diff --git a/.abi-compliance-history b/.abi-compliance-history
new file mode 100644
index 00000000000..a4bf3336cac
--- /dev/null
+++ b/.abi-compliance-history
@@ -0,0 +1,94 @@
+# Reference point for ABI compliance checks
+#
+# This file lists commits on the current branch that break ABI compatibility in
+# ways that have been deemed acceptable (e.g., removing an extern function with
+# no third-party uses).  The primary intent of this file is to control the ABI
+# compliance checks on the buildfarm, but it also serves as a central location
+# to document the justification for each.
+#
+# In general, entries should be added reactively after an abi-compliance-check
+# buildfarm failure.  It is important to verify the details of the breakage
+# match expectations, as the first entry listed will become the updated ABI
+# baseline point.
+#
+# Add new entries by adding the output of the following to the top of the file:
+#
+# $ git log --pretty=format:"%H%n#%n# %s%n# %cd%n#%n# <ADD JUSTIFICATION HERE>" $ABIBREAKGITHASH -1 --date=iso
+#
+# Be sure to replace "<ADD JUSTIFICATION HERE>" with details of your change and
+# why it is deemed acceptable.
+
+8d9a97e0bb6d820dac553848f0d5d8cc3f3e219d
+#
+# Avoid name collision with NOT NULL constraints
+# 2026-02-21 12:22:08 +0100
+#
+# AddRelationNotNullConstraints() needs to receive the names of constraints
+# already created, so that it can avoid those names when assigning names to
+# not-null constraints.  The purpose of this function is rather obscure, and
+# furthermore it's new in 18, so I don't expect any third-party code to break.
+#
+# Discussion: https://postgr.es/m/19393-6a82427485a744cf@postgresql.org
+
+33e3de6d77e87d6c3c6f8f878dd8de42d37c3b8f
+#
+# Add file_extend_method=posix_fallocate,write_zeros.
+# 2026-02-06 17:38:39 +1300
+#
+# Modifying GUC tables isn't really an ABI break: the relevant object has
+# incomplete type so its layout is unknown to other C translation units.
+#
+# Discussion: https://www.postgresql.org/message-id/flat/e1f0cd3b-0164-45f5-9705-e922e59df90f%40dunslane.net#8a350b54012c0042f9869d288e978cfe
+
+492a69e1407029f8c673484f44aa719a63323d77
+#
+# Reject ADD CONSTRAINT NOT NULL if name mismatches existing constraint
+# 2026-02-03 12:33:29 +0100
+#
+# This commit added the constraint name as a parameter to
+# AdjustNotNullInheritance(), which it needed to verify that the new name
+# matches the existing one.  PGXN contained no calls to that function.
+
+c6ce4dcf9d3b7a8a89aca386124c473f98fc329e
+#
+# Fix trigger transition table capture for MERGE in CTE queries.
+# 2026-01-24 11:30:48 +0000
+#
+# This commit changed the TransitionCaptureState structure, replacing
+# the "tcs_private" field with 3 separate fields. This structure can
+# only be built using MakeTransitionCaptureState(), and PGXN contained
+# no calls to MakeTransitionCaptureState() or uses of the
+# TransitionCaptureState structure.
+
+bae8ca82fd00603ebafa0658640d6e4dfe20af92
+#
+# Revisit cosmetics of "For inplace update, send nontransactional invalidations."
+# 2025-12-15 12:19:53 -0800
+#
+# This removed a CacheInvalidateHeapTupleInplace() parameter.  PGXN contained
+# no calls to that function.
+
+00eb646ea43410e5df77fed96f4a981e66811796
+#
+# Check for CREATE privilege on the schema in CREATE STATISTICS.
+# 2025-11-10 09:00:00 -0600
+#
+# This commit added a parameter to CreateStatistics().  We are unaware of any
+# impacted third-party code.
+
+c8af5019bee5c57502db830f8005a01cba60fee0
+#
+# Fix lookups in pg_{clear,restore}_{attribute,relation}_stats().
+# 2025-10-15 12:47:33 -0500
+#
+# This commit replaced two functions related to lookups/privilege checks for
+# the new stats stuff in v18 with RangeVarGetRelidExtended().  These functions
+# were not intended for use elsewhere, exist in exactly one release (18.0), and
+# do not have any known third-party callers.
+
+9bbcec6030a2744d83311370ec92213fbd76e514
+#
+# Translation updates
+# 2025-09-22 14:18:56 +0200
+#
+# This is the original ABI baseline point for REL_18_STABLE.
diff --git a/.cirrus.star b/.cirrus.star
index d7a07e0ca7d..4b71ee92e49 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -7,7 +7,7 @@ https://github.com/bazelbuild/starlark/blob/master/spec.md
 See also .cirrus.yml and src/tools/ci/README
 """
 
-load("cirrus", "env", "fs")
+load("cirrus", "env", "fs", "re", "yaml")
 
 
 def main():
@@ -18,19 +18,36 @@ def main():
 
     1) the contents of .cirrus.yml
 
-    2) if defined, the contents of the file referenced by the, repository
+    2) computed environment variables
+
+    3) if defined, the contents of the file referenced by the, repository
        level, REPO_CI_CONFIG_GIT_URL variable (see
        https://cirrus-ci.org/guide/programming-tasks/#fs for the accepted
        format)
 
-    3) .cirrus.tasks.yml
+    4) .cirrus.tasks.yml
     """
 
     output = ""
 
     # 1) is evaluated implicitly
 
+
     # Add 2)
+    additional_env = compute_environment_vars()
+    env_fmt = """
+###
+# Computed environment variables start here
+###
+{0}
+###
+# Computed environment variables end here
+###
+"""
+    output += env_fmt.format(yaml.dumps({'env': additional_env}))
+
+
+    # Add 3)
     repo_config_url = env.get("REPO_CI_CONFIG_GIT_URL")
     if repo_config_url != None:
         print("loading additional configuration from \"{}\"".format(repo_config_url))
@@ -38,15 +55,77 @@ def main():
     else:
         output += "\n# REPO_CI_CONFIG_URL was not set\n"
 
-    # Add 3)
+    # Add 4)
     # output += config_from(".cirrus.tasks.yml")
 
     # PR-only format check
     output += config_from(".cirrus.format.yml")
 
+
     return output
 
 
+def compute_environment_vars():
+    cenv = {}
+
+    ###
+    # Some tasks are manually triggered by default because they might use too
+    # many resources for users of free Cirrus credits, but they can be
+    # triggered automatically by naming them in an environment variable e.g.
+    # REPO_CI_AUTOMATIC_TRIGGER_TASKS="task_name other_task" under "Repository
+    # Settings" on Cirrus CI's website.
+
+    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd']
+
+    repo_ci_automatic_trigger_tasks = env.get('REPO_CI_AUTOMATIC_TRIGGER_TASKS', '')
+    for task in default_manual_trigger_tasks:
+        name = 'CI_TRIGGER_TYPE_' + task.upper()
+        if repo_ci_automatic_trigger_tasks.find(task) != -1:
+            value = 'automatic'
+        else:
+            value = 'manual'
+        cenv[name] = value
+    ###
+
+    ###
+    # Parse "ci-os-only:" tag in commit message and set
+    # CI_{$OS}_ENABLED variable for each OS
+
+    # We want to disable SanityCheck if testing just a specific OS. This
+    # shortens push-wait-for-ci cycle time a bit when debugging operating
+    # system specific failures. Just treating it as an OS in that case
+    # suffices.
+
+    operating_systems = [
+      'compilerwarnings',
+      'freebsd',
+      'linux',
+      'macos',
+      'mingw',
+      'netbsd',
+      'openbsd',
+      'sanitycheck',
+      'windows',
+    ]
+    commit_message = env.get('CIRRUS_CHANGE_MESSAGE')
+    match_re = r"(^|.*\n)ci-os-only: ([^\n]+)($|\n.*)"
+
+    # re.match() returns an array with a tuple of (matched-string, match_1, ...)
+    m = re.match(match_re, commit_message)
+    if m and len(m) > 0:
+        os_only = m[0][2]
+        os_only_list = re.split(r'[, ]+', os_only)
+    else:
+        os_only_list = operating_systems
+
+    for os in operating_systems:
+        os_enabled = os in os_only_list
+        cenv['CI_{0}_ENABLED'.format(os.upper())] = os_enabled
+    ###
+
+    return cenv
+
+
 def config_from(config_src):
     """return contents of config file `config_src`, surrounded by markers
     indicating start / end of the included file
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index 92057006c93..1f32c53bf83 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -72,13 +72,13 @@ task:
   # push-wait-for-ci cycle time a bit when debugging operating system specific
   # failures. Uses skip instead of only_if, as cirrus otherwise warns about
   # only_if conditions not matching.
-  skip: $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:.*'
+  skip: $CI_SANITYCHECK_ENABLED == false
 
   env:
     CPUS: 4
     BUILD_JOBS: 8
     TEST_JOBS: 8
-    IMAGE_FAMILY: pg-ci-bookworm
+    IMAGE_FAMILY: pg-ci-trixie
     CCACHE_DIR: ${CIRRUS_WORKING_DIR}/ccache_dir
     # no options enabled, should be small
     CCACHE_MAXSIZE: "150M"
@@ -104,6 +104,7 @@ task:
 
   configure_script: |
     su postgres <<-EOF
+      set -e
       meson setup \
         --buildtype=debug \
         --auto-features=disabled \
@@ -112,6 +113,7 @@ task:
     EOF
   build_script: |
     su postgres <<-EOF
+      set -e
       ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
     EOF
   upload_caches: ccache
@@ -121,6 +123,7 @@ task:
   # tap test that exercises both a frontend binary and the backend.
   test_minimal_script: |
     su postgres <<-EOF
+      set -e
       ulimit -c unlimited
       meson test $MTEST_ARGS --suite setup
       meson test $MTEST_ARGS --num-processes ${TEST_JOBS} \
@@ -167,7 +170,7 @@ task:
   <<: *freebsd_task_template
 
   depends_on: SanityCheck
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*freebsd.*'
+  only_if: $CI_FREEBSD_ENABLED
 
   sysinfo_script: |
     id
@@ -195,6 +198,7 @@ task:
   # already takes longer than other platforms except for windows.
   configure_script: |
     su postgres <<-EOF
+      set -e
       meson setup \
         --buildtype=debug \
         -Dcassert=true -Dinjection_points=true \
@@ -207,6 +211,7 @@ task:
 
   test_world_script: |
     su postgres <<-EOF
+      set -e
       ulimit -c unlimited
       meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
     EOF
@@ -231,6 +236,7 @@ task:
     # during upload, as it doesn't expect artifacts to change size
     stop_running_script: |
       su postgres <<-EOF
+        set -e
         build/tmp_install/usr/local/pgsql/bin/pg_ctl -D build/runningcheck stop || true
       EOF
     <<: *on_failure_meson
@@ -239,7 +245,6 @@ task:
 
 task:
   depends_on: SanityCheck
-  trigger_type: manual
 
   env:
     # Below are experimentally derived to be a decent choice.
@@ -257,7 +262,9 @@ task:
 
   matrix:
     - name: NetBSD - Meson
-      only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*netbsd.*'
+      # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star
+      trigger_type: $CI_TRIGGER_TYPE_NETBSD
+      only_if: $CI_NETBSD_ENABLED
       env:
         OS_NAME: netbsd
         IMAGE_FAMILY: pg-ci-netbsd-postgres
@@ -274,13 +281,16 @@ task:
       <<: *netbsd_task_template
 
     - name: OpenBSD - Meson
-      only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*openbsd.*'
+      # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star
+      trigger_type: $CI_TRIGGER_TYPE_OPENBSD
+      only_if: $CI_OPENBSD_ENABLED
       env:
         OS_NAME: openbsd
         IMAGE_FAMILY: pg-ci-openbsd-postgres
         PKGCONFIG_PATH: '/usr/lib/pkgconfig:/usr/local/lib/pkgconfig'
         UUID: -Duuid=e2fs
         TCL: -Dtcl_version=tcl86
+        CORE_DUMP_EXECUTABLE_DIR: $CIRRUS_WORKING_DIR/build/tmp_install/usr/local/pgsql/bin
       setup_additional_packages_script: |
         #pkg_add -I ...
       # Always core dump to ${CORE_DUMP_DIR}
@@ -313,6 +323,7 @@ task:
   # And other uuid options are not available on NetBSD.
   configure_script: |
     su postgres <<-EOF
+      set -e
       meson setup \
         --buildtype=debugoptimized \
         --pkg-config-path ${PKGCONFIG_PATH} \
@@ -327,10 +338,8 @@ task:
 
   test_world_script: |
     su postgres <<-EOF
+      set -e
       ulimit -c unlimited
-      # Otherwise tests will fail on OpenBSD, due to inability to start enough
-      # processes.
-      ulimit -p 256
       meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
     EOF
 
@@ -341,7 +350,7 @@ task:
       # ${CORE_DUMP_DIR}, they may not obey this. So, move core files to the
       # ${CORE_DUMP_DIR} directory.
       find build/ -type f -name '*.core' -exec mv '{}' ${CORE_DUMP_DIR} \;
-      src/tools/ci/cores_backtrace.sh ${OS_NAME} ${CORE_DUMP_DIR}
+      src/tools/ci/cores_backtrace.sh ${OS_NAME} ${CORE_DUMP_DIR} ${CORE_DUMP_EXECUTABLE_DIR}
 
 
 # configure feature flags, shared between the task running the linux tests and
@@ -376,7 +385,7 @@ task:
     CPUS: 4
     BUILD_JOBS: 4
     TEST_JOBS: 8 # experimentally derived to be a decent choice
-    IMAGE_FAMILY: pg-ci-bookworm
+    IMAGE_FAMILY: pg-ci-trixie
 
     CCACHE_DIR: /tmp/ccache_dir
     DEBUGINFOD_URLS: "https://debuginfod.debian.net"
@@ -397,7 +406,7 @@ task:
     # print_stacktraces=1,verbosity=2, duh
     # detect_leaks=0: too many uninteresting leak errors in short-lived binaries
     UBSAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:verbosity=2
-    ASAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:detect_leaks=0
+    ASAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:detect_leaks=0:detect_stack_use_after_return=0
 
     # SANITIZER_FLAGS is set in the tasks below
     CFLAGS: -Og -ggdb -fno-sanitize-recover=all $SANITIZER_FLAGS
@@ -405,8 +414,6 @@ task:
     LDFLAGS: $SANITIZER_FLAGS
     CC: ccache gcc
     CXX: ccache g++
-    # GCC emits a warning for llvm-14, so switch to a newer one.
-    LLVM_CONFIG: llvm-config-16
 
     LINUX_CONFIGURE_FEATURES: *LINUX_CONFIGURE_FEATURES
     LINUX_MESON_FEATURES: *LINUX_MESON_FEATURES
@@ -414,7 +421,7 @@ task:
   <<: *linux_task_template
 
   depends_on: SanityCheck
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*linux.*'
+  only_if: $CI_LINUX_ENABLED
 
   ccache_cache:
     folder: ${CCACHE_DIR}
@@ -453,7 +460,7 @@ task:
     # - Uses address sanitizer, sanitizer failures are typically printed in
     #   the server log
     # - Configures postgres with a small segment size
-    - name: Linux - Debian Bookworm - Autoconf
+    - name: Linux - Debian Trixie - Autoconf
 
       env:
         SANITIZER_FLAGS: -fsanitize=address
@@ -467,6 +474,7 @@ task:
       # that.
       configure_script: |
         su postgres <<-EOF
+          set -e
           ./configure \
             --enable-cassert --enable-injection-points --enable-debug \
             --enable-tap-tests --enable-nls \
@@ -476,13 +484,14 @@ task:
             \
             ${LINUX_CONFIGURE_FEATURES} \
             \
-            CLANG="ccache clang-16"
+            CLANG="ccache clang"
         EOF
       build_script: su postgres -c "make -s -j${BUILD_JOBS} world-bin"
       upload_caches: ccache
 
       test_world_script: |
         su postgres <<-EOF
+          set -e
           ulimit -c unlimited # default is 0
           make -s ${CHECK} ${CHECKFLAGS} -j${TEST_JOBS}
         EOF
@@ -495,7 +504,7 @@ task:
     #   are typically printed in the server log
     # - Test both 64bit and 32 bit builds
     # - uses io_method=io_uring
-    - name: Linux - Debian Bookworm - Meson
+    - name: Linux - Debian Trixie - Meson
 
       env:
         CCACHE_MAXSIZE: "400M" # tests two different builds
@@ -505,6 +514,7 @@ task:
 
       configure_script: |
         su postgres <<-EOF
+          set -e
           meson setup \
             --buildtype=debug \
             -Dcassert=true -Dinjection_points=true \
@@ -516,6 +526,7 @@ task:
       # locally.
       configure_32_script: |
         su postgres <<-EOF
+          set -e
           export CC='ccache gcc -m32'
           meson setup \
             --buildtype=debug \
@@ -523,19 +534,21 @@ task:
             ${LINUX_MESON_FEATURES} \
             -Dllvm=disabled \
             --pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \
-            -DPERL=perl5.36-i386-linux-gnu \
+            -DPERL=perl5.40-i386-linux-gnu \
             -Dlibnuma=disabled \
             build-32
         EOF
 
       build_script: |
         su postgres <<-EOF
+          set -e
           ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
           ninja -C build -t missingdeps
         EOF
 
       build_32_script: |
         su postgres <<-EOF
+          set -e
           ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}
           ninja -C build -t missingdeps
         EOF
@@ -544,6 +557,7 @@ task:
 
       test_world_script: |
         su postgres <<-EOF
+          set -e
           ulimit -c unlimited
           meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
         EOF
@@ -556,6 +570,7 @@ task:
       # from C, prevent that with PYTHONCOERCECLOCALE.
       test_world_32_script: |
         su postgres <<-EOF
+          set -e
           ulimit -c unlimited
           PYTHONCOERCECLOCALE=0 LANG=C meson test $MTEST_ARGS -C build-32 --num-processes ${TEST_JOBS}
         EOF
@@ -573,16 +588,16 @@ task:
 # SPECIAL:
 # - Enables --clone for pg_upgrade and pg_combinebackup
 task:
-  name: macOS - Sonoma - Meson
+  name: macOS - Sequoia - Meson
 
   env:
     CPUS: 4 # always get that much for cirrusci macOS instances
     BUILD_JOBS: $CPUS
-    # Test performance regresses noticably when using all cores. 8 seems to
+    # Test performance regresses noticeably when using all cores. 8 seems to
     # work OK. See
     # https://postgr.es/m/20220927040208.l3shfcidovpzqxfh%40awork3.anarazel.de
     TEST_JOBS: 8
-    IMAGE: ghcr.io/cirruslabs/macos-runner:sonoma
+    IMAGE: ghcr.io/cirruslabs/macos-runner:sequoia
 
     CIRRUS_WORKING_DIR: ${HOME}/pgsql/
     CCACHE_DIR: ${HOME}/ccache
@@ -613,7 +628,7 @@ task:
   <<: *macos_task_template
 
   depends_on: SanityCheck
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*(macos|darwin|osx).*'
+  only_if: $CI_MACOS_ENABLED
 
   sysinfo_script: |
     id
@@ -701,7 +716,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
 
 
 task:
-  name: Windows - Server 2019, VS 2019 - Meson & ninja
+  name: Windows - Server 2022, VS 2019 - Meson & ninja
   << : *WINDOWS_ENVIRONMENT_BASE
 
   env:
@@ -719,7 +734,7 @@ task:
   <<: *windows_task_template
 
   depends_on: SanityCheck
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
+  only_if: $CI_WINDOWS_ENABLED
 
   setup_additional_packages_script: |
     REM choco install -y --no-progress ...
@@ -730,10 +745,9 @@ task:
     echo 127.0.0.3 pg-loadbalancetest >> c:\Windows\System32\Drivers\etc\hosts
     type c:\Windows\System32\Drivers\etc\hosts
 
-  # Use /DEBUG:FASTLINK to avoid high memory usage during linking
   configure_script: |
     vcvarsall x64
-    meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% build
+    meson setup --backend ninja --buildtype debug -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% build
 
   build_script: |
     vcvarsall x64
@@ -753,15 +767,13 @@ task:
 
 task:
   << : *WINDOWS_ENVIRONMENT_BASE
-  name: Windows - Server 2019, MinGW64 - Meson
-
-  # due to resource constraints we don't run this task by default for now
-  trigger_type: manual
-  # worth using only_if despite being manual, otherwise this task will show up
-  # when e.g. ci-os-only: linux is used.
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*mingw.*'
-  # otherwise it'll be sorted before other tasks
+  name: Windows - Server 2022, MinGW64 - Meson
+
+  # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star.
+  trigger_type: $CI_TRIGGER_TYPE_MINGW
+
   depends_on: SanityCheck
+  only_if: $CI_MINGW_ENABLED
 
   env:
     TEST_JOBS: 4 # higher concurrency causes occasional failures
@@ -815,15 +827,14 @@ task:
 
   # To limit unnecessary work only run this once the SanityCheck
   # succeeds. This is particularly important for this task as we intentionally
-  # use always: to continue after failures. Task that did not run count as a
-  # success, so we need to recheck SanityChecks's condition here ...
+  # use always: to continue after failures.
   depends_on: SanityCheck
-  only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*'
+  only_if: $CI_COMPILERWARNINGS_ENABLED
 
   env:
     CPUS: 4
     BUILD_JOBS: 4
-    IMAGE_FAMILY: pg-ci-bookworm
+    IMAGE_FAMILY: pg-ci-trixie
 
     # Use larger ccache cache, as this task compiles with multiple compilers /
     # flag combinations
@@ -833,9 +844,6 @@ task:
     LINUX_CONFIGURE_FEATURES: *LINUX_CONFIGURE_FEATURES
     LINUX_MESON_FEATURES: *LINUX_MESON_FEATURES
 
-    # GCC emits a warning for llvm-14, so switch to a newer one.
-    LLVM_CONFIG: llvm-config-16
-
   <<: *linux_task_template
 
   sysinfo_script: |
@@ -871,7 +879,7 @@ task:
         --cache gcc.cache \
         --enable-dtrace \
         ${LINUX_CONFIGURE_FEATURES} \
-        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
+        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} world-bin
 
@@ -882,7 +890,7 @@ task:
         --cache gcc.cache \
         --enable-cassert \
         ${LINUX_CONFIGURE_FEATURES} \
-        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
+        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} world-bin
 
@@ -892,7 +900,7 @@ task:
       time ./configure \
         --cache clang.cache \
         ${LINUX_CONFIGURE_FEATURES} \
-        CC="ccache clang" CXX="ccache clang++-16" CLANG="ccache clang-16"
+        CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} world-bin
 
@@ -904,7 +912,7 @@ task:
         --enable-cassert \
         --enable-dtrace \
         ${LINUX_CONFIGURE_FEATURES} \
-        CC="ccache clang" CXX="ccache clang++-16" CLANG="ccache clang-16"
+        CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} world-bin
 
@@ -912,11 +920,11 @@ task:
   always:
     mingw_cross_warning_script: |
       time ./configure \
-        --host=x86_64-w64-mingw32 \
+        --host=x86_64-w64-mingw32ucrt \
         --enable-cassert \
         --without-icu \
-        CC="ccache x86_64-w64-mingw32-gcc" \
-        CXX="ccache x86_64-w64-mingw32-g++"
+        CC="ccache x86_64-w64-mingw32ucrt-gcc" \
+        CXX="ccache x86_64-w64-mingw32ucrt-g++"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} world-bin
 
@@ -928,7 +936,7 @@ task:
     docs_build_script: |
       time ./configure \
         --cache gcc.cache \
-        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
+        CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
       time make -s -j${BUILD_JOBS} -C doc
 
@@ -938,16 +946,13 @@ task:
   # - Don't use ccache, the files are uncacheable, polluting ccache's
   #   cache
   # - Use -fmax-errors, as particularly cpluspluscheck can be very verbose
-  # - XXX have to disable ICU to avoid errors:
-  #   https://postgr.es/m/20220323002024.f2g6tivduzrktgfa%40alap3.anarazel.de
   ###
   always:
     headers_headerscheck_script: |
       time ./configure \
         ${LINUX_CONFIGURE_FEATURES} \
-        --without-icu \
         --quiet \
-        CC="gcc" CXX"=g++" CLANG="clang-16"
+        CC="gcc" CXX"=g++" CLANG="clang"
       make -s -j${BUILD_JOBS} clean
       time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
     headers_cpluspluscheck_script: |
diff --git a/.cirrus.yml b/.cirrus.yml
index 33c6e481d74..3f75852e84e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,12 +10,20 @@
 #
 # 1) the contents of this file
 #
-# 2) if defined, the contents of the file referenced by the, repository
+# 2) computed environment variables
+#
+#    Used to enable/disable tasks based on the execution environment. See
+#    .cirrus.star: compute_environment_vars()
+#
+# 3) if defined, the contents of the file referenced by the, repository
 #    level, REPO_CI_CONFIG_GIT_URL variable (see
 #    https://cirrus-ci.org/guide/programming-tasks/#fs for the accepted
 #    format)
 #
-# 3) .cirrus.tasks.yml
+#    This allows running tasks in a different execution environment than the
+#    default, e.g. to have sufficient resources for cfbot.
+#
+# 4) .cirrus.tasks.yml
 #
 # This composition is done by .cirrus.star
 
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 00000000000..170e20de21e
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,10 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+# Minimal configuration for getting started
+language: "en-US"
+reviews:
+  profile: "chill"
+  high_level_summary: true
+  auto_review:
+    enabled: true
+    drafts: false
+    base_branches: ["master", "IVORY_REL_5_STABLE"]
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8048afd1a80..88aa34ab4b2 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -14,6 +14,15 @@
 #
 # $ git log --pretty=format:"%H # %cd%n# %s" $PGINDENTGITHASH -1 --date=iso
 
+2795f5a5428fd292996fd155f16a57b0db3df8f4 # 2025-10-21 09:56:26 -0500
+# Re-pgindent brin.c.
+
+17a5ca58eb119a33e81e57b72618236538932167 # 2025-09-13 14:50:02 -0500
+# Re-pgindent nbtpreprocesskeys.c after commit 796962922e.
+
+07448b3969d55a2081cdafafc23f68df3392f220 # 2025-07-01 15:24:19 +0200
+# Fix indentation in pg_numa code
+
 b27644bade0348d0dafd3036c47880a349fe9332 # 2025-06-15 13:04:24 -0400
 # Sync typedefs.list with the buildfarm.
 
diff --git a/.gitattributes b/.gitattributes
index 8df6b75e653..4e26bbfb145 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,8 +12,8 @@
 *.xsl		whitespace=space-before-tab,trailing-space,tab-in-indent
 
 # Avoid confusing ASCII underlines with leftover merge conflict markers
-README		conflict-marker-size=32
-README.*	conflict-marker-size=32
+README		conflict-marker-size=48
+README.*	conflict-marker-size=48
 
 # Certain data files that contain special whitespace, and other special cases
 *.data						-whitespace
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ffddd94454f..9cb6073522f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
 
 jobs:
   build:
@@ -19,6 +19,9 @@ jobs:
       if: ${{ matrix.os == 'ubuntu-latest' }}
       run: |
         sudo apt-get update
+        sudo apt-get install -y gcc-14 g++-14
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
         sudo apt-get install -y build-essential git lcov bison flex \
               libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
               tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
@@ -35,4 +38,4 @@ jobs:
             --with-ossp-uuid  --with-libxml --with-libxslt  --with-perl \
             --with-icu --with-libnuma --enable-injection-points
     - name: compile
-      run: make
+      run: make CFLAGS="$CFLAGS  -Wshadow=compatible-local -Werror=missing-variable-declarations -Werror=maybe-uninitialized -Werror=unused-value -Werror=unused-but-set-variable -Werror=missing-prototypes -Werror=unused-variable"
diff --git a/.github/workflows/contrib_regression.yml b/.github/workflows/contrib_regression.yml
index 953880c7ca2..fc12c1b7815 100644
--- a/.github/workflows/contrib_regression.yml
+++ b/.github/workflows/contrib_regression.yml
@@ -2,9 +2,9 @@ name: contrib_regression
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
 
 jobs:
   contrib_regression:
@@ -51,4 +51,3 @@ jobs:
       with:
         name: results
         path: ${{ github.workspace }}/pg_regression.tar.gz
-
diff --git a/.github/workflows/meson_build.yml b/.github/workflows/meson_build.yml
index fe13e1dbccb..63c192ba388 100644
--- a/.github/workflows/meson_build.yml
+++ b/.github/workflows/meson_build.yml
@@ -2,9 +2,9 @@ name: meson_build
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE ]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE ]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE ]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE ]
 
 jobs:
   meson_build:
diff --git a/.github/workflows/oracle_pg_regression.yml b/.github/workflows/oracle_pg_regression.yml
index 9a8ca6084d8..8dcf711ed03 100644
--- a/.github/workflows/oracle_pg_regression.yml
+++ b/.github/workflows/oracle_pg_regression.yml
@@ -2,9 +2,9 @@ name: oracle_pg_regression
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
 
 jobs:
   oracle_pg_regression:
@@ -58,4 +58,3 @@ jobs:
       with:
         name: results
         path: ${{ github.workspace }}/oracle_pg_regression.tar.gz
-
diff --git a/.github/workflows/oracle_regression.yml b/.github/workflows/oracle_regression.yml
index 6efd612f06d..44f0c23feeb 100644
--- a/.github/workflows/oracle_regression.yml
+++ b/.github/workflows/oracle_regression.yml
@@ -2,9 +2,9 @@ name: oracle_regression
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
 
 jobs:
   oracle_regression:
@@ -55,4 +55,3 @@ jobs:
       with:
         name: results
         path: ${{ github.workspace }}/oracle_regression.tar.gz
-
diff --git a/.github/workflows/pg_regression.yml b/.github/workflows/pg_regression.yml
index c8423df1210..4e305e197a7 100644
--- a/.github/workflows/pg_regression.yml
+++ b/.github/workflows/pg_regression.yml
@@ -2,9 +2,9 @@ name: pg_regression
 
 on:
   push:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
   pull_request:
-    branches: [ master , IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
+    branches: [ master , IVORY_REL_5_STABLE, IVORY_REL_4_STABLE , IVORYSQL_REL_1_STABLE]
 
 jobs:
   pg_regression:
@@ -55,4 +55,3 @@ jobs:
       with:
         name: results
         path: ${{ github.workspace }}/pg_regression.tar.gz
-
diff --git a/COPYRIGHT b/COPYRIGHT
index 3b79b1b4ca0..0a397648dcd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (also known as Postgres, formerly known as Postgres95)
 
-Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a279aecacc3..96fb275d62e 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -158,7 +158,11 @@ headerscheck: submake-generated-headers
 cpluspluscheck: submake-generated-headers
 	$(top_srcdir)/src/tools/pginclude/headerscheck --cplusplus $(top_srcdir) $(abs_top_builddir)
 
+# ivorysql code format
+code-format: submake-generated-headers
+	@bash tools/enable-git-hooks.sh
+
 #.PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world headerscheck cpluspluscheck
 
-.PHONY: dist distcheck docs install-docs world check-world install-world installcheck-world headerscheck cpluspluscheck oracle-pg-check-world oracle-check-world oracle-installcheck-world all-check all-check-world all-installcheck-world
+.PHONY: dist distcheck docs install-docs world check-world install-world installcheck-world headerscheck cpluspluscheck oracle-pg-check-world oracle-check-world oracle-installcheck-world all-check all-check-world all-installcheck-world code-format
 
diff --git a/Makefile b/Makefile
index 977ffe37491..ffa50b5548b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ all check oracle-check all-check install installdirs installcheck oracle-install
 
 	@if [ ! -f GNUmakefile ] ; then \
 	   echo "You need to run the 'configure' program first. Please see"; \
-	   echo "<https://www.postgresql.org/docs/devel/installation.html>" ; \
+	   echo "<https://www.postgresql.org/docs/18/installation.html>" ; \
 	   false ; \
 	 fi
 	@IFS=':' ; \
@@ -44,7 +44,3 @@ all check oracle-check all-check install installdirs installcheck oracle-install
 	   false; \
 	 fi
 
-
-.PHONY: enable-git-hooks
-enable-git-hooks:
-	@bash tools/enable-git-hooks.sh
diff --git a/README.md b/README.md
index d7da90170fe..52d253ce9e9 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ Furthermore, for more detailed installation instructions, please refer to the [I
 - [Source code installation](https://docs.ivorysql.org/en/ivorysql-doc/v4.5/v4.5/6#Source-code-installation)
 
 ## Developer Formatting hooks and CI:
-- A pre-commit formatting hook is provided at `.githooks/pre-commit`. Enable it with `git config core.hooksPath .githooks`, or run `make enable-git-hooks` (equivalently `bash tools/enable-git-hooks.sh`).
-- The hook depends only on in-tree tools `src/tools/pgindent` and `src/tools/pg_bsd_indent`. On commit it formats staged C/C++ files with pgindent and re-adds them to the index. 
+- A pre-commit formatting hook is provided at `.githooks/pre-commit`. Enable it with `git config core.hooksPath .githooks`, or run `make code-format` (equivalently `bash tools/enable-git-hooks.sh`).
+- The hook depends only on in-tree tools `src/tools/pgindent` and `src/tools/pg_bsd_indent`. On commit it formats staged C/C++ files with pgindent and re-adds them to the staged area. 
 - A Cirrus workflow `FormatCheck` runs `pgindent --check` on files changed in a PR.
 
 ## Contributing to the IvorySQL
diff --git a/README_CN.md b/README_CN.md
index 3dffb0fff01..5fad9cc4b9c 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -18,7 +18,7 @@ IvorySQL 项目采用 Apache 2.0 许可协议发布，并鼓励各种形式的
 
 ## 开发者代码格式化
 - 提交前自动格式化（推荐）：
-  - 已克隆仓库：在仓库根目录执行 `make enable-git-hooks`（或 `bash tools/enable-git-hooks.sh`）
+  - 已克隆仓库：在仓库根目录执行 `make code-format`（或 `bash tools/enable-git-hooks.sh`）
 - 提交时行为：Git 钩子会自动用 `pgindent` 格式化已暂存的 C/C++ 文件并回加到暂存区，未通过二次校验会阻止提交。
 - PR 阶段：Cirrus 将运行 `FormatCheck`（pgindent --check）对差异文件做只读校验。
 
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index da40bd6a647..8de232ec050 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -7,10 +7,10 @@
 # Select the format archetype to be used by gcc to check printf-type functions.
 # We prefer "gnu_printf", as that most closely matches the features supported
 # by src/port/snprintf.c (particularly the %m conversion spec).  However,
-# on some NetBSD versions, that doesn't work while "__syslog__" does.
-# If all else fails, use "printf".
+# on clang and on some NetBSD versions, that doesn't work while "__syslog__"
+# does.  If all else fails, use "printf".
 AC_DEFUN([PGAC_PRINTF_ARCHETYPE],
-[AC_CACHE_CHECK([for printf format archetype], pgac_cv_printf_archetype,
+[AC_CACHE_CHECK([for C printf format archetype], pgac_cv_printf_archetype,
 [pgac_cv_printf_archetype=gnu_printf
 PGAC_TEST_PRINTF_ARCHETYPE
 if [[ "$ac_archetype_ok" = no ]]; then
@@ -20,8 +20,8 @@ if [[ "$ac_archetype_ok" = no ]]; then
     pgac_cv_printf_archetype=printf
   fi
 fi])
-AC_DEFINE_UNQUOTED([PG_PRINTF_ATTRIBUTE], [$pgac_cv_printf_archetype],
-[Define to best printf format archetype, usually gnu_printf if available.])
+AC_DEFINE_UNQUOTED([PG_C_PRINTF_ATTRIBUTE], [$pgac_cv_printf_archetype],
+[Define to best C printf format archetype, usually gnu_printf if available.])
 ])# PGAC_PRINTF_ARCHETYPE
 
 # Subroutine: test $pgac_cv_printf_archetype, set $ac_archetype_ok to yes or no
@@ -38,6 +38,42 @@ ac_c_werror_flag=$ac_save_c_werror_flag
 ])# PGAC_TEST_PRINTF_ARCHETYPE
 
 
+# PGAC_CXX_PRINTF_ARCHETYPE
+# -------------------------
+# Because we support using gcc as C compiler with clang as C++ compiler,
+# we have to be prepared to use different printf archetypes in C++ code.
+# So, do the above test all over in C++.
+AC_DEFUN([PGAC_CXX_PRINTF_ARCHETYPE],
+[AC_CACHE_CHECK([for C++ printf format archetype], pgac_cv_cxx_printf_archetype,
+[pgac_cv_cxx_printf_archetype=gnu_printf
+PGAC_TEST_CXX_PRINTF_ARCHETYPE
+if [[ "$ac_archetype_ok" = no ]]; then
+  pgac_cv_cxx_printf_archetype=__syslog__
+  PGAC_TEST_CXX_PRINTF_ARCHETYPE
+  if [[ "$ac_archetype_ok" = no ]]; then
+    pgac_cv_cxx_printf_archetype=printf
+  fi
+fi])
+AC_DEFINE_UNQUOTED([PG_CXX_PRINTF_ATTRIBUTE], [$pgac_cv_cxx_printf_archetype],
+[Define to best C++ printf format archetype, usually gnu_printf if available.])
+])# PGAC_CXX_PRINTF_ARCHETYPE
+
+# Subroutine: test $pgac_cv_cxx_printf_archetype, set $ac_archetype_ok to yes or no
+AC_DEFUN([PGAC_TEST_CXX_PRINTF_ARCHETYPE],
+[ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
+AC_LANG_PUSH(C++)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[extern void pgac_write(int ignore, const char *fmt,...)
+__attribute__((format($pgac_cv_cxx_printf_archetype, 2, 3)));],
+[pgac_write(0, "error %s: %m", "foo");])],
+                  [ac_archetype_ok=yes],
+                  [ac_archetype_ok=no])
+AC_LANG_POP([])
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+])# PGAC_TEST_CXX_PRINTF_ARCHETYPE
+
+
 # PGAC_TYPE_128BIT_INT
 # --------------------
 # Check if __int128 is a working 128 bit integer type, and if so
diff --git a/config/llvm.m4 b/config/llvm.m4
index fa4bedd9370..9d6fe8199e3 100644
--- a/config/llvm.m4
+++ b/config/llvm.m4
@@ -4,7 +4,7 @@
 # -----------------
 #
 # Look for the LLVM installation, check that it's new enough, set the
-# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH} and LDFLAGS
+# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH,LIBS}
 # variables. Also verify that CLANG is available, to transform C
 # into bitcode.
 #
@@ -55,7 +55,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
 
   for pgac_option in `$LLVM_CONFIG --ldflags`; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
     esac
   done
 
diff --git a/config/programs.m4 b/config/programs.m4
index 0ad1e58b48d..e57fe4907b8 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -284,20 +284,26 @@ AC_DEFUN([PGAC_CHECK_STRIP],
 
 AC_DEFUN([PGAC_CHECK_LIBCURL],
 [
+  # libcurl compiler/linker flags are kept separate from the global flags, so
+  # they have to be added back temporarily for the following tests.
+  pgac_save_CPPFLAGS=$CPPFLAGS
+  pgac_save_LDFLAGS=$LDFLAGS
+  pgac_save_LIBS=$LIBS
+
+  CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+  LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
+
   AC_CHECK_HEADER(curl/curl.h, [],
 				  [AC_MSG_ERROR([header file <curl/curl.h> is required for --with-libcurl])])
+
+  # LIBCURL_LDLIBS is determined here. Like the compiler flags, it should not
+  # pollute the global LIBS setting.
   AC_CHECK_LIB(curl, curl_multi_init, [
 				 AC_DEFINE([HAVE_LIBCURL], [1], [Define to 1 if you have the `curl' library (-lcurl).])
 				 AC_SUBST(LIBCURL_LDLIBS, -lcurl)
 			   ],
 			   [AC_MSG_ERROR([library 'curl' does not provide curl_multi_init])])
 
-  pgac_save_CPPFLAGS=$CPPFLAGS
-  pgac_save_LDFLAGS=$LDFLAGS
-  pgac_save_LIBS=$LIBS
-
-  CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-  LDFLAGS="$LIBCURL_LDFLAGS $LDFLAGS"
   LIBS="$LIBCURL_LDLIBS $LIBS"
 
   # Check to see whether the current platform supports threadsafe Curl
diff --git a/configure b/configure
index 66dc47aea4a..d2343c8d800 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 18beta1.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 18.4.
 #
 # Report bugs to <pgsql-bugs@lists.postgresql.org>.
 #
@@ -11,7 +11,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 1996-2025, PostgreSQL Global Development Group
 ## -------------------- ##
 ## M4sh Initialization. ##
@@ -583,8 +583,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='18beta1'
-PACKAGE_STRING='PostgreSQL 18beta1'
+PACKAGE_VERSION='18.4'
+PACKAGE_STRING='PostgreSQL 18.4'
 PACKAGE_BUGREPORT='pgsql-bugs@lists.postgresql.org'
 PACKAGE_URL='https://www.postgresql.org/'
 
@@ -1473,7 +1473,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 18beta1 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 18.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1538,7 +1538,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 18beta1:";;
+     short | recursive ) echo "Configuration of PostgreSQL 18.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1733,7 +1733,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 18beta1
+PostgreSQL configure 18.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2486,7 +2486,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 18beta1, which was
+It was created by PostgreSQL $as_me 18.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5342,7 +5342,7 @@ fi
 
   for pgac_option in `$LLVM_CONFIG --ldflags`; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
     esac
   done
 
@@ -9584,12 +9584,12 @@ fi
   # Note the user could also set XML2_CFLAGS/XML2_LIBS directly
   for pgac_option in $XML2_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $XML2_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -9814,12 +9814,12 @@ fi
   # note that -llz4 will be added by AC_CHECK_LIB below.
   for pgac_option in $LZ4_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $LZ4_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -9955,12 +9955,12 @@ fi
   # note that -lzstd will be added by AC_CHECK_LIB below.
   for pgac_option in $ZSTD_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $ZSTD_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -12865,6 +12865,15 @@ fi
 
 if test "$with_libcurl" = yes ; then
 
+  # libcurl compiler/linker flags are kept separate from the global flags, so
+  # they have to be added back temporarily for the following tests.
+  pgac_save_CPPFLAGS=$CPPFLAGS
+  pgac_save_LDFLAGS=$LDFLAGS
+  pgac_save_LIBS=$LIBS
+
+  CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+  LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
+
   ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
 if test "x$ac_cv_header_curl_curl_h" = xyes; then :
 
@@ -12873,6 +12882,9 @@ else
 fi
 
 
+
+  # LIBCURL_LDLIBS is determined here. Like the compiler flags, it should not
+  # pollute the global LIBS setting.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_multi_init in -lcurl" >&5
 $as_echo_n "checking for curl_multi_init in -lcurl... " >&6; }
 if ${ac_cv_lib_curl_curl_multi_init+:} false; then :
@@ -12922,12 +12934,6 @@ else
 fi
 
 
-  pgac_save_CPPFLAGS=$CPPFLAGS
-  pgac_save_LDFLAGS=$LDFLAGS
-  pgac_save_LIBS=$LIBS
-
-  CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-  LDFLAGS="$LIBCURL_LDFLAGS $LDFLAGS"
   LIBS="$LIBCURL_LDLIBS $LIBS"
 
   # Check to see whether the current platform supports threadsafe Curl
@@ -13457,6 +13463,23 @@ fi
 
 fi
 
+if test "$with_liburing" = yes; then
+  _LIBS="$LIBS"
+  LIBS="$LIBURING_LIBS $LIBS"
+  for ac_func in io_uring_queue_init_mem
+do :
+  ac_fn_c_check_func "$LINENO" "io_uring_queue_init_mem" "ac_cv_func_io_uring_queue_init_mem"
+if test "x$ac_cv_func_io_uring_queue_init_mem" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IO_URING_QUEUE_INIT_MEM 1
+_ACEOF
+
+fi
+done
+
+  LIBS="$_LIBS"
+fi
+
 if test "$with_lz4" = yes ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4_compress_default in -llz4" >&5
 $as_echo_n "checking for LZ4_compress_default in -llz4... " >&6; }
@@ -14962,8 +14985,8 @@ _ACEOF
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf format archetype" >&5
-$as_echo_n "checking for printf format archetype... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C printf format archetype" >&5
+$as_echo_n "checking for C printf format archetype... " >&6; }
 if ${pgac_cv_printf_archetype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -15023,7 +15046,97 @@ fi
 $as_echo "$pgac_cv_printf_archetype" >&6; }
 
 cat >>confdefs.h <<_ACEOF
-#define PG_PRINTF_ATTRIBUTE $pgac_cv_printf_archetype
+#define PG_C_PRINTF_ATTRIBUTE $pgac_cv_printf_archetype
+_ACEOF
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ printf format archetype" >&5
+$as_echo_n "checking for C++ printf format archetype... " >&6; }
+if ${pgac_cv_cxx_printf_archetype+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  pgac_cv_cxx_printf_archetype=gnu_printf
+ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+extern void pgac_write(int ignore, const char *fmt,...)
+__attribute__((format($pgac_cv_cxx_printf_archetype, 2, 3)));
+int
+main ()
+{
+pgac_write(0, "error %s: %m", "foo");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_archetype_ok=yes
+else
+  ac_archetype_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+
+if [ "$ac_archetype_ok" = no ]; then
+  pgac_cv_cxx_printf_archetype=__syslog__
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+extern void pgac_write(int ignore, const char *fmt,...)
+__attribute__((format($pgac_cv_cxx_printf_archetype, 2, 3)));
+int
+main ()
+{
+pgac_write(0, "error %s: %m", "foo");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_archetype_ok=yes
+else
+  ac_archetype_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+
+  if [ "$ac_archetype_ok" = no ]; then
+    pgac_cv_cxx_printf_archetype=printf
+  fi
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_cxx_printf_archetype" >&5
+$as_echo "$pgac_cv_cxx_printf_archetype" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PG_CXX_PRINTF_ATTRIBUTE $pgac_cv_cxx_printf_archetype
 _ACEOF
 
 
@@ -16783,7 +16896,7 @@ fi
 
 if test "$with_icu" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$ICU_CFLAGS $CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
 
   # Verify we have ICU's header files
   ac_fn_c_check_header_mongrel "$LINENO" "unicode/ucol.h" "ac_cv_header_unicode_ucol_h" "$ac_includes_default"
@@ -17690,7 +17803,7 @@ $as_echo "#define HAVE_GCC__ATOMIC_INT64_CAS 1" >>confdefs.h
 fi
 
 
-# Check for x86 cpuid instruction
+# Check for __get_cpuid() and __cpuid()
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid" >&5
 $as_echo_n "checking for __get_cpuid... " >&6; }
 if ${pgac_cv__get_cpuid+:} false; then :
@@ -17723,77 +17836,79 @@ if test x"$pgac_cv__get_cpuid" = x"yes"; then
 
 $as_echo "#define HAVE__GET_CPUID 1" >>confdefs.h
 
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid_count" >&5
-$as_echo_n "checking for __get_cpuid_count... " >&6; }
-if ${pgac_cv__get_cpuid_count+:} false; then :
+else
+  # __cpuid()
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
+$as_echo_n "checking for __cpuid... " >&6; }
+if ${pgac_cv__cpuid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <cpuid.h>
+#include <intrin.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
+    __cpuid(exx, 1);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__get_cpuid_count="yes"
+  pgac_cv__cpuid="yes"
 else
-  pgac_cv__get_cpuid_count="no"
+  pgac_cv__cpuid="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid_count" >&5
-$as_echo "$pgac_cv__get_cpuid_count" >&6; }
-if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuid" >&5
+$as_echo "$pgac_cv__cpuid" >&6; }
+  if test x"$pgac_cv__cpuid" = x"yes"; then
 
-$as_echo "#define HAVE__GET_CPUID_COUNT 1" >>confdefs.h
+$as_echo "#define HAVE__CPUID 1" >>confdefs.h
 
+  fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
-$as_echo_n "checking for __cpuid... " >&6; }
-if ${pgac_cv__cpuid+:} false; then :
+# Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid_count" >&5
+$as_echo_n "checking for __get_cpuid_count... " >&6; }
+if ${pgac_cv__get_cpuid_count+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <intrin.h>
+#include <cpuid.h>
 int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid(exx[0], 1);
+  __get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv__cpuid="yes"
+  pgac_cv__get_cpuid_count="yes"
 else
-  pgac_cv__cpuid="no"
+  pgac_cv__get_cpuid_count="no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuid" >&5
-$as_echo "$pgac_cv__cpuid" >&6; }
-if test x"$pgac_cv__cpuid" = x"yes"; then
-
-$as_echo "#define HAVE__CPUID 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid_count" >&5
+$as_echo "$pgac_cv__get_cpuid_count" >&6; }
+if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
 
-fi
+$as_echo "#define HAVE__GET_CPUID_COUNT 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
+else
+  # __cpuidex()
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
 $as_echo_n "checking for __cpuidex... " >&6; }
 if ${pgac_cv__cpuidex+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17805,7 +17920,7 @@ int
 main ()
 {
 unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuidex(exx[0], 7, 0);
+    __cpuidex(exx, 7, 0);
 
   ;
   return 0;
@@ -17821,10 +17936,11 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuidex" >&5
 $as_echo "$pgac_cv__cpuidex" >&6; }
-if test x"$pgac_cv__cpuidex" = x"yes"; then
+  if test x"$pgac_cv__cpuidex" = x"yes"; then
 
 $as_echo "#define HAVE__CPUIDEX 1" >>confdefs.h
 
+  fi
 fi
 
 # Check for XSAVE intrinsics
@@ -19005,7 +19121,7 @@ Use --without-tcl to disable building PL/Tcl." "$LINENO" 5
     fi
     # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
     ac_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
     ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
 if test "x$ac_cv_header_tcl_h" = xyes; then :
 
@@ -19074,7 +19190,7 @@ fi
 # check for <Python.h>
 if test "$with_python" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$python_includespec $CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $python_includespec"
   ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
 if test "x$ac_cv_header_Python_h" = xyes; then :
 
@@ -19618,9 +19734,15 @@ else
   cc_string=$CC
 fi
 
+# IvorySQL version
+PACKAGE_IVORYSQL_VERSION='5.4'
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_IVORYSQL_VERSION "$PACKAGE_IVORYSQL_VERSION"
+_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define PG_VERSION_STR "PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
+#define PG_VERSION_STR "PostgreSQL $PG_VERSION (IvorySQL $PACKAGE_IVORYSQL_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
 _ACEOF
 
 
@@ -20214,7 +20336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 18beta1, which was
+This file was extended by PostgreSQL $as_me 18.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20285,7 +20407,7 @@ _ACEOF
 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 18beta1
+PostgreSQL config.status 18.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2138df308f0..66f9e2254b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,18 +17,22 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [18beta1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+AC_INIT([PostgreSQL], [18.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.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
 recommended.  You can remove the check from 'configure.ac' but it is then
 your responsibility whether the result works or not.])])
 AC_COPYRIGHT([Copyright (c) 1996-2025, PostgreSQL Global Development Group])
+AC_COPYRIGHT([Portions Copyright (c), 2023-2025, IvorySQL Global Development Team])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)
 AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
 
+# IvorySQL version
+PACKAGE_IVORYSQL_VERSION='5.4'
+
 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
 [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
 test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
@@ -36,6 +40,7 @@ AC_SUBST(PG_MAJORVERSION)
 AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
 AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major version number])
 AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number])
+AC_DEFINE_UNQUOTED([PACKAGE_IVORYSQL_VERSION], "$PACKAGE_IVORYSQL_VERSION" , [IvorySQL version number])
 
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
@@ -1186,12 +1191,12 @@ if test "$with_libxml" = yes ; then
   # Note the user could also set XML2_CFLAGS/XML2_LIBS directly
   for pgac_option in $XML2_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $XML2_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -1235,12 +1240,12 @@ if test "$with_lz4" = yes; then
   # note that -llz4 will be added by AC_CHECK_LIB below.
   for pgac_option in $LZ4_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $LZ4_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -1260,12 +1265,12 @@ if test "$with_zstd" = yes; then
   # note that -lzstd will be added by AC_CHECK_LIB below.
   for pgac_option in $ZSTD_CFLAGS; do
     case $pgac_option in
-      -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
+      -I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
     esac
   done
   for pgac_option in $ZSTD_LIBS; do
     case $pgac_option in
-      -L*) LDFLAGS="$LDFLAGS $pgac_option";;
+      -L*) LIBDIRS="$LIBDIRS $pgac_option";;
     esac
   done
 fi
@@ -1503,6 +1508,13 @@ if test "$with_libxslt" = yes ; then
   AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
 fi
 
+if test "$with_liburing" = yes; then
+  _LIBS="$LIBS"
+  LIBS="$LIBURING_LIBS $LIBS"
+  AC_CHECK_FUNCS([io_uring_queue_init_mem])
+  LIBS="$_LIBS"
+fi
+
 if test "$with_lz4" = yes ; then
   AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])])
 fi
@@ -1757,6 +1769,7 @@ m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that.
 AC_C_BIGENDIAN
 AC_C_INLINE
 PGAC_PRINTF_ARCHETYPE
+PGAC_CXX_PRINTF_ARCHETYPE
 PGAC_C_STATIC_ASSERT
 PGAC_C_TYPEOF
 PGAC_C_TYPES_COMPATIBLE
@@ -2020,7 +2033,7 @@ fi
 
 if test "$with_icu" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$ICU_CFLAGS $CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
 
   # Verify we have ICU's header files
   AC_CHECK_HEADER(unicode/ucol.h, [],
@@ -2120,7 +2133,7 @@ PGAC_HAVE_GCC__ATOMIC_INT32_CAS
 PGAC_HAVE_GCC__ATOMIC_INT64_CAS
 
 
-# Check for x86 cpuid instruction
+# Check for __get_cpuid() and __cpuid()
 AC_CACHE_CHECK([for __get_cpuid], [pgac_cv__get_cpuid],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cpuid.h>],
   [[unsigned int exx[4] = {0, 0, 0, 0};
@@ -2130,8 +2143,21 @@ AC_CACHE_CHECK([for __get_cpuid], [pgac_cv__get_cpuid],
   [pgac_cv__get_cpuid="no"])])
 if test x"$pgac_cv__get_cpuid" = x"yes"; then
   AC_DEFINE(HAVE__GET_CPUID, 1, [Define to 1 if you have __get_cpuid.])
+else
+  # __cpuid()
+  AC_CACHE_CHECK([for __cpuid], [pgac_cv__cpuid],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
+    [[unsigned int exx[4] = {0, 0, 0, 0};
+    __cpuid(exx, 1);
+    ]])],
+    [pgac_cv__cpuid="yes"],
+    [pgac_cv__cpuid="no"])])
+  if test x"$pgac_cv__cpuid" = x"yes"; then
+    AC_DEFINE(HAVE__CPUID, 1, [Define to 1 if you have __cpuid.])
+  fi
 fi
 
+# Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
 AC_CACHE_CHECK([for __get_cpuid_count], [pgac_cv__get_cpuid_count],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cpuid.h>],
   [[unsigned int exx[4] = {0, 0, 0, 0};
@@ -2141,28 +2167,18 @@ AC_CACHE_CHECK([for __get_cpuid_count], [pgac_cv__get_cpuid_count],
   [pgac_cv__get_cpuid_count="no"])])
 if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
   AC_DEFINE(HAVE__GET_CPUID_COUNT, 1, [Define to 1 if you have __get_cpuid_count.])
-fi
-
-AC_CACHE_CHECK([for __cpuid], [pgac_cv__cpuid],
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
-  [[unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuid(exx[0], 1);
-  ]])],
-  [pgac_cv__cpuid="yes"],
-  [pgac_cv__cpuid="no"])])
-if test x"$pgac_cv__cpuid" = x"yes"; then
-  AC_DEFINE(HAVE__CPUID, 1, [Define to 1 if you have __cpuid.])
-fi
-
-AC_CACHE_CHECK([for __cpuidex], [pgac_cv__cpuidex],
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
-  [[unsigned int exx[4] = {0, 0, 0, 0};
-  __get_cpuidex(exx[0], 7, 0);
-  ]])],
-  [pgac_cv__cpuidex="yes"],
-  [pgac_cv__cpuidex="no"])])
-if test x"$pgac_cv__cpuidex" = x"yes"; then
-  AC_DEFINE(HAVE__CPUIDEX, 1, [Define to 1 if you have __cpuidex.])
+else
+  # __cpuidex()
+  AC_CACHE_CHECK([for __cpuidex], [pgac_cv__cpuidex],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <intrin.h>],
+    [[unsigned int exx[4] = {0, 0, 0, 0};
+    __cpuidex(exx, 7, 0);
+    ]])],
+    [pgac_cv__cpuidex="yes"],
+    [pgac_cv__cpuidex="no"])])
+  if test x"$pgac_cv__cpuidex" = x"yes"; then
+    AC_DEFINE(HAVE__CPUIDEX, 1, [Define to 1 if you have __cpuidex.])
+  fi
 fi
 
 # Check for XSAVE intrinsics
@@ -2424,7 +2440,7 @@ Use --without-tcl to disable building PL/Tcl.])
     fi
     # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
     ac_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
     AC_CHECK_HEADER(tcl.h, [], [AC_MSG_ERROR([header file <tcl.h> is required for Tcl])])
     CPPFLAGS=$ac_save_CPPFLAGS
 fi
@@ -2461,7 +2477,7 @@ fi
 # check for <Python.h>
 if test "$with_python" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$python_includespec $CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $python_includespec"
   AC_CHECK_HEADER(Python.h, [], [AC_MSG_ERROR([header file <Python.h> is required for Python])])
   CPPFLAGS=$ac_save_CPPFLAGS
 fi
@@ -2543,7 +2559,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(PG_VERSION_STR,
-                   ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
+                   ["PostgreSQL $PG_VERSION (IvorySQL $PACKAGE_IVORYSQL_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
                    [A string containing the version number, platform, and C compiler])
 
 # Supply a numeric version string for use by 3rd party add-ons
diff --git a/contrib/amcheck/t/002_cic.pl b/contrib/amcheck/t/002_cic.pl
index 6a0c4f61125..983d0b3cbdd 100644
--- a/contrib/amcheck/t/002_cic.pl
+++ b/contrib/amcheck/t/002_cic.pl
@@ -64,5 +64,29 @@
 		  )
 	});
 
+# Test bt_index_parent_check() with indexes created with
+# CREATE INDEX CONCURRENTLY.
+$node->safe_psql('postgres', q(CREATE TABLE quebec(i int primary key)));
+# Insert two rows into index
+$node->safe_psql('postgres',
+	q(INSERT INTO quebec SELECT i FROM generate_series(1, 2) s(i);));
+
+# start background transaction
+my $in_progress_h = $node->background_psql('postgres');
+$in_progress_h->query_safe(q(BEGIN; SELECT pg_current_xact_id();));
+
+# delete one row from table, while background transaction is in progress
+$node->safe_psql('postgres', q(DELETE FROM quebec WHERE i = 1;));
+# create index concurrently, which will skip the deleted row
+$node->safe_psql('postgres',
+	q(CREATE INDEX CONCURRENTLY oscar ON quebec(i);));
+
+# check index using bt_index_parent_check
+my $result = $node->psql('postgres',
+	q(SELECT bt_index_parent_check('oscar', heapallindexed => true)));
+is($result, '0', 'bt_index_parent_check for CIC after removed row');
+
+$in_progress_h->quit;
+
 $node->stop;
 done_testing();
diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index f11c43a0ed7..3de1c06c7cf 100644
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@@ -92,9 +92,11 @@ typedef struct BtreeCheckState
 	BufferAccessStrategy checkstrategy;
 
 	/*
-	 * Info for uniqueness checking. Fill these fields once per index check.
+	 * Info for uniqueness checking. Fill this field and the one below once
+	 * per index check.
 	 */
 	IndexInfo  *indexinfo;
+	/* Table scan snapshot for heapallindexed and checkunique */
 	Snapshot	snapshot;
 
 	/*
@@ -382,7 +384,6 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 	BTMetaPageData *metad;
 	uint32		previouslevel;
 	BtreeLevel	current;
-	Snapshot	snapshot = SnapshotAny;
 
 	if (!readonly)
 		elog(DEBUG1, "verifying consistency of tree structure for index \"%s\"",
@@ -433,54 +434,46 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 		state->heaptuplespresent = 0;
 
 		/*
-		 * Register our own snapshot in !readonly case, rather than asking
+		 * Register our own snapshot for heapallindexed, rather than asking
 		 * table_index_build_scan() to do this for us later.  This needs to
 		 * happen before index fingerprinting begins, so we can later be
 		 * certain that index fingerprinting should have reached all tuples
 		 * returned by table_index_build_scan().
 		 */
-		if (!state->readonly)
-		{
-			snapshot = RegisterSnapshot(GetTransactionSnapshot());
+		state->snapshot = RegisterSnapshot(GetTransactionSnapshot());
 
-			/*
-			 * GetTransactionSnapshot() always acquires a new MVCC snapshot in
-			 * READ COMMITTED mode.  A new snapshot is guaranteed to have all
-			 * the entries it requires in the index.
-			 *
-			 * We must defend against the possibility that an old xact
-			 * snapshot was returned at higher isolation levels when that
-			 * snapshot is not safe for index scans of the target index.  This
-			 * is possible when the snapshot sees tuples that are before the
-			 * index's indcheckxmin horizon.  Throwing an error here should be
-			 * very rare.  It doesn't seem worth using a secondary snapshot to
-			 * avoid this.
-			 */
-			if (IsolationUsesXactSnapshot() && rel->rd_index->indcheckxmin &&
-				!TransactionIdPrecedes(HeapTupleHeaderGetXmin(rel->rd_indextuple->t_data),
-									   snapshot->xmin))
-				ereport(ERROR,
-						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-						 errmsg("index \"%s\" cannot be verified using transaction snapshot",
-								RelationGetRelationName(rel))));
-		}
+		/*
+		 * GetTransactionSnapshot() always acquires a new MVCC snapshot in
+		 * READ COMMITTED mode.  A new snapshot is guaranteed to have all the
+		 * entries it requires in the index.
+		 *
+		 * We must defend against the possibility that an old xact snapshot
+		 * was returned at higher isolation levels when that snapshot is not
+		 * safe for index scans of the target index.  This is possible when
+		 * the snapshot sees tuples that are before the index's indcheckxmin
+		 * horizon.  Throwing an error here should be very rare.  It doesn't
+		 * seem worth using a secondary snapshot to avoid this.
+		 */
+		if (IsolationUsesXactSnapshot() && rel->rd_index->indcheckxmin &&
+			!TransactionIdPrecedes(HeapTupleHeaderGetXmin(rel->rd_indextuple->t_data),
+								   state->snapshot->xmin))
+			ereport(ERROR,
+					errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+					errmsg("index \"%s\" cannot be verified using transaction snapshot",
+						   RelationGetRelationName(rel)));
 	}
 
 	/*
-	 * We need a snapshot to check the uniqueness of the index. For better
-	 * performance take it once per index check. If snapshot already taken
-	 * reuse it.
+	 * We need a snapshot to check the uniqueness of the index.  For better
+	 * performance, take it once per index check.  If one was already taken
+	 * above, use that.
 	 */
 	if (state->checkunique)
 	{
 		state->indexinfo = BuildIndexInfo(state->rel);
-		if (state->indexinfo->ii_Unique)
-		{
-			if (snapshot != SnapshotAny)
-				state->snapshot = snapshot;
-			else
-				state->snapshot = RegisterSnapshot(GetTransactionSnapshot());
-		}
+
+		if (state->indexinfo->ii_Unique && state->snapshot == InvalidSnapshot)
+			state->snapshot = RegisterSnapshot(GetTransactionSnapshot());
 	}
 
 	Assert(!state->rootdescend || state->readonly);
@@ -555,13 +548,12 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 		/*
 		 * Create our own scan for table_index_build_scan(), rather than
 		 * getting it to do so for us.  This is required so that we can
-		 * actually use the MVCC snapshot registered earlier in !readonly
-		 * case.
+		 * actually use the MVCC snapshot registered earlier.
 		 *
 		 * Note that table_index_build_scan() calls heap_endscan() for us.
 		 */
 		scan = table_beginscan_strat(state->heaprel,	/* relation */
-									 snapshot,	/* snapshot */
+									 state->snapshot,	/* snapshot */
 									 0, /* number of keys */
 									 NULL,	/* scan key */
 									 true,	/* buffer access strategy OK */
@@ -569,16 +561,15 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 
 		/*
 		 * Scan will behave as the first scan of a CREATE INDEX CONCURRENTLY
-		 * behaves in !readonly case.
+		 * behaves.
 		 *
 		 * It's okay that we don't actually use the same lock strength for the
-		 * heap relation as any other ii_Concurrent caller would in !readonly
-		 * case.  We have no reason to care about a concurrent VACUUM
-		 * operation, since there isn't going to be a second scan of the heap
-		 * that needs to be sure that there was no concurrent recycling of
-		 * TIDs.
+		 * heap relation as any other ii_Concurrent caller would.  We have no
+		 * reason to care about a concurrent VACUUM operation, since there
+		 * isn't going to be a second scan of the heap that needs to be sure
+		 * that there was no concurrent recycling of TIDs.
 		 */
-		indexinfo->ii_Concurrent = !state->readonly;
+		indexinfo->ii_Concurrent = true;
 
 		/*
 		 * Don't wait for uncommitted tuple xact commit/abort when index is a
@@ -602,14 +593,11 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 								 state->heaptuplespresent, RelationGetRelationName(heaprel),
 								 100.0 * bloom_prop_bits_set(state->filter))));
 
-		if (snapshot != SnapshotAny)
-			UnregisterSnapshot(snapshot);
-
 		bloom_free(state->filter);
 	}
 
 	/* Be tidy: */
-	if (snapshot == SnapshotAny && state->snapshot != InvalidSnapshot)
+	if (state->snapshot != InvalidSnapshot)
 		UnregisterSnapshot(state->snapshot);
 	MemoryContextDelete(state->targetcontext);
 }
@@ -721,7 +709,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)
 							 errmsg("block %u is not leftmost in index \"%s\"",
 									current, RelationGetRelationName(state->rel))));
 
-				if (level.istruerootlevel && !P_ISROOT(opaque))
+				if (level.istruerootlevel && (!P_ISROOT(opaque) && !P_INCOMPLETE_SPLIT(opaque)))
 					ereport(ERROR,
 							(errcode(ERRCODE_INDEX_CORRUPTED),
 							 errmsg("block %u is not true root in index \"%s\"",
@@ -2270,7 +2258,7 @@ bt_child_highkey_check(BtreeCheckState *state,
 		 * If we visit page with high key, check that it is equal to the
 		 * target key next to corresponding downlink.
 		 */
-		if (!rightsplit && !P_RIGHTMOST(opaque))
+		if (!rightsplit && !P_RIGHTMOST(opaque) && !P_ISHALFDEAD(opaque))
 		{
 			BTPageOpaque topaque;
 			IndexTuple	highkey;
diff --git a/contrib/auto_explain/Makefile b/contrib/auto_explain/Makefile
index efd127d3cae..32355b12db6 100644
--- a/contrib/auto_explain/Makefile
+++ b/contrib/auto_explain/Makefile
@@ -6,6 +6,9 @@ OBJS = \
 	auto_explain.o
 PGFILEDESC = "auto_explain - logging facility for execution plans"
 
+REGRESS = alter_reset
+ORA_REGRESS = alter_reset
+
 TAP_TESTS = 1
 
 ifdef USE_PGXS
diff --git a/contrib/auto_explain/expected/alter_reset.out b/contrib/auto_explain/expected/alter_reset.out
new file mode 100644
index 00000000000..ec355189806
--- /dev/null
+++ b/contrib/auto_explain/expected/alter_reset.out
@@ -0,0 +1,19 @@
+--
+-- This tests resetting unknown custom GUCs with reserved prefixes.  There's
+-- nothing specific to auto_explain; this is just a convenient place to put
+-- this test.
+--
+SELECT current_database() AS datname \gset
+CREATE ROLE regress_ae_role;
+ALTER DATABASE :"datname" SET auto_explain.bogus = 1;
+ALTER ROLE regress_ae_role SET auto_explain.bogus = 1;
+ALTER ROLE regress_ae_role IN DATABASE :"datname" SET auto_explain.bogus = 1;
+ALTER SYSTEM SET auto_explain.bogus = 1;
+LOAD 'auto_explain';
+WARNING:  invalid configuration parameter name "auto_explain.bogus", removing it
+DETAIL:  "auto_explain" is now a reserved prefix.
+ALTER DATABASE :"datname" RESET auto_explain.bogus;
+ALTER ROLE regress_ae_role RESET auto_explain.bogus;
+ALTER ROLE regress_ae_role IN DATABASE :"datname" RESET auto_explain.bogus;
+ALTER SYSTEM RESET auto_explain.bogus;
+DROP ROLE regress_ae_role;
diff --git a/contrib/auto_explain/meson.build b/contrib/auto_explain/meson.build
index 92dc9df6f7c..a9b45cc235f 100644
--- a/contrib/auto_explain/meson.build
+++ b/contrib/auto_explain/meson.build
@@ -20,6 +20,11 @@ tests += {
   'name': 'auto_explain',
   'sd': meson.current_source_dir(),
   'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'alter_reset',
+    ],
+  },
   'tap': {
     'tests': [
       't/001_auto_explain.pl',
diff --git a/contrib/auto_explain/sql/alter_reset.sql b/contrib/auto_explain/sql/alter_reset.sql
new file mode 100644
index 00000000000..bf621454ec2
--- /dev/null
+++ b/contrib/auto_explain/sql/alter_reset.sql
@@ -0,0 +1,22 @@
+--
+-- This tests resetting unknown custom GUCs with reserved prefixes.  There's
+-- nothing specific to auto_explain; this is just a convenient place to put
+-- this test.
+--
+
+SELECT current_database() AS datname \gset
+CREATE ROLE regress_ae_role;
+
+ALTER DATABASE :"datname" SET auto_explain.bogus = 1;
+ALTER ROLE regress_ae_role SET auto_explain.bogus = 1;
+ALTER ROLE regress_ae_role IN DATABASE :"datname" SET auto_explain.bogus = 1;
+ALTER SYSTEM SET auto_explain.bogus = 1;
+
+LOAD 'auto_explain';
+
+ALTER DATABASE :"datname" RESET auto_explain.bogus;
+ALTER ROLE regress_ae_role RESET auto_explain.bogus;
+ALTER ROLE regress_ae_role IN DATABASE :"datname" RESET auto_explain.bogus;
+ALTER SYSTEM RESET auto_explain.bogus;
+
+DROP ROLE regress_ae_role;
diff --git a/contrib/basic_archive/basic_archive.c b/contrib/basic_archive/basic_archive.c
index 4a8b8c7ac29..0eec948e002 100644
--- a/contrib/basic_archive/basic_archive.c
+++ b/contrib/basic_archive/basic_archive.c
@@ -90,13 +90,11 @@ _PG_archive_module_init(void)
 /*
  * check_archive_directory
  *
- * Checks that the provided archive directory exists.
+ * Checks that the provided archive directory path isn't too long.
  */
 static bool
 check_archive_directory(char **newval, void **extra, GucSource source)
 {
-	struct stat st;
-
 	/*
 	 * The default value is an empty string, so we have to accept that value.
 	 * Our check_configured callback also checks for this and prevents
@@ -115,17 +113,6 @@ check_archive_directory(char **newval, void **extra, GucSource source)
 		return false;
 	}
 
-	/*
-	 * Do a basic sanity check that the specified archive directory exists. It
-	 * could be removed at some point in the future, so we still need to be
-	 * prepared for it not to exist in the actual archiving logic.
-	 */
-	if (stat(*newval, &st) != 0 || !S_ISDIR(st.st_mode))
-	{
-		GUC_check_errdetail("Specified archive directory does not exist.");
-		return false;
-	}
-
 	return true;
 }
 
diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index 68190ac5e46..7ac2df26c10 100644
--- a/contrib/btree_gist/Makefile
+++ b/contrib/btree_gist/Makefile
@@ -34,7 +34,7 @@ DATA = btree_gist--1.0--1.1.sql \
        btree_gist--1.1--1.2.sql btree_gist--1.2.sql btree_gist--1.2--1.3.sql \
        btree_gist--1.3--1.4.sql btree_gist--1.4--1.5.sql \
        btree_gist--1.5--1.6.sql btree_gist--1.6--1.7.sql \
-       btree_gist--1.7--1.8.sql btree_gist--1.8--1.9.sql
+       btree_gist--1.7--1.8.sql
 PGFILEDESC = "btree_gist - B-tree equivalent GiST operator classes"
 
 REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz \
diff --git a/contrib/btree_gist/btree_gist--1.7--1.8.sql b/contrib/btree_gist/btree_gist--1.7--1.8.sql
index 8f79365a461..22316dc3f56 100644
--- a/contrib/btree_gist/btree_gist--1.7--1.8.sql
+++ b/contrib/btree_gist/btree_gist--1.7--1.8.sql
@@ -3,6 +3,203 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "ALTER EXTENSION btree_gist UPDATE TO '1.8'" to load this file. \quit
 
+-- Add sortsupport functions
+
+CREATE FUNCTION gbt_bit_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_varbit_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_bool_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_bytea_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_cash_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_date_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_enum_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_float4_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_float8_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_inet_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_int2_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_int4_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_int8_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_intv_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_macaddr_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_macad8_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_numeric_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_oid_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_text_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_bpchar_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_time_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_ts_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+CREATE FUNCTION gbt_uuid_sortsupport(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
+
+ALTER OPERATOR FAMILY gist_bit_ops USING gist ADD
+	FUNCTION	11  (bit, bit) gbt_bit_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_vbit_ops USING gist ADD
+	FUNCTION	11  (varbit, varbit) gbt_varbit_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_bool_ops USING gist ADD
+	FUNCTION	11  (bool, bool) gbt_bool_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_bytea_ops USING gist ADD
+	FUNCTION	11  (bytea, bytea) gbt_bytea_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_cash_ops USING gist ADD
+	FUNCTION	11  (money, money) gbt_cash_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_date_ops USING gist ADD
+	FUNCTION	11  (date, date) gbt_date_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_enum_ops USING gist ADD
+	FUNCTION	11  (anyenum, anyenum) gbt_enum_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_float4_ops USING gist ADD
+	FUNCTION	11  (float4, float4) gbt_float4_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_float8_ops USING gist ADD
+	FUNCTION	11  (float8, float8) gbt_float8_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_inet_ops USING gist ADD
+	FUNCTION	11  (inet, inet) gbt_inet_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_cidr_ops USING gist ADD
+	FUNCTION	11  (cidr, cidr) gbt_inet_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_int2_ops USING gist ADD
+	FUNCTION	11  (int2, int2) gbt_int2_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_int4_ops USING gist ADD
+	FUNCTION	11  (int4, int4) gbt_int4_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_int8_ops USING gist ADD
+	FUNCTION	11  (int8, int8) gbt_int8_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_interval_ops USING gist ADD
+	FUNCTION	11  (interval, interval) gbt_intv_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_macaddr_ops USING gist ADD
+	FUNCTION	11  (macaddr, macaddr) gbt_macaddr_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_macaddr8_ops USING gist ADD
+	FUNCTION	11  (macaddr8, macaddr8) gbt_macad8_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_numeric_ops USING gist ADD
+	FUNCTION	11  (numeric, numeric) gbt_numeric_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_oid_ops USING gist ADD
+	FUNCTION	11  (oid, oid) gbt_oid_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_text_ops USING gist ADD
+	FUNCTION	11  (text, text) gbt_text_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_bpchar_ops USING gist ADD
+	FUNCTION	11  (bpchar, bpchar) gbt_bpchar_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_time_ops USING gist ADD
+	FUNCTION	11  (time, time) gbt_time_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_timetz_ops USING gist ADD
+	FUNCTION	11  (timetz, timetz) gbt_time_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_timestamp_ops USING gist ADD
+	FUNCTION	11  (timestamp, timestamp) gbt_ts_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_timestamptz_ops USING gist ADD
+	FUNCTION	11  (timestamptz, timestamptz) gbt_ts_sortsupport (internal) ;
+
+ALTER OPERATOR FAMILY gist_uuid_ops USING gist ADD
+	FUNCTION	11  (uuid, uuid) gbt_uuid_sortsupport (internal) ;
+
+-- Add translate_cmptype functions
+
 CREATE FUNCTION gist_translate_cmptype_btree(int)
 RETURNS smallint
 AS 'MODULE_PATHNAME'
diff --git a/contrib/btree_gist/btree_gist--1.8--1.9.sql b/contrib/btree_gist/btree_gist--1.8--1.9.sql
deleted file mode 100644
index 4b38749bf5f..00000000000
--- a/contrib/btree_gist/btree_gist--1.8--1.9.sql
+++ /dev/null
@@ -1,197 +0,0 @@
-/* contrib/btree_gist/btree_gist--1.7--1.8.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION btree_gist UPDATE TO '1.9'" to load this file. \quit
-
-CREATE FUNCTION gbt_bit_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_varbit_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_bool_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_bytea_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_cash_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_date_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_enum_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_float4_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_float8_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_inet_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_int2_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_int4_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_int8_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_intv_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_macaddr_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_macad8_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_numeric_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_oid_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_text_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_bpchar_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_time_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_ts_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-CREATE FUNCTION gbt_uuid_sortsupport(internal)
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
-
-ALTER OPERATOR FAMILY gist_bit_ops USING gist ADD
-	FUNCTION	11  (bit, bit) gbt_bit_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_vbit_ops USING gist ADD
-	FUNCTION	11  (varbit, varbit) gbt_varbit_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_bool_ops USING gist ADD
-	FUNCTION	11  (bool, bool) gbt_bool_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_bytea_ops USING gist ADD
-	FUNCTION	11  (bytea, bytea) gbt_bytea_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_cash_ops USING gist ADD
-	FUNCTION	11  (money, money) gbt_cash_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_date_ops USING gist ADD
-	FUNCTION	11  (date, date) gbt_date_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_enum_ops USING gist ADD
-	FUNCTION	11  (anyenum, anyenum) gbt_enum_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_float4_ops USING gist ADD
-	FUNCTION	11  (float4, float4) gbt_float4_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_float8_ops USING gist ADD
-	FUNCTION	11  (float8, float8) gbt_float8_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_inet_ops USING gist ADD
-	FUNCTION	11  (inet, inet) gbt_inet_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_cidr_ops USING gist ADD
-	FUNCTION	11  (cidr, cidr) gbt_inet_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_int2_ops USING gist ADD
-	FUNCTION	11  (int2, int2) gbt_int2_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_int4_ops USING gist ADD
-	FUNCTION	11  (int4, int4) gbt_int4_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_int8_ops USING gist ADD
-	FUNCTION	11  (int8, int8) gbt_int8_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_interval_ops USING gist ADD
-	FUNCTION	11  (interval, interval) gbt_intv_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_macaddr_ops USING gist ADD
-	FUNCTION	11  (macaddr, macaddr) gbt_macaddr_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_macaddr8_ops USING gist ADD
-	FUNCTION	11  (macaddr8, macaddr8) gbt_macad8_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_numeric_ops USING gist ADD
-	FUNCTION	11  (numeric, numeric) gbt_numeric_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_oid_ops USING gist ADD
-	FUNCTION	11  (oid, oid) gbt_oid_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_text_ops USING gist ADD
-	FUNCTION	11  (text, text) gbt_text_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_bpchar_ops USING gist ADD
-	FUNCTION	11  (bpchar, bpchar) gbt_bpchar_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_time_ops USING gist ADD
-	FUNCTION	11  (time, time) gbt_time_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_timetz_ops USING gist ADD
-	FUNCTION	11  (timetz, timetz) gbt_time_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_timestamp_ops USING gist ADD
-	FUNCTION	11  (timestamp, timestamp) gbt_ts_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_timestamptz_ops USING gist ADD
-	FUNCTION	11  (timestamptz, timestamptz) gbt_ts_sortsupport (internal) ;
-
-ALTER OPERATOR FAMILY gist_uuid_ops USING gist ADD
-	FUNCTION	11  (uuid, uuid) gbt_uuid_sortsupport (internal) ;
diff --git a/contrib/btree_gist/btree_gist.control b/contrib/btree_gist/btree_gist.control
index 69d9341a0ad..abf66538f32 100644
--- a/contrib/btree_gist/btree_gist.control
+++ b/contrib/btree_gist/btree_gist.control
@@ -1,6 +1,6 @@
 # btree_gist extension
 comment = 'support for indexing common datatypes in GiST'
-default_version = '1.9'
+default_version = '1.8'
 module_pathname = '$libdir/btree_gist'
 relocatable = true
 trusted = true
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index d9df2356cd1..96cc08f9054 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -115,36 +115,47 @@ gbt_var_leaf2node(GBT_VARKEY *leaf, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
 
 /*
  * returns the common prefix length of a node key
+ *
+ * If the underlying type is character data, the prefix length may point in
+ * the middle of a multibyte character.
 */
 static int32
 gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
 {
 	GBT_VARKEY_R r = gbt_var_key_readable(node);
 	int32		i = 0;
-	int32		l = 0;
+	int32		l_left_to_match = 0;
+	int32		l_total = 0;
 	int32		t1len = VARSIZE(r.lower) - VARHDRSZ;
 	int32		t2len = VARSIZE(r.upper) - VARHDRSZ;
 	int32		ml = Min(t1len, t2len);
 	char	   *p1 = VARDATA(r.lower);
 	char	   *p2 = VARDATA(r.upper);
+	const char *end1 = p1 + t1len;
+	const char *end2 = p2 + t2len;
 
 	if (ml == 0)
 		return 0;
 
 	while (i < ml)
 	{
-		if (tinfo->eml > 1 && l == 0)
+		if (tinfo->eml > 1 && l_left_to_match == 0)
 		{
-			if ((l = pg_mblen(p1)) != pg_mblen(p2))
+			l_total = pg_mblen_range(p1, end1);
+			if (l_total != pg_mblen_range(p2, end2))
 			{
 				return i;
 			}
+			l_left_to_match = l_total;
 		}
 		if (*p1 != *p2)
 		{
 			if (tinfo->eml > 1)
 			{
-				return (i - l + 1);
+				int32		l_matched_subset = l_total - l_left_to_match;
+
+				/* end common prefix at final byte of last matching char */
+				return i - l_matched_subset;
 			}
 			else
 			{
@@ -154,7 +165,7 @@ gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
 
 		p1++;
 		p2++;
-		l--;
+		l_left_to_match--;
 		i++;
 	}
 	return ml;					/* lower == upper */
diff --git a/contrib/btree_gist/meson.build b/contrib/btree_gist/meson.build
index 89932dd3844..f4fa9574f1f 100644
--- a/contrib/btree_gist/meson.build
+++ b/contrib/btree_gist/meson.build
@@ -51,7 +51,6 @@ install_data(
   'btree_gist--1.5--1.6.sql',
   'btree_gist--1.6--1.7.sql',
   'btree_gist--1.7--1.8.sql',
-  'btree_gist--1.8--1.9.sql',
   kwargs: contrib_data_args,
 )
 
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 4fb70bfc76a..de837ce09f9 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -2665,7 +2665,7 @@ dblink_connstr_has_required_scram_options(const char *connstr)
 		PQconninfoFree(options);
 	}
 
-	has_scram_keys = has_scram_client_key && has_scram_server_key && MyProcPort->has_scram_keys;
+	has_scram_keys = has_scram_client_key && has_scram_server_key && MyProcPort != NULL && MyProcPort->has_scram_keys;
 
 	return (has_scram_keys && has_require_auth);
 }
@@ -2698,7 +2698,7 @@ dblink_security_check(PGconn *conn, const char *connname, const char *connstr)
 	 * only added if UseScramPassthrough is set, and the user is not allowed
 	 * to add the SCRAM keys on fdw and user mapping options.
 	 */
-	if (MyProcPort->has_scram_keys && dblink_connstr_has_required_scram_options(connstr))
+	if (MyProcPort != NULL && MyProcPort->has_scram_keys && dblink_connstr_has_required_scram_options(connstr))
 		return;
 
 #ifdef ENABLE_GSS
@@ -2771,7 +2771,7 @@ dblink_connstr_check(const char *connstr)
 	if (dblink_connstr_has_pw(connstr))
 		return;
 
-	if (MyProcPort->has_scram_keys && dblink_connstr_has_required_scram_options(connstr))
+	if (MyProcPort != NULL && MyProcPort->has_scram_keys && dblink_connstr_has_required_scram_options(connstr))
 		return;
 
 #ifdef ENABLE_GSS
@@ -2931,7 +2931,7 @@ get_connect_string(const char *servername)
 		 * the user overwrites these options we can ereport on
 		 * dblink_connstr_check and dblink_security_check.
 		 */
-		if (MyProcPort->has_scram_keys && UseScramPassthrough(foreign_server, user_mapping))
+		if (MyProcPort != NULL && MyProcPort->has_scram_keys && UseScramPassthrough(foreign_server, user_mapping))
 			appendSCRAMKeysInfo(&buf);
 
 		foreach(cell, fdw->options)
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
index 1ec5285d6d1..c4eb2ec8bce 100644
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -54,14 +54,14 @@ find_word(char *in, char **end)
 
 	*end = NULL;
 	while (*in && isspace((unsigned char) *in))
-		in += pg_mblen(in);
+		in += pg_mblen_cstr(in);
 
 	if (!*in || *in == '#')
 		return NULL;
 	start = in;
 
 	while (*in && !isspace((unsigned char) *in))
-		in += pg_mblen(in);
+		in += pg_mblen_cstr(in);
 
 	*end = in;
 
diff --git a/contrib/file_fdw/expected/file_fdw.out b/contrib/file_fdw/expected/file_fdw.out
index 62c4c0c1e2b..f57574f558f 100644
--- a/contrib/file_fdw/expected/file_fdw.out
+++ b/contrib/file_fdw/expected/file_fdw.out
@@ -456,6 +456,21 @@ SELECT tableoid::regclass, * FROM p2;
  p2       | 2 | xyzzy
 (3 rows)
 
+-- Test DELETE/UPDATE/MERGE on a partitioned table when all partitions
+-- are excluded and only the dummy root result relation remains. The
+-- operation is a no-op but should not fail regardless of whether the
+-- foreign child was processed (pruning off) or not (pruning on).
+DROP TABLE p2;
+SET enable_partition_pruning TO off;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+SET enable_partition_pruning TO on;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
 DROP TABLE pt;
 -- generated column tests
 \set filename :abs_srcdir '/data/list1.csv'
diff --git a/contrib/file_fdw/expected/ivy_file_fdw.out b/contrib/file_fdw/expected/ivy_file_fdw.out
index 5c6845c84a3..dfbb8ec85b4 100644
--- a/contrib/file_fdw/expected/ivy_file_fdw.out
+++ b/contrib/file_fdw/expected/ivy_file_fdw.out
@@ -1,6 +1,7 @@
 --
 -- Test foreign-data wrapper file_fdw.
 --
+\set EXECUTE_RUN_PREPARE on
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 -- Clean up in case a prior regression run failed
@@ -446,6 +447,21 @@ SELECT tableoid::regclass, * FROM p2;
  p2       | 2 | xyzzy
 (3 rows)
 
+-- Test DELETE/UPDATE/MERGE on a partitioned table when all partitions
+-- are excluded and only the dummy root result relation remains. The
+-- operation is a no-op but should not fail regardless of whether the
+-- foreign child was processed (pruning off) or not (pruning on).
+DROP TABLE p2;
+SET enable_partition_pruning TO off;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+SET enable_partition_pruning TO on;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
 DROP TABLE pt;
 -- generated column tests
 \set filename :abs_srcdir '/data/list1.csv'
diff --git a/contrib/file_fdw/sql/file_fdw.sql b/contrib/file_fdw/sql/file_fdw.sql
index 01431f5da8d..f9c8577fb13 100644
--- a/contrib/file_fdw/sql/file_fdw.sql
+++ b/contrib/file_fdw/sql/file_fdw.sql
@@ -242,6 +242,24 @@ UPDATE pt set a = 1 where a = 2; -- ERROR
 SELECT tableoid::regclass, * FROM pt;
 SELECT tableoid::regclass, * FROM p1;
 SELECT tableoid::regclass, * FROM p2;
+
+-- Test DELETE/UPDATE/MERGE on a partitioned table when all partitions
+-- are excluded and only the dummy root result relation remains. The
+-- operation is a no-op but should not fail regardless of whether the
+-- foreign child was processed (pruning off) or not (pruning on).
+DROP TABLE p2;
+SET enable_partition_pruning TO off;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+
+SET enable_partition_pruning TO on;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+
 DROP TABLE pt;
 
 -- generated column tests
diff --git a/contrib/file_fdw/sql/ivy_file_fdw.sql b/contrib/file_fdw/sql/ivy_file_fdw.sql
index 2f91c878534..6e6dd88038d 100644
--- a/contrib/file_fdw/sql/ivy_file_fdw.sql
+++ b/contrib/file_fdw/sql/ivy_file_fdw.sql
@@ -2,6 +2,7 @@
 -- Test foreign-data wrapper file_fdw.
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 
@@ -243,6 +244,24 @@ UPDATE pt set a = 1 where a = 2; -- ERROR
 SELECT tableoid::regclass, * FROM pt;
 SELECT tableoid::regclass, * FROM p1;
 SELECT tableoid::regclass, * FROM p2;
+
+-- Test DELETE/UPDATE/MERGE on a partitioned table when all partitions
+-- are excluded and only the dummy root result relation remains. The
+-- operation is a no-op but should not fail regardless of whether the
+-- foreign child was processed (pruning off) or not (pruning on).
+DROP TABLE p2;
+SET enable_partition_pruning TO off;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+
+SET enable_partition_pruning TO on;
+DELETE FROM pt WHERE false;
+UPDATE pt SET b = 'x' WHERE false;
+MERGE INTO pt t USING (VALUES (1, 'x'::text)) AS s(a, b)
+  ON false WHEN MATCHED THEN UPDATE SET b = s.b;
+
 DROP TABLE pt;
 
 -- generated column tests
diff --git a/contrib/gb18030_2022/.gitignore b/contrib/gb18030_2022/.gitignore
new file mode 100644
index 00000000000..4e85009fe53
--- /dev/null
+++ b/contrib/gb18030_2022/.gitignore
@@ -0,0 +1,4 @@
+# Generated files
+# Generated subdirectories
+/log/
+/results/
diff --git a/contrib/gb18030_2022/Maps/UCS_to_GB18030.pl b/contrib/gb18030_2022/Maps/UCS_to_GB18030.pl
index 9d20bb2b6b2..65ff22b997e 100644
--- a/contrib/gb18030_2022/Maps/UCS_to_GB18030.pl
+++ b/contrib/gb18030_2022/Maps/UCS_to_GB18030.pl
@@ -10,7 +10,7 @@
 # 	http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/
 #
 #
-#  Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+#  Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # Identification:
 #		contrib/gb18030_2022/Maps/UCS_to_GB18030.pl
@@ -53,4 +53,4 @@
 }
 close($in);
 
-print_conversion_tables($this_script, "GB18030_2022", \@mapping);
\ No newline at end of file
+print_conversion_tables($this_script, "GB18030_2022", \@mapping);
diff --git a/contrib/gb18030_2022/Maps/convutils.pm b/contrib/gb18030_2022/Maps/convutils.pm
index 5bafdff1f89..a2f74e371d1 100644
--- a/contrib/gb18030_2022/Maps/convutils.pm
+++ b/contrib/gb18030_2022/Maps/convutils.pm
@@ -1,6 +1,6 @@
 # ------------------------------------------------ 
 #
-#  Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+#  Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # Identification:
 #		contrib/gb18030_2022/Maps/convutils.pm
diff --git a/contrib/gb18030_2022/Maps/gb-18030-2022.xml b/contrib/gb18030_2022/Maps/gb-18030-2022.xml
index f4190cb1a87..5623b376f1e 100644
--- a/contrib/gb18030_2022/Maps/gb-18030-2022.xml
+++ b/contrib/gb18030_2022/Maps/gb-18030-2022.xml
@@ -63544,4 +63544,4 @@
   <range uFirst="FFE6" uLast="FFFF"  bFirst="84 31 A2 34" bLast="84 31 A4 39"  bMin="81 30 81 30" bMax="FE 39 FE 39"/>
   <range uFirst="10000" uLast="10FFFF"  bFirst="90 30 81 30" bLast="E3 32 9A 35"  bMin="81 30 81 30" bMax="FE 39 FE 39"/>
  </assignments>
-</characterMapping>
\ No newline at end of file
+</characterMapping>
diff --git a/contrib/gb18030_2022/expected/gb18030_2022_and_utf8_1.out b/contrib/gb18030_2022/expected/gb18030_2022_and_utf8_1.out
index 4a2bbd0b044..c918341b4f0 100644
--- a/contrib/gb18030_2022/expected/gb18030_2022_and_utf8_1.out
+++ b/contrib/gb18030_2022/expected/gb18030_2022_and_utf8_1.out
@@ -962,4 +962,4 @@ show shared_preload_libraries;
  ivorysql_ora | 1.0     | sys        | Oracle Compatible extenison on Postgres Database
  plisql       | 1.0     | pg_catalog | PL/iSQL procedural language
  plpgsql      | 1.0     | pg_catalog | PL/pgSQL procedural language
-(4 rows)
\ No newline at end of file
+(4 rows)
diff --git a/contrib/gb18030_2022/gb18030_2022--1.0.sql b/contrib/gb18030_2022/gb18030_2022--1.0.sql
index acd690d3724..9dac5306c68 100644
--- a/contrib/gb18030_2022/gb18030_2022--1.0.sql
+++ b/contrib/gb18030_2022/gb18030_2022--1.0.sql
@@ -1,4 +1,4 @@
 /* contrib/gb18030_2022/gb18030_2022--1.0.sql */
 --complain if script is sourced in psql rather than via ALTER EXTENSION
 \echo Use "CREATE EXTENSION gb18030_2022" to load this file. \quit
-LOAD 'gb18030_2022';
\ No newline at end of file
+LOAD 'gb18030_2022';
diff --git a/contrib/gb18030_2022/gb18030_2022.control b/contrib/gb18030_2022/gb18030_2022.control
index 7e6ca22e03f..e26cd737199 100644
--- a/contrib/gb18030_2022/gb18030_2022.control
+++ b/contrib/gb18030_2022/gb18030_2022.control
@@ -3,4 +3,4 @@ default_version = '1.0'
 module_pathname = '$libdir/gb18030_2022'
 relocatable = false
 schema = pg_catalog
-trusted = true
\ No newline at end of file
+trusted = true
diff --git a/contrib/gb18030_2022/meson.build b/contrib/gb18030_2022/meson.build
index 9342ca10273..148341a04d1 100644
--- a/contrib/gb18030_2022/meson.build
+++ b/contrib/gb18030_2022/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 gb18030_2022_src_files = files(
   'utf8_and_gb18030_2022.c'
diff --git a/contrib/gb18030_2022/sql/copy.sql b/contrib/gb18030_2022/sql/copy.sql
index 78fb0afcec9..1fd566fdea6 100644
--- a/contrib/gb18030_2022/sql/copy.sql
+++ b/contrib/gb18030_2022/sql/copy.sql
@@ -39,4 +39,4 @@ select * from copy_csv_18030;
 drop table copy_csv_18030;
 
 \c postgres
-drop database gb18030_copy;
\ No newline at end of file
+drop database gb18030_copy;
diff --git a/contrib/gb18030_2022/utf8_and_gb18030_2022.c b/contrib/gb18030_2022/utf8_and_gb18030_2022.c
index 9c1a0e355e4..80eee6716fe 100644
--- a/contrib/gb18030_2022/utf8_and_gb18030_2022.c
+++ b/contrib/gb18030_2022/utf8_and_gb18030_2022.c
@@ -6,7 +6,7 @@
  * 		support encoding conversion between gb18030_2022 and utf8 using radix tree in ./Maps/\*.map.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		contrib/gb18030_2022
@@ -22,8 +22,8 @@
 
 PG_MODULE_MAGIC;
 
-gb18030_2022_to_utf8_hook_type pre_gb18030_2022_to_utf8_hook = NULL;
-utf8_to_gb18030_2022_hook_type pre_utf8_to_gb18030_2022_hook = NULL;
+static gb18030_2022_to_utf8_hook_type pre_gb18030_2022_to_utf8_hook = NULL;
+static utf8_to_gb18030_2022_hook_type pre_utf8_to_gb18030_2022_hook = NULL;
 
 int gb18030_2022_to_utf8(const unsigned char *iso, int len,
 								unsigned char *utf, bool noError);
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 4f867e4bd1f..fece61e293b 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -67,7 +67,7 @@ prssyntaxerror(HSParser *state)
 	errsave(state->escontext,
 			(errcode(ERRCODE_SYNTAX_ERROR),
 			 errmsg("syntax error in hstore, near \"%.*s\" at position %d",
-					pg_mblen(state->ptr), state->ptr,
+					pg_mblen_cstr(state->ptr), state->ptr,
 					(int) (state->ptr - state->begin))));
 	/* In soft error situation, return false as convenience for caller */
 	return false;
@@ -385,7 +385,8 @@ hstoreUniquePairs(Pairs *a, int32 l, int32 *buflen)
 			if (ptr->needfree)
 			{
 				pfree(ptr->key);
-				pfree(ptr->val);
+				if (ptr->val != NULL)
+					pfree(ptr->val);
 			}
 		}
 		else
diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
index 31393b4fa50..2727a5f2ceb 100644
--- a/contrib/hstore_plperl/hstore_plperl.c
+++ b/contrib/hstore_plperl/hstore_plperl.c
@@ -121,7 +121,7 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
 
 	pcount = hv_iterinit(hv);
 
-	pairs = palloc(pcount * sizeof(Pairs));
+	pairs = palloc_array(Pairs, pcount);
 
 	i = 0;
 	while ((he = hv_iternext(hv)))
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index e2bfc6da38e..b0af13945bb 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -150,7 +150,7 @@ plpython_to_hstore(PG_FUNCTION_ARGS)
 		Py_ssize_t	i;
 		Pairs	   *pairs;
 
-		pairs = palloc(pcount * sizeof(*pairs));
+		pairs = palloc_array(Pairs, pcount);
 
 		for (i = 0; i < pcount; i++)
 		{
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 2b2c3f4029e..26ba0b8a3b6 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -434,37 +434,77 @@ boolop(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(result);
 }
 
-static void
-findoprnd(ITEM *ptr, int32 *pos)
+/*
+ * Recursively fill the "left" fields of an ITEM array that represents
+ * a valid postfix tree.
+ *
+ *	state: only needed for error reporting
+ *	ptr: starting element of array
+ *	pos: in/out argument, the array index this call is responsible to fill
+ *
+ * At exit, *pos has been decremented to point before the sub-tree whose
+ * top is the entry-time value of *pos.
+ *
+ * Returns true if okay, false if error (the only possible error is
+ * overflow of a "left" field).
+ */
+static bool
+findoprnd(WORKSTATE *state, ITEM *ptr, int32 *pos)
 {
+	int32		mypos;
+
 	/* since this function recurses, it could be driven to stack overflow. */
 	check_stack_depth();
 
+	/* get the position this call is supposed to update */
+	mypos = *pos;
+	Assert(mypos >= 0);
+
+	/* in all cases, we should decrement *pos to advance over this item */
+	(*pos)--;
+
 #ifdef BS_DEBUG
-	elog(DEBUG3, (ptr[*pos].type == OPR) ?
-		 "%d  %c" : "%d  %d", *pos, ptr[*pos].val);
+	elog(DEBUG3, (ptr[mypos].type == OPR) ?
+		 "%d  %c" : "%d  %d", mypos, ptr[mypos].val);
 #endif
-	if (ptr[*pos].type == VAL)
+
+	if (ptr[mypos].type == VAL)
 	{
-		ptr[*pos].left = 0;
-		(*pos)--;
+		/* base case: a VAL has no operand, so just set its left to zero */
+		ptr[mypos].left = 0;
 	}
-	else if (ptr[*pos].val == (int32) '!')
+	else if (ptr[mypos].val == (int32) '!')
 	{
-		ptr[*pos].left = -1;
-		(*pos)--;
-		findoprnd(ptr, pos);
+		/* unary operator, likewise easy: operand is just before it */
+		ptr[mypos].left = -1;
+		/* recurse to scan operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
 	}
 	else
 	{
-		ITEM	   *curitem = &ptr[*pos];
-		int32		tmp = *pos;
+		/* binary operator */
+		int32		delta;
 
-		(*pos)--;
-		findoprnd(ptr, pos);
-		curitem->left = *pos - tmp;
-		findoprnd(ptr, pos);
+		/* recurse to scan right operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
+		/* we must fill left with offset to left operand's top */
+		/* abs(delta) < QUERYTYPEMAXITEMS, so it can't overflow ... */
+		delta = *pos - mypos;
+		/* ... but it might be too large to fit in the 16-bit left field */
+		Assert(delta < 0);
+		if (unlikely(delta < PG_INT16_MIN))
+			ereturn(state->escontext, false,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("query_int expression is too complex")));
+		ptr[mypos].left = (int16) delta;
+		/* recurse to scan left operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
 	}
+
+	return true;
 }
 
 
@@ -515,6 +555,7 @@ bqarr_in(PG_FUNCTION_ARGS)
 	query->size = state.num;
 	ptr = GETQUERY(query);
 
+	/* fill the query array from the data makepol constructed */
 	for (i = state.num - 1; i >= 0; i--)
 	{
 		ptr[i].type = state.str->type;
@@ -524,8 +565,13 @@ bqarr_in(PG_FUNCTION_ARGS)
 		state.str = tmp;
 	}
 
+	/* now fill the "left" fields */
 	pos = query->size - 1;
-	findoprnd(ptr, &pos);
+	if (!findoprnd(&state, ptr, &pos))
+		PG_RETURN_NULL();
+	/* if successful, findoprnd should have scanned the whole array */
+	Assert(pos == -1);
+
 #ifdef BS_DEBUG
 	initStringInfo(&pbuf);
 	for (i = 0; i < query->size; i++)
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index 6c3b7ace146..60fd163668f 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -19,6 +19,7 @@
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
+#include "commands/extension.h"
 #include "miscadmin.h"
 #include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
@@ -170,14 +171,25 @@ _int_matchsel(PG_FUNCTION_ARGS)
 		PG_RETURN_FLOAT8(0.0);
 	}
 
-	/* The caller made sure the const is a query, so get it now */
+	/*
+	 * Verify that the Const is a query_int, else return a default estimate.
+	 * (This could only fail if someone attached this estimator to the wrong
+	 * operator.)
+	 */
+	if (((Const *) other)->consttype !=
+		get_function_sibling_type(fcinfo->flinfo->fn_oid, "query_int"))
+	{
+		ReleaseVariableStats(vardata);
+		PG_RETURN_FLOAT8(DEFAULT_EQ_SEL);
+	}
+
 	query = DatumGetQueryTypeP(((Const *) other)->constvalue);
 
 	/* Empty query matches nothing */
 	if (query->size == 0)
 	{
 		ReleaseVariableStats(vardata);
-		return (Selectivity) 0.0;
+		PG_RETURN_FLOAT8(0.0);
 	}
 
 	/*
@@ -326,7 +338,12 @@ static int
 compare_val_int4(const void *a, const void *b)
 {
 	int32		key = *(int32 *) a;
-	const Datum *t = (const Datum *) b;
+	int32		value = DatumGetInt32(*(const Datum *) b);
 
-	return key - DatumGetInt32(*t);
+	if (key < value)
+		return -1;
+	else if (key > value)
+		return 1;
+	else
+		return 0;
 }
diff --git a/contrib/ivorysql_ora/.gitignore b/contrib/ivorysql_ora/.gitignore
new file mode 100644
index 00000000000..7da67cb0cc9
--- /dev/null
+++ b/contrib/ivorysql_ora/.gitignore
@@ -0,0 +1,5 @@
+# Generated files
+/ivorysql_ora--1.0.sql
+# Generated subdirectories
+/log/
+/results/
diff --git a/contrib/ivorysql_ora/expected/ora_datetime.out b/contrib/ivorysql_ora/expected/ora_datetime.out
index a21a9ad638d..dd1435e4148 100644
--- a/contrib/ivorysql_ora/expected/ora_datetime.out
+++ b/contrib/ivorysql_ora/expected/ora_datetime.out
@@ -280,7 +280,7 @@ CREATE INDEX TEST_DATE_BRIN ON TEST_DATE USING BRIN (A);
 -- Build tables and test 'NLS_TIMESTAMP_FORMAT' parameter, don't do the validity check.
 CREATE TABLE TEST_TIMESTAMP(a TIMESTAMP);
 SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS.FF9';
--- effective number of fractional seconds is 6,the part of excess is 0
+-- effective number of fractional seconds is 6, the part of excess is 0
 INSERT INTO TEST_TIMESTAMP VALUES('1990-1-19 11:11:11.123456789');
 INSERT INTO TEST_TIMESTAMP VALUES('1990-2-19');		-- hour、minute、second、fractional second is zero.
 INSERT INTO TEST_TIMESTAMP VALUES('1990-2-19 11:11:11');
@@ -550,7 +550,7 @@ CREATE INDEX TEST_TIMESTAMP_BRIN ON TEST_TIMESTAMP USING BRIN (A);
 -- Build tables and test 'NLS_TIMESTAMP_TZ_FORMAT' parameter, don't do the validity check.
 CREATE TABLE TEST_TIMESTAMPTZ(a TIMESTAMP WITH TIME ZONE);
 SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF9';
--- effective number of fractional seconds is 6,the part of excess is 0
+-- effective number of fractional seconds is 6, the part of excess is 0
 INSERT INTO TEST_TIMESTAMPTZ VALUES('1990-1-19 11:11:11.123456789');
 INSERT INTO TEST_TIMESTAMPTZ VALUES('1990-2-19');		-- hour、minute、second、fractional second is zero.
 INSERT INTO TEST_TIMESTAMPTZ VALUES('1990-2-19 11:11:11');
diff --git a/contrib/ivorysql_ora/expected/ora_datetime_datatype_functions.out b/contrib/ivorysql_ora/expected/ora_datetime_datatype_functions.out
index 1c782bab721..a4159256839 100644
--- a/contrib/ivorysql_ora/expected/ora_datetime_datatype_functions.out
+++ b/contrib/ivorysql_ora/expected/ora_datetime_datatype_functions.out
@@ -1739,10 +1739,10 @@ select * from timestpwtz_tb;
 drop table timestpwtz_tb;
 alter session set NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH.MI.SS.FF5 AM';
 CREATE TABLE timestp_tb(timestp_clo timestamp(7));
-WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6,the part of excess is 0
+WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6, the part of excess is 0
 LINE 1: CREATE TABLE timestp_tb(timestp_clo timestamp(7));
                                             ^
-WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6,the part of excess is 0
+WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6, the part of excess is 0
 insert into timestp_tb values ('2022-08-19 03.37.05 PM');
 select * from timestp_tb;
          timestp_clo          
diff --git a/contrib/ivorysql_ora/gensql.pl b/contrib/ivorysql_ora/gensql.pl
index a5b153e9046..c987e31bb48 100755
--- a/contrib/ivorysql_ora/gensql.pl
+++ b/contrib/ivorysql_ora/gensql.pl
@@ -21,7 +21,7 @@
 #    specified by DATA in Makefile usings SQL files specified
 #    in ivorysql_ora_merge_sqls.
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # Identification:
 #     contrib/ivorysql_ora/gensql.pl
diff --git a/contrib/ivorysql_ora/meson.build b/contrib/ivorysql_ora/meson.build
index d16cba8d7bd..e7f9541c7e7 100644
--- a/contrib/ivorysql_ora/meson.build
+++ b/contrib/ivorysql_ora/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 ivorysql_ora_sources = files(
   'src/ivorysql_ora.c',
diff --git a/contrib/ivorysql_ora/preload_ora_misc.sql b/contrib/ivorysql_ora/preload_ora_misc.sql
index 6f90c62c472..f9522823c8c 100644
--- a/contrib/ivorysql_ora/preload_ora_misc.sql
+++ b/contrib/ivorysql_ora/preload_ora_misc.sql
@@ -6,7 +6,9 @@ insert into dual values('X');
 GRANT SELECT ON dual TO PUBLIC;
 
 --
--- ROWID type
+-- Oracle-compatible ROWID and UROWID types
+-- ROWID: Composite type containing row object ID and row number
+-- UROWID: Universal ROWID, compatible with ROWID
 --
 CREATE TYPE sys.rowid AS(rowoid OID, rowno bigint);
 CREATE TYPE sys.urowid AS(rowoid OID, rowno bigint);
diff --git a/contrib/ivorysql_ora/sql/ora_datetime.sql b/contrib/ivorysql_ora/sql/ora_datetime.sql
index 138ef43cb09..1c3850a34a1 100644
--- a/contrib/ivorysql_ora/sql/ora_datetime.sql
+++ b/contrib/ivorysql_ora/sql/ora_datetime.sql
@@ -143,7 +143,7 @@ CREATE TABLE TEST_TIMESTAMP(a TIMESTAMP);
 
 SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS.FF9';
 
--- effective number of fractional seconds is 6,the part of excess is 0
+-- effective number of fractional seconds is 6, the part of excess is 0
 INSERT INTO TEST_TIMESTAMP VALUES('1990-1-19 11:11:11.123456789');
 
 INSERT INTO TEST_TIMESTAMP VALUES('1990-2-19');		-- hour、minute、second、fractional second is zero.
@@ -276,7 +276,7 @@ CREATE TABLE TEST_TIMESTAMPTZ(a TIMESTAMP WITH TIME ZONE);
 SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF9';
 
 
--- effective number of fractional seconds is 6,the part of excess is 0
+-- effective number of fractional seconds is 6, the part of excess is 0
 INSERT INTO TEST_TIMESTAMPTZ VALUES('1990-1-19 11:11:11.123456789');
 
 INSERT INTO TEST_TIMESTAMPTZ VALUES('1990-2-19');		-- hour、minute、second、fractional second is zero.
diff --git a/contrib/ivorysql_ora/src/builtin_functions/builtin_functions--1.0.sql b/contrib/ivorysql_ora/src/builtin_functions/builtin_functions--1.0.sql
index af9b87b862a..c4f6b5a2354 100644
--- a/contrib/ivorysql_ora/src/builtin_functions/builtin_functions--1.0.sql
+++ b/contrib/ivorysql_ora/src/builtin_functions/builtin_functions--1.0.sql
@@ -970,7 +970,7 @@ IMMUTABLE;
  */
 /* SESSIONID */
 CREATE SEQUENCE sys.userenv_sessionid_sequence;
-GRANT ALL ON SEQUENCE sys.userenv_sessionid_sequence to public;
+GRANT SELECT, USAGE ON SEQUENCE sys.userenv_sessionid_sequence TO public;
 
 CREATE OR REPLACE FUNCTION sys.get_sessionid() RETURNS number AS $$
 DECLARE
@@ -1228,159 +1228,159 @@ AS $$
 $$ LANGUAGE SQL IMMUTABLE STRICT;
 
 /* Begin - SYS_CONTEXT */
-create or replace function sys.sys_context(a varchar2, b varchar2)
-return varchar2 as $$
-declare
+CREATE OR REPLACE FUNCTION sys.sys_context(a varchar2, b varchar2)
+RETURNS varchar2 AS $$
+DECLARE
 	res varchar2;
-begin
-	if upper(a) = 'USERENV' then
-	  case upper(b)
-		  when 'CURRENT_SCHEMA' then
-			select current_schema() into res;
-		  when 'CURRENT_SCHEMAID' then
-		  	select current_schema()::regnamespace::oid into res;
-		  when 'SESSION_USER' then
-			select session_user into res;
-		  when 'SESSION_USERID' then
-		  	select session_user::regrole::oid into res;
-		  when 'PROXY_USER' then
-		  	select session_user into res;
-		  when 'PROXY_USERID' then
-		  	select session_user::regrole::oid into res;
-		  when 'CURRENT_USER' then
-		    select current_user into res;
-		  when 'CURRENT_USERID' then
-		  	select current_user::regrole::oid into res;
-		  when 'CURRENT_EDITION_NAME' then
-		  	select version() into res;
-		  when 'CLIENT_PROGRAM_NAME' then
-		  	select application_name into res from pg_stat_activity where pid = pg_backend_pid();
-		  when 'IP_ADDRESS' then
-		    select client_addr into res from pg_stat_activity where pid = pg_backend_pid();
-		  when 'HOST' then
-		  	select client_hostname into res from pg_stat_activity where pid = pg_backend_pid();
-		  when 'ISDBA' then
-		  	select sys.get_isdba() into res;
-		  when 'LANGUAGE' then
-		  	select sys.get_language() into res;
-		  when 'LANG' then
-		  	select sys.get_lang() into res;
-		  when 'NLS_CURRENCY' then
-		  	select null into res;-- show nls_currency into res;
-		  when 'NLS_DATE_FORMAT' then
-		  	show nls_date_format into res;
-		  when 'NLS_DATE_LANGUAGE' then
-		  	select null into res;-- show nls_iso_currency into res;
-		  when 'NLS_SORT' then
-		  	select null into res;-- show nls_sort into res;
-		  when 'NLS_TERRITORY' then
-		  	select null into res;-- show nls_territory into res;
-		  when 'ORACLE_HOME' then
-		  	show data_directory into res;
-		  when 'PLATFORM_SLASH' then 
-		  	select 
-				case
-					when substring((select setting from pg_settings where name = 'data_directory') from 1 for 1) = '/' then 'LINUX'
-					else 'WINDOWS'
-				end into res;
-		  when 'DB_NAME' then
-		  	select current_database into res;
-		  when 'SESSION_DEFAULT_COLLATION' then
-		  	select null into res;-- show default_collation into res;
-		  when 'SID' then
-		  	select sys.get_sid() into res;
-		  when 'ACTION' then select NULL into res;
-		  when 'IS_APPLICATION_ROOT' then select NULL into res;
-		  when 'IS_APPLICATION_PDB' then select NULL into res;
-		  when 'AUDITED_CURSORID' then select NULL into res;
-		  when 'AUTHENTICATED_IDENTITY' then select NULL into res;
-		  when 'AUTHENTICATION_DATA' then select NULL into res;
-		  when 'AUTHENTICATION_METHOD' then select NULL into res;
-		  when 'BG_JOB_ID' then select NULL into res;
-		  when 'CDB_DOMAIN' then select NULL into res;
-		  when 'CDB_NAME' then select NULL into res;
-		  when 'CLIENT_IDENTIFIER' then select NULL into res;
-		  when 'CLIENT_INFO' then
-		  	select sys.get_client_info() into res;
-		  when 'CON_ID' then select NULL into res;
-		  when 'CON_NAME' then select NULL into res;
-		  when 'CURRENT_BIND' then select NULL into res;
-		  when 'CURRENT_EDITION_ID' then select NULL into res;
-		  when 'CURRENT_SQL' then select NULL into res;
-		  when 'CURRENT_SQL1' then select NULL into res;
-		  when 'CURRENT_SQL2' then select NULL into res;
-		  when 'CURRENT_SQL3' then select NULL into res;
-		  when 'CURRENT_SQL4' then select NULL into res;
-		  when 'CURRENT_SQL5' then select NULL into res;
-		  when 'CURRENT_SQL6' then select NULL into res;
-		  when 'CURRENT_SQL7' then select NULL into res;
-		  when 'CURRENT_SQL_LENGTH' then select NULL into res;
-		  when 'DATABASE_ROLE' then select NULL into res;
-		  when 'DB_DOMAIN' then select NULL into res;
-		  when 'DB_SUPPLEMENTAL_LOG_LEVEL' then select NULL into res;
-		  when 'DB_UNIQUE_NAME' then select NULL into res;
-		  when 'DBLINK_INFO' then select NULL into res;
-		  when 'DRAIN_STATUS' then select NULL into res;
-		  when 'ENTRYID' then
-		  	select sys.get_entryid() into res;
-		  when 'ENTERPRISE_IDENTITY' then select NULL into res;
-		  when 'FG_JOB_ID' then select NULL into res;
-		  when 'GLOBAL_CONTEXT_MEMORY' then select NULL into res;
-		  when 'GLOBAL_UID' then select NULL into res;
-		  when 'IDENTIFICATION_TYPE' then select NULL into res;
-		  when 'INSTANCE' then select NULL into res;
-		  when 'INSTANCE_NAME' then select NULL into res;
-		  when 'IS_APPLY_SERVER' then select 'FALSE' into res;
-		  when 'IS_DG_ROLLING_UPGRADE' then select 'FALSE' into res;
-		  when 'LDAP_SERVER_TYPE' then select NULL into res;
-		  when 'MODULE' then select NULL into res;
-		  when 'NETWORK_PROTOCOL' then select NULL into res;
-		  when 'NLS_CALENDAR' then select NULL into res;
-		  when 'OS_USER' then select NULL into res;
-		  when 'POLICY_INVOKER' then select NULL into res;
-		  when 'PROXY_ENTERPRISE_IDENTITY' then select NULL into res;
-		  when 'SCHEDULER_JOB' then select NULL into res;
-		  when 'SERVER_HOST' then select NULL into res;
-		  when 'SERVICE_NAME' then select NULL into res;
-		  when 'SESSION_EDITION_ID' then select NULL into res;
-		  when 'SESSION_EDITION_NAME' then select NULL into res;
-		  when 'SESSIONID' then
-		  	select sys.get_sessionid() into res;
-		  when 'STATEMENTID' then select NULL into res;
-		  when 'TERMINAL' then
-		  	select sys.get_terminal() into res;
-		  when 'UNIFIED_AUDIT_SESSIONID' then select NULL into res;
-		  else
-		  	RAISE EXCEPTION 'invalid USERENV parameter: %', b;
-	  end case;
-	elsif upper(a) = 'SYS_SESSION_ROLES' then
-		case upper(b)
-			when 'DBA' then
-				select sys.get_isdba() into res;
-			when 'LOGIN' then
-				select case when rolcanlogin = 't' then 'TRUE' else 'FALSE' end into res from pg_roles where oid = current_user::regrole::oid;
-			when 'CREATEROLE' then
-				select case when rolcreaterole = 't' then 'TRUE' else 'FALSE' end into res from pg_roles where oid = current_user::regrole::oid;
-			when 'CREATEDB' then
-				select case when rolcreatedb = 't' then 'TRUE' else 'FALSE' end into res from pg_roles where oid = current_user::regrole::oid;
-			else
+BEGIN
+	IF upper(a) = 'USERENV' THEN
+	  CASE upper(b)
+		  WHEN 'CURRENT_SCHEMA' THEN
+			SELECT current_schema() INTO res;
+		  WHEN 'CURRENT_SCHEMAID' THEN
+			SELECT current_schema()::regnamespace::oid INTO res;
+		  WHEN 'SESSION_USER' THEN
+			SELECT session_user INTO res;
+		  WHEN 'SESSION_USERID' THEN
+			SELECT session_user::regrole::oid INTO res;
+		  WHEN 'PROXY_USER' THEN
+			SELECT session_user INTO res;
+		  WHEN 'PROXY_USERID' THEN
+			SELECT session_user::regrole::oid INTO res;
+		  WHEN 'CURRENT_USER' THEN
+		    SELECT current_user INTO res;
+		  WHEN 'CURRENT_USERID' THEN
+			SELECT current_user::regrole::oid INTO res;
+		  WHEN 'CURRENT_EDITION_NAME' THEN
+			SELECT version() INTO res;
+		  WHEN 'CLIENT_PROGRAM_NAME' THEN
+			SELECT application_name INTO res FROM pg_stat_activity WHERE pid = pg_backend_pid();
+		  WHEN 'IP_ADDRESS' THEN
+		    SELECT client_addr INTO res FROM pg_stat_activity WHERE pid = pg_backend_pid();
+		  WHEN 'HOST' THEN
+			SELECT client_hostname INTO res FROM pg_stat_activity WHERE pid = pg_backend_pid();
+		  WHEN 'ISDBA' THEN
+			SELECT sys.get_isdba() INTO res;
+		  WHEN 'LANGUAGE' THEN
+			SELECT sys.get_language() INTO res;
+		  WHEN 'LANG' THEN
+			SELECT sys.get_lang() INTO res;
+		  WHEN 'NLS_CURRENCY' THEN
+			SELECT null INTO res;
+		  WHEN 'NLS_DATE_FORMAT' THEN
+			SELECT current_setting('nls_date_format') INTO res;
+		  WHEN 'NLS_DATE_LANGUAGE' THEN
+			SELECT null INTO res;
+		  WHEN 'NLS_SORT' THEN
+			SELECT null INTO res;
+		  WHEN 'NLS_TERRITORY' THEN
+			SELECT null INTO res;
+		  WHEN 'ORACLE_HOME' THEN
+			SELECT current_setting('data_directory') INTO res;
+		  WHEN 'PLATFORM_SLASH' THEN
+			SELECT
+				CASE
+					WHEN substring((SELECT setting FROM pg_settings WHERE name = 'data_directory') FROM 1 for 1) = '/' THEN 'LINUX'
+					ELSE 'WINDOWS'
+				END INTO res;
+		  WHEN 'DB_NAME' THEN
+			SELECT current_database() INTO res;
+		  WHEN 'SESSION_DEFAULT_COLLATION' THEN
+			SELECT null INTO res;
+		  WHEN 'SID' THEN
+			SELECT sys.get_sid() INTO res;
+		  WHEN 'ACTION' THEN SELECT NULL INTO res;
+		  WHEN 'IS_APPLICATION_ROOT' THEN SELECT NULL INTO res;
+		  WHEN 'IS_APPLICATION_PDB' THEN SELECT NULL INTO res;
+		  WHEN 'AUDITED_CURSORID' THEN SELECT NULL INTO res;
+		  WHEN 'AUTHENTICATED_IDENTITY' THEN SELECT NULL INTO res;
+		  WHEN 'AUTHENTICATION_DATA' THEN SELECT NULL INTO res;
+		  WHEN 'AUTHENTICATION_METHOD' THEN SELECT NULL INTO res;
+		  WHEN 'BG_JOB_ID' THEN SELECT NULL INTO res;
+		  WHEN 'CDB_DOMAIN' THEN SELECT NULL INTO res;
+		  WHEN 'CDB_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'CLIENT_IDENTIFIER' THEN SELECT NULL INTO res;
+		  WHEN 'CLIENT_INFO' THEN
+			SELECT sys.get_client_info() INTO res;
+		  WHEN 'CON_ID' THEN SELECT NULL INTO res;
+		  WHEN 'CON_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_BIND' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_EDITION_ID' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL1' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL2' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL3' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL4' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL5' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL6' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL7' THEN SELECT NULL INTO res;
+		  WHEN 'CURRENT_SQL_LENGTH' THEN SELECT NULL INTO res;
+		  WHEN 'DATABASE_ROLE' THEN SELECT NULL INTO res;
+		  WHEN 'DB_DOMAIN' THEN SELECT NULL INTO res;
+		  WHEN 'DB_SUPPLEMENTAL_LOG_LEVEL' THEN SELECT NULL INTO res;
+		  WHEN 'DB_UNIQUE_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'DBLINK_INFO' THEN SELECT NULL INTO res;
+		  WHEN 'DRAIN_STATUS' THEN SELECT NULL INTO res;
+		  WHEN 'ENTRYID' THEN
+			SELECT sys.get_entryid() INTO res;
+		  WHEN 'ENTERPRISE_IDENTITY' THEN SELECT NULL INTO res;
+		  WHEN 'FG_JOB_ID' THEN SELECT NULL INTO res;
+		  WHEN 'GLOBAL_CONTEXT_MEMORY' THEN SELECT NULL INTO res;
+		  WHEN 'GLOBAL_UID' THEN SELECT NULL INTO res;
+		  WHEN 'IDENTIFICATION_TYPE' THEN SELECT NULL INTO res;
+		  WHEN 'INSTANCE' THEN SELECT NULL INTO res;
+		  WHEN 'INSTANCE_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'IS_APPLY_SERVER' THEN SELECT 'FALSE' INTO res;
+		  WHEN 'IS_DG_ROLLING_UPGRADE' THEN SELECT 'FALSE' INTO res;
+		  WHEN 'LDAP_SERVER_TYPE' THEN SELECT NULL INTO res;
+		  WHEN 'MODULE' THEN SELECT NULL INTO res;
+		  WHEN 'NETWORK_PROTOCOL' THEN SELECT NULL INTO res;
+		  WHEN 'NLS_CALENDAR' THEN SELECT NULL INTO res;
+		  WHEN 'OS_USER' THEN SELECT NULL INTO res;
+		  WHEN 'POLICY_INVOKER' THEN SELECT NULL INTO res;
+		  WHEN 'PROXY_ENTERPRISE_IDENTITY' THEN SELECT NULL INTO res;
+		  WHEN 'SCHEDULER_JOB' THEN SELECT NULL INTO res;
+		  WHEN 'SERVER_HOST' THEN SELECT NULL INTO res;
+		  WHEN 'SERVICE_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'SESSION_EDITION_ID' THEN SELECT NULL INTO res;
+		  WHEN 'SESSION_EDITION_NAME' THEN SELECT NULL INTO res;
+		  WHEN 'SESSIONID' THEN
+			SELECT sys.get_sessionid() INTO res;
+		  WHEN 'STATEMENTID' THEN SELECT NULL INTO res;
+		  WHEN 'TERMINAL' THEN
+			SELECT sys.get_terminal() INTO res;
+		  WHEN 'UNIFIED_AUDIT_SESSIONID' THEN SELECT NULL INTO res;
+		  ELSE
+			RAISE EXCEPTION 'invalid USERENV parameter: %', b;
+	  END CASE;
+	ELSIF upper(a) = 'SYS_SESSION_ROLES' THEN
+		CASE upper(b)
+			WHEN 'DBA' THEN
+				SELECT sys.get_isdba() INTO res;
+			WHEN 'LOGIN' THEN
+				SELECT CASE WHEN rolcanlogin = 't' THEN 'TRUE' ELSE 'FALSE' END INTO res FROM pg_roles WHERE oid = current_user::regrole::oid;
+			WHEN 'CREATEROLE' THEN
+				SELECT CASE WHEN rolcreaterole = 't' THEN 'TRUE' ELSE 'FALSE' END INTO res FROM pg_roles WHERE oid = current_user::regrole::oid;
+			WHEN 'CREATEDB' THEN
+				SELECT CASE WHEN rolcreatedb = 't' THEN 'TRUE' ELSE 'FALSE' END INTO res FROM pg_roles WHERE oid = current_user::regrole::oid;
+			ELSE
 				RAISE EXCEPTION 'invalid SYS_SESSION_ROLES parameter: %', b;
-		end case;
- 	else
-	  select current_setting(a||'.'||b, true) into res;
-	end if;
-	return res;
-end;
+		END CASE;
+	ELSE
+	  SELECT current_setting(a||'.'||b, true) INTO res;
+	END IF;
+	RETURN res;
+END;
 $$ LANGUAGE plisql SECURITY INVOKER;
 
 
-create or replace function sys.sys_context(a varchar2, b varchar2, c number)
-return varchar2 as $$
-declare
+CREATE or REPLACE FUNCTION sys.sys_context(a varchar2, b varchar2, c number)
+RETURNS varchar2 AS $$
+DECLARE
 	res varchar2;
-begin
-	select left(sys.sys_context(a, b), c::integer) into res;
-	return res;
-end;
+BEGIN
+	SELECT left(sys.sys_context(a, b), c::integer) INTO res;
+	RETURN res;
+END;
 $$ LANGUAGE plisql SECURITY INVOKER;
 /* End - SYS_CONTEXT */
diff --git a/contrib/ivorysql_ora/src/builtin_functions/character_datatype_functions.c b/contrib/ivorysql_ora/src/builtin_functions/character_datatype_functions.c
index 609e4082f05..74bb01d1be8 100644
--- a/contrib/ivorysql_ora/src/builtin_functions/character_datatype_functions.c
+++ b/contrib/ivorysql_ora/src/builtin_functions/character_datatype_functions.c
@@ -18,7 +18,7 @@
  * This file contains the implementation of Oracle's
  * character data type related built-in functions.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/builtin_functions/character_datatype_functions.c
  *
diff --git a/contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c b/contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c
index 3f8128df410..b814a30bdc5 100644
--- a/contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c
+++ b/contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * This file contains the implementation of Oracle's
  * datetime data type related built-in functions.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c
  *
@@ -104,7 +104,7 @@ do { \
 #define ROUND_MDAY(_tm_) \
 	do { if (rounded) _tm_->tm_mday += _tm_->tm_hour >= 12?1:0; } while(0)
 
-	/* Note: this is used to copy pg_tm to fmt_tm, so not quite a bitwise copy */
+ /* Note: this is used to copy pg_tm to fmt_tm, so not quite a bitwise copy */
 #define COPY_tm(_DST, _SRC) \
 	do {	\
 		(_DST)->tm_sec = (_SRC)->tm_sec; \
@@ -122,38 +122,38 @@ typedef struct WeekDays
 {
 	int			encoding;
 	const char *names[7];
-} WeekDays;
+}			WeekDays;
 
 static const WeekDays WEEKDAYS[] =
 {
-	{ PG_UTF8,
-	 {"\xe6\x98\x9f\xe6\x9c\x9f\xe6\x97\xa5",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe4\xb8\x80",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe4\xba\x8c",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe4\xb8\x89",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe5\x9b\x9b",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe4\xba\x94",
-	  "\xe6\x98\x9f\xe6\x9c\x9f\xe5\x85\xad"
-	 }
+	{PG_UTF8,
+		{"\xe6\x98\x9f\xe6\x9c\x9f\xe6\x97\xa5",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe4\xb8\x80",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe4\xba\x8c",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe4\xb8\x89",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe5\x9b\x9b",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe4\xba\x94",
+			"\xe6\x98\x9f\xe6\x9c\x9f\xe5\x85\xad"
+		}
 	},
 
-	{ PG_GBK,
-	 {"\320\307\306\332\310\325",
-	  "\320\307\306\332\322\273",
-	  "\320\307\306\332\266\376",
-	  "\320\307\306\332\310\375",
-	  "\320\307\306\332\313\304",
-	  "\320\307\306\332\316\345",
-	  "\320\307\306\332\301\371"
-	 }
+	{PG_GBK,
+		{"\320\307\306\332\310\325",
+			"\320\307\306\332\322\273",
+			"\320\307\306\332\266\376",
+			"\320\307\306\332\310\375",
+			"\320\307\306\332\313\304",
+			"\320\307\306\332\316\345",
+			"\320\307\306\332\301\371"
+		}
 	}
 };
 
 static const int month_days[] = {
-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 
+	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
+static const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
 "Thursday", "Friday", "Saturday", NULL};
 
 #define CASE_fmt_YYYY	case 0: case 1: case 2: case 3: case 4: case 5: case 6:
@@ -167,9 +167,9 @@ const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
 #define CASE_fmt_CC	case 22: case 23:
 #define CASE_fmt_DDD	case 24: case 25: case 26:
 #define CASE_fmt_HH	case 27: case 28: case 29:
-#define CASE_fmt_MI	case 30: 
+#define CASE_fmt_MI	case 30:
 
-const char *const date_fmt[] =
+static const char *const date_fmt[] =
 {
 	"Y", "Yy", "Yyy", "Yyyy", "Year", "Syyyy", "syear",
 	"I", "Iy", "Iyy", "Iyyy",
@@ -195,23 +195,23 @@ const char *const date_fmt[] =
 #define CASE_timezone_10	case 15: case 16:
 #define CASE_timezone_11	case 17:
 
-const char *const date_timezone[] =
+static const char *const date_timezone[] =
 {
 	"GMT", "ADT", "NST", "AST", "EDT", "CDT",
-	"EST","CST", "MDT", "MST", "PDT", "PST",
+	"EST", "CST", "MDT", "MST", "PDT", "PST",
 	"YDT", "HDT", "YST", "BDT", "HST", "BST",
 	NULL
 };
 
 static int64 sys_time_zone(void);
-static int days_of_month(int y, int m);
+static int	days_of_month(int y, int m);
 static void tm_round(struct pg_tm *tm, text *fmt);
-static Timestamp iso_year (int y, int m, int d);
+static Timestamp iso_year(int y, int m, int d);
 static pg_tz *ora_make_timezone(char **newval);
 static void tm_trunc(struct pg_tm *tm, text *fmt);
-static int ora_seq_prefix_search(const char *name, const char *const array[], int max);
-static int weekday_search(const WeekDays *weekdays, const char *str, int len);
-static int ora_timezone_name_to_num(const char *name);
+static int	ora_seq_prefix_search(const char *name, const char *const array[], int max);
+static int	weekday_search(const WeekDays * weekdays, const char *str, int len);
+static int	ora_timezone_name_to_num(const char *name);
 
 /*
  * sysdate returns the current date and time set for the operating
@@ -228,7 +228,7 @@ sysdate(PG_FUNCTION_ARGS)
 	struct pg_tm tt,
 			   *tm = &tt;
 	fsec_t		fsec;
-	int64 systimezone;
+	int64		systimezone;
 
 	systimezone = sys_time_zone();
 	timestamp = timestamp + systimezone * 1000000;
@@ -241,7 +241,7 @@ sysdate(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 					 errmsg("timestamp out of range")));
-		
+
 		if (tm2timestamp(tm, 0, NULL, &result) != 0)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -267,54 +267,56 @@ ora_current_date(PG_FUNCTION_ARGS)
 	int			tz;
 
 	if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
-		
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
+
 	if (tm2timestamp(tm, 0, NULL, &result) != 0)
 		ereport(ERROR,
-			(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-			errmsg("timestamp out of range")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
- * Returns the current date and time in the session time zone, 
+/*
+ * Returns the current date and time in the session time zone,
  * in a value of data type TIMESTAMP WITH TIME ZONE.
  */
 Datum
 ora_current_timestamp(PG_FUNCTION_ARGS)
 {
 	TimestampTz timestamp = GetCurrentTransactionStartTimestamp();
-	int argsnum = PG_NARGS();
+	int			argsnum = PG_NARGS();
+
 	if (argsnum == 1)
 	{
-		int n = PG_GETARG_INT32(0);
-		if(n > MAX_TIMESTAMP_PRECISION && n <= ORACLE_MAX_TIMESTAMP_PRECISION)
+		int			n = PG_GETARG_INT32(0);
+
+		if (n > MAX_TIMESTAMP_PRECISION && n <= ORACLE_MAX_TIMESTAMP_PRECISION)
 		{
 			ereport(WARNING,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				errmsg("TIMESTAMP(%d) effective number of fractional seconds is 6,the part of excess is 0",
-				  n)));
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("TIMESTAMP(%d) effective number of fractional seconds is 6, the part of excess is 0",
+							n)));
 			n = MAX_TIMESTAMP_PRECISION;
 		}
-		OraAdjustTimestampForTypmod((Timestamp *)&timestamp, n);
+		OraAdjustTimestampForTypmod((Timestamp *) &timestamp, n);
 	}
 
 	PG_RETURN_TIMESTAMPTZ(timestamp);
 }
 
-/* 
+/*
  * Returns the current date and time in the session time zone in a value of data type TIMESTAMP.
  */
 Datum
 ora_local_timestamp(PG_FUNCTION_ARGS)
 {
-	Timestamp timestamp = GetCurrentTransactionStartTimestamp();
-	int argsnum = PG_NARGS();
+	Timestamp	timestamp = GetCurrentTransactionStartTimestamp();
+	int			argsnum = PG_NARGS();
 	struct pg_tm tt,
-				*tm = &tt;
+			   *tm = &tt;
 	fsec_t		fsec;
 	int			tz;
 	const char *tzn;
@@ -333,33 +335,36 @@ ora_local_timestamp(PG_FUNCTION_ARGS)
 
 	if (argsnum == 1)
 	{
-		int n = PG_GETARG_INT32(0);
-		if(n > MAX_TIMESTAMP_PRECISION && n <= ORACLE_MAX_TIMESTAMP_PRECISION)
+		int			n = PG_GETARG_INT32(0);
+
+		if (n > MAX_TIMESTAMP_PRECISION && n <= ORACLE_MAX_TIMESTAMP_PRECISION)
 		{
 			ereport(WARNING,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				errmsg("TIMESTAMP(%d) effective number of fractional seconds is 6,the part of excess is 0",
-				  n)));
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("TIMESTAMP(%d) effective number of fractional seconds is 6, the part of excess is 0",
+							n)));
 			n = MAX_TIMESTAMP_PRECISION;
 		}
-		OraAdjustTimestampForTypmod((Timestamp *)&timestamp, n);
+		OraAdjustTimestampForTypmod((Timestamp *) &timestamp, n);
 	}
 	PG_RETURN_TIMESTAMP(timestamp);
 }
 
-/* 
- * Returns the date of the last day of the month that contains date. 
+/*
+ * Returns the date of the last day of the month that contains date.
  * The return type is always DATE, regardless of the data type of date.
  */
 Datum
 last_day(PG_FUNCTION_ARGS)
 {
-	Timestamp time = PG_GETARG_TIMESTAMP(0);
+	Timestamp	time = PG_GETARG_TIMESTAMP(0);
 	Timestamp	date;
-	int y = 0, m = 0, d = 0; 
-	int	last_day = 0;
-	Timestamp result;
-	
+	int			y = 0,
+				m = 0,
+				d = 0;
+	int			last_day = 0;
+	Timestamp	result;
+
 	TMODULO(time, date, USECS_PER_DAY);
 	if (time < INT64CONST(0))
 	{
@@ -368,7 +373,7 @@ last_day(PG_FUNCTION_ARGS)
 	}
 
 	date += POSTGRES_EPOCH_JDATE;
-	j2date((int)date, &y, &m, &d);
+	j2date((int) date, &y, &m, &d);
 	last_day = days_of_month(y, m);
 
 	result = date2j(y, m, last_day) - POSTGRES_EPOCH_JDATE;
@@ -378,21 +383,23 @@ last_day(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
+/*
  * Returns the date 'time' plus 'num' months.
  * The return type is always DATE, regardless of the data type of 'time'.
  */
 Datum
 add_months(PG_FUNCTION_ARGS)
 {
-	Timestamp time = PG_GETARG_TIMESTAMP(0);
+	Timestamp	time = PG_GETARG_TIMESTAMP(0);
 	Timestamp	date;
-	int y = 0, m = 0, d = 0; 
-	int days;
-	Timestamp result;
-	div_t	v;
-	bool	last_day;
-	int64	n;
+	int			y = 0,
+				m = 0,
+				d = 0;
+	int			days;
+	Timestamp	result;
+	div_t		v;
+	bool		last_day;
+	int64		n;
 	Numeric		num = PG_GETARG_NUMERIC(1);
 
 	n = DatumGetInt32(DirectFunctionCall1(numeric_int8, NumericGetDatum(num)));
@@ -405,7 +412,7 @@ add_months(PG_FUNCTION_ARGS)
 	}
 
 	date += POSTGRES_EPOCH_JDATE;
-	j2date((int)date, &y, &m, &d);
+	j2date((int) date, &y, &m, &d);
 	last_day = (d == days_of_month(y, m));
 
 	v = div(y * 12 + m - 1 + n, 12);
@@ -431,13 +438,15 @@ add_months(PG_FUNCTION_ARGS)
 Datum
 ora_round(PG_FUNCTION_ARGS)
 {
-	fsec_t fsec;
-	struct pg_tm tt, *tm = &tt;
-	Timestamp timestamp = PG_GETARG_TIMESTAMP(0);
-	Timestamp result;
-	text *fmt = NULL;
-	int argsnum = PG_NARGS();
-	if(argsnum == 1)
+	fsec_t		fsec;
+	struct pg_tm tt,
+			   *tm = &tt;
+	Timestamp	timestamp = PG_GETARG_TIMESTAMP(0);
+	Timestamp	result;
+	text	   *fmt = NULL;
+	int			argsnum = PG_NARGS();
+
+	if (argsnum == 1)
 		fmt = cstring_to_text("DDD");
 	else
 		fmt = PG_GETARG_TEXT_PP(1);
@@ -447,8 +456,8 @@ ora_round(PG_FUNCTION_ARGS)
 
 	if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
 	tm_round(tm, fmt);
 
@@ -467,14 +476,16 @@ ora_round(PG_FUNCTION_ARGS)
 Datum
 ora_trunc(PG_FUNCTION_ARGS)
 {
-	Timestamp timestamp = PG_GETARG_TIMESTAMP(0);
-	Timestamp result;
-	text *fmt = NULL;
-	fsec_t fsec;
-	struct pg_tm tt, *tm = &tt;
-	
-	int argsnum = PG_NARGS();
-	if(argsnum == 1)
+	Timestamp	timestamp = PG_GETARG_TIMESTAMP(0);
+	Timestamp	result;
+	text	   *fmt = NULL;
+	fsec_t		fsec;
+	struct pg_tm tt,
+			   *tm = &tt;
+
+	int			argsnum = PG_NARGS();
+
+	if (argsnum == 1)
 		fmt = cstring_to_text("DDD");
 	else
 		fmt = PG_GETARG_TEXT_PP(1);
@@ -484,8 +495,8 @@ ora_trunc(PG_FUNCTION_ARGS)
 
 	if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
 	tm_trunc(tm, fmt);
 	fsec = 0;
@@ -498,18 +509,18 @@ ora_trunc(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
+/*
  * Internal implementation of Oracle's NEXT_DAY function.
  * First weekday specified by int type.
  */
 Datum
 next_day_by_index(PG_FUNCTION_ARGS)
 {
-	Timestamp day = PG_GETARG_TIMESTAMP(0);
-	int		idx = PG_GETARG_INT32(1);
+	Timestamp	day = PG_GETARG_TIMESTAMP(0);
+	int			idx = PG_GETARG_INT32(1);
 	Timestamp	date;
-	int	off = 0;
-	Timestamp result;
+	int			off = 0;
+	Timestamp	result;
 
 	CHECK_SEQ_SEARCH((idx < 1 || 7 < idx) ? -1 : 0, "DAY/Day/day");
 	TMODULO(day, date, USECS_PER_DAY);
@@ -521,8 +532,8 @@ next_day_by_index(PG_FUNCTION_ARGS)
 	date += POSTGRES_EPOCH_JDATE;
 
 	/* j2day returns 0..6 as Sun..Sat */
-	off = (idx - 1) - j2day((int)date);
-	date = (off <= 0) ? date+off+7 : date + off;
+	off = (idx - 1) - j2day((int) date);
+	date = (off <= 0) ? date + off + 7 : date + off;
 
 	result = date - POSTGRES_EPOCH_JDATE;
 	result = result * USECS_PER_DAY + day;
@@ -530,23 +541,23 @@ next_day_by_index(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
+/*
  * Internal implementation of Oracle's NEXT_DAY function.
  * First weekday specified by character type.
  */
 Datum
 next_day(PG_FUNCTION_ARGS)
 {
-	Timestamp day = PG_GETARG_TIMESTAMP(0);
-	text *day_txt = PG_GETARG_TEXT_PP(1);
+	Timestamp	day = PG_GETARG_TIMESTAMP(0);
+	text	   *day_txt = PG_GETARG_TEXT_PP(1);
 	const char *str = VARDATA_ANY(day_txt);
-	int len = VARSIZE_ANY_EXHDR(day_txt);
-	char *changstr =NULL;
-	int changstrlen =0;
-	Timestamp date;
-	int off = 0;
-	Timestamp result;
-	int d = -1;
+	int			len = VARSIZE_ANY_EXHDR(day_txt);
+	char	   *changstr = NULL;
+	int			changstrlen = 0;
+	Timestamp	date;
+	int			off = 0;
+	Timestamp	result;
+	int			d = -1;
 
 	if (len >= 3 && (d = ora_seq_prefix_search(str, ora_days, 3)) >= 0)
 		goto found;
@@ -556,7 +567,7 @@ next_day(PG_FUNCTION_ARGS)
 
 	if ((d = weekday_search(&WEEKDAYS[0], changstr, changstrlen)) >= 0)
 		goto found;
-				
+
 	CHECK_SEQ_SEARCH(-1, "DAY/Day/day");
 
 found:
@@ -569,8 +580,8 @@ next_day(PG_FUNCTION_ARGS)
 	date += POSTGRES_EPOCH_JDATE;
 
 	/* j2day returns 0..6 as Sun..Sat */
-	off = d - j2day((int)date);
-	date = (off <= 0) ? date+off+7 : date + off;
+	off = d - j2day((int) date);
+	date = (off <= 0) ? date + off + 7 : date + off;
 
 	result = date - POSTGRES_EPOCH_JDATE;
 	result = result * USECS_PER_DAY + day;
@@ -587,36 +598,36 @@ next_day(PG_FUNCTION_ARGS)
 Datum
 ora_new_time(PG_FUNCTION_ARGS)
 {
-	Timestamp day = PG_GETARG_TIMESTAMP(0);
-	text *txtimezone1 = PG_GETARG_TEXT_PP(1);
-	text *txtimezone2 = PG_GETARG_TEXT_PP(2);
+	Timestamp	day = PG_GETARG_TIMESTAMP(0);
+	text	   *txtimezone1 = PG_GETARG_TEXT_PP(1);
+	text	   *txtimezone2 = PG_GETARG_TEXT_PP(2);
 
-	char *strtimezone1 = text_to_cstring(txtimezone1);
-	char *strtimezone2 = text_to_cstring(txtimezone2);
-	Timestamp result;
+	char	   *strtimezone1 = text_to_cstring(txtimezone1);
+	char	   *strtimezone2 = text_to_cstring(txtimezone2);
+	Timestamp	result;
 	struct pg_tm tt,
-				*tm = &tt;
+			   *tm = &tt;
 	fsec_t		fsec;
 	int			tz1;
 	int			tz2;
-	
-	if((tz1 = ora_timezone_name_to_num(strtimezone1)) == -1)
+
+	if ((tz1 = ora_timezone_name_to_num(strtimezone1)) == -1)
 	{
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("Invalid time zone")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("Invalid time zone")));
 	}
 
-	if((tz2 = ora_timezone_name_to_num(strtimezone2)) == -1)
+	if ((tz2 = ora_timezone_name_to_num(strtimezone2)) == -1)
 	{
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("Invalid time zone")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("Invalid time zone")));
 	}
 	if (timestamp2tm(day, NULL, tm, &fsec, NULL, NULL) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 	tz1 = tz1 - tz2;
 	tm2timestamp(tm, fsec, &tz1, &result);
 
@@ -630,65 +641,70 @@ ora_new_time(PG_FUNCTION_ARGS)
 Datum
 ora_tz_offset(PG_FUNCTION_ARGS)
 {
-	text	*res;
-	bool ispositive = true;
-	pg_tz *timezonedat;
+	text	   *res;
+	bool		ispositive = true;
+	pg_tz	   *timezonedat;
 	struct pg_tm tt,
-				*tm = &tt;
+			   *tm = &tt;
 	fsec_t		fsec;
-	int64			tz;
-	int hourdat,mindate;
-	char *reschar = (char *) palloc(8);
-	text *txtimezone1 = PG_GETARG_TEXT_PP(0);
+	int64		tz;
+	int			hourdat,
+				mindate;
+	char	   *reschar = (char *) palloc(8);
+	text	   *txtimezone1 = PG_GETARG_TEXT_PP(0);
 
-	char *strtimezone1 = text_to_cstring(txtimezone1);
+	char	   *strtimezone1 = text_to_cstring(txtimezone1);
 	TimestampTz timestamp = GetCurrentTimestamp();
 
 	/* to get pg_tz struct data of char */
-	if((timezonedat = ora_make_timezone(&strtimezone1)) == NULL)
+	if ((timezonedat = ora_make_timezone(&strtimezone1)) == NULL)
 	{
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timezone is not ok")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timezone is not ok")));
 	}
 
 	if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
 	tz = DetermineTimeZoneOffset(tm, timezonedat);
-	if(tz <= 0)
+	if (tz <= 0)
 	{
 		tz = tz * (-1);
 		ispositive = false;
 	}
 	hourdat = tz / 3600;
-	mindate = (tz - hourdat*3600) / 60;
+	mindate = (tz - hourdat * 3600) / 60;
 
-	snprintf(reschar,8,"%s%02d:%02d",ispositive ? "-":"+",hourdat,mindate);
+	snprintf(reschar, 8, "%s%02d:%02d", ispositive ? "-" : "+", hourdat, mindate);
 
 	res = cstring_to_text(reschar);
 
 	PG_RETURN_TEXT_P(res);
 }
 
-/* 
+/*
  * Returns number of months between dates 'time1' and 'time2'.
  */
 Datum
 months_between(PG_FUNCTION_ARGS)
 {
-	Timestamp time1 = PG_GETARG_TIMESTAMP(0);
-	Timestamp time2 = PG_GETARG_TIMESTAMP(1);
+	Timestamp	time1 = PG_GETARG_TIMESTAMP(0);
+	Timestamp	time2 = PG_GETARG_TIMESTAMP(1);
 
-	Timestamp date1;
-	Timestamp date2;
+	Timestamp	date1;
+	Timestamp	date2;
 
-	int y1, m1, d1;
-	int y2, m2, d2;
+	int			y1,
+				m1,
+				d1;
+	int			y2,
+				m2,
+				d2;
 
-	float8 result;
+	float8		result;
 
 	TMODULO(time1, date1, USECS_PER_DAY);
 	if (time1 < INT64CONST(0))
@@ -704,10 +720,10 @@ months_between(PG_FUNCTION_ARGS)
 	}
 
 	date1 += POSTGRES_EPOCH_JDATE;
-	j2date((int)date1, &y1, &m1, &d1);
+	j2date((int) date1, &y1, &m1, &d1);
 
 	date2 += POSTGRES_EPOCH_JDATE;
-	j2date((int)date2, &y2, &m2, &d2);
+	j2date((int) date2, &y2, &m2, &d2);
 
 	/* Ignore day components for last days, or based on a 31-day month. */
 	if (d1 == days_of_month(y1, m1) && d2 == days_of_month(y2, m2))
@@ -716,7 +732,7 @@ months_between(PG_FUNCTION_ARGS)
 	{
 		result = (y1 - y2) * 12 + (m1 - m2) + (d1 - d2) / 31.0;
 		/* If the days are different, you need to compare the time difference */
-		if(d1 != d2)
+		if (d1 != d2)
 			result += ((time1 - time2) / 31.0) / USECS_PER_DAY;
 	}
 	PG_RETURN_FLOAT8(result);
@@ -728,27 +744,27 @@ months_between(PG_FUNCTION_ARGS)
 Datum
 ora_from_tz(PG_FUNCTION_ARGS)
 {
-	Timestamp day = PG_GETARG_TIMESTAMP(0);
-	text *day_txt = PG_GETARG_TEXT_PP(1);
+	Timestamp	day = PG_GETARG_TIMESTAMP(0);
+	text	   *day_txt = PG_GETARG_TEXT_PP(1);
 	TimestampTz result;
 	struct pg_tm tt,
-				*tm = &tt;
-	pg_tz *timezonedat;
-	char *day_char = text_to_cstring(day_txt);
+			   *tm = &tt;
+	pg_tz	   *timezonedat;
+	char	   *day_char = text_to_cstring(day_txt);
 	fsec_t		fsec;
 	int			tz;
 
-	if((timezonedat = ora_make_timezone(&day_char)) == NULL)
+	if ((timezonedat = ora_make_timezone(&day_char)) == NULL)
 	{
 		ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timezone is not ok")));
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timezone is not ok")));
 	}
 
 	if (timestamp2tm(day, NULL, tm, &fsec, NULL, NULL) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					 errmsg("timestamp out of range")));
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
 	tz = DetermineTimeZoneOffset(tm, timezonedat);
 	tm2timestamp(tm, fsec, &tz, &result);
@@ -757,14 +773,14 @@ ora_from_tz(PG_FUNCTION_ARGS)
 }
 
 /*
- * Extracts the UTC(Coordinated Universal Time--formerly Greenwich Mean Time) 
+ * Extracts the UTC(Coordinated Universal Time--formerly Greenwich Mean Time)
  * from a datetime value with time zone offset or time zone region name.
  */
 Datum
 ora_sys_extract_utc(PG_FUNCTION_ARGS)
 {
 	TimestampTz timestamp = PG_GETARG_TIMESTAMP(0);
-	Timestamp result = timestamp;
+	Timestamp	result = timestamp;
 
 	PG_RETURN_TIMESTAMP(result);
 }
@@ -775,10 +791,10 @@ ora_sys_extract_utc(PG_FUNCTION_ARGS)
 Datum
 ora_sessiontimezone(PG_FUNCTION_ARGS)
 {
-	char	*res;
-	text	*out;
+	char	   *res;
+	text	   *out;
 
-	res = (char *)pg_get_timezone_name(session_timezone);
+	res = (char *) pg_get_timezone_name(session_timezone);
 	out = cstring_to_text(res);
 
 	PG_RETURN_TEXT_P(out);
@@ -792,8 +808,8 @@ ora_sessiontimezone(PG_FUNCTION_ARGS)
 Datum
 to_oradate1(PG_FUNCTION_ARGS)
 {
-	text		*date_txt = PG_GETARG_TEXT_P(0);
-	Oid		collid = PG_GET_COLLATION();
+	text	   *date_txt = PG_GETARG_TEXT_P(0);
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -813,9 +829,9 @@ to_oradate1(PG_FUNCTION_ARGS)
 Datum
 to_oradate2(PG_FUNCTION_ARGS)
 {
-	text		*date_txt = PG_GETARG_TEXT_P(0);
-	text		*fmt = PG_GETARG_TEXT_P(1);
-	Oid		collid = PG_GET_COLLATION();
+	text	   *date_txt = PG_GETARG_TEXT_P(0);
+	text	   *fmt = PG_GETARG_TEXT_P(1);
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -838,13 +854,14 @@ to_oradate3(PG_FUNCTION_ARGS)
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
 	text	   *nlsparam = PG_GETARG_TEXT_P(2);
-	Oid		    collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
 
 	/* TODO */
-	char	*p;
+	char	   *p;
+
 	p = text_to_cstring(nlsparam);
 
 #if 0
@@ -855,9 +872,9 @@ to_oradate3(PG_FUNCTION_ARGS)
 #endif
 
 	if (p && strlen(p) != 0)
-	/* make compiler quiet */
+		/* make compiler quiet */
 
-	ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
+		ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
 
 	/* no timezone and no fractional second */
 	fsec = 0;
@@ -878,7 +895,7 @@ Datum
 to_oratimestamp1(PG_FUNCTION_ARGS)
 {
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -899,7 +916,7 @@ to_oratimestamp2(PG_FUNCTION_ARGS)
 {
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -921,23 +938,23 @@ to_oratimestamp3(PG_FUNCTION_ARGS)
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
 	text	   *nlsparam = PG_GETARG_TEXT_P(2);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
-	char	*p;
+	char	   *p;
+
 	p = text_to_cstring(nlsparam);
 
 	/*
-	if (strlen(p) != 0)
-		ereport(WARNING,
-				(errcode(ERRCODE_UNTERMINATED_C_STRING),
-				 errmsg("function \"to_date\" not support the parameter of \"nlsparam\".")));
-	*/
+	 * if (strlen(p) != 0) ereport(WARNING,
+	 * (errcode(ERRCODE_UNTERMINATED_C_STRING), errmsg("function \"to_date\"
+	 * not support the parameter of \"nlsparam\".")));
+	 */
 	if (p && strlen(p) != 0)
-	/* make compiler quiet */
+		/* make compiler quiet */
 
-	ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
+		ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
 
 	/* no time zone */
 	if (tm2timestamp(&tm, fsec, NULL, &result) != 0)
@@ -957,7 +974,7 @@ Datum
 to_oratimestamptz1(PG_FUNCTION_ARGS)
 {
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	int			tz;
 	struct pg_tm tm;
@@ -968,7 +985,7 @@ to_oratimestamptz1(PG_FUNCTION_ARGS)
 
 	if (tm.tm_zone)
 	{
-		int dterr = DecodeTimezone((char *)tm.tm_zone, &tz);
+		int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
 
 		if (dterr)
 			DateTimeParseError(dterr, &extra, text_to_cstring(date_txt), "timestamptz", NULL);
@@ -983,13 +1000,13 @@ to_oratimestamptz1(PG_FUNCTION_ARGS)
 
 	PG_RETURN_TIMESTAMP(result);
 }
- 
+
 Datum
 to_oratimestamptz2(PG_FUNCTION_ARGS)
 {
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	int			tz;
 	struct pg_tm tm;
@@ -1000,7 +1017,7 @@ to_oratimestamptz2(PG_FUNCTION_ARGS)
 
 	if (tm.tm_zone)
 	{
-		int			dterr = DecodeTimezone((char *)tm.tm_zone, &tz);
+		int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
 
 		if (dterr)
 			DateTimeParseError(dterr, &extra, text_to_cstring(date_txt), "timestamptz", NULL);
@@ -1009,13 +1026,13 @@ to_oratimestamptz2(PG_FUNCTION_ARGS)
 		tz = DetermineTimeZoneOffset(&tm, session_timezone);
 
 #if 0
-	if(tm.tm_gmtoff == -1)
+	if (tm.tm_gmtoff == -1)
 	{
 		tm.tm_gmtoff = 0;
 		tz = DetermineTimeZoneOffset(&tm, session_timezone);
 	}
 	else
-		tz = (int)tm.tm_gmtoff * (-1);
+		tz = (int) tm.tm_gmtoff * (-1);
 #endif
 
 	if (tm2timestamp(&tm, fsec, &tz, &result) != 0)
@@ -1032,30 +1049,30 @@ to_oratimestamptz3(PG_FUNCTION_ARGS)
 	text	   *date_txt = PG_GETARG_TEXT_P(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
 	text	   *nlsparam = PG_GETARG_TEXT_P(2);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	int			tz;
 	struct pg_tm tm;
 	fsec_t		fsec;
 	DateTimeErrorExtra extra;
-	char	*p;
+	char	   *p;
+
 	p = text_to_cstring(nlsparam);
 
 	if (p && strlen(p) != 0)
-	/* make compile quiet */
+		/* make compile quiet */
 
-	/*
-	if (strlen(p) != 0)
-		ereport(WARNING,
-				(errcode(ERRCODE_UNTERMINATED_C_STRING),
-				 errmsg("function \"to_date\" not support the parameter of \"nlsparam\".")));
-	*/
+		/*
+		 * if (strlen(p) != 0) ereport(WARNING,
+		 * (errcode(ERRCODE_UNTERMINATED_C_STRING), errmsg("function
+		 * \"to_date\" not support the parameter of \"nlsparam\".")));
+		 */
 
-	ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
+		ora_do_to_timestamp(date_txt, fmt, collid, false, &tm, &fsec, NULL, NULL, NULL, true);
 
 	if (tm.tm_zone)
 	{
-		int 	dterr = DecodeTimezone((char *)tm.tm_zone, &tz);
+		int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
 
 		if (dterr)
 			DateTimeParseError(dterr, &extra, text_to_cstring(date_txt), "timestamptz", NULL);
@@ -1074,18 +1091,18 @@ to_oratimestamptz3(PG_FUNCTION_ARGS)
 /*
  * Compatible with Oracle's TO_CHAR(DATETIME) function.
  *
- * Converts a DATETIME or INTERVAL data type to a value of VARCHAR2 data 
+ * Converts a DATETIME or INTERVAL data type to a value of VARCHAR2 data
  * type in the format specified by the date format fmt.
  */
 Datum
 oradate_to_char1(PG_FUNCTION_ARGS)
 {
 	Timestamp	dt = PG_GETARG_TIMESTAMP(0);
-	VarChar	*res;
+	VarChar    *res;
 
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamp_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(cstring_to_text(nls_date_format))));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(cstring_to_text(nls_date_format))));
 
 	PG_RETURN_VARCHAR_P(res);
 }
@@ -1095,11 +1112,11 @@ oradate_to_char2(PG_FUNCTION_ARGS)
 {
 	Timestamp	dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	VarChar	*res;
+	VarChar    *res;
 
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamp_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(fmt)));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(fmt)));
 
 	PG_RETURN_VARCHAR_P(res);
 }
@@ -1109,17 +1126,17 @@ oradate_to_char3(PG_FUNCTION_ARGS)
 {
 	Timestamp	dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	VarChar	   *res;
+	VarChar    *res;
 
 	/*
-	ereport(WARNING,
-			(errcode(ERRCODE_UNTERMINATED_C_STRING),
-			 errmsg("function \"to_char\" not support the parameter of \"nlsparam\".")));
-	*/
+	 * ereport(WARNING, (errcode(ERRCODE_UNTERMINATED_C_STRING),
+	 * errmsg("function \"to_char\" not support the parameter of
+	 * \"nlsparam\".")));
+	 */
 
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamp_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(fmt)));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(fmt)));
 
 	PG_RETURN_VARCHAR_P(res);
 }
@@ -1135,7 +1152,7 @@ oratimestamp_to_char1(PG_FUNCTION_ARGS)
 	struct pg_tm *tm;
 
 	int			thisdate;
-	VarChar	   *vres;
+	VarChar    *vres;
 
 	if ((VARSIZE(fmt) - VARHDRSZ) <= 0 || TIMESTAMP_NOT_FINITE(dt))
 		PG_RETURN_NULL();
@@ -1157,7 +1174,7 @@ oratimestamp_to_char1(PG_FUNCTION_ARGS)
 	if (!(res = datetime_to_char_body(&tmtc, fmt, false, PG_GET_COLLATION())))
 		PG_RETURN_NULL();
 
-	vres = (VarChar *)res;
+	vres = (VarChar *) res;
 	PG_RETURN_VARCHAR_P(vres);
 }
 
@@ -1171,7 +1188,7 @@ oratimestamp_to_char2(PG_FUNCTION_ARGS)
 	struct pg_tm pgtm;
 	struct pg_tm *tm;
 	int			thisdate;
-	VarChar	   *vres;
+	VarChar    *vres;
 
 	if ((VARSIZE(fmt) - VARHDRSZ) <= 0 || TIMESTAMP_NOT_FINITE(dt))
 		PG_RETURN_NULL();
@@ -1193,7 +1210,7 @@ oratimestamp_to_char2(PG_FUNCTION_ARGS)
 	if (!(res = datetime_to_char_body(&tmtc, fmt, false, PG_GET_COLLATION())))
 		PG_RETURN_NULL();
 
-	vres = (VarChar *)res;
+	vres = (VarChar *) res;
 	PG_RETURN_VARCHAR_P(vres);
 }
 
@@ -1207,7 +1224,7 @@ oratimestamp_to_char3(PG_FUNCTION_ARGS)
 	struct pg_tm pgtm;
 	struct pg_tm *tm;
 	int			thisdate;
-	VarChar	   *vres;
+	VarChar    *vres;
 
 	if ((VARSIZE(fmt) - VARHDRSZ) <= 0 || TIMESTAMP_NOT_FINITE(dt))
 		PG_RETURN_NULL();
@@ -1229,7 +1246,7 @@ oratimestamp_to_char3(PG_FUNCTION_ARGS)
 	if (!(res = datetime_to_char_body(&tmtc, fmt, false, PG_GET_COLLATION())))
 		PG_RETURN_NULL();
 
-	vres = (VarChar *)res;
+	vres = (VarChar *) res;
 	PG_RETURN_VARCHAR_P(vres);
 }
 
@@ -1237,11 +1254,11 @@ Datum
 oratimestamptz_to_char1(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
-	VarChar	*res;
+	VarChar    *res;
 
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamptz_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(cstring_to_text(nls_timestamp_tz_format))));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(cstring_to_text(nls_timestamp_tz_format))));
 
 	PG_RETURN_VARCHAR_P(res);
 }
@@ -1251,10 +1268,11 @@ oratimestamptz_to_char2(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	VarChar *res;
+	VarChar    *res;
+
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamptz_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(fmt)));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(fmt)));
 	PG_RETURN_VARCHAR_P(res);
 }
 
@@ -1263,17 +1281,17 @@ oratimestamptz_to_char3(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	VarChar	   *res;
+	VarChar    *res;
 
 	/*
-	ereport(WARNING,
-			(errcode(ERRCODE_UNTERMINATED_C_STRING),
-			 errmsg("function \"to_char\" not support the parameter of \"nlsparam\".")));
-	*/
+	 * ereport(WARNING, (errcode(ERRCODE_UNTERMINATED_C_STRING),
+	 * errmsg("function \"to_char\" not support the parameter of
+	 * \"nlsparam\".")));
+	 */
 
 	res = DatumGetVarCharP(DirectFunctionCall2(timestamptz_to_char,
-							TimestampGetDatum(dt),
-							PointerGetDatum(fmt)));
+											   TimestampGetDatum(dt),
+											   PointerGetDatum(fmt)));
 	PG_RETURN_VARCHAR_P(res);
 }
 
@@ -1281,12 +1299,12 @@ Datum
 oratimestampltz_to_char1(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
-	text	*res;
-	
+	text	   *res;
+
 	res = DatumGetTextP(DirectFunctionCall2(timestamptz_to_char,
-						TimestampGetDatum(dt),
-						PointerGetDatum(cstring_to_text(nls_timestamp_format))));
-	
+											TimestampGetDatum(dt),
+											PointerGetDatum(cstring_to_text(nls_timestamp_format))));
+
 	PG_RETURN_VARCHAR_P(res);
 }
 
@@ -1295,11 +1313,12 @@ oratimestampltz_to_char2(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	text	*res;
+	text	   *res;
+
 	res = DatumGetTextP(DirectFunctionCall2(timestamptz_to_char,
-						TimestampGetDatum(dt),
-						PointerGetDatum(fmt)));
-	
+											TimestampGetDatum(dt),
+											PointerGetDatum(fmt)));
+
 	PG_RETURN_VARCHAR_P(res);
 }
 
@@ -1308,18 +1327,18 @@ oratimestampltz_to_char3(PG_FUNCTION_ARGS)
 {
 	TimestampTz dt = PG_GETARG_TIMESTAMP(0);
 	text	   *fmt = PG_GETARG_TEXT_P(1);
-	text	*res;
+	text	   *res;
 
 	/*
-	ereport(WARNING,
-			(errcode(ERRCODE_UNTERMINATED_C_STRING),
-			 errmsg("function \"to_char\" not support the parameter of \"nlsparam\".")));
-	*/
+	 * ereport(WARNING, (errcode(ERRCODE_UNTERMINATED_C_STRING),
+	 * errmsg("function \"to_char\" not support the parameter of
+	 * \"nlsparam\".")));
+	 */
 
 	res = DatumGetTextP(DirectFunctionCall2(timestamptz_to_char,
-						TimestampGetDatum(dt),
-						PointerGetDatum(fmt)));
-	
+											TimestampGetDatum(dt),
+											PointerGetDatum(fmt)));
+
 	PG_RETURN_VARCHAR_P(res);
 }
 
@@ -1327,14 +1346,15 @@ Datum
 oradsinterval_to_char1(PG_FUNCTION_ARGS)
 {
 	Interval   *intervaldate = PG_GETARG_INTERVAL_P(0);
-	text	*res;
-	char *aa;
-	VarChar	*vres;
+	text	   *res;
+	char	   *aa;
+	VarChar    *vres;
+
 	aa = DatumGetCString(DirectFunctionCall1(dsinterval_out,
-						 IntervalPGetDatum(intervaldate)));
+											 IntervalPGetDatum(intervaldate)));
 
 	res = cstring_to_text(aa);
-	vres = (VarChar *)res;
+	vres = (VarChar *) res;
 	PG_RETURN_VARCHAR_P(vres);
 }
 
@@ -1342,40 +1362,41 @@ Datum
 orayminterval_to_char1(PG_FUNCTION_ARGS)
 {
 	Interval   *intervaldate = PG_GETARG_INTERVAL_P(0);
-	text	*res;
-	char *aa;
-	VarChar	*vres;
+	text	   *res;
+	char	   *aa;
+	VarChar    *vres;
+
 	aa = DatumGetCString(DirectFunctionCall1(yminterval_out,
-						 IntervalPGetDatum(intervaldate)));
+											 IntervalPGetDatum(intervaldate)));
 
 	res = cstring_to_text(aa);
-	vres = (VarChar *)res;
+	vres = (VarChar *) res;
 	PG_RETURN_VARCHAR_P(vres);
 }
 
-/* 
+/*
  * Compatible oracle 'TO_YMINTERVAL' function.
  */
 Datum
 to_yminterval(PG_FUNCTION_ARGS)
 {
-	text	*interval_txt = PG_GETARG_TEXT_P(0);
-	char	*interval_str;
-	int32	typmod;
+	text	   *interval_txt = PG_GETARG_TEXT_P(0);
+	char	   *interval_str;
+	int32		typmod;
 	Interval   *result;
 
 	typmod = INTERVAL_TYPMOD(ORACLE_MAX_INTERVAL_PRECISION, INTERVAL_MASK(YEAR) | INTERVAL_MASK(MONTH));
 	interval_str = text_to_cstring(interval_txt);
 
-	result = DatumGetIntervalP(DirectFunctionCall3(yminterval_in, 
-												   CStringGetDatum(interval_str), 
+	result = DatumGetIntervalP(DirectFunctionCall3(yminterval_in,
+												   CStringGetDatum(interval_str),
 												   ObjectIdGetDatum(InvalidOid),
 												   Int32GetDatum(typmod)));
 
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* 
+/*
  * Compatible oracle 'NUMTOYMINTERVAL' function
  *
  * if 'interval_unit' is 'month' then do round() according to
@@ -1383,15 +1404,15 @@ to_yminterval(PG_FUNCTION_ARGS)
  *
  * if 'interval_unit' is 'year' then 'interval_val' multiply 12 and
  * do round() according to the first place after the decimal point.
- *  
+ *
  */
 Datum
 numtoyminterval(PG_FUNCTION_ARGS)
 {
-	float8	interval_val = PG_GETARG_FLOAT8(0);
-	text	*interval_unit = PG_GETARG_TEXT_P(1);
-	char	*interval_unit_str;
-	int		interval_unit_len = 0;
+	float8		interval_val = PG_GETARG_FLOAT8(0);
+	text	   *interval_unit = PG_GETARG_TEXT_P(1);
+	char	   *interval_unit_str;
+	int			interval_unit_len = 0;
 	Interval   *result;
 
 	interval_unit_str = text_to_cstring(interval_unit);
@@ -1424,10 +1445,10 @@ numtoyminterval(PG_FUNCTION_ARGS)
 	/* positive */
 	if (interval_val > 0)
 	{
-		if( interval_val < 0.01)
+		if (interval_val < 0.01)
 			interval_val = 0;
-		
-		if(interval_val >= 0.01 && interval_val < 1)
+
+		if (interval_val >= 0.01 && interval_val < 1)
 			interval_val = 1;
 	}
 
@@ -1436,19 +1457,19 @@ numtoyminterval(PG_FUNCTION_ARGS)
 	{
 		if (interval_val > -0.5 && interval_val < 0)
 			interval_val = 0;
-		
+
 		if (interval_val <= -0.5 && interval_val > -1)
 			interval_val = 1;
 	}
 
 	/* round to first place after the decimal point */
 	if (interval_val > 0)
-		interval_val = ((int)(interval_val*10) + 5) / 10;
+		interval_val = ((int) (interval_val * 10) + 5) / 10;
 
 	if (interval_val < 0)
 	{
 		interval_val = interval_val * (-1);
-		interval_val = ((int)(interval_val*10) + 5) / 10;
+		interval_val = ((int) (interval_val * 10) + 5) / 10;
 		interval_val = interval_val * (-1);
 	}
 
@@ -1457,19 +1478,19 @@ numtoyminterval(PG_FUNCTION_ARGS)
 	result->month = interval_val;
 	result->day = 0;
 	result->time = 0;
-	
+
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* 
+/*
  * Compatible oracle TO_DSINTERVAL function.
  */
 Datum
 to_dsinterval(PG_FUNCTION_ARGS)
 {
-	text	*interval_txt = PG_GETARG_TEXT_P(0);
-	char	*interval_str;
-	int32	typmod;
+	text	   *interval_txt = PG_GETARG_TEXT_P(0);
+	char	   *interval_str;
+	int32		typmod;
 	Interval   *result;
 
 	typmod = INTERVAL_DS_TYPMOD(ORACLE_MAX_INTERVAL_PRECISION,
@@ -1489,16 +1510,16 @@ to_dsinterval(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* 
+/*
  * Compatible oracle 'NUMTODSINTERVAL' function
  */
 Datum
 numtodsinterval(PG_FUNCTION_ARGS)
 {
-	float8	interval_val = PG_GETARG_FLOAT8(0);
-	text	*interval_unit = PG_GETARG_TEXT_P(1);
-	char	*interval_unit_str;
-	int		interval_unit_len = 0;
+	float8		interval_val = PG_GETARG_FLOAT8(0);
+	text	   *interval_unit = PG_GETARG_TEXT_P(1);
+	char	   *interval_unit_str;
+	int			interval_unit_len = 0;
 	Interval   *result;
 
 	interval_unit_str = text_to_cstring(interval_unit);
@@ -1539,8 +1560,8 @@ numtodsinterval(PG_FUNCTION_ARGS)
 	result = (Interval *) palloc(sizeof(Interval));
 
 	result->month = 0;
-	result->day = (int)(interval_val / USECS_PER_DAY);
-	result->time = (interval_val - ((int)(interval_val / USECS_PER_DAY)) * USECS_PER_DAY);
+	result->day = (int) (interval_val / USECS_PER_DAY);
+	result->time = (interval_val - ((int) (interval_val / USECS_PER_DAY)) * USECS_PER_DAY);
 
 	PG_RETURN_INTERVAL_P(result);
 }
@@ -1552,36 +1573,37 @@ ora_make_timezone(char **newval)
 	long		gmtoffset;
 	int			hours = 0;
 	int			minu = 0;
-	int 		res = 0;
+	int			res = 0;
 
 	/*
 	 * Try it as a numeric number of hours (possibly fractional).
 	 */
-	res = sscanf(*newval,"%d:%d",&hours,&minu);
-	if(res == 2)
+	res = sscanf(*newval, "%d:%d", &hours, &minu);
+	if (res == 2)
 	{
-		if(hours < -12 || hours >14)
+		if (hours < -12 || hours > 14)
 			ereport(ERROR,
-				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-				errmsg("timezone hour between -12 and 14")));
-		if(minu < 0 || minu > 59 || (hours == 14 && minu > 0))
+					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+					 errmsg("timezone hour between -12 and 14")));
+		if (minu < 0 || minu > 59 || (hours == 14 && minu > 0))
 			ereport(ERROR,
-				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					errmsg("timezone minute between 0 and 59")));
-		if(hours < 0)
+					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+					 errmsg("timezone minute between 0 and 59")));
+		if (hours < 0)
 			minu *= -1;
 		gmtoffset = -(hours * SECS_PER_HOUR + minu * SECS_PER_MINUTE);
 		new_tz = pg_tzset_offset(gmtoffset);
 	}
 	else
 	{
-		if(res > 0)
+		if (res > 0)
 			ereport(ERROR,
-				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					errmsg("timezone type is error")));
+					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+					 errmsg("timezone type is error")));
+
 		/*
-		* Otherwise assume it is a timezone name, and try to load it.
-		*/
+		 * Otherwise assume it is a timezone name, and try to load it.
+		 */
 		new_tz = pg_tzset(*newval);
 		if (!new_tz)
 		{
@@ -1592,8 +1614,8 @@ ora_make_timezone(char **newval)
 		if (!pg_tz_acceptable(new_tz))
 		{
 			ereport(ERROR,
-				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-					errmsg("time zone \"%s\" appears to use leap seconds",
+					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+					 errmsg("time zone \"%s\" appears to use leap seconds",
 							*newval)));
 		}
 	}
@@ -1605,6 +1627,7 @@ ora_make_timezone(char **newval)
 				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 				 errmsg("UTC timezone offset is out of range.")));
 	}
+
 	/*
 	 * Pass back data for assign_timezone to use
 	 */
@@ -1615,27 +1638,32 @@ ora_make_timezone(char **newval)
  * Make a timestamp according to the year, month and day.
  */
 static Timestamp
-iso_year (int y, int m, int d)
+iso_year(int y, int m, int d)
 {
-	Timestamp result, result2, day;
-	int off;
+	Timestamp	result,
+				result2,
+				day;
+	int			off;
 
-	result = DATE2J(y,1,1);
-	day = DATE2J(y,m,d);
+	result = DATE2J(y, 1, 1);
+	day = DATE2J(y, m, d);
 	off = 4 - J2DAY(result);
-	result += off + ((off >= 0) ? - 3: + 4);  // to monday
+	result += off + ((off >= 0) ? -3 : +4);
+	/* to monday */
 	if (result > day)
 	{
-		result = DATE2J(y-1,1,1);
+		result = DATE2J(y - 1, 1, 1);
 		off = 4 - J2DAY(result);
-		result += off + ((off >= 0) ? - 3: + 4);  // to monday
+		result += off + ((off >= 0) ? -3 : +4);
+		/* to monday */
 	}
 
 	if (((day - result) / 7 + 1) > 52)
 	{
-		result2 = DATE2J(y+1,1,1);
+		result2 = DATE2J(y + 1, 1, 1);
 		off = 4 - J2DAY(result2);
-		result2 += off + ((off >= 0) ? - 3: + 4);  // to monday
+		result2 += off + ((off >= 0) ? -3 : +4);
+		/* to monday */
 		if (day >= result2)
 			return result2;
 	}
@@ -1650,20 +1678,22 @@ static int64
 sys_time_zone()
 {
 
-#ifdef _WIN64 
-	size_t a;
-	char time_zone[128];
-	long diff_secs;
+#ifdef _WIN64
+	size_t		a;
+	char		time_zone[128];
+	long		diff_secs;
+
 	_get_tzname(&a, time_zone, 128, 0);
 	_get_timezone(&diff_secs);
-	return (int64)diff_secs * (-1);
-#else  
-	struct tm *gmt;
-	time_t t;	
-	t = time(NULL);	
+	return (int64) diff_secs * (-1);
+#else
+	struct tm  *gmt;
+	time_t		t;
+
+	t = time(NULL);
 	gmt = localtime(&t);
-	return (int64)gmt->tm_gmtoff;
-#endif  
+	return (int64) gmt->tm_gmtoff;
+#endif
 }
 
 /*
@@ -1672,7 +1702,7 @@ sys_time_zone()
 static int
 days_of_month(int y, int m)
 {
-	int		days;
+	int			days;
 
 	if (m < 0 || 12 < m)
 		ereport(ERROR,
@@ -1681,14 +1711,14 @@ days_of_month(int y, int m)
 
 	days = month_days[m - 1];
 	if (m == 2 && (y % 400 == 0 || (y % 4 == 0 && y % 100 != 0)))
-		days += 1;	/* February 29 in leap year */
+		days += 1;				/* February 29 in leap year */
 	return days;
 }
 
 static int
 ora_seq_search(const char *name, const char *const array[], int max)
 {
-	int		i;
+	int			i;
 
 	if (!*name)
 		return -1;
@@ -1699,62 +1729,68 @@ ora_seq_search(const char *name, const char *const array[], int max)
 			pg_strncasecmp(name, array[i], max) == 0)
 			return i;
 	}
-	return -1;	/* not found */
+	return -1;					/* not found */
 }
 
 static Timestamp
 ora_date_round(Timestamp day, int f)
 {
-	int y, m, d, z;
-	Timestamp result;
+	int			y,
+				m,
+				d,
+				z;
+	Timestamp	result;
 
 	j2date(day + POSTGRES_EPOCH_JDATE, &y, &m, &d);
 
 	switch (f)
 	{
-		CASE_fmt_CC
-			if (y > 0)
-				result = DATE2J((y/100)*100+(day < DATE2J((y/100)*100+50,1,1) ?1:101),1,1);
+			CASE_fmt_CC
+				if (y > 0)
+				result = DATE2J((y / 100) * 100 + (day < DATE2J((y / 100) * 100 + 50, 1, 1) ? 1 : 101), 1, 1);
 			else
-				result = DATE2J((y/100)*100+(day < DATE2J((y/100)*100-50+1,1,1) ?-99:1),1,1);
+				result = DATE2J((y / 100) * 100 + (day < DATE2J((y / 100) * 100 - 50 + 1, 1, 1) ? -99 : 1), 1, 1);
 			break;
-		CASE_fmt_YYYY
-			result = DATE2J(y+(day<DATE2J(y,7,1)?0:1),1,1);
+			CASE_fmt_YYYY
+				result = DATE2J(y + (day < DATE2J(y, 7, 1) ? 0 : 1), 1, 1);
 			break;
-		CASE_fmt_IYYY
+			CASE_fmt_IYYY
 			{
-				if (day < DATE2J(y,7,1))
+				if (day < DATE2J(y, 7, 1))
 				{
 					result = iso_year(y, m, d);
 				}
 				else
 				{
-					Timestamp iy1 = iso_year(y+1, 1, 8);
+					Timestamp	iy1 = iso_year(y + 1, 1, 8);
+
 					result = iy1;
 
-					if (((day - DATE2J(y,1,1)) / 7 + 1) >= 52)
+					if (((day - DATE2J(y, 1, 1)) / 7 + 1) >= 52)
 					{
-						bool overl = ((date2j(y+2,1,1)-date2j(y+1,1,1)) == 366);
-						bool isSaturday = (J2DAY(day) == 6);
+						bool		overl = ((date2j(y + 2, 1, 1) - date2j(y + 1, 1, 1)) == 366);
+						bool		isSaturday = (J2DAY(day) == 6);
 
-						Timestamp iy2 = iso_year(y+2, 1, 8);
-						Timestamp day1 = DATE2J(y+1,1,1);
-						// exception saturdays 
+						Timestamp	iy2 = iso_year(y + 2, 1, 8);
+						Timestamp	day1 = DATE2J(y + 1, 1, 1);
+
+						/* exception saturdays  */
 						if (iy1 >= (day1) && day >= day1 - 2 && isSaturday)
 						{
-							result = overl?iy2:iy1;
+							result = overl ? iy2 : iy1;
 						}
-						// iso year stars in last year and day >= iso year 
+						/* iso year stars in last year and day >= iso year  */
 						else if (iy1 <= (day1) && day >= iy1 - 3)
 						{
-							Timestamp cmp = iy1 - (iy1 < day1?0:1);
-							int d1 = J2DAY(day1);
-							// some exceptions 
+							Timestamp	cmp = iy1 - (iy1 < day1 ? 0 : 1);
+							int			d1 = J2DAY(day1);
+
+							/* some exceptions  */
 							if ((day >= cmp - 2) && (!(d1 == 3 && overl)))
 							{
-								// if year don't starts in thursday
+								/* if year don't starts in thursday */
 								if ((d1 < 4 && J2DAY(day) != 5 && !isSaturday)
-									||(d1 == 2 && isSaturday && overl))
+									|| (d1 == 2 && isSaturday && overl))
 								{
 									result = iy2;
 								}
@@ -1764,43 +1800,45 @@ ora_date_round(Timestamp day, int f)
 				}
 				break;
 			}
-		CASE_fmt_MON
-			result = DATE2J(y,m+(day<DATE2J(y,m,16)?0:1),1);
+			CASE_fmt_MON
+				result = DATE2J(y, m + (day < DATE2J(y, m, 16) ? 0 : 1), 1);
 			break;
-		CASE_fmt_WW
-			z = (day - DATE2J(y,1,1)) % 7;
-			result = day - z + (z < 4?0:7);
+			CASE_fmt_WW
+				z = (day - DATE2J(y, 1, 1)) % 7;
+			result = day - z + (z < 4 ? 0 : 7);
 			break;
-		CASE_fmt_IW
-		{
-			z = (day - iso_year(y,m,d)) % 7;
-			result = day - z + (z < 4?0:7);
-			if (((day - DATE2J(y,1,1)) / 7 + 1) >= 52)
+			CASE_fmt_IW
 			{
-				// only for last iso week 
-				Timestamp isoyear = iso_year(y+1, 1, 8);
-				if (isoyear > (DATE2J(y+1,1,1)-1))
-					if (day > isoyear - 7)
-					{
-						int tmpd = J2DAY(day);
-						result -= (tmpd == 0 || tmpd > 4?7:0);
-					}
+				z = (day - iso_year(y, m, d)) % 7;
+				result = day - z + (z < 4 ? 0 : 7);
+				if (((day - DATE2J(y, 1, 1)) / 7 + 1) >= 52)
+				{
+					/* only for last iso week  */
+					Timestamp	isoyear = iso_year(y + 1, 1, 8);
+
+					if (isoyear > (DATE2J(y + 1, 1, 1) - 1))
+						if (day > isoyear - 7)
+						{
+							int			tmpd = J2DAY(day);
+
+							result -= (tmpd == 0 || tmpd > 4 ? 7 : 0);
+						}
+				}
+				break;
 			}
+			CASE_fmt_W
+				z = (day - DATE2J(y, m, 1)) % 7;
+			result = day - z + (z < 4 ? 0 : 7);
 			break;
-		}
-		CASE_fmt_W
-			z = (day - DATE2J(y,m,1)) % 7;
-			result = day - z + (z < 4?0:7);
-			break;
-		CASE_fmt_DAY
-			z = J2DAY(day);
+			CASE_fmt_DAY
+				z = J2DAY(day);
 			if (y > 0)
-				result = day - z + (z < 4?0:7);
+				result = day - z + (z < 4 ? 0 : 7);
 			else
-				result = day + (5 - (z>0?(z>1?z:z+7):7));
+				result = day + (5 - (z > 0 ? (z > 1 ? z : z + 7) : 7));
 			break;
-		CASE_fmt_Q
-			result = DATE2J(y,((m-1)/3)*3+(day<(DATE2J(y,((m-1)/3)*3+2,16))?1:4),1);
+			CASE_fmt_Q
+				result = DATE2J(y, ((m - 1) / 3) * 3 + (day < (DATE2J(y, ((m - 1) / 3) * 3 + 2, 16)) ? 1 : 4), 1);
 			break;
 		default:
 			result = day;
@@ -1811,83 +1849,83 @@ ora_date_round(Timestamp day, int f)
 static void
 tm_round(struct pg_tm *tm, text *fmt)
 {
-	int 	f;
-	bool	rounded = true;
+	int			f;
+	bool		rounded = true;
 
 	f = ora_seq_search(VARDATA_ANY(fmt), date_fmt, VARSIZE_ANY_EXHDR(fmt));
 	CHECK_SEQ_SEARCH(f, "round/trunc format string");
 
-	// set rounding rule 
+	/* set rounding rule  */
 	switch (f)
 	{
-	CASE_fmt_IYYY
-		NOT_ROUND_MDAY(tm->tm_mday < 8 && tm->tm_mon == 1);
-		NOT_ROUND_MDAY(tm->tm_mday == 30 && tm->tm_mon == 6);
-		if (tm->tm_mday >= 28 && tm->tm_mon == 12 && tm->tm_hour >= 12)
-		{
-			Timestamp isoyear = iso_year(tm->tm_year+1, 1, 8);
-			Timestamp day0 = DATE2J(tm->tm_year+1,1,1);
-			Timestamp dayc = DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday);
-
-			if ((isoyear <= day0) || (day0 <= dayc + 2))
+			CASE_fmt_IYYY
+				NOT_ROUND_MDAY(tm->tm_mday < 8 && tm->tm_mon == 1);
+			NOT_ROUND_MDAY(tm->tm_mday == 30 && tm->tm_mon == 6);
+			if (tm->tm_mday >= 28 && tm->tm_mon == 12 && tm->tm_hour >= 12)
 			{
-				rounded = false;
+				Timestamp	isoyear = iso_year(tm->tm_year + 1, 1, 8);
+				Timestamp	day0 = DATE2J(tm->tm_year + 1, 1, 1);
+				Timestamp	dayc = DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday);
+
+				if ((isoyear <= day0) || (day0 <= dayc + 2))
+				{
+					rounded = false;
+				}
 			}
-		}
-		break;
-	CASE_fmt_YYYY
-		NOT_ROUND_MDAY(tm->tm_mday == 30 && tm->tm_mon == 6);
-		break;
-	CASE_fmt_MON
-		NOT_ROUND_MDAY(tm->tm_mday == 15);
-		break;
-	CASE_fmt_Q
-		NOT_ROUND_MDAY(tm->tm_mday == 15 && tm->tm_mon == ((tm->tm_mon-1)/3)*3+2);
-		break;
-	CASE_fmt_WW
-	CASE_fmt_IW
-		// last day in year 
-		NOT_ROUND_MDAY(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday) ==
-		(DATE2J(tm->tm_year+1, 1,1) - 1));
-		break;
-	CASE_fmt_W
-		// last day in month 
-		NOT_ROUND_MDAY(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday) ==
-		(DATE2J(tm->tm_year, tm->tm_mon+1,1) - 1));
-		break;
+			break;
+			CASE_fmt_YYYY
+				NOT_ROUND_MDAY(tm->tm_mday == 30 && tm->tm_mon == 6);
+			break;
+			CASE_fmt_MON
+				NOT_ROUND_MDAY(tm->tm_mday == 15);
+			break;
+			CASE_fmt_Q
+				NOT_ROUND_MDAY(tm->tm_mday == 15 && tm->tm_mon == ((tm->tm_mon - 1) / 3) * 3 + 2);
+			break;
+			CASE_fmt_WW
+				CASE_fmt_IW
+			/* last day in year  */
+				NOT_ROUND_MDAY(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday) ==
+							   (DATE2J(tm->tm_year + 1, 1, 1) - 1));
+			break;
+			CASE_fmt_W
+			/* last day in month  */
+				NOT_ROUND_MDAY(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday) ==
+							   (DATE2J(tm->tm_year, tm->tm_mon + 1, 1) - 1));
+			break;
 	}
 
 	switch (f)
 	{
-	// easier convert to date
-	CASE_fmt_IW
-	CASE_fmt_DAY
-	CASE_fmt_IYYY
-	CASE_fmt_WW
-	CASE_fmt_W
-	CASE_fmt_CC
-	CASE_fmt_MON
-	CASE_fmt_YYYY
-	CASE_fmt_Q
-		ROUND_MDAY(tm);
-		j2date(ora_date_round(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday), f)
-			   + POSTGRES_EPOCH_JDATE,
-		&tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_DDD
-		tm->tm_mday += (tm->tm_hour >= 12)?1:0;
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_MI
-		tm->tm_min += (tm->tm_sec >= 30)?1:0;
-		break;
-	CASE_fmt_HH
-		tm->tm_hour += (tm->tm_min >= 30)?1:0;
-		tm->tm_min = 0;
-		break;
+			/* easier convert to date */
+			CASE_fmt_IW
+				CASE_fmt_DAY
+				CASE_fmt_IYYY
+				CASE_fmt_WW
+				CASE_fmt_W
+				CASE_fmt_CC
+				CASE_fmt_MON
+				CASE_fmt_YYYY
+				CASE_fmt_Q
+				ROUND_MDAY(tm);
+			j2date(ora_date_round(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday), f)
+				   + POSTGRES_EPOCH_JDATE,
+				   &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_DDD
+				tm->tm_mday += (tm->tm_hour >= 12) ? 1 : 0;
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_MI
+				tm->tm_min += (tm->tm_sec >= 30) ? 1 : 0;
+			break;
+			CASE_fmt_HH
+				tm->tm_hour += (tm->tm_min >= 30) ? 1 : 0;
+			tm->tm_min = 0;
+			break;
 	}
 
 	tm->tm_sec = 0;
@@ -1896,45 +1934,47 @@ tm_round(struct pg_tm *tm, text *fmt)
 static Timestamp
 ora_date_trunc(Timestamp day, int f)
 {
-	int y, m, d;
-	Timestamp result;
+	int			y,
+				m,
+				d;
+	Timestamp	result;
 
 	j2date(day + POSTGRES_EPOCH_JDATE, &y, &m, &d);
 
 	switch (f)
 	{
-	CASE_fmt_CC
-		if (y > 0)
-			result = DATE2J((y/100)*100+1,1,1);
-		else
-			result = DATE2J(-((99 - (y - 1)) / 100) * 100 + 1,1,1);
-		break;
-	CASE_fmt_YYYY
-		result = DATE2J(y,1,1);
-		break;
-	CASE_fmt_IYYY
-		result = iso_year(y,m,d);
-		break;
-	CASE_fmt_MON
-		result = DATE2J(y,m,1);
-		break;
-	CASE_fmt_WW
-		result = day - (day - DATE2J(y,1,1)) % 7;
-		break;
-	CASE_fmt_IW
-		result = day - (day - iso_year(y,m,d)) % 7;
-		break;
-	CASE_fmt_W
-		result = day - (day - DATE2J(y,m,1)) % 7;
-		break;
-	CASE_fmt_DAY
-		result = day - J2DAY(day);
-		break;
-	CASE_fmt_Q
-		result = DATE2J(y,((m-1)/3)*3+1,1);
-		break;
-	default:
-		result = day;
+			CASE_fmt_CC
+				if (y > 0)
+				result = DATE2J((y / 100) * 100 + 1, 1, 1);
+			else
+				result = DATE2J(-((99 - (y - 1)) / 100) * 100 + 1, 1, 1);
+			break;
+			CASE_fmt_YYYY
+				result = DATE2J(y, 1, 1);
+			break;
+			CASE_fmt_IYYY
+				result = iso_year(y, m, d);
+			break;
+			CASE_fmt_MON
+				result = DATE2J(y, m, 1);
+			break;
+			CASE_fmt_WW
+				result = day - (day - DATE2J(y, 1, 1)) % 7;
+			break;
+			CASE_fmt_IW
+				result = day - (day - iso_year(y, m, d)) % 7;
+			break;
+			CASE_fmt_W
+				result = day - (day - DATE2J(y, m, 1)) % 7;
+			break;
+			CASE_fmt_DAY
+				result = day - J2DAY(day);
+			break;
+			CASE_fmt_Q
+				result = DATE2J(y, ((m - 1) / 3) * 3 + 1, 1);
+			break;
+		default:
+			result = day;
 	}
 
 	return result;
@@ -1943,7 +1983,7 @@ ora_date_trunc(Timestamp day, int f)
 static void
 tm_trunc(struct pg_tm *tm, text *fmt)
 {
-	int f;
+	int			f;
 
 	f = ora_seq_search(VARDATA_ANY(fmt), date_fmt, VARSIZE_ANY_EXHDR(fmt));
 	CHECK_SEQ_SEARCH(f, "round/trunc format string");
@@ -1952,49 +1992,49 @@ tm_trunc(struct pg_tm *tm, text *fmt)
 
 	switch (f)
 	{
-	CASE_fmt_IYYY
-	CASE_fmt_WW
-	CASE_fmt_W
-	CASE_fmt_IW
-	CASE_fmt_DAY
-	CASE_fmt_CC
-		j2date(ora_date_trunc(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday), f)
-			   + POSTGRES_EPOCH_JDATE,
-		&tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_YYYY
-		tm->tm_mon = 1;
-		tm->tm_mday = 1;
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_Q
-		tm->tm_mon = (3*((tm->tm_mon - 1)/3)) + 1;
-		tm->tm_mday = 1;
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_MON
-		tm->tm_mday = 1;
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_DDD
-		tm->tm_hour = 0;
-		tm->tm_min = 0;
-		break;
-	CASE_fmt_HH
-		tm->tm_min = 0;
-		break;
+			CASE_fmt_IYYY
+				CASE_fmt_WW
+				CASE_fmt_W
+				CASE_fmt_IW
+				CASE_fmt_DAY
+				CASE_fmt_CC
+				j2date(ora_date_trunc(DATE2J(tm->tm_year, tm->tm_mon, tm->tm_mday), f)
+					   + POSTGRES_EPOCH_JDATE,
+					   &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_YYYY
+				tm->tm_mon = 1;
+			tm->tm_mday = 1;
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_Q
+				tm->tm_mon = (3 * ((tm->tm_mon - 1) / 3)) + 1;
+			tm->tm_mday = 1;
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_MON
+				tm->tm_mday = 1;
+			tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_DDD
+				tm->tm_hour = 0;
+			tm->tm_min = 0;
+			break;
+			CASE_fmt_HH
+				tm->tm_min = 0;
+			break;
 	}
 }
 
 static int
 ora_seq_prefix_search(const char *name, const char *const array[], int max)
 {
-	int		i;
+	int			i;
 
 	if (!*name)
 		return -1;
@@ -2004,71 +2044,74 @@ ora_seq_prefix_search(const char *name, const char *const array[], int max)
 		if (pg_strncasecmp(name, array[i], max) == 0)
 			return i;
 	}
-	return -1;	/* not found */
+	return -1;					/* not found */
 }
 
 static int
-weekday_search(const WeekDays *weekdays, const char *str, int len)
+weekday_search(const WeekDays * weekdays, const char *str, int len)
 {
-	int		i;
+	int			i;
 
 	for (i = 0; i < 7; i++)
 	{
-		int	n = strlen(weekdays->names[i]);
+		int			n = strlen(weekdays->names[i]);
+
 		if (n > len)
-			continue;	/* too short */
+			continue;			/* too short */
 		if (pg_strncasecmp(weekdays->names[i], str, n) == 0)
 			return i;
 	}
-	return -1;	/* not found */
+	return -1;					/* not found */
 }
 
-static int ora_timezone_name_to_num(const char *name)
+static int
+ora_timezone_name_to_num(const char *name)
 {
-	int i;
-	if(strlen(name) != 3)
+	int			i;
+
+	if (strlen(name) != 3)
 		return -1;
 
-	for(i = 0; date_timezone[i] != NULL; ++i)
+	for (i = 0; date_timezone[i] != NULL; ++i)
 	{
-		if(pg_strncasecmp(name, date_timezone[i], 3) == 0)
+		if (pg_strncasecmp(name, date_timezone[i], 3) == 0)
 			break;
 
 	}
 	switch (i)
 	{
-		CASE_timezone_0
-			return 0;
+			CASE_timezone_0
+				return 0;
 			break;
-		CASE_timezone_3
-			return 3*3600;
+			CASE_timezone_3
+				return 3 * 3600;
 			break;
-		CASE_timezone_35
-			return 3.5*3600;
+			CASE_timezone_35
+				return 3.5 * 3600;
 			break;
-		CASE_timezone_4
-			return 4*3600;
+			CASE_timezone_4
+				return 4 * 3600;
 			break;
-		CASE_timezone_5
-			return 5*3600;
+			CASE_timezone_5
+				return 5 * 3600;
 			break;
-		CASE_timezone_6
-			return 6*3600;
+			CASE_timezone_6
+				return 6 * 3600;
 			break;
-		CASE_timezone_7
-			return 7*3600;
+			CASE_timezone_7
+				return 7 * 3600;
 			break;
-		CASE_timezone_8
-			return 8*3600;
+			CASE_timezone_8
+				return 8 * 3600;
 			break;
-		CASE_timezone_9
-			return 9*3600;
+			CASE_timezone_9
+				return 9 * 3600;
 			break;
-		CASE_timezone_10
-			return 10*3600;
+			CASE_timezone_10
+				return 10 * 3600;
 			break;
-		CASE_timezone_11
-			return 11*3600;
+			CASE_timezone_11
+				return 11 * 3600;
 			break;
 		default:
 			return -1;
diff --git a/contrib/ivorysql_ora/src/builtin_functions/misc_functions.c b/contrib/ivorysql_ora/src/builtin_functions/misc_functions.c
index 44130fc9aab..75e984d33ac 100644
--- a/contrib/ivorysql_ora/src/builtin_functions/misc_functions.c
+++ b/contrib/ivorysql_ora/src/builtin_functions/misc_functions.c
@@ -18,7 +18,7 @@
  * This file contains the implementation of Oracle's
  * datatype-independent built-in functions.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/builtin_functions/misc_functions.c
  *
diff --git a/contrib/ivorysql_ora/src/builtin_functions/numeric_datatype_functions.c b/contrib/ivorysql_ora/src/builtin_functions/numeric_datatype_functions.c
index d4c0dbc03bf..ba59c33badc 100644
--- a/contrib/ivorysql_ora/src/builtin_functions/numeric_datatype_functions.c
+++ b/contrib/ivorysql_ora/src/builtin_functions/numeric_datatype_functions.c
@@ -18,7 +18,7 @@
  * This file contains the implementation of Oracle's
  * numeric data type related built-in functions.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/builtin_functions/numeric_datatype_functions.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/binary_double.c b/contrib/ivorysql_ora/src/datatype/binary_double.c
index f9796e37c59..68921db2b77 100644
--- a/contrib/ivorysql_ora/src/datatype/binary_double.c
+++ b/contrib/ivorysql_ora/src/datatype/binary_double.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's binary_double data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/binary_double.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/binary_float.c b/contrib/ivorysql_ora/src/datatype/binary_float.c
index a1f4e6b81ce..5cc1e8015b2 100644
--- a/contrib/ivorysql_ora/src/datatype/binary_float.c
+++ b/contrib/ivorysql_ora/src/datatype/binary_float.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's binary_float data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/binary_float.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/common_datatypes.c b/contrib/ivorysql_ora/src/datatype/common_datatypes.c
index 56b4d795d09..fcbd7a9eb34 100644
--- a/contrib/ivorysql_ora/src/datatype/common_datatypes.c
+++ b/contrib/ivorysql_ora/src/datatype/common_datatypes.c
@@ -17,7 +17,7 @@
  *
  * This file contains Common support routines for datatypes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/common_datatypes.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/compatible_oracle_precedence.c b/contrib/ivorysql_ora/src/datatype/compatible_oracle_precedence.c
index 457e0d78e23..d11385a701e 100644
--- a/contrib/ivorysql_ora/src/datatype/compatible_oracle_precedence.c
+++ b/contrib/ivorysql_ora/src/datatype/compatible_oracle_precedence.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle data type precedence.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/compatible_oracle_precedence.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/dsinterval.c b/contrib/ivorysql_ora/src/datatype/dsinterval.c
index a379b6820fc..87d7588cd26 100644
--- a/contrib/ivorysql_ora/src/datatype/dsinterval.c
+++ b/contrib/ivorysql_ora/src/datatype/dsinterval.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's INTERVAL DAY TO SECOND data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/dsinterval.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/oracharbyte.c b/contrib/ivorysql_ora/src/datatype/oracharbyte.c
index 9fc89cf8f8e..06a3d328982 100644
--- a/contrib/ivorysql_ora/src/datatype/oracharbyte.c
+++ b/contrib/ivorysql_ora/src/datatype/oracharbyte.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's CHAR(n byte) data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oracharbyte.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/oracharchar.c b/contrib/ivorysql_ora/src/datatype/oracharchar.c
index f68e92f3017..78213a667a5 100644
--- a/contrib/ivorysql_ora/src/datatype/oracharchar.c
+++ b/contrib/ivorysql_ora/src/datatype/oracharchar.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's CHAR(n char) data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oracharchar.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/oradate.c b/contrib/ivorysql_ora/src/datatype/oradate.c
index 508761adbaa..29f6fdd5753 100644
--- a/contrib/ivorysql_ora/src/datatype/oradate.c
+++ b/contrib/ivorysql_ora/src/datatype/oradate.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's DATE data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oradate.c
  *
@@ -166,16 +166,16 @@ timestamp2timestamptz(Timestamp timestamp)
 Datum
 oradate_in(PG_FUNCTION_ARGS)
 {
-	char		*str = PG_GETARG_CSTRING(0);
-	Oid		collid = PG_GET_COLLATION();
+	char	   *str = PG_GETARG_CSTRING(0);
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
-	struct pg_tm	tm;
+	struct pg_tm tm;
 	fsec_t		fsec;
 
 	if (strcmp(nls_date_format, "pg") == 0 || DATETIME_IGNORE_NLS(datetime_ignore_nls_mask, ORADATE_MASK))
 	{
 		return DirectFunctionCall1(date_timestamp,
-									DirectFunctionCall1(date_in, CStringGetDatum(str)));
+								   DirectFunctionCall1(date_in, CStringGetDatum(str)));
 	}
 	else
 	{
@@ -206,8 +206,8 @@ oradate_out(PG_FUNCTION_ARGS)
 		text	   *date_str;
 
 		date_str = DatumGetTextP(DirectFunctionCall2(timestamp_to_char,
-								  TimestampGetDatum(timestamp),
-								  PointerGetDatum(cstring_to_text(nls_date_format))));
+													 TimestampGetDatum(timestamp),
+													 PointerGetDatum(cstring_to_text(nls_date_format))));
 
 		result = text_to_cstring(date_str);
 		PG_RETURN_CSTRING(result);
@@ -589,7 +589,7 @@ oradate_cmp_oratimestampltz(PG_FUNCTION_ARGS)
 }
 
 /*****************************************************************************
- *	 Hash index support procedure 
+ *	 Hash index support procedure
  *****************************************************************************/
 Datum
 oradate_hash(PG_FUNCTION_ARGS)
@@ -744,4 +744,3 @@ oradate_oratimestampltz(PG_FUNCTION_ARGS)
 
 	PG_RETURN_TIMESTAMPTZ(timestamp2timestamptz(timestamp));
 }
-
diff --git a/contrib/ivorysql_ora/src/datatype/oratimestamp.c b/contrib/ivorysql_ora/src/datatype/oratimestamp.c
index a3d319554f3..3b88c199186 100644
--- a/contrib/ivorysql_ora/src/datatype/oratimestamp.c
+++ b/contrib/ivorysql_ora/src/datatype/oratimestamp.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's TIMESTAMP data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oratimestamp.c
  *
@@ -163,8 +163,8 @@ OraAdjustTimestampForTypmod(Timestamp *time, int32 typmod)
 		if (typmod < 0 || typmod > MAX_TIMESTAMP_PRECISION)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				  errmsg("timestamp(%d) precision must be between %d and %d",
-						 typmod, 0, MAX_TIMESTAMP_PRECISION)));
+					 errmsg("timestamp(%d) precision must be between %d and %d",
+							typmod, 0, MAX_TIMESTAMP_PRECISION)));
 
 		/*
 		 * Note: this round-to-nearest code is not completely consistent about
@@ -214,15 +214,15 @@ anytimestamp_typmodin(bool istz, ArrayType *ta)
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-		   errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6,the part of excess is 0",
-				  *tl, (istz ? " WITH TIME ZONE" : ""))));
+				 errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6, the part of excess is 0",
+						*tl, (istz ? " WITH TIME ZONE" : ""))));
 		typmod = *tl;
 	}
 	else if (*tl > ORACLE_MAX_TIMESTAMP_PRECISION)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-		   errmsg("the precision of datetime out of rang")));	
+				 errmsg("the precision of datetime out of range")));
 	}
 	else
 		typmod = *tl;
@@ -288,7 +288,7 @@ oratimestamp_in(PG_FUNCTION_ARGS)
 	Oid			typelem = PG_GETARG_OID(1);
 #endif
 	int32		typmod = PG_GETARG_INT32(2);
-	Oid		collid = PG_GET_COLLATION();
+	Oid			collid = PG_GET_COLLATION();
 	Timestamp	result;
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -296,9 +296,9 @@ oratimestamp_in(PG_FUNCTION_ARGS)
 	if (strcmp(nls_timestamp_format, "pg") == 0 || DATETIME_IGNORE_NLS(datetime_ignore_nls_mask, ORATIMESTAMP_MASK))
 	{
 		return DirectFunctionCall3(timestamp_in,
-									CStringGetDatum(str),
-									ObjectIdGetDatum(InvalidOid),
-									Int32GetDatum(typmod));
+								   CStringGetDatum(str),
+								   ObjectIdGetDatum(InvalidOid),
+								   Int32GetDatum(typmod));
 	}
 	else
 	{
@@ -330,8 +330,8 @@ oratimestamp_out(PG_FUNCTION_ARGS)
 		text	   *date_str;
 
 		date_str = DatumGetTextP(DirectFunctionCall2(timestamp_to_char,
-								  TimestampGetDatum(timestamp),
-								  PointerGetDatum(cstring_to_text(nls_timestamp_format))));
+													 TimestampGetDatum(timestamp),
+													 PointerGetDatum(cstring_to_text(nls_timestamp_format))));
 
 		result = text_to_cstring(date_str);
 		PG_RETURN_CSTRING(result);
@@ -717,7 +717,7 @@ oratimestamp_cmp_oratimestampltz(PG_FUNCTION_ARGS)
 }
 
 /*****************************************************************************
- *	 Hash index support procedure 
+ *	 Hash index support procedure
  *****************************************************************************/
 Datum
 oratimestamp_hash(PG_FUNCTION_ARGS)
@@ -775,7 +775,7 @@ oratimestamp(PG_FUNCTION_ARGS)
 	/* No work if typmod is invalid */
 	if (typmod == -1)
 		PG_RETURN_TIMESTAMP(source);
-		
+
 	OraAdjustTimestampForTypmod(&source, typmod);
 	PG_RETURN_TIMESTAMP(source);
 }
@@ -851,7 +851,7 @@ Datum
 oradate_mi_oratimestampltz(PG_FUNCTION_ARGS)
 {
 	Timestamp	dt1 = PG_GETARG_TIMESTAMP(0);
-	TimestampTz	dt2 = PG_GETARG_TIMESTAMP(1);
+	TimestampTz dt2 = PG_GETARG_TIMESTAMP(1);
 	Timestamp	timestamp;
 	struct pg_tm tt,
 			   *tm = &tt;
@@ -883,7 +883,7 @@ oradate_mi_oratimestampltz(PG_FUNCTION_ARGS)
 	result->day = 0;
 
 	result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
-												 IntervalPGetDatum(result)));
+												   IntervalPGetDatum(result)));
 
 	PG_RETURN_INTERVAL_P(result);
 }
@@ -897,7 +897,7 @@ oradate_mi_oratimestampltz(PG_FUNCTION_ARGS)
 Datum
 oratimestampltz_mi_oradate(PG_FUNCTION_ARGS)
 {
-	TimestampTz	dt1 = PG_GETARG_TIMESTAMP(0);
+	TimestampTz dt1 = PG_GETARG_TIMESTAMP(0);
 	Timestamp	dt2 = PG_GETARG_TIMESTAMP(1);
 	Timestamp	timestamp;
 	struct pg_tm tt,
@@ -930,7 +930,7 @@ oratimestampltz_mi_oradate(PG_FUNCTION_ARGS)
 	result->day = 0;
 
 	result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
-												 IntervalPGetDatum(result)));
+												   IntervalPGetDatum(result)));
 
 	PG_RETURN_INTERVAL_P(result);
 }
@@ -995,7 +995,7 @@ oratimestamp_mi(PG_FUNCTION_ARGS)
 	result->day = 0;
 
 	result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
-												 IntervalPGetDatum(result)));
+												   IntervalPGetDatum(result)));
 
 	PG_RETURN_INTERVAL_P(result);
 }
@@ -1050,7 +1050,7 @@ oradate_pl_interval(PG_FUNCTION_ARGS)
 
 			/* Compatible oracle oradate dont have fsec */
 			fsec = 0;
-			
+
 			if (tm2timestamp(tm, fsec, NULL, &timestamp) != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -1076,7 +1076,7 @@ oradate_pl_interval(PG_FUNCTION_ARGS)
 
 			/* Compatible oracle oradate dont have fsec */
 			fsec = 0;
-			
+
 			if (tm2timestamp(tm, fsec, NULL, &timestamp) != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -1456,7 +1456,7 @@ oradate_mi_number(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
+/*
  * Compatible oracle
  * The arithmetic operation of oratimestamp plus number, Result
  * type is oradate.
@@ -1481,7 +1481,7 @@ oratimestamp_pl_number(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 					 errmsg("timestamp out of range")));
-					 
+
 		/* Convert timestamp to date ignore time zone and fractional second */
 		if (tm2timestamp(tm, 0, NULL, &result) != 0)
 			ereport(ERROR,
@@ -1490,14 +1490,14 @@ oratimestamp_pl_number(PG_FUNCTION_ARGS)
 
 		addend = DatumGetFloat8(DirectFunctionCall1(numeric_float8, NumericGetDatum(num)));
 		addend = rint(addend * USECS_PER_DAY);
-		
+
 		result = result + addend;
 	}
 
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* 
+/*
  * Compatible oracle
  * The arithmetic operation of number plus oratimestamp, Result
  * type is oradate.
@@ -1531,7 +1531,7 @@ number_pl_oratimestamp(PG_FUNCTION_ARGS)
 
 		addend = DatumGetFloat8(DirectFunctionCall1(numeric_float8, NumericGetDatum(num)));
 		addend = rint(addend * USECS_PER_DAY);
-		
+
 		result = result + addend;
 	}
 
@@ -1588,7 +1588,7 @@ oratimestamp_mi_number(PG_FUNCTION_ARGS)
 Datum
 oratimestamptz_mi_number(PG_FUNCTION_ARGS)
 {
-	TimestampTz	timestamp = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
 	Numeric		num = PG_GETARG_NUMERIC(1);
 	float8		mi;
 	Timestamp	result;
@@ -1605,7 +1605,7 @@ oratimestamptz_mi_number(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 					 errmsg("timestamp out of range")));
-					 
+
 		/* Convert timestamp to date ignore fractional second */
 		if (tm2timestamp(tm, 0, NULL, &result) != 0)
 			ereport(ERROR,
@@ -1628,7 +1628,7 @@ oratimestamptz_mi_number(PG_FUNCTION_ARGS)
 Datum
 oratimestamptz_pl_number(PG_FUNCTION_ARGS)
 {
-	TimestampTz	timestamp = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
 	Numeric		num = PG_GETARG_NUMERIC(1);
 	float8		addend;
 	Timestamp	result;
@@ -1646,7 +1646,7 @@ oratimestamptz_pl_number(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 					 errmsg("timestamp out of range")));
-					 
+
 		/* Convert timestamp to date ignore time zone and fractional second */
 		if (tm2timestamp(tm, 0, NULL, &result) != 0)
 			ereport(ERROR,
@@ -1655,7 +1655,7 @@ oratimestamptz_pl_number(PG_FUNCTION_ARGS)
 
 		addend = DatumGetFloat8(DirectFunctionCall1(numeric_float8, NumericGetDatum(num)));
 		addend = rint(addend * USECS_PER_DAY);
-		
+
 		result = result + addend;
 	}
 
@@ -1671,7 +1671,7 @@ Datum
 number_pl_oratimestamptz(PG_FUNCTION_ARGS)
 {
 	Numeric		num = PG_GETARG_NUMERIC(0);
-	TimestampTz	timestamp = PG_GETARG_TIMESTAMPTZ(1);
+	TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(1);
 	float8		addend;
 	Timestamp	result;
 	struct pg_tm tt,
@@ -1697,10 +1697,9 @@ number_pl_oratimestamptz(PG_FUNCTION_ARGS)
 
 		addend = DatumGetFloat8(DirectFunctionCall1(numeric_float8, NumericGetDatum(num)));
 		addend = rint(addend * USECS_PER_DAY);
-		
+
 		result = result + addend;
 	}
 
 	PG_RETURN_TIMESTAMP(result);
 }
-
diff --git a/contrib/ivorysql_ora/src/datatype/oratimestampltz.c b/contrib/ivorysql_ora/src/datatype/oratimestampltz.c
index 4805096e42c..17bcebddbf0 100644
--- a/contrib/ivorysql_ora/src/datatype/oratimestampltz.c
+++ b/contrib/ivorysql_ora/src/datatype/oratimestampltz.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's TIMESTAMP WITH LOCAL TIME ZONE data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oratimestampltz.c
  *
@@ -126,15 +126,15 @@ anytimestamp_typmodin(bool istz, ArrayType *ta)
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-		   errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6,the part of excess is 0",
-				  *tl, (istz ? " WITH TIME ZONE" : ""))));
+				 errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6, the part of excess is 0",
+						*tl, (istz ? " WITH TIME ZONE" : ""))));
 		typmod = *tl;
 	}
 	else if (*tl > ORACLE_MAX_TIMESTAMP_PRECISION)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-		   errmsg("the precision of datetime out of rang")));	
+				 errmsg("the precision of datetime out of range")));
 	}
 	else
 		typmod = *tl;
@@ -197,18 +197,19 @@ oratimestampltz_in(PG_FUNCTION_ARGS)
 	char	   *str = PG_GETARG_CSTRING(0);
 
 #ifdef NOT_USED
-	Oid		typelem = PG_GETARG_OID(1);
+	Oid			typelem = PG_GETARG_OID(1);
 #endif
 	int32		typmod = PG_GETARG_INT32(2);
-	Oid		collid = PG_GET_COLLATION();
-	TimestampTz	result;
+	Oid			collid = PG_GET_COLLATION();
+	TimestampTz result;
 	struct pg_tm tm;
 	fsec_t		fsec;
 	int			tz;
 
 	if (strcmp(nls_timestamp_format, "pg") == 0 || DATETIME_IGNORE_NLS(datetime_ignore_nls_mask, ORATIMESTAMPLTZ_MASK))
 	{
-		Datum	datum;
+		Datum		datum;
+
 		datum = DirectFunctionCall3(timestamp_in, CStringGetDatum(str), ObjectIdGetDatum(InvalidOid), Int32GetDatum(typmod));
 		PG_RETURN_TIMESTAMPTZ(timestamp2timestamptz(DatumGetTimestamp(datum)));
 	}
@@ -235,13 +236,13 @@ oratimestampltz_in(PG_FUNCTION_ARGS)
 Datum
 oratimestampltz_out(PG_FUNCTION_ARGS)
 {
-	TimestampTz	timestamp = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
 	char	   *result;
 	text	   *date_str;
 
 	date_str = DatumGetTextP(DirectFunctionCall2(timestamptz_to_char,
-												  TimestampTzGetDatum(timestamp),
-												  PointerGetDatum(cstring_to_text(nls_timestamp_format))));
+												 TimestampTzGetDatum(timestamp),
+												 PointerGetDatum(cstring_to_text(nls_timestamp_format))));
 
 	result = text_to_cstring(date_str);
 	PG_RETURN_CSTRING(result);
@@ -577,13 +578,13 @@ oratimestampltz_ge_oratimestamptz(PG_FUNCTION_ARGS)
 Datum
 oratimestampltz(PG_FUNCTION_ARGS)
 {
-	TimestampTz	source = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz source = PG_GETARG_TIMESTAMPTZ(0);
 	int32		typmod = PG_GETARG_INT32(1);
 
 	/* No work if typmod is invalid */
 	if (typmod == -1)
 		PG_RETURN_TIMESTAMPTZ(source);
-		
+
 	OraAdjustTimestampForTypmod(&source, typmod);
 	PG_RETURN_TIMESTAMPTZ(source);
 }
@@ -634,7 +635,7 @@ oratimestampltz_cmp_oratimestamptz(PG_FUNCTION_ARGS)
 }
 
 /*****************************************************************************
- *	 Hash index support procedure 
+ *	 Hash index support procedure
  *****************************************************************************/
 Datum
 oratimestampltz_hash(PG_FUNCTION_ARGS)
@@ -735,4 +736,3 @@ oratimestampltz_oratimestamp(PG_FUNCTION_ARGS)
 	}
 	PG_RETURN_TIMESTAMP(result);
 }
-
diff --git a/contrib/ivorysql_ora/src/datatype/oratimestamptz.c b/contrib/ivorysql_ora/src/datatype/oratimestamptz.c
index 2ed46819043..9393e0a763b 100644
--- a/contrib/ivorysql_ora/src/datatype/oratimestamptz.c
+++ b/contrib/ivorysql_ora/src/datatype/oratimestamptz.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's TIMESTAMP WITH TIME ZONE data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oratimestamptz.c
  *
@@ -126,15 +126,15 @@ anytimestamp_typmodin(bool istz, ArrayType *ta)
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6,the part of excess is 0",
-				 *tl, (istz ? " WITH TIME ZONE" : ""))));
+				 errmsg("TIMESTAMP(%d)%s effective number of fractional seconds is 6, the part of excess is 0",
+						*tl, (istz ? " WITH TIME ZONE" : ""))));
 		typmod = *tl;
 	}
 	else if (*tl > ORACLE_MAX_TIMESTAMP_PRECISION)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("the precision of datetime out of rang")));
+				 errmsg("the precision of datetime out of range")));
 	}
 	else
 		typmod = *tl;
@@ -193,24 +193,24 @@ timestamp2timestamptz(Timestamp timestamp)
 Datum
 oratimestamptz_in(PG_FUNCTION_ARGS)
 {
-		char	   *str = PG_GETARG_CSTRING(0);
+	char	   *str = PG_GETARG_CSTRING(0);
 
 #ifdef NOT_USED
-		Oid			typelem = PG_GETARG_OID(1);
+	Oid			typelem = PG_GETARG_OID(1);
 #endif
-		int32		typmod = PG_GETARG_INT32(2);
-		Oid		collid = PG_GET_COLLATION();
+	int32		typmod = PG_GETARG_INT32(2);
+	Oid			collid = PG_GET_COLLATION();
 
 	if (strcmp(nls_timestamp_tz_format, "pg") == 0 || DATETIME_IGNORE_NLS(datetime_ignore_nls_mask, ORATIMESTAMPTZ_MASK))
 	{
 		return DirectFunctionCall3(timestamptz_in,
-									CStringGetDatum(str),
-									ObjectIdGetDatum(InvalidOid),
-									Int32GetDatum(typmod));
+								   CStringGetDatum(str),
+								   ObjectIdGetDatum(InvalidOid),
+								   Int32GetDatum(typmod));
 	}
 	else
 	{
-		TimestampTz	result;
+		TimestampTz result;
 		struct pg_tm tm;
 		fsec_t		fsec;
 		int			tz;
@@ -220,7 +220,7 @@ oratimestamptz_in(PG_FUNCTION_ARGS)
 
 		if (tm.tm_zone)
 		{
-			int		dterr = DecodeTimezone((char *)tm.tm_zone, &tz);
+			int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
 
 			if (dterr)
 				DateTimeParseError(dterr, &extra, str, "timestamptz", NULL);
@@ -247,7 +247,7 @@ oratimestamptz_in(PG_FUNCTION_ARGS)
 Datum
 oratimestamptz_out(PG_FUNCTION_ARGS)
 {
-	TimestampTz	timestamp = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
 
 	if (strcmp(nls_timestamp_tz_format, "pg") != 0)
 	{
@@ -255,9 +255,9 @@ oratimestamptz_out(PG_FUNCTION_ARGS)
 		text	   *date_str;
 
 		date_str = DatumGetTextP(DirectFunctionCall2(timestamptz_to_char,
-													  TimestampTzGetDatum(timestamp),
-													  PointerGetDatum(cstring_to_text(nls_timestamp_tz_format))));
-		
+													 TimestampTzGetDatum(timestamp),
+													 PointerGetDatum(cstring_to_text(nls_timestamp_tz_format))));
+
 		result = text_to_cstring(date_str);
 		PG_RETURN_CSTRING(result);
 	}
@@ -595,13 +595,13 @@ oratimestamptz_ge_oratimestampltz(PG_FUNCTION_ARGS)
 Datum
 oratimestamptz(PG_FUNCTION_ARGS)
 {
-	TimestampTz	source = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz source = PG_GETARG_TIMESTAMPTZ(0);
 	int32		typmod = PG_GETARG_INT32(1);
 
 	/* No work if typmod is invalid */
 	if (typmod == -1)
 		PG_RETURN_TIMESTAMPTZ(source);
-		
+
 	OraAdjustTimestampForTypmod(&source, typmod);
 	PG_RETURN_TIMESTAMPTZ(source);
 }
@@ -652,7 +652,7 @@ oratimestamptz_cmp_oratimestampltz(PG_FUNCTION_ARGS)
 }
 
 /*****************************************************************************
- *	 Hash index support procedure 
+ *	 Hash index support procedure
  *****************************************************************************/
 Datum
 oratimestamptz_hash(PG_FUNCTION_ARGS)
diff --git a/contrib/ivorysql_ora/src/datatype/oravarcharbyte.c b/contrib/ivorysql_ora/src/datatype/oravarcharbyte.c
index d349d0a7077..f1ddb1744d7 100644
--- a/contrib/ivorysql_ora/src/datatype/oravarcharbyte.c
+++ b/contrib/ivorysql_ora/src/datatype/oravarcharbyte.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's VARCHAR2(n byte) data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oravarcharbyte.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/oravarcharchar.c b/contrib/ivorysql_ora/src/datatype/oravarcharchar.c
index f42ef834a22..3ada0a11c87 100644
--- a/contrib/ivorysql_ora/src/datatype/oravarcharchar.c
+++ b/contrib/ivorysql_ora/src/datatype/oravarcharchar.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's VARCHAR2(n char) data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/oravarcharchar.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/raw_long.c b/contrib/ivorysql_ora/src/datatype/raw_long.c
index 8abdcef63f3..b55c297d18c 100644
--- a/contrib/ivorysql_ora/src/datatype/raw_long.c
+++ b/contrib/ivorysql_ora/src/datatype/raw_long.c
@@ -17,7 +17,7 @@
  *
  * Auxiliary routine for compatible with Oracle's LONG RAW data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/raw_long.c
  *
diff --git a/contrib/ivorysql_ora/src/datatype/yminterval.c b/contrib/ivorysql_ora/src/datatype/yminterval.c
index 907f087ad78..b62f87cb3a7 100644
--- a/contrib/ivorysql_ora/src/datatype/yminterval.c
+++ b/contrib/ivorysql_ora/src/datatype/yminterval.c
@@ -17,7 +17,7 @@
  *
  * Compatible with Oracle's INTERVAL YEAR TO MONTH data type.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/datatype/yminterval.c
  *
diff --git a/contrib/ivorysql_ora/src/guc/guc.c b/contrib/ivorysql_ora/src/guc/guc.c
index 3632671592d..650e7693328 100644
--- a/contrib/ivorysql_ora/src/guc/guc.c
+++ b/contrib/ivorysql_ora/src/guc/guc.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  *
  * Ivorysql_ora GUC variables define.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/guc/guc.c
  *
@@ -32,17 +32,6 @@
 
 #include "../include/guc.h"
 
-#if 0
-static const struct config_enum_entry nls_length_semantics_options[] =
-{
-	{"char", NLS_LENGTH_SEMANTICS_CHAR, false},
-	{"byte", NLS_LENGTH_SEMANTICS_BYTE, false},
-	{NULL, 0, false}
-};
-
-/* GUC variables */
-int	nls_length_semantics = NLS_LENGTH_SEMANTICS_BYTE;
-#endif
 
 /*
  * Define various GUC.
@@ -50,17 +39,5 @@ int	nls_length_semantics = NLS_LENGTH_SEMANTICS_BYTE;
 void
 IvorysqlOraDefineGucs(void)
 {
-#if 0
-	DefineCustomEnumVariable(
-		"ivorysql_ora.nls_length_semantics",
-		gettext_noop("Compatible Oracle NLS parameter for charater data type"),
-		NULL,
-		&nls_length_semantics,
-		NLS_LENGTH_SEMANTICS_BYTE, nls_length_semantics_options,
-		PGC_USERSET,
-		GUC_NOT_IN_SAMPLE,
-		NULL,
-		NULL,
-		NULL);
-#endif
+
 }
diff --git a/contrib/ivorysql_ora/src/include/common_datatypes.h b/contrib/ivorysql_ora/src/include/common_datatypes.h
index 551261f300d..a0f920e7ae7 100644
--- a/contrib/ivorysql_ora/src/include/common_datatypes.h
+++ b/contrib/ivorysql_ora/src/include/common_datatypes.h
@@ -17,7 +17,7 @@
  *
  * This file contains extern declarations for datatype common routines.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/include/common_datatypes.h
  *
diff --git a/contrib/ivorysql_ora/src/include/guc.h b/contrib/ivorysql_ora/src/include/guc.h
index ae94091061f..1d60e673902 100644
--- a/contrib/ivorysql_ora/src/include/guc.h
+++ b/contrib/ivorysql_ora/src/include/guc.h
@@ -17,7 +17,7 @@
  *
  * This file contains extern declarations for GUC.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/include/guc.h
  *
diff --git a/contrib/ivorysql_ora/src/include/ivorysql_ora.h b/contrib/ivorysql_ora/src/include/ivorysql_ora.h
index 3cc4295de11..a55f40372b0 100644
--- a/contrib/ivorysql_ora/src/include/ivorysql_ora.h
+++ b/contrib/ivorysql_ora/src/include/ivorysql_ora.h
@@ -17,7 +17,7 @@
  *
  * This file contains extern declarations for ivorysql_ora itself.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/include/ivorysql_ora.h
  *
diff --git a/contrib/ivorysql_ora/src/ivorysql_ora.c b/contrib/ivorysql_ora/src/ivorysql_ora.c
index 4ec0fc6ec20..d9738afbadd 100644
--- a/contrib/ivorysql_ora/src/ivorysql_ora.c
+++ b/contrib/ivorysql_ora/src/ivorysql_ora.c
@@ -17,7 +17,7 @@
  *
  * Ivorysql_ora main entrypoint.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/ivorysql_ora.c
  *
diff --git a/contrib/ivorysql_ora/src/merge/ora_merge.c b/contrib/ivorysql_ora/src/merge/ora_merge.c
index 2d01b369f2a..f472df7c10f 100644
--- a/contrib/ivorysql_ora/src/merge/ora_merge.c
+++ b/contrib/ivorysql_ora/src/merge/ora_merge.c
@@ -15,7 +15,7 @@
  *
  * Compatible with Oracle's Merge command.
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * contrib/ivorysql_ora/src/merge/ora_merge.c
  *
diff --git a/contrib/ivorysql_ora/src/sysview/sysview--1.0.sql b/contrib/ivorysql_ora/src/sysview/sysview--1.0.sql
index e92e5b5e00e..21c2d05fc5b 100644
--- a/contrib/ivorysql_ora/src/sysview/sysview--1.0.sql
+++ b/contrib/ivorysql_ora/src/sysview/sysview--1.0.sql
@@ -1086,7 +1086,7 @@ SELECT
 	decode(bitand(s.flags, 16), 16, 'Y', 'N') AS scale_flag,
 	decode(bitand(s.flags, 2048), 2048, 'Y', 'N') AS extend_flag,null AS shared_flag,
 	decode(bitand(s.flags, 64), 64, 'Y', 'N') AS session_flag,null AS keep_value
-	FROM PG_SEQUENCE s,pg_class c where s.seqrelid = c.oid and c.relowner::regrole = current_user::regrole;
+	FROM PG_SEQUENCE s,pg_class c where s.seqrelid = c.oid and pg_get_userbyid(c.relowner) = current_user;
 
 CREATE OR REPLACE VIEW SYS.DBA_VIEWS AS
 SELECT
diff --git a/contrib/ivorysql_ora/src/sysview/sysview_functions.c b/contrib/ivorysql_ora/src/sysview/sysview_functions.c
index d112e8f6413..54cb93bd7bc 100755
--- a/contrib/ivorysql_ora/src/sysview/sysview_functions.c
+++ b/contrib/ivorysql_ora/src/sysview/sysview_functions.c
@@ -19,7 +19,7 @@
  * 		Function which converts all-uppercase text to all-lowercase text 
  * 		and vice versa.
  *
- * Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		contrib/ivorysql_ora/src/sysview/sysview_functions.c
diff --git a/contrib/ivorysql_ora/src/xml_functions/ora_xml_functions.c b/contrib/ivorysql_ora/src/xml_functions/ora_xml_functions.c
index d65015fd633..564cf574414 100644
--- a/contrib/ivorysql_ora/src/xml_functions/ora_xml_functions.c
+++ b/contrib/ivorysql_ora/src/xml_functions/ora_xml_functions.c
@@ -18,7 +18,7 @@
  * Abstract:
  * 		This file implements the C functions that support the XML SQL functions
  *
- * Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		contrib/ivorysql_ora/src/xml_functions/ora_xml_functions.c
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 134f46a805e..3bcdaa3dce1 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -10,31 +10,77 @@
 #include "postgres.h"
 #include "ltree.h"
 
+#include "crc32.h"
+#include "utils/pg_crc.h"
 #ifdef LOWER_NODE
-#include <ctype.h>
-#define TOLOWER(x)	tolower((unsigned char) (x))
-#else
-#define TOLOWER(x)	(x)
+#include "catalog/pg_collation.h"
+#include "utils/pg_locale.h"
 #endif
 
-#include "crc32.h"
-#include "utils/pg_crc.h"
+#ifdef LOWER_NODE
 
 unsigned int
 ltree_crc32_sz(const char *buf, int size)
 {
 	pg_crc32	crc;
 	const char *p = buf;
+	const char *end = buf + size;
+	static pg_locale_t locale = NULL;
+
+	if (!locale)
+		locale = pg_newlocale_from_collation(DEFAULT_COLLATION_OID);
 
 	INIT_TRADITIONAL_CRC32(crc);
-	while (size > 0)
+	if (locale->ctype_is_c)
 	{
-		char		c = (char) TOLOWER(*p);
+		while (size > 0)
+		{
+			char		c = pg_ascii_tolower(*p);
+
+			COMP_TRADITIONAL_CRC32(crc, &c, 1);
+			size--;
+			p++;
+		}
+	}
+	else
+	{
+		while (size > 0)
+		{
+			char		foldstr[UNICODE_CASEMAP_BUFSZ];
+			int			srclen = pg_mblen_range(p, end);
+			size_t		foldlen;
+
+			/* fold one codepoint at a time */
+			foldlen = pg_strfold(foldstr, UNICODE_CASEMAP_BUFSZ, p, srclen,
+								 locale);
+
+			COMP_TRADITIONAL_CRC32(crc, foldstr, foldlen);
+
+			size -= srclen;
+			p += srclen;
+		}
+	}
+	FIN_TRADITIONAL_CRC32(crc);
+	return (unsigned int) crc;
+}
+
+#else
 
-		COMP_TRADITIONAL_CRC32(crc, &c, 1);
+unsigned int
+ltree_crc32_sz(const char *buf, int size)
+{
+	pg_crc32	crc;
+	const char *p = buf;
+
+	INIT_TRADITIONAL_CRC32(crc);
+	while (size > 0)
+	{
+		COMP_TRADITIONAL_CRC32(crc, p, 1);
 		size--;
 		p++;
 	}
 	FIN_TRADITIONAL_CRC32(crc);
 	return (unsigned int) crc;
 }
+
+#endif							/* !LOWER_NODE */
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index a6466f575fd..e15e726ad09 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -27,21 +27,21 @@ getlexeme(char *start, char *end, int *len)
 	char	   *ptr;
 
 	while (start < end && t_iseq(start, '_'))
-		start += pg_mblen(start);
+		start += pg_mblen_range(start, end);
 
 	ptr = start;
 	if (ptr >= end)
 		return NULL;
 
 	while (ptr < end && !t_iseq(ptr, '_'))
-		ptr += pg_mblen(ptr);
+		ptr += pg_mblen_range(ptr, end);
 
 	*len = ptr - start;
 	return start;
 }
 
 bool
-compare_subnode(ltree_level *t, char *qn, int len, int (*cmpptr) (const char *, const char *, size_t), bool anyend)
+compare_subnode(ltree_level *t, char *qn, int len, bool prefix, bool ci)
 {
 	char	   *endt = t->name + t->len;
 	char	   *endq = qn + len;
@@ -56,10 +56,8 @@ compare_subnode(ltree_level *t, char *qn, int len, int (*cmpptr) (const char *,
 		isok = false;
 		while ((tn = getlexeme(tn, endt, &lent)) != NULL)
 		{
-			if ((lent == lenq || (lent > lenq && anyend)) &&
-				(*cmpptr) (qn, tn, lenq) == 0)
+			if (ltree_label_match(qn, lenq, tn, lent, prefix, ci))
 			{
-
 				isok = true;
 				break;
 			}
@@ -74,17 +72,85 @@ compare_subnode(ltree_level *t, char *qn, int len, int (*cmpptr) (const char *,
 	return true;
 }
 
-int
-ltree_strncasecmp(const char *a, const char *b, size_t s)
+/*
+ * Check if the label matches the predicate string. If 'prefix' is true, then
+ * the predicate string is treated as a prefix. If 'ci' is true, then the
+ * predicate string is case-insensitive (and locale-aware).
+ */
+bool
+ltree_label_match(const char *pred, size_t pred_len, const char *label,
+				  size_t label_len, bool prefix, bool ci)
 {
-	char	   *al = str_tolower(a, s, DEFAULT_COLLATION_OID);
-	char	   *bl = str_tolower(b, s, DEFAULT_COLLATION_OID);
-	int			res;
+	static pg_locale_t locale = NULL;
+	char	   *fpred;			/* casefolded predicate */
+	size_t		fpred_len = pred_len;
+	char	   *flabel;			/* casefolded label */
+	size_t		flabel_len = label_len;
+	size_t		len;
+	bool		res;
+
+	/* fast path for binary match or binary prefix match */
+	if ((pred_len == label_len || (prefix && pred_len < label_len)) &&
+		strncmp(pred, label, pred_len) == 0)
+		return true;
+	else if (!ci)
+		return false;
+
+	if (!locale)
+		locale = pg_newlocale_from_collation(DEFAULT_COLLATION_OID);
+
+	if (locale->ctype_is_c)
+	{
+		if (pred_len > label_len || (!prefix && pred_len != label_len))
+			return false;
+
+		for (int i = 0; i < pred_len; i++)
+		{
+			if (pg_ascii_tolower(pred[i]) != pg_ascii_tolower(label[i]))
+				return false;
+		}
 
-	res = strncmp(al, bl, s);
+		return true;
+	}
 
-	pfree(al);
-	pfree(bl);
+	/*
+	 * Slow path for case-insensitive comparison: case fold and then compare.
+	 * This path is necessary even if pred_len > label_len, because the byte
+	 * lengths may change after casefolding.
+	 */
+
+	fpred = palloc(fpred_len + 1);
+	len = pg_strfold(fpred, fpred_len + 1, pred, pred_len, locale);
+	if (len > fpred_len)
+	{
+		/* grow buffer if needed and retry */
+		fpred_len = len;
+		fpred = repalloc(fpred, fpred_len + 1);
+		len = pg_strfold(fpred, fpred_len + 1, pred, pred_len, locale);
+	}
+	Assert(len <= fpred_len);
+	fpred_len = len;
+
+	flabel = palloc(flabel_len + 1);
+	len = pg_strfold(flabel, flabel_len + 1, label, label_len, locale);
+	if (len > flabel_len)
+	{
+		/* grow buffer if needed and retry */
+		flabel_len = len;
+		flabel = repalloc(flabel, flabel_len + 1);
+		len = pg_strfold(flabel, flabel_len + 1, label, label_len, locale);
+	}
+	Assert(len <= flabel_len);
+	flabel_len = len;
+
+	if ((fpred_len == flabel_len || (prefix && fpred_len < flabel_len)) &&
+		strncmp(fpred, flabel, fpred_len) == 0)
+		res = true;
+	else
+		res = false;
+
+	pfree(fpred);
+	pfree(flabel);
 
 	return res;
 }
@@ -109,19 +175,16 @@ checkLevel(lquery_level *curq, ltree_level *curt)
 
 	for (int i = 0; i < curq->numvar; i++)
 	{
-		int			(*cmpptr) (const char *, const char *, size_t);
-
-		cmpptr = (curvar->flag & LVAR_INCASE) ? ltree_strncasecmp : strncmp;
+		bool		prefix = (curvar->flag & LVAR_ANYEND);
+		bool		ci = (curvar->flag & LVAR_INCASE);
 
 		if (curvar->flag & LVAR_SUBLEXEME)
 		{
-			if (compare_subnode(curt, curvar->name, curvar->len, cmpptr,
-								(curvar->flag & LVAR_ANYEND)))
+			if (compare_subnode(curt, curvar->name, curvar->len, prefix, ci))
 				return success;
 		}
-		else if ((curvar->len == curt->len ||
-				  (curt->len > curvar->len && (curvar->flag & LVAR_ANYEND))) &&
-				 (*cmpptr) (curvar->name, curt->name, curvar->len) == 0)
+		else if (ltree_label_match(curvar->name, curvar->len, curt->name,
+								   curt->len, prefix, ci))
 			return success;
 
 		curvar = LVAR_NEXT(curvar);
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 5e0761641d3..226c1cb2115 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -127,7 +127,7 @@ typedef struct
 #define LQUERY_HASNOT		0x01
 
 /* valid label chars are alphanumerics, underscores and hyphens */
-#define ISLABEL(x) ( t_isalnum(x) || t_iseq(x, '_') || t_iseq(x, '-') )
+#define ISLABEL(x) ( t_isalnum_cstr(x) || t_iseq(x, '_') || t_iseq(x, '-') )
 
 /* full text query */
 
@@ -207,10 +207,11 @@ bool		ltree_execute(ITEM *curitem, void *checkval,
 
 int			ltree_compare(const ltree *a, const ltree *b);
 bool		inner_isparent(const ltree *c, const ltree *p);
-bool		compare_subnode(ltree_level *t, char *qn, int len,
-							int (*cmpptr) (const char *, const char *, size_t), bool anyend);
+bool		compare_subnode(ltree_level *t, char *qn, int len, bool prefix, bool ci);
 ltree	   *lca_inner(ltree **a, int len);
-int			ltree_strncasecmp(const char *a, const char *b, size_t s);
+bool		ltree_label_match(const char *pred, size_t pred_len,
+							  const char *label, size_t label_len,
+							  bool prefix, bool ci);
 
 /* fmgr macros for ltree objects */
 #define DatumGetLtreeP(X)			((ltree *) PG_DETOAST_DATUM(X))
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index 9f109cfe648..5192a184d02 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -7,6 +7,7 @@
 
 #include <ctype.h>
 
+#include "common/int.h"
 #include "crc32.h"
 #include "libpq/pqformat.h"
 #include "ltree.h"
@@ -54,7 +55,7 @@ parse_ltree(const char *buf, struct Node *escontext)
 	ptr = buf;
 	while (*ptr)
 	{
-		charlen = pg_mblen(ptr);
+		charlen = pg_mblen_cstr(ptr);
 		if (t_iseq(ptr, '.'))
 			num++;
 		ptr += charlen;
@@ -69,7 +70,7 @@ parse_ltree(const char *buf, struct Node *escontext)
 	ptr = buf;
 	while (*ptr)
 	{
-		charlen = pg_mblen(ptr);
+		charlen = pg_mblen_cstr(ptr);
 
 		switch (state)
 		{
@@ -291,7 +292,7 @@ parse_lquery(const char *buf, struct Node *escontext)
 	ptr = buf;
 	while (*ptr)
 	{
-		charlen = pg_mblen(ptr);
+		charlen = pg_mblen_cstr(ptr);
 
 		if (t_iseq(ptr, '.'))
 			num++;
@@ -311,7 +312,7 @@ parse_lquery(const char *buf, struct Node *escontext)
 	ptr = buf;
 	while (*ptr)
 	{
-		charlen = pg_mblen(ptr);
+		charlen = pg_mblen_cstr(ptr);
 
 		switch (state)
 		{
@@ -344,7 +345,12 @@ parse_lquery(const char *buf, struct Node *escontext)
 					lptr++;
 					lptr->start = ptr;
 					state = LQPRS_WAITDELIM;
-					curqlevel->numvar++;
+					if (pg_add_u16_overflow(curqlevel->numvar, 1, &curqlevel->numvar))
+						ereturn(escontext, NULL,
+								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+								 errmsg("lquery level has too many variants"),
+								 errdetail("Number of variants exceeds the maximum allowed (%d).",
+										   PG_UINT16_MAX)));
 				}
 				else
 					UNCHAR;
@@ -542,7 +548,16 @@ parse_lquery(const char *buf, struct Node *escontext)
 			lptr = GETVAR(curqlevel);
 			while (lptr - GETVAR(curqlevel) < curqlevel->numvar)
 			{
-				cur->totallen += MAXALIGN(LVAR_HDRSIZE + lptr->len);
+				int			newlen = cur->totallen + MAXALIGN(LVAR_HDRSIZE + lptr->len);
+
+				if (newlen > PG_UINT16_MAX)
+					ereturn(escontext, NULL,
+							(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+							 errmsg("lquery level is too large"),
+							 errdetail("Total size of level exceeds the maximum allowed (%d bytes).",
+									   PG_UINT16_MAX)));
+				cur->totallen = (uint16) newlen;
+
 				lrptr->len = lptr->len;
 				lrptr->flag = lptr->flag;
 				lrptr->val = ltree_crc32_sz(lptr->start, lptr->len);
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index fe0cae22277..5eca740cb35 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -64,7 +64,7 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
 
 	for (;;)
 	{
-		charlen = pg_mblen(state->buf);
+		charlen = pg_mblen_cstr(state->buf);
 
 		switch (state->state)
 		{
@@ -294,33 +294,71 @@ makepol(QPRS_STATE *state)
 	return END;
 }
 
-static void
-findoprnd(ITEM *ptr, int32 *pos)
+/*
+ * Recursively fill the "left" fields of an ITEM array that represents
+ * a valid postfix tree.
+ *
+ *	state: only needed for error reporting
+ *	ptr: starting element of array
+ *	pos: in/out argument, the array index this call is responsible to fill
+ *
+ * At exit, *pos has been incremented to point after the sub-tree whose
+ * top is the entry-time value of *pos.
+ *
+ * Returns true if okay, false if error (the only possible error is
+ * overflow of a "left" field).
+ */
+static bool
+findoprnd(QPRS_STATE *state, ITEM *ptr, int32 *pos)
 {
+	int32		mypos;
+
 	/* since this function recurses, it could be driven to stack overflow. */
 	check_stack_depth();
 
-	if (ptr[*pos].type == VAL || ptr[*pos].type == VALTRUE)
+	/* get the position this call is supposed to update */
+	mypos = *pos;
+
+	/* in all cases, we should increment *pos to advance over this item */
+	(*pos)++;
+
+	if (ptr[mypos].type == VAL || ptr[mypos].type == VALTRUE)
 	{
-		ptr[*pos].left = 0;
-		(*pos)++;
+		/* base case: a VAL has no operand, so just set its left to zero */
+		ptr[mypos].left = 0;
 	}
-	else if (ptr[*pos].val == (int32) '!')
+	else if (ptr[mypos].val == (int32) '!')
 	{
-		ptr[*pos].left = 1;
-		(*pos)++;
-		findoprnd(ptr, pos);
+		/* unary operator, likewise easy: operand is just after it */
+		ptr[mypos].left = 1;
+		/* recurse to scan operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
 	}
 	else
 	{
-		ITEM	   *curitem = &ptr[*pos];
-		int32		tmp = *pos;
-
-		(*pos)++;
-		findoprnd(ptr, pos);
-		curitem->left = *pos - tmp;
-		findoprnd(ptr, pos);
+		/* binary operator */
+		int32		delta;
+
+		/* recurse to scan right operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
+		/* we must fill left with offset to left operand's top */
+		/* delta can't overflow, see LTXTQUERY_TOO_BIG ... */
+		delta = *pos - mypos;
+		/* ... but it might be too large to fit in the 16-bit left field */
+		Assert(delta > 0);
+		if (unlikely(delta > PG_INT16_MAX))
+			ereturn(state->escontext, false,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("ltxtquery is too large")));
+		ptr[mypos].left = (int16) delta;
+		/* recurse to scan left operand */
+		if (!findoprnd(state, ptr, pos))
+			return false;
 	}
+
+	return true;
 }
 
 
@@ -396,7 +434,10 @@ queryin(char *buf, struct Node *escontext)
 
 	/* set left operand's position for every operator */
 	pos = 0;
-	findoprnd(ptr, &pos);
+	if (!findoprnd(&state, ptr, &pos))
+		return NULL;
+	/* if successful, findoprnd should have scanned the whole array */
+	Assert(pos == state.num);
 
 	return query;
 }
diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
index 002102c9c75..0e6612ff77a 100644
--- a/contrib/ltree/ltxtquery_op.c
+++ b/contrib/ltree/ltxtquery_op.c
@@ -58,19 +58,18 @@ checkcondition_str(void *checkval, ITEM *val)
 	ltree_level *level = LTREE_FIRST(((CHKVAL *) checkval)->node);
 	int			tlen = ((CHKVAL *) checkval)->node->numlevel;
 	char	   *op = ((CHKVAL *) checkval)->operand + val->distance;
-	int			(*cmpptr) (const char *, const char *, size_t);
+	bool		prefix = (val->flag & LVAR_ANYEND);
+	bool		ci = (val->flag & LVAR_INCASE);
 
-	cmpptr = (val->flag & LVAR_INCASE) ? ltree_strncasecmp : strncmp;
 	while (tlen > 0)
 	{
 		if (val->flag & LVAR_SUBLEXEME)
 		{
-			if (compare_subnode(level, op, val->length, cmpptr, (val->flag & LVAR_ANYEND)))
+			if (compare_subnode(level, op, val->length, prefix, ci))
 				return true;
 		}
-		else if ((val->length == level->len ||
-				  (level->len > val->length && (val->flag & LVAR_ANYEND))) &&
-				 (*cmpptr) (op, level->name, val->length) == 0)
+		else if (ltree_label_match(op, val->length, level->name, level->len,
+								   prefix, ci))
 			return true;
 
 		tlen--;
diff --git a/contrib/meson.build b/contrib/meson.build
index cf6c32954c2..fc188a153f4 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 contrib_mod_args = pg_mod_args
diff --git a/contrib/ora_btree_gin/.gitignore b/contrib/ora_btree_gin/.gitignore
new file mode 100644
index 00000000000..7da67cb0cc9
--- /dev/null
+++ b/contrib/ora_btree_gin/.gitignore
@@ -0,0 +1,5 @@
+# Generated files
+/ivorysql_ora--1.0.sql
+# Generated subdirectories
+/log/
+/results/
diff --git a/contrib/ora_btree_gin/meson.build b/contrib/ora_btree_gin/meson.build
index ac505872829..7f843018c07 100644
--- a/contrib/ora_btree_gin/meson.build
+++ b/contrib/ora_btree_gin/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 btree_gin_sources = files(
   'ora_btree_gin.c',
diff --git a/contrib/ora_btree_gist/btree_gist.h b/contrib/ora_btree_gist/btree_gist.h
index 6885b7d2ebb..8d89745ac85 100644
--- a/contrib/ora_btree_gist/btree_gist.h
+++ b/contrib/ora_btree_gist/btree_gist.h
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * 
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * contrib/btree_gist/btree_gist.h
  */
 #ifndef __BTREE_GIST_H__
diff --git a/contrib/ora_btree_gist/btree_utils_num.h b/contrib/ora_btree_gist/btree_utils_num.h
index 38c51a4567e..c75934c9fb6 100644
--- a/contrib/ora_btree_gist/btree_utils_num.h
+++ b/contrib/ora_btree_gist/btree_utils_num.h
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * 
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * contrib/btree_gist/btree_utils_num.h
  */
 #ifndef __BTREE_UTILS_NUM_H__
diff --git a/contrib/ora_btree_gist/btree_utils_var.h b/contrib/ora_btree_gist/btree_utils_var.h
index c1c83ccb5c3..10fe05e0a78 100644
--- a/contrib/ora_btree_gist/btree_utils_var.h
+++ b/contrib/ora_btree_gist/btree_utils_var.h
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * 
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * contrib/btree_gist/btree_utils_var.h
  */
 #ifndef __BTREE_UTILS_VAR_H__
diff --git a/contrib/ora_btree_gist/meson.build b/contrib/ora_btree_gist/meson.build
index 926b972713e..2976ceff019 100644
--- a/contrib/ora_btree_gist/meson.build
+++ b/contrib/ora_btree_gist/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 btree_gist_sources = files(
   'btree_binary_double.c',
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index c1997a02780..8743afc66d0 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -86,7 +86,7 @@ text_to_bits(char *str, int len)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
 					 errmsg("invalid character \"%.*s\" in t_bits string",
-							pg_mblen(str + off), str + off)));
+							pg_mblen_cstr(str + off), str + off)));
 
 		if (off % 8 == 7)
 			bits[off / 8] = byte;
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index 4b007f6e1b0..7d6af3f55eb 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -194,6 +194,8 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
 			BufferDesc *bufHdr;
 			uint32		buf_state;
 
+			CHECK_FOR_INTERRUPTS();
+
 			bufHdr = GetBufferDescriptor(i);
 			/* Lock each buffer header before inspecting. */
 			buf_state = LockBufHdr(bufHdr);
@@ -320,7 +322,6 @@ pg_buffercache_numa_pages(PG_FUNCTION_ARGS)
 		uint64		os_page_count;
 		int			pages_per_buffer;
 		int			max_entries;
-		volatile uint64 touch pg_attribute_unused();
 		char	   *startptr,
 				   *endptr;
 
@@ -365,7 +366,7 @@ pg_buffercache_numa_pages(PG_FUNCTION_ARGS)
 
 		/* Used to determine the NUMA node for all OS pages at once */
 		os_page_ptrs = palloc0(sizeof(void *) * os_page_count);
-		os_page_status = palloc(sizeof(uint64) * os_page_count);
+		os_page_status = palloc(sizeof(int) * os_page_count);
 
 		/* Fill pointers for all the memory pages. */
 		idx = 0;
@@ -375,7 +376,7 @@ pg_buffercache_numa_pages(PG_FUNCTION_ARGS)
 
 			/* Only need to touch memory once per backend process lifetime */
 			if (firstNumaTouch)
-				pg_numa_touch_mem_if_required(touch, ptr);
+				pg_numa_touch_mem_if_required(ptr);
 		}
 
 		Assert(idx == os_page_count);
@@ -525,8 +526,18 @@ pg_buffercache_numa_pages(PG_FUNCTION_ARGS)
 		values[1] = Int64GetDatum(fctx->record[i].page_num);
 		nulls[1] = false;
 
-		values[2] = Int32GetDatum(fctx->record[i].numa_node);
-		nulls[2] = false;
+		/* status is valid node number */
+		if (fctx->record[i].numa_node >= 0)
+		{
+			values[2] = Int32GetDatum(fctx->record[i].numa_node);
+			nulls[2] = false;
+		}
+		else
+		{
+			/* some kind of error (e.g. pages moved to swap) */
+			values[2] = (Datum) 0;
+			nulls[2] = true;
+		}
 
 		/* Build and return the tuple. */
 		tuple = heap_form_tuple(fctx->tupdesc, values, nulls);
@@ -561,6 +572,8 @@ pg_buffercache_summary(PG_FUNCTION_ARGS)
 		BufferDesc *bufHdr;
 		uint32		buf_state;
 
+		CHECK_FOR_INTERRUPTS();
+
 		/*
 		 * This function summarizes the state of all headers. Locking the
 		 * buffer headers wouldn't provide an improved result as the state of
@@ -621,6 +634,8 @@ pg_buffercache_usage_counts(PG_FUNCTION_ARGS)
 		uint32		buf_state = pg_atomic_read_u32(&bufHdr->state);
 		int			usage_count;
 
+		CHECK_FOR_INTERRUPTS();
+
 		usage_count = BUF_STATE_GET_USAGECOUNT(buf_state);
 		usage_counts[usage_count]++;
 
diff --git a/contrib/pg_overexplain/expected/ivy_pg_overexplain.out b/contrib/pg_overexplain/expected/ivy_pg_overexplain.out
index c190fe1df65..f2fb042b79f 100644
--- a/contrib/pg_overexplain/expected/ivy_pg_overexplain.out
+++ b/contrib/pg_overexplain/expected/ivy_pg_overexplain.out
@@ -292,9 +292,9 @@ $$);
          <Security-Barrier>false</Security-Barrier>                 +
          <Lateral>false</Lateral>                                   +
        </Range-Table-Entry>                                         +
-       <Unprunable-RTIs>1 3 4</Unprunable-RTIs>                     +
-       <Result-RTIs>none</Result-RTIs>                              +
      </Range-Table>                                                 +
+     <Unprunable-RTIs>1 3 4</Unprunable-RTIs>                       +
+     <Result-RTIs>none</Result-RTIs>                                +
    </Query>                                                         +
  </explain>
 (1 row)
diff --git a/contrib/pg_overexplain/expected/pg_overexplain.out b/contrib/pg_overexplain/expected/pg_overexplain.out
index 6de02323d7c..0c1d32d386e 100644
--- a/contrib/pg_overexplain/expected/pg_overexplain.out
+++ b/contrib/pg_overexplain/expected/pg_overexplain.out
@@ -291,13 +291,130 @@ $$);
          <Security-Barrier>false</Security-Barrier>                 +
          <Lateral>false</Lateral>                                   +
        </Range-Table-Entry>                                         +
-       <Unprunable-RTIs>1 3 4</Unprunable-RTIs>                     +
-       <Result-RTIs>none</Result-RTIs>                              +
      </Range-Table>                                                 +
+     <Unprunable-RTIs>1 3 4</Unprunable-RTIs>                       +
+     <Result-RTIs>none</Result-RTIs>                                +
    </Query>                                                         +
  </explain>
 (1 row)
 
+-- Test JSON format with RANGE_TABLE to verify valid JSON structure.
+SELECT explain_filter($$
+EXPLAIN (RANGE_TABLE, FORMAT JSON, COSTS OFF)
+SELECT genus, array_agg(name ORDER BY name) FROM vegetables GROUP BY genus
+$$);
+                         explain_filter                         
+----------------------------------------------------------------
+ [                                                             +
+   {                                                           +
+     "Plan": {                                                 +
+       "Node Type": "Aggregate",                               +
+       "Strategy": "Sorted",                                   +
+       "Partial Mode": "Simple",                               +
+       "Parallel Aware": false,                                +
+       "Async Capable": false,                                 +
+       "Disabled": false,                                      +
+       "Group Key": ["vegetables.genus"],                      +
+       "Plans": [                                              +
+         {                                                     +
+           "Node Type": "Sort",                                +
+           "Parent Relationship": "Outer",                     +
+           "Parallel Aware": false,                            +
+           "Async Capable": false,                             +
+           "Disabled": false,                                  +
+           "Sort Key": ["vegetables.genus", "vegetables.name"],+
+           "Plans": [                                          +
+             {                                                 +
+               "Node Type": "Append",                          +
+               "Parent Relationship": "Outer",                 +
+               "Parallel Aware": false,                        +
+               "Async Capable": false,                         +
+               "Disabled": false,                              +
+               "Append RTIs": "1",                             +
+               "Subplans Removed": 0,                          +
+               "Plans": [                                      +
+                 {                                             +
+                   "Node Type": "Seq Scan",                    +
+                   "Parent Relationship": "Member",            +
+                   "Parallel Aware": false,                    +
+                   "Async Capable": false,                     +
+                   "Relation Name": "brassica",                +
+                   "Alias": "vegetables_1",                    +
+                   "Disabled": false,                          +
+                   "Scan RTI": 3                               +
+                 },                                            +
+                 {                                             +
+                   "Node Type": "Seq Scan",                    +
+                   "Parent Relationship": "Member",            +
+                   "Parallel Aware": false,                    +
+                   "Async Capable": false,                     +
+                   "Relation Name": "daucus",                  +
+                   "Alias": "vegetables_2",                    +
+                   "Disabled": false,                          +
+                   "Scan RTI": 4                               +
+                 }                                             +
+               ]                                               +
+             }                                                 +
+           ]                                                   +
+         }                                                     +
+       ]                                                       +
+     },                                                        +
+     "Range Table": [                                          +
+       {                                                       +
+         "RTI": 1,                                             +
+         "Kind": "relation",                                   +
+         "Inherited": true,                                    +
+         "In From Clause": true,                               +
+         "Eref": "vegetables (id, name, genus)",               +
+         "Relation": "vegetables",                             +
+         "Relation Kind": "partitioned_table",                 +
+         "Relation Lock Mode": "AccessShareLock",              +
+         "Permission Info Index": 1,                           +
+         "Security Barrier": false,                            +
+         "Lateral": false                                      +
+       },                                                      +
+       {                                                       +
+         "RTI": 2,                                             +
+         "Kind": "group",                                      +
+         "Inherited": false,                                   +
+         "In From Clause": false,                              +
+         "Eref": "\"*GROUP*\" (genus)",                        +
+         "Security Barrier": false,                            +
+         "Lateral": false                                      +
+       },                                                      +
+       {                                                       +
+         "RTI": 3,                                             +
+         "Kind": "relation",                                   +
+         "Inherited": false,                                   +
+         "In From Clause": true,                               +
+         "Alias": "vegetables (id, name, genus)",              +
+         "Eref": "vegetables (id, name, genus)",               +
+         "Relation": "brassica",                               +
+         "Relation Kind": "relation",                          +
+         "Relation Lock Mode": "AccessShareLock",              +
+         "Security Barrier": false,                            +
+         "Lateral": false                                      +
+       },                                                      +
+       {                                                       +
+         "RTI": 4,                                             +
+         "Kind": "relation",                                   +
+         "Inherited": false,                                   +
+         "In From Clause": true,                               +
+         "Alias": "vegetables (id, name, genus)",              +
+         "Eref": "vegetables (id, name, genus)",               +
+         "Relation": "daucus",                                 +
+         "Relation Kind": "relation",                          +
+         "Relation Lock Mode": "AccessShareLock",              +
+         "Security Barrier": false,                            +
+         "Lateral": false                                      +
+       }                                                       +
+     ],                                                        +
+     "Unprunable RTIs": "1 3 4",                               +
+     "Result RTIs": "none"                                     +
+   }                                                           +
+ ]
+(1 row)
+
 -- Test just the DEBUG option. Verify that it shows information about
 -- disabled nodes, parallel safety, and the parallelModeNeeded flag.
 SET enable_seqscan = false;
diff --git a/contrib/pg_overexplain/pg_overexplain.c b/contrib/pg_overexplain/pg_overexplain.c
index de824566f8c..78f128562e6 100644
--- a/contrib/pg_overexplain/pg_overexplain.c
+++ b/contrib/pg_overexplain/pg_overexplain.c
@@ -658,7 +658,14 @@ overexplain_range_table(PlannedStmt *plannedstmt, ExplainState *es)
 		ExplainCloseGroup("Range Table Entry", NULL, true, es);
 	}
 
-	/* Print PlannedStmt fields that contain RTIs. */
+	/* Close the Range Table array before emitting PlannedStmt-level fields. */
+	ExplainCloseGroup("Range Table", "Range Table", false, es);
+
+	/*
+	 * Print PlannedStmt fields that contain RTIs.  These are properties of
+	 * the PlannedStmt, not of individual RTEs, so they belong outside the
+	 * Range Table array.
+	 */
 	if (es->format != EXPLAIN_FORMAT_TEXT ||
 		!bms_is_empty(plannedstmt->unprunableRelids))
 		overexplain_bitmapset("Unprunable RTIs", plannedstmt->unprunableRelids,
@@ -666,9 +673,6 @@ overexplain_range_table(PlannedStmt *plannedstmt, ExplainState *es)
 	if (es->format != EXPLAIN_FORMAT_TEXT ||
 		plannedstmt->resultRelations != NIL)
 		overexplain_intlist("Result RTIs", plannedstmt->resultRelations, es);
-
-	/* Close group, we're all done */
-	ExplainCloseGroup("Range Table", "Range Table", false, es);
 }
 
 /*
diff --git a/contrib/pg_overexplain/sql/pg_overexplain.sql b/contrib/pg_overexplain/sql/pg_overexplain.sql
index 42e275ac2f9..4703ac3e3d7 100644
--- a/contrib/pg_overexplain/sql/pg_overexplain.sql
+++ b/contrib/pg_overexplain/sql/pg_overexplain.sql
@@ -66,6 +66,12 @@ EXPLAIN (DEBUG, RANGE_TABLE, FORMAT XML, COSTS OFF)
 SELECT genus, array_agg(name ORDER BY name) FROM vegetables GROUP BY genus
 $$);
 
+-- Test JSON format with RANGE_TABLE to verify valid JSON structure.
+SELECT explain_filter($$
+EXPLAIN (RANGE_TABLE, FORMAT JSON, COSTS OFF)
+SELECT genus, array_agg(name ORDER BY name) FROM vegetables GROUP BY genus
+$$);
+
 -- Test just the DEBUG option. Verify that it shows information about
 -- disabled nodes, parallel safety, and the parallelModeNeeded flag.
 SET enable_seqscan = false;
diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index b968933ea8b..5b519a2c854 100644
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -16,9 +16,11 @@
 #include <unistd.h>
 
 #include "access/relation.h"
+#include "catalog/index.h"
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
+#include "storage/lmgr.h"
 #include "storage/read_stream.h"
 #include "storage/smgr.h"
 #include "utils/acl.h"
@@ -71,6 +73,8 @@ pg_prewarm(PG_FUNCTION_ARGS)
 	char	   *ttype;
 	PrewarmType ptype;
 	AclResult	aclresult;
+	char		relkind;
+	Oid			privOid;
 
 	/* Basic sanity checking. */
 	if (PG_ARGISNULL(0))
@@ -106,9 +110,43 @@ pg_prewarm(PG_FUNCTION_ARGS)
 	forkString = text_to_cstring(forkName);
 	forkNumber = forkname_to_number(forkString);
 
-	/* Open relation and check privileges. */
+	/*
+	 * Open relation and check privileges.  If the relation is an index, we
+	 * must check the privileges on its parent table instead.
+	 */
+	relkind = get_rel_relkind(relOid);
+	if (relkind == RELKIND_INDEX ||
+		relkind == RELKIND_PARTITIONED_INDEX)
+	{
+		privOid = IndexGetRelation(relOid, true);
+
+		/* Lock table before index to avoid deadlock. */
+		if (OidIsValid(privOid))
+			LockRelationOid(privOid, AccessShareLock);
+	}
+	else
+		privOid = relOid;
+
 	rel = relation_open(relOid, AccessShareLock);
-	aclresult = pg_class_aclcheck(relOid, GetUserId(), ACL_SELECT);
+
+	/*
+	 * It's possible that the relation with OID "privOid" was dropped and the
+	 * OID was reused before we locked it.  If that happens, we could be left
+	 * with the wrong parent table OID, in which case we must ERROR.  It's
+	 * possible that such a race would change the outcome of
+	 * get_rel_relkind(), too, but the worst case scenario there is that we'll
+	 * check privileges on the index instead of its parent table, which isn't
+	 * too terrible.
+	 */
+	if (!OidIsValid(privOid) ||
+		(privOid != relOid &&
+		 privOid != IndexGetRelation(relOid, true)))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_TABLE),
+				 errmsg("could not find parent table of index \"%s\"",
+						RelationGetRelationName(rel))));
+
+	aclresult = pg_class_aclcheck(privOid, GetUserId(), ACL_SELECT);
 	if (aclresult != ACLCHECK_OK)
 		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind), get_rel_name(relOid));
 
@@ -233,8 +271,11 @@ pg_prewarm(PG_FUNCTION_ARGS)
 		read_stream_end(stream);
 	}
 
-	/* Close relation, release lock. */
+	/* Close relation, release locks. */
 	relation_close(rel, AccessShareLock);
 
+	if (privOid != relOid)
+		UnlockRelationOid(privOid, AccessShareLock);
+
 	PG_RETURN_INT64(blocks_done);
 }
diff --git a/contrib/pg_prewarm/t/001_basic.pl b/contrib/pg_prewarm/t/001_basic.pl
index d87493d4347..caf524d9592 100644
--- a/contrib/pg_prewarm/t/001_basic.pl
+++ b/contrib/pg_prewarm/t/001_basic.pl
@@ -11,7 +11,7 @@
 
 my $node = PostgreSQL::Test::Cluster->new('main');
 
-$node->init;
+$node->init('auth_extra' => [ '--create-role', 'test_user' ]);
 $node->append_conf(
 	'postgresql.conf',
 	qq{shared_preload_libraries = 'pg_prewarm'
@@ -23,7 +23,9 @@
 $node->safe_psql("postgres",
 	    "CREATE EXTENSION pg_prewarm;\n"
 	  . "CREATE TABLE test(c1 int);\n"
-	  . "INSERT INTO test SELECT generate_series(1, 100);");
+	  . "INSERT INTO test SELECT generate_series(1, 100);\n"
+	  . "CREATE INDEX test_idx ON test(c1);\n"
+	  . "CREATE ROLE test_user LOGIN;");
 
 # test read mode
 my $result =
@@ -42,6 +44,31 @@
 		  or $stderr =~ qr/prefetch is not supported by this build/),
 	'prefetch mode succeeded');
 
+# test_user should be unable to prewarm table/index without privileges
+($cmdret, $stdout, $stderr) =
+  $node->psql(
+    "postgres", "SELECT pg_prewarm('test');",
+    extra_params => [ '--username' => 'test_user' ]);
+ok($stderr =~ /permission denied for table test/, 'pg_prewarm failed as expected');
+($cmdret, $stdout, $stderr) =
+  $node->psql(
+    "postgres", "SELECT pg_prewarm('test_idx');",
+    extra_params => [ '--username' => 'test_user' ]);
+ok($stderr =~ /permission denied for index test_idx/, 'pg_prewarm failed as expected');
+
+# test_user should be able to prewarm table/index with privileges
+$node->safe_psql("postgres", "GRANT SELECT ON test TO test_user;");
+$result =
+  $node->safe_psql(
+    "postgres", "SELECT pg_prewarm('test');",
+    extra_params => [ '--username' => 'test_user' ]);
+like($result, qr/^[1-9][0-9]*$/, 'pg_prewarm succeeded as expected');
+$result =
+  $node->safe_psql(
+    "postgres", "SELECT pg_prewarm('test_idx');",
+    extra_params => [ '--username' => 'test_user' ]);
+like($result, qr/^[1-9][0-9]*$/, 'pg_prewarm succeeded as expected');
+
 # test autoprewarm_dump_now()
 $result = $node->safe_psql("postgres", "SELECT autoprewarm_dump_now();");
 like($result, qr/^[1-9][0-9]*$/, 'autoprewarm_dump_now succeeded');
diff --git a/contrib/pg_stat_statements/expected/ivy_squashing.out b/contrib/pg_stat_statements/expected/ivy_squashing.out
index cb316616a09..80961df2943 100644
--- a/contrib/pg_stat_statements/expected/ivy_squashing.out
+++ b/contrib/pg_stat_statements/expected/ivy_squashing.out
@@ -1,6 +1,7 @@
 --
 -- Const squashing functionality
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 --
 -- Simple Lists
@@ -812,6 +813,23 @@ SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
  select where $1 IN ($2 /*, ... */)                 |     2
 (2 rows)
 
+-- IN and ANY clauses with Vars are not squashed.
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN (1, 2, 3, b.id, b.id + 1);
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
+SELECT * FROM test_squash a, test_squash b WHERE a.id = ANY (array[1, ((b.id + b.id * 2)), 5]);
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4) \bind 1 2 3 1
+;
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
 --
 -- cleanup
 --
diff --git a/contrib/pg_stat_statements/expected/ivy_utility.out b/contrib/pg_stat_statements/expected/ivy_utility.out
index dd873f0fc09..6dbef1429b0 100644
--- a/contrib/pg_stat_statements/expected/ivy_utility.out
+++ b/contrib/pg_stat_statements/expected/ivy_utility.out
@@ -1,6 +1,7 @@
 --
 -- Utility commands
 --
+\set EXECUTE_RUN_PREPARE on
 -- These tests require track_utility to be enabled.
 SET pg_stat_statements.track_utility = TRUE;
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;
diff --git a/contrib/pg_stat_statements/expected/planning.out b/contrib/pg_stat_statements/expected/planning.out
index 9effd11fdc8..6c99fe0c4c6 100644
--- a/contrib/pg_stat_statements/expected/planning.out
+++ b/contrib/pg_stat_statements/expected/planning.out
@@ -1,6 +1,7 @@
 --
 -- Information related to planning
 --
+\set EXECUTE_RUN_PREPARE on
 -- These tests require track_planning to be enabled.
 SET pg_stat_statements.track_planning = TRUE;
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;
diff --git a/contrib/pg_stat_statements/expected/select.out b/contrib/pg_stat_statements/expected/select.out
index 75c896f3885..47b86fcedb9 100644
--- a/contrib/pg_stat_statements/expected/select.out
+++ b/contrib/pg_stat_statements/expected/select.out
@@ -1,6 +1,7 @@
 --
 -- SELECT statements
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 SET pg_stat_statements.track_utility = FALSE;
 SET pg_stat_statements.track_planning = TRUE;
@@ -459,6 +460,102 @@ SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FETCH FIRST%';
      2
 (1 row)
 
+-- GROUP BY, HAVING, GROUPING
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a, b;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b, a;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY GROUPING SETS(a, ());
+ count 
+-------
+     1
+     1
+(2 rows)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY GROUPING SETS(b, ());
+ count 
+-------
+     1
+     1
+(2 rows)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a HAVING a = 1;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a HAVING a = 2;
+ count 
+-------
+(0 rows)
+
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b HAVING b = 1;
+ count 
+-------
+(0 rows)
+
+SELECT GROUPING(a) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a;
+ grouping 
+----------
+        0
+(1 row)
+
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b;
+ grouping 
+----------
+        0
+(1 row)
+
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a, b;
+ grouping 
+----------
+        0
+(1 row)
+
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b, a;
+ grouping 
+----------
+        0
+(1 row)
+
+SELECT calls, query FROM pg_stat_statements WHERE query LIKE '%GROUP BY%' ORDER BY query COLLATE "C";
+ calls |                                           query                                           
+-------+-------------------------------------------------------------------------------------------
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY GROUPING SETS(a, ())
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY GROUPING SETS(b, ())
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY a
+     2 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY a HAVING a = $3
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY a, b
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY b
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY b HAVING b = $3
+     1 | SELECT COUNT(*) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY b, a
+     1 | SELECT GROUPING(a) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY a
+     1 | SELECT GROUPING(b) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY a, b
+     1 | SELECT GROUPING(b) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY b
+     1 | SELECT GROUPING(b) FROM (VALUES ($1::INT, $2::INT)) AS t(a, b) GROUP BY b, a
+(12 rows)
+
 -- GROUP BY [DISTINCT]
 SELECT a, b, c
 FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
@@ -548,7 +645,7 @@ SELECT (
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
  count 
 -------
-     2
+     6
 (1 row)
 
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;
diff --git a/contrib/pg_stat_statements/expected/squashing.out b/contrib/pg_stat_statements/expected/squashing.out
index f952f47ef7b..6963a434db9 100644
--- a/contrib/pg_stat_statements/expected/squashing.out
+++ b/contrib/pg_stat_statements/expected/squashing.out
@@ -809,6 +809,104 @@ SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
  select where $1 IN ($2 /*, ... */)                 |     2
 (2 rows)
 
+-- composite function with row expansion
+create table test_composite(x integer);
+CREATE FUNCTION composite_f(a integer[], out x integer, out y integer) returns
+record as $$            begin
+        x = a[1];
+        y = a[2];
+    end;
+$$ language plpgsql;
+SELECT pg_stat_statements_reset() IS NOT NULL AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT ((composite_f(array[1, 2]))).* FROM test_composite;
+ x | y 
+---+---
+(0 rows)
+
+SELECT ((composite_f(array[1, 2, 3]))).* FROM test_composite;
+ x | y 
+---+---
+(0 rows)
+
+SELECT ((composite_f(array[1, 2, 3]))).*, 1, 2, 3, ((composite_f(array[1, 2, 3]))).*, 1, 2
+FROM test_composite
+WHERE x IN (1, 2, 3);
+ x | y | ?column? | ?column? | ?column? | x | y | ?column? | ?column? 
+---+---+----------+----------+----------+---+---+----------+----------
+(0 rows)
+
+SELECT ((composite_f(array[1, $1, 3]))).*, 1 FROM test_composite \bind 1
+;
+ x | y | ?column? 
+---+---+----------
+(0 rows)
+
+-- ROW() expression with row expansion
+SELECT (ROW(ARRAY[1,2])).*;
+  f1   
+-------
+ {1,2}
+(1 row)
+
+SELECT (ROW(ARRAY[1, 2], ARRAY[1, 2, 3])).*;
+  f1   |   f2    
+-------+---------
+ {1,2} | {1,2,3}
+(1 row)
+
+SELECT 1, 2, (ROW(ARRAY[1, 2], ARRAY[1, 2, 3])).*, 3, 4;
+ ?column? | ?column? |  f1   |   f2    | ?column? | ?column? 
+----------+----------+-------+---------+----------+----------
+        1 |        2 | {1,2} | {1,2,3} |        3 |        4
+(1 row)
+
+SELECT (ROW(ARRAY[1, 2], ARRAY[1, $1, 3])).*, 1 \bind 1
+;
+  f1   |   f2    | ?column? 
+-------+---------+----------
+ {1,2} | {1,1,3} |        1
+(1 row)
+
+-- IN and ANY clauses with Vars are not squashed.
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN (1, 2, 3, b.id, b.id + 1);
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
+SELECT * FROM test_squash a, test_squash b WHERE a.id = ANY (array[1, ((b.id + b.id * 2)), 5]);
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4) \bind 1 2 3 1
+;
+ id | data | id | data 
+----+------+----+------
+(0 rows)
+
+SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
+                                                    query                                                    | calls 
+-------------------------------------------------------------------------------------------------------------+-------
+ SELECT $1, $2, (ROW(ARRAY[$3 /*, ... */], ARRAY[$4 /*, ... */])).*, $5, $6                                  |     1
+ SELECT ((composite_f(array[$1 /*, ... */]))).* FROM test_composite                                          |     2
+ SELECT ((composite_f(array[$1 /*, ... */]))).*, $2 FROM test_composite                                      |     1
+ SELECT ((composite_f(array[$1 /*, ... */]))).*, $2, $3, $4, ((composite_f(array[$5 /*, ... */]))).*, $6, $7+|     1
+ FROM test_composite                                                                                        +| 
+ WHERE x IN ($8 /*, ... */)                                                                                  | 
+ SELECT (ROW(ARRAY[$1 /*, ... */])).*                                                                        |     1
+ SELECT (ROW(ARRAY[$1 /*, ... */], ARRAY[$2 /*, ... */])).*                                                  |     1
+ SELECT (ROW(ARRAY[$1 /*, ... */], ARRAY[$2 /*, ... */])).*, $3                                              |     1
+ SELECT * FROM test_squash a, test_squash b WHERE a.id = ANY (array[$1, ((b.id + b.id * $2)), $3])           |     1
+ SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4)                      |     1
+ SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4)                      |     1
+ SELECT pg_stat_statements_reset() IS NOT NULL AS t                                                          |     1
+(11 rows)
+
 --
 -- cleanup
 --
@@ -818,3 +916,5 @@ DROP TABLE test_squash_numeric;
 DROP TABLE test_squash_bigint;
 DROP TABLE test_squash_cast CASCADE;
 DROP TABLE test_squash_jsonb;
+DROP TABLE test_composite;
+DROP FUNCTION composite_f;
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 52f3790c4c9..e3dce9613ad 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -34,7 +34,7 @@
  * in the file to be read or written while holding only shared lock.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2008-2025, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
@@ -805,7 +805,7 @@ pgss_shmem_shutdown(int code, Datum arg)
 	if (fwrite(&pgss->stats, sizeof(pgssGlobalStats), 1, file) != 1)
 		goto error;
 
-	free(qbuffer);
+	pfree(qbuffer);
 	qbuffer = NULL;
 
 	if (FreeFile(file))
@@ -829,7 +829,8 @@ pgss_shmem_shutdown(int code, Datum arg)
 			(errcode_for_file_access(),
 			 errmsg("could not write file \"%s\": %m",
 					PGSS_DUMP_FILE ".tmp")));
-	free(qbuffer);
+	if (qbuffer)
+		pfree(qbuffer);
 	if (file)
 		FreeFile(file);
 	unlink(PGSS_DUMP_FILE ".tmp");
@@ -1798,7 +1799,8 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
 			pgss->extent != extent ||
 			pgss->gc_count != gc_count)
 		{
-			free(qbuffer);
+			if (qbuffer)
+				pfree(qbuffer);
 			qbuffer = qtext_load_file(&qbuffer_size);
 		}
 	}
@@ -2013,7 +2015,8 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
 
 	LWLockRelease(pgss->lock);
 
-	free(qbuffer);
+	if (qbuffer)
+		pfree(qbuffer);
 }
 
 /* Number of output arguments (columns) for pg_stat_statements_info */
@@ -2300,7 +2303,7 @@ qtext_store(const char *query, int query_len,
 }
 
 /*
- * Read the external query text file into a malloc'd buffer.
+ * Read the external query text file into a palloc'd buffer.
  *
  * Returns NULL (without throwing an error) if unable to read, eg
  * file not there or insufficient memory.
@@ -2342,7 +2345,7 @@ qtext_load_file(Size *buffer_size)
 
 	/* Allocate buffer; beware that off_t might be wider than size_t */
 	if (stat.st_size <= MaxAllocHugeSize)
-		buf = (char *) malloc(stat.st_size);
+		buf = (char *) palloc_extended(stat.st_size, MCXT_ALLOC_HUGE | MCXT_ALLOC_NO_OOM);
 	else
 		buf = NULL;
 	if (buf == NULL)
@@ -2381,7 +2384,7 @@ qtext_load_file(Size *buffer_size)
 						(errcode_for_file_access(),
 						 errmsg("could not read file \"%s\": %m",
 								PGSS_TEXT_FILE)));
-			free(buf);
+			pfree(buf);
 			CloseTransientFile(fd);
 			return NULL;
 		}
@@ -2592,7 +2595,7 @@ gc_qtexts(void)
 	else
 		pgss->mean_query_len = ASSUMED_LENGTH_INIT;
 
-	free(qbuffer);
+	pfree(qbuffer);
 
 	/*
 	 * OK, count a garbage collection cycle.  (Note: even though we have
@@ -2609,7 +2612,8 @@ gc_qtexts(void)
 	/* clean up resources */
 	if (qfile)
 		FreeFile(qfile);
-	free(qbuffer);
+	if (qbuffer)
+		pfree(qbuffer);
 
 	/*
 	 * Since the contents of the external file are now uncertain, mark all
@@ -2922,9 +2926,8 @@ generate_normalized_query(JumbleState *jstate, const char *query,
  * have originated from within the authoritative parser, this should not be
  * a problem.
  *
- * Duplicate constant pointers are possible, and will have their lengths
- * marked as '-1', so that they are later ignored.  (Actually, we assume the
- * lengths were initialized as -1 to start with, and don't change them here.)
+ * Multiple constants can have the same location.  We reset lengths of those
+ * past the first to -1 so that they can later be ignored.
  *
  * If query_loc > 0, then "query" has been advanced by that much compared to
  * the original string start, so we need to translate the provided locations
@@ -2955,8 +2958,6 @@ standard_fill_in_constant_lengths(JumbleState *jstate, const char *query,
 	core_yy_extra_type yyextra;
 	core_YYSTYPE yylval;
 	YYLTYPE		yylloc;
-	int			last_loc = -1;
-	int			i;
 
 	/*
 	 * Sort the records by location so that we can process them in order while
@@ -2977,23 +2978,29 @@ standard_fill_in_constant_lengths(JumbleState *jstate, const char *query,
 	yyextra.escape_string_warning = false;
 
 	/* Search for each constant, in sequence */
-	for (i = 0; i < jstate->clocations_count; i++)
+	for (int i = 0; i < jstate->clocations_count; i++)
 	{
-		int			loc = locs[i].location;
+		int			loc;
 		int			tok;
 
-		/* Adjust recorded location if we're dealing with partial string */
-		loc -= query_loc;
-
-		Assert(loc >= 0);
+		/* Ignore constants after the first one in the same location */
+		if (i > 0 && locs[i].location == locs[i - 1].location)
+		{
+			locs[i].length = -1;
+			continue;
+		}
 
 		if (locs[i].squashed)
 			continue;			/* squashable list, ignore */
 
-		if (loc <= last_loc)
-			continue;			/* Duplicate constant, ignore */
+		/* Adjust recorded location if we're dealing with partial string */
+		loc = locs[i].location - query_loc;
+		Assert(loc >= 0);
 
-		/* Lex tokens until we find the desired constant */
+		/*
+		 * We have a valid location for a constant that's not a dupe. Lex
+		 * tokens until we find the desired constant.
+		 */
 		for (;;)
 		{
 			tok = core_yylex(&yylval, &yylloc, yyscanner);
@@ -3039,8 +3046,6 @@ standard_fill_in_constant_lengths(JumbleState *jstate, const char *query,
 		/* If we hit end-of-string, give up, leaving remaining lengths -1 */
 		if (tok == 0)
 			break;
-
-		last_loc = loc;
 	}
 
 	scanner_finish(yyscanner);
diff --git a/contrib/pg_stat_statements/sql/ivy_squashing.sql b/contrib/pg_stat_statements/sql/ivy_squashing.sql
index 259bb151dd0..4ac3a291b8f 100644
--- a/contrib/pg_stat_statements/sql/ivy_squashing.sql
+++ b/contrib/pg_stat_statements/sql/ivy_squashing.sql
@@ -1,6 +1,7 @@
 --
 -- Const squashing functionality
 --
+\set EXECUTE_RUN_PREPARE on
 CREATE EXTENSION pg_stat_statements;
 
 --
@@ -294,6 +295,12 @@ select where '1' IN ('1'::int::text, '2'::int::text);
 select where '1' = ANY (array['1'::int::text, '2'::int::text]);
 SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
 
+-- IN and ANY clauses with Vars are not squashed.
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN (1, 2, 3, b.id, b.id + 1);
+SELECT * FROM test_squash a, test_squash b WHERE a.id = ANY (array[1, ((b.id + b.id * 2)), 5]);
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4) \bind 1 2 3 1
+;
+
 --
 -- cleanup
 --
diff --git a/contrib/pg_stat_statements/sql/ivy_utility.sql b/contrib/pg_stat_statements/sql/ivy_utility.sql
index cbfce169357..b6d68de1a72 100644
--- a/contrib/pg_stat_statements/sql/ivy_utility.sql
+++ b/contrib/pg_stat_statements/sql/ivy_utility.sql
@@ -1,6 +1,7 @@
 --
 -- Utility commands
 --
+\set EXECUTE_RUN_PREPARE on
 
 -- These tests require track_utility to be enabled.
 SET pg_stat_statements.track_utility = TRUE;
diff --git a/contrib/pg_stat_statements/sql/planning.sql b/contrib/pg_stat_statements/sql/planning.sql
index 46f5d9b951c..9bfcff07d4f 100644
--- a/contrib/pg_stat_statements/sql/planning.sql
+++ b/contrib/pg_stat_statements/sql/planning.sql
@@ -1,6 +1,7 @@
 --
 -- Information related to planning
 --
+\set EXECUTE_RUN_PREPARE on
 
 -- These tests require track_planning to be enabled.
 SET pg_stat_statements.track_planning = TRUE;
diff --git a/contrib/pg_stat_statements/sql/select.sql b/contrib/pg_stat_statements/sql/select.sql
index 11662cde08c..3dc185e4930 100644
--- a/contrib/pg_stat_statements/sql/select.sql
+++ b/contrib/pg_stat_statements/sql/select.sql
@@ -1,6 +1,7 @@
 --
 -- SELECT statements
 --
+\set EXECUTE_RUN_PREPARE on
 
 CREATE EXTENSION pg_stat_statements;
 SET pg_stat_statements.track_utility = FALSE;
@@ -158,6 +159,22 @@ FETCH FIRST 2 ROW ONLY;
 
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FETCH FIRST%';
 
+-- GROUP BY, HAVING, GROUPING
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a, b;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b, a;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY GROUPING SETS(a, ());
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY GROUPING SETS(b, ());
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a HAVING a = 1;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a HAVING a = 2;
+SELECT COUNT(*) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b HAVING b = 1;
+SELECT GROUPING(a) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a;
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b;
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY a, b;
+SELECT GROUPING(b) FROM (VALUES (1::INT, 2::INT)) AS t(a, b) GROUP BY b, a;
+SELECT calls, query FROM pg_stat_statements WHERE query LIKE '%GROUP BY%' ORDER BY query COLLATE "C";
+
 -- GROUP BY [DISTINCT]
 SELECT a, b, c
 FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
diff --git a/contrib/pg_stat_statements/sql/squashing.sql b/contrib/pg_stat_statements/sql/squashing.sql
index 53138d125a9..2100f2d83fd 100644
--- a/contrib/pg_stat_statements/sql/squashing.sql
+++ b/contrib/pg_stat_statements/sql/squashing.sql
@@ -291,6 +291,36 @@ select where '1' IN ('1'::int::text, '2'::int::text);
 select where '1' = ANY (array['1'::int::text, '2'::int::text]);
 SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
 
+-- composite function with row expansion
+create table test_composite(x integer);
+CREATE FUNCTION composite_f(a integer[], out x integer, out y integer) returns
+record as $$            begin
+        x = a[1];
+        y = a[2];
+    end;
+$$ language plpgsql;
+SELECT pg_stat_statements_reset() IS NOT NULL AS t;
+SELECT ((composite_f(array[1, 2]))).* FROM test_composite;
+SELECT ((composite_f(array[1, 2, 3]))).* FROM test_composite;
+SELECT ((composite_f(array[1, 2, 3]))).*, 1, 2, 3, ((composite_f(array[1, 2, 3]))).*, 1, 2
+FROM test_composite
+WHERE x IN (1, 2, 3);
+SELECT ((composite_f(array[1, $1, 3]))).*, 1 FROM test_composite \bind 1
+;
+-- ROW() expression with row expansion
+SELECT (ROW(ARRAY[1,2])).*;
+SELECT (ROW(ARRAY[1, 2], ARRAY[1, 2, 3])).*;
+SELECT 1, 2, (ROW(ARRAY[1, 2], ARRAY[1, 2, 3])).*, 3, 4;
+SELECT (ROW(ARRAY[1, 2], ARRAY[1, $1, 3])).*, 1 \bind 1
+;
+
+-- IN and ANY clauses with Vars are not squashed.
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN (1, 2, 3, b.id, b.id + 1);
+SELECT * FROM test_squash a, test_squash b WHERE a.id = ANY (array[1, ((b.id + b.id * 2)), 5]);
+SELECT * FROM test_squash a, test_squash b WHERE a.id IN ($1, $2, $3, b.id, b.id + $4) \bind 1 2 3 1
+;
+SELECT query, calls FROM pg_stat_statements ORDER BY query COLLATE "C";
+
 --
 -- cleanup
 --
@@ -300,3 +330,5 @@ DROP TABLE test_squash_numeric;
 DROP TABLE test_squash_bigint;
 DROP TABLE test_squash_cast CASCADE;
 DROP TABLE test_squash_jsonb;
+DROP TABLE test_composite;
+DROP FUNCTION composite_f;
diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile
index 5fb927d2650..b169c9084f4 100644
--- a/contrib/pg_trgm/Makefile
+++ b/contrib/pg_trgm/Makefile
@@ -14,7 +14,7 @@ DATA = pg_trgm--1.5--1.6.sql pg_trgm--1.4--1.5.sql pg_trgm--1.3--1.4.sql \
 	pg_trgm--1.0--1.1.sql
 PGFILEDESC = "pg_trgm - trigram matching"
 
-REGRESS = pg_trgm pg_word_trgm pg_strict_word_trgm
+REGRESS = pg_trgm pg_utf8_trgm pg_word_trgm pg_strict_word_trgm
 ORA_REGRESS = ivy_pg_trgm pg_word_trgm pg_strict_word_trgm
 
 ifdef USE_PGXS
diff --git a/contrib/pg_trgm/data/trgm_utf8.data b/contrib/pg_trgm/data/trgm_utf8.data
new file mode 100644
index 00000000000..713856e76a6
--- /dev/null
+++ b/contrib/pg_trgm/data/trgm_utf8.data
@@ -0,0 +1,50 @@
+Mathematics
+数学
+गणित
+Matemáticas
+رياضيات
+Mathématiques
+গণিত
+Matemática
+Математика
+ریاضی
+Matematika
+Mathematik
+数学
+Mathematics
+गणित
+గణితం
+Matematik
+கணிதம்
+數學
+Toán học
+Matematika
+数学
+수학
+ریاضی
+Lissafi
+Hisabati
+Matematika
+Matematica
+ریاضی
+ಗಣಿತ
+ગણિત
+คณิตศาสตร์
+ሂሳብ
+गणित
+ਗਣਿਤ
+數學
+数学
+Iṣiro
+數學
+သင်္ချာ
+Herrega
+رياضي
+गणित
+Математика
+Matematyka
+ഗണിതം
+Matematika
+رياضي
+Matematika
+Matematică
diff --git a/contrib/pg_trgm/expected/ivy_pg_trgm.out b/contrib/pg_trgm/expected/ivy_pg_trgm.out
index 84882a74c3d..aef6dd80e2e 100644
--- a/contrib/pg_trgm/expected/ivy_pg_trgm.out
+++ b/contrib/pg_trgm/expected/ivy_pg_trgm.out
@@ -4694,6 +4694,23 @@ select count(*) from test_trgm where t like '%99%' and t like '%qw%';
     19
 (1 row)
 
+explain (costs off)
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_trgm
+         Recheck Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+         ->  Bitmap Index Scan on trgm_idx
+               Index Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+(5 rows)
+
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 -- ensure that pending-list items are handled correctly, too
 create temp table t_test_trgm(t varchar2(1024) COLLATE "C");
 create index t_trgm_idx on t_test_trgm using gin (t gin_trgm_ops);
@@ -4732,6 +4749,23 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
      1
 (1 row)
 
+explain (costs off)
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on t_test_trgm
+         Recheck Cond: (((t)::text %> ''::text) AND ((t)::text %> '%qwerty%'::text))
+         ->  Bitmap Index Scan on t_trgm_idx
+               Index Cond: (((t)::text %> ''::text) AND ((t)::text %> '%qwerty%'::text))
+(5 rows)
+
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 -- run the same queries with sequential scan to check the results
 set enable_bitmapscan=off;
 set enable_seqscan=on;
@@ -4747,6 +4781,12 @@ select count(*) from test_trgm where t like '%99%' and t like '%qw%';
     19
 (1 row)
 
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
  count 
 -------
@@ -4759,6 +4799,12 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
      1
 (1 row)
 
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 reset enable_bitmapscan;
 create table test2(t varchar2(1024) COLLATE "C");
 insert into test2 values ('abcdef');
diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out
index 0b70d9de256..04da98170ab 100644
--- a/contrib/pg_trgm/expected/pg_trgm.out
+++ b/contrib/pg_trgm/expected/pg_trgm.out
@@ -4693,6 +4693,23 @@ select count(*) from test_trgm where t like '%99%' and t like '%qw%';
     19
 (1 row)
 
+explain (costs off)
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_trgm
+         Recheck Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+         ->  Bitmap Index Scan on trgm_idx
+               Index Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+(5 rows)
+
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 -- ensure that pending-list items are handled correctly, too
 create temp table t_test_trgm(t text COLLATE "C");
 create index t_trgm_idx on t_test_trgm using gin (t gin_trgm_ops);
@@ -4731,6 +4748,23 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
      1
 (1 row)
 
+explain (costs off)
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on t_test_trgm
+         Recheck Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+         ->  Bitmap Index Scan on t_trgm_idx
+               Index Cond: ((t %> ''::text) AND (t %> '%qwerty%'::text))
+(5 rows)
+
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 -- run the same queries with sequential scan to check the results
 set enable_bitmapscan=off;
 set enable_seqscan=on;
@@ -4746,6 +4780,12 @@ select count(*) from test_trgm where t like '%99%' and t like '%qw%';
     19
 (1 row)
 
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
  count 
 -------
@@ -4758,6 +4798,12 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
      1
 (1 row)
 
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+ count 
+-------
+     0
+(1 row)
+
 reset enable_bitmapscan;
 create table test2(t text COLLATE "C");
 insert into test2 values ('abcdef');
diff --git a/contrib/pg_trgm/expected/pg_utf8_trgm.out b/contrib/pg_trgm/expected/pg_utf8_trgm.out
new file mode 100644
index 00000000000..0768e7d6a83
--- /dev/null
+++ b/contrib/pg_trgm/expected/pg_utf8_trgm.out
@@ -0,0 +1,8 @@
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+-- Index 50 translations of the word "Mathematics"
+CREATE TEMP TABLE mb (s text);
+\copy mb from 'data/trgm_utf8.data'
+CREATE INDEX ON mb USING gist(s gist_trgm_ops);
diff --git a/contrib/pg_trgm/expected/pg_utf8_trgm_1.out b/contrib/pg_trgm/expected/pg_utf8_trgm_1.out
new file mode 100644
index 00000000000..8505c4fa552
--- /dev/null
+++ b/contrib/pg_trgm/expected/pg_utf8_trgm_1.out
@@ -0,0 +1,3 @@
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/contrib/pg_trgm/meson.build b/contrib/pg_trgm/meson.build
index a31aa5c574d..b808215f74d 100644
--- a/contrib/pg_trgm/meson.build
+++ b/contrib/pg_trgm/meson.build
@@ -39,6 +39,7 @@ tests += {
   'regress': {
     'sql': [
       'pg_trgm',
+      'pg_utf8_trgm',
       'pg_word_trgm',
       'pg_strict_word_trgm',
     ],
diff --git a/contrib/pg_trgm/sql/ivy_pg_trgm.sql b/contrib/pg_trgm/sql/ivy_pg_trgm.sql
index 46d6f25ae51..03249c1c53a 100644
--- a/contrib/pg_trgm/sql/ivy_pg_trgm.sql
+++ b/contrib/pg_trgm/sql/ivy_pg_trgm.sql
@@ -81,6 +81,9 @@ select count(*) from test_trgm where t like '%99%' and t like '%qwerty%';
 explain (costs off)
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
+explain (costs off)
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
 -- ensure that pending-list items are handled correctly, too
 create temp table t_test_trgm(t varchar2(1024) COLLATE "C");
 create index t_trgm_idx on t_test_trgm using gin (t gin_trgm_ops);
@@ -91,14 +94,19 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
 explain (costs off)
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
+explain (costs off)
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
 
 -- run the same queries with sequential scan to check the results
 set enable_bitmapscan=off;
 set enable_seqscan=on;
 select count(*) from test_trgm where t like '%99%' and t like '%qwerty%';
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
 reset enable_bitmapscan;
 
 create table test2(t varchar2(1024) COLLATE "C");
diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql
index 340c9891899..44debced6d5 100644
--- a/contrib/pg_trgm/sql/pg_trgm.sql
+++ b/contrib/pg_trgm/sql/pg_trgm.sql
@@ -80,6 +80,9 @@ select count(*) from test_trgm where t like '%99%' and t like '%qwerty%';
 explain (costs off)
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
+explain (costs off)
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
 -- ensure that pending-list items are handled correctly, too
 create temp table t_test_trgm(t text COLLATE "C");
 create index t_trgm_idx on t_test_trgm using gin (t gin_trgm_ops);
@@ -90,14 +93,19 @@ select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
 explain (costs off)
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
+explain (costs off)
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
 
 -- run the same queries with sequential scan to check the results
 set enable_bitmapscan=off;
 set enable_seqscan=on;
 select count(*) from test_trgm where t like '%99%' and t like '%qwerty%';
 select count(*) from test_trgm where t like '%99%' and t like '%qw%';
+select count(*) from test_trgm where t %> '' and t %> '%qwerty%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qwerty%';
 select count(*) from t_test_trgm where t like '%99%' and t like '%qw%';
+select count(*) from t_test_trgm where t %> '' and t %> '%qwerty%';
 reset enable_bitmapscan;
 
 create table test2(t text COLLATE "C");
diff --git a/contrib/pg_trgm/sql/pg_utf8_trgm.sql b/contrib/pg_trgm/sql/pg_utf8_trgm.sql
new file mode 100644
index 00000000000..0dd962ced83
--- /dev/null
+++ b/contrib/pg_trgm/sql/pg_utf8_trgm.sql
@@ -0,0 +1,9 @@
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+-- Index 50 translations of the word "Mathematics"
+CREATE TEMP TABLE mb (s text);
+\copy mb from 'data/trgm_utf8.data'
+CREATE INDEX ON mb USING gist(s gist_trgm_ops);
diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h
index ca017585369..ca23aad4dd9 100644
--- a/contrib/pg_trgm/trgm.h
+++ b/contrib/pg_trgm/trgm.h
@@ -47,7 +47,7 @@ typedef char trgm[3];
 } while(0)
 extern int	(*CMPTRGM) (const void *a, const void *b);
 
-#define ISWORDCHR(c)	(t_isalnum(c))
+#define ISWORDCHR(c, len)	(t_isalnum_with_len(c, len))
 #define ISPRINTABLECHAR(a)	( isascii( *(unsigned char*)(a) ) && (isalnum( *(unsigned char*)(a) ) || *(unsigned char*)(a)==' ') )
 #define ISPRINTABLETRGM(t)	( ISPRINTABLECHAR( ((char*)(t)) ) && ISPRINTABLECHAR( ((char*)(t))+1 ) && ISPRINTABLECHAR( ((char*)(t))+2 ) )
 
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index 5ba895217b0..43afd11fa67 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -699,10 +699,13 @@ gtrgm_penalty(PG_FUNCTION_ARGS)
 	if (ISARRKEY(newval))
 	{
 		char	   *cache = (char *) fcinfo->flinfo->fn_extra;
-		TRGM	   *cachedVal = (TRGM *) (cache + MAXALIGN(siglen));
+		TRGM	   *cachedVal = NULL;
 		Size		newvalsize = VARSIZE(newval);
 		BITVECP		sign;
 
+		if (cache != NULL)
+			cachedVal = (TRGM *) (cache + MAXALIGN(siglen));
+
 		/*
 		 * Cache the sign data across multiple calls with the same newval.
 		 */
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 29b39ec8a4c..fa83cc7aa29 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -66,6 +66,78 @@ typedef uint8 TrgmBound;
 #define WORD_SIMILARITY_STRICT		0x02	/* force bounds of extent to match
 											 * word bounds */
 
+/*
+ * A growable array of trigrams
+ *
+ * The actual array of trigrams is in 'datum'.  Note that the other fields in
+ * 'datum', i.e. datum->flags and the varlena length, are not kept up to date
+ * when items are added to the growable array.  We merely reserve the space
+ * for them here.  You must fill those other fields before using 'datum' as a
+ * proper TRGM datum.
+ */
+typedef struct
+{
+	TRGM	   *datum;			/* trigram array */
+	int			length;			/* number of trigrams in the array */
+	int			allocated;		/* allocated size of 'datum' (# of trigrams) */
+} growable_trgm_array;
+
+/*
+ * Allocate a new growable array.
+ *
+ * 'slen' is the size of the source string that we're extracting the trigrams
+ * from.  It is used to choose the initial size of the array.
+ */
+static void
+init_trgm_array(growable_trgm_array *arr, int slen)
+{
+	size_t		init_size;
+
+	/*
+	 * In the extreme case, the input string consists entirely of one
+	 * character words, like "a b c", where each word is expanded to two
+	 * trigrams.  This is not a strict upper bound though, because when
+	 * IGNORECASE is defined, we convert the input string to lowercase before
+	 * extracting the trigrams, which in rare cases can expand one input
+	 * character into multiple characters.
+	 */
+	init_size = (size_t) slen + 1;
+
+	/*
+	 * Guard against possible overflow in the palloc request.  (We don't worry
+	 * about the additive constants, since palloc can detect requests that are
+	 * a little above MaxAllocSize --- we just need to prevent integer
+	 * overflow in the multiplications.)
+	 */
+	if (init_size > MaxAllocSize / sizeof(trgm))
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("out of memory")));
+
+	arr->datum = palloc(CALCGTSIZE(ARRKEY, init_size));
+	arr->allocated = init_size;
+	arr->length = 0;
+}
+
+/* Make sure the array can hold at least 'needed' more trigrams */
+static void
+enlarge_trgm_array(growable_trgm_array *arr, int needed)
+{
+	size_t		new_needed = (size_t) arr->length + needed;
+
+	if (new_needed > arr->allocated)
+	{
+		/* Guard against possible overflow, like in init_trgm_array */
+		if (new_needed > MaxAllocSize / sizeof(trgm))
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("out of memory")));
+
+		arr->datum = repalloc(arr->datum, CALCGTSIZE(ARRKEY, new_needed));
+		arr->allocated = new_needed;
+	}
+}
+
 /*
  * Module load callback
  */
@@ -220,22 +292,31 @@ comp_trgm(const void *a, const void *b)
  * endword points to the character after word
  */
 static char *
-find_word(char *str, int lenstr, char **endword, int *charlen)
+find_word(char *str, int lenstr, char **endword)
 {
 	char	   *beginword = str;
+	const char *endstr = str + lenstr;
 
-	while (beginword - str < lenstr && !ISWORDCHR(beginword))
-		beginword += pg_mblen(beginword);
+	while (beginword < endstr)
+	{
+		int			clen = pg_mblen_range(beginword, endstr);
 
-	if (beginword - str >= lenstr)
+		if (ISWORDCHR(beginword, clen))
+			break;
+		beginword += clen;
+	}
+
+	if (beginword >= endstr)
 		return NULL;
 
 	*endword = beginword;
-	*charlen = 0;
-	while (*endword - str < lenstr && ISWORDCHR(*endword))
+	while (*endword < endstr)
 	{
-		*endword += pg_mblen(*endword);
-		(*charlen)++;
+		int			clen = pg_mblen_range(*endword, endstr);
+
+		if (!ISWORDCHR(*endword, clen))
+			break;
+		*endword += clen;
 	}
 
 	return beginword;
@@ -269,78 +350,138 @@ compact_trigram(trgm *tptr, char *str, int bytelen)
 }
 
 /*
- * Adds trigrams from words (already padded).
+ * Adds trigrams from the word in 'str' (already padded if necessary).
  */
-static trgm *
-make_trigrams(trgm *tptr, char *str, int bytelen, int charlen)
+static void
+make_trigrams(growable_trgm_array *dst, char *str, int bytelen)
 {
+	trgm	   *tptr;
 	char	   *ptr = str;
 
-	if (charlen < 3)
-		return tptr;
+	if (bytelen < 3)
+		return;
 
-	if (bytelen > charlen)
-	{
-		/* Find multibyte character boundaries and apply compact_trigram */
-		int			lenfirst = pg_mblen(str),
-					lenmiddle = pg_mblen(str + lenfirst),
-					lenlast = pg_mblen(str + lenfirst + lenmiddle);
+	/* max number of trigrams = strlen - 2 */
+	enlarge_trgm_array(dst, bytelen - 2);
+	tptr = GETARR(dst->datum) + dst->length;
 
-		while ((ptr - str) + lenfirst + lenmiddle + lenlast <= bytelen)
+	if (pg_encoding_max_length(GetDatabaseEncoding()) == 1)
+	{
+		while (ptr < str + bytelen - 2)
 		{
-			compact_trigram(tptr, ptr, lenfirst + lenmiddle + lenlast);
-
-			ptr += lenfirst;
+			CPTRGM(tptr, ptr);
+			ptr++;
 			tptr++;
-
-			lenfirst = lenmiddle;
-			lenmiddle = lenlast;
-			lenlast = pg_mblen(ptr + lenfirst + lenmiddle);
 		}
 	}
 	else
 	{
-		/* Fast path when there are no multibyte characters */
-		Assert(bytelen == charlen);
+		int			lenfirst,
+					lenmiddle,
+					lenlast;
+		char	   *endptr;
 
-		while (ptr - str < bytelen - 2 /* number of trigrams = strlen - 2 */ )
+		/*
+		 * Fast path as long as there are no multibyte characters
+		 */
+		if (!IS_HIGHBIT_SET(ptr[0]) && !IS_HIGHBIT_SET(ptr[1]))
 		{
-			CPTRGM(tptr, ptr);
-			ptr++;
+			while (!IS_HIGHBIT_SET(ptr[2]))
+			{
+				CPTRGM(tptr, ptr);
+				ptr++;
+				tptr++;
+
+				if (ptr == str + bytelen - 2)
+					goto done;
+			}
+
+			lenfirst = 1;
+			lenmiddle = 1;
+			lenlast = pg_mblen_unbounded(ptr + 2);
+		}
+		else
+		{
+			lenfirst = pg_mblen_unbounded(ptr);
+			if (ptr + lenfirst >= str + bytelen)
+				goto done;
+			lenmiddle = pg_mblen_unbounded(ptr + lenfirst);
+			if (ptr + lenfirst + lenmiddle >= str + bytelen)
+				goto done;
+			lenlast = pg_mblen_unbounded(ptr + lenfirst + lenmiddle);
+		}
+
+		/*
+		 * Slow path to handle any remaining multibyte characters
+		 *
+		 * As we go, 'ptr' points to the beginning of the current
+		 * three-character string and 'endptr' points to just past it.
+		 */
+		endptr = ptr + lenfirst + lenmiddle + lenlast;
+		while (endptr <= str + bytelen)
+		{
+			compact_trigram(tptr, ptr, endptr - ptr);
 			tptr++;
+
+			/* Advance to the next character */
+			if (endptr == str + bytelen)
+				break;
+			ptr += lenfirst;
+			lenfirst = lenmiddle;
+			lenmiddle = lenlast;
+			lenlast = pg_mblen_unbounded(endptr);
+			endptr += lenlast;
 		}
 	}
 
-	return tptr;
+done:
+	dst->length = tptr - GETARR(dst->datum);
+	Assert(dst->length <= dst->allocated);
 }
 
 /*
  * Make array of trigrams without sorting and removing duplicate items.
  *
- * trg: where to return the array of trigrams.
+ * dst: where to return the array of trigrams.
  * str: source string, of length slen bytes.
- * bounds: where to return bounds of trigrams (if needed).
- *
- * Returns length of the generated array.
+ * bounds_p: where to return bounds of trigrams (if needed).
  */
-static int
-generate_trgm_only(trgm *trg, char *str, int slen, TrgmBound *bounds)
+static void
+generate_trgm_only(growable_trgm_array *dst, char *str, int slen, TrgmBound **bounds_p)
 {
-	trgm	   *tptr;
+	size_t		buflen;
 	char	   *buf;
-	int			charlen,
-				bytelen;
+	int			bytelen;
 	char	   *bword,
 			   *eword;
+	TrgmBound  *bounds = NULL;
+	int			bounds_allocated = 0;
 
-	if (slen + LPADDING + RPADDING < 3 || slen == 0)
-		return 0;
+	init_trgm_array(dst, slen);
 
-	tptr = trg;
+	/*
+	 * If requested, allocate an array for the bounds, with the same size as
+	 * the trigram array.
+	 */
+	if (bounds_p)
+	{
+		bounds_allocated = dst->allocated;
+		bounds = *bounds_p = palloc0_array(TrgmBound, bounds_allocated);
+	}
 
-	/* Allocate a buffer for case-folded, blank-padded words */
-	buf = (char *) palloc(slen * pg_database_encoding_max_length() + 4);
+	if (slen + LPADDING + RPADDING < 3 || slen == 0)
+		return;
 
+	/*
+	 * Allocate a buffer for case-folded, blank-padded words.
+	 *
+	 * As an initial guess, allocate a buffer large enough to hold the
+	 * original string with padding, which is always enough when compiled with
+	 * !IGNORECASE.  If the case-folding produces a string longer than the
+	 * original, we'll grow the buffer.
+	 */
+	buflen = (size_t) slen + 4;
+	buf = (char *) palloc(buflen);
 	if (LPADDING > 0)
 	{
 		*buf = ' ';
@@ -349,52 +490,59 @@ generate_trgm_only(trgm *trg, char *str, int slen, TrgmBound *bounds)
 	}
 
 	eword = str;
-	while ((bword = find_word(eword, slen - (eword - str), &eword, &charlen)) != NULL)
+	while ((bword = find_word(eword, slen - (eword - str), &eword)) != NULL)
 	{
+		int			oldlen;
+
+		/* Convert word to lower case before extracting trigrams from it */
 #ifdef IGNORECASE
-		bword = str_tolower(bword, eword - bword, DEFAULT_COLLATION_OID);
-		bytelen = strlen(bword);
+		{
+			char	   *lowered;
+
+			lowered = str_tolower(bword, eword - bword, DEFAULT_COLLATION_OID);
+			bytelen = strlen(lowered);
+
+			/* grow the buffer if necessary */
+			if (bytelen > buflen - 4)
+			{
+				pfree(buf);
+				buflen = (size_t) bytelen + 4;
+				buf = (char *) palloc(buflen);
+				if (LPADDING > 0)
+				{
+					*buf = ' ';
+					if (LPADDING > 1)
+						*(buf + 1) = ' ';
+				}
+			}
+			memcpy(buf + LPADDING, lowered, bytelen);
+			pfree(lowered);
+		}
 #else
 		bytelen = eword - bword;
-#endif
-
 		memcpy(buf + LPADDING, bword, bytelen);
-
-#ifdef IGNORECASE
-		pfree(bword);
 #endif
 
 		buf[LPADDING + bytelen] = ' ';
 		buf[LPADDING + bytelen + 1] = ' ';
 
 		/* Calculate trigrams marking their bounds if needed */
+		oldlen = dst->length;
+		make_trigrams(dst, buf, bytelen + LPADDING + RPADDING);
 		if (bounds)
-			bounds[tptr - trg] |= TRGM_BOUND_LEFT;
-		tptr = make_trigrams(tptr, buf, bytelen + LPADDING + RPADDING,
-							 charlen + LPADDING + RPADDING);
-		if (bounds)
-			bounds[tptr - trg - 1] |= TRGM_BOUND_RIGHT;
+		{
+			if (bounds_allocated < dst->length)
+			{
+				bounds = *bounds_p = repalloc0_array(bounds, TrgmBound, bounds_allocated, dst->allocated);
+				bounds_allocated = dst->allocated;
+			}
+
+			bounds[oldlen] |= TRGM_BOUND_LEFT;
+			bounds[dst->length - 1] |= TRGM_BOUND_RIGHT;
+		}
 	}
 
 	pfree(buf);
-
-	return tptr - trg;
-}
-
-/*
- * Guard against possible overflow in the palloc requests below.  (We
- * don't worry about the additive constants, since palloc can detect
- * requests that are a little above MaxAllocSize --- we just need to
- * prevent integer overflow in the multiplications.)
- */
-static void
-protect_out_of_mem(int slen)
-{
-	if ((Size) (slen / 2) >= (MaxAllocSize / (sizeof(trgm) * 3)) ||
-		(Size) slen >= (MaxAllocSize / pg_database_encoding_max_length()))
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("out of memory")));
 }
 
 /*
@@ -408,19 +556,14 @@ TRGM *
 generate_trgm(char *str, int slen)
 {
 	TRGM	   *trg;
+	growable_trgm_array arr;
 	int			len;
 
-	protect_out_of_mem(slen);
-
-	trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3);
+	generate_trgm_only(&arr, str, slen, NULL);
+	len = arr.length;
+	trg = arr.datum;
 	trg->flag = ARRKEY;
 
-	len = generate_trgm_only(GETARR(trg), str, slen, NULL);
-	SET_VARSIZE(trg, CALCGTSIZE(ARRKEY, len));
-
-	if (len == 0)
-		return trg;
-
 	/*
 	 * Make trigrams unique.
 	 */
@@ -675,8 +818,8 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2,
 {
 	bool	   *found;
 	pos_trgm   *ptrg;
-	trgm	   *trg1;
-	trgm	   *trg2;
+	growable_trgm_array trg1;
+	growable_trgm_array trg2;
 	int			len1,
 				len2,
 				len,
@@ -685,27 +828,21 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2,
 				ulen1;
 	int		   *trg2indexes;
 	float4		result;
-	TrgmBound  *bounds;
-
-	protect_out_of_mem(slen1 + slen2);
+	TrgmBound  *bounds = NULL;
 
 	/* Make positional trigrams */
-	trg1 = (trgm *) palloc(sizeof(trgm) * (slen1 / 2 + 1) * 3);
-	trg2 = (trgm *) palloc(sizeof(trgm) * (slen2 / 2 + 1) * 3);
-	if (flags & WORD_SIMILARITY_STRICT)
-		bounds = (TrgmBound *) palloc0(sizeof(TrgmBound) * (slen2 / 2 + 1) * 3);
-	else
-		bounds = NULL;
 
-	len1 = generate_trgm_only(trg1, str1, slen1, NULL);
-	len2 = generate_trgm_only(trg2, str2, slen2, bounds);
+	generate_trgm_only(&trg1, str1, slen1, NULL);
+	len1 = trg1.length;
+	generate_trgm_only(&trg2, str2, slen2, (flags & WORD_SIMILARITY_STRICT) ? &bounds : NULL);
+	len2 = trg2.length;
 
-	ptrg = make_positional_trgm(trg1, len1, trg2, len2);
+	ptrg = make_positional_trgm(GETARR(trg1.datum), len1, GETARR(trg2.datum), len2);
 	len = len1 + len2;
 	qsort(ptrg, len, sizeof(pos_trgm), comp_ptrgm);
 
-	pfree(trg1);
-	pfree(trg2);
+	pfree(trg1.datum);
+	pfree(trg2.datum);
 
 	/*
 	 * Merge positional trigrams array: enumerate each trigram and find its
@@ -761,20 +898,20 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2,
  * str: source string, of length lenstr bytes (need not be null-terminated)
  * buf: where to return the substring (must be long enough)
  * *bytelen: receives byte length of the found substring
- * *charlen: receives character length of the found substring
  *
  * Returns pointer to end+1 of the found substring in the source string.
- * Returns NULL if no word found (in which case buf, bytelen, charlen not set)
+ * Returns NULL if no word found (in which case buf, bytelen is not set)
  *
  * If the found word is bounded by non-word characters or string boundaries
  * then this function will include corresponding padding spaces into buf.
  */
 static const char *
 get_wildcard_part(const char *str, int lenstr,
-				  char *buf, int *bytelen, int *charlen)
+				  char *buf, int *bytelen)
 {
 	const char *beginword = str;
 	const char *endword;
+	const char *endstr = str + lenstr;
 	char	   *s = buf;
 	bool		in_leading_wildcard_meta = false;
 	bool		in_trailing_wildcard_meta = false;
@@ -787,11 +924,13 @@ get_wildcard_part(const char *str, int lenstr,
 	 * from this loop to the next one, since we may exit at a word character
 	 * that is in_escape.
 	 */
-	while (beginword - str < lenstr)
+	while (beginword < endstr)
 	{
+		clen = pg_mblen_range(beginword, endstr);
+
 		if (in_escape)
 		{
-			if (ISWORDCHR(beginword))
+			if (ISWORDCHR(beginword, clen))
 				break;
 			in_escape = false;
 			in_leading_wildcard_meta = false;
@@ -802,12 +941,12 @@ get_wildcard_part(const char *str, int lenstr,
 				in_escape = true;
 			else if (ISWILDCARDCHAR(beginword))
 				in_leading_wildcard_meta = true;
-			else if (ISWORDCHR(beginword))
+			else if (ISWORDCHR(beginword, clen))
 				break;
 			else
 				in_leading_wildcard_meta = false;
 		}
-		beginword += pg_mblen(beginword);
+		beginword += clen;
 	}
 
 	/*
@@ -820,18 +959,13 @@ get_wildcard_part(const char *str, int lenstr,
 	 * Add left padding spaces if preceding character wasn't wildcard
 	 * meta-character.
 	 */
-	*charlen = 0;
 	if (!in_leading_wildcard_meta)
 	{
 		if (LPADDING > 0)
 		{
 			*s++ = ' ';
-			(*charlen)++;
 			if (LPADDING > 1)
-			{
 				*s++ = ' ';
-				(*charlen)++;
-			}
 		}
 	}
 
@@ -840,15 +974,14 @@ get_wildcard_part(const char *str, int lenstr,
 	 * string boundary.  Strip escapes during copy.
 	 */
 	endword = beginword;
-	while (endword - str < lenstr)
+	while (endword < endstr)
 	{
-		clen = pg_mblen(endword);
+		clen = pg_mblen_range(endword, endstr);
 		if (in_escape)
 		{
-			if (ISWORDCHR(endword))
+			if (ISWORDCHR(endword, clen))
 			{
 				memcpy(s, endword, clen);
-				(*charlen)++;
 				s += clen;
 			}
 			else
@@ -873,10 +1006,9 @@ get_wildcard_part(const char *str, int lenstr,
 				in_trailing_wildcard_meta = true;
 				break;
 			}
-			else if (ISWORDCHR(endword))
+			else if (ISWORDCHR(endword, clen))
 			{
 				memcpy(s, endword, clen);
-				(*charlen)++;
 				s += clen;
 			}
 			else
@@ -894,12 +1026,8 @@ get_wildcard_part(const char *str, int lenstr,
 		if (RPADDING > 0)
 		{
 			*s++ = ' ';
-			(*charlen)++;
 			if (RPADDING > 1)
-			{
 				*s++ = ' ';
-				(*charlen)++;
-			}
 		}
 	}
 
@@ -918,24 +1046,21 @@ TRGM *
 generate_wildcard_trgm(const char *str, int slen)
 {
 	TRGM	   *trg;
-	char	   *buf,
-			   *buf2;
-	trgm	   *tptr;
+	growable_trgm_array arr;
+	char	   *buf;
 	int			len,
-				charlen,
 				bytelen;
 	const char *eword;
 
-	protect_out_of_mem(slen);
-
-	trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3);
-	trg->flag = ARRKEY;
-	SET_VARSIZE(trg, TRGMHDRSIZE);
-
 	if (slen + LPADDING + RPADDING < 3 || slen == 0)
+	{
+		trg = (TRGM *) palloc(TRGMHDRSIZE);
+		trg->flag = ARRKEY;
+		SET_VARSIZE(trg, TRGMHDRSIZE);
 		return trg;
+	}
 
-	tptr = GETARR(trg);
+	init_trgm_array(&arr, slen);
 
 	/* Allocate a buffer for blank-padded, but not yet case-folded, words */
 	buf = palloc(sizeof(char) * (slen + 4));
@@ -945,39 +1070,41 @@ generate_wildcard_trgm(const char *str, int slen)
 	 */
 	eword = str;
 	while ((eword = get_wildcard_part(eword, slen - (eword - str),
-									  buf, &bytelen, &charlen)) != NULL)
+									  buf, &bytelen)) != NULL)
 	{
+		char	   *word;
+
 #ifdef IGNORECASE
-		buf2 = str_tolower(buf, bytelen, DEFAULT_COLLATION_OID);
-		bytelen = strlen(buf2);
+		word = str_tolower(buf, bytelen, DEFAULT_COLLATION_OID);
+		bytelen = strlen(word);
 #else
-		buf2 = buf;
+		word = buf;
 #endif
 
 		/*
 		 * count trigrams
 		 */
-		tptr = make_trigrams(tptr, buf2, bytelen, charlen);
+		make_trigrams(&arr, word, bytelen);
 
 #ifdef IGNORECASE
-		pfree(buf2);
+		pfree(word);
 #endif
 	}
 
 	pfree(buf);
 
-	if ((len = tptr - GETARR(trg)) == 0)
-		return trg;
-
 	/*
 	 * Make trigrams unique.
 	 */
+	trg = arr.datum;
+	len = arr.length;
 	if (len > 1)
 	{
 		qsort(GETARR(trg), len, sizeof(trgm), comp_trgm);
 		len = qunique(GETARR(trg), len, sizeof(trgm), comp_trgm);
 	}
 
+	trg->flag = ARRKEY;
 	SET_VARSIZE(trg, CALCGTSIZE(ARRKEY, len));
 
 	return trg;
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 149f9eb259c..b21b959b6c8 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -483,7 +483,7 @@ static TRGM *createTrgmNFAInternal(regex_t *regex, TrgmPackedGraph **graph,
 static void RE_compile(regex_t *regex, text *text_re,
 					   int cflags, Oid collation);
 static void getColorInfo(regex_t *regex, TrgmNFA *trgmNFA);
-static bool convertPgWchar(pg_wchar c, trgm_mb_char *result);
+static int	convertPgWchar(pg_wchar c, trgm_mb_char *result);
 static void transformGraph(TrgmNFA *trgmNFA);
 static void processState(TrgmNFA *trgmNFA, TrgmState *state);
 static void addKey(TrgmNFA *trgmNFA, TrgmState *state, TrgmStateKey *key);
@@ -808,10 +808,11 @@ getColorInfo(regex_t *regex, TrgmNFA *trgmNFA)
 		for (j = 0; j < charsCount; j++)
 		{
 			trgm_mb_char c;
+			int			clen = convertPgWchar(chars[j], &c);
 
-			if (!convertPgWchar(chars[j], &c))
+			if (!clen)
 				continue;		/* ok to ignore it altogether */
-			if (ISWORDCHR(c.bytes))
+			if (ISWORDCHR(c.bytes, clen))
 				colorInfo->wordChars[colorInfo->wordCharsCount++] = c;
 			else
 				colorInfo->containsNonWord = true;
@@ -823,13 +824,15 @@ getColorInfo(regex_t *regex, TrgmNFA *trgmNFA)
 
 /*
  * Convert pg_wchar to multibyte format.
- * Returns false if the character should be ignored completely.
+ * Returns 0 if the character should be ignored completely, else returns its
+ * byte length.
  */
-static bool
+static int
 convertPgWchar(pg_wchar c, trgm_mb_char *result)
 {
 	/* "s" has enough space for a multibyte character and a trailing NUL */
 	char		s[MAX_MULTIBYTE_CHAR_LEN + 1];
+	int			clen;
 
 	/*
 	 * We can ignore the NUL character, since it can never appear in a PG text
@@ -837,11 +840,11 @@ convertPgWchar(pg_wchar c, trgm_mb_char *result)
 	 * reconstructing trigrams.
 	 */
 	if (c == 0)
-		return false;
+		return 0;
 
 	/* Do the conversion, making sure the result is NUL-terminated */
 	memset(s, 0, sizeof(s));
-	pg_wchar2mb_with_len(&c, s, 1);
+	clen = pg_wchar2mb_with_len(&c, s, 1);
 
 	/*
 	 * In IGNORECASE mode, we can ignore uppercase characters.  We assume that
@@ -858,12 +861,12 @@ convertPgWchar(pg_wchar c, trgm_mb_char *result)
 	 */
 #ifdef IGNORECASE
 	{
-		char	   *lowerCased = str_tolower(s, strlen(s), DEFAULT_COLLATION_OID);
+		char	   *lowerCased = str_tolower(s, clen, DEFAULT_COLLATION_OID);
 
 		if (strcmp(lowerCased, s) != 0)
 		{
 			pfree(lowerCased);
-			return false;
+			return 0;
 		}
 		pfree(lowerCased);
 	}
@@ -871,7 +874,7 @@ convertPgWchar(pg_wchar c, trgm_mb_char *result)
 
 	/* Fill result with exactly MAX_MULTIBYTE_CHAR_LEN bytes */
 	memcpy(result->bytes, s, MAX_MULTIBYTE_CHAR_LEN);
-	return true;
+	return clen;
 }
 
 
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index fdbcb687a87..a3aed470ecb 100644
--- a/contrib/pgcrypto/Makefile
+++ b/contrib/pgcrypto/Makefile
@@ -44,11 +44,12 @@ REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
 	sha2 des 3des cast5 \
 	crypt-des crypt-md5 crypt-blowfish crypt-xdes \
 	pgp-armor pgp-decrypt pgp-encrypt pgp-encrypt-md5 $(CF_PGP_TESTS) \
-	pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info crypt-shacrypt
+	pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-pubkey-session \
+	pgp-info crypt-shacrypt
 ORA_REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
 	sha2 des 3des cast5 \
 	crypt-des crypt-md5 crypt-blowfish crypt-xdes \
-	pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
+	pgp-armor ivy-pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
 	pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info ivy-crypt-shacrypt
 
 ifdef USE_PGXS
diff --git a/contrib/pgcrypto/crypt-sha.c b/contrib/pgcrypto/crypt-sha.c
index 7ec21771a83..e8f32bc3896 100644
--- a/contrib/pgcrypto/crypt-sha.c
+++ b/contrib/pgcrypto/crypt-sha.c
@@ -328,7 +328,7 @@ px_crypt_shacrypt(const char *pw, const char *salt, char *passwd, unsigned dstle
 				ereport(ERROR,
 						errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						errmsg("invalid character in salt string: \"%.*s\"",
-							   pg_mblen(ep), ep));
+							   pg_mblen_cstr(ep), ep));
 		}
 		else
 		{
diff --git a/contrib/pgcrypto/expected/hmac-md5_2.out b/contrib/pgcrypto/expected/hmac-md5_2.out
new file mode 100644
index 00000000000..08cdf95d532
--- /dev/null
+++ b/contrib/pgcrypto/expected/hmac-md5_2.out
@@ -0,0 +1,44 @@
+--
+-- HMAC-MD5
+--
+SELECT hmac(
+'Hi There',
+'\x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 2
+SELECT hmac(
+'Jefe',
+'what do ya want for nothing?',
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 3
+SELECT hmac(
+'\xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd'::bytea,
+'\xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 4
+SELECT hmac(
+'\xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd'::bytea,
+'\x0102030405060708090a0b0c0d0e0f10111213141516171819'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 5
+SELECT hmac(
+'Test With Truncation',
+'\x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 6
+SELECT hmac(
+'Test Using Larger Than Block-Size Key - Hash Key First',
+'\xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+-- 7
+SELECT hmac(
+'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
+'\xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'::bytea,
+'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
diff --git a/contrib/pgcrypto/expected/ivy-pgp-decrypt.out b/contrib/pgcrypto/expected/ivy-pgp-decrypt.out
new file mode 100644
index 00000000000..279477104a7
--- /dev/null
+++ b/contrib/pgcrypto/expected/ivy-pgp-decrypt.out
@@ -0,0 +1,441 @@
+--
+-- pgp decrypt tests
+--
+--  Checking ciphers
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.blowfish.sha1.mdc.s2k3.z0
+
+jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
+yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
+=JcP+
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
+UTAsG35A1vYs02VARKzGz6xI2UHwFUirP+brPBg3Ee7muOx8pA==
+=XtrP
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCI7YQpWqp3D1g0kQBCjB7GlX7+SQeXNleXeXQ78ZAPNliquGDq9u378zI
+5FPTqAhIB2/2fjY8QEIs1ai00qphjX2NitxV/3Wn+6dufB4Q4g==
+=rCZt
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMC4f/5djqCC1Rg0kQBTHEPsD+Sw7biBsM2er3vKyGPAQkuTBGKC5ie7hT/
+lceMfQdbAg6oTFyJpk/wH18GzRDphCofg0X8uLgkAKMrpcmgog==
+=fB6S
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking MDC modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.nomdc.s2k3.z0
+
+jA0EBwMCnv07rlXqWctgyS2Dm2JfOKCRL4sLSLJUC8RS2cH7cIhKSuLitOtyquB+
+u9YkgfJfsuRJmgQ9tmo=
+=60ui
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEeP3idNjQ1Bg0kQBf4G0wX+2QNzLh2YNwYkQgQkfYhn/hLXjV4nK9nsE
+8Ex1Dsdt5UPvOz8W8VKQRS6loOfOe+yyXil8W3IYFwUpdDUi+Q==
+=moGf
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking hashes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.md5.mdc.s2k3.z0
+
+jA0EBwMClrXXtOXetohg0kQBn0Kl1ymevQZRHkdoYRHgzCwSQEiss7zYff2UNzgO
+KyRrHf7zEBuZiZ2AG34jNVMOLToj1jJUg5zTSdecUzQVCykWTA==
+=NyLk
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCApbdlrURoWJg0kQBzHM/E0o7djY82bNuspjxjAcPFrrtp0uvDdMQ4z2m
+/PM8jhgI5vxFYfNQjLl8y3fHYIomk9YflN9K/Q13iq8A8sjeTw==
+=FxbQ
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking S2K modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k0.z0
+
+jAQEBwAC0kQBKTaLAKE3xzps+QIZowqRNb2eAdzBw2LxEW2YD5PgNlbhJdGg+dvw
+Ah9GXjGS1TVALzTImJbz1uHUZRfhJlFbc5yGQw==
+=YvkV
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k1.z0
+
+jAwEBwEC/QTByBLI3b/SRAHPxKzI6SZBo5lAEOD+EsvKQWO4adL9tDY+++Iqy1xK
+4IaWXVKEj9R2Lr2xntWWMGZtcKtjD2lFFRXXd9dZp1ZThNDz
+=dbXm
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEq4Su3ZqNEJg0kQB4QG5jBTKF0i04xtH+avzmLhstBNRxvV3nsmB3cwl
+z+9ZaA/XdSx5ZiFnMym8P6r8uY9rLjjNptvvRHlxIReF+p9MNg==
+=VJKg
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k0.z0
+
+jAQECAAC0kQBBDnQWkgsx9YFaqDfWmpsiyAJ6y2xG/sBvap1dySYEMuZ+wJTXQ9E
+Cr3i2M7TgVZ0M4jp4QL0adG1lpN5iK7aQeOwMw==
+=cg+i
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k1.z0
+
+jAwECAECruOfyNDFiTnSRAEVoGXm4A9UZKkWljdzjEO/iaE7mIraltIpQMkiqCh9
+7h8uZ2u9uRBOv222fZodGvc6bvq/4R4hAa/6qSHtm8mdmvGt
+=aHmC
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCjFn6SRi3SONg0kQBqtSHPaD0m7rXfDAhCWU/ypAsI93GuHGRyM99cvMv
+q6eF6859ZVnli3BFSDSk3a4e/pXhglxmDYCfjAXkozKNYLo6yw==
+=K0LS
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k0.z0
+
+jAQECQAC0kQB4L1eMbani07XF2ZYiXNK9LW3v8w41oUPl7dStmrJPQFwsdxmrDHu
+rQr3WbdKdY9ufjOE5+mXI+EFkSPrF9rL9NCq6w==
+=RGts
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k1.z0
+
+jAwECQECKHhrou7ZOIXSRAHWIVP+xjVQcjAVBTt+qh9SNzYe248xFTwozkwev3mO
++KVJW0qhk0An+Y2KF99/bYFl9cL5D3Tl43fC8fXGl3x3m7pR
+=SUrU
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMCjc8lwZu8Fz1g0kQBkEzjImi21liep5jj+3dAJ2aZFfUkohi8b3n9z+7+
+4+NRzL7cMW2RLAFnJbiqXDlRHMwleeuLN1up2WIxsxtYYuaBjA==
+=XZrG
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking longer passwords
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCx6dBiuqrYNRg0kQBEo63AvA1SCslxP7ayanLf1H0/hlk2nONVhTwVEWi
+tTGup1mMz6Cfh1uDRErUuXpx9A0gdMu7zX0o5XjrL7WGDAZdSw==
+=XKKG
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCBDvYuS990iFg0kQBW31UK5OiCjWf5x6KJ8qNNT2HZWQCjCBZMU0XsOC6
+CMxFKadf144H/vpoV9GA0f22keQgCl0EsTE4V4lweVOPTKCMJg==
+=gWDh
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij2jk4h5g2j54khg23h54g2kh54g2khj54g23hj54');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCqXbFafC+ofVg0kQBejyiPqH0QMERVGfmPOjtAxvyG5KDIJPYojTgVSDt
+FwsDabdQUz5O7bgNSnxfmyw1OifGF+W2bIn/8W+0rDf8u3+O+Q==
+=OxOF
+-----END PGP MESSAGE-----
+'), 'x');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking various data
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCGJ+SpuOysINg0kQBJfSjzsW0x4OVcAyr17O7FBvMTwIGeGcJd99oTQU8
+Xtx3kDqnhUq9Z1fS3qPbi5iNP2A9NxOBxPWz2JzxhydANlgbxg==
+=W/ik
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x0225e3ede6f2587b076d021a189ff60aad67e066
+(1 row)
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat2.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCvdpDvidNzMxg0jUBvj8eS2+1t/9/zgemxvhtc0fvdKGGbjH7dleaTJRB
+SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
+=Fxen
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \xda39a3ee5e6b4b0d3255bfef95601890afd80709
+(1 row)
+
+select digest(pgp_sym_decrypt_bytea(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat3.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCxQvxJZ3G/HRg0lgBeYmTa7/uDAjPyFwSX4CYBgpZWVn/JS8JzILrcWF8
+gFnkUKIE0PSaYFp+Yi1VlRfUtRQ/X/LYNGa7tWZS+4VQajz2Xtz4vUeAEiYFYPXk
+73Hb8m1yRhQK
+=ivrD
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x5e5c135efc0dd00633efc6dfd6e731ea408a5b4c
+(1 row)
+
+-- Checking CRLF
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=0'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x9353062be7720f1446d30b9e75573a4833886784
+(1 row)
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=1'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x7efefcab38467f7484d6fa43dc86cf5281bd78e2
+(1 row)
+
+-- check BUG #11905, problem with messages 6 less than a power of 2.
+select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- Negative tests
+-- Decryption with a certain incorrect key yields an apparent Literal Data
+-- packet reporting its content to be binary data.  Ciphertext source:
+-- iterative pgp_sym_encrypt('secret', 'key') until the random prefix gave
+-- rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMCxf8PTrQBmJdl0jcB6y2joE7GSLKRv7trbNsF5Z8ou5NISLUg31llVH/S0B2wl4bvzZjV
+VsxxqLSPzNLAeIspJk5G
+=mSd/
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_literal_data: data type=b
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine text/binary mismatch.
+select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
+NOTICE:  dbg: parse_literal_data: data type=b
+ERROR:  Not text data
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+ERROR:  invalid byte sequence for encoding [REDACTED]: 0x00
+CONTEXT:  PL/iSQL function inline_code_block line 12 at RAISE
+-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
+-- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
+-- until the random prefix gave rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMC9rK/dMkF5Zlt0jcBlzAQ1mQY2qYbKYbw8h3EZ5Jk0K2IiY92R82TRhWzBIF/8cmXDPtP
+GXsd65oYJZp3Khz0qfyn
+=Nmpq
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine use of BZip2 compression.  Ciphertext source:
+-- echo x | gpg --homedir /nonexistent --personal-compress-preferences bzip2 \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCRhFrAKNcLVJg0mMBLJG1cCASNk/x/3dt1zJ+2eo7jHfjgg3N6wpB3XIe
+QCwkWJwlBG5pzbO5gu7xuPQN+TbPJ7aQ2sLx3bAHhtYb0i3vV9RO10Gw++yUyd4R
+UCAAw2JRIISttRHMfDpDuZJpvYo=
+=AZ9M
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+ERROR:  Unsupported compression algorithm
diff --git a/contrib/pgcrypto/expected/ivy-pgp-decrypt_1.out b/contrib/pgcrypto/expected/ivy-pgp-decrypt_1.out
new file mode 100644
index 00000000000..c4fc7c8c20f
--- /dev/null
+++ b/contrib/pgcrypto/expected/ivy-pgp-decrypt_1.out
@@ -0,0 +1,437 @@
+--
+-- pgp decrypt tests
+--
+--  Checking ciphers
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.blowfish.sha1.mdc.s2k3.z0
+
+jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
+yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
+=JcP+
+-----END PGP MESSAGE-----
+'), 'foobar');
+ERROR:  Wrong key or corrupt data
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
+UTAsG35A1vYs02VARKzGz6xI2UHwFUirP+brPBg3Ee7muOx8pA==
+=XtrP
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCI7YQpWqp3D1g0kQBCjB7GlX7+SQeXNleXeXQ78ZAPNliquGDq9u378zI
+5FPTqAhIB2/2fjY8QEIs1ai00qphjX2NitxV/3Wn+6dufB4Q4g==
+=rCZt
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMC4f/5djqCC1Rg0kQBTHEPsD+Sw7biBsM2er3vKyGPAQkuTBGKC5ie7hT/
+lceMfQdbAg6oTFyJpk/wH18GzRDphCofg0X8uLgkAKMrpcmgog==
+=fB6S
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking MDC modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.nomdc.s2k3.z0
+
+jA0EBwMCnv07rlXqWctgyS2Dm2JfOKCRL4sLSLJUC8RS2cH7cIhKSuLitOtyquB+
+u9YkgfJfsuRJmgQ9tmo=
+=60ui
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEeP3idNjQ1Bg0kQBf4G0wX+2QNzLh2YNwYkQgQkfYhn/hLXjV4nK9nsE
+8Ex1Dsdt5UPvOz8W8VKQRS6loOfOe+yyXil8W3IYFwUpdDUi+Q==
+=moGf
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking hashes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.md5.mdc.s2k3.z0
+
+jA0EBwMClrXXtOXetohg0kQBn0Kl1ymevQZRHkdoYRHgzCwSQEiss7zYff2UNzgO
+KyRrHf7zEBuZiZ2AG34jNVMOLToj1jJUg5zTSdecUzQVCykWTA==
+=NyLk
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCApbdlrURoWJg0kQBzHM/E0o7djY82bNuspjxjAcPFrrtp0uvDdMQ4z2m
+/PM8jhgI5vxFYfNQjLl8y3fHYIomk9YflN9K/Q13iq8A8sjeTw==
+=FxbQ
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking S2K modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k0.z0
+
+jAQEBwAC0kQBKTaLAKE3xzps+QIZowqRNb2eAdzBw2LxEW2YD5PgNlbhJdGg+dvw
+Ah9GXjGS1TVALzTImJbz1uHUZRfhJlFbc5yGQw==
+=YvkV
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k1.z0
+
+jAwEBwEC/QTByBLI3b/SRAHPxKzI6SZBo5lAEOD+EsvKQWO4adL9tDY+++Iqy1xK
+4IaWXVKEj9R2Lr2xntWWMGZtcKtjD2lFFRXXd9dZp1ZThNDz
+=dbXm
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEq4Su3ZqNEJg0kQB4QG5jBTKF0i04xtH+avzmLhstBNRxvV3nsmB3cwl
+z+9ZaA/XdSx5ZiFnMym8P6r8uY9rLjjNptvvRHlxIReF+p9MNg==
+=VJKg
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k0.z0
+
+jAQECAAC0kQBBDnQWkgsx9YFaqDfWmpsiyAJ6y2xG/sBvap1dySYEMuZ+wJTXQ9E
+Cr3i2M7TgVZ0M4jp4QL0adG1lpN5iK7aQeOwMw==
+=cg+i
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k1.z0
+
+jAwECAECruOfyNDFiTnSRAEVoGXm4A9UZKkWljdzjEO/iaE7mIraltIpQMkiqCh9
+7h8uZ2u9uRBOv222fZodGvc6bvq/4R4hAa/6qSHtm8mdmvGt
+=aHmC
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCjFn6SRi3SONg0kQBqtSHPaD0m7rXfDAhCWU/ypAsI93GuHGRyM99cvMv
+q6eF6859ZVnli3BFSDSk3a4e/pXhglxmDYCfjAXkozKNYLo6yw==
+=K0LS
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k0.z0
+
+jAQECQAC0kQB4L1eMbani07XF2ZYiXNK9LW3v8w41oUPl7dStmrJPQFwsdxmrDHu
+rQr3WbdKdY9ufjOE5+mXI+EFkSPrF9rL9NCq6w==
+=RGts
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k1.z0
+
+jAwECQECKHhrou7ZOIXSRAHWIVP+xjVQcjAVBTt+qh9SNzYe248xFTwozkwev3mO
++KVJW0qhk0An+Y2KF99/bYFl9cL5D3Tl43fC8fXGl3x3m7pR
+=SUrU
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMCjc8lwZu8Fz1g0kQBkEzjImi21liep5jj+3dAJ2aZFfUkohi8b3n9z+7+
+4+NRzL7cMW2RLAFnJbiqXDlRHMwleeuLN1up2WIxsxtYYuaBjA==
+=XZrG
+-----END PGP MESSAGE-----
+'), 'foobar');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking longer passwords
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCx6dBiuqrYNRg0kQBEo63AvA1SCslxP7ayanLf1H0/hlk2nONVhTwVEWi
+tTGup1mMz6Cfh1uDRErUuXpx9A0gdMu7zX0o5XjrL7WGDAZdSw==
+=XKKG
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCBDvYuS990iFg0kQBW31UK5OiCjWf5x6KJ8qNNT2HZWQCjCBZMU0XsOC6
+CMxFKadf144H/vpoV9GA0f22keQgCl0EsTE4V4lweVOPTKCMJg==
+=gWDh
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij2jk4h5g2j54khg23h54g2kh54g2khj54g23hj54');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCqXbFafC+ofVg0kQBejyiPqH0QMERVGfmPOjtAxvyG5KDIJPYojTgVSDt
+FwsDabdQUz5O7bgNSnxfmyw1OifGF+W2bIn/8W+0rDf8u3+O+Q==
+=OxOF
+-----END PGP MESSAGE-----
+'), 'x');
+ pgp_sym_decrypt 
+-----------------
+ Secret message.
+(1 row)
+
+-- Checking various data
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCGJ+SpuOysINg0kQBJfSjzsW0x4OVcAyr17O7FBvMTwIGeGcJd99oTQU8
+Xtx3kDqnhUq9Z1fS3qPbi5iNP2A9NxOBxPWz2JzxhydANlgbxg==
+=W/ik
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x0225e3ede6f2587b076d021a189ff60aad67e066
+(1 row)
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat2.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCvdpDvidNzMxg0jUBvj8eS2+1t/9/zgemxvhtc0fvdKGGbjH7dleaTJRB
+SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
+=Fxen
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \xda39a3ee5e6b4b0d3255bfef95601890afd80709
+(1 row)
+
+select digest(pgp_sym_decrypt_bytea(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat3.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCxQvxJZ3G/HRg0lgBeYmTa7/uDAjPyFwSX4CYBgpZWVn/JS8JzILrcWF8
+gFnkUKIE0PSaYFp+Yi1VlRfUtRQ/X/LYNGa7tWZS+4VQajz2Xtz4vUeAEiYFYPXk
+73Hb8m1yRhQK
+=ivrD
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x5e5c135efc0dd00633efc6dfd6e731ea408a5b4c
+(1 row)
+
+-- Checking CRLF
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=0'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x9353062be7720f1446d30b9e75573a4833886784
+(1 row)
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=1'), 'sha1');
+                   digest                   
+--------------------------------------------
+ \x7efefcab38467f7484d6fa43dc86cf5281bd78e2
+(1 row)
+
+-- check BUG #11905, problem with messages 6 less than a power of 2.
+select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- Negative tests
+-- Decryption with a certain incorrect key yields an apparent Literal Data
+-- packet reporting its content to be binary data.  Ciphertext source:
+-- iterative pgp_sym_encrypt('secret', 'key') until the random prefix gave
+-- rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMCxf8PTrQBmJdl0jcB6y2joE7GSLKRv7trbNsF5Z8ou5NISLUg31llVH/S0B2wl4bvzZjV
+VsxxqLSPzNLAeIspJk5G
+=mSd/
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_literal_data: data type=b
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine text/binary mismatch.
+select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
+NOTICE:  dbg: parse_literal_data: data type=b
+ERROR:  Not text data
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+ERROR:  invalid byte sequence for encoding [REDACTED]: 0x00
+CONTEXT:  PL/iSQL function inline_code_block line 12 at RAISE
+-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
+-- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
+-- until the random prefix gave rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMC9rK/dMkF5Zlt0jcBlzAQ1mQY2qYbKYbw8h3EZ5Jk0K2IiY92R82TRhWzBIF/8cmXDPtP
+GXsd65oYJZp3Khz0qfyn
+=Nmpq
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+NOTICE:  dbg: prefix_init: corrupt prefix
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+NOTICE:  dbg: mdcbuf_finish: bad MDC pkt hdr
+ERROR:  Wrong key or corrupt data
+-- Routine use of BZip2 compression.  Ciphertext source:
+-- echo x | gpg --homedir /nonexistent --personal-compress-preferences bzip2 \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCRhFrAKNcLVJg0mMBLJG1cCASNk/x/3dt1zJ+2eo7jHfjgg3N6wpB3XIe
+QCwkWJwlBG5pzbO5gu7xuPQN+TbPJ7aQ2sLx3bAHhtYb0i3vV9RO10Gw++yUyd4R
+UCAAw2JRIISttRHMfDpDuZJpvYo=
+=AZ9M
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+NOTICE:  dbg: parse_compressed_data: bzip2 unsupported
+ERROR:  Unsupported compression algorithm
diff --git a/contrib/pgcrypto/expected/md5_2.out b/contrib/pgcrypto/expected/md5_2.out
new file mode 100644
index 00000000000..51bdaa86f32
--- /dev/null
+++ b/contrib/pgcrypto/expected/md5_2.out
@@ -0,0 +1,17 @@
+--
+-- MD5 message digest
+--
+SELECT digest('', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('a', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('abc', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('message digest', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('abcdefghijklmnopqrstuvwxyz', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
+SELECT digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'md5');
+ERROR:  Cannot use "md5": No such hash algorithm
diff --git a/contrib/pgcrypto/expected/pgp-decrypt.out b/contrib/pgcrypto/expected/pgp-decrypt.out
index eb049ba9d44..8ce6466f2e9 100644
--- a/contrib/pgcrypto/expected/pgp-decrypt.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt.out
@@ -315,7 +315,7 @@ SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
  \xda39a3ee5e6b4b0d3255bfef95601890afd80709
 (1 row)
 
-select digest(pgp_sym_decrypt(dearmor('
+select digest(pgp_sym_decrypt_bytea(dearmor('
 -----BEGIN PGP MESSAGE-----
 Comment: dat3.aes.sha1.mdc.s2k3.z0
 
@@ -387,6 +387,28 @@ ERROR:  Wrong key or corrupt data
 select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 NOTICE:  dbg: parse_literal_data: data type=b
 ERROR:  Not text data
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+ERROR:  invalid byte sequence for encoding [REDACTED]: 0x00
+CONTEXT:  PL/pgSQL function inline_code_block line 12 at RAISE
 -- Decryption with a certain incorrect key yields an apparent BZip2-compressed
 -- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
 -- until the random prefix gave rise to that property.
diff --git a/contrib/pgcrypto/expected/pgp-decrypt_1.out b/contrib/pgcrypto/expected/pgp-decrypt_1.out
index 80a4c48613d..ee57ad43cb7 100644
--- a/contrib/pgcrypto/expected/pgp-decrypt_1.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt_1.out
@@ -311,7 +311,7 @@ SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
  \xda39a3ee5e6b4b0d3255bfef95601890afd80709
 (1 row)
 
-select digest(pgp_sym_decrypt(dearmor('
+select digest(pgp_sym_decrypt_bytea(dearmor('
 -----BEGIN PGP MESSAGE-----
 Comment: dat3.aes.sha1.mdc.s2k3.z0
 
@@ -383,6 +383,28 @@ ERROR:  Wrong key or corrupt data
 select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 NOTICE:  dbg: parse_literal_data: data type=b
 ERROR:  Not text data
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+ERROR:  invalid byte sequence for encoding [REDACTED]: 0x00
+CONTEXT:  PL/pgSQL function inline_code_block line 12 at RAISE
 -- Decryption with a certain incorrect key yields an apparent BZip2-compressed
 -- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
 -- until the random prefix gave rise to that property.
diff --git a/contrib/pgcrypto/expected/pgp-pubkey-session.out b/contrib/pgcrypto/expected/pgp-pubkey-session.out
new file mode 100644
index 00000000000..e57cb8fab99
--- /dev/null
+++ b/contrib/pgcrypto/expected/pgp-pubkey-session.out
@@ -0,0 +1,47 @@
+-- Test for overflow with session key at decrypt.
+-- Data automatically generated by scripts/pgp_session_data.py.
+-- See this file for details explaining how this data is generated.
+SELECT pgp_pub_decrypt_bytea(
+'\xc1c04c030000000000000000020800a46f5b9b1905b49457a6485474f71ed9b46c2527e1
+da08e1f7871e12c3d38828f2076b984a595bf60f616599ca5729d547de06a258bfbbcd30
+94a321e4668cd43010f0ca8ecf931e5d39bda1152c50c367b11c723f270729245d3ebdbd
+0694d320c5a5aa6a405fb45182acb3d7973cbce398e0c5060af7603cfd9ed186ebadd616
+3b50ae42bea5f6d14dda24e6d4687b434c175084515d562e896742b0ba9a1c87d5642e10
+a5550379c71cc490a052ada483b5d96526c0a600fc51755052aa77fdf72f7b4989b920e7
+b90f4b30787a46482670d5caecc7a515a926055ad5509d135702ce51a0e4c1033f2d939d
+8f0075ec3428e17310da37d3d2d7ad1ce99adcc91cd446c366c402ae1ee38250343a7fcc
+0f8bc28020e603d7a4795ef0dcc1c04c030000000000000000020800a46f5b9b1905b494
+57a6485474f71ed9b46c2527e1da08e1f7871e12c3d38828f2076b984a595bf60f616599
+ca5729d547de06a258bfbbcd3094a321e4668cd43010f0ca8ecf931e5d39bda1152c50c3
+67b11c723f270729245d3ebdbd0694d320c5a5aa6a405fb45182acb3d7973cbce398e0c5
+060af7603cfd9ed186ebadd6163b50ae42bea5f6d14dda24e6d4687b434c175084515d56
+2e896742b0ba9a1c87d5642e10a5550379c71cc490a052ada483b5d96526c0a600fc5175
+5052aa77fdf72f7b4989b920e7b90f4b30787a46482670d5caecc7a515a926055ad5509d
+135702ce51a0e4c1033f2d939d8f0075ec3428e17310da37d3d2d7ad1ce99adc'::bytea,
+'\xc7c2d8046965d657020800eef8bf1515adb1a3ee7825f75c668ea8dd3e3f9d13e958f6ad
+9c55adc0c931a4bb00abe1d52cf7bb0c95d537949d277a5292ede375c6b2a67a3bf7d19f
+f975bb7e7be35c2d8300dacba360a0163567372f7dc24000cc7cb6170bedc8f3b1f98c12
+07a6cb4de870a4bc61319b139dcc0e20c368fd68f8fd346d2c0b69c5aed560504e2ec6f1
+23086fe3c5540dc4dd155c0c67257c4ada862f90fe172ace344089da8135e92aca5c2709
+f1c1bc521798bb8c0365841496e709bd184132d387e0c9d5f26dc00fd06c3a76ef66a75c
+138285038684707a847b7bd33cfbefbf1d336be954a8048946af97a66352adef8e8b5ae4
+c4748c6f2510265b7a8267bc370dbb00110100010007ff7e72d4f95d2d39901ac12ca5c5
+18e767e719e72340c3fab51c8c5ab1c40f31db8eaffe43533fa61e2dbca2c3f4396c0847
+e5434756acbb1f68128f4136bb135710c89137d74538908dac77967de9e821c559700dd9
+de5a2727eec1f5d12d5d74869dd1de45ed369d94a8814d23861dd163f8c27744b26b98f0
+239c2e6dd1e3493b8cc976fdc8f9a5e250f715aa4c3d7d5f237f8ee15d242e8fa941d1a0
+ed9550ab632d992a97518d142802cb0a97b251319bf5742db8d9d8cbaa06cdfba2d75bc9
+9d77a51ff20bd5ba7f15d7af6e85b904de2855d19af08d45f39deb85403033c69c767a8e
+74a343b1d6c8911d34ea441ac3850e57808ed3d885835cbe6c79d10400ef16256f3d5c4c
+3341516a2d2aa888df81b603f48a27f3666b40f992a857c1d11ff639cd764a9b42d5a1f8
+58b4aeee36b85508bb5e8b91ef88a7737770b330224479d9b44eae8c631bc43628b69549
+507c0a1af0be0dd7696015abea722b571eb35eefc4ab95595378ec12814727443f625fcd
+183bb9b3bccf53b54dd0e5e7a50400ffe08537b2d4e6074e4a1727b658cfccdec8962302
+25e300c05690de45f7065c3d40d86f544a64d51a3e94424f9851a16d1322ebdb41fa8a45
+3131f3e2dc94e858e6396722643df382680f815e53bcdcde5da622f50530a83b217f1103
+cdd6e5e9babe1e415bbff28d44bd18c95f43bbd04afeb2a2a99af38a571c7540de21df03
+ff62c0a33d9143dd3f639893f47732c11c5a12c6052d1935f4d507b7ae1f76ab0e9a69b8
+7305a7f7c19bd509daf4903bff614bc26d118f03e461469c72c12d3a2bb4f78e4d342ce8
+487723649a01ed2b9eb11c662134502c098d55dfcd361939d8370873422c3da75a515a75
+9ffedfe7df44fb3c20f81650801a30d43b5c90b98b3eee'::bytea);
+ERROR:  Session key too big
diff --git a/contrib/pgcrypto/meson.build b/contrib/pgcrypto/meson.build
index 7d5ef9b6d32..3927c54458f 100644
--- a/contrib/pgcrypto/meson.build
+++ b/contrib/pgcrypto/meson.build
@@ -52,6 +52,7 @@ pgcrypto_regress = [
   'pgp-encrypt-md5',
   'pgp-pubkey-decrypt',
   'pgp-pubkey-encrypt',
+  'pgp-pubkey-session',
   'pgp-info',
   'crypt-shacrypt'
 ]
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 7c9f4c7b39b..464ca6e06c9 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -631,6 +631,7 @@ pgp_sym_decrypt_text(PG_FUNCTION_ARGS)
 		arg = PG_GETARG_TEXT_PP(2);
 
 	res = decrypt_internal(0, 1, data, key, NULL, arg);
+	pg_verifymbstr(VARDATA_ANY(res), VARSIZE_ANY_EXHDR(res), false);
 
 	PG_FREE_IF_COPY(data, 0);
 	PG_FREE_IF_COPY(key, 1);
@@ -732,6 +733,7 @@ pgp_pub_decrypt_text(PG_FUNCTION_ARGS)
 		arg = PG_GETARG_TEXT_PP(3);
 
 	res = decrypt_internal(1, 1, data, key, psw, arg);
+	pg_verifymbstr(VARDATA_ANY(res), VARSIZE_ANY_EXHDR(res), false);
 
 	PG_FREE_IF_COPY(data, 0);
 	PG_FREE_IF_COPY(key, 1);
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index a0a5738a40e..2a13aa3e6ad 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -157,6 +157,7 @@ pgp_parse_pubenc_sesskey(PGP_Context *ctx, PullFilter *pkt)
 	uint8	   *msg;
 	int			msglen;
 	PGP_MPI    *m;
+	unsigned	sess_key_len;
 
 	pk = ctx->pub_key;
 	if (pk == NULL)
@@ -220,11 +221,19 @@ pgp_parse_pubenc_sesskey(PGP_Context *ctx, PullFilter *pkt)
 	if (res < 0)
 		goto out;
 
+	sess_key_len = msglen - 3;
+	if (sess_key_len > PGP_MAX_KEY)
+	{
+		px_debug("incorrect session key length=%u", sess_key_len);
+		res = PXE_PGP_KEY_TOO_BIG;
+		goto out;
+	}
+
 	/*
 	 * got sesskey
 	 */
 	ctx->cipher_algo = *msg;
-	ctx->sess_key_len = msglen - 3;
+	ctx->sess_key_len = sess_key_len;
 	memcpy(ctx->sess_key, msg + 1, ctx->sess_key_len);
 
 out:
diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
index d35ccca7774..ad0914991b1 100644
--- a/contrib/pgcrypto/px.c
+++ b/contrib/pgcrypto/px.c
@@ -65,6 +65,7 @@ static const struct error_desc px_err_list[] = {
 	{PXE_PGP_UNEXPECTED_PKT, "Unexpected packet in key data"},
 	{PXE_PGP_MATH_FAILED, "Math operation failed"},
 	{PXE_PGP_SHORT_ELGAMAL_KEY, "Elgamal keys must be at least 1024 bits long"},
+	{PXE_PGP_KEY_TOO_BIG, "Session key too big"},
 	{PXE_PGP_UNKNOWN_PUBALGO, "Unknown public-key encryption algorithm"},
 	{PXE_PGP_WRONG_KEY, "Wrong key"},
 	{PXE_PGP_MULTIPLE_KEYS,
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index 4b81fceab8e..a09533a3582 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -75,7 +75,7 @@
 /* -108 is unused */
 #define PXE_PGP_MATH_FAILED			-109
 #define PXE_PGP_SHORT_ELGAMAL_KEY	-110
-/* -111 is unused */
+#define PXE_PGP_KEY_TOO_BIG			-111
 #define PXE_PGP_UNKNOWN_PUBALGO		-112
 #define PXE_PGP_WRONG_KEY			-113
 #define PXE_PGP_MULTIPLE_KEYS		-114
diff --git a/contrib/pgcrypto/scripts/pgp_session_data.py b/contrib/pgcrypto/scripts/pgp_session_data.py
new file mode 100644
index 00000000000..999350bb2bc
--- /dev/null
+++ b/contrib/pgcrypto/scripts/pgp_session_data.py
@@ -0,0 +1,491 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Generate PGP data to check the session key length of the input data provided
+# to pgp_pub_decrypt_bytea().
+#
+# First, the crafted data is generated from valid RSA data, freshly generated
+# by this script each time it is run, see generate_rsa_keypair().
+# Second, the crafted PGP data is built, see build_message_data() and
+# build_key_data().  Finally, the resulting SQL script is generated.
+#
+# This script generates in stdout the SQL file that is used in the regression
+# tests of pgcrypto.  The following command can be used to regenerate the file
+# which should never be manually manipulated:
+# python3 scripts/pgp_session_data.py > sql/pgp-pubkey-session.sql
+
+import os
+import re
+import struct
+import secrets
+import sys
+import time
+
+# pwn for binary manipulation (p32, p64)
+from pwn import *
+
+# Cryptographic libraries, to craft the PGP data.
+from Crypto.Cipher import AES
+from Crypto.PublicKey import RSA
+from Crypto.Util.number import inverse
+
+# AES key used for session key encryption (16 bytes for AES-128)
+AES_KEY = b'\x01' * 16
+
+def generate_rsa_keypair(key_size: int = 2048) -> dict:
+    """
+    Generate a fresh RSA key pair.
+
+    The generated key includes all components needed for PGP operations:
+    - n: public modulus (p * q)
+    - e: public exponent (typically 65537)
+    - d: private exponent (e^-1 mod phi(n))
+    - p, q: prime factors of n
+    - u: coefficient (p^-1 mod q) for CRT optimization
+
+    The caller can pass the wanted key size in input, for a default of 2048
+    bytes.  This function returns the RSA key components, after performing
+    some validation on them.
+    """
+
+    start_time = time.time()
+
+    # Generate RSA key
+    key = RSA.generate(key_size)
+
+    # Extract all key components
+    rsa_components = {
+        'n': key.n,      # Public modulus (p * q)
+        'e': key.e,      # Public exponent (typically 65537)
+        'd': key.d,      # Private exponent (e^-1 mod phi(n))
+        'p': key.p,      # First prime factor
+        'q': key.q,      # Second prime factor
+        'u': inverse(key.p, key.q)  # Coefficient for CRT: p^-1 mod q
+    }
+
+    # Validate key components for correctness
+    validate_rsa_key(rsa_components)
+
+    return rsa_components
+
+def validate_rsa_key(rsa: dict) -> None:
+    """
+    Validate a generated RSA key.
+
+    This function performs basic validation to ensure the RSA key is properly
+    constructed and all components are consistent, at least mathematically.
+
+    Validations performed:
+    1. n = p * q (modulus is product of primes)
+    2. gcd(e, phi(n)) = 1 (public exponent is coprime to phi(n))
+    3. (d * e) mod(phi(n)) = 1 (private exponent is multiplicative inverse)
+    4. (u * p) (mod q) = 1 (coefficient is correct for CRT)
+    """
+
+    n, e, d, p, q, u = rsa['n'], rsa['e'], rsa['d'], rsa['p'], rsa['q'], rsa['u']
+
+    # Check that n = p * q
+    if n != p * q:
+        raise ValueError("RSA validation failed: n <> p * q")
+
+    # Check that p and q are different
+    if p == q:
+        raise ValueError("RSA validation failed: p = q (not allowed)")
+
+    # Calculate phi(n) = (p-1)(q-1)
+    phi_n = (p - 1) * (q - 1)
+
+    # Check that gcd(e, phi(n)) = 1
+    def gcd(a, b):
+        while b:
+            a, b = b, a % b
+        return a
+
+    if gcd(e, phi_n) != 1:
+        raise ValueError("RSA validation failed: gcd(e, phi(n)) <> 1")
+
+    # Check that (d * e) mod(phi(n)) = 1
+    if (d * e) % phi_n != 1:
+        raise ValueError("RSA validation failed: d * e <> 1 (mod phi(n))")
+
+    # Check that (u * p) (mod q) = 1
+    if (u * p) % q != 1:
+        raise ValueError("RSA validation failed: u * p <> 1 (mod q)")
+
+def mpi_encode(x: int) -> bytes:
+    """
+    Encode an integer as an OpenPGP Multi-Precision Integer (MPI).
+
+    Format (RFC 4880, Section 3.2):
+    - 2 bytes: bit length of the integer (big-endian)
+    - N bytes: the integer in big-endian format
+
+    This is used to encode RSA key components (n, e, d, p, q, u) in PGP
+    packets.
+
+    The integer to encode is given in input, returning an MPI-encoded
+    integer.
+
+    For example:
+        mpi_encode(65537) -> b'\x00\x11\x01\x00\x01'
+        (17 bits, value 0x010001)
+    """
+    if x < 0:
+        raise ValueError("MPI cannot encode negative integers")
+
+    if x == 0:
+        # Special case: zero has 0 bits and empty magnitude
+        bits = 0
+        mag = b""
+    else:
+        # Calculate bit length and convert to bytes
+        bits = x.bit_length()
+        mag = x.to_bytes((bits + 7) // 8, 'big')
+
+    # Pack: 2-byte bit length + magnitude bytes
+    return struct.pack('>H', bits) + mag
+
+def new_packet(tag: int, payload: bytes) -> bytes:
+    """
+    Create a new OpenPGP packet with a proper header.
+
+    OpenPGP packet format (RFC 4880, Section 4.2):
+    - New packet format: 0xC0 | tag
+    - Length encoding depends on payload size:
+      * 0-191: single byte
+      * 192-8383: two bytes (192 + ((length - 192) >> 8), (length - 192) & 0xFF)
+      * 8384+: five bytes (0xFF + 4-byte big-endian length)
+
+    The packet is built from a "tag" (1-63) and some "payload" data.  The
+    result generated is a complete OpenPGP packet.
+
+    For example:
+        new_packet(1, b'data') -> b'\xC1\x04data'
+        (Tag 1, length 4, payload 'data')
+    """
+    # New packet format: set bit 7 and 6, clear bit 5, tag in bits 0-5
+    first = 0xC0 | (tag & 0x3F)
+    ln = len(payload)
+
+    # Encode length according to OpenPGP specification
+    if ln <= 191:
+        # Single byte length for small packets
+        llen = bytes([ln])
+    elif ln <= 8383:
+        # Two-byte length for medium packets
+        ln2 = ln - 192
+        llen = bytes([192 + (ln2 >> 8), ln2 & 0xFF])
+    else:
+        # Five-byte length for large packets
+        llen = bytes([255]) + struct.pack('>I', ln)
+
+    return bytes([first]) + llen + payload
+
+def build_key_data(rsa: dict) -> bytes:
+    """
+    Build the key data, containing an RSA private key.
+
+    The RSA contents should have been generated previously.
+
+    Format (see RFC 4880, Section 5.5.3):
+    - 1 byte: version (4)
+    - 4 bytes: creation time (current Unix timestamp)
+    - 1 byte: public key algorithm (2 = RSA encrypt)
+    - MPI: RSA public modulus n
+    - MPI: RSA public exponent e
+    - 1 byte: string-to-key usage (0 = no encryption)
+    - MPI: RSA private exponent d
+    - MPI: RSA prime p
+    - MPI: RSA prime q
+    - MPI: RSA coefficient u = p^-1 mod q
+    - 2 bytes: checksum of private key material
+
+    This function takes a set of RSA key components in input (n, e, d, p, q, u)
+    and returns a secret key packet.
+    """
+
+    # Public key portion
+    ver = bytes([4])                           # Version 4 key
+    ctime = struct.pack('>I', int(time.time())) # Current Unix timestamp
+    algo = bytes([2])                          # RSA encrypt algorithm
+    n_mpi = mpi_encode(rsa['n'])               # Public modulus
+    e_mpi = mpi_encode(rsa['e'])               # Public exponent
+    pub = ver + ctime + algo + n_mpi + e_mpi
+
+    # Private key portion
+    hide_type = bytes([0])              # No string-to-key encryption
+    d_mpi = mpi_encode(rsa['d'])        # Private exponent
+    p_mpi = mpi_encode(rsa['p'])        # Prime p
+    q_mpi = mpi_encode(rsa['q'])        # Prime q
+    u_mpi = mpi_encode(rsa['u'])        # Coefficient u = p^-1 mod q
+
+    # Calculate checksum of private key material (simple sum mod 65536)
+    private_data = d_mpi + p_mpi + q_mpi + u_mpi
+    cksum = sum(private_data) & 0xFFFF
+
+    secret = hide_type + private_data + struct.pack('>H', cksum)
+    payload = pub + secret
+
+    return new_packet(7, payload)
+
+def pgp_cfb_encrypt_resync(key, plaintext):
+    """
+    Implement OpenPGP CFB mode with resync.
+
+    OpenPGP CFB mode is a variant of standard CFB with a resync operation
+    after the first two blocks.
+
+    Algorithm (RFC 4880, Section 13.9):
+    1. Block 1: FR=zeros, encrypt full block_size bytes
+    2. Block 2: FR=block1, encrypt only 2 bytes
+    3. Resync: FR = block1[2:] + block2
+    4. Remaining blocks: standard CFB mode
+
+    This function uses the following arguments:
+    - key: AES encryption key (16 bytes for AES-128)
+    - plaintext: Data to encrypt
+    """
+    block_size = 16  # AES block size
+    cipher = AES.new(key[:16], AES.MODE_ECB)  # Use ECB for manual CFB
+    ciphertext = b''
+
+    # Block 1: FR=zeros, encrypt full 16 bytes
+    FR = b'\x00' * block_size
+    FRE = cipher.encrypt(FR)  # Encrypt the feedback register
+    block1 = bytes(a ^ b for a, b in zip(FRE, plaintext[0:16]))
+    ciphertext += block1
+
+    # Block 2: FR=block1, encrypt only 2 bytes
+    FR = block1
+    FRE = cipher.encrypt(FR)
+    block2 = bytes(a ^ b for a, b in zip(FRE[0:2], plaintext[16:18]))
+    ciphertext += block2
+
+    # Resync: FR = block1[2:16] + block2[0:2]
+    # This is the key difference from standard CFB mode
+    FR = block1[2:] + block2
+
+    # Block 3+: Continue with standard CFB mode
+    pos = 18
+    while pos < len(plaintext):
+        FRE = cipher.encrypt(FR)
+        chunk_len = min(block_size, len(plaintext) - pos)
+        chunk = plaintext[pos:pos+chunk_len]
+        enc_chunk = bytes(a ^ b for a, b in zip(FRE[:chunk_len], chunk))
+        ciphertext += enc_chunk
+
+        # Update feedback register for next iteration
+        if chunk_len == block_size:
+            FR = enc_chunk
+        else:
+            # Partial block: pad with old FR bytes
+            FR = enc_chunk + FR[chunk_len:]
+        pos += chunk_len
+
+    return ciphertext
+
+def build_literal_data_packet(data: bytes) -> bytes:
+    """
+    Build a literal data packet containing a message.
+
+    Format (RFC 4880, Section 5.9):
+    - 1 byte: data format ('b' = binary, 't' = text, 'u' = UTF-8 text)
+    - 1 byte: filename length (0 = no filename)
+    - N bytes: filename (empty in this case)
+    - 4 bytes: date (current Unix timestamp)
+    - M bytes: literal data
+
+    The data used to build the packet is given in input, with the generated
+    result returned.
+    """
+    body = bytes([
+        ord('b'),                              # Binary data format
+        0,                                     # Filename length (0 = no filename)
+    ]) + struct.pack('>I', int(time.time())) + data  # Current timestamp + data
+
+    return new_packet(11, body)
+
+def build_symenc_data_packet(sess_key: bytes, cipher_algo: int, payload: bytes) -> bytes:
+    """
+    Build a symmetrically-encrypted data packet using AES-128-CFB.
+
+    This packet contains encrypted data using the session key. The format
+    includes a random prefix, for security (see RFC 4880, Section 5.7).
+
+    Packet structure:
+    - Random prefix (block_size bytes)
+    - Prefix repeat (last 2 bytes of prefix repeated)
+    - Encrypted literal data packet
+
+    This function uses the following set of arguments:
+    - sess_key: Session key for encryption
+    - cipher_algo: Cipher algorithm identifier (7 = AES-128)
+    - payload: Data to encrypt (wrapped in literal data packet)
+    """
+    block_size = 16  # AES-128 block size
+    key = sess_key[:16]  # Use first 16 bytes for AES-128
+
+    # Create random prefix + repeat last 2 bytes (total 18 bytes)
+    # This is required by OpenPGP for integrity checking
+    prefix_random = secrets.token_bytes(block_size)
+    prefix = prefix_random + prefix_random[-2:]  # 18 bytes total
+
+    # Wrap payload in literal data packet
+    literal_pkt = build_literal_data_packet(payload)
+
+    # Plaintext = prefix + literal data packet
+    plaintext = prefix + literal_pkt
+
+    # Encrypt using OpenPGP CFB mode with resync
+    ciphertext = pgp_cfb_encrypt_resync(key, plaintext)
+
+    return new_packet(9, ciphertext)
+
+def build_tag1_packet(rsa: dict, sess_key: bytes) -> bytes:
+    """
+    Build a public-key encrypted key.
+
+    This is a very important function, as it is able to create the packet
+    triggering the overflow check.  This function can also be used to create
+    "legit" packet data.
+
+    Format (RFC 4880, Section 5.1):
+    - 1 byte: version (3)
+    - 8 bytes: key ID (0 = any key accepted)
+    - 1 byte: public key algorithm (2 = RSA encrypt)
+    - MPI: RSA-encrypted session key
+
+    This uses in arguments the generated RSA key pair, and the session key
+    to encrypt.  The latter is manipulated to trigger the overflow.
+
+    This function returns a complete packet encrypted by a session key.
+    """
+
+    # Calculate RSA modulus size in bytes
+    n_bytes = (rsa['n'].bit_length() + 7) // 8
+
+    # Session key message format:
+    # - 1 byte: symmetric cipher algorithm (7 = AES-128)
+    # - N bytes: session key
+    # - 2 bytes: checksum (simple sum of session key bytes)
+    algo_byte = bytes([7])  # AES-128 algorithm identifier
+    cksum = sum(sess_key) & 0xFFFF  # 16-bit checksum
+    M = algo_byte + sess_key + struct.pack('>H', cksum)
+
+    # PKCS#1 v1.5 padding construction
+    # Format: 0x02 || PS || 0x00 || M
+    # Total padded message must be exactly n_bytes long.
+    total_len = n_bytes  # Total length must equal modulus size in bytes
+    ps_len = total_len - len(M) - 2  # Subtract 2 for 0x02 and 0x00 bytes
+
+    if ps_len < 8:
+        raise ValueError(f"Padding string too short ({ps_len} bytes); need at least 8 bytes. "
+                        f"Message length: {len(M)}, Modulus size: {n_bytes} bytes")
+
+    # Create padding string with *ALL* bytes being 0xFF (no zero separator!)
+    PS = bytes([0xFF]) * ps_len
+
+    # Construct the complete padded message
+    # Normal PKCS#1 v1.5 padding: 0x02 || PS || 0x00 || M
+    padded = bytes([0x02]) + PS + bytes([0x00]) + M
+
+    # Verify padding construction
+    if len(padded) != n_bytes:
+        raise ValueError(f"Padded message length ({len(padded)}) doesn't match RSA modulus size ({n_bytes})")
+
+    # Convert padded message to integer and encrypt with RSA
+    m_int = int.from_bytes(padded, 'big')
+
+    # Ensure message is smaller than modulus (required for RSA)
+    if m_int >= rsa['n']:
+        raise ValueError("Padded message is larger than RSA modulus")
+
+    # RSA encryption: c = m^e mod n
+    c_int = pow(m_int, rsa['e'], rsa['n'])
+
+    # Encode encrypted result as MPI
+    c_mpi = mpi_encode(c_int)
+
+    # Build complete packet
+    ver = bytes([3])           # Version 3 packet
+    key_id = b"\x00" * 8      # Key ID (0 = any key accepted)
+    algo = bytes([2])         # RSA encrypt algorithm
+    payload = ver + key_id + algo + c_mpi
+
+    return new_packet(1, payload)
+
+def build_message_data(rsa: dict) -> bytes:
+    """
+    This function creates a crafted message, with a long session key
+    length.
+
+    This takes in input the RSA key components generated previously,
+    returning a concatenated set of PGP packets crafted for the purpose
+    of this test.
+    """
+
+    # Base prefix for session key (AES key + padding + size).
+    # Note that the crafted size is the important part for this test.
+    prefix = AES_KEY + b"\x00" * 16 + p32(0x10)
+
+    # Build encrypted data packet, legit.
+    sedata = build_symenc_data_packet(AES_KEY, cipher_algo=7, payload=b"\x0a\x00")
+
+    # Build multiple packets
+    packets = [
+        # First packet, legit.
+        build_tag1_packet(rsa, prefix),
+
+        # Encrypted data packet, legit.
+        sedata,
+
+        # Second packet: information payload.
+        #
+        # This packet contains a longer-crafted session key, able to trigger
+        # the overflow check in pgcrypto.  This is the critical part, and
+        # and you are right to pay a lot of attention here if you are
+        # reading this code.
+        build_tag1_packet(rsa, prefix)
+    ]
+
+    return b"".join(packets)
+
+def main():
+    # Default key size.
+    # This number can be set to a higher number if wanted, like 4096.  We
+    # just do not need to do that here.
+    key_size = 2048
+
+    # Generate fresh RSA key pair
+    rsa = generate_rsa_keypair(key_size)
+
+    # Generate the message data.
+    print("### Building message data", file=sys.stderr)
+    message_data = build_message_data(rsa)
+
+    # Build the key containing the RSA private key
+    print("### Building key data", file=sys.stderr)
+    key_data = build_key_data(rsa)
+
+    # Convert to hexadecimal, for the bytea used in the SQL file.
+    message_data = message_data.hex()
+    key_data = key_data.hex()
+
+    # Split each value into lines of 72 characters, for readability.
+    message_data = re.sub("(.{72})", "\\1\n", message_data, 0, re.DOTALL)
+    key_data = re.sub("(.{72})", "\\1\n", key_data, 0, re.DOTALL)
+
+    # Get the script filename for documentation
+    file_basename = os.path.basename(__file__)
+
+    # Output the SQL test case
+    print(f'''-- Test for overflow with session key at decrypt.
+-- Data automatically generated by scripts/{file_basename}.
+-- See this file for details explaining how this data is generated.
+SELECT pgp_pub_decrypt_bytea(
+'\\x{message_data}'::bytea,
+'\\x{key_data}'::bytea);''',
+          file=sys.stdout)
+
+if __name__ == "__main__":
+    main()
diff --git a/contrib/pgcrypto/sql/ivy-pgp-decrypt.sql b/contrib/pgcrypto/sql/ivy-pgp-decrypt.sql
new file mode 100644
index 00000000000..b499bf757b0
--- /dev/null
+++ b/contrib/pgcrypto/sql/ivy-pgp-decrypt.sql
@@ -0,0 +1,330 @@
+--
+-- pgp decrypt tests
+--
+
+--  Checking ciphers
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.blowfish.sha1.mdc.s2k3.z0
+
+jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
+yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
+=JcP+
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
+UTAsG35A1vYs02VARKzGz6xI2UHwFUirP+brPBg3Ee7muOx8pA==
+=XtrP
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCI7YQpWqp3D1g0kQBCjB7GlX7+SQeXNleXeXQ78ZAPNliquGDq9u378zI
+5FPTqAhIB2/2fjY8QEIs1ai00qphjX2NitxV/3Wn+6dufB4Q4g==
+=rCZt
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMC4f/5djqCC1Rg0kQBTHEPsD+Sw7biBsM2er3vKyGPAQkuTBGKC5ie7hT/
+lceMfQdbAg6oTFyJpk/wH18GzRDphCofg0X8uLgkAKMrpcmgog==
+=fB6S
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+-- Checking MDC modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.nomdc.s2k3.z0
+
+jA0EBwMCnv07rlXqWctgyS2Dm2JfOKCRL4sLSLJUC8RS2cH7cIhKSuLitOtyquB+
+u9YkgfJfsuRJmgQ9tmo=
+=60ui
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEeP3idNjQ1Bg0kQBf4G0wX+2QNzLh2YNwYkQgQkfYhn/hLXjV4nK9nsE
+8Ex1Dsdt5UPvOz8W8VKQRS6loOfOe+yyXil8W3IYFwUpdDUi+Q==
+=moGf
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+-- Checking hashes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.md5.mdc.s2k3.z0
+
+jA0EBwMClrXXtOXetohg0kQBn0Kl1ymevQZRHkdoYRHgzCwSQEiss7zYff2UNzgO
+KyRrHf7zEBuZiZ2AG34jNVMOLToj1jJUg5zTSdecUzQVCykWTA==
+=NyLk
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCApbdlrURoWJg0kQBzHM/E0o7djY82bNuspjxjAcPFrrtp0uvDdMQ4z2m
+/PM8jhgI5vxFYfNQjLl8y3fHYIomk9YflN9K/Q13iq8A8sjeTw==
+=FxbQ
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+-- Checking S2K modes
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k0.z0
+
+jAQEBwAC0kQBKTaLAKE3xzps+QIZowqRNb2eAdzBw2LxEW2YD5PgNlbhJdGg+dvw
+Ah9GXjGS1TVALzTImJbz1uHUZRfhJlFbc5yGQw==
+=YvkV
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k1.z0
+
+jAwEBwEC/QTByBLI3b/SRAHPxKzI6SZBo5lAEOD+EsvKQWO4adL9tDY+++Iqy1xK
+4IaWXVKEj9R2Lr2xntWWMGZtcKtjD2lFFRXXd9dZp1ZThNDz
+=dbXm
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCEq4Su3ZqNEJg0kQB4QG5jBTKF0i04xtH+avzmLhstBNRxvV3nsmB3cwl
+z+9ZaA/XdSx5ZiFnMym8P6r8uY9rLjjNptvvRHlxIReF+p9MNg==
+=VJKg
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k0.z0
+
+jAQECAAC0kQBBDnQWkgsx9YFaqDfWmpsiyAJ6y2xG/sBvap1dySYEMuZ+wJTXQ9E
+Cr3i2M7TgVZ0M4jp4QL0adG1lpN5iK7aQeOwMw==
+=cg+i
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k1.z0
+
+jAwECAECruOfyNDFiTnSRAEVoGXm4A9UZKkWljdzjEO/iaE7mIraltIpQMkiqCh9
+7h8uZ2u9uRBOv222fZodGvc6bvq/4R4hAa/6qSHtm8mdmvGt
+=aHmC
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes192.sha1.mdc.s2k3.z0
+
+jA0ECAMCjFn6SRi3SONg0kQBqtSHPaD0m7rXfDAhCWU/ypAsI93GuHGRyM99cvMv
+q6eF6859ZVnli3BFSDSk3a4e/pXhglxmDYCfjAXkozKNYLo6yw==
+=K0LS
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k0.z0
+
+jAQECQAC0kQB4L1eMbani07XF2ZYiXNK9LW3v8w41oUPl7dStmrJPQFwsdxmrDHu
+rQr3WbdKdY9ufjOE5+mXI+EFkSPrF9rL9NCq6w==
+=RGts
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k1.z0
+
+jAwECQECKHhrou7ZOIXSRAHWIVP+xjVQcjAVBTt+qh9SNzYe248xFTwozkwev3mO
++KVJW0qhk0An+Y2KF99/bYFl9cL5D3Tl43fC8fXGl3x3m7pR
+=SUrU
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes256.sha1.mdc.s2k3.z0
+
+jA0ECQMCjc8lwZu8Fz1g0kQBkEzjImi21liep5jj+3dAJ2aZFfUkohi8b3n9z+7+
+4+NRzL7cMW2RLAFnJbiqXDlRHMwleeuLN1up2WIxsxtYYuaBjA==
+=XZrG
+-----END PGP MESSAGE-----
+'), 'foobar');
+
+-- Checking longer passwords
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCx6dBiuqrYNRg0kQBEo63AvA1SCslxP7ayanLf1H0/hlk2nONVhTwVEWi
+tTGup1mMz6Cfh1uDRErUuXpx9A0gdMu7zX0o5XjrL7WGDAZdSw==
+=XKKG
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCBDvYuS990iFg0kQBW31UK5OiCjWf5x6KJ8qNNT2HZWQCjCBZMU0XsOC6
+CMxFKadf144H/vpoV9GA0f22keQgCl0EsTE4V4lweVOPTKCMJg==
+=gWDh
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij2jk4h5g2j54khg23h54g2kh54g2khj54g23hj54');
+
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCqXbFafC+ofVg0kQBejyiPqH0QMERVGfmPOjtAxvyG5KDIJPYojTgVSDt
+FwsDabdQUz5O7bgNSnxfmyw1OifGF+W2bIn/8W+0rDf8u3+O+Q==
+=OxOF
+-----END PGP MESSAGE-----
+'), 'x');
+
+-- Checking various data
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat1.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCGJ+SpuOysINg0kQBJfSjzsW0x4OVcAyr17O7FBvMTwIGeGcJd99oTQU8
+Xtx3kDqnhUq9Z1fS3qPbi5iNP2A9NxOBxPWz2JzxhydANlgbxg==
+=W/ik
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat2.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCvdpDvidNzMxg0jUBvj8eS2+1t/9/zgemxvhtc0fvdKGGbjH7dleaTJRB
+SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
+=Fxen
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+
+select digest(pgp_sym_decrypt_bytea(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: dat3.aes.sha1.mdc.s2k3.z0
+
+jA0EBwMCxQvxJZ3G/HRg0lgBeYmTa7/uDAjPyFwSX4CYBgpZWVn/JS8JzILrcWF8
+gFnkUKIE0PSaYFp+Yi1VlRfUtRQ/X/LYNGa7tWZS+4VQajz2Xtz4vUeAEiYFYPXk
+73Hb8m1yRhQK
+=ivrD
+-----END PGP MESSAGE-----
+'), '0123456789abcdefghij'), 'sha1');
+
+-- Checking CRLF
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=0'), 'sha1');
+
+select digest(pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+Comment: crlf mess
+
+ww0ECQMCt7VAtby6l4Bi0lgB5KMIZiiF/b3CfMfUyY0eDncsGXtkbu1X+l9brjpMP8eJnY79Amms
+a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
+=mBP9
+-----END PGP MESSAGE-----
+'), 'key', 'convert-crlf=1'), 'sha1');
+
+-- check BUG #11905, problem with messages 6 less than a power of 2.
+select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);
+
+
+-- Negative tests
+
+-- Decryption with a certain incorrect key yields an apparent Literal Data
+-- packet reporting its content to be binary data.  Ciphertext source:
+-- iterative pgp_sym_encrypt('secret', 'key') until the random prefix gave
+-- rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMCxf8PTrQBmJdl0jcB6y2joE7GSLKRv7trbNsF5Z8ou5NISLUg31llVH/S0B2wl4bvzZjV
+VsxxqLSPzNLAeIspJk5G
+=mSd/
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+
+-- Routine text/binary mismatch.
+select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
+
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+
+-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
+-- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
+-- until the random prefix gave rise to that property.
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+ww0EBwMC9rK/dMkF5Zlt0jcBlzAQ1mQY2qYbKYbw8h3EZ5Jk0K2IiY92R82TRhWzBIF/8cmXDPtP
+GXsd65oYJZp3Khz0qfyn
+=Nmpq
+-----END PGP MESSAGE-----
+'), 'wrong-key', 'debug=1');
+
+-- Routine use of BZip2 compression.  Ciphertext source:
+-- echo x | gpg --homedir /nonexistent --personal-compress-preferences bzip2 \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+select pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCRhFrAKNcLVJg0mMBLJG1cCASNk/x/3dt1zJ+2eo7jHfjgg3N6wpB3XIe
+QCwkWJwlBG5pzbO5gu7xuPQN+TbPJ7aQ2sLx3bAHhtYb0i3vV9RO10Gw++yUyd4R
+UCAAw2JRIISttRHMfDpDuZJpvYo=
+=AZ9M
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
diff --git a/contrib/pgcrypto/sql/pgp-decrypt.sql b/contrib/pgcrypto/sql/pgp-decrypt.sql
index 49a0267bbcb..b499bf757b0 100644
--- a/contrib/pgcrypto/sql/pgp-decrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-decrypt.sql
@@ -228,7 +228,7 @@ SaV9L04ky1qECNDx3XjnoKLC+H7IOQ==
 -----END PGP MESSAGE-----
 '), '0123456789abcdefghij'), 'sha1');
 
-select digest(pgp_sym_decrypt(dearmor('
+select digest(pgp_sym_decrypt_bytea(dearmor('
 -----BEGIN PGP MESSAGE-----
 Comment: dat3.aes.sha1.mdc.s2k3.z0
 
@@ -282,6 +282,27 @@ VsxxqLSPzNLAeIspJk5G
 -- Routine text/binary mismatch.
 select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 
+-- NUL byte in text decrypt.  Ciphertext source:
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
+--      --personal-cipher-preferences aes --no-emit-version --batch \
+--      --symmetric --passphrase key --armor
+do $$
+begin
+  perform pgp_sym_decrypt(dearmor('
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
+-----END PGP MESSAGE-----
+'), 'key', 'debug=1');
+exception when others then
+  raise '%',
+    regexp_replace(sqlerrm, 'encoding "[^"]*"', 'encoding [REDACTED]');
+end
+$$;
+
 -- Decryption with a certain incorrect key yields an apparent BZip2-compressed
 -- plaintext.  Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
 -- until the random prefix gave rise to that property.
diff --git a/contrib/pgcrypto/sql/pgp-pubkey-session.sql b/contrib/pgcrypto/sql/pgp-pubkey-session.sql
new file mode 100644
index 00000000000..51792f1f4d8
--- /dev/null
+++ b/contrib/pgcrypto/sql/pgp-pubkey-session.sql
@@ -0,0 +1,46 @@
+-- Test for overflow with session key at decrypt.
+-- Data automatically generated by scripts/pgp_session_data.py.
+-- See this file for details explaining how this data is generated.
+SELECT pgp_pub_decrypt_bytea(
+'\xc1c04c030000000000000000020800a46f5b9b1905b49457a6485474f71ed9b46c2527e1
+da08e1f7871e12c3d38828f2076b984a595bf60f616599ca5729d547de06a258bfbbcd30
+94a321e4668cd43010f0ca8ecf931e5d39bda1152c50c367b11c723f270729245d3ebdbd
+0694d320c5a5aa6a405fb45182acb3d7973cbce398e0c5060af7603cfd9ed186ebadd616
+3b50ae42bea5f6d14dda24e6d4687b434c175084515d562e896742b0ba9a1c87d5642e10
+a5550379c71cc490a052ada483b5d96526c0a600fc51755052aa77fdf72f7b4989b920e7
+b90f4b30787a46482670d5caecc7a515a926055ad5509d135702ce51a0e4c1033f2d939d
+8f0075ec3428e17310da37d3d2d7ad1ce99adcc91cd446c366c402ae1ee38250343a7fcc
+0f8bc28020e603d7a4795ef0dcc1c04c030000000000000000020800a46f5b9b1905b494
+57a6485474f71ed9b46c2527e1da08e1f7871e12c3d38828f2076b984a595bf60f616599
+ca5729d547de06a258bfbbcd3094a321e4668cd43010f0ca8ecf931e5d39bda1152c50c3
+67b11c723f270729245d3ebdbd0694d320c5a5aa6a405fb45182acb3d7973cbce398e0c5
+060af7603cfd9ed186ebadd6163b50ae42bea5f6d14dda24e6d4687b434c175084515d56
+2e896742b0ba9a1c87d5642e10a5550379c71cc490a052ada483b5d96526c0a600fc5175
+5052aa77fdf72f7b4989b920e7b90f4b30787a46482670d5caecc7a515a926055ad5509d
+135702ce51a0e4c1033f2d939d8f0075ec3428e17310da37d3d2d7ad1ce99adc'::bytea,
+'\xc7c2d8046965d657020800eef8bf1515adb1a3ee7825f75c668ea8dd3e3f9d13e958f6ad
+9c55adc0c931a4bb00abe1d52cf7bb0c95d537949d277a5292ede375c6b2a67a3bf7d19f
+f975bb7e7be35c2d8300dacba360a0163567372f7dc24000cc7cb6170bedc8f3b1f98c12
+07a6cb4de870a4bc61319b139dcc0e20c368fd68f8fd346d2c0b69c5aed560504e2ec6f1
+23086fe3c5540dc4dd155c0c67257c4ada862f90fe172ace344089da8135e92aca5c2709
+f1c1bc521798bb8c0365841496e709bd184132d387e0c9d5f26dc00fd06c3a76ef66a75c
+138285038684707a847b7bd33cfbefbf1d336be954a8048946af97a66352adef8e8b5ae4
+c4748c6f2510265b7a8267bc370dbb00110100010007ff7e72d4f95d2d39901ac12ca5c5
+18e767e719e72340c3fab51c8c5ab1c40f31db8eaffe43533fa61e2dbca2c3f4396c0847
+e5434756acbb1f68128f4136bb135710c89137d74538908dac77967de9e821c559700dd9
+de5a2727eec1f5d12d5d74869dd1de45ed369d94a8814d23861dd163f8c27744b26b98f0
+239c2e6dd1e3493b8cc976fdc8f9a5e250f715aa4c3d7d5f237f8ee15d242e8fa941d1a0
+ed9550ab632d992a97518d142802cb0a97b251319bf5742db8d9d8cbaa06cdfba2d75bc9
+9d77a51ff20bd5ba7f15d7af6e85b904de2855d19af08d45f39deb85403033c69c767a8e
+74a343b1d6c8911d34ea441ac3850e57808ed3d885835cbe6c79d10400ef16256f3d5c4c
+3341516a2d2aa888df81b603f48a27f3666b40f992a857c1d11ff639cd764a9b42d5a1f8
+58b4aeee36b85508bb5e8b91ef88a7737770b330224479d9b44eae8c631bc43628b69549
+507c0a1af0be0dd7696015abea722b571eb35eefc4ab95595378ec12814727443f625fcd
+183bb9b3bccf53b54dd0e5e7a50400ffe08537b2d4e6074e4a1727b658cfccdec8962302
+25e300c05690de45f7065c3d40d86f544a64d51a3e94424f9851a16d1322ebdb41fa8a45
+3131f3e2dc94e858e6396722643df382680f815e53bcdcde5da622f50530a83b217f1103
+cdd6e5e9babe1e415bbff28d44bd18c95f43bbd04afeb2a2a99af38a571c7540de21df03
+ff62c0a33d9143dd3f639893f47732c11c5a12c6052d1935f4d507b7ae1f76ab0e9a69b8
+7305a7f7c19bd509daf4903bff614bc26d118f03e461469c72c12d3a2bb4f78e4d342ce8
+487723649a01ed2b9eb11c662134502c098d55dfcd361939d8370873422c3da75a515a75
+9ffedfe7df44fb3c20f81650801a30d43b5c90b98b3eee'::bytea);
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 0d9c2b0b653..dbe7a190aaf 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -424,7 +424,7 @@ pgstat_btree_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 		/* fully empty page */
 		stat->free_space += BLCKSZ;
 	}
-	else
+	else if (PageGetSpecialSize(page) == MAXALIGN(sizeof(BTPageOpaqueData)))
 	{
 		BTPageOpaque opaque;
 
@@ -458,10 +458,16 @@ pgstat_hash_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 	Buffer		buf;
 	Page		page;
 
-	buf = _hash_getbuf_with_strategy(rel, blkno, HASH_READ, 0, bstrategy);
+	buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, bstrategy);
+	LockBuffer(buf, HASH_READ);
 	page = BufferGetPage(buf);
 
-	if (PageGetSpecialSize(page) == MAXALIGN(sizeof(HashPageOpaqueData)))
+	if (PageIsNew(page))
+	{
+		/* fully empty page */
+		stat->free_space += BLCKSZ;
+	}
+	else if (PageGetSpecialSize(page) == MAXALIGN(sizeof(HashPageOpaqueData)))
 	{
 		HashPageOpaque opaque;
 
@@ -502,17 +508,23 @@ pgstat_gist_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 
 	buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, bstrategy);
 	LockBuffer(buf, GIST_SHARE);
-	gistcheckpage(rel, buf);
 	page = BufferGetPage(buf);
-
-	if (GistPageIsLeaf(page))
+	if (PageIsNew(page))
 	{
-		pgstat_index_page(stat, page, FirstOffsetNumber,
-						  PageGetMaxOffsetNumber(page));
+		/* fully empty page */
+		stat->free_space += BLCKSZ;
 	}
-	else
+	else if (PageGetSpecialSize(page) == MAXALIGN(sizeof(GISTPageOpaqueData)))
 	{
-		/* root or node */
+		if (GistPageIsLeaf(page))
+		{
+			pgstat_index_page(stat, page, FirstOffsetNumber,
+							  PageGetMaxOffsetNumber(page));
+		}
+		else
+		{
+			/* root or node */
+		}
 	}
 
 	UnlockReleaseBuffer(buf);
diff --git a/contrib/postgres_fdw/.gitignore b/contrib/postgres_fdw/.gitignore
index 5dcb3ff9723..b4903eba657 100644
--- a/contrib/postgres_fdw/.gitignore
+++ b/contrib/postgres_fdw/.gitignore
@@ -1,4 +1,6 @@
 # Generated subdirectories
 /log/
 /results/
+/output_iso/
 /tmp_check/
+/tmp_check_iso/
diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile
index 2bcd04effac..995bc776eeb 100644
--- a/contrib/postgres_fdw/Makefile
+++ b/contrib/postgres_fdw/Makefile
@@ -18,6 +18,8 @@ DATA = postgres_fdw--1.0.sql postgres_fdw--1.0--1.1.sql postgres_fdw--1.1--1.2.s
 
 REGRESS = postgres_fdw query_cancel
 ORA_REGRESS = ivy_postgres_fdw
+ISOLATION = eval_plan_qual
+ISOLATION_OPTS = --load-extension=postgres_fdw
 TAP_TESTS = 1
 
 ifdef USE_PGXS
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 47b20f84607..738edc2c8ee 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -462,7 +462,7 @@ pgfdw_security_check(const char **keywords, const char **values, UserMapping *us
 	 * assume that UseScramPassthrough is also true since SCRAM options are
 	 * only set when UseScramPassthrough is enabled.
 	 */
-	if (MyProcPort->has_scram_keys && pgfdw_has_required_scram_options(keywords, values))
+	if (MyProcPort != NULL && MyProcPort->has_scram_keys && pgfdw_has_required_scram_options(keywords, values))
 		return;
 
 	ereport(ERROR,
@@ -568,7 +568,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
 		n++;
 
 		/* Add required SCRAM pass-through connection options if it's enabled. */
-		if (MyProcPort->has_scram_keys && UseScramPassthrough(server, user))
+		if (MyProcPort != NULL && MyProcPort->has_scram_keys && UseScramPassthrough(server, user))
 		{
 			int			len;
 			int			encoded_len;
@@ -660,8 +660,9 @@ disconnect_pg_server(ConnCacheEntry *entry)
 }
 
 /*
- * Return true if the password_required is defined and false for this user
- * mapping, otherwise false. The mapping has been pre-validated.
+ * Check and return the value of password_required, if defined; otherwise,
+ * return true, which is the default value of it.  The mapping has been
+ * pre-validated.
  */
 static bool
 UserMappingPasswordRequired(UserMapping *user)
@@ -743,7 +744,7 @@ check_conn_params(const char **keywords, const char **values, UserMapping *user)
 	 * assume that UseScramPassthrough is also true since SCRAM options are
 	 * only set when UseScramPassthrough is enabled.
 	 */
-	if (MyProcPort->has_scram_keys && pgfdw_has_required_scram_options(keywords, values))
+	if (MyProcPort != NULL && MyProcPort->has_scram_keys && pgfdw_has_required_scram_options(keywords, values))
 		return;
 
 	ereport(ERROR,
@@ -1341,6 +1342,11 @@ pgfdw_inval_callback(Datum arg, int cacheid, uint32 hashvalue)
  * 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.
+ *
+ * Note: there might be open cursors that use the connection, so even if the
+ * connection cache entry is marked as such, we will retain it until abort
+ * cleanup of the main transaction, to ensure such open cursors can safely
+ * refer to the PGconn for the connection.
  */
 static void
 pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
@@ -1351,15 +1357,12 @@ pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
 	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->serverid);
 
 	ereport(ERROR,
 			(errcode(ERRCODE_CONNECTION_EXCEPTION),
-			 errmsg("connection to server \"%s\" was lost",
+			 errmsg("connection to server \"%s\" cannot be used due to abort cleanup failure",
 					server->servername)));
 }
 
@@ -2557,7 +2560,7 @@ pgfdw_has_required_scram_options(const char **keywords, const char **values)
 		}
 	}
 
-	has_scram_keys = has_scram_client_key && has_scram_server_key && MyProcPort->has_scram_keys;
+	has_scram_keys = has_scram_client_key && has_scram_server_key && MyProcPort != NULL && MyProcPort->has_scram_keys;
 
 	return (has_scram_keys && has_require_auth);
 }
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 29d58ea9931..f5b2f899741 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -8,8 +8,8 @@
  * well as functions to construct the query text to be sent.  The latter
  * functionality is annoyingly duplicative of ruleutils.c, but there are
  * enough special considerations that it seems best to keep this separate.
- * One saving grace is that we only need deparse logic for node types that
- * we consider safe to send.
+ * One saving grace is that deparse logic is required only for node types
+ * considered safe to send.
  *
  * We assume that the remote session's search_path is exactly "pg_catalog",
  * and thus we need schema-qualify all and only names outside pg_catalog.
@@ -2976,7 +2976,7 @@ deparseVar(Var *node, deparse_expr_cxt *context)
 						 qualify_col);
 	else
 	{
-		/* Treat like a Param */
+		/* Treat as a Param */
 		if (context->params_list)
 		{
 			int			pindex = 0;
@@ -3409,7 +3409,7 @@ deparseOperatorName(StringInfo buf, Form_pg_operator opform)
 {
 	char	   *opname;
 
-	/* opname is not a SQL identifier, so we should not quote it. */
+/* opname is not a SQL identifier, so do not quote it. */
 	opname = NameStr(opform->oprname);
 
 	/* Print schema name only if it's not pg_catalog */
diff --git a/contrib/postgres_fdw/expected/eval_plan_qual.out b/contrib/postgres_fdw/expected/eval_plan_qual.out
new file mode 100644
index 00000000000..cee4c6ad1a8
--- /dev/null
+++ b/contrib/postgres_fdw/expected/eval_plan_qual.out
@@ -0,0 +1,131 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s0_update_l s1_tuplock_l_0 s0_commit s1_commit
+step s0_update_l: UPDATE l SET i = i + 1;
+step s1_tuplock_l_0: 
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.i = 123 FOR UPDATE OF l;
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.i = 123 FOR UPDATE OF l;
+ <waiting ...>
+step s0_commit: COMMIT;
+step s1_tuplock_l_0: <... completed>
+QUERY PLAN                                                           
+---------------------------------------------------------------------
+LockRows                                                             
+  Output: l.i, l.v, l.ctid, ft.*                                     
+  ->  Nested Loop                                                    
+        Output: l.i, l.v, l.ctid, ft.*                               
+        ->  Seq Scan on public.l                                     
+              Output: l.i, l.v, l.ctid                               
+              Filter: (l.i = 123)                                    
+        ->  Foreign Scan on public.ft                                
+              Output: ft.*, ft.i                                     
+              Remote SQL: SELECT i, v FROM public.t WHERE ((i = 123))
+(10 rows)
+
+i|v
+-+-
+(0 rows)
+
+step s1_commit: COMMIT;
+
+starting permutation: s0_update_l s1_tuplock_l_1 s0_commit s1_commit
+step s0_update_l: UPDATE l SET i = i + 1;
+step s1_tuplock_l_1: 
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.v = 'foo' FOR UPDATE OF l;
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.v = 'foo' FOR UPDATE OF l;
+ <waiting ...>
+step s0_commit: COMMIT;
+step s1_tuplock_l_1: <... completed>
+QUERY PLAN                                                                   
+-----------------------------------------------------------------------------
+LockRows                                                                     
+  Output: l.i, l.v, l.ctid, ft.*                                             
+  ->  Nested Loop                                                            
+        Output: l.i, l.v, l.ctid, ft.*                                       
+        ->  Seq Scan on public.l                                             
+              Output: l.i, l.v, l.ctid                                       
+              Filter: (l.v = 'foo'::text)                                    
+        ->  Foreign Scan on public.ft                                        
+              Output: ft.*, ft.i                                             
+              Remote SQL: SELECT i, v FROM public.t WHERE ((i = $1::integer))
+(10 rows)
+
+i|v
+-+-
+(0 rows)
+
+step s1_commit: COMMIT;
+
+starting permutation: s0_update_a s1_tuplock_a_0 s0_commit s1_commit
+step s0_update_a: UPDATE a SET i = i + 1;
+step s1_tuplock_a_0: 
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT a.i FROM a, fb, fc WHERE a.i = fb.i AND fb.i = fc.i FOR UPDATE OF a;
+    SELECT a.i FROM a, fb, fc WHERE a.i = fb.i AND fb.i = fc.i FOR UPDATE OF a;
+ <waiting ...>
+step s0_commit: COMMIT;
+step s1_tuplock_a_0: <... completed>
+QUERY PLAN                                                                                                                                                                                                              
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+LockRows                                                                                                                                                                                                                
+  Output: a.i, a.ctid, fb.*, fc.*                                                                                                                                                                                       
+  ->  Nested Loop                                                                                                                                                                                                       
+        Output: a.i, a.ctid, fb.*, fc.*                                                                                                                                                                                 
+        Join Filter: (fb.i = a.i)                                                                                                                                                                                       
+        ->  Foreign Scan                                                                                                                                                                                                
+              Output: fb.*, fb.i, fc.*, fc.i                                                                                                                                                                            
+              Relations: (public.fb) INNER JOIN (public.fc)                                                                                                                                                             
+              Remote SQL: SELECT CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.i) END, r2.i, CASE WHEN (r3.*)::text IS NOT NULL THEN ROW(r3.i) END, r3.i FROM (public.b r2 INNER JOIN public.c r3 ON (((r2.i = r3.i))))
+              ->  Nested Loop                                                                                                                                                                                           
+                    Output: fb.*, fb.i, fc.*, fc.i                                                                                                                                                                      
+                    Join Filter: (fb.i = fc.i)                                                                                                                                                                          
+                    ->  Foreign Scan on public.fb                                                                                                                                                                       
+                          Output: fb.*, fb.i                                                                                                                                                                            
+                          Remote SQL: SELECT i FROM public.b ORDER BY i ASC NULLS LAST                                                                                                                                  
+                    ->  Foreign Scan on public.fc                                                                                                                                                                       
+                          Output: fc.*, fc.i                                                                                                                                                                            
+                          Remote SQL: SELECT i FROM public.c                                                                                                                                                            
+        ->  Seq Scan on public.a                                                                                                                                                                                        
+              Output: a.i, a.ctid                                                                                                                                                                                       
+(20 rows)
+
+i
+-
+(0 rows)
+
+step s1_commit: COMMIT;
+
+starting permutation: s0_update_a s1_tuplock_a_1 s0_commit s1_commit
+step s0_update_a: UPDATE a SET i = i + 1;
+step s1_tuplock_a_1: 
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT a.i,
+        (SELECT 1 FROM fb, fc WHERE a.i = fb.i AND fb.i = fc.i)
+    FROM a FOR UPDATE;
+    SELECT a.i,
+        (SELECT 1 FROM fb, fc WHERE a.i = fb.i AND fb.i = fc.i)
+    FROM a FOR UPDATE;
+ <waiting ...>
+step s0_commit: COMMIT;
+step s1_tuplock_a_1: <... completed>
+QUERY PLAN                                                                                                                              
+----------------------------------------------------------------------------------------------------------------------------------------
+LockRows                                                                                                                                
+  Output: a.i, ((SubPlan 1)), a.ctid                                                                                                    
+  ->  Seq Scan on public.a                                                                                                              
+        Output: a.i, (SubPlan 1), a.ctid                                                                                                
+        SubPlan 1                                                                                                                       
+          ->  Foreign Scan                                                                                                              
+                Output: 1                                                                                                               
+                Relations: (public.fb) INNER JOIN (public.fc)                                                                           
+                Remote SQL: SELECT NULL FROM (public.b r1 INNER JOIN public.c r2 ON (((r2.i = $1::integer)) AND ((r1.i = $1::integer))))
+(9 rows)
+
+i|?column?
+-+--------
+2|        
+(1 row)
+
+step s1_commit: COMMIT;
diff --git a/contrib/postgres_fdw/expected/ivy_postgres_fdw.out b/contrib/postgres_fdw/expected/ivy_postgres_fdw.out
index c8412608d6f..a11e4c3499c 100644
--- a/contrib/postgres_fdw/expected/ivy_postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/ivy_postgres_fdw.out
@@ -7595,20 +7595,31 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
- Update on public.ft2
-   Output: c1, c2, c3, c4, c5, c6, c7, c8
-   Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
-   ->  Foreign Scan on public.ft2
-         Output: 'bar'::varchar2(1024), ctid, ft2.*
-         Filter: (postgres_fdw_abs(ft2.c1) > 2000)
-         Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
-(7 rows)
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+                                                    QUERY PLAN                                                    
+------------------------------------------------------------------------------------------------------------------
+ Sort
+   Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+   Sort Key: cte.c1
+   CTE cte
+     ->  Update on public.ft2
+           Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8
+           Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
+           ->  Foreign Scan on public.ft2
+                 Output: 'bar'::varchar2(1024), ft2.ctid, ft2.*
+                 Filter: (postgres_fdw_abs(ft2.c1) > 2000)
+                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
+   ->  CTE Scan on cte
+         Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+(13 rows)
 
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
   c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 
 ------+----+-----+----+----+----+------------+----
  2001 | 1  | bar |    |    |    | ft2        | 
@@ -9339,6 +9350,119 @@ DELETE FROM rem1;                 -- can't be pushed down
 (5 rows)
 
 DROP TRIGGER trig_row_after_delete ON rem1;
+-- We are allowed to create transition-table triggers on both kinds of
+-- inheritance even if they contain foreign tables as children, but currently
+-- collecting transition tuples from such foreign tables is not supported.
+CREATE TABLE local_tbl (a text, b int);
+CREATE FOREIGN TABLE foreign_tbl (a text, b int)
+  SERVER loopback OPTIONS (table_name 'local_tbl');
+INSERT INTO foreign_tbl VALUES ('AAA', 42);
+-- Test case for partition hierarchy
+CREATE TABLE parent_tbl (a text, b int) PARTITION BY LIST (a);
+ALTER TABLE parent_tbl ATTACH PARTITION foreign_tbl FOR VALUES IN ('AAA');
+CREATE TRIGGER parent_tbl_insert_trig
+  AFTER INSERT ON parent_tbl REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+ERROR:  cannot collect transition tuples from child foreign tables
+COPY parent_tbl (a, b) FROM stdin;
+ERROR:  cannot collect transition tuples from child foreign tables
+CONTEXT:  COPY parent_tbl, line 1: "AAA	42"
+ALTER SERVER loopback OPTIONS (ADD batch_size '10');
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+ERROR:  cannot collect transition tuples from child foreign tables
+COPY parent_tbl (a, b) FROM stdin;
+ERROR:  cannot collect transition tuples from child foreign tables
+CONTEXT:  COPY parent_tbl, line 1: "AAA	42"
+ALTER SERVER loopback OPTIONS (DROP batch_size);
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Update on public.parent_tbl
+   Foreign Update on public.foreign_tbl parent_tbl_1
+     Remote SQL: UPDATE public.local_tbl SET b = $2 WHERE ctid = $1
+   ->  Foreign Scan on public.foreign_tbl parent_tbl_1
+         Output: (parent_tbl_1.b + 1), parent_tbl_1.tableoid, parent_tbl_1.ctid, parent_tbl_1.*
+         Remote SQL: SELECT a, b, ctid FROM public.local_tbl FOR UPDATE
+(6 rows)
+
+UPDATE parent_tbl SET b = b + 1;
+ERROR:  cannot collect transition tuples from child foreign tables
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Delete on public.parent_tbl
+   Foreign Delete on public.foreign_tbl parent_tbl_1
+     Remote SQL: DELETE FROM public.local_tbl WHERE ctid = $1
+   ->  Foreign Scan on public.foreign_tbl parent_tbl_1
+         Output: parent_tbl_1.tableoid, parent_tbl_1.ctid
+         Remote SQL: SELECT ctid FROM public.local_tbl FOR UPDATE
+(6 rows)
+
+DELETE FROM parent_tbl;
+ERROR:  cannot collect transition tuples from child foreign tables
+ALTER TABLE parent_tbl DETACH PARTITION foreign_tbl;
+DROP TABLE parent_tbl;
+-- Test case for non-partition hierarchy
+CREATE TABLE parent_tbl (a text, b int);
+ALTER FOREIGN TABLE foreign_tbl INHERIT parent_tbl;
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Update on public.parent_tbl
+   Update on public.parent_tbl parent_tbl_1
+   Foreign Update on public.foreign_tbl parent_tbl_2
+     Remote SQL: UPDATE public.local_tbl SET b = $2 WHERE ctid = $1
+   ->  Result
+         Output: (parent_tbl.b + 1), parent_tbl.tableoid, parent_tbl.ctid, (NULL::record)
+         ->  Append
+               ->  Seq Scan on public.parent_tbl parent_tbl_1
+                     Output: parent_tbl_1.b, parent_tbl_1.tableoid, parent_tbl_1.ctid, NULL::record
+               ->  Foreign Scan on public.foreign_tbl parent_tbl_2
+                     Output: parent_tbl_2.b, parent_tbl_2.tableoid, parent_tbl_2.ctid, parent_tbl_2.*
+                     Remote SQL: SELECT a, b, ctid FROM public.local_tbl FOR UPDATE
+(12 rows)
+
+UPDATE parent_tbl SET b = b + 1;
+ERROR:  cannot collect transition tuples from child foreign tables
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Delete on public.parent_tbl
+   Delete on public.parent_tbl parent_tbl_1
+   Foreign Delete on public.foreign_tbl parent_tbl_2
+     Remote SQL: DELETE FROM public.local_tbl WHERE ctid = $1
+   ->  Append
+         ->  Seq Scan on public.parent_tbl parent_tbl_1
+               Output: parent_tbl_1.tableoid, parent_tbl_1.ctid
+         ->  Foreign Scan on public.foreign_tbl parent_tbl_2
+               Output: parent_tbl_2.tableoid, parent_tbl_2.ctid
+               Remote SQL: SELECT ctid FROM public.local_tbl FOR UPDATE
+(10 rows)
+
+DELETE FROM parent_tbl;
+ERROR:  cannot collect transition tuples from child foreign tables
+ALTER FOREIGN TABLE foreign_tbl NO INHERIT parent_tbl;
+DROP TABLE parent_tbl;
+-- Cleanup
+DROP FOREIGN TABLE foreign_tbl;
+DROP TABLE local_tbl;
 -- ===================================================================
 -- test inheritance features
 -- ===================================================================
@@ -13872,7 +13996,7 @@ ALTER SERVER loopback2 OPTIONS (DROP parallel_abort);
 -- ===================================================================
 CREATE TABLE analyze_table (id number(38,0), a varchar2(1024), b bigint);
 CREATE FOREIGN TABLE analyze_ftable (id number(38,0), a varchar2(1024), b bigint)
-       SERVER loopback OPTIONS (table_name 'analyze_rtable1');
+       SERVER loopback OPTIONS (table_name 'analyze_table');
 INSERT INTO analyze_table (SELECT x FROM generate_series(1,1000) x);
 ANALYZE analyze_table;
 SET default_statistics_target = 10;
@@ -13880,15 +14004,15 @@ ANALYZE analyze_table;
 ALTER SERVER loopback OPTIONS (analyze_sampling 'invalid');
 ERROR:  invalid value for string option "analyze_sampling": invalid
 ALTER SERVER loopback OPTIONS (analyze_sampling 'auto');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'system');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'bernoulli');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'random');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'off');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 -- cleanup
 DROP FOREIGN TABLE analyze_ftable;
 DROP TABLE analyze_table;
@@ -13947,4 +14071,81 @@ SELECT server_name,
 -- Clean up
 \set VERBOSITY default
 RESET debug_discard_caches;
+-- ===================================================================
+-- test cleanup of failed connections on abort
+-- ===================================================================
+CREATE VIEW my_backend_pid (pid) AS SELECT pg_backend_pid();
+CREATE FOREIGN TABLE remote_backend_pid (pid int)
+  SERVER loopback OPTIONS (table_name 'my_backend_pid');
+CREATE FUNCTION wait_for_backend_termination(int) RETURNS void AS $$
+  BEGIN
+    WHILE (SELECT count(*) FROM pg_stat_activity WHERE pid = $1) > 0
+    LOOP
+      PERFORM pg_stat_clear_snapshot();
+    END LOOP;
+  END
+$$ LANGUAGE plpgsql;
+/
+SET client_min_messages = 'ERROR';
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+ pg_terminate_backend 
+----------------------
+ t
+(1 row)
+
+SELECT wait_for_backend_termination(:remote_pid);
+ wait_for_backend_termination 
+------------------------------
+ 
+(1 row)
+
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ERROR:  connection to server "loopback" cannot be used due to abort cleanup failure
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+FETCH c;
+ERROR:  no connection to the server
+CONTEXT:  remote SQL command: DECLARE c1 CURSOR FOR
+SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"
+ABORT;
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+FETCH c;
+ c1 | c2 |        c3         |                c4                 |             c5             | c6 |     c7     | c8  
+----+----+-------------------+-----------------------------------+----------------------------+----+------------+-----
+ 1  | 2  | 00001_trig_update | 1970-01-02 00:00:00.000000 -08:00 | 1970-01-02 00:00:00.000000 | 1  | 1          | foo
+(1 row)
+
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+ pg_terminate_backend 
+----------------------
+ t
+(1 row)
+
+SELECT wait_for_backend_termination(:remote_pid);
+ wait_for_backend_termination 
+------------------------------
+ 
+(1 row)
+
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ERROR:  connection to server "loopback" cannot be used due to abort cleanup failure
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+CLOSE c;
+ERROR:  no connection to the server
+CONTEXT:  remote SQL command: CLOSE c1
+ABORT;
+RESET client_min_messages;
+DROP FUNCTION wait_for_backend_termination(int);
+DROP FOREIGN TABLE remote_backend_pid;
+DROP VIEW my_backend_pid;
 RESET ivorysql.enable_emptystring_to_NULL;
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 2185b42bb4f..f975ceff200 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -6489,20 +6489,31 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
- Update on public.ft2
-   Output: c1, c2, c3, c4, c5, c6, c7, c8
-   Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
-   ->  Foreign Scan on public.ft2
-         Output: 'bar'::text, ctid, ft2.*
-         Filter: (postgres_fdw_abs(ft2.c1) > 2000)
-         Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
-(7 rows)
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+                                                    QUERY PLAN                                                    
+------------------------------------------------------------------------------------------------------------------
+ Sort
+   Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+   Sort Key: cte.c1
+   CTE cte
+     ->  Update on public.ft2
+           Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8
+           Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
+           ->  Foreign Scan on public.ft2
+                 Output: 'bar'::text, ft2.ctid, ft2.*
+                 Filter: (postgres_fdw_abs(ft2.c1) > 2000)
+                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
+   ->  CTE Scan on cte
+         Output: cte.c1, cte.c2, cte.c3, cte.c4, cte.c5, cte.c6, cte.c7, cte.c8
+(13 rows)
 
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
   c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 
 ------+----+-----+----+----+----+------------+----
  2001 |  1 | bar |    |    |    | ft2        | 
@@ -8212,6 +8223,119 @@ DELETE FROM rem1;                 -- can't be pushed down
 (5 rows)
 
 DROP TRIGGER trig_row_after_delete ON rem1;
+-- We are allowed to create transition-table triggers on both kinds of
+-- inheritance even if they contain foreign tables as children, but currently
+-- collecting transition tuples from such foreign tables is not supported.
+CREATE TABLE local_tbl (a text, b int);
+CREATE FOREIGN TABLE foreign_tbl (a text, b int)
+  SERVER loopback OPTIONS (table_name 'local_tbl');
+INSERT INTO foreign_tbl VALUES ('AAA', 42);
+-- Test case for partition hierarchy
+CREATE TABLE parent_tbl (a text, b int) PARTITION BY LIST (a);
+ALTER TABLE parent_tbl ATTACH PARTITION foreign_tbl FOR VALUES IN ('AAA');
+CREATE TRIGGER parent_tbl_insert_trig
+  AFTER INSERT ON parent_tbl REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+ERROR:  cannot collect transition tuples from child foreign tables
+COPY parent_tbl (a, b) FROM stdin;
+ERROR:  cannot collect transition tuples from child foreign tables
+CONTEXT:  COPY parent_tbl, line 1: "AAA	42"
+ALTER SERVER loopback OPTIONS (ADD batch_size '10');
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+ERROR:  cannot collect transition tuples from child foreign tables
+COPY parent_tbl (a, b) FROM stdin;
+ERROR:  cannot collect transition tuples from child foreign tables
+CONTEXT:  COPY parent_tbl, line 1: "AAA	42"
+ALTER SERVER loopback OPTIONS (DROP batch_size);
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Update on public.parent_tbl
+   Foreign Update on public.foreign_tbl parent_tbl_1
+     Remote SQL: UPDATE public.local_tbl SET b = $2 WHERE ctid = $1
+   ->  Foreign Scan on public.foreign_tbl parent_tbl_1
+         Output: (parent_tbl_1.b + 1), parent_tbl_1.tableoid, parent_tbl_1.ctid, parent_tbl_1.*
+         Remote SQL: SELECT a, b, ctid FROM public.local_tbl FOR UPDATE
+(6 rows)
+
+UPDATE parent_tbl SET b = b + 1;
+ERROR:  cannot collect transition tuples from child foreign tables
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Delete on public.parent_tbl
+   Foreign Delete on public.foreign_tbl parent_tbl_1
+     Remote SQL: DELETE FROM public.local_tbl WHERE ctid = $1
+   ->  Foreign Scan on public.foreign_tbl parent_tbl_1
+         Output: parent_tbl_1.tableoid, parent_tbl_1.ctid
+         Remote SQL: SELECT ctid FROM public.local_tbl FOR UPDATE
+(6 rows)
+
+DELETE FROM parent_tbl;
+ERROR:  cannot collect transition tuples from child foreign tables
+ALTER TABLE parent_tbl DETACH PARTITION foreign_tbl;
+DROP TABLE parent_tbl;
+-- Test case for non-partition hierarchy
+CREATE TABLE parent_tbl (a text, b int);
+ALTER FOREIGN TABLE foreign_tbl INHERIT parent_tbl;
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Update on public.parent_tbl
+   Update on public.parent_tbl parent_tbl_1
+   Foreign Update on public.foreign_tbl parent_tbl_2
+     Remote SQL: UPDATE public.local_tbl SET b = $2 WHERE ctid = $1
+   ->  Result
+         Output: (parent_tbl.b + 1), parent_tbl.tableoid, parent_tbl.ctid, (NULL::record)
+         ->  Append
+               ->  Seq Scan on public.parent_tbl parent_tbl_1
+                     Output: parent_tbl_1.b, parent_tbl_1.tableoid, parent_tbl_1.ctid, NULL::record
+               ->  Foreign Scan on public.foreign_tbl parent_tbl_2
+                     Output: parent_tbl_2.b, parent_tbl_2.tableoid, parent_tbl_2.ctid, parent_tbl_2.*
+                     Remote SQL: SELECT a, b, ctid FROM public.local_tbl FOR UPDATE
+(12 rows)
+
+UPDATE parent_tbl SET b = b + 1;
+ERROR:  cannot collect transition tuples from child foreign tables
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Delete on public.parent_tbl
+   Delete on public.parent_tbl parent_tbl_1
+   Foreign Delete on public.foreign_tbl parent_tbl_2
+     Remote SQL: DELETE FROM public.local_tbl WHERE ctid = $1
+   ->  Append
+         ->  Seq Scan on public.parent_tbl parent_tbl_1
+               Output: parent_tbl_1.tableoid, parent_tbl_1.ctid
+         ->  Foreign Scan on public.foreign_tbl parent_tbl_2
+               Output: parent_tbl_2.tableoid, parent_tbl_2.ctid
+               Remote SQL: SELECT ctid FROM public.local_tbl FOR UPDATE
+(10 rows)
+
+DELETE FROM parent_tbl;
+ERROR:  cannot collect transition tuples from child foreign tables
+ALTER FOREIGN TABLE foreign_tbl NO INHERIT parent_tbl;
+DROP TABLE parent_tbl;
+-- Cleanup
+DROP FOREIGN TABLE foreign_tbl;
+DROP TABLE local_tbl;
 -- ===================================================================
 -- test inheritance features
 -- ===================================================================
@@ -12515,7 +12639,7 @@ ALTER SERVER loopback2 OPTIONS (DROP parallel_abort);
 -- ===================================================================
 CREATE TABLE analyze_table (id int, a text, b bigint);
 CREATE FOREIGN TABLE analyze_ftable (id int, a text, b bigint)
-       SERVER loopback OPTIONS (table_name 'analyze_rtable1');
+       SERVER loopback OPTIONS (table_name 'analyze_table');
 INSERT INTO analyze_table (SELECT x FROM generate_series(1,1000) x);
 ANALYZE analyze_table;
 SET default_statistics_target = 10;
@@ -12523,15 +12647,15 @@ ANALYZE analyze_table;
 ALTER SERVER loopback OPTIONS (analyze_sampling 'invalid');
 ERROR:  invalid value for string option "analyze_sampling": invalid
 ALTER SERVER loopback OPTIONS (analyze_sampling 'auto');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'system');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'bernoulli');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'random');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'off');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 -- cleanup
 DROP FOREIGN TABLE analyze_ftable;
 DROP TABLE analyze_table;
@@ -12590,3 +12714,79 @@ SELECT server_name,
 -- Clean up
 \set VERBOSITY default
 RESET debug_discard_caches;
+-- ===================================================================
+-- test cleanup of failed connections on abort
+-- ===================================================================
+CREATE VIEW my_backend_pid (pid) AS SELECT pg_backend_pid();
+CREATE FOREIGN TABLE remote_backend_pid (pid int)
+  SERVER loopback OPTIONS (table_name 'my_backend_pid');
+CREATE FUNCTION wait_for_backend_termination(int) RETURNS void AS $$
+  BEGIN
+    WHILE (SELECT count(*) FROM pg_stat_activity WHERE pid = $1) > 0
+    LOOP
+      PERFORM pg_stat_clear_snapshot();
+    END LOOP;
+  END
+$$ LANGUAGE plpgsql;
+SET client_min_messages = 'ERROR';
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+ pg_terminate_backend 
+----------------------
+ t
+(1 row)
+
+SELECT wait_for_backend_termination(:remote_pid);
+ wait_for_backend_termination 
+------------------------------
+ 
+(1 row)
+
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ERROR:  connection to server "loopback" cannot be used due to abort cleanup failure
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+FETCH c;
+ERROR:  no connection to the server
+CONTEXT:  remote SQL command: DECLARE c1 CURSOR FOR
+SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" ORDER BY "C 1" ASC NULLS LAST
+ABORT;
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+FETCH c;
+ c1 | c2 |        c3         |              c4              |            c5            | c6 |     c7     | c8  
+----+----+-------------------+------------------------------+--------------------------+----+------------+-----
+  1 |  2 | 00001_trig_update | Fri Jan 02 00:00:00 1970 PST | Fri Jan 02 00:00:00 1970 | 1  | 1          | foo
+(1 row)
+
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+ pg_terminate_backend 
+----------------------
+ t
+(1 row)
+
+SELECT wait_for_backend_termination(:remote_pid);
+ wait_for_backend_termination 
+------------------------------
+ 
+(1 row)
+
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ERROR:  connection to server "loopback" cannot be used due to abort cleanup failure
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+CLOSE c;
+ERROR:  no connection to the server
+CONTEXT:  remote SQL command: CLOSE c1
+ABORT;
+RESET client_min_messages;
+DROP FUNCTION wait_for_backend_termination(int);
+DROP FOREIGN TABLE remote_backend_pid;
+DROP VIEW my_backend_pid;
diff --git a/contrib/postgres_fdw/meson.build b/contrib/postgres_fdw/meson.build
index 8b29be24dee..c96030ca089 100644
--- a/contrib/postgres_fdw/meson.build
+++ b/contrib/postgres_fdw/meson.build
@@ -41,6 +41,12 @@ tests += {
     ],
     'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
   },
+  'isolation': {
+    'specs': [
+      'eval_plan_qual',
+    ],
+    'regress_args': ['--load-extension=postgres_fdw'],
+  },
   'tap': {
     'tests': [
       't/001_auth_scram.pl',
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index c2f936640bc..6d5795b9fa9 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -531,7 +531,7 @@ process_pgfdw_appname(const char *appname)
 				appendStringInfoString(&buf, application_name);
 				break;
 			case 'c':
-				appendStringInfo(&buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid);
+				appendStringInfo(&buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
 				break;
 			case 'C':
 				appendStringInfoString(&buf, cluster_name);
diff --git a/contrib/postgres_fdw/specs/eval_plan_qual.spec b/contrib/postgres_fdw/specs/eval_plan_qual.spec
new file mode 100644
index 00000000000..9f52270db69
--- /dev/null
+++ b/contrib/postgres_fdw/specs/eval_plan_qual.spec
@@ -0,0 +1,102 @@
+# Tests for the EvalPlanQual mechanism involving foreign tables
+
+setup
+{
+    DO $d$
+        BEGIN
+            EXECUTE $$CREATE SERVER loopback FOREIGN DATA WRAPPER postgres_fdw
+                OPTIONS (dbname '$$||current_database()||$$',
+                         port '$$||current_setting('port')||$$',
+                         use_remote_estimate 'true'
+                )$$;
+        END;
+    $d$;
+    CREATE USER MAPPING FOR PUBLIC SERVER loopback;
+
+    CREATE TABLE l (i int, v text);
+    CREATE TABLE t (i int, v text);
+    CREATE FOREIGN TABLE ft (i int, v text) SERVER loopback OPTIONS (table_name 't');
+
+    INSERT INTO l VALUES (123, 'foo'), (456, 'bar'), (789, 'baz');
+    INSERT INTO t SELECT i, to_char(i, 'FM0000') FROM generate_series(1, 1000) i;
+    CREATE INDEX t_idx ON t (i);
+    ANALYZE l, t;
+
+    CREATE TABLE a (i int);
+    CREATE TABLE b (i int);
+    CREATE TABLE c (i int);
+    CREATE FOREIGN TABLE fb (i int) SERVER loopback OPTIONS (table_name 'b');
+    CREATE FOREIGN TABLE fc (i int) SERVER loopback OPTIONS (table_name 'c');
+
+    INSERT INTO a VALUES (1);
+    INSERT INTO b VALUES (1);
+    INSERT INTO c VALUES (1);
+    ANALYZE a, b, c;
+}
+
+teardown
+{
+    DROP TABLE l;
+    DROP TABLE t;
+    DROP TABLE a;
+    DROP TABLE b;
+    DROP TABLE c;
+    DROP SERVER loopback CASCADE;
+}
+
+session s0
+setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step s0_update_l { UPDATE l SET i = i + 1; }
+step s0_update_a { UPDATE a SET i = i + 1; }
+step s0_commit { COMMIT; }
+
+session s1
+setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
+
+# Test for EPQ with a foreign scan pushing down a qual
+step s1_tuplock_l_0 {
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.i = 123 FOR UPDATE OF l;
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.i = 123 FOR UPDATE OF l;
+}
+
+# Same test, except that the qual is parameterized
+step s1_tuplock_l_1 {
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.v = 'foo' FOR UPDATE OF l;
+    SELECT l.* FROM l, ft WHERE l.i = ft.i AND l.v = 'foo' FOR UPDATE OF l;
+}
+
+# Test for EPQ with a foreign scan pushing down a join
+step s1_tuplock_a_0 {
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT a.i FROM a, fb, fc WHERE a.i = fb.i AND fb.i = fc.i FOR UPDATE OF a;
+    SELECT a.i FROM a, fb, fc WHERE a.i = fb.i AND fb.i = fc.i FOR UPDATE OF a;
+}
+
+# Same test, except that the join is contained in a SubLink sub-select, not
+# in the main query
+step s1_tuplock_a_1 {
+    EXPLAIN (VERBOSE, COSTS OFF)
+    SELECT a.i,
+        (SELECT 1 FROM fb, fc WHERE a.i = fb.i AND fb.i = fc.i)
+    FROM a FOR UPDATE;
+    SELECT a.i,
+        (SELECT 1 FROM fb, fc WHERE a.i = fb.i AND fb.i = fc.i)
+    FROM a FOR UPDATE;
+}
+
+step s1_commit { COMMIT; }
+
+# This test checks the case of rechecking a pushed-down qual.
+permutation s0_update_l s1_tuplock_l_0 s0_commit s1_commit
+
+# This test checks the same case, except that the qual is parameterized.
+permutation s0_update_l s1_tuplock_l_1 s0_commit s1_commit
+
+# This test checks the case of rechecking a pushed-down join.
+permutation s0_update_a s1_tuplock_a_0 s0_commit s1_commit
+
+# This test exercises EvalPlanQual with a SubLink sub-select (which should
+# be unaffected by any EPQ recheck behavior in the outer query).
+permutation s0_update_a s1_tuplock_a_1 s0_commit s1_commit
diff --git a/contrib/postgres_fdw/sql/ivy_postgres_fdw.sql b/contrib/postgres_fdw/sql/ivy_postgres_fdw.sql
index 084bdbc0924..afcd5d9ed56 100644
--- a/contrib/postgres_fdw/sql/ivy_postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/ivy_postgres_fdw.sql
@@ -1677,9 +1677,15 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
 EXPLAIN (verbose, costs off)
 UPDATE ft2 SET c3 = 'baz'
   FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
@@ -2349,6 +2355,84 @@ EXPLAIN (verbose, costs off)
 DELETE FROM rem1;                 -- can't be pushed down
 DROP TRIGGER trig_row_after_delete ON rem1;
 
+
+-- We are allowed to create transition-table triggers on both kinds of
+-- inheritance even if they contain foreign tables as children, but currently
+-- collecting transition tuples from such foreign tables is not supported.
+
+CREATE TABLE local_tbl (a text, b int);
+CREATE FOREIGN TABLE foreign_tbl (a text, b int)
+  SERVER loopback OPTIONS (table_name 'local_tbl');
+
+INSERT INTO foreign_tbl VALUES ('AAA', 42);
+
+-- Test case for partition hierarchy
+CREATE TABLE parent_tbl (a text, b int) PARTITION BY LIST (a);
+ALTER TABLE parent_tbl ATTACH PARTITION foreign_tbl FOR VALUES IN ('AAA');
+
+CREATE TRIGGER parent_tbl_insert_trig
+  AFTER INSERT ON parent_tbl REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+
+COPY parent_tbl (a, b) FROM stdin;
+AAA	42
+\.
+
+ALTER SERVER loopback OPTIONS (ADD batch_size '10');
+
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+
+COPY parent_tbl (a, b) FROM stdin;
+AAA	42
+\.
+
+ALTER SERVER loopback OPTIONS (DROP batch_size);
+
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+UPDATE parent_tbl SET b = b + 1;
+
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+DELETE FROM parent_tbl;
+
+ALTER TABLE parent_tbl DETACH PARTITION foreign_tbl;
+DROP TABLE parent_tbl;
+
+-- Test case for non-partition hierarchy
+CREATE TABLE parent_tbl (a text, b int);
+ALTER FOREIGN TABLE foreign_tbl INHERIT parent_tbl;
+
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+UPDATE parent_tbl SET b = b + 1;
+
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+DELETE FROM parent_tbl;
+
+ALTER FOREIGN TABLE foreign_tbl NO INHERIT parent_tbl;
+DROP TABLE parent_tbl;
+
+-- Cleanup
+DROP FOREIGN TABLE foreign_tbl;
+DROP TABLE local_tbl;
+
 -- ===================================================================
 -- test inheritance features
 -- ===================================================================
@@ -4388,7 +4472,7 @@ ALTER SERVER loopback2 OPTIONS (DROP parallel_abort);
 CREATE TABLE analyze_table (id number(38,0), a varchar2(1024), b bigint);
 
 CREATE FOREIGN TABLE analyze_ftable (id number(38,0), a varchar2(1024), b bigint)
-       SERVER loopback OPTIONS (table_name 'analyze_rtable1');
+       SERVER loopback OPTIONS (table_name 'analyze_table');
 
 INSERT INTO analyze_table (SELECT x FROM generate_series(1,1000) x);
 ANALYZE analyze_table;
@@ -4399,19 +4483,19 @@ ANALYZE analyze_table;
 ALTER SERVER loopback OPTIONS (analyze_sampling 'invalid');
 
 ALTER SERVER loopback OPTIONS (analyze_sampling 'auto');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'system');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'bernoulli');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'random');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'off');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 -- cleanup
 DROP FOREIGN TABLE analyze_ftable;
@@ -4459,5 +4543,56 @@ SELECT server_name,
 \set VERBOSITY default
 RESET debug_discard_caches;
 
+-- ===================================================================
+-- test cleanup of failed connections on abort
+-- ===================================================================
+
+CREATE VIEW my_backend_pid (pid) AS SELECT pg_backend_pid();
+CREATE FOREIGN TABLE remote_backend_pid (pid int)
+  SERVER loopback OPTIONS (table_name 'my_backend_pid');
+CREATE FUNCTION wait_for_backend_termination(int) RETURNS void AS $$
+  BEGIN
+    WHILE (SELECT count(*) FROM pg_stat_activity WHERE pid = $1) > 0
+    LOOP
+      PERFORM pg_stat_clear_snapshot();
+    END LOOP;
+  END
+$$ LANGUAGE plpgsql;
+/
+
+SET client_min_messages = 'ERROR';
+
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+SELECT wait_for_backend_termination(:remote_pid);
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+FETCH c;
+ABORT;
+
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+FETCH c;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+SELECT wait_for_backend_termination(:remote_pid);
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+CLOSE c;
+ABORT;
+
+RESET client_min_messages;
+
+DROP FUNCTION wait_for_backend_termination(int);
+DROP FOREIGN TABLE remote_backend_pid;
+DROP VIEW my_backend_pid;
 RESET ivorysql.enable_emptystring_to_NULL;
 
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index e534b40de3c..04a5a1244e8 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -1608,9 +1608,16 @@ UPDATE ft2 d SET c2 = CASE WHEN random() >= 0 THEN d.c2 ELSE 0 END
 ALTER SERVER loopback OPTIONS (DROP extensions);
 INSERT INTO ft2 (c1,c2,c3)
   SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+
+-- this will do a remote seqscan, causing unstable result order, so sort
 EXPLAIN (verbose, costs off)
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
-UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;          -- can't be pushed down
+WITH cte AS (
+  UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *
+) SELECT * FROM cte ORDER BY c1;
+
 EXPLAIN (verbose, costs off)
 UPDATE ft2 SET c3 = 'baz'
   FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
@@ -2272,6 +2279,84 @@ EXPLAIN (verbose, costs off)
 DELETE FROM rem1;                 -- can't be pushed down
 DROP TRIGGER trig_row_after_delete ON rem1;
 
+
+-- We are allowed to create transition-table triggers on both kinds of
+-- inheritance even if they contain foreign tables as children, but currently
+-- collecting transition tuples from such foreign tables is not supported.
+
+CREATE TABLE local_tbl (a text, b int);
+CREATE FOREIGN TABLE foreign_tbl (a text, b int)
+  SERVER loopback OPTIONS (table_name 'local_tbl');
+
+INSERT INTO foreign_tbl VALUES ('AAA', 42);
+
+-- Test case for partition hierarchy
+CREATE TABLE parent_tbl (a text, b int) PARTITION BY LIST (a);
+ALTER TABLE parent_tbl ATTACH PARTITION foreign_tbl FOR VALUES IN ('AAA');
+
+CREATE TRIGGER parent_tbl_insert_trig
+  AFTER INSERT ON parent_tbl REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+
+COPY parent_tbl (a, b) FROM stdin;
+AAA	42
+\.
+
+ALTER SERVER loopback OPTIONS (ADD batch_size '10');
+
+INSERT INTO parent_tbl VALUES ('AAA', 42);
+
+COPY parent_tbl (a, b) FROM stdin;
+AAA	42
+\.
+
+ALTER SERVER loopback OPTIONS (DROP batch_size);
+
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+UPDATE parent_tbl SET b = b + 1;
+
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+DELETE FROM parent_tbl;
+
+ALTER TABLE parent_tbl DETACH PARTITION foreign_tbl;
+DROP TABLE parent_tbl;
+
+-- Test case for non-partition hierarchy
+CREATE TABLE parent_tbl (a text, b int);
+ALTER FOREIGN TABLE foreign_tbl INHERIT parent_tbl;
+
+CREATE TRIGGER parent_tbl_update_trig
+  AFTER UPDATE ON parent_tbl REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+CREATE TRIGGER parent_tbl_delete_trig
+  AFTER DELETE ON parent_tbl REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func();
+
+EXPLAIN (VERBOSE, COSTS OFF)
+UPDATE parent_tbl SET b = b + 1;
+UPDATE parent_tbl SET b = b + 1;
+
+EXPLAIN (VERBOSE, COSTS OFF)
+DELETE FROM parent_tbl;
+DELETE FROM parent_tbl;
+
+ALTER FOREIGN TABLE foreign_tbl NO INHERIT parent_tbl;
+DROP TABLE parent_tbl;
+
+-- Cleanup
+DROP FOREIGN TABLE foreign_tbl;
+DROP TABLE local_tbl;
+
 -- ===================================================================
 -- test inheritance features
 -- ===================================================================
@@ -4278,7 +4363,7 @@ ALTER SERVER loopback2 OPTIONS (DROP parallel_abort);
 CREATE TABLE analyze_table (id int, a text, b bigint);
 
 CREATE FOREIGN TABLE analyze_ftable (id int, a text, b bigint)
-       SERVER loopback OPTIONS (table_name 'analyze_rtable1');
+       SERVER loopback OPTIONS (table_name 'analyze_table');
 
 INSERT INTO analyze_table (SELECT x FROM generate_series(1,1000) x);
 ANALYZE analyze_table;
@@ -4289,19 +4374,19 @@ ANALYZE analyze_table;
 ALTER SERVER loopback OPTIONS (analyze_sampling 'invalid');
 
 ALTER SERVER loopback OPTIONS (analyze_sampling 'auto');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'system');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'bernoulli');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'random');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 ALTER SERVER loopback OPTIONS (SET analyze_sampling 'off');
-ANALYZE analyze_table;
+ANALYZE analyze_ftable;
 
 -- cleanup
 DROP FOREIGN TABLE analyze_ftable;
@@ -4348,3 +4433,54 @@ SELECT server_name,
 -- Clean up
 \set VERBOSITY default
 RESET debug_discard_caches;
+
+-- ===================================================================
+-- test cleanup of failed connections on abort
+-- ===================================================================
+
+CREATE VIEW my_backend_pid (pid) AS SELECT pg_backend_pid();
+CREATE FOREIGN TABLE remote_backend_pid (pid int)
+  SERVER loopback OPTIONS (table_name 'my_backend_pid');
+CREATE FUNCTION wait_for_backend_termination(int) RETURNS void AS $$
+  BEGIN
+    WHILE (SELECT count(*) FROM pg_stat_activity WHERE pid = $1) > 0
+    LOOP
+      PERFORM pg_stat_clear_snapshot();
+    END LOOP;
+  END
+$$ LANGUAGE plpgsql;
+
+SET client_min_messages = 'ERROR';
+
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+SELECT wait_for_backend_termination(:remote_pid);
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+FETCH c;
+ABORT;
+
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM ft1 ORDER BY c1;
+FETCH c;
+SAVEPOINT s;
+SELECT pid AS remote_pid FROM remote_backend_pid \gset
+SELECT pg_terminate_backend(:remote_pid);
+SELECT wait_for_backend_termination(:remote_pid);
+ROLLBACK TO SAVEPOINT s;
+SELECT pid FROM remote_backend_pid;
+ROLLBACK TO SAVEPOINT s;
+RELEASE SAVEPOINT s;
+CLOSE c;
+ABORT;
+
+RESET client_min_messages;
+
+DROP FUNCTION wait_for_backend_termination(int);
+DROP FOREIGN TABLE remote_backend_pid;
+DROP VIEW my_backend_pid;
diff --git a/contrib/sepgsql/.gitignore b/contrib/sepgsql/.gitignore
index b1778d05bbd..7e240e44c36 100644
--- a/contrib/sepgsql/.gitignore
+++ b/contrib/sepgsql/.gitignore
@@ -3,5 +3,7 @@
 /sepgsql-regtest.if
 /sepgsql-regtest.pp
 /tmp
-# Generated by test suite
+# Generated subdirectories
+/log/
+/results/
 /tmp_check/
diff --git a/contrib/sepgsql/expected/ddl.out b/contrib/sepgsql/expected/ddl.out
index 7e8deae4f93..accb903f5ce 100644
--- a/contrib/sepgsql/expected/ddl.out
+++ b/contrib/sepgsql/expected/ddl.out
@@ -304,6 +304,8 @@ ALTER TABLE regtest_table_4 ALTER COLUMN y TYPE float;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema" permissive=0
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public" permissive=0
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
+LINE 1: ALTER TABLE regtest_table_4 ALTER COLUMN y TYPE float;
+                                                        ^
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table_4.y" permissive=0
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.float8(integer)" permissive=0
@@ -388,7 +390,11 @@ ALTER TABLE regtest_ptable_4 ALTER COLUMN y TYPE float;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema" permissive=0
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public" permissive=0
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
+LINE 1: ALTER TABLE regtest_ptable_4 ALTER COLUMN y TYPE float;
+                                                         ^
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
+LINE 1: ALTER TABLE regtest_ptable_4 ALTER COLUMN y TYPE float;
+                                                         ^
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_ptable_4.y" permissive=0
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="pg_catalog" permissive=0
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index d5e25e07ae9..ab0b2b291f9 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -171,21 +171,24 @@ check_primary_key(PG_FUNCTION_ARGS)
 	if (plan->nplans <= 0)
 	{
 		SPIPlanPtr	pplan;
-		char		sql[8192];
+		StringInfoData sql;
+
+		initStringInfo(&sql);
 
 		/*
 		 * Construct query: SELECT 1 FROM _referenced_relation_ WHERE Pkey1 =
 		 * $1 [AND Pkey2 = $2 [...]]
 		 */
-		snprintf(sql, sizeof(sql), "select 1 from %s where ", relname);
-		for (i = 0; i < nkeys; i++)
+		appendStringInfo(&sql, "select 1 from %s where ", relname);
+		for (i = 1; i <= nkeys; i++)
 		{
-			snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), "%s = $%d %s",
-					 args[i + nkeys + 1], i + 1, (i < nkeys - 1) ? "and " : "");
+			appendStringInfo(&sql, "%s = $%d ", args[i + nkeys], i);
+			if (i < nkeys)
+				appendStringInfoString(&sql, "and ");
 		}
 
 		/* Prepare plan for query */
-		pplan = SPI_prepare(sql, nkeys, argtypes);
+		pplan = SPI_prepare(sql.data, nkeys, argtypes);
 		if (pplan == NULL)
 			/* internal error */
 			elog(ERROR, "check_primary_key: SPI_prepare returned %s", SPI_result_code_string(SPI_result));
@@ -201,6 +204,8 @@ check_primary_key(PG_FUNCTION_ARGS)
 														sizeof(SPIPlanPtr));
 		*(plan->splan) = pplan;
 		plan->nplans = 1;
+
+		pfree(sql.data);
 	}
 
 	/*
@@ -423,7 +428,6 @@ check_foreign_key(PG_FUNCTION_ARGS)
 	if (plan->nplans <= 0)
 	{
 		SPIPlanPtr	pplan;
-		char		sql[8192];
 		char	  **args2 = args;
 
 		plan->splan = (SPIPlanPtr *) MemoryContextAlloc(TopMemoryContext,
@@ -431,6 +435,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
 
 		for (r = 0; r < nrefs; r++)
 		{
+			StringInfoData sql;
+
+			initStringInfo(&sql);
+
 			relname = args2[0];
 
 			/*---------
@@ -444,8 +452,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 			 *---------
 			 */
 			if (action == 'r')
-
-				snprintf(sql, sizeof(sql), "select 1 from %s where ", relname);
+				appendStringInfo(&sql, "select 1 from %s where ", relname);
 
 			/*---------
 			 * For 'C'ascade action we construct DELETE query
@@ -472,42 +479,23 @@ check_foreign_key(PG_FUNCTION_ARGS)
 					char	   *nv;
 					int			k;
 
-					snprintf(sql, sizeof(sql), "update %s set ", relname);
+					appendStringInfo(&sql, "update %s set ", relname);
 					for (k = 1; k <= nkeys; k++)
 					{
-						int			is_char_type = 0;
-						char	   *type;
-
 						fn = SPI_fnumber(tupdesc, args_temp[k - 1]);
 						Assert(fn > 0); /* already checked above */
 						nv = SPI_getvalue(newtuple, tupdesc, fn);
-						type = SPI_gettype(tupdesc, fn);
-
-						if (strcmp(type, "text") == 0 ||
-							strcmp(type, "varchar") == 0 ||
-							strcmp(type, "char") == 0 ||
-							strcmp(type, "bpchar") == 0 ||
-							strcmp(type, "date") == 0 ||
-							strcmp(type, "timestamp") == 0)
-							is_char_type = 1;
-#ifdef	DEBUG_QUERY
-						elog(DEBUG4, "check_foreign_key Debug value %s type %s %d",
-							 nv, type, is_char_type);
-#endif
 
-						/*
-						 * is_char_type =1 i set ' ' for define a new value
-						 */
-						snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql),
-								 " %s = %s%s%s %s ",
-								 args2[k], (is_char_type > 0) ? "'" : "",
-								 nv, (is_char_type > 0) ? "'" : "", (k < nkeys) ? ", " : "");
+						appendStringInfo(&sql, " %s = %s ",
+										 args2[k], quote_literal_cstr(nv));
+						if (k < nkeys)
+							appendStringInfoString(&sql, ", ");
 					}
-					strcat(sql, " where ");
+					appendStringInfoString(&sql, " where ");
 				}
 				else
 					/* DELETE */
-					snprintf(sql, sizeof(sql), "delete from %s where ", relname);
+					appendStringInfo(&sql, "delete from %s where ", relname);
 			}
 
 			/*
@@ -518,25 +506,26 @@ check_foreign_key(PG_FUNCTION_ARGS)
 			 */
 			else if (action == 's')
 			{
-				snprintf(sql, sizeof(sql), "update %s set ", relname);
+				appendStringInfo(&sql, "update %s set ", relname);
 				for (i = 1; i <= nkeys; i++)
 				{
-					snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql),
-							 "%s = null%s",
-							 args2[i], (i < nkeys) ? ", " : "");
+					appendStringInfo(&sql, "%s = null", args2[i]);
+					if (i < nkeys)
+						appendStringInfoString(&sql, ", ");
 				}
-				strcat(sql, " where ");
+				appendStringInfoString(&sql, " where ");
 			}
 
 			/* Construct WHERE qual */
 			for (i = 1; i <= nkeys; i++)
 			{
-				snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), "%s = $%d %s",
-						 args2[i], i, (i < nkeys) ? "and " : "");
+				appendStringInfo(&sql, "%s = $%d ", args2[i], i);
+				if (i < nkeys)
+					appendStringInfoString(&sql, "and ");
 			}
 
 			/* Prepare plan for query */
-			pplan = SPI_prepare(sql, nkeys, argtypes);
+			pplan = SPI_prepare(sql.data, nkeys, argtypes);
 			if (pplan == NULL)
 				/* internal error */
 				elog(ERROR, "check_foreign_key: SPI_prepare returned %s", SPI_result_code_string(SPI_result));
@@ -552,11 +541,14 @@ check_foreign_key(PG_FUNCTION_ARGS)
 			plan->splan[r] = pplan;
 
 			args2 += nkeys + 1; /* to the next relation */
+
+#ifdef DEBUG_QUERY
+			elog(DEBUG4, "check_foreign_key Debug Query is :  %s ", sql.data);
+#endif
+
+			pfree(sql.data);
 		}
 		plan->nplans = nrefs;
-#ifdef	DEBUG_QUERY
-		elog(DEBUG4, "check_foreign_key Debug Query is :  %s ", sql);
-#endif
 	}
 
 	/*
diff --git a/contrib/tablefunc/expected/ivy_tablefunc.out b/contrib/tablefunc/expected/ivy_tablefunc.out
index 6241131054b..df5b77d51de 100644
--- a/contrib/tablefunc/expected/ivy_tablefunc.out
+++ b/contrib/tablefunc/expected/ivy_tablefunc.out
@@ -14,6 +14,7 @@ SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
 ERROR:  number of rows cannot be negative
 --
 -- crosstab()
+-- Use 'orarowid' instead of 'rowid' to avoid conflict with system column
 --
 CREATE TABLE ct(id int, rowclass text, orarowid text, attribute text, val text);
 \copy ct from 'data/ct.data'
diff --git a/contrib/tablefunc/sql/ivy_tablefunc.sql b/contrib/tablefunc/sql/ivy_tablefunc.sql
index 26ae0840298..1a862629cf6 100644
--- a/contrib/tablefunc/sql/ivy_tablefunc.sql
+++ b/contrib/tablefunc/sql/ivy_tablefunc.sql
@@ -10,6 +10,7 @@ SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
 
 --
 -- crosstab()
+-- Use 'orarowid' instead of 'rowid' to avoid conflict with system column
 --
 CREATE TABLE ct(id int, rowclass text, orarowid text, attribute text, val text);
 \copy ct from 'data/ct.data'
diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
index 336ba31047a..84d5e68a860 100644
--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@@ -156,7 +156,7 @@ initTrie(const char *filename)
 				state = 0;
 				for (ptr = line; *ptr; ptr += ptrlen)
 				{
-					ptrlen = pg_mblen(ptr);
+					ptrlen = pg_mblen_cstr(ptr);
 					/* ignore whitespace, but end src or trg */
 					if (isspace((unsigned char) *ptr))
 					{
@@ -382,6 +382,7 @@ unaccent_lexize(PG_FUNCTION_ARGS)
 	char	   *srcchar = (char *) PG_GETARG_POINTER(1);
 	int32		len = PG_GETARG_INT32(2);
 	char	   *srcstart = srcchar;
+	const char *srcend = srcstart + len;
 	TSLexeme   *res;
 	StringInfoData buf;
 
@@ -409,7 +410,7 @@ unaccent_lexize(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			matchlen = pg_mblen(srcchar);
+			matchlen = pg_mblen_range(srcchar, srcend);
 			if (buf.data != NULL)
 				appendBinaryStringInfo(&buf, srcchar, matchlen);
 		}
diff --git a/contrib/uuid-ossp/sql/ivy_uuid_ossp.sql b/contrib/uuid-ossp/sql/ivy_uuid_ossp.sql
index bf32c2b63e6..ddc385640a3 100644
--- a/contrib/uuid-ossp/sql/ivy_uuid_ossp.sql
+++ b/contrib/uuid-ossp/sql/ivy_uuid_ossp.sql
@@ -81,4 +81,4 @@ SELECT uuid_version_bits(uuid_generate_v4()),
 
 SELECT uuid_generate_v4() <> uuid_generate_v4();
 
-SELECT sys_guid() <> sys_guid();
\ No newline at end of file
+SELECT sys_guid() <> sys_guid();
diff --git a/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql b/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql
index 000557e0acc..fa005bd99f5 100644
--- a/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql
+++ b/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql
@@ -17,4 +17,4 @@ ALTER FUNCTION uuid_generate_v5(uuid, text) PARALLEL SAFE;
 CREATE OR REPLACE FUNCTION pg_catalog.sys_guid()
     RETURNS bytea
 AS 'MODULE_PATHNAME', 'ora_sys_guid'
-VOLATILE STRICT LANGUAGE C;
\ No newline at end of file
+VOLATILE STRICT LANGUAGE C;
diff --git a/contrib/uuid-ossp/uuid-ossp--1.1.sql b/contrib/uuid-ossp/uuid-ossp--1.1.sql
index f033283cbcb..d5d06efb166 100644
--- a/contrib/uuid-ossp/uuid-ossp--1.1.sql
+++ b/contrib/uuid-ossp/uuid-ossp--1.1.sql
@@ -56,4 +56,4 @@ IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 CREATE OR REPLACE FUNCTION pg_catalog.sys_guid()
     RETURNS bytea
 AS 'MODULE_PATHNAME', 'ora_sys_guid'
-VOLATILE STRICT LANGUAGE C;
\ No newline at end of file
+VOLATILE STRICT LANGUAGE C;
diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
index 596614d814e..8f71f235deb 100644
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -562,12 +562,20 @@ Datum
 ora_sys_guid(PG_FUNCTION_ARGS)
 {
     bytea *result;
+#ifdef HAVE_UUID_OSSP
+    uuid_t      *uuid;
+    uuid_rc_t   rc;
+#elif defined(HAVE_UUID_E2FS)
+	uuid_t uu;
+#else	/* BSD */
+	int i;
+	unsigned char byte_array[SYS_GUID_LENGTH];
+#endif
+
     result = (bytea *)palloc(VARHDRSZ + SYS_GUID_LENGTH);
     SET_VARSIZE(result, VARHDRSZ + SYS_GUID_LENGTH);
 
 #ifdef HAVE_UUID_OSSP
-    uuid_t      *uuid;
-    uuid_rc_t   rc;
     uuid = get_cached_uuid_t(0);
     rc = uuid_make(uuid, UUID_MAKE_V4, NULL, NULL);
     if (rc != UUID_RC_OK) {
@@ -576,17 +584,14 @@ ora_sys_guid(PG_FUNCTION_ARGS)
     memcpy(VARDATA(result), (unsigned char *)uuid, SYS_GUID_LENGTH);
 
 #elif defined(HAVE_UUID_E2FS)
-    uuid_t uu;
     uuid_generate_random(uu);
     memcpy(VARDATA(result), uu, SYS_GUID_LENGTH);
 
 #else	/* BSD */
-	int i;
-    unsigned char byte_array[SYS_GUID_LENGTH];
     for (i = 0; i < SYS_GUID_LENGTH; i++) {
         byte_array[i] = (unsigned char)arc4random();
     }
     memcpy(VARDATA(result), byte_array, SYS_GUID_LENGTH);
 #endif
     PG_RETURN_BYTEA_P(result);
-}
\ No newline at end of file
+}
diff --git a/contrib/xml2/expected/ivy_xml2.out b/contrib/xml2/expected/ivy_xml2.out
index d8a1d2804fc..e343537fe8b 100644
--- a/contrib/xml2/expected/ivy_xml2.out
+++ b/contrib/xml2/expected/ivy_xml2.out
@@ -262,4 +262,14 @@ $$<xsl:stylesheet version="1.0"
   </xsl:template>
 </xsl:stylesheet>$$);
 ERROR:  failed to apply stylesheet
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
+ xslt_process 
+--------------
+ 
+(1 row)
+
 reset ivorysql.enable_emptystring_to_null;
diff --git a/contrib/xml2/expected/ivy_xml2_1.out b/contrib/xml2/expected/ivy_xml2_1.out
index 40ce13c6e7a..2e21decc2ba 100644
--- a/contrib/xml2/expected/ivy_xml2_1.out
+++ b/contrib/xml2/expected/ivy_xml2_1.out
@@ -167,4 +167,10 @@ $$<xsl:stylesheet version="1.0"
   </xsl:template>
 </xsl:stylesheet>$$);
 ERROR:  xslt_process() is not available without libxslt
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
+ERROR:  xslt_process() is not available without libxslt
 reset ivorysql.enable_emptystring_to_null;
diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out
index 3d97b14c3a1..1906fcf33e2 100644
--- a/contrib/xml2/expected/xml2.out
+++ b/contrib/xml2/expected/xml2.out
@@ -261,3 +261,13 @@ $$<xsl:stylesheet version="1.0"
   </xsl:template>
 </xsl:stylesheet>$$);
 ERROR:  failed to apply stylesheet
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
+ xslt_process 
+--------------
+ 
+(1 row)
+
diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out
index 31e6d33c2df..6e53263a1a4 100644
--- a/contrib/xml2/expected/xml2_1.out
+++ b/contrib/xml2/expected/xml2_1.out
@@ -206,4 +206,10 @@ $$<xsl:stylesheet version="1.0"
   </xsl:template>
 </xsl:stylesheet>$$);
 ERROR:  xslt_process() is not available without libxslt
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
+ERROR:  xslt_process() is not available without libxslt
 reset ivorysql.enable_emptystring_to_null;
diff --git a/contrib/xml2/sql/ivy_xml2.sql b/contrib/xml2/sql/ivy_xml2.sql
index fa1885f7a67..75af3ece5a6 100644
--- a/contrib/xml2/sql/ivy_xml2.sql
+++ b/contrib/xml2/sql/ivy_xml2.sql
@@ -153,4 +153,10 @@ $$<xsl:stylesheet version="1.0"
     </sax:output>
   </xsl:template>
 </xsl:stylesheet>$$);
+
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
 reset ivorysql.enable_emptystring_to_null;
diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql
index ef99d164f27..510d18a3679 100644
--- a/contrib/xml2/sql/xml2.sql
+++ b/contrib/xml2/sql/xml2.sql
@@ -153,3 +153,9 @@ $$<xsl:stylesheet version="1.0"
     </sax:output>
   </xsl:template>
 </xsl:stylesheet>$$);
+
+-- empty output
+select xslt_process('<aaa/>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:stylesheet>$$);
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 23d3f332dba..2820874cb5e 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -176,7 +176,7 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 		xmlBufferWriteCHAR(buf, toptagname);
 		xmlBufferWriteChar(buf, ">");
 	}
-	result = xmlStrdup(buf->content);
+	result = xmlStrdup(xmlBufferContent(buf));
 	xmlBufferFree(buf);
 	return result;
 }
diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index b720d89f754..8ff7c7f1bbf 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -176,7 +176,14 @@ xslt_process(PG_FUNCTION_ARGS)
 	if (resstat < 0)
 		PG_RETURN_NULL();
 
-	result = cstring_to_text_with_len((char *) resstr, reslen);
+	/*
+	 * If an empty string has been returned, resstr would be NULL. In
+	 * this case, assume that the result is an empty string.
+	 */
+	if (reslen == 0)
+		result = cstring_to_text("");
+	else
+		result = cstring_to_text_with_len((char *) resstr, reslen);
 
 	if (resstr)
 		xmlFree(resstr);
diff --git a/doc/src/sgml/amcheck.sgml b/doc/src/sgml/amcheck.sgml
index 211a0ae1945..0402172a5ff 100644
--- a/doc/src/sgml/amcheck.sgml
+++ b/doc/src/sgml/amcheck.sgml
@@ -382,7 +382,7 @@ SET client_min_messages = DEBUG1;
   verification functions is <literal>true</literal>, an additional
   phase of verification is performed against the table associated with
   the target index relation.  This consists of a <quote>dummy</quote>
-  <command>CREATE INDEX</command> operation, which checks for the
+  <command>CREATE INDEX CONCURRENTLY</command> operation, which checks for the
   presence of all hypothetical new index tuples against a temporary,
   in-memory summarizing structure (this is built when needed during
   the basic first phase of verification).  The summarizing structure
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 832b616a7bb..105f1a975dc 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -889,16 +889,16 @@ host    all             all             192.168.0.0/16          ident map=omicro
 # list of names of administrators.  Passwords are required in all cases.
 #
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
-local   sameuser        all                                     md5
-local   all             /^.*helpdesk$                           md5
-local   all             @admins                                 md5
-local   all             +support                                md5
+local   sameuser        all                                     scram-sha-256
+local   all             /^.*helpdesk$                           scram-sha-256
+local   all             @admins                                 scram-sha-256
+local   all             +support                                scram-sha-256
 
 # The last two lines above can be combined into a single line:
-local   all             @admins,+support                        md5
+local   all             @admins,+support                        scram-sha-256
 
 # The database column can also use lists and file names:
-local   db1,db2,@demodbs  all                                   md5
+local   db1,db2,@demodbs  all                                   scram-sha-256
 </programlisting>
    </example>
  </sect1>
@@ -1003,8 +1003,9 @@ local   db1,db2,@demodbs  all                                   md5
    the remainder of the field is treated as a regular expression.
    (See <xref linkend="posix-syntax-details"/> for details of
    <productname>PostgreSQL</productname>'s regular expression syntax.)  The regular
-   expression can include a single capture, or parenthesized subexpression,
-   which can then be referenced in the <replaceable>database-username</replaceable>
+   expression can include a single capture, or parenthesized subexpression.
+   The portion of the system user name that matched the capture can then
+   be referenced in the <replaceable>database-username</replaceable>
    field as <literal>\1</literal> (backslash-one).  This allows the mapping of
    multiple user names in a single line, which is particularly useful for
    simple syntax substitutions.  For example, these entries
@@ -1022,12 +1023,11 @@ mymap   /^(.*)@otherdomain\.com$   guest
   <para>
    If the <replaceable>database-username</replaceable> field starts with
    a slash (<literal>/</literal>), the remainder of the field is treated
-   as a regular expression (see <xref linkend="posix-syntax-details"/>
-   for details of <productname>PostgreSQL</productname>'s regular
-   expression syntax). It is not possible to use <literal>\1</literal>
-   to use a capture from regular expression on
-   <replaceable>system-username</replaceable> for a regular expression
-   on <replaceable>database-username</replaceable>.
+   as a regular expression.
+   When the <replaceable>database-username</replaceable> field is a regular
+   expression, it is not possible to use <literal>\1</literal> within it to
+   refer to a capture from the <replaceable>system-username</replaceable>
+   field.
   </para>
 
   <tip>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 4f1ad5f15ab..2f3d95b832b 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1680,7 +1680,7 @@ include_dir 'conf.d'
         This parameter determines whether the passphrase command set by
         <varname>ssl_passphrase_command</varname> will also be called during a
         configuration reload if a key file needs a passphrase.  If this
-        parameter is off (the default), then
+        parameter is <literal>off</literal> (the default), then
         <varname>ssl_passphrase_command</varname> will be ignored during a
         reload and the SSL configuration will not be reloaded if a passphrase
         is needed.  That setting is appropriate for a command that requires a
@@ -1688,6 +1688,12 @@ include_dir 'conf.d'
         running.  Setting this parameter to on might be appropriate if the
         passphrase is obtained from a file, for example.
        </para>
+       <para>
+        This parameter must be set to <literal>on</literal> when running on
+        <systemitem class="osname">Windows</systemitem> since all connections
+        will perform a configuration reload due to the different process model
+        of that platform.
+       </para>
        <para>
         This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
@@ -1760,7 +1766,8 @@ include_dir 'conf.d'
        <para>
         Controls whether huge pages are requested for the main shared memory
         area. Valid values are <literal>try</literal> (the default),
-        <literal>on</literal>, and <literal>off</literal>.  With
+        <literal>on</literal>, and <literal>off</literal>.
+        This parameter can only be set at server start. With
         <varname>huge_pages</varname> set to <literal>try</literal>, the
         server will try to request huge pages, but fall back to the default if
         that fails. With <literal>on</literal>, failure to request huge pages
@@ -2273,6 +2280,7 @@ include_dir 'conf.d'
         platform, is generally discouraged because it typically requires
         non-default kernel settings to allow for large allocations (see <xref
         linkend="sysvipc"/>).
+        This parameter can only be set at server start.
        </para>
       </listitem>
      </varlistentry>
@@ -2300,6 +2308,7 @@ include_dir 'conf.d'
         however, it may be useful for debugging, when the
         <literal>pg_dynshmem</literal> directory is stored on a RAM disk, or when
         other shared memory facilities are not available.
+        This parameter can only be set at server start.
        </para>
       </listitem>
      </varlistentry>
@@ -2401,6 +2410,43 @@ include_dir 'conf.d'
       </listitem>
      </varlistentry>
 
+     <varlistentry id="guc-file-extend-method" xreflabel="file_extend_method">
+      <term><varname>file_extend_method</varname> (<type>enum</type>)
+      <indexterm>
+       <primary><varname>file_extend_method</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Specifies the method used to extend data files during bulk operations
+        such as <command>COPY</command>.  The first available option is used as
+        the default, depending on the operating system:
+        <itemizedlist>
+         <listitem>
+          <para>
+           <literal>posix_fallocate</literal> (Unix) uses the standard POSIX
+            interface for allocating disk space, but is missing on some systems.
+            If it is present but the underlying file system doesn't support it,
+            this option silently falls back to <literal>write_zeros</literal>.
+            Current versions of BTRFS are known to disable compression when
+            this option is used.
+            This is the default on systems that have the function.
+           </para>
+         </listitem>
+         <listitem>
+          <para>
+           <literal>write_zeros</literal> extends files by writing out blocks
+            of zero bytes.  This is the default on systems that don't have the
+            function <function>posix_fallocate</function>.
+          </para>
+         </listitem>
+        </itemizedlist>
+        The <literal>write_zeros</literal> method is always used when data
+        files are extended by 8 blocks or fewer.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry id="guc-max-notify-queue-pages" xreflabel="max_notify_queue_pages">
       <term><varname>max_notify_queue_pages</varname> (<type>integer</type>)
       <indexterm>
@@ -2413,6 +2459,7 @@ include_dir 'conf.d'
         <xref linkend="sql-notify"/> / <xref linkend="sql-listen"/> queue.
         The default value is 1048576. For 8 KB pages it allows to consume
         up to 8 GB of disk space.
+        This parameter can only be set at server start.
        </para>
       </listitem>
      </varlistentry>
@@ -2647,7 +2694,7 @@ include_dir 'conf.d'
          Higher values will have the most impact on higher latency storage
          where queries otherwise experience noticeable I/O stalls and on
          devices with high IOPs. Unnecessarily high values may increase I/O
-         latency for all queries on the system
+         latency for all queries on the system.
         </para>
 
         <para>
@@ -2694,9 +2741,9 @@ include_dir 'conf.d'
         <para>
          Controls the largest I/O size in operations that combine I/O, and silently
          limits the user-settable parameter <varname>io_combine_limit</varname>.
-         This parameter can only be set in
-         the <filename>postgresql.conf</filename> file or on the server
-         command line.
+         This parameter can only be set at server start.
+         If this value is specified without units, it is taken as blocks,
+         that is <symbol>BLCKSZ</symbol> bytes, typically 8kB.
          The maximum possible size depends on the operating system and block
          size, but is typically 1MB on Unix and 128kB on Windows.
          The default is 128kB.
@@ -2716,6 +2763,8 @@ include_dir 'conf.d'
          higher than the <varname>io_max_combine_limit</varname> parameter, the
          lower value will silently be used instead, so both may need to be raised
          to increase the I/O size.
+         If this value is specified without units, it is taken as blocks,
+         that is <symbol>BLCKSZ</symbol> bytes, typically 8kB.
          The maximum possible size depends on the operating system and block
          size, but is typically 1MB on Unix and 128kB on Windows.
          The default is 128kB.
@@ -3399,8 +3448,9 @@ include_dir 'conf.d'
         This parameter enables compression of WAL using the specified
         compression method.
         When enabled, the <productname>PostgreSQL</productname>
-        server compresses full page images written to WAL when
-        <xref linkend="guc-full-page-writes"/> is on or during a base backup.
+        server compresses full page images written to WAL (e.g. when
+        <xref linkend="guc-full-page-writes"/> is on, during a base backup,
+        etc.).
         A compressed page image will be decompressed during WAL replay.
         The supported methods are <literal>pglz</literal>,
         <literal>lz4</literal> (if <productname>PostgreSQL</productname>
@@ -3962,6 +4012,7 @@ include_dir 'conf.d'
         blocks to prefetch.  If this value is specified without units, it is
         taken as bytes.
         The default is 512kB.
+        This parameter can only be set at server start.
        </para>
       </listitem>
      </varlistentry>
@@ -4618,10 +4669,12 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
       </term>
       <listitem>
        <para>
-        Invalidate replication slots that have remained idle longer than this
-        duration. If this value is specified without units, it is taken as
-        minutes. A value of zero (the default) disables the idle timeout
-        invalidation mechanism. This parameter can only be set in the
+        Invalidate replication slots that have remained inactive (not used by
+        a <link linkend="protocol-replication">replication connection</link>)
+        for longer than this duration.
+        If this value is specified without units, it is taken as seconds.
+        A value of zero (the default) disables the idle timeout
+        invalidation mechanism.  This parameter can only be set in the
         <filename>postgresql.conf</filename> file or on the server command
         line.
        </para>
@@ -4685,48 +4738,9 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
       </term>
       <listitem>
        <para>
-        Record commit time of transactions. This parameter
-        can only be set in <filename>postgresql.conf</filename> file or on the server
-        command line. The default value is <literal>off</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry id="guc-synchronized-standby-slots" xreflabel="synchronized_standby_slots">
-      <term><varname>synchronized_standby_slots</varname> (<type>string</type>)
-      <indexterm>
-       <primary><varname>synchronized_standby_slots</varname> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        A comma-separated list of streaming replication standby server slot names
-        that logical WAL sender processes will wait for. Logical WAL sender processes
-        will send decoded changes to plugins only after the specified replication
-        slots confirm receiving WAL. This guarantees that logical replication
-        failover slots do not consume changes until those changes are received
-        and flushed to corresponding physical standbys. If a
-        logical replication connection is meant to switch to a physical standby
-        after the standby is promoted, the physical replication slot for the
-        standby should be listed here. Note that logical replication will not
-        proceed if the slots specified in the
-        <varname>synchronized_standby_slots</varname> do not exist or are invalidated.
-        Additionally, the replication management functions
-        <link linkend="pg-replication-slot-advance">
-        <function>pg_replication_slot_advance</function></link>,
-        <link linkend="pg-logical-slot-get-changes">
-        <function>pg_logical_slot_get_changes</function></link>, and
-        <link linkend="pg-logical-slot-peek-changes">
-        <function>pg_logical_slot_peek_changes</function></link>,
-        when used with logical failover slots, will block until all
-        physical slots specified in <varname>synchronized_standby_slots</varname> have
-        confirmed WAL receipt.
-       </para>
-       <para>
-        The standbys corresponding to the physical replication slots in
-        <varname>synchronized_standby_slots</varname> must configure
-        <literal>sync_replication_slots = true</literal> so they can receive
-        logical failover slot changes from the primary.
+        Record commit time of transactions.
+        This parameter can only be set at server start.
+        The default value is <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -4879,6 +4893,45 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         file or on the server command line.
        </para>
       </listitem>
+
+     </varlistentry>
+     <varlistentry id="guc-synchronized-standby-slots" xreflabel="synchronized_standby_slots">
+      <term><varname>synchronized_standby_slots</varname> (<type>string</type>)
+      <indexterm>
+       <primary><varname>synchronized_standby_slots</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        A comma-separated list of streaming replication standby server slot names
+        that logical WAL sender processes will wait for. Logical WAL sender processes
+        will send decoded changes to plugins only after the specified replication
+        slots confirm receiving WAL. This guarantees that logical replication
+        failover slots do not consume changes until those changes are received
+        and flushed to corresponding physical standbys. If a
+        logical replication connection is meant to switch to a physical standby
+        after the standby is promoted, the physical replication slot for the
+        standby should be listed here. Note that logical replication will not
+        proceed if the slots specified in the
+        <varname>synchronized_standby_slots</varname> do not exist or are invalidated.
+        Additionally, the replication management functions
+        <link linkend="pg-replication-slot-advance">
+        <function>pg_replication_slot_advance</function></link>,
+        <link linkend="pg-logical-slot-get-changes">
+        <function>pg_logical_slot_get_changes</function></link>, and
+        <link linkend="pg-logical-slot-peek-changes">
+        <function>pg_logical_slot_peek_changes</function></link>,
+        when used with logical failover slots, will block until all
+        physical slots specified in <varname>synchronized_standby_slots</varname> have
+        confirmed WAL receipt.
+       </para>
+       <para>
+        The standbys corresponding to the physical replication slots in
+        <varname>synchronized_standby_slots</varname> must configure
+        <literal>sync_replication_slots = true</literal> so they can receive
+        logical failover slot changes from the primary.
+       </para>
+      </listitem>
      </varlistentry>
 
      </variablelist>
@@ -5904,24 +5957,24 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        </para>
 
        <para>
-        Random access to mechanical disk storage is normally much more expensive
-        than four times sequential access.  However, a lower default is used
-        (4.0) because the majority of random accesses to disk, such as indexed
-        reads, are assumed to be in cache.  The default value can be thought of
-        as modeling random access as 40 times slower than sequential, while
-        expecting 90% of random reads to be cached.
+        Random access to durable storage is normally much more expensive
+        than four times sequential access.  However, a lower default is
+        used (4.0) because the majority of random accesses to storage,
+        such as indexed reads, are assumed to be in cache.  Also, the
+        latency of network-attached storage tends to reduce the relative
+        overhead of random access.
        </para>
 
        <para>
-        If you believe a 90% cache rate is an incorrect assumption
-        for your workload, you can increase random_page_cost to better
-        reflect the true cost of random storage reads. Correspondingly,
-        if your data is likely to be completely in cache, such as when
-        the database is smaller than the total server memory, decreasing
-        random_page_cost can be appropriate.  Storage that has a low random
-        read cost relative to sequential, e.g., solid-state drives, might
-        also be better modeled with a lower value for random_page_cost,
-        e.g., <literal>1.1</literal>.
+        If you believe caching is less frequent than the default
+        value reflects, and network latency is minimal, you can increase
+        random_page_cost to better reflect the true cost of random storage
+        reads.  Storage that has a higher random read cost relative to
+        sequential, like magnetic disks, might also be better modeled with
+        a higher value for random_page_cost.  Correspondingly, if your data
+        is likely to be completely in cache, such as when the database
+        is smaller than the total server memory, or network latency is
+        high, decreasing random_page_cost might be appropriate.
        </para>
 
        <tip>
@@ -7003,8 +7056,7 @@ local0.*    /var/log/postgresql
         determines the program name used to identify
         <productname>PostgreSQL</productname> messages in
         the log. The default is <literal>PostgreSQL</literal>.
-        This parameter can only be set in the <filename>postgresql.conf</filename>
-        file or on the server command line.
+        This parameter can only be set at server start.
        </para>
       </listitem>
      </varlistentry>
@@ -11054,6 +11106,12 @@ extension_control_path = 'C:\tools\postgresql;H:\my_project\share;$system'
         string, the default <literal>'$system'</literal> is also assumed.
        </para>
 
+       <para>
+        If extensions with equal names are present in multiple directories in
+        the configured path, only the instance found first in the path will be
+        used.
+       </para>
+
        <para>
         This parameter can be changed at run time by superusers and users
         with the appropriate <literal>SET</literal> privilege, but a
@@ -12194,6 +12252,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:$libdir'
         main data files, <literal>wal</literal> for WAL files, and
         <literal>wal_init</literal> for WAL files when being initially
         allocated.
+        This parameter can only be set at server start.
        </para>
        <para>
         Some operating systems and file systems do not support direct I/O, so
@@ -12681,7 +12740,9 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
         If LLVM has the required functionality, register generated functions
         with <productname>GDB</productname>.  This makes debugging easier.
         The default setting is <literal>off</literal>.
-        This parameter can only be set at server start.
+        Only superusers and users with the appropriate <literal>SET</literal>
+        privilege can change this parameter at session start,
+        and it cannot be changed at all within a session.
        </para>
       </listitem>
      </varlistentry>
@@ -12732,7 +12793,9 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
         This writes out files to <filename>~/.debug/jit/</filename>; the
         user is responsible for performing cleanup when desired.
         The default setting is <literal>off</literal>.
-        This parameter can only be set at server start.
+        Only superusers and users with the appropriate <literal>SET</literal>
+        privilege can change this parameter at session start,
+        and it cannot be changed at all within a session.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 09309ba0390..83392220736 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -117,7 +117,7 @@
 
       <row>
        <entry><type>double precision</type></entry>
-       <entry><type>float8</type></entry>
+       <entry><type>float</type>, <type>float8</type></entry>
        <entry>double precision floating-point number (8 bytes)</entry>
       </row>
 
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 65bc070d2e5..8813a09561b 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1558,7 +1558,7 @@ CREATE TABLE circles (
       locate the row version very quickly, a row's
       <structfield>ctid</structfield> will change if it is
       updated or moved by <command>VACUUM FULL</command>.  Therefore
-      <structfield>ctid</structfield> is useless as a long-term row
+      <structfield>ctid</structfield> should not be used as a row
       identifier.  A primary key should be used to identify logical rows.
      </para>
     </listitem>
@@ -1959,6 +1959,8 @@ ALTER TABLE <replaceable>table_name</replaceable> OWNER TO <replaceable>new_owne
    Superusers can always do this; ordinary roles can only do it if they are
    both the current owner of the object (or inherit the privileges of the
    owning role) and able to <literal>SET ROLE</literal> to the new owning role.
+   All object privileges of the old owner are transferred to the new owner
+   along with the ownership.
   </para>
 
   <para>
@@ -5083,13 +5085,9 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
        It is possible to determine the number of partitions which were
        removed during this phase by observing the
        <quote>Subplans Removed</quote> property in the
-       <command>EXPLAIN</command> output.  The query planner obtains locks for
-       all partitions which are part of the plan.  However, when the executor
-       uses a cached plan, locks are only obtained on the partitions which
-       remain after partition pruning done during the initialization phase of
-       execution, i.e., the ones shown in the <command>EXPLAIN</command>
-       output and not the ones referred to by the
-       <quote>Subplans Removed</quote> property.
+       <command>EXPLAIN</command> output.  It's important to note that any
+       partitions removed by the partition pruning done at this stage are
+       still locked at the beginning of execution.
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index e7a53f3c9d0..d6f1161374c 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1823,7 +1823,7 @@ while (1)
      representation of that type is <literal>(%f,%f)</literal>,
      which is defined in the
      functions <function>complex_in()</function>
-     and <function>complex_out()</function> functions
+     and <function>complex_out()</function>
      in <xref linkend="xtypes"/>.  The following example inserts the
      complex type values <literal>(1,1)</literal>
      and <literal>(3,3)</literal> into the
diff --git a/doc/src/sgml/file-fdw.sgml b/doc/src/sgml/file-fdw.sgml
index 882d9a76d21..e3fe796b897 100644
--- a/doc/src/sgml/file-fdw.sgml
+++ b/doc/src/sgml/file-fdw.sgml
@@ -115,6 +115,17 @@
    </listitem>
   </varlistentry>
 
+  <varlistentry>
+   <term><literal>default</literal></term>
+
+   <listitem>
+    <para>
+     Specifies the string that represents a default value,
+     the same as <command>COPY</command>'s <literal>DEFAULT</literal> option.
+    </para>
+   </listitem>
+  </varlistentry>
+
   <varlistentry>
    <term><literal>encoding</literal></term>
 
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 224d4fe5a9f..1128763d04d 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -11247,10 +11247,10 @@ now()
     statement (more specifically, the time of receipt of the latest command
     message from the client).
     <function>statement_timestamp()</function> and <function>transaction_timestamp()</function>
-    return the same value during the first command of a transaction, but might
-    differ during subsequent commands.
+    return the same value during the first statement of a transaction, but might
+    differ during subsequent statements.
     <function>clock_timestamp()</function> returns the actual current time, and
-    therefore its value changes even within a single SQL command.
+    therefore its value changes even within a single SQL statement.
     <function>timeofday()</function> is a historical
     <productname>PostgreSQL</productname> function.  Like
     <function>clock_timestamp()</function>, it returns the actual current time,
@@ -14419,8 +14419,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    <tgroup cols="1">
     <thead>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
+      <entry role="func_table_entry"><para role="func_signature">
         Function
        </para>
        <para>
@@ -14428,24 +14427,22 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         </para>
        <para>
         Example(s)
-       </para>
-       </entry>
+       </para></entry>
      </row>
     </thead>
 
     <tbody>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
-        <type>gen_random_uuid</type>
+      <entry role="func_table_entry"><para role="func_signature">
+        <function>gen_random_uuid</function> ( )
         <returnvalue>uuid</returnvalue>
        </para>
        <para role="func_signature">
-        <type>uuidv4</type>
+        <function>uuidv4</function> ( )
         <returnvalue>uuid</returnvalue>
        </para>
        <para>
-         Generate a version 4 (random) UUID.
+        Generates a version 4 (random) UUID
        </para>
        <para>
         <literal>gen_random_uuid()</literal>
@@ -14454,26 +14451,25 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
        <para>
         <literal>uuidv4()</literal>
         <returnvalue>b42410ee-132f-42ee-9e4f-09a6485c95b8</returnvalue>
-       </para>
-      </entry>
+       </para></entry>
      </row>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
-        <type>uuidv7</type>
+      <entry role="func_table_entry"><para role="func_signature">
+        <function>uuidv7</function>
         ( <optional> <parameter>shift</parameter> <type>interval</type> </optional> )
         <returnvalue>uuid</returnvalue>
        </para>
        <para>
-        Generate a version 7 (time-ordered) UUID. The timestamp is computed using UNIX timestamp
-        with millisecond precision + sub-millisecond timestamp + random. The optional parameter
-        <parameter>shift</parameter> will shift the computed timestamp by the given <type>interval</type>.
+        Generates a version 7 (time-ordered) UUID. The timestamp is
+        computed using UNIX timestamp with millisecond precision +
+        sub-millisecond timestamp + random. The optional
+        parameter <parameter>shift</parameter> will shift the computed
+        timestamp by the given <type>interval</type>.
        </para>
        <para>
         <literal>uuidv7()</literal>
         <returnvalue>019535d9-3df7-79fb-b466-fa907fa17f9e</returnvalue>
-       </para>
-      </entry>
+       </para></entry>
      </row>
     </tbody>
    </tgroup>
@@ -14496,8 +14492,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    <tgroup cols="1">
     <thead>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
+      <entry role="func_table_entry"><para role="func_signature">
         Function
        </para>
        <para>
@@ -14505,44 +14500,41 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
        </para>
        <para>
         Example(s)
-       </para>
-      </entry>
+       </para></entry>
      </row>
     </thead>
 
     <tbody>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
-        <type>uuid_extract_timestamp</type>
+      <entry role="func_table_entry"><para role="func_signature">
+        <function>uuid_extract_timestamp</function>
         ( <type>uuid</type> )
         <returnvalue>timestamp with time zone</returnvalue>
        </para>
        <para>
-        Extracts a <type>timestamp with time zone</type> from UUID
-        version 1 and 7.  For other versions, this function returns null.  Note that
-        the extracted timestamp is not necessarily exactly equal to the time the
-        UUID was generated; this depends on the implementation that generated the
-        UUID.
+        Extracts a <type>timestamp with time zone</type> from a UUID of
+        version 1 or 7.  For other versions, this function returns null.
+        Note that the extracted timestamp is not necessarily exactly equal
+        to the time the UUID was generated; this depends on the
+        implementation that generated the UUID.
        </para>
        <para>
         <literal>uuid_extract_timestamp('019535d9-3df7-79fb-b466-&zwsp;fa907fa17f9e'::uuid)</literal>
          <returnvalue>2025-02-23 21:46:24.503-05</returnvalue>
-       </para>
-      </entry>
+       </para></entry>
      </row>
      <row>
-      <entry role="func_table_entry">
-       <para role="func_signature">
-        <type>uuid_extract_version</type>
+      <entry role="func_table_entry"><para role="func_signature">
+        <function>uuid_extract_version</function>
         ( <type>uuid</type> )
         <returnvalue>smallint</returnvalue>
        </para>
        <para>
-        Extracts the version from a UUID of the variant described by
-        <ulink url="https://datatracker.ietf.org/doc/html/rfc9562">RFC 9562</ulink>.  For
-        other variants, this function returns null.  For example, for a UUID
-        generated by <function>gen_random_uuid</function>, this function will
+        Extracts the version from a UUID of one of the variants described by
+        <ulink url="https://datatracker.ietf.org/doc/html/rfc9562">RFC
+        9562</ulink>.  For other variants, this function returns null.
+        For example, for a UUID generated
+        by <function>gen_random_uuid()</function>, this function will
         return 4.
        </para>
        <para>
@@ -14552,8 +14544,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
        <para>
         <literal>uuid_extract_version('019535d9-3df7-79fb-b466-&zwsp;fa907fa17f9e'::uuid)</literal>
         <returnvalue>7</returnvalue>
-       </para>
-      </entry>
+       </para></entry>
      </row>
     </tbody>
    </tgroup>
@@ -17449,7 +17440,7 @@ ERROR:  value too long for type character(2)
         <returnvalue>[{"f1":1},2,null,3]</returnvalue>
        </para>
        <para>
-        <literal>jsonb_strip_nulls('[1,2,null,3,4]', true);</literal>
+        <literal>jsonb_strip_nulls('[1,2,null,3,4]', true)</literal>
         <returnvalue>[1,2,3,4]</returnvalue>
        </para>
        </entry>
@@ -26407,6 +26398,21 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
        </para></entry>
       </row>
 
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>pg_get_partition_constraintdef</primary>
+        </indexterm>
+        <function>pg_get_partition_constraintdef</function> ( <parameter>table</parameter> <type>oid</type> )
+        <returnvalue>text</returnvalue>
+       </para>
+       <para>
+        Reconstructs the definition of a partition constraint.
+        (This is a decompiled reconstruction, not the original text
+        of the command.)
+       </para></entry>
+      </row>
+
       <row>
        <entry role="func_table_entry"><para role="func_signature">
         <indexterm>
@@ -27687,6 +27693,31 @@ acl      | {postgres=arwdDxtm/postgres,foo=r/postgres}
         details.
        </para></entry>
       </row>
+
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>pg_get_multixact_members</primary>
+        </indexterm>
+        <function>pg_get_multixact_members</function> ( <parameter>multixid</parameter> <type>xid</type> )
+        <returnvalue>setof record</returnvalue>
+        ( <parameter>xid</parameter> <type>xid</type>,
+        <parameter>mode</parameter> <type>text</type> )
+       </para>
+       <para>
+        Returns the transaction ID and lock mode for each member of the
+        specified multixact ID.  The lock modes <literal>forupd</literal>,
+        <literal>fornokeyupd</literal>, <literal>sh</literal>, and
+        <literal>keysh</literal> correspond to the row-level locks
+        <literal>FOR UPDATE</literal>, <literal>FOR NO KEY UPDATE</literal>,
+        <literal>FOR SHARE</literal>, and <literal>FOR KEY SHARE</literal>,
+        respectively, as described in <xref linkend="locking-rows"/>.  Two
+        additional modes are specific to multixacts:
+        <literal>nokeyupd</literal>, used by updates that do not modify key
+        columns, and <literal>upd</literal>, used by updates or deletes that
+        modify key columns.
+       </para></entry>
+      </row>
      </tbody>
     </tgroup>
    </table>
@@ -27695,7 +27726,8 @@ acl      | {postgres=arwdDxtm/postgres,foo=r/postgres}
     The internal transaction ID type <type>xid</type> is 32 bits wide and
     wraps around every 4 billion transactions.  However,
     the functions shown in <xref linkend="functions-pg-snapshot"/>, except
-    <function>age</function> and <function>mxid_age</function>, use a
+    <function>age</function>, <function>mxid_age</function>, and
+    <function>pg_get_multixact_members</function>, use a
     64-bit type <type>xid8</type> that does not wrap around during the life
     of an installation and can be converted to <type>xid</type> by casting if
     required;  see <xref linkend="transaction-id"/> for details.
@@ -29981,7 +30013,7 @@ postgres=# SELECT '0/0'::pg_lsn + pd.segment_number * ps.setting::int + :offset
         logical decoding and must be dropped after promotion. See
         <xref linkend="logicaldecoding-replication-slots-synchronization"/> for details.
         Note that this function is primarily intended for testing and
-        debugging purposes and should be used with caution. Additionaly,
+        debugging purposes and should be used with caution. Additionally,
         this function cannot be executed if
         <link linkend="guc-sync-replication-slots"><varname>
         sync_replication_slots</varname></link> is enabled and the slotsync
@@ -30336,7 +30368,8 @@ postgres=# SELECT '0/0'::pg_lsn + pd.segment_number * ps.setting::int + :offset
         <function>pg_relation_filepath</function>.  For a relation in the
         database's default tablespace, the tablespace can be specified as zero.
         Returns <literal>NULL</literal> if no relation in the current database
-        is associated with the given values.
+        is associated with the given values, or if dealing with a temporary
+        relation.
        </para></entry>
       </row>
      </tbody>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index ee86e170055..423f691dd42 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -291,7 +291,7 @@ CREATE INDEX ON my_table USING GIST (my_inet_column inet_ops);
    speed up building a <acronym>GiST</acronym> index.
    The optional twelfth method <function>stratnum</function> is used to
    translate compare types (from
-   <filename>src/include/nodes/primnodes.h</filename>) into strategy numbers
+   <filename>src/include/access/cmptype.h</filename>) into strategy numbers
    used by the operator class.  This lets the core code look up operators for
    temporal constraint indexes.
  </para>
@@ -1174,7 +1174,7 @@ my_sortsupport(PG_FUNCTION_ARGS)
      <listitem>
       <para>
        Given a <literal>CompareType</literal> value from
-       <filename>src/include/nodes/primnodes.h</filename>, returns a strategy
+       <filename>src/include/access/cmptype.h</filename>, returns a strategy
        number used by this operator class for matching functionality.  The
        function should return <literal>InvalidStrategy</literal> if the
        operator class has no matching strategy.
diff --git a/doc/src/sgml/hash.sgml b/doc/src/sgml/hash.sgml
index 9e69ef91fe8..34f3b2cb0c1 100644
--- a/doc/src/sgml/hash.sgml
+++ b/doc/src/sgml/hash.sgml
@@ -125,11 +125,10 @@
   Both scanning the index and inserting tuples require locating the bucket
   where a given tuple ought to be located. To do this, we need the bucket
   count, highmask, and lowmask from the metapage; however, it's undesirable
-  for performance reasons to have to have to lock and pin the metapage for
-  every such operation. Instead, we retain a cached copy of the metapage
-  in each backend's relcache entry. This will produce the correct bucket
-  mapping as long as the target bucket hasn't been split since the last
-  cache refresh.
+  for performance reasons to have to lock and pin the metapage for every such
+  operation. Instead, we retain a cached copy of the metapage in each
+  backend's relcache entry. This will produce the correct bucket mapping as
+  long as the target bucket hasn't been split since the last cache refresh.
  </para>
 
  <para>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index b47d8b4106e..aa256e2ec51 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -857,7 +857,7 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
 # as a replication standby if the user's password is correctly supplied.
 #
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
-host    replication     foo             192.168.1.100/32        md5
+host    replication     foo             192.168.1.100/32        scram-sha-256
 </programlisting>
     </para>
     <para>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index 8bfa1db670d..628f13ce123 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -171,7 +171,7 @@
       A short tutorial introducing regular <acronym>SQL</acronym>
       features as well as those of
       <productname>Postgres95</productname> was distributed with the
-      source code
+      source code.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index 1aa4741a8ea..63d7e376f19 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -147,7 +147,7 @@ typedef struct IndexAmRoutine
     ambuild_function ambuild;
     ambuildempty_function ambuildempty;
     aminsert_function aminsert;
-    aminsertcleanup_function aminsertcleanup;
+    aminsertcleanup_function aminsertcleanup;   /* can be NULL */
     ambulkdelete_function ambulkdelete;
     amvacuumcleanup_function amvacuumcleanup;
     amcanreturn_function amcanreturn;   /* can be NULL */
diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 75c1309cf73..742c0146f7f 100644
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -1,9 +1,9 @@
 <!-- doc/src/sgml/legal.sgml -->
 
-<date>2025</date>
+<date>2026</date>
 
 <copyright>
- <year>1996&ndash;2025</year>
+ <year>1996&ndash;2026</year>
  <holder>The PostgreSQL Global Development Group</holder>
 </copyright>
 
@@ -16,7 +16,7 @@
  </para>
 
  <para>
-  Portions Copyright &copy; 1996-2025, PostgreSQL Global Development Group
+  Portions Copyright &copy; 1996-2026, PostgreSQL Global Development Group
  </para>
  <para>
   Portions Copyright &copy; 1994, The Regents of the University of California
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 4b299f5df0e..62a278e61fb 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/libpq.sgml -->
 
-<chapter id="libpq" xreflabel="libpq">
+<chapter id="libpq">
  <title><application>libpq</application> &mdash; C Library</title>
 
  <indexterm zone="libpq">
@@ -2220,7 +2220,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         server does not support the protocol version requested by the client,
         the connection is automatically downgraded to a lower minor protocol
         version that the server supports. After the connection attempt has
-        completed you can use <xref linkend="libpq-PQprotocolVersion"/> to
+        completed you can use <xref linkend="libpq-PQfullProtocolVersion"/> to
         find out which exact protocol version was negotiated.
        </para>
 
@@ -2740,26 +2740,6 @@ char *PQport(const PGconn *conn);
      </listitem>
     </varlistentry>
 
-    <varlistentry id="libpq-PQservice">
-     <term><function>PQservice</function><indexterm><primary>PQservice</primary></indexterm></term>
-
-     <listitem>
-      <para>
-       Returns the service of the active connection.
-
-<synopsis>
-char *PQservice(const PGconn *conn);
-</synopsis>
-      </para>
-
-      <para>
-       <xref linkend="libpq-PQservice"/> returns <symbol>NULL</symbol> if the
-       <parameter>conn</parameter> argument is <symbol>NULL</symbol>.
-       Otherwise, if there was no service provided, it returns an empty string.
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="libpq-PQtty">
      <term><function>PQtty</function><indexterm><primary>PQtty</primary></indexterm></term>
 
@@ -7036,15 +7016,20 @@ int PQrequestCancel(PGconn *conn);
    to send simple function calls to the server.
   </para>
 
-  <tip>
+  <warning>
    <para>
-    This interface is somewhat obsolete, as one can achieve similar
+    This interface is unsafe and should not be used.  When
+    <parameter>result_is_int</parameter> is set to <literal>0</literal>,
+    <function>PQfn</function> may write data beyond the end of
+    <parameter>result_buf</parameter>, regardless of whether the buffer has
+    enough space for the requested number of bytes.  Furthermore, it is
+    obsolete, as one can achieve similar
     performance and greater functionality by setting up a prepared
     statement to define the function call.  Then, executing the statement
     with binary transmission of parameters and results substitutes for a
     fast-path function call.
    </para>
-  </tip>
+  </warning>
 
   <para>
    The function <function id="libpq-PQfn">PQfn</function><indexterm><primary>PQfn</primary></indexterm>
@@ -10432,10 +10417,14 @@ typedef struct PGoauthBearerRequest
 
     /* Hook outputs */
 
-    /* Callback implementing a custom asynchronous OAuth flow. */
+    /*
+     * Callback implementing a custom asynchronous OAuth flow. The signature is
+     * platform-dependent: PQ_SOCKTYPE is SOCKET on Windows, and int everywhere
+     * else.
+     */
     PostgresPollingStatusType (*async) (PGconn *conn,
                                         struct PGoauthBearerRequest *request,
-                                        SOCKTYPE *altsock);
+                                        PQ_SOCKTYPE *altsock);
 
     /* Callback to clean up custom allocations. */
     void        (*cleanup) (PGconn *conn, struct PGoauthBearerRequest *request);
@@ -10492,7 +10481,7 @@ typedef struct PGoauthBearerRequest
          hook. When the callback cannot make further progress without blocking,
          it should return either <symbol>PGRES_POLLING_READING</symbol> or
          <symbol>PGRES_POLLING_WRITING</symbol> after setting
-         <literal>*pgsocket</literal> to the file descriptor that will be marked
+         <literal>*altsock</literal> to the file descriptor that will be marked
          ready to read/write when progress can be made again. (This descriptor
          is then provided to the top-level polling loop via
          <function>PQsocket()</function>.) Return <symbol>PGRES_POLLING_OK</symbol>
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index c32e6bc000d..03e3ed9c170 100644
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -68,7 +68,7 @@
    <listitem>
     <para>
      Replicating between PostgreSQL instances on different platforms (for
-     example Linux to Windows)
+     example Linux to Windows).
     </para>
    </listitem>
 
@@ -89,7 +89,7 @@
  <para>
   The subscriber database behaves in the same way as any other PostgreSQL
   instance and can be used as a publisher for other databases by defining its
-  own publications.  When the subscriber is treated as read-only by
+  own publications.  When the subscriber is treated as read-only by an
   application, there will be no conflicts from a single subscription.  On the
   other hand, if there are other writes done either by an application or by other
   subscribers to the same set of tables, conflicts can arise.
@@ -202,8 +202,8 @@
    A <firstterm>subscription</firstterm> is the downstream side of logical
    replication.  The node where a subscription is defined is referred to as
    the <firstterm>subscriber</firstterm>.  A subscription defines the connection
-   to another database and set of publications (one or more) to which it wants
-   to subscribe.
+   to another database and the set of publications (one or more) to which it
+   wants to subscribe.
   </para>
 
   <para>
@@ -709,8 +709,8 @@ HINT:  To initiate replication, you must manually create the replication slot, e
   </para>
 
   <para>
-   To confirm that the standby server is indeed ready for failover, follow these
-   steps to verify that all necessary logical replication slots have been
+   To confirm that the standby server is indeed ready for failover for a given subscriber, follow these
+   steps to verify that all the logical replication slots required by that subscriber have been
    synchronized to the standby server:
   </para>
 
@@ -764,7 +764,7 @@ HINT:  To initiate replication, you must manually create the replication slot, e
      Check that the logical replication slots identified above exist on
      the standby server and are ready for failover.
 <programlisting>
-/* standby # */ SELECT slot_name, (synced AND NOT temporary AND NOT conflicting) AS failover_ready
+/* standby # */ SELECT slot_name, (synced AND NOT temporary AND invalidation_reason IS NULL) AS failover_ready
                FROM pg_replication_slots
                WHERE slot_name IN
                    ('sub1','sub2','sub3', 'pg_16394_sync_16385_7394666715149055164');
@@ -782,10 +782,42 @@ HINT:  To initiate replication, you must manually create the replication slot, e
   <para>
    If all the slots are present on the standby server and the result
    (<literal>failover_ready</literal>) of the above SQL query is true, then
-   existing subscriptions can continue subscribing to publications now on the
-   new primary server.
+   existing subscriptions can continue subscribing to publications on the new
+   primary server.
+  </para>
+
+  <para>
+   The first two steps in the above procedure are meant for a
+   <productname>PostgreSQL</productname> subscriber. It is recommended to run
+   these steps on each subscriber node, that will be served by the designated
+   standby after failover, to obtain the complete list of replication
+   slots. This list can then be verified in Step 3 to ensure failover readiness.
+   Non-<productname>PostgreSQL</productname> subscribers, on the other hand, may
+   use their own methods to identify the replication slots used by their
+   respective subscriptions.
+  </para>
+
+  <para>
+   In some cases, such as during a planned failover, it is necessary to confirm
+   that all subscribers, whether <productname>PostgreSQL</productname> or
+   non-<productname>PostgreSQL</productname>, will be able to continue
+   replication after failover to a given standby server. In such cases, use the
+   following SQL, instead of performing the first two steps above, to identify
+   which replication slots on the primary need to be synced to the standby that
+   is intended for promotion. This query returns the relevant replication slots
+   associated with all the failover-enabled subscriptions.
   </para>
 
+   <para>
+<programlisting>
+/* primary # */ SELECT array_agg(quote_literal(r.slot_name)) AS slots
+               FROM pg_replication_slots r
+               WHERE r.failover AND NOT r.temporary;
+ slots
+-------
+ {'sub1','sub2','sub3', 'pg_16394_sync_16385_7394666715149055164'}
+(1 row)
+</programlisting></para>
  </sect1>
 
  <sect1 id="logical-replication-row-filter">
@@ -945,7 +977,7 @@ HINT:  To initiate replication, you must manually create the replication slot, e
 
    <note>
     <para>
-     If the subscriber is in a release prior to 15, copy pre-existing data
+     If the subscriber is in a release prior to 15, copying pre-existing data
      doesn't use row filters even if they are defined in the publication.
      This is because old releases can only copy the entire table data.
     </para>
@@ -1016,28 +1048,28 @@ HINT:  To initiate replication, you must manually create the replication slot, e
     defined) for each publication.
 <programlisting><![CDATA[
 /* pub # */ \dRp+
-          Publication p1
-  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Via root
-----------+------------+---------+---------+---------+-----------+----------
- postgres | f          | t       | t       | t       | t         | f
+                                         Publication p1
+  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root
+----------+------------+---------+---------+---------+-----------+-------------------+----------
+ postgres | f          | t       | t       | t       | t         | none              | f
 Tables:
- "public.t1" WHERE ((a > 5) AND (c = 'NSW'::text))
+    "public.t1" WHERE ((a > 5) AND (c = 'NSW'::text))
 
-          Publication p2
-  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Via root
-----------+------------+---------+---------+---------+-----------+----------
- postgres | f          | t       | t       | t       | t         | f
+                                         Publication p2
+  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root
+----------+------------+---------+---------+---------+-----------+-------------------+----------
+ postgres | f          | t       | t       | t       | t         | none              | f
 Tables:
- "public.t1"
- "public.t2" WHERE (e = 99)
+    "public.t1"
+    "public.t2" WHERE (e = 99)
 
-          Publication p3
-  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Via root
-----------+------------+---------+---------+---------+-----------+----------
- postgres | f          | t       | t       | t       | t         | f
+                                         Publication p3
+  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root
+----------+------------+---------+---------+---------+-----------+-------------------+----------
+ postgres | f          | t       | t       | t       | t         | none              | f
 Tables:
- "public.t2" WHERE (d = 10)
- "public.t3" WHERE (g = 10)
+    "public.t2" WHERE (d = 10)
+    "public.t3" WHERE (g = 10)
 ]]></programlisting></para>
 
    <para>
@@ -1459,10 +1491,10 @@ Publications:
      for each publication.
 <programlisting>
 /* pub # */ \dRp+
-                               Publication p1
-  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Via root
-----------+------------+---------+---------+---------+-----------+----------
- postgres | f          | t       | t       | t       | t         | f
+                                         Publication p1
+  Owner   | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root
+----------+------------+---------+---------+---------+-----------+-------------------+----------
+ postgres | f          | t       | t       | t       | t         | none              | f
 Tables:
     "public.t1" (id, a, b, d)
 </programlisting></para>
@@ -1776,7 +1808,7 @@ Publications:
      <term><literal>update_missing</literal></term>
      <listitem>
       <para>
-       The tuple to be updated was not found. The update will simply be
+       The row to be updated was not found. The update will simply be
        skipped in this scenario.
       </para>
      </listitem>
@@ -1797,7 +1829,7 @@ Publications:
      <term><literal>delete_missing</literal></term>
      <listitem>
       <para>
-       The tuple to be deleted was not found. The delete will simply be
+       The row to be deleted was not found. The delete will simply be
        skipped in this scenario.
       </para>
      </listitem>
@@ -1831,8 +1863,8 @@ DETAIL:  <replaceable class="parameter">detailed_explanation</replaceable>.
 <phrase>where <replaceable class="parameter">detail_values</replaceable> is one of:</phrase>
 
     <literal>Key</literal> (<replaceable>column_name</replaceable> <optional>, ...</optional>)=(<replaceable>column_value</replaceable> <optional>, ...</optional>)
-    <literal>existing local tuple</literal> <optional>(<replaceable>column_name</replaceable> <optional>, ...</optional>)=</optional>(<replaceable>column_value</replaceable> <optional>, ...</optional>)
-    <literal>remote tuple</literal> <optional>(<replaceable>column_name</replaceable> <optional>, ...</optional>)=</optional>(<replaceable>column_value</replaceable> <optional>, ...</optional>)
+    <literal>existing local row</literal> <optional>(<replaceable>column_name</replaceable> <optional>, ...</optional>)=</optional>(<replaceable>column_value</replaceable> <optional>, ...</optional>)
+    <literal>remote row</literal> <optional>(<replaceable>column_name</replaceable> <optional>, ...</optional>)=</optional>(<replaceable>column_value</replaceable> <optional>, ...</optional>)
     <literal>replica identity</literal> {(<replaceable>column_name</replaceable> <optional>, ...</optional>)=(<replaceable>column_value</replaceable> <optional>, ...</optional>) | full <optional>(<replaceable>column_name</replaceable> <optional>, ...</optional>)=</optional>(<replaceable>column_value</replaceable> <optional>, ...</optional>)}
 </synopsis>
 
@@ -1866,32 +1898,32 @@ DETAIL:  <replaceable class="parameter">detailed_explanation</replaceable>.
         <para>
          <replaceable class="parameter">detailed_explanation</replaceable> includes
          the origin, transaction ID, and commit timestamp of the transaction that
-         modified the existing local tuple, if available.
+         modified the existing local row, if available.
         </para>
        </listitem>
        <listitem>
         <para>
          The <literal>Key</literal> section includes the key values of the local
-         tuple that violated a unique constraint for
+         row that violated a unique constraint for
          <literal>insert_exists</literal>, <literal>update_exists</literal> or
          <literal>multiple_unique_conflicts</literal> conflicts.
         </para>
        </listitem>
        <listitem>
         <para>
-         The <literal>existing local tuple</literal> section includes the local
-         tuple if its origin differs from the remote tuple for
+         The <literal>existing local row</literal> section includes the local
+         row if its origin differs from the remote row for
          <literal>update_origin_differs</literal> or <literal>delete_origin_differs</literal>
-         conflicts, or if the key value conflicts with the remote tuple for
+         conflicts, or if the key value conflicts with the remote row for
          <literal>insert_exists</literal>, <literal>update_exists</literal> or
          <literal>multiple_unique_conflicts</literal> conflicts.
         </para>
        </listitem>
        <listitem>
         <para>
-         The <literal>remote tuple</literal> section includes the new tuple from
+         The <literal>remote row</literal> section includes the new row from
          the remote insert or update operation that caused the conflict. Note that
-         for an update operation, the column value of the new tuple will be null
+         for an update operation, the column value of the new row will be null
          if the value is unchanged and toasted.
         </para>
        </listitem>
@@ -1899,7 +1931,7 @@ DETAIL:  <replaceable class="parameter">detailed_explanation</replaceable>.
         <para>
          The <literal>replica identity</literal> section includes the replica
          identity key values that were used to search for the existing local
-         tuple to be updated or deleted. This may include the full tuple value
+         row to be updated or deleted. This may include the full row value
          if the local relation is marked with
          <link linkend="sql-altertable-replica-identity-full"><literal>REPLICA IDENTITY FULL</literal></link>.
         </para>
@@ -1907,7 +1939,7 @@ DETAIL:  <replaceable class="parameter">detailed_explanation</replaceable>.
        <listitem>
         <para>
          <replaceable class="parameter">column_name</replaceable> is the column name.
-         For <literal>existing local tuple</literal>, <literal>remote tuple</literal>,
+         For <literal>existing local row</literal>, <literal>remote row</literal>,
          and <literal>replica identity full</literal> cases, column names are
          logged only if the user lacks the privilege to access all columns of
          the table. If column names are present, they appear in the same order
@@ -1964,7 +1996,7 @@ DETAIL:  <replaceable class="parameter">detailed_explanation</replaceable>.
 <screen>
 ERROR:  conflict detected on relation "public.test": conflict=insert_exists
 DETAIL:  Key already exists in unique index "t_pkey", which was modified locally in transaction 740 at 2024-06-26 10:47:04.727375+08.
-Key (c)=(1); existing local tuple (1, 'local'); remote tuple (1, 'remote').
+Key (c)=(1); existing local row (1, 'local'); remote row (1, 'remote').
 CONTEXT:  processing remote data for replication origin "pg_16395" during "INSERT" for replication target relation "public.test" in transaction 725 finished at 0/14C0378
 </screen>
    The LSN of the transaction that contains the change violating the constraint and
@@ -2156,7 +2188,7 @@ CONTEXT:  processing remote data for replication origin "pg_16395" during "INSER
   <sect2 id="logical-replication-snapshot">
     <title>Initial Snapshot</title>
     <para>
-     The initial data in existing subscribed tables are snapshotted and
+     The initial data in existing subscribed tables is snapshotted and
      copied in parallel instances of a special kind of apply process.
      These special apply processes are dedicated table synchronization
      workers, spawned for each table to be synchronized.  Each table
@@ -3183,7 +3215,7 @@ wal_level = logical
    (the values here depend on your actual network configuration and user you
    want to use for connecting):
 <programlisting>
-host     all     repuser     0.0.0.0/0     md5
+host     all     repuser     0.0.0.0/0     scram-sha-256
 </programlisting>
   </para>
 
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
index fc288d691b9..e84bfbce71a 100644
--- a/doc/src/sgml/logicaldecoding.sgml
+++ b/doc/src/sgml/logicaldecoding.sgml
@@ -290,7 +290,7 @@ postgres=# select * from pg_logical_slot_get_changes('regression_slot', NULL, NU
     <para>
      A logical slot will emit each change just once in normal operation.
      The current position of each slot is persisted only at checkpoint, so in
-     the case of a crash the slot may return to an earlier LSN, which will
+     the case of a crash the slot might return to an earlier LSN, which will
      then cause recent changes to be sent again when the server restarts.
      Logical decoding clients are responsible for avoiding ill effects from
      handling the same message more than once.  Clients may wish to record
@@ -409,7 +409,7 @@ postgres=# select * from pg_logical_slot_get_changes('regression_slot', NULL, NU
       should be used with caution. Unlike automatic synchronization, it does not
       include cyclic retries, making it more prone to synchronization failures,
       particularly during initial sync scenarios where the required WAL files
-      or catalog rows for the slot may have already been removed or are at risk
+      or catalog rows for the slot might have already been removed or are at risk
       of being removed on the standby. In contrast, automatic synchronization
       via <varname>sync_replication_slots</varname> provides continuous slot
       updates, enabling seamless failover and supporting high availability.
@@ -420,18 +420,18 @@ postgres=# select * from pg_logical_slot_get_changes('regression_slot', NULL, NU
     <para>
      When slot synchronization is configured as recommended,
      and the initial synchronization is performed either automatically or
-     manually via pg_sync_replication_slot, the standby can persist the
-     synchronized slot only if the following condition is met: The logical
-     replication slot on the primary must retain WALs and system catalog
-     rows that are still available on the standby. This ensures data
+     manually via <function>pg_sync_replication_slots</function>, the standby
+     can persist the synchronized slot only if the following condition is met:
+     The logical replication slot on the primary must retain WALs and system
+     catalog rows that are still available on the standby. This ensures data
      integrity and allows logical replication to continue smoothly after
      promotion.
      If the required WALs or catalog rows have already been purged from the
      standby, the slot will not be persisted to avoid data loss. In such
      cases, the following log message may appear:
 <programlisting>
-     LOG:  could not synchronize replication slot "failover_slot"
-     DETAIL:  Synchronization could lead to data loss as the remote slot needs WAL at LSN 0/3003F28 and catalog xmin 754, but the standby has LSN 0/3003F28 and catalog xmin 756
+LOG:  could not synchronize replication slot "failover_slot"
+DETAIL:  Synchronization could lead to data loss, because the remote slot needs WAL at LSN 0/3003F28 and catalog xmin 754, but the standby has LSN 0/3003F28 and catalog xmin 756.
 </programlisting>
      If the logical replication slot is actively used by a consumer, no
      manual intervention is needed; the slot will advance automatically,
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 600e4b3f2f3..1571a895fc8 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -779,7 +779,10 @@ HINT:  Execute a database-wide VACUUM in that database.
      careful aging management, storage cleanup, and wraparound handling.
      There is a separate storage area which holds the list of members in
      each multixact, which also uses a 32-bit counter and which must also
-     be managed.
+     be managed.  The system function
+     <function>pg_get_multixact_members()</function> described in
+     <xref linkend="functions-pg-snapshot"/> can be used to examine the
+     transaction IDs associated with a multixact ID.
     </para>
 
     <para>
@@ -930,12 +933,16 @@ vacuum threshold = Minimum(vacuum max threshold, vacuum base threshold + vacuum
     The table is also vacuumed if the number of tuples inserted since the last
     vacuum has exceeded the defined insert threshold, which is defined as:
 <programlisting>
-vacuum insert threshold = vacuum base insert threshold + vacuum insert scale factor * number of tuples
+vacuum insert threshold = vacuum base insert threshold + vacuum insert scale factor * number of tuples * percent of table not frozen
 </programlisting>
     where the vacuum insert base threshold is
     <xref linkend="guc-autovacuum-vacuum-insert-threshold"/>,
-    and vacuum insert scale factor is
-    <xref linkend="guc-autovacuum-vacuum-insert-scale-factor"/>.
+    the vacuum insert scale factor is
+    <xref linkend="guc-autovacuum-vacuum-insert-scale-factor"/>,
+    the number of tuples is
+    <structname>pg_class</structname>.<structfield>reltuples</structfield>,
+    and the percent of the table not frozen is
+    <literal>1 - pg_class.relallfrozen / pg_class.relpages</literal>.
     Such vacuums may allow portions of the table to be marked as
     <firstterm>all visible</firstterm> and also allow tuples to be frozen, which
     can reduce the work required in subsequent vacuums.
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 4265a22d4de..5ac0e54688c 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -3980,6 +3980,7 @@ description | Waiting for a newly initialized WAL file to reach durable storage
       </para>
       <para>
        Estimated number of rows inserted since this table was last vacuumed
+       (not counting <command>VACUUM FULL</command>)
       </para></entry>
      </row>
 
@@ -4066,7 +4067,8 @@ description | Waiting for a newly initialized WAL file to reach durable storage
        <structfield>total_vacuum_time</structfield> <type>double precision</type>
       </para>
       <para>
-       Total time this table has been manually vacuumed, in milliseconds.
+       Total time this table has been manually vacuumed, in milliseconds
+       (not counting <command>VACUUM FULL</command>).
        (This includes the time spent sleeping due to cost-based delays.)
       </para></entry>
      </row>
@@ -5649,7 +5651,7 @@ FROM pg_stat_get_backend_idset() AS backendid;
       </para>
       <para>
        Total time spent sleeping due to cost-based delay (see
-       <xref linkend="runtime-config-resource-vacuum-cost"/>, in milliseconds
+       <xref linkend="runtime-config-resource-vacuum-cost"/>), in milliseconds
        (if <xref linkend="guc-track-cost-delay-timing"/> is enabled, otherwise
        zero).
       </para></entry>
diff --git a/doc/src/sgml/pgbuffercache.sgml b/doc/src/sgml/pgbuffercache.sgml
index 537d6014942..6817cf5d215 100644
--- a/doc/src/sgml/pgbuffercache.sgml
+++ b/doc/src/sgml/pgbuffercache.sgml
@@ -19,10 +19,18 @@
   <primary>pg_buffercache_pages</primary>
  </indexterm>
 
+ <indexterm>
+  <primary>pg_buffercache_numa</primary>
+ </indexterm>
+
  <indexterm>
   <primary>pg_buffercache_summary</primary>
  </indexterm>
 
+ <indexterm>
+  <primary>pg_buffercache_usage_counts</primary>
+ </indexterm>
+
  <indexterm>
   <primary>pg_buffercache_evict</primary>
  </indexterm>
@@ -37,12 +45,12 @@
 
  <para>
   This module provides the <function>pg_buffercache_pages()</function>
-  function (wrapped in the <structname>pg_buffercache</structname> view),
+  function (wrapped in the <structname>pg_buffercache</structname> view), the
   <function>pg_buffercache_numa_pages()</function> function (wrapped in the
   <structname>pg_buffercache_numa</structname> view), the
   <function>pg_buffercache_summary()</function> function, the
   <function>pg_buffercache_usage_counts()</function> function, the
-  <function>pg_buffercache_evict()</function>, the
+  <function>pg_buffercache_evict()</function> function, the
   <function>pg_buffercache_evict_relation()</function> function and the
   <function>pg_buffercache_evict_all()</function> function.
  </para>
@@ -55,7 +63,7 @@
  </para>
 
  <para>
-  The <function>pg_buffercache_numa_pages()</function> provides
+  The <function>pg_buffercache_numa_pages()</function> function provides
   <acronym>NUMA</acronym> node mappings for shared buffer entries. This
   information is not part of <function>pg_buffercache_pages()</function>
   itself, as it is much slower to retrieve.
@@ -489,7 +497,7 @@
  </sect2>
 
  <sect2 id="pgbuffercache-pg-buffercache-evict-relation">
-  <title>The <structname>pg_buffercache_evict_relation</structname> Function</title>
+  <title>The <function>pg_buffercache_evict_relation()</function> Function</title>
   <para>
    The <function>pg_buffercache_evict_relation()</function> function is very
    similar to the <function>pg_buffercache_evict()</function> function.  The
@@ -507,7 +515,7 @@
  </sect2>
 
  <sect2 id="pgbuffercache-pg-buffercache-evict-all">
-  <title>The <structname>pg_buffercache_evict_all</structname> Function</title>
+  <title>The <function>pg_buffercache_evict_all()</function> Function</title>
   <para>
    The <function>pg_buffercache_evict_all()</function> function is very
    similar to the <function>pg_buffercache_evict()</function> function.  The
diff --git a/doc/src/sgml/pgoverexplain.sgml b/doc/src/sgml/pgoverexplain.sgml
index 21930fbd3bd..e399c1cbad5 100644
--- a/doc/src/sgml/pgoverexplain.sgml
+++ b/doc/src/sgml/pgoverexplain.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>pg_overexplain</filename> extends <command>EXPLAIN</command>
+  The <filename>pg_overexplain</filename> module extends <command>EXPLAIN</command>
   with new options that provide additional output. It is mostly intended to
   assist with debugging of and development of the planner, rather than for
   general use. Since this module displays internal details of planner data
@@ -17,6 +17,21 @@
   often as) those data structures change.
  </para>
 
+ <para>
+  To use it, simply load it into the server.  You can load it into an
+  individual session:
+
+<programlisting>
+LOAD 'pg_overexplain';
+</programlisting>
+
+  You can also preload it into some or all sessions by including
+  <literal>pg_overexplain</literal> in
+  <xref linkend="guc-session-preload-libraries"/> or
+  <xref linkend="guc-shared-preload-libraries"/> in
+  <filename>postgresql.conf</filename>.
+ </para>
+
  <sect2 id="pgoverexplain-debug">
   <title>EXPLAIN (DEBUG)</title>
 
@@ -24,8 +39,8 @@
    The <literal>DEBUG</literal> option displays miscellaneous information from
    the plan tree that is not normally shown because it is not expected to be
    of general interest. For each individual plan node, it will display the
-   following fields.  See <literal>Plan</literal> in
-   <literal>nodes/plannodes.h</literal> for additional documentation of these
+   following fields.  See <structname>Plan</structname> in
+   <filename>nodes/plannodes.h</filename> for additional documentation of these
    fields.
   </para>
 
@@ -67,8 +82,8 @@
 
   <para>
    Once per query, the <literal>DEBUG</literal> option will display the
-   following fields. See <literal>PlannedStmt</literal> in
-   <literal>nodes/plannodes.h</literal> for additional detail.
+   following fields. See <structname>PlannedStmt</structname> in
+   <filename>nodes/plannodes.h</filename> for additional detail.
   </para>
 
   <itemizedlist>
@@ -82,7 +97,7 @@
    <listitem>
     <para>
      <literal>Flags</literal>. A comma-separated list of Boolean structure
-     member names from the <literal>PlannedStmt</literal> that are set to
+     member names from the <structname>PlannedStmt</structname> that are set to
      <literal>true</literal>. It covers the following structure members:
      <literal>hasReturning</literal>, <literal>hasModifyingCTE</literal>,
      <literal>canSetTag</literal>, <literal>transientPlan</literal>,
@@ -162,7 +177,7 @@
    table entry (e.g.  <literal>relation</literal>,
    <literal>subquery</literal>, or <literal>join</literal>), followed by the
    contents of various range table entry fields that are not normally part of
-   <literal>EXPLAIN</literal> output. Some of these fields are only displayed
+   <command>EXPLAIN</command> output. Some of these fields are only displayed
    for certain kinds of range table entries. For example,
    <literal>Eref</literal> is displayed for all types of range table entries,
    but <literal>CTE Name</literal> is displayed only for range table entries
@@ -171,7 +186,7 @@
 
   <para>
    For more information about range table entries, see the definition of
-   <literal>RangeTblEntry</literal> in <literal>nodes/plannodes.h</literal>.
+   <structname>RangeTblEntry</structname> in <filename>nodes/parsenodes.h</filename>.
   </para>
  </sect2>
 
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index e937491e6b8..5492a66f7ee 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -4962,13 +4962,13 @@ $$ LANGUAGE plpgsql;
    <para>
     Variable substitution currently works only in <command>SELECT</command>,
     <command>INSERT</command>, <command>UPDATE</command>,
-    <command>DELETE</command>, and commands containing one of
-    these (such as <command>EXPLAIN</command> and <command>CREATE TABLE
-    ... AS SELECT</command>),
-    because the main SQL engine allows query parameters only in these
-    commands.  To use a non-constant name or value in other statement
-    types (generically called utility statements), you must construct
-    the utility statement as a string and <command>EXECUTE</command> it.
+    <command>DELETE</command>, <command>MERGE</command> and commands
+    containing one of these (such as <command>EXPLAIN</command> and
+    <command>CREATE TABLE ... AS SELECT</command>), because the main SQL
+    engine allows query parameters only in these commands.  To use a
+    non-constant name or value in other statement types (generically called
+    utility statements), you must construct the utility statement as a string
+    and <command>EXECUTE</command> it.
    </para>
 
   </sect2>
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index cb065bf5f88..bee817ea822 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/plpython.sgml -->
 
-<chapter id="plpython" xreflabel="PL/Python">
+<chapter id="plpython">
  <title>PL/Python &mdash; Python Procedural Language</title>
 
  <indexterm zone="plpython"><primary>PL/Python</primary></indexterm>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 82fe3f93761..f0b29ed8cab 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -537,6 +537,11 @@
         The frontend should not respond to this message, but should
         continue listening for a ReadyForQuery message.
        </para>
+       <para>
+        The <productname>PostgreSQL</productname> server will always send this
+        message, but some third party backend implementations of the protocol
+        that don't support query cancellation are known not to.
+       </para>
       </listitem>
      </varlistentry>
 
@@ -886,6 +891,16 @@ SELCT 1/0;<!-- this typo is intentional -->
      Errors detected at semantic analysis or later, such as a misspelled
      table or column name, do not have this effect.
     </para>
+
+    <para>
+     Lastly, note that all the statements within the Query message will
+     observe the same value of <function>statement_timestamp()</function>,
+     since that timestamp is updated only upon receipt of the Query
+     message.  This will result in them all observing the same
+     value of <function>transaction_timestamp()</function> as well,
+     except in cases where the query string ends a previously-started
+     transaction and begins a new one.
+    </para>
    </sect3>
   </sect2>
 
@@ -3504,11 +3519,13 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
      </term>
      <listitem>
       <para>
-       Boolean option to enable streaming of in-progress transactions.
-       It accepts an additional value "parallel" to enable sending extra
-       information with some messages to be used for parallelisation.
-       Minimum protocol version 2 is required to turn it on.  Minimum protocol
-       version 4 is required for the "parallel" option.
+       Option to enable streaming of in-progress transactions. Valid values are
+       <literal>off</literal> (the default), <literal>on</literal> and
+       <literal>parallel</literal>. The setting <literal>parallel</literal>
+       enables sending extra information with some messages to be used for
+       parallelization. Minimum protocol version 2 is required to turn it
+       <literal>on</literal>.  Minimum protocol version 4 is required for the
+       <literal>parallel</literal> value.
       </para>
      </listitem>
     </varlistentry>
@@ -4146,7 +4163,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
          message, indicated by the length field.
         </para>
         <para>
-          The maximum key length is 256 bytes. The
+          The minimum and maximum key length are 4 and 256 bytes, respectively. The
           <productname>PostgreSQL</productname> server only sends keys up to
           32 bytes, but the larger maximum size allows for future server
           versions, as well as connection poolers and other middleware, to use
@@ -4337,7 +4354,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
     <listitem>
      <variablelist>
       <varlistentry>
-       <term>Int32(16)</term>
+       <term>Int32</term>
        <listitem>
         <para>
          Length of message contents in bytes, including self.
@@ -6081,13 +6098,13 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
       </varlistentry>
 
       <varlistentry>
-       <term>Int32(196608)</term>
+       <term>Int32(196610)</term>
        <listitem>
         <para>
          The protocol version number.  The most significant 16 bits are
          the major version number (3 for the protocol described here).
          The least significant 16 bits are the minor version number
-         (0 for the protocol described here).
+         (2 for the protocol described here).
         </para>
        </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 727a0cb185f..b190f28d41e 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -264,8 +264,18 @@ COPY weather FROM '/home/user/weather.txt';
 
     where the file name for the source file must be available on the
     machine running the backend process, not the client, since the backend process
-    reads the file directly.  You can read more about the
-    <command>COPY</command> command in <xref linkend="sql-copy"/>.
+    reads the file directly.  The data inserted above into the weather table
+    could also be inserted from a file containing (values are separated by a
+    tab character):
+
+<programlisting>
+San Francisco    46    50    0.25    1994-11-27
+San Francisco    43    57    0.0    1994-11-29
+Hayward    37    54    \N    1994-11-29
+</programlisting>
+
+    You can read more about the <command>COPY</command> command in
+    <xref linkend="sql-copy"/>.
    </para>
   </sect1>
 
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index e2da3cc719f..9d923c00fff 100644
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -32,7 +32,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab
 
 <phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
 
-    ADD [ COLUMN ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
+    ADD [ COLUMN ] [ IF NOT EXISTS ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="parameter">column_name</replaceable> [ RESTRICT | CASCADE ]
     ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ]
     ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable>
@@ -67,11 +67,13 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab
 
   <variablelist>
    <varlistentry>
-    <term><literal>ADD COLUMN</literal></term>
+    <term><literal>ADD [ COLUMN ] [ IF NOT EXISTS ]</literal></term>
     <listitem>
      <para>
       This form adds a new column to the foreign table, using the same syntax as
       <link linkend="sql-createforeigntable"><command>CREATE FOREIGN TABLE</command></link>.
+      If <literal>IF NOT EXISTS</literal> is specified and a column already
+      exists with this name, no error is thrown.
       Unlike the case when adding a column to a regular table, nothing happens
       to the underlying storage: this action simply declares that
       some new column is now accessible through the foreign table.
@@ -80,7 +82,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DROP COLUMN [ IF EXISTS ]</literal></term>
+    <term><literal>DROP [ COLUMN ] [ IF EXISTS ]</literal></term>
     <listitem>
      <para>
       This form drops a column from a foreign table.
diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml
index 1d42d05d858..fb7096c16ea 100644
--- a/doc/src/sgml/ref/alter_index.sgml
+++ b/doc/src/sgml/ref/alter_index.sgml
@@ -97,6 +97,11 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="parameter">name</replaceable>
       index cannot be dropped by itself, and will automatically be dropped
       if its parent index is dropped.
      </para>
+     <para>
+      If the named index is already attached to the altered index, the
+      command will attempt to validate the parent index if the parent is
+      currently invalid.
+     </para>
     </listitem>
    </varlistentry>
 
diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml
index d5ea383e8bc..d7f1a5a7229 100644
--- a/doc/src/sgml/ref/alter_publication.sgml
+++ b/doc/src/sgml/ref/alter_publication.sgml
@@ -23,15 +23,24 @@ PostgreSQL documentation
 <synopsis>
 ALTER PUBLICATION <replaceable class="parameter">name</replaceable> ADD <replaceable class="parameter">publication_object</replaceable> [, ...]
 ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET <replaceable class="parameter">publication_object</replaceable> [, ...]
-ALTER PUBLICATION <replaceable class="parameter">name</replaceable> DROP <replaceable class="parameter">publication_object</replaceable> [, ...]
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> DROP <replaceable class="parameter">publication_drop_object</replaceable> [, ...]
 ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
 ALTER PUBLICATION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
 ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 
 <phrase>where <replaceable class="parameter">publication_object</replaceable> is one of:</phrase>
 
-    TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ] [, ... ]
+    TABLE <replaceable class="parameter">table_and_columns</replaceable> [, ... ]
     TABLES IN SCHEMA { <replaceable class="parameter">schema_name</replaceable> | CURRENT_SCHEMA } [, ... ]
+
+<phrase>and <replaceable class="parameter">publication_drop_object</replaceable> is one of:</phrase>
+
+    TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ... ]
+    TABLES IN SCHEMA { <replaceable class="parameter">schema_name</replaceable> | CURRENT_SCHEMA } [, ... ]
+
+<phrase>and <replaceable class="parameter">table_and_columns</replaceable> is:</phrase>
+
+    [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -57,8 +66,7 @@ ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <r
    <literal>DROP TABLES IN SCHEMA</literal> will not drop any schema tables
    that were specified using
    <link linkend="sql-createpublication-params-for-table"><literal>FOR TABLE</literal></link>/
-   <literal>ADD TABLE</literal>, and the combination of <literal>DROP</literal>
-   with a <literal>WHERE</literal> clause is not allowed.
+   <literal>ADD TABLE</literal>.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml
index fdc648d007f..1333a0b559f 100644
--- a/doc/src/sgml/ref/alter_subscription.sgml
+++ b/doc/src/sgml/ref/alter_subscription.sgml
@@ -272,7 +272,7 @@ ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <
       process reports an error if any prepared transactions done by the
       logical replication worker (from when <literal>two_phase</literal>
       parameter was still <literal>true</literal>) are found. You can resolve
-      prepared transactions on the publisher node, or manually roll back them
+      prepared transactions on the publisher node, or manually roll them back
       on the subscriber, and then try again. The transactions prepared by
       logical replication worker corresponding to a particular subscription have
       the following pattern: <quote><literal>pg_gid_%u_%u</literal></quote>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index d1696991683..409164bf180 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -157,7 +157,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
 
   <variablelist>
    <varlistentry id="sql-altertable-desc-add-column">
-    <term><literal>ADD COLUMN [ IF NOT EXISTS ]</literal></term>
+    <term><literal>ADD [ COLUMN ] [ IF NOT EXISTS ]</literal></term>
     <listitem>
      <para>
       This form adds a new column to the table, using the same syntax as
@@ -169,7 +169,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
    </varlistentry>
 
    <varlistentry id="sql-altertable-desc-drop-column">
-    <term><literal>DROP COLUMN [ IF EXISTS ]</literal></term>
+    <term><literal>DROP [ COLUMN ] [ IF EXISTS ]</literal></term>
     <listitem>
      <para>
       This form drops a column from a table.  Indexes and
@@ -210,6 +210,8 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
       When this form is used, the column's statistics are removed,
       so running <link linkend="sql-analyze"><command>ANALYZE</command></link>
       on the table afterwards is recommended.
+      For a virtual generated column, <command>ANALYZE</command>
+      is not necessary because such columns never have statistics.
      </para>
     </listitem>
    </varlistentry>
@@ -240,9 +242,10 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
       provided none of the records in the table contain a
       <literal>NULL</literal> value for the column.  Ordinarily this is
       checked during the <literal>ALTER TABLE</literal> by scanning the
-      entire table; however, if a valid <literal>CHECK</literal> constraint is
-      found which proves no <literal>NULL</literal> can exist, then the
-      table scan is skipped.
+      entire table, unless <literal>NOT VALID</literal> is specified;
+      however, if a valid <literal>CHECK</literal> constraint exists
+      (and is not dropped in the same command) which proves no
+      <literal>NULL</literal> can exist, then the table scan is skipped.
       If a column has an invalid not-null constraint,
       <literal>SET NOT NULL</literal> validates it.
      </para>
@@ -270,6 +273,15 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
       in a stored generated column is rewritten and all the future changes
       will apply the new generation expression.
      </para>
+
+     <para>
+      When this form is used on a stored generated column, its statistics
+      are removed, so running
+      <link linkend="sql-analyze"><command>ANALYZE</command></link>
+      on the table afterwards is recommended.
+      For a virtual generated column, <command>ANALYZE</command>
+      is not necessary because such columns never have statistics.
+     </para>
     </listitem>
    </varlistentry>
 
@@ -364,24 +376,22 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
       <literal>n_distinct_inherited</literal>, which override the
       number-of-distinct-values estimates made by subsequent
       <link linkend="sql-analyze"><command>ANALYZE</command></link>
-      operations.  <literal>n_distinct</literal> affects the statistics for the table
-      itself, while <literal>n_distinct_inherited</literal> affects the statistics
-      gathered for the table plus its inheritance children.  When set to a
-      positive value, <command>ANALYZE</command> will assume that the column contains
-      exactly the specified number of distinct nonnull values.  When set to a
-      negative value, which must be greater
-      than or equal to -1, <command>ANALYZE</command> will assume that the number of
-      distinct nonnull values in the column is linear in the size of the
-      table; the exact count is to be computed by multiplying the estimated
-      table size by the absolute value of the given number.  For example,
-      a value of -1 implies that all values in the column are distinct, while
-      a value of -0.5 implies that each value appears twice on the average.
-      This can be useful when the size of the table changes over time, since
-      the multiplication by the number of rows in the table is not performed
-      until query planning time.  Specify a value of 0 to revert to estimating
-      the number of distinct values normally.  For more information on the use
-      of statistics by the <productname>PostgreSQL</productname> query
-      planner, refer to <xref linkend="planner-stats"/>.
+      operations. <literal>n_distinct</literal> affects the statistics for the
+      table itself, while <literal>n_distinct_inherited</literal> affects the
+      statistics gathered for the table plus its inheritance children, and for
+      the statistics gathered for partitioned tables.  When the value
+      specified is a positive value, the query planner will assume that the
+      column contains exactly the specified number of distinct nonnull values.
+      Fractional values may also be specified by using values below 0 and
+      above or equal to -1.  This instructs the query planner to estimate the
+      number of distinct values by multiplying the absolute value of the
+      specified number by the estimated number of rows in the table.  For
+      example, a value of -1 implies that all values in the column are
+      distinct, while a value of -0.5 implies that each value appears twice on
+      average.  This can be useful when the size of the table changes over
+      time.  For more information on the use of statistics by the
+      <productname>PostgreSQL</productname> query planner, refer to
+      <xref linkend="planner-stats"/>.
      </para>
      <para>
       Changing per-attribute options acquires a
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 5b43c56b133..a824b99f826 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -80,14 +80,16 @@ COMMENT ON
   <title>Description</title>
 
   <para>
-   <command>COMMENT</command> stores a comment about a database object.
+   <command>COMMENT</command> stores, replaces, or removes the comment on a
+   database object.
   </para>
 
   <para>
-   Only one comment string is stored for each object, so to modify a comment,
-   issue a new <command>COMMENT</command> command for the same object.  To remove a
-   comment, write <literal>NULL</literal> in place of the text string.
-   Comments are automatically dropped when their object is dropped.
+   Only one comment string is stored for each object.  Issuing a new
+   <command>COMMENT</command> command for the same object replaces the
+   existing comment.  Specifying <literal>NULL</literal> or an empty
+   string (<literal>''</literal>) removes the comment.  Comments are
+   automatically dropped when their object is dropped.
   </para>
 
   <para>
@@ -266,7 +268,8 @@ COMMENT ON
     <term><replaceable class="parameter">string_literal</replaceable></term>
     <listitem>
      <para>
-      The new comment contents, written as a string literal.
+      The new comment contents, written as a string literal.  An empty string
+      (<literal>''</literal>) removes the comment.
      </para>
     </listitem>
    </varlistentry>
@@ -275,7 +278,7 @@ COMMENT ON
     <term><literal>NULL</literal></term>
     <listitem>
      <para>
-      Write <literal>NULL</literal> to drop the comment.
+      Write <literal>NULL</literal> to remove the comment.
      </para>
     </listitem>
    </varlistentry>
@@ -362,6 +365,7 @@ COMMENT ON TRANSFORM FOR hstore LANGUAGE plpython3u IS 'Transform between hstore
 COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI';
 COMMENT ON TYPE complex IS 'Complex number data type';
 COMMENT ON VIEW my_view IS 'View of departmental costs';
+COMMENT ON VIEW my_view IS NULL;
 </programlisting></para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml
index 009fa46532b..adc775b90c5 100644
--- a/doc/src/sgml/ref/create_foreign_table.sgml
+++ b/doc/src/sgml/ref/create_foreign_table.sgml
@@ -232,9 +232,9 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
         <term><literal>INCLUDING COMMENTS</literal></term>
         <listitem>
          <para>
-          Comments for the copied columns and constraints will be
-          copied.  The default behavior is to exclude comments, resulting in
-          the copied columns and constraints in the new table having no
+          Comments for the copied columns, constraints, and extended statistics
+          will be copied.  The default behavior is to exclude comments,
+          resulting in the corresponding objects in the new table having no
           comments.
          </para>
         </listitem>
diff --git a/doc/src/sgml/ref/create_policy.sgml b/doc/src/sgml/ref/create_policy.sgml
index e76c342d3da..9065ccb65f9 100644
--- a/doc/src/sgml/ref/create_policy.sgml
+++ b/doc/src/sgml/ref/create_policy.sgml
@@ -49,6 +49,8 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
    in <literal>WITH CHECK</literal>.  When a <literal>USING</literal>
    expression returns true for a given row then that row is visible to the
    user, while if false or null is returned then the row is not visible.
+   Typically, no error occurs when a row is not visible, but see
+   <xref linkend="sql-createpolicy-summary"/> for exceptions.
    When a <literal>WITH CHECK</literal> expression returns true for a row
    then that row is inserted or updated, while if false or null is returned
    then an error occurs.
@@ -194,8 +196,9 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       rows for which the expression returns false or null will not be
       visible to the user (in a <command>SELECT</command>), and will not be
       available for modification (in an <command>UPDATE</command>
-      or <command>DELETE</command>).  Such rows are silently suppressed; no error
-      is reported.
+      or <command>DELETE</command>).  Typically, such rows are silently
+      suppressed; no error is reported (but see
+      <xref linkend="sql-createpolicy-summary"/> for exceptions).
      </para>
     </listitem>
    </varlistentry>
@@ -251,8 +254,10 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          otherwise).  If an <command>INSERT</command>
          or <command>UPDATE</command> command attempts to add rows to the
          table that do not pass the <literal>ALL</literal>
-         policy's <literal>WITH CHECK</literal> expression, the entire
-         command will be aborted.
+         policy's <literal>WITH CHECK</literal> expression (or its
+         <literal>USING</literal> expression, if it does not have a
+         <literal>WITH CHECK</literal> expression), the entire command will
+         be aborted.
        </para>
       </listitem>
      </varlistentry>
@@ -268,11 +273,52 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          relation that pass the <literal>SELECT</literal> policy will be
          returned during a <literal>SELECT</literal> query, and that queries
          that require <literal>SELECT</literal> permissions, such as
-         <literal>UPDATE</literal>, will also only see those records
+         <literal>UPDATE</literal>, <literal>DELETE</literal>, and
+         <literal>MERGE</literal>, will also only see those records
          that are allowed by the <literal>SELECT</literal> policy.
          A <literal>SELECT</literal> policy cannot have a <literal>WITH
          CHECK</literal> expression, as it only applies in cases where
-         records are being retrieved from the relation.
+         records are being retrieved from the relation, except as described
+         below.
+       </para>
+       <para>
+         If a data-modifying query has a <literal>RETURNING</literal> clause,
+         <literal>SELECT</literal> permissions are required on the relation,
+         and any newly inserted or updated rows from the relation must satisfy
+         the relation's <literal>SELECT</literal> policies in order to be
+         available to the <literal>RETURNING</literal> clause.  If a newly
+         inserted or updated row does not satisfy the relation's
+         <literal>SELECT</literal> policies, an error will be thrown (inserted
+         or updated rows to be returned are <emphasis>never</emphasis>
+         silently ignored).
+       </para>
+       <para>
+         If an <literal>INSERT</literal> has an <literal>ON CONFLICT DO
+         UPDATE</literal> clause, or an <literal>ON CONFLICT DO
+         NOTHING</literal> clause with an arbiter index or constraint
+         specification, then <literal>SELECT</literal>
+         permissions are required on the relation, and the rows proposed for
+         insertion are checked using the relation's <literal>SELECT</literal>
+         policies.  If a row proposed for insertion does not satisfy the
+         relation's <literal>SELECT</literal> policies, an error is thrown
+         (the <literal>INSERT</literal> is <emphasis>never</emphasis> silently
+         avoided).  In addition, if the <literal>UPDATE</literal> path is
+         taken, the row to be updated and the new updated row are checked
+         against the relation's <literal>SELECT</literal> policies, and an
+         error is thrown if they are not satisfied (an auxiliary
+         <literal>UPDATE</literal> is <emphasis>never</emphasis> silently
+         avoided).
+       </para>
+       <para>
+         A <literal>MERGE</literal> command requires <literal>SELECT</literal>
+         permissions on both the source and target relations, and so each
+         relation's <literal>SELECT</literal> policies are applied before they
+         are joined, and the <literal>MERGE</literal> actions will only see
+         those records that are allowed by those policies.  In addition, if
+         an <literal>UPDATE</literal> action is executed, the target relation's
+         <literal>SELECT</literal> policies are applied to the updated row, as
+         for a standalone <literal>UPDATE</literal>, except that an error is
+         thrown if they are not satisfied.
        </para>
       </listitem>
      </varlistentry>
@@ -292,10 +338,11 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          where records are being added to the relation.
        </para>
        <para>
-         Note that <literal>INSERT</literal> with <literal>ON CONFLICT DO
-         UPDATE</literal> checks <literal>INSERT</literal> policies'
-         <literal>WITH CHECK</literal> expressions only for rows appended
-         to the relation by the <literal>INSERT</literal> path.
+         Note that an <literal>INSERT</literal> with an <literal>ON CONFLICT
+         DO NOTHING/UPDATE</literal> clause will check the
+         <literal>INSERT</literal> policies' <literal>WITH CHECK</literal>
+         expressions for all rows proposed for insertion, regardless of
+         whether or not they end up being inserted.
        </para>
       </listitem>
      </varlistentry>
@@ -305,12 +352,12 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       <listitem>
        <para>
          Using <literal>UPDATE</literal> for a policy means that it will apply
-         to <literal>UPDATE</literal>, <literal>SELECT FOR UPDATE</literal>
+         to <literal>UPDATE</literal>, <literal>SELECT FOR UPDATE</literal>,
          and <literal>SELECT FOR SHARE</literal> commands, as well as
          auxiliary <literal>ON CONFLICT DO UPDATE</literal> clauses of
-         <literal>INSERT</literal> commands.
-         <literal>MERGE</literal> commands containing <literal>UPDATE</literal>
-         actions are affected as well.  Since <literal>UPDATE</literal>
+         <literal>INSERT</literal> commands, and <literal>MERGE</literal>
+         commands containing <literal>UPDATE</literal> actions.
+         Since an <literal>UPDATE</literal> command
          involves pulling an existing record and replacing it with a new
          modified record, <literal>UPDATE</literal>
          policies accept both a <literal>USING</literal> expression and
@@ -356,7 +403,8 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          command, if the existing row does not pass the
          <literal>USING</literal> expressions, an error will be thrown (the
          <literal>UPDATE</literal> path will <emphasis>never</emphasis> be silently
-         avoided).
+         avoided).  The same applies to an <literal>UPDATE</literal> action
+         of a <command>MERGE</command> command.
        </para>
       </listitem>
      </varlistentry>
@@ -366,12 +414,18 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       <listitem>
        <para>
          Using <literal>DELETE</literal> for a policy means that it will apply
-         to <literal>DELETE</literal> commands.  Only rows that pass this
-         policy will be seen by a <literal>DELETE</literal> command.  There can
-         be rows that are visible through a <literal>SELECT</literal> that are
-         not available for deletion, if they do not pass the
-         <literal>USING</literal> expression for
-         the <literal>DELETE</literal> policy.
+         to <literal>DELETE</literal> commands and <literal>MERGE</literal>
+         commands containing <literal>DELETE</literal> actions.  For a
+         <literal>DELETE</literal> command, only rows that pass this policy
+         will be seen by the <literal>DELETE</literal> command.  There can
+         be rows that are visible through a <literal>SELECT</literal> policy
+         that are not available for deletion, if they do not pass the
+         <literal>USING</literal> expression for the <literal>DELETE</literal>
+         policy.  Note, however, that a <literal>DELETE</literal> action in a
+         <literal>MERGE</literal> command will see rows that are visible
+         through <literal>SELECT</literal> policies, and if the
+         <literal>DELETE</literal> policy does not pass for such a row, an
+         error will be thrown.
        </para>
 
        <para>
@@ -400,6 +454,15 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
 
    </variablelist>
 
+   <para>
+    <xref linkend="sql-createpolicy-summary"/> summarizes how the different
+    types of policy apply to specific commands.  In the table,
+    <quote>check</quote> means that the policy expression is checked and an
+    error is thrown if it returns false or null, whereas <quote>filter</quote>
+    means that the row is silently ignored if the policy expression returns
+    false or null.
+   </para>
+
    <table id="sql-createpolicy-summary">
     <title>Policies Applied by Command Type</title>
     <tgroup cols="6">
@@ -424,8 +487,8 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
      </thead>
      <tbody>
       <row>
-       <entry><command>SELECT</command></entry>
-       <entry>Existing row</entry>
+       <entry><command>SELECT</command> / <command>COPY ... TO</command></entry>
+       <entry>Filter existing row</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
@@ -433,63 +496,121 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       </row>
       <row>
        <entry><command>SELECT FOR UPDATE/SHARE</command></entry>
-       <entry>Existing row</entry>
+       <entry>Filter existing row</entry>
        <entry>&mdash;</entry>
-       <entry>Existing row</entry>
+       <entry>Filter existing row</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
       </row>
       <row>
-       <entry><command>INSERT</command> / <command>MERGE ... THEN INSERT</command></entry>
+       <entry><command>INSERT</command></entry>
+       <entry>
+        Check new row&nbsp;<footnote id="rls-select-priv">
+         <para>
+          If read access is required to either the existing or new row (for
+          example, a <literal>WHERE</literal> or <literal>RETURNING</literal>
+          clause that refers to columns from the relation).
+         </para>
+        </footnote>
+       </entry>
+       <entry>Check new row</entry>
        <entry>&mdash;</entry>
-       <entry>New row</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>UPDATE</command></entry>
+       <entry>
+        Filter existing row&nbsp;<footnoteref linkend="rls-select-priv"/> &amp;
+        check new row&nbsp;<footnoteref linkend="rls-select-priv"/>
+       </entry>
+       <entry>&mdash;</entry>
+       <entry>Filter existing row</entry>
+       <entry>Check new row</entry>
        <entry>&mdash;</entry>
       </row>
       <row>
-       <entry><command>INSERT ... RETURNING</command></entry>
+       <entry><command>DELETE</command></entry>
        <entry>
-        New row <footnote id="rls-select-priv">
+        Filter existing row&nbsp;<footnoteref linkend="rls-select-priv"/>
+       </entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>Filter existing row</entry>
+      </row>
+      <row>
+       <entry><command>INSERT ... ON CONFLICT</command></entry>
+       <entry>
+        Check new row&nbsp;<footnote>
+         <para>
+          If an arbiter index or constraint is specified.
+         </para>
+        </footnote><footnote id="rls-on-conflict-priv">
          <para>
-          If read access is required to the existing or new row (for example,
-          a <literal>WHERE</literal> or <literal>RETURNING</literal> clause
-          that refers to columns from the relation).
+          Row proposed for insertion is checked regardless of whether or not a
+          conflict occurs.
          </para>
         </footnote>
        </entry>
-       <entry>New row</entry>
+       <entry>
+        Check new row&nbsp;<footnoteref linkend="rls-on-conflict-priv"/>
+       </entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
       </row>
       <row>
-       <entry><command>UPDATE</command> / <command>MERGE ... THEN UPDATE</command></entry>
+       <entry><command>ON CONFLICT DO UPDATE</command></entry>
        <entry>
-        Existing &amp; new rows <footnoteref linkend="rls-select-priv"/>
+        Check existing &amp; new rows&nbsp;<footnote id="rls-on-conflict-update-priv">
+         <para>
+          New row of the auxiliary <command>UPDATE</command> command, which
+          might be different from the new row of the original
+          <command>INSERT</command> command.
+         </para>
+        </footnote>
        </entry>
        <entry>&mdash;</entry>
-       <entry>Existing row</entry>
-       <entry>New row</entry>
+       <entry>Check existing row</entry>
+       <entry>
+        Check new row&nbsp;<footnoteref linkend="rls-on-conflict-update-priv"/>
+       </entry>
        <entry>&mdash;</entry>
       </row>
       <row>
-       <entry><command>DELETE</command></entry>
+       <entry><command>MERGE</command></entry>
+       <entry>Filter source &amp; target rows</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>MERGE ... THEN INSERT</command></entry>
        <entry>
-        Existing row <footnoteref linkend="rls-select-priv"/>
+        Check new row&nbsp;<footnoteref linkend="rls-select-priv"/>
        </entry>
+       <entry>Check new row</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
        <entry>&mdash;</entry>
-       <entry>Existing row</entry>
       </row>
       <row>
-       <entry><command>ON CONFLICT DO UPDATE</command></entry>
-       <entry>Existing &amp; new rows</entry>
+       <entry><command>MERGE ... THEN UPDATE</command></entry>
+       <entry>Check new row</entry>
+       <entry>&mdash;</entry>
+       <entry>Check existing row</entry>
+       <entry>Check new row</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>MERGE ... THEN DELETE</command></entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
        <entry>&mdash;</entry>
-       <entry>Existing row</entry>
-       <entry>New row</entry>
        <entry>&mdash;</entry>
+       <entry>Check existing row</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index 802630f2df1..b9e12a33c62 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -28,8 +28,12 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
 
 <phrase>where <replaceable class="parameter">publication_object</replaceable> is one of:</phrase>
 
-    TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ] [, ... ]
+    TABLE <replaceable class="parameter">table_and_columns</replaceable> [, ... ]
     TABLES IN SCHEMA { <replaceable class="parameter">schema_name</replaceable> | CURRENT_SCHEMA } [, ... ]
+
+<phrase>and <replaceable class="parameter">table_and_columns</replaceable> is:</phrase>
+
+    [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -151,7 +155,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
      </para>
 
      <para>
-      When a partitioned table is published via schema level publication, all
+      When a partitioned table is published via a schema-level publication, all
       of its existing and future partitions are implicitly considered to be part of the
       publication, regardless of whether they are from the publication schema or not.
       So, even operations that are performed directly on a
@@ -174,7 +178,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
         <listitem>
          <para>
           This parameter determines which DML operations will be published by
-          the new publication to the subscribers.  The value is
+          the new publication to the subscribers.  The value is a
           comma-separated list of operations.  The allowed operations are
           <literal>insert</literal>, <literal>update</literal>,
           <literal>delete</literal>, and <literal>truncate</literal>.
@@ -214,7 +218,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
          <note>
           <para>
            If the subscriber is from a release prior to 18, then initial table
-           synchronization won't copy generated columns even if parameter
+           synchronization won't copy generated columns even if the parameter
            <literal>publish_generated_columns</literal> is <literal>stored</literal>
            in the publisher.
           </para>
@@ -231,13 +235,15 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
         <term><literal>publish_via_partition_root</literal> (<type>boolean</type>)</term>
         <listitem>
          <para>
-          This parameter determines whether changes in a partitioned table (or
-          on its partitions) contained in the publication will be published
-          using the identity and schema of the partitioned table rather than
-          that of the individual partitions that are actually changed; the
-          latter is the default.  Enabling this allows the changes to be
-          replicated into a non-partitioned table or a partitioned table
-          consisting of a different set of partitions.
+          This parameter controls how changes to a partitioned table (or any of
+          its partitions) are published.  When set to <literal>true</literal>,
+          changes are published using the identity and schema of the
+          root partitioned table.  When set to <literal>false</literal> (the
+          default), changes are published using the identity and schema of the
+          individual partitions where the changes actually occurred.  Enabling
+          this option allows the changes to be replicated into a
+          non-partitioned table or into a partitioned table whose partition
+          structure differs from that of the publisher.
          </para>
 
          <para>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index dc000e913c1..a033efce4de 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -672,9 +672,10 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
         <term><literal>INCLUDING COMMENTS</literal></term>
         <listitem>
          <para>
-          Comments for the copied columns, constraints, and indexes will be
+          Comments for the copied columns, check constraints,
+          not-null constraints, indexes, and extended statistics will be
           copied.  The default behavior is to exclude comments, resulting in
-          the copied columns and constraints in the new table having no
+          the corresponding objects in the new table having no
           comments.
          </para>
         </listitem>
@@ -1379,8 +1380,8 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
       <literal>REFERENCES</literal> (foreign key) constraints accept this
       clause.  <literal>NOT NULL</literal> and <literal>CHECK</literal> constraints are not
       deferrable.  Note that deferrable constraints cannot be used as
-      conflict arbitrators in an <command>INSERT</command> statement that
-      includes an <literal>ON CONFLICT DO UPDATE</literal> clause.
+      conflict arbiters in an <command>INSERT</command> statement that
+      includes an <literal>ON CONFLICT</literal> clause.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 982ab6f3ee4..71869c996e3 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -197,9 +197,11 @@ CREATE [ OR REPLACE ] [ CONSTRAINT ] TRIGGER <replaceable class="parameter">name
    of the rows inserted, deleted, or modified by the current SQL statement.
    This feature lets the trigger see a global view of what the statement did,
    not just one row at a time.  This option is only allowed for
-   an <literal>AFTER</literal> trigger that is not a constraint trigger; also, if
-   the trigger is an <literal>UPDATE</literal> trigger, it must not specify
-   a <replaceable class="parameter">column_name</replaceable> list.
+   an <literal>AFTER</literal> trigger on a plain table (not a foreign table).
+   The trigger should not be a constraint trigger.  Also, if the trigger is
+   an <literal>UPDATE</literal> trigger, it must not specify
+   a <replaceable class="parameter">column_name</replaceable> list when using
+   this option.
    <literal>OLD TABLE</literal> may only be specified once, and only for a trigger
    that can fire on <literal>UPDATE</literal> or <literal>DELETE</literal>; it creates a
    transition relation containing the <firstterm>before-images</firstterm> of all rows
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 5c34c623423..0c061428514 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -539,7 +539,7 @@ PostgreSQL documentation
 <prompt>$ </prompt><userinput>createuser -P -s -e joe</userinput>
 <computeroutput>Enter password for new role: </computeroutput><userinput>xyzzy</userinput>
 <computeroutput>Enter it again: </computeroutput><userinput>xyzzy</userinput>
-<computeroutput>CREATE ROLE joe PASSWORD 'md5b5f5ba1a423792b526f799ae4eb3d59e' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN;</computeroutput>
+<computeroutput>CREATE ROLE joe PASSWORD 'SCRAM-SHA-256$4096:44560wPMLfjqiAzyPDZ/eQ==$4CA054rZlSFEq8Z3FEhToBTa2X6KnWFxFkPwIbKoDe0=:L/nbSZRCjp6RhOhKK56GoR1zibCCSePKshCJ9lnl3yw=' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN NOREPLICATION NOBYPASSRLS;</computeroutput>
 </screen>
     In the above example, the new password isn't actually echoed when typed,
     but we show what was typed for clarity.  As you see, the password is
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 29649f6afd6..f88a03f821e 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -323,6 +323,9 @@ DELETE FROM user_logs AS dl
   USING delete_batch AS del
   WHERE dl.ctid = del.ctid;
 </programlisting>
+   This use of <structfield>ctid</structfield> is only safe because
+   the query is repeatedly run, avoiding the problem of changed
+   <structfield>ctid</structfield>s.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index 46e1c229ec0..efda01a39e8 100644
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -33,7 +33,7 @@ DROP OWNED BY { <replaceable class="parameter">name</replaceable> | CURRENT_ROLE
    database that are owned by one of the specified roles. Any
    privileges granted to the given roles on objects in the current
    database or on shared objects (databases, tablespaces, configuration
-   parameters, or other roles) will also be revoked.
+   parameters) will also be revoked.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_subscription.sgml b/doc/src/sgml/ref/drop_subscription.sgml
index d4f54c7170e..6e84bb0a256 100644
--- a/doc/src/sgml/ref/drop_subscription.sgml
+++ b/doc/src/sgml/ref/drop_subscription.sgml
@@ -49,6 +49,16 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable
   <title>Parameters</title>
 
   <variablelist>
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the subscription does not exist. A notice is
+      issued in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index 3f139917790..706952e50fc 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -114,10 +114,13 @@ INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replac
    <literal>INSERT</literal> privilege on the listed columns.
    Similarly, when <literal>ON CONFLICT DO UPDATE</literal> is specified, you
    only need <literal>UPDATE</literal> privilege on the column(s) that are
-   listed to be updated.  However, <literal>ON CONFLICT DO UPDATE</literal>
-   also requires <literal>SELECT</literal> privilege on any column whose
-   values are read in the <literal>ON CONFLICT DO UPDATE</literal>
-   expressions or <replaceable>condition</replaceable>.
+   listed to be updated.  However, all forms of <literal>ON CONFLICT</literal>
+   also require <literal>SELECT</literal> privilege on any column whose values
+   are read.  This includes any column mentioned in
+   <replaceable>conflict_target</replaceable> (including columns referred to
+   by the arbiter constraint), and any column mentioned in an
+   <literal>ON CONFLICT DO UPDATE</literal> <replaceable>expression</replaceable>,
+   or a <literal>WHERE</literal> clause <replaceable>condition</replaceable>.
   </para>
 
   <para>
@@ -594,6 +597,15 @@ INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replac
     </para>
    </tip>
 
+   <warning>
+    <para>
+      While <command>CREATE INDEX CONCURRENTLY</command> or <command>REINDEX
+      CONCURRENTLY</command> is running on a unique index, <command>INSERT
+      ... ON CONFLICT</command> statements on the same table may unexpectedly
+      fail with a unique violation.
+    </para>
+   </warning>
+
   </refsect2>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_combinebackup.sgml b/doc/src/sgml/ref/pg_combinebackup.sgml
index 330a598f701..9a6d201e0b8 100644
--- a/doc/src/sgml/ref/pg_combinebackup.sgml
+++ b/doc/src/sgml/ref/pg_combinebackup.sgml
@@ -314,7 +314,7 @@ PostgreSQL documentation
 
   <para>
    To avoid this problem, taking a new full backup after changing the checksum
-   state of the cluster using <xref linkend="app-pgchecksums "/> is
+   state of the cluster using <xref linkend="app-pgchecksums"/> is
    recommended. Otherwise, you can disable and then optionally reenable
    checksums on the directory produced by <literal>pg_combinebackup</literal>
    in order to correct the problem.
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index a0287bb81d6..b762b002c02 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -299,8 +299,9 @@ PostgreSQL documentation
        <para>
         Append the server log output to
         <replaceable>filename</replaceable>.  If the file does not
-        exist, it is created.  The <systemitem>umask</systemitem> is set to 077,
-        so access to the log file is disallowed to other users by default.
+        exist, it is created.  By default, only the cluster owner can
+        access the log file.  If group access is enabled in the cluster,
+        users in the same group as the cluster owner can also read it.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 2ae084b5fa6..f1b076ec46e 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -96,6 +96,18 @@ PostgreSQL documentation
    light of the limitations listed below.
   </para>
 
+  <warning>
+   <para>
+    Restoring a dump causes the destination to execute arbitrary code of the
+    source superusers' choice.  Partial dumps and partial restores do not limit
+    that.  If the source superusers are not trusted, the dumped SQL statements
+    must be inspected before restoring.  Non-plain-text dumps can be inspected
+    by using <application>pg_restore</application>'s <option>--file</option>
+    option.  Note that the client running the dump and restore need not trust
+    the source or destination superusers.
+   </para>
+  </warning>
+
  </refsect1>
 
  <refsect1 id="pg-dump-options">
@@ -1252,6 +1264,29 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--restrict-key=<replaceable class="parameter">restrict_key</replaceable></option></term>
+      <listitem>
+       <para>
+        Use the provided string as the <application>psql</application>
+        <command>\restrict</command> key in the dump output.  This can only be
+        specified for plain-text dumps, i.e., when <option>--format</option> is
+        set to <literal>plain</literal> or the <option>--format</option> option
+        is omitted.  If no restrict key is specified,
+        <application>pg_dump</application> will generate a random one as
+        needed.  Keys may contain only alphanumeric characters.
+       </para>
+       <para>
+        This option is primarily intended for testing purposes and other
+        scenarios that require repeatable output (e.g., comparing dump files).
+        It is not recommended for general use, as a malicious server with
+        advance knowledge of the key may be able to inject arbitrary code that
+        will be executed on the machine that runs
+        <application>psql</application> with the dump output.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--rows-per-insert=<replaceable class="parameter">nrows</replaceable></option></term>
       <listitem>
@@ -1354,12 +1389,21 @@ PostgreSQL documentation
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--statistics</option></term>
+      <listitem>
+       <para>
+        Dump optimizer statistics.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--statistics-only</option></term>
       <listitem>
        <para>
         Dump only the statistics, not the schema (data definitions) or data.
-        Statistics for tables, materialized views, foreign tables,
+        Optimizer statistics for tables, materialized views, foreign tables,
         and indexes are dumped.
        </para>
       </listitem>
@@ -1440,33 +1484,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--with-data</option></term>
-      <listitem>
-       <para>
-        Dump data. This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-schema</option></term>
-      <listitem>
-       <para>
-        Dump schema (data definitions). This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-statistics</option></term>
-      <listitem>
-       <para>
-        Dump statistics.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
        <term><option>-?</option></term>
        <term><option>--help</option></term>
@@ -1682,11 +1699,12 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   If <option>--with-statistics</option> is specified,
+   When <option>--statistics</option> is specified,
    <command>pg_dump</command> will include most optimizer statistics in the
-   resulting dump file.  However, some statistics may not be included, such as
-   those created explicitly with <xref linkend="sql-createstatistics"/> or
-   custom statistics added by an extension.  Therefore, it may be useful to
+   resulting dump file.  This does not include all statistics, such as
+   those created explicitly with <xref linkend="sql-createstatistics"/>,
+   custom statistics added by an extension, or statistics collected by the
+   cumulative statistics system. Therefore, it may still be useful to
    run <command>ANALYZE</command> after restoring from a dump file to ensure
    optimal performance; see <xref linkend="vacuum-for-statistics"/> and <xref
    linkend="autovacuum"/> for more information.
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 8ca68da5a55..8834b7ec141 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -16,10 +16,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>pg_dumpall</refname>
-
-  <refpurpose>
-   export a <productname>PostgreSQL</productname> database cluster as an SQL script or to other formats
-  </refpurpose>
+  <refpurpose>extract a <productname>PostgreSQL</productname> database cluster into a script file</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
@@ -36,7 +33,7 @@ PostgreSQL documentation
   <para>
    <application>pg_dumpall</application> is a utility for writing out
    (<quote>dumping</quote>) all <productname>PostgreSQL</productname> databases
-   of a cluster into an SQL script file or an archive.  The output contains
+   of a cluster into one script file.  The script file contains
    <acronym>SQL</acronym> commands that can be used as input to <xref
    linkend="app-psql"/> to restore the databases.  It does this by
    calling <xref linkend="app-pgdump"/> for each database in the cluster.
@@ -55,16 +52,11 @@ PostgreSQL documentation
   </para>
 
   <para>
-   Plain text SQL scripts will be written to the standard output.  Use the
+   The SQL script will be written to the standard output.  Use the
    <option>-f</option>/<option>--file</option> option or shell operators to
    redirect it into a file.
   </para>
 
-  <para>
-   Archives in other formats will be placed in a directory named using the
-   <option>-f</option>/<option>--file</option>, which is required in this case.
-  </para>
-
   <para>
   <application>pg_dumpall</application> needs to connect several
   times to the <productname>PostgreSQL</productname> server (once per
@@ -74,6 +66,16 @@ PostgreSQL documentation
   linkend="libpq-pgpass"/> for more information.
   </para>
 
+  <warning>
+   <para>
+    Restoring a dump causes the destination to execute arbitrary code of the
+    source superusers' choice.  Partial dumps and partial restores do not limit
+    that.  If the source superusers are not trusted, the dumped SQL statements
+    must be inspected before restoring.  Note that the client running the dump
+    and restore need not trust the source or destination superusers.
+   </para>
+  </warning>
+
  </refsect1>
 
  <refsect1>
@@ -129,85 +131,10 @@ PostgreSQL documentation
        <para>
         Send output to the specified file.  If this is omitted, the
         standard output is used.
-        Note: This option can only be omitted when <option>--format</option> is plain
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-F <replaceable class="parameter">format</replaceable></option></term>
-      <term><option>--format=<replaceable class="parameter">format</replaceable></option></term>
-      <listitem>
-       <para>
-        Specify the format of dump files.  In plain format, all the dump data is
-        sent in a single text stream. This is the default.
-
-        In all other modes, <application>pg_dumpall</application> first creates two files:
-        <filename>global.dat</filename> and <filename>map.dat</filename>, in the directory
-        specified by <option>--file</option>.
-        The first file contains global data, such as roles and tablespaces. The second
-        contains a mapping between database oids and names. These files are used by
-        <application>pg_restore</application>. Data for individual databases is placed in
-        <filename>databases</filename> subdirectory, named using the database's <type>oid</type>.
-
-       <variablelist>
-        <varlistentry>
-         <term><literal>d</literal></term>
-         <term><literal>directory</literal></term>
-         <listitem>
-          <para>
-           Output directory-format archives for each database,
-           suitable for input into pg_restore. The directory
-           will have database <type>oid</type> as its name.
-          </para>
-         </listitem>
-        </varlistentry>
-
-        <varlistentry>
-         <term><literal>p</literal></term>
-         <term><literal>plain</literal></term>
-         <listitem>
-          <para>
-           Output a plain-text SQL script file (the default).
-          </para>
-         </listitem>
-        </varlistentry>
-
-        <varlistentry>
-         <term><literal>c</literal></term>
-         <term><literal>custom</literal></term>
-         <listitem>
-          <para>
-           Output a custom-format archive for each database,
-           suitable for input into pg_restore. The archive
-           will be named <filename>dboid.dmp</filename> where <type>dboid</type> is the
-           <type>oid</type> of the database.
-          </para>
-         </listitem>
-        </varlistentry>
-
-         <varlistentry>
-         <term><literal>t</literal></term>
-         <term><literal>tar</literal></term>
-         <listitem>
-          <para>
-           Output a tar-format archive for each database,
-           suitable for input into pg_restore. The archive
-           will be named <filename>dboid.tar</filename> where <type>dboid</type> is the
-           <type>oid</type> of the database.
-          </para>
-         </listitem>
-        </varlistentry>
-
-        </variablelist>
-
-       Note: see <xref linkend="app-pgdump"/> for details
-       of how the various non plain text archives work.
-
-        </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-g</option></term>
       <term><option>--globals-only</option></term>
@@ -674,6 +601,26 @@ exclude database <replaceable class="parameter">PATTERN</replaceable>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--restrict-key=<replaceable class="parameter">restrict_key</replaceable></option></term>
+      <listitem>
+       <para>
+        Use the provided string as the <application>psql</application>
+        <command>\restrict</command> key in the dump output.  If no restrict
+        key is specified, <application>pg_dumpall</application> will generate a
+        random one as needed.  Keys may contain only alphanumeric characters.
+       </para>
+       <para>
+        This option is primarily intended for testing purposes and other
+        scenarios that require repeatable output (e.g., comparing dump files).
+        It is not recommended for general use, as a malicious server with
+        advance knowledge of the key may be able to inject arbitrary code that
+        will be executed on the machine that runs
+        <application>psql</application> with the dump output.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--rows-per-insert=<replaceable class="parameter">nrows</replaceable></option></term>
       <listitem>
@@ -688,12 +635,21 @@ exclude database <replaceable class="parameter">PATTERN</replaceable>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--statistics</option></term>
+      <listitem>
+       <para>
+        Dump optimizer statistics.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--statistics-only</option></term>
       <listitem>
        <para>
         Dump only the statistics, not the schema (data definitions) or data.
-        Statistics for tables, materialized views, foreign tables,
+        Optimizer statistics for tables, materialized views, foreign tables,
         and indexes are dumped.
        </para>
       </listitem>
@@ -723,33 +679,6 @@ exclude database <replaceable class="parameter">PATTERN</replaceable>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--with-data</option></term>
-      <listitem>
-       <para>
-        Dump data. This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-schema</option></term>
-      <listitem>
-       <para>
-        Dump schema (data definitions). This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-statistics</option></term>
-      <listitem>
-       <para>
-        Dump statistics.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
        <term><option>-?</option></term>
        <term><option>--help</option></term>
@@ -961,11 +890,12 @@ exclude database <replaceable class="parameter">PATTERN</replaceable>
   </para>
 
   <para>
-   If <option>--with-statistics</option> is specified,
+   When <option>--statistics</option> is specified,
    <command>pg_dumpall</command> will include most optimizer statistics in the
-   resulting dump file.  However, some statistics may not be included, such as
-   those created explicitly with <xref linkend="sql-createstatistics"/> or
-   custom statistics added by an extension.  Therefore, it may be useful to
+   resulting dump file. This does not include all statistics, such as
+   those created explicitly with <xref linkend="sql-createstatistics"/>,
+   custom statistics added by an extension, or statistics collected by the
+   cumulative statistics system.  Therefore, it may still be useful to
    run <command>ANALYZE</command> on each database after restoring from a dump
    file to ensure optimal performance.  You can also run <command>vacuumdb -a
    -z</command> to analyze all databases.
diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index f68182266a9..263ebdeeab4 100644
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -53,6 +53,16 @@ PostgreSQL documentation
    (<keycombo action="simul"><keycap>Control</keycap><keycap>C</keycap></keycombo>)
    or <systemitem>SIGTERM</systemitem> signal.
   </para>
+
+  <para>
+   When <application>pg_recvlogical</application> receives
+   a <systemitem>SIGHUP</systemitem> signal, it closes the current output file
+   and opens a new one using the filename specified by
+   the <option>--file</option> option.  This allows us to rotate
+   the output file by first renaming the current file and then sending
+   a <systemitem>SIGHUP</systemitem> signal to
+   <application>pg_recvlogical</application>.
+  </para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index b649bd3a5ae..a468a38361a 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -18,9 +18,8 @@ PostgreSQL documentation
   <refname>pg_restore</refname>
 
   <refpurpose>
-   restore <productname>PostgreSQL</productname> databases from archives
-   created by <application>pg_dump</application> or
-   <application>pg_dumpall</application>
+   restore a <productname>PostgreSQL</productname> database from an
+   archive file created by <application>pg_dump</application>
   </refpurpose>
  </refnamediv>
 
@@ -39,14 +38,13 @@ PostgreSQL documentation
 
   <para>
    <application>pg_restore</application> is a utility for restoring a
-   <productname>PostgreSQL</productname> database or cluster from an archive
-   created by <xref linkend="app-pgdump"/> or
-   <xref linkend="app-pg-dumpall"/> in one of the non-plain-text
+   <productname>PostgreSQL</productname> database from an archive
+   created by <xref linkend="app-pgdump"/> in one of the non-plain-text
    formats.  It will issue the commands necessary to reconstruct the
-   database or cluster to the state it was in at the time it was saved. The
-   archives also allow <application>pg_restore</application> to
+   database to the state it was in at the time it was saved.  The
+   archive files also allow <application>pg_restore</application> to
    be selective about what is restored, or even to reorder the items
-   prior to being restored. The archive formats are designed to be
+   prior to being restored. The archive files are designed to be
    portable across architectures.
   </para>
 
@@ -54,17 +52,10 @@ PostgreSQL documentation
    <application>pg_restore</application> can operate in two modes.
    If a database name is specified, <application>pg_restore</application>
    connects to that database and restores archive contents directly into
-   the database.
-   When restoring from a dump made by <application>pg_dumpall</application>,
-   each database will be created and then the restoration will be run in that
-   database.
-
-   Otherwise, when a database name is not specified, a script containing the SQL
-   commands necessary to rebuild the database or cluster is created and written
+   the database.  Otherwise, a script containing the SQL
+   commands necessary to rebuild the database is created and written
    to a file or standard output.  This script output is equivalent to
-   the plain text output format of <application>pg_dump</application> or
-   <application>pg_dumpall</application>.
-
+   the plain text output format of <application>pg_dump</application>.
    Some of the options controlling the output are therefore analogous to
    <application>pg_dump</application> options.
   </para>
@@ -77,6 +68,18 @@ PostgreSQL documentation
    <application>pg_restore</application> will not be able to load the data
    using <command>COPY</command> statements.
   </para>
+
+  <warning>
+   <para>
+    Restoring a dump causes the destination to execute arbitrary code of the
+    source superusers' choice.  Partial dumps and partial restores do not limit
+    that.  If the source superusers are not trusted, the dumped SQL statements
+    must be inspected before restoring.  Non-plain-text dumps can be inspected
+    by using <application>pg_restore</application>'s <option>--file</option>
+    option.  Note that the client running the dump and restore need not trust
+    the source or destination superusers.
+   </para>
+  </warning>
  </refsect1>
 
  <refsect1 id="app-pgrestore-options">
@@ -149,8 +152,6 @@ PostgreSQL documentation
         commands that mention this database.
         Access privileges for the database itself are also restored,
         unless <option>--no-acl</option> is specified.
-        <option>--create</option> is required when restoring multiple databases
-        from an archive created by <application>pg_dumpall</application>.
        </para>
 
        <para>
@@ -246,19 +247,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-g</option></term>
-      <term><option>--globals-only</option></term>
-      <listitem>
-       <para>
-        Restore only global objects (roles and tablespaces), no databases.
-       </para>
-       <para>
-        This option is only relevant when restoring from an archive made using <application>pg_dumpall</application>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-I <replaceable class="parameter">index</replaceable></option></term>
       <term><option>--index=<replaceable class="parameter">index</replaceable></option></term>
@@ -603,28 +591,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--exclude-database=<replaceable class="parameter">pattern</replaceable></option></term>
-      <listitem>
-       <para>
-        Do not restore databases whose name matches
-        <replaceable class="parameter">pattern</replaceable>.
-        Multiple patterns can be excluded by writing multiple
-        <option>--exclude-database</option> switches.  The
-        <replaceable class="parameter">pattern</replaceable> parameter is
-        interpreted as a pattern according to the same rules used by
-        <application>psql</application>'s <literal>\d</literal>
-        commands (see <xref linkend="app-psql-patterns"/>),
-        so multiple databases can also be excluded by writing wildcard
-        characters in the pattern.  When using wildcards, be careful to
-        quote the pattern if needed to prevent shell wildcard expansion.
-       </para>
-       <para>
-        This option is only relevant when restoring from an archive made using <application>pg_dumpall</application>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>--filter=<replaceable class="parameter">filename</replaceable></option></term>
       <listitem>
@@ -842,6 +808,28 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--restrict-key=<replaceable class="parameter">restrict_key</replaceable></option></term>
+      <listitem>
+       <para>
+        Use the provided string as the <application>psql</application>
+        <command>\restrict</command> key in the dump output.  This can only be
+        specified for SQL script output, i.e., when the <option>--file</option>
+        option is used.  If no restrict key is specified,
+        <application>pg_restore</application> will generate a random one as
+        needed.  Keys may contain only alphanumeric characters.
+       </para>
+       <para>
+        This option is primarily intended for testing purposes and other
+        scenarios that require repeatable output (e.g., comparing dump files).
+        It is not recommended for general use, as a malicious server with
+        advance knowledge of the key may be able to inject arbitrary code that
+        will be executed on the machine that runs
+        <application>psql</application> with the dump output.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
        <term><option>--section=<replaceable class="parameter">sectionname</replaceable></option></term>
        <listitem>
@@ -861,6 +849,16 @@ PostgreSQL documentation
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--statistics</option></term>
+      <listitem>
+       <para>
+        Output commands to restore statistics, if the archive contains them.
+        This is the default.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--statistics-only</option></term>
       <listitem>
@@ -919,36 +917,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--with-data</option></term>
-      <listitem>
-       <para>
-        Output commands to restore data, if the archive contains them.
-        This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-schema</option></term>
-      <listitem>
-       <para>
-        Output commands to restore schema (data definitions), if the archive
-        contains them. This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--with-statistics</option></term>
-      <listitem>
-       <para>
-        Output commands to restore statistics, if the archive contains them.
-        This is the default.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
        <term><option>-?</option></term>
        <term><option>--help</option></term>
diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index 5485033ed8c..c696cec1a1c 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -97,9 +97,9 @@ PostgreSQL documentation
    <application>pg_rewind</application> requires that the target server either has
    the <xref linkend="guc-wal-log-hints"/> option enabled
    in <filename>postgresql.conf</filename> or data checksums enabled when
-   the cluster was initialized with <application>initdb</application>.  Neither of these
-   are currently on by default.  <xref linkend="guc-full-page-writes"/>
-   must also be set to <literal>on</literal>, but is enabled by default.
+   the cluster was initialized with <application>initdb</application> (the
+   default).  <xref linkend="guc-full-page-writes"/> must also be set to
+   <literal>on</literal>, but is enabled by default.
   </para>
 
   <warning>
diff --git a/doc/src/sgml/ref/pg_walsummary.sgml b/doc/src/sgml/ref/pg_walsummary.sgml
index 57b2d24650c..399b6879754 100644
--- a/doc/src/sgml/ref/pg_walsummary.sgml
+++ b/doc/src/sgml/ref/pg_walsummary.sgml
@@ -31,7 +31,7 @@ PostgreSQL documentation
   <title>Description</title>
   <para>
    <application>pg_walsummary</application> is used to print the contents of
-   WAL summary files. These binary files are found with the
+   WAL summary files. These binary files are found in the
    <literal>pg_wal/summaries</literal> subdirectory of the data directory,
    and can be converted to text using this tool. This is not ordinarily
    necessary, since WAL summary files primarily exist to support
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index aeeed297437..1445579429f 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -70,6 +70,14 @@ PostgreSQL documentation
    <application>pg_upgrade</application> supports upgrades from 9.2.X and later to the current
    major release of <productname>PostgreSQL</productname>, including snapshot and beta releases.
   </para>
+
+  <warning>
+   <para>
+    Upgrading a cluster causes the destination to execute arbitrary code of the
+    source superusers' choice.  Ensure that the source superusers are trusted
+    before upgrading.
+   </para>
+  </warning>
  </refsect1>
 
  <refsect1>
@@ -825,10 +833,10 @@ psql --username=postgres --file=script.sql postgres
     <para>
      Unless the <option>--no-statistics</option> option is specified,
      <command>pg_upgrade</command> will transfer most optimizer statistics
-     from the old cluster to the new cluster.  However, some statistics may
-     not be transferred, such as those created explicitly with <xref
-     linkend="sql-createstatistics"/> or custom statistics added by an
-     extension.
+     from the old cluster to the new cluster.  This does not transfer
+     all statistics, such as those created explicitly with
+     <xref linkend="sql-createstatistics"/>, custom statistics added by
+     an extension, or statistics collected by the cumulative statistics system.
     </para>
 
     <para>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 95f4cac2467..bc273f8dce5 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -3551,6 +3551,24 @@ SELECT $1 \parse stmt1
       </varlistentry>
 
 
+      <varlistentry id="app-psql-meta-command-restrict">
+        <term><literal>\restrict <replaceable class="parameter">restrict_key</replaceable></literal></term>
+        <listitem>
+        <para>
+        Enter "restricted" mode with the provided key.  In this mode, the only
+        allowed meta-command is <command>\unrestrict</command>, to exit
+        restricted mode.  The key may contain only alphanumeric characters.
+        </para>
+        <para>
+        This command is primarily intended for use in plain-text dumps
+        generated by <application>pg_dump</application>,
+        <application>pg_dumpall</application>, and
+        <application>pg_restore</application>, but it may be useful elsewhere.
+        </para>
+        </listitem>
+      </varlistentry>
+
+
       <varlistentry id="app-psql-meta-command-s">
         <term><literal>\s [ <replaceable class="parameter">filename</replaceable> ]</literal></term>
         <listitem>
@@ -3802,6 +3820,24 @@ SELECT 1 \bind \sendpipeline
       </varlistentry>
 
 
+      <varlistentry id="app-psql-meta-command-unrestrict">
+        <term><literal>\unrestrict <replaceable class="parameter">restrict_key</replaceable></literal></term>
+        <listitem>
+        <para>
+        Exit "restricted" mode (i.e., where all other meta-commands are
+        blocked), provided the specified key matches the one given to
+        <command>\restrict</command> when restricted mode was entered.
+        </para>
+        <para>
+        This command is primarily intended for use in plain-text dumps
+        generated by <application>pg_dump</application>,
+        <application>pg_dumpall</application>, and
+        <application>pg_restore</application>, but it may be useful elsewhere.
+        </para>
+        </listitem>
+      </varlistentry>
+
+
       <varlistentry id="app-psql-meta-command-unset">
         <term><literal>\unset <replaceable class="parameter">name</replaceable></literal></term>
 
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 40cca063946..b523766abe3 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -503,6 +503,9 @@ UPDATE work_item SET status = 'failed'
   WHERE work_item.ctid = emr.ctid;
 </programlisting>
    This command will need to be repeated until no rows remain to be updated.
+   (This use of <structfield>ctid</structfield> is only safe because
+   the query is repeatedly run, avoiding the problem of changed
+   <structfield>ctid</structfield>s.)
    Use of an <literal>ORDER BY</literal> clause allows the command to
    prioritize which rows will be updated; it can also prevent deadlock
    with other update operations if they use the same ordering.
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index b0680a61814..bfa3cf56096 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -282,14 +282,24 @@ PostgreSQL documentation
       <listitem>
        <para>
         Only analyze relations that are missing statistics for a column, index
-        expression, or extended statistics object.  This option prevents
-        <application>vacuumdb</application> from deleting existing statistics
-        so that the query optimizer's choices do not become transiently worse.
+        expression, or extended statistics object.  When used with
+        <option>--analyze-in-stages</option>, this option prevents
+        <application>vacuumdb</application> from temporarily replacing existing
+        statistics with ones generated with lower statistics targets, thus
+        avoiding transiently worse query optimizer choices.
        </para>
        <para>
         This option can only be used in conjunction with
         <option>--analyze-only</option> or <option>--analyze-in-stages</option>.
        </para>
+       <para>
+        Note that <option>--missing-stats-only</option> requires
+        <literal>SELECT</literal> privileges on
+        <link linkend="catalog-pg-statistic"><structname>pg_statistic</structname></link>
+        and
+        <link linkend="catalog-pg-statistic-ext-data"><structname>pg_statistic_ext_data</structname></link>,
+        which are restricted to superusers by default.
+       </para>
       </listitem>
      </varlistentry>
 
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index bf4ffb30576..8838fe7f022 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -285,75 +285,88 @@ make check-world PG_TEST_EXTRA='kerberos ldap ssl load_balance libpq_encryption'
     </varlistentry>
 
     <varlistentry>
-     <term><literal>sepgsql</literal></term>
+     <term><literal>libpq_encryption</literal></term>
      <listitem>
       <para>
-       Runs the test suite under <filename>contrib/sepgsql</filename>.  This
-       requires an SELinux environment that is set up in a specific way; see
-       <xref linkend="sepgsql-regression"/>.
+       Runs the test <filename>src/interfaces/libpq/t/005_negotiate_encryption.pl</filename>.
+       This opens TCP/IP listen sockets. If <varname>PG_TEST_EXTRA</varname>
+       also includes <literal>kerberos</literal>, additional tests that require
+       an MIT Kerberos installation are enabled.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>ssl</literal></term>
+     <term><literal>load_balance</literal></term>
      <listitem>
       <para>
-       Runs the test suite under <filename>src/test/ssl</filename>.  This opens TCP/IP listen sockets.
+       Runs the test <filename>src/interfaces/libpq/t/004_load_balance_dns.pl</filename>.
+       This requires editing the system <filename>hosts</filename> file and
+       opens TCP/IP listen sockets.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>load_balance</literal></term>
+     <term><literal>oauth</literal></term>
      <listitem>
       <para>
-       Runs the test <filename>src/interfaces/libpq/t/004_load_balance_dns.pl</filename>.
-       This requires editing the system <filename>hosts</filename> file and
-       opens TCP/IP listen sockets.
+       Runs the test suite under <filename>src/test/modules/oauth_validator</filename>.
+       This opens TCP/IP listen sockets for a test server running HTTPS.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>libpq_encryption</literal></term>
+     <term><literal>regress_dump_restore</literal></term>
      <listitem>
       <para>
-       Runs the test <filename>src/interfaces/libpq/t/005_negotiate_encryption.pl</filename>.
-       This opens TCP/IP listen sockets. If <varname>PG_TEST_EXTRA</varname>
-       also includes <literal>kerberos</literal>, additional tests that require
-       an MIT Kerberos installation are enabled.
+       Runs an additional test suite in
+       <filename>src/bin/pg_upgrade/t/002_pg_upgrade.pl</filename> which
+       cycles the regression database through <command>pg_dump</command>/
+       <command>pg_restore</command>.  Not enabled by default because it
+       is resource intensive.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>wal_consistency_checking</literal></term>
+     <term><literal>sepgsql</literal></term>
      <listitem>
       <para>
-       Uses <literal>wal_consistency_checking=all</literal> while running
-       certain tests under <filename>src/test/recovery</filename>.  Not
-       enabled by default because it is resource intensive.
+       Runs the test suite under <filename>contrib/sepgsql</filename>.  This
+       requires an SELinux environment that is set up in a specific way; see
+       <xref linkend="sepgsql-regression"/>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>xid_wraparound</literal></term>
+     <term><literal>ssl</literal></term>
      <listitem>
       <para>
-       Runs the test suite under <filename>src/test/modules/xid_wraparound</filename>.
-       Not enabled by default because it is resource intensive.
+       Runs the test suite under <filename>src/test/ssl</filename>.  This opens TCP/IP listen sockets.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>oauth</literal></term>
+     <term><literal>wal_consistency_checking</literal></term>
      <listitem>
       <para>
-       Runs the test suite under <filename>src/test/modules/oauth_validator</filename>.
-       This opens TCP/IP listen sockets for a test server running HTTPS.
+       Uses <literal>wal_consistency_checking=all</literal> while running
+       certain tests under <filename>src/test/recovery</filename>.  Not
+       enabled by default because it is resource intensive.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal>xid_wraparound</literal></term>
+     <listitem>
+      <para>
+       Runs the test suite under <filename>src/test/modules/xid_wraparound</filename>.
+       Not enabled by default because it is resource intensive.
       </para>
      </listitem>
     </varlistentry>
diff --git a/doc/src/sgml/release-18.sgml b/doc/src/sgml/release-18.sgml
index 66a6817a2be..9537f1932ec 100644
--- a/doc/src/sgml/release-18.sgml
+++ b/doc/src/sgml/release-18.sgml
@@ -1,12 +1,5148 @@
 <!-- doc/src/sgml/release-18.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-18-4">
+  <title>Release 18.4</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2026-05-14</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 18.3.
+   For information about new features in major release 18, see
+   <xref linkend="release-18"/>.
+  </para>
+
+  <sect2 id="release-18-4-migration">
+   <title>Migration to Version 18.4</title>
+
+   <para>
+    A dump/restore is not required for those running 18.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 18.2,
+    see <xref linkend="release-18-2"/>.
+   </para>
+  </sect2>
+
+  <sect2 id="release-18-4-changes">
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [b63f25bdd] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [f7a191f53] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [32a4ce55c] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [66cf26b9e] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [3fb66d302] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [3b4e66739] 2026-05-11 05:13:51 -0700
+Branch: REL_17_STABLE [6dffaeb8e] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [c2e6ef863] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [16fda4df6] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [14a4a7040] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Prevent unbounded recursion while processing startup packets
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;f7a191f53">&sect;</ulink>
+     </para>
+
+     <para>
+      A malicious client could crash the connected backend by alternating
+      rejected SSL and GSS encryption requests indefinitely.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks Calif.io
+      (in collaboration with Claude and Anthropic Research) for reporting
+      this problem.
+      (CVE-2026-6479)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [46593aea0] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [e1c30458a] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [fe2720c45] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [cfb610eaa] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [bfc5cea76] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [61a9b4b6e] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c55cea529] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [01e568b8c] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [01b5ef7df] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [aff71f87b] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [4032c9d98] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [e31ef0720] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [0dc1fdc75] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [f3cee4dc4] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [e3a2bea41] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [a4f089c79] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [7fdb0907e] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [39bc8f2ca] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [b2869ebc4] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [dd8af778d] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [26dd3cac2] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [c25973124] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [fb0bc321d] 2026-05-11 05:13:51 -0700
+Branch: REL_14_STABLE [bcfd848e7] 2026-05-11 05:13:51 -0700
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [6a985e71e] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [55328e3a9] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [87357a606] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [32c525eb6] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [137013f60] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [986753361] 2026-05-11 05:13:51 -0700
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [6d68fcb28] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [67dd6243d] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [3c41f5534] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [e24fb3247] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [e49e9590d] 2026-05-11 05:13:51 -0700
+Branch: REL_14_STABLE [8e81995de] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [066b7b144] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [8d1489d50] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [ebcfa7867] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [f20b84081] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [b11c3eadf] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [3e0eba196] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL_18_STABLE [c7fb9f765] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [00e243e67] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [924b3e943] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [d75b1dc96] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [37842f3dc] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL_17_STABLE [e5babf754] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [47dae5e74] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [d106295b6] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [6a423a256] 2026-05-11 05:13:51 -0700
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [c3f7dde39] 2026-05-11 21:27:55 +0300
+Branch: REL_18_STABLE [3fbec9e50] 2026-05-11 21:28:46 +0300
+Branch: REL_17_STABLE [8e909812d] 2026-05-11 21:28:57 +0300
+Branch: REL_16_STABLE [e42598a41] 2026-05-11 21:29:08 +0300
+Branch: REL_15_STABLE [dc6c85ff4] 2026-05-11 21:29:18 +0300
+Branch: REL_14_STABLE [c9447b8bd] 2026-05-11 21:29:27 +0300
+-->
+     <para>
+      Fix assorted integer overflows in memory-allocation calculations
+      (Tom Lane, Nathan Bossart, Heikki Linnakangas)
+      <ulink url="&commit_baseurl;e1c30458a">&sect;</ulink>
+      <ulink url="&commit_baseurl;01e568b8c">&sect;</ulink>
+      <ulink url="&commit_baseurl;f3cee4dc4">&sect;</ulink>
+      <ulink url="&commit_baseurl;dd8af778d">&sect;</ulink>
+      <ulink url="&commit_baseurl;55328e3a9">&sect;</ulink>
+      <ulink url="&commit_baseurl;67dd6243d">&sect;</ulink>
+      <ulink url="&commit_baseurl;8d1489d50">&sect;</ulink>
+      <ulink url="&commit_baseurl;c7fb9f765">&sect;</ulink>
+      <ulink url="&commit_baseurl;3fbec9e50">&sect;</ulink>
+     </para>
+
+     <para>
+      Various places were incautious about the possibility of integer
+      overflow in calculations of how much memory to allocate.  Overflow
+      would lead to allocating a too-small buffer which the caller would
+      then write past the end of.  This would at least trigger server
+      crashes, and probably could be exploited for arbitrary code
+      execution.  In many but by no means all cases, the hazard exists
+      only in 32-bit builds.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks Xint Code,
+      Bruce Dang, Sven Klemm, and Pavel Kohout for reporting these problems.
+      (CVE-2026-6473)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [d389415ff] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [c2e44c370] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [d7de7fa84] 2026-05-11 05:13:49 -0700
+-->
+     <para>
+      Properly quote subscription names
+      in <application>pg_createsubscriber</application> (Nathan Bossart)
+      <ulink url="&commit_baseurl;c2e44c370">&sect;</ulink>
+     </para>
+
+     <para>
+      The given subscription name was inserted into SQL commands without
+      quoting, so that SQL injection could be achieved in the (perhaps
+      unlikely) case that the subscription name comes from an untrusted
+      source.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Yu Kunpeng for reporting this problem.
+      (CVE-2026-6476)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [46b4f5c11] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [cb35d7306] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [f0f59b658] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [248a433cd] 2026-05-11 05:13:50 -0700
+-->
+     <para>
+      Properly quote object names in logical replication origin checks
+      (Pavel Kohout)
+      <ulink url="&commit_baseurl;cb35d7306">&sect;</ulink>
+     </para>
+
+     <para>
+      <command>ALTER SUBSCRIPTION ... REFRESH PUBLICATION</command>
+      interpolated schema and relation names into SQL commands without
+      quoting them, allowing execution of arbitrary SQL on the publisher.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Pavel Kohout for reporting this problem.
+      (CVE-2026-6638)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [d388e1d7f] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [62ad26266] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [3ed3dbbf4] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [5919e0005] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [7fe365693] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [2d267ffc4] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Reject over-length options in <function>ts_headline()</function>
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;62ad26266">&sect;</ulink>
+     </para>
+
+     <para>
+      The <literal>StartSel</literal>, <literal>StopSel</literal>
+      and <literal>FragmentDelimiter</literal> strings must not exceed
+      32Kb in length, but this was not checked for.  An over-length value
+      would typically crash the server.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Xint Code for reporting this problem.
+      (CVE-2026-6473)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [6d6348f03] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [661095c40] 2026-05-11 05:13:47 -0700
+-->
+     <para>
+      Detect faulty input when restoring attribute MCV statistics
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;661095c40">&sect;</ulink>
+     </para>
+
+     <para>
+      The statistics restore functions were insufficiently careful about
+      validating most-common-value statistics, and would accept values
+      that could crash the planner later on.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Jeroen Gui for reporting this problem.
+      (CVE-2026-6575)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [76ab76f87] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [ba27389c2] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [4197c880c] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [24e0e3254] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [126a236ba] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [a50ae8306] 2026-05-11 05:13:51 -0700
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ec8ded4b3] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [c6e7a9ef3] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [a386d14fe] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [79b7847c7] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [c3fff3950] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [2c8226f52] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Guard against malicious time zone names
+      in <function>timeofday()</function>
+      and <function>pg_strftime()</function> (Tom Lane)
+      <ulink url="&commit_baseurl;ba27389c2">&sect;</ulink>
+      <ulink url="&commit_baseurl;c6e7a9ef3">&sect;</ulink>
+     </para>
+
+     <para>
+      A crafted time zone setting could pass <literal>%</literal>
+      sequences to <function>snprintf()</function>, potentially causing
+      crashes or disclosure of server memory.  Another path to similar
+      results was to overflow the limited-size output buffer used
+      by <function>pg_strftime()</function>.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Xint Code for reporting this problem.
+      (CVE-2026-6474)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [4793fc41f] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [a44780f41] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [c27ba08cd] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [d92852d62] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [08c397b02] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [8bca85e9f] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      When creating a multirange type, ensure the user
+      has <literal>CREATE</literal> privilege on the schema specified for
+      the multirange type (Jelte Fennema-Nio)
+      <ulink url="&commit_baseurl;a44780f41">&sect;</ulink>
+     </para>
+
+     <para>
+      The multirange type can be put into a different schema than its
+      parent range type, but we neglected to apply the required privilege
+      check when doing so.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Jelte Fennema-Nio for reporting this problem.
+      (CVE-2026-6472)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [5924e256c] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [d93ef4131] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [c4e7435b3] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [00e27235e] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [c95275f18] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [4608619a1] 2026-05-11 05:13:51 -0700
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: REL_17_STABLE [8e34acfda] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [1604939b2] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [9dcfcb92f] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [b282280e9] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Use timing-safe string comparisons in authentication code
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;d93ef4131">&sect;</ulink>
+     </para>
+
+     <para>
+      Use <function>timingsafe_bcmp()</function> instead
+      of <function>memcpy()</function> or <function>strcmp()</function>
+      when checking passwords, hashes, etc.  It is not known whether the
+      data dependency of those functions is usefully exploitable in any of
+      these places, but in the interests of safety, replace them.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Joe Conway for reporting this problem.
+      (CVE-2026-6478)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [bd4811493] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [be0136440] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [d88c7be15] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [614474996] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [e3a1f83ea] 2026-05-11 05:13:51 -0700
+Branch: REL_14_STABLE [8ac723b2b] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Mark <function>PQfn()</function> as unsafe, and avoid using it
+      within <application>libpq</application> (Nathan Bossart)
+      <ulink url="&commit_baseurl;be0136440">&sect;</ulink>
+     </para>
+
+     <para>
+      For a non-integral result type, <function>PQfn()</function> is not
+      passed the size of the output buffer, so it cannot check that the
+      data returned by the server will fit.  A malicious server could
+      therefore overwrite client memory.  This is unfixable without an
+      API change, so mark the function as deprecated.  Internally
+      to <application>libpq</application>, use a variant version that can
+      apply the missing check.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Yu Kunpeng and Martin Heistermann for reporting this problem.
+      (CVE-2026-6477)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [a1063eece] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [6a67c540a] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [8f881e188] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [6778af13e] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [0c83fe8e4] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [498829dca] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Prevent path traversal in <application>pg_basebackup</application>
+      and <application>pg_rewind</application> (Michael Paquier)
+      <ulink url="&commit_baseurl;6a67c540a">&sect;</ulink>
+     </para>
+
+     <para>
+      These applications failed to validate output file paths read from
+      their input, so that a malicious source could overwrite any file
+      writable by these applications.  Constrain where data can be written
+      by rejecting paths that are absolute or contain parent-directory
+      references.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks XlabAI Team
+      of Tencent Xuanwu Lab and Valery Gubanov for reporting this problem.
+      (CVE-2026-6475)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [43451a7a2] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [c5790ec4f] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [c4d04cc48] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [5c1069c35] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [84a9f2641] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [074702525] 2026-05-11 05:13:51 -0700
+Branch: master [906ea101d] 2026-05-11 12:12:03 -0400
+Branch: REL_18_STABLE [05e73b5c3] 2026-05-11 12:12:03 -0400
+Branch: REL_17_STABLE [2b429d887] 2026-05-11 12:12:03 -0400
+Branch: REL_16_STABLE [6f0bff33d] 2026-05-11 12:12:03 -0400
+Branch: REL_15_STABLE [fc1fd3d97] 2026-05-11 12:12:03 -0400
+Branch: REL_14_STABLE [479823a71] 2026-05-11 12:12:03 -0400
+-->
+     <para>
+      Guard against field overflow
+      within <filename>contrib/intarray</filename>'s <type>query_int</type>
+      type and <filename>contrib/ltree</filename>'s <type>ltxtquery</type>
+      type (Tom Lane)
+      <ulink url="&commit_baseurl;c5790ec4f">&sect;</ulink>
+      <ulink url="&commit_baseurl;05e73b5c3">&sect;</ulink>
+     </para>
+
+     <para>
+      Parsing of these query structures did not check for overflow of
+      16-bit fields, so that construction of an invalid query tree was
+      possible.  This can crash the server when executing the query.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Xint Code for reporting this problem.
+      (CVE-2026-6473)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [2f1b16e86] 2026-05-11 05:13:46 -0700
+Branch: REL_18_STABLE [7f019f341] 2026-05-11 05:13:47 -0700
+Branch: REL_17_STABLE [8c3426110] 2026-05-11 05:13:48 -0700
+Branch: REL_16_STABLE [6b6b26fde] 2026-05-11 05:13:49 -0700
+Branch: REL_15_STABLE [9c2fa5b6a] 2026-05-11 05:13:50 -0700
+Branch: REL_14_STABLE [b545c3787] 2026-05-11 05:13:51 -0700
+-->
+     <para>
+      Guard against overly long values
+      of <filename>contrib/ltree</filename>'s <type>lquery</type> type
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;7f019f341">&sect;</ulink>
+     </para>
+
+     <para>
+      Values with more than 64K items caused internal overflows,
+      potentially resulting in stack smashes or wrong answers.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Vergissmeinnicht, A1ex, and Jihe Wang
+      for reporting this problem.
+      (CVE-2026-6473)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [260e97733] 2026-05-11 05:13:47 -0700
+Branch: REL_18_STABLE [1ebda7da9] 2026-05-11 05:13:48 -0700
+Branch: REL_17_STABLE [2dc64ef28] 2026-05-11 05:13:49 -0700
+Branch: REL_16_STABLE [710995782] 2026-05-11 05:13:50 -0700
+Branch: REL_15_STABLE [8053235ab] 2026-05-11 05:13:51 -0700
+Branch: REL_14_STABLE [2b026df29] 2026-05-11 05:13:52 -0700
+-->
+     <para>
+      Prevent SQL injection and buffer overruns
+      in <filename>contrib/spi</filename> (Nathan Bossart)
+      <ulink url="&commit_baseurl;1ebda7da9">&sect;</ulink>
+     </para>
+
+     <para>
+      <function>check_foreign_key()</function> was insufficiently careful
+      about quoting key values, and also used fixed-length buffers for
+      constructing queries.  While this module is only meant as example
+      code, it still shouldn't contain such dangerous errors.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Nikolay Samokhvalov for reporting this problem.
+      (CVE-2026-6637)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [f76686ce7] 2026-05-01 11:13:50 +0900
+Branch: REL_18_STABLE [e8fd5e579] 2026-05-01 11:16:36 +0900
+Branch: master [ba82de48e] 2026-05-08 10:57:50 +0900
+Branch: REL_18_STABLE [1132af22c] 2026-05-08 10:59:13 +0900
+Branch: master [a1b754558] 2026-05-08 12:45:51 +0900
+Branch: REL_18_STABLE [5c214b58b] 2026-05-08 12:47:26 +0900
+Branch: master [5a55ea507] 2026-05-05 10:22:53 +0900
+Branch: REL_18_STABLE [b62f514ac] 2026-05-05 10:26:17 +0900
+Branch: REL_17_STABLE [d0e73bb18] 2026-05-05 10:28:24 +0900
+Branch: REL_16_STABLE [748fe9e60] 2026-05-05 10:30:37 +0900
+Branch: REL_15_STABLE [872c9fae7] 2026-05-05 10:32:25 +0900
+Branch: REL_14_STABLE [8395446df] 2026-05-05 10:33:47 +0900
+Branch: master [574581b50] 2026-05-05 10:23:31 +0900
+Branch: REL_18_STABLE [bed3ffbf9] 2026-05-05 10:27:06 +0900
+Branch: REL_17_STABLE [13226050e] 2026-05-05 10:29:01 +0900
+Branch: REL_16_STABLE [5a24cef08] 2026-05-05 10:31:17 +0900
+Branch: REL_15_STABLE [bab4f7fa5] 2026-05-05 10:32:42 +0900
+Branch: REL_14_STABLE [172034f6e] 2026-05-05 10:34:07 +0900
+-->
+     <para>
+      Check for nondeterministic collations before assuming that an
+      equality condition on a collatable type implies uniqueness
+      (Richard Guo)
+      <ulink url="&commit_baseurl;e8fd5e579">&sect;</ulink>
+      <ulink url="&commit_baseurl;1132af22c">&sect;</ulink>
+      <ulink url="&commit_baseurl;5c214b58b">&sect;</ulink>
+      <ulink url="&commit_baseurl;b62f514ac">&sect;</ulink>
+      <ulink url="&commit_baseurl;bed3ffbf9">&sect;</ulink>
+     </para>
+
+     <para>
+      Numerous planner optimizations assume that, for example, at most one
+      table row can satisfy <literal>WHERE x = 'abc'</literal> if there is
+      a unique index on <literal>x</literal>.  However this conclusion is
+      unsafe in general if the index and the <literal>WHERE</literal>
+      clause have different collations attached.  It is safe when both
+      collations are deterministic, because that property essentially
+      requires that equality of two strings means bitwise equality.  But
+      nondeterministic collations don't act that way, so that optimizing
+      on the assumption of unique matches can give wrong query answers if
+      either the <literal>WHERE</literal> clause or the index has a
+      nondeterministic collation.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [cfcd57111] 2026-04-20 14:48:23 -0400
+Branch: REL_18_STABLE [16fb94605] 2026-04-20 14:48:23 -0400
+Branch: REL_17_STABLE [766d40286] 2026-04-20 14:48:23 -0400
+Branch: REL_16_STABLE [d509be4ac] 2026-04-20 14:48:23 -0400
+Branch: master [f0ac6d494] 2026-04-20 19:24:52 -0400
+Branch: REL_17_STABLE [53cb4ec1d] 2026-04-20 19:24:46 -0400
+Branch: REL_16_STABLE [798dabe83] 2026-04-20 19:24:46 -0400
+-->
+     <para>
+      Fix incomplete removal of relation references
+      in <literal>RestrictInfo</literal> structs during join removal
+      (Tom Lane)
+      <ulink url="&commit_baseurl;16fb94605">&sect;</ulink>
+     </para>
+
+     <para>
+      This oversight has been shown to result in planner failures such as
+      unexpected <quote>FULL JOIN is only supported with merge-joinable or
+      hash-joinable join conditions</quote> errors.  It may also have
+      caused failure to consider valid plans in other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [c1408956e] 2026-04-09 16:41:31 +0900
+Branch: REL_18_STABLE [8e8b2bef7] 2026-04-09 16:43:28 +0900
+-->
+     <para>
+      Improve planner's matching of partition key columns to sub-query
+      outputs (Richard Guo)
+      <ulink url="&commit_baseurl;8e8b2bef7">&sect;</ulink>
+     </para>
+
+     <para>
+      Strip no-op PlaceHolderVars from operands before comparing them to
+      partition keys.  This change enables partition pruning to succeed in
+      some cases where it previously failed to recognize that a partition
+      need not be scanned.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alexander Korotkov <akorotkov@postgresql.org>
+Branch: master [07b7a964d] 2026-03-20 15:46:30 +0200
+Branch: REL_18_STABLE [e8b9d6497] 2026-03-20 15:47:11 +0200
+-->
+     <para>
+      Fix self-join removal to handle join clauses that are bare boolean
+      columns, e.g. <literal>ON t1.boolcol</literal> (Andrei Lepikhov,
+      Tender Wang, Alexander Korotkov)
+      <ulink url="&commit_baseurl;e8b9d6497">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously such a case led to a <quote>no relation entry
+      for relid <replaceable>N</replaceable></quote> error.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [5548a969b] 2026-04-22 11:50:17 +0100
+Branch: REL_18_STABLE [f3d03fbd5] 2026-04-22 11:50:18 +0100
+-->
+     <para>
+      Fix <literal>UPDATE/DELETE ... WHERE CURRENT OF</literal> to work on
+      tables with virtual generated columns (Satyanarayana Narlapuram,
+      Dean Rasheed)
+      <ulink url="&commit_baseurl;f3d03fbd5">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [783425175] 2026-04-22 09:03:44 +0100
+Branch: REL_18_STABLE [cf38dedf6] 2026-04-22 09:03:44 +0100
+-->
+     <para>
+      Fix expansion of virtual generated columns
+      in <literal>EXCLUDED</literal> column references in <literal>INSERT
+      ... ON CONFLICT</literal> (Satyanarayana Narlapuram, Dean Rasheed)
+      <ulink url="&commit_baseurl;cf38dedf6">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [c6a79be3f] 2026-04-21 14:28:26 +0900
+Branch: REL_18_STABLE [e528bfe97] 2026-04-21 14:29:33 +0900
+Branch: REL_17_STABLE [9d6208939] 2026-04-21 14:31:15 +0900
+Branch: REL_16_STABLE [07b257189] 2026-04-21 14:33:07 +0900
+Branch: REL_15_STABLE [7062bd577] 2026-04-21 14:33:57 +0900
+Branch: REL_14_STABLE [8e39951be] 2026-04-21 14:35:43 +0900
+-->
+     <para>
+      Fix incorrect handling of <literal>NEW</literal> generated columns
+      in rule actions and rule qualifications (Richard Guo, Dean Rasheed)
+      <ulink url="&commit_baseurl;e528bfe97">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, such column references would produce NULL
+      in <literal>INSERT</literal> cases, or be equivalent to
+      the <literal>OLD</literal> value in <literal>UPDATE</literal> cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [570e2fcc0] 2026-03-24 06:28:33 -0400
+Branch: REL_18_STABLE [cceb9c18a] 2026-03-24 06:28:32 -0400
+-->
+     <para>
+      Fix spurious <quote>indexes on virtual generated columns are not
+      supported</quote> errors (Robert Haas)
+      <ulink url="&commit_baseurl;cceb9c18a">&sect;</ulink>
+     </para>
+
+     <para>
+      Creation of an expression index could sometimes incorrectly report
+      this error.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL_18_STABLE [11c2c0cc8] 2026-04-06 14:22:17 -0400
+Branch: REL_17_STABLE [681a91d29] 2026-04-06 14:22:17 -0400
+Branch: REL_16_STABLE [3c7a6bbe6] 2026-04-06 14:22:17 -0400
+Branch: REL_15_STABLE [07e833e3c] 2026-04-06 14:22:17 -0400
+Branch: REL_14_STABLE [40fa04e7c] 2026-04-06 14:22:17 -0400
+-->
+     <para>
+      Fix spurious <quote>generated columns are not supported in COPY FROM
+      WHERE conditions</quote> errors (Tom Lane)
+      <ulink url="&commit_baseurl;11c2c0cc8">&sect;</ulink>
+     </para>
+
+     <para>
+      Use of a system column in a <literal>COPY FROM WHERE</literal>
+      condition could sometimes incorrectly report this error.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alexander Korotkov <akorotkov@postgresql.org>
+Branch: master [177037341] 2026-03-05 19:49:28 +0200
+Branch: REL_18_STABLE [13fab378e] 2026-03-05 19:50:06 +0200
+Branch: REL_17_STABLE [2dcac93c0] 2026-03-05 19:56:42 +0200
+Branch: REL_16_STABLE [f6e63d4b8] 2026-03-05 20:02:08 +0200
+Branch: REL_15_STABLE [8bfaae6fb] 2026-03-05 19:57:32 +0200
+-->
+     <para>
+      Correctly report a serialization failure
+      when <command>MERGE</command> encounters a concurrently-updated
+      tuple in repeatable-read or serializable mode (Tender Wang)
+      <ulink url="&commit_baseurl;13fab378e">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, such cases behaved the same as in lower isolation
+      levels.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [6cf49e804] 2026-04-30 11:04:57 -0400
+Branch: REL_18_STABLE [149c875fc] 2026-04-30 11:05:29 -0400
+Branch: REL_17_STABLE [a0104b447] 2026-04-30 11:14:37 -0400
+Branch: REL_16_STABLE [7bb519635] 2026-04-30 11:14:26 -0400
+Branch: REL_15_STABLE [76d15a7ee] 2026-04-30 11:14:12 -0400
+Branch: REL_14_STABLE [81b56b47c] 2026-04-30 11:13:50 -0400
+-->
+     <para>
+      Fix <literal>CREATE TABLE ... LIKE ... INCLUDING
+      STATISTICS</literal> for cases where the source table has dropped
+      column(s) (Julien Tachoires)
+      <ulink url="&commit_baseurl;149c875fc">&sect;</ulink>
+     </para>
+
+     <para>
+      In such cases, extended statistics objects could be copied
+      incorrectly, or the command could give an incorrect error.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [9d3e094f1] 2026-04-22 10:32:10 +0900
+Branch: REL_18_STABLE [5713ac248] 2026-04-22 10:34:33 +0900
+Branch: REL_17_STABLE [becf6d269] 2026-04-22 10:34:35 +0900
+Branch: REL_16_STABLE [313355d68] 2026-04-22 10:34:37 +0900
+Branch: REL_15_STABLE [0859000d0] 2026-04-22 10:34:38 +0900
+Branch: REL_14_STABLE [d809b16d1] 2026-04-22 10:34:40 +0900
+-->
+     <para>
+      Allow <literal>ALTER INDEX ... ATTACH PARTITION</literal> to mark
+      the parent index valid if appropriate (Sami Imseih)
+      <ulink url="&commit_baseurl;5713ac248">&sect;</ulink>
+     </para>
+
+     <para>
+      There are edge cases in which a partitioned index might remain
+      marked as invalid even when all its leaf indexes are valid.  This
+      change provides a mechanism whereby a user can correct such a
+      situation without resorting to manual catalog updates.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [e7975f1c0] 2026-03-20 14:38:50 +0100
+Branch: REL_18_STABLE [6958077ce] 2026-03-20 14:38:50 +0100
+-->
+     <para>
+      Fix <literal>ALTER TABLE ... SET NOT NULL</literal> to invoke
+      object-access hook functions only after completing the catalog
+      change (Artur Zakirov)
+      <ulink url="&commit_baseurl;6958077ce">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [703fee3b2] 2026-03-19 15:07:43 -0700
+Branch: REL_18_STABLE [c11f87b1a] 2026-03-19 14:59:30 -0700
+Branch: REL_17_STABLE [876fa84a2] 2026-03-19 15:02:18 -0700
+Branch: REL_16_STABLE [a19edb66a] 2026-03-19 15:00:58 -0700
+Branch: REL_15_STABLE [3a35ab1d0] 2026-03-19 15:01:22 -0700
+Branch: REL_14_STABLE [c6f369e58] 2026-03-19 15:01:45 -0700
+-->
+     <para>
+      Fix <command>ALTER FOREIGN DATA WRAPPER</command> to not drop the
+      wrapper object's dependency on its handler function (Jeff Davis)
+      <ulink url="&commit_baseurl;c11f87b1a">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [2497dac55] 2026-03-30 14:37:33 +0900
+Branch: REL_18_STABLE [5db5e3396] 2026-03-30 14:38:58 +0900
+-->
+     <para>
+      Fix loss of deferrability of foreign-key triggers (Yasuo Honda)
+      <ulink url="&commit_baseurl;5db5e3396">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, a foreign key defined as <literal>DEFERRABLE INITIALLY
+      DEFERRED</literal> would behave as <literal>NOT DEFERRABLE</literal>
+      after being set to <literal>NOT ENFORCED</literal> status and then
+      back to <literal>ENFORCED</literal>.
+     </para>
+
+     <para>
+      If you have a foreign key with this problem, it can be repaired
+      (after installing this update) by again setting it to <literal>NOT
+      ENFORCED</literal> and then back to <literal>ENFORCED</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [4edd6036d] 2026-04-07 14:45:37 -0400
+Branch: REL_18_STABLE [49f3cb453] 2026-04-07 14:45:33 -0400
+-->
+     <para>
+      Fix <literal>WITHOUT OVERLAPS</literal> to allow domains (Jian He)
+      <ulink url="&commit_baseurl;49f3cb453">&sect;</ulink>
+     </para>
+
+     <para>
+      <literal>UNIQUE/PRIMARY KEY ... WITHOUT OVERLAPS</literal> requires
+      the no-overlap column to be a range or multirange, but it should
+      allow a domain over such a type too.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [dd4069197] 2026-04-23 21:28:11 +0300
+Branch: REL_18_STABLE [ff8f27d6e] 2026-04-23 21:28:59 +0300
+Branch: REL_17_STABLE [54343f6f9] 2026-04-23 21:31:32 +0300
+Branch: REL_16_STABLE [06e304524] 2026-04-23 21:33:02 +0300
+Branch: REL_15_STABLE [34ebeb15c] 2026-04-23 21:33:25 +0300
+Branch: REL_14_STABLE [c7a1d5fc6] 2026-04-23 21:33:39 +0300
+-->
+     <para>
+      Disallow making a composite type be a member of itself via a
+      multirange (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;ff8f27d6e">&sect;</ulink>
+     </para>
+
+     <para>
+      We already forbade such cases when the intermediate type is a
+      domain, array, composite type, or range; but multiranges were
+      overlooked.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [0d866282b] 2026-03-30 16:14:34 +1300
+Branch: REL_18_STABLE [49315de0c] 2026-03-30 16:16:09 +1300
+Branch: REL_17_STABLE [d29808e35] 2026-03-30 16:16:39 +1300
+Branch: REL_16_STABLE [1bd90c887] 2026-03-30 16:17:14 +1300
+Branch: REL_15_STABLE [6b2e091f0] 2026-03-30 16:17:39 +1300
+Branch: REL_14_STABLE [6ce5c310b] 2026-03-30 16:18:13 +1300
+-->
+     <para>
+      Fix datum-image comparisons to be insensitive to sign-extension
+      variations (David Rowley)
+      <ulink url="&commit_baseurl;49315de0c">&sect;</ulink>
+     </para>
+
+     <para>
+      This fixes some situations that previously led to <quote>could not
+      find memoization table entry</quote> errors or wrong query results.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [94219a73f] 2026-04-24 14:03:12 +1200
+Branch: REL_18_STABLE [035c520db] 2026-04-24 14:03:41 +1200
+Branch: REL_17_STABLE [3fda3e12f] 2026-04-24 14:04:05 +1200
+Branch: REL_16_STABLE [a2a0060d5] 2026-04-24 14:04:31 +1200
+Branch: REL_15_STABLE [622f8b530] 2026-04-24 14:04:55 +1200
+Branch: REL_14_STABLE [109de35b7] 2026-04-24 14:05:23 +1200
+-->
+     <para>
+      Fix incorrect logic for hashed <literal>IN</literal>/<literal>NOT
+      IN</literal> with non-strict equality operator (Chengpeng Yan)
+      <ulink url="&commit_baseurl;035c520db">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous coding could crash or give wrong answers.  All built-in
+      data types have strict equality operators, so that this issue could
+      only arise with an extension data type.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a50777680] 2026-04-22 12:41:00 -0400
+Branch: REL_18_STABLE [580e7be88] 2026-04-22 12:41:00 -0400
+Branch: REL_17_STABLE [c97a28618] 2026-04-22 12:41:00 -0400
+Branch: REL_16_STABLE [e1e60f148] 2026-04-22 12:41:01 -0400
+Branch: REL_15_STABLE [f60d25986] 2026-04-22 12:41:01 -0400
+Branch: REL_14_STABLE [8a6f08c0c] 2026-04-22 12:41:01 -0400
+-->
+     <para>
+      Truncate overly-long locale-specific numeric symbols
+      in <function>to_char()</function> (Tom Lane)
+      <ulink url="&commit_baseurl;580e7be88">&sect;</ulink>
+     </para>
+
+     <para>
+      If a locale specified a currency symbol, thousands separator, or
+      decimal or sign symbol more than 8 bytes long, a buffer overrun was
+      possible.  No such locales exist in the real world, and it's
+      impractical for an unprivileged attacker to install a malicious
+      locale definition underneath a Postgres server; but for safety's
+      sake check for overlength symbols and truncate if needed.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d7970e7e9] 2026-04-22 12:02:15 -0400
+Branch: REL_18_STABLE [00c6e0819] 2026-04-22 12:02:15 -0400
+Branch: REL_17_STABLE [ea5f0d176] 2026-04-22 12:02:15 -0400
+Branch: REL_16_STABLE [42383d32d] 2026-04-22 12:02:15 -0400
+Branch: REL_15_STABLE [0b196d3db] 2026-04-22 12:02:15 -0400
+Branch: REL_14_STABLE [21a24d709] 2026-04-22 12:02:15 -0400
+Branch: master [844bb90d4] 2026-04-22 10:47:56 -0400
+Branch: REL_18_STABLE [c2bfeb3bb] 2026-04-22 11:04:35 -0400
+Branch: REL_17_STABLE [a5426dbf8] 2026-04-22 11:05:51 -0400
+Branch: REL_16_STABLE [17f72e037] 2026-04-22 11:06:47 -0400
+Branch: REL_15_STABLE [f852c9093] 2026-04-22 11:09:02 -0400
+Branch: REL_14_STABLE [6cae0c2bd] 2026-04-22 11:09:21 -0400
+-->
+     <para>
+      Prevent buffer overruns when parsing an affix file for
+      an <literal>Ispell</literal> dictionary (Tom Lane)
+      <ulink url="&commit_baseurl;00c6e0819">&sect;</ulink>
+      <ulink url="&commit_baseurl;c2bfeb3bb">&sect;</ulink>
+     </para>
+
+     <para>
+      A corrupt or malicious affix file could crash the server.
+      This is not considered a security issue because text search
+      configuration files are presumed trustworthy, but it still seems
+      worth fixing.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [8b6c89e37] 2026-04-09 19:28:33 +0900
+Branch: REL_18_STABLE [bfc7dff26] 2026-04-09 19:30:37 +0900
+Branch: REL_17_STABLE [f8736f8bc] 2026-04-09 19:32:09 +0900
+Branch: REL_16_STABLE [0fe032e6a] 2026-04-09 19:34:02 +0900
+Branch: REL_15_STABLE [4da71fc37] 2026-04-09 19:35:08 +0900
+Branch: REL_14_STABLE [305cf0df0] 2026-04-09 19:36:13 +0900
+-->
+     <para>
+      Guard against integer overflow in calculations of frame start and
+      end positions for window aggregates (Richard Guo)
+      <ulink url="&commit_baseurl;bfc7dff26">&sect;</ulink>
+     </para>
+
+     <para>
+      Very large user-specified offsets (close to INT64_MAX) could result
+      in errors or incorrect query results.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6582010c8] 2026-04-06 13:14:53 -0400
+Branch: REL_18_STABLE [14bf2c39e] 2026-04-06 13:14:50 -0400
+Branch: REL_17_STABLE [d6c9432cb] 2026-04-06 13:14:50 -0400
+Branch: REL_16_STABLE [bb959269e] 2026-04-06 13:14:50 -0400
+-->
+     <para>
+      Fix <function>array_agg_array_combine()</function> to combine the
+      arrays' null bitmaps correctly (Dmytro Astapov)
+      <ulink url="&commit_baseurl;14bf2c39e">&sect;</ulink>
+     </para>
+
+     <para>
+      This mistake resulted in sometimes-incorrect output from
+      parallelized <function>array_agg(anyarray)</function> calculations.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [5941e7f09] 2026-04-30 18:44:38 +0900
+Branch: REL_18_STABLE [6cb307251] 2026-04-30 18:44:41 +0900
+Branch: REL_17_STABLE [5499be332] 2026-04-30 18:44:43 +0900
+Branch: REL_16_STABLE [3b35c10a4] 2026-04-30 18:44:45 +0900
+-->
+     <para>
+      Retry <function>sync_file_range()</function> if it returns error
+      code <literal>EINTR</literal> (DaeMyung Kang)
+      <ulink url="&commit_baseurl;6cb307251">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [80156cee0] 2026-04-11 17:02:52 +0900
+Branch: REL_18_STABLE [b081c5b07] 2026-04-11 17:03:04 +0900
+Branch: REL_17_STABLE [a4fefb3e0] 2026-04-11 17:03:06 +0900
+Branch: REL_16_STABLE [c7cdcbd3e] 2026-04-11 17:03:08 +0900
+Branch: REL_15_STABLE [c6d3f0585] 2026-04-11 17:03:10 +0900
+-->
+     <para>
+      Fix incorrect behavior
+      of <function>pg_stat_reset_single_table_counters()</function> on a
+      shared catalog (Chao Li)
+      <ulink url="&commit_baseurl;b081c5b07">&sect;</ulink>
+     </para>
+
+     <para>
+      Such cases had a side-effect of resetting the
+      current database's <literal>stat_reset_timestamp</literal>, which
+      was unintended.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [090c4297e] 2026-04-20 10:31:11 +0530
+Branch: REL_18_STABLE [44c8dc280] 2026-04-20 10:23:22 +0530
+Branch: REL_17_STABLE [88d7fdcc9] 2026-04-20 10:17:47 +0530
+Branch: REL_16_STABLE [d052f6c7d] 2026-04-20 10:13:55 +0530
+-->
+     <para>
+      Update activity statistics when a parallel apply worker is idle
+      (Zhijie Hou)
+      <ulink url="&commit_baseurl;44c8dc280">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, statistics from a recently-completed transaction might
+      go unreported for long intervals, particularly if the workload is
+      light.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [77d0e82e5] 2026-04-11 16:38:47 +0900
+Branch: REL_18_STABLE [13e20d1c9] 2026-04-11 16:40:34 +0900
+Branch: REL_17_STABLE [93ed18720] 2026-04-11 16:41:58 +0900
+-->
+     <para>
+      Fix <quote>no relation entry for relid 0</quote> failure while
+      estimating array lengths in set operations (Tender Wang)
+      <ulink url="&commit_baseurl;13e20d1c9">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [2b5ba2a0a] 2026-04-10 07:13:08 -0400
+Branch: REL_18_STABLE [c3e436b1c] 2026-04-10 10:28:00 -0400
+Branch: REL_17_STABLE [c05c3baf1] 2026-04-10 10:27:43 -0400
+Branch: REL_16_STABLE [e630f65d0] 2026-04-10 10:27:16 -0400
+Branch: REL_15_STABLE [c88ad3a21] 2026-04-10 10:26:50 -0400
+Branch: REL_14_STABLE [de32a01e7] 2026-04-10 10:22:48 -0400
+-->
+     <para>
+      Fix buffer overread when <function>pglz_decompress()</function>
+      receives corrupt input (Andrew Dunstan)
+      <ulink url="&commit_baseurl;c3e436b1c">&sect;</ulink>
+     </para>
+
+     <para>
+      It was possible to read a few bytes past the end of the input, which
+      in very unlucky cases might cause a crash.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [2478bd5db] 2026-04-10 07:13:08 -0400
+Branch: REL_18_STABLE [3e4955630] 2026-04-10 10:21:38 -0400
+Branch: REL_17_STABLE [2e373785e] 2026-04-10 10:21:39 -0400
+-->
+     <para>
+      Fix incremental JSON parser's handling of numeric tokens that cross
+      input buffer boundaries (Andrew Dunstan)
+      <ulink url="&commit_baseurl;3e4955630">&sect;</ulink>
+     </para>
+
+     <para>
+      It was possible to accept an incorrectly-formatted number, leading
+      to failures later.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [ffc226ab6] 2026-03-09 06:45:32 -0400
+Branch: REL_18_STABLE [9540c0e5d] 2026-03-09 06:46:20 -0400
+Branch: REL_17_STABLE [076bc57fa] 2026-03-09 06:55:10 -0400
+-->
+     <para>
+      Prevent bloating relation visibility maps during restore of an
+      incremental backup (Robert Haas)
+      <ulink url="&commit_baseurl;9540c0e5d">&sect;</ulink>
+     </para>
+
+     <para>
+      Restore could append many blocks of zeroes to a visibility map, due
+      to incorrect computation of the expected file length.  This does not
+      result in data corruption, but it could waste a substantial amount
+      of disk space.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [dbf217c1c] 2026-04-22 10:22:44 -0700
+Branch: REL_18_STABLE [03c4f243e] 2026-04-22 10:23:44 -0700
+Branch: REL_17_STABLE [9dda30dd3] 2026-04-22 10:23:54 -0700
+-->
+     <para>
+      Use C collation, not the database's default collation, in catalog
+      cache lookups on text columns (Jeff Davis)
+      <ulink url="&commit_baseurl;03c4f243e">&sect;</ulink>
+     </para>
+
+     <para>
+      This avoids failures in edge cases such as physical replication
+      startup, where there is no identified database so that a default
+      collation cannot be determined.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [db93032a7] 2026-04-08 11:22:21 +0900
+Branch: REL_18_STABLE [58c1188a3] 2026-04-08 11:23:13 +0900
+Branch: REL_17_STABLE [15910b1c3] 2026-04-08 11:24:00 +0900
+Branch: REL_18_STABLE [acf49bfed] 2026-04-09 15:25:40 +0900
+Branch: REL_17_STABLE [586f4266f] 2026-04-09 15:30:59 +0900
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [1362bc33e] 2025-12-11 03:49:28 +0000
+Branch: REL_18_STABLE [94efd308b] 2026-04-08 11:19:31 +0900
+Branch: REL_17_STABLE [4bed04d39] 2026-04-08 11:21:14 +0900
+-->
+     <para>
+      Prevent stuck slotsync worker processes from blocking promotion of a
+      standby server (Nisha Moond, Ajin Cherian)
+      <ulink url="&commit_baseurl;58c1188a3">&sect;</ulink>
+      <ulink url="&commit_baseurl;acf49bfed">&sect;</ulink>
+      <ulink url="&commit_baseurl;94efd308b">&sect;</ulink>
+     </para>
+
+     <para>
+      A worker process that was vainly waiting for a response from the
+      primary would delay promotion for an unreasonable amount of time.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [85c17f612] 2026-04-13 10:06:50 +0530
+Branch: REL_18_STABLE [540fe8fb5] 2026-04-13 09:42:51 +0530
+Branch: REL_17_STABLE [91741b7cb] 2026-04-13 09:21:34 +0530
+-->
+     <para>
+      Fix excessive log output from idle slotsync worker processes
+      (Zhijie Hou)
+      <ulink url="&commit_baseurl;540fe8fb5">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [739477345] 2026-03-30 13:59:58 -0400
+Branch: REL_18_STABLE [adb7873bb] 2026-03-30 13:59:54 -0400
+Branch: REL_17_STABLE [1f5b6a5e5] 2026-03-30 13:59:54 -0400
+Branch: REL_16_STABLE [59c139d53] 2026-03-30 13:59:54 -0400
+Branch: REL_15_STABLE [811f3263a] 2026-03-30 13:59:54 -0400
+Branch: REL_14_STABLE [7cd23aad2] 2026-03-30 13:59:54 -0400
+-->
+     <para>
+      Ensure that tuplestore data structures are internally consistent
+      even after an error (Tom Lane)
+      <ulink url="&commit_baseurl;adb7873bb">&sect;</ulink>
+     </para>
+
+     <para>
+      The code was previously careless about this, which is fine most of
+      the time but is problematic for the tuplestore backing
+      a <literal>WITH HOLD</literal> cursor.  In v15 and before this
+      leads to easily-reproducible crashes; later branches are not known
+      to be vulnerable, but it seems best to preserve consistency in all.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [93b76db0a] 2026-03-23 18:13:56 +0900
+Branch: REL_18_STABLE [882bdcf9f] 2026-03-23 18:14:28 +0900
+-->
+     <para>
+      Make the <structname>pg_aios</structname> system
+      view's <structfield>pid</structfield> column show NULL not
+      0 when an entry has no owning process (ChangAo Chen)
+      <ulink url="&commit_baseurl;882bdcf9f">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [eef1ba704] 2026-03-26 20:49:31 +0900
+Branch: REL_18_STABLE [98e96e579] 2026-03-26 20:50:22 +0900
+Branch: REL_17_STABLE [fdce5de55] 2026-03-26 20:50:27 +0900
+Branch: REL_16_STABLE [f42105001] 2026-03-26 20:50:33 +0900
+Branch: REL_15_STABLE [246c296f0] 2026-03-26 20:50:38 +0900
+Branch: REL_14_STABLE [bf7ecf353] 2026-03-26 20:50:43 +0900
+-->
+     <para>
+      Fix premature NULL lag reporting
+      in <structname>pg_stat_replication</structname> (Shinya Kato)
+      <ulink url="&commit_baseurl;98e96e579">&sect;</ulink>
+     </para>
+
+     <para>
+      The lag columns frequently read as NULL even while replication
+      activity was happening.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Geoghegan <pg@bowt.ie>
+Branch: master [748d871b7] 2026-04-29 11:22:23 -0400
+Branch: REL_18_STABLE [1e71970d2] 2026-04-29 11:22:21 -0400
+-->
+     <para>
+      Fix under-allocation of shared memory used for parallel btree index
+      scans (Siddharth Kothari)
+      <ulink url="&commit_baseurl;1e71970d2">&sect;</ulink>
+     </para>
+
+     <para>
+      In edge cases this could result in a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [b1f14c967] 2026-03-13 23:25:24 +0100
+Branch: REL_18_STABLE [5b3f63a1b] 2026-03-13 23:26:02 +0100
+Branch: REL_17_STABLE [6ef36bb35] 2026-03-13 23:26:15 +0100
+Branch: REL_16_STABLE [4f4025eac] 2026-03-13 23:26:25 +0100
+Branch: REL_15_STABLE [ce06b5740] 2026-03-13 23:26:36 +0100
+Branch: REL_14_STABLE [c0ffc725f] 2026-03-13 23:26:49 +0100
+-->
+     <para>
+      Avoid rare flush failure when working with non-WAL-logged GiST
+      indexes (Tomas Vondra)
+      <ulink url="&commit_baseurl;5b3f63a1b">&sect;</ulink>
+     </para>
+
+     <para>
+      A non-logged GiST index could nonetheless sometimes
+      produce <quote>xlog flush request <replaceable>n/nnnn</replaceable>
+      is not satisfied</quote> errors, due to incorrect selection of
+      a <quote>fake LSN</quote> to represent an insertion point.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [4da2afd01] 2026-03-09 13:46:27 +0900
+Branch: REL_18_STABLE [a0f38604d] 2026-03-09 13:46:31 +0900
+Branch: REL_17_STABLE [2543b9ea9] 2026-03-09 13:46:33 +0900
+Branch: REL_16_STABLE [0af5e64e9] 2026-03-09 13:46:35 +0900
+Branch: REL_15_STABLE [46c93b705] 2026-03-09 13:46:37 +0900
+Branch: REL_14_STABLE [eb11d7a91] 2026-03-09 13:46:38 +0900
+-->
+     <para>
+      Fix underestimate of required size of DSA page maps for odd-size
+      segments (Paul Bunn)
+      <ulink url="&commit_baseurl;a0f38604d">&sect;</ulink>
+     </para>
+
+     <para>
+      This miscalculation led to out-of-bounds accesses and hence server
+      crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [ccae90abd] 2026-03-02 19:19:22 +0200
+Branch: REL_18_STABLE [0a50ef094] 2026-03-02 19:19:26 +0200
+Branch: REL_17_STABLE [dcd9c06a4] 2026-03-02 19:19:29 +0200
+Branch: master [fe08113ae] 2026-03-04 11:29:02 +0200
+Branch: REL_18_STABLE [fa3b328e6] 2026-03-04 11:30:03 +0200
+Branch: REL_17_STABLE [969576dab] 2026-03-04 11:30:06 +0200
+-->
+     <para>
+      Fix indexing of oldest-multixact arrays in shared memory
+      (Yura Sokolov)
+      <ulink url="&commit_baseurl;0a50ef094">&sect;</ulink>
+      <ulink url="&commit_baseurl;fa3b328e6">&sect;</ulink>
+     </para>
+
+     <para>
+      This mistake could cause a prepared-but-not-yet-committed
+      transaction's row locks to appear invisible to other sessions, or
+      other visibility issues for the results of such a transaction.
+      With a very small max_connections setting, memory stomps were also
+      possible.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [f7dc17aa9] 2026-03-02 13:14:15 +0900
+Branch: REL_18_STABLE [730c98d03] 2026-03-02 13:14:18 +0900
+-->
+     <para>
+      Fix array overrun when too many <command>EXPLAIN</command> extension
+      options are installed (Joel Jacobson)
+      <ulink url="&commit_baseurl;730c98d03">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [3b7a6fa15] 2026-03-02 09:38:37 +0900
+Branch: REL_18_STABLE [83671c0da] 2026-03-02 09:38:40 +0900
+Branch: REL_17_STABLE [530b6b02f] 2026-03-02 09:38:42 +0900
+Branch: REL_16_STABLE [04745ba9c] 2026-03-02 09:38:44 +0900
+Branch: REL_15_STABLE [f033abc6c] 2026-03-02 09:38:46 +0900
+Branch: REL_14_STABLE [038c7d4a3] 2026-03-02 09:38:47 +0900
+-->
+     <para>
+      Fix possible server crash when processing extended statistics on
+      expressions of extension data types (Michael Paquier)
+      <ulink url="&commit_baseurl;83671c0da">&sect;</ulink>
+     </para>
+
+     <para>
+      NULL pointer dereferences were possible if the data type's
+      typanalyze function does not compute any useful statistics.
+      No in-core typanalyze function behaves that way, but extensions
+      could.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [98616ac18] 2026-02-27 12:54:02 -0500
+Branch: REL_18_STABLE [c2c1962a6] 2026-02-27 12:54:02 -0500
+-->
+     <para>
+      Correctly display join alias Vars that are used in <literal>GROUP
+      BY</literal> (Tom Lane)
+      <ulink url="&commit_baseurl;c2c1962a6">&sect;</ulink>
+     </para>
+
+     <para>
+      In views containing queries like <literal>SELECT ... t1 LEFT JOIN t2
+      USING (x) GROUP BY x</literal>, the <literal>GROUP BY</literal>
+      clause could be displayed incorrectly by deparsing, leading to
+      dump/restore failures.  Failures occurred only
+      if <literal>t1.x</literal> and <literal>t2.x</literal> were not of
+      identical data types and <literal>t1.x</literal> was the side that
+      required an implicit coercion.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [d942511f0] 2026-02-26 12:15:01 -0800
+Branch: REL_18_STABLE [4abf63c62] 2026-02-26 12:15:15 -0800
+Branch: REL_17_STABLE [4761f2eee] 2026-02-26 12:15:23 -0800
+Branch: REL_16_STABLE [a4515c9b4] 2026-02-26 12:15:31 -0800
+-->
+     <para>
+      Fix minor memory leaks in ICU-based string processing (Jeff Davis)
+      <ulink url="&commit_baseurl;4abf63c62">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [9b43e6793] 2026-04-21 09:39:59 +0900
+Branch: REL_18_STABLE [affdb2dd5] 2026-04-21 09:40:03 +0900
+Branch: REL_17_STABLE [e381843cf] 2026-04-21 09:40:04 +0900
+Branch: REL_16_STABLE [2d347f2cd] 2026-04-21 09:40:06 +0900
+Branch: REL_15_STABLE [23cebf672] 2026-04-21 09:40:07 +0900
+-->
+     <para>
+      If the startup process fails, properly shut down other child
+      processes before exiting the postmaster (Ayush Tiwari)
+      <ulink url="&commit_baseurl;affdb2dd5">&sect;</ulink>
+     </para>
+
+     <para>
+      The handling of this situation relied on a long-obsolete assumption
+      that no other postmaster children exist while the startup process is
+      running, so that immediate postmaster exit is acceptable.
+      Orphaned children would eventually notice the postmaster's death and
+      exit on their own, but a cleaner shutdown procedure is desirable.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: REL_18_STABLE [0852643e1] 2026-03-23 11:53:32 +0200
+Branch: REL_17_STABLE [1ca385032] 2026-03-23 11:59:07 +0200
+Branch: REL_16_STABLE [77dff5d93] 2026-03-23 12:02:27 +0200
+Branch: REL_15_STABLE [a5f412107] 2026-03-23 12:02:35 +0200
+Branch: REL_14_STABLE [e35e466f6] 2026-03-23 12:03:30 +0200
+-->
+     <para>
+      Fix race condition between WAL replay of checkpoints and multixact
+      ID creations (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;0852643e1">&sect;</ulink>
+     </para>
+
+     <para>
+      A standby server following WAL from a primary of an older minor
+      version could get into a crash-and-restart loop complaining
+      about <quote>could not access status of transaction</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [6eedb2a5f] 2026-03-06 16:43:40 +0900
+Branch: REL_18_STABLE [3eb2fecdb] 2026-03-06 16:44:40 +0900
+Branch: REL_17_STABLE [bbbc0888b] 2026-03-06 16:44:45 +0900
+Branch: REL_16_STABLE [82935467a] 2026-03-06 16:44:51 +0900
+Branch: REL_15_STABLE [42734f296] 2026-03-06 16:44:59 +0900
+Branch: REL_14_STABLE [3bf6f22ce] 2026-03-06 16:45:05 +0900
+Branch: master [d927b4bd9] 2026-03-17 08:10:20 +0900
+Branch: REL_18_STABLE [980498138] 2026-03-17 08:12:25 +0900
+Branch: REL_17_STABLE [8ee536c89] 2026-03-17 08:12:32 +0900
+Branch: REL_16_STABLE [da21ecf57] 2026-03-17 08:12:37 +0900
+Branch: REL_15_STABLE [fa9f2e317] 2026-03-17 08:12:41 +0900
+Branch: REL_14_STABLE [f15471464] 2026-03-17 08:12:46 +0900
+-->
+     <para>
+      Prevent indefinite wait in shutdown of a walsender process
+      (Anthonin Bonnefoy)
+      <ulink url="&commit_baseurl;3eb2fecdb">&sect;</ulink>
+      <ulink url="&commit_baseurl;980498138">&sect;</ulink>
+     </para>
+
+     <para>
+      At shutdown of a cluster that is publishing logical replication
+      data, the walsender waits for all pending WAL to be written out.
+      But it did not correctly request that to happen, so that in some
+      cases this could become an indefinite wait.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alexander Korotkov <akorotkov@postgresql.org>
+Branch: master [c06d1a4ba] 2026-05-03 20:23:50 +0300
+Branch: REL_18_STABLE [ac3b97db3] 2026-05-03 20:27:36 +0300
+Branch: REL_17_STABLE [1cf010f21] 2026-05-03 20:27:33 +0300
+Branch: REL_16_STABLE [54537de35] 2026-05-03 20:27:02 +0300
+Branch: REL_15_STABLE [ca259b084] 2026-05-03 20:26:55 +0300
+Branch: REL_14_STABLE [f5d1038d9] 2026-05-03 20:26:07 +0300
+-->
+     <para>
+      Ensure that changes to tables' free space maps are persisted during
+      recovery (Alexey Makhmutov)
+      <ulink url="&commit_baseurl;ac3b97db3">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, while WAL replay did update the free space map while
+      replaying operations that should change it, the map page buffer did
+      not get marked dirty if checksums are enabled, so that the changes
+      might never get written out.  On a standby server, over time this
+      would result in a map wildly at variance with the table's actual
+      contents.  While the map is only used as a hint, this condition
+      could cause significant performance degradation for some period of
+      time after the standby server is promoted to be active, until most
+      of the map has been repaired by updates.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [c34a280c8] 2026-05-01 15:12:28 -0400
+Branch: REL_18_STABLE [e2688ea5e] 2026-05-01 15:15:15 -0400
+Branch: REL_17_STABLE [5d67549d9] 2026-05-01 15:15:23 -0400
+Branch: REL_16_STABLE [7e4c871f4] 2026-05-01 15:15:33 -0400
+Branch: REL_15_STABLE [6916f4410] 2026-05-01 15:16:02 -0400
+Branch: REL_14_STABLE [f0e3f9732] 2026-05-01 15:16:42 -0400
+-->
+     <para>
+      Fix crashes in some <application>ecpg</application> functions when
+      called without any established connection (Shruthi Gowda)
+      <ulink url="&commit_baseurl;e2688ea5e">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [bc30c704a] 2026-04-02 12:20:36 -0400
+Branch: REL_18_STABLE [698eae7db] 2026-04-02 12:20:26 -0400
+-->
+     <para>
+      Harden tar-file parsing logic against archives it can't handle
+      (Tom Lane)
+      <ulink url="&commit_baseurl;698eae7db">&sect;</ulink>
+     </para>
+
+     <para>
+      The tar-file reading code used
+      in <application>pg_basebackup</application>
+      and <application>pg_verifybackup</application> failed to verify that
+      the input is a tar file at all, let alone that it fits into the
+      subset of valid tar files that we can handle.  This isn't a problem
+      for the normal scenario where the input file was generated
+      by <productname>PostgreSQL</productname> code, but it can be an
+      issue if the input has been generated by some
+      other <application>tar</application> program.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [01d58d7e3] 2026-03-29 09:01:47 -0400
+Branch: REL_18_STABLE [5095f3f4a] 2026-03-29 09:02:15 -0400
+Branch: REL_17_STABLE [f1298a4c2] 2026-03-29 09:11:37 -0400
+Branch: REL_16_STABLE [1590723f0] 2026-03-29 09:12:28 -0400
+Branch: REL_15_STABLE [d3bb7841b] 2026-03-29 09:12:40 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ac0accafd] 2026-03-05 14:43:21 -0500
+Branch: REL_18_STABLE [a01a592b1] 2026-03-05 14:43:21 -0500
+Branch: REL_17_STABLE [8b198b093] 2026-03-05 14:43:21 -0500
+Branch: REL_16_STABLE [cce939c71] 2026-03-05 14:43:21 -0500
+Branch: REL_15_STABLE [9a42888a3] 2026-03-05 14:43:21 -0500
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c70f6dc6b] 2026-03-04 12:08:37 -0500
+Branch: REL_18_STABLE [78dc9a808] 2026-03-04 12:08:37 -0500
+Branch: REL_17_STABLE [2640c5ba7] 2026-03-04 12:08:37 -0500
+Branch: REL_16_STABLE [415cc943f] 2026-03-04 12:08:37 -0500
+Branch: REL_15_STABLE [4548e8746] 2026-03-04 12:08:37 -0500
+-->
+     <para>
+      Fix assorted bugs in backup decompression and tar-parsing code
+      (Andrew Dunstan, Tom Lane, Chao Li)
+      <ulink url="&commit_baseurl;5095f3f4a">&sect;</ulink>
+      <ulink url="&commit_baseurl;a01a592b1">&sect;</ulink>
+      <ulink url="&commit_baseurl;78dc9a808">&sect;</ulink>
+     </para>
+
+     <para>
+      The decompression and tar-file reading code used
+      in <application>pg_basebackup</application>
+      and <application>pg_verifybackup</application> mishandled tar-file
+      padding data, could corrupt LZ4-compressed data in edge cases,
+      failed to check for some unusual error conditions, failed to exit
+      after compression/decompression errors (leading to cascading error
+      reports), and leaked memory.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [d0833fdae] 2026-02-26 11:50:26 +0100
+Branch: REL_18_STABLE [c3c8b63d7] 2026-02-26 11:50:26 +0100
+-->
+     <para>
+      In <application>pg_dump</application>, preserve <literal>NO
+      INHERIT</literal> property of <literal>NOT NULL</literal>
+      constraints (Jian He)
+      <ulink url="&commit_baseurl;c3c8b63d7">&sect;</ulink>
+     </para>
+
+     <para>
+      Some cases missed printing the <literal>NO INHERIT</literal> clause.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [74b4438a7] 2026-03-02 11:15:10 -0500
+Branch: REL_18_STABLE [b09158cc7] 2026-03-02 11:14:58 -0500
+Branch: REL_17_STABLE [1cd783d20] 2026-03-02 11:14:58 -0500
+Branch: REL_16_STABLE [a4649c50a] 2026-03-02 11:14:58 -0500
+-->
+     <para>
+      In <application>pg_dumpall</application>, don't skip
+      role <literal>GRANT</literal>s with dangling grantor OIDs
+      (Tom Lane)
+      <ulink url="&commit_baseurl;b09158cc7">&sect;</ulink>
+     </para>
+
+     <para>
+      Instead, handle such cases by emitting <literal>GRANT</literal>
+      without any <literal>GRANTED BY</literal> clause, as we did before
+      v16.  This avoids losing the grant in foreseeable cases, since
+      pre-v16 servers didn't prevent dropping the grantor role.  Continue
+      to emit a warning about the missing grantor, but only if the source
+      server is v16 or later.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jacob Champion <jchampion@postgresql.org>
+Branch: master [a60a10338] 2026-02-24 14:01:37 -0800
+Branch: REL_18_STABLE [1b2773179] 2026-02-24 14:01:41 -0800
+Branch: REL_17_STABLE [ad7fc3f1f] 2026-02-24 14:01:46 -0800
+Branch: REL_16_STABLE [a38ed212f] 2026-02-24 14:01:51 -0800
+Branch: REL_15_STABLE [e726620d2] 2026-02-24 14:01:54 -0800
+Branch: REL_14_STABLE [c47744ede] 2026-02-24 14:01:58 -0800
+-->
+     <para>
+      In <application>pg_upgrade</application>, take care to use the
+      correct protocol version when connecting to older source servers
+      (Jacob Champion)
+      <ulink url="&commit_baseurl;1b2773179">&sect;</ulink>
+     </para>
+
+     <para>
+      This could be problematic when attempting to upgrade from a pre-2018
+      server.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [cc774c543] 2026-03-02 13:12:25 -0600
+Branch: REL_18_STABLE [bde9ad315] 2026-03-02 13:12:25 -0600
+Branch: REL_17_STABLE [f510577de] 2026-03-02 13:12:25 -0600
+Branch: REL_16_STABLE [28c2b7896] 2026-03-02 13:12:25 -0600
+Branch: REL_15_STABLE [8fc45ac5d] 2026-03-02 13:12:25 -0600
+-->
+     <para>
+      In <filename>contrib/basic_archive</filename>, allow the archive
+      directory to be missing at startup (Nathan Bossart)
+      <ulink url="&commit_baseurl;bde9ad315">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, the setting
+      of <literal>basic_archive.archive_directory</literal> was rejected
+      if it didn't point to an existing directory.  This is undesirable
+      because archiving will be stuck indefinitely, even if the directory
+      appears later.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [c8308a984] 2026-02-26 12:23:22 -0800
+Branch: REL_18_STABLE [b3c2a3d38] 2026-02-26 12:23:51 -0800
+Branch: REL_18_STABLE [53a57cae1] 2026-02-26 15:19:31 -0800
+Branch: REL_17_STABLE [d1bd9a7dc] 2026-02-26 12:24:12 -0800
+Branch: REL_16_STABLE [3ed2c7ef7] 2026-02-26 12:25:00 -0800
+Branch: REL_15_STABLE [2b993167f] 2026-02-26 12:26:13 -0800
+Branch: REL_14_STABLE [058710d41] 2026-02-26 12:26:32 -0800
+-->
+     <para>
+      Fix <filename>contrib/ltree</filename> to cope when case-folding
+      changes a string's byte length (Jeff Davis)
+      <ulink url="&commit_baseurl;b3c2a3d38">&sect;</ulink>
+      <ulink url="&commit_baseurl;53a57cae1">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, <type>lquery</type> patterns specifying case-insensitive
+      matching might fail to match labels they should match.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [059cf7f58] 2026-04-16 13:47:07 +0900
+Branch: REL_18_STABLE [6723d462d] 2026-04-16 13:49:39 +0900
+-->
+     <para>
+      Fix mis-structured output
+      from <filename>contrib/pg_overexplain</filename>'s
+      <literal>RANGE_TABLE</literal> option (Satyanarayana Narlapuram)
+      <ulink url="&commit_baseurl;6723d462d">&sect;</ulink>
+     </para>
+
+     <para>
+      Some fields were misplaced in JSON, YAML, and XML formats, resulting
+      in structurally invalid output.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [3c74cb576] 2026-03-27 12:25:10 +0200
+Branch: REL_18_STABLE [25b02320e] 2026-03-27 12:21:29 +0200
+Branch: REL_17_STABLE [351e59f34] 2026-03-27 12:21:38 +0200
+Branch: REL_16_STABLE [52edaf9d9] 2026-03-27 12:21:48 +0200
+Branch: REL_15_STABLE [92cf11171] 2026-03-27 12:22:21 +0200
+Branch: REL_14_STABLE [a6d03067f] 2026-03-27 12:23:38 +0200
+-->
+     <para>
+      In <filename>contrib/pg_stat_statements</filename>, don't leak
+      memory if an error occurs while parsing the
+      <filename>pgss_query_texts.stat</filename> file (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;25b02320e">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Etsuro Fujita <efujita@postgresql.org>
+Branch: master [648818ba3] 2026-05-05 18:55:00 +0900
+Branch: REL_18_STABLE [c318777da] 2026-05-05 18:55:02 +0900
+Branch: REL_17_STABLE [af8f9248f] 2026-05-05 18:55:03 +0900
+Branch: REL_16_STABLE [1352651c2] 2026-05-05 18:55:04 +0900
+Branch: REL_15_STABLE [34c18a225] 2026-05-05 18:55:05 +0900
+Branch: REL_14_STABLE [fd5b36ab1] 2026-05-05 18:55:06 +0900
+-->
+     <para>
+      In <filename>contrib/postgres_fdw</filename>, avoid crash due to
+      premature cleanup of a failed connection (Etsuro Fujita)
+      <ulink url="&commit_baseurl;c318777da">&sect;</ulink>
+     </para>
+
+     <para>
+      If a remote connection fails abort cleanup, we can't use it any
+      longer.  But delay closing the connection object until end of
+      transaction, because there might still be references to it within
+      data structures such as open cursors.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f64f62f5b] 2026-04-24 12:28:35 -0400
+Branch: REL_18_STABLE [8a431b6d6] 2026-04-24 12:28:35 -0400
+Branch: REL_17_STABLE [4c0eab6f0] 2026-04-24 12:28:35 -0400
+Branch: REL_16_STABLE [0465c999e] 2026-04-24 12:28:35 -0400
+Branch: REL_15_STABLE [e28fc73d5] 2026-04-24 12:28:35 -0400
+Branch: REL_14_STABLE [affd929c9] 2026-04-24 12:28:35 -0400
+-->
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2026b (Tom Lane)
+      <ulink url="&commit_baseurl;8a431b6d6">&sect;</ulink>
+     </para>
+
+     <para>
+      British Columbia (America/Vancouver) will be on year-round UTC-07
+      (effectively, permanent DST) beginning in November 2026.  This
+      release assumes that their TZ abbreviation will
+      be <literal>MST</literal> from that time forward.  That seems likely
+      to change, but it's unclear what new abbreviation will be used.
+      Also a historical correction for Moldova: they have followed EU DST
+      transition times since 2022.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-18-3">
+  <title>Release 18.3</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2026-02-26</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 18.2.
+   For information about new features in major release 18, see
+   <xref linkend="release-18"/>.
+  </para>
+
+  <sect2 id="release-18-3-migration">
+   <title>Migration to Version 18.3</title>
+
+   <para>
+    A dump/restore is not required for those running 18.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 18.2,
+    see <xref linkend="release-18-2"/>.
+   </para>
+  </sect2>
+
+  <sect2 id="release-18-3-changes">
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: REL_18_STABLE [817f74600] 2026-02-16 17:16:59 +0200
+Branch: REL_17_STABLE [4a36c89f1] 2026-02-16 17:18:17 +0200
+Branch: REL_16_STABLE [23064542f] 2026-02-16 17:20:29 +0200
+Branch: REL_15_STABLE [899de38d8] 2026-02-16 17:20:51 +0200
+Branch: REL_14_STABLE [547a8aaa7] 2026-02-16 17:20:56 +0200
+-->
+     <para>
+      Fix failure after replaying a multixid truncation record from WAL
+      that was generated by an older minor version (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;817f74600">&sect;</ulink>
+     </para>
+
+     <para>
+      Erroneous logic for coping with the way that previous versions
+      handled multixid wraparound led to replay failure, with messages
+      like <quote>could not access status of transaction</quote>.
+      A typical scenario in which this could occur is a standby server of
+      the latest minor version consuming WAL from a primary server of an
+      older version.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [9f4fd119b] 2026-02-14 12:16:16 -0800
+Branch: REL_18_STABLE [6e045e1a6] 2026-02-14 12:16:19 -0800
+Branch: REL_17_STABLE [5d5232bc3] 2026-02-14 12:16:20 -0800
+Branch: REL_16_STABLE [bdfb37228] 2026-02-14 12:16:20 -0800
+Branch: REL_15_STABLE [a20eb248c] 2026-02-14 12:16:21 -0800
+Branch: REL_14_STABLE [14b1fd617] 2026-02-14 12:16:21 -0800
+Branch: master [8cef93d8a] 2026-02-16 18:04:58 -0800
+Branch: REL_18_STABLE [d04b34d68] 2026-02-16 18:05:01 -0800
+Branch: REL_17_STABLE [50d361f62] 2026-02-16 18:05:02 -0800
+Branch: REL_16_STABLE [2280ab354] 2026-02-16 18:05:02 -0800
+Branch: REL_15_STABLE [ec86152e0] 2026-02-16 18:05:02 -0800
+Branch: REL_14_STABLE [a0769e74d] 2026-02-16 18:05:03 -0800
+Branch: master [4644f8b23] 2026-02-14 12:16:16 -0800
+Branch: REL_18_STABLE [4174e41b9] 2026-02-14 12:16:19 -0800
+Branch: REL_17_STABLE [8e73530f1] 2026-02-14 12:16:20 -0800
+Branch: REL_16_STABLE [45eb47230] 2026-02-14 12:16:20 -0800
+Branch: REL_15_STABLE [5b305ebcc] 2026-02-14 12:16:20 -0800
+Branch: REL_14_STABLE [44fc85bbf] 2026-02-14 12:16:21 -0800
+-->
+     <para>
+      Avoid incorrect complaint of invalid encoding
+      when <function>substring()</function> is applied
+      to <quote>toasted</quote> data (Noah Misch)
+      <ulink url="&commit_baseurl;6e045e1a6">&sect;</ulink>
+      <ulink url="&commit_baseurl;d04b34d68">&sect;</ulink>
+      <ulink url="&commit_baseurl;4174e41b9">&sect;</ulink>
+     </para>
+
+     <para>
+      The fix for CVE-2026-2006 was too aggressive and could raise an
+      error about an incomplete character in cases that are actually
+      valid.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [18bcdb75d] 2026-02-20 11:56:42 +0200
+Branch: REL_18_STABLE [041e02e6a] 2026-02-20 11:56:50 +0200
+-->
+     <para>
+      Fix oversight in the fix for CVE-2026-2007 (Zsolt Parragi)
+      <ulink url="&commit_baseurl;041e02e6a">&sect;</ulink>
+     </para>
+
+     <para>
+      If the <quote>bounds</quote> array needed to be expanded, because
+      the input contained more trigrams than the initial guess,
+      <function>generate_trgm_only</function> didn't return the modified
+      array pointer to its caller.  That would lead to incorrect output
+      from <function>strict_word_similarity()</function> and related
+      functions, or in rare cases a crash.  The faulty code is reached if
+      the input string becomes longer when it's converted to lower case.
+      The only known instances of that occur when an ICU locale is used
+      with certain single-byte encodings.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [759b03b24] 2026-02-18 14:14:44 -0500
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: REL_18_STABLE [2f6ee7b38] 2026-02-18 10:31:03 -0500
+-->
+     <para>
+      Fix the volatility marking
+      of <function>json_strip_nulls()</function>
+      and <function>jsonb_strip_nulls()</function> (Andrew Dunstan)
+      <ulink url="&commit_baseurl;2f6ee7b38">&sect;</ulink>
+     </para>
+
+     <para>
+      These functions have always been considered immutable, but
+      refactoring in version 18 accidentally marked them stable instead.
+      That prevents their use in index expressions and could cause
+      unnecessary repeat evaluations in queries.  This fix corrects the
+      marking in newly-initialized database clusters (including clusters
+      that are <application>pg_upgrade</application>'d to 18.3 or later).
+      However it will not help existing clusters made using 18.0 through
+      18.2.
+     </para>
+
+     <para>
+      If this mistake affects your usage of these functions, the
+      recommended fix for an existing cluster is a manual catalog update.
+      As superuser, perform
+<programlisting>
+UPDATE pg_catalog.pg_proc SET provolatile = 'i' WHERE oid IN ('3261','3262');
+</programlisting>
+      in each affected database.  Update <literal>template0</literal>
+      and <literal>template1</literal> as well, so that databases made in
+      future will have the fix.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [691977d37] 2026-02-20 17:57:53 +0900
+Branch: REL_18_STABLE [ed57c207c] 2026-02-20 18:00:02 +0900
+Branch: REL_17_STABLE [bcaf1b510] 2026-02-20 18:01:56 +0900
+Branch: REL_16_STABLE [ec20a4552] 2026-02-20 18:04:26 +0900
+-->
+     <para>
+      Fix computation of the set of potentially-nulling outer joins for
+      the output of a <literal>LATERAL UNION ALL</literal> subquery
+      (Richard Guo)
+      <ulink url="&commit_baseurl;ed57c207c">&sect;</ulink>
+     </para>
+
+     <para>
+      This error could lead to skipping <literal>NOT NULL</literal> tests
+      in the mistaken belief that they were unnecessary, resulting in
+      wrong query output.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [0eeffd31b] 2026-02-21 12:22:08 +0100
+Branch: REL_18_STABLE [8d9a97e0b] 2026-02-21 12:22:08 +0100
+-->
+     <para>
+      Avoid name collisions between user-written constraints and
+      automatically-named <literal>NOT NULL</literal> constraints
+      (Laurenz Albe)
+      <ulink url="&commit_baseurl;8d9a97e0b">&sect;</ulink>
+     </para>
+
+     <para>
+      As of version 18, <literal>NOT NULL</literal> constraints have
+      full-fledged <structname>pg_constraint</structname> entries, and
+      therefore require names.  The logic for choosing a name for an
+      unnamed <literal>NOT NULL</literal> constraint failed to avoid
+      conflicts with user-written constraints elsewhere in the
+      same <command>CREATE TABLE</command> statement.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [78a5e3074] 2026-02-11 18:50:57 +0200
+Branch: REL_18_STABLE [53463b4b2] 2026-02-11 18:51:06 +0200
+Branch: REL_17_STABLE [842473337] 2026-02-11 18:51:12 +0200
+Branch: REL_16_STABLE [2332911ae] 2026-02-11 18:51:19 +0200
+Branch: REL_15_STABLE [ebc53ca7b] 2026-02-11 18:51:25 +0200
+Branch: REL_14_STABLE [82b495cdd] 2026-02-11 18:51:32 +0200
+-->
+     <para>
+      Fix <function>pg_stat_get_backend_wait_event()</function>
+      and <function>pg_stat_get_backend_wait_event_type()</function>
+      to report values for auxiliary processes (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;53463b4b2">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously these functions returned NULL for auxiliary processes,
+      but that's inconsistent with
+      the <structname>pg_stat_activity</structname> view.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9863c9075] 2026-02-11 16:53:14 -0500
+Branch: REL_18_STABLE [ce4b7e3a1] 2026-02-11 16:53:14 -0500
+Branch: REL_17_STABLE [dfd850980] 2026-02-11 16:53:14 -0500
+Branch: REL_16_STABLE [c66f4cff1] 2026-02-11 16:53:14 -0500
+Branch: REL_15_STABLE [254b15cbf] 2026-02-11 16:53:14 -0500
+Branch: REL_14_STABLE [2b93d3820] 2026-02-11 16:53:14 -0500
+-->
+     <para>
+      Fix casting a composite-type variable to a domain type when
+      returning its value from a PL/pgSQL function (Tom Lane)
+      <ulink url="&commit_baseurl;ce4b7e3a1">&sect;</ulink>
+     </para>
+
+     <para>
+      If the variable's value is NULL, a <quote>cache lookup failed for
+      type 0</quote> error resulted.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [a6f823e77] 2026-02-17 08:41:26 +0900
+Branch: REL_18_STABLE [4a0843c53] 2026-02-17 08:41:30 +0900
+Branch: REL_17_STABLE [0dfbe42da] 2026-02-17 08:41:32 +0900
+Branch: REL_16_STABLE [31d0b917d] 2026-02-17 08:41:34 +0900
+Branch: REL_15_STABLE [63c05e03b] 2026-02-17 08:41:35 +0900
+Branch: REL_14_STABLE [f604cc695] 2026-02-17 08:41:37 +0900
+-->
+     <para>
+      Fix potential null pointer dereference
+      in <filename>contrib/hstore</filename>'s binary input function
+      (Michael Paquier)
+      <ulink url="&commit_baseurl;4a0843c53">&sect;</ulink>
+     </para>
+
+     <para>
+      <type>hstore</type>'s receive function crashed on input containing
+      duplicate keys.  <type>hstore</type> values generated by Postgres
+      would never contain duplicate keys, so this mistake has gone
+      unnoticed.  The crash could be provoked by malicious or corrupted
+      data.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-18-2">
+  <title>Release 18.2</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2026-02-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 18.1.
+   For information about new features in major release 18, see
+   <xref linkend="release-18"/>.
+  </para>
+
+  <sect2 id="release-18-2-migration">
+   <title>Migration to Version 18.2</title>
+
+   <para>
+    A dump/restore is not required for those running 18.X.
+   </para>
+
+   <para>
+    However, if you have any indexes on <type>ltree</type> columns, it may
+    be necessary to reindex them after updating.  See the sixth changelog
+    entry below.
+   </para>
+  </sect2>
+
+  <sect2 id="release-18-2-changes">
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [60e7ae41a] 2026-02-09 09:57:43 -0500
+Branch: REL_18_STABLE [3b6588cd9] 2026-02-09 09:57:44 -0500
+Branch: REL_17_STABLE [3d160401b] 2026-02-09 09:57:44 -0500
+Branch: REL_16_STABLE [595956fc7] 2026-02-09 09:57:44 -0500
+Branch: REL_15_STABLE [429aeaebd] 2026-02-09 09:57:44 -0500
+Branch: REL_14_STABLE [b39d38139] 2026-02-09 09:57:44 -0500
+-->
+     <para>
+      Guard against unexpected dimensions
+      of <type>oidvector</type>/<type>int2vector</type> (Tom Lane)
+      <ulink url="&commit_baseurl;3b6588cd9">&sect;</ulink>
+     </para>
+
+     <para>
+      These data types are expected to be 1-dimensional arrays containing
+      no nulls, but there are cast pathways that permit violating those
+      expectations.  Add checks to some functions that were depending on
+      those expectations without verifying them, and could misbehave in
+      consequence.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Altan Birler for reporting this problem.
+      (CVE-2026-2003)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [841d42cc4] 2026-02-09 10:07:31 -0500
+Branch: REL_18_STABLE [66ddac698] 2026-02-09 10:07:31 -0500
+Branch: REL_17_STABLE [bbf5bcf58] 2026-02-09 10:07:31 -0500
+Branch: REL_16_STABLE [91d7c0bfd] 2026-02-09 10:07:31 -0500
+Branch: REL_15_STABLE [b764b26f2] 2026-02-09 10:07:31 -0500
+Branch: REL_14_STABLE [ea3bf3498] 2026-02-09 10:07:31 -0500
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8ebdf41c2] 2026-02-09 10:14:22 -0500
+Branch: REL_18_STABLE [b69af3dda] 2026-02-09 10:14:22 -0500
+Branch: REL_17_STABLE [dd3ad2a4d] 2026-02-09 10:14:22 -0500
+Branch: REL_16_STABLE [c0887b39d] 2026-02-09 10:14:22 -0500
+Branch: REL_15_STABLE [deb464a40] 2026-02-09 10:14:22 -0500
+Branch: REL_14_STABLE [7e82d9a04] 2026-02-09 10:14:22 -0500
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL_17_STABLE [dbb09fd8e] 2026-02-09 10:02:23 -0500
+Branch: REL_16_STABLE [d484bc260] 2026-02-09 10:02:23 -0500
+Branch: REL_15_STABLE [3ecc84cce] 2026-02-09 10:02:23 -0500
+Branch: REL_14_STABLE [9fa38c572] 2026-02-09 10:02:23 -0500
+-->
+     <para>
+      Harden selectivity estimators against being attached to operators
+      that accept unexpected data types (Tom Lane)
+      <ulink url="&commit_baseurl;66ddac698">&sect;</ulink>
+      <ulink url="&commit_baseurl;b69af3dda">&sect;</ulink>
+     </para>
+
+     <para>
+      <filename>contrib/intarray</filename> contained a selectivity
+      estimation function that could be abused for arbitrary code
+      execution, because it did not check that its input was of the
+      expected data type.  Third-party extensions should check for similar
+      hazards and add defenses using the technique intarray now uses.
+      Since such extension fixes will take time, we now require superuser
+      privilege to attach a non-built-in selectivity estimator to an
+      operator.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Daniel Firer, as part of zeroday.cloud, for reporting this problem.
+      (CVE-2026-2004)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [379695d3c] 2026-02-09 08:00:59 +0900
+Branch: REL_18_STABLE [209f387b8] 2026-02-09 08:01:05 +0900
+Branch: REL_17_STABLE [7a7d9693c] 2026-02-09 08:01:07 +0900
+Branch: REL_16_STABLE [527b730f4] 2026-02-09 08:01:09 +0900
+Branch: REL_15_STABLE [9a9982ec6] 2026-02-09 08:01:10 +0900
+Branch: REL_14_STABLE [01de2e32d] 2026-02-09 08:01:12 +0900
+-->
+     <para>
+      Fix buffer overrun in <filename>contrib/pgcrypto</filename>'s
+      PGP decryption functions (Michael Paquier)
+      <ulink url="&commit_baseurl;209f387b8">&sect;</ulink>
+     </para>
+
+     <para>
+      Decrypting a crafted message with an overlength session key caused a
+      buffer overrun, with consequences as bad as arbitrary code
+      execution.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Team Xint Code, as part of zeroday.cloud, for reporting this problem.
+      (CVE-2026-2005)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [af79c30dc] 2026-02-09 12:08:58 +1300
+Branch: REL_18_STABLE [df0852fe0] 2026-02-09 12:12:29 +1300
+Branch: REL_17_STABLE [838248b1b] 2026-02-09 12:23:45 +1300
+Branch: REL_16_STABLE [70ff9ede5] 2026-02-09 12:28:01 +1300
+Branch: REL_15_STABLE [b2c81ac86] 2026-02-09 12:34:12 +1300
+Branch: REL_14_STABLE [2a53db21e] 2026-02-09 12:38:07 +1300
+Branch: master [74ee636cc] 2026-02-09 12:08:58 +1300
+Branch: REL_18_STABLE [efef05ba9] 2026-02-09 12:12:33 +1300
+Branch: REL_17_STABLE [7a522039f] 2026-02-09 12:23:51 +1300
+Branch: REL_16_STABLE [b0e3f5cf9] 2026-02-09 12:28:07 +1300
+Branch: REL_15_STABLE [50863be0b] 2026-02-09 12:34:17 +1300
+Branch: REL_14_STABLE [6ed116046] 2026-02-09 12:38:12 +1300
+Branch: master [1e7fe06c1] 2026-02-09 12:44:04 +1300
+Branch: REL_18_STABLE [7b5fc85be] 2026-02-09 12:43:42 +1300
+Branch: REL_17_STABLE [319e8a644] 2026-02-09 12:42:47 +1300
+Branch: REL_16_STABLE [d837fb029] 2026-02-09 12:29:15 +1300
+Branch: REL_15_STABLE [fd82ddb67] 2026-02-09 12:34:24 +1300
+Branch: REL_14_STABLE [cecedb912] 2026-02-09 12:39:01 +1300
+Branch: master [c67bef3f3] 2026-02-09 12:44:12 +1300
+Branch: REL_18_STABLE [b0f5d25bc] 2026-02-09 12:43:50 +1300
+Branch: REL_17_STABLE [10ebc4bd6] 2026-02-09 12:42:59 +1300
+Branch: REL_16_STABLE [4c08960d9] 2026-02-09 12:29:41 +1300
+Branch: REL_15_STABLE [757bf8145] 2026-02-09 12:35:19 +1300
+Branch: REL_14_STABLE [e7591254c] 2026-02-09 12:39:16 +1300
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [d536aee55] 2026-02-09 06:14:47 -0800
+Branch: REL_18_STABLE [b42709194] 2026-02-09 06:14:50 -0800
+Branch: REL_17_STABLE [dc072a09a] 2026-02-09 06:14:51 -0800
+Branch: REL_16_STABLE [0c33d5608] 2026-02-09 06:14:51 -0800
+Branch: REL_15_STABLE [8f8b1ffac] 2026-02-09 06:14:52 -0800
+Branch: REL_14_STABLE [8373ed094] 2026-02-09 06:14:52 -0800
+Branch: master [c5dc75479] 2026-02-09 09:08:10 -0800
+Branch: REL_18_STABLE [4543b02af] 2026-02-09 09:08:13 -0800
+Branch: REL_17_STABLE [955433ebd] 2026-02-09 09:08:13 -0800
+Branch: REL_16_STABLE [763671b74] 2026-02-09 09:08:13 -0800
+Branch: REL_15_STABLE [6f741bcb6] 2026-02-09 09:08:14 -0800
+Branch: REL_14_STABLE [5301b2b7d] 2026-02-09 09:08:14 -0800
+-->
+     <para>
+      Fix inadequate validation of multibyte character lengths
+      (Thomas Munro, Noah Misch)
+      <ulink url="&commit_baseurl;df0852fe0">&sect;</ulink>
+      <ulink url="&commit_baseurl;efef05ba9">&sect;</ulink>
+      <ulink url="&commit_baseurl;7b5fc85be">&sect;</ulink>
+      <ulink url="&commit_baseurl;b0f5d25bc">&sect;</ulink>
+      <ulink url="&commit_baseurl;b42709194">&sect;</ulink>
+      <ulink url="&commit_baseurl;4543b02af">&sect;</ulink>
+     </para>
+
+     <para>
+      Assorted bugs allowed an attacker able to issue crafted SQL to
+      overrun string buffers, with consequences as bad as arbitrary code
+      execution.  After these fixes, applications may
+      observe <quote>invalid byte sequence for encoding</quote> errors
+      when string functions process invalid text that has been stored in
+      the database.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks Paul Gerste
+      and Moritz Sanft, as part of zeroday.cloud, for reporting this
+      problem.
+      (CVE-2026-2006)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [00896ddaf] 2026-02-09 12:08:58 +1300
+Branch: REL_18_STABLE [e0965fb1a] 2026-02-09 12:12:24 +1300
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [54598670f] 2026-02-09 12:08:58 +1300
+Branch: REL_18_STABLE [18548681d] 2026-02-09 12:12:18 +1300
+-->
+     <para>
+      Harden <filename>contrib/pg_trgm</filename> against changes in
+      string lowercasing behavior (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;e0965fb1a">&sect;</ulink>
+      <ulink url="&commit_baseurl;18548681d">&sect;</ulink>
+     </para>
+
+     <para>
+      Fix potential buffer overruns arising from the fact that in some
+      locales lower-casing a string can produce more characters (not
+      bytes) than were in the original.  That behavior is new in version
+      18, and so is the bug.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Heikki Linnakangas for reporting this problem.
+      (CVE-2026-2007)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [7f007e4a0] 2025-12-16 12:57:00 -0800
+Branch: REL_18_STABLE [806555e30] 2025-12-16 12:57:12 -0800
+Branch: REL_18_STABLE [8993bf099] 2026-01-27 08:16:07 -0800
+-->
+     <para>
+      Fix inconsistent case-insensitive matching
+      in <filename>contrib/ltree</filename> (Jeff Davis)
+      <ulink url="&commit_baseurl;806555e30">&sect;</ulink>
+      <ulink url="&commit_baseurl;8993bf099">&sect;</ulink>
+     </para>
+
+     <para>
+      Index-related routines in <filename>ltree</filename> used a
+      different implementation of case-folding than the primary operators
+      did.  Their behavior was equivalent only if the default collation
+      provider was libc and the encoding was single-byte.
+     </para>
+
+     <para>
+      To fix, change the code to use case-folding with the database's
+      default collation.
+      This change will require reindexing indexes on <type>ltree</type>
+      columns (regardless of the index access method) unless the database
+      uses libc as collation provider and its encoding is single-byte.
+      Without that, searches of such indexes will fail to locate relevant
+      entries.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [96e2af605] 2026-02-03 12:33:29 +0100
+Branch: REL_18_STABLE [492a69e14] 2026-02-03 12:33:29 +0100
+-->
+     <para>
+      When using <command>ALTER TABLE ... ADD CONSTRAINT</command> to add
+      a not-null constraint with an explicit name, if the column is
+      already marked NOT NULL, require that the provided name match the
+      existing constraint name (Álvaro Herrera, Srinath Reddy Sadipiralla)
+      <ulink url="&commit_baseurl;492a69e14">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [35b5c62c3] 2025-11-18 12:56:55 -0500
+Branch: REL_18_STABLE [12bc32917] 2025-11-18 12:56:55 -0500
+Branch: REL_17_STABLE [075a763e2] 2025-11-18 12:56:55 -0500
+Branch: REL_16_STABLE [1c8c3206f] 2025-11-18 12:56:55 -0500
+Branch: REL_15_STABLE [9f5a58aac] 2025-11-18 12:56:55 -0500
+Branch: REL_14_STABLE [b85397481] 2025-11-18 12:56:55 -0500
+-->
+     <para>
+      Don't allow CTE references in sub-selects to determine semantic
+      levels of aggregate functions (Tom Lane)
+      <ulink url="&commit_baseurl;12bc32917">&sect;</ulink>
+     </para>
+
+     <para>
+      This change undoes a change made two minor releases ago, instead
+      throwing an error if a sub-select references a CTE that's below the
+      semantic level that standard SQL rules would assign to the aggregate
+      based on contained column references and aggregates.  The attempted
+      fix turned out to cause problems of its own, and it's unclear what
+      to do instead.  Since sub-selects within aggregates are disallowed
+      altogether by the SQL standard, treating such cases as errors seems
+      sufficient.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [b4307ae2e] 2026-01-24 11:30:48 +0000
+Branch: REL_18_STABLE [c6ce4dcf9] 2026-01-24 11:30:48 +0000
+Branch: REL_17_STABLE [c5fc17dda] 2026-01-24 11:30:49 +0000
+Branch: REL_16_STABLE [e7391bbf1] 2026-01-24 11:30:50 +0000
+Branch: REL_15_STABLE [c5824536e] 2026-01-24 11:30:51 +0000
+-->
+     <para>
+      Fix trigger transition table capture for <command>MERGE</command>
+      in CTE queries (Dean Rasheed)
+      <ulink url="&commit_baseurl;c6ce4dcf9">&sect;</ulink>
+     </para>
+
+     <para>
+      When executing a data-modifying CTE query containing both
+      a <command>MERGE</command> and another DML operation on a table with
+      statement-level <literal>AFTER</literal> triggers, the transition
+      tables passed to the triggers would not include the rows affected by
+      the <command>MERGE</command>, only those affected by the other
+      operation(s).
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [889676a0d] 2026-01-16 14:53:50 +0900
+Branch: REL_18_STABLE [f335457e8] 2026-01-16 14:53:32 +0900
+-->
+     <para>
+      Fix incorrect pruning of rowmarks belonging to non-relation
+      rangetable entries, such as subqueries (Dean Rasheed)
+      <ulink url="&commit_baseurl;f335457e8">&sect;</ulink>
+     </para>
+
+     <para>
+      This led to incorrect results if a proposed row update needed to be
+      modified by EvalPlanQual rechecking, as could happen if there was a
+      concurrent update to that row.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [f9a468c66] 2026-01-23 10:23:30 +0900
+Branch: REL_18_STABLE [9f4b7bfc5] 2026-01-23 10:23:26 +0900
+Branch: REL_17_STABLE [933f67fb6] 2026-01-23 10:23:22 +0900
+Branch: REL_16_STABLE [fab386f74] 2026-01-23 10:23:18 +0900
+Branch: REL_15_STABLE [687533b39] 2026-01-23 10:23:14 +0900
+Branch: REL_14_STABLE [6d2fa44d2] 2026-01-23 10:23:10 +0900
+-->
+     <para>
+      Fix failure when all children of a partitioned target table
+      of an update or delete have been pruned (Amit Langote)
+      <ulink url="&commit_baseurl;9f4b7bfc5">&sect;</ulink>
+     </para>
+
+     <para>
+      In such cases, the executor could report <quote>could not find junk
+      ctid column</quote> errors, even though nothing needs to be done.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [75609fded] 2026-01-06 19:51:10 -0500
+Branch: REL_18_STABLE [bdc5dedfc] 2026-01-06 19:51:19 -0500
+-->
+     <para>
+      Fix expression evaluation bug for a sub-select within an array
+      subscript (Andres Freund)
+      <ulink url="&commit_baseurl;bdc5dedfc">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6dfce8420] 2025-12-05 20:10:33 -0500
+Branch: REL_18_STABLE [18b349315] 2025-12-05 20:10:33 -0500
+-->
+     <para>
+      Fix text substring search for non-deterministic collations
+      (Laurenz Albe)
+      <ulink url="&commit_baseurl;18b349315">&sect;</ulink>
+     </para>
+
+     <para>
+      When using a non-deterministic collation, we failed to detect a
+      match occurring at the very end of the searched string.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [7027dd499] 2026-01-26 23:27:15 +1300
+Branch: REL_18_STABLE [ccde5be68] 2026-01-26 23:46:23 +1300
+Branch: REL_17_STABLE [cae812741] 2026-01-26 23:47:07 +1300
+Branch: REL_16_STABLE [4297a3519] 2026-01-26 23:47:37 +1300
+-->
+     <para>
+      Avoid possible planner failure when a query contains duplicate
+      window function calls (Meng Zhang, David Rowley)
+      <ulink url="&commit_baseurl;ccde5be68">&sect;</ulink>
+     </para>
+
+     <para>
+      Confusion over de-duplication of such calls could result in errors
+      like <quote>WindowFunc with winref 2 assigned to WindowAgg with
+      winref 1</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [325808cac] 2025-12-25 12:12:52 +0900
+Branch: REL_18_STABLE [382ce9cb7] 2025-12-25 12:15:09 +0900
+-->
+     <para>
+      Fix planner error with set-returning functions and grouping sets
+      (Richard Guo)
+      <ulink url="&commit_baseurl;382ce9cb7">&sect;</ulink>
+     </para>
+
+     <para>
+      When constructing a ProjectSet plan node, the planner failed to
+      detect that subexpressions involving grouping expressions were
+      already computed by the input plan.  This led to inefficient plans
+      or errors such as <quote>variable not found in subplan target
+      list</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [34740b90b] 2026-01-19 11:13:23 +0900
+Branch: REL_18_STABLE [7650eabb6] 2026-01-19 11:14:51 +0900
+-->
+     <para>
+      Avoid incorrect optimization when a subquery's grouping clause
+      contains a volatile or set-returning function (Richard Guo)
+      <ulink url="&commit_baseurl;7650eabb6">&sect;</ulink>
+     </para>
+
+     <para>
+      The planner was willing to push down outer-query restrictions
+      referencing such a grouping column, leading to incorrect behavior
+      due to multiple evaluation of a volatile function, or errors caused
+      by introduction of a set-returning function into the
+      subquery's <literal>WHERE</literal>/<literal>HAVING</literal>
+      clauses.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [559f9e90d] 2025-12-29 11:40:45 +0900
+Branch: REL_18_STABLE [7e9f852a7] 2025-12-29 11:44:14 +0900
+-->
+     <para>
+      Look through PlaceHolderVar nodes when searching for statistics
+      about an expression (Richard Guo)
+      <ulink url="&commit_baseurl;7e9f852a7">&sect;</ulink>
+     </para>
+
+     <para>
+      This change allows the planner to find relevant statistics about
+      expressions pulled up from subqueries or used in <literal>GROUP
+      BY</literal>, avoiding falling back to a default estimate.
+      (Arguably we should adjust any found statistics to account for an
+      increased probability of the value being NULL, but we've never done
+      the equivalent thing for plain Vars either.)  While this restriction
+      is old, changes in <productname>PostgreSQL</productname> version 18
+      made PlaceHolderVars more common than before, so make the change to
+      avoid plan regressions in affected cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [ad66f705f] 2025-12-29 11:38:49 +0900
+Branch: REL_18_STABLE [b4cf74420] 2025-12-29 11:43:06 +0900
+-->
+     <para>
+      Look through no-op PlaceHolderVar nodes when matching expressions to
+      indexes (Richard Guo)
+      <ulink url="&commit_baseurl;b4cf74420">&sect;</ulink>
+     </para>
+
+     <para>
+      Because <productname>PostgreSQL</productname> version 18 uses
+      PlaceHolderVars in more cases than before, some queries that
+      formerly could use an index failed to do so.  Add logic to prevent
+      that regression.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ed931377a] 2025-11-17 13:54:52 -0500
+Branch: REL_18_STABLE [bf5b13a8a] 2025-11-17 13:55:26 -0500
+-->
+     <para>
+      Fix planner's conversion of <literal>OR</literal> clauses to
+      ScalarArrayOp index conditions (Tender Wang, Tom Lane)
+      <ulink url="&commit_baseurl;bf5b13a8a">&sect;</ulink>
+     </para>
+
+     <para>
+      The code did not handle RelabelType nodes correctly, and could
+      generate invalid expressions or fail to perform a valid conversion.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [5528e8d10] 2025-11-27 13:09:59 -0500
+Branch: REL_18_STABLE [a212877dc] 2025-11-27 13:09:59 -0500
+Branch: REL_17_STABLE [e79b27662] 2025-11-27 13:09:59 -0500
+Branch: REL_16_STABLE [b497766a8] 2025-11-27 13:09:59 -0500
+Branch: REL_15_STABLE [f19502f04] 2025-11-27 13:09:59 -0500
+Branch: REL_14_STABLE [9e77323fc] 2025-11-27 13:09:59 -0500
+-->
+     <para>
+      Allow indexscans on partial hash indexes even when the index's
+      predicate implies the truth of the WHERE clause (Tom Lane)
+      <ulink url="&commit_baseurl;a212877dc">&sect;</ulink>
+     </para>
+
+     <para>
+      Normally we drop a WHERE clause that is implied by the predicate,
+      since it's pointless to test it; it must hold for every index
+      entry.  However that can prevent creation of an indexscan plan if
+      the index is one that requires a WHERE clause on the leading index
+      key, as hash indexes do.  Don't drop implied clauses when
+      considering such an index.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [951b60f7a] 2025-12-18 15:08:48 +0200
+Branch: REL_18_STABLE [d77a5f981] 2025-12-18 15:09:26 +0200
+Branch: REL_17_STABLE [4b6d096a0] 2025-12-18 15:09:23 +0200
+Branch: REL_16_STABLE [a5277700e] 2025-12-18 15:09:21 +0200
+Branch: REL_15_STABLE [460d97020] 2025-12-18 15:09:19 +0200
+Branch: REL_14_STABLE [ab4256869] 2025-12-18 15:09:17 +0200
+-->
+     <para>
+      Do not emit WAL for unlogged BRIN indexes (Kirill Reshke)
+      <ulink url="&commit_baseurl;d77a5f981">&sect;</ulink>
+     </para>
+
+     <para>
+      One seldom-taken code path incorrectly emitted a WAL record
+      relating to a BRIN index even if the index was marked unlogged.
+      Crash recovery would then fail to replay that record, complaining
+      that the file already exists.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [db14dcdec] 2026-01-26 20:05:17 +0100
+Branch: REL_18_STABLE [eee71a66c] 2026-01-26 20:05:00 +0100
+-->
+     <para>
+      Use the correct ordering function in parallel GIN index builds
+      (Tomas Vondra)
+      <ulink url="&commit_baseurl;eee71a66c">&sect;</ulink>
+     </para>
+
+     <para>
+      The parallel code used the default ordering operator (which is
+      determined by the column data type's btree opclass), whereas it
+      should use the ordering function specified by the GIN opclass, if
+      any.  This led to a failure if the data type has no btree opclass,
+      or to an invalid index if the opclass specifies an ordering function
+      that doesn't agree with the btree opclass.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [8eeb4a0f7] 2025-11-12 20:59:36 +0200
+Branch: REL_18_STABLE [321ec5462] 2025-11-12 21:00:42 +0200
+Branch: REL_17_STABLE [d02c03ddc] 2025-11-12 21:01:13 +0200
+Branch: REL_16_STABLE [053e1868b] 2025-11-12 21:01:42 +0200
+Branch: REL_15_STABLE [1a469d7b5] 2025-11-12 21:02:12 +0200
+Branch: REL_14_STABLE [eba917d36] 2025-11-12 21:02:36 +0200
+Branch: master [797e9ea6e] 2025-11-12 20:59:44 +0200
+Branch: REL_18_STABLE [7b069a187] 2025-11-12 21:00:46 +0200
+Branch: REL_17_STABLE [c2682810a] 2025-11-12 21:01:16 +0200
+Branch: REL_16_STABLE [44e8c60be] 2025-11-12 21:01:45 +0200
+Branch: REL_15_STABLE [0c862646c] 2025-11-12 21:02:14 +0200
+Branch: REL_14_STABLE [c2e58c071] 2025-11-12 21:02:38 +0200
+Branch: master [0bdc777e8] 2025-11-12 21:19:03 +0200
+Branch: REL_18_STABLE [82fa6b78d] 2025-11-12 21:26:58 +0200
+Branch: REL_17_STABLE [d80d5f099] 2025-11-12 21:27:02 +0200
+Branch: REL_16_STABLE [0e8eaa218] 2025-11-12 21:27:05 +0200
+Branch: REL_15_STABLE [21a9014cf] 2025-11-12 21:27:07 +0200
+Branch: REL_14_STABLE [84f1bf4af] 2025-11-12 21:27:11 +0200
+-->
+     <para>
+      Prevent truncation of CLOG that is still needed by
+      unread <command>NOTIFY</command> messages (Joel Jacobson, Heikki
+      Linnakangas)
+      <ulink url="&commit_baseurl;321ec5462">&sect;</ulink>
+      <ulink url="&commit_baseurl;7b069a187">&sect;</ulink>
+      <ulink url="&commit_baseurl;82fa6b78d">&sect;</ulink>
+     </para>
+
+     <para>
+      This fix prevents <quote>could not access status of
+      transaction</quote> errors when a backend is slow to
+      absorb <command>NOTIFY</command> messages.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [1b4699090] 2025-11-12 20:59:28 +0200
+Branch: REL_18_STABLE [aab4a84bb] 2025-11-12 21:00:25 +0200
+Branch: REL_17_STABLE [b821c9292] 2025-11-12 21:01:08 +0200
+Branch: REL_16_STABLE [c1a5bde00] 2025-11-12 21:01:39 +0200
+Branch: REL_15_STABLE [b1da37de2] 2025-11-12 21:02:07 +0200
+Branch: REL_14_STABLE [7cb05dd2d] 2025-11-12 21:02:32 +0200
+-->
+     <para>
+      Escalate errors occurring during <command>NOTIFY</command> message
+      processing to FATAL, i.e. close the connection (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;aab4a84bb">&sect;</ulink>
+     </para>
+
+     <para>
+      Formerly, if a backend got an error while absorbing
+      a <command>NOTIFY</command> message, it would advance past that
+      message, report the error to the client, and move on.  That behavior
+      was fraught with problems though.  One big concern is that the
+      client has no good way to know that a notification was lost, and
+      certainly no way to know what was in it.  Depending on the
+      application logic, missing a notification could cause the
+      application to get stuck waiting, for example.  Also, any remaining
+      messages would not get processed until someone sent a
+      new <command>NOTIFY</command>.
+     </para>
+
+     <para>
+      Also, if the connection is idle at the time of receiving
+      a <command>NOTIFY</command> signal, any ERROR would be escalated to
+      FATAL anyway, due to unrelated concerns.  Therefore, we've chosen to
+      make that happen in all cases, for consistency and to provide a
+      clear signal to the application that it might have missed some
+      notifications.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [e217dc748] 2026-01-14 08:44:12 +0900
+Branch: REL_18_STABLE [9c3caad02] 2026-01-14 08:44:52 +0900
+-->
+     <para>
+      Consider grouping expressions when computing a query ID hash
+      (Jian He)
+      <ulink url="&commit_baseurl;9c3caad02">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, two queries that were the same except in <literal>GROUP
+      BY</literal> expressions would be merged
+      by <filename>contrib/pg_stat_statements</filename> and other users
+      of query IDs.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [1b92fe7bb] 2025-11-16 22:14:06 +0000
+Branch: REL_18_STABLE [5749d95d4] 2025-11-16 22:15:10 +0000
+Branch: REL_17_STABLE [d6c415c4b] 2025-11-16 22:15:45 +0000
+-->
+     <para>
+      Fix erroneous counting of updates in <command>EXPLAIN ANALYZE
+      MERGE</command> with a concurrent update (Dean Rasheed)
+      <ulink url="&commit_baseurl;5749d95d4">&sect;</ulink>
+     </para>
+
+     <para>
+      This situation led to an incorrect count of <quote>skipped</quote>
+      tuples in <command>EXPLAIN</command>'s output, or to an assertion
+      failure in an assert-enabled build.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [955f55068] 2025-12-23 13:37:16 +0200
+Branch: REL_18_STABLE [3e3a80f62] 2025-12-23 13:37:23 +0200
+Branch: REL_17_STABLE [bb87d7fef] 2025-12-23 13:37:25 +0200
+Branch: REL_16_STABLE [7efef18ff] 2025-12-23 13:37:27 +0200
+Branch: REL_15_STABLE [5d5487cd2] 2025-12-23 13:37:29 +0200
+Branch: REL_14_STABLE [b6201c76e] 2025-12-23 13:37:31 +0200
+-->
+     <para>
+      Fix bug in following update chain when locking a tuple (Jasper
+      Smit)
+      <ulink url="&commit_baseurl;3e3a80f62">&sect;</ulink>
+     </para>
+
+     <para>
+      This code path neglected to check the xmin of the first new tuple in
+      the update chain, making it possible to lock an unrelated tuple if
+      the original updater aborted and the space was immediately reclaimed
+      by <command>VACUUM</command> and then re-used.
+      That could cause unexpected transaction delays or deadlocks.
+      Errors associated with having identified the wrong tuple have also
+      been observed.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [ecd275718] 2026-01-19 12:09:32 -0500
+Branch: REL_18_STABLE [c80b0c9d6] 2026-01-19 12:09:48 -0500
+Branch: REL_17_STABLE [ad569b54a] 2026-01-19 12:10:00 -0500
+-->
+     <para>
+      Fix incorrect handling of incremental backups of large tables
+      (Robert Haas, Oleg Tkachenko)
+      <ulink url="&commit_baseurl;c80b0c9d6">&sect;</ulink>
+     </para>
+
+     <para>
+      If a table exceeding 1GB (or in general, the installation's segment
+      size) is truncated by <literal>VACUUM</literal> between the base
+      backup and the incremental
+      backup, <application>pg_combinebackup</application> could fail with
+      an error about <quote>truncation block length in excess of segment
+      size</quote>.  This prevented restoring the incremental backup.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [9cbb1d21d] 2026-01-16 13:02:42 +0900
+Branch: REL_18_STABLE [1943ceb38] 2026-01-16 13:14:21 +0900
+Branch: REL_17_STABLE [4071fe900] 2026-01-16 13:19:53 +0900
+Branch: REL_16_STABLE [980b7c736] 2026-01-16 13:19:59 +0900
+Branch: REL_15_STABLE [b926ff137] 2026-01-16 13:20:05 +0900
+Branch: REL_14_STABLE [f6df78173] 2026-01-16 13:20:11 +0900
+-->
+     <para>
+      Fix potential backend process crash at process exit due to trying to
+      release a lock in an already-unmapped shared memory segment
+      (Rahila Syed)
+      <ulink url="&commit_baseurl;1943ceb38">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [807764990] 2026-01-15 11:09:07 -0500
+Branch: REL_18_STABLE [7f1b3a4ce] 2026-01-15 11:09:49 -0500
+-->
+     <para>
+      Fix race condition in async I/O code (Andres Freund)
+      <ulink url="&commit_baseurl;7f1b3a4ce">&sect;</ulink>
+     </para>
+
+     <para>
+      It was possible for the result code of an asynchronous I/O operation
+      to be overwritten before it was fetched.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [102bdaa9b] 2026-01-15 16:48:45 +0200
+Branch: REL_18_STABLE [09532a78b] 2026-01-15 16:49:42 +0200
+Branch: REL_17_STABLE [d3ad4cef6] 2026-01-15 16:50:30 +0200
+Branch: REL_16_STABLE [c7946e6f3] 2026-01-15 16:50:37 +0200
+Branch: REL_15_STABLE [a563ac619] 2026-01-15 16:50:42 +0200
+Branch: REL_14_STABLE [46be454ca] 2026-01-15 16:50:46 +0200
+-->
+     <para>
+      Guard against incorrect truncation of the multixact log after a
+      crash (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;09532a78b">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [36b8f4974] 2025-12-27 17:23:30 +0900
+Branch: REL_18_STABLE [06907e864] 2025-12-27 17:23:51 +0900
+Branch: REL_17_STABLE [52b27f585] 2025-12-27 17:23:53 +0900
+Branch: REL_16_STABLE [c48829ed8] 2025-12-27 17:23:54 +0900
+Branch: REL_15_STABLE [300575fe2] 2025-12-27 17:23:56 +0900
+Branch: REL_14_STABLE [ea3524cff] 2025-12-27 17:23:58 +0900
+-->
+     <para>
+      Fix possibly mis-encoded result
+      of <function>pg_stat_get_backend_activity()</function> (Chao Li)
+      <ulink url="&commit_baseurl;06907e864">&sect;</ulink>
+     </para>
+
+     <para>
+      The shared-memory buffer holding a session's activity string can
+      end with an incomplete multibyte character.  Readers are supposed
+      to truncate off any such incomplete character, but this function
+      failed to do so.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [b3ccb0a2c] 2025-12-19 12:05:37 +0900
+Branch: REL_18_STABLE [b863d8d87] 2025-12-19 12:07:10 +0900
+Branch: REL_17_STABLE [699293d27] 2025-12-19 12:07:21 +0900
+Branch: REL_16_STABLE [3853f6168] 2025-12-19 12:08:20 +0900
+Branch: REL_15_STABLE [0fc2f533a] 2025-12-19 12:09:10 +0900
+Branch: REL_14_STABLE [1a9a49699] 2025-12-19 12:09:16 +0900
+-->
+     <para>
+      Guard against recursive memory context logging (Fujii Masao)
+      <ulink url="&commit_baseurl;b863d8d87">&sect;</ulink>
+     </para>
+
+     <para>
+      A constant flow of signals requesting memory context logging could
+      cause recursive execution of the logging code, which in theory could
+      lead to stack overflow.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [f1a6e622b] 2025-12-16 12:24:55 -0500
+Branch: REL_18_STABLE [57df5ab80] 2025-12-16 10:59:05 -0500
+Branch: REL_17_STABLE [1d0fc2499] 2025-12-16 10:59:04 -0500
+Branch: REL_16_STABLE [12c2f843c] 2025-12-16 10:59:02 -0500
+Branch: REL_15_STABLE [bd2726d3e] 2025-12-16 10:59:01 -0500
+Branch: REL_14_STABLE [1d9f7fbba] 2025-12-16 10:59:00 -0500
+-->
+     <para>
+      Fix memory context usage when reinitializing a parallel execution
+      context (Jakub Wartak, Jeevan Chalke)
+      <ulink url="&commit_baseurl;57df5ab80">&sect;</ulink>
+     </para>
+
+     <para>
+      This error could result in a crash due to a subsidiary data
+      structure having a shorter lifespan than the parallel context.
+      The problem is not known to be reachable using only
+      core <productname>PostgreSQL</productname>, but we have reports of
+      trouble in extensions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [789d65364] 2025-12-03 19:15:08 +0200
+Branch: REL_18_STABLE [e46041fd9] 2025-12-03 19:15:18 +0200
+Branch: REL_17_STABLE [8ba61bc06] 2025-12-03 19:15:21 +0200
+Branch: REL_16_STABLE [635166913] 2025-12-03 19:15:24 +0200
+Branch: REL_15_STABLE [8cfb174a6] 2025-12-03 19:15:26 +0200
+Branch: REL_14_STABLE [81416e101] 2025-12-03 19:15:29 +0200
+Branch: master [4d936c3ff] 2025-12-05 11:32:38 +0200
+Branch: REL_18_STABLE [02ba5e3be] 2025-12-05 11:35:20 +0200
+Branch: REL_17_STABLE [cad40cec2] 2025-12-05 11:35:44 +0200
+Branch: REL_16_STABLE [4d689a176] 2025-12-05 11:36:36 +0200
+Branch: REL_15_STABLE [b9a02b978] 2025-12-05 11:36:52 +0200
+Branch: REL_14_STABLE [489695554] 2025-12-05 11:37:06 +0200
+-->
+     <para>
+      Set next multixid's offset when creating a new multixid, to remove
+      the wait loop that was needed in corner cases (Andrey Borodin)
+      <ulink url="&commit_baseurl;e46041fd9">&sect;</ulink>
+      <ulink url="&commit_baseurl;02ba5e3be">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous logic could get stuck waiting for an update that would
+      never occur.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [3881561d7] 2025-11-29 12:28:59 +0000
+Branch: REL_18_STABLE [b880d9a02] 2025-11-29 12:31:30 +0000
+Branch: REL_17_STABLE [c09096503] 2025-11-29 12:32:12 +0000
+Branch: REL_16_STABLE [4d288e33b] 2025-11-29 12:33:04 +0000
+Branch: REL_15_STABLE [134a8ee22] 2025-11-29 12:33:35 +0000
+Branch: REL_14_STABLE [2d5b97b8c] 2025-11-29 12:34:45 +0000
+-->
+     <para>
+      Avoid rewriting data-modifying CTEs more than once (Bernice Southey,
+      Dean Rasheed)
+      <ulink url="&commit_baseurl;b880d9a02">&sect;</ulink>
+     </para>
+
+     <para>
+      Formerly, when updating an auto-updatable view or a relation with
+      rules, if the original query had any data-modifying CTEs, the rewriter
+      would rewrite those CTEs multiple times due to recursion.  This was
+      inefficient and could produce false errors if a CTE included an
+      update of an always-generated column.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [dbdc717ac] 2025-11-26 15:12:25 -0600
+Branch: REL_18_STABLE [b83bcc0df] 2025-11-26 15:12:25 -0600
+Branch: REL_17_STABLE [2fc5c5062] 2025-11-26 15:12:25 -0600
+-->
+     <para>
+      Allow retrying initialization of a DSM registry entry
+      (Nathan Bossart)
+      <ulink url="&commit_baseurl;b83bcc0df">&sect;</ulink>
+     </para>
+
+     <para>
+      If we fail partway through initialization of a dynamic shared memory
+      entry, allow the next attempt to use that entry to retry
+      initialization.  Previously the entry was left in a
+      permanently-failed state.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [3fccbd94c] 2026-01-27 00:21:40 +0100
+Branch: REL_18_STABLE [9796c4f56] 2026-01-26 23:37:03 +0100
+-->
+     <para>
+      Avoid failure of NUMA status views when a page has been swapped out
+      (Tomas Vondra)
+      <ulink url="&commit_baseurl;9796c4f56">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [599336c64] 2025-11-20 13:26:49 +0100
+Branch: REL_18_STABLE [482e98ac4] 2025-11-20 13:26:14 +0100
+-->
+     <para>
+      Avoid <quote>operation not permitted</quote> errors when querying
+      NUMA page status with older libnuma versions (Tomas Vondra)
+      <ulink url="&commit_baseurl;482e98ac4">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [dc7c77f82] 2025-12-16 13:29:28 +0900
+Branch: REL_18_STABLE [68ebdf2b0] 2025-12-16 13:29:36 +0900
+Branch: REL_17_STABLE [f5927da4f] 2025-12-16 13:29:39 +0900
+Branch: REL_16_STABLE [1aa57e9ed] 2025-12-16 13:29:41 +0900
+Branch: REL_15_STABLE [95ef6f490] 2025-12-16 13:29:42 +0900
+Branch: REL_14_STABLE [14161bca4] 2025-12-16 13:29:44 +0900
+-->
+     <para>
+      Fail recovery if WAL does not exist back to the redo point indicated
+      by the checkpoint record (Nitin Jadhav)
+      <ulink url="&commit_baseurl;68ebdf2b0">&sect;</ulink>
+     </para>
+
+     <para>
+      Add an explicit check for this before starting recovery, so that no
+      harm is done and a useful error message is provided.  Previously,
+      recovery might crash or corrupt the database in this situation.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [6ca8506ea] 2026-01-06 17:29:12 +1300
+Branch: REL_18_STABLE [bea57a6b4] 2026-01-06 17:29:44 +1300
+Branch: REL_17_STABLE [bb08ac7ac] 2026-01-06 17:30:08 +1300
+Branch: REL_16_STABLE [0687a6eb0] 2026-01-06 17:30:32 +1300
+Branch: REL_15_STABLE [f20b79059] 2026-01-06 17:30:57 +1300
+Branch: REL_14_STABLE [ae45c7296] 2026-01-06 17:31:20 +1300
+-->
+     <para>
+      Avoid scribbling on the source query tree during <command>ALTER
+      PUBLICATION</command> (Sunil S)
+      <ulink url="&commit_baseurl;bea57a6b4">&sect;</ulink>
+     </para>
+
+     <para>
+      This error had the visible effect that an event trigger fired for
+      the query would see only the first <literal>publish</literal>
+      option, even if several had been specified.  If such a query were
+      set up as a prepared statement, re-executions would misbehave too.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [d926462d8] 2026-01-06 11:52:22 +0900
+Branch: REL_18_STABLE [797fc5d1b] 2026-01-06 11:54:09 +0900
+Branch: REL_17_STABLE [7a990e801] 2026-01-06 11:54:14 +0900
+Branch: REL_16_STABLE [75f3428f2] 2026-01-06 11:54:46 +0900
+Branch: REL_15_STABLE [f7eb44e0f] 2026-01-06 11:55:46 +0900
+-->
+     <para>
+      Pass connection options specified in <literal>CREATE SUBSCRIPTION
+      ... CONNECTION</literal> to the publisher's walsender (Fujii Masao)
+      <ulink url="&commit_baseurl;797fc5d1b">&sect;</ulink>
+     </para>
+
+     <para>
+      Before this fix, the <literal>options</literal> connection option
+      (if any) was ignored, thus for example preventing setting custom
+      server parameter values in the walsender session.  It was intended
+      for that to work, and it did work before refactoring
+      in <productname>PostgreSQL</productname> version 15 broke it, so
+      restore the previous behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [851f6649c] 2026-01-27 05:06:29 +0000
+Branch: REL_18_STABLE [919c9fa13] 2026-01-27 05:45:25 +0000
+Branch: REL_17_STABLE [3243c0177] 2026-01-27 05:49:23 +0000
+Branch: master [3a98f989e] 2026-01-29 03:22:02 +0000
+Branch: REL_18_STABLE [1c60f7236] 2026-01-29 03:34:55 +0000
+Branch: REL_17_STABLE [9649f1adf] 2026-01-29 02:57:02 +0000
+Branch: master [006dd4b2e] 2025-12-08 05:21:22 +0000
+Branch: REL_18_STABLE [d3ceb2084] 2025-12-08 05:33:14 +0000
+Branch: REL_17_STABLE [3510ebeb0] 2026-01-08 07:17:56 +0000
+Branch: REL_16_STABLE [24cce33c3] 2026-01-08 07:07:23 +0000
+Branch: REL_15_STABLE [aae05622a] 2026-01-08 06:54:52 +0000
+Branch: REL_14_STABLE [7406df605] 2026-01-08 06:44:28 +0000
+-->
+     <para>
+      Prevent invalidation of newly created or newly synced replication
+      slots (Zhijie Hou)
+      <ulink url="&commit_baseurl;919c9fa13">&sect;</ulink>
+      <ulink url="&commit_baseurl;1c60f7236">&sect;</ulink>
+      <ulink url="&commit_baseurl;d3ceb2084">&sect;</ulink>
+     </para>
+
+     <para>
+      A race condition with a concurrent checkpoint could allow WAL to be
+      removed that is needed by the replication slot, causing the slot to
+      immediately get marked invalid.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Masahiko Sawada <msawada@postgresql.org>
+Branch: master [2a5225b99] 2025-12-30 10:56:30 -0800
+Branch: REL_18_STABLE [fd7c86cfa] 2025-12-30 10:56:28 -0800
+Branch: REL_17_STABLE [123b851ab] 2025-12-30 10:56:25 -0800
+Branch: REL_16_STABLE [821466722] 2025-12-30 10:56:23 -0800
+Branch: REL_15_STABLE [fa557d300] 2025-12-30 10:56:21 -0800
+Branch: REL_14_STABLE [57048d6e1] 2025-12-30 10:56:18 -0800
+-->
+     <para>
+      Fix race condition in computing a replication slot's required xmin
+      (Zhijie Hou)
+      <ulink url="&commit_baseurl;fd7c86cfa">&sect;</ulink>
+     </para>
+
+     <para>
+      This could lead to the error <quote>cannot build an initial slot
+      snapshot as oldest safe xid follows snapshot's xmin</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [8e0d32a4a] 2025-12-23 14:32:14 +0900
+Branch: REL_18_STABLE [b07c32619] 2025-12-23 14:32:19 +0900
+Branch: REL_17_STABLE [e063ccc72] 2025-12-23 14:32:21 +0900
+Branch: REL_16_STABLE [e22e9ab0c] 2025-12-23 14:32:22 +0900
+Branch: REL_15_STABLE [90d1beef6] 2025-12-23 14:32:24 +0900
+Branch: REL_14_STABLE [25a04aa52] 2025-12-23 14:32:25 +0900
+-->
+     <para>
+      During initial synchronization of a logical replication
+      subscription, commit the addition of
+      a <structname>pg_replication_origin</structname> entry before
+      starting to copy data (Zhijie Hou)
+      <ulink url="&commit_baseurl;b07c32619">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, if the copy step failed, the
+      new <structname>pg_replication_origin</structname> entry would be
+      lost due to transaction rollback.  This led to inconsistent state in
+      shared memory.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [1528b0d89] 2025-12-24 04:36:39 +0000
+Branch: REL_18_STABLE [2f7ffe124] 2025-12-24 04:21:43 +0000
+Branch: REL_17_STABLE [0ed8f1afb] 2025-12-24 04:05:06 +0000
+Branch: REL_16_STABLE [63a65adf4] 2025-12-24 04:19:57 +0000
+-->
+     <para>
+      Don't advance logical replication progress after a parallel worker
+      apply failure (Zhijie Hou)
+      <ulink url="&commit_baseurl;2f7ffe124">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous behavior allowed transactions to be lost by a
+      subscriber.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [04396eacd] 2025-12-09 07:25:20 +0000
+Branch: REL_18_STABLE [6c61c69d5] 2025-12-09 07:12:37 +0000
+Branch: REL_17_STABLE [f2818868a] 2025-12-09 07:02:08 +0000
+-->
+     <para>
+      Fix logical replication slotsync worker processes to handle
+      LOCK_TIMEOUT signals correctly (Zhijie Hou)
+      <ulink url="&commit_baseurl;6c61c69d5">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, timeout signals were effectively ignored.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [23b25586d] 2026-01-15 21:02:49 +0200
+Branch: REL_18_STABLE [9ed411e08] 2026-01-15 21:02:54 +0200
+Branch: REL_17_STABLE [c3770181c] 2026-01-15 21:02:59 +0200
+Branch: REL_16_STABLE [a2eeb04f3] 2026-01-15 21:03:12 +0200
+Branch: REL_15_STABLE [ef8465588] 2026-01-15 21:03:16 +0200
+Branch: REL_14_STABLE [2514f1c77] 2026-01-15 20:58:05 +0200
+-->
+     <para>
+      Fix possible failure with <quote>unexpected data beyond EOF</quote>
+      during restart of a streaming replica server (Anthonin Bonnefoy)
+      <ulink url="&commit_baseurl;9ed411e08">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [519fa0433] 2025-11-27 12:07:01 +0900
+Branch: REL_18_STABLE [15ba0702c] 2025-11-27 11:59:40 +0900
+Branch: REL_17_STABLE [b5511fed5] 2025-11-27 11:59:36 +0900
+-->
+     <para>
+      Fix error reporting for SQL/JSON path type mismatches (Jian He)
+      <ulink url="&commit_baseurl;15ba0702c">&sect;</ulink>
+     </para>
+
+     <para>
+      The code could produce a <quote>cache lookup failed for type 0</quote>
+      error instead of the intended complaint about the path expression
+      not being of the right type.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [349107537] 2026-01-09 11:01:36 +1300
+Branch: REL_18_STABLE [c35e5dd9a] 2026-01-09 11:02:59 +1300
+Branch: REL_17_STABLE [84b787ae6] 2026-01-09 11:03:24 +1300
+Branch: REL_16_STABLE [821c4d27b] 2026-01-09 11:03:48 +1300
+Branch: REL_15_STABLE [3ad05640b] 2026-01-09 11:04:12 +1300
+Branch: REL_14_STABLE [a65995947] 2026-01-09 11:04:39 +1300
+-->
+     <para>
+      Fix erroneous tracking of column position when parsing partition
+      range bounds (myzhen)
+      <ulink url="&commit_baseurl;c35e5dd9a">&sect;</ulink>
+     </para>
+
+     <para>
+      This could, for example, lead to the wrong column name being cited
+      in error messages about casting partition bound values to the
+      column's data type.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [74a116a79] 2026-02-06 15:38:16 +0900
+Branch: REL_18_STABLE [acfa422c3] 2026-02-06 15:38:21 +0900
+Branch: REL_17_STABLE [67ad4387b] 2026-02-06 15:38:23 +0900
+Branch: REL_16_STABLE [977a17a3e] 2026-02-06 15:38:25 +0900
+Branch: REL_15_STABLE [4ec943f7d] 2026-02-06 15:38:27 +0900
+Branch: REL_14_STABLE [d32e17160] 2026-02-06 15:38:29 +0900
+Branch: master [c8ec74713] 2026-02-04 16:38:06 +0900
+Branch: REL_18_STABLE [2ca4464b6] 2026-02-04 16:38:10 +0900
+Branch: REL_17_STABLE [263af458e] 2026-02-04 16:38:12 +0900
+Branch: master [a9afa021e] 2026-02-02 10:21:04 +0900
+Branch: REL_18_STABLE [ab61f0087] 2026-02-02 10:21:07 +0900
+Branch: REL_17_STABLE [5995135f1] 2026-02-02 10:21:10 +0900
+Branch: master [6bca4b50d] 2026-01-18 17:24:25 +0900
+Branch: REL_18_STABLE [69ee81932] 2026-01-18 17:24:58 +0900
+Branch: REL_17_STABLE [05ef2371a] 2026-01-18 17:25:00 +0900
+Branch: REL_16_STABLE [e8fd6c9fd] 2026-01-18 17:25:01 +0900
+Branch: REL_15_STABLE [fbf8df580] 2026-01-18 17:25:03 +0900
+Branch: REL_14_STABLE [f1dc7a5b7] 2026-01-18 17:25:04 +0900
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master [1653ce523] 2026-02-07 22:37:02 +0100
+Branch: REL_18_STABLE [cff2ef984] 2026-02-07 22:53:16 +0100
+Branch: REL_17_STABLE [5449fd261] 2026-02-07 22:53:21 +0100
+Branch: REL_16_STABLE [a7bdbbada] 2026-02-07 22:53:25 +0100
+Branch: REL_15_STABLE [9dcd0b3de] 2026-02-07 22:53:34 +0100
+Branch: REL_14_STABLE [3e7bb39df] 2026-02-07 22:53:38 +0100
+-->
+     <para>
+      Fix assorted minor errors in error messages (Man Zeng, Tianchen Zhang)
+      <ulink url="&commit_baseurl;acfa422c3">&sect;</ulink>
+      <ulink url="&commit_baseurl;2ca4464b6">&sect;</ulink>
+      <ulink url="&commit_baseurl;ab61f0087">&sect;</ulink>
+      <ulink url="&commit_baseurl;69ee81932">&sect;</ulink>
+      <ulink url="&commit_baseurl;cff2ef984">&sect;</ulink>
+     </para>
+
+     <para>
+      For example, an error report about mismatched timeline number in a
+      backup manifest showed the starting timeline number where it meant
+      to show the ending timeline number.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [e5d99b4d9] 2026-01-22 16:03:47 +1300
+Branch: REL_18_STABLE [f1c6b153c] 2026-01-22 16:10:58 +1300
+Branch: REL_17_STABLE [d0bb0e5b3] 2026-01-22 16:10:28 +1300
+Branch: REL_16_STABLE [7600dc79c] 2026-01-22 16:10:08 +1300
+Branch: REL_15_STABLE [cbdd09ae1] 2026-01-22 16:09:29 +1300
+Branch: REL_14_STABLE [de8081c30] 2026-01-22 16:06:06 +1300
+-->
+     <para>
+      Fix failure to perform function inlining when doing JIT compilation
+      with LLVM version 17 or later (Anthonin Bonnefoy)
+      <ulink url="&commit_baseurl;f1c6b153c">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [0dceba21d] 2025-11-22 21:21:11 +1300
+Branch: REL_18_STABLE [912cfa314] 2025-11-22 21:21:54 +1300
+Branch: REL_17_STABLE [60215eae7] 2025-11-22 21:22:37 +1300
+Branch: REL_16_STABLE [600acd34b] 2025-11-22 21:23:23 +1300
+Branch: REL_15_STABLE [55164852d] 2025-11-22 21:23:45 +1300
+Branch: REL_14_STABLE [035a1f5ac] 2025-11-22 21:20:27 +1300
+-->
+     <para>
+      Adjust our JIT code to work with LLVM 21 (Holger Hoffstätte)
+      <ulink url="&commit_baseurl;912cfa314">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous coding failed to compile on aarch64 machines.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6d969ca68] 2025-11-17 15:24:34 -0500
+Branch: REL_18_STABLE [db4eba152] 2025-11-17 15:24:40 -0500
+Branch: master [3e83bdd35] 2025-11-18 16:16:46 -0500
+Branch: REL_18_STABLE [6a5170755] 2025-11-18 16:16:51 -0500
+-->
+     <para>
+      Fix aarch64-specific code to build with old (RHEL7-era) system
+      header files (Tom Lane)
+      <ulink url="&commit_baseurl;db4eba152">&sect;</ulink>
+      <ulink url="&commit_baseurl;6a5170755">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Masahiko Sawada <msawada@postgresql.org>
+Branch: master [85d5bd308] 2025-12-31 11:18:14 -0800
+Branch: REL_18_STABLE [640772c6d] 2025-12-31 11:18:17 -0800
+-->
+     <para>
+      Fix incorrect configure probe
+      for <function>io_uring_queue_init_mem()</function> (Masahiko Sawada)
+      <ulink url="&commit_baseurl;640772c6d">&sect;</ulink>
+     </para>
+
+     <para>
+      This error resulted in failure to optimize async I/O buffer
+      allocations in autotools-based builds, though the code did work when
+      building with meson.  The main impact of the omission was
+      slower-than-necessary backend process exits.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [f94e9141a] 2026-02-06 17:38:49 +1300
+Branch: REL_18_STABLE [33e3de6d7] 2026-02-06 17:38:39 +1300
+Branch: REL_17_STABLE [4dac22aa1] 2026-02-06 17:41:42 +1300
+Branch: REL_16_STABLE [e37b59802] 2026-02-06 17:43:49 +1300
+-->
+     <para>
+      Add new server parameter <xref linkend="guc-file-extend-method"/> to
+      control use of <function>posix_fallocate()</function> (Thomas Munro)
+      <ulink url="&commit_baseurl;33e3de6d7">&sect;</ulink>
+     </para>
+
+     <para>
+      <productname>PostgreSQL</productname> version 16 and later will
+      use <function>posix_fallocate()</function>, if the platform provides
+      it, to extend relation files.  However, this has been reported to
+      interact poorly with some file systems: BTRFS compression is
+      disabled by the use of <function>posix_fallocate()</function>, and
+      XFS could produce spurious <literal>ENOSPC</literal> errors in older
+      Linux kernel versions.  To provide a workaround, introduce this new
+      server parameter.  Setting <varname>file_extend_method</varname>
+      to <literal>write_zeros</literal> will cause the server to return to
+      the old method of extending files by writing blocks of zeroes.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [c507ba55f] 2025-12-10 09:01:35 +1300
+Branch: REL_18_STABLE [bebb281b0] 2025-12-10 09:05:21 +1300
+Branch: REL_17_STABLE [f24af0e04] 2025-12-10 09:10:31 +1300
+Branch: REL_16_STABLE [d62a258cd] 2025-12-10 09:11:19 +1300
+Branch: master [bec2a0aa3] 2025-12-21 17:34:20 +1300
+Branch: REL_18_STABLE [a7d06e74d] 2025-12-21 17:34:49 +1300
+Branch: REL_17_STABLE [045185913] 2025-12-21 17:35:46 +1300
+Branch: REL_16_STABLE [0666ccc16] 2025-12-21 17:36:04 +1300
+Branch: master [45d92b76d] 2025-12-29 15:47:31 +1300
+Branch: REL_18_STABLE [4da5c33a3] 2025-12-29 15:48:27 +1300
+Branch: REL_17_STABLE [b3c8119e2] 2025-12-29 15:28:17 +1300
+Branch: REL_16_STABLE [80e8ec772] 2025-12-29 15:31:39 +1300
+-->
+     <para>
+      Honor <function>open()</function>'s <literal>O_CLOEXEC</literal>
+      flag on Windows (Bryan Green, Thomas Munro)
+      <ulink url="&commit_baseurl;bebb281b0">&sect;</ulink>
+      <ulink url="&commit_baseurl;a7d06e74d">&sect;</ulink>
+      <ulink url="&commit_baseurl;4da5c33a3">&sect;</ulink>
+     </para>
+
+     <para>
+      Make this flag work like it does on POSIX platforms, so that we
+      don't leak file handles into child processes such as <literal>COPY
+      TO/FROM PROGRAM</literal>.  While that leakage hasn't caused many
+      problems, it seems undesirable.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c0bf15729] 2026-02-07 20:05:52 -0500
+Branch: REL_18_STABLE [5eac1d68f] 2026-02-07 20:05:52 -0500
+Branch: REL_17_STABLE [59c2f7efa] 2026-02-07 20:05:52 -0500
+Branch: REL_16_STABLE [7369656fa] 2026-02-07 20:05:52 -0500
+-->
+     <para>
+      Fix failure to parse long options on the server command line in
+      Solaris executables built with meson (Tom Lane)
+      <ulink url="&commit_baseurl;5eac1d68f">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [32b236644] 2025-11-17 12:48:55 +1300
+Branch: REL_18_STABLE [bcfca332f] 2025-11-17 12:48:47 +1300
+Branch: REL_17_STABLE [d66a922f9] 2025-11-17 12:48:37 +1300
+Branch: REL_16_STABLE [a1407dade] 2025-11-17 12:48:22 +1300
+Branch: REL_15_STABLE [3995e4a9d] 2025-11-18 11:19:56 +1300
+Branch: REL_14_STABLE [29a3e22f3] 2025-11-18 11:21:15 +1300
+-->
+     <para>
+      Support process title changes on GNU/Hurd (Michael Banck)
+      <ulink url="&commit_baseurl;bcfca332f">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Masahiko Sawada <msawada@postgresql.org>
+Branch: master [c5c808f9b] 2025-12-24 13:55:29 -0800
+Branch: REL_18_STABLE [4e1376900] 2025-12-24 13:55:32 -0800
+-->
+     <para>
+      Fix <application>psql</application>'s tab completion
+      for <command>VACUUM</command> option values (Yugo Nagata)
+      <ulink url="&commit_baseurl;4e1376900">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [4b77282f2] 2026-01-29 16:20:45 +0900
+Branch: REL_18_STABLE [d42735b1e] 2026-01-29 16:20:50 +0900
+-->
+     <para>
+      In <application>psql</application> command prompts,
+      do not show a value for <literal>%P</literal> (pipeline status) when
+      there is no server connection (Chao Li)
+      <ulink url="&commit_baseurl;d42735b1e">&sect;</ulink>
+     </para>
+
+     <para>
+      This makes <literal>%P</literal> act like other prompt escape
+      sequences whose values depend on the active connection.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [7a485bd64] 2026-01-09 10:12:54 -0600
+Branch: REL_18_STABLE [39d555576] 2026-01-09 10:12:54 -0600
+Branch: master [5d1f5079a] 2026-01-11 13:52:50 -0600
+Branch: REL_18_STABLE [56e1f5010] 2026-01-11 13:52:50 -0600
+-->
+     <para>
+      Fix <application>pg_dump</application>'s logic for collecting
+      sequence values (Nathan Bossart)
+      <ulink url="&commit_baseurl;39d555576">&sect;</ulink>
+      <ulink url="&commit_baseurl;56e1f5010">&sect;</ulink>
+     </para>
+
+     <para>
+      <application>pg_dump</application> failed if a sequence was dropped
+      concurrently with the dump, even if the sequence was not among the
+      database objects to be dumped.  Also, if the calling user lacks
+      privileges to read a sequence's
+      value, <application>pg_dump</application> emitted incorrect values
+      rather than failing as expected.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Daniel Gustafsson <dgustafsson@postgresql.org>
+Branch: master [ec0da9b89] 2025-12-27 23:05:48 +0100
+Branch: REL_18_STABLE [61c78e1f4] 2025-12-27 23:05:48 +0100
+-->
+     <para>
+      Fix potentially-incorrect quoting
+      of <varname>oauth_validator_libraries</varname> values
+      by <application>pg_dump</application> (ChangAo Chen)
+      <ulink url="&commit_baseurl;61c78e1f4">&sect;</ulink>
+     </para>
+
+     <para>
+      <application>pg_dump</application> applied the wrong quoting rule if
+      it needed to dump a value of this setting.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [d49936f30] 2025-12-18 10:23:47 -0800
+Branch: REL_18_STABLE [573e679a2] 2025-12-18 10:23:51 -0800
+Branch: REL_17_STABLE [1cdc07ad5] 2025-12-18 10:23:51 -0800
+-->
+     <para>
+      Avoid <application>pg_dump</application> assertion failure in
+      binary-upgrade mode (Vignesh C)
+      <ulink url="&commit_baseurl;573e679a2">&sect;</ulink>
+     </para>
+
+     <para>
+      Failure to handle subscription-relation objects in the object
+      sorting code triggered an assertion, though there were no serious
+      ill effects in production builds.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [4aa0ac057] 2025-11-14 22:40:39 +0900
+Branch: REL_18_STABLE [00e64e35c] 2025-11-14 22:41:55 +0900
+Branch: REL_17_STABLE [5bc251b28] 2025-11-14 22:42:02 +0900
+-->
+     <para>
+      Fix incorrect error handling in <application>pgbench</application>
+      with multiple <command>\syncpipeline</command> commands
+      in pipeline mode (Yugo Nagata)
+      <ulink url="&commit_baseurl;00e64e35c">&sect;</ulink>
+     </para>
+
+     <para>
+      If multiple <command>\syncpipeline</command> commands are
+      encountered after a query error, <application>pgbench</application>
+      would report <quote>failed to exit pipeline mode</quote>, or get an
+      assertion failure in an assert-enabled build.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [d5b4f3a6d] 2025-11-19 18:05:42 +0200
+Branch: REL_18_STABLE [19594271c] 2025-11-19 18:06:04 +0200
+Branch: REL_17_STABLE [f2e0ca0af] 2025-11-19 18:06:23 +0200
+Branch: REL_16_STABLE [890cc81b6] 2025-11-19 18:06:24 +0200
+Branch: REL_15_STABLE [7c494072b] 2025-11-19 18:06:26 +0200
+Branch: REL_14_STABLE [11cc0f452] 2025-11-19 18:06:27 +0200
+-->
+     <para>
+      Make <application>pg_resetwal</application> print the updated value
+      when changing OldestXID (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;19594271c">&sect;</ulink>
+     </para>
+
+     <para>
+      It already did that for every other variable it can change.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [94939c5f3] 2025-11-12 12:20:16 +0200
+Branch: REL_18_STABLE [8747b969f] 2025-11-12 12:21:30 +0200
+Branch: REL_17_STABLE [cb2ef0e92] 2025-11-12 12:23:55 +0200
+Branch: REL_16_STABLE [e039b09f8] 2025-11-12 12:45:16 +0200
+Branch: REL_15_STABLE [97cd4b65a] 2025-11-12 12:46:19 +0200
+-->
+     <para>
+      Make <application>pg_resetwal</application> allow setting next
+      multixact xid to 0 or next multixact offset to UINT32_MAX (Maxim
+      Orlov)
+      <ulink url="&commit_baseurl;8747b969f">&sect;</ulink>
+     </para>
+
+     <para>
+      These are valid values, so rejecting them was incorrect.  In the
+      worst case, if a pg_upgrade is attempted when exactly at the point
+      of multixact wraparound, the upgrade would fail.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [6bd469d26] 2025-12-04 18:12:08 +0100
+Branch: REL_18_STABLE [df93f94dd] 2025-12-04 18:12:08 +0100
+Branch: REL_17_STABLE [ce2f575b7] 2025-12-04 18:12:08 +0100
+Branch: master [1f28982e4] 2026-01-21 18:55:43 +0100
+Branch: REL_18_STABLE [3c83a2a0a] 2026-01-21 18:55:43 +0100
+Branch: REL_17_STABLE [e1a327dc4] 2026-01-21 18:55:43 +0100
+Branch: REL_16_STABLE [098a1fab8] 2026-01-21 18:55:43 +0100
+Branch: REL_15_STABLE [dcddd6987] 2026-01-21 18:55:43 +0100
+Branch: REL_14_STABLE [607a67c5e] 2026-01-21 18:55:43 +0100
+-->
+     <para>
+      In <filename>contrib/amcheck</filename>, use the correct snapshot
+      for btree index parent checks (Mihail Nikalayeu)
+      <ulink url="&commit_baseurl;df93f94dd">&sect;</ulink>
+      <ulink url="&commit_baseurl;3c83a2a0a">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous coding caused spurious errors when examining indexes
+      created with <command>CREATE INDEX CONCURRENTLY</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [cbe04e5d7] 2025-12-02 21:11:15 +0200
+Branch: REL_18_STABLE [19e786727] 2025-12-02 21:15:04 +0200
+Branch: REL_17_STABLE [e8ae59445] 2025-12-02 21:15:28 +0200
+Branch: REL_16_STABLE [182901626] 2025-12-02 21:15:48 +0200
+Branch: REL_15_STABLE [7792bdc45] 2025-12-02 21:16:06 +0200
+Branch: REL_14_STABLE [fbb4b6078] 2025-12-02 21:16:17 +0200
+-->
+     <para>
+      Fix <filename>contrib/amcheck</filename> to
+      handle <quote>half-dead</quote> btree index pages correctly
+      (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;19e786727">&sect;</ulink>
+     </para>
+
+     <para>
+      <filename>amcheck</filename> expected such a page to have a parent
+      downlink, but it does not, leading to a false error report
+      about <quote>mismatch between parent key and child high key</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [6c05ef572] 2025-12-02 21:10:51 +0200
+Branch: REL_18_STABLE [50c63ebb0] 2025-12-02 21:14:53 +0200
+Branch: REL_17_STABLE [5a2d1df00] 2025-12-02 21:15:19 +0200
+Branch: REL_16_STABLE [f2a6df9fd] 2025-12-02 21:15:43 +0200
+Branch: REL_15_STABLE [721b58fbe] 2025-12-02 21:16:01 +0200
+Branch: REL_14_STABLE [a4cb21ea9] 2025-12-02 21:16:13 +0200
+-->
+     <para>
+      Fix <filename>contrib/amcheck</filename> to
+      handle incomplete btree root page splits correctly
+      (Heikki Linnakangas)
+      <ulink url="&commit_baseurl;50c63ebb0">&sect;</ulink>
+     </para>
+
+     <para>
+      <filename>amcheck</filename> could report a false error
+      about <quote>block is not true root</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [3f83de20b] 2025-12-11 14:11:06 +0900
+Branch: REL_18_STABLE [580b5c2f3] 2025-12-11 14:11:25 +0900
+-->
+     <para>
+      Fix excessive memory allocation
+      in <filename>contrib/pg_buffercache</filename> (David Geier)
+      <ulink url="&commit_baseurl;580b5c2f3">&sect;</ulink>
+     </para>
+
+     <para>
+      The code allocated twice as much memory as it needed for NUMA
+      page status.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [4f49e4b55] 2026-01-04 20:32:40 +1300
+Branch: REL_18_STABLE [07c1c6ec5] 2026-01-04 20:33:14 +1300
+Branch: REL_17_STABLE [a5f2dc421] 2026-01-04 20:33:39 +1300
+Branch: REL_16_STABLE [54f82c4aa] 2026-01-04 20:34:01 +1300
+Branch: REL_15_STABLE [c89510431] 2026-01-04 20:34:22 +1300
+Branch: REL_14_STABLE [67a6fd507] 2026-01-04 20:34:45 +1300
+-->
+     <para>
+      Fix edge-case integer overflow
+      in <filename>contrib/intarray</filename>'s selectivity estimator
+      for <literal>@@</literal> (Chao Li)
+      <ulink url="&commit_baseurl;07c1c6ec5">&sect;</ulink>
+     </para>
+
+     <para>
+      This could cause poor selectivity estimates to be produced for cases
+      involving the maximum integer value.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [84d5efa7e] 2025-12-16 10:35:40 -0800
+Branch: REL_18_STABLE [f79e239e0] 2025-12-16 10:36:09 -0800
+Branch: REL_17_STABLE [b8cfe9dc2] 2025-12-16 10:36:29 -0800
+Branch: REL_16_STABLE [b80227c0a] 2025-12-16 10:36:48 -0800
+Branch: REL_15_STABLE [335b2f30b] 2025-12-16 10:37:22 -0800
+Branch: REL_14_STABLE [898991966] 2025-12-16 10:38:15 -0800
+-->
+     <para>
+      Fix multibyte-encoding issue in <filename>contrib/ltree</filename>
+      (Jeff Davis)
+      <ulink url="&commit_baseurl;f79e239e0">&sect;</ulink>
+     </para>
+
+     <para>
+      The previous coding could pass an incomplete multibyte character
+      to <function>lower()</function>, probably resulting in incorrect
+      behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [5d95219fa] 2026-01-20 08:11:12 +0900
+Branch: REL_18_STABLE [3304e97b1] 2026-01-20 08:11:16 +0900
+-->
+     <para>
+      Avoid crash in <filename>contrib/pg_stat_statements</filename> when
+      an <literal>IN</literal> list contains both constants and
+      non-constant expressions (Sami Imseih)
+      <ulink url="&commit_baseurl;3304e97b1">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [228fe0c3e] 2026-01-18 14:54:33 -0500
+Branch: REL_18_STABLE [6574bee64] 2026-01-18 14:54:47 -0500
+Branch: REL_17_STABLE [f87c0b84e] 2026-01-18 14:54:54 -0500
+Branch: REL_16_STABLE [d852d105e] 2026-01-18 14:55:01 -0500
+Branch: REL_15_STABLE [00410b76d] 2026-01-18 14:55:07 -0500
+Branch: REL_14_STABLE [8bbf28191] 2026-01-18 14:55:13 -0500
+-->
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2025c (Tom Lane)
+      <ulink url="&commit_baseurl;6574bee64">&sect;</ulink>
+     </para>
+
+     <para>
+      The only change is in historical data for pre-1976 timestamps in
+      Baja California.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-18-1">
+  <title>Release 18.1</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2025-11-13</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 18.0.
+   For information about new features in major release 18, see
+   <xref linkend="release-18"/>.
+  </para>
+
+  <sect2 id="release-18-1-migration">
+   <title>Migration to Version 18.1</title>
+
+   <para>
+    A dump/restore is not required for those running 18.X.
+   </para>
+  </sect2>
+
+  <sect2 id="release-18-1-changes">
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [5e4fcbe53] 2025-11-10 09:00:00 -0600
+Branch: REL_18_STABLE [00eb646ea] 2025-11-10 09:00:00 -0600
+Branch: REL_17_STABLE [e2fb3dfa8] 2025-11-10 09:00:00 -0600
+Branch: REL_16_STABLE [d20abb587] 2025-11-10 09:00:00 -0600
+Branch: REL_15_STABLE [2393d374a] 2025-11-10 09:00:00 -0600
+Branch: REL_14_STABLE [95cce5669] 2025-11-10 09:00:00 -0600
+Branch: REL_13_STABLE [8a2530ebc] 2025-11-10 09:00:00 -0600
+-->
+     <para>
+      Check for <literal>CREATE</literal> privileges on the schema
+      in <command>CREATE STATISTICS</command> (Jelte Fennema-Nio)
+      <ulink url="&commit_baseurl;00eb646ea">&sect;</ulink>
+     </para>
+
+     <para>
+      This omission allowed table owners to create statistics in any
+      schema, potentially leading to unexpected naming conflicts.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks
+      Jelte Fennema-Nio for reporting this problem.
+      (CVE-2025-12817)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jacob Champion <jchampion@postgresql.org>
+Branch: master [600086f47] 2025-11-10 06:20:33 -0800
+Branch: REL_18_STABLE [7eb8fcad8] 2025-11-10 06:03:01 -0800
+Branch: REL_17_STABLE [f5999f018] 2025-11-10 06:03:03 -0800
+Branch: REL_16_STABLE [585fd9b3c] 2025-11-10 06:03:04 -0800
+Branch: REL_15_STABLE [91421565f] 2025-11-10 06:03:05 -0800
+Branch: REL_14_STABLE [96d2c7e96] 2025-11-10 06:03:05 -0800
+Branch: REL_13_STABLE [d6f0c0d6d] 2025-11-10 06:03:06 -0800
+-->
+     <para>
+      Avoid integer overflow in allocation-size calculations
+      within <application>libpq</application> (Jacob Champion)
+      <ulink url="&commit_baseurl;7eb8fcad8">&sect;</ulink>
+     </para>
+
+     <para>
+      Several places in <application>libpq</application> were not
+      sufficiently careful about computing the required size of a memory
+      allocation.  Sufficiently large inputs could cause integer overflow,
+      resulting in an undersized buffer, which would then lead to writing
+      past the end of the buffer.
+     </para>
+
+     <para>
+      The <productname>PostgreSQL</productname> Project thanks Aleksey
+      Solovev of Positive Technologies for reporting this problem.
+      (CVE-2025-12818)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [ef5e60a9d] 2025-10-09 01:07:59 -0400
+Branch: REL_18_STABLE [dc9125111] 2025-10-09 01:07:52 -0400
+Branch: REL_17_STABLE [09f86a42f] 2025-10-09 01:07:36 -0400
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master [c09a06918] 2025-11-04 12:25:04 +0100
+Branch: REL_18_STABLE [1baae827e] 2025-11-04 12:25:14 +0100
+Branch: REL_17_STABLE [1e6dfdaa0] 2025-11-04 12:25:20 +0100
+-->
+     <para>
+      Prevent <quote>unrecognized node type</quote> errors when a SQL/JSON
+      function such as <function>JSON_VALUE</function> has
+      a <literal>DEFAULT</literal> clause containing
+      a <literal>COLLATE</literal> expression (Jian He)
+      <ulink url="&commit_baseurl;dc9125111">&sect;</ulink>
+      <ulink url="&commit_baseurl;1baae827e">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [18d261409] 2025-10-21 12:35:36 +0900
+Branch: REL_18_STABLE [40c242830] 2025-10-21 12:38:16 +0900
+Branch: REL_18_STABLE [ee49f2cf4] 2025-10-21 14:12:13 +0900
+-->
+     <para>
+      Avoid incorrect optimization of
+      variable-free <literal>HAVING</literal> clauses with grouping sets
+      (Richard Guo)
+      <ulink url="&commit_baseurl;40c242830">&sect;</ulink>
+      <ulink url="&commit_baseurl;ee49f2cf4">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [257ee7834] 2025-10-30 11:58:45 +0900
+Branch: REL_18_STABLE [ef6168baf] 2025-10-30 12:03:15 +0900
+-->
+     <para>
+      Do not use parallelism in hash right semi joins (Richard Guo)
+      <ulink url="&commit_baseurl;ef6168baf">&sect;</ulink>
+     </para>
+
+     <para>
+      The case does not work reliably due to a race condition in updating
+      the join's shared hash table.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Richard Guo <rguo@postgresql.org>
+Branch: master [c1777f2d6] 2025-11-05 18:09:21 +0900
+Branch: REL_18_STABLE [500f64636] 2025-11-05 18:15:02 +0900
+-->
+     <para>
+      Avoid possible division-by-zero when creating ordered-append plans
+      (Richard Guo)
+      <ulink url="&commit_baseurl;500f64636">&sect;</ulink>
+     </para>
+
+     <para>
+      This mistake could result in incorrect selection of the cheapest
+      path, or in an assertion failure in debug builds.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master [35e53b684] 2025-10-28 10:07:29 +0100
+Branch: REL_18_STABLE [74197bdc8] 2025-10-28 10:11:35 +0100
+-->
+     <para>
+      Fix planner failure with index types that can do ordered access but
+      not index-only scans (Maxime Schoemans)
+      <ulink url="&commit_baseurl;74197bdc8">&sect;</ulink>
+     </para>
+
+     <para>
+      This oversight resulted in errors like <quote>no data returned for
+      index-only scan</quote>.  The case does not arise with any in-core
+      index type, but some extensions encountered the problem.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Geoghegan <pg@bowt.ie>
+Branch: master [843e50208] 2025-10-10 14:52:25 -0400
+Branch: REL_18_STABLE [61de81a49] 2025-10-10 14:52:23 -0400
+Branch: REL_17_STABLE [ae15cebc2] 2025-10-10 14:52:21 -0400
+Branch: REL_16_STABLE [c160fd469] 2025-10-10 14:52:19 -0400
+Branch: REL_15_STABLE [ca0c93908] 2025-10-10 14:52:17 -0400
+Branch: REL_14_STABLE [314004021] 2025-10-10 14:52:14 -0400
+Branch: REL_13_STABLE [af302ff6b] 2025-10-10 14:52:12 -0400
+-->
+     <para>
+      Remove faulty assertion in btree index cleanup (Peter Geoghegan)
+      <ulink url="&commit_baseurl;61de81a49">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [c98dffcb7] 2025-11-04 18:51:17 +0100
+Branch: REL_18_STABLE [a26b753a0] 2025-11-04 18:47:14 +0100
+-->
+     <para>
+      Avoid possible out-of-memory or <quote>invalid memory alloc request
+      size</quote> failures during parallel GIN index build (Tomas Vondra)
+      <ulink url="&commit_baseurl;a26b753a0">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [a95e3d84c] 2025-11-04 13:23:26 +0100
+Branch: REL_18_STABLE [419ffde23] 2025-11-04 13:23:26 +0100
+Branch: REL_17_STABLE [f4b68b033] 2025-11-04 13:23:26 +0100
+Branch: REL_16_STABLE [6ef33c805] 2025-11-04 13:23:26 +0100
+Branch: REL_15_STABLE [23ddadf68] 2025-11-04 13:23:26 +0100
+Branch: REL_14_STABLE [f0ad41716] 2025-11-04 13:23:26 +0100
+Branch: REL_13_STABLE [3c7b47974] 2025-11-04 13:23:26 +0100
+Branch: master [0a3d27bfe] 2025-11-04 20:31:43 +0100
+Branch: REL_18_STABLE [8733f0b54] 2025-11-04 20:31:43 +0100
+Branch: REL_17_STABLE [3b5007347] 2025-11-04 20:31:43 +0100
+Branch: REL_16_STABLE [20442cf50] 2025-11-04 20:31:43 +0100
+Branch: REL_15_STABLE [bcfbd3f74] 2025-11-04 20:31:43 +0100
+Branch: REL_14_STABLE [65b0d1f74] 2025-11-04 20:31:43 +0100
+Branch: REL_13_STABLE [ef81697fe] 2025-11-04 20:31:43 +0100
+-->
+     <para>
+      Ensure that BRIN autosummarization provides a snapshot for index
+      expressions that need one (Álvaro Herrera)
+      <ulink url="&commit_baseurl;419ffde23">&sect;</ulink>
+      <ulink url="&commit_baseurl;8733f0b54">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, autosummarization would fail for such indexes, and then
+      leave placeholder index tuples behind, causing the index to bloat
+      over time.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [9fd29d7ff] 2025-10-21 20:46:14 +1300
+Branch: REL_18_STABLE [715983a81] 2025-10-21 20:46:49 +1300
+Branch: REL_17_STABLE [c4f5a59ab] 2025-10-21 20:47:10 +1300
+Branch: REL_16_STABLE [ef915bf93] 2025-10-21 20:47:35 +1300
+Branch: REL_15_STABLE [810aaf7f2] 2025-10-21 20:48:06 +1300
+Branch: REL_14_STABLE [eea24eb0a] 2025-10-21 20:48:34 +1300
+Branch: REL_13_STABLE [c28f8ca29] 2025-10-21 20:49:00 +1300
+-->
+     <para>
+      Fix integer-overflow hazard in BRIN index scans when the table
+      contains close to 2<superscript>32</superscript> pages (Sunil S)
+      <ulink url="&commit_baseurl;715983a81">&sect;</ulink>
+     </para>
+
+     <para>
+      This oversight could result in an infinite loop or scanning of
+      unneeded table pages.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [6911f8037] 2025-10-23 13:11:02 +1300
+Branch: REL_18_STABLE [ceb51d09b] 2025-10-23 13:12:03 +1300
+Branch: REL_17_STABLE [10945148e] 2025-10-23 13:12:49 +1300
+Branch: REL_16_STABLE [3398b0d02] 2025-10-23 13:13:19 +1300
+Branch: REL_15_STABLE [b8ecfbe5a] 2025-10-23 13:13:44 +1300
+Branch: REL_14_STABLE [e4316ec4d] 2025-10-23 13:14:08 +1300
+Branch: REL_13_STABLE [4afab175b] 2025-10-23 13:14:33 +1300
+-->
+     <para>
+      Fix incorrect zero-extension of stored values in JIT-generated tuple
+      deforming code (David Rowley)
+      <ulink url="&commit_baseurl;ceb51d09b">&sect;</ulink>
+     </para>
+
+     <para>
+      When not using JIT, the equivalent code does sign-extension not
+      zero-extension, leading to a different Datum representation of small
+      integer data types.  This inconsistency was masked in most cases,
+      but it is known to lead to <quote>could not find memoization table
+      entry</quote> errors when using Memoize plan nodes, and there might
+      be other symptoms.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [5c0a20003] 2025-10-18 16:07:04 +1300
+Branch: REL_18_STABLE [0b6a02f03] 2025-10-18 16:07:41 +1300
+-->
+     <para>
+      Fix rare crash when processing hashed <literal>GROUPING
+      SETS</literal> queries (David Rowley)
+      <ulink url="&commit_baseurl;0b6a02f03">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tomas Vondra <tomas.vondra@postgresql.org>
+Branch: master [b85c4700f] 2025-10-17 22:21:50 +0200
+Branch: REL_18_STABLE [aa151022e] 2025-10-17 22:27:49 +0200
+-->
+     <para>
+      Repair faulty hash-table-size-choosing logic in hash joins
+      (Tomas Vondra)
+      <ulink url="&commit_baseurl;aa151022e">&sect;</ulink>
+     </para>
+
+     <para>
+      Hash joins sometimes used more memory than intended, or failed to
+      divide it in an efficient way.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [688dc6299] 2025-10-15 12:47:33 -0500
+Branch: REL_18_STABLE [c8af5019b] 2025-10-15 12:47:33 -0500
+Branch: REL_18_STABLE [15d7dded0] 2025-10-15 13:14:00 -0500
+-->
+     <para>
+      Improve relation lookup logic in statistics manipulation functions
+      (Nathan Bossart)
+      <ulink url="&commit_baseurl;c8af5019b">&sect;</ulink>
+      <ulink url="&commit_baseurl;15d7dded0">&sect;</ulink>
+     </para>
+
+     <para>
+      Fix <function>pg_restore_relation_stats()</function>,
+      <function>pg_clear_relation_stats()</function>,
+      <function>pg_restore_attribute_stats()</function>, and
+      <function>pg_clear_attribute_stats()</function> to check
+      privileges before acquiring lock on the target relation
+      rather than after.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [39dcfda2d] 2025-10-26 10:59:50 +1300
+Branch: REL_18_STABLE [a2387c32f] 2025-10-26 11:01:32 +1300
+Branch: REL_17_STABLE [0d3074615] 2025-10-26 11:01:53 +1300
+Branch: REL_16_STABLE [a546964db] 2025-10-26 11:02:15 +1300
+Branch: REL_15_STABLE [2992b9a07] 2025-10-26 11:02:36 +1300
+-->
+     <para>
+      Fix incorrect logic for caching result-relation information for
+      triggers (David Rowley, Amit Langote)
+      <ulink url="&commit_baseurl;a2387c32f">&sect;</ulink>
+     </para>
+
+     <para>
+      In cases where partitions' column sets aren't physically identical
+      to their parent partitioned tables' column sets, this oversight
+      could lead to crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Langote <amitlan@postgresql.org>
+Branch: master [905e932f0] 2025-10-16 14:01:44 +0900
+Branch: REL_18_STABLE [1296dcf18] 2025-10-16 14:01:50 +0900
+-->
+     <para>
+      Fix crash during EvalPlanQual rechecks on partitioned tables (David
+      Rowley, Amit Langote)
+      <ulink url="&commit_baseurl;1296dcf18">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Etsuro Fujita <efujita@postgresql.org>
+Branch: master [12609fbac] 2025-10-15 17:15:00 +0900
+Branch: REL_18_STABLE [b14144325] 2025-10-15 17:15:01 +0900
+Branch: REL_17_STABLE [2bb84ea7e] 2025-10-15 17:15:02 +0900
+Branch: REL_16_STABLE [5a9af4868] 2025-10-15 17:15:03 +0900
+Branch: REL_15_STABLE [4a08603a2] 2025-10-15 17:15:04 +0900
+Branch: REL_14_STABLE [24e74b962] 2025-10-15 17:15:05 +0900
+Branch: REL_13_STABLE [12b0c0e51] 2025-10-15 17:15:05 +0900
+-->
+     <para>
+      Fix EvalPlanQual handling of foreign or custom joins that do not
+      have an alternative local-join plan prepared for EPQ (Masahiko
+      Sawada, Etsuro Fujita)
+      <ulink url="&commit_baseurl;b14144325">&sect;</ulink>
+     </para>
+
+     <para>
+      In such cases the foreign or custom access method should be invoked
+      normally, but that did not happen, typically leading to a crash.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [3231fd045] 2025-10-11 20:30:12 +0200
+Branch: REL_18_STABLE [08c037dff] 2025-10-11 20:30:12 +0200
+Branch: REL_17_STABLE [ea06f97ee] 2025-10-11 20:30:12 +0200
+Branch: REL_16_STABLE [b835759ec] 2025-10-11 20:30:12 +0200
+Branch: REL_15_STABLE [bdae98495] 2025-10-11 20:30:12 +0200
+Branch: REL_14_STABLE [b753be38a] 2025-10-11 20:30:12 +0200
+-->
+     <para>
+      Avoid duplicating hash partition constraints during <literal>DETACH
+      CONCURRENTLY</literal> (Haiyang Li)
+      <ulink url="&commit_baseurl;08c037dff">&sect;</ulink>
+     </para>
+
+     <para>
+      <command>ALTER TABLE DETACH PARTITION CONCURRENTLY</command> was
+      written to add a copy of the partitioning constraint to the
+      now-detached partition.  This was misguided, partially because
+      non-concurrent <literal>DETACH</literal> doesn't do that, but mostly
+      because in the case of hash partitioning the constraint expression
+      contains references to the parent table's OID.  That causes problems
+      during dump/restore, or if the parent table is dropped
+      after <literal>DETACH</literal>.  In v19 and later, we'll no longer
+      create any such copied constraints at all.  In released branches, to
+      minimize the risk of unforeseen consequences, only skip adding a
+      copied constraint if it is for hash partitioning.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master [040cc5f3c] 2025-11-04 14:46:58 +0100
+Branch: REL_18_STABLE [ba99c9491] 2025-11-04 14:47:15 +0100
+Branch: REL_17_STABLE [0b44f2443] 2025-11-04 15:18:09 +0100
+Branch: REL_16_STABLE [7180d56c5] 2025-11-04 15:22:17 +0100
+Branch: REL_15_STABLE [643a5e96c] 2025-11-04 15:28:46 +0100
+Branch: REL_14_STABLE [04345d7a4] 2025-11-04 15:37:08 +0100
+Branch: REL_13_STABLE [7f239c72a] 2025-11-04 15:37:19 +0100
+-->
+     <para>
+      Disallow generated columns in partition keys
+      (Jian He, Ashutosh Bapat)
+      <ulink url="&commit_baseurl;ba99c9491">&sect;</ulink>
+     </para>
+
+     <para>
+      This was already not allowed, but the check missed some cases, such
+      as where the column reference is implicit in a whole-row reference.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master [aa606b931] 2025-11-06 13:54:42 +0100
+Branch: REL_18_STABLE [0f9e0068b] 2025-11-06 13:55:08 +0100
+Branch: REL_17_STABLE [07f787e57] 2025-11-06 14:01:42 +0100
+Branch: REL_16_STABLE [26958f4d9] 2025-11-06 14:01:57 +0100
+Branch: REL_15_STABLE [8278737bf] 2025-11-06 14:02:03 +0100
+Branch: REL_14_STABLE [ccfe28eb4] 2025-11-06 14:02:09 +0100
+Branch: REL_13_STABLE [3717849e6] 2025-11-06 14:02:13 +0100
+-->
+     <para>
+      Disallow generated columns in <literal>COPY ... FROM
+      ... WHERE</literal> clauses (Peter Eisentraut, Jian He)
+      <ulink url="&commit_baseurl;0f9e0068b">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, incorrect behavior or an obscure error message resulted
+      from attempting to reference such a column, since generated columns
+      have not yet been computed at the point
+      where <literal>WHERE</literal> filtering is done.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [cf8be0225] 2025-11-03 15:58:19 +0100
+Branch: REL_18_STABLE [d9ffc2729] 2025-11-03 15:58:19 +0100
+-->
+     <para>
+      Prevent setting a column as identity if it has a not-null constraint
+      but the constraint is marked as invalid (Jian He)
+      <ulink url="&commit_baseurl;d9ffc2729">&sect;</ulink>
+     </para>
+
+     <para>
+      Identity columns must be not-null, but the check for that missed
+      this edge case.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: John Naylor <john.naylor@postgresql.org>
+Branch: master [54ab74865] 2025-10-03 16:05:02 +0700
+Branch: REL_18_STABLE [76613b539] 2025-10-03 16:07:42 +0700
+Branch: REL_17_STABLE [3549ffb6a] 2025-10-03 16:07:34 +0700
+-->
+     <para>
+      Avoid potential use-after-free in parallel vacuum (Kevin Oommen
+      Anish)
+      <ulink url="&commit_baseurl;76613b539">&sect;</ulink>
+     </para>
+
+     <para>
+      This bug seems to have no consequences in standard builds, but it's
+      theoretically a hazard.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [a95393ecd] 2025-09-29 11:15:44 -0700
+Branch: REL_18_STABLE [d024160ff] 2025-09-29 11:15:47 -0700
+Branch: REL_17_STABLE [6778fbca6] 2025-09-29 11:15:48 -0700
+Branch: REL_16_STABLE [ab16418ee] 2025-09-29 11:15:48 -0700
+Branch: REL_15_STABLE [d202ec1fb] 2025-09-29 11:15:48 -0700
+Branch: REL_14_STABLE [5816baa9b] 2025-09-29 11:15:49 -0700
+Branch: REL_13_STABLE [afb2cce74] 2025-09-29 11:15:49 -0700
+-->
+     <para>
+      Fix visibility checking for statistics objects
+      in <literal>pg_temp</literal> (Noah Misch)
+      <ulink url="&commit_baseurl;d024160ff">&sect;</ulink>
+     </para>
+
+     <para>
+      A statistics object located in a temporary schema cannot be named
+      without schema qualification,
+      but <function>pg_statistics_obj_is_visible()</function> missed that
+      memo and could return <quote>true</quote> regardless.  In turn,
+      functions such as <function>pg_describe_object()</function> could
+      fail to schema-qualify the object's name as expected.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [ff47f9c16] 2025-10-11 16:39:22 +0200
+Branch: REL_18_STABLE [33e7b4a7c] 2025-10-11 16:39:22 +0200
+Branch: REL_17_STABLE [f9993ac64] 2025-10-11 16:39:22 +0200
+Branch: REL_16_STABLE [c72b5c536] 2025-10-11 16:39:22 +0200
+Branch: REL_15_STABLE [23b316c36] 2025-10-11 16:39:22 +0200
+-->
+     <para>
+      Fix minor memory leak during WAL replay of database creation
+      (Nathan Bossart)
+      <ulink url="&commit_baseurl;33e7b4a7c">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [883a95646] 2025-10-22 11:27:15 +0900
+Branch: REL_18_STABLE [9670032cc] 2025-10-22 11:28:48 +0900
+Branch: REL_17_STABLE [62d5ee75b] 2025-10-22 11:28:57 +0900
+Branch: REL_16_STABLE [2e55cf4ef] 2025-10-22 11:29:02 +0900
+Branch: REL_15_STABLE [59b215f72] 2025-10-22 11:29:07 +0900
+Branch: REL_14_STABLE [a7ab6ce6a] 2025-10-22 11:29:13 +0900
+Branch: REL_13_STABLE [7d7ebdb80] 2025-10-22 11:29:18 +0900
+-->
+     <para>
+      Fix incorrect reporting of replication lag
+      in <structname>pg_stat_replication</structname> view (Fujii Masao)
+      <ulink url="&commit_baseurl;9670032cc">&sect;</ulink>
+     </para>
+
+     <para>
+      If any standby server's replay LSN stopped advancing,
+      the <structfield>write_lag</structfield>
+      and <structfield>flush_lag</structfield> columns would eventually
+      stop updating.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [f33e60a53] 2025-10-22 20:09:43 +0900
+Branch: REL_18_STABLE [6ff7ba9fe] 2025-10-22 20:10:58 +0900
+Branch: REL_17_STABLE [1db2870bb] 2025-10-22 20:11:47 +0900
+Branch: REL_16_STABLE [4fd916eab] 2025-10-22 20:12:36 +0900
+Branch: REL_15_STABLE [caf529aba] 2025-10-22 20:13:15 +0900
+Branch: REL_14_STABLE [f106f53df] 2025-10-22 20:14:02 +0900
+Branch: REL_13_STABLE [b00a16bae] 2025-10-22 20:14:07 +0900
+-->
+     <para>
+      Avoid duplicative log messages about
+      invalid <varname>primary_slot_name</varname> settings (Fujii Masao)
+      <ulink url="&commit_baseurl;6ff7ba9fe">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [e0dc4bbfb] 2025-10-27 06:48:32 +0000
+Branch: REL_18_STABLE [b45a8d7d8] 2025-10-27 06:37:35 +0000
+Branch: REL_17_STABLE [0024f5a10] 2025-10-27 06:34:29 +0000
+-->
+     <para>
+      Avoid failures when <varname>synchronized_standby_slots</varname>
+      references nonexistent replication slots (Shlok Kyal)
+      <ulink url="&commit_baseurl;b45a8d7d8">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [912af1c7e] 2025-10-10 09:23:59 +0900
+Branch: REL_18_STABLE [9a6ea00ac] 2025-10-10 09:24:48 +0900
+Branch: REL_17_STABLE [42348839d] 2025-10-10 09:24:50 +0900
+Branch: REL_16_STABLE [bfdd1a12d] 2025-10-10 09:24:53 +0900
+Branch: REL_15_STABLE [0adf424b4] 2025-10-10 09:24:54 +0900
+Branch: REL_14_STABLE [f57f2760e] 2025-10-10 09:24:57 +0900
+Branch: REL_13_STABLE [c878d9808] 2025-10-10 09:24:59 +0900
+-->
+     <para>
+      Remove the unfinished slot state file after failing to write a
+      replication slot's state to disk (Michael Paquier)
+      <ulink url="&commit_baseurl;9a6ea00ac">&sect;</ulink>
+     </para>
+
+     <para>
+      Previously, a failure such as out-of-disk-space resulted in leaving
+      a temporary <filename>state.tmp</filename> file behind.  That's
+      problematic because it would block all subsequent attempts to
+      write the state, requiring manual intervention to clean up.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Amit Kapila <akapila@postgresql.org>
+Branch: master [e41d954da] 2025-09-24 04:11:53 +0000
+Branch: REL_18_STABLE [37fc5de43] 2025-09-24 04:00:15 +0000
+Branch: REL_17_STABLE [2f6e1a490] 2025-09-24 03:49:02 +0000
+Branch: REL_16_STABLE [a54c7a113] 2025-09-24 03:38:27 +0000
+-->
+     <para>
+      Fix mishandling of lock timeout signals in parallel apply workers
+      for logical replication (Hayato Kuroda)
+      <ulink url="&commit_baseurl;37fc5de43">&sect;</ulink>
+     </para>
+
+     <para>
+      The same signal number was being used for both worker shutdown and
+      lock timeout, leading to confusion.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [17b2d5ec7] 2025-11-04 10:47:38 +0900
+Branch: REL_18_STABLE [a14201073] 2025-11-04 10:52:33 +0900
+Branch: REL_17_STABLE [e7340b484] 2025-11-04 10:52:35 +0900
+Branch: REL_16_STABLE [9b6109607] 2025-11-04 10:52:38 +0900
+Branch: REL_15_STABLE [da5ea6c70] 2025-11-04 10:52:41 +0900
+Branch: REL_14_STABLE [a1b8b3b2e] 2025-11-04 10:52:42 +0900
+Branch: REL_13_STABLE [25b484080] 2025-11-04 10:52:44 +0900
+-->
+     <para>
+      Avoid unwanted WAL receiver shutdown when switching from streaming
+      to archive WAL source (Xuneng Zhou)
+      <ulink url="&commit_baseurl;a14201073">&sect;</ulink>
+     </para>
+
+     <para>
+      During a timeline change, a standby server's WAL receiver should
+      remain alive, waiting for a new WAL streaming start point.  Instead
+      it was repeatedly shutting down and immediately getting restarted,
+      which could confuse status monitoring code.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Masahiko Sawada <msawada@postgresql.org>
+Branch: master [b46efe904] 2025-10-09 10:59:27 -0700
+Branch: REL_18_STABLE [32b95fc71] 2025-10-09 10:59:29 -0700
+Branch: REL_17_STABLE [a61592253] 2025-10-09 10:59:31 -0700
+Branch: REL_16_STABLE [b07682bce] 2025-10-09 10:59:34 -0700
+Branch: REL_15_STABLE [c40761759] 2025-10-09 10:59:36 -0700
+-->
+     <para>
+      Fix use-after-free issue in the relation synchronization cache
+      maintained by the <application>pgoutput</application> logical
+      decoding plugin (Vignesh C, Masahiko Sawada)
+      <ulink url="&commit_baseurl;32b95fc71">&sect;</ulink>
+     </para>
+
+     <para>
+      An error during logical decoding could result in crashes in
+      subsequent logical decoding attempts in the same session.
+      The case is only reachable when <application>pgoutput</application>
+      is invoked via SQL functions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [d43209468] 2025-10-30 13:13:28 +0900
+Branch: REL_18_STABLE [bf3dba508] 2025-10-30 13:13:31 +0900
+Branch: REL_17_STABLE [f3fb6bc9f] 2025-10-30 13:13:34 +0900
+Branch: REL_16_STABLE [e3714dc05] 2025-10-30 13:13:37 +0900
+-->
+     <para>
+      Avoid unnecessary invalidation of logical replication slots
+      (Bertrand Drouvot)
+      <ulink url="&commit_baseurl;bf3dba508">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Jeff Davis <jdavis@postgresql.org>
+Branch: master [d115de9d8] 2025-11-04 16:48:16 -0800
+Branch: REL_18_STABLE [3ebea75f9] 2025-11-04 16:49:00 -0800
+-->
+     <para>
+      Re-establish special case for <literal>C</literal> collation in
+      locale setup (Jeff Davis)
+      <ulink url="&commit_baseurl;3ebea75f9">&sect;</ulink>
+     </para>
+
+     <para>
+      This fixes a regression in access to shared catalogs early in
+      backend startup, before a database has been selected.  It is not
+      known to be a problem for any
+      core <productname>PostgreSQL</productname> code, but some extensions
+      were broken.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [03bf7a12c] 2025-10-13 17:56:45 -0400
+Branch: REL_18_STABLE [b48ae226e] 2025-10-13 17:56:45 -0400
+Branch: REL_17_STABLE [4c53519e1] 2025-10-13 17:56:45 -0400
+Branch: REL_16_STABLE [9883e3cd1] 2025-10-13 17:56:45 -0400
+Branch: REL_15_STABLE [f91666c83] 2025-10-13 17:56:45 -0400
+Branch: REL_14_STABLE [e91eb4ad6] 2025-10-13 17:56:45 -0400
+Branch: REL_13_STABLE [75a555d61] 2025-10-13 17:56:45 -0400
+-->
+     <para>
+      Fix incorrect printing of messages about failures in checking
+      whether the user has Windows administrator privilege (Bryan Green)
+      <ulink url="&commit_baseurl;b48ae226e">&sect;</ulink>
+     </para>
+
+     <para>
+      This code would have crashed or at least printed garbage.
+      No such cases have been reported though, indicating that failure of
+      these system calls is extremely rare.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d4baa327a] 2025-11-05 11:09:45 -0500
+Branch: REL_18_STABLE [6d8acb777] 2025-11-05 11:09:30 -0500
+Branch: REL_17_STABLE [a9515f294] 2025-11-05 11:09:30 -0500
+Branch: REL_16_STABLE [c775bf048] 2025-11-05 11:09:30 -0500
+-->
+     <para>
+      Avoid crash when attempting to
+      test <productname>PostgreSQL</productname> with certain libsanitizer
+      options (Emmanuel Sibi, Jacob Champion)
+      <ulink url="&commit_baseurl;6d8acb777">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: David Rowley <drowley@postgresql.org>
+Branch: master [50eb4e118] 2025-10-30 14:48:10 +1300
+Branch: REL_18_STABLE [af3a79e08] 2025-10-30 14:49:07 +1300
+Branch: REL_17_STABLE [bd6f986c9] 2025-10-30 14:49:42 +1300
+Branch: REL_16_STABLE [cdc04a6c3] 2025-10-30 14:50:05 +1300
+Branch: REL_15_STABLE [f3420e006] 2025-10-30 14:50:26 +1300
+Branch: REL_14_STABLE [86bd9497f] 2025-10-30 14:50:46 +1300
+Branch: REL_13_STABLE [7b955c227] 2025-10-30 14:51:08 +1300
+-->
+     <para>
+      Fix false memory-context-checking warnings in debug builds
+      on 64-bit Windows (David Rowley)
+      <ulink url="&commit_baseurl;af3a79e08">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7504d2be9] 2025-09-27 14:29:41 -0400
+Branch: REL_18_STABLE [78a284b0b] 2025-09-27 14:29:41 -0400
+Branch: REL_17_STABLE [3fc9aa5b0] 2025-09-27 14:29:41 -0400
+Branch: REL_16_STABLE [b7f6798c0] 2025-09-27 14:29:41 -0400
+Branch: REL_15_STABLE [9ca79896a] 2025-09-27 14:29:41 -0400
+Branch: REL_14_STABLE [0be39b4b1] 2025-09-27 14:29:41 -0400
+-->
+     <para>
+      Correctly handle <literal>GROUP BY DISTINCT</literal> in PL/pgSQL
+      assignment statements (Tom Lane)
+      <ulink url="&commit_baseurl;78a284b0b">&sect;</ulink>
+     </para>
+
+     <para>
+      The parser failed to record the <literal>DISTINCT</literal> option
+      in this context, so that the command would act as if it were
+      plain <literal>GROUP BY</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [798b19d27] 2025-10-23 11:47:46 -0400
+Branch: REL_18_STABLE [447a794f6] 2025-10-23 11:47:46 -0400
+Branch: REL_17_STABLE [fbc41a145] 2025-10-23 11:47:46 -0400
+Branch: REL_16_STABLE [cbfd4d0f8] 2025-10-23 11:47:46 -0400
+Branch: REL_15_STABLE [4cde73259] 2025-10-23 11:47:46 -0400
+Branch: REL_14_STABLE [7fb8c9240] 2025-10-23 11:47:46 -0400
+Branch: REL_13_STABLE [d90c92d1c] 2025-10-23 11:47:46 -0400
+-->
+     <para>
+      Avoid leaking memory when handling a SQL error within PL/Python
+      (Tom Lane)
+      <ulink url="&commit_baseurl;447a794f6">&sect;</ulink>
+     </para>
+
+     <para>
+      This fixes a session-lifespan memory leak introduced in our previous
+      minor releases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ea78bd6d5] 2025-10-05 16:27:47 -0400
+Branch: REL_18_STABLE [d83879a32] 2025-10-05 16:27:47 -0400
+Branch: REL_17_STABLE [1c4671f7b] 2025-10-05 16:27:47 -0400
+Branch: REL_16_STABLE [46c4478db] 2025-10-05 16:27:47 -0400
+Branch: REL_15_STABLE [771b106d1] 2025-10-05 16:27:47 -0400
+Branch: REL_14_STABLE [f46d77377] 2025-10-05 16:27:47 -0400
+Branch: REL_13_STABLE [fc287cf3c] 2025-10-05 16:27:47 -0400
+-->
+     <para>
+      Fix <application>libpq</application>'s handling of socket-related
+      errors on Windows within its GSSAPI logic (Ning Wu, Tom Lane)
+      <ulink url="&commit_baseurl;d83879a32">&sect;</ulink>
+     </para>
+
+     <para>
+      The code for encrypting/decrypting transmitted data using GSSAPI did
+      not correctly recognize error conditions on the connection socket,
+      since Windows reports those differently than other platforms.  This
+      led to failure to make such connections on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [615ff828e] 2025-10-18 18:18:19 +0200
+Branch: REL_18_STABLE [0fe07fa11] 2025-10-18 18:18:19 +0200
+Branch: REL_17_STABLE [c945b06d5] 2025-10-18 18:18:19 +0200
+-->
+     <para>
+      Fix dumping of non-inherited not-null constraints on inherited table
+      columns (Dilip Kumar)
+      <ulink url="&commit_baseurl;0fe07fa11">&sect;</ulink>
+     </para>
+
+     <para>
+      <application>pg_dump</application> failed to preserve such
+      constraints when dumping from a pre-v18 server.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [4921a5972] 2025-10-18 17:50:10 +0200
+Branch: REL_18_STABLE [162e70ea0] 2025-10-18 17:50:10 +0200
+Branch: REL_17_STABLE [7419c99a2] 2025-10-18 17:50:10 +0200
+Branch: REL_16_STABLE [06c1ee6b7] 2025-10-18 17:50:10 +0200
+Branch: REL_15_STABLE [4cc3b4445] 2025-10-18 17:50:10 +0200
+Branch: REL_14_STABLE [6062c3db3] 2025-10-18 17:50:10 +0200
+Branch: REL_13_STABLE [d20df9590] 2025-10-18 17:50:10 +0200
+-->
+     <para>
+      Fix <application>pg_dump</application>'s sorting of
+      foreign key constraints (Álvaro Herrera)
+      <ulink url="&commit_baseurl;162e70ea0">&sect;</ulink>
+     </para>
+
+     <para>
+      Ensure consistent ordering of these database objects, as was
+      already done for other object types.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Daniel Gustafsson <dgustafsson@postgresql.org>
+Branch: master [e686010c5] 2025-08-29 19:28:46 +0200
+Branch: REL_18_STABLE Release: REL_18_0 [8980c724b] 2025-08-29 19:28:46 +0200
+Branch: REL_17_STABLE [92268b35d] 2025-08-29 19:28:46 +0200
+Branch: REL_16_STABLE [ec017a305] 2025-08-29 19:28:46 +0200
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a239c4a0c] 2025-10-13 12:44:20 -0400
+Branch: REL_18_STABLE [6a4009747] 2025-10-13 12:44:20 -0400
+Branch: REL_17_STABLE [bf18e9bd7] 2025-10-13 12:44:20 -0400
+Branch: REL_16_STABLE [1518b7d76] 2025-10-13 12:44:20 -0400
+Branch: master [277dec651] 2025-10-19 14:36:58 -0400
+Branch: REL_18_STABLE [aa1fcd087] 2025-10-19 14:36:58 -0400
+Branch: REL_17_STABLE [2efca1633] 2025-10-19 14:36:58 -0400
+Branch: REL_16_STABLE [c865f5b9f] 2025-10-19 14:36:58 -0400
+Branch: REL_15_STABLE [8b9924bce] 2025-10-19 14:36:58 -0400
+Branch: REL_14_STABLE [40dc710a6] 2025-10-19 14:36:58 -0400
+Branch: REL_13_STABLE [33276cd02] 2025-10-19 14:36:58 -0400
+-->
+     <para>
+      Fix assorted errors in the data compression logic
+      in <application>pg_dump</application>
+      and <application>pg_restore</application>
+      (Daniel Gustafsson, Tom Lane)
+      <ulink url="&commit_baseurl;8980c724b">&sect;</ulink>
+      <ulink url="&commit_baseurl;6a4009747">&sect;</ulink>
+      <ulink url="&commit_baseurl;aa1fcd087">&sect;</ulink>
+     </para>
+
+     <para>
+      Error checking was missing or incorrect in several places, and there
+      were also portability issues that would manifest on big-endian
+      hardware.  These problems had been missed because this code is only
+      used to read compressed TOC files within directory-format
+      dumps.   <application>pg_dump</application> never produces such a
+      dump; the case can be reached only by manually compressing the TOC
+      file after the fact, which is a supported thing to do but very
+      uncommon.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [902c08887] 2025-10-03 14:03:55 +0900
+Branch: REL_18_STABLE [c00637b5f] 2025-10-03 14:04:00 +0900
+Branch: REL_17_STABLE [de6de069d] 2025-10-03 14:04:01 +0900
+Branch: REL_16_STABLE [640590bb4] 2025-10-03 14:04:03 +0900
+Branch: REL_15_STABLE [b5cefc197] 2025-10-03 14:04:05 +0900
+Branch: REL_14_STABLE [9b3beb7c6] 2025-10-03 14:04:06 +0900
+Branch: REL_13_STABLE [f1a2f3a0c] 2025-10-03 14:04:08 +0900
+-->
+     <para>
+      Fix <application>pgbench</application> to error out cleanly if
+      a <literal>COPY</literal> operation is started (Anthonin Bonnefoy)
+      <ulink url="&commit_baseurl;c00637b5f">&sect;</ulink>
+     </para>
+
+     <para>
+      <application>pgbench</application> doesn't intend to support this
+      case, but previously it went into an infinite loop.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [19d4f9ffc] 2025-09-30 23:52:28 +0900
+Branch: REL_18_STABLE [29aabbc43] 2025-09-30 23:53:32 +0900
+Branch: REL_17_STABLE [a912118c6] 2025-09-30 23:53:46 +0900
+Branch: REL_16_STABLE [36c4d30c8] 2025-09-30 23:53:53 +0900
+Branch: REL_15_STABLE [bdccb6302] 2025-09-30 23:54:01 +0900
+Branch: REL_14_STABLE [cb21e1f92] 2025-09-30 23:55:02 +0900
+Branch: REL_13_STABLE [7d7e81d1e] 2025-09-30 23:55:33 +0900
+-->
+     <para>
+      Fix <application>pgbench</application>'s reporting of multiple
+      errors (Yugo Nagata)
+      <ulink url="&commit_baseurl;29aabbc43">&sect;</ulink>
+     </para>
+
+     <para>
+      In cases where two successive <function>PQgetResult</function> calls
+      both fail, <application>pgbench</application> might report the wrong
+      error message.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [8bb174295] 2025-09-26 21:23:43 +0900
+Branch: REL_18_STABLE [c736808e0] 2025-09-26 21:24:59 +0900
+Branch: REL_17_STABLE [f39d9164b] 2025-09-26 21:25:05 +0900
+Branch: REL_16_STABLE [8b2e290bd] 2025-09-26 21:25:11 +0900
+Branch: REL_15_STABLE [704f51771] 2025-09-26 21:25:17 +0900
+-->
+     <para>
+      In <application>pgbench</application>, fix faulty assertion about
+      errors in pipeline mode (Yugo Nagata)
+      <ulink url="&commit_baseurl;c736808e0">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9224c3025] 2025-10-22 13:38:40 -0400
+Branch: REL_18_STABLE [e2072b47b] 2025-10-22 13:38:37 -0400
+Branch: REL_17_STABLE [4eb6992af] 2025-10-22 13:38:37 -0400
+-->
+     <para>
+      Fix per-file memory leakage
+      in <application>pg_combinebackup</application> (Tom Lane)
+      <ulink url="&commit_baseurl;e2072b47b">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Masahiko Sawada <msawada@postgresql.org>
+Branch: master [8ae0f6a0c] 2025-11-04 15:47:25 -0800
+Branch: REL_18_STABLE [71aa2e114] 2025-11-04 15:47:22 -0800
+Branch: master [eab9e4e27] 2025-08-19 12:11:42 -0700
+Branch: REL_18_STABLE Release: REL_18_0 [0beb7e933] 2025-08-19 12:11:39 -0700
+Branch: REL_17_STABLE [b6090ed96] 2025-08-19 12:11:37 -0700
+Branch: REL_16_STABLE [815fcfb20] 2025-08-19 12:11:34 -0700
+Branch: REL_15_STABLE [eb9ee4d18] 2025-08-19 12:11:32 -0700
+Branch: REL_14_STABLE [79643105a] 2025-08-19 12:11:29 -0700
+Branch: REL_13_STABLE [7d8d36289] 2025-08-19 12:11:25 -0700
+-->
+     <para>
+      Ensure that <filename>contrib/pg_buffercache</filename> functions
+      can be canceled (Satyanarayana Narlapuram, Yuhang Qiu)
+      <ulink url="&commit_baseurl;71aa2e114">&sect;</ulink>
+      <ulink url="&commit_baseurl;0beb7e933">&sect;</ulink>
+     </para>
+
+     <para>
+      Some code paths were capable of running for a long time without
+      checking for interrupts.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+Branch: master [208927e65] 2025-10-17 11:36:50 -0500
+Branch: REL_18_STABLE [3ccf8e9ac] 2025-10-17 11:36:50 -0500
+Branch: REL_17_STABLE [a0551bc57] 2025-10-17 11:36:50 -0500
+Branch: REL_16_STABLE [fae0ce5e3] 2025-10-17 11:36:50 -0500
+Branch: REL_15_STABLE [6c03ae8d6] 2025-10-17 11:36:50 -0500
+Branch: REL_14_STABLE [f146eb45c] 2025-10-17 11:36:50 -0500
+Branch: REL_13_STABLE [19a64f567] 2025-10-17 11:36:50 -0500
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [da44d71e7] 2025-10-18 18:36:21 -0400
+Branch: REL_18_STABLE [c29d32d27] 2025-10-18 18:36:21 -0400
+Branch: REL_17_STABLE [d4e8c37cc] 2025-10-18 18:36:21 -0400
+Branch: REL_16_STABLE [c26a8eaf6] 2025-10-18 18:36:21 -0400
+-->
+     <para>
+      Fix <filename>contrib/pg_prewarm</filename>'s privilege checks for
+      indexes (Ayush Vatsa, Nathan Bossart)
+      <ulink url="&commit_baseurl;3ccf8e9ac">&sect;</ulink>
+      <ulink url="&commit_baseurl;c29d32d27">&sect;</ulink>
+     </para>
+
+     <para>
+      <function>pg_prewarm()</function> requires <literal>SELECT</literal>
+      privilege on relations to be prewarmed.  However, since indexes have
+      no SQL privileges of their own, this resulted in non-superusers
+      being unable to prewarm indexes.  Instead, check
+      for <literal>SELECT</literal> privilege on the index's table.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [16edc1b94] 2025-10-29 12:35:02 +0100
+Branch: REL_18_STABLE [b1635c166] 2025-10-29 12:35:02 +0100
+-->
+     <para>
+      In <filename>contrib/pg_stat_statements</filename>, avoid
+      crash when two or more constants are marked as having the same
+      location in the SQL statement text (Sami Imseih, Dmitry Dolgov)
+      <ulink url="&commit_baseurl;b1635c166">&sect;</ulink>
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [684a745f5] 2025-10-02 11:07:30 +0900
+Branch: REL_18_STABLE [fc295beb7] 2025-10-02 11:09:10 +0900
+Branch: REL_17_STABLE [036decbba] 2025-10-02 11:09:12 +0900
+Branch: REL_16_STABLE [c0f9fe877] 2025-10-02 11:09:13 +0900
+Branch: REL_15_STABLE [49b5f0b53] 2025-10-02 11:09:15 +0900
+Branch: REL_14_STABLE [ee2dbcad0] 2025-10-02 11:09:17 +0900
+Branch: REL_13_STABLE [c207bf473] 2025-10-02 11:09:19 +0900
+-->
+     <para>
+      Make <filename>contrib/pgstattuple</filename> more robust about
+      empty or invalid index pages (Nitin Motiani)
+      <ulink url="&commit_baseurl;fc295beb7">&sect;</ulink>
+     </para>
+
+     <para>
+      Count all-zero pages as free space, and ignore pages that are
+      invalid according to a check of the page's special-space size.
+      The code for btree indexes already counted all-zero pages as free,
+      but the hash and gist code would error out, which has been found to
+      be much less user-friendly.  Similarly, make all three cases agree
+      on ignoring corrupted pages rather than throwing errors.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Thomas Munro <tmunro@postgresql.org>
+Branch: master [c5d34f4a5] 2025-11-08 12:26:43 +1300
+Branch: REL_18_STABLE [f8ccab0e9] 2025-11-08 12:28:15 +1300
+Branch: REL_17_STABLE [03d9140cb] 2025-11-08 12:28:52 +1300
+Branch: REL_16_STABLE [2f76ffe5e] 2025-11-08 12:29:15 +1300
+Branch: REL_15_STABLE [1c7cba4c5] 2025-11-08 12:30:08 +1300
+Branch: REL_14_STABLE [d8ba910b0] 2025-11-08 12:32:42 +1300
+Branch: REL_13_STABLE [77b5b2c6f] 2025-11-08 12:33:01 +1300
+-->
+     <para>
+      Harden our read and write barrier macros to satisfy Clang
+      (Thomas Munro)
+      <ulink url="&commit_baseurl;f8ccab0e9">&sect;</ulink>
+     </para>
+
+     <para>
+      We supposed that <function>__atomic_thread_fence()</function> is a
+      sufficient barrier to prevent the C compiler from re-ordering memory
+      accesses around it, but it appears that that's not true for Clang,
+      allowing it to generate incorrect code for at least RISC-V, MIPS,
+      and LoongArch machines.  Add explicit compiler barriers to fix that.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master [6ad9378c9] 2025-10-16 20:21:05 +0200
+Branch: REL_18_STABLE [6aa04a60c] 2025-10-16 20:21:05 +0200
+Branch: REL_17_STABLE [a8933194e] 2025-10-16 20:21:05 +0200
+Branch: REL_16_STABLE [a506b0c0a] 2025-10-16 20:21:05 +0200
+Branch: REL_15_STABLE [33202cba8] 2025-10-16 20:21:05 +0200
+Branch: REL_14_STABLE [56cd332f8] 2025-10-16 20:21:05 +0200
+Branch: REL_13_STABLE [f768f5a7d] 2025-10-16 20:21:05 +0200
+-->
+     <para>
+      Fix PGXS build infrastructure to support building
+      NLS <filename>po</filename> files for extensions (Ryo Matsumura)
+      <ulink url="&commit_baseurl;6aa04a60c">&sect;</ulink>
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-18">
   <title>Release 18</title>
 
   <formalpara>
    <title>Release date:</title>
-   <para>2025-??-??, CURRENT AS OF 2025-06-20</para>
+   <para>2025-09-25</para>
   </formalpara>
 
   <sect2 id="release-18-highlights">
@@ -21,7 +5157,65 @@
 
     <listitem>
      <para>
-      (to be completed)
+      An asynchronous I/O (AIO) subsystem that can improve performance of
+      sequential scans, bitmap heap scans, vacuums, and other operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      <link linkend="pgupgrade"><application>pg_upgrade</application></link>
+      now retains optimizer statistics.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support for "skip scan" lookups that allow using
+      <link linkend="indexes-multicolumn">multicolumn B-tree indexes</link> in
+      more cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      <link linkend="func_uuid_gen_table"><function>uuidv7()</function></link>
+      function for generating timestamp-ordered
+      <link linkend="datatype-uuid">UUIDs</link>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Virtual
+      <link linkend="sql-createtable-parms-generated-stored">generated columns</link>
+      that compute their values during read operations.  This is now the
+      default for generated columns.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      <link linkend="auth-oauth">OAuth authentication</link> support.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      <literal>OLD</literal> and <literal>NEW</literal> support for
+      <link linkend="dml-returning"><literal>RETURNING</literal></link> clauses
+      in <xref linkend="sql-insert"/>, <xref linkend="sql-update"/>,
+      <xref linkend="sql-delete"/>, and <xref linkend="sql-merge"/> commands.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Temporal constraints, or constraints over ranges, for
+      <link linkend="sql-createtable-parms-primary-key">PRIMARY KEY</link>,
+      <link linkend="sql-createtable-parms-unique">UNIQUE</link>, and
+      <link linkend="sql-createtable-parms-references">FOREIGN KEY</link>
+      constraints.
      </para>
     </listitem>
    </itemizedlist>
@@ -266,6 +5460,30 @@ Author: Fujii Masao <fujii@postgresql.org>
     </para>
     </listitem>
 
+<!--
+Author: Peter Eisentraut <peter@eisentraut.org>
+2024-12-17 [fb1a18810f0] Remove ts_locale.c's lowerstr()
+-->
+
+    <listitem>
+    <para>
+    Change <link linkend="textsearch">full text search</link> to use the
+    default collation provider of the cluster to read configuration files
+    and dictionaries, rather than always using libc (Peter Eisentraut)
+    <ulink url="&commit_baseurl;fb1a18810f0">&sect;</ulink>
+    </para>
+
+    <para>
+    Clusters that default to non-libc collation providers (e.g., ICU,
+    builtin) that behave differently than libc for characters processed
+    by LC_CTYPE could observe changes in behavior of some full-text
+    search functions, as well as the <xref linkend="pgtrgm"/> extension.
+    When upgrading such clusters using <xref linkend="pgupgrade"/>, it
+    is recommended to reindex all indexes related to full-text search
+    and <application>pg_trgm</application> after the upgrade.
+    </para>
+    </listitem>
+
    </itemizedlist>
 
   </sect2>
@@ -583,8 +5801,10 @@ Author: Peter Geoghegan <pg@bowt.ie>
       </para>
 
       <para>
-      This allows multi-column btree indexes to be used by queries that
-      only equality-reference the second or later indexed columns.
+      This allows multi-column btree indexes to be used in more cases such
+      as when there are no restrictions on the first or early indexed
+      columns (or there are non-equality ones), and there are useful
+      restrictions on later indexed columns.
       </para>
       </listitem>
 
@@ -1181,15 +6401,18 @@ Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
 2025-03-18 [62d712ecf] Introduce squashing of constant lists in query jumbling
 Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
 2025-03-27 [9fbd53dea] Remove the query_id_squash_values GUC
+Author: Álvaro Herrera <alvherre@kurilemu.de>
+Branch: master Release: REL_18_BR [c2da1a5d6] 2025-06-24 19:36:32 +0200
 -->
 
       <listitem>
       <para>
       Have <link linkend="guc-compute-query-id">query id</link> computation
-      of arrays consider only the first and last array elements (Dmitry
+      of constant lists consider only the first and last constants (Dmitry
       Dolgov, Sami Imseih)
       <ulink url="&commit_baseurl;62d712ecf">&sect;</ulink>
       <ulink url="&commit_baseurl;9fbd53dea">&sect;</ulink>
+      <ulink url="&commit_baseurl;c2da1a5d6">&sect;</ulink>
       </para>
 
       <para>
@@ -1521,7 +6744,7 @@ Author: Amit Kapila <akapila@postgresql.org>
 
       <listitem>
       <para>
-      Allow inactive replication slots to be automatically invalided using
+      Allow inactive replication slots to be automatically invalidated using
       server variable <xref linkend="guc-idle-replication-slot-timeout"/>
       (Nisha Moond, Bharath Rupireddy)
       <ulink url="&commit_baseurl;ac0e33136">&sect;</ulink>
@@ -1864,21 +7087,27 @@ Author: Thomas Munro <tmunro@postgresql.org>
 <!--
 Author: Peter Eisentraut <peter@eisentraut.org>
 2024-09-17 [fc0438b4e] Add temporal PRIMARY KEY and UNIQUE constraints
+Author: Peter Eisentraut <peter@eisentraut.org>
+2024-09-17 [89f908a6d] Add temporal FOREIGN KEY contraints
 -->
 
       <listitem>
       <para>
       Allow the specification of non-overlapping <link
       linkend="sql-createtable-parms-primary-key"><literal>PRIMARY
-      KEY</literal></link> and <link
-      linkend="sql-createtable-parms-unique"><literal>UNIQUE</literal></link>
+      KEY</literal></link>, <link linkend="sql-createtable-parms-unique">
+      <literal>UNIQUE</literal></link>, and
+      <link linkend="sql-createtable-parms-references">foreign key</link>
       constraints (Paul A. Jungwirth)
       <ulink url="&commit_baseurl;fc0438b4e">&sect;</ulink>
+      <ulink url="&commit_baseurl;89f908a6d">&sect;</ulink>
       </para>
 
       <para>
-      This is specified by <literal>WITHOUT OVERLAPS</literal> on the
-      last specified column.
+      This is specified by <literal>WITHOUT OVERLAPS</literal> for
+      <literal>PRIMARY KEY</literal> and <literal>UNIQUE</literal>, and by
+      <literal>PERIOD</literal> for foreign keys, all applied to the last
+      specified column.
       </para>
       </listitem>
 
@@ -1930,6 +7159,8 @@ Author: Peter Eisentraut <peter@eisentraut.org>
 <!--
 Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
 2024-11-08 [14e87ffa5] Add pg_constraint rows for not-null constraints
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master Release: REL_18_BR [81ce602d4] 2025-06-26 20:25:34 +0900
 -->
 
       <listitem>
@@ -1940,6 +7171,7 @@ Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
       linkend="catalog-pg-constraint"><structname>pg_constraint</structname></link>
       (Álvaro Herrera, Bernd Helmle)
       <ulink url="&commit_baseurl;14e87ffa5">&sect;</ulink>
+      <ulink url="&commit_baseurl;81ce602d4">&sect;</ulink>
       </para>
 
       <para>
@@ -2588,7 +7820,7 @@ Author: Tom Lane <tgl@sss.pgh.pa.us>
    </sect3>
 
    <sect3 id="release-18-libpq">
-    <title><xref linkend="libpq"/></title>
+    <title><link linkend="libpq">Libpq</link></title>
 
     <itemizedlist>
 
@@ -2626,20 +7858,6 @@ Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
      </para>
      </listitem>
 
-<!--
-Author: Michael Paquier <michael@paquier.xyz>
-2024-12-18 [4b99fed75] libpq: Add service name to PGconn and PQservice()
--->
-
-     <listitem>
-     <para>
-     Add libpq function <link
-     linkend="libpq-PQservice"><function>PQservice()</function></link>
-     to return the connection service name (Michael Banck)
-     <ulink url="&commit_baseurl;4b99fed75">&sect;</ulink>
-     </para>
-     </listitem>
-
 <!--
 Author: Tomas Vondra <tomas.vondra@postgresql.org>
 2024-08-19 [28a1121fd] Mark search_path as GUC_REPORT
@@ -2731,6 +7949,8 @@ Author: Thomas Munro <tmunro@postgresql.org>
 <!--
 Author: Michael Paquier <michael@paquier.xyz>
 2024-08-22 [d55322b0d] psql: Add more meta-commands able to use the extended pr
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master Release: REL_18_BR [fc39b286a] 2025-06-24 13:12:46 +0900
 -->
 
      <listitem>
@@ -2738,6 +7958,7 @@ Author: Michael Paquier <michael@paquier.xyz>
      Allow <application>psql</application> to parse, bind, and close
      named prepared statements (Anthonin Bonnefoy, Michael Paquier)
      <ulink url="&commit_baseurl;d55322b0d">&sect;</ulink>
+     <ulink url="&commit_baseurl;fc39b286a">&sect;</ulink>
      </para>
 
      <para>
@@ -2972,8 +8193,9 @@ Author: Nathan Bossart <nathan@postgresql.org>
      </para>
 
      <para>
-     This option can only be used by <option>--analyze-only</option>
-     and <option>--analyze-in-stages</option>.
+     This option can only be run by superusers and can only
+     be used with options <option>--analyze-only</option> and
+     <option>--analyze-in-stages</option>.
      </para>
      </listitem>
 
@@ -3048,37 +8270,19 @@ Author: Masahiko Sawada <msawada@postgresql.org>
 
      <itemizedlist>
 
-<!--
-Author: Andrew Dunstan <andrew@dunslane.net>
-2025-04-04 [1495eff7b] Non text modes for pg_dumpall, correspondingly change pg
--->
-
-      <listitem>
-      <para>
-      Allow <xref linkend="app-pg-dumpall"/> to dump in the same output
-      formats as <application>pg_dump</application> supports (Mahendra
-      Singh Thalor, Andrew Dunstan)
-      <ulink url="&commit_baseurl;1495eff7b">&sect;</ulink>
-      </para>
-
-      <para>
-      Also modify <xref linkend="app-pgrestore"/> to handle such dumps.
-      Previously <application>pg_dumpall</application> only supported
-      text format.
-      </para>
-      </listitem>
-
 <!--
 Author: Jeff Davis <jdavis@postgresql.org>
 2025-03-25 [bde2fb797] Add pg_dump - -with-{schema|data|statistics} options.
+Author: Jeff Davis <jdavis@postgresql.org>
+2025-08-02 [a3e8dc143] Simplify options in pg_dump and pg_restore.
 -->
 
       <listitem>
       <para>
-      Add <xref linkend="app-pgdump"/> options
-      <option>--with-schema</option>, <option>--with-data</option>,
-      and <option>--with-statistics</option> (Jeff Davis)
+      Add <xref linkend="app-pgdump"/> option <option>--statistics</option>
+      (Jeff Davis)
       <ulink url="&commit_baseurl;bde2fb797">&sect;</ulink>
+      <ulink url="&commit_baseurl;a3e8dc143">&sect;</ulink>
       </para>
       </listitem>
 
@@ -3285,13 +8489,16 @@ Author: Amit Kapila <akapila@postgresql.org>
 <!--
 Author: Amit Kapila <akapila@postgresql.org>
 2025-03-20 [e5aeed4b8] pg_createsubscriber: Add -R publications option.
+Author: Peter Eisentraut <peter@eisentraut.org>
+Branch: master Release: REL_18_BR [60dda7bbc] 2025-06-25 10:50:43 +0200
 -->
 
       <listitem>
       <para>
       Add <application>pg_createsubscriber</application> option
-      <option>--remove</option> to remove publications (Shubham Khanna)
+      <option>--clean</option> to remove publications (Shubham Khanna)
       <ulink url="&commit_baseurl;e5aeed4b8">&sect;</ulink>
+      <ulink url="&commit_baseurl;60dda7bbc">&sect;</ulink>
       </para>
       </listitem>
 
@@ -3317,9 +8524,14 @@ Author: Masahiko Sawada <msawada@postgresql.org>
       <listitem>
       <para>
       Add <xref linkend="app-pgrecvlogical"/> option
-      <option>--failover</option> to specify failover slots (Hayato Kuroda)
+      <option>--enable-failover</option> to specify failover slots (Hayato Kuroda)
       <ulink url="&commit_baseurl;cf2655a90">&sect;</ulink>
       </para>
+
+      <para>
+      Also add option <option>--enable-two-phase</option> as a synonym
+      for <option>--two-phase</option>, and deprecate the latter.
+      </para>
       </listitem>
 
 <!--
@@ -3595,8 +8807,8 @@ Author: Peter Eisentraut <peter@eisentraut.org>
 
      <listitem>
      <para>
-     Add support for Python "Limited <acronym>API</acronym>" in <xref
-     linkend="plpython"/> (Peter Eisentraut)
+     Add support for Python "Limited <acronym>API</acronym>" in <link
+     linkend="plpython">PL/Python</link> (Peter Eisentraut)
      <ulink url="&commit_baseurl;72a3d0462">&sect;</ulink>
      <ulink url="&commit_baseurl;0793ab810">&sect;</ulink>
      </para>
@@ -4193,7 +9405,513 @@ Author: Daniel Gustafsson <dgustafsson@postgresql.org>
    </para>
 
    <simplelist>
-    <member>(to be completed)</member>
+    <member>Abhishek Chanda</member>
+    <member>Adam Guo</member>
+    <member>Adam Rauch</member>
+    <member>Aidar Imamov</member>
+    <member>Ajin Cherian</member>
+    <member>Alastair Turner</member>
+    <member>Alec Cozens</member>
+    <member>Aleksander Alekseev</member>
+    <member>Alena Rybakina</member>
+    <member>Alex Friedman</member>
+    <member>Alex Richman</member>
+    <member>Alexander Alehin</member>
+    <member>Alexander Borisov</member>
+    <member>Alexander Korotkov</member>
+    <member>Alexander Kozhemyakin</member>
+    <member>Alexander Kukushkin</member>
+    <member>Alexander Kuzmenkov</member>
+    <member>Alexander Kuznetsov</member>
+    <member>Alexander Lakhin</member>
+    <member>Alexander Pyhalov</member>
+    <member>Alexandra Wang</member>
+    <member>Alexey Dvoichenkov</member>
+    <member>Alexey Makhmutov</member>
+    <member>Alexey Shishkin</member>
+    <member>Ali Akbar</member>
+    <member>Álvaro Herrera</member>
+    <member>Álvaro Mongil</member>
+    <member>Amit Kapila</member>
+    <member>Amit Langote</member>
+    <member>Amul Sul</member>
+    <member>Andreas Karlsson</member>
+    <member>Andreas Scherbaum</member>
+    <member>Andreas Ulbrich</member>
+    <member>Andrei Lepikhov</member>
+    <member>Andres Freund</member>
+    <member>Andrew</member>
+    <member>Andrew Bille</member>
+    <member>Andrew Dunstan</member>
+    <member>Andrew Jackson</member>
+    <member>Andrew Kane</member>
+    <member>Andrew Watkins</member>
+    <member>Andrey Borodin</member>
+    <member>Andrey Chudnovsky</member>
+    <member>Andrey Rachitskiy</member>
+    <member>Andrey Rudometov</member>
+    <member>Andy Alsup</member>
+    <member>Andy Fan</member>
+    <member>Anthonin Bonnefoy</member>
+    <member>Anthony Hsu</member>
+    <member>Anthony Leung</member>
+    <member>Anton Melnikov</member>
+    <member>Anton Voloshin</member>
+    <member>Antonin Houska</member>
+    <member>Antti Lampinen</member>
+    <member>Arseniy Mukhin</member>
+    <member>Artur Zakirov</member>
+    <member>Arun Thirupathi</member>
+    <member>Ashutosh Bapat</member>
+    <member>Asphator</member>
+    <member>Atsushi Torikoshi</member>
+    <member>Avi Weinberg</member>
+    <member>Aya Iwata</member>
+    <member>Ayush Tiwari</member>
+    <member>Ayush Vatsa</member>
+    <member>Bastien Roucariès</member>
+    <member>Ben Peachey Higdon</member>
+    <member>Benoit Lobréau</member>
+    <member>Bernd Helmle</member>
+    <member>Bernd Reiß</member>
+    <member>Bernhard Wiedemann</member>
+    <member>Bertrand Drouvot</member>
+    <member>Bertrand Mamasam</member>
+    <member>Bharath Rupireddy</member>
+    <member>Bogdan Grigorenko</member>
+    <member>Boyu Yang</member>
+    <member>Braulio Fdo Gonzalez</member>
+    <member>Bruce Momjian</member>
+    <member>Bykov Ivan</member>
+    <member>Cameron Vogt</member>
+    <member>Cary Huang</member>
+    <member>Cédric Villemain</member>
+    <member>Cees van Zeeland</member>
+    <member>ChangAo Chen</member>
+    <member>Chao Li</member>
+    <member>Chapman Flack</member>
+    <member>Charles Samborski</member>
+    <member>Chengwen Wu</member>
+    <member>Chengxi Sun</member>
+    <member>Chiranmoy Bhattacharya</member>
+    <member>Chris Gooch</member>
+    <member>Christian Charukiewicz</member>
+    <member>Christoph Berg</member>
+    <member>Christophe Courtois</member>
+    <member>Christopher Inokuchi</member>
+    <member>Clemens Ruck</member>
+    <member>Corey Huinker</member>
+    <member>Craig Milhiser</member>
+    <member>Crisp Lee</member>
+    <member>Dagfinn Ilmari Mannsåker</member>
+    <member>Daniel Elishakov</member>
+    <member>Daniel Gustafsson</member>
+    <member>Daniel Vérité</member>
+    <member>Daniel Westermann</member>
+    <member>Daniele Varrazzo</member>
+    <member>Daniil Davydov</member>
+    <member>Daria Shanina</member>
+    <member>Dave Cramer</member>
+    <member>Dave Page</member>
+    <member>David Benjamin</member>
+    <member>David Christensen</member>
+    <member>David Fiedler</member>
+    <member>David G. Johnston</member>
+    <member>David Geier</member>
+    <member>David Rowley</member>
+    <member>David Steele</member>
+    <member>David Wheeler</member>
+    <member>David Zhang</member>
+    <member>Davinder Singh</member>
+    <member>Dean Rasheed</member>
+    <member>Devanga Susmitha</member>
+    <member>Devrim Gündüz</member>
+    <member>Dian Fay</member>
+    <member>Dilip Kumar</member>
+    <member>Dimitrios Apostolou</member>
+    <member>Dipesh Dhameliya</member>
+    <member>Dmitrii Bondar</member>
+    <member>Dmitry Dolgov</member>
+    <member>Dmitry Koval</member>
+    <member>Dmitry Kovalenko</member>
+    <member>Dmitry Yurichev</member>
+    <member>Dominique Devienne</member>
+    <member>Donghang Lin</member>
+    <member>Dorjpalam Batbaatar</member>
+    <member>Drew Callahan</member>
+    <member>Duncan Sands</member>
+    <member>Dwayne Towell</member>
+    <member>Dzmitry Jachnik</member>
+    <member>Egor Chindyaskin</member>
+    <member>Egor Rogov</member>
+    <member>Emanuel Ionescu</member>
+    <member>Emanuele Musella</member>
+    <member>Emre Hasegeli</member>
+    <member>Eric Cyr</member>
+    <member>Erica Zhang</member>
+    <member>Erik Nordström</member>
+    <member>Erik Rijkers</member>
+    <member>Erik Wienhold</member>
+    <member>Erki Eessaar</member>
+    <member>Ethan Mertz</member>
+    <member>Etienne LAFARGE</member>
+    <member>Etsuro Fujita</member>
+    <member>Euler Taveira</member>
+    <member>Evan Si</member>
+    <member>Evgeniy Gorbanev</member>
+    <member>Fabio R. Sluzala</member>
+    <member>Fabrízio de Royes Mello</member>
+    <member>Feike Steenbergen</member>
+    <member>Feliphe Pozzer</member>
+    <member>Felix</member>
+    <member>Fire Emerald</member>
+    <member>Florents Tselai</member>
+    <member>Francesco Degrassi</member>
+    <member>Frank Streitzig</member>
+    <member>Frédéric Yhuel</member>
+    <member>Fredrik Widlert</member>
+    <member>Gabriele Bartolini</member>
+    <member>Gavin Panella</member>
+    <member>Geoff Winkless</member>
+    <member>George MacKerron</member>
+    <member>Gilles Darold</member>
+    <member>Grant Gryczan</member>
+    <member>Greg Burd</member>
+    <member>Greg Sabino Mullane</member>
+    <member>Greg Stark</member>
+    <member>Grigory Kryachko</member>
+    <member>Guillaume Lelarge</member>
+    <member>Gunnar Morling</member>
+    <member>Gunnar Wagner</member>
+    <member>Gurjeet Singh</member>
+    <member>Haifang Wang</member>
+    <member>Hajime Matsunaga</member>
+    <member>Hamid Akhtar</member>
+    <member>Hannu Krosing</member>
+    <member>Hari Krishna Sunder</member>
+    <member>Haruka Takatsuka</member>
+    <member>Hayato Kuroda</member>
+    <member>Heikki Linnakangas</member>
+    <member>Hironobu Suzuki</member>
+    <member>Holger Jakobs</member>
+    <member>Hubert Lubaczewski</member>
+    <member>Hugo Dubois</member>
+    <member>Hugo Zhang</member>
+    <member>Hunaid Sohail</member>
+    <member>Hywel Carver</member>
+    <member>Ian Barwick</member>
+    <member>Ibrar Ahmed</member>
+    <member>Igor Gnatyuk</member>
+    <member>Igor Korot</member>
+    <member>Ilia Evdokimov</member>
+    <member>Ilya Gladyshev</member>
+    <member>Ilyasov Ian</member>
+    <member>Imran Zaheer</member>
+    <member>Isaac Morland</member>
+    <member>Israel Barth Rubio</member>
+    <member>Ivan Kush</member>
+    <member>Jacob Brazeal</member>
+    <member>Jacob Champion</member>
+    <member>Jaime Casanova</member>
+    <member>Jakob Egger</member>
+    <member>Jakub Wartak</member>
+    <member>James Coleman</member>
+    <member>James Hunter</member>
+    <member>Jan Behrens</member>
+    <member>Japin Li</member>
+    <member>Jason Smith</member>
+    <member>Jayesh Dehankar</member>
+    <member>Jeevan Chalke</member>
+    <member>Jeff Davis</member>
+    <member>Jehan-Guillaume de Rorthais</member>
+    <member>Jelte Fennema-Nio</member>
+    <member>Jian He</member>
+    <member>Jianghua Yang</member>
+    <member>Jiao Shuntian</member>
+    <member>Jim Jones</member>
+    <member>Jim Nasby</member>
+    <member>Jingtang Zhang</member>
+    <member>Jingzhou Fu</member>
+    <member>Joe Conway</member>
+    <member>Joel Jacobson</member>
+    <member>John Hutchins</member>
+    <member>John Naylor</member>
+    <member>Jonathan Katz</member>
+    <member>Jorge Solórzano</member>
+    <member>José Villanova</member>
+    <member>Josef Šimánek</member>
+    <member>Joseph Koshakow</member>
+    <member>Julien Rouhaud</member>
+    <member>Junwang Zhao</member>
+    <member>Justin Pryzby</member>
+    <member>Kaido Vaikla</member>
+    <member>Kaimeh</member>
+    <member>Karina Litskevich</member>
+    <member>Karthik S</member>
+    <member>Kartyshov Ivan</member>
+    <member>Kashif Zeeshan</member>
+    <member>Keisuke Kuroda</member>
+    <member>Kevin Hale Boyes</member>
+    <member>Kevin K Biju</member>
+    <member>Kirill Reshke</member>
+    <member>Kirill Zdornyy</member>
+    <member>Koen De Groote</member>
+    <member>Koichi Suzuki</member>
+    <member>Koki Nakamura</member>
+    <member>Konstantin Knizhnik</member>
+    <member>Kouhei Sutou</member>
+    <member>Kuntal Ghosh</member>
+    <member>Kyotaro Horiguchi</member>
+    <member>Lakshmi Narayana Velayudam</member>
+    <member>Lars Kanis</member>
+    <member>Laurence Parry</member>
+    <member>Laurenz Albe</member>
+    <member>Lele Gaifax</member>
+    <member>Li Yong</member>
+    <member>Lilian Ontowhee</member>
+    <member>Lingbin Meng</member>
+    <member>Luboslav Špilák</member>
+    <member>Luca Vallisa</member>
+    <member>Lukas Fittl</member>
+    <member>Maciek Sakrejda</member>
+    <member>Magnus Hagander</member>
+    <member>Mahendra Singh Thalor</member>
+    <member>Mahendrakar Srinivasarao</member>
+    <member>Maiquel Grassi</member>
+    <member>Maksim Korotkov</member>
+    <member>Maksim Melnikov</member>
+    <member>Man Zeng</member>
+    <member>Marat Buharov</member>
+    <member>Marc Balmer</member>
+    <member>Marco Nenciarini</member>
+    <member>Marcos Pegoraro</member>
+    <member>Marina Polyakova</member>
+    <member>Mark Callaghan</member>
+    <member>Mark Dilger</member>
+    <member>Marlene Brandstaetter</member>
+    <member>Marlene Reiterer</member>
+    <member>Martin Rakhmanov</member>
+    <member>Masahiko Sawada</member>
+    <member>Masahiro Ikeda</member>
+    <member>Masao Fujii</member>
+    <member>Mason Mackaman</member>
+    <member>Mat Arye</member>
+    <member>Matheus Alcantara</member>
+    <member>Mats Kindahl</member>
+    <member>Matthew Gabeler-Lee</member>
+    <member>Matthew Kim</member>
+    <member>Matthew Sterrett</member>
+    <member>Matthew Woodcraft</member>
+    <member>Matthias van de Meent</member>
+    <member>Matthieu Denais</member>
+    <member>Maurizio Boriani</member>
+    <member>Max Johnson</member>
+    <member>Max Madden</member>
+    <member>Maxim Boguk</member>
+    <member>Maxim Orlov</member>
+    <member>Maximilian Chrzan</member>
+    <member>Melanie Plageman</member>
+    <member>Melih Mutlu</member>
+    <member>Mert Alev</member>
+    <member>Michael Banck</member>
+    <member>Michael Bondarenko</member>
+    <member>Michael Christofides</member>
+    <member>Michael Guissine</member>
+    <member>Michael Harris</member>
+    <member>Michaël Paquier</member>
+    <member>Michail Nikolaev</member>
+    <member>Michal Kleczek</member>
+    <member>Michel Pelletier</member>
+    <member>Mikaël Gourlaouen</member>
+    <member>Mikhail Gribkov</member>
+    <member>Mikhail Kot</member>
+    <member>Milosz Chmura</member>
+    <member>Muralikrishna Bandaru</member>
+    <member>Murat Efendioglu</member>
+    <member>Mutaamba Maasha</member>
+    <member>Naeem Akhter</member>
+    <member>Nat Makarevitch</member>
+    <member>Nathan Bossart</member>
+    <member>Navneet Kumar</member>
+    <member>Nazir Bilal Yavuz</member>
+    <member>Neil Conway</member>
+    <member>Niccolò Fei</member>
+    <member>Nick Davies</member>
+    <member>Nicolas Maus</member>
+    <member>Niek Brasa</member>
+    <member>Nikhil Raj</member>
+    <member>Nikita</member>
+    <member>Nikita Kalinin</member>
+    <member>Nikita Malakhov</member>
+    <member>Nikolay Samokhvalov</member>
+    <member>Nikolay Shaplov</member>
+    <member>Nisha Moond</member>
+    <member>Nitin Jadhav</member>
+    <member>Nitin Motiani</member>
+    <member>Noah Misch</member>
+    <member>Noboru Saito</member>
+    <member>Noriyoshi Shinoda</member>
+    <member>Ole Peder Brandtzæg</member>
+    <member>Oleg Sibiryakov</member>
+    <member>Oleg Tselebrovskiy</member>
+    <member>Olleg Samoylov</member>
+    <member>Onder Kalaci</member>
+    <member>Ondrej Navratil</member>
+    <member>Patrick Stählin</member>
+    <member>Paul Amonson</member>
+    <member>Paul Jungwirth</member>
+    <member>Paul Ramsey</member>
+    <member>Pavel Borisov</member>
+    <member>Pavel Luzanov</member>
+    <member>Pavel Nekrasov</member>
+    <member>Pavel Stehule</member>
+    <member>Peter Eisentraut</member>
+    <member>Peter Geoghegan</member>
+    <member>Peter Mittere</member>
+    <member>Peter Smith</member>
+    <member>Phil Eaton</member>
+    <member>Philipp Salvisberg</member>
+    <member>Philippe Beaudoin</member>
+    <member>Pierre Giraud</member>
+    <member>Pixian Shi</member>
+    <member>Polina Bungina</member>
+    <member>Przemyslaw Sztoch</member>
+    <member>Quynh Tran</member>
+    <member>Rafia Sabih</member>
+    <member>Raghuveer Devulapalli</member>
+    <member>Rahila Syed</member>
+    <member>Rama Malladi</member>
+    <member>Ran Benita</member>
+    <member>Ranier Vilela</member>
+    <member>Renan Alves Fonseca</member>
+    <member>Richard Guo</member>
+    <member>Richard Neill</member>
+    <member>Rintaro Ikeda</member>
+    <member>Robert Haas</member>
+    <member>Robert Treat</member>
+    <member>Robins Tharakan</member>
+    <member>Roman Zharkov</member>
+    <member>Ronald Cruz</member>
+    <member>Ronan Dunklau</member>
+    <member>Rui Zhao</member>
+    <member>Rushabh Lathia</member>
+    <member>Rustam Allakov</member>
+    <member>Ryo Kanbayashi</member>
+    <member>Ryohei Takahashi</member>
+    <member>RyotaK</member>
+    <member>Sagar Dilip Shedge</member>
+    <member>Salvatore Dipietro</member>
+    <member>Sam Gabrielsson</member>
+    <member>Sam James</member>
+    <member>Sameer Kumar</member>
+    <member>Sami Imseih</member>
+    <member>Samuel Thibault</member>
+    <member>Satyanarayana Narlapuram</member>
+    <member>Sebastian Skalacki</member>
+    <member>Senglee Choi</member>
+    <member>Sergei Kornilov</member>
+    <member>Sergey Belyashov</member>
+    <member>Sergey Dudoladov</member>
+    <member>Sergey Prokhorenko</member>
+    <member>Sergey Sargsyan</member>
+    <member>Sergey Soloviev</member>
+    <member>Sergey Tatarintsev</member>
+    <member>Shaik Mohammad Mujeeb</member>
+    <member>Shawn McCoy</member>
+    <member>Shenhao Wang</member>
+    <member>Shihao Zhong</member>
+    <member>Shinya Kato</member>
+    <member>Shlok Kyal</member>
+    <member>Shubham Khanna</member>
+    <member>Shveta Malik</member>
+    <member>Simon Riggs</member>
+    <member>Smolkin Grigory</member>
+    <member>Sofia Kopikova</member>
+    <member>Song Hongyu</member>
+    <member>Song Jinzhou</member>
+    <member>Soumyadeep Chakraborty</member>
+    <member>Sravan Kumar</member>
+    <member>Srinath Reddy</member>
+    <member>Stan Hu</member>
+    <member>Stepan Neretin</member>
+    <member>Stephen Fewer</member>
+    <member>Stephen Frost</member>
+    <member>Steve Chavez</member>
+    <member>Steven Niu</member>
+    <member>Suraj Kharage</member>
+    <member>Sven Klemm</member>
+    <member>Takamichi Osumi</member>
+    <member>Takeshi Ideriha</member>
+    <member>Tatsuo Ishii</member>
+    <member>Ted Yu</member>
+    <member>Tels</member>
+    <member>Tender Wang</member>
+    <member>Teodor Sigaev</member>
+    <member>Thom Brown</member>
+    <member>Thomas Baehler</member>
+    <member>Thomas Krennwallner</member>
+    <member>Thomas Munro</member>
+    <member>Tim Wood</member>
+    <member>Timur Magomedov</member>
+    <member>Tobias Wendorff</member>
+    <member>Todd Cook</member>
+    <member>Tofig Aliev</member>
+    <member>Tom Lane</member>
+    <member>Tomas Vondra</member>
+    <member>Tomasz Rybak</member>
+    <member>Tomasz Szypowski</member>
+    <member>Torsten Foertsch</member>
+    <member>Toshi Harada</member>
+    <member>Tristan Partin</member>
+    <member>Triveni N</member>
+    <member>Umar Hayat</member>
+    <member>Vallimaharajan G</member>
+    <member>Vasya Boytsov</member>
+    <member>Victor Yegorov</member>
+    <member>Vignesh C</member>
+    <member>Viktor Holmberg</member>
+    <member>Vinícius Abrahão</member>
+    <member>Vinod Sridharan</member>
+    <member>Virender Singla</member>
+    <member>Vitaly Davydov</member>
+    <member>Vladlen Popolitov</member>
+    <member>Vladyslav Nebozhyn</member>
+    <member>Walid Ibrahim</member>
+    <member>Webbo Han</member>
+    <member>Wenhui Qiu</member>
+    <member>Will Mortensen</member>
+    <member>Will Storey</member>
+    <member>Wolfgang Walther</member>
+    <member>Xin Zhang</member>
+    <member>Xing Guo</member>
+    <member>Xuneng Zhou</member>
+    <member>Yan Chengpen</member>
+    <member>Yang Lei</member>
+    <member>Yaroslav Saburov</member>
+    <member>Yaroslav Syrytsia</member>
+    <member>Yasir Hussain</member>
+    <member>Yasuo Honda</member>
+    <member>Yogesh Sharma</member>
+    <member>Yonghao Lee</member>
+    <member>Yoran Heling</member>
+    <member>Yu Liang</member>
+    <member>Yugo Nagata</member>
+    <member>Yuhang Qiu</member>
+    <member>Yuki Seino</member>
+    <member>Yura Sokolov</member>
+    <member>Yurii Rashkovskii</member>
+    <member>Yushi Ogiwara</member>
+    <member>Yusuke Sugie</member>
+    <member>Yuta Katsuragi</member>
+    <member>Yuto Sasaki</member>
+    <member>Yuuki Fujii</member>
+    <member>Yuya Watari</member>
+    <member>Zane Duffield</member>
+    <member>Zeyuan Hu</member>
+    <member>Zhang Mingli</member>
+    <member>Zhihong Yu</member>
+    <member>Zhijie Hou</member>
+    <member>Zsolt Parragi</member>
    </simplelist>
   </sect2>
 
diff --git a/doc/src/sgml/sourcerepo.sgml b/doc/src/sgml/sourcerepo.sgml
index 6c13c5a30cd..f4368e83ab3 100644
--- a/doc/src/sgml/sourcerepo.sgml
+++ b/doc/src/sgml/sourcerepo.sgml
@@ -40,7 +40,7 @@
 
    <step>
     <para>
-     To begin using the Git repository, make a clone of the official mirror:
+     To begin using the <productname>Git</productname> repository, make a clone of the official mirror:
 
 <programlisting>
 git clone https://git.postgresql.org/git/postgresql.git
@@ -51,16 +51,6 @@ git clone https://git.postgresql.org/git/postgresql.git
      The files will be placed in a new subdirectory <filename>postgresql</filename> of
      your current directory.
     </para>
-
-    <para>
-     The Git mirror can also be reached via the Git protocol. Just change the URL
-     prefix to <literal>git</literal>, as in:
-
-<programlisting>
-git clone git://git.postgresql.org/git/postgresql.git
-</programlisting>
-
-    </para>
    </step>
 
    <step>
diff --git a/doc/src/sgml/system-views.sgml b/doc/src/sgml/system-views.sgml
index 986ae1f543d..d5ce93dd893 100644
--- a/doc/src/sgml/system-views.sgml
+++ b/doc/src/sgml/system-views.sgml
@@ -2819,21 +2819,18 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
          <para>
           <literal>unreserved</literal> means that the slot no longer
           retains the required WAL files and some of them are to be removed at
-          the next checkpoint.  This state can return
+          the next checkpoint.  This typically occurs when
+          <xref linkend="guc-max-slot-wal-keep-size"/> is set to
+          a non-negative value.  This state can return
           to <literal>reserved</literal> or <literal>extended</literal>.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>lost</literal> means that some required WAL files have
-          been removed and this slot is no longer usable.
+          <literal>lost</literal> means that this slot is no longer usable.
          </para>
         </listitem>
        </itemizedlist>
-       The last two states are seen only when
-       <xref linkend="guc-max-slot-wal-keep-size"/> is
-       non-negative. If <structfield>restart_lsn</structfield> is NULL, this
-       field is null.
       </para></entry>
      </row>
 
@@ -2932,7 +2929,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
         <listitem>
          <para>
           <literal>idle_timeout</literal> means that the slot has remained
-          idle longer than the configured
+          inactive longer than the configured
           <xref linkend="guc-idle-replication-slot-timeout"/> duration.
          </para>
         </listitem>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 2d81afce8cb..1eb5abffd8f 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -3669,11 +3669,14 @@ LWLockRelease(AddinShmemInitLock);
 </programlisting>
       <literal>shmem_startup_hook</literal> provides a convenient place for the
       initialization code, but it is not strictly required that all such code
-      be placed in this hook.  Each backend will execute the registered
-      <literal>shmem_startup_hook</literal> shortly after it attaches to shared
-      memory.  Note that add-ins should still acquire
+      be placed in this hook.  On Windows (and anywhere else where
+      <literal>EXEC_BACKEND</literal> is defined), each backend executes the
+      registered <literal>shmem_startup_hook</literal> shortly after it
+      attaches to shared memory, so add-ins should still acquire
       <function>AddinShmemInitLock</function> within this hook, as shown in the
-      example above.
+      example above.  On other platforms, only the postmaster process executes
+      the <literal>shmem_startup_hook</literal>, and each backend automatically
+      inherits the pointers to shared memory.
      </para>
 
      <para>
diff --git a/meson.build b/meson.build
index b1d1522890b..abdf156deb6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-#Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+#Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 # Entry point for building PostgreSQL with meson
@@ -9,7 +9,7 @@
 
 project('postgresql',
   ['c'],
-  version: '18beta1',
+  version: '18.4',
   license: 'PostgreSQL',
 
   # We want < 0.56 for python 3.5 compatibility on old platforms. EPEL for
@@ -28,7 +28,7 @@ project('postgresql',
 )
 
 # IvorySQL version
-ivorysql_version = '5.0'
+ivorysql_version = '5.4'
 
 
 ###############################################################
@@ -155,7 +155,7 @@ cdata.set('PG_MAJORVERSION_NUM', pg_version_major)
 cdata.set('PG_MINORVERSION_NUM', pg_version_minor)
 cdata.set('PG_VERSION_NUM', pg_version_num)
 
-cdata.set('PACKAGE_IVORYSQL_VERSION', ivorysql_version)
+cdata.set_quoted('PACKAGE_IVORYSQL_VERSION', ivorysql_version)
 # PG_VERSION_STR is built later, it depends on compiler test results
 cdata.set_quoted('CONFIGURE_ARGS', '')
 
@@ -457,6 +457,14 @@ else
   segsize = (get_option('segsize') * 1024 * 1024 * 1024) / blocksize
 endif
 
+# If we don't have largefile support, can't handle segment size >= 2GB.
+if cc.sizeof('off_t', args: test_c_args) < 8
+  segsize_bytes = segsize * blocksize
+  if segsize_bytes >= (2 * 1024 * 1024 * 1024)
+    error('Large file support is not enabled. Segment size cannot be larger than 1GB.')
+  endif
+endif
+
 cdata.set('BLCKSZ', blocksize, description:
 '''Size of a disk block --- this also limits the size of a tuple. You can set
    it bigger if you need bigger tuples (although TOAST should reduce the need
@@ -951,10 +959,10 @@ if not libcurlopt.disabled()
   # libcurl and one of either epoll or kqueue.
   oauth_flow_supported = (
     libcurl.found()
-    and (cc.check_header('sys/event.h', required: false,
-                         args: test_c_args, include_directories: postgres_inc)
-         or cc.check_header('sys/epoll.h', required: false,
-                            args: test_c_args, include_directories: postgres_inc))
+    and (cc.has_header('sys/event.h',
+                       args: test_c_args, include_directories: postgres_inc)
+         or cc.has_header('sys/epoll.h',
+                          args: test_c_args, include_directories: postgres_inc))
   )
 
   if oauth_flow_supported
@@ -998,6 +1006,12 @@ liburingopt = get_option('liburing')
 liburing = dependency('liburing', required: liburingopt)
 if liburing.found()
   cdata.set('USE_LIBURING', 1)
+
+  if cc.has_function('io_uring_queue_init_mem',
+      dependencies: liburing, args: test_c_args)
+    cdata.set('HAVE_IO_URING_QUEUE_INIT_MEM', 1)
+  endif
+
 endif
 
 
@@ -1581,7 +1595,10 @@ if uuidopt != 'none'
   elif uuidopt == 'ossp'
     # In upstream, the package and library is called just 'uuid', but many
     # distros change it to 'ossp-uuid'.
-    uuid = dependency('ossp-uuid', 'uuid', required: false)
+    uuid = dependency('ossp-uuid', required: false)
+    if not uuid.found()
+      uuid = dependency('uuid', required: false)
+    endif
     uuidfunc = 'uuid_export'
     uuidheader = 'uuid.h'
 
@@ -1900,6 +1917,8 @@ if cc.compiles('''
 endif
 
 
+# Select the format archetype to be used to check printf-type functions.
+#
 # Need to check a call with %m because netbsd supports gnu_printf but emits a
 # warning for each use of %m.
 printf_attributes = ['gnu_printf', '__syslog__', 'printf']
@@ -1914,11 +1933,24 @@ attrib_error_args = cc.get_supported_arguments('-Werror=format', '-Werror=ignore
 foreach a : printf_attributes
   if cc.compiles(testsrc.format(a),
       args: test_c_args + attrib_error_args, name: 'format ' + a)
-    cdata.set('PG_PRINTF_ATTRIBUTE', a)
+    cdata.set('PG_C_PRINTF_ATTRIBUTE', a)
     break
   endif
 endforeach
 
+# We need to repeat the test for C++ because gcc and clang prefer different
+# format archetypes.
+if llvm.found()
+  attrib_error_args = cpp.get_supported_arguments('-Werror=format', '-Werror=ignored-attributes')
+  foreach a : printf_attributes
+    if cpp.compiles(testsrc.format(a),
+        args: attrib_error_args, name: 'cppformat ' + a)
+      cdata.set('PG_CXX_PRINTF_ATTRIBUTE', a)
+      break
+    endif
+  endforeach
+endif
+
 
 if cc.has_function_attribute('visibility:default') and \
     cc.has_function_attribute('visibility:hidden')
@@ -1993,10 +2025,7 @@ if cc.links('''
   cdata.set('HAVE__BUILTIN_OP_OVERFLOW', 1)
 endif
 
-
-# XXX: The configure.ac check for __cpuid() is broken, we don't copy that
-# here. To prevent problems due to two detection methods working, stop
-# checking after one.
+# Check for __get_cpuid() and __cpuid().
 if cc.links('''
     #include <cpuid.h>
     int main(int arg, char **argv)
@@ -2850,7 +2879,7 @@ gnugetopt_dep = cc.find_library('gnugetopt', required: false)
 #   (i.e., allow '-' as a flag character), so use our version on those platforms
 # - We want to use system's getopt_long() only if the system provides struct
 #   option
-always_replace_getopt = host_system in ['windows', 'cygwin', 'openbsd', 'solaris']
+always_replace_getopt = host_system in ['windows', 'cygwin', 'openbsd', 'sunos']
 always_replace_getopt_long = host_system in ['windows', 'cygwin'] or not cdata.has('HAVE_STRUCT_OPTION')
 
 # Required on BSDs
@@ -2979,7 +3008,7 @@ cdata.set_quoted('DLSUFFIX', dlsuffix)
 cdata.set_quoted('PG_VERSION_STR',
   'PostgreSQL (IvorySQL @6@) @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
     pg_version, host_machine.cpu_family(), host_system,
-    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8, cdata.get('PACKAGE_IVORYSQL_VERSION')
+    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8, ivorysql_version
   )
 )
 
@@ -3305,6 +3334,7 @@ libpq_deps += [
 ]
 
 libpq_oauth_deps += [
+  thread_dep,
   libcurl,
 ]
 
@@ -3473,6 +3503,13 @@ installed_targets = [
   ecpg_targets,
 ]
 
+if oauth_flow_supported
+  installed_targets += [
+    libpq_oauth_so,
+    libpq_oauth_st,
+  ]
+endif
+
 # all targets that require building code
 all_built = [
   installed_targets,
diff --git a/meson_options.txt b/meson_options.txt
index 61ddb46b1e0..7689c7b3d01 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-#Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+#Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 # Data layout influencing options
@@ -160,7 +160,7 @@ option('systemd', type: 'feature', value: 'auto',
   description: 'systemd support')
 
 option('uuid', type: 'combo', choices: ['none', 'bsd', 'e2fs', 'ossp'],
-  value: 'ossp',
+  value: 'e2fs',
   description: 'Use LIB for contrib/uuid-ossp support')
 
 option('zlib', type: 'feature', value: 'auto',
diff --git a/src/Makefile b/src/Makefile
index bcba97838e0..492ae9dffa7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 # Makefile for src
 #
 # Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/Makefile
 #
@@ -35,7 +35,6 @@ SUBDIRS = \
 	test/perl \
 	oracle_test/regress \
 	oracle_test/isolation \
-	oracle_test/modules \
 	oracle_test/perl
 
 ifeq ($(with_llvm), yes)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index d3ea5c22933..67534d0daa7 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -258,7 +258,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 PG_SYSROOT = @PG_SYSROOT@
 
-override CPPFLAGS := $(ICU_CFLAGS) $(LIBNUMA_CFLAGS) $(LIBURING_CFLAGS) $(CPPFLAGS)
+override CPPFLAGS += $(ICU_CFLAGS) $(LIBNUMA_CFLAGS) $(LIBURING_CFLAGS)
 
 ifdef PGXS
 override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS)
diff --git a/src/backend/Makefile b/src/backend/Makefile
index ae60b7461c2..f1613f3b41a 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/backend/Makefile
 #
@@ -115,9 +115,6 @@ parser/gram.h: parser/gram.y
 storage/lmgr/lwlocknames.h: storage/lmgr/generate-lwlocknames.pl ../include/storage/lwlocklist.h utils/activity/wait_event_names.txt
 	$(MAKE) -C storage/lmgr lwlocknames.h
 
-utils/activity/wait_event_types.h: utils/activity/generate-wait_event_types.pl utils/activity/wait_event_names.txt
-	$(MAKE) -C utils/activity wait_event_types.h pgstat_wait_event.c wait_event_funcs_data.c
-
 # run this unconditionally to avoid needing to know its dependencies here:
 submake-catalog-headers:
 	$(MAKE) -C ../include/catalog generated-headers
@@ -142,18 +139,13 @@ submake-utils-headers:
 
 .PHONY: generated-headers
 
-generated-headers: $(top_builddir)/src/include/storage/lwlocknames.h $(top_builddir)/src/include/utils/wait_event_types.h submake-catalog-headers submake-nodes-headers submake-utils-headers parser/gram.h
+generated-headers: $(top_builddir)/src/include/storage/lwlocknames.h submake-catalog-headers submake-nodes-headers submake-utils-headers parser/gram.h
 
 $(top_builddir)/src/include/storage/lwlocknames.h: storage/lmgr/lwlocknames.h
 	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
 	  cd '$(dir $@)' && rm -f $(notdir $@) && \
 	  $(LN_S) "$$prereqdir/$(notdir $<)" .
 
-$(top_builddir)/src/include/utils/wait_event_types.h: utils/activity/wait_event_types.h
-	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
-	  cd '$(dir $@)' && rm -f $(notdir $@) && \
-	  $(LN_S) "$$prereqdir/$(notdir $<)" .
-
 utils/probes.o: utils/probes.d $(SUBDIROBJS)
 	$(DTRACE) $(DTRACEFLAGS) -C -G -s $(call expand_subsys,$^) -o $@
 
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index 00fc182d36f..a7fb742219a 100644
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -573,7 +573,6 @@ bringetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 	Relation	heapRel;
 	BrinOpaque *opaque;
 	BlockNumber nblocks;
-	BlockNumber heapBlk;
 	int64		totalpages = 0;
 	FmgrInfo   *consistentFn;
 	MemoryContext oldcxt;
@@ -735,9 +734,10 @@ bringetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 	/*
 	 * Now scan the revmap.  We start by querying for heap page 0,
 	 * incrementing by the number of pages per range; this gives us a full
-	 * view of the table.
+	 * view of the table.  We make use of uint64 for heapBlk as a BlockNumber
+	 * could wrap for tables with close to 2^32 pages.
 	 */
-	for (heapBlk = 0; heapBlk < nblocks; heapBlk += opaque->bo_pagesPerRange)
+	for (uint64 heapBlk = 0; heapBlk < nblocks; heapBlk += opaque->bo_pagesPerRange)
 	{
 		bool		addrange;
 		bool		gottuple = false;
@@ -749,7 +749,7 @@ bringetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 
 		MemoryContextReset(perRangeCxt);
 
-		tup = brinGetTupleForHeapBlock(opaque->bo_rmAccess, heapBlk, &buf,
+		tup = brinGetTupleForHeapBlock(opaque->bo_rmAccess, (BlockNumber) heapBlk, &buf,
 									   &off, &size, BUFFER_LOCK_SHARE);
 		if (tup)
 		{
@@ -924,7 +924,7 @@ bringetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 		/* add the pages in the range to the output bitmap, if needed */
 		if (addrange)
 		{
-			BlockNumber pageno;
+			uint64		pageno;
 
 			for (pageno = heapBlk;
 				 pageno <= Min(nblocks, heapBlk + opaque->bo_pagesPerRange) - 1;
diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c
index 0d1507a2a36..4755c3d0af3 100644
--- a/src/backend/access/brin/brin_minmax_multi.c
+++ b/src/backend/access/brin/brin_minmax_multi.c
@@ -2032,7 +2032,7 @@ brin_minmax_multi_distance_numeric(PG_FUNCTION_ARGS)
 
 	d = DirectFunctionCall2(numeric_sub, a2, a1);	/* a2 - a1 */
 
-	PG_RETURN_FLOAT8(DirectFunctionCall1(numeric_float8, d));
+	PG_RETURN_DATUM(DirectFunctionCall1(numeric_float8, d));
 }
 
 /*
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index 6d8dd1512d6..a5187a6202f 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -893,7 +893,11 @@ brin_initialize_empty_new_buffer(Relation idxrel, Buffer buffer)
 	page = BufferGetPage(buffer);
 	brin_page_init(page, BRIN_PAGETYPE_REGULAR);
 	MarkBufferDirty(buffer);
-	log_newpage_buffer(buffer, true);
+
+	/* XLOG stuff */
+	if (RelationNeedsWAL(idxrel))
+		log_newpage_buffer(buffer, true);
+
 	END_CRIT_SECTION();
 
 	/*
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index b736a5cce73..60d9d0799c1 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/access/common/printtup.c
diff --git a/src/backend/access/common/session.c b/src/backend/access/common/session.c
index de99822a3cd..79d53a49734 100644
--- a/src/backend/access/common/session.c
+++ b/src/backend/access/common/session.c
@@ -12,7 +12,7 @@
  * Currently this infrastructure is used to share:
  * - typemod registry for ephemeral row-types, i.e. BlessTupleDesc etc.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 2017-2025, PostgreSQL Global Development Group
  *
  * src/backend/access/common/session.c
diff --git a/src/backend/access/common/toast_internals.c b/src/backend/access/common/toast_internals.c
index 7d8be8346ce..b03196fdf3e 100644
--- a/src/backend/access/common/toast_internals.c
+++ b/src/backend/access/common/toast_internals.c
@@ -135,7 +135,7 @@ toast_save_datum(Relation rel, Datum value,
 		char		data[TOAST_MAX_CHUNK_SIZE + VARHDRSZ];
 		/* ensure union is aligned well enough: */
 		int32		align_it;
-	}			chunk_data;
+	}			chunk_data = {0};	/* silence compiler warning */
 	int32		chunk_size;
 	int32		chunk_seq = 0;
 	char	   *data_p;
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index f29ccd3c2d1..656299b1b52 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -1327,6 +1327,8 @@ scanGetItem(IndexScanDesc scan, ItemPointerData advancePast,
 	 */
 	do
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		ItemPointerSetMin(item);
 		match = true;
 		for (i = 0; i < so->nkeys && match; i++)
@@ -1966,8 +1968,6 @@ gingetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 
 	for (;;)
 	{
-		CHECK_FOR_INTERRUPTS();
-
 		if (!scanGetItem(scan, iptr, &iptr, &recheck))
 			break;
 
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index a65acd89104..a72e531167b 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -152,7 +152,9 @@ typedef struct
 	 * only in the leader process.
 	 */
 	GinLeader  *bs_leader;
-	int			bs_worker_id;
+
+	/* number of participating workers (including leader) */
+	int			bs_num_workers;
 
 	/* used to pass information from workers to leader */
 	double		bs_numtuples;
@@ -479,6 +481,15 @@ ginBuildCallback(Relation index, ItemPointer tid, Datum *values,
 /*
  * ginFlushBuildState
  *		Write all data from BuildAccumulator into the tuplesort.
+ *
+ * The number of TIDs written to the tuplesort at once is limited, to reduce
+ * the amount of memory needed when merging the intermediate results later.
+ * The leader will see up to two chunks per worker, so calculate the limit to
+ * not need more than MaxAllocSize overall.
+ *
+ * We don't need to worry about overflowing maintenance_work_mem. We can't
+ * build chunks larger than work_mem, and that limit was set so that workers
+ * produce sufficiently small chunks.
  */
 static void
 ginFlushBuildState(GinBuildState *buildstate, Relation index)
@@ -489,6 +500,11 @@ ginFlushBuildState(GinBuildState *buildstate, Relation index)
 	uint32		nlist;
 	OffsetNumber attnum;
 	TupleDesc	tdesc = RelationGetDescr(index);
+	uint32		maxlen;
+
+	/* maximum number of TIDs per chunk (two chunks per worker) */
+	maxlen = MaxAllocSize / sizeof(ItemPointerData);
+	maxlen /= (2 * buildstate->bs_num_workers);
 
 	ginBeginBAScan(&buildstate->accum);
 	while ((list = ginGetBAEntry(&buildstate->accum,
@@ -497,20 +513,31 @@ ginFlushBuildState(GinBuildState *buildstate, Relation index)
 		/* information about the key */
 		Form_pg_attribute attr = TupleDescAttr(tdesc, (attnum - 1));
 
-		/* GIN tuple and tuple length */
-		GinTuple   *tup;
-		Size		tuplen;
+		/* start of the chunk */
+		uint32		offset = 0;
 
-		/* there could be many entries, so be willing to abort here */
-		CHECK_FOR_INTERRUPTS();
+		/* split the entry into smaller chunk with up to maxlen items */
+		while (offset < nlist)
+		{
+			/* GIN tuple and tuple length */
+			GinTuple   *tup;
+			Size		tuplen;
+			uint32		len = Min(maxlen, nlist - offset);
 
-		tup = _gin_build_tuple(attnum, category,
-							   key, attr->attlen, attr->attbyval,
-							   list, nlist, &tuplen);
+			/* there could be many entries, so be willing to abort here */
+			CHECK_FOR_INTERRUPTS();
+
+			tup = _gin_build_tuple(attnum, category,
+								   key, attr->attlen, attr->attbyval,
+								   &list[offset], len,
+								   &tuplen);
 
-		tuplesort_putgintuple(buildstate->bs_worker_sort, tup, tuplen);
+			offset += len;
 
-		pfree(tup);
+			tuplesort_putgintuple(buildstate->bs_worker_sort, tup, tuplen);
+
+			pfree(tup);
+		}
 	}
 
 	MemoryContextReset(buildstate->tmpCtx);
@@ -2013,6 +2040,9 @@ _gin_parallel_scan_and_build(GinBuildState *state,
 	/* remember how much space is allowed for the accumulated entries */
 	state->work_mem = (sortmem / 2);
 
+	/* remember how many workers participate in the build */
+	state->bs_num_workers = ginshared->scantuplesortstates;
+
 	/* Begin "partial" tuplesort */
 	state->bs_sortstate = tuplesort_begin_index_gin(heap, index,
 													state->work_mem,
diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c
index c2d1771bd77..26081693383 100644
--- a/src/backend/access/gin/ginscan.c
+++ b/src/backend/access/gin/ginscan.c
@@ -271,6 +271,7 @@ ginNewScanKey(IndexScanDesc scan)
 	ScanKey		scankey = scan->keyData;
 	GinScanOpaque so = (GinScanOpaque) scan->opaque;
 	int			i;
+	int			numExcludeOnly;
 	bool		hasNullQuery = false;
 	bool		attrHasNormalScan[INDEX_MAX_KEYS] = {false};
 	MemoryContext oldCtx;
@@ -393,6 +394,7 @@ ginNewScanKey(IndexScanDesc scan)
 	 * excludeOnly scan key must receive a GIN_CAT_EMPTY_QUERY hidden entry
 	 * and be set to normal (excludeOnly = false).
 	 */
+	numExcludeOnly = 0;
 	for (i = 0; i < so->nkeys; i++)
 	{
 		GinScanKey	key = &so->keys[i];
@@ -406,6 +408,47 @@ ginNewScanKey(IndexScanDesc scan)
 			ginScanKeyAddHiddenEntry(so, key, GIN_CAT_EMPTY_QUERY);
 			attrHasNormalScan[key->attnum - 1] = true;
 		}
+		else
+			numExcludeOnly++;
+	}
+
+	/*
+	 * If we left any excludeOnly scan keys as-is, move them to the end of the
+	 * scan key array: they must appear after normal key(s).
+	 */
+	if (numExcludeOnly > 0)
+	{
+		GinScanKey	tmpkeys;
+		int			iNormalKey;
+		int			iExcludeOnly;
+
+		/* We'd better have made at least one normal key */
+		Assert(numExcludeOnly < so->nkeys);
+		/* Make a temporary array to hold the re-ordered scan keys */
+		tmpkeys = (GinScanKey) palloc(so->nkeys * sizeof(GinScanKeyData));
+		/* Re-order the keys ... */
+		iNormalKey = 0;
+		iExcludeOnly = so->nkeys - numExcludeOnly;
+		for (i = 0; i < so->nkeys; i++)
+		{
+			GinScanKey	key = &so->keys[i];
+
+			if (key->excludeOnly)
+			{
+				memcpy(tmpkeys + iExcludeOnly, key, sizeof(GinScanKeyData));
+				iExcludeOnly++;
+			}
+			else
+			{
+				memcpy(tmpkeys + iNormalKey, key, sizeof(GinScanKeyData));
+				iNormalKey++;
+			}
+		}
+		Assert(iNormalKey == so->nkeys - numExcludeOnly);
+		Assert(iExcludeOnly == so->nkeys);
+		/* ... and copy them back to so->keys[] */
+		memcpy(so->keys, tmpkeys, so->nkeys * sizeof(GinScanKeyData));
+		pfree(tmpkeys);
 	}
 
 	/*
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index c0aa7d0222f..7d4d7f733e4 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -157,7 +157,7 @@ gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len,
 {
 	int			i;
 	GistEntryVector *evec;
-	int			attrsize;
+	int			attrsize = 0;	/* silence compiler warning */
 
 	evec = (GistEntryVector *) palloc((len + 2) * sizeof(GISTENTRY) + GEVHDRSZ);
 
@@ -242,7 +242,7 @@ gistMakeUnionKey(GISTSTATE *giststate, int attno,
 		char		padding[2 * sizeof(GISTENTRY) + GEVHDRSZ];
 	}			storage;
 	GistEntryVector *evec = &storage.gev;
-	int			dstsize;
+	int			dstsize = 0;	/* silence compiler warning */
 
 	evec->n = 2;
 
@@ -1034,7 +1034,7 @@ gistGetFakeLSN(Relation rel)
 		 * last call.
 		 */
 		static XLogRecPtr lastlsn = InvalidXLogRecPtr;
-		XLogRecPtr	currlsn = GetXLogInsertRecPtr();
+		XLogRecPtr	currlsn = GetXLogInsertEndRecPtr();
 
 		/* Shouldn't be called for WAL-logging relations */
 		Assert(!RelationNeedsWAL(rel));
diff --git a/src/backend/access/hash/README b/src/backend/access/hash/README
index 13dc59c124a..fc9031117c9 100644
--- a/src/backend/access/hash/README
+++ b/src/backend/access/hash/README
@@ -171,11 +171,10 @@ Metapage Caching
 Both scanning the index and inserting tuples require locating the bucket
 where a given tuple ought to be located.  To do this, we need the bucket
 count, highmask, and lowmask from the metapage; however, it's undesirable
-for performance reasons to have to have to lock and pin the metapage for
-every such operation.  Instead, we retain a cached copy of the metapage
-in each backend's relcache entry.  This will produce the correct
-bucket mapping as long as the target bucket hasn't been split since the
-last cache refresh.
+for performance reasons to have to lock and pin the metapage for every such
+operation.  Instead, we retain a cached copy of the metapage in each backend's
+relcache entry.  This will produce the correct bucket mapping as long as the
+target bucket hasn't been split since the last cache refresh.
 
 To guard against the possibility that such a split has occurred, the
 primary page of each bucket chain stores the number of buckets that
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index d24e240dba1..74c1782b7a1 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -27,6 +27,7 @@
 #include "postgres.h"
 
 #include "common/hashfn.h"
+#include "utils/builtins.h"
 #include "utils/float.h"
 #include "utils/fmgrprotos.h"
 #include "utils/pg_locale.h"
@@ -233,6 +234,7 @@ hashoidvector(PG_FUNCTION_ARGS)
 {
 	oidvector  *key = (oidvector *) PG_GETARG_POINTER(0);
 
+	check_valid_oidvector(key);
 	return hash_any((unsigned char *) key->values, key->dim1 * sizeof(Oid));
 }
 
@@ -241,6 +243,7 @@ hashoidvectorextended(PG_FUNCTION_ARGS)
 {
 	oidvector  *key = (oidvector *) PG_GETARG_POINTER(0);
 
+	check_valid_oidvector(key);
 	return hash_any_extended((unsigned char *) key->values,
 							 key->dim1 * sizeof(Oid),
 							 PG_GETARG_INT64(1));
diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index 891a51cca6c..121eb7008bf 100644
--- a/src/backend/access/hash/hashvalidate.c
+++ b/src/backend/access/hash/hashvalidate.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/access/hash/hashvalidate.c
diff --git a/src/backend/access/heap/README.tuplock b/src/backend/access/heap/README.tuplock
index 843c2e58f92..16f7d78b7d2 100644
--- a/src/backend/access/heap/README.tuplock
+++ b/src/backend/access/heap/README.tuplock
@@ -199,3 +199,35 @@ under a reader holding a pin.  A reader of a heap_fetch() result tuple may
 witness a torn read.  Current inplace-updated fields are aligned and are no
 wider than four bytes, and current readers don't need consistency across
 fields.  Hence, they get by with just fetching each field once.
+
+During logical decoding, caches reflect an inplace update no later than the
+next XLOG_XACT_INVALIDATIONS.  That record witnesses the end of a command.
+Tuples of its cmin are then visible to decoding, as are inplace updates of any
+lower LSN.  Inplace updates of a higher LSN may also be visible, even if those
+updates would have been invisible to a non-historic snapshot matching
+decoding's historic snapshot.  (In other words, decoding may see inplace
+updates that were not visible to a similar snapshot taken during original
+transaction processing.)  That's a consequence of inplace update violating
+MVCC: there are no snapshot-specific versions of inplace-updated values.  This
+all makes it hard to reason about inplace-updated column reads during logical
+decoding, but the behavior does suffice for relhasindex.  A relhasindex=t in
+CREATE INDEX becomes visible no later than the new pg_index row.  While it may
+be visible earlier, that's harmless.  Finding zero indexes despite
+relhasindex=t is normal in more cases than this, e.g. after DROP INDEX.
+Example of a case that meaningfully reacts to the inplace inval:
+
+CREATE TABLE cat (c int) WITH (user_catalog_table = true);
+CREATE TABLE normal (d int);
+...
+CREATE INDEX ON cat (c)\; INSERT INTO normal VALUES (1);
+
+If the output plugin reads "cat" during decoding of the INSERT, it's fair to
+want that read to see relhasindex=t and use the new index.
+
+An alternative would be to have decoding of XLOG_HEAP_INPLACE immediately
+execute its invals.  That would behave more like invals during original
+transaction processing.  It would remove the decoding-specific delay in e.g. a
+decoding plugin witnessing a relfrozenxid change.  However, a good use case
+for that is unlikely, since the plugin would still witness relfrozenxid
+changes prematurely.  Hence, inplace update takes the trivial approach of
+delegating to XLOG_XACT_INVALIDATIONS.
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index bad41b56cbe..793118f6d9e 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -80,8 +80,11 @@ static inline BlockNumber heapgettup_advance_block(HeapScanDesc scan,
 												   ScanDirection dir);
 static pg_noinline BlockNumber heapgettup_initial_block(HeapScanDesc scan,
 														ScanDirection dir);
-static TM_Result heap_lock_updated_tuple(Relation rel, HeapTuple tuple,
-										 ItemPointer ctid, TransactionId xid,
+static TM_Result heap_lock_updated_tuple(Relation rel,
+										 uint16 prior_infomask,
+										 TransactionId prior_rawxmax,
+										 const ItemPointerData *prior_ctid,
+										 TransactionId xid,
 										 LockTupleMode mode);
 static void GetMultiXactIdHintBits(MultiXactId multi, uint16 *new_infomask,
 								   uint16 *new_infomask2);
@@ -986,7 +989,7 @@ heapgettup_pagemode(HeapScanDesc scan,
 			ItemId		lpp;
 			OffsetNumber lineoff;
 
-			Assert(lineindex <= scan->rs_ntuples);
+			Assert(lineindex < scan->rs_ntuples);
 			lineoff = scan->rs_vistuples[lineindex];
 			lpp = PageGetItemId(page, lineoff);
 			Assert(ItemIdIsNormal(lpp));
@@ -4713,11 +4716,13 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
 				 * If there are updates, follow the update chain; bail out if
 				 * that cannot be done.
 				 */
-				if (follow_updates && updated)
+				if (follow_updates && updated &&
+					!ItemPointerEquals(&tuple->t_self, &t_ctid))
 				{
 					TM_Result	res;
 
-					res = heap_lock_updated_tuple(relation, tuple, &t_ctid,
+					res = heap_lock_updated_tuple(relation,
+												  infomask, xwait, &t_ctid,
 												  GetCurrentTransactionId(),
 												  mode);
 					if (res != TM_Ok)
@@ -4960,11 +4965,13 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
 			}
 
 			/* if there are updates, follow the update chain */
-			if (follow_updates && !HEAP_XMAX_IS_LOCKED_ONLY(infomask))
+			if (follow_updates && !HEAP_XMAX_IS_LOCKED_ONLY(infomask) &&
+				!ItemPointerEquals(&tuple->t_self, &t_ctid))
 			{
 				TM_Result	res;
 
-				res = heap_lock_updated_tuple(relation, tuple, &t_ctid,
+				res = heap_lock_updated_tuple(relation,
+											  infomask, xwait, &t_ctid,
 											  GetCurrentTransactionId(),
 											  mode);
 				if (res != TM_Ok)
@@ -5618,7 +5625,8 @@ test_lockmode_for_conflict(MultiXactStatus status, TransactionId xid,
  * version as well.
  */
 static TM_Result
-heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
+heap_lock_updated_tuple_rec(Relation rel, TransactionId priorXmax,
+							const ItemPointerData *tid, TransactionId xid,
 							LockTupleMode mode)
 {
 	TM_Result	result;
@@ -5631,7 +5639,6 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
 				old_infomask2;
 	TransactionId xmax,
 				new_xmax;
-	TransactionId priorXmax = InvalidTransactionId;
 	bool		cleared_all_frozen = false;
 	bool		pinned_desired_page;
 	Buffer		vmbuffer = InvalidBuffer;
@@ -5945,7 +5952,10 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
  *		Follow update chain when locking an updated tuple, acquiring locks (row
  *		marks) on the updated versions.
  *
- * The initial tuple is assumed to be already locked.
+ * 'prior_infomask', 'prior_raw_xmax' and 'prior_ctid' are the corresponding
+ * fields from the initial tuple.  We will lock the tuples starting from the
+ * one that 'prior_ctid' points to.  Note: This function does not lock the
+ * initial tuple itself.
  *
  * This function doesn't check visibility, it just unconditionally marks the
  * tuple(s) as locked.  If any tuple in the updated chain is being deleted
@@ -5963,16 +5973,22 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
  * levels, because that would lead to a serializability failure.
  */
 static TM_Result
-heap_lock_updated_tuple(Relation rel, HeapTuple tuple, ItemPointer ctid,
+heap_lock_updated_tuple(Relation rel,
+						uint16 prior_infomask,
+						TransactionId prior_raw_xmax,
+						const ItemPointerData *prior_ctid,
 						TransactionId xid, LockTupleMode mode)
 {
+	INJECTION_POINT("heap_lock_updated_tuple", NULL);
+
 	/*
-	 * If the tuple has not been updated, or has moved into another partition
-	 * (effectively a delete) stop here.
+	 * If the tuple has moved into another partition (effectively a delete)
+	 * stop here.
 	 */
-	if (!HeapTupleHeaderIndicatesMovedPartitions(tuple->t_data) &&
-		!ItemPointerEquals(&tuple->t_self, ctid))
+	if (!ItemPointerIndicatesMovedPartitions(prior_ctid))
 	{
+		TransactionId prior_xmax;
+
 		/*
 		 * If this is the first possibly-multixact-able operation in the
 		 * current transaction, set my per-backend OldestMemberMXactId
@@ -5984,7 +6000,9 @@ heap_lock_updated_tuple(Relation rel, HeapTuple tuple, ItemPointer ctid,
 		 */
 		MultiXactIdSetOldestMember();
 
-		return heap_lock_updated_tuple_rec(rel, ctid, xid, mode);
+		prior_xmax = (prior_infomask & HEAP_XMAX_IS_MULTI) ?
+			MultiXactIdGetUpdateXid(prior_raw_xmax, prior_infomask) : prior_raw_xmax;
+		return heap_lock_updated_tuple_rec(rel, prior_xmax, prior_ctid, xid, mode);
 	}
 
 	/* nothing to lock */
@@ -6290,15 +6308,17 @@ heap_inplace_lock(Relation relation,
 	Assert(BufferIsValid(buffer));
 
 	/*
-	 * Construct shared cache inval if necessary.  Because we pass a tuple
-	 * version without our own inplace changes or inplace changes other
-	 * sessions complete while we wait for locks, inplace update mustn't
-	 * change catcache lookup keys.  But we aren't bothering with index
-	 * updates either, so that's true a fortiori.  After LockBuffer(), it
-	 * would be too late, because this might reach a
-	 * CatalogCacheInitializeCache() that locks "buffer".
+	 * Register shared cache invals if necessary.  Other sessions may finish
+	 * inplace updates of this tuple between this step and LockTuple().  Since
+	 * inplace updates don't change cache keys, that's harmless.
+	 *
+	 * While it's tempting to register invals only after confirming we can
+	 * return true, the following obstacle precludes reordering steps that
+	 * way.  Registering invals might reach a CatalogCacheInitializeCache()
+	 * that locks "buffer".  That would hang indefinitely if running after our
+	 * own LockBuffer().  Hence, we must register invals before LockBuffer().
 	 */
-	CacheInvalidateHeapTupleInplace(relation, oldtup_ptr, NULL);
+	CacheInvalidateHeapTupleInplace(relation, oldtup_ptr);
 
 	LockTuple(relation, &oldtup.t_self, InplaceUpdateTupleLock);
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
@@ -6536,10 +6556,6 @@ heap_inplace_update_and_unlock(Relation relation,
 	/*
 	 * Send invalidations to shared queue.  SearchSysCacheLocked1() assumes we
 	 * do this before UnlockTuple().
-	 *
-	 * If we're mutating a tuple visible only to this transaction, there's an
-	 * equivalent transactional inval from the action that created the tuple,
-	 * and this inval is superfluous.
 	 */
 	AtInplace_Inval();
 
@@ -6550,10 +6566,10 @@ heap_inplace_update_and_unlock(Relation relation,
 	AcceptInvalidationMessages();	/* local processing of just-sent inval */
 
 	/*
-	 * Queue a transactional inval.  The immediate invalidation we just sent
-	 * is the only one known to be necessary.  To reduce risk from the
-	 * transition to immediate invalidation, continue sending a transactional
-	 * invalidation like we've long done.  Third-party code might rely on it.
+	 * Queue a transactional inval, for logical decoding and for third-party
+	 * code that might have been relying on it since long before inplace
+	 * update adopted immediate invalidation.  See README.tuplock section
+	 * "Reading inplace-updated columns" for logical decoding details.
 	 */
 	if (!IsBootstrapProcessingMode())
 		CacheInvalidateHeapTuple(relation, tuple, NULL);
diff --git a/src/backend/access/heap/heapam_visibility.c b/src/backend/access/heap/heapam_visibility.c
index add305b8aa9..cc405c37163 100644
--- a/src/backend/access/heap/heapam_visibility.c
+++ b/src/backend/access/heap/heapam_visibility.c
@@ -57,7 +57,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/access/heap/heapam_visibility.c
diff --git a/src/backend/access/heap/heaptoast.c b/src/backend/access/heap/heaptoast.c
index 4c49324673a..87e91bb0df9 100644
--- a/src/backend/access/heap/heaptoast.c
+++ b/src/backend/access/heap/heaptoast.c
@@ -786,7 +786,7 @@ heap_fetch_toast_slice(Relation toastrel, Oid valueid, int32 attrsize,
 			chcpyend = (sliceoffset + slicelength - 1) % TOAST_MAX_CHUNK_SIZE;
 
 		memcpy(VARDATA(result) +
-			   (curchunk * TOAST_MAX_CHUNK_SIZE - sliceoffset) + chcpystrt,
+			   curchunk * TOAST_MAX_CHUNK_SIZE - sliceoffset + chcpystrt,
 			   chunkdata + chcpystrt,
 			   (chcpyend - chcpystrt) + 1);
 
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index 5e099d63676..462741507d5 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -431,7 +431,7 @@ static void find_next_unskippable_block(LVRelState *vacrel, bool *skipsallvis);
 static bool lazy_scan_new_or_empty(LVRelState *vacrel, Buffer buf,
 								   BlockNumber blkno, Page page,
 								   bool sharelock, Buffer vmbuffer);
-static void lazy_scan_prune(LVRelState *vacrel, Buffer buf,
+static int	lazy_scan_prune(LVRelState *vacrel, Buffer buf,
 							BlockNumber blkno, Page page,
 							Buffer vmbuffer, bool all_visible_according_to_vm,
 							bool *has_lpdead_items, bool *vm_page_frozen);
@@ -1244,6 +1244,7 @@ lazy_scan_heap(LVRelState *vacrel)
 		Buffer		buf;
 		Page		page;
 		uint8		blk_info = 0;
+		int			ndeleted = 0;
 		bool		has_lpdead_items;
 		void	   *per_buffer_data = NULL;
 		bool		vm_page_frozen = false;
@@ -1386,10 +1387,10 @@ lazy_scan_heap(LVRelState *vacrel)
 		 * line pointers previously marked LP_DEAD.
 		 */
 		if (got_cleanup_lock)
-			lazy_scan_prune(vacrel, buf, blkno, page,
-							vmbuffer,
-							blk_info & VAC_BLK_ALL_VISIBLE_ACCORDING_TO_VM,
-							&has_lpdead_items, &vm_page_frozen);
+			ndeleted = lazy_scan_prune(vacrel, buf, blkno, page,
+									   vmbuffer,
+									   blk_info & VAC_BLK_ALL_VISIBLE_ACCORDING_TO_VM,
+									   &has_lpdead_items, &vm_page_frozen);
 
 		/*
 		 * Count an eagerly scanned page as a failure or a success.
@@ -1480,7 +1481,7 @@ lazy_scan_heap(LVRelState *vacrel)
 			 * table has indexes. There will only be newly-freed space if we
 			 * held the cleanup lock and lazy_scan_prune() was called.
 			 */
-			if (got_cleanup_lock && vacrel->nindexes == 0 && has_lpdead_items &&
+			if (got_cleanup_lock && vacrel->nindexes == 0 && ndeleted > 0 &&
 				blkno - next_fsm_block_to_vacuum >= VACUUM_FSM_EVERY_PAGES)
 			{
 				FreeSpaceMapVacuumRange(vacrel->rel, next_fsm_block_to_vacuum,
@@ -1935,8 +1936,10 @@ cmpOffsetNumbers(const void *a, const void *b)
  * *vm_page_frozen is set to true if the page is newly set all-frozen in the
  * VM. The caller currently only uses this for determining whether an eagerly
  * scanned page was successfully set all-frozen.
+ *
+ * Returns the number of tuples deleted from the page during HOT pruning.
  */
-static void
+static int
 lazy_scan_prune(LVRelState *vacrel,
 				Buffer buf,
 				BlockNumber blkno,
@@ -2207,6 +2210,8 @@ lazy_scan_prune(LVRelState *vacrel,
 			*vm_page_frozen = true;
 		}
 	}
+
+	return presult.ndeleted;
 }
 
 /*
@@ -3556,6 +3561,8 @@ dead_items_reset(LVRelState *vacrel)
 	if (ParallelVacuumIsActive(vacrel))
 	{
 		parallel_vacuum_reset_dead_items(vacrel->pvs);
+		vacrel->dead_items = parallel_vacuum_get_dead_items(vacrel->pvs,
+															&vacrel->dead_items_info);
 		return;
 	}
 
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
index 226ac4899ec..21b4863c148 100644
--- a/src/backend/access/heap/visibilitymap.c
+++ b/src/backend/access/heap/visibilitymap.c
@@ -115,6 +115,8 @@
 
 /* Mapping from heap block number to the right bit in the visibility map */
 #define HEAPBLK_TO_MAPBLOCK(x) ((x) / HEAPBLOCKS_PER_PAGE)
+#define HEAPBLK_TO_MAPBLOCK_LIMIT(x) \
+	(((x) + HEAPBLOCKS_PER_PAGE - 1) / HEAPBLOCKS_PER_PAGE)
 #define HEAPBLK_TO_MAPBYTE(x) (((x) % HEAPBLOCKS_PER_PAGE) / HEAPBLOCKS_PER_BYTE)
 #define HEAPBLK_TO_OFFSET(x) (((x) % HEAPBLOCKS_PER_BYTE) * BITS_PER_HEAPBLOCK)
 
@@ -533,6 +535,21 @@ visibilitymap_prepare_truncate(Relation rel, BlockNumber nheapblocks)
 	return newnblocks;
 }
 
+/*
+ *	visibilitymap_truncation_length -
+ *			compute truncation length for visibility map
+ *
+ * Given a proposed truncation length for the main fork, compute the
+ * correct truncation length for the visibility map. Should return the
+ * same answer as visibilitymap_prepare_truncate(), but without modifying
+ * anything.
+ */
+BlockNumber
+visibilitymap_truncation_length(BlockNumber nheapblocks)
+{
+	return HEAPBLK_TO_MAPBLOCK_LIMIT(nheapblocks);
+}
+
 /*
  * Read a visibility map page.
  *
diff --git a/src/backend/access/index/amvalidate.c b/src/backend/access/index/amvalidate.c
index 0117dbaf02d..b9457b2f494 100644
--- a/src/backend/access/index/amvalidate.c
+++ b/src/backend/access/index/amvalidate.c
@@ -4,7 +4,7 @@
  *	  Support routines for index access methods' amvalidate and
  *	  amadjustmembers functions.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2016-2025, PostgreSQL Global Development Group
  *
  *
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 200617a8dad..97e38747c8d 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 4da5a3c1d16..458cd1ae0a0 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -57,6 +57,7 @@
 
 #include <limits.h>
 
+#include "utils/builtins.h"
 #include "utils/fmgrprotos.h"
 #include "utils/skipsupport.h"
 #include "utils/sortsupport.h"
@@ -525,6 +526,9 @@ btoidvectorcmp(PG_FUNCTION_ARGS)
 	oidvector  *b = (oidvector *) PG_GETARG_POINTER(1);
 	int			i;
 
+	check_valid_oidvector(a);
+	check_valid_oidvector(b);
+
 	/* We arbitrarily choose to sort first by vector length */
 	if (a->dim1 != b->dim1)
 		PG_RETURN_INT32(a->dim1 - b->dim1);
diff --git a/src/backend/access/nbtree/nbtpreprocesskeys.c b/src/backend/access/nbtree/nbtpreprocesskeys.c
index a136e4bbfdf..d09384a813a 100644
--- a/src/backend/access/nbtree/nbtpreprocesskeys.c
+++ b/src/backend/access/nbtree/nbtpreprocesskeys.c
@@ -16,6 +16,7 @@
 #include "postgres.h"
 
 #include "access/nbtree.h"
+#include "common/int.h"
 #include "lib/qunique.h"
 #include "utils/array.h"
 #include "utils/lsyscache.h"
@@ -56,6 +57,8 @@ static void _bt_skiparray_strat_decrement(IndexScanDesc scan, ScanKey arraysk,
 										  BTArrayKeyInfo *array);
 static void _bt_skiparray_strat_increment(IndexScanDesc scan, ScanKey arraysk,
 										  BTArrayKeyInfo *array);
+static void _bt_unmark_keys(IndexScanDesc scan, int *keyDataMap);
+static int	_bt_reorder_array_cmp(const void *a, const void *b);
 static ScanKey _bt_preprocess_array_keys(IndexScanDesc scan, int *new_numberOfKeys);
 static void _bt_preprocess_array_keys_final(IndexScanDesc scan, int *keyDataMap);
 static int	_bt_num_array_keys(IndexScanDesc scan, Oid *skip_eq_ops_out,
@@ -96,7 +99,7 @@ static int	_bt_compare_array_elements(const void *a, const void *b, void *arg);
  * incomplete sets of cross-type operators, we may fail to detect redundant
  * or contradictory keys, but we can survive that.)
  *
- * The output keys must be sorted by index attribute.  Presently we expect
+ * Required output keys are sorted by index attribute.  Presently we expect
  * (but verify) that the input keys are already so sorted --- this is done
  * by match_clauses_to_index() in indxpath.c.  Some reordering of the keys
  * within each attribute may be done as a byproduct of the processing here.
@@ -117,6 +120,10 @@ static int	_bt_compare_array_elements(const void *a, const void *b, void *arg);
  * For the first attribute without an "=" key, any "<" and "<=" keys are
  * marked SK_BT_REQFWD while any ">" and ">=" keys are marked SK_BT_REQBKWD.
  * This can be seen to be correct by considering the above example.
+ * (Actually, the z key _will_ be marked SK_BT_REQFWD, since preprocessing
+ * will generate a skip array on y -- except when DEBUG_DISABLE_SKIP_SCAN.
+ * See below description of how and why we generate skip array = keys in the
+ * presence of a "contradictory" condition such as "y < 4".)
  *
  * If we never generated skip array scan keys, it would be possible for "gaps"
  * to appear that make it unsafe to mark any subsequent input scan keys
@@ -127,29 +134,36 @@ static int	_bt_compare_array_elements(const void *a, const void *b, void *arg);
  * This has the potential to be much more efficient than a full index scan
  * (though it behaves like a full scan when there's many distinct "x" values).
  *
- * If possible, redundant keys are eliminated: we keep only the tightest
+ * Typically, redundant keys are eliminated: we keep only the tightest
  * >/>= bound and the tightest </<= bound, and if there's an = key then
  * that's the only one returned.  (So, we return either a single = key,
  * or one or two boundary-condition keys for each attr.)  However, if we
  * cannot compare two keys for lack of a suitable cross-type operator,
- * we cannot eliminate either.  If there are two such keys of the same
- * operator strategy, the second one is just pushed into the output array
- * without further processing here.  We may also emit both >/>= or both
- * </<= keys if we can't compare them.  The logic about required keys still
- * works if we don't eliminate redundant keys.
- *
- * Note that one reason we need direction-sensitive required-key flags is
- * precisely that we may not be able to eliminate redundant keys.  Suppose
- * we have "x > 4::int AND x > 10::bigint", and we are unable to determine
- * which key is more restrictive for lack of a suitable cross-type operator.
- * _bt_first will arbitrarily pick one of the keys to do the initial
- * positioning with.  If it picks x > 4, then the x > 10 condition will fail
- * until we reach index entries > 10; but we can't stop the scan just because
- * x > 10 is failing.  On the other hand, if we are scanning backwards, then
- * failure of either key is indeed enough to stop the scan.  (In general, when
- * inequality keys are present, the initial-positioning code only promises to
- * position before the first possible match, not exactly at the first match,
- * for a forward scan; or after the last match for a backward scan.)
+ * we cannot eliminate either key.
+ *
+ * When all redundant keys could not be eliminated, we'll output a key array
+ * that can more or less be treated as if it had no redundant keys.  Suppose
+ * we have "x > 4::int AND x > 10::bigint AND x < 70", and we are unable to
+ * determine which > key is more restrictive for lack of a suitable cross-type
+ * operator.  We'll arbitrarily pick one of the > keys; the other > key won't
+ * be marked required.  Obviously, the scan will be less efficient if we
+ * choose x > 4 over x > 10 -- but it can still largely proceed as if there
+ * was only a single > condition.  "x > 10" will be placed at the end of the
+ * so->keyData[] output array.  It'll always be evaluated last, after the keys
+ * that could be marked required in the usual way (after "x > 4 AND x < 70").
+ * This can sometimes result in so->keyData[] keys that aren't even in index
+ * attribute order (if the qual involves multiple attributes).  The scan's
+ * required keys will still be in attribute order, though, so it can't matter.
+ *
+ * This scheme ensures that _bt_first always uses the same set of keys at the
+ * start of a forwards scan as those _bt_checkkeys uses to determine when to
+ * end a similar backwards scan (and vice-versa).  _bt_advance_array_keys
+ * depends on this: it expects to be able to reliably predict what the next
+ * _bt_first call will do by testing whether _bt_checkkeys' routines report
+ * that the final tuple on the page is past the end of matches for the scan's
+ * keys with the scan direction flipped.  If it is (if continuescan=false),
+ * then it follows that calling _bt_first will, at a minimum, relocate the
+ * scan to the very next leaf page (in the current scan direction).
  *
  * As a byproduct of this work, we can detect contradictory quals such
  * as "x = 1 AND x > 2".  If we see that, we return so->qual_ok = false,
@@ -165,13 +179,18 @@ static int	_bt_compare_array_elements(const void *a, const void *b, void *arg);
  * array will generate its array elements from a range that's constrained by
  * any merged input inequalities (which won't get output in so->keyData[]).
  *
- * Row comparison keys currently have a couple of notable limitations.
- * Right now we just transfer them into the preprocessed array without any
- * editorialization.  We can treat them the same as an ordinary inequality
- * comparison on the row's first index column, for the purposes of the logic
- * about required keys.  Also, we are unable to merge a row comparison key
- * into a skip array (only ordinary inequalities are merged).  A key that
- * comes after a Row comparison key is therefore never marked as required.
+ * Row compares are treated as ordinary inequality comparisons on the row's
+ * first index column whenever possible.  We treat their first subkey as if it
+ * was a simple scalar inequality for the purposes of the logic about required
+ * keys.  This also gives us limited ability to detect contradictory/redundant
+ * conditions involving a row compare: we can do so whenever it involves an
+ * SK_ISNULL condition on a row compare's first column (the same rules used
+ * with simple inequalities work just as well here).  We have no ability to
+ * detect redundant/contradictory conditions in any other row compare case.
+ * Note in particular that we are unable to merge a row comparison key into a
+ * skip array (only ordinary inequalities are merged).  Any so->keyData[] key
+ * on a column that comes after a row comparison's first column can therefore
+ * never be marked as required at present.
  *
  * Note: the reason we have to copy the preprocessed scan keys into private
  * storage is that we are modifying the array based on comparisons of the
@@ -188,7 +207,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 	int			numberOfEqualCols;
 	ScanKey		inkeys;
 	BTScanKeyPreproc xform[BTMaxStrategyNumber];
-	bool		test_result;
+	bool		test_result,
+				redundant_key_kept = false;
 	AttrNumber	attno;
 	ScanKey		arrayKeyData;
 	int		   *keyDataMap = NULL;
@@ -388,7 +408,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 						xform[j].inkey = NULL;
 						xform[j].inkeyi = -1;
 					}
-					/* else, cannot determine redundancy, keep both keys */
+					else
+						redundant_key_kept = true;
 				}
 				/* track number of attrs for which we have "=" keys */
 				numberOfEqualCols++;
@@ -409,6 +430,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 					else
 						xform[BTLessStrategyNumber - 1].inkey = NULL;
 				}
+				else
+					redundant_key_kept = true;
 			}
 
 			/* try to keep only one of >, >= */
@@ -426,6 +449,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 					else
 						xform[BTGreaterStrategyNumber - 1].inkey = NULL;
 				}
+				else
+					redundant_key_kept = true;
 			}
 
 			/*
@@ -466,25 +491,6 @@ _bt_preprocess_keys(IndexScanDesc scan)
 		/* check strategy this key's operator corresponds to */
 		j = inkey->sk_strategy - 1;
 
-		/* if row comparison, push it directly to the output array */
-		if (inkey->sk_flags & SK_ROW_HEADER)
-		{
-			ScanKey		outkey = &so->keyData[new_numberOfKeys++];
-
-			memcpy(outkey, inkey, sizeof(ScanKeyData));
-			if (arrayKeyData)
-				keyDataMap[new_numberOfKeys - 1] = i;
-			if (numberOfEqualCols == attno - 1)
-				_bt_mark_scankey_required(outkey);
-
-			/*
-			 * We don't support RowCompare using equality; such a qual would
-			 * mess up the numberOfEqualCols tracking.
-			 */
-			Assert(j != (BTEqualStrategyNumber - 1));
-			continue;
-		}
-
 		if (inkey->sk_strategy == BTEqualStrategyNumber &&
 			(inkey->sk_flags & SK_SEARCHARRAY))
 		{
@@ -593,9 +599,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 				 * the new scan key.
 				 *
 				 * Note: We do things this way around so that our arrays are
-				 * always in the same order as their corresponding scan keys,
-				 * even with incomplete opfamilies.  _bt_advance_array_keys
-				 * depends on this.
+				 * always in the same order as their corresponding scan keys.
+				 * _bt_preprocess_array_keys_final expects this.
 				 */
 				ScanKey		outkey = &so->keyData[new_numberOfKeys++];
 
@@ -607,6 +612,7 @@ _bt_preprocess_keys(IndexScanDesc scan)
 				xform[j].inkey = inkey;
 				xform[j].inkeyi = i;
 				xform[j].arrayidx = arrayidx;
+				redundant_key_kept = true;
 			}
 		}
 	}
@@ -622,6 +628,15 @@ _bt_preprocess_keys(IndexScanDesc scan)
 	if (arrayKeyData)
 		_bt_preprocess_array_keys_final(scan, keyDataMap);
 
+	/*
+	 * If there are remaining redundant inequality keys, we must make sure
+	 * that each index attribute has no more than one required >/>= key, and
+	 * no more than one required </<= key.  Attributes that have one or more
+	 * required = keys now must keep only one required key (the first = key).
+	 */
+	if (unlikely(redundant_key_kept) && so->qual_ok)
+		_bt_unmark_keys(scan, keyDataMap);
+
 	/* Could pfree arrayKeyData/keyDataMap now, but not worth the cycles */
 }
 
@@ -746,9 +761,12 @@ _bt_fix_scankey_strategy(ScanKey skey, int16 *indoption)
  *
  * Depending on the operator type, the key may be required for both scan
  * directions or just one.  Also, if the key is a row comparison header,
- * we have to mark its first subsidiary ScanKey as required.  (Subsequent
- * subsidiary ScanKeys are normally for lower-order columns, and thus
- * cannot be required, since they're after the first non-equality scankey.)
+ * we have to mark the appropriate subsidiary ScanKeys as required.  In such
+ * cases, the first subsidiary key is required, but subsequent ones are
+ * required only as long as they correspond to successive index columns and
+ * match the leading column as to sort direction.  Otherwise the row
+ * comparison ordering is different from the index ordering and so we can't
+ * stop the scan on the basis of those lower-order columns.
  *
  * Note: when we set required-key flag bits in a subsidiary scankey, we are
  * scribbling on a data structure belonging to the index AM's caller, not on
@@ -786,12 +804,25 @@ _bt_mark_scankey_required(ScanKey skey)
 	if (skey->sk_flags & SK_ROW_HEADER)
 	{
 		ScanKey		subkey = (ScanKey) DatumGetPointer(skey->sk_argument);
+		AttrNumber	attno = skey->sk_attno;
 
 		/* First subkey should be same column/operator as the header */
-		Assert(subkey->sk_flags & SK_ROW_MEMBER);
-		Assert(subkey->sk_attno == skey->sk_attno);
+		Assert(subkey->sk_attno == attno);
 		Assert(subkey->sk_strategy == skey->sk_strategy);
-		subkey->sk_flags |= addflags;
+
+		for (;;)
+		{
+			Assert(subkey->sk_flags & SK_ROW_MEMBER);
+			if (subkey->sk_attno != attno)
+				break;			/* non-adjacent key, so not required */
+			if (subkey->sk_strategy != skey->sk_strategy)
+				break;			/* wrong direction, so not required */
+			subkey->sk_flags |= addflags;
+			if (subkey->sk_flags & SK_ROW_END)
+				break;
+			subkey++;
+			attno++;
+		}
 	}
 }
 
@@ -847,8 +878,7 @@ _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
 				cmp_op;
 	StrategyNumber strat;
 
-	Assert(!((leftarg->sk_flags | rightarg->sk_flags) &
-			 (SK_ROW_HEADER | SK_ROW_MEMBER)));
+	Assert(!((leftarg->sk_flags | rightarg->sk_flags) & SK_ROW_MEMBER));
 
 	/*
 	 * First, deal with cases where one or both args are NULL.  This should
@@ -924,6 +954,16 @@ _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
 		return true;
 	}
 
+	/*
+	 * We don't yet know how to determine redundancy when it involves a row
+	 * compare key (barring simple cases involving IS NULL/IS NOT NULL)
+	 */
+	if ((leftarg->sk_flags | rightarg->sk_flags) & SK_ROW_HEADER)
+	{
+		Assert(!((leftarg->sk_flags | rightarg->sk_flags) & SK_BT_SKIP));
+		return false;
+	}
+
 	/*
 	 * If either leftarg or rightarg are equality-type array scankeys, we need
 	 * specialized handling (since by now we know that IS NULL wasn't used)
@@ -1364,7 +1404,7 @@ _bt_skiparray_strat_adjust(IndexScanDesc scan, ScanKey arraysk,
 }
 
 /*
- * Convert skip array's > low_compare key into a >= key
+ * Convert skip array's < high_compare key into a <= key
  */
 static void
 _bt_skiparray_strat_decrement(IndexScanDesc scan, ScanKey arraysk,
@@ -1379,6 +1419,7 @@ _bt_skiparray_strat_decrement(IndexScanDesc scan, ScanKey arraysk,
 	Datum		orig_sk_argument = high_compare->sk_argument,
 				new_sk_argument;
 	bool		uflow;
+	int16		lookupstrat;
 
 	Assert(high_compare->sk_strategy == BTLessStrategyNumber);
 
@@ -1400,9 +1441,14 @@ _bt_skiparray_strat_decrement(IndexScanDesc scan, ScanKey arraysk,
 		return;
 	}
 
-	/* Look up <= operator (might fail) */
-	leop = get_opfamily_member(opfamily, opcintype, opcintype,
-							   BTLessEqualStrategyNumber);
+	/*
+	 * Look up <= operator (might fail), accounting for the fact that a
+	 * high_compare on a DESC column already had its strategy commuted
+	 */
+	lookupstrat = BTLessEqualStrategyNumber;
+	if (high_compare->sk_flags & SK_BT_DESC)
+		lookupstrat = BTGreaterEqualStrategyNumber; /* commute this too */
+	leop = get_opfamily_member(opfamily, opcintype, opcintype, lookupstrat);
 	if (!OidIsValid(leop))
 		return;
 	cmp_proc = get_opcode(leop);
@@ -1416,7 +1462,7 @@ _bt_skiparray_strat_decrement(IndexScanDesc scan, ScanKey arraysk,
 }
 
 /*
- * Convert skip array's < low_compare key into a <= key
+ * Convert skip array's > low_compare key into a >= key
  */
 static void
 _bt_skiparray_strat_increment(IndexScanDesc scan, ScanKey arraysk,
@@ -1431,6 +1477,7 @@ _bt_skiparray_strat_increment(IndexScanDesc scan, ScanKey arraysk,
 	Datum		orig_sk_argument = low_compare->sk_argument,
 				new_sk_argument;
 	bool		oflow;
+	int16		lookupstrat;
 
 	Assert(low_compare->sk_strategy == BTGreaterStrategyNumber);
 
@@ -1452,9 +1499,14 @@ _bt_skiparray_strat_increment(IndexScanDesc scan, ScanKey arraysk,
 		return;
 	}
 
-	/* Look up >= operator (might fail) */
-	geop = get_opfamily_member(opfamily, opcintype, opcintype,
-							   BTGreaterEqualStrategyNumber);
+	/*
+	 * Look up >= operator (might fail), accounting for the fact that a
+	 * low_compare on a DESC column already had its strategy commuted
+	 */
+	lookupstrat = BTGreaterEqualStrategyNumber;
+	if (low_compare->sk_flags & SK_BT_DESC)
+		lookupstrat = BTLessEqualStrategyNumber;	/* commute this too */
+	geop = get_opfamily_member(opfamily, opcintype, opcintype, lookupstrat);
 	if (!OidIsValid(geop))
 		return;
 	cmp_proc = get_opcode(geop);
@@ -1467,6 +1519,283 @@ _bt_skiparray_strat_increment(IndexScanDesc scan, ScanKey arraysk,
 	}
 }
 
+/*
+ *	_bt_unmark_keys() -- make superfluous required keys nonrequired after all
+ *
+ * When _bt_preprocess_keys fails to eliminate one or more redundant keys, it
+ * calls here to make sure that no index attribute has more than one > or >=
+ * key marked required, and no more than one required < or <= key.  Attributes
+ * with = keys will always get one = key as their required key.  All other
+ * keys that were initially marked required get "unmarked" here.  That way,
+ * _bt_first and _bt_checkkeys will reliably agree on which keys to use to
+ * start and/or to end the scan.
+ *
+ * We also relocate keys that become/started out nonrequired to the end of
+ * so->keyData[].  That way, _bt_first and _bt_checkkeys cannot fail to reach
+ * a required key due to some earlier nonrequired key getting in the way.
+ *
+ * Only call here when _bt_compare_scankey_args returned false at least once
+ * (otherwise, calling here will just waste cycles).
+ */
+static void
+_bt_unmark_keys(IndexScanDesc scan, int *keyDataMap)
+{
+	BTScanOpaque so = (BTScanOpaque) scan->opaque;
+	AttrNumber	attno;
+	bool	   *unmarkikey;
+	int			nunmark,
+				nunmarked,
+				nkept,
+				firsti;
+	ScanKey		keepKeys,
+				unmarkKeys;
+	FmgrInfo   *keepOrderProcs = NULL,
+			   *unmarkOrderProcs = NULL;
+	bool		haveReqEquals,
+				haveReqForward,
+				haveReqBackward;
+
+	/*
+	 * Do an initial pass over so->keyData[] that determines which keys to
+	 * keep as required.  We expect so->keyData[] to still be in attribute
+	 * order when we're called (though we don't expect any particular order
+	 * among each attribute's keys).
+	 *
+	 * When both equality and inequality keys remain on a single attribute, we
+	 * *must* make sure that exactly one of the equalities remains required.
+	 * Any requiredness markings that we might leave on later keys/attributes
+	 * are predicated on there being required = keys on all prior columns.
+	 */
+	unmarkikey = palloc0(so->numberOfKeys * sizeof(bool));
+	nunmark = 0;
+
+	/* Set things up for first key's attribute */
+	attno = so->keyData[0].sk_attno;
+	firsti = 0;
+	haveReqEquals = false;
+	haveReqForward = false;
+	haveReqBackward = false;
+	for (int i = 0; i < so->numberOfKeys; i++)
+	{
+		ScanKey		origkey = &so->keyData[i];
+
+		if (origkey->sk_attno != attno)
+		{
+			/* Reset for next attribute */
+			attno = origkey->sk_attno;
+			firsti = i;
+
+			haveReqEquals = false;
+			haveReqForward = false;
+			haveReqBackward = false;
+		}
+
+		/* Equalities get priority over inequalities */
+		if (haveReqEquals)
+		{
+			/*
+			 * We already found the first "=" key for this attribute.  We've
+			 * already decided that all its other keys will be unmarked.
+			 */
+			Assert(!(origkey->sk_flags & SK_SEARCHNULL));
+			unmarkikey[i] = true;
+			nunmark++;
+			continue;
+		}
+		else if ((origkey->sk_flags & SK_BT_REQFWD) &&
+				 (origkey->sk_flags & SK_BT_REQBKWD))
+		{
+			/*
+			 * Found the first "=" key for attno.  All other attno keys will
+			 * be unmarked.
+			 */
+			Assert(origkey->sk_strategy == BTEqualStrategyNumber);
+
+			haveReqEquals = true;
+			for (int j = firsti; j < i; j++)
+			{
+				/* Unmark any prior inequality keys on attno after all */
+				if (!unmarkikey[j])
+				{
+					unmarkikey[j] = true;
+					nunmark++;
+				}
+			}
+			continue;
+		}
+
+		/* Deal with inequalities next */
+		if ((origkey->sk_flags & SK_BT_REQFWD) && !haveReqForward)
+		{
+			haveReqForward = true;
+			continue;
+		}
+		else if ((origkey->sk_flags & SK_BT_REQBKWD) && !haveReqBackward)
+		{
+			haveReqBackward = true;
+			continue;
+		}
+
+		/*
+		 * We have either a redundant inequality key that will be unmarked, or
+		 * we have a key that wasn't marked required in the first place
+		 */
+		unmarkikey[i] = true;
+		nunmark++;
+	}
+
+	/* Should only be called when _bt_compare_scankey_args reported failure */
+	Assert(nunmark > 0);
+
+	/*
+	 * Next, allocate temp arrays: one for required keys that'll remain
+	 * required, the other for all remaining keys
+	 */
+	unmarkKeys = palloc(nunmark * sizeof(ScanKeyData));
+	keepKeys = palloc((so->numberOfKeys - nunmark) * sizeof(ScanKeyData));
+	nunmarked = 0;
+	nkept = 0;
+	if (so->numArrayKeys)
+	{
+		unmarkOrderProcs = palloc(nunmark * sizeof(FmgrInfo));
+		keepOrderProcs = palloc((so->numberOfKeys - nunmark) * sizeof(FmgrInfo));
+	}
+
+	/*
+	 * Next, copy the contents of so->keyData[] into the appropriate temp
+	 * array.
+	 *
+	 * Scans with = array keys need us to maintain invariants around the order
+	 * of so->orderProcs[] and so->arrayKeys[] relative to so->keyData[].  See
+	 * _bt_preprocess_array_keys_final for a full explanation.
+	 */
+	for (int i = 0; i < so->numberOfKeys; i++)
+	{
+		ScanKey		origkey = &so->keyData[i];
+		ScanKey		unmark;
+
+		if (!unmarkikey[i])
+		{
+			/*
+			 * Key gets to keep its original requiredness markings.
+			 *
+			 * Key will stay in its original position, unless we're going to
+			 * unmark an earlier key (in which case this key gets moved back).
+			 */
+			memcpy(keepKeys + nkept, origkey, sizeof(ScanKeyData));
+
+			if (so->numArrayKeys)
+			{
+				keyDataMap[i] = nkept;
+				memcpy(keepOrderProcs + nkept, &so->orderProcs[i],
+					   sizeof(FmgrInfo));
+			}
+
+			nkept++;
+			continue;
+		}
+
+		/*
+		 * Key will be unmarked as needed, and moved to the end of the array,
+		 * next to other keys that will become (or always were) nonrequired
+		 */
+		unmark = unmarkKeys + nunmarked;
+		memcpy(unmark, origkey, sizeof(ScanKeyData));
+
+		if (so->numArrayKeys)
+		{
+			keyDataMap[i] = (so->numberOfKeys - nunmark) + nunmarked;
+			memcpy(&unmarkOrderProcs[nunmarked], &so->orderProcs[i],
+				   sizeof(FmgrInfo));
+		}
+
+		/*
+		 * Preprocessing only generates skip arrays when it knows that they'll
+		 * be the only required = key on the attr.  We'll never unmark them.
+		 */
+		Assert(!(unmark->sk_flags & SK_BT_SKIP));
+
+		/*
+		 * Also shouldn't have to unmark an IS NULL or an IS NOT NULL key.
+		 * They aren't cross-type, so an incomplete opfamily can't matter.
+		 */
+		Assert(!(unmark->sk_flags & SK_ISNULL) ||
+			   !(unmark->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)));
+
+		/* Clear requiredness flags on redundant key (and on any subkeys) */
+		unmark->sk_flags &= ~(SK_BT_REQFWD | SK_BT_REQBKWD);
+		if (unmark->sk_flags & SK_ROW_HEADER)
+		{
+			ScanKey		subkey = (ScanKey) DatumGetPointer(unmark->sk_argument);
+
+			Assert(subkey->sk_strategy == unmark->sk_strategy);
+			for (;;)
+			{
+				Assert(subkey->sk_flags & SK_ROW_MEMBER);
+				subkey->sk_flags &= ~(SK_BT_REQFWD | SK_BT_REQBKWD);
+				if (subkey->sk_flags & SK_ROW_END)
+					break;
+				subkey++;
+			}
+		}
+
+		nunmarked++;
+	}
+
+	/* Copy both temp arrays back into so->keyData[] to reorder */
+	Assert(nkept == so->numberOfKeys - nunmark);
+	Assert(nunmarked == nunmark);
+	memcpy(so->keyData, keepKeys, sizeof(ScanKeyData) * nkept);
+	memcpy(so->keyData + nkept, unmarkKeys, sizeof(ScanKeyData) * nunmarked);
+
+	/* Done with temp arrays */
+	pfree(unmarkikey);
+	pfree(keepKeys);
+	pfree(unmarkKeys);
+
+	/*
+	 * Now copy so->orderProcs[] temp entries needed by scans with = array
+	 * keys back (just like with the so->keyData[] temp arrays)
+	 */
+	if (so->numArrayKeys)
+	{
+		memcpy(so->orderProcs, keepOrderProcs, sizeof(FmgrInfo) * nkept);
+		memcpy(so->orderProcs + nkept, unmarkOrderProcs,
+			   sizeof(FmgrInfo) * nunmarked);
+
+		/* Also fix-up array->scan_key references */
+		for (int arridx = 0; arridx < so->numArrayKeys; arridx++)
+		{
+			BTArrayKeyInfo *array = &so->arrayKeys[arridx];
+
+			array->scan_key = keyDataMap[array->scan_key];
+		}
+
+		/*
+		 * Sort so->arrayKeys[] based on its new BTArrayKeyInfo.scan_key
+		 * offsets, so that its order matches so->keyData[] order as expected
+		 */
+		qsort(so->arrayKeys, so->numArrayKeys, sizeof(BTArrayKeyInfo),
+			  _bt_reorder_array_cmp);
+
+		/* Done with temp arrays */
+		pfree(unmarkOrderProcs);
+		pfree(keepOrderProcs);
+	}
+}
+
+/*
+ * qsort comparator for reordering so->arrayKeys[] BTArrayKeyInfo entries
+ */
+static int
+_bt_reorder_array_cmp(const void *a, const void *b)
+{
+	BTArrayKeyInfo *arraya = (BTArrayKeyInfo *) a;
+	BTArrayKeyInfo *arrayb = (BTArrayKeyInfo *) b;
+
+	return pg_cmp_s32(arraya->scan_key, arrayb->scan_key);
+}
+
 /*
  *	_bt_preprocess_array_keys() -- Preprocess SK_SEARCHARRAY scan keys
  *
@@ -1532,6 +1861,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan, int *new_numberOfKeys)
 	 * (also checks if we should add extra skip arrays based on input keys)
 	 */
 	numArrayKeys = _bt_num_array_keys(scan, skip_eq_ops, &numSkipArrayKeys);
+	so->skipScan = (numSkipArrayKeys > 0);
 
 	/* Quit if nothing to do. */
 	if (numArrayKeys == 0)
@@ -1561,7 +1891,6 @@ _bt_preprocess_array_keys(IndexScanDesc scan, int *new_numberOfKeys)
 	arrayKeyData = (ScanKey) palloc(numArrayKeyData * sizeof(ScanKeyData));
 
 	/* Allocate space for per-array data in the workspace context */
-	so->skipScan = (numSkipArrayKeys > 0);
 	so->arrayKeys = (BTArrayKeyInfo *) palloc(numArrayKeys * sizeof(BTArrayKeyInfo));
 
 	/* Allocate space for ORDER procs used to help _bt_checkkeys */
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index fdff960c130..74677cc04ff 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -619,8 +619,11 @@ btestimateparallelscan(Relation rel, int nkeys, int norderbys)
 		 * also require a skip array.
 		 *
 		 * Every skip array must have space to store its scan key's sk_flags.
+		 * We also need space for each skip array's unused btps_arrElems slot
+		 * (we need to be able to subscript btps_arrElems using a simple
+		 * so->arrayKeys[]-wise offset for any subsequent SAOP arrays).
 		 */
-		estnbtreeshared = add_size(estnbtreeshared, sizeof(int));
+		estnbtreeshared = add_size(estnbtreeshared, sizeof(int) * 2);
 
 		/* Consider space required to store a datum of opclass input type */
 		attr = TupleDescCompactAttr(rel->rd_att, attnum - 1);
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 36544ecfd58..47b6552d67c 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -960,46 +960,51 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 
 	/*----------
 	 * Examine the scan keys to discover where we need to start the scan.
+	 * The selected scan keys (at most one per index column) are remembered by
+	 * storing their addresses into the local startKeys[] array.  The final
+	 * startKeys[] entry's strategy is set in strat_total. (Actually, there
+	 * are a couple of cases where we force a less/more restrictive strategy.)
 	 *
-	 * We want to identify the keys that can be used as starting boundaries;
-	 * these are =, >, or >= keys for a forward scan or =, <, <= keys for
-	 * a backwards scan.  We can use keys for multiple attributes so long as
-	 * the prior attributes had only =, >= (resp. =, <=) keys.  Once we accept
-	 * a > or < boundary or find an attribute with no boundary (which can be
-	 * thought of as the same as "> -infinity"), we can't use keys for any
-	 * attributes to its right, because it would break our simplistic notion
-	 * of what initial positioning strategy to use.
+	 * We must use the key that was marked required (in the direction opposite
+	 * our own scan's) during preprocessing.  Each index attribute can only
+	 * have one such required key.  In general, the keys that we use to find
+	 * an initial position when scanning forwards are the same keys that end
+	 * the scan on the leaf level when scanning backwards (and vice-versa).
 	 *
 	 * When the scan keys include cross-type operators, _bt_preprocess_keys
-	 * may not be able to eliminate redundant keys; in such cases we will
-	 * arbitrarily pick a usable one for each attribute.  This is correct
-	 * but possibly not optimal behavior.  (For example, with keys like
-	 * "x >= 4 AND x >= 5" we would elect to scan starting at x=4 when
-	 * x=5 would be more efficient.)  Since the situation only arises given
-	 * a poorly-worded query plus an incomplete opfamily, live with it.
+	 * may not be able to eliminate redundant keys; in such cases it will
+	 * arbitrarily pick a usable key for each attribute (and scan direction),
+	 * ensuring that there is no more than one key required in each direction.
+	 * We stop considering further keys once we reach the first nonrequired
+	 * key (which must come after all required keys), so this can't affect us.
+	 *
+	 * The required keys that we use as starting boundaries have to be =, >,
+	 * or >= keys for a forward scan or =, <, <= keys for a backwards scan.
+	 * We can use keys for multiple attributes so long as the prior attributes
+	 * had only =, >= (resp. =, <=) keys.  These rules are very similar to the
+	 * rules that preprocessing used to determine which keys to mark required.
+	 * We cannot always use every required key as a positioning key, though.
+	 * Skip arrays necessitate independently applying our own rules here.
+	 * Skip arrays are always generally considered = array keys, but we'll
+	 * nevertheless treat them as inequalities at certain points of the scan.
+	 * When that happens, it _might_ have implications for the number of
+	 * required keys that we can safely use for initial positioning purposes.
 	 *
-	 * When both equality and inequality keys appear for a single attribute
-	 * (again, only possible when cross-type operators appear), we *must*
-	 * select one of the equality keys for the starting point, because
-	 * _bt_checkkeys() will stop the scan as soon as an equality qual fails.
-	 * For example, if we have keys like "x >= 4 AND x = 10" and we elect to
-	 * start at x=4, we will fail and stop before reaching x=10.  If multiple
-	 * equality quals survive preprocessing, however, it doesn't matter which
-	 * one we use --- by definition, they are either redundant or
-	 * contradictory.
+	 * For example, a forward scan with a skip array on its leading attribute
+	 * (with no low_compare/high_compare) will have at least two required scan
+	 * keys, but we won't use any of them as boundary keys during the scan's
+	 * initial call here.  Our positioning key during the first call here can
+	 * be thought of as representing "> -infinity".  Similarly, if such a skip
+	 * array's low_compare is "a > 'foo'", then we position using "a > 'foo'"
+	 * during the scan's initial call here; a lower-order key such as "b = 42"
+	 * can't be used until the "a" array advances beyond MINVAL/low_compare.
 	 *
-	 * In practice we rarely see any "attribute boundary key gaps" here.
-	 * Preprocessing can usually backfill skip array keys for any attributes
-	 * that were omitted from the original scan->keyData[] input keys.  All
-	 * array keys are always considered = keys, but we'll sometimes need to
-	 * treat the current key value as if we were using an inequality strategy.
-	 * This happens with range skip arrays, which store inequality keys in the
-	 * array's low_compare/high_compare fields (used to find the first/last
-	 * set of matches, when = key will lack a usable sk_argument value).
-	 * These are always preferred over any redundant "standard" inequality
-	 * keys on the same column (per the usual rule about preferring = keys).
-	 * Note also that any column with an = skip array key can never have an
-	 * additional, contradictory = key.
+	 * On the other hand, if such a skip array's low_compare was "a >= 'foo'",
+	 * then we _can_ use "a >= 'foo' AND b = 42" during the initial call here.
+	 * A subsequent call here might have us use "a = 'fop' AND b = 42".  Note
+	 * that we treat = and >= as equivalent when scanning forwards (just as we
+	 * treat = and <= as equivalent when scanning backwards).  We effectively
+	 * do the same thing (though with a distinct "a" element/value) each time.
 	 *
 	 * All keys (with the exception of SK_SEARCHNULL keys and SK_BT_SKIP
 	 * array keys whose array is "null_elem=true") imply a NOT NULL qualifier.
@@ -1011,21 +1016,20 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	 * traversing a lot of null entries at the start of the scan.
 	 *
 	 * In this loop, row-comparison keys are treated the same as keys on their
-	 * first (leftmost) columns.  We'll add on lower-order columns of the row
-	 * comparison below, if possible.
+	 * first (leftmost) columns.  We'll add all lower-order columns of the row
+	 * comparison that were marked required during preprocessing below.
 	 *
-	 * The selected scan keys (at most one per index column) are remembered by
-	 * storing their addresses into the local startKeys[] array.
-	 *
-	 * _bt_checkkeys/_bt_advance_array_keys decide whether and when to start
-	 * the next primitive index scan (for scans with array keys) based in part
-	 * on an understanding of how it'll enable us to reposition the scan.
-	 * They're directly aware of how we'll sometimes cons up an explicit
-	 * SK_SEARCHNOTNULL key.  They'll even end primitive scans by applying a
-	 * symmetric "deduce NOT NULL" rule of their own.  This allows top-level
-	 * scans to skip large groups of NULLs through repeated deductions about
-	 * key strictness (for a required inequality key) and whether NULLs in the
-	 * key's index column are stored last or first (relative to non-NULLs).
+	 * _bt_advance_array_keys needs to know exactly how we'll reposition the
+	 * scan (should it opt to schedule another primitive index scan).  It is
+	 * critical that primscans only be scheduled when they'll definitely make
+	 * some useful progress.  _bt_advance_array_keys does this by calling
+	 * _bt_checkkeys routines that report whether a tuple is past the end of
+	 * matches for the scan's keys (given the scan's current array elements).
+	 * If the page's final tuple is "after the end of matches" for a scan that
+	 * uses the *opposite* scan direction, then it must follow that it's also
+	 * "before the start of matches" for the actual current scan direction.
+	 * It is therefore essential that all of our initial positioning rules are
+	 * symmetric with _bt_checkkeys's corresponding continuescan=false rule.
 	 * If you update anything here, _bt_checkkeys/_bt_advance_array_keys might
 	 * need to be kept in sync.
 	 *----------
@@ -1034,18 +1038,17 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	if (so->numberOfKeys > 0)
 	{
 		AttrNumber	curattr;
-		ScanKey		chosen;
+		ScanKey		bkey;
 		ScanKey		impliesNN;
 		ScanKey		cur;
 
 		/*
-		 * chosen is the so-far-chosen key for the current attribute, if any.
-		 * We don't cast the decision in stone until we reach keys for the
-		 * next attribute.
+		 * bkey will be set to the key that preprocessing left behind as the
+		 * boundary key for this attribute, in this scan direction (if any)
 		 */
 		cur = so->keyData;
 		curattr = 1;
-		chosen = NULL;
+		bkey = NULL;
 		/* Also remember any scankey that implies a NOT NULL constraint */
 		impliesNN = NULL;
 
@@ -1058,23 +1061,29 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 		{
 			if (i >= so->numberOfKeys || cur->sk_attno != curattr)
 			{
+				/* Done looking for the curattr boundary key */
+				Assert(bkey == NULL ||
+					   (bkey->sk_attno == curattr &&
+						(bkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD))));
+				Assert(impliesNN == NULL ||
+					   (impliesNN->sk_attno == curattr &&
+						(impliesNN->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD))));
+
 				/*
-				 * Done looking at keys for curattr.
-				 *
 				 * If this is a scan key for a skip array whose current
 				 * element is MINVAL, choose low_compare (when scanning
 				 * backwards it'll be MAXVAL, and we'll choose high_compare).
 				 *
-				 * Note: if the array's low_compare key makes 'chosen' NULL,
+				 * Note: if the array's low_compare key makes 'bkey' NULL,
 				 * then we behave as if the array's first element is -inf,
 				 * except when !array->null_elem implies a usable NOT NULL
 				 * constraint.
 				 */
-				if (chosen != NULL &&
-					(chosen->sk_flags & (SK_BT_MINVAL | SK_BT_MAXVAL)))
+				if (bkey != NULL &&
+					(bkey->sk_flags & (SK_BT_MINVAL | SK_BT_MAXVAL)))
 				{
-					int			ikey = chosen - so->keyData;
-					ScanKey		skipequalitykey = chosen;
+					int			ikey = bkey - so->keyData;
+					ScanKey		skipequalitykey = bkey;
 					BTArrayKeyInfo *array = NULL;
 
 					for (int arridx = 0; arridx < so->numArrayKeys; arridx++)
@@ -1087,35 +1096,35 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 					if (ScanDirectionIsForward(dir))
 					{
 						Assert(!(skipequalitykey->sk_flags & SK_BT_MAXVAL));
-						chosen = array->low_compare;
+						bkey = array->low_compare;
 					}
 					else
 					{
 						Assert(!(skipequalitykey->sk_flags & SK_BT_MINVAL));
-						chosen = array->high_compare;
+						bkey = array->high_compare;
 					}
 
-					Assert(chosen == NULL ||
-						   chosen->sk_attno == skipequalitykey->sk_attno);
+					Assert(bkey == NULL ||
+						   bkey->sk_attno == skipequalitykey->sk_attno);
 
 					if (!array->null_elem)
 						impliesNN = skipequalitykey;
 					else
-						Assert(chosen == NULL && impliesNN == NULL);
+						Assert(bkey == NULL && impliesNN == NULL);
 				}
 
 				/*
 				 * If we didn't find a usable boundary key, see if we can
 				 * deduce a NOT NULL key
 				 */
-				if (chosen == NULL && impliesNN != NULL &&
+				if (bkey == NULL && impliesNN != NULL &&
 					((impliesNN->sk_flags & SK_BT_NULLS_FIRST) ?
 					 ScanDirectionIsForward(dir) :
 					 ScanDirectionIsBackward(dir)))
 				{
 					/* Yes, so build the key in notnullkeys[keysz] */
-					chosen = &notnullkeys[keysz];
-					ScanKeyEntryInitialize(chosen,
+					bkey = &notnullkeys[keysz];
+					ScanKeyEntryInitialize(bkey,
 										   (SK_SEARCHNOTNULL | SK_ISNULL |
 											(impliesNN->sk_flags &
 											 (SK_BT_DESC | SK_BT_NULLS_FIRST))),
@@ -1130,12 +1139,12 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 				}
 
 				/*
-				 * If we still didn't find a usable boundary key, quit; else
-				 * save the boundary key pointer in startKeys.
+				 * If preprocessing didn't leave a usable boundary key, quit;
+				 * else save the boundary key pointer in startKeys[]
 				 */
-				if (chosen == NULL)
+				if (bkey == NULL)
 					break;
-				startKeys[keysz++] = chosen;
+				startKeys[keysz++] = bkey;
 
 				/*
 				 * We can only consider adding more boundary keys when the one
@@ -1143,7 +1152,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 				 * (during backwards scans we can only do so when the key that
 				 * we just added to startKeys[] uses the = or <= strategy)
 				 */
-				strat_total = chosen->sk_strategy;
+				strat_total = bkey->sk_strategy;
 				if (strat_total == BTGreaterStrategyNumber ||
 					strat_total == BTLessStrategyNumber)
 					break;
@@ -1154,19 +1163,19 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 				 * make strat_total > or < (and stop adding boundary keys).
 				 * This can only happen with opclasses that lack skip support.
 				 */
-				if (chosen->sk_flags & (SK_BT_NEXT | SK_BT_PRIOR))
+				if (bkey->sk_flags & (SK_BT_NEXT | SK_BT_PRIOR))
 				{
-					Assert(chosen->sk_flags & SK_BT_SKIP);
+					Assert(bkey->sk_flags & SK_BT_SKIP);
 					Assert(strat_total == BTEqualStrategyNumber);
 
 					if (ScanDirectionIsForward(dir))
 					{
-						Assert(!(chosen->sk_flags & SK_BT_PRIOR));
+						Assert(!(bkey->sk_flags & SK_BT_PRIOR));
 						strat_total = BTGreaterStrategyNumber;
 					}
 					else
 					{
-						Assert(!(chosen->sk_flags & SK_BT_NEXT));
+						Assert(!(bkey->sk_flags & SK_BT_NEXT));
 						strat_total = BTLessStrategyNumber;
 					}
 
@@ -1180,24 +1189,30 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 
 				/*
 				 * Done if that was the last scan key output by preprocessing.
-				 * Also done if there is a gap index attribute that lacks a
-				 * usable key (only possible when preprocessing was unable to
-				 * generate a skip array key to "fill in the gap").
+				 * Also done if we've now examined all keys marked required.
 				 */
 				if (i >= so->numberOfKeys ||
-					cur->sk_attno != curattr + 1)
+					!(cur->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)))
 					break;
 
 				/*
 				 * Reset for next attr.
 				 */
+				Assert(cur->sk_attno == curattr + 1);
 				curattr = cur->sk_attno;
-				chosen = NULL;
+				bkey = NULL;
 				impliesNN = NULL;
 			}
 
 			/*
-			 * Can we use this key as a starting boundary for this attr?
+			 * If we've located the starting boundary key for curattr, we have
+			 * no interest in curattr's other required key
+			 */
+			if (bkey != NULL)
+				continue;
+
+			/*
+			 * Is this key the starting boundary key for curattr?
 			 *
 			 * If not, does it imply a NOT NULL constraint?  (Because
 			 * SK_SEARCHNULL keys are always assigned BTEqualStrategyNumber,
@@ -1207,27 +1222,20 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			{
 				case BTLessStrategyNumber:
 				case BTLessEqualStrategyNumber:
-					if (chosen == NULL)
-					{
-						if (ScanDirectionIsBackward(dir))
-							chosen = cur;
-						else
-							impliesNN = cur;
-					}
+					if (ScanDirectionIsBackward(dir))
+						bkey = cur;
+					else if (impliesNN == NULL)
+						impliesNN = cur;
 					break;
 				case BTEqualStrategyNumber:
-					/* override any non-equality choice */
-					chosen = cur;
+					bkey = cur;
 					break;
 				case BTGreaterEqualStrategyNumber:
 				case BTGreaterStrategyNumber:
-					if (chosen == NULL)
-					{
-						if (ScanDirectionIsForward(dir))
-							chosen = cur;
-						else
-							impliesNN = cur;
-					}
+					if (ScanDirectionIsForward(dir))
+						bkey = cur;
+					else if (impliesNN == NULL)
+						impliesNN = cur;
 					break;
 			}
 		}
@@ -1253,16 +1261,18 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	Assert(keysz <= INDEX_MAX_KEYS);
 	for (int i = 0; i < keysz; i++)
 	{
-		ScanKey		cur = startKeys[i];
+		ScanKey		bkey = startKeys[i];
 
-		Assert(cur->sk_attno == i + 1);
+		Assert(bkey->sk_attno == i + 1);
 
-		if (cur->sk_flags & SK_ROW_HEADER)
+		if (bkey->sk_flags & SK_ROW_HEADER)
 		{
 			/*
 			 * Row comparison header: look to the first row member instead
 			 */
-			ScanKey		subkey = (ScanKey) DatumGetPointer(cur->sk_argument);
+			ScanKey		subkey = (ScanKey) DatumGetPointer(bkey->sk_argument);
+			bool		loosen_strat = false,
+						tighten_strat = false;
 
 			/*
 			 * Cannot be a NULL in the first row member: _bt_preprocess_keys
@@ -1270,9 +1280,20 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			 * ever getting this far
 			 */
 			Assert(subkey->sk_flags & SK_ROW_MEMBER);
-			Assert(subkey->sk_attno == cur->sk_attno);
+			Assert(subkey->sk_attno == bkey->sk_attno);
 			Assert(!(subkey->sk_flags & SK_ISNULL));
 
+			/*
+			 * This is either a > or >= key (during backwards scans it is
+			 * either < or <=) that was marked required during preprocessing.
+			 * Later so->keyData[] keys can't have been marked required, so
+			 * our row compare header key must be the final startKeys[] entry.
+			 */
+			Assert(subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD));
+			Assert(subkey->sk_strategy == bkey->sk_strategy);
+			Assert(subkey->sk_strategy == strat_total);
+			Assert(i == keysz - 1);
+
 			/*
 			 * The member scankeys are already in insertion format (ie, they
 			 * have sk_func = 3-way-comparison function)
@@ -1280,112 +1301,141 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			memcpy(inskey.scankeys + i, subkey, sizeof(ScanKeyData));
 
 			/*
-			 * If the row comparison is the last positioning key we accepted,
-			 * try to add additional keys from the lower-order row members.
-			 * (If we accepted independent conditions on additional index
-			 * columns, we use those instead --- doesn't seem worth trying to
-			 * determine which is more restrictive.)  Note that this is OK
-			 * even if the row comparison is of ">" or "<" type, because the
-			 * condition applied to all but the last row member is effectively
-			 * ">=" or "<=", and so the extra keys don't break the positioning
-			 * scheme.  But, by the same token, if we aren't able to use all
-			 * the row members, then the part of the row comparison that we
-			 * did use has to be treated as just a ">=" or "<=" condition, and
-			 * so we'd better adjust strat_total accordingly.
+			 * Now look to later row compare members.
+			 *
+			 * If there's an "index attribute gap" between two row compare
+			 * members, the second member won't have been marked required, and
+			 * so can't be used as a starting boundary key here.  The part of
+			 * the row comparison that we do still use has to be treated as a
+			 * ">=" or "<=" condition.  For example, a qual "(a, c) > (1, 42)"
+			 * with an omitted intervening index attribute "b" will use an
+			 * insertion scan key "a >= 1".  Even the first "a = 1" tuple on
+			 * the leaf level might satisfy the row compare qual.
+			 *
+			 * We're able to use a _more_ restrictive strategy when we reach a
+			 * NULL row compare member, since they're always unsatisfiable.
+			 * For example, a qual "(a, b, c) >= (1, NULL, 77)" will use an
+			 * insertion scan key "a > 1".  All tuples where "a = 1" cannot
+			 * possibly satisfy the row compare qual, so this is safe.
 			 */
-			if (i == keysz - 1)
+			Assert(!(subkey->sk_flags & SK_ROW_END));
+			for (;;)
 			{
-				bool		used_all_subkeys = false;
+				subkey++;
+				Assert(subkey->sk_flags & SK_ROW_MEMBER);
 
-				Assert(!(subkey->sk_flags & SK_ROW_END));
-				for (;;)
+				if (subkey->sk_flags & SK_ISNULL)
 				{
-					subkey++;
-					Assert(subkey->sk_flags & SK_ROW_MEMBER);
-					if (subkey->sk_attno != keysz + 1)
-						break;	/* out-of-sequence, can't use it */
-					if (subkey->sk_strategy != cur->sk_strategy)
-						break;	/* wrong direction, can't use it */
-					if (subkey->sk_flags & SK_ISNULL)
-						break;	/* can't use null keys */
-					Assert(keysz < INDEX_MAX_KEYS);
-					memcpy(inskey.scankeys + keysz, subkey,
-						   sizeof(ScanKeyData));
-					keysz++;
-					if (subkey->sk_flags & SK_ROW_END)
-					{
-						used_all_subkeys = true;
-						break;
-					}
+					/*
+					 * NULL member key, can only use earlier keys.
+					 *
+					 * We deliberately avoid checking if this key is marked
+					 * required.  All earlier keys are required, and this key
+					 * is unsatisfiable either way, so we can't miss anything.
+					 */
+					tighten_strat = true;
+					break;
 				}
-				if (!used_all_subkeys)
+
+				if (!(subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)))
 				{
-					switch (strat_total)
-					{
-						case BTLessStrategyNumber:
-							strat_total = BTLessEqualStrategyNumber;
-							break;
-						case BTGreaterStrategyNumber:
-							strat_total = BTGreaterEqualStrategyNumber;
-							break;
-					}
+					/* nonrequired member key, can only use earlier keys */
+					loosen_strat = true;
+					break;
 				}
-				break;			/* done with outer loop */
+
+				Assert(subkey->sk_attno == keysz + 1);
+				Assert(subkey->sk_strategy == bkey->sk_strategy);
+				Assert(keysz < INDEX_MAX_KEYS);
+
+				memcpy(inskey.scankeys + keysz, subkey, sizeof(ScanKeyData));
+				keysz++;
+
+				if (subkey->sk_flags & SK_ROW_END)
+					break;
 			}
-		}
-		else
-		{
-			/*
-			 * Ordinary comparison key.  Transform the search-style scan key
-			 * to an insertion scan key by replacing the sk_func with the
-			 * appropriate btree comparison function.
-			 *
-			 * If scankey operator is not a cross-type comparison, we can use
-			 * the cached comparison function; otherwise gotta look it up in
-			 * the catalogs.  (That can't lead to infinite recursion, since no
-			 * indexscan initiated by syscache lookup will use cross-data-type
-			 * operators.)
-			 *
-			 * We support the convention that sk_subtype == InvalidOid means
-			 * the opclass input type; this is a hack to simplify life for
-			 * ScanKeyInit().
-			 */
-			if (cur->sk_subtype == rel->rd_opcintype[i] ||
-				cur->sk_subtype == InvalidOid)
+			Assert(!(loosen_strat && tighten_strat));
+			if (loosen_strat)
 			{
-				FmgrInfo   *procinfo;
-
-				procinfo = index_getprocinfo(rel, cur->sk_attno, BTORDER_PROC);
-				ScanKeyEntryInitializeWithInfo(inskey.scankeys + i,
-											   cur->sk_flags,
-											   cur->sk_attno,
-											   InvalidStrategy,
-											   cur->sk_subtype,
-											   cur->sk_collation,
-											   procinfo,
-											   cur->sk_argument);
+				/* Use less restrictive strategy (and fewer member keys) */
+				switch (strat_total)
+				{
+					case BTLessStrategyNumber:
+						strat_total = BTLessEqualStrategyNumber;
+						break;
+					case BTGreaterStrategyNumber:
+						strat_total = BTGreaterEqualStrategyNumber;
+						break;
+				}
 			}
-			else
+			if (tighten_strat)
 			{
-				RegProcedure cmp_proc;
-
-				cmp_proc = get_opfamily_proc(rel->rd_opfamily[i],
-											 rel->rd_opcintype[i],
-											 cur->sk_subtype,
-											 BTORDER_PROC);
-				if (!RegProcedureIsValid(cmp_proc))
-					elog(ERROR, "missing support function %d(%u,%u) for attribute %d of index \"%s\"",
-						 BTORDER_PROC, rel->rd_opcintype[i], cur->sk_subtype,
-						 cur->sk_attno, RelationGetRelationName(rel));
-				ScanKeyEntryInitialize(inskey.scankeys + i,
-									   cur->sk_flags,
-									   cur->sk_attno,
-									   InvalidStrategy,
-									   cur->sk_subtype,
-									   cur->sk_collation,
-									   cmp_proc,
-									   cur->sk_argument);
+				/* Use more restrictive strategy (and fewer member keys) */
+				switch (strat_total)
+				{
+					case BTLessEqualStrategyNumber:
+						strat_total = BTLessStrategyNumber;
+						break;
+					case BTGreaterEqualStrategyNumber:
+						strat_total = BTGreaterStrategyNumber;
+						break;
+				}
 			}
+
+			/* Done (row compare header key is always last startKeys[] key) */
+			break;
+		}
+
+		/*
+		 * Ordinary comparison key/search-style key.
+		 *
+		 * Transform the search-style scan key to an insertion scan key by
+		 * replacing the sk_func with the appropriate btree 3-way-comparison
+		 * function.
+		 *
+		 * If scankey operator is not a cross-type comparison, we can use the
+		 * cached comparison function; otherwise gotta look it up in the
+		 * catalogs.  (That can't lead to infinite recursion, since no
+		 * indexscan initiated by syscache lookup will use cross-data-type
+		 * operators.)
+		 *
+		 * We support the convention that sk_subtype == InvalidOid means the
+		 * opclass input type; this hack simplifies life for ScanKeyInit().
+		 */
+		if (bkey->sk_subtype == rel->rd_opcintype[i] ||
+			bkey->sk_subtype == InvalidOid)
+		{
+			FmgrInfo   *procinfo;
+
+			procinfo = index_getprocinfo(rel, bkey->sk_attno, BTORDER_PROC);
+			ScanKeyEntryInitializeWithInfo(inskey.scankeys + i,
+										   bkey->sk_flags,
+										   bkey->sk_attno,
+										   InvalidStrategy,
+										   bkey->sk_subtype,
+										   bkey->sk_collation,
+										   procinfo,
+										   bkey->sk_argument);
+		}
+		else
+		{
+			RegProcedure cmp_proc;
+
+			cmp_proc = get_opfamily_proc(rel->rd_opfamily[i],
+										 rel->rd_opcintype[i],
+										 bkey->sk_subtype, BTORDER_PROC);
+			if (!RegProcedureIsValid(cmp_proc))
+				elog(ERROR, "missing support function %d(%u,%u) for attribute %d of index \"%s\"",
+					 BTORDER_PROC, rel->rd_opcintype[i], bkey->sk_subtype,
+					 bkey->sk_attno, RelationGetRelationName(rel));
+			ScanKeyEntryInitialize(inskey.scankeys + i,
+								   bkey->sk_flags,
+								   bkey->sk_attno,
+								   InvalidStrategy,
+								   bkey->sk_subtype,
+								   bkey->sk_collation,
+								   cmp_proc,
+								   bkey->sk_argument);
 		}
 	}
 
@@ -1474,6 +1524,8 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 
 	if (!BufferIsValid(so->currPos.buf))
 	{
+		Assert(!so->needPrimScan);
+
 		/*
 		 * We only get here if the index is completely empty. Lock relation
 		 * because nothing finer to lock exists.  Without a buffer lock, it's
@@ -1492,7 +1544,6 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 
 		if (!BufferIsValid(so->currPos.buf))
 		{
-			Assert(!so->needPrimScan);
 			_bt_parallel_done(scan);
 			return false;
 		}
@@ -2199,12 +2250,9 @@ _bt_steppage(IndexScanDesc scan, ScanDirection dir)
  *
  * _bt_first caller passes us an offnum returned by _bt_binsrch, which might
  * be an out of bounds offnum such as "maxoff + 1" in certain corner cases.
- * _bt_checkkeys will stop the scan as soon as an equality qual fails (when
- * its scan key was marked required), so _bt_first _must_ pass us an offnum
- * exactly at the beginning of where equal tuples are to be found.  When we're
- * passed an offnum past the end of the page, we might still manage to stop
- * the scan on this page by calling _bt_checkkeys against the high key.  See
- * _bt_readpage for full details.
+ * When we're passed an offnum past the end of the page, we might still manage
+ * to stop the scan on this page by calling _bt_checkkeys against the high
+ * key.  See _bt_readpage for full details.
  *
  * On entry, so->currPos must be pinned and locked (so offnum stays valid).
  * Parallel scan callers must have seized the scan before calling here.
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index c71d1b6f2e1..7e166de93ea 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -44,7 +44,6 @@ static bool _bt_array_decrement(Relation rel, ScanKey skey, BTArrayKeyInfo *arra
 static bool _bt_array_increment(Relation rel, ScanKey skey, BTArrayKeyInfo *array);
 static bool _bt_advance_array_keys_increment(IndexScanDesc scan, ScanDirection dir,
 											 bool *skip_array_set);
-static void _bt_rewind_nonrequired_arrays(IndexScanDesc scan, ScanDirection dir);
 static bool _bt_tuple_before_array_skeys(IndexScanDesc scan, ScanDirection dir,
 										 IndexTuple tuple, TupleDesc tupdesc, int tupnatts,
 										 bool readpagetup, int sktrig, bool *scanBehind);
@@ -52,7 +51,6 @@ static bool _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 								   IndexTuple tuple, int tupnatts, TupleDesc tupdesc,
 								   int sktrig, bool sktrig_required);
 #ifdef USE_ASSERT_CHECKING
-static bool _bt_verify_arrays_bt_first(IndexScanDesc scan, ScanDirection dir);
 static bool _bt_verify_keys_with_arraykeys(IndexScanDesc scan);
 #endif
 static bool _bt_oppodir_checkkeys(IndexScanDesc scan, ScanDirection dir,
@@ -61,7 +59,7 @@ static bool _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
 							  IndexTuple tuple, int tupnatts, TupleDesc tupdesc,
 							  bool advancenonrequired, bool forcenonrequired,
 							  bool *continuescan, int *ikey);
-static bool _bt_check_rowcompare(ScanKey skey,
+static bool _bt_check_rowcompare(ScanKey header,
 								 IndexTuple tuple, int tupnatts, TupleDesc tupdesc,
 								 ScanDirection dir, bool forcenonrequired, bool *continuescan);
 static void _bt_checkkeys_look_ahead(IndexScanDesc scan, BTReadPageState *pstate,
@@ -1034,73 +1032,6 @@ _bt_advance_array_keys_increment(IndexScanDesc scan, ScanDirection dir,
 	return false;
 }
 
-/*
- * _bt_rewind_nonrequired_arrays() -- Rewind SAOP arrays not marked required
- *
- * Called when _bt_advance_array_keys decides to start a new primitive index
- * scan on the basis of the current scan position being before the position
- * that _bt_first is capable of repositioning the scan to by applying an
- * inequality operator required in the opposite-to-scan direction only.
- *
- * Although equality strategy scan keys (for both arrays and non-arrays alike)
- * are either marked required in both directions or in neither direction,
- * there is a sense in which non-required arrays behave like required arrays.
- * With a qual such as "WHERE a IN (100, 200) AND b >= 3 AND c IN (5, 6, 7)",
- * the scan key on "c" is non-required, but nevertheless enables positioning
- * the scan at the first tuple >= "(100, 3, 5)" on the leaf level during the
- * first descent of the tree by _bt_first.  Later on, there could also be a
- * second descent, that places the scan right before tuples >= "(200, 3, 5)".
- * _bt_first must never be allowed to build an insertion scan key whose "c"
- * entry is set to a value other than 5, the "c" array's first element/value.
- * (Actually, it's the first in the current scan direction.  This example uses
- * a forward scan.)
- *
- * Calling here resets the array scan key elements for the scan's non-required
- * arrays.  This is strictly necessary for correctness in a subset of cases
- * involving "required in opposite direction"-triggered primitive index scans.
- * Not all callers are at risk of _bt_first using a non-required array like
- * this, but advancement always resets the arrays when another primitive scan
- * is scheduled, just to keep things simple.  Array advancement even makes
- * sure to reset non-required arrays during scans that have no inequalities.
- * (Advancement still won't call here when there are no inequalities, though
- * that's just because it's all handled indirectly instead.)
- *
- * Note: _bt_verify_arrays_bt_first is called by an assertion to enforce that
- * everybody got this right.
- *
- * Note: In practice almost all SAOP arrays are marked required during
- * preprocessing (if necessary by generating skip arrays).  It is hardly ever
- * truly necessary to call here, but consistently doing so is simpler.
- */
-static void
-_bt_rewind_nonrequired_arrays(IndexScanDesc scan, ScanDirection dir)
-{
-	Relation	rel = scan->indexRelation;
-	BTScanOpaque so = (BTScanOpaque) scan->opaque;
-	int			arrayidx = 0;
-
-	for (int ikey = 0; ikey < so->numberOfKeys; ikey++)
-	{
-		ScanKey		cur = so->keyData + ikey;
-		BTArrayKeyInfo *array = NULL;
-
-		if (!(cur->sk_flags & SK_SEARCHARRAY) ||
-			cur->sk_strategy != BTEqualStrategyNumber)
-			continue;
-
-		array = &so->arrayKeys[arrayidx++];
-		Assert(array->scan_key == ikey);
-
-		if ((cur->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)))
-			continue;
-
-		Assert(array->num_elems != -1); /* No non-required skip arrays */
-
-		_bt_array_set_low_or_high(rel, cur, array,
-								  ScanDirectionIsForward(dir));
-	}
-}
-
 /*
  * _bt_tuple_before_array_skeys() -- too early to advance required arrays?
  *
@@ -1380,8 +1311,6 @@ _bt_start_prim_scan(IndexScanDesc scan, ScanDirection dir)
 	 */
 	if (so->needPrimScan)
 	{
-		Assert(_bt_verify_arrays_bt_first(scan, dir));
-
 		/*
 		 * Flag was set -- must call _bt_first again, which will reset the
 		 * scan's needPrimScan flag
@@ -1516,7 +1445,6 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 		BTArrayKeyInfo *array = NULL;
 		Datum		tupdatum;
 		bool		required = false,
-					required_opposite_direction_only = false,
 					tupnull;
 		int32		result;
 		int			set_elem = 0;
@@ -1540,8 +1468,7 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 				  (cur->sk_flags & (SK_BT_REQBKWD))) ||
 				 (ScanDirectionIsBackward(dir) &&
 				  (cur->sk_flags & (SK_BT_REQFWD)))))
-				has_required_opposite_direction_only =
-					required_opposite_direction_only = true;
+				has_required_opposite_direction_only = true;
 		}
 
 		/* Optimization: skip over known-satisfied scan keys */
@@ -2007,14 +1934,7 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 	 */
 	else if (has_required_opposite_direction_only && pstate->finaltup &&
 			 unlikely(!_bt_oppodir_checkkeys(scan, dir, pstate->finaltup)))
-	{
-		/*
-		 * Make sure that any SAOP arrays that were not marked required by
-		 * preprocessing are reset to their first element for this direction
-		 */
-		_bt_rewind_nonrequired_arrays(scan, dir);
 		goto new_prim_scan;
-	}
 
 continue_scan:
 
@@ -2045,8 +1965,6 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 		 */
 		so->oppositeDirCheck = has_required_opposite_direction_only;
 
-		_bt_rewind_nonrequired_arrays(scan, dir);
-
 		/*
 		 * skip by setting "look ahead" mechanism's offnum for forwards scans
 		 * (backwards scans check scanBehind flag directly instead)
@@ -2142,48 +2060,6 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
 }
 
 #ifdef USE_ASSERT_CHECKING
-/*
- * Verify that the scan's qual state matches what we expect at the point that
- * _bt_start_prim_scan is about to start a just-scheduled new primitive scan.
- *
- * We enforce a rule against non-required array scan keys: they must start out
- * with whatever element is the first for the scan's current scan direction.
- * See _bt_rewind_nonrequired_arrays comments for an explanation.
- */
-static bool
-_bt_verify_arrays_bt_first(IndexScanDesc scan, ScanDirection dir)
-{
-	BTScanOpaque so = (BTScanOpaque) scan->opaque;
-	int			arrayidx = 0;
-
-	for (int ikey = 0; ikey < so->numberOfKeys; ikey++)
-	{
-		ScanKey		cur = so->keyData + ikey;
-		BTArrayKeyInfo *array = NULL;
-		int			first_elem_dir;
-
-		if (!(cur->sk_flags & SK_SEARCHARRAY) ||
-			cur->sk_strategy != BTEqualStrategyNumber)
-			continue;
-
-		array = &so->arrayKeys[arrayidx++];
-
-		if (((cur->sk_flags & SK_BT_REQFWD) && ScanDirectionIsForward(dir)) ||
-			((cur->sk_flags & SK_BT_REQBKWD) && ScanDirectionIsBackward(dir)))
-			continue;
-
-		if (ScanDirectionIsForward(dir))
-			first_elem_dir = 0;
-		else
-			first_elem_dir = array->num_elems - 1;
-
-		if (array->cur_elem != first_elem_dir)
-			return false;
-	}
-
-	return _bt_verify_keys_with_arraykeys(scan);
-}
-
 /*
  * Verify that the scan's "so->keyData[]" scan keys are in agreement with
  * its array key state
@@ -2194,6 +2070,7 @@ _bt_verify_keys_with_arraykeys(IndexScanDesc scan)
 	BTScanOpaque so = (BTScanOpaque) scan->opaque;
 	int			last_sk_attno = InvalidAttrNumber,
 				arrayidx = 0;
+	bool		nonrequiredseen = false;
 
 	if (!so->qual_ok)
 		return false;
@@ -2217,8 +2094,16 @@ _bt_verify_keys_with_arraykeys(IndexScanDesc scan)
 		if (array->num_elems != -1 &&
 			cur->sk_argument != array->elem_values[array->cur_elem])
 			return false;
-		if (last_sk_attno > cur->sk_attno)
-			return false;
+		if (cur->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD))
+		{
+			if (last_sk_attno > cur->sk_attno)
+				return false;
+			if (nonrequiredseen)
+				return false;
+		}
+		else
+			nonrequiredseen = true;
+
 		last_sk_attno = cur->sk_attno;
 	}
 
@@ -2551,37 +2436,12 @@ _bt_set_startikey(IndexScanDesc scan, BTReadPageState *pstate)
 		if (!(key->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)))
 		{
 			/* Scan key isn't marked required (corner case) */
-			Assert(!(key->sk_flags & SK_ROW_HEADER));
 			break;				/* unsafe */
 		}
 		if (key->sk_flags & SK_ROW_HEADER)
 		{
-			/*
-			 * RowCompare inequality.
-			 *
-			 * Only the first subkey from a RowCompare can ever be marked
-			 * required (that happens when the row header is marked required).
-			 * There is no simple, general way for us to transitively deduce
-			 * whether or not every tuple on the page satisfies a RowCompare
-			 * key based only on firsttup and lasttup -- so we just give up.
-			 */
-			if (!start_past_saop_eq && !so->skipScan)
-				break;			/* unsafe to go further */
-
-			/*
-			 * We have to be even more careful with RowCompares that come
-			 * after an array: we assume it's unsafe to even bypass the array.
-			 * Calling _bt_start_array_keys to recover the scan's arrays
-			 * following use of forcenonrequired mode isn't compatible with
-			 * _bt_check_rowcompare's continuescan=false behavior with NULL
-			 * row compare members.  _bt_advance_array_keys must not make a
-			 * decision on the basis of a key not being satisfied in the
-			 * opposite-to-scan direction until the scan reaches a leaf page
-			 * where the same key begins to be satisfied in scan direction.
-			 * The _bt_first !used_all_subkeys behavior makes this limitation
-			 * hard to work around some other way.
-			 */
-			return;				/* completely unsafe to set pstate.startikey */
+			/* RowCompare inequalities currently aren't supported */
+			break;				/* "unsafe" */
 		}
 		if (key->sk_strategy != BTEqualStrategyNumber)
 		{
@@ -3017,11 +2877,6 @@ _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
 			 * Tuple fails this qual.  If it's a required qual for the current
 			 * scan direction, then we can conclude no further tuples will
 			 * pass, either.
-			 *
-			 * Note: because we stop the scan as soon as any required equality
-			 * qual fails, it is critical that equality quals be used for the
-			 * initial positioning in _bt_first() when they are available. See
-			 * comments in _bt_first().
 			 */
 			if (requiredSameDir)
 				*continuescan = false;
@@ -3056,19 +2911,64 @@ _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
  * it's not possible for any future tuples in the current scan direction
  * to pass the qual.
  *
- * This is a subroutine for _bt_checkkeys/_bt_check_compare.
+ * This is a subroutine for _bt_checkkeys/_bt_check_compare.  Caller passes us
+ * a row compare header key taken from so->keyData[].
+ *
+ * Row value comparisons can be described in terms of logical expansions that
+ * use only scalar operators.  Consider the following example row comparison:
+ *
+ * "(a, b, c) > (7, 'bar', 62)"
+ *
+ * This can be evaluated as:
+ *
+ * "(a = 7 AND b = 'bar' AND c > 62) OR (a = 7 AND b > 'bar') OR (a > 7)".
+ *
+ * Notice that this condition is satisfied by _all_ rows that satisfy "a > 7",
+ * and by a subset of all rows that satisfy "a >= 7" (possibly all such rows).
+ * It _can't_ be satisfied by other rows (where "a < 7" or where "a IS NULL").
+ * A row comparison header key can therefore often be treated as if it was a
+ * simple scalar inequality on the row compare's most significant column.
+ * (For example, _bt_advance_array_keys and most preprocessing routines treat
+ * row compares like any other same-strategy inequality on the same column.)
+ *
+ * Things get more complicated for our row compare given a row where "a = 7".
+ * Note that a row compare isn't necessarily satisfied by _every_ tuple that
+ * appears between the first and last satisfied tuple returned by the scan,
+ * due to the way that its lower-order subkeys are only conditionally applied.
+ * A forwards scan that uses our example qual might initially return a tuple
+ * "(a, b, c) = (7, 'zebra', 54)".  But it won't subsequently return a tuple
+ * "(a, b, c) = (7, NULL, 1)" located to the right of the first matching tuple
+ * (assume that "b" was declared NULLS LAST here).  The scan will only return
+ * additional matches upon reaching tuples where "a > 7".  If you rereview our
+ * example row comparison's logical expansion, you'll understand why this is.
+ * (Here we assume that all subkeys could be marked required, guaranteeing
+ * that row comparison order matches index order.  This is the common case.)
+ *
+ * Note that a row comparison header key behaves _exactly_ the same as a
+ * similar scalar inequality key on the row's most significant column once the
+ * scan reaches the point where it no longer needs to evaluate lower-order
+ * subkeys (or before the point where it starts needing to evaluate them).
+ * For example, once a forwards scan that uses our example qual reaches the
+ * first tuple "a > 7", we'll behave in just the same way as our caller would
+ * behave with a similar scalar inequality "a > 7" for the remainder of the
+ * scan (assuming that the scan never changes direction/never goes backwards).
+ * We'll even set continuescan=false according to exactly the same rules as
+ * the ones our caller applies with simple scalar inequalities, including the
+ * rules it applies when NULL tuple values don't satisfy an inequality qual.
  */
 static bool
-_bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
+_bt_check_rowcompare(ScanKey header, IndexTuple tuple, int tupnatts,
 					 TupleDesc tupdesc, ScanDirection dir,
 					 bool forcenonrequired, bool *continuescan)
 {
-	ScanKey		subkey = (ScanKey) DatumGetPointer(skey->sk_argument);
+	ScanKey		subkey = (ScanKey) DatumGetPointer(header->sk_argument);
 	int32		cmpresult = 0;
 	bool		result;
 
 	/* First subkey should be same as the header says */
-	Assert(subkey->sk_attno == skey->sk_attno);
+	Assert(header->sk_flags & SK_ROW_HEADER);
+	Assert(subkey->sk_attno == header->sk_attno);
+	Assert(subkey->sk_strategy == header->sk_strategy);
 
 	/* Loop over columns of the row condition */
 	for (;;)
@@ -3078,6 +2978,31 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 
 		Assert(subkey->sk_flags & SK_ROW_MEMBER);
 
+		/* When a NULL row member is compared, the row never matches */
+		if (subkey->sk_flags & SK_ISNULL)
+		{
+			/*
+			 * Unlike the simple-scankey case, this isn't a disallowed case
+			 * (except when it's the first row element that has the NULL arg).
+			 * But it can never match.  If all the earlier row comparison
+			 * columns are required for the scan direction, we can stop the
+			 * scan, because there can't be another tuple that will succeed.
+			 */
+			Assert(subkey != (ScanKey) DatumGetPointer(header->sk_argument));
+			subkey--;
+			if (forcenonrequired)
+			{
+				/* treating scan's keys as non-required */
+			}
+			else if ((subkey->sk_flags & SK_BT_REQFWD) &&
+					 ScanDirectionIsForward(dir))
+				*continuescan = false;
+			else if ((subkey->sk_flags & SK_BT_REQBKWD) &&
+					 ScanDirectionIsBackward(dir))
+				*continuescan = false;
+			return false;
+		}
+
 		if (subkey->sk_attno > tupnatts)
 		{
 			/*
@@ -3087,11 +3012,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 			 * attribute passes the qual.
 			 */
 			Assert(BTreeTupleIsPivot(tuple));
-			cmpresult = 0;
-			if (subkey->sk_flags & SK_ROW_END)
-				break;
-			subkey++;
-			continue;
+			return true;
 		}
 
 		datum = index_getattr(tuple,
@@ -3101,6 +3022,8 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 
 		if (isNull)
 		{
+			int			reqflags;
+
 			if (forcenonrequired)
 			{
 				/* treating scan's keys as non-required */
@@ -3111,15 +3034,35 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 				 * Since NULLs are sorted before non-NULLs, we know we have
 				 * reached the lower limit of the range of values for this
 				 * index attr.  On a backward scan, we can stop if this qual
-				 * is one of the "must match" subset.  We can stop regardless
-				 * of whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass. On
-				 * a forward scan, however, we must keep going, because we may
-				 * have initially positioned to the start of the index.
-				 * (_bt_advance_array_keys also relies on this behavior during
-				 * forward scans.)
+				 * is one of the "must match" subset.  However, on a forwards
+				 * scan, we must keep going, because we may have initially
+				 * positioned to the start of the index.
+				 *
+				 * All required NULLS FIRST > row members can use NULL tuple
+				 * values to end backwards scans, just like with other values.
+				 * A qual "WHERE (a, b, c) > (9, 42, 'foo')" can terminate a
+				 * backwards scan upon reaching the index's rightmost "a = 9"
+				 * tuple whose "b" column contains a NULL (if not sooner).
+				 * Since "b" is NULLS FIRST, we can treat its NULLs as "<" 42.
 				 */
-				if ((subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
+				reqflags = SK_BT_REQBKWD;
+
+				/*
+				 * When a most significant required NULLS FIRST < row compare
+				 * member sees NULL tuple values during a backwards scan, it
+				 * signals the end of matches for the whole row compare/scan.
+				 * A qual "WHERE (a, b, c) < (9, 42, 'foo')" will terminate a
+				 * backwards scan upon reaching the rightmost tuple whose "a"
+				 * column has a NULL.  The "a" NULL value is "<" 9, and yet
+				 * our < row compare will still end the scan.  (This isn't
+				 * safe with later/lower-order row members.  Notice that it
+				 * can only happen with an "a" NULL some time after the scan
+				 * completely stops needing to use its "b" and "c" members.)
+				 */
+				if (subkey == (ScanKey) DatumGetPointer(header->sk_argument))
+					reqflags |= SK_BT_REQFWD;	/* safe, first row member */
+
+				if ((subkey->sk_flags & reqflags) &&
 					ScanDirectionIsBackward(dir))
 					*continuescan = false;
 			}
@@ -3129,15 +3072,35 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 				 * Since NULLs are sorted after non-NULLs, we know we have
 				 * reached the upper limit of the range of values for this
 				 * index attr.  On a forward scan, we can stop if this qual is
-				 * one of the "must match" subset.  We can stop regardless of
-				 * whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass. On
-				 * a backward scan, however, we must keep going, because we
-				 * may have initially positioned to the end of the index.
-				 * (_bt_advance_array_keys also relies on this behavior during
-				 * backward scans.)
+				 * one of the "must match" subset.  However, on a backward
+				 * scan, we must keep going, because we may have initially
+				 * positioned to the end of the index.
+				 *
+				 * All required NULLS LAST < row members can use NULL tuple
+				 * values to end forwards scans, just like with other values.
+				 * A qual "WHERE (a, b, c) < (9, 42, 'foo')" can terminate a
+				 * forwards scan upon reaching the index's leftmost "a = 9"
+				 * tuple whose "b" column contains a NULL (if not sooner).
+				 * Since "b" is NULLS LAST, we can treat its NULLs as ">" 42.
+				 */
+				reqflags = SK_BT_REQFWD;
+
+				/*
+				 * When a most significant required NULLS LAST > row compare
+				 * member sees NULL tuple values during a forwards scan, it
+				 * signals the end of matches for the whole row compare/scan.
+				 * A qual "WHERE (a, b, c) > (9, 42, 'foo')" will terminate a
+				 * forwards scan upon reaching the leftmost tuple whose "a"
+				 * column has a NULL.  The "a" NULL value is ">" 9, and yet
+				 * our > row compare will end the scan.  (This isn't safe with
+				 * later/lower-order row members.  Notice that it can only
+				 * happen with an "a" NULL some time after the scan completely
+				 * stops needing to use its "b" and "c" members.)
 				 */
-				if ((subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
+				if (subkey == (ScanKey) DatumGetPointer(header->sk_argument))
+					reqflags |= SK_BT_REQBKWD;	/* safe, first row member */
+
+				if ((subkey->sk_flags & reqflags) &&
 					ScanDirectionIsForward(dir))
 					*continuescan = false;
 			}
@@ -3148,30 +3111,6 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, int tupnatts,
 			return false;
 		}
 
-		if (subkey->sk_flags & SK_ISNULL)
-		{
-			/*
-			 * Unlike the simple-scankey case, this isn't a disallowed case
-			 * (except when it's the first row element that has the NULL arg).
-			 * But it can never match.  If all the earlier row comparison
-			 * columns are required for the scan direction, we can stop the
-			 * scan, because there can't be another tuple that will succeed.
-			 */
-			Assert(subkey != (ScanKey) DatumGetPointer(skey->sk_argument));
-			subkey--;
-			if (forcenonrequired)
-			{
-				/* treating scan's keys as non-required */
-			}
-			else if ((subkey->sk_flags & SK_BT_REQFWD) &&
-					 ScanDirectionIsForward(dir))
-				*continuescan = false;
-			else if ((subkey->sk_flags & SK_BT_REQBKWD) &&
-					 ScanDirectionIsBackward(dir))
-				*continuescan = false;
-			return false;
-		}
-
 		/* Perform the test --- three-way comparison not bool operator */
 		cmpresult = DatumGetInt32(FunctionCall2Coll(&subkey->sk_func,
 													subkey->sk_collation,
@@ -3391,7 +3330,6 @@ _bt_killitems(IndexScanDesc scan)
 		buf = _bt_getbuf(rel, so->currPos.currPage, BT_READ);
 
 		latestlsn = BufferGetLSNAtomic(buf);
-		Assert(!XLogRecPtrIsInvalid(so->currPos.lsn));
 		Assert(so->currPos.lsn <= latestlsn);
 		if (so->currPos.lsn != latestlsn)
 		{
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index 113fae1437a..225ff7ca9f2 100644
--- a/src/backend/access/transam/commit_ts.c
+++ b/src/backend/access/transam/commit_ts.c
@@ -707,6 +707,13 @@ ActivateCommitTs(void)
 	TransactionId xid;
 	int64		pageno;
 
+	/*
+	 * During bootstrap, we should not register commit timestamps so skip the
+	 * activation in this case.
+	 */
+	if (IsBootstrapProcessingMode())
+		return;
+
 	/* If we've done this already, there's nothing to do */
 	LWLockAcquire(CommitTsLock, LW_EXCLUSIVE);
 	if (commitTsShared->commitTsActive)
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index d1bfa70bedf..037f59fafd8 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -275,20 +275,9 @@ typedef struct MultiXactStateData
 	/* support for members anti-wraparound measures */
 	MultiXactOffset offsetStopLimit;	/* known if oldestOffsetKnown */
 
-	/*
-	 * This is used to sleep until a multixact offset is written when we want
-	 * to create the next one.
-	 */
-	ConditionVariable nextoff_cv;
-
 	/*
 	 * Per-backend data starts here.  We have two arrays stored in the area
-	 * immediately following the MultiXactStateData struct. Each is indexed by
-	 * ProcNumber.
-	 *
-	 * In both arrays, there's a slot for all normal backends
-	 * (0..MaxBackends-1) followed by a slot for max_prepared_xacts prepared
-	 * transactions.
+	 * immediately following the MultiXactStateData struct:
 	 *
 	 * OldestMemberMXactId[k] is the oldest MultiXactId each backend's current
 	 * transaction(s) could possibly be a member of, or InvalidMultiXactId
@@ -300,6 +289,10 @@ typedef struct MultiXactStateData
 	 * member of a MultiXact, and that MultiXact would have to be created
 	 * during or after the lock acquisition.)
 	 *
+	 * In the OldestMemberMXactId array, there's a slot for all normal
+	 * backends (0..MaxBackends-1) followed by a slot for max_prepared_xacts
+	 * prepared transactions.
+	 *
 	 * OldestVisibleMXactId[k] is the oldest MultiXactId each backend's
 	 * current transaction(s) think is potentially live, or InvalidMultiXactId
 	 * when not in a transaction or not in a transaction that's paid any
@@ -311,6 +304,9 @@ typedef struct MultiXactStateData
 	 * than its own OldestVisibleMXactId[] setting; this is necessary because
 	 * the relevant SLRU data can be concurrently truncated away.
 	 *
+	 * In the OldestVisibleMXactId array, there's a slot for all normal
+	 * backends (0..MaxBackends-1) only. No slots for prepared transactions.
+	 *
 	 * The oldest valid value among all of the OldestMemberMXactId[] and
 	 * OldestVisibleMXactId[] entries is considered by vacuum as the earliest
 	 * possible value still having any live member transaction -- OldestMxact.
@@ -332,9 +328,10 @@ typedef struct MultiXactStateData
 } MultiXactStateData;
 
 /*
- * Size of OldestMemberMXactId and OldestVisibleMXactId arrays.
+ * Sizes of OldestMemberMXactId and OldestVisibleMXactId arrays.
  */
-#define MaxOldestSlot	(MaxBackends + max_prepared_xacts)
+#define NumMemberSlots		(MaxBackends + max_prepared_xacts)
+#define NumVisibleSlots		MaxBackends
 
 /* Pointers to the state data in shared memory */
 static MultiXactStateData *MultiXactState;
@@ -342,6 +339,41 @@ static MultiXactId *OldestMemberMXactId;
 static MultiXactId *OldestVisibleMXactId;
 
 
+static inline MultiXactId *
+MyOldestMemberMXactIdSlot(void)
+{
+	/*
+	 * The first MaxBackends entries in the OldestMemberMXactId array are
+	 * reserved for regular backends.  MyProcNumber should index into one of
+	 * them.
+	 */
+	Assert(MyProcNumber >= 0 && MyProcNumber < MaxBackends);
+	return &OldestMemberMXactId[MyProcNumber];
+}
+
+static inline MultiXactId *
+PreparedXactOldestMemberMXactIdSlot(ProcNumber procno)
+{
+	int			prepared_xact_idx;
+
+	Assert(procno >= FIRST_PREPARED_XACT_PROC_NUMBER);
+	prepared_xact_idx = procno - FIRST_PREPARED_XACT_PROC_NUMBER;
+
+	/*
+	 * The first MaxBackends entries in the OldestMemberMXactId array are
+	 * reserved for regular backends.  Prepared xacts come after them.
+	 */
+	Assert(MaxBackends + prepared_xact_idx < NumMemberSlots);
+	return &OldestMemberMXactId[MaxBackends + prepared_xact_idx];
+}
+
+static inline MultiXactId *
+MyOldestVisibleMXactIdSlot(void)
+{
+	Assert(MyProcNumber >= 0 && MyProcNumber < NumVisibleSlots);
+	return &OldestVisibleMXactId[MyProcNumber];
+}
+
 /*
  * Definitions for the backend-local MultiXactId cache.
  *
@@ -385,6 +417,19 @@ static MemoryContext MXactContext = NULL;
 #define debug_elog6(a,b,c,d,e,f)
 #endif
 
+/*
+ * Hack to deal with WAL generated with older minor versions.
+ *
+ * last_initialized_offsets_page is the XLOG_MULTIXACT_ZERO_OFF_PAGE record
+ * that we saw during WAL replay, or -1 if we haven't seen any yet.
+ *
+ * pre_initialized_offsets_page is the last page that was implicitly
+ * initialized by replaying a XLOG_MULTIXACT_CREATE_ID record, when we had not
+ * seen a XLOG_MULTIXACT_ZERO_OFF_PAGE record for the page yet.
+ */
+static int64 last_initialized_offsets_page = -1;
+static int64 pre_initialized_offsets_page = -1;
+
 /* internal MultiXactId management */
 static void MultiXactIdSetOldestVisible(void);
 static void RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
@@ -443,7 +488,7 @@ MultiXactIdCreate(TransactionId xid1, MultiXactStatus status1,
 	Assert(!TransactionIdEquals(xid1, xid2) || (status1 != status2));
 
 	/* MultiXactIdSetOldestMember() must have been called already. */
-	Assert(MultiXactIdIsValid(OldestMemberMXactId[MyProcNumber]));
+	Assert(MultiXactIdIsValid(*MyOldestMemberMXactIdSlot()));
 
 	/*
 	 * Note: unlike MultiXactIdExpand, we don't bother to check that both XIDs
@@ -497,7 +542,7 @@ MultiXactIdExpand(MultiXactId multi, TransactionId xid, MultiXactStatus status)
 	Assert(TransactionIdIsValid(xid));
 
 	/* MultiXactIdSetOldestMember() must have been called already. */
-	Assert(MultiXactIdIsValid(OldestMemberMXactId[MyProcNumber]));
+	Assert(MultiXactIdIsValid(*MyOldestMemberMXactIdSlot()));
 
 	debug_elog5(DEBUG2, "Expand: received multi %u, xid %u status %s",
 				multi, xid, mxstatus_to_string(status));
@@ -672,7 +717,7 @@ MultiXactIdIsRunning(MultiXactId multi, bool isLockOnly)
 void
 MultiXactIdSetOldestMember(void)
 {
-	if (!MultiXactIdIsValid(OldestMemberMXactId[MyProcNumber]))
+	if (!MultiXactIdIsValid(*MyOldestMemberMXactIdSlot()))
 	{
 		MultiXactId nextMXact;
 
@@ -701,7 +746,7 @@ MultiXactIdSetOldestMember(void)
 		if (nextMXact < FirstMultiXactId)
 			nextMXact = FirstMultiXactId;
 
-		OldestMemberMXactId[MyProcNumber] = nextMXact;
+		*MyOldestMemberMXactIdSlot() = nextMXact;
 
 		LWLockRelease(MultiXactGenLock);
 
@@ -729,7 +774,7 @@ MultiXactIdSetOldestMember(void)
 static void
 MultiXactIdSetOldestVisible(void)
 {
-	if (!MultiXactIdIsValid(OldestVisibleMXactId[MyProcNumber]))
+	if (!MultiXactIdIsValid(*MyOldestVisibleMXactIdSlot()))
 	{
 		MultiXactId oldestMXact;
 		int			i;
@@ -745,7 +790,7 @@ MultiXactIdSetOldestVisible(void)
 		if (oldestMXact < FirstMultiXactId)
 			oldestMXact = FirstMultiXactId;
 
-		for (i = 0; i < MaxOldestSlot; i++)
+		for (i = 0; i < NumMemberSlots; i++)
 		{
 			MultiXactId thisoldest = OldestMemberMXactId[i];
 
@@ -754,7 +799,7 @@ MultiXactIdSetOldestVisible(void)
 				oldestMXact = thisoldest;
 		}
 
-		OldestVisibleMXactId[MyProcNumber] = oldestMXact;
+		*MyOldestVisibleMXactIdSlot() = oldestMXact;
 
 		LWLockRelease(MultiXactGenLock);
 
@@ -921,13 +966,105 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
 	int			entryno;
 	int			slotno;
 	MultiXactOffset *offptr;
-	int			i;
+	MultiXactId next;
+	int64		next_pageno;
+	int			next_entryno;
+	MultiXactOffset *next_offptr;
+	MultiXactOffset next_offset;
 	LWLock	   *lock;
 	LWLock	   *prevlock = NULL;
 
+	/* position of this multixid in the offsets SLRU area  */
 	pageno = MultiXactIdToOffsetPage(multi);
 	entryno = MultiXactIdToOffsetEntry(multi);
 
+	/* position of the next multixid */
+	next = multi + 1;
+	if (next < FirstMultiXactId)
+		next = FirstMultiXactId;
+	next_pageno = MultiXactIdToOffsetPage(next);
+	next_entryno = MultiXactIdToOffsetEntry(next);
+
+	/*
+	 * Older minor versions didn't set the next multixid's offset in this
+	 * function, and therefore didn't initialize the next page until the next
+	 * multixid was assigned.  If we're replaying WAL that was generated by
+	 * such a version, the next page might not be initialized yet.  Initialize
+	 * it now.
+	 */
+	if (InRecovery && next_pageno != pageno)
+	{
+		bool		init_needed;
+
+		/*----------
+		 * Check if the page exists, and if not, initialize it now.
+		 *
+		 * The straightforward way to check if the page exists is to call
+		 * SimpleLruDoesPhysicalPageExist().  However, there two problems with
+		 * that:
+		 *
+		 * 1. It's somewhat expensive to call on every page switch.
+		 *
+		 * 2. It does not take into account pages that have been initialized
+		 *    in the SLRU buffer cache but not yet flushed to disk.  For such
+		 *    pages, it will incorrectly return false.
+		 *
+		 * To fix both of those problems, if we have replayed any
+		 * XLOG_MULTIXACT_ZERO_OFF_PAGE records, we assume that the last page
+		 * that was zeroed by XLOG_MULTIXACT_ZERO_OFF_PAGE is the last page
+		 * that exists.  This works because the XLOG_MULTIXACT_ZERO_OFF_PAGE
+		 * records must appear in the WAL in order, unlike CREATE_ID records.
+		 * We only resort to SimpleLruDoesPhysicalPageExist() if we haven't
+		 * seen any XLOG_MULTIXACT_ZERO_OFF_PAGE records yet, which should
+		 * happen at most once after starting WAL recovery.
+		 *
+		 * As an extra safety measure, if we do resort to
+		 * SimpleLruDoesPhysicalPageExist(), flush the SLRU buffers first so
+		 * that it will return an accurate result.
+		 *----------
+		 */
+		if (last_initialized_offsets_page == -1)
+		{
+			SimpleLruWriteAll(MultiXactOffsetCtl, false);
+			init_needed = !SimpleLruDoesPhysicalPageExist(MultiXactOffsetCtl, next_pageno);
+		}
+		else
+			init_needed = (last_initialized_offsets_page == pageno);
+
+		if (init_needed)
+		{
+			elog(DEBUG1, "next offsets page is not initialized, initializing it now");
+
+			lock = SimpleLruGetBankLock(MultiXactOffsetCtl, next_pageno);
+			LWLockAcquire(lock, LW_EXCLUSIVE);
+
+			/* Create and zero the page */
+			slotno = SimpleLruZeroPage(MultiXactOffsetCtl, next_pageno);
+
+			/* Make sure it's written out */
+			SimpleLruWritePage(MultiXactOffsetCtl, slotno);
+			Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
+
+			LWLockRelease(lock);
+
+			/*
+			 * Remember that we initialized the page, so that we don't zero it
+			 * again at the XLOG_MULTIXACT_ZERO_OFF_PAGE record.
+			 */
+			pre_initialized_offsets_page = next_pageno;
+			last_initialized_offsets_page = next_pageno;
+		}
+	}
+
+	/*
+	 * Set the starting offset of this multixid's members.
+	 *
+	 * In the common case, it was already be set by the previous
+	 * RecordNewMultiXact call, as this was the next multixid of the previous
+	 * multixid.  But if multiple backends are generating multixids
+	 * concurrently, we might race ahead and get called before the previous
+	 * multixid.
+	 */
 	lock = SimpleLruGetBankLock(MultiXactOffsetCtl, pageno);
 	LWLockAcquire(lock, LW_EXCLUSIVE);
 
@@ -942,22 +1079,54 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
 	offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 	offptr += entryno;
 
-	*offptr = offset;
+	if (*offptr != offset)
+	{
+		/* should already be set to the correct value, or not at all */
+		Assert(*offptr == 0);
+		*offptr = offset;
+		MultiXactOffsetCtl->shared->page_dirty[slotno] = true;
+	}
 
-	MultiXactOffsetCtl->shared->page_dirty[slotno] = true;
+	/*
+	 * Set the next multixid's offset to the end of this multixid's members.
+	 */
+	if (next_pageno == pageno)
+	{
+		next_offptr = offptr + 1;
+	}
+	else
+	{
+		/* must be the first entry on the page */
+		Assert(next_entryno == 0 || next == FirstMultiXactId);
+
+		/* Swap the lock for a lock on the next page */
+		LWLockRelease(lock);
+		lock = SimpleLruGetBankLock(MultiXactOffsetCtl, next_pageno);
+		LWLockAcquire(lock, LW_EXCLUSIVE);
+
+		slotno = SimpleLruReadPage(MultiXactOffsetCtl, next_pageno, true, next);
+		next_offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
+		next_offptr += next_entryno;
+	}
+
+	/* Like in GetNewMultiXactId(), skip over offset 0 */
+	next_offset = offset + nmembers;
+	if (next_offset == 0)
+		next_offset = 1;
+	if (*next_offptr != next_offset)
+	{
+		/* should already be set to the correct value, or not at all */
+		Assert(*next_offptr == 0);
+		*next_offptr = next_offset;
+		MultiXactOffsetCtl->shared->page_dirty[slotno] = true;
+	}
 
 	/* Release MultiXactOffset SLRU lock. */
 	LWLockRelease(lock);
 
-	/*
-	 * If anybody was waiting to know the offset of this multixact ID we just
-	 * wrote, they can read it now, so wake them up.
-	 */
-	ConditionVariableBroadcast(&MultiXactState->nextoff_cv);
-
 	prev_pageno = -1;
 
-	for (i = 0; i < nmembers; i++, offset++)
+	for (int i = 0; i < nmembers; i++, offset++)
 	{
 		TransactionId *memberptr;
 		uint32	   *flagsptr;
@@ -1147,8 +1316,11 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 			result = FirstMultiXactId;
 	}
 
-	/* Make sure there is room for the MXID in the file.  */
-	ExtendMultiXactOffset(result);
+	/*
+	 * Make sure there is room for the next MXID in the file.  Assigning this
+	 * MXID sets the next MXID's offset already.
+	 */
+	ExtendMultiXactOffset(result + 1);
 
 	/*
 	 * Reserve the members space, similarly to above.  Also, be careful not to
@@ -1313,7 +1485,6 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	MultiXactOffset nextOffset;
 	MultiXactMember *ptr;
 	LWLock	   *lock;
-	bool		slept = false;
 
 	debug_elog3(DEBUG2, "GetMembers: asked for %u", multi);
 
@@ -1341,7 +1512,7 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	 * multi.  It cannot possibly still be running.
 	 */
 	if (isLockOnly &&
-		MultiXactIdPrecedes(multi, OldestVisibleMXactId[MyProcNumber]))
+		MultiXactIdPrecedes(multi, *MyOldestVisibleMXactIdSlot()))
 	{
 		debug_elog2(DEBUG2, "GetMembers: a locker-only multi is too old");
 		*members = NULL;
@@ -1390,23 +1561,14 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	 * one's.  However, there are some corner cases to worry about:
 	 *
 	 * 1. This multixact may be the latest one created, in which case there is
-	 * no next one to look at.  In this case the nextOffset value we just
-	 * saved is the correct endpoint.
-	 *
-	 * 2. The next multixact may still be in process of being filled in: that
-	 * is, another process may have done GetNewMultiXactId but not yet written
-	 * the offset entry for that ID.  In that scenario, it is guaranteed that
-	 * the offset entry for that multixact exists (because GetNewMultiXactId
-	 * won't release MultiXactGenLock until it does) but contains zero
-	 * (because we are careful to pre-zero offset pages). Because
-	 * GetNewMultiXactId will never return zero as the starting offset for a
-	 * multixact, when we read zero as the next multixact's offset, we know we
-	 * have this case.  We handle this by sleeping on the condition variable
-	 * we have just for this; the process in charge will signal the CV as soon
-	 * as it has finished writing the multixact offset.
+	 * no next one to look at.  The next multixact's offset should be set
+	 * already, as we set it in RecordNewMultiXact(), but we used to not do
+	 * that in older minor versions.  To cope with that case, if this
+	 * multixact is the latest one created, use the nextOffset value we read
+	 * above as the endpoint.
 	 *
-	 * 3. Because GetNewMultiXactId increments offset zero to offset one to
-	 * handle case #2, there is an ambiguity near the point of offset
+	 * 2. Because GetNewMultiXactId skips over offset zero, to reserve zero
+	 * for to mean "unset", there is an ambiguity near the point of offset
 	 * wraparound.  If we see next multixact's offset is one, is that our
 	 * multixact's actual endpoint, or did it end at zero with a subsequent
 	 * increment?  We handle this using the knowledge that if the zero'th
@@ -1418,7 +1580,6 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	 * cases, so it seems better than holding the MultiXactGenLock for a long
 	 * time on every multixact creation.
 	 */
-retry:
 	pageno = MultiXactIdToOffsetPage(multi);
 	entryno = MultiXactIdToOffsetEntry(multi);
 
@@ -1481,18 +1642,10 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 		nextMXOffset = *offptr;
 
 		if (nextMXOffset == 0)
-		{
-			/* Corner case 2: next multixact is still being filled in */
-			LWLockRelease(lock);
-			CHECK_FOR_INTERRUPTS();
-
-			INJECTION_POINT("multixact-get-members-cv-sleep", NULL);
-
-			ConditionVariableSleep(&MultiXactState->nextoff_cv,
-								   WAIT_EVENT_MULTIXACT_CREATION);
-			slept = true;
-			goto retry;
-		}
+			ereport(ERROR,
+					(errcode(ERRCODE_DATA_CORRUPTED),
+					 errmsg("MultiXact %u has invalid next offset",
+							multi)));
 
 		length = nextMXOffset - offset;
 	}
@@ -1500,12 +1653,6 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 	LWLockRelease(lock);
 	lock = NULL;
 
-	/*
-	 * If we slept above, clean up state; it's no longer needed.
-	 */
-	if (slept)
-		ConditionVariableCancelSleep();
-
 	ptr = (MultiXactMember *) palloc(length * sizeof(MultiXactMember));
 
 	truelength = 0;
@@ -1548,7 +1695,10 @@ GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
 
 		if (!TransactionIdIsValid(*xactptr))
 		{
-			/* Corner case 3: we must be looking at unused slot zero */
+			/*
+			 * Corner case 2: offset must have wrapped around to unused slot
+			 * zero.
+			 */
 			Assert(offset == 0);
 			continue;
 		}
@@ -1814,8 +1964,8 @@ AtEOXact_MultiXact(void)
 	 * We assume that storing a MultiXactId is atomic and so we need not take
 	 * MultiXactGenLock to do this.
 	 */
-	OldestMemberMXactId[MyProcNumber] = InvalidMultiXactId;
-	OldestVisibleMXactId[MyProcNumber] = InvalidMultiXactId;
+	*MyOldestMemberMXactIdSlot() = InvalidMultiXactId;
+	*MyOldestVisibleMXactIdSlot() = InvalidMultiXactId;
 
 	/*
 	 * Discard the local MultiXactId cache.  Since MXactContext was created as
@@ -1835,7 +1985,7 @@ AtEOXact_MultiXact(void)
 void
 AtPrepare_MultiXact(void)
 {
-	MultiXactId myOldestMember = OldestMemberMXactId[MyProcNumber];
+	MultiXactId myOldestMember = *MyOldestMemberMXactIdSlot();
 
 	if (MultiXactIdIsValid(myOldestMember))
 		RegisterTwoPhaseRecord(TWOPHASE_RM_MULTIXACT_ID, 0,
@@ -1855,7 +2005,7 @@ PostPrepare_MultiXact(TransactionId xid)
 	 * Transfer our OldestMemberMXactId value to the slot reserved for the
 	 * prepared transaction.
 	 */
-	myOldestMember = OldestMemberMXactId[MyProcNumber];
+	myOldestMember = *MyOldestMemberMXactIdSlot();
 	if (MultiXactIdIsValid(myOldestMember))
 	{
 		ProcNumber	dummyProcNumber = TwoPhaseGetDummyProcNumber(xid, false);
@@ -1868,8 +2018,8 @@ PostPrepare_MultiXact(TransactionId xid)
 		 */
 		LWLockAcquire(MultiXactGenLock, LW_EXCLUSIVE);
 
-		OldestMemberMXactId[dummyProcNumber] = myOldestMember;
-		OldestMemberMXactId[MyProcNumber] = InvalidMultiXactId;
+		*PreparedXactOldestMemberMXactIdSlot(dummyProcNumber) = myOldestMember;
+		*MyOldestMemberMXactIdSlot() = InvalidMultiXactId;
 
 		LWLockRelease(MultiXactGenLock);
 	}
@@ -1882,7 +2032,7 @@ PostPrepare_MultiXact(TransactionId xid)
 	 * We assume that storing a MultiXactId is atomic and so we need not take
 	 * MultiXactGenLock to do this.
 	 */
-	OldestVisibleMXactId[MyProcNumber] = InvalidMultiXactId;
+	*MyOldestVisibleMXactIdSlot() = InvalidMultiXactId;
 
 	/*
 	 * Discard the local MultiXactId cache like in AtEOXact_MultiXact.
@@ -1909,7 +2059,7 @@ multixact_twophase_recover(TransactionId xid, uint16 info,
 	Assert(len == sizeof(MultiXactId));
 	oldestMember = *((MultiXactId *) recdata);
 
-	OldestMemberMXactId[dummyProcNumber] = oldestMember;
+	*PreparedXactOldestMemberMXactIdSlot(dummyProcNumber) = oldestMember;
 }
 
 /*
@@ -1924,7 +2074,7 @@ multixact_twophase_postcommit(TransactionId xid, uint16 info,
 
 	Assert(len == sizeof(MultiXactId));
 
-	OldestMemberMXactId[dummyProcNumber] = InvalidMultiXactId;
+	*PreparedXactOldestMemberMXactIdSlot(dummyProcNumber) = InvalidMultiXactId;
 }
 
 /*
@@ -1939,21 +2089,32 @@ multixact_twophase_postabort(TransactionId xid, uint16 info,
 }
 
 /*
- * Initialization of shared memory for MultiXact.  We use two SLRU areas,
- * thus double memory.  Also, reserve space for the shared MultiXactState
- * struct and the per-backend MultiXactId arrays (two of those, too).
+ * Initialization of shared memory for MultiXact.
+ *
+ * MultiXactSharedStateShmemSize() calculates the size of the MultiXactState
+ * struct, and the two per-backend MultiXactId arrays.  They are carved out of
+ * the same allocation.  MultiXactShmemSize() additionally includes the memory
+ * needed for the two SLRU areas.
  */
+static Size
+MultiXactSharedStateShmemSize(void)
+{
+	Size		size;
+
+	size = offsetof(MultiXactStateData, perBackendXactIds);
+	size = add_size(size,
+					mul_size(sizeof(MultiXactId), NumMemberSlots));
+	size = add_size(size,
+					mul_size(sizeof(MultiXactId), NumVisibleSlots));
+	return size;
+}
+
 Size
 MultiXactShmemSize(void)
 {
 	Size		size;
 
-	/* We need 2*MaxOldestSlot perBackendXactIds[] entries */
-#define SHARED_MULTIXACT_STATE_SIZE \
-	add_size(offsetof(MultiXactStateData, perBackendXactIds), \
-			 mul_size(sizeof(MultiXactId) * 2, MaxOldestSlot))
-
-	size = SHARED_MULTIXACT_STATE_SIZE;
+	size = MultiXactSharedStateShmemSize();
 	size = add_size(size, SimpleLruShmemSize(multixact_offset_buffers, 0));
 	size = add_size(size, SimpleLruShmemSize(multixact_member_buffers, 0));
 
@@ -1987,15 +2148,14 @@ MultiXactShmemInit(void)
 
 	/* Initialize our shared state struct */
 	MultiXactState = ShmemInitStruct("Shared MultiXact State",
-									 SHARED_MULTIXACT_STATE_SIZE,
+									 MultiXactSharedStateShmemSize(),
 									 &found);
 	if (!IsUnderPostmaster)
 	{
 		Assert(!found);
 
 		/* Make sure we zero out the per-backend state */
-		MemSet(MultiXactState, 0, SHARED_MULTIXACT_STATE_SIZE);
-		ConditionVariableInit(&MultiXactState->nextoff_cv);
+		MemSet(MultiXactState, 0, MultiXactSharedStateShmemSize());
 	}
 	else
 		Assert(found);
@@ -2004,7 +2164,7 @@ MultiXactShmemInit(void)
 	 * Set up array pointers.
 	 */
 	OldestMemberMXactId = MultiXactState->perBackendXactIds;
-	OldestVisibleMXactId = OldestMemberMXactId + MaxOldestSlot;
+	OldestVisibleMXactId = OldestMemberMXactId + NumMemberSlots;
 }
 
 /*
@@ -2202,26 +2362,34 @@ TrimMultiXact(void)
 						pageno);
 
 	/*
-	 * Zero out the remainder of the current offsets page.  See notes in
-	 * TrimCLOG() for background.  Unlike CLOG, some WAL record covers every
-	 * pg_multixact SLRU mutation.  Since, also unlike CLOG, we ignore the WAL
-	 * rule "write xlog before data," nextMXact successors may carry obsolete,
-	 * nonzero offset values.  Zero those so case 2 of GetMultiXactIdMembers()
-	 * operates normally.
+	 * Set the offset of nextMXact on the offsets page.  This is normally done
+	 * in RecordNewMultiXact() of the previous multixact, but we used to not
+	 * do that in older minor versions.  To ensure that the next offset is set
+	 * if the binary was just upgraded from an older minor version, do it now.
+	 *
+	 * Zero out the remainder of the page.  See notes in TrimCLOG() for
+	 * background.  Unlike CLOG, some WAL record covers every pg_multixact
+	 * SLRU mutation.  Since, also unlike CLOG, we ignore the WAL rule "write
+	 * xlog before data," nextMXact successors may carry obsolete, nonzero
+	 * offset values.
 	 */
 	entryno = MultiXactIdToOffsetEntry(nextMXact);
-	if (entryno != 0)
 	{
 		int			slotno;
 		MultiXactOffset *offptr;
 		LWLock	   *lock = SimpleLruGetBankLock(MultiXactOffsetCtl, pageno);
 
 		LWLockAcquire(lock, LW_EXCLUSIVE);
-		slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, nextMXact);
+		if (entryno == 0)
+			slotno = SimpleLruZeroPage(MultiXactOffsetCtl, pageno);
+		else
+			slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, nextMXact);
 		offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 		offptr += entryno;
 
-		MemSet(offptr, 0, BLCKSZ - (entryno * sizeof(MultiXactOffset)));
+		*offptr = offset;
+		if (entryno != 0 && (entryno + 1) * sizeof(MultiXactOffset) != BLCKSZ)
+			MemSet(offptr + 1, 0, BLCKSZ - (entryno + 1) * sizeof(MultiXactOffset));
 
 		MultiXactOffsetCtl->shared->page_dirty[slotno] = true;
 		LWLockRelease(lock);
@@ -2661,7 +2829,6 @@ GetOldestMultiXactId(void)
 {
 	MultiXactId oldestMXact;
 	MultiXactId nextMXact;
-	int			i;
 
 	/*
 	 * This is the oldest valid value among all the OldestMemberMXactId[] and
@@ -2679,7 +2846,7 @@ GetOldestMultiXactId(void)
 		nextMXact = FirstMultiXactId;
 
 	oldestMXact = nextMXact;
-	for (i = 0; i < MaxOldestSlot; i++)
+	for (int i = 0; i < NumMemberSlots; i++)
 	{
 		MultiXactId thisoldest;
 
@@ -2687,6 +2854,11 @@ GetOldestMultiXactId(void)
 		if (MultiXactIdIsValid(thisoldest) &&
 			MultiXactIdPrecedes(thisoldest, oldestMXact))
 			oldestMXact = thisoldest;
+	}
+	for (int i = 0; i < NumVisibleSlots; i++)
+	{
+		MultiXactId thisoldest;
+
 		thisoldest = OldestVisibleMXactId[i];
 		if (MultiXactIdIsValid(thisoldest) &&
 			MultiXactIdPrecedes(thisoldest, oldestMXact))
@@ -3209,6 +3381,23 @@ TruncateMultiXact(MultiXactId newOldestMulti, Oid newOldestMultiDB)
 		return;
 	}
 
+	/*
+	 * On crash, MultiXactIdCreateFromMembers() can leave behind multixids
+	 * that were not yet written out and hence have zero offset on disk. If
+	 * such a multixid becomes oldestMulti, we won't be able to look up its
+	 * offset. That should be rare, so we don't try to do anything smart about
+	 * it. Just skip the truncation, and hope that by the next truncation
+	 * attempt, oldestMulti has advanced to a valid multixid.
+	 */
+	if (newOldestOffset == 0)
+	{
+		ereport(LOG,
+				(errmsg("cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation",
+						newOldestMulti)));
+		LWLockRelease(MultiXactTruncationLock);
+		return;
+	}
+
 	elog(DEBUG1, "performing multixact truncation: "
 		 "offsets [%u, %u), offsets segments [%" PRIx64 ", %" PRIx64 "), "
 		 "members [%u, %u), members segments [%" PRIx64 ", %" PRIx64 ")",
@@ -3406,14 +3595,26 @@ multixact_redo(XLogReaderState *record)
 
 		memcpy(&pageno, XLogRecGetData(record), sizeof(pageno));
 
-		lock = SimpleLruGetBankLock(MultiXactOffsetCtl, pageno);
-		LWLockAcquire(lock, LW_EXCLUSIVE);
+		/*
+		 * Skip the record if we already initialized the page at the previous
+		 * XLOG_MULTIXACT_CREATE_ID record. See RecordNewMultiXact().
+		 */
+		if (pre_initialized_offsets_page != pageno)
+		{
+			lock = SimpleLruGetBankLock(MultiXactOffsetCtl, pageno);
+			LWLockAcquire(lock, LW_EXCLUSIVE);
 
-		slotno = ZeroMultiXactOffsetPage(pageno, false);
-		SimpleLruWritePage(MultiXactOffsetCtl, slotno);
-		Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
+			slotno = ZeroMultiXactOffsetPage(pageno, false);
+			SimpleLruWritePage(MultiXactOffsetCtl, slotno);
+			Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
 
-		LWLockRelease(lock);
+			LWLockRelease(lock);
+
+			last_initialized_offsets_page = pageno;
+		}
+		else
+			elog(DEBUG1, "skipping initialization of offsets page " INT64_FORMAT " because it was already initialized on multixid creation", pageno);
+		pre_initialized_offsets_page = -1;
 	}
 	else if (info == XLOG_MULTIXACT_ZERO_MEM_PAGE)
 	{
@@ -3439,6 +3640,22 @@ multixact_redo(XLogReaderState *record)
 		TransactionId max_xid;
 		int			i;
 
+		if (pre_initialized_offsets_page != -1)
+		{
+			/*
+			 * If we implicitly initialized the next offsets page while
+			 * replaying an XLOG_MULTIXACT_CREATE_ID record that was generated
+			 * with an older minor version, we still expect to see an
+			 * XLOG_MULTIXACT_ZERO_OFF_PAGE record for it before any other
+			 * XLOG_MULTIXACT_CREATE_ID records.  Therefore this case should
+			 * not happen.  If it does, we'll continue with the replay, but
+			 * log a message to note that something's funny.
+			 */
+			elog(LOG, "expected to see an XLOG_MULTIXACT_ZERO_OFF_PAGE record for page " INT64_FORMAT " that was implicitly initialized earlier",
+				 pre_initialized_offsets_page);
+			pre_initialized_offsets_page = -1;
+		}
+
 		/* Store the data back into the SLRU files */
 		RecordNewMultiXact(xlrec->mid, xlrec->moff, xlrec->nmembers,
 						   xlrec->members);
@@ -3464,7 +3681,6 @@ multixact_redo(XLogReaderState *record)
 	else if (info == XLOG_MULTIXACT_TRUNCATE_ID)
 	{
 		xl_multixact_truncate xlrec;
-		int64		pageno;
 
 		memcpy(&xlrec, XLogRecGetData(record),
 			   SizeOfMultiXactTruncate);
@@ -3489,15 +3705,6 @@ multixact_redo(XLogReaderState *record)
 		SetMultiXactIdLimit(xlrec.endTruncOff, xlrec.oldestMultiDB, false);
 
 		PerformMembersTruncation(xlrec.startTruncMemb, xlrec.endTruncMemb);
-
-		/*
-		 * During XLOG replay, latest_page_number isn't necessarily set up
-		 * yet; insert a suitable value to bypass the sanity test in
-		 * SimpleLruTruncate.
-		 */
-		pageno = MultiXactIdToOffsetPage(xlrec.endTruncOff);
-		pg_atomic_write_u64(&MultiXactOffsetCtl->shared->latest_page_number,
-							pageno);
 		PerformOffsetsTruncation(xlrec.startTruncOff, xlrec.endTruncOff);
 
 		LWLockRelease(MultiXactTruncationLock);
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index c098c17bc01..51e0944d2d6 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -507,8 +507,12 @@ InitializeParallelDSM(ParallelContext *pcxt)
 void
 ReinitializeParallelDSM(ParallelContext *pcxt)
 {
+	MemoryContext oldcontext;
 	FixedParallelState *fps;
 
+	/* We might be running in a very short-lived memory context. */
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
+
 	/* Wait for any old workers to exit. */
 	if (pcxt->nworkers_launched > 0)
 	{
@@ -546,6 +550,9 @@ ReinitializeParallelDSM(ParallelContext *pcxt)
 			pcxt->worker[i].error_mqh = shm_mq_attach(mq, pcxt->seg, NULL);
 		}
 	}
+
+	/* Restore previous memory context. */
+	MemoryContextSwitchTo(oldcontext);
 }
 
 /*
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index fe56286d9a9..4b2a285db34 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -246,6 +246,7 @@ SimpleLruAutotuneBuffers(int divisor, int max)
  * buffer_tranche_id: tranche ID to use for the SLRU's per-buffer LWLocks.
  * bank_tranche_id: tranche ID to use for the bank LWLocks.
  * sync_handler: which set of functions to use to handle sync requests
+ * long_segment_names: use short or long segment names
  */
 void
 SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
@@ -400,10 +401,10 @@ SimpleLruZeroPage(SlruCtl ctl, int64 pageno)
 	/*
 	 * Assume this page is now the latest active page.
 	 *
-	 * Note that because both this routine and SlruSelectLRUPage run with
-	 * ControlLock held, it is not possible for this to be zeroing a page that
-	 * SlruSelectLRUPage is going to evict simultaneously.  Therefore, there's
-	 * no memory barrier here.
+	 * Note that because both this routine and SlruSelectLRUPage run with a
+	 * SLRU bank lock held, it is not possible for this to be zeroing a page
+	 * that SlruSelectLRUPage is going to evict simultaneously.  Therefore,
+	 * there's no memory barrier here.
 	 */
 	pg_atomic_write_u64(&shared->latest_page_number, pageno);
 
@@ -619,7 +620,7 @@ SimpleLruReadPage_ReadOnly(SlruCtl ctl, int64 pageno, TransactionId xid)
 			shared->page_number[slotno] == pageno &&
 			shared->page_status[slotno] != SLRU_PAGE_READ_IN_PROGRESS)
 		{
-			/* See comments for SlruRecentlyUsed macro */
+			/* See comments for SlruRecentlyUsed() */
 			SlruRecentlyUsed(shared, slotno);
 
 			/* update the stats counter of pages found in the SLRU */
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 73a80559194..77be057bdbb 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -895,9 +895,10 @@ TwoPhaseGetXidByVirtualXID(VirtualTransactionId vxid,
  *		Get the dummy proc number for prepared transaction specified by XID
  *
  * Dummy proc numbers are similar to proc numbers of real backends.  They
- * start at MaxBackends, and are unique across all currently active real
- * backends and prepared transactions.  If lock_held is set to true,
- * TwoPhaseStateLock will not be taken, so the caller had better hold it.
+ * start at FIRST_PREPARED_XACT_PROC_NUMBER, and are unique across all
+ * currently active real backends and prepared transactions.  If lock_held is
+ * set to true, TwoPhaseStateLock will not be taken, so the caller had better
+ * hold it.
  */
 ProcNumber
 TwoPhaseGetDummyProcNumber(TransactionId xid, bool lock_held)
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 37cdeda0c80..a31e8322ad6 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -30,7 +30,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/backend/access/transam/xlog.c
  *
@@ -97,6 +97,7 @@
 #include "utils/guc_hooks.h"
 #include "utils/guc_tables.h"
 #include "utils/injection_point.h"
+#include "utils/pgstat_internal.h"
 #include "utils/ps_status.h"
 #include "utils/relmapper.h"
 #include "utils/snapmgr.h"
@@ -108,7 +109,7 @@
 #include "utils/memutils.h"
 #endif
 
-extern int       bootstrap_database_mode;
+
 /* timeline ID to be used when bootstrapping */
 #define BootstrapTimeLineID		1
 
@@ -304,6 +305,11 @@ static bool doPageWrites;
  * so it's a plain spinlock.  The other locks are held longer (potentially
  * over I/O operations), so we use LWLocks for them.  These locks are:
  *
+ * WALBufMappingLock: must be held to replace a page in the WAL buffer cache.
+ * It is only held while initializing and changing the mapping.  If the
+ * contents of the buffer being replaced haven't been written yet, the mapping
+ * lock is released while the write is done, and reacquired afterwards.
+ *
  * WALWriteLock: must be held to write WAL buffers to disk (XLogWrite or
  * XLogFlush).
  *
@@ -470,37 +476,21 @@ typedef struct XLogCtlData
 	pg_atomic_uint64 logFlushResult;	/* last byte + 1 flushed */
 
 	/*
-	 * First initialized page in the cache (first byte position).
-	 */
-	XLogRecPtr	InitializedFrom;
-
-	/*
-	 * Latest reserved for initialization page in the cache (last byte
-	 * position + 1).
+	 * Latest initialized page in the cache (last byte position + 1).
 	 *
-	 * To change the identity of a buffer, you need to advance
-	 * InitializeReserved first.  To change the identity of a buffer that's
+	 * To change the identity of a buffer (and InitializedUpTo), you need to
+	 * hold WALBufMappingLock.  To change the identity of a buffer that's
 	 * still dirty, the old page needs to be written out first, and for that
 	 * you need WALWriteLock, and you need to ensure that there are no
 	 * in-progress insertions to the page by calling
 	 * WaitXLogInsertionsToFinish().
 	 */
-	pg_atomic_uint64 InitializeReserved;
-
-	/*
-	 * Latest initialized page in the cache (last byte position + 1).
-	 *
-	 * InitializedUpTo is updated after the buffer initialization.  After
-	 * update, waiters got notification using InitializedUpToCondVar.
-	 */
-	pg_atomic_uint64 InitializedUpTo;
-	ConditionVariable InitializedUpToCondVar;
+	XLogRecPtr	InitializedUpTo;
 
 	/*
 	 * These values do not change after startup, although the pointed-to pages
-	 * and xlblocks values certainly do.  xlblocks values are changed
-	 * lock-free according to the check for the xlog write position and are
-	 * accompanied by changes of InitializeReserved and InitializedUpTo.
+	 * and xlblocks values certainly do.  xlblocks values are protected by
+	 * WALBufMappingLock.
 	 */
 	char	   *pages;			/* buffers for unwritten XLOG pages */
 	pg_atomic_uint64 *xlblocks; /* 1st byte ptr-s + XLOG_BLCKSZ */
@@ -680,7 +670,6 @@ static XLogRecPtr CreateOverwriteContrecordRecord(XLogRecPtr aborted_lsn,
 												  TimeLineID newTLI);
 static void CheckPointGuts(XLogRecPtr checkPointRedo, int flags);
 static void KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo);
-static XLogRecPtr XLogGetReplicationSlotMinimumLSN(void);
 
 static void AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli,
 								  bool opportunistic);
@@ -823,9 +812,9 @@ XLogInsertRecord(XLogRecData *rdata,
 	 * fullPageWrites from changing until the insertion is finished.
 	 *
 	 * Step 2 can usually be done completely in parallel. If the required WAL
-	 * page is not initialized yet, you have to go through AdvanceXLInsertBuffer,
-	 * which will ensure it is initialized. But the WAL writer tries to do that
-	 * ahead of insertions to avoid that from happening in the critical path.
+	 * page is not initialized yet, you have to grab WALBufMappingLock to
+	 * initialize it, but the WAL writer tries to do that ahead of insertions
+	 * to avoid that from happening in the critical path.
 	 *
 	 *----------
 	 */
@@ -1094,6 +1083,9 @@ XLogInsertRecord(XLogRecData *rdata,
 		pgWalUsage.wal_bytes += rechdr->xl_tot_len;
 		pgWalUsage.wal_records++;
 		pgWalUsage.wal_fpi += num_fpi;
+
+		/* Required for the flush of pending stats WAL data */
+		pgstat_report_fixed = true;
 	}
 
 	return EndPos;
@@ -2004,79 +1996,32 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli, bool opportunistic)
 	XLogRecPtr	NewPageEndPtr = InvalidXLogRecPtr;
 	XLogRecPtr	NewPageBeginPtr;
 	XLogPageHeader NewPage;
-	XLogRecPtr	ReservedPtr;
 	int			npages pg_attribute_unused() = 0;
 
-	/*
-	 * We must run the loop below inside the critical section as we expect
-	 * XLogCtl->InitializedUpTo to eventually keep up.  The most of callers
-	 * already run inside the critical section. Except for WAL writer, which
-	 * passed 'opportunistic == true', and therefore we don't perform
-	 * operations that could error out.
-	 *
-	 * Start an explicit critical section anyway though.
-	 */
-	Assert(CritSectionCount > 0 || opportunistic);
-	START_CRIT_SECTION();
+	LWLockAcquire(WALBufMappingLock, LW_EXCLUSIVE);
 
-	/*--
-	 * Loop till we get all the pages in WAL buffer before 'upto' reserved for
-	 * initialization.  Multiple process can initialize different buffers with
-	 * this loop in parallel as following.
-	 *
-	 * 1. Reserve page for initialization using XLogCtl->InitializeReserved.
-	 * 2. Initialize the reserved page.
-	 * 3. Attempt to advance XLogCtl->InitializedUpTo,
+	/*
+	 * Now that we have the lock, check if someone initialized the page
+	 * already.
 	 */
-	ReservedPtr = pg_atomic_read_u64(&XLogCtl->InitializeReserved);
-	while (upto >= ReservedPtr || opportunistic)
+	while (upto >= XLogCtl->InitializedUpTo || opportunistic)
 	{
-		Assert(ReservedPtr % XLOG_BLCKSZ == 0);
+		nextidx = XLogRecPtrToBufIdx(XLogCtl->InitializedUpTo);
 
 		/*
-		 * Get ending-offset of the buffer page we need to replace.
-		 *
-		 * We don't lookup into xlblocks, but rather calculate position we
-		 * must wait to be written. If it was written, xlblocks will have this
-		 * position (or uninitialized)
+		 * Get ending-offset of the buffer page we need to replace (this may
+		 * be zero if the buffer hasn't been used yet).  Fall through if it's
+		 * already written out.
 		 */
-		if (ReservedPtr + XLOG_BLCKSZ > XLogCtl->InitializedFrom + XLOG_BLCKSZ * XLOGbuffers)
-			OldPageRqstPtr = ReservedPtr + XLOG_BLCKSZ - (XLogRecPtr) XLOG_BLCKSZ * XLOGbuffers;
-		else
-			OldPageRqstPtr = InvalidXLogRecPtr;
-
-		if (LogwrtResult.Write < OldPageRqstPtr && opportunistic)
+		OldPageRqstPtr = pg_atomic_read_u64(&XLogCtl->xlblocks[nextidx]);
+		if (LogwrtResult.Write < OldPageRqstPtr)
 		{
 			/*
-			 * If we just want to pre-initialize as much as we can without
-			 * flushing, give up now.
+			 * Nope, got work to do. If we just want to pre-initialize as much
+			 * as we can without flushing, give up now.
 			 */
-			upto = ReservedPtr - 1;
-			break;
-		}
-
-		/*
-		 * Attempt to reserve the page for initialization.  Failure means that
-		 * this page got reserved by another process.
-		 */
-		if (!pg_atomic_compare_exchange_u64(&XLogCtl->InitializeReserved,
-											&ReservedPtr,
-											ReservedPtr + XLOG_BLCKSZ))
-			continue;
-
-		/*
-		 * Wait till page gets correctly initialized up to OldPageRqstPtr.
-		 */
-		nextidx = XLogRecPtrToBufIdx(ReservedPtr);
-		while (pg_atomic_read_u64(&XLogCtl->InitializedUpTo) < OldPageRqstPtr)
-			ConditionVariableSleep(&XLogCtl->InitializedUpToCondVar, WAIT_EVENT_WAL_BUFFER_INIT);
-		ConditionVariableCancelSleep();
-		Assert(pg_atomic_read_u64(&XLogCtl->xlblocks[nextidx]) == OldPageRqstPtr);
-
-		/* Fall through if it's already written out. */
-		if (LogwrtResult.Write < OldPageRqstPtr)
-		{
-			/* Nope, got work to do. */
+			if (opportunistic)
+				break;
 
 			/* Advance shared memory write request position */
 			SpinLockAcquire(&XLogCtl->info_lck);
@@ -2091,6 +2036,14 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli, bool opportunistic)
 			RefreshXLogWriteResult(LogwrtResult);
 			if (LogwrtResult.Write < OldPageRqstPtr)
 			{
+				/*
+				 * Must acquire write lock. Release WALBufMappingLock first,
+				 * to make sure that all insertions that we need to wait for
+				 * can finish (up to this same position). Otherwise we risk
+				 * deadlock.
+				 */
+				LWLockRelease(WALBufMappingLock);
+
 				WaitXLogInsertionsToFinish(OldPageRqstPtr);
 
 				LWLockAcquire(WALWriteLock, LW_EXCLUSIVE);
@@ -2111,7 +2064,16 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli, bool opportunistic)
 					LWLockRelease(WALWriteLock);
 					pgWalUsage.wal_buffers_full++;
 					TRACE_POSTGRESQL_WAL_BUFFER_WRITE_DIRTY_DONE();
+
+					/*
+					 * Required for the flush of pending stats WAL data, per
+					 * update of pgWalUsage.
+					 */
+					pgstat_report_fixed = true;
 				}
+				/* Re-acquire WALBufMappingLock and retry */
+				LWLockAcquire(WALBufMappingLock, LW_EXCLUSIVE);
+				continue;
 			}
 		}
 
@@ -2119,9 +2081,11 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli, bool opportunistic)
 		 * Now the next buffer slot is free and we can set it up to be the
 		 * next output page.
 		 */
-		NewPageBeginPtr = ReservedPtr;
+		NewPageBeginPtr = XLogCtl->InitializedUpTo;
 		NewPageEndPtr = NewPageBeginPtr + XLOG_BLCKSZ;
 
+		Assert(XLogRecPtrToBufIdx(NewPageBeginPtr) == nextidx);
+
 		NewPage = (XLogPageHeader) (XLogCtl->pages + nextidx * (Size) XLOG_BLCKSZ);
 
 		/*
@@ -2185,100 +2149,12 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, TimeLineID tli, bool opportunistic)
 		 */
 		pg_write_barrier();
 
-		/*-----
-		 * Update the value of XLogCtl->xlblocks[nextidx] and try to advance
-		 * XLogCtl->InitializedUpTo in a lock-less manner.
-		 *
-		 * First, let's provide a formal proof of the algorithm.  Let it be 'n'
-		 * process with the following variables in shared memory:
-		 *	f - an array of 'n' boolean flags,
-		 *	v - atomic integer variable.
-		 *
-		 * Also, let
-		 *	i - a number of a process,
-		 *	j - local integer variable,
-		 * CAS(var, oldval, newval) - compare-and-swap atomic operation
-		 *							  returning true on success,
-		 * write_barrier()/read_barrier() - memory barriers.
-		 *
-		 * The pseudocode for each process is the following.
-		 *
-		 *	j := i
-		 *	f[i] := true
-		 *	write_barrier()
-		 *	while CAS(v, j, j + 1):
-		 *		j := j + 1
-		 *		read_barrier()
-		 *		if not f[j]:
-		 *			break
-		 *
-		 * Let's prove that v eventually reaches the value of n.
-		 * 1. Prove by contradiction.  Assume v doesn't reach n and stucks
-		 *	  on k, where k < n.
-		 * 2. Process k attempts CAS(v, k, k + 1).  1). If, as we assumed, v
-		 *	  gets stuck at k, then this CAS operation must fail.  Therefore,
-		 *    v < k when process k attempts CAS(v, k, k + 1).
-		 * 3. If, as we assumed, v gets stuck at k, then the value k of v
-		 *	  must be achieved by some process m, where m < k.  The process
-		 *	  m must observe f[k] == false.  Otherwise, it will later attempt
-		 *	  CAS(v, k, k + 1) with success.
-		 * 4. Therefore, corresponding read_barrier() (while j == k) on
-		 *	  process m reached before write_barrier() of process k.  But then
-		 *	  process k attempts CAS(v, k, k + 1) after process m successfully
-		 *	  incremented v to k, and that CAS operation must succeed.
-		 *	  That leads to a contradiction.  So, there is no such k (k < n)
-		 *    where v gets stuck.  Q.E.D.
-		 *
-		 * To apply this proof to the code below, we assume
-		 * XLogCtl->InitializedUpTo will play the role of v with XLOG_BLCKSZ
-		 * granularity.  We also assume setting XLogCtl->xlblocks[nextidx] to
-		 * NewPageEndPtr to play the role of setting f[i] to true.  Also, note
-		 * that processes can't concurrently map different xlog locations to
-		 * the same nextidx because we previously requested that
-		 * XLogCtl->InitializedUpTo >= OldPageRqstPtr.  So, a xlog buffer can
-		 * be taken for initialization only once the previous initialization
-		 * takes effect on XLogCtl->InitializedUpTo.
-		 */
-
 		pg_atomic_write_u64(&XLogCtl->xlblocks[nextidx], NewPageEndPtr);
-
-		pg_write_barrier();
-
-		while (pg_atomic_compare_exchange_u64(&XLogCtl->InitializedUpTo, &NewPageBeginPtr, NewPageEndPtr))
-		{
-			NewPageBeginPtr = NewPageEndPtr;
-			NewPageEndPtr = NewPageBeginPtr + XLOG_BLCKSZ;
-			nextidx = XLogRecPtrToBufIdx(NewPageBeginPtr);
-
-			pg_read_barrier();
-
-			if (pg_atomic_read_u64(&XLogCtl->xlblocks[nextidx]) != NewPageEndPtr)
-			{
-				/*
-				 * Page at nextidx wasn't initialized yet, so we can't move
-				 * InitializedUpto further. It will be moved by backend which
-				 * will initialize nextidx.
-				 */
-				ConditionVariableBroadcast(&XLogCtl->InitializedUpToCondVar);
-				break;
-			}
-		}
+		XLogCtl->InitializedUpTo = NewPageEndPtr;
 
 		npages++;
 	}
-
-	END_CRIT_SECTION();
-
-	/*
-	 * All the pages in WAL buffer before 'upto' were reserved for
-	 * initialization.  However, some pages might be reserved by concurrent
-	 * processes.  Wait till they finish initialization.
-	 */
-	while (upto >= pg_atomic_read_u64(&XLogCtl->InitializedUpTo))
-		ConditionVariableSleep(&XLogCtl->InitializedUpToCondVar, WAIT_EVENT_WAL_BUFFER_INIT);
-	ConditionVariableCancelSleep();
-
-	pg_read_barrier();
+	LWLockRelease(WALBufMappingLock);
 
 #ifdef WAL_DEBUG
 	if (XLOG_DEBUG && npages > 0)
@@ -2348,25 +2224,6 @@ check_wal_segment_size(int *newval, void **extra, GucSource source)
 	return true;
 }
 
-/*
- * GUC check_hook for max_slot_wal_keep_size
- *
- * We don't allow the value of max_slot_wal_keep_size other than -1 during the
- * binary upgrade. See start_postmaster() in pg_upgrade for more details.
- */
-bool
-check_max_slot_wal_keep_size(int *newval, void **extra, GucSource source)
-{
-	if (IsBinaryUpgrade && *newval != -1)
-	{
-		GUC_check_errdetail("\"%s\" must be set to -1 during binary upgrade mode.",
-							"max_slot_wal_keep_size");
-		return false;
-	}
-
-	return true;
-}
-
 /*
  * At a checkpoint, how many WAL segments to recycle as preallocated future
  * XLOG segments? Returns the highest segment that should be preallocated.
@@ -2820,7 +2677,7 @@ XLogSetReplicationSlotMinimumLSN(XLogRecPtr lsn)
  * Return the oldest LSN we must retain to satisfy the needs of some
  * replication slot.
  */
-static XLogRecPtr
+XLogRecPtr
 XLogGetReplicationSlotMinimumLSN(void)
 {
 	XLogRecPtr	retval;
@@ -5211,10 +5068,6 @@ XLOGShmemInit(void)
 	pg_atomic_init_u64(&XLogCtl->logWriteResult, InvalidXLogRecPtr);
 	pg_atomic_init_u64(&XLogCtl->logFlushResult, InvalidXLogRecPtr);
 	pg_atomic_init_u64(&XLogCtl->unloggedLSN, InvalidXLogRecPtr);
-
-	pg_atomic_init_u64(&XLogCtl->InitializeReserved, InvalidXLogRecPtr);
-	pg_atomic_init_u64(&XLogCtl->InitializedUpTo, InvalidXLogRecPtr);
-	ConditionVariableInit(&XLogCtl->InitializedUpToCondVar);
 }
 
 /*
@@ -5372,8 +5225,6 @@ BootStrapXLOG(uint32 data_checksum_version)
 	/* save database compatible level value */
 	ControlFile->dbmode = bootstrap_database_mode;
 	ControlFile->casemode = identifier_case_switch;
-	
-	
 
 	/* some additional ControlFile fields are set in WriteControlFile() */
 	WriteControlFile();
@@ -5571,7 +5422,7 @@ CleanupAfterArchiveRecovery(TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog,
 	}
 }
 
-/* IvorySQL: BEGIN - case sensitive indentify
+/* IvorySQL: BEGIN - case-sensitive indentifier support
  * Read database compatibility mode from pg_control file
  *
  */
@@ -5588,7 +5439,7 @@ int GetDatabaseStyleFromControl(char* path)
 	else
 		configdir = make_absolute_path(getenv("PGDATA"));
 
-	sprintf(pathname,"%s/%s",configdir,XLOG_CONTROL_FILE);
+	snprintf(pathname, sizeof(pathname), "%s/%s", configdir, XLOG_CONTROL_FILE);
 
 	fd = open(pathname, O_RDONLY | PG_BINARY, 0);
 
@@ -5630,7 +5481,7 @@ int GetCaseSwitchModeFromControl(char* path)
 	else
 		configdir = make_absolute_path(getenv("PGDATA"));
 
-	sprintf(pathname,"%s/%s",configdir,XLOG_CONTROL_FILE);
+	snprintf(pathname, sizeof(pathname), "%s/%s", configdir, XLOG_CONTROL_FILE);
 
 	fd = open(pathname, O_RDONLY | PG_BINARY, 0);
 
@@ -5665,7 +5516,7 @@ void SetCaseGucOption(char* path)
 
 	dbstyle = GetDatabaseStyleFromControl(path);
 
-	//the pg mode does not need to set
+	/* PG mode leaves identifier_case_switch unchanged. */
 	if (DB_ORACLE == dbstyle)
 	{
 		int casemode;
@@ -5691,6 +5542,7 @@ void SetCaseGucOption(char* path)
 					(errmsg("Incorrect case conversion mode value \"%d\"", casemode)));
 	}
 }
+/* IvorySQL: END - case-sensitive identifier support */
 
 /*
  * Check to see if required parameters are set high enough on this server
@@ -6361,8 +6213,7 @@ StartupXLOG(void)
 		memset(page + len, 0, XLOG_BLCKSZ - len);
 
 		pg_atomic_write_u64(&XLogCtl->xlblocks[firstIdx], endOfRecoveryInfo->lastPageBeginPtr + XLOG_BLCKSZ);
-		pg_atomic_write_u64(&XLogCtl->InitializedUpTo, endOfRecoveryInfo->lastPageBeginPtr + XLOG_BLCKSZ);
-		XLogCtl->InitializedFrom = endOfRecoveryInfo->lastPageBeginPtr;
+		XLogCtl->InitializedUpTo = endOfRecoveryInfo->lastPageBeginPtr + XLOG_BLCKSZ;
 	}
 	else
 	{
@@ -6371,10 +6222,8 @@ StartupXLOG(void)
 		 * let the first attempt to insert a log record to initialize the next
 		 * buffer.
 		 */
-		pg_atomic_write_u64(&XLogCtl->InitializedUpTo, EndOfLog);
-		XLogCtl->InitializedFrom = EndOfLog;
+		XLogCtl->InitializedUpTo = EndOfLog;
 	}
-	pg_atomic_write_u64(&XLogCtl->InitializeReserved, pg_atomic_read_u64(&XLogCtl->InitializedUpTo));
 
 	/*
 	 * Update local and shared status.  This is OK to do without any locks
@@ -7632,9 +7481,7 @@ CreateCheckPoint(int flags)
 	if (PriorRedoPtr != InvalidXLogRecPtr)
 		UpdateCheckPointDistanceEstimate(RedoRecPtr - PriorRedoPtr);
 
-#ifdef USE_INJECTION_POINTS
 	INJECTION_POINT("checkpoint-before-old-wal-removal", NULL);
-#endif
 
 	/*
 	 * Delete old log files, those no longer needed for last checkpoint to
@@ -8097,6 +7944,9 @@ CreateRestartPoint(int flags)
 	replayPtr = GetXLogReplayRecPtr(&replayTLI);
 	endptr = (receivePtr < replayPtr) ? replayPtr : receivePtr;
 	KeepLogSeg(endptr, &_logSegNo);
+
+	INJECTION_POINT("restartpoint-before-slot-invalidation", NULL);
+
 	if (InvalidateObsoleteReplicationSlots(RS_INVAL_WAL_REMOVED | RS_INVAL_IDLE_TIMEOUT,
 										   _logSegNo, InvalidOid,
 										   InvalidTransactionId))
@@ -8285,17 +8135,19 @@ KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo)
 	XLByteToSeg(recptr, currSegNo, wal_segment_size);
 	segno = currSegNo;
 
-	/*
-	 * Calculate how many segments are kept by slots first, adjusting for
-	 * max_slot_wal_keep_size.
-	 */
+	/* Calculate how many segments are kept by slots. */
 	keep = XLogGetReplicationSlotMinimumLSN();
 	if (keep != InvalidXLogRecPtr && keep < recptr)
 	{
 		XLByteToSeg(keep, segno, wal_segment_size);
 
-		/* Cap by max_slot_wal_keep_size ... */
-		if (max_slot_wal_keep_size_mb >= 0)
+		/*
+		 * Account for max_slot_wal_keep_size to avoid keeping more than
+		 * configured.  However, don't do that during a binary upgrade: if
+		 * slots were to be invalidated because of this, it would not be
+		 * possible to preserve logical ones during the upgrade.
+		 */
+		if (max_slot_wal_keep_size_mb >= 0 && !IsBinaryUpgrade)
 		{
 			uint64		slot_keep_segs;
 
@@ -8684,6 +8536,14 @@ xlog_redo(XLogReaderState *record)
 							checkPoint.ThisTimeLineID, replayTLI)));
 
 		RecoveryRestartPoint(&checkPoint, record);
+
+		/*
+		 * After replaying a checkpoint record, free all smgr objects.
+		 * Otherwise we would never do so for dropped relations, as the
+		 * startup does not process shared invalidation messages or call
+		 * AtEOXact_SMgr().
+		 */
+		smgrdestroyall();
 	}
 	else if (info == XLOG_CHECKPOINT_ONLINE)
 	{
@@ -8742,6 +8602,14 @@ xlog_redo(XLogReaderState *record)
 							checkPoint.ThisTimeLineID, replayTLI)));
 
 		RecoveryRestartPoint(&checkPoint, record);
+
+		/*
+		 * After replaying a checkpoint record, free all smgr objects.
+		 * Otherwise we would never do so for dropped relations, as the
+		 * startup does not process shared invalidation messages or call
+		 * AtEOXact_SMgr().
+		 */
+		smgrdestroyall();
 	}
 	else if (info == XLOG_OVERWRITE_CONTRECORD)
 	{
@@ -9759,6 +9627,22 @@ GetXLogInsertRecPtr(void)
 	return XLogBytePosToRecPtr(current_bytepos);
 }
 
+/*
+ * Get latest WAL record end pointer
+ */
+XLogRecPtr
+GetXLogInsertEndRecPtr(void)
+{
+	XLogCtlInsert *Insert = &XLogCtl->Insert;
+	uint64		current_bytepos;
+
+	SpinLockAcquire(&Insert->insertpos_lck);
+	current_bytepos = Insert->CurrBytePos;
+	SpinLockRelease(&Insert->insertpos_lck);
+
+	return XLogBytePosToEndRecPtr(current_bytepos);
+}
+
 /*
  * Get latest WAL write pointer
  */
@@ -9788,10 +9672,7 @@ void
 XLogShutdownWalRcv(void)
 {
 	ShutdownWalRcv();
-
-	LWLockAcquire(ControlFileLock, LW_EXCLUSIVE);
-	XLogCtl->InstallXLogFileSegmentActive = false;
-	LWLockRelease(ControlFileLock);
+	ResetInstallXLogFileSegmentActive();
 }
 
 /* Enable WAL file recycling and preallocation. */
@@ -9803,6 +9684,15 @@ SetInstallXLogFileSegmentActive(void)
 	LWLockRelease(ControlFileLock);
 }
 
+/* Disable WAL file recycling and preallocation. */
+void
+ResetInstallXLogFileSegmentActive(void)
+{
+	LWLockAcquire(ControlFileLock, LW_EXCLUSIVE);
+	XLogCtl->InstallXLogFileSegmentActive = false;
+	LWLockRelease(ControlFileLock);
+}
+
 bool
 IsInstallXLogFileSegmentActive(void)
 {
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index cb0eac592e5..5b3f55c0d8d 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -723,11 +723,12 @@ XLogDecodeNextRecord(XLogReaderState *state, bool nonblocking)
 			/* Calculate pointer to beginning of next page */
 			targetPagePtr += XLOG_BLCKSZ;
 
-			/* Wait for the next page to become available */
-			readOff = ReadPageInternal(state, targetPagePtr,
-									   Min(total_len - gotlen + SizeOfXLogShortPHD,
-										   XLOG_BLCKSZ));
-
+			/*
+			 * Read the page header before processing the record data, so we
+			 * can handle the case where the previous record ended as being a
+			 * partial one.
+			 */
+			readOff = ReadPageInternal(state, targetPagePtr, SizeOfXLogShortPHD);
 			if (readOff == XLREAD_WOULDBLOCK)
 				return XLREAD_WOULDBLOCK;
 			else if (readOff < 0)
@@ -776,6 +777,15 @@ XLogDecodeNextRecord(XLogReaderState *state, bool nonblocking)
 				goto err;
 			}
 
+			/* Wait for the next page to become available */
+			readOff = ReadPageInternal(state, targetPagePtr,
+									   Min(total_len - gotlen + SizeOfXLogShortPHD,
+										   XLOG_BLCKSZ));
+			if (readOff == XLREAD_WOULDBLOCK)
+				return XLREAD_WOULDBLOCK;
+			else if (readOff < 0)
+				goto err;
+
 			/* Append the continuation from this page to the buffer */
 			pageHeaderSize = XLogPageHeaderSize(pageHeader);
 
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 6daf89159a9..226b42893b8 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -45,6 +45,7 @@
 #include "commands/tablespace.h"
 #include "common/file_utils.h"
 #include "miscadmin.h"
+#include "nodes/miscnodes.h"
 #include "pgstat.h"
 #include "postmaster/bgwriter.h"
 #include "postmaster/startup.h"
@@ -803,6 +804,16 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr,
 		}
 		memcpy(&checkPoint, XLogRecGetData(xlogreader), sizeof(CheckPoint));
 		wasShutdown = ((record->xl_info & ~XLR_INFO_MASK) == XLOG_CHECKPOINT_SHUTDOWN);
+
+		/* Make sure that REDO location exists. */
+		if (checkPoint.redo < CheckPointLoc)
+		{
+			XLogPrefetcherBeginRead(xlogprefetcher, checkPoint.redo);
+			if (!ReadRecord(xlogprefetcher, LOG, false, checkPoint.ThisTimeLineID))
+				ereport(PANIC,
+						errmsg("could not find redo location %X/%08X referenced by checkpoint record at %X/%08X",
+							   LSN_FORMAT_ARGS(checkPoint.redo), LSN_FORMAT_ARGS(CheckPointLoc)));
+		}
 	}
 
 	if (ArchiveRecoveryRequested)
@@ -3685,8 +3696,19 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 					 * Before we leave XLOG_FROM_STREAM state, make sure that
 					 * walreceiver is not active, so that it won't overwrite
 					 * WAL that we restore from archive.
+					 *
+					 * If walreceiver is actively streaming (or attempting to
+					 * connect), we must shut it down. However, if it's
+					 * already in WAITING state (e.g., due to timeline
+					 * divergence), we only need to reset the install flag to
+					 * allow archive restoration.
 					 */
-					XLogShutdownWalRcv();
+					if (WalRcvStreaming())
+						XLogShutdownWalRcv();
+					else
+					{
+						ResetInstallXLogFileSegmentActive();
+					}
 
 					/*
 					 * Before we sleep, re-scan for possible new timelines if
@@ -4759,9 +4781,20 @@ RecoveryRequiresIntParameter(const char *param_name, int currValue, int minValue
 bool
 check_primary_slot_name(char **newval, void **extra, GucSource source)
 {
+	int			err_code;
+	char	   *err_msg = NULL;
+	char	   *err_hint = NULL;
+
 	if (*newval && strcmp(*newval, "") != 0 &&
-		!ReplicationSlotValidateName(*newval, WARNING))
+		!ReplicationSlotValidateNameInternal(*newval, &err_code, &err_msg,
+											 &err_hint))
+	{
+		GUC_check_errcode(err_code);
+		GUC_check_errdetail("%s", err_msg);
+		if (err_hint != NULL)
+			GUC_check_errhint("%s", err_hint);
 		return false;
+	}
 
 	return true;
 }
diff --git a/src/backend/access/transam/xlogstats.c b/src/backend/access/transam/xlogstats.c
index f92d9e13b17..85963a6ac29 100644
--- a/src/backend/access/transam/xlogstats.c
+++ b/src/backend/access/transam/xlogstats.c
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * xlogstats.c
- *		Functions for WAL Statitstics
+ *		Functions for WAL Statistics
  *
  * Copyright (c) 2022-2025, PostgreSQL Global Development Group
  *
diff --git a/src/backend/backup/backup_manifest.c b/src/backend/backup/backup_manifest.c
index 22e2be37c95..f40e775bf18 100644
--- a/src/backend/backup/backup_manifest.c
+++ b/src/backend/backup/backup_manifest.c
@@ -253,7 +253,7 @@ AddWALInfoToBackupManifest(backup_manifest_info *manifest, XLogRecPtr startptr,
 		if (first_wal_range && endtli != entry->tli)
 			ereport(ERROR,
 					errmsg("expected end timeline %u but found timeline %u",
-						   starttli, entry->tli));
+						   endtli, entry->tli));
 
 		/*
 		 * If this timeline entry matches with the timeline on which the
diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c
index 28491b1e0ab..0fc4042693f 100644
--- a/src/backend/backup/basebackup_incremental.c
+++ b/src/backend/backup/basebackup_incremental.c
@@ -850,8 +850,22 @@ GetFileBackupMethod(IncrementalBackupInfo *ib, const char *path,
 	{
 		unsigned	relative_limit = limit_block - segno * RELSEG_SIZE;
 
+		/*
+		 * We can't set a truncation_block_length in excess of the limit block
+		 * number (relativized to the current segment). To do so would be to
+		 * treat blocks from older backups as valid current contents even if
+		 * they were subsequently truncated away.
+		 */
 		if (*truncation_block_length < relative_limit)
 			*truncation_block_length = relative_limit;
+
+		/*
+		 * We also can't set a truncation_block_length in excess of the
+		 * segment size, since the reconstructed file can't be larger than
+		 * that.
+		 */
+		if (*truncation_block_length > RELSEG_SIZE)
+			*truncation_block_length = RELSEG_SIZE;
 	}
 
 	/* Send it incrementally. */
diff --git a/src/backend/backup/walsummary.c b/src/backend/backup/walsummary.c
index c7a2c65cc6a..5e37ee47801 100644
--- a/src/backend/backup/walsummary.c
+++ b/src/backend/backup/walsummary.c
@@ -214,7 +214,7 @@ OpenWalSummaryFile(WalSummaryFile *ws, bool missing_ok)
 			 LSN_FORMAT_ARGS(ws->end_lsn));
 
 	file = PathNameOpenFile(path, O_RDONLY);
-	if (file < 0 && (errno != EEXIST || !missing_ok))
+	if (file < 0 && (errno != ENOENT || !missing_ok))
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("could not open file \"%s\": %m", path)));
@@ -251,7 +251,7 @@ RemoveWalSummaryIfOlderThan(WalSummaryFile *ws, time_t cutoff_time)
 	if (unlink(path) != 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
-				 errmsg("could not stat file \"%s\": %m", path)));
+				 errmsg("could not remove file \"%s\": %m", path)));
 	ereport(DEBUG2,
 			(errmsg_internal("removing file \"%s\"", path)));
 }
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 80ded6a612a..bbf57db41a3 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/bootstrap/bootstrap.c
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index 772578d1923..f33f3dae8ab 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -6,7 +6,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/backend/catalog/Catalog.pm
 #
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index a924711cefa..b6c64df2392 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/backend/catalog/Makefile
 #
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 29f68b8a7bb..4e15e51223d 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -677,6 +677,20 @@ ExecGrantStmt_oids(InternalGrant *istmt)
  * objectNamesToOids
  *
  * Turn a list of object names of a given type into an Oid list.
+ *
+ * XXX This function intentionally takes only an AccessShareLock.  In the face
+ * of concurrent DDL, we might easily latch onto an old version of an object,
+ * causing the GRANT or REVOKE statement to fail.  But it does prevent the
+ * object from disappearing altogether.  To do better, we would need to use a
+ * self-exclusive lock, perhaps ShareUpdateExclusiveLock, here and before
+ * *every* CatalogTupleUpdate() of a row that GRANT/REVOKE can affect.
+ * Besides that additional work, this could have operational costs.  For
+ * example, it would make GRANT ALL TABLES IN SCHEMA terminate every
+ * autovacuum running in the schema and consume a shared lock table entry per
+ * table in the schema.  The user-visible benefit of that additional work is
+ * just changing "ERROR: tuple concurrently updated" to blocking.  That's not
+ * nothing, but it might not outweigh autovacuum termination and lock table
+ * consumption spikes.
  */
 static List *
 objectNamesToOids(ObjectType objtype, List *objnames, bool is_grant)
@@ -1267,7 +1281,8 @@ SetDefaultACL(InternalDefaultACL *iacls)
 			if (OidIsValid(iacls->nspid))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_GRANT_OPERATION),
-						 errmsg("cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS")));
+						 errmsg("cannot use IN SCHEMA clause when using %s",
+								"GRANT/REVOKE ON SCHEMAS")));
 			objtype = DEFACLOBJ_NAMESPACE;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_SCHEMA;
@@ -1277,7 +1292,8 @@ SetDefaultACL(InternalDefaultACL *iacls)
 			if (OidIsValid(iacls->nspid))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_GRANT_OPERATION),
-						 errmsg("cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS")));
+						 errmsg("cannot use IN SCHEMA clause when using %s",
+								"GRANT/REVOKE ON LARGE OBJECTS")));
 			objtype = DEFACLOBJ_LARGEOBJECT;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_LARGEOBJECT;
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 48b18a688a0..d6b3156e647 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/catalog/dependency.c
@@ -165,7 +165,7 @@ static void reportDependentObjects(const ObjectAddresses *targetObjects,
 								   DropBehavior behavior,
 								   int flags,
 								   const ObjectAddress *origObject,
-								   bool	*refinddepobjects);
+								   bool *refinddepobjects);
 static void deleteOneObject(const ObjectAddress *object,
 							Relation *depRel, int32 flags);
 static void doDeletion(const ObjectAddress *object, int flags);
@@ -287,7 +287,7 @@ performDeletion(const ObjectAddress *object,
 {
 	Relation	depRel;
 	ObjectAddresses *targetObjects;
-	bool	need_refinddepobj = false;
+	bool		need_refinddepobj = false;
 
 	/*
 	 * We save some cycles by opening pg_depend just once and passing the
@@ -363,7 +363,7 @@ performMultipleDeletions(const ObjectAddresses *objects,
 	Relation	depRel;
 	ObjectAddresses *targetObjects;
 	int			i;
-	bool	need_refinddepobj = false;
+	bool		need_refinddepobj = false;
 
 	/* No work if no objects... */
 	if (objects->numrefs <= 0)
@@ -427,7 +427,9 @@ performMultipleDeletions(const ObjectAddresses *objects,
 			const ObjectAddress *thisobj = objects->refs + i;
 
 			/*
-			 * Obtain a deletion lock for every target object.  (Preferably, this should have been handled by the caller, but in reality, many callers neglect to do so.)
+			 * Obtain a deletion lock for every target object.  (Preferably,
+			 * this should have been handled by the caller, but in reality,
+			 * many callers neglect to do so.)
 			 */
 			AcquireDeletionLock(thisobj, flags);
 
@@ -504,7 +506,7 @@ findDependentObjects(const ObjectAddress *object,
 	int			maxDependentObjects;
 	ObjectAddressStack mystack;
 	ObjectAddressExtra extra;
-	ObjectFunOrPkg		*dependentFuncPkgOids;
+	ObjectFunOrPkg *dependentFuncPkgOids;
 	int			numDependentFuncPkgOids;
 	int			maxDependentFuncPkgOids;
 
@@ -968,7 +970,7 @@ findDependentObjects(const ObjectAddress *object,
 		if (foundDep->deptype == DEPENDENCY_TYPE &&
 			(object->classId == RelationRelationId ||
 			 object->classId == PackageRelationId ||
-			 object->classId == PackageBodyRelationId ))
+			 object->classId == PackageBodyRelationId))
 		{
 			if (foundDep->classid == 0)
 				continue;
@@ -1106,17 +1108,17 @@ findDependentObjects(const ObjectAddress *object,
 		pg_qsort(dependentFuncPkgOids, numDependentFuncPkgOids,
 				 sizeof(ObjectFunOrPkg), object_funpkgoid_comparator);
 
-		numDependentFuncPkgOids = qunique((void *)dependentFuncPkgOids, numDependentFuncPkgOids,
-							sizeof(ObjectFunOrPkg), object_funpkgoid_comparator);
+		numDependentFuncPkgOids = qunique((void *) dependentFuncPkgOids, numDependentFuncPkgOids,
+										  sizeof(ObjectFunOrPkg), object_funpkgoid_comparator);
 	}
 
 	/*
-	 * Find out the dependent funciton which uses %TYPE or %ROWTYPE
-	 * in parameters datatype or return datatype.
+	 * Find out the dependent funciton which uses %TYPE or %ROWTYPE in
+	 * parameters datatype or return datatype.
 	 */
 	for (int i = 0; i < numDependentFuncPkgOids; i++)
 	{
-		Oid objectId = dependentFuncPkgOids[i].objectId;
+		Oid			objectId = dependentFuncPkgOids[i].objectId;
 
 		switch (dependentFuncPkgOids[i].flags)
 		{
@@ -1150,7 +1152,7 @@ findDependentObjects(const ObjectAddress *object,
 				{
 					PackageCacheKey pkey;
 					PackageCacheItem *item;
-					HeapTuple pkgbodyTup;
+					HeapTuple	pkgbodyTup;
 					Form_pg_package_body pkgbodyStruct;
 
 					/*
@@ -1269,7 +1271,7 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
 	if (ORA_PARSER == compatible_db && behavior == DROP_RESTRICT)
 	{
 		/* Check if all dependencies that require CASCADE are views */
-		bool	all_cascade_dep_is_view = true;
+		bool		all_cascade_dep_is_view = true;
 		ObjectAddresses *viewObjects;
 
 		viewObjects = new_object_addresses();
@@ -1295,8 +1297,9 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
 				continue;
 
 			/*
-			 * If the object was found via an automatic, internal, partition, or extension dependency,
-			 * it is permitted to be removed even with RESTRICT.
+			 * If the object was found via an automatic, internal, partition,
+			 * or extension dependency, it is permitted to be removed even
+			 * with RESTRICT.
 			 */
 			if (extra->flags & (DEPFLAG_AUTO |
 								DEPFLAG_INTERNAL |
@@ -1317,7 +1320,10 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
 			}
 			else
 			{
-				/* If any dependent object is not a view, set flag and exit loop */
+				/*
+				 * If any dependent object is not a view, set flag and exit
+				 * loop
+				 */
 				if (get_rel_relkind(obj->objectId) != RELKIND_VIEW)
 				{
 					all_cascade_dep_is_view = false;
@@ -1330,7 +1336,10 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
 			pfree(objDesc);
 		}
 
-		/* If all dependencies are views, mark them as invalid and trigger a recheck */
+		/*
+		 * If all dependencies are views, mark them as invalid and trigger a
+		 * recheck
+		 */
 		if (all_cascade_dep_is_view && viewObjects->numrefs > 0)
 		{
 			for (i = viewObjects->numrefs - 1; i >= 0; i--)
@@ -1339,7 +1348,8 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
 			}
 
 			/*
-			 * After invalidating views, re-evaluate dependencies to ensure consistency.
+			 * After invalidating views, re-evaluate dependencies to ensure
+			 * consistency.
 			 */
 			if (refinddepobj)
 				*refinddepobj = true;
@@ -1709,7 +1719,7 @@ doDeletion(const ObjectAddress *object, int flags)
 					DeleteSequenceTuple(object->objectId);
 
 				if (ORA_PARSER == compatible_db && relKind == RELKIND_VIEW)
-					  DeleteForceView(object->objectId);
+					DeleteForceView(object->objectId);
 
 				break;
 			}
@@ -1851,7 +1861,7 @@ AcquireDeletionLock(const ObjectAddress *object, int flags)
 						 AccessExclusiveLock);
 	else
 	{
-		/* assume we should lock the whole object not a sub-object */
+		/* Assume we lock the whole object, not a sub-object */
 		LockDatabaseObject(object->classId, object->objectId, 0,
 						   AccessExclusiveLock);
 	}
@@ -1868,7 +1878,7 @@ ReleaseDeletionLock(const ObjectAddress *object)
 	if (object->classId == RelationRelationId)
 		UnlockRelationOid(object->objectId, AccessExclusiveLock);
 	else
-		/* assume we should lock the whole object not a sub-object */
+		/* Assume we lock the whole object, not a sub-object */
 		UnlockDatabaseObject(object->classId, object->objectId, 0,
 							 AccessExclusiveLock);
 }
@@ -2211,21 +2221,21 @@ find_expr_references_walker(Node *node,
 
 		if (FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 			add_object_address(ProcedureRelationId, funcexpr->funcid, 0,
-						   context->addrs);
+							   context->addrs);
 		else
 		{
 			Oid			funcoid = InvalidOid;
-			bool is_package = false;
+			bool		is_package = false;
 
 			funcoid = get_top_function_info(funcexpr, &is_package);
 			if (OidIsValid(funcoid))
 			{
 				if (is_package)
 					add_object_address(PackageRelationId, funcoid, 0,
-							context->addrs);
+									   context->addrs);
 				else
 					add_object_address(ProcedureRelationId, funcoid, 0,
-						   context->addrs);
+									   context->addrs);
 			}
 		}
 
@@ -2857,8 +2867,8 @@ object_address_comparator(const void *a, const void *b)
 int
 object_funpkgoid_comparator(const void *a, const void *b)
 {
-	const ObjectFunOrPkg *obja = (const ObjectFunOrPkg *) a;
-	const ObjectFunOrPkg *objb = (const ObjectFunOrPkg *) b;
+	const		ObjectFunOrPkg *obja = (const ObjectFunOrPkg *) a;
+	const		ObjectFunOrPkg *objb = (const ObjectFunOrPkg *) b;
 
 	if (obja->objectId > objb->objectId)
 		return -1;
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 7d2c7a4be11..216e44dd0a9 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -8,7 +8,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/backend/catalog/genbki.pl
 #
@@ -1118,10 +1118,27 @@ sub lookup_oids
 			push @lookupoids, $lookupname;
 			if ($lookupname eq '-' or $lookupname eq '0')
 			{
-				warn sprintf
-				  "invalid zero OID reference in %s.dat field %s line %s\n",
-				  $catname, $attname, $bki_values->{line_number}
-				  if !$lookup_opt;
+				if (defined($bki_values->{type_name}) 
+				and $bki_values->{type_name} ne 'oracharchar' 
+				and $bki_values->{type_name} ne 'oracharbyte' 
+				and $bki_values->{type_name} ne 'oravarcharchar' 
+				and $bki_values->{type_name} ne 'oravarcharbyte' 
+				and $bki_values->{type_name} ne 'oradate' 
+				and $bki_values->{type_name} ne 'oratimestamp' 
+				and $bki_values->{type_name} ne 'oratimestamptz' 
+				and $bki_values->{type_name} ne 'oratimestampltz' 
+				and $bki_values->{type_name} ne 'yminterval' 
+				and $bki_values->{type_name} ne 'dsinterval' 
+				and $bki_values->{type_name} ne 'number' 
+				and $bki_values->{type_name} ne 'binary_float' 
+				and $bki_values->{type_name} ne 'binary_double' 
+				)
+				{
+					warn sprintf
+				  	  "invalid zero OID reference in %s.dat field %s line %s\n",
+				  	  $catname, $attname, $bki_values->{line_number}
+				  	  if !$lookup_opt;
+				}
 			}
 			else
 			{
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 17639744130..b6b5a2d6f47 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -228,7 +228,9 @@ static const FormData_pg_attribute a6 = {
 };
 
 /*
- * Compatible Oracle ROWID pseudo column.
+ * Oracle-compatible ROWID pseudo-column.
+ * This system column provides a unique identifier for each row,
+ * compatible with Oracle's ROWID functionality.
  */
 static const FormData_pg_attribute a7 = {
    .attname = {"rowid"},
@@ -525,11 +527,15 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
 	 */
 	for (i = 0; i < natts; i++)
 	{
-		CheckAttributeType(NameStr(TupleDescAttr(tupdesc, i)->attname),
-						   TupleDescAttr(tupdesc, i)->atttypid,
-						   TupleDescAttr(tupdesc, i)->attcollation,
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+		if (attr->attisdropped)
+			continue;
+		CheckAttributeType(NameStr(attr->attname),
+						   attr->atttypid,
+						   attr->attcollation,
 						   NIL, /* assume we're creating a new rowtype */
-						   flags | (TupleDescAttr(tupdesc, i)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL ? CHKATYPE_IS_VIRTUAL : 0));
+						   flags | (attr->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL ? CHKATYPE_IS_VIRTUAL : 0));
 	}
 }
 
@@ -675,6 +681,16 @@ CheckAttributeType(const char *attname,
 						   containing_rowtypes,
 						   flags);
 	}
+	else if (att_typtype == TYPTYPE_MULTIRANGE)
+	{
+		/*
+		 * If it's a multirange, recurse to check its plain range type.
+		 */
+		CheckAttributeType(attname, get_multirange_range(atttypid),
+						   InvalidOid,	/* range types are not collatable */
+						   containing_rowtypes,
+						   flags);
+	}
 	else if (OidIsValid((att_typelem = get_element_type(atttypid))))
 	{
 		/*
@@ -2675,6 +2691,7 @@ AddRelationNewConstraints(Relation rel,
 			 * requested validity.
 			 */
 			if (AdjustNotNullInheritance(RelationGetRelid(rel), colnum,
+										 cdef->conname,
 										 is_local, cdef->is_no_inherit,
 										 cdef->skip_validation))
 				continue;
@@ -2925,14 +2942,16 @@ MergeWithExistingConstraint(Relation rel, const char *ccname, Node *expr,
  * for each column, giving priority to user-specified ones, and setting
  * inhcount according to how many parents cause each column to get a
  * not-null constraint.  If a user-specified name clashes with another
- * user-specified name, an error is raised.
+ * user-specified name, an error is raised.  'existing_constraints'
+ * is a list of already defined constraint names, which should be avoided
+ * when generating further ones.
  *
  * Returns a list of AttrNumber for columns that need to have the attnotnull
  * flag set.
  */
 List *
 AddRelationNotNullConstraints(Relation rel, List *constraints,
-							  List *old_notnulls)
+							  List *old_notnulls, List *existing_constraints)
 {
 	List	   *givennames;
 	List	   *nnnames;
@@ -2944,7 +2963,7 @@ AddRelationNotNullConstraints(Relation rel, List *constraints,
 	 * because we must raise error for user-generated name conflicts, but for
 	 * system-generated name conflicts we just generate another.
 	 */
-	nnnames = NIL;
+	nnnames = list_copy(existing_constraints);	/* don't scribble on input */
 	givennames = NIL;
 
 	/*
diff --git a/src/backend/catalog/meson.build b/src/backend/catalog/meson.build
index 2b0dc58677b..7519263ab2f 100644
--- a/src/backend/catalog/meson.build
+++ b/src/backend/catalog/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_sources += files(
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index e50329ca4e6..ffbe4ad0127 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -11,7 +11,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/catalog/namespace.c
@@ -2928,6 +2928,9 @@ StatisticsObjIsVisibleExt(Oid stxid, bool *is_missing)
 		{
 			Oid			namespaceId = lfirst_oid(l);
 
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
 			if (namespaceId == stxnamespace)
 			{
 				/* Found it first in path */
@@ -4420,7 +4423,8 @@ preprocessNamespacePath(const char *searchPath, Oid roleid,
 		char	   *curname = (char *) lfirst(l);
 		Oid			namespaceId;
 
-		if ((compatible_db == ORA_PARSER && enable_case_switch && identifier_case_switch != NORMAL) ?	/* IvorySQL: case sensitive indentify */
+		if ((compatible_db == ORA_PARSER && enable_case_switch && 
+		         identifier_case_switch != NORMAL) ?	/* IvorySQL: case-sensitive indentifier support */
 			pg_strcasecmp(curname, "$user") == 0 : strcmp(curname, "$user") == 0)
 		{
 			/* $user --- substitute namespace matching user name, if any */
@@ -5433,4 +5437,3 @@ get_nodefvalargposition(HeapTuple proctup, int pronargs)
 	}
 	return nodefvalargposition;
 }
-
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 3e9beaa422c..05829b6c4a0 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index bf7664ff684..7111ed14cc3 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 490037e5bfb..1938b659bd1 100644
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -731,14 +731,15 @@ extractNotNullColumn(HeapTuple constrTup)
  * If a constraint exists but the connoinherit flag is not what the caller
  * wants, throw an error about the incompatibility.  If the desired
  * constraint is valid but the existing constraint is not valid, also
- * throw an error about that (the opposite case is acceptable).
+ * throw an error about that (the opposite case is acceptable).  If
+ * the proposed constraint has a different name, also throw an error.
  *
  * If everything checks out, we adjust conislocal/coninhcount and return
  * true.  If is_local is true we flip conislocal true, or do nothing if
  * it's already true; otherwise we increment coninhcount by 1.
  */
 bool
-AdjustNotNullInheritance(Oid relid, AttrNumber attnum,
+AdjustNotNullInheritance(Oid relid, AttrNumber attnum, const char *new_conname,
 						 bool is_local, bool is_no_inherit, bool is_notvalid)
 {
 	HeapTuple	tup;
@@ -777,6 +778,22 @@ AdjustNotNullInheritance(Oid relid, AttrNumber attnum,
 					errhint("You might need to validate it using %s.",
 							"ALTER TABLE ... VALIDATE CONSTRAINT"));
 
+		/*
+		 * If, for a new constraint that is being defined locally (i.e., not
+		 * being passed down via inheritance), a name was specified, then
+		 * verify that the existing constraint has the same name.  Otherwise
+		 * throw an error.  Names of inherited constraints are ignored because
+		 * they are not directly user-specified, so matching is not important.
+		 */
+		if (is_local && new_conname &&
+			strcmp(new_conname, NameStr(conform->conname)) != 0)
+			ereport(ERROR,
+					errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					errmsg("cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\"",
+						   new_conname, get_attname(relid, attnum, false), get_rel_name(relid)),
+					errdetail("A not-null constraint named \"%s\" already exists for this column.",
+							  NameStr(conform->conname)));
+
 		if (!is_local)
 		{
 			if (pg_add_s16_overflow(conform->coninhcount, 1,
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index c8b11f887e2..70635d9f81a 100644
--- a/src/backend/catalog/pg_depend.c
+++ b/src/backend/catalog/pg_depend.c
@@ -23,12 +23,14 @@
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_extension.h"
+#include "catalog/pg_type.h"
 #include "catalog/partition.h"
 #include "commands/extension.h"
 #include "miscadmin.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
+#include "utils/syscache.h"
 
 
 static bool isObjectPinned(const ObjectAddress *object);
@@ -813,6 +815,77 @@ getAutoExtensionsOfObject(Oid classId, Oid objectId)
 	return result;
 }
 
+/*
+ * Look up a type belonging to an extension.
+ *
+ * Returns the type's OID, or InvalidOid if not found.
+ *
+ * Notice that the type is specified by name only, without a schema.
+ * That's because this will typically be used by relocatable extensions
+ * which can't make a-priori assumptions about which schema their objects
+ * are in.  As long as the extension only defines one type of this name,
+ * the answer is unique anyway.
+ *
+ * We might later add the ability to look up functions, operators, etc.
+ */
+Oid
+getExtensionType(Oid extensionOid, const char *typname)
+{
+	Oid			result = InvalidOid;
+	Relation	depRel;
+	ScanKeyData key[3];
+	SysScanDesc scan;
+	HeapTuple	tup;
+
+	depRel = table_open(DependRelationId, AccessShareLock);
+
+	ScanKeyInit(&key[0],
+				Anum_pg_depend_refclassid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(ExtensionRelationId));
+	ScanKeyInit(&key[1],
+				Anum_pg_depend_refobjid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(extensionOid));
+	ScanKeyInit(&key[2],
+				Anum_pg_depend_refobjsubid,
+				BTEqualStrategyNumber, F_INT4EQ,
+				Int32GetDatum(0));
+
+	scan = systable_beginscan(depRel, DependReferenceIndexId, true,
+							  NULL, 3, key);
+
+	while (HeapTupleIsValid(tup = systable_getnext(scan)))
+	{
+		Form_pg_depend depform = (Form_pg_depend) GETSTRUCT(tup);
+
+		if (depform->classid == TypeRelationId &&
+			depform->deptype == DEPENDENCY_EXTENSION)
+		{
+			Oid			typoid = depform->objid;
+			HeapTuple	typtup;
+
+			typtup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typoid));
+			if (!HeapTupleIsValid(typtup))
+				continue;		/* should we throw an error? */
+			if (strcmp(NameStr(((Form_pg_type) GETSTRUCT(typtup))->typname),
+					   typname) == 0)
+			{
+				result = typoid;
+				ReleaseSysCache(typtup);
+				break;			/* no need to keep searching */
+			}
+			ReleaseSysCache(typtup);
+		}
+	}
+
+	systable_endscan(scan);
+
+	table_close(depRel, AccessShareLock);
+
+	return result;
+}
+
 /*
  * Detect whether a sequence is marked as "owned" by a column
  *
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 44d721d10ff..2c359749962 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -1357,7 +1357,7 @@ match_prosrc_to_literal(const char *prosrc, const char *literal,
 			if (cursorpos > 0)
 				newcp++;
 		}
-		chlen = pg_mblen(prosrc);
+		chlen = pg_mblen_cstr(prosrc);
 		if (strncmp(prosrc, literal, chlen) != 0)
 			goto fail;
 		prosrc += chlen;
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index 1395032413e..c0abc8bc8f3 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -319,7 +319,7 @@ AddSubscriptionRelState(Oid subid, Oid relid, char state,
  */
 void
 UpdateSubscriptionRelState(Oid subid, Oid relid, char state,
-						   XLogRecPtr sublsn)
+						   XLogRecPtr sublsn, bool already_locked)
 {
 	Relation	rel;
 	HeapTuple	tup;
@@ -327,9 +327,24 @@ UpdateSubscriptionRelState(Oid subid, Oid relid, char state,
 	Datum		values[Natts_pg_subscription_rel];
 	bool		replaces[Natts_pg_subscription_rel];
 
-	LockSharedObject(SubscriptionRelationId, subid, 0, AccessShareLock);
+	if (already_locked)
+	{
+#ifdef USE_ASSERT_CHECKING
+		LOCKTAG		tag;
 
-	rel = table_open(SubscriptionRelRelationId, RowExclusiveLock);
+		Assert(CheckRelationOidLockedByMe(SubscriptionRelRelationId,
+										  RowExclusiveLock, true));
+		SET_LOCKTAG_OBJECT(tag, InvalidOid, SubscriptionRelationId, subid, 0);
+		Assert(LockHeldByMe(&tag, AccessShareLock, true));
+#endif
+
+		rel = table_open(SubscriptionRelRelationId, NoLock);
+	}
+	else
+	{
+		LockSharedObject(SubscriptionRelationId, subid, 0, AccessShareLock);
+		rel = table_open(SubscriptionRelRelationId, RowExclusiveLock);
+	}
 
 	/* Try finding existing mapping. */
 	tup = SearchSysCacheCopy2(SUBSCRIPTIONRELMAP,
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index b36f81afb9d..bf15c603a82 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -950,7 +950,7 @@ char *
 makeMultirangeTypeName(const char *rangeTypeName, Oid typeNamespace)
 {
 	char	   *buf;
-	char	   *rangestr;
+	const char *rangestr;
 
 	/*
 	 * If the range type name contains "range" then change that to
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 227df90f89c..85d1219b235 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -546,7 +546,7 @@ RelationCopyStorage(SMgrRelation src, SMgrRelation dst,
 
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("invalid page in block %u of relation %s",
+					 errmsg("invalid page in block %u of relation \"%s\"",
 							blkno, relpath.str)));
 		}
 
diff --git a/src/backend/catalog/system_functions.sql b/src/backend/catalog/system_functions.sql
index 566f308e443..29696b84b35 100644
--- a/src/backend/catalog/system_functions.sql
+++ b/src/backend/catalog/system_functions.sql
@@ -611,14 +611,14 @@ CREATE OR REPLACE FUNCTION
   jsonb_strip_nulls(target jsonb, strip_in_arrays boolean DEFAULT false)
 RETURNS jsonb
 LANGUAGE INTERNAL
-STRICT STABLE PARALLEL SAFE
+STRICT IMMUTABLE PARALLEL SAFE
 AS 'jsonb_strip_nulls';
 
 CREATE OR REPLACE FUNCTION
   json_strip_nulls(target json, strip_in_arrays boolean DEFAULT false)
 RETURNS json
 LANGUAGE INTERNAL
-STRICT STABLE PARALLEL SAFE
+STRICT IMMUTABLE PARALLEL SAFE
 AS 'json_strip_nulls';
 
 -- default normalization form is NFC, per SQL standard
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index 6af74f1da93..f4216f46aa7 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 0d7df9ab412..15fac799d81 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 4bd37d5beb5..e1cf659485a 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -446,9 +446,8 @@ static double asyncQueueUsage(void);
 static void asyncQueueFillWarning(void);
 static void SignalBackends(void);
 static void asyncQueueReadAllNotifications(void);
-static bool asyncQueueProcessPageEntries(volatile QueuePosition *current,
+static bool asyncQueueProcessPageEntries(QueuePosition *current,
 										 QueuePosition stop,
-										 char *page_buffer,
 										 Snapshot snapshot);
 static void asyncQueueAdvanceTail(void);
 static void ProcessIncomingNotify(bool flush);
@@ -1419,6 +1418,7 @@ asyncQueueAddEntries(ListCell *nextNotify)
 			 */
 			qe.length = QUEUE_PAGESIZE - offset;
 			qe.dboid = InvalidOid;
+			qe.xid = InvalidTransactionId;
 			qe.data[0] = '\0';	/* empty channel */
 			qe.data[1] = '\0';	/* empty payload */
 		}
@@ -1850,17 +1850,10 @@ ProcessNotifyInterrupt(bool flush)
 static void
 asyncQueueReadAllNotifications(void)
 {
-	volatile QueuePosition pos;
+	QueuePosition pos;
 	QueuePosition head;
 	Snapshot	snapshot;
 
-	/* page_buffer must be adequately aligned, so use a union */
-	union
-	{
-		char		buf[QUEUE_PAGESIZE];
-		AsyncQueueEntry align;
-	}			page_buffer;
-
 	/* Fetch current state */
 	LWLockAcquire(NotifyQueueLock, LW_SHARED);
 	/* Assert checks that we have a valid state entry */
@@ -1920,49 +1913,27 @@ asyncQueueReadAllNotifications(void)
 	 * It is possible that we fail while trying to send a message to our
 	 * frontend (for example, because of encoding conversion failure).  If
 	 * that happens it is critical that we not try to send the same message
-	 * over and over again.  Therefore, we place a PG_TRY block here that will
-	 * forcibly advance our queue position before we lose control to an error.
-	 * (We could alternatively retake NotifyQueueLock and move the position
-	 * before handling each individual message, but that seems like too much
-	 * lock traffic.)
+	 * over and over again.  Therefore, we set ExitOnAnyError to upgrade any
+	 * ERRORs to FATAL, causing the client connection to be closed on error.
+	 *
+	 * We used to only skip over the offending message and try to soldier on,
+	 * but it was somewhat questionable to lose a notification and give the
+	 * client an ERROR instead.  A client application is not be prepared for
+	 * that and can't tell that a notification was missed.  It was also not
+	 * very useful in practice because notifications are often processed while
+	 * a connection is idle and reading a message from the client, and in that
+	 * state, any error is upgraded to FATAL anyway.  Closing the connection
+	 * is a clear signal to the application that it might have missed
+	 * notifications.
 	 */
-	PG_TRY();
 	{
+		bool		save_ExitOnAnyError = ExitOnAnyError;
 		bool		reachedStop;
 
+		ExitOnAnyError = true;
+
 		do
 		{
-			int64		curpage = QUEUE_POS_PAGE(pos);
-			int			curoffset = QUEUE_POS_OFFSET(pos);
-			int			slotno;
-			int			copysize;
-
-			/*
-			 * We copy the data from SLRU into a local buffer, so as to avoid
-			 * holding the SLRU lock while we are examining the entries and
-			 * possibly transmitting them to our frontend.  Copy only the part
-			 * of the page we will actually inspect.
-			 */
-			slotno = SimpleLruReadPage_ReadOnly(NotifyCtl, curpage,
-												InvalidTransactionId);
-			if (curpage == QUEUE_POS_PAGE(head))
-			{
-				/* we only want to read as far as head */
-				copysize = QUEUE_POS_OFFSET(head) - curoffset;
-				if (copysize < 0)
-					copysize = 0;	/* just for safety */
-			}
-			else
-			{
-				/* fetch all the rest of the page */
-				copysize = QUEUE_PAGESIZE - curoffset;
-			}
-			memcpy(page_buffer.buf + curoffset,
-				   NotifyCtl->shared->page_buffer[slotno] + curoffset,
-				   copysize);
-			/* Release lock that we got from SimpleLruReadPage_ReadOnly() */
-			LWLockRelease(SimpleLruGetBankLock(NotifyCtl, curpage));
-
 			/*
 			 * Process messages up to the stop position, end of page, or an
 			 * uncommitted message.
@@ -1978,19 +1949,16 @@ asyncQueueReadAllNotifications(void)
 			 * rewrite pages under us. Especially we don't want to hold a lock
 			 * while sending the notifications to the frontend.
 			 */
-			reachedStop = asyncQueueProcessPageEntries(&pos, head,
-													   page_buffer.buf,
-													   snapshot);
+			reachedStop = asyncQueueProcessPageEntries(&pos, head, snapshot);
 		} while (!reachedStop);
-	}
-	PG_FINALLY();
-	{
+
 		/* Update shared state */
 		LWLockAcquire(NotifyQueueLock, LW_SHARED);
 		QUEUE_BACKEND_POS(MyProcNumber) = pos;
 		LWLockRelease(NotifyQueueLock);
+
+		ExitOnAnyError = save_ExitOnAnyError;
 	}
-	PG_END_TRY();
 
 	/* Done with snapshot */
 	UnregisterSnapshot(snapshot);
@@ -2000,31 +1968,42 @@ asyncQueueReadAllNotifications(void)
  * Fetch notifications from the shared queue, beginning at position current,
  * and deliver relevant ones to my frontend.
  *
- * The current page must have been fetched into page_buffer from shared
- * memory.  (We could access the page right in shared memory, but that
- * would imply holding the SLRU bank lock throughout this routine.)
- *
- * We stop if we reach the "stop" position, or reach a notification from an
- * uncommitted transaction, or reach the end of the page.
- *
  * The function returns true once we have reached the stop position or an
  * uncommitted notification, and false if we have finished with the page.
  * In other words: once it returns true there is no need to look further.
  * The QueuePosition *current is advanced past all processed messages.
  */
 static bool
-asyncQueueProcessPageEntries(volatile QueuePosition *current,
+asyncQueueProcessPageEntries(QueuePosition *current,
 							 QueuePosition stop,
-							 char *page_buffer,
 							 Snapshot snapshot)
 {
+	int64		curpage = QUEUE_POS_PAGE(*current);
+	int			slotno;
+	char	   *page_buffer;
 	bool		reachedStop = false;
 	bool		reachedEndOfPage;
-	AsyncQueueEntry *qe;
+
+	/*
+	 * We copy the entries into a local buffer to avoid holding the SLRU lock
+	 * while we transmit them to our frontend.  The local buffer must be
+	 * adequately aligned, so use a union.
+	 */
+	union
+	{
+		char		buf[QUEUE_PAGESIZE];
+		AsyncQueueEntry align;
+	}			local_buf;
+	char	   *local_buf_end = local_buf.buf;
+
+	slotno = SimpleLruReadPage_ReadOnly(NotifyCtl, curpage,
+										InvalidTransactionId);
+	page_buffer = NotifyCtl->shared->page_buffer[slotno];
 
 	do
 	{
 		QueuePosition thisentry = *current;
+		AsyncQueueEntry *qe;
 
 		if (QUEUE_POS_EQUAL(thisentry, stop))
 			break;
@@ -2066,18 +2045,23 @@ asyncQueueProcessPageEntries(volatile QueuePosition *current,
 				reachedStop = true;
 				break;
 			}
-			else if (TransactionIdDidCommit(qe->xid))
-			{
-				/* qe->data is the null-terminated channel name */
-				char	   *channel = qe->data;
 
-				if (IsListeningOn(channel))
-				{
-					/* payload follows channel name */
-					char	   *payload = qe->data + strlen(channel) + 1;
+			/*
+			 * Quick check for the case that we're not listening on any
+			 * channels, before calling TransactionIdDidCommit().  This makes
+			 * that case a little faster, but more importantly, it ensures
+			 * that if there's a bad entry in the queue for which
+			 * TransactionIdDidCommit() fails for some reason, we can skip
+			 * over it on the first LISTEN in a session, and not get stuck on
+			 * it indefinitely.
+			 */
+			if (listenChannels == NIL)
+				continue;
 
-					NotifyMyFrontEnd(channel, payload, qe->srcPid);
-				}
+			if (TransactionIdDidCommit(qe->xid))
+			{
+				memcpy(local_buf_end, qe, qe->length);
+				local_buf_end += qe->length;
 			}
 			else
 			{
@@ -2091,6 +2075,32 @@ asyncQueueProcessPageEntries(volatile QueuePosition *current,
 		/* Loop back if we're not at end of page */
 	} while (!reachedEndOfPage);
 
+	/* Release lock that we got from SimpleLruReadPage_ReadOnly() */
+	LWLockRelease(SimpleLruGetBankLock(NotifyCtl, curpage));
+
+	/*
+	 * Now that we have let go of the SLRU bank lock, send the notifications
+	 * to our backend
+	 */
+	Assert(local_buf_end - local_buf.buf <= BLCKSZ);
+	for (char *p = local_buf.buf; p < local_buf_end;)
+	{
+		AsyncQueueEntry *qe = (AsyncQueueEntry *) p;
+
+		/* qe->data is the null-terminated channel name */
+		char	   *channel = qe->data;
+
+		if (IsListeningOn(channel))
+		{
+			/* payload follows channel name */
+			char	   *payload = qe->data + strlen(channel) + 1;
+
+			NotifyMyFrontEnd(channel, payload, qe->srcPid);
+		}
+
+		p += qe->length;
+	}
+
 	if (QUEUE_POS_EQUAL(*current, stop))
 		reachedStop = true;
 
@@ -2168,6 +2178,120 @@ asyncQueueAdvanceTail(void)
 	LWLockRelease(NotifyQueueTailLock);
 }
 
+/*
+ * AsyncNotifyFreezeXids
+ *
+ * Prepare the async notification queue for CLOG truncation by freezing
+ * transaction IDs that are about to become inaccessible.
+ *
+ * This function is called by VACUUM before advancing datfrozenxid. It scans
+ * the notification queue and replaces XIDs that would become inaccessible
+ * after CLOG truncation with special markers:
+ * - Committed transactions are set to FrozenTransactionId
+ * - Aborted/crashed transactions are set to InvalidTransactionId
+ *
+ * Only XIDs < newFrozenXid are processed, as those are the ones whose CLOG
+ * pages will be truncated. If XID < newFrozenXid, it cannot still be running
+ * (or it would have held back newFrozenXid through ProcArray).
+ * Therefore, if TransactionIdDidCommit returns false, we know the transaction
+ * either aborted explicitly or crashed, and we can safely mark it invalid.
+ */
+void
+AsyncNotifyFreezeXids(TransactionId newFrozenXid)
+{
+	QueuePosition pos;
+	QueuePosition head;
+	int64		curpage = -1;
+	int			slotno = -1;
+	char	   *page_buffer = NULL;
+	bool		page_dirty = false;
+
+	/*
+	 * Acquire locks in the correct order to avoid deadlocks. As per the
+	 * locking protocol: NotifyQueueTailLock, then NotifyQueueLock, then SLRU
+	 * bank locks.
+	 *
+	 * We only need SHARED mode since we're just reading the head/tail
+	 * positions, not modifying them.
+	 */
+	LWLockAcquire(NotifyQueueTailLock, LW_SHARED);
+	LWLockAcquire(NotifyQueueLock, LW_SHARED);
+
+	pos = QUEUE_TAIL;
+	head = QUEUE_HEAD;
+
+	/* Release NotifyQueueLock early, we only needed to read the positions */
+	LWLockRelease(NotifyQueueLock);
+
+	/*
+	 * Scan the queue from tail to head, freezing XIDs as needed. We hold
+	 * NotifyQueueTailLock throughout to ensure the tail doesn't move while
+	 * we're working.
+	 */
+	while (!QUEUE_POS_EQUAL(pos, head))
+	{
+		AsyncQueueEntry *qe;
+		TransactionId xid;
+		int64		pageno = QUEUE_POS_PAGE(pos);
+		int			offset = QUEUE_POS_OFFSET(pos);
+
+		/* If we need a different page, release old lock and get new one */
+		if (pageno != curpage)
+		{
+			LWLock	   *lock;
+
+			/* Release previous page if any */
+			if (slotno >= 0)
+			{
+				if (page_dirty)
+				{
+					NotifyCtl->shared->page_dirty[slotno] = true;
+					page_dirty = false;
+				}
+				LWLockRelease(SimpleLruGetBankLock(NotifyCtl, curpage));
+			}
+
+			lock = SimpleLruGetBankLock(NotifyCtl, pageno);
+			LWLockAcquire(lock, LW_EXCLUSIVE);
+			slotno = SimpleLruReadPage(NotifyCtl, pageno, true,
+									   InvalidTransactionId);
+			page_buffer = NotifyCtl->shared->page_buffer[slotno];
+			curpage = pageno;
+		}
+
+		qe = (AsyncQueueEntry *) (page_buffer + offset);
+		xid = qe->xid;
+
+		if (TransactionIdIsNormal(xid) &&
+			TransactionIdPrecedes(xid, newFrozenXid))
+		{
+			if (TransactionIdDidCommit(xid))
+			{
+				qe->xid = FrozenTransactionId;
+				page_dirty = true;
+			}
+			else
+			{
+				qe->xid = InvalidTransactionId;
+				page_dirty = true;
+			}
+		}
+
+		/* Advance to next entry */
+		asyncQueueAdvance(&pos, qe->length);
+	}
+
+	/* Release final page lock if we acquired one */
+	if (slotno >= 0)
+	{
+		if (page_dirty)
+			NotifyCtl->shared->page_dirty[slotno] = true;
+		LWLockRelease(SimpleLruGetBankLock(NotifyCtl, curpage));
+	}
+
+	LWLockRelease(NotifyQueueTailLock);
+}
+
 /*
  * ProcessIncomingNotify
  *
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 54a08e4102e..94a5aee90b5 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -124,8 +124,8 @@ cluster(ParseState *pstate, ClusterStmt *stmt, bool isTopLevel)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized CLUSTER option \"%s\"",
-							opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"CLUSTER", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 	}
 
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 2275f936ea8..bf0b867c0ac 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -133,6 +133,9 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt,
 
 		if (stmt->whereClause)
 		{
+			Bitmapset  *expr_attrs = NULL;
+			int			i;
+
 			/* add nsitem to query namespace */
 			addNSItemToQuery(pstate, nsitem, false, true, true);
 
@@ -145,6 +148,43 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt,
 			/* we have to fix its collations too */
 			assign_expr_collations(pstate, whereClause);
 
+			/*
+			 * Examine all the columns in the WHERE clause expression.  When
+			 * the whole-row reference is present, examine all the columns of
+			 * the table.
+			 */
+			pull_varattnos(whereClause, 1, &expr_attrs);
+			if (bms_is_member(0 - FirstLowInvalidHeapAttributeNumber, expr_attrs))
+			{
+				expr_attrs = bms_add_range(expr_attrs,
+										   1 - FirstLowInvalidHeapAttributeNumber,
+										   RelationGetNumberOfAttributes(rel) - FirstLowInvalidHeapAttributeNumber);
+				expr_attrs = bms_del_member(expr_attrs, 0 - FirstLowInvalidHeapAttributeNumber);
+			}
+
+			i = -1;
+			while ((i = bms_next_member(expr_attrs, i)) >= 0)
+			{
+				AttrNumber	attno = i + FirstLowInvalidHeapAttributeNumber;
+
+				Assert(attno != 0);
+
+				/*
+				 * Prohibit generated columns in the WHERE clause.  Stored
+				 * generated columns are not yet computed when the filtering
+				 * happens.  Virtual generated columns could probably work (we
+				 * would need to expand them somewhere around here), but for
+				 * now we keep them consistent with the stored variant.
+				 */
+				if (attno > 0 &&
+					TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated)
+					ereport(ERROR,
+							errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+							errmsg("generated columns are not supported in COPY FROM WHERE conditions"),
+							errdetail("Column \"%s\" is a generated column.",
+									  get_attname(RelationGetRelid(rel), attno, false)));
+			}
+
 			whereClause = eval_const_expressions(NULL, whereClause);
 
 			whereClause = (Node *) canonicalize_qual((Expr *) whereClause, false);
diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c
index fbbbc09a97b..12781963b4f 100644
--- a/src/backend/commands/copyfrom.c
+++ b/src/backend/commands/copyfrom.c
@@ -919,7 +919,7 @@ CopyFrom(CopyFromState cstate)
 	ExecInitResultRelation(estate, resultRelInfo, 1);
 
 	/* Verify the named relation is a valid target for INSERT */
-	CheckValidResultRel(resultRelInfo, CMD_INSERT, NIL);
+	CheckValidResultRel(resultRelInfo, CMD_INSERT, ONCONFLICT_NONE, NIL);
 
 	ExecOpenIndices(resultRelInfo, false);
 
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 2526276df14..396b683b13a 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -1052,7 +1052,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 		dbctype = src_ctype;
 	if (dblocprovider == '\0')
 		dblocprovider = src_locprovider;
-	if (dblocale == NULL)
+	if (dblocale == NULL && dblocprovider == src_locprovider)
 		dblocale = src_locale;
 	if (dbicurules == NULL)
 		dbicurules = src_icurules;
@@ -2353,7 +2353,8 @@ DropDatabase(ParseState *pstate, DropdbStmt *stmt)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized DROP DATABASE option \"%s\"", opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"DROP DATABASE", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 	}
 
@@ -3398,6 +3399,7 @@ dbase_redo(XLogReaderState *record)
 		parent_path = pstrdup(dbpath);
 		get_parent_directory(parent_path);
 		recovery_create_dbdir(parent_path, true);
+		pfree(parent_path);
 
 		/* Create the database directory with the version file. */
 		CreateDirAndVersionFile(dbpath, xlrec->db_id, xlrec->tablespace_id,
diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c
index d207bd98387..d9df4dbd72c 100644
--- a/src/backend/commands/discard.c
+++ b/src/backend/commands/discard.c
@@ -3,7 +3,7 @@
  * discard.c
  *	  The implementation of the DISCARD command
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 1996-2025, PostgreSQL Global Development Group
  *
  *
diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c
index d33f67d7d47..76343792739 100644
--- a/src/backend/commands/dropcmds.c
+++ b/src/backend/commands/dropcmds.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 3e100faa289..d4a69d6056c 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/commands/event_trigger.c
@@ -22,6 +22,7 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
+#include "catalog/pg_attrdef.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_auth_members.h"
 #include "catalog/pg_database.h"
@@ -30,6 +31,7 @@
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_parameter_acl.h"
+#include "catalog/pg_policy.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
@@ -110,6 +112,8 @@ static Oid	insert_event_trigger_tuple(const char *trigname, const char *eventnam
 static void validate_ddl_tags(const char *filtervar, List *taglist);
 static void validate_table_rewrite_tags(const char *filtervar, List *taglist);
 static void EventTriggerInvoke(List *fn_oid_list, EventTriggerData *trigdata);
+static bool obtain_object_name_namespace(const ObjectAddress *object,
+										 SQLDropObject *obj);
 static const char *stringify_grant_objtype(ObjectType objtype);
 static const char *stringify_adefprivs_objtype(ObjectType objtype);
 static void SetDatabaseHasLoginEventTriggers(void);
@@ -1281,12 +1285,6 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 
 	Assert(EventTriggerSupportsObject(object));
 
-	/* don't report temp schemas except my own */
-	if (object->classId == NamespaceRelationId &&
-		(isAnyTempNamespace(object->objectId) &&
-		 !isTempNamespace(object->objectId)))
-		return;
-
 	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
 
 	obj = palloc0(sizeof(SQLDropObject));
@@ -1294,21 +1292,172 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 	obj->original = original;
 	obj->normal = normal;
 
+	if (object->classId == NamespaceRelationId)
+	{
+		/* Special handling is needed for temp namespaces */
+		if (isTempNamespace(object->objectId))
+			obj->istemp = true;
+		else if (isAnyTempNamespace(object->objectId))
+		{
+			/* don't report temp schemas except my own */
+			pfree(obj);
+			MemoryContextSwitchTo(oldcxt);
+			return;
+		}
+		obj->objname = get_namespace_name(object->objectId);
+	}
+	else if (object->classId == AttrDefaultRelationId)
+	{
+		/* We treat a column default as temp if its table is temp */
+		ObjectAddress colobject;
+
+		colobject = GetAttrDefaultColumnAddress(object->objectId);
+		if (OidIsValid(colobject.objectId))
+		{
+			if (!obtain_object_name_namespace(&colobject, obj))
+			{
+				pfree(obj);
+				MemoryContextSwitchTo(oldcxt);
+				return;
+			}
+		}
+	}
+	else if (object->classId == TriggerRelationId)
+	{
+		/* Similarly, a trigger is temp if its table is temp */
+		/* Sadly, there's no lsyscache.c support for trigger objects */
+		Relation	pg_trigger_rel;
+		ScanKeyData skey[1];
+		SysScanDesc sscan;
+		HeapTuple	tuple;
+		Oid			relid;
+
+		/* Fetch the trigger's table OID the hard way */
+		pg_trigger_rel = table_open(TriggerRelationId, AccessShareLock);
+		ScanKeyInit(&skey[0],
+					Anum_pg_trigger_oid,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(object->objectId));
+		sscan = systable_beginscan(pg_trigger_rel, TriggerOidIndexId, true,
+								   NULL, 1, skey);
+		tuple = systable_getnext(sscan);
+		if (HeapTupleIsValid(tuple))
+			relid = ((Form_pg_trigger) GETSTRUCT(tuple))->tgrelid;
+		else
+			relid = InvalidOid; /* shouldn't happen */
+		systable_endscan(sscan);
+		table_close(pg_trigger_rel, AccessShareLock);
+		/* Do nothing if we didn't find the trigger */
+		if (OidIsValid(relid))
+		{
+			ObjectAddress relobject;
+
+			relobject.classId = RelationRelationId;
+			relobject.objectId = relid;
+			/* Arbitrarily set objectSubId nonzero so as not to fill objname */
+			relobject.objectSubId = 1;
+			if (!obtain_object_name_namespace(&relobject, obj))
+			{
+				pfree(obj);
+				MemoryContextSwitchTo(oldcxt);
+				return;
+			}
+		}
+	}
+	else if (object->classId == PolicyRelationId)
+	{
+		/* Similarly, a policy is temp if its table is temp */
+		/* Sadly, there's no lsyscache.c support for policy objects */
+		Relation	pg_policy_rel;
+		ScanKeyData skey[1];
+		SysScanDesc sscan;
+		HeapTuple	tuple;
+		Oid			relid;
+
+		/* Fetch the policy's table OID the hard way */
+		pg_policy_rel = table_open(PolicyRelationId, AccessShareLock);
+		ScanKeyInit(&skey[0],
+					Anum_pg_policy_oid,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(object->objectId));
+		sscan = systable_beginscan(pg_policy_rel, PolicyOidIndexId, true,
+								   NULL, 1, skey);
+		tuple = systable_getnext(sscan);
+		if (HeapTupleIsValid(tuple))
+			relid = ((Form_pg_policy) GETSTRUCT(tuple))->polrelid;
+		else
+			relid = InvalidOid; /* shouldn't happen */
+		systable_endscan(sscan);
+		table_close(pg_policy_rel, AccessShareLock);
+		/* Do nothing if we didn't find the policy */
+		if (OidIsValid(relid))
+		{
+			ObjectAddress relobject;
+
+			relobject.classId = RelationRelationId;
+			relobject.objectId = relid;
+			/* Arbitrarily set objectSubId nonzero so as not to fill objname */
+			relobject.objectSubId = 1;
+			if (!obtain_object_name_namespace(&relobject, obj))
+			{
+				pfree(obj);
+				MemoryContextSwitchTo(oldcxt);
+				return;
+			}
+		}
+	}
+	else
+	{
+		/* Generic handling for all other object classes */
+		if (!obtain_object_name_namespace(object, obj))
+		{
+			/* don't report temp objects except my own */
+			pfree(obj);
+			MemoryContextSwitchTo(oldcxt);
+			return;
+		}
+	}
+
+	/* object identity, objname and objargs */
+	obj->objidentity =
+		getObjectIdentityParts(&obj->address, &obj->addrnames, &obj->addrargs,
+							   false);
+
+	/* object type */
+	obj->objecttype = getObjectTypeDescription(&obj->address, false);
+
+	slist_push_head(&(currentEventTriggerState->SQLDropList), &obj->next);
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * Fill obj->objname, obj->schemaname, and obj->istemp based on object.
+ *
+ * Returns true if this object should be reported, false if it should
+ * be ignored because it is a temporary object of another session.
+ */
+static bool
+obtain_object_name_namespace(const ObjectAddress *object, SQLDropObject *obj)
+{
 	/*
 	 * Obtain schema names from the object's catalog tuple, if one exists;
 	 * this lets us skip objects in temp schemas.  We trust that
 	 * ObjectProperty contains all object classes that can be
 	 * schema-qualified.
+	 *
+	 * Currently, this function does nothing for object classes that are not
+	 * in ObjectProperty, but we might sometime add special cases for that.
 	 */
 	if (is_objectclass_supported(object->classId))
 	{
 		Relation	catalog;
 		HeapTuple	tuple;
 
-		catalog = table_open(obj->address.classId, AccessShareLock);
+		catalog = table_open(object->classId, AccessShareLock);
 		tuple = get_catalog_object_by_oid(catalog,
 										  get_object_attnum_oid(object->classId),
-										  obj->address.objectId);
+										  object->objectId);
 
 		if (tuple)
 		{
@@ -1316,7 +1465,7 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 			Datum		datum;
 			bool		isnull;
 
-			attnum = get_object_attnum_namespace(obj->address.classId);
+			attnum = get_object_attnum_namespace(object->classId);
 			if (attnum != InvalidAttrNumber)
 			{
 				datum = heap_getattr(tuple, attnum,
@@ -1334,10 +1483,9 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 					}
 					else if (isAnyTempNamespace(namespaceId))
 					{
-						pfree(obj);
+						/* no need to fill any fields of *obj */
 						table_close(catalog, AccessShareLock);
-						MemoryContextSwitchTo(oldcxt);
-						return;
+						return false;
 					}
 					else
 					{
@@ -1347,10 +1495,10 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 				}
 			}
 
-			if (get_object_namensp_unique(obj->address.classId) &&
-				obj->address.objectSubId == 0)
+			if (get_object_namensp_unique(object->classId) &&
+				object->objectSubId == 0)
 			{
-				attnum = get_object_attnum_name(obj->address.classId);
+				attnum = get_object_attnum_name(object->classId);
 				if (attnum != InvalidAttrNumber)
 				{
 					datum = heap_getattr(tuple, attnum,
@@ -1363,24 +1511,8 @@ EventTriggerSQLDropAddObject(const ObjectAddress *object, bool original, bool no
 
 		table_close(catalog, AccessShareLock);
 	}
-	else
-	{
-		if (object->classId == NamespaceRelationId &&
-			isTempNamespace(object->objectId))
-			obj->istemp = true;
-	}
-
-	/* object identity, objname and objargs */
-	obj->objidentity =
-		getObjectIdentityParts(&obj->address, &obj->addrnames, &obj->addrargs,
-							   false);
 
-	/* object type */
-	obj->objecttype = getObjectTypeDescription(&obj->address, false);
-
-	slist_push_head(&(currentEventTriggerState->SQLDropList), &obj->next);
-
-	MemoryContextSwitchTo(oldcxt);
+	return true;
 }
 
 /*
@@ -1873,8 +2005,11 @@ EventTriggerCollectAlterTSConfig(AlterTSConfigurationStmt *stmt, Oid cfgId,
 	command->in_extension = creating_extension;
 	ObjectAddressSet(command->d.atscfg.address,
 					 TSConfigRelationId, cfgId);
-	command->d.atscfg.dictIds = palloc(sizeof(Oid) * ndicts);
-	memcpy(command->d.atscfg.dictIds, dictIds, sizeof(Oid) * ndicts);
+	if (ndicts > 0)
+	{
+		command->d.atscfg.dictIds = palloc_array(Oid, ndicts);
+		memcpy(command->d.atscfg.dictIds, dictIds, sizeof(Oid) * ndicts);
+	}
 	command->d.atscfg.ndicts = ndicts;
 	command->parsetree = (Node *) copyObject(stmt);
 
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 7a9c5f2c5fa..41405d0e06a 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/commands/explain.c
@@ -1002,7 +1002,7 @@ ExplainPrintSerialize(ExplainState *es, SerializeMetrics *metrics)
 {
 	const char *format;
 
-	/* We shouldn't get called for EXPLAIN_SERIALIZE_NONE */
+/* Must not be called for EXPLAIN_SERIALIZE_NONE */
 	if (es->serialize == EXPLAIN_SERIALIZE_TEXT)
 		format = "text";
 	else
@@ -1343,7 +1343,7 @@ plan_is_disabled(Plan *plan)
  * (eg, "Outer", "Inner"); it can be null at top level.  plan_name is an
  * optional name to be attached to the node.
  *
- * In text format, es->indent is controlled in this function since we only
+ * In text format, es->indent is controlled here since we only
  * want it to change at plan-node boundaries (but a few subroutines will
  * transiently increment it).  In non-text formats, es->indent corresponds
  * to the nesting depth of logical output groups, and therefore is controlled
@@ -1699,7 +1699,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 			{
 				BitmapIndexScan *bitmapindexscan = (BitmapIndexScan *) plan;
 				const char *indexname =
-				explain_get_index_name(bitmapindexscan->indexid);
+					explain_get_index_name(bitmapindexscan->indexid);
 
 				if (es->format == EXPLAIN_FORMAT_TEXT)
 					appendStringInfo(es->str, " on %s",
@@ -3116,13 +3116,12 @@ show_sort_info(SortState *sortstate, ExplainState *es)
 	}
 
 	/*
-	 * You might think we should just skip this stanza entirely when
-	 * es->hide_workers is true, but then we'd get no sort-method output at
-	 * all.  We have to make it look like worker 0's data is top-level data.
-	 * This is easily done by just skipping the OpenWorker/CloseWorker calls.
-	 * Currently, we don't worry about the possibility that there are multiple
-	 * workers in such a case; if there are, duplicate output fields will be
-	 * emitted.
+	 * It might seem better to skip this stanza entirely when es->hide_workers
+	 * is true, but then we'd get no sort-method output at all.  We have to
+	 * make it look like worker 0's data is top-level data. This is easily
+	 * done by just skipping the OpenWorker/CloseWorker calls. Currently, we
+	 * don't worry about the possibility that there are multiple workers in
+	 * such a case; if there are, duplicate output fields will be emitted.
 	 */
 	if (sortstate->shared_info != NULL)
 	{
@@ -3330,7 +3329,7 @@ show_incremental_sort_info(IncrementalSortState *incrsortstate,
 		for (n = 0; n < incrsortstate->shared_info->num_workers; n++)
 		{
 			IncrementalSortInfo *incsort_info =
-			&incrsortstate->shared_info->sinfo[n];
+				&incrsortstate->shared_info->sinfo[n];
 
 			/*
 			 * If a worker hasn't processed any sort groups at all, then
@@ -4831,7 +4830,7 @@ ExplainCustomChildren(CustomScanState *css, List *ancestors, ExplainState *es)
 {
 	ListCell   *cell;
 	const char *label =
-	(list_length(css->custom_ps) != 1 ? "children" : "child");
+		(list_length(css->custom_ps) != 1 ? "children" : "child");
 
 	foreach(cell, css->custom_ps)
 		ExplainNode((PlanState *) lfirst(cell), ancestors, label, NULL, es);
diff --git a/src/backend/commands/explain_state.c b/src/backend/commands/explain_state.c
index 60d98d63a62..1fcfa7883cc 100644
--- a/src/backend/commands/explain_state.c
+++ b/src/backend/commands/explain_state.c
@@ -130,8 +130,8 @@ ParseExplainOptionList(ExplainState *es, List *options, ParseState *pstate)
 				else
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-							 errmsg("unrecognized value for EXPLAIN option \"%s\": \"%s\"",
-									opt->defname, p),
+							 errmsg("unrecognized value for %s option \"%s\": \"%s\"",
+									"EXPLAIN", opt->defname, p),
 							 parser_errposition(pstate, opt->location)));
 			}
 			else
@@ -155,15 +155,15 @@ ParseExplainOptionList(ExplainState *es, List *options, ParseState *pstate)
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("unrecognized value for EXPLAIN option \"%s\": \"%s\"",
-								opt->defname, p),
+						 errmsg("unrecognized value for %s option \"%s\": \"%s\"",
+								"EXPLAIN", opt->defname, p),
 						 parser_errposition(pstate, opt->location)));
 		}
 		else if (!ApplyExtensionExplainOption(es, opt, pstate))
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized EXPLAIN option \"%s\"",
-							opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"EXPLAIN", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 	}
 
@@ -195,7 +195,8 @@ ParseExplainOptionList(ExplainState *es, List *options, ParseState *pstate)
 	if (es->generic && es->analyze)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together")));
+				 errmsg("%s options %s and %s cannot be used together",
+						"EXPLAIN", "ANALYZE", "GENERIC_PLAN")));
 
 	/* if the summary was not set explicitly, set default value */
 	es->summary = (summary_set) ? es->summary : es->analyze;
@@ -281,7 +282,8 @@ SetExplainExtensionState(ExplainState *es, int extension_id, void *opaque)
 	/* If there is no array yet, create one. */
 	if (es->extension_state == NULL)
 	{
-		es->extension_state_allocated = 16;
+		es->extension_state_allocated =
+			Max(16, pg_nextpower2_32(extension_id + 1));
 		es->extension_state =
 			palloc0(es->extension_state_allocated * sizeof(void *));
 	}
@@ -291,7 +293,7 @@ SetExplainExtensionState(ExplainState *es, int extension_id, void *opaque)
 	{
 		int			i;
 
-		i = pg_nextpower2_32(es->extension_state_allocated + 1);
+		i = pg_nextpower2_32(extension_id + 1);
 		es->extension_state = (void **)
 			repalloc0(es->extension_state,
 					  es->extension_state_allocated * sizeof(void *),
@@ -336,7 +338,7 @@ RegisterExtensionExplainOption(const char *option_name,
 		ExplainExtensionOptionArray = (ExplainExtensionOption *)
 			MemoryContextAlloc(TopMemoryContext,
 							   ExplainExtensionOptionsAllocated
-							   * sizeof(char *));
+							   * sizeof(ExplainExtensionOption));
 	}
 
 	/* If there's an array but it's currently full, expand it. */
@@ -345,7 +347,7 @@ RegisterExtensionExplainOption(const char *option_name,
 		int			i = pg_nextpower2_32(ExplainExtensionOptionsAssigned + 1);
 
 		ExplainExtensionOptionArray = (ExplainExtensionOption *)
-			repalloc(ExplainExtensionOptionArray, i * sizeof(char *));
+			repalloc(ExplainExtensionOptionArray, i * sizeof(ExplainExtensionOption));
 		ExplainExtensionOptionsAllocated = i;
 	}
 
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index e6f9ab6dfd6..f1a54066e32 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -45,6 +45,7 @@
 #include "catalog/pg_depend.h"
 #include "catalog/pg_extension.h"
 #include "catalog/pg_namespace.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
 #include "commands/comment.h"
@@ -62,6 +63,7 @@
 #include "utils/builtins.h"
 #include "utils/conffiles.h"
 #include "utils/fmgroids.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
@@ -126,7 +128,26 @@ typedef struct
 	ParseLoc	stmt_len;		/* length in bytes; 0 means "rest of string" */
 } script_error_callback_arg;
 
+/*
+ * Cache structure for get_function_sibling_type (and maybe later,
+ * allied lookup functions).
+ */
+typedef struct ExtensionSiblingCache
+{
+	struct ExtensionSiblingCache *next; /* list link */
+	/* lookup key: requesting function's OID and type name */
+	Oid			reqfuncoid;
+	const char *typname;
+	bool		valid;			/* is entry currently valid? */
+	uint32		exthash;		/* cache hash of owning extension's OID */
+	Oid			typeoid;		/* OID associated with typname */
+} ExtensionSiblingCache;
+
+/* Head of linked list of ExtensionSiblingCache structs */
+static ExtensionSiblingCache *ext_sibling_list = NULL;
+
 /* Local functions */
+static void ext_sibling_callback(Datum arg, int cacheid, uint32 hashvalue);
 static List *find_update_path(List *evi_list,
 							  ExtensionVersionInfo *evi_start,
 							  ExtensionVersionInfo *evi_target,
@@ -224,6 +245,114 @@ get_extension_schema(Oid ext_oid)
 	return result;
 }
 
+/*
+ * get_function_sibling_type - find a type belonging to same extension as func
+ *
+ * Returns the type's OID, or InvalidOid if not found.
+ *
+ * This is useful in extensions, which won't have fixed object OIDs.
+ * We work from the calling function's own OID, which it can get from its
+ * FunctionCallInfo parameter, and look up the owning extension and thence
+ * a type belonging to the same extension.
+ *
+ * Notice that the type is specified by name only, without a schema.
+ * That's because this will typically be used by relocatable extensions
+ * which can't make a-priori assumptions about which schema their objects
+ * are in.  As long as the extension only defines one type of this name,
+ * the answer is unique anyway.
+ *
+ * We might later add the ability to look up functions, operators, etc.
+ *
+ * This code is simply a frontend for some pg_depend lookups.  Those lookups
+ * are fairly expensive, so we provide a simple cache facility.  We assume
+ * that the passed typname is actually a C constant, or at least permanently
+ * allocated, so that we need not copy that string.
+ */
+Oid
+get_function_sibling_type(Oid funcoid, const char *typname)
+{
+	ExtensionSiblingCache *cache_entry;
+	Oid			extoid;
+	Oid			typeoid;
+
+	/*
+	 * See if we have the answer cached.  Someday there may be enough callers
+	 * to justify a hash table, but for now, a simple linked list is fine.
+	 */
+	for (cache_entry = ext_sibling_list; cache_entry != NULL;
+		 cache_entry = cache_entry->next)
+	{
+		if (funcoid == cache_entry->reqfuncoid &&
+			strcmp(typname, cache_entry->typname) == 0)
+			break;
+	}
+	if (cache_entry && cache_entry->valid)
+		return cache_entry->typeoid;
+
+	/*
+	 * Nope, so do the expensive lookups.  We do not expect failures, so we do
+	 * not cache negative results.
+	 */
+	extoid = getExtensionOfObject(ProcedureRelationId, funcoid);
+	if (!OidIsValid(extoid))
+		return InvalidOid;
+	typeoid = getExtensionType(extoid, typname);
+	if (!OidIsValid(typeoid))
+		return InvalidOid;
+
+	/*
+	 * Build, or revalidate, cache entry.
+	 */
+	if (cache_entry == NULL)
+	{
+		/* Register invalidation hook if this is first entry */
+		if (ext_sibling_list == NULL)
+			CacheRegisterSyscacheCallback(EXTENSIONOID,
+										  ext_sibling_callback,
+										  (Datum) 0);
+
+		/* Momentarily zero the space to ensure valid flag is false */
+		cache_entry = (ExtensionSiblingCache *)
+			MemoryContextAllocZero(CacheMemoryContext,
+								   sizeof(ExtensionSiblingCache));
+		cache_entry->next = ext_sibling_list;
+		ext_sibling_list = cache_entry;
+	}
+
+	cache_entry->reqfuncoid = funcoid;
+	cache_entry->typname = typname;
+	cache_entry->exthash = GetSysCacheHashValue1(EXTENSIONOID,
+												 ObjectIdGetDatum(extoid));
+	cache_entry->typeoid = typeoid;
+	/* Mark it valid only once it's fully populated */
+	cache_entry->valid = true;
+
+	return typeoid;
+}
+
+/*
+ * ext_sibling_callback
+ *		Syscache inval callback function for EXTENSIONOID cache
+ *
+ * It seems sufficient to invalidate ExtensionSiblingCache entries when
+ * the owning extension's pg_extension entry is modified or deleted.
+ * Neither a requesting function's OID, nor the OID of the object it's
+ * looking for, could change without an extension update or drop/recreate.
+ */
+static void
+ext_sibling_callback(Datum arg, int cacheid, uint32 hashvalue)
+{
+	ExtensionSiblingCache *cache_entry;
+
+	for (cache_entry = ext_sibling_list; cache_entry != NULL;
+		 cache_entry = cache_entry->next)
+	{
+		if (hashvalue == 0 ||
+			cache_entry->exthash == hashvalue)
+			cache_entry->valid = false;
+	}
+}
+
 /*
  * Utility functions to check validity of extension and version names
  */
@@ -2208,6 +2337,7 @@ pg_available_extensions(PG_FUNCTION_ARGS)
 	List	   *locations;
 	DIR		   *dir;
 	struct dirent *de;
+	List	   *found_ext = NIL;
 
 	/* Build tuplestore to hold the result rows */
 	InitMaterializedSRF(fcinfo, 0);
@@ -2232,6 +2362,7 @@ pg_available_extensions(PG_FUNCTION_ARGS)
 			{
 				ExtensionControlFile *control;
 				char	   *extname;
+				String	   *extname_str;
 				Datum		values[3];
 				bool		nulls[3];
 
@@ -2246,6 +2377,16 @@ pg_available_extensions(PG_FUNCTION_ARGS)
 				if (strstr(extname, "--"))
 					continue;
 
+				/*
+				 * Ignore already-found names.  They are not reachable by the
+				 * path search, so don't shown them.
+				 */
+				extname_str = makeString(extname);
+				if (list_member(found_ext, extname_str))
+					continue;
+				else
+					found_ext = lappend(found_ext, extname_str);
+
 				control = new_ExtensionControlFile(extname);
 				control->control_dir = pstrdup(location);
 				parse_extension_control_file(control, NULL);
@@ -2294,6 +2435,7 @@ pg_available_extension_versions(PG_FUNCTION_ARGS)
 	List	   *locations;
 	DIR		   *dir;
 	struct dirent *de;
+	List	   *found_ext = NIL;
 
 	/* Build tuplestore to hold the result rows */
 	InitMaterializedSRF(fcinfo, 0);
@@ -2318,6 +2460,7 @@ pg_available_extension_versions(PG_FUNCTION_ARGS)
 			{
 				ExtensionControlFile *control;
 				char	   *extname;
+				String	   *extname_str;
 
 				if (!is_extension_control_filename(de->d_name))
 					continue;
@@ -2330,6 +2473,16 @@ pg_available_extension_versions(PG_FUNCTION_ARGS)
 				if (strstr(extname, "--"))
 					continue;
 
+				/*
+				 * Ignore already-found names.  They are not reachable by the
+				 * path search, so don't shown them.
+				 */
+				extname_str = makeString(extname);
+				if (list_member(found_ext, extname_str))
+					continue;
+				else
+					found_ext = lappend(found_ext, extname_str);
+
 				/* read the control file */
 				control = new_ExtensionControlFile(extname);
 				control->control_dir = pstrdup(location);
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
index 8d2d7431544..d7ac1489a17 100644
--- a/src/backend/commands/foreigncmds.c
+++ b/src/backend/commands/foreigncmds.c
@@ -740,6 +740,11 @@ AlterForeignDataWrapper(ParseState *pstate, AlterFdwStmt *stmt)
 		ereport(WARNING,
 				(errmsg("changing the foreign-data wrapper handler can change behavior of existing foreign tables")));
 	}
+	else
+	{
+		/* handler unchanged */
+		fdwhandler = fdwForm->fdwhandler;
+	}
 
 	if (validator_given)
 	{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index aac39bf5e35..8744dab5aa5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -100,13 +100,12 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 	Oid			rettype;
 	Type		typtup;
 	AclResult	aclresult;
-	PkgType *pkgtype;
+	PkgType    *pkgtype;
 
 	/*
-	 * we first find it from a package
-	 * this is ok, because oracle doesn't
-	 * support table,type,package in the same
-	 * scheam share the same name
+	 * First, try to resolve the type from a package. This is acceptable
+	 * because, in Oracle, a schema does not allow a table, type, and package
+	 * to share the same name.
 	 */
 	*rettypename = NULL;
 
@@ -118,8 +117,8 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 		if (pkgtype->pkgname_startloc == 1)
 		{
 			/* append pkgname schema */
-			List *saved_names = returnType->names;
-			char *pkgschema = get_namespace_name(get_package_namespace(pkgtype->pkgoid));
+			List	   *saved_names = returnType->names;
+			char	   *pkgschema = get_namespace_name(get_package_namespace(pkgtype->pkgoid));
 
 			returnType->names = lcons(makeString(pkgschema), (List *) copyObject(returnType->names));
 			*rettypename = nodeToString(returnType);
@@ -195,7 +194,7 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 		namespaceId = QualifiedNameGetCreationNamespace(returnType->names,
 														&typname);
 		aclresult = object_aclcheck(NamespaceRelationId, namespaceId, GetUserId(),
-										  ACL_CREATE);
+									ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(namespaceId));
@@ -241,7 +240,7 @@ interpret_function_parameter_list(ParseState *pstate,
 								  List **inParameterNames_list,
 								  List **parameterDefaults,
 								  Oid *variadicArgType,
-								  Oid *requiredResultType, 
+								  Oid *requiredResultType,
 								  ArrayType **parametertypeNames)
 {
 	int			parameterCount = list_length(parameters);
@@ -256,9 +255,9 @@ interpret_function_parameter_list(ParseState *pstate,
 	bool		have_defaults = false;
 	ListCell   *x;
 	int			i;
-	Datum		*typeNames = NULL;
+	Datum	   *typeNames = NULL;
 	bool		has_pkg_type = false;
-	bool isplisql = false;
+	bool		isplisql = false;
 	bool		has_rel_type = false;
 
 	*variadicArgType = InvalidOid;	/* default result */
@@ -271,8 +270,7 @@ interpret_function_parameter_list(ParseState *pstate,
 	*parameterDefaults = NIL;
 
 	/*
-	 * only plisql language support package
-	 * type
+	 * Only the PL/iSQL language supports package types.
 	 */
 	if (languageOid == get_language_oid("plisql", true))
 	{
@@ -291,17 +289,16 @@ interpret_function_parameter_list(ParseState *pstate,
 		Oid			toid;
 		Type		typtup;
 		AclResult	aclresult;
-		PkgType *pkgtype;
+		PkgType    *pkgtype;
 
 		/* For our purposes here, a defaulted mode spec is identical to IN */
 		if (fpmode == FUNC_PARAM_DEFAULT)
 			fpmode = FUNC_PARAM_IN;
 
 		/*
-		 * we first find it from a package
-		 * this is ok, because oracle doesn't
-		 * support table,type,package in the same
-		 * scheam share the same name.
+		 * First, try to resolve the argument type from a package. In Oracle,
+		 * a schema does not allow a table, type, and package to share the
+		 * same name.
 		 */
 
 		if (isplisql &&
@@ -310,8 +307,8 @@ interpret_function_parameter_list(ParseState *pstate,
 			toid = pkgtype->basetypid;
 			if (pkgtype->pkgname_startloc == 1)
 			{
-				char *pkgschema = get_namespace_name(get_package_namespace(pkgtype->pkgoid));
-				List *saved_names = t->names;
+				char	   *pkgschema = get_namespace_name(get_package_namespace(pkgtype->pkgoid));
+				List	   *saved_names = t->names;
 
 				t->names = lcons(makeString(pkgschema), (List *) copyObject(t->names));
 				typeNames[i] = CStringGetTextDatum(nodeToString(t));
@@ -335,21 +332,24 @@ interpret_function_parameter_list(ParseState *pstate,
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 								 errmsg("SQL function cannot accept shell type %s",
-												 TypeNameToString(t)),
+										TypeNameToString(t)),
 								 parser_errposition(pstate, t->location)));
 
-					/* We don't allow creating aggregates on shell types either */
+					/*
+					 * We don't allow creating aggregates on shell types
+					 * either
+					 */
 					else if (objtype == OBJECT_AGGREGATE)
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 								 errmsg("aggregate cannot accept shell type %s",
-												 TypeNameToString(t)),
+										TypeNameToString(t)),
 								 parser_errposition(pstate, t->location)));
 					else
 						ereport(NOTICE,
 								(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 								 errmsg("argument type %s is only a shell",
-												 TypeNameToString(t)),
+										TypeNameToString(t)),
 								 parser_errposition(pstate, t->location)));
 				}
 				toid = typeTypeId(typtup);
@@ -361,7 +361,7 @@ interpret_function_parameter_list(ParseState *pstate,
 						(errcode(ERRCODE_UNDEFINED_OBJECT),
 						 errmsg("type %s does not exist",
 								TypeNameToString(t)),
-						parser_errposition(pstate, t->location)));
+						 parser_errposition(pstate, t->location)));
 				toid = InvalidOid;	/* keep compiler quiet */
 			}
 
@@ -517,7 +517,7 @@ interpret_function_parameter_list(ParseState *pstate,
 				compatible_db == ORA_PARSER)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-				   errmsg("IN OUT formal parameters may have no default expressions")));
+						 errmsg("IN OUT formal parameters may have no default expressions")));
 
 
 			def = transformExpr(pstate, fp->defexpr,
@@ -557,54 +557,58 @@ interpret_function_parameter_list(ParseState *pstate,
 		{
 			if (compatible_db == PG_PARSER ||
 				(compatible_db == ORA_PARSER &&
-				LANG_PLISQL_OID != languageOid))
+				 LANG_PLISQL_OID != languageOid))
 			{
 
-			if (isinput && have_defaults)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-						 errmsg("input parameters after one with a default value must also have defaults"),
-						 parser_errposition(pstate, fp->location)));
+				if (isinput && have_defaults)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
+							 errmsg("input parameters after one with a default value must also have defaults"),
+							 parser_errposition(pstate, fp->location)));
 
-			/*
-			 * For procedures, we also can't allow OUT parameters after one
-			 * with a default, because the same sort of confusion arises in a
-			 * CALL statement.
-			 */
-			if (objtype == OBJECT_PROCEDURE && have_defaults)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-						 errmsg("procedure OUT parameters cannot appear after one with a default value"),
-						 parser_errposition(pstate, fp->location)));
+				/*
+				 * For procedures, we also can't allow OUT parameters after
+				 * one with a default, because the same sort of confusion
+				 * arises in a CALL statement.
+				 */
+				if (objtype == OBJECT_PROCEDURE && have_defaults)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
+							 errmsg("procedure OUT parameters cannot appear after one with a default value"),
+							 parser_errposition(pstate, fp->location)));
 			}
 			else if (compatible_db == ORA_PARSER &&
-					LANG_PLISQL_OID == languageOid &&
-					have_defaults)
+					 LANG_PLISQL_OID == languageOid &&
+					 have_defaults)
 			{
-				/* the parameters after default parameters are always NonDefValNode */
+				/*
+				 * the parameters after default parameters are always
+				 * NonDefValNode
+				 */
 				*parameterDefaults = lappend(*parameterDefaults, makeNode(NonDefValNode));
 			}
 		}
 
 		/*
-		 * Check if the datatype of function parameter is tablename.columnname%TYPE
+		 * Check if the datatype of function parameter is
+		 * tablename.columnname%TYPE
 		 */
 		if (!has_pkg_type &&
 			compatible_db == ORA_PARSER &&
 			LANG_PLISQL_OID == languageOid &&
 			t->pct_type)
 		{
-			RangeVar	*rel = makeRangeVar(NULL, NULL, t->location);
-			Oid 		relid;
+			RangeVar   *rel = makeRangeVar(NULL, NULL, t->location);
+			Oid			relid;
 
 			/* parse name list */
 			switch (list_length(t->names))
 			{
 				case 1:
 					ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("wrong %%TYPE reference (too few dotted names): %s",
-							NameListToString(t->names)),
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("wrong %%TYPE reference (too few dotted names): %s",
+									NameListToString(t->names)),
 							 parser_errposition(pstate, t->location)));
 					break;
 				case 2:
@@ -621,10 +625,10 @@ interpret_function_parameter_list(ParseState *pstate,
 					break;
 				default:
 					ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("wrong %%TYPE reference (too many dotted names): %s",
-							NameListToString(t->names)),
-						 	parser_errposition(pstate, t->location)));
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("wrong %%TYPE reference (too many dotted names): %s",
+									NameListToString(t->names)),
+							 parser_errposition(pstate, t->location)));
 					break;
 			}
 
@@ -637,14 +641,14 @@ interpret_function_parameter_list(ParseState *pstate,
 			}
 		}
 		else if (!has_pkg_type &&
-			compatible_db == ORA_PARSER &&
-			LANG_PLISQL_OID == languageOid &&
-			t->row_type)
+				 compatible_db == ORA_PARSER &&
+				 LANG_PLISQL_OID == languageOid &&
+				 t->row_type)
 		{
-			char		*schema_name = NULL;
-			char		*relname = NULL;
-			RangeVar   	*rel = NULL;
-			Oid 		relid;
+			char	   *schema_name = NULL;
+			char	   *relname = NULL;
+			RangeVar   *rel = NULL;
+			Oid			relid;
 
 			DeconstructQualifiedName(t->names, &schema_name, &relname);
 			rel = makeRangeVar(schema_name, relname, t->location);
@@ -697,7 +701,7 @@ interpret_function_parameter_list(ParseState *pstate,
 				typeNames[i] = CStringGetTextDatum("");
 		}
 		*parametertypeNames = construct_array(typeNames, parameterCount, TEXTOID,
-											-1, false, 'i');
+											  -1, false, 'i');
 	}
 	else
 	{
@@ -750,7 +754,7 @@ compute_common_attribute(ParseState *pstate,
 		*strict_item = defel;
 	}
 	else if (strcmp(defel->defname, "security") == 0 ||
-		(ORA_PARSER == compatible_db && strcmp(defel->defname, "authid") == 0))
+			 (ORA_PARSER == compatible_db && strcmp(defel->defname, "authid") == 0))
 	{
 		if (*security_item)
 			errorConflictingDefElem(defel, pstate);
@@ -798,7 +802,7 @@ compute_common_attribute(ParseState *pstate,
 		*support_item = defel;
 	}
 	else if (strcmp(defel->defname, "parallel") == 0 ||
-		(ORA_PARSER == compatible_db && strcmp(defel->defname, "parallel_enable") == 0))
+			 (ORA_PARSER == compatible_db && strcmp(defel->defname, "parallel_enable") == 0))
 	{
 		if (is_procedure)
 			goto procedure_error;
@@ -1338,8 +1342,8 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 	Form_pg_language languageStruct;
 	List	   *as_clause;
 	char		parallel;
-	ArrayType	*parametertypeNames = NULL;
-	char		*rettypeName = NULL;
+	ArrayType  *parametertypeNames = NULL;
+	char	   *rettypeName = NULL;
 
 	/* Convert list of names to a name and namespace */
 	namespaceId = QualifiedNameGetCreationNamespace(stmt->funcname,
@@ -1463,7 +1467,7 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 									  &variadicArgType,
 									  &requiredResultType,
 									  &parametertypeNames
-									  );
+		);
 
 	if (stmt->is_procedure)
 	{
@@ -1475,26 +1479,26 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 	{
 		/* explicit RETURNS clause */
 		compute_return_type(stmt->returnType, languageOid,
-							&prorettype, &returnsSet, &rettypeName); 
-		if (OidIsValid(requiredResultType) && prorettype != requiredResultType && 
-		    !(compatible_db == ORA_PARSER && LANG_PLISQL_OID == languageOid))
+							&prorettype, &returnsSet, &rettypeName);
+		if (OidIsValid(requiredResultType) && prorettype != requiredResultType &&
+			!(compatible_db == ORA_PARSER && LANG_PLISQL_OID == languageOid))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 					 errmsg("function result type must be %s because of OUT parameters",
 							format_type_be(requiredResultType))));
 
 		/*
-		 * in plisql function, there is no relationship between 
-		 * the function return datatype and out pararmeter datatype
+		 * In PL/iSQL functions, the function return datatype is independent
+		 * of the OUT parameter datatypes.
 		 */
 		if (LANG_PLISQL_OID == languageOid)
 		{
-			/* out parameter exists,  should't return setof */
+			/* If OUT parameters exist, the function must not return SETOF */
 			if (returnsSet && parameterModes != NULL)
 			{
-				char *paramModes = NULL;
-				int numparams = ARR_DIMS(parameterModes)[0];
-				int i;
+				char	   *paramModes = NULL;
+				int			numparams = ARR_DIMS(parameterModes)[0];
+				int			i;
 
 				if (ARR_NDIM(parameterModes) != 1 ||
 					ARR_HASNULL(parameterModes) ||
@@ -1614,14 +1618,14 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 }
 
 /*
- * support oracle grammer like
+ * Support Oracle grammar such as
  * alter function func editionable|noneditionable or compile
- * this function we doesn't consider function arguments and
- * search pg_proc directly, if we found more than one or less
- * than one, we report error.
+ * This function does not consider function arguments and
+ * searches pg_proc directly; if more than one or fewer than one match is
+ * found, report an error.
  */
 ObjectAddress
-CompileFunction(CompileFunctionStmt *stmt)
+CompileFunction(CompileFunctionStmt * stmt)
 {
 	HeapTuple	tup;
 	Oid			funcOid;
@@ -1631,19 +1635,19 @@ CompileFunction(CompileFunctionStmt *stmt)
 	HeapTuple	languageTuple;
 	Form_pg_language langForm;
 	Oid			lanvalidator;
-	Oid relrettypoid = InvalidOid;
+	Oid			relrettypoid = InvalidOid;
 	Oid			argtypes[FUNC_MAX_ARGS];
 	bool		argtypes_change = false;
-	ArrayType	*all_argtypes;
+	ArrayType  *all_argtypes;
 	bool		alltype_change = false;
 	bool		nulls[Natts_pg_proc];
 	Datum		values[Natts_pg_proc];
 	bool		replaces[Natts_pg_proc];
-	int 		i;
-	HeapTuple 	newtuple;
-	ObjectAddress 	myself;
-	MemoryContext 	oldcontext = CurrentMemoryContext;
-	ResourceOwner 	oldowner = CurrentResourceOwner;
+	int			i;
+	HeapTuple	newtuple;
+	ObjectAddress myself;
+	MemoryContext oldcontext = CurrentMemoryContext;
+	ResourceOwner oldowner = CurrentResourceOwner;
 	bool		plisql_check_body = false;
 
 	rel = table_open(ProcedureRelationId, RowExclusiveLock);
@@ -1659,7 +1663,7 @@ CompileFunction(CompileFunctionStmt *stmt)
 	}
 	procForm = (Form_pg_proc) GETSTRUCT(tup);
 
-	/* The OID of plisql language is not fixed */
+	/* The OID of the PL/iSQL language is not fixed */
 	languageTuple = SearchSysCache1(LANGOID, ObjectIdGetDatum(procForm->prolang));
 	if (!HeapTupleIsValid(languageTuple))
 		elog(ERROR, "cache lookup failed for language %u", procForm->prolang);
@@ -1668,8 +1672,8 @@ CompileFunction(CompileFunctionStmt *stmt)
 	lanvalidator = langForm->lanvalidator;
 
 	/*
-	 * alter editable|noneditionable, we only support grammer
-	 * we only compile plisql function
+	 * For ALTER ... EDITIONABLE | NONEDITIONABLE, only grammar is supported;
+	 * compilation applies only to PL/iSQL functions.
 	 */
 	if (!stmt->is_compile || strcmp(NameStr(langForm->lanname), "plisql"))
 	{
@@ -1704,41 +1708,42 @@ CompileFunction(CompileFunctionStmt *stmt)
 		}
 
 		/*
-		 * if function argtypes or rettype is from
-		 * a package, its pg_proc tuple should be changed 
-		 * when its argumentstype or rettype is changed.
+		 * if function argtypes or rettype is from a package, its pg_proc
+		 * tuple should be changed when its argumentstype or rettype is
+		 * changed.
 		 */
 		relrettypoid = get_func_real_rettype(tup);
 		if (procForm->pronargs != 0)
 		{
 			memcpy(argtypes, procForm->proargtypes.values,
-				procForm->pronargs * sizeof(Oid));
+				   procForm->pronargs * sizeof(Oid));
 
 			repl_func_real_argtype(tup, argtypes, procForm->pronargs);
 
 			argtypes_change = (procForm->pronargs != 0 &&
-				memcmp(argtypes, procForm->proargtypes.values,
-				procForm->pronargs * sizeof(Oid)) != 0);
+							   memcmp(argtypes, procForm->proargtypes.values,
+									  procForm->pronargs * sizeof(Oid)) != 0);
 		}
 
 		all_argtypes = get_func_real_allargtype(tup);
 		if (all_argtypes != NULL)
 		{
-			Datum 	proallargtypes;
-			bool	isNull;
-			ArrayType *arr;
-			int	numargs;
+			Datum		proallargtypes;
+			bool		isNull;
+			ArrayType  *arr;
+			int			numargs;
 
 			/* find out the number of parameters and get the types */
 			proallargtypes = SysCacheGetAttr(PROCOID, tup,
-							 Anum_pg_proc_proallargtypes,
-							 &isNull);
+											 Anum_pg_proc_proallargtypes,
+											 &isNull);
 			Assert(!isNull);
 
 			/*
-			 * Expect the arrays to be 1-D arrays of the right types and verify that.  
+			 * Expect the arrays to be 1-D arrays of the right types and
+			 * verify that.
 			 */
-			arr = DatumGetArrayTypeP(proallargtypes);	
+			arr = DatumGetArrayTypeP(proallargtypes);
 			numargs = ARR_DIMS(arr)[0];
 
 			if (ARR_NDIM(arr) != 1 ||
@@ -1748,9 +1753,9 @@ CompileFunction(CompileFunctionStmt *stmt)
 			{
 				elog(ERROR, "proallargtypes is not a 1-D Oid array or it contains nulls");
 			}
-	
+
 			alltype_change = (memcmp(ARR_DATA_PTR(arr),
-						ARR_DATA_PTR(all_argtypes), sizeof(Oid) * numargs) != 0);
+									 ARR_DATA_PTR(all_argtypes), sizeof(Oid) * numargs) != 0);
 		}
 
 		if (relrettypoid != procForm->prorettype ||
@@ -1769,7 +1774,7 @@ CompileFunction(CompileFunctionStmt *stmt)
 			{
 				nulls[Anum_pg_proc_proargtypes - 1] = false;
 				values[Anum_pg_proc_proargtypes - 1] = PointerGetDatum(buildoidvector(argtypes,
-													procForm->pronargs));
+																					  procForm->pronargs));
 				replaces[Anum_pg_proc_proargtypes - 1] = true;
 			}
 
@@ -1817,8 +1822,9 @@ CompileFunction(CompileFunctionStmt *stmt)
 			if (procForm->prostatus == PROSTATUS_NA || procForm->prostatus == PROSTATUS_VALID)
 			{
 				/*
-				 * When lanvalidator failed, just update prostatus to be PROSTATUS_INVALID.
-				 * No need to update prorettype, proargtypes, proallargtypes.
+				 * When lanvalidator failed, just update prostatus to be
+				 * PROSTATUS_INVALID. No need to update prorettype,
+				 * proargtypes, proallargtypes.
 				 */
 				/* emit nuisance notice */
 				ereport(WARNING,
@@ -1911,7 +1917,10 @@ CompileFunction(CompileFunctionStmt *stmt)
 
 			if (plisql_check_body)
 			{
-				/* Commit the inner transaction, return to outer transaction context */
+				/*
+				 * Commit the inner transaction, return to outer transaction
+				 * context
+				 */
 				ReleaseCurrentSubTransaction();
 				MemoryContextSwitchTo(oldcontext);
 				CurrentResourceOwner = oldowner;
@@ -1957,8 +1966,9 @@ CompileFunction(CompileFunctionStmt *stmt)
 							 errposition(edata->cursorpos)));
 
 					/*
-					 * When lanvalidator failed, update prostatus to be PROSTATUS_INVALID.
-					 * no need to update prorettype, proargtypes, proallargtypes.
+					 * When lanvalidator failed, update prostatus to be
+					 * PROSTATUS_INVALID. no need to update prorettype,
+					 * proargtypes, proallargtypes.
 					 */
 					nulls[Anum_pg_proc_prostatus - 1] = false;
 					values[Anum_pg_proc_prostatus - 1] = CharGetDatum(PROSTATUS_INVALID);
@@ -2339,7 +2349,7 @@ CreateCast(CreateCastStmt *stmt)
 					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 					 errmsg("third argument of cast function must be type %s",
 							"boolean")));
-		if (!IsBinaryCoercibleWithCast(get_func_real_rettype(tuple), 
+		if (!IsBinaryCoercibleWithCast(get_func_real_rettype(tuple),
 									   targettypeid,
 									   &outcastid))
 			ereport(ERROR,
@@ -2603,7 +2613,7 @@ CreateTransform(CreateTransformStmt *stmt)
 		if (!HeapTupleIsValid(tuple))
 			elog(ERROR, "cache lookup failed for function %u", fromsqlfuncid);
 		procstruct = (Form_pg_proc) GETSTRUCT(tuple);
-		if (get_func_real_rettype(tuple) != INTERNALOID) 
+		if (get_func_real_rettype(tuple) != INTERNALOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 					 errmsg("return data type of FROM SQL function must be %s",
@@ -2782,8 +2792,8 @@ IsThereFunctionInNamespace(const char *proname, int pronargs,
  * See at ExecuteCallStmt() about the atomic argument.
  */
 void
-ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic, 
-		ParamListInfo params, DestReceiver *dest)
+ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
+			  ParamListInfo params, DestReceiver *dest)
 {
 	InlineCodeBlock *codeblock = makeNode(InlineCodeBlock);
 	ListCell   *arg;
@@ -2794,8 +2804,8 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
 	HeapTuple	languageTuple;
 	Form_pg_language languageStruct;
 	Datum		result;
-	int         oraparam_top_level = -1;
-	int         oraparam_cur_level = -1;
+	int			oraparam_top_level = -1;
+	int			oraparam_cur_level = -1;
 
 
 	/* Process options we got from gram.y */
@@ -2831,15 +2841,16 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
 	if (language_item)
 		language = strVal(language_item->arg);
 	else
-		{
-			/* anonymous block's language default value is plsql
-			 * in oracle compatibility mode
-			 */
-			if (ORA_PARSER == compatible_db)
-				language = "plisql";
-			else
-				language = "plpgsql";
-		}
+	{
+		/*
+		 * anonymous block's language default value is plsql in oracle
+		 * compatibility mode
+		 */
+		if (ORA_PARSER == compatible_db)
+			language = "plisql";
+		else
+			language = "plpgsql";
+	}
 
 	/* Look up the language and validate permissions */
 	languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(language));
@@ -2854,6 +2865,7 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
 	codeblock->langOid = languageStruct->oid;
 	codeblock->langIsTrusted = languageStruct->lanpltrusted;
 	codeblock->atomic = atomic;
+	codeblock->do_from_call = stmt->do_from_call;
 
 	if (languageStruct->lanpltrusted)
 	{
@@ -2861,7 +2873,7 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
 		AclResult	aclresult;
 
 		aclresult = object_aclcheck(LanguageRelationId, codeblock->langOid, GetUserId(),
-										 ACL_USAGE);
+									ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_LANGUAGE,
 						   NameStr(languageStruct->lanname));
@@ -2914,8 +2926,8 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic,
 	if (result != 0 && dest != NULL && stmt->paramsmode != NIL)
 	{
 		HeapTupleHeader td;
-		TupleDesc		tupdesc;
-		HeapTupleData	tmptup;
+		TupleDesc	tupdesc;
+		HeapTupleData tmptup;
 		Tuplestorestate *tupstore;
 		TupleTableSlot *scanslot;
 
@@ -3056,9 +3068,9 @@ ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic, DestReceiver
 	}
 	else
 	{
-			/* Initialize function call structure */
-			InvokeFunctionExecuteHook(fexpr->funcid);
-			fmgr_info(fexpr->funcid, &flinfo);
+		/* Initialize function call structure */
+		InvokeFunctionExecuteHook(fexpr->funcid);
+		fmgr_info(fexpr->funcid, &flinfo);
 	}
 
 	fmgr_info_set_expr((Node *) fexpr, &flinfo);
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 4b7b7dd3394..2d59be3cbee 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -1116,7 +1116,8 @@ DefineIndex(Oid tableId,
 					 errmsg("index creation on system columns is not supported")));
 
 
-		if (TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
+		if (attno > 0 &&
+			TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
 			ereport(ERROR,
 					errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					stmt->primary ?
@@ -1158,7 +1159,8 @@ DefineIndex(Oid tableId,
 		{
 			AttrNumber	attno = j + FirstLowInvalidHeapAttributeNumber;
 
-			if (TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
+			if (attno > 0 &&
+				TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 stmt->isconstraint ?
@@ -2441,8 +2443,8 @@ GetDefaultOpClass(Oid type_id, Oid am_id)
  * Finds an operator from a CompareType.  This is used for temporal index
  * constraints (and other temporal features) to look up equality and overlaps
  * operators.  We ask an opclass support function to translate from the
- * compare type to the internal strategy numbers.  If the function isn't
- * defined or it gives no result, we set *strat to InvalidStrategy.
+ * compare type to the internal strategy numbers.  Raises ERROR on search
+ * failure.
  */
 void
 GetOperatorFromCompareType(Oid opclass, Oid rhstype, CompareType cmptype,
@@ -2844,8 +2846,8 @@ ExecReindex(ParseState *pstate, const ReindexStmt *stmt, bool isTopLevel)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized REINDEX option \"%s\"",
-							opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"REINDEX", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 	}
 
diff --git a/src/backend/commands/meson.build b/src/backend/commands/meson.build
index 7bd25dcb2cd..389006062b1 100644
--- a/src/backend/commands/meson.build
+++ b/src/backend/commands/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_sources += files(
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 43db21f8282..79a5dac9e72 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 673648f1fc6..6274edcd1a9 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -276,7 +276,6 @@ ValidateRestrictionEstimator(List *restrictionName)
 {
 	Oid			typeId[4];
 	Oid			restrictionOid;
-	AclResult	aclresult;
 
 	typeId[0] = INTERNALOID;	/* PlannerInfo */
 	typeId[1] = OIDOID;			/* operator OID */
@@ -292,11 +291,33 @@ ValidateRestrictionEstimator(List *restrictionName)
 				 errmsg("restriction estimator function %s must return type %s",
 						NameListToString(restrictionName), "float8")));
 
-	/* Require EXECUTE rights for the estimator */
-	aclresult = object_aclcheck(ProcedureRelationId, restrictionOid, GetUserId(), ACL_EXECUTE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, OBJECT_FUNCTION,
-					   NameListToString(restrictionName));
+	/*
+	 * If the estimator is not a built-in function, require superuser
+	 * privilege to install it.  This protects against using something that is
+	 * not a restriction estimator or has hard-wired assumptions about what
+	 * data types it is working with.  (Built-in estimators are required to
+	 * defend themselves adequately against unexpected data type choices, but
+	 * it seems impractical to expect that of extensions' estimators.)
+	 *
+	 * If it is built-in, only require EXECUTE rights.
+	 */
+	if (restrictionOid >= FirstGenbkiObjectId)
+	{
+		if (!superuser())
+			ereport(ERROR,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("must be superuser to specify a non-built-in restriction estimator function")));
+	}
+	else
+	{
+		AclResult	aclresult;
+
+		aclresult = object_aclcheck(ProcedureRelationId, restrictionOid,
+									GetUserId(), ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, OBJECT_FUNCTION,
+						   NameListToString(restrictionName));
+	}
 
 	return restrictionOid;
 }
@@ -312,7 +333,6 @@ ValidateJoinEstimator(List *joinName)
 	Oid			typeId[5];
 	Oid			joinOid;
 	Oid			joinOid2;
-	AclResult	aclresult;
 
 	typeId[0] = INTERNALOID;	/* PlannerInfo */
 	typeId[1] = OIDOID;			/* operator OID */
@@ -350,11 +370,24 @@ ValidateJoinEstimator(List *joinName)
 				 errmsg("join estimator function %s must return type %s",
 						NameListToString(joinName), "float8")));
 
-	/* Require EXECUTE rights for the estimator */
-	aclresult = object_aclcheck(ProcedureRelationId, joinOid, GetUserId(), ACL_EXECUTE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, OBJECT_FUNCTION,
-					   NameListToString(joinName));
+	/* privilege checks are the same as in ValidateRestrictionEstimator */
+	if (joinOid >= FirstGenbkiObjectId)
+	{
+		if (!superuser())
+			ereport(ERROR,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("must be superuser to specify a non-built-in join estimator function")));
+	}
+	else
+	{
+		AclResult	aclresult;
+
+		aclresult = object_aclcheck(ProcedureRelationId, joinOid,
+									GetUserId(), ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, OBJECT_FUNCTION,
+						   NameListToString(joinName));
+	}
 
 	return joinOid;
 }
diff --git a/src/backend/commands/packagecmds.c b/src/backend/commands/packagecmds.c
index c7793e473b9..455709d0b5b 100644
--- a/src/backend/commands/packagecmds.c
+++ b/src/backend/commands/packagecmds.c
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package
  *
  *
- * Portions Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/commands/packagecmds.c
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 1bf7eaae5b3..0feec8b765a 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -122,7 +122,12 @@ parse_publication_options(ParseState *pstate,
 			pubactions->pubtruncate = false;
 
 			*publish_given = true;
-			publish = defGetString(defel);
+
+			/*
+			 * SplitIdentifierString destructively modifies its input, so make
+			 * a copy so we don't modify the memory of the executing statement
+			 */
+			publish = pstrdup(defGetString(defel));
 
 			if (!SplitIdentifierString(publish, ',', &publish_list))
 				ereport(ERROR,
@@ -2113,20 +2118,20 @@ AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId)
 static char
 defGetGeneratedColsOption(DefElem *def)
 {
-	char	   *sval;
+	char	   *sval = "";
 
 	/*
-	 * If no parameter value given, assume "stored" is meant.
+	 * A parameter value is required.
 	 */
-	if (!def->arg)
-		return PUBLISH_GENCOLS_STORED;
-
-	sval = defGetString(def);
+	if (def->arg)
+	{
+		sval = defGetString(def);
 
-	if (pg_strcasecmp(sval, "none") == 0)
-		return PUBLISH_GENCOLS_NONE;
-	if (pg_strcasecmp(sval, "stored") == 0)
-		return PUBLISH_GENCOLS_STORED;
+		if (pg_strcasecmp(sval, "none") == 0)
+			return PUBLISH_GENCOLS_NONE;
+		if (pg_strcasecmp(sval, "stored") == 0)
+			return PUBLISH_GENCOLS_STORED;
+	}
 
 	ereport(ERROR,
 			errcode(ERRCODE_SYNTAX_ERROR),
diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 141967b5cc2..7c0f5e48b43 100644
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 446b1aa916e..ca1e9bee42b 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -96,8 +96,8 @@ typedef struct SeqTableData
 typedef SeqTableData *SeqTable;
 
 static HTAB *seqhashtab = NULL; /* hash table for SeqTable items */
-int64	session_id = 0;
-int32	scale_value = 0;
+static int64	session_id = 0;
+static int32	scale_value = 0;
 
 /*
  * last_used_seq is updated by nextval() to point to the last used
@@ -2399,7 +2399,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)
 	DependencyType deptype;
 	int			nnames;
 	Relation	tablerel;
-	AttrNumber	attnum;
+	AttrNumber	attnum = InvalidAttrNumber;
 	char		*seqname;
 
 	deptype = for_identity ? DEPENDENCY_INTERNAL : DEPENDENCY_AUTO;
@@ -2608,7 +2608,6 @@ pg_get_sequence_data(PG_FUNCTION_ARGS)
 {
 #define PG_GET_SEQUENCE_DATA_COLS	2
 	Oid			relid = PG_GETARG_OID(0);
-	SeqTable	elm;
 	Relation	seqrel;
 	Datum		values[PG_GET_SEQUENCE_DATA_COLS] = {0};
 	bool		isnull[PG_GET_SEQUENCE_DATA_COLS] = {0};
@@ -2623,13 +2622,15 @@ pg_get_sequence_data(PG_FUNCTION_ARGS)
 					   BOOLOID, -1, 0);
 	resultTupleDesc = BlessTupleDesc(resultTupleDesc);
 
-	init_sequence(relid, &elm, &seqrel);
+	seqrel = try_relation_open(relid, AccessShareLock);
 
 	/*
-	 * Return all NULLs for sequences for which we lack privileges, other
-	 * sessions' temporary sequences, and unlogged sequences on standbys.
+	 * Return all NULLs for missing sequences, sequences for which we lack
+	 * privileges, other sessions' temporary sequences, and unlogged sequences
+	 * on standbys.
 	 */
-	if (pg_class_aclcheck(relid, GetUserId(), ACL_SELECT) == ACLCHECK_OK &&
+	if (seqrel && seqrel->rd_rel->relkind == RELKIND_SEQUENCE &&
+		pg_class_aclcheck(relid, GetUserId(), ACL_SELECT) == ACLCHECK_OK &&
 		!RELATION_IS_OTHER_TEMP(seqrel) &&
 		(RelationIsPermanent(seqrel) || !RecoveryInProgress()))
 	{
@@ -2647,7 +2648,8 @@ pg_get_sequence_data(PG_FUNCTION_ARGS)
 	else
 		memset(isnull, true, sizeof(isnull));
 
-	sequence_close(seqrel, NoLock);
+	if (seqrel)
+		relation_close(seqrel, AccessShareLock);
 
 	resultHeapTuple = heap_form_tuple(resultTupleDesc, values, isnull);
 	result = HeapTupleGetDatum(resultHeapTuple);
diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c
index e24d540cd45..08dad5fa155 100644
--- a/src/backend/commands/statscmds.c
+++ b/src/backend/commands/statscmds.c
@@ -59,7 +59,7 @@ compare_int16(const void *a, const void *b)
  *		CREATE STATISTICS
  */
 ObjectAddress
-CreateStatistics(CreateStatsStmt *stmt)
+CreateStatistics(CreateStatsStmt *stmt, bool check_rights)
 {
 	int16		attnums[STATS_MAX_DIMENSIONS];
 	int			nattnums = 0;
@@ -134,7 +134,13 @@ CreateStatistics(CreateStatsStmt *stmt)
 							RelationGetRelationName(rel)),
 					 errdetail_relkind_not_supported(rel->rd_rel->relkind)));
 
-		/* You must own the relation to create stats on it */
+		/*
+		 * You must own the relation to create stats on it.
+		 *
+		 * NB: Concurrent changes could cause this function's lookup to find a
+		 * different relation than a previous lookup by the caller, so we must
+		 * perform this check even when check_rights == false.
+		 */
 		if (!object_ownercheck(RelationRelationId, RelationGetRelid(rel), stxowner))
 			aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
@@ -169,6 +175,21 @@ CreateStatistics(CreateStatsStmt *stmt)
 	}
 	namestrcpy(&stxname, namestr);
 
+	/*
+	 * Check we have creation rights in target namespace.  Skip check if
+	 * caller doesn't want it.
+	 */
+	if (check_rights)
+	{
+		AclResult	aclresult;
+
+		aclresult = object_aclcheck(NamespaceRelationId, namespaceId,
+									GetUserId(), ACL_CREATE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
+						   get_namespace_name(namespaceId));
+	}
+
 	/*
 	 * Deal with the possibility that the statistics object already exists.
 	 */
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 3d962e4a09b..3b544f93f49 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -983,10 +983,10 @@ AlterSubscription_refresh(Subscription *sub, bool copy_data,
 					 *
 					 * It is possible that the origin is not yet created for
 					 * tablesync worker, this can happen for the states before
-					 * SUBREL_STATE_FINISHEDCOPY. The tablesync worker or
-					 * apply worker can also concurrently try to drop the
-					 * origin and by this time the origin might be already
-					 * removed. For these reasons, passing missing_ok = true.
+					 * SUBREL_STATE_DATASYNC. The tablesync worker or apply
+					 * worker can also concurrently try to drop the origin and
+					 * by this time the origin might be already removed. For
+					 * these reasons, passing missing_ok = true.
 					 */
 					ReplicationOriginNameForLogicalRep(sub->oid, relid, originname,
 													   sizeof(originname));
@@ -1645,10 +1645,12 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 	bool		must_use_password;
 
 	/*
-	 * Lock pg_subscription with AccessExclusiveLock to ensure that the
-	 * launcher doesn't restart new worker during dropping the subscription
+	 * The launcher may concurrently start a new worker for this subscription.
+	 * During initialization, the worker checks for subscription validity and
+	 * exits if the subscription has already been dropped. See
+	 * InitializeLogRepWorker.
 	 */
-	rel = table_open(SubscriptionRelationId, AccessExclusiveLock);
+	rel = table_open(SubscriptionRelationId, RowExclusiveLock);
 
 	tup = SearchSysCache2(SUBSCRIPTIONNAME, MyDatabaseId,
 						  CStringGetDatum(stmt->subname));
@@ -1788,7 +1790,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 		 *
 		 * It is possible that the origin is not yet created for tablesync
 		 * worker so passing missing_ok = true. This can happen for the states
-		 * before SUBREL_STATE_FINISHEDCOPY.
+		 * before SUBREL_STATE_DATASYNC.
 		 */
 		ReplicationOriginNameForLogicalRep(subid, relid, originname,
 										   sizeof(originname));
@@ -2136,9 +2138,14 @@ check_publications_origin(WalReceiverConn *wrconn, List *publications,
 		Oid			relid = subrel_local_oids[i];
 		char	   *schemaname = get_namespace_name(get_rel_namespace(relid));
 		char	   *tablename = get_rel_name(relid);
+		char	   *schemaname_lit = quote_literal_cstr(schemaname);
+		char	   *tablename_lit = quote_literal_cstr(tablename);
+
+		appendStringInfo(&cmd, "AND NOT (N.nspname = %s AND C.relname = %s)\n",
+						 schemaname_lit, tablename_lit);
 
-		appendStringInfo(&cmd, "AND NOT (N.nspname = '%s' AND C.relname = '%s')\n",
-						 schemaname, tablename);
+		pfree(schemaname_lit);
+		pfree(tablename_lit);
 	}
 
 	res = walrcv_exec(wrconn, cmd.data, 1, tableRow);
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 31aec67685d..2a75cfe13b4 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -799,6 +799,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	List	   *rawDefaults;
 	List	   *cookedDefaults;
 	List	   *nncols;
+	List	   *connames = NIL;
 	Datum		reloptions;
 	ListCell   *listptr;
 	AttrNumber	attnum;
@@ -1415,11 +1416,20 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	/*
 	 * Now add any newly specified CHECK constraints to the new relation. Same
 	 * as for defaults above, but these need to come after partitioning is set
-	 * up.
+	 * up.  We save the constraint names that were used, to avoid dupes below.
 	 */
 	if (stmt->constraints)
-		AddRelationNewConstraints(rel, NIL, stmt->constraints,
-								  true, true, false, queryString);
+	{
+		List	   *conlist;
+
+		conlist = AddRelationNewConstraints(rel, NIL, stmt->constraints,
+											true, true, false, queryString);
+		foreach_ptr(CookedConstraint, cons, conlist)
+		{
+			if (cons->name != NULL)
+				connames = lappend(connames, cons->name);
+		}
+	}
 
 	/*
 	 * Finally, merge the not-null constraints that are declared directly with
@@ -1428,7 +1438,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	 * columns that don't yet have it.
 	 */
 	nncols = AddRelationNotNullConstraints(rel, stmt->nnconstraints,
-										   old_notnulls);
+										   old_notnulls, connames);
 	foreach_int(attrnum, nncols)
 		set_attnotnull(NULL, rel, attrnum, true, false);
 
@@ -6957,6 +6967,8 @@ alter_table_type_to_string(AlterTableType cmdtype)
 			return "ALTER TABLE ... SET WITH ROWID";
 		case AT_DropRowids:
 			return "ALTER TABLE ... SET WITHOUT ROWID";
+		case AT_ForceViewCompile:
+			return NULL;
 	}
 
 	return NULL;
@@ -8495,12 +8507,12 @@ ATExecSetNotNull(List **wqueue, Relation rel, char *conName, char *colName,
 	ccon = linitial(cooked);
 	ObjectAddressSet(address, ConstraintRelationId, ccon->conoid);
 
-	InvokeObjectPostAlterHook(RelationRelationId,
-							  RelationGetRelid(rel), attnum);
-
 	/* Mark pg_attribute.attnotnull for the column and queue validation */
 	set_attnotnull(wqueue, rel, attnum, true, true);
 
+	InvokeObjectPostAlterHook(RelationRelationId,
+							  RelationGetRelid(rel), attnum);
+
 	/*
 	 * Recurse to propagate the constraint to children that don't have one.
 	 */
@@ -8734,6 +8746,31 @@ ATExecAddIdentity(Relation rel, const char *colName,
 				 errmsg("column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added",
 						colName, RelationGetRelationName(rel))));
 
+	/*
+	 * On the other hand, if a not-null constraint exists, then verify that
+	 * it's compatible.
+	 */
+	if (attTup->attnotnull)
+	{
+		HeapTuple	contup;
+		Form_pg_constraint conForm;
+
+		contup = findNotNullConstraintAttnum(RelationGetRelid(rel),
+											 attnum);
+		if (!HeapTupleIsValid(contup))
+			elog(ERROR, "cache lookup failed for not-null constraint on column \"%s\" of relation \"%s\"",
+				 colName, RelationGetRelationName(rel));
+
+		conForm = (Form_pg_constraint) GETSTRUCT(contup);
+		if (!conForm->convalidated)
+			ereport(ERROR,
+					errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					errmsg("incompatible NOT VALID constraint \"%s\" on relation \"%s\"",
+						   NameStr(conForm->conname), RelationGetRelationName(rel)),
+					errhint("You might need to validate it using %s.",
+							"ALTER TABLE ... VALIDATE CONSTRAINT"));
+	}
+
 	if (attTup->attidentity)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -10185,7 +10222,7 @@ ATExecAddStatistics(AlteredTableInfo *tab, Relation rel,
 	/* The CreateStatsStmt has already been through transformStatsStmt */
 	Assert(stmt->transformed);
 
-	address = CreateStatistics(stmt);
+	address = CreateStatistics(stmt, !is_rebuild);
 
 	return address;
 }
@@ -12969,6 +13006,8 @@ ATExecAlterConstrEnforceability(List **wqueue, ATAlterConstraint *cmdcon,
 		fkconstraint->fk_matchtype = currcon->confmatchtype;
 		fkconstraint->fk_upd_action = currcon->confupdtype;
 		fkconstraint->fk_del_action = currcon->confdeltype;
+		fkconstraint->deferrable = currcon->condeferrable;
+		fkconstraint->initdeferred = currcon->condeferred;
 
 		/* Create referenced triggers */
 		if (currcon->conrelid == fkrelid)
@@ -15640,7 +15679,7 @@ RememberAllDependentForRebuilding(AlteredTableInfo *tab, AlterTableType subtype,
 	ScanKeyData key[3];
 	SysScanDesc scan;
 	HeapTuple	depTup;
-	ObjectFunOrPkg *dependentFuncPkgOids;
+	ObjectFunOrPkg *dependentFuncPkgOids = NULL;
 	bool		FuncPkgDepend = false;
 
 	if(NULL != numDependentFuncPkgOids  &&
@@ -15651,6 +15690,7 @@ RememberAllDependentForRebuilding(AlteredTableInfo *tab, AlterTableType subtype,
 		dependentFuncPkgOids = *dependentFuncPkg;
 	}
 
+
 	Assert(subtype == AT_AlterColumnType || subtype == AT_SetExpression);
 
 	depRel = table_open(DependRelationId, RowExclusiveLock);
@@ -16263,6 +16303,14 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
 		Oid			relid;
 
 		relid = IndexGetRelation(oldId, false);
+
+		/*
+		 * As above, make sure we have lock on the index's table if it's not
+		 * the same table.
+		 */
+		if (relid != tab->relid)
+			LockRelationOid(relid, AccessExclusiveLock);
+
 		ATPostAlterTypeParse(oldId, relid, InvalidOid,
 							 (char *) lfirst(def_item),
 							 wqueue, lockmode, tab->rewrite);
@@ -16279,6 +16327,20 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
 		Oid			relid;
 
 		relid = StatisticsGetRelation(oldId, false);
+
+		/*
+		 * As above, make sure we have lock on the statistics object's table
+		 * if it's not the same table.  However, we take
+		 * ShareUpdateExclusiveLock here, aligning with the lock level used in
+		 * CreateStatistics and RemoveStatisticsById.
+		 *
+		 * CAUTION: this should be done after all cases that grab
+		 * AccessExclusiveLock, else we risk causing deadlock due to needing
+		 * to promote our table lock.
+		 */
+		if (relid != tab->relid)
+			LockRelationOid(relid, ShareUpdateExclusiveLock);
+
 		ATPostAlterTypeParse(oldId, relid, InvalidOid,
 							 (char *) lfirst(def_item),
 							 wqueue, lockmode, tab->rewrite);
@@ -20563,6 +20625,8 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
 			/* Expression */
 			Node	   *expr = pelem->expr;
 			char		partattname[16];
+			Bitmapset  *expr_attrs = NULL;
+			int			i;
 
 			Assert(expr != NULL);
 			atttype = exprType(expr);
@@ -20586,43 +20650,36 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
 			while (IsA(expr, CollateExpr))
 				expr = (Node *) ((CollateExpr *) expr)->arg;
 
-			if (IsA(expr, Var) &&
-				((Var *) expr)->varattno > 0)
+			/*
+			 * Examine all the columns in the partition key expression. When
+			 * the whole-row reference is present, examine all the columns of
+			 * the partitioned table.
+			 */
+			pull_varattnos(expr, 1, &expr_attrs);
+			if (bms_is_member(0 - FirstLowInvalidHeapAttributeNumber, expr_attrs))
 			{
-				/*
-				 * User wrote "(column)" or "(column COLLATE something)".
-				 * Treat it like simple attribute anyway.
-				 */
-				partattrs[attn] = ((Var *) expr)->varattno;
+				expr_attrs = bms_add_range(expr_attrs,
+										   1 - FirstLowInvalidHeapAttributeNumber,
+										   RelationGetNumberOfAttributes(rel) - FirstLowInvalidHeapAttributeNumber);
+				expr_attrs = bms_del_member(expr_attrs, 0 - FirstLowInvalidHeapAttributeNumber);
 			}
-			else
+
+			i = -1;
+			while ((i = bms_next_member(expr_attrs, i)) >= 0)
 			{
-				Bitmapset  *expr_attrs = NULL;
-				int			i;
+				AttrNumber	attno = i + FirstLowInvalidHeapAttributeNumber;
 
-				partattrs[attn] = 0;	/* marks the column as expression */
-				*partexprs = lappend(*partexprs, expr);
-
-				/*
-				 * transformPartitionSpec() should have already rejected
-				 * subqueries, aggregates, window functions, and SRFs, based
-				 * on the EXPR_KIND_ for partition expressions.
-				 */
+				Assert(attno != 0);
 
 				/*
 				 * Cannot allow system column references, since that would
 				 * make partition routing impossible: their values won't be
 				 * known yet when we need to do that.
 				 */
-				pull_varattnos(expr, 1, &expr_attrs);
-				for (i = FirstLowInvalidHeapAttributeNumber; i < 0; i++)
-				{
-					if (bms_is_member(i - FirstLowInvalidHeapAttributeNumber,
-									  expr_attrs))
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("partition key expressions cannot contain system column references")));
-				}
+				if (attno < 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+							 errmsg("partition key expressions cannot contain system column references")));
 
 				/*
 				 * Stored generated columns cannot work: They are computed
@@ -20632,20 +20689,35 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
 				 * SET EXPRESSION would need to check whether the column is
 				 * used in partition keys).  Seems safer to prohibit for now.
 				 */
-				i = -1;
-				while ((i = bms_next_member(expr_attrs, i)) >= 0)
-				{
-					AttrNumber	attno = i + FirstLowInvalidHeapAttributeNumber;
+				if (TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+							 errmsg("cannot use generated column in partition key"),
+							 errdetail("Column \"%s\" is a generated column.",
+									   get_attname(RelationGetRelid(rel), attno, false)),
+							 parser_errposition(pstate, pelem->location)));
+			}
 
-					if (attno > 0 &&
-						TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated)
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("cannot use generated column in partition key"),
-								 errdetail("Column \"%s\" is a generated column.",
-										   get_attname(RelationGetRelid(rel), attno, false)),
-								 parser_errposition(pstate, pelem->location)));
-				}
+			if (IsA(expr, Var) &&
+				((Var *) expr)->varattno > 0)
+			{
+
+				/*
+				 * User wrote "(column)" or "(column COLLATE something)".
+				 * Treat it like simple attribute anyway.
+				 */
+				partattrs[attn] = ((Var *) expr)->varattno;
+			}
+			else
+			{
+				partattrs[attn] = 0;	/* marks the column as expression */
+				*partexprs = lappend(*partexprs, expr);
+
+				/*
+				 * transformPartitionSpec() should have already rejected
+				 * subqueries, aggregates, window functions, and SRFs, based
+				 * on the EXPR_KIND_ for partition expressions.
+				 */
 
 				/*
 				 * Preprocess the expression before checking for mutability.
@@ -21623,13 +21695,14 @@ ATExecDetachPartition(List **wqueue, AlteredTableInfo *tab, Relation rel,
 	Relation	partRel;
 	ObjectAddress address;
 	Oid			defaultPartOid;
+	PartitionDesc partdesc;
 
 	/*
 	 * We must lock the default partition, because detaching this partition
 	 * will change its partition constraint.
 	 */
-	defaultPartOid =
-		get_default_oid_from_partdesc(RelationGetPartitionDesc(rel, true));
+	partdesc = RelationGetPartitionDesc(rel, true);
+	defaultPartOid = get_default_oid_from_partdesc(partdesc);
 	if (OidIsValid(defaultPartOid))
 	{
 		/*
@@ -21696,10 +21769,13 @@ ATExecDetachPartition(List **wqueue, AlteredTableInfo *tab, Relation rel,
 		char	   *partrelname;
 
 		/*
-		 * Add a new constraint to the partition being detached, which
-		 * supplants the partition constraint (unless there is one already).
+		 * For strategies other than hash, add a constraint to the partition
+		 * being detached which supplants the partition constraint. For hash
+		 * we cannot do that, because the constraint would reference the
+		 * partitioned table OID, possibly causing problems later.
 		 */
-		DetachAddConstraintIfNeeded(wqueue, partRel);
+		if (partdesc->boundinfo->strategy != PARTITION_STRATEGY_HASH)
+			DetachAddConstraintIfNeeded(wqueue, partRel);
 
 		/*
 		 * We're almost done now; the only traces that remain are the
@@ -22373,7 +22449,10 @@ ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name)
 
 	ObjectAddressSet(address, RelationRelationId, RelationGetRelid(partIdx));
 
-	/* Silently do nothing if already in the right state */
+	/*
+	 * Check if the index is already attached to the correct parent,
+	 * ultimately attempting one round of validation if already the case.
+	 */
 	currParent = partIdx->rd_rel->relispartition ?
 		get_partition_parent(partIdxId, false) : InvalidOid;
 	if (currParent != RelationGetRelid(parentIdx))
@@ -22482,6 +22561,14 @@ ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name)
 
 		validatePartitionedIndex(parentIdx, parentTbl);
 	}
+	else if (!parentIdx->rd_index->indisvalid)
+	{
+		/*
+		 * The index is attached, but the parent is still invalid; see if it
+		 * can be validated now.
+		 */
+		validatePartitionedIndex(parentIdx, parentTbl);
+	}
 
 	relation_close(parentTbl, AccessShareLock);
 	/* keep these locks till commit */
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 67f8e70f9c1..17f1e224f91 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -80,6 +80,7 @@ static bool GetTupleForTrigger(EState *estate,
 							   ItemPointer tid,
 							   LockTupleMode lockmode,
 							   TupleTableSlot *oldslot,
+							   bool do_epq_recheck,
 							   TupleTableSlot **epqslot,
 							   TM_Result *tmresultp,
 							   TM_FailureData *tmfdp);
@@ -2284,6 +2285,8 @@ FindTriggerIncompatibleWithInheritance(TriggerDesc *trigdesc)
 		{
 			Trigger    *trigger = &trigdesc->triggers[i];
 
+			if (!TRIGGER_FOR_ROW(trigger->tgtype))
+				continue;
 			if (trigger->tgoldtable != NULL || trigger->tgnewtable != NULL)
 				return trigger->tgname;
 		}
@@ -2544,6 +2547,15 @@ ExecARInsertTriggers(EState *estate, ResultRelInfo *relinfo,
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 
+	if (relinfo->ri_FdwRoutine && transition_capture &&
+		transition_capture->tcs_insert_new_table)
+	{
+		Assert(relinfo->ri_RootResultRelInfo);
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot collect transition tuples from child foreign tables")));
+	}
+
 	if ((trigdesc && trigdesc->trig_insert_after_row) ||
 		(transition_capture && transition_capture->tcs_insert_new_table))
 		AfterTriggerSaveEvent(estate, relinfo, NULL, NULL,
@@ -2693,7 +2705,8 @@ ExecBRDeleteTriggers(EState *estate, EPQState *epqstate,
 					 HeapTuple fdw_trigtuple,
 					 TupleTableSlot **epqslot,
 					 TM_Result *tmresult,
-					 TM_FailureData *tmfd)
+					 TM_FailureData *tmfd,
+					 bool is_merge_delete)
 {
 	TupleTableSlot *slot = ExecGetTriggerOldSlot(estate, relinfo);
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
@@ -2708,9 +2721,17 @@ ExecBRDeleteTriggers(EState *estate, EPQState *epqstate,
 	{
 		TupleTableSlot *epqslot_candidate = NULL;
 
+		/*
+		 * Get a copy of the on-disk tuple we are planning to delete.  In
+		 * general, if the tuple has been concurrently updated, we should
+		 * recheck it using EPQ.  However, if this is a MERGE DELETE action,
+		 * we skip this EPQ recheck and leave it to the caller (it must do
+		 * additional rechecking, and might end up executing a different
+		 * action entirely).
+		 */
 		if (!GetTupleForTrigger(estate, epqstate, relinfo, tupleid,
-								LockTupleExclusive, slot, &epqslot_candidate,
-								tmresult, tmfd))
+								LockTupleExclusive, slot, !is_merge_delete,
+								&epqslot_candidate, tmresult, tmfd))
 			return false;
 
 		/*
@@ -2787,6 +2808,15 @@ ExecARDeleteTriggers(EState *estate,
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 
+	if (relinfo->ri_FdwRoutine && transition_capture &&
+		transition_capture->tcs_delete_old_table)
+	{
+		Assert(relinfo->ri_RootResultRelInfo);
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot collect transition tuples from child foreign tables")));
+	}
+
 	if ((trigdesc && trigdesc->trig_delete_after_row) ||
 		(transition_capture && transition_capture->tcs_delete_old_table))
 	{
@@ -2800,6 +2830,7 @@ ExecARDeleteTriggers(EState *estate,
 							   tupleid,
 							   LockTupleExclusive,
 							   slot,
+							   false,
 							   NULL,
 							   NULL,
 							   NULL);
@@ -2944,7 +2975,8 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 					 HeapTuple fdw_trigtuple,
 					 TupleTableSlot *newslot,
 					 TM_Result *tmresult,
-					 TM_FailureData *tmfd)
+					 TM_FailureData *tmfd,
+					 bool is_merge_update)
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 	TupleTableSlot *oldslot = ExecGetTriggerOldSlot(estate, relinfo);
@@ -2965,10 +2997,17 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 	{
 		TupleTableSlot *epqslot_candidate = NULL;
 
-		/* get a copy of the on-disk tuple we are planning to update */
+		/*
+		 * Get a copy of the on-disk tuple we are planning to update.  In
+		 * general, if the tuple has been concurrently updated, we should
+		 * recheck it using EPQ.  However, if this is a MERGE UPDATE action,
+		 * we skip this EPQ recheck and leave it to the caller (it must do
+		 * additional rechecking, and might end up executing a different
+		 * action entirely).
+		 */
 		if (!GetTupleForTrigger(estate, epqstate, relinfo, tupleid,
-								lockmode, oldslot, &epqslot_candidate,
-								tmresult, tmfd))
+								lockmode, oldslot, !is_merge_update,
+								&epqslot_candidate, tmresult, tmfd))
 			return false;		/* cancel the update action */
 
 		/*
@@ -3115,6 +3154,16 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 
+	if (relinfo->ri_FdwRoutine && transition_capture &&
+		(transition_capture->tcs_update_old_table ||
+		 transition_capture->tcs_update_new_table))
+	{
+		Assert(relinfo->ri_RootResultRelInfo);
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot collect transition tuples from child foreign tables")));
+	}
+
 	if ((trigdesc && trigdesc->trig_update_after_row) ||
 		(transition_capture &&
 		 (transition_capture->tcs_update_old_table ||
@@ -3142,6 +3191,7 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 							   tupleid,
 							   LockTupleExclusive,
 							   oldslot,
+							   false,
 							   NULL,
 							   NULL,
 							   NULL);
@@ -3298,6 +3348,7 @@ GetTupleForTrigger(EState *estate,
 				   ItemPointer tid,
 				   LockTupleMode lockmode,
 				   TupleTableSlot *oldslot,
+				   bool do_epq_recheck,
 				   TupleTableSlot **epqslot,
 				   TM_Result *tmresultp,
 				   TM_FailureData *tmfdp)
@@ -3357,29 +3408,30 @@ GetTupleForTrigger(EState *estate,
 				if (tmfd.traversed)
 				{
 					/*
-					 * Recheck the tuple using EPQ. For MERGE, we leave this
-					 * to the caller (it must do additional rechecking, and
-					 * might end up executing a different action entirely).
+					 * Recheck the tuple using EPQ, if requested.  Otherwise,
+					 * just return that it was concurrently updated.
 					 */
-					if (estate->es_plannedstmt->commandType == CMD_MERGE)
+					if (do_epq_recheck)
 					{
-						if (tmresultp)
-							*tmresultp = TM_Updated;
-						return false;
+						*epqslot = EvalPlanQual(epqstate,
+												relation,
+												relinfo->ri_RangeTableIndex,
+												oldslot);
+
+						/*
+						 * If PlanQual failed for updated tuple - we must not
+						 * process this tuple!
+						 */
+						if (TupIsNull(*epqslot))
+						{
+							*epqslot = NULL;
+							return false;
+						}
 					}
-
-					*epqslot = EvalPlanQual(epqstate,
-											relation,
-											relinfo->ri_RangeTableIndex,
-											oldslot);
-
-					/*
-					 * If PlanQual failed for updated tuple - we must not
-					 * process this tuple!
-					 */
-					if (TupIsNull(*epqslot))
+					else
 					{
-						*epqslot = NULL;
+						if (tmresultp)
+							*tmresultp = TM_Updated;
 						return false;
 					}
 				}
@@ -3868,21 +3920,10 @@ struct AfterTriggersTableData
 	bool		after_trig_done;	/* did we already queue AS triggers? */
 	AfterTriggerEventList after_trig_events;	/* if so, saved list pointer */
 
-	/*
-	 * We maintain separate transition tables for UPDATE/INSERT/DELETE since
-	 * MERGE can run all three actions in a single statement. Note that UPDATE
-	 * needs both old and new transition tables whereas INSERT needs only new,
-	 * and DELETE needs only old.
-	 */
-
-	/* "old" transition table for UPDATE, if any */
-	Tuplestorestate *old_upd_tuplestore;
-	/* "new" transition table for UPDATE, if any */
-	Tuplestorestate *new_upd_tuplestore;
-	/* "old" transition table for DELETE, if any */
-	Tuplestorestate *old_del_tuplestore;
-	/* "new" transition table for INSERT, if any */
-	Tuplestorestate *new_ins_tuplestore;
+	/* "old" transition table for UPDATE/DELETE, if any */
+	Tuplestorestate *old_tuplestore;
+	/* "new" transition table for INSERT/UPDATE, if any */
+	Tuplestorestate *new_tuplestore;
 
 	TupleTableSlot *storeslot;	/* for converting to tuplestore's format */
 };
@@ -3909,6 +3950,7 @@ static Tuplestorestate *GetAfterTriggersTransitionTable(int event,
 														TupleTableSlot *newslot,
 														TransitionCaptureState *transition_capture);
 static void TransitionTableAddTuple(EState *estate,
+									int event,
 									TransitionCaptureState *transition_capture,
 									ResultRelInfo *relinfo,
 									TupleTableSlot *slot,
@@ -4476,19 +4518,13 @@ AfterTriggerExecute(EState *estate,
 	{
 		if (LocTriggerData.tg_trigger->tgoldtable)
 		{
-			if (TRIGGER_FIRED_BY_UPDATE(evtshared->ats_event))
-				LocTriggerData.tg_oldtable = evtshared->ats_table->old_upd_tuplestore;
-			else
-				LocTriggerData.tg_oldtable = evtshared->ats_table->old_del_tuplestore;
+			LocTriggerData.tg_oldtable = evtshared->ats_table->old_tuplestore;
 			evtshared->ats_table->closed = true;
 		}
 
 		if (LocTriggerData.tg_trigger->tgnewtable)
 		{
-			if (TRIGGER_FIRED_BY_INSERT(evtshared->ats_event))
-				LocTriggerData.tg_newtable = evtshared->ats_table->new_ins_tuplestore;
-			else
-				LocTriggerData.tg_newtable = evtshared->ats_table->new_upd_tuplestore;
+			LocTriggerData.tg_newtable = evtshared->ats_table->new_tuplestore;
 			evtshared->ats_table->closed = true;
 		}
 	}
@@ -4835,6 +4871,11 @@ GetAfterTriggersTableData(Oid relid, CmdType cmdType)
 	MemoryContext oldcxt;
 	ListCell   *lc;
 
+	/* At this level, cmdType should not be, eg, CMD_MERGE */
+	Assert(cmdType == CMD_INSERT ||
+		   cmdType == CMD_UPDATE ||
+		   cmdType == CMD_DELETE);
+
 	/* Caller should have ensured query_depth is OK. */
 	Assert(afterTriggers.query_depth >= 0 &&
 		   afterTriggers.query_depth < afterTriggers.maxquerydepth);
@@ -4921,7 +4962,9 @@ MakeTransitionCaptureState(TriggerDesc *trigdesc, Oid relid, CmdType cmdType)
 				need_new_upd,
 				need_old_del,
 				need_new_ins;
-	AfterTriggersTableData *table;
+	AfterTriggersTableData *ins_table;
+	AfterTriggersTableData *upd_table;
+	AfterTriggersTableData *del_table;
 	MemoryContext oldcxt;
 	ResourceOwner saveResourceOwner;
 
@@ -4968,10 +5011,15 @@ MakeTransitionCaptureState(TriggerDesc *trigdesc, Oid relid, CmdType cmdType)
 		AfterTriggerEnlargeQueryState();
 
 	/*
-	 * Find or create an AfterTriggersTableData struct to hold the
+	 * Find or create AfterTriggersTableData struct(s) to hold the
 	 * tuplestore(s).  If there's a matching struct but it's marked closed,
 	 * ignore it; we need a newer one.
 	 *
+	 * Note: MERGE must use the same AfterTriggersTableData structs as INSERT,
+	 * UPDATE, and DELETE, so that any MERGE'd tuples are added to the same
+	 * tuplestores as tuples from any INSERT, UPDATE, or DELETE commands
+	 * running in the same top-level command (e.g., in a writable CTE).
+	 *
 	 * Note: the AfterTriggersTableData list, as well as the tuplestores, are
 	 * allocated in the current (sub)transaction's CurTransactionContext, and
 	 * the tuplestores are managed by the (sub)transaction's resource owner.
@@ -4979,21 +5027,34 @@ MakeTransitionCaptureState(TriggerDesc *trigdesc, Oid relid, CmdType cmdType)
 	 * transition tables to be deferrable; they will be fired during
 	 * AfterTriggerEndQuery, after which it's okay to delete the data.
 	 */
-	table = GetAfterTriggersTableData(relid, cmdType);
+	if (need_new_ins)
+		ins_table = GetAfterTriggersTableData(relid, CMD_INSERT);
+	else
+		ins_table = NULL;
+
+	if (need_old_upd || need_new_upd)
+		upd_table = GetAfterTriggersTableData(relid, CMD_UPDATE);
+	else
+		upd_table = NULL;
+
+	if (need_old_del)
+		del_table = GetAfterTriggersTableData(relid, CMD_DELETE);
+	else
+		del_table = NULL;
 
 	/* Now create required tuplestore(s), if we don't have them already. */
 	oldcxt = MemoryContextSwitchTo(CurTransactionContext);
 	saveResourceOwner = CurrentResourceOwner;
 	CurrentResourceOwner = CurTransactionResourceOwner;
 
-	if (need_old_upd && table->old_upd_tuplestore == NULL)
-		table->old_upd_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-	if (need_new_upd && table->new_upd_tuplestore == NULL)
-		table->new_upd_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-	if (need_old_del && table->old_del_tuplestore == NULL)
-		table->old_del_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-	if (need_new_ins && table->new_ins_tuplestore == NULL)
-		table->new_ins_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+	if (need_old_upd && upd_table->old_tuplestore == NULL)
+		upd_table->old_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+	if (need_new_upd && upd_table->new_tuplestore == NULL)
+		upd_table->new_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+	if (need_old_del && del_table->old_tuplestore == NULL)
+		del_table->old_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+	if (need_new_ins && ins_table->new_tuplestore == NULL)
+		ins_table->new_tuplestore = tuplestore_begin_heap(false, false, work_mem);
 
 	CurrentResourceOwner = saveResourceOwner;
 	MemoryContextSwitchTo(oldcxt);
@@ -5004,7 +5065,9 @@ MakeTransitionCaptureState(TriggerDesc *trigdesc, Oid relid, CmdType cmdType)
 	state->tcs_update_old_table = need_old_upd;
 	state->tcs_update_new_table = need_new_upd;
 	state->tcs_insert_new_table = need_new_ins;
-	state->tcs_private = table;
+	state->tcs_insert_private = ins_table;
+	state->tcs_update_private = upd_table;
+	state->tcs_delete_private = del_table;
 
 	return state;
 }
@@ -5182,20 +5245,12 @@ AfterTriggerFreeQuery(AfterTriggersQueryData *qs)
 	{
 		AfterTriggersTableData *table = (AfterTriggersTableData *) lfirst(lc);
 
-		ts = table->old_upd_tuplestore;
-		table->old_upd_tuplestore = NULL;
-		if (ts)
-			tuplestore_end(ts);
-		ts = table->new_upd_tuplestore;
-		table->new_upd_tuplestore = NULL;
-		if (ts)
-			tuplestore_end(ts);
-		ts = table->old_del_tuplestore;
-		table->old_del_tuplestore = NULL;
+		ts = table->old_tuplestore;
+		table->old_tuplestore = NULL;
 		if (ts)
 			tuplestore_end(ts);
-		ts = table->new_ins_tuplestore;
-		table->new_ins_tuplestore = NULL;
+		ts = table->new_tuplestore;
+		table->new_tuplestore = NULL;
 		if (ts)
 			tuplestore_end(ts);
 		if (table->storeslot)
@@ -5506,17 +5561,17 @@ GetAfterTriggersTransitionTable(int event,
 	{
 		Assert(TupIsNull(newslot));
 		if (event == TRIGGER_EVENT_DELETE && delete_old_table)
-			tuplestore = transition_capture->tcs_private->old_del_tuplestore;
+			tuplestore = transition_capture->tcs_delete_private->old_tuplestore;
 		else if (event == TRIGGER_EVENT_UPDATE && update_old_table)
-			tuplestore = transition_capture->tcs_private->old_upd_tuplestore;
+			tuplestore = transition_capture->tcs_update_private->old_tuplestore;
 	}
 	else if (!TupIsNull(newslot))
 	{
 		Assert(TupIsNull(oldslot));
 		if (event == TRIGGER_EVENT_INSERT && insert_new_table)
-			tuplestore = transition_capture->tcs_private->new_ins_tuplestore;
+			tuplestore = transition_capture->tcs_insert_private->new_tuplestore;
 		else if (event == TRIGGER_EVENT_UPDATE && update_new_table)
-			tuplestore = transition_capture->tcs_private->new_upd_tuplestore;
+			tuplestore = transition_capture->tcs_update_private->new_tuplestore;
 	}
 
 	return tuplestore;
@@ -5530,6 +5585,7 @@ GetAfterTriggersTransitionTable(int event,
  */
 static void
 TransitionTableAddTuple(EState *estate,
+						int event,
 						TransitionCaptureState *transition_capture,
 						ResultRelInfo *relinfo,
 						TupleTableSlot *slot,
@@ -5548,9 +5604,26 @@ TransitionTableAddTuple(EState *estate,
 		tuplestore_puttupleslot(tuplestore, original_insert_tuple);
 	else if ((map = ExecGetChildToRootMap(relinfo)) != NULL)
 	{
-		AfterTriggersTableData *table = transition_capture->tcs_private;
+		AfterTriggersTableData *table;
 		TupleTableSlot *storeslot;
 
+		switch (event)
+		{
+			case TRIGGER_EVENT_INSERT:
+				table = transition_capture->tcs_insert_private;
+				break;
+			case TRIGGER_EVENT_UPDATE:
+				table = transition_capture->tcs_update_private;
+				break;
+			case TRIGGER_EVENT_DELETE:
+				table = transition_capture->tcs_delete_private;
+				break;
+			default:
+				elog(ERROR, "invalid after-trigger event code: %d", event);
+				table = NULL;	/* keep compiler quiet */
+				break;
+		}
+
 		storeslot = GetAfterTriggersStoreSlot(table, map->outdesc);
 		execute_attr_map_slot(map->attrMap, slot, storeslot);
 		tuplestore_puttupleslot(tuplestore, storeslot);
@@ -6144,7 +6217,7 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 															 oldslot,
 															 NULL,
 															 transition_capture);
-			TransitionTableAddTuple(estate, transition_capture, relinfo,
+			TransitionTableAddTuple(estate, event, transition_capture, relinfo,
 									oldslot, NULL, old_tuplestore);
 		}
 
@@ -6160,7 +6233,7 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 															 NULL,
 															 newslot,
 															 transition_capture);
-			TransitionTableAddTuple(estate, transition_capture, relinfo,
+			TransitionTableAddTuple(estate, event, transition_capture, relinfo,
 									newslot, original_insert_tuple, new_tuplestore);
 		}
 
@@ -6463,7 +6536,24 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 		new_shared.ats_firing_id = 0;
 		if ((trigger->tgoldtable || trigger->tgnewtable) &&
 			transition_capture != NULL)
-			new_shared.ats_table = transition_capture->tcs_private;
+		{
+			switch (event)
+			{
+				case TRIGGER_EVENT_INSERT:
+					new_shared.ats_table = transition_capture->tcs_insert_private;
+					break;
+				case TRIGGER_EVENT_UPDATE:
+					new_shared.ats_table = transition_capture->tcs_update_private;
+					break;
+				case TRIGGER_EVENT_DELETE:
+					new_shared.ats_table = transition_capture->tcs_delete_private;
+					break;
+				default:
+					/* Must be TRUNCATE, see switch above */
+					new_shared.ats_table = NULL;
+					break;
+			}
+		}
 		else
 			new_shared.ats_table = NULL;
 		new_shared.ats_modifiedcols = modifiedCols;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 06af9e53eef..da213c37f07 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -940,11 +940,19 @@ DefineDomain(ParseState *pstate, CreateDomainStmt *stmt)
 				break;
 
 			case CONSTR_NOTNULL:
-				if (nullDefined && !typNotNull)
+				if (nullDefined)
+				{
+					if (!typNotNull)
+						ereport(ERROR,
+								errcode(ERRCODE_SYNTAX_ERROR),
+								errmsg("conflicting NULL/NOT NULL constraints"),
+								parser_errposition(pstate, constr->location));
+
 					ereport(ERROR,
-							errcode(ERRCODE_SYNTAX_ERROR),
-							errmsg("conflicting NULL/NOT NULL constraints"),
+							errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+							errmsg("redundant NOT NULL constraint definition"),
 							parser_errposition(pstate, constr->location));
+				}
 				if (constr->is_no_inherit)
 					ereport(ERROR,
 							errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -1480,6 +1488,13 @@ DefineRange(ParseState *pstate, CreateRangeStmt *stmt)
 			/* we can look up the subtype name immediately */
 			multirangeNamespace = QualifiedNameGetCreationNamespace(defGetQualifiedName(defel),
 																	&multirangeTypeName);
+
+			/* Check we have creation rights in target namespace */
+			aclresult = object_aclcheck(NamespaceRelationId, multirangeNamespace,
+										GetUserId(), ACL_CREATE);
+			if (aclresult != ACLCHECK_OK)
+				aclcheck_error(aclresult, OBJECT_SCHEMA,
+							   get_namespace_name(multirangeNamespace));
 		}
 		else
 			ereport(ERROR,
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 15f101e5378..267d7aa3d5a 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -30,7 +30,6 @@
 #include "commands/defrem.h"
 #include "commands/seclabel.h"
 #include "commands/user.h"
-#include "lib/qunique.h"
 #include "libpq/crypt.h"
 #include "miscadmin.h"
 #include "storage/lmgr.h"
@@ -490,7 +489,8 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt)
 	 * Advance command counter so we can see new record; else tests in
 	 * AddRoleMems may fail.
 	 */
-	CommandCounterIncrement();
+	if (addroleto || adminmembers || rolemembers)
+		CommandCounterIncrement();
 
 	/* Default grant. */
 	InitGrantRoleOptions(&popt);
@@ -1904,8 +1904,7 @@ AddRoleMems(Oid currentUserId, const char *rolename, Oid roleid,
 		else
 		{
 			Oid			objectId;
-			Oid		   *newmembers = (Oid *) palloc(3 * sizeof(Oid));
-			int			nnewmembers;
+			Oid		   *newmembers = palloc(sizeof(Oid));
 
 			/*
 			 * The values for these options can be taken directly from 'popt'.
@@ -1947,22 +1946,12 @@ AddRoleMems(Oid currentUserId, const char *rolename, Oid roleid,
 									new_record, new_record_nulls);
 			CatalogTupleInsert(pg_authmem_rel, tuple);
 
-			/*
-			 * Record dependencies on the roleid, member, and grantor, as if a
-			 * pg_auth_members entry were an object ACL.
-			 * updateAclDependencies() requires an input array that is
-			 * palloc'd (it will free it), sorted, and de-duped.
-			 */
-			newmembers[0] = roleid;
-			newmembers[1] = memberid;
-			newmembers[2] = grantorId;
-			qsort(newmembers, 3, sizeof(Oid), oid_cmp);
-			nnewmembers = qunique(newmembers, 3, sizeof(Oid), oid_cmp);
-
+			/* updateAclDependencies wants to pfree array inputs */
+			newmembers[0] = grantorId;
 			updateAclDependencies(AuthMemRelationId, objectId,
 								  0, InvalidOid,
 								  0, NULL,
-								  nnewmembers, newmembers);
+								  1, newmembers);
 		}
 
 		/* CCI after each change, in case there are duplicates in list */
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 02993d320da..be863db81cb 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -37,6 +37,7 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_inherits.h"
+#include "commands/async.h"
 #include "commands/cluster.h"
 #include "commands/defrem.h"
 #include "commands/progress.h"
@@ -230,7 +231,8 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 		else if (!vacstmt->is_vacuumcmd)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized ANALYZE option \"%s\"", opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"ANALYZE", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 
 		/* Parse options available on VACUUM */
@@ -303,7 +305,8 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized VACUUM option \"%s\"", opt->defname),
+					 errmsg("unrecognized %s option \"%s\"",
+							"VACUUM", opt->defname),
 					 parser_errposition(pstate, opt->location)));
 	}
 
@@ -1957,6 +1960,12 @@ vac_truncate_clog(TransactionId frozenXID,
 		return;
 	}
 
+	/*
+	 * Freeze any old transaction IDs in the async notification queue before
+	 * CLOG truncation.
+	 */
+	AsyncNotifyFreezeXids(frozenXID);
+
 	/*
 	 * Advance the oldest value for commit timestamps before truncating, so
 	 * that if a user requests a timestamp for a transaction we're truncating
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 0b10bbfac63..f9117971ded 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 621cf682f75..f250cb57064 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -105,7 +105,7 @@ static void ExecBuildAggTransCall(ExprState *state, AggState *aggstate,
 								  int transno, int setno, int setoff, bool ishash,
 								  bool nullcheck);
 static void ExecInitFuncWithOutParams(Expr *node, ExprState *state,
-					Datum *resvalue, bool *resnull);
+									  Datum *resvalue, bool *resnull);
 
 static void ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
 							 Datum *resv, bool *resnull,
@@ -1306,8 +1306,8 @@ ExecInitExprRec(Expr *node, ExprState *state,
 
 				/* Check permission to call function */
 				aclresult = object_aclcheck(ProcedureRelationId, cmpfuncid,
-											 GetUserId(),
-											 ACL_EXECUTE);
+											GetUserId(),
+											ACL_EXECUTE);
 				if (aclresult != ACLCHECK_OK)
 					aclcheck_error(aclresult, OBJECT_FUNCTION,
 								   get_func_name(cmpfuncid));
@@ -1316,8 +1316,8 @@ ExecInitExprRec(Expr *node, ExprState *state,
 				if (OidIsValid(opexpr->hashfuncid))
 				{
 					aclresult = object_aclcheck(ProcedureRelationId, opexpr->hashfuncid,
-												 GetUserId(),
-												 ACL_EXECUTE);
+												GetUserId(),
+												ACL_EXECUTE);
 					if (aclresult != ACLCHECK_OK)
 						aclcheck_error(aclresult, OBJECT_FUNCTION,
 									   get_func_name(opexpr->hashfuncid));
@@ -2723,11 +2723,11 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 	FunctionCallInfo fcinfo;
 	int			argno;
 	ListCell   *lc;
-	bool is_subproc_func = false;
+	bool		is_subproc_func = false;
 
 	if (nodeTag(node) == T_FuncExpr)
 	{
-		FuncExpr *funcexpr = (FuncExpr *) node;
+		FuncExpr   *funcexpr = (FuncExpr *) node;
 
 		if (!FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 			is_subproc_func = true;
@@ -2735,7 +2735,7 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 
 	if (!is_subproc_func)
 	{
-		/* Check permission to call function */
+		/* Verify EXECUTE privilege before invoking the function. */
 		aclresult = object_aclcheck(ProcedureRelationId, funcid, GetUserId(), ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(funcid));
@@ -2861,12 +2861,13 @@ ExecInitSubPlanExpr(SubPlan *subplan,
 	/*
 	 * Generate steps to evaluate input arguments for the subplan.
 	 *
-	 * We evaluate the argument expressions into ExprState's resvalue/resnull,
-	 * and then use PARAM_SET to update the parameter. We do that, instead of
-	 * evaluating directly into the param, to avoid depending on the pointer
-	 * value remaining stable / being included in the generated expression. No
-	 * danger of conflicts with other uses of resvalue/resnull as storing and
-	 * using the value always is in subsequent steps.
+	 * We evaluate the argument expressions into resv/resnull, and then use
+	 * PARAM_SET to update the parameter. We do that, instead of evaluating
+	 * directly into the param, to avoid depending on the pointer value
+	 * remaining stable / being included in the generated expression. It's ok
+	 * to use resv/resnull for multiple params, as each parameter evaluation
+	 * is immediately followed by an EEOP_PARAM_SET (and thus are saved before
+	 * they could be overwritten again).
 	 *
 	 * Any calculation we have to do can be done in the parent econtext, since
 	 * the Param values don't need to have per-query lifetime.
@@ -2877,10 +2878,11 @@ ExecInitSubPlanExpr(SubPlan *subplan,
 		int			paramid = lfirst_int(l);
 		Expr	   *arg = (Expr *) lfirst(pvar);
 
-		ExecInitExprRec(arg, state,
-						&state->resvalue, &state->resnull);
+		ExecInitExprRec(arg, state, resv, resnull);
 
 		scratch.opcode = EEOP_PARAM_SET;
+		scratch.resvalue = resv;
+		scratch.resnull = resnull;
 		scratch.d.param.paramid = paramid;
 		/* paramtype's not actually used, but we might as well fill it */
 		scratch.d.param.paramtype = exprType((Node *) arg);
@@ -3257,7 +3259,7 @@ ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, ExprState *state)
 			{
 				scratch->d.wholerow.junkFilter =
 					ExecInitJunkFilter(subplan->plan->targetlist,
-									ExecGetResultType(subplan)->tdhasrowid,
+									   ExecGetResultType(subplan)->tdhasrowid,
 									   ExecInitExtraTupleSlot(parent->state, NULL,
 															  &TTSOpsVirtual));
 			}
@@ -3885,7 +3887,7 @@ ExecBuildAggTrans(AggState *aggstate, AggStatePerPhase phase,
 			 * column sorted on.
 			 */
 			TargetEntry *source_tle =
-			(TargetEntry *) linitial(pertrans->aggref->args);
+				(TargetEntry *) linitial(pertrans->aggref->args);
 
 			Assert(list_length(pertrans->aggref->args) == 1);
 
@@ -5106,42 +5108,55 @@ ExecInitJsonCoercion(ExprState *state, JsonReturning *returning,
  */
 static void
 ExecInitFuncWithOutParams(Expr *node, ExprState *state,
-					Datum *resvalue, bool *resnull)
+						  Datum *resvalue, bool *resnull)
 {
 	if (compatible_db == ORA_PARSER)
 	{
-		FuncExpr	*funcexpr = (FuncExpr *) node;
-		Oid 		funcOid = funcexpr->funcid;
-		HeapTuple	func_tuple;
-		Oid 	   *argtypes = NULL;
+		FuncExpr   *funcexpr = (FuncExpr *) node;
+		Oid			funcOid = funcexpr->funcid;
+		HeapTuple	func_tuple = NULL;
+		Oid		   *argtypes = NULL;
 		char	  **argnames = NULL;
 		char	   *argmodes = NULL;
-		int 		i = 0;
-		int 		num_out_args = 0;
-		int 		num_all_args = 0;
-		Oid 		rettype;
+		int			i = 0;
+		int			num_out_args = 0;
+		int			num_all_args = 0;
+		Oid			rettype;
 		char	   *funcname = NULL;
 
-		func_tuple = SearchSysCache1(PROCOID,
-						 ObjectIdGetDatum(funcOid));
+		if (FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
+		{
+			func_tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcOid));
 
-		if (!HeapTupleIsValid(func_tuple))
-			return;
+			if (!HeapTupleIsValid(func_tuple))
+				return;
 
-		if (((Form_pg_proc) GETSTRUCT(func_tuple))->prokind != PROKIND_FUNCTION ||
-			LANG_PLISQL_OID != ((Form_pg_proc) GETSTRUCT(func_tuple))->prolang)
+			if (((Form_pg_proc) GETSTRUCT(func_tuple))->prokind != PROKIND_FUNCTION ||
+				LANG_PLISQL_OID != ((Form_pg_proc) GETSTRUCT(func_tuple))->prolang)
+			{
+				ReleaseSysCache(func_tuple);
+				return;
+			}
+
+			/*
+			 * Get the argument names and modes 
+			 */
+			num_all_args = get_func_arg_info(func_tuple, &argtypes,
+								&argnames, &argmodes);
+			rettype = get_func_real_rettype(func_tuple);
+			funcname = NameStr(((Form_pg_proc) GETSTRUCT(func_tuple))->proname);
+		}
+		else
 		{
-			ReleaseSysCache(func_tuple);
-			return;
+			/* skip procedure */
+			if (get_subproc_kind(funcexpr) != PROKIND_FUNCTION)
+				return;
+			num_all_args = get_subproc_arg_info(funcexpr, &argtypes,
+										&argnames, &argmodes);
+			rettype = funcexpr->funcresulttype;
+			funcname = get_internal_function_name(funcexpr);
 		}
 
-		/*
-	 	 * get the argument names and modes 
-	 	 */
-		num_all_args = get_func_arg_info(func_tuple, &argtypes, &argnames, &argmodes);
-		rettype = ((Form_pg_proc) GETSTRUCT(func_tuple))->prorettype;
-		funcname = NameStr(((Form_pg_proc) GETSTRUCT(func_tuple))->proname);
-
 		num_out_args = 0;
 		for (i = 0; i < num_all_args; i++)
 		{
@@ -5153,20 +5168,20 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 
 		if (num_out_args > 0)
 		{
-			ListCell	 *lc;
+			ListCell   *lc;
 
 			if (SPI_get_connected() >= 0)
 			{
-				ExprEvalStep  scratch = {0};
+				ExprEvalStep scratch = {0};
 				ParamListInfo params = NULL;
-				int 		  nout = 0;
-				int 		 *paramids = NULL;
+				int			nout = 0;
+				int		   *paramids = NULL;
 
 				if (state->ext_params &&
 					state->ext_params->outparamSetup)
 					params = state->ext_params;
 				else if (state->parent &&
-					state->parent->state)
+						 state->parent->state)
 					params = state->parent->state->es_param_list_info;
 
 				if (!params || !params->outparamSetup)
@@ -5175,9 +5190,9 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 						ReleaseSysCache(func_tuple);
 					if (!allow_out_parameter_const)
 						ereport(ERROR,
-							(errcode(ERRCODE_DATA_EXCEPTION),
-							errmsg("OUT or IN OUT arguments of the function %s must be variables",
-									funcname)));
+								(errcode(ERRCODE_DATA_EXCEPTION),
+								 errmsg("OUT or IN OUT arguments of the function %s must be variables",
+										funcname)));
 					return;
 				}
 
@@ -5187,7 +5202,7 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 				i = 0;
 				foreach(lc, funcexpr->args)
 				{
-					Node *arg = (Node *) lfirst(lc);
+					Node	   *arg = (Node *) lfirst(lc);
 
 					if (argmodes[i] == PROARGMODE_OUT ||
 						argmodes[i] == PROARGMODE_INOUT)
@@ -5199,11 +5214,11 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 							if (!allow_out_parameter_const)
 								ereport(ERROR,
 										(errcode(ERRCODE_DATA_EXCEPTION),
-										errmsg("OUT or IN OUT arguments of the function %s must be variables ",
+										 errmsg("OUT or IN OUT arguments of the function %s must be variables ",
 												funcname)));
 						}
 						else
-							paramids[nout++] = ((Param *)arg)->paramid - 1;
+							paramids[nout++] = ((Param *) arg)->paramid - 1;
 					}
 
 					i++;
@@ -5224,16 +5239,16 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 			else
 			{
 				/*
-				 * a funciton in SQL, not in psql, is called.
-				 * If allow_out_parameter_const is false,
-				 * the out parameter of the function must be variable.
-				 * Else if allow_out_parameter_const is true,
-				 * the out parameter of the function can be const.
+				 * a funciton in SQL, not in psql, is called. If
+				 * allow_out_parameter_const is false, the out parameter of
+				 * the function must be variable. Else if
+				 * allow_out_parameter_const is true, the out parameter of the
+				 * function can be const.
 				 */
 				i = 0;
 				foreach(lc, funcexpr->args)
 				{
-					Node *arg = (Node *) lfirst(lc);
+					Node	   *arg = (Node *) lfirst(lc);
 
 					if (argmodes[i] == PROARGMODE_OUT ||
 						argmodes[i] == PROARGMODE_INOUT)
@@ -5243,7 +5258,7 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 						if (!IsA(arg, Param) && !allow_out_parameter_const)
 							ereport(ERROR,
 									(errcode(ERRCODE_DATA_EXCEPTION),
-									errmsg("OUT or IN OUT arguments of the function %s must be variables ",
+									 errmsg("OUT or IN OUT arguments of the function %s must be variables ",
 											funcname)));
 					}
 
@@ -5251,10 +5266,10 @@ ExecInitFuncWithOutParams(Expr *node, ExprState *state,
 				}
 			}
 		}
+		
 		if (FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 			ReleaseSysCache(func_tuple);
 	}
 
 	return;
 }
-
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 7ee820ee353..22d766f59c5 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -48,7 +48,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/executor/execExprInterp.c
@@ -185,6 +185,14 @@ static Datum ExecJustHashInnerVarVirt(ExprState *state, ExprContext *econtext, b
 static Datum ExecJustHashOuterVarStrict(ExprState *state, ExprContext *econtext, bool *isnull);
 
 /* execution helper functions */
+static pg_attribute_always_inline void ExecEvalArrayCompareInternal(FunctionCallInfo fcinfo,
+																	ArrayType *arr,
+																	int16 typlen,
+																	bool typbyval,
+																	char typalign,
+																	bool useOr,
+																	Datum *result,
+																	bool *resultnull);
 static pg_attribute_always_inline void ExecAggPlainTransByVal(AggState *aggstate,
 															  AggStatePerTrans pertrans,
 															  AggStatePerGroup pergroup,
@@ -3128,7 +3136,7 @@ ExecEvalParamExtern(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 
 /*
  * Set value of a param (currently always PARAM_EXEC) from
- * state->res{value,null}.
+ * op->res{value,null}.
  */
 void
 ExecEvalParamSet(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
@@ -3140,8 +3148,8 @@ ExecEvalParamSet(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 	/* Shouldn't have a pending evaluation anymore */
 	Assert(prm->execPlan == NULL);
 
-	prm->value = state->resvalue;
-	prm->isnull = state->resnull;
+	prm->value = *op->resvalue;
+	prm->isnull = *op->resnull;
 }
 
 /*
@@ -4059,12 +4067,6 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 	int			nitems;
 	Datum		result;
 	bool		resultnull;
-	int16		typlen;
-	bool		typbyval;
-	char		typalign;
-	char	   *s;
-	bits8	   *bitmap;
-	int			bitmask;
 
 	/*
 	 * If the array is NULL then we return NULL --- it's not very meaningful
@@ -4113,13 +4115,42 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 		op->d.scalararrayop.element_type = ARR_ELEMTYPE(arr);
 	}
 
-	typlen = op->d.scalararrayop.typlen;
-	typbyval = op->d.scalararrayop.typbyval;
-	typalign = op->d.scalararrayop.typalign;
+	ExecEvalArrayCompareInternal(fcinfo,
+								 arr,
+								 op->d.scalararrayop.typlen,
+								 op->d.scalararrayop.typbyval,
+								 op->d.scalararrayop.typalign,
+								 useOr,
+								 &result,
+								 &resultnull);
+
+	*op->resvalue = result;
+	*op->resnull = resultnull;
+}
+
+/*
+ * Shared helper for ExecEvalScalarArrayOp() and the NULL-LHS fallback for
+ * non-strict ExecEvalHashedScalarArrayOp().
+ *
+ * Callers must handle the strict LHS-is-NULL; return NULL fast path prior to
+ * calling this.
+ */
+static pg_attribute_always_inline void
+ExecEvalArrayCompareInternal(FunctionCallInfo fcinfo, ArrayType *arr,
+							 int16 typlen, bool typbyval, char typalign,
+							 bool useOr, Datum *result, bool *resultnull)
+{
+	int			nitems;
+	char	   *s;
+	bits8	   *bitmap;
+	int			bitmask;
+	bool		strictfunc = fcinfo->flinfo->fn_strict;
+
+	nitems = ArrayGetNItems(ARR_NDIM(arr), ARR_DIMS(arr));
 
 	/* Initialize result appropriately depending on useOr */
-	result = BoolGetDatum(!useOr);
-	resultnull = false;
+	*result = BoolGetDatum(!useOr);
+	*resultnull = false;
 
 	/* Loop over the array elements */
 	s = (char *) ARR_DATA_PTR(arr);
@@ -4155,18 +4186,18 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 		else
 		{
 			fcinfo->isnull = false;
-			thisresult = op->d.scalararrayop.fn_addr(fcinfo);
+			thisresult = fcinfo->flinfo->fn_addr(fcinfo);
 		}
 
 		/* Combine results per OR or AND semantics */
 		if (fcinfo->isnull)
-			resultnull = true;
+			*resultnull = true;
 		else if (useOr)
 		{
 			if (DatumGetBool(thisresult))
 			{
-				result = BoolGetDatum(true);
-				resultnull = false;
+				*result = BoolGetDatum(true);
+				*resultnull = false;
 				break;			/* needn't look at any more elements */
 			}
 		}
@@ -4174,8 +4205,8 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 		{
 			if (!DatumGetBool(thisresult))
 			{
-				result = BoolGetDatum(false);
-				resultnull = false;
+				*result = BoolGetDatum(false);
+				*resultnull = false;
 				break;			/* needn't look at any more elements */
 			}
 		}
@@ -4191,9 +4222,6 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 			}
 		}
 	}
-
-	*op->resvalue = result;
-	*op->resnull = resultnull;
 }
 
 /*
@@ -4272,7 +4300,7 @@ ExecEvalHashedScalarArrayOp(ExprState *state, ExprEvalStep *op, ExprContext *eco
 	 * If the scalar is NULL, and the function is strict, return NULL; no
 	 * point in executing the search.
 	 */
-	if (fcinfo->args[0].isnull && strictfunc)
+	if (scalar_isnull && strictfunc)
 	{
 		*op->resnull = true;
 		return;
@@ -4370,8 +4398,51 @@ ExecEvalHashedScalarArrayOp(ExprState *state, ExprEvalStep *op, ExprContext *eco
 		 * non-strict functions with a null lhs value if no match is found.
 		 */
 		op->d.hashedscalararrayop.has_nulls = has_nulls;
+
+		/*
+		 * When we have a non-strict equality function, check and cache the
+		 * result from looking up a NULL.  Non-strict functions are free to
+		 * treat a NULL as equal to any other value, e.g. a 0 or an empty
+		 * string.  Here we perform a linear search over the array and cache
+		 * the outcome so that we can use that result any time we receive a
+		 * NULL.
+		 */
+		if (!strictfunc)
+		{
+			bool		null_lhs_result;
+
+			fcinfo->args[0].value = (Datum) 0;
+			fcinfo->args[0].isnull = true;
+
+			ExecEvalArrayCompareInternal(fcinfo, arr, typlen, typbyval,
+										 typalign, true, &result,
+										 &resultnull);
+
+			null_lhs_result = DatumGetBool(result);
+
+			/* invert non-NULL results for NOT IN */
+			if (!resultnull && !inclause)
+				null_lhs_result = !null_lhs_result;
+
+			op->d.hashedscalararrayop.null_lhs_isnull = resultnull;
+			op->d.hashedscalararrayop.null_lhs_result = null_lhs_result;
+		}
 	}
 
+	/*
+	 * When looking up an SQL NULL value with non-strict functions, we defer
+	 * to the value we cached when building the hash table.
+	 */
+	if (scalar_isnull)
+	{
+		Assert(!strictfunc);
+
+		*op->resnull = op->d.hashedscalararrayop.null_lhs_isnull;
+		*op->resvalue = BoolGetDatum(op->d.hashedscalararrayop.null_lhs_result);
+		return;
+	}
+
+
 	/* Check the hash to see if we have a match. */
 	hashfound = NULL != saophash_lookup(elements_tab->hashtab, scalar);
 
@@ -5285,7 +5356,6 @@ ExecEvalJsonCoercionFinish(ExprState *state, ExprEvalStep *op)
 		 * JsonBehavior expression.
 		 */
 		jsestate->escontext.error_occurred = false;
-		jsestate->escontext.error_occurred = false;
 		jsestate->escontext.details_wanted = true;
 	}
 }
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index b5400749353..75087204f0c 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -156,6 +156,12 @@ execTuplesHashPrepare(int numCols,
  *
  * Note that the keyColIdx, hashfunctions, and collations arrays must be
  * allocated in storage that will live as long as the hashtable does.
+ *
+ * LookupTupleHashEntry, FindTupleHashEntry, and related functions may leak
+ * memory in the tempcxt.  It is caller's responsibility to reset that context
+ * reasonably often, typically once per tuple.  (We do it that way, rather
+ * than managing an extra context within the hashtable, because in many cases
+ * the caller can specify a tempcxt that it needs to reset per-tuple anyway.)
  */
 TupleHashTable
 BuildTupleHashTable(PlanState *parent,
diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
index 81e9b163710..8815638b484 100644
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@ -114,6 +114,7 @@
 #include "executor/executor.h"
 #include "nodes/nodeFuncs.h"
 #include "storage/lmgr.h"
+#include "utils/lsyscache.h"
 #include "utils/multirangetypes.h"
 #include "utils/rangetypes.h"
 #include "utils/snapmgr.h"
@@ -279,7 +280,7 @@ ExecCloseIndices(ResultRelInfo *resultRelInfo)
  *		executor is performing an UPDATE that could not use an
  *		optimization like heapam's HOT (in more general terms a
  *		call to table_tuple_update() took place and set
- *		'update_indexes' to TUUI_All).  Receiving this hint makes
+ *		'update_indexes' to TU_All).  Receiving this hint makes
  *		us consider if we should pass down the 'indexUnchanged'
  *		hint in turn.  That's something that we figure out for
  *		each index_insert() call iff 'update' is true.
@@ -290,7 +291,7 @@ ExecCloseIndices(ResultRelInfo *resultRelInfo)
  *		HOT has been applied and any updated columns are indexed
  *		only by summarizing indexes (or in more general terms a
  *		call to table_tuple_update() took place and set
- *		'update_indexes' to TUUI_Summarizing). We can (and must)
+ *		'update_indexes' to TU_Summarizing). We can (and must)
  *		therefore only update the indexes that have
  *		'amsummarizing' = true.
  *
@@ -753,11 +754,18 @@ check_exclusion_or_unique_constraint(Relation heap, Relation index,
 		{
 			TupleDesc	tupdesc = RelationGetDescr(heap);
 			Form_pg_attribute att = TupleDescAttr(tupdesc, attno - 1);
-			TypeCacheEntry *typcache = lookup_type_cache(att->atttypid, 0);
+			TypeCacheEntry *typcache = lookup_type_cache(att->atttypid,
+														 TYPECACHE_DOMAIN_BASE_INFO);
+			char		typtype;
+
+			if (OidIsValid(typcache->domainBaseType))
+				typtype = get_typtype(typcache->domainBaseType);
+			else
+				typtype = typcache->typtype;
 
 			ExecWithoutOverlapsNotEmpty(heap, att->attname,
 										values[indnkeyatts - 1],
-										typcache->typtype, att->atttypid);
+										typtype, att->atttypid);
 		}
 	}
 
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 54c632bbdec..926e1bd688d 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -28,7 +28,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -87,7 +87,6 @@ static void ExecutePlan(QueryDesc *queryDesc,
 						uint64 numberTuples,
 						ScanDirection direction,
 						DestReceiver *dest);
-static bool ExecCheckOneRelPerms(RTEPermissionInfo *perminfo);
 static bool ExecCheckPermissionsModified(Oid relOid, Oid userid,
 										 Bitmapset *modifiedCols,
 										 AclMode requiredPerms);
@@ -646,7 +645,7 @@ ExecCheckPermissions(List *rangeTable, List *rteperminfos,
  * ExecCheckOneRelPerms
  *		Check access permissions for a single relation.
  */
-static bool
+bool
 ExecCheckOneRelPerms(RTEPermissionInfo *perminfo)
 {
 	AclMode		requiredPerms;
@@ -884,21 +883,25 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 		foreach(l, plannedstmt->rowMarks)
 		{
 			PlanRowMark *rc = (PlanRowMark *) lfirst(l);
+			RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
 			Oid			relid;
 			Relation	relation;
 			ExecRowMark *erm;
 
+			/* ignore "parent" rowmarks; they are irrelevant at runtime */
+			if (rc->isParent)
+				continue;
+
 			/*
-			 * Ignore "parent" rowmarks, because they are irrelevant at
-			 * runtime.  Also ignore the rowmarks belonging to child tables
-			 * that have been pruned in ExecDoInitialPruning().
+			 * Also ignore rowmarks belonging to child tables that have been
+			 * pruned in ExecDoInitialPruning().
 			 */
-			if (rc->isParent ||
+			if (rte->rtekind == RTE_RELATION &&
 				!bms_is_member(rc->rti, estate->es_unpruned_relids))
 				continue;
 
 			/* get relation's OID (will produce InvalidOid if subquery) */
-			relid = exec_rt_fetch(rc->rti, estate)->relid;
+			relid = rte->relid;
 
 			/* open relation, if we need to access it for this mark type */
 			switch (rc->markType)
@@ -1040,6 +1043,9 @@ InitPlan(QueryDesc *queryDesc, int eflags)
  * Generally the parser and/or planner should have noticed any such mistake
  * already, but let's make sure.
  *
+ * For INSERT ON CONFLICT, the result relation is required to support the
+ * onConflictAction, regardless of whether a conflict actually occurs.
+ *
  * For MERGE, mergeActions is the list of actions that may be performed.  The
  * result relation is required to support every action, regardless of whether
  * or not they are all executed.
@@ -1049,7 +1055,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
  */
 void
 CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation,
-					List *mergeActions)
+					OnConflictAction onConflictAction, List *mergeActions)
 {
 	Relation	resultRel = resultRelInfo->ri_RelationDesc;
 	FdwRoutine *fdwroutine;
@@ -1062,7 +1068,23 @@ CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation,
 	{
 		case RELKIND_RELATION:
 		case RELKIND_PARTITIONED_TABLE:
-			CheckCmdReplicaIdentity(resultRel, operation);
+
+			/*
+			 * For MERGE, check that the target relation supports each action.
+			 * For other operations, just check the operation itself.
+			 */
+			if (operation == CMD_MERGE)
+				foreach_node(MergeAction, action, mergeActions)
+					CheckCmdReplicaIdentity(resultRel, action->commandType);
+			else
+				CheckCmdReplicaIdentity(resultRel, operation);
+
+			/*
+			 * For INSERT ON CONFLICT DO UPDATE, additionally check that the
+			 * target relation supports UPDATE.
+			 */
+			if (onConflictAction == ONCONFLICT_UPDATE)
+				CheckCmdReplicaIdentity(resultRel, CMD_UPDATE);
 			break;
 		case RELKIND_SEQUENCE:
 			ereport(ERROR,
@@ -1311,10 +1333,9 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
  *		Get a ResultRelInfo for a trigger target relation.
  *
  * Most of the time, triggers are fired on one of the result relations of the
- * query, and so we can just return a member of the es_result_relations array,
- * or the es_tuple_routing_result_relations list (if any). (Note: in self-join
- * situations there might be multiple members with the same OID; if so it
- * doesn't matter which one we pick.)
+ * query, and so we can just return a suitable one we already made and stored
+ * in the es_opened_result_relations or es_tuple_routing_result_relations
+ * Lists.
  *
  * However, it is sometimes necessary to fire triggers on other relations;
  * this happens mainly when an RI update trigger queues additional triggers
@@ -1334,11 +1355,20 @@ ExecGetTriggerResultRel(EState *estate, Oid relid,
 	Relation	rel;
 	MemoryContext oldcontext;
 
+	/*
+	 * Before creating a new ResultRelInfo, check if we've already made and
+	 * cached one for this relation.  We must ensure that the given
+	 * 'rootRelInfo' matches the one stored in the cached ResultRelInfo as
+	 * trigger handling for partitions can result in mixed requirements for
+	 * what ri_RootResultRelInfo is set to.
+	 */
+
 	/* Search through the query result relations */
 	foreach(l, estate->es_opened_result_relations)
 	{
 		rInfo = lfirst(l);
-		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid &&
+			rInfo->ri_RootResultRelInfo == rootRelInfo)
 			return rInfo;
 	}
 
@@ -1349,7 +1379,8 @@ ExecGetTriggerResultRel(EState *estate, Oid relid,
 	foreach(l, estate->es_tuple_routing_result_relations)
 	{
 		rInfo = (ResultRelInfo *) lfirst(l);
-		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid &&
+			rInfo->ri_RootResultRelInfo == rootRelInfo)
 			return rInfo;
 	}
 
@@ -1357,7 +1388,8 @@ ExecGetTriggerResultRel(EState *estate, Oid relid,
 	foreach(l, estate->es_trig_target_relations)
 	{
 		rInfo = (ResultRelInfo *) lfirst(l);
-		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid &&
+			rInfo->ri_RootResultRelInfo == rootRelInfo)
 			return rInfo;
 	}
 	/* Nope, so we need a new one */
@@ -3114,6 +3146,18 @@ EvalPlanQualStart(EPQState *epqstate, Plan *planTree)
 	 */
 	rcestate->es_unpruned_relids = parentestate->es_unpruned_relids;
 
+	/*
+	 * Also make the PartitionPruneInfo and the results of pruning available.
+	 * These need to match exactly so that we initialize all the same Append
+	 * and MergeAppend subplans as the parent did.
+	 */
+	rcestate->es_part_prune_infos = parentestate->es_part_prune_infos;
+	rcestate->es_part_prune_states = parentestate->es_part_prune_states;
+	rcestate->es_part_prune_results = parentestate->es_part_prune_results;
+
+	/* We'll also borrow the es_partition_directory from the parent state */
+	rcestate->es_partition_directory = parentestate->es_partition_directory;
+
 	/*
 	 * Initialize private state information for each SubPlan.  We must do this
 	 * before running ExecInitNode on the main query tree, since
@@ -3231,6 +3275,13 @@ EvalPlanQualEnd(EPQState *epqstate)
 
 	MemoryContextSwitchTo(oldcontext);
 
+	/*
+	 * NULLify the partition directory before freeing the executor state.
+	 * Since EvalPlanQualStart() just borrowed the parent EState's directory,
+	 * we'd better leave it up to the parent to delete it.
+	 */
+	estate->es_partition_directory = NULL;
+
 	FreeExecutorState(estate);
 
 	/* Mark EPQState idle */
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index 514eae1037d..1f2da072632 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -360,8 +360,12 @@ ExecFindPartition(ModifyTableState *mtstate,
 											   true, false);
 				if (rri)
 				{
+					ModifyTable *node = (ModifyTable *) mtstate->ps.plan;
+
 					/* Verify this ResultRelInfo allows INSERTs */
-					CheckValidResultRel(rri, CMD_INSERT, NIL);
+					CheckValidResultRel(rri, CMD_INSERT,
+										node ? node->onConflictAction : ONCONFLICT_NONE,
+										NIL);
 
 					/*
 					 * Initialize information needed to insert this and
@@ -527,7 +531,8 @@ ExecInitPartitionInfo(ModifyTableState *mtstate, EState *estate,
 	 * partition-key becomes a DELETE+INSERT operation, so this check is still
 	 * required when the operation is CMD_UPDATE.
 	 */
-	CheckValidResultRel(leaf_part_rri, CMD_INSERT, NIL);
+	CheckValidResultRel(leaf_part_rri, CMD_INSERT,
+						node ? node->onConflictAction : ONCONFLICT_NONE, NIL);
 
 	/*
 	 * Open partition indices.  The user may have asked to check for conflicts
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 53ddd25c42d..bb78d89265d 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -609,10 +609,10 @@ ExecSimpleRelationInsert(ResultRelInfo *resultRelInfo,
 												   conflictindexes, false);
 
 		/*
-		 * Checks the conflict indexes to fetch the conflicting local tuple
-		 * and reports the conflict. We perform this check here, instead of
+		 * Checks the conflict indexes to fetch the conflicting local row and
+		 * reports the conflict. We perform this check here, instead of
 		 * performing an additional index scan before the actual insertion and
-		 * reporting the conflict if any conflicting tuples are found. This is
+		 * reporting the conflict if any conflicting rows are found. This is
 		 * to avoid the overhead of executing the extra scan for each INSERT
 		 * operation, even when no conflict arises, which could introduce
 		 * significant overhead to replication, particularly in cases where
@@ -670,7 +670,7 @@ ExecSimpleRelationUpdate(ResultRelInfo *resultRelInfo,
 		resultRelInfo->ri_TrigDesc->trig_update_before_row)
 	{
 		if (!ExecBRUpdateTriggers(estate, epqstate, resultRelInfo,
-								  tid, NULL, slot, NULL, NULL))
+								  tid, NULL, slot, NULL, NULL, false))
 			skip_tuple = true;	/* "do nothing" */
 	}
 
@@ -746,7 +746,7 @@ ExecSimpleRelationDelete(ResultRelInfo *resultRelInfo,
 		resultRelInfo->ri_TrigDesc->trig_delete_before_row)
 	{
 		skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
-										   tid, NULL, NULL, NULL, NULL);
+										   tid, NULL, NULL, NULL, NULL, false);
 	}
 
 	if (!skip_tuple)
diff --git a/src/backend/executor/execSRF.c b/src/backend/executor/execSRF.c
index 375592ba412..830ecb1ebf3 100644
--- a/src/backend/executor/execSRF.c
+++ b/src/backend/executor/execSRF.c
@@ -20,6 +20,7 @@
 
 #include "access/htup_details.h"
 #include "catalog/objectaccess.h"
+#include "executor/spi.h"
 #include "catalog/pg_proc.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -31,6 +32,8 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/typcache.h"
+#include "utils/ora_compatible.h"
+#include "utils/guc.h"
 
 
 /* static function decls */
@@ -132,7 +135,39 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 	MemoryContextReset(argContext);
 	callerContext = MemoryContextSwitchTo(argContext);
 
-	funcrettype = exprType((Node *) setexpr->expr);
+	if (nodeTag(setexpr->expr) == T_FuncExpr &&
+		SPI_get_connected() < 0 &&
+		DB_ORACLE == compatible_db)
+	{
+		FuncExpr *funcexpr = (FuncExpr *) setexpr->expr;
+		Oid		resulttype;
+		int32	chtypmod;
+		Oid		chcollationoid;
+
+		funcrettype = exprType((Node *) setexpr->expr);
+
+		if (FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from) &&
+			func_should_change_return_type(funcexpr->funcid, &resulttype, &chtypmod, &chcollationoid))
+		{
+			funcrettype = resulttype;
+			funcexpr->funcresulttype = resulttype;
+			funcexpr->funccollid = chcollationoid;
+		}
+		else if (!FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from) &&
+				subproc_should_change_return_type(funcexpr,
+									&resulttype,
+									&chtypmod,
+									&chcollationoid))
+		{
+			funcrettype = resulttype;
+			funcexpr->funcresulttype = resulttype;
+			funcexpr->funccollid = chcollationoid;
+		}
+	}
+	else
+	{
+		funcrettype = exprType((Node *) setexpr->expr);
+	}
 
 	returnsTuple = type_is_rowtype(funcrettype);
 
@@ -259,7 +294,7 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 			if (first_time)
 			{
 				MemoryContext oldcontext =
-				MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
+					MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 				tupstore = tuplestore_begin_heap(randomAccess, false, work_mem);
 				rsinfo.setResult = tupstore;
@@ -289,7 +324,7 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 					if (tupdesc == NULL)
 					{
 						MemoryContext oldcontext =
-						MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
+							MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 						/*
 						 * This is the first non-NULL result from the
@@ -394,7 +429,7 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 	if (rsinfo.setResult == NULL)
 	{
 		MemoryContext oldcontext =
-		MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
+			MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 		tupstore = tuplestore_begin_heap(randomAccess, false, work_mem);
 		rsinfo.setResult = tupstore;
@@ -700,11 +735,11 @@ init_sexpr(Oid foid, Oid input_collation, Expr *node,
 	AclResult	aclresult;
 	size_t		numargs = list_length(sexpr->args);
 
-	bool is_subproc_func = false;
+	bool		is_subproc_func = false;
 
 	if (node != NULL && nodeTag(node) == T_FuncExpr)
 	{
-		FuncExpr *funcexpr = (FuncExpr *) node;
+		FuncExpr   *funcexpr = (FuncExpr *) node;
 
 		if (!FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 			is_subproc_func = true;
@@ -712,7 +747,7 @@ init_sexpr(Oid foid, Oid input_collation, Expr *node,
 
 	if (!is_subproc_func)
 	{
-		/* Check permission to call function */
+		/* Verify EXECUTE privilege before invoking the function. */
 		aclresult = object_aclcheck(ProcedureRelationId, foid, GetUserId(), ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(foid));
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 90726949a87..31ed4783c1d 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -134,7 +134,7 @@ ExecScanReScan(ScanState *node)
 
 			/*
 			 * If an FDW or custom scan provider has replaced the join with a
-			 * scan, there are multiple RTIs; reset the epqScanDone flag for
+			 * scan, there are multiple RTIs; reset the relsubs_done flag for
 			 * all of them.
 			 */
 			if (IsA(node->ps.plan, ForeignScan))
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index e9677ec25c7..2db2b4be1d8 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -2205,6 +2205,15 @@ ExecTypeFromTLInternal(List *targetList, bool hasrowid, bool skipjunk)
 				func->funcresulttype = resulttype;
 				func->funccollid = chcollationoid;
 			}
+			else if (!FUNC_EXPR_FROM_PG_PROC(func->function_from) &&
+				subproc_should_change_return_type(func, &resulttype, &chtypmod, &chcollationoid))
+			{
+				typoid = resulttype;
+				typmod = chtypmod;
+				collationoid = chcollationoid;
+				func->funcresulttype = resulttype;
+				func->funccollid = chcollationoid;
+			}
 		}
 
 		TupleDescInitEntry(typeInfo,
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 0442812be36..a1f5f552553 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -143,6 +143,7 @@ typedef struct SQLFunctionCache
 {
 	SQLFunctionHashEntry *func; /* associated SQLFunctionHashEntry */
 
+	bool		active;			/* are we executing this cache entry? */
 	bool		lazyEvalOK;		/* true if lazyEval is safe */
 	bool		shutdown_reg;	/* true if registered shutdown callback */
 	bool		lazyEval;		/* true if using lazyEval for result query */
@@ -556,6 +557,28 @@ init_sql_fcache(FunctionCallInfo fcinfo, bool lazyEvalOK)
 		finfo->fn_extra = fcache;
 	}
 
+	/*
+	 * If the SQLFunctionCache is marked as active, we must have errored out
+	 * of a prior execution.  Reset state.  (It might seem that we could also
+	 * reach this during recursive invocation of a SQL function, but we won't
+	 * because that case won't involve re-use of the same FmgrInfo.)
+	 */
+	if (fcache->active)
+	{
+		/*
+		 * In general, this stanza should clear all the same fields that
+		 * ShutdownSQLFunction would.  Note we must clear fcache->cplan
+		 * without doing ReleaseCachedPlan, because error cleanup from the
+		 * prior execution would have taken care of releasing that plan.
+		 * Likewise, if tstore is still set then it is pointing at garbage.
+		 */
+		fcache->cplan = NULL;
+		fcache->eslist = NULL;
+		fcache->tstore = NULL;
+		fcache->shutdown_reg = false;
+		fcache->active = false;
+	}
+
 	/*
 	 * If we are resuming execution of a set-returning function, just keep
 	 * using the same cache.  We do not ask funccache.c to re-validate the
@@ -1598,6 +1621,9 @@ fmgr_sql(PG_FUNCTION_ARGS)
 	 */
 	fcache = init_sql_fcache(fcinfo, lazyEvalOK);
 
+	/* Mark fcache as active */
+	fcache->active = true;
+
 	/* Remember info that we might need later to construct tuplestore */
 	fcache->tscontext = tscontext;
 	fcache->randomAccess = randomAccess;
@@ -1854,6 +1880,9 @@ fmgr_sql(PG_FUNCTION_ARGS)
 	if (es == NULL)
 		fcache->eslist = NULL;
 
+	/* Mark fcache as inactive */
+	fcache->active = false;
+
 	error_context_stack = sqlerrcontext.previous;
 
 	return result;
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 60d3120b454..d85341b96ed 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -2912,7 +2912,7 @@ agg_retrieve_hash_table_in_memory(AggState *aggstate)
 
 				perhash = &aggstate->perhash[aggstate->current_set];
 
-				ResetTupleHashIterator(hashtable, &perhash->hashiter);
+				ResetTupleHashIterator(perhash->hashtable, &perhash->hashiter);
 
 				continue;
 			}
@@ -4413,7 +4413,7 @@ ExecEndAgg(AggState *node)
 	{
 		AggregateInstrumentation *si;
 
-		Assert(ParallelWorkerNumber <= node->shared_info->num_workers);
+		Assert(ParallelWorkerNumber < node->shared_info->num_workers);
 		si = &node->shared_info->sinstrument[ParallelWorkerNumber];
 		si->hash_batches_used = node->hash_batches_used;
 		si->hash_disk_used = node->hash_disk_used;
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index bf24f3d7fe0..fd842ad8e22 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -277,7 +277,7 @@ ExecEndBitmapHeapScan(BitmapHeapScanState *node)
 	{
 		BitmapHeapScanInstrumentation *si;
 
-		Assert(ParallelWorkerNumber <= node->sinstrument->num_workers);
+		Assert(ParallelWorkerNumber < node->sinstrument->num_workers);
 		si = &node->sinstrument->sinstrument[ParallelWorkerNumber];
 
 		/*
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index abbb033881a..59a6a16b053 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -192,7 +192,7 @@ ExecEndBitmapIndexScan(BitmapIndexScanState *node)
 	{
 		IndexScanInstrumentation *winstrument;
 
-		Assert(ParallelWorkerNumber <= node->biss_SharedInfo->num_workers);
+		Assert(ParallelWorkerNumber < node->biss_SharedInfo->num_workers);
 		winstrument = &node->biss_SharedInfo->winstrument[ParallelWorkerNumber];
 
 		/*
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 150ae172d7a..ea0bd6422a6 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -851,85 +851,91 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 	/*
 	 * Optimize the total amount of memory consumed by the hash node.
 	 *
-	 * The nbatch calculation above focuses on the size of the in-memory hash
-	 * table, assuming no per-batch overhead. Now adjust the number of batches
-	 * and the size of the hash table to minimize total memory consumed by the
-	 * hash node.
-	 *
-	 * Each batch file has a BLCKSZ buffer, and we may need two files per
-	 * batch (inner and outer side). So with enough batches this can be
-	 * significantly more memory than the hashtable itself.
+	 * The nbatch calculation above focuses on the in-memory hash table,
+	 * assuming no per-batch overhead. But each batch may have two files, each
+	 * with a BLCKSZ buffer. For large nbatch values these buffers may use
+	 * significantly more memory than the hash table.
 	 *
 	 * The total memory usage may be expressed by this formula:
 	 *
-	 * (inner_rel_bytes / nbatch) + (2 * nbatch * BLCKSZ) <= hash_table_bytes
+	 * (inner_rel_bytes / nbatch) + (2 * nbatch * BLCKSZ)
 	 *
 	 * where (inner_rel_bytes / nbatch) is the size of the in-memory hash
 	 * table and (2 * nbatch * BLCKSZ) is the amount of memory used by file
-	 * buffers. But for sufficiently large values of inner_rel_bytes value
-	 * there may not be a nbatch value that would make both parts fit into
-	 * hash_table_bytes.
-	 *
-	 * In this case we can't enforce the memory limit - we're going to exceed
-	 * it. We can however minimize the impact and use as little memory as
-	 * possible. (We haven't really enforced it before either, as we simply
-	 * ignored the batch files.)
+	 * buffers.
 	 *
-	 * The formula for total memory usage says that given an inner relation of
-	 * size inner_rel_bytes, we may divide it into an arbitrary number of
-	 * batches. This determines both the size of the in-memory hash table and
-	 * the amount of memory needed for batch files. These two terms work in
-	 * opposite ways - when one decreases, the other increases.
+	 * The nbatch calculation however ignores the second part. And for very
+	 * large inner_rel_bytes, there may be no nbatch that keeps total memory
+	 * usage under the budget (work_mem * hash_mem_multiplier). To deal with
+	 * that, we will adjust nbatch to minimize total memory consumption across
+	 * both the hashtable and file buffers.
 	 *
-	 * For low nbatch values, the hash table takes most of the memory, but at
-	 * some point the batch files start to dominate. If you combine these two
-	 * terms, the memory consumption (for a fixed size of the inner relation)
-	 * has a u-shape, with a minimum at some nbatch value.
+	 * As we increase the size of the hashtable, the number of batches
+	 * decreases, and the total memory usage follows a U-shaped curve. We find
+	 * the minimum nbatch by "walking back" -- checking if halving nbatch
+	 * would lower the total memory usage. We stop when it no longer helps.
 	 *
-	 * Our goal is to find this nbatch value, minimizing the memory usage. We
-	 * calculate the memory usage with half the batches (i.e. nbatch/2), and
-	 * if it's lower than the current memory usage we know it's better to use
-	 * fewer batches. We repeat this until reducing the number of batches does
-	 * not reduce the memory usage - we found the optimum. We know the optimum
-	 * exists, thanks to the u-shape.
+	 * We only reduce the number of batches. Adding batches reduces memory
+	 * usage only when most of the memory is used by the hash table, with
+	 * total memory usage within the limit or not far from it. We don't want
+	 * to start batching when not needed, even if that would reduce memory
+	 * usage.
 	 *
-	 * We only want to do this when exceeding the memory limit, not every
-	 * time. The goal is not to minimize memory usage in every case, but to
-	 * minimize the memory usage when we can't stay within the memory limit.
+	 * While growing the hashtable, we also adjust the number of buckets to
+	 * maintain a load factor of NTUP_PER_BUCKET while squeezing tuples back
+	 * from batches into the hashtable.
 	 *
-	 * For this reason we only consider reducing the number of batches. We
-	 * could try the opposite direction too, but that would save memory only
-	 * when most of the memory is used by the hash table. And the hash table
-	 * was used for the initial sizing, so we shouldn't be exceeding the
-	 * memory limit too much. We might save memory by using more batches, but
-	 * it would result in spilling more batch files, which does not seem like
-	 * a great trade off.
+	 * Note that we can only change nbuckets during initial hashtable sizing.
+	 * Once we start building the hash, nbuckets is fixed (we may still grow
+	 * the hash table).
 	 *
-	 * While growing the hashtable, we also adjust the number of buckets, to
-	 * not have more than one tuple per bucket (load factor 1). We can only do
-	 * this during the initial sizing - once we start building the hash,
-	 * nbucket is fixed.
+	 * We double several parameters (space_allowed, nbuckets, num_skew_mcvs),
+	 * which introduces a risk of overflow. We avoid this by exiting the loop.
+	 * We could do something smarter (e.g. capping nbuckets and continue), but
+	 * the complexity is not worth it. Such cases are extremely rare, and this
+	 * is a best-effort attempt to reduce memory usage.
 	 */
-	while (nbatch > 0)
+	while (nbatch > 1)
 	{
-		/* how much memory are we using with current nbatch value */
-		size_t		current_space = hash_table_bytes + (2 * nbatch * BLCKSZ);
+		/* Check that buckets won't overflow MaxAllocSize */
+		if (nbuckets > (MaxAllocSize / sizeof(HashJoinTuple) / 2))
+			break;
+
+		/* num_skew_mcvs should be less than nbuckets */
+		Assert((*num_skew_mcvs) < (INT_MAX / 2));
 
-		/* how much memory would we use with half the batches */
-		size_t		new_space = hash_table_bytes * 2 + (nbatch * BLCKSZ);
+		/*
+		 * Check that space_allowed won't overflow SIZE_MAX.
+		 *
+		 * We don't use hash_table_bytes here, because it does not include the
+		 * skew buckets. And we want to limit the overall memory limit.
+		 */
+		if ((*space_allowed) > (SIZE_MAX / 2))
+			break;
 
-		/* If the memory usage would not decrease, we found the optimum. */
-		if (current_space < new_space)
+		/*
+		 * Will halving the number of batches and doubling the size of the
+		 * hashtable reduce overall memory usage?
+		 *
+		 * This is the same as (S = space_allowed):
+		 *
+		 * (S + 2 * nbatch * BLCKSZ) < (S * 2 + nbatch * BLCKSZ)
+		 *
+		 * but avoiding intermediate overflow.
+		 */
+		if (nbatch < (*space_allowed) / BLCKSZ)
 			break;
 
 		/*
-		 * It's better to use half the batches, so do that and adjust the
-		 * nbucket in the opposite direction, and double the allowance.
+		 * MaxAllocSize is sufficiently small that we are not worried about
+		 * overflowing nbuckets.
 		 */
-		nbatch /= 2;
 		nbuckets *= 2;
 
+		*num_skew_mcvs = (*num_skew_mcvs) * 2;
 		*space_allowed = (*space_allowed) * 2;
+
+		nbatch /= 2;
 	}
 
 	Assert(nbuckets > 0);
@@ -995,14 +1001,14 @@ ExecHashIncreaseBatchSize(HashJoinTable hashtable)
 	 * How much additional memory would doubling nbatch use? Each batch may
 	 * require two buffered files (inner/outer), with a BLCKSZ buffer.
 	 */
-	size_t		batchSpace = (hashtable->nbatch * 2 * BLCKSZ);
+	size_t		batchSpace = (hashtable->nbatch * 2 * (size_t) BLCKSZ);
 
 	/*
 	 * Compare the new space needed for doubling nbatch and for enlarging the
 	 * in-memory hash table. If doubling the hash table needs less memory,
 	 * just do that. Otherwise, continue with doubling the nbatch.
 	 *
-	 * We're either doubling spaceAllowed of batchSpace, so which of those
+	 * We're either doubling spaceAllowed or batchSpace, so which of those
 	 * increases the memory usage the least is the same as comparing the
 	 * values directly.
 	 */
diff --git a/src/backend/executor/nodeIncrementalSort.c b/src/backend/executor/nodeIncrementalSort.c
index bcebaf41c78..80b4bf96106 100644
--- a/src/backend/executor/nodeIncrementalSort.c
+++ b/src/backend/executor/nodeIncrementalSort.c
@@ -102,7 +102,7 @@
 			if ((node)->shared_info && (node)->am_worker) \
 			{ \
 				Assert(IsParallelWorker()); \
-				Assert(ParallelWorkerNumber <= (node)->shared_info->num_workers); \
+				Assert(ParallelWorkerNumber < (node)->shared_info->num_workers); \
 				instrumentSortedGroup(&(node)->shared_info->sinfo[ParallelWorkerNumber].groupName##GroupInfo, \
 									  (node)->groupName##_state); \
 			} \
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index 6498ae4c8b9..63a0be4f347 100644
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -423,7 +423,7 @@ ExecEndIndexOnlyScan(IndexOnlyScanState *node)
 	{
 		IndexScanInstrumentation *winstrument;
 
-		Assert(ParallelWorkerNumber <= node->ioss_SharedInfo->num_workers);
+		Assert(ParallelWorkerNumber < node->ioss_SharedInfo->num_workers);
 		winstrument = &node->ioss_SharedInfo->winstrument[ParallelWorkerNumber];
 
 		/*
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 7fcaa37fe62..aff3100f6e2 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -804,7 +804,7 @@ ExecEndIndexScan(IndexScanState *node)
 	{
 		IndexScanInstrumentation *winstrument;
 
-		Assert(ParallelWorkerNumber <= node->iss_SharedInfo->num_workers);
+		Assert(ParallelWorkerNumber < node->iss_SharedInfo->num_workers);
 		winstrument = &node->iss_SharedInfo->winstrument[ParallelWorkerNumber];
 
 		/*
diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c
index a8afbf93b48..5d38bd4095c 100644
--- a/src/backend/executor/nodeLockRows.c
+++ b/src/backend/executor/nodeLockRows.c
@@ -344,15 +344,19 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
 	foreach(lc, node->rowMarks)
 	{
 		PlanRowMark *rc = lfirst_node(PlanRowMark, lc);
+		RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
 		ExecRowMark *erm;
 		ExecAuxRowMark *aerm;
 
+		/* ignore "parent" rowmarks; they are irrelevant at runtime */
+		if (rc->isParent)
+			continue;
+
 		/*
-		 * Ignore "parent" rowmarks, because they are irrelevant at runtime.
-		 * Also ignore the rowmarks belonging to child tables that have been
+		 * Also ignore rowmarks belonging to child tables that have been
 		 * pruned in ExecDoInitialPruning().
 		 */
-		if (rc->isParent ||
+		if (rte->rtekind == RTE_RELATION &&
 			!bms_is_member(rc->rti, estate->es_unpruned_relids))
 			continue;
 
diff --git a/src/backend/executor/nodeMemoize.c b/src/backend/executor/nodeMemoize.c
index 609deb12afb..c0f42a5c19d 100644
--- a/src/backend/executor/nodeMemoize.c
+++ b/src/backend/executor/nodeMemoize.c
@@ -1122,7 +1122,7 @@ ExecEndMemoize(MemoizeState *node)
 		if (node->stats.mem_peak == 0)
 			node->stats.mem_peak = node->mem_used;
 
-		Assert(ParallelWorkerNumber <= node->shared_info->num_workers);
+		Assert(ParallelWorkerNumber < node->shared_info->num_workers);
 		si = &node->shared_info->sinstrument[ParallelWorkerNumber];
 		memcpy(si, &node->stats, sizeof(MemoizeInstrumentation));
 	}
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 6281aece77d..9e14cefeba9 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -1418,7 +1418,8 @@ ExecDeletePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 
 		return ExecBRDeleteTriggers(context->estate, context->epqstate,
 									resultRelInfo, tupleid, oldtuple,
-									epqreturnslot, result, &context->tmfd);
+									epqreturnslot, result, &context->tmfd,
+									context->mtstate->operation == CMD_MERGE);
 	}
 
 	return true;
@@ -2061,7 +2062,8 @@ ExecUpdatePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 
 		return ExecBRUpdateTriggers(context->estate, context->epqstate,
 									resultRelInfo, tupleid, oldtuple, slot,
-									result, &context->tmfd);
+									result, &context->tmfd,
+									context->mtstate->operation == CMD_MERGE);
 	}
 
 	return true;
@@ -2751,14 +2753,6 @@ ExecOnConflictUpdate(IvyModifyTableContext *context,
 						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 						 errmsg("could not serialize access due to concurrent update")));
 
-			/*
-			 * As long as we don't support an UPDATE of INSERT ON CONFLICT for
-			 * a partitioned table we shouldn't reach to a case where tuple to
-			 * be lock is moved to another partition due to concurrent update
-			 * of the partition key.
-			 */
-			Assert(!ItemPointerIndicatesMovedPartitions(&tmfd.ctid));
-
 			/*
 			 * Tell caller to try again from the very start.
 			 *
@@ -2776,7 +2770,6 @@ ExecOnConflictUpdate(IvyModifyTableContext *context,
 						 errmsg("could not serialize access due to concurrent delete")));
 
 			/* see TM_Updated case */
-			Assert(!ItemPointerIndicatesMovedPartitions(&tmfd.ctid));
 			ExecClearTuple(existing);
 			return false;
 
@@ -3305,6 +3298,11 @@ ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 							   *inputslot;
 					LockTupleMode lockmode;
 
+					if (IsolationUsesXactSnapshot())
+						ereport(ERROR,
+								(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+								 errmsg("could not serialize access due to concurrent update")));
+
 					/*
 					 * The target tuple was concurrently updated by some other
 					 * transaction.  If we are currently processing a MATCHED
@@ -3344,7 +3342,7 @@ ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 							 * the tuple moved, and setting our current
 							 * resultRelInfo to that.
 							 */
-							if (ItemPointerIndicatesMovedPartitions(&context->tmfd.ctid))
+							if (ItemPointerIndicatesMovedPartitions(tupleid))
 								ereport(ERROR,
 										(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 										 errmsg("tuple to be merged was already moved to another partition due to concurrent update")));
@@ -3392,12 +3390,13 @@ ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 									if (ItemPointerIsValid(&lockedtid))
 										UnlockTuple(resultRelInfo->ri_RelationDesc, &lockedtid,
 													InplaceUpdateTupleLock);
-									LockTuple(resultRelInfo->ri_RelationDesc, &context->tmfd.ctid,
+									LockTuple(resultRelInfo->ri_RelationDesc, tupleid,
 											  InplaceUpdateTupleLock);
-									lockedtid = context->tmfd.ctid;
+									lockedtid = *tupleid;
 								}
+
 								if (!table_tuple_fetch_row_version(resultRelationDesc,
-																   &context->tmfd.ctid,
+																   tupleid,
 																   SnapshotAny,
 																   resultRelInfo->ri_oldTupleSlot))
 									elog(ERROR, "failed to fetch the target tuple");
@@ -3408,7 +3407,28 @@ ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
 
 								/* Switch lists, if necessary */
 								if (!*matched)
+								{
 									actionStates = mergeActions[MERGE_WHEN_NOT_MATCHED_BY_SOURCE];
+
+									/*
+									 * If we have both NOT MATCHED BY SOURCE
+									 * and NOT MATCHED BY TARGET actions (a
+									 * full join between the source and target
+									 * relations), the single previously
+									 * matched tuple from the outer plan node
+									 * is treated as two not matched tuples,
+									 * in the same way as if they had not
+									 * matched to start with.  Therefore, we
+									 * must adjust the outer plan node's tuple
+									 * count, if we're instrumenting the
+									 * query, to get the correct "skipped" row
+									 * count --- see show_modifytable_info().
+									 */
+									if (outerPlanState(mtstate)->instrument &&
+										mergeActions[MERGE_WHEN_NOT_MATCHED_BY_SOURCE] &&
+										mergeActions[MERGE_WHEN_NOT_MATCHED_BY_TARGET])
+										InstrUpdateTupleCount(outerPlanState(mtstate)->instrument, 1.0);
+								}
 							}
 
 							/*
@@ -4304,8 +4324,12 @@ ExecModifyTable(PlanState *pstate)
 				relkind == RELKIND_MATVIEW ||
 				relkind == RELKIND_PARTITIONED_TABLE)
 			{
-				/* ri_RowIdAttNo refers to a ctid attribute */
-				Assert(AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo));
+				/*
+				 * ri_RowIdAttNo refers to a ctid attribute.  See the comment
+				 * in ExecInitModifyTable().
+				 */
+				Assert(AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo) ||
+					   relkind == RELKIND_PARTITIONED_TABLE);
 				datum = ExecGetJunkAttribute(slot,
 											 resultRelInfo->ri_RowIdAttNo,
 											 &isNull);
@@ -4768,7 +4792,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		/*
 		 * Verify result relation is a valid target for the current operation
 		 */
-		CheckValidResultRel(resultRelInfo, operation, mergeActions);
+		CheckValidResultRel(resultRelInfo, operation, node->onConflictAction,
+							mergeActions);
 
 		resultRelInfo++;
 		i++;
@@ -4818,7 +4843,16 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 			{
 				resultRelInfo->ri_RowIdAttNo =
 					ExecFindJunkAttributeInTlist(subplan->targetlist, "ctid");
-				if (!AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo))
+
+				/*
+				 * For heap relations, a ctid junk attribute must be present.
+				 * Partitioned tables should only appear here when all leaf
+				 * partitions were pruned, in which case no rows can be
+				 * produced and ctid is not needed.
+				 */
+				if (relkind == RELKIND_PARTITIONED_TABLE)
+					Assert(nrels == 1);
+				else if (!AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo))
 					elog(ERROR, "could not find junk ctid column");
 			}
 			else if (relkind == RELKIND_FOREIGN_TABLE)
@@ -5027,15 +5061,19 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	foreach(l, node->rowMarks)
 	{
 		PlanRowMark *rc = lfirst_node(PlanRowMark, l);
+		RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
 		ExecRowMark *erm;
 		ExecAuxRowMark *aerm;
 
+		/* ignore "parent" rowmarks; they are irrelevant at runtime */
+		if (rc->isParent)
+			continue;
+
 		/*
-		 * Ignore "parent" rowmarks, because they are irrelevant at runtime.
-		 * Also ignore the rowmarks belonging to child tables that have been
+		 * Also ignore rowmarks belonging to child tables that have been
 		 * pruned in ExecDoInitialPruning().
 		 */
-		if (rc->isParent ||
+		if (rte->rtekind == RTE_RELATION &&
 			!bms_is_member(rc->rti, estate->es_unpruned_relids))
 			continue;
 
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index f603337ecd3..c5219fe880b 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -175,7 +175,7 @@ ExecSort(PlanState *pstate)
 			TuplesortInstrumentation *si;
 
 			Assert(IsParallelWorker());
-			Assert(ParallelWorkerNumber <= node->shared_info->num_workers);
+			Assert(ParallelWorkerNumber < node->shared_info->num_workers);
 			si = &node->shared_info->sinstrument[ParallelWorkerNumber];
 			tuplesort_get_stats(tuplesortstate, si);
 		}
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index b45c788870b..be752a72d11 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -102,6 +102,7 @@ ExecHashSubPlan(SubPlanState *node,
 				ExprContext *econtext,
 				bool *isNull)
 {
+	bool		result = false;
 	SubPlan    *subplan = node->subplan;
 	PlanState  *planstate = node->planstate;
 	TupleTableSlot *slot;
@@ -132,14 +133,6 @@ ExecHashSubPlan(SubPlanState *node,
 	node->projLeft->pi_exprContext = econtext;
 	slot = ExecProject(node->projLeft);
 
-	/*
-	 * Note: because we are typically called in a per-tuple context, we have
-	 * to explicitly clear the projected tuple before returning. Otherwise,
-	 * we'll have a double-free situation: the per-tuple context will probably
-	 * be reset before we're called again, and then the tuple slot will think
-	 * it still needs to free the tuple.
-	 */
-
 	/*
 	 * If the LHS is all non-null, probe for an exact match in the main hash
 	 * table.  If we find one, the result is TRUE. Otherwise, scan the
@@ -161,19 +154,10 @@ ExecHashSubPlan(SubPlanState *node,
 							   slot,
 							   node->cur_eq_comp,
 							   node->lhs_hash_expr) != NULL)
-		{
-			ExecClearTuple(slot);
-			return BoolGetDatum(true);
-		}
-		if (node->havenullrows &&
-			findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
-		{
-			ExecClearTuple(slot);
+			result = true;
+		else if (node->havenullrows &&
+				 findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
 			*isNull = true;
-			return BoolGetDatum(false);
-		}
-		ExecClearTuple(slot);
-		return BoolGetDatum(false);
 	}
 
 	/*
@@ -186,34 +170,31 @@ ExecHashSubPlan(SubPlanState *node,
 	 * aren't provably unequal to the LHS; if so, the result is UNKNOWN.
 	 * Otherwise, the result is FALSE.
 	 */
-	if (node->hashnulls == NULL)
-	{
-		ExecClearTuple(slot);
-		return BoolGetDatum(false);
-	}
-	if (slotAllNulls(slot))
-	{
-		ExecClearTuple(slot);
+	else if (node->hashnulls == NULL)
+		 /* just return FALSE */ ;
+	else if (slotAllNulls(slot))
 		*isNull = true;
-		return BoolGetDatum(false);
-	}
 	/* Scan partly-null table first, since more likely to get a match */
-	if (node->havenullrows &&
-		findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
-	{
-		ExecClearTuple(slot);
+	else if (node->havenullrows &&
+			 findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
 		*isNull = true;
-		return BoolGetDatum(false);
-	}
-	if (node->havehashrows &&
-		findPartialMatch(node->hashtable, slot, node->cur_eq_funcs))
-	{
-		ExecClearTuple(slot);
+	else if (node->havehashrows &&
+			 findPartialMatch(node->hashtable, slot, node->cur_eq_funcs))
 		*isNull = true;
-		return BoolGetDatum(false);
-	}
+
+	/*
+	 * Note: because we are typically called in a per-tuple context, we have
+	 * to explicitly clear the projected tuple before returning. Otherwise,
+	 * we'll have a double-free situation: the per-tuple context will probably
+	 * be reset before we're called again, and then the tuple slot will think
+	 * it still needs to free the tuple.
+	 */
 	ExecClearTuple(slot);
-	return BoolGetDatum(false);
+
+	/* Also must reset the hashtempcxt after each hashtable lookup. */
+	MemoryContextReset(node->hashtempcxt);
+
+	return BoolGetDatum(result);
 }
 
 /*
@@ -642,6 +623,9 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 		 * during ExecProject.
 		 */
 		ResetExprContext(innerecontext);
+
+		/* Also must reset the hashtempcxt after each hashtable lookup. */
+		MemoryContextReset(node->hashtempcxt);
 	}
 
 	/*
diff --git a/src/backend/executor/nodeTidrangescan.c b/src/backend/executor/nodeTidrangescan.c
index 26f7420b64b..1bce8d6cbfe 100644
--- a/src/backend/executor/nodeTidrangescan.c
+++ b/src/backend/executor/nodeTidrangescan.c
@@ -274,6 +274,16 @@ TidRangeNext(TidRangeScanState *node)
 static bool
 TidRangeRecheck(TidRangeScanState *node, TupleTableSlot *slot)
 {
+	if (!TidRangeEval(node))
+		return false;
+
+	Assert(ItemPointerIsValid(&slot->tts_tid));
+
+	/* Recheck the ctid is still within range */
+	if (ItemPointerCompare(&slot->tts_tid, &node->trss_mintid) < 0 ||
+		ItemPointerCompare(&slot->tts_tid, &node->trss_maxtid) > 0)
+		return false;
+
 	return true;
 }
 
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 5e56e29a15f..d50c6600358 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -402,12 +402,23 @@ TidNext(TidScanState *node)
 static bool
 TidRecheck(TidScanState *node, TupleTableSlot *slot)
 {
+	ItemPointer match;
+
+	/* WHERE CURRENT OF always intends to resolve to the latest tuple */
+	if (node->tss_isCurrentOf)
+		return true;
+
+	if (node->tss_TidList == NULL)
+		TidListEval(node);
+
 	/*
-	 * XXX shouldn't we check here to make sure tuple matches TID list? In
-	 * runtime-key case this is not certain, is it?  However, in the WHERE
-	 * CURRENT OF case it might not match anyway ...
+	 * Binary search the TidList to see if this ctid is mentioned and return
+	 * true if it is.
 	 */
-	return true;
+	match = (ItemPointer) bsearch(&slot->tts_tid, node->tss_TidList,
+								  node->tss_NumTids, sizeof(ItemPointerData),
+								  itemptr_comparator);
+	return match != NULL;
 }
 
 
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index c9e5ce62159..d6480490577 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -37,6 +37,7 @@
 #include "catalog/objectaccess.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
+#include "common/int.h"
 #include "executor/executor.h"
 #include "executor/nodeWindowAgg.h"
 #include "miscadmin.h"
@@ -1465,12 +1466,21 @@ row_is_in_frame(WindowAggState *winstate, int64 pos, TupleTableSlot *slot)
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			int64		offset = DatumGetInt64(winstate->endOffsetValue);
+			int64		frameendpos = 0;
 
 			/* rows after current row + offset are out of frame */
 			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 				offset = -offset;
 
-			if (pos > winstate->currentpos + offset)
+			/*
+			 * If we have an overflow, it means the frame end is beyond the
+			 * range of int64.  Since currentpos >= 0, this can only be a
+			 * positive overflow.  We treat this as meaning that the frame
+			 * extends to end of partition.
+			 */
+			if (!pg_add_s64_overflow(winstate->currentpos, offset,
+									 &frameendpos) &&
+				pos > frameendpos)
 				return -1;
 		}
 		else if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
@@ -1605,7 +1615,16 @@ update_frameheadpos(WindowAggState *winstate)
 			if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
 				offset = -offset;
 
-			winstate->frameheadpos = winstate->currentpos + offset;
+			/*
+			 * If we have an overflow, it means the frame head is beyond the
+			 * range of int64.  Since currentpos >= 0, this can only be a
+			 * positive overflow.  We treat this as being beyond end of
+			 * partition.
+			 */
+			if (pg_add_s64_overflow(winstate->currentpos, offset,
+									&winstate->frameheadpos))
+				winstate->frameheadpos = PG_INT64_MAX;
+
 			/* frame head can't go before first row */
 			if (winstate->frameheadpos < 0)
 				winstate->frameheadpos = 0;
@@ -1717,12 +1736,21 @@ update_frameheadpos(WindowAggState *winstate)
 			 * framehead_slot empty.
 			 */
 			int64		offset = DatumGetInt64(winstate->startOffsetValue);
-			int64		minheadgroup;
+			int64		minheadgroup = 0;
 
 			if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
 				minheadgroup = winstate->currentgroup - offset;
 			else
-				minheadgroup = winstate->currentgroup + offset;
+			{
+				/*
+				 * If we have an overflow, it means the target group is beyond
+				 * the range of int64.  We treat this as "infinity", which
+				 * ensures the loop below advances to end of partition.
+				 */
+				if (pg_add_s64_overflow(winstate->currentgroup, offset,
+										&minheadgroup))
+					minheadgroup = PG_INT64_MAX;
+			}
 
 			tuplestore_select_read_pointer(winstate->buffer,
 										   winstate->framehead_ptr);
@@ -1859,7 +1887,18 @@ update_frametailpos(WindowAggState *winstate)
 			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 				offset = -offset;
 
-			winstate->frametailpos = winstate->currentpos + offset + 1;
+			/*
+			 * If we have an overflow, it means the frame tail is beyond the
+			 * range of int64.  Since currentpos >= 0, this can only be a
+			 * positive overflow.  We treat this as being beyond end of
+			 * partition.
+			 */
+			if (pg_add_s64_overflow(winstate->currentpos, offset,
+									&winstate->frametailpos) ||
+				pg_add_s64_overflow(winstate->frametailpos, 1,
+									&winstate->frametailpos))
+				winstate->frametailpos = PG_INT64_MAX;
+
 			/* smallest allowable value of frametailpos is 0 */
 			if (winstate->frametailpos < 0)
 				winstate->frametailpos = 0;
@@ -1971,12 +2010,21 @@ update_frametailpos(WindowAggState *winstate)
 			 * leave frametailpos = end+1 and frametail_slot empty.
 			 */
 			int64		offset = DatumGetInt64(winstate->endOffsetValue);
-			int64		maxtailgroup;
+			int64		maxtailgroup = 0;
 
 			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 				maxtailgroup = winstate->currentgroup - offset;
 			else
-				maxtailgroup = winstate->currentgroup + offset;
+			{
+				/*
+				 * If we have an overflow, it means the target group is beyond
+				 * the range of int64.  We treat this as "infinity", which
+				 * ensures the loop below advances to end of partition.
+				 */
+				if (pg_add_s64_overflow(winstate->currentgroup, offset,
+										&maxtailgroup))
+					maxtailgroup = PG_INT64_MAX;
+			}
 
 			tuplestore_select_read_pointer(winstate->buffer,
 										   winstate->frametail_ptr);
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index eda76b501ea..2e433858556 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -1237,7 +1237,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 	Oid			typoid,
 				foutoid;
 	bool		typisvarlena;
-	char		*value;
+	char	   *value;
 
 	SPI_result = 0;
 
@@ -1259,9 +1259,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 
 	getTypeOutputInfo(typoid, &foutoid, &typisvarlena);
 
-	/*
-	 * Compatible oracle , pass typmod to output function
-	 */
+	/* Oracle compatibility: pass typmod to the output function */
 	if (fnumber > 0 &&
 		ORA_PARSER == compatible_db &&
 		(typoid == YMINTERVALOID ||
@@ -3406,7 +3404,7 @@ SPI_register_trigger_data(TriggerData *tdata)
 	if (tdata->tg_newtable)
 	{
 		EphemeralNamedRelation enr =
-		palloc(sizeof(EphemeralNamedRelationData));
+			palloc(sizeof(EphemeralNamedRelationData));
 		int			rc;
 
 		enr->md.name = tdata->tg_trigger->tgnewtable;
@@ -3423,7 +3421,7 @@ SPI_register_trigger_data(TriggerData *tdata)
 	if (tdata->tg_oldtable)
 	{
 		EphemeralNamedRelation enr =
-		palloc(sizeof(EphemeralNamedRelationData));
+			palloc(sizeof(EphemeralNamedRelationData));
 		int			rc;
 
 		enr->md.name = tdata->tg_trigger->tgoldtable;
@@ -3462,7 +3460,7 @@ SPI_remember_func(void *func)
 /*
  * get current_func according to level
  */
-void*
+void *
 SPI_get_func(int level)
 {
 	if (level > _SPI_connected ||
@@ -3491,5 +3489,3 @@ Ora_spi_saved_memorycontext(void)
 {
 	return _SPI_current->savedcxt;
 }
-
-
diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile
index e8c12060b93..7a65290a85a 100644
--- a/src/backend/jit/llvm/Makefile
+++ b/src/backend/jit/llvm/Makefile
@@ -22,16 +22,10 @@ endif
 PGFILEDESC = "llvmjit - JIT using LLVM"
 NAME = llvmjit
 
-# LLVM 14 produces deprecation warnings.  We'll need to make some changes
-# before the relevant functions are removed, but for now silence the warnings.
-ifeq ($(GCC), yes)
-LLVM_CFLAGS += -Wno-deprecated-declarations
-endif
-
 # All files in this directory use LLVM.
 CFLAGS += $(LLVM_CFLAGS)
 CXXFLAGS += $(LLVM_CXXFLAGS)
-override CPPFLAGS := $(LLVM_CPPFLAGS) $(CPPFLAGS)
+override CPPFLAGS += $(LLVM_CPPFLAGS)
 SHLIB_LINK += $(LLVM_LIBS)
 
 # Because this module includes C++ files, we need to use a C++
diff --git a/src/backend/jit/llvm/SectionMemoryManager.cpp b/src/backend/jit/llvm/SectionMemoryManager.cpp
index 2171db5f382..ba00fd4cf3f 100644
--- a/src/backend/jit/llvm/SectionMemoryManager.cpp
+++ b/src/backend/jit/llvm/SectionMemoryManager.cpp
@@ -1,18 +1,11 @@
 /*
- * This file is from https://github.com/llvm/llvm-project/pull/71968
- * with minor modifications to avoid name clash and work with older
- * LLVM versions.  The llvm::backport::SectionMemoryManager class is a
- * drop-in replacement for llvm::SectionMemoryManager, for use with
- * llvm::RuntimeDyld.  It fixes a memory layout bug on large memory
- * ARM systems (see pull request for details).  If the LLVM project
- * eventually commits the change, we may need to resynchronize our
- * copy with any further modifications, but they would be unlikely to
- * backport it into the LLVM versions that we target so we would still
- * need this copy.
+ * This file is from LLVM 22 (originally pull request #71968), with minor
+ * modifications to avoid name clash and work with older LLVM versions.  It
+ * replaces llvm::SectionMemoryManager, and is injected into llvm::RuntimeDyld
+ * to fix a memory layout bug on large memory ARM systems on LLVM < 22.
  *
- * In the future we will switch to using JITLink instead of
- * RuntimeDyld where possible, and later remove this code (.cpp, .h,
- * .LICENSE) after all LLVM versions that we target allow it.
+ * We can remove this code (.cpp, .h, .LICENSE) once LLVM 22 is our minimum
+ * supported version or we've switched to JITLink for at least Aarch64.
  *
  * This file is a modified copy of a part of the LLVM source code that
  * we would normally access from the LLVM library.  It is therefore
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index c7c8a5469ec..5e765e0aa78 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -673,7 +673,11 @@ llvm_optimize_module(LLVMJitContext *context, LLVMModuleRef module)
 
 	if (context->base.flags & PGJIT_OPT3)
 		passes = "default<O3>";
+	else if (context->base.flags & PGJIT_INLINE)
+		/* if doing inlining, but no expensive optimization, add inline pass */
+		passes = "default<O0>,mem2reg,inline";
 	else
+		/* default<O0> includes always-inline pass */
 		passes = "default<O0>,mem2reg";
 
 	options = LLVMCreatePassBuilderOptions();
@@ -1170,7 +1174,10 @@ llvm_log_jit_error(void *ctx, LLVMErrorRef error)
 static LLVMOrcObjectLayerRef
 llvm_create_object_layer(void *Ctx, LLVMOrcExecutionSessionRef ES, const char *Triple)
 {
-#ifdef USE_LLVM_BACKPORT_SECTION_MEMORY_MANAGER
+#if LLVM_VERSION_MAJOR >= 22
+	LLVMOrcObjectLayerRef objlayer =
+		LLVMOrcCreateRTDyldObjectLinkingLayerWithSectionMemoryManagerReserveAlloc(ES, true);
+#elif defined(USE_LLVM_BACKPORT_SECTION_MEMORY_MANAGER)
 	LLVMOrcObjectLayerRef objlayer =
 		LLVMOrcCreateRTDyldObjectLinkingLayerWithSafeSectionMemoryManager(ES);
 #else
@@ -1193,7 +1200,8 @@ llvm_create_object_layer(void *Ctx, LLVMOrcExecutionSessionRef ES, const char *T
 	{
 		LLVMJITEventListenerRef l = LLVMCreatePerfJITEventListener();
 
-		LLVMOrcRTDyldObjectLinkingLayerRegisterJITEventListener(objlayer, l);
+		if (l)
+			LLVMOrcRTDyldObjectLinkingLayerRegisterJITEventListener(objlayer, l);
 	}
 #endif
 
diff --git a/src/backend/jit/llvm/llvmjit_deform.c b/src/backend/jit/llvm/llvmjit_deform.c
index c562edd094b..798c1ce4ed2 100644
--- a/src/backend/jit/llvm/llvmjit_deform.c
+++ b/src/backend/jit/llvm/llvmjit_deform.c
@@ -663,7 +663,7 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
 			v_tmp_loaddata =
 				LLVMBuildPointerCast(b, v_attdatap, vartypep, "");
 			v_tmp_loaddata = l_load(b, vartype, v_tmp_loaddata, "attr_byval");
-			v_tmp_loaddata = LLVMBuildZExt(b, v_tmp_loaddata, TypeSizeT, "");
+			v_tmp_loaddata = LLVMBuildSExt(b, v_tmp_loaddata, TypeSizeT, "");
 
 			LLVMBuildStore(b, v_tmp_loaddata, v_resultp);
 		}
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index 6637ef28480..8a459cc0366 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -62,7 +62,9 @@ static LLVMValueRef build_EvalXFuncInt(LLVMBuilderRef b, LLVMModuleRef mod,
 									   LLVMValueRef v_state,
 									   ExprEvalStep *op,
 									   int natts, LLVMValueRef *v_args);
+#if LLVM_VERSION_MAJOR < 22
 static LLVMValueRef create_LifetimeEnd(LLVMModuleRef mod);
+#endif
 
 /* macro making it easier to call ExecEval* functions */
 #define build_EvalXFunc(b, mod, funcname, v_state, op, ...) \
@@ -698,8 +700,8 @@ llvm_compile_expr(ExprState *state)
 						LLVMBuildStore(b, l_sbool_const(1), v_resnullp);
 
 						/* create blocks for checking args, one for each */
-						b_checkargnulls =
-							palloc(sizeof(LLVMBasicBlockRef *) * op->d.func.nargs);
+						b_checkargnulls = (LLVMBasicBlockRef *)
+							palloc(sizeof(LLVMBasicBlockRef) * op->d.func.nargs);
 						for (int argno = 0; argno < op->d.func.nargs; argno++)
 							b_checkargnulls[argno] =
 								l_bb_before_v(b_nonull, "b.%d.isnull.%d", opno,
@@ -2505,7 +2507,7 @@ llvm_compile_expr(ExprState *state)
 					v_nullsp = l_ptr_const(nulls, l_ptr(TypeStorageBool));
 
 					/* create blocks for checking args */
-					b_checknulls = palloc(sizeof(LLVMBasicBlockRef *) * nargs);
+					b_checknulls = palloc(sizeof(LLVMBasicBlockRef) * nargs);
 					for (int argno = 0; argno < nargs; argno++)
 					{
 						b_checknulls[argno] =
@@ -3008,14 +3010,11 @@ BuildV1Call(LLVMJitContext *context, LLVMBuilderRef b,
 			LLVMModuleRef mod, FunctionCallInfo fcinfo,
 			LLVMValueRef *v_fcinfo_isnull)
 {
-	LLVMContextRef lc;
 	LLVMValueRef v_fn;
 	LLVMValueRef v_fcinfo_isnullp;
 	LLVMValueRef v_retval;
 	LLVMValueRef v_fcinfo;
 
-	lc = LLVMGetModuleContext(mod);
-
 	v_fn = llvm_function_reference(context, b, mod, fcinfo);
 
 	v_fcinfo = l_ptr_const(fcinfo, l_ptr(StructFunctionCallInfoData));
@@ -3031,11 +3030,14 @@ BuildV1Call(LLVMJitContext *context, LLVMBuilderRef b,
 	if (v_fcinfo_isnull)
 		*v_fcinfo_isnull = l_load(b, TypeStorageBool, v_fcinfo_isnullp, "");
 
+#if LLVM_VERSION_MAJOR < 22
+
 	/*
 	 * Add lifetime-end annotation, signaling that writes to memory don't have
 	 * to be retained (important for inlining potential).
 	 */
 	{
+		LLVMContextRef lc = LLVMGetModuleContext(mod);
 		LLVMValueRef v_lifetime = create_LifetimeEnd(mod);
 		LLVMValueRef params[2];
 
@@ -3047,6 +3049,7 @@ BuildV1Call(LLVMJitContext *context, LLVMBuilderRef b,
 		params[1] = l_ptr_const(&fcinfo->isnull, l_ptr(LLVMInt8TypeInContext(lc)));
 		l_call(b, LLVMGetFunctionType(v_lifetime), v_lifetime, params, lengthof(params), "");
 	}
+#endif
 
 	return v_retval;
 }
@@ -3084,6 +3087,7 @@ build_EvalXFuncInt(LLVMBuilderRef b, LLVMModuleRef mod, const char *funcname,
 	return v_ret;
 }
 
+#if LLVM_VERSION_MAJOR < 22
 static LLVMValueRef
 create_LifetimeEnd(LLVMModuleRef mod)
 {
@@ -3113,3 +3117,4 @@ create_LifetimeEnd(LLVMModuleRef mod)
 
 	return fn;
 }
+#endif
diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
index 2764c3bbe2f..51b32cd9f94 100644
--- a/src/backend/jit/llvm/llvmjit_inline.cpp
+++ b/src/backend/jit/llvm/llvmjit_inline.cpp
@@ -238,7 +238,11 @@ llvm_build_inline_plan(LLVMContextRef lc, llvm::Module *mod)
 
 		llvm_split_symbol_name(symbolName.data(), &cmodname, &cfuncname);
 
+#if LLVM_VERSION_MAJOR >= 21
+		funcGUID = llvm::GlobalValue::getGUIDAssumingExternalLinkage(cfuncname);
+#else
 		funcGUID = llvm::GlobalValue::getGUID(cfuncname);
+#endif
 
 		/* already processed */
 		if (inlineState.processed)
diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp
index da850d67ab6..c31a57b8563 100644
--- a/src/backend/jit/llvm/llvmjit_wrap.cpp
+++ b/src/backend/jit/llvm/llvmjit_wrap.cpp
@@ -53,7 +53,14 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(llvm::orc::ObjectLayer, LLVMOrcObjectLayerRef
 LLVMOrcObjectLayerRef
 LLVMOrcCreateRTDyldObjectLinkingLayerWithSafeSectionMemoryManager(LLVMOrcExecutionSessionRef ES)
 {
+#if LLVM_VERSION_MAJOR >= 21
+	return wrap(new llvm::orc::RTDyldObjectLinkingLayer(
+		*unwrap(ES), [](const llvm::MemoryBuffer&) {
+			return std::make_unique<llvm::backport::SectionMemoryManager>(nullptr, true);
+		}));
+#else
 	return wrap(new llvm::orc::RTDyldObjectLinkingLayer(
 		*unwrap(ES), [] { return std::make_unique<llvm::backport::SectionMemoryManager>(nullptr, true); }));
+#endif
 }
 #endif
diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
index db778405724..8fe5b989c2f 100644
--- a/src/backend/libpq/auth-scram.c
+++ b/src/backend/libpq/auth-scram.c
@@ -581,7 +581,7 @@ scram_verify_plain_password(const char *username, const char *password,
 	 * Compare the secret's Server Key with the one computed from the
 	 * user-supplied password.
 	 */
-	return memcmp(computed_key, server_key, key_length) == 0;
+	return timingsafe_bcmp(computed_key, server_key, key_length) == 0;
 }
 
 
@@ -1132,9 +1132,9 @@ verify_final_nonce(scram_state *state)
 
 	if (final_nonce_len != client_nonce_len + server_nonce_len)
 		return false;
-	if (memcmp(state->client_final_nonce, state->client_nonce, client_nonce_len) != 0)
+	if (timingsafe_bcmp(state->client_final_nonce, state->client_nonce, client_nonce_len) != 0)
 		return false;
-	if (memcmp(state->client_final_nonce + client_nonce_len, state->server_nonce, server_nonce_len) != 0)
+	if (timingsafe_bcmp(state->client_final_nonce + client_nonce_len, state->server_nonce, server_nonce_len) != 0)
 		return false;
 
 	return true;
@@ -1188,7 +1188,7 @@ verify_client_proof(scram_state *state)
 				client_StoredKey, &errstr) < 0)
 		elog(ERROR, "could not hash stored key: %s", errstr);
 
-	if (memcmp(client_StoredKey, state->StoredKey, state->key_length) != 0)
+	if (timingsafe_bcmp(client_StoredKey, state->StoredKey, state->key_length) != 0)
 		return false;
 
 	return true;
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 9f4d05ffbd4..40b6f93bffc 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -94,8 +94,16 @@ static int	auth_peer(hbaPort *port);
 
 #define PGSQL_PAM_SERVICE "postgresql"	/* Service name passed to PAM */
 
+/* Work around original Solaris' lack of "const" in the conv_proc signature */
+#ifdef _PAM_LEGACY_NONCONST
+#define PG_PAM_CONST
+#else
+#define PG_PAM_CONST const
+#endif
+
 static int	CheckPAMAuth(Port *port, const char *user, const char *password);
-static int	pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
+static int	pam_passwd_conv_proc(int num_msg,
+								 PG_PAM_CONST struct pam_message **msg,
 								 struct pam_response **resp, void *appdata_ptr);
 
 static struct pam_conv pam_passw_conv = {
@@ -1917,7 +1925,7 @@ auth_peer(hbaPort *port)
  */
 
 static int
-pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
+pam_passwd_conv_proc(int num_msg, PG_PAM_CONST struct pam_message **msg,
 					 struct pam_response **resp, void *appdata_ptr)
 {
 	const char *passwd;
@@ -3224,7 +3232,7 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
 		}
 		pfree(cryptvector);
 
-		if (memcmp(receivepacket->vector, encryptedpassword, RADIUS_VECTOR_LENGTH) != 0)
+		if (timingsafe_bcmp(receivepacket->vector, encryptedpassword, RADIUS_VECTOR_LENGTH) != 0)
 		{
 			ereport(LOG,
 					(errmsg("RADIUS response from %s has incorrect MD5 signature",
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index f6b641e726e..063ac95778d 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -230,7 +230,8 @@ md5_crypt_verify(const char *role, const char *shadow_pass,
 		return STATUS_ERROR;
 	}
 
-	if (strcmp(client_pass, crypt_pwd) == 0)
+	if (strlen(client_pass) == strlen(crypt_pwd) &&
+		timingsafe_bcmp(client_pass, crypt_pwd, strlen(crypt_pwd)) == 0)
 		retval = STATUS_OK;
 	else
 	{
@@ -292,7 +293,8 @@ plain_crypt_verify(const char *role, const char *shadow_pass,
 				*logdetail = errstr;
 				return STATUS_ERROR;
 			}
-			if (strcmp(crypt_client_pass, shadow_pass) == 0)
+			if (strlen(crypt_client_pass) == strlen(shadow_pass) &&
+				timingsafe_bcmp(crypt_client_pass, shadow_pass, strlen(shadow_pass)) == 0)
 				return STATUS_OK;
 			else
 			{
diff --git a/src/backend/libpq/pg_ident.conf.sample b/src/backend/libpq/pg_ident.conf.sample
index f5225f26cdf..8ee6c0ba315 100644
--- a/src/backend/libpq/pg_ident.conf.sample
+++ b/src/backend/libpq/pg_ident.conf.sample
@@ -13,25 +13,25 @@
 # user names to their corresponding PostgreSQL user names.  Records
 # are of the form:
 #
-# MAPNAME  SYSTEM-USERNAME  PG-USERNAME
+# MAPNAME  SYSTEM-USERNAME  DATABASE-USERNAME
 #
 # (The uppercase quantities must be replaced by actual values.)
 #
 # MAPNAME is the (otherwise freely chosen) map name that was used in
 # pg_hba.conf.  SYSTEM-USERNAME is the detected user name of the
-# client.  PG-USERNAME is the requested PostgreSQL user name.  The
-# existence of a record specifies that SYSTEM-USERNAME may connect as
-# PG-USERNAME.
+# client.  DATABASE-USERNAME is the requested PostgreSQL user name.
+# The existence of a record specifies that SYSTEM-USERNAME may connect
+# as DATABASE-USERNAME.
 #
-# If SYSTEM-USERNAME starts with a slash (/), it will be treated as a
-# regular expression.  Optionally this can contain a capture (a
-# parenthesized subexpression).  The substring matching the capture
-# will be substituted for \1 (backslash-one) if present in
-# PG-USERNAME.
+# If SYSTEM-USERNAME starts with a slash (/), the rest of it will be
+# treated as a regular expression.  Optionally this can contain a capture
+# (a parenthesized subexpression).  The substring matching the capture
+# will be substituted for \1 (backslash-one) if that appears in
+# DATABASE-USERNAME.
 #
-# PG-USERNAME can be "all", a user name, a group name prefixed with "+", or
-# a regular expression (if it starts with a slash (/)).  If it is a regular
-# expression, the substring matching with \1 has no effect.
+# DATABASE-USERNAME can be "all", a user name, a group name prefixed with "+",
+# or a regular expression (if it starts with a slash (/)).  If it is a regular
+# expression, no substitution for \1 will occur.
 #
 # Multiple maps may be specified in this file and used by pg_hba.conf.
 #
@@ -69,4 +69,4 @@
 # Put your actual configuration here
 # ----------------------------------
 
-# MAPNAME       SYSTEM-USERNAME         PG-USERNAME
+# MAPNAME       SYSTEM-USERNAME         DATABASE-USERNAME
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index aae4b0a3765..8a39abff888 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -11,7 +11,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -484,20 +484,29 @@ check_root(const char *progname)
 /*
  * At least on linux, set_ps_display() breaks /proc/$pid/environ. The
  * sanitizer library uses /proc/$pid/environ to implement getenv() as it wants
- * to work independent of libc. When just using undefined and alignment
- * sanitizers, the sanitizer library is only initialized when the first error
- * occurs, by which time we've often already called set_ps_display(),
- * preventing the sanitizer libraries from seeing the options.
+ * to work independent of libc. Depending on which sanitizers are enabled,
+ * the sanitizer library may not get initialized until after we've called
+ * set_ps_display(), preventing the sanitizer from seeing environment-supplied
+ * options.
  *
  * We can work around that by defining __ubsan_default_options, a weak symbol
  * libsanitizer uses to get defaults from the application, and return
  * getenv("UBSAN_OPTIONS"). But only if main already was reached, so that we
  * don't end up relying on a not-yet-working getenv().
  *
+ * On the other hand, with different sanitizers enabled, libsanitizer can
+ * call this so early that it's not fully initialized itself, resulting in
+ * recursion and a core dump within libsanitizer.  To prevent that, ensure
+ * that this function is built without any sanitizer callbacks in it.
+ *
  * As this function won't get called when not running a sanitizer, it doesn't
  * seem necessary to only compile it conditionally.
  */
 const char *__ubsan_default_options(void);
+
+#if __has_attribute(disable_sanitizer_instrumentation)
+__attribute__((disable_sanitizer_instrumentation))
+#endif
 const char *
 __ubsan_default_options(void)
 {
diff --git a/src/backend/meson.build b/src/backend/meson.build
index dc87a82c5e9..a140221e19e 100644
--- a/src/backend/meson.build
+++ b/src/backend/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_build_deps = [backend_code]
diff --git a/src/backend/nodes/gen_node_support.pl b/src/backend/nodes/gen_node_support.pl
index 9e3f3b7f9d0..9d985f08087 100644
--- a/src/backend/nodes/gen_node_support.pl
+++ b/src/backend/nodes/gen_node_support.pl
@@ -107,9 +107,9 @@ sub elem
 # In HEAD, these variables should be left undef, since we don't promise
 # ABI stability during development.
 
-my $last_nodetag = undef;
-my $last_nodetag_no = undef;
-
+my $last_nodetag = 'WindowObjectData';
+# my $last_nodetag_no = 479; --PG
+my $last_nodetag_no = 490;
 # output file names
 my @output_files;
 
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 62fb851b549..7e41885e04c 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -607,6 +607,13 @@ makeFuncExpr(Oid funcid, Oid rettype, List *args,
 	funcexpr->funccollid = funccollid;
 	funcexpr->inputcollid = inputcollid;
 	funcexpr->args = args;
+
+	/*
+	 * Initialize origin and parent linkage: - function_from defaults to
+	 * pg_proc-backed functions; callers may override for package/subprocedure
+	 * cases. - parent_func is NULL since this node is not nested under
+	 * another routine unless explicitly linked by the caller.
+	 */
 	funcexpr->function_from = FUNC_FROM_PG_PROC;
 	funcexpr->parent_func = NULL;
 	funcexpr->function_name = NULL;
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 0df86b10dc0..e3a7e053486 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -77,7 +77,7 @@ exprType(const Node *expr)
 			break;
 		case T_FuncExpr:
 			{
-				FuncExpr *funcexpr = (FuncExpr *) expr;
+				FuncExpr   *funcexpr = (FuncExpr *) expr;
 
 				if (FUNC_EXPR_FROM_PACKAGE(funcexpr->function_from))
 					set_pkginfo_from_funcexpr(funcexpr);
@@ -235,7 +235,7 @@ exprType(const Node *expr)
 				type = TEXTOID;
 			else if (((const XmlExpr *) expr)->op == IS_UPDATEXML)
 			{
-				int32	typmod;
+				int32		typmod;
 
 				type = XMLOID;
 				(void) parseTypeString("XMLTYPE", &type, &typmod, NULL);
@@ -1297,12 +1297,8 @@ exprSetCollation(Node *expr, Oid collation)
 			}
 			break;
 		case T_JsonBehavior:
-			{
-				JsonBehavior *behavior = (JsonBehavior *) expr;
-
-				if (behavior->expr)
-					exprSetCollation(behavior->expr, collation);
-			}
+			Assert(((JsonBehavior *) expr)->expr == NULL ||
+				   exprCollation(((JsonBehavior *) expr)->expr) == collation);
 			break;
 		case T_NullTest:
 			/* NullTest's result is boolean ... */
@@ -1715,6 +1711,7 @@ exprLocation(const Node *expr)
 		case T_ColumnRefOrFuncCall:
 			{
 				const ColumnRef *c = ((const ColumnRefOrFuncCall *) expr)->cref;
+
 				loc = c->location;
 			}
 			break;
@@ -1964,6 +1961,11 @@ check_functions_in_node(Node *node, check_function_callback checker,
 			{
 				FuncExpr   *expr = (FuncExpr *) node;
 
+				/*
+				 * Only invoke the checker for functions backed by pg_proc.
+				 * Package/subprocedure calls are skipped as they don't map to
+				 * a catalog function OID understood by generic checkers.
+				 */
 				if (FUNC_EXPR_FROM_PG_PROC(expr->function_from) &&
 					checker(expr->funcid, context))
 					return true;
@@ -4463,17 +4465,12 @@ raw_expression_tree_walker_impl(Node *node,
 			break;
 		case T_ColumnRefOrFuncCall:
 			{
-				FuncCall   *fcall = ((ColumnRefOrFuncCall *) node)->func;
+				ColumnRefOrFuncCall *colf = (ColumnRefOrFuncCall *) node;
 
-				if (WALK(fcall->args))
-					return true;
-				if (WALK(fcall->agg_order))
+				if (colf->cref && WALK(colf->cref))
 					return true;
-				if (WALK(fcall->agg_filter))
+				if (colf->func && WALK(colf->func))
 					return true;
-				if (WALK(fcall->over))
-					return true;
-				/* function name is deemed uninteresting */
 			}
 			break;
 		case T_NamedArgExpr:
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 2a437fc69d4..1dedbf473f6 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -99,6 +99,7 @@ static void outDouble(StringInfo str, double d);
 #define WRITE_LOCATION_FIELD(fldname) \
 	appendStringInfo(str, " :" CppAsString(fldname) " %d", write_location_fields ? node->fldname : -1)
 
+/* Write a Void field */
 #define WRITE_VOID_FIELD(fldname) \
 	appendStringInfo(str, " :" CppAsString(fldname) " %d", 0)
 
diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c
index a1a2ac9996f..d297ba3169b 100644
--- a/src/backend/nodes/params.c
+++ b/src/backend/nodes/params.c
@@ -62,10 +62,11 @@ makeParamList(int numParams)
 	retval->numParams = numParams;
 	retval->outparamSetup = NULL;
 
-	/* set all params mode to be IN */
+	/* Initialize all parameters to IN mode with typmod -1 */
 	for (i = 0; i < numParams; i++)
 	{
 		retval->params[i].pmode = PROARGMODE_IN;
+		retval->params[i].ptypmod = -1;
 	}
 
 	retval->outctext = NULL;
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 55e5c832803..365d591d4a8 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -384,9 +384,7 @@ print_expr(const Node *expr, const List *rtable)
 		getTypeOutputInfo(c->consttype,
 						  &typoutput, &typIsVarlena);
 
-		/*
-		 * Compatible oracle , pass typmod to output function
-		 */
+		/* Oracle compatibility: pass typmod to the output function */
 		if (ORA_PARSER == compatible_db &&
 			(c->consttype == YMINTERVALOID ||
 			 c->consttype == DSINTERVALOID))
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 3bc3dee7e61..3f46d98cd16 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -137,10 +137,11 @@
 	local_node->fldname = -1	/* set field to "unknown" */
 #endif
 
+/* Read a Void field  */
 #define READ_VOID_FIELD(fldname) \
 	token = pg_strtok(&length);		/* skip :fldname */ \
 	token = pg_strtok(&length);		/* get field value */ \
-	local_node->fldname = NULL		/* assign to null */
+	local_node->fldname = NULL	/* assign to null */
 
 /* Read a Node field */
 #define READ_NODE_FIELD(fldname) \
diff --git a/src/backend/nodes/value.c b/src/backend/nodes/value.c
index f992c5bd206..0b8bca54613 100644
--- a/src/backend/nodes/value.c
+++ b/src/backend/nodes/value.c
@@ -4,7 +4,7 @@
  *	  implementation of value nodes
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2003-2025, PostgreSQL Global Development Group
  *
  *
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 6cc6966b060..8feeed9f303 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -1727,9 +1727,11 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
  * We generate a path for each ordering (pathkey list) appearing in
  * all_child_pathkeys.
  *
- * We consider both cheapest-startup and cheapest-total cases, ie, for each
- * interesting ordering, collect all the cheapest startup subpaths and all the
- * cheapest total paths, and build a suitable path for each case.
+ * We consider the cheapest-startup and cheapest-total cases, and also the
+ * cheapest-fractional case when not all tuples need to be retrieved.  For each
+ * interesting ordering, we collect all the cheapest startup subpaths, all the
+ * cheapest total paths, and, if applicable, all the cheapest fractional paths,
+ * and build a suitable path for each case.
  *
  * We don't currently generate any parameterized ordered paths here.  While
  * it would not take much more code here to do so, it's very unclear that it
@@ -1894,14 +1896,18 @@ generate_orderedappend_paths(PlannerInfo *root, RelOptInfo *rel,
 				double		path_fraction = root->tuple_fraction;
 
 				/*
-				 * Merge Append considers only live children relations.  Dummy
-				 * relations must be filtered out before.
+				 * We should not have a dummy child relation here.  However,
+				 * we cannot use childrel->rows to compute the tuple fraction,
+				 * as childrel can be an upper relation with an unset row
+				 * estimate.  Instead, we use the row estimate from the
+				 * cheapest_total path, which should already have been forced
+				 * to a sane value.
 				 */
-				Assert(childrel->rows > 0);
+				Assert(cheapest_total->rows > 0);
 
 				/* Convert absolute limit to a path fraction */
 				if (path_fraction >= 1.0)
-					path_fraction /= childrel->rows;
+					path_fraction /= cheapest_total->rows;
 
 				cheapest_fractional =
 					get_cheapest_fractional_path_for_pathkeys(childrel->pathlist,
@@ -3746,9 +3752,33 @@ recurse_pushdown_safe(Node *setOp, Query *topquery,
 static void
 check_output_expressions(Query *subquery, pushdown_safety_info *safetyInfo)
 {
+	List	   *flattened_targetList = subquery->targetList;
 	ListCell   *lc;
 
-	foreach(lc, subquery->targetList)
+	/*
+	 * We must be careful with grouping Vars and join alias Vars in the
+	 * subquery's outputs, as they hide the underlying expressions.
+	 *
+	 * We need to expand grouping Vars to their underlying expressions (the
+	 * grouping clauses) because the grouping expressions themselves might be
+	 * volatile or set-returning.  However, we do not need to expand join
+	 * alias Vars, as their underlying structure does not introduce volatile
+	 * or set-returning functions at the current level.
+	 *
+	 * In neither case do we need to recursively examine the Vars contained in
+	 * these underlying expressions.  Even if they reference outputs from
+	 * lower-level subqueries (at any depth), those references are guaranteed
+	 * not to expand to volatile or set-returning functions, because
+	 * subqueries containing such functions in their targetlists are never
+	 * pulled up.
+	 */
+	if (subquery->hasGroupRTE)
+	{
+		flattened_targetList = (List *)
+			flatten_group_exprs(NULL, subquery, (Node *) subquery->targetList);
+	}
+
+	foreach(lc, flattened_targetList)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(lc);
 
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index a20f459665f..bd437dcf935 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -864,19 +864,19 @@ clause_selectivity_ext(PlannerInfo *root,
 	{
 		FuncExpr   *funcclause = (FuncExpr *) clause;
 
-		/* Try to get an estimate from the support function, if any */
+		/* For non-pg_proc calls use a heuristic; otherwise consult support. */
 		if (!FUNC_EXPR_FROM_PG_PROC(funcclause->function_from))
 			s1 = (Selectivity) 0.3333333;
 		else
 			s1 = function_selectivity(root,
-								  funcclause->funcid,
-								  funcclause->args,
-								  funcclause->inputcollid,
-								  treat_as_join_clause(root, clause, rinfo,
-													   varRelid, sjinfo),
-								  varRelid,
-								  jointype,
-								  sjinfo);
+									  funcclause->funcid,
+									  funcclause->args,
+									  funcclause->inputcollid,
+									  treat_as_join_clause(root, clause, rinfo,
+														   varRelid, sjinfo),
+									  varRelid,
+									  jointype,
+									  sjinfo);
 	}
 	else if (IsA(clause, ScalarArrayOpExpr))
 	{
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 928fa76e759..d2f090a87d9 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -4535,10 +4535,24 @@ cost_subplan(PlannerInfo *root, SubPlan *subplan, Plan *plan)
 {
 	QualCost	sp_cost;
 
-	/* Figure any cost for evaluating the testexpr */
+	/*
+	 * Figure any cost for evaluating the testexpr.
+	 *
+	 * Usually, SubPlan nodes are built very early, before we have constructed
+	 * any RelOptInfos for the parent query level, which means the parent root
+	 * does not yet contain enough information to safely consult statistics.
+	 * Therefore, we pass root as NULL here.  cost_qual_eval() is already
+	 * well-equipped to handle a NULL root.
+	 *
+	 * One exception is SubPlan nodes built for the initplans of MIN/MAX
+	 * aggregates from indexes (cf. SS_make_initplan_from_plan).  In this
+	 * case, having a NULL root is safe because testexpr will be NULL.
+	 * Besides, an initplan will by definition not consult anything from the
+	 * parent plan.
+	 */
 	cost_qual_eval(&sp_cost,
 				   make_ands_implicit((Expr *) subplan->testexpr),
-				   root);
+				   NULL);
 
 	if (subplan->useHashTable)
 	{
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index edb99320e1a..8a60e255a19 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -31,6 +31,7 @@
 #include "optimizer/optimizer.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
+#include "optimizer/placeholder.h"
 #include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
 #include "utils/lsyscache.h"
@@ -3028,8 +3029,13 @@ match_funcclause_to_indexcol(PlannerInfo *root,
 	int			indexarg;
 	ListCell   *lc;
 
+	/*
+	 * Only functions originating from pg_proc are eligible here.
+	 * Subprocedure/package calls are not supported for index-qual matching
+	 * and should never reach this path.
+	 */
 	if (!FUNC_EXPR_FROM_PG_PROC(clause->function_from))
-		elog(ERROR, "invalid funcexpr, because it is a subproc");
+		elog(ERROR, "invalid FuncExpr: subprocedure/package calls are not supported for index-qual matching");
 
 	/*
 	 * We have no built-in intelligence about function clauses, but if there's
@@ -3292,8 +3298,8 @@ match_rowcompare_to_indexcol(PlannerInfo *root,
  *
  * In this routine, we attempt to transform a list of OR-clause args into a
  * single SAOP expression matching the target index column.  On success,
- * return an IndexClause, containing the transformed expression or NULL,
- * if failed.
+ * return an IndexClause containing the transformed expression.
+ * Return NULL if the transformation fails.
  */
 static IndexClause *
 match_orclause_to_indexcol(PlannerInfo *root,
@@ -3301,85 +3307,59 @@ match_orclause_to_indexcol(PlannerInfo *root,
 						   int indexcol,
 						   IndexOptInfo *index)
 {
-	ListCell   *lc;
 	BoolExpr   *orclause = (BoolExpr *) rinfo->orclause;
-	Node	   *indexExpr = NULL;
 	List	   *consts = NIL;
-	ScalarArrayOpExpr *saopexpr = NULL;
+	Node	   *indexExpr = NULL;
 	Oid			matchOpno = InvalidOid;
-	IndexClause *iclause;
 	Oid			consttype = InvalidOid;
 	Oid			arraytype = InvalidOid;
 	Oid			inputcollid = InvalidOid;
 	bool		firstTime = true;
 	bool		haveNonConst = false;
 	Index		indexRelid = index->rel->relid;
+	ScalarArrayOpExpr *saopexpr;
+	IndexClause *iclause;
+	ListCell   *lc;
 
-	Assert(IsA(orclause, BoolExpr));
-	Assert(orclause->boolop == OR_EXPR);
-
-	/* Ignore index if it doesn't support SAOP clauses */
+	/* Forget it if index doesn't support SAOP clauses */
 	if (!index->amsearcharray)
 		return NULL;
 
 	/*
 	 * Try to convert a list of OR-clauses to a single SAOP expression. Each
 	 * OR entry must be in the form: (indexkey operator constant) or (constant
-	 * operator indexkey).  Operators of all the entries must match.  To be
-	 * effective, give up on the first non-matching entry.  Exit is
-	 * implemented as a break from the loop, which is catched afterwards.
+	 * operator indexkey).  Operators of all the entries must match.  On
+	 * discovery of anything unsupported, we give up by breaking out of the
+	 * loop immediately and returning NULL.
 	 */
 	foreach(lc, orclause->args)
 	{
-		RestrictInfo *subRinfo;
+		RestrictInfo *subRinfo = (RestrictInfo *) lfirst(lc);
 		OpExpr	   *subClause;
 		Oid			opno;
 		Node	   *leftop,
 				   *rightop;
 		Node	   *constExpr;
 
-		if (!IsA(lfirst(lc), RestrictInfo))
+		/* If it's not a RestrictInfo (i.e. it's a sub-AND), we can't use it */
+		if (!IsA(subRinfo, RestrictInfo))
 			break;
 
-		subRinfo = (RestrictInfo *) lfirst(lc);
-
-		/* Only operator clauses can match  */
+		/* Only operator clauses can match */
 		if (!IsA(subRinfo->clause, OpExpr))
 			break;
 
 		subClause = (OpExpr *) subRinfo->clause;
 		opno = subClause->opno;
 
-		/* Only binary operators can match  */
+		/* Only binary operators can match */
 		if (list_length(subClause->args) != 2)
 			break;
 
-		/*
-		 * The parameters below must match between sub-rinfo and its parent as
-		 * make_restrictinfo() fills them with the same values, and further
-		 * modifications are also the same for the whole subtree.  However,
-		 * still make a sanity check.
-		 */
-		Assert(subRinfo->is_pushed_down == rinfo->is_pushed_down);
-		Assert(subRinfo->is_clone == rinfo->is_clone);
-		Assert(subRinfo->security_level == rinfo->security_level);
-		Assert(bms_equal(subRinfo->incompatible_relids, rinfo->incompatible_relids));
-		Assert(bms_equal(subRinfo->outer_relids, rinfo->outer_relids));
-
-		/*
-		 * Also, check that required_relids in sub-rinfo is subset of parent's
-		 * required_relids.
-		 */
-		Assert(bms_is_subset(subRinfo->required_relids, rinfo->required_relids));
-
-		/* Only the operator returning a boolean suit the transformation. */
-		if (get_op_rettype(opno) != BOOLOID)
-			break;
-
 		/*
 		 * Check for clauses of the form: (indexkey operator constant) or
-		 * (constant operator indexkey).  See match_clause_to_indexcol's notes
-		 * about const-ness.
+		 * (constant operator indexkey).  These tests should agree with
+		 * match_opclause_to_indexcol.
 		 */
 		leftop = (Node *) linitial(subClause->args);
 		rightop = (Node *) lsecond(subClause->args);
@@ -3408,22 +3388,6 @@ match_orclause_to_indexcol(PlannerInfo *root,
 			break;
 		}
 
-		/*
-		 * Ignore any RelabelType node above the operands.  This is needed to
-		 * be able to apply indexscanning in binary-compatible-operator cases.
-		 * Note: we can assume there is at most one RelabelType node;
-		 * eval_const_expressions() will have simplified if more than one.
-		 */
-		if (IsA(constExpr, RelabelType))
-			constExpr = (Node *) ((RelabelType *) constExpr)->arg;
-		if (IsA(indexExpr, RelabelType))
-			indexExpr = (Node *) ((RelabelType *) indexExpr)->arg;
-
-		/* Forbid transformation for composite types, records. */
-		if (type_is_rowtype(exprType(constExpr)) ||
-			type_is_rowtype(exprType(indexExpr)))
-			break;
-
 		/*
 		 * Save information about the operator, type, and collation for the
 		 * first matching qual.  Then, check that subsequent quals match the
@@ -3441,54 +3405,71 @@ match_orclause_to_indexcol(PlannerInfo *root,
 			 * the expression collation matches the index collation.  Also,
 			 * there must be an array type to construct an array later.
 			 */
-			if (!IndexCollMatchesExprColl(index->indexcollations[indexcol], inputcollid) ||
+			if (!IndexCollMatchesExprColl(index->indexcollations[indexcol],
+										  inputcollid) ||
 				!op_in_opfamily(matchOpno, index->opfamily[indexcol]) ||
 				!OidIsValid(arraytype))
 				break;
+
+			/*
+			 * Disallow if either type is RECORD, mainly because we can't be
+			 * positive that all the RHS expressions are the same record type.
+			 */
+			if (consttype == RECORDOID || exprType(indexExpr) == RECORDOID)
+				break;
+
 			firstTime = false;
 		}
 		else
 		{
-			if (opno != matchOpno ||
+			if (matchOpno != opno ||
 				inputcollid != subClause->inputcollid ||
 				consttype != exprType(constExpr))
 				break;
 		}
 
 		/*
-		 * Check if our list of constants in match_clause_to_indexcol's
-		 * understanding of const-ness have something other than Const.
+		 * The righthand inputs don't necessarily have to be plain Consts, but
+		 * make_SAOP_expr needs to know if any are not.
 		 */
 		if (!IsA(constExpr, Const))
 			haveNonConst = true;
+
 		consts = lappend(consts, constExpr);
 	}
 
 	/*
-	 * Catch the break from the loop above.  Normally, a foreach() loop ends
-	 * up with a NULL list cell.  A non-NULL list cell indicates a break from
-	 * the foreach() loop.  Free the consts list and return NULL then.
+	 * Handle failed conversion from breaking out of the loop because of an
+	 * unsupported qual.  Also check that we have an indexExpr, just in case
+	 * the OR list was somehow empty (it shouldn't be).  Return NULL to
+	 * indicate the conversion failed.
 	 */
-	if (lc != NULL)
+	if (lc != NULL || indexExpr == NULL)
 	{
-		list_free(consts);
+		list_free(consts);		/* might as well */
 		return NULL;
 	}
 
+	/*
+	 * Build the new SAOP node.  We use the indexExpr from the last OR arm;
+	 * since all the arms passed match_index_to_operand, it shouldn't matter
+	 * which one we use.  But using "inputcollid" twice is a bit of a cheat:
+	 * we might end up with an array Const node that is labeled with a
+	 * collation despite its elements being of a noncollatable type.  But
+	 * nothing is likely to complain about that, so we don't bother being more
+	 * accurate.
+	 */
 	saopexpr = make_SAOP_expr(matchOpno, indexExpr, consttype, inputcollid,
 							  inputcollid, consts, haveNonConst);
+	Assert(saopexpr != NULL);
 
 	/*
-	 * Finally, build an IndexClause based on the SAOP node.  Use
-	 * make_simple_restrictinfo() to get RestrictInfo with clean selectivity
-	 * estimations, because they may differ from the estimation made for an OR
-	 * clause.  Although it is not a lossy expression, keep the original rinfo
-	 * in iclause->rinfo as prescribed.
+	 * Finally, build an IndexClause based on the SAOP node.  It's not lossy.
 	 */
 	iclause = makeNode(IndexClause);
 	iclause->rinfo = rinfo;
 	iclause->indexquals = list_make1(make_simple_restrictinfo(root,
-															  &saopexpr->xpr));
+															  (Expr *) saopexpr));
 	iclause->lossy = false;
 	iclause->indexcol = indexcol;
 	iclause->indexcols = NIL;
@@ -4078,6 +4059,16 @@ check_index_predicates(PlannerInfo *root, RelOptInfo *rel)
 		if (is_target_rel)
 			continue;
 
+		/*
+		 * If index is !amoptionalkey, also leave indrestrictinfo as set
+		 * above.  Otherwise we risk removing all quals for the first index
+		 * key and then not being able to generate an indexscan at all.  It
+		 * would be better to be more selective, but we've not yet identified
+		 * which if any of the quals match the first index key.
+		 */
+		if (!index->amoptionalkey)
+			continue;
+
 		/* Else compute indrestrictinfo as the non-implied quals */
 		index->indrestrictinfo = NIL;
 		foreach(lcr, rel->baserestrictinfo)
@@ -4268,16 +4259,19 @@ relation_has_unique_index_ext(PlannerInfo *root, RelOptInfo *rel,
 				 * The condition's equality operator must be a member of the
 				 * index opfamily, else it is not asserting the right kind of
 				 * equality behavior for this index.  We check this first
-				 * since it's probably cheaper than match_index_to_operand().
+				 * since it's probably the cheapest test.
 				 */
 				if (!list_member_oid(rinfo->mergeopfamilies, ind->opfamily[c]))
 					continue;
 
 				/*
-				 * XXX at some point we may need to check collations here too.
-				 * For the moment we assume all collations reduce to the same
-				 * notion of equality.
+				 * The index's collation must agree with the clause's input
+				 * collation on equality, else the index's uniqueness does not
+				 * imply uniqueness under the clause's equality semantics.
 				 */
+				if (!collations_agree_on_equality(ind->indexcollations[c],
+												  exprInputCollation((Node *) rinfo->clause)))
+					continue;
 
 				/* OK, see if the condition operand matches the index key */
 				if (rinfo->outer_is_left)
@@ -4333,10 +4327,13 @@ relation_has_unique_index_ext(PlannerInfo *root, RelOptInfo *rel,
 					continue;
 
 				/*
-				 * XXX at some point we may need to check collations here too.
-				 * For the moment we assume all collations reduce to the same
-				 * notion of equality.
+				 * The index's collation must agree with the operand's
+				 * collation on equality, else the index's uniqueness does not
+				 * imply uniqueness under the operator's equality semantics.
 				 */
+				if (!collations_agree_on_equality(ind->indexcollations[c],
+												  exprCollation(expr)))
+					continue;
 
 				matched = true; /* column is unique */
 				break;
@@ -4433,12 +4430,23 @@ match_index_to_operand(Node *operand,
 	int			indkey;
 
 	/*
-	 * Ignore any RelabelType node above the operand.   This is needed to be
-	 * able to apply indexscanning in binary-compatible-operator cases. Note:
-	 * we can assume there is at most one RelabelType node;
-	 * eval_const_expressions() will have simplified if more than one.
+	 * Ignore any PlaceHolderVar node contained in the operand.  This is
+	 * needed to be able to apply indexscanning in cases where the operand (or
+	 * a subtree) has been wrapped in PlaceHolderVars to enforce separate
+	 * identity or as a result of outer joins.
+	 */
+	operand = strip_noop_phvs(operand);
+
+	/*
+	 * Ignore any RelabelType node above the operand.  This is needed to be
+	 * able to apply indexscanning in binary-compatible-operator cases.
+	 *
+	 * Note: we must handle nested RelabelType nodes here.  While
+	 * eval_const_expressions() will have simplified them to at most one
+	 * layer, our prior stripping of PlaceHolderVars may have brought separate
+	 * RelabelTypes into adjacency.
 	 */
-	if (operand && IsA(operand, RelabelType))
+	while (operand && IsA(operand, RelabelType))
 		operand = (Node *) ((RelabelType *) operand)->arg;
 
 	indkey = index->indexkeys[indexcol];
@@ -4491,6 +4499,19 @@ match_index_to_operand(Node *operand,
 	return false;
 }
 
+/*
+ * strip_phvs_in_index_operand
+ *
+ * Retained as a backward-compatibility wrapper around strip_noop_phvs() to
+ * avoid breaking third-party extensions that may reference this function.  New
+ * code should call strip_noop_phvs() directly.
+ */
+Node *
+strip_phvs_in_index_operand(Node *operand)
+{
+	return strip_noop_phvs(operand);
+}
+
 /*
  * is_pseudo_constant_for_index()
  *	  Test whether the given expression can be used as an indexscan
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 7aa8f5d799c..af5aa8aea84 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -2399,13 +2399,25 @@ hash_inner_and_outer(PlannerInfo *root,
 
 		/*
 		 * If the joinrel is parallel-safe, we may be able to consider a
-		 * partial hash join.  However, we can't handle JOIN_UNIQUE_OUTER,
-		 * because the outer path will be partial, and therefore we won't be
-		 * able to properly guarantee uniqueness.  Also, the resulting path
-		 * must not be parameterized.
+		 * partial hash join.
+		 *
+		 * However, we can't handle JOIN_UNIQUE_OUTER, because the outer path
+		 * will be partial, and therefore we won't be able to properly
+		 * guarantee uniqueness.
+		 *
+		 * Similarly, we can't handle JOIN_RIGHT_SEMI, because the hash table
+		 * is either a shared hash table or a private hash table per backend.
+		 * In the shared case, there is no concurrency protection for the
+		 * match flags, so multiple workers could inspect and set the flags
+		 * concurrently, potentially producing incorrect results.  In the
+		 * private case, each worker has its own copy of the hash table, so no
+		 * single process has all the match flags.
+		 *
+		 * Also, the resulting path must not be parameterized.
 		 */
 		if (joinrel->consider_parallel &&
 			save_jointype != JOIN_UNIQUE_OUTER &&
+			save_jointype != JOIN_RIGHT_SEMI &&
 			outerrel->partial_pathlist != NIL &&
 			bms_is_empty(joinrel->lateral_relids))
 		{
@@ -2439,13 +2451,12 @@ hash_inner_and_outer(PlannerInfo *root,
 			 * total inner path will also be parallel-safe, but if not, we'll
 			 * have to search for the cheapest safe, unparameterized inner
 			 * path.  If doing JOIN_UNIQUE_INNER, we can't use any alternative
-			 * inner path.  If full, right, right-semi or right-anti join, we
-			 * can't use parallelism (building the hash table in each backend)
-			 * because no one process has all the match bits.
+			 * inner path.  If full, right, or right-anti join, we can't use
+			 * parallelism (building the hash table in each backend) because
+			 * no one process has all the match bits.
 			 */
 			if (save_jointype == JOIN_FULL ||
 				save_jointype == JOIN_RIGHT ||
-				save_jointype == JOIN_RIGHT_SEMI ||
 				save_jointype == JOIN_RIGHT_ANTI)
 				cheapest_safe_inner = NULL;
 			else if (cheapest_total_inner->parallel_safe)
diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c
index 4d55c2ea591..9f546b4d3a6 100644
--- a/src/backend/optimizer/plan/analyzejoins.c
+++ b/src/backend/optimizer/plan/analyzejoins.c
@@ -34,6 +34,20 @@
 #include "rewrite/rewriteManip.h"
 #include "utils/lsyscache.h"
 
+/*
+ * One element of the list passed to query_is_distinct_for_with_collations().
+ * Each entry names a subquery output column that the caller needs to be
+ * distinct over, plus the upper-level equality operator and its input
+ * collation, so that the subquery's own DISTINCT/GROUP BY/set-op clauses can
+ * be compared for compatibility.
+ */
+typedef struct DistinctColInfo
+{
+	int			colno;			/* subquery output column resno */
+	Oid			opid;			/* upper-level equality operator */
+	Oid			collid;			/* input collation of opid */
+} DistinctColInfo;
+
 /*
  * Utility structure.  A sorting procedure is needed to simplify the search
  * of SJE-candidate baserels referencing the same database relation.  Having
@@ -65,7 +79,9 @@ static List *remove_rel_from_joinlist(List *joinlist, int relid, int *nremoved);
 static bool rel_supports_distinctness(PlannerInfo *root, RelOptInfo *rel);
 static bool rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel,
 								List *clause_list, List **extra_clauses);
-static Oid	distinct_col_search(int colno, List *colnos, List *opids);
+static bool query_is_distinct_for_with_collations(Query *query,
+												  List *distinct_cols);
+static DistinctColInfo *distinct_col_search(int colno, List *distinct_cols);
 static bool is_innerrel_unique_for(PlannerInfo *root,
 								   Relids joinrelids,
 								   Relids outerrelids,
@@ -631,6 +647,7 @@ remove_leftjoinrel_from_query(PlannerInfo *root, int relid,
 	 * remove_join_clause_from_rels will touch it.)
 	 */
 	root->simple_rel_array[relid] = NULL;
+	root->simple_rte_array[relid] = NULL;
 
 	/* And nuke the RelOptInfo, just in case there's another access path */
 	pfree(rel);
@@ -648,7 +665,7 @@ remove_leftjoinrel_from_query(PlannerInfo *root, int relid,
 /*
  * Remove any references to relid or ojrelid from the RestrictInfo.
  *
- * We only bother to clean out bits in clause_relids and required_relids,
+ * We only bother to clean out bits in the RestrictInfo's various relid sets,
  * not nullingrel bits in contained Vars and PHVs.  (This might have to be
  * improved sometime.)  However, if the RestrictInfo contains an OR clause
  * we have to also clean up the sub-clauses.
@@ -670,6 +687,22 @@ remove_rel_from_restrictinfo(RestrictInfo *rinfo, int relid, int ojrelid)
 	rinfo->required_relids = bms_copy(rinfo->required_relids);
 	rinfo->required_relids = bms_del_member(rinfo->required_relids, relid);
 	rinfo->required_relids = bms_del_member(rinfo->required_relids, ojrelid);
+	/* Likewise for incompatible_relids */
+	rinfo->incompatible_relids = bms_copy(rinfo->incompatible_relids);
+	rinfo->incompatible_relids = bms_del_member(rinfo->incompatible_relids, relid);
+	rinfo->incompatible_relids = bms_del_member(rinfo->incompatible_relids, ojrelid);
+	/* Likewise for outer_relids */
+	rinfo->outer_relids = bms_copy(rinfo->outer_relids);
+	rinfo->outer_relids = bms_del_member(rinfo->outer_relids, relid);
+	rinfo->outer_relids = bms_del_member(rinfo->outer_relids, ojrelid);
+	/* Likewise for left_relids */
+	rinfo->left_relids = bms_copy(rinfo->left_relids);
+	rinfo->left_relids = bms_del_member(rinfo->left_relids, relid);
+	rinfo->left_relids = bms_del_member(rinfo->left_relids, ojrelid);
+	/* Likewise for right_relids */
+	rinfo->right_relids = bms_copy(rinfo->right_relids);
+	rinfo->right_relids = bms_del_member(rinfo->right_relids, relid);
+	rinfo->right_relids = bms_del_member(rinfo->right_relids, ojrelid);
 
 	/* If it's an OR, recurse to clean up sub-clauses */
 	if (restriction_is_or_clause(rinfo))
@@ -1001,15 +1034,17 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list,
 	{
 		Index		relid = rel->relid;
 		Query	   *subquery = root->simple_rte_array[relid]->subquery;
-		List	   *colnos = NIL;
-		List	   *opids = NIL;
+		List	   *distinct_cols = NIL;
 		ListCell   *l;
 
 		/*
-		 * Build the argument lists for query_is_distinct_for: a list of
-		 * output column numbers that the query needs to be distinct over, and
-		 * a list of equality operators that the output columns need to be
-		 * distinct according to.
+		 * Build the argument list for query_is_distinct_for_with_collations:
+		 * a list of DistinctColInfo entries, each holding an output column
+		 * number that the query needs to be distinct over, the equality
+		 * operator that the column needs to be distinct according to, and
+		 * that operator's input collation.  The collation matters because the
+		 * subquery's own DISTINCT / GROUP BY / set-op proves uniqueness under
+		 * its own collation, which need not agree with the operator's.
 		 *
 		 * (XXX we are not considering restriction clauses attached to the
 		 * subquery; is that worth doing?)
@@ -1017,18 +1052,18 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list,
 		foreach(l, clause_list)
 		{
 			RestrictInfo *rinfo = lfirst_node(RestrictInfo, l);
-			Oid			op;
+			OpExpr	   *opexpr;
 			Var		   *var;
+			DistinctColInfo *dcinfo;
 
 			/*
-			 * Get the equality operator we need uniqueness according to.
-			 * (This might be a cross-type operator and thus not exactly the
-			 * same operator the subquery would consider; that's all right
-			 * since query_is_distinct_for can resolve such cases.)  The
-			 * caller's mergejoinability test should have selected only
-			 * OpExprs.
+			 * The caller's mergejoinability test should have selected only
+			 * OpExprs.  The operator might be a cross-type operator and thus
+			 * not exactly the same operator the subquery would consider;
+			 * that's all right since query_is_distinct_for_with_collations
+			 * can resolve such cases.
 			 */
-			op = castNode(OpExpr, rinfo->clause)->opno;
+			opexpr = castNode(OpExpr, rinfo->clause);
 
 			/* caller identified the inner side for us */
 			if (rinfo->outer_is_left)
@@ -1052,11 +1087,14 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list,
 				var->varno != relid || var->varlevelsup != 0)
 				continue;
 
-			colnos = lappend_int(colnos, var->varattno);
-			opids = lappend_oid(opids, op);
+			dcinfo = palloc(sizeof(DistinctColInfo));
+			dcinfo->colno = var->varattno;
+			dcinfo->opid = opexpr->opno;
+			dcinfo->collid = opexpr->inputcollid;
+			distinct_cols = lappend(distinct_cols, dcinfo);
 		}
 
-		if (query_is_distinct_for(subquery, colnos, opids))
+		if (query_is_distinct_for_with_collations(subquery, distinct_cols))
 			return true;
 	}
 	return false;
@@ -1094,31 +1132,70 @@ query_supports_distinctness(Query *query)
 }
 
 /*
- * query_is_distinct_for - does query never return duplicates of the
- *		specified columns?
+ * query_is_distinct_for - ABI-preserving wrapper around
+ *		query_is_distinct_for_with_collations().
+ *
+ * The original signature took parallel colnos/opids lists and did not
+ * consider collations.  External callers built against earlier minor
+ * releases continue to call it with the historical (collation-blind)
+ * semantics; we forward with InvalidOid collations, which makes the
+ * collation check a no-op (see collations_agree_on_equality()).
+ */
+bool
+query_is_distinct_for(Query *query, List *colnos, List *opids)
+{
+	List	   *distinct_cols = NIL;
+	ListCell   *lc1;
+	ListCell   *lc2;
+
+	Assert(list_length(colnos) == list_length(opids));
+
+	forboth(lc1, colnos, lc2, opids)
+	{
+		DistinctColInfo *dcinfo = palloc(sizeof(DistinctColInfo));
+
+		dcinfo->colno = lfirst_int(lc1);
+		dcinfo->opid = lfirst_oid(lc2);
+		dcinfo->collid = InvalidOid;
+		distinct_cols = lappend(distinct_cols, dcinfo);
+	}
+
+	return query_is_distinct_for_with_collations(query, distinct_cols);
+}
+
+/*
+ * query_is_distinct_for_with_collations - does query never return duplicates
+ *		of the specified columns?
  *
  * query is a not-yet-planned subquery (in current usage, it's always from
  * a subquery RTE, which the planner avoids scribbling on).
  *
- * colnos is an integer list of output column numbers (resno's).  We are
- * interested in whether rows consisting of just these columns are certain
- * to be distinct.  "Distinctness" is defined according to whether the
- * corresponding upper-level equality operators listed in opids would think
- * the values are distinct.  (Note: the opids entries could be cross-type
- * operators, and thus not exactly the equality operators that the subquery
- * would use itself.  We use equality_ops_are_compatible() to check
- * compatibility.  That looks at opfamily membership for index AMs that have
- * declared that they support consistent equality semantics within an
+ * distinct_cols is a list of DistinctColInfo, one per requested output column.
+ * Each entry names the subquery output column number we want distinct, the
+ * upper-level equality operator we'll compare values with, and that operator's
+ * input collation.  We are interested in whether rows consisting of just these
+ * columns are certain to be distinct.
+ *
+ * "Distinctness" is defined according to whether the corresponding upper-level
+ * equality operators would think the values are distinct.  (Note: each opid
+ * could be a cross-type operator, and thus not exactly the equality operator
+ * that the subquery would use itself.  We use equality_ops_are_compatible() to
+ * check compatibility.  That looks at opfamily membership for index AMs that
+ * have declared that they support consistent equality semantics within an
  * opfamily, and so should give trustworthy answers for all operators that we
  * might need to deal with here.)
+ *
+ * The collid must also agree on equality with the collation the subquery's own
+ * DISTINCT/GROUP BY/set-op uses to deduplicate the column, else the subquery's
+ * distinctness does not carry over to the caller's equality semantics.  Two
+ * collations agree on equality if they match or if both are deterministic (in
+ * which case both reduce equality to byte-equality; see CREATE COLLATION).
  */
-bool
-query_is_distinct_for(Query *query, List *colnos, List *opids)
+static bool
+query_is_distinct_for_with_collations(Query *query, List *distinct_cols)
 {
 	ListCell   *l;
-	Oid			opid;
-
-	Assert(list_length(colnos) == list_length(opids));
+	DistinctColInfo *dcinfo;
 
 	/*
 	 * DISTINCT (including DISTINCT ON) guarantees uniqueness if all the
@@ -1134,9 +1211,11 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 			TargetEntry *tle = get_sortgroupclause_tle(sgc,
 													   query->targetList);
 
-			opid = distinct_col_search(tle->resno, colnos, opids);
-			if (!OidIsValid(opid) ||
-				!equality_ops_are_compatible(opid, sgc->eqop))
+			dcinfo = distinct_col_search(tle->resno, distinct_cols);
+			if (dcinfo == NULL ||
+				!equality_ops_are_compatible(dcinfo->opid, sgc->eqop) ||
+				!collations_agree_on_equality(dcinfo->collid,
+											  exprCollation((Node *) tle->expr)))
 				break;			/* exit early if no match */
 		}
 		if (l == NULL)			/* had matches for all? */
@@ -1165,9 +1244,11 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 			TargetEntry *tle = get_sortgroupclause_tle(sgc,
 													   query->targetList);
 
-			opid = distinct_col_search(tle->resno, colnos, opids);
-			if (!OidIsValid(opid) ||
-				!equality_ops_are_compatible(opid, sgc->eqop))
+			dcinfo = distinct_col_search(tle->resno, distinct_cols);
+			if (dcinfo == NULL ||
+				!equality_ops_are_compatible(dcinfo->opid, sgc->eqop) ||
+				!collations_agree_on_equality(dcinfo->collid,
+											  exprCollation((Node *) tle->expr)))
 				break;			/* exit early if no match */
 		}
 		if (l == NULL)			/* had matches for all? */
@@ -1233,9 +1314,11 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 				sgc = (SortGroupClause *) lfirst(lg);
 				lg = lnext(topop->groupClauses, lg);
 
-				opid = distinct_col_search(tle->resno, colnos, opids);
-				if (!OidIsValid(opid) ||
-					!equality_ops_are_compatible(opid, sgc->eqop))
+				dcinfo = distinct_col_search(tle->resno, distinct_cols);
+				if (dcinfo == NULL ||
+					!equality_ops_are_compatible(dcinfo->opid, sgc->eqop) ||
+					!collations_agree_on_equality(dcinfo->collid,
+												  exprCollation((Node *) tle->expr)))
 					break;		/* exit early if no match */
 			}
 			if (l == NULL)		/* had matches for all? */
@@ -1255,24 +1338,23 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 }
 
 /*
- * distinct_col_search - subroutine for query_is_distinct_for
+ * distinct_col_search - subroutine for query_is_distinct_for_with_collations
  *
- * If colno is in colnos, return the corresponding element of opids,
- * else return InvalidOid.  (Ordinarily colnos would not contain duplicates,
- * but if it does, we arbitrarily select the first match.)
+ * If colno matches the colno field of an entry in distinct_cols, return a
+ * pointer to that entry; else return NULL.  (Ordinarily distinct_cols would
+ * not contain duplicate colnos, but if it does, we arbitrarily select the
+ * first match.)
  */
-static Oid
-distinct_col_search(int colno, List *colnos, List *opids)
+static DistinctColInfo *
+distinct_col_search(int colno, List *distinct_cols)
 {
-	ListCell   *lc1,
-			   *lc2;
-
-	forboth(lc1, colnos, lc2, opids)
+	foreach_ptr(DistinctColInfo, dcinfo, distinct_cols)
 	{
-		if (colno == lfirst_int(lc1))
-			return lfirst_oid(lc2);
+		if (dcinfo->colno == colno)
+			return dcinfo;
 	}
-	return InvalidOid;
+
+	return NULL;
 }
 
 
@@ -1686,14 +1768,14 @@ add_non_redundant_clauses(PlannerInfo *root,
 }
 
 /*
- * A custom callback for ChangeVarNodesExtended() providing
- * Self-join elimination (SJE) related functionality
+ * A custom callback for ChangeVarNodesExtended() providing Self-join
+ * elimination (SJE) related functionality
  *
- * SJE needs to skip the RangeTblRef node
- * type.  During SJE's last step, remove_rel_from_joinlist() removes
- * remaining RangeTblRefs with target relid.  If ChangeVarNodes() replaces
- * the target relid before, remove_rel_from_joinlist() fails to identify
- * the nodes to delete.
+ * SJE needs to skip the RangeTblRef node type.  During SJE's last
+ * step, remove_rel_from_joinlist() removes remaining RangeTblRefs
+ * with target relid.  If ChangeVarNodes() replaces the target relid
+ * before, remove_rel_from_joinlist() would fail to identify the nodes
+ * to delete.
  *
  * SJE also needs to change the relids within RestrictInfo's.
  */
@@ -1772,8 +1854,8 @@ replace_relid_callback(Node *node, ChangeVarNodes_context *context)
 			/*
 			 * For self-join elimination, changing varnos could transform
 			 * "t1.a = t2.a" into "t1.a = t1.a".  That is always true as long
-			 * as "t1.a" is not null.  We use qual() to check for such a case,
-			 * and then we replace the qual for a check for not null
+			 * as "t1.a" is not null.  We use equal() to check for such a
+			 * case, and then we replace the qual with a check for not null
 			 * (NullTest).
 			 */
 			if (leftOp != NULL && equal(leftOp, rightOp))
@@ -1979,10 +2061,12 @@ remove_self_join_rel(PlannerInfo *root, PlanRowMark *kmark, PlanRowMark *rmark,
 	 * remove_join_clause_from_rels will touch it.)
 	 */
 	root->simple_rel_array[toRemove->relid] = NULL;
+	root->simple_rte_array[toRemove->relid] = NULL;
 
 	/* And nuke the RelOptInfo, just in case there's another access path. */
 	pfree(toRemove);
 
+
 	/*
 	 * Now repeat construction of attr_needed bits coming from all other
 	 * sources.
@@ -2142,21 +2226,21 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 
 	while ((r = bms_next_member(relids, r)) > 0)
 	{
-		RelOptInfo *inner = root->simple_rel_array[r];
+		RelOptInfo *rrel = root->simple_rel_array[r];
 
 		k = r;
 
 		while ((k = bms_next_member(relids, k)) > 0)
 		{
 			Relids		joinrelids = NULL;
-			RelOptInfo *outer = root->simple_rel_array[k];
+			RelOptInfo *krel = root->simple_rel_array[k];
 			List	   *restrictlist;
 			List	   *selfjoinquals;
 			List	   *otherjoinquals;
 			ListCell   *lc;
 			bool		jinfo_check = true;
-			PlanRowMark *omark = NULL;
-			PlanRowMark *imark = NULL;
+			PlanRowMark *kmark = NULL;
+			PlanRowMark *rmark = NULL;
 			List	   *uclauses = NIL;
 
 			/* A sanity check: the relations have the same Oid. */
@@ -2194,21 +2278,21 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 			{
 				PlanRowMark *rowMark = (PlanRowMark *) lfirst(lc);
 
-				if (rowMark->rti == k)
+				if (rowMark->rti == r)
 				{
-					Assert(imark == NULL);
-					imark = rowMark;
+					Assert(rmark == NULL);
+					rmark = rowMark;
 				}
-				else if (rowMark->rti == r)
+				else if (rowMark->rti == k)
 				{
-					Assert(omark == NULL);
-					omark = rowMark;
+					Assert(kmark == NULL);
+					kmark = rowMark;
 				}
 
-				if (omark && imark)
+				if (kmark && rmark)
 					break;
 			}
-			if (omark && imark && omark->markType != imark->markType)
+			if (kmark && rmark && kmark->markType != rmark->markType)
 				continue;
 
 			/*
@@ -2229,8 +2313,8 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 			 * build_joinrel_restrictlist() routine.
 			 */
 			restrictlist = generate_join_implied_equalities(root, joinrelids,
-															inner->relids,
-															outer, NULL);
+															rrel->relids,
+															krel, NULL);
 			if (restrictlist == NIL)
 				continue;
 
@@ -2240,7 +2324,7 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 			 * otherjoinquals.
 			 */
 			split_selfjoin_quals(root, restrictlist, &selfjoinquals,
-								 &otherjoinquals, inner->relid, outer->relid);
+								 &otherjoinquals, rrel->relid, krel->relid);
 
 			Assert(list_length(restrictlist) ==
 				   (list_length(selfjoinquals) + list_length(otherjoinquals)));
@@ -2251,17 +2335,17 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 			 * degenerate case works only if both sides have the same clause.
 			 * So doesn't matter which side to add.
 			 */
-			selfjoinquals = list_concat(selfjoinquals, outer->baserestrictinfo);
+			selfjoinquals = list_concat(selfjoinquals, krel->baserestrictinfo);
 
 			/*
-			 * Determine if the inner table can duplicate outer rows.  We must
-			 * bypass the unique rel cache here since we're possibly using a
-			 * subset of join quals. We can use 'force_cache' == true when all
-			 * join quals are self-join quals.  Otherwise, we could end up
-			 * putting false negatives in the cache.
+			 * Determine if the rrel can duplicate outer rows. We must bypass
+			 * the unique rel cache here since we're possibly using a subset
+			 * of join quals. We can use 'force_cache' == true when all join
+			 * quals are self-join quals.  Otherwise, we could end up putting
+			 * false negatives in the cache.
 			 */
-			if (!innerrel_is_unique_ext(root, joinrelids, inner->relids,
-										outer, JOIN_INNER, selfjoinquals,
+			if (!innerrel_is_unique_ext(root, joinrelids, rrel->relids,
+										krel, JOIN_INNER, selfjoinquals,
 										list_length(otherjoinquals) == 0,
 										&uclauses))
 				continue;
@@ -2277,14 +2361,14 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
 			 * expressions, or we won't match the same row on each side of the
 			 * join.
 			 */
-			if (!match_unique_clauses(root, inner, uclauses, outer->relid))
+			if (!match_unique_clauses(root, rrel, uclauses, krel->relid))
 				continue;
 
 			/*
-			 * We can remove either relation, so remove the inner one in order
-			 * to simplify this loop.
+			 * Remove rrel ReloptInfo from the planner structures and the
+			 * corresponding row mark.
 			 */
-			remove_self_join_rel(root, omark, imark, outer, inner, restrictlist);
+			remove_self_join_rel(root, kmark, rmark, krel, rrel, restrictlist);
 
 			result = bms_add_member(result, r);
 
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 0b61aef962c..10b7358c28b 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -5256,7 +5256,8 @@ fix_indexqual_clause(PlannerInfo *root, IndexOptInfo *index, int indexcol,
  * equal to the index's attribute number (index column position).
  *
  * Most of the code here is just for sanity cross-checking that the given
- * expression actually matches the index column it's claimed to.
+ * expression actually matches the index column it's claimed to.  It should
+ * match the logic in match_index_to_operand().
  */
 static Node *
 fix_indexqual_operand(Node *node, IndexOptInfo *index, int indexcol)
@@ -5265,14 +5266,19 @@ fix_indexqual_operand(Node *node, IndexOptInfo *index, int indexcol)
 	int			pos;
 	ListCell   *indexpr_item;
 
+	Assert(indexcol >= 0 && indexcol < index->ncolumns);
+
+	/*
+	 * Remove any PlaceHolderVar wrapping of the indexkey
+	 */
+	node = strip_noop_phvs(node);
+
 	/*
 	 * Remove any binary-compatible relabeling of the indexkey
 	 */
-	if (IsA(node, RelabelType))
+	while (IsA(node, RelabelType))
 		node = (Node *) ((RelabelType *) node)->arg;
 
-	Assert(indexcol >= 0 && indexcol < index->ncolumns);
-
 	if (index->indexkeys[indexcol] != 0)
 	{
 		/* It's a simple index column */
@@ -7174,6 +7180,8 @@ make_modifytable(PlannerInfo *root, Plan *subplan,
 	ModifyTable *node = makeNode(ModifyTable);
 	bool		returning_old_or_new = false;
 	bool		returning_old_or_new_valid = false;
+	bool		transition_tables = false;
+	bool		transition_tables_valid = false;
 	List	   *fdw_private_list;
 	Bitmapset  *direct_modify_plans;
 	ListCell   *lc;
@@ -7320,8 +7328,8 @@ make_modifytable(PlannerInfo *root, Plan *subplan,
 		 * callback functions needed for that and (2) there are no local
 		 * structures that need to be run for each modified row: row-level
 		 * triggers on the foreign table, stored generated columns, WITH CHECK
-		 * OPTIONs from parent views, or Vars returning OLD/NEW in the
-		 * RETURNING list.
+		 * OPTIONs from parent views, Vars returning OLD/NEW in the RETURNING
+		 * list, or transition tables on the named relation.
 		 */
 		direct_modify = false;
 		if (fdwroutine != NULL &&
@@ -7333,7 +7341,10 @@ make_modifytable(PlannerInfo *root, Plan *subplan,
 			!has_row_triggers(root, rti, operation) &&
 			!has_stored_generated_columns(root, rti))
 		{
-			/* returning_old_or_new is the same for all result relations */
+			/*
+			 * returning_old_or_new and transition_tables are the same for all
+			 * result relations, respectively
+			 */
 			if (!returning_old_or_new_valid)
 			{
 				returning_old_or_new =
@@ -7342,7 +7353,18 @@ make_modifytable(PlannerInfo *root, Plan *subplan,
 				returning_old_or_new_valid = true;
 			}
 			if (!returning_old_or_new)
-				direct_modify = fdwroutine->PlanDirectModify(root, node, rti, i);
+			{
+				if (!transition_tables_valid)
+				{
+					transition_tables = has_transition_tables(root,
+															  nominalRelation,
+															  operation);
+					transition_tables_valid = true;
+				}
+				if (!transition_tables)
+					direct_modify = fdwroutine->PlanDirectModify(root, node,
+																 rti, i);
+			}
 		}
 		if (direct_modify)
 			direct_modify_plans = bms_add_member(direct_modify_plans, i);
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 01804b085b3..8112509e872 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -80,6 +80,18 @@ typedef struct JoinTreeItem
 									 * lateral references */
 } JoinTreeItem;
 
+/*
+ * Compatibility info for one GROUP BY item, precomputed for use by
+ * remove_useless_groupby_columns() when matching unique-index columns against
+ * GROUP BY items.
+ */
+typedef struct GroupByColInfo
+{
+	AttrNumber	attno;			/* var->varattno */
+	List	   *eq_opfamilies;	/* mergejoin opfamilies of sgc->eqop */
+	Oid			coll;			/* var->varcollid */
+} GroupByColInfo;
+
 
 static void extract_lateral_references(PlannerInfo *root, RelOptInfo *brel,
 									   Index rtindex);
@@ -413,6 +425,7 @@ remove_useless_groupby_columns(PlannerInfo *root)
 {
 	Query	   *parse = root->parse;
 	Bitmapset **groupbyattnos;
+	List	  **groupbycols;
 	Bitmapset **surplusvars;
 	bool		tryremove = false;
 	ListCell   *lc;
@@ -429,15 +442,21 @@ remove_useless_groupby_columns(PlannerInfo *root)
 	/*
 	 * Scan the GROUP BY clause to find GROUP BY items that are simple Vars.
 	 * Fill groupbyattnos[k] with a bitmapset of the column attnos of RTE k
-	 * that are GROUP BY items.
+	 * that are GROUP BY items, and groupbycols[k] with a parallel list of
+	 * GroupByColInfo records.  We need the latter so that, when checking a
+	 * unique index against this rel's GROUP BY items, we can verify that the
+	 * index's notion of equality agrees with at least one GROUP BY item per
+	 * index column.
 	 */
 	groupbyattnos = (Bitmapset **) palloc0(sizeof(Bitmapset *) *
 										   (list_length(parse->rtable) + 1));
+	groupbycols = palloc0_array(List *, list_length(parse->rtable) + 1);
 	foreach(lc, root->processed_groupClause)
 	{
 		SortGroupClause *sgc = lfirst_node(SortGroupClause, lc);
 		TargetEntry *tle = get_sortgroupclause_tle(sgc, parse->targetList);
 		Var		   *var = (Var *) tle->expr;
+		GroupByColInfo *info;
 
 		/*
 		 * Ignore non-Vars and Vars from other query levels.
@@ -463,6 +482,12 @@ remove_useless_groupby_columns(PlannerInfo *root)
 		tryremove |= !bms_is_empty(groupbyattnos[relid]);
 		groupbyattnos[relid] = bms_add_member(groupbyattnos[relid],
 											  var->varattno - FirstLowInvalidHeapAttributeNumber);
+
+		info = palloc(sizeof(GroupByColInfo));
+		info->attno = var->varattno;
+		info->eq_opfamilies = get_mergejoin_opfamilies(sgc->eqop);
+		info->coll = var->varcollid;
+		groupbycols[relid] = lappend(groupbycols[relid], info);
 	}
 
 	/*
@@ -517,7 +542,7 @@ remove_useless_groupby_columns(PlannerInfo *root)
 		foreach_node(IndexOptInfo, index, rel->indexlist)
 		{
 			Bitmapset  *ind_attnos;
-			bool		nulls_check_ok;
+			bool		index_check_ok;
 
 			/*
 			 * Skip any non-unique and deferrable indexes.  Predicate indexes
@@ -532,9 +557,14 @@ remove_useless_groupby_columns(PlannerInfo *root)
 				continue;
 
 			ind_attnos = NULL;
-			nulls_check_ok = true;
+			index_check_ok = true;
 			for (int i = 0; i < index->nkeycolumns; i++)
 			{
+				AttrNumber	indkey_attno = index->indexkeys[i];
+				Oid			indkey_opfamily = index->opfamily[i];
+				Oid			indkey_coll = index->indexcollations[i];
+				ListCell   *lc2;
+
 				/*
 				 * We must insist that the index columns are all defined NOT
 				 * NULL otherwise duplicate NULLs could exist.  However, we
@@ -544,20 +574,41 @@ remove_useless_groupby_columns(PlannerInfo *root)
 				 * despite the NULL.
 				 */
 				if (!index->nullsnotdistinct &&
-					!bms_is_member(index->indexkeys[i],
-								   rel->notnullattnums))
+					!bms_is_member(indkey_attno, rel->notnullattnums))
+				{
+					index_check_ok = false;
+					break;
+				}
+
+				/*
+				 * The index proves uniqueness only under its own opfamily and
+				 * collation.  Require some GROUP BY item on this column to
+				 * use a compatible eqop and collation, the same check
+				 * relation_has_unique_index_for() applies to join clauses.
+				 */
+				foreach(lc2, groupbycols[relid])
+				{
+					GroupByColInfo *info = (GroupByColInfo *) lfirst(lc2);
+
+					if (info->attno != indkey_attno)
+						continue;
+					if (list_member_oid(info->eq_opfamilies, indkey_opfamily) &&
+						collations_agree_on_equality(indkey_coll, info->coll))
+						break;
+				}
+				if (lc2 == NULL)
 				{
-					nulls_check_ok = false;
+					index_check_ok = false;
 					break;
 				}
 
 				ind_attnos =
 					bms_add_member(ind_attnos,
-								   index->indexkeys[i] -
+								   indkey_attno -
 								   FirstLowInvalidHeapAttributeNumber);
 			}
 
-			if (!nulls_check_ok)
+			if (!index_check_ok)
 				continue;
 
 			/*
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 549aedcfa99..55fddf804c4 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -58,6 +58,7 @@
 #include "parser/parsetree.h"
 #include "partitioning/partdesc.h"
 #include "rewrite/rewriteManip.h"
+#include "utils/acl.h"
 #include "utils/backend_status.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
@@ -127,9 +128,27 @@ typedef struct
 								 * subquery belonging to a set operation */
 } standard_qp_extra;
 
+/*
+ * Context for the find_having_collation_conflicts walker.
+ *
+ * ancestor_collids is a stack of inputcollids contributed by collation-aware
+ * ancestors of the current node.  Entries are pushed before recursing into a
+ * node's children and popped afterwards, so the stack reflects exactly the
+ * inputcollids on the current root-to-node path.
+ */
+typedef struct
+{
+	Index		group_rtindex;
+	List	   *ancestor_collids;
+} having_collation_ctx;
+
 /* Local functions */
 static Node *preprocess_expression(PlannerInfo *root, Node *expr, int kind);
 static void preprocess_qual_conditions(PlannerInfo *root, Node *jtnode);
+static Bitmapset *find_having_collation_conflicts(Query *parse,
+												  Index group_rtindex);
+static bool having_collation_conflict_walker(Node *node,
+											 having_collation_ctx *ctx);
 static void grouping_planner(PlannerInfo *root, double tuple_fraction,
 							 SetOperationStmt *setops);
 static grouping_sets_data *preprocess_grouping_sets(PlannerInfo *root);
@@ -654,6 +673,8 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 	PlannerInfo *root;
 	List	   *newWithCheckOptions;
 	List	   *newHaving;
+	Bitmapset  *havingCollationConflicts;
+	int			havingIdx;
 	bool		hasOuterJoins;
 	bool		hasResultRTEs;
 	RelOptInfo *final_rel;
@@ -848,6 +869,38 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 				bms_make_singleton(parse->resultRelation);
 	}
 
+	/*
+	 * This would be a convenient time to check access permissions for all
+	 * relations mentioned in the query, since it would be better to fail now,
+	 * before doing any detailed planning.  However, for historical reasons,
+	 * we leave this to be done at executor startup.
+	 *
+	 * Note, however, that we do need to check access permissions for any view
+	 * relations mentioned in the query, in order to prevent information being
+	 * leaked by selectivity estimation functions, which only check view owner
+	 * permissions on underlying tables (see all_rows_selectable() and its
+	 * callers).  This is a little ugly, because it means that access
+	 * permissions for views will be checked twice, which is another reason
+	 * why it would be better to do all the ACL checks here.
+	 */
+	foreach(l, parse->rtable)
+	{
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
+
+		if (rte->perminfoindex != 0 &&
+			rte->relkind == RELKIND_VIEW)
+		{
+			RTEPermissionInfo *perminfo;
+			bool		result;
+
+			perminfo = getRTEPermissionInfo(parse->rteperminfos, rte);
+			result = ExecCheckOneRelPerms(perminfo);
+			if (!result)
+				aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_VIEW,
+							   get_rel_name(perminfo->relid));
+		}
+	}
+
 	/*
 	 * Preprocess RowMark information.  We need to do this after subquery
 	 * pullup, so that all base relations are present.
@@ -1043,6 +1096,27 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 		}
 	}
 
+	/*
+	 * Before we flatten GROUP Vars, check which HAVING clauses have collation
+	 * conflicts.  When GROUP BY uses a nondeterministic collation, values
+	 * that are "equal" for grouping may be distinguishable under a different
+	 * collation.  If such a HAVING clause were moved to WHERE, it would
+	 * filter individual rows before grouping, potentially eliminating some
+	 * members of a group and thereby changing aggregate results.
+	 *
+	 * We do this check before flatten_group_exprs because we can easily
+	 * identify grouping expressions by checking whether a Var references
+	 * RTE_GROUP, and such Vars directly carry the GROUP BY collation as their
+	 * varcollid.  After flattening, these Vars are replaced by the underlying
+	 * expressions, and we would have to match expressions in the HAVING
+	 * clause back to grouping expressions, which is much more complex.
+	 */
+	if (parse->hasGroupRTE)
+		havingCollationConflicts =
+			find_having_collation_conflicts(parse, root->group_rtindex);
+	else
+		havingCollationConflicts = NULL;
+
 	/*
 	 * Replace any Vars in the subquery's targetlist and havingQual that
 	 * reference GROUP outputs with the underlying grouping expressions.
@@ -1064,15 +1138,36 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 	if (parse->hasTargetSRFs)
 		parse->hasTargetSRFs = expression_returns_set((Node *) parse->targetList);
 
+	/*
+	 * If we have grouping sets, expand the groupingSets tree of this query to
+	 * a flat list of grouping sets.  We need to do this before optimizing
+	 * HAVING, since we can't easily tell if there's an empty grouping set
+	 * until we have this representation.
+	 */
+	if (parse->groupingSets)
+	{
+		parse->groupingSets =
+			expand_grouping_sets(parse->groupingSets, parse->groupDistinct, -1);
+	}
+
 	/*
 	 * In some cases we may want to transfer a HAVING clause into WHERE. We
 	 * cannot do so if the HAVING clause contains aggregates (obviously) or
 	 * volatile functions (since a HAVING clause is supposed to be executed
-	 * only once per group).  We also can't do this if there are any nonempty
-	 * grouping sets and the clause references any columns that are nullable
-	 * by the grouping sets; moving such a clause into WHERE would potentially
-	 * change the results.  (If there are only empty grouping sets, then the
-	 * HAVING clause must be degenerate as discussed below.)
+	 * only once per group).  We also can't do this if there are any grouping
+	 * sets and the clause references any columns that are nullable by the
+	 * grouping sets; the nulled values of those columns are not available
+	 * before the grouping step.  (The test on groupClause might seem wrong,
+	 * but it's okay: it's just an optimization to avoid running pull_varnos
+	 * when there cannot be any Vars in the HAVING clause.)
+	 *
+	 * We also cannot do this if the HAVING clause uses a different collation
+	 * than the GROUP BY for any grouping expression whose GROUP BY collation
+	 * is nondeterministic.  This is detected before flatten_group_exprs (see
+	 * find_having_collation_conflicts above) and recorded in the
+	 * havingCollationConflicts bitmapset.  The bitmapset indexes remain valid
+	 * here because flatten_group_exprs uses expression_tree_mutator, which
+	 * preserves the list length and ordering of havingQual.
 	 *
 	 * Also, it may be that the clause is so expensive to execute that we're
 	 * better off doing it only once per group, despite the loss of
@@ -1082,19 +1177,19 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 	 * clause into WHERE, in hopes of eliminating tuples before aggregation
 	 * instead of after.
 	 *
-	 * If the query has explicit grouping then we can simply move such a
+	 * If the query has no empty grouping set then we can simply move such a
 	 * clause into WHERE; any group that fails the clause will not be in the
 	 * output because none of its tuples will reach the grouping or
-	 * aggregation stage.  Otherwise we must have a degenerate (variable-free)
-	 * HAVING clause, which we put in WHERE so that query_planner() can use it
-	 * in a gating Result node, but also keep in HAVING to ensure that we
-	 * don't emit a bogus aggregated row. (This could be done better, but it
-	 * seems not worth optimizing.)
+	 * aggregation stage.  Otherwise we have to keep the clause in HAVING to
+	 * ensure that we don't emit a bogus aggregated row.  But then the HAVING
+	 * clause must be degenerate (variable-free), so we can copy it into WHERE
+	 * so that query_planner() can use it in a gating Result node. (This could
+	 * be done better, but it seems not worth optimizing.)
 	 *
 	 * Note that a HAVING clause may contain expressions that are not fully
 	 * preprocessed.  This can happen if these expressions are part of
 	 * grouping items.  In such cases, they are replaced with GROUP Vars in
-	 * the parser and then replaced back after we've done with expression
+	 * the parser and then replaced back after we're done with expression
 	 * preprocessing on havingQual.  This is not an issue if the clause
 	 * remains in HAVING, because these expressions will be matched to lower
 	 * target items in setrefs.c.  However, if the clause is moved or copied
@@ -1106,6 +1201,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 	 * as Node *.
 	 */
 	newHaving = NIL;
+	havingIdx = 0;
 	foreach(l, (List *) parse->havingQual)
 	{
 		Node	   *havingclause = (Node *) lfirst(l);
@@ -1113,14 +1209,18 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 		if (contain_agg_clause(havingclause) ||
 			contain_volatile_functions(havingclause) ||
 			contain_subplans(havingclause) ||
+			bms_is_member(havingIdx, havingCollationConflicts) ||
 			(parse->groupClause && parse->groupingSets &&
 			 bms_is_member(root->group_rtindex, pull_varnos(root, havingclause))))
 		{
 			/* keep it in HAVING */
 			newHaving = lappend(newHaving, havingclause);
 		}
-		else if (parse->groupClause)
+		else if (parse->groupClause &&
+				 (parse->groupingSets == NIL ||
+				  (List *) linitial(parse->groupingSets) != NIL))
 		{
+			/* There is GROUP BY, but no empty grouping set */
 			Node	   *whereclause;
 
 			/* Preprocess the HAVING clause fully */
@@ -1133,6 +1233,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 		}
 		else
 		{
+			/* There is an empty grouping set (perhaps implicitly) */
 			Node	   *whereclause;
 
 			/* Preprocess the HAVING clause fully */
@@ -1145,6 +1246,8 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root,
 			/* ... and also keep it in HAVING */
 			newHaving = lappend(newHaving, havingclause);
 		}
+
+		havingIdx++;
 	}
 	parse->havingQual = (Node *) newHaving;
 
@@ -1336,6 +1439,195 @@ preprocess_qual_conditions(PlannerInfo *root, Node *jtnode)
 			 (int) nodeTag(jtnode));
 }
 
+/*
+ * find_having_collation_conflicts
+ *	  Identify HAVING clauses that must not be moved to WHERE due to collation
+ *	  mismatches with GROUP BY.
+ *
+ * This must be called before flatten_group_exprs, while the HAVING clause
+ * still contains GROUP Vars (Vars referencing RTE_GROUP).  These GROUP Vars
+ * carry the GROUP BY collation as their varcollid.  A GROUP Var with a
+ * nondeterministic varcollid conflicts whenever some collation-aware ancestor
+ * on its path applies a different inputcollid: that operator would distinguish
+ * values which the GROUP BY considers equal, so the clause is unsafe to push
+ * to WHERE.
+ *
+ * Returns a Bitmapset of zero-based indexes into the havingQual list for
+ * clauses that have collation conflicts and must stay in HAVING.
+ */
+static Bitmapset *
+find_having_collation_conflicts(Query *parse, Index group_rtindex)
+{
+	Bitmapset  *result = NULL;
+	having_collation_ctx ctx;
+	int			idx;
+
+	if (parse->havingQual == NULL)
+		return NULL;
+
+	ctx.group_rtindex = group_rtindex;
+	ctx.ancestor_collids = NIL;
+
+	idx = 0;
+	foreach_ptr(Node, clause, (List *) parse->havingQual)
+	{
+		if (having_collation_conflict_walker(clause, &ctx))
+			result = bms_add_member(result, idx);
+		idx++;
+		Assert(ctx.ancestor_collids == NIL);
+	}
+
+	return result;
+}
+
+/*
+ * Walker function for find_having_collation_conflicts.
+ *
+ * Walk the clause top-down, maintaining a stack of inputcollids contributed
+ * by collation-aware ancestors.  At each GROUP Var with a nondeterministic
+ * varcollid, the clause has a conflict if any ancestor's inputcollid differs
+ * from the GROUP Var's varcollid.  Most collation-aware nodes expose their
+ * inputcollid through exprInputCollation().  Two structural exceptions need
+ * special handling:
+ *
+ * - RowCompareExpr carries one inputcollid per column in inputcollids[], so we
+ *   descend into its (largs[i], rargs[i]) pairs explicitly with the matching
+ *   collation pushed onto the stack.
+ *
+ * - A simple CASE (CaseExpr with a non-NULL arg) holds the arg outside the
+ *   WHEN's OpExpr, even though the WHEN's OpExpr is the place where the
+ *   comparison's inputcollid lives.  Parse analysis builds each WHEN as
+ *   "OpExpr(CaseTestExpr op val)" -- the CaseTestExpr is a placeholder for
+ *   the arg.  Before walking cexpr->arg we therefore push every WHEN's
+ *   inputcollid onto the ancestor stack, so a GROUP Var at the arg is
+ *   checked against the same collations the WHEN comparisons would apply.
+ *   The WHEN bodies and defresult are then walked under the unchanged stack
+ *   so their own collation contexts are picked up by the default path.
+ */
+static bool
+having_collation_conflict_walker(Node *node, having_collation_ctx *ctx)
+{
+	Oid			this_collid;
+	bool		result;
+
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, Var))
+	{
+		Var		   *var = (Var *) node;
+
+		/* We should not see any upper-level Vars here */
+		Assert(var->varlevelsup == 0);
+
+		if (var->varno == ctx->group_rtindex &&
+			OidIsValid(var->varcollid) &&
+			!get_collation_isdeterministic(var->varcollid))
+		{
+			foreach_oid(collid, ctx->ancestor_collids)
+			{
+				if (collid != var->varcollid)
+					return true;
+			}
+		}
+		return false;
+	}
+
+	if (IsA(node, RowCompareExpr))
+	{
+		RowCompareExpr *rcexpr = (RowCompareExpr *) node;
+		ListCell   *lc_l;
+		ListCell   *lc_r;
+		ListCell   *lc_c;
+
+		/*
+		 * Each column of a row comparison is compared under its own
+		 * inputcollids[i].  Walk each (largs[i], rargs[i]) pair with that
+		 * collation pushed, so a Var in column i is checked against the
+		 * collation that actually applies to it.
+		 */
+		forthree(lc_l, rcexpr->largs,
+				 lc_r, rcexpr->rargs,
+				 lc_c, rcexpr->inputcollids)
+		{
+			Oid			collid = lfirst_oid(lc_c);
+			bool		found;
+
+			if (OidIsValid(collid))
+				ctx->ancestor_collids = lappend_oid(ctx->ancestor_collids,
+													collid);
+
+			found = having_collation_conflict_walker((Node *) lfirst(lc_l),
+													 ctx) ||
+				having_collation_conflict_walker((Node *) lfirst(lc_r),
+												 ctx);
+
+			if (OidIsValid(collid))
+				ctx->ancestor_collids =
+					list_delete_last(ctx->ancestor_collids);
+
+			if (found)
+				return true;
+		}
+		return false;
+	}
+
+	if (IsA(node, CaseExpr) && ((CaseExpr *) node)->arg != NULL)
+	{
+		CaseExpr   *cexpr = (CaseExpr *) node;
+		int			saved_len = list_length(ctx->ancestor_collids);
+		bool		found;
+
+		/*
+		 * Push every WHEN's inputcollid before walking cexpr->arg, since each
+		 * WHEN implicitly compares the arg under that inputcollid.
+		 */
+		foreach_node(CaseWhen, cw, cexpr->args)
+		{
+			Oid			collid = exprInputCollation((Node *) cw->expr);
+
+			if (OidIsValid(collid))
+				ctx->ancestor_collids = lappend_oid(ctx->ancestor_collids,
+													collid);
+		}
+
+		found = having_collation_conflict_walker((Node *) cexpr->arg, ctx);
+
+		ctx->ancestor_collids = list_truncate(ctx->ancestor_collids,
+											  saved_len);
+
+		if (found)
+			return true;
+
+		/*
+		 * Walk the WHEN bodies and defresult under the unchanged ancestor
+		 * stack; any inputcollids inside them are picked up by the default
+		 * path.
+		 */
+		foreach_node(CaseWhen, cw, cexpr->args)
+		{
+			if (having_collation_conflict_walker((Node *) cw->expr, ctx) ||
+				having_collation_conflict_walker((Node *) cw->result, ctx))
+				return true;
+		}
+		return having_collation_conflict_walker((Node *) cexpr->defresult,
+												ctx);
+	}
+
+	this_collid = exprInputCollation(node);
+	if (OidIsValid(this_collid))
+		ctx->ancestor_collids = lappend_oid(ctx->ancestor_collids,
+											this_collid);
+
+	result = expression_tree_walker(node, having_collation_conflict_walker,
+									ctx);
+
+	if (OidIsValid(this_collid))
+		ctx->ancestor_collids = list_delete_last(ctx->ancestor_collids);
+
+	return result;
+}
+
 /*
  * preprocess_phv_expression
  *	  Do preprocessing on a PlaceHolderVar expression that's been pulled up.
@@ -1694,9 +1986,10 @@ grouping_planner(PlannerInfo *root, double tuple_fraction,
 			sort_input_target = linitial_node(PathTarget, sort_input_targets);
 			Assert(!linitial_int(sort_input_targets_contain_srfs));
 			/* likewise for grouping_target vs. scanjoin_target */
-			split_pathtarget_at_srfs(root, grouping_target, scanjoin_target,
-									 &grouping_targets,
-									 &grouping_targets_contain_srfs);
+			split_pathtarget_at_srfs_grouping(root,
+											  grouping_target, scanjoin_target,
+											  &grouping_targets,
+											  &grouping_targets_contain_srfs);
 			grouping_target = linitial_node(PathTarget, grouping_targets);
 			Assert(!linitial_int(grouping_targets_contain_srfs));
 			/* scanjoin_target will not have any SRFs precomputed for it */
@@ -2119,10 +2412,13 @@ grouping_planner(PlannerInfo *root, double tuple_fraction,
 }
 
 /*
- * Do preprocessing for groupingSets clause and related data.  This handles the
- * preliminary steps of expanding the grouping sets, organizing them into lists
- * of rollups, and preparing annotations which will later be filled in with
- * size estimates.
+ * Do preprocessing for groupingSets clause and related data.
+ *
+ * We expect that parse->groupingSets has already been expanded into a flat
+ * list of grouping sets (that is, just integer Lists of ressortgroupref
+ * numbers) by expand_grouping_sets().  This function handles the preliminary
+ * steps of organizing the grouping sets into lists of rollups, and preparing
+ * annotations which will later be filled in with size estimates.
  */
 static grouping_sets_data *
 preprocess_grouping_sets(PlannerInfo *root)
@@ -2133,19 +2429,18 @@ preprocess_grouping_sets(PlannerInfo *root)
 	ListCell   *lc_set;
 	grouping_sets_data *gd = palloc0(sizeof(grouping_sets_data));
 
-	parse->groupingSets = expand_grouping_sets(parse->groupingSets, parse->groupDistinct, -1);
-
-	gd->any_hashable = false;
-	gd->unhashable_refs = NULL;
-	gd->unsortable_refs = NULL;
-	gd->unsortable_sets = NIL;
-
 	/*
 	 * We don't currently make any attempt to optimize the groupClause when
 	 * there are grouping sets, so just duplicate it in processed_groupClause.
 	 */
 	root->processed_groupClause = parse->groupClause;
 
+	/* Detect unhashable and unsortable grouping expressions */
+	gd->any_hashable = false;
+	gd->unhashable_refs = NULL;
+	gd->unsortable_refs = NULL;
+	gd->unsortable_sets = NIL;
+
 	if (parse->groupClause)
 	{
 		ListCell   *lc;
@@ -5891,6 +6186,41 @@ optimize_window_clauses(PlannerInfo *root, WindowFuncLists *wflists)
 			}
 		}
 	}
+
+	/*
+	 * XXX remove any duplicate WindowFuncs from each WindowClause.  This has
+	 * been done only in the back branches.  Previously, the deduplication was
+	 * done in find_window_functions(), but that caused issues with the code
+	 * above when moving a WindowFunc to another WindowClause as any duplicate
+	 * WindowFuncs won't receive the adjusted winref when merging
+	 * WindowClauses.  The deduplication below has been done only so that we
+	 * maintain the same cost calculations.  As it turns out, the previous
+	 * deduplication code thought it was saving effort during execution by
+	 * getting rid of duplicates, but that was not true as the expression
+	 * evaluation code will evaluate each WindowFunc mentioned in the
+	 * targetlist.
+	 */
+	foreach(lc, windowClause)
+	{
+		WindowClause *wc = lfirst_node(WindowClause, lc);
+		ListCell   *lc2;
+		List	   *list = wflists->windowFuncs[wc->winref];
+		List	   *newlist = NIL;
+
+		if (list == NIL)
+			continue;
+
+		foreach(lc2, list)
+		{
+			if (!list_member(newlist, lfirst(lc2)))
+				newlist = lappend(newlist, lfirst(lc2));
+			else
+				wflists->numWindowFuncs--;
+		}
+		list_free(list);
+
+		wflists->windowFuncs[wc->winref] = newlist;
+	}
 }
 
 /*
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 5ce1a5d8900..a153abc82fc 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -312,6 +312,10 @@ set_plan_references(PlannerInfo *root, Plan *plan)
 		PlanRowMark *rc = lfirst_node(PlanRowMark, lc);
 		PlanRowMark *newrc;
 
+		/* sanity check on existing row marks */
+		Assert(root->simple_rel_array[rc->rti] != NULL &&
+			   root->simple_rte_array[rc->rti] != NULL);
+
 		/* flat copy is enough since all fields are scalars */
 		newrc = (PlanRowMark *) palloc(sizeof(PlanRowMark));
 		memcpy(newrc, rc, sizeof(PlanRowMark));
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index e7cb3fede66..0e567890c72 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -1618,8 +1618,6 @@ convert_EXISTS_sublink_to_join(PlannerInfo *root, SubLink *sublink,
 static bool
 simplify_EXISTS_query(PlannerInfo *root, Query *query)
 {
-	ListCell   *lc;
-
 	/*
 	 * We don't try to simplify at all if the query uses set operations,
 	 * aggregates, grouping sets, SRFs, modifying CTEs, HAVING, OFFSET, or FOR
@@ -1689,25 +1687,27 @@ simplify_EXISTS_query(PlannerInfo *root, Query *query)
 	query->hasDistinctOn = false;
 
 	/*
-	 * Since we have thrown away the GROUP BY clauses, we'd better remove the
-	 * RTE_GROUP RTE and clear the hasGroupRTE flag.
+	 * Since we have thrown away the GROUP BY clauses, we'd better get rid of
+	 * the RTE_GROUP RTE and clear the hasGroupRTE flag.  To safely get rid of
+	 * the RTE_GROUP RTE without shifting the index of any subsequent RTE in
+	 * the rtable, we convert the RTE to be RTE_RESULT type in-place, and zero
+	 * out RTE_GROUP-specific fields.
 	 */
-	foreach(lc, query->rtable)
+	if (query->hasGroupRTE)
 	{
-		RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);
-
-		/*
-		 * Remove the RTE_GROUP RTE and clear the hasGroupRTE flag.  (Since
-		 * we'll exit the foreach loop immediately, we don't bother with
-		 * foreach_delete_current.)
-		 */
-		if (rte->rtekind == RTE_GROUP)
+		foreach_node(RangeTblEntry, rte, query->rtable)
 		{
-			Assert(query->hasGroupRTE);
-			query->rtable = list_delete_cell(query->rtable, lc);
-			query->hasGroupRTE = false;
-			break;
+			if (rte->rtekind == RTE_GROUP)
+			{
+				rte->rtekind = RTE_RESULT;
+				rte->groupexprs = NIL;
+
+				/* A query should only have one RTE_GROUP, so we can stop. */
+				break;
+			}
 		}
+
+		query->hasGroupRTE = false;
 	}
 
 	return true;
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index 87dc6f56b57..7bf4e55c7a1 100644
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -994,6 +994,7 @@ expand_virtual_generated_columns(PlannerInfo *root)
 		{
 			List	   *tlist = NIL;
 			pullup_replace_vars_context rvcontext;
+			List	   *save_exclRelTlist = NIL;
 
 			for (int i = 0; i < tupdesc->natts; i++)
 			{
@@ -1061,8 +1062,26 @@ expand_virtual_generated_columns(PlannerInfo *root)
 
 			/*
 			 * Apply pullup variable replacement throughout the query tree.
+			 *
+			 * We intentionally do not touch the EXCLUDED pseudo-relation's
+			 * targetlist here.  Various places in the planner assume that it
+			 * contains only Vars, and we want that to remain the case.  More
+			 * importantly, we don't want setrefs.c to turn any expanded
+			 * EXCLUDED.virtual_column expressions in other parts of the query
+			 * back into Vars referencing the original virtual column, which
+			 * set_plan_refs() would do if exclRelTlist contained matching
+			 * expressions.
 			 */
+			if (parse->onConflict)
+			{
+				save_exclRelTlist = parse->onConflict->exclRelTlist;
+				parse->onConflict->exclRelTlist = NIL;
+			}
+
 			parse = (Query *) pullup_replace_vars((Node *) parse, &rvcontext);
+
+			if (parse->onConflict)
+				parse->onConflict->exclRelTlist = save_exclRelTlist;
 		}
 
 		table_close(rel, NoLock);
diff --git a/src/backend/optimizer/util/appendinfo.c b/src/backend/optimizer/util/appendinfo.c
index 5447c1367ec..51613585eb7 100644
--- a/src/backend/optimizer/util/appendinfo.c
+++ b/src/backend/optimizer/util/appendinfo.c
@@ -237,8 +237,9 @@ adjust_appendrel_attrs_mutator(Node *node,
 		 * You might think we need to adjust var->varnullingrels, but that
 		 * shouldn't need any changes.  It will contain outer-join relids,
 		 * while the transformation we are making affects only baserels.
-		 * Below, we just propagate var->varnullingrels into the translated
-		 * Var.
+		 * Below, we just merge var->varnullingrels into the translated Var.
+		 * (We must merge not just copy: the child Var could have some
+		 * nullingrel bits set already, and we mustn't drop those.)
 		 *
 		 * If var->varnullingrels isn't empty, and the translation wouldn't be
 		 * a Var, we have to fail.  One could imagine wrapping the translated
@@ -291,8 +292,11 @@ adjust_appendrel_attrs_mutator(Node *node,
 						 var->varattno, get_rel_name(appinfo->parent_reloid));
 				if (IsA(newnode, Var))
 				{
-					((Var *) newnode)->varreturningtype = var->varreturningtype;
-					((Var *) newnode)->varnullingrels = var->varnullingrels;
+					Var		   *newvar = (Var *) newnode;
+
+					newvar->varreturningtype = var->varreturningtype;
+					newvar->varnullingrels = bms_add_members(newvar->varnullingrels,
+															 var->varnullingrels);
 				}
 				else
 				{
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 64ec8b9963d..db1b9f3472c 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -256,13 +256,10 @@ find_window_functions_walker(Node *node, WindowFuncLists *lists)
 		if (wfunc->winref > lists->maxWinRef)
 			elog(ERROR, "WindowFunc contains out-of-range winref %u",
 				 wfunc->winref);
-		/* eliminate duplicates, so that we avoid repeated computation */
-		if (!list_member(lists->windowFuncs[wfunc->winref], wfunc))
-		{
-			lists->windowFuncs[wfunc->winref] =
-				lappend(lists->windowFuncs[wfunc->winref], wfunc);
-			lists->numWindowFuncs++;
-		}
+
+		lists->windowFuncs[wfunc->winref] =
+			lappend(lists->windowFuncs[wfunc->winref], wfunc);
+		lists->numWindowFuncs++;
 
 		/*
 		 * We assume that the parser checked that there are no window
@@ -1135,6 +1132,8 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 		return true;
 	if (IsA(node, BooleanTest))
 		return true;
+	if (IsA(node, JsonConstructorExpr))
+		return true;
 
 	/* Check other function-containing nodes */
 	if (check_functions_in_node(node, contain_nonstrict_functions_checker,
@@ -2615,22 +2614,28 @@ eval_const_expressions_mutator(Node *node,
 				 * length coercion; we want to preserve the typmod in the
 				 * eventual Const if so.
 				 */
-					if (FUNC_EXPR_FROM_PG_PROC(expr->function_from))
-					{
-						if (expr->ref_pkgtype)
-							set_pkgtype_from_funcexpr(expr);
 
-						simple = simplify_function(expr->funcid,
-										   expr->funcresulttype,
-										   exprTypmod(node),
-										   expr->funccollid,
-										   expr->inputcollid,
-										   &args,
-										   expr->funcvariadic,
-										   true,
-										   true,
-										   context);
-					}
+				/*
+				 * Only fold functions that originate from pg_proc.
+				 * Package/subprocedure invocations are engine-specific and
+				 * are not simplified here.
+				 */
+				if (FUNC_EXPR_FROM_PG_PROC(expr->function_from))
+				{
+					if (expr->ref_pkgtype)
+						set_pkgtype_from_funcexpr(expr);
+
+					simple = simplify_function(expr->funcid,
+											   expr->funcresulttype,
+											   exprTypmod(node),
+											   expr->funccollid,
+											   expr->inputcollid,
+											   &args,
+											   expr->funcvariadic,
+											   true,
+											   true,
+											   context);
+				}
 				if (simple)		/* successfully simplified it */
 					return (Node *) simple;
 
@@ -3236,9 +3241,9 @@ eval_const_expressions_mutator(Node *node,
 																  context);
 
 						/*
-						 * If the test condition is constant FALSE (or NULL), then
-						 * drop this WHEN clause completely, without processing
-						 * the result.
+						 * If the test condition is constant FALSE (or NULL),
+						 * then drop this WHEN clause completely, without
+						 * processing the result.
 						 */
 						if (casecond && IsA(casecond, Const))
 						{
@@ -3246,7 +3251,8 @@ eval_const_expressions_mutator(Node *node,
 
 							if (const_input->constisnull ||
 								!DatumGetBool(const_input->constvalue))
-								continue;	/* drop alternative with FALSE cond */
+								continue;	/* drop alternative with FALSE
+											 * cond */
 							/* Else it's constant TRUE */
 							const_true_cond = true;
 						}
@@ -3254,12 +3260,12 @@ eval_const_expressions_mutator(Node *node,
 					else
 					{
 						orig_casecond = eval_const_expressions_mutator((Node *) oldcasewhen->orig_expr,
-																  context);
+																	   context);
 
 						/*
-						 * If the test condition is constant FALSE (or NULL), then
-						 * drop this WHEN clause completely, without processing
-						 * the result.
+						 * If the test condition is constant FALSE (or NULL),
+						 * then drop this WHEN clause completely, without
+						 * processing the result.
 						 */
 						if (orig_casecond && IsA(orig_casecond, Const))
 						{
@@ -3269,7 +3275,8 @@ eval_const_expressions_mutator(Node *node,
 							{
 								if (orig_const_input->constisnull ||
 									!DatumGetBool(orig_const_input->constvalue))
-									continue;	/* drop alternative with FALSE cond */
+									continue;	/* drop alternative with FALSE
+												 * cond */
 							}
 							else
 							{
@@ -3279,7 +3286,7 @@ eval_const_expressions_mutator(Node *node,
 										continue;
 									else if (IsA(caseexpr->arg, CoerceViaIO))
 									{
-										Node *n = (Node *)((CoerceViaIO *) caseexpr->arg)->arg;
+										Node	   *n = (Node *) ((CoerceViaIO *) caseexpr->arg)->arg;
 
 										if (IsA(n, Const) && ((Const *) n)->constisnull)
 											continue;
@@ -3303,7 +3310,7 @@ eval_const_expressions_mutator(Node *node,
 									}
 									else if (IsA(caseexpr->arg, CoerceViaIO))
 									{
-										Node *n = (Node *)((CoerceViaIO *) caseexpr->arg)->arg;
+										Node	   *n = (Node *) ((CoerceViaIO *) caseexpr->arg)->arg;
 
 										if (IsA(n, Const))
 										{
@@ -3323,13 +3330,15 @@ eval_const_expressions_mutator(Node *node,
 								}
 								else
 								{
-eval_whenexpr1:
+							eval_whenexpr1:
 									casecond = eval_const_expressions_mutator((Node *) oldcasewhen->expr,
-																  context);
+																			  context);
+
 									/*
-									 * If the test condition is constant FALSE (or NULL), then
-									 * drop this WHEN clause completely, without processing
-									 * the result.
+									 * If the test condition is constant FALSE
+									 * (or NULL), then drop this WHEN clause
+									 * completely, without processing the
+									 * result.
 									 */
 									if (casecond && IsA(casecond, Const))
 									{
@@ -3339,7 +3348,8 @@ eval_const_expressions_mutator(Node *node,
 										{
 											if (const_input->constisnull ||
 												!DatumGetBool(const_input->constvalue))
-												continue;	/* drop alternative with FALSE cond */
+												continue;	/* drop alternative with
+															 * FALSE cond */
 											/* Else it's constant TRUE */
 											const_true_cond = true;
 										}
@@ -3353,22 +3363,25 @@ eval_const_expressions_mutator(Node *node,
 								continue;
 							else if (IsA(caseexpr->arg, CoerceViaIO))
 							{
-								/*Node *n = (Node *)((CoerceViaIO *) caseexpr->arg)->arg;
-
-								if (IsA(n, Const) && ((Const *) n)->constisnull)
-									continue;
-								else*/
-									goto eval_whenexpr2;
+								/*
+								 * Node *n = (Node *)((CoerceViaIO *)
+								 * caseexpr->arg)->arg;
+								 *
+								 * if (IsA(n, Const) && ((Const *)
+								 * n)->constisnull) continue; else
+								 */
+								goto eval_whenexpr2;
 							}
 							else
 							{
-eval_whenexpr2:
+						eval_whenexpr2:
 								casecond = eval_const_expressions_mutator((Node *) oldcasewhen->expr,
-																			context);
+																		  context);
+
 								/*
-								 * If the test condition is constant FALSE (or NULL), then
-								 * drop this WHEN clause completely, without processing
-								 * the result.
+								 * If the test condition is constant FALSE (or
+								 * NULL), then drop this WHEN clause
+								 * completely, without processing the result.
 								 */
 								if (casecond && IsA(casecond, Const))
 								{
@@ -3376,7 +3389,8 @@ eval_const_expressions_mutator(Node *node,
 
 									if (const_input->constisnull ||
 										!DatumGetBool(const_input->constvalue))
-										continue;	/* drop alternative with FALSE cond */
+										continue;	/* drop alternative with
+													 * FALSE cond */
 									/* Else it's constant TRUE */
 									const_true_cond = true;
 								}
@@ -4414,8 +4428,8 @@ expand_function_arguments(List *args, bool include_out_arguments,
 	/* argtype maybe from a package */
 	if (ORA_PARSER == compatible_db)
 	{
-		Size size_len = sizeof(Oid) * pronargs;
-		Oid *rel_proargtypes = palloc0(size_len);
+		Size		size_len = sizeof(Oid) * pronargs;
+		Oid		   *rel_proargtypes = palloc0(size_len);
 
 		memcpy(rel_proargtypes, proargtypes, size_len);
 		repl_func_real_argtype(func_tuple, rel_proargtypes, pronargs);
@@ -4663,7 +4677,7 @@ evaluate_function(Oid funcid, Oid result_type, int32 result_typmod,
 	 * null constant with no remaining indication of which concrete record
 	 * type it is.  For now, seems best to leave the function call unreduced.
 	 */
-	if (get_func_real_rettype(func_tuple) == RECORDOID) 
+	if (get_func_real_rettype(func_tuple) == RECORDOID)
 		return NULL;
 
 	/*
@@ -4800,7 +4814,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid,
 		funcform->prokind != PROKIND_FUNCTION ||
 		funcform->prosecdef ||
 		funcform->proretset ||
-		get_func_real_rettype(func_tuple) == RECORDOID || 
+		get_func_real_rettype(func_tuple) == RECORDOID ||
 		!heap_attisnull(func_tuple, Anum_pg_proc_proconfig, NULL) ||
 		funcform->pronargs != list_length(args))
 		return NULL;
@@ -5384,7 +5398,7 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte)
 		funcform->prokind != PROKIND_FUNCTION ||
 		funcform->proisstrict ||
 		funcform->provolatile == PROVOLATILE_VOLATILE ||
-		get_func_real_rettype(func_tuple) == VOIDOID || 
+		get_func_real_rettype(func_tuple) == VOIDOID ||
 		funcform->prosecdef ||
 		!funcform->proretset ||
 		list_length(fexpr->args) != funcform->pronargs ||
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c
index 17e51cd75d7..246749309c4 100644
--- a/src/backend/optimizer/util/inherit.c
+++ b/src/backend/optimizer/util/inherit.c
@@ -322,7 +322,6 @@ expand_partitioned_rtentry(PlannerInfo *root, RelOptInfo *relinfo,
 						   PlanRowMark *top_parentrc, LOCKMODE lockmode)
 {
 	PartitionDesc partdesc;
-	Bitmapset  *live_parts;
 	int			num_live_parts;
 	int			i;
 
@@ -356,10 +355,10 @@ expand_partitioned_rtentry(PlannerInfo *root, RelOptInfo *relinfo,
 	 * that survive pruning.  Below, we will initialize child objects for the
 	 * surviving partitions.
 	 */
-	relinfo->live_parts = live_parts = prune_append_rel_partitions(relinfo);
+	relinfo->live_parts = prune_append_rel_partitions(relinfo);
 
 	/* Expand simple_rel_array and friends to hold child objects. */
-	num_live_parts = bms_num_members(live_parts);
+	num_live_parts = bms_num_members(relinfo->live_parts);
 	if (num_live_parts > 0)
 		expand_planner_arrays(root, num_live_parts);
 
@@ -378,7 +377,7 @@ expand_partitioned_rtentry(PlannerInfo *root, RelOptInfo *relinfo,
 	 * table itself, because it's not going to be scanned.
 	 */
 	i = -1;
-	while ((i = bms_next_member(live_parts, i)) >= 0)
+	while ((i = bms_next_member(relinfo->live_parts, i)) >= 0)
 	{
 		Oid			childOID = partdesc->oids[i];
 		Relation	childrel;
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index e0192d4a491..e8d8a537061 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -19,6 +19,7 @@
 #include "foreign/fdwapi.h"
 #include "miscadmin.h"
 #include "nodes/extensible.h"
+#include "nodes/makefuncs.h"
 #include "optimizer/appendinfo.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
@@ -27,7 +28,9 @@
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
+#include "parser/parse_clause.h"
 #include "parser/parsetree.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/selfuncs.h"
 
@@ -1727,6 +1730,8 @@ UniquePath *
 create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 				   SpecialJoinInfo *sjinfo)
 {
+	List	   *uniq_exprs;
+	List	   *in_operators;
 	UniquePath *pathnode;
 	Path		sort_path;		/* dummy for result of cost_sort */
 	Path		agg_path;		/* dummy for result of cost_agg */
@@ -1748,6 +1753,15 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 	if (!(sjinfo->semi_can_btree || sjinfo->semi_can_hash))
 		return NULL;
 
+	/*
+	 * Punt if this is a child relation and we failed to build a unique-ified
+	 * path for its parent.  This can happen if all the RHS columns were found
+	 * to be equated to constants when unique-ifying the parent table, leaving
+	 * no columns to unique-ify.
+	 */
+	if (IS_OTHER_REL(rel) && rel->top_parent->cheapest_unique_path == NULL)
+		return NULL;
+
 	/*
 	 * When called during GEQO join planning, we are in a short-lived memory
 	 * context.  We must make sure that the path and any subsidiary data
@@ -1760,6 +1774,134 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 	 */
 	oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(rel));
 
+	/*
+	 * First, identify the columns/expressions to be made unique along with
+	 * the associated equality operators.  We made lists of these when the
+	 * SpecialJoinInfo was created, but that was before constructing
+	 * EquivalenceClasses.  Some of the values to be unique-ified may now be
+	 * known redundant by the EquivalenceClass machinery (e.g., because they
+	 * have been equated to constants).  There is no need to compare such
+	 * values during unique-ification, and indeed we had better not try
+	 * because the Vars involved may not have propagated as high as the
+	 * semijoin's level.  We use make_pathkeys_for_sortclauses to detect such
+	 * cases, which is a tad inefficient but it doesn't seem worth building
+	 * specialized infrastructure for this.
+	 *
+	 * For a child rel, we can construct these lists from those of its parent.
+	 */
+	if (IS_OTHER_REL(rel))
+	{
+		UniquePath *parent_path = (UniquePath *) rel->top_parent->cheapest_unique_path;
+
+		Assert(parent_path && IsA(parent_path, UniquePath));
+		uniq_exprs = (List *)
+			adjust_appendrel_attrs_multilevel(root,
+											  (Node *) parent_path->uniq_exprs,
+											  rel,
+											  rel->top_parent);
+		in_operators = copyObject(parent_path->in_operators);
+	}
+	else
+	{
+		List	   *newtlist;
+		List	   *sortList;
+		ListCell   *lc1;
+		ListCell   *lc2;
+
+		uniq_exprs = in_operators = newtlist = sortList = NIL;
+		forboth(lc1, sjinfo->semi_rhs_exprs, lc2, sjinfo->semi_operators)
+		{
+			Expr	   *uniqexpr = lfirst(lc1);
+			Oid			in_oper = lfirst_oid(lc2);
+			Oid			sortop;
+
+			/*
+			 * Try to build an ORDER BY list to sort the input compatibly.  We
+			 * do this for each sortable clause even when the clauses are not
+			 * all sortable, so that we can detect clauses that are redundant
+			 * according to the pathkey machinery.
+			 */
+			sortop = get_ordering_op_for_equality_op(in_oper, false);
+			if (OidIsValid(sortop))
+			{
+				Oid			eqop;
+				TargetEntry *tle;
+				SortGroupClause *sortcl;
+				List	   *sortPathkeys;
+
+				/*
+				 * The Unique node will need equality operators.  Normally
+				 * these are the same as the IN clause operators, but if those
+				 * are cross-type operators then the equality operators are
+				 * the ones for the IN clause operators' RHS datatype.
+				 */
+				eqop = get_equality_op_for_ordering_op(sortop, NULL);
+				if (!OidIsValid(eqop))	/* shouldn't happen */
+					elog(ERROR, "could not find equality operator for ordering operator %u",
+						 sortop);
+
+				tle = makeTargetEntry((Expr *) uniqexpr,
+									  list_length(newtlist) + 1,
+									  NULL,
+									  false);
+				newtlist = lappend(newtlist, tle);
+
+				sortcl = makeNode(SortGroupClause);
+				sortcl->tleSortGroupRef = assignSortGroupRef(tle, newtlist);
+				sortcl->eqop = eqop;
+				sortcl->sortop = sortop;
+				sortcl->reverse_sort = false;
+				sortcl->nulls_first = false;
+				sortcl->hashable = false;	/* no need to make this accurate */
+				sortList = lappend(sortList, sortcl);
+
+				/*
+				 * At each step, convert the SortGroupClause list to pathkey
+				 * form. If the just-added SortGroupClause is redundant, the
+				 * result will be shorter than the SortGroupClause list.
+				 */
+				sortPathkeys = make_pathkeys_for_sortclauses(root, sortList,
+															 newtlist);
+				if (list_length(sortPathkeys) != list_length(sortList))
+				{
+					/* Drop the redundant SortGroupClause */
+					sortList = list_delete_last(sortList);
+					Assert(list_length(sortPathkeys) == list_length(sortList));
+					/* Undo tlist addition too */
+					newtlist = list_delete_last(newtlist);
+					/* Don't need this column */
+					continue;
+				}
+			}
+			else if (sjinfo->semi_can_btree)	/* shouldn't happen */
+				elog(ERROR, "could not find ordering operator for equality operator %u",
+					 in_oper);
+
+			/*
+			 * We need to include this column in the output list.
+			 *
+			 * Under GEQO and when planning child joins, the sjinfo might be
+			 * short-lived, so we'd better make copies of data structures we
+			 * extract from it.
+			 */
+			uniq_exprs = lappend(uniq_exprs, copyObject(uniqexpr));
+			in_operators = lappend_oid(in_operators, in_oper);
+		}
+
+		/*
+		 * It can happen that all the RHS columns are equated to constants.
+		 * We'd have to do something special to unique-ify in that case, and
+		 * it's such an unlikely-in-the-real-world case that it's not worth
+		 * the effort.  So just punt if we found no columns to unique-ify.
+		 */
+		if (uniq_exprs == NIL)
+		{
+			MemoryContextSwitchTo(oldcontext);
+			return NULL;
+		}
+	}
+
+	/* OK, build the path node */
 	pathnode = makeNode(UniquePath);
 
 	pathnode->path.pathtype = T_Unique;
@@ -1778,14 +1920,8 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 	pathnode->path.pathkeys = NIL;
 
 	pathnode->subpath = subpath;
-
-	/*
-	 * Under GEQO and when planning child joins, the sjinfo might be
-	 * short-lived, so we'd better make copies of data structures we extract
-	 * from it.
-	 */
-	pathnode->in_operators = copyObject(sjinfo->semi_operators);
-	pathnode->uniq_exprs = copyObject(sjinfo->semi_rhs_exprs);
+	pathnode->in_operators = in_operators;
+	pathnode->uniq_exprs = uniq_exprs;
 
 	/*
 	 * If the input is a relation and it has a unique index that proves the
@@ -1795,8 +1931,8 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 	 */
 	if (rel->rtekind == RTE_RELATION && sjinfo->semi_can_btree &&
 		relation_has_unique_index_for(root, rel, NIL,
-									  sjinfo->semi_rhs_exprs,
-									  sjinfo->semi_operators))
+									  uniq_exprs,
+									  in_operators))
 	{
 		pathnode->umethod = UNIQUE_PATH_NOOP;
 		pathnode->path.rows = rel->rows;
@@ -1829,13 +1965,13 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 		{
 			List	   *sub_tlist_colnos;
 
-			sub_tlist_colnos = translate_sub_tlist(sjinfo->semi_rhs_exprs,
+			sub_tlist_colnos = translate_sub_tlist(uniq_exprs,
 												   rel->relid);
 
 			if (sub_tlist_colnos &&
 				query_is_distinct_for(rte->subquery,
 									  sub_tlist_colnos,
-									  sjinfo->semi_operators))
+									  in_operators))
 			{
 				pathnode->umethod = UNIQUE_PATH_NOOP;
 				pathnode->path.rows = rel->rows;
@@ -1855,11 +1991,11 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 
 	/* Estimate number of output rows */
 	pathnode->path.rows = estimate_num_groups(root,
-											  sjinfo->semi_rhs_exprs,
+											  uniq_exprs,
 											  rel->rows,
 											  NULL,
 											  NULL);
-	numCols = list_length(sjinfo->semi_rhs_exprs);
+	numCols = list_length(uniq_exprs);
 
 	if (sjinfo->semi_can_btree)
 	{
diff --git a/src/backend/optimizer/util/placeholder.c b/src/backend/optimizer/util/placeholder.c
index e1cd00a72fb..86e3c1e751f 100644
--- a/src/backend/optimizer/util/placeholder.c
+++ b/src/backend/optimizer/util/placeholder.c
@@ -35,6 +35,8 @@ static void find_placeholders_recurse(PlannerInfo *root, Node *jtnode);
 static void find_placeholders_in_expr(PlannerInfo *root, Node *expr);
 static bool contain_placeholder_references_walker(Node *node,
 												  contain_placeholder_references_context *context);
+static bool contain_noop_phv_walker(Node *node, void *context);
+static Node *strip_noop_phvs_mutator(Node *node, void *context);
 
 
 /*
@@ -585,3 +587,92 @@ get_placeholder_nulling_relids(PlannerInfo *root, PlaceHolderInfo *phinfo)
 	result = bms_del_members(result, phinfo->ph_eval_at);
 	return result;
 }
+
+/*
+ * strip_noop_phvs
+ *	  Strip no-op PlaceHolderVar nodes from the given expression tree.
+ *
+ * A PlaceHolderVar that is not marked as nullable (i.e., its phnullingrels
+ * is empty) is effectively a no-op when it appears in a relation-scan-level
+ * expression.  This function strips such PlaceHolderVars, which is useful
+ * for matching expressions to index keys or partition keys in cases where
+ * the expression has been wrapped in PlaceHolderVars during subquery pullup.
+ *
+ * IMPORTANT: the caller must ensure that the expression is a scan-level
+ * expression, so that non-nullable PlaceHolderVars in it are indeed no-ops.
+ *
+ * The removal is performed recursively because PlaceHolderVars can be nested
+ * or interleaved with other node types.  We must peel back all layers to
+ * expose the base expression.
+ *
+ * As a performance optimization, we first use a lightweight walker to check
+ * for the presence of strippable PlaceHolderVars.  The expensive mutator is
+ * invoked only if a candidate is found, avoiding unnecessary memory allocation
+ * and tree copying in the common case where no PlaceHolderVars are present.
+ */
+Node *
+strip_noop_phvs(Node *node)
+{
+	/* Don't mutate/copy if no target PHVs exist */
+	if (!contain_noop_phv_walker(node, NULL))
+		return node;
+
+	return strip_noop_phvs_mutator(node, NULL);
+}
+
+/*
+ * contain_noop_phv_walker
+ *	  Detect if there are any PlaceHolderVars in the tree that are candidates
+ *	  for stripping.
+ *
+ * We identify a PlaceHolderVar as strippable only if its phnullingrels is
+ * empty.
+ */
+static bool
+contain_noop_phv_walker(Node *node, void *context)
+{
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, PlaceHolderVar))
+	{
+		PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+		if (bms_is_empty(phv->phnullingrels))
+			return true;
+	}
+
+	return expression_tree_walker(node, contain_noop_phv_walker,
+								  context);
+}
+
+/*
+ * strip_noop_phvs_mutator
+ *	  Recursively remove PlaceHolderVars that are not marked nullable.
+ *
+ * We strip a PlaceHolderVar only if its phnullingrels is empty, replacing it
+ * with its contained expression.
+ */
+static Node *
+strip_noop_phvs_mutator(Node *node, void *context)
+{
+	if (node == NULL)
+		return NULL;
+
+	if (IsA(node, PlaceHolderVar))
+	{
+		PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+		if (bms_is_empty(phv->phnullingrels))
+		{
+			/* Recurse on its contained expression */
+			return strip_noop_phvs_mutator((Node *) phv->phexpr,
+										   context);
+		}
+
+		/* Otherwise, keep this PHV but check its contained expression */
+	}
+
+	return expression_tree_mutator(node, strip_noop_phvs_mutator,
+								   context);
+}
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e97dd082020..d892faec92c 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -42,6 +42,7 @@
 #include "parser/parse_relation.h"
 #include "parser/parsetree.h"
 #include "partitioning/partdesc.h"
+#include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
 #include "statistics/statistics.h"
 #include "storage/bufmgr.h"
@@ -702,6 +703,11 @@ get_relation_foreign_keys(PlannerInfo *root, RelOptInfo *rel,
  * the purposes of inference.  If no opclass (or collation) is specified, then
  * all matching indexes (that may or may not match the default in terms of
  * each attribute opclass/collation) are used for inference.
+ *
+ * Note: during index CONCURRENTLY operations, different transactions may
+ * reference different sets of arbiter indexes. This can lead to false unique
+ * constraint violations that wouldn't occur during normal operations.  For
+ * more information, see insert.sgml.
  */
 List *
 infer_arbiter_indexes(PlannerInfo *root)
@@ -1392,6 +1398,14 @@ get_relation_constraints(PlannerInfo *root,
 		result = list_concat(result, rel->partition_qual);
 	}
 
+	/*
+	 * Expand virtual generated columns in the constraint expressions.
+	 */
+	if (result)
+		result = (List *) expand_generated_columns_in_expr((Node *) result,
+														   relation,
+														   varno);
+
 	table_close(relation, NoLock);
 
 	return result;
@@ -2116,12 +2130,12 @@ add_function_cost(PlannerInfo *root, Oid funcid, Node *node,
 
 	if (node != NULL && nodeTag(node) == T_FuncExpr)
 	{
-		FuncExpr *funcexpr = (FuncExpr *) node;
+		FuncExpr   *funcexpr = (FuncExpr *) node;
 
-		/* not pg_proc function use default cost */
+		/* For functions not coming from pg_proc, use a default cost. */
 		if (!FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 		{
-			/* use the default */
+			/* Apply the default per-tuple estimate. */
 			cost->per_tuple += 100 * cpu_operator_cost;
 			return;
 		}
@@ -2316,6 +2330,60 @@ has_row_triggers(PlannerInfo *root, Index rti, CmdType event)
 	return result;
 }
 
+/*
+ * has_transition_tables
+ *
+ * Detect whether the specified relation has any transition tables for event.
+ */
+bool
+has_transition_tables(PlannerInfo *root, Index rti, CmdType event)
+{
+	RangeTblEntry *rte = planner_rt_fetch(rti, root);
+	Relation	relation;
+	TriggerDesc *trigDesc;
+	bool		result = false;
+
+	Assert(rte->rtekind == RTE_RELATION);
+
+	/* Currently foreign tables cannot have transition tables */
+	if (rte->relkind == RELKIND_FOREIGN_TABLE)
+		return result;
+
+	/* Assume we already have adequate lock */
+	relation = table_open(rte->relid, NoLock);
+
+	trigDesc = relation->trigdesc;
+	switch (event)
+	{
+		case CMD_INSERT:
+			if (trigDesc &&
+				trigDesc->trig_insert_new_table)
+				result = true;
+			break;
+		case CMD_UPDATE:
+			if (trigDesc &&
+				(trigDesc->trig_update_old_table ||
+				 trigDesc->trig_update_new_table))
+				result = true;
+			break;
+		case CMD_DELETE:
+			if (trigDesc &&
+				trigDesc->trig_delete_old_table)
+				result = true;
+			break;
+			/* There is no separate event for MERGE, only INSERT/UPDATE/DELETE */
+		case CMD_MERGE:
+			result = false;
+			break;
+		default:
+			elog(ERROR, "unrecognized CmdType: %d", (int) event);
+			break;
+	}
+
+	table_close(relation, NoLock);
+	return result;
+}
+
 /*
  * has_stored_generated_columns
  *
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index d2b4ecc5e51..8ee565a9b13 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -19,6 +19,7 @@
 #include "optimizer/cost.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/tlist.h"
+#include "rewrite/rewriteManip.h"
 
 
 /*
@@ -45,6 +46,8 @@ typedef struct
 
 typedef struct
 {
+	PlannerInfo *root;
+	bool		is_grouping_target; /* true if processing grouping target */
 	/* This is a List of bare expressions: */
 	List	   *input_target_exprs; /* exprs available from input */
 	/* These are Lists of Lists of split_pathtarget_items: */
@@ -59,6 +62,12 @@ typedef struct
 	Index		current_sgref;	/* current subexpr's sortgroupref, or 0 */
 } split_pathtarget_context;
 
+static void split_pathtarget_at_srfs_extended(PlannerInfo *root,
+											  PathTarget *target,
+											  PathTarget *input_target,
+											  List **targets,
+											  List **targets_contain_srfs,
+											  bool is_grouping_target);
 static bool split_pathtarget_walker(Node *node,
 									split_pathtarget_context *context);
 static void add_sp_item_to_pathtarget(PathTarget *target,
@@ -822,6 +831,51 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
 
 /*
  * split_pathtarget_at_srfs
+ *		Split given PathTarget into multiple levels to position SRFs safely,
+ *		performing exact matching against input_target.
+ *
+ * This is a wrapper for split_pathtarget_at_srfs_extended() that is used when
+ * both targets are on the same side of the grouping boundary (i.e., both are
+ * pre-grouping or both are post-grouping).  In this case, no special handling
+ * for the grouping nulling bit is required.
+ *
+ * See split_pathtarget_at_srfs_extended() for more details.
+ */
+void
+split_pathtarget_at_srfs(PlannerInfo *root,
+						 PathTarget *target, PathTarget *input_target,
+						 List **targets, List **targets_contain_srfs)
+{
+	split_pathtarget_at_srfs_extended(root, target, input_target,
+									  targets, targets_contain_srfs,
+									  false);
+}
+
+/*
+ * split_pathtarget_at_srfs_grouping
+ *		Split given PathTarget into multiple levels to position SRFs safely,
+ *		ignoring the grouping nulling bit when matching against input_target.
+ *
+ * This variant is used when the targets cross the grouping boundary (i.e.,
+ * target is post-grouping while input_target is pre-grouping).  In this case,
+ * we need to ignore the grouping nulling bit when checking for expression
+ * availability to avoid incorrectly re-evaluating SRFs that have already been
+ * computed in input_target.
+ *
+ * See split_pathtarget_at_srfs_extended() for more details.
+ */
+void
+split_pathtarget_at_srfs_grouping(PlannerInfo *root,
+								  PathTarget *target, PathTarget *input_target,
+								  List **targets, List **targets_contain_srfs)
+{
+	split_pathtarget_at_srfs_extended(root, target, input_target,
+									  targets, targets_contain_srfs,
+									  true);
+}
+
+/*
+ * split_pathtarget_at_srfs_extended
  *		Split given PathTarget into multiple levels to position SRFs safely
  *
  * The executor can only handle set-returning functions that appear at the
@@ -860,6 +914,13 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
  * already meant as a reference to a lower subexpression).  So, don't expand
  * any tlist expressions that appear in input_target, if that's not NULL.
  *
+ * This check requires extra care when processing the grouping target
+ * (indicated by the is_grouping_target flag).  In this case input_target is
+ * pre-grouping while target is post-grouping, so the latter may carry
+ * nullingrels bits from the grouping step that are absent in the former.  We
+ * must ignore those bits to correctly recognize that the tlist expressions are
+ * available in input_target.
+ *
  * It's also important that we preserve any sortgroupref annotation appearing
  * in the given target, especially on expressions matching input_target items.
  *
@@ -877,10 +938,11 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
  * are only a few possible patterns for which levels contain SRFs.
  * But this representation decouples callers from that knowledge.
  */
-void
-split_pathtarget_at_srfs(PlannerInfo *root,
-						 PathTarget *target, PathTarget *input_target,
-						 List **targets, List **targets_contain_srfs)
+static void
+split_pathtarget_at_srfs_extended(PlannerInfo *root,
+								  PathTarget *target, PathTarget *input_target,
+								  List **targets, List **targets_contain_srfs,
+								  bool is_grouping_target)
 {
 	split_pathtarget_context context;
 	int			max_depth;
@@ -905,7 +967,12 @@ split_pathtarget_at_srfs(PlannerInfo *root,
 		return;
 	}
 
-	/* Pass any input_target exprs down to split_pathtarget_walker() */
+	/*
+	 * Pass 'root', the is_grouping_target flag, and any input_target exprs
+	 * down to split_pathtarget_walker().
+	 */
+	context.root = root;
+	context.is_grouping_target = is_grouping_target;
 	context.input_target_exprs = input_target ? input_target->exprs : NIL;
 
 	/*
@@ -1076,9 +1143,27 @@ split_pathtarget_at_srfs(PlannerInfo *root,
 static bool
 split_pathtarget_walker(Node *node, split_pathtarget_context *context)
 {
+	Node	   *sanitized_node = node;
+
 	if (node == NULL)
 		return false;
 
+	/*
+	 * If we are crossing the grouping boundary (post-grouping target vs
+	 * pre-grouping input_target), we must ignore the grouping nulling bit to
+	 * correctly check if the subexpression is available in input_target. This
+	 * aligns with the matching logic in set_upper_references().
+	 */
+	if (context->is_grouping_target &&
+		context->root->parse->hasGroupRTE &&
+		context->root->parse->groupingSets != NIL)
+	{
+		sanitized_node =
+			remove_nulling_relids(node,
+								  bms_make_singleton(context->root->group_rtindex),
+								  NULL);
+	}
+
 	/*
 	 * A subexpression that matches an expression already computed in
 	 * input_target can be treated like a Var (which indeed it will be after
@@ -1087,7 +1172,7 @@ split_pathtarget_walker(Node *node, split_pathtarget_context *context)
 	 * substructure.  (Note in particular that this preserves the identity of
 	 * any expressions that appear as sortgrouprefs in input_target.)
 	 */
-	if (list_member(context->input_target_exprs, node))
+	if (list_member(context->input_target_exprs, sanitized_node))
 	{
 		split_pathtarget_item *item = palloc(sizeof(split_pathtarget_item));
 
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 8065237a189..9428cf5bb9c 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -959,10 +959,14 @@ flatten_join_alias_vars_mutator(Node *node,
  * wrapper.
  *
  * NOTE: this is also used by ruleutils.c, to deparse one query parsetree back
- * to source text.  For that use-case, root will be NULL, which is why we have
- * to pass the Query separately.  We need the root itself only for preserving
+ * to source text, and by check_output_expressions() to check for unsafe
+ * pushdowns.  For these use-cases, root will be NULL, which is why we have to
+ * pass the Query separately.  We need the root itself only for preserving
  * varnullingrels.  We can avoid preserving varnullingrels in the ruleutils.c's
  * usage because it does not make any difference to the deparsed source text.
+ * We can also avoid it in check_output_expressions() because that function
+ * uses the expanded expressions solely to check for volatile or set-returning
+ * functions, which is independent of the Vars' nullingrels.
  */
 Node *
 flatten_group_exprs(PlannerInfo *root, Query *query, Node *node)
diff --git a/src/backend/oracle_parser/.gitignore b/src/backend/oracle_parser/.gitignore
index 75274853cce..0a645eab369 100644
--- a/src/backend/oracle_parser/.gitignore
+++ b/src/backend/oracle_parser/.gitignore
@@ -1,4 +1,4 @@
 /ora_gram.h
 /ora_gram.c
 /ora_scan.c
-/ora_kwlist_d.h
\ No newline at end of file
+/ora_kwlist_d.h
diff --git a/src/backend/oracle_parser/Makefile b/src/backend/oracle_parser/Makefile
index c7f9efbb59d..0a45511aba9 100644
--- a/src/backend/oracle_parser/Makefile
+++ b/src/backend/oracle_parser/Makefile
@@ -16,8 +16,8 @@
 # Makefile--
 #    Makefile for src/backend/oracle_parser
 #
-# Copyright (c) 2023-2025, IvorySQL Global Development Team
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Copyright (c) 2023-2026, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # IDENTIFICATION
 #    src/backend/oracle_parser/Makefile
diff --git a/src/backend/oracle_parser/liboracle_parser.c b/src/backend/oracle_parser/liboracle_parser.c
index 7a4e6687cfa..0cf274199e1 100644
--- a/src/backend/oracle_parser/liboracle_parser.c
+++ b/src/backend/oracle_parser/liboracle_parser.c
@@ -10,7 +10,7 @@
  * analyze.c and related files.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -49,7 +49,7 @@ PG_MODULE_MAGIC_EXT(
 static raw_parser_hook_type prev_raw_parser = NULL;
 static get_keywords_hook_type prev_pg_get_keywords = NULL;
 static fill_in_constant_lengths_hook_type prev_fill_in_contant_lengths = NULL;
-quote_identifier_hook_type prev_quote_identifier = NULL;
+static quote_identifier_hook_type prev_quote_identifier = NULL;
 
 void _PG_init(void);
 void _PG_fini(void);
@@ -313,8 +313,9 @@ token_is_col_id(int token)
 			break;
 	}
 
-	if (OraScanKeywordCategories[i]== UNRESERVED_KEYWORD ||
-		OraScanKeywordCategories[i]== COL_NAME_KEYWORD)
+	if (i < OraScanKeywords.num_keywords &&
+		(OraScanKeywordCategories[i]== UNRESERVED_KEYWORD ||
+		OraScanKeywordCategories[i]== COL_NAME_KEYWORD))
 		return true;
 	return false;
 }
@@ -397,18 +398,18 @@ ora_base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp, ora_core_yyscan_t yyscanner)
 			while (token != 0 && token != ';')
 			{
 				/*
-				 * support anonymous block
+				 * support anonymous block.
 				 * In the PLSQL, the cursor declare must be 'CURSOR ...',
 				 * not '... CURSOR ...'.
 				 *
-				 * PLSQL support type xxx is ref cursor grammer
-				 * so we check the last token is ref
-				 * declare cursor don't support ref for the cursor name
+				 * PLSQL supports "type xxx is ref cursor" grammer
+				 * so we check the last token is ref or not.
+				 * declare cursor doesn't support ref for the cursor name.
 				 *
-				 * Inline function support cursor
-				 * we judge it is the cursor of SQL, if it next token
+				 * Inline function supports cursor
+				 * we know it is the cursor of SQL, if the next token
 				 * is WITH or FOR or WITHOUT. see details for ora_gram.y about
-				 * declare cursor stmt
+				 * declare cursor stmt.
 				 */
 				if (token == CURSOR)
 					has_cursor = true;
@@ -604,7 +605,7 @@ ora_base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp, ora_core_yyscan_t yyscanner)
 					}
 
 					/*
-					 * there, maybe package body has init block
+					 * package body may have init block
 					 */
 					if (yyextra->body_style == OraBody_PACKAGEBODY &&
 						blocklevel == 0)
diff --git a/src/backend/oracle_parser/meson.build b/src/backend/oracle_parser/meson.build
index 00bfff242a5..2b6b7287797 100644
--- a/src/backend/oracle_parser/meson.build
+++ b/src/backend/oracle_parser/meson.build
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 ora_parser_sources = files(
   'liboracle_parser.c',
diff --git a/src/backend/oracle_parser/ora_gram.y b/src/backend/oracle_parser/ora_gram.y
index 6a43c8b3402..09adcb86e0a 100644
--- a/src/backend/oracle_parser/ora_gram.y
+++ b/src/backend/oracle_parser/ora_gram.y
@@ -6,7 +6,7 @@
  * ora_gram.y
  *	  IvorySQL BISON rules/actions  (Oracle compatible)
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -652,10 +652,12 @@ static void determineLanguage(List *options);
 %type <list>		hash_partbound
 %type <defelt>		hash_partbound_elem
 
-%type <node> param_mode
 %type <node> param_mode_item
 %type <list> param_mode_list
+%type <list> params_length_list
 %type <str>  opt_param_name
+%type <node> param_mode
+%type <boolean>	opt_do_from_where
 
 %type <list>	identity_clause identity_options drop_identity
 %type <boolean>	opt_with opt_by
@@ -778,7 +780,7 @@ static void determineLanguage(List *options);
 	OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER PACKAGES 
 
 	PARALLEL PARAMETER PARSER PARTIAL PARTITION PASSING PASSWORD PATH
-	PGEXTRACT PLACING PLAN PLANS POLICY
+	EXTRACT PGEXTRACT PLACING PLAN PLANS POLICY
 	POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
 	PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROCEDURES PROGRAM PUBLICATION
 
@@ -847,6 +849,8 @@ static void determineLanguage(List *options);
 	BINARY_DOUBLE_NAN BINARY_DOUBLE_INFINITY
 %token <keyword> NAN_P INFINITE_P
 
+%token <keyword> PARAMSLENGTH
+
 %type <node> CreatePackageStmt CreatePackageBodyStmt AlterPackageStmt
 %type <node> package_proper_item
 %type <list> package_proper package_proper_list package_names package_names_list
@@ -1253,6 +1257,21 @@ CallStmt:	CALL func_application
 					n->funccall = castNode(FuncCall, $2);
 					$$ = (Node *) n;
 				}
+			| CALL func_application INTO ORAPARAM
+				{
+					CallStmt *n = makeNode(CallStmt);
+					OraParamRef *hostvar = makeNode(OraParamRef);
+					char	*callstr = NULL;
+					n->funccall = castNode(FuncCall, $2);
+					hostvar->number = 0;
+					hostvar->location = @4;
+					hostvar->name = $4;
+					n->hostvariable = hostvar;
+					callstr = pnstrdup(pg_yyget_extra(yyscanner)->core_yy_extra.scanbuf + @2, @3 - @2);
+					n->callinto = psprintf("%s := %s;", $4, callstr);
+					pfree(callstr);
+					$$ = (Node *)n;
+				}
 			| EXEC exec_func_application
 				{
 					CallStmt   *n = makeNode(CallStmt);
@@ -2908,6 +2927,13 @@ alter_table_cmd:
 						c->alterDeferrability = true;
 					if ($4 & CAS_NO_INHERIT)
 						c->alterInheritability = true;
+		           /* handle unsupported case with specific error message */
+					if ($4 & CAS_NOT_VALID)
+							ereport(ERROR,
+											errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+											errmsg("constraints cannot be altered to be NOT VALID"),
+											parser_errposition(@4));
+
 					processCASbits($4, @4, "FOREIGN KEY",
 									&c->deferrable,
 									&c->initdeferred,
@@ -9097,7 +9123,7 @@ implementation_package:
 			{
 				$$ = NIL;
 			}
-		/* reuse implementation_type temporary */
+		/* reuse implementation_type temporarily */
 		| implementation_package_type POLYMORPHIC implementation_type
 			{
 				$$ = $3;
@@ -9195,7 +9221,7 @@ opt_ora_func_args_with_defaults:
 	 * In order to avoid reduce/reduce conflict, we are compatible with Oracle
 	 * based on the original CREATE PROCEUDRE grammar rules of PG. The purpose
 	 * of adding this nonterminal is to try not to destroy the syntax of PG.
-	 * Although we can switch to the gram.y of native PG, try our best to Stick
+	 * Although we can switch to the gram.y of native PG, try our best to stick
 	 * to this principle.
 	 */
 	opt_procedure_args_with_defaults:
@@ -9409,7 +9435,7 @@ func_arg_with_default:
 					$$ = $1;
 					$$->defexpr = $3;
 				}
-		| func_arg '=' a_expr
+		| func_arg plassign_equals a_expr
 				{
 					$$ = $1;
 					$$->defexpr = $3;
@@ -10236,6 +10262,18 @@ DoStmt: DO dostmt_opt_list
 					DoStmt *n = makeNode(DoStmt);
 					n->args = $2;
 					n->paramsmode = $4;
+					n->paramslen = NIL;
+					determineLanguage(n->args);
+					$$ = (Node *)n;
+				}
+
+			| DO dostmt_opt_list USING param_mode_list PARAMSLENGTH params_length_list opt_do_from_where
+				{
+					DoStmt *n = makeNode(DoStmt);
+					n->args = $2;
+					n->paramsmode = $4;
+					n->paramslen = $6;
+					n->do_from_call = $7;
 					determineLanguage(n->args);
 					$$ = (Node *)n;
 				}
@@ -10303,6 +10341,21 @@ param_mode:
 				| IN_P OUT_P    		{ $$ = (Node *) makeString("inout"); }
 		;
 
+params_length_list:
+			SignedIconst
+				{
+					$$ = list_make1(makeInteger($1));
+				}
+			| params_length_list ',' SignedIconst
+				{
+					$$ = lappend($1, makeInteger($3));
+				}
+		;
+
+opt_do_from_where:
+			GENERATED FROM CALL			{ $$ = true; }
+			| /*EMPTY*/					{ $$ = false; }
+		;
 
 /*****************************************************************************
  *
@@ -17965,6 +18018,27 @@ func_expr_common_subexpr:
 											   COERCE_SQL_SYNTAX,
 											   @1);
 				}
+			| EXTRACT '(' extract_list ')'
+				{
+					$$ = (Node *) makeFuncCall(SystemFuncName("extract"),
+											   $3,
+											   COERCE_SQL_SYNTAX,
+											   @1);
+				}
+			| EXTRACT '(' a_expr ',' a_expr ')'
+				{
+					$$ = (Node *) makeFuncCall(list_make1(makeString("extract")),
+											   list_make2($3, $5),
+											   COERCE_EXPLICIT_CALL,
+											   @1);
+				}
+			| EXTRACT '(' a_expr ',' a_expr ',' a_expr ')'
+				{
+					$$ = (Node *) makeFuncCall(list_make1(makeString("extract")),
+											   list_make3($3, $5, $7),
+											   COERCE_EXPLICIT_CALL,
+											   @1);
+				}
 			/* End - ReqID:SRS-SQL-XML */
 			| NORMALIZE '(' a_expr ')'
 				{
@@ -18201,26 +18275,25 @@ func_expr_common_subexpr:
 			/* End - ReqID:SRS-SQL-XML */
 			| USERENV '(' Sconst ')'
 				{
-					if (strcmp(downcase_identifier($3, strlen($3), true, true), "client_info") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_client_info"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "entryid") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_entryid"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "terminal") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_terminal"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "isdba") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_isdba"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "lang") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_lang"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "language") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_language"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "sessionid") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_sessionid"), NIL, COERCE_EXPLICIT_CALL, @1);
-					else if (strcmp(downcase_identifier($3, strlen($3), true, true), "sid") == 0)
-						$$ = (Node *) makeFuncCall(OracleSystemFuncName("get_sid"), NIL, COERCE_EXPLICIT_CALL, @1);
+					char *normalized_param = downcase_identifier($3, strlen($3), true, true);
+
+					#define CHECK_AND_CALL(param, func_name) \
+						if (strcmp(normalized_param, param) == 0) \
+							$$ = (Node *) makeFuncCall(OracleSystemFuncName(func_name), NIL, COERCE_EXPLICIT_CALL, @1);
+
+					CHECK_AND_CALL("client_info", "get_client_info")
+					else CHECK_AND_CALL("entryid", "get_entryid")
+					else CHECK_AND_CALL("terminal", "get_terminal")
+					else CHECK_AND_CALL("isdba", "get_isdba")
+					else CHECK_AND_CALL("lang", "get_lang")
+					else CHECK_AND_CALL("language", "get_language")
+					else CHECK_AND_CALL("sessionid", "get_sessionid")
+					else CHECK_AND_CALL("sid", "get_sid")
 					else
 						ereport(ERROR,
 								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("invalid USERENV parameter.")));
+								 errmsg("invalid USERENV parameter: \"%s\".", $3)));
+					#undef CHECK_AND_CALL
 				}
 			| JSON_OBJECT '(' func_arg_list ')'
 				{
@@ -20279,6 +20352,7 @@ unreserved_keyword:
 			| PARALLEL
 			| PARALLEL_ENABLE
 			| PARAMETER
+			| PARAMSLENGTH
 			| PARSER
 			| PARTIAL
 			| PARTITION
@@ -20457,6 +20531,7 @@ col_name_keyword:
 			| DECIMAL_P
 			| DECODE
 			| EXISTS
+			| EXTRACT
 			| FLOAT_P
 			| GREATEST
 			| GROUPING
@@ -20815,6 +20890,7 @@ bare_label_keyword:
 			| EXTEND
 			| EXTENSION
 			| EXTERNAL
+			| EXTRACT
 			| FALSE_P
 			| FAMILY
 			| FINALIZE
@@ -20985,6 +21061,7 @@ bare_label_keyword:
 			| PARALLEL
 			| PARALLEL_ENABLE
 			| PARAMETER
+			| PARAMSLENGTH
 			| PARSER
 			| PARTIAL
 			| PARTITION
diff --git a/src/backend/oracle_parser/ora_gramparse.h b/src/backend/oracle_parser/ora_gramparse.h
index b92dde16145..187f0e81af6 100644
--- a/src/backend/oracle_parser/ora_gramparse.h
+++ b/src/backend/oracle_parser/ora_gramparse.h
@@ -8,7 +8,7 @@
  * Definitions that are needed outside the core parser should be in parser.h.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
diff --git a/src/backend/oracle_parser/ora_keywords.c b/src/backend/oracle_parser/ora_keywords.c
index 16b57f774fd..f7dbd38dec1 100644
--- a/src/backend/oracle_parser/ora_keywords.c
+++ b/src/backend/oracle_parser/ora_keywords.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/oracle_parser/ora_scan.l b/src/backend/oracle_parser/ora_scan.l
index a899318d305..cf9a734a5b2 100644
--- a/src/backend/oracle_parser/ora_scan.l
+++ b/src/backend/oracle_parser/ora_scan.l
@@ -23,7 +23,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/oracle_parser/ora_scan.l
@@ -486,7 +486,7 @@ other			.
 
 <xc>{
 {xcstart}		{
-					/* Simply don't consider nesting for compatibility with Oracle's comments */
+					/* don't consider nesting for compatibility of Oracle's comments */
 					//(yyextra->xcdepth)++;
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
@@ -846,7 +846,7 @@ other			.
 						int		len = 0;
 
 						BEGIN(INITIAL);
-						/* get q' escaped character,really character */
+						/* get q' escaped character, the real character */
 
 						oldstr = litbufdup(yyscanner);
 						len = strlen(oldstr);
@@ -942,7 +942,7 @@ other			.
 						yyerror("zero-length delimited identifier");
 					ident = litbufdup(yyscanner);
 
-					/* Convert the upper case identifier to the lower case, and the lower
+					/* Convert the upper case identifier to the lower case one, and the lower
 					 * case to the upper case, if the identifier is quoted by the double
 					 * quotes.
 					 */
@@ -1473,7 +1473,7 @@ ora_scanner_init(const char *str,
 
 
 /*
- * Called after parsing is done to clean up after ora_scanner_init()
+ * when parsing is done, clean up after ora_scanner_init()
  */
 void
 ora_scanner_finish(ora_core_yyscan_t yyscanner)
diff --git a/src/backend/parser/README b/src/backend/parser/README
index e0c986a41ef..e26eb437a9f 100644
--- a/src/backend/parser/README
+++ b/src/backend/parser/README
@@ -20,6 +20,7 @@ parse_cte.c	handle Common Table Expressions (WITH clauses)
 parse_expr.c	handle expressions like col, col + 3, x = 3 or x = 4
 parse_enr.c	handle ephemeral named rels (trigger transition tables, ...)
 parse_func.c	handle functions, table.column and column identifiers
+parse_jsontable.c handle JSON_TABLE
 parse_merge.c	handle MERGE
 parse_node.c	create nodes for various structures
 parse_oper.c	handle operators in expressions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 96bf21ec6a2..7f4eb90b28b 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -16,7 +16,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *	src/backend/parser/analyze.c
  *
@@ -367,7 +367,7 @@ transformStmt(ParseState *pstate, Node *parseTree)
 			break;
 
 		case T_MergeStmt:
-			result = (*pg_transform_merge_stmt_hook)(pstate, (MergeStmt *) parseTree);
+			result = (*pg_transform_merge_stmt_hook) (pstate, (MergeStmt *) parseTree);
 			break;
 
 		case T_SelectStmt:
@@ -579,6 +579,14 @@ transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt)
 										 ACL_DELETE);
 	nsitem = pstate->p_target_nsitem;
 
+	/* disallow DELETE ... WHERE CURRENT OF on a view */
+	if (stmt->whereClause &&
+		IsA(stmt->whereClause, CurrentOfExpr) &&
+		pstate->p_target_relation->rd_rel->relkind == RELKIND_VIEW)
+		ereport(ERROR,
+				errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				errmsg("WHERE CURRENT OF on a view is not implemented"));
+
 	/* there's no DISTINCT in DELETE */
 	qry->distinctClause = NIL;
 
@@ -974,15 +982,15 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 		if (selectStmt->valuesIsrow == true)
 		{
 			/*
-			 * Transform the row variable into its fields form.
-			 * For example: INSERT INTO tablename VALUES row_variable; 
-			 * convert it to the equivalent statement: 
-			 * INSERT INTO tablename VALUES (row_variable.field1,...,row_variable.fieldN);
+			 * Transform the row variable into its fields form. For example:
+			 * INSERT INTO tablename VALUES row_variable; convert it to the
+			 * equivalent statement: INSERT INTO tablename VALUES
+			 * (row_variable.field1,...,row_variable.fieldN);
 			 */
 			exprList = transformRowExpression(pstate,
-							  (List *) linitial(valuesLists),
-							  EXPR_KIND_VALUES_SINGLE,
-							  true);
+											  (List *) linitial(valuesLists),
+											  EXPR_KIND_VALUES_SINGLE,
+											  true);
 
 			nattrs = list_length(icolumns);
 			nvalues = list_length(exprList);
@@ -999,13 +1007,13 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 		else
 		{
 			/*
-			 * Do basic expression transformation (same as a ROW() expr, but allow
-			 * SetToDefault at top level)
+			 * Do basic expression transformation (same as a ROW() expr, but
+			 * allow SetToDefault at top level)
 			 */
 			exprList = transformExpressionList(pstate,
-							   (List *) linitial(valuesLists),
-							   EXPR_KIND_VALUES_SINGLE,
-							   true);
+											   (List *) linitial(valuesLists),
+											   EXPR_KIND_VALUES_SINGLE,
+											   true);
 		}
 
 		/* Prepare row for assignment to target table */
@@ -2520,6 +2528,14 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 										 ACL_UPDATE);
 	nsitem = pstate->p_target_nsitem;
 
+	/* disallow UPDATE ... WHERE CURRENT OF on a view */
+	if (stmt->whereClause &&
+		IsA(stmt->whereClause, CurrentOfExpr) &&
+		pstate->p_target_relation->rd_rel->relkind == RELKIND_VIEW)
+		ereport(ERROR,
+				errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				errmsg("WHERE CURRENT OF on a view is not implemented"));
+
 	/* subqueries in FROM cannot access the result relation */
 	nsitem->p_lateral_only = true;
 	nsitem->p_lateral_ok = false;
@@ -2547,7 +2563,7 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 		foreach(o_target, stmt->targetList)
 		{
 			ResTarget  *origTarget = (ResTarget *) lfirst(o_target);
-	
+
 			if (strcmp(origTarget->name, "rowid") == 0)
 				elog(ERROR, "cannot specify system column name \"%s\"", origTarget->name);
 		}
@@ -2688,14 +2704,14 @@ transformUpdateTargetList(ParseState *pstate, List *origTlist)
 		if (attrno == InvalidAttrNumber && compatible_db == PG_PARSER)
 		{
 			ereport(ERROR,
-			(errcode(ERRCODE_UNDEFINED_COLUMN),
-			 errmsg("column \"%s\" of relation \"%s\" does not exist",
-					origTarget->name,
-					RelationGetRelationName(pstate->p_target_relation)),
-			 (origTarget->indirection != NIL &&
-			  strcmp(origTarget->name, pstate->p_target_nsitem->p_names->aliasname) == 0) ?
-			 errhint("SET target columns cannot be qualified with the relation name.") : 0,
-			 parser_errposition(pstate, origTarget->location)));
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column \"%s\" of relation \"%s\" does not exist",
+							origTarget->name,
+							RelationGetRelationName(pstate->p_target_relation)),
+					 (origTarget->indirection != NIL &&
+					  strcmp(origTarget->name, pstate->p_target_nsitem->p_names->aliasname) == 0) ?
+					 errhint("SET target columns cannot be qualified with the relation name.") : 0,
+					 parser_errposition(pstate, origTarget->location)));
 		}
 
 		if (colname_temp)
@@ -3015,13 +3031,26 @@ transformPLAssignStmt(ParseState *pstate, PLAssignStmt *stmt)
 		 */
 		Node	   *orig_expr = (Node *) tle->expr;
 
-		tle->expr = (Expr *)
-			coerce_to_target_type(pstate,
-								  orig_expr, type_id,
-								  targettype, targettypmod,
-								  COERCION_PLPGSQL,
-								  COERCE_IMPLICIT_CAST,
-								  -1);
+		if (pstate->do_from_call &&
+			(((type_id == ORACHARCHAROID || type_id == ORACHARBYTEOID) &&
+				(targettype == ORACHARCHAROID || targettype == ORACHARBYTEOID)) ||
+			((targettype == ORAVARCHARCHAROID || targettype == ORAVARCHARBYTEOID))))
+			tle->expr = (Expr *)
+				coerce_to_target_type(pstate,
+									  orig_expr, type_id,
+									  targettype, targettypmod,
+									  COERCION_EXPLICIT,
+									  COERCE_IMPLICIT_CAST,
+									  -1);
+		else
+		/* End - ReqID:SRS-SQL-CALL */
+			tle->expr = (Expr *)
+				coerce_to_target_type(pstate,
+									  orig_expr, type_id,
+									  targettype, targettypmod,
+									  COERCION_PLPGSQL,
+									  COERCE_IMPLICIT_CAST,
+									  -1);
 		/* With COERCION_PLPGSQL, this error is probably unreachable */
 		if (tle->expr == NULL)
 			ereport(ERROR,
@@ -3066,6 +3095,7 @@ transformPLAssignStmt(ParseState *pstate, PLAssignStmt *stmt)
 											qry->sortClause,
 											EXPR_KIND_GROUP_BY,
 											false /* allow SQL92 rules */ );
+	qry->groupDistinct = sstmt->groupDistinct;
 
 	if (sstmt->distinctClause == NIL)
 	{
@@ -3480,6 +3510,12 @@ transformCallStmt(ParseState *pstate, CallStmt *stmt)
 
 	ReleaseSysCache(proctup);
 
+/*
+ * Fast exit for non-pg_proc routines:
+ * when the target is resolved outside the pg_proc catalog, we have already
+ * prepared funcexpr and any OUT arguments; skip catalog-based checks and
+ * finalize the CALL as a utility Query node.
+ */
 SKIP_PG_PROC_CHECK:
 
 	/* represent the command as a utility Query */
@@ -3891,25 +3927,25 @@ transformUpdateRowTargetList(ParseState *pstate, List *origTlist)
 	List	   *tlist = NIL;
 	RTEPermissionInfo *target_perminfo = NULL;
 	ListCell   *tl;
-	int	nattrs;
-	int	nvalues;
-	int	attrno;
-	int	location;
+	int			nattrs;
+	int			nvalues;
+	int			attrno;
+	int			location;
 	ResTarget  *origTarget;
 
 	nvalues = list_length(origTlist);
 	origTarget = (ResTarget *) linitial(origTlist);
-	location = ((ResTarget *)lfirst_node(ResTarget, list_head(origTlist)))->location;
+	location = ((ResTarget *) lfirst_node(ResTarget, list_head(origTlist)))->location;
 
 	/*
-	 * some checkings 
+	 * some checkings
 	 */
-	 if (nvalues != 1)
+	if (nvalues != 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("too many values"),
 				 parser_errposition(pstate,
-							location)));
+									location)));
 
 	if (nodeTag(origTarget->val) == T_FuncCall ||
 		nodeTag(origTarget->val) == T_OraParamRef ||
@@ -3918,13 +3954,13 @@ transformUpdateRowTargetList(ParseState *pstate, List *origTlist)
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("unsupported target"),
 				 parser_errposition(pstate,
-							location)));
+									location)));
 
 	/* Transform the target list */
 	tlist = transformRowTargetList(pstate, origTlist,
-					EXPR_KIND_UPDATE_SOURCE);
+								   EXPR_KIND_UPDATE_SOURCE);
 
-	location = ((ResTarget *)lfirst_node(ResTarget, list_head(origTlist)))->location;
+	location = ((ResTarget *) lfirst_node(ResTarget, list_head(origTlist)))->location;
 
 	nattrs = RelationGetNumberOfAttributes(pstate->p_target_relation);
 	nvalues = list_length(tlist);
@@ -3934,14 +3970,14 @@ transformUpdateRowTargetList(ParseState *pstate, List *origTlist)
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("no enough values"),
 				 parser_errposition(pstate,
-							location)));
+									location)));
 
 	else if (nattrs < nvalues)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("too many values"),
 				 parser_errposition(pstate,
-							location)));
+									location)));
 
 	if (pstate->p_next_resno <= RelationGetNumberOfAttributes(pstate->p_target_relation))
 		pstate->p_next_resno = RelationGetNumberOfAttributes(pstate->p_target_relation) + 1;
@@ -3956,9 +3992,9 @@ transformUpdateRowTargetList(ParseState *pstate, List *origTlist)
 
 		att = TupleDescAttr(pstate->p_target_relation->rd_att, attrno);
 		updateTargetListEntry(pstate, tle, NameStr(att->attname),
-					  attrno + 1,
-					  NIL,
-					  location);
+							  attrno + 1,
+							  NIL,
+							  location);
 
 		/* Mark the target column as requiring update permissions */
 		target_perminfo->updatedCols = bms_add_member(target_perminfo->updatedCols, attrno - FirstLowInvalidHeapAttributeNumber);
@@ -3986,11 +4022,11 @@ transformIvyUpdateTargetList(ParseState *pstate, List *origTlist)
 {
 	List	   *tlist = NIL;
 	ListCell   *o_target;
-	int	target_has_row = false;
-	bool	cols_has_row = false;
-	int	col_is_complex = false;
-	int	row_no;
-	Oid	attrrowtype;
+	int			target_has_row = false;
+	bool		cols_has_row = false;
+	int			col_is_complex = false;
+	int			row_no;
+	Oid			attrrowtype;
 
 	target_has_row = 0;
 	row_no = 0;
@@ -3998,15 +4034,15 @@ transformIvyUpdateTargetList(ParseState *pstate, List *origTlist)
 	/* Check if the target name is "row" */
 	foreach(o_target, origTlist)
 	{
-		ResTarget  	*origTarget = (ResTarget *) lfirst(o_target);
-		int 		attrno;
+		ResTarget  *origTarget = (ResTarget *) lfirst(o_target);
+		int			attrno;
 
 		/* Check if there is a column named "row" */
 		if (pg_strcasecmp(origTarget->name, "row") == 0)
 		{
 			target_has_row = true;
 			attrno = attnameAttNum(pstate->p_target_relation,
-						   origTarget->name, true);
+								   origTarget->name, true);
 
 			if (attrno != InvalidAttrNumber)
 			{
@@ -4024,15 +4060,16 @@ transformIvyUpdateTargetList(ParseState *pstate, List *origTlist)
 	}
 
 	/*
-	 * If target_has_row is false, there should be no SET ROW = xx clause, 
+	 * If target_has_row is false, there should be no SET ROW = xx clause,
 	 * call transformUpdateTargetList to transform the targetlist.
 	 */
 	if (!target_has_row)
 		return transformUpdateTargetList(pstate, origTlist);
 
 	/*
-	 * cols_has_row is false, there should be no column named "row".
-	 * the UPDATE statment is UPDATE tablename SET ROW = record_var[WHERE ..] statement.
+	 * cols_has_row is false, there should be no column named "row". the
+	 * UPDATE statment is UPDATE tablename SET ROW = record_var[WHERE ..]
+	 * statement.
 	 */
 	if (!cols_has_row)
 	{
@@ -4040,11 +4077,11 @@ transformIvyUpdateTargetList(ParseState *pstate, List *origTlist)
 	}
 	else
 	{
-		TargetEntry 	*row_tle;
-		Oid		value_type;
+		TargetEntry *row_tle;
+		Oid			value_type;
 
 		tlist = transformTargetList(pstate, origTlist,
-						EXPR_KIND_UPDATE_SOURCE);
+									EXPR_KIND_UPDATE_SOURCE);
 
 		/* Get the transformed value of the target row */
 		row_tle = (TargetEntry *) list_nth(tlist, row_no);
@@ -4066,11 +4103,13 @@ transformIvyUpdateTargetList(ParseState *pstate, List *origTlist)
 		}
 		else
 		{
-			/* It is UPDATE tablename SET ROW = value,.. colN = value..[WHERE ..] statement */
+			/*
+			 * It is UPDATE tablename SET ROW = value,.. colN = value..[WHERE
+			 * ..] statement
+			 */
 			tlist = transformUpdateTargetList(pstate, origTlist);
 		}
 	}
 
 	return tlist;
 }
-
diff --git a/src/backend/parser/check_keywords.pl b/src/backend/parser/check_keywords.pl
index 50e0ba71694..7c450a4d28b 100644
--- a/src/backend/parser/check_keywords.pl
+++ b/src/backend/parser/check_keywords.pl
@@ -4,7 +4,7 @@
 # Usage: check_keywords.pl gram.y kwlist.h
 
 # src/backend/parser/check_keywords.pl
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2009-2025, PostgreSQL Global Development Group
 
 use strict;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index f52781cb5f2..6d4ff7d9a59 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -2672,6 +2672,12 @@ alter_table_cmd:
 						c->alterDeferrability = true;
 					if ($4 & CAS_NO_INHERIT)
 						c->alterInheritability = true;
+					/* handle unsupported case with specific error message */
+					if ($4 & CAS_NOT_VALID)
+						ereport(ERROR,
+								errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								errmsg("constraints cannot be altered to be NOT VALID"),
+								parser_errposition(@4));
 					processCASbits($4, @4, "FOREIGN KEY",
 									&c->deferrable,
 									&c->initdeferred,
diff --git a/src/backend/parser/meson.build b/src/backend/parser/meson.build
index c6136f9649d..306c7c9ef7a 100644
--- a/src/backend/parser/meson.build
+++ b/src/backend/parser/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_sources += files(
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 0ac8966e30f..4163d9a5930 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -38,6 +38,8 @@ typedef struct
 	ParseState *pstate;
 	int			min_varlevel;
 	int			min_agglevel;
+	int			min_ctelevel;
+	RangeTblEntry *min_cte;
 	int			sublevels_up;
 } check_agg_arguments_context;
 
@@ -58,7 +60,8 @@ typedef struct
 static int	check_agg_arguments(ParseState *pstate,
 								List *directargs,
 								List *args,
-								Expr *filter);
+								Expr *filter,
+								int agglocation);
 static bool check_agg_arguments_walker(Node *node,
 									   check_agg_arguments_context *context);
 static Node *substitute_grouped_columns(Node *node, ParseState *pstate, Query *qry,
@@ -339,7 +342,8 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr)
 	min_varlevel = check_agg_arguments(pstate,
 									   directargs,
 									   args,
-									   filter);
+									   filter,
+									   location);
 
 	*p_levelsup = min_varlevel;
 
@@ -641,7 +645,8 @@ static int
 check_agg_arguments(ParseState *pstate,
 					List *directargs,
 					List *args,
-					Expr *filter)
+					Expr *filter,
+					int agglocation)
 {
 	int			agglevel;
 	check_agg_arguments_context context;
@@ -649,6 +654,8 @@ check_agg_arguments(ParseState *pstate,
 	context.pstate = pstate;
 	context.min_varlevel = -1;	/* signifies nothing found yet */
 	context.min_agglevel = -1;
+	context.min_ctelevel = -1;
+	context.min_cte = NULL;
 	context.sublevels_up = 0;
 
 	(void) check_agg_arguments_walker((Node *) args, &context);
@@ -686,6 +693,20 @@ check_agg_arguments(ParseState *pstate,
 				 parser_errposition(pstate, aggloc)));
 	}
 
+	/*
+	 * If there's a non-local CTE that's below the aggregate's semantic level,
+	 * complain.  It's not quite clear what we should do to fix up such a case
+	 * (treating the CTE reference like a Var seems wrong), and it's also
+	 * unclear whether there is a real-world use for such cases.
+	 */
+	if (context.min_ctelevel >= 0 && context.min_ctelevel < agglevel)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("outer-level aggregate cannot use a nested CTE"),
+				 errdetail("CTE \"%s\" is below the aggregate's semantic level.",
+						   context.min_cte->eref->aliasname),
+				 parser_errposition(pstate, agglocation)));
+
 	/*
 	 * Now check for vars/aggs in the direct arguments, and throw error if
 	 * needed.  Note that we allow a Var of the agg's semantic level, but not
@@ -699,6 +720,7 @@ check_agg_arguments(ParseState *pstate,
 	{
 		context.min_varlevel = -1;
 		context.min_agglevel = -1;
+		context.min_ctelevel = -1;
 		(void) check_agg_arguments_walker((Node *) directargs, &context);
 		if (context.min_varlevel >= 0 && context.min_varlevel < agglevel)
 			ereport(ERROR,
@@ -714,6 +736,13 @@ check_agg_arguments(ParseState *pstate,
 					 parser_errposition(pstate,
 										locate_agg_of_level((Node *) directargs,
 															context.min_agglevel))));
+		if (context.min_ctelevel >= 0 && context.min_ctelevel < agglevel)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("outer-level aggregate cannot use a nested CTE"),
+					 errdetail("CTE \"%s\" is below the aggregate's semantic level.",
+							   context.min_cte->eref->aliasname),
+					 parser_errposition(pstate, agglocation)));
 	}
 	return agglevel;
 }
@@ -791,6 +820,30 @@ check_agg_arguments_walker(Node *node,
 					 parser_errposition(context->pstate,
 										((WindowFunc *) node)->location)));
 	}
+
+	if (IsA(node, RangeTblEntry))
+	{
+		RangeTblEntry *rte = (RangeTblEntry *) node;
+
+		if (rte->rtekind == RTE_CTE)
+		{
+			int			ctelevelsup = rte->ctelevelsup;
+
+			/* convert levelsup to frame of reference of original query */
+			ctelevelsup -= context->sublevels_up;
+			/* ignore local CTEs of subqueries */
+			if (ctelevelsup >= 0)
+			{
+				if (context->min_ctelevel < 0 ||
+					context->min_ctelevel > ctelevelsup)
+				{
+					context->min_ctelevel = ctelevelsup;
+					context->min_cte = rte;
+				}
+			}
+		}
+		return false;			/* allow range_table_walker to continue */
+	}
 	if (IsA(node, Query))
 	{
 		/* Recurse into subselects */
@@ -800,7 +853,7 @@ check_agg_arguments_walker(Node *node,
 		result = query_tree_walker((Query *) node,
 								   check_agg_arguments_walker,
 								   context,
-								   0);
+								   QTW_EXAMINE_RTES_BEFORE);
 		context->sublevels_up--;
 		return result;
 	}
@@ -1160,8 +1213,8 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 	}
 
 	/*
-	 * Build a list of the acceptable GROUP BY expressions for use by
-	 * substitute_grouped_columns().
+	 * Build a list of the acceptable GROUP BY expressions to save in the
+	 * RTE_GROUP RTE, and for use by substitute_grouped_columns().
 	 *
 	 * We get the TLE, not just the expr, because GROUPING wants to know the
 	 * sortgroupref.
@@ -1178,6 +1231,23 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 		groupClauses = lappend(groupClauses, expr);
 	}
 
+	/*
+	 * If there are any acceptable GROUP BY expressions, build an RTE and
+	 * nsitem for the result of the grouping step.  (It's important to do this
+	 * before flattening join alias vars in groupClauses, because the RTE
+	 * should preserve any alias vars that were in the input.)
+	 */
+	if (groupClauses)
+	{
+		pstate->p_grouping_nsitem =
+			addRangeTableEntryForGroup(pstate, groupClauses);
+
+		/* Set qry->rtable again in case it was previously NIL */
+		qry->rtable = pstate->p_rtable;
+		/* Mark the Query as having RTE_GROUP RTE */
+		qry->hasGroupRTE = true;
+	}
+
 	/*
 	 * If there are join alias vars involved, we have to flatten them to the
 	 * underlying vars, so that aliased and unaliased vars will be correctly
@@ -1213,21 +1283,6 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 		}
 	}
 
-	/*
-	 * If there are any acceptable GROUP BY expressions, build an RTE and
-	 * nsitem for the result of the grouping step.
-	 */
-	if (groupClauses)
-	{
-		pstate->p_grouping_nsitem =
-			addRangeTableEntryForGroup(pstate, groupClauses);
-
-		/* Set qry->rtable again in case it was previously NIL */
-		qry->rtable = pstate->p_rtable;
-		/* Mark the Query as having RTE_GROUP RTE */
-		qry->hasGroupRTE = true;
-	}
-
 	/*
 	 * Replace grouped variables in the targetlist and HAVING clause with Vars
 	 * that reference the RTE_GROUP RTE.  Emit an error message if we find any
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 70ecea39079..ec90d87c60d 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -3955,71 +3955,78 @@ interpretRowidOption(List *defList, bool allowRowid)
 static void
 check_funcexpr_outparams(List *funcexprs)
 {
-	HeapTuple		procTup;
-	Form_pg_proc		procStruct;
-	char			*proname = NULL;
-	FuncExpr *func = (FuncExpr *) linitial(funcexprs);
+	ListCell *lc;
 
-	if (list_length(funcexprs) <= 0)
+	if (allow_out_parameter_const)
 		return;
 
-	if (!IsA(func, FuncExpr))
-		return;
-
-	if (!FUNC_EXPR_FROM_PG_PROC(func->function_from))
-		return;
+	foreach (lc, funcexprs)
+	{
+		FuncExpr *func = (FuncExpr *) lfirst(lc);
+		int			i;
+		ListCell 	*lc1;
+		Oid 	   *argtypes = NULL;
+		char	  **argnames = NULL;
+		char	   *argmodes= NULL;
+		HeapTuple		procTup = NULL;
+		char *proname = NULL;
 
-	procTup = SearchSysCache1(PROCOID,
-					ObjectIdGetDatum(func->funcid));
+		if (!IsA(func, FuncExpr))
+			return;
 
-	if (!HeapTupleIsValid(procTup))
-		ereport(ERROR,
-			(errcode(ERRCODE_DATA_EXCEPTION),
-			 errmsg("cache lookup failed for function %u", func->funcid)));
+		if (FUNC_EXPR_FROM_PG_PROC(func->function_from))
+		{
+			Form_pg_proc	procStruct;
+		
+			procTup = SearchSysCache1(PROCOID, ObjectIdGetDatum(func->funcid));
 
-	procStruct = (Form_pg_proc) GETSTRUCT(procTup);
+			if (!HeapTupleIsValid(procTup))
+				ereport(ERROR,
+					(errcode(ERRCODE_DATA_EXCEPTION),
+					 errmsg("cache lookup failed for function %u", func->funcid)));
 
-	if (LANG_PLISQL_OID != procStruct->prolang)
-	{
-		ReleaseSysCache(procTup);
-		return;
-	}
+			procStruct = (Form_pg_proc) GETSTRUCT(procTup);
 
-	if (!heap_attisnull(procTup, Anum_pg_proc_proargmodes, NULL) &&
-		!allow_out_parameter_const)
-	{
-		int		i;
-		ListCell 	*lc;
-		Oid 	   *argtypes;
-		char	  **argnames;
-		char	   *argmodes;
+			if (LANG_PLISQL_OID != procStruct->prolang)
+			{
+				ReleaseSysCache(procTup);
+				continue;
+			}
 
-		proname = pstrdup(NameStr(procStruct->proname));
-		get_func_arg_info(procTup, &argtypes, &argnames, &argmodes);
+			proname = pstrdup(NameStr(procStruct->proname));
+			get_func_arg_info(procTup, &argtypes, &argnames, &argmodes);
+			ReleaseSysCache(procTup);
 
+			if (argmodes == NULL)
+				continue;
+		}
+		else 
+		{
+			get_subproc_arg_info(func, &argtypes,
+										&argnames, &argmodes);
+			proname = get_internal_function_name(func);
+		}
 		i = 0;
-		foreach(lc, func->args)
+
+		foreach(lc1, func->args)
 		{
+
 			if (argmodes[i] == PROARGMODE_OUT ||
 				argmodes[i] == PROARGMODE_INOUT)
 			{
-				Node *arg = (Node *) lfirst(lc);
+				Node *arg = (Node *) lfirst(lc1);
 
 				arg = ParseParamVariable(arg);
 				if (!IsA(arg, Param))
 				{
-					ReleaseSysCache(procTup);
 					ereport(ERROR,
 						(errcode(ERRCODE_DATA_EXCEPTION),
-						errmsg("OUT or IN OUT arguments of the function %s must be variables ",
+						errmsg("OUT or IN OUT arguments of the function %s must be variables.",
 								proname)));
 				}
 			}
 			i++;
 		}
 	}
-	ReleaseSysCache(procTup);
-
-	return;
 }
 
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 204b4f348d5..4d24069ad3f 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c
index 9675d19aa2d..2de3f303d38 100644
--- a/src/backend/parser/parse_collate.c
+++ b/src/backend/parser/parse_collate.c
@@ -31,7 +31,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 536bf97ee42..2fede43c0ff 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -104,7 +104,8 @@ static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func);
 static void transformJsonPassingArgs(ParseState *pstate, const char *constructName,
 									 JsonFormatType format, List *args,
 									 List **passing_values, List **passing_names);
-static JsonBehavior *transformJsonBehavior(ParseState *pstate, JsonBehavior *behavior,
+static JsonBehavior *transformJsonBehavior(ParseState *pstate, JsonExpr *jsexpr,
+										   JsonBehavior *behavior,
 										   JsonBehaviorType default_behavior,
 										   JsonReturning *returning);
 static Node *GetJsonBehaviorConst(JsonBehaviorType btype, int location);
@@ -1292,6 +1293,7 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 	List	   *rnonvars;
 	bool		useOr;
 	ListCell   *l;
+	bool		has_rvars = false;
 
 	/*
 	 * If the operator is <>, combine with AND not OR.
@@ -1320,7 +1322,10 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 
 		rexprs = lappend(rexprs, rexpr);
 		if (contain_vars_of_level(rexpr, 0))
+		{
 			rvars = lappend(rvars, rexpr);
+			has_rvars = true;
+		}
 		else
 			rnonvars = lappend(rnonvars, rexpr);
 	}
@@ -1385,10 +1390,15 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 			newa->element_typeid = scalar_type;
 			newa->elements = aexprs;
 			newa->multidims = false;
-			newa->list_start = a->rexpr_list_start;
-			newa->list_end = a->rexpr_list_end;
 			newa->location = -1;
 
+			/*
+			 * If the IN expression contains Vars, disable query jumbling
+			 * squashing.  Vars cannot be safely jumbled.
+			 */
+			newa->list_start = has_rvars ? -1 : a->rexpr_list_start;
+			newa->list_end = has_rvars ? -1 : a->rexpr_list_end;
+
 			result = (Node *) make_scalar_array_op(pstate,
 												   a->name,
 												   useOr,
@@ -4867,6 +4877,9 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 {
 	JsonExpr   *jsexpr;
 	Node	   *path_spec;
+	Oid			pathspec_type;
+	int			pathspec_loc;
+	Node	   *coerced_path_spec;
 	const char *func_name = NULL;
 	JsonFormatType default_format;
 
@@ -5082,17 +5095,21 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 	jsexpr->format = func->context_item->format;
 
 	path_spec = transformExprRecurse(pstate, func->pathspec);
-	path_spec = coerce_to_target_type(pstate, path_spec, exprType(path_spec),
-									  JSONPATHOID, -1,
-									  COERCION_EXPLICIT, COERCE_IMPLICIT_CAST,
-									  exprLocation(path_spec));
-	if (path_spec == NULL)
+	pathspec_type = exprType(path_spec);
+	pathspec_loc = exprLocation(path_spec);
+	coerced_path_spec = coerce_to_target_type(pstate, path_spec,
+											  pathspec_type,
+											  JSONPATHOID, -1,
+											  COERCION_EXPLICIT,
+											  COERCE_IMPLICIT_CAST,
+											  pathspec_loc);
+	if (coerced_path_spec == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("JSON path expression must be of type %s, not of type %s",
-						"jsonpath", format_type_be(exprType(path_spec))),
-				 parser_errposition(pstate, exprLocation(path_spec))));
-	jsexpr->path_spec = path_spec;
+						"jsonpath", format_type_be(pathspec_type)),
+				 parser_errposition(pstate, pathspec_loc)));
+	jsexpr->path_spec = coerced_path_spec;
 
 	/* Transform and coerce the PASSING arguments to jsonb. */
 	transformJsonPassingArgs(pstate, func_name,
@@ -5112,13 +5129,16 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 			{
 				jsexpr->returning->typid = BOOLOID;
 				jsexpr->returning->typmod = -1;
+				jsexpr->collation = InvalidOid;
 			}
 
 			/* JSON_TABLE() COLUMNS can specify a non-boolean type. */
 			if (jsexpr->returning->typid != BOOLOID)
 				jsexpr->use_json_coercion = true;
 
-			jsexpr->on_error = transformJsonBehavior(pstate, func->on_error,
+			jsexpr->on_error = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_error,
 													 JSON_BEHAVIOR_FALSE,
 													 jsexpr->returning);
 			break;
@@ -5133,6 +5153,8 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 				ret->typmod = -1;
 			}
 
+			jsexpr->collation = get_typcollation(jsexpr->returning->typid);
+
 			/*
 			 * Keep quotes on scalar strings by default, omitting them only if
 			 * OMIT QUOTES is specified.
@@ -5149,11 +5171,15 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 				jsexpr->use_json_coercion = true;
 
 			/* Assume NULL ON EMPTY when ON EMPTY is not specified. */
-			jsexpr->on_empty = transformJsonBehavior(pstate, func->on_empty,
+			jsexpr->on_empty = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_empty,
 													 JSON_BEHAVIOR_NULL,
 													 jsexpr->returning);
 			/* Assume NULL ON ERROR when ON ERROR is not specified. */
-			jsexpr->on_error = transformJsonBehavior(pstate, func->on_error,
+			jsexpr->on_error = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_error,
 													 JSON_BEHAVIOR_NULL,
 													 jsexpr->returning);
 			break;
@@ -5165,6 +5191,7 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 				jsexpr->returning->typid = TEXTOID;
 				jsexpr->returning->typmod = -1;
 			}
+			jsexpr->collation = get_typcollation(jsexpr->returning->typid);
 
 			/*
 			 * Override whatever transformJsonOutput() set these to, which
@@ -5190,11 +5217,15 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 			}
 
 			/* Assume NULL ON EMPTY when ON EMPTY is not specified. */
-			jsexpr->on_empty = transformJsonBehavior(pstate, func->on_empty,
+			jsexpr->on_empty = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_empty,
 													 JSON_BEHAVIOR_NULL,
 													 jsexpr->returning);
 			/* Assume NULL ON ERROR when ON ERROR is not specified. */
-			jsexpr->on_error = transformJsonBehavior(pstate, func->on_error,
+			jsexpr->on_error = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_error,
 													 JSON_BEHAVIOR_NULL,
 													 jsexpr->returning);
 			break;
@@ -5205,6 +5236,7 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 				jsexpr->returning->typid = exprType(jsexpr->formatted_expr);
 				jsexpr->returning->typmod = -1;
 			}
+			jsexpr->collation = get_typcollation(jsexpr->returning->typid);
 
 			/*
 			 * Assume EMPTY ARRAY ON ERROR when ON ERROR is not specified.
@@ -5212,7 +5244,9 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 			 * ON EMPTY cannot be specified at the top level but it can be for
 			 * the individual columns.
 			 */
-			jsexpr->on_error = transformJsonBehavior(pstate, func->on_error,
+			jsexpr->on_error = transformJsonBehavior(pstate,
+													 jsexpr,
+													 func->on_error,
 													 JSON_BEHAVIOR_EMPTY_ARRAY,
 													 jsexpr->returning);
 			break;
@@ -5288,7 +5322,8 @@ ValidJsonBehaviorDefaultExpr(Node *expr, void *context)
  * Transform a JSON BEHAVIOR clause.
  */
 static JsonBehavior *
-transformJsonBehavior(ParseState *pstate, JsonBehavior *behavior,
+transformJsonBehavior(ParseState *pstate, JsonExpr *jsexpr,
+					  JsonBehavior *behavior,
 					  JsonBehaviorType default_behavior,
 					  JsonReturning *returning)
 {
@@ -5303,7 +5338,11 @@ transformJsonBehavior(ParseState *pstate, JsonBehavior *behavior,
 		location = behavior->location;
 		if (btype == JSON_BEHAVIOR_DEFAULT)
 		{
+			Oid			targetcoll = jsexpr->collation;
+			Oid			exprcoll;
+
 			expr = transformExprRecurse(pstate, behavior->expr);
+
 			if (!ValidJsonBehaviorDefaultExpr(expr, NULL))
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -5319,6 +5358,24 @@ transformJsonBehavior(ParseState *pstate, JsonBehavior *behavior,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
 						 errmsg("DEFAULT expression must not return a set"),
 						 parser_errposition(pstate, exprLocation(expr))));
+
+			/*
+			 * Reject a DEFAULT expression whose collation differs from the
+			 * enclosing JSON expression's result collation
+			 * (jsexpr->collation), as chosen by the RETURNING clause.
+			 */
+			exprcoll = exprCollation(expr);
+			if (!OidIsValid(exprcoll))
+				exprcoll = get_typcollation(exprType(expr));
+			if (OidIsValid(targetcoll) && OidIsValid(exprcoll) &&
+				targetcoll != exprcoll)
+				ereport(ERROR,
+						errcode(ERRCODE_COLLATION_MISMATCH),
+						errmsg("collation of DEFAULT expression conflicts with RETURNING clause"),
+						errdetail("\"%s\" versus \"%s\"",
+								  get_collation_name(exprcoll),
+								  get_collation_name(targetcoll)),
+						parser_errposition(pstate, exprLocation(expr)));
 		}
 	}
 
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 12f17783b40..4bf373aa6b1 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -125,9 +125,16 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 	char		aggkind = 0;
 	ParseCallbackState pcbstate;
 
-	char function_from = FUNC_FROM_PG_PROC;
-	void *pfunc = NULL;
-	Oid pkgoid = InvalidOid;
+	/*
+	 * Routine origin and handle bookkeeping: - function_from starts as the
+	 * catalog path (pg_proc) and may be updated later if the name resolves to
+	 * a package or subprocedure. - pfunc is a placeholder for an
+	 * engine-specific routine pointer; it remains NULL until a non-pg_proc
+	 * target is identified.
+	 */
+	char		function_from = FUNC_FROM_PG_PROC;
+	void	   *pfunc = NULL;
+	Oid			pkgoid = InvalidOid;
 
 
 	/*
@@ -168,28 +175,29 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 	{
 		Node	   *arg = lfirst(l);
 		Oid			argtype = exprType(arg);
-		bool 		leftCall = false;
-		bool 		argout = false;
-		bool 		argin  = true;
+		bool		leftCall = false;
+		bool		argout = false;
+		bool		argin = true;
 
 		/*
 		 * Oid is 32 bit, the 32nd-30nd bit is used for special purpose.
 		 * 32nd bit means that it is '{? = call function/proc}' .
-		 * 31nd bit means that the function or procedure parameter mode is OUT.
-		 * 30nd bit means that the function or procedure parameter mode is IN.
-		 * 29nd-1nd bit used for the function or procedure parameter type OID.
+		 * 31st bit means that the function or procedure parameter mode is OUT.
+		 * 30th bit means that the function or procedure parameter mode is IN.
+		 * 29th-1st bit used for the function or procedure parameter type OID.
+		 * bit used for the function or procedure parameter type OID.
 		 */
 		if (IsA(arg, Param) &&
 			pstate->p_ref_hook_state &&
 			pstate->p_isVarParamState)
 		{
 			ParseVarParamState(pstate->p_ref_hook_state, arg,
-							&argout, &argin, &leftCall);
+							   &argout, &argin, &leftCall);
 		}
 
 		/*
-		 * If it is called by jdbc, drop the first argument in the parameter list.
-		 * As the first argument is the result.
+		 * If it is called by jdbc, drop the first argument in the parameter
+		 * list. As the first argument is the result.
 		 */
 		if (leftCall)
 		{
@@ -306,26 +314,26 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 	if (pstate->p_subprocfunc_hook != NULL)
 	{
 		fdresult = pstate->p_subprocfunc_hook(pstate, funcname, &fargs, argnames, nargs,
-											actual_arg_types,
-											!func_variadic, true, proc_call,
-											&funcid, &rettype, &retset,
-											&nvargs, &vatype,
-											&declared_arg_types, &argdefaults, &pfunc);
+											  actual_arg_types,
+											  !func_variadic, true, proc_call,
+											  &funcid, &rettype, &retset,
+											  &nvargs, &vatype,
+											  &declared_arg_types, &argdefaults, &pfunc);
 		if (fdresult != FUNCDETAIL_NOTFOUND)
 			function_from = FUNC_FROM_SUBPROCFUNC;
 		else if (list_length(funcname) == 1)
 		{
 			/* lookup standard package func */
-			List *new_funcname = lcons(makeString("standard"), copyObject(funcname));
+			List	   *new_funcname = lcons(makeString("standard"), copyObject(funcname));
 
 			fdresult = LookupPkgFunc(pstate, new_funcname, &fargs, argnames, nargs,
-											actual_arg_types,
-											!func_variadic, true, proc_call,
-											&funcid, &rettype, &retset,
-											&nvargs, &vatype,
-											&declared_arg_types, &argdefaults,
-											&pfunc, &pkgoid,
-											true);
+									 actual_arg_types,
+									 !func_variadic, true, proc_call,
+									 &funcid, &rettype, &retset,
+									 &nvargs, &vatype,
+									 &declared_arg_types, &argdefaults,
+									 &pfunc, &pkgoid,
+									 true);
 			list_free(new_funcname);
 			if (fdresult != FUNCDETAIL_NOTFOUND)
 				function_from = FUNC_FROM_PACKAGE;
@@ -334,27 +342,55 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 	if (fdresult == FUNCDETAIL_NOTFOUND)
 	{
 		fdresult = LookupPkgFunc(pstate, funcname, &fargs, argnames, nargs,
-											actual_arg_types,
-											!func_variadic, true, proc_call,
-											&funcid, &rettype, &retset,
-											&nvargs, &vatype,
-											&declared_arg_types, &argdefaults,
-											&pfunc, &pkgoid,
-											false);
+								 actual_arg_types,
+								 !func_variadic, true, proc_call,
+								 &funcid, &rettype, &retset,
+								 &nvargs, &vatype,
+								 &declared_arg_types, &argdefaults,
+								 &pfunc, &pkgoid,
+								 false);
 		if (fdresult != FUNCDETAIL_NOTFOUND)
 			function_from = FUNC_FROM_PACKAGE;
 	}
 
 	if (fdresult == FUNCDETAIL_NOTFOUND)
 		fdresult = func_get_detail(funcname, fargs, argnames, nargs,
-							   actual_arg_types,
-							   !func_variadic, true, proc_call,
-							   &funcid, &rettype, &retset,
-							   &nvargs, &vatype,
-							   &declared_arg_types, &argdefaults);
+								   actual_arg_types,
+								   !func_variadic, true, proc_call,
+								   &funcid, &rettype, &retset,
+								   &nvargs, &vatype,
+								   &declared_arg_types, &argdefaults);
 
 	cancel_parser_errposition_callback(&pcbstate);
 
+	/*
+	 * If we found a package function/procedure or subprocedure, the fargs
+	 * list may have been reordered and expanded with default arguments. We
+	 * need to rebuild the actual_arg_types array to match the new argument
+	 * order, otherwise type coercion will fail when trying to match reordered
+	 * arguments.
+	 *
+	 * For subprocedures, the fix in pl_subproc_function.c also rebuilds
+	 * true_typeids (declared_arg_types) in declared order after reordering,
+	 * so that both arrays match the reordered fargs.
+	 */
+	if ((function_from == FUNC_FROM_PACKAGE ||
+		 function_from == FUNC_FROM_SUBPROCFUNC) &&
+		fdresult != FUNCDETAIL_NOTFOUND)
+	{
+		ListCell   *lc;
+		int			i = 0;
+
+		foreach(lc, fargs)
+		{
+			Node	   *arg = lfirst(lc);
+
+			actual_arg_types[i++] = exprType(arg);
+		}
+		/* Update nargs to reflect the reordered/expanded argument list */
+		nargs = i;
+	}
+
 	/*
 	 * Check for various wrong-kind-of-routine cases.
 	 */
@@ -374,16 +410,16 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 				 errhint("To call a function, use SELECT."),
 				 parser_errposition(pstate, location)));
 
-	/*  If this is a CALL func with setof by JDBC, reject it */
+	/* If this is a CALL func with setof by JDBC, reject it */
 	if (proc_call && retset && fdresult == FUNCDETAIL_NORMAL)
 		ereport(ERROR,
-			(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			 errmsg("can't call %s with return sets",
-					func_signature_string(funcname, nargs,
-										  argnames,
-										  actual_arg_types)),
-			 errhint("To call a function, use SELECT."),
-			 parser_errposition(pstate, location)));
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("can't call %s with return sets",
+						func_signature_string(funcname, nargs,
+											  argnames,
+											  actual_arg_types)),
+				 errhint("To call a function, use SELECT."),
+				 parser_errposition(pstate, location)));
 
 	/* Conversely, if not a CALL, reject procedures */
 	if (fdresult == FUNCDETAIL_PROCEDURE && !proc_call)
@@ -451,7 +487,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		if (ORA_PARSER == compatible_db)
 		{
 			HeapTuple	tup;
-			Form_pg_proc 	procstruct;
+			Form_pg_proc procstruct;
 
 			tup = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
 
@@ -462,15 +498,15 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 				if (procstruct->prolang == LANG_PLISQL_OID &&
 					procstruct->prostatus == PROSTATUS_INVALID &&
 					(procstruct->prokind == PROKIND_FUNCTION ||
-					procstruct->prokind == PROKIND_PROCEDURE))
+					 procstruct->prokind == PROKIND_PROCEDURE))
 				{
 					ReleaseSysCache(tup);
 
 					ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("%s %s is in invalid state",
-							(procstruct->prokind == PROKIND_FUNCTION) ? "function" : "procedure",
-								NameStr(procstruct->proname))));
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("%s %s is in invalid state",
+									(procstruct->prokind == PROKIND_FUNCTION) ? "function" : "procedure",
+									NameStr(procstruct->proname))));
 				}
 
 				ReleaseSysCache(tup);
@@ -887,8 +923,8 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 			if (list_length(funcname) == 2)
 			{
 				/* add pkg namespace */
-				List *pkg_funcname = (List *) copyObject(funcname);
-				char *pkgschema = get_namespace_name(get_package_namespace(pkgoid));
+				List	   *pkg_funcname = (List *) copyObject(funcname);
+				char	   *pkgschema = get_namespace_name(get_package_namespace(pkgoid));
 
 				pkg_funcname = lcons(makeString(pkgschema), pkg_funcname);
 				funcexpr->function_name = nodeToString(pkg_funcname);
@@ -899,22 +935,22 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		}
 		else if (function_from == FUNC_FROM_PG_PROC)
 		{
-			char **p_argtypeNames = NULL;
-			char *rettypeName = NULL;
-			HeapTuple procTup;
+			char	  **p_argtypeNames = NULL;
+			char	   *rettypeName = NULL;
+			HeapTuple	procTup;
 
 			procTup = SearchSysCache1(PROCOID,
-							   ObjectIdGetDatum(funcid));
-			if (!HeapTupleIsValid(procTup))	/* should not happen */
+									  ObjectIdGetDatum(funcid));
+			if (!HeapTupleIsValid(procTup)) /* should not happen */
 				elog(ERROR, "cache lookup failed for function %u", funcid);
 
 			get_func_typename_info(procTup, &p_argtypeNames, &rettypeName);
 			if (p_argtypeNames != NULL || rettypeName != NULL)
 			{
-				bool rettyp_ref_pkgtype = false;
-				bool argtype_ref_pkgtype = false;
-				PkgType 	*pkgtype;
-				TypeName	*tname;
+				bool		rettyp_ref_pkgtype = false;
+				bool		argtype_ref_pkgtype = false;
+				PkgType    *pkgtype;
+				TypeName   *tname;
 
 				if (p_argtypeNames != NULL && strcmp(*p_argtypeNames, "") != 0)
 				{
@@ -1362,15 +1398,15 @@ func_select_candidate(int nargs,
 	{
 		/*
 		 *
-		 * There are more than one candidates, then check those namespace.
-		 * If they are not in the same namespace, then return the one in
-		 * the frontest namespace.
+		 * There are more than one candidates, then check those namespace. If
+		 * they are not in the same namespace, then return the one in the
+		 * frontest namespace.
 		 */
 		if (PG_PARSER == compatible_db)
-			return NULL;			/* failed to select a best candidate */
+			return NULL;		/* failed to select a best candidate */
 		else
 		{
-			int times;
+			int			times;
 
 			candidate = first_candidate;
 			times = 1;
@@ -1589,7 +1625,7 @@ func_select_candidate(int nargs,
 			else if (ncandidates > 1)
 			{
 				if (PG_PARSER == compatible_db)
-					return NULL;			/* failed to select a best candidate */
+					return NULL;	/* failed to select a best candidate */
 				else
 				{
 					candidate = first_candidate;
@@ -1880,8 +1916,8 @@ func_get_detail(List *funcname,
 		if (PG_PARSER == compatible_db &&
 			pform->prolang == LANG_PLISQL_OID)
 			ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("when ivorysql.compatible_mode is pg, can't execute a plisql procedural-language function")));
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("when ivorysql.compatible_mode is pg, can't execute a plisql procedural-language function")));
 
 		*rettype = pform->prorettype;
 		/* return a package.xxx */
@@ -2475,9 +2511,9 @@ LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func, bool missing_ok)
 	ListCell   *args_item;
 	Oid			oid;
 	FuncLookupError lookupError;
-	Oid 		raw_argoids[FUNC_MAX_ARGS];
-	int 		raw_argcount = list_length(func->objargs);
-	int 		j = 0;
+	Oid			raw_argoids[FUNC_MAX_ARGS];
+	int			raw_argcount = list_length(func->objargs);
+	int			j = 0;
 
 
 	Assert(objtype == OBJECT_AGGREGATE ||
@@ -2527,7 +2563,7 @@ LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func, bool missing_ok)
 				return InvalidOid;
 
 			j++;
-			
+
 			continue;
 		}
 
@@ -2565,8 +2601,8 @@ LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func, bool missing_ok)
 	{
 		nargs = func->args_unspecified ? -1 : raw_argcount;
 		oid = LookupFuncNameInternal(func->args_unspecified ? objtype : OBJECT_ROUTINE,
-									func->objname, nargs, raw_argoids,
-									false, missing_ok, &lookupError);
+									 func->objname, nargs, raw_argoids,
+									 false, missing_ok, &lookupError);
 	}
 
 	/*
@@ -2977,4 +3013,3 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location)
 						ParseExprKindName(pstate->p_expr_kind)),
 				 parser_errposition(pstate, location)));
 }
-
diff --git a/src/backend/parser/parse_merge.c b/src/backend/parser/parse_merge.c
index 40c9979e47a..018cda3d8be 100644
--- a/src/backend/parser/parse_merge.c
+++ b/src/backend/parser/parse_merge.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 24069132013..fd2a0daf8ee 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 955b06b22df..6777c5b0dd8 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_package.c b/src/backend/parser/parse_package.c
index ad0373514d1..f6e82960c78 100644
--- a/src/backend/parser/parse_package.c
+++ b/src/backend/parser/parse_package.c
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package parser
  *
  *
- * Portions Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/parser/parse_package.c
diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c
index d5cf359dad3..33e5772cd9b 100644
--- a/src/backend/parser/parse_param.c
+++ b/src/backend/parser/parse_param.c
@@ -71,8 +71,8 @@ typedef struct OraParamNumbers
 	struct OraParamNumbers* prev;
 }OraParamNumbers;
 
-OraParamNumbers *TopOraParamNode = NULL;
-OraParamNumbers *CurrentOraParamNode = NULL;
+static OraParamNumbers *TopOraParamNode = NULL;
+static OraParamNumbers *CurrentOraParamNode = NULL;
 
 /*
  * dynamic sql stmt parse information
@@ -90,6 +90,7 @@ static bool			IsParseDynDoStmt = true;
 static bool			HasPgParam = false;
 static bool			DoStmtCheckVar = false;
 static bool			IsBindByName = false;
+static bool			IsDynCallStmt = false;
 
 /*
  * store the OraParam name and position
@@ -575,6 +576,7 @@ push_oraparam_stack(void)
 		IsParseDynDoStmt = true;
 		HasPgParam = false;
 		DoStmtCheckVar = false;
+		IsDynCallStmt = false;
 		new->level = 1;
 	}
 	else
@@ -657,8 +659,14 @@ calculate_oraparamnumber(const char* name)
 		 for (i = 0; i < CurrentOraParamNode->param_count; ++i)
 		 {
 			 if (strcmp(CurrentOraParamNode->params[i].name, name) == 0)
-			 {			 
-				 return CurrentOraParamNode->params[i].number;
+			 {
+				/* ORA-06578: output parameter cannot be a duplicate bind */
+			 	if (IsDynCallStmt)
+					ereport(ERROR,
+							(errcode(ERRCODE_AMBIGUOUS_PARAMETER),
+							 errmsg("output parameter cannot be a duplicate bind")));
+				else
+					return CurrentOraParamNode->params[i].number;
 			 }
 		 }
 	 }
@@ -689,6 +697,15 @@ calculate_oraparamnumbers(List *parsetree_list)
 	{
 		Node *parsetree = (Node *)lfirst(parsetree_item);
 
+		if (nodeTag(parsetree) == T_RawStmt &&
+			nodeTag(((RawStmt *)parsetree)->stmt) == T_CallStmt &&
+			CurrentOraParamNode &&
+			CurrentOraParamNode->param_count == 0)
+			setdynamic_callparser(true);
+		else
+			/* In any case, it should't affect other statements in the list */
+			setdynamic_callparser(false);
+
 		if (calculate_oraparamnumbers_walker(parsetree, NULL) == true)
 			return true;
 	}
@@ -2491,6 +2508,16 @@ raw_calculate_oraparamnumbers_walker(Node *node,
 				return true;
 		}
 			break;
+		case T_CallStmt:
+			{
+				CallStmt *callstmt = (CallStmt *)node;
+
+				if (walker(callstmt->funccall, context))
+					return true;
+				if (walker(callstmt->hostvariable, context))
+					return true;
+			}
+			break;
 
 		default:		
 			break;
@@ -2584,6 +2611,15 @@ get_bindByName(void)
 	return IsBindByName;
 }
 
+/*
+ * set dynamic CallStmt parser status
+ */
+void
+setdynamic_callparser(bool value)
+{
+	IsDynCallStmt = value;
+}
+
 int
 calculate_oraparamname_position(Node *parsetree, char ***paramnames)
 {
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 8b42bca3ea7..ea60e2a7ae1 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -1276,7 +1276,7 @@ chooseScalarFunctionAlias(Node *funcexpr, char *funcname,
 
 	/*
 	 * If the expression is a simple function call, and the function has a
-	 * single OUT parameter that is named, use the parameter's name.
+	 * single named OUT parameter, use the parameter's name.
 	 */
 	if (funcexpr && IsA(funcexpr, FuncExpr))
 	{
@@ -1344,9 +1344,10 @@ buildNSItemFromTupleDesc(RangeTblEntry *rte, Index rtindex,
 		nscolumns[varattno].p_varcollid = attr->attcollation;
 		nscolumns[varattno].p_varnosyn = rtindex;
 		nscolumns[varattno].p_varattnosyn = varattno + 1;
+
 		/*
-		 * For an invisible column, the entry will not
-		 * be included in star expansion.
+		 * For an invisible column, the entry will not be included in star
+		 * expansion.
 		 */
 		if (attr->attisinvisible)
 			nscolumns[varattno].p_dontexpand = true;
@@ -1529,17 +1530,20 @@ addRangeTableEntry(ParseState *pstate,
 	 * to a rel in a statement, we must open the rel with the proper lockmode.
 	 */
 	rel = parserOpenTable(pstate, relation, lockmode);
+
 	/*
-	 * The force view is compiled at this point. Although performing compilation here may not be ideal,
-	 * since it is a DDL operation, Oracle's SELECT statements will recursively compile force views.
-	 * For now, we handle the compilation in this location as a temporary solution.
+	 * The force view is compiled at this point. Although performing
+	 * compilation here may not be ideal, since it is a DDL operation,
+	 * Oracle's SELECT statements will recursively compile force views. For
+	 * now, we handle the compilation in this location as a temporary
+	 * solution.
 	 */
 	if (ORA_PARSER == compatible_db && rel_is_force_view(RelationGetRelid(rel)))
 	{
-		bool	compile_res;
-		char	*nspname;
-		char	*viewname;
-		Oid		viewoid;
+		bool		compile_res;
+		char	   *nspname;
+		char	   *viewname;
+		Oid			viewoid;
 
 		viewoid = RelationGetRelid(rel);
 		nspname = get_namespace_name(RelationGetNamespace(rel));
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 26c10270fdb..a606170d747 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 41ca7028e0b..dc8118e48a9 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index eb1b7c7de1f..433e0ba1112 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -14,7 +14,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *	src/backend/parser/parse_utilcmd.c
  *
@@ -68,7 +68,7 @@
 #include "utils/ruleutils.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
-#include <math.h> 
+#include <math.h>
 #include "utils/guc.h"
 #include "utils/ora_compatible.h"
 
@@ -280,10 +280,12 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	if (cxt.inhRelations)
 	{
 		ListCell   *inher;
+
 		foreach(inher, cxt.inhRelations)
 		{
 			RangeVar   *inh = lfirst_node(RangeVar, inher);
 			Relation	prel;
+
 			prel = table_openrv(inh, AccessShareLock);
 			cxt.hasrowid = cxt.hasrowid || prel->rd_rel->relhasrowid;
 			table_close(prel, NoLock);
@@ -302,7 +304,8 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 		{
 			case T_ColumnDef:
 				{
-					ColumnDef *col = (ColumnDef *) element;
+					ColumnDef  *col = (ColumnDef *) element;
+
 					if (compatible_db == ORA_PARSER && strcmp(col->colname, "rowid") == 0)
 						elog(ERROR, "column name \"%s\" conflicts with a system column name", col->colname);
 					else
@@ -331,13 +334,14 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	 */
 	foreach(elements, cxt.columns)
 	{
-		ColumnDef          *element = lfirst(elements);
-		if(element->identity == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL ||
-				element->identity == ATTRIBUTE_ORA_IDENTITY_ALWAYS ||
-					element->identity == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
+		ColumnDef  *element = lfirst(elements);
+
+		if (element->identity == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL ||
+			element->identity == ATTRIBUTE_ORA_IDENTITY_ALWAYS ||
+			element->identity == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
 			ora_identity_cnt++;
 	}
-	if(ora_identity_cnt > 1)
+	if (ora_identity_cnt > 1)
 		elog(ERROR, "table can have only one identity column");
 
 	if (like_found && cxt.hasrowid)
@@ -348,7 +352,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 
 	if (cxt.hasrowid)
 	{
-		Oid	   snamespaceid;
+		Oid			snamespaceid;
 		char	   *snamespace;
 		char	   *sname;
 
@@ -368,28 +372,29 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 								   false);
 
 		/*
-		 * Build a CREATE SEQUENCE command to create the sequence object,
-		 * and add it to the list of things to be done before this CREATE/ALTER TABLE
+		 * Build a CREATE SEQUENCE command to create the sequence object, and
+		 * add it to the list of things to be done before this CREATE/ALTER
+		 * TABLE
 		 */
 		seqstmt = makeNode(CreateSeqStmt);
 		seqstmt->with_rowid = true;
 		seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 		seqstmt->options = lcons(makeDefElem("as",
-					 	(Node *) makeTypeNameFromOid(INT8OID, -1),
-						 -1),
-					 seqstmt->options);
+											 (Node *) makeTypeNameFromOid(INT8OID, -1),
+											 -1),
+								 seqstmt->options);
 		if (rowid_seq_cache > 1)
 		{
 			seqstmt->options = lcons(makeDefElem("cache",
-							 (Node *) makeInteger(rowid_seq_cache),
-							 -1),
-						 seqstmt->options);
+												 (Node *) makeInteger(rowid_seq_cache),
+												 -1),
+									 seqstmt->options);
 		}
 		else
 			seqstmt->options = lcons(makeDefElem("nocache",
-								 NULL,
-							 -1),
-						seqstmt->options);
+												 NULL,
+												 -1),
+									 seqstmt->options);
 
 		if (cxt.rel)
 			seqstmt->ownerId = cxt.rel->rd_rel->relowner;
@@ -397,18 +402,18 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 		cxt.blist = lappend(cxt.blist, seqstmt);
 
 		/*
-		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence as owned
-		 * by this table.
+		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence
+		 * as owned by this table.
 		 */
 		altseqstmt = makeNode(AlterSeqStmt);
 		altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 
 		relnamelist = list_make3(makeString(snamespace),
-					 makeString(cxt.relation->relname),
-					 makeString(sname));
+								 makeString(cxt.relation->relname),
+								 makeString(sname));
 
 		altseqstmt->options = list_make1(makeDefElem("owned_by",
-								 (Node *) relnamelist, -1));
+													 (Node *) relnamelist, -1));
 		cxt.alist = lappend(cxt.alist, altseqstmt);
 	}
 
@@ -971,11 +976,14 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 					ctype = typenameType(cxt->pstate, column->typeName, &typmod);
 					typeOid = ((Form_pg_type) GETSTRUCT(ctype))->oid;
 
-					/* Convert compatible identity smallint/int type column to bigint type */
+					/*
+					 * Convert compatible identity smallint/int type column to
+					 * bigint type
+					 */
 					if ((constraint->generated_when == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL
-							|| constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_ALWAYS
-								|| constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
-									&& (typeOid == INT4OID || typeOid == INT2OID))
+						 || constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_ALWAYS
+						 || constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
+						&& (typeOid == INT4OID || typeOid == INT2OID))
 					{
 						column->typeName = makeTypeName("int8");
 						typeOid = INT8OID;
@@ -1296,7 +1304,7 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 	if (relation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
 	{
 		aclresult = object_aclcheck(TypeRelationId, relation->rd_rel->reltype, GetUserId(),
-									 ACL_USAGE);
+									ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_TYPE,
 						   RelationGetRelationName(relation));
@@ -1608,7 +1616,6 @@ expandTableLikeClause(RangeVar *heapRel, TableLikeClause *table_like_clause)
 			char	   *ccname = constr->check[ccnum].ccname;
 			char	   *ccbin = constr->check[ccnum].ccbin;
 			bool		ccenforced = constr->check[ccnum].ccenforced;
-			bool		ccvalid = constr->check[ccnum].ccvalid;
 			bool		ccnoinherit = constr->check[ccnum].ccnoinherit;
 			Node	   *ccbin_node;
 			bool		found_whole_row;
@@ -1639,7 +1646,7 @@ expandTableLikeClause(RangeVar *heapRel, TableLikeClause *table_like_clause)
 			n->conname = pstrdup(ccname);
 			n->location = -1;
 			n->is_enforced = ccenforced;
-			n->initially_valid = ccvalid;
+			n->initially_valid = ccenforced;	/* sic */
 			n->is_no_inherit = ccnoinherit;
 			n->raw_expr = NULL;
 			n->cooked_expr = nodeToString(ccbin_node);
@@ -2188,7 +2195,10 @@ generateClonedIndexStmt(RangeVar *heapRel, Relation source_idx,
  * extended statistic "source_statsid", for the rel identified by heapRel and
  * heapRelid.
  *
- * Attribute numbers in expression Vars are adjusted according to attmap.
+ * stxkeys in the source statistic holds attribute numbers from the parent
+ * relation.  Those attnums, along with the attribute numbers referenced by
+ * Vars inside the expression tree, are remapped to the new relation's
+ * numbering according to attmap.
  */
 static CreateStatsStmt *
 generateClonedExtStatsStmt(RangeVar *heapRel, Oid heapRelid,
@@ -2246,7 +2256,8 @@ generateClonedExtStatsStmt(RangeVar *heapRel, Oid heapRelid,
 		StatsElem  *selem = makeNode(StatsElem);
 		AttrNumber	attnum = statsrec->stxkeys.values[i];
 
-		selem->name = get_attname(heapRelid, attnum, false);
+		selem->name =
+			get_attname(heapRelid, attmap->attnums[attnum - 1], false);
 		selem->expr = NULL;
 
 		def_names = lappend(def_names, selem);
@@ -2690,7 +2701,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 				 * mentioned above.
 				 */
 				Datum		attoptions =
-				get_attoptions(RelationGetRelid(index_rel), i + 1);
+					get_attoptions(RelationGetRelid(index_rel), i + 1);
 
 				defopclass = GetDefaultOpClass(attform->atttypid,
 											   index_rel->rd_rel->relam);
@@ -2906,7 +2917,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 
 			/*
 			 * The WITHOUT OVERLAPS part (if any) must be a range or
-			 * multirange type.
+			 * multirange type, or a domain over such a type.
 			 */
 			if (constraint->without_overlaps && lc == list_last_cell(constraint->keys))
 			{
@@ -2924,8 +2935,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 						const char *attname;
 
 						if (attr->attisdropped)
-							break;
-
+							continue;
 						attname = NameStr(attr->attname);
 						if (strcmp(attname, key) == 0)
 						{
@@ -2937,10 +2947,16 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 				}
 				if (found)
 				{
+					/* Look up column type if we didn't already */
 					if (!OidIsValid(typid) && column)
-						typid = typenameTypeId(NULL, column->typeName);
-
-					if (!OidIsValid(typid) || !(type_is_range(typid) || type_is_multirange(typid)))
+						typid = typenameTypeId(cxt->pstate,
+											   column->typeName);
+					/* Look through any domain */
+					if (OidIsValid(typid))
+						typid = getBaseType(typid);
+					/* Complain if not range/multirange */
+					if (!OidIsValid(typid) ||
+						!(type_is_range(typid) || type_is_multirange(typid)))
 						ereport(ERROR,
 								(errcode(ERRCODE_DATATYPE_MISMATCH),
 								 errmsg("column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type", key),
@@ -3765,12 +3781,12 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 
 			case AT_AddRowidsRecurse:
 				{
-					Oid 			snamespaceid;
-					char	 		*snamespace;
-					char	 		*sname;
-					List 	 		*relnamelist;
-					CreateSeqStmt 	*seqstmt;
-					AlterSeqStmt 	*altseqstmt;
+					Oid			snamespaceid;
+					char	   *snamespace;
+					char	   *sname;
+					List	   *relnamelist;
+					CreateSeqStmt *seqstmt;
+					AlterSeqStmt *altseqstmt;
 
 					if (cmd->is_rowid)
 					{
@@ -3790,26 +3806,27 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 												   false);
 
 						/*
-						 * Build a CREATE SEQUENCE command to create the sequence object,
-						 * and add it to the list of things to be done before this CREATE/ALTER TABLE
+						 * Build a CREATE SEQUENCE command to create the
+						 * sequence object, and add it to the list of things
+						 * to be done before this CREATE/ALTER TABLE
 						 */
 						seqstmt = makeNode(CreateSeqStmt);
 						seqstmt->with_rowid = true;
 						seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 						seqstmt->options = lcons(makeDefElem("as",
-									 (Node *) makeTypeNameFromOid(INT8OID, -1),
-										 -1), seqstmt->options);
+															 (Node *) makeTypeNameFromOid(INT8OID, -1),
+															 -1), seqstmt->options);
 						if (rowid_seq_cache > 1)
 						{
 							seqstmt->options = lcons(makeDefElem("cache",
-									 (Node *) makeInteger(rowid_seq_cache),
-										 -1), seqstmt->options);
+																 (Node *) makeInteger(rowid_seq_cache),
+																 -1), seqstmt->options);
 						}
 						else
 							seqstmt->options = lcons(makeDefElem("nocache",
-										 NULL,
-										 -1),
-										seqstmt->options);
+																 NULL,
+																 -1),
+													 seqstmt->options);
 
 						if (cxt.rel)
 							seqstmt->ownerId = cxt.rel->rd_rel->relowner;
@@ -3817,18 +3834,18 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 						cxt.blist = lappend(cxt.blist, seqstmt);
 
 						/*
-						 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence as owned
-						 * by this table.
+						 * Build an ALTER SEQUENCE ... OWNED BY command to
+						 * mark the sequence as owned by this table.
 						 */
 						altseqstmt = makeNode(AlterSeqStmt);
 						altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 
 						relnamelist = list_make3(makeString(snamespace),
-									 makeString(cxt.relation->relname),
-									 makeString(sname));
+												 makeString(cxt.relation->relname),
+												 makeString(sname));
 
 						altseqstmt->options = list_make1(makeDefElem("owned_by",
-										 (Node *) relnamelist, -1));
+																	 (Node *) relnamelist, -1));
 						cxt.alist = lappend(cxt.alist, altseqstmt);
 
 						newcmds = lappend(newcmds, cmd);
@@ -4659,18 +4676,20 @@ transformPartitionRangeBounds(ParseState *pstate, List *blist,
 	int			i,
 				j;
 
-	i = j = 0;
+	j = 0;
 	foreach(lc, blist)
 	{
 		Node	   *expr = lfirst(lc);
 		PartitionRangeDatum *prd = NULL;
 
+		i = foreach_current_index(lc);
+
 		/*
 		 * Infinite range bounds -- "minvalue" and "maxvalue" -- get passed in
 		 * as ColumnRefs.
 		 */
 		if (IsA(expr, ColumnRef) ||
-				IsA(expr, ColumnRefOrFuncCall))
+			IsA(expr, ColumnRefOrFuncCall))
 		{
 			ColumnRef  *cref = NULL;
 			char	   *cname = NULL;
@@ -4748,7 +4767,6 @@ transformPartitionRangeBounds(ParseState *pstate, List *blist,
 			prd = makeNode(PartitionRangeDatum);
 			prd->kind = PARTITION_RANGE_DATUM_VALUE;
 			prd->value = (Node *) value;
-			++i;
 		}
 
 		prd->location = exprLocation(expr);
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 43b995bcedf..7f65c77340d 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -12,7 +12,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/parser/parser.c
@@ -92,7 +92,7 @@ standard_raw_parser(const char *str, RawParseMode mode)
 			scanner_finish(yyscanner);
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("when ivorysql.compatible_mode is pg, not support a plisql procedural-language function statement")));
+					 errmsg("when ivorysql.compatible_mode is set to pg, any plisql procedural language function statement is not supported.")));
 		}
 
 		yyextra.have_lookahead = true;
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 22048bbae6a..a608406f677 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -56,11 +56,11 @@ downcase_identifier(const char *ident, int len, bool warn, bool truncate)
 	/*
 	 * SQL99 specifies Unicode-aware case normalization, which we don't yet
 	 * have the infrastructure for.  Instead we use tolower() to provide a
-	 * locale-aware translation.  However, there are some locales where this
-	 * is not right either (eg, Turkish may do strange things with 'i' and
-	 * 'I').  Our current compromise is to use tolower() for characters with
-	 * the high bit set, as long as they aren't part of a multi-byte
-	 * character, and use an ASCII-only downcasing for 7-bit characters.
+	 * locale-aware translation.  However, in some locales (for example, 
+	 * Turkish with 'i' and 'I') this still is not correct.  Our compromise is
+	 * to use tolower() for characters with the high bit set, as long as they
+	 * aren't part of a multi-byte character, and use an ASCII-only approach
+	 * for 7-bit characters.
 	 */
 	for (i = 0; i < len; i++)
 	{
diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.c
index 48a35f763e9..2ef98d6ad6e 100644
--- a/src/backend/partitioning/partprune.c
+++ b/src/backend/partitioning/partprune.c
@@ -49,6 +49,7 @@
 #include "optimizer/cost.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/placeholder.h"
 #include "parser/parsetree.h"
 #include "partitioning/partbounds.h"
 #include "partitioning/partprune.h"
@@ -1814,6 +1815,15 @@ gen_prune_steps_from_opexps(GeneratePruningStepsContext *context,
  *   and couldn't possibly match any other one either, due to its form or
  *   properties (such as containing a volatile function).
  *   Output arguments: none set.
+ *
+ * Note that when pulling up a subquery, the clause operands may get wrapped
+ * in PlaceHolderVars to enforce separate identity or as a result of outer
+ * joins.  We must strip such no-op PlaceHolderVars before comparing operands
+ * to the partition key, otherwise the equal() checks will fail to recognize
+ * valid matches.  This is safe because the clauses here are always
+ * relation-scan-level expressions, where a PlaceHolderVar with empty
+ * phnullingrels is effectively a no-op.  Stripping may also bring separate
+ * RelabelType nodes into adjacency, so we must loop when peeling those.
  */
 static PartClauseMatchStatus
 match_clause_to_partition_key(GeneratePruningStepsContext *context,
@@ -1929,10 +1939,12 @@ match_clause_to_partition_key(GeneratePruningStepsContext *context,
 		PartClauseInfo *partclause;
 
 		leftop = (Expr *) get_leftop(clause);
-		if (IsA(leftop, RelabelType))
+		leftop = (Expr *) strip_noop_phvs((Node *) leftop);
+		while (IsA(leftop, RelabelType))
 			leftop = ((RelabelType *) leftop)->arg;
 		rightop = (Expr *) get_rightop(clause);
-		if (IsA(rightop, RelabelType))
+		rightop = (Expr *) strip_noop_phvs((Node *) rightop);
+		while (IsA(rightop, RelabelType))
 			rightop = ((RelabelType *) rightop)->arg;
 		opno = opclause->opno;
 
@@ -2180,7 +2192,8 @@ match_clause_to_partition_key(GeneratePruningStepsContext *context,
 				   *elem_clauses;
 		ListCell   *lc1;
 
-		if (IsA(leftop, RelabelType))
+		leftop = (Expr *) strip_noop_phvs((Node *) leftop);
+		while (IsA(leftop, RelabelType))
 			leftop = ((RelabelType *) leftop)->arg;
 
 		/* check if the LHS matches this partition key */
@@ -2406,7 +2419,8 @@ match_clause_to_partition_key(GeneratePruningStepsContext *context,
 		NullTest   *nulltest = (NullTest *) clause;
 		Expr	   *arg = nulltest->arg;
 
-		if (IsA(arg, RelabelType))
+		arg = (Expr *) strip_noop_phvs((Node *) arg);
+		while (IsA(arg, RelabelType))
 			arg = ((RelabelType *) arg)->arg;
 
 		/* Does arg match with this partition key column? */
@@ -3718,7 +3732,8 @@ match_boolean_partition_clause(Oid partopfamily, Expr *clause, Expr *partkey,
 		BooleanTest *btest = (BooleanTest *) clause;
 
 		leftop = btest->arg;
-		if (IsA(leftop, RelabelType))
+		leftop = (Expr *) strip_noop_phvs((Node *) leftop);
+		while (IsA(leftop, RelabelType))
 			leftop = ((RelabelType *) leftop)->arg;
 
 		if (equal(leftop, partkey))
@@ -3755,7 +3770,8 @@ match_boolean_partition_clause(Oid partopfamily, Expr *clause, Expr *partkey,
 
 		leftop = is_not_clause ? get_notclausearg(clause) : clause;
 
-		if (IsA(leftop, RelabelType))
+		leftop = (Expr *) strip_noop_phvs((Node *) leftop);
+		while (IsA(leftop, RelabelType))
 			leftop = ((RelabelType *) leftop)->arg;
 
 		/* Compare to the partition key, and make up a clause ... */
diff --git a/src/backend/po/de.po b/src/backend/po/de.po
index 19f1a2abea0..05941cd212a 100644
--- a/src/backend/po/de.po
+++ b/src/backend/po/de.po
@@ -1,14 +1,14 @@
 # German message translation file for PostgreSQL server
-# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2024.
+# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2026.
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-06-22 13:41+0000\n"
-"PO-Revision-Date: 2024-06-24 00:19+0200\n"
+"POT-Creation-Date: 2026-05-05 12:03+0000\n"
+"PO-Revision-Date: 2026-05-06 16:05+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -18,10 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../common/binaryheap.c:121 ../common/binaryheap.c:159
-#, fuzzy, c-format
-#| msgid "out of background worker slots"
+#, c-format
 msgid "out of binary heap slots"
-msgstr "alle Slots für Background-Worker belegt"
+msgstr "alle Slots für Binary-Heaps belegt"
 
 #: ../common/compression.c:132 ../common/compression.c:141
 #: ../common/compression.c:150
@@ -81,34 +80,34 @@ msgid "not recorded"
 msgstr "nicht aufgezeichnet"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1737 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3960 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1369 access/transam/xlog.c:3471
-#: access/transam/xlog.c:4335 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5084
-#: replication/logical/snapbuild.c:2035 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1354 access/transam/xlog.c:3478
+#: access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257
+#: access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392
+#: access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3970 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2546
+#: replication/slot.c:2587 replication/walsender.c:643
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht lesen: %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3476 access/transam/xlog.c:4340
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2040 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3483 access/transam/xlog.c:4374
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2550
+#: replication/slot.c:2591 replication/walsender.c:648
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -118,18 +117,19 @@ msgstr "konnte Datei »%s« nicht lesen: %d von %zu gelesen"
 #: ../common/controldata_utils.c:277 ../common/controldata_utils.c:280
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
-#: access/transam/timeline.c:512 access/transam/twophase.c:1381
-#: access/transam/twophase.c:1793 access/transam/xlog.c:3317
-#: access/transam/xlog.c:3511 access/transam/xlog.c:3516
-#: access/transam/xlog.c:3652 access/transam/xlog.c:4305
-#: access/transam/xlog.c:5239 commands/copyfrom.c:1797 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5136
-#: replication/logical/snapbuild.c:1802 replication/logical/snapbuild.c:1926
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/timeline.c:512 access/transam/twophase.c:1366
+#: access/transam/twophase.c:1784 access/transam/xlog.c:3324
+#: access/transam/xlog.c:3518 access/transam/xlog.c:3523
+#: access/transam/xlog.c:3659 access/transam/xlog.c:4339
+#: access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828
+#: storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -154,105 +154,107 @@ msgstr ""
 "wäre inkompatibel mit diesem Datenverzeichnis."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1325 access/transam/xlog.c:3224
-#: access/transam/xlog.c:3387 access/transam/xlog.c:3426
-#: access/transam/xlog.c:3619 access/transam/xlog.c:4325
-#: access/transam/xlogrecovery.c:4263 access/transam/xlogrecovery.c:4366
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3737
-#: replication/logical/reorderbuffer.c:4291
-#: replication/logical/reorderbuffer.c:5064
-#: replication/logical/snapbuild.c:1757 replication/logical/snapbuild.c:1867
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2091
-#: utils/init/miscinit.c:1526 utils/init/miscinit.c:1660
-#: utils/init/miscinit.c:1737 utils/misc/guc.c:4727 utils/misc/guc.c:4777
+#: access/transam/twophase.c:1310 access/transam/xlog.c:3214
+#: access/transam/xlog.c:3394 access/transam/xlog.c:3433
+#: access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616
+#: replication/walsender.c:3103 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575
+#: storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht öffnen: %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1766 access/transam/twophase.c:1775
-#: access/transam/xlog.c:9210 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1757 access/transam/twophase.c:1766
+#: access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4125
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4087
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schreiben: %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1787
-#: access/transam/xlog.c:3310 access/transam/xlog.c:3505
-#: access/transam/xlog.c:4298 access/transam/xlog.c:8585
-#: access/transam/xlog.c:8630 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1795
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1329 storage/smgr/md.c:1374
-#: storage/sync/sync.c:446 utils/misc/guc.c:4480
+#: access/transam/timeline.c:506 access/transam/twophase.c:1778
+#: access/transam/xlog.c:3314 access/transam/xlog.c:3512
+#: access/transam/xlog.c:4332 access/transam/xlog.c:8726
+#: access/transam/xlog.c:8770 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820
+#: storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:853 ../common/psprintf.c:143
-#: ../common/scram-common.c:269 ../common/stringinfo.c:314 ../port/path.c:751
-#: ../port/path.c:788 ../port/path.c:805 access/transam/twophase.c:1434
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3559 postmaster/postmaster.c:4019
-#: postmaster/postmaster.c:4381 postmaster/walsummarizer.c:820
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:209 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1453
-#: storage/ipc/procarray.c:2207 storage/ipc/procarray.c:2214
-#: storage/ipc/procarray.c:2719 storage/ipc/procarray.c:3423
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:509
-#: utils/adt/pg_locale.c:673 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4458 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2459 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1419
+#: access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3557
+#: postmaster/walsummarizer.c:939
+#: replication/libpqwalreceiver/libpqwalreceiver.c:364
+#: replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447
+#: storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517
+#: utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:410 utils/mb/mbutils.c:438
+#: utils/mb/mbutils.c:823 utils/mb/mbutils.c:850 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "Erfolg"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "Zielpuffer ist zu klein"
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "OpenSSL-Fehler"
 
@@ -276,34 +278,34 @@ msgstr "konnte kein »%s« zum Ausführen finden"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "konnte Pfad »%s« nicht in absolute Form auflösen: %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1721
-#: commands/copyto.c:649 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "konnte Befehl »%s« nicht ausführen: %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "konnte nicht von Befehl »%s« lesen: %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "Befehl »%s« gab keine Daten zurück"
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1582 storage/ipc/latch.c:1744
-#: storage/ipc/latch.c:1870
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783
+#: storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203
+#: storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() fehlgeschlagen: %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:753 ../port/path.c:790
-#: ../port/path.c:807 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
@@ -313,51 +315,51 @@ msgstr "Speicher aufgebraucht\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3581
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "konnte Dateisystem für Datei »%s« nicht synchronisieren: %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1337
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1322
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1747
-#: commands/copyto.c:695 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1653 replication/logical/snapbuild.c:2156
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979
+#: commands/extension.c:3949 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "diese Installation unterstützt Sync-Methode »%s« nicht"
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1468
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1497
+#: storage/file/fd.c:2997 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3009
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1814 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:1027
+#: replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
@@ -366,288 +368,292 @@ msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2484
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Parser mit rekursivem Abstieg kann inkrementellen Lexer nicht benutzen."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2486
 msgid "Incremental parser requires incremental lexer."
 msgstr "Inkrementeller Parser benötigt inkrementellen Lexer."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2488
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON zu tief geschachtelt, maximale erlaubte Tiefe ist 6400."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2490
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Escape-Sequenz »\\%.*s« ist nicht gültig."
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2494
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Zeichen mit Wert 0x%02x muss escapt werden."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2498
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Ende der Eingabe erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2501
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Array-Element oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2504
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "»,« oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2507
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "»:« erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2510
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON-Wert erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2513
 msgid "The input string ended unexpectedly."
 msgstr "Die Eingabezeichenkette endete unerwartet."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2515
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Zeichenkette oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2518
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "»,« oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2521
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Zeichenkette erwartet, aber »%.*s« gefunden."
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2524
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Token »%.*s« ist ungültig."
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2530 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kann nicht in »text« umgewandelt werden."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2532
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "Nach »\\u« müssen vier Hexadezimalziffern folgen."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2535
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Unicode-Escape-Werte können nicht für Code-Punkt-Werte über 007F verwendet werden, wenn die Kodierung nicht UTF8 ist."
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2544
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Unicode-Escape-Wert konnte nicht in die Serverkodierung %s umgewandelt werden."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2551 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicode-High-Surrogate darf nicht auf ein High-Surrogate folgen."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2553 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicode-Low-Surrogate muss auf ein High-Surrogate folgen."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2575
+msgid "out of memory while constructing error description"
+msgstr "Speicher aufgebraucht beim Konstruieren der Fehlerbeschreibung"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "Fehler: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "Detail: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "Tipp: "
 
-#: ../common/parse_manifest.c:159 ../common/parse_manifest.c:855
+#: ../common/parse_manifest.c:159 ../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
 msgstr "konnte Prüfsumme des Manifests nicht initialisieren"
 
-#: ../common/parse_manifest.c:204 ../common/parse_manifest.c:261
+#: ../common/parse_manifest.c:203 ../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "Manifest endete unerwartet"
 
-#: ../common/parse_manifest.c:210 ../common/parse_manifest.c:862
+#: ../common/parse_manifest.c:209 ../common/parse_manifest.c:861
 #, c-format
 msgid "could not update checksum of manifest"
 msgstr "konnte Prüfsumme des Manifests nicht aktualisieren"
 
-#: ../common/parse_manifest.c:302
+#: ../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "unerwarteter Objektstart"
 
-#: ../common/parse_manifest.c:337
+#: ../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "unerwartetes Objektende"
 
-#: ../common/parse_manifest.c:366
+#: ../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "unerwarteter Array-Start"
 
-#: ../common/parse_manifest.c:391
+#: ../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "unerwartetes Array-Ende"
 
-#: ../common/parse_manifest.c:418
+#: ../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "unerwartete Versionskennzeichnung"
 
-#: ../common/parse_manifest.c:454
+#: ../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "unbekanntes Feld auf oberster Ebene"
 
-#: ../common/parse_manifest.c:473
+#: ../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "unerwartetes Feld für Datei"
 
-#: ../common/parse_manifest.c:487
+#: ../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "unerwartetes Feld für WAL-Bereich"
 
-#: ../common/parse_manifest.c:493
+#: ../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "unbekanntes Feld für Objekt"
 
-#: ../common/parse_manifest.c:583
+#: ../common/parse_manifest.c:582
 msgid "unexpected scalar"
 msgstr "unerwarteter Skalar"
 
-#: ../common/parse_manifest.c:609
+#: ../common/parse_manifest.c:608
 msgid "manifest version not an integer"
 msgstr "Manifestversion ist keine ganze Zahl"
 
-#: ../common/parse_manifest.c:613
+#: ../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "unerwartete Manifestversion"
 
-#: ../common/parse_manifest.c:637
-msgid "manifest system identifier not an integer"
+#: ../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
 msgstr "Systemidentifikator im Manifest ist keine ganze Zahl"
 
-#: ../common/parse_manifest.c:662
+#: ../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "fehlender Pfadname"
 
-#: ../common/parse_manifest.c:665
+#: ../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "sowohl Pfadname als auch kodierter Pfadname angegeben"
 
-#: ../common/parse_manifest.c:667
+#: ../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "Größenangabe fehlt"
 
-#: ../common/parse_manifest.c:670
+#: ../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "Prüfsumme ohne Algorithmus"
 
-#: ../common/parse_manifest.c:684
+#: ../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "konnte Dateinamen nicht dekodieren"
 
-#: ../common/parse_manifest.c:694
+#: ../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "Dateigröße ist keine ganze Zahl"
 
-#: ../common/parse_manifest.c:700 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "unbekannter Prüfsummenalgorithmus: »%s«"
 
-#: ../common/parse_manifest.c:719
+#: ../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "ungültige Prüfsumme für Datei »%s«: »%s«"
 
-#: ../common/parse_manifest.c:762
+#: ../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "Zeitleiste fehlt"
 
-#: ../common/parse_manifest.c:764
+#: ../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "Start-LSN fehlt"
 
-#: ../common/parse_manifest.c:766
+#: ../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "End-LSN fehlt"
 
-#: ../common/parse_manifest.c:772
+#: ../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "Zeitleiste ist keine ganze Zahl"
 
-#: ../common/parse_manifest.c:775
+#: ../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "konnte Start-LSN nicht parsen"
 
-#: ../common/parse_manifest.c:778
+#: ../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "konnte End-LSN nicht parsen"
 
-#: ../common/parse_manifest.c:843
+#: ../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "mindestens 2 Zeilen erwartet"
 
-#: ../common/parse_manifest.c:846
+#: ../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "letzte Zeile nicht durch Newline abgeschlossen"
 
-#: ../common/parse_manifest.c:865
+#: ../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "konnte Prüfsumme des Manifests nicht abschließen"
 
-#: ../common/parse_manifest.c:869
+#: ../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "Manifest hat keine Prüfsumme"
 
-#: ../common/parse_manifest.c:873
+#: ../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "ungültige Manifestprüfsumme: »%s«"
 
-#: ../common/parse_manifest.c:877
+#: ../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "Manifestprüfsumme stimmt nicht überein"
 
-#: ../common/parse_manifest.c:892
+#: ../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "konnte Backup-Manifest nicht parsen: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4662 utils/misc/guc.c:6887
-#: utils/misc/guc.c:6928
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "ungültiger Wert für Parameter »%s«: »%s«"
@@ -708,51 +714,56 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1726 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4560
-#: replication/logical/snapbuild.c:1695 replication/logical/snapbuild.c:2129
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1717 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 backup/walsummary.c:254
+#: postmaster/postmaster.c:1070 postmaster/syslogger.c:1489
+#: replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht löschen: %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3435
+#: storage/file/fd.c:3844
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht löschen: %m"
 
-#: ../common/scram-common.c:282
+#: ../common/scram-common.c:281
 msgid "could not encode salt"
 msgstr "konnte Salt nicht kodieren"
 
-#: ../common/scram-common.c:298
+#: ../common/scram-common.c:297
 msgid "could not encode stored key"
 msgstr "konnte Stored Key nicht kodieren"
 
-#: ../common/scram-common.c:315
+#: ../common/scram-common.c:314
 msgid "could not encode server key"
 msgstr "konnte Server Key nicht kodieren"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "Zeichenkettenpuffer überschreitet maximale erlaubte Länge (%zu Bytes)"
+
+#: ../common/stringinfo.c:363
 #, 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."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
 msgid ""
-"out of memory\n"
+"string buffer exceeds maximum allowed length (%zu bytes)\n"
 "\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
 msgstr ""
-"Speicher aufgebraucht\n"
+"Zeichenkettenpuffer überschreitet maximale erlaubte Länge (%zu Bytes)\n"
 "\n"
 "Kann Zeichenkettenpuffer mit %d Bytes nicht um %d Bytes vergrößern.\n"
 
@@ -761,7 +772,7 @@ msgstr ""
 msgid "could not look up effective user ID %ld: %s"
 msgstr "konnte effektive Benutzer-ID %ld nicht nachschlagen: %s"
 
-#: ../common/username.c:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "Benutzer existiert nicht"
 
@@ -800,12 +811,12 @@ msgstr "Kindprozess wurde von Signal %d beendet: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "konnte Kodierung für Codeset »%s« nicht bestimmen"
 
-#: ../port/chklocale.c:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, 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«"
@@ -830,30 +841,30 @@ msgstr "konnte Junction für »%s« nicht ermitteln: %s"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "konnte Junction für »%s« nicht ermitteln: %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "konnte Datei »%s« nicht öffnen: %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "Sperrverletzung"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "Zugriffsverletzung (Sharing Violation)"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "Versuche werden für 30 Sekunden wiederholt."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 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:775
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "konnte aktuelles Arbeitsverzeichnis nicht ermitteln: %m\n"
@@ -863,16 +874,6 @@ msgstr "konnte aktuelles Arbeitsverzeichnis nicht ermitteln: %m\n"
 msgid "operating system error %d"
 msgstr "Betriebssystemfehler %d"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "konnte lokale Benutzer-ID %d nicht nachschlagen: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "lokaler Benutzer mit ID %d existiert nicht"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -888,48 +889,50 @@ msgstr "konnte SID der PowerUsers-Gruppe nicht ermitteln: Fehlercode %lu\n"
 msgid "could not check access token membership: error code %lu\n"
 msgstr "konnte Access-Token-Mitgliedschaft nicht prüfen: Fehlercode %lu\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "Aufforderung für BRIN-Range-Summarization für Index »%s« Seite %u wurde nicht aufgezeichnet"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:936
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "Wiederherstellung läuft"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "Während der Wiederherstellung können keine BRIN-Kontrollfunktionen ausgeführt werden."
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "Blocknummer ist außerhalb des gültigen Bereichs: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "Blocknummer ist außerhalb des gültigen Bereichs: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "»%s« ist kein BRIN-Index"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "konnte Basistabelle von Index »%s« nicht öffnen"
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2252
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2458
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "Index »%s« ist nicht gültig"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -940,7 +943,7 @@ msgstr "kann keinen Wert vom Typ %s annehmen"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -956,90 +959,90 @@ msgstr "verfälschter BRIN-Index: inkonsistente Range-Map"
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "unerwarteter Seitentyp 0x%04X in BRIN-Index »%s« Block %u"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with invalid support number %d"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält Funktion %s mit ungültiger Support-Nummer %d"
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält Funktion %s mit falscher Signatur für Support-Nummer %d"
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält Operator %s mit ungültiger Strategienummer %d"
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid "operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält ungültige ORDER-BY-Angabe für Operator %s"
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with wrong signature"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält Operator %s mit falscher Signatur"
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing operator(s) for types %s and %s"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlen Operatoren für Typen %s und %s"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function(s) for types %s and %s"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlen Support-Funktionen für Typen %s und %s"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "in Operatorklasse »%s« für Zugriffsmethode %s fehlen Operatoren"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "in Operatorklasse »%s« für Zugriffsmethode %s fehlt Support-Funktion %d"
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Zurückgegebener Typ %1$s stimmt in Spalte %3$d nicht mit erwartetem Typ %2$s überein."
+msgid "Returned type %s does not match expected type %s in column \"%s\" (position %d)."
+msgstr "Zurückgegebener Typ %1$s stimmt in Spalte »%3$s« (Position %4$d) nicht mit erwartetem Typ %2$s überein."
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "Anzahl der zurückgegebenen Spalten (%d) entspricht nicht der erwarteten Spaltenanzahl (%d)."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "konnte Zeilentyp nicht umwandeln"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, c-format
 msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
 msgstr "Attribut »%s« von Typ %s stimmt nicht mit dem entsprechenden Attribut von Typ %s überein."
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "Attribut »%s« von Typ %s existiert nicht in Typ %s."
 
-#: access/common/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "Anzahl der Spalten (%d) überschreitet Maximum (%d)"
@@ -1049,96 +1052,101 @@ msgstr "Anzahl der Spalten (%d) überschreitet Maximum (%d)"
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "Anzahl der Indexspalten (%d) überschreitet Maximum (%d)"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "Indexzeile benötigt %zu Bytes, Maximalgröße ist %zu"
 
-#: access/common/printtup.c:291 commands/explain.c:5375 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1940
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1951
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "nicht unterstützter Formatcode: %d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "Gültige Werte sind »on«, »off« und »auto«."
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Gültige Werte sind »local« und »cascaded«."
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "Wertebereich des Typs für benutzerdefinierte Relationsparameter überschritten"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "RESET darf keinen Parameterwert enthalten"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "unbekannter Parameter-Namensraum »%s«"
 
-#: access/common/reloptions.c:1300 commands/variable.c:1191
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "ungültiger Optionsname »%s«: darf nicht »=« enthalten"
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "Tabellen mit WITH OIDS werden nicht unterstützt"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "unbekannter Parameter »%s«"
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "Parameter »%s« mehrmals angegeben"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "ungültiger Wert für Boole’sche Option »%s«: »%s«"
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "ungültiger Wert für ganzzahlige Option »%s«: »%s«"
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "Wert %s ist außerhalb des gültigen Bereichs für Option »%s«"
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Gültige Werte sind zwischen »%d« und »%d«."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "ungültiger Wert für Gleitkommaoption »%s«: »%s«"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Gültige Werte sind zwischen »%f« und »%f«."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "ungültiger Wert für Enum-Option »%s«: »%s«"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "für eine partitionierte Tabelle können keine Storage-Parameter angegeben werden"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "Geben Sie Storage-Parameter stattdessen für ihre Blattpartitionen an."
@@ -1183,52 +1191,53 @@ msgstr "auf temporäre Indexe anderer Sitzungen kann nicht zugegriffen werden"
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "konnte Tupel mit Index »%s« nicht erneut finden"
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1972
+#: utils/adt/arrayfuncs.c:4034 utils/adt/arrayfuncs.c:6732
+#: utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "konnte keine Vergleichsfunktion für Typ %s ermitteln"
+
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "alte GIN-Indexe unterstützen keine Scans des ganzen Index oder Suchen nach NULL-Werten"
 
-#: access/gin/ginscan.c:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Um das zu reparieren, führen Sie REINDEX INDEX \"%s\" aus."
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2191
-#: utils/adt/arrayfuncs.c:4009 utils/adt/arrayfuncs.c:6705
-#: utils/adt/rowtypes.c:974
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "konnte keine Vergleichsfunktion für Typ %s ermitteln"
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid "operator family \"%s\" of access method %s contains support function %s with different left and right input types"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält Support-Funktion %s mit unterschiedlichen linken und rechten Eingabetypen"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d or %d"
 msgstr "in Operatorklasse »%s« für Zugriffsmethode %s fehlt Support-Funktion %d oder %d"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "Support-Funktionsnummer %d ist ungültig für Zugriffsmethode %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "Index »%s« enthält ein inneres Tupel, das als ungültig markiert ist"
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "Das kommt von einem unvollständigen Page-Split bei der Crash-Recovery vor dem Upgrade auf PostgreSQL 9.1."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1236,7 +1245,7 @@ msgstr "Das kommt von einem unvollständigen Page-Split bei der Crash-Recovery v
 msgid "Please REINDEX it."
 msgstr "Bitte führen Sie REINDEX für den Index aus."
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "repariere unvollständiges Teilen in Index »%s«, Block %u"
@@ -1251,41 +1260,42 @@ msgstr "Picksplit-Methode für Spalte %d von Index »%s« fehlgeschlagen"
 msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
 msgstr "Der Index ist nicht optimal. Um ihn zu optimieren, kontaktieren Sie einen Entwickler oder versuchen Sie, die Spalte als die zweite im CREATE-INDEX-Befehl zu verwenden."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "Index »%s« enthält unerwartete Nullseite bei Block %u"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "Index »%s« enthält korrupte Seite bei Block %u"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid "operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält nicht unterstützte ORDER-BY-Angabe für Operator %s"
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid "operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode %s enthält ungültige ORDER-BY-Operatorfamilienangabe für Operator %s"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:331
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1063
+#: access/hash/hashfunc.c:280 access/hash/hashfunc.c:335
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "konnte die für das Zeichenketten-Hashing zu verwendende Sortierfolge nicht bestimmen"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:332 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:510
-#: commands/indexcmds.c:2045 commands/tablecmds.c:18071 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1064 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:281 access/hash/hashfunc.c:336 catalog/heap.c:702
+#: catalog/heap.c:708 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2092 commands/tablecmds.c:19999 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1657
+#: utils/adt/formatting.c:1721 utils/adt/formatting.c:1785
+#: utils/adt/formatting.c:1849 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1648
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Verwenden Sie die COLLATE-Klausel, um die Sortierfolge explizit zu setzen."
@@ -1296,7 +1306,7 @@ 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:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "Werte, die größer sind als eine Pufferseite, können nicht indiziert werden."
@@ -1311,7 +1321,7 @@ msgstr "ungültige Überlaufblocknummer %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "keine Überlaufseiten in Hash-Index »%s« mehr"
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "Hash-Indexe unterstützen keine Scans des ganzen Index"
@@ -1326,48 +1336,54 @@ msgstr "Index »%s« ist kein Hash-Index"
 msgid "index \"%s\" has wrong hash version"
 msgstr "Index »%s« hat falsche Hash-Version"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid "operator family \"%s\" of access method %s lacks support function for operator %s"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlt Support-Funktion für Operator %s"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlen typübergreifende Operatoren"
 
-#: access/heap/heapam.c:2194
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "in einem parallelen Arbeitsprozess können keine Tupel eingefügt werden"
 
-#: access/heap/heapam.c:2713
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "während einer parallelen Operation können keine Tupel gelöscht werden"
 
-#: access/heap/heapam.c:2760
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "Versuch ein unsichtbares Tupel zu löschen"
 
-#: access/heap/heapam.c:3208 access/heap/heapam.c:6081
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, 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:3336
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "Versuch ein unsichtbares Tupel zu aktualisieren"
 
-#: access/heap/heapam.c:4725 access/heap/heapam.c:4763
-#: access/heap/heapam.c:5028 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031
+#: access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "konnte Sperre für Zeile in Relation »%s« nicht setzen"
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam.c:6425 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
+#, 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"
+
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update"
 msgstr "das zu sperrende Tupel wurde schon durch ein gleichzeitiges Update in eine andere Partition verschoben"
@@ -1384,14 +1400,14 @@ msgstr "konnte nicht in Datei »%s« schreiben, %d von %d geschrieben: %m"
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3249 access/transam/xlog.c:3440
-#: access/transam/xlog.c:4277 access/transam/xlog.c:9199
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:328 postmaster/postmaster.c:4112
-#: postmaster/walsummarizer.c:1067 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3239 access/transam/xlog.c:3447
+#: access/transam/xlog.c:4311 access/transam/xlog.c:9329
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4074
+#: postmaster/walsummarizer.c:1216 replication/logical/origin.c:626
+#: replication/slot.c:2360 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht erstellen: %m"
@@ -1403,162 +1419,177 @@ msgstr "konnte Datei »%s« nicht auf %u kürzen: %m"
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3299 access/transam/xlog.c:3496
-#: access/transam/xlog.c:4289 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:339 postmaster/launch_backend.c:351
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1771
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1601
-#: utils/init/miscinit.c:1612 utils/init/miscinit.c:1620 utils/misc/guc.c:4441
-#: utils/misc/guc.c:4472 utils/misc/guc.c:5625 utils/misc/guc.c:5643
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3300 access/transam/xlog.c:3503
+#: access/transam/xlog.c:4323 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2396 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "konnte nicht in Datei »%s« schreiben: %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "aggressives Vacuum von »%s.%s.%s«"
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "Vacuum von »%s.%s.%s«"
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "beende Vacuum der Tabelle »%s.%s.%s«: Index-Scans: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisches aggressives Vacuum um Überlauf zu verhindern in der Tabelle »%s.%s.%s«: Index-Scans: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisches Vacuum um Überlauf zu verhindern in der Tabelle »%s.%s.%s«: Index-Scans: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisches aggressives Vacuum der Tabelle »%s.%s.%s«: Index-Scans: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, 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"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
-msgstr "Seiten: %u entfernt, %u verbleiben, %u gescannt (%.2f%% der Gesamtzahl)\n"
+msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
+msgstr "Seiten: %u entfernt, %u verbleiben, %u gescannt (%.2f%% der Gesamtzahl), %u mit Eager Scan gelesen\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
-msgid "tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
-msgstr "Tupel: %lld entfernt, %lld verbleiben, %lld sind tot aber noch nicht entfernbar\n"
+msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
+msgstr "Tupel: %<PRId64> entfernt, %<PRId64> verbleiben, %<PRId64> sind tot aber noch nicht entfernbar\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
-msgid "tuples missed: %lld dead from %u pages not removed due to cleanup lock contention\n"
-msgstr "verpasste Tupel: %lld tot von %u Seiten nicht entfernt wegen Cleanup-Lock-Konflikt\n"
+msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
+msgstr "verpasste Tupel: %<PRId64> tot von %u Seiten nicht entfernt wegen Cleanup-Lock-Konflikt\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "entfernbare Obergrenze: %u, was %d XIDs alt war als die Operation endete\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "neue relfrozenxid: %u, was %d XIDs vor dem vorherigen Wert ist\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "neue relminmxid: %u, was %d MXIDs vor dem vorherigen Wert ist\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
+#, c-format
+msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
+msgstr "eingefroren: in %u Seiten der Tabelle (%.2f%% der Gesamtzahl) wurden %<PRId64> Tupel eingefroren\n"
+
+#: access/heap/vacuumlazy.c:1062
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
-msgstr "eingefroren: in %u Seiten der Tabelle (%.2f%% der Gesamtzahl) wurden %lld Tupel eingefroren\n"
+msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
+msgstr "Visibility-Map: %u Seiten auf all-visible gesetzt, %u Seiten auf all-frozen gesetzt (%u waren all-visible)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "Index-Scan nicht benötigt: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "Index-Scan benötigt: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
-msgid "%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"
-msgstr "in %u Seiten der Tabelle (%.2f%% der Gesamtzahl) wurden %lld tote Item-Bezeichner entfernt\n"
+msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
+msgstr "in %u Seiten der Tabelle (%.2f%% der Gesamtzahl) wurden %<PRId64> tote Item-Bezeichner entfernt\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "Index-Scan umgangen: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "Index-Scan umgangen durch Ausfallsicherung: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
-msgstr "%u Seiten der Tabelle (%.2f%% der Gesamtzahl) haben %lld tote Item-Bezeichner\n"
+msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
+msgstr "%u Seiten der Tabelle (%.2f%% der Gesamtzahl) haben %<PRId64> tote Item-Bezeichner\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "Index »%s«: Seiten: %u gesamt, %u neu gelöscht, %u gegenwärtig gelöscht, %u wiederverwendbar\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:789
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "Verzögerungszeit: %.3f ms\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "I/O-Zeitmessungen: Lesen: %.3f ms, Schreiben: %.3f ms\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:792
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, 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"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
-msgstr "Puffer-Verwendung: %lld Treffer, %lld Verfehlen, %lld geändert\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
+msgstr "Puffer-Verwendung: %<PRId64> Treffer, %<PRId64> Verfehlen, %<PRId64> geändert\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
-msgstr "WAL-Benutzung: %lld Einträge, %lld Full Page Images, %llu Bytes\n"
+msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
+msgstr "WAL-Benutzung: %<PRId64> Einträge, %<PRId64> Full Page Images, %<PRIu64> Bytes, %<PRId64> Puffer voll\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:798
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "Systembenutzung: %s"
 
-#: access/heap/vacuumlazy.c:2172
+#: access/heap/vacuumlazy.c:1432
+#, c-format
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
+msgstr "Eager Scanning wird deaktiviert, nachdem %u mit Eager Scanning gelesene Blöcke von Relation »%s.%s.%s« eingefroren wurden"
+
+#: access/heap/vacuumlazy.c:2821
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
-msgstr "Tabelle »%s«: %lld tote Item-Bezeichner in %u Seiten entfernt"
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
+msgstr "Tabelle »%s«: %<PRId64> tote Item-Bezeichner in %u Seiten entfernt"
 
-#: access/heap/vacuumlazy.c:2326
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "umgehe nicht essentielle Wartung der Tabelle »%s.%s.%s« als Ausfallsicherung nach %d Index-Scans"
 
-#: access/heap/vacuumlazy.c:2329
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "relfrozenxid oder relminmxid der Tabelle ist zu weit in der Vergangenheit."
 
-#: access/heap/vacuumlazy.c:2330
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
@@ -1567,67 +1598,67 @@ msgstr ""
 "Erhöhen Sie eventuell die Konfigurationsparameter »maintenance_work_mem« oder »autovacuum_work_mem«.\n"
 "Sie müssen möglicherweise auch andere Wege in Betracht ziehen, wie VACUUM mit der Benutzung von Transaktions-IDs mithalten kann."
 
-#: access/heap/vacuumlazy.c:2592
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "»%s«: Truncate wird gestoppt wegen Sperrkonflikt"
 
-#: access/heap/vacuumlazy.c:2662
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "Tabelle »%s«: von %u auf %u Seiten verkürzt"
 
-#: access/heap/vacuumlazy.c:2724
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "Tabelle »%s«: Truncate wird ausgesetzt wegen Sperrkonflikt"
 
-#: access/heap/vacuumlazy.c:2843
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "Paralleloption für Vacuum von »%s« wird deaktiviert --- Vacuum in temporären Tabellen kann nicht parallel ausgeführt werden"
 
-#: access/heap/vacuumlazy.c:3113
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "beim Scannen von Block %u Offset %u von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3116
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "beim Scannen von Block %u von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3120
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "beim Scannen von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3128
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "beim Vacuum von Block %u Offset %u von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3131
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "beim Vacuum von Block %u von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3135
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "beim Vacuum von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1113
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "beim Vacuum von Index »%s« von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3145 commands/vacuumparallel.c:1119
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "beim Säubern von Index »%s« von Relation »%s.%s«"
 
-#: access/heap/vacuumlazy.c:3151
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "beim Trunkieren von Relation »%s.%s« auf %u Blöcke"
@@ -1642,24 +1673,24 @@ msgstr "Zugriffsmethode »%s« ist nicht vom Typ %s"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "Indexzugriffsmethode »%s« hat keinen Handler"
 
-#: access/index/genam.c:487
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "Transaktion während eines Systemkatalog-Scans abgebrochen"
 
-#: access/index/genam.c:655 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "auf Index »%s« kann nicht zugegriffen werden, während er reindiziert wird"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2873 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17766 commands/tablecmds.c:19584
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3018 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19678 commands/tablecmds.c:21620
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "»%s« ist kein Index"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "Operatorklasse %s hat keine Optionen"
@@ -1680,7 +1711,7 @@ msgid "This may be because of a non-immutable index expression."
 msgstr "Das kann daran liegen, dass der Indexausdruck nicht »immutable« ist."
 
 #: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2298
+#: parser/parse_utilcmd.c:2508
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "Index »%s« ist kein B-Tree"
@@ -1700,17 +1731,17 @@ msgstr "Index »%s« enthält eine halbtote interne Seite"
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "Die Ursache kann ein unterbrochenes VACUUM in Version 9.3 oder älter vor dem Upgrade sein. Bitte REINDEX durchführen."
 
-#: access/nbtree/nbtutils.c:5112
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "Größe %zu der Indexzeile überschreitet btree-Version %u Maximum %zu für Index »%s«"
 
-#: access/nbtree/nbtutils.c:5118
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "Indexzeile verweist auf Tupel (%u,%u) in Relation »%s«."
 
-#: access/nbtree/nbtutils.c:5122
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1719,58 +1750,58 @@ msgstr ""
 "Werte, die größer sind als 1/3 einer Pufferseite, können nicht indiziert werden.\n"
 "Erstellen Sie eventuell einen Funktionsindex auf einen MD5-Hash oder verwenden Sie Volltextindizierung."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlt Support-Funktion für Typen %s und %s"
 
 #: access/sequence/sequence.c:75 access/table/table.c:145
-#: optimizer/util/plancat.c:143
+#: optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "kann Relation »%s« nicht öffnen"
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid "compress method must be defined when leaf type is different from input type"
 msgstr "Compress-Methode muss definiert sein, wenn der Leaf-Typ verschieden vom Eingabetyp ist"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "innere Tupelgröße %zu überschreitet SP-GiST-Maximum %zu"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr "SP-GiST-Leaf-Datentyp %s stimmt nicht mit deklariertem Typ %s überein"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "in Operatorfamilie »%s« für Zugriffsmethode %s fehlt Support-Funktion %d für Typ %s"
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "tid (%u, %u) ist nicht gültig für Relation »%s«"
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "»%s« kann nicht leer sein."
 
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4858
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "»%s« ist zu lang (maximal %d Zeichen)."
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "Tabellenzugriffsmethode »%s« existiert nicht"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "Tabellenzugriffsmethode »%s« existiert nicht."
@@ -1800,13 +1831,13 @@ msgstr "Stellen Sie sicher, dass der Konfigurationsparameter »%s« auf dem Prim
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Stellen Sie sicher, dass der Konfigurationsparameter »%s« gesetzt ist."
 
-#: access/transam/multixact.c:1091
+#: access/transam/multixact.c:1266
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "Datenbank nimmt keine Befehle an, die neue MultiXactIds zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank »%s« zu vermeiden"
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1268 access/transam/multixact.c:1275
+#: access/transam/multixact.c:1299 access/transam/multixact.c:1308
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
@@ -1816,131 +1847,138 @@ msgstr ""
 "Führen Sie ein datenbankweites VACUUM in dieser Datenbank aus.\n"
 "Eventuell müssen Sie auch alte vorbereitete Transaktionen committen oder zurückrollen oder unbenutzte Replikations-Slots löschen."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1273
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "Datenbank nimmt keine Befehle an, die neue MultiXactIds zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank mit OID %u zu vermeiden"
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1294 access/transam/multixact.c:2650
 #, 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"
 
-#: access/transam/multixact.c:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1303 access/transam/multixact.c:2659
 #, 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] "Datenbank mit OID %u muss gevacuumt werden, bevor %u weitere MultiXactId aufgebraucht ist"
 msgstr[1] "Datenbank mit OID %u muss gevacuumt werden, bevor %u weitere MultiXactIds aufgebraucht sind"
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1367
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "Grenzwert für Multixact-»Members« überschritten"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1368
 #, 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] "Dieser Befehl würde eine Multixact mit %u Mitgliedern erzeugen, aber es ist nur genug Platz für %u Mitglied."
 msgstr[1] "Dieser Befehl würde eine Multixact mit %u Mitgliedern erzeugen, aber es ist nur genug Platz für %u Mitglieder."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1373
 #, 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 "Führen Sie ein datenbankweites VACUUM in der Datenbank mit OID %u aus, mit reduzierten Einstellungen für »vacuum_multixact_freeze_min_age« und »vacuum_multixact_freeze_table_age«."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1404
 #, c-format
 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] "Datenbank mit OID %u muss gevacuumt werden, bevor %d weiteres Multixact-Mitglied aufgebraucht ist"
 msgstr[1] "Datenbank mit OID %u muss gevacuumt werden, bevor %d weitere Multixact-Mitglieder aufgebraucht sind"
 
-#: access/transam/multixact.c:1231
+#: access/transam/multixact.c:1409
 #, 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 "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:1371
+#: access/transam/multixact.c:1548
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u existiert nicht mehr -- anscheinender Überlauf"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1554
 #, 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:2479 access/transam/multixact.c:2488
-#, fuzzy, c-format
-#| msgid ""
-#| "To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-#| "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
+#: access/transam/multixact.c:1647
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "MultiXact %u hat ungültiges nächstes Offset"
+
+#: access/transam/multixact.c:2655 access/transam/multixact.c:2664
+#, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
 msgstr ""
-"Um ein Abschalten der Datenbank zu vermeiden, führen Sie ein komplettes VACUUM über diese Datenbank aus.\n"
+"Um Scheitern von MultiXactId-Zuweisungen 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 oder unbenutzte Replikations-Slots löschen."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2947
 #, 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:2789
+#: access/transam/multixact.c:2969
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "MultiXact-Member-Wraparound-Schutz ist jetzt aktiviert"
 
-#: access/transam/multixact.c:3179
+#: access/transam/multixact.c:3360
 #, 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:3197
+#: access/transam/multixact.c:3378
 #, 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:3516
+#: access/transam/multixact.c:3395
+#, c-format
+msgid "cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation"
+msgstr "kann nicht bis MultiXact %u trunkieren, weil es ein ungültiges Offset hat, Trunkierung wird ausgelassen"
+
+#: access/transam/multixact.c:3732
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "ungültige MultiXactId: %u"
 
-#: access/transam/parallel.c:731 access/transam/parallel.c:850
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "Initialisierung von parallelem Arbeitsprozess fehlgeschlagen"
 
-#: access/transam/parallel.c:732 access/transam/parallel.c:851
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "Weitere Einzelheiten sind möglicherweise im Serverlog zu finden."
 
-#: access/transam/parallel.c:912
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "Postmaster beendete während einer parallelen Transaktion"
 
-#: access/transam/parallel.c:1099
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "Verbindung mit parallelem Arbeitsprozess verloren"
 
-#: access/transam/parallel.c:1155 access/transam/parallel.c:1157
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "paralleler Arbeitsprozess"
 
-#: access/transam/parallel.c:1327 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:906
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "konnte dynamisches Shared-Memory-Segment nicht mappen"
 
-#: access/transam/parallel.c:1332 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:912
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "ungültige magische Zahl in dynamischem Shared-Memory-Segment"
@@ -2001,65 +2039,65 @@ msgstr "Bestehender Resource-Manager mit ID %d hat den gleichen Namen."
 msgid "registered custom resource manager \"%s\" with ID %d"
 msgstr "Custom-Resource-Manager »%s« mit ID %d wurde registriert"
 
-#: access/transam/slru.c:346
+#: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
-msgstr "»%s« muss ein Vielfaches von %d sein"
+msgid "\"%s\" must be a multiple of %d."
+msgstr "»%s« muss ein Vielfaches von %d sein."
 
-#: access/transam/slru.c:815
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "Datei »%s« existiert nicht, wird als Nullen eingelesen"
 
-#: access/transam/slru.c:1044 access/transam/slru.c:1050
-#: access/transam/slru.c:1058 access/transam/slru.c:1063
-#: access/transam/slru.c:1070 access/transam/slru.c:1075
-#: access/transam/slru.c:1082 access/transam/slru.c:1089
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "konnte auf den Status von Transaktion %u nicht zugreifen"
 
-#: access/transam/slru.c:1045
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "Konnte Datei »%s« nicht öffnen: %m."
 
-#: access/transam/slru.c:1051
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "Konnte Positionszeiger in Datei »%s« nicht auf %d setzen: %m."
 
-#: access/transam/slru.c:1059
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "Konnte nicht aus Datei »%s« bei Position %d lesen: %m."
 
-#: access/transam/slru.c:1064
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "Konnte nicht aus Datei »%s« bei Position %d lesen: zu wenige Bytes gelesen."
 
-#: access/transam/slru.c:1071
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "Konnte nicht in Datei »%s« bei Position %d schreiben: %m."
 
-#: access/transam/slru.c:1076
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "Konnte nicht in Datei »%s« bei Position %d schreiben: zu wenige Bytes geschrieben."
 
-#: access/transam/slru.c:1083
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "Konnte Datei »%s« nicht fsyncen: %m."
 
-#: access/transam/slru.c:1090
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "Konnte Datei »%s« nicht schließen: %m."
 
-#: access/transam/slru.c:1416
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "konnte Verzeichnis »%s« nicht leeren: anscheinender Überlauf"
@@ -2124,12 +2162,12 @@ msgstr "Setzen Sie »max_prepared_transactions« auf einen Wert höher als null.
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "Transaktionsbezeichner »%s« wird bereits verwendet"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2541
+#: access/transam/twophase.c:404 access/transam/twophase.c:2531
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "maximale Anzahl vorbereiteter Transaktionen erreicht"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2542
+#: access/transam/twophase.c:405 access/transam/twophase.c:2532
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr "Erhöhen Sie »max_prepared_transactions« (aktuell %d)."
@@ -2164,150 +2202,149 @@ msgstr "Verbinden Sie sich mit der Datenbank, wo die Transaktion vorbereitet wur
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "vorbereitete Transaktion mit Bezeichner »%s« existiert nicht"
 
-#: access/transam/twophase.c:1190
+#: access/transam/twophase.c:1175
 #, c-format
 msgid "two-phase state file maximum length exceeded"
 msgstr "maximale Länge der Zweiphasen-Statusdatei überschritten"
 
-#: access/transam/twophase.c:1345
+#: access/transam/twophase.c:1330
 #, c-format
 msgid "incorrect size of file \"%s\": %lld byte"
 msgid_plural "incorrect size of file \"%s\": %lld bytes"
 msgstr[0] "falsche Größe von Datei »%s«: %lld Byte"
 msgstr[1] "falsche Größe von Datei »%s«: %lld Bytes"
 
-#: access/transam/twophase.c:1354
+#: access/transam/twophase.c:1339
 #, c-format
 msgid "incorrect alignment of CRC offset for file \"%s\""
 msgstr "falsche Ausrichtung des CRC-Offsets für Datei »%s«"
 
-#: access/transam/twophase.c:1372
+#: access/transam/twophase.c:1357
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "konnte Datei »%s« nicht lesen: %d von %lld gelesen"
 
-#: access/transam/twophase.c:1387
+#: access/transam/twophase.c:1372
 #, c-format
 msgid "invalid magic number stored in file \"%s\""
 msgstr "ungültige magische Zahl in Datei »%s gespeichert«"
 
-#: access/transam/twophase.c:1393
+#: access/transam/twophase.c:1378
 #, c-format
 msgid "invalid size stored in file \"%s\""
 msgstr "ungültige Größe in Datei »%s« gespeichert"
 
-#: access/transam/twophase.c:1405
+#: access/transam/twophase.c:1390
 #, c-format
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "berechnete CRC-Prüfsumme stimmt nicht mit dem Wert in Datei »%s« überein"
 
-#: access/transam/twophase.c:1435 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:821 replication/logical/logical.c:210
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1420 access/transam/xlogrecovery.c:572
+#: postmaster/walsummarizer.c:940 replication/logical/logical.c:213
+#: replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "Fehlgeschlagen beim Anlegen eines WAL-Leseprozessors."
 
-#: access/transam/twophase.c:1445
+#: access/transam/twophase.c:1430
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X: %s"
 msgstr "konnte Zweiphasen-Status nicht aus dem WAL bei %X/%X lesen: %s"
 
-#: access/transam/twophase.c:1450
+#: access/transam/twophase.c:1435
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X"
 msgstr "konnte Zweiphasen-Status nicht aus dem WAL bei %X/%X lesen"
 
-#: access/transam/twophase.c:1458
+#: access/transam/twophase.c:1443
 #, c-format
 msgid "expected two-phase state data is not present in WAL at %X/%X"
 msgstr "erwartete Zweiphasen-Status-Daten sind nicht im WAL bei %X/%X vorhanden"
 
-#: access/transam/twophase.c:1754
+#: access/transam/twophase.c:1745
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht neu erzeugen: %m"
 
-#: access/transam/twophase.c:1881
+#: access/transam/twophase.c:1872
 #, c-format
 msgid "%u two-phase state file was written for a long-running prepared transaction"
 msgid_plural "%u two-phase state files were written for long-running prepared transactions"
 msgstr[0] "%u Zweiphasen-Statusdatei wurde für eine lange laufende vorbereitete Transaktion geschrieben"
 msgstr[1] "%u Zweiphasen-Statusdateien wurden für lange laufende vorbereitete Transaktionen geschrieben"
 
-#: access/transam/twophase.c:2117
+#: access/transam/twophase.c:2107
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "Wiederherstellung der vorbereiteten Transaktion %u aus dem Shared Memory"
 
-#: access/transam/twophase.c:2210
+#: access/transam/twophase.c:2200
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "entferne abgelaufene Zweiphasen-Statusdatei für Transaktion %u"
 
-#: access/transam/twophase.c:2217
+#: access/transam/twophase.c:2207
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr "entferne abgelaufenen Zweiphasen-Status aus dem Speicher für Transaktion %u"
 
-#: access/transam/twophase.c:2230
+#: access/transam/twophase.c:2220
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "entferne zukünftige Zweiphasen-Statusdatei für Transaktion %u"
 
-#: access/transam/twophase.c:2237
+#: access/transam/twophase.c:2227
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "entferne zukünftigen Zweiphasen-Status aus dem Speicher für Transaktion %u"
 
-#: access/transam/twophase.c:2262
+#: access/transam/twophase.c:2252
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "verfälschte Zweiphasen-Statusdatei für Transaktion %u"
 
-#: access/transam/twophase.c:2267
+#: access/transam/twophase.c:2257
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "verfälschter Zweiphasen-Status im Speicher für Transaktion %u"
 
-#: access/transam/twophase.c:2524
+#: access/transam/twophase.c:2514
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "konnte Zweiphasen-Statusdatei für Transaktion %u nicht wiederherstellen"
 
-#: access/transam/twophase.c:2526
+#: access/transam/twophase.c:2516
 #, c-format
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr "Zweiphasen-Statusdatei wurde in WAL-Eintrag %X/%X gefunden, aber diese Transaktion wurde schon von der Festplatte wiederhergestellt."
 
-#: access/transam/twophase.c:2534 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2524 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "konnte nicht auf Datei »%s« zugreifen: %m"
 
 #: access/transam/varsup.c:156
 #, c-format
-msgid "database is not accepting commands that assign new XIDs to avoid wraparound data loss in database \"%s\""
-msgstr "Datenbank nimmt keine Befehle an, die neue XIDs zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank »%s« zu vermeiden"
+msgid "database is not accepting commands that assign new transaction IDs to avoid wraparound data loss in database \"%s\""
+msgstr "Datenbank nimmt keine Befehle an, die neue Transaktions-IDs zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank »%s« zu vermeiden"
 
 #: access/transam/varsup.c:163
 #, c-format
-msgid "database is not accepting commands that assign new XIDs to avoid wraparound data loss in database with OID %u"
-msgstr "Datenbank nimmt keine Befehle an, die neue XIDs zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank mit OID %u zu vermeiden"
+msgid "database is not accepting commands that assign new transaction IDs to avoid wraparound data loss in database with OID %u"
+msgstr "Datenbank nimmt keine Befehle an, die neue Transaktions-IDs zuweisen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank mit OID %u zu vermeiden"
 
 #: access/transam/varsup.c:175 access/transam/varsup.c:490
 #, c-format
 msgid "database \"%s\" must be vacuumed within %u transactions"
 msgstr "Datenbank »%s« muss innerhalb von %u Transaktionen gevacuumt werden"
 
-#: access/transam/varsup.c:178 access/transam/varsup.c:185
-#: access/transam/varsup.c:493 access/transam/varsup.c:500
+#: access/transam/varsup.c:178
 #, c-format
 msgid ""
-"To avoid XID assignment failures, execute a database-wide VACUUM in that database.\n"
+"To avoid transaction ID assignment failures, execute a database-wide VACUUM in that database.\n"
 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
 msgstr ""
-"Um ein Fehler bei der Zuweisung von XIDs zu vermeiden, führen Sie ein komplettes VACUUM über diese Datenbank aus.\n"
+"Um ein Fehler bei der Zuweisung von Transaktions-IDs 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 oder unbenutzte Replikations-Slots löschen."
 
 #: access/transam/varsup.c:182 access/transam/varsup.c:497
@@ -2315,584 +2352,540 @@ msgstr ""
 msgid "database with OID %u must be vacuumed within %u transactions"
 msgstr "Datenbank mit OID %u muss innerhalb von %u Transaktionen gevacuumt werden"
 
-#: access/transam/xact.c:649
+#: access/transam/varsup.c:185 access/transam/varsup.c:493
+#: access/transam/varsup.c:500
+#, c-format
+msgid ""
+"To avoid XID assignment failures, execute a database-wide VACUUM in that database.\n"
+"You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
+msgstr ""
+"Um ein Fehler bei der Zuweisung von XIDs 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 oder unbenutzte Replikations-Slots löschen."
+
+#: access/transam/xact.c:652
 #, c-format
-msgid "cannot assign XIDs during a parallel operation"
-msgstr "während einer parallelen Operation können keine XIDs zugewiesen werden"
+msgid "cannot assign transaction IDs during a parallel operation"
+msgstr "während einer parallelen Operation können keine Transaktions-IDs zugewiesen werden"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "in einem parallelen Arbeitsprozess können keine Daten modifiziert werden"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "während einer parallelen Operation können keine Befehle gestartet werden"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "kann nicht mehr als 2^32-2 Befehle in einer Transaktion ausführen"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "maximale Anzahl committeter Subtransaktionen (%d) überschritten"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr "PREPARE kann nicht für eine Transaktion ausgeführt werden, die temporäre Objekte bearbeitet hat"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "PREPARE kann nicht für eine Transaktion ausgeführt werden, die Snapshots exportiert hat"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3593
+#: access/transam/xact.c:3657
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s kann nicht in einem Transaktionsblock laufen"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3603
+#: access/transam/xact.c:3667
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s kann nicht in einer Subtransaktion laufen"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s kann nicht innerhalb einer Pipeline ausgeführt werden"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s kann nicht aus einer Funktion ausgeführt werden"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s kann nur in Transaktionsblöcken verwendet werden"
 
-#: access/transam/xact.c:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "eine Transaktion ist bereits begonnen"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "keine Transaktion offen"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "während einer parallelen Operation kann nicht committet werden"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "während einer parallelen Operation kann nicht abgebrochen werden"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "während einer parallelen Operation können keine Sicherungspunkte definiert werden"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "während einer parallelen Operation können keine Sicherungspunkte freigegeben werden"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "Sicherungspunkt »%s« existiert nicht"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr "Sicherungspunkt »%s« existiert nicht innerhalb der aktuellen Sicherungspunktebene"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "während einer parallelen Operation kann nicht auf einen Sicherungspunkt zurückgerollt werden"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, c-format
 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:1536
+#: access/transam/xlog.c:1544
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr "Flush hinter das Ende des erzeugten WAL angefordert; Anforderung %X/%X, aktuelle Position %X/%X"
 
-#: access/transam/xlog.c:1763
+#: access/transam/xlog.c:1771
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr "kann nicht hinter das Ende des erzeugten WAL lesen: Anforderung %X/%X, aktuelle Position %X/%X"
 
-#: access/transam/xlog.c:2204 access/transam/xlog.c:4495
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Die WAL-Segmentgröße muss eine Zweierpotenz zwischen 1 MB und 1 GB sein."
 
-#: access/transam/xlog.c:2222
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "»%s« muss im Binary-Upgrade-Modus auf -1 gesetzt sein."
-
-#: access/transam/xlog.c:2471
+#: access/transam/xlog.c:2454
 #, 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:3733 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820
+#: replication/walsender.c:3097
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "das angeforderte WAL-Segment %s wurde schon entfernt"
 
-#: access/transam/xlog.c:4055
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht umbenennen: %m"
 
-#: access/transam/xlog.c:4098 access/transam/xlog.c:4109
-#: access/transam/xlog.c:4130
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116
+#: access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "benötigtes WAL-Verzeichnis »%s« existiert nicht"
 
-#: access/transam/xlog.c:4115 access/transam/xlog.c:4136
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "erzeuge fehlendes WAL-Verzeichnis »%s«"
 
-#: access/transam/xlog.c:4119 access/transam/xlog.c:4139
-#: commands/dbcommands.c:3242
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146
+#: commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "konnte fehlendes Verzeichnis »%s« nicht erzeugen: %m"
 
-#: access/transam/xlog.c:4206
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "konnte geheimes Autorisierungstoken nicht erzeugen"
 
-#: access/transam/xlog.c:4357 access/transam/xlog.c:4367
-#: access/transam/xlog.c:4393 access/transam/xlog.c:4401
-#: access/transam/xlog.c:4409 access/transam/xlog.c:4415
-#: access/transam/xlog.c:4423 access/transam/xlog.c:4431
-#: access/transam/xlog.c:4439 access/transam/xlog.c:4447
-#: access/transam/xlog.c:4455 access/transam/xlog.c:4463
-#: access/transam/xlog.c:4473 access/transam/xlog.c:4481
-#: utils/init/miscinit.c:1758
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4437
+#: access/transam/xlog.c:4447 access/transam/xlog.c:4453
+#: access/transam/xlog.c:4463 access/transam/xlog.c:4473
+#: access/transam/xlog.c:4483 access/transam/xlog.c:4493
+#: access/transam/xlog.c:4503 access/transam/xlog.c:4513
+#: access/transam/xlog.c:4525 access/transam/xlog.c:4533
+#: utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "Datenbankdateien sind inkompatibel mit Server"
 
-#: access/transam/xlog.c:4358
+#: access/transam/xlog.c:4392
 #, 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:4362
+#: access/transam/xlog.c:4396
 #, 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:4368
+#: access/transam/xlog.c:4402
 #, 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:4371 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4405 access/transam/xlog.c:4411
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433
+#: access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, 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:4383
+#: access/transam/xlog.c:4417
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "falsche Prüfsumme in Kontrolldatei"
 
-#: access/transam/xlog.c:4394
-#, 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:4402
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439
+#: access/transam/xlog.c:4455 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4475 access/transam/xlog.c:4485
+#: access/transam/xlog.c:4495 access/transam/xlog.c:4505
+#: access/transam/xlog.c:4515
 #, 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."
+msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
+msgstr "Der Datenbank-Cluster wurde mit %s %d initialisiert, aber der Server wurde mit %s %d kompiliert."
 
-#: access/transam/xlog.c:4410
+#: access/transam/xlog.c:4448
 #, 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:4416
-#, 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:4419 access/transam/xlog.c:4427
-#: access/transam/xlog.c:4435 access/transam/xlog.c:4443
-#: access/transam/xlog.c:4451 access/transam/xlog.c:4459
-#: access/transam/xlog.c:4467 access/transam/xlog.c:4476
-#: access/transam/xlog.c:4484
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469
+#: access/transam/xlog.c:4479 access/transam/xlog.c:4489
+#: access/transam/xlog.c:4499 access/transam/xlog.c:4509
+#: access/transam/xlog.c:4519 access/transam/xlog.c:4528
+#: access/transam/xlog.c:4536
 #, 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:4424
-#, 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:4432
-#, 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:4440
-#, 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:4448
-#, 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:4456
-#, 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:4464
-#, 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:4474
+#: access/transam/xlog.c:4526
 #, 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:4482
+#: access/transam/xlog.c:4534
 #, 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:4491
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "ungültige WAL-Segmentgröße in Kontrolldatei (%d Byte)"
 msgstr[1] "ungültige WAL-Segmentgröße in Kontrolldatei (%d Bytes)"
 
-#: access/transam/xlog.c:4504
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "»min_wal_size« muss mindestens zweimal so groß wie »wal_segment_size« sein"
-
-#: access/transam/xlog.c:4508
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "»max_wal_size« muss mindestens zweimal so groß wie »wal_segment_size« sein"
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "»%s« muss mindestens zweimal so groß wie »%s« sein"
 
-#: access/transam/xlog.c:4656 catalog/namespace.c:4681
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 utils/error/elog.c:2214
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699
+#: commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72
+#: replication/slot.c:2768 tcop/postgres.c:3630 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Die Listensyntax ist ungültig."
 
-#: access/transam/xlog.c:4702 commands/user.c:2545 commands/variable.c:173
-#: utils/error/elog.c:2240
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173
+#: tcop/postgres.c:3646 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Unbekanntes Schlüsselwort: »%s«."
 
-#: access/transam/xlog.c:5122
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "konnte Bootstrap-Write-Ahead-Log-Datei nicht schreiben: %m"
 
-#: access/transam/xlog.c:5130
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "konnte Bootstrap-Write-Ahead-Log-Datei nicht fsyncen: %m"
 
-#: access/transam/xlog.c:5136
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "konnte Bootstrap-Write-Ahead-Log-Datei nicht schließen: %m"
 
-#: access/transam/xlog.c:5354
+#: access/transam/xlog.c:5433
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "WAL wurde mit »wal_level=minimal« erzeugt, Wiederherstellung kann nicht fortgesetzt werden"
 
-#: access/transam/xlog.c:5355
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "Das passiert, wenn auf dem Server vorübergehend »wal_level=minimal« gesetzt wurde."
 
-#: access/transam/xlog.c:5356
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "Verwenden Sie ein Backup, das durchgeführt wurde, nachdem »wal_level« auf höher als »minimal« gesetzt wurde."
 
-#: access/transam/xlog.c:5421
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "Kontrolldatei enthält ungültige Checkpoint-Position"
 
-#: access/transam/xlog.c:5432
+#: access/transam/xlog.c:5511
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "Datenbanksystem wurde am %s heruntergefahren"
 
-#: access/transam/xlog.c:5438
+#: access/transam/xlog.c:5517
 #, 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:5444
+#: access/transam/xlog.c:5523
 #, 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:5450
+#: access/transam/xlog.c:5529
 #, 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:5452
+#: access/transam/xlog.c:5531
 #, 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:5458
+#: access/transam/xlog.c:5537
 #, 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:5460
+#: access/transam/xlog.c:5539
 #, 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:5466
+#: access/transam/xlog.c:5545
 #, 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:5473
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "Kontrolldatei enthält ungültigen Datenbankclusterstatus"
 
-#: access/transam/xlog.c:5860
+#: access/transam/xlog.c:5940
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL endet vor dem Ende der Online-Sicherung"
 
-#: access/transam/xlog.c:5861
+#: access/transam/xlog.c:5941
 #, 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:5865
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL endet vor einem konsistenten Wiederherstellungspunkt"
 
-#: access/transam/xlog.c:5911
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "gewählte neue Zeitleisten-ID: %u"
 
-#: access/transam/xlog.c:5944
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "Wiederherstellung aus Archiv abgeschlossen"
 
-#: access/transam/xlog.c:6552
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "fahre herunter"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6591
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "Restart-Punkt beginnt:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6603
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "Checkpoint beginnt:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6668
+#: access/transam/xlog.c:6769
 #, c-format
-msgid "restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "Restart-Punkt komplett: %d Puffer geschrieben (%.1f%%); %d WAL-Datei(en) hinzugefügt, %d entfernt, %d wiederverwendet; Schreiben=%ld,%03d s, Sync=%ld,%03d s, gesamt=%ld,%03d s; sync. Dateien=%d, längste=%ld,%03d s, Durchschnitt=%ld.%03d s; Entfernung=%d kB, Schätzung=%d kB; LSN=%X/%X, Redo-LSN=%X/%X"
+msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "Restart-Punkt komplett: %d Puffer geschrieben (%.1f%%), %d SLRU-Puffer geschrieben; %d WAL-Datei(en) hinzugefügt, %d entfernt, %d wiederverwendet; Schreiben=%ld,%03d s, Sync=%ld,%03d s, gesamt=%ld,%03d s; sync. Dateien=%d, längste=%ld,%03d s, Durchschnitt=%ld.%03d s; Entfernung=%d kB, Schätzung=%d kB; LSN=%X/%X, Redo-LSN=%X/%X"
 
-#: access/transam/xlog.c:6691
+#: access/transam/xlog.c:6793
 #, c-format
-msgid "checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "Checkpoint komplett: %d Puffer geschrieben (%.1f%%); %d WAL-Datei(en) hinzugefügt, %d entfernt, %d wiederverwendet; Schreiben=%ld,%03d s, Sync=%ld,%03d s, gesamt=%ld,%03d s; sync. Dateien=%d, längste=%ld,%03d s, Durchschnitt=%ld.%03d s; Entfernung=%d kB, Schätzung=%d kB; LSN=%X/%X, Redo-LSN=%X/%X"
+msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "Checkpoint komplett: %d Puffer geschrieben (%.1f%%), %d SLRU-Puffer geschrieben; %d WAL-Datei(en) hinzugefügt, %d entfernt, %d wiederverwendet; Schreiben=%ld,%03d s, Sync=%ld,%03d s, gesamt=%ld,%03d s; sync. Dateien=%d, längste=%ld,%03d s, Durchschnitt=%ld.%03d s; Entfernung=%d kB, Schätzung=%d kB; LSN=%X/%X, Redo-LSN=%X/%X"
 
-#: access/transam/xlog.c:7165
+#: access/transam/xlog.c:7279
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "gleichzeitige Write-Ahead-Log-Aktivität während das Datenbanksystem herunterfährt"
 
-#: access/transam/xlog.c:7749
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "Recovery-Restart-Punkt bei %X/%X"
 
-#: access/transam/xlog.c:7751
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "Die letzte vollständige Transaktion war bei Logzeit %s."
 
-#: access/transam/xlog.c:8013
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "Restore-Punkt »%s« erzeugt bei %X/%X"
 
-#: access/transam/xlog.c:8220
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "Online-Sicherung wurde storniert, Wiederherstellung kann nicht fortgesetzt werden"
 
-#: access/transam/xlog.c:8277
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "unerwartete Zeitleisten-ID %u (sollte %u sein) im Shutdown-Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:8335
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "unerwartete Zeitleisten-ID %u (sollte %u sein) im Online-Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:8364
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "unerwartete Zeitleisten-ID %u (sollte %u sein) im End-of-Recovery-Datensatz"
 
-#: access/transam/xlog.c:8635
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "konnte Write-Through-Logdatei »%s« nicht fsyncen: %m"
 
-#: access/transam/xlog.c:8640
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fdatasyncen: %m"
 
-#: access/transam/xlog.c:8727 access/transam/xlog.c:9063
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, 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:8728 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "»wal_level« muss beim Serverstart auf »replica« oder »logical« gesetzt werden."
 
-#: access/transam/xlog.c:8733
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "Backup-Label zu lang (maximal %d Bytes)"
 
-#: access/transam/xlog.c:8854
+#: access/transam/xlog.c:8984
 #, 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:8856 access/transam/xlog.c:9152
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, 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 primary, 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 auf dem Primärserver »full_page_writes« ein, führen Sie dort CHECKPOINT aus und versuchen Sie dann die Online-Sicherung erneut."
 
-#: access/transam/xlog.c:8936 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "konnte symbolische Verknüpfung »%s« nicht lesen: %m"
 
-#: access/transam/xlog.c:8943 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "Ziel für symbolische Verknüpfung »%s« ist zu lang"
 
-#: access/transam/xlog.c:9064
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr "wal_level muss beim Serverstart auf »replica« oder »logical« gesetzt werden."
-
-#: access/transam/xlog.c:9102 backup/basebackup.c:1281
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, 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:9103 backup/basebackup.c:1282
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, 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:9150
+#: access/transam/xlog.c:9280
 #, 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:9266
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "Basissicherung beendet, warte bis die benötigten WAL-Segmente archiviert sind"
 
-#: access/transam/xlog.c:9280
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "warte immer noch, bis alle benötigten WAL-Segmente archiviert sind (%d Sekunden abgelaufen)"
 
-#: access/transam/xlog.c:9282
+#: access/transam/xlog.c:9412
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, 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. Dieser Sicherungsvorgang kann gefahrlos abgebrochen werden, aber die Datenbanksicherung wird ohne die fehlenden WAL-Segmente nicht benutzbar sein."
 
-#: access/transam/xlog.c:9289
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "alle benötigten WAL-Segmente wurden archiviert"
 
-#: access/transam/xlog.c:9293
+#: access/transam/xlog.c:9423
 #, 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:9332
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "Backup wird abgebrochen, weil Backend-Prozess beendete, bevor pg_backup_stop aufgerufen wurde"
@@ -2935,277 +2928,276 @@ msgstr "konnte Archivstatusdatei »%s« nicht erstellen: %m"
 msgid "could not write archive status file \"%s\": %m"
 msgstr "konnte Archivstatusdatei »%s« nicht schreiben: %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "ein Backup läuft bereits in dieser Sitzung"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "es läuft kein Backup"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "Haben Sie pg_backup_start() ausgeführt?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, 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/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "%s kann nicht während der Wiederherstellung ausgeführt werden."
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
 msgstr "pg_log_standby_snapshot() kann nur verwendet werden, wenn »wal_level« >= »replica«"
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "WAL-Level nicht ausreichend, um Restore-Punkt anzulegen"
 
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "Wert zu lang für Restore-Punkt (maximal %d Zeichen)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "ungültiger WAL-Dateiname »%s«"
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "Wiederherstellung läuft nicht"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr "Wiederherstellungskontrollfunktionen können nur während der Wiederherstellung ausgeführt werden."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "Beförderung des Standby läuft"
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s kann nicht ausgeführt werden, nachdem eine Beförderung angestoßen wurde."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "»wait_seconds« darf nicht negativ oder null sein"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "konnte Signal nicht an Postmaster senden: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "Verbindung wird abgebrochen wegen unerwartetem Ende des Postmasters"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
-msgstr ""
+msgstr "beim Warten auf Beförderung"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
 msgstr[0] "Befördern des Servers wurde nicht innerhalb von %d Sekunde abgeschlossen"
 msgstr[1] "Befördern des Servers wurde nicht innerhalb von %d Sekunden abgeschlossen"
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
-msgid "\"recovery_prefetch\" is not supported on platforms that lack posix_fadvise()."
-msgstr "»recovery_prefetch« wird auf Plattformen ohne posix_fadvise() nicht unterstützt."
+msgid "\"recovery_prefetch\" is not supported on platforms that lack support for issuing read-ahead advice."
+msgstr "»recovery_prefetch« wird auf Plattformen ohne Unterstützung für Read-Ahead-Advice nicht unterstützt."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "ungültiger Datensatz-Offset bei %X/%X: mindestens %u erwartet, %u erhalten"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "Contrecord angefordert von %X/%X"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "ungültige Datensatzlänge bei %X/%X: mindestens %u erwartet, %u erhalten"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "keine Contrecord-Flag bei %X/%X"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "ungültige Contrecord-Länge %u (erwartet %lld) bei %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ungültige Resource-Manager-ID %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "Datensatz mit falschem Prev-Link %X/%X bei %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "ungültige Resource-Manager-Datenprüfsumme in Datensatz bei %X/%X"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ungültige magische Zahl %04X in WAL-Segment %s, LSN %X/%X, Offset %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ungültige Info-Bits %04X in WAL-Segment %s, LSN %X/%X, Offset %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL-Datei ist von einem anderen Datenbanksystem: Datenbanksystemidentifikator in WAL-Datei ist %llu, Datenbanksystemidentifikator in pg_control ist %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL-Datei ist von einem anderen Datenbanksystem: Datenbanksystemidentifikator in WAL-Datei ist %<PRIu64>, Datenbanksystemidentifikator in pg_control ist %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL-Datei ist von einem anderen Datenbanksystem: falsche Segmentgröße im Seitenkopf"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL-Datei ist von einem anderen Datenbanksystem: falsche XLOG_BLCKSZ im Seitenkopf"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "unerwartete Pageaddr %X/%X in WAL-Segment %s, LSN %X/%X, Offset %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "Zeitleisten-ID %u außer der Reihe (nach %u) in WAL-Segment %s, LSN %X/%X, Offset %u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, 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:1773
+#: access/transam/xlogreader.c:1793
 #, 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:1780
+#: access/transam/xlogreader.c:1800
 #, 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:1816
+#: access/transam/xlogreader.c:1836
 #, 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:1832
+#: access/transam/xlogreader.c:1852
 #, 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:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED gesetzt, aber Block-Abbild-Länge %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "weder BKPIMAGE_HAS_HOLE noch BKPIMAGE_COMPRESSED gesetzt, aber Block-Abbild-Länge ist %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, 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:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ungültige block_id %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "Datensatz mit ungültiger Länge bei %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "konnte Backup-Block mit ID %d nicht im WAL-Eintrag finden"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "konnte Abbild bei %X/%X mit ungültigem angegebenen Block %d nicht wiederherstellen"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "konnte Abbild mit ungültigem Zustand bei %X/%X nicht wiederherstellen, Block %d"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "konnte Abbild bei %X/%X nicht wiederherstellen, komprimiert mit %s, nicht unterstützt von dieser Installation, Block %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "konnte Abbild bei %X/%X nicht wiederherstellen, komprimiert mit unbekannter Methode, Block %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "konnte Abbild bei %X/%X nicht dekomprimieren, Block %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "starte Wiederherstellung aus Backup mit Redo-LSN %X/%X, Checkpoint-LSN %X/%X, auf Zeitleisten-ID %u"
 
-#: access/transam/xlogrecovery.c:649
-#, fuzzy, c-format
-#| msgid "could not find redo location referenced by checkpoint record"
+#: access/transam/xlogrecovery.c:656
+#, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
-msgstr "konnte die vom Checkpoint-Datensatz referenzierte Redo-Position nicht finden"
+msgstr "konnte die Redo-Position %X/%X, die vom Checkpoint-Datensatz bei %X/%X referenziert wird, nicht finden"
 
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
@@ -3216,467 +3208,488 @@ msgstr ""
 "Wenn Sie gerade kein Backup wiederherstellen, dann versuchen Sie, die Datei »%s/backup_label« zu entfernen.\n"
 "Vorsicht: Wenn ein Backup wiederhergestellt wird und »%s/backup_label« gelöscht wird, dann wird das den Cluster verfälschen."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "konnte den nötigen Checkpoint-Datensatz bei %X/%X nicht finden"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "ignoriere Datei »%s«, weil keine Datei »%s« existiert"
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Datei »%s« wurde in »%s« umbenannt."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "Konnte Datei »%s« nicht in »%s« umbenennen: %m."
 
-#: access/transam/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "starte Wiederherstellung aus Backup neu mit Redo-LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "konnte keinen gültigen Checkpoint-Datensatz bei %X/%X finden"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "konnte die Redo-Position %X/%08X, die vom Checkpoint-Datensatz bei %X/%08X referenziert wird, nicht finden"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "Standby-Modus eingeschaltet"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "starte Point-in-Time-Recovery bis XID %u"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "starte Point-in-Time-Recovery bis %s"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "starte Point-in-Time-Recovery bis »%s«"
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "starte Point-in-Time-Recovery bis WAL-Position (LSN) »%X/%X«"
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:842
 #, 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/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "starte Wiederherstellung aus Archiv"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:866
 #, 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/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:869
 #, 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."
+msgid "Latest checkpoint in file \"%s\" 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 in Datei »%s« 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/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:884
 #, 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/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "ungültige nächste Transaktions-ID"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "ungültiges Redo im Checkpoint-Datensatz"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "ungültiger Redo-Datensatz im Shutdown-Checkpoint"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:957
 #, 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/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:961
 #, 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/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "Daten in backup_label stimmen nicht mit Kontrolldatei überein"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:1005
 #, 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/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "Verwendung von Recovery-Befehlsdatei »%s« wird nicht unterstützt"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1124
 #, 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/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "weder »primary_conninfo« noch »restore_command« angegeben"
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr "Der Datenbankserver prüft das Unterverzeichnis pg_wal regelmäßig auf dort abgelegte Dateien."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "»restore_command« muss angegeben werden, wenn der Standby-Modus nicht eingeschaltet ist"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "recovery_target_timeline %u existiert nicht"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278
+#: access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425
+#: access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "ungültige Daten in Datei »%s«"
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "Gelesene Zeitleisten-ID ist %u, aber %u wurde erwartet."
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "dies ist ein inkrementelles Backup, kein Datenverzeichnis"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "Verwenden Sie pg_combinebackup, um ein gültiges Datenverzeichnis zu rekonstruieren."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "unerwarteter Datensatztyp bei Redo-Position %X/%X gefunden"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "Redo beginnt bei %X/%X"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "Redo im Gang, abgelaufene Zeit: %ld.%02d s, aktuelle LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "angeforderter Recovery-Endpunkt ist vor konsistentem Recovery-Punkt"
 
-#: access/transam/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "Redo fertig bei %X/%X Systembenutzung: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "letzte vollständige Transaktion war bei Logzeit %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "Redo nicht nötig"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "Wiederherstellung endete bevor das konfigurierte Wiederherstellungsziel erreicht wurde"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "fehlender Contrecord bei %X/%X erfolgreich übersprungen, überschrieben am %s"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "unerwarteter Verzeichniseintrag »%s« in %s gefunden"
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2184
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr "Alle Verzeichniseinträge in pg_tblspc/ sollten symbolische Verknüpfungen sein."
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "Alle Verzeichniseinträge in %s/ sollten symbolische Verknüpfungen sein."
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr "Entfernen Sie diese Verzeichnisse oder setzen Sie »allow_in_place_tablespaces« vorrübergehend auf ON, damit die Wiederherstellung abschließen kann."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "Wiederherstellung aus Backup abgeschlossen mit Redo-LSN %X/%X und End-LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "konsistenter Wiederherstellungszustand erreicht bei %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "WAL-Redo bei %X/%X für %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2405
 #, 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/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "unerwartete Zeitleisten-ID %u (nach %u) im Checkpoint-Datensatz"
 
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2430
 #, 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/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "Wiederherstellung beendet nachdem Konsistenz erreicht wurde"
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "Wiederherstellung beendet vor WAL-Position (LSN) »%X/%X«"
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "Wiederherstellung beendet vor Commit der Transaktion %u, Zeit %s"
 
-#: access/transam/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "Wiederherstellung beendet vor Abbruch der Transaktion %u, Zeit %s"
 
-#: access/transam/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "Wiederherstellung beendet bei Restore-Punkt »%s«, Zeit %s"
 
-#: access/transam/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "Wiederherstellung beendet nach WAL-Position (LSN) »%X/%X«"
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "Wiederherstellung beendet nach Commit der Transaktion %u, Zeit %s"
 
-#: access/transam/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "Wiederherstellung beendet nach Abbruch der Transaktion %u, Zeit %s"
 
-#: access/transam/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "pausiere am Ende der Wiederherstellung"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "Führen Sie pg_wal_replay_resume() aus, um den Server zum Primärserver zu befördern."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4678
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "Wiederherstellung wurde pausiert"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "Führen Sie pg_wal_replay_resume() aus um fortzusetzen."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "unerwartete Zeitleisten-ID %u in WAL-Segment %s, LSN %X/%X, Offset %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "konnte nicht aus WAL-Segment %s, LSN %X/%X, Position %u lesen: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "konnte nicht aus WAL-Segment %s, LSN %X/%X, Position %u lesen: %d von %zu gelesen"
 
-#: access/transam/xlogrecovery.c:4060
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "ungültige Checkpoint-Position"
 
-#: access/transam/xlogrecovery.c:4070
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "ungültiger Checkpoint-Datensatz"
 
-#: access/transam/xlogrecovery.c:4076
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "ungültige Resource-Manager-ID im Checkpoint-Datensatz"
 
-#: access/transam/xlogrecovery.c:4084
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "ungültige xl_info im Checkpoint-Datensatz"
 
-#: access/transam/xlogrecovery.c:4090
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "ungültige Länge des Checkpoint-Datensatzes"
 
-#: access/transam/xlogrecovery.c:4144
+#: access/transam/xlogrecovery.c:4188
 #, 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/xlogrecovery.c:4158
+#: access/transam/xlogrecovery.c:4202
 #, 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/xlogrecovery.c:4177
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "neue Zielzeitleiste ist %u"
 
-#: access/transam/xlogrecovery.c:4380
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "Herunterfahren des WAL-Receiver-Prozesses verlangt"
 
-#: access/transam/xlogrecovery.c:4440
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "Anforderung zum Befördern empfangen"
 
-#: access/transam/xlogrecovery.c:4669
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "Hot Standby ist nicht möglich wegen unzureichender Parametereinstellungen"
 
-#: access/transam/xlogrecovery.c:4670 access/transam/xlogrecovery.c:4697
-#: access/transam/xlogrecovery.c:4727
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739
+#: access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d ist eine niedrigere Einstellung als auf dem Primärserver, wo der Wert %d war."
 
-#: access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "Wenn die Wiederherstellungspause beendet wird, wird der Server herunterfahren."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "Sie können den Server dann neu starten, nachdem die nötigen Konfigurationsänderungen getätigt worden sind."
 
-#: access/transam/xlogrecovery.c:4691
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "Beförderung ist nicht möglich wegen unzureichender Parametereinstellungen"
 
-#: access/transam/xlogrecovery.c:4701
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "Starten Sie den Server neu, nachdem die nötigen Konfigurationsänderungen getätigt worden sind."
 
-#: access/transam/xlogrecovery.c:4725
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "Wiederherstellung abgebrochen wegen unzureichender Parametereinstellungen"
 
-#: access/transam/xlogrecovery.c:4731
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "Sie können den Server neu starten, nachdem die nötigen Konfigurationsänderungen getätigt worden sind."
 
-#: access/transam/xlogrecovery.c:4773
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795
+#: catalog/dependency.c:1153 catalog/dependency.c:1160
+#: catalog/dependency.c:1171 commands/tablecmds.c:1529
+#: commands/tablecmds.c:16752 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5282
+#: executor/execExprInterp.c:5290 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1057 replication/slot.c:1705
+#: replication/slot.c:2783 replication/slot.c:2785 replication/syncrep.c:1079
+#: storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137
+#: storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207
+#: utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868
+#: utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "mehrere Wiederherstellungsziele angegeben"
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "Höchstens eins aus »recovery_target«, »recovery_target_lsn«, »recovery_target_name«, »recovery_target_time«, »recovery_target_xid« darf gesetzt sein."
 
-#: access/transam/xlogrecovery.c:4785
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Der einzige erlaubte Wert ist »immediate«."
 
-#: access/transam/xlogrecovery.c:4937 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4991
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp ist außerhalb des gültigen Bereichs: »%s«"
+msgid "Timestamp out of range: \"%s\"."
+msgstr "Timestamp ist außerhalb des gültigen Bereichs: »%s«."
 
-#: access/transam/xlogrecovery.c:4982
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "»recovery_target_timeline« ist keine gültige Zahl."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "konnte nicht aus WAL-Segment %s, Position %d lesen: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr "konnte nicht aus WAL-Segment %s, Position %d lesen: %d von %d gelesen"
@@ -3697,7 +3710,7 @@ msgstr "Der fehlgeschlagene Archivbefehl war: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "Archivbefehl wurde durch Ausnahme 0x%X beendet"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3094
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2832
 #, 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."
@@ -3712,165 +3725,165 @@ msgstr "Archivbefehl wurde von Signal %d beendet: %s"
 msgid "archive command exited with unrecognized status %d"
 msgstr "Archivbefehl hat mit unbekanntem Status %d beendet"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "End-Zeitleiste %u wurde erwartet, aber Zeitleiste %u wurde gefunden"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "Start-Zeitleiste %u wurde erwartet, aber Zeitleiste %u wurde gefunden"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "Start-Zeitleiste %u nicht in der History der Zeitleiste %u gefunden"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "konnte Position in temporärer Datei nicht auf Anfang setzen"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "konnte keine WAL-Dateien finden"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "konnte WAL-Datei »%s« nicht finden"
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "unerwartete WAL-Dateigröße »%s«"
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
 msgstr[0] "%lld Prüfsummenfehler insgesamt"
 msgstr[1] "%lld Prüfsummenfehler insgesamt"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "Prüfsummenüberprüfung bei der Basissicherung fehlgeschlagen"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "doppelte Option »%s«"
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "unbekannter Checkpoint-Typ: »%s«"
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr "inkrementelle Backups können nicht durchgeführt werden, wenn WAL-Zusammenfassung nicht eingeschaltet ist"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, 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)"
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "unbekannte Manifestoption: »%s«"
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "unbekannter Komprimierungsalgorithmus: »%s«"
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "unbekannte Base-Backup-Option: »%s«"
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "Manifest-Prüfsummen benötigen ein Backup-Manifest"
 
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "Zieldetail kann nicht ohne Ziel verwendet werden"
 
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "Ziel »%s« akzeptiert kein Zieldetail"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "Komprimierungsdetail kann nicht angegeben werden, wenn Komprimierung nicht eingeschaltet ist"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "ungültige Komprimierungsangabe: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
-msgstr ""
+msgstr "UPLOAD_MANIFEST muss vor einem inkrementellen BASE_BACKUP ausgeführt werden"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "überspringe besondere Datei »%s«"
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid "could not verify checksum in file \"%s\", block %u: read buffer size %d and page size %d differ"
 msgstr "konnte Prüfsumme in Datei »%s«, Block %u nicht überprüfen: gelesene Puffergröße %d und Seitengröße %d sind verschieden"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
 msgstr[0] "Datei »%s« hat insgesamt %d Prüfsummenfehler"
 msgstr[1] "Datei »%s« hat insgesamt %d Prüfsummenfehler"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated %X but expected %X"
 msgstr "Prüfsummenüberprüfung fehlgeschlagen in Datei »%s«, Block %u: berechnet %X, aber erwartet %X"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid "further checksum verification failures in file \"%s\" will not be reported"
 msgstr "weitere Prüfsummenfehler in Datei »%s« werden nicht berichtet werden"
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "Dateiname zu lang für Tar-Format: »%s«"
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, 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«"
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "konnte Datei »%s« nicht lesen: %zd von %zu gelesen"
@@ -3885,84 +3898,65 @@ msgstr "gzip-Komprimierung wird von dieser Installation nicht unterstützt"
 msgid "could not initialize compression library"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren"
 
-#: backup/basebackup_incremental.c:300
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
-msgstr ""
+msgstr "Manifest enthält keine benötigten WAL-Bereiche"
 
-#: backup/basebackup_incremental.c:355
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "Zeitleiste %u wurde im Manifest gefunden, aber nicht in der History dieses Servers"
 
-#: backup/basebackup_incremental.c:420
-#, fuzzy, c-format
-#| msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
+#: backup/basebackup_incremental.c:412
+#, c-format
 msgid "manifest requires WAL from initial timeline %u starting at %X/%X, but that timeline begins at %X/%X"
-msgstr "Server beendete Streaming von Zeitleiste %u bei %X/%X, aber gab an, dass nächste Zeitleiste %u bei %X/%X beginnt"
+msgstr "Manifest benötigt WAL aus der initialen Zeitleiste %u beginnend bei %X/%X, aber diese Zeitleiste beginnt bei %X/%X"
 
-#: backup/basebackup_incremental.c:430
-#, fuzzy, c-format
-#| msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
+#: backup/basebackup_incremental.c:422
+#, c-format
 msgid "manifest requires WAL from continuation timeline %u starting at %X/%X, but that timeline begins at %X/%X"
-msgstr "Server beendete Streaming von Zeitleiste %u bei %X/%X, aber gab an, dass nächste Zeitleiste %u bei %X/%X beginnt"
+msgstr "Manifest benötigt WAL aus der Fortsetzungszeitleiste %u beginnend bei %X/%X, aber diese Zeitleiste beginnt bei %X/%X"
 
-#: backup/basebackup_incremental.c:441
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid "manifest requires WAL from final timeline %u ending at %X/%X, but this backup starts at %X/%X"
-msgstr ""
-
-#: backup/basebackup_incremental.c:451
-#, fuzzy, c-format
-#| msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
-msgid "manifest requires WAL from non-final timeline %u ending at %X/%X, but this server switched timelines at %X/%X"
-msgstr "Server beendete Streaming von Zeitleiste %u bei %X/%X, aber gab an, dass nächste Zeitleiste %u bei %X/%X beginnt"
-
-#: backup/basebackup_incremental.c:518
-#, c-format
-msgid "WAL summarization is not progressing"
-msgstr ""
-
-#: backup/basebackup_incremental.c:519
-#, c-format
-msgid "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/%X in memory."
-msgstr ""
+msgstr "Manifest benötigt WAL aus der finalen Zeitleiste %u endend bei %X/%X, aber dieses Backup startet bei %X/%X"
 
-#: backup/basebackup_incremental.c:532
+#: backup/basebackup_incremental.c:437
 #, c-format
-msgid "still waiting for WAL summarization through %X/%X after %ld seconds"
-msgstr ""
+msgid "This can happen for incremental backups on a standby if there was little activity since the previous backup."
+msgstr "Das kann für inkrementelle Backups auf einem Standby passieren, wenn es wenig Aktivität seit dem letzten Backup gab."
 
-#: backup/basebackup_incremental.c:535
+#: backup/basebackup_incremental.c:444
 #, c-format
-msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
-msgstr ""
+msgid "manifest requires WAL from non-final timeline %u ending at %X/%X, but this server switched timelines at %X/%X"
+msgstr "Manifest benötigt WAL aus der nicht-finalen Zeitleiste %u endend bei %X/%X, aber dieser Server hat die Zeitleiste bei %X/%X gewechselt"
 
-#: backup/basebackup_incremental.c:604
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no summaries for that timeline and LSN range exist"
-msgstr ""
+msgstr "WAL-Zusammenfassungen auf Zeitleiste %u von %X/%X bis %X/%X werden benötigt, aber für diese Zeitleiste und diesen LSN-Bereich existieren keine Zusammenfassungen."
 
-#: backup/basebackup_incremental.c:611
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the summaries for that timeline and LSN range are incomplete"
-msgstr ""
+msgstr "WAL-Zusammenfassungen auf Zeitleiste %u von %X/%X bis %X/%X werden benötigt, aber die Zusammenfassungen für diese Zeitleiste und diesen LSN-Bereich sind unvollständig."
 
-#: backup/basebackup_incremental.c:615
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "Die erste nicht zusammengefasste LSN in diesem Bereich ist %X/%X."
 
-#: backup/basebackup_incremental.c:1015
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "Backup-Manifest Version 1 unterstützt kein inkrementelles Backup"
 
-#: backup/basebackup_incremental.c:1033
-#, fuzzy, c-format
-#| msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgid "manifest system identifier is %llu, but database system identifier is %llu"
-msgstr "%s: Systemidentifikator im Manifest ist %llu, aber Kontrolldatei hat %llu"
+#: backup/basebackup_incremental.c:966
+#, c-format
+msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
+msgstr "Systemidentifikator im Backup-Manifest ist %<PRIu64>, aber Datenbanksystemidentifikator ist %<PRIu64>"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -3984,10 +3978,10 @@ msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können ein auf dem Serv
 msgid "relative path not allowed for backup stored on server"
 msgstr "relativer Pfad nicht erlaubt für auf dem Server abgelegtes Backup"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
@@ -3997,15 +3991,15 @@ msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "Verzeichnis »%s« existiert aber ist nicht leer"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1177
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "konnte nicht auf Verzeichnis »%s« zugreifen: %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "Prüfen Sie den freien Festplattenplatz."
@@ -4043,688 +4037,684 @@ msgstr "konnte Long-Distance-Modus nicht einschalten: %s"
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "ungültige Zeitleiste %lld"
+msgid "invalid timeline %<PRId64>"
+msgstr "ungültige Zeitleiste %<PRId64>"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:627 tcop/postgres.c:3862
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s muss erstes Argument sein"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3859
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:641 tcop/postgres.c:3876
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3864
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:646 tcop/postgres.c:3881
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:764
+#: postmaster/postmaster.c:777
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: ungültige Kommandozeilenargumente\n"
 
-#: catalog/aclchk.c:210
+#: catalog/aclchk.c:211
 #, c-format
 msgid "grant options can only be granted to roles"
 msgstr "Grant-Optionen können nur Rollen gewährt werden"
 
-#: catalog/aclchk.c:332
+#: catalog/aclchk.c:333
 #, 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"
 
-#: catalog/aclchk.c:337
+#: catalog/aclchk.c:338
 #, c-format
 msgid "no privileges were granted for \"%s\""
 msgstr "es wurden keine Privilegien für »%s« gewährt"
 
-#: catalog/aclchk.c:345
+#: catalog/aclchk.c:346
 #, 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"
 
-#: catalog/aclchk.c:350
+#: catalog/aclchk.c:351
 #, c-format
 msgid "not all privileges were granted for \"%s\""
 msgstr "es wurden nicht alle Priviligien für »%s« gewährt"
 
-#: catalog/aclchk.c:361
+#: catalog/aclchk.c:362
 #, 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"
 
-#: catalog/aclchk.c:366
+#: catalog/aclchk.c:367
 #, c-format
 msgid "no privileges could be revoked for \"%s\""
 msgstr "es konnten keine Privilegien für »%s« entzogen werden"
 
-#: catalog/aclchk.c:374
+#: catalog/aclchk.c:375
 #, 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"
 
-#: catalog/aclchk.c:379
+#: catalog/aclchk.c:380
 #, c-format
 msgid "not all privileges could be revoked for \"%s\""
 msgstr "es konnten nicht alle Privilegien für »%s« entzogen werden"
 
-#: catalog/aclchk.c:411
+#: catalog/aclchk.c:412
 #, c-format
 msgid "grantor must be current user"
 msgstr "Grantor muss aktueller Benutzer sein"
 
-#: catalog/aclchk.c:479 catalog/aclchk.c:1054
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "ungültiger Privilegtyp %s für Relation"
 
-#: catalog/aclchk.c:483 catalog/aclchk.c:1058
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "ungültiger Privilegtyp %s für Sequenz"
 
-#: catalog/aclchk.c:487
+#: catalog/aclchk.c:488
 #, c-format
 msgid "invalid privilege type %s for database"
 msgstr "ungültiger Privilegtyp %s für Datenbank"
 
-#: catalog/aclchk.c:491
+#: catalog/aclchk.c:492
 #, c-format
 msgid "invalid privilege type %s for domain"
 msgstr "ungültiger Privilegtyp %s für Domäne"
 
-#: catalog/aclchk.c:495 catalog/aclchk.c:1062
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "ungültiger Privilegtyp %s für Funktion"
 
-#: catalog/aclchk.c:499
+#: catalog/aclchk.c:500
 #, c-format
 msgid "invalid privilege type %s for language"
 msgstr "ungültiger Privilegtyp %s für Sprache"
 
-#: catalog/aclchk.c:503
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "ungültiger Privilegtyp %s für Large Object"
 
-#: catalog/aclchk.c:507 catalog/aclchk.c:1078
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "ungültiger Privilegtyp %s für Schema"
 
-#: catalog/aclchk.c:511 catalog/aclchk.c:1066
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "ungültiger Privilegtyp %s für Prozedur"
 
-#: catalog/aclchk.c:515 catalog/aclchk.c:1070
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "ungültiger Privilegtyp %s für Routine"
 
-#: catalog/aclchk.c:519
+#: catalog/aclchk.c:520
 #, c-format
 msgid "invalid privilege type %s for tablespace"
 msgstr "ungültiger Privilegtyp %s für Tablespace"
 
-#: catalog/aclchk.c:523 catalog/aclchk.c:1074
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "ungültiger Privilegtyp %s für Typ"
 
-#: catalog/aclchk.c:527
+#: catalog/aclchk.c:528
 #, c-format
 msgid "invalid privilege type %s for foreign-data wrapper"
 msgstr "ungültiger Privilegtyp %s für Fremddaten-Wrapper"
 
-#: catalog/aclchk.c:531
+#: catalog/aclchk.c:532
 #, c-format
 msgid "invalid privilege type %s for foreign server"
 msgstr "ungültiger Privilegtyp %s für Fremdserver"
 
-#: catalog/aclchk.c:535
+#: catalog/aclchk.c:536
 #, c-format
 msgid "invalid privilege type %s for parameter"
 msgstr "ungültiger Privilegtyp %s für Parameter"
 
-#: catalog/aclchk.c:574
+#: catalog/aclchk.c:575
 #, c-format
 msgid "column privileges are only valid for relations"
 msgstr "Spaltenprivilegien sind nur für Relation gültig"
 
-#: catalog/aclchk.c:737 catalog/aclchk.c:3624 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "Large Object %u existiert nicht"
-
-#: catalog/aclchk.c:1111
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "Vorgabeprivilegien können nicht für Spalten gesetzt werden"
 
-#: catalog/aclchk.c:1147
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "keine Berechtigung, um Vorgabeprivilegien zu ändern"
 
-#: catalog/aclchk.c:1265
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "Klausel IN SCHEMA kann nicht verwendet werden, wenn GRANT/REVOKE ON SCHEMAS verwendet wird"
-
-#: catalog/aclchk.c:1616 catalog/catalog.c:629 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:913
-#: commands/sequence.c:1645 commands/tablecmds.c:7549 commands/tablecmds.c:7703
-#: commands/tablecmds.c:7753 commands/tablecmds.c:7827
-#: commands/tablecmds.c:7897 commands/tablecmds.c:8027
-#: commands/tablecmds.c:8156 commands/tablecmds.c:8250
-#: commands/tablecmds.c:8351 commands/tablecmds.c:8478
-#: commands/tablecmds.c:8508 commands/tablecmds.c:8650
-#: commands/tablecmds.c:8743 commands/tablecmds.c:8877
-#: commands/tablecmds.c:8989 commands/tablecmds.c:12709
-#: commands/tablecmds.c:12890 commands/tablecmds.c:13051
-#: commands/tablecmds.c:14240 commands/tablecmds.c:16866 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3538
-#: parser/parse_utilcmd.c:3578 parser/parse_utilcmd.c:3620 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2811
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
+#, c-format
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "Klausel IN SCHEMA kann nicht verwendet werden, wenn %s verwendet wird"
+
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2635
+#: catalog/heap.c:2957 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1040
+#: commands/sequence.c:1655 commands/tablecmds.c:7761 commands/tablecmds.c:7939
+#: commands/tablecmds.c:8140 commands/tablecmds.c:8269
+#: commands/tablecmds.c:8423 commands/tablecmds.c:8517
+#: commands/tablecmds.c:8620 commands/tablecmds.c:8786
+#: commands/tablecmds.c:8816 commands/tablecmds.c:8971
+#: commands/tablecmds.c:9074 commands/tablecmds.c:9208
+#: commands/tablecmds.c:9321 commands/tablecmds.c:14409
+#: commands/tablecmds.c:14612 commands/tablecmds.c:14773
+#: commands/tablecmds.c:16001 commands/tablecmds.c:18768 commands/trigger.c:948
+#: parser/analyze.c:2591 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3671
+#: parser/parse_utilcmd.c:3711 parser/parse_utilcmd.c:3753
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "Spalte »%s« von Relation »%s« existiert nicht"
 
-#: catalog/aclchk.c:1861
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "»%s« ist ein Index"
 
-#: catalog/aclchk.c:1868 commands/tablecmds.c:14397 commands/tablecmds.c:17775
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16158 commands/tablecmds.c:19687
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "»%s« ist ein zusammengesetzter Typ"
 
-#: catalog/aclchk.c:1876 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17739 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19651 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "»%s« ist keine Sequenz"
 
-#: catalog/aclchk.c:1914
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "Sequenz »%s« unterstützt nur die Privilegien USAGE, SELECT und UPDATE"
 
-#: catalog/aclchk.c:1931
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "ungültiger Privilegtyp %s für Tabelle"
 
-#: catalog/aclchk.c:2093
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "ungültiger Privilegtyp %s für Spalte"
 
-#: catalog/aclchk.c:2106
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "Sequenz »%s« unterstützt nur den Spaltenprivilegientyp SELECT"
 
-#: catalog/aclchk.c:2296
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "Sprache »%s« ist nicht »trusted«"
 
-#: catalog/aclchk.c:2298
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "GRANT und REVOKE sind für nicht vertrauenswürdige Sprachen nicht erlaubt, weil nur Superuser nicht vertrauenswürdige Sprachen verwenden können."
 
-#: catalog/aclchk.c:2449
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "für Array-Typen können keine Privilegien gesetzt werden"
 
-#: catalog/aclchk.c:2450
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "Setzen Sie stattdessen die Privilegien des Elementtyps."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "für Multirange-Typen können keine Privilegien gesetzt werden"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "Setzen Sie stattdessen die Privilegien des Range-Typs."
 
-#: catalog/aclchk.c:2462 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "»%s« ist keine Domäne"
-
-#: catalog/aclchk.c:2648
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "unbekannter Privilegtyp »%s«"
 
-#: catalog/aclchk.c:2715
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "keine Berechtigung für Aggregatfunktion %s"
 
-#: catalog/aclchk.c:2718
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "keine Berechtigung für Sortierfolge %s"
 
-#: catalog/aclchk.c:2721
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "keine Berechtigung für Spalte %s"
 
-#: catalog/aclchk.c:2724
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "keine Berechtigung für Konversion %s"
 
-#: catalog/aclchk.c:2727
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "keine Berechtigung für Datenbank %s"
 
-#: catalog/aclchk.c:2730
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "keine Berechtigung für Domäne %s"
 
-#: catalog/aclchk.c:2733
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "keine Berechtigung für Ereignistrigger %s"
 
-#: catalog/aclchk.c:2736
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "keine Berechtigung für Erweiterung %s"
 
-#: catalog/aclchk.c:2739
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "keine Berechtigung für Fremddaten-Wrapper %s"
 
-#: catalog/aclchk.c:2742
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "keine Berechtigung für Fremdserver %s"
 
-#: catalog/aclchk.c:2745
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "keine Berechtigung für Fremdtabelle %s"
 
-#: catalog/aclchk.c:2748
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "keine Berechtigung für Funktion %s"
 
-#: catalog/aclchk.c:2751
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "keine Berechtigung für Index %s"
 
-#: catalog/aclchk.c:2754
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "keine Berechtigung für Sprache %s"
 
-#: catalog/aclchk.c:2757
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "keine Berechtigung für Large Object %s"
 
-#: catalog/aclchk.c:2760
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "keine Berechtigung für materialisierte Sicht %s"
 
-#: catalog/aclchk.c:2763
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "keine Berechtigung für Operatorklasse %s"
 
-#: catalog/aclchk.c:2766
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "keine Berechtigung für Operator %s"
 
-#: catalog/aclchk.c:2769
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "keine Berechtigung für Operatorfamilie %s"
 
-#: catalog/aclchk.c:2772
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "keine Berechtigung für Parameter %s"
 
-#: catalog/aclchk.c:2775
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "keine Berechtigung für Policy %s"
 
-#: catalog/aclchk.c:2778
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "keine Berechtigung für Prozedur %s"
 
-#: catalog/aclchk.c:2781
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "keine Berechtigung für Publikation %s"
 
-#: catalog/aclchk.c:2784
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "keine Berechtigung für Routine %s"
 
-#: catalog/aclchk.c:2787
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "keine Berechtigung für Schema %s"
 
-#: catalog/aclchk.c:2790 commands/sequence.c:647 commands/sequence.c:873
-#: commands/sequence.c:915 commands/sequence.c:956 commands/sequence.c:1743
-#: commands/sequence.c:1789
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880
+#: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "keine Berechtigung für Sequenz %s"
 
-#: catalog/aclchk.c:2793
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "keine Berechtigung für Statistikobjekt %s"
 
-#: catalog/aclchk.c:2796
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "keine Berechtigung für Subskription %s"
 
-#: catalog/aclchk.c:2799
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "keine Berechtigung für Tabelle %s"
 
-#: catalog/aclchk.c:2802
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "keine Berechtigung für Tablespace %s"
 
-#: catalog/aclchk.c:2805
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "keine Berechtigung für Textsuchekonfiguration %s"
 
-#: catalog/aclchk.c:2808
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "keine Berechtigung für Textsuchewörterbuch %s"
 
-#: catalog/aclchk.c:2811
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "keine Berechtigung für Typ %s"
 
-#: catalog/aclchk.c:2814
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "keine Berechtigung für Sicht %s"
 
-#: catalog/aclchk.c:2850
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "Berechtigung nur für Eigentümer der Aggregatfunktion %s"
 
-#: catalog/aclchk.c:2853
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "Berechtigung nur für Eigentümer der Sortierfolge %s"
 
-#: catalog/aclchk.c:2856
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "Berechtigung nur für Eigentümer der Konversion %s"
 
-#: catalog/aclchk.c:2859
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "Berechtigung nur für Eigentümer der Datenbank %s"
 
-#: catalog/aclchk.c:2862
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "Berechtigung nur für Eigentümer der Domäne %s"
 
-#: catalog/aclchk.c:2865
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "Berechtigung nur für Eigentümer des Ereignistriggers %s"
 
-#: catalog/aclchk.c:2868
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "Berechtigung nur für Eigentümer der Erweiterung %s"
 
-#: catalog/aclchk.c:2871
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "Berechtigung nur für Eigentümer des Fremddaten-Wrappers %s"
 
-#: catalog/aclchk.c:2874
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "Berechtigung nur für Eigentümer des Fremdservers %s"
 
-#: catalog/aclchk.c:2877
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "Berechtigung nur für Eigentümer der Fremdtabelle %s"
 
-#: catalog/aclchk.c:2880
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "Berechtigung nur für Eigentümer der Funktion %s"
 
-#: catalog/aclchk.c:2883
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "Berechtigung nur für Eigentümer des Index %s"
 
-#: catalog/aclchk.c:2886
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "Berechtigung nur für Eigentümer der Sprache %s"
 
-#: catalog/aclchk.c:2889
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "Berechtigung nur für Eigentümer des Large Object %s"
 
-#: catalog/aclchk.c:2892
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "Berechtigung nur für Eigentümer der materialisierten Sicht %s"
 
-#: catalog/aclchk.c:2895
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "Berechtigung nur für Eigentümer der Operatorklasse %s"
 
-#: catalog/aclchk.c:2898
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "Berechtigung nur für Eigentümer des Operators %s"
 
-#: catalog/aclchk.c:2901
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "Berechtigung nur für Eigentümer der Operatorfamilie %s"
 
-#: catalog/aclchk.c:2904
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "Berechtigung nur für Eigentümer der Prozedur %s"
 
-#: catalog/aclchk.c:2907
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "Berechtigung nur für Eigentümer der Publikation %s"
 
-#: catalog/aclchk.c:2910
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "Berechtigung nur für Eigentümer der Routine %s"
 
-#: catalog/aclchk.c:2913
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "Berechtigung nur für Eigentümer der Sequenz %s"
 
-#: catalog/aclchk.c:2916
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "Berechtigung nur für Eigentümer der Subskription %s"
 
-#: catalog/aclchk.c:2919
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "Berechtigung nur für Eigentümer der Tabelle %s"
 
-#: catalog/aclchk.c:2922
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "Berechtigung nur für Eigentümer des Typs %s"
 
-#: catalog/aclchk.c:2925
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "Berechtigung nur für Eigentümer der Sicht %s"
 
-#: catalog/aclchk.c:2928
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "Berechtigung nur für Eigentümer des Schemas %s"
 
-#: catalog/aclchk.c:2931
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "Berechtigung nur für Eigentümer des Statistikobjekts %s"
 
-#: catalog/aclchk.c:2934
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "Berechtigung nur für Eigentümer des Tablespace %s"
 
-#: catalog/aclchk.c:2937
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "Berechtigung nur für Eigentümer der Textsuchekonfiguration %s"
 
-#: catalog/aclchk.c:2940
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "Berechtigung nur für Eigentümer des Textsuchewörterbuches %s"
 
-#: catalog/aclchk.c:2954
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "Berechtigung nur für Eigentümer der Relation %s"
 
-#: catalog/aclchk.c:3000
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "keine Berechtigung für Spalte »%s« von Relation »%s«"
 
-#: catalog/aclchk.c:3157 catalog/aclchk.c:4165 catalog/aclchk.c:4196
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s mit OID %u existiert nicht"
-
-#: catalog/aclchk.c:3240 catalog/aclchk.c:3259
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, 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:3297 catalog/aclchk.c:3360 catalog/aclchk.c:3999
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "Relation mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3545
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "Parameter-ACL mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3718 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "Large Object %u existiert nicht"
+
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "Schema mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3792 catalog/aclchk.c:3819 catalog/aclchk.c:3848
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "Typ mit OID %u existiert nicht"
 
-#: catalog/catalog.c:447
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "suche immer noch nach einer unbenutzten OID in in Relation »%s«"
 
-#: catalog/catalog.c:449
+#: catalog/catalog.c:506
 #, c-format
-msgid "OID candidates have been checked %llu time, but no unused OID has been found yet."
-msgid_plural "OID candidates have been checked %llu times, but no unused OID has been found yet."
-msgstr[0] "OID-Kandidaten wurden %llu mal geprüft, aber es wurde bisher keine unbenutzte OID gefunden."
-msgstr[1] "OID-Kandidaten wurden %llu mal geprüft, aber es wurde bisher keine unbenutzte OID gefunden."
+msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
+msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
+msgstr[0] "OID-Kandidaten wurden %<PRIu64> mal geprüft, aber es wurde bisher keine unbenutzte OID gefunden."
+msgstr[1] "OID-Kandidaten wurden %<PRIu64> mal geprüft, aber es wurde bisher keine unbenutzte OID gefunden."
 
-#: catalog/catalog.c:474
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "neue OID in Relation »%s« wurde zugewiesen nach %llu Versuch"
-msgstr[1] "neue OID in Relation »%s« wurde zugewiesen nach %llu Versuchen"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "neue OID in Relation »%s« wurde zugewiesen nach %<PRIu64> Versuch"
+msgstr[1] "neue OID in Relation »%s« wurde zugewiesen nach %<PRIu64> Versuchen"
 
-#: catalog/catalog.c:607 catalog/catalog.c:674
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "nur Superuser können %s() aufrufen"
 
-#: catalog/catalog.c:616
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() kann nur mit Systemkatalogen verwendet werden"
 
-#: catalog/catalog.c:621 parser/parse_utilcmd.c:2245
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2451
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "Index »%s« gehört nicht zu Tabelle »%s«"
 
-#: catalog/catalog.c:638
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "Spalte »%s« hat nicht Typ oid"
 
-#: catalog/catalog.c:645
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "»%s« ist kein Index für Spalte »%s«"
@@ -4774,19 +4764,6 @@ msgstr[1] ""
 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:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1447
-#: commands/tablecmds.c:14989 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1427 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6781
-#: utils/misc/guc.c:6815 utils/misc/guc.c:6849 utils/misc/guc.c:6892
-#: utils/misc/guc.c:6934
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4809,34 +4786,40 @@ msgstr[1] "Löschvorgang löscht ebenfalls %d weitere Objekte"
 msgid "constant of the type %s cannot be used here"
 msgstr "Konstante vom Typ %s kann hier nicht verwendet werden"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "auf Übergangstabelle »%s« kann in einem persistenten Objekt nicht verwiesen werden"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:224
+#: statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "Spalte %d von Relation »%s« existiert nicht"
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "keine Berechtigung, um »%s.%s« zu erzeugen"
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Änderungen an Systemkatalogen sind gegenwärtig nicht erlaubt."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2483 commands/tablecmds.c:2905
-#: commands/tablecmds.c:7171
+#: catalog/heap.c:463 commands/tablecmds.c:2572 commands/tablecmds.c:3024
+#: commands/tablecmds.c:7371
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "Tabellen können höchstens %d Spalten haben"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7440
+#: catalog/heap.c:481 commands/tablecmds.c:7673
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "Spaltenname »%s« steht im Konflikt mit dem Namen einer Systemspalte"
 
-#: catalog/heap.c:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "Spaltenname »%s« mehrmals angegeben"
@@ -4852,632 +4835,698 @@ msgstr "Partitionierungsschlüsselspalte %s hat Pseudotyp %s"
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "Spalte »%s« hat Pseudotyp %s"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:599
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "virtuelle generierte Spalte »%s« kann keinen Domänentyp haben"
+
+#: catalog/heap.c:626
 #, 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:687
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "virtuelle generierte Spalte »%s« kann keinen benutzerdefinierten Typ haben"
+
+#: catalog/heap.c:688 catalog/heap.c:3311
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "Virtuelle generierte Spalten, die benutzerdefinierte Typen verwenden, werden noch nicht unterstützt."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:700
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr "für Partitionierungsschlüsselspalte %s mit sortierbarem Typ %s wurde keine Sortierfolge abgeleitet"
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:507
+#: catalog/heap.c:706 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr "für Spalte »%s« mit sortierbarem Typ %s wurde keine Sortierfolge abgeleitet"
 
-#: catalog/heap.c:1161 catalog/index.c:899 commands/createas.c:403
-#: commands/tablecmds.c:4142 commands/tablecmds.c:20463
-#: commands/tablecmds.c:20725
+#: catalog/heap.c:1193 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4306
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "Relation »%s« existiert bereits"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1209 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "Typ »%s« existiert bereits"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1210
 #, 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:1218
+#: catalog/heap.c:1250
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "TOAST-Relfile-Nummer-Wert ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1261
 #, 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:1239
+#: catalog/heap.c:1271
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "Relfile-Nummer-Wert ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: catalog/heap.c:2121
+#: catalog/heap.c:2216
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "zur partitionierten Tabelle »%s« kann kein NO-INHERIT-Constraint hinzugefügt werden"
 
-#: catalog/heap.c:2393
+#: catalog/heap.c:2539
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "Check-Constraint »%s« existiert bereits"
 
-#: catalog/heap.c:2565 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9364
+#: catalog/heap.c:2640 catalog/heap.c:2963
+#, c-format
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "zur Systemspalte »%s« kann kein Not-Null-Constraint hinzugefügt werden"
+
+#: catalog/heap.c:2668 catalog/heap.c:2794 catalog/heap.c:3047
+#: catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9831
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "Constraint »%s« existiert bereits für Relation »%s«"
 
-#: catalog/heap.c:2572
+#: catalog/heap.c:2801
 #, 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«"
 
-#: catalog/heap.c:2583
+#: catalog/heap.c:2812
 #, 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:2593
+#: catalog/heap.c:2822
 #, 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:2598
+#: catalog/heap.c:2834
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
+msgstr "Constraint »%s« kollidiert mit NOT-ENFORCED-Constraint für Relation »%s«"
+
+#: catalog/heap.c:2839
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "Constraint »%s« wird mit geerbter Definition zusammengeführt"
 
-#: catalog/heap.c:2624 catalog/pg_constraint.c:853 commands/tablecmds.c:3062
-#: commands/tablecmds.c:3365 commands/tablecmds.c:7097
-#: commands/tablecmds.c:15807 commands/tablecmds.c:15938
+#: catalog/heap.c:2863 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154
+#: commands/tablecmds.c:3189 commands/tablecmds.c:3509
+#: commands/tablecmds.c:7296 commands/tablecmds.c:7977
+#: commands/tablecmds.c:17595 commands/tablecmds.c:17777
 #, c-format
 msgid "too many inheritance parents"
 msgstr "zu viele Elterntabellen"
 
-#: catalog/heap.c:2708
+#: catalog/heap.c:2982 parser/parse_utilcmd.c:2659
+#, c-format
+msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr "widersprüchliche NO INHERIT-Deklaration für Not-Null-Constraint für Spalte »%s«"
+
+#: catalog/heap.c:2996
+#, c-format
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "widersprüchliche Not-Null-Constraint-Namen »%s« und »%s«"
+
+#: catalog/heap.c:3026
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "kann keinen Not-Null-Constraint mit NO INHERIT für Spalte »%s« definieren"
+
+#: catalog/heap.c:3028
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "Die Spalte hat einen geerbten Not-Null-Constraint."
+
+#: catalog/heap.c:3218
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "generierte Spalte »%s« kann nicht im Spaltengenerierungsausdruck verwendet werden"
 
-#: catalog/heap.c:2710
+#: catalog/heap.c:3220
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "Eine generierte Spalte kann nicht auf eine andere generierte Spalte verweisen."
 
-#: catalog/heap.c:2716
+#: catalog/heap.c:3226
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr "Variable mit Verweis auf die ganze Zeile kann nicht im Spaltengenerierungsausdruck verwendet werden"
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:3227
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "Dadurch würde die generierte Spalte von ihrem eigenen Wert abhängen."
 
-#: catalog/heap.c:2772
+#: catalog/heap.c:3294
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "Generierungsausdruck verwendet benutzerdefinierte Funktion"
+
+#: catalog/heap.c:3295
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr "Virtuelle generierte Spalten, die benutzerdefinierte Funktionen verwenden, werden noch nicht unterstützt."
+
+#: catalog/heap.c:3310
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "Generierungsausdruck verwendet benutzerdefinierten Typ"
+
+#: catalog/heap.c:3362
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "Generierungsausdruck ist nicht »immutable«"
 
-#: catalog/heap.c:2800 rewrite/rewriteHandler.c:1281
+#: catalog/heap.c:3394 rewrite/rewriteHandler.c:1321
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "Spalte »%s« hat Typ %s, aber der Vorgabeausdruck hat Typ %s"
 
-#: catalog/heap.c:2805 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1286
+#: catalog/heap.c:3399 commands/prepare.c:334 parser/analyze.c:2922
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1326
 #, 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:2852
+#: catalog/heap.c:3446
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "nur Verweise auf Tabelle »%s« sind im Check-Constraint zugelassen"
 
-#: catalog/heap.c:3158
+#: catalog/heap.c:3752
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "nicht unterstützte Kombination aus ON COMMIT und Fremdschlüssel"
 
-#: catalog/heap.c:3159
+#: catalog/heap.c:3753
 #, 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."
 
-#: catalog/heap.c:3164
+#: catalog/heap.c:3758
 #, 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:3165
+#: catalog/heap.c:3759
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Tabelle »%s« verweist auf »%s«."
 
-#: catalog/heap.c:3167
+#: catalog/heap.c:3761
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Leeren Sie die Tabelle »%s« gleichzeitig oder verwenden Sie TRUNCATE ... CASCADE."
 
-#: catalog/index.c:219 parser/parse_utilcmd.c:2151
+#: catalog/index.c:220 parser/parse_utilcmd.c:2356
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "mehrere Primärschlüssel für Tabelle »%s« nicht erlaubt"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "Primärschlüssel können keine NULLS-NOT-DISTINCT-Indexe verwenden"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "Primärschlüssel können keine Ausdrücke sein"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "Primärschlüsselspalte »%s« ist nicht als NOT NULL markiert"
 
-#: catalog/index.c:798 catalog/index.c:1914
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "benutzerdefinierte Indexe für Systemkatalogtabellen werden nicht unterstützt"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr "nichtdeterministische Sortierfolgen werden von Operatorklasse »%s« nicht unterstützt"
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "nebenläufige Indexerzeugung für Systemkatalogtabellen wird nicht unterstützt"
 
-#: catalog/index.c:862 catalog/index.c:1330
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr "nebenläufige Indexerzeugung für Exclusion-Constraints wird nicht unterstützt"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr "Cluster-globale Indexe können nicht nach initdb erzeugt werden"
 
-#: catalog/index.c:891 commands/createas.c:418 commands/sequence.c:159
-#: parser/parse_utilcmd.c:212
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "Relation »%s« existiert bereits, wird übersprungen"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "Index-OID-Wert für pg_class ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3790
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "Index-Relfile-Nummer-Wert ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: catalog/index.c:2213
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY muss die erste Aktion in einer Transaktion sein"
 
-#: catalog/index.c:3669
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht reindizieren"
 
-#: catalog/index.c:3680 commands/indexcmds.c:3648
+#: catalog/index.c:3740 commands/indexcmds.c:3793
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "ungültiger Index einer TOAST-Tabelle kann nicht reindiziert werden"
 
-#: catalog/index.c:3696 commands/indexcmds.c:3526 commands/indexcmds.c:3672
-#: commands/tablecmds.c:3557
+#: catalog/index.c:3756 commands/indexcmds.c:3671 commands/indexcmds.c:3817
+#: commands/tablecmds.c:3713
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "Systemrelation »%s« kann nicht verschoben werden"
 
-#: catalog/index.c:3833
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "Index »%s« wurde neu indiziert"
 
-#: catalog/index.c:3999
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "ungültiger Index »%s.%s« einer TOAST-Tabelle kann nicht reindizert werden, wird übersprungen"
 
-#: catalog/namespace.c:447 catalog/namespace.c:651 catalog/namespace.c:743
-#: commands/trigger.c:5731
+#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
+#: commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: »%s.%s.%s«"
 
-#: catalog/namespace.c:504
+#: catalog/namespace.c:519
 #, c-format
 msgid "temporary tables cannot specify a schema name"
 msgstr "temporäre Tabellen können keinen Schemanamen angeben"
 
-#: catalog/namespace.c:585
+#: catalog/namespace.c:600
 #, c-format
 msgid "could not obtain lock on relation \"%s.%s\""
 msgstr "konnte Sperre für Relation »%s.%s« nicht setzen"
 
-#: catalog/namespace.c:590 commands/lockcmds.c:143 commands/lockcmds.c:223
+#: catalog/namespace.c:605 commands/lockcmds.c:143 commands/lockcmds.c:223
 #, c-format
 msgid "could not obtain lock on relation \"%s\""
 msgstr "konnte Sperre für Relation »%s« nicht setzen"
 
-#: catalog/namespace.c:618 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "Relation »%s.%s« existiert nicht"
 
-#: catalog/namespace.c:623 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "Relation »%s« existiert nicht"
 
-#: catalog/namespace.c:689 catalog/namespace.c:3507 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1933
+#: commands/extension.c:1939
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "kein Schema für die Objekterzeugung ausgewählt"
 
-#: catalog/namespace.c:841 catalog/namespace.c:854
+#: catalog/namespace.c:856 catalog/namespace.c:869
 #, c-format
 msgid "cannot create relations in temporary schemas of other sessions"
 msgstr "kann keine Relationen in temporären Schemas anderer Sitzungen erzeugen"
 
-#: catalog/namespace.c:845
+#: catalog/namespace.c:860
 #, c-format
 msgid "cannot create temporary relation in non-temporary schema"
 msgstr "kann keine temporäre Relation in einem nicht-temporären Schema erzeugen"
 
-#: catalog/namespace.c:860
+#: catalog/namespace.c:875
 #, c-format
 msgid "only temporary relations may be created in temporary schemas"
 msgstr "nur temporäre Relationen können in temporären Schemas erzeugt werden"
 
-#: catalog/namespace.c:2604
+#: catalog/namespace.c:2619
 #, c-format
 msgid "statistics object \"%s\" does not exist"
 msgstr "Statistikobjekt »%s« existiert nicht"
 
-#: catalog/namespace.c:2746
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "Textsucheparser »%s« existiert nicht"
 
-#: catalog/namespace.c:2891 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "Textsuchewörterbuch »%s« existiert nicht"
 
-#: catalog/namespace.c:3037
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "Textsuchevorlage »%s« existiert nicht"
 
-#: catalog/namespace.c:3182 commands/tsearchcmds.c:1168
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168
 #: utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "Textsuchekonfiguration »%s« existiert nicht"
 
-#: catalog/namespace.c:3314 parser/parse_expr.c:869 parser/parse_target.c:1259
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: %s"
 
-#: catalog/namespace.c:3320 gram.y:19230 gram.y:19270 parser/parse_expr.c:876
-#: parser/parse_target.c:1266
+#: catalog/namespace.c:3338 gram.y:19355 gram.y:19395 parser/parse_expr.c:874
+#: parser/parse_target.c:1269
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "falscher qualifizierter Name (zu viele Namensteile): %s"
 
-#: catalog/namespace.c:3450
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "Objekte können nicht in oder aus temporären Schemas verschoben werden"
 
-#: catalog/namespace.c:3456
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "Objekte können nicht in oder aus TOAST-Schemas verschoben werden"
 
-#: catalog/namespace.c:3529 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1392 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344
+#: commands/tablecmds.c:1474 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "Schema »%s« existiert nicht"
 
-#: catalog/namespace.c:3560
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "falscher Relationsname (zu viele Namensteile): %s"
 
-#: catalog/namespace.c:4001 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "Sortierfolge »%s« für Kodierung »%s« existiert nicht"
 
-#: catalog/namespace.c:4056
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "Konversion »%s« existiert nicht"
 
-#: catalog/namespace.c:4397
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "keine Berechtigung, um temporäre Tabellen in Datenbank »%s« zu erzeugen"
 
-#: catalog/namespace.c:4413
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "während der Wiederherstellung können keine temporären Tabellen erzeugt werden"
 
-#: catalog/namespace.c:4419
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "während einer parallelen Operation können keine temporären Tabellen erzeugt werden"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2315
-#: commands/tablecmds.c:12826 parser/parse_utilcmd.c:3249
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2397
+#: commands/tablecmds.c:14547
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "»%s« ist keine Tabelle"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17744 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19656 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "»%s« ist keine Sicht"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:183 commands/tablecmds.c:275
-#: commands/tablecmds.c:17749
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19661
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "»%s« ist keine materialisierte Sicht"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17754
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19666
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "»%s« ist keine Fremdtabelle"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "Relations- und Objektname müssen angegeben werden"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "Spaltenname muss qualifiziert werden"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, 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"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "Typ »%s« existiert nicht"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
 #, c-format
-msgid "operator %d (%s, %s) of %s does not exist"
+msgid "\"%s\" is not a domain"
+msgstr "»%s« ist keine Domäne"
+
+#: catalog/objectaddress.c:1742
+#, c-format
+msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "Operator %d (%s, %s) von %s existiert nicht"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "Funktion %d (%s, %s) von %s existiert nicht"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, 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"
 
-#: catalog/objectaddress.c:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:703
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1009 commands/foreigncmds.c:1372
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "Server »%s« existiert nicht"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "Publikationsrelation »%s« in Publikation »%s« existiert nicht"
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "Publikationsschema »%s« in Publikation »%s« existiert nicht"
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "unbekannter Standard-ACL-Objekttyp »%c«"
 
-#: catalog/objectaddress.c:2007
+#: catalog/objectaddress.c:2015
 #, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
-msgstr "Gültige Objekttypen sind »%c«, »%c«, »%c«, »%c«, »%c«."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgstr "Gültige Objekttypen sind »%c«, »%c«, »%c«, »%c«, »%c«, »%c«."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, 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"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, 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"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "Namens- oder Argumentlisten dürfen keine NULL-Werte enthalten"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "nicht unterstützter Objekttyp »%s«"
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "Länge der Namensliste muss genau %d sein"
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "Large-Object-OID darf nicht NULL sein"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "Länge der Namensliste muss mindestens %d sein"
 
-#: catalog/objectaddress.c:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "Länge der Argumentliste muss genau %d sein"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "Berechtigung nur für Eigentümer des Large Object %u"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, 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:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "keine Berechtigung"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "Der aktuelle Benutzer muss das %s-Attribut haben."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "Der aktuelle Benutzer muss die %s-Option für Rolle »%s« haben."
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "Berechtigung nur für Superuser"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "unbekannter Objekttyp »%s«"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2903
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr "Spalte %s von %s"
 
-#: catalog/objectaddress.c:2918
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "Funktion %s"
 
-#: catalog/objectaddress.c:2931
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "Typ %s"
 
-#: catalog/objectaddress.c:2968
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "Typumwandlung von %s in %s"
 
-#: catalog/objectaddress.c:3001
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "Sortierfolge %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3032
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "Constraint %s für %s"
 
-#: catalog/objectaddress.c:3038
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "Constraint %s"
 
-#: catalog/objectaddress.c:3070
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "Konversion %s"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3092
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "Vorgabewert für %s"
 
-#: catalog/objectaddress.c:3103
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "Sprache %s"
 
-#: catalog/objectaddress.c:3111
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "Large Object %u"
 
-#: catalog/objectaddress.c:3124
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "Operator %s"
 
-#: catalog/objectaddress.c:3161
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "Operatorklasse %s für Zugriffsmethode %s"
 
-#: catalog/objectaddress.c:3189
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "Zugriffsmethode %s"
@@ -5486,7 +5535,7 @@ msgstr "Zugriffsmethode %s"
 #. 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:3238
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "Operator %d (%s, %s) von %s: %s"
@@ -5495,236 +5544,241 @@ msgstr "Operator %d (%s, %s) von %s: %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3295
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "Funktion %d (%s, %s) von %s: %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3347
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "Regel %s für %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3393
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "Trigger %s für %s"
 
-#: catalog/objectaddress.c:3413
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "Schema %s"
 
-#: catalog/objectaddress.c:3441
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "Statistikobjekt %s"
 
-#: catalog/objectaddress.c:3472
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "Textsucheparser %s"
 
-#: catalog/objectaddress.c:3503
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "Textsuchewörterbuch %s"
 
-#: catalog/objectaddress.c:3534
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "Textsuchevorlage %s"
 
-#: catalog/objectaddress.c:3565
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "Textsuchekonfiguration %s"
 
-#: catalog/objectaddress.c:3578
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "Rolle %s"
 
-#: catalog/objectaddress.c:3615 catalog/objectaddress.c:5464
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "Mitgliedschaft von Rolle %s in Rolle %s"
 
-#: catalog/objectaddress.c:3636
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "Datenbank %s"
 
-#: catalog/objectaddress.c:3652
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "Tablespace %s"
 
-#: catalog/objectaddress.c:3663
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "Fremddaten-Wrapper %s"
 
-#: catalog/objectaddress.c:3673
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "Server %s"
 
-#: catalog/objectaddress.c:3706
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "Benutzerabbildung für %s auf Server %s"
 
-#: catalog/objectaddress.c:3758
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr "Vorgabeprivilegien für neue Relationen von Rolle %s in Schema %s"
 
-#: catalog/objectaddress.c:3762
+#: catalog/objectaddress.c:3812
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Relationen von Rolle %s"
 
-#: catalog/objectaddress.c:3768
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr "Vorgabeprivilegien für neue Sequenzen von Rolle %s in Schema %s"
 
-#: catalog/objectaddress.c:3772
+#: catalog/objectaddress.c:3822
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Sequenzen von Rolle %s"
 
-#: catalog/objectaddress.c:3778
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "Vorgabeprivilegien für neue Funktionen von Rolle %s in Schema %s"
 
-#: catalog/objectaddress.c:3782
+#: catalog/objectaddress.c:3832
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Funktionen von Rolle %s"
 
-#: catalog/objectaddress.c:3788
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr "Vorgabeprivilegien für neue Typen von Rolle %s in Schema %s"
 
-#: catalog/objectaddress.c:3792
+#: catalog/objectaddress.c:3842
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Typen von Rolle %s"
 
-#: catalog/objectaddress.c:3798
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Schemas von Rolle %s"
 
-#: catalog/objectaddress.c:3805
+#: catalog/objectaddress.c:3854
+#, c-format
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "Vorgabeprivilegien für neue Large Objects von Rolle %s"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr "Vorgabeprivilegien von Rolle %s in Schema %s"
 
-#: catalog/objectaddress.c:3809
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "Vorgabeprivilegien von Rolle %s"
 
-#: catalog/objectaddress.c:3831
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "Erweiterung %s"
 
-#: catalog/objectaddress.c:3848
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "Ereignistrigger %s"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "Parameter %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3915
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "Policy %s für %s"
 
-#: catalog/objectaddress.c:3929
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "Publikation %s"
 
-#: catalog/objectaddress.c:3942
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "Publikation von Schema %s in Publikation %s"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3973
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "Publikation von %s in Publikation %s"
 
-#: catalog/objectaddress.c:3986
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "Subskription %s"
 
-#: catalog/objectaddress.c:4007
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "Transformation %s für Sprache %s"
 
-#: catalog/objectaddress.c:4076
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "Tabelle %s"
 
-#: catalog/objectaddress.c:4081
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "Index %s"
 
-#: catalog/objectaddress.c:4085
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "Sequenz %s"
 
-#: catalog/objectaddress.c:4089
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "TOAST-Tabelle %s"
 
-#: catalog/objectaddress.c:4093
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "Sicht %s"
 
-#: catalog/objectaddress.c:4097
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "materialisierte Sicht %s"
 
-#: catalog/objectaddress.c:4101
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "zusammengesetzter Typ %s"
 
-#: catalog/objectaddress.c:4105
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "Fremdtabelle %s"
 
-#: catalog/objectaddress.c:4110
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "Relation %s"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "Operatorfamilie %s für Zugriffsmethode %s"
@@ -5766,7 +5820,7 @@ msgstr "Anfangswert darf nicht ausgelassen werden, wenn Übergangsfunktion strik
 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:352 executor/nodeWindowAgg.c:2992
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3105
 #, 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"
@@ -5781,7 +5835,7 @@ msgstr "Abschlussfunktion mit zusätzlichen Argumenten darf nicht als STRICT dek
 msgid "return type of combine function %s is not %s"
 msgstr "Rückgabetyp der Kombinierfunktion %s ist nicht %s"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr "Kombinierfunktion mit Übergangstyp %s darf nicht als STRICT deklariert sein"
@@ -5796,12 +5850,12 @@ msgstr "Rückgabetyp der Serialisierungsfunktion %s ist nicht %s"
 msgid "return type of deserialization function %s is not %s"
 msgstr "Rückgabetyp der Deserialisierungsfunktion %s ist nicht %s"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "kann Ergebnisdatentyp nicht bestimmen"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "unsichere Verwendung des Pseudotyps »internal«"
@@ -5816,53 +5870,53 @@ msgstr "Moving-Aggregat-Implementierung gibt Typ %s zurück, aber die normale Im
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "Sortieroperator kann nur für Aggregatfunktionen mit einem Argument angegeben werden"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "kann Routinenart nicht ändern"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "»%s« ist eine normale Aggregatfunktion."
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "»%s« ist eine Ordered-Set-Aggregatfunktion."
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "»%s« ist eine Hypothetical-Set-Aggregatfunktion."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "die Anzahl direkter Argumente einer Aggregatfunktion kann nicht geändert werden"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "Funktion %s existiert nicht"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "Funktion %s gibt eine Ergebnismenge zurück"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr "Funktion %s muss VARIADIC ANY akzeptieren, um in dieser Aggregatfunktion verwendet zu werden"
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "Funktion %s erfordert Typumwandlung zur Laufzeit"
@@ -5942,21 +5996,62 @@ msgstr "Sortierfolge »%s« existiert bereits"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7962
+#, c-format
+msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
+msgstr "NO INHERIT-Status von NOT-NULL-Constraint »%s« von Relation »%s« kann nicht geändert werden"
+
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9594
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "Sie müssen möglicherweise den bestehenden Constraint mit %s vererbbar machen."
+
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8311
+#, c-format
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr "inkompatibler NOT-VALID-Constraint »%s« für Relation »%s«"
+
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8313
+#: commands/tablecmds.c:9606
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "Sie müssen ihn möglicherweise mit %s validieren."
+
+#: catalog/pg_constraint.c:792
+#, c-format
+msgid "cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr "kann Not-Null-Constraint »%s« für Spalte »%s« von Tabelle »%s« nicht erzeugen"
+
+#: catalog/pg_constraint.c:794
+#, c-format
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "Ein Not-Null-Constraint namens »%s« existiert bereits für diese Spalte."
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "Constraint »%s« für Domäne %s existiert bereits"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "Constraint »%s« für Tabelle »%s« existiert nicht"
 
-#: catalog/pg_constraint.c:1125
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "Constraint »%s« für Domäne %s existiert nicht"
 
+#: catalog/pg_constraint.c:1681
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "ungültiger Typ für den PERIOD-Teil des Fremdschlüssels"
+
+#: catalog/pg_constraint.c:1682
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "Nur range und multirange werden unterstützt."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -5967,27 +6062,27 @@ msgstr "Konversion »%s« existiert bereits"
 msgid "default conversion for %s to %s already exists"
 msgstr "Standardumwandlung von %s nach %s existiert bereits"
 
-#: catalog/pg_depend.c:224 commands/extension.c:3397
+#: catalog/pg_depend.c:225 commands/extension.c:3818
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s ist schon Mitglied der Erweiterung »%s«"
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:232 catalog/pg_depend.c:283 commands/extension.c:3858
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s ist kein Mitglied der Erweiterung »%s«"
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:235
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "Eine Erweiterung darf kein Objekt ersetzen, das ihr nicht gehört."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:286
 #, c-format
 msgid "An extension may only use CREATE ... IF NOT EXISTS to skip object creation if the conflicting object is one that it already owns."
 msgstr "Eine Erweiterung darf CREATE .. IF NOT EXISTS zum Überspringen der Erzeugung eines Objekts nur verwenden, wenn ihr das vorhandene Objekt schon gehört."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:649
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "kann Abhängigkeit von %s nicht entfernen, weil es ein Systemobjekt ist"
@@ -6037,8 +6132,8 @@ msgstr "Partition »%s« kann nicht abgetrennt werden"
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "Die Partition wird nebenläufig abgetrennt oder hat eine unfertige Abtrennoperation."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4778
-#: commands/tablecmds.c:16053
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4926
+#: commands/tablecmds.c:17903
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "Verwendet Sie ALTER TABLE ... DETACH PARTITION ... FINALIZE, um die unerledigte Abtrennoperation abzuschließen."
@@ -6068,7 +6163,7 @@ msgstr "»%s« ist kein gültiger Operatorname"
 msgid "operator %s already exists"
 msgstr "Operator %s existiert bereits"
 
-#: catalog/pg_operator.c:445 commands/operatorcmds.c:600
+#: catalog/pg_operator.c:445 commands/operatorcmds.c:633
 #, c-format
 msgid "operator cannot be its own negator"
 msgstr "Operator kann nicht sein eigener Negator sein"
@@ -6143,44 +6238,44 @@ msgstr "Negator-Operator %s ist bereits der Negator des Operators %u"
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "Parameter-ACL »%s« existiert nicht"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "Funktionen können nicht mehr als %d Argument haben"
 msgstr[1] "Funktionen können nicht mehr als %d Argumente haben"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "Funktion »%s« existiert bereits mit den selben Argumenttypen"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "»%s« ist eine Aggregatfunktion."
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "»%s« ist eine Funktion."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "»%s« ist eine Prozedur."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "»%s« ist eine Fensterfunktion."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "man kann nicht ändern, ob eine Prozedur Ausgabeparameter hat"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "kann Rückgabetyp einer bestehenden Funktion nicht ändern"
@@ -6189,109 +6284,109 @@ msgstr "kann Rückgabetyp einer bestehenden Funktion nicht ändern"
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "Verwenden Sie zuerst %s %s."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "Der von OUT-Parametern bestimmte Zeilentyp ist verschieden."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "kann Name des Eingabeparameters »%s« nicht ändern"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr "kann Parametervorgabewerte einer bestehenden Funktion nicht entfernen"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr "kann Datentyp eines bestehenden Parametervorgabewerts nicht ändern"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "es gibt keine eingebaute Funktion namens %s"
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL-Funktionen können keinen Rückgabetyp »%s« haben"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-Funktionen können keine Argumente vom Typ »%s« haben"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1467
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "SQL-Funktion »%s«"
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "Relation »%s« kann nicht zu Publikation hinzugefügt werden"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "Diese Operation wird für Systemtabellen nicht unterstützt."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "Diese Operation wird für temporäre Tabellen nicht unterstützt."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "Diese Operation wird für ungeloggte Tabellen nicht unterstützt."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "Schema »%s« kann nicht zu Publikation hinzugefügt werden"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "Diese Operation wird für Systemschemas nicht unterstützt."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "Temporäre Schemas können nicht repliziert werden."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "Relation »%s« ist schon Mitglied der Publikation »%s«"
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr "Systemspalte »%s« kann nicht in der Publikationspaltenliste verwendet werden"
 
-#: catalog/pg_publication.c:540
+#: catalog/pg_publication.c:582
 #, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
-msgstr "generierte Spalte »%s« kann nicht in der Publikationsspaltenliste verwendet werden"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
+msgstr "virtuelle generierte Spalte »%s« kann nicht in der Publikationsspaltenliste verwendet werden"
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "doppelte Spalte »%s« in Publikationsspaltenliste"
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "Schema »%s« ist schon Mitglied der Publikation »%s«"
@@ -6369,12 +6464,12 @@ msgstr "kann Objekte, die %s gehören, nicht löschen, weil sie vom Datenbanksys
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "kann den Eigentümer von den Objekten, die %s gehören, nicht ändern, weil die Objekte vom Datenbanksystem benötigt werden"
 
-#: catalog/pg_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "konnte Relation-Mapping für Subskription »%s« nicht löschen"
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "Tabellensynchronisierung für Relation »%s« ist im Gang und hat Status »%c«."
@@ -6382,7 +6477,7 @@ msgstr "Tabellensynchronisierung für Relation »%s« ist im Gang und hat Status
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "Verwenden Sie %s um die Subskription zu aktivieren, falls noch nicht aktiviert, oder %s um die Subskription zu löschen."
@@ -6413,7 +6508,7 @@ msgstr "interne Größe %d ist ungültig für Typen mit Wertübergabe"
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "Ausrichtung »%c« ist ungültig für Typen variabler Länge"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "Typen mit fester Größe müssen Storage-Typ PLAIN haben"
@@ -6428,10 +6523,10 @@ msgstr "Fehler während der Erzeugung eines Multirange-Typs für Typ »%s«."
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "Sie können einen Multirange-Typnamen manuell angeben, mit dem Attribut »multirange_type_name«."
 
-#: catalog/storage.c:508 storage/buffer/bufmgr.c:1540
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "ungültige Seite in Block %u von Relation %s"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "ungültige Seite in Block %u von Relation »%s«"
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -6513,7 +6608,7 @@ msgstr "Serialisierungsfunktionen dürfen nur angegeben werden, wenn der Überga
 msgid "must specify both or neither of serialization and deserialization functions"
 msgstr "Serialisierungs- und Deserialisierungsfunktionen müssen zusammen angegeben werden"
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr "Parameter »parallel« muss SAFE, RESTRICTED oder UNSAFE sein"
@@ -6523,86 +6618,86 @@ msgstr "Parameter »parallel« muss SAFE, RESTRICTED oder UNSAFE sein"
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "Parameter »%s« muss READ_ONLY, SHAREABLE oder READ_WRITE sein"
 
-#: commands/alter.c:82 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "Ereignistrigger »%s« existiert bereits"
 
-#: commands/alter.c:85 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "Fremddaten-Wrapper »%s« existiert bereits"
 
-#: commands/alter.c:88 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:900
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "Server »%s« existiert bereits"
 
-#: commands/alter.c:91 commands/proclang.c:131
+#: commands/alter.c:92 commands/proclang.c:131
 #, c-format
 msgid "language \"%s\" already exists"
 msgstr "Sprache »%s« existiert bereits"
 
-#: commands/alter.c:94 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "Publikation »%s« existiert bereits"
 
-#: commands/alter.c:97 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "Subskription »%s« existiert bereits"
 
-#: commands/alter.c:120
+#: commands/alter.c:121
 #, c-format
 msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr "Konversion »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:124
+#: commands/alter.c:125
 #, c-format
 msgid "statistics object \"%s\" already exists in schema \"%s\""
 msgstr "Statistikobjekt »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:128
+#: commands/alter.c:129
 #, c-format
 msgid "text search parser \"%s\" already exists in schema \"%s\""
 msgstr "Textsucheparser »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:132
+#: commands/alter.c:133
 #, c-format
 msgid "text search dictionary \"%s\" already exists in schema \"%s\""
 msgstr "Textsuchewörterbuch »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:136
+#: commands/alter.c:137
 #, c-format
 msgid "text search template \"%s\" already exists in schema \"%s\""
 msgstr "Textsuchevorlage »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:140
+#: commands/alter.c:141
 #, c-format
 msgid "text search configuration \"%s\" already exists in schema \"%s\""
 msgstr "Textsuchekonfiguration »%s« existiert bereits in Schema »%s«"
 
-#: commands/alter.c:213
+#: commands/alter.c:214
 #, c-format
 msgid "must be superuser to rename %s"
 msgstr "nur Superuser können %s umbenennen"
 
-#: commands/alter.c:255 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false ist nur für Superuser"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "Subskriptionen mit der Option password_required auf falsch gesetzt können nur vom Superuser erzeugt oder geändert werden."
 
-#: commands/alter.c:734
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "nur Superuser können Schema von %s setzen"
@@ -6622,8 +6717,8 @@ msgstr "Nur Superuser können Zugriffsmethoden anlegen."
 msgid "access method \"%s\" already exists"
 msgstr "Zugriffsmethode »%s« existiert bereits"
 
-#: commands/amcmds.c:154 commands/indexcmds.c:221 commands/indexcmds.c:841
-#: commands/opclasscmds.c:374 commands/opclasscmds.c:832
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
+#: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "Zugriffsmethode »%s« existiert nicht"
@@ -6633,79 +6728,84 @@ msgstr "Zugriffsmethode »%s« existiert nicht"
 msgid "handler function is not specified"
 msgstr "keine Handler-Funktion angegeben"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:204
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "Funktion %s muss Rückgabetyp %s haben"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "überspringe »%s« --- kann diese Fremdtabelle nicht analysieren"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr "überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht analysieren"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analysiere Vererbungsbaum von »%s.%s«"
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analysiere »%s.%s«"
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "Spalte »%s« von Relation »%s« erscheint mehrmals"
 
-#: commands/analyze.c:780
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "automatisches Analysieren der Tabelle »%s.%s.%s«\n"
 
-#: commands/analyze.c:1295
+#: commands/analyze.c:805
+#, c-format
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "Analysieren von Tabelle »%s.%s.%s« abgeschlossen\n"
+
+#: commands/analyze.c:1346
 #, 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"
 
-#: commands/analyze.c:1379
+#: commands/analyze.c:1430
 #, 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"
 
-#: commands/analyze.c:1477
+#: commands/analyze.c:1528
 #, 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"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "Kanalname kann nicht leer sein"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "Kanalname zu lang"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "Payload-Zeichenkette zu lang"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "PREPARE kann nicht in einer Transaktion ausgeführt werden, die LISTEN, UNLISTEN oder NOTIFY ausgeführt hat"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "zu viele Benachrichtigungen in NOTIFY-Schlange"
@@ -6725,82 +6825,84 @@ msgstr "Der Serverprozess mit PID %d gehört zu denen mit den ältesten Transakt
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "Die NOTIFY-Schlange kann erst geleert werden, wenn dieser Prozess seine aktuelle Transaktion beendet."
 
-#: commands/cluster.c:128
+#: commands/cluster.c:127 commands/dbcommands.c:2356
+#: commands/explain_state.c:165 commands/indexcmds.c:2848 commands/vacuum.c:234
+#: commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "unbekannte CLUSTER-Option »%s«"
+msgid "unrecognized %s option \"%s\""
+msgstr "unbekannte %s-Option »%s«"
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht clustern"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "es gibt keinen bereits geclusterten Index für Tabelle »%s«"
 
-#: commands/cluster.c:191 commands/tablecmds.c:14698 commands/tablecmds.c:16629
+#: commands/cluster.c:190 commands/tablecmds.c:16459 commands/tablecmds.c:18525
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "Index »%s« für Tabelle »%s« existiert nicht"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "globaler Katalog kann nicht geclustert werden"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht gevacuumt werden"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16639
+#: commands/cluster.c:507 commands/tablecmds.c:18535
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "»%s« ist kein Index für Tabelle »%s«"
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, 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"
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "kann nicht anhand des partiellen Index »%s« clustern"
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "kann nicht anhand des ungültigen Index »%s« clustern"
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "ein Index kann nicht als anhand einer partitionierten Tabelle geclustert markiert werden"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "clustere »%s.%s« durch Index-Scan von »%s«"
 
-#: commands/cluster.c:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "clustere »%s.%s« durch sequenziellen Scan und Sortieren"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "Vacuum von »%s.%s«"
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
 msgstr "»%s.%s«: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u Seiten gefunden"
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -6809,7 +6911,7 @@ msgstr ""
 "%.0f tote Zeilenversionen können noch nicht entfernt werden.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "keine Berechtigung für Clustern von »%s«, wird übersprungen"
@@ -6820,13 +6922,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "Attribut »%s« für Sortierfolge unbekannt"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8137
-#: replication/pgoutput/pgoutput.c:307 replication/pgoutput/pgoutput.c:330
-#: replication/pgoutput/pgoutput.c:344 replication/pgoutput/pgoutput.c:354
-#: replication/pgoutput/pgoutput.c:364 replication/pgoutput/pgoutput.c:374
-#: replication/pgoutput/pgoutput.c:386 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8404
+#: replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372
+#: replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392
+#: replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137
+#: replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420
+#: replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "widersprüchliche oder überflüssige Optionen"
@@ -6857,7 +6960,7 @@ msgstr "unbekannter Sortierfolgen-Provider: %s"
 msgid "parameter \"%s\" must be specified"
 msgstr "Parameter »%s« muss angegeben werden"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "verwende Standardform »%s« für ICU-Locale »%s«"
@@ -6867,7 +6970,7 @@ msgstr "verwende Standardform »%s« für ICU-Locale »%s«"
 msgid "nondeterministic collations not supported with this provider"
 msgstr "nichtdeterministische Sortierfolgen werden von diesem Provider nicht unterstützt"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "ICU-Regeln können nur angegeben werden, wenn der Locale-Provider ICU ist"
@@ -6877,68 +6980,69 @@ msgstr "ICU-Regeln können nur angegeben werden, wenn der Locale-Provider ICU is
 msgid "current database's encoding is not supported with this provider"
 msgstr "Kodierung der aktuellen Datenbank wird von diesem Provider nicht unterstützt"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits in Schema »%s«"
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "Sortierfolge »%s« existiert bereits in Schema »%s«"
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "Version der Standardsortierfolge kann nicht aufgefrischt werden"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7913 commands/tablecmds.c:7923
-#: commands/tablecmds.c:7925 commands/tablecmds.c:14400
-#: commands/tablecmds.c:17777 commands/tablecmds.c:17798
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8156 commands/tablecmds.c:8166
+#: commands/tablecmds.c:8168 commands/tablecmds.c:16161
+#: commands/tablecmds.c:19689 commands/tablecmds.c:19710
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "Verwenden Sie stattdessen %s."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2550
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "Version wird von %s in %s geändert"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2563
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "Version hat sich nicht geändert"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2729
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "Datenbank mit OID %u existiert nicht"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "Sortierfolge mit OID %u existiert nicht"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr "nur Superuser können Systemsortierfolgen importieren"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "keine brauchbaren System-Locales gefunden"
 
-#: commands/comment.c:61 commands/dbcommands.c:1663 commands/dbcommands.c:1875
-#: commands/dbcommands.c:1985 commands/dbcommands.c:2183
-#: commands/dbcommands.c:2421 commands/dbcommands.c:2512
-#: commands/dbcommands.c:2633 commands/dbcommands.c:3141
-#: utils/init/postinit.c:1033 utils/init/postinit.c:1097
-#: utils/init/postinit.c:1170
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2473 commands/dbcommands.c:2566
+#: commands/dbcommands.c:2690 commands/dbcommands.c:3201
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "Datenbank »%s« existiert nicht"
@@ -6948,12 +7052,12 @@ msgstr "Datenbank »%s« existiert nicht"
 msgid "cannot set comment on relation \"%s\""
 msgstr "Kommentar von Relation »%s« kann nicht gesetzt werden"
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "Funktion »%s« wurde nicht von Triggermanager aufgerufen"
 
-#: commands/constraint.c:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "Funktion »%s« muss AFTER ROW ausgelöst werden"
@@ -7023,338 +7127,309 @@ msgstr "keine Berechtigung für COPY in eine Datei"
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können mit COPY in eine Datei schreiben."
 
-#: commands/copy.c:193
+#: commands/copy.c:183
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "generierte Spalten werden in COPY-FROM-WHERE-Bedingungen nicht unterstützt"
+
+#: commands/copy.c:184 commands/tablecmds.c:14430 commands/tablecmds.c:19836
+#: commands/tablecmds.c:19918 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:985 rewrite/rewriteHandler.c:1020
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "Spalte »%s« ist eine generierte Spalte."
+
+#: commands/copy.c:233
 #, 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:194
+#: commands/copy.c:234
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Verwenden Sie stattdessen INSERT-Anweisungen."
 
-#: commands/copy.c:375
+#: commands/copy.c:415
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "»%s« kann nicht mit HEADER in COPY TO verwendet werden"
 
-#: commands/copy.c:384
+#: commands/copy.c:424
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "%s erfordert einen Boole’schen Wert oder »match«"
 
-#: commands/copy.c:400
+#. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
+#. second %s is a COPY with direction, e.g. COPY TO
+#: commands/copy.c:442 commands/copy.c:858 commands/copy.c:874
+#: commands/copy.c:891 commands/copy.c:917 commands/copy.c:927
 #, c-format
-msgid "COPY ON_ERROR cannot be used with COPY TO"
-msgstr "COPY ON_ERROR kann nicht mit COPY TO verwendet werden"
+msgid "COPY %s cannot be used with %s"
+msgstr "COPY %s kann nicht mit %s verwendet werden"
 
-#: commands/copy.c:413
-#, fuzzy, c-format
-#| msgid "COPY format \"%s\" not recognized"
-msgid "COPY ON_ERROR \"%s\" not recognized"
-msgstr "COPY-Format »%s« nicht erkannt"
+#. translator: first %s is the name of a COPY option, e.g. ON_ERROR
+#: commands/copy.c:456 commands/copy.c:514
+#, c-format
+msgid "COPY %s \"%s\" not recognized"
+msgstr "COPY %s »%s« nicht erkannt"
 
-#: commands/copy.c:437
-#, fuzzy, c-format
-#| msgid "COPY format \"%s\" not recognized"
-msgid "COPY LOG_VERBOSITY \"%s\" not recognized"
-msgstr "COPY-Format »%s« nicht erkannt"
+#: commands/copy.c:476 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s erfordert einen numerischen Wert"
+
+#: commands/copy.c:486
+#, c-format
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "REJECT_LIMIT (%<PRId64>) muss größer als null sein"
 
-#: commands/copy.c:498
+#: commands/copy.c:576
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "COPY-Format »%s« nicht erkannt"
 
-#: commands/copy.c:556 commands/copy.c:571 commands/copy.c:586
-#: commands/copy.c:605
+#: commands/copy.c:634 commands/copy.c:649 commands/copy.c:664
+#: commands/copy.c:683
 #, 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"
 
-#: commands/copy.c:617
+#: commands/copy.c:695
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "Argument von Option »%s« muss ein gültiger Kodierungsname sein"
 
-#: commands/copy.c:638 commands/dbcommands.c:866 commands/dbcommands.c:2369
+#: commands/copy.c:723 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "Option »%s« nicht erkannt"
 
-#: commands/copy.c:650
-#, c-format
-msgid "cannot specify DELIMITER in BINARY mode"
-msgstr "DELIMITER kann nicht im BINARY-Modus angegeben werden"
-
-#: commands/copy.c:655
-#, c-format
-msgid "cannot specify NULL in BINARY mode"
-msgstr "NULL kann nicht im BINARY-Modus angegeben werden"
-
-#: commands/copy.c:660
-#, c-format
-msgid "cannot specify DEFAULT in BINARY mode"
-msgstr "DEFAULT kann nicht im BINARY-Modus angegeben werden"
-
-#: commands/copy.c:665
+#. translator: %s is the name of a COPY option, e.g. ON_ERROR
+#: commands/copy.c:736 commands/copy.c:741 commands/copy.c:746
+#: commands/copy.c:816
 #, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr ""
+msgid "cannot specify %s in BINARY mode"
+msgstr "%s kann nicht im BINARY-Modus angegeben werden"
 
-#: commands/copy.c:687
+#: commands/copy.c:768
 #, 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:694
+#: commands/copy.c:775
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPY-Trennzeichen kann nicht Newline oder Carriage Return sein"
 
-#: commands/copy.c:700
+#: commands/copy.c:781
 #, 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:710
+#: commands/copy.c:791
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "COPY DEFAULT-Darstellung kann nicht Newline oder Carriage Return enthalten"
 
-#: commands/copy.c:728
+#: commands/copy.c:809
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "DELIMITER für COPY darf nicht »%s« sein"
 
-#: commands/copy.c:734
-#, c-format
-msgid "cannot specify HEADER in BINARY mode"
-msgstr "HEADER kann nicht im BINARY-Modus angegeben werden"
-
-#: commands/copy.c:740
+#. translator: %s is the name of a COPY option, e.g. ON_ERROR
+#: commands/copy.c:823 commands/copy.c:840 commands/copy.c:852
+#: commands/copy.c:867 commands/copy.c:883
 #, c-format
-msgid "COPY QUOTE requires CSV mode"
-msgstr "COPY QUOTE benötigt CSV-Modus"
+msgid "COPY %s requires CSV mode"
+msgstr "COPY %s benötigt CSV-Modus"
 
-#: commands/copy.c:745
+#: commands/copy.c:828
 #, 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:750
+#: commands/copy.c:833
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "DELIMITER und QUOTE für COPY müssen verschieden sein"
 
-#: commands/copy.c:756
-#, c-format
-msgid "COPY ESCAPE requires CSV mode"
-msgstr "COPY ESCAPE benötigt CSV-Modus"
-
-#: commands/copy.c:761
+#: commands/copy.c:845
 #, 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:767
-#, c-format
-msgid "COPY FORCE_QUOTE requires CSV mode"
-msgstr "COPY FORCE_QUOTE benötigt CSV-Modus"
-
-#: commands/copy.c:771
-#, c-format
-msgid "COPY FORCE_QUOTE cannot be used with COPY FROM"
-msgstr "COPY FORCE_QUOTE kann nicht mit COPY FROM verwendet werden"
-
-#: commands/copy.c:777
-#, c-format
-msgid "COPY FORCE_NOT_NULL requires CSV mode"
-msgstr "COPY FORCE_NOT_NULL benötigt CSV-Modus"
-
-#: commands/copy.c:781
-#, c-format
-msgid "COPY FORCE_NOT_NULL cannot be used with COPY TO"
-msgstr "COPY FORCE_NOT_NULL kann nicht mit COPY TO verwendet werden"
-
-#: commands/copy.c:787
-#, c-format
-msgid "COPY FORCE_NULL requires CSV mode"
-msgstr "COPY FORCE_NULL benötigt CSV-Modus"
-
-#: commands/copy.c:792
-#, c-format
-msgid "COPY FORCE_NULL cannot be used with COPY TO"
-msgstr "COPY FORCE_NULL kann nicht mit COPY TO verwendet werden"
-
-#: commands/copy.c:798
-#, c-format
-msgid "COPY delimiter character must not appear in the NULL specification"
-msgstr "Trennzeichen für COPY darf nicht in der NULL-Darstellung erscheinen"
-
-#: commands/copy.c:805
-#, 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:811
+#. translator: %s is the name of a COPY option, e.g. NULL
+#: commands/copy.c:899 commands/copy.c:935
 #, c-format
-msgid "COPY FREEZE cannot be used with COPY TO"
-msgstr "COPY FREEZE kann nicht mit COPY TO verwendet werden"
+msgid "COPY delimiter character must not appear in the %s specification"
+msgstr "Trennzeichen für COPY darf nicht in der %s-Darstellung erscheinen"
 
-#: commands/copy.c:818
+#. translator: %s is the name of a COPY option, e.g. NULL
+#: commands/copy.c:908 commands/copy.c:944
 #, c-format
-msgid "COPY DEFAULT only available using COPY FROM"
-msgstr "COPY DEFAULT ist nur bei COPY FROM verfügbar"
+msgid "CSV quote character must not appear in the %s specification"
+msgstr "CSV-Quote-Zeichen darf nicht in der %s-Darstellung erscheinen"
 
-#: commands/copy.c:824
+#: commands/copy.c:953
 #, c-format
-msgid "COPY delimiter must not appear in the DEFAULT specification"
-msgstr "Trennzeichen für COPY darf nicht in der DEFAULT-Darstellung erscheinen"
+msgid "NULL specification and DEFAULT specification cannot be the same"
+msgstr "NULL-Darstellung und DEFAULT-Darstellung können nicht gleich sein"
 
-#: commands/copy.c:831
+#: commands/copy.c:959
 #, c-format
-msgid "CSV quote character must not appear in the DEFAULT specification"
-msgstr "CSV-Quote-Zeichen darf nicht in der DEFAULT-Darstellung erscheinen"
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "nur ON_ERROR STOP ist im BINARY-Modus erlaubt"
 
-#: commands/copy.c:839
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:966
 #, c-format
-msgid "NULL specification and DEFAULT specification cannot be the same"
-msgstr "NULL-Darstellung und DEFAULT-Darstellung können nicht gleich sein"
+msgid "COPY %s requires %s to be set to %s"
+msgstr "COPY %s erfordert, dass %s auf %s gesetzt ist"
 
-#: commands/copy.c:901
+#: commands/copy.c:1028
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "Spalte »%s« ist eine generierte Spalte"
 
-#: commands/copy.c:903
+#: commands/copy.c:1030
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "Generierte Spalten können nicht in COPY verwendet werden."
 
-#: commands/copy.c:918 commands/indexcmds.c:1915 commands/statscmds.c:239
-#: commands/tablecmds.c:2514 commands/tablecmds.c:2985
-#: commands/tablecmds.c:3781 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
-#: utils/adt/tsvector_op.c:2853
+#: commands/copy.c:1045 commands/indexcmds.c:1961 commands/statscmds.c:260
+#: commands/tablecmds.c:2603 commands/tablecmds.c:3111
+#: commands/tablecmds.c:3940 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
+#: utils/adt/tsvector_op.c:2857
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "Spalte »%s« existiert nicht"
 
-#: commands/copy.c:925 commands/tablecmds.c:2540 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1052 commands/tablecmds.c:2629 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "Spalte »%s« mehrmals angegeben"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, Zeile %llu, Spalte %s"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, Zeile %<PRIu64>, Spalte %s"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, Zeile %llu"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, Zeile %<PRIu64>"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, Zeile %llu, Spalte %s: »%s«"
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, Zeile %<PRIu64>, Spalte %s: »%s«"
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, Zeile %llu, Spalte %s: NULL Eingabe"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, Zeile %<PRIu64>, Spalte %s: NULL Eingabe"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, Zeile %llu: »%s«"
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, Zeile %<PRIu64>: »%s«"
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "kann nicht in Sicht »%s« kopieren"
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr "Um Kopieren in eine Sicht zu ermöglichen, richten Sie einen INSTEAD OF INSERT Trigger ein."
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "kann nicht in materialisierte Sicht »%s« kopieren"
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "kann nicht in Sequenz »%s« kopieren"
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "kann nicht in Relation »%s« kopieren, die keine Tabelle ist"
 
-#: commands/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "COPY FREEZE kann nicht in einer partitionierten Tabelle durchgeführt werden"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, c-format
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "COPY FREEZE kann nicht in einer Fremdtabelle durchgeführt werden"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr "COPY FREEZE kann nicht durchgeführt werden wegen vorheriger Aktivität in dieser Transaktion"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid "cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "COPY FREEZE kann nicht durchgeführt werden, weil die Tabelle nicht in der aktuellen Transaktion erzeugt oder geleert wurde"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] ""
-msgstr[1] ""
+msgid "skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type incompatibility"
+msgstr "mehr als REJECT_LIMIT (%<PRId64>) Zeilen wurden übersprungen wegen Datentypinkompatibilität"
 
-#: commands/copyfrom.c:1447
+#: commands/copyfrom.c:1474
 #, c-format
-msgid "FORCE_NOT_NULL column \"%s\" not referenced by COPY"
-msgstr "Spalte »%s« mit FORCE_NOT_NULL wird von COPY nicht verwendet"
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "%<PRIu64> Zeile wurde übersprungen wegen Datentypinkompatibilität"
+msgstr[1] "%<PRIu64> Zeilen wurden übersprungen wegen Datentypinkompatibilität"
 
-#: commands/copyfrom.c:1489
+#. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
+#. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
-msgid "FORCE_NULL column \"%s\" not referenced by COPY"
-msgstr "Spalte »%s« mit FORCE_NULL wird von COPY nicht verwendet"
+msgid "%s column \"%s\" not referenced by COPY"
+msgstr "Spalte »%s« mit %s wird von COPY nicht verwendet"
 
-#: commands/copyfrom.c:1542 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:394
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "Standardumwandlung von Kodierung »%s« nach »%s« existiert nicht"
 
-#: commands/copyfrom.c:1740
+#: commands/copyfrom.c:1882
 #, c-format
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "Mit COPY FROM liest der PostgreSQL-Serverprozess eine Datei. Möglicherweise möchten Sie Funktionalität auf Client-Seite verwenden, wie zum Beispiel \\copy in psql."
 
-#: commands/copyfrom.c:1753 commands/copyto.c:701
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "»%s« ist ein Verzeichnis"
 
-#: commands/copyfrom.c:1821 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "konnte Pipe zu externem Programm nicht schließen: %m"
 
-#: commands/copyfrom.c:1836 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "Programm »%s« fehlgeschlagen"
@@ -7395,676 +7470,677 @@ msgid "could not read from COPY file: %m"
 msgstr "konnte nicht aus COPY-Datei lesen: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:377
+#: replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:370
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "unerwartetes EOF auf Client-Verbindung mit einer offenen Transaktion"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "unerwarteter Messagetyp 0x%02X während COPY FROM STDIN"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "COPY FROM STDIN fehlgeschlagen: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "falsche Anzahl Felder in Kopfzeile: %d erhalten, %d erwartet"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid "column name mismatch in header line field %d: got null value (\"%s\"), expected \"%s\""
 msgstr "Spaltenname in Kopfzeile Feld %d stimmt nicht überein: NULL-Wert (»%s«) erhalten, »%s« erwartet"
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
 msgstr "Spaltenname in Kopfzeile Feld %d stimmt nicht überein: »%s« erhalten, »%s« erwartet"
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "zusätzliche Daten nach letzter erwarteter Spalte"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "fehlende Daten für Spalte »%s«"
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column %s: \"%s\""
-msgstr ""
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": \"%s\""
+msgstr "Zeile wird übersprungen wegen Datentypinkompatibilität auf Zeile %<PRIu64> für Spalte »%s«: »%s«"
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column %s: null input"
-msgstr ""
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": null input"
+msgstr "Zeile wird übersprungen wegen Datentypinkompatibilität auf Zeile %<PRIu64> für Spalte »%s«: Eingabe ist NULL"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "COPY-Daten nach EOF-Markierung empfangen"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "Feldanzahl in Zeile ist %d, erwartet wurden %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "Carriage-Return-Zeichen in Daten gefunden"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "ungequotetes Carriage-Return-Zeichen in Daten gefunden"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Verwenden Sie »\\r«, um ein Carriage-Return-Zeichen darzustellen."
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, 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/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "Newline-Zeichen in Daten gefunden"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "ungequotetes Newline-Zeichen in Daten gefunden"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Verwenden Sie »\\n«, um ein Newline-Zeichen darzustellen."
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Verwenden Sie ein gequotetes CSV-Feld, um ein Newline-Zeichen darzustellen."
 
-#: commands/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, 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/copyfromparse.c:1428 commands/copyfromparse.c:1444
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
 #, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "COPY-Ende-Markierung verfälscht"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "COPY-Ende-Markierung ist nicht allein auf der Zeile"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "unerwartete Default-Markierung in COPY-Daten"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "Spalte »%s« hat keinen Vorgabewert."
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "Quotes in CSV-Feld nicht abgeschlossen"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "unerwartetes EOF in COPY-Daten"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "ungültige Feldgröße"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "falsches Binärdatenformat"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "konnte nicht zum COPY-Programm schreiben: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "konnte nicht in COPY-Datei schreiben: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "kann nicht aus Sicht »%s« kopieren"
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Versuchen Sie die Variante COPY (SELECT ...) TO."
 
-#: commands/copyto.c:385
+#: commands/copyto.c:660
+#, c-format
+msgid "cannot copy from unpopulated materialized view \"%s\""
+msgstr "kann nicht aus unbefüllter materialisierter Sicht »%s« kopieren"
+
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
-msgid "cannot copy from materialized view \"%s\""
-msgstr "kann nicht aus materialisierter Sicht »%s« kopieren"
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "Verwenden Sie den Befehl REFRESH MATERIALIZED VIEW."
 
-#: commands/copyto.c:391
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "kann nicht aus Fremdtabelle »%s« kopieren"
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "kann nicht aus Sequenz »%s« kopieren"
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "kann nicht aus partitionierter Tabelle »%s« kopieren"
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "kann nicht aus Relation »%s«, die keine Tabelle ist, kopieren"
 
-#: commands/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "DO-INSTEAD-NOTHING-Regeln werden für COPY nicht unterstützt"
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "DO-INSTEAD-Regeln mit Bedingung werden für COPY nicht unterstützt"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
-msgid "DO ALSO rules are not supported for the COPY"
+msgid "DO ALSO rules are not supported for COPY"
 msgstr "DO-ALSO-Regeln werden für COPY nicht unterstützt"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "DO-INSTEAD-Regeln mit mehreren Anweisungen werden für COPY nicht unterstützt"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) wird nicht unterstützt"
 
-#: commands/copyto.c:511
+#: commands/copyto.c:778
+#, c-format
+msgid "COPY query must not be a utility command"
+msgstr "COPY-Anfrage darf kein Utility-Befehl sein"
+
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "COPY-Anfrage muss eine RETURNING-Klausel haben"
 
-#: commands/copyto.c:540
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "die von der COPY-Anweisung verwendete Relation hat sich geändert"
 
-#: commands/copyto.c:596
-#, c-format
-msgid "FORCE_QUOTE column \"%s\" not referenced by COPY"
-msgstr "FORCE_QUOTE-Spalte »%s« wird von COPY nicht verwendet"
-
-#: commands/copyto.c:666
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "relativer Pfad bei COPY in Datei nicht erlaubt"
 
-#: commands/copyto.c:685
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "konnte Datei »%s« nicht zum Schreiben öffnen: %m"
 
-#: commands/copyto.c:688
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "Mit COPY TO schreibt der PostgreSQL-Serverprozess eine Datei. Möglicherweise möchten Sie Funktionalität auf Client-Seite verwenden, wie zum Beispiel \\copy in psql."
 
-#: commands/createas.c:210 commands/createas.c:518
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "zu viele Spaltennamen wurden angegeben"
 
-#: commands/createas.c:541
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "Policys sind für diesen Befehl noch nicht implementiert"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION wird nicht mehr unterstützt"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "Verwenden Sie stattdessen Tablespaces."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "OIDs kleiner als %u sind für Systemobjekte reserviert"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d ist kein gültiger Kodierungscode"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s ist kein gültiger Kodierungsname"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "unbekannter Locale-Provider: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2402 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "ungültige Verbindungshöchstgrenze: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "keine Berechtigung, um Datenbank zu erzeugen"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "Template-Datenbank »%s« existiert nicht"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "ungültige Datenbank »%s« kann nicht als Template verwendet werden"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2431
-#: utils/init/postinit.c:1112
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "Verwenden Sie DROP DATABASE, um ungültige Datenbanken zu löschen."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "keine Berechtigung, um Datenbank »%s« zu kopieren"
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "ungültige Datenbankerzeugungsstrategie »%s«"
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "Gültige Strategien sind »wal_log« und »file_copy«."
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "ungültige Serverkodierung %d"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "ungültiger LC_COLLATE-Locale-Name: »%s«"
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, c-format
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "Wenn der Locale-Name nur für den Provider »builtin« gültig ist, verwenden Sie BUILTIN_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "Wenn der Locale-Name nur für ICU gültig ist, verwenden Sie ICU_LOCALE."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "Wenn der Locale-Name nur für den ICU-Provider gültig ist, verwenden Sie ICU_LOCALE."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "ungültiger LC_CTYPE-Locale-Name: »%s«"
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALE kann nur angegeben werden, wenn der Locale-Provider »builtin« ist"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICU-Locale kann nur angegeben werden, wenn der Locale-Provider ICU ist"
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "LOCALE oder BUILTIN_LOCALE muss angegeben werden"
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "Kodierung »%s« wird vom ICU-Provider nicht unterstützt"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "LOCALE oder ICU_LOCALE muss angegeben werden"
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "neue Kodierung (%s) ist inkompatibel mit der Kodierung der Template-Datenbank (%s)"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "Verwenden Sie die gleiche Kodierung wie die Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "neue Sortierreihenfolge (%s) ist inkompatibel mit der Sortierreihenfolge der Template-Datenbank (%s)"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "Verwenden Sie die gleiche Sortierreihenfolge wie die Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "neues LC_CTYPE (%s) ist inkompatibel mit dem LC_CTYPE der Template-Datenbank (%s)"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "Verwenden Sie das gleiche LC_CTYPE wie die Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "neuer Locale-Provider (%s) stimmt nicht mit dem Locale-Provider der Template-Datenbank (%s) überein"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "Verwenden Sie den gleichen Locale-Provider wie die Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "neue ICU-Locale (%s) ist inkompatibel mit der ICU-Locale der Template-Datenbank (%s)"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "Verwenden Sie die gleiche ICU-Locale wie die Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "die neuen ICU-Sortierfolgenregeln (%s) sind inkompatibel mit den ICU-Sortierfolgenregeln der Template-Datenbank (%s)"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "Verwenden Sie die gleichen ICU-Sortierfolgenregeln wie in der Template-Datenbank oder verwenden Sie template0 als Template."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "Template-Datenbank »%s« hat eine Sortierfolgenversion, aber keine tatsächliche Sortierfolgenversion konnte ermittelt werden"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "Version von Sortierfolge für Template-Datenbank »%s« stimmt nicht überein"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "Die Template-Datenbank wurde mit Sortierfolgenversion %s erzeugt, aber das Betriebssystem hat Version %s."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Bauen Sie alle Objekte in der Template-Datenbank, die die Standardsortierfolge verwenden, neu und führen Sie ALTER DATABASE %s REFRESH COLLATION VERSION aus, oder bauen Sie PostgreSQL mit der richtigen Bibliotheksversion."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2031
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global kann nicht als Standard-Tablespace verwendet werden"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "kann neuen Standard-Tablespace »%s« nicht setzen"
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, 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."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1904
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "Datenbank »%s« existiert bereits"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "auf Quelldatenbank »%s« wird gerade von anderen Benutzern zugegriffen"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "Datenbank-OID %u wird bereits von Datenbank »%s« verwendet"
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "Datenverzeichnis mit der angegebenen OID %u existiert bereits"
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2565
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "Kodierung »%s« stimmt nicht mit Locale »%s« überein"
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "Die gewählte LC_CTYPE-Einstellung verlangt die Kodierung »%s«."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "Die gewählte LC_COLLATE-Einstellung verlangt die Kodierung »%s«."
 
-#: commands/dbcommands.c:1670
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "Datenbank »%s« existiert nicht, wird übersprungen"
 
-#: commands/dbcommands.c:1694
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "Template-Datenbank kann nicht gelöscht werden"
 
-#: commands/dbcommands.c:1700
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "kann aktuell geöffnete Datenbank nicht löschen"
 
-#: commands/dbcommands.c:1713
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "Datenbank »%s« wird von einem aktiven logischen Replikations-Slot verwendet"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "%d Slot ist vorhanden."
 msgstr[1] "%d Slots sind vorhanden."
 
-#: commands/dbcommands.c:1729
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "Datenbank »%s« wird von einer Subskription für logische Replikation verwendet"
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "%d Subskription ist vorhanden."
 msgstr[1] "%d Subskriptionen sind vorhanden."
 
-#: commands/dbcommands.c:1752 commands/dbcommands.c:1926
-#: commands/dbcommands.c:2053
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "auf Datenbank »%s« wird von anderen Benutzern zugegriffen"
 
-#: commands/dbcommands.c:1886
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "keine Berechtigung, um Datenbank umzubenennen"
 
-#: commands/dbcommands.c:1915
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "aktuelle Datenbank kann nicht umbenannt werden"
 
-#: commands/dbcommands.c:2009
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "kann den Tablespace der aktuell geöffneten Datenbank nicht ändern"
 
-#: commands/dbcommands.c:2115
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "einige Relationen von Datenbank »%s« ist bereits in Tablespace »%s«"
 
-#: commands/dbcommands.c:2117
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "Sie müssen sie zurück in den Standard-Tablespace der Datenbank verschieben, bevor Sie diesen Befehl verwenden können."
 
-#: commands/dbcommands.c:2244 commands/dbcommands.c:2979
-#: commands/dbcommands.c:3279 commands/dbcommands.c:3392
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039
+#: commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, 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"
 
-#: commands/dbcommands.c:2305
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "unbekannte DROP-DATABASE-Option »%s«"
-
-#: commands/dbcommands.c:2383
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "Option »%s« kann nicht mit anderen Optionen angegeben werden"
 
-#: commands/dbcommands.c:2430
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "ungültige Datenbank »%s« kann nicht geändert werden"
 
-#: commands/dbcommands.c:2447
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "Verbindungen mit der aktuellen Datenbank können nicht verboten werden"
 
-#: commands/dbcommands.c:2673
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "keine Berechtigung, um Eigentümer der Datenbank zu ändern"
 
-#: commands/dbcommands.c:3085
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "%d andere Sitzung(en) und %d vorbereitete Transaktion(en) verwenden die Datenbank."
 
-#: commands/dbcommands.c:3088
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "%d andere Sitzung verwendet die Datenbank."
 msgstr[1] "%d andere Sitzungen verwenden die Datenbank."
 
-#: commands/dbcommands.c:3093 storage/ipc/procarray.c:3847
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "%d vorbereitete Transaktion verwendet die Datenbank."
 msgstr[1] "%d vorbereitete Transaktionen verwenden die Datenbank."
 
-#: commands/dbcommands.c:3235
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "Verzeichnis »%s« fehlt"
 
-#: commands/dbcommands.c:3293 commands/tablespace.c:184
+#: commands/dbcommands.c:3353 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "konnte »stat« für Verzeichnis »%s« nicht ausführen: %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s erfordert einen Parameter"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s erfordert einen numerischen Wert"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "%s erfordert einen Boole’schen Wert"
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s erfordert einen ganzzahligen Wert"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "Argument von %s muss ein Name sein"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "Argument von %s muss ein Typname sein"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "ungültiges Argument für %s: »%s«"
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2909
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "»%s« ist eine Aggregatfunktion"
@@ -8074,19 +8150,19 @@ msgstr "»%s« ist eine Aggregatfunktion"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Verwenden Sie DROP AGGREGATE, um Aggregatfunktionen zu löschen."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3865
-#: commands/tablecmds.c:4023 commands/tablecmds.c:4075
-#: commands/tablecmds.c:17061 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4024
+#: commands/tablecmds.c:4185 commands/tablecmds.c:4237
+#: commands/tablecmds.c:18966 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1397
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1479
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "Schema »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "Typ »%s« existiert nicht, wird übersprungen"
@@ -8106,7 +8182,7 @@ msgstr "Sortierfolge »%s« existiert nicht, wird übersprungen"
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "Konversion »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "Statistikobjekt »%s« existiert nicht, wird übersprungen"
@@ -8201,7 +8277,7 @@ msgstr "Regel »%s« für Relation »%s« existiert nicht, wird übersprungen"
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "Fremddaten-Wrapper »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1376
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "Server »%s« existiert nicht, wird übersprungen"
@@ -8221,503 +8297,504 @@ msgstr "Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«, wird
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "Publikation »%s« existiert nicht, wird übersprungen"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "keine Berechtigung, um Ereignistrigger »%s« zu erzeugen"
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "Nur Superuser können Ereignistrigger anlegen."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "unbekannter Ereignisname »%s«"
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "unbekannte Filtervariable »%s«"
 
-#: commands/event_trigger.c:181
-#, fuzzy, c-format
-#| msgid "This operation is not supported for unlogged tables."
+#: commands/event_trigger.c:185
+#, c-format
 msgid "tag filtering is not supported for login event triggers"
-msgstr "Diese Operation wird für ungeloggte Tabellen nicht unterstützt."
+msgstr "Tag-Filtern wird für Login-Ereignistrigger nicht unterstützt"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "Filterwert »%s« nicht erkannt für Filtervariable »%s«"
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "Ereignistrigger für %s werden nicht unterstützt"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "Filtervariable »%s« mehrmals angegeben"
 
-#: commands/event_trigger.c:435 commands/event_trigger.c:487
-#: commands/event_trigger.c:581
+#: commands/event_trigger.c:442 commands/event_trigger.c:494
+#: commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "Ereignistrigger »%s« existiert nicht"
 
-#: commands/event_trigger.c:519
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "Ereignistrigger mit OID %u existiert nicht"
 
-#: commands/event_trigger.c:549
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "keine Berechtigung, um Eigentümer des Ereignistriggers »%s« zu ändern"
 
-#: commands/event_trigger.c:551
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "Der Eigentümer eines Ereignistriggers muss ein Superuser sein."
 
-#: commands/event_trigger.c:1411
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s kann nur in einer sql_drop-Ereignistriggerfunktion aufgerufen werden"
 
-#: commands/event_trigger.c:1504 commands/event_trigger.c:1525
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%s kann nur in einer table_rewrite-Ereignistriggerfunktion aufgerufen werden"
 
-#: commands/event_trigger.c:1938
+#: commands/event_trigger.c:2066
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s kann nur in einer Ereignistriggerfunktion aufgerufen werden"
 
-#: commands/explain.c:240 commands/explain.c:265
+#: commands/explain_state.c:133 commands/explain_state.c:158
+#: replication/walsender.c:1151
 #, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "unbekannter Wert für EXPLAIN-Option »%s«: »%s«"
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "unbekannter Wert für %s-Option »%s«: »%s«"
 
-#: commands/explain.c:272
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
 #, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "unbekannte EXPLAIN-Option »%s«"
+msgid "EXPLAIN option %s requires ANALYZE"
+msgstr "EXPLAIN-Option %s erfordert ANALYZE"
 
-#: commands/explain.c:281
+#: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
-msgstr "EXPLAIN-Option WAL erfordert ANALYZE"
+msgid "%s options %s and %s cannot be used together"
+msgstr "%s-Optionen %s und %s können nicht zusammen verwendet werden"
 
-#: commands/explain.c:290
-#, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "EXPLAIN-Option TIMING erfordert ANALYZE"
-
-#: commands/explain.c:296
-#, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "EXPLAIN-Option SERIALIZE erfordert ANALYZE"
-
-#: commands/explain.c:302
-#, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "EXPLAIN-Optionen ANALYZE und GENERIC_PLAN können nicht zusammen verwendet werden"
-
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:198 commands/extension.c:3452
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "Erweiterung »%s« existiert nicht"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:371 commands/extension.c:380 commands/extension.c:392
+#: commands/extension.c:402
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "ungültiger Erweiterungsname: »%s«"
 
-#: commands/extension.c:278
+#: commands/extension.c:372
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "Erweiterungsnamen dürfen nicht leer sein."
 
-#: commands/extension.c:287
+#: commands/extension.c:381
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "Erweiterungsnamen dürfen nicht »--« enthalten."
 
-#: commands/extension.c:299
+#: commands/extension.c:393
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Erweiterungsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
-#: commands/extension.c:309
+#: commands/extension.c:403
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "Erweiterungsnamen dürfen keine Verzeichnistrennzeichen enthalten."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:418 commands/extension.c:427 commands/extension.c:436
+#: commands/extension.c:446
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "ungültiger Erweiterungsversionsname: »%s«"
 
-#: commands/extension.c:325
+#: commands/extension.c:419
 #, c-format
 msgid "Version names must not be empty."
 msgstr "Versionsnamen dürfen nicht leer sein."
 
-#: commands/extension.c:334
+#: commands/extension.c:428
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "Versionsnamen dürfen nicht »--« enthalten."
 
-#: commands/extension.c:343
+#: commands/extension.c:437
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "Versionsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
-#: commands/extension.c:353
+#: commands/extension.c:447
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "Versionsnamen dürfen keine Verzeichnistrennzeichen enthalten."
 
-#: commands/extension.c:507
+#: commands/extension.c:672
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "Erweiterung »%s« ist nicht verfügbar"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "Konnte Erweiterungskontrolldatei »%s« nicht öffnen: %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:673
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "Die Erweiterung muss zuerst auf dem System, auf dem PostgreSQL läuft, installiert werden."
 
-#: commands/extension.c:514
+#: commands/extension.c:695
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "konnte Erweiterungskontrolldatei »%s« nicht öffnen: %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:718 commands/extension.c:728
 #, 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"
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:750 commands/extension.c:758 commands/extension.c:766
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "Parameter »%s« erfordert einen Boole’schen Wert"
 
-#: commands/extension.c:594
+#: commands/extension.c:775
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "»%s« ist kein gültiger Kodierungsname"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:789 commands/extension.c:804
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "Parameter »%s« muss eine Liste von Erweiterungsnamen sein"
 
-#: commands/extension.c:630
+#: commands/extension.c:811
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "unbekannter Parameter »%s« in Datei »%s«"
 
-#: commands/extension.c:639
+#: commands/extension.c:820
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "Parameter »schema« kann nicht angegeben werden, wenn »relocatable« an ist"
 
-#: commands/extension.c:817
+#: commands/extension.c:996
+#, c-format
+msgid "SQL statement \"%.*s\""
+msgstr "SQL-Anweisung »%.*s«"
+
+#: commands/extension.c:1025
+#, c-format
+msgid "extension script file \"%s\", near line %d"
+msgstr "Erweiterungs-Skript-Datei »%s«, in der Nähe von Zeile %d"
+
+#: commands/extension.c:1029
+#, c-format
+msgid "extension script file \"%s\""
+msgstr "Erweiterungs-Skript-Datei »%s«"
+
+#: commands/extension.c:1141
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "Transaktionskontrollanweisungen sind nicht in einem Erweiterungsskript erlaubt"
 
-#: commands/extension.c:897
+#: commands/extension.c:1223
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "keine Berechtigung, um Erweiterung »%s« zu erzeugen"
 
-#: commands/extension.c:900
+#: commands/extension.c:1226
 #, c-format
 msgid "Must have CREATE privilege on current database to create this extension."
 msgstr "CREATE-Privileg für die aktuelle Datenbank wird benötigt, um diese Erweiterung anzulegen."
 
-#: commands/extension.c:901
+#: commands/extension.c:1227
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Nur Superuser können diese Erweiterung anlegen."
 
-#: commands/extension.c:905
+#: commands/extension.c:1231
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "keine Berechtigung, um Erweiterung »%s« zu aktualisieren"
 
-#: commands/extension.c:908
+#: commands/extension.c:1234
 #, c-format
 msgid "Must have CREATE privilege on current database to update this extension."
 msgstr "CREATE-Privileg für die aktuelle Datenbank wird benötigt, um diese Erweiterung zu aktualisieren."
 
-#: commands/extension.c:909
+#: commands/extension.c:1235
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Nur Superuser können diese Erweiterung aktualisieren."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1368
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "ungültiges Zeichen im Erweiterungseigentümer: darf keins aus »%s« enthalten"
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1392 commands/extension.c:1419
 #, c-format
 msgid "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr "ungültiges Zeichen in Schema von Erweiterung »%s«: darf keins aus »%s« enthalten"
 
-#: commands/extension.c:1288
+#: commands/extension.c:1614
 #, 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«"
 
-#: commands/extension.c:1496 commands/extension.c:3089
+#: commands/extension.c:1822 commands/extension.c:3510
 #, c-format
 msgid "version to install must be specified"
 msgstr "die zu installierende Version muss angegeben werden"
 
-#: commands/extension.c:1533
+#: commands/extension.c:1859
 #, c-format
 msgid "extension \"%s\" has no installation script nor update path for version \"%s\""
 msgstr "Erweiterung »%s« hat kein Installationsskript und keinen Aktualisierungspfad für Version »%s«"
 
-#: commands/extension.c:1567
+#: commands/extension.c:1893
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "Erweiterung »%s« muss in Schema »%s« installiert werden"
 
-#: commands/extension.c:1727
+#: commands/extension.c:2053
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "zyklische Abhängigkeit zwischen Erweiterungen »%s« und »%s« entdeckt"
 
-#: commands/extension.c:1732
+#: commands/extension.c:2058
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "installiere benötigte Erweiterung »%s«"
 
-#: commands/extension.c:1755
+#: commands/extension.c:2081
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "benötigte Erweiterung »%s« ist nicht installiert"
 
-#: commands/extension.c:1758
+#: commands/extension.c:2084
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr "Verwenden Sie CREATE EXTENSION ... CASCADE, um die benötigten Erweiterungen ebenfalls zu installieren."
 
-#: commands/extension.c:1793
+#: commands/extension.c:2119
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "Erweiterung »%s« existiert bereits, wird übersprungen"
 
-#: commands/extension.c:1800
+#: commands/extension.c:2126
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "Erweiterung »%s« existiert bereits"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2137
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "geschachteltes CREATE EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:1975
+#: commands/extension.c:2301
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "Erweiterung »%s« kann nicht gelöscht werden, weil sie gerade geändert wird"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2818
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s kann nur von einem SQL-Skript aufgerufen werden, das von CREATE EXTENSION ausgeführt wird"
 
-#: commands/extension.c:2462
+#: commands/extension.c:2830
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u bezieht sich nicht auf eine Tabelle"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2835
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "Tabelle »%s« ist kein Mitglied der anzulegenden Erweiterung"
 
-#: commands/extension.c:2813
+#: commands/extension.c:3234
 #, 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"
 
-#: commands/extension.c:2854 commands/extension.c:2948
+#: commands/extension.c:3275 commands/extension.c:3369
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "Erweiterung »%s« unterstützt SET SCHEMA nicht"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3332
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "SET SCHEMA für Erweiterung »%s« ist nicht möglich, weil andere Erweiterungen es verhindern"
 
-#: commands/extension.c:2913
+#: commands/extension.c:3334
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "Erweiterung »%s« verhindert Verlagerung von Erweiterung »%s«."
 
-#: commands/extension.c:2950
+#: commands/extension.c:3371
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s ist nicht im Schema der Erweiterung (»%s«)"
 
-#: commands/extension.c:3011
+#: commands/extension.c:3432
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "geschachteltes ALTER EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3521
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "Version »%s« von Erweiterung »%s« ist bereits installiert"
 
-#: commands/extension.c:3311
+#: commands/extension.c:3732
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "ein Objekt dieses Typs kann nicht zu einer Erweiterung hinzugefügt werden"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3830
 #, 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"
 
-#: commands/extension.c:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3912 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "konnte Multirange-Typ für Datentyp %s nicht finden"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3954
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "Datei »%s« ist zu groß"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:4047 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "eine Komponente im Parameter »%s« ist kein absoluter Pfad"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "Option »%s« nicht gefunden"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "Option »%s« mehrmals angegeben"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Eigentümer des Fremddaten-Wrappers »%s« zu ändern"
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "Nur Superuser können den Eigentümer eines Fremddaten-Wrappers ändern."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Der Eigentümer eines Fremddaten-Wrappers muss ein Superuser sein."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:681
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "Fremddaten-Wrapper »%s« existiert nicht"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "Fremddaten-Wrapper mit OID %u existiert nicht"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "Fremdserver mit OID %u existiert nicht"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu erzeugen"
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Nur Superuser können Fremddaten-Wrapper anlegen."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu ändern"
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Nur Superuser können Fremddaten-Wrapper ändern."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "das Ändern des Handlers des Fremddaten-Wrappers kann das Verhalten von bestehenden Fremdtabellen verändern"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:761
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr "durch Ändern des Validators des Fremddaten-Wrappers können die Optionen von abhängigen Objekten ungültig werden"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:892
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "Server »%s« existiert bereits, wird übersprungen"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1160
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "Benutzerabbildung für »%s« existiert bereits für Server »%s«, wird übersprungen"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1170
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "Benutzerabbildung für »%s« existiert bereits für Server »%s«"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1270 commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "Benutzerabbildung für »%s« existiert nicht für Server »%s«"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1395
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "Benutzerabbildung für »%s« existiert nicht für Server »%s«, wird übersprungen"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:394
+#: commands/foreigncmds.c:1523 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "Fremddaten-Wrapper »%s« hat keinen Handler"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1529
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "Fremddaten-Wrapper »%s« unterstützt IMPORT FOREIGN SCHEMA nicht"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1631
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "importiere Fremdtabelle »%s«"
@@ -8752,637 +8829,681 @@ msgstr "Hüllentypdefinition wird erzeugt."
 msgid "SQL function cannot accept shell type %s"
 msgstr "SQL-Funktion kann keinen Hüllentyp %s annehmen"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "Aggregatfunktion kann keinen Hüllentyp %s annehmen"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "Argumenttyp %s ist nur eine Hülle"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "Typ %s existiert nicht"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "Aggregatfunktionen können keine SETOF-Argumente haben"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "Prozeduren können keine SETOF-Argumente haben"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "Funktionen können keine SETOF-Argumente haben"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "VARIADIC-Parameter muss der letzte Eingabeparameter sein"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "VARIADIC-Parameter muss der letzte Parameter sein"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "VARIADIC-Parameter muss ein Array sein"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "Parametername »%s« mehrmals angegeben"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "nur Eingabeparameter können Vorgabewerte haben"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "Tabellenverweise können nicht in Parametervorgabewerten verwendet werden"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr "Eingabeparameter hinter einem mit Vorgabewert müssen auch einen Vorgabewert haben"
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr "Prozedur-OUT-Parameter können nicht nach einem Parameter mit Vorgabewert stehen"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "ungültiges Attribut in Prozedurdefinition"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "Unterstützungsfunktion %s muss Rückgabetyp %s haben"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "nur Superuser können eine Support-Funktion angeben"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "COST muss positiv sein"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "ROWS muss positiv sein"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "kein Funktionskörper angegeben"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "doppelter Funktionskörper angegeben"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "Inline-SQL-Funktionskörper ist nur gültig für Sprache SQL"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid "SQL function with unquoted function body cannot have polymorphic arguments"
 msgstr "SQL-Funktion mit Funktionsrumpf nicht in Anführungszeichen kann keine polymorphen Argumente haben"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr "%s ist in SQL-Funktionen nicht in Anführungszeichen noch nicht erlaubt"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "nur ein AS-Element benötigt für Sprache »%s«"
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "keine Sprache angegeben"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2104
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "Sprache »%s« existiert nicht"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2106
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr "Verwenden Sie CREATE EXTENSION, um die Sprache in die Datenbank zu laden."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr "nur Superuser können eine »leakproof«-Funktion definieren"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "Ergebnistyp der Funktion muss %s sein wegen OUT-Parametern"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "Ergebnistyp der Funktion muss angegeben werden"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS ist nicht anwendbar, wenn die Funktion keine Ergebnismenge zurückgibt"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "Quelldatentyp %s ist ein Pseudotyp"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "Zieldatentyp %s ist ein Pseudotyp"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "Typumwandlung wird ignoriert werden, weil der Quelldatentyp eine Domäne ist"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "Typumwandlung wird ignoriert werden, weil der Zieldatentyp eine Domäne ist"
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "Typumwandlungsfunktion muss ein bis drei Argumente haben"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid "argument of cast function must match or be binary-coercible from source data type"
 msgstr "Argument der Typumwandlungsfunktion muss mit Quelldatentyp übereinstimmen oder in ihn binär-umwandelbar sein"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "zweites Argument der Typumwandlungsfunktion muss Typ %s haben"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "drittes Argument der Typumwandlungsfunktion muss Typ %s haben"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid "return data type of cast function must match or be binary-coercible to target data type"
 msgstr "Rückgabetyp der Typumwandlungsfunktion muss mit Zieldatentyp übereinstimmen oder in ihn binär-umwandelbar sein"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "Typumwandlungsfunktion darf nicht VOLATILE sein"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "Typumwandlungsfunktion muss eine normale Funktion sein"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "Typumwandlungsfunktion darf keine Ergebnismenge zurückgeben"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "nur Superuser können Typumwandlungen mit WITHOUT FUNCTION erzeugen"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "Quelldatentyp und Zieldatentyp sind nicht physikalisch kompatibel"
 
-#: commands/functioncmds.c:1704
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "zusammengesetzte Datentypen sind nicht binärkompatibel"
 
-#: commands/functioncmds.c:1710
-#, c-format
-msgid "enum data types are not binary-compatible"
-msgstr "Enum-Datentypen sind nicht binärkompatibel"
-
-#: commands/functioncmds.c:1716
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "Array-Datentypen sind nicht binärkompatibel"
 
-#: commands/functioncmds.c:1733
+#: commands/functioncmds.c:1741
+#, c-format
+msgid "range data types are not binary-compatible"
+msgstr "Range-Datentypen sind nicht binärkompatibel"
+
+#: commands/functioncmds.c:1747
+#, c-format
+msgid "enum data types are not binary-compatible"
+msgstr "Enum-Datentypen sind nicht binärkompatibel"
+
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "Domänendatentypen dürfen nicht als binärkompatibel markiert werden"
 
-#: commands/functioncmds.c:1743
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "Quelldatentyp und Zieldatentyp sind der selbe"
 
-#: commands/functioncmds.c:1776
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "Transformationsfunktion darf nicht VOLATILE sein"
 
-#: commands/functioncmds.c:1780
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "Transformationsfunktion muss eine normale Funktion sein"
 
-#: commands/functioncmds.c:1784
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "Transformationsfunktion darf keine Ergebnismenge zurückgeben"
 
-#: commands/functioncmds.c:1788
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "Transformationsfunktion muss ein Argument haben"
 
-#: commands/functioncmds.c:1792
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "erstes Argument der Transformationsfunktion muss Typ %s haben"
 
-#: commands/functioncmds.c:1831
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "Datentyp %s ist ein Pseudotyp"
 
-#: commands/functioncmds.c:1837
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "Datentyp %s ist eine Domäne"
 
-#: commands/functioncmds.c:1877
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "Rückgabetyp der FROM-SQL-Funktion muss %s sein"
 
-#: commands/functioncmds.c:1903
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "Rückgabetyp der TO-SQL-Funktion muss der zu transformierende Datentyp sein"
 
-#: commands/functioncmds.c:1930
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "Transformation für Typ %s Sprache »%s« existiert bereits"
 
-#: commands/functioncmds.c:2016
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "Transformation für Typ %s Sprache »%s« existiert nicht"
 
-#: commands/functioncmds.c:2040
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "Funktion %s existiert bereits in Schema »%s«"
 
-#: commands/functioncmds.c:2091
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "kein Inline-Code angegeben"
 
-#: commands/functioncmds.c:2137
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "Sprache »%s« unterstützt das Ausführen von Inline-Code nicht"
 
-#: commands/functioncmds.c:2232
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
 msgstr[0] "kann nicht mehr als %d Argument an eine Prozedur übergeben"
 msgstr[1] "kann nicht mehr als %d Argumente an eine Prozedur übergeben"
 
-#: commands/indexcmds.c:647
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "mindestens eine Spalte muss angegeben werden"
 
-#: commands/indexcmds.c:651
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "Index kann nicht mehr als %d Spalten enthalten"
 
-#: commands/indexcmds.c:694
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "kann keinen Index für Relation »%s« erzeugen"
 
-#: commands/indexcmds.c:720
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr "kann Index für partitionierte Tabelle »%s« nicht nebenläufig erzeugen"
 
-#: commands/indexcmds.c:730
+#: commands/indexcmds.c:748
 #, 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:768 commands/tablecmds.c:806 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:893 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "für partitionierte Relationen kann kein Standard-Tablespace angegeben werden"
 
-#: commands/indexcmds.c:800 commands/tablecmds.c:837 commands/tablecmds.c:3564
+#: commands/indexcmds.c:818 commands/tablecmds.c:924 commands/tablecmds.c:3720
 #, 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"
 
-#: commands/indexcmds.c:833
+#: commands/indexcmds.c:851
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "ersetze Zugriffsmethode »gist« für obsolete Methode »rtree«"
 
-#: commands/indexcmds.c:854
+#: commands/indexcmds.c:872
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "Zugriffsmethode »%s« unterstützt keine Unique Indexe"
 
-#: commands/indexcmds.c:859
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "Zugriffsmethode »%s« unterstützt keine eingeschlossenen Spalten"
 
-#: commands/indexcmds.c:864
+#: commands/indexcmds.c:882
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "Zugriffsmethode »%s« unterstützt keine mehrspaltigen Indexe"
 
-#: commands/indexcmds.c:869
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "Zugriffsmethode »%s« unterstützt keine Exclusion-Constraints"
 
-#: commands/indexcmds.c:998
+#: commands/indexcmds.c:892
 #, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr "Partitionierungsschlüssel kann nicht mit Zugriffsmethode »%s« mit einem Index gepaart werden"
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "Zugriffsmethode »%s« unterstützt keine WITHOUT-OVERLAPS-Constraints"
 
-#: commands/indexcmds.c:1008
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr "nicht unterstützter %s-Constraint mit Partitionierungsschlüsseldefinition"
 
-#: commands/indexcmds.c:1010
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "%s-Constraints können nicht verwendet werden, wenn Partitionierungsschlüssel Ausdrücke enthalten."
 
-#: commands/indexcmds.c:1060
-#, fuzzy, c-format
-#| msgid "cannot match partition key to an index using access method \"%s\""
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2471
+#: commands/indexcmds.c:2490 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1419 utils/adt/array_userfuncs.c:1562
+#: utils/adt/arrayfuncs.c:3870 utils/adt/arrayfuncs.c:4425
+#: utils/adt/arrayfuncs.c:6446 utils/adt/rowtypes.c:1220
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "konnte keinen Ist-Gleich-Operator für Typ %s ermitteln"
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2493
+#, c-format
+msgid "There is no suitable operator in operator family \"%s\" for access method \"%s\"."
+msgstr "Es gibt keinen passenden Operator in Operatorfamilie »%s« für Zugriffsmethode »%s«."
+
+#: commands/indexcmds.c:1077
+#, c-format
 msgid "cannot match partition key to index on column \"%s\" using non-equal operator \"%s\""
-msgstr "Partitionierungsschlüssel kann nicht mit Zugriffsmethode »%s« mit einem Index gepaart werden"
+msgstr "Partitionierungsschlüssel kann nicht mit Nicht-Ist-Gleich-Operator »%s« mit Index für Spalte »%s« gepaart werden"
 
-#: commands/indexcmds.c:1076
+#: commands/indexcmds.c:1093
 #, c-format
 msgid "unique constraint on partitioned table must include all partitioning columns"
 msgstr "Unique-Constraint für partitionierte Tabelle muss alle Partitionierungsspalten enthalten"
 
-#: commands/indexcmds.c:1077
+#: commands/indexcmds.c:1094
 #, c-format
 msgid "%s constraint on table \"%s\" lacks column \"%s\" which is part of the partition key."
 msgstr "Im %s-Constraint in Tabelle »%s« fehlt Spalte »%s«, welche Teil des Partitionierungsschlüssels ist."
 
-#: commands/indexcmds.c:1096 commands/indexcmds.c:1115
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1148
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "Indexerzeugung für Systemspalten wird nicht unterstützt"
 
-#: commands/indexcmds.c:1344 tcop/utility.c:1515
+#: commands/indexcmds.c:1124
+#, c-format
+msgid "primary keys on virtual generated columns are not supported"
+msgstr "Primärschlüssel über virtuelle generierte Spalten werden nicht unterstützt"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1166
+#, c-format
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr "Unique Constraints über virtuelle generierte Spalten werden nicht unterstützt"
+
+#: commands/indexcmds.c:1127 commands/indexcmds.c:1167
+#, c-format
+msgid "indexes on virtual generated columns are not supported"
+msgstr "Indexe über virtuelle generierte Spalten werden nicht unterstützt"
+
+#: commands/indexcmds.c:1399 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "kann keinen Unique Index für partitionierte Tabelle »%s« erzeugen"
 
-#: commands/indexcmds.c:1346 tcop/utility.c:1517
+#: commands/indexcmds.c:1401 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "Tabelle »%s« enthält Partitionen, die Fremdtabellen sind."
 
-#: commands/indexcmds.c:1831
+#: commands/indexcmds.c:1859
 #, 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:1910 parser/parse_utilcmd.c:2494
-#: parser/parse_utilcmd.c:2629
+#: commands/indexcmds.c:1956 parser/parse_utilcmd.c:2739
+#: parser/parse_utilcmd.c:2927
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "Spalte »%s«, die im Schlüssel verwendet wird, existiert nicht"
 
-#: commands/indexcmds.c:1934 parser/parse_utilcmd.c:1782
+#: commands/indexcmds.c:1980 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "in eingeschlossenen Spalten werden keine Ausdrücke unterstützt"
 
-#: commands/indexcmds.c:1975
+#: commands/indexcmds.c:2021
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "Funktionen im Indexausdruck müssen als IMMUTABLE markiert sein"
 
-#: commands/indexcmds.c:1990
+#: commands/indexcmds.c:2036
 #, c-format
 msgid "including column does not support a collation"
 msgstr "inkludierte Spalte unterstützt keine Sortierfolge"
 
-#: commands/indexcmds.c:1994
+#: commands/indexcmds.c:2040
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "inkludierte Spalte unterstützt keine Operatorklasse"
 
-#: commands/indexcmds.c:1998
+#: commands/indexcmds.c:2044
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "inkludierte Spalte unterstützt die Optionen ASC/DESC nicht"
 
-#: commands/indexcmds.c:2002
+#: commands/indexcmds.c:2048
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "inkludierte Spalte unterstützt die Optionen NULLS FIRST/LAST nicht"
 
-#: commands/indexcmds.c:2044
+#: commands/indexcmds.c:2091
 #, 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:2052 commands/tablecmds.c:18078 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3918
+#: commands/indexcmds.c:2099 commands/tablecmds.c:20006 commands/typecmds.c:812
+#: parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4073
 #: utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "Sortierfolgen werden von Typ %s nicht unterstützt"
 
-#: commands/indexcmds.c:2117
+#: commands/indexcmds.c:2166
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "Operator %s ist nicht kommutativ"
 
-#: commands/indexcmds.c:2119
+#: commands/indexcmds.c:2168
 #, 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:2145
+#: commands/indexcmds.c:2178
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "Operator %s ist kein Mitglied der Operatorfamilie »%s«"
 
-#: commands/indexcmds.c:2148
+#: commands/indexcmds.c:2181
 #, 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:2183
+#: commands/indexcmds.c:2230
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "Zugriffsmethode »%s« unterstützt die Optionen ASC/DESC nicht"
 
-#: commands/indexcmds.c:2188
+#: commands/indexcmds.c:2235
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "Zugriffsmethode »%s« unterstützt die Optionen NULLS FIRST/LAST nicht"
 
-#: commands/indexcmds.c:2232 commands/tablecmds.c:18103
-#: commands/tablecmds.c:18109 commands/typecmds.c:2311
+#: commands/indexcmds.c:2279 commands/tablecmds.c:20031
+#: commands/tablecmds.c:20037 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "Datentyp %s hat keine Standardoperatorklasse für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:2234
+#: commands/indexcmds.c:2281
 #, 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:2263 commands/indexcmds.c:2271
-#: commands/opclasscmds.c:204
+#: commands/indexcmds.c:2310 commands/indexcmds.c:2318
+#: commands/opclasscmds.c:205
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "Operatorklasse »%s« existiert nicht für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:2285 commands/typecmds.c:2299
+#: commands/indexcmds.c:2332 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "Operatorklasse »%s« akzeptiert Datentyp %s nicht"
 
-#: commands/indexcmds.c:2375
+#: commands/indexcmds.c:2422
 #, 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:2703
+#: commands/indexcmds.c:2472 commands/indexcmds.c:2491
+#, c-format
+msgid "could not identify an overlaps operator for type %s"
+msgstr "konnte keinen Überlappungsoperator für Typ %s ermitteln"
+
+#: commands/indexcmds.c:2473 commands/indexcmds.c:2492
+#, c-format
+msgid "could not identify a contained-by operator for type %s"
+msgstr "konnte keinen Contained-By-Operator für Typ %s ermitteln"
+
+#: commands/indexcmds.c:2474 commands/tablecmds.c:10368
 #, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "unbekannte REINDEX-Option »%s«"
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "Konnte Vergleichstyp %d für Operatorfamilie »%s« von Zugriffsmethode »%s« nicht übersetzen."
 
-#: commands/indexcmds.c:2935
+#: commands/indexcmds.c:3080
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "Tabelle »%s« hat keine Indexe, die nebenläufig reindiziert werden können"
 
-#: commands/indexcmds.c:2949
+#: commands/indexcmds.c:3094
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "Tabelle »%s« hat keine zu reindizierenden Indexe"
 
-#: commands/indexcmds.c:2996 commands/indexcmds.c:3507
-#: commands/indexcmds.c:3637
+#: commands/indexcmds.c:3141 commands/indexcmds.c:3652
+#: commands/indexcmds.c:3782
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "Systemkataloge können nicht nebenläufig reindiziert werden"
 
-#: commands/indexcmds.c:3020
+#: commands/indexcmds.c:3165
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "nur die aktuell geöffnete Datenbank kann reindiziert werden"
 
-#: commands/indexcmds.c:3112
+#: commands/indexcmds.c:3257
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "Systemkataloge können nicht nebenläufig reindiziert werden, werden alle übersprungen"
 
-#: commands/indexcmds.c:3145
+#: commands/indexcmds.c:3290
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "Systemrelationen können nicht verschoben werden, werden alle übersprungen"
 
-#: commands/indexcmds.c:3191
+#: commands/indexcmds.c:3336
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "beim Reindizieren der partitionierten Tabelle »%s.%s«"
 
-#: commands/indexcmds.c:3194
+#: commands/indexcmds.c:3339
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "beim Reindizieren des partitionierten Index »%s.%s«"
 
-#: commands/indexcmds.c:3387 commands/indexcmds.c:4255
+#: commands/indexcmds.c:3532 commands/indexcmds.c:4424
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "Tabelle »%s.%s« wurde neu indiziert"
 
-#: commands/indexcmds.c:3539 commands/indexcmds.c:3592
+#: commands/indexcmds.c:3684 commands/indexcmds.c:3737
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "Reindizieren des ungültigen Index »%s.%s« wird übersprungen"
 
-#: commands/indexcmds.c:3542 commands/indexcmds.c:3595
+#: commands/indexcmds.c:3687 commands/indexcmds.c:3740
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "Verwenden Sie DROP INDEX oder REINDEX INDEX."
 
-#: commands/indexcmds.c:3546
+#: commands/indexcmds.c:3691
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "Exclusion-Constraint-Index »%s.%s« kann nicht nebenläufig reindizert werden, wird übersprungen"
 
-#: commands/indexcmds.c:3702
+#: commands/indexcmds.c:3847
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "diese Art Relation kann nicht nebenläufig reindiziert werden"
 
-#: commands/indexcmds.c:3720
+#: commands/indexcmds.c:3865
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "nicht geteilte Relation kann nicht nach Tablespace »%s« verschoben werden"
 
-#: commands/indexcmds.c:4236 commands/indexcmds.c:4248
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4417
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "Index »%s.%s« wurde neu indiziert"
 
-#: commands/indexcmds.c:4238 commands/indexcmds.c:4257
+#: commands/indexcmds.c:4407 commands/indexcmds.c:4426
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -9392,254 +9513,274 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "kann Relation »%s« nicht sperren"
 
-#: commands/matview.c:190
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "CONCURRENTLY kann nicht verwendet werden, wenn die materialisierte Sicht nicht befüllt ist"
 
-#: commands/matview.c:196 gram.y:18967
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "Optionen %s und %s können nicht zusammen verwendet werden"
 
-#: commands/matview.c:253
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "kann materialisierte Sicht »%s« nicht nebenläufig auffrischen"
 
-#: commands/matview.c:256
+#: commands/matview.c:276
 #, c-format
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr "Erzeugen Sie einen Unique Index ohne WHERE-Klausel für eine oder mehrere Spalten der materialisierten Sicht."
 
-#: commands/matview.c:650
+#: commands/matview.c:682
 #, 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"
 
-#: commands/matview.c:652
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "Zeile: %s"
 
-#: commands/opclasscmds.c:123
+#: commands/matview.c:838
+#, c-format
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "konnte keinen passenden Unique Index für materialisierte Sicht »%s« finden"
+
+#: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
 msgstr "Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«"
 
-#: commands/opclasscmds.c:266
+#: commands/opclasscmds.c:267
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists"
 msgstr "Operatorfamilie »%s« für Zugriffsmethode »%s« existiert bereits"
 
-#: commands/opclasscmds.c:415
+#: commands/opclasscmds.c:416
 #, c-format
 msgid "must be superuser to create an operator class"
 msgstr "nur Superuser können Operatorklassen erzeugen"
 
-#: commands/opclasscmds.c:492 commands/opclasscmds.c:909
-#: commands/opclasscmds.c:1055
+#: commands/opclasscmds.c:493 commands/opclasscmds.c:910
+#: commands/opclasscmds.c:1056
 #, c-format
 msgid "invalid operator number %d, must be between 1 and %d"
 msgstr "ungültige Operatornummer %d, muss zwischen 1 und %d sein"
 
-#: commands/opclasscmds.c:537 commands/opclasscmds.c:959
-#: commands/opclasscmds.c:1071
+#: commands/opclasscmds.c:538 commands/opclasscmds.c:960
+#: commands/opclasscmds.c:1072
 #, c-format
 msgid "invalid function number %d, must be between 1 and %d"
 msgstr "ungültige Funktionsnummer %d, muss zwischen 1 und %d sein"
 
-#: commands/opclasscmds.c:566
+#: commands/opclasscmds.c:567
 #, c-format
 msgid "storage type specified more than once"
 msgstr "Storage-Typ mehrmals angegeben"
 
-#: commands/opclasscmds.c:593
+#: commands/opclasscmds.c:594
 #, 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"
 
-#: commands/opclasscmds.c:609
+#: commands/opclasscmds.c:610
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists"
 msgstr "Operatorklasse »%s« für Zugriffsmethode »%s« existiert bereits"
 
-#: commands/opclasscmds.c:637
+#: commands/opclasscmds.c:638
 #, 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"
 
-#: commands/opclasscmds.c:640
+#: commands/opclasscmds.c:641
 #, c-format
 msgid "Operator class \"%s\" already is the default."
 msgstr "Operatorklasse »%s« ist bereits der Standard."
 
-#: commands/opclasscmds.c:800
+#: commands/opclasscmds.c:801
 #, c-format
 msgid "must be superuser to create an operator family"
 msgstr "nur Superuser können Operatorfamilien erzeugen"
 
-#: commands/opclasscmds.c:860
+#: commands/opclasscmds.c:861
 #, c-format
 msgid "must be superuser to alter an operator family"
 msgstr "nur Superuser können Operatorfamilien ändern"
 
-#: commands/opclasscmds.c:918
+#: commands/opclasscmds.c:919
 #, c-format
 msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
 msgstr "Operatorargumenttypen müssen in ALTER OPERATOR FAMILY angegeben werden"
 
-#: commands/opclasscmds.c:993
+#: commands/opclasscmds.c:994
 #, c-format
 msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
 msgstr "STORAGE kann in ALTER OPERATOR FAMILY nicht angegeben werden"
 
-#: commands/opclasscmds.c:1127
+#: commands/opclasscmds.c:1128
 #, c-format
 msgid "one or two argument types must be specified"
 msgstr "ein oder zwei Argumenttypen müssen angegeben werden"
 
-#: commands/opclasscmds.c:1153
+#: commands/opclasscmds.c:1154
 #, c-format
 msgid "index operators must be binary"
 msgstr "Indexoperatoren müssen binär sein"
 
-#: commands/opclasscmds.c:1172
+#: commands/opclasscmds.c:1173
 #, c-format
 msgid "access method \"%s\" does not support ordering operators"
 msgstr "Zugriffsmethode »%s« unterstützt keine Sortieroperatoren"
 
-#: commands/opclasscmds.c:1183
+#: commands/opclasscmds.c:1184
 #, c-format
 msgid "index search operators must return boolean"
 msgstr "Indexsuchoperatoren müssen Typ boolean zurückgeben"
 
-#: commands/opclasscmds.c:1223
+#: commands/opclasscmds.c:1224
 #, c-format
 msgid "associated data types for operator class options parsing functions must match opclass input type"
 msgstr "zugehörige Datentypen für Operatorklassenoptionsparsefunktionen müssen mit Operatorklasseneingabetyp übereinstimmen"
 
-#: commands/opclasscmds.c:1230
+#: commands/opclasscmds.c:1231
 #, c-format
 msgid "left and right associated data types for operator class options parsing functions must match"
 msgstr "linke und rechte zugehörige Datentypen für Operatorklassenoptionsparsefunktionen müssen übereinstimmen"
 
-#: commands/opclasscmds.c:1238
+#: commands/opclasscmds.c:1239
 #, c-format
 msgid "invalid operator class options parsing function"
 msgstr "ungültige Operatorklassenoptionsparsefunktion"
 
-#: commands/opclasscmds.c:1239
+#: commands/opclasscmds.c:1240
 #, c-format
 msgid "Valid signature of operator class options parsing function is %s."
 msgstr "Gültige Signatur einer Operatorklassenoptionsparsefunktion ist %s."
 
-#: commands/opclasscmds.c:1258
+#: commands/opclasscmds.c:1259
+#, c-format
+msgid "ordering comparison functions must have two arguments"
+msgstr "ordnende Vergleichsfunktionen müssen zwei Argumente haben"
+
+#: commands/opclasscmds.c:1263
+#, c-format
+msgid "ordering comparison functions must return integer"
+msgstr "ordnende Vergleichsfunktionen müssen Typ integer zurückgeben"
+
+#: commands/opclasscmds.c:1280
+#, c-format
+msgid "ordering sort support functions must accept type \"internal\""
+msgstr "ordnende Sortierunterstützungsfunktionen müssen Typ »internal« akzeptieren"
+
+#: commands/opclasscmds.c:1284
 #, c-format
-msgid "btree comparison functions must have two arguments"
-msgstr "btree-Vergleichsfunktionen müssen zwei Argumente haben"
+msgid "ordering sort support functions must return void"
+msgstr "ordnende Sortierunterstützungsfunktionen müssen Typ void zurückgeben"
 
-#: commands/opclasscmds.c:1262
+#: commands/opclasscmds.c:1295
 #, c-format
-msgid "btree comparison functions must return integer"
-msgstr "btree-Vergleichsfunktionen müssen Typ integer zurückgeben"
+msgid "ordering in_range functions must have five arguments"
+msgstr "ordnende in_range-Funktionen müssen fünf Argumente haben"
 
-#: commands/opclasscmds.c:1279
+#: commands/opclasscmds.c:1299
 #, c-format
-msgid "btree sort support functions must accept type \"internal\""
-msgstr "btree-Sortierunterstützungsfunktionen müssen Typ »internal« akzeptieren"
+msgid "ordering in_range functions must return boolean"
+msgstr "ordnende in_range-Funktionen müssen Typ boolean zurückgeben"
 
-#: commands/opclasscmds.c:1283
+#: commands/opclasscmds.c:1315
 #, c-format
-msgid "btree sort support functions must return void"
-msgstr "btree-Sortierunterstützungsfunktionen müssen Typ void zurückgeben"
+msgid "ordering equal image functions must have one argument"
+msgstr "ordnende Equal-Image-Funktionen müssen ein Argument haben"
 
-#: commands/opclasscmds.c:1294
+#: commands/opclasscmds.c:1319
 #, c-format
-msgid "btree in_range functions must have five arguments"
-msgstr "btree-in_range-Funktionen müssen fünf Argumente haben"
+msgid "ordering equal image functions must return boolean"
+msgstr "ordnende Equal-Image-Funktionen müssen Typ boolean zurückgeben"
 
-#: commands/opclasscmds.c:1298
+#: commands/opclasscmds.c:1332
 #, c-format
-msgid "btree in_range functions must return boolean"
-msgstr "btree-in_range-Funktionen müssen Typ boolean zurückgeben"
+msgid "ordering equal image functions must not be cross-type"
+msgstr "ordnende Equal-Image-Funktionen dürfen nicht typübergreifend sein"
 
-#: commands/opclasscmds.c:1314
+#: commands/opclasscmds.c:1340
 #, c-format
-msgid "btree equal image functions must have one argument"
-msgstr "btree-equal-image-Funktionen müssen ein Argument haben"
+msgid "btree skip support functions must accept type \"internal\""
+msgstr "btree-Skip-Unterstützungsfunktionen müssen Typ »internal« akzeptieren"
 
-#: commands/opclasscmds.c:1318
+#: commands/opclasscmds.c:1344
 #, c-format
-msgid "btree equal image functions must return boolean"
-msgstr "btree-equal-image-Funktionen müssen Typ boolean zurückgeben"
+msgid "btree skip support functions must return void"
+msgstr "btree-Skip-Unterstützungsfunktionen müssen Typ void zurückgeben"
 
-#: commands/opclasscmds.c:1331
+#: commands/opclasscmds.c:1357
 #, c-format
-msgid "btree equal image functions must not be cross-type"
-msgstr "btree-equal-image-Funktionen dürfen nicht typübergreifend sein"
+msgid "btree skip support functions must not be cross-type"
+msgstr "btree-Skip-Unterstützungsfunktionen dürfen nicht typübergreifend sein"
 
-#: commands/opclasscmds.c:1341
+#: commands/opclasscmds.c:1367
 #, c-format
 msgid "hash function 1 must have one argument"
 msgstr "Hash-Funktion 1 muss ein Argument haben"
 
-#: commands/opclasscmds.c:1345
+#: commands/opclasscmds.c:1371
 #, c-format
 msgid "hash function 1 must return integer"
 msgstr "Hash-Funktion 1 muss Typ integer zurückgeben"
 
-#: commands/opclasscmds.c:1352
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "Hash-Funktion 2 muss zwei Argumente haben"
 
-#: commands/opclasscmds.c:1356
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "Hash-Funktion 2 muss Typ bigint zurückgeben"
 
-#: commands/opclasscmds.c:1381
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "zugehörige Datentypen müssen für Indexunterstützungsfunktion angegeben werden"
 
-#: commands/opclasscmds.c:1406
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "Funktionsnummer %d für (%s,%s) einscheint mehrmals"
 
-#: commands/opclasscmds.c:1413
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "Operatornummer %d für (%s,%s) einscheint mehrmals"
 
-#: commands/opclasscmds.c:1459
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "Operator %d(%s,%s) existiert bereits in Operatorfamilie »%s«"
 
-#: commands/opclasscmds.c:1565
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "Funktion %d(%s,%s) existiert bereits in Operatorfamilie »%s«"
 
-#: commands/opclasscmds.c:1646
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "Operator %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 
-#: commands/opclasscmds.c:1686
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "Funktion %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 
-#: commands/opclasscmds.c:1717
+#: commands/opclasscmds.c:1840
 #, 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«"
 
-#: commands/opclasscmds.c:1740
+#: commands/opclasscmds.c:1863
 #, 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«"
@@ -9649,7 +9790,7 @@ msgstr "Operatorfamilie »%s« für Zugriffsmethode »%s« existiert bereits in
 msgid "SETOF type not allowed for operator argument"
 msgstr "SETOF-Typ nicht als Operatorargument erlaubt"
 
-#: commands/operatorcmds.c:154 commands/operatorcmds.c:554
+#: commands/operatorcmds.c:154 commands/operatorcmds.c:587
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "Operator-Attribut »%s« unbekannt"
@@ -9674,49 +9815,59 @@ msgstr "rechtes Argument des Operators muss angegeben werden"
 msgid "Postfix operators are not supported."
 msgstr "Postfix-Operatoren werden nicht unterstützt."
 
-#: commands/operatorcmds.c:292
+#: commands/operatorcmds.c:291
 #, c-format
 msgid "restriction estimator function %s must return type %s"
 msgstr "Restriktionsschätzfunktion %s muss Typ %s zurückgeben"
 
-#: commands/operatorcmds.c:335
+#: commands/operatorcmds.c:309
+#, c-format
+msgid "must be superuser to specify a non-built-in restriction estimator function"
+msgstr "nur Superuser können eine nicht eingebaute Restriktionsschätzfunktion angeben"
+
+#: commands/operatorcmds.c:355
 #, c-format
 msgid "join estimator function %s has multiple matches"
 msgstr "Join-Schätzfunktion %s hat mehrere Übereinstimmungen"
 
-#: commands/operatorcmds.c:350
+#: commands/operatorcmds.c:370
 #, c-format
 msgid "join estimator function %s must return type %s"
 msgstr "Join-Schätzfunktion %s muss Typ %s zurückgeben"
 
-#: commands/operatorcmds.c:388 parser/parse_oper.c:119 parser/parse_oper.c:637
+#: commands/operatorcmds.c:379
+#, c-format
+msgid "must be superuser to specify a non-built-in join estimator function"
+msgstr "nur Superuser können eine nicht eingebaute Join-Schätzfunktion angeben"
+
+#: commands/operatorcmds.c:421 parser/parse_oper.c:119 parser/parse_oper.c:637
 #: utils/adt/regproc.c:509 utils/adt/regproc.c:683
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "Operator existiert nicht: %s"
 
-#: commands/operatorcmds.c:396 parser/parse_oper.c:702 parser/parse_oper.c:815
+#: commands/operatorcmds.c:429 parser/parse_oper.c:702 parser/parse_oper.c:815
 #, c-format
 msgid "operator is only a shell: %s"
 msgstr "Operator ist nur eine Hülle: %s"
 
-#: commands/operatorcmds.c:548
+#: commands/operatorcmds.c:581
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed"
 msgstr "Operator-Attribut »%s« kann nicht geändert werden"
 
-#: commands/operatorcmds.c:615 commands/operatorcmds.c:622
-#: commands/operatorcmds.c:628 commands/operatorcmds.c:634
+#: commands/operatorcmds.c:648 commands/operatorcmds.c:655
+#: commands/operatorcmds.c:661 commands/operatorcmds.c:667
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "Operator-Attribut »%s« kann nicht geändert werden, wenn es schon gesetzt wurde"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1728 commands/tablecmds.c:2328
-#: commands/tablecmds.c:3675 commands/tablecmds.c:6613
-#: commands/tablecmds.c:9645 commands/tablecmds.c:17665
-#: commands/tablecmds.c:17700 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152
+#: commands/tablecmds.c:1810 commands/tablecmds.c:2410
+#: commands/tablecmds.c:3834 commands/tablecmds.c:6803
+#: commands/tablecmds.c:10124 commands/tablecmds.c:19577
+#: commands/tablecmds.c:19612 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -9757,53 +9908,53 @@ msgstr "Policy »%s« für Tabelle »%s« existiert nicht"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "für SELECT und DELETE sind nur USING-Ausdrücke erlaubt"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "ungültiger Cursorname: darf nicht leer sein"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "kann WITH-HOLD-Cursor nicht in einer sicherheitsbeschränkten Operation erzeugen"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2873 utils/adt/xml.c:3043
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2937 utils/adt/xml.c:3107
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "Cursor »%s« existiert nicht"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "ungültiger Anweisungsname: darf nicht leer sein"
 
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "vorbereitete Anweisung ist kein SELECT"
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "falsche Anzahl Parameter für vorbereitete Anweisung »%s«"
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "%d Parameter erwartet aber %d erhalten."
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "Parameter $%d mit Typ %s kann nicht in erwarteten Typ %s umgewandelt werden"
 
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "vorbereitete Anweisung »%s« existiert bereits"
 
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "vorbereitete Anweisung »%s« existiert nicht"
@@ -9813,203 +9964,214 @@ msgstr "vorbereitete Anweisung »%s« existiert nicht"
 msgid "must be superuser to create custom procedural language"
 msgstr "nur Superuser können maßgeschneiderte prozedurale Sprachen erzeugen"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1811
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1131 postmaster/postmaster.c:1233
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "ungültige Listensyntax für Parameter »%s«"
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "unbekannter Wert für Publikationsoption »%s«: »%s«"
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "unbekannter Publikationsparameter: »%s«"
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "kein Schema für CURRENT_SCHEMA ausgewählt"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "Systemspalten sind nicht erlaubt."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609
+#: commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "Benutzerdefinierte Operatoren sind nicht erlaubt."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:650
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "Nur Spalten, Konstanten, eingebaute Operatoren, eingebaute Datentypen, eingebaute Sortierfolgen und eingebaute Funktionen, die »immutable« sind, sind erlaubt."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "Benutzerdefinierte Typen sind nicht erlaubt."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "Benutzerdefinierte Funktionen oder eingebaute Funktionen, die nicht »immutable« sind, sind nicht erlaubt."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
 msgstr "Benutzerdefinierte Sortierfolgen sind nicht erlaubt."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "ungültiger WHERE-Ausdruck für Publikation"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "Publikations-WHERE-Ausdruck kann nicht für Relation »%s« verwendet werden"
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "WHERE-Klausel kann nicht für eine partitionierte Tabelle verwendet werden, wenn %s falsch ist."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "für Relation »%s.%s« in Publikation »%s« kann keine Spaltenliste verwendet werden"
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:809
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "Spaltenlisten können nicht in Publikationen, die FOR-TABLES-IN-SCHEMA-Elemente enthalten, angegeben werden."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:823
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "Spaltenlisten können nicht für partitionierte Tabellen angegeben werden, wenn %s falsch ist."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "nur Superuser können eine Publikation FOR ALL TABLES erzeugen"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "nur Superuser können eine Publikation FOR TABLES IN SCHEMA erzeugen"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "»wal_level« ist nicht ausreichend, um logische Veränderungen zu publizieren"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "Setzen Sie »wal_level« auf »logical« bevor Sie Subskriptionen erzeugen."
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "Parameter »%s« kann für Publikation »%s« nicht auf falsch gesetzt werden"
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Die Publikation enthält eine WHERE-Klausel für die partitionierte Tabelle »%s«, was nicht erlaubt ist, wenn »%s« falsch ist."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Die Publikation enthält eine Spaltenliste für die partitionierte Tabelle »%s«, was nicht erlaubt ist, wenn »%s« falsch ist."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "Schema kann nicht zu Publikation »%s« hinzugefügt werden"
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "Schemas können nicht hinzugefügt werden, wenn Tabellen, die eine Spaltenliste angeben, schon Teil der Publikation sind."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "nur Superuser können Schemas hinzufügen oder setzen"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "Publikation »%s« ist als FOR ALL TABLES definiert"
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "In einer FOR-ALL-TABLES-Publikation können keine Schemas hinzugefügt oder entfernt werden."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "In einer FOR-ALL-TABLES-Publikation können keine Tabellen hinzugefügt oder entfernt werden."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536
+#: commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3812
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "Publikation »%s« existiert nicht"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "widersprüchliche oder überflüssige WHERE-Klauseln für Tabelle »%s«"
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "widersprüchliche oder überflüssige Spaltenlisten für Tabelle »%s«"
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "in ALTER PUBLICATION ... DROP darf keine Spaltenliste angegeben werden"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "Relation »%s« ist nicht Teil der Publikation"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "WHERE-Klausel kann nicht verwendet werden, wenn eine Tabelle aus einer Publikation entfernt wird"
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "Tabellen von Schema »%s« sind nicht Teil der Publikation"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "keine Berechtigung, um Eigentümer der Publikation »%s« zu ändern"
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "Der Eigentümer einer FOR-ALL-TABLES-Publikation muss ein Superuser sein."
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "Der Eigentümer einer FOR-TABLES-IN-SCHEMA-Publikation muss ein Superuser sein."
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "Publikation mit OID %u existiert nicht"
 
+#: commands/publicationcmds.c:2138
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "ungültiger Wert für Publikationsparameter »%s«: »%s«"
+
+#: commands/publicationcmds.c:2139
+#, c-format
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "Gültige Werte sind »%s« und »%s«."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -10050,128 +10212,128 @@ msgstr "Security-Labels werden für diese Art Objekt nicht unterstützt"
 msgid "cannot set security label on relation \"%s\""
 msgstr "Security-Label für Relation »%s« kann nicht gesetzt werden"
 
-#: commands/sequence.c:741
+#: commands/sequence.c:748
 #, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
-msgstr "nextval: Maximalwert von Sequenz »%s« erreicht (%lld)"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: Maximalwert von Sequenz »%s« erreicht (%<PRId64>)"
 
-#: commands/sequence.c:760
+#: commands/sequence.c:767
 #, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
-msgstr "nextval: Minimalwert von Sequenz »%s« erreicht (%lld)"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: Minimalwert von Sequenz »%s« erreicht (%<PRId64>)"
 
-#: commands/sequence.c:879
+#: commands/sequence.c:886
 #, 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"
 
-#: commands/sequence.c:898 commands/sequence.c:904
+#: commands/sequence.c:905 commands/sequence.c:911
 #, c-format
 msgid "lastval is not yet defined in this session"
 msgstr "lastval ist in dieser Sitzung noch nicht definiert"
 
-#: commands/sequence.c:984
+#: commands/sequence.c:991
 #, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
-msgstr "setval: Wert %lld ist außerhalb des gültigen Bereichs von Sequenz »%s« (%lld..%lld)"
+msgid "setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>..%<PRId64>)"
+msgstr "setval: Wert %<PRId64> ist außerhalb des gültigen Bereichs von Sequenz »%s« (%<PRId64>..%<PRId64>)"
 
-#: commands/sequence.c:1347
+#: commands/sequence.c:1357
 #, c-format
 msgid "invalid sequence option SEQUENCE NAME"
 msgstr "ungültige Sequenzoption SEQUENCE NAME"
 
-#: commands/sequence.c:1373
+#: commands/sequence.c:1383
 #, c-format
 msgid "identity column type must be smallint, integer, or bigint"
 msgstr "Typ von Identitätsspalte muss smallint, integer oder bigint sein"
 
-#: commands/sequence.c:1374
+#: commands/sequence.c:1384
 #, c-format
 msgid "sequence type must be smallint, integer, or bigint"
 msgstr "Sequenztyp muss smallint, integer oder bigint sein"
 
-#: commands/sequence.c:1408
+#: commands/sequence.c:1418
 #, c-format
 msgid "INCREMENT must not be zero"
 msgstr "INCREMENT darf nicht null sein"
 
-#: commands/sequence.c:1456
+#: commands/sequence.c:1466
 #, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) ist außerhalb des gültigen Bereichs für Sequenzdatentyp %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MAXVALUE (%<PRId64>) ist außerhalb des gültigen Bereichs für Sequenzdatentyp %s"
 
-#: commands/sequence.c:1488
+#: commands/sequence.c:1498
 #, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MINVALUE (%lld) ist außerhalb des gültigen Bereichs für Sequenzdatentyp %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MINVALUE (%<PRId64>) ist außerhalb des gültigen Bereichs für Sequenzdatentyp %s"
 
-#: commands/sequence.c:1496
+#: commands/sequence.c:1506
 #, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
-msgstr "MINVALUE (%lld) muss kleiner als MAXVALUE (%lld) sein"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
+msgstr "MINVALUE (%<PRId64>) muss kleiner als MAXVALUE (%<PRId64>) sein"
 
-#: commands/sequence.c:1517
+#: commands/sequence.c:1527
 #, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "START-Wert (%lld) kann nicht kleiner als MINVALUE (%lld) sein"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "START-Wert (%<PRId64>) kann nicht kleiner als MINVALUE (%<PRId64>) sein"
 
-#: commands/sequence.c:1523
+#: commands/sequence.c:1533
 #, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "START-Wert (%lld) kann nicht größer als MAXVALUE (%lld) sein"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "START-Wert (%<PRId64>) kann nicht größer als MAXVALUE (%<PRId64>) sein"
 
-#: commands/sequence.c:1547
+#: commands/sequence.c:1557
 #, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "RESTART-Wert (%lld) kann nicht kleiner als MINVALUE (%lld) sein"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "RESTART-Wert (%<PRId64>) kann nicht kleiner als MINVALUE (%<PRId64>) sein"
 
-#: commands/sequence.c:1553
+#: commands/sequence.c:1563
 #, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "RESTART-Wert (%lld) kann nicht größer als MAXVALUE (%lld) sein"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "RESTART-Wert (%<PRId64>) kann nicht größer als MAXVALUE (%<PRId64>) sein"
 
-#: commands/sequence.c:1564
+#: commands/sequence.c:1574
 #, c-format
-msgid "CACHE (%lld) must be greater than zero"
-msgstr "CACHE (%lld) muss größer als null sein"
+msgid "CACHE (%<PRId64>) must be greater than zero"
+msgstr "CACHE (%<PRId64>) muss größer als null sein"
 
-#: commands/sequence.c:1600
+#: commands/sequence.c:1610
 #, c-format
 msgid "invalid OWNED BY option"
 msgstr "ungültige OWNED BY Option"
 
-#: commands/sequence.c:1601
+#: commands/sequence.c:1611
 #, c-format
 msgid "Specify OWNED BY table.column or OWNED BY NONE."
 msgstr "Geben Sie OWNED BY tabelle.spalte oder OWNED BY NONE an."
 
-#: commands/sequence.c:1626
+#: commands/sequence.c:1636
 #, c-format
 msgid "sequence cannot be owned by relation \"%s\""
 msgstr "Sequenz kann nicht mit Relation »%s« verknüpft werden"
 
-#: commands/sequence.c:1634
+#: commands/sequence.c:1644
 #, c-format
 msgid "sequence must have same owner as table it is linked to"
 msgstr "Sequenz muss selben Eigentümer wie die verknüpfte Tabelle haben"
 
-#: commands/sequence.c:1638
+#: commands/sequence.c:1648
 #, c-format
 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/sequence.c:1660
+#: commands/sequence.c:1670
 #, c-format
 msgid "cannot change ownership of identity sequence"
 msgstr "kann Eigentümer einer Identitätssequenz nicht ändern"
 
-#: commands/sequence.c:1661 commands/tablecmds.c:14387
-#: commands/tablecmds.c:17081
+#: commands/sequence.c:1671 commands/tablecmds.c:16148
+#: commands/tablecmds.c:18986
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Sequenz »%s« ist mit Tabelle »%s« verknüpft."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "in CREATE STATISTICS ist nur eine einzelne Relation erlaubt"
@@ -10181,1819 +10343,1966 @@ msgstr "in CREATE STATISTICS ist nur eine einzelne Relation erlaubt"
 msgid "cannot define statistics for relation \"%s\""
 msgstr "für Relation »%s« können keine Statistiken definiert werden"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "Statistikobjekt »%s« existiert bereits, wird übersprungen"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "Statistikobjekt »%s« existiert bereits"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "Statistiken können nicht mehr als %d Spalten enthalten"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "Statistikerzeugung für Systemspalten wird nicht unterstützt"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
+#, c-format
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr "Statistikerzeugung für virtuelle generierte Spalten wird nicht unterstützt"
+
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "Spalte »%s« kann nicht in Statistiken verwendet werden, weil ihr Typ %s keine Standardoperatorklasse für btree hat"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr "Ausdruck kann nicht in multivariaten Statistiken verwendet werden, weil sein Typ %s keine Standardoperatorklasse für btree hat"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "wenn Statistiken für einen einzelnen Ausdruck gebaut werden, kann die Statistikart nicht angegeben werden"
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "unbekannte Statistikart »%s«"
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "erweiterte Statistiken benötigen mindestens 2 Spalten"
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "doppelter Spaltenname in Statistikdefinition"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "doppelter Ausdruck in Statistikdefinition"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8628
+#: commands/statscmds.c:667 commands/tablecmds.c:8949
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "Statistikziel %d ist zu niedrig"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8636
+#: commands/statscmds.c:675 commands/tablecmds.c:8957
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "setze Statistikziel auf %d herab"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "Statistikobjekt »%s.%s« existiert nicht, wird übersprungen"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "unbekannter Subskriptionsparameter: »%s«"
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:397
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "unbekannter Origin-Wert: »%s«"
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "ungültige WAL-Position (LSN): %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "unbekannter Subskriptionsparameter: »%s«"
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "die Optionen %s und %s schließen einander aus"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "Subskription mit %s muss auch %s setzen"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "konnte Liste der Publikationen nicht vom Publikationsserver empfangen: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
 msgstr[0] "Publikation %s existiert auf dem Publikationsserver nicht"
 msgstr[1] "Publikationen %s existieren auf dem Publikationsserver nicht"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "keine Berechtigung, um Subskription zu erzeugen"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können Subskriptionen erzeugen."
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
 #, c-format
-msgid "could not connect to the publisher: %s"
-msgstr "konnte nicht mit dem Publikationsserver verbinden: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
+msgstr "Subskription »%s« konnte nicht mit dem Publikationsserver verbinden: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "Replikations-Slot »%s« wurde auf dem Publikationsserver erzeugt"
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "Subskription wurde erzeugt, ist aber nicht verbunden"
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid "To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the subscription."
 msgstr "Um die Replikation einzuleiten, müssen Sie den Replikations-Slot manuell erzeugen, die Subskription aktivieren und die Subskription auffrischen."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, c-format
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "für eine aktivierte Subskription kann Option »%s« nicht gesetzt werden"
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr "Option »%s« kann nicht für eine Subskription ohne Slot-Name gesetzt werden"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3862
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "Subskription »%s« existiert nicht"
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "für eine aktivierte Subskription kann nicht %s gesetzt werden"
 
-#: commands/subscriptioncmds.c:1233
-#, fuzzy, c-format
-#| msgid "cannot enable subscription that does not have a slot name"
-msgid "cannot set %s for a subscription that does not have a slot name"
-msgstr "eine Subskription ohne Slot-Name kann nicht aktiviert werden"
+#: commands/subscriptioncmds.c:1270
+#, c-format
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "»slot_name« und »two_phase« können nicht gleichzeitig geändert werden"
+
+#: commands/subscriptioncmds.c:1286
+#, c-format
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "»two_phase« kann nicht geändert werden, wenn ein Replikationsarbeitsprozess noch läuft"
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1287
+#, c-format
+msgid "Try again after some time."
+msgstr "Versuchen Sie es nach einer Weile erneut."
+
+#: commands/subscriptioncmds.c:1300
+#, c-format
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "»two_phase« kann nicht ausgeschaltet werden, wenn vorbereitete Transaktionen existieren"
+
+#: commands/subscriptioncmds.c:1301
+#, c-format
+msgid "Resolve these transactions and try again."
+msgstr "Lösen Sie diese Transaktionen auf und versuchen Sie erneut."
+
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "eine Subskription ohne Slot-Name kann nicht aktiviert werden"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION mit Refresh ist für deaktivierte Subskriptionen nicht erlaubt"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr "Verwenden Sie ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION mit »refresh« und »copy_data« ist nicht erlaubt, wenn »two_phase« eingeschaltet ist"
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Verwenden Sie ALTER SUBSCRIPTION ... SET PUBLICATION mit refresh = false, oder mit copy_data = false, oder verwenden Sie DROP/CREATE SUBSCRIPTION."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Verwenden Sie %s mit refresh = false, oder mit copy_data = false, oder verwenden Sie DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION ... REFRESH ist für eine deaktivierte Subskription nicht erlaubt"
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION ... REFRESH mit »copy_data« ist nicht erlaubt, wenn »two_phase« eingeschaltet ist"
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Verwenden Sie ALTER SUBSCRIPTION ... REFRESH mit copy_data = false, oder verwenden Sie DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "zu überspringende WAL-Position (LSN %X/%X) muss größer als Origin-LSN %X/%X sein"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "Subskription »%s« existiert nicht, wird übersprungen"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "Replikations-Slot »%s« auf dem Publikationsserver wurde gelöscht"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "konnte Replikations-Slot »%s« auf dem Publikationsserver nicht löschen: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "Subskription mit OID %u existiert nicht"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "konnte Liste der replizierten Tabellen nicht vom Publikationsserver empfangen: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr "Subskription »%s« verlangte copy_data mit origin = NONE, aber könnte Daten kopieren, die einen anderen Origin hatten"
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
 msgstr[0] "Die zu erzeugende Subskription hat eine Publikation (%s) abonniert, die Tabellen enthält, in die von anderen Subskriptionen geschrieben wird."
 msgstr[1] "Die zu erzeugende Subskription hat Publikationen (%s) abonniert, die Tabellen enthalten, in die von anderen Subskriptionen geschrieben wird."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr "Überprüfen Sie, dass die von den publizierten Tabellen kopierten initialen Daten nicht von anderen Origins kamen."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1117
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr "für Tabelle »%s.%s« können nicht verschiedene Spaltenlisten für verschiedene Publikationen verwendet werden"
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "konnte beim Versuch den Replikations-Slot »%s« zu löschen nicht mit dem Publikationsserver verbinden: %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "Verwenden Sie %s, um die Subskription zu deaktivieren, und dann %s, um sie vom Slot zu trennen."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "Publikationsname »%s« mehrmals angegeben"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "Publikation »%s« ist bereits in Subskription »%s«"
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "Publikation »%s« ist nicht in Subskription »%s«"
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "kann nicht alle Publikationen von einer Subskription löschen"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s erfordert einen Boole’schen Wert oder »parallel«"
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "Tabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "Tabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "Verwenden Sie DROP TABLE, um eine Tabelle zu löschen."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "Sequenz »%s« existiert nicht"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "Sequenz »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Verwenden Sie DROP SEQUENCE, um eine Sequenz zu löschen."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "Sicht »%s« existiert nicht"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "Sicht »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "Verwenden Sie DROP VIEW, um eine Sicht zu löschen."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "materialisierte Sicht »%s« existiert nicht"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "materialisierte Sicht »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 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:279 commands/tablecmds.c:303 commands/tablecmds.c:19627
-#: parser/parse_utilcmd.c:2226
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21663
+#: parser/parse_utilcmd.c:2432
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "Index »%s« existiert nicht"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "Index »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "Verwenden Sie DROP INDEX, um einen Index zu löschen."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "»%s« ist kein Typ"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "Verwenden Sie DROP TYPE, um einen Typen zu löschen."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14226
-#: commands/tablecmds.c:16786
+#: commands/tablecmds.c:294 commands/tablecmds.c:15987
+#: commands/tablecmds.c:18688
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "Fremdtabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "Fremdtabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 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:722
+#: commands/tablecmds.c:803
 #, 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:753
+#: commands/tablecmds.c:820
+#, c-format
+msgid "partitioned tables cannot be unlogged"
+msgstr "partitionierte Tabellen können nicht ungeloggt sein"
+
+#: commands/tablecmds.c:840
 #, 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:789 commands/tablecmds.c:15645
+#: commands/tablecmds.c:876 commands/tablecmds.c:17412
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "von der Relation »%s« würde mehrmals geerbt werden"
 
-#: commands/tablecmds.c:1055
+#: commands/tablecmds.c:1134
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "»%s« ist nicht partitioniert"
 
-#: commands/tablecmds.c:1149
+#: commands/tablecmds.c:1228
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "Partitionierung kann nicht mehr als %d Spalten verwenden"
 
-#: commands/tablecmds.c:1205
+#: commands/tablecmds.c:1284
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "kann keine Fremdpartition der partitionierten Tabelle »%s« erzeugen"
 
-#: commands/tablecmds.c:1207
+#: commands/tablecmds.c:1286
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "Tabelle »%s« enthält Unique Indexe."
 
-#: commands/tablecmds.c:1326 commands/tablecmds.c:13242
+#: commands/tablecmds.c:1425 commands/tablecmds.c:14964
 #, c-format
 msgid "too many array dimensions"
 msgstr "zu viele Array-Dimensionen"
 
-#: commands/tablecmds.c:1331 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1430 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "Spalte »%s« kann nicht als SETOF deklariert werden"
 
-#: commands/tablecmds.c:1477
+#: commands/tablecmds.c:1559
 #, 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:1481
+#: commands/tablecmds.c:1563
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY unterstützt kein CASCADE"
 
-#: commands/tablecmds.c:1585
+#: commands/tablecmds.c:1667
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "kann partitionierten Index »%s« nicht nebenläufig löschen"
 
-#: commands/tablecmds.c:1873
+#: commands/tablecmds.c:1955
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "kann nicht nur eine partitionierte Tabelle leeren"
 
-#: commands/tablecmds.c:1874
+#: commands/tablecmds.c:1956
 #, c-format
 msgid "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly."
 msgstr "Lassen Sie das Schlüsselwort ONLY weg oder wenden Sie TRUNCATE ONLY direkt auf die Partitionen an."
 
-#: commands/tablecmds.c:1947
+#: commands/tablecmds.c:2029
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "Truncate-Vorgang leert ebenfalls Tabelle »%s«"
 
-#: commands/tablecmds.c:2308
+#: commands/tablecmds.c:2390
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "kann Fremdtabelle »%s« nicht leeren"
 
-#: commands/tablecmds.c:2365
+#: commands/tablecmds.c:2447
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht leeren"
 
-#: commands/tablecmds.c:2594 commands/tablecmds.c:15542
+#: commands/tablecmds.c:2685 commands/tablecmds.c:17309
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "von partitionierter Tabelle »%s« kann nicht geerbt werden"
 
-#: commands/tablecmds.c:2599
+#: commands/tablecmds.c:2690
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "von Partition »%s« kann nicht geerbt werden"
 
-#: commands/tablecmds.c:2607 parser/parse_utilcmd.c:2456
-#: parser/parse_utilcmd.c:2598
+#: commands/tablecmds.c:2698 parser/parse_utilcmd.c:2703
+#: parser/parse_utilcmd.c:2896
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "geerbte Relation »%s« ist keine Tabelle oder Fremdtabelle"
 
-#: commands/tablecmds.c:2619 commands/tablecmds.c:20391
+#: commands/tablecmds.c:2710
 #, c-format
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "eine temporäre Relation kann nicht als Partition der permanenten Relation »%s« erzeugt werden"
 
-#: commands/tablecmds.c:2628 commands/tablecmds.c:15521
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17288
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "von temporärer Relation »%s« kann nicht geerbt werden"
 
-#: commands/tablecmds.c:2638 commands/tablecmds.c:15529
+#: commands/tablecmds.c:2729 commands/tablecmds.c:17296
 #, 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:2779 commands/tablecmds.c:2833
-#: commands/tablecmds.c:12925 parser/parse_utilcmd.c:1240
-#: parser/parse_utilcmd.c:1283 parser/parse_utilcmd.c:1710
-#: parser/parse_utilcmd.c:1818
+#: commands/tablecmds.c:2884 commands/tablecmds.c:2938
+#: commands/tablecmds.c:14647 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "kann Verweis auf ganze Zeile der Tabelle nicht umwandeln"
 
-#: commands/tablecmds.c:2780 parser/parse_utilcmd.c:1241
+#: commands/tablecmds.c:2885 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Generierungsausdruck für Spalte »%s« enthält einen Verweis auf die ganze Zeile der Tabelle »%s«."
 
-#: commands/tablecmds.c:2834 parser/parse_utilcmd.c:1284
+#: commands/tablecmds.c:2939 parser/parse_utilcmd.c:1485
 #, 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«."
 
-#: commands/tablecmds.c:2944 commands/tablecmds.c:3215
+#: commands/tablecmds.c:3061 commands/tablecmds.c:3355
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "Spalte »%s« erbt von einer generierten Spalte aber hat einen Vorgabewert angegeben"
 
-#: commands/tablecmds.c:2949 commands/tablecmds.c:3220
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr "Spalte »%s« erbt von einer generierten Spalte aber ist als Identitätsspalte definiert"
 
-#: commands/tablecmds.c:2957 commands/tablecmds.c:3228
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "abgeleitete Spalte »%s« gibt einen Generierungsausdruck an"
 
-#: commands/tablecmds.c:2959 commands/tablecmds.c:3230
+#: commands/tablecmds.c:3076 commands/tablecmds.c:3370
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "Eine Spalte einer abgeleiteten Tabelle kann nur generiert sein, wenn die Spalte in der Elterntabelle es auch ist."
 
-#: commands/tablecmds.c:3005
+#: commands/tablecmds.c:3082 commands/tablecmds.c:3376
+#: commands/tablecmds.c:17574
+#, c-format
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "Spalte »%s« erbt von einer generierten Spalte einer anderen Art"
+
+#: commands/tablecmds.c:3084 commands/tablecmds.c:3378
+#: commands/tablecmds.c:17575
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "Spalte in Elterntabelle ist %s, Spalte in abgeleiteter Tabelle ist %s."
+
+#: commands/tablecmds.c:3131
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "Spalte »%s« erbt widersprüchliche Generierungsausdrücke"
 
-#: commands/tablecmds.c:3007
+#: commands/tablecmds.c:3133
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "Um den Konflikt zu lösen, geben Sie einen Generierungsausdruck ausdrücklich an."
 
-#: commands/tablecmds.c:3011
+#: commands/tablecmds.c:3137
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "Spalte »%s« erbt widersprüchliche Vorgabewerte"
 
-#: commands/tablecmds.c:3013
+#: commands/tablecmds.c:3139
 #, 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:3068
+#: commands/tablecmds.c:3206
 #, 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"
 
-#: commands/tablecmds.c:3119
+#: commands/tablecmds.c:3259
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "Spalte »%s« wird mit geerbter Definition zusammengeführt"
 
-#: commands/tablecmds.c:3123
+#: commands/tablecmds.c:3263
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "Spalte »%s« wird verschoben und mit geerbter Definition zusammengeführt"
 
-#: commands/tablecmds.c:3124
+#: commands/tablecmds.c:3264
 #, 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:3136
+#: commands/tablecmds.c:3276
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "für Spalte »%s« besteht ein Typkonflikt"
 
-#: commands/tablecmds.c:3138 commands/tablecmds.c:3172
-#: commands/tablecmds.c:3188 commands/tablecmds.c:3295
-#: commands/tablecmds.c:3328 commands/tablecmds.c:3344
-#: parser/parse_coerce.c:2155 parser/parse_coerce.c:2175
-#: parser/parse_coerce.c:2195 parser/parse_coerce.c:2216
-#: parser/parse_coerce.c:2271 parser/parse_coerce.c:2305
-#: parser/parse_coerce.c:2381 parser/parse_coerce.c:2412
-#: parser/parse_coerce.c:2451 parser/parse_coerce.c:2518
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3278 commands/tablecmds.c:3312
+#: commands/tablecmds.c:3328 commands/tablecmds.c:3444
+#: commands/tablecmds.c:3472 commands/tablecmds.c:3488
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s gegen %s"
 
-#: commands/tablecmds.c:3150
+#: commands/tablecmds.c:3290
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "für Spalte »%s« besteht ein Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:3152 commands/tablecmds.c:3314
-#: commands/tablecmds.c:7088
+#: commands/tablecmds.c:3292 commands/tablecmds.c:3458
+#: commands/tablecmds.c:7287 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "»%s« gegen »%s«"
 
-#: commands/tablecmds.c:3170
+#: commands/tablecmds.c:3310
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "für Spalte »%s« besteht ein Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:3186 commands/tablecmds.c:3342
+#: commands/tablecmds.c:3326 commands/tablecmds.c:3486
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "für Spalte »%s« besteht ein Komprimierungsmethodenkonflikt"
 
-#: commands/tablecmds.c:3281
+#: commands/tablecmds.c:3430
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "geerbte Definitionen von Spalte »%s« werden zusammengeführt"
 
-#: commands/tablecmds.c:3293
+#: commands/tablecmds.c:3442
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "geerbte Spalte »%s« hat Typkonflikt"
 
-#: commands/tablecmds.c:3312
+#: commands/tablecmds.c:3456
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "geerbte Spalte »%s« hat Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:3326
+#: commands/tablecmds.c:3470
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "geerbte Spalte »%s« hat einen Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:3354
+#: commands/tablecmds.c:3498
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "geerbte Spalte »%s« hat einen Generierungskonflikt"
 
-#: commands/tablecmds.c:3573
+#: commands/tablecmds.c:3729
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht verschoben werden"
 
-#: commands/tablecmds.c:3643
+#: commands/tablecmds.c:3802
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "Spalte einer getypten Tabelle kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:3662
+#: commands/tablecmds.c:3821
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "Spalten von Relation »%s« können nicht umbenannt werden"
 
-#: commands/tablecmds.c:3757
+#: commands/tablecmds.c:3916
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "vererbte Spalte »%s« muss ebenso in den abgeleiteten Tabellen umbenannt werden"
 
-#: commands/tablecmds.c:3789
+#: commands/tablecmds.c:3948
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:3804
+#: commands/tablecmds.c:3963
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "kann vererbte Spalte »%s« nicht umbenennen"
 
-#: commands/tablecmds.c:3956
+#: commands/tablecmds.c:4118
 #, 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"
 
-#: commands/tablecmds.c:3963
+#: commands/tablecmds.c:4125
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "kann vererbten Constraint »%s« nicht umbenennen"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4260
+#: commands/tablecmds.c:4425
 #, 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"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4269
+#: commands/tablecmds.c:4434
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "%s mit Relation »%s« nicht möglich, weil es anstehende Trigger-Ereignisse dafür gibt"
 
-#: commands/tablecmds.c:4295
+#: commands/tablecmds.c:4460
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht ändern"
 
-#: commands/tablecmds.c:4776
+#: commands/tablecmds.c:4924
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "kann Partition »%s« mit einer unvollständigen Abtrennoperation nicht ändern"
 
-#: commands/tablecmds.c:4980 commands/tablecmds.c:4995
+#: commands/tablecmds.c:5153
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "Persistenzeinstellung kann nicht zweimal geändert werden"
 
-#: commands/tablecmds.c:5016
+#: commands/tablecmds.c:5170
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "mehrere SET ACCESS METHOD Unterbefehle sind ungültig"
 
-#: commands/tablecmds.c:5772
+#: commands/tablecmds.c:5904
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "Systemrelation »%s« kann nicht neu geschrieben werden"
 
-#: commands/tablecmds.c:5778
+#: commands/tablecmds.c:5910
 #, 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"
 
-#: commands/tablecmds.c:5790
+#: commands/tablecmds.c:5922
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht neu schreiben"
 
-#: commands/tablecmds.c:6285
+#: commands/tablecmds.c:6458 commands/tablecmds.c:6478
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "Spalte »%s« von Relation »%s« enthält NULL-Werte"
 
-#: commands/tablecmds.c:6302
+#: commands/tablecmds.c:6495
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "Check-Constraint »%s« von Relation »%s« wird von irgendeiner Zeile verletzt"
 
-#: commands/tablecmds.c:6321 partitioning/partbounds.c:3388
+#: commands/tablecmds.c:6515 partitioning/partbounds.c:3387
 #, c-format
 msgid "updated partition constraint for default partition \"%s\" would be violated by some row"
 msgstr "aktualisierter Partitions-Constraint der Standardpartition »%s« würde von irgendeiner Zeile verletzt werden"
 
-#: commands/tablecmds.c:6327
+#: commands/tablecmds.c:6521
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "Partitions-Constraint von Relation »%s« wird von irgendeiner Zeile verletzt"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6596
+#: commands/tablecmds.c:6786
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "ALTER-Aktion %s kann nicht mit Relation »%s« ausgeführt werden"
 
-#: commands/tablecmds.c:6851 commands/tablecmds.c:6858
+#: commands/tablecmds.c:7041 commands/tablecmds.c:7048
 #, 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"
 
-#: commands/tablecmds.c:6865
+#: commands/tablecmds.c:7055
 #, 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"
 
-#: commands/tablecmds.c:6872
+#: commands/tablecmds.c:7062
 #, 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"
 
-#: commands/tablecmds.c:6928
+#: commands/tablecmds.c:7118
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "kann Typ »%s« nicht ändern, weil er der Typ einer getypten Tabelle ist"
 
-#: commands/tablecmds.c:6930
+#: commands/tablecmds.c:7120
 #, 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:6976
+#: commands/tablecmds.c:7166
+#, c-format
+msgid "type %s is the row type of another table"
+msgstr "Typ %s ist der Zeilentyp einer anderen Tabelle"
+
+#: commands/tablecmds.c:7168
+#, c-format
+msgid "A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr "Eine getypte Tabelle muss einen alleinstehenden mit CREATE TYPE erzeugten Typ verwenden."
+
+#: commands/tablecmds.c:7173
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "Typ %s ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:7003
+#: commands/tablecmds.c:7200
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "zu einer getypten Tabelle kann keine Spalte hinzugefügt werden"
 
-#: commands/tablecmds.c:7051
+#: commands/tablecmds.c:7250
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "zu einer Partition kann keine Spalte hinzugefügt werden"
 
-#: commands/tablecmds.c:7080 commands/tablecmds.c:15760
+#: commands/tablecmds.c:7279 commands/tablecmds.c:17530
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "abgeleitete Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:7086 commands/tablecmds.c:15766
+#: commands/tablecmds.c:7285 commands/tablecmds.c:17536
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "abgeleitete Tabelle »%s« hat unterschiedliche Sortierfolge für Spalte »%s«"
 
-#: commands/tablecmds.c:7104
+#: commands/tablecmds.c:7303
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "Definition von Spalte »%s« für abgeleitete Tabelle »%s« wird zusammengeführt"
 
-#: commands/tablecmds.c:7157
+#: commands/tablecmds.c:7356
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "eine Identitätsspalte kann nicht rekursiv zu einer Tabelle hinzugefügt werden, die abgeleitete Tabellen hat"
 
-#: commands/tablecmds.c:7370
+#: commands/tablecmds.c:7603
 #, 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:7448
+#: commands/tablecmds.c:7681
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "Spalte »%s« von Relation »%s« existiert bereits, wird übersprungen"
 
-#: commands/tablecmds.c:7455
+#: commands/tablecmds.c:7688
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "Spalte »%s« von Relation »%s« existiert bereits"
 
-#: commands/tablecmds.c:7521 commands/tablecmds.c:12564
-#, c-format
-msgid "cannot remove constraint from only the partitioned table when partitions exist"
-msgstr "Constraint kann nicht nur von der partitionierten Tabelle entfernt werden, wenn Partitionen existieren"
-
-#: commands/tablecmds.c:7522 commands/tablecmds.c:7836
-#: commands/tablecmds.c:8014 commands/tablecmds.c:8121
-#: commands/tablecmds.c:8238 commands/tablecmds.c:9057
-#: commands/tablecmds.c:12565
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "Lassen Sie das Schlüsselwort ONLY weg."
-
-#: commands/tablecmds.c:7558 commands/tablecmds.c:7762
-#: commands/tablecmds.c:7904 commands/tablecmds.c:8036
-#: commands/tablecmds.c:8165 commands/tablecmds.c:8259
-#: commands/tablecmds.c:8360 commands/tablecmds.c:8517
-#: commands/tablecmds.c:8670 commands/tablecmds.c:8751
-#: commands/tablecmds.c:8885 commands/tablecmds.c:12718
-#: commands/tablecmds.c:14249 commands/tablecmds.c:16875
+#: commands/tablecmds.c:7779 commands/tablecmds.c:7946
+#: commands/tablecmds.c:8147 commands/tablecmds.c:8278
+#: commands/tablecmds.c:8432 commands/tablecmds.c:8526
+#: commands/tablecmds.c:8629 commands/tablecmds.c:8825
+#: commands/tablecmds.c:8991 commands/tablecmds.c:9082
+#: commands/tablecmds.c:9216 commands/tablecmds.c:14419
+#: commands/tablecmds.c:16010 commands/tablecmds.c:18777
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht geändert werden"
 
-#: commands/tablecmds.c:7564 commands/tablecmds.c:7910
+#: commands/tablecmds.c:7785 commands/tablecmds.c:8153
+#: commands/tablecmds.c:14180
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "Spalte »%s« von Relation »%s« ist eine Identitätsspalte"
 
-#: commands/tablecmds.c:7605
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "Spalte »%s« ist in einem Primärschlüssel"
-
-#: commands/tablecmds.c:7610
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "Spalte »%s« ist in einem Index, der als Replik-Identität verwendet wird"
-
-#: commands/tablecmds.c:7633
+#: commands/tablecmds.c:7802
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "Spalte »%s« ist in Elterntabelle als NOT NULL markiert"
 
-#: commands/tablecmds.c:7833 commands/tablecmds.c:9541
+#: commands/tablecmds.c:8024 commands/tablecmds.c:10023
 #, 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:7834
+#: commands/tablecmds.c:8025 commands/tablecmds.c:8256
+#: commands/tablecmds.c:8388 commands/tablecmds.c:8505
+#: commands/tablecmds.c:9389 commands/tablecmds.c:12217
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "Spalte »%s« von Relation »%s« ist nicht bereits NOT NULL."
-
-#: commands/tablecmds.c:7919
+msgid "Do not specify the ONLY keyword."
+msgstr "Lassen Sie das Schlüsselwort ONLY weg."
+
+#: commands/tablecmds.c:8162
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "Spalte »%s« von Relation »%s« ist eine generierte Spalte"
 
-#: commands/tablecmds.c:8013
-#, fuzzy, c-format
-#| msgid "cannot drop column from only the partitioned table when partitions exist"
+#: commands/tablecmds.c:8255
+#, c-format
 msgid "cannot add identity to a column of only the partitioned table"
-msgstr "Spalte kann nicht nur aus der partitionierten Tabelle gelöscht werden, wenn Partitionen existieren"
+msgstr "Identität kann nicht einer Spalte nur in der partitionierten Tabelle hinzugefügt werden"
 
-#: commands/tablecmds.c:8019
+#: commands/tablecmds.c:8261
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "zu einer Spalte einer Partition kann keine Identität hinzugefügt werden"
 
-#: commands/tablecmds.c:8047
+#: commands/tablecmds.c:8289
 #, c-format
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "Spalte »%s« von Relation »%s« muss als NOT NULL deklariert werden, bevor Sie Identitätsspalte werden kann"
 
-#: commands/tablecmds.c:8053
+#: commands/tablecmds.c:8320
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "Spalte »%s« von Relation »%s« ist bereits eine Identitätsspalte"
 
-#: commands/tablecmds.c:8059
+#: commands/tablecmds.c:8326
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "Spalte »%s« von Relation »%s« hat bereits einen Vorgabewert"
 
-#: commands/tablecmds.c:8120
-#, fuzzy, c-format
-#| msgid "cannot change inheritance of partitioned table"
+#: commands/tablecmds.c:8387
+#, c-format
 msgid "cannot change identity column of only the partitioned table"
-msgstr "Vererbung einer partitionierten Tabelle kann nicht geändert werden"
+msgstr "Identitätsspalte kann nicht nur in der partitionierten Tabelle geändert werden"
 
-#: commands/tablecmds.c:8126
+#: commands/tablecmds.c:8393
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "Identitätsspalte einer Partition kann nicht geändert werden"
 
-#: commands/tablecmds.c:8171 commands/tablecmds.c:8267
+#: commands/tablecmds.c:8438 commands/tablecmds.c:8534
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "Spalte »%s« von Relation »%s« ist keine Identitätsspalte"
 
-#: commands/tablecmds.c:8237
-#, fuzzy, c-format
-#| msgid "cannot drop column from only the partitioned table when partitions exist"
+#: commands/tablecmds.c:8504
+#, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
-msgstr "Spalte kann nicht nur aus der partitionierten Tabelle gelöscht werden, wenn Partitionen existieren"
+msgstr "Identität kann nicht von einer Spalte nur in der partitionierten Tabelle gelöscht werden"
 
-#: commands/tablecmds.c:8243
-#, fuzzy, c-format
-#| msgid "cannot add column to a partition"
+#: commands/tablecmds.c:8510
+#, c-format
 msgid "cannot drop identity from a column of a partition"
-msgstr "zu einer Partition kann keine Spalte hinzugefügt werden"
+msgstr "Identität kann nicht von einer Spalte einer Partition gelöscht werden"
 
-#: commands/tablecmds.c:8272
+#: commands/tablecmds.c:8539
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "Spalte »%s« von Relation »%s« ist keine Identitätsspalte, wird übersprungen"
 
-#: commands/tablecmds.c:8366
+#: commands/tablecmds.c:8636 commands/tablecmds.c:8846
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "Spalte »%s« von Relation »%s« ist keine generierte Spalte"
 
-#: commands/tablecmds.c:8464
+#: commands/tablecmds.c:8647
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
+msgstr "ALTER TABLE / SET EXPRESSION wird nicht unterstützt für virtuelle generierte Spalten in Tabellen mit Check-Constraints"
+
+#: commands/tablecmds.c:8648 commands/tablecmds.c:8666
+#: commands/tablecmds.c:8838
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr "Spalte »%s« von Relation »%s« ist eine virtuelle generierte Spalte."
+
+#: commands/tablecmds.c:8665
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
+msgstr "ALTER TABLE / SET EXPRESSION wird nicht unterstützt für virtuelle generierte Spalten in Tabellen, die Teil einer Publikation sind"
+
+#: commands/tablecmds.c:8772
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION muss auch auf abgeleitete Tabellen angewendet werden"
 
-#: commands/tablecmds.c:8486
+#: commands/tablecmds.c:8794
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "Generierungsausdruck von vererbter Spalte kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:8525
+#: commands/tablecmds.c:8837
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
-msgstr "Spalte »%s« von Relation »%s« ist keine gespeicherte generierte Spalte"
+msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
+msgstr "ALTER TABLE / DROP EXPRESSION wird für virtuelle generierte Spalten nicht unterstützt"
 
-#: commands/tablecmds.c:8530
+#: commands/tablecmds.c:8851
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
-msgstr "Spalte »%s« von Relation »%s« ist keine gespeicherte generierte Spalte, wird übersprungen"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
+msgstr "Spalte »%s« von Relation »%s« ist keine generierte Spalte, wird übersprungen"
 
-#: commands/tablecmds.c:8608
+#: commands/tablecmds.c:8929
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "auf eine Nicht-Index-Spalte kann nicht per Nummer verwiesen werden"
 
-#: commands/tablecmds.c:8660
+#: commands/tablecmds.c:8981
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "Spalte Nummer %d von Relation »%s« existiert nicht"
 
-#: commands/tablecmds.c:8679
+#: commands/tablecmds.c:9001
+#, c-format
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "Statistiken von virtueller generierter Spalte »%s« können nicht geändert werden"
+
+#: commands/tablecmds.c:9010
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "Statistiken von eingeschlossener Spalte »%s« von Index »%s« können nicht geändert werden"
 
-#: commands/tablecmds.c:8684
+#: commands/tablecmds.c:9015
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr "kann Statistiken von Spalte »%s« von Index »%s«, welche kein Ausdruck ist, nicht ändern"
 
-#: commands/tablecmds.c:8686
+#: commands/tablecmds.c:9017
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "Ändern Sie stattdessen die Statistiken für die Tabellenspalte."
 
-#: commands/tablecmds.c:8932
+#: commands/tablecmds.c:9263
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "aus einer getypten Tabelle können keine Spalten gelöscht werden"
 
-#: commands/tablecmds.c:8995
+#: commands/tablecmds.c:9327
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "Spalte »%s« von Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:9008
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:9018
+#: commands/tablecmds.c:9350
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "geerbte Spalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:9031
+#: commands/tablecmds.c:9363
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "Spalte »%s« kann nicht gelöscht werden, weil sie Teil des Partitionierungsschlüssels von Relation »%s« ist"
 
-#: commands/tablecmds.c:9056
+#: commands/tablecmds.c:9388
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr "Spalte kann nicht nur aus der partitionierten Tabelle gelöscht werden, wenn Partitionen existieren"
 
-#: commands/tablecmds.c:9261
+#: commands/tablecmds.c:9553
+#, c-format
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "Spalte »%s« von Tabelle »%s« ist nicht als NOT NULL markiert"
+
+#: commands/tablecmds.c:9589 commands/tablecmds.c:9601
+#, c-format
+msgid "cannot create primary key on column \"%s\""
+msgstr "kann keinen Primärschlüssel über Spalte »%s« erzeugen"
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9591 commands/tablecmds.c:9603
+#, c-format
+msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
+msgstr "Der Constraint »%s« für Spalte »%s« von Tabelle »%s«, markiert als %s, ist inkompatibel mit einem Primärschlüssel."
+
+#: commands/tablecmds.c:9727
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX wird für partitionierte Tabellen nicht unterstützt"
 
-#: commands/tablecmds.c:9286
+#: commands/tablecmds.c:9752
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX benennt Index »%s« um in »%s«"
 
-#: commands/tablecmds.c:9623
+#: commands/tablecmds.c:10110
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr "ONLY nicht möglich für Fremdschlüssel für partitionierte Tabelle »%s« verweisend auf Relation »%s«"
 
-#: commands/tablecmds.c:9629
-#, c-format
-msgid "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing relation \"%s\""
-msgstr "Hinzufügen von Fremdschlüssel mit NOT VALID nicht möglich für partitionierte Tabelle »%s« verweisend auf Relation »%s«"
-
-#: commands/tablecmds.c:9632
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr "Dieses Feature wird für partitionierte Tabellen noch nicht unterstützt."
-
-#: commands/tablecmds.c:9639 commands/tablecmds.c:10095
+#: commands/tablecmds.c:10118 commands/tablecmds.c:10745
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "Relation »%s«, auf die verwiesen wird, ist keine Tabelle"
 
-#: commands/tablecmds.c:9662
+#: commands/tablecmds.c:10141
 #, 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:9669
+#: commands/tablecmds.c:10148
 #, 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:9675
+#: commands/tablecmds.c:10154
 #, 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:9679
+#: commands/tablecmds.c:10158
 #, 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:9743 commands/tablecmds.c:9749
+#: commands/tablecmds.c:10173 commands/tablecmds.c:10201
+#, c-format
+msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr "Fremdschlüssel verwendet PERIOD für die Tabelle, auf die verwiesen wird, aber nicht für die verweisende Tabelle"
+
+#: commands/tablecmds.c:10213
+#, c-format
+msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr "Fremdschlüssel verwendet PERIOD für die verweisende Tabelle, aber nicht für die Tabelle, auf die verwiesen wird"
+
+#: commands/tablecmds.c:10227
+#, c-format
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
+msgstr "Fremdschlüssel muss PERIOD verwenden, wenn auf einen Primärschlüssel verwiesen wird, der WITHOUT OVERLAPS verwendet"
+
+#: commands/tablecmds.c:10251 commands/tablecmds.c:10257
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "ungültige %s-Aktion für Fremdschlüssel-Constraint, der eine generierte Spalte enthält"
 
-#: commands/tablecmds.c:9765
+#: commands/tablecmds.c:10272
+#, c-format
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr "Fremdschlüssel-Constraints für virtuelle generierte Spalten werden nicht unterstützt"
+
+#: commands/tablecmds.c:10286 commands/tablecmds.c:10295
+#, c-format
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr "nicht unterstützte %s-Aktion für Fremdschlüssel-Constraint, der PERIOD verwendet"
+
+#: commands/tablecmds.c:10310
 #, 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:9872
+#: commands/tablecmds.c:10366
+#, c-format
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "konnte keinen Überlappungsoperator für den Fremdschlüssel ermitteln"
+
+#: commands/tablecmds.c:10367
+#, c-format
+msgid "could not identify an equality operator for foreign key"
+msgstr "konnte keinen Ist-Gleich-Operator für den Fremdschlüssel ermitteln"
+
+#: commands/tablecmds.c:10432 commands/tablecmds.c:10466
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "Fremdschlüssel-Constraint »%s« kann nicht implementiert werden"
 
-#: commands/tablecmds.c:9874
+#: commands/tablecmds.c:10434
+#, c-format
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
+msgstr "Schlüsselspalten »%s« der referenzierenden Tabelle und »%s« der referenzierten Tabelle haben inkompatible Typen: %s und %s."
+
+#: commands/tablecmds.c:10467
 #, 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."
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
+msgstr "Schlüsselspalten »%s« der referenzierenden Tabelle und »%s« der referenzierten Tabelle haben inkompatible Sortierfolgen: »%s« und »%s«. Wenn eine der Sortierfolgen nichtdeterministisch ist, dann müssen beide Sortierfolgen die selbe sein."
 
-#: commands/tablecmds.c:10031
+#: commands/tablecmds.c:10673
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr "Spalte »%s«, auf die in der ON-DELETE-SET-Aktion verwiesen wird, muss Teil des Fremdschlüssels sein"
 
-#: commands/tablecmds.c:10305 commands/tablecmds.c:10775
-#: parser/parse_utilcmd.c:797 parser/parse_utilcmd.c:920
+#: commands/tablecmds.c:11057 commands/tablecmds.c:11490
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "Fremdschlüssel-Constraints auf Fremdtabellen werden nicht unterstützt"
 
-#: commands/tablecmds.c:11328 commands/tablecmds.c:11609
-#: commands/tablecmds.c:12521 commands/tablecmds.c:12595
+#: commands/tablecmds.c:11473
+#, c-format
+msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
+msgstr "kann Tabelle »%s« nicht als Partition anfügen, weil auf sie von Fremdschlüssel »%s« verwiesen wird"
+
+#: commands/tablecmds.c:11754
+#, c-format
+msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
+msgstr "ENFORCED-Einstellung von Constraint »%s« kollidiert mit Constraint »%s« für Relation »%s«"
+
+#: commands/tablecmds.c:12216
+#, c-format
+msgid "constraint must be altered in child tables too"
+msgstr "Constraint muss ebenso in den abgeleiteten Tabellen geändert werden"
+
+#: commands/tablecmds.c:12245 commands/tablecmds.c:12944
+#: commands/tablecmds.c:14059 commands/tablecmds.c:14288
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "Constraint »%s« von Relation »%s« existiert nicht"
 
-#: commands/tablecmds.c:11335
+#: commands/tablecmds.c:12252
 #, 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"
 
-#: commands/tablecmds.c:11373
+#: commands/tablecmds.c:12257
+#, c-format
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr "ENFORCED-Einstellung des Constraints »%s« von Relation »%s« kann nicht geändert werden"
+
+#: commands/tablecmds.c:12263
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "Constraint »%s« von Relation »%s« ist kein Not-Null-Constraint"
+
+#: commands/tablecmds.c:12271
+#, c-format
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "geerbter Constraint »%s« von Relation »%s« kann nicht geändert werden"
+
+#: commands/tablecmds.c:12311
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "Constraint »%s« von Relation »%s« kann nicht geändert werden"
 
-#: commands/tablecmds.c:11376
+#: commands/tablecmds.c:12314
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "Constraint »%s« ist von Constraint »%s« von Relation »%s« abgeleitet."
 
-#: commands/tablecmds.c:11378
+#: commands/tablecmds.c:12316
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "Sie können stattdessen den Constraint, von dem er abgeleitet ist, ändern."
 
-#: commands/tablecmds.c:11617
+#: commands/tablecmds.c:12953
+#, c-format
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "Constraint »%s« von Relation »%s« kann nicht validiert werden"
+
+#: commands/tablecmds.c:12955
+#, c-format
+msgid "This operation is not supported for this type of constraint."
+msgstr "Diese Operation wird für diese Art von Constraint nicht unterstützt."
+
+#: commands/tablecmds.c:12960
 #, 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"
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "auf NOT ENFORCED gesetzter Constraint kann nicht validiert werden"
 
-#: commands/tablecmds.c:11694
+#: commands/tablecmds.c:13169 commands/tablecmds.c:13269
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "Constraint muss ebenso in den abgeleiteten Tabellen validiert werden"
 
-#: commands/tablecmds.c:11781
+#: commands/tablecmds.c:13346
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "Spalte »%s«, die im Fremdschlüssel verwendet wird, existiert nicht"
 
-#: commands/tablecmds.c:11787
+#: commands/tablecmds.c:13352
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "Systemspalten können nicht in Fremdschlüsseln verwendet werden"
 
-#: commands/tablecmds.c:11791
+#: commands/tablecmds.c:13356
 #, 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:11856
+#: commands/tablecmds.c:13424
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "aufschiebbarer Primärschlüssel kann nicht für Tabelle »%s«, auf die verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:11873
+#: commands/tablecmds.c:13441
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Primärschlüssel"
 
-#: commands/tablecmds.c:11941
+#: commands/tablecmds.c:13514
 #, 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:12033
+#: commands/tablecmds.c:13617
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "aufschiebbarer Unique-Constraint kann nicht für Tabelle »%s«, auf die verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:12038
+#: commands/tablecmds.c:13622
 #, 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"
 
-#: commands/tablecmds.c:12477
+#: commands/tablecmds.c:14063
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "Constraint »%s« von Relation »%s« existiert nicht, wird übersprungen"
+
+#: commands/tablecmds.c:14108
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "geerbter Constraint »%s« von Relation »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:12527
+#: commands/tablecmds.c:14160
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "Constraint »%s« von Relation »%s« existiert nicht, wird übersprungen"
+msgid "column \"%s\" is in a primary key"
+msgstr "Spalte »%s« ist in einem Primärschlüssel"
+
+#: commands/tablecmds.c:14168
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "Spalte »%s« ist in einem Index, der als Replik-Identität verwendet wird"
 
-#: commands/tablecmds.c:12702
+#: commands/tablecmds.c:14401
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "Spaltentyp einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:12729
+#: commands/tablecmds.c:14429
+#, c-format
+msgid "cannot specify USING when altering type of generated column"
+msgstr "USING kann nicht angegeben werden, wenn der Typ einer generierten Spalte geändert wird"
+
+#: commands/tablecmds.c:14441
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "kann vererbte Spalte »%s« nicht ändern"
 
-#: commands/tablecmds.c:12738
+#: commands/tablecmds.c:14450
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "Spalte »%s« kann nicht geändert werden, weil sie Teil des Partitionierungsschlüssels von Relation »%s« ist"
 
-#: commands/tablecmds.c:12788
+#: commands/tablecmds.c:14505
 #, 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"
 
-#: commands/tablecmds.c:12791
+#: commands/tablecmds.c:14508
 #, 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:12795
+#: commands/tablecmds.c:14512
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "Spalte »%s« kann nicht automatisch in Typ %s umgewandelt werden"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:12798
+#: commands/tablecmds.c:14516
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Sie müssen möglicherweise »USING %s::%s« angeben."
 
-#: commands/tablecmds.c:12897
+#: commands/tablecmds.c:14619
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "geerbte Spalte »%s« von Relation »%s« kann nicht geändert werden"
 
-#: commands/tablecmds.c:12926
+#: commands/tablecmds.c:14648
 #, 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:12937
+#: commands/tablecmds.c:14659
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "Typ der vererbten Spalte »%s« muss ebenso in den abgeleiteten Tabellen geändert werden"
 
-#: commands/tablecmds.c:13062
+#: commands/tablecmds.c:14784
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "Typ der Spalte »%s« kann nicht zweimal geändert werden"
 
-#: commands/tablecmds.c:13100
+#: commands/tablecmds.c:14822
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr "Generierungsausdruck der Spalte »%s« kann nicht automatisch in Typ %s umgewandelt werden"
 
-#: commands/tablecmds.c:13105
+#: commands/tablecmds.c:14827
 #, 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"
 
-#: commands/tablecmds.c:13409
+#: commands/tablecmds.c:15131
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "Typ einer Spalte, die von einer Funktion oder Prozedur verwendet wird, kann nicht geändert werden"
 
-#: commands/tablecmds.c:13410 commands/tablecmds.c:13425
-#: commands/tablecmds.c:13445 commands/tablecmds.c:13464
-#: commands/tablecmds.c:13523
+#: commands/tablecmds.c:15132 commands/tablecmds.c:15147
+#: commands/tablecmds.c:15167 commands/tablecmds.c:15186
+#: commands/tablecmds.c:15245
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s hängt von Spalte »%s« ab"
 
-#: commands/tablecmds.c:13424
+#: commands/tablecmds.c:15146
 #, 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:13444
+#: commands/tablecmds.c:15166
 #, 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:13463
+#: commands/tablecmds.c:15185
 #, 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:13494
+#: commands/tablecmds.c:15216
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "Typ einer Spalte, die von einer generierten Spalte verwendet wird, kann nicht geändert werden"
 
-#: commands/tablecmds.c:13495
+#: commands/tablecmds.c:15217
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "Spalte »%s« wird von generierter Spalte »%s« verwendet."
 
-#: commands/tablecmds.c:13522
+#: commands/tablecmds.c:15244
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "Typ einer Spalte, die in der WHERE-Klausel einer Publikation verwendet wird, kann nicht geändert werden"
 
-#: commands/tablecmds.c:14357 commands/tablecmds.c:14369
+#: commands/tablecmds.c:16118 commands/tablecmds.c:16130
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "kann Eigentümer des Index »%s« nicht ändern"
 
-#: commands/tablecmds.c:14359 commands/tablecmds.c:14371
+#: commands/tablecmds.c:16120 commands/tablecmds.c:16132
 #, 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:14385
+#: commands/tablecmds.c:16146
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "kann Eigentümer der Sequenz »%s« nicht ändern"
 
-#: commands/tablecmds.c:14410
+#: commands/tablecmds.c:16171
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "kann Eigentümer der Relation »%s« nicht ändern"
 
-#: commands/tablecmds.c:14877
+#: commands/tablecmds.c:16638
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "mehrere SET TABLESPACE Unterbefehle sind ungültig"
 
-#: commands/tablecmds.c:14954
+#: commands/tablecmds.c:16717
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "für Relation »%s« können keine Optionen gesetzt werden"
 
-#: commands/tablecmds.c:14988 commands/view.c:440
+#: commands/tablecmds.c:16751 commands/view.c:440
 #, 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:15238
+#: commands/tablecmds.c:17004
 #, 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:15250
+#: commands/tablecmds.c:17016
 #, 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"
 
-#: commands/tablecmds.c:15342
+#: commands/tablecmds.c:17108
 #, 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"
 
-#: commands/tablecmds.c:15358
+#: commands/tablecmds.c:17124
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "keine passenden Relationen in Tablespace »%s« gefunden"
 
-#: commands/tablecmds.c:15480
+#: commands/tablecmds.c:17246
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "Vererbung einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:15485 commands/tablecmds.c:15985
+#: commands/tablecmds.c:17251 commands/tablecmds.c:17835
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "Vererbung einer Partition kann nicht geändert werden"
 
-#: commands/tablecmds.c:15490
+#: commands/tablecmds.c:17256
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "Vererbung einer partitionierten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:15536
+#: commands/tablecmds.c:17303
 #, 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:15549
+#: commands/tablecmds.c:17316
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "von einer Partition kann nicht geerbt werden"
 
-#: commands/tablecmds.c:15571 commands/tablecmds.c:18453
+#: commands/tablecmds.c:17338 commands/tablecmds.c:20359
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "zirkuläre Vererbung ist nicht erlaubt"
 
-#: commands/tablecmds.c:15572 commands/tablecmds.c:18454
+#: commands/tablecmds.c:17339 commands/tablecmds.c:20360
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "»%s« ist schon von »%s« abgeleitet."
 
-#: commands/tablecmds.c:15585
+#: commands/tablecmds.c:17352
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "Trigger »%s« verhindert, dass Tabelle »%s« ein Vererbungskind werden kann"
 
-#: commands/tablecmds.c:15587
+#: commands/tablecmds.c:17354
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "ROW-Trigger mit Übergangstabellen werden in Vererbungshierarchien nicht unterstützt."
 
-#: commands/tablecmds.c:15776
+#: commands/tablecmds.c:17555 commands/tablecmds.c:17804
 #, 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"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr "Spalte »%s« in abgeleiteter Tabelle »%s« muss als NOT NULL markiert sein"
 
-#: commands/tablecmds.c:15785
+#: commands/tablecmds.c:17565
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "Spalte »%s« in abgeleiteter Tabelle muss eine generierte Spalte sein"
 
-#: commands/tablecmds.c:15789
+#: commands/tablecmds.c:17569
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "Spalte »%s« in abgeleiteter Tabelle darf keine generierte Spalte sein"
 
-#: commands/tablecmds.c:15827
+#: commands/tablecmds.c:17615
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "Spalte »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:15908
+#: commands/tablecmds.c:17732
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "abgeleitete Tabelle »%s« hat unterschiedliche Definition für Check-Constraint »%s«"
 
-#: commands/tablecmds.c:15915
+#: commands/tablecmds.c:17741
 #, 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«"
 
-#: commands/tablecmds.c:15925
+#: commands/tablecmds.c:17752
 #, 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:15963
+#: commands/tablecmds.c:17763
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
+msgstr "Constraint »%s« kollidiert mit NOT-ENFORCED-Constraint für abgeleitete Tabelle »%s«"
+
+#: commands/tablecmds.c:17812
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "Constraint »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:16049
+#: commands/tablecmds.c:17899
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "Partition »%s« hat schon eine unerledigte Abtrennoperation in der partitionierten Tabelle »%s.%s«"
 
-#: commands/tablecmds.c:16078 commands/tablecmds.c:16124
-#: parser/parse_utilcmd.c:3261
+#: commands/tablecmds.c:17928 commands/tablecmds.c:17976
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "Relation »%s« ist keine Partition von Relation »%s«"
 
-#: commands/tablecmds.c:16130
+#: commands/tablecmds.c:17982
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "Relation »%s« ist keine Basisrelation von Relation »%s«"
 
-#: commands/tablecmds.c:16357
+#: commands/tablecmds.c:18253
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "getypte Tabellen können nicht erben"
 
-#: commands/tablecmds.c:16387
+#: commands/tablecmds.c:18283
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "Spalte »%s« fehlt in Tabelle"
 
-#: commands/tablecmds.c:16398
+#: commands/tablecmds.c:18294
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "Tabelle hat Spalte »%s«, aber Typ benötigt »%s«"
 
-#: commands/tablecmds.c:16407
+#: commands/tablecmds.c:18303
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:16421
+#: commands/tablecmds.c:18317
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "Tabelle hat zusätzliche Spalte »%s«"
 
-#: commands/tablecmds.c:16473
+#: commands/tablecmds.c:18369
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "»%s« ist keine getypte Tabelle"
 
-#: commands/tablecmds.c:16647
+#: commands/tablecmds.c:18549
 #, 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"
 
-#: commands/tablecmds.c:16653
+#: commands/tablecmds.c:18555
 #, 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"
 
-#: commands/tablecmds.c:16659
+#: commands/tablecmds.c:18561
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "Ausdrucksindex »%s« kann nicht als Replik-Identität verwendet werden"
 
-#: commands/tablecmds.c:16665
+#: commands/tablecmds.c:18567
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "partieller Index »%s« kann nicht als Replik-Identität verwendet werden"
 
-#: commands/tablecmds.c:16682
+#: commands/tablecmds.c:18584
 #, 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:16689
+#: commands/tablecmds.c:18591
 #, 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"
 
-#: commands/tablecmds.c:16941
+#: commands/tablecmds.c:18840
 #, 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"
 
-#: commands/tablecmds.c:16965
+#: commands/tablecmds.c:18864
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "kann Tabelle »%s« nicht in ungeloggt ändern, weil sie Teil einer Publikation ist"
 
-#: commands/tablecmds.c:16967
+#: commands/tablecmds.c:18866
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "Ungeloggte Relationen können nicht repliziert werden."
 
-#: commands/tablecmds.c:17012
+#: commands/tablecmds.c:18911
 #, 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"
 
-#: commands/tablecmds.c:17022
+#: commands/tablecmds.c:18921
 #, 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"
 
-#: commands/tablecmds.c:17080
+#: commands/tablecmds.c:18985
 #, 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:17185
+#: commands/tablecmds.c:19093
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "Relation »%s« existiert bereits in Schema »%s«"
 
-#: commands/tablecmds.c:17606
+#: commands/tablecmds.c:19518
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "»%s« ist keine Tabelle oder materialisierte Sicht"
 
-#: commands/tablecmds.c:17759
+#: commands/tablecmds.c:19671
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "»%s« ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:17789
+#: commands/tablecmds.c:19701
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "kann Schema des Index »%s« nicht ändern"
 
-#: commands/tablecmds.c:17791 commands/tablecmds.c:17805
+#: commands/tablecmds.c:19703 commands/tablecmds.c:19717
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "Ändern Sie stattdessen das Schema der Tabelle."
 
-#: commands/tablecmds.c:17795
+#: commands/tablecmds.c:19707
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "kann Schema des zusammengesetzten Typs »%s« nicht ändern"
 
-#: commands/tablecmds.c:17803
+#: commands/tablecmds.c:19715
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "kann Schema der TOAST-Tabelle »%s« nicht ändern"
 
-#: commands/tablecmds.c:17835
+#: commands/tablecmds.c:19747
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "Partitionierungsstrategie »list« kann nicht mit mehr als einer Spalte verwendet werden"
 
-#: commands/tablecmds.c:17901
+#: commands/tablecmds.c:19813
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "Spalte »%s«, die im Partitionierungsschlüssel verwendet wird, existiert nicht"
 
-#: commands/tablecmds.c:17909
+#: commands/tablecmds.c:19821
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "Systemspalte »%s« kann nicht im Partitionierungsschlüssel verwendet werden"
 
-#: commands/tablecmds.c:17920 commands/tablecmds.c:18010
+#: commands/tablecmds.c:19835 commands/tablecmds.c:19917
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "generierte Spalte kann nicht im Partitionierungsschlüssel verwendet werden"
 
-#: commands/tablecmds.c:17921 commands/tablecmds.c:18011 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:934 rewrite/rewriteHandler.c:969
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "Spalte »%s« ist eine generierte Spalte."
-
-#: commands/tablecmds.c:17993
+#: commands/tablecmds.c:19904
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "Partitionierungsschlüsselausdruck kann nicht auf Systemspalten verweisen"
 
-#: commands/tablecmds.c:18040
+#: commands/tablecmds.c:19968
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "Funktionen im Partitionierungsschlüsselausdruck müssen als IMMUTABLE markiert sein"
 
-#: commands/tablecmds.c:18049
+#: commands/tablecmds.c:19977
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "Partitionierungsschlüssel kann kein konstanter Ausdruck sein"
 
-#: commands/tablecmds.c:18070
+#: commands/tablecmds.c:19998
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "konnte die für den Partitionierungsausdruck zu verwendende Sortierfolge nicht bestimmen"
 
-#: commands/tablecmds.c:18105
+#: commands/tablecmds.c:20033
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr "Sie müssen eine hash-Operatorklasse angeben oder eine hash-Standardoperatorklasse für den Datentyp definieren."
 
-#: commands/tablecmds.c:18111
+#: commands/tablecmds.c:20039
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr "Sie müssen eine btree-Operatorklasse angeben oder eine btree-Standardoperatorklasse für den Datentyp definieren."
 
-#: commands/tablecmds.c:18393
+#: commands/tablecmds.c:20299
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "»%s« ist bereits eine Partition"
 
-#: commands/tablecmds.c:18399
+#: commands/tablecmds.c:20305
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "eine getypte Tabelle kann nicht als Partition angefügt werden"
 
-#: commands/tablecmds.c:18415
+#: commands/tablecmds.c:20321
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "ein Vererbungskind kann nicht als Partition angefügt werden"
 
-#: commands/tablecmds.c:18429
+#: commands/tablecmds.c:20335
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "eine Tabelle mit abgeleiteten Tabellen kann nicht als Partition angefügt werden"
 
-#: commands/tablecmds.c:18463
+#: commands/tablecmds.c:20369
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "eine temporäre Relation kann nicht als Partition an permanente Relation »%s« angefügt werden"
 
-#: commands/tablecmds.c:18471
+#: commands/tablecmds.c:20377
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "eine permanente Relation kann nicht als Partition an temporäre Relation »%s« angefügt werden"
 
-#: commands/tablecmds.c:18479
+#: commands/tablecmds.c:20385
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "kann nicht als Partition an temporäre Relation einer anderen Sitzung anfügen"
 
-#: commands/tablecmds.c:18486
+#: commands/tablecmds.c:20392
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "temporäre Relation einer anderen Sitzung kann nicht als Partition angefügt werden"
 
-#: commands/tablecmds.c:18506
-#, fuzzy, c-format
-#| msgid "table \"%s\" has different type for column \"%s\""
+#: commands/tablecmds.c:20412
+#, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
-msgstr "Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
+msgstr "anzufügende Tabelle »%s« enthält eine Identitätsspalte »%s«"
 
-#: commands/tablecmds.c:18508
-#, fuzzy, c-format
-#| msgid "The new partition may contain only the columns present in parent."
+#: commands/tablecmds.c:20414
+#, c-format
 msgid "The new partition may not contain an identity column."
-msgstr "Die neue Partition darf nur Spalten enthalten, die auch die Elterntabelle hat."
+msgstr "Die neue Partition darf keine Identitätsspalte enthalten."
 
-#: commands/tablecmds.c:18516
+#: commands/tablecmds.c:20422
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "Tabelle »%s« enthält Spalte »%s«, die nicht in der Elterntabelle »%s« gefunden wurde"
 
-#: commands/tablecmds.c:18519
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "Die neue Partition darf nur Spalten enthalten, die auch die Elterntabelle hat."
 
-#: commands/tablecmds.c:18531
+#: commands/tablecmds.c:20437
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "Trigger »%s« verhindert, dass Tabelle »%s« eine Partition werden kann"
 
-#: commands/tablecmds.c:18533
+#: commands/tablecmds.c:20439
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "ROW-Trigger mit Übergangstabellen werden für Partitionen nicht unterstützt."
 
-#: commands/tablecmds.c:18694
+#: commands/tablecmds.c:20621
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "kann Fremdtabelle »%s« nicht als Partition an partitionierte Tabelle »%s« anfügen"
 
-#: commands/tablecmds.c:18697
+#: commands/tablecmds.c:20624
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "Partitionierte Tabelle »%s« enthält Unique-Indexe."
 
-#: commands/tablecmds.c:19019
+#: commands/tablecmds.c:20948
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "nebenläufiges Abtrennen einer Partition ist nicht möglich, wenn eine Standardpartition existiert"
 
-#: commands/tablecmds.c:19128
+#: commands/tablecmds.c:21060
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "partitionierte Tabelle »%s« wurde nebenläufig entfernt"
 
-#: commands/tablecmds.c:19134
+#: commands/tablecmds.c:21066
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "Partition »%s« wurde nebenläufig entfernt"
 
-#: commands/tablecmds.c:19661 commands/tablecmds.c:19681
-#: commands/tablecmds.c:19702 commands/tablecmds.c:19721
-#: commands/tablecmds.c:19763
+#: commands/tablecmds.c:21700 commands/tablecmds.c:21720
+#: commands/tablecmds.c:21741 commands/tablecmds.c:21760
+#: commands/tablecmds.c:21817
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "kann Index »%s« nicht als Partition an Index »%s« anfügen"
 
-#: commands/tablecmds.c:19664
+#: commands/tablecmds.c:21703
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "Index »%s« ist bereits an einen anderen Index angefügt."
 
-#: commands/tablecmds.c:19684
+#: commands/tablecmds.c:21723
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "Index »%s« ist kein Index irgendeiner Partition von Tabelle »%s«."
 
-#: commands/tablecmds.c:19705
+#: commands/tablecmds.c:21744
 #, c-format
 msgid "The index definitions do not match."
 msgstr "Die Indexdefinitionen stimmen nicht überein."
 
-#: commands/tablecmds.c:19724
+#: commands/tablecmds.c:21763
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr "Der Index »%s« gehört zu einem Constraint in Tabelle »%s«, aber kein Constraint existiert für Index »%s«."
 
-#: commands/tablecmds.c:19766
+#: commands/tablecmds.c:21820
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "Ein anderer Index ist bereits für Partition »%s« angefügt."
 
-#: commands/tablecmds.c:20002
+#: commands/tablecmds.c:21943
+#, c-format
+msgid "invalid primary key definition"
+msgstr "ungültige Primärschlüsseldefinition"
+
+#: commands/tablecmds.c:21944
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "Spalte »%s« von Relation »%s« ist nicht als NOT NULL markiert."
+
+#: commands/tablecmds.c:22079
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "Spaltendatentyp %s unterstützt keine Komprimierung"
 
-#: commands/tablecmds.c:20009
+#: commands/tablecmds.c:22086
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "ungültige Komprimierungsmethode »%s«"
 
-#: commands/tablecmds.c:20035
+#: commands/tablecmds.c:22112
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "ungültiger Storage-Typ »%s«"
 
-#: commands/tablecmds.c:20045
+#: commands/tablecmds.c:22122
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "Spaltendatentyp %s kann nur Storage-Typ PLAIN"
 
-#: commands/tablecmds.c:20242
-#, fuzzy, c-format
-#| msgid "cannot inherit from a partition"
-msgid "can not find partition for split partition row"
-msgstr "von einer Partition kann nicht geerbt werden"
-
-#: commands/tablecmds.c:20328
-#, fuzzy, c-format
-#| msgid "cannot attach as partition of temporary relation of another session"
-msgid "cannot create as partition of temporary relation of another session"
-msgstr "kann nicht als Partition an temporäre Relation einer anderen Sitzung anfügen"
-
-#: commands/tablecmds.c:20399
-#, c-format
-msgid "cannot create a permanent relation as partition of temporary relation \"%s\""
-msgstr "eine permanente Relation kann nicht als Partition der temporären Relation »%s« erzeugt werden"
-
 #: commands/tablespace.c:193 commands/tablespace.c:644
 #, c-format
 msgid "\"%s\" exists but is not a directory"
@@ -12116,287 +12425,286 @@ msgstr "Verzeichnisse für Tablespace %u konnten nicht entfernt werden"
 msgid "You can remove the directories manually if necessary."
 msgstr "Sie können die Verzeichnisse falls nötig manuell entfernen."
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "»%s« ist eine Tabelle"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "Tabellen können keine INSTEAD OF-Trigger haben."
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "»%s« ist eine partitionierte Tabelle"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "ROW-Trigger mit Übergangstabellen werden für partitionierte Tabellen nicht unterstützt."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "»%s« ist eine Sicht"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "Sichten können keine BEFORE- oder AFTER-Trigger auf Zeilenebene haben."
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "Sichten können keine TRUNCATE-Trigger haben."
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "»%s« ist eine Fremdtabelle"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "Fremdtabellen können keine INSTEAD OF-Trigger haben."
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "Fremdtabellen können keine Constraint-Trigger haben."
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "Relation »%s« kann keine Trigger haben"
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW-Trigger werden nicht unterstützt"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF-Trigger müssen FOR EACH ROW sein"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF-Trigger können keine WHEN-Bedingungen haben"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF-Trigger können keine Spaltenlisten haben"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "Benennung von ROW-Variablen in der REFERENCING-Klausel wird nicht unterstützt"
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "Verwenden Sie OLD TABLE und NEW TABLE, um Übergangstabellen zu benennen."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "Trigger für Fremdtabellen können keine Übergangstabellen haben."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "Trigger für Sichten können keine Übergangstabellen haben."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "ROW-Trigger mit Übergangstabellen werden für Partitionen nicht unterstützt"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "ROW-Trigger mit Übergangstabellen werden für Vererbungskinder nicht unterstützt"
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "Übergangstabellenname kann nur für einen AFTER-Trigger angegeben werden"
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "TRUNCATE-Trigger mit Übergangstabellen werden nicht unterstützt"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "Übergangstabellen können nicht für Trigger mit mehr als einem Ereignis angegeben werden"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "Übergangstabellen können nicht für Trigger mit Spaltenlisten angegeben werden"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE kann nur für INSERT- oder UPDATE-Trigger angegeben werden"
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE kann nicht mehrmals angegeben werden"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE kann nur für DELETE- oder UPDATE-Trigger angegeben werden"
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE kann nicht mehrmals angegeben werden"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "Name für OLD TABLE und NEW TABLE kann nicht gleich sein"
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "WHEN-Bedingung eines Statement-Triggers kann keine Verweise auf Spaltenwerte enthalten"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "WHEN-Bedingung eines INSERT-Triggers kann keine Verweise auf OLD-Werte enthalten"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "WHEN-Bedingung eines DELETE-Triggers kann keine Verweise auf NEW-Werte enthalten"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "WHEN-Bedingung eines BEFORE-Triggers kann keine Verweise auf Systemspalten in NEW enthalten"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "WHEN-Bedingung eines BEFORE-Triggers kann keine Verweise auf generierte Spalten in NEW enthalten"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr "Ein Verweis auf die ganze Zeile der Tabelle wird verwendet und die Tabelle enthält generierte Spalten."
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "Trigger »%s« für Relation »%s« existiert bereits"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "Trigger »%s« für Relation »%s« ist ein interner oder abgeleiteter Trigger"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "Trigger »%s« für Relation »%s« ist ein Constraint-Trigger"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "Trigger »%s« für Tabelle »%s« existiert nicht"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "Trigger »%s« für Tabelle »%s« kann nicht umbenannt werden"
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "Benennen Sie stattdessen den Trigger für die partitionierte Tabelle »%s« um."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "Trigger »%s« für Tabelle »%s« wurde umbenannt"
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "keine Berechtigung: »%s« ist ein Systemtrigger"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "Triggerfunktion %u gab NULL-Wert zurück"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "Trigger für BEFORE STATEMENT kann keinen Wert zurückgeben"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "Verschieben einer Zeile in eine andere Partition durch einen BEFORE-FOR-EACH-ROW-Trigger wird nicht unterstützt"
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "Vor der Ausführung von Trigger »%s« gehörte die Zeile in Partition »%s.%s«."
 
-#: commands/trigger.c:3340 executor/nodeModifyTable.c:2363
-#: executor/nodeModifyTable.c:2446
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
 #, 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"
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "aus abgeleiteten Fremdtabellen können keine Übergangstupel gesammelt werden"
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1532
-#: executor/nodeModifyTable.c:1606 executor/nodeModifyTable.c:2364
-#: executor/nodeModifyTable.c:2447 executor/nodeModifyTable.c:3075
-#: executor/nodeModifyTable.c:3236
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322
+#: executor/nodeModifyTable.c:3519
 #, 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:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:305
-#: executor/nodeModifyTable.c:1548 executor/nodeModifyTable.c:2381
-#: executor/nodeModifyTable.c:2589
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810 executor/nodeModifyTable.c:3360
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "konnte Zugriff nicht serialisieren wegen gleichzeitiger Aktualisierung"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1638
-#: executor/nodeModifyTable.c:2464 executor/nodeModifyTable.c:2613
-#: executor/nodeModifyTable.c:3093
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826
+#: executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "konnte Zugriff nicht serialisieren wegen gleichzeitigem Löschen"
 
-#: commands/trigger.c:4601
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "aufgeschobener Trigger kann nicht in einer sicherheitsbeschränkten Operation ausgelöst werden"
 
-#: commands/trigger.c:5782
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "Constraint »%s« ist nicht aufschiebbar"
 
-#: commands/trigger.c:5805
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "Constraint »%s« existiert nicht"
@@ -12506,7 +12814,7 @@ msgstr "nur Superuser können Basistypen anlegen"
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr "Erzeugen Sie den Typ als Shell-Typ, legen Sie dann die I/O-Funktionen an und führen Sie dann das volle CREATE TYPE aus."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "Typ-Attribut »%s« nicht erkannt"
@@ -12526,7 +12834,7 @@ msgstr "Arrayelementtyp kann nicht %s sein"
 msgid "alignment \"%s\" not recognized"
 msgstr "Ausrichtung »%s« nicht erkannt"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "Storage-Typ »%s« nicht erkannt"
@@ -12556,288 +12864,308 @@ msgstr "Elementtyp kann nicht ohne eine Subscript-Funktion angeben werden"
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "»%s« ist kein gültiger Basistyp für eine Domäne"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "mehrere Vorgabeausdrücke"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "wiedersprüchliche NULL/NOT NULL-Constraints"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "überflüssige NOT-NULL-Constraint-Definition"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "Not-Null-Constraints für Domänen können nicht als NO INHERIT markiert werden"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "Check-Constraints für Domänen können nicht als NO INHERIT markiert werden"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "Unique-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "Primärschlüssel-Constraints sind nicht fürDomänen möglich"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "Exclusion-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "Fremdschlüssel-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "Setzen des Constraint-Modus wird für Domänen nicht unterstützt"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
+#, c-format
+msgid "specifying GENERATED not supported for domains"
+msgstr "Angabe von GENERATED wird für Domänen nicht unterstützt"
+
+#: commands/typecmds.c:1043
+#, c-format
+msgid "specifying constraint enforceability not supported for domains"
+msgstr "Angabe von ENFORCED/NOT ENFORCED wird für Domänen nicht unterstützt"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "»%s« ist kein Enum"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "Typ-Attribut »subtype« muss angegeben werden"
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "Bereichtsuntertyp kann nicht %s sein"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr "Sortierfolge für Bereichstyp angegeben, aber Untertyp unterstützt keine Sortierfolgen"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "Canonical-Funktion kann nicht angegeben werden ohne einen vorher angelegten Shell-Typ"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr "Erzeugen Sie den Typ als Shell-Typ, legen Sie dann die Canonicalization-Funktion an und führen Sie dann das volle CREATE TYPE aus."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "Typeingabefunktion %s hat mehrere Übereinstimmungen"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "Typeingabefunktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "Typeingabefunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "Typausgabefunktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "Typausgabefunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "Typempfangsfunktion %s hat mehrere Übereinstimmungen"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "Typempfangsfunktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "Typempfangsfunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "Typsendefunktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "Typsendefunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "typmod_in-Funktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "Typmodifikatoreingabefunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "typmod_out-Funktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "Typmodifikatorausgabefunktion %s sollte nicht VOLATILE sein"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "Typanalysefunktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "Typ-Subscript-Funktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "benutzerdefinierte Typen können Subscript-Funktion %s nicht verwenden"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr "Sie müssen für den Bereichstyp eine Operatorklasse angeben oder eine Standardoperatorklasse für den Untertyp definieren."
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "Bereichstyp-Canonical-Funktion %s muss Bereichstyp zurückgeben"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "Bereichstyp-Canonical-Funktion %s muss »immutable« sein"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "Bereichstyp-Untertyp-Diff-Funktion %s muss Typ %s zurückgeben"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "Bereichstyp-Untertyp-Diff-Funktion %s muss »immutable« sein"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "Array-OID-Wert für pg_type ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "Multirange-OID-Wert für pg_type ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "Multirange-Array-OID-Wert für pg_type ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "Constraint »%s« von Domäne »%s« existiert nicht"
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "Constraint »%s« von Domäne »%s« existiert nicht, wird übersprungen"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "Constraint »%s« von Domäne »%s« ist kein Check-Constraint"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "Spalte »%s« von Tabelle »%s« enthält NULL-Werte"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, 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"
 
-#: commands/typecmds.c:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s ist keine Domäne"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "Constraint »%s« für Domäne »%s« existiert bereits"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "Tabellenverweise können in Domänen-Check-Constraints nicht verwendet werden"
 
-#: commands/typecmds.c:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s ist der Zeilentyp einer Tabelle"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "Array-Typ %s kann nicht verändert werden"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Sie können den Typ %s ändern, wodurch der Array-Typ ebenfalls geändert wird."
 
-#: commands/typecmds.c:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "Multirange-Typ %s kann nicht verändert werden"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "Sie können den Typ %s ändern, wodurch der Multirange-Typ ebenfalls geändert wird."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "Typ %s existiert bereits in Schema »%s«"
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "Storage-Typ eines Typs kann nicht in PLAIN geändert werden"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "Typ-Attribut »%s« kann nicht geändert werden"
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "nur Superuser können Typen ändern"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "%s ist kein Basistyp"
@@ -12864,8 +13192,8 @@ msgstr "Nur Rollen mit dem %s-Attribut können Rollen erzeugen."
 msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "Nur Rollen mit dem %s-Attribut können Rollen mit dem %s-Attribut erzeugen."
 
-#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17355
-#: gram.y:17401 utils/adt/acl.c:5574 utils/adt/acl.c:5580
+#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17473
+#: gram.y:17519 utils/adt/acl.c:5707 utils/adt/acl.c:5713
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "Rollenname »%s« ist reserviert"
@@ -12925,8 +13253,8 @@ msgstr "Um das Passwort einer anderen Rolle zu ändern, muss der aktuelle Benutz
 
 #: commands/user.c:825
 #, c-format
-msgid "Only roles with the %s option on role \"%s\" may add members."
-msgstr "Nur Rollen mit der %s-Option für Rolle »%s« können Mitglieder hinzufügen."
+msgid "Only roles with the %s option on role \"%s\" may add or drop members."
+msgstr "Nur Rollen mit der %s-Option für Rolle »%s« können Mitglieder hinzufügen oder entfernen."
 
 #: commands/user.c:870
 #, c-format
@@ -12958,11 +13286,11 @@ msgstr "Nur Rollen mit dem %s-Attribut und der %s-Option für die Zielrollen kö
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "in DROP ROLE kann kein Rollenplatzhalter verwendet werden"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:838
-#: commands/variable.c:841 commands/variable.c:947 commands/variable.c:950
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:762
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "Rolle »%s« existiert nicht"
@@ -13027,7 +13355,7 @@ msgstr "Nur Rollen mit dem %s-Attribut und der %s-Option für Rolle »%s« könn
 msgid "MD5 password cleared because of role rename"
 msgstr "MD5-Passwort wegen Rollenumbenennung gelöscht"
 
-#: commands/user.c:1518 gram.y:1297
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "unbekannte Rollenoption »%s«"
@@ -13067,207 +13395,202 @@ msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können ihr gehörende O
 msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können ihr Objekte zuordnen."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "Rolle »%s« kann kein Mitglied einer Rolle sein"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "Rolle »%s« ist ein Mitglied der Rolle »%s«"
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "%s-Option kann nicht an den eigenen Grantor gegeben werden"
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "Rolle »%s« wurde schon Mitgliedschaft in Rolle »%s« durch Rolle »%s« gewährt"
 
-#: commands/user.c:2024
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "Rolle »%s« wurde keine Mitgliedschaft in Rolle »%s« durch Rolle »%s« gewährt"
 
-#: commands/user.c:2124
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "Rolle »%s« kann keine expliziten Mitglieder haben"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "keine Berechtigung, um Rolle »%s« zu gewähren"
 
-#: commands/user.c:2137
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "Nur Rollen mit dem %s-Attribut können Rollen mit dem %s-Attribut gewähren."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "keine Berechtigung, um Rolle »%s« zu entziehen"
 
-#: commands/user.c:2144
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "Nur Rollen mit dem %s-Attribut können Rollen mit dem %s-Attribut entziehen."
 
-#: commands/user.c:2160
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "Nur Rollen mit der %s-Option für Rolle »%s« können diese Rolle gewähren."
 
-#: commands/user.c:2167
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "Nur Rollen mit der %s-Option für Rolle »%s« können diese Rolle entziehen."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "keine Berechtigung, um Privilegien als Rolle »%s« zu gewähren"
 
-#: commands/user.c:2249
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können Privilegien als diese Rolle gewähren."
 
-#: commands/user.c:2258
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "Der Grantor muss die %s-Option für Rolle »%s« haben."
 
-#: commands/user.c:2266
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "keine Berechtigung, um von Rolle »%s« gewährte Privilegien zu entziehen"
 
-#: commands/user.c:2268
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können von dieser Rolle gewährte Privilegien entziehen."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "abhängige Privilegien existieren"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "Verwenden Sie CASCADE, um diese auch zu entziehen."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:148
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
-msgstr "»vacuum_buffer_usage_limit« muss 0 sein oder zwischen %d kB und %d kB liegen"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
+msgstr "»%s« muss 0 sein oder zwischen %d kB und %d kB liegen."
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "Option BUFFER_USAGE_LIMIT muss 0 sein oder zwischen %d kB und %d kB liegen"
 
-#: commands/vacuum.c:219
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "unbekannte ANALYZE-Option »%s«"
-
-#: commands/vacuum.c:259
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "Option PARALLEL benötigt einen Wert zwischen 0 und %d"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "parallele Arbeitsprozesse für Vacuum müssen zwischen 0 und %d sein"
 
-#: commands/vacuum.c:292
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "unbekannte VACUUM-Option »%s«"
-
-#: commands/vacuum.c:318
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL kann nicht parallel ausgeführt werden"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "BUFFER_USAGE_LIMIT kann nicht für VACUUM FULL angegeben werden"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "Option ANALYZE muss angegeben werden, wenn eine Spaltenliste angegeben ist"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "VACUUM-Option DISABLE_PAGE_SKIPPING kann nicht zusammen mit FULL verwendet werden"
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "PROCESS_TOAST benötigt VACUUM FULL"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS kann nicht mit einer Tabellenliste angegeben werden"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATS kann nicht mit anderen VACUUM-Optionen angegeben werden"
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s kann nicht aus VACUUM oder ANALYZE ausgeführt werden"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "keine Berechtigung für Vacuum von »%s«, wird übersprungen"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "keine Berechtigung für Analyze von »%s«, wird übersprungen"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "überspringe Vacuum von »%s« --- Sperre nicht verfügbar"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "überspringe Vacuum von »%s« --- Relation existiert nicht mehr"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "überspringe Analyze von »%s« --- Sperre nicht verfügbar"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "überspringe Analyze von »%s« --- Relation existiert nicht mehr"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:992
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "VACUUM ONLY für partitionierte Tabelle »%s« hat keine Auswirkung"
+
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "Obergrenze für das Entfernen und Einfrieren von Tuples ist weit in der Vergangenheit"
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -13276,37 +13599,37 @@ msgstr ""
 "Schließen Sie bald alle offenen Transaktionen, um Überlaufprobleme zu vermeiden.\n"
 "Eventuell müssen Sie auch alte vorbereitete Transaktionen committen oder zurückrollen oder unbenutzte Replikations-Slots löschen."
 
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "Obergrenze für das Einfrieren von Multixacts ist weit in der Vergangenheit"
 
-#: commands/vacuum.c:1890
+#: commands/vacuum.c:1950
 #, 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:1891
+#: commands/vacuum.c:1951
 #, 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:2070
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht vacuumen"
 
-#: commands/vacuum.c:2502
+#: commands/vacuum.c:2659
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr "Index »%s« gelesen und %lld Zeilenversionen entfernt"
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "Index »%s« gelesen und %<PRId64> Zeilenversionen entfernt"
 
-#: commands/vacuum.c:2521
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "Index »%s« enthält %.0f Zeilenversionen in %u Seiten"
 
-#: commands/vacuum.c:2525
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -13317,14 +13640,14 @@ msgstr ""
 "%u Indexseiten wurden neu gelöscht.\n"
 "%u Indexseiten sind gegenwärtig gelöscht, wovon %u gegenwärtig wiederverwendbar sind."
 
-#: commands/vacuumparallel.c:708
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index vacuuming (planned: %d)"
 msgstr[0] "%d parallelen Vacuum-Worker für Index-Vacuum gestartet (geplant: %d)"
 msgstr[1] "%d parallele Vacuum-Worker für Index-Vacuum gestartet (geplant: %d)"
 
-#: commands/vacuumparallel.c:714
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index cleanup (planned: %d)"
@@ -13333,8 +13656,8 @@ msgstr[1] "%d parallele Vacuum-Worker für Index-Cleanup gestartet (geplant: %d)
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "Widersprüchliche »datestyle«-Angaben."
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "Widersprüchliche »DateStyle«-Angaben."
 
 #: commands/variable.c:307
 #, c-format
@@ -13346,12 +13669,12 @@ msgstr "Im Zeitzonenintervall können keine Monate angegeben werden."
 msgid "Cannot specify days in time zone interval."
 msgstr "Im Zeitzonenintervall können keine Tage angegeben werden."
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "Zeitzone »%s« verwendet anscheinend Schaltsekunden"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL unterstützt keine Schaltsekunden."
@@ -13361,108 +13684,97 @@ msgstr "PostgreSQL unterstützt keine Schaltsekunden."
 msgid "UTC timezone offset is out of range."
 msgstr "Zeitzonenabstand zu UTC ist außerhalb des gültigen Bereichs."
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "kann den Read/Write-Modus einer Transaktion nicht in einer Read-Only-Transaktion setzen"
 
-#: commands/variable.c:559
+#: commands/variable.c:561
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr "Read/Write-Modus einer Transaktion muss vor allen Anfragen gesetzt werden"
 
-#: commands/variable.c:566
+#: commands/variable.c:568
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr "kann den Read/Write-Modus einer Transaktion nicht während der Wiederherstellung setzen"
 
-#: commands/variable.c:592
+#: commands/variable.c:596
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "SET TRANSACTION ISOLATION LEVEL muss vor allen Anfragen aufgerufen werden"
 
-#: commands/variable.c:599
+#: commands/variable.c:603
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr "SET TRANSACTION ISOLATION LEVEL kann nicht in einer Subtransaktion aufgerufen werden"
 
-#: commands/variable.c:606 storage/lmgr/predicate.c:1680
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "kann serialisierbaren Modus nicht in einem Hot Standby verwenden"
 
-#: commands/variable.c:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Sie können stattdessen REPEATABLE READ verwenden."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE kann nicht in einer Subtransaktion aufgerufen werden"
 
-#: commands/variable.c:631
+#: commands/variable.c:639
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE muss vor allen Anfragen aufgerufen werden"
 
-#: commands/variable.c:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr "»client_encoding« kann nicht während einer parallelen Operation geändert werden."
+
+#: commands/variable.c:743
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt."
 
-#: commands/variable.c:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "»client_encoding« kann jetzt nicht geändert werden."
 
-#: commands/variable.c:781
+#: commands/variable.c:889
 #, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr "»client_encoding« kann nicht während einer parallelen Operation geändert werden"
-
-#: commands/variable.c:863
-#, fuzzy, c-format
-#| msgid "permission denied to set session authorization"
 msgid "permission will be denied to set session authorization \"%s\""
-msgstr "keine Berechtigung, um Sitzungsautorisierung zu setzen"
+msgstr "es wird keine Berechtigung gegeben werden, um Sitzungsautorisierung »%s« zu setzen"
 
-#: commands/variable.c:868
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "keine Berechtigung, um Sitzungsautorisierung »%s« zu setzen"
 
-#: commands/variable.c:972
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
 msgstr "Berechtigung fehlt, um Rolle »%s« zu setzen"
 
-#: commands/variable.c:977
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "keine Berechtigung, um Rolle »%s« zu setzen"
 
-#: commands/variable.c:1177
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour wird von dieser Installation nicht unterstützt"
 
-#: commands/variable.c:1205
-#, c-format
-msgid "\"effective_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "»effective_io_concurrency« muss auf Plattformen ohne posix_fadvise() auf 0 gesetzt sein."
-
-#: commands/variable.c:1218
-#, c-format
-msgid "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "»maintenance_io_concurrency« muss auf Plattformen ohne posix_fadvise() auf 0 gesetzt sein."
-
-#: commands/variable.c:1231
+#: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL wird von dieser Installation nicht unterstützt"
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, 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"
@@ -13548,57 +13860,57 @@ msgstr "Cursor »%s« ist nicht auf eine Zeile positioniert"
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "Cursor »%s« ist kein einfach aktualisierbarer Scan der Tabelle »%s«"
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2543
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3101
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "Typ von Parameter %d (%s) stimmt nicht mit dem überein, als der Plan vorbereitet worden ist (%s)"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3113
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "kein Wert für Parameter %d gefunden"
 
-#: executor/execExpr.c:641 executor/execExpr.c:648 executor/execExpr.c:654
-#: executor/execExprInterp.c:4741 executor/execExprInterp.c:4758
-#: executor/execExprInterp.c:4857 executor/nodeModifyTable.c:194
-#: executor/nodeModifyTable.c:205 executor/nodeModifyTable.c:222
-#: executor/nodeModifyTable.c:230
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5510 executor/execExprInterp.c:5527
+#: executor/execExprInterp.c:5626 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "Zeilentyp der Tabelle und der von der Anfrage angegebene Zeilentyp stimmen nicht überein"
 
-#: executor/execExpr.c:642 executor/nodeModifyTable.c:195
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "Anfrage hat zu viele Spalten."
 
-#: executor/execExpr.c:649 executor/nodeModifyTable.c:223
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "Anfrage liefert einen Wert für eine gelöschte Spalte auf Position %d."
 
-#: executor/execExpr.c:655 executor/execExprInterp.c:4759
-#: executor/nodeModifyTable.c:206
+#: executor/execExpr.c:681 executor/execExprInterp.c:5528
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "Tabelle hat Typ %s auf Position %d, aber Anfrage erwartet %s."
 
-#: executor/execExpr.c:1103 parser/parse_agg.c:840
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "Aufrufe von Fensterfunktionen können nicht geschachtelt werden"
 
-#: executor/execExpr.c:1640
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "Zieltyp ist kein Array"
 
-#: executor/execExpr.c:1980
+#: executor/execExpr.c:2033
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "ROW()-Spalte hat Typ %s statt Typ %s"
 
-#: executor/execExpr.c:2642 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
@@ -13606,372 +13918,382 @@ msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "kann nicht mehr als %d Argument an eine Funktion übergeben"
 msgstr[1] "kann nicht mehr als %d Argumente an eine Funktion übergeben"
 
-#: executor/execExpr.c:2669 executor/execSRF.c:738 executor/functions.c:1067
-#: utils/adt/jsonfuncs.c:4035 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, 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"
 
-#: executor/execExpr.c:3075 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr "kann aus Typ %s kein Element auswählen, weil er Subscripting nicht unterstützt"
 
-#: executor/execExpr.c:3203 executor/execExpr.c:3225
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "Typ %s unterstützt Wertzuweisungen in Elemente nicht"
 
-#: executor/execExprInterp.c:2007
+#: executor/execExprInterp.c:2423
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "Attribut %d von Typ %s wurde gelöscht"
 
-#: executor/execExprInterp.c:2013
+#: executor/execExprInterp.c:2429
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "Attribut %d von Typ %s hat falschen Typ"
 
-#: executor/execExprInterp.c:2015 executor/execExprInterp.c:3214
-#: executor/execExprInterp.c:3260
+#: executor/execExprInterp.c:2431 executor/execExprInterp.c:3790
+#: executor/execExprInterp.c:3836
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "Tabelle hat Typ %s, aber Anfrage erwartet %s."
 
-#: executor/execExprInterp.c:2095 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2511 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "Typ %s ist kein zusammengesetzter Typ"
 
-#: executor/execExprInterp.c:2698
+#: executor/execExprInterp.c:3274
 #, 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/execExprInterp.c:2911
+#: executor/execExprInterp.c:3487
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "kann inkompatible Arrays nicht verschmelzen"
 
-#: executor/execExprInterp.c:2912
+#: executor/execExprInterp.c:3488
 #, 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/execExprInterp.c:2933 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3496 utils/adt/arrayfuncs.c:5586
-#: utils/adt/arrayfuncs.c:6103 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3509 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5611
+#: utils/adt/arrayfuncs.c:6130 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "Anzahl der Arraydimensionen (%d) überschreitet erlaubtes Maximum (%d)"
 
-#: executor/execExprInterp.c:2953 executor/execExprInterp.c:2988
+#: executor/execExprInterp.c:3529 executor/execExprInterp.c:3564
 #, 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/execExprInterp.c:2965 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3541 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
-#: utils/adt/arrayfuncs.c:2942 utils/adt/arrayfuncs.c:2957
-#: utils/adt/arrayfuncs.c:3298 utils/adt/arrayfuncs.c:3526
-#: utils/adt/arrayfuncs.c:5358 utils/adt/arrayfuncs.c:6195
-#: utils/adt/arrayfuncs.c:6539 utils/adt/arrayutils.c:83
-#: utils/adt/arrayutils.c:92 utils/adt/arrayutils.c:99
+#: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
+#: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5383
+#: utils/adt/arrayfuncs.c:6222 utils/adt/arrayfuncs.c:6566
+#: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
+#: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "Arraygröße überschreitet erlaubtes Maximum (%d)"
 
-#: executor/execExprInterp.c:3213 executor/execExprInterp.c:3259
+#: executor/execExprInterp.c:3789 executor/execExprInterp.c:3835
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "Attribut %d hat falschen Typ"
 
-#: executor/execExprInterp.c:3845 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4484 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "Domäne %s erlaubt keine NULL-Werte"
 
-#: executor/execExprInterp.c:3860 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4499 utils/adt/domains.c:196
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "Wert für Domäne %s verletzt Check-Constraint »%s«"
 
-#: executor/execExprInterp.c:4433
+#: executor/execExprInterp.c:5074
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
-msgstr ""
+msgstr "kein SQL/JSON-Item für angegebenen Pfad von Spalte »%s« gefunden"
 
-#: executor/execExprInterp.c:4438
+#: executor/execExprInterp.c:5079
 #, c-format
 msgid "no SQL/JSON item found for specified path"
-msgstr ""
+msgstr "kein SQL/JSON-Item für angegebenen Pfad gefunden"
+
+#. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
+#: executor/execExprInterp.c:5279 executor/execExprInterp.c:5287
+#, c-format
+msgid "could not coerce %s expression (%s) to the RETURNING type"
+msgstr "konnte %s-Ausdruck (%s) nicht in RETURNING-Typ umwandeln"
 
-#: executor/execExprInterp.c:4742
+#: executor/execExprInterp.c:5511
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "Tabellenzeile enthält %d Attribut, aber Anfrage erwartet %d."
 msgstr[1] "Tabellenzeile enthält %d Attribute, aber Anfrage erwartet %d."
 
-#: executor/execExprInterp.c:4858 executor/execSRF.c:977
+#: executor/execExprInterp.c:5627 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "Physischer Speicher stimmt nicht überein mit gelöschtem Attribut auf Position %d."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:609
 #, 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:870
+#: executor/execIndexing.c:919
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "konnte Exclusion-Constraint »%s« nicht erzeugen"
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:922
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Schlüssel %s kollidiert mit Schlüssel %s."
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:924
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Es bestehen Schlüsselkonflikte."
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:930
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "kollidierender Schlüsselwert verletzt Exclusion-Constraint »%s«"
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:933
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Schlüssel %s kollidiert mit vorhandenem Schlüssel %s."
 
-#: executor/execIndexing.c:886
+#: executor/execIndexing.c:935
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Der Schlüssel kollidiert mit einem vorhandenen Schlüssel."
 
-#: executor/execMain.c:1041
+#: executor/execIndexing.c:1180
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr "leerer WITHOUT-OVERLAPS-Wert gefunden in Spalte »%s« in Relation »%s«"
+
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "kann Sequenz »%s« nicht ändern"
 
-#: executor/execMain.c:1047
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "kann TOAST-Relation »%s« nicht ändern"
 
-#: executor/execMain.c:1066
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "kann materialisierte Sicht »%s« nicht ändern"
 
-#: executor/execMain.c:1078
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "kann nicht in Fremdtabelle »%s« einfügen"
 
-#: executor/execMain.c:1084
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "Fremdtabelle »%s« erlaubt kein Einfügen"
 
-#: executor/execMain.c:1091
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "kann Fremdtabelle »%s« nicht aktualisieren"
 
-#: executor/execMain.c:1097
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "Fremdtabelle »%s« erlaubt kein Aktualisieren"
 
-#: executor/execMain.c:1104
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "kann nicht aus Fremdtabelle »%s« löschen"
 
-#: executor/execMain.c:1110
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "Fremdtabelle »%s« erlaubt kein Löschen"
 
-#: executor/execMain.c:1121
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "kann Relation »%s« nicht ändern"
 
-#: executor/execMain.c:1148
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "kann Zeilen in Sequenz »%s« nicht sperren"
 
-#: executor/execMain.c:1155
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "kann Zeilen in TOAST-Relation »%s« nicht sperren"
 
-#: executor/execMain.c:1162
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "kann Zeilen in Sicht »%s« nicht sperren"
 
-#: executor/execMain.c:1170
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "kann Zeilen in materialisierter Sicht »%s« nicht sperren"
 
-#: executor/execMain.c:1179 executor/execMain.c:2684
+#: executor/execMain.c:1227 executor/execMain.c:2869
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "kann Zeilen in Fremdtabelle »%s« nicht sperren"
 
-#: executor/execMain.c:1185
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "kann Zeilen in Relation »%s« nicht sperren"
 
-#: executor/execMain.c:1898
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "neue Zeile für Relation »%s« verletzt Partitions-Constraint"
 
-#: executor/execMain.c:1900 executor/execMain.c:1984 executor/execMain.c:2035
-#: executor/execMain.c:2145
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218
+#: executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "Fehlgeschlagene Zeile enthält %s."
 
-#: executor/execMain.c:1981
-#, c-format
-msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
-msgstr "NULL-Wert in Spalte »%s« von Relation »%s« verletzt Not-Null-Constraint"
-
-#: executor/execMain.c:2033
+#: executor/execMain.c:2078
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "neue Zeile für Relation »%s« verletzt Check-Constraint »%s«"
 
-#: executor/execMain.c:2143
+#: executor/execMain.c:2215
+#, c-format
+msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
+msgstr "NULL-Wert in Spalte »%s« von Relation »%s« verletzt Not-Null-Constraint"
+
+#: executor/execMain.c:2324
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "neue Zeile verletzt Check-Option für Sicht »%s«"
 
-#: executor/execMain.c:2153
+#: executor/execMain.c:2334
 #, 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«"
 
-#: executor/execMain.c:2158
+#: executor/execMain.c:2339
 #, 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«"
 
-#: executor/execMain.c:2166
+#: executor/execMain.c:2347
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "Zielzeile verletzt Policy für Sicherheit auf Zeilenebene »%s« (USING-Ausdruck) für Tabelle »%s«"
 
-#: executor/execMain.c:2171
+#: executor/execMain.c:2352
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "Zielzeile verletzt Policy für Sicherheit auf Zeilenebene (USING-Ausdruck) für Tabelle »%s«"
 
-#: executor/execMain.c:2178
+#: executor/execMain.c:2359
 #, 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«"
 
-#: executor/execMain.c:2183
+#: executor/execMain.c:2364
 #, 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«"
 
-#: executor/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "keine Partition von Relation »%s« für die Zeile gefunden"
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "Partitionierungsschlüssel der fehlgeschlagenen Zeile enthält %s."
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update, retrying"
 msgstr "das zu sperrende Tupel wurde schon durch ein gleichzeitiges Update in eine andere Partition verschoben, versuche erneut"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "gleichzeitige Aktualisierung, versuche erneut"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "gleichzeitiges Löschen, versuche erneut"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3845
-#: utils/adt/arrayfuncs.c:4400 utils/adt/arrayfuncs.c:6419
-#: utils/adt/rowtypes.c:1220
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "konnte keinen Ist-Gleich-Operator für Typ %s ermitteln"
-
-#: executor/execReplication.c:683 executor/execReplication.c:689
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "kann Tabelle »%s« nicht aktualisieren"
 
-#: executor/execReplication.c:685 executor/execReplication.c:697
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid "Column used in the publication WHERE expression is not part of the replica identity."
 msgstr "Im WHERE-Ausdruck der Publikation verwendete Spalte ist nicht Teil der Replika-Identität."
 
-#: executor/execReplication.c:691 executor/execReplication.c:703
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid "Column list used by the publication does not cover the replica identity."
 msgstr "Die von der Publikation verwendete Spaltenliste umfasst die Replika-Identität nicht."
 
-#: executor/execReplication.c:695 executor/execReplication.c:701
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr "Replika-Identität darf keine unpublizierten generierten Spalten enthalten."
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "kann nicht aus Tabelle »%s« löschen"
 
-#: executor/execReplication.c:721
+#: executor/execReplication.c:859
 #, c-format
 msgid "cannot update table \"%s\" because it does not have a replica identity and publishes updates"
 msgstr "Tabelle »%s« kann nicht aktualisiert werden, weil sie keine Replik-Identität hat und Updates publiziert"
 
-#: executor/execReplication.c:723
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "Um Aktualisieren der Tabelle zu ermöglichen, setzen Sie REPLICA IDENTITY mit ALTER TABLE."
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:865
 #, c-format
 msgid "cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes"
 msgstr "aus Tabelle »%s« kann nicht gelöscht werden, weil sie keine Replik-Identität hat und Deletes publiziert"
 
-#: executor/execReplication.c:729
+#: executor/execReplication.c:867
 #, c-format
 msgid "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "Um Löschen in der Tabelle zu ermöglichen, setzen Sie REPLICA IDENTITY mit ALTER TABLE."
 
-#: executor/execReplication.c:745
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr "Relation »%s.%s« kann nicht als Ziel für logische Replikation verwendet werden"
@@ -14018,118 +14340,118 @@ msgstr[1] "Zurückgegebene Zeile enthält %d Attribute, aber Anfrage erwartet %d
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "Rückgabetyp war %s auf Position %d, aber Anfrage erwartet %s."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "Systemspalte kann in diesem Kontext nicht ausgelesen werden"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
-msgstr ""
+msgstr "dieser Tupeltyp hat keine Transaktionsinformationen"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
-#, fuzzy, c-format
-#| msgid "cannot retrieve a system column in this context"
+#: executor/execTuples.c:391 executor/execTuples.c:796
+#, c-format
 msgid "don't have a storage tuple in this context"
-msgstr "Systemspalte kann in diesem Kontext nicht ausgelesen werden"
+msgstr "in diesem Kontext gibt es kein zu speicherndes Tupel"
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "materialisierte Sicht »%s« wurde noch nicht befüllt"
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "Verwenden Sie den Befehl REFRESH MATERIALIZED VIEW."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 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:512
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "COPY vom/zum Client funktioniert in einer SQL-Funktion nicht"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:518
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "%s ist in SQL-Funktionen nicht erlaubt"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:526 executor/spi.c:1741 executor/spi.c:2649
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s ist in als nicht »volatile« markierten Funktionen nicht erlaubt"
 
-#: executor/functions.c:1451
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL-Funktion »%s« Anweisung %d"
+msgid "return type mismatch in function declared to return %s"
+msgstr "Rückgabetyp von Funktion stimmt nicht überein; deklariert als %s"
 
-#: executor/functions.c:1477
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "SQL-Funktion »%s« beim Start"
+msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgstr "Die letzte Anweisung der Funktion muss ein SELECT oder INSERT/UPDATE/DELETE/MERGE RETURNING sein."
 
-#: executor/functions.c:1562
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
-msgid "calling procedures with output arguments is not supported in SQL functions"
-msgstr "Aufruf von Prozeduren mit Ausgabeargumenten wird in SQL-Funktionen nicht unterstützt"
+msgid "cached plan must not change result type"
+msgstr "gecachter Plan darf den Ergebnistyp nicht ändern"
 
-#: executor/functions.c:1697 executor/functions.c:1735
-#: executor/functions.c:1749 executor/functions.c:1844
-#: executor/functions.c:1877 executor/functions.c:1891
+#: executor/functions.c:1922 executor/functions.c:1953
 #, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "Rückgabetyp von Funktion stimmt nicht überein; deklariert als %s"
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL-Funktion »%s« beim Start"
 
-#: executor/functions.c:1699
+#: executor/functions.c:1950
 #, c-format
-msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
-msgstr "Die letzte Anweisung der Funktion muss ein SELECT oder INSERT/UPDATE/DELETE/MERGE RETURNING sein."
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL-Funktion »%s« Anweisung %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid "calling procedures with output arguments is not supported in SQL functions"
+msgstr "Aufruf von Prozeduren mit Ausgabeargumenten wird in SQL-Funktionen nicht unterstützt"
 
-#: executor/functions.c:1737
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "Die letzte Anweisung muss genau eine Spalte zurückgeben."
 
-#: executor/functions.c:1751
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Eigentlicher Rückgabetyp ist %s."
 
-#: executor/functions.c:1846
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "Die letzte Anweisung gibt zu viele Spalten zurück."
 
-#: executor/functions.c:1879
+#: executor/functions.c:2401
 #, 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:1893
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "Die letzte Anweisung gibt zu wenige Spalten zurück."
 
-#: executor/functions.c:1921
+#: executor/functions.c:2443
 #, 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:3936 executor/nodeWindowAgg.c:2976
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3089
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "Aggregatfunktion %u muss kompatiblen Eingabe- und Übergangstyp haben"
 
-#: executor/nodeAgg.c:3966 parser/parse_agg.c:682 parser/parse_agg.c:710
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "Aufrufe von Aggregatfunktionen können nicht geschachtelt werden"
@@ -14139,12 +14461,12 @@ msgstr "Aufrufe von Aggregatfunktionen können nicht geschachtelt werden"
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "Custom-Scan »%s« unterstützt MarkPos nicht"
 
-#: executor/nodeHashjoin.c:1130 executor/nodeHashjoin.c:1160
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "konnte Position in temporärer Datei für Hash-Verbund nicht auf Anfang setzen"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr "verlustbehaftete Abstandsfunktionen werden in Index-Only-Scans nicht unterstützt"
@@ -14159,74 +14481,79 @@ msgstr "OFFSET darf nicht negativ sein"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT darf nicht negativ sein"
 
-#: executor/nodeMergejoin.c:1578
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN wird nur für Merge-Verbund-fähige Verbundbedingungen unterstützt"
 
-#: executor/nodeMergejoin.c:1596
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN wird nur für Merge-Verbund-fähige Verbundbedingungen unterstützt"
 
-#: executor/nodeModifyTable.c:231
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "Anfrage liefert einen Wert für eine generierte Spalte auf Position %d."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "Anfrage hat zu wenige Spalten."
 
-#: executor/nodeModifyTable.c:1531 executor/nodeModifyTable.c:1605
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr "das zu löschende Tupel wurde schon durch eine vom aktuellen Befehl ausgelöste Operation verändert"
 
-#: executor/nodeModifyTable.c:1760
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "ungültige ON-UPDATE-Angabe"
 
-#: executor/nodeModifyTable.c:1761
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr "Das Ergebnistupel würde in einer anderen Partition erscheinen als das ursprüngliche Tupel."
 
-#: executor/nodeModifyTable.c:2217
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr "Tupel kann nicht zwischen Partitionen bewegt werden, wenn ein Fremdschlüssel direkt auf einen Vorgänger (außer der Wurzel) der Quellpartition verweist"
 
-#: executor/nodeModifyTable.c:2218
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr "Ein Fremdschlüssel verweist auf den Vorgänger »%s«, aber nicht auf den Wurzelvorgänger »%s«."
 
-#: executor/nodeModifyTable.c:2221
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "Definieren Sie den Fremdschlüssel eventuell für Tabelle »%s«."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2567 executor/nodeModifyTable.c:3081
-#: executor/nodeModifyTable.c:3242
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328
+#: executor/nodeModifyTable.c:3525
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "Befehl in %s kann eine Zeile nicht ein zweites Mal ändern"
 
-#: executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2790
 #, 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."
 
-#: executor/nodeModifyTable.c:3074 executor/nodeModifyTable.c:3235
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3518
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "das zu aktualisierende oder zu löschende Tupel wurde schon durch eine vom aktuellen Befehl ausgelöste Operation verändert"
 
-#: executor/nodeModifyTable.c:3083 executor/nodeModifyTable.c:3244
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3527
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "Stellen Sie sicher, dass nicht mehr als eine Quellzeile auf jede Zielzeile passt."
 
-#: executor/nodeModifyTable.c:3152
+#: executor/nodeModifyTable.c:3404
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
 msgstr "das zu mergende Tupel wurde schon durch ein gleichzeitiges Update in eine andere Partition verschoben"
@@ -14241,8 +14568,8 @@ msgstr "Parameter von TABLESAMPLE darf nicht NULL sein"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "Parameter von TABLESAMPLE REPEATABLE darf nicht NULL sein"
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "als Ausdruck verwendete Unteranfrage ergab mehr als eine Zeile"
@@ -14272,32 +14599,32 @@ msgstr "Filter für Spalte »%s« ist NULL."
 msgid "null is not allowed in column \"%s\""
 msgstr "NULL ist in Spalte »%s« nicht erlaubt"
 
-#: executor/nodeWindowAgg.c:356
+#: executor/nodeWindowAgg.c:357
 #, c-format
 msgid "moving-aggregate transition function must not return null"
 msgstr "Moving-Aggregat-Übergangsfunktion darf nicht NULL zurückgeben"
 
-#: executor/nodeWindowAgg.c:2083
+#: executor/nodeWindowAgg.c:2154
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "Frame-Start-Offset darf nicht NULL sein"
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2168
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "Frame-Start-Offset darf nicht negativ sein"
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2181
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "Frame-Ende-Offset darf nicht NULL sein"
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2195
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "Frame-Ende-Offset darf nicht negativ sein"
 
-#: executor/nodeWindowAgg.c:2892
+#: executor/nodeWindowAgg.c:3005
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr "Aggregatfunktion %s unterstützt die Verwendung als Fensterfunktion nicht"
@@ -14332,49 +14659,49 @@ msgstr "Prüfen Sie, ob Aufrufe von »SPI_finish« fehlen."
 msgid "subtransaction left non-empty SPI stack"
 msgstr "Subtransaktion ließ nicht-leeren SPI-Stack zurück"
 
-#: executor/spi.c:1599
+#: executor/spi.c:1602
 #, c-format
 msgid "cannot open multi-query plan as cursor"
 msgstr "Plan mit mehreren Anfragen kann nicht als Cursor geöffnet werden"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1609
+#: executor/spi.c:1612
 #, c-format
 msgid "cannot open %s query as cursor"
 msgstr "%s kann nicht als Cursor geöffnet werden"
 
-#: executor/spi.c:1715
+#: executor/spi.c:1718
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE wird nicht unterstützt"
 
-#: executor/spi.c:1716 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3093
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Scrollbare Cursor müssen READ ONLY sein."
 
-#: executor/spi.c:2488
+#: executor/spi.c:2496
 #, c-format
 msgid "empty query does not return tuples"
 msgstr "leere Anfrage gibt keine Tupel zurück"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:2562
+#: executor/spi.c:2570
 #, c-format
 msgid "%s query does not return tuples"
 msgstr "%s-Anfrage gibt keine Tupel zurück"
 
-#: executor/spi.c:2979
+#: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "SQL-Ausdruck »%s«"
+msgid "PL/pgSQL expression \"%s\""
+msgstr "PL/pgSQL-Ausdruck »%s«"
 
-#: executor/spi.c:2984
+#: executor/spi.c:2992
 #, c-format
 msgid "PL/pgSQL assignment \"%s\""
 msgstr "PL/pgSQL-Zuweisung »%s«"
 
-#: executor/spi.c:2987
+#: executor/spi.c:2995
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "SQL-Anweisung »%s«"
@@ -14384,482 +14711,495 @@ msgstr "SQL-Anweisung »%s«"
 msgid "could not send tuple to shared-memory queue"
 msgstr "konnte Tupel nicht an Shared-Memory-Queue senden"
 
-#: foreign/foreign.c:224
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "Benutzerabbildung für Benutzer »%s«, Server »%s« nicht gefunden"
 
-#: foreign/foreign.c:650
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299
+#: optimizer/util/plancat.c:539
+#, c-format
+msgid "access to non-system foreign table is restricted"
+msgstr "Zugriff auf Nicht-System-Fremdtabelle ist beschränkt"
+
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "ungültige Option »%s«"
 
-#: foreign/foreign.c:652
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "Vielleicht meinten Sie die Option »%s«."
 
-#: foreign/foreign.c:654
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "Es gibt keine gültigen Optionen in diesem Zusammenhang."
 
-#: gram.y:1234
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD wird nicht mehr unterstützt"
 
-#: gram.y:1235
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "Lassen Sie UNENCRYPTED weg, um das Passwort stattdessen in verschlüsselter Form zu speichern."
 
-#: gram.y:1562 gram.y:1578
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS kann keine Schemaelemente enthalten"
 
-#: gram.y:1730
+#: gram.y:1727
 #, c-format
 msgid "current database cannot be changed"
 msgstr "aktuelle Datenbank kann nicht geändert werden"
 
-#: gram.y:1863
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "Zeitzonenintervall muss HOUR oder HOUR TO MINUTE sein"
 
-#: gram.y:2539
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "Spaltennummer muss im Bereich 1 bis %d sein"
 
-#: gram.y:3135
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "Constraints können nicht in NOT VALID geändert werden"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "Sequenzoption »%s« wird hier nicht unterstützt"
 
-#: gram.y:3174
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "Modulus für Hashpartition mehrmals angegeben"
 
-#: gram.y:3183
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "Rest für Hashpartition mehrmals angegeben"
 
-#: gram.y:3190
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "unbekannte Hashpartitionsbegrenzungsangabe »%s«"
 
-#: gram.y:3198
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "Modulus für Hashpartition muss angegeben werden"
 
-#: gram.y:3202
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "Rest für Hashpartition muss angegeben werden"
 
-#: gram.y:3410 gram.y:3444
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT sind nicht mit PROGRAM erlaubt"
 
-#: gram.y:3416
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "mit COPY TO ist keine WHERE-Klausel erlaubt"
 
-#: gram.y:3764 gram.y:3771 gram.y:13068 gram.y:13076
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "die Verwendung von GLOBAL beim Erzeugen einer temporären Tabelle ist veraltet"
 
-#: gram.y:4047
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "für eine generierte Spalte muss GENERATED ALWAYS angegeben werden"
 
-#: gram.y:4392 utils/adt/ri_triggers.c:2103
+#: gram.y:4454 utils/adt/ri_triggers.c:2259
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL ist noch nicht implementiert"
 
-#: gram.y:4484
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "eine Spaltenliste für %s wird nur für ON-DELETE-Aktionen unterstützt"
 
-#: gram.y:5196
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM wird nicht mehr unterstützt"
 
-#: gram.y:5894
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "unbekannte Zeilensicherheitsoption »%s«"
 
-#: gram.y:5895
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "Aktuell werden nur PERMISSIVE und RESTRICTIVE unterstützt."
 
-#: gram.y:5980
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER wird nicht unterstützt"
 
-#: gram.y:6017
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "mehrere Trigger-Ereignisse angegeben"
 
-#: gram.y:6159 parser/parse_utilcmd.c:3839 parser/parse_utilcmd.c:3865
+#: gram.y:6229 parser/parse_utilcmd.c:3955 parser/parse_utilcmd.c:3981
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "Constraint, der als INITIALLY DEFERRED deklariert wurde, muss DEFERRABLE sein"
 
-#: gram.y:6166
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "widersprüchliche Constraint-Eigentschaften"
 
-#: gram.y:6265
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION ist noch nicht implementiert"
 
-#: gram.y:6582
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "Löschen eines Enum-Werts ist nicht implementiert"
 
-#: gram.y:6700
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK wird nicht mehr benötigt"
-
-#: gram.y:6701
-#, c-format
-msgid "Update your data type."
-msgstr "Aktualisieren Sie Ihren Datentyp."
-
-#: gram.y:8574
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "Aggregatfunktionen können keine OUT-Argumente haben"
 
-#: gram.y:9037 utils/adt/regproc.c:670
+#: gram.y:9100 utils/adt/regproc.c:670
 #, c-format
 msgid "missing argument"
 msgstr "Argument fehlt"
 
-#: gram.y:9038 utils/adt/regproc.c:671
+#: gram.y:9101 utils/adt/regproc.c:671
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Verwenden Sie NONE, um das fehlende Argument eines unären Operators anzugeben."
 
-#: gram.y:11266 gram.y:11285
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION wird für rekursive Sichten nicht unterstützt"
 
-#: gram.y:13207
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "Syntax LIMIT x,y wird nicht unterstützt"
 
-#: gram.y:13208
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Verwenden Sie die getrennten Klauseln LIMIT und OFFSET."
 
-#: gram.y:14083
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "nur ein DEFAULT-Wert ist erlaubt"
 
-#: gram.y:14092
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "nur ein PATH-Wert pro Spalte ist erlaubt"
 
-#: gram.y:14101
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "widersprüchliche oder überflüssige NULL/NOT NULL-Deklarationen für Spalte »%s«"
 
-#: gram.y:14110
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "unbekannte Spaltenoption »%s«"
 
-#: gram.y:14192
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "Optionsname »%s« kann nicht in XMLTABLE verwendet werden"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "nur Zeichenkettenkonstanten werden in Pfadangaben in JSON_TABLE unterstützt"
 
-#: gram.y:14514
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "Präzision von Typ float muss mindestens 1 Bit sein"
 
-#: gram.y:14523
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "Präzision von Typ float muss weniger als 54 Bits sein"
 
-#: gram.y:15040
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "falsche Anzahl Parameter auf linker Seite von OVERLAPS-Ausdruck"
 
-#: gram.y:15045
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "falsche Anzahl Parameter auf rechter Seite von OVERLAPS-Ausdruck"
 
-#: gram.y:15222
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE-Prädikat ist noch nicht implementiert"
 
-#: gram.y:15636
+#: gram.y:15764
 #, 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:15641
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT kann nicht mit WITHIN GROUP verwendet werden"
 
-#: gram.y:15646
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC kann nicht mit WITHIN GROUP verwendet werden"
 
-#: gram.y:16373 gram.y:16397
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "Frame-Beginn kann nicht UNBOUNDED FOLLOWING sein"
 
-#: gram.y:16378
+#: gram.y:16506
 #, 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:16402
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "Frame-Ende kann nicht UNBOUNDED PRECEDING sein"
 
-#: gram.y:16408
+#: gram.y:16536
 #, 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:16415
+#: gram.y:16543
 #, 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:16964
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "unbekannte JSON-Kodierung: %s"
 
-#: gram.y:17288
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "Typmodifikator kann keinen Parameternamen haben"
 
-#: gram.y:17294
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "Typmodifikator kann kein ORDER BY haben"
 
-#: gram.y:17362 gram.y:17369 gram.y:17376
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s kann hier nicht als Rollenname verwendet werden"
 
-#: gram.y:17466 gram.y:18955
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES kann nicht ohne ORDER-BY-Klausel angegeben werden"
 
-#: gram.y:18646 gram.y:18821
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "unzulässige Verwendung von »*«"
 
-#: gram.y:18784 gram.y:18801 tsearch/spell.c:963 tsearch/spell.c:980
-#: tsearch/spell.c:997 tsearch/spell.c:1014 tsearch/spell.c:1079
+#: gram.y:18905 gram.y:18922 tsearch/spell.c:972 tsearch/spell.c:989
+#: tsearch/spell.c:1006 tsearch/spell.c:1023 tsearch/spell.c:1088
 #, c-format
 msgid "syntax error"
 msgstr "Syntaxfehler"
 
-#: gram.y:18885
+#: gram.y:19006
 #, 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:18922
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "mehrere ORDER-BY-Klauseln sind nicht erlaubt"
 
-#: gram.y:18933
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "mehrere OFFSET-Klauseln sind nicht erlaubt"
 
-#: gram.y:18942
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "mehrere LIMIT-Klauseln sind nicht erlaubt"
 
-#: gram.y:18951
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "mehrere Limit-Optionen sind nicht erlaubt"
-
-#: gram.y:18978
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "mehrere WITH-Klauseln sind nicht erlaubt"
 
-#: gram.y:19171
+#: gram.y:19295
 #, 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:19304
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "mehrere COLLATE-Klauseln sind nicht erlaubt"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19342 gram.y:19355
+#: gram.y:19469 gram.y:19482
 #, 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:19368
+#: gram.y:19495
 #, 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:19381
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s-Constraints können nicht als NO INHERIT markiert werden"
 
-#: gram.y:19403
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, c-format
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "%s-Constraints können nicht als NOT ENFORCED markiert werden"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, c-format
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "%s-Constraints können nicht als ENFORCED markiert werden"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "unbekannte Partitionierungsstrategie »%s«"
 
-#: gram.y:19427
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "ungültige Publikationsobjektliste"
 
-#: gram.y:19428
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr "Entweder TABLE oder TABLES IN SCHEMA muss vor einem alleinstehenden Tabellen- oder Schemanamen angegeben werden."
 
-#: gram.y:19444
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "ungültiger Tabellenname"
 
-#: gram.y:19465
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "für Schemas ist keine WHERE-Klausel erlaubt"
 
-#: gram.y:19472
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "für Schemas ist keine Spaltenangabe erlaubt"
 
-#: gram.y:19486
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "ungültiger Schemaname"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "leerer Konfigurationsdateiname: »%s«"
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr "konnte Konfigurationsdatei »%s« nicht öffnen: maximale Verschachtelungstiefe überschritten"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "Konfigurationsdateirekursion in »%s«"
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "konnte Konfigurationsdatei »%s« nicht öffnen: %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "fehlende Konfigurationsdatei »%s« wird übersprungen"
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, 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"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "Syntaxfehler in Datei »%s«, Zeile %u, bei »%s«"
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr "zu viele Syntaxfehler gefunden, Datei »%s« wird aufgegeben"
 
-#: jsonpath_gram.y:266 jsonpath_gram.y:598 jsonpath_scan.l:640
-#: jsonpath_scan.l:651 jsonpath_scan.l:661 jsonpath_scan.l:712
-#: utils/adt/encode.c:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:658
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374
+#: jsonpath_gram.y:268 jsonpath_gram.y:600 jsonpath_scan.l:617
+#: jsonpath_scan.l:628 jsonpath_scan.l:638 jsonpath_scan.l:690
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:342 utils/adt/varlena.c:383
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "ungültige Eingabesyntax für Typ %s"
 
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
-msgstr ""
+msgstr ".decimal() kann nur optionale Argumente Präzision[,Skala] haben."
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "Unbekanntes Flag-Zeichen »%.*s« in LIKE_REGEX-Prädikat."
 
-#: jsonpath_gram.y:629 tsearch/spell.c:749 utils/adt/regexp.c:223
+#: jsonpath_gram.y:632 tsearch/spell.c:752 utils/adt/regexp.c:223
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "ungültiger regulärer Ausdruck: %s"
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:680
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "XQuery-Flag »x« (expanded regular expression) ist nicht implementiert"
@@ -14876,49 +15216,49 @@ msgstr "ungültige hexadezimale Zeichensequenz"
 msgid "unexpected end after backslash"
 msgstr "unerwartetes Ende nach Backslash"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:742
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "Zeichenkette in Anführungszeichen nicht abgeschlossen"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "unerwartetes Kommentarende"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "ungültige numerische Konstante"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1050
-#: scan.l:1054 scan.l:1058 scan.l:1062 scan.l:1066 scan.l:1070 scan.l:1074
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "Müll folgt auf numerische Konstante"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s am Ende der jsonpath-Eingabe"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s bei »%s« in jsonpath-Eingabe"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "ungültige Eingabe"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "ungültige hexadezimale Ziffer"
 
-#: jsonpath_scan.l:607 utils/adt/jsonfuncs.c:646
+#: jsonpath_scan.l:584 utils/adt/jsonfuncs.c:649
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "nicht unterstützte Unicode-Escape-Sequenz"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "konnte Unicode nicht in Serverkodierung umwandeln"
@@ -14929,712 +15269,896 @@ msgstr "konnte Unicode nicht in Serverkodierung umwandeln"
 msgid "Failed on DSA request of size %zu."
 msgstr "Fehler bei DSA-Anfrage mit Größe %zu."
 
-#: libpq/auth-sasl.c:97
-#, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "SASL-Antwort erwartet, Message-Typ %d empfangen"
-
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
 msgid "client selected an invalid SASL authentication mechanism"
 msgstr "Client hat einen ungültigen SASL-Authentifizierungsmechanismums gewählt"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
-#, c-format
-msgid "invalid SCRAM secret for user \"%s\""
-msgstr "ungültiges SCRAM-Geheimnis für Benutzer »%s«"
-
-#: libpq/auth-scram.c:298
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
 #, c-format
-msgid "User \"%s\" does not have a valid SCRAM secret."
-msgstr "Benutzer »%s« hat kein gültiges SCRAM-Geheimnis."
-
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
-#, c-format
-msgid "malformed SCRAM message"
-msgstr "fehlerhafte SCRAM-Nachricht"
+msgid "malformed OAUTHBEARER message"
+msgstr "fehlerhafte OAUTHBEARER-Nachricht"
 
-#: libpq/auth-scram.c:379
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
 #, c-format
 msgid "The message is empty."
 msgstr "Die Nachricht ist leer."
 
-#: libpq/auth-scram.c:384
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
 #, c-format
 msgid "Message length does not match input length."
 msgstr "Länge der Nachricht stimmt nicht mit Länge der Eingabe überein."
 
-#: libpq/auth-scram.c:416
+#: libpq/auth-oauth.c:193
 #, c-format
-msgid "invalid SCRAM response"
-msgstr "ungültige SCRAM-Antwort"
+msgid "Client did not send a kvsep response."
+msgstr "Client hat keine kvsep-Antwort gesendet."
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-oauth.c:221
 #, c-format
-msgid "Nonce does not match."
-msgstr "Nonce stimmt nicht überein."
+msgid "The server does not support channel binding for OAuth, but the client message includes channel binding data."
+msgstr "Der Server unterstützt Channel-Binding für OAuth nicht, aber die Client-Nachricht enthält Channel-Binding-Daten."
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
 #, c-format
-msgid "could not generate random salt"
-msgstr "konnte zufälliges Salt nicht erzeugen"
+msgid "Comma expected, but found character \"%s\"."
+msgstr "Komma wurde erwartet, aber Zeichen »%s« wurde gefunden."
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
 #, c-format
-msgid "Expected attribute \"%c\" but found \"%s\"."
-msgstr "Attribut »%c« wurde erwartet, aber »%s« wurde gefunden."
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "Unerwartetes Channel-Binding-Flag »%s«."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
 #, c-format
-msgid "Expected character \"=\" for attribute \"%c\"."
-msgstr "Zeichen »=« für Attribut »%c« wurde erwartet."
+msgid "client uses authorization identity, but it is not supported"
+msgstr "Client verwendet Autorisierungsidentität, was nicht unterstützt wird"
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
 #, c-format
-msgid "Attribute expected, but found end of string."
-msgstr "Attribut wurde erwartet, aber Ende der Zeichenkette wurde gefunden."
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "Unerwartetes Attribut »%s« in »client-first-message«."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-oauth.c:264
 #, c-format
-msgid "Attribute expected, but found invalid character \"%s\"."
-msgstr "Attribut wurde erwartet, aber ungültiges Zeichen »%s« wurde gefunden."
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr "Key-Value-Separator wurde erwartet, aber Zeichen »%s« wurde gefunden."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-oauth.c:273
 #, c-format
-msgid "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not include channel binding data."
-msgstr "Der Client hat SCRAM-SHA-256-PLUS gewählt, aber die SCRAM-Nachricht enthielt keine Channel-Binding-Daten."
+msgid "Message does not contain an auth value."
+msgstr "Nachricht enthält keinen auth-Wert."
 
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
+#: libpq/auth-oauth.c:280
 #, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "Komma wurde erwartet, aber Zeichen »%s« wurde gefunden."
+msgid "Message contains additional data after the final terminator."
+msgstr "Nachricht enthält zusätzliche Daten nach dem abschließenden Endezeichen."
 
-#: libpq/auth-scram.c:1010
+#: libpq/auth-oauth.c:343
 #, c-format
-msgid "SCRAM channel binding negotiation error"
-msgstr "Fehler bei der Aushandlung von SCRAM-Channel-Binding"
+msgid "Message contains an empty key name."
+msgstr "Nachricht enthält einen leeren Schlüsselnamen."
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-oauth.c:350
 #, c-format
-msgid "The client supports SCRAM channel binding but thinks the server does not.  However, this server does support channel binding."
-msgstr "Der Client unterstützt SCRAM-Channel-Binding aber glaubt dass der Server es nicht tut. Dieser Server unterstützt jedoch Channel-Binding."
+msgid "Message contains an invalid key name."
+msgstr "Nachricht enthält einen ungültigen Schlüsselnamen."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-oauth.c:376
 #, c-format
-msgid "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM message includes channel binding data."
-msgstr "Der Client hat SCRAM-SHA-256 ohne Channel-Binding gewählt, aber die SCRAM-Nachricht enthält Channel-Binding-Daten."
+msgid "Message contains an invalid value."
+msgstr "Nachricht enthält einen ungültigen Wert."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-oauth.c:421
 #, c-format
-msgid "unsupported SCRAM channel-binding type \"%s\""
-msgstr "nicht unterstützter SCRAM-Channel-Binding-Typ »%s«"
+msgid "Message contains an unterminated key/value pair."
+msgstr "Nachricht enthält ein nicht abgeschlossenes Schlüssel/Wert-Paar."
 
-#: libpq/auth-scram.c:1051
+#: libpq/auth-oauth.c:439
 #, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "Unerwartetes Channel-Binding-Flag »%s«."
+msgid "Message contains a key without a value."
+msgstr "Nachricht enthält einen Schlüssel ohne einen Wert."
 
-#: libpq/auth-scram.c:1061
+#: libpq/auth-oauth.c:453
 #, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr "Client verwendet Autorisierungsidentität, was nicht unterstützt wird"
+msgid "Message contains multiple auth values."
+msgstr "Nachricht enthält mehrere auth-Werte."
 
-#: libpq/auth-scram.c:1066
+#: libpq/auth-oauth.c:473
 #, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "Unerwartetes Attribut »%s« in »client-first-message«."
+msgid "Message did not contain a final terminator."
+msgstr "Nachricht enthielt kein abschließendes Endezeichen."
 
-#: libpq/auth-scram.c:1082
+#: libpq/auth-oauth.c:499
 #, c-format
-msgid "client requires an unsupported SCRAM extension"
-msgstr "Client verlangt eine nicht unterstützte SCRAM-Erweiterung"
+msgid "OAuth is not properly configured for this user"
+msgstr "OAuth ist für diesen Benutzer nicht richtig konfiguriert."
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr "Die Parameter issuer und scope müssen in pg_hba.conf gesetzt sein."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, c-format
+msgid "malformed OAuth bearer token"
+msgstr "fehlerhaftes OAuth-Bearer-Token"
+
+#: libpq/auth-oauth.c:586
+#, c-format
+msgid "Client response indicated a non-Bearer authentication scheme."
+msgstr "Client-Antwort gibt ein Nicht-Bearer-Authentifizierungssystem an."
+
+#: libpq/auth-oauth.c:603
+#, c-format
+msgid "Bearer token is empty."
+msgstr "Bearer-Token ist leer."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "Bearer-Token ist nicht im korrekten Format."
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "Validierung von OAuth-Token verlangt ohne geladenen Validator"
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "interner Fehler im OAuth-Validator-Modul"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, c-format
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr "OAuth-Bearer-Authentifizierung für Benutzer »%s« fehlgeschlagen"
+
+#: libpq/auth-oauth.c:681
+#, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "Validator konnte das bereitgestellte Token nicht autorisieren."
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "Validator hat keine Identität angegeben."
+
+#: libpq/auth-oauth.c:760
+#, c-format
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "%s-Modul »%s« muss das Symbol %s definieren"
+
+#: libpq/auth-oauth.c:773
+#, c-format
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "%s-Modul »%s«: magische Zahl stimmt nicht überein"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "Server hat magische Zahl 0x%08X, Modul hat 0x%08X."
+
+#: libpq/auth-oauth.c:784
+#, c-format
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "%s-Modul »%s« muss einen %s-Callback zur Verfügung stellen"
+
+#: libpq/auth-oauth.c:833
+#, c-format
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr "oauth_validator_libraries muss gesetzt sein für Authentifizierungsmethode \"%s\""
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:201
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "Zeile %d in Konfigurationsdatei »%s«"
+
+#: libpq/auth-oauth.c:867
+#, c-format
+msgid "authentication method \"oauth\" requires argument \"validator\" to be set when oauth_validator_libraries contains multiple options"
+msgstr "Authentifizierungsmethode »oauth« erfordert, dass das Argument »validator« gesetzt ist, wenn oauth_validator_libraries mehrere Optionen enthält"
+
+#: libpq/auth-oauth.c:882
+#, c-format
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "Validator »%s« ist nicht durch %s erlaubt"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "SASL-Antwort erwartet, Message-Typ %d empfangen"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
+#, c-format
+msgid "invalid SCRAM secret for user \"%s\""
+msgstr "ungültiges SCRAM-Geheimnis für Benutzer »%s«"
+
+#: libpq/auth-scram.c:302
+#, c-format
+msgid "User \"%s\" does not have a valid SCRAM secret."
+msgstr "Benutzer »%s« hat kein gültiges SCRAM-Geheimnis."
+
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
+#, c-format
+msgid "malformed SCRAM message"
+msgstr "fehlerhafte SCRAM-Nachricht"
+
+#: libpq/auth-scram.c:420
+#, c-format
+msgid "invalid SCRAM response"
+msgstr "ungültige SCRAM-Antwort"
+
+#: libpq/auth-scram.c:421
+#, c-format
+msgid "Nonce does not match."
+msgstr "Nonce stimmt nicht überein."
+
+#: libpq/auth-scram.c:504
+#, c-format
+msgid "could not generate random salt"
+msgstr "konnte zufälliges Salt nicht erzeugen"
+
+#: libpq/auth-scram.c:752
+#, c-format
+msgid "Expected attribute \"%c\" but found \"%s\"."
+msgstr "Attribut »%c« wurde erwartet, aber »%s« wurde gefunden."
+
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
+#, c-format
+msgid "Expected character \"=\" for attribute \"%c\"."
+msgstr "Zeichen »=« für Attribut »%c« wurde erwartet."
+
+#: libpq/auth-scram.c:865
+#, c-format
+msgid "Attribute expected, but found end of string."
+msgstr "Attribut wurde erwartet, aber Ende der Zeichenkette wurde gefunden."
+
+#: libpq/auth-scram.c:878
+#, c-format
+msgid "Attribute expected, but found invalid character \"%s\"."
+msgstr "Attribut wurde erwartet, aber ungültiges Zeichen »%s« wurde gefunden."
+
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
+#, c-format
+msgid "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not include channel binding data."
+msgstr "Der Client hat SCRAM-SHA-256-PLUS gewählt, aber die SCRAM-Nachricht enthielt keine Channel-Binding-Daten."
+
+#: libpq/auth-scram.c:1024
+#, c-format
+msgid "SCRAM channel binding negotiation error"
+msgstr "Fehler bei der Aushandlung von SCRAM-Channel-Binding"
+
+#: libpq/auth-scram.c:1025
+#, c-format
+msgid "The client supports SCRAM channel binding but thinks the server does not.  However, this server does support channel binding."
+msgstr "Der Client unterstützt SCRAM-Channel-Binding aber glaubt dass der Server es nicht tut. Dieser Server unterstützt jedoch Channel-Binding."
+
+#: libpq/auth-scram.c:1047
+#, c-format
+msgid "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM message includes channel binding data."
+msgstr "Der Client hat SCRAM-SHA-256 ohne Channel-Binding gewählt, aber die SCRAM-Nachricht enthält Channel-Binding-Daten."
+
+#: libpq/auth-scram.c:1058
+#, c-format
+msgid "unsupported SCRAM channel-binding type \"%s\""
+msgstr "nicht unterstützter SCRAM-Channel-Binding-Typ »%s«"
 
 #: libpq/auth-scram.c:1096
 #, c-format
+msgid "client requires an unsupported SCRAM extension"
+msgstr "Client verlangt eine nicht unterstützte SCRAM-Erweiterung"
+
+#: libpq/auth-scram.c:1110
+#, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "nicht druckbare Zeichen in SCRAM-Nonce"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "konnte zufällige Nonce nicht erzeugen"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "konnte zufällige Nonce nicht kodieren"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
 msgstr "SCRAM-Channel-Binding-Prüfung fehlgeschlagen"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr "unerwartetes SCRAM-Channel-Binding-Attribut in »client-final-message«"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "Fehlerhafter Proof in »client-final-message«."
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "Müll am Ende der »client-final-message« gefunden."
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "Authentifizierung für Benutzer »%s« fehlgeschlagen: Host abgelehnt"
 
-#: libpq/auth.c:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "»trust«-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "Ident-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "Peer-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "Passwort-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "GSSAPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "SSPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "PAM-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "BSD-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "LDAP-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "RADIUS-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "Authentifizierung für Benutzer »%s« fehlgeschlagen: ungültige Authentifizierungsmethode"
 
-#: libpq/auth.c:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "Verbindung stimmte mit Datei »%s« Zeile %d überein: »%s«"
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "Authentifizierungsbezeichner mehrmals gesetzt"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "vorheriger Bezeichner: »%s«; neuer Bezeichner: »%s«"
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "Verbindung authentifiziert: Identität=»%s« Methode=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "Client-Zertifikate können nur überprüft werden, wenn Wurzelzertifikat verfügbar ist"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "Verbindung erfordert ein gültiges Client-Zertifikat"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "GSS-Verschlüsselung"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "keine Verschlüsselung"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, 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"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, 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"
 
-#: libpq/auth.c:506
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt überein."
 
-#: libpq/auth.c:509
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung nicht geprüft."
 
-#: libpq/auth.c:512
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt nicht überein."
 
-#: libpq/auth.c:515
+#: libpq/auth.c:512
 #, 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."
 
-#: libpq/auth.c:520
+#: libpq/auth.c:517
 #, 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."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, 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"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "kein pg_hba.conf-Eintrag für Host »%s«, Benutzer »%s«, Datenbank »%s«, %s"
 
-#: libpq/auth.c:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "Verbindung authentifiziert: Benutzer=»%s« Methode=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "Passwort-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "ungültige Größe des Passwortpakets"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "Client gab leeres Passwort zurück"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "konnte zufälliges MD5-Salt nicht erzeugen"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "konnte Umgebung nicht setzen: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "GSS-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "Annahme des GSS-Sicherheitskontexts fehlgeschlagen"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "Abfrage des GSS-Benutzernamens fehlgeschlagen"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "konnte SSPI-Credentials nicht erhalten"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "SSPI-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "konnte SSPI-Sicherheitskontext nicht akzeptieren"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "konnte kein Token vom SSPI-Sicherheitskontext erhalten"
 
-#: libpq/auth.c:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "konnte Namen nicht umwandeln"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "Realm-Name zu lang"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "umgewandelter Account-Name zu lang"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "konnte Socket für Ident-Verbindung nicht erzeugen: %m"
 
-#: libpq/auth.c:1756
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "konnte nicht mit lokaler Adresse »%s« verbinden: %m"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "konnte nicht mit Ident-Server auf Adresse »%s«, Port %s verbinden: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "konnte Anfrage an Ident-Server auf Adresse »%s«, Port %s nicht senden: %m"
 
-#: libpq/auth.c:1807
+#: libpq/auth.c:1808
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "konnte Antwort von Ident-Server auf Adresse »%s«, Port %s nicht empfangen: %m"
 
-#: libpq/auth.c:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "ungültig formatierte Antwort vom Ident-Server: »%s«"
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "Peer-Authentifizierung wird auf dieser Plattform nicht unterstützt"
 
-#: libpq/auth.c:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "konnte lokale Benutzer-ID %ld nicht nachschlagen: %m"
+
+#: libpq/auth.c:1894
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "konnte lokale Benutzer-ID %ld nicht nachschlagen: %s"
+msgid "local user with ID %ld does not exist"
+msgstr "lokaler Benutzer mit ID %ld existiert nicht"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "Fehler von der unteren PAM-Ebene: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "nicht unterstützte PAM-Conversation: %d/»%s«"
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht erzeugen: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) fehlgeschlagen: %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST) fehlgeschlagen: %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) fehlgeschlagen: %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate fehlgeschlagen: %s"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt fehlgeschlagen: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht freigeben: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "konnte LDAP nicht initialisieren: Fehlercode %d"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "konnte keinen Domain-Namen aus ldapbasedn herauslesen"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "LDAP-Authentifizierung konnte keine DNS-SRV-Einträge für »%s« finden"
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "Geben Sie einen LDAP-Servernamen explizit an."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "konnte LDAP nicht initialisieren: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "ldaps wird mit dieser LDAP-Bibliothek nicht unterstützt"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "konnte LDAP nicht initialisieren: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "konnte LDAP-Protokollversion nicht setzen: %s"
 
-#: libpq/auth.c:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "konnte LDAP-TLS-Sitzung nicht starten: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP-Server nicht angegeben, und kein ldapbasedn"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-Server nicht angegeben"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "ungültiges Zeichen im Benutzernamen für LDAP-Authentifizierung"
 
-#: libpq/auth.c:2534
+#: libpq/auth.c:2540
 #, 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"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2570
 #, 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"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "LDAP-Benutzer »%s« existiert nicht"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, 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."
 
-#: libpq/auth.c:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "LDAP-Benutzer »%s« ist nicht eindeutig"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, 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."
 
-#: libpq/auth.c:2606
+#: libpq/auth.c:2612
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "konnte DN fũr den ersten Treffer für »%s« auf Server »%s« nicht lesen: %s"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2639
 #, 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"
 
-#: libpq/auth.c:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "LDAP-Diagnostik: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, 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"
 
-#: libpq/auth.c:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen: konnte Subject-DN nicht abfragen"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "Zertifikatüberprüfung (clientcert=verify=full) für Benutzer »%s« fehlgeschlagen: DN stimmt nicht überein"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "Zertifikatüberprüfung (clientcert=verify=full) für Benutzer »%s« fehlgeschlagen: CN stimmt nicht überein"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-Server nicht angegeben"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS-Geheimnis nicht angegeben"
 
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "RADIUS-Authentifizierung unterstützt keine Passwörter länger als %d Zeichen"
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "konnte RADIUS-Servername »%s« nicht in Adresse übersetzen: %s"
 
-#: libpq/auth.c:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "konnte zufälligen Verschlüsselungsvektor nicht erzeugen"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "konnte MD5-Verschlüsselung des Passworts nicht durchführen: %s"
 
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "konnte RADIUS-Socket nicht erstellen: %m"
 
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "konnte lokales RADIUS-Socket nicht binden: %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "konnte RADIUS-Paket nicht senden: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "Zeitüberschreitung beim Warten auf RADIUS-Antwort von %s"
 
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "konnte Status des RADIUS-Sockets nicht prüfen: %m"
 
-#: libpq/auth.c:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "konnte RADIUS-Antwort nicht lesen: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "RADIUS-Antwort von %s wurde von falschem Port gesendet: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "RADIUS-Antwort von %s zu kurz: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "RADIUS-Antwort von %s hat verfälschte Länge: %d (tatsächliche Länge %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "RADIUS-Antwort von %s unterscheidet sich von Anfrage: %d (sollte %d sein)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "konnte MD5-Verschlüsselung des empfangenen Pakets nicht durchführen: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "RADIUS-Antwort von %s hat falsche MD5-Signatur"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "RADIUS-Antwort von %s hat ungültigen Code (%d) für Benutzer »%s«"
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "ungültiger Large-Object-Deskriptor: %d"
@@ -15644,7 +16168,7 @@ msgstr "ungültiger Large-Object-Deskriptor: %d"
 msgid "large object descriptor %d was not opened for reading"
 msgstr "Large-Objekt-Deskriptor %d wurde nicht zum Lesen geöffnet"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "Large-Objekt-Deskriptor %d wurde nicht zum Schreiben geöffnet"
@@ -15659,32 +16183,32 @@ msgstr "Ergebnis von lo_lseek ist außerhalb des gültigen Bereichs für Large-O
 msgid "lo_tell result out of range for large-object descriptor %d"
 msgstr "Ergebnis von lo_tell ist außerhalb des gültigen Bereichs für Large-Object-Deskriptor: %d"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "konnte Serverdatei »%s« nicht öffnen: %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "konnte Serverdatei »%s« nicht lesen: %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "konnte Serverdatei »%s« nicht erstellen: %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "konnte Serverdatei »%s« nicht schreiben: %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "Large-Object-Leseaufforderung ist zu groß"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "verlangte Länge darf nicht negativ sein"
@@ -15719,819 +16243,837 @@ msgstr "private Schlüsseldatei »%s« erlaubt Zugriff von Gruppe oder Welt"
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "Dateirechte müssen u=rw (0600) oder weniger sein, wenn der Eigentümer der Datenbankbenutzer ist, oder u=rw,g=r (0640) oder weniger, wenn der Eigentümer »root« ist."
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI-Wrap-Fehler"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "ausgehende GSSAPI-Nachricht würde keine Vertraulichkeit verwenden"
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "Server versuchte übergroßes GSSAPI-Paket zu senden (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "übergroßes GSSAPI-Paket vom Client gesendet (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-Unwrap-Fehler"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "eingehende GSSAPI-Nachricht verwendete keine Vertraulichkeit"
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "übergroßes GSSAPI-Paket vom Client gesendet (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "konnte GSSAPI-Sicherheitskontext nicht akzeptieren"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-Fehler bei der Größenprüfung"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "konnte Serverzertifikatsdatei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid "private key file \"%s\" cannot be reloaded because it requires a passphrase"
 msgstr "private Schlüsseldatei »%s« kann nicht neu geladen werden, weil sie eine Passphrase benötigt"
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "Überprüfung des privaten Schlüssels fehlgeschlagen: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "»%s«-Wert »%s« wird von dieser Installation nicht unterstützt"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "konnte minimale SSL-Protokollversion nicht setzen"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "konnte maximale SSL-Protokollversion nicht setzen"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "konnte SSL-Protokollversionsbereich nicht setzen"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "»%s« kann nicht höher als »%s« sein"
 
-#: libpq/be-secure-openssl.c:296
+#: libpq/be-secure-openssl.c:295
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "konnte Cipher-Liste nicht setzen (keine gültigen Ciphers verfügbar)"
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr "konnte TLSv1.2-Cipher-Liste nicht setzen (keine gültigen Ciphers verfügbar)"
 
-#: libpq/be-secure-openssl.c:316
+#: libpq/be-secure-openssl.c:310
+#, c-format
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr "konnte TLSv1.3-Cipher-Suites nicht setzen (keine gültigen Ciphers verfügbar)"
+
+#: libpq/be-secure-openssl.c:331
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "konnte Root-Zertifikat-Datei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:365
+#: libpq/be-secure-openssl.c:380
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "konnte SSL-Certificate-Revocation-List-Datei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:373
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr "konnte SSL-Certificate-Revocation-List-Verzeichnis »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:381
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\" or directory \"%s\": %s"
 msgstr "konnte SSL-Certificate-Revocation-List-Datei »%s« oder -Verzeichnis »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:439
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr "konnte SSL-Verbindung nicht initialisieren: SSL-Kontext nicht eingerichtet"
 
-#: libpq/be-secure-openssl.c:453
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht initialisieren: %s"
 
-#: libpq/be-secure-openssl.c:461
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "konnte SSL-Socket nicht setzen: %s"
 
-#: libpq/be-secure-openssl.c:517
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "konnte SSL-Verbindung nicht annehmen: %m"
 
-#: libpq/be-secure-openssl.c:521 libpq/be-secure-openssl.c:578
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "konnte SSL-Verbindung nicht annehmen: EOF entdeckt"
 
-#: libpq/be-secure-openssl.c:562
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht annehmen: %s"
 
-#: libpq/be-secure-openssl.c:566
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid "This may indicate that the client does not support any SSL protocol version between %s and %s."
 msgstr "Das zeigt möglicherweise an, dass der Client keine SSL-Protokollversion zwischen %s und %s unterstützt."
 
-#: libpq/be-secure-openssl.c:583 libpq/be-secure-openssl.c:798
-#: libpq/be-secure-openssl.c:868
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "unbekannter SSL-Fehlercode: %d"
 
-#: libpq/be-secure-openssl.c:611
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
-msgstr ""
+msgstr "SSL-Verbindungsanfrage mit unerwartetem ALPN-Protokoll erhalten"
 
-#: libpq/be-secure-openssl.c:655
+#: libpq/be-secure-openssl.c:670
 #, 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:701
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "Distinguished Name im SSL-Zertifikat enthält Null-Byte"
 
-#: libpq/be-secure-openssl.c:787 libpq/be-secure-openssl.c:852
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-Fehler: %s"
 
-#: libpq/be-secure-openssl.c:1027
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "konnte DH-Parameterdatei »%s« nicht öffnen: %m"
 
-#: libpq/be-secure-openssl.c:1039
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "konnte DH-Parameterdatei nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:1049
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "ungültige DH-Parameter: %s"
 
-#: libpq/be-secure-openssl.c:1058
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "ungültige DH-Parameter: p ist keine Primzahl"
 
-#: libpq/be-secure-openssl.c:1067
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr "ungültige DH-Parameter: weder geeigneter Generator noch sichere Primzahl"
 
-#: libpq/be-secure-openssl.c:1203
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "Überprüfung des Client-Zertifikats ist auf Tiefe %d fehlgeschlagen: %s."
 
-#: libpq/be-secure-openssl.c:1240
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid "Failed certificate data (unverified): subject \"%s\", serial number %s, issuer \"%s\"."
 msgstr "Daten des fehlgeschlagenen Zertifikats (nicht verifiziert): Subject »%s«, Seriennummer %s, Aussteller »%s«."
 
-#: libpq/be-secure-openssl.c:1241
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "unbekannt"
 
-#: libpq/be-secure-openssl.c:1378
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: konnte DH-Parameter nicht laden"
 
-#: libpq/be-secure-openssl.c:1386
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: konnte DH-Parameter nicht setzen: %s"
 
-#: libpq/be-secure-openssl.c:1413
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: unbekannter Kurvenname: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "konnte die in ssl_groups angegebenen Gruppennamen nicht setzen: %s"
+
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "Keine gültigen Gruppen gefunden"
 
-#: libpq/be-secure-openssl.c:1422
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: konnte Schlüssel nicht erzeugen"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "Stellen Sie sicher, dass jeder Gruppenname richtig geschrieben ist und von der installierten Version von OpenSSL unterstützt wird."
 
-#: libpq/be-secure-openssl.c:1450
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: libpq/be-secure-openssl.c:1467
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
 
-#: libpq/be-secure-openssl.c:1624
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "konnte BIO nicht erzeugen"
 
-#: libpq/be-secure-openssl.c:1634
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "konnte NID für ASN1_OBJECT-Objekt nicht ermitteln"
 
-#: libpq/be-secure-openssl.c:1642
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "konnte NID %d nicht in eine ASN1_OBJECT-Struktur umwandeln"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "Rolle »%s« existiert nicht."
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "Benutzer »%s« hat kein Passwort zugewiesen."
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "Benutzer »%s« hat ein abgelaufenes Passwort."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, c-format
+msgid "encrypted password is too long"
+msgstr "verschlüsseltes Passwort ist zu lang"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "Verschlüsselte Passwörter dürfen nicht länger als %d Bytes sein."
+
+#: libpq/crypt.c:183
+#, c-format
+msgid "setting an MD5-encrypted password"
+msgstr "ein MD5-verschlüsseltes Passwort wird gesetzt"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid "MD5 password support is deprecated and will be removed in a future release of PostgreSQL."
+msgstr "Unterstützung für MD5-Passwörter ist veraltet und wird in einer zukünftigen Version von PostgreSQL entfernt werden."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid "Refer to the PostgreSQL documentation for details about migrating to another password type."
+msgstr "Lesen Sie in der PostgreSQL-Dokumentation, wie man zu einem anderen Passworttyp migrieren kann."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr "Benutzer »%s« hat ein Passwort, das nicht mit MD5-Authentifizierung verwendet werden kann."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "Passwort stimmt nicht überein für Benutzer »%s«."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "Passwort von Benutzer »%s« hat unbekanntes Format."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "ungültiger regulärer Ausdruck »%s«: %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "Zeile %d in Konfigurationsdatei »%s«"
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "fehlende Authentifizierungsdatei »%s« wird übersprungen"
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "konnte Datei »%s« nicht öffnen: maximale Verschachtelungstiefe überschritten"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "Fehler beim Aufzählen der Netzwerkschnittstellen: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "Authentifizierungsoption »%s« ist nur gültig für Authentifizierungsmethoden %s"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "Authentifizierungsmethode »%s« benötigt Argument »%s«"
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "fehlender Eintrag am Ende der Zeile"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "mehrere Werte in Ident-Feld"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "mehrere Werte angegeben für Verbindungstyp"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "Geben Sie genau einen Verbindungstyp pro Zeile an."
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "hostssl-Eintrag kann nicht angewendet werden, weil SSL deaktiviert ist"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
 msgstr "Setzen Sie »ssl = on« in postgresql.conf."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr "hostssl-Eintrag kann nicht angewendet werden, weil SSL von dieser Installation nicht unterstützt wird"
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid "hostgssenc record cannot match because GSSAPI is not supported by this build"
 msgstr "hostgssenc-Eintrag kann nicht angewendet werden, weil GSSAPI von dieser Installation nicht unterstützt wird"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "ungültiger Verbindungstyp »%s«"
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "Zeilenende vor Datenbankangabe"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "Zeilenende vor Rollenangabe"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "Zeilenende vor IP-Adressangabe"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "mehrere Werte für Hostadresse angegeben"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "Geben Sie einen Adressbereich pro Zeile an."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "ungültige IP-Adresse »%s«: %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, 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«"
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "ungültige CIDR-Maske in Adresse »%s«"
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "Zeilenende vor Netzmaskenangabe"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr "Geben Sie einen Adressbereich in CIDR-Schreibweise oder eine separate Netzmaske an."
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "mehrere Werte für Netzmaske angegeben"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "ungültige IP-Maske »%s«: %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "IP-Adresse und -Maske passen nicht zusammen"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "Zeilenende vor Authentifizierungsmethode"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "mehrere Werte für Authentifizierungstyp angegeben"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "Geben Sie genau einen Authentifizierungstyp pro Zeile an."
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "ungültige Authentifizierungsmethode »%s«"
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr "ungültige Authentifizierungsmethode »%s«: von dieser Installation nicht unterstützt"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "gssapi-Authentifizierung wird auf lokalen Sockets nicht unterstützt"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "peer-Authentifizierung wird nur auf lokalen Sockets unterstützt"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "cert-Authentifizierung wird nur auf »hostssl«-Verbindungen unterstützt"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "Authentifizierungsoption nicht im Format name=wert: %s"
 
-#: libpq/hba.c:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"
-msgstr "ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter oder ldapurl kann nicht zusammen mit ldapprefix verwendet werden"
+msgid "cannot mix options for simple bind and search+bind modes"
+msgstr "Optionen für den Simple-Bind-Modus und den Search+Bind-Modus können nicht gemischt werden"
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, 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«"
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "ldapsearchattribute kann nicht zusammen mit ldapsearchfilter verwendet werden"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "List der RADIUS-Server darf nicht leer sein"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "Liste der RADIUS-Geheimnisse darf nicht leer sein"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid "the number of RADIUS secrets (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "die Anzahl der RADIUS-Geheimnisse (%d) muss 1 oder gleich der Anzahl der RADIUS-Server (%d) sein"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid "the number of RADIUS ports (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "die Anzahl der RADIUS-Ports (%d) muss 1 oder gleich der Anzahl der RADIUS-Server (%d) sein"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid "the number of RADIUS identifiers (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "die Anzahl der RADIUS-Bezeichner (%d) muss 1 oder gleich der Anzahl der RADIUS-Server (%d) sein"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi und cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s kann nicht in Kombination mit %s verwendet werden"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert und oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert kann nur für »hostssl«-Zeilen konfiguriert werden"
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
 msgstr "clientcert akzeptiert »verify-full« nur, wenn »cert«-Authentifizierung verwendet wird"
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "ungültiger Wert für clientcert: »%s«"
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname kann nur für »hostssl«-Zeilen konfiguriert werden"
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "ungültiger Wert für clientname: »%s«"
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "konnte LDAP-URL »%s« nicht interpretieren: %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "nicht unterstütztes LDAP-URL-Schema: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "LDAP-URLs werden auf dieser Plattform nicht unterstützt"
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "ungültiger ldapscheme-Wert: »%s«"
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "ungültige LDAP-Portnummer: »%s«"
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi und sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "konnte RADIUS-Serverliste »%s« nicht parsen"
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "konnte RADIUS-Portliste »%s« nicht parsen"
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "ungültige RADIUS-Portnummer: »%s«"
 
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "konnte RADIUS-Geheimnisliste »%s« nicht parsen"
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "konnte RADIUS-Bezeichnerliste »%s« nicht parsen"
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "unbekannter Authentifizierungsoptionsname: »%s«"
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "Konfigurationsdatei »%s« enthält keine Einträge"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "Suche nach regulärem Ausdruck für »%s« fehlgeschlagen: %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, 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"
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "angegebener Benutzername (%s) und authentifizierter Benutzername (%s) stimmen nicht überein"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr "kein passender Eintrag in Usermap »%s« für Benutzer »%s«, authentifiziert als »%s«"
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "%s(%s) fehlgeschlagen: %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, 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)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, 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"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "konnte Dienst »%s« nicht in Adresse übersetzen: %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "konnte nicht an alle verlangten Adressen binden: MAXLISTEN (%d) überschritten"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "unbekannte Adressfamilie %d"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "konnte %s-Socket für Adresse »%s« nicht erzeugen: %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "%s(%s) für %s-Adresse »%s« fehlgeschlagen: %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "konnte %s-Adresse »%s« nicht binden: %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "Läuft bereits ein anderer Postmaster auf Port %d?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr "Läuft bereits ein anderer Postmaster auf Port %d? Wenn nicht, warten Sie einige Sekunden und versuchen Sie erneut."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "konnte nicht auf %s-Adresse »%s« hören: %m"
 
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "erwarte Verbindungen auf Unix-Socket »%s«"
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "erwarte Verbindungen auf %s-Adresse »%s«, Port %d"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "Gruppe »%s« existiert nicht"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "konnte Gruppe von Datei »%s« nicht setzen: %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Datei »%s« nicht setzen: %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "konnte neue Verbindung nicht akzeptieren: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "es besteht keine Client-Verbindung"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "konnte Daten vom Client nicht empfangen: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4446
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4504
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "Verbindung wird abgebrochen, weil Protokollsynchronisierung verloren wurde"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "unerwartetes EOF im Message-Längenwort"
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "ungültige Message-Länge"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "unvollständige Message vom Client"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "konnte Daten nicht an den Client senden: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) fehlgeschlagen: Fehlercode %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "Setzen der Keepalive-Idle-Zeit wird nicht unterstützt"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) nicht unterstützt"
@@ -16542,7 +17084,7 @@ msgid "no data left in message"
 msgstr "keine Daten in Message übrig"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:874 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -16558,12 +17100,12 @@ msgstr "ungültige Zeichenkette in Message"
 msgid "invalid message format"
 msgstr "ungültiges Message-Format"
 
-#: main/main.c:234
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup fehlgeschlagen: %d\n"
 
-#: main/main.c:322
+#: main/main.c:386
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -16572,7 +17114,7 @@ msgstr ""
 "%s ist der PostgreSQL-Server.\n"
 "\n"
 
-#: main/main.c:323
+#: main/main.c:387
 #, c-format
 msgid ""
 "Usage:\n"
@@ -16583,107 +17125,107 @@ msgstr ""
 "  %s [OPTION]...\n"
 "\n"
 
-#: main/main.c:324
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: main/main.c:325
+#: main/main.c:389
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B ZAHL            Anzahl der geteilten Puffer\n"
 
-#: main/main.c:326
+#: main/main.c:390
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NAME=WERT       setze Konfigurationsparameter\n"
 
-#: main/main.c:327
+#: main/main.c:391
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NAME            Wert des Konfigurationsparameters ausgeben, dann beenden\n"
 
-#: main/main.c:328
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             Debug-Level\n"
 
-#: main/main.c:329
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D VERZEICHNIS     Datenbankverzeichnis\n"
 
-#: main/main.c:330
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 verwende europäisches Datumseingabeformat (DMY)\n"
 
-#: main/main.c:331
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 »fsync« ausschalten\n"
 
-#: main/main.c:332
+#: main/main.c:396
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h HOSTNAME        horche auf Hostname oder IP-Adresse\n"
 
-#: main/main.c:333
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr "  -i                 ermögliche TCP/IP-Verbindungen (veraltet)\n"
 
-#: main/main.c:334
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k VERZEICHNIS     Ort der Unix-Domain-Socket\n"
 
-#: main/main.c:336
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 ermögliche SSL-Verbindungen\n"
 
-#: main/main.c:338
+#: main/main.c:402
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N ZAHL            Anzahl der erlaubten Verbindungen\n"
 
-#: main/main.c:339
+#: main/main.c:403
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            auf dieser Portnummer horchen\n"
 
-#: main/main.c:340
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 zeige Statistiken nach jeder Anfrage\n"
 
-#: main/main.c:341
+#: main/main.c:405
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S ZAHL            setze Speicher für Sortiervorgänge (in kB)\n"
 
-#: main/main.c:342
+#: main/main.c:406
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      Versionsinformationen anzeigen, dann beenden\n"
 
-#: main/main.c:343
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NAME=WERT        setze Konfigurationsparameter\n"
 
-#: main/main.c:344
+#: main/main.c:408
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  zeige Konfigurationsparameter und beende\n"
 
-#: main/main.c:345
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         diese Hilfe anzeigen, dann beenden\n"
 
-#: main/main.c:347
+#: main/main.c:411
 #, c-format
 msgid ""
 "\n"
@@ -16692,37 +17234,37 @@ msgstr ""
 "\n"
 "Entwickleroptionen:\n"
 
-#: main/main.c:348
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h verbiete Verwendung einiger Plantypen\n"
 
-#: main/main.c:349
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 erlaube Änderungen an Systemtabellenstruktur\n"
 
-#: main/main.c:350
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 schalte Systemindexe aus\n"
 
-#: main/main.c:351
+#: main/main.c:415
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        zeige Zeitmessung nach jeder Anfrage\n"
 
-#: main/main.c:352
+#: main/main.c:416
 #, c-format
 msgid "  -T                 send SIGABRT to all backend processes if one dies\n"
 msgstr "  -T                 SIGABRT an alle Backend-Prozesse senden wenn einer stirbt\n"
 
-#: main/main.c:353
+#: main/main.c:417
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr "  -W ZAHL            warte ZAHL Sekunden, um Debugger starten zu können\n"
 
-#: main/main.c:355
+#: main/main.c:419
 #, c-format
 msgid ""
 "\n"
@@ -16731,39 +17273,39 @@ msgstr ""
 "\n"
 "Optionen für Einzelbenutzermodus:\n"
 
-#: main/main.c:356
+#: main/main.c:420
 #, c-format
 msgid "  --single           selects single-user mode (must be first argument)\n"
 msgstr "  --single           wählt den Einzelbenutzermodus (muss erstes Argument sein)\n"
 
-#: main/main.c:357
+#: main/main.c:421
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  DBNAME             Datenbankname (Vorgabe: Benutzername)\n"
 
-#: main/main.c:358
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             Debug-Level setzen\n"
 
-#: main/main.c:359
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 gebe Befehl vor der Ausführung aus\n"
 
-#: main/main.c:360
+#: main/main.c:424
 #, c-format
 msgid "  -j                 do not use newline as interactive query delimiter\n"
 msgstr ""
 "  -j                 verwende Zeilenende nicht als Anfrageende im interaktiven\n"
 "                     Modus\n"
 
-#: main/main.c:361 main/main.c:367
+#: main/main.c:425 main/main.c:431
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r DATEINAME       sende stdout und stderr in genannte Datei\n"
 
-#: main/main.c:363
+#: main/main.c:427
 #, c-format
 msgid ""
 "\n"
@@ -16772,22 +17314,22 @@ msgstr ""
 "\n"
 "Optionen für Bootstrap-Modus:\n"
 
-#: main/main.c:364
+#: main/main.c:428
 #, c-format
 msgid "  --boot             selects bootstrapping mode (must be first argument)\n"
 msgstr "  --boot             wählt den Bootstrap-Modus (muss erstes Argument sein)\n"
 
-#: main/main.c:365
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr "  --check            wählt den Check-Modus (muss erstes Argument sein)\n"
 
-#: main/main.c:366
+#: main/main.c:430
 #, c-format
 msgid "  DBNAME             database name (mandatory argument in bootstrapping mode)\n"
 msgstr "  DBNAME             Datenbankname (Pflichtangabe im Bootstrap-Modus)\n"
 
-#: main/main.c:369
+#: main/main.c:433
 #, c-format
 msgid ""
 "\n"
@@ -16804,12 +17346,12 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <%s>.\n"
 
-#: main/main.c:373
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s Homepage: <%s>\n"
 
-#: main/main.c:384
+#: main/main.c:448
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -16823,12 +17365,12 @@ msgstr ""
 "Dokumentation finden Sie weitere Informationen darüber, wie der\n"
 "Server richtig gestartet wird.\n"
 
-#: main/main.c:401
+#: main/main.c:465
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: reelle und effektive Benutzer-IDs müssen übereinstimmen\n"
 
-#: main/main.c:408
+#: main/main.c:472
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -16853,15 +17395,15 @@ msgstr "erweiterbarer Knotentyp »%s« existiert bereits"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "ExtensibleNodeMethods »%s« wurde nicht registriert"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2296
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "Relation »%s« hat keinen zusammengesetzten Typ"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2567
-#: parser/parse_coerce.c:2705 parser/parse_coerce.c:2752
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1959 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "konnte Arraytyp für Datentyp %s nicht finden"
@@ -16876,769 +17418,805 @@ msgstr "Portal »%s« mit Parametern: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "unbenanntes Portal mit Parametern: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN wird nur für Merge- oder Hash-Verbund-fähige Verbundbedingungen unterstützt"
 
-#: optimizer/plan/createplan.c:7162 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1695
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1725
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "MERGE kann für Relation »%s« nicht ausgeführt werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 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:1380 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1700 parser/analyze.c:1823 parser/analyze.c:2082
+#: parser/analyze.c:3412
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s ist nicht in UNION/INTERSECT/EXCEPT erlaubt"
 
-#: optimizer/plan/planner.c:2121 optimizer/plan/planner.c:4107
+#: optimizer/plan/planner.c:2446 optimizer/plan/planner.c:4332
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "konnte GROUP BY nicht implementieren"
 
-#: optimizer/plan/planner.c:2122 optimizer/plan/planner.c:4108
-#: optimizer/plan/planner.c:4789 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2447 optimizer/plan/planner.c:4333
+#: optimizer/plan/planner.c:5014 optimizer/prep/prepunion.c:1073
 #, 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:4788
+#: optimizer/plan/planner.c:5013
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "konnte DISTINCT nicht implementieren"
 
-#: optimizer/plan/planner.c:6133
+#: optimizer/plan/planner.c:6510
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "konnte PARTITION BY für Fenster nicht implementieren"
 
-#: optimizer/plan/planner.c:6134
+#: optimizer/plan/planner.c:6511
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Fensterpartitionierungsspalten müssen sortierbare Datentypen haben."
 
-#: optimizer/plan/planner.c:6138
+#: optimizer/plan/planner.c:6515
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "konnte ORDER BY für Fenster nicht implementieren"
 
-#: optimizer/plan/planner.c:6139
+#: optimizer/plan/planner.c:6516
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Fenstersortierspalten müssen sortierbare Datentypen haben."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "konnte rekursive UNION nicht implementieren"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "Alle Spaltendatentypen müssen hashbar sein."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "konnte %s nicht implementieren"
 
-#: optimizer/util/clauses.c:4951
+#: optimizer/util/appendinfo.c:165
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "Attribut »%s« von Relation »%s« stimmt nicht mit dem Typ der Elterntabelle überein"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr "Attribut »%s« von Relation »%s« stimmt nicht mit der Sortierfolge der Elterntabelle überein"
+
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "SQL-Funktion »%s« beim Inlining"
 
-#: optimizer/util/plancat.c:152
+#: optimizer/util/plancat.c:154
 #, 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:756
+#: optimizer/util/plancat.c:776
 #, c-format
 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:773
+#: optimizer/util/plancat.c:793
 #, 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:823
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE nicht unterstützt mit Exclusion-Constraints"
 
-#: optimizer/util/plancat.c:933
+#: optimizer/util/plancat.c:960
 #, 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:824 parser/analyze.c:1550
+#: parser/analyze.c:582 parser/analyze.c:2501
+#, c-format
+msgid "WHERE CURRENT OF on a view is not implemented"
+msgstr "WHERE CURRENT OF mit einer Sicht ist nicht implementiert"
+
+#: parser/analyze.c:877 parser/analyze.c:1602
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VALUES-Listen müssen alle die gleiche Länge haben"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1079
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT hat mehr Ausdrücke als Zielspalten"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1097
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT hat mehr Zielspalten als Ausdrücke"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1101
 #, c-format
 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:1357 parser/analyze.c:1744
+#: parser/analyze.c:1409 parser/analyze.c:1796
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO ist hier nicht erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1725 parser/analyze.c:3644
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s kann nicht auf VALUES angewendet werden"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1963
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "ungültige ORDER-BY-Klausel mit UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1964
 #, 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:1913
+#: parser/analyze.c:1965
 #, 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:2019
+#: parser/analyze.c:2072
 #, 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:2091
+#: parser/analyze.c:2144
 #, 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:2178
+#: parser/analyze.c:2231
 #, 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:2535
+#: parser/analyze.c:2596
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "SET-Zielspalten können nicht mit dem Relationsnamen qualifiziert werden."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2684 parser/analyze.c:2694
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s kann nicht mehrmals angegeben werden"
+
+#: parser/analyze.c:2706 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "Tabellenname »%s« mehrmals angegeben"
+
+#: parser/analyze.c:2754
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING muss mindestens eine Spalte haben"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2856
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "Quelle der Wertzuweisung hat %d Spalte zurückgegeben"
 msgstr[1] "Quelle der Wertzuweisung hat %d Spalten zurückgegeben"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2917
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "Variable »%s« hat Typ %s, aber der Ausdruck hat Typ %s"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3043 parser/analyze.c:3051
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "%s und %s können nicht beide angegeben werden"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3071
 #, 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:2914
+#: parser/analyze.c:3079
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s wird nicht unterstützt"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3082
 #, 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:2925
+#: parser/analyze.c:3090
 #, 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:2936
+#: parser/analyze.c:3101
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s ist nicht gültig"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3104
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Insensitive Cursor müssen READ ONLY sein."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3198
 #, 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:3043
+#: parser/analyze.c:3208
 #, 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:3053
+#: parser/analyze.c:3218
 #, 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:3065
+#: parser/analyze.c:3230
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "materialisierte Sichten können nicht ungeloggt sein"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3254
+#: parser/analyze.c:3419
 #, 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:3261
+#: parser/analyze.c:3426
 #, 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:3268
+#: parser/analyze.c:3433
 #, 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:3275
+#: parser/analyze.c:3440
 #, 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:3282
+#: parser/analyze.c:3447
 #, 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:3289
+#: parser/analyze.c:3454
 #, 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:3388
+#: parser/analyze.c:3553
 #, 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:3452
+#: parser/analyze.c:3617
 #, 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:3461
+#: parser/analyze.c:3626
 #, 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:3470
+#: parser/analyze.c:3635
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s kann nicht auf eine Tabellenfunktion angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3653
 #, 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:3497
+#: parser/analyze.c:3662
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s kann nicht auf einen benannten Tupelstore angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3682
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "Relation »%s« in %s nicht in der FROM-Klausel gefunden"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
-msgstr "konnte keine Sortieroperator für Typ %s ermitteln"
+msgstr "konnte keinen Sortieroperator für Typ %s ermitteln"
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Aggregatfunktionen mit DISTINCT müssen ihre Eingaben sortieren können."
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING muss weniger als 32 Argumente haben"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "Aggregatfunktionen sind in JOIN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:375
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "Gruppieroperationen sind in JOIN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:387
+#: parser/parse_agg.c:394
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "Aggregatfunktionen sind nicht in der FROM-Klausel ihrer eigenen Anfrageebene erlaubt"
 
-#: parser/parse_agg.c:389
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "Gruppieroperationen sind nicht in der FROM-Klausel ihrer eigenen Anfrageebene erlaubt"
 
-#: parser/parse_agg.c:394
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "Aggregatfunktionen sind in Funktionen in FROM nicht erlaubt"
 
-#: parser/parse_agg.c:396
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "Gruppieroperationen sind in Funktionen in FROM nicht erlaubt"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "Aggregatfunktionen sind in Policy-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:406
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "Gruppieroperationen sind in Policy-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:423
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "Aggregatfunktionen sind in der Fenster-RANGE-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:425
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "Gruppieroperationen sind in der Fenster-RANGE-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:430
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "Aggregatfunktionen sind in der Fenster-ROWS-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:432
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "Gruppieroperationen sind in der Fenster-ROWS-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "Aggregatfunktionen sind in der Fenster-GROUPS-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:439
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "Gruppieroperationen sind in der Fenster-GROUPS-Klausel nicht erlaubt"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "Aggregatfunktionen sind in MERGE-WHEN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:454
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "Gruppieroperationen sind in MERGE-WHEN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "Aggregatfunktionen sind in Check-Constraints nicht erlaubt"
 
-#: parser/parse_agg.c:483
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "Gruppieroperationen sind in Check-Constraints nicht erlaubt"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "Aggregatfunktionen sind in DEFAULT-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:492
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "Gruppieroperationen sind in DEFAULT-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:497
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "Aggregatfunktionen sind in Indexausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:499
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "Gruppieroperationen sind in Indexausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:504
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "Aggregatfunktionen sind in Indexprädikaten nicht erlaubt"
 
-#: parser/parse_agg.c:506
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "Gruppieroperationen sind in Indexprädikaten nicht erlaubt"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "Aggregatfunktionen sind in Statistikausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:513
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "Gruppieroperationen sind in Statistikausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:518
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "Aggregatfunktionen sind in Umwandlungsausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:520
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "Gruppieroperationen sind in Umwandlungsausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:525
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "Aggregatfunktionen sind in EXECUTE-Parametern nicht erlaubt"
 
-#: parser/parse_agg.c:527
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "Gruppieroperationen sind in EXECUTE-Parametern nicht erlaubt"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "Aggregatfunktionen sind in der WHEN-Bedingung eines Triggers nicht erlaubt"
 
-#: parser/parse_agg.c:534
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "Gruppieroperationen sind in der WHEN-Bedingung eines Triggers nicht erlaubt"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "Aggregatfunktionen sind in Partitionsbegrenzungen nicht erlaubt"
 
-#: parser/parse_agg.c:541
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "Gruppieroperationen sind in Partitionsbegrenzungen nicht erlaubt"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "Aggregatfunktionen sind in Partitionierungsschlüsselausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:548
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "Gruppieroperationen sind in Partitionierungsschlüsselausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "Aggregatfunktionen sind in Spaltengenerierungsausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:556
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "Gruppieroperationen sind in Spaltengenerierungsausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "Aggregatfunktionen sind in CALL-Argumenten nicht erlaubt"
 
-#: parser/parse_agg.c:564
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "Gruppieroperationen sind in CALL-Argumenten nicht erlaubt"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "Aggregatfunktionen sind in COPY-FROM-WHERE-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:572
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "Gruppieroperationen sind in COPY-FROM-WHERE-Bedingungen nicht erlaubt"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:599 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "Aggregatfunktionen sind in %s nicht erlaubt"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:602
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "Gruppieroperationen sind in %s nicht erlaubt"
 
-#: parser/parse_agg.c:703
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "Aggregatfunktionen auf äußerer Ebene kann keine geschachtelte CTE verwenden"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "CTE »%s« ist unterhalb der semantischen Ebene der Aggregatfunktion."
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr "Aggregatfunktion auf äußerer Ebene kann keine Variable einer unteren Ebene in ihren direkten Argumenten haben"
 
-#: parser/parse_agg.c:781
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "Aufrufe von Aggregatfunktionen können keine Aufrufe von Funktionen mit Ergebnismenge enthalten"
 
-#: parser/parse_agg.c:782 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265
 #: parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr "Sie können möglicherweise die Funktion mit Ergebnismenge in ein LATERAL-FROM-Element verschieben."
 
-#: parser/parse_agg.c:787
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "Aufrufe von Aggregatfunktionen können keine Aufrufe von Fensterfunktionen enthalten"
 
-#: parser/parse_agg.c:866
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "Fensterfunktionen sind in JOIN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:873
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "Fensterfunktionen sind in Funktionen in FROM nicht erlaubt"
 
-#: parser/parse_agg.c:879
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "Fensterfunktionen sind in Policy-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:892
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "Fensterfunktionen sind in Fensterdefinitionen nicht erlaubt"
 
-#: parser/parse_agg.c:903
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "Fensterfunktionen sind in MERGE-WHEN-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:928
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "Fensterfunktionen sind in Check-Constraints nicht erlaubt"
 
-#: parser/parse_agg.c:932
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "Fensterfunktionen sind in DEFAULT-Ausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:935
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "Fensterfunktionen sind in Indexausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:938
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "Fensterfunktionen sind in Statistikausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:941
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "Fensterfunktionen sind in Indexprädikaten nicht erlaubt"
 
-#: parser/parse_agg.c:944
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "Fensterfunktionen sind in Umwandlungsausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:947
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "Fensterfunktionen sind in EXECUTE-Parametern nicht erlaubt"
 
-#: parser/parse_agg.c:950
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "Fensterfunktionen sind in der WHEN-Bedingung eines Triggers nicht erlaubt"
 
-#: parser/parse_agg.c:953
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "Fensterfunktionen sind in Partitionsbegrenzungen nicht erlaubt"
 
-#: parser/parse_agg.c:956
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "Fensterfunktionen sind in Partitionierungsschlüsselausdrücken nicht erlaubt"
 
-#: parser/parse_agg.c:959
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "Fensterfunktionen sind in CALL-Argumenten nicht erlaubt"
 
-#: parser/parse_agg.c:962
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "Fensterfunktionen sind in COPY-FROM-WHERE-Bedingungen nicht erlaubt"
 
-#: parser/parse_agg.c:965
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "Fensterfunktionen sind in Spaltengenerierungsausdrücken nicht erlaubt"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:988 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "Fensterfunktionen sind in %s nicht erlaubt"
 
-#: parser/parse_agg.c:1022 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "Fenster »%s« existiert nicht"
 
-#: parser/parse_agg.c:1110
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "zu viele Grouping-Sets vorhanden (maximal 4096)"
 
-#: parser/parse_agg.c:1250
+#: parser/parse_agg.c:1331
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "Aggregatfunktionen sind nicht im rekursiven Ausdruck einer rekursiven Anfrage erlaubt"
 
-#: parser/parse_agg.c:1443
+#: parser/parse_agg.c:1554
 #, 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"
 
-#: parser/parse_agg.c:1446
+#: parser/parse_agg.c:1557
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "Direkte Argumente einer Ordered-Set-Aggregatfunktion dürfen nur gruppierte Spalten verwenden."
 
-#: parser/parse_agg.c:1451
+#: parser/parse_agg.c:1562
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "Unteranfrage verwendet nicht gruppierte Spalte »%s.%s« aus äußerer Anfrage"
 
-#: parser/parse_agg.c:1615
+#: parser/parse_agg.c:1727
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr "Argumente von GROUPING müssen Gruppierausdrücke der zugehörigen Anfrageebene sein"
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "Relation »%s« kann nicht das Ziel einer datenverändernden Anweisung sein"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr "Funktionen mit Ergebnismenge müssen auf oberster Ebene von FROM erscheinen"
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr "mehrere Spaltendefinitionslisten für die selbe Funktion sind nicht erlaubt"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid "ROWS FROM() with multiple functions cannot have a column definition list"
 msgstr "ROWS FROM() mit mehreren Funktionen kann keine Spaltendefinitionsliste haben"
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid "Put a separate column definition list for each function inside ROWS FROM()."
 msgstr "Geben Sie innerhalb von ROWS FROM() jeder Funktion eine eigene Spaltendefinitionsliste."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr "UNNEST() mit mehreren Argumenten kann keine Spaltendefinitionsliste haben"
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid "Use separate UNNEST() calls inside ROWS FROM(), and attach a column definition list to each one."
 msgstr "Verwenden Sie getrennte UNNEST()-Aufrufe innerhalb von ROWS FROM() und geben Sie jeder eine eigene Spaltendefinitionsliste."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr "WITH ORDINALITY kann nicht mit einer Spaltendefinitionsliste verwendet werden"
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "Geben Sie die Spaltendefinitionsliste innerhalb von ROWS FROM() an."
 
-#: parser/parse_clause.c:762
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "nur eine FOR-ORDINALITY-Spalte ist erlaubt"
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "Spaltenname »%s« ist nicht eindeutig"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "Namensraumname »%s« ist nicht eindeutig"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "nur ein Standardnamensraum ist erlaubt"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "Tablesample-Methode %s existiert nicht"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
 msgstr[0] "Tablesample-Methode %s benötigt %d Argument, nicht %d"
 msgstr[1] "Tablesample-Methode %s benötigt %d Argumente, nicht %d"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "Tablesample-Methode %s unterstützt REPEATABLE nicht"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr "TABLESAMPLE-Klausel kann nur auf Tabellen und materialisierte Sichten angewendet werden"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "Spaltenname »%s« erscheint mehrmals in der USING-Klausel"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "gemeinsamer Spaltenname »%s« erscheint mehrmals in der linken Tabelle"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, 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"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "gemeinsamer Spaltenname »%s« erscheint mehrmals in der rechten Tabelle"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, 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"
@@ -17777,184 +18355,184 @@ msgstr "Operator %s ist kein gültiger Sortieroperator"
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
 msgstr "Sortieroperatoren müssen die Mitglieder »<« oder »>« einer »btree«-Operatorfamilie sein."
 
-#: parser/parse_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
 msgstr "RANGE mit Offset PRECEDING/FOLLOWING wird für Spaltentyp %s nicht unterstützt"
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s and offset type %s"
 msgstr "RANGE mit Offset PRECEDING/FOLLOWING wird für Spaltentyp %s und Offset-Typ %s nicht unterstützt"
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "Wandeln Sie den Offset-Wert in einen passenden Typ um."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for column type %s and offset type %s"
 msgstr "RANGE mit Offset PRECEDING/FOLLOWING hat mehrere Interpretationen für Spaltentyp %s und Offset-Typ %s"
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "Wandeln Sie den Offset-Wert in den genauen beabsichtigten Typ um."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3403
-#: parser/parse_expr.c:3624 parser/parse_expr.c:4388 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435
+#: parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "kann Typ %s nicht in Typ %s umwandeln"
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "Eingabe hat zu wenige Spalten."
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Kann in Spalte %3$d Typ %1$s nicht in Typ %2$s umwandeln."
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1122
 #, c-format
 msgid "Input has too many columns."
 msgstr "Eingabe hat zu viele Spalten."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "Argument von %s muss Typ %s haben, nicht Typ %s"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "Argument von %s darf keine Ergebnismenge zurückgeben"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1383
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "%s-Typen %s und %s passen nicht zusammen"
 
-#: parser/parse_coerce.c:1499
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "Argumenttypen %s und %s passen nicht zusammen"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1551
+#: parser/parse_coerce.c:1586
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s konnte Typ %s nicht in %s umwandeln"
 
-#: parser/parse_coerce.c:2154 parser/parse_coerce.c:2174
-#: parser/parse_coerce.c:2194 parser/parse_coerce.c:2215
-#: parser/parse_coerce.c:2270 parser/parse_coerce.c:2304
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "als »%s« deklarierte Argumente sind nicht alle gleich"
 
-#: parser/parse_coerce.c:2249 parser/parse_coerce.c:2362
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "als %s deklariertes Argument ist kein Array sondern Typ %s"
 
-#: parser/parse_coerce.c:2282 parser/parse_coerce.c:2432
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "als %s deklariertes Argument ist kein Bereichstyp sondern Typ %s"
 
-#: parser/parse_coerce.c:2316 parser/parse_coerce.c:2396
-#: parser/parse_coerce.c:2529 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "als %s deklariertes Argument ist kein Multirange-Typ sondern Typ %s"
 
-#: parser/parse_coerce.c:2353
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "kann Elementtyp des Arguments mit Typ »anyarray« nicht bestimmen"
 
-#: parser/parse_coerce.c:2379 parser/parse_coerce.c:2410
-#: parser/parse_coerce.c:2449 parser/parse_coerce.c:2515
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr "als %s deklariertes Argument ist nicht mit als %s deklariertem Argument konsistent"
 
-#: parser/parse_coerce.c:2474
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr "konnte polymorphischen Typ nicht bestimmen, weil Eingabe Typ %s hat"
 
-#: parser/parse_coerce.c:2488
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "mit »anynonarray« gepaarter Typ ist ein Array-Typ: %s"
 
-#: parser/parse_coerce.c:2498
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "mit »anyenum« gepaarter Typ ist kein Enum-Typ: %s"
 
-#: parser/parse_coerce.c:2559
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr "Argumente der anycompatible-Familie können nicht in einen gemeinsamen Typ umgewandelt werden"
 
-#: parser/parse_coerce.c:2577 parser/parse_coerce.c:2598
-#: parser/parse_coerce.c:2648 parser/parse_coerce.c:2653
-#: parser/parse_coerce.c:2717 parser/parse_coerce.c:2729
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr "konnte polymorphischen Typ %s nicht bestimmen, weil Eingabe Typ %s hat"
 
-#: parser/parse_coerce.c:2587
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr "anycompatiblerange-Typ %s stimmt nicht mit anycompatible-Typ %s überein"
 
-#: parser/parse_coerce.c:2608
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr "anycompatiblemultirange-Typ %s stimmt nicht mit anycompatible-Typ %s überein"
 
-#: parser/parse_coerce.c:2622
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr "mit »anycompatiblenonarray« gepaarter Typ ist ein Array-Typ: %s"
 
-#: parser/parse_coerce.c:2857
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid "A result of type %s requires at least one input of type anyrange or anymultirange."
 msgstr "Ein Ergebnis mit Typ %s benötigt mindestens eine Eingabe mit Typ anyrange oder anymultirange."
 
-#: parser/parse_coerce.c:2874
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatiblerange or anycompatiblemultirange."
 msgstr "Ein Ergebnis mit Typ %s benötigt mindestens eine Eingabe mit Typ anycompatiblerange oder anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2886
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid "A result of type %s requires at least one input of type anyelement, anyarray, anynonarray, anyenum, anyrange, or anymultirange."
 msgstr "Ein Ergebnis mit Typ %s benötigt mindestens eine Eingabe mit Typ anyelement, anyarray, anynonarray, anyenum, anyrange oder anymultirange."
 
-#: parser/parse_coerce.c:2898
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange, or anycompatiblemultirange."
 msgstr "Ein Ergebnis mit Typ %s benötigt mindestens eine Eingabe mit Typ anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange oder anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2928
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr "Ein Ergebnis mit Typ internal benötigt mindestens eine Eingabe mit Typ internal."
 
@@ -18000,501 +18578,563 @@ msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in INTERSECT erscheinen
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in EXCEPT erscheinen"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "WIHT-Anfragename »%s« mehrmals angegeben"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "konnte keinen Ist-Ungleich-Operator für Typ %s ermitteln"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid "WITH clause containing a data-modifying statement must be at the top level"
 msgstr "WITH-Klausel mit datenmodifizierender Anweisung muss auf der obersten Ebene sein"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, 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"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Wandeln Sie die Ausgabe des nicht-rekursiven Teilausdrucks in den korrekten Typ um."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, 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"
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr "Verwenden Sie die COLLATE-Klausel, um die Sortierfolge des nicht-rekursiven Teilsausdrucks zu setzen."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "WITH-Anfrage ist nicht rekursiv"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr "mit einer SEARCH- oder CYCLE-Klausel muss die linke Seite von UNION ein SELECT sein"
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr "mit einer SEARCH- oder CYCLE-Klausel muss mit rechte Seite von UNION ein SELECT sein"
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "Search-Spalte »%s« ist nicht in der Spaltenliste der WITH-Anfrage"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "Search-Spalte »%s« mehrmals angegeben"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid "search sequence column name \"%s\" already used in WITH query column list"
 msgstr "Search-Sequenz-Spaltenname »%s« schon in Spaltenliste der WITH-Anfrage verwendet"
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "Cycle-Spalte »%s« ist nicht in der Spaltenliste der WITH-Anfrage"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "Zyklusspalte »%s« mehrmals angegeben"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr "Zyklusmarkierungsspaltenname »%s« schon in Spaltenliste der WITH-Anfrage verwendet"
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr "Zykluspfadspaltenname »%s« schon in Spaltenliste der WITH-Anfrage verwendet"
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "Zyklusmarkierungsspaltenname und Zykluspfadspaltenname sind gleich"
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr "Search-Sequenz-Spaltenname und Zyklusmarkierungsspaltenname sind gleich"
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr "Search-Sequenz-Spaltenname und Zykluspfadspaltenname sind gleich"
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, 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"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "gegenseitige Rekursion zwischen WITH-Elementen ist nicht implementiert"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr "rekursive Anfrage »%s« darf keine datenmodifizierenden Anweisungen enthalten"
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, 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"
 
-#: parser/parse_cte.c:920
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY in einer rekursiven Anfrage ist nicht implementiert"
 
-#: parser/parse_cte.c:926
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET in einer rekursiven Anfrage ist nicht implementiert"
 
-#: parser/parse_cte.c:932
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT in einer rekursiven Anfrage ist nicht implementiert"
 
-#: parser/parse_cte.c:938
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE in einer rekursiven Anfrage ist nicht implementiert"
 
-#: parser/parse_cte.c:995
+#: parser/parse_cte.c:1074
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht mehrmals erscheinen"
 
-#: parser/parse_expr.c:314
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "DEFAULT ist in diesem Zusammenhang nicht erlaubt"
 
-#: parser/parse_expr.c:407 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "Spalte %s.%s existiert nicht"
 
-#: parser/parse_expr.c:419
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "Spalte »%s« nicht gefunden im Datentyp %s"
 
-#: parser/parse_expr.c:425
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "konnte Spalte »%s« im Record-Datentyp nicht identifizieren"
 
-#: parser/parse_expr.c:431
+#: parser/parse_expr.c:429
 #, 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:462 parser/parse_target.c:732
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "Zeilenexpansion mit »*« wird hier nicht unterstützt"
 
-#: parser/parse_expr.c:585
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "Spaltenverweise können nicht in DEFAULT-Ausdrücken verwendet werden"
 
-#: parser/parse_expr.c:588
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "Spaltenverweise können nicht in Partitionsbegrenzungsausdrücken verwendet werden"
 
-#: parser/parse_expr.c:847 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:845 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 
-#: parser/parse_expr.c:903 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "es gibt keinen Parameter $%d"
 
-#: parser/parse_expr.c:1103
+#. translator: %s is name of a SQL construct, eg NULLIF
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
-msgid "NULLIF requires = operator to yield boolean"
-msgstr "NULLIF erfordert, dass Operator = boolean ergibt"
+msgid "%s requires = operator to yield boolean"
+msgstr "%s erfordert, dass Operator = boolean ergibt"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3070
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s darf keine Ergebnismenge zurückgeben"
 
-#: parser/parse_expr.c:1395
+#: parser/parse_expr.c:1405
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
-msgstr ""
+msgstr "MERGE_ACTION() kann nur in der RETURNING-Liste eines MERGE-Befehls verwendet werden"
 
-#: parser/parse_expr.c:1519 parser/parse_expr.c:1551
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "Anzahl der Spalten stimmt nicht mit der Anzahl der Werte überein"
 
-#: parser/parse_expr.c:1565
+#: parser/parse_expr.c:1575
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr "die Quelle für ein UPDATE-Element mit mehreren Spalten muss ein Sub-SELECT oder ein ROW()-Ausdruck sein"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "Funktionen mit Ergebnismenge sind in %s nicht erlaubt"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "Unteranfragen können nicht in Check-Constraints verwendet werden"
 
-#: parser/parse_expr.c:1828
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "Unteranfragen können nicht in DEFAULT-Ausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1831
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "Unteranfragen können nicht in Indexausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1834
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "Unteranfragen können nicht im Indexprädikat verwendet werden"
 
-#: parser/parse_expr.c:1837
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "Unteranfragen können nicht in Statistikausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1840
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in transform expression"
 msgstr "Unteranfragen können in Umwandlungsausdrücken nicht verwendet werden"
 
-#: parser/parse_expr.c:1843
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "Unteranfragen können nicht in EXECUTE-Parameter verwendet werden"
 
-#: parser/parse_expr.c:1846
+#: parser/parse_expr.c:1856
 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:1849
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "Unteranfragen können nicht in Partitionsbegrenzungen verwendet werden"
 
-#: parser/parse_expr.c:1852
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "Unteranfragen können nicht in Partitionierungsschlüsselausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1855
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "Unteranfragen können nicht in CALL-Argument verwendet werden"
 
-#: parser/parse_expr.c:1858
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "Unteranfragen können nicht in COPY-FROM-WHERE-Bedingungen verwendet werden"
 
-#: parser/parse_expr.c:1861
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "Unteranfragen können nicht in Spaltengenerierungsausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3756
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "Unteranfrage darf nur eine Spalte zurückgeben"
 
-#: parser/parse_expr.c:1985
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "Unteranfrage hat zu viele Spalten"
 
-#: parser/parse_expr.c:1990
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "Unteranfrage hat zu wenige Spalten"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2104
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "kann Typ eines leeren Arrays nicht bestimmen"
 
-#: parser/parse_expr.c:2087
+#: parser/parse_expr.c:2105
 #, 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:2101
+#: parser/parse_expr.c:2119
 #, 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:2184
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW-Ausdrücke können höchstens %d Einträge haben"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2409
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "unbenannter XML-Attributwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:2390
+#: parser/parse_expr.c:2410
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "unbenannter XML-Elementwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:2405
+#: parser/parse_expr.c:2425
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "XML-Attributname »%s« einscheint mehrmals"
 
-#: parser/parse_expr.c:2513
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "kann das Ergebnis von XMLSERIALIZE nicht in Typ %s umwandeln"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "ungleiche Anzahl Einträge in Zeilenausdrücken"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "kann Zeilen mit Länge null nicht vergleichen"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2892
 #, 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:2869
+#: parser/parse_expr.c:2899
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "Zeilenvergleichsoperator darf keine Ergebnismenge zurückgeben"
 
-#: parser/parse_expr.c:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "konnte Interpretation des Zeilenvergleichsoperators %s nicht bestimmen"
 
-#: parser/parse_expr.c:2930
+#: parser/parse_expr.c:2960
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "Zeilenvergleichsoperatoren müssen einer »btree«-Operatorfamilie zugeordnet sein."
 
-#: parser/parse_expr.c:2971
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Es gibt mehrere gleichermaßen plausible Kandidaten."
 
-#: parser/parse_expr.c:3064
-#, c-format
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr "IS DISTINCT FROM erfordert, dass Operator = boolean ergibt"
-
-#: parser/parse_expr.c:3304
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "JSON-ENCODING-Klausel ist nur für Eingabetyp bytea erlaubt"
 
-#: parser/parse_expr.c:3368
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr "implizite FORMAT-JSON-Klausel kann nicht mit Typen verwendet werden, die keine Zeichenketten sind"
 
-#: parser/parse_expr.c:3369
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr "explizite FORMAT-JSON-Klausel kann nicht mit Typen verwendet werden, die keine Zeichenketten sind"
 
-#: parser/parse_expr.c:3458
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "Format JSON kann nicht mit Ausgabetypen verwendet werden, die keine Zeichenketten sind"
 
-#: parser/parse_expr.c:3471
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "JSON-Kodierung kann nur für Ausgabetyp bytea gesetzt werden"
 
-#: parser/parse_expr.c:3476
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "nicht unterstützte JSON-Kodierung"
 
-#: parser/parse_expr.c:3477
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "Nur die JSON-Kodierung UTF8 wird unterstützt."
 
-#: parser/parse_expr.c:3514
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "Rückgabe von SETOF-Typen wird in SQL/JSON-Funktionen nicht unterstützt"
 
-#: parser/parse_expr.c:3519
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "Rückgabe von Pseudotypen wird in SQL/JSON-Funktionen nicht unterstützt"
 
-#: parser/parse_expr.c:3841 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "ORDER BY in Aggregatfunktion ist für Fensterfunktionen nicht implementiert"
 
-#: parser/parse_expr.c:4063
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr "JSON-FORMAT-ENCODING-Klausel kann nur für Eingabetyp bytea verwendet werden"
 
-#: parser/parse_expr.c:4083
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "Typ %s kann nicht im IS-JSON-Prädikat verwendet werden"
 
-#: parser/parse_expr.c:4109 parser/parse_expr.c:4229
-#, fuzzy, c-format
-#| msgid "cannot cast type %s to %s"
-msgid "cannot use RETURNING type %s in %s"
-msgstr "kann Typ %s nicht in Typ %s umwandeln"
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
+#, c-format
+msgid "cannot use type %s in RETURNING clause of %s"
+msgstr "Typ %s kann nicht in der RETURNING-Klausel von %s verwendet werden"
+
+#: parser/parse_expr.c:4150
+#, c-format
+msgid "Try returning json or jsonb."
+msgstr "Versuchen Sie json oder jsonb zurückzugeben."
 
-#: parser/parse_expr.c:4158
-#, fuzzy, c-format
-#| msgid "cannot use non-string types with implicit FORMAT JSON clause"
+#: parser/parse_expr.c:4198
+#, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
-msgstr "implizite FORMAT-JSON-Klausel kann nicht mit Typen verwendet werden, die keine Zeichenketten sind"
+msgstr "Klausel WITH UNIQUE KEYS kann nicht mit Typen verwendet werden, die keine Zeichenketten sind"
 
-#: parser/parse_expr.c:4232
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
-msgstr ""
+msgstr "Versuchen Sie einen Zeichenkettentyp oder bytea zurückzugeben."
 
-#: parser/parse_expr.c:4297
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
-msgstr ""
+msgstr "FORMAT JSON kann nicht in der RETURNING-Klausel von %s() angegeben werden"
 
-#: parser/parse_expr.c:4309
+#: parser/parse_expr.c:4353
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
-msgstr ""
+msgstr "SQL/JSON-QUOTES-Verhalten darf nicht angegeben werden, wenn WITH WRAPPER verwendet wird"
 
-#: parser/parse_expr.c:4336
+#. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427
+#: parser/parse_expr.c:4453 parser/parse_expr.c:4479
+#: parser/parse_jsontable.c:92
 #, c-format
-msgid "JSON path expression must be of type %s, not of type %s"
-msgstr "JSON-Pfadausdruck muss Typ %s haben, nicht Typ %s"
+msgid "invalid %s behavior"
+msgstr "ungültiges »%s«-Verhalten"
 
-#: parser/parse_expr.c:4684
+#. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
+#. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
-msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
-msgstr ""
+msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
+msgstr "Nur ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT oder DEFAULT-Ausdruck sind erlaubt in %s für %s."
 
-#: parser/parse_expr.c:4689
+#. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
+#. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435
+#: parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
-msgid "DEFAULT expression must not contain column references"
-msgstr "DEFAULT-Ausdruck darf keine Spaltenverweise enthalten"
+msgid "invalid %s behavior for column \"%s\""
+msgstr "ungültiges »%s«-Verhalten für Spalte »%s«"
 
-#: parser/parse_expr.c:4694
+#. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
-msgid "DEFAULT expression must not return a set"
-msgstr "DEFAULT-Ausdruck darf keine Ergebnismenge zurückgeben"
+msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
+msgstr "Nur ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT oder DEFAULT-Ausdruck sind erlaubt in %s für formatierte Spalten."
 
-#: parser/parse_expr.c:4728
-#, fuzzy, c-format
-#| msgid "cannot cast type %s to %s"
-msgid "cannot cast behavior expression of type %s to %s"
-msgstr "kann Typ %s nicht in Typ %s umwandeln"
+#: parser/parse_expr.c:4428
+#, c-format
+msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
+msgstr "Nur ERROR, TRUE, FALSE oder UNKNOWN sind erlaubt in %s für %s."
 
-#: parser/parse_func.c:194
+#. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#: parser/parse_expr.c:4438
 #, c-format
-msgid "argument name \"%s\" used more than once"
-msgstr "Argumentname »%s« mehrmals angegeben"
+msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
+msgstr "Nur ERROR, TRUE, FALSE oder UNKNOWN sind erlaubt in %s für EXISTS-Spalten."
 
-#: parser/parse_func.c:205
+#. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
+#. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
+#, c-format
+msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
+msgstr "Nur ERROR, NULL oder DEFAULT-Ausdruck sind erlaubt in %s für %s."
+
+#. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
+#, c-format
+msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
+msgstr "Nur ERROR, NULL oder DEFAULT-Ausdruck sind erlaubt in %s für skalare Spalten."
+
+#: parser/parse_expr.c:4526
+#, c-format
+msgid "JSON path expression must be of type %s, not of type %s"
+msgstr "JSON-Pfadausdruck muss Typ %s haben, nicht Typ %s"
+
+#: parser/parse_expr.c:4766
+#, c-format
+msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
+msgstr "für DEFAULT kann nur eine Konstante, Nicht-Aggregat-Funktion oder ein Operatorausdruck angegeben werden"
+
+#: parser/parse_expr.c:4771
+#, c-format
+msgid "DEFAULT expression must not contain column references"
+msgstr "DEFAULT-Ausdruck darf keine Spaltenverweise enthalten"
+
+#: parser/parse_expr.c:4776
+#, c-format
+msgid "DEFAULT expression must not return a set"
+msgstr "DEFAULT-Ausdruck darf keine Ergebnismenge zurückgeben"
+
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr "Sortierfolge des DEFAULT-Ausdrucks kollidiert mit der RETURNING-Klausel"
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
+#, c-format
+msgid "cannot cast behavior expression of type %s to %s"
+msgstr "kann Verhaltensausdruck nicht von Typ %s in %s umwandeln"
+
+#: parser/parse_expr.c:4873
+#, c-format
+msgid "You will need to explicitly cast the expression to type %s."
+msgstr "Sie werden den Ausdruck ausdrücklich in Typ %s umwandeln müssen."
+
+#: parser/parse_func.c:194
+#, c-format
+msgid "argument name \"%s\" used more than once"
+msgstr "Argumentname »%s« mehrmals angegeben"
+
+#: parser/parse_func.c:205
 #, c-format
 msgid "positional argument cannot follow named argument"
 msgstr "Positionsargument kann nicht hinter benanntem Argument stehen"
@@ -18823,27 +19463,16 @@ msgstr "Funktionen mit Ergebnismenge sind in COPY-FROM-WHERE-Bedingungen nicht e
 msgid "set-returning functions are not allowed in column generation expressions"
 msgstr "Funktionen mit Ergebnismenge sind in Spaltengenerierungsausdrücken nicht erlaubt"
 
-#: parser/parse_jsontable.c:94
+#: parser/parse_jsontable.c:93
 #, c-format
-msgid "invalid ON ERROR behavior"
-msgstr "ungültiges ON-ERROR-Verhalten"
+msgid "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
+msgstr "Nur EMPTY [ ARRAY ] oder ERROR ist in der ON-ERROR-Klausel auf der obersten Ebene erlaubt."
 
-#: parser/parse_jsontable.c:95
-#, c-format
-msgid "Only EMPTY or ERROR is allowed in the top-level ON ERROR clause."
-msgstr ""
-
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
 msgstr "doppelter JSON_TABLE-Spalten- oder -Pfadname: %s"
 
-#: parser/parse_jsontable.c:295
-#, fuzzy, c-format
-#| msgid "only one FOR ORDINALITY column is allowed"
-msgid "cannot use more than one FOR ORDINALITY column"
-msgstr "nur eine FOR-ORDINALITY-Spalte ist erlaubt"
-
 #: parser/parse_merge.c:129
 #, c-format
 msgid "WITH RECURSIVE is not supported for MERGE statement"
@@ -18919,229 +19548,224 @@ msgstr "op ANY/ALL (array) erfordert, dass Operator boolean ergibt"
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (array) erfordert, dass Operator keine Ergebnismenge zurückgibt"
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "inkonsistente Typen für Parameter $%d ermittelt"
 
-#: parser/parse_param.c:309 tcop/postgres.c:740
+#: parser/parse_param.c:310 tcop/postgres.c:735
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "konnte Datentyp von Parameter $%d nicht ermitteln"
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "Tabellenbezug »%s« ist nicht eindeutig"
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "Tabellenbezug %u ist nicht eindeutig"
 
-#: parser/parse_relation.c:465
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "Tabellenname »%s« mehrmals angegeben"
-
-#: parser/parse_relation.c:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "ungültiger Verweis auf FROM-Klausel-Eintrag für Tabelle »%s«"
 
-#: parser/parse_relation.c:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, 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."
 
-#: parser/parse_relation.c:500
+#: parser/parse_relation.c:508
 #, 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:703
+#: parser/parse_relation.c:711
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "Verweis auf Systemspalte »%s« im Check-Constraint ist ungültig"
 
-#: parser/parse_relation.c:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr "Systemspalte »%s« kann nicht in Spaltengenerierungsausdruck verwendet werden"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "Systemspalte »%s« kann nicht in MERGE-WHEN-Bedingung verwendet werden"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "Tabelle »%s« hat %d Spalten, aber %d Spalten wurden angegeben"
 
-#: parser/parse_relation.c:1445
+#: parser/parse_relation.c:1462
 #, 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."
 
-#: parser/parse_relation.c:1447
+#: parser/parse_relation.c:1464
 #, 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:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid "a column definition list is redundant for a function with OUT parameters"
 msgstr "eine Spaltendefinitionsliste ist überflüssig bei einer Funktion mit OUT-Parametern"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid "a column definition list is redundant for a function returning a named composite type"
 msgstr "eine Spaltendefinitionsliste ist überflüssig bei einer Funktion, die einen benannten zusammengesetzten Typ zurückgibt"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, 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"
 
-#: parser/parse_relation.c:1857
+#: parser/parse_relation.c:1874
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "eine Spaltendefinitionsliste ist erforderlich bei Funktionen, die »record« zurückgeben"
 
-#: parser/parse_relation.c:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "Spaltendefinitionslisten können höchstens %d Einträge haben"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr "Funktion »%s« in FROM hat nicht unterstützten Rückgabetyp %s"
 
-#: parser/parse_relation.c:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "Funktionen in FROM können höchstens %d Spalten zurückgeben"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "Funktion %s hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, 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"
 
-#: parser/parse_relation.c:2242
+#: parser/parse_relation.c:2259
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "Verbunde können höchstens %d Spalten haben"
 
-#: parser/parse_relation.c:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr "Verbundausdruck »%s« hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "WITH-Anfrage »%s« hat keine RETURNING-Klausel"
 
-#: parser/parse_relation.c:3635
+#: parser/parse_relation.c:3741
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Vielleicht wurde beabsichtigt, auf den Tabellenalias »%s« zu verweisen."
 
-#: parser/parse_relation.c:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr "Um auf diese Tabelle zu verweisen, müssen Sie diese Unteranfrage mit LATERAL markieren."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "fehlender Eintrag in FROM-Klausel für Tabelle »%s«"
 
-#: parser/parse_relation.c:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid "There are columns named \"%s\", but they are in tables that cannot be referenced from this part of the query."
 msgstr "Es gibt Spalten namens »%s«, aber sie sind in Tabellen, auf die aus diesem Teil der Anfrage nicht verwiesen werden kann."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "Versuchen Sie, einen tabellenqualifizierten Namen zu verwenden."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, 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."
 
-#: parser/parse_relation.c:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr "Um auf diese Spalte zu verweisen, müssen Sie diese Unteranfrage mit LATERAL markieren."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr "Um auf diese Spalte zu verweisen, müssen Sie einen tabellenqualifizierten Namen verwenden."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Vielleicht wurde beabsichtigt, auf die Spalte »%s.%s« zu verweisen."
 
-#: parser/parse_relation.c:3742
+#: parser/parse_relation.c:3848
 #, 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."
 
-#: parser/parse_target.c:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "kann Systemspalte »%s« keinen Wert zuweisen"
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "kann Arrayelement nicht auf DEFAULT setzen"
 
-#: parser/parse_target.c:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "kann Subfeld nicht auf DEFAULT setzen"
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, 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"
 
-#: parser/parse_target.c:779
+#: parser/parse_target.c:782
 #, 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"
 
-#: parser/parse_target.c:788
+#: parser/parse_target.c:791
 #, 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"
 
-#: parser/parse_target.c:877
+#: parser/parse_target.c:880
 #, c-format
 msgid "subscripted assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "Wertzuweisung in Elemente von »%s« erfordert Typ %s, aber Ausdruck hat Typ %s"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, 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"
 
-#: parser/parse_target.c:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * ist nicht gültig, wenn keine Tabellen angegeben sind"
@@ -19161,8 +19785,8 @@ msgstr "falscher %%TYPE-Verweis (zu viele Namensteile): %s"
 msgid "type reference %s converted to %s"
 msgstr "Typverweis %s in %s umgewandelt"
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "Typ »%s« ist nur eine Hülle"
@@ -19182,343 +19806,355 @@ msgstr "Typmodifikatoren müssen einfache Konstanten oder Bezeichner sein"
 msgid "invalid type name \"%s\""
 msgstr "ungültiger Typname: »%s«"
 
-#: parser/parse_utilcmd.c:266
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "partitionierte Tabelle kann nicht als Vererbungskind erzeugt werden"
 
-#: parser/parse_utilcmd.c:586
+#: parser/parse_utilcmd.c:504
+#, c-format
+msgid "cannot set logged status of a temporary sequence"
+msgstr "kann den geloggten Status einer temporären Sequenz nicht ändern"
+
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "Array aus Typ serial ist nicht implementiert"
 
-#: parser/parse_utilcmd.c:665 parser/parse_utilcmd.c:677
-#: parser/parse_utilcmd.c:736
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "widersprüchliche NULL/NOT NULL-Deklarationen für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:689
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr "Not-Null-Constraints für partitionierte Tabellen können nicht NO INHERIT sein"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid "conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr "widersprüchliche NO INHERIT-Deklarationen für Not-Null-Constraints für Spalte »%s«"
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "mehrere Vorgabewerte angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:706
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr "Identitätsspalten in getypten Tabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:710
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "Identitätsspalten in partitionierten Tabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:719
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr "mehrere Identitätsangaben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:749
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr "generierte Spalten in getypten Tabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:753
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr "mehrere Generierungsklauseln angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:771 parser/parse_utilcmd.c:886
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "Primärschlüssel für Fremdtabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:780 parser/parse_utilcmd.c:896
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "Unique-Constraints auf Fremdtabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:825
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr "sowohl Vorgabewert als auch Identität angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:833
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid "both default and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "sowohl Vorgabewert als auch Generierungsausdruck angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:841
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid "both identity and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "sowohl Identität als auch Generierungsausdruck angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:906
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "Exclusion-Constraints auf Fremdtabellen werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:971
-#, c-format
-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:984
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "Relation »%s« ist ungültig in der LIKE-Klausel"
 
-#: parser/parse_utilcmd.c:1711 parser/parse_utilcmd.c:1819
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "Index »%s« enthält einen Verweis auf die ganze Zeile der Tabelle."
 
-#: parser/parse_utilcmd.c:2217
+#: parser/parse_utilcmd.c:2423
 #, 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:2237
+#: parser/parse_utilcmd.c:2443
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "Index »%s« gehört bereits zu einem Constraint"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2469
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "»%s« ist kein Unique Index"
 
-#: parser/parse_utilcmd.c:2259 parser/parse_utilcmd.c:2266
-#: parser/parse_utilcmd.c:2273 parser/parse_utilcmd.c:2350
+#: parser/parse_utilcmd.c:2470 parser/parse_utilcmd.c:2477
+#: parser/parse_utilcmd.c:2484 parser/parse_utilcmd.c:2560
 #, 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:2265
+#: parser/parse_utilcmd.c:2476
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "Index »%s« enthält Ausdrücke"
 
-#: parser/parse_utilcmd.c:2272
+#: parser/parse_utilcmd.c:2483
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "»%s« ist ein partieller Index"
 
-#: parser/parse_utilcmd.c:2284
+#: parser/parse_utilcmd.c:2495
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "»%s« ist ein aufschiebbarer Index"
 
-#: parser/parse_utilcmd.c:2285
+#: parser/parse_utilcmd.c:2496
 #, 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:2349
+#: parser/parse_utilcmd.c:2559
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "Index »%s« Spalte Nummer %d hat nicht das Standardsortierverhalten"
 
-#: parser/parse_utilcmd.c:2506
+#: parser/parse_utilcmd.c:2751
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "Spalte »%s« erscheint zweimal im Primärschlüssel-Constraint"
 
-#: parser/parse_utilcmd.c:2512
+#: parser/parse_utilcmd.c:2757
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "Spalte »%s« erscheint zweimal im Unique-Constraint"
 
-#: parser/parse_utilcmd.c:2846
+#: parser/parse_utilcmd.c:2807
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr "Spalte »%s« in WITHOUT OVERLAPS ist kein Range- oder Multirange-Typ"
+
+#: parser/parse_utilcmd.c:2835
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr "Constraints, die WITHOUT OVERLAPS verwenden, benötigen mindestens zwei Spalten"
+
+#: parser/parse_utilcmd.c:3132
 #, 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:2918
+#: parser/parse_utilcmd.c:3204
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "Statistikausdrücke können nur auf die referenzierte Tabelle verweisen"
 
-#: parser/parse_utilcmd.c:2961
+#: parser/parse_utilcmd.c:3247
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "Regeln für materialisierte Sichten werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:3021
+#: parser/parse_utilcmd.c:3307
 #, 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:3093
+#: parser/parse_utilcmd.c:3379
 #, 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:3111 parser/parse_utilcmd.c:3212
-#: rewrite/rewriteHandler.c:537 rewrite/rewriteManip.c:1095
+#: parser/parse_utilcmd.c:3397 parser/parse_utilcmd.c:3498
+#: rewrite/rewriteHandler.c:545 rewrite/rewriteManip.c:1198
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "UNION/INTERSECTION/EXCEPT mit Bedingung sind nicht implementiert"
 
-#: parser/parse_utilcmd.c:3129
+#: parser/parse_utilcmd.c:3415
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON-SELECT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:3133
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON-SELECT-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:3142
+#: parser/parse_utilcmd.c:3428
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON-INSERT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:3148
+#: parser/parse_utilcmd.c:3434
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON-DELETE-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:3176
+#: parser/parse_utilcmd.c:3462
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "in WITH-Anfrage kann nicht auf OLD verweisen werden"
 
-#: parser/parse_utilcmd.c:3183
+#: parser/parse_utilcmd.c:3469
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "in WITH-Anfrage kann nicht auf NEW verwiesen werden"
 
-#: parser/parse_utilcmd.c:3255
-#, c-format
-msgid "\"%s\" is not a partition"
-msgstr "»%s« ist keine Partition"
-
-#: parser/parse_utilcmd.c:3290 parser/parse_utilcmd.c:3335
-#: parser/parse_utilcmd.c:4101
-#, c-format
-msgid "\"%s\" is not a partitioned table"
-msgstr "»%s« ist keine partitionierte Tabelle"
-
-#: parser/parse_utilcmd.c:3343
-#, fuzzy, c-format
-#| msgid "a hash-partitioned table may not have a default partition"
-msgid "partition of hash-partitioned table cannot be merged"
-msgstr "eine hashpartitionierte Tabelle kann keine Standardpartition haben"
-
-#: parser/parse_utilcmd.c:3361
-#, fuzzy, c-format
-#| msgid "transaction identifier \"%s\" is already in use"
-msgid "partition with name \"%s\" is already used"
-msgstr "Transaktionsbezeichner »%s« wird bereits verwendet"
-
-#: parser/parse_utilcmd.c:3673
-#, c-format
-msgid "list of new partitions should contain at least two items"
-msgstr ""
-
-#: parser/parse_utilcmd.c:3811
+#: parser/parse_utilcmd.c:3927
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "falsch platzierte DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:3816 parser/parse_utilcmd.c:3831
+#: parser/parse_utilcmd.c:3932 parser/parse_utilcmd.c:3947
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "mehrere DEFERRABLE/NOT DEFERRABLE-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:3826
+#: parser/parse_utilcmd.c:3942
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "falsch platzierte NOT DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:3847
+#: parser/parse_utilcmd.c:3963
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "falsch platzierte INITIALLY DEFERRED-Klausel"
 
-#: parser/parse_utilcmd.c:3852 parser/parse_utilcmd.c:3878
+#: parser/parse_utilcmd.c:3968 parser/parse_utilcmd.c:3994
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "mehrere INITIALLY IMMEDIATE/DEFERRED-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:3873
+#: parser/parse_utilcmd.c:3989
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "falsch platzierte INITIALLY IMMEDIATE-Klausel"
 
-#: parser/parse_utilcmd.c:4066
+#: parser/parse_utilcmd.c:4006
+#, c-format
+msgid "misplaced ENFORCED clause"
+msgstr "falsch platzierte ENFORCED-Klausel"
+
+#: parser/parse_utilcmd.c:4011 parser/parse_utilcmd.c:4028
+#, c-format
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "mehrere ENFORCED/NOT ENFORCED-Klauseln sind nicht erlaubt"
+
+#: parser/parse_utilcmd.c:4023
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "falsch platzierte NOT ENFORCED-Klausel"
+
+#: parser/parse_utilcmd.c:4221
 #, 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)"
 
-#: parser/parse_utilcmd.c:4108
+#: parser/parse_utilcmd.c:4256
+#, c-format
+msgid "\"%s\" is not a partitioned table"
+msgstr "»%s« ist keine partitionierte Tabelle"
+
+#: parser/parse_utilcmd.c:4263
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "Tabelle »%s« ist nicht partitioniert"
 
-#: parser/parse_utilcmd.c:4115
+#: parser/parse_utilcmd.c:4270
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "Index »%s« ist nicht partitioniert"
 
-#: parser/parse_utilcmd.c:4155
+#: parser/parse_utilcmd.c:4310
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "eine hashpartitionierte Tabelle kann keine Standardpartition haben"
 
-#: parser/parse_utilcmd.c:4172
+#: parser/parse_utilcmd.c:4327
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "ungültige Begrenzungsangabe für eine Hash-Partition"
 
-#: parser/parse_utilcmd.c:4178 partitioning/partbounds.c:4803
+#: parser/parse_utilcmd.c:4333 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "Modulus für Hashpartition muss eine ganze Zahl größer als null sein"
 
-#: parser/parse_utilcmd.c:4185 partitioning/partbounds.c:4811
+#: parser/parse_utilcmd.c:4340 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "Rest für Hashpartition muss kleiner als Modulus sein"
 
-#: parser/parse_utilcmd.c:4198
+#: parser/parse_utilcmd.c:4353
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "ungültige Begrenzungsangabe für eine Listenpartition"
 
-#: parser/parse_utilcmd.c:4251
+#: parser/parse_utilcmd.c:4406
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "ungültige Begrenzungsangabe für eine Bereichspartition"
 
-#: parser/parse_utilcmd.c:4257
+#: parser/parse_utilcmd.c:4412
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "FROM muss genau einen Wert pro Partitionierungsspalte angeben"
 
-#: parser/parse_utilcmd.c:4261
+#: parser/parse_utilcmd.c:4416
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "TO muss genau einen Wert pro Partitionierungsspalte angeben"
 
-#: parser/parse_utilcmd.c:4375
+#: parser/parse_utilcmd.c:4532
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "NULL kann nicht in der Bereichsgrenze angegeben werden"
 
-#: parser/parse_utilcmd.c:4424
+#: parser/parse_utilcmd.c:4580
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "jede Begrenzung, die auf MAXVALUE folgt, muss auch MAXVALUE sein"
 
-#: parser/parse_utilcmd.c:4431
+#: parser/parse_utilcmd.c:4587
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "jede Begrenzung, die auf MINVALUE folgt, muss auch MINVALUE sein"
 
-#: parser/parse_utilcmd.c:4474
+#: parser/parse_utilcmd.c:4630
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "angegebener Wert kann nicht in Typ %s für Spalte »%s« umgewandelt werden"
@@ -19531,12 +20167,12 @@ msgstr "auf UESCAPE muss eine einfache Zeichenkettenkonstante folgen"
 msgid "invalid Unicode escape character"
 msgstr "ungültiges Unicode-Escape-Zeichen"
 
-#: parser/parser.c:347 scan.l:1391
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "ungültiger Unicode-Escape-Wert"
 
-#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6640
+#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6901
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "ungültiges Unicode-Escape"
@@ -19547,7 +20183,7 @@ msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Unicode-Escapes müssen \\XXXX oder \\+XXXXXX sein."
 
 #: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695
-#: utils/adt/varlena.c:6665
+#: utils/adt/varlena.c:6926
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "ungültiges Unicode-Surrogatpaar"
@@ -19578,134 +20214,53 @@ msgstr "Der neue Modulus %d ist kein Faktor von %d, dem Modulus der bestehenden
 msgid "The new modulus %d is not divisible by %d, the modulus of existing partition \"%s\"."
 msgstr "Der neue Modulus %d ist nicht durch %d, den Modulus der bestehenden Parition »%s«, teilbar."
 
-#: partitioning/partbounds.c:3127 partitioning/partbounds.c:5202
+#: partitioning/partbounds.c:3127
 #, c-format
 msgid "empty range bound specified for partition \"%s\""
 msgstr "leere Bereichsgrenze angegeben für Partition »%s«"
 
-#: partitioning/partbounds.c:3129 partitioning/partbounds.c:5204
+#: partitioning/partbounds.c:3129
 #, c-format
 msgid "Specified lower bound %s is greater than or equal to upper bound %s."
 msgstr "Angegebene Untergrenze %s ist größer als oder gleich der Obergrenze %s."
 
-#: partitioning/partbounds.c:3238
+#: partitioning/partbounds.c:3237
 #, c-format
 msgid "partition \"%s\" would overlap partition \"%s\""
 msgstr "Partition »%s« würde sich mit Partition »%s« überlappen"
 
-#: partitioning/partbounds.c:3355
+#: partitioning/partbounds.c:3354
 #, c-format
 msgid "skipped scanning foreign table \"%s\" which is a partition of default partition \"%s\""
 msgstr "Scannen von Fremdtabelle »%s«, die eine Partition der Standardpartition »%s« ist, wurde übersprungen"
 
-#: partitioning/partbounds.c:4807
+#: partitioning/partbounds.c:4806
 #, c-format
 msgid "remainder for hash partition must be an integer value greater than or equal to zero"
 msgstr "Rest für Hashpartition muss eine ganze Zahl größer als oder gleich null sein"
 
-#: partitioning/partbounds.c:4831
+#: partitioning/partbounds.c:4830
 #, c-format
 msgid "\"%s\" is not a hash partitioned table"
 msgstr "»%s« ist keine Hash-partitionierte Tabelle"
 
-#: partitioning/partbounds.c:4842 partitioning/partbounds.c:4959
+#: partitioning/partbounds.c:4841 partitioning/partbounds.c:4958
 #, c-format
 msgid "number of partitioning columns (%d) does not match number of partition keys provided (%d)"
 msgstr "Anzahl der Partitionierungsspalten (%d) stimmt nicht mit der Anzahl der angegebenen Partitionierungsschlüssel (%d) überein"
 
-#: partitioning/partbounds.c:4864
+#: partitioning/partbounds.c:4863
 #, c-format
 msgid "column %d of the partition key has type %s, but supplied value is of type %s"
 msgstr "Spalte %d des Partitionierungsschlüssels hat Typ %s, aber der angegebene Wert hat Typ %s"
 
-#: partitioning/partbounds.c:4896
+#: partitioning/partbounds.c:4895
 #, c-format
 msgid "column %d of the partition key has type \"%s\", but supplied value is of type \"%s\""
 msgstr "Spalte %d des Partitionierungsschlüssels hat Typ »%s«, aber der angegebene Wert hat Typ »%s«"
 
-#: partitioning/partbounds.c:5038
-#, fuzzy, c-format
-#| msgid "partition \"%s\" conflicts with existing default partition \"%s\""
-msgid "lower bound of partition \"%s\" conflicts with upper bound of previous partition \"%s\""
-msgstr "Partition »%s« kollidiert mit bestehender Standardpartition »%s«"
-
-#: partitioning/partbounds.c:5092
-#, fuzzy, c-format
-#| msgid "partition \"%s\" would overlap partition \"%s\""
-msgid "new partition \"%s\" would overlap with another new partition \"%s\""
-msgstr "Partition »%s« würde sich mit Partition »%s« überlappen"
-
-#: partitioning/partbounds.c:5239
-#, c-format
-msgid "lower bound of partition \"%s\" is not equal to lower bound of split partition"
-msgstr "Untergrenze der Partition »%s« ist nicht gleich der Untergrenze der geteilten Partition"
-
-#: partitioning/partbounds.c:5251
-#, c-format
-msgid "lower bound of partition \"%s\" is less than lower bound of split partition"
-msgstr "Untergrenze der Partition »%s« ist kleiner als die Untergrenze der geteilten Partition"
-
-#: partitioning/partbounds.c:5280
-#, c-format
-msgid "upper bound of partition \"%s\" is not equal to upper bound of split partition"
-msgstr "Obergrenze der Partition »%s« ist nicht gleich der Obergrenze der geteilten Partition"
-
-#: partitioning/partbounds.c:5292
-#, c-format
-msgid "upper bound of partition \"%s\" is greater than upper bound of split partition"
-msgstr "Obergrenze der Partition »%s« ist größer als die Obergrenze der geteilten Partition"
-
-#: partitioning/partbounds.c:5364
-#, c-format
-msgid "new partition \"%s\" cannot have this value because split partition does not have"
-msgstr ""
-
-#: partitioning/partbounds.c:5380
-#, c-format
-msgid "new partition \"%s\" cannot have NULL value because split partition does not have"
-msgstr ""
-
-#: partitioning/partbounds.c:5390
-#, fuzzy, c-format
-#| msgid "partition \"%s\" would overlap partition \"%s\""
-msgid "new partition \"%s\" would overlap with another (not split) partition \"%s\""
-msgstr "Partition »%s« würde sich mit Partition »%s« überlappen"
-
-#: partitioning/partbounds.c:5530
-#, fuzzy, c-format
-#| msgid "a hash-partitioned table may not have a default partition"
-msgid "new partitions do not have value %s but split partition does"
-msgstr "eine hashpartitionierte Tabelle kann keine Standardpartition haben"
-
-#: partitioning/partbounds.c:5607
-#, c-format
-msgid "DEFAULT partition should be one"
-msgstr ""
-
-#: partitioning/partbounds.c:5623
-#, fuzzy, c-format
-#| msgid "a hash-partitioned table may not have a default partition"
-msgid "partition of hash-partitioned table cannot be split"
-msgstr "eine hashpartitionierte Tabelle kann keine Standardpartition haben"
-
-#: partitioning/partbounds.c:5677
-#, c-format
-msgid "one partition in the list should be DEFAULT because split partition is DEFAULT"
-msgstr ""
-
-#: partitioning/partbounds.c:5687
-#, c-format
-msgid "new partition cannot be DEFAULT because DEFAULT partition already exists"
-msgstr ""
-
-#: partitioning/partbounds.c:5746
-#, fuzzy, c-format
-#| msgid "name \"%s\" is already declared"
-msgid "name \"%s\" is already used"
-msgstr "Name »%s« ist bereits deklariert"
-
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:323 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "konnte »stat« für Datenverzeichnis »%s« nicht ausführen: %m"
@@ -19772,27 +20327,27 @@ msgstr "Huge Pages werden auf dieser Plattform nicht unterstützt"
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "Huge Pages werden mit der aktuellen »shared_memory_type«-Einstellung nicht unterstützt"
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1347
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "bereits bestehender Shared-Memory-Block (Schlüssel %lu, ID %lu) wird noch benutzt"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1349
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr "Beenden Sie alle alten Serverprozesse, die zum Datenverzeichnis »%s« gehören."
 
-#: port/sysv_sema.c:120
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "konnte Semaphore nicht erzeugen: %m"
 
-#: port/sysv_sema.c:121
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "Fehlgeschlagener Systemaufruf war semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:125
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
@@ -19801,7 +20356,7 @@ 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"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen, wie Sie Ihr System für PostgreSQL konfigurieren können."
 
-#: port/sysv_sema.c:155
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Sie müssen möglicherweise den Kernelparameter SEMVMX auf mindestens %d erhöhen.  Weitere Informationen finden Sie in der PostgreSQL-Dokumentation."
@@ -19926,383 +20481,402 @@ msgstr "Fehlgeschlagener Systemaufruf war DuplicateHandle."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Fehlgeschlagener Systemaufruf war MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "Autovacuum-Worker benötigte zu lange zum Starten; abgebrochen"
 
-#: postmaster/autovacuum.c:2199
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "Autovacuum: lösche verwaiste temporäre Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2435
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "automatisches Vacuum der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2438
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "automatisches Analysieren der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2632
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "verarbeite Arbeitseintrag für Relation »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:3250
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "Autovacuum wegen Fehlkonfiguration nicht gestartet"
 
-#: postmaster/autovacuum.c:3251
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Schalten Sie die Option »track_counts« ein."
 
+#: postmaster/autovacuum.c:3471
+#, c-format
+msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
+msgstr "»autovacuum_max_workers« (%d) sollte kleiner oder gleich »autovacuum_worker_slots« (%d) sein"
+
+#: postmaster/autovacuum.c:3473
+#, c-format
+msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
+msgstr "Der Server wird nur bis zu »autovacuum_worker_slots« (%d) Autovacuum-Arbeitsprozesse gleichzeitig starten."
+
 #: postmaster/bgworker.c:260
 #, c-format
-msgid "inconsistent background worker state (max_worker_processes=%d, total_slots=%d)"
-msgstr "inkonsistenter Background-Worker-Zustand (max_worker_processes=%d, total_slots=%d)"
+msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
+msgstr "inkonsistenter Background-Worker-Zustand (»max_worker_processes«=%d, Slots gesamt=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr "Background-Worker »%s«: Background-Worker ohne Shared-Memory-Zugriff werden nicht unterstützt"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, 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"
 
-#: postmaster/bgworker.c:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "Background-Worker »%s«: ungültiges Neustart-Intervall"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "Background-Worker »%s«: parallele Arbeitsprozesse dürfen nicht für Neustart konfiguriert sein"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3285
+#: postmaster/bgworker.c:710 tcop/postgres.c:3344
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "Background-Worker »%s« wird abgebrochen aufgrund von Anweisung des Administrators"
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, c-format
+msgid "database connection requirement not indicated during registration"
+msgstr "die Notwendigkeit, Datenbankverbindungen zu erzeugen, wurde bei der Registrierung nicht angezeigt"
+
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "ungültiger Verarbeitungsmodus in Background-Worker"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr "Background-Worker »%s«: muss in »shared_preload_libraries« registriert sein"
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, 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"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "zu viele Background-Worker"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, 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:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "Erhöhen Sie eventuell den Konfigurationsparameter »%s«."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "Checkpoints passieren zu oft (alle %d Sekunde)"
 msgstr[1] "Checkpoints passieren zu oft (alle %d Sekunden)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "Checkpoint-Anforderung fehlgeschlagen"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "Einzelheiten finden Sie in den letzten Meldungen im Serverlog."
 
-#: postmaster/launch_backend.c:369
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "konnte Serverprozess »%s« nicht ausführen: %m"
 
-#: postmaster/launch_backend.c:422
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr "konnte Backend-Parameter-Datei-Mapping nicht erzeugen: Fehlercode %lu"
 
-#: postmaster/launch_backend.c:430
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr "konnte Backend-Parameter-Speicher nicht mappen: Fehlercode %lu"
 
-#: postmaster/launch_backend.c:447
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "Kommandozeile für Subprozess zu lang"
 
-#: postmaster/launch_backend.c:465
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "Aufruf von CreateProcess() fehlgeschlagen: %m (Fehlercode %lu)"
 
-#: postmaster/launch_backend.c:492
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr "konnte Sicht der Backend-Parameter-Datei nicht unmappen: Fehlercode %lu"
 
-#: postmaster/launch_backend.c:496
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr "konnte Handle für Backend-Parameter-Datei nicht schließen: Fehlercode %lu"
 
-#: postmaster/launch_backend.c:518
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr "Aufgabe nach zu vielen Versuchen, Shared Memory zu reservieren"
 
-#: postmaster/launch_backend.c:519
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "Dies kann durch ASLR oder Antivirus-Software verursacht werden."
 
-#: postmaster/launch_backend.c:817
+#: postmaster/launch_backend.c:854
 #, 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/launch_backend.c:849
+#: postmaster/launch_backend.c:886
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "konnte geerbtes Socket nicht erzeugen: Fehlercode %d\n"
 
-#: postmaster/launch_backend.c:878
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
 msgstr "konnte Servervariablendatei »%s« nicht öffnen: %m\n"
 
-#: postmaster/launch_backend.c:884
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
 msgstr "konnte nicht aus Servervariablendatei »%s« lesen: %m\n"
 
-#: postmaster/launch_backend.c:895
-#, fuzzy, c-format
-#| msgid "could not read from backend variables file \"%s\": %s\n"
+#: postmaster/launch_backend.c:932
+#, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
-msgstr "konnte nicht aus Servervariablendatei »%s« lesen: %s\n"
+msgstr "konnte Startup-Daten nicht aus Servervariablendatei »%s« lesen: %m\n"
 
-#: postmaster/launch_backend.c:907
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
 msgstr "konnte Datei »%s« nicht löschen: %m\n"
 
-#: postmaster/launch_backend.c:923
+#: postmaster/launch_backend.c:960
 #, 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/launch_backend.c:942
+#: postmaster/launch_backend.c:979
 #, 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/launch_backend.c:949
+#: postmaster/launch_backend.c:986
 #, 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/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
 msgstr "»archive_mode« ist an, aber Archivierung wurde nicht konfiguriert"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "verwaiste Archivstatusdatei »%s« wurde entfernt"
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid "removal of orphan archive status file \"%s\" failed too many times, will try again later"
 msgstr "Entfernen der verwaisten Archivstatusdatei »%s« schlug zu oft fehl, wird später erneut versucht"
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr "Archivieren der Write-Ahead-Log-Datei »%s« schlug zu oft fehl, wird später erneut versucht"
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "sowohl »archive_command« als auch »archive_library« ist gesetzt"
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "Einstellungen »archive_command« und »archive_library« dürfen nicht beide gesetzt sein."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr "Archivierprozess wird neu gestartet, weil der Wert von »archive_library« geändert wurde"
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "Archivmodule müssen das Symbol %s definieren"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "Archivmodule müssen einen Archiv-Callback registrieren"
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:679
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: ungültiges Argument für Option -f: »%s«\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:752
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: ungültiges Argument für Option -t: »%s«\n"
 
-#: postmaster/postmaster.c:757
+#: postmaster/postmaster.c:775
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: ungültiges Argument: »%s«\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:843
 #, c-format
 msgid "%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" (%d) must be less than \"max_connections\" (%d)\n"
 msgstr "%s: »superuser_reserved_connections« (%d) plus »reserved_connections« (%d) muss kleiner als »max_connections« (%d) sein\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:851
 #, 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"
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:854
 #, c-format
 msgid "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be \"replica\" or \"logical\""
 msgstr "WAL-Streaming (»max_wal_senders« > 0) benötigt »wal_level« »replica« oder »logical«"
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:857
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "WAL kann nicht zusammengefasst werden, wenn »wal_level« »minimal« ist"
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:865
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ungültige datetoken-Tabellen, bitte reparieren\n"
 
-#: postmaster/postmaster.c:1004
+#: postmaster/postmaster.c:1026
 #, 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:1069
+#: postmaster/postmaster.c:1092
 #, c-format
 msgid "ending log output to stderr"
 msgstr "Logausgabe nach stderr endet"
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1093
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "Die weitere Logausgabe geht an Logziel »%s«."
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1104
 #, c-format
 msgid "starting %s"
 msgstr "%s startet"
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1166
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "konnte Listen-Socket für »%s« nicht erzeugen"
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1172
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "konnte keine TCP/IP-Sockets erstellen"
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1204
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "DNSServiceRegister() fehlgeschlagen: Fehlercode %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1257
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "konnte Unix-Domain-Socket in Verzeichnis »%s« nicht erzeugen"
 
-#: postmaster/postmaster.c:1240
+#: postmaster/postmaster.c:1263
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "konnte keine Unix-Domain-Sockets erzeugen"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1274
 #, c-format
 msgid "no socket created for listening"
 msgstr "keine Listen-Socket erzeugt"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1305
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: konnte Rechte der externen PID-Datei »%s« nicht ändern: %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1309
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: konnte externe PID-Datei »%s« nicht schreiben: %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1337 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "konnte %s nicht laden"
 
-#: postmaster/postmaster.c:1340
+#: postmaster/postmaster.c:1365
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "Postmaster ist während des Starts multithreaded geworden"
 
-#: postmaster/postmaster.c:1341
+#: postmaster/postmaster.c:1366 postmaster/postmaster.c:3650
 #, 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:1440
+#: postmaster/postmaster.c:1469
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: konnte Pfad des eigenen Programs nicht finden"
 
-#: postmaster/postmaster.c:1447
+#: postmaster/postmaster.c:1476
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: konnte kein passendes Programm »postgres« finden"
 
-#: postmaster/postmaster.c:1470 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1499 utils/misc/tzparser.c:342
 #, 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."
 
-#: postmaster/postmaster.c:1497
+#: postmaster/postmaster.c:1526
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -20314,329 +20888,316 @@ msgstr ""
 "aber die Datei »%s« konnte nicht geöffnet werden: %m\n"
 
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1787
+#: postmaster/postmaster.c:1763
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "%s wird an ungehorsame Kinder gesendet"
 
-#: postmaster/postmaster.c:1809
+#: postmaster/postmaster.c:1785
 #, 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:1872
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "falscher Schlüssel in Stornierungsanfrage für Prozess %d"
-
-#: postmaster/postmaster.c:1884
-#, 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:2105
+#: postmaster/postmaster.c:2005
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "SIGHUP empfangen, Konfigurationsdateien werden neu geladen"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2133 postmaster/postmaster.c:2137
+#: postmaster/postmaster.c:2013 postmaster/postmaster.c:2017
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s wurde nicht neu geladen"
 
-#: postmaster/postmaster.c:2147
+#: postmaster/postmaster.c:2027
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "SSL-Konfiguration wurde nicht neu geladen"
 
-#: postmaster/postmaster.c:2233
+#: postmaster/postmaster.c:2113
 #, c-format
 msgid "received smart shutdown request"
 msgstr "intelligentes Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2274
+#: postmaster/postmaster.c:2154
 #, c-format
 msgid "received fast shutdown request"
 msgstr "schnelles Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2292
+#: postmaster/postmaster.c:2172
 #, c-format
 msgid "aborting any active transactions"
 msgstr "etwaige aktive Transaktionen werden abgebrochen"
 
-#: postmaster/postmaster.c:2316
+#: postmaster/postmaster.c:2196
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "sofortiges Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2388
+#: postmaster/postmaster.c:2271
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "Herunterfahren beim Wiederherstellungsziel"
 
-#: postmaster/postmaster.c:2406 postmaster/postmaster.c:2442
+#: postmaster/postmaster.c:2309
 msgid "startup process"
 msgstr "Startprozess"
 
-#: postmaster/postmaster.c:2409
-#, c-format
-msgid "aborting startup due to startup process failure"
-msgstr "Serverstart abgebrochen wegen Startprozessfehler"
-
-#: postmaster/postmaster.c:2484
+#: postmaster/postmaster.c:2332
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "Datenbanksystem ist bereit, um Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:2505
+#: postmaster/postmaster.c:2354
 msgid "background writer process"
 msgstr "Background-Writer-Prozess"
 
-#: postmaster/postmaster.c:2552
+#: postmaster/postmaster.c:2387
 msgid "checkpointer process"
 msgstr "Checkpointer-Prozess"
 
-#: postmaster/postmaster.c:2568
+#: postmaster/postmaster.c:2404
 msgid "WAL writer process"
 msgstr "WAL-Schreibprozess"
 
-#: postmaster/postmaster.c:2583
+#: postmaster/postmaster.c:2420
 msgid "WAL receiver process"
 msgstr "WAL-Receiver-Prozess"
 
-#: postmaster/postmaster.c:2597
+#: postmaster/postmaster.c:2435
 msgid "WAL summarizer process"
 msgstr "WAL-Summarizer-Prozess"
 
-#: postmaster/postmaster.c:2612
+#: postmaster/postmaster.c:2451
 msgid "autovacuum launcher process"
 msgstr "Autovacuum-Launcher-Prozess"
 
-#: postmaster/postmaster.c:2630
+#: postmaster/postmaster.c:2467
 msgid "archiver process"
 msgstr "Archivierprozess"
 
-#: postmaster/postmaster.c:2643
+#: postmaster/postmaster.c:2482
 msgid "system logger process"
 msgstr "Systemlogger-Prozess"
 
-#: postmaster/postmaster.c:2660
-#, fuzzy
-#| msgid "could not create worker process: %m"
+#: postmaster/postmaster.c:2500
 msgid "slot sync worker process"
-msgstr "konnte Arbeitsprozess nicht erzeugen: %m"
+msgstr "Slot-Sync-Arbeitsprozess"
+
+#: postmaster/postmaster.c:2508 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "I/O-Arbeitsprozess"
 
-#: postmaster/postmaster.c:2716
+#: postmaster/postmaster.c:2530 postmaster/postmaster.c:2532
+msgid "untracked child process"
+msgstr "nicht verfolgter Kindprozess"
+
+#: postmaster/postmaster.c:2565
 #, c-format
 msgid "background worker \"%s\""
 msgstr "Background-Worker »%s«"
 
-#: postmaster/postmaster.c:2795 postmaster/postmaster.c:2815
-#: postmaster/postmaster.c:2822 postmaster/postmaster.c:2840
-msgid "server process"
-msgstr "Serverprozess"
-
-#: postmaster/postmaster.c:2894
+#: postmaster/postmaster.c:2786
 #, 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:3081
+#: postmaster/postmaster.c:2819
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) beendete mit Status %d"
 
-#: postmaster/postmaster.c:3083 postmaster/postmaster.c:3095
-#: postmaster/postmaster.c:3105 postmaster/postmaster.c:3116
+#: postmaster/postmaster.c:2821 postmaster/postmaster.c:2833
+#: postmaster/postmaster.c:2843 postmaster/postmaster.c:2854
 #, 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:3092
+#: postmaster/postmaster.c:2830
 #, 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:3102
+#: postmaster/postmaster.c:2840
 #, 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:3114
+#: postmaster/postmaster.c:2852
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) beendete mit unbekanntem Status %d"
 
-#: postmaster/postmaster.c:3330
+#: postmaster/postmaster.c:3143
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "abnormales Herunterfahren des Datenbanksystems"
 
-#: postmaster/postmaster.c:3356
+#: postmaster/postmaster.c:3169
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "fahre herunter wegen Startprozessfehler"
 
-#: postmaster/postmaster.c:3362
+#: postmaster/postmaster.c:3175
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "fahre herunter, weil »restart_after_crash« aus ist"
 
-#: postmaster/postmaster.c:3374
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "alle Serverprozesse beendet; initialisiere neu"
 
-#: postmaster/postmaster.c:3573 postmaster/postmaster.c:3983
-#: postmaster/postmaster.c:4372
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "konnte zufälligen Stornierungsschlüssel nicht erzeugen"
-
-#: postmaster/postmaster.c:3606
+#: postmaster/postmaster.c:3580
 #, 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:3648
+#: postmaster/postmaster.c:3615
 msgid "could not fork new process for connection: "
 msgstr "konnte neuen Prozess für Verbindung nicht starten (fork-Fehler): "
 
-#: postmaster/postmaster.c:3682
+#: postmaster/postmaster.c:3649
 #, c-format
-msgid "Please report this to <%s>."
-msgstr "Bitte berichten Sie dies an <%s>."
+msgid "postmaster became multithreaded"
+msgstr "Postmaster ist multithreaded geworden"
 
-#: postmaster/postmaster.c:3750
+#: postmaster/postmaster.c:3727
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "Datenbanksystem ist bereit, um lesende Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:3933
+#: postmaster/postmaster.c:3828
 #, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "konnte »%s«-Prozess nicht starten (fork-Fehler): %m"
-
-#: postmaster/postmaster.c:4171 postmaster/postmaster.c:4205
-#, c-format
-msgid "database connection requirement not indicated during registration"
-msgstr "die Notwendigkeit, Datenbankverbindungen zu erzeugen, wurde bei der Registrierung nicht angezeigt"
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL wurde unerwartet heruntergefahren"
 
-#: postmaster/postmaster.c:4181 postmaster/postmaster.c:4215
+#: postmaster/postmaster.c:3953
 #, c-format
-msgid "invalid processing mode in background worker"
-msgstr "ungültiger Verarbeitungsmodus in Background-Worker"
+msgid "no slot available for new autovacuum worker process"
+msgstr "kein Slot für neuen Autovacuum-Worker-Prozess verfügbar"
 
-#: postmaster/postmaster.c:4275
+#: postmaster/postmaster.c:3968
 #, c-format
-msgid "could not fork background worker process: %m"
-msgstr "konnte Background-Worker-Prozess nicht starten (fork-Fehler): %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "konnte »%s«-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4358
+#: postmaster/postmaster.c:4127
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "kein Slot für neuen Background-Worker-Prozess verfügbar"
 
-#: postmaster/postmaster.c:4621
+#: postmaster/postmaster.c:4145
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "konnte Background-Worker-Prozess nicht starten (fork-Fehler): %m"
+
+#: postmaster/postmaster.c:4478
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "konnte Exitcode des Prozesses nicht lesen\n"
 
-#: postmaster/postmaster.c:4663
+#: postmaster/postmaster.c:4520
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "konnte Child-Completion-Status nicht versenden\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "konnte nicht aus Logger-Pipe lesen: %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "konnte Pipe für Syslog nicht erzeugen: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "konnte Systemlogger nicht starten (fork-Fehler): %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "Logausgabe wird an Logsammelprozess umgeleitet"
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "Die weitere Logausgabe wird im Verzeichnis »%s« erscheinen."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "konnte Standardausgabe nicht umleiten: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "konnte Standardfehlerausgabe nicht umleiten: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "konnte nicht in Logdatei schreiben: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "konnte Logdatei »%s« nicht öffnen: %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "automatische Rotation abgeschaltet (SIGHUP zum Wiederanschalten verwenden)"
 
-#: postmaster/walsummarizer.c:384
+#: postmaster/walsummarizer.c:744
 #, c-format
-msgid "switch point from TLI %u to TLI %u is at %X/%X"
-msgstr ""
+msgid "WAL summarization is not progressing"
+msgstr "WAL-Zusammenfassung kommt nicht voran"
+
+#: postmaster/walsummarizer.c:745
+#, c-format
+msgid "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/%X in memory."
+msgstr "Zusammenfassung bis %X/%X wird benötigt, aber sie hängt fest bei %X/%X auf Festplatte und %X/%X im Speicher."
+
+#: postmaster/walsummarizer.c:759
+#, c-format
+msgid "still waiting for WAL summarization through %X/%X after %ld second"
+msgid_plural "still waiting for WAL summarization through %X/%X after %ld seconds"
+msgstr[0] "warte immer noch auf WAL-Zusammenfassung bis %X/%X nach %ld Sekunde"
+msgstr[1] "warte immer noch auf WAL-Zusammenfassung bis %X/%X nach %ld Sekunden"
+
+#: postmaster/walsummarizer.c:764
+#, c-format
+msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
+msgstr "Zusammenfassung hat %X/%X auf Festplatte und %X/%X im Speicher erreicht."
 
-#: postmaster/walsummarizer.c:885
+#: postmaster/walsummarizer.c:1004
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "konnte keinen gültigen Datensatz nach %X/%X finden"
 
-#: postmaster/walsummarizer.c:930
+#: postmaster/walsummarizer.c:1049
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "konnte WAL aus Zeitleiste %u bei %X/%X nicht lesen: %s"
 
-#: postmaster/walsummarizer.c:936
+#: postmaster/walsummarizer.c:1055
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "konnte WAL aus Zeitleiste %u bei %X/%X nicht lesen"
 
-#: postmaster/walsummarizer.c:1077
-#, c-format
-msgid "summarized WAL on TLI %u from %X/%X to %X/%X"
-msgstr ""
-
-#: postmaster/walsummarizer.c:1385
-#, c-format
-msgid "timeline %u became historic, can read up to %X/%X"
-msgstr ""
-
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "konnte die für den regulären Ausdruck zu verwendende Sortierfolge nicht bestimmen"
@@ -20646,153 +21207,153 @@ msgstr "konnte die für den regulären Ausdruck zu verwendende Sortierfolge nich
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "nichtdeterministische Sortierfolgen werden von regulären Ausdrücken nicht unterstützt"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "ungültige Zeitleiste %u"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "ungültige Streaming-Startposition"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243
+#: replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "Passwort wird benötigt"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "Nicht-Superuser kann nicht verbinden, wenn der Server kein Passwort anfordert."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr "Die Authentifizierungsmethode des Zielservers muss geändern werden oder setzen Sie password_required=false in den Subskriptionsparametern."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "konnte Suchpfad nicht auf leer setzen: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308
+#: replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "ungültige Syntax für Verbindungszeichenkette: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "Nicht-Superuser müssen ein Passwort in den Verbindungsparametern angeben."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "konnte Verbindungsparameter nicht interpretieren: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr "konnte Datenbanksystemidentifikator und Zeitleisten-ID nicht vom Primärserver empfangen: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455
+#: replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "ungültige Antwort vom Primärserver"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr "Konnte System nicht identifizieren: %d Zeilen und %d Felder erhalten, %d Zeilen und %d oder mehr Felder erwartet."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597
+#: replication/libpqwalreceiver/libpqwalreceiver.c:604
+#: replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "konnte WAL-Streaming nicht starten: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "konnte End-of-Streaming-Nachricht nicht an Primärserver senden: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "unerwartete Ergebnismenge nach End-of-Streaming"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "Fehler beim Beenden des COPY-Datenstroms: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "Fehler beim Lesen des Ergebnisses von Streaming-Befehl: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721
+#: replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "unerwartetes Ergebnis nach CommandComplete: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "konnte Zeitleisten-History-Datei nicht vom Primärserver empfangen: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "1 Tupel mit 2 Feldern erwartet, %d Tupel mit %d Feldern erhalten."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818
+#: replication/libpqwalreceiver/libpqwalreceiver.c:873
+#: replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "konnte keine Daten vom WAL-Stream empfangen: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "konnte keine Daten an den WAL-Stream senden: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "konnte Replikations-Slot »%s« nicht erzeugen: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "konnte Replikations-Slot »%s« nicht ändern: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "ungültige Antwort auf Anfrage"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "%d Felder erwartet, %d Feldern erhalten."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "Ausführen von Anfragen benötigt eine Datenbankverbindung"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "leere Anfrage"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "unerwarteter Pipeline-Modus"
 
@@ -20801,165 +21362,261 @@ msgstr "unerwarteter Pipeline-Modus"
 msgid "logical replication parallel apply worker for subscription \"%s\" has finished"
 msgstr "Parallel-Apply-Worker für logische Replikation für Subskription »%s« hat abschlossen"
 
-#: replication/logical/applyparallelworker.c:822
+#: replication/logical/applyparallelworker.c:831
 #, c-format
 msgid "lost connection to the logical replication apply worker"
 msgstr "Verbindung mit dem Apply-Worker für logische Replikation verloren"
 
-#: replication/logical/applyparallelworker.c:1024
-#: replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1042
 msgid "logical replication parallel apply worker"
 msgstr "Parallel-Apply-Worker für logische Replikation"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1056
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr "Parallel-Apply-Worker für logische Replikation beendete wegen eines Fehlers"
 
-#: replication/logical/applyparallelworker.c:1127
-#: replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1143
+#: replication/logical/applyparallelworker.c:1316
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "Verbindung mit dem Parallel-Apply-Worker für logische Replikation verloren"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1196
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "konnte Daten nicht an Shared-Memory-Queue senden"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1231
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr "Apply-Worker für logische Replikation wird die restlichen Änderungen der Remote-Transaktion %u in eine Datei serialisieren"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/conflict.c:126
+#, c-format
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "Konflikt entdeckt für Relation »%s.%s«: Konflikt=%s"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified locally in transaction %u at %s."
+msgstr "Schlüssel existiert bereits in Unique Index »%s«, lokal modifiziert in Transaktion %u um %s."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by origin \"%s\" in transaction %u at %s."
+msgstr "Schlüssel existiert bereits in Unique Index »%s«, modifiziert von Origin »%s« in Transaktion %u um %s."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by a non-existent origin in transaction %u at %s."
+msgstr "Schlüssel existiert bereits in Unique Index »%s«, modifiziert von nicht existierendem Origin in Transaktion %u um %s."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr "Schlüssel existiert bereits in Unique Index »%s«, modifiziert in Transaktion %u."
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr "Aktualisiere die Zeile, die lokal in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid "Updating the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Aktualisiere die Zeile, die von einem anderen Origin »%s« in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid "Updating the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Aktualisiere die Zeile, die von einem nicht existierenden Origin in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:265
+msgid "Could not find the row to be updated."
+msgstr "Konnte die zu aktualisierende Zeile nicht finden."
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "Lösche die Zeile, die lokal in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid "Deleting the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Lösche die Zeile, die von einem anderen Origin »%s« in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid "Deleting the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Lösche die Zeile, die von einem nicht existierenden Origin in Transaktion %u um %s modifiziert wurde."
+
+#: replication/logical/conflict.c:284
+msgid "Could not find the row to be deleted."
+msgstr "Konnte die zu löschende Zeile nicht finden."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "Schlüssel %s"
+
+#: replication/logical/conflict.c:364
+#, c-format
+msgid "existing local row %s"
+msgstr "bestehende lokale Zeile %s"
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "Bestehende lokale Zeile %s"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "entfernte Zeile %s"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "Entfernte Zeile %s"
+
+#: replication/logical/conflict.c:434
+#, c-format
+msgid "replica identity %s"
+msgstr "Replika-Identität %s"
+
+#: replication/logical/conflict.c:435
+#, c-format
+msgid "replica identity full %s"
+msgstr "Replika-Identität Full %s"
+
+#: replication/logical/conflict.c:440
+#, c-format
+msgid "Replica identity %s"
+msgstr "Replika-Identität %s"
+
+#: replication/logical/conflict.c:441
+#, c-format
+msgid "Replica identity full %s"
+msgstr "Replika-Identität Full %s"
+
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "logische Dekodierung auf dem Standby-Server erfordert »wal_level« >= »logical« auf dem Primärserver"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
-msgstr "Arbeitsprozesse für logische Replikation können nicht gestartet werden, wenn max_replication_slots = 0"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "Arbeitsprozesse für logische Replikation können nicht gestartet werden, wenn »max_active_replication_origins« 0 ist"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "alle Slots für Arbeitsprozesse für logische Replikation belegt"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:963 storage/lmgr/lock.c:1001
-#: storage/lmgr/lock.c:2804 storage/lmgr/lock.c:4189 storage/lmgr/lock.c:4254
-#: storage/lmgr/lock.c:4604 storage/lmgr/predicate.c:2464
-#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:3876
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "Sie müssen möglicherweise »%s« erhöhen."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "alle Slots für Background-Worker belegt"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "Arbeitsprozess-Slot %d für logische Replikation ist leer, kann nicht zugeteilt werden"
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr "Arbeitsprozess-Slot %d für logische Replikation wird schon von einem anderen Arbeitsprozess verwendet, kann nicht zugeteilt werden"
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "logische Dekodierung erfordert »wal_level« >= »logical«"
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "logische Dekodierung benötigt eine Datenbankverbindung"
 
-#: replication/logical/logical.c:364 replication/logical/logical.c:518
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, 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:369 replication/logical/logical.c:528
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "Replikations-Slot »%s« wurde nicht in dieser Datenbank erzeugt"
 
-#: replication/logical/logical.c:376
+#: replication/logical/logical.c:379
 #, 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:539
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "physischer Replikations-Slot »%s« kann nicht für logisches Dekodieren verwendet werden"
 
-#: replication/logical/logical.c:541
+#: replication/logical/logical.c:546 replication/slot.c:858
+#: replication/slot.c:903
 #, c-format
-msgid "This slot is being synchronized from the primary server."
-msgstr "Dieser Slot wird vom Primärserver synchronisiert."
+msgid "This replication slot is being synchronized from the primary server."
+msgstr "Dieser Replikations-Slot wird vom Primärserver synchronisiert."
 
-#: replication/logical/logical.c:542
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "Geben Sie einen anderen Replikations-Slot an."
 
-#: replication/logical/logical.c:553 replication/logical/logical.c:560
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "aus Replikations-Slot »%s« können keine Änderungen mehr gelesen werden"
-
-#: replication/logical/logical.c:555
-#, c-format
-msgid "This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr "Dieser Slot wurde ungültig gemacht, weil er die maximale reservierte Größe überschritten hat."
-
-#: replication/logical/logical.c:562
-#, c-format
-msgid "This slot has been invalidated because it was conflicting with recovery."
-msgstr "Dieser Slot wurde ungültig gemacht, weil er mit der Wiederherstellung kollidierte."
-
-#: replication/logical/logical.c:627
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "starte logisches Dekodieren für Slot »%s«"
 
-#: replication/logical/logical.c:629
+#: replication/logical/logical.c:615
 #, 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:777
+#: replication/logical/logical.c:763
 #, 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"
 
-#: replication/logical/logical.c:783
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "Slot »%s«, Ausgabe-Plugin »%s«, im Callback %s"
 
-#: replication/logical/logical.c:954 replication/logical/logical.c:999
-#: replication/logical/logical.c:1044 replication/logical/logical.c:1090
+#: replication/logical/logical.c:940 replication/logical/logical.c:985
+#: replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "logische Replikation bei PREPARE TRANSACTION benötigt einen %s-Callback"
 
-#: replication/logical/logical.c:1322 replication/logical/logical.c:1371
-#: replication/logical/logical.c:1412 replication/logical/logical.c:1498
-#: replication/logical/logical.c:1547
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357
+#: replication/logical/logical.c:1398 replication/logical/logical.c:1484
+#: replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "logisches Streaming benötigt einen %s-Callback"
 
-#: replication/logical/logical.c:1457
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "logisches Streaming bei PREPARE TRANSACTION benötigt einen %s-Callback"
@@ -20984,7 +21641,7 @@ msgstr "Array muss eindimensional sein"
 msgid "array must not contain nulls"
 msgstr "Array darf keine NULL-Werte enthalten"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1406
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -20995,1184 +21652,1224 @@ msgstr "Array muss eine gerade Anzahl Elemente haben"
 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"
 
-#: replication/logical/origin.c:190
+#: replication/logical/origin.c:195
 #, c-format
-msgid "cannot query or manipulate replication origin when \"max_replication_slots\" is 0"
-msgstr "Replication-Origin kann nicht abgefragt oder geändert werden, wenn »max_replication_slots« 0 ist"
+msgid "cannot query or manipulate replication origin when \"max_active_replication_origins\" is 0"
+msgstr "Replication-Origin kann nicht abgefragt oder geändert werden, wenn »max_active_replication_origins« 0 ist"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "Replication-Origins können nicht während der Wiederherstellung geändert werden"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "Replication-Origin »%s« existiert nicht"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "Replication-Origin-Name ist zu lang"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "Replication-Origin-Namen dürfen nicht länger als %d Bytes sein."
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "konnte keine freie Replication-Origin-ID finden"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "konnte Replication-Origin mit ID %d nicht löschen, wird von PID %d verwendet"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "Replication-Origin mit ID %d existiert nicht"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, 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:798
+#: replication/logical/origin.c:821
 #, 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«"
+msgid "could not find free replication state, increase \"max_active_replication_origins\""
+msgstr "konnte keinen freien Replication-State finden, erhöhen Sie »max_active_replication_origins«"
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "Replikationszustand von Knoten %d auf %X/%X wiederhergestellt"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, 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:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "Replication-Origin mit ID %d ist bereits aktiv für PID %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr "konnte keinen freien Replication-State-Slot für Replication-Origin mit ID %d finden"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
-msgid "Increase \"max_replication_slots\" and try again."
-msgstr "Erhöhen Sie »max_replication_slots« und versuchen Sie es erneut."
+msgid "Increase \"max_active_replication_origins\" and try again."
+msgstr "Erhöhen Sie »max_active_replication_origins« und versuchen Sie es erneut."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, 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:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "kein Replication-Origin konfiguriert"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "Replication-Origin-Name »%s« ist reserviert"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "Replication-Origin-Namen »%s«, »%s« und Namen, die mit »pg_« anfangen, sind reserviert."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "»%s«"
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", »%s«"
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid "logical replication target relation \"%s.%s\" is missing replicated column: %s"
 msgid_plural "logical replication target relation \"%s.%s\" is missing replicated columns: %s"
 msgstr[0] "in Zielrelation für logische Replikation »%s.%s« fehlt eine replizierte Spalte: %s"
 msgstr[1] "in Zielrelation für logische Replikation »%s.%s« fehlen replizierte Spalten: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, c-format
+msgid "logical replication target relation \"%s.%s\" has incompatible generated column: %s"
+msgid_plural "logical replication target relation \"%s.%s\" has incompatible generated columns: %s"
+msgstr[0] "Zielrelation für logische Replikation »%s.%s« hat eine inkompatible generierte Spalte: %s"
+msgstr[1] "Zielrelation für logische Replikation »%s.%s« hat inkompatible generierte Spalten: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid "logical replication target relation \"%s.%s\" uses system columns in REPLICA IDENTITY index"
 msgstr "Zielrelation für logische Replikation »%s.%s« verwendet Systemspalten in REPLICA-IDENTITY-Index"
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "Zielrelation für logische Replikation »%s.%s« existiert nicht"
 
-#: replication/logical/reorderbuffer.c:3970
+#: replication/logical/reorderbuffer.c:4252
 #, 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:4316
-#: replication/logical/reorderbuffer.c:4341
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, 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:4320
-#: replication/logical/reorderbuffer.c:4345
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, 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:4595
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
-msgstr "konnte Datei »%s« nicht löschen, bei Löschen von pg_replslot/%s/xid*: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
+msgstr "konnte Datei »%s« nicht löschen, beim Löschen von %s/%s/xid*: %m"
 
-#: replication/logical/reorderbuffer.c:5091
+#: replication/logical/reorderbuffer.c:5373
 #, 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"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:225 replication/logical/slotsync.c:620
 #, c-format
-msgid "could not sync slot \"%s\" as remote slot precedes local slot"
-msgstr ""
+msgid "could not synchronize replication slot \"%s\""
+msgstr "konnte Replikations-Slot »%s« nicht synchronisieren"
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:227
 #, c-format
-msgid "Remote slot has LSN %X/%X and catalog xmin %u, but local slot has LSN %X/%X and catalog xmin %u."
-msgstr ""
-
-#: replication/logical/slotsync.c:459
-#, fuzzy, c-format
-#| msgid "dropped replication slot \"%s\" on publisher"
-msgid "dropped replication slot \"%s\" of dbid %u"
-msgstr "Replikations-Slot »%s« auf dem Publikationsserver wurde gelöscht"
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
+msgstr "Synchronisation könnte zu Datenverlust führen, weil der Remote-Slot WAL bei LSN %X/%X und Katalog-xmin %u benötigt, aber der Standby LSN %X/%X und Katalog-xmin %u hat."
 
-#: replication/logical/slotsync.c:579
-#, fuzzy, c-format
-#| msgid "could not fsync file \"%s\": %m"
-msgid "could not sync slot \"%s\""
-msgstr "konnte Datei »%s« nicht fsyncen: %m"
+#: replication/logical/slotsync.c:499
+#, c-format
+msgid "dropped replication slot \"%s\" of database with OID %u"
+msgstr "Replikations-Slot »%s« von Datenbank mit OID %u wurde gelöscht"
 
-#: replication/logical/slotsync.c:580
-#, fuzzy, c-format
-#| msgid "logical decoding found consistent point at %X/%X"
-msgid "Logical decoding cannot find consistent point from local slot's LSN %X/%X."
-msgstr "logisches Dekodieren fand konsistenten Punkt bei %X/%X"
+#: replication/logical/slotsync.c:621
+#, c-format
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr "Synchronisation könnte zu Datenverlust führen, weil der Standby keinen konsistenten Snapshot zum Dekodieren von WAL bei LSN %X/%X bauen konnte."
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:630
 #, c-format
-msgid "newly created slot \"%s\" is sync-ready now"
-msgstr ""
+msgid "newly created replication slot \"%s\" is sync-ready now"
+msgstr "neu erzeugter Replikations-Slot »%s« ist jetzt bereit für die Synchronisierung"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:669
 #, c-format
-msgid "skipping slot synchronization as the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
-msgstr ""
+msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
+msgstr "Slot-Synchronisierung wird übersprungen, weil die empfangene Slot-Sync-LSN %X/%X für Slot »%s« der Position %X/%X des Standbys voraus ist"
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:691
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
-msgstr ""
+msgstr "verlasse Slot-Synchronisierung, weil der gleiche Slot »%s« schon auf dem Standby existiert"
 
-#: replication/logical/slotsync.c:819
-#, fuzzy, c-format
-#| msgid "could not receive timeline history file from the primary server: %s"
+#: replication/logical/slotsync.c:862
+#, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
-msgstr "konnte Zeitleisten-History-Datei nicht vom Primärserver empfangen: %s"
+msgstr "konnte Informationen über logische Failover-Slots nicht vom Primärserver holen: %s"
 
-#: replication/logical/slotsync.c:965
-#, fuzzy, c-format
-#| msgid "could not receive timeline history file from the primary server: %s"
-msgid "could not fetch primary_slot_name \"%s\" info from the primary server: %s"
-msgstr "konnte Zeitleisten-History-Datei nicht vom Primärserver empfangen: %s"
+#: replication/logical/slotsync.c:1011
+#, c-format
+msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
+msgstr "konnte Informationen über primary_slot_name »%s« nicht vom Primärserver holen: %s"
 
-#: replication/logical/slotsync.c:967
+#: replication/logical/slotsync.c:1013
 #, c-format
-msgid "Check if primary_slot_name is configured correctly."
-msgstr ""
+msgid "Check if \"primary_slot_name\" is configured correctly."
+msgstr "Prüfen Sie, ob »primary_slot_name« korrekt konfiguriert ist."
 
-#: replication/logical/slotsync.c:987
-#, fuzzy, c-format
-#| msgid "cannot copy a replication slot that doesn't reserve WAL"
+#: replication/logical/slotsync.c:1033
+#, c-format
 msgid "cannot synchronize replication slots from a standby server"
-msgstr "ein Replikations-Slot, der kein WAL reserviert, kann nicht kopiert werden"
+msgstr "Replikations-Slots können nicht von einem Standby-Server synchronisiert werden"
 
-#: replication/logical/slotsync.c:995
+#. translator: second %s is a GUC variable name
+#: replication/logical/slotsync.c:1042
 #, c-format
-msgid "slot synchronization requires valid primary_slot_name"
-msgstr ""
+msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
+msgstr "Replikations-Slot »%s«, der in »%s« angegeben ist, existiert auf dem Publikationsserver nicht"
 
-#. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:997
-#, fuzzy, c-format
-#| msgid "publication %s does not exist on the publisher"
-#| msgid_plural "publications %s do not exist on the publisher"
-msgid "The replication slot \"%s\" specified by %s does not exist on the primary server."
-msgstr "Publikation %s existiert auf dem Publikationsserver nicht"
-
-#: replication/logical/slotsync.c:1029
-#, fuzzy, c-format
-#| msgid "option %s requires option %s to be specified"
-msgid "slot synchronization requires dbname to be specified in %s"
-msgstr "Option %s erfordert, dass Option %s angegeben wird"
-
-#: replication/logical/slotsync.c:1050
-#, fuzzy, c-format
-#| msgid "slot synchronization requires wal_level >= \"logical\""
-msgid "slot synchronization requires \"wal_level\" >= \"logical\""
-msgstr "logische Dekodierung erfordert wal_level >= »logical«"
-
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
-#, fuzzy, c-format
-#| msgid "option %s requires option %s to be specified"
-msgid "slot synchronization requires %s to be defined"
-msgstr "Option %s erfordert, dass Option %s angegeben wird"
-
-#: replication/logical/slotsync.c:1077
-#, fuzzy, c-format
-#| msgid "option %s requires option %s to be specified"
-msgid "slot synchronization requires %s to be enabled"
-msgstr "Option %s erfordert, dass Option %s angegeben wird"
+#. translator: first %s is a connection option; second %s is a GUC
+#. variable name
+#.
+#: replication/logical/slotsync.c:1075
+#, c-format
+msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
+msgstr "Replikations-Slot-Synchronisierung erfordert, dass »%s« in »%s« angegeben wird"
+
+#: replication/logical/slotsync.c:1094
+#, c-format
+msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
+msgstr "Replikations-Slot-Synchronisierung erfordert »wal_level« >= »logical«"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1109 replication/logical/slotsync.c:1137
 #, c-format
-msgid "slot sync worker will shutdown because %s is disabled"
-msgstr ""
+msgid "replication slot synchronization requires \"%s\" to be set"
+msgstr "Replikations-Slot-Synchronisierung erfordert, dass »%s« definiert ist"
 
-#: replication/logical/slotsync.c:1138
-#, fuzzy, c-format
-#| msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
-msgid "slot sync worker will restart because of a parameter change"
-msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird neu starten wegen einer Parameteränderung"
+#. translator: %s is a GUC variable name
+#: replication/logical/slotsync.c:1123
+#, c-format
+msgid "replication slot synchronization requires \"%s\" to be enabled"
+msgstr "Replikations-Slot-Synchronisierung erfordert, dass »%s« eingeschaltet ist"
 
-#: replication/logical/slotsync.c:1162
+#. translator: %s is a GUC variable name
+#: replication/logical/slotsync.c:1180
 #, c-format
-msgid "slot sync worker is shutting down on receiving SIGINT"
-msgstr ""
+msgid "replication slot synchronization worker will stop because \"%s\" is disabled"
+msgstr "Arbeitsprozess für Replikations-Slot-Synchronisierung wird anhalten, weil »%s« deaktiviert ist"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1198
 #, c-format
-msgid "cannot synchronize replication slots when standby promotion is ongoing"
-msgstr ""
+msgid "replication slot synchronization worker will restart because of a parameter change"
+msgstr "Arbeitsprozess für Replikations-Slot-Synchronisierung wird neu starten wegen einer Parameteränderung"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1223
+#, c-format
+msgid "replication slot synchronization will stop because of a parameter change"
+msgstr "Arbeitsprozess für Replikations-Slot-Synchronisierung wird anhalten wegen einer Parameteränderung"
+
+#: replication/logical/slotsync.c:1259
+#, c-format
+msgid "replication slot synchronization worker will stop because promotion is triggered"
+msgstr "Arbeitsprozess für Replikations-Slot-Synchronisierung wird anhalten, weil Beförderung ausgelöst wurde"
+
+#: replication/logical/slotsync.c:1273
+#, c-format
+msgid "replication slot synchronization will stop because promotion is triggered"
+msgstr "Replikations-Slot-Synchronisierung wird anhalten, weil Beförderung ausgelöst wurde"
+
+#: replication/logical/slotsync.c:1393
+#, c-format
+msgid "replication slot synchronization worker will not start because promotion was triggered"
+msgstr "Arbeitsprozess für Replikations-Slot-Synchronisierung wird nicht starten, weil Beförderung ausgelöst wurde"
+
+#: replication/logical/slotsync.c:1405
+#, c-format
+msgid "replication slot synchronization will not start because promotion was triggered"
+msgstr "Replikations-Slot-Synchronisierung wird nicht starten, weil Beförderung ausgelöst wurde"
+
+#: replication/logical/slotsync.c:1414
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "Replikations-Slots können nicht nebenläufig synchronisiert werden"
 
-#: replication/logical/slotsync.c:1403
-#, fuzzy, c-format
-#| msgid "server started\n"
+#: replication/logical/slotsync.c:1526
+#, c-format
 msgid "slot sync worker started"
-msgstr "Server gestartet\n"
+msgstr "Slot-Sync-Arbeitsprozess gestartet"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
+#: replication/logical/slotsync.c:1588 replication/slotfuncs.c:928
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "konnte nicht mit dem Primärserver verbinden: %s"
+msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
+msgstr "Synchronisierungs-Arbeitsprozess »%s« konnte nicht mit dem Primärserver verbinden: %s"
 
-#: replication/logical/snapbuild.c:643
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "initialer Slot-Snapshot ist zu groß"
 
-#: replication/logical/snapbuild.c:697
+#: replication/logical/snapbuild.c:568
 #, 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"
 
-#: replication/logical/snapbuild.c:1392 replication/logical/snapbuild.c:1484
-#: replication/logical/snapbuild.c:2000
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "logisches Dekodieren fand konsistenten Punkt bei %X/%X"
 
-#: replication/logical/snapbuild.c:1394
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "Keine laufenden Transaktionen."
 
-#: replication/logical/snapbuild.c:1436
+#: replication/logical/snapbuild.c:1362
 #, 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:1438 replication/logical/snapbuild.c:1462
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "Warten auf Abschluss der Transaktionen (ungefähr %d), die älter als %u sind."
 
-#: replication/logical/snapbuild.c:1460
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr "logisches Dekodieren fand initialen konsistenten Punkt bei %X/%X"
 
-#: replication/logical/snapbuild.c:1486
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "Es laufen keine alten Transaktionen mehr."
 
-#: replication/logical/snapbuild.c:1887
+#: replication/logical/snapbuild.c:1783
 #, 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"
 
-#: replication/logical/snapbuild.c:1893
+#: replication/logical/snapbuild.c:1789
 #, 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"
 
-#: replication/logical/snapbuild.c:1934
+#: replication/logical/snapbuild.c:1830
 #, 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"
 
-#: replication/logical/snapbuild.c:2002
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Logische Dekodierung beginnt mit gespeichertem Snapshot."
 
-#: replication/logical/snapbuild.c:2109
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "konnte Dateinamen »%s« nicht parsen"
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr "Arbeitsprozess für logische Replikation für Tabellensynchronisation für Subskription »%s«, Tabelle »%s« hat abgeschlossen"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr "Apply-Worker für logische Replikation für Subskription »%s« wird neu starten, damit two_phase eingeschaltet werden kann"
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "konnte Tabelleninformationen für Tabelle »%s.%s« nicht vom Publikationsserver holen: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "Tabelle »%s.%s« nicht auf dem Publikationsserver gefunden"
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "konnte Spaltenlisteninformationen für Tabelle »%s.%s« nicht vom Publikationsserver holen: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr "konnte WHERE-Klausel-Informationen für Tabelle »%s.%s« nicht vom Publikationsserver holen: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "konnte Kopieren des Anfangsinhalts für Tabelle »%s.%s« nicht starten: %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
 #, c-format
-msgid "table copy could not start transaction on publisher: %s"
-msgstr "beim Kopieren der Tabelle konnte die Transaktion auf dem Publikationsserver nicht gestartet werden: %s"
+msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "Arbeitsprozess für Tabellensynchronisation für Subskription »%s« konnte nicht mit dem Publikationsserver verbinden: %s"
 
-#: replication/logical/tablesync.c:1472
+#: replication/logical/tablesync.c:1480
 #, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "Replication-Origin »%s« existiert bereits"
+msgid "table copy could not start transaction on publisher: %s"
+msgstr "beim Kopieren der Tabelle konnte die Transaktion auf dem Publikationsserver nicht gestartet werden: %s"
 
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr "Benutzer »%s« kann nicht in eine Relation mit Sicherheit auf Zeilenebene replizieren: »%s«"
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "beim Kopieren der Tabelle konnte die Transaktion auf dem Publikationsserver nicht beenden werden: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "Parallel-Apply-Worker für logische Replikation für Subskription »%s« wird anhalten"
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr "Gestreamte Replikationstransaktionen können erst mit parallelen Apply-Worker-Prozessen verarbeitet werden, wenn alle Tabellen synchronisiert worden sind."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "falsches Binärdatenformat in Spalte %d in logischer Replikation"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr "Publikationsserver hat nicht die Replikidentitätsspalten gesendet, die von Replikationszielrelation »%s.%s« erwartet wurden"
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr "Zielrelation für logische Replikation »%s.%s« hat weder REPLICA-IDENTITY-Index noch Primärschlüssel und die publizierte Relation hat kein REPLICA IDENTITY FULL"
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "ungültiger Nachrichtentyp für logische Replikation »??? (%d)«"
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "Datenstrom vom Publikationsserver endete"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "Arbeitsprozess für logische Replikation wird abgebrochen wegen Zeitüberschreitung"
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird anhalten, weil die Subskription entfernt wurde"
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird anhalten, weil die Subskription deaktiviert wurde"
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr "Parallel-Apply-Worker für logische Replikation für Subskription »%s« wird anhalten wegen einer Parameteränderung"
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird neu starten wegen einer Parameteränderung"
 
-#: replication/logical/worker.c:3954
-#, fuzzy, c-format
-#| msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
+#: replication/logical/worker.c:4053
+#, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
-msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird anhalten, weil die Subskription deaktiviert wurde"
+msgstr "Parallel-Apply-Worker für logische Replikation für Subskription »%s« wird anhalten, weil die Superuser-Privilegien des Eigentümers der Subskription entzogen wurden"
 
-#: replication/logical/worker.c:3958
-#, fuzzy, c-format
-#| msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
+#: replication/logical/worker.c:4057
+#, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
-msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird anhalten, weil die Subskription deaktiviert wurde"
+msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird neu starten, weil die Superuser-Privilegien des Eigentümers der Subskription entzogen wurden"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "für die Subskription ist kein Replikations-Slot gesetzt"
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, c-format
+msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "Apply-Worker für Subskription »%s« konnte nicht mit dem Publikationsserver verbinden: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr "Arbeitsprozess für logische Replikation für Subskription %u« wird nicht starten, weil die Subskription während des Starts entfernt wurde"
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr "Arbeitsprozess für logische Replikation für Subskription »%s« wird nicht starten, weil die Subskription während des Starts deaktiviert wurde"
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr "Arbeitsprozess für logische Replikation für Tabellensynchronisation für Subskription »%s«, Tabelle »%s« hat gestartet"
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "Apply-Worker für logische Replikation für Subskription »%s« hat gestartet"
 
-#: replication/logical/worker.c:4734
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "Subskription »%s« wurde wegen eines Fehlers deaktiviert"
 
-#: replication/logical/worker.c:4782
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "logische Replikation beginnt Überspringen von Transaktion bei %X/%X"
 
-#: replication/logical/worker.c:4796
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "logische Replikation beendet Überspringen von Transaktion bei %X/%X"
 
-#: replication/logical/worker.c:4878
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "Skip-LSN von Subskription »%s« gelöscht"
 
-#: replication/logical/worker.c:4879
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr "Die WAL-Endposition (LSN) %X/%X der Remote-Transaktion stimmte nicht mit der Skip-LSN %X/%X überein."
 
-#: replication/logical/worker.c:4905
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s«"
 
-#: replication/logical/worker.c:4909
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« in Transaktion %u"
 
-#: replication/logical/worker.c:4914
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« in Transaktion %u, beendet bei %X/%X"
 
-#: replication/logical/worker.c:4925
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« für Replikationszielrelation »%s.%s« in Transaktion %u"
 
-#: replication/logical/worker.c:4932
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« für Replikationszielrelation »%s.%s« in Transaktion %u, beendet bei %X/%X"
 
-#: replication/logical/worker.c:4943
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« für Replikationszielrelation »%s.%s« Spalte »%s« in Transaktion %u"
 
-#: replication/logical/worker.c:4951
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr "Verarbeiten empfangener Daten für Replication-Origin »%s« bei Nachrichtentyp »%s« für Replikationszielrelation »%s.%s« Spalte »%s« in Transaktion %u, beendet bei %X/%X"
 
-#: replication/pgoutput/pgoutput.c:315
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "ungültige proto_version"
 
-#: replication/pgoutput/pgoutput.c:320
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_version »%s« ist außerhalb des gültigen Bereichs"
 
-#: replication/pgoutput/pgoutput.c:337
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "ungültige Syntax für publication_names"
 
-#: replication/pgoutput/pgoutput.c:407
-#, fuzzy, c-format
-#| msgid "proto_version \"%s\" out of range"
-msgid "proto_version option missing"
-msgstr "proto_version »%s« ist außerhalb des gültigen Bereichs"
-
-#: replication/pgoutput/pgoutput.c:411
-#, fuzzy, c-format
-#| msgid "publication_names parameter missing"
-msgid "publication_names option missing"
-msgstr "Parameter »publication_names« fehlt"
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
+#, c-format
+msgid "option \"%s\" missing"
+msgstr "Option »%s« fehlt"
 
-#: replication/pgoutput/pgoutput.c:452
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "Client sendete proto_version=%d, aber Server unterstützt nur Protokoll %d oder niedriger"
 
-#: replication/pgoutput/pgoutput.c:458
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "Client sendete proto_version=%d, aber Server unterstützt nur Protokoll %d oder höher"
 
-#: replication/pgoutput/pgoutput.c:473
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr "angeforderte proto_version=%d unterstützt Streaming nicht, benötigt %d oder höher"
 
-#: replication/pgoutput/pgoutput.c:479
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr "angeforderte proto_version=%d unterstützt paralleles Streaming nicht, benötigt %d oder höher"
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "Streaming angefordert, aber wird vom Ausgabe-Plugin nicht unterstützt"
 
-#: replication/pgoutput/pgoutput.c:498
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr "angeforderte proto_version=%d unterstützt Zwei-Phasen-Commit nicht, benötigt %d oder höher"
 
-#: replication/pgoutput/pgoutput.c:503
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "Zwei-Phasen-Commit angefordert, aber wird vom Ausgabe-Plugin nicht unterstützt"
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1112
+#, c-format
+msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
+msgstr "für Tabelle »%s.%s« können nicht verschiedene Werte für publish_generated_columns für verschiedene Publikationen verwendet werden"
+
+#: replication/pgoutput/pgoutput.c:1815
+#, c-format
+msgid "skipped loading publication \"%s\""
+msgstr "Laden der Publikation »%s« übersprungen"
+
+#: replication/pgoutput/pgoutput.c:1816
+#, c-format
+msgid "The publication does not exist at this point in the WAL."
+msgstr "Die Publikation existiert an diesem Punkt im WAL nicht."
+
+#: replication/pgoutput/pgoutput.c:1817
+#, c-format
+msgid "Create the publication if it does not exist."
+msgstr "Erzeugen Sie die Publikation, wenn sie nicht existiert."
+
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "Replikations-Slot-Name »%s« ist zu kurz"
 
-#: replication/slot.c:269
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "Replikations-Slot-Name »%s« ist zu lang"
 
-#: replication/slot.c:282
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "Replikations-Slot-Name »%s« enthält ungültiges Zeichen"
 
-#: replication/slot.c:284
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr "Replikations-Slot-Namen dürfen nur Kleinbuchstaben, Zahlen und Unterstriche enthalten."
 
-#: replication/slot.c:333
-#, fuzzy, c-format
-#| msgid "Sets the name of the replication slot to use on the sending server."
+#: replication/slot.c:377
+#, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
-msgstr "Setzt den Namen des zu verwendenden Replikations-Slots auf dem sendenden Server."
+msgstr "Failover kann nicht für einen auf dem Standby erzeugten Replikations-Slot eingeschaltet werden"
 
-#: replication/slot.c:345 replication/slot.c:849
-#, fuzzy, c-format
-#| msgid "cannot inherit from temporary relation \"%s\""
+#: replication/slot.c:389 replication/slot.c:925
+#, c-format
 msgid "cannot enable failover for a temporary replication slot"
-msgstr "von temporärer Relation »%s« kann nicht geerbt werden"
+msgstr "Failover kann nicht für einen temporären Replikations-Slot eingeschaltet werden"
 
-#: replication/slot.c:370
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "Replikations-Slot »%s« existiert bereits"
 
-#: replication/slot.c:380
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "alle Replikations-Slots sind in Benutzung"
 
-#: replication/slot.c:381
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "Geben Sie einen frei oder erhöhen Sie »max_replication_slots«."
 
-#: replication/slot.c:560 replication/slot.c:2453 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:609 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "Replikations-Slot »%s« existiert nicht"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "Replikations-Slot »%s« ist aktiv für PID %d"
 
-#: replication/slot.c:638
-#, fuzzy, c-format
-#| msgid "cannot copy unfinished logical replication slot \"%s\""
+#: replication/slot.c:681
+#, c-format
+msgid "can no longer access replication slot \"%s\""
+msgstr "auf Replikations-Slot »%s« kann nicht mehr zugegriffen werden"
+
+#: replication/slot.c:683
+#, c-format
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "Dieser Replikations-Slot wurde wegen »%s« ungültig gemacht."
+
+#: replication/slot.c:702
+#, c-format
 msgid "acquired logical replication slot \"%s\""
-msgstr "kann unfertigen Replikations-Slot »%s« nicht kopieren"
+msgstr "logischer Replikations-Slot »%s« wurde akquiriert"
 
-#: replication/slot.c:640
-#, fuzzy, c-format
-#| msgid "created replication slot \"%s\""
+#: replication/slot.c:704
+#, c-format
 msgid "acquired physical replication slot \"%s\""
-msgstr "Replikations-Slot »%s« wurde erzeugt"
+msgstr "physischer Replikations-Slot »%s« wurde akquiriert"
 
-#: replication/slot.c:729
-#, fuzzy, c-format
-#| msgid "created replication slot \"%s\""
+#: replication/slot.c:789
+#, c-format
 msgid "released logical replication slot \"%s\""
-msgstr "Replikations-Slot »%s« wurde erzeugt"
+msgstr "logischer Replikations-Slot »%s« wurde freigegeben"
 
-#: replication/slot.c:731
-#, fuzzy, c-format
-#| msgid "created replication slot \"%s\""
+#: replication/slot.c:791
+#, c-format
 msgid "released physical replication slot \"%s\""
-msgstr "Replikations-Slot »%s« wurde erzeugt"
+msgstr "physischer Replikations-Slot »%s« wurde freigegeben"
 
-#: replication/slot.c:797
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "kann Replikations-Slot »%s« nicht löschen"
 
-#: replication/slot.c:798 replication/slot.c:829
+#: replication/slot.c:890
 #, c-format
-msgid "This slot is being synced from the primary server."
-msgstr "Dieser Slot wird vom Primärserver synchronisiert."
-
-#: replication/slot.c:816
-#, fuzzy, c-format
-#| msgid "cannot use %s with a logical replication slot"
 msgid "cannot use %s with a physical replication slot"
-msgstr "%s kann nicht mit einem logischem Replikations-Slot verwendet werden"
+msgstr "%s kann nicht mit einem physischem Replikations-Slot verwendet werden"
 
-#: replication/slot.c:828
-#, fuzzy, c-format
-#| msgid "created replication slot \"%s\""
+#: replication/slot.c:902
+#, c-format
 msgid "cannot alter replication slot \"%s\""
-msgstr "Replikations-Slot »%s« wurde erzeugt"
+msgstr "Replikations-Slot »%s« kann nicht geändert werden"
 
-#: replication/slot.c:838
-#, fuzzy, c-format
-#| msgid "cannot use a logical replication slot for physical replication"
+#: replication/slot.c:912
+#, c-format
 msgid "cannot enable failover for a replication slot on the standby"
-msgstr "logischer Replikations-Slot kann nicht für physische Replikation verwendet werden"
+msgstr "Failover kann nicht für einen Replikations-Slot auf dem Standby eingeschaltet werden"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "konnte Verzeichnis »%s« nicht löschen"
 
-#: replication/slot.c:1372
+#: replication/slot.c:1534
 #, 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:1377
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "Replikations-Slots können nur verwendet werden, wenn »wal_level« >= replica"
 
-#: replication/slot.c:1389
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "keine Berechtigung, um Replikations-Slots zu verwenden"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "Nur Rollen mit dem %s-Attribut können Replikations-Slots verwenden."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1664
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
-msgstr[0] "Die restart_lsn des Slots %X/%X überschreitet das Maximum um %llu Byte."
-msgstr[1] "Die restart_lsn des Slots %X/%X überschreitet das Maximum um %llu Bytes."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
+msgstr[0] "Die restart_lsn des Slots %X/%X überschreitet das Maximum um %<PRIu64> Byte."
+msgstr[1] "Die restart_lsn des Slots %X/%X überschreitet das Maximum um %<PRIu64> Bytes."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "Der Slot kollidierte mit dem xid-Horizont %u."
 
-#: replication/slot.c:1511
+#: replication/slot.c:1680
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "Logische Dekodierung auf dem Standby-Server erfordert »wal_level« >= »logical« auf dem Primärserver."
 
-#: replication/slot.c:1519
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1686
+#, c-format
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr "Die Leerlaufzeit des Slots von %lds überschreitet die durch »%s« konfigurierte Dauer von %ds."
+
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "Prozess %d wird beendet, um Replikations-Slot »%s« freizugeben"
 
-#: replication/slot.c:1521
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "obsoleter Replikations-Slot »%s« wird ungültig gemacht"
 
-#: replication/slot.c:2249
+#: replication/slot.c:2559
 #, 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"
 
-#: replication/slot.c:2256
+#: replication/slot.c:2566
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "Replikations-Slot-Datei »%s« hat nicht unterstützte Version %u"
 
-#: replication/slot.c:2263
+#: replication/slot.c:2573
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "Replikations-Slot-Datei »%s« hat falsche Länge %u"
 
-#: replication/slot.c:2299
+#: replication/slot.c:2609
 #, 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"
 
-#: replication/slot.c:2333
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "logischer Replikations-Slot »%s« existiert, aber »wal_level« < »logical«"
 
-#: replication/slot.c:2335
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "Ändern Sie »wal_level« in »logical« oder höher."
 
-#: replication/slot.c:2339
+#: replication/slot.c:2659
+#, c-format
+msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
+msgstr "logischer Replikations-Slot »%s« existiert auf dem Standby, aber »hot_standby« = »off«"
+
+#: replication/slot.c:2661
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "Ändern Sie »hot_standby« auf »on«."
+
+#: replication/slot.c:2666
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "physischer Replikations-Slot »%s« existiert, aber »wal_level« < »replica«"
 
-#: replication/slot.c:2341
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "Ändern Sie »wal_level« in »replica« oder höher."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "zu viele aktive Replikations-Slots vor dem Herunterfahren"
 
-#: replication/slot.c:2461
+#: replication/slot.c:2716
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "»%s« ist kein physischer Replikations-Slot"
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "Erhöhen Sie »max_replication_slots« und versuchen Sie es erneut."
 
-#: replication/slot.c:2637
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" does not exist"
-msgid "replication slot \"%s\" specified in parameter %s does not exist"
-msgstr "Replikations-Slot »%s« existiert nicht"
+#: replication/slot.c:2953
+#, c-format
+msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
+msgstr "Replikations-Slot »%s«, der in Parameter »%s« angegeben ist, existiert nicht"
 
-#: replication/slot.c:2639 replication/slot.c:2680 replication/slot.c:2695
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" was not created in this database"
-msgid "Logical replication is waiting on the standby associated with \"%s\"."
-msgstr "Replikations-Slot »%s« wurde nicht in dieser Datenbank erzeugt"
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
+#, c-format
+msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
+msgstr "Logische Replikation wartet auf den Standby, der zum Replikations-Slot »%s« gehört."
 
-#: replication/slot.c:2641
-#, fuzzy, c-format
-#| msgid "Consider increasing the configuration parameter \"max_wal_size\"."
-msgid "Consider creating the slot \"%s\" or amend parameter %s."
-msgstr "Erhöhen Sie eventuell den Konfigurationsparameter »max_wal_size«."
+#: replication/slot.c:2957
+#, c-format
+msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
+msgstr "Erzeugen Sie den Replikations-Slot »%s« oder berichtigen Sie den Parameter »%s«."
 
-#: replication/slot.c:2658
-#, fuzzy, c-format
-#| msgid "cannot copy unfinished logical replication slot \"%s\""
-msgid "cannot have logical replication slot \"%s\" in parameter %s"
-msgstr "kann unfertigen Replikations-Slot »%s« nicht kopieren"
+#: replication/slot.c:2967
+#, c-format
+msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
+msgstr "logischer Replikations-Slot »%s« kann nicht in Parameter »%s« angegeben werden"
 
-#: replication/slot.c:2660
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" was not created in this database"
-msgid "Logical replication is waiting for correction on \"%s\"."
-msgstr "Replikations-Slot »%s« wurde nicht in dieser Datenbank erzeugt"
+#: replication/slot.c:2969
+#, c-format
+msgid "Logical replication is waiting for correction on replication slot \"%s\"."
+msgstr "Logische Replikation wartet auf Korrektur bei Replikations-Slot »%s«."
 
-#: replication/slot.c:2662
+#: replication/slot.c:2971
 #, c-format
-msgid "Consider removing logical slot \"%s\" from parameter %s."
-msgstr ""
+msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
+msgstr "Entfernen Sie den Replikations-Slot »%s« aus dem Parameter »%s«."
 
-#: replication/slot.c:2678
+#: replication/slot.c:2987
 #, c-format
-msgid "physical slot \"%s\" specified in parameter %s has been invalidated"
-msgstr ""
+msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
+msgstr "der physische Replikations-Slot »%s«, der in Parameter »%s« angegeben wurde, wurde ungültig gemacht"
 
-#: replication/slot.c:2682
-#, fuzzy, c-format
-#| msgid "Consider increasing the configuration parameter \"max_wal_size\"."
-msgid "Consider dropping and recreating the slot \"%s\" or amend parameter %s."
-msgstr "Erhöhen Sie eventuell den Konfigurationsparameter »max_wal_size«."
+#: replication/slot.c:2991
+#, c-format
+msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
+msgstr "Löschen Sie den Replikations-Slot »%s« und erzeugen Sie ihn neu, oder berichtigen Sie den Parameter »%s«."
 
-#: replication/slot.c:2693
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" was not created in this database"
-msgid "replication slot \"%s\" specified in parameter %s does not have active_pid"
-msgstr "Replikations-Slot »%s« wurde nicht in dieser Datenbank erzeugt"
+#: replication/slot.c:3002
+#, c-format
+msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
+msgstr "der Replikations-Slot »%s«, der in Parameter »%s« angegeben wurde, hat keine active_pid"
 
-#: replication/slot.c:2697
+#: replication/slot.c:3006
 #, c-format
-msgid "Consider starting standby associated with \"%s\" or amend parameter %s."
-msgstr ""
+msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
+msgstr "Starten Sie den zum Replikations-Slot »%s« gehörenden Standby oder berichtigen Sie den Parameter »%s«."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "ungültige Ziel-WAL-LSN"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "Replikations-Slot »%s« kann nicht vorwärtsgesetzt werden"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "Diese Slot hat nie zuvor WAL reserviert oder er wurde ungültig gemacht."
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr "Replikations-Slot kann nicht auf %X/%X vorwärtsgesetzt werden, Minimum ist %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid "cannot copy physical replication slot \"%s\" as a logical replication slot"
 msgstr "physischer Replikations-Slot »%s« kann nicht als logischer Replikations-Slot kopiert werden"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid "cannot copy logical replication slot \"%s\" as a physical replication slot"
 msgstr "logischer Replikations-Slot »%s« kann nicht als physischer Replikations-Slot kopiert werden"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "ein Replikations-Slot, der kein WAL reserviert, kann nicht kopiert werden"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "ungültig gemachter Replikations-Slot »%s« kann nicht kopiert werden"
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "konnte Replikations-Slot »%s« nicht kopieren"
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid "The source replication slot was modified incompatibly during the copy operation."
 msgstr "Der Quell-Replikations-Slot wurde während der Kopieroperation inkompatibel geändert."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr "kann unfertigen Replikations-Slot »%s« nicht kopieren"
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr "Versuchen Sie es erneut, wenn confirmed_flush_lsn des Quell-Replikations-Slots gültig ist."
 
-#: replication/slotfuncs.c:877
-#, fuzzy, c-format
-#| msgid "replication slots can only be used with WAL streaming"
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "kann Replikations-Slot »%s« nicht kopieren"
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "Der Quell-Replikations-Slot wurde während der Kopieroperation ungültig gemacht."
+
+#: replication/slotfuncs.c:906
+#, c-format
 msgid "replication slots can only be synchronized to a standby server"
-msgstr "Replikations-Slots können nur mit WAL-Streaming verwendet werden"
+msgstr "Replikations-Slots können nur zu einem Standby-Server synchronisiert werden"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "Warten auf synchrone Replikation wird storniert and Verbindung wird abgebrochen, aufgrund von Anweisung des Administrators"
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, 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:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "storniere Warten auf synchrone Replikation wegen Benutzeraufforderung"
 
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "Standby »%s« ist jetzt ein synchroner Standby mit Priorität %d"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "Standby »%s« ist jetzt ein Kandidat für synchroner Standby mit Quorum"
 
-#: replication/syncrep.c:1013
+#. translator: %s is a GUC name
+#: replication/syncrep.c:1082
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr "Parser für »synchronous_standby_names« fehlgeschlagen"
+msgid "\"%s\" parser failed."
+msgstr "Parser für »%s« fehlgeschlagen."
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1089
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "Anzahl synchroner Standbys (%d) muss größer als null sein"
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "WAL-Receiver-Prozess wird abgebrochen aufgrund von Anweisung des Administrators"
+msgid "streaming replication receiver \"%s\" could not connect to the primary server: %s"
+msgstr "Streaming-Replication-Receiver »%s« konnte nicht mit dem Primärserver verbinden: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "Datenbanksystemidentifikator unterscheidet sich zwischen Primär- und Standby-Server"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "Identifikator des Primärservers ist %s, Identifikator des Standby ist %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr "höchste Zeitleiste %u des primären Servers liegt hinter Wiederherstellungszeitleiste %u zurück"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr "WAL-Streaming vom Primärserver gestartet bei %X/%X auf Zeitleiste %u"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "WAL-Streaming neu gestartet bei %X/%X auf Zeitleiste %u"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "kann WAL-Streaming nicht fortsetzen, Wiederherstellung ist bereits beendet"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "Replikation wurde durch Primärserver beendet"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "WAL-Ende erreicht auf Zeitleiste %u bei %X/%X."
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "WAL-Receiver-Prozess wird abgebrochen wegen Zeitüberschreitung"
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr "Primärserver enthält kein WAL mehr auf angeforderter Zeitleiste %u"
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "konnte WAL-Segment %s nicht schließen: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "hole Zeitleisten-History-Datei für Zeitleiste %u vom Primärserver"
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "konnte nicht in WAL-Segment %s bei Position %d, Länge %lu schreiben: %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "%s kann nicht mit einem logischem Replikations-Slot verwendet werden"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1723
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "konnte Positionszeiger nicht ans Ende der Datei »%s« setzen: %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "konnte Positionszeiger nicht den Anfang der Datei »%s« setzen: %m"
 
-#: replication/walsender.c:853
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "logischer Replikations-Slot kann nicht für physische Replikation verwendet werden"
 
-#: replication/walsender.c:919
+#: replication/walsender.c:909
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "angeforderter Startpunkt %X/%X auf Zeitleiste %u ist nicht in der History dieses Servers"
 
-#: replication/walsender.c:922
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "Die History dieses Servers zweigte von Zeitleiste %u bei %X/%X ab."
 
-#: replication/walsender.c:966
+#: replication/walsender.c:956
 #, c-format
 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:1160
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "unbekannter Wert für CREATE_REPLICATION_SLOT-Option »%s«: »%s«"
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s darf nicht in einer Transaktion aufgerufen werden"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s muss in einer Transaktion aufgerufen werden"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s muss in einer Transaktion im Isolationsmodus REPEATABLE READ aufgerufen werden"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s muss in einer Read-Only-Transaktion aufgerufen werden"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s muss vor allen Anfragen aufgerufen werden"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s darf nicht in einer Subtransaktion aufgerufen werden"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "WAL-Sender-Prozess wird nach Beförderung abgebrochen"
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:2016
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "während der WAL-Sender im Stoppmodus ist können keine neuen Befehle ausgeführt werden"
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2070
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "im WAL-Sender für physische Replikation können keine SQL-Befehle ausgeführt werden"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2101
 #, c-format
 msgid "received replication command: %s"
 msgstr "Replikationsbefehl empfangen: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1138
-#: tcop/postgres.c:1496 tcop/postgres.c:1736 tcop/postgres.c:2206
-#: tcop/postgres.c:2644 tcop/postgres.c:2722
+#: replication/walsender.c:2109 tcop/fastpath.c:208 tcop/postgres.c:1138
+#: tcop/postgres.c:1495 tcop/postgres.c:1747 tcop/postgres.c:2252
+#: tcop/postgres.c:2689 tcop/postgres.c:2766
 #, 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"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2269 replication/walsender.c:2304
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "unerwartetes EOF auf Standby-Verbindung"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2292
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "ungültiger Standby-Message-Typ »%c«"
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2381
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "unerwarteter Message-Typ »%c«"
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2798
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "WAL-Sender-Prozess wird abgebrochen wegen Zeitüberschreitung bei der Replikation"
@@ -22353,282 +23050,281 @@ msgstr "Regel »%s« für Relation »%s« existiert nicht"
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "Umbenennen einer ON-SELECT-Regel ist nicht erlaubt"
 
-#: rewrite/rewriteHandler.c:581
+#: rewrite/rewriteHandler.c:589
 #, c-format
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr "WITH-Anfragename »%s« erscheint sowohl in der Regelaktion als auch in der umzuschreibenden Anfrage"
 
-#: rewrite/rewriteHandler.c:608
+#: rewrite/rewriteHandler.c:619
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "INSERT ... SELECT-Regelaktionen werden für Anfrangen mit datenmodifizierenden Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:661
+#: rewrite/rewriteHandler.c:707
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "RETURNING-Listen können nicht in mehreren Regeln auftreten"
 
-#: rewrite/rewriteHandler.c:893 rewrite/rewriteHandler.c:932
+#: rewrite/rewriteHandler.c:944 rewrite/rewriteHandler.c:983
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "kann keinen Wert außer DEFAULT in Spalte »%s« einfügen"
 
-#: rewrite/rewriteHandler.c:895 rewrite/rewriteHandler.c:961
+#: rewrite/rewriteHandler.c:946 rewrite/rewriteHandler.c:1012
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "Spalte »%s« ist eine Identitätsspalte, die als GENERATED ALWAYS definiert ist."
 
-#: rewrite/rewriteHandler.c:897
+#: rewrite/rewriteHandler.c:948
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "Verwenden Sie OVERRIDING SYSTEM VALUE, um diese Einschränkung außer Kraft zu setzen."
 
-#: rewrite/rewriteHandler.c:959 rewrite/rewriteHandler.c:967
+#: rewrite/rewriteHandler.c:1010 rewrite/rewriteHandler.c:1018
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "Spalte »%s« kann nur auf DEFAULT aktualisiert werden"
 
-#: rewrite/rewriteHandler.c:1114 rewrite/rewriteHandler.c:1132
+#: rewrite/rewriteHandler.c:1154 rewrite/rewriteHandler.c:1172
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "mehrere Zuweisungen zur selben Spalte »%s«"
 
-#: rewrite/rewriteHandler.c:1697
+#: rewrite/rewriteHandler.c:1727
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE wird für Relationen mit Regeln nicht unterstützt."
 
-#: rewrite/rewriteHandler.c:2110 rewrite/rewriteHandler.c:4197
+#: rewrite/rewriteHandler.c:1767 rewrite/rewriteHandler.c:3339
+#, c-format
+msgid "access to non-system view \"%s\" is restricted"
+msgstr "Zugriff auf Nicht-System-Sicht »%s« ist beschränkt"
+
+#: rewrite/rewriteHandler.c:2166 rewrite/rewriteHandler.c:4350
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "unendliche Rekursion entdeckt in Regeln für Relation »%s«"
 
-#: rewrite/rewriteHandler.c:2195
+#: rewrite/rewriteHandler.c:2271
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "unendliche Rekursion entdeckt in Policys für Relation »%s«"
 
-#: rewrite/rewriteHandler.c:2547
+#: rewrite/rewriteHandler.c:2666
 msgid "Junk view columns are not updatable."
 msgstr "Junk-Sichtspalten sind nicht aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2552
+#: rewrite/rewriteHandler.c:2671
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Sichtspalten, die nicht Spalten ihrer Basisrelation sind, sind nicht aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2555
+#: rewrite/rewriteHandler.c:2674
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Sichtspalten, die auf Systemspalten verweisen, sind nicht aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2558
+#: rewrite/rewriteHandler.c:2677
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Sichtspalten, die Verweise auf ganze Zeilen zurückgeben, sind nicht aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2619
+#: rewrite/rewriteHandler.c:2738
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Sichten, die DISTINCT enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2622
+#: rewrite/rewriteHandler.c:2741
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Sichten, die GROUP BY enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2625
+#: rewrite/rewriteHandler.c:2744
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Sichten, die HAVING enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2628
+#: rewrite/rewriteHandler.c:2747
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Sichten, die UNION, INTERSECT oder EXCEPT enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2631
+#: rewrite/rewriteHandler.c:2750
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Sichten, die WITH enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2634
+#: rewrite/rewriteHandler.c:2753
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Sichten, die LIMIT oder OFFSET enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2646
+#: rewrite/rewriteHandler.c:2765
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Sichten, die Aggregatfunktionen zurückgeben, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2649
+#: rewrite/rewriteHandler.c:2768
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Sichten, die Fensterfunktionen zurückgeben, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2652
+#: rewrite/rewriteHandler.c:2771
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Sichten, die Funktionen mit Ergebnismenge zurückgeben, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2659 rewrite/rewriteHandler.c:2663
-#: rewrite/rewriteHandler.c:2671
+#: rewrite/rewriteHandler.c:2778 rewrite/rewriteHandler.c:2782
+#: rewrite/rewriteHandler.c:2790
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Sichten, die nicht aus einer einzigen Tabelle oder Sicht lesen, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2674
+#: rewrite/rewriteHandler.c:2793
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Sichten, die TABLESAMPLE enthalten, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:2698
+#: rewrite/rewriteHandler.c:2817
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Sichten, die keine aktualisierbaren Spalten haben, sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:3079 rewrite/rewriteHandler.c:3114
+#: rewrite/rewriteHandler.c:3198 rewrite/rewriteHandler.c:3233
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "kann nicht in Sicht »%s« einfügen"
 
-#: rewrite/rewriteHandler.c:3082
+#: rewrite/rewriteHandler.c:3201
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "Um Einfügen in die Sicht zu ermöglichen, richten Sie einen INSTEAD OF INSERT Trigger oder eine ON INSERT DO INSTEAD Regel ohne Bedingung ein."
 
-#: rewrite/rewriteHandler.c:3087 rewrite/rewriteHandler.c:3123
+#: rewrite/rewriteHandler.c:3206 rewrite/rewriteHandler.c:3242
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "kann Sicht »%s« nicht aktualisieren"
 
-#: rewrite/rewriteHandler.c:3090
+#: rewrite/rewriteHandler.c:3209
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Um Aktualisieren der Sicht zu ermöglichen, richten Sie einen INSTEAD OF UPDATE Trigger oder eine ON UPDATE DO INSTEAD Regel ohne Bedingung ein."
 
-#: rewrite/rewriteHandler.c:3095 rewrite/rewriteHandler.c:3132
+#: rewrite/rewriteHandler.c:3214 rewrite/rewriteHandler.c:3251
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "kann nicht aus Sicht »%s« löschen"
 
-#: rewrite/rewriteHandler.c:3098
+#: rewrite/rewriteHandler.c:3217
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "Um Löschen aus der Sicht zu ermöglichen, richten Sie einen INSTEAD OF DELETE Trigger oder eine ON DELETE DO INSTEAD Regel ohne Bedingung ein."
 
-#: rewrite/rewriteHandler.c:3117
+#: rewrite/rewriteHandler.c:3236
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
 msgstr "Um Einfügen in die Sicht mit MERGE zu ermöglichen, richten Sie einen INSTEAD OF INSERT Trigger ein."
 
-#: rewrite/rewriteHandler.c:3126
+#: rewrite/rewriteHandler.c:3245
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
 msgstr "Um Aktualisieren der Sicht mit MERGE zu ermöglichen, richten Sie einen INSTEAD OF UPDATE Trigger ein."
 
-#: rewrite/rewriteHandler.c:3135
+#: rewrite/rewriteHandler.c:3254
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
 msgstr "Um Löschen aus der Sicht zu ermöglichen, richten Sie einen INSTEAD OF DELETE Trigger ein."
 
-#: rewrite/rewriteHandler.c:3289
+#: rewrite/rewriteHandler.c:3429
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "kann nicht in Spalte »%s« von Sicht »%s« einfügen"
 
-#: rewrite/rewriteHandler.c:3297
+#: rewrite/rewriteHandler.c:3437
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "kann Spalte »%s« von Sicht »%s« nicht aktualisieren"
 
-#: rewrite/rewriteHandler.c:3305
+#: rewrite/rewriteHandler.c:3445
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "kann nicht in Spalte »%s« von Sicht »%s« mergen"
 
-#: rewrite/rewriteHandler.c:3333
+#: rewrite/rewriteHandler.c:3473
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "kann nicht in Sicht »%s« mergen"
 
-#: rewrite/rewriteHandler.c:3335
+#: rewrite/rewriteHandler.c:3475
 #, c-format
-msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions, but not others."
-msgstr ""
+msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
+msgstr "MERGE wird nicht unterstützt für Sichten mit INSTEAD-OF-Trigger für einige Aktionen aber nicht für alle."
 
-#: rewrite/rewriteHandler.c:3336
-#, fuzzy, c-format
-#| msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
+#: rewrite/rewriteHandler.c:3476
+#, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
-msgstr "Um Einfügen in die Sicht zu ermöglichen, richten Sie einen INSTEAD OF INSERT Trigger oder eine ON INSERT DO INSTEAD Regel ohne Bedingung ein."
+msgstr "Um Mergen in die Sicht zu ermöglichen, richten Sie entweder einen vollen Satz an INSTEAD-OF-Triggern ein oder löschen Sie die bestehenden INSTEAD-OF-Trigger."
 
-#: rewrite/rewriteHandler.c:3855
+#: rewrite/rewriteHandler.c:4007
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr "DO-INSTEAD-NOTIFY-Regeln werden für datenmodifizierende Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:3866
+#: rewrite/rewriteHandler.c:4018
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr "DO-INSTEAD-NOTHING-Regeln werden für datenmodifizierende Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:3880
+#: rewrite/rewriteHandler.c:4032
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "DO-INSTEAD-Regeln mit Bedingung werden für datenmodifizierende Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:3884
+#: rewrite/rewriteHandler.c:4036
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "DO-ALSO-Regeln werden für datenmodifizierende Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:3889
+#: rewrite/rewriteHandler.c:4041
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "DO-INSTEAD-Regeln mit mehreren Anweisungen werden für datenmodifizierende Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:4149
+#: rewrite/rewriteHandler.c:4302
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr "Sichten mit DO-INSTEAD-Regeln mit Bedingung sind nicht automatisch aktualisierbar."
 
-#: rewrite/rewriteHandler.c:4246
+#: rewrite/rewriteHandler.c:4400
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "INSERT RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:4248
+#: rewrite/rewriteHandler.c:4402
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr "Sie benötigen eine ON INSERT DO INSTEAD Regel ohne Bedingung, mit RETURNING-Klausel."
 
-#: rewrite/rewriteHandler.c:4253
+#: rewrite/rewriteHandler.c:4407
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "UPDATE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:4255
+#: rewrite/rewriteHandler.c:4409
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "Sie benötigen eine ON UPDATE DO INSTEAD Regel ohne Bedingung, mit RETURNING-Klausel."
 
-#: rewrite/rewriteHandler.c:4260
+#: rewrite/rewriteHandler.c:4414
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "DELETE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:4262
+#: rewrite/rewriteHandler.c:4416
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr "Sie benötigen eine ON DELETE DO INSTEAD Regel ohne Bedingung, mit RETURNING-Klausel."
 
-#: rewrite/rewriteHandler.c:4280
+#: rewrite/rewriteHandler.c:4434
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT mit ON-CONFLICT-Klausel kann nicht mit Tabelle verwendet werden, die INSERT- oder UPDATE-Regeln hat"
 
-#: rewrite/rewriteHandler.c:4337
+#: rewrite/rewriteHandler.c:4491
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "WITH kann nicht in einer Anfrage verwendet werden, die durch Regeln in mehrere Anfragen umgeschrieben wird"
 
-#: rewrite/rewriteManip.c:1083
+#: rewrite/rewriteManip.c:1186
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "Utility-Anweisungen mit Bedingung sind nicht implementiert"
 
-#: rewrite/rewriteManip.c:1427
-#, c-format
-msgid "WHERE CURRENT OF on a view is not implemented"
-msgstr "WHERE CURRENT OF mit einer Sicht ist nicht implementiert"
-
-#: rewrite/rewriteManip.c:1762
+#: rewrite/rewriteManip.c:1915
 #, 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 "NEW-Variablen in ON UPDATE-Regeln können nicht auf Spalten verweisen, die Teil einer Mehrfachzuweisung in dem UPDATE-Befehl sind"
@@ -22687,7 +23383,7 @@ msgstr "Dollar-Quotes nicht abgeschlossen"
 msgid "zero-length delimited identifier"
 msgstr "Bezeichner in Anführungszeichen hat Länge null"
 
-#: scan.l:825 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "Bezeichner in Anführungszeichen nicht abgeschlossen"
 
@@ -22696,90 +23392,151 @@ msgid "operator too long"
 msgstr "Operator zu lang"
 
 #: scan.l:1001
+msgid "parameter number too large"
+msgstr "Parameternummer ist zu groß"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "Müll folgt auf Parameter"
 
-#: scan.l:1022
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "ungültige hexadezimale Zahl"
 
-#: scan.l:1026
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "ungültige oktale Zahl"
 
-#: scan.l:1030
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "ungültige binäre Zahl"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1237
+#: scan.l:1231
 #, 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:1245
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s bei »%s«"
 
-#: scan.l:1437
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "nicht standardkonforme Verwendung von \\' in Zeichenkettenkonstante"
 
-#: scan.l:1438
+#: scan.l:1432
 #, 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:1447
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "nicht standardkonforme Verwendung  von \\\\ in Zeichenkettenkonstante"
 
-#: scan.l:1448
+#: scan.l:1442
 #, 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:1462
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "nicht standardkonforme Verwendung von Escape in Zeichenkettenkonstante"
 
-#: scan.l:1463
+#: scan.l:1457
 #, 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'."
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, 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"
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "mehrere »StopWords«-Parameter"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "mehrere »Language«-Parameter"
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "unbekannter Snowball-Parameter: »%s«"
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "Parameter »Language« fehlt"
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937
+#: statistics/relation_stats.c:98
+#, c-format
+msgid "Statistics cannot be modified during recovery."
+msgstr "Statistiken können nicht während der Wiederherstellung geändert werden."
+
+#: statistics/attribute_stats.c:205
+#, c-format
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "»%s« und »%s« können nicht beide angegeben werden"
+
+#: statistics/attribute_stats.c:231
+#, c-format
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "entweder »%s« oder »%s« muss angegeben werden"
+
+#: statistics/attribute_stats.c:239
+#, c-format
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "Statistiken für Systemspalte »%s« können nicht modifiziert werden"
+
+#: statistics/attribute_stats.c:303
+#, c-format
+msgid "could not determine element type of column \"%s\""
+msgstr "konnte Elementtyp von Spalte »%s« nicht bestimmen"
+
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321
+#: statistics/attribute_stats.c:336
+#, c-format
+msgid "Cannot set %s or %s."
+msgstr "Kann %s oder %s nicht setzen."
+
+#: statistics/attribute_stats.c:320
+#, c-format
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "konnte Kleiner-Als-Operator für Spalte »%s« nicht bestimmen"
+
+#: statistics/attribute_stats.c:335
+#, c-format
+msgid "column \"%s\" is not a range type"
+msgstr "Spalte »%s« ist kein Range-Typ"
+
+#: statistics/attribute_stats.c:738
+#, c-format
+msgid "\"%s\" array must not contain null values"
+msgstr "»%s«-Array darf keine NULL-Werte enthalten"
+
+#: statistics/attribute_stats.c:781
+#, c-format
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "maximale Anzahl Statistik-Slots überschritten: %d"
+
+#: statistics/attribute_stats.c:949
+#, c-format
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "Statistiken für Systemspalte »%s« können nicht geleert werden"
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
 msgstr "Statistikobjekt »%s.%s« konnte für Relation »%s.%s« nicht berechnet werden"
@@ -22789,57 +23546,227 @@ msgstr "Statistikobjekt »%s.%s« konnte für Relation »%s.%s« nicht berechnet
 msgid "function returning record called in context that cannot accept type record"
 msgstr "Funktion, die einen Record zurückgibt, in einem Zusammenhang aufgerufen, der Typ record nicht verarbeiten kann"
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:117
 #, c-format
-msgid "cannot access temporary tables of other sessions"
-msgstr "auf temporäre Tabellen anderer Sitzungen kann nicht zugegriffen werden"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "Argument »%s« darf nicht kleiner als -1.0 sein"
+
+#: statistics/stat_utils.c:47
+#, c-format
+msgid "argument \"%s\" must not be null"
+msgstr "Argument »%s« darf nicht NULL sein"
+
+#: statistics/stat_utils.c:74
+#, c-format
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "Argument »%s« darf kein mehrdimensionales Array sein"
+
+#: statistics/stat_utils.c:83
+#, c-format
+msgid "argument \"%s\" array must not contain null values"
+msgstr "Array für Argument »%s« darf keine NULL-Werte enthalten"
+
+#: statistics/stat_utils.c:114
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "Argument »%s« muss angegeben werden, wenn Argument »%s« angegeben ist"
+
+#: statistics/stat_utils.c:177
+#, c-format
+msgid "index \"%s\" was concurrently dropped"
+msgstr "Index »%s« wurde gleichzeitig gelöscht"
+
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "Index »%s« wurde gleichzeitig erzeugt"
+
+#: statistics/stat_utils.c:212
+#, c-format
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "Statistiken für Relation »%s« können nicht modifiziert werden"
+
+#: statistics/stat_utils.c:220
+#, c-format
+msgid "cannot modify statistics for shared relation"
+msgstr "Statistiken für geteilte Relation können nicht modifiziert werden"
+
+#: statistics/stat_utils.c:260
+#, c-format
+msgid "unrecognized argument name: \"%s\""
+msgstr "unbekannter Argumentname »%s«"
+
+#: statistics/stat_utils.c:274
+#, c-format
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "Argument »%s« hat Typ %s, erwarteter Typ %s"
+
+#: statistics/stat_utils.c:315
+#, c-format
+msgid "variadic arguments must be name/value pairs"
+msgstr "variadische Argumente müssen Name/Wert-Paare sein"
+
+#: statistics/stat_utils.c:316
+#, c-format
+msgid "Provide an even number of variadic arguments that can be divided into pairs."
+msgstr "Geben Sie eine gerade Anzahl variadischer Argumente an, die in Paare aufgeteilt werden können."
+
+#: statistics/stat_utils.c:330
+#, c-format
+msgid "name at variadic position %d is null"
+msgstr "Name auf variadischer Position %d ist NULL"
+
+#: statistics/stat_utils.c:334
+#, c-format
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "Name auf variadischer Position %d hat Typ %s, erwarteter Typ %s"
+
+#: storage/aio/aio.c:1343
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "Nur -1 oder Werte größer als 0 sind gültig."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
+msgstr "Prüfen Sie, ob io_uring durch /proc/sys/kernel/io_uring_disabled deaktiviert ist."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "Erhöhen Sie eventuell »ulimit -n« auf mindestens %d."
 
-#: storage/buffer/bufmgr.c:1532
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
+msgstr "Der Kernel unterstützt io_uring nicht."
+
+#: storage/aio/method_io_uring.c:388
+#, c-format
+msgid "could not setup io_uring queue: %m"
+msgstr "konnte io_uring-Queue nicht einrichten: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "komplettiere I/O für Prozess %d"
+
+#: storage/aio/method_worker.c:382
 #, c-format
-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"
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "I/O-Worker, der I/O für Prozess %d ausführt"
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
+#, c-format
+msgid "cannot access temporary tables of other sessions"
+msgstr "auf temporäre Tabellen anderer Sitzungen kann nicht zugegriffen werden"
+
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "kann Relation %s nicht auf über %u Blöcke erweitern"
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "unerwartete Daten hinter Dateiende in Block %u von Relation %s"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "unerwartete Daten hinter Dateiende in Block %u von Relation »%s«"
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr "Das scheint mit fehlerhaften Kernels vorzukommen; Sie sollten eine Systemaktualisierung in Betracht ziehen."
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "konnte Block %u von %s nicht schreiben"
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Mehrere Fehlschläge --- Schreibfehler ist möglicherweise dauerhaft."
 
-#: storage/buffer/bufmgr.c:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
+#, c-format
+msgid "writing block %u of relation \"%s\""
+msgstr "schreibe Block %u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7317
+#, c-format
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr "%u Seite(n) werden mit Nullen gefüllt und %u Prüfsummenfehler werden ignoriert in den Blöcken %u..%u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
+#, c-format
+msgid "Block %u held the first zeroed page."
+msgstr "Block %u enthielt die erste mit Nullen gefüllte Seite."
+
+#: storage/buffer/bufmgr.c:7322
+#, c-format
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "Details zu dem anderen %d ungültigen Block finden Sie im Serverlog."
+msgstr[1] "Details zu den anderen %d ungültigen Blöcken finden Sie im Serverlog."
+
+#: storage/buffer/bufmgr.c:7339
+#, c-format
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u ungültige Seiten in den Blöcken %u..%u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7340
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr "Block %u enthielt die erste ungültige Seite."
+
+#: storage/buffer/bufmgr.c:7341
+#, c-format
+msgid "See server log for the other %u invalid block(s)."
+msgstr "Die anderen %u ungültigen Blöcke finden Sie im Serverlog."
+
+#: storage/buffer/bufmgr.c:7346
+#, c-format
+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:7347
+#, c-format
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u ungültige Seiten werden mit Nullen gefüllt in den Blöcken %u..%u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7349
+#, c-format
+msgid "See server log for the other %u zeroed block(s)."
+msgstr "Die anderen %u mit Nullen gefüllten Blöcke finden Sie im Serverlog."
+
+#: storage/buffer/bufmgr.c:7354
+#, c-format
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "Prüfsummenfehler wird ignoriert in Block %u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7355
+#, c-format
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "%u Prüfsummenfehler werden ignoriert in den Blöcken %u..%u von Relation »%s«"
+
+#: storage/buffer/bufmgr.c:7356
+#, c-format
+msgid "Block %u held the first ignored page."
+msgstr "Block %u enthielt die erste ignorierte Seite."
+
+#: storage/buffer/bufmgr.c:7357
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "schreibe Block %u von Relation %s"
+msgid "See server log for the other %u ignored block(s)."
+msgstr "Die anderen %u ignorierten Blöcke finden Sie im Serverlog."
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/localbuf.c:272
 #, c-format
 msgid "no empty local buffer available"
 msgstr "kein leerer lokaler Puffer verfügbar"
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/localbuf.c:736
 #, c-format
 msgid "cannot access temporary tables during a parallel operation"
 msgstr "während einer parallelen Operation kann nicht auf temporäre Tabellen zugegriffen werden"
 
-#: storage/buffer/localbuf.c:712
+#: storage/buffer/localbuf.c:876
 #, 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."
@@ -22859,21 +23786,26 @@ msgstr "konnte nicht aus File-Set »%s« lesen: es wurden nur %zu von %zu Bytes
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "konnte nicht aus temporärer Datei lesen: es wurden nur %zu von %zu Bytes gelesen"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "konnte Größe von temporärer Datei »%s« von BufFile »%s« nicht bestimmen: %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "konnte Fileset »%s« nicht löschen: %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1192
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "kann Datei »%s« nicht kürzen: %m"
 
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, c-format
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "konnte Datei »%s« nicht nach »%s« klonen: %m"
+
 #: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
 #, c-format
 msgid "could not flush dirty data: %m"
@@ -22894,121 +23826,121 @@ msgstr "munmap() fehlgeschlagen beim Flushen von Daten: %m"
 msgid "getrlimit failed: %m"
 msgstr "getrlimit fehlgeschlagen: %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1074
 #, 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:1074
+#: storage/file/fd.c:1075
 #, c-format
-msgid "System allows %d, server needs at least %d."
-msgstr "System erlaubt %d, Server benötigt mindestens %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
+msgstr "System erlaubt %d, Server benötigt mindestens %d, %d Dateien sind bereit offen."
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1164 storage/file/fd.c:2679 storage/file/fd.c:2788
+#: storage/file/fd.c:2942
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "keine Dateideskriptoren mehr: %m; freigeben und nochmal versuchen"
 
-#: storage/file/fd.c:1536
+#: storage/file/fd.c:1540
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "temporäre Datei: Pfad »%s«, Größe %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1679
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "konnte temporäres Verzeichnis »%s« nicht erzeugen: %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1686
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "konnte temporäres Unterverzeichnis »%s« nicht erzeugen: %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1883
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "konnte temporäre Datei »%s« nicht erzeugen: %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1919
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "konnte temporäre Datei »%s« nicht öffnen: %m"
 
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1960
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "konnte temporäre Datei »%s« nicht löschen: %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2050
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht löschen: %m"
 
-#: storage/file/fd.c:2234
+#: storage/file/fd.c:2289
 #, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
-msgstr "Größe der temporären Datei überschreitet temp_file_limit (%dkB)"
+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:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2655 storage/file/fd.c:2714
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, die Datei »%s« zu öffnen"
 
-#: storage/file/fd.c:2698
+#: storage/file/fd.c:2759
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, den Befehl »%s« auszuführen"
 
-#: storage/file/fd.c:2854
+#: storage/file/fd.c:2918
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, das Verzeichnis »%s« zu öffnen"
 
-#: storage/file/fd.c:3384
+#: storage/file/fd.c:3449
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "unerwartete Datei im Verzeichnis für temporäre Dateien gefunden: »%s«"
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3567
 #, c-format
 msgid "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synchronisiere Datenverzeichnis (syncfs), abgelaufene Zeit: %ld.%02d s, aktueller Pfad: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3794
 #, c-format
 msgid "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synchronisiere Datenverzeichnis (pre-fsync), abgelaufene Zeit: %ld.%02d s, aktueller Pfad: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3826
 #, c-format
 msgid "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synchronisiere Datenverzeichnis (fsync), abgelaufene Zeit: %ld.%02d s, aktueller Pfad: %s"
 
-#: storage/file/fd.c:3950
+#: storage/file/fd.c:4015
 #, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr "debug_io_direct wird auf dieser Plattform nicht unterstützt."
+msgid "\"%s\" is not supported on this platform."
+msgstr "»%s« wird auf dieser Plattform nicht unterstützt."
 
-#: storage/file/fd.c:3964
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
 #, c-format
-msgid "Invalid list syntax in parameter \"%s\""
-msgstr "Ungültige Listensyntax für Parameter »%s«"
+msgid "Invalid list syntax in parameter \"%s\"."
+msgstr "Ungültige Listensyntax für Parameter »%s«."
 
-#: storage/file/fd.c:3984
+#: storage/file/fd.c:4050 tcop/backend_startup.c:1054
 #, c-format
-msgid "Invalid option \"%s\""
-msgstr "Ungültige Option »%s«"
+msgid "Invalid option \"%s\"."
+msgstr "Ungültige Option »%s«."
 
-#: storage/file/fd.c:3997
+#: storage/file/fd.c:4063
 #, c-format
-msgid "\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
-msgstr "»debug_io_direct« wird für WAL nicht unterstützt, weil XLOG_BLCKSZ zu klein ist"
+msgid "\"%s\" is not supported for WAL because %s is too small."
+msgstr "»%s« wird für WAL nicht unterstützt, weil %s zu klein ist."
 
-#: storage/file/fd.c:4004
+#: storage/file/fd.c:4071
 #, c-format
-msgid "\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
-msgstr "»debug_io_direct« wird für Daten nicht unterstützt, weil BLCKSZ zu klein ist"
+msgid "\"%s\" is not supported for data because %s is too small."
+msgstr "»%s« wird für Daten nicht unterstützt, weil %s zu klein ist."
 
 #: storage/file/reinit.c:145
 #, c-format
@@ -23095,59 +24027,74 @@ msgstr "konnte Shared-Memory-Segment »%s« nicht schließen: %m"
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "konnte Handle für »%s« nicht duplizieren: %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "DSM-Segmentname kann nicht leer sein"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "DSN-Segmentname zu lang"
 
-#: storage/ipc/dsm_registry.c:150
-#, fuzzy, c-format
-#| msgid "WAL segment size could not be parsed"
+#: storage/ipc/dsm_registry.c:152
+#, c-format
 msgid "DSM segment size must be nonzero"
-msgstr "WAL-Segmentgröße konnte nicht interpretiert werden"
+msgstr "DSM-Segmentgröße darf nicht null sein"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
-msgstr ""
+msgstr "angeforderte DSM-Segmentgröße stimmt nicht mit der Größe des existierenden Segments überein"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:352
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "tut mir leid, schon zu viele Verbindungen"
 
-#: storage/ipc/procarray.c:3845
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "Datenbank »%s« wird von vorbereiteten Transaktionen verwendet"
 
-#: storage/ipc/procarray.c:3881 storage/ipc/procarray.c:3889
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "keine Berechtigung, um Prozess zu beenden"
 
-#: storage/ipc/procarray.c:3882 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid "Only roles with the %s attribute may terminate processes of roles with the %s attribute."
 msgstr "Nur Rollen mit dem %s-Attribut können Prozesse von Rollen mit dem %s-Attribut beenden."
 
-#: storage/ipc/procarray.c:3890 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr "Nur Rollen mit den Privilegien der Rolle deren Prozess beendet werden soll oder den Privilegien der Rolle »%s« können diesen Prozess beenden."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:452
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr "warte immer noch darauf, dass Backend mit PID %d ProcSignalBarrier annimmt"
 
+#: storage/ipc/procsignal.c:737
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "ungültige Stornierungsanfrage mit PID 0"
+
+#: storage/ipc/procsignal.c:792
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "falscher Schlüssel in Stornierungsanfrage für Prozess %d"
+
+#: storage/ipc/procsignal.c:801
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "PID %d in Stornierungsanfrage stimmte mit keinem Prozess überein"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -23158,12 +24105,12 @@ msgstr "kann Nachricht mit Größe %zu nicht über Shared-Memory-Queue senden"
 msgid "invalid message size %zu in shared memory queue"
 msgstr "ungültige Nachrichtengröße %zu in Shared-Memory-Queue"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:962
-#: storage/lmgr/lock.c:1000 storage/lmgr/lock.c:2803 storage/lmgr/lock.c:4188
-#: storage/lmgr/lock.c:4253 storage/lmgr/lock.c:4603
-#: storage/lmgr/predicate.c:2463 storage/lmgr/predicate.c:2478
-#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:4922
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "Shared Memory aufgebraucht"
@@ -23193,269 +24140,285 @@ msgstr "nicht genug Shared-Memory für Datenstruktur »%s« (%zu Bytes angeforde
 msgid "requested shared memory size overflows size_t"
 msgstr "angeforderte Shared-Memory-Größe übersteigt Kapazität von size_t"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d ist kein PostgreSQL-Backend-Prozess"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1448
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "konnte Signal nicht an Prozess %d senden: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "keine Berechtigung, um Anfrage zu stornieren"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid "Only roles with the %s attribute may cancel queries of roles with the %s attribute."
 msgstr "Nur Rollen mit dem %s-Attribut können Anfragen von Rollen mit dem %s-Attribut stornieren."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können Autovacuum-Arbeitsprozesse stornieren."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid "Only roles with privileges of the role whose query is being canceled or with privileges of the \"%s\" role may cancel this query."
 msgstr "Nur Rollen mit den Privilegien der Rolle deren Anfrage storniert werden soll oder den Privilegien der Rolle »%s« können diese Anfrage stornieren."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr "konnte die Existenz des Backend mit PID %d nicht prüfen: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "Backend mit PID %d wurde nicht innerhalb von %lld Millisekunde beendet"
-msgstr[1] "Backend mit PID %d wurde nicht innerhalb von %lld Millisekunden beendet"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural "backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "Backend mit PID %d wurde nicht innerhalb von %<PRId64> Millisekunde beendet"
+msgstr[1] "Backend mit PID %d wurde nicht innerhalb von %<PRId64> Millisekunden beendet"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "»timeout« darf nicht negativ sein"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may terminate autovacuum workers."
+msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können Autovacuum-Arbeitsprozesse beenden."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "Rotierung nicht möglich, weil Logsammlung nicht aktiv ist"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "Wiederherstellung wartet immer noch nach %ld,%03d ms: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "Warten der Wiederherstellung beendet nach %ld,%03d ms: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3169
+#: storage/ipc/standby.c:921 tcop/postgres.c:3224
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "storniere Anfrage wegen Konflikt mit der Wiederherstellung"
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:2529
+#: storage/ipc/standby.c:922 tcop/postgres.c:2574
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "Benutzertransaktion hat Verklemmung (Deadlock) mit Wiederherstellung verursacht."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "unbekannter Grund"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "Konflikt bei der Wiederherstellung wegen Buffer-Pin"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "Konflikt bei Wiederherstellung wegen Sperre"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "Konflikt bei Wiederherstellung wegen Tablespace"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "Konflikt bei der Wiederherstellung wegen Snapshot"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "Konflikt bei der Wiederherstellung wegen Replikations-Slot"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "Konflikt bei der Wiederherstellung wegen Buffer-Deadlock"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "Konflikt bei Wiederherstellung wegen Datenbank"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr "pg_largeobject-Eintrag für OID %u, Seite %d hat ungültige Datenfeldgröße %d"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "ungültige Flags zum Öffnen eines Large Objects: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "keine Berechtigung für Large Object %u"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "ungültige »whence«-Angabe: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "ungültige Größe der Large-Object-Schreibaufforderung: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr "Prozess %d wartet auf %s-Sperre auf %s; blockiert von Prozess %d."
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "Prozess %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "Verklemmung (Deadlock) entdeckt"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "Einzelheiten zur Anfrage finden Sie im Serverlog."
 
-#: storage/lmgr/lmgr.c:858
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "beim Aktualisieren von Tupel (%u,%u) in Relation »%s«"
 
-#: storage/lmgr/lmgr.c:861
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "beim Löschen von Tupel (%u,%u) in Relation »%s«"
 
-#: storage/lmgr/lmgr.c:864
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "beim Sperren von Tupel (%u,%u) in Relation »%s«"
 
-#: storage/lmgr/lmgr.c:867
+#: storage/lmgr/lmgr.c:871
 #, 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«"
 
-#: storage/lmgr/lmgr.c:870
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "beim Einfügen von Indextupel (%u,%u) in Relation »%s«"
 
-#: storage/lmgr/lmgr.c:873
+#: storage/lmgr/lmgr.c:877
 #, 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«"
 
-#: storage/lmgr/lmgr.c:876
+#: storage/lmgr/lmgr.c:880
 #, 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«"
 
-#: storage/lmgr/lmgr.c:879
+#: storage/lmgr/lmgr.c:883
 #, 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«"
 
-#: storage/lmgr/lmgr.c:1249
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "Relation %u der Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1255
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "Erweiterung von Relation %u in Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1261
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid der Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1266
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "Seite %u von Relation %u von Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1273
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "Tupel (%u, %u) von Relation %u von Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1281
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "Transaktion %u"
 
-#: storage/lmgr/lmgr.c:1286
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "virtuelle Transaktion %d/%u"
 
-#: storage/lmgr/lmgr.c:1292
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "spekulatives Token %u von Transaktion %u"
 
-#: storage/lmgr/lmgr.c:1298
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "Objekt %u von Klasse %u von Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1306
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "Benutzersperre [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1313
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "Benutzersperre [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1321
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "Remote-Transaktion %u von Subskription %u in Datenbank %u"
 
-#: storage/lmgr/lmgr.c:1328
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "unbekannter Locktag-Typ %d"
 
-#: storage/lmgr/lock.c:790
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "Sperrmodus %s kann während der Wiederherstellung nicht auf Datenbankobjekte gesetzt werden"
 
-#: storage/lmgr/lock.c:792
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "Nur Sperren gleich oder unter RowExclusiveLock können während der Wiederherstellung auf Datenbankobjekte gesetzt werden."
 
-#: storage/lmgr/lock.c:3252 storage/lmgr/lock.c:3320 storage/lmgr/lock.c:3436
+#: storage/lmgr/lock.c:1185
+#, c-format
+msgid "process %d could not obtain %s on %s"
+msgstr "Prozess %d konnte Sperre %s für %s nicht setzen"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "PREPARE kann nicht ausgeführt werden, wenn für das selbe Objekt Sperren auf Sitzungsebene und auf Transaktionsebene gehalten werden"
@@ -23475,678 +24438,718 @@ msgstr "Sie müssten entweder weniger Transaktionen auf einmal ausführen oder 
 msgid "not enough elements in RWConflictPool to record a potential read/write conflict"
 msgstr "nicht genügend Elemente in RWConflictPool, um einen möglichen Lese-/Schreibkonflikt aufzuzeichnen"
 
-#: storage/lmgr/predicate.c:1681
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr "»default_transaction_isolation« ist auf »serializable« gesetzt."
 
-#: storage/lmgr/predicate.c:1682
+#: storage/lmgr/predicate.c:1697
 #, 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."
 
-#: storage/lmgr/predicate.c:1733
+#: storage/lmgr/predicate.c:1748
 #, 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:1812 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "konnte den angeforderten Snapshot nicht importieren"
 
-#: storage/lmgr/predicate.c:1813 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "Der Ausgangsprozess mit PID %d läuft nicht mehr."
 
-#: storage/lmgr/predicate.c:3986 storage/lmgr/predicate.c:4022
-#: storage/lmgr/predicate.c:4055 storage/lmgr/predicate.c:4063
-#: storage/lmgr/predicate.c:4102 storage/lmgr/predicate.c:4332
-#: storage/lmgr/predicate.c:4651 storage/lmgr/predicate.c:4663
-#: storage/lmgr/predicate.c:4710 storage/lmgr/predicate.c:4746
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, c-format
 msgid "could not serialize access due to read/write dependencies among transactions"
 msgstr "konnte Zugriff nicht serialisieren wegen Lese-/Schreib-Abhängigkeiten zwischen Transaktionen"
 
-#: storage/lmgr/predicate.c:3988 storage/lmgr/predicate.c:4024
-#: storage/lmgr/predicate.c:4057 storage/lmgr/predicate.c:4065
-#: storage/lmgr/predicate.c:4104 storage/lmgr/predicate.c:4334
-#: storage/lmgr/predicate.c:4653 storage/lmgr/predicate.c:4665
-#: storage/lmgr/predicate.c:4712 storage/lmgr/predicate.c:4748
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "Die Transaktion könnte erfolgreich sein, wenn sie erneut versucht würde."
 
-#: storage/lmgr/proc.c:348
+#: storage/lmgr/proc.c:453
 #, 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)"
 
-#: storage/lmgr/proc.c:1541
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "Prozess %d vermied Verklemmung wegen %s-Sperre auf %s durch Umordnen der Queue nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1556
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "Prozess %d hat Verklemmung festgestellt beim Warten auf %s-Sperre auf %s nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1565
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "Prozess %d wartet immer noch auf %s-Sperre auf %s nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1572
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "Prozess %d erlangte %s-Sperre auf %s nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1589
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "Prozess %d konnte %s-Sperre auf %s nach %ld,%03d ms nicht erlangen"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 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:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, 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:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "verfälschter Line-Pointer: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, 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:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "verfälschter Line-Pointer: offset = %u, size = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "kann Datei »%s« nicht auf über %u Blöcke erweitern"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht erweitern: %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "konnte Datei »%s« nicht erweitern: es wurden nur %d von %d Bytes bei Block %u geschrieben"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "konnte Datei »%s« nicht mit FileFallocate() erweitern: %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "konnte Blöcke %u..%u in Datei »%s« nicht lesen: %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "konnte Blöcke %u..%u in Datei »%s« nicht lesen: es wurden nur %zu von %zu Bytes gelesen"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1034
+#, c-format
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "konnte nicht anfangen, die Blöcke %u..%u in Datei »%s« zu lesen: %m"
+
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "konnte Blöcke %u..%u in Datei »%s« nicht schreiben: %m"
 
-#: storage/smgr/md.c:1163
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: es sind jetzt nur %u Blöcke"
 
-#: storage/smgr/md.c:1218
+#: storage/smgr/md.c:1358
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: %m"
 
-#: storage/smgr/md.c:1688
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr "konnte Datei »%s« nicht öffnen (Zielblock %u): vorhergehendes Segment hat nur %u Blöcke"
 
-#: storage/smgr/md.c:1702
+#: storage/smgr/md.c:1860
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "konnte Datei »%s« nicht öffnen (Zielblock %u): %m"
 
-#: tcop/backend_startup.c:85
+#: storage/smgr/smgr.c:1115
+#, c-format
+msgid "file \"%s\""
+msgstr "Datei »%s«"
+
+#: storage/smgr/smgr.c:1117
+#, c-format
+msgid "block %u in file \"%s\""
+msgstr "Block %u in Datei »%s«"
+
+#: storage/smgr/smgr.c:1121
+#, c-format
+msgid "blocks %u..%u in file \"%s\""
+msgstr "Blöcke %u..%u in Datei »%s«"
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "SSL-Konfiguration konnte im Kindprozess nicht geladen werden"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "Verbindung empfangen: Host=%s Port=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "Verbindung empfangen: Host=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "das Datenbanksystem startet"
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "das Datenbanksystem nimmt keine Verbindungen an"
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "Hot-Standby-Modus ist deaktiviert."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "das Datenbanksystem nimmt noch keine Verbindungen an"
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "Konsistenter Wiederherstellungszustand wurde noch nicht erreicht."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr "Recovery-Snapshot ist noch nicht für Hot-Standby bereit."
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "das Datenbanksystem nimmt keine Verbindungen an"
+msgid "To enable hot standby, close write transactions with more than %d subtransactions on the primary server."
+msgstr "Um Hot Standby zu ermöglichen, schließen Sie schreibende Transaktionen auf dem Primärserver mit mehr als %d Subtransaktionen."
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "Hot-Standby-Modus ist deaktiviert."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "Konsistenter Wiederherstellungszustand wurde noch nicht erreicht."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "das Datenbanksystem fährt herunter"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "das Datenbanksystem ist im Wiederherstellungsmodus"
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid "received direct SSL connection request without ALPN protocol negotiation extension"
-msgstr ""
+msgstr "direkte SSL-Verbindungsanfrage ohne ALPN-Protokollerweiterung empfangen"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
 msgstr "direkte SSL-Verbindung angenommen"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
 msgstr "direkte SSL-Verbindung abgelehnt"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "unvollständiges Startpaket"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "ungültige Länge des Startpakets"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
-msgstr ""
+msgstr "SSLRequest akzeptiert"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
-msgstr ""
+msgstr "SSLRequest abgelehnt"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "konnte SSL-Verhandlungsantwort nicht senden: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "unverschlüsselte Daten nach SSL-Anforderung empfangen"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid "This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."
 msgstr "Das könnte entweder ein Fehler in der Client-Software oder ein Hinweis auf einen versuchten Man-in-the-Middle-Angriff sein."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
-msgstr ""
+msgstr "GSSENCRequest akzeptiert"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
-msgstr ""
+msgstr "GSSENCRequest abgelehnt"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "konnte GSSAPI-Verhandlungsantwort nicht senden: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "unverschlüsselte Daten nach GSSAPI-Verschlüsselungsanforderung empfangen"
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, 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"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Gültige Werte sind: »false«, 0, »true«, 1, »database«."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "ungültiges Layout des Startpakets: Abschluss als letztes Byte erwartet"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "kein PostgreSQL-Benutzername im Startpaket angegeben"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, c-format
+msgid "invalid length of cancel request packet"
+msgstr "ungültige Länge des Pakets zur Stornierungsanfrage"
+
+#: tcop/backend_startup.c:892
+#, c-format
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "ungültige Länge des Stornierungsschlüssels im Paket zur Stornierungsanfrage"
+
+#: tcop/backend_startup.c:1022
+#, c-format
+msgid "Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr "log_connections-Option »%s« kann nicht in einer Liste mit anderen Optionen angegeben werden."
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "Funktion mit OID %u existiert nicht"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "Funktion »%s« kann nicht via Fastpath-Interface aufgerufen werden"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "Fastpath-Funktionsaufruf: »%s« (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1365 tcop/postgres.c:1601
-#: tcop/postgres.c:2055 tcop/postgres.c:2305
+#: tcop/fastpath.c:312 tcop/postgres.c:1364 tcop/postgres.c:1600
+#: tcop/postgres.c:2078 tcop/postgres.c:2350
 #, c-format
 msgid "duration: %s ms"
 msgstr "Dauer: %s ms"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "Dauer: %s ms  Fastpath-Funktionsaufruf: »%s« (OID %u)"
 
-#: tcop/fastpath.c:353
+#: tcop/fastpath.c:352
 #, 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:361
+#: tcop/fastpath.c:360
 #, 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:385
+#: tcop/fastpath.c:384
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "ungültige Argumentgröße %d in Funktionsaufruf-Message"
 
-#: tcop/fastpath.c:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "falsches Binärdatenformat in Funktionsargument %d"
 
-#: tcop/postgres.c:463 tcop/postgres.c:4925
+#: tcop/postgres.c:456 tcop/postgres.c:5022
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "ungültiger Frontend-Message-Typ %d"
 
-#: tcop/postgres.c:1072
+#: tcop/postgres.c:1071
 #, c-format
 msgid "statement: %s"
 msgstr "Anweisung: %s"
 
-#: tcop/postgres.c:1370
+#: tcop/postgres.c:1369
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "Dauer: %s ms  Anweisung: %s"
 
-#: tcop/postgres.c:1476
+#: tcop/postgres.c:1475
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "kann nicht mehrere Befehle in vorbereitete Anweisung einfügen"
 
-#: tcop/postgres.c:1606
+#: tcop/postgres.c:1605
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "Dauer: %s ms  Parsen %s: %s"
 
-#: tcop/postgres.c:1672 tcop/postgres.c:2625
+#: tcop/postgres.c:1672 tcop/postgres.c:2670
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "unbenannte vorbereitete Anweisung existiert nicht"
 
-#: tcop/postgres.c:1713
+#: tcop/postgres.c:1724
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "Binden-Nachricht hat %d Parameterformate aber %d Parameter"
 
-#: tcop/postgres.c:1719
+#: tcop/postgres.c:1730
 #, 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"
 
-#: tcop/postgres.c:1933
+#: tcop/postgres.c:1944
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "falsches Binärdatenformat in Binden-Parameter %d"
 
-#: tcop/postgres.c:2060
+#: tcop/postgres.c:2083
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "Dauer: %s ms  Binden %s%s%s: %s"
 
-#: tcop/postgres.c:2114 tcop/postgres.c:2708
+#: tcop/postgres.c:2138 tcop/postgres.c:2752
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "Portal »%s« existiert nicht"
 
-#: tcop/postgres.c:2185
+#: tcop/postgres.c:2231
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2187 tcop/postgres.c:2313
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute fetch from"
 msgstr "Ausführen Fetch von"
 
-#: tcop/postgres.c:2188 tcop/postgres.c:2314
+#: tcop/postgres.c:2234 tcop/postgres.c:2359
 msgid "execute"
 msgstr "Ausführen"
 
-#: tcop/postgres.c:2310
+#: tcop/postgres.c:2355
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "Dauer: %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2458
+#: tcop/postgres.c:2503
 #, c-format
 msgid "prepare: %s"
 msgstr "Vorbereiten: %s"
 
-#: tcop/postgres.c:2483
+#: tcop/postgres.c:2528
 #, c-format
 msgid "Parameters: %s"
 msgstr "Parameter: %s"
 
-#: tcop/postgres.c:2498
+#: tcop/postgres.c:2543
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "Abbruchgrund: Konflikt bei Wiederherstellung"
 
-#: tcop/postgres.c:2514
+#: tcop/postgres.c:2559
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "Benutzer hat Shared-Buffer-Pin zu lange gehalten."
 
-#: tcop/postgres.c:2517
+#: tcop/postgres.c:2562
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "Benutzer hat Relationssperre zu lange gehalten."
 
-#: tcop/postgres.c:2520
+#: tcop/postgres.c:2565
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "Benutzer hat (möglicherweise) einen Tablespace verwendet, der gelöscht werden muss."
 
-#: tcop/postgres.c:2523
+#: tcop/postgres.c:2568
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "Benutzeranfrage hat möglicherweise Zeilenversionen sehen müssen, die entfernt werden müssen."
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2571
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "Benutzer verwendete einen logischen Replikations-Slot, der ungültig gemacht werden muss."
 
-#: tcop/postgres.c:2532
+#: tcop/postgres.c:2577
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "Benutzer war mit einer Datenbank verbunden, die gelöscht werden muss."
 
-#: tcop/postgres.c:2571
+#: tcop/postgres.c:2616
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "Portal »%s« Parameter $%d = %s"
 
-#: tcop/postgres.c:2574
+#: tcop/postgres.c:2619
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "Portal »%s« Parameter $%d"
 
-#: tcop/postgres.c:2580
+#: tcop/postgres.c:2625
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "unbenanntes Portal Parameter $%d = %s"
 
-#: tcop/postgres.c:2583
+#: tcop/postgres.c:2628
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "unbenanntes Portal Parameter $%d"
 
-#: tcop/postgres.c:2928
+#: tcop/postgres.c:2983
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "Verbindung wird abgebrochen wegen unerwartetem SIGQUIT-Signal"
 
-#: tcop/postgres.c:2934
+#: tcop/postgres.c:2989
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "Verbindung wird abgebrochen wegen Absturz eines anderen Serverprozesses"
 
-#: tcop/postgres.c:2935
+#: tcop/postgres.c:2990
 #, 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 "Der Postmaster hat diesen Serverprozess angewiesen, die aktuelle Transaktion zurückzurollen und die Sitzung zu beenden, weil ein anderer Serverprozess abnormal beendet wurde und möglicherweise das Shared Memory verfälscht hat."
 
-#: tcop/postgres.c:2939 tcop/postgres.c:3192
+#: tcop/postgres.c:2994 tcop/postgres.c:3247
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr "In einem Moment sollten Sie wieder mit der Datenbank verbinden und Ihren Befehl wiederholen können."
 
-#: tcop/postgres.c:2946
+#: tcop/postgres.c:3001
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "Verbindung wird abgebrochen aufgrund von Befehl für sofortiges Herunterfahren"
 
-#: tcop/postgres.c:3024
+#: tcop/postgres.c:3079
 #, c-format
 msgid "floating-point exception"
 msgstr "Fließkommafehler"
 
-#: tcop/postgres.c:3025
+#: tcop/postgres.c:3080
 #, 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 "Eine ungültige Fließkommaoperation wurde signalisiert. Das bedeutet wahrscheinlich ein Ergebnis außerhalb des gültigen Bereichs oder eine ungültige Operation, zum Beispiel Division durch null."
 
-#: tcop/postgres.c:3190
+#: tcop/postgres.c:3245
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "Verbindung wird abgebrochen wegen Konflikt mit der Wiederherstellung"
 
-#: tcop/postgres.c:3262
+#: tcop/postgres.c:3317
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "storniere Authentifizierung wegen Zeitüberschreitung"
 
-#: tcop/postgres.c:3266
+#: tcop/postgres.c:3321
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "Autovacuum-Prozess wird abgebrochen aufgrund von Anweisung des Administrators"
 
-#: tcop/postgres.c:3270
+#: tcop/postgres.c:3325
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "Arbeitsprozess für logische Replikation wird abgebrochen aufgrund von Anweisung des Administrators"
 
-#: tcop/postgres.c:3290
+#: tcop/postgres.c:3340
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "WAL-Receiver-Prozess wird abgebrochen aufgrund von Anweisung des Administrators"
+
+#: tcop/postgres.c:3356
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "Verbindung wird abgebrochen aufgrund von Anweisung des Administrators"
 
-#: tcop/postgres.c:3321
+#: tcop/postgres.c:3387
 #, c-format
 msgid "connection to client lost"
 msgstr "Verbindung zum Client wurde verloren"
 
-#: tcop/postgres.c:3373
+#: tcop/postgres.c:3439
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "storniere Anfrage wegen Zeitüberschreitung einer Sperre"
 
-#: tcop/postgres.c:3380
+#: tcop/postgres.c:3446
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "storniere Anfrage wegen Zeitüberschreitung der Anfrage"
 
-#: tcop/postgres.c:3387
+#: tcop/postgres.c:3453
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "storniere Autovacuum-Aufgabe"
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3466
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "storniere Anfrage wegen Benutzeraufforderung"
 
-#: tcop/postgres.c:3421
+#: tcop/postgres.c:3487
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "Verbindung wird abgebrochen wegen Zeitüberschreitung in inaktiver Transaktion"
 
-#: tcop/postgres.c:3434
+#: tcop/postgres.c:3500
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "Verbindung wird abgebrochen wegen Zeitüberschreitung in Transaktion"
 
-#: tcop/postgres.c:3447
+#: tcop/postgres.c:3513
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "Verbindung wird abgebrochen wegen Zeitüberschreitung in inaktiver Sitzung"
 
-#: tcop/postgres.c:3537
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "Grenze für Stacktiefe überschritten"
-
-#: tcop/postgres.c:3538
-#, 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."
-
-#: tcop/postgres.c:3585
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "»max_stack_depth« darf %ldkB nicht überschreiten."
-
-#: tcop/postgres.c:3587
-#, 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."
-
-#: tcop/postgres.c:3610
+#: tcop/postgres.c:3552
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr "»client_connection_check_interval« muss auf dieser Plattform auf 0 gesetzt sein."
 
-#: tcop/postgres.c:3631
+#: tcop/postgres.c:3573
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "Kann Parameter nicht einschalten, wenn »log_statement_stats« an ist."
 
-#: tcop/postgres.c:3646
+#: tcop/postgres.c:3588
 #, 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."
 
-#: tcop/postgres.c:4011
+#: tcop/postgres.c:4028
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "ungültiges Kommandozeilenargument für Serverprozess: %s"
 
-#: tcop/postgres.c:4012 tcop/postgres.c:4018
+#: tcop/postgres.c:4029 tcop/postgres.c:4035
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: tcop/postgres.c:4016
+#: tcop/postgres.c:4033
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: ungültiges Kommandozeilenargument: %s"
 
-#: tcop/postgres.c:4069
+#: tcop/postgres.c:4086
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: weder Datenbankname noch Benutzername angegeben"
 
-#: tcop/postgres.c:4822
+#: tcop/postgres.c:4279
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "konnte zufälligen Stornierungsschlüssel nicht erzeugen"
+
+#: tcop/postgres.c:4681
+#, c-format
+msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr "Verbindung bereit: Setup gesamt=%.3f ms, Fork=%.3f ms, Authentifizierung=%.3f ms"
+
+#: tcop/postgres.c:4912
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "ungültiger Subtyp %d von CLOSE-Message"
 
-#: tcop/postgres.c:4859
+#: tcop/postgres.c:4949
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "ungültiger Subtyp %d von DESCRIBE-Message"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:5043
 #, 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:4950
+#: tcop/postgres.c:5047
 #, 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:5130
+#: tcop/postgres.c:5193
 #, 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"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "Bind-Message hat %d Ergebnisspalten, aber Anfrage hat %d Spalten"
 
-#: tcop/pquery.c:944 tcop/pquery.c:1701
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "Cursor kann nur vorwärts scannen"
 
-#: tcop/pquery.c:945 tcop/pquery.c:1702
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Deklarieren Sie ihn mit der Option SCROLL, um rückwarts scannen zu können."
@@ -24176,68 +25179,73 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "kann %s nicht in einer sicherheitsbeschränkten Operation ausführen"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "%s kann nicht in einem Hintergrundprozess ausgeführt werden"
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "keine Berechtigung, um Befehl %s auszuführen"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können diesen Befehl ausführen."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS unterstützt nur Relationsnamen in der FROM-Klausel"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "mehrere DictFile-Parameter"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "mehrere AffFile-Parameter"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "unbekannter Ispell-Parameter: »%s«"
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "Parameter »AffFile« fehlt"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "Parameter »DictFile« fehlt"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "mehrere »Accept«-Parameter"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "unbekannter Parameter für das einfache Wörterbuch: »%s«"
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "unbekannter Synonymparameter: »%s«"
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "Parameter »Synonyms« fehlt"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "konnte Synonymdatei »%s« nicht öffnen: %m"
@@ -24312,78 +25320,73 @@ msgstr "unbekannter Thesaurus-Parameter: »%s«"
 msgid "missing Dictionary parameter"
 msgstr "Parameter »Dictionary« fehlt"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:384 tsearch/spell.c:401 tsearch/spell.c:410
+#: tsearch/spell.c:1053
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "ungültiges Affix-Flag »%s«"
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:388 tsearch/spell.c:1057
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "Affix-Flag »%s« ist außerhalb des gültigen Bereichs"
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:418
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "ungültiges Zeichen in Affix-Flag »%s«"
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:438
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "ungültiges Affix-Flag »%s« mit Flag-Wert »long«"
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:528
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "konnte Wörterbuchdatei »%s« nicht öffnen: %m"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1182 tsearch/spell.c:1194 tsearch/spell.c:1758
+#: tsearch/spell.c:1763 tsearch/spell.c:1768
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "ungültiges Affixalias »%s«"
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1235 tsearch/spell.c:1306 tsearch/spell.c:1455
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "konnte Affixdatei »%s« nicht öffnen: %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1289
 #, c-format
 msgid "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag values"
 msgstr "Ispell-Wörterbuch unterstützt nur die Flag-Werte »default«, »long« und »num«"
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1333
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "ungültige Anzahl Flag-Vektor-Aliasse"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1356
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "Anzahl der Aliasse überschreitet angegebene Zahl %d"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1570
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "Affixdatei enthält Befehle im alten und im neuen Stil"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "Zeichenkette ist zu lang für tsvector (%d Bytes, maximal %d Bytes)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:196
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "Zeile %d in Konfigurationsdatei »%s«: »%s«"
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "Umwandlung von wchar_t in Serverkodierung fehlgeschlagen: %m"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -24396,12 +25399,12 @@ msgstr "Wort ist zu lang, um indiziert zu werden"
 msgid "Words longer than %d characters are ignored."
 msgstr "Wörter, die länger als %d Zeichen sind, werden ignoriert."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "ungültiger Textsuchekonfigurationsdateiname »%s«"
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "konnte Stoppwortdatei »%s« nicht öffnen: %m"
@@ -24411,67 +25414,113 @@ msgstr "konnte Stoppwortdatei »%s« nicht öffnen: %m"
 msgid "text search parser does not support headline creation"
 msgstr "Textsucheparser unterstützt das Erzeugen von Headlines nicht"
 
-#: tsearch/wparser_def.c:2664
+#: tsearch/wparser_def.c:2665
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "unbekannter Headline-Parameter: »%s«"
 
-#: tsearch/wparser_def.c:2674
-#, c-format
-msgid "MinWords should be less than MaxWords"
-msgstr "»MinWords« sollte kleiner als »MaxWords« sein"
-
-#: tsearch/wparser_def.c:2678
+#: tsearch/wparser_def.c:2675
 #, c-format
-msgid "MinWords should be positive"
-msgstr "»MinWords« sollte positiv sein"
+msgid "%s must be less than %s"
+msgstr "%s muss kleiner als %s sein"
 
-#: tsearch/wparser_def.c:2682
+#: tsearch/wparser_def.c:2679
 #, c-format
-msgid "ShortWord should be >= 0"
-msgstr "»ShortWord« sollte >= 0 sein"
+msgid "%s must be positive"
+msgstr "%s muss positiv sein"
 
-#: tsearch/wparser_def.c:2686
+#: tsearch/wparser_def.c:2683 tsearch/wparser_def.c:2687
 #, c-format
-msgid "MaxFragments should be >= 0"
-msgstr "»MaxFragments« sollte >= 0 sein"
+msgid "%s must be >= 0"
+msgstr "%s muss >= 0 sein"
 
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "konnte permanente Statistikdatei »%s« nicht löschen: %m"
 
-#: utils/activity/pgstat.c:1252
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "ungültige Statistikart: »%s«"
 
-#: utils/activity/pgstat.c:1332
+#: utils/activity/pgstat.c:1471
+#, c-format
+msgid "custom cumulative statistics name is invalid"
+msgstr "Name für benutzerdefinierte kumulative Statistik ist ungültig"
+
+#: utils/activity/pgstat.c:1472
+#, c-format
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "Geben Sie einen nicht leeren Namen für die benutzerdefinierte kumulative Statistik an."
+
+#: utils/activity/pgstat.c:1475
+#, c-format
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr "ID %u für benutzerdefinierte kumulative Statistik ist außerhalb des gültigen Bereichs"
+
+#: utils/activity/pgstat.c:1476
+#, c-format
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr "Geben Sie eine ID für die benutzerdefinierte kumulative Statistik zwischen %u und %u an."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, c-format
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr "konnte benutzerdefinierte kumulative Statistik »%s« mit ID %u nicht registrieren"
+
+#: utils/activity/pgstat.c:1482
+#, c-format
+msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
+msgstr "Benutzerdefinierte kumulative Statistik muss beim Initialisieren von Modulen in »shared_preload_libraries« registriert werden."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr "Property für benutzerdefinierte kumulative Statistik ist ungültig"
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
+msgstr "Benutzerdefinierte kumulative Statistiken benötigen eine Shared-Memory-Größe für Objekte mit fester Zahl."
+
+#: utils/activity/pgstat.c:1509
+#, c-format
+msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr "Benutzerdefinierte kumulative Statistik »%s« ist schon mit der gleichen ID registriert."
+
+#: utils/activity/pgstat.c:1522
+#, c-format
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr "Bestehende kumulative Statistik mit ID %u hat den gleichen Namen."
+
+#: utils/activity/pgstat.c:1528
+#, c-format
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr "benutzerdefinierte kumulative Statistik »%s« mit ID %u wurde registriert"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht öffnen: %m"
 
-#: utils/activity/pgstat.c:1444
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht schreiben: %m"
 
-#: utils/activity/pgstat.c:1453
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht schließen: %m"
 
-#: utils/activity/pgstat.c:1461
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "konnte temporäre Statistikdatei »%s« nicht in »%s« umbenennen: %m"
-
-#: utils/activity/pgstat.c:1510
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "konnte Statistikdatei »%s« nicht öffnen: %m"
 
-#: utils/activity/pgstat.c:1672
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "verfälschte Statistikdatei »%s«"
@@ -24481,195 +25530,209 @@ msgstr "verfälschte Statistikdatei »%s«"
 msgid "function call to dropped function"
 msgstr "Funktionsaufruf einer gelöschten Funktion"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "Fehlgeschlagen beim Anlegen von Eintrag %u/%u/%<PRIu64>."
+
+#: utils/activity/pgstat_xact.c:366
+#, c-format
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "bestehende Statistiken für Art %s, db=%u, oid=%<PRIu64> werden zurückgesetzt"
+
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "bestehende Statistiken für Art %s, db=%u, oid=%u werden zurückgesetzt"
+msgid "wait event \"%s\" already exists in type \"%s\""
+msgstr "Wait-Event »%s« existiert bereits in Typ »%s«"
 
-#: utils/activity/wait_event.c:210
-#, fuzzy, c-format
-#| msgid "too many arguments for cursor \"%s\""
-msgid "too many wait events for extensions"
-msgstr "zu viele Argumente für Cursor »%s«"
+#: utils/activity/wait_event.c:245
+#, c-format
+msgid "too many custom wait events"
+msgstr "zu viele benutzerdefinierte Wait-Events"
 
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "Bezeichner zu lang"
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "Bezeichner muss weniger als %d Zeichen haben."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "unbekanntes Schlüsselwort: »%s«"
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "ACL-Schlüsselwort muss »group« oder »user« sein."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "Name fehlt"
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, 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."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "»=«-Zeichen fehlt"
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "ungültiges Moduszeichen: muss eines aus »%s« sein"
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "auf das »/«-Zeichen muss ein Name folgen"
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "nicht angegebener Grantor wird auf user ID %u gesetzt"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "ACL-Array enthält falschen Datentyp"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "ACL-Arrays müssen eindimensional sein"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "ACL-Array darf keine NULL-Werte enthalten"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "überflüssiger Müll am Ende der ACL-Angabe"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "Grant-Optionen können nicht an den eigenen Grantor gegeben werden"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert wird nicht mehr unterstützt"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove wird nicht mehr unterstützt"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "unbekannter Privilegtyp: »%s«"
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "Funktion »%s« existiert nicht"
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "Berechtigung nur für Rollen, die SET ROLE \"%s\" ausführen können"
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:119 utils/adt/array_userfuncs.c:566
+#: utils/adt/array_userfuncs.c:943 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, c-format
 msgid "could not determine input data type"
 msgstr "konnte Eingabedatentypen nicht bestimmen"
 
-#: utils/adt/array_userfuncs.c:107
+#: utils/adt/array_userfuncs.c:124
 #, c-format
 msgid "input data type is not an array"
 msgstr "Eingabedatentyp ist kein Array"
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
-#: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
-#: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
-#: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
-#: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
-#: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1902 utils/adt/numeric.c:4439
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/array_userfuncs.c:168 utils/adt/array_userfuncs.c:250
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:807 utils/adt/int.c:829
+#: utils/adt/int.c:843 utils/adt/int.c:857 utils/adt/int.c:888
+#: utils/adt/int.c:909 utils/adt/int.c:1026 utils/adt/int.c:1040
+#: utils/adt/int.c:1054 utils/adt/int.c:1087 utils/adt/int.c:1101
+#: utils/adt/int.c:1115 utils/adt/int.c:1146 utils/adt/int.c:1228
+#: utils/adt/int.c:1292 utils/adt/int.c:1360 utils/adt/int.c:1366
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1186
+#: utils/adt/varlena.c:3240 utils/adt/varlena.c:4174
 #, c-format
 msgid "integer out of range"
 msgstr "integer ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:175 utils/adt/array_userfuncs.c:260
 #, 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:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:372 utils/adt/array_userfuncs.c:411
+#: utils/adt/array_userfuncs.c:448 utils/adt/array_userfuncs.c:477
+#: utils/adt/array_userfuncs.c:505
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "inkompatible Arrays können nicht aneinandergehängt werden"
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:373
 #, 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:335
+#: utils/adt/array_userfuncs.c:412
 #, 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:372
+#: utils/adt/array_userfuncs.c:449
 #, 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:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:478 utils/adt/array_userfuncs.c:506
 #, 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:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5609 utils/adt/arrayfuncs.c:5615
+#: utils/adt/array_userfuncs.c:1053 utils/adt/array_userfuncs.c:1061
+#: utils/adt/arrayfuncs.c:5634 utils/adt/arrayfuncs.c:5640
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "Arrays unterschiedlicher Dimensionalität können nicht akkumuliert werden"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1073
+#, c-format
+msgid "array size exceeds the maximum allowed (%zu)"
+msgstr "Arraygröße überschreitet erlaubtes Maximum (%zu)"
+
+#: utils/adt/array_userfuncs.c:1357 utils/adt/array_userfuncs.c:1511
 #, 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:1301
+#: utils/adt/array_userfuncs.c:1386
 #, c-format
 msgid "initial position must not be null"
 msgstr "Startposition darf nicht NULL sein"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1759
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "Stichprobengröße muss zwischen 0 und %d sein"
@@ -24722,8 +25785,8 @@ msgstr "Auf »[« müssen explizit angegebene Array-Dimensionen folgen."
 msgid "Missing array dimension value."
 msgstr "Dimensionswert fehlt."
 
-#: utils/adt/arrayfuncs.c:481 utils/adt/arrayfuncs.c:2933
-#: utils/adt/arrayfuncs.c:2978 utils/adt/arrayfuncs.c:2993
+#: utils/adt/arrayfuncs.c:481 utils/adt/arrayfuncs.c:2940
+#: utils/adt/arrayfuncs.c:2985 utils/adt/arrayfuncs.c:3000
 #, c-format
 msgid "upper bound cannot be less than lower bound"
 msgstr "Obergrenze kann nicht kleiner als Untergrenze sein"
@@ -24754,26 +25817,25 @@ msgstr "Unerwartetes Arrayelement."
 msgid "Specified array dimensions do not match array contents."
 msgstr "Angegebene Array-Dimensionen stimmen nicht mit dem Array-Inhalt überein."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2597
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "Mehrdimensionale Arrays müssen Arraysausdrücke mit gleicher Anzahl Dimensionen haben."
 
 #: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:905
-#, fuzzy, c-format
-#| msgid "Unexpected array element."
+#, c-format
 msgid "Incorrectly quoted array element."
-msgstr "Unerwartetes Arrayelement."
+msgstr "Inkorrekt gequotetes Arrayelement."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "Unerwartetes Ende der Eingabe."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3492
-#: utils/adt/arrayfuncs.c:6099
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6126
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "ungültige Anzahl Dimensionen: %d"
@@ -24789,7 +25851,7 @@ msgid "binary data has array element type %u (%s) instead of expected %u (%s)"
 msgstr "binäre Daten haben Array-Elementtyp %u (%s) statt erwartet %u (%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3136
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "keine binäre Eingabefunktion verfügbar für Typ %s"
@@ -24800,7 +25862,7 @@ msgid "improper binary format in array element %d"
 msgstr "falsches Binärformat in Arrayelement %d"
 
 #: utils/adt/arrayfuncs.c:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3169
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "keine binäre Ausgabefunktion verfügbar für Typ %s"
@@ -24812,17 +25874,17 @@ msgstr "Auswählen von Stücken aus Arrays mit fester Länge ist nicht implement
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2908 utils/adt/arrayfuncs.c:6085
-#: utils/adt/arrayfuncs.c:6111 utils/adt/arrayfuncs.c:6122
-#: utils/adt/json.c:1419 utils/adt/json.c:1491 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4691 utils/adt/jsonfuncs.c:4844
-#: utils/adt/jsonfuncs.c:4955 utils/adt/jsonfuncs.c:5003
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6112
+#: utils/adt/arrayfuncs.c:6138 utils/adt/arrayfuncs.c:6149
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "falsche Anzahl Arrayindizes"
 
 #: utils/adt/arrayfuncs.c:2250 utils/adt/arrayfuncs.c:2374
-#: utils/adt/arrayfuncs.c:2653 utils/adt/arrayfuncs.c:2983
+#: utils/adt/arrayfuncs.c:2653 utils/adt/arrayfuncs.c:2990
 #, c-format
 msgid "array subscript out of range"
 msgstr "Arrayindex außerhalb des gültigen Bereichs"
@@ -24847,95 +25909,95 @@ msgstr "Array-Slice-Index muss beide Begrenzungen angeben"
 msgid "When assigning to a slice of an empty array value, slice boundaries must be fully specified."
 msgstr "Wenn ein Slice eines leeren Array-Wertes zugewiesen wird, dann müssen die Slice-Begrenzungen vollständig angegeben werden."
 
-#: utils/adt/arrayfuncs.c:2898 utils/adt/arrayfuncs.c:3010
+#: utils/adt/arrayfuncs.c:2905 utils/adt/arrayfuncs.c:3017
 #, c-format
 msgid "source array too small"
 msgstr "Quellarray ist zu klein"
 
-#: utils/adt/arrayfuncs.c:3650
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "NULL-Werte im Array sind in diesem Zusammenhang nicht erlaubt"
 
-#: utils/adt/arrayfuncs.c:3821 utils/adt/arrayfuncs.c:3992
-#: utils/adt/arrayfuncs.c:4383
+#: utils/adt/arrayfuncs.c:3846 utils/adt/arrayfuncs.c:4017
+#: utils/adt/arrayfuncs.c:4408
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "kann Arrays mit verschiedenen Elementtypen nicht vergleichen"
 
-#: utils/adt/arrayfuncs.c:4170 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4195 utils/adt/multirangetypes.c:2806
+#: utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "konnte keine Hash-Funktion für Typ %s ermitteln"
 
-#: utils/adt/arrayfuncs.c:4298 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4323 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "konnte keine erweiterte Hash-Funktion für Typ %s ermitteln"
 
-#: utils/adt/arrayfuncs.c:5499
+#: utils/adt/arrayfuncs.c:5524
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "Datentyp %s ist kein Array-Typ"
 
-#: utils/adt/arrayfuncs.c:5554
+#: utils/adt/arrayfuncs.c:5579
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "Arrays, die NULL sind, können nicht akkumuliert werden"
 
-#: utils/adt/arrayfuncs.c:5582
+#: utils/adt/arrayfuncs.c:5607
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "leere Arrays können nicht akkumuliert werden"
 
-#: utils/adt/arrayfuncs.c:5983 utils/adt/arrayfuncs.c:6023
+#: utils/adt/arrayfuncs.c:6010 utils/adt/arrayfuncs.c:6050
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "Dimensions-Array oder Untergrenzen-Array darf nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:6086 utils/adt/arrayfuncs.c:6112
+#: utils/adt/arrayfuncs.c:6113 utils/adt/arrayfuncs.c:6139
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Dimensions-Array muss eindimensional sein."
 
-#: utils/adt/arrayfuncs.c:6091 utils/adt/arrayfuncs.c:6117
+#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "Dimensionswerte dürfen nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:6123
+#: utils/adt/arrayfuncs.c:6150
 #, 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:6404
+#: utils/adt/arrayfuncs.c:6431
 #, 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:6681
+#: utils/adt/arrayfuncs.c:6708
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "Parameter »thresholds« muss ein eindimensionales Array sein"
 
-#: utils/adt/arrayfuncs.c:6686
+#: utils/adt/arrayfuncs.c:6713
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "»thresholds«-Array darf keine NULL-Werte enthalten"
 
-#: utils/adt/arrayfuncs.c:6919
+#: utils/adt/arrayfuncs.c:6946
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "Anzahl der zu entfernenden Elemente muss zwischen 0 und %d sein"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "Arrayindex muss Typ integer haben"
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "Arrayindex in Zuweisung darf nicht NULL sein"
@@ -24966,48 +26028,52 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "Kodierungsumwandlung zwischen %s und ASCII wird nicht unterstützt"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:277 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
-#: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
+#: utils/adt/geo_ops.c:4672 utils/adt/int.c:198 utils/adt/int.c:210
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:796 utils/adt/numeric.c:7206
-#: utils/adt/numeric.c:7409 utils/adt/numeric.c:8356 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:360
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "ungültige Eingabesyntax für Typ %s: »%s«"
 
-#: utils/adt/cash.c:215 utils/adt/cash.c:240 utils/adt/cash.c:250
-#: utils/adt/cash.c:290 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/cash.c:98 utils/adt/cash.c:111 utils/adt/cash.c:124
+#: utils/adt/cash.c:137 utils/adt/cash.c:150
 #, c-format
-msgid "value \"%s\" is out of range for type %s"
-msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ %s"
+msgid "money out of range"
+msgstr "money ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/cash.c:652 utils/adt/cash.c:702 utils/adt/cash.c:753
-#: utils/adt/cash.c:802 utils/adt/cash.c:854 utils/adt/cash.c:904
-#: utils/adt/float.c:99 utils/adt/int.c:843 utils/adt/int.c:959
-#: utils/adt/int.c:1039 utils/adt/int.c:1101 utils/adt/int.c:1139
-#: utils/adt/int.c:1167 utils/adt/int8.c:514 utils/adt/int8.c:572
-#: utils/adt/int8.c:942 utils/adt/int8.c:1022 utils/adt/int8.c:1084
-#: utils/adt/int8.c:1164 utils/adt/numeric.c:3176 utils/adt/numeric.c:3199
-#: utils/adt/numeric.c:3284 utils/adt/numeric.c:3302 utils/adt/numeric.c:3398
-#: utils/adt/numeric.c:8905 utils/adt/numeric.c:9218 utils/adt/numeric.c:9566
-#: utils/adt/numeric.c:9682 utils/adt/numeric.c:11192
-#: utils/adt/timestamp.c:3713
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
+#: utils/adt/int.c:872 utils/adt/int.c:988 utils/adt/int.c:1068
+#: utils/adt/int.c:1130 utils/adt/int.c:1168 utils/adt/int.c:1196
+#: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
+#: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "Division durch Null"
 
+#: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
+#: utils/adt/cash.c:367 utils/adt/int.c:204 utils/adt/numutils.c:350
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
+#, c-format
+msgid "value \"%s\" is out of range for type %s"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ %s"
+
 #: utils/adt/char.c:197
 #, c-format
 msgid "\"char\" out of range"
@@ -25018,189 +26084,187 @@ msgstr "\"char\" ist außerhalb des gültigen Bereichs"
 msgid "could not compute %s hash: %s"
 msgstr "konnte %s-Hash nicht berechnen: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "ungültige Typmodifikation"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "Präzision von TIME(%d)%s darf nicht negativ sein"
 
-#: utils/adt/date.c:82
+#: utils/adt/date.c:83
 #, c-format
 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:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4174
+#: utils/adt/formatting.c:4183 utils/adt/formatting.c:4288
+#: utils/adt/formatting.c:4298
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "date ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2489
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2553
 #, c-format
 msgid "date out of range"
 msgstr "date ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, 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:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "date ist außerhalb des gültigen Bereichs: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "kann unendliche date-Werte nicht subtrahieren"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "Datum ist außerhalb des gültigen Bereichs für Typ »timestamp«"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "Einheit »%s« nicht unterstützt für Typ %s"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "Einheit »%s« nicht erkannt für Typ %s"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2511
-#: utils/adt/xml.c:2518 utils/adt/xml.c:2538 utils/adt/xml.c:2545
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4019 utils/adt/formatting.c:4055
+#: utils/adt/formatting.c:4142 utils/adt/formatting.c:4264 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2575
+#: utils/adt/xml.c:2582 utils/adt/xml.c:2602 utils/adt/xml.c:2609
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4347
 #, c-format
 msgid "time out of range"
 msgstr "time ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, 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"
 
-#: utils/adt/date.c:2020
-#, fuzzy, c-format
-#| msgid "cannot convert infinity to %s"
+#: utils/adt/date.c:2085
+#, c-format
 msgid "cannot convert infinite interval to time"
-msgstr "kann Unendlich nicht in %s umwandeln"
+msgstr "kann unendlichen interval-Wert nicht in time umwandeln"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
-#, fuzzy, c-format
-#| msgid "cannot subtract infinite dates"
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
+#, c-format
 msgid "cannot add infinite interval to time"
-msgstr "kann unendliche date-Werte nicht subtrahieren"
+msgstr "kann unendlichen interval-Wert nicht zu time addieren"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
-#, fuzzy, c-format
-#| msgid "cannot subtract infinite dates"
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
+#, c-format
 msgid "cannot subtract infinite interval from time"
-msgstr "kann unendliche date-Werte nicht subtrahieren"
+msgstr "kann unendlichen interval-Wert nicht von time subtrahieren"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2580
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:664 utils/adt/int.c:711
+#: utils/adt/int.c:746 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "ungültige vorhergehende oder folgende Größe in Fensterfunktion"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "Zeitzonenunterschied ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
 msgstr "Intervall-Zeitzone »%s« muss endlich sein"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, 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:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "Zeitzone »%s« nicht erkannt"
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "Datum/Zeit-Feldwert ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/datetime.c:4110
+#: utils/adt/datetime.c:4232
 #, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Möglicherweise benötigen Sie eine andere »datestyle«-Einstellung."
+msgid "Perhaps you need a different \"DateStyle\" setting."
+msgstr "Möglicherweise benötigen Sie eine andere »DateStyle«-Einstellung."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "»interval«-Feldwert ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "Zeitzonenunterschied ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, 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«."
@@ -25210,17 +26274,22 @@ msgstr "Dieser Zeitzonenname erscheint in der Konfigurationsdatei für Zeitzonen
 msgid "invalid Datum pointer"
 msgstr "ungültiger »Datum«-Zeiger"
 
-#: utils/adt/dbsize.c:760 utils/adt/dbsize.c:836
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "Tablespace mit OID %u existiert nicht"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "ungültige Größe: »%s«"
 
-#: utils/adt/dbsize.c:837
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "Ungültige Größeneinheit: »%s«."
 
-#: utils/adt/dbsize.c:838
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
 msgstr "Gültige Einheiten sind »bytes«, »B«, »kB«, »MB«, »GB«, »TB« und »PB«."
@@ -25245,32 +26314,32 @@ msgstr "Ergebnis der Kodierungsumwandlung ist zu groß"
 msgid "result of decoding conversion is too large"
 msgstr "Ergebnis der Dekodierungsumwandlung ist zu groß"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "ungültige hexadezimale Ziffer: »%.*s«"
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "ungültige hexadezimale Daten: ungerade Anzahl Ziffern"
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "unerwartetes »=« beim Dekodieren von Base64-Sequenz"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "ungültiges Symbol »%.*s« beim Dekodieren von Base64-Sequenz"
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "ungültige Base64-Endsequenz"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr "Die Eingabedaten haben fehlendes Padding, sind zu kurz oder sind anderweitig verfälscht."
@@ -25307,352 +26376,363 @@ msgstr "konnte tatsächlichen Enum-Typen nicht bestimmen"
 msgid "enum %s contains no values"
 msgstr "Enum %s enthält keine Werte"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "Wert ist außerhalb des gültigen Bereichs: Überlauf"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "Wert ist außerhalb des gültigen Bereichs: Unterlauf"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "»%s« ist außerhalb des gültigen Bereichs für Typ real"
 
-#: utils/adt/float.c:482
+#: utils/adt/float.c:489
 #, 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"
 
-#: utils/adt/float.c:1247 utils/adt/float.c:1321 utils/adt/int.c:355
-#: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
-#: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4578 utils/adt/numeric.c:4583
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:384
+#: utils/adt/int.c:922 utils/adt/int.c:944 utils/adt/int.c:958
+#: utils/adt/int.c:972 utils/adt/int.c:1004 utils/adt/int.c:1242
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4149
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3694 utils/adt/numeric.c:10097
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "Quadratwurzel von negativer Zahl kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1515 utils/adt/numeric.c:3982 utils/adt/numeric.c:4094
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "null hoch eine negative Zahl ist undefiniert"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:3986 utils/adt/numeric.c:10988
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, 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:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3894
-#: utils/adt/numeric.c:10768
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "Logarithmus von null kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3832
-#: utils/adt/numeric.c:3889 utils/adt/numeric.c:10772
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "Logarithmus negativer Zahlen kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "Eingabe ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1842
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "Anzahl muss größer als null sein"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1853
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, 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:4011 utils/adt/numeric.c:1858
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "Untergrenze und Obergrenze müssen endlich sein"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1872
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "Untergrenze kann nicht gleich der Obergrenze sein"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "ungültige Formatangabe für Intervall-Wert"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Intervalle beziehen sich nicht auf bestimmte Kalenderdaten."
 
-#: utils/adt/formatting.c:1161
+#: utils/adt/formatting.c:1199
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "»EEEE« muss das letzte Muster sein"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1207
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "»9« muss vor »PR« stehen"
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1223
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "»0« muss vor »PR« stehen"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1250
 #, c-format
 msgid "multiple decimal points"
 msgstr "mehrere Dezimalpunkte"
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1254 utils/adt/formatting.c:1341
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "»V« und Dezimalpunkt können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1228
+#: utils/adt/formatting.c:1266
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "»S« kann nicht zweimal verwendet werden"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1270
 #, 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"
 
-#: utils/adt/formatting.c:1252
+#: utils/adt/formatting.c:1290
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "»S« und »MI« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1300
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "»S« und »PL« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1310
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "»S« und »SG« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1319
 #, 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"
 
-#: utils/adt/formatting.c:1307
+#: utils/adt/formatting.c:1328
+#, c-format
+msgid "cannot use \"RN\" twice"
+msgstr "»RN« kann nicht zweimal verwendet werden"
+
+#: utils/adt/formatting.c:1349
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "»EEEE« kann nicht zweimal verwendet werden"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1355
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "»EEEE« ist mit anderen Formaten inkompatibel"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1356
 #, 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."
 
-#: utils/adt/formatting.c:1398
+#: utils/adt/formatting.c:1365
+#, c-format
+msgid "\"RN\" is incompatible with other formats"
+msgstr "»RN« ist mit anderen Formaten inkompatibel"
+
+#: utils/adt/formatting.c:1366
+#, c-format
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "»RN« kann nur zusammen mit »FM« verwendet werden."
+
+#: utils/adt/formatting.c:1447
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "ungültiges Datum-/Zeit-Formattrennzeichen: »%s«"
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1574
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "»%s« ist keine Zahl"
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "Groß/Klein-Umwandlung fehlgeschlagen: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1655 utils/adt/formatting.c:1719
+#: utils/adt/formatting.c:1783 utils/adt/formatting.c:1847
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr "konnte die für die Funktion %s zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/formatting.c:2410
+#: utils/adt/formatting.c:1855
+#, c-format
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr "Unicode-Case-Folding kann nur durchgeführt werden, wenn die Serverkodierung UTF8 ist"
+
+#: utils/adt/formatting.c:2152
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "ungültige Kombination von Datumskonventionen"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2153
 #, 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:2433
+#: utils/adt/formatting.c:2175
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "widersprüchliche Werte für das Feld »%s« in Formatzeichenkette"
 
-#: utils/adt/formatting.c:2435
+#: utils/adt/formatting.c:2177
 #, 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:2502
+#: utils/adt/formatting.c:2244
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "Quellzeichenkette zu kurz für Formatfeld »%s»"
 
-#: utils/adt/formatting.c:2504
+#: utils/adt/formatting.c:2246
 #, 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:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2248 utils/adt/formatting.c:2262
 #, 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«."
 
-#: utils/adt/formatting.c:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2258 utils/adt/formatting.c:2271
+#: utils/adt/formatting.c:2492 utils/adt/formatting.c:3392
+#: utils/adt/formatting.c:3595
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "ungültiger Wert »%s« für »%s«"
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2260
 #, 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:2531
+#: utils/adt/formatting.c:2273
 #, c-format
 msgid "Value must be an integer."
 msgstr "Der Wert muss eine ganze Zahl sein."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2278 utils/adt/formatting.c:3603
 #, 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"
 
-#: utils/adt/formatting.c:2538
+#: utils/adt/formatting.c:2280
 #, 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:2752
+#: utils/adt/formatting.c:2494
 #, 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:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2710 utils/adt/formatting.c:2730
+#: utils/adt/formatting.c:2750 utils/adt/formatting.c:2770
+#: utils/adt/formatting.c:2789 utils/adt/formatting.c:2808
+#: utils/adt/formatting.c:2832 utils/adt/formatting.c:2850
+#: utils/adt/formatting.c:2868 utils/adt/formatting.c:2886
+#: utils/adt/formatting.c:2903 utils/adt/formatting.c:2920
 #, c-format
 msgid "localized string format value too long"
 msgstr "lokalisierter Formatwert ist zu lang"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3200
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "Formattrennzeichen »%c« ohne passende Eingabe"
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3261
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "Formatzeichen »%s« ohne passende Eingabe"
 
-#: utils/adt/formatting.c:3652
-#, fuzzy, c-format
-#| msgid "time zone \"%s\" not recognized"
-msgid "Time zone abbreviation is not recognized."
-msgstr "Zeitzone »%s« nicht erkannt"
-
-#: utils/adt/formatting.c:3853
+#: utils/adt/formatting.c:3394
 #, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "ungültige Eingabe für »Y,YYY«"
+msgid "Time zone abbreviation is not recognized."
+msgstr "Zeitzonenabkürzung wird nicht erkannt."
 
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3692
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "Eingabezeichenkette ist zu kurz für Datum-/Zeitformat"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3700
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "nach dem Datum-/Zeitformat bleiben noch Zeichen in der Eingabezeichenkette"
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4244
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "Zeitzone fehlt in Eingabezeichenkette für Typ timestamptz"
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4250
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4278
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "Datum-/Zeitformat hat Zeitzone aber keine Zeit"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4327
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "Zeitzone fehlt in Eingabezeichenkette für Typ timetz"
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4333
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4359
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "Datum-/Zeitformat hat kein Datum und keine Zeit"
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "Stunde »%d« ist bei einer 12-Stunden-Uhr ungültig"
 
-#: utils/adt/formatting.c:4788
+#: utils/adt/formatting.c:4538
 #, 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:4900
+#: utils/adt/formatting.c:4715
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "kann Tag des Jahres nicht berechnen ohne Jahrinformationen"
 
-#: utils/adt/formatting.c:5852
+#: utils/adt/formatting.c:5849
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "»E« wird nicht bei der Eingabe unterstützt"
 
-#: utils/adt/formatting.c:5864
+#: utils/adt/formatting.c:6139
 #, c-format
-msgid "\"RN\" not supported for input"
-msgstr "»RN« wird nicht bei der Eingabe unterstützt"
+msgid "invalid Roman numeral"
+msgstr "ungültige römische Zahl"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -25664,9 +26744,9 @@ msgstr "absoluter Pfad nicht erlaubt"
 msgid "path must be in or below the data directory"
 msgstr "Pfad muss in oder unter dem Datenverzeichnis sein"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:864
+#: utils/adt/oracle_compat.c:1167
 #, c-format
 msgid "requested length too large"
 msgstr "verlangte Länge zu groß"
@@ -25681,11 +26761,6 @@ msgstr "konnte Positionszeiger in Datei »%s« nicht setzen: %m"
 msgid "file length too large"
 msgstr "Dateilänge zu groß"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "Tablespace mit OID %u existiert nicht"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -25732,13 +26807,18 @@ msgstr "kann Kreis mit Radius null nicht in Polygon umwandeln"
 msgid "must request at least 2 points"
 msgstr "mindestens 2 Punkte müssen angefordert werden"
 
-#: utils/adt/int.c:264
+#: utils/adt/int.c:158
+#, c-format
+msgid "array is not a valid int2vector"
+msgstr "Array ist kein gültiger int2vector"
+
+#: utils/adt/int.c:292
 #, c-format
 msgid "invalid int2vector data"
 msgstr "ungültige int2vector-Daten"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1750
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1558 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "Schrittgröße kann nicht gleich null sein"
@@ -25752,9 +26832,9 @@ msgstr "Schrittgröße kann nicht gleich null sein"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4527
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4199
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint ist außerhalb des gültigen Bereichs"
@@ -25764,49 +26844,49 @@ msgstr "bigint ist außerhalb des gültigen Bereichs"
 msgid "OID out of range"
 msgstr "OID ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "Schlüsselwert muss skalar sein, nicht Array, zusammengesetzt oder json"
 
-#: utils/adt/json.c:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "konnte Datentyp von Argument %d nicht ermitteln"
 
-#: utils/adt/json.c:1067 utils/adt/json.c:1259 utils/adt/json.c:1435
-#: utils/adt/json.c:1513 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "NULL-Werte sind nicht als Objektschlüssel erlaubt"
 
-#: utils/adt/json.c:1110 utils/adt/json.c:1274
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "doppelter JSON-Objekt-Schlüsselwert: %s"
 
-#: utils/adt/json.c:1219 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "Argumentliste muss gerade Anzahl Elemente haben"
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1221 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "Die Argumente von %s müssen abwechselnd Schlüssel und Werte sein."
 
-#: utils/adt/json.c:1413 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "Array muss zwei Spalten haben"
 
-#: utils/adt/json.c:1502 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "Array-Dimensionen passen nicht"
 
-#: utils/adt/json.c:1688 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "doppelter JSON-Objekt-Schlüsselwert"
@@ -25871,23 +26951,23 @@ msgstr "kann jsonb-Objekt nicht in Typ %s umwandeln"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "kann jsonb-Array oder -Objekt nicht in Typ %s umwandeln"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "Anzahl der jsonb-Objekte-Paare überschreitet erlaubtes Maximum (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "Anzahl der jsonb-Arrayelemente überschreitet erlaubtes Maximum (%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "Gesamtgröße der jsonb-Array-Elemente überschreitet die maximale Größe von %d Bytes"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "Gesamtgröße der jsonb-Objektelemente überschreitet die maximale Größe von %d Bytes"
@@ -25922,210 +27002,210 @@ msgstr "jsonb-Index muss Typ text haben"
 msgid "jsonb subscript in assignment must not be null"
 msgstr "jsonb-Index in Zuweisung darf nicht NULL sein"
 
-#: utils/adt/jsonfuncs.c:582 utils/adt/jsonfuncs.c:829
-#: utils/adt/jsonfuncs.c:2438 utils/adt/jsonfuncs.c:3013
-#: utils/adt/jsonfuncs.c:3929 utils/adt/jsonfuncs.c:4276
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "%s kann nicht mit einem skalaren Wert aufgerufen werden"
 
-#: utils/adt/jsonfuncs.c:587 utils/adt/jsonfuncs.c:814
-#: utils/adt/jsonfuncs.c:3015 utils/adt/jsonfuncs.c:3916
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "%s kann nicht mit einem Array aufgerufen werden"
 
-#: utils/adt/jsonfuncs.c:723
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "JSON-Daten, Zeile %d: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1882 utils/adt/jsonfuncs.c:1919
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "kann nicht die Arraylänge eines skalaren Wertes ermitteln"
 
-#: utils/adt/jsonfuncs.c:1886 utils/adt/jsonfuncs.c:1905
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "kann nicht die Arraylänge eines Nicht-Arrays ermitteln"
 
-#: utils/adt/jsonfuncs.c:1985
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "%s kann nicht mit etwas aufgerufen werden, das kein Objekt ist"
 
-#: utils/adt/jsonfuncs.c:2173
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "kann Array nicht in ein Objekt zerlegen"
 
-#: utils/adt/jsonfuncs.c:2187
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "kann skalaren Wert nicht zerlegen"
 
-#: utils/adt/jsonfuncs.c:2232
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "kann keine Elemente aus einem skalaren Wert auswählen"
 
-#: utils/adt/jsonfuncs.c:2236
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "kann keine Elemente aus einem Objekt auswählen"
 
-#: utils/adt/jsonfuncs.c:2423 utils/adt/jsonfuncs.c:4154
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "%s kann nicht mit etwas aufgerufen werden, das kein Array ist"
 
-#: utils/adt/jsonfuncs.c:2514 utils/adt/jsonfuncs.c:2519
-#: utils/adt/jsonfuncs.c:2537 utils/adt/jsonfuncs.c:2543
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "JSON-Array wurde erwartet"
 
-#: utils/adt/jsonfuncs.c:2515
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "Prüfen Sie den Wert des Schlüssels »%s«."
 
-#: utils/adt/jsonfuncs.c:2538
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "Prüfen Sie das Arrayelement %s des Schlüssels »%s«."
 
-#: utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "Prüfen Sie das Arrayelement %s."
 
-#: utils/adt/jsonfuncs.c:2596
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "fehlerhaftes JSON-Array"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3628
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "erstes Argument von %s muss ein Zeilentyp sein"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3652
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "konnte Zeilentyp für Ergebnis von %s nicht ermitteln"
 
-#: utils/adt/jsonfuncs.c:3654
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid "Provide a non-null record argument, or call the function in the FROM clause using a column definition list."
 msgstr "Geben Sie ein »record«-Argument, das nicht NULL ist, an oder rufen Sie die Funktion in der FROM-Klausel mit einer Spaltendefinitionsliste auf."
 
-#: utils/adt/jsonfuncs.c:4040 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "Materialisierungsmodus wird benötigt, ist aber in diesem Zusammenhang nicht erlaubt"
 
-#: utils/adt/jsonfuncs.c:4171 utils/adt/jsonfuncs.c:4255
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "Argument von %s muss ein Array von Objekten sein"
 
-#: utils/adt/jsonfuncs.c:4204
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "%s kann nicht mit einem Objekt aufgerufen werden"
 
-#: utils/adt/jsonfuncs.c:4637 utils/adt/jsonfuncs.c:4696
-#: utils/adt/jsonfuncs.c:4776
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "kann nicht aus skalarem Wert löschen"
 
-#: utils/adt/jsonfuncs.c:4781
+#: utils/adt/jsonfuncs.c:4824
 #, c-format
 msgid "cannot delete from object using integer index"
 msgstr "aus einem Objekt kann nicht per numerischem Index gelöscht werden"
 
-#: utils/adt/jsonfuncs.c:4849 utils/adt/jsonfuncs.c:5008
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "in einem skalaren Wert kann kein Pfad gesetzt werden"
 
-#: utils/adt/jsonfuncs.c:4890 utils/adt/jsonfuncs.c:4932
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid "null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\""
 msgstr "null_value_treatment muss »delete_key«, »return_target«, »use_json_null« oder »raise_exception« sein"
 
-#: utils/adt/jsonfuncs.c:4903
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "JSON-Wert darf nicht NULL sein"
 
-#: utils/adt/jsonfuncs.c:4904
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid "Exception was raised because null_value_treatment is \"raise_exception\"."
 msgstr "Ausnahme wurde ausgelöst, weil null_value_treatment »raise_exception« ist."
 
-#: utils/adt/jsonfuncs.c:4905
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid "To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed."
 msgstr "Um dies zu vermeiden, ändern Sie das Argument null_value_treatment oder sorgen Sie dafür, dass kein SQL NULL übergeben wird."
 
-#: utils/adt/jsonfuncs.c:4960
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "in einem skalaren Wert kann kein Pfad gelöscht werden"
 
-#: utils/adt/jsonfuncs.c:5174
+#: utils/adt/jsonfuncs.c:5217
 #, c-format
 msgid "path element at position %d is null"
 msgstr "Pfadelement auf Position %d ist NULL"
 
-#: utils/adt/jsonfuncs.c:5193 utils/adt/jsonfuncs.c:5224
-#: utils/adt/jsonfuncs.c:5297
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "existierender Schlüssel kann nicht ersetzt werden"
 
-#: utils/adt/jsonfuncs.c:5194 utils/adt/jsonfuncs.c:5225
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr "Der Pfad nimmt an, dass der Schlüssel ein zusammengesetztes Objekt ist, aber er ist ein skalarer Wert."
 
-#: utils/adt/jsonfuncs.c:5298
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "Verwenden Sie die Funktion jsonb_set, um den Schlüsselwert zu ersetzen."
 
-#: utils/adt/jsonfuncs.c:5402
+#: utils/adt/jsonfuncs.c:5445
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
 msgstr "Pfadelement auf Position %d ist keine ganze Zahl: »%s«"
 
-#: utils/adt/jsonfuncs.c:5419
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "Pfadelement auf Position %d ist außerhalb des gültigen Bereichs: %d"
 
-#: utils/adt/jsonfuncs.c:5571
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "falscher Flag-Typ, nur Arrays und skalare Werte sind erlaubt"
 
-#: utils/adt/jsonfuncs.c:5578
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "Flag-Array-Element ist keine Zeichenkette"
 
-#: utils/adt/jsonfuncs.c:5579 utils/adt/jsonfuncs.c:5601
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid "Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"."
 msgstr "Mögliche Werte sind: »string«, »numeric«, »boolean«, »key« und »all«."
 
-#: utils/adt/jsonfuncs.c:5599
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "falsche Flag im Flag-Array: »%s«"
@@ -26140,275 +27220,247 @@ msgstr "@ ist nicht erlaubt in Wurzelausdrücken"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST ist nur in Arrayindizes erlaubt"
 
-#: utils/adt/jsonpath_exec.c:490
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "ein einzelnes Ergebnis mit Typ boolean wird erwartet"
 
-#: utils/adt/jsonpath_exec.c:850
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr "JSON-Path-Wildcard-Array-Indizierung kann nur auf ein Array angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:873
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr "JSON-Path-Wildcard-Member-Zugriff kann nur auf ein Objekt angwendet werden"
 
-#: utils/adt/jsonpath_exec.c:922
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "JSON-Path-Arrayindex ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/jsonpath_exec.c:979
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr "JSON-Path-Array-Indizierung kann nur auf ein Array angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:1043
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "JSON-Objekt enthält Schlüssel »%s« nicht"
 
-#: utils/adt/jsonpath_exec.c:1055
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr "JSON-Path-Member-Zugriff kann nur auf ein Objekt angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:1113
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "Jsonpath-Item-Methode .%s() kann nur auf ein Array angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:1166 utils/adt/jsonpath_exec.c:1192
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type double precision"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
+#, c-format
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "Argument »%s« der JSON-Path-Item-Methode .%s() ist ungültig für Typ %s"
 
-#: utils/adt/jsonpath_exec.c:1171 utils/adt/jsonpath_exec.c:1197
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
 #: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
-msgstr ""
+msgstr "NaN oder unendliche Werte sind für JSON-Path-Item-Methode .%s() nicht erlaubt"
 
-#: utils/adt/jsonpath_exec.c:1210 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
 #: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
 msgstr "JSON-Path-Item-Methode .%s() kann nur auf eine Zeichenkette oder einen numerischen Wert angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:1280 utils/adt/jsonpath_exec.c:1304
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
-
-#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
-
 #: utils/adt/jsonpath_exec.c:1385
-#, fuzzy, c-format
-#| msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
-msgid "jsonpath item method .%s() can only be applied to a bool, string, or numeric value"
-msgstr "JSON-Path-Item-Methode .%s() kann nur auf eine Zeichenkette oder einen numerischen Wert angewendet werden"
-
-#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
+#, c-format
+msgid "jsonpath item method .%s() can only be applied to a boolean, string, or numeric value"
+msgstr "JSON-Path-Item-Methode .%s() kann nur auf boolean, eine Zeichenkette oder einen numerischen Wert angewendet werden"
 
 #: utils/adt/jsonpath_exec.c:1486
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
+#, c-format
 msgid "precision of jsonpath item method .%s() is out of range for type integer"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
+msgstr "Präzision der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ integer"
 
 #: utils/adt/jsonpath_exec.c:1500
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
+#, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
+msgstr "Skala der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ integer"
 
-#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
-
-#: utils/adt/jsonpath_exec.c:1666
-#, fuzzy, c-format
-#| msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
-msgid "jsonpath item method .%s() can only be applied to a bool, string, numeric, or datetime value"
-msgstr "JSON-Path-Item-Methode .%s() kann nur auf eine Zeichenkette oder einen numerischen Wert angewendet werden"
+#: utils/adt/jsonpath_exec.c:1647
+#, c-format
+msgid "jsonpath item method .%s() can only be applied to a boolean, string, numeric, or datetime value"
+msgstr "JSON-Path-Item-Methode .%s() kann nur auf boolean, eine Zeichenkette, einen numerischen Wert oder einen datetime-Wert angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:2155
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr "linker Operand des JSON-Path-Operators %s ist kein einzelner numerischer Wert"
 
-#: utils/adt/jsonpath_exec.c:2162
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr "rechter Operand des JSON-Path-Operators %s ist kein einzelner numerischer Wert"
 
-#: utils/adt/jsonpath_exec.c:2230
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr "Operand des unären JSON-Path-Operators %s ist kein numerischer Wert"
 
-#: utils/adt/jsonpath_exec.c:2329
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "JSON-Path-Item-Methode .%s() kann nur auf einen numerischen Wert angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:2375
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "JSON-Path-Item-Methode .%s() kann nur auf eine Zeichenkette angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:2468
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
+#: utils/adt/jsonpath_exec.c:2449
+#, c-format
 msgid "time precision of jsonpath item method .%s() is out of range for type integer"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
-
-#: utils/adt/jsonpath_exec.c:2502 utils/adt/jsonpath_exec.c:2508
-#: utils/adt/jsonpath_exec.c:2535 utils/adt/jsonpath_exec.c:2563
-#: utils/adt/jsonpath_exec.c:2616 utils/adt/jsonpath_exec.c:2667
-#: utils/adt/jsonpath_exec.c:2723
-#, fuzzy, c-format
-#| msgid "datetime format is not recognized: \"%s\""
+msgstr "Zeitpräzision der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ integer"
+
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
+#, c-format
 msgid "%s format is not recognized: \"%s\""
-msgstr "Datum-/Zeitformat nicht erkannt: »%s«"
+msgstr "%s-Format wird nicht erkannt: »%s«"
 
-#: utils/adt/jsonpath_exec.c:2504
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr "Verwenden Sie das Template-Argument für .datetime(), um das Eingabeformat anzugeben."
 
-#: utils/adt/jsonpath_exec.c:2697 utils/adt/jsonpath_exec.c:2753
-#, fuzzy, c-format
-#| msgid "numeric argument of jsonpath item method .%s() is out of range for type double precision"
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
+#, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
-msgstr "numerisches Argument der JSON-Path-Item-Methode .%s() ist außerhalb des gültigen Bereichs für Typ double precision"
+msgstr "Zeitpräzision der JSON-Path-Item-Methode .%s() ist ungültig"
 
-#: utils/adt/jsonpath_exec.c:2833
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "JSON-Path-Item-Methode .%s() kann nur auf ein Objekt angewendet werden"
 
-#: utils/adt/jsonpath_exec.c:3117
-#, fuzzy, c-format
-#| msgid "%s could not convert type %s to %s"
+#: utils/adt/jsonpath_exec.c:3123
+#, c-format
 msgid "could not convert value of type %s to jsonpath"
-msgstr "%s konnte Typ %s nicht in %s umwandeln"
+msgstr "konnte Wert vom Typ %s nicht in jsonpath umwandeln"
 
-#: utils/adt/jsonpath_exec.c:3151
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "konnte JSON-Path-Variable »%s« nicht finden"
 
-#: utils/adt/jsonpath_exec.c:3204
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "Argument »vars« ist kein Objekt"
 
-#: utils/adt/jsonpath_exec.c:3205
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
 msgstr "JSON-Path-Parameter sollten als Schüssel-Wert-Paare im »vars«-Objekt kodiert werden."
 
-#: utils/adt/jsonpath_exec.c:3468
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "JSON-Path-Arrayindex ist kein einzelner numerischer Wert"
 
-#: utils/adt/jsonpath_exec.c:3480
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "JSON-Path-Arrayindex ist außerhalb des gültigen Bereichs für ganze Zahlen"
 
-#: utils/adt/jsonpath_exec.c:3664
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "Wert kann nicht von %s nach %s konvertiert werden ohne Verwendung von Zeitzonen"
 
-#: utils/adt/jsonpath_exec.c:3666
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "Verwenden Sie die *_tz()-Funktion für Zeitzonenunterstützung."
 
-#: utils/adt/jsonpath_exec.c:3960
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
-msgid "JSON path expression for column \"%s\" should return single item without wrapper"
-msgstr ""
+msgid "JSON path expression for column \"%s\" must return single item when no wrapper is requested"
+msgstr "JSON-Path-Ausdruck für Spalte »%s« muss ein einzelnes Element zurückgeben, wenn kein Wrapper angefordert wurde"
 
-#: utils/adt/jsonpath_exec.c:3962 utils/adt/jsonpath_exec.c:3967
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
-msgid "Use WITH WRAPPER clause to wrap SQL/JSON items into array."
-msgstr ""
+msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
+msgstr "Verwenden Sie die WITH-WRAPPER-Klausel, um SQL/JSON-Elemente in ein Array einzupacken."
 
-#: utils/adt/jsonpath_exec.c:3966
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
-msgid "JSON path expression in JSON_QUERY should return single item without wrapper"
-msgstr ""
+msgid "JSON path expression in JSON_QUERY must return single item when no wrapper is requested"
+msgstr "JSON-Pfad-Ausdruck in JSON_QUERY muss ein einzelnes Element zurückgeben, wenn kein Wrapper angefordert wurde"
 
-#: utils/adt/jsonpath_exec.c:4024 utils/adt/jsonpath_exec.c:4048
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
-msgid "JSON path expression for column \"%s\" should return single scalar item"
-msgstr ""
+msgid "JSON path expression for column \"%s\" must return single scalar item"
+msgstr "JSON-Path-Ausdruck für Spalte »%s« muss ein einzelnes skalares Element zurückgeben"
 
-#: utils/adt/jsonpath_exec.c:4029 utils/adt/jsonpath_exec.c:4053
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
-msgid "JSON path expression in JSON_VALUE should return single scalar item"
-msgstr ""
+msgid "JSON path expression in JSON_VALUE must return single scalar item"
+msgstr "JSON-Pfad-Ausdruck in JSON_VALUE muss ein einzelnes skalares Element zurückgeben"
 
-#: utils/adt/levenshtein.c:132
+#: utils/adt/levenshtein.c:134
 #, 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:159
+#: utils/adt/like.c:162
 #, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "nichtdeterministische Sortierfolgen werden von LIKE nicht unterstützt"
+msgid "could not determine which collation to use for LIKE"
+msgstr "konnte die für LIKE zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "konnte die für ILIKE zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "nichtdeterministische Sortierfolgen werden von ILIKE nicht unterstützt"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "LIKE-Muster darf nicht mit Escape-Zeichen enden"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:804
 #, c-format
 msgid "invalid escape string"
 msgstr "ungültige ESCAPE-Zeichenkette"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:805
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "ESCAPE-Zeichenkette muss null oder ein Zeichen lang sein."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, 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/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, 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"
@@ -26428,7 +27480,7 @@ msgstr "macaddr8-Daten außerhalb des gültigen Bereichs für Umwandlung in maca
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr "Nur Adressen, die FF und FE als Werte im 4. und 5. Byte von links haben, zum Beispiel xx:xx:xx:ff:fe:xx:xx:xx, kommen für eine Umwandlung von macaddr8 nach macaddr in Frage."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d ist kein PostgreSQL-Serverprozess"
@@ -26525,12 +27577,12 @@ msgstr "Start einer Range erwartet."
 msgid "Expected comma or end of multirange."
 msgstr "Komma oder Ende der Multirange erwartet."
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "Multiranges können nicht aus mehrdimensionalen Arrays konstruiert werden"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "Multirange-Werte können keine Mitglieder, die NULL sind, haben"
@@ -26545,8 +27597,8 @@ msgstr "ungültiger cidr-Wert: »%s«"
 msgid "Value has bits set to right of mask."
 msgstr "Wert hat gesetzte Bits rechts von der Maske."
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "konnte inet-Wert nicht formatieren: %m"
@@ -26574,198 +27626,203 @@ msgstr "ungültige Länge in externem »%s«-Wert"
 msgid "invalid external \"cidr\" value"
 msgstr "ungültiger externer »cidr«-Wert"
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "ungültige Maskenlänge: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "konnte cidr-Wert nicht formatieren: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "Adressen verschiedener Familien können nicht zusammengeführt werden"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "binäres »Und« nicht mit »inet«-Werten unterschiedlicher Größe möglich"
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "binäres »Oder« nicht mit »inet«-Werten unterschiedlicher Größe möglich"
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "Ergebnis ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "Subtraktion von »inet«-Werten unterschiedlicher Größe nicht möglich"
 
-#: utils/adt/numeric.c:786 utils/adt/numeric.c:3644 utils/adt/numeric.c:7201
-#: utils/adt/numeric.c:7404 utils/adt/numeric.c:7876 utils/adt/numeric.c:10571
-#: utils/adt/numeric.c:11045 utils/adt/numeric.c:11139
-#: utils/adt/numeric.c:11273
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "Wert verursacht Überlauf im »numeric«-Format"
 
-#: utils/adt/numeric.c:1099
+#: utils/adt/numeric.c:1108
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "ungültiges Vorzeichen in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:1105
+#: utils/adt/numeric.c:1114
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "ungültige Skala in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:1114
+#: utils/adt/numeric.c:1123
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "ungültige Ziffer in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:1329 utils/adt/numeric.c:1343
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, 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:1334
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "Skala von NUMERIC (%d) muss zwischen %d und %d liegen"
 
-#: utils/adt/numeric.c:1352
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "ungültiker Modifikator für Typ NUMERIC"
 
-#: utils/adt/numeric.c:1710
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "Startwert kann nicht NaN sein"
 
-#: utils/adt/numeric.c:1714
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "Startwert kann nicht unendlich sein"
 
-#: utils/adt/numeric.c:1721
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "Stoppwert kann nicht NaN sein"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "Stoppwert kann nicht unendlich sein"
 
-#: utils/adt/numeric.c:1738
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "Schrittgröße kann nicht NaN sein"
 
-#: utils/adt/numeric.c:1742
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "Schrittgröße kann nicht unendlich sein"
 
-#: utils/adt/numeric.c:3634
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "Fakultät einer negativen Zahl ist undefiniert"
 
-#: utils/adt/numeric.c:4241
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "Untergrenze kann nicht NaN sein"
 
-#: utils/adt/numeric.c:4245
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "Untergrenze kann nicht unendlich sein"
 
-#: utils/adt/numeric.c:4252
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "Obergrenze kann nicht NaN sein"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "Obergrenze kann nicht unendlich sein"
 
-#: utils/adt/numeric.c:4417 utils/adt/numeric.c:4505 utils/adt/numeric.c:4565
-#: utils/adt/numeric.c:4761
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "kann NaN nicht in %s umwandeln"
 
-#: utils/adt/numeric.c:4421 utils/adt/numeric.c:4509 utils/adt/numeric.c:4569
-#: utils/adt/numeric.c:4765
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "kann Unendlich nicht in %s umwandeln"
 
-#: utils/adt/numeric.c:4774
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/numeric.c:7966 utils/adt/numeric.c:8017
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "Feldüberlauf bei Typ »numeric«"
 
-#: utils/adt/numeric.c:7967
+#: utils/adt/numeric.c:8086
 #, 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:8018
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "Ein Feld mit Präzision %d, Skala %d kann keinen unendlichen Wert enthalten."
 
-#: utils/adt/numeric.c:11342 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
 msgstr "Untergrenze muss kleiner als oder gleich der Obergrenze sein"
 
-#: utils/adt/oid.c:217
+#: utils/adt/oid.c:131
+#, c-format
+msgid "array is not a valid oidvector"
+msgstr "Array ist kein gültiger oidvector"
+
+#: utils/adt/oid.c:245
 #, c-format
 msgid "invalid oidvector data"
 msgstr "ungültige oidvector-Daten"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:1001
 #, c-format
 msgid "requested character too large"
 msgstr "verlangtes Zeichen zu groß"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1045
 #, c-format
 msgid "character number must be positive"
 msgstr "Zeichennummer muss positiv sein"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1049
 #, c-format
 msgid "null character not permitted"
 msgstr "Null-Zeichen ist nicht erlaubt"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1067 utils/adt/oracle_compat.c:1120
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "gewünschtes Zeichen ist zu groß für die Kodierung: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1108
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "gewünschtes Zeichen ist nicht gültig für die Kodierung: %u"
@@ -26776,140 +27833,150 @@ msgstr "gewünschtes Zeichen ist nicht gültig für die Kodierung: %u"
 msgid "percentile value %g is not between 0 and 1"
 msgstr "Perzentilwert %g ist nicht zwischen 0 und 1"
 
-#: utils/adt/pg_locale.c:1484
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr "konnte Collator für Locale »%s« mit Regeln »%s« nicht öffnen: %s"
-
-#: utils/adt/pg_locale.c:1495 utils/adt/pg_locale.c:2969
-#: utils/adt/pg_locale.c:3042
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU wird in dieser Installation nicht unterstützt"
-
-#: utils/adt/pg_locale.c:1523
-#, c-format
-msgid "could not create locale \"%s\": %m"
-msgstr "konnte Locale »%s« nicht erzeugen: %m"
-
-#: utils/adt/pg_locale.c:1526
-#, c-format
-msgid "The operating system could not find any locale data for the locale name \"%s\"."
-msgstr "Das Betriebssystem konnte keine Locale-Daten für den Locale-Namen »%s« finden."
-
-#: utils/adt/pg_locale.c:1647
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, 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"
+msgid "locale name \"%s\" contains non-ASCII characters"
+msgstr "Locale-Name »%s« enthält Nicht-ASCII-Zeichen"
 
-#: utils/adt/pg_locale.c:1694
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "Sortierfolge »%s« hat keine tatsächliche Version, aber eine Version wurde aufgezeichnet"
 
-#: utils/adt/pg_locale.c:1700
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "Version von Sortierfolge »%s« stimmt nicht überein"
 
-#: utils/adt/pg_locale.c:1702
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr "Die Sortierfolge in der Datenbank wurde mit Version %s erzeugt, aber das Betriebssystem hat Version %s."
 
-#: utils/adt/pg_locale.c:1705
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr "Bauen Sie alle von dieser Sortierfolge beinflussten Objekte neu und führen Sie ALTER COLLATION %s REFRESH VERSION aus, oder bauen Sie PostgreSQL mit der richtigen Bibliotheksversion."
 
-#: utils/adt/pg_locale.c:1749 utils/adt/pg_locale.c:2533
-#: utils/adt/pg_locale.c:2558
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "ungültiger Locale-Name »%s« für Provider »builtin«"
 
-#: utils/adt/pg_locale.c:1791
+#: utils/adt/pg_locale.c:1590
 #, c-format
-msgid "could not load locale \"%s\""
-msgstr "konnte Locale »%s« nicht laden"
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "konnte Locale-Namen »%s« nicht in Sprach-Tag umwandeln: %s"
 
-#: utils/adt/pg_locale.c:1816
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
-msgstr "konnte Sortierfolgenversion für Locale »%s« nicht ermitteln: Fehlercode %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU wird in dieser Installation nicht unterstützt"
 
-#: utils/adt/pg_locale.c:1872 utils/adt/pg_locale.c:1885
+#: utils/adt/pg_locale.c:1632
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "konnte Zeichenkette nicht in UTF-16 umwandeln: Fehlercode %lu"
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "konnte Sprache nicht aus ICU-Locale »%s« ermitteln: %s"
 
-#: utils/adt/pg_locale.c:1897
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "konnte Unicode-Zeichenketten nicht vergleichen: %m"
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
+msgstr "Um die Validierung von ICU-Locales auszuschalten, setzen Sie den Parameter »%s« auf »%s«."
+
+#: utils/adt/pg_locale.c:1662
+#, c-format
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "ICU-Locale »%s« hat unbekannte Sprache »%s«"
+
+#: utils/adt/pg_locale_icu.c:264
+#, c-format
+msgid "could not get language from locale \"%s\": %s"
+msgstr "konnte Sprache nicht aus Locale »%s« ermitteln: %s"
+
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
+#, c-format
+msgid "could not open collator for locale \"%s\": %s"
+msgstr "konnte Collator für Locale »%s« nicht öffnen: %s"
 
-#: utils/adt/pg_locale.c:2071
+#: utils/adt/pg_locale_icu.c:374
+#, c-format
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr "konnte Collator für Locale »%s« mit Regeln »%s« nicht öffnen: %s"
+
+#: utils/adt/pg_locale_icu.c:490
 #, c-format
 msgid "collation failed: %s"
 msgstr "Vergleichung fehlgeschlagen: %s"
 
-#: utils/adt/pg_locale.c:2290 utils/adt/pg_locale.c:2322
+#: utils/adt/pg_locale_icu.c:569 utils/adt/pg_locale_icu.c:833
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "Sortierschlüsselerzeugung fehlgeschlagen: %s"
 
-#: utils/adt/pg_locale.c:2612
+#: utils/adt/pg_locale_icu.c:643 utils/adt/pg_locale_icu.c:655
+#: utils/adt/pg_locale_icu.c:883 utils/adt/pg_locale_icu.c:904
 #, c-format
-msgid "could not get language from locale \"%s\": %s"
-msgstr "konnte Sprache nicht aus Locale »%s« ermitteln: %s"
+msgid "%s failed: %s"
+msgstr "%s fehlgeschlagen: %s"
 
-#: utils/adt/pg_locale.c:2633 utils/adt/pg_locale.c:2649
+#: utils/adt/pg_locale_icu.c:684
 #, c-format
-msgid "could not open collator for locale \"%s\": %s"
-msgstr "konnte Collator für Locale »%s« nicht öffnen: %s"
+msgid "case conversion failed: %s"
+msgstr "Groß/Klein-Umwandlung fehlgeschlagen: %s"
 
-#: utils/adt/pg_locale.c:2674
+#: utils/adt/pg_locale_icu.c:856
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "Kodierung »%s« wird von ICU nicht unterstützt"
 
-#: utils/adt/pg_locale.c:2681
+#: utils/adt/pg_locale_icu.c:863
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "konnte ICU-Konverter für Kodierung »%s« nicht öffnen: %s"
 
-#: utils/adt/pg_locale.c:2699 utils/adt/pg_locale.c:2718
-#: utils/adt/pg_locale.c:2774 utils/adt/pg_locale.c:2785
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "%s failed: %s"
-msgstr "%s fehlgeschlagen: %s"
+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"
 
-#: utils/adt/pg_locale.c:2960
+#: utils/adt/pg_locale_libc.c:683
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "konnte Locale-Namen »%s« nicht in Sprach-Tag umwandeln: %s"
+msgid "could not load locale \"%s\""
+msgstr "konnte Locale »%s« nicht laden"
 
-#: utils/adt/pg_locale.c:3001
+#: utils/adt/pg_locale_libc.c:708
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "konnte Sprache nicht aus ICU-Locale »%s« ermitteln: %s"
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr "konnte Sortierfolgenversion für Locale »%s« nicht ermitteln: Fehlercode %lu"
 
-#: utils/adt/pg_locale.c:3003 utils/adt/pg_locale.c:3032
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr "Um die Validierung von ICU-Locales auszuschalten, setzen Sie den Parameter »%s« auf »%s«."
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "konnte Zeichenkette nicht in UTF-16 umwandeln: Fehlercode %lu"
 
-#: utils/adt/pg_locale.c:3030
+#: utils/adt/pg_locale_libc.c:793
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "ICU-Locale »%s« hat unbekannte Sprache »%s«"
+msgid "could not compare Unicode strings: %m"
+msgstr "konnte Unicode-Zeichenketten nicht vergleichen: %m"
 
-#: utils/adt/pg_locale.c:3181
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "konnte Locale »%s« nicht erzeugen: %m"
+
+#: utils/adt/pg_locale_libc.c:828
+#, c-format
+msgid "The operating system could not find any locale data for the locale name \"%s\"."
+msgstr "Das Betriebssystem konnte keine Locale-Daten für den Locale-Namen »%s« finden."
+
+#: utils/adt/pg_locale_libc.c:1000
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "ungültiges Mehrbytezeichen für Locale"
 
-#: utils/adt/pg_locale.c:3182
+#: utils/adt/pg_locale_libc.c:1001
 #, 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."
@@ -26924,27 +27991,27 @@ msgstr "NaN kann nicht zu pg_lsn addiert werden"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "NaN kann nicht von pg_lsn subtrahiert werden"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr "Funktion kann nur aufgerufen werden, wenn der Server im Binary-Upgrade-Modus ist"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "ungültiger Befehlsname: »%s«"
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1921
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "unbekanntes Reset-Ziel: »%s«"
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1922
 #, c-format
 msgid "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\", or \"wal\"."
 msgstr "Das Reset-Ziel muss »archiver«, »bgwriter«, »checkpointer«, »io«, »recovery_prefetch«, »slru« oder »wal« sein."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2039
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "ungültige Subskriptions-OID: %u"
@@ -26969,113 +28036,113 @@ msgstr "kann keinen Wert eines Hüllentyps annehmen"
 msgid "cannot display a value of a shell type"
 msgstr "kann keinen Wert eines Hüllentyps anzeigen"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "Flags-Argument des Bereichstyp-Konstruktors darf nicht NULL sein"
 
-#: utils/adt/rangetypes.c:1021
+#: utils/adt/rangetypes.c:1023
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "Ergebnis von Bereichsdifferenz würde nicht zusammenhängend sein"
 
-#: utils/adt/rangetypes.c:1082
+#: utils/adt/rangetypes.c:1084
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "Ergebnis von Bereichsvereinigung würde nicht zusammenhängend sein"
 
-#: utils/adt/rangetypes.c:1757
+#: utils/adt/rangetypes.c:1821
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "Bereichsuntergrenze muss kleiner als oder gleich der Bereichsobergrenze sein"
 
-#: utils/adt/rangetypes.c:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "ungültige Markierungen für Bereichsgrenzen"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Gültige Werte sind »[]«, »[)«, »(]« und »()«."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "fehlerhafte Bereichskonstante: »%s«"
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Müll nach Schlüsselwort »empty«."
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Linke runde oder eckige Klammer fehlt."
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Komma fehlt nach Untergrenze."
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "Zu viele Kommas."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Müll nach rechter runder oder eckiger Klammer."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2068 utils/adt/varlena.c:4531
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "regulärer Ausdruck fehlgeschlagen: %s"
 
-#: utils/adt/regexp.c:445 utils/adt/regexp.c:680
+#: utils/adt/regexp.c:445 utils/adt/regexp.c:681
 #, c-format
 msgid "invalid regular expression option: \"%.*s\""
 msgstr "ungültige Option für regulären Ausdruck: »%.*s«"
 
-#: utils/adt/regexp.c:682
+#: utils/adt/regexp.c:683
 #, c-format
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr "Wenn Sie regexp_replace() mit einem Startparameter verwenden wollten, wandeln Sie das vierte Argument explizit in integer um."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6776 utils/misc/guc.c:6810
+#: utils/adt/regexp.c:717 utils/adt/regexp.c:726 utils/adt/regexp.c:1154
+#: utils/adt/regexp.c:1218 utils/adt/regexp.c:1227 utils/adt/regexp.c:1236
+#: utils/adt/regexp.c:1245 utils/adt/regexp.c:1925 utils/adt/regexp.c:1934
+#: utils/adt/regexp.c:1943 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "ungültiger Wert für Parameter »%s«: %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:951
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr "SQL regulärer Ausdruck darf nicht mehr als zwei Escape-Double-Quote-Separatoren enthalten"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1165 utils/adt/regexp.c:1256 utils/adt/regexp.c:1343
+#: utils/adt/regexp.c:1382 utils/adt/regexp.c:1770 utils/adt/regexp.c:1825
+#: utils/adt/regexp.c:1954
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s unterstützt die »Global«-Option nicht"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1384
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "Verwenden Sie stattdessen die Funktion regexp_matches."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1572
 #, c-format
 msgid "too many regular expression matches"
 msgstr "zu viele Treffer für regulären Ausdruck"
@@ -27090,8 +28157,8 @@ msgstr "es gibt mehrere Funktionen namens »%s«"
 msgid "more than one operator named %s"
 msgstr "es gibt mehrere Operatoren namens %s"
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10424
-#: utils/adt/ruleutils.c:10637
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
@@ -27102,7 +28169,7 @@ msgid "Provide two argument types for operator."
 msgstr "Geben Sie zwei Argumente für den Operator an."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3537 utils/adt/varlena.c:3542
 #, c-format
 msgid "invalid name syntax"
 msgstr "ungültige Namenssyntax"
@@ -27127,78 +28194,93 @@ msgstr "Typname erwartet"
 msgid "improper type name"
 msgstr "falscher Typname"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr "Einfügen oder Aktualisieren in Tabelle »%s« verletzt Fremdschlüssel-Constraint »%s«"
 
-#: utils/adt/ri_triggers.c:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, 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:2036
+#: utils/adt/ri_triggers.c:2192
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "Funktion »%s« muss von INSERT ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2198
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "Funktion »%s« muss von UPDATE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2048
+#: utils/adt/ri_triggers.c:2204
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "Funktion »%s« muss von DELETE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2071
+#: utils/adt/ri_triggers.c:2227
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "kein »pg_constraint«-Eintrag für Trigger »%s« für Tabelle »%s«"
 
-#: utils/adt/ri_triggers.c:2073
+#: utils/adt/ri_triggers.c:2229
 #, 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:2426
+#: utils/adt/ri_triggers.c:2599
 #, 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"
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, 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:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr "Entfernen der Partition »%s« verletzt Fremdschlüssel-Constraint »%s«"
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "Auf Schlüssel (%s)=(%s) wird noch aus Tabelle »%s« verwiesen."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Schlüssel (%s)=(%s) ist nicht in Tabelle »%s« vorhanden."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "Der Schlüssel ist nicht in Tabelle »%s« vorhanden."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, c-format
+msgid "update or delete on table \"%s\" violates RESTRICT setting of foreign key constraint \"%s\" on table \"%s\""
+msgstr "Aktualisieren oder Löschen in Tabelle »%s« verletzt die RESTRICT-Einstellung des Fremdschlüssel-Constraints »%s« von Tabelle »%s«"
+
+#: utils/adt/ri_triggers.c:2792
+#, c-format
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "Auf Schlüssel (%s)=(%s) wird aus Tabelle »%s« verwiesen."
+
+#: utils/adt/ri_triggers.c:2795
+#, c-format
+msgid "Key is referenced from table \"%s\"."
+msgstr "Auf den Schlüssel wird aus Tabelle »%s« verwiesen."
+
+#: utils/adt/ri_triggers.c:2801
 #, 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«"
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "Auf den Schlüssel wird noch aus Tabelle »%s« verwiesen."
@@ -27249,147 +28331,175 @@ msgstr "binäre Daten haben Typ %u (%s) statt erwartet %u (%s) in Record-Spalte
 msgid "improper binary format in record column %d"
 msgstr "falsches Binärformat in Record-Spalte %d"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "kann unterschiedliche Spaltentyp %s und %s in Record-Spalte %d nicht vergleichen"
 
 #: utils/adt/rowtypes.c:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "kann Record-Typen mit unterschiedlicher Anzahl Spalten nicht vergleichen"
 
-#: utils/adt/ruleutils.c:2693
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "Eingabe ist eine Anfrage, kein Ausdruck"
 
-#: utils/adt/ruleutils.c:2705
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "Ausdruck enthält Verweise auf Variablen von mehr als einer Relation"
 
-#: utils/adt/ruleutils.c:2712
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "Ausdruck enthält Variablen"
 
-#: utils/adt/ruleutils.c:5242
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "Regel »%s« hat nicht unterstützten Ereignistyp %d"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, c-format
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "für Relation »%s.%s« kann die letzte sichtbare tid nicht angesehen werden"
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr "ctid hat nicht Typ TID"
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr "currtid kann keine Sichten ohne CTID verarbeiten"
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr "die Sicht hat keine Regeln"
+
+#: utils/adt/tid.c:381
+#, c-format
+msgid "only one select rule is allowed in views"
+msgstr "in einer Sicht ist nur eine SELECT-Regel erlaubt"
+
+#: utils/adt/timestamp.c:130
 #, 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:134
+#: utils/adt/timestamp.c:136
 #, 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:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp ist außerhalb des gültigen Bereichs: »%s«"
+
+#: utils/adt/timestamp.c:396
 #, 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:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "Numerische Zeitzonen müssen »-« oder »+« als erstes Zeichen haben."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "numerische Zeitzone »%s« ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, 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:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp kann nicht NaN sein"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "timestamp ist außerhalb des gültigen Bereichs: »%g«"
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "interval-Wert ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "ungültiger Modifikator für Typ INTERVAL"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d)-Präzision darf nicht negativ sein"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, 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:1506
+#: utils/adt/timestamp.c:1497
 #, 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:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "Anfangspunkt ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
-#, fuzzy, c-format
-#| msgid "timestamps cannot be binned into intervals containing months or years"
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
+#, c-format
 msgid "timestamps cannot be binned into infinite intervals"
-msgstr "timestamp-Werte können nicht in Intervalle, die Monate oder Jahre enthalten, einsortiert werden"
+msgstr "timestamp-Werte können nicht in unendliche Intervalle einsortiert werden"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr "timestamp-Werte können nicht in Intervalle, die Monate oder Jahre enthalten, einsortiert werden"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "Schrittgröße muss größer als null sein"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "Monate haben gewöhnlich partielle Wochen."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "Schrittgröße kann nicht unendlich sein"
@@ -27464,32 +28574,32 @@ msgstr "Textsucheanfrage enthält nur Stoppwörter oder enthält keine Lexeme, i
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "ts_rewrite-Anfrage muss zwei tsquery-Spalten zurückgeben"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "Gewichtungs-Array muss eindimensional sein"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "Gewichtungs-Array ist zu kurz"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "Gewichtungs-Array darf keine NULL-Werte enthalten"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "Gewichtung ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "Wort ist zu lang (%ld Bytes, maximal %ld Bytes)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 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)"
@@ -27519,37 +28629,37 @@ msgstr "unbekannte Gewichtung: »%c«"
 msgid "ts_stat query must return one tsvector column"
 msgstr "ts_stat-Anfrage muss eine tsvector-Spalte zurückgeben"
 
-#: utils/adt/tsvector_op.c:2788
+#: utils/adt/tsvector_op.c:2792
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "tsvector-Spalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:2795
+#: utils/adt/tsvector_op.c:2799
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "Spalte »%s« hat nicht Typ tsvector"
 
-#: utils/adt/tsvector_op.c:2807
+#: utils/adt/tsvector_op.c:2811
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "Konfigurationsspalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:2813
+#: utils/adt/tsvector_op.c:2817
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "Spalte »%s« hat nicht Typ regconfig"
 
-#: utils/adt/tsvector_op.c:2820
+#: utils/adt/tsvector_op.c:2824
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "Konfigurationsspalte »%s« darf nicht NULL sein"
 
-#: utils/adt/tsvector_op.c:2833
+#: utils/adt/tsvector_op.c:2837
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "Textsuchekonfigurationsname »%s« muss Schemaqualifikation haben"
 
-#: utils/adt/tsvector_op.c:2858
+#: utils/adt/tsvector_op.c:2862
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "Spalte »%s« hat keinen Zeichentyp"
@@ -27559,17 +28669,17 @@ msgstr "Spalte »%s« hat keinen Zeichentyp"
 msgid "syntax error in tsvector: \"%s\""
 msgstr "Syntaxfehler in tsvector: »%s«"
 
-#: utils/adt/tsvector_parser.c:221
+#: utils/adt/tsvector_parser.c:220
 #, c-format
 msgid "there is no escaped character: \"%s\""
 msgstr "es gibt kein escaptes Zeichen: »%s«"
 
-#: utils/adt/tsvector_parser.c:339
+#: utils/adt/tsvector_parser.c:334
 #, c-format
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "falsche Positionsinformationen in tsvector: »%s«"
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "konnte keine Zufallswerte erzeugen"
@@ -27614,9 +28724,9 @@ msgstr "ungültige Länge in externer Bitkette"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "Bitkette ist zu lang für Typ bit varying(%d)"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:923
+#: utils/adt/varlena.c:987 utils/adt/varlena.c:1182 utils/adt/varlena.c:3158
+#: utils/adt/varlena.c:3236
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "negative Teilzeichenkettenlänge nicht erlaubt"
@@ -27641,7 +28751,7 @@ msgstr "binäres »Exklusiv-Oder« nicht mit Bitketten unterschiedlicher Länge
 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:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3440
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "neues Bit muss 0 oder 1 sein"
@@ -27656,92 +28766,92 @@ msgstr "Wert zu lang für Typ character(%d)"
 msgid "value too long for type character varying(%d)"
 msgstr "Wert zu lang für Typ character varying(%d)"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1647
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "konnte die für den Zeichenkettenvergleich zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1920
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "nichtdeterministische Sortierfolgen werden für Teilzeichenkettensuchen nicht unterstützt"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3324 utils/adt/varlena.c:3391
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "Index %d ist außerhalb des gültigen Bereichs, 0..%d"
 
-#: utils/adt/varlena.c:3252 utils/adt/varlena.c:3324
+#: utils/adt/varlena.c:3355 utils/adt/varlena.c:3427
 #, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "Index %lld ist außerhalb des gültigen Bereichs, 0..%lld"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "Index %<PRId64> ist außerhalb des gültigen Bereichs, 0..%<PRId64>"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4643
 #, c-format
 msgid "field position must not be zero"
 msgstr "Feldposition darf nicht null sein"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5891
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "Typspezifikation in format() nicht abgeschlossen"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5892 utils/adt/varlena.c:6026 utils/adt/varlena.c:6147
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "Für ein einzelnes »%%« geben Sie »%%%%« an."
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:6024 utils/adt/varlena.c:6145
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "unbekannte Typspezifikation in format(): »%.*s«"
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:6037 utils/adt/varlena.c:6094
 #, c-format
 msgid "too few arguments for format()"
 msgstr "zu wenige Argumente für format()"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6190 utils/adt/varlena.c:6372
 #, c-format
 msgid "number is out of range"
 msgstr "Zahl ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6253 utils/adt/varlena.c:6281
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "Format gibt Argument 0 an, aber die Argumente sind von 1 an nummeriert"
 
-#: utils/adt/varlena.c:6013
+#: utils/adt/varlena.c:6274
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "Argumentposition der Breitenangabe muss mit »$« enden"
 
-#: utils/adt/varlena.c:6058
+#: utils/adt/varlena.c:6319
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "NULL-Werte können nicht als SQL-Bezeichner formatiert werden"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6527
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr "Unicode-Normalisierung kann nur durchgeführt werden, wenn die Serverkodierung UTF8 ist"
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6540
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "ungültige Normalisierungsform: %s"
 
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6585
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr "Unicode-Kategorisierung kann nur durchgeführt werden, wenn die Serverkodierung UTF8 ist"
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6802 utils/adt/varlena.c:6837 utils/adt/varlena.c:6872
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "ungültiger Unicode-Codepunkt: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6902
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr "Unicode-Escapes müssen \\XXXX, \\+XXXXXX, \\uXXXX oder \\UXXXXXXXX sein."
@@ -27756,12 +28866,12 @@ msgstr "Argument von ntile muss größer als null sein"
 msgid "argument of nth_value must be greater than zero"
 msgstr "Argument von nth_value muss größer als null sein"
 
-#: utils/adt/xid8funcs.c:124
+#: utils/adt/xid8funcs.c:120
 #, c-format
-msgid "transaction ID %llu is in the future"
-msgstr "Transaktions-ID %llu ist in der Zukunft"
+msgid "transaction ID %<PRIu64> is in the future"
+msgstr "Transaktions-ID %<PRIu64> ist in der Zukunft"
 
-#: utils/adt/xid8funcs.c:553
+#: utils/adt/xid8funcs.c:522
 #, c-format
 msgid "invalid external pg_snapshot data"
 msgstr "ungültige externe pg_snapshot-Daten"
@@ -27776,7 +28886,7 @@ msgstr "nicht unterstützte XML-Funktionalität"
 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:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:636
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "ungültiger Kodierungsname »%s«"
@@ -27786,162 +28896,167 @@ msgstr "ungültiger Kodierungsname »%s«"
 msgid "invalid XML comment"
 msgstr "ungültiger XML-Kommentar"
 
-#: utils/adt/xml.c:691
+#: utils/adt/xml.c:697
 #, c-format
 msgid "not an XML document"
 msgstr "kein XML-Dokument"
 
-#: utils/adt/xml.c:987 utils/adt/xml.c:1010
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "ungültige XML-Verarbeitungsanweisung"
 
-#: utils/adt/xml.c:988
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "Die Zielangabe der XML-Verarbeitungsanweisung darf nicht »%s« sein."
 
-#: utils/adt/xml.c:1011
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML-Verarbeitungsanweisung darf nicht »?>« enthalten."
 
-#: utils/adt/xml.c:1090
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate ist nicht implementiert"
 
-#: utils/adt/xml.c:1146
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "konnte XML-Bibliothek nicht initialisieren"
 
-#: utils/adt/xml.c:1147
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2 hat inkompatiblen char-Typ: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1233
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "konnte XML-Fehlerbehandlung nicht einrichten"
 
-#: utils/adt/xml.c:1234
+#: utils/adt/xml.c:1267
 #, 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:2218
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "Ungültiger Zeichenwert."
 
-#: utils/adt/xml.c:2221
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "Leerzeichen benötigt."
 
-#: utils/adt/xml.c:2224
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone akzeptiert nur »yes« oder »no«."
 
-#: utils/adt/xml.c:2227
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "Fehlerhafte Deklaration: Version fehlt."
 
-#: utils/adt/xml.c:2230
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "Fehlende Kodierung in Textdeklaration."
 
-#: utils/adt/xml.c:2233
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Beim Parsen der XML-Deklaration: »?>« erwartet."
 
-#: utils/adt/xml.c:2236
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Unbekannter Libxml-Fehlercode: %d."
 
-#: utils/adt/xml.c:2490
+#: utils/adt/xml.c:2554
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML unterstützt keine unendlichen Datumswerte."
 
-#: utils/adt/xml.c:2512 utils/adt/xml.c:2539
+#: utils/adt/xml.c:2576 utils/adt/xml.c:2603
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML unterstützt keine unendlichen timestamp-Werte."
 
-#: utils/adt/xml.c:2955
+#: utils/adt/xml.c:3019
 #, c-format
 msgid "invalid query"
 msgstr "ungültige Anfrage"
 
-#: utils/adt/xml.c:3047
+#: utils/adt/xml.c:3111
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "Portal »%s« gibt keine Tupel zurück"
 
-#: utils/adt/xml.c:4299
+#: utils/adt/xml.c:4363
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "ungültiges Array for XML-Namensraumabbildung"
 
-#: utils/adt/xml.c:4300
+#: utils/adt/xml.c:4364
 #, 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:4324
+#: utils/adt/xml.c:4388
 #, c-format
 msgid "empty XPath expression"
 msgstr "leerer XPath-Ausdruck"
 
-#: utils/adt/xml.c:4376
+#: utils/adt/xml.c:4440
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "weder Namensraumname noch URI dürfen NULL sein"
 
-#: utils/adt/xml.c:4383
+#: utils/adt/xml.c:4447
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "konnte XML-Namensraum mit Namen »%s« und URI »%s« nicht registrieren"
 
-#: utils/adt/xml.c:4726
+#: utils/adt/xml.c:4796
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "DEFAULT-Namensraum wird nicht unterstützt"
 
-#: utils/adt/xml.c:4755
+#: utils/adt/xml.c:4825
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "Zeilenpfadfilter darf nicht leer sein"
 
-#: utils/adt/xml.c:4786
+#: utils/adt/xml.c:4859
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "Spaltenpfadfilter darf nicht leer sein"
 
-#: utils/adt/xml.c:4930
+#: utils/adt/xml.c:5006
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "XPath-Ausdruck für Spalte gab mehr als einen Wert zurück"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, 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"
+
+#: utils/cache/lsyscache.c:1147
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "Typumwandlung von Typ %s in Typ %s existiert nicht"
 
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3065 utils/cache/lsyscache.c:3098
+#: utils/cache/lsyscache.c:3131 utils/cache/lsyscache.c:3164
 #, c-format
 msgid "type %s is only a shell"
 msgstr "Typ %s ist nur eine Hülle"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3070
 #, c-format
 msgid "no input function available for type %s"
 msgstr "keine Eingabefunktion verfügbar für Typ %s"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3103
 #, c-format
 msgid "no output function available for type %s"
 msgstr "keine Ausgabefunktion verfügbar für Typ %s"
@@ -27951,32 +29066,27 @@ msgstr "keine Ausgabefunktion verfügbar für Typ %s"
 msgid "operator class \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "in Operatorklasse »%s« für Zugriffsmethode %s fehlt Support-Funktion %d für Typ %s"
 
-#: utils/cache/plancache.c:747
-#, c-format
-msgid "cached plan must not change result type"
-msgstr "gecachter Plan darf den Ergebnistyp nicht ändern"
-
-#: utils/cache/relcache.c:3800
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "Heap-Relfile-Nummer-Wert ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: utils/cache/relcache.c:3808
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "unerwartete Anforderung einer neuen Relfile-Nummer im Binary-Upgrade-Modus"
 
-#: utils/cache/relcache.c:6536
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "konnte Initialisierungsdatei für Relationscache »%s« nicht erzeugen: %m"
 
-#: utils/cache/relcache.c:6538
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Setze trotzdem fort, aber irgendwas stimmt nicht."
 
-#: utils/cache/relcache.c:6868
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "konnte Cache-Datei »%s« nicht löschen: %m"
@@ -27996,7 +29106,7 @@ msgstr "Relation-Mapping-Datei »%s« enthält ungültige Daten"
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "Relation-Mapping-Datei »%s« enthält falsche Prüfsumme"
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "Record-Typ wurde nicht registriert"
@@ -28011,193 +29121,180 @@ msgstr "TRAP: ExceptionalCondition: fehlerhafte Argumente in PID %d\n"
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "TRAP: fehlgeschlagenes Assert(»%s«), Datei: »%s«, Zeile: %d, PID: %d\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "Fehler geschah bevor Fehlermeldungsverarbeitung bereit war\n"
 
-#: utils/error/elog.c:2101
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "konnte Datei »%s« nicht als stderr neu öffnen: %m"
 
-#: utils/error/elog.c:2114
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "konnte Datei »%s« nicht als stdout neu öffnen: %m"
 
-#: utils/error/elog.c:2150
+#: utils/error/elog.c:2191
 #, c-format
-msgid "Invalid character"
-msgstr "Ungültiges Zeichen"
+msgid "Invalid character."
+msgstr "Ungültiges Zeichen."
 
-#: utils/error/elog.c:2856 utils/error/elog.c:2883 utils/error/elog.c:2899
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[unbekannt]"
 
-#: utils/error/elog.c:3169 utils/error/elog.c:3493 utils/error/elog.c:3600
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "fehlender Fehlertext"
 
-#: utils/error/elog.c:3172 utils/error/elog.c:3175
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " bei Zeichen %d"
 
-#: utils/error/elog.c:3185 utils/error/elog.c:3192
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "DETAIL:  "
 
-#: utils/error/elog.c:3199
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "TIPP:  "
 
-#: utils/error/elog.c:3206
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "ANFRAGE:  "
 
-#: utils/error/elog.c:3213
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "ZUSAMMENHANG:  "
 
-#: utils/error/elog.c:3223
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "ORT:  %s, %s:%d\n"
 
-#: utils/error/elog.c:3230
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "ORT:  %s:%d\n"
 
-#: utils/error/elog.c:3237
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "BACKTRACE:  "
 
-#: utils/error/elog.c:3249
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "ANWEISUNG:  "
 
-#: utils/error/elog.c:3645
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3649
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3652
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3655
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "HINWEIS"
 
-#: utils/error/elog.c:3659
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: utils/error/elog.c:3662
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: utils/error/elog.c:3665
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3668
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "PANIK"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "konnte Funktion »%s« nicht in Datei »%s« finden"
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "konnte Bibliothek »%s« nicht laden: %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "inkompatible Bibliothek »%s«: magischer Block fehlt"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "Erweiterungsbibliotheken müssen das Makro PG_MODULE_MAGIC verwenden."
 
-#: utils/fmgr/dfmgr.c:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "inkompatible Bibliothek »%s«: Version stimmt nicht überein"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "Serverversion ist %d, Bibliotheksversion ist %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "inkompatible Bibliothek »%s«: ABI stimmt nicht überein"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "Server hat ABI »%s«, Bibliothek hat »%s«."
 
-#: utils/fmgr/dfmgr.c:361
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "Server hat FUNC_MAX_ARGS = %d, Bibliothek hat %d."
-
-#: utils/fmgr/dfmgr.c:370
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "Server hat INDEX_MAX_KEYS = %d, Bibliothek hat %d."
+msgid "Server has %s = %d, library has %d."
+msgstr "Server hat %s = %d, Bibliothek hat %d."
 
-#: utils/fmgr/dfmgr.c:379
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
 #, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "Server hat NAMEDATALEN = %d, Bibliothek hat %d."
+msgid "Server has %s = %s, library has %s."
+msgstr "Server hat %s = %s, Bibliothek hat %s."
 
-#: utils/fmgr/dfmgr.c:388
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "Server hat FLOAT8PASSBYVAL = %s, Bibliothek hat %s."
-
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "Magischer Block hat unerwartete Länge oder unterschiedliches Padding."
 
-#: utils/fmgr/dfmgr.c:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "inkompatible Bibliothek »%s«: magischer Block stimmt überein"
+msgstr "inkompatible Bibliothek »%s«: magischer Block stimmt nicht überein"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "Zugriff auf Bibliothek »%s« ist nicht erlaubt"
 
-#: utils/fmgr/dfmgr.c:501
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "ungültiger Makroname in Parameter »dynamic_library_path«: %s"
-
-#: utils/fmgr/dfmgr.c:541
+#: utils/fmgr/dfmgr.c:554
 #, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "eine Komponente im Parameter »dynamic_library_path« hat Länge null"
+msgid "invalid macro name in path: %s"
+msgstr "ungültiger Makroname im Pfad: %s"
 
-#: utils/fmgr/dfmgr.c:560
+#: utils/fmgr/dfmgr.c:606
 #, 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"
+msgid "zero-length component in parameter \"%s\""
+msgstr "eine Komponente im Parameter »%s« hat Länge null"
 
 #: utils/fmgr/fmgr.c:236
 #, c-format
@@ -28254,345 +29351,427 @@ msgstr "Spaltenalias fehlt"
 msgid "could not determine row description for function returning record"
 msgstr "konnte Zeilenbeschreibung für Funktion, die »record« zurückgibt, nicht ermitteln"
 
-#: utils/init/miscinit.c:352
+#: utils/init/miscinit.c:265
+msgid "unknown process type"
+msgstr "unbekannter Prozesstyp"
+
+#: utils/init/miscinit.c:270
+msgid "not initialized"
+msgstr "nicht initialisiert"
+
+#: utils/init/miscinit.c:273
+msgid "archiver"
+msgstr "Archivierer"
+
+#: utils/init/miscinit.c:276
+msgid "autovacuum launcher"
+msgstr "Autovacuum-Launcher"
+
+#: utils/init/miscinit.c:279
+msgid "autovacuum worker"
+msgstr "Autovacuum-Worker"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "Client-Backend"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr "dead-end Client-Backend"
+
+#: utils/init/miscinit.c:288
+msgid "background worker"
+msgstr "Background-Worker"
+
+#: utils/init/miscinit.c:291
+msgid "background writer"
+msgstr "Background-Writer"
+
+#: utils/init/miscinit.c:294
+msgid "checkpointer"
+msgstr "Checkpointer"
+
+#: utils/init/miscinit.c:300
+msgid "logger"
+msgstr "Logger"
+
+#: utils/init/miscinit.c:303
+msgid "slotsync worker"
+msgstr "Slot-Sync-Arbeitsprozess"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr "Standalone Backend"
+
+#: utils/init/miscinit.c:309
+msgid "startup"
+msgstr "Startprozess"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr "WAL-Receiver"
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr "WAL-Sender"
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr "WAL-Summarizer"
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr "WAL-Writer"
+
+#: utils/init/miscinit.c:358
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "Datenverzeichnis »%s« existiert nicht"
 
-#: utils/init/miscinit.c:357
+#: utils/init/miscinit.c:363
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Verzeichnis »%s« nicht lesen: %m"
 
-#: utils/init/miscinit.c:365
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "angegebenes Datenverzeichnis »%s« ist kein Verzeichnis"
 
-#: utils/init/miscinit.c:381
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "Datenverzeichnis »%s« hat falschen Eigentümer"
 
-#: utils/init/miscinit.c:383
+#: utils/init/miscinit.c:389
 #, 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."
 
-#: utils/init/miscinit.c:401
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "Datenverzeichnis »%s« hat ungültige Zugriffsrechte"
 
-#: utils/init/miscinit.c:403
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "Rechte sollten u=rwx (0700) oder u=rwx,g=rx (0750) sein."
 
-#: utils/init/miscinit.c:461
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "konnte nicht in Verzeichnis »%s« wechseln: %m"
 
-#: utils/init/miscinit.c:697 utils/misc/guc.c:3641
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "kann Parameter »%s« nicht in einer sicherheitsbeschränkten Operation setzen"
 
-#: utils/init/miscinit.c:770
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "Rolle mit OID %u existiert nicht"
 
-#: utils/init/miscinit.c:800
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "Rolle »%s« hat keine Berechtigung zum Einloggen"
 
-#: utils/init/miscinit.c:818
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "zu viele Verbindungen von Rolle »%s«"
 
-#: utils/init/miscinit.c:991
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "ungültige Rollen-OID: %u"
 
-#: utils/init/miscinit.c:1138
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "Datenbanksystem ist heruntergefahren"
 
-#: utils/init/miscinit.c:1225
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "konnte Sperrdatei »%s« nicht erstellen: %m"
 
-#: utils/init/miscinit.c:1239
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "konnte Sperrdatei »%s« nicht öffnen: %m"
 
-#: utils/init/miscinit.c:1246
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "konnte Sperrdatei »%s« nicht lesen: %m"
 
-#: utils/init/miscinit.c:1255
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "Sperrdatei »%s« ist leer"
 
-#: utils/init/miscinit.c:1256
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Entweder startet gerade ein anderer Server oder die Sperrdatei ist von einen Absturz übrig geblieben."
 
-#: utils/init/miscinit.c:1300
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "Sperrdatei »%s« existiert bereits"
 
-#: utils/init/miscinit.c:1304
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "Läuft bereits ein anderer postgres-Prozess (PID %d) im Datenverzeichnis »%s«?"
 
-#: utils/init/miscinit.c:1306
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "Läuft bereits ein anderer postmaster-Prozess (PID %d) im Datenverzeichnis »%s«?"
 
-#: utils/init/miscinit.c:1309
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "Verwendet bereits ein anderer postgres-Prozess (PID %d) die Socketdatei »%s«?"
 
-#: utils/init/miscinit.c:1311
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "Verwendet bereits ein anderer postmaster-Prozess (PID %d) die Socketdatei »%s«?"
 
-#: utils/init/miscinit.c:1362
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "konnte alte Sperrdatei »%s« nicht löschen: %m"
 
-#: utils/init/miscinit.c:1364
+#: utils/init/miscinit.c:1424
 #, 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 "Die Datei ist anscheinend aus Versehen übrig geblieben, konnte aber nicht gelöscht werden. Bitte entfernen Sie die Datei von Hand und versuchen Sie es erneut."
 
-#: utils/init/miscinit.c:1401 utils/init/miscinit.c:1415
-#: utils/init/miscinit.c:1426
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "konnte Sperrdatei »%s« nicht schreiben: %m"
 
-#: utils/init/miscinit.c:1537 utils/init/miscinit.c:1679 utils/misc/guc.c:5715
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "konnte nicht aus Datei »%s« lesen: %m"
 
-#: utils/init/miscinit.c:1667
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "konnte Datei »%s« nicht öffnen: %m; setze trotzdem fort"
 
-#: utils/init/miscinit.c:1692
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "Sperrdatei »%s« enthält falsche PID: %ld statt %ld"
 
-#: utils/init/miscinit.c:1731 utils/init/miscinit.c:1747
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "»%s« ist kein gültiges Datenverzeichnis"
 
-#: utils/init/miscinit.c:1733
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Die Datei »%s« fehlt."
 
-#: utils/init/miscinit.c:1749
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Die Datei »%s« enthält keine gültigen Daten."
 
-#: utils/init/miscinit.c:1751
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "Sie müssen möglicherweise initdb ausführen."
 
-#: utils/init/miscinit.c:1759
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "Das Datenverzeichnis wurde von PostgreSQL Version %s initialisiert, welche nicht mit dieser Version %s kompatibel ist."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "Replikationsverbindung autorisiert: Benutzer=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "Verbindung autorisiert: Benutzer=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr " Datenbank=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " application_name=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr " SSL an (Protokoll=%s, Verschlüsselungsmethode=%s, Bits=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 msgstr " GSS (authentifiziert=%s, verschlüsselt=%s, delegated Credentials=%s, Principal=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "nein"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "ja"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr " GSS (authentifiziert=%s, verschlüsselt=%s, delegated Credentials=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "Datenbank »%s« ist aus pg_database verschwunden"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "Datenbank-OID %u gehört jetzt anscheinend zu »%s«."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "Datenbank »%s« akzeptiert gegenwärtig keine Verbindungen"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "keine Berechtigung für Datenbank »%s«"
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "Benutzer hat das CONNECT-Privileg nicht."
 
-#: utils/init/postinit.c:386
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "zu viele Verbindungen für Datenbank »%s«"
 
-#: utils/init/postinit.c:410 utils/init/postinit.c:417
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "Datenbank-Locale ist inkompatibel mit Betriebssystem"
 
-#: utils/init/postinit.c:411
+#: utils/init/postinit.c:423
 #, c-format
 msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
 msgstr "Die Datenbank wurde mit LC_COLLATE »%s« initialisiert, was von setlocale() nicht erkannt wird."
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid "Recreate the database with another locale or install the missing locale."
 msgstr "Erzeugen Sie die Datenbank neu mit einer anderen Locale oder installieren Sie die fehlende Locale."
 
-#: utils/init/postinit.c:418
+#: utils/init/postinit.c:430
 #, c-format
 msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
 msgstr "Die Datenbank wurde mit LC_CTYPE »%s« initialisiert, was von setlocale() nicht erkannt wird."
 
-#: utils/init/postinit.c:491
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "Version von Sortierfolge für Datenbank »%s« stimmt nicht überein"
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:473
 #, c-format
 msgid "The database was created using collation version %s, but the operating system provides version %s."
 msgstr "Die Datenbank wurde mit Sortierfolgenversion %s erzeugt, aber das Betriebssystem hat Version %s."
 
-#: utils/init/postinit.c:496
+#: utils/init/postinit.c:476
 #, c-format
 msgid "Rebuild all objects in this database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Bauen Sie alle Objekte in dieser Datenbank, die die Standardsortierfolge verwenden, neu und führen Sie ALTER DATABASE %s REFRESH COLLATION VERSION aus, oder bauen Sie PostgreSQL mit der richtigen Bibliotheksversion."
 
-#: utils/init/postinit.c:902
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr "zu viele Serverprozesse konfiguriert"
+
+#: utils/init/postinit.c:567
+#, c-format
+msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
+msgstr "»max_connections« (%d) plus »autovacuum_worker_slots« (%d) plus »max_worker_processes« (%d) plus »max_wal_senders« (%d) muss kleiner als %d sein."
+
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "in diesem Datenbanksystem sind keine Rollen definiert"
 
-#: utils/init/postinit.c:903
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Sie sollten sofort CREATE USER \"%s\" SUPERUSER; ausführen."
 
-#: utils/init/postinit.c:940
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "nur Superuser können im Binary-Upgrade-Modus verbinden"
 
-#: utils/init/postinit.c:961
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "die verbleibenden Verbindungen sind für Rollen mit dem %s-Attribut reserviert"
 
-#: utils/init/postinit.c:967
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "die verbleibenden Verbindungen sind für Rollen mit den Privilegien der Rolle »%s« reserviert"
 
-#: utils/init/postinit.c:979
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "keine Berechtigung, um WAL-Sender zu starten"
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "Nur Rollen mit dem %s-Attribut können einen WAL-Sender-Prozess starten."
 
-#: utils/init/postinit.c:1098
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Sie wurde anscheinend gerade gelöscht oder umbenannt."
 
-#: utils/init/postinit.c:1102
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "Datenbank %u existiert nicht"
 
-#: utils/init/postinit.c:1111
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "mit ungültiger Datenbank »%s« kann nicht verbunden werden"
 
-#: utils/init/postinit.c:1172
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "Das Datenbankunterverzeichnis »%s« fehlt."
@@ -28607,60 +29786,60 @@ msgstr "Rolle »%s« kann nicht SET ROLE auf »%s« durchführen"
 msgid "invalid encoding number: %d"
 msgstr "ungültige Kodierungsnummer: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "unerwartete Kodierungs-ID %d für ISO-8859-Zeichensatz"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "unerwartete Kodierungs-ID %d für WIN-Zeichensatz"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:306 utils/mb/mbutils.c:909
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:411 utils/mb/mbutils.c:439 utils/mb/mbutils.c:824
+#: utils/mb/mbutils.c:851
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "Zeichenkette mit %d Bytes ist zu lang für Kodierungsumwandlung."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:577
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "ungültiger Quellkodierungsname »%s«"
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:582
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "ungültiger Zielkodierungsname »%s«"
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:722
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "ungültiger Byte-Wert für Kodierung »%s«: 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:886
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "ungültiger Unicode-Codepunkt"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1327
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codeset fehlgeschlagen"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1851
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "ungültige Byte-Sequenz für Kodierung »%s«: %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1898
 #, 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«"
@@ -28675,82 +29854,82 @@ msgstr "leerer Konfigurationsverzeichnisname: »%s«"
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "konnte Konfigurationsverzeichnis »%s« nicht öffnen: %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Gültige Einheiten für diesen Parameter sind »B«, »kB«, »MB«, »GB« und »TB«."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr "Gültige Einheiten für diesen Parameter sind »us«, »ms«, »s«, »min«, »h« und »d«."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "unbekannter Konfigurationsparameter »%s« in Datei »%s« Zeile %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3495 utils/misc/guc.c:3739
-#: utils/misc/guc.c:3837 utils/misc/guc.c:3935 utils/misc/guc.c:4059
-#: utils/misc/guc.c:4162
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "Parameter »%s« kann nicht geändert werden, ohne den Server neu zu starten"
 
-#: utils/misc/guc.c:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr "Parameter »%s« wurde aus Konfigurationsdatei entfernt, wird auf Standardwert zurückgesetzt"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "Parameter »%s« auf »%s« gesetzt"
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "Konfigurationsdatei »%s« enthält Fehler"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid "configuration file \"%s\" contains errors; unaffected changes were applied"
 msgstr "Konfigurationsdatei »%s« enthält Fehler; nicht betroffene Änderungen wurden durchgeführt"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "Konfigurationsdatei »%s« enthält Fehler; keine Änderungen wurden durchgeführt"
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "ungültiger Konfigurationsparametername »%s«"
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid "Custom parameter names must be two or more simple identifiers separated by dots."
 msgstr "Selbstdefinierte Parameternamen müssen zwei oder mehr einfache Bezeichner getrennt durch Punkte sein."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "»%s« ist ein reservierter Präfix."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "unbekannter Konfigurationsparameter »%s«"
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
 msgstr "Führen Sie initdb oder pg_basebackup aus, um ein PostgreSQL-Datenverzeichnis zu initialisieren.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -28760,12 +29939,12 @@ msgstr ""
 "Sie müssen die Kommandozeilenoption --config-file oder -D angegeben oder\n"
 "die Umgebungsvariable PGDATA setzen.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s: konnte nicht auf die Serverkonfigurationsdatei »%s« zugreifen: %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -28775,7 +29954,7 @@ msgstr ""
 "zu finden sind.  Sie können dies mit »data_directory« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -28785,7 +29964,7 @@ msgstr ""
 "Sie können dies mit »hba_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -28795,126 +29974,131 @@ msgstr ""
 "Sie können dies mit »ident_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "Wert überschreitet Bereich für ganze Zahlen."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
 msgstr "%d%s%s ist außerhalb des gültigen Bereichs für Parameter »%s« (%d%s%s ... %d%s%s)"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
 msgstr "%g%s%s ist außerhalb des gültigen Bereichs für Parameter »%s« (%g%s%s ... %g%s%s)"
 
-#: utils/misc/guc.c:3447 utils/misc/guc_funcs.c:54
+#: utils/misc/guc.c:3462
 #, c-format
-msgid "cannot set parameters during a parallel operation"
-msgstr "während einer parallelen Operation können keine Parameter gesetzt werden"
+msgid "parameter \"%s\" cannot be set during a parallel operation"
+msgstr "Parameter »%s« kann nicht während einer parallelen Operation gesetzt werden"
 
-#: utils/misc/guc.c:3472 utils/misc/guc.c:4646
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "Parameter »%s« kann nicht geändert werden"
 
-#: utils/misc/guc.c:3505
+#: utils/misc/guc.c:3511
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "Parameter »%s« kann jetzt nicht geändert werden"
 
-#: utils/misc/guc.c:3532 utils/misc/guc.c:3594 utils/misc/guc.c:4621
-#: utils/misc/guc.c:6712
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "keine Berechtigung, um Parameter »%s« zu setzen"
 
-#: utils/misc/guc.c:3574
+#: utils/misc/guc.c:3580
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "Parameter »%s« kann nach Start der Verbindung nicht geändert werden"
 
-#: utils/misc/guc.c:3633
+#: utils/misc/guc.c:3639
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "Parameter »%s« kann nicht in einer Security-Definer-Funktion gesetzt werden"
 
-#: utils/misc/guc.c:3654
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "Parameter »%s« kann nicht zurückgesetzt werden"
 
-#: utils/misc/guc.c:3661
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "Parameter »%s« kann nicht lokal in Funktionen gesetzt werden"
 
-#: utils/misc/guc.c:4320 utils/misc/guc.c:4368 utils/misc/guc.c:5400
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "keine Berechtigung, um »%s« zu inspizieren"
 
-#: utils/misc/guc.c:4321 utils/misc/guc.c:4369 utils/misc/guc.c:5401
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "Nur Rollen mit den Privilegien der Rolle »%s« können diesen Parameter inspizieren."
 
-#: utils/misc/guc.c:4579
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "ALTER SYSTEM ist in dieser Umgebung nicht erlaubt"
 
-#: utils/misc/guc.c:4611
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "keine Berechtigung um ALTER SYSTEM RESET ALL auszuführen"
 
-#: utils/misc/guc.c:4690
+#: utils/misc/guc.c:4742
 #, 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:4735
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "konnte Inhalt der Datei »%s« nicht parsen"
 
-#: utils/misc/guc.c:4917
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "Versuch, den Parameter »%s« zu redefinieren"
 
-#: utils/misc/guc.c:5256
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "ungültiger Konfigurationsparametername »%s«, wird entfernt"
 
-#: utils/misc/guc.c:5258
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "»%s« ist jetzt ein reservierter Präfix."
 
-#: utils/misc/guc.c:6135
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "beim Setzen von Parameter »%s« auf »%s«"
 
-#: utils/misc/guc.c:6304
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "Parameter »%s« kann nicht gesetzt werden"
 
-#: utils/misc/guc.c:6394
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "konnte Wert von Parameter »%s« nicht lesen"
 
-#: utils/misc/guc.c:6844
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "ungültiger Wert für Parameter »%s«: %g"
 
+#: utils/misc/guc_funcs.c:54
+#, 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_funcs.c:130
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
@@ -28930,2070 +30114,2275 @@ msgstr "SET %s darf nur ein Argument haben"
 msgid "SET requires parameter name"
 msgstr "SET benötigt Parameternamen"
 
-#: utils/misc/guc_tables.c:675
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "Ungruppiert"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "Dateipfade"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Verbindungen und Authentifizierung / Verbindungseinstellungen"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "Verbindungen und Authentifizierung / TCP-Einstellungen"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "Verbindungen und Authentifizierung / Authentifizierung"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "Verbindungen und Authentifizierung / SSL"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "Resourcenbenutzung / Speicher"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "Resourcenbenutzung / Festplatte"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
 msgstr "Resourcenbenutzung / Kernelresourcen"
 
-#: utils/misc/guc_tables.c:684
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Resourcenbenutzung / Kostenbasierte Vacuum-Verzögerung"
-
-#: utils/misc/guc_tables.c:685
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "Resourcenbenutzung / Background-Writer"
 
-#: utils/misc/guc_tables.c:686
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Resourcenbenutzung / Asynchrones Verhalten"
+#: utils/misc/guc_tables.c:711
+msgid "Resource Usage / I/O"
+msgstr "Resourcenbenutzung / I/O"
+
+#: utils/misc/guc_tables.c:712
+msgid "Resource Usage / Worker Processes"
+msgstr "Resourcenbenutzung / Arbeitsprozesse"
 
-#: utils/misc/guc_tables.c:687
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead-Log / Einstellungen"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead-Log / Checkpoints"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead-Log / Archivierung"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "Write-Ahead-Log / Wiederherstellung"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Write-Ahead-Log / Archivwiederherstellung"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Write-Ahead-Log / Wiederherstellungsziele"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "Write-Ahead-Log / Zusammenfassung (Summarization)"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "Replikation / sendende Server"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "Replikation / Primärserver"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "Replikation / Standby-Server"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "Replikation / Subskriptionsserver"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Anfragetuning / Planermethoden"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Anfragetuning / Planerkosten"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Anfragetuning / Genetischer Anfrageoptimierer"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "Anfragetuning / Andere Planeroptionen"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "Berichte und Logging / Wohin geloggt wird"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "Berichte und Logging / Wann geloggt wird"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "Berichte und Logging / Was geloggt wird"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "Berichte und Logging / Prozesstitel"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "Statistiken / Überwachung"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "Statistiken / Kumulierte Anfrage- und Indexstatistiken"
 
-#: utils/misc/guc_tables.c:708
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/misc/guc_tables.c:734
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr "Vacuum / Automatisches Vacuum"
 
-#: utils/misc/guc_tables.c:709
+#: utils/misc/guc_tables.c:735
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "Vacuum / Kostenbasierte Vacuum-Verzögerung"
+
+#: utils/misc/guc_tables.c:736
+msgid "Vacuuming / Default Behavior"
+msgstr "Vacuum / Voreinstellungen"
+
+#: utils/misc/guc_tables.c:737
+msgid "Vacuuming / Freezing"
+msgstr "Vacuum / Einfrieren"
+
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Standardeinstellungen für Clientverbindungen / Anweisungsverhalten"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Standardeinstellungen für Clientverbindungen / Locale und Formatierung"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Standardeinstellungen für Clientverbindungen / Shared Library Preloading"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Standardeinstellungen für Clientverbindungen / Andere"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "Sperrenverwaltung"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Versions- und Plattformkompatibilität / Frühere PostgreSQL-Versionen"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Versions- und Plattformkompatibilität / Andere Plattformen und Clients"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "Fehlerbehandlung"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "Voreingestellte Optionen"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "Angepasste Optionen"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "Entwickleroptionen"
 
-#: utils/misc/guc_tables.c:774
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Ermöglicht sequenzielle Scans in Planer."
 
-#: utils/misc/guc_tables.c:784
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Ermöglicht Index-Scans im Planer."
 
-#: utils/misc/guc_tables.c:794
+#: utils/misc/guc_tables.c:823
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Ermöglicht Index-Only-Scans im Planer."
 
-#: utils/misc/guc_tables.c:804
+#: utils/misc/guc_tables.c:833
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "Ermöglicht Bitmap-Scans im Planer."
 
-#: utils/misc/guc_tables.c:814
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Ermöglicht TID-Scans im Planer."
 
-#: utils/misc/guc_tables.c:824
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Ermöglicht Sortierschritte im Planer."
 
-#: utils/misc/guc_tables.c:834
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "Ermöglicht inkrementelle Sortierschritte im Planer."
 
-#: utils/misc/guc_tables.c:844
+#: utils/misc/guc_tables.c:873
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Ermöglicht Hash-Aggregierung im Planer."
 
-#: utils/misc/guc_tables.c:854
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "Ermöglicht Materialisierung im Planer."
 
-#: utils/misc/guc_tables.c:864
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "Ermöglicht Memoization im Planer."
 
-#: utils/misc/guc_tables.c:874
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Ermöglicht Nested-Loop-Verbunde im Planer."
 
-#: utils/misc/guc_tables.c:884
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "Ermöglicht Merge-Verbunde im Planer."
 
-#: utils/misc/guc_tables.c:894
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "Ermöglicht Hash-Verbunde im Planer."
 
-#: utils/misc/guc_tables.c:904
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "Ermöglicht Gather-Merge-Pläne im Planer."
 
-#: utils/misc/guc_tables.c:914
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "Ermöglicht partitionsweise Verbunde."
 
-#: utils/misc/guc_tables.c:924
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "Ermöglicht partitionsweise Aggregierung und Gruppierung."
 
-#: utils/misc/guc_tables.c:934
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "Ermöglicht parallele Append-Pläne im Planer."
 
-#: utils/misc/guc_tables.c:944
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "Ermöglicht parallele Hash-Pläne im Planer."
 
-#: utils/misc/guc_tables.c:954
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "Ermöglicht Partition-Pruning zur Planzeit und zur Ausführungszeit."
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:984
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr "Erlaubt es dem Planer und dem Executor, Partitionsbegrenzungen mit Bedingungen in der Anfrage zu vergleichen, um festzustellen, welche Partitionen gelesen werden müssen."
 
-#: utils/misc/guc_tables.c:966
+#: utils/misc/guc_tables.c:995
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr "Schaltet die Fähigkeit des Planers ein, Pläne zu erzeugen, die vorsortierte Eingaben für ORDER-BY-/DISTINCT-Aggregatfunktionen bereitstellen."
 
-#: utils/misc/guc_tables.c:969
+#: utils/misc/guc_tables.c:998
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr "Erlaubt es dem Planer, Pläne zu bauen, die vorsortierte Eingaben für Aggregatfunktionen mit ORDER-BY-/DISTINCT-Klausel bereitstellen. Wenn ausgeschaltet, werden immer implizite Sortierschritte bei der Ausführung durchgeführt."
 
-#: utils/misc/guc_tables.c:981
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr "Ermöglicht asynchrone Append-Pläne im Planer."
 
-#: utils/misc/guc_tables.c:991
+#: utils/misc/guc_tables.c:1020
+msgid "Enables removal of unique self-joins."
+msgstr "Ermöglicht das Entfernen von Unique Self-Joins."
+
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
-msgstr ""
+msgstr "Ermöglicht Umordnen von GROUP-BY-Schlüsseln."
 
-#: utils/misc/guc_tables.c:1001
+#: utils/misc/guc_tables.c:1040
+msgid "Enables reordering of DISTINCT keys."
+msgstr "Ermöglicht Umordnen von DISTINCT-Schlüsseln."
+
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "Ermöglicht genetische Anfrageoptimierung."
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1051
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "Dieser Algorithmus versucht das Planen ohne erschöpfende Suche durchzuführen."
 
-#: utils/misc/guc_tables.c:1016
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "Zeigt, ob der aktuelle Benutzer ein Superuser ist."
 
-#: utils/misc/guc_tables.c:1031
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
-msgstr ""
+msgstr "Erlaubt das Ausführen des Befehls ALTER SYSTEM."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1081
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
-msgstr ""
+msgstr "Kann auf aus gesetzt werden in Umgebungen, wo globale Konfigurationsänderungen mit einer anderen Methode gemacht werden sollten."
 
-#: utils/misc/guc_tables.c:1042
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "Ermöglicht die Bekanntgabe des Servers mit Bonjour."
 
-#: utils/misc/guc_tables.c:1051
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "Sammelt Commit-Timestamps von Transaktionen."
 
-#: utils/misc/guc_tables.c:1060
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "Ermöglicht SSL-Verbindungen."
 
-#: utils/misc/guc_tables.c:1069
+#: utils/misc/guc_tables.c:1118
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr "Kontrolliert, ob »ssl_passphrase_command« beim Neuladen des Servers aufgerufen wird."
 
-#: utils/misc/guc_tables.c:1078
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
 msgstr "Der Ciphersuite-Reihenfolge des Servers Vorrang geben."
 
-#: utils/misc/guc_tables.c:1087
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "Erzwingt die Synchronisierung von Aktualisierungen auf Festplatte."
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1137
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures that a database cluster will recover to a consistent state after an operating system or hardware crash."
 msgstr "Der Server verwendet den Systemaufruf fsync() an mehreren Stellen, um sicherzustellen, dass Datenänderungen physikalisch auf die Festplatte geschrieben werden. Das stellt sicher, dass der Datenbankcluster nach einem Betriebssystemabsturz oder Hardwarefehler in einem korrekten Zustand wiederhergestellt werden kann."
 
-#: utils/misc/guc_tables.c:1099
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "Setzt die Verarbeitung trotz Prüfsummenfehler fort."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1149
 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."
 
-#: utils/misc/guc_tables.c:1114
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "Setzt die Verarbeitung trotz kaputter Seitenköpfe fort."
 
-#: utils/misc/guc_tables.c:1115
+#: utils/misc/guc_tables.c:1164
 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."
 
-#: utils/misc/guc_tables.c:1128
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr "Setzt die Wiederherstellung trotz Fehler durch ungültige Seiten fort."
 
-#: utils/misc/guc_tables.c:1129
+#: utils/misc/guc_tables.c:1178
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
 msgstr "Wenn WAL-Einträge mit Verweisen auf ungültige Seiten bei der Wiederherstellung erkannt werden, verursacht das einen PANIC-Fehler, wodurch die Wiederherstellung abgebrochen wird. Wenn »ignore_invalid_pages« an ist, dann werden ungültige Seitenverweise in WAL-Einträgen ignoriert (aber trotzen eine Warnung ausgegeben) und die Wiederherstellung wird fortgesetzt. Dieses Verhalten kann Abstürze und Datenverlust verursachen, Datenverfälschung verbreiten oder verstecken sowie andere ernsthafte Probleme verursachen. Es hat nur Auswirkungen im Wiederherstellungs- oder Standby-Modus."
 
-#: utils/misc/guc_tables.c:1147
+#: utils/misc/guc_tables.c:1196
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "Schreibt volle Seiten in den WAL, sobald sie nach einem Checkpoint geändert werden."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1197
 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 "Ein Seitenschreibvorgang während eines Betriebssystemabsturzes könnte eventuell nur teilweise geschrieben worden sein. Bei der Wiederherstellung sind die im WAL gespeicherten Zeilenänderungen nicht ausreichend. Diese Option schreibt Seiten, sobald sie nach einem Checkpoint geändert worden sind, damit eine volle Wiederherstellung möglich ist."
 
-#: utils/misc/guc_tables.c:1161
+#: utils/misc/guc_tables.c:1210
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
 msgstr "Schreibt volle Seiten in den WAL, sobald sie nach einem Checkpoint geändert werden, auch für eine nicht kritische Änderung."
 
-#: utils/misc/guc_tables.c:1171
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "Schreibt Nullen in neue WAL-Dateien vor der ersten Verwendung."
 
-#: utils/misc/guc_tables.c:1181
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "WAL-Dateien werden durch Umbenennen wiederverwendet."
 
-#: utils/misc/guc_tables.c:1191
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "Schreibt jeden Checkpoint in den Log."
 
-#: utils/misc/guc_tables.c:1200
-msgid "Logs each successful connection."
-msgstr "Schreibt jede erfolgreiche Verbindung in den Log."
-
-#: utils/misc/guc_tables.c:1209
-#, fuzzy
-#| msgid "Connections and Authentication / Connection Settings"
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
-msgstr "Verbindungen und Authentifizierung / Verbindungseinstellungen"
+msgstr "Schreibt Details über den Verbindungs-Handshake vor der Authentifizierung in den Log."
 
-#: utils/misc/guc_tables.c:1219
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "Schreibt jedes Verbindungsende mit Sitzungszeit in den Log."
 
-#: utils/misc/guc_tables.c:1228
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "Schreibt jeden Replikationsbefehl in den Log."
 
-#: utils/misc/guc_tables.c:1237
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Zeigt, ob der laufende Server Assertion-Prüfungen aktiviert hat."
 
-#: utils/misc/guc_tables.c:1248
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "Sitzung bei jedem Fehler abbrechen."
 
-#: utils/misc/guc_tables.c:1257
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "Server nach Absturz eines Serverprozesses reinitialisieren."
 
-#: utils/misc/guc_tables.c:1266
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "Temporäre Dateien nach Absturz eines Serverprozesses löschen."
 
-#: utils/misc/guc_tables.c:1276
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "SIGABRT statt SIGQUIT an Kindprozesse noch Absturz eines Serverprozesses senden."
 
-#: utils/misc/guc_tables.c:1286
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "SIGABRT statt SIGKILL an feststeckende Kindprozesse senden."
 
-#: utils/misc/guc_tables.c:1297
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Loggt die Dauer jeder abgeschlossenen SQL-Anweisung."
 
-#: utils/misc/guc_tables.c:1306
+#: utils/misc/guc_tables.c:1347
+msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr "Wenn dies gesetzt ist, werden alle Parse- und Plan-Bäume durch copyObject() geschickt, um Fehler und Versäumnisse in copyObject() finden zu können."
+
+#: utils/misc/guc_tables.c:1364
+msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr "Wenn dies gesetzt ist, werden alle Parse- und Plan-Bäume durch outfuncs.c/readfuncs.c geschickt, um Fehler und Versäumnisse in diesen Modulen finden zu können."
+
+#: utils/misc/guc_tables.c:1381
+msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
+msgstr "Wenn dies gesetzt ist, werden alle Raw-Parse-Bäume für DML-Anweisungen durch raw_expression_tree_walker() geprüft, um Fehler und Versäumnisse in dieser Funktion finden zu können."
+
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "Scheibt den Parsebaum jeder Anfrage in den Log."
 
-#: utils/misc/guc_tables.c:1315
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "Schreibt den umgeschriebenen Parsebaum jeder Anfrage in den Log."
 
-#: utils/misc/guc_tables.c:1324
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "Schreibt den Ausführungsplan jeder Anfrage in den Log."
 
-#: utils/misc/guc_tables.c:1333
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr "Rückt die Anzeige von Parse- und Planbäumen ein."
 
-#: utils/misc/guc_tables.c:1342
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "Schreibt Parser-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc_tables.c:1351
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "Schreibt Planer-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc_tables.c:1360
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "Schreibt Executor-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc_tables.c:1369
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Schreibt Gesamtleistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc_tables.c:1379
+#: utils/misc/guc_tables.c:1472
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "Loggt Statistiken über Systemressourcen (Speicher und CPU) während diverser B-Baum-Operationen."
 
-#: utils/misc/guc_tables.c:1391
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "Sammelt Informationen über ausgeführte Befehle."
 
-#: utils/misc/guc_tables.c:1392
+#: utils/misc/guc_tables.c:1485
 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 "Schaltet die Sammlung von Informationen über den aktuell ausgeführten Befehl jeder Sitzung ein, einschließlich der Zeit, and dem die Befehlsausführung begann."
 
-#: utils/misc/guc_tables.c:1402
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "Sammelt Statistiken über Datenbankaktivität."
 
-#: utils/misc/guc_tables.c:1411
+#: utils/misc/guc_tables.c:1504
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "Sammelt Zeitmessungsstatistiken über kostenbasierte Vacuum-Verzögerung."
+
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Sammelt Zeitmessungsstatistiken über Datenbank-I/O-Aktivität."
 
-#: utils/misc/guc_tables.c:1420
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "Sammelt Zeitmessungsstatistiken über WAL-I/O-Aktivität."
 
-#: utils/misc/guc_tables.c:1430
+#: utils/misc/guc_tables.c:1532
 msgid "Updates the process title to show the active SQL command."
 msgstr "Der Prozesstitel wird aktualisiert, um den aktuellen SQL-Befehl anzuzeigen."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1533
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr "Ermöglicht das Aktualisieren des Prozesstitels bei jedem von Server empfangenen neuen SQL-Befehl."
 
-#: utils/misc/guc_tables.c:1440
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "Startet den Autovacuum-Prozess."
 
-#: utils/misc/guc_tables.c:1450
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Erzeugt Debug-Ausgabe für LISTEN und NOTIFY."
 
-#: utils/misc/guc_tables.c:1462
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "Gibt Informationen über Sperrenverwendung aus."
 
-#: utils/misc/guc_tables.c:1472
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "Gibt Informationen über Benutzersperrenverwendung aus."
 
-#: utils/misc/guc_tables.c:1482
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "Gibt Informationen über die Verwendung von Lightweight Locks aus."
 
-#: utils/misc/guc_tables.c:1492
+#: utils/misc/guc_tables.c:1594
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "Gibt Informationen über alle aktuellen Sperren aus, wenn eine Verklemmung auftritt."
 
-#: utils/misc/guc_tables.c:1504
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "Schreibt Meldungen über langes Warten auf Sperren in den Log."
 
-#: utils/misc/guc_tables.c:1513
+#: utils/misc/guc_tables.c:1615
+msgid "Logs lock failures."
+msgstr "Schreibt Meldungen über fehlgeschlagenes Sperren in den Log."
+
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr "Schreibt Meldungen über Warten wegen Konflikten bei Wiederherstellung in den Log."
 
-#: utils/misc/guc_tables.c:1522
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "Schreibt den Hostnamen jeder Verbindung in den Log."
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1634
 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 "In der Standardeinstellung zeigen die Verbindungslogs nur die IP-Adresse der Clienthosts. Wenn Sie den Hostnamen auch anzeigen wollen, dann können Sie diese Option anschalten, aber je nachdem, wie Ihr DNS eingerichtet ist, kann das die Leistung nicht unerheblich beeinträchtigen."
 
-#: utils/misc/guc_tables.c:1534
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Behandelt »ausdruck=NULL« als »ausdruck IS NULL«."
 
-#: utils/misc/guc_tables.c:1535
+#: utils/misc/guc_tables.c:1646
 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 "Wenn an, dann werden Ausdrücke der Form ausdruck = NULL (oder NULL = ausdruck) wie ausdruck IS NULL behandelt, das heißt, sie ergeben wahr, wenn das Ergebnis von ausdruck der NULL-Wert ist, und ansonsten falsch. Das korrekte Verhalten von ausdruck = NULL ist immer den NULL-Wert (für unbekannt) zurückzugeben."
 
-#: utils/misc/guc_tables.c:1547
+#: utils/misc/guc_tables.c:1658
 msgid "Sets the default read-only status of new transactions."
 msgstr "Setzt den Standardwert für die Read-Only-Einstellung einer neuen Transaktion."
 
-#: utils/misc/guc_tables.c:1557
+#: utils/misc/guc_tables.c:1668
 msgid "Sets the current transaction's read-only status."
 msgstr "Setzt die Read-Only-Einstellung der aktuellen Transaktion."
 
-#: utils/misc/guc_tables.c:1567
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Setzt den Standardwert für die Deferrable-Einstellung einer neuen Transaktion."
 
-#: utils/misc/guc_tables.c:1576
+#: utils/misc/guc_tables.c:1687
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "Ob eine serialisierbare Read-Only-Transaktion aufgeschoben werden soll, bis sie ohne mögliche Serialisierungsfehler ausgeführt werden kann."
 
-#: utils/misc/guc_tables.c:1586
-msgid "Enable row security."
+#: utils/misc/guc_tables.c:1697
+msgid "Enables row security."
 msgstr "Schaltet Sicherheit auf Zeilenebene ein."
 
-#: utils/misc/guc_tables.c:1587
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr "Wenn eingeschaltet, wird Sicherheit auf Zeilenebene auf alle Benutzer angewendet."
 
-#: utils/misc/guc_tables.c:1595
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "Prüft Funktionskörper bei der Ausführung von CREATE FUNCTION und CREATE PROCEDURE."
 
-#: utils/misc/guc_tables.c:1604
-msgid "Enable input of NULL elements in arrays."
+#: utils/misc/guc_tables.c:1715
+msgid "Enables input of NULL elements in arrays."
 msgstr "Ermöglicht die Eingabe von NULL-Elementen in Arrays."
 
-#: utils/misc/guc_tables.c:1605
+#: utils/misc/guc_tables.c:1716
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr "Wenn dies eingeschaltet ist, wird ein nicht gequotetes NULL in einem Array-Eingabewert als NULL-Wert interpretiert, ansonsten als Zeichenkette."
 
-#: utils/misc/guc_tables.c:1621
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS wird nicht mehr unterstützt; kann nur auf falsch gesetzt werden."
 
-#: utils/misc/guc_tables.c:1631
-msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
-msgstr "Startet einen Subprozess, um die Stderr-Ausgabe und/oder CSV-Logs in Logdateien auszugeben."
+#: utils/misc/guc_tables.c:1742
+msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
+msgstr "Startet einen Subprozess, um stderr, csvlog und/oder jsonlog in Logdateien auszugeben."
 
-#: utils/misc/guc_tables.c:1640
+#: utils/misc/guc_tables.c:1751
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "Kürzt existierende Logdateien mit dem selben Namen beim Rotieren."
 
-#: utils/misc/guc_tables.c:1651
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "Gibt Informationen über die Ressourcenverwendung beim Sortieren aus."
 
-#: utils/misc/guc_tables.c:1665
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Erzeugt Debug-Ausgabe für synchronisiertes Scannen."
 
-#: utils/misc/guc_tables.c:1680
-msgid "Enable bounded sorting using heap sort."
+#: utils/misc/guc_tables.c:1789
+msgid "Enables bounded sorting using heap sort."
 msgstr "Ermöglicht Bounded Sorting mittels Heap-Sort."
 
-#: utils/misc/guc_tables.c:1693
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "Gibt diverse Debug-Meldungen über WAL aus."
 
-#: utils/misc/guc_tables.c:1705
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "Zeigt ob Datum/Zeit intern ganze Zahlen verwendet."
 
-#: utils/misc/guc_tables.c:1716
+#: utils/misc/guc_tables.c:1825
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "Bestimmt, ob Groß-/Kleinschreibung bei Kerberos- und GSSAPI-Benutzernamen ignoriert werden soll."
 
-#: utils/misc/guc_tables.c:1726
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "Bestimmt, ob GSSAPI-Delegation vom Client akzeptiert werden soll."
 
-#: utils/misc/guc_tables.c:1736
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Warnt bei Backslash-Escapes in normalen Zeichenkettenkonstanten."
 
-#: utils/misc/guc_tables.c:1746
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Bewirkt, dass Zeichenketten der Art '...' Backslashes als normales Zeichen behandeln."
 
-#: utils/misc/guc_tables.c:1757
-msgid "Enable synchronized sequential scans."
+#: utils/misc/guc_tables.c:1866
+msgid "Enables synchronized sequential scans."
 msgstr "Ermöglicht synchronisierte sequenzielle Scans."
 
-#: utils/misc/guc_tables.c:1767
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "Setzt ob die Transaktion mit dem Wiederherstellungsziel einbezogen oder ausgeschlossen wird."
 
-#: utils/misc/guc_tables.c:1777
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "Startet den WAL-Summarizer-Prozess, um inkrementelle Backups zu ermöglichen."
 
-#: utils/misc/guc_tables.c:1787
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr "Erlaubt Verbindungen und Anfragen während der Wiederherstellung."
 
-#: utils/misc/guc_tables.c:1797
+#: utils/misc/guc_tables.c:1906
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "Erlaubt Rückmeldungen von einem Hot Standby an den Primärserver, um Anfragekonflikte zu vermeiden."
 
-#: utils/misc/guc_tables.c:1807
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "Zeigt, ob Hot Standby aktuell aktiv ist."
 
-#: utils/misc/guc_tables.c:1818
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "Erlaubt Änderungen an der Struktur von Systemtabellen."
 
-#: utils/misc/guc_tables.c:1829
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "Schaltet das Lesen aus Systemindexen ab."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1939
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "Das Aktualisieren der Indexe wird nicht verhindert, also ist die Verwendung unbedenklich. Schlimmstenfalls wird alles langsamer."
 
-#: utils/misc/guc_tables.c:1841
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "Erlaubt Tablespaces direkt in pg_tblspc, zum Testen."
 
-#: utils/misc/guc_tables.c:1852
+#: utils/misc/guc_tables.c:1961
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "Schaltet den rückwärtskompatiblen Modus für Privilegienprüfungen bei Large Objects ein."
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1962
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "Überspringt Privilegienprüfungen beim Lesen oder Ändern von Large Objects, zur Kompatibilität mit PostgreSQL-Versionen vor 9.0."
 
-#: utils/misc/guc_tables.c:1863
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "Wenn SQL-Fragmente erzeugt werden, alle Bezeichner quoten."
 
-#: utils/misc/guc_tables.c:1873
+#: utils/misc/guc_tables.c:1982
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Zeigt, ob Datenprüfsummen in diesem Cluster angeschaltet sind."
 
-#: utils/misc/guc_tables.c:1884
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "Syslog-Nachrichten mit Sequenznummern versehen, um Unterdrückung doppelter Nachrichten zu unterbinden."
 
-#: utils/misc/guc_tables.c:1894
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "An Syslog gesendete Nachrichten nach Zeilen und in maximal 1024 Bytes aufteilen."
 
-#: utils/misc/guc_tables.c:1904
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Kontrolliert, ob Gather und Gather Merge auch Subpläne ausführen."
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "Sollen Gather-Knoten auch Subpläne ausführen oder nur Tupel sammeln?"
 
-#: utils/misc/guc_tables.c:1915
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "Erlaubt JIT-Kompilierung."
 
-#: utils/misc/guc_tables.c:1926
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "JIT-kompilierte Funktionen im Debugger registrieren."
 
-#: utils/misc/guc_tables.c:1943
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "LLVM-Bitcode in Dateien schreiben, um Debuggen von JIT zu erleichtern."
 
-#: utils/misc/guc_tables.c:1954
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "Erlaubt JIT-Kompilierung von Ausdrücken."
 
-#: utils/misc/guc_tables.c:1965
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "JIT-kompilierte Funktionen im Profiler perf registrieren."
 
-#: utils/misc/guc_tables.c:1982
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "Erlaubt JIT-Kompilierung von Tuple-Deforming."
 
-#: utils/misc/guc_tables.c:1993
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "Ob nach fehlgeschlagenem Synchronisieren von Datendateien fortgesetzt werden soll."
 
-#: utils/misc/guc_tables.c:2002
+#: utils/misc/guc_tables.c:2111
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr "Bestimmt, ob der WAL-Receiver einen temporären Replikations-Slot erzeugen soll, wenn kein permanenter Slot konfiguriert ist."
 
-#: utils/misc/guc_tables.c:2011
-#, fuzzy
-#| msgid "event trigger %s"
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
-msgstr "Ereignistrigger %s"
+msgstr "Schaltet Ereignistrigger ein."
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
-msgstr ""
+msgstr "Wenn eingeschaltet, werden Ereignistrigger für alle passenden Anweisungen ausgelöst."
 
-#: utils/misc/guc_tables.c:2021
-msgid "Enables a physical standby to synchronize logical failover slots from the primary server."
-msgstr ""
+#: utils/misc/guc_tables.c:2130
+msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
+msgstr "Ermöglicht, dass ein physischer Standby logische Failover-Replikations-Slots vom Primärserver synchronisiert."
+
+#: utils/misc/guc_tables.c:2139
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr "Ermöglicht Warnungen über veraltete Verwendung von MD5-Passwörtern."
+
+#: utils/misc/guc_tables.c:2148
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "Ermöglicht es Vacuum, leere Seiten am Ende der Tabelle abzuschneiden."
 
-#: utils/misc/guc_tables.c:2039
+#: utils/misc/guc_tables.c:2166
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "Setzt die Zeit, die gewartet wird, bevor ein Umschalten auf die nächste WAL-Datei erzwungen wird."
 
-#: utils/misc/guc_tables.c:2050
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322
+#: utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752
+#: utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774
+#: utils/misc/guc_tables.c:2785
+msgid "0 disables the timeout."
+msgstr "0 schaltet Zeitüberschreitungen aus."
+
+#: utils/misc/guc_tables.c:2177
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr "Setzt die Zeit, die nach der Authentifizierung beim Verbindungsstart gewartet wird."
 
-#: utils/misc/guc_tables.c:2052 utils/misc/guc_tables.c:2774
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "Das ermöglicht es, einen Debugger in den Prozess einzuhängen."
 
-#: utils/misc/guc_tables.c:2061
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "Setzt das voreingestellte Statistikziel."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2189
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr "Diese Einstellung gilt für Tabellenspalten, für die kein spaltenspezifisches Ziel mit ALTER TABLE SET STATISTICS gesetzt worden ist."
 
-#: utils/misc/guc_tables.c:2071
+#: utils/misc/guc_tables.c:2198
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr "Setzt die Größe der FROM-Liste, ab der Unteranfragen nicht kollabiert werden."
 
-#: utils/misc/guc_tables.c:2073
+#: utils/misc/guc_tables.c:2200
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr "Der Planer bindet Unteranfragen in die übergeordneten Anfragen ein, wenn die daraus resultierende FROM-Liste nicht mehr als so viele Elemente haben würde."
 
-#: utils/misc/guc_tables.c:2084
+#: utils/misc/guc_tables.c:2211
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr "Setzt die Größe der FROM-Liste, ab der JOIN-Konstrukte nicht aufgelöst werden."
 
-#: utils/misc/guc_tables.c:2086
+#: utils/misc/guc_tables.c:2213
 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 "Der Planer löst ausdrückliche JOIN-Konstrukte in FROM-Listen auf, wenn die daraus resultierende FROM-Liste nicht mehr als so viele Elemente haben würde."
 
-#: utils/misc/guc_tables.c:2097
+#: utils/misc/guc_tables.c:2224
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr "Setzt die Anzahl der Elemente in der FROM-Liste, ab der GEQO verwendet wird."
 
-#: utils/misc/guc_tables.c:2107
+#: utils/misc/guc_tables.c:2234
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: wird für die Berechnung der Vorgabewerte anderer GEQO-Parameter verwendet."
 
-#: utils/misc/guc_tables.c:2117
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: Anzahl der Individien in der Bevölkerung."
 
-#: utils/misc/guc_tables.c:2118 utils/misc/guc_tables.c:2128
-msgid "Zero selects a suitable default value."
-msgstr "Null wählt einen passenden Vorgabewert."
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
+msgid "0 means use a suitable default value."
+msgstr "0 bedeutet, dass ein passender Vorgabewert verwendet wird."
 
-#: utils/misc/guc_tables.c:2127
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: Anzahl der Iterationen im Algorithmus."
 
-#: utils/misc/guc_tables.c:2139
+#: utils/misc/guc_tables.c:2266
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Setzt die Zeit, die gewartet wird, bis auf Verklemmung geprüft wird."
 
-#: utils/misc/guc_tables.c:2150
+#: utils/misc/guc_tables.c:2277
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr "Setzt die maximale Verzögerung bevor Anfragen storniert werden, wenn ein Hot-Standby-Server archivierte WAL-Daten verarbeitet."
 
-#: utils/misc/guc_tables.c:2161
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
+msgid "-1 means wait forever."
+msgstr "-1 bedeutet ewig warten."
+
+#: utils/misc/guc_tables.c:2288
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr "Setzt die maximale Verzögerung bevor Anfragen storniert werden, wenn ein Hot-Standby-Server gestreamte WAL-Daten verarbeitet."
 
-#: utils/misc/guc_tables.c:2172
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "Setzt die minimale Verzögerung für das Einspielen von Änderungen während der Wiederherstellung."
 
-#: utils/misc/guc_tables.c:2183
+#: utils/misc/guc_tables.c:2310
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr "Setzt das maximale Intervall zwischen Statusberichten des WAL-Receivers an den sendenden Server."
 
-#: utils/misc/guc_tables.c:2194
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr "Setzt die maximale Zeit, um auf den Empfang von Daten vom sendenden Server zu warten."
 
-#: utils/misc/guc_tables.c:2205
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Setzt die maximale Anzahl gleichzeitiger Verbindungen."
 
-#: utils/misc/guc_tables.c:2216
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Setzt die Anzahl der für Superuser reservierten Verbindungen."
 
-#: utils/misc/guc_tables.c:2226
+#: utils/misc/guc_tables.c:2353
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr "Setzt die Anzahl der Verbindungen, die für Rollen mit den Privilegien der Rolle pg_use_reserved_connections reserviert sind."
 
-#: utils/misc/guc_tables.c:2237
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "Menge des beim Start reservierten dynamischen Shared Memory."
 
-#: utils/misc/guc_tables.c:2252
+#: utils/misc/guc_tables.c:2379
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Setzt die Anzahl der vom Server verwendeten Shared-Memory-Puffer."
 
-#: utils/misc/guc_tables.c:2263
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "Setzt die Buffer-Pool-Größe für VACUUM, ANALYZE und Autovacuum."
 
-#: utils/misc/guc_tables.c:2274
+#: utils/misc/guc_tables.c:2401
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr "Zeigt die Größe des primären Shared-Memory-Bereichs des Servers (aufgerundet zum nächsten MB)."
 
-#: utils/misc/guc_tables.c:2285
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "Zeigt die Anzahl der Huge Pages, die für den primären Shared-Memory-Bereich benötigt werden."
 
-#: utils/misc/guc_tables.c:2286
-msgid "-1 indicates that the value could not be determined."
-msgstr "-1 zeigt an, dass der Wert nicht ermittelt werden konnte."
+#: utils/misc/guc_tables.c:2413
+msgid "-1 means huge pages are not supported."
+msgstr "-1 bedeutet, dass Huge Page nicht unterstützt werden."
+
+#: utils/misc/guc_tables.c:2423
+msgid "Shows the number of semaphores required for the server."
+msgstr "Zeigt die Anzahl der vom Server benötigten Semaphore."
 
-#: utils/misc/guc_tables.c:2296
+#: utils/misc/guc_tables.c:2434
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
-msgstr ""
+msgstr "Setzt die Größe des für den Commit-Timestamp-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2297 utils/misc/guc_tables.c:2352
-#: utils/misc/guc_tables.c:2363
-msgid "Specify 0 to have this value determined as a fraction of shared_buffers."
-msgstr ""
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490
+#: utils/misc/guc_tables.c:2501
+msgid "0 means use a fraction of \"shared_buffers\"."
+msgstr "0 bedeutet, einen Bruchteil von »shared_buffers« zu verwenden."
 
-#: utils/misc/guc_tables.c:2307
+#: utils/misc/guc_tables.c:2445
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
-msgstr ""
+msgstr "Setzt die Größe des für den MultiXact-Member-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2318
+#: utils/misc/guc_tables.c:2456
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
-msgstr ""
+msgstr "Setzt die Größe des für den MultiXact-Offset-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2329
+#: utils/misc/guc_tables.c:2467
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
-msgstr ""
+msgstr "Setzt die Größe des für den LISTEN/NOTIFY-Message-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2340
+#: utils/misc/guc_tables.c:2478
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
-msgstr ""
+msgstr "Setzt die Größe des für den Cache für serialisierbare Transaktionen bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2351
-#, fuzzy
-#| msgid "Sets the name of the replication slot to use on the sending server."
-msgid "Sets the size of the dedicated buffer pool used for the sub-transaction cache."
-msgstr "Setzt den Namen des zu verwendenden Replikations-Slots auf dem sendenden Server."
+#: utils/misc/guc_tables.c:2489
+msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
+msgstr "Setzt die Größe des für den Subtransaktions-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2362
+#: utils/misc/guc_tables.c:2500
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
-msgstr ""
+msgstr "Setzt die Größe des für den Transaktionsstatus-Cache bestimmten Buffer-Pools."
 
-#: utils/misc/guc_tables.c:2373
+#: utils/misc/guc_tables.c:2511
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "Setzt die maximale Anzahl der von jeder Sitzung verwendeten temporären Puffer."
 
-#: utils/misc/guc_tables.c:2384
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "Setzt den TCP-Port, auf dem der Server auf Verbindungen wartet."
 
-#: utils/misc/guc_tables.c:2394
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Setzt die Zugriffsrechte für die Unix-Domain-Socket."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2533
 msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
 msgstr "Unix-Domain-Sockets verwenden die üblichen Zugriffsrechte für Unix-Dateisysteme. Der Wert dieser Option muss ein numerischer Wert in der von den Systemaufrufen chmod und umask verwendeten Form sein. (Um das gebräuchliche Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) anfangen.)"
 
-#: utils/misc/guc_tables.c:2409
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "Setzt die Dateizugriffsrechte für Logdateien."
 
-#: utils/misc/guc_tables.c:2410
+#: utils/misc/guc_tables.c:2548
 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 "Der Wert dieser Option muss ein numerischer Wert in der von den Systemaufrufen chmod und umask verwendeten Form sein. (Um das gebräuchliche Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) anfangen.)"
 
-#: utils/misc/guc_tables.c:2424
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "Zeigt die Zugriffsrechte des Datenverzeichnisses."
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2563
 msgid "The parameter value is 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 "Der Wert dieser Option muss ein numerischer Wert in der von den Systemaufrufen chmod und umask verwendeten Form sein. (Um das gebräuchliche Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) anfangen.)"
 
-#: utils/misc/guc_tables.c:2438
+#: utils/misc/guc_tables.c:2576
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Setzt die maximale Speichergröße für Anfrage-Arbeitsbereiche."
 
-#: utils/misc/guc_tables.c:2439
+#: utils/misc/guc_tables.c:2577
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr "Gibt die Speichermenge an, die für interne Sortiervorgänge und Hashtabellen verwendet werden kann, bevor auf temporäre Dateien umgeschaltet wird."
 
-#: utils/misc/guc_tables.c:2451
+#: utils/misc/guc_tables.c:2594
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Setzt die maximale Speichergröße für Wartungsoperationen."
 
-#: utils/misc/guc_tables.c:2452
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Das schließt Operationen wie VACUUM und CREATE INDEX ein."
 
-#: utils/misc/guc_tables.c:2462
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "Setzt die maximale Speichergröße für logische Dekodierung."
 
-#: utils/misc/guc_tables.c:2463
+#: utils/misc/guc_tables.c:2606
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr "Gibt die Speichermenge an, die für jeden internen Reorder-Puffer verwendet werden kann, bevor auf Festplatte ausgelagert wird."
 
-#: utils/misc/guc_tables.c:2479
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Setzt die maximale Stackgröße, in Kilobytes."
 
-#: utils/misc/guc_tables.c:2490
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "Beschränkt die Gesamtgröße aller temporären Dateien, die von einem Prozess verwendet werden."
 
-#: utils/misc/guc_tables.c:2491
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1 bedeutet keine Grenze."
 
-#: utils/misc/guc_tables.c:2501
+#: utils/misc/guc_tables.c:2644
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Vacuum-Kosten für eine im Puffer-Cache gefundene Seite."
 
-#: utils/misc/guc_tables.c:2511
+#: utils/misc/guc_tables.c:2654
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Vacuum-Kosten für eine nicht im Puffer-Cache gefundene Seite."
 
-#: utils/misc/guc_tables.c:2521
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Vacuum-Kosten für eine durch Vacuum schmutzig gemachte Seite."
 
-#: utils/misc/guc_tables.c:2531
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr "Verfügbare Vacuum-Kosten vor Nickerchen."
 
-#: utils/misc/guc_tables.c:2541
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Verfügbare Vacuum-Kosten vor Nickerchen, für Autovacuum."
 
-#: utils/misc/guc_tables.c:2551
-msgid "Sets the maximum number of simultaneously open files for each server process."
-msgstr "Setzt die maximale Zahl gleichzeitig geöffneter Dateien für jeden Serverprozess."
+#: utils/misc/guc_tables.c:2685
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1 bedeutet, »vacuum_cost_limit« zu verwenden."
+
+#: utils/misc/guc_tables.c:2694
+msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
+msgstr "Setzt die maximale Zahl Dateien, die jeder Serverprozess gleichzeitig öffnen darf."
 
-#: utils/misc/guc_tables.c:2564
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Setzt die maximale Anzahl von gleichzeitig vorbereiteten Transaktionen."
 
-#: utils/misc/guc_tables.c:2575
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Setzt die minimale Tabellen-OID für das Verfolgen von Sperren."
 
-#: utils/misc/guc_tables.c:2576
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "Wird verwendet, um Ausgabe für Systemtabellen zu vermeiden."
 
-#: utils/misc/guc_tables.c:2585
+#: utils/misc/guc_tables.c:2728
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Setzt die OID der Tabelle mit bedingungsloser Sperrenverfolgung."
 
-#: utils/misc/guc_tables.c:2597
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Setzt die maximal erlaubte Dauer jeder Anweisung."
 
-#: utils/misc/guc_tables.c:2598 utils/misc/guc_tables.c:2609
-#: utils/misc/guc_tables.c:2620 utils/misc/guc_tables.c:2631
-#: utils/misc/guc_tables.c:2642
-msgid "A value of 0 turns off the timeout."
-msgstr "Der Wert 0 schaltet die Zeitprüfung aus."
-
-#: utils/misc/guc_tables.c:2608
+#: utils/misc/guc_tables.c:2751
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Setzt die maximal erlaubte Dauer, um auf eine Sperre zu warten."
 
-#: utils/misc/guc_tables.c:2619
+#: utils/misc/guc_tables.c:2762
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "Setzt die maximal erlaubte inaktive Zeit zwischen Anfragen, wenn in einer Transaktion."
 
-#: utils/misc/guc_tables.c:2630
-#, fuzzy
-#| msgid "Sets the maximum allowed duration of any statement."
+#: utils/misc/guc_tables.c:2773
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
-msgstr "Setzt die maximal erlaubte Dauer jeder Anweisung."
+msgstr "Setzt die maximal erlaubte Dauer jeder Transaktion innerhalb einer Sitzung (keine vorbereitete Transaktion)."
 
-#: utils/misc/guc_tables.c:2641
+#: utils/misc/guc_tables.c:2784
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "Setzt die maximal erlaubte inaktive Zeit zwischen Anfragen, wenn nicht in einer Transaktion."
 
-#: utils/misc/guc_tables.c:2652
+#: utils/misc/guc_tables.c:2795
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "Mindestalter, bei dem VACUUM eine Tabellenzeile einfrieren soll."
 
-#: utils/misc/guc_tables.c:2662
+#: utils/misc/guc_tables.c:2805
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Alter, bei dem VACUUM die ganze Tabelle durchsuchen soll, um Zeilen einzufrieren."
 
-#: utils/misc/guc_tables.c:2672
+#: utils/misc/guc_tables.c:2815
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "Mindestalter, bei dem VACUUM eine MultiXactId in einer Tabellenzeile einfrieren soll."
 
-#: utils/misc/guc_tables.c:2682
+#: utils/misc/guc_tables.c:2825
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Multixact-Alter, bei dem VACUUM die ganze Tabelle durchsuchen soll, um Zeilen einzufrieren."
 
-#: utils/misc/guc_tables.c:2692
+#: utils/misc/guc_tables.c:2835
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Alter, bei dem VACUUM die Ausfallsicherung auslösen soll, um Ausfall wegen Transaktionsnummernüberlauf zu verhindern."
 
-#: utils/misc/guc_tables.c:2701
+#: utils/misc/guc_tables.c:2844
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Multixact-Alter, bei dem VACUUM die Ausfallsicherung auslösen soll, um Ausfall wegen Transaktionsnummernüberlauf zu verhindern."
 
-#: utils/misc/guc_tables.c:2714
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Setzt die maximale Anzahl Sperren pro Transaktion."
 
-#: utils/misc/guc_tables.c:2715
+#: utils/misc/guc_tables.c:2858
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "Die globale Sperrentabelle wird mit der Annahme angelegt, das höchstens »max_locks_per_transaction« Objekte pro Serverprozess oder vorbereitete Transaktion gleichzeitig gesperrt werden müssen."
 
-#: utils/misc/guc_tables.c:2726
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Setzt die maximale Anzahl Prädikatsperren pro Transaktion."
 
-#: utils/misc/guc_tables.c:2727
+#: utils/misc/guc_tables.c:2870
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "Die globale Prädikatsperrentabelle wird mit der Annahme angelegt, das höchstens »max_pred_locks_per_transaction« Objekte pro Serverprozess oder vorbereitete Transaktion gleichzeitig gesperrt werden müssen."
 
-#: utils/misc/guc_tables.c:2738
+#: utils/misc/guc_tables.c:2881
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "Setzt die maximale Anzahl Prädikatsperren für Seiten und Tupel pro Relation."
 
-#: utils/misc/guc_tables.c:2739
+#: utils/misc/guc_tables.c:2882
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr "Wenn mehr als diese Gesamtzahl Seiten und Tupel in der selben Relation von einer Verbindung gesperrt sind, werden diese Sperren durch eine Sperre auf Relationsebene ersetzt."
 
-#: utils/misc/guc_tables.c:2749
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "Setzt die maximale Anzahl Prädikatsperren für Tupel pro Seite."
 
-#: utils/misc/guc_tables.c:2750
+#: utils/misc/guc_tables.c:2893
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr "Wenn mehr als diese Anzahl Tupel auf der selben Seite von einer Verbindung gesperrt sind, werden diese Sperren durch eine Sperre auf Seitenebene ersetzt."
 
-#: utils/misc/guc_tables.c:2760
+#: utils/misc/guc_tables.c:2903
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Setzt die maximale Zeit, um die Client-Authentifizierung zu beenden."
 
-#: utils/misc/guc_tables.c:2772
+#: utils/misc/guc_tables.c:2915
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr "Setzt die Zeit, die vor der Authentifizierung beim Verbindungsstart gewartet wird."
 
-#: utils/misc/guc_tables.c:2784
-#, fuzzy
-#| msgid "Sets the maximum number of predicate-locked tuples per page."
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
-msgstr "Setzt die maximale Anzahl Prädikatsperren für Tupel pro Seite."
+msgstr "Setzt die maximale Anzahl bereitgestellte Seiten für die NOTIFY/LISTEN-Warteschlange."
 
-#: utils/misc/guc_tables.c:2794
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "Puffergröße für WAL-Read-Ahead während der Wiederherstellung."
 
-#: utils/misc/guc_tables.c:2795
+#: utils/misc/guc_tables.c:2938
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr "Maximale Entfernung, die im WAL vorausgelesen wird, um Datenblöcke, auf die verwiesen wird, vorab einzulesen."
 
-#: utils/misc/guc_tables.c:2805
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "Setzt die Größe der für Standby-Server vorgehaltenen WAL-Dateien."
 
-#: utils/misc/guc_tables.c:2816
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Setzt die minimale Größe, auf die der WAL geschrumpft wird."
 
-#: utils/misc/guc_tables.c:2828
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Setzt die WAL-Größe, die einen Checkpoint auslöst."
 
-#: utils/misc/guc_tables.c:2840
+#: utils/misc/guc_tables.c:2983
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "Setzt die maximale Zeit zwischen automatischen WAL-Checkpoints."
 
-#: utils/misc/guc_tables.c:2851
+#: utils/misc/guc_tables.c:2994
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr "Setzt die maximale Zeit, bevor gewarnt wird, wenn durch WAL-Volumen ausgelöste Checkpoints zu häufig passieren."
 
-#: utils/misc/guc_tables.c:2853
-msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. Zero turns off the warning."
-msgstr "Schreibe Meldung in den Serverlog, wenn Checkpoints, die durch Füllen der WAL-Segmentdateien ausgelöst werden, häufiger als dieser Zeitraum passieren. Null schaltet die Warnung ab."
+#: utils/misc/guc_tables.c:2996
+msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
+msgstr "Schreibe Meldung in den Serverlog, wenn Checkpoints, die durch Füllen der WAL-Segmentdateien ausgelöst werden, häufiger als dieser Zeitraum passieren. 0 schaltet die Warnung ab."
 
-#: utils/misc/guc_tables.c:2866 utils/misc/guc_tables.c:3084
-#: utils/misc/guc_tables.c:3138
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239
+#: utils/misc/guc_tables.c:3331
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr "Anzahl der Seiten, nach denen getätigte Schreibvorgänge auf die Festplatte zurückgeschrieben werden."
 
-#: utils/misc/guc_tables.c:2877
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240
+#: utils/misc/guc_tables.c:3332
+msgid "0 disables forced writeback."
+msgstr "0 schaltet das erzwungene Zurückschreiben aus."
+
+#: utils/misc/guc_tables.c:3020
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Setzt die Anzahl Diskseitenpuffer für WAL im Shared Memory."
 
-#: utils/misc/guc_tables.c:2878
-msgid "Specify -1 to have this value determined as a fraction of shared_buffers."
-msgstr ""
+#: utils/misc/guc_tables.c:3021
+msgid "-1 means use a fraction of \"shared_buffers\"."
+msgstr "-1 bedeutet, einen Bruchteil von »shared_buffers« zu verwenden."
 
-#: utils/misc/guc_tables.c:2888
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "Zeit zwischen WAL-Flush-Operationen im WAL-Writer."
 
-#: utils/misc/guc_tables.c:2899
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "Ein Flush wird ausgelöst, wenn diese Menge WAL vom WAL-Writer geschrieben worden ist."
 
-#: utils/misc/guc_tables.c:2910
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "Mindestgröße ab der neue Datei gefsynct wird statt WAL zu schreiben."
 
-#: utils/misc/guc_tables.c:2921
+#: utils/misc/guc_tables.c:3064
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "Setzt die maximale Anzahl gleichzeitig laufender WAL-Sender-Prozesse."
 
-#: utils/misc/guc_tables.c:2932
+#: utils/misc/guc_tables.c:3075
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Setzt die maximale Anzahl von gleichzeitig definierten Replikations-Slots."
 
-#: utils/misc/guc_tables.c:2942
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "Setzt die maximale WAL-Größe, die von Replikations-Slots reserviert werden kann."
 
-#: utils/misc/guc_tables.c:2943
-msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk."
-msgstr "Replikations-Slots werden als fehlgeschlagen markiert, und Segmente zum Löschen oder Wiederverwenden freigegeben, wenn so viel Platz von WAL auf der Festplatte belegt wird."
+#: utils/misc/guc_tables.c:3086
+msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
+msgstr "Replikations-Slots werden als fehlgeschlagen markiert, und Segmente zum Löschen oder Wiederverwenden freigegeben, wenn so viel Platz von WAL auf der Festplatte belegt wird. -1 bedeutet kein Maximum."
 
-#: utils/misc/guc_tables.c:2955
+#: utils/misc/guc_tables.c:3098
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "Setzt die maximale Zeit, um auf WAL-Replikation zu warten."
 
-#: utils/misc/guc_tables.c:2966
+#: utils/misc/guc_tables.c:3109
+msgid "Sets the duration a replication slot can remain idle before it is invalidated."
+msgstr "Setzt die Dauer, die ein Replikations-Slot inaktiv sein kann, bevor er ungültig gemacht wird."
+
+#: utils/misc/guc_tables.c:3121
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr "Setzt die Verzögerung in Millisekunden zwischen Transaktionsabschluss und dem Schreiben von WAL auf die Festplatte."
 
-#: utils/misc/guc_tables.c:2978
+#: utils/misc/guc_tables.c:3133
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
 msgstr "Setzt die notwendige minimale Anzahl gleichzeitig offener Transaktionen bevor »commit_delay« angewendet wird."
 
-#: utils/misc/guc_tables.c:2989
+#: utils/misc/guc_tables.c:3144
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Setzt die Anzahl ausgegebener Ziffern für Fließkommawerte."
 
-#: utils/misc/guc_tables.c:2990
+#: utils/misc/guc_tables.c:3145
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr "Diese Einstellung betrifft real, double precision und geometrische Datentypen. Null oder ein negativer Parameterwert wird zur Standardziffernanzahl (FLT_DIG bzw. DBL_DIG) hinzuaddiert. Ein Wert größer als Null wählt präzisen Ausgabemodus."
 
-#: utils/misc/guc_tables.c:3002
-msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by log_statement_sample_rate."
-msgstr "Setzt die minimale Ausführungszeit, über der Stichproben aller Anweisungen geloggt werden. Die Stichproben werden durch log_statement_sample_rate bestimmt."
+#: utils/misc/guc_tables.c:3157
+msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
+msgstr "Setzt die minimale Ausführungszeit, über der Stichproben aller Anweisungen geloggt werden. Die Stichproben werden durch »log_statement_sample_rate« bestimmt."
 
-#: utils/misc/guc_tables.c:3005
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "Null loggt eine Stichprobe aller Anfragen. -1 schaltet dieses Feature aus."
+#: utils/misc/guc_tables.c:3160
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr "-1 schaltet Stichproben aus. 0 bedeutet, alle Anweisungen zu einzubeziehen."
 
-#: utils/misc/guc_tables.c:3015
+#: utils/misc/guc_tables.c:3170
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr "Setzt die minimale Ausführungszeit, über der alle Anweisungen geloggt werden."
 
-#: utils/misc/guc_tables.c:3017
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Null zeigt alle Anfragen. -1 schaltet dieses Feature aus."
+#: utils/misc/guc_tables.c:3172
+msgid "-1 disables logging statement durations. 0 means log all statement durations."
+msgstr "-1 schaltet das Loggen der Ausführungszeit aus. 0 bedeutet, die Ausführungszeit aller Anweisungen zu loggen."
 
-#: utils/misc/guc_tables.c:3027
+#: utils/misc/guc_tables.c:3182
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr "Setzt die minimale Ausführungszeit, über der Autovacuum-Aktionen geloggt werden."
 
-#: utils/misc/guc_tables.c:3029
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "Null gibt alls Aktionen aus. -1 schaltet die Log-Aufzeichnung über Autovacuum aus."
+#: utils/misc/guc_tables.c:3184
+msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
+msgstr "-1 schaltet das Loggen der Autovacuum-Aktionen aus. 0 bedeutet, alle Autovacuum-Aktionen zu loggen."
 
-#: utils/misc/guc_tables.c:3039
+#: utils/misc/guc_tables.c:3194
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr "Setzt die maximale Länge in Bytes für geloggte Daten von Bind-Parametern, wenn Anfragen geloggt werden."
 
-#: utils/misc/guc_tables.c:3041 utils/misc/guc_tables.c:3053
-msgid "-1 to print values in full."
-msgstr "-1 um die Werte vollständig auszugeben."
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
+msgid "-1 means log values in full."
+msgstr "-1 bedeutet, die vollen Werte zu loggen."
 
-#: utils/misc/guc_tables.c:3051
+#: utils/misc/guc_tables.c:3206
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr "Setzt die maximale Länge in Bytes für bei Fehlern geloggte Daten von Bind-Parametern, wenn Anfragen geloggt werden."
 
-#: utils/misc/guc_tables.c:3063
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr "Schlafzeit zwischen Durchläufen des Background-Writers."
 
-#: utils/misc/guc_tables.c:3074
+#: utils/misc/guc_tables.c:3229
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "Maximale Anzahl der vom Background-Writer pro Durchlauf zu flushenden LRU-Seiten."
 
-#: utils/misc/guc_tables.c:3097
+#: utils/misc/guc_tables.c:3230
+msgid "0 disables background writing."
+msgstr "0 schaltet Schreiben im Hintergrund aus."
+
+#: utils/misc/guc_tables.c:3252
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr "Anzahl simultaner Anfragen, die das Festplattensubsystem effizient bearbeiten kann."
 
-#: utils/misc/guc_tables.c:3111
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
+msgid "0 disables simultaneous requests."
+msgstr "0 schaltet simultane Anfragen aus."
+
+#: utils/misc/guc_tables.c:3266
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr "Eine Variante von »effective_io_concurrency«, die für Wartungsarbeiten verwendet wird."
 
-#: utils/misc/guc_tables.c:3126
+#: utils/misc/guc_tables.c:3281
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr "Serverweites Limit, das io_combine_limit beschränkt."
+
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
-msgstr ""
+msgstr "Begrenzung der Größe von Datenlese- und -schreibvorgängen."
+
+#: utils/misc/guc_tables.c:3309
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr "Maximale Anzahl IOs, die ein Prozess gleichzeitig ausführen kann."
 
-#: utils/misc/guc_tables.c:3151
+#: utils/misc/guc_tables.c:3321
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr "Anzahl IO-Worker-Prozesse, für io_method=worker."
+
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "Maximale Anzahl gleichzeitiger Worker-Prozesse."
 
-#: utils/misc/guc_tables.c:3163
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr "Maximale Anzahl Arbeitsprozesse für logische Replikation."
 
-#: utils/misc/guc_tables.c:3175
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "Maximale Anzahl Arbeitsprozesse für Tabellensynchronisation pro Subskription."
 
-#: utils/misc/guc_tables.c:3187
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "Maximale Anzahl Parallel-Apply-Worker pro Subskription."
 
-#: utils/misc/guc_tables.c:3197
+#: utils/misc/guc_tables.c:3392
+msgid "Sets the maximum number of active replication origins."
+msgstr "Setzt die maximale Anzahl aktiver Replication-Origins."
+
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "Setzt die Zeit, die gewartet wird, bevor Logdateirotation erzwungen wird."
 
-#: utils/misc/guc_tables.c:3209
+#: utils/misc/guc_tables.c:3404
+msgid "0 disables time-based creation of new log files."
+msgstr "0 schaltet zeitbasierende Erzeugung neuer Logdateien aus."
+
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "Setzt die maximale Größe, die eine Logdatei erreichen kann, bevor sie rotiert wird."
 
-#: utils/misc/guc_tables.c:3221
+#: utils/misc/guc_tables.c:3416
+msgid "0 disables size-based creation of new log files."
+msgstr "0 schaltet größenbasierende Erzeugung neuer Logdateien aus."
+
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "Setzt die maximale Anzahl von Funktionsargumenten."
 
-#: utils/misc/guc_tables.c:3232
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "Zeigt die maximale Anzahl von Indexschlüsseln."
 
-#: utils/misc/guc_tables.c:3243
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "Zeigt die maximale Länge von Bezeichnern."
 
-#: utils/misc/guc_tables.c:3254
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "Zeigt die Größe eines Diskblocks."
 
-#: utils/misc/guc_tables.c:3265
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "Zeigt die Anzahl Seiten pro Diskdatei."
 
-#: utils/misc/guc_tables.c:3276
+#: utils/misc/guc_tables.c:3481
 msgid "Shows the block size in the write ahead log."
 msgstr "Zeigt die Blockgröße im Write-Ahead-Log."
 
-#: utils/misc/guc_tables.c:3287
+#: utils/misc/guc_tables.c:3492
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr "Setzt die Zeit, die gewartet wird, bevor nach einem fehlgeschlagenen Versuch neue WAL-Daten angefordert werden."
 
-#: utils/misc/guc_tables.c:3299
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "Zeigt die Größe eines Write-Ahead-Log-Segments."
 
-#: utils/misc/guc_tables.c:3312
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
-msgstr ""
+msgstr "Zeit, für die WAL-Summary-Dateien aufgehoben werden sollen."
 
-#: utils/misc/guc_tables.c:3325
+#: utils/misc/guc_tables.c:3518
+msgid "0 disables automatic summary file deletion."
+msgstr "0 schaltet das automatische Löschen von Summary-Dateien aus."
+
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "Wartezeit zwischen Autovacuum-Durchläufen."
 
-#: utils/misc/guc_tables.c:3335
+#: utils/misc/guc_tables.c:3540
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "Mindestanzahl an geänderten oder gelöschten Tupeln vor einem Vacuum."
 
-#: utils/misc/guc_tables.c:3344
-msgid "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert vacuums."
-msgstr "Mindestanzahl an Einfügeoperationen vor einem Vacuum, oder -1 um auszuschalten."
+#: utils/misc/guc_tables.c:3549
+msgid "Maximum number of tuple updates or deletes prior to vacuum."
+msgstr "Höchstanzahl an geänderten oder gelöschten Tupeln vor einem Vacuum."
 
-#: utils/misc/guc_tables.c:3353
+#: utils/misc/guc_tables.c:3550
+msgid "-1 disables the maximum threshold."
+msgstr "-1 schaltet die Höchstanzahl aus."
+
+#: utils/misc/guc_tables.c:3558
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "Mindestanzahl an eingefügten Tupeln vor einem Vacuum."
+
+#: utils/misc/guc_tables.c:3559
+msgid "-1 disables insert vacuums."
+msgstr "-1 schaltet Vacuum aufgrund von Einfügen aus."
+
+#: utils/misc/guc_tables.c:3567
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "Mindestanzahl an Einfüge-, Änderungs- oder Löschoperationen vor einem Analyze."
 
-#: utils/misc/guc_tables.c:3363
+#: utils/misc/guc_tables.c:3577
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "Alter, nach dem eine Tabelle automatisch gevacuumt wird, um Transaktionsnummernüberlauf zu verhindern."
 
-#: utils/misc/guc_tables.c:3375
+#: utils/misc/guc_tables.c:3589
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "Multixact-Alter, nach dem eine Tabelle automatisch gevacuumt wird, um Transaktionsnummernüberlauf zu verhindern."
 
-#: utils/misc/guc_tables.c:3385
+#: utils/misc/guc_tables.c:3599
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr "Setzt die Anzahl der für Autovacuum-Worker bereitgestellten Backend-Slots."
+
+#: utils/misc/guc_tables.c:3608
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "Setzt die maximale Anzahl gleichzeitig laufender Autovacuum-Worker-Prozesse."
 
-#: utils/misc/guc_tables.c:3395
+#: utils/misc/guc_tables.c:3618
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "Setzt die maximale Anzahl paralleler Prozesse pro Wartungsoperation."
 
-#: utils/misc/guc_tables.c:3405
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "Setzt die maximale Anzahl paralleler Prozesse pro Executor-Knoten."
 
-#: utils/misc/guc_tables.c:3416
+#: utils/misc/guc_tables.c:3639
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "Setzt die maximale Anzahl paralleler Arbeitsprozesse, die gleichzeitig aktiv sein können."
 
-#: utils/misc/guc_tables.c:3427
+#: utils/misc/guc_tables.c:3650
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "Setzt die maximale Speichergröße für jeden Autovacuum-Worker-Prozess."
 
-#: utils/misc/guc_tables.c:3438
+#: utils/misc/guc_tables.c:3651
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "-1 bedeutet, »maintenance_work_mem« zu verwenden."
+
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "Zeit zwischen TCP-Keepalive-Sendungen."
 
-#: utils/misc/guc_tables.c:3439 utils/misc/guc_tables.c:3450
-#: utils/misc/guc_tables.c:3574
-msgid "A value of 0 uses the system default."
-msgstr "Der Wert 0 verwendet die Systemvoreinstellung."
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673
+#: utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
+msgid "0 means use the system default."
+msgstr "0 bedeutet, die Systemvoreinstellung zu verwenden."
 
-#: utils/misc/guc_tables.c:3449
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "Zeit zwischen TCP-Keepalive-Neuübertragungen."
 
-#: utils/misc/guc_tables.c:3460
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "SSL-Renegotiation wird nicht mehr unterstützt; kann nur auf 0 gesetzt werden."
 
-#: utils/misc/guc_tables.c:3471
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Maximale Anzahl an TCP-Keepalive-Neuübertragungen."
 
-#: utils/misc/guc_tables.c:3472
-msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
-msgstr "Anzahl von aufeinanderfolgenden Keepalive-Neuübertragungen, die verloren gehen dürfen, bis die Verbindung als tot betrachtet wird. Der Wert 0 verwendet die Betriebssystemvoreinstellung."
+#: utils/misc/guc_tables.c:3695
+msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
+msgstr "Anzahl von aufeinanderfolgenden Keepalive-Neuübertragungen, die verloren gehen dürfen, bis die Verbindung als tot betrachtet wird. 0 bedeutet, die Betriebssystemvoreinstellung zu verwenden."
 
-#: utils/misc/guc_tables.c:3483
+#: utils/misc/guc_tables.c:3706
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "Setzt die maximal erlaubte Anzahl Ergebnisse für eine genaue Suche mit GIN."
 
-#: utils/misc/guc_tables.c:3494
+#: utils/misc/guc_tables.c:3707
+msgid "0 means no limit."
+msgstr "0 bedeutet keine Grenze."
+
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "Setzt die Annahme des Planers über die Gesamtgröße der Daten-Caches."
 
-#: utils/misc/guc_tables.c:3495
+#: utils/misc/guc_tables.c:3717
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr "Das heißt, die Gesamtgröße der Caches (Kernel-Cache und Shared Buffers), die für Datendateien von PostgreSQL verwendet wird. Das wird in Diskseiten gemessen, welche normalerweise 8 kB groß sind."
 
-#: utils/misc/guc_tables.c:3506
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "Setzt die Mindestmenge an Tabellendaten für einen parallelen Scan."
 
-#: utils/misc/guc_tables.c:3507
+#: utils/misc/guc_tables.c:3729
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Wenn der Planer schätzt, dass zu wenige Tabellenseiten gelesen werden werden um diesen Wert zu erreichen, dann wird kein paralleler Scan in Erwägung gezogen werden."
 
-#: utils/misc/guc_tables.c:3517
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "Setzt die Mindestmenge an Indexdaten für einen parallelen Scan."
 
-#: utils/misc/guc_tables.c:3518
+#: utils/misc/guc_tables.c:3740
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Wenn der Planer schätzt, dass zu wenige Indexseiten gelesen werden werden um diesen Wert zu erreichen, dann wird kein paralleler Scan in Erwägung gezogen werden."
 
-#: utils/misc/guc_tables.c:3529
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "Zeigt die Serverversion als Zahl."
 
-#: utils/misc/guc_tables.c:3540
+#: utils/misc/guc_tables.c:3762
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "Schreibt Meldungen über die Verwendung von temporären Dateien in den Log, wenn sie größer als diese Anzahl an Kilobytes sind."
 
-#: utils/misc/guc_tables.c:3541
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr "Null loggt alle Dateien. Die Standardeinstellung ist -1 (wodurch dieses Feature ausgeschaltet wird)."
+#: utils/misc/guc_tables.c:3763
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
+msgstr "-1 schaltet Loggen von temporären Dateien aus. 0 bedeutet, dass alle temporären Dateien geloggt werden."
 
-#: utils/misc/guc_tables.c:3551
+#: utils/misc/guc_tables.c:3773
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Setzt die für pg_stat_activity.query reservierte Größe, in Bytes."
 
-#: utils/misc/guc_tables.c:3562
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Setzt die maximale Größe der Pending-Liste eines GIN-Index."
 
-#: utils/misc/guc_tables.c:3573
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "TCP-User-Timeout."
 
-#: utils/misc/guc_tables.c:3584
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "Huge-Page-Größe, die angefordert werden soll."
 
-#: utils/misc/guc_tables.c:3595
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "System-Caches aggressiv flushen, zum Debuggen."
 
-#: utils/misc/guc_tables.c:3618
+#: utils/misc/guc_tables.c:3818
+msgid "0 means use normal caching behavior."
+msgstr "0 bedeutet, das normale Caching-Verhalten zu verwenden."
+
+#: utils/misc/guc_tables.c:3840
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr "Setzt das Zeitintervall zwischen Prüfungen auf Verbindungsabbruch während Anfragen laufen."
 
-#: utils/misc/guc_tables.c:3629
+#: utils/misc/guc_tables.c:3841
+msgid "0 disables connection checks."
+msgstr "0 schaltet Verbindungsprüfungen aus."
+
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr "Zeit zwischen Fortschrittsnachrichten für lange laufende Operationen beim Serverstart."
 
-#: utils/misc/guc_tables.c:3631
-msgid "0 turns this feature off."
-msgstr "0 schaltet dieses Feature aus."
+#: utils/misc/guc_tables.c:3853
+msgid "0 disables progress updates."
+msgstr "0 schaltet Fortschrittsnachrichten aus."
 
-#: utils/misc/guc_tables.c:3641
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "Setzt die Iterationszahl für die Erzeugung von SCRAM-Geheimnissen."
 
-#: utils/misc/guc_tables.c:3661
+#: utils/misc/guc_tables.c:3883
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr "Setzt den vom Planer geschätzten Aufwand, um eine sequenzielle Diskseite zu lesen."
 
-#: utils/misc/guc_tables.c:3672
+#: utils/misc/guc_tables.c:3894
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr "Setzt den vom Planer geschätzten Aufwand, um eine nichtsequenzielle Diskseite zu lesen."
 
-#: utils/misc/guc_tables.c:3683
+#: utils/misc/guc_tables.c:3905
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung einer Zeile."
 
-#: utils/misc/guc_tables.c:3694
+#: utils/misc/guc_tables.c:3916
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung eines Indexeintrags während eines Index-Scans."
 
-#: utils/misc/guc_tables.c:3705
+#: utils/misc/guc_tables.c:3927
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung eines Operators oder Funktionsaufrufs."
 
-#: utils/misc/guc_tables.c:3716
+#: utils/misc/guc_tables.c:3938
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr "Setzt den vom Planer geschätzten Aufwand, um eine Zeile vom Arbeitsprozess an das Leader-Backend zu senden."
 
-#: utils/misc/guc_tables.c:3727
+#: utils/misc/guc_tables.c:3949
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr "Setzt den vom Planer geschätzten Aufwand für das Starten von Arbeitsprozessen für parallele Anfragen."
 
-#: utils/misc/guc_tables.c:3739
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "JIT-Kompilierung durchführen, wenn die Anfrage teurer ist."
 
-#: utils/misc/guc_tables.c:3740
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 schaltet JIT-Kompilierung aus."
 
-#: utils/misc/guc_tables.c:3750
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "JIT-kompilierte Funktionen optimieren, wenn die Anfrage teurer ist."
 
-#: utils/misc/guc_tables.c:3751
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1 schaltet Optimierung aus."
 
-#: utils/misc/guc_tables.c:3761
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "JIT-Inlining durchführen, wenn die Anfrage teurer ist."
 
-#: utils/misc/guc_tables.c:3762
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 schaltet Inlining aus."
 
-#: utils/misc/guc_tables.c:3772
+#: utils/misc/guc_tables.c:3994
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr "Setzt die Planerschätzung für den Anteil der Cursor-Zeilen, die ausgelesen werden werden."
 
-#: utils/misc/guc_tables.c:3784
+#: utils/misc/guc_tables.c:4006
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr "Setzt die Planerschätzung für die durchschnittliche Größe der Arbeitstabelle einer rekursiven Anfrage."
 
-#: utils/misc/guc_tables.c:3796
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: selektiver Auswahldruck in der Bevölkerung."
 
-#: utils/misc/guc_tables.c:3807
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: Ausgangswert für die zufällige Pfadauswahl."
 
-#: utils/misc/guc_tables.c:3818
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "Vielfaches von »work_mem« zur Verwendung bei Hash-Tabellen."
 
-#: utils/misc/guc_tables.c:3829
+#: utils/misc/guc_tables.c:4051
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "Vielfaches der durchschnittlichen freizugebenden Pufferverwendung pro Runde."
 
-#: utils/misc/guc_tables.c:3839
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "Setzt den Ausgangswert für die Zufallszahlenerzeugung."
 
-#: utils/misc/guc_tables.c:3850
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Vacuum-Kosten-Verzögerung in Millisekunden."
 
-#: utils/misc/guc_tables.c:3861
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Vacuum-Kosten-Verzögerung in Millisekunden, für Autovacuum."
 
-#: utils/misc/guc_tables.c:3872
+#: utils/misc/guc_tables.c:4084
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr "-1 bedeutet, »vacuum_cost_delay« zu verwenden."
+
+#: utils/misc/guc_tables.c:4094
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "Anzahl geänderter oder gelöschter Tupel vor einem Vacuum, relativ zu reltuples."
 
-#: utils/misc/guc_tables.c:3882
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "Anzahl eingefügter Tupel vor einem Vacuum, relativ zu reltuples."
 
-#: utils/misc/guc_tables.c:3892
+#: utils/misc/guc_tables.c:4114
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "Anzahl eingefügter, geänderter oder gelöschter Tupel vor einem Analyze, relativ zu reltuples."
 
-#: utils/misc/guc_tables.c:3902
+#: utils/misc/guc_tables.c:4124
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr "Zeit, die damit verbracht wird, modifizierte Puffer während eines Checkpoints zurückzuschreiben, als Bruchteil des Checkpoint-Intervalls."
 
-#: utils/misc/guc_tables.c:3912
+#: utils/misc/guc_tables.c:4134
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr "Anteil der zu loggenden Anweisungen, die »log_min_duration_sample« überschreiten."
 
-#: utils/misc/guc_tables.c:3913
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "Verwenden Sie einen Wert zwischen 0.0 (nie loggen) und 1.0 (immer loggen)."
 
-#: utils/misc/guc_tables.c:3922
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "Setzt den Bruchteil der Transaktionen, aus denen alle Anweisungen geloggt werden."
 
-#: utils/misc/guc_tables.c:3923
+#: utils/misc/guc_tables.c:4145
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr "Verwenden Sie einen Wert zwischen 0.0 (nie loggen) und 1.0 (alle Anweisungen für alle Transaktionen loggen)."
 
-#: utils/misc/guc_tables.c:3942
+#: utils/misc/guc_tables.c:4155
+msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
+msgstr "Bruchteil an Seiten in einer Relation, die Vacuum scannen kann aber nicht einfrieren kann, bevor Eager Scanning ausgeschaltet wird."
+
+#: utils/misc/guc_tables.c:4156
+msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
+msgstr "Der Wert 0.0 schaltet Eager Scanning aus und der Wert 1.0 wird bis zu 100 Prozent der all-visible Seiten in der Relation mit Eager Scanning lesen. Wenn Vacuum diese Seiten erfolgreich einfriert, dann ist die Deckelung niedriger als 100 Prozent, weil das Ziel ist, die Kosten für das Einfrieren von Seiten über mehrere Vacuums zu amortisieren."
+
+#: utils/misc/guc_tables.c:4174
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "Setzt den Shell-Befehl, der aufgerufen wird, um eine WAL-Datei zu archivieren."
 
-#: utils/misc/guc_tables.c:3943
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "Dieser wird nur verwendet, wenn »archive_library« nicht gesetzt ist."
+#: utils/misc/guc_tables.c:4175
+msgid "An empty string means use \"archive_library\"."
+msgstr "Ein leerer Wert bedeutet, »archive_library« zu verwenden."
 
-#: utils/misc/guc_tables.c:3952
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "Setzt die Bibliothek, die aufgerufen wird, um eine WAL-Datei zu archivieren."
 
-#: utils/misc/guc_tables.c:3953
-msgid "An empty string indicates that \"archive_command\" should be used."
-msgstr "Eine leere Zeichenkette bedeutet, dass »archive_command« verwendet werden soll."
+#: utils/misc/guc_tables.c:4185
+msgid "An empty string means use \"archive_command\"."
+msgstr "Eine leere Zeichenkette bedeutet, »archive_command« zu verwenden."
 
-#: utils/misc/guc_tables.c:3962
+#: utils/misc/guc_tables.c:4194
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "Setzt den Shell-Befehl, der aufgerufen wird, um eine archivierte WAL-Datei zurückzuholen."
 
-#: utils/misc/guc_tables.c:3972
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "Setzt den Shell-Befehl, der bei jedem Restart-Punkt ausgeführt wird."
 
-#: utils/misc/guc_tables.c:3982
+#: utils/misc/guc_tables.c:4214
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr "Setzt den Shell-Befehl, der einmal am Ende der Wiederherstellung ausgeführt wird."
 
-#: utils/misc/guc_tables.c:3992
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "Gibt die Zeitleiste für die Wiederherstellung an."
 
-#: utils/misc/guc_tables.c:4002
+#: utils/misc/guc_tables.c:4234
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr "Auf »immediate« setzen, um die Wiederherstellung zu beenden, sobald ein konsistenter Zustand erreicht ist."
 
-#: utils/misc/guc_tables.c:4011
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "Setzt die Transaktions-ID, bis zu der die Wiederherstellung voranschreiten wird."
 
-#: utils/misc/guc_tables.c:4020
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "Setzt den Zeitstempel, bis zu dem die Wiederherstellung voranschreiten wird."
 
-#: utils/misc/guc_tables.c:4029
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "Setzt den benannten Restore-Punkt, bis zu dem die Wiederherstellung voranschreiten wird."
 
-#: utils/misc/guc_tables.c:4038
+#: utils/misc/guc_tables.c:4270
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr "Setzt die LSN der Write-Ahead-Log-Position, bis zu der die Wiederherstellung voranschreiten wird."
 
-#: utils/misc/guc_tables.c:4048
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "Setzt die Verbindungszeichenkette zur Verbindung mit dem sendenden Server."
 
-#: utils/misc/guc_tables.c:4059
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "Setzt den Namen des zu verwendenden Replikations-Slots auf dem sendenden Server."
 
-#: utils/misc/guc_tables.c:4069
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "Setzt die Zeichensatzkodierung des Clients."
 
-#: utils/misc/guc_tables.c:4080
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "Bestimmt die Informationen, die vor jede Logzeile geschrieben werden."
 
-#: utils/misc/guc_tables.c:4081
-msgid "If blank, no prefix is used."
-msgstr "Wenn leer, dann wird kein Präfix verwendet."
+#: utils/misc/guc_tables.c:4313
+msgid "An empty string means no prefix."
+msgstr "Ein leerer Wert bedeutet, keinen Präfix zu schreiben."
 
-#: utils/misc/guc_tables.c:4090
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "Setzt die in Logmeldungen verwendete Zeitzone."
 
-#: utils/misc/guc_tables.c:4100
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "Setzt das Ausgabeformat für Datums- und Zeitwerte."
 
-#: utils/misc/guc_tables.c:4101
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Kontrolliert auch die Interpretation von zweideutigen Datumseingaben."
 
-#: utils/misc/guc_tables.c:4112
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "Setzt die Standard-Tabellenzugriffsmethode für neue Tabellen."
 
-#: utils/misc/guc_tables.c:4123
+#: utils/misc/guc_tables.c:4355
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "Setzt den Standard-Tablespace für Tabellen und Indexe."
 
-#: utils/misc/guc_tables.c:4124
-msgid "An empty string selects the database's default tablespace."
-msgstr "Eine leere Zeichenkette wählt den Standard-Tablespace der Datenbank."
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
+msgid "An empty string means use the database's default tablespace."
+msgstr "Eine leere Zeichenkette bedeutet, den Standard-Tablespace der Datenbank zu verwenden."
 
-#: utils/misc/guc_tables.c:4134
+#: utils/misc/guc_tables.c:4366
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "Setzt den oder die Tablespaces für temporäre Tabellen und Sortierdateien."
 
-#: utils/misc/guc_tables.c:4145
+#: utils/misc/guc_tables.c:4377
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr "Bestimmt, ob ein CREATEROLE-Benutzer sich die Rolle automatisch selbst gewährt, und mit welchen Optionen."
 
-#: utils/misc/guc_tables.c:4157
+#: utils/misc/guc_tables.c:4379
+msgid "An empty string disables automatic self grants."
+msgstr "Eine leere Zeichenkette schaltet automatische Selbst-Grants aus."
+
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Setzt den Pfad für ladbare dynamische Bibliotheken."
 
-#: utils/misc/guc_tables.c:4158
+#: utils/misc/guc_tables.c:4390
 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 "Wenn ein dynamisch ladbares Modul geöffnet werden muss und der angegebene Name keine Verzeichniskomponente hat (das heißt er enthält keinen Schrägstrich), dann sucht das System in diesem Pfad nach der angegebenen Datei."
 
-#: utils/misc/guc_tables.c:4171
+#: utils/misc/guc_tables.c:4403
+msgid "Sets the path for extension control files."
+msgstr "Setzt den Pfad für Kontrolldateien von Erweiterungen."
+
+#: utils/misc/guc_tables.c:4404
+msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
+msgstr "Die übrigen Skriptdateien und sekundären Kontrolldateien von Erweiterungen werden aus dem selben Verzeichnis geladen, wo die primäre Kontrolldatei gefunden wurde."
+
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Setzt den Ort der Kerberos-Server-Schlüsseldatei."
 
-#: utils/misc/guc_tables.c:4182
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Setzt den Bonjour-Servicenamen."
 
-#: utils/misc/guc_tables.c:4192
+#: utils/misc/guc_tables.c:4427
+msgid "An empty string means use the computer name."
+msgstr "Eine leere Zeichenkette bedeutet, den Computer-Namen zu verwenden."
+
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "Setzt die Sprache, in der Mitteilungen ausgegeben werden."
 
-#: utils/misc/guc_tables.c:4202
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
+msgid "An empty string means use the operating system setting."
+msgstr "Eine leere Zeichenkette bedeutet, die Betriebssystemeinstellung zu verwenden."
+
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Setzt die Locale für die Formatierung von Geldbeträgen."
 
-#: utils/misc/guc_tables.c:4212
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "Setzt die Locale für die Formatierung von Zahlen."
 
-#: utils/misc/guc_tables.c:4222
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "Setzt die Locale für die Formatierung von Datums- und Zeitwerten."
 
-#: utils/misc/guc_tables.c:4232
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Listet dynamische Bibliotheken, die vorab in jeden Serverprozess geladen werden."
 
-#: utils/misc/guc_tables.c:4243
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "Listet dynamische Bibliotheken, die vorab in den Server geladen werden."
 
-#: utils/misc/guc_tables.c:4254
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Listet unprivilegierte dynamische Bibliotheken, die vorab in jeden Serverprozess geladen werden."
 
-#: utils/misc/guc_tables.c:4265
+#: utils/misc/guc_tables.c:4509
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Setzt die Schemasuchreihenfolge für Namen ohne Schemaqualifikation."
 
-#: utils/misc/guc_tables.c:4277
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "Zeigt die Zeichensatzkodierung des Servers (der Datenbank)."
 
-#: utils/misc/guc_tables.c:4289
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "Zeigt die Serverversion."
 
-#: utils/misc/guc_tables.c:4301
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "Setzt die aktuelle Rolle."
 
-#: utils/misc/guc_tables.c:4313
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "Setzt den Sitzungsbenutzernamen."
 
-#: utils/misc/guc_tables.c:4324
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "Setzt das Ziel für die Serverlogausgabe."
 
-#: utils/misc/guc_tables.c:4325
+#: utils/misc/guc_tables.c:4569
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr "Gültige Werte sind Kombinationen von »stderr«, »syslog«, »csvlog«, »jsonlog« und »eventlog«, je nach Plattform."
 
-#: utils/misc/guc_tables.c:4336
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "Bestimmt das Zielverzeichnis für Logdateien."
 
-#: utils/misc/guc_tables.c:4337
+#: utils/misc/guc_tables.c:4581
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "Kann relativ zum Datenverzeichnis oder als absoluter Pfad angegeben werden."
 
-#: utils/misc/guc_tables.c:4347
+#: utils/misc/guc_tables.c:4591
 msgid "Sets the file name pattern for log files."
 msgstr "Bestimmt das Dateinamenmuster für Logdateien."
 
-#: utils/misc/guc_tables.c:4358
+#: utils/misc/guc_tables.c:4602
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Setzt den Programmnamen, mit dem PostgreSQL-Meldungen im Syslog identifiziert werden."
 
-#: utils/misc/guc_tables.c:4369
+#: utils/misc/guc_tables.c:4613
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "Setzt den Programmnamen, mit dem PostgreSQL-Meldungen im Ereignisprotokoll identifiziert werden."
 
-#: utils/misc/guc_tables.c:4380
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Setzt die Zeitzone, in der Zeitangaben interpretiert und ausgegeben werden."
 
-#: utils/misc/guc_tables.c:4390
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "Wählt eine Datei mit Zeitzonenabkürzungen."
 
-#: utils/misc/guc_tables.c:4400
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Setzt die Eigentümergruppe der Unix-Domain-Socket."
 
-#: utils/misc/guc_tables.c:4401
-msgid "The owning user of the socket is always the user that starts the server."
-msgstr "Der Eigentümer ist immer der Benutzer, der den Server startet."
+#: utils/misc/guc_tables.c:4645
+msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
+msgstr "Der Eigentümer ist immer der Benutzer, der den Server startet. Eine leere Zeichenkette bedeutet, die Standardgruppe des Benutzers zu verwenden."
 
-#: utils/misc/guc_tables.c:4411
+#: utils/misc/guc_tables.c:4655
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Setzt die Verzeichnisse, in denen Unix-Domain-Sockets erzeugt werden sollen."
 
-#: utils/misc/guc_tables.c:4422
+#: utils/misc/guc_tables.c:4666
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Setzt den Hostnamen oder die IP-Adresse(n), auf der auf Verbindungen gewartet wird."
 
-#: utils/misc/guc_tables.c:4437
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "Setzt das Datenverzeichnis des Servers."
 
-#: utils/misc/guc_tables.c:4448
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "Setzt die Hauptkonfigurationsdatei des Servers."
 
-#: utils/misc/guc_tables.c:4459
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Setzt die »hba«-Konfigurationsdatei des Servers."
 
-#: utils/misc/guc_tables.c:4470
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Setzt die »ident«-Konfigurationsdatei des Servers."
 
-#: utils/misc/guc_tables.c:4481
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Schreibt die Postmaster-PID in die angegebene Datei."
 
-#: utils/misc/guc_tables.c:4492
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "Zeigt den Namen der SSL-Bibliothek."
 
-#: utils/misc/guc_tables.c:4507
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "Ort der SSL-Serverzertifikatsdatei."
 
-#: utils/misc/guc_tables.c:4517
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "Setzt den Ort der Datei mit dem privaten SSL-Server-Schlüssel."
 
-#: utils/misc/guc_tables.c:4527
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "Ort der SSL-Certificate-Authority-Datei."
 
-#: utils/misc/guc_tables.c:4537
+#: utils/misc/guc_tables.c:4781
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Ort der SSL-Certificate-Revocation-List-Datei."
 
-#: utils/misc/guc_tables.c:4547
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "Ort des SSL-Certificate-Revocation-List-Verzeichnisses."
 
-#: utils/misc/guc_tables.c:4557
+#: utils/misc/guc_tables.c:4801
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr "Anzahl synchroner Standbys und Liste der Namen der möglichen synchronen Standbys."
 
-#: utils/misc/guc_tables.c:4568
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "Setzt die vorgegebene Textsuchekonfiguration."
 
-#: utils/misc/guc_tables.c:4578
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Setzt die Liste der erlaubten SSL-Verschlüsselungsalgorithmen."
+#: utils/misc/guc_tables.c:4822
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "Setzt die Liste der erlaubten Verschlüsselungsalgorithmen für TLSv1.3."
+
+#: utils/misc/guc_tables.c:4823
+msgid "An empty string means use the default cipher suites."
+msgstr "Eine leere Zeichenkette bedeutet, die voreingestellten Verschlüsselungsalgorithmen zu verwenden."
+
+#: utils/misc/guc_tables.c:4833
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
+msgstr "Setzt die Liste der erlaubten Verschlüsselungsalgorithmen für TLSv1.2 (und älter)."
+
+#: utils/misc/guc_tables.c:4848
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr "Setzt die für Diffie-Hellman-Schlüsselaustausch zu verwendenden Gruppen."
 
-#: utils/misc/guc_tables.c:4593
-msgid "Sets the curve to use for ECDH."
-msgstr "Setzt die für ECDH zu verwendende Kurve."
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr "Mehrere Gruppen können in einer durch Doppelpunkte getrennten Liste angegeben werden."
 
-#: utils/misc/guc_tables.c:4608
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "Setzt den Ort der SSL-DH-Parameter-Datei."
 
-#: utils/misc/guc_tables.c:4619
+#: utils/misc/guc_tables.c:4864
+msgid "An empty string means use compiled-in default parameters."
+msgstr "Eine leere Zeichenkette bedeutet, die einkompilierten Standardparameter zu verwenden."
+
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "Befehl zum Einlesen von Passphrasen für SSL."
 
-#: utils/misc/guc_tables.c:4630
+#: utils/misc/guc_tables.c:4875
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr "Eine leere Zeichenkette bedeutet, den eingebauten Prompt-Mechanismus zu verwenden."
+
+#: utils/misc/guc_tables.c:4885
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "Setzt den Anwendungsnamen, der in Statistiken und Logs verzeichnet wird."
 
-#: utils/misc/guc_tables.c:4641
+#: utils/misc/guc_tables.c:4896
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "Setzt den Namen des Clusters, welcher im Prozesstitel angezeigt wird."
 
-#: utils/misc/guc_tables.c:4652
+#: utils/misc/guc_tables.c:4907
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "Setzt die WAL-Resource-Manager, für die WAL-Konsistenzprüfungen durchgeführt werden."
 
-#: utils/misc/guc_tables.c:4653
+#: utils/misc/guc_tables.c:4908
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr "Volle Seitenabbilder werden für alle Datenblöcke geloggt und gegen die Resultate der WAL-Wiederherstellung geprüft."
 
-#: utils/misc/guc_tables.c:4663
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "Zu verwendender JIT-Provider."
 
-#: utils/misc/guc_tables.c:4674
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "Backtrace für Fehler in diesen Funktionen loggen."
 
-#: utils/misc/guc_tables.c:4685
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "Direct-I/O für Dateizugriff verwenden."
 
-#: utils/misc/guc_tables.c:4696
-msgid "Lists streaming replication standby server slot names that logical WAL sender processes will wait for."
-msgstr ""
+#: utils/misc/guc_tables.c:4941
+msgid "An empty string disables direct I/O."
+msgstr "Eine leere Zeichenkette schaltet Direct-I/O aus."
 
-#: utils/misc/guc_tables.c:4698
-msgid "Logical WAL sender processes will send decoded changes to plugins only after the specified  replication slots confirm receiving WAL."
-msgstr ""
+#: utils/misc/guc_tables.c:4951
+msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
+msgstr "Listet Replikations-Slot-Namen von Streaming-Replication-Standby-Servern, auf die logische WAL-Sender warten werden."
+
+#: utils/misc/guc_tables.c:4953
+msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
+msgstr "Logische WAL-Sender-Prozesse werden dekodierte Änderungen erst an die Ausgabe-Plugins senden, nachdem die angegebenen Replikations-Slots den Empfang von WAL bestätigt haben."
 
-#: utils/misc/guc_tables.c:4719
+#: utils/misc/guc_tables.c:4965
+msgid "Prohibits access to non-system relations of specified kinds."
+msgstr "Verbietet Zugriff auf Nicht-System-Relationen der angegeben Arten."
+
+#: utils/misc/guc_tables.c:4976
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr "Listet Bibliotheken, die aufgerufen werden können, um OAuth-v2-Bearer-Tokens zu validieren."
+
+#: utils/misc/guc_tables.c:4987
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr "Loggt die angegebenen Aspekte des Verbindungsaufbaus."
+
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Bestimmt, ob »\\'« in Zeichenkettenkonstanten erlaubt ist."
 
-#: utils/misc/guc_tables.c:4729
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "Setzt das Ausgabeformat für bytea."
 
-#: utils/misc/guc_tables.c:4739
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "Setzt die Meldungstypen, die an den Client gesendet werden."
 
-#: utils/misc/guc_tables.c:4740 utils/misc/guc_tables.c:4836
-#: utils/misc/guc_tables.c:4847
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125
+#: utils/misc/guc_tables.c:5136
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr "Jeder Wert schließt alle ihm folgenden Werte mit ein. Je weiter hinten der Wert steht, desto weniger Meldungen werden gesendet werden."
 
-#: utils/misc/guc_tables.c:4750
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "Schaltet die eingebaute Berechnung von Anfragebezeichnern ein."
 
-#: utils/misc/guc_tables.c:4760
+#: utils/misc/guc_tables.c:5049
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "Ermöglicht dem Planer die Verwendung von Constraints, um Anfragen zu optimieren."
 
-#: utils/misc/guc_tables.c:4761
+#: utils/misc/guc_tables.c:5050
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "Tabellen-Scans werden übersprungen, wenn deren Constraints garantieren, dass keine Zeile mit der Abfrage übereinstimmt."
 
-#: utils/misc/guc_tables.c:4772
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "Setzt die Standard-Komprimierungsmethode für komprimierbare Werte."
 
-#: utils/misc/guc_tables.c:4783
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Setzt den Transaktionsisolationsgrad neuer Transaktionen."
 
-#: utils/misc/guc_tables.c:4793
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "Zeigt den Isolationsgrad der aktuellen Transaktion."
 
-#: utils/misc/guc_tables.c:4804
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "Setzt das Ausgabeformat für Intervallwerte."
 
-#: utils/misc/guc_tables.c:4815
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "Loglevel für Meldungen über ungültige ICU-Locale-Zeichenketten."
 
-#: utils/misc/guc_tables.c:4825
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "Setzt den Detailgrad von geloggten Meldungen."
 
-#: utils/misc/guc_tables.c:4835
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "Setzt die Meldungstypen, die geloggt werden."
 
-#: utils/misc/guc_tables.c:4846
+#: utils/misc/guc_tables.c:5135
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "Schreibt alle Anweisungen, die einen Fehler auf dieser Stufe oder höher verursachen, in den Log."
 
-#: utils/misc/guc_tables.c:4857
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "Setzt die Anweisungsarten, die geloggt werden."
 
-#: utils/misc/guc_tables.c:4867
+#: utils/misc/guc_tables.c:5156
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "Setzt die zu verwendende Syslog-»Facility«, wenn Syslog angeschaltet ist."
 
-#: utils/misc/guc_tables.c:4878
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Setzt das Sitzungsverhalten für Trigger und Regeln."
 
-#: utils/misc/guc_tables.c:4888
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "Setzt den Synchronisationsgrad der aktuellen Transaktion."
 
-#: utils/misc/guc_tables.c:4898
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "Erlaubt die Archivierung von WAL-Dateien mittels »archive_command«."
 
-#: utils/misc/guc_tables.c:4908
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "Setzt die Aktion, die beim Erreichen des Wiederherstellungsziels durchgeführt wird."
 
-#: utils/misc/guc_tables.c:4918
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "Sammelt Statistiken auf Funktionsebene über Datenbankaktivität."
 
-#: utils/misc/guc_tables.c:4929
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "Setzt die Konsistenz von Zugriffen auf Statistikdaten."
 
-#: utils/misc/guc_tables.c:4939
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "Komprimiert in WAL-Dateien geschriebene volle Seiten mit der angegebenen Methode."
 
-#: utils/misc/guc_tables.c:4949
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "Setzt den Umfang der in den WAL geschriebenen Informationen."
 
-#: utils/misc/guc_tables.c:4959
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Wählt die zu verwendende Implementierung von dynamischem Shared Memory."
 
-#: utils/misc/guc_tables.c:4969
+#: utils/misc/guc_tables.c:5258
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr "Wählt die Shared-Memory-Implementierung, die für den Haupt-Shared-Memory-Bereich verwendet wird."
 
-#: utils/misc/guc_tables.c:4979
+#: utils/misc/guc_tables.c:5268
+msgid "Selects the file copy method."
+msgstr "Wählt die Methode, um Dateien zu kopieren."
+
+#: utils/misc/guc_tables.c:5278
+msgid "Selects the method used for extending data files."
+msgstr "Wählt die Methode, um Datendateien zu erweitern."
+
+#: utils/misc/guc_tables.c:5288
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "Wählt die Methode, um das Schreiben von WAL-Änderungen auf die Festplatte zu erzwingen."
 
-#: utils/misc/guc_tables.c:4989
+#: utils/misc/guc_tables.c:5298
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "Setzt, wie binäre Werte in XML kodiert werden."
 
-#: utils/misc/guc_tables.c:4999
+#: utils/misc/guc_tables.c:5308
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr "Setzt, ob XML-Daten in impliziten Parse- und Serialisierungsoperationen als Dokument oder Fragment betrachtet werden sollen."
 
-#: utils/misc/guc_tables.c:5010
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Huge Pages auf Linux oder Windows verwenden."
 
-#: utils/misc/guc_tables.c:5020
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
-msgstr ""
+msgstr "Zeigt den Status von Huge Pages an."
 
-#: utils/misc/guc_tables.c:5031
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "Während der Wiederherstellung Blöcke, auf die verwiesen wird, vorab einlesen."
 
-#: utils/misc/guc_tables.c:5032
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "Im WAL vorausschauen, um Verweise auf ungecachte Daten zu finden."
 
-#: utils/misc/guc_tables.c:5041
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "Erzwingt die Verwendung von Parallel-Query-Knoten im Planer."
 
-#: utils/misc/guc_tables.c:5042
+#: utils/misc/guc_tables.c:5351
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr "Das kann nützlich sein, um die Parallel-Query-Infrastruktur zu testen, indem der Planer gezwungen wird, Pläne zu erzeugen, die Knoten enthalten, die Tupelkommunikation zwischen Worker- und Hauptprozess durchführen."
 
-#: utils/misc/guc_tables.c:5054
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "Wählt den Algorithmus zum Verschlüsseln von Passwörtern."
 
-#: utils/misc/guc_tables.c:5064
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "Kontrolliert, ob der Planer einen maßgeschneiderten oder einen allgemeinen Plan verwendet."
 
-#: utils/misc/guc_tables.c:5065
+#: utils/misc/guc_tables.c:5374
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr "Vorbereitete Anweisungen können maßgeschneiderte oder allgemeine Pläne haben und der Planer wird versuchen, den besseren auszuwählen. Diese Einstellung kann das Standardverhalten außer Kraft setzen."
 
-#: utils/misc/guc_tables.c:5077
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "Setzt die minimale zu verwendende SSL/TLS-Protokollversion."
 
-#: utils/misc/guc_tables.c:5089
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "Setzt die maximale zu verwendende SSL/TLS-Protokollversion."
 
-#: utils/misc/guc_tables.c:5101
+#: utils/misc/guc_tables.c:5410
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr "Setzt die Methode für das Synchronisieren des Datenverzeichnisses vor der Wiederherstellung nach einem Absturz."
 
-#: utils/misc/guc_tables.c:5110
+#: utils/misc/guc_tables.c:5419
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr "Erzwingt sofortiges Streaming oder sofortige Serialisierung von Änderungen in großen Transaktionen."
 
-#: utils/misc/guc_tables.c:5111
+#: utils/misc/guc_tables.c:5420
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr "Auf dem Publikationsserver erlaubt es Streaming oder Serialisierung jeder Änderung aus logischer Dekodierung. Auf dem Subskriptionsserver erlaubt es die Serialisierung aller Änderungen in Dateien und benachrichtigt die Parallel-Apply-Worker, sie nach dem Ende der Transaktion zu lesen und anzuwenden."
 
+#: utils/misc/guc_tables.c:5432
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "Wählt die Methode zum Ausführen von asynchronem I/O."
+
 #: utils/misc/help_config.c:129
 #, c-format
 msgid "internal error: unrecognized run-time parameter type\n"
@@ -31020,6 +32409,26 @@ msgstr "Policy für Sicherheit auf Zeilenebene für Tabelle »%s« würde Auswir
 msgid "To disable the policy for the table's owner, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 msgstr "Um die Policy für den Tabelleneigentümer zu deaktivieren, verwenden Sie ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
+#: utils/misc/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "Grenze für Stacktiefe überschritten"
+
+#: utils/misc/stack_depth.c:102
+#, 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."
+
+#: utils/misc/stack_depth.c:149
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "»max_stack_depth« darf %zdkB nicht überschreiten."
+
+#: utils/misc/stack_depth.c:151
+#, 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."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -31035,57 +32444,57 @@ msgstr "Zeitzonenabkürzung »%s« ist zu lang (maximal %d Zeichen) in Zeitzonen
 msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr "Zeitzonenabstand %d ist außerhalb des gültigen Bereichs in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr "fehlende Zeitzonenabkürzung in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr "fehlender Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr "ungültige Zahl für Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "ungültige Syntax in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "Zeitzonenabkürzung »%s« ist mehrfach definiert"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
 msgstr "Eintrag in Zeitzonendatei »%s«, Zeile %d, steht im Konflikt mit Eintrag in Datei »%s«, Zeile %d."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "ungültiger Zeitzonen-Dateiname »%s«"
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "Rekursionsbeschränkung für Zeitzonendatei überschritten in Datei »%s«"
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "konnte Zeitzonendatei »%s« nicht lesen: %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "Zeile ist zu lang in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "@INCLUDE ohne Dateiname in Zeitzonendatei »%s«, Zeile %d"
@@ -31101,12 +32510,12 @@ msgstr "Fehler während der Erzeugung des Speicherkontexts »%s«."
 msgid "could not attach to dynamic shared area"
 msgstr "konnte nicht an dynamische Shared Area anbinden"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "Fehler bei Anfrage mit Größe %zu im Speicherkontext »%s«."
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "logge Speicherkontexte von PID %d"
@@ -31141,107 +32550,106 @@ msgstr "aktives Portal »%s« kann nicht gelöscht werden"
 msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
 msgstr "PREPARE kann nicht in einer Transaktion ausgeführt werden, die einen Cursor mit WITH HOLD erzeugt hat"
 
-#: utils/mmgr/portalmem.c:1229
+#: utils/mmgr/portalmem.c:1232
 #, c-format
 msgid "cannot perform transaction commands inside a cursor loop that is not read-only"
 msgstr "in einer Cursor-Schleife, die nicht nur liest, können keine Transaktionsbefehle ausgeführt werden"
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
-#, fuzzy, c-format
-#| msgid "could not seek to block %ld of temporary file"
-msgid "could not seek to block %lld of temporary file"
-msgstr "konnte Positionszeiger in temporärer Datei nicht auf Block %ld setzen"
+#, c-format
+msgid "could not seek to block %<PRId64> of temporary file"
+msgstr "konnte Positionszeiger in temporärer Datei nicht auf Block %<PRId64> setzen"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr "unerwarteter Chunk in temporärer Datei für Shared-Tuplestore"
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "konnte Positionszeiger in temporärer Datei für Shared-Tuplestore nicht auf Block %u setzen"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "ein externer Sortiervorgang kann nicht mehr als %d Durchgänge haben"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "konnte Unique Index »%s« nicht erstellen"
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "Schlüssel %s ist doppelt vorhanden."
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Es existieren doppelte Schlüssel."
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1320 utils/sort/tuplestore.c:1385
+#: utils/sort/tuplestore.c:1394
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "konnte Positionszeiger in temporärer Datei für Tuplestore nicht setzen"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "Die Quelltransaktion läuft nicht mehr."
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "aus einer Subtransaktion kann kein Snapshot exportiert werden"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "ungültige Snapshot-Daten in Datei »%s«"
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, 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:1402
+#: utils/time/snapmgr.c:1420
 #, 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:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "ungültiger Snapshot-Bezeichner: »%s«"
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "Snapshot »%s« existiert nicht"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, 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:1528
+#: utils/time/snapmgr.c:1546
 #, 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:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "kann keinen Snapshot aus einer anderen Datenbank importieren"
diff --git a/src/backend/po/es.po b/src/backend/po/es.po
index e2593b52271..93f873ce51a 100644
--- a/src/backend/po/es.po
+++ b/src/backend/po/es.po
@@ -64,8 +64,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL server 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:41+0000\n"
-"PO-Revision-Date: 2025-02-17 15:18+0100\n"
+"POT-Creation-Date: 2026-02-06 23:10+0000\n"
+"PO-Revision-Date: 2026-02-25 16:53+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -138,34 +138,34 @@ msgid "not recorded"
 msgstr "no registrado"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1739 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3831 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1353 access/transam/xlog.c:3477
-#: access/transam/xlog.c:4341 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5113
-#: replication/logical/snapbuild.c:2052 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1353 access/transam/xlog.c:3478
+#: access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257
+#: access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392
+#: access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3841 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2546
+#: replication/slot.c:2587 replication/walsender.c:643
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3482 access/transam/xlog.c:4346
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2057 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3483 access/transam/xlog.c:4374
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2550
+#: replication/slot.c:2591 replication/walsender.c:648
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -176,17 +176,18 @@ msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
 #: access/transam/timeline.c:512 access/transam/twophase.c:1365
-#: access/transam/twophase.c:1784 access/transam/xlog.c:3323
-#: access/transam/xlog.c:3517 access/transam/xlog.c:3522
-#: access/transam/xlog.c:3658 access/transam/xlog.c:4311
-#: access/transam/xlog.c:5246 commands/copyfrom.c:1799 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5165
-#: replication/logical/snapbuild.c:1819 replication/logical/snapbuild.c:1943
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/twophase.c:1783 access/transam/xlog.c:3324
+#: access/transam/xlog.c:3518 access/transam/xlog.c:3523
+#: access/transam/xlog.c:3659 access/transam/xlog.c:4339
+#: access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828
+#: storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -211,105 +212,107 @@ msgstr ""
 "directorio de datos."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1309 access/transam/xlog.c:3230
-#: access/transam/xlog.c:3393 access/transam/xlog.c:3432
-#: access/transam/xlog.c:3625 access/transam/xlog.c:4331
-#: access/transam/xlogrecovery.c:4264 access/transam/xlogrecovery.c:4367
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3766
-#: replication/logical/reorderbuffer.c:4320
-#: replication/logical/reorderbuffer.c:5093
-#: replication/logical/snapbuild.c:1774 replication/logical/snapbuild.c:1884
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2124
-#: utils/init/miscinit.c:1580 utils/init/miscinit.c:1714
-#: utils/init/miscinit.c:1791 utils/misc/guc.c:4777 utils/misc/guc.c:4827
+#: access/transam/twophase.c:1309 access/transam/xlog.c:3214
+#: access/transam/xlog.c:3394 access/transam/xlog.c:3433
+#: access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616
+#: replication/walsender.c:3094 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575
+#: storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1757 access/transam/twophase.c:1766
-#: access/transam/xlog.c:9280 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1756 access/transam/twophase.c:1765
+#: access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4127
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4105
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1778
-#: access/transam/xlog.c:3316 access/transam/xlog.c:3511
-#: access/transam/xlog.c:4304 access/transam/xlog.c:8655
-#: access/transam/xlog.c:8700 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1812
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1331 storage/smgr/md.c:1376
-#: storage/sync/sync.c:446 utils/misc/guc.c:4530
+#: access/transam/timeline.c:506 access/transam/twophase.c:1777
+#: access/transam/xlog.c:3314 access/transam/xlog.c:3512
+#: access/transam/xlog.c:4332 access/transam/xlog.c:8726
+#: access/transam/xlog.c:8770 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820
+#: storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:852 ../common/psprintf.c:143
-#: ../common/scram-common.c:268 ../common/stringinfo.c:314 ../port/path.c:828
-#: ../port/path.c:865 ../port/path.c:882 access/transam/twophase.c:1418
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3560 postmaster/postmaster.c:4021
-#: postmaster/postmaster.c:4383 postmaster/walsummarizer.c:935
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:210 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1465
-#: storage/ipc/procarray.c:2219 storage/ipc/procarray.c:2226
-#: storage/ipc/procarray.c:2731 storage/ipc/procarray.c:3435
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:532
-#: utils/adt/pg_locale.c:696 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4508 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2410 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1418
+#: access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3575
+#: postmaster/walsummarizer.c:938
+#: replication/libpqwalreceiver/libpqwalreceiver.c:364
+#: replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447
+#: storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517
+#: utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:402 utils/mb/mbutils.c:430
+#: utils/mb/mbutils.c:815 utils/mb/mbutils.c:842 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "éxito"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "el búfer de destino es demasiado pequeño"
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "falla de openSSL"
 
@@ -333,34 +336,34 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1723
-#: commands/copyto.c:654 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1589 storage/ipc/latch.c:1751
-#: storage/ipc/latch.c:1877
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783
+#: storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203
+#: storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:830 ../port/path.c:867
-#: ../port/path.c:884 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
@@ -370,51 +373,51 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3581
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1321
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1321
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1749
-#: commands/copyto.c:700 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:2173
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979
+#: commands/extension.c:3820 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1470
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1496
+#: storage/file/fd.c:2997 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3009
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1831 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:1027
+#: replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -423,122 +426,126 @@ msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
 msgid "internal error"
 msgstr "error interno"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "El parser recursivo descendiente no puede usar el lexer incremental."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "El parser incremental requiere el lexer incremental."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON anidado demasiado profundamente, profundidad máxima es 6400."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "La secuencia de escape «\\%.*s» no es válida."
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Los caracteres con valor 0x%02x deben ser escapados."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Se esperaba el fin de la entrada, se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Se esperaba un elemento de array o «]», se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Se esperaba «,» o «]», se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Se esperaba «:», se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Se esperaba un valor JSON, se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "La cadena de entrada terminó inesperadamente."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Se esperaba una cadena o «}», se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Se esperaba «,» o «}», se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Se esperaba una cadena, se encontró «%.*s»."
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "El elemento «%.*s» no es válido."
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 no puede ser convertido a text."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "«\\u» debe ser seguido por cuatro dígitos hexadecimales."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Los valores de escape Unicode no se pueden utilizar para valores de código superiores a 007F cuando la codificación no es UTF8."
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "El valor de escape Unicode no pudo ser traducido a la codificación del servidor %s."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, 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»."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Un «low-surrogate» Unicode debe seguir a un «high-surrogate»."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "memoria agotada mientras se construía una descripción de error"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -633,7 +640,7 @@ msgstr "no se pudo decodificar el nombre del archivo"
 msgid "file size is not an integer"
 msgstr "el tamaño del archivo no es un número entero"
 
-#: ../common/parse_manifest.c:699 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "algoritmo de suma de comprobación no reconocido: \"%s\""
@@ -702,9 +709,9 @@ msgstr "no se pudo analizar el manifiesto de la copia de seguridad: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4712 utils/misc/guc.c:6931
-#: utils/misc/guc.c:6972
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "valor no válido para el parámetro «%s»: «%s»"
@@ -765,22 +772,22 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "no se pudo obtener el código de salida del subproceso»: código de error %lu"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1717 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4589
-#: replication/logical/snapbuild.c:1712 replication/logical/snapbuild.c:2146
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1716 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 backup/walsummary.c:254
+#: postmaster/postmaster.c:1069 postmaster/syslogger.c:1489
+#: replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo «%s»: %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3435
+#: storage/file/fd.c:3844
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "no se pudo eliminar el directorio «%s»: %m"
@@ -797,19 +804,24 @@ msgstr "no se pudo codificar la llave almacenada"
 msgid "could not encode server key"
 msgstr "no se pudo codificar la llave del servidor"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "el tamaño del búfer de cadena excede el máximo permitido (%zu)"
+
+#: ../common/stringinfo.c:363
 #, c-format
 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."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
 msgid ""
-"out of memory\n"
+"string buffer exceeds maximum allowed length (%zu bytes)\n"
 "\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
 msgstr ""
-"memoria agotada\n"
+"el tamaño del búfer de cadena excede el máximo permitido (%zu)\n"
 "\n"
 "No se puede agrandar el búfer de cadena que ya tiene %d bytes en %d bytes adicionales.\n"
 
@@ -818,7 +830,7 @@ msgstr ""
 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:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "usuario no existe"
 
@@ -857,12 +869,12 @@ msgstr "el proceso hijo fue terminado por una señal %d: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código %d no reconocido"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, 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:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, 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»"
@@ -887,30 +899,30 @@ msgstr "no se pudo obtener junction para «%s»: %s"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "no se pudo obtener junction para «%s»: %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "no se pudo abrir el archivo «%s»: %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "infracción de bloqueo (locking violation)"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "infracción de uso compartido (sharing violation)"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "Reintentando durante 30 segundos."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 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:852
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "no se pudo obtener el directorio de trabajo actual: %m\n"
@@ -920,16 +932,6 @@ msgstr "no se pudo obtener el directorio de trabajo actual: %m\n"
 msgid "operating system error %d"
 msgstr "error %d de sistema operativo"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "no se pudo buscar el usuario local de ID %d: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "no existe un usuario local con ID %d"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -945,48 +947,50 @@ msgstr "no se pudo obtener el SID del grupo PowerUsers: código de error %lu\n"
 msgid "could not check access token membership: error code %lu\n"
 msgstr "no se pudo verificar el token de proceso: código de error %lu\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "petición para sumarización BRIN de rango para el índice «%s» página %u no fue registrada"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:936
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "la recuperación está en proceso"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "Las funciones de control de BRIN no pueden ejecutarse durante la recuperación."
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "número de bloque fuera de rango: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "número de bloque fuera de rango: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "«%s» no es un índice BRIN"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "no se pudo abrir la tabla padre del índice «%s»"
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2277
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "el índice «%s» no es válido"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -997,7 +1001,7 @@ msgstr "no se puede aceptar un valor de tipo %s"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -1013,90 +1017,90 @@ msgstr "índice BRIN corrompido: mapa de rango inconsistente"
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "tipo de página 0x%04X inesperado en el índice BRIN «%s» bloque %u"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with invalid support number %d"
 msgstr "familia de operadores «%s» de método de acceso %s contiene la función %s con número de soporte %d no válido"
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d"
 msgstr "familia de operadores «%s» de método de acceso %s contiene la función %s con signatura incorrecta para el número de soporte %d"
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d"
 msgstr "familia de operadores «%s» de método de acceso %s contiene el operador %s con número de estrategia %d no válido"
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid "operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s"
 msgstr "familia de operadores «%s» de método de acceso %s contiene especificación ORDER BY no válida para el operador %s"
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with wrong signature"
 msgstr "familia de operadores «%s» de método de acceso %s contiene el operador %s con signatura incorrecta"
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing operator(s) for types %s and %s"
 msgstr "el/los operador(es) para los tipos %3$s y %4$s faltan de la familia de operadores «%1$s» de método de acceso %2$s"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function(s) for types %s and %s"
 msgstr "la(s) función/funciones de soporte para los tipos %3$s y %4$s faltan de la familia de operadores «%1$s» de método de acceso %2$s"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "faltan operadores de la clase de operadores «%s» del método de acceso %s"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "falta la función de soporte %3$d de la clase de operadores «%1$s» del método de acceso %2$s"
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "El tipo retornado %s no coincide con el tipo de registro esperado %s en la columna %d."
+msgid "Returned type %s does not match expected type %s in column \"%s\" (position %d)."
+msgstr "El tipo retornado %s no coincide con el tipo de esperado %s en la columna «%s» (posición %d)."
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "La cantidad de columnas retornadas (%d) no coincide con la cantidad esperada de columnas (%d)."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "no se pudo convertir el tipo de registro"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, 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 con el atributo correspondiente de tipo %s."
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, 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/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "el número de columnas (%d) excede el límite (%d)"
@@ -1106,96 +1110,101 @@ msgstr "el número de columnas (%d) excede el límite (%d)"
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "el número de columnas del índice (%d) excede el límite (%d)"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 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:292 commands/explain.c:5376 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1956
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "código de formato no soportado: %d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "Los valores aceptables son «on», «off» y «auto»."
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Los valores aceptables son «local» y «cascaded»."
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "el límite de tipos de parámetros de relación definidos por el usuario ha sido excedido"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "RESET no debe incluir valores de parámetros"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "espacio de nombre de parámetro «%s» no reconocido"
 
-#: access/common/reloptions.c:1300 commands/variable.c:1214
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "nombre de opción «%s» no válido: no debe contener «=»"
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "las tablas declaradas WITH OIDS no están soportadas"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "parámetro «%s» no reconocido"
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "el parámetro «%s» fue especificado más de una vez"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "valor no válido para la opción booleana «%s»: «%s»"
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "valor no válido para la opción entera «%s»: «%s»"
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "el valor %s está fuera del rango de la opción «%s»"
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Los valores aceptables están entre «%d» y «%d»."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "valor no válido para la opción de coma flotante «%s»: «%s»"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Valores aceptables están entre «%f» y «%f»."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "valor no válido para la opción enum «%s»: %s"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "no se puede especificar parámetros de almacenamiento para una tabla particionada"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "Especifique parámetros de almacenamiento para sus particiones hijas en su lugar."
@@ -1240,52 +1249,53 @@ msgstr "no se pueden acceder índices temporales de otras sesiones"
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "no se pudo volver a encontrar la tupla dentro del índice «%s»"
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963
+#: utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726
+#: utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
+#, 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"
+
+#: access/gin/ginscan.c:480
 #, 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:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Para corregir esto, ejecute REINDEX INDEX \"%s\"."
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2200
-#: utils/adt/arrayfuncs.c:4016 utils/adt/arrayfuncs.c:6712
-#: utils/adt/rowtypes.c:974
-#, 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"
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid "operator family \"%s\" of access method %s contains support function %s with different left and right input types"
 msgstr "la familia de operadores «%s» del método de acceso %s contiene el procedimiento de soporte %s registrado entre tipos distintos"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d or %d"
 msgstr "falta la función de soporte %3$d o %4$d de la clase de operadores «%1$s» del método de accesso %2$s"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "el número de función de soporte %d no es válido para el método de acceso %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "el índice «%s» contiene una tupla interna marcada como no válida"
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "Esto es causado por una división de página incompleta durante una recuperación antes de actualizar a PostgreSQL 9.1."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1293,7 +1303,7 @@ msgstr "Esto es causado por una división de página incompleta durante una recu
 msgid "Please REINDEX it."
 msgstr "Por favor aplíquele REINDEX."
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "arreglando división incompleta en el índice «%s», bloque %u"
@@ -1308,41 +1318,42 @@ msgstr "el método picksplit para la columna %d del índice «%s» falló"
 msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
 msgstr "El índice no es óptimo.  Para optimizarlo, contacte un desarrollador o trate de usar la columna en segunda posición en la orden CREATE INDEX."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "índice «%s» contiene páginas vacías no esperadas en el bloque %u"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "el índice «%s» contiene una página corrupta en el bloque %u"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid "operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s"
 msgstr "la familia de operadores «%s» del método de acceso %s contiene una especificación ORDER BY no soportada para el operador %s"
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid "operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s"
 msgstr "la familia de operadores «%s» del método de acceso %s contiene una especificación de familia en ORDER BY incorrecta para el operador %s"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:333
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1065
+#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:332
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "no se pudo determinar qué ordenamiento usar para el hashing de cadenas"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:334 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:508
-#: commands/indexcmds.c:2021 commands/tablecmds.c:18178 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1066 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:688
+#: catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655
+#: utils/adt/formatting.c:1719 utils/adt/formatting.c:1783
+#: utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1603
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Use la cláusula COLLATE para establecer el ordenamiento explícitamente."
@@ -1353,7 +1364,7 @@ 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:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "Valores mayores a una página del buffer no pueden ser indexados."
@@ -1368,7 +1379,7 @@ msgstr "número no válido de bloque de «overflow» %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "se agotaron las páginas de desbordamiento en el índice hash «%s»"
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "los índices hash no soportan recorridos del índice completo"
@@ -1383,54 +1394,54 @@ msgstr "el índice «%s» no es un índice hash"
 msgid "index \"%s\" has wrong hash version"
 msgstr "el índice «%s» tiene una versión de hash incorrecta"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid "operator family \"%s\" of access method %s lacks support function for operator %s"
 msgstr "la familia de operadores «%s» del método de acceso %s no tiene función de soporte para el operador %s"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "faltan operadores entre tipos en la familia de operadores «%s» del método de acceso %s"
 
-#: access/heap/heapam.c:2206
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "no se pueden insertar tuplas en un ayudante paralelo"
 
-#: access/heap/heapam.c:2725
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "no se pueden eliminar tuplas durante una operación paralela"
 
-#: access/heap/heapam.c:2772
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "se intentó eliminar una tupla invisible"
 
-#: access/heap/heapam.c:3220 access/heap/heapam.c:6501 access/index/genam.c:818
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "no se pueden actualizar tuplas durante una operación paralela"
 
-#: access/heap/heapam.c:3397
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "se intentó actualizar una tupla invisible"
 
-#: access/heap/heapam.c:4908 access/heap/heapam.c:4946
-#: access/heap/heapam.c:5211 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031
+#: access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "no se pudo bloquear un “lock” en la fila de la relación «%s»"
 
-#: access/heap/heapam.c:6314 commands/trigger.c:3340
-#: executor/nodeModifyTable.c:2376 executor/nodeModifyTable.c:2467
+#: access/heap/heapam.c:6425 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, 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"
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update"
 msgstr "el registro a ser bloqueado ya fue movido a otra partición por un update concurrente"
@@ -1447,14 +1458,14 @@ msgstr "no se pudo escribir al archivo «%s», se escribió %d de %d: %m"
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3255 access/transam/xlog.c:3446
-#: access/transam/xlog.c:4283 access/transam/xlog.c:9269
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:340 postmaster/postmaster.c:4114
-#: postmaster/walsummarizer.c:1212 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3239 access/transam/xlog.c:3447
+#: access/transam/xlog.c:4311 access/transam/xlog.c:9329
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4092
+#: postmaster/walsummarizer.c:1215 replication/logical/origin.c:626
+#: replication/slot.c:2360 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
@@ -1466,162 +1477,177 @@ msgstr "no se pudo truncar el archivo «%s» a %u: %m"
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3305 access/transam/xlog.c:3502
-#: access/transam/xlog.c:4295 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:351 postmaster/launch_backend.c:363
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1788
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1655
-#: utils/init/miscinit.c:1666 utils/init/miscinit.c:1674 utils/misc/guc.c:4491
-#: utils/misc/guc.c:4522 utils/misc/guc.c:5675 utils/misc/guc.c:5693
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3300 access/transam/xlog.c:3503
+#: access/transam/xlog.c:4323 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2396 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "haciendo vacuum agresivamente a «%s.%s.%s»"
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "haciendo vacuum a «%s.%s.%s»"
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "se terminó el vacuum de «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "vacuum agresivo automático para prevenir wraparound de la tabla «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "vacuum automático para prevenir wraparound de la tabla «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "vacuum agresivo automático de la tabla «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "vacuum automático de la tabla «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
-msgstr "páginas: %u eliminadas, %u quedan, %u recorridas (%.2f%% del total)\n"
+msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
+msgstr "páginas: %u eliminadas, %u quedan, %u recorridas (%.2f%% del total), %u recorridas ávidamente\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
-msgid "tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
-msgstr "tuplas: %lld eliminadas, %lld permanecen, %lld están muertas pero aún no se pueden quitar\n"
+msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
+msgstr "tuplas: %<PRId64> eliminadas, %<PRId64> permanecen, %<PRId64> están muertas pero aún no se pueden quitar\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
-msgid "tuples missed: %lld dead from %u pages not removed due to cleanup lock contention\n"
-msgstr "tuplas faltantes: %lld muertas en %u páginas no eliminadas debido a contención del lock de limpieza\n"
+msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
+msgstr "tuplas faltantes: %<PRId64> muertas en %u páginas no eliminadas debido a contención del lock de limpieza\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "punto de corte de eliminación: %u, que era %d XIDs de antiguo cuando la operación terminó\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "nuevo relfrozenxid: %u, que está %d XIDs más adelante del valor anterior\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "nuevo relminmxid: %u, que está %d MXIDs más adelante del valor anterior\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
+#, c-format
+msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
+msgstr "congelado: %u páginas de la tabla (%.2f%% del total) tuvieron %<PRId64> tuplas congeladas\n"
+
+#: access/heap/vacuumlazy.c:1062
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
-msgstr "congelado: %u páginas de la tabla (%.2f%% del total) tuvieron %lld tuplas congeladas\n"
+msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
+msgstr "mapa de visibilidad: %u páginas definidas “all-visible”, %u páginas definidas “all-frozen” (%u eran “all-visible”)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "recorrido de índice no necesario: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "recorrido de índice necesario: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
-msgid "%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"
-msgstr "en %u páginas de la tabla (%.2f%% del total) se eliminaron %lld identificadores de elementos muertos\n"
+msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
+msgstr "en %u páginas de la tabla (%.2f%% del total) se eliminaron %<PRId64> identificadores de elementos muertos\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "recorrido de índice pasado por alto: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "recorrido de índice pasado por alto debido a modo failsafe: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
-msgstr "%u páginas de la tabla (%.2f%% del total) tienen %lld identificadores de elementos muertos\n"
+msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
+msgstr "%u páginas de la tabla (%.2f%% del total) tienen %<PRId64> identificadores de elementos muertos\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "índice «%s»: páginas: %u en total, %u recientemente eliminadas, %u eliminadas hasta ahora, %u reusables\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "tiempo de retardo: %.3f ms\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "tiempos de E/S: lectura: %.3f ms, escritura: %.3f ms\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:797
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "tasa lectura promedio: %.3f MB/s, tasa escritura promedio: %.3f MB/s\n"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:799
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
-msgstr "uso de búfers: %lld aciertos, %lld fallos, %lld ensuciados\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
+msgstr "uso de búfers: %<PRId64> aciertos, %<PRId64> fallos, %<PRId64> ensuciados\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
-msgstr "uso de WAL: %lld registros, %lld imágenes de página completa, %llu bytes\n"
+msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
+msgstr "uso de WAL: %<PRId64> registros, %<PRId64> imágenes de página completa, %<PRIu64> bytes, %<PRId64> búfers llenos\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:803
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "uso de sistema: %s"
 
-#: access/heap/vacuumlazy.c:2170
+#: access/heap/vacuumlazy.c:1432
+#, fuzzy, c-format
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
+msgstr "inhabilitando el recorrido “eager” después de hacer “freeze” en %u bloques recorridos “eagerly” de la relación «%s.%s.%s»"
+
+#: access/heap/vacuumlazy.c:2821
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
-msgstr "tabla «%s»: se eliminaron %lld identificadores de elementos muertos en %u páginas"
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
+msgstr "tabla «%s»: se eliminaron %<PRId64> identificadores de elementos muertos en %u páginas"
 
-#: access/heap/vacuumlazy.c:2324
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "pasando por alto el mantenimiento no esencial de la tabla «%s.%s.%s» como mecanismo de seguridad (failsafe) luego de %d recorridos de índice"
 
-#: access/heap/vacuumlazy.c:2327
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "El relfrozenxid o el relminmxid de la tabla es demasiado antiguo."
 
-#: access/heap/vacuumlazy.c:2328
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
@@ -1630,67 +1656,67 @@ msgstr ""
 "Considere incrementar el parámetro de configuración «maintenance_work_mem» o «autovacuum_work_mem».\n"
 "Es probable que también deba considerar otras formas para que VACUUM pueda mantener el paso de la asignación de IDs de transacción."
 
-#: access/heap/vacuumlazy.c:2590
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "«%s»: suspendiendo el truncado debido a una petición de “lock” en conflicto"
 
-#: access/heap/vacuumlazy.c:2660
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "tabla «%s»: truncadas %u a %u páginas"
 
-#: access/heap/vacuumlazy.c:2722
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "tabla «%s»: suspendiendo el truncado debido a una petición de bloqueo en conflicto"
 
-#: access/heap/vacuumlazy.c:2841
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "desactivando el comportamiento paralelo de vacuum en «%s» --- no se puede hacer vacuum de tablas temporales en paralelo"
 
-#: access/heap/vacuumlazy.c:3108
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "recorriendo el bloque %u posición %u de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3111
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "recorriendo el bloque %u de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3115
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "recorriendo la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3123
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "haciendo «vacuum» al bloque %u posición %u de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3126
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "haciendo «vacuum» al bloque %u de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3130
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "mientras se hacía «vacuum» a la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3135 commands/vacuumparallel.c:1112
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "mientras se hacía «vacuum» al índice «%s» de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1118
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "mientras se limpiaba el índice «%s» de la relación «%s.%s»"
 
-#: access/heap/vacuumlazy.c:3146
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "error mientras se truncaba la relación «%s.%s» a %u bloques"
@@ -1705,24 +1731,24 @@ msgstr "el método de acceso «%s» no es de tipo %s"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "el método de acceso «%s» no tiene manejador"
 
-#: access/index/genam.c:489
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "transacción abortada durante recorrido de catálogos de sistema"
 
-#: access/index/genam.c:657 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "no se puede acceder el índice «%s» mientras está siendo reindexado"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2851 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17873 commands/tablecmds.c:19762
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "«%s» no es un índice"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "clase de operadores «%s» no tiene opciones"
@@ -1743,7 +1769,7 @@ 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/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2323
+#: parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "el índice «%s» no es un btree"
@@ -1763,17 +1789,17 @@ msgstr "el índice «%s» contiene una página interna parcialmente muerta"
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "Esto puede ser causado por la interrupción de un VACUUM en la versión 9.3 o anteriores, antes de actualizar. Ejecute REINDEX por favor."
 
-#: access/nbtree/nbtutils.c:5108
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "el tamaño de fila de índice %1$zu excede el máximo %3$zu para btree versión %2$u para el índice «%4$s»"
 
-#: access/nbtree/nbtutils.c:5114
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "La tupla de índice hace referencia a la tupla (%u,%u) en la relación «%s»."
 
-#: access/nbtree/nbtutils.c:5118
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1782,58 +1808,58 @@ msgstr ""
 "Valores mayores a 1/3 de la página del buffer no pueden ser indexados.\n"
 "Considere un índice sobre una función que genere un hash MD5 del valor, o utilice un esquema de indexación de texto completo."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "falta una función de soporte para los tipos %3$s y %4$s en la familia de operadores «%1$s» del método de acceso %2$s"
 
 #: access/sequence/sequence.c:75 access/table/table.c:145
-#: optimizer/util/plancat.c:144
+#: optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "no se puede abrir la relación «%s»"
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid "compress method must be defined when leaf type is different from input type"
 msgstr "método «compress» debe estar definido cuando el tipo hoja es distinto del tipo de entrada"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "el tamaño de tupla interna SP-GiST %zu excede el máximo %zu"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr "el tipo de dato hoja SP-GiST %s no coincide con el tipo declarado %s"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "falta la función de soporte %3$d para el tipo %4$s de la clase de operadores «%1$s» del método de accesso %2$s"
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "el tid (%u, %u) no es válido para la relación «%s»"
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "«%s» no puede ser vacío."
 
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4859
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "«%s» es demasiado largo (máximo %d caracteres)."
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "no existe el método de acceso de tabla «%s»"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "No existe el método de acceso de tabla «%s»."
@@ -1863,13 +1889,13 @@ msgstr "Asegúrese que el parámetro de configuración «%s» esté definido en
 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:1091
+#: access/transam/multixact.c:1179
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "la base de datos no está aceptando órdenes que asignen nuevos MultiXactIds para evitar pérdida de datos debido al “wraparound” en la base de datos «%s»"
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188
+#: access/transam/multixact.c:1212 access/transam/multixact.c:1221
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
@@ -1879,65 +1905,70 @@ msgstr ""
 "Ejecute VACUUM de la base completa en esa base de datos.\n"
 "Puede que además necesite comprometer o abortar transacciones preparadas antiguas, o eliminar slots de replicación añejos."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1186
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "la base de datos no está aceptando órdenes que asignen nuevos MultiXactIds para evitar pérdida de datos debido al “wraparound” en la base con OID %u"
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, 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:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, 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] "base de datos con OID %u debe ser limpiada antes de que %u más MultiXactId sea usado"
 msgstr[1] "base de datos con OID %u debe ser limpiada antes de que %u más MultiXactIds sean usados"
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "límite de miembros de multixact alcanzado"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1281
 #, 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] "Esta orden crearía un multixact con %u miembros, pero el espacio que queda sólo sirve para %u miembro."
 msgstr[1] "Esta orden crearía un multixact con %u miembros, pero el espacio que queda sólo sirve para %u miembros."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1286
 #, 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 "Ejecute un VACUUM de la base completa en la base de datos con OID %u con «vacuum_multixact_freeze_min_age» y «vacuum_multixact_freeze_table_age» reducidos."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1317
 #, c-format
 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:1231
+#: access/transam/multixact.c:1322
 #, 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:1371
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "el MultiXactId %u ya no existe -- “wraparound” aparente"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "el MultiXactId %u no se ha creado aún -- “wraparound” aparente"
 
-#: access/transam/multixact.c:2479 access/transam/multixact.c:2488
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "el MultiXact %u tiene un siguiente offset no válido"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
@@ -1946,61 +1977,67 @@ msgstr ""
 "Para evitar fallos de asignación de MultiXactId, ejecute VACUUM en esa base de datos.\n"
 "Puede que además necesite comprometer o abortar transacciones preparadas antiguas, o eliminar slots de replicación añejos."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2845
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "las protecciones de “wraparound” de multixact están inhabilitadas porque el multixact más antiguo %u en checkpoint no existe en disco"
 
-#: access/transam/multixact.c:2789
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "las protecciones de “wraparound” de miembros de multixact están habilitadas"
 
-#: access/transam/multixact.c:3180
+#: access/transam/multixact.c:3258
 #, 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, omitiendo el truncado"
 
-#: access/transam/multixact.c:3198
+#: access/transam/multixact.c:3276
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "no se puede truncar hasta el MultiXact %u porque no existe en disco, omitiendo el truncado"
 
-#: access/transam/multixact.c:3517
+#: access/transam/multixact.c:3293
+#, fuzzy, c-format
+#| msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
+msgid "cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation"
+msgstr "no se puede truncar hasta el MultiXact %u porque no existe en disco, omitiendo el truncado"
+
+#: access/transam/multixact.c:3638
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "el MultiXactId no es válido: %u"
 
-#: access/transam/parallel.c:748 access/transam/parallel.c:867
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "el ayudante paralelo no pudo iniciar"
 
-#: access/transam/parallel.c:749 access/transam/parallel.c:868
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "Puede haber más detalles disponibles en el log del servidor."
 
-#: access/transam/parallel.c:929
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster terminó durante una transacción paralela"
 
-#: access/transam/parallel.c:1116
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "se ha perdido la conexión al ayudante paralelo"
 
-#: access/transam/parallel.c:1172 access/transam/parallel.c:1174
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "ayudante paralelo"
 
-#: access/transam/parallel.c:1344 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, 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:1349 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "número mágico no válido en segmento de memoria compartida dinámica"
@@ -2063,63 +2100,63 @@ msgstr "se registró el gestor de recursos «%s» con ID %d"
 
 #: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
-msgstr "«%s» debe ser múltiple de %d"
+msgid "\"%s\" must be a multiple of %d."
+msgstr "«%s» debe ser múltiple de %d."
 
-#: access/transam/slru.c:830
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "el archivo «%s» no existe, leyendo como ceros"
 
-#: access/transam/slru.c:1059 access/transam/slru.c:1065
-#: access/transam/slru.c:1073 access/transam/slru.c:1078
-#: access/transam/slru.c:1085 access/transam/slru.c:1090
-#: access/transam/slru.c:1097 access/transam/slru.c:1104
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "no se pudo encontrar el estado de la transacción %u"
 
-#: access/transam/slru.c:1060
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "No se pudo abrir el archivo «%s»: %m."
 
-#: access/transam/slru.c:1066
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "No se pudo posicionar (seek) en el archivo «%s» a la posición %d: %m."
 
-#: access/transam/slru.c:1074
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "No se pudo leer desde el archivo «%s» en la posición %d: %m."
 
-#: access/transam/slru.c:1079
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "No se pudo leer desde el archivo «%s» en la posición %d: se leyeron muy pocos bytes."
 
-#: access/transam/slru.c:1086
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "No se pudo escribir al archivo «%s» en la posición %d: %m."
 
-#: access/transam/slru.c:1091
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "No se pudo escribir al archivo «%s» en la posición %d: se escribieron muy pocos bytes."
 
-#: access/transam/slru.c:1098
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "No se pudo sincronizar (fsync) archivo «%s»: %m."
 
-#: access/transam/slru.c:1105
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "No se pudo cerrar el archivo «%s»: %m."
 
-#: access/transam/slru.c:1431
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "no se pudo truncar el directorio «%s»: “wraparound” aparente"
@@ -2184,12 +2221,12 @@ msgstr "Defina «max_prepared_transactions» a un valor distinto de cero."
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "identificador de transacción «%s» ya está siendo utilizado"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2531
+#: access/transam/twophase.c:404 access/transam/twophase.c:2530
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "se alcanzó el número máximo de transacciones preparadas"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2532
+#: access/transam/twophase.c:405 access/transam/twophase.c:2531
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr "Incremente «max_prepared_transactions» (actualmente es %d)."
@@ -2261,9 +2298,9 @@ msgstr "tamaño no válido en archivo «%s»"
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "la suma de verificación calculada no coincide con el valor almacenado en el archivo «%s»"
 
-#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:936 replication/logical/logical.c:211
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572
+#: postmaster/walsummarizer.c:939 replication/logical/logical.c:213
+#: replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "Falló mientras se emplazaba un procesador de lectura de WAL."
@@ -2283,64 +2320,64 @@ msgstr "no se pudo leer el archivo de estado de dos fases desde WAL en %X/%X"
 msgid "expected two-phase state data is not present in WAL at %X/%X"
 msgstr "los datos de estado de dos fases esperados no están presentes en WAL en %X/%X"
 
-#: access/transam/twophase.c:1745
+#: access/transam/twophase.c:1744
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "no se pudo recrear archivo «%s»: %m"
 
-#: access/transam/twophase.c:1872
+#: access/transam/twophase.c:1871
 #, c-format
 msgid "%u two-phase state file was written for a long-running prepared transaction"
 msgid_plural "%u two-phase state files were written for long-running prepared transactions"
 msgstr[0] "%u archivo de estado de dos fases fue escrito para transacción de larga duración"
 msgstr[1] "%u archivos de estado de dos fases fueron escritos para transacciones de larga duración"
 
-#: access/transam/twophase.c:2107
+#: access/transam/twophase.c:2106
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "recuperando transacción preparada %u desde memoria compartida"
 
-#: access/transam/twophase.c:2200
+#: access/transam/twophase.c:2199
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "eliminando archivo obsoleto de estado de dos fases para transacción %u"
 
-#: access/transam/twophase.c:2207
+#: access/transam/twophase.c:2206
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr "eliminando de memoria estado de dos fases obsoleto para transacción %u"
 
-#: access/transam/twophase.c:2220
+#: access/transam/twophase.c:2219
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "eliminando archivo futuro de estado de dos fases para transacción %u"
 
-#: access/transam/twophase.c:2227
+#: access/transam/twophase.c:2226
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "eliminando estado de dos fases futuro de memoria para transacción %u"
 
-#: access/transam/twophase.c:2252
+#: access/transam/twophase.c:2251
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "archivo de estado de dos fases corrupto para transacción %u"
 
-#: access/transam/twophase.c:2257
+#: access/transam/twophase.c:2256
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "estado de dos fases en memoria corrupto para transacción %u"
 
-#: access/transam/twophase.c:2514
+#: access/transam/twophase.c:2513
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "no se pudo recuperar el archivo de estado de dos fases para la transacción %u"
 
-#: access/transam/twophase.c:2516
+#: access/transam/twophase.c:2515
 #, c-format
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr "El archivo de estado en dos fases ha sido encontrado en el registro de WAL %X/%X, pero esta transacción ya ha sido restaurada desde disco."
 
-#: access/transam/twophase.c:2524 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "no se pudo acceder al archivo «%s»: %m"
@@ -2384,584 +2421,530 @@ msgstr ""
 "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, o eliminar slots de replicación añejos."
 
-#: access/transam/xact.c:649
+#: access/transam/xact.c:652
 #, c-format
 msgid "cannot assign transaction IDs during a parallel operation"
 msgstr "no se puede asignar IDs de transacción durante una operación paralela"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "no se pueden modificar datos en un proceso ayudante paralelo"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "no se puede iniciar órdenes durante una operación paralela"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "no se pueden tener más de 2^32-2 órdenes en una transacción"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "se superó el número máximo de subtransacciones comprometidas (%d)"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr "no se puede hacer PREPARE de una transacción que ha operado en objetos temporales"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, 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:3593
+#: access/transam/xact.c:3657
 #, 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:3603
+#: access/transam/xact.c:3667
 #, 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:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s no puede ser ejecutado en un “pipeline”"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s no puede ser ejecutado desde una función"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, 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:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "ya hay una transacción en curso"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "no hay una transacción en curso"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "no se puede comprometer una transacción durante una operación paralela"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "no se puede abortar durante una operación paralela"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "no se pueden definir savepoints durante una operación paralela"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "no se pueden liberar savepoints durante una operación paralela"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "no existe el «savepoint» «%s»"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr "el «savepoint» «%s» no existe dentro del nivel de savepoint actual"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "no se puede hacer rollback a un savepoint durante una operación paralela"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, 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:1542
+#: access/transam/xlog.c:1544
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr "petición para sincronizar (flush) más allá del final del WAL generado; petición %X/%X, posición actual %X/%X"
 
-#: access/transam/xlog.c:1769
+#: access/transam/xlog.c:1771
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr "no se puede ler más allá del final del WAL generado; petición %X/%X, posición actual %X/%X"
 
-#: access/transam/xlog.c:2210 access/transam/xlog.c:4501
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "El tamaño de segmento de WAL debe ser una potencia de dos entre 1 MB y 1 GB."
 
-#: access/transam/xlog.c:2228
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "«%s» debe ser establecido a -1 durante el modo de actualización binaria."
-
-#: access/transam/xlog.c:2477
+#: access/transam/xlog.c:2454
 #, 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:3739 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820
+#: replication/walsender.c:3088
 #, 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:4061
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "no se pudo renombrar el archivo «%s»: %m"
 
-#: access/transam/xlog.c:4104 access/transam/xlog.c:4115
-#: access/transam/xlog.c:4136
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116
+#: access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "no existe el directorio WAL «%s»"
 
-#: access/transam/xlog.c:4121 access/transam/xlog.c:4142
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "creando el directorio WAL faltante «%s»"
 
-#: access/transam/xlog.c:4125 access/transam/xlog.c:4145
-#: commands/dbcommands.c:3262
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146
+#: commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "no se pudo crear el directorio faltante «%s»: %m"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "no se pudo generar un token de autorización secreto"
 
-#: access/transam/xlog.c:4363 access/transam/xlog.c:4373
-#: access/transam/xlog.c:4399 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4415 access/transam/xlog.c:4421
-#: access/transam/xlog.c:4429 access/transam/xlog.c:4437
-#: access/transam/xlog.c:4445 access/transam/xlog.c:4453
-#: access/transam/xlog.c:4461 access/transam/xlog.c:4469
-#: access/transam/xlog.c:4479 access/transam/xlog.c:4487
-#: utils/init/miscinit.c:1812
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4437
+#: access/transam/xlog.c:4447 access/transam/xlog.c:4453
+#: access/transam/xlog.c:4463 access/transam/xlog.c:4473
+#: access/transam/xlog.c:4483 access/transam/xlog.c:4493
+#: access/transam/xlog.c:4503 access/transam/xlog.c:4513
+#: access/transam/xlog.c:4525 access/transam/xlog.c:4533
+#: utils/init/miscinit.c:1818
 #, 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:4364
+#: access/transam/xlog.c:4392
 #, 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:4368
+#: access/transam/xlog.c:4396
 #, 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:4374
+#: access/transam/xlog.c:4402
 #, 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:4377 access/transam/xlog.c:4403
-#: access/transam/xlog.c:4411 access/transam/xlog.c:4417
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433
+#: access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Parece que necesita ejecutar initdb."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4417
 #, 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:4400
-#, 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:4408
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439
+#: access/transam/xlog.c:4455 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4475 access/transam/xlog.c:4485
+#: access/transam/xlog.c:4495 access/transam/xlog.c:4505
+#: access/transam/xlog.c:4515
 #, 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."
+msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
+msgstr "Los archivos de base de datos fueron inicializados con %s %d, pero el servidor fue compilado con %s %d."
 
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4448
 #, 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:4422
-#, 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:4425 access/transam/xlog.c:4433
-#: access/transam/xlog.c:4441 access/transam/xlog.c:4449
-#: access/transam/xlog.c:4457 access/transam/xlog.c:4465
-#: access/transam/xlog.c:4473 access/transam/xlog.c:4482
-#: access/transam/xlog.c:4490
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469
+#: access/transam/xlog.c:4479 access/transam/xlog.c:4489
+#: access/transam/xlog.c:4499 access/transam/xlog.c:4509
+#: access/transam/xlog.c:4519 access/transam/xlog.c:4528
+#: access/transam/xlog.c:4536
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Parece que necesita recompilar o ejecutar initdb."
 
-#: access/transam/xlog.c:4430
-#, 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:4438
-#, 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:4446
-#, 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:4454
-#, 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:4462
-#, 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:4470
-#, 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:4480
+#: access/transam/xlog.c:4526
 #, 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:4488
+#: access/transam/xlog.c:4534
 #, 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:4497
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "tamaño de segmento de WAL no válido (%d byte) en archivo de control"
 msgstr[1] "tamaño de segmento de WAL no válido (%d bytes) en archivo de control"
 
-#: access/transam/xlog.c:4510
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "«min_wal_size» debe ser al menos el doble de «wal_segment_size»"
-
-#: access/transam/xlog.c:4514
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "«max_wal_size» debe ser al menos el doble de «wal_segment_size»"
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "«%s» debe ser al menos el doble que «%s»"
 
-#: access/transam/xlog.c:4662 catalog/namespace.c:4696
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 tcop/postgres.c:3715 utils/error/elog.c:2247
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699
+#: commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72
+#: replication/slot.c:2768 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "La sintaxis de lista no es válida."
 
-#: access/transam/xlog.c:4708 commands/user.c:2545 commands/variable.c:173
-#: tcop/postgres.c:3731 utils/error/elog.c:2273
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173
+#: tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Palabra clave no reconocida: «%s»."
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "no se pudo escribir el archivo WAL de boostrap: %m"
 
-#: access/transam/xlog.c:5137
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "no se pudo sincronizar (fsync) el archivo de WAL de bootstrap: %m"
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "no se pudo cerrar el archivo WAL de bootstrap: %m"
 
-#: access/transam/xlog.c:5368
+#: access/transam/xlog.c:5433
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "el WAL fue generado con «wal_level=minimal», no se puede continuar con la recuperación"
 
-#: access/transam/xlog.c:5369
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "Esto sucede si temporalmente define «wal_level=minimal» en el servidor."
 
-#: access/transam/xlog.c:5370
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "Utilice un respaldo tomado después de establecer «wal_level» a un valor superior a «minimal»."
 
-#: access/transam/xlog.c:5435
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "el archivo de control contiene una ubicación no válida de checkpoint"
 
-#: access/transam/xlog.c:5446
+#: access/transam/xlog.c:5511
 #, 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:5452
+#: access/transam/xlog.c:5517
 #, 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:5458
+#: access/transam/xlog.c:5523
 #, 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:5464
+#: access/transam/xlog.c:5529
 #, 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:5466
+#: access/transam/xlog.c:5531
 #, 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:5472
+#: access/transam/xlog.c:5537
 #, 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:5474
+#: access/transam/xlog.c:5539
 #, 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:5480
+#: access/transam/xlog.c:5545
 #, 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:5487
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "el archivo de control contiene un estado no válido del clúster"
 
-#: access/transam/xlog.c:5875
+#: access/transam/xlog.c:5940
 #, 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:5876
+#: access/transam/xlog.c:5941
 #, 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:5880
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL termina antes del punto de recuperación consistente"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "seleccionado nuevo ID de timeline: %u"
 
-#: access/transam/xlog.c:5959
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "recuperación completa"
 
-#: access/transam/xlog.c:6612
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "apagando"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6651
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "empezando restartpoint:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6663
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "empezando checkpoint:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6728
+#: access/transam/xlog.c:6769
 #, c-format
-msgid "restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "restartpoint completo: escritos %d búfers (%.1f%%); %d archivos WAL añadidos, %d eliminados, %d reciclados; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; archivos sincronizados=%d, más largo=%ld.%03d s, promedio=%ld.%03d s; distancia=%d kB, estimación=%d kB; lsn=%X/%X, lsn de redo=%X/%X"
+msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "restartpoint completo: escritos %d búfers (%.1f%%); escritos %d búfers SLRU; %d archivos WAL añadidos, %d eliminados, %d reciclados; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; archivos sincronizados=%d, más largo=%ld.%03d s, promedio=%ld.%03d s; distancia=%d kB, estimación=%d kB; lsn=%X/%X, lsn de redo=%X/%X"
 
-#: access/transam/xlog.c:6751
+#: access/transam/xlog.c:6793
 #, c-format
-msgid "checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "checkpoint completo: escritos %d búfers (%.1f%%); %d archivos WAL añadidos, %d eliminados, %d reciclados; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; archivos sincronizados=%d, más largo=%ld.%03d s, promedio=%ld.%03d s; distancia=%d kB, estimación=%d kB; lsn=%X/%X, lsn de redo=%X/%X"
+msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "checkpoint completo: escritos %d búfers (%.1f%%); escritos %d búfers SLRU; %d archivos WAL añadidos, %d eliminados, %d reciclados; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; archivos sincronizados=%d, más largo=%ld.%03d s, promedio=%ld.%03d s; distancia=%d kB, estimación=%d kB; lsn=%X/%X, lsn de redo=%X/%X"
 
-#: access/transam/xlog.c:7233
+#: access/transam/xlog.c:7279
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "hay actividad de WAL mientras el sistema se está apagando"
 
-#: access/transam/xlog.c:7818
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "restartpoint de recuperación en %X/%X"
 
-#: access/transam/xlog.c:7820
+#: access/transam/xlog.c:7873
 #, 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:8082
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "punto de recuperación «%s» creado en %X/%X"
 
-#: access/transam/xlog.c:8289
+#: access/transam/xlog.c:8344
 #, 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:8347
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "ID de timeline %u inesperado (debería ser %u) en el registro de checkpoint de detención"
 
-#: access/transam/xlog.c:8405
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "ID de timeline %u inesperado (debería ser %u) en el registro de checkpoint «online»"
 
-#: access/transam/xlog.c:8434
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "ID de timeline %u inesperado (debería ser %u) en el registro de fin-de-recuperación"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync write-through) el archivo «%s»: %m"
 
-#: access/transam/xlog.c:8710
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fdatasync) archivo «%s»: %m"
 
-#: access/transam/xlog.c:8797 access/transam/xlog.c:9133
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, 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:8798 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "«wal_level» debe ser definido a «replica» o «logical» al inicio del servidor."
 
-#: access/transam/xlog.c:8803
+#: access/transam/xlog.c:8863
 #, 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:8924
+#: access/transam/xlog.c:8984
 #, 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 restartpoint"
 
-#: access/transam/xlog.c:8926 access/transam/xlog.c:9222
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, 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 primary, 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 primario, luego trate de ejecutar un respaldo en línea nuevamente."
 
-#: access/transam/xlog.c:9006 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, 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:9013 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, 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:9134
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr "wal_level debe ser definido a «replica» o «logical» al inicio del servidor."
-
-#: access/transam/xlog.c:9172 backup/basebackup.c:1281
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, 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:9173 backup/basebackup.c:1282
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, 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:9220
+#: access/transam/xlog.c:9280
 #, 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:9336
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "respaldo base completo, esperando que se archiven los segmentos WAL requeridos"
 
-#: access/transam/xlog.c:9350
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "todavía en espera de que todos los segmentos WAL requeridos sean archivados (han pasado %d segundos)"
 
-#: access/transam/xlog.c:9352
+#: access/transam/xlog.c:9412
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, but the database backup will not be usable without all the WAL segments."
 msgstr "Verifique que su «archive_command» se esté ejecutando con normalidad.  Puede cancelar este respaldo con confianza, 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:9359
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "todos los segmentos de WAL requeridos han sido archivados"
 
-#: access/transam/xlog.c:9363
+#: access/transam/xlog.c:9423
 #, 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 mecanismo para completar el respaldo"
 
-#: access/transam/xlog.c:9402
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "abortando el backup porque el proceso servidor terminó antes de que pg_backup_stop fuera invocada"
@@ -3004,277 +2987,277 @@ msgstr "no se pudo crear el archivo de estado «%s»: %m"
 msgid "could not write archive status file \"%s\": %m"
 msgstr "no se pudo escribir el archivo de estado «%s»: %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "ya hay un respaldo en curso en esta sesión"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "no hay respaldo en curso"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "¿Invocó pg_backup_start()?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, 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/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "No se puede ejecutar %s durante la recuperación."
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
 msgstr "pg_log_standby_snapshot() sólo puede usarse si «wal_level» >= «replica»"
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "el nivel de WAL no es suficiente para crear un punto de recuperación"
 
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "el valor es demasiado largo para un punto de recuperación (máximo %d caracteres)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "nombre de archivo WAL «%s» no válido"
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "la recuperación no está en proceso"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr "Las funciones de control de recuperación sólo pueden ejecutarse durante la recuperación."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "la promoción del standby está en curso"
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s no puede ser ejecutado después que una promoción es solicitada."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "«wait_seconds» no puede ser negativo o cero"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "no se pudo enviar señal a postmaster: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "terminando la conexión debido al término inesperado de postmaster"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
 msgstr "mientras se esperaba la promoción"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
 msgstr[0] "el servidor no se promovió en %d segundo"
 msgstr[1] "el servidor no se promovió en %d segundos"
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
-msgid "\"recovery_prefetch\" is not supported on platforms that lack posix_fadvise()."
-msgstr "«recovery_prefetch» no está soportado en plataformas que no tienen posix_fadvise()."
+msgid "\"recovery_prefetch\" is not supported on platforms that lack support for issuing read-ahead advice."
+msgstr "«recovery_prefetch» no está soportado en plataformas que no tienen soporte para enviar indicaciones de lectura adelantada."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "desplazamiento de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord solicitado por %X/%X"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "largo de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "no hay bandera de contrecord en %X/%X"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "largo de contrecord %u no válido (se esperaba %lld) en %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ID de gestor de recursos %u no válido en %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "registro con prev-link %X/%X incorrecto en %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "suma de verificación de los datos del gestor de recursos incorrecta en el registro en %X/%X"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "número mágico %04X no válido en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "info bits %04X no válidos en segment WAL %s, LSN %X/%X, posición %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %llu, identificador en pg_control es %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %<PRIu64>, identificador en pg_control es %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: tamaño de segmento incorrecto en cabecera de paǵina"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: XLOG_BLCKSZ incorrecto en cabecera de paǵina"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "pageaddr %X/%X inesperado en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ID de timeline %u fuera de secuencia (después de %u) en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, 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:1773
+#: access/transam/xlogreader.c:1793
 #, 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:1780
+#: access/transam/xlogreader.c:1800
 #, 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:1816
+#: access/transam/xlogreader.c:1836
 #, 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:1832
+#: access/transam/xlogreader.c:1852
 #, 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:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_COMPRESSED están definidos, pero el largo de imagen de bloque es %u en %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, 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:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u no válido en %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "registro con largo no válido en %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "no se pudo localizar un bloque de respaldo con ID %d en el registro WAL"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "no se pudo restaurar la imagen en %X/%X con bloque especifica %d no válido"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X con estado no válido, bloque %d"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con %s que no está soportado por esta instalación, bloque %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con un método desconocido, bloque %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "no se pudo descomprimir la imagen en %X/%X, bloque %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "iniciando recuperación de backup con LSN de redo %X/%X, LSN de checkpoint %X/%X, en timeline %u"
 
-#: access/transam/xlogrecovery.c:649
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "no se pudo encontrar la ubicación de redo %X/%X referida por el registro de checkpoint en %X/%X"
 
 # Purposefully deviate from quoting convention here, since argument is a shell command.
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
@@ -3285,467 +3268,489 @@ msgstr ""
 "Si no está restaurando de un respaldo, intente eliminar el archivo \"%s/backup_label\".\n"
 "Tenga cuidado: eliminar \"%s/backup_label\" resultará en un clúster corrupto si está restaurando de un respaldo."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "no se pudo localizar el registro de checkpoint requerido en %X/%X"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "no se pudo crear el enlace simbólico «%s»: %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "ignorando el archivo «%s» porque no existe un archivo «%s»"
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "El archivo «%s» fue renombrado a «%s»."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:738
 #, 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/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "reiniciando recuperación del backup con LSN de redo «%X/%X»"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "no se pudo localizar un registro de válido en %X/%X"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:814
+#, fuzzy, c-format
+#| msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "no se pudo encontrar la ubicación de redo %X/%X referida por el registro de checkpoint en %X/%X"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "entrando al modo standby"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "comenzando el proceso de recuperación hasta el XID %u"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "comenzando el proceso de recuperación hasta %s"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "comenzando el proceso de recuperación hasta «%s»"
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "comenzando el proceso de recuperación punto-en-el-tiempo a la ubicación (LSN) de WAL «%X/%X»"
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:842
 #, 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/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "comenzando proceso de recuperación"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:866
 #, 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/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:869
 #, 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 checkpoint 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."
+msgid "Latest checkpoint in file \"%s\" 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 checkpoint más reciente en el archivo «%s» 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/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:884
 #, 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/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "el siguiente ID de transacción no es válido"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "redo no es válido en el registro de checkpoint"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "registro redo no es válido en el checkpoint de apagado"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:957
 #, 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/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:961
 #, 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/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label contiene datos inconsistentes con el archivo de control"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:1005
 #, 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/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "el uso del archivo de configuración de recuperación «%s» no está soportado"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1124
 #, 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/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "no se especifica «primary_conninfo» ni «restore_command»"
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr "El servidor de bases de datos monitoreará el subdirectorio pg_wal con regularidad en búsqueda de archivos almacenados ahí."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "debe especificarse «restore_command» cuando el modo standby no está activo"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "no existe el timeline %u especificado como destino de recuperación"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278
+#: access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425
+#: access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "datos no válidos en archivo «%s»"
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "El ID de timeline interpretado es %u, pero se esperaba %u."
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "esto es un backup incremental, no un directorio de datos"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "Use pg_combinebackup para reconstruir un directorio de datos válido."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "se encontró registro de tipo inesperada en el punto de redo %X/%X"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo comienza en %X/%X"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "redo en progreso, tiempo transcurrido: %ld.%02d s, LSN actual: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1862
 #, 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/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "redo listo en %X/%X utilización del sistema: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "última transacción completada al tiempo de registro %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "no se requiere redo"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "la recuperación terminó antes de alcanzar el punto configurado como destino de recuperación"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "se omitió con éxito contrecord no encontrado en %X/%X, sobrescrito en %s"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "entrada de directorio inesperada «%s» fue encontrada en %s"
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2184
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr "Todas las entradas de directorio en pg_tblspc deberían ser enlaces simbólicos"
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "Todas las entradas de directorio en %s/ deberían ser enlaces simbólicos."
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr "Elimine esos directorios, o defina «allow_in_place_tablespaces» a ON transitoriamente para permitir que la recuperación pueda completarse."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "se completó la recuperación de backup con LSN de redo %X/%X y LSN de término %X/%X"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "el estado de recuperación consistente fue alcanzado en %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "redo WAL en %X/%X para %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2405
 #, 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 checkpoint"
 
-#: access/transam/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2414
 #, 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 checkpoint"
 
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2430
 #, 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/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "deteniendo recuperación al alcanzar un estado consistente"
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "deteniendo recuperación antes de la ubicación (LSN) de WAL «%X/%X»"
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2725
 #, 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/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2732
 #, 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/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2785
 #, 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/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "deteniendo recuperación después de la ubicación (LSN) de WAL «%X/%X»"
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2870
 #, 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/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2878
 #, 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/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "pausando al final de la recuperación"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "Ejecute pg_wal_replay_resume() para promover."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "la recuperación está en pausa"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "Ejecute pg_wal_replay_resume() para continuar."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ID de timeline %u inesperado en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "no se pudo leer desde el segmento de WAL %s, LSN %X/%X, posición %u: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "no se pudo leer del segmento de WAL %s, LSN %X/%X, posición %u: leídos %d de %zu"
 
-#: access/transam/xlogrecovery.c:4061
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "ubicación de checkpoint no válida"
 
-#: access/transam/xlogrecovery.c:4071
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "el registro del checkpoint no es válido"
 
-#: access/transam/xlogrecovery.c:4077
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "el ID de gestor de recursos en el registro del checkpoint no es válido"
 
-#: access/transam/xlogrecovery.c:4085
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "xl_info en el registro del checkpoint no es válido"
 
-#: access/transam/xlogrecovery.c:4091
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "la longitud del registro de checkpoint no es válida"
 
-#: access/transam/xlogrecovery.c:4145
+#: access/transam/xlogrecovery.c:4188
 #, 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/xlogrecovery.c:4159
+#: access/transam/xlogrecovery.c:4202
 #, 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/xlogrecovery.c:4178
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "el nuevo timeline destino es %u"
 
-#: access/transam/xlogrecovery.c:4381
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "se recibió una petición de apagado para el proceso receptor de wal"
 
-#: access/transam/xlogrecovery.c:4441
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "se recibió petición de promoción"
 
-#: access/transam/xlogrecovery.c:4670
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "hot standby no es posible porque la configuración de parámetros no es suficiente"
 
-#: access/transam/xlogrecovery.c:4671 access/transam/xlogrecovery.c:4698
-#: access/transam/xlogrecovery.c:4728
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739
+#: access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d es una configuración menor que en el servidor primario, donde su valor era %d."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "Si se continúa con la recuperación, el servidor se apagará."
 
-#: access/transam/xlogrecovery.c:4681
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "Luego puede reiniciar el servidor después de hacer los cambios necesarios en la configuración."
 
-#: access/transam/xlogrecovery.c:4692
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "la promoción no es posible porque la configuración de parámetros no es suficiente"
 
-#: access/transam/xlogrecovery.c:4702
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "Reinicie el servidor luego de hacer los cambios necesarios en la configuración."
 
-#: access/transam/xlogrecovery.c:4726
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "se abortó la recuperación porque la configuración de parámetros no es suficiente"
 
-#: access/transam/xlogrecovery.c:4732
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "Puede reiniciar el servidor luego de hacer los cambios necesarios en la configuración."
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795
+#: catalog/dependency.c:1153 catalog/dependency.c:1160
+#: catalog/dependency.c:1171 commands/tablecmds.c:1519
+#: commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211
+#: executor/execExprInterp.c:5219 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1048 replication/slot.c:1705
+#: replication/slot.c:2783 replication/slot.c:2785 replication/syncrep.c:1079
+#: storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137
+#: storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207
+#: utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868
+#: utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "múltiples valores de destino de recuperación especificados"
 
-#: access/transam/xlogrecovery.c:4775
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "A lo más uno de «recovery_target», «recovery_target_lsn», «recovery_target_name», «recovery_target_time», «recovery_target_xid» puede estar definido."
 
-#: access/transam/xlogrecovery.c:4786
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "El único valor permitido es «immediate»."
 
-#: access/transam/xlogrecovery.c:4938 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4991
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp fuera de rango: «%s»"
+msgid "Timestamp out of range: \"%s\"."
+msgstr "Timestamp fuera de rango: «%s»."
 
-#: access/transam/xlogrecovery.c:4983
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "«recovery_target_timeline» no es un número válido."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "no se pudo leer desde el segmento de WAL %s, posición %d: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr "no se pudo leer del segmento de WAL %s, posición %d: leídos %d de %d"
@@ -3766,7 +3771,7 @@ msgstr "La orden fallida era: «%s»"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "la orden de archivado fue terminada por una excepción 0x%X"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3095
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, 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."
@@ -3781,165 +3786,165 @@ msgstr "la orden de archivado fue terminada por una señal %d: %s"
 msgid "archive command exited with unrecognized status %d"
 msgstr "la orden de archivado fue terminada con código %d no reconocido"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "se esperaba el timeline de término %u pero se encontró el timeline %u"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "se esperaba el timeline de inicio %u pero se encontró el timeline %u"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "el timeline de inicio %u no fue encontrado en la historia del timeline %u"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "no se puede rebobinar el archivo temporal"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "no se pudo encontrar ningún archivo de WAL"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "no se pudo encontrar archivo de WAL «%s»"
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "tamaño del archivo WAL «%s» inesperado"
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
 msgstr[0] "%lld falla de verificación de suma de comprobación en total"
 msgstr[1] "%lld fallas de verificación de suma de comprobación en total"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "falla en verificación de checksums durante respaldo base"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "nombre de opción «%s» duplicada"
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "tipo de checkpoint no reconocido: «%s»"
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr "los backups incrementales no pueden tomarse a menos que la sumarización de WAL esté activada"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, 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)"
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "opción de manifiesto «%s» no reconocida"
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "algoritmo de compresión no reconocido: «%s»"
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "opción de respaldo base no reconocida: «%s»"
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "la suma de comprobación del manifiesto requiere un manifiesto de la copia de seguridad"
 
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "no se puede usar “target detail” sin un destino"
 
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "el destino «%s» no acepta “target details”"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "el detalle de compresión no puede especificarse a menos que la compresión esté activada"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "especificación de compresión no válida: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
 msgstr "debe ejecutar UPLOAD_MANIFEST antes de lanzar un BASE_BACKUP incremental"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo o directorio «%s»: %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "omitiendo el archivo especial «%s»"
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid "could not verify checksum in file \"%s\", block %u: read buffer size %d and page size %d differ"
 msgstr "no se pudo verificar el checksum en el archivo «%s», bloque %u: el tamaño de búfer de lectura %d y el tamaño de página %d difieren"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
 msgstr[0] "el archivo «%s» tiene un total de %d falla de verificación de checksum"
 msgstr[1] "el archivo «%s» tiene un total de %d fallas de verificación de checksums"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated %X but expected %X"
 msgstr "verificación de checksums falló en archivo «%s», bloque %u: calculado %X pero se esperaba %X"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid "further checksum verification failures in file \"%s\" will not be reported"
 msgstr "subsiguientes fallas de verificación de checksums en el archivo «%s» no se reportarán"
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "nombre de archivo demasiado largo para el formato tar: «%s»"
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
 msgstr "destino de enlace simbólico demasiado largo para el formato tar: nombre de archivo «%s», destino «%s»"
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "no se pudo leer el archivo «%s»: leídos %zd de %zu"
@@ -3954,65 +3959,65 @@ msgstr "la compresión gzip no está soportada en este servidor"
 msgid "could not initialize compression library"
 msgstr "no se pudo inicializar la biblioteca de compresión"
 
-#: backup/basebackup_incremental.c:294
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
 msgstr "el manifiesto no contiene ningún rango WAL requerido"
 
-#: backup/basebackup_incremental.c:349
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "el timeline %u fue encontrado en el manifiesto, pero no en la historia de este servidor"
 
-#: backup/basebackup_incremental.c:414
+#: backup/basebackup_incremental.c:412
 #, c-format
 msgid "manifest requires WAL from initial timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "el manifiesto requiere WAL en el timeline inicial %u desde %X/%X, pero ese timeline inicia en %X/%X"
 
-#: backup/basebackup_incremental.c:424
+#: backup/basebackup_incremental.c:422
 #, c-format
 msgid "manifest requires WAL from continuation timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "el manifiesto requiere WAL del timeline de continuación %u desde %X/%X, pero ese timeline empieza en %X/%X"
 
-#: backup/basebackup_incremental.c:435
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid "manifest requires WAL from final timeline %u ending at %X/%X, but this backup starts at %X/%X"
 msgstr "el manifiesto requiere WAL del timeline final %u terminado en %X/%X, pero este backup empieza en %X/%X"
 
-#: backup/basebackup_incremental.c:439
+#: backup/basebackup_incremental.c:437
 #, c-format
 msgid "This can happen for incremental backups on a standby if there was little activity since the previous backup."
 msgstr "Esto puede pasar para backups incrementales en un standby si hubo insuficiente actividad desde el backup anterior."
 
-#: backup/basebackup_incremental.c:446
+#: backup/basebackup_incremental.c:444
 #, c-format
 msgid "manifest requires WAL from non-final timeline %u ending at %X/%X, but this server switched timelines at %X/%X"
 msgstr "el manifiesto requiere WAL del timeline no-final %u terminando en %X/%X, pero este servidor cambió de timelines en %X/%X"
 
-#: backup/basebackup_incremental.c:527
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no summaries for that timeline and LSN range exist"
 msgstr "se requieren sumarizaciones de WAL en el timeline %u desde %X/%X hasta %X/%X, pero no existen sumarizaciones para ese timeline y rango de LSN"
 
-#: backup/basebackup_incremental.c:534
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the summaries for that timeline and LSN range are incomplete"
 msgstr "se requieren sumarizaciones de WAL en el timeline %u desde %X/%X hasta %X/%X, pero las sumarizaciones en ese timeline y rango de LSN están incompletos"
 
-#: backup/basebackup_incremental.c:538
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "El primer LSN sin sumarización en este rango es %X/%X."
 
-#: backup/basebackup_incremental.c:938
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "el manifiesto de backup versión 1 no soporta backups incrementales"
 
-#: backup/basebackup_incremental.c:956
+#: backup/basebackup_incremental.c:966
 #, c-format
-msgid "system identifier in backup manifest is %llu, but database system identifier is %llu"
-msgstr "el identificador de sistema en el manifiesto de backup es %llu, pero el identificador en el sistema es %llu"
+msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
+msgstr "el identificador de sistema en el manifiesto de backup es %<PRIu64>, pero el identificador en el sistema es %<PRIu64>"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -4034,10 +4039,10 @@ msgstr "Sólo los roles con privilegio del rol «%s» pueden crear un respaldo a
 msgid "relative path not allowed for backup stored on server"
 msgstr "no se permiten rutas relativas para un respaldo almacenado en el servidor"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
@@ -4047,15 +4052,15 @@ msgstr "no se pudo crear el directorio «%s»: %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "el directorio «%s» existe pero no está vacío"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1178
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "no se pudo acceder al directorio «%s»: %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "Verifique el espacio libre en disco."
@@ -4093,26 +4098,31 @@ msgstr "no se pudo habilitar el modo “long-distance”: %s"
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "timeline %lld no válido"
+msgid "invalid timeline %<PRId64>"
+msgstr "timeline %<PRId64> no válido"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s debe ser el primer argumento"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3946
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s requiere un valor"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3951
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s requiere un valor"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:763
+#: postmaster/postmaster.c:776
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Pruebe «%s --help» para mayor información.\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: argumentos de línea de órdenes no válidos\n"
@@ -4167,12 +4177,12 @@ msgstr "no todos los privilegios pudieron ser revocados para «%s»"
 msgid "grantor must be current user"
 msgstr "el cedente (grantor) debe ser el usuario actual"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:1055
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "el tipo de privilegio %s no es válido para una relación"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:1059
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "el tipo de privilegio %s no es válido para una secuencia"
@@ -4187,7 +4197,7 @@ msgstr "el tipo de privilegio %s no es válido para una base de datos"
 msgid "invalid privilege type %s for domain"
 msgstr "el tipo de privilegio %s no es válido para un dominio"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:1063
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "el tipo de privilegio %s no es válido para una función"
@@ -4197,22 +4207,22 @@ msgstr "el tipo de privilegio %s no es válido para una función"
 msgid "invalid privilege type %s for language"
 msgstr "el tipo de privilegio %s no es válido para un lenguaje"
 
-#: catalog/aclchk.c:504
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "el tipo de privilegio %s no es válido para un objeto grande"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1079
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "el tipo de privilegio %s no es válido para un esquema"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:1067
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "el tipo de privilegio %s no es válido para un procedimiento"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:1071
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "el tipo de privilegio %s no es válido para una rutina"
@@ -4222,7 +4232,7 @@ msgstr "el tipo de privilegio %s no es válido para una rutina"
 msgid "invalid privilege type %s for tablespace"
 msgstr "el tipo de privilegio %s no es válido para un tablespace"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1075
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "el tipo de privilegio %s no es válido para un tipo"
@@ -4247,534 +4257,525 @@ msgstr "el tipo de privilegio %s no es válido para un parámetro"
 msgid "column privileges are only valid for relations"
 msgstr "los privilegios de columna son sólo válidos para relaciones"
 
-#: catalog/aclchk.c:738 catalog/aclchk.c:3629 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "no existe el objeto grande %u"
-
-#: catalog/aclchk.c:1112
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "los privilegios por omisión no pueden definirse para columnas"
 
-#: catalog/aclchk.c:1148
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "se ha denegado el permiso para cambiar los privilegios por omisión"
 
-#: catalog/aclchk.c:1266
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "No puede utilizar la cláusula IN SCHEMA cuando se utiliza GRANT / REVOKE ON SCHEMAS"
-
-#: catalog/aclchk.c:1617 catalog/catalog.c:659 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:951
-#: commands/sequence.c:1655 commands/tablecmds.c:7541 commands/tablecmds.c:7695
-#: commands/tablecmds.c:7745 commands/tablecmds.c:7819
-#: commands/tablecmds.c:7889 commands/tablecmds.c:8019
-#: commands/tablecmds.c:8148 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8343 commands/tablecmds.c:8470
-#: commands/tablecmds.c:8500 commands/tablecmds.c:8642
-#: commands/tablecmds.c:8735 commands/tablecmds.c:8869
-#: commands/tablecmds.c:8981 commands/tablecmds.c:12797
-#: commands/tablecmds.c:12989 commands/tablecmds.c:13150
-#: commands/tablecmds.c:14339 commands/tablecmds.c:16966 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3409
-#: parser/parse_utilcmd.c:3449 parser/parse_utilcmd.c:3491 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2812
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
+#, c-format
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "No puede utilizar la cláusula IN SCHEMA cuando se utiliza %s"
+
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621
+#: catalog/heap.c:2941 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039
+#: commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929
+#: commands/tablecmds.c:8130 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8413 commands/tablecmds.c:8507
+#: commands/tablecmds.c:8610 commands/tablecmds.c:8776
+#: commands/tablecmds.c:8806 commands/tablecmds.c:8961
+#: commands/tablecmds.c:9064 commands/tablecmds.c:9198
+#: commands/tablecmds.c:9311 commands/tablecmds.c:14397
+#: commands/tablecmds.c:14600 commands/tablecmds.c:14761
+#: commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948
+#: parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3662
+#: parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, 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:1862
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "«%s» es un índice"
 
-#: catalog/aclchk.c:1869 commands/tablecmds.c:14496 commands/tablecmds.c:17882
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "«%s» es un tipo compuesto"
 
-#: catalog/aclchk.c:1877 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17846 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "«%s» no es una secuencia"
 
-#: catalog/aclchk.c:1915
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "la secuencia «%s» sólo soporta los privilegios USAGE, SELECT, y UPDATE"
 
-#: catalog/aclchk.c:1932
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "el tipo de privilegio %s no es válido para una tabla"
 
-#: catalog/aclchk.c:2097
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "el tipo de privilegio %s no es válido para una columna"
 
-#: catalog/aclchk.c:2110
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "la secuencia «%s» sólo soporta el privilegio SELECT"
 
-#: catalog/aclchk.c:2301
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "el lenguaje «%s» no es confiable (trusted)"
 
-#: catalog/aclchk.c:2303
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "GRANT y REVOKE no están permitidos en lenguajes no confiables, porque sólo los superusuarios pueden usar lenguajes no confiables."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "no se puede definir privilegios para tipos de array"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "Defina los privilegios del tipo elemento en su lugar."
 
-#: catalog/aclchk.c:2459
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "no se puede definir privilegios para tipos multirango"
 
-#: catalog/aclchk.c:2460
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "Defina los privilegios del tipo de rango en su lugar."
 
-#: catalog/aclchk.c:2467 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "«%s» no es un dominio"
-
-#: catalog/aclchk.c:2653
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "tipo de privilegio «%s» no reconocido"
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "permiso denegado a la función de agregación %s"
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "permiso denegado al ordenamiento (collation) %s"
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "permiso denegado a la columna %s"
 
-#: catalog/aclchk.c:2729
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "permiso denegado a la conversión %s"
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "permiso denegado a la base de datos %s"
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "permiso denegado al dominio %s"
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "permiso denegado al “trigger” por eventos %s"
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "permiso denegado a la extensión %s"
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "permiso denegado al conector de datos externos %s"
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "permiso denegado al servidor foráneo %s"
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "permiso denegado a la tabla foránea %s"
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "permiso denegado a la función %s"
 
-#: catalog/aclchk.c:2756
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "permiso denegado al índice %s"
 
-#: catalog/aclchk.c:2759
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "permiso denegado al lenguaje %s"
 
-#: catalog/aclchk.c:2762
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "permiso denegado al objeto grande %s"
 
-#: catalog/aclchk.c:2765
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "permiso denegado a la vista materializada %s"
 
-#: catalog/aclchk.c:2768
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "permiso denegado a la clase de operadores %s"
 
-#: catalog/aclchk.c:2771
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "permiso denegado al operador %s"
 
-#: catalog/aclchk.c:2774
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "permiso denegado a la familia de operadores %s"
 
-#: catalog/aclchk.c:2777
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "permiso denegado al parámetro %s"
 
-#: catalog/aclchk.c:2780
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "permiso denegado a la política %s"
 
-#: catalog/aclchk.c:2783
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "permiso denegado al procedimiento %s"
 
-#: catalog/aclchk.c:2786
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "permiso denegado a la publicación %s"
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "permiso denegado a la rutina %s"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "permiso denegado al esquema %s"
 
-#: catalog/aclchk.c:2795 commands/sequence.c:654 commands/sequence.c:880
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880
 #: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
-#: commands/sequence.c:1799
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "permiso denegado a la secuencia %s"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "permiso denegado al objeto de estadísticas %s"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "permiso denegado a la suscripción %s"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "permiso denegado a la tabla %s"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "permiso denegado al tablespace %s"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "permiso denegado a la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "permiso denegado a la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "permiso denegado al tipo %s"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "permiso denegado a la vista %s"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "debe ser dueño de la función de agregación %s"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "debe ser dueño del ordenamiento (collation) %s"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "debe ser dueño de la conversión %s"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "debe ser dueño de la base de datos %s"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "debe ser dueño del dominio %s"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "debe ser dueño del “trigger” por eventos %s"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "debe ser dueño de la extensión %s"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "debe ser dueño del conector de datos externos %s"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "debe ser dueño del servidor foráneo %s"
 
-#: catalog/aclchk.c:2882
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "debe ser dueño de la tabla foránea %s"
 
-#: catalog/aclchk.c:2885
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "debe ser dueño de la función %s"
 
-#: catalog/aclchk.c:2888
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "debe ser dueño del índice %s"
 
-#: catalog/aclchk.c:2891
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "debe ser dueño del lenguaje %s"
 
-#: catalog/aclchk.c:2894
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "debe ser dueño del objeto grande %s"
 
-#: catalog/aclchk.c:2897
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "debe ser dueño de la vista materializada %s"
 
-#: catalog/aclchk.c:2900
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "debe ser dueño de la clase de operadores %s"
 
-#: catalog/aclchk.c:2903
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "debe ser dueño del operador %s"
 
-#: catalog/aclchk.c:2906
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "debe ser dueño de la familia de operadores %s"
 
-#: catalog/aclchk.c:2909
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "debe ser dueño del procedimiento %s"
 
-#: catalog/aclchk.c:2912
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "debe ser dueño de la publicación %s"
 
-#: catalog/aclchk.c:2915
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "debe ser dueño de la rutina %s"
 
-#: catalog/aclchk.c:2918
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "debe ser dueño de la secuencia %s"
 
-#: catalog/aclchk.c:2921
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "debe ser dueño de la suscripción %s"
 
-#: catalog/aclchk.c:2924
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "debe ser dueño de la tabla %s"
 
-#: catalog/aclchk.c:2927
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "debe ser dueño del tipo %s"
 
-#: catalog/aclchk.c:2930
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "debe ser dueño de la vista %s"
 
-#: catalog/aclchk.c:2933
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "debe ser dueño del esquema %s"
 
-#: catalog/aclchk.c:2936
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "debe ser dueño del objeto de estadísticas %s"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "debe ser dueño del tablespace %s"
 
-#: catalog/aclchk.c:2942
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "debe ser dueño de la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:2945
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "debe ser dueño del diccionario de búsqueda en texto %s"
 
-#: catalog/aclchk.c:2959
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "debe ser dueño de la relación %s"
 
-#: catalog/aclchk.c:3005
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "permiso denegado a la columna «%s» de la relación «%s»"
 
-#: catalog/aclchk.c:3162 catalog/aclchk.c:4170 catalog/aclchk.c:4201
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s con el OID %u no existe"
-
-#: catalog/aclchk.c:3245 catalog/aclchk.c:3264
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "no existe el atributo %d de la relación con OID %u"
 
-#: catalog/aclchk.c:3302 catalog/aclchk.c:3365 catalog/aclchk.c:4004
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "no existe la relación con OID %u"
 
-#: catalog/aclchk.c:3550
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "no existe el ACL de parámetro con OID %u"
 
-#: catalog/aclchk.c:3723 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "no existe el objeto grande %u"
+
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "no existe el esquema con OID %u"
 
-#: catalog/aclchk.c:3797 catalog/aclchk.c:3824 catalog/aclchk.c:3853
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "no existe el tipo con OID %u"
 
-#: catalog/catalog.c:477
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "aún se está buscando algún OID sin utilizar en la relación «%s»"
 
-#: catalog/catalog.c:479
+#: catalog/catalog.c:506
 #, c-format
-msgid "OID candidates have been checked %llu time, but no unused OID has been found yet."
-msgid_plural "OID candidates have been checked %llu times, but no unused OID has been found yet."
-msgstr[0] "se han revisado los OID candidatos %llu vez, pero aún no se ha encontrado algún OID sin utilizar."
-msgstr[1] "se han revisado los OID candidatos %llu veces, pero aún no se ha encontrado algún OID sin utilizar."
+msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
+msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
+msgstr[0] "se han revisado los OID candidatos %<PRIu64> vez, pero aún no se ha encontrado algún OID sin utilizar."
+msgstr[1] "se han revisado los OID candidatos %<PRIu64> veces, pero aún no se ha encontrado algún OID sin utilizar."
 
-#: catalog/catalog.c:504
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "se ha asignado un nuevo OID en la relación «%s» luego de %llu reintento"
-msgstr[1] "se ha asignado un nuevo OID en la relación «%s» luego de %llu reintentos"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "se ha asignado un nuevo OID en la relación «%s» luego de %<PRIu64> reintento"
+msgstr[1] "se ha asignado un nuevo OID en la relación «%s» luego de %<PRIu64> reintentos"
 
-#: catalog/catalog.c:637 catalog/catalog.c:704
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "debe ser superusuario para invocar %s()"
 
-#: catalog/catalog.c:646
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() sólo puede usarse en catálogos de sistema"
 
-#: catalog/catalog.c:651 parser/parse_utilcmd.c:2270
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "el índice «%s» no pertenece a la tabla «%s»"
 
-#: catalog/catalog.c:668
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "la columna «%s» no es de tipo oid"
 
-#: catalog/catalog.c:675
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "«el índice %s» no es el índice para la columna «%s»"
@@ -4824,20 +4825,6 @@ msgstr[1] ""
 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:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1459
-#: commands/tablecmds.c:15088 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 executor/execExprInterp.c:4655
-#: executor/execExprInterp.c:4663 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1432 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6825
-#: utils/misc/guc.c:6859 utils/misc/guc.c:6893 utils/misc/guc.c:6936
-#: utils/misc/guc.c:6978
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4860,303 +4847,377 @@ msgstr[1] "eliminando además %d objetos más"
 msgid "constant of the type %s cannot be used here"
 msgstr "no se puede usar una constante de tipo %s aquí"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "la tabla de transición «%s» no puede ser referida en un objeto persistente"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:224
+#: statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "no existe la columna %d en la relación «%s»"
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "se ha denegado el permiso para crear «%s.%s»"
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Las modificaciones al catálogo del sistema están actualmente deshabilitadas."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2495 commands/tablecmds.c:2917
-#: commands/tablecmds.c:7163
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014
+#: commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "las tablas pueden tener a lo más %d columnas"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7432
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, 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:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "el nombre de columna «%s» fue especificado más de una vez"
 
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:579
+#: catalog/heap.c:575
 #, c-format
 msgid "partition key column %s has pseudo-type %s"
 msgstr "la columna %s de la llave de partición tiene pseudotipo %s"
 
-#: catalog/heap.c:584
+#: catalog/heap.c:580
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la columna «%s» tiene pseudotipo %s"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:595
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "la columna generada virtual «%s» no puede tener tipo que sea un dominio"
+
+#: catalog/heap.c:622
 #, 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:673
+#, fuzzy, c-format
+#| msgid "Generated columns cannot be used in COPY."
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "Las columnas generadas no pueden usarse en COPY."
+
+#: catalog/heap.c:674 catalog/heap.c:3295
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "Las columnas virtuales generadas que usan tipos de datos definidos por el usuario no están soportados aún."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:686
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr "no se derivó ningún ordenamiento (collate) para la columna %s de llave de partición con tipo ordenable %s"
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:505
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, 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:1161 catalog/index.c:899 commands/createas.c:401
-#: commands/tablecmds.c:4171
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relación «%s» ya existe"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "ya existe un tipo «%s»"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1196
 #, 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:1218
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "el valor de relfilenumber de toast no se definió en modo de actualización binaria"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "el valor de OID de heap de pg_class no se definió en modo de actualización binaria"
 
-#: catalog/heap.c:1239
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "el valor de relfilenumber no se definió en modo de actualización binaria"
 
-#: catalog/heap.c:2130
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "no se puede agregar una restricción NO INHERIT a la tabla particionada «%s»"
 
-#: catalog/heap.c:2402
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "la restricción «check» «%s» ya existe"
 
-#: catalog/heap.c:2574 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9356
+#: catalog/heap.c:2626 catalog/heap.c:2947
+#, fuzzy, c-format
+#| msgid "cannot assign to system column \"%s\""
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "no se puede asignar a la columna de sistema «%s»"
+
+#: catalog/heap.c:2654 catalog/heap.c:2780 catalog/heap.c:3031
+#: catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9821
 #, 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:2581
+#: catalog/heap.c:2787
 #, 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:2592
+#: catalog/heap.c:2798
 #, 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:2602
+#: catalog/heap.c:2808
 #, 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:2607
+#: catalog/heap.c:2820
+#, fuzzy, c-format
+#| msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgid "constraint \"%s\" conflicts with NOT ENFORCED 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:2825
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "mezclando la restricción «%s» con la definición heredada"
 
-#: catalog/heap.c:2633 catalog/pg_constraint.c:853 commands/tablecmds.c:3074
-#: commands/tablecmds.c:3377 commands/tablecmds.c:7089
-#: commands/tablecmds.c:15907 commands/tablecmds.c:16038
+#: catalog/heap.c:2849 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154
+#: commands/tablecmds.c:3179 commands/tablecmds.c:3499
+#: commands/tablecmds.c:7286 commands/tablecmds.c:7967
+#: commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "demasiados padres de herencia"
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:2966 parser/parse_utilcmd.c:2655
+#, fuzzy, c-format
+#| msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
+msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr "las declaraciones NULL/NOT NULL no son coincidentes para la columna «%s» de la tabla «%s»"
+
+#: catalog/heap.c:2980
+#, fuzzy, c-format
+#| msgid "cannot alter constraint \"%s\" on relation \"%s\""
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
+
+#: catalog/heap.c:3010
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "no se puede definir una restricción “not-null” con NO INHERIT en la columna «%s»"
+
+#: catalog/heap.c:3012
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "La columna tiene una restricción “not-null” heredada."
+
+#: catalog/heap.c:3202
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "no se puede usar la columna generada «%s» en una expresión de generación de columna"
 
-#: catalog/heap.c:2719
+#: catalog/heap.c:3204
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "Una columna generada no puede hacer referencia a otra columna generada."
 
-#: catalog/heap.c:2725
+#: catalog/heap.c:3210
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr "no se puede usar una variable de fila completa (whole-row) en una expresión de generación de columna"
 
-#: catalog/heap.c:2726
+#: catalog/heap.c:3211
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "Esto causaría que la columna generada dependa de su propio valor."
 
-#: catalog/heap.c:2781
+#: catalog/heap.c:3278
+#, fuzzy, c-format
+#| msgid "reading user-defined functions"
+msgid "generation expression uses user-defined function"
+msgstr "leyendo las funciones definidas por el usuario"
+
+#: catalog/heap.c:3279
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr "Las columnas generadas virtuales que usan tipos de datos definidos por el usuario no están soportadas aún."
+
+#: catalog/heap.c:3294
+#, fuzzy, c-format
+#| msgid "generation expression is not immutable"
+msgid "generation expression uses user-defined type"
+msgstr "la expresión de generación no es inmutable"
+
+#: catalog/heap.c:3346
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "la expresión de generación no es inmutable"
 
-#: catalog/heap.c:2809 rewrite/rewriteHandler.c:1276
+#: catalog/heap.c:3378 rewrite/rewriteHandler.c:1288
 #, 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:2814 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1281
+#: catalog/heap.c:3383 commands/prepare.c:334 parser/analyze.c:2906
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, 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:2861
+#: catalog/heap.c:3430
 #, 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:3167
+#: catalog/heap.c:3736
 #, 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:3168
+#: catalog/heap.c:3737
 #, 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:3173
+#: catalog/heap.c:3742
 #, 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:3174
+#: catalog/heap.c:3743
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La tabla «%s» hace referencia a «%s»."
 
-#: catalog/heap.c:3176
+#: catalog/heap.c:3745
 #, 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:219 parser/parse_utilcmd.c:2176
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "no se permiten múltiples llaves primarias para la tabla «%s»"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "las llaves primarias no pueden usar índices NULLS NOT DISTINCT"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "las llaves primarias no pueden ser expresiones"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "columna de llave primaria «%s» no está marcada NOT NULL"
 
-#: catalog/index.c:798 catalog/index.c:1915
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "los usuarios no pueden crear índices en tablas del sistema"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr "los ordenamientos no determinísticos no están soportados para la clase de operadores «%s»"
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "no se pueden crear índices de forma concurrente en tablas del sistema"
 
-#: catalog/index.c:862 catalog/index.c:1331
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr "no se pueden crear índices para restricciones de exclusión de forma concurrente"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr "no se pueden crear índices compartidos después de initdb"
 
-#: catalog/index.c:891 commands/createas.c:416 commands/sequence.c:159
-#: parser/parse_utilcmd.c:209
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "la relación «%s» ya existe, omitiendo"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "el valor de OID de índice de pg_class no se definió en modo de actualización binaria"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3791
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "el valor relfilenumber de índice no se definió en modo de actualización binaria"
 
-#: catalog/index.c:2214
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY debe ser la primera acción en una transacción"
 
-#: catalog/index.c:3668
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "no se puede hacer reindex de tablas temporales de otras sesiones"
 
-#: catalog/index.c:3679 commands/indexcmds.c:3626
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "no es posible reindexar un índice no válido en tabla TOAST"
 
-#: catalog/index.c:3695 commands/indexcmds.c:3504 commands/indexcmds.c:3650
-#: commands/tablecmds.c:3581
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815
+#: commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "no se puede mover la relación de sistema «%s»"
 
-#: catalog/index.c:3832
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "el índice «%s» fue reindexado"
 
-#: catalog/index.c:3998
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "no se puede reindexar el índice no válido «%s.%s» en tabla TOAST, omitiendo"
 
 #: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
-#: commands/trigger.c:5729
+#: commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "no están implementadas las referencias entre bases de datos: «%s.%s.%s»"
@@ -5176,19 +5237,19 @@ msgstr "no se pudo bloquear un “lock” en la relación «%s.%s»"
 msgid "could not obtain lock on relation \"%s\""
 msgstr "no se pudo bloquear un “lock” en la relación «%s»"
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "no existe la relación «%s.%s»"
 
-#: catalog/namespace.c:638 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1804
+#: commands/extension.c:1810
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "no se ha seleccionado ningún esquema dentro del cual crear"
@@ -5213,321 +5274,328 @@ msgstr "sólo relaciones temporales pueden ser creadas en los esquemas temporale
 msgid "statistics object \"%s\" does not exist"
 msgstr "no existe el objeto de estadísticas «%s»"
 
-#: catalog/namespace.c:2761
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "no existe el analizador de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:2906 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "no existe el diccionario de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:3052
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "no existe la plantilla de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:3197 commands/tsearchcmds.c:1168
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168
 #: utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "no existe la configuración de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:868 parser/parse_target.c:1259
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, 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:3335 parser/parse_expr.c:875 parser/parse_target.c:1266
-#: gram.y:19181 gram.y:19221
+#: catalog/namespace.c:3338 parser/parse_expr.c:874 parser/parse_target.c:1269
+#: gram.y:19355 gram.y:19395
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
 
-#: catalog/namespace.c:3465
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "no se puede mover objetos hacia o desde esquemas temporales"
 
-#: catalog/namespace.c:3471
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "no se puede mover objetos hacia o desde el esquema TOAST"
 
-#: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1404 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344
+#: commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "no existe el esquema «%s»"
 
-#: catalog/namespace.c:3575
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "el nombre de relación no es válido (demasiados puntos): %s"
 
-#: catalog/namespace.c:4016 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "no existe el ordenamiento (collation) «%s» para la codificación «%s»"
 
-#: catalog/namespace.c:4071
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "no existe la conversión «%s»"
 
-#: catalog/namespace.c:4412
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "se ha denegado el permiso para crear tablas temporales en la base de datos «%s»"
 
-#: catalog/namespace.c:4428
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "no se pueden crear tablas temporales durante la recuperación"
 
-#: catalog/namespace.c:4434
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "no se pueden crear tablas temporales durante una operación paralela"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2327
-#: commands/tablecmds.c:12925
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387
+#: commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "«%s» no es una tabla"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17851 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "«%s» no es una vista"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:199 commands/tablecmds.c:275
-#: commands/tablecmds.c:17856
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "«%s» no es una vista materializada"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17861
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "«%s» no es una tabla foránea"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "debe especificar nombre de relación y nombre de objeto"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "el nombre de columna debe ser calificado"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "no existe el valor por omisión para la columna «%s» de la relación «%s»"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "no existe el tipo «%s»"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "«%s» no es un dominio"
+
+#: catalog/objectaddress.c:1742
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "no existe el operador %d (%s, %s) de %s"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "no existe la función %d (%s, %s) de %s"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, 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:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1004 commands/foreigncmds.c:1367
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "no existe el servidor «%s»"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "no existe la relación «%s» en la publicación «%s»"
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "no existe el esquema de publicación «%s» en la publicación «%s»"
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "tipo de objeto para ACL por omisión «%c» no reconocido"
 
-#: catalog/objectaddress.c:2007
-#, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+#: catalog/objectaddress.c:2015
+#, fuzzy, c-format
+#| msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
 msgstr "Tipos válidos de objeto son «%c», «%c», «%c», «%c» y «%c»."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "no existe el ACL por omisión para el usuario «%s» en el esquema «%s» en %s"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "no existe el ACL por omisión para el usuario «%s» en %s"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "las listas de nombres o argumentos no pueden contener nulls"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "tipo de objeto «%s» no soportado"
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "el largo de la lista de nombres debe ser exactamente %d"
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "el OID de objeto grande no puede ser null"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 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:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "el largo de la lista de argumentos debe ser exactamente %d"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "debe ser dueño del objeto grande %u"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, 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:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "El usuario actual debe tener el atributo %s."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "El usuario actual debe tener la opción %s en el rol «%s»."
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "debe ser superusuario"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "tipo de objeto «%s» no reconocido"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2928
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr "columna %s de %s"
 
-#: catalog/objectaddress.c:2943
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "función %s"
 
-#: catalog/objectaddress.c:2956
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "tipo %s"
 
-#: catalog/objectaddress.c:2993
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversión de %s a %s"
 
-#: catalog/objectaddress.c:3026
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "ordenamiento (collation) %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3057
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "restricción «%s» en %s"
 
-#: catalog/objectaddress.c:3063
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "restricción %s"
 
-#: catalog/objectaddress.c:3095
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "conversión %s"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3117
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "valor por omisión para %s"
 
-#: catalog/objectaddress.c:3128
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "lenguaje %s"
 
-#: catalog/objectaddress.c:3136
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "objeto grande %u"
 
-#: catalog/objectaddress.c:3149
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "operador %s"
 
-#: catalog/objectaddress.c:3186
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "clase de operadores «%s» para el método de acceso «%s»"
 
-#: catalog/objectaddress.c:3214
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "método de acceso %s"
@@ -5536,7 +5604,7 @@ msgstr "método de acceso %s"
 #. 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:3269
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "operador %d (%s, %s) de %s: %s"
@@ -5545,236 +5613,242 @@ msgstr "operador %d (%s, %s) de %s: %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3334
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "función %d (%s, %s) de %s: %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3388
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "regla %s en %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3434
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "“trigger” %s en %s"
 
-#: catalog/objectaddress.c:3454
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "esquema %s"
 
-#: catalog/objectaddress.c:3482
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "objeto de estadísticas %s"
 
-#: catalog/objectaddress.c:3513
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "analizador de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:3544
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "diccionario de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:3575
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "plantilla de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:3606
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "configuración de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:3619
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "rol %s"
 
-#: catalog/objectaddress.c:3656 catalog/objectaddress.c:5505
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "membresía del rol %s en el rol %s"
 
-#: catalog/objectaddress.c:3677
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "base de datos %s"
 
-#: catalog/objectaddress.c:3693
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/objectaddress.c:3704
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "conector de datos externos %s"
 
-#: catalog/objectaddress.c:3714
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "servidor %s"
 
-#: catalog/objectaddress.c:3747
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "mapeo para el usuario %s en el servidor %s"
 
-#: catalog/objectaddress.c:3799
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr "privilegios por omisión en nuevas relaciones pertenecientes al rol %s en el esquema %s"
 
-#: catalog/objectaddress.c:3803
+#: catalog/objectaddress.c:3812
 #, 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:3809
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr "privilegios por omisión en nuevas secuencias pertenecientes al rol %s en el esquema %s"
 
-#: catalog/objectaddress.c:3813
+#: catalog/objectaddress.c:3822
 #, 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:3819
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "privilegios por omisión en nuevas funciones pertenecientes al rol %s en el esquema %s"
 
-#: catalog/objectaddress.c:3823
+#: catalog/objectaddress.c:3832
 #, 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:3829
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr "privilegios por omisión en nuevos tipos pertenecientes al rol %s en el esquema %s"
 
-#: catalog/objectaddress.c:3833
+#: catalog/objectaddress.c:3842
 #, 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:3839
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "privilegios por omisión en nuevos esquemas pertenecientes al rol %s"
 
-#: catalog/objectaddress.c:3846
+#: catalog/objectaddress.c:3854
+#, fuzzy, c-format
+#| msgid "default privileges on new relations belonging to role %s"
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "privilegios por omisión en nuevas relaciones pertenecientes al rol %s"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr "privilegios por omisión pertenecientes al rol %s en el esquema %s"
 
-#: catalog/objectaddress.c:3850
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "privilegios por omisión pertenecientes al rol %s"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "extensión %s"
 
-#: catalog/objectaddress.c:3889
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "“trigger” por eventos %s"
 
-#: catalog/objectaddress.c:3913
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "parámetro %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3956
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "política %s en %s"
 
-#: catalog/objectaddress.c:3970
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "publicación %s"
 
-#: catalog/objectaddress.c:3983
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "publicación de esquema %s en la publicación %s"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:4014
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "publicación de %s en la publicación %s"
 
-#: catalog/objectaddress.c:4027
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "suscripción %s"
 
-#: catalog/objectaddress.c:4048
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "transformación para %s lenguaje %s"
 
-#: catalog/objectaddress.c:4117
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "tabla %s"
 
-#: catalog/objectaddress.c:4122
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "índice %s"
 
-#: catalog/objectaddress.c:4126
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "secuencia %s"
 
-#: catalog/objectaddress.c:4130
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "tabla toast %s"
 
-#: catalog/objectaddress.c:4134
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "vista %s"
 
-#: catalog/objectaddress.c:4138
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "vista materializada %s"
 
-#: catalog/objectaddress.c:4142
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "tipo compuesto %s"
 
-#: catalog/objectaddress.c:4146
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "tabla foránea %s"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "relación %s"
 
-#: catalog/objectaddress.c:4192
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "familia de operadores %s para el método de acceso %s"
@@ -5816,7 +5890,7 @@ msgstr "no se puede omitir el valor inicial cuando la función de transición es
 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:352 executor/nodeWindowAgg.c:2991
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3057
 #, 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"
@@ -5831,7 +5905,7 @@ msgstr "la función final con argumentos extra no debe declararse STRICT"
 msgid "return type of combine function %s is not %s"
 msgstr "el tipo de retorno de la función «combine» %s no es %s"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr "la función «combine» con tipo de transición %s no debe declararse STRICT"
@@ -5846,12 +5920,12 @@ msgstr "el tipo de retorno de la función de serialización %s no es %s"
 msgid "return type of deserialization function %s is not %s"
 msgstr "el tipo de retorno de la función de deserialización %s no es %s"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "no se puede determinar el tipo de dato del resultado"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "uso inseguro de pseudotipo «internal»"
@@ -5866,53 +5940,53 @@ msgstr "la implementación de la función de agregación en modo «moving» devu
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "el operador de ordenamiento sólo puede ser especificado para funciones de agregación de un solo argumento"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "no se puede cambiar el tipo de rutina"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "«%s» es una función de agregación corriente."
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "«%s» es una función de agregación de conjunto ordenado."
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "«%s» es una agregación de conjunto hipotético."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "no se puede cambiar cantidad de argumentos directos de una función de agregación"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "no existe la función %s"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "la función %s retorna un conjunto"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr "la función %s debe aceptar VARIADIC ANY para usarse en esta agregación"
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "la función %s requiere conversión de tipos en tiempo de ejecución"
@@ -5992,21 +6066,67 @@ msgstr "el ordenamiento «%s» ya existe"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "la codificación «%2$s» ya tiene un ordenamiento llamado «%1$s»"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7952
+#, fuzzy, c-format
+#| msgid "cannot alter constraint \"%s\" on relation \"%s\""
+msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
+msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
+
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9584
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "Puede que sea necesario hacer heredable la restricción existente usando %s."
+
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8301
+#, fuzzy, c-format
+#| msgid "cannot alter constraint \"%s\" on relation \"%s\""
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
+
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8303
+#: commands/tablecmds.c:9596
+#, fuzzy, c-format
+#| msgid "You might need to increase \"%s\"."
+msgid "You might need to validate it using %s."
+msgstr "Puede ser necesario incrementar «%s»."
+
+#: catalog/pg_constraint.c:792
+#, fuzzy, c-format
+#| msgid "cannot assign to system column \"%s\""
+msgid "cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr "no se puede asignar a la columna de sistema «%s»"
+
+#: catalog/pg_constraint.c:794
+#, fuzzy, c-format
+#| msgid "check constraint \"%s\" already exists"
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "la restricción «check» «%s» ya existe"
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "el dominio %2$s ya contiene una restricción llamada «%1$s»"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, 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:1125
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "no existe la restricción «%s» para el dominio %s"
 
+#: catalog/pg_constraint.c:1681
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "tipo no válido para la parte PERIOD de la llave foránea"
+
+#: catalog/pg_constraint.c:1682
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "Sólo de admiten rangos y multirangos."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -6017,27 +6137,27 @@ msgstr "ya existe la conversión «%s»"
 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:224 commands/extension.c:3397
+#: catalog/pg_depend.c:223 commands/extension.c:3689
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "«%s» ya es un miembro de la extensión «%s»"
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3729
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s no es un miembro de la extensión «%s»"
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:233
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "A una extensión no se le permite reemplazar un objeto que no posee."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:284
 #, c-format
 msgid "An extension may only use CREATE ... IF NOT EXISTS to skip object creation if the conflicting object is one that it already owns."
 msgstr "Una extensión sólo puede usar CREATE ... IF NOT EXISTS para omitir la creación de un objeto si el objeto en conflicto es uno de cual ya es dueña."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:647
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "no se puede eliminar dependencia a %s porque es un objeto requerido por el sistema"
@@ -6087,8 +6207,8 @@ msgstr "no se puede desprender la partición «%s»"
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "La partición está siendo desprendida de forma concurrente o tiene un desprendimiento sin terminar."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4800
-#: commands/tablecmds.c:16153
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916
+#: commands/tablecmds.c:17891
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "Utilice ALTER TABLE ... DETACH PARTITION ... FINALIZE para completar la operación de desprendimiento pendiente."
@@ -6193,44 +6313,44 @@ msgstr "el operator de negación %s ya es el negador del operador %u"
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "no existe el ACL de parámetro «%s»"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "las funciones no pueden tener más de %d argumento"
 msgstr[1] "las funciones no pueden tener más de %d argumentos"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "ya existe una función «%s» con los mismos argumentos"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "«%s» es una función de agregación."
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "«%s» es una función de agregación."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "«%s» es un índice parcial."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "«%s» es una función de ventana deslizante."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "no se puede cambiar que un procedimiento tenga parámetros de salida"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "no se puede cambiar el tipo de retorno de una función existente"
@@ -6239,109 +6359,110 @@ msgstr "no se puede cambiar el tipo de retorno de una función existente"
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "Use %s %s primero."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "Tipo de registro definido por parámetros OUT es diferente."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "no se puede cambiar el nombre del parámetro de entrada «%s»"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr "no se puede eliminar el valor por omisión de funciones existentes"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr "no se puede cambiar el tipo de dato del valor por omisión de un parámetro"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "no hay ninguna función interna llamada «%s»"
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "las funciones SQL no pueden retornar el tipo %s"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "las funciones SQL no pueden tener argumentos de tipo %s"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1468
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "función SQL «%s»"
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "no se puede agregar la relación «%s» a la publicación"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "Esta operación no está soportada en tablas de sistema."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "Esta operación no está soportada en tablas temporales."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "Esta característica no está soportada en tablas «unlogged»."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "no se puede agregar el esquema «%s» a la partición"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "Esta operación no está soportada en esquemas de sistema."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "Los esquemas temporales no pueden replicarse."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "la relación «%s» ya es un miembro de la publicación «%s»"
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr "no se puede usar la columna de sistema «%s» en lista de columnas de publicación"
 
-#: catalog/pg_publication.c:540
-#, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
+#: catalog/pg_publication.c:582
+#, fuzzy, c-format
+#| msgid "cannot use generated column \"%s\" in publication column list"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
 msgstr "no se puede usar la columna generada «%s» en lista de columnas de publicación"
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "columna «%s» duplicada en lista de columnas de publicación"
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "el esquema «%s» ya es miembro de la publicación «%s»"
@@ -6419,12 +6540,12 @@ msgstr "no se puede eliminar objetos de propiedad de %s porque son requeridos po
 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_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "no se pudo eliminar mapeo de relación para suscripción «%s»"
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "La sincronización de tabla para la relación «%s» está en progreso y su estado es «%c»."
@@ -6432,7 +6553,7 @@ msgstr "La sincronización de tabla para la relación «%s» está en progreso y
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "Utilice %s para activar la suscripción si aún no está activada, o utilice %s para eliminar la suscripción."
@@ -6463,7 +6584,7 @@ msgstr "el tamaño interno %d no es válido para un tipo pasado por valor"
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "el alineamiento «%c» no es válido para un tipo de largo variable"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "los tipos de tamaño fijo deben tener almacenamiento PLAIN"
@@ -6478,9 +6599,10 @@ msgstr "Falla al crear un tipo de multirango para el tipo «%s»."
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "Puede especificar manualmente un nombre para el tipo de multirango usando el atributo «multirange_type_name»."
 
-#: catalog/storage.c:533 storage/buffer/bufmgr.c:1540
-#, c-format
-msgid "invalid page in block %u of relation %s"
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
+#, fuzzy, c-format
+#| msgid "invalid page in block %u of relation %s"
+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/aggregatecmds.c:167
@@ -6563,7 +6685,7 @@ msgstr "las funciones de serialización pueden especificarse sólo cuando el tip
 msgid "must specify both or neither of serialization and deserialization functions"
 msgstr "debe especificar ambas o ninguna de las funciones de serialización y deserialización"
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr "el parámetro «parallel» debe ser SAFE, RESTRICTED o UNSAFE"
@@ -6573,17 +6695,17 @@ msgstr "el parámetro «parallel» debe ser SAFE, RESTRICTED o UNSAFE"
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "el parámetro «%s» debe ser READ_ONLY, SHAREABLE o READ_WRITE"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "el “trigger” por eventos «%s» ya existe"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "el conector de datos externos «%s» ya existe"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "el servidor «%s» ya existe"
@@ -6593,12 +6715,12 @@ msgstr "el servidor «%s» ya existe"
 msgid "language \"%s\" already exists"
 msgstr "ya existe el lenguaje «%s»"
 
-#: commands/alter.c:95 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "la publicación «%s» ya existe"
 
-#: commands/alter.c:98 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "la suscripción «%s» ya existe"
@@ -6638,21 +6760,21 @@ msgstr "la configuración de búsqueda en texto «%s» ya existe en el esquema 
 msgid "must be superuser to rename %s"
 msgstr "debe ser superusuario para cambiar el nombre de «%s»"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false es sólo para superusuario"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "Las suscripciones con la opción password_required puesta en falso sólo pueden ser creadas o modificadas por el superusuario."
 
-#: commands/alter.c:735
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "debe ser superusuario para definir el esquema de %s"
@@ -6672,7 +6794,7 @@ msgstr "Debe ser superusuario para crear un método de acceso."
 msgid "access method \"%s\" already exists"
 msgstr "el método de acceso «%s» ya existe"
 
-#: commands/amcmds.c:154 commands/indexcmds.c:224 commands/indexcmds.c:850
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
 #: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
@@ -6683,79 +6805,85 @@ msgstr "no existe el método de acceso «%s»"
 msgid "handler function is not specified"
 msgstr "no se ha especificado una función manejadora"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:204
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "la función %s debe retornar el tipo %s"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "omitiendo «%s»: no se puede analizar esta tabla foránea"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr "omitiendo «%s»: no se pueden analizar objetos que no son tablas, ni tablas especiales de sistema"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analizando la jerarquía de herencia «%s.%s»"
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analizando «%s.%s»"
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "la columna «%s» aparece más de una vez en la relación «%s»"
 
-#: commands/analyze.c:785
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "análisis automático de la tabla «%s.%s.%s»\n"
 
-#: commands/analyze.c:1300
+#: commands/analyze.c:805
+#, fuzzy, c-format
+#| msgid "heap table \"%s.%s.%s\":\n"
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "tabla heap «%s.%s.%s»:\n"
+
+#: commands/analyze.c:1346
 #, 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:1384
+#: commands/analyze.c:1430
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "omitiendo el análisis del árbol de herencia «%s.%s» --- este árbol no contiene tablas hijas"
 
-#: commands/analyze.c:1482
+#: commands/analyze.c:1528
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "omitiendo el análisis del árbol de herencia «%s.%s» --- este árbol no contiene tablas hijas analizables"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "el nombre de canal no puede ser vacío"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "el nombre de canal es demasiado largo"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "la cadena de carga es demasiado larga"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "no se puede hacer PREPARE de una transacción que ha ejecutado LISTEN, UNLISTEN o NOTIFY"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "demasiadas notificaciones en la cola NOTIFY"
@@ -6775,82 +6903,85 @@ msgstr "El proceso servidor con PID %d está entre aquellos con transacciones m
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "La cola NOTIFY no puede vaciarse hasta que ese proceso cierre su transacción actual."
 
-#: commands/cluster.c:128
-#, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "opción de CLUSTER «%s» no reconocida"
+#: commands/cluster.c:127 commands/dbcommands.c:2356
+#: commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234
+#: commands/vacuum.c:308
+#, fuzzy, c-format
+#| msgid "unrecognized role option \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "opción de rol «%s» no reconocida"
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "no se pueden reordenar tablas temporales de otras sesiones"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "no hay un índice de ordenamiento definido para la tabla «%s»"
 
-#: commands/cluster.c:191 commands/tablecmds.c:14797 commands/tablecmds.c:16729
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "no existe el índice «%s» en la tabla «%s»"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "no se puede reordenar un catálogo compartido"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "no se puede hacer vacuum a tablas temporales de otras sesiones"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16739
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "«%s» no es un índice de la tabla «%s»"
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, c-format
 msgid "cannot cluster on index \"%s\" because access method does not support clustering"
 msgstr "no se puede reordenar en índice «%s» porque el método de acceso no soporta reordenamiento"
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "no se puede reordenar en índice parcial «%s»"
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "no se puede reordenar en el índice no válido «%s»"
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "no se puede marcar un índice «clustered» en una tabla particionada"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, 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:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "reordenando «%s.%s» usando un recorrido secuencial y ordenamiento"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "haciendo vacuum a «%s.%s»"
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
 msgstr "«%s.%s»: se encontraron %.0f versiones de filas eliminables, %.0f no eliminables en %u páginas"
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -6859,7 +6990,7 @@ msgstr ""
 "%.0f versiones muertas de filas no pueden ser eliminadas aún.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "permiso denegado a hacer cluster a «%s», ignorando"
@@ -6870,13 +7001,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "el atributo de ordenamiento (collation) «%s» no es reconocido"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8129
-#: replication/pgoutput/pgoutput.c:314 replication/pgoutput/pgoutput.c:337
-#: replication/pgoutput/pgoutput.c:351 replication/pgoutput/pgoutput.c:361
-#: replication/pgoutput/pgoutput.c:371 replication/pgoutput/pgoutput.c:381
-#: replication/pgoutput/pgoutput.c:393 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8394
+#: replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372
+#: replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392
+#: replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137
+#: replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420
+#: replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "opciones contradictorias o redundantes"
@@ -6907,7 +7039,7 @@ msgstr "proveedor de ordenamiento no reconocido: %s"
 msgid "parameter \"%s\" must be specified"
 msgstr "el parámetro «%s» debe especificarse"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "usando la forma estándar «%s» para la configuración regional ICU «%s»"
@@ -6917,7 +7049,7 @@ msgstr "usando la forma estándar «%s» para la configuración regional ICU «%
 msgid "nondeterministic collations not supported with this provider"
 msgstr "los ordenamientos no determinísticos no están soportados con este proveedor"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "no se pueden especificar reglas ICU a menos que el proveedor de configuración regional sea ICU"
@@ -6927,68 +7059,69 @@ msgstr "no se pueden especificar reglas ICU a menos que el proveedor de configur
 msgid "current database's encoding is not supported with this provider"
 msgstr "la codificación de la base de datos actual no está soportada con este proveedor"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr "ya existe un ordenamiento (collation) llamado «%s» para la codificación «%s» en el esquema «%s»"
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "ya existe un ordenamiento llamado «%s» en el esquema «%s»"
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "no se puede refrescar la versión del ordenamiento por omisión"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7905 commands/tablecmds.c:7915
-#: commands/tablecmds.c:7917 commands/tablecmds.c:14499
-#: commands/tablecmds.c:17884 commands/tablecmds.c:17905
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8146 commands/tablecmds.c:8156
+#: commands/tablecmds.c:8158 commands/tablecmds.c:16149
+#: commands/tablecmds.c:19677 commands/tablecmds.c:19698
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "Use %s en su lugar."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2566
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "cambiando versión de %s a %s"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2579
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "la versión no ha cambiado"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2749
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "no existe la base de datos con OID %u"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "no existe el ordenamiento (collation) con OID %u"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr "debe ser superusuario para importar ordenamientos del sistema"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "no se encontraron locales de sistema utilizables"
 
-#: commands/comment.c:61 commands/dbcommands.c:1665 commands/dbcommands.c:1883
-#: commands/dbcommands.c:1995 commands/dbcommands.c:2193
-#: commands/dbcommands.c:2433 commands/dbcommands.c:2526
-#: commands/dbcommands.c:2650 commands/dbcommands.c:3161
-#: utils/init/postinit.c:1034 utils/init/postinit.c:1098
-#: utils/init/postinit.c:1171
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2473 commands/dbcommands.c:2566
+#: commands/dbcommands.c:2690 commands/dbcommands.c:3201
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "no existe la base de datos «%s»"
@@ -6998,12 +7131,12 @@ msgstr "no existe la base de datos «%s»"
 msgid "cannot set comment on relation \"%s\""
 msgstr "no se puede definir comentario en la relación «%s»"
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, 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:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la función «%s» debe ser ejecutada AFTER ROW"
@@ -7073,268 +7206,314 @@ msgstr "se ha denegado el permiso para hacer COPY a un archivo"
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "Sólo los roles con privilegios del rol «%s» pueden hacer COPY hacia un archivo."
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "no se permiten columnas generadas en las condiciones WHERE de COPY FROM"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824
+#: commands/tablecmds.c:19906 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "La columna «%s» es una columna generada."
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM no está soportado con seguridad a nivel de registros"
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Use sentencias INSERT en su lugar."
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "no se puede usar «%s» con HEADER en COPY TO"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "«%s» requiere un valor lógico (booleano) o «match»"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:782 commands/copy.c:798
-#: commands/copy.c:815 commands/copy.c:841 commands/copy.c:851
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873
+#: commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s no puede usarse con %s"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:441
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "no se reconoce el valor «%2$s» para COPY %1$s"
 
-#: commands/copy.c:502
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s requiere un valor numérico"
+
+#: commands/copy.c:485
+#, fuzzy, c-format
+#| msgid "CACHE (%lld) must be greater than zero"
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "el CACHE (%lld) debe ser mayor que cero"
+
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "el formato de COPY «%s» no es reconocido"
 
-#: commands/copy.c:560 commands/copy.c:575 commands/copy.c:590
-#: commands/copy.c:609
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663
+#: commands/copy.c:682
 #, 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:621
+#: commands/copy.c:694
 #, 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:642 commands/dbcommands.c:866 commands/dbcommands.c:2381
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "no se reconoce la opción «%s»"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:655 commands/copy.c:660 commands/copy.c:665
-#: commands/copy.c:740
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745
+#: commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "no se puede especificar %s en modo BINARY"
 
-#: commands/copy.c:670
-#, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr "sólo ON ERROR STOP es permitido en modo BINARY"
-
-#: commands/copy.c:692
+#: commands/copy.c:767
 #, 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:699
+#: commands/copy.c:774
 #, 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:705
+#: commands/copy.c:780
 #, 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:715
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "la representación de default de COPY no puede usar el carácter de nueva línea ni el de retorno de carro"
 
-#: commands/copy.c:733
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "el delimitador de COPY no puede ser «%s»"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:747 commands/copy.c:764 commands/copy.c:776
-#: commands/copy.c:791 commands/copy.c:807
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851
+#: commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "COPY %s requiere modo CSV"
 
-#: commands/copy.c:752
+#: commands/copy.c:827
 #, 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:757
+#: commands/copy.c:832
 #, 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:769
+#: commands/copy.c:844
 #, 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"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:823 commands/copy.c:859
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "el carácter delimitador de COPY no debe aparecer en la especificación %s"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:832 commands/copy.c:868
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "el carácter de «quote» de CSV no debe aparecer en la especificación %s"
 
-#: commands/copy.c:877
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "las especificaciones NULL y DEFAULT no pueden ser la misma"
 
-#: commands/copy.c:939
+#: commands/copy.c:958
+#, c-format
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "sólo ON ERROR STOP es permitido en modo BINARY"
+
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:965
+#, fuzzy, c-format
+#| msgid "COPY %s requires CSV mode"
+msgid "COPY %s requires %s to be set to %s"
+msgstr "COPY %s requiere modo CSV"
+
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "la columna «%s» es una columna generada"
 
-#: commands/copy.c:941
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "Las columnas generadas no pueden usarse en COPY."
 
-#: commands/copy.c:956 commands/indexcmds.c:1890 commands/statscmds.c:239
-#: commands/tablecmds.c:2526 commands/tablecmds.c:2997
-#: commands/tablecmds.c:3808 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260
+#: commands/tablecmds.c:2593 commands/tablecmds.c:3101
+#: commands/tablecmds.c:3930 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
 #: utils/adt/tsvector_op.c:2853
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "no existe la columna «%s»"
 
-#: commands/copy.c:963 commands/tablecmds.c:2552 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la columna «%s» fue especificada más de una vez"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, línea %llu, columna %s"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, línea %<PRIu64>, columna %s"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, línea %llu"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, línea %<PRIu64>"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, línea %llu, columna %s: «%s»"
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, línea %<PRIu64>, columna %s: «%s»"
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, línea %llu, columna %s: entrada nula"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, línea %<PRIu64>, columna %s: entrada nula"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, línea %llu: «%s»"
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, línea %<PRIu64>: «%s»"
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "no se puede copiar hacia la vista «%s»"
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr "Para posibilitar «copy» a una vista, provea un “trigger” INSTEAD OF INSERT."
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "no se puede copiar hacia la vista materializada «%s»"
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "no se puede copiar hacia la secuencia «%s»"
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, 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/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "no se puede hacer COPY FREEZE a una tabla particionada"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, fuzzy, c-format
+#| msgid "cannot perform COPY FREEZE on a partitioned table"
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "no se puede hacer COPY FREEZE a una tabla particionada"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr "no se puede ejecutar COPY FREEZE debido a actividad anterior en la transacción"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid "cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "no se puede ejecutar COPY FREEZE porque la tabla no fue creada ni truncada en la subtransacción en curso"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
+#, fuzzy, c-format
+#| msgid "%llu row was skipped due to data type incompatibility"
+#| msgid_plural "%llu rows were skipped due to data type incompatibility"
+msgid "skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type incompatibility"
+msgstr "%llu fila fue ignorada por incompatibilidad de tipo de dato"
+
+#: commands/copyfrom.c:1474
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] "%llu fila fue ignorada por incompatibilidad de tipo de dato"
-msgstr[1] "%llu filas fueron ignoradas por incompatibilidad de tipo de dato"
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "%<PRIu64> fila fue ignorada por incompatibilidad de tipo de dato"
+msgstr[1] "%<PRIu64> filas fueron ignoradas por incompatibilidad de tipo de dato"
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1448 commands/copyfrom.c:1491 commands/copyto.c:601
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "la columna %s «%s» no es referenciada en COPY"
 
-#: commands/copyfrom.c:1544 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:386
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "no existe el procedimiento por omisión de conversión desde la codificación «%s» a «%s»"
 
-#: commands/copyfrom.c:1742
+#: commands/copyfrom.c:1882
 #, c-format
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY FROM indica al proceso servidor de PostgreSQL leer un archivo. Puede desear usar una facilidad del lado del cliente como \\copy de psql."
 
-#: commands/copyfrom.c:1755 commands/copyto.c:706
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» es un directorio"
 
-#: commands/copyfrom.c:1823 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, 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/copyfrom.c:1838 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "el programa «%s» falló"
@@ -7375,676 +7554,681 @@ msgid "could not read from COPY file: %m"
 msgstr "no se pudo leer desde archivo COPY: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:381
+#: replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "se encontró fin de archivo inesperado en una conexión con una transacción abierta"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "se recibió un mensaje de tipo 0x%02X inesperado durante COPY desde la entrada estándar"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "falló COPY desde la entrada estándar: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "número de campos en línea de cabecera erróneo: %d, se esperaban %d"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid "column name mismatch in header line field %d: got null value (\"%s\"), expected \"%s\""
 msgstr "discordancia de nombre de columna en campo %d de la línea de encabezado: se obtuvo valor nulo («%s»), se esperaba «%s»"
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
 msgstr "discordancia en nombre de columna en campo %d de la línea de encabezado: se obtuvo «%s», se esperaba «%s»"
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "datos extra después de la última columna esperada"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "faltan datos en la columna «%s»"
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": \"%s\""
-msgstr "omitiendo fila debido a incompatibilidad de tipo en la línea %llu para la columna «%s»: «%s»"
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": \"%s\""
+msgstr "omitiendo fila debido a incompatibilidad de tipo en la línea %<PRIu64> para la columna «%s»: «%s»"
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": null input"
-msgstr "omitiendo fila debido a incompatibilidad de tipo en la línea %llu para la columna «%s»: entrada nula"
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": null input"
+msgstr "omitiendo fila debido a incompatibilidad de tipo en la línea %<PRIu64> para la columna «%s»: entrada nula"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "se recibieron datos de copy después del marcador EOF"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "la cantidad de registros es %d, pero se esperaban %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "se encontró un retorno de carro literal en los datos"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "se encontró un retorno de carro fuera de comillas en los datos"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Use «\\r» para representar el retorno de carro."
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, 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/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "se encontró un salto de línea literal en los datos"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "se encontró un salto de línea fuera de comillas en los datos"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Use «\\n» para representar un salto de línea."
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, 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/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, 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/copyfromparse.c:1428 commands/copyfromparse.c:1444
-#, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "marcador fin-de-copy corrupto"
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
+#, fuzzy, c-format
+#| msgid "end-of-copy marker does not match previous newline style"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "el marcador fin-de-copy no coincide con el estilo previo de salto de línea"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "marcador “default” inesperado en datos de COPY"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "La columna «%s» no tiene valor por omisión."
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "un valor entre comillas está inconcluso"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "EOF inesperado en datos de COPY"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "el tamaño de campo no es válido"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "el formato de datos binarios es incorrecto"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "no se pudo escribir al programa COPY: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "no se pudo escribir archivo COPY: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "no se puede copiar desde la vista «%s»"
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Intente la forma COPY (SELECT ...) TO."
 
-#: commands/copyto.c:385
-#, c-format
-msgid "cannot copy from materialized view \"%s\""
+#: commands/copyto.c:660
+#, fuzzy, c-format
+#| msgid "cannot copy from materialized view \"%s\""
+msgid "cannot copy from unpopulated materialized view \"%s\""
 msgstr "no se puede copiar desde la vista materializada «%s»"
 
-#: commands/copyto.c:391
+#: commands/copyto.c:662 executor/execUtils.c:760
+#, c-format
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "Use la orden REFRESH MATERIALIZED VIEW."
+
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "no se puede copiar desde la tabla foránea «%s»"
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "no se puede copiar desde la secuencia «%s»"
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "no se puede hacer copy de la tabla particionada «%s»"
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, 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/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "las reglas DO INSTEAD NOTHING no están soportadas para COPY"
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "las reglas DO INSTEAD condicionales no están soportadas para COPY"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
 msgid "DO ALSO rules are not supported for COPY"
 msgstr "las reglas DO ALSO no están soportadas para COPY"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "las reglas DO INSTEAD de múltiples sentencias no están soportadas para COPY"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) no está soportado"
 
-#: commands/copyto.c:499
+#: commands/copyto.c:778
 #, c-format
 msgid "COPY query must not be a utility command"
 msgstr "la consulta COPY no debe ser una orden de utilidad"
 
-#: commands/copyto.c:515
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "la consulta COPY debe tener una cláusula RETURNING"
 
-#: commands/copyto.c:544
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "la relación referenciada por la sentencia COPY ha cambiado"
 
-#: commands/copyto.c:671
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "no se permiten rutas relativas para COPY hacia un archivo"
 
-#: commands/copyto.c:690
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "no se pudo abrir el archivo «%s» para escritura: %m"
 
-#: commands/copyto.c:693
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY TO indica al proceso servidor PostgreSQL escribir a un archivo. Puede desear usar facilidades del lado del cliente, como \\copy de psql."
 
-#: commands/createas.c:210 commands/createas.c:516
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "se especificaron demasiados nombres de columna"
 
-#: commands/createas.c:539
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "las políticas no están implementadas para esta orden"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION ya no está soportado"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "Considere usar tablespaces."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "los OIDs menores que %u están reservados para objetos del sistema"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d no es un código válido de codificación"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s no es un nombre válido de codificación"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "proveedor de ordenamiento no reconocido: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2414 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "límite de conexión no válido: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "se ha denegado el permiso para crear la base de datos"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "no existe la base de datos patrón «%s»"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "no se puede usar la base de datos «%s» no válida como plantilla"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2444
-#: utils/init/postinit.c:1113
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "Use DROP DATABASE para eliminar una base de datos no válida."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "se ha denegado el permiso para copiar la base de datos «%s»"
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "estrategia de creación de base de dato no válida: «%s»"
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "Las estrategias válidas son «wal_log» y «file_copy»."
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "la codificación de servidor %d no es válida"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "nombre de configuración regional LC_COLLATE no válido: «%s»"
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
-#, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, fuzzy, c-format
+#| msgid "If the locale name is specific to ICU, use ICU_LOCALE."
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "Si el nombre de configuración regional es específico a ICU, use ICU_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
+#, fuzzy, c-format
+#| msgid "If the locale name is specific to ICU, use ICU_LOCALE."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
 msgstr "Si el nombre de configuración regional es específico a ICU, use ICU_LOCALE."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "nombre de configuración regional LC_CTYPE no válido: «%s»"
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "no se puede especificar BUILTIN_LOCALE a menos que el proveedor de configuración regional sea builtin"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "no se puede especificar una configuración regional ICU a menos que el proveedor de configuración regional sea ICU"
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "debe especificarse LOCALE o BUILTIN_LOCALE"
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "la codificación «%s» no está soportada por ICU"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "debe especificarse LOCALE o ICU_LOCALE"
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "la nueva codificación (%s) es incompatible con la codificación de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "Use la misma codificación que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "la nueva «collation» (%s) es incompatible con la «collation» de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "Use la misma «collation» que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "el nuevo LC_CTYPE (%s) es incompatible con el LC_CTYPE de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "Use el mismo LC_CTYPE que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "el nuevo proveedor de configuración regional (%s) no coincide con el proveedor de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "Use el mismo proveedor de «locale» que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "la nueva configuración regional ICU (%s) es incompatible con la configuración regional ICU de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "Use la misma configuración regional («locale») que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "las nuevas reglas de «collation» ICU (%s) son incompatibles con las reglas de «collation» ICU de la base de datos patrón (%s)"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "Use las mismas reglas de «collation» ICU que en la base de datos patrón, o bien use template0 como patrón."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "la base de datos patrón «%s» tiene una versión de configuración regional, pero no se pudo determinar una versión real"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "discordancia en la versión de «collation» de la base de datos patrón «%s»"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "La base de datos patrón fue creada usando la versión %s, pero el sistema operativo provee la versión %s."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Reconstruya todos los objetos de la base de datos patrón afectados por este ordenamiento y ejecute ALTER DATABASE %s REFRESH COLLATION VERSION, o construya PostgreSQL con la versión correcta de la biblioteca."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2041
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "no puede usarse pg_global como tablespace por omisión"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "no se puede asignar el nuevo tablespace por omisión «%s»"
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr "Hay un conflicto puesto que la base de datos «%s» ya tiene algunas tablas en este tablespace."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1912
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "la base de datos «%s» ya existe"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "la base de datos de origen «%s» está siendo utilizada por otros usuarios"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "el OID de base de datos %u ya está en uso por la base de datos «%s»"
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "el directorio de datos con el OID %u especificado ya existe"
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2588
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "la codificación «%s» no coincide con la configuración regional «%s»"
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "El parámetro LC_CTYPE escogido requiere la codificación «%s»."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "El parámetro LC_COLLATE escogido requiere la codificación «%s»."
 
-#: commands/dbcommands.c:1672
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "no existe la base de datos «%s», omitiendo"
 
-#: commands/dbcommands.c:1696
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "no se puede borrar una base de datos patrón"
 
-#: commands/dbcommands.c:1702
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "no se puede eliminar la base de datos activa"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "la base de datos «%s» está en uso por un slot de replicación lógica activo"
 
-#: commands/dbcommands.c:1717
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "Hay %d slot activo."
 msgstr[1] "Hay %d slots activos."
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "la base de datos «%s» está siendo utilizada por suscripciones de replicación lógica"
 
-#: commands/dbcommands.c:1733
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "Hay %d suscripción."
 msgstr[1] "Hay %d suscripciones."
 
-#: commands/dbcommands.c:1754 commands/dbcommands.c:1934
-#: commands/dbcommands.c:2063
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "la base de datos «%s» está siendo utilizada por otros usuarios"
 
-#: commands/dbcommands.c:1894
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "se ha denegado el permiso para cambiar el nombre a la base de datos"
 
-#: commands/dbcommands.c:1923
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "no se puede cambiar el nombre de la base de datos activa"
 
-#: commands/dbcommands.c:2019
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "no se puede cambiar el tablespace de la base de datos activa"
 
-#: commands/dbcommands.c:2125
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "algunas relaciones de la base de datos «%s» ya están en el tablespace «%s»"
 
-#: commands/dbcommands.c:2127
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "Debe moverlas de vuelta al tablespace por omisión de la base de datos antes de ejecutar esta orden."
 
-#: commands/dbcommands.c:2256 commands/dbcommands.c:2999
-#: commands/dbcommands.c:3299 commands/dbcommands.c:3412
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039
+#: commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "algunos archivos inútiles pueden haber quedado en el directorio \"%s\""
 
-#: commands/dbcommands.c:2317
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "opción de DROP DATABASE «%s» no reconocida"
-
-#: commands/dbcommands.c:2395
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "la opción «%s» no puede ser especificada con otras opciones"
 
-#: commands/dbcommands.c:2443
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "no se puede alterar base de datos no válida «%s»"
 
-#: commands/dbcommands.c:2460
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "no se pueden prohibir las conexiones para la base de datos actual"
 
-#: commands/dbcommands.c:2690
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "se ha denegado el permiso para cambiar el dueño de la base de datos"
 
-#: commands/dbcommands.c:3105
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "Hay otras %d sesiones y %d transacciones preparadas usando la base de datos."
 
-#: commands/dbcommands.c:3108
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "Hay %d otra sesión usando la base de datos."
 msgstr[1] "Hay otras %d sesiones usando la base de datos."
 
-#: commands/dbcommands.c:3113 storage/ipc/procarray.c:3859
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "Hay %d otra transacción preparada usando la base de datos."
 msgstr[1] "Hay otras %d transacciones preparadas usando la base de datos."
 
-#: commands/dbcommands.c:3255
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "directorio «%s» faltante"
 
-#: commands/dbcommands.c:3313 commands/tablespace.c:184
+#: commands/dbcommands.c:3353 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "no se pudo hacer stat al directorio «%s»: %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s requiere un parámetro"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s requiere un valor numérico"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "«%s» requiere un valor lógico (booleano)"
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s requiere valor entero"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "el argumento de %s debe ser un nombre"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "el argumento de %s debe ser un nombre de tipo"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "argumento no válido para %s: «%s»"
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2910
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "«%s» es una función de agregación"
@@ -8054,19 +8238,19 @@ msgstr "«%s» es una función de agregación"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Use DROP AGGREGATE para eliminar funciones de agregación."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3892
-#: commands/tablecmds.c:4050 commands/tablecmds.c:4102
-#: commands/tablecmds.c:17161 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014
+#: commands/tablecmds.c:4175 commands/tablecmds.c:4227
+#: commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "no existe la relación «%s», omitiendo"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1409
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "el esquema «%s» no existe, omitiendo"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "el tipo «%s» no existe, omitiendo"
@@ -8086,7 +8270,7 @@ msgstr "no existe el ordenamiento (collation) «%s», omitiendo"
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "no existe la conversión «%s», omitiendo"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "no existe el objeto de estadísticas «%s», omitiendo"
@@ -8181,7 +8365,7 @@ msgstr "la regla «%s» para la relación «%s» no existe, omitiendo"
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "no existe el conector de datos externos «%s», omitiendo"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "el servidor «%s» no existe, omitiendo"
@@ -8201,502 +8385,511 @@ msgstr "no existe la familia de operadores «%s» para el método de acceso «%s
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "no existe la publicación «%s», omitiendo"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "se ha denegado el permiso para crear el “trigger” por eventos «%s»"
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "Debe ser superusuario para crear un “trigger” por eventos."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "nommre de evento «%s» no reconocido"
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "variable de filtro «%s» no reconocida"
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "el filtrado de «tags» no está soportado en “triggers” por evento de login"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "el valor de filtro «%s» no es reconocido por la variable de filtro «%s»"
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "los “triggers” por evento no están soportados para %s"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "la variable de filtro «%s» fue especificada más de una vez"
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490
-#: commands/event_trigger.c:584
+#: commands/event_trigger.c:442 commands/event_trigger.c:494
+#: commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "no existe el “trigger” por eventos «%s»"
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "no existe el “trigger” por eventos con OID %u"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "se ha denegado el permiso para cambiar el dueño del “trigger” por eventos «%s»"
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "El dueño de un “trigger” por eventos debe ser un superusuario."
 
-#: commands/event_trigger.c:1409
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s sólo puede invocarse en una función de un “trigger” en el evento sql_drop"
 
-#: commands/event_trigger.c:1502 commands/event_trigger.c:1523
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, 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 “trigger” en el evento table_rewrite"
 
-#: commands/event_trigger.c:1936
+#: commands/event_trigger.c:2063
 #, 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 “trigger” por eventos"
 
-#: commands/explain.c:241 commands/explain.c:266
-#, 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:273
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "opción de EXPLAIN «%s» no reconocida"
+#: commands/explain_state.c:133 commands/explain_state.c:158
+#: replication/walsender.c:1151
+#, fuzzy, c-format
+#| msgid "unrecognized value for role option \"%s\": \"%s\""
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "valor no reconocido para la opción de rol «%s»: «%s»"
 
-#: commands/explain.c:282
-#, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
+#, fuzzy, c-format
+#| msgid "EXPLAIN option WAL requires ANALYZE"
+msgid "EXPLAIN option %s requires ANALYZE"
 msgstr "la opción WAL de EXPLAIN requiere ANALYZE"
 
-#: commands/explain.c:291
-#, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "la opción TIMING de EXPLAIN requiere ANALYZE"
-
-#: commands/explain.c:297
-#, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "la opción SERIALIZE de EXPLAIN requiere ANALYZE"
-
-#: commands/explain.c:303
-#, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "las opciones ANALYZE y GENERIC_PLAN de EXPLAIN no pueden usarse juntas"
+#: commands/explain_state.c:198
+#, fuzzy, c-format
+#| msgid "options %s and %s cannot be used together"
+msgid "%s options %s and %s cannot be used together"
+msgstr "las opciones %s y %s no pueden usarse juntas"
 
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:177 commands/extension.c:3323
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "no existe la extensión «%s»"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:242 commands/extension.c:251 commands/extension.c:263
+#: commands/extension.c:273
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "nombre de extensión no válido: «%s»"
 
-#: commands/extension.c:278
+#: commands/extension.c:243
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "Los nombres de extensión no deben ser vacíos."
 
-#: commands/extension.c:287
+#: commands/extension.c:252
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "Los nombres de extensión no deben contener «--»."
 
-#: commands/extension.c:299
+#: commands/extension.c:264
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Los nombres de extensión no deben empezar ni terminar con «-»."
 
-#: commands/extension.c:309
+#: commands/extension.c:274
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "Los nombres de extensión no deben contener caracteres separadores de directorio."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:289 commands/extension.c:298 commands/extension.c:307
+#: commands/extension.c:317
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "nombre de versión de extensión no válido: «%s»"
 
-#: commands/extension.c:325
+#: commands/extension.c:290
 #, c-format
 msgid "Version names must not be empty."
 msgstr "Los nombres de versión no deben ser vacíos."
 
-#: commands/extension.c:334
+#: commands/extension.c:299
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "Los nombres de versión no deben contener «--»."
 
-#: commands/extension.c:343
+#: commands/extension.c:308
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "Los nombres de versión no deben empezar ni terminar con «-»."
 
-#: commands/extension.c:353
+#: commands/extension.c:318
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "Los nombres de versión no deben contener caracteres separadores de directorio."
 
-#: commands/extension.c:507
+#: commands/extension.c:543
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "la extensión «%s» no está disponible"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "No se pudo abrir el archivo de control de extensión «%s»: %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:544
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "La extensión debe primero ser instalada en el sistema donde PostgreSQL está ejecutándose."
 
-#: commands/extension.c:514
+#: commands/extension.c:566
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de control de extensión «%s»: %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:589 commands/extension.c:599
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "el parámetro «%s» no se puede cambiar en un archivo control secundario de extensión"
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:621 commands/extension.c:629 commands/extension.c:637
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "el parámetro «%s» requiere un valor lógico (booleano)"
 
-#: commands/extension.c:594
+#: commands/extension.c:646
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "«%s» no es un nombre válido de codificación"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:660 commands/extension.c:675
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "el parámetro «%s» debe ser una lista de nombres de extensión"
 
-#: commands/extension.c:630
+#: commands/extension.c:682
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "parámetro no reconocido «%s» en el archivo «%s»"
 
-#: commands/extension.c:639
+#: commands/extension.c:691
 #, c-format
 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:817
+#: commands/extension.c:867
+#, fuzzy, c-format
+#| msgid "SQL statement \"%s\""
+msgid "SQL statement \"%.*s\""
+msgstr "sentencia SQL: «%s»"
+
+#: commands/extension.c:896
+#, fuzzy, c-format
+#| msgid "unrecognized descriptor item \"%s\" on line %d"
+msgid "extension script file \"%s\", near line %d"
+msgstr "elemento de descriptor no reconocido «%s» en línea %d"
+
+#: commands/extension.c:900
+#, fuzzy, c-format
+#| msgid "skipping special file \"%s\""
+msgid "extension script file \"%s\""
+msgstr "omitiendo el archivo especial «%s»"
+
+#: commands/extension.c:1012
 #, 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:897
+#: commands/extension.c:1094
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "se ha denegado el permiso para crear la extensión «%s»"
 
-#: commands/extension.c:900
+#: commands/extension.c:1097
 #, c-format
 msgid "Must have CREATE privilege on current database to create this extension."
 msgstr "Debe tener privilegio CREATE en la base de datos actual para crear esta extensión."
 
-#: commands/extension.c:901
+#: commands/extension.c:1098
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Debe ser superusuario para crear esta extensión."
 
-#: commands/extension.c:905
+#: commands/extension.c:1102
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "se ha denegado el permiso para actualizar la extensión «%s»"
 
-#: commands/extension.c:908
+#: commands/extension.c:1105
 #, c-format
 msgid "Must have CREATE privilege on current database to update this extension."
 msgstr "Debe tener privilegio CREATE en la base de datos actual para actualizar esta extensión."
 
-#: commands/extension.c:909
+#: commands/extension.c:1106
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Debe ser superusuario para actualizar esta extensión."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1239
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "carácter no válido en dueño de extensión: no debe contener ninguno de «%s»"
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1263 commands/extension.c:1290
 #, c-format
 msgid "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr "carácter no válido en esquema de extensión «%s»: no debe contener ninguno de «%s»"
 
-#: commands/extension.c:1288
+#: commands/extension.c:1485
 #, 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:1496 commands/extension.c:3089
+#: commands/extension.c:1693 commands/extension.c:3381
 #, c-format
 msgid "version to install must be specified"
 msgstr "la versión a instalar debe ser especificada"
 
-#: commands/extension.c:1533
+#: commands/extension.c:1730
 #, c-format
 msgid "extension \"%s\" has no installation script nor update path for version \"%s\""
 msgstr "la extensión «%s» no tiene script de instalación ni ruta de actualización para la versión «%s»"
 
-#: commands/extension.c:1567
+#: commands/extension.c:1764
 #, 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:1727
+#: commands/extension.c:1924
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "detectada una dependencia cíclica entre las extensiones «%s» y «%s»"
 
-#: commands/extension.c:1732
+#: commands/extension.c:1929
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "instalando la extensión requerida «%s»"
 
-#: commands/extension.c:1755
+#: commands/extension.c:1952
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "la extensión requerida «%s» no está instalada"
 
-#: commands/extension.c:1758
+#: commands/extension.c:1955
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr "Use CREATE EXTENSION ... CASCADE para instalar además las extensiones requeridas."
 
-#: commands/extension.c:1793
+#: commands/extension.c:1990
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "la extensión «%s» ya existe, omitiendo"
 
-#: commands/extension.c:1800
+#: commands/extension.c:1997
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "la extensión «%s» ya existe"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2008
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "los CREATE EXTENSION anidados no están soportados"
 
-#: commands/extension.c:1975
+#: commands/extension.c:2172
 #, 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:2450
+#: commands/extension.c:2689
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s sólo puede invocarse desde un script SQL ejecutado por CREATE EXTENSION"
 
-#: commands/extension.c:2462
+#: commands/extension.c:2701
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "el OID %u no hace referencia a una tabla"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2706
 #, 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:2813
+#: commands/extension.c:3105
 #, 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:2854 commands/extension.c:2948
+#: commands/extension.c:3146 commands/extension.c:3240
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "la extensión «%s» no soporta SET SCHEMA"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3203
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "no se puede hacer SET SCHEMA de la extensión «%s» porque otras extensiones lo impiden"
 
-#: commands/extension.c:2913
+#: commands/extension.c:3205
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "La extensión «%s» solicita no relocalizar la extensión «%s»."
 
-#: commands/extension.c:2950
+#: commands/extension.c:3242
 #, 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:3011
+#: commands/extension.c:3303
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "los ALTER EXTENSION anidados no están soportados"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3392
 #, 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:3311
+#: commands/extension.c:3603
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "no se puede añadir un objeto de este tipo a una extensión"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3701
 #, 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:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3783 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "no se pudo encontrar un tipo de multirango para el tipo de dato %s"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3825
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "el archivo «%s» es demasiado grande"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:3918 utils/fmgr/dfmgr.c:625
+#, fuzzy, c-format
+#| msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "un componente en el parámetro «dynamic_library_path» no es una ruta absoluta"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "opción «%s» no encontrada"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "la opción «%s» fue especificada más de una vez"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "se ha denegado el permiso para cambiar el dueño del conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "Debe ser superusuario para cambiar el dueño de un conector de datos externos."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "El dueño de un conector de datos externos debe ser un superusuario."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "no existe el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "no existe el conector de datos externos con OID %u"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "no existe el servidor foráneo con OID %u"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "se ha denegado el permiso para crear el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Debe ser superusuario para crear un conector de datos externos."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "se ha denegado el permiso para cambiar el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Debe ser superusuario para alterar un conector de datos externos."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "al cambiar el manejador del conector de datos externos, el comportamiento de las tablas foráneas existentes puede cambiar"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr "al cambiar el validador del conector de datos externos, las opciones para los objetos dependientes de él pueden volverse no válidas"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "el servidor «%s» ya existe, omitiendo"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "el mapeo de usuario «%s» ya existe para el servidor «%s», omitiendo"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "el mapeo de usuario «%s» ya existe para el servidor «%s»"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "no existe el mapeo de usuario «%s» para el servidor «%s»"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "no existe el mapeo de usuario «%s» para el servidor «%s», omitiendo"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "el conector de datos externos «%s» no tiene manejador"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "el conector de datos externos «%s» no soporta IMPORT FOREIGN SCHEMA"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "importando la tabla foránea «%s»"
@@ -8731,641 +8924,689 @@ msgstr "Creando una definición de tipo inconclusa."
 msgid "SQL function cannot accept shell type %s"
 msgstr "las funciones SQL no pueden aceptar el tipo inconcluso %s"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "las funciones de agregación no pueden aceptar el tipo inconcluso %s"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "el tipo de argumento %s está inconcluso"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "no existe el tipo %s"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "las funciones de agregación no pueden aceptar argumentos de conjunto"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "los procedimientos no pueden aceptar argumentos de conjunto"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "funciones no pueden aceptar argumentos de conjunto"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "el parámetro VARIADIC debe ser el último parámetro de entrada"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "el parámetro VARIADIC debe ser el último parámetro"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "el parámetro VARIADIC debe ser un array"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "nombre de parámetro «%s» usado más de una vez"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "solo los parámetros de entrada pueden tener valores por omisión"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "no se pueden usar referencias a tablas en el valor por omisión de un parámetro"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr "los parámetros de entrada después de uno que tenga valor por omisión también deben tener valores por omisión"
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr "los parámetros OUT no pueden aparecer después de uno que tenga valor por omisión"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "atributo no válido en definición de procedimiento"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "la función de soporte %s debe retornar el tipo %s"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "debe ser superusuario para especificar una función de soporte"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "COST debe ser positivo"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "ROWS debe ser positivo"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "no se ha especificado un cuerpo para la función"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "se ha especificado por duplicado el cuerpo para la función"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "cuerpo de función SQL en línea solo es válido para lenguaje SQL"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid "SQL function with unquoted function body cannot have polymorphic arguments"
 msgstr "una función SQL con el cuerpo de la función fuera de comillas no puede tener argumentos polimórficos"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr "%s aún no está soportado en una función SQL con el cuerpo fuera de comillas"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "sólo se requiere un item AS para el lenguaje «%s»"
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "no se ha especificado el lenguaje"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2117
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "no existe el lenguaje «%s»"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2119
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr "Use CREATE EXTENSION para cargar el lenguaje en la base de datos."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr "sólo un superusuario puede definir funciones «leakproof»"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "tipo de retorno de función debe ser %s debido a los parámetros OUT"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "el tipo de retorno de la función debe ser especificado"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS no es aplicable cuando una función no retorna un conjunto"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "el tipo de origen %s es un pseudotipo"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "el tipo de retorno %s es un pseudotipo"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "el cast será ignorado porque el tipo de datos de origen es un dominio"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "el cast será ignorado porque el tipo de datos de destino es un dominio"
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "la función de conversión lleva de uno a tres argumentos"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid "argument of cast function must match or be binary-coercible from source data type"
 msgstr "el argumento de la función de conversión debe coincidir o ser binario-convertible con el tipo de origen"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "el segundo argumento de la función de conversión debe ser de tipo %s"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "el tercer argumento de la función de conversión debe ser de tipo %s"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid "return data type of cast function must match or be binary-coercible to target 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"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "la función de conversión no debe ser volatile"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "la función de conversión debe ser una función normal"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "la función de conversión no debe retornar un conjunto"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "debe ser superusuario para crear una conversión sin especificar función"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "los tipos de datos de origen y destino no son físicamente compatibles"
 
-#: commands/functioncmds.c:1709
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "los tipos de datos compuestos no son binario-compatibles"
 
-#: commands/functioncmds.c:1715
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "los tipos de datos de array no son binario-compatibles"
 
-#: commands/functioncmds.c:1723
+#: commands/functioncmds.c:1741
 #, c-format
 msgid "range data types are not binary-compatible"
 msgstr "los tipos de datos de rango no son binario-compatibles"
 
-#: commands/functioncmds.c:1729
+#: commands/functioncmds.c:1747
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "los tipos de datos enum no son binario-compatibles"
 
-#: commands/functioncmds.c:1746
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "los tipos de dato de dominio no deben ser marcados binario-compatibles"
 
-#: commands/functioncmds.c:1756
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "el tipo de origen y el tipo de retorno son el mismo"
 
-#: commands/functioncmds.c:1789
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "la función de transformación no debe ser volatile"
 
-#: commands/functioncmds.c:1793
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "la función de transformación debe ser una función normal"
 
-#: commands/functioncmds.c:1797
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "la función de transformación no debe retornar un conjunto"
 
-#: commands/functioncmds.c:1801
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "la función de transformación debe recibir un argumento"
 
-#: commands/functioncmds.c:1805
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "el primer argumento de la función de transformación debe ser de tipo %s"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "el tipo de dato %s es un pseudo-tipo"
 
-#: commands/functioncmds.c:1850
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "tipo de dato «%s» es un dominio"
 
-#: commands/functioncmds.c:1890
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "el tipo de dato de retorno de la función FROM SQL debe ser %s"
 
-#: commands/functioncmds.c:1916
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "el tipo de dato de retorno de la función TO SQL debe ser el tipo de dato de la transformación"
 
-#: commands/functioncmds.c:1943
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "la transformación para el tipo %s lenguaje «%s» ya existe"
 
-#: commands/functioncmds.c:2029
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "la transformación para el tipo %s lenguaje «%s» no existe"
 
-#: commands/functioncmds.c:2053
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "ya existe una función llamada %s en el esquema «%s»"
 
-#: commands/functioncmds.c:2104
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "no se ha especificado código"
 
-#: commands/functioncmds.c:2150
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "el lenguaje «%s» no soporta ejecución de código en línea"
 
-#: commands/functioncmds.c:2245
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
 msgstr[0] "no se pueden pasar más de %d argumento a un procedimiento"
 msgstr[1] "no se pueden pasar más de %d argumentos a un procedimiento"
 
-#: commands/indexcmds.c:656
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "debe especificar al menos una columna"
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "no se puede usar más de %d columnas en un índice"
 
-#: commands/indexcmds.c:703
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "no se puede crear índice en la relación «%s»"
 
-#: commands/indexcmds.c:729
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr "no se puede crear un índice en la tabla particionada «%s» concurrentemente"
 
-#: commands/indexcmds.c:739
+#: commands/indexcmds.c:748
 #, c-format
 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:777 commands/tablecmds.c:818 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "no se puede especificar el tablespace por omisión para las relaciones particionadas"
 
-#: commands/indexcmds.c:809 commands/tablecmds.c:849 commands/tablecmds.c:3588
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, 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:842
+#: commands/indexcmds.c:851
 #, 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:863
+#: commands/indexcmds.c:872
 #, 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:868
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "el método de acceso «%s» no soporta columnas incluidas"
 
-#: commands/indexcmds.c:873
+#: commands/indexcmds.c:882
 #, 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:878
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "el método de acceso «%s» no soporta restricciones de exclusión"
 
-#: commands/indexcmds.c:1007
-#, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr "no se puede hacer coincidir la llave de partición a un índice usando el método de acceso «%s»"
+#: commands/indexcmds.c:892
+#, fuzzy, c-format
+#| msgid "access method \"%s\" does not support exclusion constraints"
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "el método de acceso «%s» no soporta restricciones de exclusión"
 
-#: commands/indexcmds.c:1017
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr "restricción %s no soportada con definición de llave de particionamiento"
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "No se pueden usar restricciones %s cuando las llaves de particionamiento incluyen expresiones."
 
-#: commands/indexcmds.c:1069
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469
+#: commands/indexcmds.c:2488 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553
+#: utils/adt/arrayfuncs.c:3864 utils/adt/arrayfuncs.c:4419
+#: utils/adt/arrayfuncs.c:6440 utils/adt/rowtypes.c:1220
+#, 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"
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2491
+#, fuzzy, c-format
+#| msgid "operator family %s for access method %s"
+msgid "There is no suitable operator in operator family \"%s\" for access method \"%s\"."
+msgstr "familia de operadores %s para el método de acceso %s"
+
+#: commands/indexcmds.c:1077
 #, c-format
 msgid "cannot match partition key to index on column \"%s\" using non-equal operator \"%s\""
 msgstr "no se puede hacer coincidir la llave de partición en la columna «%s» usando el operador «%s» que no es igualdad"
 
-#: commands/indexcmds.c:1085
+#: commands/indexcmds.c:1093
 #, c-format
 msgid "unique constraint on partitioned table must include all partitioning columns"
 msgstr "las restricciones unique en tablas particionadas deben incluir todas las columnas de particionamiento"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1094
 #, c-format
 msgid "%s constraint on table \"%s\" lacks column \"%s\" which is part of the partition key."
 msgstr "La restricción %s en la tabla «%s» no incluye la columna «%s» que es parte de la llave de particionamiento."
 
-#: commands/indexcmds.c:1105 commands/indexcmds.c:1124
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1147
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "la creación de índices en columnas de sistema no está soportada"
 
-#: commands/indexcmds.c:1354 tcop/utility.c:1515
+#: commands/indexcmds.c:1123
+#, fuzzy, c-format
+#| msgid "generated columns are not supported on typed tables"
+msgid "primary keys on virtual generated columns are not supported"
+msgstr "las columnas generadas no están soportadas en tablas tipadas"
+
+#: commands/indexcmds.c:1125 commands/indexcmds.c:1164
+#, fuzzy, c-format
+#| msgid "index creation on system columns is not supported"
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr "la creación de índices en columnas de sistema no está soportada"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1165
+#, fuzzy, c-format
+#| msgid "index creation on system columns is not supported"
+msgid "indexes on virtual generated columns are not supported"
+msgstr "la creación de índices en columnas de sistema no está soportada"
+
+#: commands/indexcmds.c:1397 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "no se puede crear un índice único en la tabla particionada «%s»"
 
-#: commands/indexcmds.c:1356 tcop/utility.c:1517
+#: commands/indexcmds.c:1399 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "La tabla «%s» contiene particiones que son tablas foráneas."
 
-#: commands/indexcmds.c:1806
+#: commands/indexcmds.c:1857
 #, 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:1885 parser/parse_utilcmd.c:2519
-#: parser/parse_utilcmd.c:2654
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735
+#: parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "no existe la columna «%s» en la llave"
 
-#: commands/indexcmds.c:1909 parser/parse_utilcmd.c:1807
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "las expresiones no están soportadas en columnas incluidas"
 
-#: commands/indexcmds.c:1950
+#: commands/indexcmds.c:2019
 #, 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:1965
+#: commands/indexcmds.c:2034
 #, c-format
 msgid "including column does not support a collation"
 msgstr "la columna incluida no permite un ordenamiento (collation)"
 
-#: commands/indexcmds.c:1969
+#: commands/indexcmds.c:2038
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "la columna incluida no permite una clase de operadores"
 
-#: commands/indexcmds.c:1973
+#: commands/indexcmds.c:2042
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "la columna incluida no permite las opciones ASC/DESC"
 
-#: commands/indexcmds.c:1977
+#: commands/indexcmds.c:2046
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "la columna incluida no permite las opciones NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:2020
+#: commands/indexcmds.c:2089
 #, 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:2028 commands/tablecmds.c:18185 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3771
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812
+#: parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4064
 #: utils/adt/misc.c:630
 #, 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:2095
+#: commands/indexcmds.c:2164
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "el operador %s no es conmutativo"
 
-#: commands/indexcmds.c:2097
+#: commands/indexcmds.c:2166
 #, 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:2123
+#: commands/indexcmds.c:2176
 #, 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:2126
+#: commands/indexcmds.c:2179
 #, 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:2161
+#: commands/indexcmds.c:2228
 #, 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:2166
+#: commands/indexcmds.c:2233
 #, 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:2210 commands/tablecmds.c:18210
-#: commands/tablecmds.c:18216 commands/typecmds.c:2311
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019
+#: commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, 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:2212
+#: commands/indexcmds.c:2279
 #, 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:2241 commands/indexcmds.c:2249
+#: commands/indexcmds.c:2308 commands/indexcmds.c:2316
 #: commands/opclasscmds.c:205
 #, 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:2263 commands/typecmds.c:2299
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, 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:2353
+#: commands/indexcmds.c:2420
 #, 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:2681
-#, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "opción de REINDEX «%s» no reconocida"
+#: commands/indexcmds.c:2470 commands/indexcmds.c:2489
+#, fuzzy, c-format
+#| msgid "could not identify an ordering operator for type %s"
+msgid "could not identify an overlaps operator for type %s"
+msgstr "no se pudo identificar un operador de ordenamiento para el tipo %s"
+
+#: commands/indexcmds.c:2471 commands/indexcmds.c:2490
+#, fuzzy, c-format
+#| msgid "could not identify an inequality operator for type %s"
+msgid "could not identify a contained-by operator for type %s"
+msgstr "no se pudo identificar un operador de desigualdad para el tipo %s"
+
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
+#, fuzzy, c-format
+#| msgid "Could not translate client host name \"%s\" to IP address: %s."
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "No se pudo traducir el nombre de host del cliente «%s» a una dirección IP: %s."
 
-#: commands/indexcmds.c:2913
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "la tabla «%s» no tiene índices que puedan ser reindexados concurrentemente"
 
-#: commands/indexcmds.c:2927
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "la tabla «%s» no tiene índices para reindexar"
 
-#: commands/indexcmds.c:2974 commands/indexcmds.c:3485
-#: commands/indexcmds.c:3615
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650
+#: commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "no se pueden reindexar catálogos de sistema concurrentemente"
 
-#: commands/indexcmds.c:2998
+#: commands/indexcmds.c:3163
 #, 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:3090
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "no se puede reindexar un catálogo de sistema concurrentemente, omitiéndolos todos"
 
-#: commands/indexcmds.c:3123
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "no se puede mover las relaciones de sistema, omitiendo todas"
 
-#: commands/indexcmds.c:3169
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "al reindexar tabla particionada «%s.%s»"
 
-#: commands/indexcmds.c:3172
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "al reindexar índice particionado «%s.%s»"
 
-#: commands/indexcmds.c:3365 commands/indexcmds.c:4241
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la tabla «%s.%s» fue reindexada"
 
-#: commands/indexcmds.c:3517 commands/indexcmds.c:3570
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "omitiendo reindexar índice no válido «%s.%s»"
 
-#: commands/indexcmds.c:3520 commands/indexcmds.c:3573
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "Use DROP INDEX o REINDEX INDEX."
 
-#: commands/indexcmds.c:3524
+#: commands/indexcmds.c:3689
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "no se puede reindexar el índice de restricción de exclusión «%s.%s» concurrentemente, omitiendo"
 
-#: commands/indexcmds.c:3680
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "no se puede reindexar este tipo de relación concurrentemente"
 
-#: commands/indexcmds.c:3698
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "no se puede mover relación no compartida al tablespace «%s»"
 
-#: commands/indexcmds.c:4222 commands/indexcmds.c:4234
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "el índice «%s.%s» fue reindexado"
 
-#: commands/indexcmds.c:4224 commands/indexcmds.c:4243
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -9375,36 +9616,42 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "no se puede bloquear la relación «%s»"
 
-#: commands/matview.c:206
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "no se puede usar CONCURRENTLY cuando la vista materializada no contiene datos"
 
-#: commands/matview.c:212 gram.y:18918
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "las opciones %s y %s no pueden usarse juntas"
 
-#: commands/matview.c:269
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "no se puede refrescar la vista materializada «%s» concurrentemente"
 
-#: commands/matview.c:272
+#: commands/matview.c:276
 #, c-format
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr "Cree un índice único sin cláusula WHERE en una o más columnas de la vista materializada."
 
-#: commands/matview.c:666
+#: commands/matview.c:682
 #, c-format
 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:668
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "Fila: %s"
 
+#: commands/matview.c:838
+#, fuzzy, c-format
+#| msgid "could not find suitable encoding for locale \"%s\""
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "no se pudo encontrar una codificación apropiada para la configuración regional «%s»"
+
 #: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
@@ -9518,111 +9765,138 @@ msgid "Valid signature of operator class options parsing function is %s."
 msgstr "La signatura válida para la función de interpretación de opciones de una clase de operadores es '%s'."
 
 #: commands/opclasscmds.c:1259
-#, c-format
-msgid "btree comparison functions must have two arguments"
+#, fuzzy, c-format
+#| msgid "btree comparison functions must have two arguments"
+msgid "ordering comparison functions must have two arguments"
 msgstr "las funciones de comparación btree deben tener dos argumentos"
 
 #: commands/opclasscmds.c:1263
-#, c-format
-msgid "btree comparison functions must return integer"
+#, fuzzy, c-format
+#| msgid "btree comparison functions must return integer"
+msgid "ordering comparison functions must return integer"
 msgstr "las funciones de comparación btree deben retornar entero"
 
 #: commands/opclasscmds.c:1280
-#, c-format
-msgid "btree sort support functions must accept type \"internal\""
+#, fuzzy, c-format
+#| msgid "btree sort support functions must accept type \"internal\""
+msgid "ordering sort support functions must accept type \"internal\""
 msgstr "las funciones btree de soporte de ordenamiento deben aceptar tipo «internal»"
 
 #: commands/opclasscmds.c:1284
-#, c-format
-msgid "btree sort support functions must return void"
+#, fuzzy, c-format
+#| msgid "btree sort support functions must return void"
+msgid "ordering sort support functions must return void"
 msgstr "las funciones btree de soporte de ordenamiento deben retornar void"
 
 #: commands/opclasscmds.c:1295
-#, c-format
-msgid "btree in_range functions must have five arguments"
+#, fuzzy, c-format
+#| msgid "btree in_range functions must have five arguments"
+msgid "ordering in_range functions must have five arguments"
 msgstr "las funciones btree in_range deben tener cinco argumentos"
 
 #: commands/opclasscmds.c:1299
-#, c-format
-msgid "btree in_range functions must return boolean"
+#, fuzzy, c-format
+#| msgid "btree in_range functions must return boolean"
+msgid "ordering in_range functions must return boolean"
 msgstr "las funciones btree in_range deben retornar booleano"
 
 #: commands/opclasscmds.c:1315
-#, c-format
-msgid "btree equal image functions must have one argument"
+#, fuzzy, c-format
+#| msgid "btree equal image functions must have one argument"
+msgid "ordering equal image functions must have one argument"
 msgstr "las funciones btree de igualdad de imagen deben tener un argumento"
 
 #: commands/opclasscmds.c:1319
-#, c-format
-msgid "btree equal image functions must return boolean"
+#, fuzzy, c-format
+#| msgid "btree equal image functions must return boolean"
+msgid "ordering equal image functions must return boolean"
 msgstr "las funciones btree de igualdad de imagen deben retornar booleano"
 
 #: commands/opclasscmds.c:1332
-#, c-format
-msgid "btree equal image functions must not be cross-type"
+#, fuzzy, c-format
+#| msgid "btree equal image functions must not be cross-type"
+msgid "ordering equal image functions must not be cross-type"
+msgstr "las funciones btree de igualdad de imagen no deben ser entre distintos tipos"
+
+#: commands/opclasscmds.c:1340
+#, fuzzy, c-format
+#| msgid "btree sort support functions must accept type \"internal\""
+msgid "btree skip support functions must accept type \"internal\""
+msgstr "las funciones btree de soporte de ordenamiento deben aceptar tipo «internal»"
+
+#: commands/opclasscmds.c:1344
+#, fuzzy, c-format
+#| msgid "btree sort support functions must return void"
+msgid "btree skip support functions must return void"
+msgstr "las funciones btree de soporte de ordenamiento deben retornar void"
+
+#: commands/opclasscmds.c:1357
+#, fuzzy, c-format
+#| msgid "btree equal image functions must not be cross-type"
+msgid "btree skip support functions must not be cross-type"
 msgstr "las funciones btree de igualdad de imagen no deben ser entre distintos tipos"
 
-#: commands/opclasscmds.c:1342
+#: commands/opclasscmds.c:1367
 #, c-format
 msgid "hash function 1 must have one argument"
 msgstr "la función de hash 1 debe tener un argumento"
 
-#: commands/opclasscmds.c:1346
+#: commands/opclasscmds.c:1371
 #, c-format
 msgid "hash function 1 must return integer"
 msgstr "la función de hash 1 debe retornar integer"
 
-#: commands/opclasscmds.c:1353
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "la función de hash 2 debe tener dos argumentos"
 
-#: commands/opclasscmds.c:1357
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "la función de hash 2 debe retornar bigint"
 
-#: commands/opclasscmds.c:1382
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "los tipos de datos asociados deben ser especificados para una función de soporte de índice"
 
-#: commands/opclasscmds.c:1407
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "la función número %d para (%s,%s) aparece más de una vez"
 
-#: commands/opclasscmds.c:1414
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "el número de operador %d para (%s,%s) aparece más de una vez"
 
-#: commands/opclasscmds.c:1460
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "ya existe un operador %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1589
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "ya existe una función %d(%s,%s) en la familia de operador «%s»"
 
-#: commands/opclasscmds.c:1744
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "no existe el operador %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1784
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "no existe la función %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1815
+#: commands/opclasscmds.c:1840
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una clase de operadores «%s» para el método de acceso «%s» en el esquema «%s»"
 
-#: commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1863
 #, c-format
 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»"
@@ -9694,12 +9968,12 @@ msgstr "el atributo de operador «%s» no puede ser cambiado"
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "el atributo de operador «%s» no puede ser cambiado si ya se ha establecido"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1740 commands/tablecmds.c:2340
-#: commands/tablecmds.c:3702 commands/tablecmds.c:6605
-#: commands/tablecmds.c:9637 commands/tablecmds.c:17772
-#: commands/tablecmds.c:17807 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152
+#: commands/tablecmds.c:1800 commands/tablecmds.c:2400
+#: commands/tablecmds.c:3824 commands/tablecmds.c:6793
+#: commands/tablecmds.c:10114 commands/tablecmds.c:19565
+#: commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -9740,53 +10014,53 @@ msgstr "no existe la política «%s» para la tabla «%s»"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "sólo se permite una expresión USING para SELECT, DELETE"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "el nombre de cursor no es válido: no debe ser vacío"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "no se puede crear un cursor WITH HOLD dentro de una operación restringida por seguridad"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2938 utils/adt/xml.c:3108
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "el nombre de sentencia no es válido: no debe ser vacío"
 
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "la sentencia preparada no es un SELECT"
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "el número de parámetros es incorrecto en la sentencia preparada «%s»"
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "Se esperaban %d parámetros pero se obtuvieron %d."
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "el parámetro $%d de tipo %s no puede ser convertido al tipo esperado %s"
 
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "la sentencia preparada «%s» ya existe"
 
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "no existe la sentencia preparada «%s»"
@@ -9796,203 +10070,216 @@ msgstr "no existe la sentencia preparada «%s»"
 msgid "must be superuser to create custom procedural language"
 msgstr "debe ser superusuario para crear un lenguaje procedural personalizado"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1865
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1130 postmaster/postmaster.c:1232
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "la sintaxis de lista no es válida para el parámetro «%s»"
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "valor no reconocido para la opción de publicación «%s»: «%s»"
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "parámetro de publicación no reconocido: «%s»"
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "no se ha seleccionado ningún esquema para CURRENT_SCHEMA"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "Las columnas de sistema no son permitidas."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609
+#: commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "Los operadores definidos por el usuario no están permitidos."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:650
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "Sólo columnas, constantes, operadores built-in, tipos de datos built-in, configuraciones regionales built-in y funciones built-in inmutables son permitidas."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "Los tipos definidos por el usuario no están permitidos."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "Las funciones definidas por el usuario, o las que son mutables, no están permitidas."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
 msgstr "Los «collations» definidos por el usuario no están permitidos."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "sintaxis de cláusula WHERE de publicación no válida"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "no se puede usar cláusula WHERE de la publicación para la relación «%s»"
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "la cláusula WHERE no puede ser usada para una tabla particionada cuando %s es falso."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "no se puede usar lista de columnas para la relación «%s.%s» en la publicación «%s»"
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:809
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "Las listas de columnas no pueden ser especificadas en publicaciones que contienen elementos FOR TABLES IN SCHEMA."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:823
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "Las listas de columnas no pueden ser especificadas para tablas particionadas cuando %s es falso."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "debe ser superusuario para crear publicaciones FOR ALL TABLES"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "debe ser superusuario para crear publicaciones FOR TABLES IN SCHEMA"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "«wal_level» es insuficiente para publicar cambios lógicos"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "Cambie «wal_level» a «logical» antes de crear suscripciones."
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "no se puede definir el parámetro «%s» a falso para la publicación «%s»"
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "La publicación contiene una cláusula WHERE para la tabla particionada «%s», que no está permitido cuando «%s» es falso."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "La publicación contiene una lista de columns para la tabla particionada «%s», que no está permitido cuando «%s» es falso."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "no se puede agregar el esquema «%s» a la publicación"
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "Los esquemas no pueden ser añadidos si alguna tabla que especifica una lista de columnas ya es parte de la publicación."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "debe ser superusuario para agregar o definir esquemas"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "la publicación \"%s\" se define como FOR ALL TABLES"
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "No se pueden agregar ni eliminar esquemas de las publicaciones FOR ALL TABLES."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "Las tablas no se pueden agregar ni eliminar de las publicaciones FOR ALL TABLES."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536
+#: commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "no existe la publicación «%s»"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "cláusulas WHERE en conflicto o redundantes para la tabla «%s»"
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "listas de columnas contradictorias o redundantes para la tabla «%s»"
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "la lista de columnas no debe ser especificada en ALTER PUBLICATION ... DROP"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "relación «%s» no es parte de la publicación"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "no se puede usar una cláusula WHERE cuando se elimina una tabla de una publicación"
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "las tablas del esquema «%s» no son parte de la publicación"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "se ha denegado el permiso para cambiar el dueño de la publicación «%s»"
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "El dueño de una publicación FOR ALL TABLES debe ser un superusuario."
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "El dueño de una publicación FOR TABLES IN SCHEMA debe ser un superusuario."
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "no existe la publicación con OID %u"
 
+#: commands/publicationcmds.c:2138
+#, fuzzy, c-format
+#| msgid "invalid value for parameter \"%s\": \"%s\""
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "valor no válido para el parámetro «%s»: «%s»"
+
+#: commands/publicationcmds.c:2139
+#, fuzzy, c-format
+#| msgid "Valid values are between \"%d\" and \"%d\"."
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "Los valores aceptables están entre «%d» y «%d»."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -10034,13 +10321,15 @@ msgid "cannot set security label on relation \"%s\""
 msgstr "no se puede definir la etiqueta de seguridad en la relación «%s»"
 
 #: commands/sequence.c:748
-#, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
+#, fuzzy, c-format
+#| msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
 msgstr "nextval: se alcanzó el valor máximo de la secuencia «%s» (%lld)"
 
 #: commands/sequence.c:767
-#, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
+#, fuzzy, c-format
+#| msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
 msgstr "nextval: se alcanzó el valor mínimo de la secuencia «%s» (%lld)"
 
 #: commands/sequence.c:886
@@ -10054,8 +10343,9 @@ msgid "lastval is not yet defined in this session"
 msgstr "lastval no está definido en esta sesión"
 
 #: commands/sequence.c:991
-#, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
+#, fuzzy, c-format
+#| msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
+msgid "setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>..%<PRId64>)"
 msgstr "setval: el valor %lld está fuera del rango para la secuencia «%s» (%lld..%lld)"
 
 #: commands/sequence.c:1357
@@ -10079,43 +10369,51 @@ msgid "INCREMENT must not be zero"
 msgstr "INCREMENT no debe ser cero"
 
 #: commands/sequence.c:1466
-#, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
+#, fuzzy, c-format
+#| msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
 msgstr "el MAXVALUE (%lld) está fuera de rango para el tipo de la secuencia %s"
 
 #: commands/sequence.c:1498
-#, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
+#, fuzzy, c-format
+#| msgid "MINVALUE (%lld) is out of range for sequence data type %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
 msgstr "el MINVALUE (%lld) está fuera de rango para el tipo de la secuencia %s"
 
 #: commands/sequence.c:1506
-#, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
+#, fuzzy, c-format
+#| msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
 msgstr "MINVALUE (%lld) debe ser menor que MAXVALUE (%lld)"
 
 #: commands/sequence.c:1527
-#, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
+#, fuzzy, c-format
+#| msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
 msgstr "el valor START (%lld) no puede ser menor que MINVALUE (%lld)"
 
 #: commands/sequence.c:1533
-#, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
+#, fuzzy, c-format
+#| msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
 msgstr "el valor START (%lld) no puede ser mayor que el MAXVALUE (%lld)"
 
 #: commands/sequence.c:1557
-#, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
+#, fuzzy, c-format
+#| msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
 msgstr "el valor RESTART (%lld) no puede ser menor que MINVALUE (%lld)"
 
 #: commands/sequence.c:1563
-#, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
+#, fuzzy, c-format
+#| msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
 msgstr "el valor RESTART (%lld) no puede ser mayor que MAXVALUE (%lld)"
 
 #: commands/sequence.c:1574
-#, c-format
-msgid "CACHE (%lld) must be greater than zero"
+#, fuzzy, c-format
+#| msgid "CACHE (%lld) must be greater than zero"
+msgid "CACHE (%<PRId64>) must be greater than zero"
 msgstr "el CACHE (%lld) debe ser mayor que cero"
 
 #: commands/sequence.c:1610
@@ -10148,13 +10446,13 @@ msgstr "la secuencia debe estar en el mismo esquema que la tabla a la que está
 msgid "cannot change ownership of identity sequence"
 msgstr "no se puede cambiar el dueño de la secuencia de identidad"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:14486
-#: commands/tablecmds.c:17181
+#: commands/sequence.c:1671 commands/tablecmds.c:16136
+#: commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La secuencia «%s» está enlazada a la tabla «%s»."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "sólo se permite una relación en CREATE STATISTICS"
@@ -10164,1801 +10462,1990 @@ msgstr "sólo se permite una relación en CREATE STATISTICS"
 msgid "cannot define statistics for relation \"%s\""
 msgstr "no se puede definir estadísticas para la relación «%s»"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "el objeto de estadísticas «%s» ya existe, omitiendo"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "el objeto de estadísticas «%s» ya existe"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "no se puede tener más de %d columnas en estadísticas"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "la creación de estadísticas en columnas de sistema no está soportada"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
+#, fuzzy, c-format
+#| msgid "statistics creation on system columns is not supported"
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr "la creación de estadísticas en columnas de sistema no está soportada"
+
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "la columna «%s» no puede ser usado en estadísticas porque su tipo %s no tiene una clase de operadores por omisión para btree"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr "la expresión no puede ser usada en estadísticas multivariantes porque su tipo %s no tiene una clase de operadores por omisión para btree"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "al crear estadísticas sobre una sola expresión, no se deben especificar tipos de estadísticas"
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "tipo de estadísticas «%s» no reconocido"
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "las estadísticas extendidas requieren al menos 2 columnas"
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "nombre de columna duplicado en definición de estadísticas"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "expresión duplicada en definición de estadísticas"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8620
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "el valor de estadísticas %d es demasiado bajo"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8628
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "bajando el valor de estadísticas a %d"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "no existe el objeto de estadísticas «%s.%s», omitiendo"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "parámetro de suscripción no reconocido: «%s»"
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:404
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "valor de origen no reconocido: «%s»"
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "ubicación de WAL (LSN) no válida: %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "parámetro de suscripción no reconocido: «%s»"
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "%s y %s son opciones mutuamente excluyentes"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "suscripción con %s también debe activar %s"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "no se pudo recibir la lista de publicaciones desde el publicador: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
 msgstr[0] "no existe la publicación «%s» en el “publisher”"
 msgstr[1] "no existen las publicaciones «%s» en el “publisher”"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "permiso denegado a crear suscripción"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "Sólo los roles con privilegio del rol «%s» pueden crear suscripciones."
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
-#, c-format
-msgid "could not connect to the publisher: %s"
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
+#, fuzzy, c-format
+#| msgid "could not connect to the publisher: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
 msgstr "no se pudo connectar con el publicador: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "se creó el slot de replicación «%s» en el publicador"
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "la suscripción fue creada, pero no está conectada"
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid "To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the subscription."
 msgstr "Para iniciar la replicacióñ, debe manualmente crear el slot de replicación, activar la suscripción, y refrescar la suscripción."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, fuzzy, c-format
+#| msgid "cannot set %s for enabled subscription"
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "no se puede establecer %s para la suscripción activada"
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr "no se puede definir la opción «%s” para una suscripción que no tiene un nombre de slot"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "no existe la suscripción «%s»"
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "no se puede establecer %s para la suscripción activada"
 
-#: commands/subscriptioncmds.c:1233
+#: commands/subscriptioncmds.c:1270
+#, fuzzy, c-format
+#| msgid "source and target cluster are on the same timeline"
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "el cluster de origen y destino están en el mismo timeline"
+
+#: commands/subscriptioncmds.c:1286
+#, fuzzy, c-format
+#| msgid "cannot use %s with a logical replication slot"
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "no se puede usar %s con un slot de replicación lógica"
+
+#: commands/subscriptioncmds.c:1287
 #, c-format
-msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
-msgstr "no se puede definir la opción «%s” para una suscripción que no tiene un nombre de slot"
+msgid "Try again after some time."
+msgstr "Intente nuevamente después de algún tiempo."
+
+#: commands/subscriptioncmds.c:1300
+#, fuzzy, c-format
+#| msgid "database \"%s\" is being used by prepared transactions"
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "la base de datos «%s» está siendo utilizada por transacciones preparadas"
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1301
+#, fuzzy, c-format
+#| msgid "Stop the standby server and try again."
+msgid "Resolve these transactions and try again."
+msgstr "Detenga el servidor standby y pruebe otra vez."
+
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "no se puede habilitar la suscripción que no tiene un nombre de slot"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION con actualización no está permitido para las suscripciones desactivadas"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION con «refresh» y «copy_data» no está permitido cuando «two_phase» está activo"
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Use ALTER SUBSCRIPTION ... SET PUBLICATION con refresh = false, o con copy_data=false, o use DROP/CREATE SUBSCRIPTION."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Use %s con refresh = false, o con copy_data = false, o use DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION ... REFRESH no está permitido para las suscripciones desactivadas"
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION ... REFRESH con copy_data no está permitido cuando two_phase está activo"
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Use ALTER SUBSCRIPTION ... REFRESH con copy_data = false, o use DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "la ubicación de WAL a saltar (LSN %X/%X) debe ser mayor que el LSN de origen %X/%X"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "no existe la suscripción «%s», omitiendo"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "eliminando el slot de replicación «%s» en publicador"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "no se pudo eliminar el slot de replicación «%s» en publicador: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "no existe la suscripción con OID %u"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "no se pudo recibir la lista de tablas replicadas desde el publicador: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr "la suscripción «%s» pidió copy_data con origin = NONE pero podría copiar datos que tenían un origen diferente"
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
 msgstr[0] "La suscripción que está siendo creada suscribe a una publicación (%s) que contiene tablas que están siendo escritas por otras suscripciones."
 msgstr[1] "La suscripción que está siendo creada suscribe a publicaciones (%s) que contienen tablas que están siendo escritas por otras suscripciones."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr "Verifique que los datos iniciales copiados desde el publicador no vinieron de otros orígenes."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1143
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr "no se puede usar distintas listas de columnas para la tabla «%s.%s» en distintas publicaciones"
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "no se pudo conectar con el publicador al intentar eliminar el slot de replicación \"%s\": %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "Use %s para desactivar la suscripción, luego use %s para disociarla del slot."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "nombre de publicación «%s» usado más de una vez"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "la publicación «%s» ya existe en la suscripción «%s»"
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "la publicación «%s» no está en la suscripción «%s»"
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "no se puede eliminar todas las publicaciones de una suscripción"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "«%s» requiere un valor lógico (booleano) o “parallel”"
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "no existe la tabla «%s»"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la tabla «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "Use DROP TABLE para eliminar una tabla."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "no existe la secuencia «%s»"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la secuencia «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Use DROP SEQUENCE para eliminar una secuencia."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "no existe la vista «%s»"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vista «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "Use DROP VIEW para eliminar una vista."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "no existe la vista materializada «%s»"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "la vista materializada «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Use DROP MATERIALIZED VIEW para eliminar una vista materializada."
 
-#: commands/tablecmds.c:279 commands/tablecmds.c:303 commands/tablecmds.c:19805
-#: parser/parse_utilcmd.c:2251
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651
+#: parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "no existe el índice «%s»"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "el índice «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "Use DROP INDEX para eliminar un índice."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "«%s» no es un tipo"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "Use DROP TYPE para eliminar un tipo."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14325
-#: commands/tablecmds.c:16886
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975
+#: commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "no existe la tabla foránea «%s»"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "la tabla foránea «%s» no existe, omitiendo"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Use DROP FOREIGN TABLE para eliminar una tabla foránea."
 
-#: commands/tablecmds.c:734
+#: commands/tablecmds.c:802
 #, 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:765
+#: commands/tablecmds.c:819
+#, fuzzy, c-format
+#| msgid "materialized views cannot be unlogged"
+msgid "partitioned tables cannot be unlogged"
+msgstr "las vistas materializadas no pueden ser «unlogged»"
+
+#: commands/tablecmds.c:839
 #, 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:801 commands/tablecmds.c:15745
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, 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:1067
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "«%s» no está particionada"
 
-#: commands/tablecmds.c:1161
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "no se puede particionar usando más de %d columnas"
 
-#: commands/tablecmds.c:1217
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "no se puede crear una partición foránea en la tabla particionada «%s»"
 
-#: commands/tablecmds.c:1219
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "La tabla «%s» contiene índices que son únicos."
 
-#: commands/tablecmds.c:1338 commands/tablecmds.c:13341
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "demasiadas dimensiones de array"
 
-#: commands/tablecmds.c:1343 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "la columna «%s» no puede ser declarada SETOF"
 
-#: commands/tablecmds.c:1489
+#: commands/tablecmds.c:1549
 #, 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:1493
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY no soporta CASCADE"
 
-#: commands/tablecmds.c:1597
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "no se puede eliminar el índice particionado «%s» concurrentemente"
 
-#: commands/tablecmds.c:1885
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "no se puede truncar ONLY una tabla particionada"
 
-#: commands/tablecmds.c:1886
+#: commands/tablecmds.c:1946
 #, c-format
 msgid "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly."
 msgstr "No especifique la opción ONLY, o ejecute TRUNCATE ONLY en las particiones directamente."
 
-#: commands/tablecmds.c:1959
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "truncando además la tabla «%s»"
 
-#: commands/tablecmds.c:2320
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "no se puede truncar la tabla foránea «%s»"
 
-#: commands/tablecmds.c:2377
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "no se pueden truncar tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:2606 commands/tablecmds.c:15642
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "no se puede heredar de la tabla particionada «%s»"
 
-#: commands/tablecmds.c:2611
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "no se puede heredar de la partición «%s»"
 
-#: commands/tablecmds.c:2619 parser/parse_utilcmd.c:2481
-#: parser/parse_utilcmd.c:2623
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "la relación heredada «%s» no es una tabla o tabla foránea"
 
-#: commands/tablecmds.c:2631
+#: commands/tablecmds.c:2700
 #, c-format
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "no se puede crear una relación temporal como partición de la relación permanente «%s»"
 
-#: commands/tablecmds.c:2640 commands/tablecmds.c:15621
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "no se puede heredar de la tabla temporal «%s»"
 
-#: commands/tablecmds.c:2650 commands/tablecmds.c:15629
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, 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:2791 commands/tablecmds.c:2845
-#: commands/tablecmds.c:13024 parser/parse_utilcmd.c:1265
-#: parser/parse_utilcmd.c:1308 parser/parse_utilcmd.c:1735
-#: parser/parse_utilcmd.c:1843
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928
+#: commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, 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:2792 parser/parse_utilcmd.c:1266
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "La expresión de generación para la columna «%s» contiene una referencia a la fila completa (whole-row) de la tabla «%s»."
 
-#: commands/tablecmds.c:2846 parser/parse_utilcmd.c:1309
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, 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:2956 commands/tablecmds.c:3227
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "la columna «%s» hereda de una columna generada pero especifica un valor por omisión"
 
-#: commands/tablecmds.c:2961 commands/tablecmds.c:3232
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr "la columna «%s» hereda de una columna generada pero especifica una identidad"
 
-#: commands/tablecmds.c:2969 commands/tablecmds.c:3240
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "la columna hija «%s» especifica una expresión de generación de columna"
 
-#: commands/tablecmds.c:2971 commands/tablecmds.c:3242
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "Una columna de tabla hija no puede ser generada a menos que su columna padre lo sea."
 
-#: commands/tablecmds.c:3017
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366
+#: commands/tablecmds.c:17562
+#, fuzzy, c-format
+#| msgid "column \"%s\" inherits from generated column but specifies identity"
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "la columna «%s» hereda de una columna generada pero especifica una identidad"
+
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
+#: commands/tablecmds.c:17563
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "La columna padre es %s, la columna hija es %s."
+
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "la columna «%s» hereda expresiones de generación en conflicto"
 
-#: commands/tablecmds.c:3019
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "Para resolver el conflicto, indique explícitamente una expresión de generación."
 
-#: commands/tablecmds.c:3023
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la columna «%s» hereda valores por omisión no coincidentes"
 
-#: commands/tablecmds.c:3025
+#: commands/tablecmds.c:3129
 #, 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:3080
+#: commands/tablecmds.c:3196
 #, 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:3131
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "mezclando la columna «%s» con la definición heredada"
 
-#: commands/tablecmds.c:3135
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "moviendo y mezclando la columna «%s» con la definición heredada"
 
-#: commands/tablecmds.c:3136
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "La columna especificada por el usuario fue movida a la posición de la columna heredada."
 
-#: commands/tablecmds.c:3148
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la columna «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:3150 commands/tablecmds.c:3184
-#: commands/tablecmds.c:3200 commands/tablecmds.c:3307
-#: commands/tablecmds.c:3340 commands/tablecmds.c:3356
-#: parser/parse_coerce.c:2192 parser/parse_coerce.c:2212
-#: parser/parse_coerce.c:2232 parser/parse_coerce.c:2253
-#: parser/parse_coerce.c:2308 parser/parse_coerce.c:2342
-#: parser/parse_coerce.c:2418 parser/parse_coerce.c:2449
-#: parser/parse_coerce.c:2488 parser/parse_coerce.c:2555
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302
+#: commands/tablecmds.c:3318 commands/tablecmds.c:3434
+#: commands/tablecmds.c:3462 commands/tablecmds.c:3478
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s versus %s"
 
-#: commands/tablecmds.c:3162
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "la columna «%s» tiene conflicto de ordenamientos (collation)"
 
-#: commands/tablecmds.c:3164 commands/tablecmds.c:3326
-#: commands/tablecmds.c:7080
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448
+#: commands/tablecmds.c:7277 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "«%s» versus «%s»"
 
-#: commands/tablecmds.c:3182
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "la columna «%s» tiene conflicto de parámetros de almacenamiento"
 
-#: commands/tablecmds.c:3198 commands/tablecmds.c:3354
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "la columna «%s» tiene conflicto de método de compresión"
 
-#: commands/tablecmds.c:3293
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "mezclando múltiples definiciones heredadas de la columna «%s»"
 
-#: commands/tablecmds.c:3305
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "columna heredada «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:3324
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "columna heredada «%s» tiene conflicto de ordenamiento (collation)"
 
-#: commands/tablecmds.c:3338
+#: commands/tablecmds.c:3460
 #, 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:3366
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "columna heredada «%s» tiene conflicto de generación"
 
-#: commands/tablecmds.c:3597
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "no se pueden mover tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:3670
+#: commands/tablecmds.c:3792
 #, 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:3689
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "no se puede cambiar el nombre de columnas de la relación «%s»"
 
-#: commands/tablecmds.c:3784
+#: commands/tablecmds.c:3906
 #, 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:3816
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna de sistema «%s»"
 
-#: commands/tablecmds.c:3831
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna heredada «%s»"
 
-#: commands/tablecmds.c:3983
+#: commands/tablecmds.c:4108
 #, 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:3990
+#: commands/tablecmds.c:4115
 #, 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:4290
+#: commands/tablecmds.c:4415
 #, 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:4299
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "no se puede hacer %s en «%s» porque tiene eventos de “trigger” pendientes"
 
-#: commands/tablecmds.c:4325
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "no se pueden alterar tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:4798
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "no se puede modificar la partición «%s» teniendo un desprendimiento incompleto"
 
-#: commands/tablecmds.c:5002 commands/tablecmds.c:5017
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "no se puede cambiar la opción de persistencia dos veces"
 
-#: commands/tablecmds.c:5038
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "no se pueden tener múltiples subórdenes SET ACCESS METHOD"
 
-#: commands/tablecmds.c:5768
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "no se puede reescribir la relación de sistema «%s»"
 
-#: commands/tablecmds.c:5774
+#: commands/tablecmds.c:5900
 #, 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:5786
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "no se puede reescribir tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:6281
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "la columna «%s» de la relación «%s» contiene valores null"
 
-#: commands/tablecmds.c:6298
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "la restricción check «%s» de la relación «%s» es violada por alguna fila"
 
-#: commands/tablecmds.c:6317 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid "updated partition constraint for default partition \"%s\" would be violated by some row"
 msgstr "la restricción de partición actualizada para la partición default «%s» sería violada por alguna fila"
 
-#: commands/tablecmds.c:6323
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "la restricción de partición de la relación «%s» es violada por alguna fila"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6588
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "la acción ALTER %s no puede ser efecutada en la relación «%s»"
 
-#: commands/tablecmds.c:6843 commands/tablecmds.c:6850
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, 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:6857
+#: commands/tablecmds.c:7045
 #, 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:6864
+#: commands/tablecmds.c:7052
 #, 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:6920
+#: commands/tablecmds.c:7108
 #, 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:6922
+#: commands/tablecmds.c:7110
 #, 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:6968
+#: commands/tablecmds.c:7156
+#, fuzzy, c-format
+#| msgid "cannot alter type \"%s\" because it is the type of a typed table"
+msgid "type %s is the row type of another table"
+msgstr "no se puede cambiar el tipo «%s» porque es el tipo de una tabla tipada"
+
+#: commands/tablecmds.c:7158
+#, c-format
+msgid "A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr "Una tabla tipada debe usar un tipo de dato “stand-alone” creado con CREATE TYPE."
+
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "el tipo %s no es un tipo compuesto"
 
-#: commands/tablecmds.c:6995
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "no se puede agregar una columna a una tabla tipada"
 
-#: commands/tablecmds.c:7043
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "no se puede agregar una columna a una partición"
 
-#: commands/tablecmds.c:7072 commands/tablecmds.c:15860
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, 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:7078 commands/tablecmds.c:15866
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, 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:7096
+#: commands/tablecmds.c:7293
 #, 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:7149
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "no se puede agregar una columna de identidad recursivamente a una tabla que tiene tablas hijas"
 
-#: commands/tablecmds.c:7362
+#: commands/tablecmds.c:7593
 #, 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:7440
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "la columna «%s» de la relación «%s» ya existe, omitiendo"
 
-#: commands/tablecmds.c:7447
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "ya existe la columna «%s» en la relación «%s»"
 
-#: commands/tablecmds.c:7513 commands/tablecmds.c:12652
-#, c-format
-msgid "cannot remove constraint from only the partitioned table when partitions exist"
-msgstr "no se pueden eliminar restricciones sólo de la tabla particionada cuando existen particiones"
-
-#: commands/tablecmds.c:7514 commands/tablecmds.c:7828
-#: commands/tablecmds.c:8006 commands/tablecmds.c:8113
-#: commands/tablecmds.c:8230 commands/tablecmds.c:9049
-#: commands/tablecmds.c:12653
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "No especifique la opción ONLY."
-
-#: commands/tablecmds.c:7550 commands/tablecmds.c:7754
-#: commands/tablecmds.c:7896 commands/tablecmds.c:8028
-#: commands/tablecmds.c:8157 commands/tablecmds.c:8251
-#: commands/tablecmds.c:8352 commands/tablecmds.c:8509
-#: commands/tablecmds.c:8662 commands/tablecmds.c:8743
-#: commands/tablecmds.c:8877 commands/tablecmds.c:12806
-#: commands/tablecmds.c:14348 commands/tablecmds.c:16975
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936
+#: commands/tablecmds.c:8137 commands/tablecmds.c:8268
+#: commands/tablecmds.c:8422 commands/tablecmds.c:8516
+#: commands/tablecmds.c:8619 commands/tablecmds.c:8815
+#: commands/tablecmds.c:8981 commands/tablecmds.c:9072
+#: commands/tablecmds.c:9206 commands/tablecmds.c:14407
+#: commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "no se puede alterar columna de sistema «%s»"
 
-#: commands/tablecmds.c:7556 commands/tablecmds.c:7902
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143
+#: commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "la columna «%s» en la relación «%s» es una columna de identidad"
 
-#: commands/tablecmds.c:7597
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "la columna «%s» está en la llave primaria"
-
-#: commands/tablecmds.c:7602
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "la columna «%s» se encuentra en un índice utilizado como identidad de réplica"
-
-#: commands/tablecmds.c:7625
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "columna «%s» está marcada NOT NULL en la tabla padre"
 
-#: commands/tablecmds.c:7825 commands/tablecmds.c:9533
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, 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:7826
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246
+#: commands/tablecmds.c:8378 commands/tablecmds.c:8495
+#: commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "La columna «%s» de la relación «%s» no está previamente marcada NOT NULL."
+msgid "Do not specify the ONLY keyword."
+msgstr "No especifique la opción ONLY."
 
-#: commands/tablecmds.c:7911
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "la columna «%s» en la relación «%s» es una columna generada"
 
-#: commands/tablecmds.c:8005
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr "no se puede agregar identidad a una columna de sólo una tabla particionada"
 
-#: commands/tablecmds.c:8011
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "no se puede agregar identidad a una columna de una partición"
 
-#: commands/tablecmds.c:8039
+#: commands/tablecmds.c:8279
 #, c-format
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "la columna «%s» en la relación «%s» debe ser declarada NOT NULL antes de que una identidad pueda agregarse"
 
-#: commands/tablecmds.c:8045
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "la columna «%s» en la relación «%s» ya es una columna de identidad"
 
-#: commands/tablecmds.c:8051
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "la columna «%s» en la relación «%s» ya tiene un valor por omisión"
 
-#: commands/tablecmds.c:8112
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "no se puede cambiar la columna de identidad de una tabla particionada"
 
-#: commands/tablecmds.c:8118
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "no puede cambiar la columna de identidad de una partición"
 
-#: commands/tablecmds.c:8163 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "la columna «%s» en la relación «%s» no es una columna identidad"
 
-#: commands/tablecmds.c:8229
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "no se pueden eliminar la identidad de la columna de sólo una tabla particionada"
 
-#: commands/tablecmds.c:8235
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "no se puede eliminar la identidad de la columna de una partición"
 
-#: commands/tablecmds.c:8264
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "la columna «%s» de la relación «%s» no es una columna identidad, omitiendo"
 
-#: commands/tablecmds.c:8358
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "la columna «%s» en la relación «%s» no es una columna generada"
 
-#: commands/tablecmds.c:8456
+#: commands/tablecmds.c:8637
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
+msgstr "ALTER TABLE / SET EXPRESSION no está soportado para columnas virtuales generadas en tablas con restricciones “check”"
+
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656
+#: commands/tablecmds.c:8828
+#, fuzzy, c-format
+#| msgid "column \"%s\" of relation \"%s\" is a generated column"
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr "la columna «%s» en la relación «%s» es una columna generada"
+
+#: commands/tablecmds.c:8655
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
+msgstr "ALTER TABLE / SET EXPRESSION no está soportado para columnas virtuales generadas en tablas que son parte de una publicación"
+
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION se debe aplicar a las tablas hijas también"
 
-#: commands/tablecmds.c:8478
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "no se puede eliminar la expresión de generación de una columna heredada"
 
-#: commands/tablecmds.c:8517
-#, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
-msgstr "la columna «%s» en la relación «%s» no es una columna generada almacenada"
+#: commands/tablecmds.c:8827
+#, fuzzy, c-format
+#| msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
+msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
+msgstr "ALTER TABLE / DROP EXPRESSION se debe aplicar a las tablas hijas también"
 
-#: commands/tablecmds.c:8522
-#, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
+#: commands/tablecmds.c:8841
+#, fuzzy, c-format
+#| msgid "column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
 msgstr "la columna «%s» de la relación «%s» no es una columna generada almacenada, omitiendo"
 
-#: commands/tablecmds.c:8600
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "no se puede referir a columnas que no son de índice por número"
 
-#: commands/tablecmds.c:8652
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "no existe la columna número %d en la relación «%s»"
 
-#: commands/tablecmds.c:8671
+#: commands/tablecmds.c:8991
+#, fuzzy, c-format
+#| msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "no se puede alterar estadísticas en la columna incluida «%s» del índice «%s»"
+
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "no se puede alterar estadísticas en la columna incluida «%s» del índice «%s»"
 
-#: commands/tablecmds.c:8676
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr "no se puede alterar estadísticas en la columna no-de-expresión «%s» del índice «%s»"
 
-#: commands/tablecmds.c:8678
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "Altere las estadísticas en la columna de la tabla en su lugar."
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "no se pueden eliminar columnas de una tabla tipada"
 
-#: commands/tablecmds.c:8987
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "no existe la columna «%s» en la relación «%s», omitiendo"
 
-#: commands/tablecmds.c:9000
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "no se puede eliminar la columna de sistema «%s»"
 
-#: commands/tablecmds.c:9010
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "no se puede eliminar la columna heredada «%s»"
 
-#: commands/tablecmds.c:9023
+#: commands/tablecmds.c:9353
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "no se puede eliminar la columna «%s» porque es parte de la llave de partición de la relación «%s»"
 
-#: commands/tablecmds.c:9048
+#: commands/tablecmds.c:9378
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr "no se pueden eliminar columnas sólo de una tabla particionada cuando existe particiones"
 
-#: commands/tablecmds.c:9253
+#: commands/tablecmds.c:9543
+#, fuzzy, c-format
+#| msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "La columna «%s» de la relación «%s» no está previamente marcada NOT NULL."
+
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
+#, fuzzy, c-format
+#| msgid "cannot rename system column \"%s\""
+msgid "cannot create primary key on column \"%s\""
+msgstr "no se puede cambiar el nombre a la columna de sistema «%s»"
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
+#, c-format
+msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
+msgstr "La restricción «%s» en la columna «%s» de la tabla «%s», marcada %s, es incompatible con una llave primaria."
+
+#: commands/tablecmds.c:9717
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX no está soportado en tablas particionadas"
 
-#: commands/tablecmds.c:9278
+#: commands/tablecmds.c:9742
 #, 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:9615
+#: commands/tablecmds.c:10100
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr "no se puede usar ONLY para una llave foránea en la tabla particionada «%s» haciendo referencia a la relación «%s»"
 
-#: commands/tablecmds.c:9621
-#, c-format
-msgid "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing relation \"%s\""
-msgstr "no se puede agregar una llave foránea NOT VALID a la tabla particionada «%s» haciendo referencia a la relación «%s»"
-
-#: commands/tablecmds.c:9624
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr "Esta característica no está aún soportada en tablas particionadas."
-
-#: commands/tablecmds.c:9631 commands/tablecmds.c:10092
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relación referida «%s» no es una tabla"
 
-#: commands/tablecmds.c:9654
+#: commands/tablecmds.c:10131
 #, 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:9661
+#: commands/tablecmds.c:10138
 #, 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:9667
+#: commands/tablecmds.c:10144
 #, 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:9671
+#: commands/tablecmds.c:10148
 #, 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:9735 commands/tablecmds.c:9741
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
+#, c-format
+msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr "la llave foránea usa PERIOD en la tabla referenciada pero no en la tabla referente"
+
+#: commands/tablecmds.c:10203
+#, c-format
+msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr "la llave foránea usa PERIOD en la tabla referente pero no en la tabla referenciada"
+
+#: commands/tablecmds.c:10217
+#, c-format
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
+msgstr "una llave foránea debe usar PERIOD si hace referencia a una llave primaria que tenga WITHOUT OVERLAPS"
+
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "acción %s no válida para restricción de llave foránea que contiene columnas generadas"
 
-#: commands/tablecmds.c:9757
+#: commands/tablecmds.c:10262
+#, fuzzy, c-format
+#| msgid "index creation on system columns is not supported"
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr "la creación de índices en columnas de sistema no está soportada"
+
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
+#, fuzzy, c-format
+#| msgid "invalid %s action for foreign key constraint containing generated column"
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr "acción %s no válida para restricción de llave foránea que contiene columnas generadas"
+
+#: commands/tablecmds.c:10300
 #, 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:9864
+#: commands/tablecmds.c:10356
+#, fuzzy, c-format
+#| msgid "could not identify an ordering operator for type %s"
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "no se pudo identificar un operador de ordenamiento para el tipo %s"
+
+#: commands/tablecmds.c:10357
+#, fuzzy, c-format
+#| msgid "could not identify an equality operator for type %s"
+msgid "could not identify an equality operator for foreign key"
+msgstr "no se pudo identificar un operador de igualdad para el tipo %s"
+
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, 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:9866
-#, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+#: commands/tablecmds.c:10424
+#, fuzzy, c-format
+#| msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
 msgstr "Las columnas llave «%s» y «%s» son de tipos incompatibles: %s y %s"
 
-#: commands/tablecmds.c:10035
+#: commands/tablecmds.c:10457
+#, c-format
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
+msgstr "Las columnas llave «%s» de la tabla referenciante y «%s» de la tabla referenciada tienen ordenamientos incompatibles: «%s» y «%s». Si alguno de los ordenamientos es no determinístico, entonces ambos deben ser el mismo."
+
+#: commands/tablecmds.c:10663
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr "la columna «%s» referenciada en la acción ON DELETE SET debe ser parte de la llave foránea"
 
-#: commands/tablecmds.c:10392 commands/tablecmds.c:10832
-#: parser/parse_utilcmd.c:822 parser/parse_utilcmd.c:945
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "las restricciones de llave foránea no están soportadas en tablas foráneas"
 
-#: commands/tablecmds.c:10815
+#: commands/tablecmds.c:11463
 #, c-format
 msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
 msgstr "no se puede adjuntar la tabla foránea «%s» como partición porque es referenciada por la llave foránea «%s»"
 
-#: commands/tablecmds.c:11416 commands/tablecmds.c:11697
-#: commands/tablecmds.c:12609 commands/tablecmds.c:12683
+#: commands/tablecmds.c:11744
+#, fuzzy, c-format
+#| msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
+msgstr "la restricción «%s» está en conflicto con la restricción heredada de la relación «%s»"
+
+#: commands/tablecmds.c:12206
+#, fuzzy, c-format
+#| msgid "constraint must be validated on child tables too"
+msgid "constraint must be altered in child tables too"
+msgstr "la restricción debe ser validada en las tablas hijas también"
+
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932
+#: commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, 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:11423
+#: commands/tablecmds.c:12242
 #, 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 restricción de llave foránea"
 
-#: commands/tablecmds.c:11461
+#: commands/tablecmds.c:12247
+#, fuzzy, c-format
+#| msgid "cannot alter constraint \"%s\" on relation \"%s\""
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
+
+#: commands/tablecmds.c:12253
+#, fuzzy, c-format
+#| msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "la restricción «%s» de la relación «%s» no es una restricción de llave foránea"
+
+#: commands/tablecmds.c:12261
+#, fuzzy, c-format
+#| msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "no se puede eliminar la restricción «%s» heredada de la relación «%s»"
+
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
 
-#: commands/tablecmds.c:11464
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "La restricción «%s» deriva de la restricción «%s» de la relación «%s»."
 
-#: commands/tablecmds.c:11466
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "En su lugar, puede modificar la restricción de la cual deriva."
 
-#: commands/tablecmds.c:11705
+#: commands/tablecmds.c:12941
+#, fuzzy, c-format
+#| msgid "cannot alter constraint \"%s\" on relation \"%s\""
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "no se puede modificar la restricción «%s» en la relación «%s»"
+
+#: commands/tablecmds.c:12943
+#, fuzzy, c-format
+#| msgid "This operation is not supported for composite types."
+msgid "This operation is not supported for this type of constraint."
+msgstr "Esta operación no está soportada en tipos compuestos."
+
+#: commands/tablecmds.c:12948
 #, 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»"
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "no se puede validar una restricción NOT ENFORCED"
 
-#: commands/tablecmds.c:11782
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, 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:11869
+#: commands/tablecmds.c:13334
 #, 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:11875
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "las columnas de sistema no pueden usarse en llaves foráneas"
 
-#: commands/tablecmds.c:11879
+#: commands/tablecmds.c:13344
 #, 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:11944
+#: commands/tablecmds.c:13412
 #, 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:11961
+#: commands/tablecmds.c:13429
 #, 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:12029
+#: commands/tablecmds.c:13502
 #, 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:12121
+#: commands/tablecmds.c:13605
 #, 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:12126
+#: commands/tablecmds.c:13610
 #, 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:12565
+#: commands/tablecmds.c:14051
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "no existe la restricción «%s» en la relación «%s», omitiendo"
+
+#: commands/tablecmds.c:14096
 #, 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:12615
+#: commands/tablecmds.c:14148
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "no existe la restricción «%s» en la relación «%s», omitiendo"
+msgid "column \"%s\" is in a primary key"
+msgstr "la columna «%s» está en la llave primaria"
+
+#: commands/tablecmds.c:14156
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "la columna «%s» se encuentra en un índice utilizado como identidad de réplica"
 
-#: commands/tablecmds.c:12790
+#: commands/tablecmds.c:14389
 #, 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:12816
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "no se puede especificar USING al alterar el tipo de una columna generada"
 
-#: commands/tablecmds.c:12817 commands/tablecmds.c:18028
-#: commands/tablecmds.c:18118 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:941 rewrite/rewriteHandler.c:976
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "La columna «%s» es una columna generada."
-
-#: commands/tablecmds.c:12827
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "no se puede alterar la columna heredada «%s»"
 
-#: commands/tablecmds.c:12836
+#: commands/tablecmds.c:14438
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "no se puede alterar la columna «%s» porque es parte de la llave de partición de la relación «%s»"
 
-#: commands/tablecmds.c:12886
+#: commands/tablecmds.c:14493
 #, 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:12889
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Puede ser necesario agregar un cast explícito."
 
-#: commands/tablecmds.c:12893
+#: commands/tablecmds.c:14500
 #, 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:12897
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Puede ser necesario especificar «USING %s::%s»."
 
-#: commands/tablecmds.c:12996
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "no se puede alterar la columna heredada «%s» de la relación «%s»"
 
-#: commands/tablecmds.c:13025
+#: commands/tablecmds.c:14636
 #, 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:13036
+#: commands/tablecmds.c:14647
 #, 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:13161
+#: commands/tablecmds.c:14772
 #, 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:13199
+#: commands/tablecmds.c:14810
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr "la expresión de generación para la columna «%s» no puede ser convertido automáticamente al tipo %s"
 
-#: commands/tablecmds.c:13204
+#: commands/tablecmds.c:14815
 #, 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:13508
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "no se puede alterar el tipo de una columna usada en una función o procedimiento"
 
-#: commands/tablecmds.c:13509 commands/tablecmds.c:13524
-#: commands/tablecmds.c:13544 commands/tablecmds.c:13563
-#: commands/tablecmds.c:13622
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135
+#: commands/tablecmds.c:15155 commands/tablecmds.c:15174
+#: commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s depende de la columna «%s»"
 
-#: commands/tablecmds.c:13523
+#: commands/tablecmds.c:15134
 #, 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:13543
+#: commands/tablecmds.c:15154
 #, 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:13562
+#: commands/tablecmds.c:15173
 #, 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 política"
 
-#: commands/tablecmds.c:13593
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "no se puede alterar el tipo de una columna usada por una columna generada"
 
-#: commands/tablecmds.c:13594
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "La columna «%s» es usada por la columna generada «%s»."
 
-#: commands/tablecmds.c:13621
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "no se puede alterar el tipo de una columna usada en una cláusula WHERE de publicación"
 
-#: commands/tablecmds.c:14456 commands/tablecmds.c:14468
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "no se puede cambiar el dueño del índice «%s»"
 
-#: commands/tablecmds.c:14458 commands/tablecmds.c:14470
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "Cambie el dueño de la tabla del índice en su lugar."
 
-#: commands/tablecmds.c:14484
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "no se puede cambiar el dueño de la secuencia «%s»"
 
-#: commands/tablecmds.c:14509
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "no se puede cambiar el dueño de la relación «%s»"
 
-#: commands/tablecmds.c:14976
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "no se pueden tener múltiples subórdenes SET TABLESPACE"
 
-#: commands/tablecmds.c:15053
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "no se puede definir opciones para la relación «%s»"
 
-#: commands/tablecmds.c:15087 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, 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:15338
+#: commands/tablecmds.c:16992
 #, 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:15350
+#: commands/tablecmds.c:17004
 #, 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:15442
+#: commands/tablecmds.c:17096
 #, c-format
 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:15458
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "no se encontraron relaciones coincidentes en el tablespace «%s»"
 
-#: commands/tablecmds.c:15580
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "no se puede cambiar la herencia de una tabla tipada"
 
-#: commands/tablecmds.c:15585 commands/tablecmds.c:16085
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "no puede cambiar la herencia de una partición"
 
-#: commands/tablecmds.c:15590
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "no se puede cambiar la herencia de una tabla particionada"
 
-#: commands/tablecmds.c:15636
+#: commands/tablecmds.c:17291
 #, 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:15649
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "no se puede heredar de una partición"
 
-#: commands/tablecmds.c:15671 commands/tablecmds.c:18529
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "la herencia circular no está permitida"
 
-#: commands/tablecmds.c:15672 commands/tablecmds.c:18530
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "«%s» ya es un hijo de «%s»."
 
-#: commands/tablecmds.c:15685
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "el trigger «%s» impide a la tabla «%s» convertirse en hija de herencia"
 
-#: commands/tablecmds.c:15687
+#: commands/tablecmds.c:17342
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "Los triggers ROW con tablas de transición no están permitidos en jerarquías de herencia."
 
-#: commands/tablecmds.c:15876
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "columna «%s» en tabla hija debe marcarse como NOT NULL"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr "columna «%s» en tabla hija «%s» debe marcarse como NOT NULL"
 
-#: commands/tablecmds.c:15885
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "columna «%s» en tabla hija debe ser una columna generada"
 
-#: commands/tablecmds.c:15889
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "columna «%s» en tabla hija no puede ser una columna generada"
 
-#: commands/tablecmds.c:15927
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "tabla hija no tiene la columna «%s»"
 
-#: commands/tablecmds.c:16008
+#: commands/tablecmds.c:17720
 #, 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:16015
+#: commands/tablecmds.c:17729
 #, 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:16025
+#: commands/tablecmds.c:17740
 #, 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:16063
+#: commands/tablecmds.c:17751
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
+msgstr "la restricción «%s» está en conflicto con la restricción NOT ENFORCED en la tabla hija «%s»"
+
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "tabla hija no tiene la restricción «%s»"
 
-#: commands/tablecmds.c:16149
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "la partición «%s» ya tiene un desprendimiento pendiente en la tabla particionada «%s.%s»"
 
-#: commands/tablecmds.c:16178 commands/tablecmds.c:16224
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "relación «%s» no es una partición de la relación «%s»"
 
-#: commands/tablecmds.c:16230
+#: commands/tablecmds.c:17970
 #, 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:16457
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "las tablas tipadas no pueden heredar"
 
-#: commands/tablecmds.c:16487
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "la tabla no tiene la columna «%s»"
 
-#: commands/tablecmds.c:16498
+#: commands/tablecmds.c:18282
 #, 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:16507
+#: commands/tablecmds.c:18291
 #, 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:16521
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "tabla tiene la columna extra «%s»"
 
-#: commands/tablecmds.c:16573
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "«%s» no es una tabla tipada"
 
-#: commands/tablecmds.c:16747
+#: commands/tablecmds.c:18537
 #, 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:16753
+#: commands/tablecmds.c:18543
 #, 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:16759
+#: commands/tablecmds.c:18549
 #, 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:16765
+#: commands/tablecmds.c:18555
 #, 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:16782
+#: commands/tablecmds.c:18572
 #, 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:16789
+#: commands/tablecmds.c:18579
 #, 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:17041
+#: commands/tablecmds.c:18828
 #, 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:17065
+#: commands/tablecmds.c:18852
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "no se pudo cambiar la tabla «%s» a «unlogged» porque es parte de una publicación"
 
-#: commands/tablecmds.c:17067
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "Las tablas «unlogged» no pueden replicarse."
 
-#: commands/tablecmds.c:17112
+#: commands/tablecmds.c:18899
 #, 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:17122
+#: commands/tablecmds.c:18909
 #, 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:17180
+#: commands/tablecmds.c:18973
 #, 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:17288
+#: commands/tablecmds.c:19081
 #, 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:17713
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "«%s» no es una tabla o vista materializada"
 
-#: commands/tablecmds.c:17866
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "«%s» no es un tipo compuesto"
 
-#: commands/tablecmds.c:17896
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "no se puede cambiar el esquema del índice «%s»"
 
-#: commands/tablecmds.c:17898 commands/tablecmds.c:17912
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "Cambie el esquema de la tabla en su lugar."
 
-#: commands/tablecmds.c:17902
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "no se puede cambiar el esquema del tipo compuesto «%s»"
 
-#: commands/tablecmds.c:17910
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "no se puede cambiar el esquema de la relación TOAST «%s»"
 
-#: commands/tablecmds.c:17942
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "no se puede usar la estrategia de particionamiento «list» con más de una columna"
 
-#: commands/tablecmds.c:18008
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "la columna «%s» nombrada en llave de particionamiento no existe"
 
-#: commands/tablecmds.c:18016
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "no se puede usar la columna de sistema «%s» en llave de particionamiento"
 
-#: commands/tablecmds.c:18027 commands/tablecmds.c:18117
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "no se puede usar una columna generada en llave de particionamiento"
 
-#: commands/tablecmds.c:18100
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "las expresiones en la llave de particionamiento no pueden contener referencias a columnas de sistema"
 
-#: commands/tablecmds.c:18147
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "las funciones utilizadas en expresiones de la llave de particionamiento deben estar marcadas IMMUTABLE"
 
-#: commands/tablecmds.c:18156
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "no se pueden usar expresiones constantes como llave de particionamiento"
 
-#: commands/tablecmds.c:18177
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "no se pudo determinar qué ordenamiento (collation) usar para la expresión de particionamiento"
 
-#: commands/tablecmds.c:18212
+#: commands/tablecmds.c:20021
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr "Debe especificar una clase de operadores hash, o definir una clase de operadores por omisión para hash para el tipo de datos."
 
-#: commands/tablecmds.c:18218
+#: commands/tablecmds.c:20027
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr "Debe especificar una clase de operadores btree, o definir una clase de operadores por omisión para btree para el tipo de datos."
 
-#: commands/tablecmds.c:18469
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "«%s» ya es una partición"
 
-#: commands/tablecmds.c:18475
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "no puede adjuntar tabla tipada como partición"
 
-#: commands/tablecmds.c:18491
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "no puede adjuntar hija de herencia como partición"
 
-#: commands/tablecmds.c:18505
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "no puede adjuntar ancestro de herencia como partición"
 
-#: commands/tablecmds.c:18539
+#: commands/tablecmds.c:20357
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "no se puede adjuntar una relación temporal como partición de la relación permanente «%s»"
 
-#: commands/tablecmds.c:18547
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "no se puede adjuntar una relación permanente como partición de la relación temporal «%s»"
 
-#: commands/tablecmds.c:18555
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "no se puede adjuntar como partición de una relación temporal de otra sesión"
 
-#: commands/tablecmds.c:18562
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "no se adjuntar una relación temporal de otra sesión como partición"
 
-#: commands/tablecmds.c:18582
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "la tabla «%s» siendo adjuntada contiene la columna de identidad «%s»"
 
-#: commands/tablecmds.c:18584
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "La nueva partición no puede contener una columna de identidad."
 
-#: commands/tablecmds.c:18592
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "la tabla «%s» contiene la columna «%s» no encontrada en el padre «%s»"
 
-#: commands/tablecmds.c:18595
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "La nueva partición sólo puede contener las columnas presentes en el padre."
 
-#: commands/tablecmds.c:18607
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "el trigger «%s» impide a la tabla «%s» devenir partición"
 
-#: commands/tablecmds.c:18609
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "Los triggers ROW con tablas de transición no están soportados en particiones."
 
-#: commands/tablecmds.c:18785
+#: commands/tablecmds.c:20609
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "no se puede adjuntar la tabla foránea «%s» como partición de la tabla particionada «%s»"
 
-#: commands/tablecmds.c:18788
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "La tabla particionada «%s» contiene índices únicos."
 
-#: commands/tablecmds.c:19110
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "no se puede desprender particiones concurrentemente cuando existe una partición por omisión"
 
-#: commands/tablecmds.c:19219
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "la tabla particionada «%s» fue eliminada concurrentemente"
 
-#: commands/tablecmds.c:19225
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "la partición «%s» fue eliminada concurrentemente"
 
-#: commands/tablecmds.c:19839 commands/tablecmds.c:19859
-#: commands/tablecmds.c:19880 commands/tablecmds.c:19899
-#: commands/tablecmds.c:19941
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705
+#: commands/tablecmds.c:21726 commands/tablecmds.c:21745
+#: commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "no se puede adjuntar el índice «%s» como partición del índice «%s»"
 
-#: commands/tablecmds.c:19842
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "El índice «%s» ya está adjunto a otro índice."
 
-#: commands/tablecmds.c:19862
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "El índice «%s» no es un índice en una partición de la tabla «%s»."
 
-#: commands/tablecmds.c:19883
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "Las definiciones de los índices no coinciden."
 
-#: commands/tablecmds.c:19902
+#: commands/tablecmds.c:21748
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr "El índice «%s» pertenece a una restricción en la tabla «%s», pero no existe una restricción para el índice «%s»."
 
-#: commands/tablecmds.c:19944
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "Otro índice ya está adjunto para la partición «%s»."
 
-#: commands/tablecmds.c:20180
+#: commands/tablecmds.c:21920
+#, c-format
+msgid "invalid primary key definition"
+msgstr "definición de llave primaria no válida"
+
+#: commands/tablecmds.c:21921
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "La columna «%s» de la relación «%s» no está marcada NOT NULL."
+
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "el tipo de dato de columna %s no soporta compresión"
 
-#: commands/tablecmds.c:20187
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "método de compresión «%s» no válido"
 
-#: commands/tablecmds.c:20213
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "tipo de almacenamiento no válido «%s»"
 
-#: commands/tablecmds.c:20223
+#: commands/tablecmds.c:22099
 #, 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"
@@ -12085,281 +12572,286 @@ msgstr "algunos directorios para el tablespace %u no pudieron eliminarse"
 msgid "You can remove the directories manually if necessary."
 msgstr "Puede eliminar los directorios manualmente, si es necesario."
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "«%s» es una tabla"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "Las tablas no pueden tener “triggers” INSTEAD OF."
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "«%s» es una tabla particionada"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "Los triggers ROW con tablas de transición no están soportados en tablas particionadas."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "«%s» es una vista"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "Las vistas no pueden tener “triggers” BEFORE o AFTER a nivel de fila."
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "Las vistas no pueden tener “triggers” TRUNCATE."
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "«%s» es una tabla foránea"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "Las tablas foráneas no pueden tener “triggers” INSTEAD OF."
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "Las tablas foráneas no pueden tener “triggers” de restricción."
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "la relación «%s» no puede tener triggers."
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "los “triggers” TRUNCATE FOR EACH ROW no están soportados"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "los “triggers” INSTEAD OF deben ser FOR EACH ROW"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "los “triggers” INSTEAD OF no pueden tener condiciones WHEN"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "los “triggers” INSTEAD OF no pueden tener listas de columnas"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "dar nombre a una variable ROW en la cláusula REFERENCING no está soportado"
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "utilice OLD TABLE o NEW TABLE para nombrar tablas de transición."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "Las tablas foráneas no pueden tener tablas de transición."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "Las triggers en vistas no pueden tener tablas de transición."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "los triggers ROW con tablas de transición no están soportados en particiones"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "los triggers ROW con tablas de transición no están soportados con hijas de herencia"
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "el nombre de la tabla de transición solo se puede especificar para un “trigger” AFTER"
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "los triggers TRUNCATE con tablas de transición no están soportados"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "las tablas de transición no pueden especificarse para triggers con más de un evento"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "las tablas de transición no pueden especificarse para triggers con lista de columnas"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE sólo se puede especificar para un “trigger” INSERT o UPDATE"
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE no se puede especificar varias veces"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE sólo se puede especificar para un “trigger” DELETE o UPDATE"
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE no se puede especificar varias veces"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "el nombre de OLD TABLE y el nombre de NEW TABLE no pueden ser iguales"
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "la condición WHEN de un “trigger” por sentencias no pueden referirse a los valores de las columnas"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "la condición WHEN de un “trigger” en INSERT no puede referirse a valores OLD"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "la condición WHEN de un “trigger” en DELETE no puede referirse a valores NEW"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "la condición WHEN de un “trigger” BEFORE no puede referirse a columnas de sistema de NEW"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "la condición WHEN del trigger BEFORE no puede hacer referencia a columnas NEW generadas"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr "Se utiliza una referencia de la tupla completa, y la tabla contiene columnas generadas"
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "ya existe un trigger «%s» para la relación «%s»"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "trigger «%s» para la relación «%s» es interno o derivado"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "“trigger” «%s» para la relación «%s» es un “trigger” de restricción"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "no existe el trigger «%s» para la tabla «%s»"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "no se puede cambiar el nombre del trigger «%s» en tabla «%s»"
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "Cambie el nombre del trigger en la tabla particionada «%s» en su lugar."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "se renombró el trigger «%s» en la relación «%s»"
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "permiso denegado: «%s» es un trigger de sistema"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "la función de trigger %u ha retornado un valor null"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "un trigger BEFORE STATEMENT no puede retornar un valor"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "mover registros a otra partición durante un trigger BEFORE FOR EACH ROW no está soportado"
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "Antes de ejecutar el trigger «%s», la fila iba a estar en la partición «%s.%s»."
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1541
-#: executor/nodeModifyTable.c:1615 executor/nodeModifyTable.c:2377
-#: executor/nodeModifyTable.c:2468 executor/nodeModifyTable.c:3132
-#: executor/nodeModifyTable.c:3302
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "no se puede recolectar tuplas de transición desde tablas foráneas hijas"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322
+#: executor/nodeModifyTable.c:3514
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Considere usar un “trigger” AFTER en lugar de un “trigger” BEFORE para propagar cambios a otros registros."
 
-#: commands/trigger.c:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:314
-#: executor/nodeModifyTable.c:1557 executor/nodeModifyTable.c:2394
-#: executor/nodeModifyTable.c:2618
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "no se pudo serializar el acceso debido a un update concurrente"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1647
-#: executor/nodeModifyTable.c:2485 executor/nodeModifyTable.c:2642
-#: executor/nodeModifyTable.c:3150
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826
+#: executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "no se pudo serializar el acceso debido a un delete concurrente"
 
-#: commands/trigger.c:4599
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "no se puede ejecutar un “trigger” postergado dentro de una operación restringida por seguridad"
 
-#: commands/trigger.c:5780
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "la restricción «%s» no es postergable"
 
-#: commands/trigger.c:5803
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "no existe la restricción «%s»"
@@ -12469,7 +12961,7 @@ msgstr "debe ser superusuario para crear un tipo base"
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr "Cree el tipo como un tipo inconcluso, luego cree sus funciones de I/O, luego haga un CREATE TYPE completo."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "el atributo de tipo «%s» no es reconocido"
@@ -12489,7 +12981,7 @@ msgstr "el tipo de elemento de array no puede ser %s"
 msgid "alignment \"%s\" not recognized"
 msgstr "el alineamiento «%s» no es reconocido"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "el almacenamiento «%s» no es reconocido"
@@ -12519,288 +13011,309 @@ msgstr "no se puede especificar tipo de elemento sin una función de subindexaci
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "«%s» no es un tipo de dato base válido para un dominio"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "múltiples expresiones default"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "las restricciones NULL/NOT NULL no coinciden"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "definición redundante de restricción NOT NULL"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "las restricciones «not-null» en dominios no pueden ser marcadas NO INHERIT"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "las restricciones «check» en dominios no pueden ser marcadas NO INHERIT"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "no se pueden poner restricciones de unicidad a un dominio"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "no se pueden poner restricciones de llave primaria a un dominio"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "las restricciones de exclusión no son posibles para los dominios"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "no se pueden poner restricciones de llave foránea a un dominio"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "no se puede especificar la postergabilidad de las restricciones a un dominio"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
+#, c-format
+msgid "specifying GENERATED not supported for domains"
+msgstr "no se puede especificar GENERATED para dominios"
+
+#: commands/typecmds.c:1043
+#, fuzzy, c-format
+#| msgid "specifying constraint deferrability not supported for domains"
+msgid "specifying constraint enforceability not supported for domains"
+msgstr "no se puede especificar la postergabilidad de las restricciones a un dominio"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s no es un enum"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "el atributo de tipo «subtype» es obligatorio"
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "el subtipo de rango no puede ser %s"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr "se especificó un ordenamiento (collation) al rango, pero el subtipo no soporta ordenamiento"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "no se puede especificar una función canónica sin antes crear un tipo inconcluso"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr "Cree el tipo como un tipo inconcluso, luego cree su función de canonicalización, luego haga un CREATE TYPE completo."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "la función de entrada %s del tipo tiene múltiples coincidencias"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "la función de entrada %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "la función de entrada %s no debe ser volatile"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "la función de salida %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "la función de salida %s no debe ser volatile"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "la función de recepción %s del tipo tiene múltiples coincidencias"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "la función de recepción %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "la función «receive» %s del tipo no debe ser volatile"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "la función «send» %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "la función «send» %s no debe ser volatile"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "la función typmod_in %s debe retornar tipo %s"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "la función de modificadores de tipo %s no debe ser volatile"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "la función typmod_out %s debe retornar tipo %s"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "la función de salida de modificadores de tipo %s no debe ser volatile"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "la función de análisis %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "la función de subindexación %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "los tipos definidos por el usuario no pueden usar la función de subindexación %s"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr "Debe especificar una clase de operadores para el tipo de rango, o definir una clase de operadores por omisión para el subtipo."
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "la función canónica %s del rango debe retornar tipo de rango"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "la función canónica %s del rango debe ser inmutable"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "la función «diff» de subtipo, %s, debe retornar tipo %s"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "la función «diff» de subtipo, %s, debe ser inmutable"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "el valor de OID de pg_type no se definió en modo de actualización binaria"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "el valor de OID de multirango de pg_type no se definió en modo de actualización binaria"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "el valor de OID de array de multirango de pg_type no se definió en modo de actualización binaria"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "no existe la restricción «%s» en el dominio «%s»"
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "no existe la restricción «%s» en el dominio «%s», omitiendo"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "la restricción «%s» en el dominio «%s» no es una restricción «check»"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "la columna «%s» de la tabla «%s» contiene valores null"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, c-format
 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:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s no es un dominio"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "el dominio «%2$s» ya contiene una restricción llamada «%1$s»"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 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:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s es el tipo de registro de una tabla"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "no se puede alterar el tipo de array %s"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, 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:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "no se puede alterar el tipo multirango %s"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "Puede alterar el tipo %s, lo cual alterará el tipo de multirango también."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "ya existe un tipo llamado «%s» en el esquema «%s»"
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "no se puede cambiar el almacenamiento del tipo a PLAIN"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "el atributo de tipo «%s» no puede ser cambiado"
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "debe ser superusuario para alterar un tipo"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "«%s» no es un tipo base"
@@ -12828,7 +13341,7 @@ msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "Sólo los roles con el atributo %s pueden crear roles con el atributo %s."
 
 #: commands/user.c:354 commands/user.c:1386 commands/user.c:1393
-#: utils/adt/acl.c:5574 utils/adt/acl.c:5580 gram.y:17310 gram.y:17356
+#: utils/adt/acl.c:5707 utils/adt/acl.c:5713 gram.y:17473 gram.y:17519
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "el nombre de rol «%s» está reservado"
@@ -12888,7 +13401,6 @@ msgstr "Para cambiar la password de otro rol, el usuario actual debe tener el at
 
 #: commands/user.c:825
 #, c-format
-#| msgid "Only roles with the %s option on role \"%s\" may add members."
 msgid "Only roles with the %s option on role \"%s\" may add or drop members."
 msgstr "Sólo los roles con la opción %s en el rol «%s» pueden agregar miembros."
 
@@ -12922,11 +13434,11 @@ msgstr "Sólo los roles con el atributo %s y la opción %s en los roles de desti
 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:1135 commands/user.c:1357 commands/variable.c:851
-#: commands/variable.c:854 commands/variable.c:971 commands/variable.c:974
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:799
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "no existe el rol «%s»"
@@ -12991,7 +13503,7 @@ msgstr "Sólo los roles con el atributo %s y la opción %s en el rol «%s» pued
 msgid "MD5 password cleared because of role rename"
 msgstr "la contraseña MD5 fue borrada debido al cambio de nombre del rol"
 
-#: commands/user.c:1518 gram.y:1294
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "opción de rol «%s» no reconocida"
@@ -13031,207 +13543,202 @@ msgstr "Sólo los roles con privilegios del rol «%s» pueden reasignar objetos
 msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr "Sólo los roles con privilegios del rol «%s» pueden reasignar objetos a él."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "el rol «%s» no puede ser miembro de ningún rol"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "el rol «%s» es un miembro del rol «%s»"
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "la opción %s no puede ser otorgada de vuelta a quien la otorgó"
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "el rol «%s» ya recibió membresía en el rol «%s» por parte del rol «%s»"
 
-#: commands/user.c:2024
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "al rol «%s» no se le ha otorgado membresía en el rol «%s» por parte del rol «%s»"
 
-#: commands/user.c:2124
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "el rol «%s» no puede tener miembros explícitos"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "se ha denegado el permiso para otorgar el rol «%s»"
 
-#: commands/user.c:2137
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "Sólo los roles con el atributo %s pueden otorgar roles con el atributo %s."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "se ha denegado el permiso para revocar el rol «%s»"
 
-#: commands/user.c:2144
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "Sólo los roles con el atributo %s pueden revocar roles con el atributo %s."
 
-#: commands/user.c:2160
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "Sólo los roles con la opción %s en el rol «%s» pueden otorgar este rol."
 
-#: commands/user.c:2167
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "Sólo los roles con la opción %s en el rol «%s» pueden revocar este rol."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "se ha denegado el permiso para otorgar privilegio de rol «%s»"
 
-#: commands/user.c:2249
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "Sólo los roles con privilegios del rol «%s» pueden otorgar privilegios como este rol."
 
-#: commands/user.c:2258
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "El otorgador debe tener la opción %s en el rol «%s»."
 
-#: commands/user.c:2266
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "se ha denegado el permiso a revocar permisos otorgados por el rol «%s»"
 
-#: commands/user.c:2268
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "Sólo los roles con privilegios del rol «%s» pueden revocar privilegios otorgados por este rol."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "existen privilegios dependientes"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "Use CASCADE para revocarlos también."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:148
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
-msgstr "«vacuum_buffer_usage_limit» debe ser 0 o estar entre %d kB y %d kB"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
+msgstr "«%s» debe ser 0 o estar entre %d kB y %d kB."
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "la opción BUFFER_USAGE_LIMIT debe ser 0 o estar entre %d kB y %d kB"
 
-#: commands/vacuum.c:219
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "opción de ANALYZE «%s» no reconocida"
-
-#: commands/vacuum.c:259
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "la opción parallel requiere un valor entre 0 y %d"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "el número de procesos paralelos para vacuum debe estar entre 0 y %d"
 
-#: commands/vacuum.c:292
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "opción de VACUUM «%s» no reconocida"
-
-#: commands/vacuum.c:318
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL no puede ser ejecutado en paralelo"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "BUFFER_USAGE_LIMIT no puede ser especificado para VACUUM FULL"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "la opción ANALYZE debe especificarse cuando se provee una lista de columnas"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "la opción DISABLE_PAGE_SKIPPING de VACUUM no puede usarse con FULL"
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "se requiere especificar PROCESS_TOAST al hacer VACUUM FULL"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS no se puede especificar con una lista de tablas"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATS no puede ser especificada con otras opciones de VACUUM"
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s no puede ejecutarse desde VACUUM o ANALYZE"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "permiso denegado a hacer vacuum a «%s», ignorando"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "se ha denegado el permiso para hacer analyze a «%s», ignorando"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "omitiendo el vacuum de «%s»: el “lock” no está disponible"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "omitiendo el vacuum de «%s» --- la relación ya no existe"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "omitiendo analyze de «%s»: el “lock” no está disponible"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "omitiendo analyze de «%s» --- la relación ya no existe"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:992
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "VACUUM ONLY de la tabla particionada «%s» no tiene efecto"
+
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "el punto de corte para eliminar y congelar tuplas es demasiado antiguo"
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -13240,37 +13747,37 @@ msgstr ""
 "Cierre transaciones abiertas pronto para impedir problemas por “wraparound”.\n"
 "Puede que además necesite comprometer o abortar transacciones preparadas antiguas, o eliminar slots de replicación añejos."
 
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "el punto de corte para congelar multixacts es demasiado antiguo"
 
-#: commands/vacuum.c:1900
+#: commands/vacuum.c:1950
 #, 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:1901
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Puede haber sufrido ya problemas de pérdida de datos por “wraparound” del contador de transacciones."
 
-#: commands/vacuum.c:2080
+#: commands/vacuum.c:2143
 #, 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/vacuum.c:2512
+#: commands/vacuum.c:2659
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr "se recorrió el índice «%s» para eliminar %lld versiones de filas"
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "se recorrió el índice «%s» para eliminar %<PRId64> versiones de filas"
 
-#: commands/vacuum.c:2531
+#: commands/vacuum.c:2678
 #, 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/vacuum.c:2535
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -13281,14 +13788,14 @@ msgstr ""
 "%u páginas de índice fueron recién eliminadas.\n"
 "%u páginas de índice están actualmente eliminadas, de las cuales %u son actualmente reusables."
 
-#: commands/vacuumparallel.c:707
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index vacuuming (planned: %d)"
 msgstr[0] "se lanzó %d proceso asistente para «vacuum» de índices (planeados: %d)"
 msgstr[1] "se lanzaron %d procesos asistentes para «vacuum» índices (planeados: %d)"
 
-#: commands/vacuumparallel.c:713
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index cleanup (planned: %d)"
@@ -13297,8 +13804,8 @@ msgstr[1] "se lanzaron %d procesos asistentes para «cleanup» de índices (plan
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "Especificaciones contradictorias de «datestyle»."
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "Especificaciones contradictorias de «DateStyle»."
 
 #: commands/variable.c:307
 #, c-format
@@ -13310,12 +13817,12 @@ msgstr "No se pueden especificar meses en el intervalo de huso horario."
 msgid "Cannot specify days in time zone interval."
 msgstr "No se pueden especificar días en el intervalo de huso horario."
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "el huso horario «%s» parece usar segundos intercalares (bisiestos)"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL no soporta segundos intercalares."
@@ -13325,107 +13832,97 @@ msgstr "PostgreSQL no soporta segundos intercalares."
 msgid "UTC timezone offset is out of range."
 msgstr "El desplazamiento de huso horario UTC está fuera de rango."
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, 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:559
+#: commands/variable.c:561
 #, 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:566
+#: commands/variable.c:568
 #, 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:592
+#: commands/variable.c:596
 #, 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:599
+#: commands/variable.c:603
 #, 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:606 storage/lmgr/predicate.c:1685
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, 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:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Puede utilizar REPEATABLE READ en su lugar."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, 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:631
+#: commands/variable.c:639
 #, 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:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr "No se puede cambiar «client_encoding» durante una operación paralela."
+
+#: commands/variable.c:743
 #, 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:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "No se puede cambiar «client_encoding» ahora."
 
-#: commands/variable.c:781
-#, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr "no se puede cambiar «client_encoding» durante una operación paralela"
-
-#: commands/variable.c:876
+#: commands/variable.c:889
 #, c-format
 msgid "permission will be denied to set session authorization \"%s\""
 msgstr "se denegará el permiso para definir autorización de sesión «%s»"
 
-#: commands/variable.c:881
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "se ha denegado el permiso para definir autorización de sesión «%s»"
 
-#: commands/variable.c:991
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
 msgstr "se denegará el permiso para definir el rol «%s»"
 
-#: commands/variable.c:996
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "se ha denegado el permiso para definir el rol «%s»"
 
-#: commands/variable.c:1200
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour no está soportado en este servidor"
 
-#: commands/variable.c:1228
-#, c-format
-msgid "\"effective_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "«effective_io_concurrency» debe ser 0 en plataformas que no tienen posix_fadvise()."
-
-#: commands/variable.c:1241
-#, c-format
-msgid "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "«maintenance_io_concurrency» debe ser 0 en plataformas que no tienen posix_fadvise()."
-
 #: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL no está soportado en este servidor"
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, 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"
@@ -13511,57 +14008,57 @@ msgstr "el cursor «%s» no está posicionado en una fila"
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "el cursor «%s» no es un recorrido simplemente actualizable de la tabla «%s»"
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3093
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "el tipo del parámetro %d (%s) no coincide aquel con que fue preparado el plan (%s)"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2567
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3105
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "no se encontró un valor para parámetro %d"
 
-#: executor/execExpr.c:642 executor/execExpr.c:649 executor/execExpr.c:655
-#: executor/execExprInterp.c:4852 executor/execExprInterp.c:4869
-#: executor/execExprInterp.c:4968 executor/nodeModifyTable.c:203
-#: executor/nodeModifyTable.c:214 executor/nodeModifyTable.c:231
-#: executor/nodeModifyTable.c:239
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5439 executor/execExprInterp.c:5456
+#: executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "el tipo de registro de la tabla no coincide con el tipo de registro de la consulta"
 
-#: executor/execExpr.c:643 executor/nodeModifyTable.c:204
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "La consulta tiene demasiadas columnas."
 
-#: executor/execExpr.c:650 executor/nodeModifyTable.c:232
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "La consulta entrega un valor para una columna eliminada en la posición %d."
 
-#: executor/execExpr.c:656 executor/execExprInterp.c:4870
-#: executor/nodeModifyTable.c:215
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "La tabla tiene tipo %s en posición ordinal %d, pero la consulta esperaba %s."
 
-#: executor/execExpr.c:1104 parser/parse_agg.c:838
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de ventana deslizante"
 
-#: executor/execExpr.c:1649
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "el tipo de destino no es un array"
 
-#: executor/execExpr.c:1989
+#: executor/execExpr.c:2033
 #, 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/execExpr.c:2653 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
@@ -13569,379 +14066,382 @@ msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "no se pueden pasar más de %d argumento a una función"
 msgstr[1] "no se pueden pasar más de %d argumentos a una función"
 
-#: executor/execExpr.c:2680 executor/execSRF.c:738 executor/functions.c:1068
-#: utils/adt/jsonfuncs.c:4054 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, 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"
 
-#: executor/execExpr.c:3086 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr "no se puede poner subíndices al tipo %s porque no soporta subíndices"
 
-#: executor/execExpr.c:3214 executor/execExpr.c:3236
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "el tipo %s no soporta asignación subindexada"
 
-#: executor/execExprInterp.c:2019
+#: executor/execExprInterp.c:2415
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "El atributo %d de tipo %s ha sido eliminado"
 
-#: executor/execExprInterp.c:2025
+#: executor/execExprInterp.c:2421
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "el atributo %d del tipo %s tiene tipo erróneo"
 
-#: executor/execExprInterp.c:2027 executor/execExprInterp.c:3226
-#: executor/execExprInterp.c:3272
+#: executor/execExprInterp.c:2423 executor/execExprInterp.c:3782
+#: executor/execExprInterp.c:3828
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "La tabla tiene tipo %s, pero la consulta esperaba %s."
 
-#: executor/execExprInterp.c:2107 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2503 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "el tipo %s no es compuesto"
 
-#: executor/execExprInterp.c:2710
+#: executor/execExprInterp.c:3266
 #, 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/execExprInterp.c:2923
+#: executor/execExprInterp.c:3479
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "no se puede mezclar arrays incompatibles"
 
-#: executor/execExprInterp.c:2924
+#: executor/execExprInterp.c:3480
 #, 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/execExprInterp.c:2945 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3503 utils/adt/arrayfuncs.c:5593
-#: utils/adt/arrayfuncs.c:6110 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5605
+#: utils/adt/arrayfuncs.c:6124 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "el número de dimensiones del array (%d) excede el máximo permitido (%d)"
 
-#: executor/execExprInterp.c:2965 executor/execExprInterp.c:3000
+#: executor/execExprInterp.c:3521 executor/execExprInterp.c:3556
 #, 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/execExprInterp.c:2977 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
 #: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
 #: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
-#: utils/adt/arrayfuncs.c:3533 utils/adt/arrayfuncs.c:5365
-#: utils/adt/arrayfuncs.c:6202 utils/adt/arrayfuncs.c:6546
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5377
+#: utils/adt/arrayfuncs.c:6216 utils/adt/arrayfuncs.c:6560
 #: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
 #: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "el tamaño del array excede el máximo permitido (%d)"
 
-#: executor/execExprInterp.c:3225 executor/execExprInterp.c:3271
+#: executor/execExprInterp.c:3781 executor/execExprInterp.c:3827
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "el atributo %d tiene tipo erróneo"
 
-#: executor/execExprInterp.c:3857 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4413 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "el dominio %s no permite valores null"
 
-#: executor/execExprInterp.c:3872 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4428 utils/adt/domains.c:196
 #, 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/execExprInterp.c:4447
+#: executor/execExprInterp.c:5003
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
 msgstr "ningún ítem SQL/JSON fue encontrado para la ruta especificada de la columna «%s»"
 
-#: executor/execExprInterp.c:4452
+#: executor/execExprInterp.c:5008
 #, c-format
 msgid "no SQL/JSON item found for specified path"
 msgstr "ningún ítem SQL/JSON fue encontrado para la ruta especificada"
 
 #. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
-#: executor/execExprInterp.c:4652 executor/execExprInterp.c:4660
+#: executor/execExprInterp.c:5208 executor/execExprInterp.c:5216
 #, c-format
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "no se pudo convertir la expresión %s (%s) al tipo RETURNING"
 
-#: executor/execExprInterp.c:4853
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "La fila de la tabla contiene %d atributo, pero la consulta esperaba %d."
 msgstr[1] "La fila de la tabla contiene %d atributos, pero la consulta esperaba %d."
 
-#: executor/execExprInterp.c:4969 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "Discordancia de almacenamiento físico en atributo eliminado en la posición %d."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:608
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT no soporta las restricciones únicas o de exclusión postergables como árbitros"
 
-#: executor/execIndexing.c:870
+#: executor/execIndexing.c:911
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "no se pudo crear la restricción de exclusión «%s»"
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:914
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La llave %s está en conflicto con la llave %s."
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:916
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Existe un conflicto de llave."
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:922
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "llave en conflicto viola la restricción de exclusión «%s»"
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:925
 #, 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:886
+#: executor/execIndexing.c:927
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "La llave está en conflicto con una llave existente."
 
-#: executor/execMain.c:1039
+#: executor/execIndexing.c:1172
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr "valor vacío WITH OVERLAPS encontrado en la columna «%s» de relación «%s»"
+
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "no se puede cambiar la secuencia «%s»"
 
-#: executor/execMain.c:1045
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "no se puede cambiar la relación TOAST «%s»"
 
-#: executor/execMain.c:1064
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "no se puede cambiar la vista materializada «%s»"
 
-#: executor/execMain.c:1076
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "no se puede insertar en la tabla foránea «%s»"
 
-#: executor/execMain.c:1082
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "la tabla foránea «%s» no permite inserciones"
 
-#: executor/execMain.c:1089
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "no se puede actualizar la tabla foránea «%s»"
 
-#: executor/execMain.c:1095
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "la tabla foránea «%s» no permite actualizaciones"
 
-#: executor/execMain.c:1102
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "no se puede eliminar desde la tabla foránea «%s»"
 
-#: executor/execMain.c:1108
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "la tabla foránea «%s» no permite eliminaciones"
 
-#: executor/execMain.c:1119
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "no se puede cambiar la relación «%s»"
 
-#: executor/execMain.c:1146
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "no se puede bloquear registros de la secuencia «%s»"
 
-#: executor/execMain.c:1153
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "no se puede bloquear registros en la relación TOAST «%s»"
 
-#: executor/execMain.c:1160
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "no se puede bloquear registros en la vista «%s»"
 
-#: executor/execMain.c:1168
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "no se puede bloquear registros en la vista materializada «%s»"
 
-#: executor/execMain.c:1177 executor/execMain.c:2689
+#: executor/execMain.c:1227 executor/execMain.c:2869
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "no se puede bloquear registros en la tabla foránea «%s»"
 
-#: executor/execMain.c:1183
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "no se puede bloquear registros en la tabla «%s»"
 
-#: executor/execMain.c:1901
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "el nuevo registro para la relación «%s» viola la restricción de partición"
 
-#: executor/execMain.c:1903 executor/execMain.c:1987 executor/execMain.c:2038
-#: executor/execMain.c:2148
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218
+#: executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "La fila que falla contiene %s."
 
-#: executor/execMain.c:1984
-#, c-format
-msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
-msgstr "el valor nulo en la columna «%s» de la relación «%s» viola la restricción de no nulo"
-
-#: executor/execMain.c:2036
+#: executor/execMain.c:2078
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "el nuevo registro para la relación «%s» viola la restricción «check» «%s»"
 
-#: executor/execMain.c:2146
+#: executor/execMain.c:2215
+#, c-format
+msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
+msgstr "el valor nulo en la columna «%s» de la relación «%s» viola la restricción “not-null”"
+
+#: executor/execMain.c:2324
 #, 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:2156
+#: executor/execMain.c:2334
 #, c-format
 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:2161
+#: executor/execMain.c:2339
 #, c-format
 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:2169
+#: executor/execMain.c:2347
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "el registro destino viola la política de seguridad de registros «%s» (expresión USING) para la tabla «%s»"
 
-#: executor/execMain.c:2174
+#: executor/execMain.c:2352
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "el registro destino viola la política de seguridad de registros (expresión USING) para la tabla «%s»"
 
-#: executor/execMain.c:2181
+#: executor/execMain.c:2359
 #, c-format
 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:2186
+#: executor/execMain.c:2364
 #, c-format
 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/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "no se encontró una partición de «%s» para el registro"
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "La llave de particionamiento de la fila que falla contiene %s."
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update, retrying"
 msgstr "el registro a ser bloqueado ya fue movido a otra partición debido a un update concurrente, reintentando"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "actualización simultánea, reintentando"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "eliminacón concurrente, reintentando"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3852
-#: utils/adt/arrayfuncs.c:4407 utils/adt/arrayfuncs.c:6426
-#: utils/adt/rowtypes.c:1220
-#, 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"
-
-#: executor/execReplication.c:687 executor/execReplication.c:693
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "no se puede actualizar la tabla «%s»"
 
-#: executor/execReplication.c:689 executor/execReplication.c:701
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid "Column used in the publication WHERE expression is not part of the replica identity."
 msgstr "La columna usada en la expresión WHERE de la publicación no es parte de la identidad de replicación."
 
-#: executor/execReplication.c:695 executor/execReplication.c:707
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid "Column list used by the publication does not cover the replica identity."
 msgstr "La lista de columnas usada por la publicación no incluye la identidad de replicación."
 
-#: executor/execReplication.c:699 executor/execReplication.c:705
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr "La identidad de réplica no debe contener columnas generadas no publicadas."
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "no se puede eliminar desde la tabla «%s»"
 
-#: executor/execReplication.c:725
+#: executor/execReplication.c:859
 #, c-format
 msgid "cannot update table \"%s\" because it does not have a replica identity and publishes updates"
 msgstr "no se puede actualizar la tabla «%s» porque no tiene identidad de replicación y publica updates"
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "Para habilitar la actualización de la tabla, configure REPLICA IDENTITY utilizando ALTER TABLE."
 
-#: executor/execReplication.c:731
+#: executor/execReplication.c:865
 #, c-format
 msgid "cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes"
 msgstr "no se puede eliminar de la tabla «%s» porque no tiene una identidad de replicación y publica deletes"
 
-#: executor/execReplication.c:733
+#: executor/execReplication.c:867
 #, c-format
 msgid "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "para habilitar la eliminación en la tabla, configure REPLICA IDENTITY utilizando ALTER TABLE."
 
-#: executor/execReplication.c:749
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr "no se puede usar la relación «%s.%s» como destino de replicación lógica"
@@ -13988,117 +14488,118 @@ msgstr[1] "Fila retornada contiene %d atributos, pero la consulta esperaba %d."
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "Tipo retornado %s en posición ordinal %d, pero la consulta esperaba %s."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "no se puede obtener una columna de sistema en este contexto"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
 msgstr "no se tiene información de transacción para este tipo de tupla"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
+#: executor/execTuples.c:391 executor/execTuples.c:796
 #, c-format
 msgid "don't have a storage tuple in this context"
 msgstr "no se tiene una tupla de almacenamiento en este contexto"
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "la vista materializada «%s» no ha sido poblada"
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "Use la orden REFRESH MATERIALIZED VIEW."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "no se pudo determinar el tipo de argumento declarado %s"
 
-#: executor/functions.c:513
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an 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:519
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "%s no está permitido en una función SQL"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:527 executor/spi.c:1744 executor/spi.c:2657
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, 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:1452
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "función SQL «%s» en la sentencia %d"
+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:1478
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "función SQL «%s» durante el inicio"
+msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgstr "La sentencia final de la función debe ser un SELECT o INSERT/UPDATE/DELETE/MERGE RETURNING."
 
-#: executor/functions.c:1563
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
-msgid "calling procedures with output arguments is not supported in SQL functions"
-msgstr "no está permitido invocar procedimientos con argumentos de salida en funciones SQL"
+msgid "cached plan must not change result type"
+msgstr "el plan almacenado no debe cambiar el tipo de resultado"
 
-#: executor/functions.c:1698 executor/functions.c:1736
-#: executor/functions.c:1750 executor/functions.c:1845
-#: executor/functions.c:1878 executor/functions.c:1892
+#: executor/functions.c:1922 executor/functions.c:1953
 #, 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"
+msgid "SQL function \"%s\" during startup"
+msgstr "función SQL «%s» durante el inicio"
 
-#: executor/functions.c:1700
+#: executor/functions.c:1950
 #, c-format
-msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
-msgstr "La sentencia final de la función debe ser un SELECT o INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgid "SQL function \"%s\" statement %d"
+msgstr "función SQL «%s» en la sentencia %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid "calling procedures with output arguments is not supported in SQL functions"
+msgstr "no está permitido invocar procedimientos con argumentos de salida en funciones SQL"
 
-#: executor/functions.c:1738
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "La sentencia final debe retornar exactamente una columna."
 
-#: executor/functions.c:1752
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "El verdadero tipo de retorno es %s."
 
-#: executor/functions.c:1847
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "La sentencia final retorna demasiadas columnas."
 
-#: executor/functions.c:1880
+#: executor/functions.c:2401
 #, 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:1894
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "La sentencia final retorna muy pocas columnas."
 
-#: executor/functions.c:1922
+#: executor/functions.c:2443
 #, 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:3936 executor/nodeWindowAgg.c:2975
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3041
 #, 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/nodeAgg.c:3966 parser/parse_agg.c:680 parser/parse_agg.c:708
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de agregación"
@@ -14108,12 +14609,12 @@ msgstr "no se pueden anidar llamadas a funciones de agregación"
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "el scan personalizado «%s» no soporta MarkPos"
 
-#: executor/nodeHashjoin.c:1131 executor/nodeHashjoin.c:1161
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "no se puede rebobinar el archivo temporal del hash-join"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, 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"
@@ -14128,74 +14629,79 @@ msgstr "OFFSET no debe ser negativo"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT no debe ser negativo"
 
-#: executor/nodeMergejoin.c:1579
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN sólo está soportado con condiciones que se pueden usar con merge join"
 
-#: executor/nodeMergejoin.c:1597
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN sólo está soportado con condiciones que se pueden usar con merge join"
 
-#: executor/nodeModifyTable.c:240
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "La consulta entrega un valor para una columna generada en la posición %d."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "La consulta tiene muy pocas columnas."
 
-#: executor/nodeModifyTable.c:1540 executor/nodeModifyTable.c:1614
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr "el registro a ser eliminado ya fue modificado por una operación disparada por la orden actual"
 
-#: executor/nodeModifyTable.c:1769
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "especificación ON UPDATE no válida"
 
-#: executor/nodeModifyTable.c:1770
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr "La tupla de resultado aparecería en una partición diferente que la tupla original."
 
-#: executor/nodeModifyTable.c:2226
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr "no se puede mover una tupla entre particiones cuando un ancestro no-raíz de la partición de origen es referenciada directamente en una llave foránea"
 
-#: executor/nodeModifyTable.c:2227
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr "Una llave foránea apunta al ancestro «%s» pero no al ancestro raíz «%s»."
 
-#: executor/nodeModifyTable.c:2230
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "Considere definir una llave foránea en la tabla «%s»."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2596 executor/nodeModifyTable.c:3138
-#: executor/nodeModifyTable.c:3308
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328
+#: executor/nodeModifyTable.c:3520
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "la orden %s no puede afectar una fila por segunda vez"
 
-#: executor/nodeModifyTable.c:2598
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "Asegúrese de que ningún registro propuesto para inserción dentro de la misma orden tenga valores duplicados restringidos."
 
-#: executor/nodeModifyTable.c:3131 executor/nodeModifyTable.c:3301
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3513
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "la tupla a ser actualizada o borrada ya fue modificada por una operación disparada por la orden actual"
 
-#: executor/nodeModifyTable.c:3140 executor/nodeModifyTable.c:3310
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "Asegúrese que no más de un registro de origen coincide con cada registro de destino."
 
-#: executor/nodeModifyTable.c:3209
+#: executor/nodeModifyTable.c:3399
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
 msgstr "la tupla a ser mezclada ya fue movida a otra partición por un update concurrente"
@@ -14210,8 +14716,8 @@ msgstr "el parámetro TABLESAMPLE no puede ser null"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "el parámetro TABLESAMPLE REPEATABLE no puede ser null"
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "una subconsulta utilizada como expresión retornó más de un registro"
@@ -14246,27 +14752,27 @@ msgstr "null no está permitido en la columna «%s»"
 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:2083
+#: executor/nodeWindowAgg.c:2106
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "la posición inicial del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2120
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "la posición inicial del marco no debe ser negativa"
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2133
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "la posición final del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2147
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "la posición final del marco no debe ser negativa"
 
-#: executor/nodeWindowAgg.c:2891
+#: executor/nodeWindowAgg.c:2957
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr "la función de agregación %s no permite ser usada como función ventana"
@@ -14317,7 +14823,7 @@ msgstr "no se puede abrir consulta %s como cursor"
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE no está soportado"
 
-#: executor/spi.c:1719 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Los cursores declarados SCROLL deben ser READ ONLY."
@@ -14335,8 +14841,8 @@ msgstr "la consulta «%s» no retorna tuplas"
 
 #: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "expresión SQL «%s»"
+msgid "PL/pgSQL expression \"%s\""
+msgstr "expresión PL/pgSQL «%s»"
 
 #: executor/spi.c:2992
 #, c-format
@@ -14353,28 +14859,28 @@ msgstr "sentencia SQL: «%s»"
 msgid "could not send tuple to shared-memory queue"
 msgstr "no se pudo enviar la tupla a la cola en memoria compartida"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "no se encontró un mapeo para el usuario «%s», servidor «%s»"
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7153
-#: optimizer/util/plancat.c:540
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299
+#: optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr "el acceso a la tabla foránea no de sistema está restringido"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "el nombre de opción «%s» no es válido"
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "Quizás se refiere a la opción «%s»."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "No hay opciones válidas en este contexto."
@@ -14385,712 +14891,910 @@ msgstr "No hay opciones válidas en este contexto."
 msgid "Failed on DSA request of size %zu."
 msgstr "Falla en petición DSA de tamaño %zu."
 
-#: libpq/auth-sasl.c:97
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "se esperaba una respuesta SASL, se obtuvo mensaje de tipo %d"
+msgid "client selected an invalid SASL authentication mechanism"
+msgstr "cliente eligió un mecanismo de autentificación SASL no válido"
 
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
 #, c-format
-msgid "client selected an invalid SASL authentication mechanism"
+msgid "malformed OAUTHBEARER message"
+msgstr "mensaje OAUTHBEARER mal formado"
+
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
+#, c-format
+msgid "The message is empty."
+msgstr "El mensaje está vacío."
+
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
+#, c-format
+msgid "Message length does not match input length."
+msgstr "El largo del mensaje no coincide con el largo de entrada."
+
+#: libpq/auth-oauth.c:193
+#, c-format
+msgid "Client did not send a kvsep response."
+msgstr "El cliente no envió una respuesta kvsep."
+
+#: libpq/auth-oauth.c:221
+#, c-format
+msgid "The server does not support channel binding for OAuth, but the client message includes channel binding data."
+msgstr "El servidor no soporta enlazado de canal (channel binding) para OAuth, pero el mensaje del cliente incluye datos de enlazado de canal."
+
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
+#, c-format
+msgid "Comma expected, but found character \"%s\"."
+msgstr "Se esperaba una coma, se encontró el carácter «%s»."
+
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
+#, c-format
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "Indicador de enlazado de canal «%s» inesperado."
+
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
+#, c-format
+msgid "client uses authorization identity, but it is not supported"
+msgstr "el cliente usa identidad de autorización, pero no está soportada"
+
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
+#, c-format
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "Atributo inesperado \"%s\" en client-first-message."
+
+#: libpq/auth-oauth.c:264
+#, fuzzy, c-format
+#| msgid "Comma expected, but found character \"%s\"."
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr "Se esperaba una coma, se encontró el carácter «%s»."
+
+#: libpq/auth-oauth.c:273
+#, fuzzy, c-format
+#| msgid "File \"%s\" does not contain valid data."
+msgid "Message does not contain an auth value."
+msgstr "El archivo «%s» no contiene datos válidos."
+
+#: libpq/auth-oauth.c:280
+#, c-format
+msgid "Message contains additional data after the final terminator."
+msgstr "El mensaje contiene datos adicionales después del terminador final."
+
+#: libpq/auth-oauth.c:343
+#, c-format
+msgid "Message contains an empty key name."
+msgstr "El mensaje contiene un nombre de llave vacío."
+
+#: libpq/auth-oauth.c:350
+#, c-format
+msgid "Message contains an invalid key name."
+msgstr "El mensaje contiene un nombre de llave no válido."
+
+#: libpq/auth-oauth.c:376
+#, fuzzy, c-format
+#| msgid "enum %s contains no values"
+msgid "Message contains an invalid value."
+msgstr "el enum %s no contiene valores"
+
+#: libpq/auth-oauth.c:421
+#, c-format
+msgid "Message contains an unterminated key/value pair."
+msgstr "El mensaje contiene un par llave/valor sin terminar."
+
+#: libpq/auth-oauth.c:439
+#, c-format
+msgid "Message contains a key without a value."
+msgstr "El mensaje contiene una llave sin un valor."
+
+#: libpq/auth-oauth.c:453
+#, c-format
+msgid "Message contains multiple auth values."
+msgstr "El mensaje contiene múltiples valores «auth»."
+
+#: libpq/auth-oauth.c:473
+#, c-format
+msgid "Message did not contain a final terminator."
+msgstr "El mensaje no contiene un terminador final."
+
+#: libpq/auth-oauth.c:499
+#, fuzzy, c-format
+#| msgid "unit \"%s\" not recognized for type %s"
+msgid "OAuth is not properly configured for this user"
+msgstr "unidad «%s» no reconocida para el tipo %s"
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr "Los parámetros emisor y “scope” deben estar definidos en pg_hba.conf."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, fuzzy, c-format
+#| msgid "malformed JSON array"
+msgid "malformed OAuth bearer token"
+msgstr "array JSON mal formado"
+
+#: libpq/auth-oauth.c:586
+#, fuzzy, c-format
+#| msgid "client selected an invalid SASL authentication mechanism"
+msgid "Client response indicated a non-Bearer authentication scheme."
 msgstr "cliente eligió un mecanismo de autentificación SASL no válido"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
+#: libpq/auth-oauth.c:603
+#, fuzzy, c-format
+#| msgid "Query buffer is empty."
+msgid "Bearer token is empty."
+msgstr "El búfer de consulta está vacío."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "E"
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "se solicitó validación de “token” OAuth sin haber cargado un validador"
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "error interno en el módulo validador OAuth"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, fuzzy, c-format
+#| msgid "Peer authentication failed for user \"%s\""
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr "la autentificación Peer falló para el usuario «%s»"
+
+#: libpq/auth-oauth.c:681
+#, fuzzy, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "El validador "
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "El validador no proveyó una identidad."
+
+#: libpq/auth-oauth.c:760
+#, fuzzy, c-format
+#| msgid "archive modules have to define the symbol %s"
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "los módulos de archivado tienen que definir el símbolo %s"
+
+#: libpq/auth-oauth.c:773
+#, fuzzy, c-format
+#| msgid "incompatible library \"%s\": magic block mismatch"
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "biblioteca «%s» incompatible: bloque mágico no coincide"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "El servidor tiene número mágico 0x%08X, el módulo tiene 0x%08X."
+
+#: libpq/auth-oauth.c:784
+#, fuzzy, c-format
+#| msgid "archive modules must register an archive callback"
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "los módulos de archivado deben registrar un callback de archivado"
+
+#: libpq/auth-oauth.c:833
+#, fuzzy, c-format
+#| msgid "authentication option \"%s\" is only valid for authentication methods %s"
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr "la opción de autentificación «%s» sólo es válida para los métodos de autentificación %s"
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:196
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "línea %d del archivo de configuración «%s»"
+
+#: libpq/auth-oauth.c:867
+#, fuzzy, c-format
+#| msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
+msgid "authentication method \"oauth\" requires argument \"validator\" to be set when oauth_validator_libraries contains multiple options"
+msgstr "el método de autentificación «ldap» requiere que los argumento «ldapbasedn», «ldapprefix» o «ldapsuffix» estén definidos"
+
+#: libpq/auth-oauth.c:882
+#, fuzzy, c-format
+#| msgid "role \"%s\" is not permitted to log in"
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "al rol «%s» no se le permite conectarse"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "se esperaba una respuesta SASL, se obtuvo mensaje de tipo %d"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
 #, c-format
 msgid "invalid SCRAM secret for user \"%s\""
 msgstr "el secreto SCRAM para el usuario «%s» no es válido"
 
-#: libpq/auth-scram.c:298
+#: libpq/auth-scram.c:302
 #, c-format
 msgid "User \"%s\" does not have a valid SCRAM secret."
 msgstr "El usuario «%s» no tiene un secreto SCRAM válido."
 
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
 #, c-format
 msgid "malformed SCRAM message"
 msgstr "mensaje SCRAM mal formado"
 
-#: libpq/auth-scram.c:379
-#, c-format
-msgid "The message is empty."
-msgstr "El mensaje está vacío."
-
-#: libpq/auth-scram.c:384
-#, c-format
-msgid "Message length does not match input length."
-msgstr "El largo del mensaje no coincide con el largo de entrada."
-
-#: libpq/auth-scram.c:416
+#: libpq/auth-scram.c:420
 #, c-format
 msgid "invalid SCRAM response"
 msgstr "respuesta SCRAM no válida"
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-scram.c:421
 #, c-format
 msgid "Nonce does not match."
 msgstr "El «nonce» no coincide."
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-scram.c:504
 #, c-format
 msgid "could not generate random salt"
 msgstr "no se pudo generar una sal aleatoria"
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-scram.c:752
 #, c-format
 msgid "Expected attribute \"%c\" but found \"%s\"."
 msgstr "Se esperaba un atributo «%c» pero se encontró «%s»."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
 #, c-format
 msgid "Expected character \"=\" for attribute \"%c\"."
 msgstr "Se esperaba el carácter «=» para el atributo «%c»."
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-scram.c:865
 #, c-format
 msgid "Attribute expected, but found end of string."
 msgstr "Se esperaba un atributo, se encontró el fin de la cadena."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-scram.c:878
 #, c-format
 msgid "Attribute expected, but found invalid character \"%s\"."
 msgstr "Se esperaba un atributo, se encontró el carácter no válido «%s»."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
 #, c-format
 msgid "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not include channel binding data."
-msgstr "El cliente seleccionó SCRAM-SHA-256-PLUS, pero el mensaje SCRAM no incluye los datos de enlazado (binding) del canal."
-
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
-#, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "Se esperaba una coma, se encontró el carácter «%s»."
+msgstr "El cliente seleccionó SCRAM-SHA-256-PLUS, pero el mensaje SCRAM no incluye los datos de enlazado de canal (channel binding)."
 
-#: libpq/auth-scram.c:1010
+#: libpq/auth-scram.c:1024
 #, c-format
 msgid "SCRAM channel binding negotiation error"
-msgstr "error de negociación de enlazado (binding) de canal SCRAM"
+msgstr "error de negociación de enlazado de canal (channel binding) SCRAM"
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-scram.c:1025
 #, c-format
 msgid "The client supports SCRAM channel binding but thinks the server does not.  However, this server does support channel binding."
-msgstr "El cliente soporta enlazado (binding) de canal SCRAM, pero piensa que el servidor no. Sin embargo, este servidor sí soporta enlazado de canal."
+msgstr "El cliente soporta enlazado de canal (channel binding) SCRAM, pero piensa que el servidor no. Sin embargo, este servidor sí soporta enlazado de canal."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-scram.c:1047
 #, c-format
 msgid "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM message includes channel binding data."
-msgstr "El cliente seleccionó SCRAM-SHA-256 sin enlazado de canal, pero el mensaje SCRAM incluye datos de enlazado de canal."
+msgstr "El cliente seleccionó SCRAM-SHA-256 sin enlazado de canal (channel binding), pero el mensaje SCRAM incluye datos de enlazado de canal."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-scram.c:1058
 #, c-format
 msgid "unsupported SCRAM channel-binding type \"%s\""
 msgstr "tipo de enlazado de canal SCRAM «%s» no soportado"
 
-#: libpq/auth-scram.c:1051
-#, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "Indicador de enlazado de canal «%s» inesperado."
-
-#: libpq/auth-scram.c:1061
-#, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr "el cliente usa identidad de autorización, pero no está soportada"
-
-#: libpq/auth-scram.c:1066
-#, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "Atributo inesperado \"%s\" en client-first-message."
-
-#: libpq/auth-scram.c:1082
+#: libpq/auth-scram.c:1096
 #, c-format
 msgid "client requires an unsupported SCRAM extension"
 msgstr "el cliente requiere una extensión SCRAM no soportada"
 
-#: libpq/auth-scram.c:1096
+#: libpq/auth-scram.c:1110
 #, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "caracteres no imprimibles en el «nonce» SCRAM"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "no se pudo generar un «nonce» aleatorio"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "no se pudo codificar un «nonce» aleatorio"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
-msgstr "la verificación de enlazado (binding) de canal SCRAM falló"
+msgstr "la verificación de enlazado de canal (channel binding) SCRAM falló"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr "atributo de enlazado de canal SCRAM inesperado en client-final-message"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "Prueba (proof) mal formada en client-final-message."
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "Basura encontrada al final de client-final-message."
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, 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:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "la autentificación «trust» falló para el usuario «%s»"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "la autentificación Ident falló para el usuario «%s»"
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "la autentificación Peer falló para el usuario «%s»"
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "la autentificación password falló para el usuario «%s»"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "la autentificación GSSAPI falló para el usuario «%s»"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "la autentificación SSPI falló para el usuario «%s»"
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "la autentificación PAM falló para el usuario «%s»"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "la autentificación BSD falló para el usuario «%s»"
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "la autentificación LDAP falló para el usuario «%s»"
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "la autentificación por certificado falló para el usuario «%s»"
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "la autentificación RADIUS falló para el usuario «%s»"
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, 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:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "La conexión coincidió con el archivo «%s» línea %d: «%s»"
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "identificador de autentificación establecido más de una vez"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "identificador anterior: «%s»; nuevo identificador: «%s»"
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "conexión autenticada: identidad=«%s» método=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "los certificados de cliente sólo pueden verificarse si un almacén de certificado raíz está disponible"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "la conexión requiere un certificado de cliente válido"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "cifrado GSS"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "cifrado SSL"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "sin cifrado"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, 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"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, 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:506
+#: libpq/auth.c:503
 #, 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:509
+#: libpq/auth.c:506
 #, 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:512
+#: libpq/auth.c:509
 #, 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:515
+#: libpq/auth.c:512
 #, 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:520
+#: libpq/auth.c:517
 #, 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."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, 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"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, 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:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "conexión autenticada: usuario=«%s» método=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, 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:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "el tamaño del paquete de contraseña no es válido"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "el cliente retornó una contraseña vacía"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "no se pudo generar una sal MD5 aleatoria"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "no se pudo establecer el ambiente: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, 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:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "falló la aceptación del contexto de seguridad GSS"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "falló la obtención del nombre de usuario GSS"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, 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:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "no se pudo aceptar un contexto SSPI"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 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:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "no se pudo traducir el nombre"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "nombre de «realm» demasiado largo"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "nombre de cuenta traducido demasiado largo"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, 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:1756
+#: libpq/auth.c:1757
 #, 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:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "no se pudo conectar al servidor Ident en dirección «%s», port %s: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, 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:1807
+#: libpq/auth.c:1808
 #, 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:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "respuesta del servidor Ident en formato no válido: «%s»"
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, 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:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "no se pudo recibir credenciales: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "no se pudo encontrar el ID del usuario local %ld: %m"
+
+#: libpq/auth.c:1894
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "no se pudo encontrar el ID del usuario local %ld: %s"
+msgid "local user with ID %ld does not exist"
+msgstr "no existe un usuario local con ID %ld"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "se ha recibido un error de la biblioteca PAM: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "conversación PAM no soportada: %d/«%s»"
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "no se pudo crear autenticador PAM: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) falló: %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST) falló: %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) falló: %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate falló: %s"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt falló: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "no se pudo liberar autenticador PAM: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "no se pudo inicializar LDAP: código de error %d"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "no se pudo extraer el nombre de dominio de ldapbasedn"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "la autentificación LDAP no pudo encontrar registros DNS SRV para «%s»"
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "Defina un nombre de servidor LDAP explícitamente."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "no se pudo inicializar LDAP: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "ldaps no está soportado con esta biblioteca LDAP"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "no se pudo inicializar LDAP: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, 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:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "no se pudo iniciar sesión de LDAP TLS: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "servidor LDAP no especificado, y no hay ldapbasedn"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "servidor LDAP no especificado"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, 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:2534
+#: libpq/auth.c:2540
 #, 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:2564
+#: libpq/auth.c:2570
 #, 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:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "no existe el usuario LDAP «%s»"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, 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:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "el usuario LDAP «%s» no es única"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, 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:2606
+#: libpq/auth.c:2612
 #, 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:2633
+#: libpq/auth.c:2639
 #, 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:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "Diagnóstico LDAP: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, 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:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "la autentificación por certificado falló para el usuario «%s»: no se pudo obtener el DN del sujeto"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "la validación de certificado (clientcert=verify-full) falló para el usuario «%s»: discordancia de DN"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "la validación de certificado (clientcert=verify-full) falló para el usuario «%s»: discordancia de CN"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "servidor RADIUS no especificado"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "secreto RADIUS no especificado"
 
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "la autentificación RADIUS no soporta contraseñas más largas de %d caracteres"
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, 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:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "no se pudo generar un vector aleatorio de encriptación"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "no se pudo efectuar cifrado MD5 de contraseña: %s"
 
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "no se pudo crear el socket RADIUS: %m"
 
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "no se pudo enlazar el socket RADIUS local: %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "no se pudo enviar el paquete RADIUS: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "se agotó el tiempo de espera de la respuesta RADIUS desde %s"
 
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, 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:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "no se pudo leer la respuesta RADIUS: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "la respuesta RADIUS desde %s fue enviada desde el port incorrecto: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "la respuesta RADIUS desde %s es demasiado corta: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "la respuesta RADIUS desde %ss tiene largo corrupto: %d (largo real %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "la respuesta RADIUS desde %s es a una petición diferente: %d (debería ser %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "no se pudo efectuar cifrado MD5 del paquete recibido: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "la respuesta RADIUS desde %s tiene firma MD5 incorrecta"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "la respuesta RADIUS desde %s tiene código no válido (%d) para el usuario «%s»"
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "el descriptor de objeto grande no es válido: %d"
@@ -15100,7 +15804,7 @@ msgstr "el descriptor de objeto grande no es válido: %d"
 msgid "large object descriptor %d was not opened for reading"
 msgstr "el descriptor de objeto grande %d no fue abierto para lectura"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "el descriptor de objeto grande %d no fue abierto para escritura"
@@ -15115,32 +15819,32 @@ msgstr "resultado de lo_lseek fuera de rango para el descriptor de objeto grande
 msgid "lo_tell result out of range for large-object descriptor %d"
 msgstr "resultado de lo_tell fuera de rango para el descriptor de objeto grande %d"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de servidor «%s»: %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "no se pudo leer el archivo de servidor «%s»: %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "no se pudo crear el archivo del servidor «%s»: %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "no se pudo escribir el archivo del servidor «%s»: %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "el tamaño de petición de lectura de objeto grande es muy grande"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "el tamaño solicitado no puede ser negativo"
@@ -15175,819 +15879,839 @@ msgstr "el archivo de la llave privada «%s» tiene acceso para el grupo u otros
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "El archivo debe tener permisos u=rw (0600) o menos si es de propiedad del usuario de base deatos, o permisos u=rw,g=r (0640) o menos si es de root."
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "error de «wrap» de GSSAPI"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "mensaje saliente GSSAPI no proveería confidencialidad"
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "el servidor intentó enviar un paquete GSSAPI demasiado grande (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "paquete GSSAPI demasiado grande enviado por el cliente (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "error de «unwrap» de GSSAPI"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "mensaje GSSAPI entrante no usó confidencialidad"
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "paquete GSSAPI demasiado grande enviado por el cliente (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "no se pudo aceptar un contexto de seguridad GSSAPI"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "error de verificación de tamaño GSSAPI"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "no se pudo crear un contexto SSL: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, 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:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid "private key file \"%s\" cannot be reloaded because it requires a passphrase"
 msgstr "el archivo de clave privada \"%s\" no se puede volver a cargar porque requiere una contraseña"
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, 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:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "falló la revisión de la llave privada: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "el valor «%2$s» para la opción «%1$s» no está soportado en este servidor"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "no se pudo definir la versión mínima de protocolo SSL"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "no se pudo definir la versión máxima de protocolo SSL"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "no se pudo definir el rango de versión de protocolo SSL"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "«%s» no puede ser más alto que «%s»"
 
-#: libpq/be-secure-openssl.c:307
+#: libpq/be-secure-openssl.c:295
+#, c-format
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr "no se pudo establecer la lista de cifrado TLSv1.2 (no hay cifradores disponibles)"
+
+#: libpq/be-secure-openssl.c:310
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "no se pudo establecer la lista de cifrado (no hay cifradores disponibles)"
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr "no se pudo establecer los suites de cifrado TLSv1.3 (no hay cifradores disponibles)"
 
-#: libpq/be-secure-openssl.c:327
+#: libpq/be-secure-openssl.c:331
 #, 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:376
+#: libpq/be-secure-openssl.c:380
 #, 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:384
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr "no se pudo cargar el directorio de lista de revocación de certificados SSL «%s»: %s"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\" or directory \"%s\": %s"
 msgstr "no se pudo cargar el archivo de lista de revocación de certificados SSL «%s» o directorio «%s»: %s"
 
-#: libpq/be-secure-openssl.c:450
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr "no se pudo inicializar la conexión SSL: el contexto SSL no está instalado"
 
-#: libpq/be-secure-openssl.c:464
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "no se pudo inicializar la conexión SSL: %s"
 
-#: libpq/be-secure-openssl.c:472
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "no se definir un socket SSL: %s"
 
-#: libpq/be-secure-openssl.c:528
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "no se pudo aceptar una conexión SSL: %m"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, 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:573
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "no se pudo aceptar una conexión SSL: %s"
 
-#: libpq/be-secure-openssl.c:577
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid "This may indicate that the client does not support any SSL protocol version between %s and %s."
 msgstr "Esto puede indicar que el cliente no soporta ninguna versión del protocolo SSL entre %s y %s."
 
-#: libpq/be-secure-openssl.c:594 libpq/be-secure-openssl.c:809
-#: libpq/be-secure-openssl.c:879
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "código de error SSL no reconocido: %d"
 
-#: libpq/be-secure-openssl.c:622
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
 msgstr "recibido una solicitud de conexión SSL con protocolo ALPN inesperado"
 
-#: libpq/be-secure-openssl.c:666
+#: libpq/be-secure-openssl.c:670
 #, 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:712
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "el elemento de nombre distinguido en el certificado SSL contiene un carácter null"
 
-#: libpq/be-secure-openssl.c:798 libpq/be-secure-openssl.c:863
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "error de SSL: %s"
 
-#: libpq/be-secure-openssl.c:1038
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de parámetros DH «%s»: %m"
 
-#: libpq/be-secure-openssl.c:1050
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "no se pudo cargar el archivo de parámetros DH: %s"
 
-#: libpq/be-secure-openssl.c:1060
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "parámetros DH no válidos: %s"
 
-#: libpq/be-secure-openssl.c:1069
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "parámetros DH no válidos: p no es primo"
 
-#: libpq/be-secure-openssl.c:1078
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr "parámetros DH no válidos: no hay generador apropiado o primo seguro"
 
-#: libpq/be-secure-openssl.c:1214
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "La autentificación por certificado de cliente falló en la profundidad %d: %s."
 
-#: libpq/be-secure-openssl.c:1251
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid "Failed certificate data (unverified): subject \"%s\", serial number %s, issuer \"%s\"."
 msgstr "Datos del certificado fallido (sin verificar): sujeto «%s», número de serie %s, emisor «%s»."
 
-#: libpq/be-secure-openssl.c:1252
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "desconocido"
 
-#: libpq/be-secure-openssl.c:1389
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: no se pudo cargar los parámetros DH"
 
-#: libpq/be-secure-openssl.c:1397
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: no se pudo definir los parámetros DH: %s"
 
-#: libpq/be-secure-openssl.c:1424
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: nombre de curva no reconocida: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "no se pudo definir los nombres de grupo especificados en ssl_groups: %s"
+
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "No se encontraron grupos válidos"
 
-#: libpq/be-secure-openssl.c:1433
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: no se pudo crear la llave"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "Asegúrese que cada nombre de grupo esté escrito correctamente y sea soportado por la versión instalada de OpenSSL."
 
-#: libpq/be-secure-openssl.c:1461
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "código de error SSL no reportado"
 
-#: libpq/be-secure-openssl.c:1479
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
 
-#: libpq/be-secure-openssl.c:1636
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "no se pudo crear BIO"
 
-#: libpq/be-secure-openssl.c:1646
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "no se pudo obtener NID para objeto ASN1_OBJECT"
 
-#: libpq/be-secure-openssl.c:1654
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "no se pudo convertir NID %d en una estructura ASN1_OBJECT"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "No existe el rol «%s»."
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "El usuario «%s» no tiene una contraseña asignada."
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "El usuario «%s» tiene contraseña expirada."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, fuzzy, c-format
+#| msgid "directory path for new cluster is too long"
+msgid "encrypted password is too long"
+msgstr "la contraseña cifrada es demasiado larga"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "Las contraseñas cifradas no deben ser mayores a %d bytes."
+
+#: libpq/crypt.c:183
+#, fuzzy, c-format
+#| msgid "could not encrypt password: %s"
+msgid "setting an MD5-encrypted password"
+msgstr "definiendo una contraseña cifrada con MD5"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid "MD5 password support is deprecated and will be removed in a future release of PostgreSQL."
+msgstr "El soporte para contraseñas MD5 está depreciado y se eliminará en una versión futura de PostgreSQL."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid "Refer to the PostgreSQL documentation for details about migrating to another password type."
+msgstr "Refiérase a la documentación de PostgreSQL para mayor información acerca de migrar a otro tipo de contraseña."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr "El usuario \"%s\" tiene una contraseña que no se puede usar con la autentificación MD5."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "La contraseña no coincide para el usuario «%s»."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "La contraseña del usuario \"%s\" está en un formato no reconocido."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "la expresión regular «%s» no es válida: %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "línea %d del archivo de configuración «%s»"
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "omitiendo el archivo de autentificación faltante «%s»"
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "no se pudo abrir el archivo «%s»: nivel de anidamiento máximo excedido"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "error al enumerar interfaces de red: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "la opción de autentificación «%s» sólo es válida para los métodos de autentificación %s"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "el método de autentificación «%s» requiere que el argumento «%s» esté definido"
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "falta una entrada al final de la línea"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "múltiples valores en campo «ident»"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "múltiples valores especificados para tipo de conexión"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "Especifique exactamente un tipo de conexión por línea."
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "el registro hostssl no puede coincidir porque SSL está deshabilitado"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
 msgstr "Defina «ssl = on» en postgresql.conf."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr "el registro hostssl no puede coincidir porque SSL no está soportado en esta instalación"
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid "hostgssenc record cannot match because GSSAPI is not supported by this build"
 msgstr "el registro hostgssenc no puede coincidir porque GSSAPI no está soportado en esta instalación"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "tipo de conexión «%s» no válido"
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "fin de línea antes de especificación de base de datos"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "fin de línea antes de especificación de rol"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "fin de línea antes de especificación de dirección IP"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "múltiples valores especificados para la dirección de anfitrión"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "Especifique un rango de direcciones por línea."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "dirección IP «%s» no válida: %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
 msgstr "especificar tanto el nombre de host como la máscara CIDR no es válido: «%s»"
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "máscara CIDR no válida en dirección «%s»"
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "fin de línea antes de especificación de máscara de red"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr "Especifique un rango de direcciones en notación CIDR, o provea una netmask separadamente."
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "múltiples valores especificados para la máscara de red"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "máscara IP «%s» no válida: %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "La dirección y máscara IP no coinciden"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "fin de línea antes de especificación de método de autentificación"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "múltiples valores especificados para el tipo de autentificación"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "Especifique exactamente un tipo de autentificación por línea."
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "método de autentificación «%s» no válido"
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr "método de autentificación «%s» no válido: este servidor no lo soporta"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "la autentificación gssapi no está soportada en conexiones locales"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "la autentificación peer sólo está soportada en conexiones locales"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "la autentificación cert sólo está soportada en conexiones hostssl"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, 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:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"
-msgstr "no se puede usar ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter o ldapurl junto con ldapprefix"
+msgid "cannot mix options for simple bind and search+bind modes"
+msgstr "no se pueden mezclar opciones para los modos de “bind simple” y “search+bind”"
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, 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"
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "no se puede usar ldapsearchattribute junto con ldapsearchfilter"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "la lista de servidores RADIUS no puede ser vacía"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "la lista de secretos RADIUS no puede ser vacía"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid "the number of RADIUS secrets (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "el número de secretos RADIUS (%d) debe ser 1 o igual al número de servidores RADIUS (%d)"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid "the number of RADIUS ports (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "el número de puertos RADIUS (%d) debe ser 1 o igual al número de servidores RADIUS (%d)"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid "the number of RADIUS identifiers (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "el número de identificadores RADIUS (%d) debe ser 1 o igual al número de servidores RADIUS (%d)"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi y cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s no puede usarse en combinación con %s"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert y oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert sólo puede ser configurado en líneas «hostssl»"
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
 msgstr "clientcert solo acepta «verify-full» cuando se emplea autentificación «cert»"
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "valor no válido para el parámetro clientcert: «%s»"
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname solo puede ser configurado en líneas «hostssl»"
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "valor no válido para el parámetro clientname: «%s»"
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "no se pudo interpretar la URL LDAP «%s»: %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "esquema de URL LDAP no soportado: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "las URLs LDAP no está soportado en esta plataforma"
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "valor ldapscheme no válido: «%s»"
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "número de puerto LDAP no válido: «%s»"
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi y sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "no se pudo interpretar la lista de servidores RADIUS «%s»"
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "no se pudo interpretar la lista de port RADIUS «%s»"
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "número de puerto RADIUS no válido: «%s»"
 
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "no se pudo interpretar la lista de secretos RADIUS «%s»"
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "no se pudo interpretar la lista de identificadores RADIUS «%s»"
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "nombre de opción de autentificación desconocido: «%s»"
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "el archivo de configuración «%s» no contiene líneas"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "la coincidencia de expresión regular para «%s» falló: %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
 msgstr "la expresión regular «%s» no tiene subexpresiones según lo requiere la referencia hacia atrás en «%s»"
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "el nombre de usuario entregado (%s) y el nombre de usuario autentificado (%s) no coinciden"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr "no hay coincidencia en el mapa «%s» para el usuario «%s» autentificado como «%s»"
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "%s(%s) falló: %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "no se pudo establecer el socket en modo no bloqueante: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "la ruta al socket de dominio Unix «%s» es demasiado larga (máximo %d bytes)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "no se pudo traducir el nombre de host «%s», servicio «%s» a dirección: %s"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "no se pudo traducir el servicio «%s» a dirección: %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "no se pudo enlazar a todas las direcciones pedidas: MAXLISTEN (%d) fue excedido"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "la familia de direcciones %d no reconocida"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "no se pudo crear el socket %s de escucha para la dirección «%s»: %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "%s(%s) falló para la dirección %s «%s»: %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "no se pudo enlazar a la dirección %s «%s»: %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "¿Hay otro postmaster en ejecución en el puerto %d?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr "¿Hay otro postmaster en ejecución en el puerto %d? Si no, aguarde unos segundos y reintente."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "no se pudo escuchar en la dirección %s «%s»: %m"
 
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "escuchando en el socket Unix «%s»"
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "escuchando en la dirección %s «%s», port %d"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "no existe el grupo «%s»"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "no se pudo definir el grupo del archivo «%s»: %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "no se pudo definir los permisos del archivo «%s»: %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "no se pudo aceptar una nueva conexión: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "no hay conexión de cliente"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "no se pudo recibir datos del cliente: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4533
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "terminando la conexión por pérdida de sincronía del protocolo"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "EOF inesperado dentro de la palabra de tamaño del mensaje"
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "el largo de mensaje no es válido"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "mensaje incompleto del cliente"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "no se pudo enviar datos al cliente: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) falló: código de error %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "establecer el tiempo de inactividad para keepalive no está soportado"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) no está soportado"
@@ -15998,7 +16722,7 @@ msgid "no data left in message"
 msgstr "no hay datos restantes en el mensaje"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:873 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -16014,12 +16738,12 @@ msgstr "cadena no válida en el mensaje"
 msgid "invalid message format"
 msgstr "formato de mensaje no válido"
 
-#: main/main.c:236
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup falló: %d\n"
 
-#: main/main.c:324
+#: main/main.c:386
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -16028,7 +16752,7 @@ msgstr ""
 "%s es el servidor PostgreSQL.\n"
 "\n"
 
-#: main/main.c:325
+#: main/main.c:387
 #, c-format
 msgid ""
 "Usage:\n"
@@ -16039,109 +16763,109 @@ msgstr ""
 "  %s [OPCION]...\n"
 "\n"
 
-#: main/main.c:326
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: main/main.c:327
+#: main/main.c:389
 #, 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:328
+#: main/main.c:390
 #, 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:329
+#: main/main.c:391
 #, 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:330
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5          nivel de depuración\n"
 
-#: main/main.c:331
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR      directorio de bases de datos\n"
 
-#: main/main.c:332
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e              usar estilo europeo de fechas (DMY)\n"
 
-#: main/main.c:333
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F              desactivar fsync\n"
 
-#: main/main.c:334
+#: main/main.c:396
 #, 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:335
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr "  -i              activar conexiones TCP/IP (obsoleto)\n"
 
-#: main/main.c:336
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k DIRECTORIO   ubicación del socket Unix\n"
 
-#: main/main.c:338
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l              activar conexiones SSL\n"
 
-#: main/main.c:340
+#: main/main.c:402
 #, 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:341
+#: main/main.c:403
 #, 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:342
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s              mostrar estadísticas después de cada consulta\n"
 
-#: main/main.c:343
+#: main/main.c:405
 #, 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:344
+#: main/main.c:406
 #, 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:345
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NOMBRE=VALOR  definir parámetro de ejecución\n"
 
-#: main/main.c:346
+#: main/main.c:408
 #, 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:347
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help      muestra esta ayuda, luego sale\n"
 
-#: main/main.c:349
+#: main/main.c:411
 #, c-format
 msgid ""
 "\n"
@@ -16150,37 +16874,37 @@ msgstr ""
 "\n"
 "Opciones de desarrollador:\n"
 
-#: main/main.c:350
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h impedir el uso de algunos tipos de planes\n"
 
-#: main/main.c:351
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O              permitir cambios en estructura de tablas de sistema\n"
 
-#: main/main.c:352
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P              desactivar índices de sistema\n"
 
-#: main/main.c:353
+#: main/main.c:415
 #, 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:354
+#: main/main.c:416
 #, c-format
 msgid "  -T                 send SIGABRT to all backend processes if one dies\n"
 msgstr "  -T              enviar SIGABRT a todos los procesos backend si uno muere\n"
 
-#: main/main.c:355
+#: main/main.c:417
 #, 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:357
+#: main/main.c:419
 #, c-format
 msgid ""
 "\n"
@@ -16189,37 +16913,37 @@ msgstr ""
 "\n"
 "Opciones para modo mono-usuario:\n"
 
-#: main/main.c:358
+#: main/main.c:420
 #, 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:359
+#: main/main.c:421
 #, 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:360
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5          nivel de depuración\n"
 
-#: main/main.c:361
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E              mostrar las consultas antes de su ejecución\n"
 
-#: main/main.c:362
+#: main/main.c:424
 #, 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:363 main/main.c:369
+#: main/main.c:425 main/main.c:431
 #, 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:365
+#: main/main.c:427
 #, c-format
 msgid ""
 "\n"
@@ -16228,22 +16952,22 @@ msgstr ""
 "\n"
 "Opciones para modo de inicio (bootstrapping):\n"
 
-#: main/main.c:366
+#: main/main.c:428
 #, 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:367
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr "  --check         selecciona modo de verificación (debe ser el primer argumento)\n"
 
-#: main/main.c:368
+#: main/main.c:430
 #, 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:371
+#: main/main.c:433
 #, c-format
 msgid ""
 "\n"
@@ -16260,12 +16984,12 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: main/main.c:375
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: main/main.c:386
+#: main/main.c:448
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -16279,12 +17003,12 @@ msgstr ""
 "Vea la documentación para obtener más información acerca de cómo\n"
 "iniciar correctamente el servidor.\n"
 
-#: main/main.c:403
+#: main/main.c:465
 #, 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:410
+#: main/main.c:472
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -16309,15 +17033,15 @@ msgstr "el tipo de nodo extensible «%s» ya existe"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "ExtensibleNodeMethods «%s» no fue registrado"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "la relación «%s» no tiene un tipo compuesto"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2604
-#: parser/parse_coerce.c:2742 parser/parse_coerce.c:2789
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, 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"
@@ -16332,769 +17056,800 @@ msgstr "portal «%s» con parámetros: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "portal sin nombre con parámetros: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, 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"
 
-#: optimizer/plan/createplan.c:7175 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1680
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "no se puede ejecutar MERGE en la relación «%s»"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, 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:1380 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074
+#: parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s no está permitido con UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:2121 optimizer/plan/planner.c:4108
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "no se pudo implementar GROUP BY"
 
-#: optimizer/plan/planner.c:2122 optimizer/plan/planner.c:4109
-#: optimizer/plan/planner.c:4790 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145
+#: optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, 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:4789
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "no se pudo implementar DISTINCT"
 
-#: optimizer/plan/planner.c:6134
+#: optimizer/plan/planner.c:6322
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "No se pudo implementar PARTITION BY de ventana"
 
-#: optimizer/plan/planner.c:6135
+#: optimizer/plan/planner.c:6323
 #, 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:6139
+#: optimizer/plan/planner.c:6327
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "no se pudo implementar ORDER BY de ventana"
 
-#: optimizer/plan/planner.c:6140
+#: optimizer/plan/planner.c:6328
 #, 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."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "no se pudo implementar UNION recursivo"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "Todos los tipos de dato de las columnas deben ser tipos de los que se puedan hacer un hash."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "no se pudo implementar %s"
 
-#: optimizer/util/clauses.c:4963
+#: optimizer/util/appendinfo.c:165
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "el atributo «%s» de la relación «%s» no coincide con el tipo del padre"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr "el atributo «%s» de la relación «%s» no coincide con el ordenamiento (collation) de la relación padre"
+
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "función SQL «%s», durante expansión en línea"
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "no se puede acceder a tablas temporales o «unlogged» durante la recuperación"
 
-#: optimizer/util/plancat.c:768
+#: optimizer/util/plancat.c:776
 #, c-format
 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:785
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "la restricción en la cláusula ON CONFLICT no tiene un índice asociado"
 
-#: optimizer/util/plancat.c:835
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE no está soportado con restricciones de exclusión"
 
-#: optimizer/util/plancat.c:945
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "no hay restricción única o de exclusión que coincida con la especificación ON CONFLICT"
 
-#: parser/analyze.c:824 parser/analyze.c:1550
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "las listas VALUES deben ser todas de la misma longitud"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT tiene más expresiones que columnas de destino"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT tiene más columnas de destino que expresiones"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1093
 #, c-format
 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:1357 parser/analyze.c:1744
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO no está permitido aquí"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s no puede ser aplicado a VALUES"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY no válida"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1956
 #, 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:1913
+#: parser/analyze.c:1957
 #, 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:2019
+#: parser/analyze.c:2064
 #, 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:2091
+#: parser/analyze.c:2136
 #, 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:2178
+#: parser/analyze.c:2223
 #, 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:2535
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "Las columnas de destino SET no pueden ser calificadas con el nombre de relación."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2668 parser/analyze.c:2678
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s no se puede especificar varias veces"
+
+#: parser/analyze.c:2690 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "el nombre de tabla «%s» fue especificado más de una vez"
+
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING debe tener al menos una columna"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "fuente de asignación retornó %d columna"
 msgstr[1] "fuente de asignación retornó %d columnas"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "la variable «%s» es de tipo %s pero la expresión es de tipo %s"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "no se puede especificar %s junto con %s"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3055
 #, 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:2914
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s no está soportado"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3066
 #, 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:2925
+#: parser/analyze.c:3074
 #, 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:2936
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s no es válido"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Los cursores insensitivos deben ser READ ONLY."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3182
 #, 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:3043
+#: parser/analyze.c:3192
 #, 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:3053
+#: parser/analyze.c:3202
 #, 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:3065
+#: parser/analyze.c:3214
 #, 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:3254
+#: parser/analyze.c:3403
 #, 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:3261
+#: parser/analyze.c:3410
 #, 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:3268
+#: parser/analyze.c:3417
 #, 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:3275
+#: parser/analyze.c:3424
 #, 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:3282
+#: parser/analyze.c:3431
 #, 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:3289
+#: parser/analyze.c:3438
 #, 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:3388
+#: parser/analyze.c:3537
 #, 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:3452
+#: parser/analyze.c:3601
 #, 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:3461
+#: parser/analyze.c:3610
 #, 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:3470
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s no puede ser aplicado a una función de tabla"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3637
 #, 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:3497
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s no puede ser aplicado a un «tuplestore» con nombre"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3666
 #, 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"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "no se pudo identificar un operador de ordenamiento para el tipo %s"
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Las funciones de agregación con DISTINCT deben ser capaces de ordenar sus valores de entrada."
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING debe tener menos de 32 argumentos"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:382
 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:375
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "no se permiten las operaciones «grouping» en condiciones JOIN"
 
-#: parser/parse_agg.c:385
+#: parser/parse_agg.c:394
 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:387
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "las operaciones «grouping» no están permitidas en la cláusula FROM de su mismo nivel de consulta"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:401
 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:394
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "no se permiten operaciones «grouping» en funciones en FROM"
 
-#: parser/parse_agg.c:402
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "no se permiten funciones de agregación en expresiones de políticas"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de políticas"
 
-#: parser/parse_agg.c:421
+#: parser/parse_agg.c:430
 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:423
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "no se permiten operaciones «grouping» en RANGE de ventana deslizante"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:437
 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:430
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "no se permiten operaciones «grouping» en ROWS de ventana deslizante"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "no se permiten funciones de agregación en GROUPS de ventana deslizante"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "no se permiten operaciones «grouping» en GROUPS de ventana deslizante"
 
-#: parser/parse_agg.c:450
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "no se permiten funciones de agregación en condiciones MERGE WHEN"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "no se permiten operaciones «grouping» en condiciones MERGE WHEN"
 
-#: parser/parse_agg.c:479
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "no se permiten funciones de agregación en restricciones «check»"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "no se permiten operaciones «grouping» en restricciones «check»"
 
-#: parser/parse_agg.c:488
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "no se permiten funciones de agregación en expresiones DEFAULT"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones DEFAULT"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:504
 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:497
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de índice"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:511
 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:504
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "no se permiten operaciones «grouping» en predicados de índice"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "no se permiten funciones de agregación en expresiones de estadísticas"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de estadísticas"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:525
 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:518
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de transformación"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:532
 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:525
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "no se permiten operaciones «grouping» en parámetros a EXECUTE"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "no se permiten funciones de agregación en condición WHEN de un “trigger”"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "no se permiten operaciones «grouping» en condiciones WHEN de un “trigger”"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "no se permiten funciones de agregación en borde de partición"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "no se permiten operaciones «grouping» en borde de partición"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "no se permiten funciones de agregación en una expresión de llave de particionamiento"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de llave de particionamiento"
 
-#: parser/parse_agg.c:552
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "no se permiten funciones de agregación en expresiones de generación de columna"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "no se permiten operaciones «grouping» en expresiones de generación de columna"
 
-#: parser/parse_agg.c:560
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "no se permiten funciones de agregación en argumentos de CALL"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "no se permiten operaciones «grouping» en argumentos de CALL"
 
-#: parser/parse_agg.c:568
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "no se permiten funciones de agregación en las condiciones WHERE de COPY FROM"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "no se permiten las operaciones «grouping» en condiciones WHERE de COPY FROM"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:597 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "no se permiten funciones de agregación en %s"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:600
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "no se permiten operaciones «grouping» en %s"
 
-#: parser/parse_agg.c:701
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "una función de agregación de nivel externo no puede usar un CTE anidado"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "El CTE «%s» está debajo del nivel semántico de la función de agregación."
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr "una función de agregación de nivel exterior no puede contener una variable de nivel inferior en sus argumentos directos"
 
-#: parser/parse_agg.c:779
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "las llamadas a funciones de agregación no pueden contener llamadas a funciones que retornan conjuntos"
 
-#: parser/parse_agg.c:780 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265
 #: parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr "Puede intentar mover la función que retorna conjuntos a un elemento LATERAL FROM."
 
-#: parser/parse_agg.c:785
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "las llamadas a funciones de agregación no pueden contener llamadas a funciones de ventana deslizante"
 
-#: parser/parse_agg.c:864
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "no se permiten funciones de ventana deslizante en condiciones JOIN"
 
-#: parser/parse_agg.c:871
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "no se permiten funciones de ventana deslizante en funciones en FROM"
 
-#: parser/parse_agg.c:877
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de políticas"
 
-#: parser/parse_agg.c:890
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "no se permiten funciones de ventana deslizante en definiciones de ventana deslizante"
 
-#: parser/parse_agg.c:901
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "no se permiten funciones de ventana deslizante en condiciones MERGE WHEN"
 
-#: parser/parse_agg.c:926
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "no se permiten funciones de ventana deslizante en restricciones «check»"
 
-#: parser/parse_agg.c:930
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones DEFAULT"
 
-#: parser/parse_agg.c:933
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de índice"
 
-#: parser/parse_agg.c:936
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de estadísticas"
 
-#: parser/parse_agg.c:939
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "no se permiten funciones de ventana deslizante en predicados de índice"
 
-#: parser/parse_agg.c:942
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de transformación"
 
-#: parser/parse_agg.c:945
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "no se permiten funciones de ventana deslizante en parámetros a EXECUTE"
 
-#: parser/parse_agg.c:948
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "no se permiten funciones de ventana deslizante en condiciones WHEN de un “trigger”"
 
-#: parser/parse_agg.c:951
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "no se permiten funciones de ventana deslizante en borde de partición"
 
-#: parser/parse_agg.c:954
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de llave de particionamiento"
 
-#: parser/parse_agg.c:957
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "no se permiten funciones de ventana deslizante en argumentos de CALL"
 
-#: parser/parse_agg.c:960
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "no se permiten funciones de ventana deslizante en las condiciones WHERE de COPY FROM"
 
-#: parser/parse_agg.c:963
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "no se permiten funciones de ventana deslizante en expresiones de generación de columna"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:986 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "no se permiten funciones de ventana deslizante en %s"
 
-#: parser/parse_agg.c:1020 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "la ventana «%s» no existe"
 
-#: parser/parse_agg.c:1108
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "demasiados conjuntos «grouping» presentes (máximo 4096)"
 
-#: parser/parse_agg.c:1248
+#: parser/parse_agg.c:1329
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "no se permiten funciones de agregación en el término recursivo de una consulta recursiva"
 
-#: parser/parse_agg.c:1441
+#: parser/parse_agg.c:1552
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr "la columna «%s.%s» debe aparecer en la cláusula GROUP BY o ser usada en una función de agregación"
 
-#: parser/parse_agg.c:1444
+#: parser/parse_agg.c:1555
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "Argumentos directos de una función de agregación de conjuntos ordenados debe usar sólo columnas agrupadas."
 
-#: parser/parse_agg.c:1449
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "la subconsulta usa la columna «%s.%s» no agrupada de una consulta exterior"
 
-#: parser/parse_agg.c:1613
+#: parser/parse_agg.c:1725
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr "los argumentos de GROUPING deben ser expresiones agrupantes del nivel de consulta asociado"
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "relación «%s» no puede ser destino de una sentencia modificadora"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr "las funciones que retornan conjuntos deben aparecer en el nivel más externo del FROM"
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr "no se permiten múltiples definiciones de columnas para la misma función"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid "ROWS FROM() with multiple functions cannot have a column definition list"
 msgstr "ROWS FROM() con varias funciones no puede tener una lista de definición de columnas"
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid "Put a separate column definition list for each function inside ROWS FROM()."
 msgstr "Ponga una lista de columnas separada para cada función dentro de ROWS FROM()."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr "UNNEST() con varios argumentos no puede tener una lista de definición de columnas"
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid "Use separate UNNEST() calls inside ROWS FROM(), and attach a column definition list to each one."
 msgstr "Use llamadas a UNNEST() separadas dentro de ROWS FROM() y adjunte una lista de columnas a cada una."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr "WITH ORDINALITY no puede usarse con una lista de definición de columnas"
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "Ponga una lista de columnas dentro de ROWS FROM()."
 
-#: parser/parse_clause.c:762 parser/parse_jsontable.c:295
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "sólo se permite una columna FOR ORDINALITY"
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "el nombre de columna «%s» no es único"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "el espacio de nombres «%s» no es único"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "sólo se permite un espacio de nombres predeterminado"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "no existe el método de tablesample «%s»"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, 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 tablesample «%s» requiere %d argumento, no %d"
 msgstr[1] "el método de tablesample «%s» requiere %d argumentos, no %d"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "el método de tablesample «%s» no soporta la opción REPEATABLE"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr "la cláusula TABLESAMPLE sólo puede aplicarse a tablas y vistas materializadas"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "la columna «%s» aparece más de una vez en la cláusula USING"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "la columna común «%s» aparece más de una vez en la tabla izquierda"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr "la columna «%s» especificada en la cláusula USING no existe en la tabla izquierda"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "la columna común «%s» aparece más de una vez en la tabla derecha"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr "la columna «%s» especificada en la cláusula USING no existe en la tabla derecha"
@@ -17233,184 +17988,184 @@ msgstr "el operador «%s» no es un operador válido de ordenamiento"
 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_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
 msgstr "RANGE con desplazamiento PRECEDING/FOLLOWING no está soportado para la columna de tipo %s"
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s and offset type %s"
 msgstr "RANGE con desplazamiento PRECEDING/FOLLOWING no está soportado para la columna de tipo %s y tipo de desplazamiento %s"
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "Convierta el valor de desplazamiento a un tipo apropiado."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for column type %s and offset type %s"
 msgstr "RANGE con desplazamiento PRECEDING/FOLLOWING tiene múltiples interpretaciones para la columna de tipo %s y tipo de desplazamiento %s"
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "Convierta el valor de desplazamiento al tipo deseado exacto."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3405
-#: parser/parse_expr.c:3634 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435
+#: parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "no se puede convertir el tipo %s a %s"
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "La entrada tiene muy pocas columnas."
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, 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:1124
+#: parser/parse_coerce.c:1122
 #, 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
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, 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: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, 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 CASE
-#: parser/parse_coerce.c:1420
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "los tipos %2$s y %3$s no son coincidentes en %1$s"
 
-#: parser/parse_coerce.c:1536
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "los tipos de argumento %s y %s no pueden hacerse coincidir"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1588
+#: parser/parse_coerce.c:1586
 #, 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:2191 parser/parse_coerce.c:2211
-#: parser/parse_coerce.c:2231 parser/parse_coerce.c:2252
-#: parser/parse_coerce.c:2307 parser/parse_coerce.c:2341
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "los argumentos declarados «%s» no son de tipos compatibles"
 
-#: parser/parse_coerce.c:2286 parser/parse_coerce.c:2399
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "el argumento declarado %s no es un array sino de tipo %s"
 
-#: parser/parse_coerce.c:2319 parser/parse_coerce.c:2469
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "el argumento declarado %s no es un tipo de rango sino tipo %s"
 
-#: parser/parse_coerce.c:2353 parser/parse_coerce.c:2433
-#: parser/parse_coerce.c:2566 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "el argumento declarado %s no es un tipo de multirango sino tipo %s"
 
-#: parser/parse_coerce.c:2390
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "no se puede determinar el tipo del argumento «anyarray»"
 
-#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
-#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2552
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr "el argumento declarado %s no es consistente con el argumento declarado %s"
 
-#: parser/parse_coerce.c:2511
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr "no se pudo determinar el tipo polimórfico porque la entrada es de tipo %s"
 
-#: parser/parse_coerce.c:2525
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "el argumento emparejado con anynonarray es un array: %s"
 
-#: parser/parse_coerce.c:2535
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "el tipo emparejado con anyenum no es un tipo enum: %s"
 
-#: parser/parse_coerce.c:2596
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr "los argumentos de la familia anycompatible no pueden ser convertidos a un tipo común"
 
-#: parser/parse_coerce.c:2614 parser/parse_coerce.c:2635
-#: parser/parse_coerce.c:2685 parser/parse_coerce.c:2690
-#: parser/parse_coerce.c:2754 parser/parse_coerce.c:2766
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr "no se pudo determinar el tipo polimórfico %s porque la entrada es de tipo %s"
 
-#: parser/parse_coerce.c:2624
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr "el tipo anycompatiblerange %s no coincide con el tipo anycompatible %s"
 
-#: parser/parse_coerce.c:2645
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr "el tipo anycompatiblemultirange %s no coincide con el tipo anycompatible %s"
 
-#: parser/parse_coerce.c:2659
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr "el argumento emparejado a anycompatiblenonarray es un array: %s"
 
-#: parser/parse_coerce.c:2894
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid "A result of type %s requires at least one input of type anyrange or anymultirange."
 msgstr "Un resultado de tipo %s requiere al menos una entrada de tipo anyrange o anymultirange."
 
-#: parser/parse_coerce.c:2911
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatiblerange or anycompatiblemultirange."
 msgstr "Un resultado de tipo %s requiere al menos una entrada de tipo anycompatiblerange o anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2923
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid "A result of type %s requires at least one input of type anyelement, anyarray, anynonarray, anyenum, anyrange, or anymultirange."
 msgstr "Un resultado de tipo %s requiere al menos una entrada de tipo anyelement, anyarray, anynonarray, anyenum, anyrange o anymultirange."
 
-#: parser/parse_coerce.c:2935
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange, or anycompatiblemultirange."
 msgstr "Un resultado de tipo %s requiere al menos una entrada de tipo anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange o anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2965
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr "Un resultado de tipo internal requiere al menos una entrada de tipo internal."
 
@@ -17456,481 +18211,479 @@ msgstr "la referencia recursiva a la consulta «%s» no debe aparecer dentro de
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "la referencia recursiva a la consulta «%s» no debe aparecer dentro de EXCEPT"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "el nombre de consulta WITH «%s» fue especificado más de una vez"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "no se pudo identificar un operador de desigualdad para el tipo %s"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid "WITH clause containing a data-modifying statement must be at the top level"
 msgstr "la cláusula WITH que contiene las sentencias que modifican datos debe estar en el nivel más externo"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, c-format
 msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
 msgstr "la columna %2$d en la consulta recursiva «%1$s» tiene tipo %3$s en el término no recursivo, pero %4$s en general"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Aplique una conversión de tipo a la salida del término no recursivo al tipo correcto."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, c-format
 msgid "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term but collation \"%s\" overall"
 msgstr "la columna %2$d en la consulta recursiva «%1$s» tiene ordenamiento (collation) %3$s en el término no recursivo, pero %4$s en general"
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr "Use la clásula COLLATE para definir el ordenamiento del término no-recursivo."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "la consulta WITH no es recursiva"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr "con una cláusula SEARCH o CYCLE, el lado izquierdo de UNION debe ser un SELECT"
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr "con una cláusula SEARCH o CYCLE, el lado derecho de UNION debe ser un SELECT"
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "columna de búsqueda «%s» no se encuentra en la lista de columnas de la consulta WITH"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "columna de búsqueda «%s» fue especificada más de una vez"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid "search sequence column name \"%s\" already used in WITH query column list"
 msgstr "el nombre para la columna de secuencia de búsqueda «%s» ya ha sido utilizado en la lista de columnas de la consulta WITH"
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "la columna de ciclo «%s» no se encuentra en la lista de columnas de la consulta WITH"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "columna de ciclo «%s» fue especificada más de una vez"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr "el nombre para la columna de marca de ciclo «%s» ya ha sido utilizada en la lista de columnas de la consulta WITH"
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr "el nombre para la columna de ruta de ciclo «%s» ya ha sido utilizada en la lista de columnas de la consulta WITH"
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "el nombre para la columna de marca de ciclo es igual que el nombre para la columna de ruta de ciclo"
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr "el nombre para la columna de secuencia de búsqueda es igual que el nombre para la columna de marca de ciclo"
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr "el nombre para la columna de secuencia de búsqueda es igual que el nombre para la columna de ruta de ciclo"
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr "la consulta WITH «%s» tiene %d columnas disponibles pero se especificaron %d"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "la recursión mutua entre elementos de WITH no está implementada"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr "la consulta recursiva «%s» no debe contener sentencias que modifiquen datos"
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, c-format
 msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
 msgstr "la consulta recursiva «%s» no tiene la forma término-no-recursivo UNION [ALL] término-recursivo"
 
-#: parser/parse_cte.c:911
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY no está implementado en una consulta recursiva"
 
-#: parser/parse_cte.c:917
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET no está implementado en una consulta recursiva"
 
-#: parser/parse_cte.c:923
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT no está implementado en una consulta recursiva"
 
-#: parser/parse_cte.c:929
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE no está implementado en una consulta recursiva"
 
-#: parser/parse_cte.c:1008
+#: parser/parse_cte.c:1074
 #, c-format
 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:313
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "DEFAULT no está permitido en este contexto"
 
-#: parser/parse_expr.c:406 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "no existe la columna %s.%s"
 
-#: parser/parse_expr.c:418
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "la columna «%s» no fue encontrado en el tipo %s"
 
-#: parser/parse_expr.c:424
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "no se pudo identificar la columna «%s» en el tipo de dato record"
 
-#: parser/parse_expr.c:430
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "la notación de columna .%s fue aplicada al tipo %s, que no es un tipo compuesto"
 
-#: parser/parse_expr.c:461 parser/parse_target.c:732
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, 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:584
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "no se pueden usar referencias a columnas en una cláusula DEFAULT"
 
-#: parser/parse_expr.c:587
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "no se pueden usar referencias a columnas en expresión de borde de partición"
 
-#: parser/parse_expr.c:846 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:845 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la referencia a la columna «%s» es ambigua"
 
-#: parser/parse_expr.c:902 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "no hay parámetro $%d"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1103 parser/parse_expr.c:3065
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "%s requiere que el operador = retorne boolean"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3072
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s no debe retornar un conjunto"
 
-#: parser/parse_expr.c:1395
+#: parser/parse_expr.c:1405
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
 msgstr "MERGE_ACTION() sólo puede usarse en la lista RETURNING de una orden MERGE"
 
-#: parser/parse_expr.c:1519 parser/parse_expr.c:1551
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, 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:1565
+#: parser/parse_expr.c:1575
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr "el origen para un UPDATE de varias columnas debe ser una expresión sub-SELECT o ROW ()"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "no se permiten funciones que retornan conjuntos en %s"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "no se pueden usar subconsultas en una restricción «check»"
 
-#: parser/parse_expr.c:1828
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "no se puede usar una subconsulta en una expresión DEFAULT"
 
-#: parser/parse_expr.c:1831
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "no se puede usar una subconsulta en una expresión de índice"
 
-#: parser/parse_expr.c:1834
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "no se puede usar una subconsulta en un predicado de índice"
 
-#: parser/parse_expr.c:1837
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "no se puede usar una subconsulta en una expresión de estadísticas"
 
-#: parser/parse_expr.c:1840
+#: parser/parse_expr.c:1850
 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:1843
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "no se puede usar una subconsulta en un parámetro a EXECUTE"
 
-#: parser/parse_expr.c:1846
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "no se puede usar una subconsulta en la condición WHEN de un “trigger”"
 
-#: parser/parse_expr.c:1849
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "no se puede usar una subconsulta en un borde de partición"
 
-#: parser/parse_expr.c:1852
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "no se puede usar una subconsulta en una expresión de llave de partición"
 
-#: parser/parse_expr.c:1855
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "no se puede usar una subconsulta en un argumento a CALL"
 
-#: parser/parse_expr.c:1858
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "no se puede usar una subconsulta en la condición WHERE de COPY FROM"
 
-#: parser/parse_expr.c:1861
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "no se puede usar una subconsulta en una expresión de generación de columna"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3764
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "la subconsulta debe retornar sólo una columna"
 
-#: parser/parse_expr.c:1985
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "la subconsulta tiene demasiadas columnas"
 
-#: parser/parse_expr.c:1990
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "la subconsulta tiene muy pocas columnas"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2104
 #, 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:2087
+#: parser/parse_expr.c:2105
 #, 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:2101
+#: parser/parse_expr.c:2119
 #, 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:2184
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "las expresiones ROW pueden tener a lo más %d entradas"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2409
 #, 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:2390
+#: parser/parse_expr.c:2410
 #, 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:2405
+#: parser/parse_expr.c:2425
 #, 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:2513
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "no se puede convertir el resultado de XMLSERIALIZE a %s"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "número desigual de entradas en expresiones de registro"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "no se pueden comparar registros de largo cero"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2892
 #, 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:2869
+#: parser/parse_expr.c:2899
 #, 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:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, 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:2930
+#: parser/parse_expr.c:2960
 #, 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:2971
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Hay múltiples candidatos igualmente plausibles."
 
-#: parser/parse_expr.c:3306
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "la cláusula ENCODING de JSON sólo está permitida para el tipo de entrada bytea"
 
-#: parser/parse_expr.c:3370
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr "no se puede usar tipos que no son string con la cláusula implícita FORMAT JSON"
 
-#: parser/parse_expr.c:3371
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr "no se puede usar tipos que no son string con la cláusula explítica FORMAT JSON"
 
-#: parser/parse_expr.c:3460
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "no se puede usar formato JSON con tipos de salida que no son string"
 
-#: parser/parse_expr.c:3473
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "no se puede definir codificación JSON para tipos de salida que no sea bytea"
 
-#: parser/parse_expr.c:3478
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "codificación JSON no soportada"
 
-#: parser/parse_expr.c:3479
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "Sólo la codificación JSON UTF8 está soportada."
 
-#: parser/parse_expr.c:3516
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "retornar tipos SETOF no está soportado en funciones SQL/JSON"
 
-#: parser/parse_expr.c:3521
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "retornar pseudo-tipos no está soportado en funciones SQL/JSON"
 
-#: parser/parse_expr.c:3849 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "el ORDER BY de funciones de agregación no está implementado para funciones de ventana deslizante"
 
-#: parser/parse_expr.c:4072
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr "no se puede usar la cláusula FORMAT ENCODING de JSON para tipos de entrada que no son bytea"
 
-#: parser/parse_expr.c:4092
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "no se puede tipo %s en predicado IS JSON"
 
-#: parser/parse_expr.c:4118 parser/parse_expr.c:4239
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
 #, c-format
-#| msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "no se puede usar el tipo %s en la cláusula RETURNING de %s"
 
-#: parser/parse_expr.c:4120
+#: parser/parse_expr.c:4150
 #, c-format
-#| msgid "Try returning a string type or bytea."
 msgid "Try returning json or jsonb."
 msgstr "Intente retornando tipo json o jsonb."
 
-#: parser/parse_expr.c:4168
+#: parser/parse_expr.c:4198
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr "no se puede usar tipos que no sean strings con cláusula WITH UNIQUE KEYS"
 
-#: parser/parse_expr.c:4242
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "Intente retornando un tipo de string o bytea."
 
-#: parser/parse_expr.c:4307
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr "no se puede especificar FORMAT JSON en la cláusula RETURNING de %s()"
 
-#: parser/parse_expr.c:4320
+#: parser/parse_expr.c:4353
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
 msgstr "el comportamiento QUOTES de SQL/JSON no debe ser especificado cuando se usa WITH WRAPPER"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4334 parser/parse_expr.c:4363 parser/parse_expr.c:4394
-#: parser/parse_expr.c:4420 parser/parse_expr.c:4446
-#: parser/parse_jsontable.c:94
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427
+#: parser/parse_expr.c:4453 parser/parse_expr.c:4479
+#: parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "especificación %s no válida"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4337 parser/parse_expr.c:4366
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
 msgstr "Sólo ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT o expresión DEFAULT se permite en %s para %s."
@@ -17938,68 +18691,73 @@ msgstr "Sólo ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT o expresión DEFAULT se per
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4344 parser/parse_expr.c:4373 parser/parse_expr.c:4402
-#: parser/parse_expr.c:4430 parser/parse_expr.c:4456
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435
+#: parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "comportamiento %s no válido para la columna «%s»"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4347 parser/parse_expr.c:4376
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
 msgstr "Sólo ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT o expresión DEFAULT se permite en %s para columnas con formato."
 
-#: parser/parse_expr.c:4395
+#: parser/parse_expr.c:4428
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
 msgstr "Sólo ERROR, TRUE, FALSE o UNKNOWN están permitidos en %s para %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4405
+#: parser/parse_expr.c:4438
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
 msgstr "Sólo ERROR, TRUE, FALSE o UNKNOWN están permitidos en %s para columnas EXISTS."
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4423 parser/parse_expr.c:4449
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr "Sólo ERROR, NULL o expresión DEFAULT se permite en %s para %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4433 parser/parse_expr.c:4459
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
 msgstr "Sólo ERROR, NULL o expresión DEFAULT se permite en %s para columnas escalares."
 
-#: parser/parse_expr.c:4489
+#: parser/parse_expr.c:4526
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "la expresión de ruta JSON debe ser de tipo %s, no tipo %s"
 
-#: parser/parse_expr.c:4707
+#: parser/parse_expr.c:4766
 #, c-format
 msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
 msgstr "sólo se puede especificar constantes, funciones no de agregación, o expresión de operador para DEFAULT"
 
-#: parser/parse_expr.c:4712
+#: parser/parse_expr.c:4771
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "las expresiones DEFAULT no pueden contener referencias a columnas"
 
-#: parser/parse_expr.c:4717
+#: parser/parse_expr.c:4776
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "las expresiones DEFAULT no deben retornar un conjunto"
 
-#: parser/parse_expr.c:4793 parser/parse_expr.c:4802
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr "el ordenamiento (collation) de la expresión DEFAULT está en conflicto con la cláusula RETURNING"
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "no se puede convertir la expresión de tipo %s a %s"
 
-#: parser/parse_expr.c:4796
+#: parser/parse_expr.c:4873
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "Necesitará aplicar una conversión de la expresión a tipo %s."
@@ -18338,12 +19096,12 @@ msgstr "no se permiten funciones que retornan conjuntos en las condiciones WHERE
 msgid "set-returning functions are not allowed in column generation expressions"
 msgstr "no se permiten funciones que retornan conjuntos en expresiones de generación de columna"
 
-#: parser/parse_jsontable.c:95
+#: parser/parse_jsontable.c:93
 #, c-format
 msgid "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
 msgstr "Sólo EMPTY [ ARRAY ] o ERROR son permitidos en la cláusula ON ERROR de nivel superior."
 
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
 msgstr "nombre de columna o de “path” duplicada en JSON_TABLE: %s"
@@ -18423,229 +19181,224 @@ msgstr "op ANY/ALL (array) requiere un operador que entregue boolean"
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (array) requiere un operador que no retorne un conjunto"
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "para el parámetro $%d se dedujeron tipos de dato inconsistentes"
 
-#: parser/parse_param.c:309 tcop/postgres.c:744
+#: parser/parse_param.c:310 tcop/postgres.c:734
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "no se pudo determinar el tipo del parámetro $%d"
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "la referencia a la tabla «%s» es ambigua"
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "la referencia a la tabla %u es ambigua"
 
-#: parser/parse_relation.c:465
-#, 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:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, 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:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, 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:500
+#: parser/parse_relation.c:508
 #, 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:703
+#: parser/parse_relation.c:711
 #, 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:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr "no se puede usar la columna de sistema «%s» en una expresión de generación de columna"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "no se puede usar la columna de sistema «%s» en condición MERGE WHEN"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, 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:1445
+#: parser/parse_relation.c:1462
 #, 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:1447
+#: parser/parse_relation.c:1464
 #, 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:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid "a column definition list is redundant for a function with OUT parameters"
 msgstr "una lista de definición de columnas es redundante para una función con parámetros OUT"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid "a column definition list is redundant for a function returning a named composite type"
 msgstr "una lista de definición de columnas es redundante para una función que retorna un tipo compuesto especificado"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, 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:1857
+#: parser/parse_relation.c:1874
 #, 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:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "las listas de definición de columnas pueden tener a lo más %d entradas"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, 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:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "las funciones en FROM pueden tener a lo más %d columnas"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "la función %s tiene %d columnas disponibles pero se especificaron %d"
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, 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:2242
+#: parser/parse_relation.c:2259
 #, 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:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr "la expresión de join «%s» tiene %d columnas disponibles pero se especificaron %d"
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, 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:3635
+#: parser/parse_relation.c:3741
 #, 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:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr "Para hacer referencia a esa tabla, debe marcar esta subconsulta con LATERAL."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, 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:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid "There are columns named \"%s\", but they are in tables that cannot be referenced from this part of the query."
 msgstr "Hay columnas llamadas «%s», pero están en tablas que no pueden ser referenciadas desde esta parte de la consulta."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "Intente usar un nombre calificado con nombre de tabla."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, 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:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr "Para hacer referencia a esa columna, debe marcar esta subconsulta con LATERAL."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr "Para hacer referencia a esa columna, debe usar un nombre calificado con nombre de tabla."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, 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:3742
+#: parser/parse_relation.c:3848
 #, 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:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "no se puede asignar a la columna de sistema «%s»"
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, 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:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "no se puede definir un subcampo a DEFAULT"
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, 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:779
+#: parser/parse_target.c:782
 #, 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:788
+#: parser/parse_target.c:791
 #, 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:877
+#: parser/parse_target.c:880
 #, c-format
 msgid "subscripted assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "la asignación subindexada a «%s» requiere tipo %s pero la expresión es de tipo %s"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, 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:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * sin especificar tablas no es válido"
@@ -18665,8 +19418,8 @@ msgstr "la referencia a %%TYPE es inapropiada (demasiados nombres con punto): %s
 msgid "type reference %s converted to %s"
 msgstr "la referencia al tipo %s convertida a %s"
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
@@ -18686,330 +19439,360 @@ msgstr "los modificadores de tipo deben ser constantes simples o identificadores
 msgid "invalid type name \"%s\""
 msgstr "el nombre de tipo «%s» no es válido"
 
-#: parser/parse_utilcmd.c:263
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "no se puede crear una tabla particionada como hija de herencia"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:504
 #, c-format
 msgid "cannot set logged status of a temporary sequence"
 msgstr "no se puede cambiar el estado «logged» de una secuencia temporal"
 
-#: parser/parse_utilcmd.c:611
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "array de serial no está implementado"
 
-#: parser/parse_utilcmd.c:690 parser/parse_utilcmd.c:702
-#: parser/parse_utilcmd.c:761
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "las declaraciones NULL/NOT NULL no son coincidentes para la columna «%s» de la tabla «%s»"
 
-#: parser/parse_utilcmd.c:714
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr "las restricciones “not-null” en tablas particionadas no pueden ser marcadas NO INHERIT"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid "conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr "declaraciones NO INHERIT no coincidentes para las restricciones “not-null” en la columna «%s»"
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "múltiples valores default especificados para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:731
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr "las columnas identidad no está soportadas en tablas tipadas"
 
-#: parser/parse_utilcmd.c:735
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "las columnas identidad no están soportadas en particiones"
 
-#: parser/parse_utilcmd.c:744
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr "múltiples especificaciones de identidad para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:774
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr "las columnas generadas no están soportadas en tablas tipadas"
 
-#: parser/parse_utilcmd.c:778
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr "múltiples cláusulas de generación especificadas para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:796 parser/parse_utilcmd.c:911
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "las restricciones de llave primaria no están soportadas en tablas foráneas"
 
-#: parser/parse_utilcmd.c:805 parser/parse_utilcmd.c:921
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "las restricciones unique no están soportadas en tablas foráneas"
 
-#: parser/parse_utilcmd.c:850
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr "tanto el valor por omisión como identidad especificados para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:858
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid "both default and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "tanto el valor por omisión como expresión de generación especificados para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:866
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid "both identity and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "tanto identidad como expresión de generación especificados para columna «%s» de tabla «%s»"
 
-#: parser/parse_utilcmd.c:931
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "las restricciones de exclusión no están soportadas en tablas foráneas"
 
-#: parser/parse_utilcmd.c:996
-#, 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:1009
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "la relación «%s» no es válida en cláusula LIKE"
 
-#: parser/parse_utilcmd.c:1736 parser/parse_utilcmd.c:1844
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, 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:2242
+#: parser/parse_utilcmd.c:2419
 #, 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:2262
+#: parser/parse_utilcmd.c:2439
 #, 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:2283
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "«%s» no es un índice único"
 
-#: parser/parse_utilcmd.c:2284 parser/parse_utilcmd.c:2291
-#: parser/parse_utilcmd.c:2298 parser/parse_utilcmd.c:2375
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473
+#: parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, 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:2290
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "el índice «%s» contiene expresiones"
 
-#: parser/parse_utilcmd.c:2297
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "«%s» es un índice parcial"
 
-#: parser/parse_utilcmd.c:2309
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "«%s» no es un índice postergable (deferrable)"
 
-#: parser/parse_utilcmd.c:2310
+#: parser/parse_utilcmd.c:2492
 #, 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:2374
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "el índice «%s» columna número %d no tiene comportamiento de ordenamiento por omisión"
 
-#: parser/parse_utilcmd.c:2531
+#: parser/parse_utilcmd.c:2747
 #, 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:2537
+#: parser/parse_utilcmd.c:2753
 #, 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:2871
+#: parser/parse_utilcmd.c:2798
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr "la columna «%s» en WITHOUT OVERLAPS no es de un tipo rango o multirango"
+
+#: parser/parse_utilcmd.c:2826
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr "la restricción WITHOUT OVERLAPS necesita al menos dos columnas"
+
+#: parser/parse_utilcmd.c:3123
 #, 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:2943
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "las expresiones estadísticas sólo pueden referirse a la tabla que está siendo referida"
 
-#: parser/parse_utilcmd.c:2986
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "las reglas en vistas materializadas no están soportadas"
 
-#: parser/parse_utilcmd.c:3046
+#: parser/parse_utilcmd.c:3298
 #, 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:3118
+#: parser/parse_utilcmd.c:3370
 #, 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:3136 parser/parse_utilcmd.c:3237
-#: rewrite/rewriteHandler.c:544 rewrite/rewriteManip.c:1096
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489
+#: rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, 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:3154
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "una regla ON SELECT no puede usar OLD"
 
-#: parser/parse_utilcmd.c:3158
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "una regla ON SELECT no puede usar NEW"
 
-#: parser/parse_utilcmd.c:3167
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "una regla ON INSERT no puede usar OLD"
 
-#: parser/parse_utilcmd.c:3173
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "una regla ON DELETE no puede usar NEW"
 
-#: parser/parse_utilcmd.c:3201
+#: parser/parse_utilcmd.c:3453
 #, 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:3208
+#: parser/parse_utilcmd.c:3460
 #, 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:3664
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "cláusula DEFERRABLE mal puesta"
 
-#: parser/parse_utilcmd.c:3669 parser/parse_utilcmd.c:3684
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, 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:3679
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "la cláusula NOT DEFERRABLE está mal puesta"
 
-#: parser/parse_utilcmd.c:3692 parser/parse_utilcmd.c:3718 gram.y:6114
+#: parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972 gram.y:6229
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "una restricción declarada INITIALLY DEFERRED debe ser DEFERRABLE"
 
-#: parser/parse_utilcmd.c:3700
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "la cláusula INITIALLY DEFERRED está mal puesta"
 
-#: parser/parse_utilcmd.c:3705 parser/parse_utilcmd.c:3731
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, 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:3726
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "la cláusula INITIALLY IMMEDIATE está mal puesta"
 
-#: parser/parse_utilcmd.c:3919
+#: parser/parse_utilcmd.c:3997
+#, c-format
+msgid "misplaced ENFORCED clause"
+msgstr "cláusula ENFORCED mal puesta"
+
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
+#, c-format
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "no se permiten múltiples cláusulas ENFORCED/NOT ENFORCED"
+
+#: parser/parse_utilcmd.c:4014
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "la cláusula NOT ENFORCED está mal puesta"
+
+#: parser/parse_utilcmd.c:4212
 #, 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)"
 
-#: parser/parse_utilcmd.c:3954
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
 msgstr "«%s» no es una tabla particionada"
 
-#: parser/parse_utilcmd.c:3961
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "la tabla «%s» no está particionada"
 
-#: parser/parse_utilcmd.c:3968
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "el índice «%s» no está particionado"
 
-#: parser/parse_utilcmd.c:4008
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "una tabla particionada por hash no puede tener una partición default"
 
-#: parser/parse_utilcmd.c:4025
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "especificación de borde no válida para partición de hash"
 
-#: parser/parse_utilcmd.c:4031 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "el módulo para una partición hash debe ser un valor entero mayor que cero"
 
-#: parser/parse_utilcmd.c:4038 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "remanente en partición hash debe ser menor que el módulo"
 
-#: parser/parse_utilcmd.c:4051
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "especificación de borde no válida para partición de lista"
 
-#: parser/parse_utilcmd.c:4104
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "especificación de borde no válida para partición de rango"
 
-#: parser/parse_utilcmd.c:4110
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "FROM debe especificar exactamente un valor por cada columna de particionado"
 
-#: parser/parse_utilcmd.c:4114
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "TO debe especificar exactamente un valor por cada columna de particionado"
 
-#: parser/parse_utilcmd.c:4228
+#: parser/parse_utilcmd.c:4523
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "no se puede especificar NULL en borde de rango"
 
-#: parser/parse_utilcmd.c:4277
+#: parser/parse_utilcmd.c:4571
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "cada borde que sigue a un MAXVALUE debe ser también MAXVALUE"
 
-#: parser/parse_utilcmd.c:4284
+#: parser/parse_utilcmd.c:4578
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "cada borde que siga a un MINVALUE debe ser también MINVALUE"
 
-#: parser/parse_utilcmd.c:4327
+#: parser/parse_utilcmd.c:4621
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "el valor especificado no puede ser convertido al tipo %s para la columna «%s»"
@@ -19022,12 +19805,12 @@ msgstr "UESCAPE debe ser seguido por un literal de cadena simple"
 msgid "invalid Unicode escape character"
 msgstr "carácter de escape Unicode no válido"
 
-#: parser/parser.c:347 scan.l:1393
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "valor de escape Unicode no válido"
 
-#: parser/parser.c:494 utils/adt/varlena.c:6640 scan.l:716
+#: parser/parser.c:494 utils/adt/varlena.c:6853 scan.l:702
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "valor de escape Unicode no válido"
@@ -19037,8 +19820,8 @@ msgstr "valor de escape Unicode no válido"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Los escapes Unicode deben ser \\XXXX o \\+XXXXXX."
 
-#: parser/parser.c:523 utils/adt/varlena.c:6665 scan.l:677 scan.l:693
-#: scan.l:709
+#: parser/parser.c:523 utils/adt/varlena.c:6878 scan.l:663 scan.l:679
+#: scan.l:695
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "par sustituto (surrogate) Unicode no válido"
@@ -19115,7 +19898,7 @@ msgid "column %d of the partition key has type \"%s\", but supplied value is of
 msgstr "la columna %d de la llave de particionamiento tiene tipo «%s», pero el valor dado es de tipo «%s»"
 
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "no se pudo hacer stat al directorio de datos «%s»: %m"
@@ -19182,27 +19965,27 @@ msgstr "las huge pages no están soportadas en esta plataforma"
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "las huge pages no están soportadas con la configuración actual de «shared_memory_type»"
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1401
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, 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"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1403
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr "Termine cualquier proceso de servidor asociado al directorio de datos «%s»."
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "no se pudo crear semáforos: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "La llamada a sistema fallida fue semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
@@ -19212,7 +19995,7 @@ msgstr ""
 "Ocurre cuando se alcanza el límite del sistema del número de semáforos (SEMMNI), o bien cuando se excede el total de semáforos del sistema (SEMMNS).  Necesita incrementar el parámetro respectivo del kernel.  Alternativamente, reduzca el consumo de semáforos de PostgreSQL reduciendo el parámetro «max_connections».\n"
 "La documentación de PostgreSQL contiene más información acerca de cómo configurar su sistema para PostgreSQL."
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Probablemente necesita incrementar el valor SEMVMX del kernel hasta al menos %d.  Examine la documentación de PostgreSQL para obtener más detalles."
@@ -19337,382 +20120,402 @@ msgstr "La llamada a sistema fallida fue DuplicateHandle."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "La llamada a sistema fallida fue MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
-msgstr "proceso ayudante autovacuum tomó demasiado tiempo para iniciarse; cancelado"
+msgstr "«autovacuum worker» tomó demasiado tiempo para iniciarse; cancelado"
 
-#: postmaster/autovacuum.c:2203
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "autovacuum: eliminando tabla temporal huérfana «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:2439
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "vacuum automático de la tabla «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:2442
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "análisis automático de la tabla «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:2636
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "procesando elemento de tarea de la tabla «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:3254
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum no fue iniciado debido a un error de configuración"
 
-#: postmaster/autovacuum.c:3255
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Active la opción «track_counts»."
 
+#: postmaster/autovacuum.c:3471
+#, c-format
+msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
+msgstr "«autovacuum_max_workers» (%d) debería ser menor o igual a «autovacuum_worker_slots» (%d)"
+
+#: postmaster/autovacuum.c:3473
+#, c-format
+msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
+msgstr "El servidor sólo iniciará hasta «autovacuum_worker_slots» (%d) procesos de autovacuum en cualquier momento dado."
+
 #: postmaster/bgworker.c:260
 #, c-format
-msgid "inconsistent background worker state (max_worker_processes=%d, total_slots=%d)"
-msgstr "estado inconsistente de proceso ayudante (max_worker_processes=%d, total_slots=%d)"
+msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
+msgstr "estado inconsistente de proceso ayudante («max_worker_processes»=%d, total_slots=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr "proceso ayudante «%s»: los ayudantes sin acceso a memoria compartida no están soportdos"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "proceso ayudante «%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:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "proceso ayudante «%s»: intervalo de reinicio no válido"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "proceso ayudante «%s»: los ayudantes paralelos no pueden ser configurados «restart»"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3312
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "terminando el proceso ayudante «%s» debido a una orden del administrador"
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, 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/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "modo de procesamiento no válido en proceso ayudante"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr "proceso ayudante «%s»: debe ser registrado en «shared_preload_libraries»"
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "proceso ayudante «%s»: sólo los ayudantes dinámicos pueden pedir notificaciones"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "demasiados procesos ayudantes"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, 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] "Hasta %d proceso ayudante puede registrarse con la configuración actual."
 msgstr[1] "Hasta %d procesos ayudantes pueden registrarse con la configuración actual."
 
-#: postmaster/bgworker.c:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "Considere incrementar el parámetro de configuración «%s»."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "los puntos de control están ocurriendo con demasiada frecuencia (cada %d segundo)"
 msgstr[1] "los puntos de control están ocurriendo con demasiada frecuencia (cada %d segundos)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "falló la petición de checkpoint"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "Vea los mensajes recientes en el registro del servidor para obtener más detalles."
 
-#: postmaster/launch_backend.c:381
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "no se pudo lanzar el proceso servidor «%s»: %m"
 
-#: postmaster/launch_backend.c:434
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr "no se pudo crear mapeo de archivo de parámetros de servidor: código de error %lu"
 
-#: postmaster/launch_backend.c:442
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr "no se pudo mapear memoria para parámetros de servidor: código de error %lu"
 
-#: postmaster/launch_backend.c:459
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "orden de subproceso demasiado larga"
 
-#: postmaster/launch_backend.c:477
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "llamada a CreateProcess() falló: %m (código de error %lu)"
 
-#: postmaster/launch_backend.c:504
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr "no se pudo desmapear la vista del archivo de parámetros de servidor: código de error %lu"
 
-#: postmaster/launch_backend.c:508
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr "no se pudo cerrar el archivo de parámetros de servidor: código de error %lu"
 
-#: postmaster/launch_backend.c:530
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr "renunciar después de demasiados intentos de reservar memoria compartida"
 
-#: postmaster/launch_backend.c:531
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "Esto podría deberse a ASLR o un software antivirus."
 
-#: postmaster/launch_backend.c:834
+#: postmaster/launch_backend.c:854
 #, 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/launch_backend.c:866
+#: postmaster/launch_backend.c:886
 #, 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/launch_backend.c:895
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
 msgstr "no se pudo abrir el archivo de variables de servidor «%s»: %m\n"
 
-#: postmaster/launch_backend.c:901
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
 msgstr "no se pudo leer el archivo de variables de servidor «%s»: %m\n"
 
-#: postmaster/launch_backend.c:912
+#: postmaster/launch_backend.c:932
 #, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
 msgstr "no se pudo leer el archivo de variables de servidor «%s»: %m\n"
 
-#: postmaster/launch_backend.c:924
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
 msgstr "no se pudo eliminar el archivo «%s»: %m\n"
 
-#: postmaster/launch_backend.c:940
+#: postmaster/launch_backend.c:960
 #, 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/launch_backend.c:959
+#: postmaster/launch_backend.c:979
 #, 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/launch_backend.c:966
+#: postmaster/launch_backend.c:986
 #, 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/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
 msgstr "«archive_mode» está activado, pero el archivado no está configurado"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "eliminando archivo de estado huérfano «%s»"
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid "removal of orphan archive status file \"%s\" failed too many times, will try again later"
 msgstr "la eliminación del archivo de estado huérfano «%s» falló demasiadas veces, se tratará de nuevo después"
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr "el archivado del archivo de WAL «%s» falló demasiadas veces, se tratará de nuevo más tarde"
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "tanto «archive_command» como «archive_library» están definidos"
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "Sólo uno de «archive_command», «archive_library» puede ser definido."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr "reiniciando el proceso archivador porque el valor de «archive_library» cambió"
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "los módulos de archivado tienen que definir el símbolo %s"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "los módulos de archivado deben registrar un callback de archivado"
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:678
 #, 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:734
+#: postmaster/postmaster.c:751
 #, 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:757
+#: postmaster/postmaster.c:774
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: argumento no válido: «%s»\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:842
 #, c-format
 msgid "%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" (%d) must be less than \"max_connections\" (%d)\n"
 msgstr "%s: «superuser_reserved_connections» (%d) más «reserved_connections» (%d) debe ser menor que «max_connections» (%d)\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:850
 #, c-format
 msgid "WAL archival cannot be enabled when \"wal_level\" is \"minimal\""
 msgstr "el archivador de WAL no puede activarse cuando «wal_level» es «minimal»"
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:853
 #, c-format
 msgid "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be \"replica\" or \"logical\""
 msgstr "el flujo de WAL («max_wal_senders» > 0) requiere que «wal_level» sea «replica» o «logical»"
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "no se puede sumarizar WAL cuando «wal_level» es «minimal»"
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:864
 #, 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:1004
+#: postmaster/postmaster.c:1025
 #, 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:1069
+#: postmaster/postmaster.c:1091
 #, c-format
 msgid "ending log output to stderr"
 msgstr "terminando la salida de registro a stderr"
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1092
 #, 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:1081
+#: postmaster/postmaster.c:1103
 #, c-format
 msgid "starting %s"
 msgstr "iniciando %s"
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1165
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "no se pudo crear el socket de escucha para «%s»"
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1171
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "no se pudo crear ningún socket TCP/IP"
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1203
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "DNSServiceRegister() falló: código de error %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1256
 #, 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:1240
+#: postmaster/postmaster.c:1262
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "no se pudo crear ningún socket de dominio Unix"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1273
 #, c-format
 msgid "no socket created for listening"
 msgstr "no se creó el socket de atención"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1304
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: no se pudo cambiar los permisos del archivo de PID externo «%s»: %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1308
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: no pudo escribir en el archivo externo de PID «%s»: %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1336 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "no se pudo cargar %s"
 
-#: postmaster/postmaster.c:1342
+#: postmaster/postmaster.c:1364
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "postmaster se volvió multi-hilo durante la partida"
 
-#: postmaster/postmaster.c:1343 postmaster/postmaster.c:3684
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, 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:1442
+#: postmaster/postmaster.c:1468
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: no se pudo localizar la ruta de mi propio ejecutable"
 
-#: postmaster/postmaster.c:1449
+#: postmaster/postmaster.c:1475
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: no se pudo localizar el ejecutable postgres correspondiente"
 
-#: postmaster/postmaster.c:1472 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1498 utils/misc/tzparser.c:342
 #, 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:1499
+#: postmaster/postmaster.c:1525
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -19724,335 +20527,321 @@ msgstr ""
 "pero no se pudo abrir el archivo «%s»: %m\n"
 
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1789
+#: postmaster/postmaster.c:1762
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "enviando %s a hijos recalcitrantes"
 
-#: postmaster/postmaster.c:1811
+#: postmaster/postmaster.c:1784
 #, 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:1874
-#, 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:1886
-#, 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:2106
+#: postmaster/postmaster.c:2004
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "se recibió SIGHUP, volviendo a cargar archivos de configuración"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2134 postmaster/postmaster.c:2138
+#: postmaster/postmaster.c:2012 postmaster/postmaster.c:2016
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s no fue vuelto a cargar"
 
-#: postmaster/postmaster.c:2148
+#: postmaster/postmaster.c:2026
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "la configuración SSL no fue vuelta a cargar"
 
-#: postmaster/postmaster.c:2234
+#: postmaster/postmaster.c:2112
 #, c-format
 msgid "received smart shutdown request"
 msgstr "se recibió petición de apagado inteligente"
 
-#: postmaster/postmaster.c:2275
+#: postmaster/postmaster.c:2153
 #, c-format
 msgid "received fast shutdown request"
 msgstr "se recibió petición de apagado rápido"
 
-#: postmaster/postmaster.c:2293
+#: postmaster/postmaster.c:2171
 #, c-format
 msgid "aborting any active transactions"
 msgstr "abortando transacciones activas"
 
-#: postmaster/postmaster.c:2317
+#: postmaster/postmaster.c:2195
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "se recibió petición de apagado inmediato"
 
-#: postmaster/postmaster.c:2389
+#: postmaster/postmaster.c:2270
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "apagándose al alcanzar el destino de recuperación"
 
-#: postmaster/postmaster.c:2407 postmaster/postmaster.c:2443
+#: postmaster/postmaster.c:2288 postmaster/postmaster.c:2324
 msgid "startup process"
 msgstr "proceso de inicio"
 
-#: postmaster/postmaster.c:2410
+#: postmaster/postmaster.c:2291
 #, 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:2485
+#: postmaster/postmaster.c:2347
 #, 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:2506
+#: postmaster/postmaster.c:2369
 msgid "background writer process"
 msgstr "proceso background writer"
 
-#: postmaster/postmaster.c:2553
+#: postmaster/postmaster.c:2402
 msgid "checkpointer process"
 msgstr "proceso checkpointer"
 
-#: postmaster/postmaster.c:2569
+#: postmaster/postmaster.c:2419
 msgid "WAL writer process"
 msgstr "proceso escritor de WAL"
 
-#: postmaster/postmaster.c:2584
+#: postmaster/postmaster.c:2435
 msgid "WAL receiver process"
 msgstr "proceso receptor de WAL"
 
-#: postmaster/postmaster.c:2598
+#: postmaster/postmaster.c:2450
 msgid "WAL summarizer process"
 msgstr "proceso sumarizador de WAL"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2466
 msgid "autovacuum launcher process"
 msgstr "proceso lanzador de autovacuum"
 
-#: postmaster/postmaster.c:2631
+#: postmaster/postmaster.c:2482
 msgid "archiver process"
 msgstr "proceso de archivado"
 
-#: postmaster/postmaster.c:2644
+#: postmaster/postmaster.c:2497
 msgid "system logger process"
 msgstr "proceso de log"
 
-#: postmaster/postmaster.c:2661
+#: postmaster/postmaster.c:2515
 msgid "slot sync worker process"
 msgstr "proceso sincronizador de slot"
 
-#: postmaster/postmaster.c:2717
+#: postmaster/postmaster.c:2523 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "proceso de “io”"
+
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2547
+msgid "untracked child process"
+msgstr "proceso hijo sin seguimiento"
+
+#: postmaster/postmaster.c:2580
 #, c-format
 msgid "background worker \"%s\""
 msgstr "proceso ayudante «%s»"
 
-#: postmaster/postmaster.c:2796 postmaster/postmaster.c:2816
-#: postmaster/postmaster.c:2823 postmaster/postmaster.c:2841
-msgid "server process"
-msgstr "proceso de servidor"
-
-#: postmaster/postmaster.c:2895
+#: postmaster/postmaster.c:2804
 #, 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:3082
+#: postmaster/postmaster.c:2837
 #, 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:3084 postmaster/postmaster.c:3096
-#: postmaster/postmaster.c:3106 postmaster/postmaster.c:3117
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:3093
+#: postmaster/postmaster.c:2848
 #, 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:3103
+#: postmaster/postmaster.c:2858
 #, 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:3115
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) terminó con código %d no reconocido"
 
-#: postmaster/postmaster.c:3331
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "apagado anormal del sistema de bases de datos"
 
-#: postmaster/postmaster.c:3357
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "apagando debido a una falla en el procesamiento de inicio"
 
-#: postmaster/postmaster.c:3363
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "apagando debido a que «restart_after_crash» está desactivado"
 
-#: postmaster/postmaster.c:3375
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "todos los procesos fueron terminados; reinicializando"
 
-#: postmaster/postmaster.c:3574 postmaster/postmaster.c:3985
-#: postmaster/postmaster.c:4374
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "no se pudo generar una llave de cancelación aleatoria"
-
-#: postmaster/postmaster.c:3607
+#: postmaster/postmaster.c:3598
 #, 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:3649
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "no se pudo lanzar el nuevo proceso para la conexión: "
 
-#: postmaster/postmaster.c:3683
+#: postmaster/postmaster.c:3667
 #, c-format
-#| msgid "postmaster became multithreaded during startup"
 msgid "postmaster became multithreaded"
 msgstr "postmaster se volvió multi-hilo"
 
-#: postmaster/postmaster.c:3752
+#: postmaster/postmaster.c:3745
 #, 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:3935
-#, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "no se pudo lanzar el proceso «%s»: %m"
-
-#: postmaster/postmaster.c:4173 postmaster/postmaster.c:4207
+#: postmaster/postmaster.c:3846
 #, 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"
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL fue terminado inesperadamente"
 
-#: postmaster/postmaster.c:4183 postmaster/postmaster.c:4217
+#: postmaster/postmaster.c:3971
 #, c-format
-msgid "invalid processing mode in background worker"
-msgstr "modo de procesamiento no válido en proceso ayudante"
+msgid "no slot available for new autovacuum worker process"
+msgstr "no hay slot disponible para un nuevo «autovacuum worker»"
 
-#: postmaster/postmaster.c:4277
+#: postmaster/postmaster.c:3986
 #, c-format
-msgid "could not fork background worker process: %m"
-msgstr "no se pudo lanzar el background writer: %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "no se pudo lanzar el proceso «%s»: %m"
 
-#: postmaster/postmaster.c:4360
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "no hay slot disponible para un nuevo proceso ayudante"
 
-#: postmaster/postmaster.c:4623
+#: postmaster/postmaster.c:4163
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "no se pudo lanzar el background writer: %m"
+
+#: postmaster/postmaster.c:4496
 #, 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:4665
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "no se pudo publicar el estado de completitud del proceso hijo\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "no se pudo leer desde la tubería de log: %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "no se pudo crear la tubería para syslog: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "no se pudo crear el proceso de log: %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "redirigiendo la salida del registro al proceso recolector de registro"
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "La salida futura del registro aparecerá en el directorio «%s»."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "no se pudo redirigir stdout: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "no se pudo redirigir stderr: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "no se pudo escribir al archivo de log: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de registro «%s»: %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "desactivando rotación automática (use SIGHUP para reactivarla)"
 
-#: postmaster/walsummarizer.c:740
+#: postmaster/walsummarizer.c:743
 #, c-format
 msgid "WAL summarization is not progressing"
 msgstr "la sumarización de WAL no está progresando"
 
-#: postmaster/walsummarizer.c:741
+#: postmaster/walsummarizer.c:744
 #, c-format
 msgid "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/%X in memory."
 msgstr "La sumarización de WAL se necesita hasta %X/%X, pero está detenido en %X/%X en disco y %X/%X en memoria."
 
-#: postmaster/walsummarizer.c:755
+#: postmaster/walsummarizer.c:758
 #, c-format
 msgid "still waiting for WAL summarization through %X/%X after %ld second"
 msgid_plural "still waiting for WAL summarization through %X/%X after %ld seconds"
 msgstr[0] "todavía esperando al resumen de WAL hasta %X/%X después de %ld segundo"
 msgstr[1] "todavía esperando al resumen de WAL hasta %X/%X después de %ld segundos"
 
-#: postmaster/walsummarizer.c:760
+#: postmaster/walsummarizer.c:763
 #, c-format
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "El resumen ha alcanzado %X/%X en disco y %X/%X en memoria."
 
-#: postmaster/walsummarizer.c:1000
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "no se pudo encontrar un registro válido después de %X/%X"
 
-#: postmaster/walsummarizer.c:1045
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "no se pudo leer WAL del timeline %u en %X/%X: %s"
 
-#: postmaster/walsummarizer.c:1051
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "no se pudo leer WAL del timeline %u en %X/%X"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "no se pudo determinar qué ordenamiento usar para la expresión regular"
@@ -20062,144 +20851,144 @@ msgstr "no se pudo determinar qué ordenamiento usar para la expresión regular"
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "los ordenamientos no determinísticos no están soportados para expresiones regulares"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243
+#: replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "una contraseña es requerida"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "No-superusuario no se puede conectar si el servidor no pide una constraseña."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr "El método de autenticación del servidor de destino debe cambiarse, o definir password_required=false en los parámetros de suscripción."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "no se pudo limpiar la ruta de búsqueda: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308
+#: replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "sintaxis de cadena de conexión no válida: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "No-superusuario debe proveer una contraseña en la cadena de conexión."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "no se pudo interpretar la cadena de conexión: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr "no se pudo recibir el identificador de sistema y el ID de timeline del servidor primario: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455
+#: replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "respuesta no válida del servidor primario"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr "No se pudo identificar el sistema: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d o más campos."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597
+#: replication/libpqwalreceiver/libpqwalreceiver.c:604
+#: replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "no se pudo iniciar el flujo de WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "no se pudo enviar el mensaje fin-de-flujo al primario: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "conjunto de resultados inesperado después del fin-de-flujo"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "ocurrió un error mientras se apagaba el flujo COPY: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "ocurrió un error mientras se leía la orden de flujo: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721
+#: replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "resultado inesperado después de CommandComplete: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "no se pudo recibir el archivo de historia de timeline del servidor primario: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "Se esperaba 1 tupla con 2 campos, se obtuvieron %d tuplas con %d campos."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818
+#: replication/libpqwalreceiver/libpqwalreceiver.c:873
+#: replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "no se pudo recibir datos desde el flujo de WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "no se pudo enviar datos al flujo de WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "no se pudo crear el slot de replicación «%s»: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "no se pudo alterar el slot de replicación «%s»: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "respuesta no válida a consulta"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "Se esperaban %d campos, se obtuvieron %d campos."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "la interfaz de consulta requiere una conexión a base de datos"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "consulta vacía"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "modo pipeline inesperado"
 
@@ -20213,164 +21002,269 @@ msgstr "el ayudante paralelo «apply» de replicación lógica para la suscripci
 msgid "lost connection to the logical replication apply worker"
 msgstr "se ha perdido la conexión al ayudante paralelo “apply” de replicación"
 
-#: replication/logical/applyparallelworker.c:1024
-#: replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031
+#: replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "ayudante paralelo “apply” de replicación lógica"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr "el ayudante paralelo “apply” de replicación lógica terminó debido a un error"
 
-#: replication/logical/applyparallelworker.c:1127
-#: replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134
+#: replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "se perdió la conexión al ayudante paralelo “apply” de replicación lógica"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "no se pudo enviar datos a la cola en memoria compartida"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr "el ayudante paralelo «apply» de replicación lógica serializará los cambios restantes de la transacción remota %u a un archivo"
 
+#: replication/logical/conflict.c:126
+#, fuzzy, c-format
+#| msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "no se puede usar lista de columnas para la relación «%s.%s» en la publicación «%s»"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified locally in transaction %u at %s."
+msgstr "La llave ya existe en el índice único «%s», modificada localmente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by origin \"%s\" in transaction %u at %s."
+msgstr "La llave ya existe en el índice único «%s», modificada por el origen «%s» en la transacción %u en %s."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by a non-existent origin in transaction %u at %s."
+msgstr "La llave ya existe en el índice único «%s», modificada por un origen inexistente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr "La llave ya existe en el índice único «%s», modificado en la transacción %u."
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr "Actualizando la fila que fue modificada localmente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid "Updating the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Actualizando la fila que fue modificada por un origen «%s» distinto en la transacción %u en %s."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid "Updating the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Actualizando la fila que fue modificada por un origen inexistente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:265
+#, fuzzy
+#| msgid "could not find a \"%s\" to execute"
+msgid "Could not find the row to be updated."
+msgstr "no se pudo encontrar un «%s» para ejecutar"
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "Eliminando la fila que fue modificada localmente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid "Deleting the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Eliminando la fila que fue modificada por un origen «%s» diferente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid "Deleting the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Eliminando la fila que fue modificada por un origen inexistente en la transacción %u en %s."
+
+#: replication/logical/conflict.c:284
+#| msgid "could not find a \"%s\" to execute"
+msgid "Could not find the row to be deleted."
+msgstr "No se pudo encontrar la fila a ser eliminada."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "Llave %s"
+
+#: replication/logical/conflict.c:364
+#, fuzzy, c-format
+#| msgid "closing existing cursor \"%s\""
+msgid "existing local row %s"
+msgstr "cerrando el cursor «%s» preexistente"
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "Fila local existente %s"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "fila remota %s"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "Fila remota %s"
+
+#: replication/logical/conflict.c:434
+#, c-format
+#| msgid ", replica identity"
+msgid "replica identity %s"
+msgstr "identidad de replicación %s"
+
+#: replication/logical/conflict.c:435
+#, fuzzy, c-format
+#| msgid ", replica identity"
+msgid "replica identity full %s"
+msgstr ", identidad de replicación"
+
+#: replication/logical/conflict.c:440
+#, fuzzy, c-format
+#| msgid "Replica Identity"
+msgid "Replica identity %s"
+msgstr "Identidad de replicación %s"
+
+#: replication/logical/conflict.c:441
+#, fuzzy, c-format
+#| msgid "Replica Identity"
+msgid "Replica identity full %s"
+msgstr "Identidad de replicación"
+
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "la decodificación lógica en standby requiere «wal_level» >= «logical» en el primario"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
-msgstr "no se pueden iniciar procesos ayudantes de replicación lógica cuando max_replication_slots = 0"
+#| msgid "cannot start logical replication workers when max_replication_slots = 0"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "no se pueden iniciar procesos ayudantes de replicación lógica cuando «max_active_replication_origins» es 0"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "se agotaron los slots de procesos ayudantes de replicación lógica"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:985 storage/lmgr/lock.c:1023
-#: storage/lmgr/lock.c:2836 storage/lmgr/lock.c:4221 storage/lmgr/lock.c:4286
-#: storage/lmgr/lock.c:4636 storage/lmgr/predicate.c:2469
-#: storage/lmgr/predicate.c:2484 storage/lmgr/predicate.c:3881
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "Puede ser necesario incrementar «%s»."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "se acabaron los slots de procesos ayudante"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "el slot del worker de replicación lógica %d está vacío, no se puede adjuntar"
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr "el slot de replicación lógica %d ya está siendo utilizado por otro worker, no se puede adjuntar"
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "la decodificación lógica requiere «wal_level» >= «logical»"
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "decodificación lógica requiere una conexión a una base de datos"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, 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:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, 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:377
+#: replication/logical/logical.c:379
 #, 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:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "no se puede usar el slot de replicación «%s» para decodificación lógica"
 
-#: replication/logical/logical.c:542 replication/slot.c:798
-#: replication/slot.c:829
+#: replication/logical/logical.c:546 replication/slot.c:858
+#: replication/slot.c:903
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "Este slot de replicación está siendo sincronizado desde el servidor primario."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "Especifique otro slot de replicación."
 
-#: replication/logical/logical.c:554 replication/logical/logical.c:561
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "ya no se pueden recibir cambios desde el slot de replicación «%s»"
-
-#: replication/logical/logical.c:556
-#, c-format
-msgid "This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr "Este slot ha sido invalidado porque excedió el máximo del tamaño de reserva."
-
-#: replication/logical/logical.c:563
-#, c-format
-msgid "This slot has been invalidated because it was conflicting with recovery."
-msgstr "Este slot ha sido invalidado porque estaba en conflicto con la recuperación."
-
-#: replication/logical/logical.c:628
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "iniciando la decodificación lógica para el slot «%s»"
 
-#: replication/logical/logical.c:630
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr "Transacciones en flujo comprometiendo después de %X/%X, leyendo WAL desde %X/%X."
 
-#: replication/logical/logical.c:778
+#: replication/logical/logical.c:763
 #, 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:784
+#: replication/logical/logical.c:769
 #, 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/logical.c:955 replication/logical/logical.c:1000
-#: replication/logical/logical.c:1045 replication/logical/logical.c:1091
+#: replication/logical/logical.c:940 replication/logical/logical.c:985
+#: replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "durante la preparación, la replicación lógica requiere una función callback %s"
 
-#: replication/logical/logical.c:1323 replication/logical/logical.c:1372
-#: replication/logical/logical.c:1413 replication/logical/logical.c:1499
-#: replication/logical/logical.c:1548
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357
+#: replication/logical/logical.c:1398 replication/logical/logical.c:1484
+#: replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "el flujo lógico requiere una función callback %s"
 
-#: replication/logical/logical.c:1458
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "durante la preparación, el flujo lógico requiere una función callback %s"
@@ -20395,7 +21289,7 @@ msgstr "el array debe ser unidimensional"
 msgid "array must not contain nulls"
 msgstr "el array no debe contener nulls"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1420
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -20406,210 +21300,230 @@ msgstr "el array debe tener un número par de elementos"
 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:190
-#, c-format
-msgid "cannot query or manipulate replication origin when \"max_replication_slots\" is 0"
+#: replication/logical/origin.c:195
+#, fuzzy, c-format
+#| msgid "cannot query or manipulate replication origin when \"max_replication_slots\" is 0"
+msgid "cannot query or manipulate replication origin when \"max_active_replication_origins\" is 0"
 msgstr "no se puede consultar o manipular orígenes de replicación cuando «max_replication_slots» = 0"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "no se puede manipular orígenes de replicación durante la recuperación"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "no existe el origen de replicación «%s»"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, fuzzy, c-format
+#| msgid "replication slot name \"%s\" is too long"
+msgid "replication origin name is too long"
+msgstr "el nombre de slot de replicación «%s» es demasiado largo"
+
+#: replication/logical/origin.c:276
+#, fuzzy, c-format
+#| msgid "replication origin name \"%s\" is reserved"
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "el nombre de origen de replicación «%s» está reservado"
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "no se pudo encontrar un ID de origen de replicación disponible"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "no se pudo eliminar el origen de replicación con ID %d, en uso por el PID %d"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "no existe el origen de replicación con ID %d"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "el checkpoint de replicación tiene número mágico erróneo %u en lugar de %u"
 
-#: replication/logical/origin.c:798
-#, c-format
-msgid "could not find free replication state, increase \"max_replication_slots\""
+#: replication/logical/origin.c:821
+#, fuzzy, c-format
+#| msgid "could not find free replication state, increase \"max_replication_slots\""
+msgid "could not find free replication state, increase \"max_active_replication_origins\""
 msgstr "no se pudo encontrar una estructura de replicación libre, incremente «max_replication_slots»"
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "recuperado el estado de replicación del nodo %d a %X/%X"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, 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:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "el origen de replicación con ID %d está activo para el PID %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr "no se pudo encontrar una estructura de replicación libre para el origen de replicación con el ID %d"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
-#, c-format
-msgid "Increase \"max_replication_slots\" and try again."
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
+#, fuzzy, c-format
+#| msgid "Increase \"max_replication_slots\" and try again."
+msgid "Increase \"max_active_replication_origins\" and try again."
 msgstr "Aumente «max_replication_slots» y reintente."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "no se puede establecer un destino de replicación cuando ya hay uno definido"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "no hay un destino de replicación configurado"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "el nombre de origen de replicación «%s» está reservado"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "Los nombres de origen «%s», «%s» y los que empiezan con «pg_» están reservados."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", «%s»"
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid "logical replication target relation \"%s.%s\" is missing replicated column: %s"
 msgid_plural "logical replication target relation \"%s.%s\" is missing replicated columns: %s"
 msgstr[0] "a la relación destino de replicación lógica «%s.%s» le falta la columna replicada: %s"
 msgstr[1] "a la relación destino de replicación lógica «%s.%s» le faltan las columnas replicadas: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, fuzzy, c-format
+#| msgid "logical replication target relation \"%s.%s\" is missing replicated column: %s"
+#| msgid_plural "logical replication target relation \"%s.%s\" is missing replicated columns: %s"
+msgid "logical replication target relation \"%s.%s\" has incompatible generated column: %s"
+msgid_plural "logical replication target relation \"%s.%s\" has incompatible generated columns: %s"
+msgstr[0] "a la relación destino de replicación lógica «%s.%s» le falta la columna replicada: %s"
+msgstr[1] "a la relación destino de replicación lógica «%s.%s» le faltan las columnas replicadas: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid "logical replication target relation \"%s.%s\" uses system columns in REPLICA IDENTITY index"
 msgstr "la relación de destino de replicación lógica «%s.%s» usa columnas de sistemas en el índice REPLICA IDENTITY"
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "la relación destino de replicación lógica «%s.%s» no existe"
 
-#: replication/logical/reorderbuffer.c:3999
+#: replication/logical/reorderbuffer.c:4252
 #, 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:4345
-#: replication/logical/reorderbuffer.c:4370
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, 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:4349
-#: replication/logical/reorderbuffer.c:4374
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, 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"
 
-#: replication/logical/reorderbuffer.c:4624
-#, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
+#: replication/logical/reorderbuffer.c:4876
+#, fuzzy, c-format
+#| msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
 msgstr "no se pudo borrar el archivo «%s» durante la eliminación de pg_replslot/%s/xid*: %m"
 
 # FIXME almost duplicated again!?
-#: replication/logical/reorderbuffer.c:5120
+#: replication/logical/reorderbuffer.c:5373
 #, 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"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:596
 #, c-format
-msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
-msgstr "no se puede sincronizar el slot de replicación «%s» porque el slot remoto precede al slot local"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "no se pudo sincronizar el slot de replicación «%s»"
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:216
 #, c-format
-msgid "The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u."
-msgstr "El slot remoto tiene LSN %X/%X y xmin de catálogo %u, pero el slot local tiene LSN %X/%X y xmin de catálogo %u."
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
+msgstr "La sincronización podría llevar a pérdida de datos, porque el slot remoto necesita WAL del LSN %X/%X y xmin de catálogo %u, pero el standby tiene LSN %X/%X y xmin de catálogo %u."
 
-#: replication/logical/slotsync.c:459
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "se eliminó el slot de replicación «%s» de la base de datos con OID %u"
 
-#: replication/logical/slotsync.c:579
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "no se pudo sincronizar el slot de replicación «%s»"
-
-#: replication/logical/slotsync.c:580
+#: replication/logical/slotsync.c:597
 #, c-format
-msgid "Logical decoding could not find consistent point from local slot's LSN %X/%X."
-msgstr "La decodificación lógica no pudo encontrar un punto consistente desde el LSN del slot local %X/%X."
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr "La sincronización podría llevar a pérdida de datos, porque el standby no pudo construir un snapshot consistente para decodificar datos en el LSN %X/%X"
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:606
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "el slot de replicación «%s» recién creado está listo para la sincronización"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:645
 #, c-format
 msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
 msgstr "omitiendo sincronización de slot porque el LSN %X/%X de sincronización recibido para el slot «%s» está adelantado respecto a la posición del standby %X/%X"
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:667
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
 msgstr "saliendo de la sincronización de slot porque un slot con el mismo nombre «%s» ya existe en el standby"
 
-#: replication/logical/slotsync.c:819
+#: replication/logical/slotsync.c:838
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "no se pudo obtener la información de slots “failover” de replicación lógica del servidor primario: %s"
 
-#: replication/logical/slotsync.c:965
-#, c-format
-msgid "could not fetch primary_slot_name \"%s\" info from the primary server: %s"
+#: replication/logical/slotsync.c:987
+#, fuzzy, c-format
+#| msgid "could not fetch primary_slot_name \"%s\" info from the primary server: %s"
+msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
 msgstr "no se pudo obtener información del primary_slot_name «%s» del servidor primario: %s"
 
-#: replication/logical/slotsync.c:967
-#, c-format
-msgid "Check if primary_slot_name is configured correctly."
+#: replication/logical/slotsync.c:989
+#, fuzzy, c-format
+#| msgid "Check if primary_slot_name is configured correctly."
+msgid "Check if \"primary_slot_name\" is configured correctly."
 msgstr "Verificando si primary_slot_name está configurado correctamente."
 
-#: replication/logical/slotsync.c:987
+#: replication/logical/slotsync.c:1009
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "no puede sincronizar slots de replicación de un servidor standby"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:996
+#: replication/logical/slotsync.c:1018
 #, c-format
 msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
 msgstr "el slot de replicación «%s» especificado por «%s» no existe en el servidor primario"
@@ -20617,938 +21531,1011 @@ msgstr "el slot de replicación «%s» especificado por «%s» no existe en el s
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1029
+#: replication/logical/slotsync.c:1051
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "la sincronización de slots de replicación requiere que «%s» esté especificado en «%s»"
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/logical/slotsync.c:1050
+#: replication/logical/slotsync.c:1070
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "la sincronización de slots de replicación requiere «wal_level» >= «logical»"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
+#: replication/logical/slotsync.c:1085 replication/logical/slotsync.c:1113
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "la sincronización de slots de replicación requiere que «%s» esté definido"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1077
+#: replication/logical/slotsync.c:1099
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "la sincronización de slots de replicación requiere que «%s» esté activado"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1151
 #, c-format
 msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
 msgstr "el proceso de sincronización de slots de replicación terminará porque «%s» está desactivado"
 
-#: replication/logical/slotsync.c:1138
+#: replication/logical/slotsync.c:1160
 #, c-format
 msgid "replication slot synchronization worker will restart because of a parameter change"
 msgstr "el proceso de sincronización de slots de replicación se reiniciará debido a un cambio de parámetro"
 
-#: replication/logical/slotsync.c:1162
-#, c-format
-msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr "el trabajador de sincronización de slots de replicación está apagándose al recibir SIGINT"
+#: replication/logical/slotsync.c:1184
+#, fuzzy, c-format
+#| msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
+msgid "replication slot synchronization worker is shutting down because promotion is triggered"
+msgstr "el proceso de sincronización de slots de replicación terminará porque «%s» está desactivado"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1309
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "no se puede sincronizar los slots de replicación cuando la promoción de standby está teniendo lugar"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1317
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "no se puede sincronizar slots de replicación concurrentemente"
 
-#: replication/logical/slotsync.c:1403
+#: replication/logical/slotsync.c:1425
 #, c-format
 msgid "slot sync worker started"
 msgstr "iniciado el trabajador de sincronización de slots"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
-#, c-format
-msgid "could not connect to the primary server: %s"
+#: replication/logical/slotsync.c:1487 replication/slotfuncs.c:928
+#, fuzzy, c-format
+#| msgid "could not connect to the primary server: %s"
+msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
 msgstr "no se pudo conectar al servidor primario: %s"
 
-#: replication/logical/snapbuild.c:653
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "el snapshot inicial del slot es demasiado grande"
 
 # FIXME: snapshot? instantánea?
-#: replication/logical/snapbuild.c:707
+#: replication/logical/snapbuild.c:568
 #, 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:1404 replication/logical/snapbuild.c:1501
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, 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:1406
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "No hay transacciones en ejecución."
 
-#: replication/logical/snapbuild.c:1453
+#: replication/logical/snapbuild.c:1362
 #, 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:1455 replication/logical/snapbuild.c:1479
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, 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:1477
+#: replication/logical/snapbuild.c:1386
 #, 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:1503
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "Ya no hay transacciones antiguas en ejecución."
 
 # FIXME "snapbuild"?
-#: replication/logical/snapbuild.c:1904
+#: replication/logical/snapbuild.c:1783
 #, c-format
 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:1910
+#: replication/logical/snapbuild.c:1789
 #, 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"
 
-#: replication/logical/snapbuild.c:1951
+#: replication/logical/snapbuild.c:1830
 #, c-format
 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:2019
+#: replication/logical/snapbuild.c:1918
 #, 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:2126
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "no se pudo interpretar el nombre de archivo «%s»"
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr "el ayudante de sincronización de tabla de replicación lógica para la suscripción «%s», tabla «%s» ha terminado"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» se reiniciará para activar «two_phase»"
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "no se pudo obtener información de la tabla «%s.%s» del publicador: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "la tabla \"%s.%s\" no fue encontrada en el publicador"
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "no se pudo obtener información de la lista de columnas para la tabla «%s.%s» del publicador: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr "no se pudo obtener información de la cláusula WHERE para la tabla «%s.%s» del publicador: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "no se pudo iniciar la copia de contenido inicial para de la tabla «%s.%s»: %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
+#, fuzzy, c-format
+#| msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
+msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "el ayudante de sincronización de tabla de replicación lógica para la suscripción «%s», tabla «%s» ha terminado"
+
+#: replication/logical/tablesync.c:1480
 #, c-format
 msgid "table copy could not start transaction on publisher: %s"
 msgstr "la copia de la tabla no pudo iniciar una transacción en el publicador: %s"
 
-#: replication/logical/tablesync.c:1472
-#, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "el origen de replicación «%s» ya existe"
-
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr "el usuario «%s» no puede replicar en relaciones con seguridad de registros activa: «%s»"
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "la copia de tabla no pudo terminar la transacción en el publicador: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» se detendrá"
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr "No se puede gestionar replicación en flujo usando procesos en paralelo hasta que todas las tablas han sido sincronizadas."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "el formato de datos binarios es incorrecto en columna de replicación lógica %d"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr "el publicador no envía la columna identidad de réplica esperada por la relación de destino de replicación lógica «%s.%s»"
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr "la relación destino de replicación lógica «%s.%s» no tiene índice REPLICA IDENTITY ni PRIMARY KEY y la relación publicada no tiene REPLICA IDENTITY FULL"
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "tipo de mensaje de replicación lógica no válido «??? (%d)»"
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "el flujo de datos del publisher ha terminado"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "terminando el proceso de replicación lógica debido a que se agotó el tiempo de espera"
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» se detendrá porque la suscripción fue eliminada"
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» se detendrá porque la suscripción fue inhabilitada"
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr "el ayudante paralelo «apply» de replicación lógica para la suscripción «%s» se reiniciará por un cambio de parámetro"
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» se reiniciará por un cambio de parámetro"
 
-#: replication/logical/worker.c:3954
+#: replication/logical/worker.c:4053
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
 msgstr "el proceso “apply” paralelo de replicación lógica para la suscripción «%s» se detendrá porque los privilegios de superusuario del dueño de la suscripción han sido revocados"
 
-#: replication/logical/worker.c:3958
+#: replication/logical/worker.c:4057
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
 msgstr "el proceso de replicación lógica para la suscripción «%s» se reiniciará porque los privilegios de superusuario del dueño de la suscripción han sido revocados"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "la suscripción no tiene un slot de replicación establecido"
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, fuzzy, c-format
+#| msgid "could not connect to the publisher: %s"
+msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "no se pudo connectar con el publicador: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción %u no se iniciará porque la suscripción fue eliminada durante el inicio"
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» no se iniciará porque la suscripción fue inhabilitada durante el inicio"
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr "el ayudante de sincronización de tabla de replicación lógica para la suscripción «%s», tabla «%s» ha iniciado"
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "el ayudante «apply» de replicación lógica para la suscripción «%s» ha iniciado"
 
-#: replication/logical/worker.c:4758
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "la suscripción «%s» ha sido inhabilitada debido a un error"
 
-#: replication/logical/worker.c:4806
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "iniciando el ignorado en la replicación lógica de la transacción en el LSN %X/%X"
 
-#: replication/logical/worker.c:4820
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "finalizó el ignorado en la replicación lógica de la transacción en el LSN %X/%X"
 
-#: replication/logical/worker.c:4902
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "el «skip-LSN» de la suscripción «%s» ha sido borrado"
 
-#: replication/logical/worker.c:4903
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr "La ubicación de WAL (LSN) de término %X/%X de la transacción remota no coincidió con el skip-LSN %X/%X."
 
-#: replication/logical/worker.c:4940
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s»"
 
-#: replication/logical/worker.c:4944
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» en la transacción %u"
 
-#: replication/logical/worker.c:4949
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» en la transacción %u, concluida en %X/%X"
 
-#: replication/logical/worker.c:4960
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» para la relación destino de replicación «%s.%s» en la transacción %u"
 
-#: replication/logical/worker.c:4967
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» para la relación de destino «%s.%s» en la transacción %u, concluida en %X/%X"
 
-#: replication/logical/worker.c:4978
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» para la relación de destino «%s.%s» columna «%s» en la transacción %u"
 
-#: replication/logical/worker.c:4986
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr "procesando datos remotos de origen de replicación «%s» durante el mensaje de tipo «%s» para la relación de destino «%s.%s» columna «%s» en la transacción %u, concluida en %X/%X"
 
-#: replication/pgoutput/pgoutput.c:322
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "proto_version no válido"
 
-#: replication/pgoutput/pgoutput.c:327
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_version «%s» fuera de rango"
 
-#: replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "sintaxis de publication_names no válida"
 
-#: replication/pgoutput/pgoutput.c:414 replication/pgoutput/pgoutput.c:418
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "falta la opción «%s»"
 
-#: replication/pgoutput/pgoutput.c:478
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "el cliente envió proto_version=%d pero el servidor sólo soporta el protocolo %d o inferior"
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "el cliente envió proto_version=%d pero el servidor sólo soporta el protocolo %d o superior"
 
-#: replication/pgoutput/pgoutput.c:499
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr "la proto_version=%d no soporta flujo, se necesita %d o superior"
 
-#: replication/pgoutput/pgoutput.c:505
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr "la proto_version=%d solicitada no soporta flujo en paralelo, se necesita %d o superior"
 
-#: replication/pgoutput/pgoutput.c:510
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "se solicitó flujo, pero no está soportado por plugin de salida"
 
-#: replication/pgoutput/pgoutput.c:524
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr "la proto_version=%d solicitada no soporta «two-phase commit», se necesita %d o superior"
 
-#: replication/pgoutput/pgoutput.c:529
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "«two-phase commit» fue solicitado, pero no está soportado por el plugin de salida"
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1112
+#, fuzzy, c-format
+#| msgid "cannot use different column lists for table \"%s.%s\" in different publications"
+msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
+msgstr "no se puede usar distintas listas de columnas para la tabla «%s.%s» en distintas publicaciones"
+
+#: replication/pgoutput/pgoutput.c:1815
+#, fuzzy, c-format
+#| msgid "reading publications"
+msgid "skipped loading publication \"%s\""
+msgstr "leyendo publicaciones"
+
+#: replication/pgoutput/pgoutput.c:1816
+#, fuzzy, c-format
+#| msgid "publication %s does not exist on the publisher"
+#| msgid_plural "publications %s do not exist on the publisher"
+msgid "The publication does not exist at this point in the WAL."
+msgstr "no existe la publicación «%s» en el “publisher”"
+
+#: replication/pgoutput/pgoutput.c:1817
+#, fuzzy, c-format
+#| msgid "publication \"%s\" does not exist"
+msgid "Create the publication if it does not exist."
+msgstr "no existe la publicación «%s»"
+
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "el nombre de slot de replicación «%s» es demasiado corto"
 
-#: replication/slot.c:269
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "el nombre de slot de replicación «%s» es demasiado largo"
 
-#: replication/slot.c:282
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "el nombre de slot de replicación «%s» contiene caracteres no válidos"
 
-#: replication/slot.c:284
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr "Los nombres de slots de replicación sólo pueden contener letras minúsculas, números y el carácter «_»."
 
-#: replication/slot.c:333
+#: replication/slot.c:377
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr "no se puede activar “failover” para un slot de replicación creado en el standby"
 
-#: replication/slot.c:345 replication/slot.c:849
+#: replication/slot.c:389 replication/slot.c:925
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "no se puede activar “failover” para un slot de replicación temporal"
 
-#: replication/slot.c:370
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "el slot de replicación «%s» ya existe"
 
-#: replication/slot.c:380
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "todos los slots de replicación están en uso"
 
-#: replication/slot.c:381
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "Libere uno o incremente «max_replication_slots»."
 
-#: replication/slot.c:560 replication/slot.c:2450 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:609 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "no existe el slot de replicación «%s»"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "el slot de replicación «%s» está activo para el PID %d"
 
-#: replication/slot.c:638
+#: replication/slot.c:681
+#, fuzzy, c-format
+#| msgid "can no longer get changes from replication slot \"%s\""
+msgid "can no longer access replication slot \"%s\""
+msgstr "ya no se pueden recibir cambios desde el slot de replicación «%s»"
+
+#: replication/slot.c:683
+#, fuzzy, c-format
+#| msgid "The source replication slot was modified incompatibly during the copy operation."
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "El slot de replicación de origen fue modificado incompatiblemente durante la operación de copia."
+
+#: replication/slot.c:702
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "se adquirió el slot de replicación lógica «%s»"
 
-#: replication/slot.c:640
+#: replication/slot.c:704
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "se adquirió el slot de replicación física «%s»"
 
-#: replication/slot.c:729
+#: replication/slot.c:789
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "se liberó el slot de replicación lógica «%s»"
 
-#: replication/slot.c:731
+#: replication/slot.c:791
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "se liberó el slot de replicación física «%s»"
 
-#: replication/slot.c:797
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "no se puede eliminar el slot de replicación «%s»"
 
-#: replication/slot.c:816
+#: replication/slot.c:890
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "no se puede usar %s con un slot de replicación física"
 
-#: replication/slot.c:828
+#: replication/slot.c:902
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "no se puede alterar el slot de replicación «%s»"
 
-#: replication/slot.c:838
+#: replication/slot.c:912
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "no se puede activar el “failover” para un slot de replicación en el standby"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "no se pudo eliminar el directorio «%s»"
 
-#: replication/slot.c:1372
+#: replication/slot.c:1534
 #, 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:1377
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "los slots de replicación sólo pueden usarse si «wal_level» >= «replica»"
 
-#: replication/slot.c:1389
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "permiso denegado a usar slots de replicación"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "Sólo roles con el atributo %s pueden usar slots de replicación."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1664
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
-msgstr[0] "El restart_lsn %X/%X del slot excede el límite por %llu byte."
-msgstr[1] "El restart_lsn %X/%X del slot excede el límite por %llu bytes."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
+msgstr[0] "El restart_lsn %X/%X del slot excede el límite por %<PRIu64> byte."
+msgstr[1] "El restart_lsn %X/%X del slot excede el límite por %<PRIu64> bytes."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "El slot estaba en conflicto con el horizonte de XID %u."
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/slot.c:1511
+#: replication/slot.c:1680
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "La decodificación lógica en standby requiere «wal_level» >= «logical» en el primario."
 
-#: replication/slot.c:1519
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1686
+#, c-format
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr "El tiempo de inactividad del slot de %lds excede la duración configurada «%s» de %ds."
+
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "terminando el proceso %d para liberar el slot de replicación «%s»"
 
-#: replication/slot.c:1521
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "invalidando el slot de replicación obsoleto «%s»"
 
-#: replication/slot.c:2249
+#: replication/slot.c:2559
 #, c-format
 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:2256
+#: replication/slot.c:2566
 #, 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:2263
+#: replication/slot.c:2573
 #, 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:2299
+#: replication/slot.c:2609
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "suma de verificación no coincidente en archivo de slot de replicación «%s»: es %u, debería ser %u"
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/slot.c:2333
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "existe el slot de replicación lógica «%s», pero «wal_level» < «logical»"
 
-#: replication/slot.c:2335
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "Cambie «wal_level» a «logical» o superior."
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: replication/slot.c:2339
+#: replication/slot.c:2659
+#, c-format
+msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
+msgstr "el slot de replicación lógica «%s» existe en el standby, pero «hot_standby» = «off»"
+
+#: replication/slot.c:2661
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "Cambie «hot_standby» a «on»."
+
+# FIXME see slot.c:779.  See also  postmaster.c:835
+#: replication/slot.c:2666
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
-msgstr "existe el slot de replicación lógica «%s», pero «wal_level» < «replica»"
+msgstr "existe el slot de replicación física «%s», pero «wal_level» < «replica»"
 
 # <> hello vim
-#: replication/slot.c:2341
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "Cambie «wal_level» a «replica» o superior."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "demasiados slots de replicación activos antes del apagado"
 
-#: replication/slot.c:2458
+#: replication/slot.c:2716
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "«%s» no es un slot de replicación física"
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "Aumente «max_replication_slots» y reintente."
 
-#: replication/slot.c:2635
+#: replication/slot.c:2953
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "el slot de replicación «%s» especificado en el parámetro «%s» no existe"
 
-#: replication/slot.c:2637 replication/slot.c:2671 replication/slot.c:2686
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
 #, c-format
 msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
 msgstr "La replicación lógica está esperando al standby asociado con el slot de replicación «%s»."
 
-#: replication/slot.c:2639
+#: replication/slot.c:2957
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "Cree el slot de replicación «%s» o corrija el parámetro «%s»."
 
-#: replication/slot.c:2649
+#: replication/slot.c:2967
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "no se puede especificar el slot de replicación lógica «%s» en el parámetro «%s»"
 
-#: replication/slot.c:2651
+#: replication/slot.c:2969
 #, c-format
 msgid "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "La replicación lógica está esperando a una corrección en el slot de replicación «%s»."
 
-#: replication/slot.c:2653
+#: replication/slot.c:2971
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "Elimine el slot de replicación lógica «%s» del parámetro «%s»."
 
-#: replication/slot.c:2669
+#: replication/slot.c:2987
 #, c-format
 msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
 msgstr "el slot de replicación física «%s» especificado en el parámetro «%s» ha sido invalidado"
 
-#: replication/slot.c:2673
+#: replication/slot.c:2991
 #, c-format
 msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "Elimine y vuelva a crear el slot de replicación «%s», o corrija el parámetro «%s»."
 
-#: replication/slot.c:2684
+#: replication/slot.c:3002
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
 msgstr "el slot de replicación «%s» especificado en el parámetro «%s» no tiene active_pid"
 
-#: replication/slot.c:2688
+#: replication/slot.c:3006
 #, c-format
 msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "Inicie el standby asociado con el slot de replicación «%s», o corrija el parámetro «%s»."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "el LSN de wal de destino no es válido"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "no se puede avanzar el slot de replicación «%s»"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "Este slot nunca ha reservado WAL previamente, o ha sido invalidado."
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr "no puede avanzar un slot de replicación a %X/%X, el mínimo es %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid "cannot copy physical replication slot \"%s\" as a logical replication slot"
 msgstr "no se puede copiar el slot de replicación física «%s» como slot de replicación lógica"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid "cannot copy logical replication slot \"%s\" as a physical replication slot"
 msgstr "no se puede copiar el slot de replicación lógica «%s» como slot de replicación física"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "no puede copiar un slot de replicación que no ha reservado WAL"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "no se puede copiar el slot de replicación «%s» invalidado"
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "no se pudo copiar el slot de replicación «%s»"
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid "The source replication slot was modified incompatibly during the copy operation."
 msgstr "El slot de replicación de origen fue modificado incompatiblemente durante la operación de copia."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr "no se puede copiar el slot de replicación lógica no terminado «%s»"
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr "Reintente cuando el confirmed_flush_lsn del slot de replicación de origen sea válido."
 
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "no se puede copiar el slot de replicación «%s»"
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "El slot de replicación de origen fue invalidado durante la operación de copia."
+
 # FIXME see logical.c:81
-#: replication/slotfuncs.c:877
+#: replication/slotfuncs.c:906
 #, c-format
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "los slots de replicación sólo pueden sincronizarse a un servidor standby"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, 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:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, 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:278
+#: replication/syncrep.c:321
 #, 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:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "el standby «%s» es ahora un standby sincrónico con prioridad %d"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "el standby «%s» es ahora un candidato para standby sincrónico de quórum"
 
-#: replication/syncrep.c:1013
+#: replication/syncrep.c:1081
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr "falló la interpretación de «synchronous_standby_names»"
+#| msgid "\"%s\" failed"
+msgid "\"%s\" parser failed."
+msgstr "El intérprete de «%s» falló."
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1088
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "el argumento de standby sincrónicos (%d) debe ser mayor que cero"
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "terminando el proceso walreceiver debido a una orden del administrador"
+#| msgid "could not connect to the primary server: %s"
+msgid "streaming replication receiver \"%s\" could not connect to the primary server: %s"
+msgstr "el receptor de replicación “streaming” «%s» no se pudo conectar al servidor primario: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "el identificador de sistema difiere entre el primario y el standby"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "El identificador del primario es %s, el identificador del standby es %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr "el timeline más alto del primario, %u, está más atrás que el timeline de recuperación %u"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr "iniciando el flujo de WAL desde el primario en %X/%X en el timeline %u"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "reiniciando el flujo de WAL en %X/%X en el timeline %u"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "no se puede continuar el flujo de WAL; la recuperación ya ha terminado"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "replicación terminada por el servidor primario"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "Se alcanzó el fin de WAL en el timeline %u en la posición %X/%X."
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "terminando el proceso walreceiver debido a que se agotó el tiempo de espera"
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr "el servidor primario no contiene más WAL en el timeline %u solicitado"
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "no se pudo cerrar el segmento de WAL %s: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "trayendo el archivo de historia del timeline para el timeline %u desde el servidor primario"
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "no se pudo escribir al segmento de WAL %s en la posición %d, largo %lu: %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "no se puede usar %s con un slot de replicación lógica"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1735
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "no se pudo posicionar (seek) al fin del archivo «%s»: %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:627
 #, 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:853
+#: replication/walsender.c:843
 #, 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:919
+#: replication/walsender.c:909
 #, 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:922
+#: replication/walsender.c:912
 #, 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:966
+#: replication/walsender.c:956
 #, 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:1160
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "valor no reconocido para la opción de CREATE_REPLICATION_SLOT «%s»: «%s»"
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s no debe ser ejecutado dentro de una transacción"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s no debe ser ejecutado dentro de una transacción"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s debe llamarse en una transacción de modo de aislamiento REPEATABLE READ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s debe ser ejecutado en una transacción de sólo lectura"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s debe ser llamado antes de cualquier consulta"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s no está permitido en una subtransacción"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "terminando el proceso walsender luego de la promoción"
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "no puede ejecutar nuevas órdenes mientras el “WAL sender” está en modo de apagarse"
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "no puede ejecutar órdenes SQL en el “WAL sender” para replicación física"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "se recibió orden de replicación: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1142
-#: tcop/postgres.c:1500 tcop/postgres.c:1752 tcop/postgres.c:2234
-#: tcop/postgres.c:2672 tcop/postgres.c:2749
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137
+#: tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251
+#: tcop/postgres.c:2688 tcop/postgres.c:2765
 #, 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"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "se encontró fin de archivo inesperado en la conexión standby"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "el tipo «%c» de mensaje del standby no es válido"
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "mensaje de tipo «%c» inesperado"
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2789
 #, 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"
@@ -21729,288 +22716,288 @@ msgstr "no existe la regla «%s» para la relación «%s»"
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "no se permite cambiar el nombre de una regla ON SELECT"
 
-#: rewrite/rewriteHandler.c:588
+#: rewrite/rewriteHandler.c:590
 #, c-format
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr "el nombre de consulta WITH «%s» aparece tanto en una acción de regla y en la consulta que está siendo reescrita"
 
-#: rewrite/rewriteHandler.c:615
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "las acciones de regla INSERT ... SELECT no están soportadas para sentencias que modifiquen datos en WITH"
 
-#: rewrite/rewriteHandler.c:668
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "no se puede usar RETURNING en múltiples reglas"
 
-#: rewrite/rewriteHandler.c:900 rewrite/rewriteHandler.c:939
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "no se puede insertar un valor no-predeterminado en la columna «%s»"
 
-#: rewrite/rewriteHandler.c:902 rewrite/rewriteHandler.c:968
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "La columna \"%s\" es una columna de identidad definida como GENERATED ALWAYS."
 
-#: rewrite/rewriteHandler.c:904
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "Use OVERRIDING SYSTEM VALUE para controlar manualmente."
 
-#: rewrite/rewriteHandler.c:966 rewrite/rewriteHandler.c:974
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "la columna «%s» sólo puede actualizarse a DEFAULT"
 
-#: rewrite/rewriteHandler.c:1109 rewrite/rewriteHandler.c:1127
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "hay múltiples asignaciones a la misma columna «%s»"
 
-#: rewrite/rewriteHandler.c:1682
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE no está soportado para relaciones con reglas."
 
-#: rewrite/rewriteHandler.c:1722 rewrite/rewriteHandler.c:3262
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr "el acceso a la vista no de sistema «%s» está restringido"
 
-#: rewrite/rewriteHandler.c:2122 rewrite/rewriteHandler.c:4254
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, 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:2227
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "se detectó recursión infinita en la política para la relación «%s»"
 
-#: rewrite/rewriteHandler.c:2589
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "Las columnas «basura» de vistas no son actualizables."
 
-#: rewrite/rewriteHandler.c:2594
+#: rewrite/rewriteHandler.c:2606
 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:2597
+#: rewrite/rewriteHandler.c:2609
 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:2600
+#: rewrite/rewriteHandler.c:2612
 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:2661
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Las vistas que contienen DISTINCT no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2664
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Las vistas que contienen GROUP BY no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2667
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Las vistas que contienen HAVING no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2670
+#: rewrite/rewriteHandler.c:2682
 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:2673
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Las vistas que contienen WITH no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2676
+#: rewrite/rewriteHandler.c:2688
 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:2688
+#: rewrite/rewriteHandler.c:2700
 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:2691
+#: rewrite/rewriteHandler.c:2703
 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:2694
+#: rewrite/rewriteHandler.c:2706
 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:2701 rewrite/rewriteHandler.c:2705
-#: rewrite/rewriteHandler.c:2713
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717
+#: rewrite/rewriteHandler.c:2725
 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:2716
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Las vistas que contienen TABLESAMPLE no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2740
+#: rewrite/rewriteHandler.c:2752
 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:3121 rewrite/rewriteHandler.c:3156
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "no se puede insertar en la vista «%s»"
 
-#: rewrite/rewriteHandler.c:3124
+#: rewrite/rewriteHandler.c:3136
 #, 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 posibilitar las inserciones en la vista, provea un “trigger” INSTEAD OF INSERT o una regla incodicional ON INSERT DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3129 rewrite/rewriteHandler.c:3165
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "no se puede actualizar la vista «%s»"
 
-#: rewrite/rewriteHandler.c:3132
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Para posibilitar las actualizaciones en la vista, provea un “trigger” INSTEAD OF UPDATE o una regla incondicional ON UPDATE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3137 rewrite/rewriteHandler.c:3174
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "no se puede eliminar de la vista «%s»"
 
-#: rewrite/rewriteHandler.c:3140
+#: rewrite/rewriteHandler.c:3152
 #, 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 posibilitar las eliminaciones en la vista, provea un “trigger” INSTEAD OF DELETE o una regla incondicional ON DELETE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3159
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
 msgstr "Para posibilitar insertar en la vista usando MERGE, provea un “trigger” INSTEAD OF INSERT."
 
-#: rewrite/rewriteHandler.c:3168
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
 msgstr "Para posibilitar actualizar la vista usando MERGE, provea un “trigger” INSTEAD OF UPDATE."
 
-#: rewrite/rewriteHandler.c:3177
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
 msgstr "Para posibilitar eliminar de la vista usando MERGE, provea un “trigger” INSTEAD OF DELETE."
 
-#: rewrite/rewriteHandler.c:3352
+#: rewrite/rewriteHandler.c:3364
 #, 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:3360
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "no se puede actualizar la columna «%s» vista «%s»"
 
-#: rewrite/rewriteHandler.c:3368
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "no se puede hacer «merge» en la columna «%s» de la vista «%s»"
 
-#: rewrite/rewriteHandler.c:3396
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "no se puede hacer «merge» en la vista «%s»"
 
-#: rewrite/rewriteHandler.c:3398
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
 msgstr "MERGE no está soportado para vistas con triggers INSTEAD OF para algunas acciones pero no todas."
 
-#: rewrite/rewriteHandler.c:3399
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
 msgstr "Para posibilitar hacer “merge” en la vista, provea un conjunto completo de “triggers” INSTEAD OF o elimine los “triggers” INSTEAD OF existentes."
 
-#: rewrite/rewriteHandler.c:3912
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr "las reglas DO INSTEAD NOTIFY no están soportadas para sentencias que modifiquen datos en WITH"
 
-#: rewrite/rewriteHandler.c:3923
+#: rewrite/rewriteHandler.c:3953
 #, 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:3937
+#: rewrite/rewriteHandler.c:3967
 #, 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:3941
+#: rewrite/rewriteHandler.c:3971
 #, 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:3946
+#: rewrite/rewriteHandler.c:3976
 #, 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"
 
 # XXX a %s here would be nice ...
-#: rewrite/rewriteHandler.c:4206
+#: rewrite/rewriteHandler.c:4237
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr "Las vistas con reglas DO INSTEAD condicionales no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:4303
+#: rewrite/rewriteHandler.c:4335
 #, 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:4305
+#: rewrite/rewriteHandler.c:4337
 #, 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:4310
+#: rewrite/rewriteHandler.c:4342
 #, 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:4312
+#: rewrite/rewriteHandler.c:4344
 #, 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:4317
+#: rewrite/rewriteHandler.c:4349
 #, 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:4319
+#: rewrite/rewriteHandler.c:4351
 #, 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:4337
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT con una cláusula ON CONFLICT no puede usarse con una tabla que tiene reglas INSERT o UPDATE"
 
-#: rewrite/rewriteHandler.c:4394
+#: rewrite/rewriteHandler.c:4426
 #, 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:1084
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "las sentencias condicionales de utilidad no están implementadas"
 
-#: rewrite/rewriteManip.c:1431
+#: rewrite/rewriteManip.c:1520
 #, 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:1767
+#: rewrite/rewriteManip.c:1923
 #, 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 "las variables NEW en reglas ON UPDATE no pueden referenciar columnas que son parte de una asignación múltiple en la orden UPDATE"
@@ -22020,33 +23007,101 @@ msgstr "las variables NEW en reglas ON UPDATE no pueden referenciar columnas que
 msgid "with a SEARCH or CYCLE clause, the recursive reference to WITH query \"%s\" must be at the top level of its right-hand SELECT"
 msgstr "con una cláusula SEARCH o CYCLE, la referencia recursiva a la consulta de WITH «%s» debe estar en el nivel superior de su SELECT del lado derecho"
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr "no se encontró un analizador Snowball para el lenguaje «%s» y la codificación «%s»"
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "parámetro StopWords duplicado"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "parámetro Language duplicado"
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "parámetro Snowball no reconocido: «%s»"
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "falta un parámetro Language"
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937
+#: statistics/relation_stats.c:98
+#, fuzzy, c-format
+#| msgid "%s cannot be executed during recovery."
+msgid "Statistics cannot be modified during recovery."
+msgstr "No se puede ejecutar %s durante la recuperación."
+
+#: statistics/attribute_stats.c:205
+#, fuzzy, c-format
+#| msgid "cannot specify both %s and %s"
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "no se puede especificar %s junto con %s"
+
+#: statistics/attribute_stats.c:231
+#, fuzzy, c-format
+#| msgid "cannot specify both %s and %s"
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "no se puede especificar %s junto con %s"
+
+#: statistics/attribute_stats.c:239
+#, fuzzy, c-format
+#| msgid "cannot assign to system column \"%s\""
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "no se puede asignar a la columna de sistema «%s»"
+
+#: statistics/attribute_stats.c:303
+#, fuzzy, c-format
+#| msgid "could not determine data type for argument %d"
+msgid "could not determine element type of column \"%s\""
+msgstr "no se pudo determinar el tipo de dato para el argumento %d"
+
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321
+#: statistics/attribute_stats.c:336
+#, fuzzy, c-format
+#| msgid "cannot cast type %s to %s"
+msgid "Cannot set %s or %s."
+msgstr "no se puede convertir el tipo %s a %s"
+
+#: statistics/attribute_stats.c:320
+#, fuzzy, c-format
+#| msgid "could not determine which collation to use for view column \"%s\""
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "no se pudo determinar el ordenamiento (collation) a usar para la columna «%s» de vista"
+
+#: statistics/attribute_stats.c:335
+#, fuzzy, c-format
+#| msgid "column \"%s\" is not of a character type"
+msgid "column \"%s\" is not a range type"
+msgstr "la columna «%s» no es de un tipo textual"
+
+#: statistics/attribute_stats.c:738
+#, fuzzy, c-format
+#| msgid "ACL arrays must not contain null values"
+msgid "\"%s\" array must not contain null values"
+msgstr "los arrays de ACL no pueden contener valores nulos"
+
+#: statistics/attribute_stats.c:781
+#, fuzzy, c-format
+#| msgid "maximum number of committed subtransactions (%d) exceeded"
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "se superó el número máximo de subtransacciones comprometidas (%d)"
+
+#: statistics/attribute_stats.c:949
+#, fuzzy, c-format
+#| msgid "cannot assign to system column \"%s\""
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "no se puede asignar a la columna de sistema «%s»"
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
 msgstr "el objeto de estadísticas «%s.%s» no pudo ser calculado para la relación «%s.%s»"
@@ -22056,62 +23111,259 @@ msgstr "el objeto de estadísticas «%s.%s» no pudo ser calculado para la relac
 msgid "function returning record called in context that cannot accept type record"
 msgstr "se llamó una función que retorna un registro en un contexto que no puede aceptarlo"
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:117
+#, fuzzy, c-format
+#| msgid "%s must be less than %s"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "%s debe ser menor que %s"
+
+#: statistics/stat_utils.c:47
+#, fuzzy, c-format
+#| msgid "argument %d: key must not be null"
+msgid "argument \"%s\" must not be null"
+msgstr "argumento %d: la llave no puede ser null"
+
+#: statistics/stat_utils.c:74
+#, fuzzy, c-format
+#| msgid "argument must be empty or one-dimensional array"
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "el argumento debe ser vacío o un array unidimensional"
+
+#: statistics/stat_utils.c:83
+#, fuzzy, c-format
+#| msgid "ACL arrays must not contain null values"
+msgid "argument \"%s\" array must not contain null values"
+msgstr "los arrays de ACL no pueden contener valores nulos"
+
+#: statistics/stat_utils.c:114
+#, fuzzy, c-format
+#| msgid "aggregate msfunc must be specified when mstype is specified"
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "debe especificarse la función de transición msfunc cuando se especifica mstype"
+
+#: statistics/stat_utils.c:177
+#, fuzzy, c-format
+#| msgid "role %u was concurrently dropped"
+msgid "index \"%s\" was concurrently dropped"
+msgstr "el rol %u fue eliminado por una transacción concurrente"
+
+#: statistics/stat_utils.c:192
+#, fuzzy, c-format
+#| msgid "role %u was concurrently dropped"
+msgid "index \"%s\" was concurrently created"
+msgstr "el rol %u fue eliminado por una transacción concurrente"
+
+#: statistics/stat_utils.c:212
+#, fuzzy, c-format
+#| msgid "cannot define statistics for relation \"%s\""
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "no se puede definir estadísticas para la relación «%s»"
+
+#: statistics/stat_utils.c:220
+#, fuzzy, c-format
+#| msgid "cannot define statistics for relation \"%s\""
+msgid "cannot modify statistics for shared relation"
+msgstr "no se puede definir estadísticas para la relación «%s»"
+
+#: statistics/stat_utils.c:260
+#, fuzzy, c-format
+#| msgid "unrecognized event name \"%s\""
+msgid "unrecognized argument name: \"%s\""
+msgstr "nommre de evento «%s» no reconocido"
+
+#: statistics/stat_utils.c:274
+#, fuzzy, c-format
+#| msgid "argument of %s must be type %s, not type %s"
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "el argumento de %s debe ser de tipo %s, no tipo %s"
+
+#: statistics/stat_utils.c:315
+#, fuzzy, c-format
+#| msgid "argument of %s must be a name"
+msgid "variadic arguments must be name/value pairs"
+msgstr "el argumento de %s debe ser un nombre"
+
+#: statistics/stat_utils.c:316
 #, c-format
-msgid "cannot access temporary tables of other sessions"
-msgstr "no se pueden acceder tablas temporales de otras sesiones"
+msgid "Provide an even number of variadic arguments that can be divided into pairs."
+msgstr "Provea un número par de argumentos variádicos que puedan ser separados en pares."
+
+#: statistics/stat_utils.c:330
+#, fuzzy, c-format
+#| msgid "path element at position %d is null"
+msgid "name at variadic position %d is null"
+msgstr "el elemento en la posición %d de la ruta es null"
 
-#: storage/buffer/bufmgr.c:1532
+#: statistics/stat_utils.c:334
 #, c-format
-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"
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "el nombre en la posición variádica %d tiene tipo %s, se esperaba tipo %s"
+
+#: storage/aio/aio.c:1343
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "Sólo -1 o valores mayores que 0 son válidos."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
+msgstr "Verifique si io_uring está desactivado vía /proc/sys/kernel/io_uring_disabled."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+#| msgid "Consider increasing the configuration parameter \"%s\"."
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "Considere incrementar «ulimit -n» al menos a %d."
+
+#: storage/aio/method_io_uring.c:380
+#| msgid "The server (version %s) does not support subscriptions."
+msgid "The kernel does not support io_uring."
+msgstr "El kernel no soporta io_uring."
+
+#: storage/aio/method_io_uring.c:388
+#, fuzzy, c-format
+#| msgid "could not delete file \"%s\": %m"
+msgid "could not setup io_uring queue: %m"
+msgstr "no se pudo borrar el archivo «%s»: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "completando I/O a nombre del proceso %d"
+
+#: storage/aio/method_worker.c:382
+#, c-format
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "trabajador I/O ejecutando I/O a nombre del proceso %d"
+
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
+#, c-format
+msgid "cannot access temporary tables of other sessions"
+msgstr "no se pueden acceder tablas temporales de otras sesiones"
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "no se puede extender la relación %s más allá de %u bloques"
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "datos inesperados más allá del EOF en el bloque %u de relación %s"
+#| msgid "unexpected data beyond EOF in block %u of relation %s"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "datos inesperados más allá del EOF en el bloque %u de relación «%s»"
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr "Esto parece ocurrir sólo con kernels defectuosos; considere actualizar su sistema."
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "no se pudo escribir el bloque %u de %s"
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:6182
 #, 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:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "escribiendo el bloque %u de la relación %s"
+#| msgid "writing block %u of relation %s"
+msgid "writing block %u of relation \"%s\""
+msgstr "escribiendo el bloque %u de la relación «%s»"
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/bufmgr.c:7317
 #, c-format
-msgid "no empty local buffer available"
-msgstr "no hay ningún búfer local disponible"
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr ""
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
 #, c-format
-msgid "cannot access temporary tables during a parallel operation"
-msgstr "no se pueden acceder tablas temporales durante una operación paralela"
+msgid "Block %u held the first zeroed page."
+msgstr ""
 
-#: storage/buffer/localbuf.c:712
-#, 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."
+#: storage/buffer/bufmgr.c:7322
+#, fuzzy, c-format
+#| msgid "See server log for query details."
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "Vea el registro del servidor para obtener detalles de las consultas."
+msgstr[1] "Vea el registro del servidor para obtener detalles de las consultas."
+
+#: storage/buffer/bufmgr.c:7339
+#, fuzzy, c-format
+#| msgid "invalid page in block %u of relation %s"
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "la página no es válida en el bloque %u de la relación %s"
 
-#: storage/file/buffile.c:338
+#: storage/buffer/bufmgr.c:7340
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr ""
+
+#: storage/buffer/bufmgr.c:7341
+#, fuzzy, c-format
+#| msgid "See server log for query details."
+msgid "See server log for the other %u invalid block(s)."
+msgstr "Vea el registro del servidor para obtener detalles de las consultas."
+
+#: storage/buffer/bufmgr.c:7346
+#, fuzzy, c-format
+#| msgid "invalid page in block %u of relation %s; zeroing out page"
+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:7347
+#, fuzzy, c-format
+#| msgid "invalid page in block %u of relation %s"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "la página no es válida en el bloque %u de la relación %s"
+
+#: storage/buffer/bufmgr.c:7349
+#, fuzzy, c-format
+#| msgid "See server log for query details."
+msgid "See server log for the other %u zeroed block(s)."
+msgstr "Vea el registro del servidor para obtener detalles de las consultas."
+
+#: storage/buffer/bufmgr.c:7354
+#, fuzzy, c-format
+#| msgid "invalid page in block %u of relation %s"
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "la página no es válida en el bloque %u de la relación %s"
+
+#: storage/buffer/bufmgr.c:7355
+#, fuzzy, c-format
+#| msgid "while vacuuming block %u of relation \"%s.%s\""
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "haciendo «vacuum» al bloque %u de la relación «%s.%s»"
+
+#: storage/buffer/bufmgr.c:7356
+#, c-format
+msgid "Block %u held the first ignored page."
+msgstr ""
+
+#: storage/buffer/bufmgr.c:7357
+#, fuzzy, c-format
+#| msgid "See server log for query details."
+msgid "See server log for the other %u ignored block(s)."
+msgstr "Vea el registro del servidor para obtener detalles de las consultas."
+
+#: storage/buffer/localbuf.c:272
+#, c-format
+msgid "no empty local buffer available"
+msgstr "no hay ningún búfer local disponible"
+
+#: storage/buffer/localbuf.c:736
+#, c-format
+msgid "cannot access temporary tables during a parallel operation"
+msgstr "no se pueden acceder tablas temporales durante una operación paralela"
+
+#: storage/buffer/localbuf.c:876
+#, 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."
+
+#: storage/file/buffile.c:338
 #, c-format
 msgid "could not open temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "no se pudo abrir archivo temporal «%s» del BufFile «%s»: %m"
@@ -22126,21 +23378,27 @@ msgstr "no se pudo leer del “file set” «%s»: se leyeron sólo %zu de %zu b
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "no se pudo leer del archivo temporal: se leyeron sólo %zu de %zu bytes"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "no se pudo determinar el tamaño del archivo temporal «%s» del BufFile «%s»: %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "no se pudo borrar el “fileset” «%s»: %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1194
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "no se pudo truncar el archivo «%s»: %m"
 
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, fuzzy, c-format
+#| msgid "could not copy file \"%s\" to \"%s\": %m"
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "no se pudo copiar el archivo de «%s» a «%s»: %m"
+
 #: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
 #, c-format
 msgid "could not flush dirty data: %m"
@@ -22161,120 +23419,127 @@ msgstr "no se pudo ejecutar munmap() mientras se sincronizaban (flush) datos: %m
 msgid "getrlimit failed: %m"
 msgstr "getrlimit falló: %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1074
 #, 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:1074
-#, c-format
-msgid "System allows %d, server needs at least %d."
+#: storage/file/fd.c:1075
+#, fuzzy, c-format
+#| msgid "System allows %d, server needs at least %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
 msgstr "El sistema permite %d, el servidor necesita al menos %d."
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1164 storage/file/fd.c:2679 storage/file/fd.c:2788
+#: storage/file/fd.c:2942
 #, 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:1536
+#: storage/file/fd.c:1540
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "archivo temporal: ruta «%s», tamaño %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1679
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "no se pudo crear el directorio temporal «%s»: %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1686
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "no se pudo crear el subdirectorio temporal «%s»: %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1883
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "no se pudo crear el archivo temporal «%s»: %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1919
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "no se pudo abrir el archivo temporal «%s»: %m"
 
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1960
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "no se pudo eliminar (unlink) el archivo temporal «%s»: %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2050
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "no se pudo borrar el archivo «%s»: %m"
 
-#: storage/file/fd.c:2234
-#, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
+#: storage/file/fd.c:2289
+#, fuzzy, c-format
+#| msgid "temporary file size exceeds temp_file_limit (%dkB)"
+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:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2655 storage/file/fd.c:2714
 #, 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:2698
+#: storage/file/fd.c:2759
 #, 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:2854
+#: storage/file/fd.c:2918
 #, 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:3384
+#: storage/file/fd.c:3449
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "archivo inesperado en directorio de archivos temporales: «%s»"
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3567
 #, c-format
 msgid "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
 msgstr "sincronizando el directorio de datos (syncfs), transcurrido: %ld.%02d s, ruta actual: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3794
 #, c-format
 msgid "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "sincronizando el directorio de datos (pre-fsync), transcurrido: %ld.%02d s, ruta actual: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3826
 #, c-format
 msgid "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "sincronizando el directorio de datos (fsync), transcurrido: %ld.%02d s, ruta actual: %s"
 
-#: storage/file/fd.c:3950
-#, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr "«debug_io_direct» no está soportado en esta plataforma."
+#: storage/file/fd.c:4015
+#, fuzzy, c-format
+#| msgid "LDAP URLs not supported on this platform"
+msgid "\"%s\" is not supported on this platform."
+msgstr "las URLs LDAP no está soportado en esta plataforma"
 
-#: storage/file/fd.c:3964
-#, c-format
-msgid "Invalid list syntax in parameter \"%s\""
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
+#, fuzzy, c-format
+#| msgid "Invalid list syntax in parameter \"%s\""
+msgid "Invalid list syntax in parameter \"%s\"."
 msgstr "Sintaxis de lista no válida en el parámetro «%s»"
 
-#: storage/file/fd.c:3984
-#, c-format
-msgid "Invalid option \"%s\""
+#: storage/file/fd.c:4050 tcop/backend_startup.c:1054
+#, fuzzy, c-format
+#| msgid "Invalid option \"%s\""
+msgid "Invalid option \"%s\"."
 msgstr "Nombre de opción «%s» no válido."
 
-#: storage/file/fd.c:3997
-#, c-format
-msgid "\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
+#: storage/file/fd.c:4063
+#, fuzzy, c-format
+#| msgid "\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
+msgid "\"%s\" is not supported for WAL because %s is too small."
 msgstr "«debug_io_direct» no está soportado para WAL porque XLOG_BLCKSZ es demasiado pequeño"
 
-#: storage/file/fd.c:4004
-#, c-format
-msgid "\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
+#: storage/file/fd.c:4071
+#, fuzzy, c-format
+#| msgid "\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
+msgid "\"%s\" is not supported for data because %s is too small."
 msgstr "«debug_io_direct» no está soportado para datos porque BLCKSZ es demasiado pequeño"
 
 #: storage/file/reinit.c:145
@@ -22362,58 +23627,75 @@ msgstr "no se pudo cerrar el segmento de memoria compartida «%s»: %m"
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "no se pudo duplicar el «handle» para «%s»: %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "el nombre del segmento DSM no puede ser vacío"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "nombre de segmento DSM es demasiado largo"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "el tamaño del segmento DSM debe ser distinto de cero"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr "el tamaño solicitado de segmento de DSM no coincide con el tamaño del segmento existente"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:357
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "lo siento, ya tenemos demasiados clientes"
 
-#: storage/ipc/procarray.c:3857
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "la base de datos «%s» está siendo utilizada por transacciones preparadas"
 
-#: storage/ipc/procarray.c:3893 storage/ipc/procarray.c:3901
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "se ha denegado el permiso para terminar el proceso"
 
-#: storage/ipc/procarray.c:3894 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid "Only roles with the %s attribute may terminate processes of roles with the %s attribute."
 msgstr "Sólo roles con el atributo %s pueden terminar procesos de roles con el atributo %s."
 
-#: storage/ipc/procarray.c:3902 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr "Sólo roles con privilegios del rol cuyo proceso está siendo terminados o con privilegios del rol «%s» pueden terminar este proceso."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr "aún esperando que el backend con PID %d acepte ProcSignalBarrier"
 
+#: storage/ipc/procsignal.c:733
+#, fuzzy, c-format
+#| msgid "invalid next transaction ID"
+msgid "invalid cancel request with PID 0"
+msgstr "el siguiente ID de transacción no es válido"
+
+#: storage/ipc/procsignal.c:788
+#, 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"
+
+#: storage/ipc/procsignal.c:797
+#, 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"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -22424,12 +23706,12 @@ msgstr "no se puede enviar un mensaje de tamaño %zu mediante la cola de memoria
 msgid "invalid message size %zu in shared memory queue"
 msgstr "tamaño no válido de mensaje %zu en cola de memoria compartida"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:984
-#: storage/lmgr/lock.c:1022 storage/lmgr/lock.c:2835 storage/lmgr/lock.c:4220
-#: storage/lmgr/lock.c:4285 storage/lmgr/lock.c:4635
-#: storage/lmgr/predicate.c:2468 storage/lmgr/predicate.c:2483
-#: storage/lmgr/predicate.c:3880 storage/lmgr/predicate.c:4927
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "memoria compartida agotada"
@@ -22459,270 +23741,287 @@ msgstr "el espacio de memoria compartida es insuficiente para la estructura «%s
 msgid "requested shared memory size overflows size_t"
 msgstr "la petición de tamaño de memoria compartida desborda size_t"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d no es un proceso servidor de PostgreSQL"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1453
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "no se pudo enviar la señal al proceso %d: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "se ha denegado el permiso para cancelar la consulta"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid "Only roles with the %s attribute may cancel queries of roles with the %s attribute."
 msgstr "Sólo roles con el atributo %s pueden cancelar consultas de roles con el atributo %s."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr "Sólo los roles con privilegios del rol «%s» pueden cancelar «autovacuum workers»."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid "Only roles with privileges of the role whose query is being canceled or with privileges of the \"%s\" role may cancel this query."
 msgstr "Sólo roles con privilegios del rol cuya consulta está siendo cancelada o con privilegios del rol «%s» pueden cancelar esta consulta."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr "no se pudo comprobar la existencia del proceso de servidor con PID %d: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "el proceso de servidor con PID %d no terminó dentro de %lld milisegundo"
-msgstr[1] "el proceso de servidor con PID %d no terminó dentro de %lld milisegundos"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural "backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "el proceso de servidor con PID %d no terminó dentro de %<PRId64> milisegundo"
+msgstr[1] "el proceso de servidor con PID %d no terminó dentro de %<PRId64> milisegundos"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "\"timeout\" no debe ser negativo"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may terminate autovacuum workers."
+msgstr "Sólo roles con privilegios del rol «%s» pueden terminar «autovacuum workers»."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "la rotación no es posible porque la recoleccion de log no está activa"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "la recuperación aún está esperando después de %ld.%03d ms: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "la recuperación terminó de esperar después de %ld.%03d ms: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3196
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, 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:921 tcop/postgres.c:2557
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transacción del usuario causó un «deadlock» con la recuperación."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "razón desconocida"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "conflicto de recuperación en «pin» de búfer"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "conflicto de recuperación en bloqueo"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "conflicto de recuperación en tablespace"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "conflicto de recuperación en snapshot"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "conflicto de recuperación en slot de replicación"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "conflicto de recuperación en deadlock de búfer"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "conflicto de recuperación en base de datos"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr "la entrada pg_largeobject para el OID %u, página %d tiene tamaño de campo %d no válido"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "opciones no válidas para abrir un objeto grande: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "permiso denegado al objeto grande %u"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "parámetro «whence» no válido: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "tamaño de petición de escritura de objeto grande no válido: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr "El proceso %d espera %s en %s; bloqueado por proceso %d."
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "Proceso %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "se ha detectado un deadlock"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "Vea el registro del servidor para obtener detalles de las consultas."
 
-#: storage/lmgr/lmgr.c:848
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se actualizaba la tupla (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:851
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se borraba la tupla (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:854
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se bloqueaba la tupla (%u,%u) de la relación «%s»"
 
-#: storage/lmgr/lmgr.c:857
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "mientras se bloqueaba la versión actualizada (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:860
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se insertaba la tupla de índice (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:863
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se verificaba la unicidad de la tupla (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:866
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se verificaba la tupla actualizada (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:869
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr "mientras se verificaba una restricción de exclusión en la tupla (%u,%u) en la relación «%s»"
 
-#: storage/lmgr/lmgr.c:1239
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1245
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "extensión de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1251
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1256
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "página %u de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1263
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "tupla (%u,%u) de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1271
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "transacción %u"
 
-#: storage/lmgr/lmgr.c:1276
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "transacción virtual %d/%u"
 
-#: storage/lmgr/lmgr.c:1282
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "token especulativo %u de la transacción %u"
 
-#: storage/lmgr/lmgr.c:1288
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "objeto %u de clase %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1296
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "“lock” de usuario [%u,%u,%u]"
 
 # XXX is this a good translation?
-#: storage/lmgr/lmgr.c:1303
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "“lock” consultivo [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1311
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "transacción remota %u de la suscripción %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:1318
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "tipo de locktag %d no reconocido"
 
-#: storage/lmgr/lock.c:812
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "no se puede adquirir “lock” en modo %s en objetos de la base de datos mientras la recuperación está en proceso"
 
-#: storage/lmgr/lock.c:814
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "Sólo “locks” RowExclusiveLock o menor pueden ser adquiridos en objetos de la base de datos durante la recuperación."
 
-#: storage/lmgr/lock.c:3284 storage/lmgr/lock.c:3352 storage/lmgr/lock.c:3468
+#: storage/lmgr/lock.c:1185
+#, fuzzy, c-format
+#| msgid "could not obtain database OID: %s"
+msgid "process %d could not obtain %s on %s"
+msgstr "no se pudo obtener el OID de base de datos: %s"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 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 “locks” a nivel de sesión y transacción simultáneamente sobre el mismo objeto"
@@ -22742,678 +24041,725 @@ msgstr "Puede ser necesario ejecutar menos transacciones al mismo tiempo, o incr
 msgid "not enough elements in RWConflictPool to record a potential read/write conflict"
 msgstr "no hay suficientes elementos en RWConflictPool para registrar un potencial conflicto read/write"
 
-#: storage/lmgr/predicate.c:1686
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr "«default_transaction_isolation» está definido a «serializable»."
 
-#: storage/lmgr/predicate.c:1687
+#: storage/lmgr/predicate.c:1697
 #, c-format
 msgid "You can use \"SET default_transaction_isolation = 'repeatable read'\" to change the default."
 msgstr "Puede usar «SET default_transaction_isolation = 'repeatable read'» para cambiar el valor por omisión."
 
-#: storage/lmgr/predicate.c:1738
+#: storage/lmgr/predicate.c:1748
 #, c-format
 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:1817 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "no se pudo importar el snapshot solicitado"
 
-#: storage/lmgr/predicate.c:1818 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "El proceso de origen con PID %d ya no está en ejecución."
 
-#: storage/lmgr/predicate.c:3991 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4060 storage/lmgr/predicate.c:4068
-#: storage/lmgr/predicate.c:4107 storage/lmgr/predicate.c:4337
-#: storage/lmgr/predicate.c:4656 storage/lmgr/predicate.c:4668
-#: storage/lmgr/predicate.c:4715 storage/lmgr/predicate.c:4751
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, 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:3993 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4062 storage/lmgr/predicate.c:4070
-#: storage/lmgr/predicate.c:4109 storage/lmgr/predicate.c:4339
-#: storage/lmgr/predicate.c:4658 storage/lmgr/predicate.c:4670
-#: storage/lmgr/predicate.c:4717 storage/lmgr/predicate.c:4753
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "La transacción podría tener éxito si es reintentada."
 
-#: storage/lmgr/proc.c:353
+#: storage/lmgr/proc.c:453
 #, 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)"
 
-#: storage/lmgr/proc.c:1546
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "el proceso %d evitó un deadlock para %s en %s reordenando la cola después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1561
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "el proceso %d detectó un deadlock mientras esperaba %s en %s después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1570
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "el proceso %d aún espera %s en %s después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1577
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "el proceso %d adquirió %s en %s después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1594
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "el proceso %d no pudo adquirir %s en %s después de %ld.%03d ms"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 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:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, 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:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "puntero de ítem corrupto: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, 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:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "puntero de ítem corrupto: desplazamiento = %u, tamaño = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "no se pudo extender el archivo «%s» más allá de %u bloques"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "no se pudo extender el archivo «%s»: %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "no se pudo extender el archivo «%s»: sólo se escribieron %d de %d bytes en el bloque %u"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "no se pudo extender el archivo «%s» con FileFallocate(): %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "no se pudo leer los bloques %u..%u del archivo «%s»: %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "no se pudo leer los bloques %u..%u del archivo «%s»: se leyeron sólo %zu de %zu bytes"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1034
+#, fuzzy, c-format
+#| msgid "could not read blocks %u..%u in file \"%s\": %m"
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "no se pudo leer los bloques %u..%u del archivo «%s»: %m"
+
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "no se pudo escribir los bloques %u..%u en el archivo «%s»: %m"
 
-#: storage/smgr/md.c:1165
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "no se pudo truncar el archivo «%s» a %u bloques: es de sólo %u bloques ahora"
 
-#: storage/smgr/md.c:1220
+#: storage/smgr/md.c:1358
 #, 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:1700
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr "no se pudo abrir el archivo «%s» (bloque buscado %u): el segmento previo sólo tiene %u bloques"
 
-#: storage/smgr/md.c:1714
+#: storage/smgr/md.c:1860
 #, 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/backend_startup.c:85
+#: storage/smgr/smgr.c:1115
+#, fuzzy, c-format
+#| msgid ", \"%s\""
+msgid "file \"%s\""
+msgstr ", «%s»"
+
+#: storage/smgr/smgr.c:1117
+#, fuzzy, c-format
+#| msgid "could not read block %u in file \"%s\": %m"
+msgid "block %u in file \"%s\""
+msgstr "no se pudo leer el bloque %u del archivo «%s»: %m"
+
+#: storage/smgr/smgr.c:1121
+#, fuzzy, c-format
+#| msgid "could not read blocks %u..%u in file \"%s\": %m"
+msgid "blocks %u..%u in file \"%s\""
+msgstr "no se pudo leer los bloques %u..%u del archivo «%s»: %m"
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "No se pudo cargar la configuración SSL en proceso secundario"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "conexión recibida: host=%s port=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "conexión recibida: host=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "el sistema de base de datos está iniciándose"
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "el sistema de bases de datos no está aceptando conexiones"
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "El modo hot standby está desactivado."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "el sistema de bases de datos aún no está aceptando conexiones"
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "Aún no se ha alcanzado un estado de recuperación consistente."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr ""
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "el sistema de bases de datos no está aceptando conexiones"
+msgid "To enable hot standby, close write transactions with more than %d subtransactions on the primary server."
+msgstr ""
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "El modo hot standby está desactivado."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "Aún no se ha alcanzado un estado de recuperación consistente."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "el sistema de base de datos está apagándose"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "el sistema de base de datos está en modo de recuperación"
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid "received direct SSL connection request without ALPN protocol negotiation extension"
 msgstr "se recibió petición de conexión SSL directa sin la extensión de negociación de protocolo ALPN"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
 msgstr "conexión SSL directa aceptada"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
 msgstr "conexión SSL directa rechazada"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "el paquete de inicio está incompleto"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "el de paquete de inicio tiene largo incorrecto"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
 msgstr "SSLRequest aceptado"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
 msgstr "SSLRequest rechazado"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "no se pudo enviar la respuesta de negociación SSL: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "se recibieron datos no cifrados después de petición SSL"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid "This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."
 msgstr "Esto podría ser un error en el software cliente o evidencia de un intento de ataque man-in-the-middle."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
 msgstr "GSSENCRequest aceptado"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
 msgstr "GSSENCRequest rechazado"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "no se pudo enviar la respuesta de negociación GSSAPI: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "se recibieron datos no cifrados después de petición de cifrado GSSAPI"
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, 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"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Los valores válidos son: «false», 0, «true», 1, «database»."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, 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"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "no se especifica un nombre de usuario en el paquete de inicio"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, fuzzy, c-format
+#| msgid "invalid length of startup packet"
+msgid "invalid length of cancel request packet"
+msgstr "el de paquete de inicio tiene largo incorrecto"
+
+#: tcop/backend_startup.c:892
+#, fuzzy, c-format
+#| msgid "invalid length of startup packet"
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "el de paquete de inicio tiene largo incorrecto"
+
+#: tcop/backend_startup.c:1022
+#, fuzzy, c-format
+#| msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
+msgid "Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr "no se puede especificar el slot de replicación lógica «%s» en el parámetro «%s»"
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "no existe la función con OID %u"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "no se puede llamar a la función «%s» mediante la interfaz fastpath"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "llamada a función fastpath: «%s» (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1369 tcop/postgres.c:1605
-#: tcop/postgres.c:2071 tcop/postgres.c:2333
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599
+#: tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "duración: %s ms"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, 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:353
+#: tcop/fastpath.c:352
 #, 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:361
+#: tcop/fastpath.c:360
 #, 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:385
+#: tcop/fastpath.c:384
 #, 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:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "el formato de datos binarios es incorrecto en argumento %d a función"
 
-#: tcop/postgres.c:467 tcop/postgres.c:5012
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "el tipo de mensaje de frontend %d no es válido"
 
-#: tcop/postgres.c:1076
+#: tcop/postgres.c:1070
 #, c-format
 msgid "statement: %s"
 msgstr "sentencia: %s"
 
-#: tcop/postgres.c:1374
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "duración: %s ms  sentencia: %s"
 
-#: tcop/postgres.c:1480
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "no se pueden insertar múltiples órdenes en una sentencia preparada"
 
-#: tcop/postgres.c:1610
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "duración: %s ms  parse: %s: %s"
 
-#: tcop/postgres.c:1677 tcop/postgres.c:2653
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "no existe una sentencia preparada sin nombre"
 
-#: tcop/postgres.c:1729
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "el mensaje de «bind» tiene %d formatos de parámetro pero %d parámetros"
 
-#: tcop/postgres.c:1735
+#: tcop/postgres.c:1729
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr "el mensaje de «bind» entrega %d parámetros, pero la sentencia preparada «%s» requiere %d"
 
-#: tcop/postgres.c:1949
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "el formato de datos binarios es incorrecto en el parámetro de «bind» %d"
 
-#: tcop/postgres.c:2076
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "duración: %s ms  bind %s%s%s: %s"
 
-#: tcop/postgres.c:2131 tcop/postgres.c:2735
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "no existe el portal «%s»"
 
-#: tcop/postgres.c:2213
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2215 tcop/postgres.c:2341
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "ejecutar fetch desde"
 
-#: tcop/postgres.c:2216 tcop/postgres.c:2342
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "ejecutar"
 
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "duración: %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2486
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "prepare: %s"
 
-#: tcop/postgres.c:2511
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "Parámetros: %s"
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "Razón para abortar: conflicto en la recuperación"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "El usuario mantuvo el búfer compartido «clavado» por demasiado tiempo."
 
-#: tcop/postgres.c:2545
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "El usuario mantuvo una relación bloqueada por demasiado tiempo."
 
-#: tcop/postgres.c:2548
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "El usuario estaba o pudo haber estado usando un tablespace que debía ser eliminado."
 
-#: tcop/postgres.c:2551
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "La consulta del usuario pudo haber necesitado examinar versiones de tuplas que debían eliminarse."
 
-#: tcop/postgres.c:2554
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "El usuario estaba usando un slot de replicación lógica que debía ser invalidado."
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "El usuario estaba conectado a una base de datos que debía ser eliminada."
 
-#: tcop/postgres.c:2599
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "portal «%s» parámetro $%d = %s"
 
-#: tcop/postgres.c:2602
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "portal «%s» parámetro $%d"
 
-#: tcop/postgres.c:2608
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "portal sin nombre, parámetro %d = %s"
 
-#: tcop/postgres.c:2611
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "portal sin nombre, parámetro %d"
 
-#: tcop/postgres.c:2955
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "terminando la conexión debido a una señal SIGQUIT inesperada"
 
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "terminando la conexión debido a una falla en otro proceso servidor"
 
-#: tcop/postgres.c:2962
+#: tcop/postgres.c:2989
 #, 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 "Postmaster ha ordenado que este proceso servidor cancele la transacción en curso y finalice la conexión, porque otro proceso servidor ha terminado anormalmente y podría haber corrompido la memoria compartida."
 
-#: tcop/postgres.c:2966 tcop/postgres.c:3219
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr "Dentro de un momento debería poder reconectarse y repetir la consulta."
 
-#: tcop/postgres.c:2973
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "terminando la conexión debido a una orden de apagado inmediato"
 
-#: tcop/postgres.c:3051
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "excepción de coma flotante"
 
-#: tcop/postgres.c:3052
+#: tcop/postgres.c:3079
 #, 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 "Se ha recibido una señal de una operación de coma flotante no válida.  Esto puede significar un resultado fuera de rango o una operación no válida, como una división por cero."
 
-#: tcop/postgres.c:3217
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "terminando la conexión debido a un conflicto con la recuperación"
 
-#: tcop/postgres.c:3289
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "cancelando la autentificación debido a que se agotó el tiempo de espera"
 
-#: tcop/postgres.c:3293
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "terminando el proceso autovacuum debido a una orden del administrador"
 
-#: tcop/postgres.c:3297
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "terminando el proceso de replicación lógica debido a una orden del administrador"
 
-#: tcop/postgres.c:3317
+#: tcop/postgres.c:3339
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "terminando el proceso walreceiver debido a una orden del administrador"
+
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "terminando la conexión debido a una orden del administrador"
 
-#: tcop/postgres.c:3348
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "se ha perdido la conexión al cliente"
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "cancelando la sentencia debido a que se agotó el tiempo de espera de “locks”"
 
-#: tcop/postgres.c:3407
+#: tcop/postgres.c:3445
 #, 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:3414
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "cancelando tarea de autovacuum"
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "cancelando la sentencia debido a una petición del usuario"
 
-#: tcop/postgres.c:3448
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "terminando la conexión debido a que se agotó el tiempo de espera para transacciones abiertas inactivas"
 
-#: tcop/postgres.c:3461
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "terminando la conexión debido a que se agotó el tiempo de espera para transacciones"
 
-#: tcop/postgres.c:3474
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "terminando la conexión debido a que se agotó el tiempo de espera para sesiones abiertas inactivas"
 
-#: tcop/postgres.c:3564
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "límite de profundidad de stack alcanzado"
-
-#: tcop/postgres.c:3565
-#, 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:3612
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "«max_stack_depth» no debe exceder %ldkB."
-
-#: tcop/postgres.c:3614
-#, 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:3637
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr "«client_connection_check_interval» debe ser 0 en esta plataforma."
 
-#: tcop/postgres.c:3658
+#: tcop/postgres.c:3569
 #, 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."
 
-#: tcop/postgres.c:3673
+#: tcop/postgres.c:3584
 #, 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."
 
-#: tcop/postgres.c:4098
+#: tcop/postgres.c:4024
 #, 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:4099 tcop/postgres.c:4105
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: tcop/postgres.c:4103
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: argumento de línea de órdenes no válido: %s"
 
-#: tcop/postgres.c:4156
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: no se ha especificado base de datos ni usuario"
 
-#: tcop/postgres.c:4909
+#: tcop/postgres.c:4275
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "no se pudo generar una llave de cancelación aleatoria"
+
+#: tcop/postgres.c:4677
+#, c-format
+msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr ""
+
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "subtipo %d de mensaje CLOSE no válido"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "subtipo %d de mensaje DESCRIBE no válido"
 
-#: tcop/postgres.c:5033
+#: tcop/postgres.c:5039
 #, 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:5037
+#: tcop/postgres.c:5043
 #, 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:5217
+#: tcop/postgres.c:5189
 #, 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"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "el mensaje de «bind» tiene %d formatos de resultado pero la consulta tiene %d columnas"
 
-#: tcop/pquery.c:942 tcop/pquery.c:1696
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "el cursor sólo se puede desplazar hacia adelante"
 
-#: tcop/pquery.c:943 tcop/pquery.c:1697
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Declárelo con SCROLL para permitirle desplazar hacia atrás."
@@ -23443,68 +24789,73 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "no se puede ejecutar %s durante una operación restringida por seguridad"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "no se puede ejecutar %s dentro de un proceso en segundo plano"
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "permiso denegado a ejecutar la sentencia %s"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "Sólo los roles con privilegios del rol «%s» pueden ejecutar esta sentencia."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS sólo puede aceptar nombres de relación en la cláusula FROM"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "parámetro DictFile duplicado"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "parámetro AffFile duplicado"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "parámetro Ispell no reconocido: «%s»"
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "falta un parámetro AffFile"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "falta un parámetro DictFile"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "parámetro Accept duplicado"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "parámetro del diccionario simple no reconocido: «%s»"
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "parámetro de sinónimo no reconocido «%s»"
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "falta un parámetro Synonyms"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de sinónimos «%s»: %m"
@@ -23582,89 +24933,84 @@ msgstr "parámetro no reconocido de tesauro: «%s»"
 msgid "missing Dictionary parameter"
 msgstr "falta un paramétro Dictionary"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:383 tsearch/spell.c:400 tsearch/spell.c:409
+#: tsearch/spell.c:1046
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "marca de afijo «%s» no válida"
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:387 tsearch/spell.c:1050
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "la marca de afijo «%s» fuera de rango"
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:417
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "caracteres no válidos en la marca de afijo «%s»"
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:437
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "marca de afijo «%s» no válida con el valor de marca «long»"
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:527
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de diccionario «%s»: %m"
 
-#: tsearch/spell.c:749 utils/adt/regexp.c:223 jsonpath_gram.y:629
+#: tsearch/spell.c:751 utils/adt/regexp.c:223 jsonpath_gram.y:631
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "la expresión regular no es válida: %s"
 
-#: tsearch/spell.c:963 tsearch/spell.c:980 tsearch/spell.c:997
-#: tsearch/spell.c:1014 tsearch/spell.c:1079 gram.y:18735 gram.y:18752
+#: tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999
+#: tsearch/spell.c:1016 tsearch/spell.c:1082 gram.y:18905 gram.y:18922
 #, c-format
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1174 tsearch/spell.c:1186 tsearch/spell.c:1751
+#: tsearch/spell.c:1756 tsearch/spell.c:1761
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "alias de afijo «%s» no válido"
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1227 tsearch/spell.c:1298 tsearch/spell.c:1447
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de afijos «%s»: %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1281
 #, c-format
 msgid "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag values"
 msgstr "el diccionario Ispell sólo permite los valores «default», «long» y «num»"
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1325
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "número no válido de alias de opciones"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1348
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "el número de aliases excede el número especificado %d"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1563
 #, 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"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "la cadena es demasiado larga para tsvector (%d bytes, máximo %d bytes)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:191
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "línea %d del archivo de configuración «%s»: «%s»"
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "conversión desde un wchar_t a la codificación del servidor falló: %m"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -23677,12 +25023,12 @@ msgstr "la palabra es demasiado larga para ser indexada"
 msgid "Words longer than %d characters are ignored."
 msgstr "Las palabras más largas que %d caracteres son ignoradas."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "nombre de configuración de búsqueda en texto «%s» no válido"
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de stopwords «%s»: %m"
@@ -23699,13 +25045,11 @@ msgstr "parámetro de encabezado (headline) no reconocido: «%s»"
 
 #: tsearch/wparser_def.c:2674
 #, c-format
-#| msgid "%s must be in range %d..%d"
 msgid "%s must be less than %s"
 msgstr "%s debe ser menor que %s"
 
 #: tsearch/wparser_def.c:2678
 #, c-format
-#| msgid "COST must be positive"
 msgid "%s must be positive"
 msgstr "%s debe ser positivo"
 
@@ -23714,42 +25058,102 @@ msgstr "%s debe ser positivo"
 msgid "%s must be >= 0"
 msgstr "%s debe ser >= 0"
 
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo permanente de estadísticas «%s»: %m"
 
-#: utils/activity/pgstat.c:1255
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "tipo de estadísticas no válido: «%s»"
 
-#: utils/activity/pgstat.c:1335
+#: utils/activity/pgstat.c:1471
+#, fuzzy, c-format
+#| msgid "custom resource manager name is invalid"
+msgid "custom cumulative statistics name is invalid"
+msgstr "el nombre de gestor de recursos personalizado no es válido"
+
+#: utils/activity/pgstat.c:1472
+#, fuzzy, c-format
+#| msgid "Provide a non-empty name for the custom resource manager."
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "Provea un nombre no vacío para el gestor de recursos personalizado."
+
+#: utils/activity/pgstat.c:1475
+#, fuzzy, c-format
+#| msgid "custom resource manager ID %d is out of range"
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr "el ID %d de gestor de recursos está fuera de rango"
+
+#: utils/activity/pgstat.c:1476
+#, fuzzy, c-format
+#| msgid "Provide a custom resource manager ID between %d and %d."
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr "Provea un ID de gestor de recursos personalizado entre %d y %d."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, fuzzy, c-format
+#| msgid "failed to register custom resource manager \"%s\" with ID %d"
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr "no se pudo registrar un gestor de recursos personalizado «%s» con ID %d"
+
+#: utils/activity/pgstat.c:1482
+#, fuzzy, c-format
+#| msgid "Custom resource manager must be registered while initializing modules in \"shared_preload_libraries\"."
+msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
+msgstr "El gestor de recursos personalizado debe ser registrado en «shared_preload_libraries» al inicializar módulos."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr ""
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
+msgstr ""
+
+#: utils/activity/pgstat.c:1509
+#, fuzzy, c-format
+#| msgid "Custom resource manager \"%s\" already registered with the same ID."
+msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr "El gestor de recursos «%s» ya está registrado con el mismo ID."
+
+#: utils/activity/pgstat.c:1522
+#, fuzzy, c-format
+#| msgid "Existing resource manager with ID %d has the same name."
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr "El gestor de recursos con ID %d tiene el mismo nombre."
+
+#: utils/activity/pgstat.c:1528
+#, fuzzy, c-format
+#| msgid "registered custom resource manager \"%s\" with ID %d"
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr "se registró el gestor de recursos «%s» con ID %d"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "no se pudo abrir el archivo temporal de estadísticas «%s»: %m"
 
-#: utils/activity/pgstat.c:1455
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "no se pudo escribir el archivo temporal de estadísticas «%s»: %m"
 
-#: utils/activity/pgstat.c:1464
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo temporal de estadísticas «%s»: %m"
 
-#: utils/activity/pgstat.c:1472
-#, 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"
-
-#: utils/activity/pgstat.c:1521
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de estadísticas «%s»: %m"
 
-#: utils/activity/pgstat.c:1683
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "el archivo de estadísticas «%s» está corrupto"
@@ -23759,199 +25163,205 @@ msgstr "el archivo de estadísticas «%s» está corrupto"
 msgid "function call to dropped function"
 msgstr "invocación a una función eliminada"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
+#, fuzzy, c-format
+#| msgid "Failed while allocating a WAL reading processor."
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "Falló mientras se emplazaba un procesador de lectura de WAL."
+
+#: utils/activity/pgstat_xact.c:366
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "reseteando estadísticas existentes para el tipo %s, db=%u, oid=%u"
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "reseteando estadísticas existentes para el tipo %s, db=%u, oid=%<PRIu64>"
 
-#: utils/activity/wait_event.c:207 utils/activity/wait_event.c:232
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
 msgid "wait event \"%s\" already exists in type \"%s\""
 msgstr "ya existe un “wait event” llamado «%s» en el tipo «%s»"
 
-#: utils/activity/wait_event.c:246
+#: utils/activity/wait_event.c:245
 #, c-format
 msgid "too many custom wait events"
 msgstr "demasiados “wait events” definidos por el usuario"
 
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "el identificador es demasiado largo"
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "El identificador debe ser menor a %d caracteres."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "palabra clave no reconocida: «%s»"
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "Palabra clave de ACL debe ser «group» o «user»."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "falta un nombre"
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "Debe venir un nombre después de una palabra clave «group» o «user»."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "falta un signo «=»"
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "carácter de modo no válido: debe ser uno de «%s»"
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "debe venir un nombre después del signo «/»"
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "usando el cedente por omisión con ID %u"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "el array ACL contiene tipo de datos incorrecto"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "los array de ACL debe ser unidimensional"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "los arrays de ACL no pueden contener valores nulos"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "basura extra al final de la especificación de la ACL"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "la opción de grant no puede ser otorgada de vuelta a quien la otorgó"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert ya no está soportado"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove ya no está soportado"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "tipo de privilegio no reconocido: «%s»"
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "no existe la función «%s»"
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "debe ser capaz de hacer SET ROLE «%s»"
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:118 utils/adt/array_userfuncs.c:565
+#: utils/adt/array_userfuncs.c:942 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, 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:107
+#: utils/adt/array_userfuncs.c:123
 #, c-format
 msgid "input data type is not an array"
 msgstr "el tipo de entrada no es un array"
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800
 #: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
 #: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
 #: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
 #: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
 #: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1917 utils/adt/numeric.c:4454
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143
+#: utils/adt/varlena.c:3195 utils/adt/varlena.c:4129
 #, c-format
 msgid "integer out of range"
 msgstr "entero fuera de rango"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:174 utils/adt/array_userfuncs.c:259
 #, 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:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:410
+#: utils/adt/array_userfuncs.c:447 utils/adt/array_userfuncs.c:476
+#: utils/adt/array_userfuncs.c:504
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "no se pueden concatenar arrays incompatibles"
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:372
 #, 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:335
+#: utils/adt/array_userfuncs.c:411
 #, 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:372
+#: utils/adt/array_userfuncs.c:448
 #, 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:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:477 utils/adt/array_userfuncs.c:505
 #, 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:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5622
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059
+#: utils/adt/arrayfuncs.c:5628 utils/adt/arrayfuncs.c:5634
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "no se pueden acumular arrays de distinta dimensionalidad"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1348 utils/adt/array_userfuncs.c:1502
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "no está soportada la búsqueda de elementos en arrays multidimensionales"
 
-#: utils/adt/array_userfuncs.c:1301
+#: utils/adt/array_userfuncs.c:1377
 #, c-format
 msgid "initial position must not be null"
 msgstr "la posición inicial no debe ser null"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1750
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "el tamaño de la muestra debe estar entre 0 y %d"
@@ -24036,7 +25446,7 @@ msgstr "Elemento de array inesperado."
 msgid "Specified array dimensions do not match array contents."
 msgstr "Las dimensiones del array especificadas no coinciden con el contenido del array."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2598
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "Los arrays multidimensionales deben tener sub-arrays con dimensiones coincidentes."
@@ -24047,14 +25457,14 @@ msgid "Incorrectly quoted array element."
 msgstr "Elemento de array entrecomillado incorrectamente."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "Fin inesperado de la entrada."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3499
-#: utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6120
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "número incorrecto de dimensiones: %d"
@@ -24070,7 +25480,7 @@ msgid "binary data has array element type %u (%s) instead of expected %u (%s)"
 msgstr "los datos binarios tienen el tipo de elemento de array %u (%s) en lugar del esperado %u (%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3098
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "no hay una función binaria de entrada para el tipo %s"
@@ -24081,7 +25491,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:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3131
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "no hay una función binaria de salida para el tipo %s"
@@ -24093,11 +25503,11 @@ msgstr "no está implementada la obtención de segmentos de arrays de largo fijo
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6092
-#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6129
-#: utils/adt/json.c:1433 utils/adt/json.c:1505 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4710 utils/adt/jsonfuncs.c:4863
-#: utils/adt/jsonfuncs.c:4974 utils/adt/jsonfuncs.c:5022
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:6132 utils/adt/arrayfuncs.c:6143
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "número incorrecto de subíndices del array"
@@ -24133,90 +25543,90 @@ msgstr "Cuando se asigna a un segmento de un array vacío, los bordes del segmen
 msgid "source array too small"
 msgstr "el array de origen es demasiado pequeño"
 
-#: utils/adt/arrayfuncs.c:3657
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "los arrays con elementos null no son permitidos en este contexto"
 
-#: utils/adt/arrayfuncs.c:3828 utils/adt/arrayfuncs.c:3999
-#: utils/adt/arrayfuncs.c:4390
+#: utils/adt/arrayfuncs.c:3840 utils/adt/arrayfuncs.c:4011
+#: utils/adt/arrayfuncs.c:4402
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "no se pueden comparar arrays con elementos de distintos tipos"
 
-#: utils/adt/arrayfuncs.c:4177 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2806
+#: utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, 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:4305 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4317 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "no se pudo identificar una función de hash extendida para el tipo %s"
 
-#: utils/adt/arrayfuncs.c:5506
+#: utils/adt/arrayfuncs.c:5518
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "el tipo %s no es un array"
 
-#: utils/adt/arrayfuncs.c:5561
+#: utils/adt/arrayfuncs.c:5573
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "no se pueden acumular arrays nulos"
 
-#: utils/adt/arrayfuncs.c:5589
+#: utils/adt/arrayfuncs.c:5601
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "no se pueden acumular arrays vacíos"
 
-#: utils/adt/arrayfuncs.c:5990 utils/adt/arrayfuncs.c:6030
+#: utils/adt/arrayfuncs.c:6004 utils/adt/arrayfuncs.c:6044
 #, 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:6093 utils/adt/arrayfuncs.c:6119
+#: utils/adt/arrayfuncs.c:6107 utils/adt/arrayfuncs.c:6133
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "El array de dimensiones debe ser unidimensional."
 
-#: utils/adt/arrayfuncs.c:6098 utils/adt/arrayfuncs.c:6124
+#: utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "los valores de dimensión no pueden ser null"
 
-#: utils/adt/arrayfuncs.c:6130
+#: utils/adt/arrayfuncs.c:6144
 #, 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:6411
+#: utils/adt/arrayfuncs.c:6425
 #, 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:6688
+#: utils/adt/arrayfuncs.c:6702
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "los umbrales deben ser un array unidimensional"
 
-#: utils/adt/arrayfuncs.c:6693
+#: utils/adt/arrayfuncs.c:6707
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "el array de umbrales no debe contener nulos"
 
-#: utils/adt/arrayfuncs.c:6926
+#: utils/adt/arrayfuncs.c:6940
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "el número de elementos a recortar debe estar entre 0 y %d"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "los subíndices de arrays deben tener tipo entero"
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "subíndice de array en asignación no puede ser nulo"
@@ -24247,21 +25657,21 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "la conversión de codificación de %s a ASCII no está soportada"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:354 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
 #: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:803 utils/adt/numeric.c:7221
-#: utils/adt/numeric.c:7424 utils/adt/numeric.c:8371 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:323
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
@@ -24272,23 +25682,23 @@ msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
 msgid "money out of range"
 msgstr "money fuera de rango"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:723 utils/adt/float.c:99
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
 #: utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039
 #: utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167
 #: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
 #: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
-#: utils/adt/numeric.c:3191 utils/adt/numeric.c:3214 utils/adt/numeric.c:3299
-#: utils/adt/numeric.c:3317 utils/adt/numeric.c:3413 utils/adt/numeric.c:8920
-#: utils/adt/numeric.c:9233 utils/adt/numeric.c:9581 utils/adt/numeric.c:9697
-#: utils/adt/numeric.c:11208 utils/adt/timestamp.c:3713
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "división por cero"
 
 #: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
 #: utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "el valor «%s» está fuera de rango para el tipo %s"
@@ -24303,186 +25713,188 @@ msgstr "«char» fuera de rango"
 msgid "could not compute %s hash: %s"
 msgstr "no se pudo calcular el hash %s: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "el modificador de tipo no es válido"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, 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:82
+#: utils/adt/date.c:83
 #, 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:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172
+#: utils/adt/formatting.c:4181 utils/adt/formatting.c:4286
+#: utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "fecha fuera de rango: «%s»"
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2554
 #, c-format
 msgid "date out of range"
 msgstr "fecha fuera de rango"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "valor en campo de fecha fuera de rango: %d-%02d-%02d"
 
-#: utils/adt/date.c:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "fecha fuera de rango: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "no se pueden restar fechas infinitas"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "fecha fuera de rango para timestamp"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "unidades «%s» no soportada para el tipo %s"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "unidad «%s» no reconocida para el tipo %s"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2574
-#: utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4017 utils/adt/formatting.c:4053
+#: utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2576
+#: utils/adt/xml.c:2583 utils/adt/xml.c:2603 utils/adt/xml.c:2610
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp fuera de rango"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "hora fuera de rango"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "valor en campo de hora fuera de rango: %d:%02d:%02g"
 
-#: utils/adt/date.c:2020
+#: utils/adt/date.c:2085
 #, c-format
 msgid "cannot convert infinite interval to time"
 msgstr "no se puede convertir intervalo infinito a time"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
 #, c-format
 msgid "cannot add infinite interval to time"
 msgstr "no se puede sumar intervalo infinito a time"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
 #, c-format
 msgid "cannot subtract infinite interval from time"
 msgstr "no se pueden restar intervalo infinito de time"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2595
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682
+#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "tamaño «preceding» o «following» no válido en ventana deslizante"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "desplazamiento de huso horario fuera de rango"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
 msgstr "el intervalo de huso horario «%s» debe ser finito"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, 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:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "el huso horario «%s» no es reconocido"
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "valor de hora/fecha fuera de rango: «%s»"
 
-#: utils/adt/datetime.c:4110
-#, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
+#: utils/adt/datetime.c:4232
+#, fuzzy, c-format
+#| msgid "Perhaps you need a different \"datestyle\" setting."
+msgid "Perhaps you need a different \"DateStyle\" setting."
 msgstr "Quizás necesite una configuración diferente de «datestyle»."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "valor de interval fuera de rango: «%s»"
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "desplazamiento de huso horario fuera de rango: «%s»"
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, 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»."
@@ -24492,17 +25904,22 @@ msgstr "Este nombre de huso horario aparece en el archivo de configuración para
 msgid "invalid Datum pointer"
 msgstr "puntero a Datum no válido"
 
-#: utils/adt/dbsize.c:764 utils/adt/dbsize.c:840
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "no existe el tablespace con OID %u"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "tamaño no válido: «%s»"
 
-#: utils/adt/dbsize.c:841
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "Nombre de unidad de tamaño no válido: «%s»."
 
-#: utils/adt/dbsize.c:842
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
 msgstr "Unidades aceptables son «bytes«, «B», «kB», «MB», «GB», «TB» y «PB»."
@@ -24527,40 +25944,40 @@ msgstr "el resultado de la conversión de codificación es demasiado grande"
 msgid "result of decoding conversion is too large"
 msgstr "el resultado de la conversión de decodificación es demasiado grande"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "dígito hexadecimal no válido: «%.*s»"
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "el dato hexadecimal no es válido: tiene un número impar de dígitos"
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "«=» inesperado mientras se decodificaba la secuencia base64"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "se encontró símbolo no válido «%.*s» al decodificar secuencia base64"
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "secuencia de término base64 no válida"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 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:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:659
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374 jsonpath_gram.y:266
-#: jsonpath_gram.y:598 jsonpath_scan.l:640 jsonpath_scan.l:651
-#: jsonpath_scan.l:661 jsonpath_scan.l:712
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:341 utils/adt/varlena.c:382 jsonpath_gram.y:268
+#: jsonpath_gram.y:600 jsonpath_scan.l:617 jsonpath_scan.l:628
+#: jsonpath_scan.l:638 jsonpath_scan.l:690
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "sintaxis de entrada no válida para tipo %s"
@@ -24597,351 +26014,368 @@ msgstr "no se pudo determinar el tipo enum efectivo"
 msgid "enum %s contains no values"
 msgstr "el enum %s no contiene valores"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "valor fuera de rango: desbordamiento"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "valor fuera de rango: desbordamiento por abajo"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, 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:482
+#: utils/adt/float.c:489
 #, 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:1247 utils/adt/float.c:1321 utils/adt/int.c:355
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355
 #: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
 #: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4593 utils/adt/numeric.c:4598
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4104
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint fuera de rango"
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3709 utils/adt/numeric.c:10112
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, 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:1515 utils/adt/numeric.c:3997 utils/adt/numeric.c:4109
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "cero elevado a una potencia negativa es indefinido"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:4001 utils/adt/numeric.c:11003
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, 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:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3909
-#: utils/adt/numeric.c:10783
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "no se puede calcular logaritmo de cero"
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3847
-#: utils/adt/numeric.c:3904 utils/adt/numeric.c:10787
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, 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:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "la entrada está fuera de rango"
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1857
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "count debe ser mayor que cero"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1868
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, 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:4011 utils/adt/numeric.c:1873
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "los límites inferior y superior deben ser finitos"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1887
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "el límite superior no puede ser igual al límite inferior"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "especificación de formato no válida para un valor de interval"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 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:1161
+#: utils/adt/formatting.c:1197
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "«EEEE» debe ser el último patrón usado"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1205
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "«9» debe ir antes de «PR»"
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1221
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "«0» debe ir antes de «PR»"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1248
 #, c-format
 msgid "multiple decimal points"
 msgstr "hay múltiples puntos decimales"
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1252 utils/adt/formatting.c:1339
 #, 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:1228
+#: utils/adt/formatting.c:1264
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "no se puede usar «S» dos veces"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1268
 #, 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:1252
+#: utils/adt/formatting.c:1288
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "no se puede usar «S» y «MI» simultáneamente"
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1298
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "no se puede usar «S» y «PL» simultáneamente"
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1308
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "no se puede usar «S» y «SG» simultáneamente"
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1317
 #, 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:1307
+#: utils/adt/formatting.c:1326
+#, fuzzy, c-format
+#| msgid "cannot use \"S\" twice"
+msgid "cannot use \"RN\" twice"
+msgstr "no se puede usar «S» dos veces"
+
+#: utils/adt/formatting.c:1347
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "no se puede usar «EEEE» dos veces"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1353
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "«EEEE» es incompatible con otros formatos"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1354
 #, 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:1398
+#: utils/adt/formatting.c:1363
+#, fuzzy, c-format
+#| msgid "\"EEEE\" is incompatible with other formats"
+msgid "\"RN\" is incompatible with other formats"
+msgstr "«EEEE» es incompatible con otros formatos"
+
+#: utils/adt/formatting.c:1364
+#, fuzzy, c-format
+#| msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "«EEEE» sólo puede ser usado en conjunción con patrones de dígitos y puntos decimales."
+
+#: utils/adt/formatting.c:1445
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "separador de formato «datetime» no válido: «%s»"
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1572
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "«%s» no es un número"
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "falló la conversión de mayúsculas: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1653 utils/adt/formatting.c:1717
+#: utils/adt/formatting.c:1781 utils/adt/formatting.c:1845
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr "no se pudo determinar qué ordenamiento usar para la función %s"
 
-#: utils/adt/formatting.c:2410
+#: utils/adt/formatting.c:1853
+#, fuzzy, c-format
+#| msgid "Unicode categorization can only be performed if server encoding is UTF8"
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr "la categorización Unicode sólo puede ser hecha si la codificación de servidor es UTF8"
+
+#: utils/adt/formatting.c:2150
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "combinación no válida de convenciones de fecha"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2151
 #, 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:2433
+#: utils/adt/formatting.c:2173
 #, 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:2435
+#: utils/adt/formatting.c:2175
 #, 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:2502
+#: utils/adt/formatting.c:2242
 #, 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:2504
+#: utils/adt/formatting.c:2244
 #, 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:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2246 utils/adt/formatting.c:2260
 #, 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:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269
+#: utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "el valor «%s» no es válido para «%s»"
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2258
 #, 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:2531
+#: utils/adt/formatting.c:2271
 #, c-format
 msgid "Value must be an integer."
 msgstr "El valor debe ser un entero."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, 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:2538
+#: utils/adt/formatting.c:2278
 #, 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:2752
+#: utils/adt/formatting.c:2492
 #, 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:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2728
+#: utils/adt/formatting.c:2748 utils/adt/formatting.c:2768
+#: utils/adt/formatting.c:2787 utils/adt/formatting.c:2806
+#: utils/adt/formatting.c:2830 utils/adt/formatting.c:2848
+#: utils/adt/formatting.c:2866 utils/adt/formatting.c:2884
+#: utils/adt/formatting.c:2901 utils/adt/formatting.c:2918
 #, c-format
 msgid "localized string format value too long"
 msgstr "cadena traducida en cadena de formato es demasiado larga"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3198
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "separador de formato «%c» desemparejado"
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3259
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "carácter de formato «%s» desemparejado"
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3392
 #, c-format
 msgid "Time zone abbreviation is not recognized."
 msgstr "La abreviatura de huso horario no es reconocida."
 
-#: utils/adt/formatting.c:3853
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "cadena de entrada no válida para «Y,YYY»"
-
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "cadena de entrada muy corta para formato de fecha/hora"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "quedan caracteres al final de la cadena de entrada después del formato fecha/hora"
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "falta el huso horario en la cadena de entrada para el tipo timestamptz"
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz fuera de rango"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "el formato de fecha/hora tiene huso horario pero no hora"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "falta el huso horario en la cadena de entrada del tipo timetz"
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz fuera de rango"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "el formato de fecha/hora no tiene fecha ni hora"
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4534
 #, 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:4788
+#: utils/adt/formatting.c:4536
 #, 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:4900
+#: utils/adt/formatting.c:4713
 #, 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:5852
+#: utils/adt/formatting.c:5834
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "«EEEE» no está soportado en la entrada"
 
-#: utils/adt/formatting.c:5864
-#, c-format
-msgid "\"RN\" not supported for input"
-msgstr "«RN» no está soportado en la entrada"
+#: utils/adt/formatting.c:6111
+#, fuzzy, c-format
+#| msgid "invalid schema name"
+msgid "invalid Roman numeral"
+msgstr "nombre de esquema no válido"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -24953,9 +26387,9 @@ msgstr "no se permiten rutas absolutas"
 msgid "path must be in or below the data directory"
 msgstr "la ruta debe estar en o debajo del directorio de datos"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:855
+#: utils/adt/oracle_compat.c:1158
 #, c-format
 msgid "requested length too large"
 msgstr "el tamaño solicitado es demasiado grande"
@@ -24970,11 +26404,6 @@ msgstr "no se pudo posicionar (seek) el archivo «%s»: %m"
 msgid "file length too large"
 msgstr "el tamaño del archivo es demasiado grande"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "no existe el tablespace con OID %u"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -25026,8 +26455,8 @@ msgstr "debe pedir al menos 2 puntos"
 msgid "invalid int2vector data"
 msgstr "datos de int2vector no válidos"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1765
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "el tamaño de paso no puede ser cero"
@@ -25041,9 +26470,9 @@ msgstr "el tamaño de paso no puede ser cero"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4542
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4154
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint fuera de rango"
@@ -25053,49 +26482,49 @@ msgstr "bigint fuera de rango"
 msgid "OID out of range"
 msgstr "OID fuera de rango"
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, 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:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, 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:1067 utils/adt/json.c:1266 utils/adt/json.c:1449
-#: utils/adt/json.c:1527 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, 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:1117 utils/adt/json.c:1288
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "valor de llave de objeto JSON duplicado: %s"
 
-#: utils/adt/json.c:1226 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "la lista de argumentos debe tener un número par de elementos"
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1228 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "El argumento de %s debe consistir de llaves y valores alternados."
 
-#: utils/adt/json.c:1427 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "un array debe tener dos columnas"
 
-#: utils/adt/json.c:1516 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "las dimensiones de array no coinciden"
 
-#: utils/adt/json.c:1702 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "valor de llavo del objeto JSON duplicado"
@@ -25160,23 +26589,23 @@ msgstr "no se puede convertir un objeto jsonb a tipo %s"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "no se puede convertir un array u objeto jsonb a tipo %s"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "el número de pares en objeto jsonb excede el máximo permitido (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "el número de elementos del array jsonb excede el máximo permitido (%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "el tamaño total de los elementos del array jsonb excede el máximo de %d bytes"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "el tamaño total de los elementos del objeto jsonb excede el máximo de %d bytes"
@@ -25211,215 +26640,215 @@ msgstr "subíndice jsonb debe tener tipo text"
 msgid "jsonb subscript in assignment must not be null"
 msgstr "subíndice jsonb en asignación no puede ser nulo"
 
-#: utils/adt/jsonfuncs.c:583 utils/adt/jsonfuncs.c:830
-#: utils/adt/jsonfuncs.c:2439 utils/adt/jsonfuncs.c:3015
-#: utils/adt/jsonfuncs.c:3948 utils/adt/jsonfuncs.c:4295
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "no se puede invocar %s en un escalar"
 
-#: utils/adt/jsonfuncs.c:588 utils/adt/jsonfuncs.c:815
-#: utils/adt/jsonfuncs.c:3017 utils/adt/jsonfuncs.c:3935
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "no se puede invocar %s en un array"
 
-#: utils/adt/jsonfuncs.c:647 jsonpath_scan.l:607
+#: utils/adt/jsonfuncs.c:649 jsonpath_scan.l:584
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "secuencia de escape Unicode no soportado"
 
-#: utils/adt/jsonfuncs.c:724
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "Datos JSON, línea %d: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1883 utils/adt/jsonfuncs.c:1920
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "no se puede obtener el largo de array de un escalar"
 
-#: utils/adt/jsonfuncs.c:1887 utils/adt/jsonfuncs.c:1906
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "no se puede obtener el largo de array de un no-array"
 
-#: utils/adt/jsonfuncs.c:1986
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "no se puede invocar %s en un no-objeto"
 
-#: utils/adt/jsonfuncs.c:2174
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "no se puede desconstruir un array como un objeto"
 
-#: utils/adt/jsonfuncs.c:2188
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "no se puede desconstruir un escalar"
 
-#: utils/adt/jsonfuncs.c:2233
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "no se pueden extraer elementos de un escalar"
 
-#: utils/adt/jsonfuncs.c:2237
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "no se pudo extraer elementos de un objeto"
 
-#: utils/adt/jsonfuncs.c:2424 utils/adt/jsonfuncs.c:4173
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "no se puede invocar %s en un no-array"
 
-#: utils/adt/jsonfuncs.c:2515 utils/adt/jsonfuncs.c:2520
-#: utils/adt/jsonfuncs.c:2538 utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "se esperaba un array JSON"
 
-#: utils/adt/jsonfuncs.c:2516
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "Vea el valor de la llave «%s»."
 
-#: utils/adt/jsonfuncs.c:2539
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "Vea el elemento %s de la llave «%s»."
 
-#: utils/adt/jsonfuncs.c:2545
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "Veo el elemento de array %s."
 
-#: utils/adt/jsonfuncs.c:2597
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "array JSON mal formado"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3647
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "el primer argumento de %s debe ser un tipo de registro"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3671
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "no se pudo determinar el tipo de dato para el resultado de %s"
 
-#: utils/adt/jsonfuncs.c:3673
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid "Provide a non-null record argument, or call the function in the FROM clause using a column definition list."
 msgstr "Provea un argumento de registro no-nulo, o invoque la función en la cláusula FROM usando una lista de definición de columnas."
 
-#: utils/adt/jsonfuncs.c:4059 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, 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"
 
-#: utils/adt/jsonfuncs.c:4190 utils/adt/jsonfuncs.c:4274
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "el argumento de %s debe ser un array de objetos"
 
-#: utils/adt/jsonfuncs.c:4223
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "no se puede invocar %s en un objeto"
 
-#: utils/adt/jsonfuncs.c:4656 utils/adt/jsonfuncs.c:4715
-#: utils/adt/jsonfuncs.c:4795
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "no se puede eliminar de un escalar"
 
-#: utils/adt/jsonfuncs.c:4800
+#: utils/adt/jsonfuncs.c:4824
 #, 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:4868 utils/adt/jsonfuncs.c:5027
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "no se puede definir una ruta en un escalar"
 
-#: utils/adt/jsonfuncs.c:4909 utils/adt/jsonfuncs.c:4951
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid "null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\""
 msgstr "null_value_treatment debe ser «delete_key», «return_target», «use_json_null», o «raise_exception»"
 
-#: utils/adt/jsonfuncs.c:4922
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "valor JSON no debe ser null"
 
-#: utils/adt/jsonfuncs.c:4923
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid "Exception was raised because null_value_treatment is \"raise_exception\"."
 msgstr "Una excepción fue lanzada porque null_value_treatment es «raise_exception»."
 
-#: utils/adt/jsonfuncs.c:4924
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid "To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed."
 msgstr "Para impedir esto, puede cambiar el argumento null_value_treatment o asegurarse que no se pase un nulo SQL."
 
-#: utils/adt/jsonfuncs.c:4979
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "no se puede eliminar una ruta en un escalar"
 
-#: utils/adt/jsonfuncs.c:5193
+#: utils/adt/jsonfuncs.c:5217
 #, 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:5212 utils/adt/jsonfuncs.c:5243
-#: utils/adt/jsonfuncs.c:5316
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "no se puede reemplazar una llave existente"
 
-#: utils/adt/jsonfuncs.c:5213 utils/adt/jsonfuncs.c:5244
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr "La ruta asume que la llave es un objeto compuesto, pero es un valor escalar."
 
-#: utils/adt/jsonfuncs.c:5317
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "Intente usar la función jsonb_set para reemplazar el valor de la llave."
 
-#: utils/adt/jsonfuncs.c:5421
+#: utils/adt/jsonfuncs.c:5445
 #, 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/jsonfuncs.c:5438
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "el elemento de ruta en la posición %d está fuera de rango: %d"
 
-#: utils/adt/jsonfuncs.c:5590
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "indicador de tipo errónea, sólo se permiten arrays y tipos escalares"
 
-#: utils/adt/jsonfuncs.c:5597
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "elemento del array de opciones no es un string"
 
-#: utils/adt/jsonfuncs.c:5598 utils/adt/jsonfuncs.c:5620
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid "Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"."
 msgstr "Los valores posibles son: «string», «numeric», «boolean», «key» y «all»."
 
-#: utils/adt/jsonfuncs.c:5618
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "indicador erróneo en array de indicadores: «%s»"
@@ -25434,222 +26863,203 @@ msgstr "@ no es permitido en expresiones raíz"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST sólo está permitido en subíndices de array"
 
-#: utils/adt/jsonpath_exec.c:491
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "se esperaba un único resultado booleano"
 
-#: utils/adt/jsonpath_exec.c:851
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr "el método de acceso comodín de array jsonpath sólo puede aplicarse a un array"
 
-#: utils/adt/jsonpath_exec.c:874
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr "el método de acesso comodín de objeto jsonpath sólo puede aplicarse a un objeto"
 
-#: utils/adt/jsonpath_exec.c:923
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "subíndice de array jsonpath fuera de los bordes"
 
-#: utils/adt/jsonpath_exec.c:980
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr "el método de acceso de array jsonpath sólo puede aplicarse a un array"
 
-#: utils/adt/jsonpath_exec.c:1044
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "el objeto JSON no contiene la llave «%s»"
 
-#: utils/adt/jsonpath_exec.c:1056
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr "el método de acceso a un miembro jsonpath sólo puede aplicarse a un objeto"
 
-#: utils/adt/jsonpath_exec.c:1114
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicase a un array"
 
-#: utils/adt/jsonpath_exec.c:1167 utils/adt/jsonpath_exec.c:1193
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type double precision"
-msgstr "el argumento «%s» del método de item jsonpath .%s() no es válido para el tipo de precisión doble"
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
+#, fuzzy, c-format
+#| msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "el argumento «%s» del método de item jsonpath .%s() es inválido para el tipo bigint"
 
-#: utils/adt/jsonpath_exec.c:1172 utils/adt/jsonpath_exec.c:1198
-#: utils/adt/jsonpath_exec.c:1414 utils/adt/jsonpath_exec.c:1446
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
+#: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
 msgstr "NaN o infinito no son permitidos para el método de ítem jsonpath .%s()"
 
-#: utils/adt/jsonpath_exec.c:1211 utils/adt/jsonpath_exec.c:1313
-#: utils/adt/jsonpath_exec.c:1455 utils/adt/jsonpath_exec.c:1593
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicarse a un valor numérico o de cadena"
 
-#: utils/adt/jsonpath_exec.c:1281 utils/adt/jsonpath_exec.c:1305
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr "el argumento «%s» del método de item jsonpath .%s() es inválido para el tipo bigint"
-
-#: utils/adt/jsonpath_exec.c:1357 utils/adt/jsonpath_exec.c:1377
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr "el argumento «%s» del método de item jsonpath .%s() no es válido para el tipo booleano"
-
-#: utils/adt/jsonpath_exec.c:1386
+#: utils/adt/jsonpath_exec.c:1385
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, or numeric value"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicarse a un valor booleano, de cadena o numérico"
 
-#: utils/adt/jsonpath_exec.c:1439 utils/adt/jsonpath_exec.c:1528
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
-msgstr "el argumento «%s» del método de item jsonpath .%s() no es válido para el tipo numeric"
-
-#: utils/adt/jsonpath_exec.c:1487
+#: utils/adt/jsonpath_exec.c:1486
 #, c-format
 msgid "precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "la precisión del método de item jsonpath .%s() está fuera de rango para el tipo integer"
 
-#: utils/adt/jsonpath_exec.c:1501
+#: utils/adt/jsonpath_exec.c:1500
 #, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
 msgstr "la escala del método de item jsonpath .%s() está fuera de rango para el tipo integer"
 
-#: utils/adt/jsonpath_exec.c:1561 utils/adt/jsonpath_exec.c:1585
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr "el argumento «%s» del método de item jsonpath .%s() no es válido para el tipo integer"
-
-#: utils/adt/jsonpath_exec.c:1648
+#: utils/adt/jsonpath_exec.c:1647
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, numeric, or datetime value"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicarse a un valor boolean, datetime, numérico o de cadena"
 
-#: utils/adt/jsonpath_exec.c:2137
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr "el operando izquierdo del operador jsonpath %s no es un valor numérico escalar"
 
-#: utils/adt/jsonpath_exec.c:2144
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr "el operando derecho del operador jsonpath %s no es un valor numérico escalar"
 
-#: utils/adt/jsonpath_exec.c:2212
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr "el operando del operador jsonpath unario %s no es un valor numérico"
 
-#: utils/adt/jsonpath_exec.c:2311
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicarse a un valor numérico"
 
-#: utils/adt/jsonpath_exec.c:2357
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "el método de ítem jsonpath .%s() sólo puede aplicase a una cadena"
 
-#: utils/adt/jsonpath_exec.c:2450
+#: utils/adt/jsonpath_exec.c:2449
 #, c-format
 msgid "time precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "la precisión de tiempo del método de item jsonpath .%s() está fuera de rango para el tipo integer"
 
-#: utils/adt/jsonpath_exec.c:2484 utils/adt/jsonpath_exec.c:2490
-#: utils/adt/jsonpath_exec.c:2517 utils/adt/jsonpath_exec.c:2545
-#: utils/adt/jsonpath_exec.c:2598 utils/adt/jsonpath_exec.c:2649
-#: utils/adt/jsonpath_exec.c:2720
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
 #, c-format
 msgid "%s format is not recognized: \"%s\""
 msgstr "formato de %s no se reconoce: «%s»"
 
-#: utils/adt/jsonpath_exec.c:2486
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr "Use un argumento de patrón fecha/hora para especificar el formato de entrada del dato."
 
-#: utils/adt/jsonpath_exec.c:2679 utils/adt/jsonpath_exec.c:2760
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
 #, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
 msgstr "la precisión de tiempo del método de item jsonpath .%s() no es válida"
 
-#: utils/adt/jsonpath_exec.c:2840
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "el método de ítem jsonpath .%s() sólo puede ser aplicado a un objeto"
 
-#: utils/adt/jsonpath_exec.c:3124
+#: utils/adt/jsonpath_exec.c:3123
 #, c-format
 msgid "could not convert value of type %s to jsonpath"
 msgstr "no se pudo convertir el valor de tipo %s a jsonpath"
 
-#: utils/adt/jsonpath_exec.c:3158
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "no se pudo encontrar la variable jsonpath «%s»"
 
-#: utils/adt/jsonpath_exec.c:3211
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "el argumento «vars» no es un objeto"
 
-#: utils/adt/jsonpath_exec.c:3212
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
 msgstr "Los parámetros jsonpath deben codificarse como pares llave-valor del objeto «vars»."
 
-#: utils/adt/jsonpath_exec.c:3475
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "el subíndice de array jsonpath no es un único valor numérico"
 
-#: utils/adt/jsonpath_exec.c:3487
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "subíndice de array jsonpath fuera del rango entero"
 
-#: utils/adt/jsonpath_exec.c:3671
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "no se puede convertir el valor de %s a %s sin uso de huso horario"
 
-#: utils/adt/jsonpath_exec.c:3673
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "Utilice una función *_tz() para el soporte de huso horario."
 
-#: utils/adt/jsonpath_exec.c:3981
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
-#| msgid "JSON path expression for column \"%s\" should return single item without wrapper"
 msgid "JSON path expression for column \"%s\" must return single item when no wrapper is requested"
 msgstr "la expresión de ruta JSON para la columna «%s» debe retornar un único elemento cuando no se pide un “wrapper”"
 
-#: utils/adt/jsonpath_exec.c:3983 utils/adt/jsonpath_exec.c:3988
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
 msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
 msgstr "Use la cláusula WITH WRAPPER para envolver elementos SQL/JSON en un array."
 
-#: utils/adt/jsonpath_exec.c:3987
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
-#| msgid "JSON path expression in JSON_QUERY should return single item without wrapper"
 msgid "JSON path expression in JSON_QUERY must return single item when no wrapper is requested"
 msgstr "la expresión de ruta en JSON_QUERY debe retornar un único elemento cuando no se pide un “wrapper”"
 
-#: utils/adt/jsonpath_exec.c:4045 utils/adt/jsonpath_exec.c:4069
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
-#| msgid "JSON path expression for column \"%s\" should return single scalar item"
 msgid "JSON path expression for column \"%s\" must return single scalar item"
 msgstr "la expresión de ruta JSON para la columna «%s» debe retornar un único elemento escalar"
 
-#: utils/adt/jsonpath_exec.c:4050 utils/adt/jsonpath_exec.c:4074
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
-#| msgid "JSON path expression in JSON_VALUE should return single scalar item"
 msgid "JSON path expression in JSON_VALUE must return single scalar item"
 msgstr "la expresión de ruta JSON en JSON_VALUE debe retornar un único elemento escalar"
 
@@ -25658,42 +27068,44 @@ msgstr "la expresión de ruta JSON en JSON_VALUE debe retornar un único element
 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:159
-#, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "los ordenamientos no determinísticos no están soportados para LIKE"
+#: utils/adt/like.c:162
+#, fuzzy, c-format
+#| msgid "could not determine which collation to use for ILIKE"
+msgid "could not determine which collation to use for LIKE"
+msgstr "no se pudo determinar qué ordenamiento (collation) usar para ILIKE"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "no se pudo determinar qué ordenamiento (collation) usar para ILIKE"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "los ordenamientos no determinísticos no están soportados para ILIKE"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "el patrón de LIKE debe no terminar con un carácter de escape"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:801
 #, c-format
 msgid "invalid escape string"
 msgstr "cadena de escape no válida"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:802
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "La cadena de escape debe ser vacía o un carácter."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, 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/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "no está soportada la comparación con expresiones regulares en bytea"
@@ -25713,7 +27125,7 @@ msgstr "datos macaddr8 fuera de rango para convertir a macaddr"
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr "Sólo las direcciones que tienen FF y FF como valores en el cuarto y quinto bytes desde la izquierda, por ejemplo xx:xx:xx:ff:fe:xx:xx:xx se pueden convertir de macaddr8 a macaddr."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d no es un proceso servidor de PostgreSQL"
@@ -25810,12 +27222,12 @@ msgstr "Se esperaba inicio de rango."
 msgid "Expected comma or end of multirange."
 msgstr "Se esperaba una coma o el final del multirango."
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "no se puede construir multirangos a partir de arrays multidimensionales"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "valores de multirango no pueden contener miembros nulos"
@@ -25830,8 +27242,8 @@ msgstr "valor cidr no válido: «%s»"
 msgid "Value has bits set to right of mask."
 msgstr "El valor tiene bits definidos a la derecha de la máscara"
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "no se pudo dar formato al valor inet: %m"
@@ -25859,167 +27271,167 @@ msgstr "largo no válido en valor «%s» externo"
 msgid "invalid external \"cidr\" value"
 msgstr "valor externo «cidr» no válido"
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "largo de máscara no válido: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "no se pudo dar formato al valor cidr: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "no se pueden mezclar direcciones de familias diferentes"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "no se puede hacer AND entre valores inet de distintos tamaños"
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "no se puede hacer OR entre valores inet de distintos tamaños"
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "el resultado está fuera de rango"
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "no se puede sustraer valores inet de distintos tamaños"
 
-#: utils/adt/numeric.c:793 utils/adt/numeric.c:3659 utils/adt/numeric.c:7216
-#: utils/adt/numeric.c:7419 utils/adt/numeric.c:7891 utils/adt/numeric.c:10586
-#: utils/adt/numeric.c:11061 utils/adt/numeric.c:11155
-#: utils/adt/numeric.c:11290
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "el valor excede el formato numeric"
 
-#: utils/adt/numeric.c:1106
+#: utils/adt/numeric.c:1108
 #, 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:1112
+#: utils/adt/numeric.c:1114
 #, 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:1121
+#: utils/adt/numeric.c:1123
 #, 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:1336 utils/adt/numeric.c:1350
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, 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:1341
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "escala NUMERIC %d debe estar entre %d y %d"
 
-#: utils/adt/numeric.c:1359
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "modificador de tipo NUMERIC no es válido"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "el valor de inicio no puede ser NaN"
 
-#: utils/adt/numeric.c:1729
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "el valor de inicio no puede ser infinito"
 
-#: utils/adt/numeric.c:1736
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "el valor de término no puede ser NaN"
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "el valor de término no puede ser infinito"
 
-#: utils/adt/numeric.c:1753
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "el tamaño de paso no puede ser NaN"
 
-#: utils/adt/numeric.c:1757
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "el tamaño de paso no puede ser infinito"
 
-#: utils/adt/numeric.c:3649
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "el factorial de un número negativo es indefinido"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "el límite inferior no puede ser NaN"
 
-#: utils/adt/numeric.c:4260
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "el límite inferior no puede ser infinito"
 
-#: utils/adt/numeric.c:4267
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "el límite superior no puede ser NaN"
 
-#: utils/adt/numeric.c:4271
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "el límite superior no puede ser infinito"
 
-#: utils/adt/numeric.c:4432 utils/adt/numeric.c:4520 utils/adt/numeric.c:4580
-#: utils/adt/numeric.c:4776
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "no se puede convertir NaN a %s"
 
-#: utils/adt/numeric.c:4436 utils/adt/numeric.c:4524 utils/adt/numeric.c:4584
-#: utils/adt/numeric.c:4780
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "no se puede convertir infinito a %s"
 
-#: utils/adt/numeric.c:4789
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn fuera de rango"
 
-#: utils/adt/numeric.c:7981 utils/adt/numeric.c:8032
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "desbordamiento de campo numeric"
 
-#: utils/adt/numeric.c:7982
+#: utils/adt/numeric.c:8086
 #, 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:8033
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "Un campo con precisión %d, escala %d no puede contener un valor infinito."
 
-#: utils/adt/numeric.c:11359 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
@@ -26030,27 +27442,27 @@ msgstr "el límite inferior debe ser menor o igual al límite superior"
 msgid "invalid oidvector data"
 msgstr "datos de oidvector no válidos"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:992
 #, c-format
 msgid "requested character too large"
 msgstr "el carácter solicitado es demasiado grande"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1036
 #, c-format
 msgid "character number must be positive"
 msgstr "el número de carácter debe ser positivo"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1040
 #, c-format
 msgid "null character not permitted"
 msgstr "el carácter nulo no está permitido"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1058 utils/adt/oracle_compat.c:1111
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "el carácter pedido es demasiado largo para el encoding: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1099
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "el carácter pedido no es válido para el encoding: %u"
@@ -26061,145 +27473,150 @@ msgstr "el carácter pedido no es válido para el encoding: %u"
 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:326 utils/adt/pg_locale.c:358
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "el nombre de configuración regional «%s» contiene caracteres no ASCII"
 
-#: utils/adt/pg_locale.c:1507
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr "no se pudo abrir el «collator» para la configuración regional «%s» con reglas «%s»: %s"
-
-#: utils/adt/pg_locale.c:1518 utils/adt/pg_locale.c:2992
-#: utils/adt/pg_locale.c:3065
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU no está soportado en este servidor"
-
-#: utils/adt/pg_locale.c:1546
-#, 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:1549
-#, 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:1670
-#, 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:1717
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "la “collation” «%s» no tiene versión actual, pero una versión fue registrada"
 
-#: utils/adt/pg_locale.c:1723
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "el ordenamiento (collation) «%s» tiene una discordancia de versión"
 
-#: utils/adt/pg_locale.c:1725
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr "El ordenamiento en la base de datos fue creado usando la versión %s, pero el sistema operativo provee la versión %s."
 
-#: utils/adt/pg_locale.c:1728
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr "Reconstruya todos los objetos afectados por este ordenamiento y ejecute ALTER COLLATION %s REFRESH VERSION, o construya PostgreSQL con la versión correcta de la biblioteca."
 
-#: utils/adt/pg_locale.c:1772 utils/adt/pg_locale.c:2556
-#: utils/adt/pg_locale.c:2581
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "nombre de configuración regional «%s» no válido para el proveedor builtin"
 
-#: utils/adt/pg_locale.c:1814
-#, c-format
-msgid "could not load locale \"%s\""
-msgstr "no se pudo cargar la configuración regional «%s»"
-
-#: utils/adt/pg_locale.c:1839
+#: utils/adt/pg_locale.c:1590
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
-msgstr "no se pudo obtener la versión de «collation» para la configuración regional «%s»: código de error %lu"
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "no se pudo convertir el nombre de configuración regional «%s» a etiqueta de lenguaje: %s"
 
-#: utils/adt/pg_locale.c:1895 utils/adt/pg_locale.c:1908
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "no se pudo convertir la cadena a UTF-16: código de error %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU no está soportado en este servidor"
 
-#: utils/adt/pg_locale.c:1920
+#: utils/adt/pg_locale.c:1632
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "no se pudieron comparar las cadenas Unicode: %m"
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "no se pudo obtener el lenguaje de la configuración regional ICU «%s»: %s"
 
-#: utils/adt/pg_locale.c:2094
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
-msgid "collation failed: %s"
-msgstr "el ordenamiento falló: %s"
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
+msgstr "Par desactivar la validación ICU de configuración regional, defina «%s» a «%s»."
 
-#: utils/adt/pg_locale.c:2313 utils/adt/pg_locale.c:2345
+#: utils/adt/pg_locale.c:1662
 #, c-format
-msgid "sort key generation failed: %s"
-msgstr "la generación de la llave de ordenamiento falló: %s"
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "el locale ICU «%s» tiene lenguaje desconocido «%s»"
 
-#: utils/adt/pg_locale.c:2635
+#: utils/adt/pg_locale_icu.c:264
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "no se pudo el lenguaje de la configuración regional «%s»: %s"
 
-#: utils/adt/pg_locale.c:2656 utils/adt/pg_locale.c:2672
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
 #, c-format
 msgid "could not open collator for locale \"%s\": %s"
 msgstr "no se pudo abrir el «collator» para la configuración regional «%s»: %s"
 
-#: utils/adt/pg_locale.c:2697
+#: utils/adt/pg_locale_icu.c:374
 #, c-format
-msgid "encoding \"%s\" not supported by ICU"
-msgstr "la codificación «%s» no estæ soportada por ICU"
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr "no se pudo abrir el «collator» para la configuración regional «%s» con reglas «%s»: %s"
 
-#: utils/adt/pg_locale.c:2704
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
-msgid "could not open ICU converter for encoding \"%s\": %s"
-msgstr "no se pudo abrir el conversor ICU para la codificación «%s»: %s"
+msgid "collation failed: %s"
+msgstr "el ordenamiento falló: %s"
 
-#: utils/adt/pg_locale.c:2722 utils/adt/pg_locale.c:2741
-#: utils/adt/pg_locale.c:2797 utils/adt/pg_locale.c:2808
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
+#, c-format
+msgid "sort key generation failed: %s"
+msgstr "la generación de la llave de ordenamiento falló: %s"
+
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653
+#: utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
 msgid "%s failed: %s"
 msgstr "%s falló: %s"
 
-#: utils/adt/pg_locale.c:2983
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "no se pudo convertir el nombre de configuración regional «%s» a etiqueta de lenguaje: %s"
+msgid "case conversion failed: %s"
+msgstr "falló la conversión de mayúsculas: %s"
 
-#: utils/adt/pg_locale.c:3024
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "no se pudo obtener el lenguaje de la configuración regional ICU «%s»: %s"
+msgid "encoding \"%s\" not supported by ICU"
+msgstr "la codificación «%s» no estæ soportada por ICU"
 
-#: utils/adt/pg_locale.c:3026 utils/adt/pg_locale.c:3055
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr "Par desactivar la validación ICU de configuración regional, defina «%s» a «%s»."
+msgid "could not open ICU converter for encoding \"%s\": %s"
+msgstr "no se pudo abrir el conversor ICU para la codificación «%s»: %s"
 
-#: utils/adt/pg_locale.c:3053
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "el locale ICU «%s» tiene lenguaje desconocido «%s»"
+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:3204
+#: utils/adt/pg_locale_libc.c:683
+#, c-format
+msgid "could not load locale \"%s\""
+msgstr "no se pudo cargar la configuración regional «%s»"
+
+#: utils/adt/pg_locale_libc.c:708
+#, c-format
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr "no se pudo obtener la versión de «collation» para la configuración regional «%s»: código de error %lu"
+
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
+#, c-format
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "no se pudo convertir la cadena a UTF-16: código de error %lu"
+
+#: utils/adt/pg_locale_libc.c:793
+#, c-format
+msgid "could not compare Unicode strings: %m"
+msgstr "no se pudieron comparar las cadenas Unicode: %m"
+
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "no se pudo crear la configuración regional «%s»: %m"
+
+#: utils/adt/pg_locale_libc.c:828
+#, 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_libc.c:1000
 #, 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:3205
+#: utils/adt/pg_locale_libc.c:1001
 #, 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."
@@ -26214,27 +27631,27 @@ msgstr "no se puede sumar NaN a bigint"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "no se puede restar NaN de pg_lsn"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr "la función sólo puede invocarse cuando el servidor está en modo de actualización binaria"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "nombre de orden no válido: «%s»"
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1909
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "destino de reset no reconocido: «%s»"
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1910
 #, c-format
 msgid "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\", or \"wal\"."
 msgstr "El destino debe ser «archiver», «bgwriter», «checkpointer», «io», «recovery_prefetch», «slru» o «wal»."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2027
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "OID de suscripción %u no válido"
@@ -26259,72 +27676,72 @@ msgstr "no se puede aceptar un valor de un tipo inconcluso"
 msgid "cannot display a value of a shell type"
 msgstr "no se puede desplegar un valor de un tipo inconcluso"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, 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:1021
+#: utils/adt/rangetypes.c:1023
 #, 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:1082
+#: utils/adt/rangetypes.c:1084
 #, 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:1757
+#: utils/adt/rangetypes.c:1821
 #, 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:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "opciones de bordes de rango no válidas"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Los valores aceptables son «[]», «[)», «(]» y «()»."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "literal de rango mal formado: «%s»"
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Basura a continuación de la palabra «empty»."
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Falta paréntesis o corchete izquierdo."
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Coma faltante después del límite inferior."
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "Demasiadas comas."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Basura después del paréntesis o corchete derecho."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2065 utils/adt/varlena.c:4486
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "la expresión regular falló: %s"
@@ -26339,33 +27756,33 @@ msgstr "opción de expresión regular no válida: «%.*s»"
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr "Si su intención era usar regexp_replace() con un parámetro de inicio, convierta el cuarto argumento a integer explícitamente."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6820 utils/misc/guc.c:6854
+#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1151
+#: utils/adt/regexp.c:1215 utils/adt/regexp.c:1224 utils/adt/regexp.c:1233
+#: utils/adt/regexp.c:1242 utils/adt/regexp.c:1922 utils/adt/regexp.c:1931
+#: utils/adt/regexp.c:1940 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "valor no válido para el parámetro «%s»: %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:948
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr "la expresión regular SQL no puede contener más de dos separadores escape-comilla doble"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1162 utils/adt/regexp.c:1253 utils/adt/regexp.c:1340
+#: utils/adt/regexp.c:1379 utils/adt/regexp.c:1767 utils/adt/regexp.c:1822
+#: utils/adt/regexp.c:1951
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s no soporta la opción «global»"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1381
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "En su lugar, utilice la función regexp_matches."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1569
 #, c-format
 msgid "too many regular expression matches"
 msgstr "demasiadas coincidencias de la expresión regular"
@@ -26380,18 +27797,18 @@ msgstr "existe más de una función llamada «%s»"
 msgid "more than one operator named %s"
 msgstr "existe más de un operador llamado %s"
 
-#: utils/adt/regproc.c:670 gram.y:8992
+#: utils/adt/regproc.c:670 gram.y:9100
 #, c-format
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: utils/adt/regproc.c:671 gram.y:8993
+#: utils/adt/regproc.c:671 gram.y:9101
 #, 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:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10509
-#: utils/adt/ruleutils.c:10722
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
@@ -26402,7 +27819,7 @@ msgid "Provide two argument types for operator."
 msgstr "Provea dos tipos de argumento para un operador."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3492 utils/adt/varlena.c:3497
 #, c-format
 msgid "invalid name syntax"
 msgstr "la sintaxis de nombre no es válida"
@@ -26427,83 +27844,101 @@ msgstr "se esperaba un nombre de tipo"
 msgid "improper type name"
 msgstr "el nombre de tipo no es válido"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, 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:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, 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:2036
+#: utils/adt/ri_triggers.c:2192
 #, 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:2042
+#: utils/adt/ri_triggers.c:2198
 #, 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:2048
+#: utils/adt/ri_triggers.c:2204
 #, 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:2071
+#: utils/adt/ri_triggers.c:2227
 #, 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:2073
+#: utils/adt/ri_triggers.c:2229
 #, 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."
 
-#: utils/adt/ri_triggers.c:2103 gram.y:4340
+#: utils/adt/ri_triggers.c:2259 gram.y:4454
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL no está implementada"
 
-#: utils/adt/ri_triggers.c:2426
+#: utils/adt/ri_triggers.c:2599
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr "la consulta de integridad referencial en «%s» de la restricción «%s» en «%s» entregó un resultado inesperado"
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Esto probablemente es causado por una regla que reescribió la consulta."
 
-#: utils/adt/ri_triggers.c:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr "eliminar la partición «%s» viola la llave foránea «%s»"
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "La llave (%s)=(%s) todavía es referida desde la tabla «%s»."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "La llave (%s)=(%s) no está presente en la tabla «%s»."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "La llave no está presente en la tabla «%s»."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, fuzzy, c-format
+#| msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
+msgid "update or delete on table \"%s\" violates RESTRICT setting of foreign key constraint \"%s\" on table \"%s\""
+msgstr "update o delete en «%s» viola la llave foránea «%s» en la tabla «%s»"
+
+#: utils/adt/ri_triggers.c:2792
+#, fuzzy, c-format
+#| msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "La llave (%s)=(%s) todavía es referida desde la tabla «%s»."
+
+#: utils/adt/ri_triggers.c:2795
+#, fuzzy, c-format
+#| msgid "Key is still referenced from table \"%s\"."
+msgid "Key is referenced from table \"%s\"."
+msgstr "La llave todavía es referida desde la tabla «%s»."
+
+#: utils/adt/ri_triggers.c:2801
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
 msgstr "update o delete en «%s» viola la llave foránea «%s» en la tabla «%s»"
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "La llave todavía es referida desde la tabla «%s»."
@@ -26554,146 +27989,177 @@ msgstr "los datos binarios tienen tipo %u (%s) en lugar del esperado %u (%s) en
 msgid "improper binary format in record column %d"
 msgstr "formato binario incorrecto en la columna record %d"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, 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:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, 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:2694
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "la entrada es una consulta, no una expresión"
 
-#: utils/adt/ruleutils.c:2706
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "la expresión contiene variables de más de una relación"
 
-#: utils/adt/ruleutils.c:2713
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "la expresión contiene variables"
 
-#: utils/adt/ruleutils.c:5246
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "la regla «%s» tiene el tipo de evento no soportado %d"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, fuzzy, c-format
+#| msgid "cannot define statistics for relation \"%s\""
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "no se puede definir estadísticas para la relación «%s»"
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr ""
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr ""
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr ""
+
+#: utils/adt/tid.c:381
+#, fuzzy, c-format
+#| msgid "only one default namespace is allowed"
+msgid "only one select rule is allowed in views"
+msgstr "sólo se permite un espacio de nombres predeterminado"
+
+#: utils/adt/timestamp.c:130
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "la precisión de TIMESTAMP(%d)%s no debe ser negativa"
 
-#: utils/adt/timestamp.c:134
+#: utils/adt/timestamp.c:136
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "la precisión de TIMESTAMP(%d)%s fue reducida al máximo permitido, %d"
 
-#: utils/adt/timestamp.c:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp fuera de rango: «%s»"
+
+#: utils/adt/timestamp.c:396
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "la precisión de timestamp(%d) debe estar entre %d y %d"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "Los husos horarios numéricos deben tener «-» o «+» como su primer carácter."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "huso horario numérico «%s» fuera de rango"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, c-format
 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:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "el timestamp no puede ser NaN"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "timestamp fuera de rango: «%g»"
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "interval fuera de rango"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "modificador de tipo INTERVAL no válido"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "la precisión de INTERVAL(%d) no debe ser negativa"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "la precisión de INTERVAL(%d) fue reducida al máximo permitido, %d"
 
-#: utils/adt/timestamp.c:1506
+#: utils/adt/timestamp.c:1497
 #, 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:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "origen fuera de rango"
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
 #, c-format
 msgid "timestamps cannot be binned into infinite intervals"
 msgstr "no se puede aproximar (bin) timestamps hacia intervalos infinitos"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr "no se puede aproximar (bin) timestamps hacia intervalos que contengan meses o años"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "el intervalo de paso (stride) debe ser mayor que cero"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "Los meses usualmente tienen semanas fraccionales."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "el tamaño de paso no puede ser infinito"
@@ -26768,32 +28234,32 @@ msgstr "la consulta de búsqueda en texto contiene sólo stopwords o no contiene
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "consulta ts_rewrite debe retornar dos columnas tsquery"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "el array de pesos debe ser unidimensional"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "el array de pesos es muy corto"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "los arrays de pesos no deben contener valores nulos"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "peso fuera de rango"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "la palabra es demasiado larga (%ld, máximo %ld bytes)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "la cadena es demasiado larga para tsvector (%ld bytes, máximo %ld bytes)"
@@ -26873,7 +28339,7 @@ msgstr "no hay carácter escapado: «%s»"
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "información posicional incorrecta en tsvector: «%s»"
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "no se pudo generar valores aleatorios"
@@ -26918,9 +28384,9 @@ msgstr "el largo no es válido en cadena de bits externa"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "la cadena de bits es demasiado larga para el tipo bit varying(%d)"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919
+#: utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3113
+#: utils/adt/varlena.c:3191
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "no se permite un largo negativo de subcadena"
@@ -26945,7 +28411,7 @@ msgstr "no se puede hacer XOR entre cadenas de bits de distintos tamaños"
 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:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3395
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "el nuevo bit debe ser 0 o 1"
@@ -26960,92 +28426,93 @@ msgstr "el valor es demasiado largo para el tipo character(%d)"
 msgid "value too long for type character varying(%d)"
 msgstr "el valor es demasiado largo para el tipo character varying(%d)"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1602
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "no se pudo determinar qué ordenamiento usar para la comparación de cadenas"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1875
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "los ordenamientos no determinísticos no están soportados para búsquedas de sub-cadenas"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3279 utils/adt/varlena.c:3346
 #, 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:3252 utils/adt/varlena.c:3324
-#, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "el índice %lld está fuera de rango, 0..%lld"
+#: utils/adt/varlena.c:3310 utils/adt/varlena.c:3382
+#, fuzzy, c-format
+#| msgid "index %d out of valid range, 0..%d"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "el índice %d está fuera de rango [0..%d]"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4598
 #, c-format
 msgid "field position must not be zero"
 msgstr "la posición del campo no debe ser cero"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5843
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "especificador de tipo inconcluso en format()"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5844 utils/adt/varlena.c:5978 utils/adt/varlena.c:6099
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "Para un «%%» solo, use «%%%%»."
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:5976 utils/adt/varlena.c:6097
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "especificador de tipo no reconocido «%.*s» en format()"
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:5989 utils/adt/varlena.c:6046
 #, c-format
 msgid "too few arguments for format()"
 msgstr "muy pocos argumentos para format()"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6142 utils/adt/varlena.c:6324
 #, c-format
 msgid "number is out of range"
 msgstr "el número está fuera de rango"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6205 utils/adt/varlena.c:6233
 #, 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:6013
+#: utils/adt/varlena.c:6226
 #, 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:6058
+#: utils/adt/varlena.c:6271
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "los valores nulos no pueden ser formateados como un identificador SQL"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6479
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr "la normalización Unicode sólo puede ser hecha si la codificación de servidor es UTF8"
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6492
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "forma de normalización no válida: %s"
 
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6537
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr "la categorización Unicode sólo puede ser hecha si la codificación de servidor es UTF8"
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6754 utils/adt/varlena.c:6789 utils/adt/varlena.c:6824
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "punto de código Unicode no válido: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6854
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr "Los escapes Unicode deben ser \\XXXX, \\+XXXXXX, \\uXXXX o \\UXXXXXXXX."
@@ -27061,8 +28528,9 @@ msgid "argument of nth_value must be greater than zero"
 msgstr "el argumento de nth_value debe ser mayor que cero"
 
 #: utils/adt/xid8funcs.c:120
-#, c-format
-msgid "transaction ID %llu is in the future"
+#, fuzzy, c-format
+#| msgid "transaction ID %llu is in the future"
+msgid "transaction ID %<PRIu64> is in the future"
 msgstr "el ID de transacción %llu está en el futuro"
 
 #: utils/adt/xid8funcs.c:522
@@ -27080,7 +28548,7 @@ msgstr "característica XML no soportada"
 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:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:628
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "nombre de codificación «%s» no válido"
@@ -27095,157 +28563,162 @@ msgstr "comentario XML no válido"
 msgid "not an XML document"
 msgstr "no es un documento XML"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "instrucción de procesamiento XML no válida"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, 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:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "la instrucción de procesamiento XML no puede contener «?>»."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate no está implementado"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "no se pudo inicializar la biblioteca XML"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2 tiene un tipo char incompatible: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "no se pudo instalar un gestor de errores XML"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, 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:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "Valor de carácter no válido."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "Se requiere un espacio."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone acepta sólo 'yes' y 'no'."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "Declaración mal formada: falta la versión."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "Falta especificación de codificación en declaración de texto."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Procesando declaración XML: se esperaba '?>'."
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Código de error libxml no reconocido: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2555
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML no soporta valores infinitos de fecha."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2577 utils/adt/xml.c:2604
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML no soporta valores infinitos de timestamp."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3020
 #, c-format
 msgid "invalid query"
 msgstr "consulta no válido"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3112
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "el portal «%s» no retorna tuplas"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4364
 #, 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:4363
+#: utils/adt/xml.c:4365
 #, 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:4387
+#: utils/adt/xml.c:4389
 #, c-format
 msgid "empty XPath expression"
 msgstr "expresion XPath vacía"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4441
 #, 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:4446
+#: utils/adt/xml.c:4448
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "no se pudo registrar un espacio de nombres XML llamado «%s» con URI «%s»"
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4797
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "el espacio de nombres DEFAULT no está soportado"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4826
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "el «path» de filtro de registros no debe ser la cadena vacía"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4860
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "el «path» de filtro de columna no debe ser la cadena vacía"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5007
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "la expresión XPath de columna retornó más de un valor"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, 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»"
+
+#: utils/cache/lsyscache.c:1109
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "no existe la conversión del tipo %s al tipo %s"
 
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3027 utils/cache/lsyscache.c:3060
+#: utils/cache/lsyscache.c:3093 utils/cache/lsyscache.c:3126
 #, c-format
 msgid "type %s is only a shell"
 msgstr "el tipo %s está inconcluso"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3032
 #, c-format
 msgid "no input function available for type %s"
 msgstr "no hay una función de entrada para el tipo %s"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3065
 #, c-format
 msgid "no output function available for type %s"
 msgstr "no hay una función de salida para el tipo %s"
@@ -27255,32 +28728,27 @@ msgstr "no hay una función de salida para el tipo %s"
 msgid "operator class \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "falta la función de soporte %3$d para el tipo %4$s de la clase de operadores «%1$s» del método de acceso %2$s"
 
-#: utils/cache/plancache.c:747
-#, 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:3801
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "el valor de relfilenumber de heap no se definió en modo de actualización binaria"
 
-#: utils/cache/relcache.c:3809
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "petición inesperada de un nuevo relfilenode en modo de actualización binaria"
 
-#: utils/cache/relcache.c:6539
+#: utils/cache/relcache.c:6633
 #, 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:6541
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Prosiguiendo de todas maneras, pero hay algo mal."
 
-#: utils/cache/relcache.c:6871
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo de cache «%s»: %m"
@@ -27300,7 +28768,7 @@ msgstr "el archivo de mapeo de relaciones «%s» contiene datos no válidos"
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "el archivo de mapeo de relaciones «%s» tiene una suma de verificación incorrecta"
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "el tipo record no ha sido registrado"
@@ -27315,194 +28783,186 @@ msgstr "TRAP: ExceptionalCondition: argumentos erróneos en PID %d\n"
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "TRAP: falló Assert(«%s»), Archivo «%s», Línea %d, PID %d\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "ocurrió un error antes de que el procesamiento de errores esté disponible\n"
 
-#: utils/error/elog.c:2134
+#: utils/error/elog.c:2142
 #, 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:2147
+#: utils/error/elog.c:2155
 #, 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:2183
-#, c-format
-msgid "Invalid character"
+#: utils/error/elog.c:2191
+#, fuzzy, c-format
+#| msgid "Invalid character"
+msgid "Invalid character."
 msgstr "Carácter no válido"
 
-#: utils/error/elog.c:2889 utils/error/elog.c:2916 utils/error/elog.c:2932
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[desconocido]"
 
-#: utils/error/elog.c:3202 utils/error/elog.c:3526 utils/error/elog.c:3633
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "falta un texto de mensaje de error"
 
-#: utils/error/elog.c:3205 utils/error/elog.c:3208
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " en carácter %d"
 
-#: utils/error/elog.c:3218 utils/error/elog.c:3225
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "DETALLE:  "
 
-#: utils/error/elog.c:3232
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "HINT:  "
 
-#: utils/error/elog.c:3239
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "CONSULTA:  "
 
-#: utils/error/elog.c:3246
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "CONTEXTO:  "
 
-#: utils/error/elog.c:3256
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "UBICACIÓN:  %s, %s:%d\n"
 
-#: utils/error/elog.c:3263
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "UBICACIÓN:  %s:%d\n"
 
-#: utils/error/elog.c:3270
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "BACKTRACE:  "
 
-#: utils/error/elog.c:3282
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "SENTENCIA:  "
 
-#: utils/error/elog.c:3678
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3682
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3685
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3688
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: utils/error/elog.c:3692
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "WARNING"
 
-#: utils/error/elog.c:3695
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "ERROR"
 
-#: utils/error/elog.c:3698
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3701
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "PANIC"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "no se pudo encontrar la función «%s» en el archivo «%s»"
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "no se pudo cargar la biblioteca «%s»: %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "biblioteca «%s» incompatible: no se encuentra el bloque mágico"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, 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:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "biblioteca «%s» incompatible: versión no coincide"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "Versión del servidor %d, versión de biblioteca %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "biblioteca «%s» incompatible: ABI no coincide"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "El servidor tiene ABI «%s», la librería tiene «%s»."
 
-#: utils/fmgr/dfmgr.c:361
-#, 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:370
-#, 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:379
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
+#, fuzzy, c-format
+#| msgid "Server has NAMEDATALEN = %d, library has %d."
+msgid "Server has %s = %d, library has %d."
 msgstr "El servidor tiene NAMEDATALEN = %d, la librería tiene %d"
 
-#: utils/fmgr/dfmgr.c:388
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "El servidor tiene FLOAT8PASSBYVAL = %s, la librería tiene %s"
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
+#, fuzzy, c-format
+#| msgid "Server has ABI \"%s\", library has \"%s\"."
+msgid "Server has %s = %s, library has %s."
+msgstr "El servidor tiene ABI «%s», la librería tiene «%s»."
 
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 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:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "biblioteca «%s» incompatible: bloque mágico no coincide"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "no está permitido el acceso a la biblioteca «%s»"
 
-#: utils/fmgr/dfmgr.c:501
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
+#: utils/fmgr/dfmgr.c:554
+#, fuzzy, c-format
+#| msgid "invalid macro name in dynamic library path: %s"
+msgid "invalid macro name in path: %s"
 msgstr "el nombre de macro no es válido en la ruta a biblioteca dinámica: %s"
 
-#: utils/fmgr/dfmgr.c:541
-#, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
+#: utils/fmgr/dfmgr.c:606
+#, fuzzy, c-format
+#| msgid "zero-length component in parameter \"dynamic_library_path\""
+msgid "zero-length component in parameter \"%s\""
 msgstr "se encontró componente de largo cero en el parámetro «dynamic_library_path»"
 
-#: utils/fmgr/dfmgr.c:560
-#, 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"
-
 #: utils/fmgr/fmgr.c:236
 #, c-format
 msgid "internal function \"%s\" is not in internal lookup table"
@@ -27558,345 +29018,449 @@ msgstr "no se entregó alias de columna"
 msgid "could not determine row description for function returning record"
 msgstr "no se pudo encontrar descripción de registro de función que retorna record"
 
-#: utils/init/miscinit.c:353
+#: utils/init/miscinit.c:265
+#, fuzzy
+#| msgid "unknown reason"
+msgid "unknown process type"
+msgstr "razón desconocida"
+
+#: utils/init/miscinit.c:270
+#, fuzzy
+#| msgid "could not initialize globals"
+msgid "not initialized"
+msgstr "no se pudo inicializar las globales"
+
+#: utils/init/miscinit.c:273
+#, fuzzy
+#| msgid "archiver process"
+msgid "archiver"
+msgstr "proceso de archivado"
+
+#: utils/init/miscinit.c:276
+#, fuzzy
+#| msgid "autovacuum launcher process"
+msgid "autovacuum launcher"
+msgstr "proceso lanzador de autovacuum"
+
+#: utils/init/miscinit.c:279
+#, fuzzy
+#| msgid "Autovacuum"
+msgid "autovacuum worker"
+msgstr "autovacuum worker"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "backend de cliente"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr ""
+
+#: utils/init/miscinit.c:288
+#, fuzzy
+#| msgid "background worker \"%s\""
+msgid "background worker"
+msgstr "proceso ayudante"
+
+#: utils/init/miscinit.c:291
+#, fuzzy
+#| msgid "background writer process"
+msgid "background writer"
+msgstr "proceso background writer"
+
+#: utils/init/miscinit.c:294
+#, fuzzy
+#| msgid "checkpointer process"
+msgid "checkpointer"
+msgstr "proceso checkpointer"
+
+#: utils/init/miscinit.c:300
+#, fuzzy
+#| msgid "unlogged"
+msgid "logger"
+msgstr "unlogged"
+
+#: utils/init/miscinit.c:303
+#, fuzzy
+#| msgid "slot sync worker process"
+msgid "slotsync worker"
+msgstr "proceso sincronizador de slot"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr ""
+
+#: utils/init/miscinit.c:309
+#, fuzzy
+#| msgid "starting up"
+msgid "startup"
+msgstr "iniciando"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr ""
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr ""
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr ""
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr ""
+
+#: utils/init/miscinit.c:358
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "no existe el directorio de datos «%s»"
 
-#: utils/init/miscinit.c:358
+#: utils/init/miscinit.c:363
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: utils/init/miscinit.c:366
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "el directorio de datos especificado «%s» no es un directorio"
 
-#: utils/init/miscinit.c:382
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "el directorio de datos «%s» tiene dueño equivocado"
 
-#: utils/init/miscinit.c:384
+#: utils/init/miscinit.c:389
 #, 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."
 
-#: utils/init/miscinit.c:402
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "el directorio de datos «%s» tiene permisos no válidos"
 
-#: utils/init/miscinit.c:404
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "Los permisos deberían ser u=rwx (0700) o u=rwx,g=rx (0750)."
 
-#: utils/init/miscinit.c:462
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "no se pudo cambiar al directorio «%s»: %m"
 
-#: utils/init/miscinit.c:720 utils/misc/guc.c:3650
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, 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:807
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "no existe el rol con OID %u"
 
-#: utils/init/miscinit.c:853
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "al rol «%s» no se le permite conectarse"
 
-#: utils/init/miscinit.c:874
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "demasiadas conexiones para el rol «%s»"
 
-#: utils/init/miscinit.c:1045
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "el OID de rol no es válido: %u"
 
-#: utils/init/miscinit.c:1192
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "el sistema de bases de datos está apagado"
 
-#: utils/init/miscinit.c:1279
+#: utils/init/miscinit.c:1285
 #, 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:1293
+#: utils/init/miscinit.c:1299
 #, 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:1300
+#: utils/init/miscinit.c:1306
 #, 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:1309
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "el archivo de bloqueo «%s» está vacío"
 
-#: utils/init/miscinit.c:1310
+#: utils/init/miscinit.c:1316
 #, 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:1354
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "el archivo de bloqueo «%s» ya existe"
 
-#: utils/init/miscinit.c:1358
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "¿Hay otro postgres (PID %d) en ejecución en el directorio de datos «%s»?"
 
-#: utils/init/miscinit.c:1360
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "¿Hay otro postmaster (PID %d) en ejecución en el directorio de datos «%s»?"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1369
 #, 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:1365
+#: utils/init/miscinit.c:1371
 #, 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:1416
+#: utils/init/miscinit.c:1422
 #, 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:1418
+#: utils/init/miscinit.c:1424
 #, 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:1455 utils/init/miscinit.c:1469
-#: utils/init/miscinit.c:1480
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, 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:1591 utils/init/miscinit.c:1733 utils/misc/guc.c:5765
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: utils/init/miscinit.c:1721
+#: utils/init/miscinit.c:1727
 #, 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:1746
+#: utils/init/miscinit.c:1752
 #, 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:1785 utils/init/miscinit.c:1801
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "«%s» no es un directorio de datos válido"
 
-#: utils/init/miscinit.c:1787
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Falta el archivo «%s»."
 
-#: utils/init/miscinit.c:1803
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "El archivo «%s» no contiene datos válidos."
 
-#: utils/init/miscinit.c:1805
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "Puede ser necesario ejecutar initdb."
 
-#: utils/init/miscinit.c:1813
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "El directorio de datos fue inicializado por PostgreSQL versión %s, que no es compatible con esta versión %s."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "conexión de replicación autorizada: usuario=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "conexión autorizada: usuario=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr " base_de_datos=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " nombre_de_aplicación=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr " SSL habilitado (protocolo=%s, cifrado=%s, bits=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 msgstr " GSS (autenticado=%s, cifrado=%s, delegado_credenciales=%s, principal=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "no"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "sí"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr " GSS (autenticado=%s, cifrado=%s, delegado_credentiales=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "la base de datos «%s» ha desaparecido de pg_database"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "Base de datos con OID %u ahora parece pertenecer a «%s»."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "la base de datos «%s» no acepta conexiones"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "permiso denegado a la base de datos «%s»"
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "Usuario no tiene privilegios de conexión."
 
-#: utils/init/postinit.c:389
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "demasiadas conexiones para la base de datos «%s»"
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "la configuración regional es incompatible con el sistema operativo"
 
-#: utils/init/postinit.c:414
+#: utils/init/postinit.c:423
 #, c-format
 msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
 msgstr "La base de datos fue inicializada con LC_COLLATE «%s», el cual no es reconocido por setlocale()."
 
-#: utils/init/postinit.c:416 utils/init/postinit.c:423
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid "Recreate the database with another locale or install the missing locale."
 msgstr "Recree la base de datos con otra configuración regional, o instale la configuración regional faltante."
 
-#: utils/init/postinit.c:421
+#: utils/init/postinit.c:430
 #, c-format
 msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
 msgstr "La base de datos fue inicializada con LC_CTYPE «%s», el cual no es reconocido por setlocale()."
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "la base de datos «%s» tiene una discordancia de versión de ordenamiento (“collation”)"
 
-#: utils/init/postinit.c:495
+#: utils/init/postinit.c:473
 #, c-format
 msgid "The database was created using collation version %s, but the operating system provides version %s."
 msgstr "La base de datos fue creada usando la versión de ordenamiento %s, pero el sistema operativo provee la versión %s."
 
-#: utils/init/postinit.c:498
+#: utils/init/postinit.c:476
 #, c-format
 msgid "Rebuild all objects in this database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Reconstruya todos los objetos en esta base de datos que usen el ordenamiento por omisión y ejecute ALTER DATABASE %s REFRESH COLLATION VERSION, o construya PostgreSQL con la versión correcta de la biblioteca."
 
-#: utils/init/postinit.c:904
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr ""
+
+#: utils/init/postinit.c:567
+#, c-format
+msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
+msgstr ""
+
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "no hay roles definidos en esta base de datos"
 
-#: utils/init/postinit.c:905
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Debería ejecutar imediatamente CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:942
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
 
-#: utils/init/postinit.c:962
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "las conexiones restantes están reservadas a roles con el atributo %s"
 
-#: utils/init/postinit.c:968
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "las conexiones restantes están reservadas a roles con privilegios del rol «%s»"
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "se ha denegado el permiso para iniciar “WAL sender”"
 
-#: utils/init/postinit.c:981
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "Sólo roles con el atributo %s pueden iniciar un proceso “WAL sender”."
 
-#: utils/init/postinit.c:1099
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Parece haber sido eliminada o renombrada."
 
-#: utils/init/postinit.c:1103
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "no existe la base de datos %u"
 
-#: utils/init/postinit.c:1112
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "no se puede conectar a la base de datos no válida «%s»"
 
-#: utils/init/postinit.c:1173
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "Falta el subdirectorio de base de datos «%s»."
@@ -27911,60 +29475,60 @@ msgstr "el rol «%s» no puede hacer SET ROLE a «%s»"
 msgid "invalid encoding number: %d"
 msgstr "el número de codificación no es válido: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "ID de codificación %d inesperado para juegos de caracteres ISO 8859"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "ID de codificación %d inesperado para juegos de caracteres WIN"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:298 utils/mb/mbutils.c:901
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "la conversión entre %s y %s no está soportada"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:403 utils/mb/mbutils.c:431 utils/mb/mbutils.c:816
+#: utils/mb/mbutils.c:843
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "La cadena de %d bytes es demasiado larga para la recodificación."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:569
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "la codificación de origen «%s» no es válida"
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:574
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "la codificación de destino «%s» no es válida"
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:714
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "byte no válido para codificación «%s»: 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:878
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "punto de código Unicode no válido"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1202
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codeset falló"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1719
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "secuencia de bytes no válida para codificación «%s»: %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1760
 #, c-format
 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»"
@@ -27979,82 +29543,82 @@ msgstr "nombre de directorio de configuración vacío: «%s»"
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio de configuración «%s»: %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Unidades válidas para este parámetro son «B», «kB», «MB», «GB» y «TB»."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr "Unidades válidas son para este parámetro son «us», «ms», «s», «min», «h» y «d»."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "parámetro de configuración «%s» no reconocido en el archivo «%s» línea %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3504 utils/misc/guc.c:3748
-#: utils/misc/guc.c:3846 utils/misc/guc.c:3944 utils/misc/guc.c:4071
-#: utils/misc/guc.c:4212
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, 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:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr "parámetro «%s» eliminado del archivo de configuración, volviendo al valor por omisión"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "el parámetro «%s» fue cambiado a «%s»"
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "el archivo de configuración «%s» contiene errores"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid "configuration file \"%s\" contains errors; unaffected changes were applied"
 msgstr "el archivo de configuración «%s» contiene errores; los cambios no afectados fueron aplicados"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "el archivo de configuración «%s» contiene errores; no se aplicó ningún cambio"
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "nombre de parámetro de configuración «%s» no válido"
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid "Custom parameter names must be two or more simple identifiers separated by dots."
 msgstr "Los nombres de los parámetros personalizados deben ser dos o más identificadores sencillos separados por puntos."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "«%s» es un prefijo reservado."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "parámetro de configuración «%s» no reconocido"
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
 msgstr "Ejecute initdb o pg_basebackup para inicializar un directorio de datos de PostgreSQL.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -28063,12 +29627,12 @@ msgstr ""
 "%s no sabe dónde encontrar el archivo de configuración del servidor.\n"
 "Debe especificar la opción --config-file o -D o definir la variable de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s: no se pudo acceder al archivo de configuración «%s»: %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -28077,7 +29641,7 @@ msgstr ""
 "%s no sabe dónde encontrar los archivos de sistema de la base de datos.\n"
 "Esto puede especificarse como «data_directory» en «%s», o usando la opción -D, o a través de la variable de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -28086,7 +29650,7 @@ msgstr ""
 "%s no sabe dónde encontrar el archivo de configuración «hba».\n"
 "Esto puede especificarse como «hba_file» en «%s», o usando la opción -D, o a través de la variable de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -28095,122 +29659,122 @@ msgstr ""
 "%s no sabe dónde encontrar el archivo de configuración «ident».\n"
 "Esto puede especificarse como «ident_file» en «%s», o usando la opción -D, o a través de la variable de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "El valor excede el rango para enteros."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
 msgstr "%d%s%s está fuera del rango aceptable para el parámetro «%s» (%d%s%s .. %d%s%s)"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
 msgstr "%g%s%s está fuera del rango aceptable para el parámetro «%s» (%g%s%s .. %g%s%s)"
 
-#: utils/misc/guc.c:3465
+#: utils/misc/guc.c:3462
 #, c-format
 msgid "parameter \"%s\" cannot be set during a parallel operation"
 msgstr "no se puede establecer el parámetro «%s» durante una operación paralela"
 
-#: utils/misc/guc.c:3481 utils/misc/guc.c:4696
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "no se puede cambiar el parámetro «%s»"
 
-#: utils/misc/guc.c:3514
+#: utils/misc/guc.c:3511
 #, 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:3541 utils/misc/guc.c:3603 utils/misc/guc.c:4671
-#: utils/misc/guc.c:6756
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, 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:3583
+#: utils/misc/guc.c:3580
 #, 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:3642
+#: utils/misc/guc.c:3639
 #, 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:3663
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "el parámetro «%s» no puede ser reseteado"
 
-#: utils/misc/guc.c:3670
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "el parámetro «%s» no se puede cambiar localmente en funciones"
 
-#: utils/misc/guc.c:4370 utils/misc/guc.c:4418 utils/misc/guc.c:5450
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "se ha denegado el permiso a examinar «%s»"
 
-#: utils/misc/guc.c:4371 utils/misc/guc.c:4419 utils/misc/guc.c:5451
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "Sólo roles con privilegios del rol «%s» pueden examinar este parámetro."
 
-#: utils/misc/guc.c:4629
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "ALTER SYSTEM no está permitido en este ambiente"
 
-#: utils/misc/guc.c:4661
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "permiso denegado a ejecutar ALTER SYSTEM RESET ALL"
 
-#: utils/misc/guc.c:4740
+#: utils/misc/guc.c:4742
 #, 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:4785
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "no se pudo interpretar el contenido del archivo «%s»"
 
-#: utils/misc/guc.c:4967
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "intento de cambiar la opción «%s»"
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "nombre de parámetro de configuración «%s» no válido, eliminándolo"
 
-#: utils/misc/guc.c:5308
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "«%s» es ahora un prefijo reservado."
 
-#: utils/misc/guc.c:6179
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "al establecer el parámetro «%s» a «%s»"
 
-#: utils/misc/guc.c:6348
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "no se pudo cambiar el parámetro «%s»"
 
-#: utils/misc/guc.c:6438
+#: utils/misc/guc.c:6441
 #, 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:6888
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "valor no válido para el parámetro «%s»: %g"
@@ -28235,2065 +29799,2371 @@ msgstr "SET %s lleva sólo un argumento"
 msgid "SET requires parameter name"
 msgstr "SET requiere el nombre de un parámetro"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "Sin Grupo"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "Ubicaciones de Archivos"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Conexiones y Autentificación / Parámetros de Conexión"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "Conexiones y Autentificación / Parámetros TCP"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "Conexiones y Autentificación / Autentificación"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "Conexiones y Autentificación / SSL"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "Uso de Recursos / Memoria"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "Uso de Recursos / Disco"
 
-#: utils/misc/guc_tables.c:684
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
 msgstr "Uso de Recursos / Recursos del Kernel"
 
-#: utils/misc/guc_tables.c:685
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Uso de Recursos / Retardo de Vacuum por Costos"
-
-#: utils/misc/guc_tables.c:686
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "Uso de Recursos / Escritor en Segundo Plano"
 
-#: utils/misc/guc_tables.c:687
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Uso de Recursos / Comportamiento Asíncrono"
+#: utils/misc/guc_tables.c:711
+#, fuzzy
+#| msgid "Resource Usage / Disk"
+msgid "Resource Usage / I/O"
+msgstr "Uso de Recursos / Disco"
+
+#: utils/misc/guc_tables.c:712
+#, fuzzy
+#| msgid "Resource Usage / Kernel Resources"
+msgid "Resource Usage / Worker Processes"
+msgstr "Uso de Recursos / Recursos del Kernel"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead Log / Configuraciones"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead Log / Puntos de Control (Checkpoints)"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead Log / Archivado"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "Write-Ahead Log / Recuperación"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Write-Ahead Log / Recuperación desde Archivo"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Write-Ahead Log / Destino de Recuperación"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "Write-Ahead Log / Sumarización"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "Replicación / Servidores de Envío"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "Replicación / Servidor Primario"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "Replicación / Servidores Standby"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "Replicación / Suscriptores"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Afinamiento de Consultas / Configuración de Métodos del Planner"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Afinamiento de Consultas / Constantes de Costo del Planner"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Afinamiento de Consultas / Optimizador Genético de Consultas"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "Afinamiento de Consultas / Otras Opciones del Planner"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "Reporte y Registro / Dónde Registrar"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "Reporte y Registro / Cuándo Registrar"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "Reporte y Registro / Qué Registrar"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "Reporte y Registro / Título del Proceso"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "Estadísticas / Monitoreo"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "Estadísticas / Acumuladores de Consultas e Índices"
 
-#: utils/misc/guc_tables.c:709
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/misc/guc_tables.c:734
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr ""
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:735
+#, fuzzy
+#| msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "Uso de Recursos / Retardo de Vacuum por Costos"
+
+#: utils/misc/guc_tables.c:736
+msgid "Vacuuming / Default Behavior"
+msgstr ""
+
+#: utils/misc/guc_tables.c:737
+msgid "Vacuuming / Freezing"
+msgstr ""
+
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Valores por Omisión de Conexiones / Comportamiento de Sentencias"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Valores por Omisión de Conexiones / Configuraciones Regionales y Formateo"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Valores por Omisión de Conexiones / Precargado de Bibliotecas Compartidas"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Valores por Omisión de Conexiones / Otros Valores"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "Manejo de Bloqueos"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Compatibilidad de Versión y Plataforma / Versiones Anteriores de PostgreSQL"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Compatibilidad de Versión y Plataforma / Otras Plataformas y Clientes"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "Gestión de Errores"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "Opciones Predefinidas"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "Opciones Personalizadas"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "Opciones de Desarrollador"
 
-#: utils/misc/guc_tables.c:775
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Permitir el uso de planes de recorrido secuencial."
 
-#: utils/misc/guc_tables.c:785
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Permitir el uso de planes de recorrido de índice."
 
-#: utils/misc/guc_tables.c:795
+#: utils/misc/guc_tables.c:823
 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_tables.c:805
+#: utils/misc/guc_tables.c:833
 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_tables.c:815
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Permitir el uso de planes de recorrido por TID."
 
-#: utils/misc/guc_tables.c:825
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Permitir el uso de pasos explícitos de ordenamiento."
 
-#: utils/misc/guc_tables.c:835
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "Permitir el uso de pasos incrementales de ordenamiento."
 
-#: utils/misc/guc_tables.c:845
+#: utils/misc/guc_tables.c:873
 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_tables.c:855
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "Permitir el uso de materialización de planes."
 
-#: utils/misc/guc_tables.c:865
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "Permitir el uso de memoización de planes."
 
-#: utils/misc/guc_tables.c:875
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Permitir el uso de planes «nested-loop join»."
 
-#: utils/misc/guc_tables.c:885
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "Permitir el uso de planes «merge join»."
 
-#: utils/misc/guc_tables.c:895
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "Permitir el uso de planes «hash join»."
 
-#: utils/misc/guc_tables.c:905
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "Permitir el uso de planes «gather merge»."
 
-#: utils/misc/guc_tables.c:915
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "Permitir el uso de joins por particiones."
 
-#: utils/misc/guc_tables.c:925
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "Permitir el uso de agregación y agrupamiento por particiones."
 
-#: utils/misc/guc_tables.c:935
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "Permitir el uso de planes «append» paralelos."
 
-#: utils/misc/guc_tables.c:945
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "Permitir el uso de planes «hash join» paralelos."
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "Permitir el uso de poda de particiones en tiempo de plan y ejecución."
 
-#: utils/misc/guc_tables.c:956
+#: utils/misc/guc_tables.c:984
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr "Permite al optimizador de consultas y al ejecutor a comparar bordes de particiones a condiciones en las consultas para determinar qué particiones deben recorrerse."
 
-#: utils/misc/guc_tables.c:967
+#: utils/misc/guc_tables.c:995
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr "Activa la capacidad del optimizador de permitir planes que proveen entrada pre-ordenada para funciones de agregación ORDER BY / DISTINCT"
 
-#: utils/misc/guc_tables.c:970
+#: utils/misc/guc_tables.c:998
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr "Permite al optimizador construir planes que proveen entrada pre-ordenada para funciones de agregación con una cláusula ORDER BY / DISTINCT.  Cuando está desactivado, siempre se efectúan ordenamientos implícitos durante la ejecución."
 
-#: utils/misc/guc_tables.c:982
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr "Permitir el uso de planes «append» asíncronos."
 
-#: utils/misc/guc_tables.c:992
+#: utils/misc/guc_tables.c:1020
+msgid "Enables removal of unique self-joins."
+msgstr ""
+
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
 msgstr "Activa el reordenamiento de claves GROUP BY."
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1040
+#, fuzzy
+#| msgid "Enables reordering of GROUP BY keys."
+msgid "Enables reordering of DISTINCT keys."
+msgstr "Activa el reordenamiento de claves GROUP BY."
+
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "Permitir el uso del optimizador genético de consultas."
 
-#: utils/misc/guc_tables.c:1003
+#: utils/misc/guc_tables.c:1051
 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_tables.c:1017
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "Indica si el usuario actual es superusuario."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "Permite ejecutar la orden ALTER SYSTEM."
 
-#: utils/misc/guc_tables.c:1033
+#: utils/misc/guc_tables.c:1081
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
 msgstr "Puede desactivarse en ambientes donde los cambios globales de configuración deban hacerse usando un método diferente."
 
-#: utils/misc/guc_tables.c:1043
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "Permitir la publicación del servidor vía Bonjour."
 
-#: utils/misc/guc_tables.c:1052
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "Recolectar tiempo de compromiso de transacciones."
 
-#: utils/misc/guc_tables.c:1061
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "Permitir conexiones SSL."
 
-#: utils/misc/guc_tables.c:1070
+#: utils/misc/guc_tables.c:1118
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr "Controla si «ssl_passphrase_command» es invocado durante el “reload” del servidor."
 
-#: utils/misc/guc_tables.c:1079
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
 msgstr "Da prioridad al orden de algoritmos de cifrado especificado por el servidor."
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "Forzar la sincronización de escrituras a disco."
 
-#: utils/misc/guc_tables.c:1089
+#: utils/misc/guc_tables.c:1137
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures 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_tables.c:1100
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "Continuar procesando después de una falla de suma de verificación."
 
-#: utils/misc/guc_tables.c:1101
+#: utils/misc/guc_tables.c:1149
 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_tables.c:1115
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "Continuar procesando después de detectar encabezados de página dañados."
 
-#: utils/misc/guc_tables.c:1116
+#: utils/misc/guc_tables.c:1164
 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_tables.c:1129
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr "Continuar procesando después de una falla de páginas no válidas."
 
-#: utils/misc/guc_tables.c:1130
+#: utils/misc/guc_tables.c:1178
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
 msgstr "La detección de que registros de WAL tengan referencias a páginas no válidas durante la recuperación hace que PostgreSQL produzca un error de nivel PANIC, abortando la recuperación. Establecer el valor de «ignore_invalid_pages» a true hace que el sistema ignore las referencias a páginas no válidas en registros de WAL (pero aún así reporta un mensaje de warning), y continúe la recuperación. Este comportamiento podría causar caídas del sistema, pérdida de datos, propagar u ocultar corrupción, u otros problemas serios. Sólo tiene efecto durante la recuperación o en modo standby."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1196
 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 checkpoint."
 
-#: utils/misc/guc_tables.c:1149
+#: utils/misc/guc_tables.c:1197
 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 checkpoint, de manera que una recuperación total es posible."
 
-#: utils/misc/guc_tables.c:1162
+#: utils/misc/guc_tables.c:1210
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
 msgstr "Escribir páginas completas al WAL cuando son modificadas después de un checkpoint, incluso para una modificación no crítica."
 
-#: utils/misc/guc_tables.c:1172
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "Escribir ceros a nuevos archivos WAL antes del primer uso."
 
-#: utils/misc/guc_tables.c:1182
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "Reciclar archivos de WAL cambiándoles de nombre."
 
-#: utils/misc/guc_tables.c:1192
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "Registrar cada checkpoint."
 
-#: utils/misc/guc_tables.c:1201
-msgid "Logs each successful connection."
-msgstr "Registrar cada conexión exitosa."
-
-#: utils/misc/guc_tables.c:1210
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
 msgstr "Registrar detalles de “handshake” de conexión anteriores a la autentificación."
 
-#: utils/misc/guc_tables.c:1220
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "Registrar el fin de una sesión, incluyendo su duración."
 
-#: utils/misc/guc_tables.c:1229
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "Registrar cada orden de replicación."
 
-#: utils/misc/guc_tables.c:1238
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Indica si el servidor actual tiene activas las aseveraciones (asserts) activas."
 
-#: utils/misc/guc_tables.c:1249
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "Terminar sesión ante cualquier error."
 
-#: utils/misc/guc_tables.c:1258
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "Reinicializar el servidor después de una caída de un proceso servidor."
 
-#: utils/misc/guc_tables.c:1267
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "Eliminar archivos temporales después de una caída de un proceso servidor."
 
-#: utils/misc/guc_tables.c:1277
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "Enviar SIGABRT en vez de SIGQUIT a procesos hijos después de una caída de un proceso servidor."
 
-#: utils/misc/guc_tables.c:1287
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "Enviar SIGABRT en vez de SIGKILL a procesos hijos atascados."
 
-#: utils/misc/guc_tables.c:1298
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Registrar la duración de cada sentencia SQL ejecutada."
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1347
+msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr ""
+
+#: utils/misc/guc_tables.c:1364
+msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr ""
+
+#: utils/misc/guc_tables.c:1381
+msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
+msgstr ""
+
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "Registrar cada arbol analizado de consulta "
 
-#: utils/misc/guc_tables.c:1316
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "Registrar cada reescritura del arból analizado de consulta"
 
-#: utils/misc/guc_tables.c:1325
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "Registrar el plan de ejecución de cada consulta."
 
-#: utils/misc/guc_tables.c:1334
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr "Indentar los árboles de parse y plan."
 
-#: utils/misc/guc_tables.c:1343
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "Escribir estadísticas de parser al registro del servidor."
 
-#: utils/misc/guc_tables.c:1352
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "Escribir estadísticas de planner al registro del servidor."
 
-#: utils/misc/guc_tables.c:1361
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "Escribir estadísticas del executor al registro del servidor."
 
-#: utils/misc/guc_tables.c:1370
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Escribir estadísticas acumulativas al registro del servidor."
 
-#: utils/misc/guc_tables.c:1380
+#: utils/misc/guc_tables.c:1472
 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_tables.c:1392
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "Recolectar estadísticas sobre órdenes en ejecución."
 
-#: utils/misc/guc_tables.c:1393
+#: utils/misc/guc_tables.c:1485
 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_tables.c:1403
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "Recolectar estadísticas de actividad de la base de datos."
 
-#: utils/misc/guc_tables.c:1412
+#: utils/misc/guc_tables.c:1504
+#, fuzzy
+#| msgid "Collects timing statistics for database I/O activity."
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "Recolectar estadísticas de tiempos en las operaciones de I/O de la base de datos."
+
+#: utils/misc/guc_tables.c:1513
 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_tables.c:1421
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "Recolectar estadísticas de tiempos en las operaciones de I/O del WAL."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1532
 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_tables.c:1432
+#: utils/misc/guc_tables.c:1533
 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_tables.c:1441
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "Iniciar el subproceso de autovacuum."
 
-#: utils/misc/guc_tables.c:1451
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Generar salida de depuración para LISTEN y NOTIFY."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "Emitir información acerca del uso de locks."
 
-#: utils/misc/guc_tables.c:1473
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "Emitir información acerca del uso de locks de usuario."
 
-#: utils/misc/guc_tables.c:1483
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "Emitir información acerca del uso de «lightweight locks»."
 
-#: utils/misc/guc_tables.c:1493
+#: utils/misc/guc_tables.c:1594
 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_tables.c:1505
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "Registrar esperas largas de bloqueos."
 
-#: utils/misc/guc_tables.c:1514
+#: utils/misc/guc_tables.c:1615
+#, fuzzy
+#| msgid "Logs long lock waits."
+msgid "Logs lock failures."
+msgstr "Registrar esperas largas de bloqueos."
+
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr "Registrar esperas por conflictos en recuperación de standby"
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "Registrar el nombre del host en la conexión."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1634
 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_tables.c:1535
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Tratar expr=NULL como expr IS NULL."
 
-#: utils/misc/guc_tables.c:1536
+#: utils/misc/guc_tables.c:1646
 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_tables.c:1548
+#: utils/misc/guc_tables.c:1658
 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_tables.c:1558
+#: utils/misc/guc_tables.c:1668
 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_tables.c:1568
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Estado por omisión de postergable de nuevas transacciones."
 
-#: utils/misc/guc_tables.c:1577
+#: utils/misc/guc_tables.c:1687
 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_tables.c:1587
-msgid "Enable row security."
+#: utils/misc/guc_tables.c:1697
+#, fuzzy
+#| msgid "Enable row security."
+msgid "Enables row security."
 msgstr "Activar seguridad de registros."
 
-#: utils/misc/guc_tables.c:1588
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr "Cuando está activada, la seguridad de registros se aplicará a todos los usuarios."
 
-#: utils/misc/guc_tables.c:1596
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "Verificar definición de rutinas durante CREATE FUNCTION y CREATE PROCEDURE."
 
-#: utils/misc/guc_tables.c:1605
-msgid "Enable input of NULL elements in arrays."
+#: utils/misc/guc_tables.c:1715
+#, fuzzy
+#| msgid "Enable input of NULL elements in arrays."
+msgid "Enables input of NULL elements in arrays."
 msgstr "Habilita el ingreso de elementos nulos en arrays."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1716
 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_tables.c:1622
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS ya no está soportado; esto sólo puede ser false."
 
-#: utils/misc/guc_tables.c:1632
-#| msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
+#: utils/misc/guc_tables.c:1742
 msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr "Lanzar un subproceso para capturar stderr, csvlog y/o jsonlog en archivos de log."
 
-#: utils/misc/guc_tables.c:1641
+#: utils/misc/guc_tables.c:1751
 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_tables.c:1652
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "Emitir información acerca de uso de recursos durante los ordenamientos."
 
-#: utils/misc/guc_tables.c:1666
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Generar salida de depuración para recorrido sincronizado."
 
-#: utils/misc/guc_tables.c:1681
-msgid "Enable bounded sorting using heap sort."
+#: utils/misc/guc_tables.c:1789
+#, fuzzy
+#| msgid "Enable bounded sorting using heap sort."
+msgid "Enables bounded sorting using heap sort."
 msgstr "Activar ordenamiento acotado usando «heap sort»."
 
-#: utils/misc/guc_tables.c:1694
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "Activar salida de depuración de WAL."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "Mostrar si las fechas y horas se basan en tipos enteros."
 
-#: utils/misc/guc_tables.c:1717
+#: utils/misc/guc_tables.c:1825
 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_tables.c:1727
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "Define si la delegación GSSAPI debería ser aceptada por el cliente."
 
-#: utils/misc/guc_tables.c:1737
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Avisa acerca de escapes de backslash en literales de cadena corrientes."
 
-#: utils/misc/guc_tables.c:1747
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Provoca que las cadenas '...' traten las barras inclinadas inversas (\\) en forma literal."
 
-#: utils/misc/guc_tables.c:1758
-msgid "Enable synchronized sequential scans."
+#: utils/misc/guc_tables.c:1866
+#, fuzzy
+#| msgid "Enable synchronized sequential scans."
+msgid "Enables synchronized sequential scans."
 msgstr "Permitir la sincronización de recorridos secuenciales."
 
-#: utils/misc/guc_tables.c:1768
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "Define si incluir o excluir la transacción con el destino de recuperación."
 
-#: utils/misc/guc_tables.c:1778
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "Inicia el proceso sumarizador de WAL para activar backups incrementales."
 
-#: utils/misc/guc_tables.c:1788
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr "Permite conexiones y consultas durante la recuperación."
 
-#: utils/misc/guc_tables.c:1798
+#: utils/misc/guc_tables.c:1906
 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_tables.c:1808
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "Muestra si hot standby está activo actualmente."
 
-#: utils/misc/guc_tables.c:1819
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "Permite modificaciones de la estructura de las tablas del sistema."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "Deshabilita lectura de índices del sistema."
 
-#: utils/misc/guc_tables.c:1831
+#: utils/misc/guc_tables.c:1939
 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_tables.c:1842
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "Permite tablespaces directamente dentro de pg_tblspc, para pruebas."
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1961
 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_tables.c:1854
+#: utils/misc/guc_tables.c:1962
 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_tables.c:1864
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "Al generar fragmentos SQL, entrecomillar todos los identificadores."
 
-#: utils/misc/guc_tables.c:1874
+#: utils/misc/guc_tables.c:1982
 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_tables.c:1885
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "Agregar número de secuencia a mensajes syslog para evitar supresión de duplicados."
 
-#: utils/misc/guc_tables.c:1895
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "Dividir mensajes enviados a syslog en líneas y que quepan en 1024 bytes."
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Controla si los Gather y Gather Merge también ejecutan subplanes."
 
-#: utils/misc/guc_tables.c:1906
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "¿Deben los nodos de recolección ejecutar subplanes o sólo recolectar tuplas?"
 
-#: utils/misc/guc_tables.c:1916
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "Permitir compilación JIT."
 
-#: utils/misc/guc_tables.c:1927
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "Registrar las funciones JIT compiladas con el depurador."
 
-#: utils/misc/guc_tables.c:1944
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "Escribe el bitcode LLVM para facilitar depuración de JIT."
 
-#: utils/misc/guc_tables.c:1955
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "Permitir compilación JIT de expresiones."
 
-#: utils/misc/guc_tables.c:1966
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "Registrar las funciones JIT compiladas con el analizador «perf»."
 
-#: utils/misc/guc_tables.c:1983
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "Permitir compilación JIT de deformación de tuplas."
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "Si continuar ejecutando después de una falla al sincronizar archivos de datos."
 
-#: utils/misc/guc_tables.c:2003
+#: utils/misc/guc_tables.c:2111
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr "Definir si un receptor de WAL debe crear un slot de replicación temporal en caso de no haber configurado un slot permanente."
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
 msgstr "Activa “triggers” por evento."
 
-#: utils/misc/guc_tables.c:2013
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr "Cuando se activa, los “triggers” por evento se ejecutarán para todas las sentencias aplicables."
 
-#: utils/misc/guc_tables.c:2022
+#: utils/misc/guc_tables.c:2130
 msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
 msgstr "Habilita un standby físico para sincronizar slots de “failover” de replicación lógica desde el servidor primario."
 
-#: utils/misc/guc_tables.c:2040
+#: utils/misc/guc_tables.c:2139
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr ""
+
+#: utils/misc/guc_tables.c:2148
+#, fuzzy
+#| msgid "      --no-truncate               don't truncate empty pages at the end of the table\n"
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "      --no-truncate            no truncar las páginas vacías al final de la tabla\n"
+
+#: utils/misc/guc_tables.c:2166
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "Define el tiempo a esperar antes de forzar un cambio al siguiente archivo WAL."
 
-#: utils/misc/guc_tables.c:2051
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322
+#: utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752
+#: utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774
+#: utils/misc/guc_tables.c:2785
+#, fuzzy
+#| msgid "-1 disables optimization."
+msgid "0 disables the timeout."
+msgstr "-1 inhabilita la optimización."
+
+#: utils/misc/guc_tables.c:2177
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr "Define el tiempo máximo a esperar la autentificación durante el establecimiento de una conexión."
 
-#: utils/misc/guc_tables.c:2053 utils/misc/guc_tables.c:2780
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "Esto permite adjuntar un depurador al proceso."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "Definir el valor por omisión de toma de estadísticas."
 
-#: utils/misc/guc_tables.c:2063
+#: utils/misc/guc_tables.c:2189
 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_tables.c:2072
+#: utils/misc/guc_tables.c:2198
 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_tables.c:2074
+#: utils/misc/guc_tables.c:2200
 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_tables.c:2085
+#: utils/misc/guc_tables.c:2211
 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_tables.c:2087
+#: utils/misc/guc_tables.c:2213
 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_tables.c:2098
+#: utils/misc/guc_tables.c:2224
 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_tables.c:2108
+#: utils/misc/guc_tables.c:2234
 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_tables.c:2118
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: número de individuos en una población."
 
-#: utils/misc/guc_tables.c:2119 utils/misc/guc_tables.c:2129
-msgid "Zero selects a suitable default value."
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
+#, fuzzy
+#| msgid "Zero selects a suitable default value."
+msgid "0 means use a suitable default value."
 msgstr "Cero selecciona un valor por omisión razonable."
 
-#: utils/misc/guc_tables.c:2128
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: número de iteraciones del algoritmo."
 
-#: utils/misc/guc_tables.c:2140
+#: utils/misc/guc_tables.c:2266
 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_tables.c:2151
+#: utils/misc/guc_tables.c:2277
 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_tables.c:2162
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
+#, fuzzy
+#| msgid "-1 means no limit."
+msgid "-1 means wait forever."
+msgstr "-1 significa sin límite."
+
+#: utils/misc/guc_tables.c:2288
 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_tables.c:2173
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "Define el retraso mínimo para aplicar cambios durante la recuperación."
 
-#: utils/misc/guc_tables.c:2184
+#: utils/misc/guc_tables.c:2310
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr "Define el intervalo máximo entre reportes de estado que el receptor de WAL envía al servidor origen."
 
-#: utils/misc/guc_tables.c:2195
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr "Define el máximo tiempo de espera para recibir datos desde el servidor origen."
 
-#: utils/misc/guc_tables.c:2206
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Número máximo de conexiones concurrentes."
 
-#: utils/misc/guc_tables.c:2217
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Número de conexiones reservadas para superusuarios."
 
-#: utils/misc/guc_tables.c:2227
+#: utils/misc/guc_tables.c:2353
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr "Número de conexiones reservadas para con privilegios de pg_use_reserved_connections."
 
-#: utils/misc/guc_tables.c:2238
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "Cantidad de memoria compartida dinámica reservada al iniciar."
 
-#: utils/misc/guc_tables.c:2253
+#: utils/misc/guc_tables.c:2379
 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_tables.c:2264
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "Define el tamaño del pool de búfers para VACUUM, ANALYZE y autovacuum."
 
-#: utils/misc/guc_tables.c:2275
+#: utils/misc/guc_tables.c:2401
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr "Muestra el tamaño del área principal de memoria compartida del servidor (redondeado al número de MB más cercano)."
 
-#: utils/misc/guc_tables.c:2286
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "Muestra la cantidad de “huge pages” necesarias para el área de memoria compartida principal."
 
-#: utils/misc/guc_tables.c:2287
-msgid "-1 indicates that the value could not be determined."
-msgstr "-1 indica que el valor no pudo ser determinado."
+#: utils/misc/guc_tables.c:2413
+#, fuzzy
+#| msgid "event triggers are not supported for %s"
+msgid "-1 means huge pages are not supported."
+msgstr "los “triggers” por evento no están soportados para %s"
+
+#: utils/misc/guc_tables.c:2423
+#, fuzzy
+#| msgid "Sets the number of shared memory buffers used by the server."
+msgid "Shows the number of semaphores required for the server."
+msgstr "Número de búfers de memoria compartida usados por el servidor."
 
-#: utils/misc/guc_tables.c:2297
+#: utils/misc/guc_tables.c:2434
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de timestamps de commit."
 
-#: utils/misc/guc_tables.c:2298 utils/misc/guc_tables.c:2353
-#: utils/misc/guc_tables.c:2364
-msgid "Specify 0 to have this value determined as a fraction of shared_buffers."
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490
+#: utils/misc/guc_tables.c:2501
+#, fuzzy
+#| msgid "Specify 0 to have this value determined as a fraction of shared_buffers."
+msgid "0 means use a fraction of \"shared_buffers\"."
 msgstr "Especifique 0 para que este valor sea determinado como fracción de shared_buffers."
 
-#: utils/misc/guc_tables.c:2308
+#: utils/misc/guc_tables.c:2445
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de miembros de MultiXact."
 
-#: utils/misc/guc_tables.c:2319
+#: utils/misc/guc_tables.c:2456
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de offsets de MultiXact."
 
-#: utils/misc/guc_tables.c:2330
+#: utils/misc/guc_tables.c:2467
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de mensajes LISTEN/NOTIFY."
 
-#: utils/misc/guc_tables.c:2341
+#: utils/misc/guc_tables.c:2478
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de transacciones serializables."
 
-#: utils/misc/guc_tables.c:2352
+#: utils/misc/guc_tables.c:2489
 msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de subtransacciones."
 
-#: utils/misc/guc_tables.c:2363
+#: utils/misc/guc_tables.c:2500
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
 msgstr "Define el tamaño del pool de búfers dedicado al caché de estatus de transacciones."
 
-#: utils/misc/guc_tables.c:2374
+#: utils/misc/guc_tables.c:2511
 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_tables.c:2385
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "Puerto TCP en el cual escuchará el servidor."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Privilegios de acceso al socket Unix."
 
-#: utils/misc/guc_tables.c:2396
+#: utils/misc/guc_tables.c:2533
 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_tables.c:2410
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "Define los privilegios para los archivos del registro del servidor."
 
-#: utils/misc/guc_tables.c:2411
+#: utils/misc/guc_tables.c:2548
 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_tables.c:2425
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "Muestra el modo del directorio de datos."
 
-#: utils/misc/guc_tables.c:2426
+#: utils/misc/guc_tables.c:2563
 msgid "The parameter value is 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 "El valor del parámetro es 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_tables.c:2439
+#: utils/misc/guc_tables.c:2576
 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_tables.c:2440
+#: utils/misc/guc_tables.c:2577
 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_tables.c:2457
+#: utils/misc/guc_tables.c:2594
 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_tables.c:2458
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Esto incluye operaciones como VACUUM y CREATE INDEX."
 
-#: utils/misc/guc_tables.c:2468
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "Establece el límite de memoria que se usará para decodificación lógica."
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2606
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr "Esta es la cantidad máxima de memoria que puede ser usada para cada búfer interno de ordenamiento, antes de comenzar a usar disco."
 
-#: utils/misc/guc_tables.c:2485
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Establece el tamaño máximo del stack, en kilobytes."
 
-#: utils/misc/guc_tables.c:2496
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "Limita el tamaño total de todos los archivos temporales usados en cada proceso."
 
-#: utils/misc/guc_tables.c:2497
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1 significa sin límite."
 
-#: utils/misc/guc_tables.c:2507
+#: utils/misc/guc_tables.c:2644
 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_tables.c:2517
+#: utils/misc/guc_tables.c:2654
 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_tables.c:2527
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Costo de Vacuum de una página ensuciada por vacuum."
 
-#: utils/misc/guc_tables.c:2537
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr "Costo de Vacuum disponible antes de descansar."
 
-#: utils/misc/guc_tables.c:2547
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Costo de Vacuum disponible antes de descansar, para autovacuum."
 
-#: utils/misc/guc_tables.c:2557
-msgid "Sets the maximum number of simultaneously open files for each server process."
+#: utils/misc/guc_tables.c:2685
+#, fuzzy
+#| msgid "-1 means no limit."
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1 significa sin límite."
+
+#: utils/misc/guc_tables.c:2694
+#, fuzzy
+#| msgid "Sets the maximum number of simultaneously open files for each server process."
+msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
 msgstr "Define la cantidad máxima de archivos abiertos por cada subproceso."
 
-#: utils/misc/guc_tables.c:2570
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Define la cantidad máxima de transacciones preparadas simultáneas."
 
-#: utils/misc/guc_tables.c:2581
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Define el OID mínimo para hacer seguimiento de locks."
 
-#: utils/misc/guc_tables.c:2582
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "Se usa para evitar salida excesiva por tablas de sistema."
 
-#: utils/misc/guc_tables.c:2591
+#: utils/misc/guc_tables.c:2728
 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_tables.c:2603
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Define la duración máxima permitida de sentencias."
 
-#: utils/misc/guc_tables.c:2604 utils/misc/guc_tables.c:2615
-#: utils/misc/guc_tables.c:2626 utils/misc/guc_tables.c:2637
-#: utils/misc/guc_tables.c:2648
-msgid "A value of 0 turns off the timeout."
-msgstr "Un valor de 0 desactiva el máximo."
-
-#: utils/misc/guc_tables.c:2614
+#: utils/misc/guc_tables.c:2751
 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_tables.c:2625
+#: utils/misc/guc_tables.c:2762
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "Define el tiempo máximo permitido de inactividad entre consultas, cuando están dentro de una transacción."
 
-#: utils/misc/guc_tables.c:2636
+#: utils/misc/guc_tables.c:2773
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
 msgstr "Define la duración máxima permitida cualquier transacción dentro de una sesión (no una transacción preparada)."
 
-#: utils/misc/guc_tables.c:2647
+#: utils/misc/guc_tables.c:2784
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "Define el tiempo máximo permitido de inactividad entre consultas, cuando no están dentro de una transacción."
 
-#: utils/misc/guc_tables.c:2658
+#: utils/misc/guc_tables.c:2795
 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_tables.c:2668
+#: utils/misc/guc_tables.c:2805
 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_tables.c:2678
+#: utils/misc/guc_tables.c:2815
 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_tables.c:2688
+#: utils/misc/guc_tables.c:2825
 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_tables.c:2698
+#: utils/misc/guc_tables.c:2835
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Edad a la cual VACUUM debería activar el modo failsafe para evitar pérdida de servicio por ”wraparound”."
 
-#: utils/misc/guc_tables.c:2707
+#: utils/misc/guc_tables.c:2844
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Edad de multixact a la cual VACUUM debería activar el modo failsafe para evitar pérdida de servicio por “wraparound”."
 
-#: utils/misc/guc_tables.c:2720
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Cantidad máxima de “locks” por transacción."
 
-#: utils/misc/guc_tables.c:2721
+#: utils/misc/guc_tables.c:2858
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "La tabla compartida de “locks” se dimensiona bajo la suposoción que a lo más «max_locks_per_transaction» objetos por cada proceso servidor o transacción preparada necesitarán ser bloqueados en un momento dado."
 
-#: utils/misc/guc_tables.c:2732
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Cantidad máxima de “locks” de predicado por transacción."
 
-#: utils/misc/guc_tables.c:2733
+#: utils/misc/guc_tables.c:2870
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "La tabla compartida de “locks” de predicados se dimensiona bajo la suposición de que a lo más «max_pred_locks_per_transaction» objetos por cada proceso servidor o transacción preparada necesitarán ser bloqueados en un momento dado."
 
-#: utils/misc/guc_tables.c:2744
+#: utils/misc/guc_tables.c:2881
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "Cantidad máxima de páginas y tuplas bloqueadas por predicado."
 
-#: utils/misc/guc_tables.c:2745
+#: utils/misc/guc_tables.c:2882
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr "Si más que este total de páginas y tuplas en la misma relación están bloqueadas por una conexión, esos locks son reemplazados por un lock a nivel de relación."
 
-#: utils/misc/guc_tables.c:2755
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "Cantidad máxima de locks de predicado por página."
 
-#: utils/misc/guc_tables.c:2756
+#: utils/misc/guc_tables.c:2893
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr "Si más que este número de tuplas de la misma página están bloqueadas por una conexión, esos locks son reemplazados por un lock a nivel de página."
 
-#: utils/misc/guc_tables.c:2766
+#: utils/misc/guc_tables.c:2903
 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_tables.c:2778
+#: utils/misc/guc_tables.c:2915
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr "Define el tiempo máximo a esperar antes de la autentificación al abrir una conexión."
 
-#: utils/misc/guc_tables.c:2790
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "Cantidad máxima de páginas dedicadas a la cola de NOTIFY / LISTEN."
 
-#: utils/misc/guc_tables.c:2800
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "Tamaño de búfer para lectura adelantada de WAL durante la recuperación."
 
-#: utils/misc/guc_tables.c:2801
+#: utils/misc/guc_tables.c:2938
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr "Máxima distancia que leer adelantado en el WAL para pre-cargar bloques de datos referenciados."
 
-#: utils/misc/guc_tables.c:2811
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "Establece el tamaño de los archivos de WAL retenidos para los servidores standby."
 
-#: utils/misc/guc_tables.c:2822
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Define el tamaño mínimo al cual reducir el WAL."
 
-#: utils/misc/guc_tables.c:2834
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Define el tamaño de WAL que desencadena un checkpoint."
 
-#: utils/misc/guc_tables.c:2846
+#: utils/misc/guc_tables.c:2983
 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_tables.c:2857
+#: utils/misc/guc_tables.c:2994
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr "Define el máximo tiempo antes de emitir un advertencia si los checkpoints iniciados a causa del volumen de WAL ocurren con demasiada frecuencia."
 
-#: utils/misc/guc_tables.c:2859
-msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. Zero turns off the warning."
+#: utils/misc/guc_tables.c:2996
+#, fuzzy
+#| msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. Zero turns off the warning."
+msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
 msgstr "Escribe una advertencia al log del servidor si los checkpoints causados por el llenado de segmentos de WAL occur más frecuentemente que esta cantidad de tiempo. Cero inhabilita la advertencia."
 
-#: utils/misc/guc_tables.c:2872 utils/misc/guc_tables.c:3090
-#: utils/misc/guc_tables.c:3144
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239
+#: utils/misc/guc_tables.c:3331
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr "Número de páginas después del cual las escrituras previamente ejecutadas se sincronizan a disco."
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240
+#: utils/misc/guc_tables.c:3332
+msgid "0 disables forced writeback."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3020
 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_tables.c:2884
-msgid "Specify -1 to have this value determined as a fraction of shared_buffers."
+#: utils/misc/guc_tables.c:3021
+#, fuzzy
+#| msgid "Specify -1 to have this value determined as a fraction of shared_buffers."
+msgid "-1 means use a fraction of \"shared_buffers\"."
 msgstr "Especifique -1 para que este valor sea determinado como fracción de shared_buffers."
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "Tiempo entre sincronizaciones de WAL ejecutadas por el proceso escritor de WAL."
 
-#: utils/misc/guc_tables.c:2905
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "Cantidad de WAL escrito por el proceso escritor de WAL que desencadena una sincronización (flush)."
 
-#: utils/misc/guc_tables.c:2916
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "Tamaño mínimo del nuevo archivo para hacer fsync en lugar de escribir WAL."
 
-#: utils/misc/guc_tables.c:2927
+#: utils/misc/guc_tables.c:3064
 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_tables.c:2938
+#: utils/misc/guc_tables.c:3075
 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_tables.c:2948
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "Define el tamaño máximo de WAL que puede ser reservado por slots de replicación."
 
-#: utils/misc/guc_tables.c:2949
-msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk."
+#: utils/misc/guc_tables.c:3086
+#, fuzzy
+#| msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk."
+msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
 msgstr "Los slots de replicación serán invalidados, y los segmentos de WAL eliminados o reciclados, si se usa esta cantidad de espacio de disco en WAL."
 
-#: utils/misc/guc_tables.c:2961
+#: utils/misc/guc_tables.c:3098
 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_tables.c:2972
+#: utils/misc/guc_tables.c:3109
+#, fuzzy
+#| msgid "User was using a logical replication slot that must be invalidated."
+msgid "Sets the duration a replication slot can remain idle before it is invalidated."
+msgstr "El usuario estaba usando un slot de replicación lógica que debía ser invalidado."
+
+#: utils/misc/guc_tables.c:3121
 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_tables.c:2984
+#: utils/misc/guc_tables.c:3133
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
 msgstr "Número mínimo de transacciones abiertas concurrentes antes de efectuar «commit_delay»."
 
-#: utils/misc/guc_tables.c:2995
+#: utils/misc/guc_tables.c:3144
 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_tables.c:2996
+#: utils/misc/guc_tables.c:3145
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr "Esto afecta los tipos real, de doble precisión, y geométricos. Un valor del parámetro cero o negativo se agrega a la cantidad estándar de dígitos (FLT_DIG o DBL_DIG, según sea apropiado). Cualquier valor mayor que cero selecciona el modo de salida preciso."
 
-#: utils/misc/guc_tables.c:3008
-msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by log_statement_sample_rate."
+#: utils/misc/guc_tables.c:3157
+#, fuzzy
+#| msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by log_statement_sample_rate."
+msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
 msgstr "Establece el tiempo mínimo de ejecución a partir del cual se registra una muestra de la sentencia. El muestreo es determinado por log_statement_sample_rate."
 
-#: utils/misc/guc_tables.c:3011
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "Cero registra una muestra de todas las consultas. -1 desactiva esta funcionalidad."
+#: utils/misc/guc_tables.c:3160
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr ""
 
-#: utils/misc/guc_tables.c:3021
+#: utils/misc/guc_tables.c:3170
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr "Establece el tiempo mínimo de ejecución a partir del cual se registran todas las sentencias."
 
-#: utils/misc/guc_tables.c:3023
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Cero imprime todas las consultas. -1 desactiva esta funcionalidad."
+#: utils/misc/guc_tables.c:3172
+msgid "-1 disables logging statement durations. 0 means log all statement durations."
+msgstr ""
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3182
 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_tables.c:3035
-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_tables.c:3184
+msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
+msgstr ""
 
-#: utils/misc/guc_tables.c:3045
+#: utils/misc/guc_tables.c:3194
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr "Define el largo máximo en bytes de valores de parámetros «bind» enviados al log al registrar sentencias."
 
-#: utils/misc/guc_tables.c:3047 utils/misc/guc_tables.c:3059
-msgid "-1 to print values in full."
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
+#, fuzzy
+#| msgid "-1 to print values in full."
+msgid "-1 means log values in full."
 msgstr "-1 para mostrar los valores completos."
 
-#: utils/misc/guc_tables.c:3057
+#: utils/misc/guc_tables.c:3206
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr "Define el largo máximo en bytes de valores de parámetros «bind» enviados al log, en caso de error."
 
-#: utils/misc/guc_tables.c:3069
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr "Tiempo de descanso entre rondas del background writer"
 
-#: utils/misc/guc_tables.c:3080
+#: utils/misc/guc_tables.c:3229
 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_tables.c:3103
+#: utils/misc/guc_tables.c:3230
+#, fuzzy
+#| msgid "-1 disables inlining."
+msgid "0 disables background writing."
+msgstr "-1 inhabilita el «inlining»."
+
+#: utils/misc/guc_tables.c:3252
 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_tables.c:3117
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
+msgid "0 disables simultaneous requests."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3266
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr "Una variante de «effective_io_concurrency» que se usa para tareas de mantención."
 
-#: utils/misc/guc_tables.c:3132
+#: utils/misc/guc_tables.c:3281
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
 msgstr "Límite del tamaño de lecturas y escrituras de datos."
 
-#: utils/misc/guc_tables.c:3157
+#: utils/misc/guc_tables.c:3309
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3321
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "Número máximo de procesos ayudantes concurrentes."
 
-#: utils/misc/guc_tables.c:3169
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr "Número máximo de procesos ayudantes de replicación lógica."
 
-#: utils/misc/guc_tables.c:3181
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "Número máximo de procesos ayudantes de sincronización por suscripción."
 
-#: utils/misc/guc_tables.c:3193
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "Número máximo de procesos ayudantes de “apply” por suscripción."
 
-#: utils/misc/guc_tables.c:3203
+#: utils/misc/guc_tables.c:3392
+#, fuzzy
+#| msgid "Sets the maximum number of simultaneously defined replication slots."
+msgid "Sets the maximum number of active replication origins."
+msgstr "Define la cantidad máxima de slots de replicación definidos simultáneamente."
+
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "Define el tiempo a esperar antes de forzar la rotación del archivo de registro del servidor."
 
-#: utils/misc/guc_tables.c:3215
+#: utils/misc/guc_tables.c:3404
+msgid "0 disables time-based creation of new log files."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "Define el tamaño máximo que un archivo de registro del servidor puede alcanzar antes de ser rotado."
 
-#: utils/misc/guc_tables.c:3227
+#: utils/misc/guc_tables.c:3416
+msgid "0 disables size-based creation of new log files."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "Muestra la cantidad máxima de argumentos de funciones."
 
-#: utils/misc/guc_tables.c:3238
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "Muestra la cantidad máxima de claves de índices."
 
-#: utils/misc/guc_tables.c:3249
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "Muestra el largo máximo de identificadores."
 
-#: utils/misc/guc_tables.c:3260
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "Muestra el tamaño de un bloque de disco."
 
-#: utils/misc/guc_tables.c:3271
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "Muestra el número de páginas por archivo en disco."
 
-#: utils/misc/guc_tables.c:3282
+#: utils/misc/guc_tables.c:3481
 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_tables.c:3293
+#: utils/misc/guc_tables.c:3492
 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_tables.c:3305
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "Muestra el tamaño de los segmentos de WAL."
 
-#: utils/misc/guc_tables.c:3318
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
 msgstr "Período durante el cual se deberían conservar los archivos de sumarización de WAL."
 
-#: utils/misc/guc_tables.c:3331
+#: utils/misc/guc_tables.c:3518
+msgid "0 disables automatic summary file deletion."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "Tiempo de descanso entre ejecuciones de autovacuum."
 
-#: utils/misc/guc_tables.c:3341
+#: utils/misc/guc_tables.c:3540
 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_tables.c:3350
-msgid "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert vacuums."
-msgstr "Número mínimo de inserciones de tuplas antes de ejecutar vacuum, o -1 para desactivar vacuums por inserciones."
+#: utils/misc/guc_tables.c:3549
+#, fuzzy
+#| msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgid "Maximum 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_tables.c:3550
+#, fuzzy
+#| msgid "-1 disables optimization."
+msgid "-1 disables the maximum threshold."
+msgstr "-1 inhabilita la optimización."
+
+#: utils/misc/guc_tables.c:3558
+#, fuzzy
+#| msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "Número mínimo de updates o deletes antes de ejecutar vacuum."
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3559
+#, fuzzy
+#| msgid "-1 disables inlining."
+msgid "-1 disables insert vacuums."
+msgstr "-1 inhabilita el «inlining»."
+
+#: utils/misc/guc_tables.c:3567
 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_tables.c:3369
+#: utils/misc/guc_tables.c:3577
 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 “wraparound” de ID de transacción."
 
-#: utils/misc/guc_tables.c:3381
+#: utils/misc/guc_tables.c:3589
 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 “wraparound” de ID de multixacts."
 
-#: utils/misc/guc_tables.c:3391
+#: utils/misc/guc_tables.c:3599
+#, fuzzy
+#| msgid "Sets the maximum memory to be used by each autovacuum worker process."
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr "Establece el límite de memoria que cada proceso «autovacuum worker» usará."
+
+#: utils/misc/guc_tables.c:3608
 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_tables.c:3401
+#: utils/misc/guc_tables.c:3618
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "Cantidad máxima de procesos ayudantes paralelos por operación de mantención."
 
-#: utils/misc/guc_tables.c:3411
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "Cantidad máxima de locks de predicado por nodo de ejecución."
 
-#: utils/misc/guc_tables.c:3422
+#: utils/misc/guc_tables.c:3639
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "Define la cantidad máxima de procesos ayudantes que pueden estar activos en un momento dado."
 
-#: utils/misc/guc_tables.c:3433
+#: utils/misc/guc_tables.c:3650
 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_tables.c:3444
+#: utils/misc/guc_tables.c:3651
+#, fuzzy
+#| msgid "Reduce \"maintenance_work_mem\"."
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "Reduzca «maintenance_work_mem»."
+
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "Tiempo entre cada emisión de TCP keepalive."
 
-#: utils/misc/guc_tables.c:3445 utils/misc/guc_tables.c:3456
-#: utils/misc/guc_tables.c:3580
-msgid "A value of 0 uses the system default."
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673
+#: utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
+#, fuzzy
+#| msgid "A value of 0 uses the system default."
+msgid "0 means use the system default."
 msgstr "Un valor 0 usa el valor por omisión del sistema."
 
-#: utils/misc/guc_tables.c:3455
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "Tiempo entre retransmisiones TCP keepalive."
 
-#: utils/misc/guc_tables.c:3466
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation 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_tables.c:3477
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Cantidad máxima de retransmisiones TCP keepalive."
 
-#: utils/misc/guc_tables.c:3478
-msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
+#: utils/misc/guc_tables.c:3695
+#, fuzzy
+#| msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
+msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
 msgstr "Número de retransmisiones consecutivas de keepalive que pueden ser perdidas antes que una conexión se considere muerta.  Cero usa el valor por omisión del sistema."
 
-#: utils/misc/guc_tables.c:3489
+#: utils/misc/guc_tables.c:3706
 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_tables.c:3500
+#: utils/misc/guc_tables.c:3707
+#, fuzzy
+#| msgid "-1 means no limit."
+msgid "0 means no limit."
+msgstr "-1 significa sin límite."
+
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "Define la suposición del optimizador sobre el tamaño total de los caches de datos."
 
-#: utils/misc/guc_tables.c:3501
+#: utils/misc/guc_tables.c:3717
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr "Esto es, el tamaño total de caches (cache del kernel y búfers compartidos) usados por archivos de datos de PostgreSQL. Esto se mide en páginas de disco, que normalmente son de 8 kB cada una."
 
-#: utils/misc/guc_tables.c:3512
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "Define la cantidad mínima de datos en una tabla para un recorrido paralelo."
 
-#: utils/misc/guc_tables.c:3513
+#: utils/misc/guc_tables.c:3729
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Si el planificador estima que leerá un número de páginas de tabla demasiado pequeñas para alcanzar este límite, no se considerará una búsqueda paralela."
 
-#: utils/misc/guc_tables.c:3523
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "Define la cantidad mínima de datos en un índice para un recorrido paralelo."
 
-#: utils/misc/guc_tables.c:3524
+#: utils/misc/guc_tables.c:3740
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Si el planificador estima que leerá un número de páginas de índice demasiado pequeñas para alcanzar este límite, no se considerará una búsqueda paralela."
 
-#: utils/misc/guc_tables.c:3535
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "Muestra la versión del servidor como un número entero."
 
-#: utils/misc/guc_tables.c:3546
+#: utils/misc/guc_tables.c:3762
 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_tables.c:3547
-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_tables.c:3763
+#, fuzzy
+#| msgid "constraints on temporary tables may reference only temporary tables"
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
+msgstr "las restricciones en tablas temporales sólo pueden hacer referencia a tablas temporales"
 
-#: utils/misc/guc_tables.c:3557
+#: utils/misc/guc_tables.c:3773
 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_tables.c:3568
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Define el tamaño máximo de la lista de pendientes de un índice GIN."
 
-#: utils/misc/guc_tables.c:3579
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "Tiempo de expiración de TCP."
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "El tamaño de huge page que se debería solicitar."
 
-#: utils/misc/guc_tables.c:3601
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "Escribir cachés de sistema de forma agresiva para propósitos de depuración."
 
-#: utils/misc/guc_tables.c:3624
+#: utils/misc/guc_tables.c:3818
+msgid "0 means use normal caching behavior."
+msgstr ""
+
+#: utils/misc/guc_tables.c:3840
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr "Establece el intervalo entre revisiones de desconexión mientras se ejecutan consultas."
 
-#: utils/misc/guc_tables.c:3635
+#: utils/misc/guc_tables.c:3841
+#, fuzzy
+#| msgid "Enables SSL connections."
+msgid "0 disables connection checks."
+msgstr "Permitir conexiones SSL."
+
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr "Tiempo a esperar entre actualizaciones para operaciones largas durante el inicio."
 
-#: utils/misc/guc_tables.c:3637
-msgid "0 turns this feature off."
-msgstr "Cero desactiva esta característica."
+#: utils/misc/guc_tables.c:3853
+msgid "0 disables progress updates."
+msgstr ""
 
-#: utils/misc/guc_tables.c:3647
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "Define la cantidad de iteraciones para generación de secretos SCRAM."
 
-#: utils/misc/guc_tables.c:3667
+#: utils/misc/guc_tables.c:3883
 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_tables.c:3678
+#: utils/misc/guc_tables.c:3894
 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_tables.c:3689
+#: utils/misc/guc_tables.c:3905
 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_tables.c:3700
+#: utils/misc/guc_tables.c:3916
 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_tables.c:3711
+#: utils/misc/guc_tables.c:3927
 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_tables.c:3722
+#: utils/misc/guc_tables.c:3938
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr "Estimación del costo de pasar cada tupla (fila) desde un proceso ayudante al proceso servidor principal."
 
-#: utils/misc/guc_tables.c:3733
+#: utils/misc/guc_tables.c:3949
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr "Estimación del costo de lanzar procesos ayudantes para consultas en paralelo."
 
-#: utils/misc/guc_tables.c:3745
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "Ejecutar compilación JIT si la consulta es más cara."
 
-#: utils/misc/guc_tables.c:3746
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 inhabilita compilación JIT."
 
-#: utils/misc/guc_tables.c:3756
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "Optimizar funciones compiladas en tiempo de ejecución (JIT) si la consulta es más cara."
 
-#: utils/misc/guc_tables.c:3757
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1 inhabilita la optimización."
 
-#: utils/misc/guc_tables.c:3767
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "Ejecutar «inlining» JIT si la consulta es más cara."
 
-#: utils/misc/guc_tables.c:3768
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 inhabilita el «inlining»."
 
-#: utils/misc/guc_tables.c:3778
+#: utils/misc/guc_tables.c:3994
 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_tables.c:3790
+#: utils/misc/guc_tables.c:4006
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr "Estimación del tamaño promedio de la tabla de trabajo de una consulta recursiva."
 
-#: utils/misc/guc_tables.c:3802
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: presión selectiva dentro de la población."
 
-#: utils/misc/guc_tables.c:3813
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: semilla para la selección aleatoria de caminos."
 
-#: utils/misc/guc_tables.c:3824
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "Múltiplo de «work_mem» para el uso de tablas de hash."
 
-#: utils/misc/guc_tables.c:3835
+#: utils/misc/guc_tables.c:4051
 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_tables.c:3845
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "Semilla para la generación de números aleatorios."
 
-#: utils/misc/guc_tables.c:3856
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Tiempo de descanso de vacuum en milisegundos."
 
-#: utils/misc/guc_tables.c:3867
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Tiempo de descanso de vacuum en milisegundos, para autovacuum."
 
-#: utils/misc/guc_tables.c:3878
+#: utils/misc/guc_tables.c:4084
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4094
 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_tables.c:3888
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "Número de inserts de tuplas antes de ejecutar un vacuum, como fracción de reltuples."
 
-#: utils/misc/guc_tables.c:3898
+#: utils/misc/guc_tables.c:4114
 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_tables.c:3908
+#: utils/misc/guc_tables.c:4124
 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 checkpoint."
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:4134
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr "Fracción de sentencias que duren más de «log_min_duration_sample» a ser registradas."
 
-#: utils/misc/guc_tables.c:3919
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "Use un valor entre 0.0 (no registrar nunca) y 1.0 (registrar siempre)."
 
-#: utils/misc/guc_tables.c:3928
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "Define la fracción de transacciones desde la cual registrar en el log todas las sentencias."
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:4145
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr "Use un valor entre 0.0 (nunca registrar) y 1.0 (registrar todas las sentencias de todas las transacciones)."
 
-#: utils/misc/guc_tables.c:3948
+#: utils/misc/guc_tables.c:4155
+msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4156
+msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4174
 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_tables.c:3949
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "Esto sólo se utiliza si «archive_library» no está definido."
+#: utils/misc/guc_tables.c:4175
+msgid "An empty string means use \"archive_library\"."
+msgstr ""
 
-#: utils/misc/guc_tables.c:3958
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "Biblioteca que se invocará para archivar un archivo WAL."
 
-#: utils/misc/guc_tables.c:3959
-msgid "An empty string indicates that \"archive_command\" should be used."
+#: utils/misc/guc_tables.c:4185
+#, fuzzy
+#| msgid "An empty string indicates that \"archive_command\" should be used."
+msgid "An empty string means use \"archive_command\"."
 msgstr "Una cadena vacía indica que «archive_command» debería usarse."
 
-#: utils/misc/guc_tables.c:3968
+#: utils/misc/guc_tables.c:4194
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "Orden de shell que se invocará para recuperar un archivo WAL archivado."
 
-#: utils/misc/guc_tables.c:3978
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "Orden de shell que se invocará en cada «restart point»."
 
-#: utils/misc/guc_tables.c:3988
+#: utils/misc/guc_tables.c:4214
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr "Orden de shell que se invocará una vez al terminar la recuperación."
 
-#: utils/misc/guc_tables.c:3998
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "Especifica la línea de tiempo a la cual recuperar."
 
-#: utils/misc/guc_tables.c:4008
+#: utils/misc/guc_tables.c:4234
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr "Defina a «immediate» para terminar la recuperación en cuando se alcance el estado consistente."
 
-#: utils/misc/guc_tables.c:4017
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "Define el ID de transacción hasta el cual se ejecutará la recuperación."
 
-#: utils/misc/guc_tables.c:4026
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "Define la marca de tiempo hasta la cual se ejecutará la recuperación."
 
-#: utils/misc/guc_tables.c:4035
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "Define el nombre del punto de restauración hasta el cual se ejecutará la recuperación."
 
-#: utils/misc/guc_tables.c:4044
+#: utils/misc/guc_tables.c:4270
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr "Define el LSN de la ubicación de WAL hasta la cual se ejecutará la recuperación."
 
-#: utils/misc/guc_tables.c:4054
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "Define la cadena de conexión que se usará para conectarse al servidor de origen."
 
-#: utils/misc/guc_tables.c:4065
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "Define el nombre del slot de replicación a utilizar en el servidor de origen."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "Codificación del juego de caracteres del cliente."
 
-#: utils/misc/guc_tables.c:4086
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "Controla el prefijo que antecede cada línea registrada."
 
-#: utils/misc/guc_tables.c:4087
-msgid "If blank, no prefix is used."
-msgstr "si está en blanco, no se usa prefijo."
+#: utils/misc/guc_tables.c:4313
+msgid "An empty string means no prefix."
+msgstr ""
 
-#: utils/misc/guc_tables.c:4096
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "Define el huso horario usando en los mensajes registrados."
 
-#: utils/misc/guc_tables.c:4106
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "Formato de salida para valores de horas y fechas."
 
-#: utils/misc/guc_tables.c:4107
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "También controla la interpretación de entradas ambiguas de fechas"
 
-#: utils/misc/guc_tables.c:4118
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "Define el método de acceso a tablas por omisión para nuevas tablas."
 
-#: utils/misc/guc_tables.c:4129
+#: utils/misc/guc_tables.c:4355
 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_tables.c:4130
-msgid "An empty string selects the database's default tablespace."
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
+#, fuzzy
+#| msgid "An empty string selects the database's default tablespace."
+msgid "An empty string means use the database's default tablespace."
 msgstr "Una cadena vacía especifica el tablespace por omisión de la base de datos."
 
-#: utils/misc/guc_tables.c:4140
+#: utils/misc/guc_tables.c:4366
 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_tables.c:4151
+#: utils/misc/guc_tables.c:4377
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr "define si un rol con CREATEROLE automáticamente se otorga ese rol a si mismo, y con qué opciones."
 
-#: utils/misc/guc_tables.c:4163
+#: utils/misc/guc_tables.c:4379
+msgid "An empty string disables automatic self grants."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Ruta para módulos dinámicos."
 
-#: utils/misc/guc_tables.c:4164
+#: utils/misc/guc_tables.c:4390
 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_tables.c:4177
+#: utils/misc/guc_tables.c:4403
+#, fuzzy
+#| msgid "Sets the file permissions for log files."
+msgid "Sets the path for extension control files."
+msgstr "Define los privilegios para los archivos del registro del servidor."
+
+#: utils/misc/guc_tables.c:4404
+msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Ubicación del archivo de llave del servidor Kerberos."
 
-#: utils/misc/guc_tables.c:4188
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Nombre del servicio Bonjour."
 
-#: utils/misc/guc_tables.c:4198
+#: utils/misc/guc_tables.c:4427
+msgid "An empty string means use the computer name."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "Idioma en el que se despliegan los mensajes."
 
-#: utils/misc/guc_tables.c:4208
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
+msgid "An empty string means use the operating system setting."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Configuración regional para formatos de moneda."
 
-#: utils/misc/guc_tables.c:4218
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "Configuración regional para formatos de números."
 
-#: utils/misc/guc_tables.c:4228
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "Configuración regional para formatos de horas y fechas."
 
-#: utils/misc/guc_tables.c:4238
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Bibliotecas compartidas a precargar en cada proceso."
 
-#: utils/misc/guc_tables.c:4249
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "Bibliotecas compartidas a precargar en el servidor."
 
-#: utils/misc/guc_tables.c:4260
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Bibliotecas compartidas no privilegiadas a precargar en cada proceso."
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4509
 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_tables.c:4283
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "Muestra la codificación de caracteres del servidor (base de datos)."
 
-#: utils/misc/guc_tables.c:4295
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "Versión del servidor."
 
-#: utils/misc/guc_tables.c:4307
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "Define el rol actual."
 
-#: utils/misc/guc_tables.c:4319
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "Define el nombre del usuario de sesión."
 
-#: utils/misc/guc_tables.c:4330
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "Define el destino de la salida del registro del servidor."
 
-#: utils/misc/guc_tables.c:4331
+#: utils/misc/guc_tables.c:4569
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr "Son aceptables combinaciones de «stderr», «syslog», «csvlog», «jsonlog» y «eventlog», dependendiendo de la plataforma."
 
-#: utils/misc/guc_tables.c:4342
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "Define el directorio de destino de los archivos del registro del servidor."
 
-#: utils/misc/guc_tables.c:4343
+#: utils/misc/guc_tables.c:4581
 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_tables.c:4353
+#: utils/misc/guc_tables.c:4591
 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_tables.c:4364
+#: utils/misc/guc_tables.c:4602
 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_tables.c:4375
+#: utils/misc/guc_tables.c:4613
 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_tables.c:4386
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Huso horario para desplegar e interpretar valores de tiempo."
 
-#: utils/misc/guc_tables.c:4396
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "Selecciona un archivo de abreviaciones de huso horario."
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Grupo dueño del socket de dominio Unix."
 
-#: utils/misc/guc_tables.c:4407
-msgid "The owning user of the socket is always the user that starts the server."
+#: utils/misc/guc_tables.c:4645
+#, fuzzy
+#| msgid "The owning user of the socket is always the user that starts the server."
+msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
 msgstr "El usuario dueño del socket siempre es el usuario que inicia el servidor."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4655
 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_tables.c:4428
+#: utils/misc/guc_tables.c:4666
 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_tables.c:4443
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "Define la ubicación del directorio de datos."
 
-#: utils/misc/guc_tables.c:4454
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "Define la ubicación del archivo principal de configuración del servidor."
 
-#: utils/misc/guc_tables.c:4465
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Define la ubicación del archivo de configuración «hba» del servidor."
 
-#: utils/misc/guc_tables.c:4476
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Define la ubicación del archivo de configuración «ident» del servidor."
 
-#: utils/misc/guc_tables.c:4487
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Registra el PID de postmaster en el archivo especificado."
 
-#: utils/misc/guc_tables.c:4498
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "Muestra el nombre de la biblioteca SSL."
 
-#: utils/misc/guc_tables.c:4513
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "Ubicación del archivo de certificado SSL del servidor."
 
-#: utils/misc/guc_tables.c:4523
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "Ubicación del archivo de la llave SSL privada del servidor."
 
-#: utils/misc/guc_tables.c:4533
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "Ubicación del archivo de autoridad certificadora SSL."
 
-#: utils/misc/guc_tables.c:4543
+#: utils/misc/guc_tables.c:4781
 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_tables.c:4553
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "Ubicación del directorio de lista de revocación de certificados SSL"
 
-#: utils/misc/guc_tables.c:4563
+#: utils/misc/guc_tables.c:4801
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr "Número de standbys sincrónicos y lista de nombres de los potenciales sincrónicos."
 
-#: utils/misc/guc_tables.c:4574
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "Define la configuración de búsqueda en texto por omisión."
 
-#: utils/misc/guc_tables.c:4584
-msgid "Sets the list of allowed SSL ciphers."
+#: utils/misc/guc_tables.c:4822
+#, fuzzy
+#| msgid "Sets the list of allowed SSL ciphers."
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "Define la lista de cifrados SSL permitidos."
+
+#: utils/misc/guc_tables.c:4823
+#, fuzzy
+#| msgid "An empty string selects the database's default tablespace."
+msgid "An empty string means use the default cipher suites."
+msgstr "Una cadena vacía especifica el tablespace por omisión de la base de datos."
+
+#: utils/misc/guc_tables.c:4833
+#, fuzzy
+#| msgid "Sets the list of allowed SSL ciphers."
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
 msgstr "Define la lista de cifrados SSL permitidos."
 
-#: utils/misc/guc_tables.c:4599
-msgid "Sets the curve to use for ECDH."
-msgstr "Define la curva a usar para ECDH."
+#: utils/misc/guc_tables.c:4848
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr ""
 
-#: utils/misc/guc_tables.c:4614
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "Ubicación del archivo de parámetros DH para SSL."
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4864
+#, fuzzy
+#| msgid "An empty string selects the database's default tablespace."
+msgid "An empty string means use compiled-in default parameters."
+msgstr "Una cadena vacía especifica el tablespace por omisión de la base de datos."
+
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "Orden para obtener frases clave para SSL."
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4875
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4885
 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_tables.c:4647
+#: utils/misc/guc_tables.c:4896
 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_tables.c:4658
+#: utils/misc/guc_tables.c:4907
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "Define los gestores de recursos WAL para los cuales hacer verificaciones de consistencia WAL."
 
-#: utils/misc/guc_tables.c:4659
+#: utils/misc/guc_tables.c:4908
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr "Se registrarán imágenes de página completa para todos los bloques de datos, y comparados con los resultados de la aplicación de WAL."
 
-#: utils/misc/guc_tables.c:4669
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "Proveedor JIT a usar."
 
-#: utils/misc/guc_tables.c:4680
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "Registrar el backtrace para errores que se produzcan en estas funciones."
 
-#: utils/misc/guc_tables.c:4691
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "Usar I/O directo para accesos a archivos."
 
-#: utils/misc/guc_tables.c:4702
+#: utils/misc/guc_tables.c:4941
+msgid "An empty string disables direct I/O."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4951
 msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
 msgstr "Lista los nombres de slots de replicación de servidores standby a los que los procesos “WAL sender” esperarán."
 
-#: utils/misc/guc_tables.c:4704
+#: utils/misc/guc_tables.c:4953
 msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
 msgstr "Los procesos “WAL sender” lógicos enviarán cambios decodificados a los “plugins” de salida sólo después de que los slots de replicación especificados han confirmado recibir el WAL."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4965
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr "Prohibir acceso a las relaciones no de sistema de los tipos especificados."
 
-#: utils/misc/guc_tables.c:4736
+#: utils/misc/guc_tables.c:4976
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr ""
+
+#: utils/misc/guc_tables.c:4987
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr ""
+
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Define si «\\'» está permitido en literales de cadena."
 
-#: utils/misc/guc_tables.c:4746
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "Formato de salida para bytea."
 
-#: utils/misc/guc_tables.c:4756
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "Nivel de mensajes enviados al cliente."
 
-#: utils/misc/guc_tables.c:4757 utils/misc/guc_tables.c:4853
-#: utils/misc/guc_tables.c:4864
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125
+#: utils/misc/guc_tables.c:5136
 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_tables.c:4767
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "Habilita el cálculo de identificadores de consulta."
 
-#: utils/misc/guc_tables.c:4777
+#: utils/misc/guc_tables.c:5049
 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_tables.c:4778
+#: utils/misc/guc_tables.c:5050
 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_tables.c:4789
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "Define el método de compresión por omisión para valores comprimibles."
 
-#: utils/misc/guc_tables.c:4800
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Nivel de aislación (isolation level) de transacciones nuevas."
 
-#: utils/misc/guc_tables.c:4810
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "Define el nivel de aislación de la transacción en curso."
 
-#: utils/misc/guc_tables.c:4821
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "Formato de salida para valores de intervalos."
 
-#: utils/misc/guc_tables.c:4832
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "Nivel de log a usar para reportar cadenas de configuración ICU no válidas."
 
-#: utils/misc/guc_tables.c:4842
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "Verbosidad de los mensajes registrados."
 
-#: utils/misc/guc_tables.c:4852
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "Nivel de mensajes registrados."
 
-#: utils/misc/guc_tables.c:4863
+#: utils/misc/guc_tables.c:5135
 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_tables.c:4874
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "Define el tipo de sentencias que se registran."
 
-#: utils/misc/guc_tables.c:4884
+#: utils/misc/guc_tables.c:5156
 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_tables.c:4895
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Define el comportamiento de la sesión con respecto a “triggers” y reglas de reescritura."
 
-#: utils/misc/guc_tables.c:4905
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "Define el nivel de sincronización de la transacción en curso."
 
-#: utils/misc/guc_tables.c:4915
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "Permite el archivado de WAL usando «archive_command»."
 
-#: utils/misc/guc_tables.c:4925
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "Acción a ejecutar al alcanzar el destino de recuperación."
 
-#: utils/misc/guc_tables.c:4935
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "Recolectar estadísticas de actividad de funciones en la base de datos."
 
-#: utils/misc/guc_tables.c:4946
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "Definir la consistencia de accesos a los datos de estadísticas."
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "Comprime las páginas completas escritas a WAL (FPI) con el método especificado."
 
-#: utils/misc/guc_tables.c:4966
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "Establece el nivel de información escrita al WAL."
 
-#: utils/misc/guc_tables.c:4976
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Escoge la implementación de memoria compartida dinámica que se usará."
 
-#: utils/misc/guc_tables.c:4986
+#: utils/misc/guc_tables.c:5258
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr "Escoge la implementación de memoria compartida dinámica que se usará para la región principal de memoria compartida."
 
-#: utils/misc/guc_tables.c:4996
+#: utils/misc/guc_tables.c:5268
+msgid "Selects the file copy method."
+msgstr ""
+
+#: utils/misc/guc_tables.c:5278
+#, fuzzy
+#| msgid "Selects the method used for forcing WAL updates to disk."
+msgid "Selects the method used for extending data files."
+msgstr "Selecciona el método usado para forzar escritura de WAL a disco."
+
+#: utils/misc/guc_tables.c:5288
 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_tables.c:5006
+#: utils/misc/guc_tables.c:5298
 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_tables.c:5016
+#: utils/misc/guc_tables.c:5308
 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_tables.c:5027
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Usar páginas grandes (huge) en Linux o Windows."
 
-#: utils/misc/guc_tables.c:5037
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
 msgstr "Indica el estado de las “huge pages”."
 
-#: utils/misc/guc_tables.c:5048
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "Pre-cargar bloques referenciados durante la recuperación."
 
-#: utils/misc/guc_tables.c:5049
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "Busca adelantadamente en el WAL para encontrar referencias a datos que no están en cache."
 
-#: utils/misc/guc_tables.c:5058
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "Fuerza al optimizador a usar planes paralelos."
 
-#: utils/misc/guc_tables.c:5059
+#: utils/misc/guc_tables.c:5351
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr "Esto puede usarse para verificar la infrastructura de consultas paralelas forzando al optimizar a generar planes que contienen nodos que utilizan la comunicación entre procesos hijos y el principal."
 
-#: utils/misc/guc_tables.c:5071
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "Escoge el algoritmo para cifrar contraseñas."
 
-#: utils/misc/guc_tables.c:5081
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "Controla la selección del optimizador de planes genéricos o «custom»."
 
-#: utils/misc/guc_tables.c:5082
+#: utils/misc/guc_tables.c:5374
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr "Las sentencias preparadas pueden tener planes genéricos y «custom», y el optimizador intentará escoger cuál es mejor. Esto puede usarse para controlar manualmente el comportamiento."
 
-#: utils/misc/guc_tables.c:5094
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "Define la versión mínima del protocolo SSL/TLS a usar."
 
-#: utils/misc/guc_tables.c:5106
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "Define la versión máxima del protocolo SSL/TLS a usar."
 
-#: utils/misc/guc_tables.c:5118
+#: utils/misc/guc_tables.c:5410
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr "Establece el método para sincronizar el directorio de datos antes de la recuperación ante una caída."
 
-#: utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5419
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr "Fuerza el flujo o serialización inmediatos de los cambios en transacciones grandes."
 
-#: utils/misc/guc_tables.c:5128
+#: utils/misc/guc_tables.c:5420
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr "En el publicador, permite serializar o transmitir en flujo cada cambio en la decodificación lógica. En el suscriptor, permite la serialización de todos los cambios a archivos y notifica a los procesos paralelos de “apply” para leerlos y aplicarlos al término de la transacción."
 
+#: utils/misc/guc_tables.c:5432
+#, fuzzy
+#| msgid "Selects the method used for forcing WAL updates to disk."
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "Selecciona el método usado para forzar escritura de WAL a disco."
+
 #: utils/misc/help_config.c:129
 #, c-format
 msgid "internal error: unrecognized run-time parameter type\n"
@@ -30320,6 +32190,27 @@ msgstr "la consulta sería afectada por la política de seguridad de registros p
 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/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "límite de profundidad de stack alcanzado"
+
+#: utils/misc/stack_depth.c:102
+#, 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."
+
+#: utils/misc/stack_depth.c:149
+#, fuzzy, c-format
+#| msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "«max_stack_depth» no debe exceder %ldkB."
+
+#: utils/misc/stack_depth.c:151
+#, 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."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -30335,57 +32226,57 @@ msgstr "la abreviación del huso horario «%s» es demasiado larga (máximo %d c
 msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr "desplazamiento de huso horario %d está fuera de rango en el archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr "falta una abreviación de huso horario en el archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr "falta un desplazamiento de huso horario en el archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr "número no válido para desplazamiento de huso horario en archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "sintaxis no válida en archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "abreviación de huso horario «%s» está definida múltiples veces"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
 msgstr "Entrada en archivo de huso horario «%s», línea %d, causa conflictos con entrada en archivo «%s», línea %d."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "nombre de huso horario «%s» no válido"
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "límite de recursión excedido en el archivo «%s»"
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "no se pudo leer archivo de huso horario «%s»: %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "línea demasiado larga en archivo de huso horario «%s», línea %d"
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "@INCLUDE sin nombre de archivo en archivo de huso horario «%s», línea %d"
@@ -30401,12 +32292,12 @@ msgstr "Falla al crear el contexto de memoria «%s»."
 msgid "could not attach to dynamic shared area"
 msgstr "no se pudo adjuntar al segmento de memoria compartida dinámica"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "Falló una petición de tamaño %zu en el contexto de memoria «%s»."
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "registrando contextos de memoria del PID %d"
@@ -30447,115 +32338,116 @@ msgid "cannot perform transaction commands inside a cursor loop that is not read
 msgstr "no se pueden ejecutar órdenes de transacción dentro de un bucle de cursor que no es de sólo lectura"
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
-#, c-format
-msgid "could not seek to block %lld of temporary file"
+#, fuzzy, c-format
+#| msgid "could not seek to block %lld of temporary file"
+msgid "could not seek to block %<PRId64> of temporary file"
 msgstr "no se pudo posicionar (seek) en el bloque %lld del archivo temporal"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr "trozo inesperado en archivo temporal del tuplestore compartido"
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "no se pudo posicionar (seek) en el bloque %u en el archivo temporal del tuplestore compartido"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "no se pueden tener más de %d pasadas para un ordenamiento externo"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "no se pudo crear el índice único «%s»"
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "La llave %s está duplicada."
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Existe una llave duplicada."
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1308 utils/sort/tuplestore.c:1373
+#: utils/sort/tuplestore.c:1382
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "no se pudo posicionar (seek) en el archivo temporal del tuplestore"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "La transacción de origen ya no está en ejecución."
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "no se puede exportar snapshots desde una subtransacción"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "datos no válidos en archivo de snapshot «%s»"
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, 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:1402
+#: utils/time/snapmgr.c:1420
 #, 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:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "identificador de snapshot no válido: «%s»"
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "no existe el snapshot «%s»"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, 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:1528
+#: utils/time/snapmgr.c:1546
 #, 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:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "no se puede importar un snapshot desde una base de datos diferente"
 
-#: gram.y:1231
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD ya no está soportado"
 
-#: gram.y:1232
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "Quite UNENCRYPTED para almacenar la contraseña en su lugar en forma cifrada."
 
-#: gram.y:1559 gram.y:1575
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS no puede incluir elementos de esquema"
@@ -30565,403 +32457,413 @@ msgstr "CREATE SCHEMA IF NOT EXISTS no puede incluir elementos de esquema"
 msgid "current database cannot be changed"
 msgstr "no se puede cambiar la base de datos activa"
 
-#: gram.y:1860
+#: gram.y:1868
 #, c-format
 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:2487
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "el número de columna debe estar en el rango de 1 a %d"
 
-#: gram.y:3083
+#: gram.y:2675
+#, fuzzy, c-format
+#| msgid "%s constraints cannot be marked NOT VALID"
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "las restricciones %s no pueden ser marcadas NOT VALID"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "la opción de secuencia «%s» no está soportada aquí"
 
-#: gram.y:3122
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "el módulo para partición de hash fue especificado más de una vez"
 
-#: gram.y:3131
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "el remanente para partición de hash fue especificado más de una vez"
 
-#: gram.y:3138
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "especificación de borde de partición hash «%s» no reconocida"
 
-#: gram.y:3146
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "el módulo para una partición hash debe ser especificado"
 
-#: gram.y:3150
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "remanente en partición hash debe ser especificado"
 
-#: gram.y:3358 gram.y:3392
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT no están permitidos con PROGRAM"
 
-#: gram.y:3364
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "la cláusula WHERE no está permitida con COPY TO"
 
-#: gram.y:3712 gram.y:3719 gram.y:13023 gram.y:13031
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL está obsoleto para la creación de tablas temporales"
 
-#: gram.y:3995
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "para una columna generada, GENERATED ALWAYS debe ser especificado"
 
-#: gram.y:4432
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "una lista de columnas con %s sólo está soportada para acciones ON DELETE"
 
-#: gram.y:5151
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM ya no está soportado"
 
-#: gram.y:5849
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "opción de seguridad de registro «%s» no reconocida"
 
-#: gram.y:5850
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "sólo se admiten actualmente políticas PERMISSIVE o RESTRICTIVE."
 
-#: gram.y:5935
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER no está soportado"
 
-#: gram.y:5972
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "se han especificado “triggers” por eventos duplicados"
 
-#: gram.y:6121
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "propiedades de restricción contradictorias"
 
-#: gram.y:6220
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION no está implementado"
 
-#: gram.y:6537
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "eliminar un valor de enum no está implementado"
 
-#: gram.y:6655
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK ya no es requerido"
-
-#: gram.y:6656
-#, c-format
-msgid "Update your data type."
-msgstr "Actualice su tipo de datos."
-
-#: gram.y:8529
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "las funciones de agregación no pueden tener argumentos de salida"
 
-#: gram.y:11221 gram.y:11240
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION no está soportado con vistas recursivas"
 
-#: gram.y:13162
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "la sintaxis LIMIT #,# no está soportada"
 
-#: gram.y:13163
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Use cláusulas LIMIT y OFFSET separadas."
 
-#: gram.y:14038
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "Sólo se permite un valor DEFAULT"
 
-#: gram.y:14047
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "sólo se permite un valor de PATH por columna"
 
-#: gram.y:14056
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "declaraciones NULL/NOT NULL en conflicto o redundantes para la columna «%s»"
 
-#: gram.y:14065
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "opción de columna «%s» no reconocida"
 
-#: gram.y:14147
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "el nombre de opción «%s» no puede usarse en XMLTABLE"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "sólo cadenas constantes están permitidas en la especificación de ruta JSON_TABLE"
 
-#: gram.y:14469
+#: gram.y:14641
 #, 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:14478
+#: gram.y:14650
 #, 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:14995
+#: gram.y:15167
 #, 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:15000
+#: gram.y:15172
 #, 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:15177
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "el predicado UNIQUE no está implementado"
 
-#: gram.y:15591
+#: gram.y:15764
 #, 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:15596
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "no se permite DISTINCT con WITHIN GROUP"
 
-#: gram.y:15601
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "no se permite VARIADIC con WITHIN GROUP"
 
-#: gram.y:16328 gram.y:16352
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "el inicio de «frame» no puede ser UNBOUNDED FOLLOWING"
 
-#: gram.y:16333
+#: gram.y:16506
 #, 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:16357
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "el fin de «frame» no puede ser UNBOUNDED PRECEDING"
 
-#: gram.y:16363
+#: gram.y:16536
 #, 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:16370
+#: gram.y:16543
 #, 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:16919
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "no se reconoce la codificación JSON: %s"
 
-#: gram.y:17243
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "el modificador de tipo no puede tener nombre de parámetro"
 
-#: gram.y:17249
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "el modificador de tipo no puede tener ORDER BY"
 
-#: gram.y:17317 gram.y:17324 gram.y:17331
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s no puede ser usado como nombre de rol aquí"
 
-#: gram.y:17421 gram.y:18906
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "la opción WITH TIES no puede ser especificada sin una cláusula ORDER BY"
 
-#: gram.y:18597 gram.y:18772
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "uso impropio de «*»"
 
-#: gram.y:18836
+#: gram.y:19006
 #, 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:18873
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "no se permiten múltiples cláusulas ORDER BY"
 
-#: gram.y:18884
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "no se permiten múltiples cláusulas OFFSET"
 
-#: gram.y:18893
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "no se permiten múltiples cláusulas LIMIT"
 
-#: gram.y:18902
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "no se permiten múltiples opciones limit"
-
-#: gram.y:18929
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "no se permiten múltiples cláusulas WITH"
 
-#: gram.y:19122
+#: gram.y:19295
 #, 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:19255
+#: gram.y:19429
 #, 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:19293 gram.y:19306
+#: gram.y:19469 gram.y:19482
 #, 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:19319
+#: gram.y:19495
 #, 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:19332
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "las restricciones %s no pueden ser marcadas NO INHERIT"
 
-#: gram.y:19354
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, fuzzy, c-format
+#| msgid "%s constraints cannot be marked NOT VALID"
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "las restricciones %s no pueden ser marcadas NOT VALID"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, fuzzy, c-format
+#| msgid "%s constraints cannot be marked DEFERRABLE"
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "las restricciones %s no pueden ser marcadas DEFERRABLE"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "estrategia de particionamiento «%s» no reconocida"
 
-#: gram.y:19378
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "sintaxis de lista de objetos de publicación no válida"
 
-#: gram.y:19379
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr "Uno de TABLE o TABLES IN SCHEMA debe ser especificado antes de un nombre de tabla o esquema."
 
-#: gram.y:19395
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "nombre de tabla no válido"
 
-#: gram.y:19416
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "cláusula WHERE no permitida para esquemas"
 
-#: gram.y:19423
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "especificación de columnas no permitida para esquemas"
 
-#: gram.y:19437
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "nombre de esquema no válido"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "nombre de archivo de configuración vacío: «%s»"
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr "no se pudo abrir el archivo de configuración «%s»: nivel de anidamiento máximo excedido"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "recursión de archivos de configuración en «%s»"
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de configuración «%s»: %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "omitiendo el archivo de configuración faltante «%s»"
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
 msgstr "error de sintaxis en el archivo «%s» línea %u, cerca del fin de línea"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "error de sintaxis en el archivo «%s» línea %u, cerca de la palabra «%s»"
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr "se encontraron demasiados errores de sintaxis, abandonando el archivo «%s»"
 
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
 msgstr ".decimal() sólo puede tener un parámetro opcional precisión[,escala]."
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "Carácter de bandera «%.*s» no reconocido en predicado LIKE_REGEX."
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:679
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "la opción «x» de XQuery (expresiones regulares expandidas) no está implementada"
@@ -30978,168 +32880,216 @@ msgstr "secuencia de caracteres hexadecimales no válido"
 msgid "unexpected end after backslash"
 msgstr "fin inesperado después de backslash"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:756
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "una cadena de caracteres entre comillas está inconclusa"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "fin de comentario inesperado"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "literal numérico no válido"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1064
-#: scan.l:1068 scan.l:1072 scan.l:1076
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "basura sigue después de un literal numérico"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s al final de la entrada jsonpath"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s en o cerca de «%s» de la entrada jsonpath"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "entrada no válida"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "dígito hexadecimal no válido"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "no se pudo convertir Unicode a la codificación del servidor"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "timeline %u no válido"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "ubicación de inicio de flujo no válida"
 
-#: scan.l:497
+#: scan.l:483
 msgid "unterminated /* comment"
 msgstr "un comentario /* está inconcluso"
 
-#: scan.l:517
+#: scan.l:503
 msgid "unterminated bit string literal"
 msgstr "una cadena de bits está inconclusa"
 
-#: scan.l:531
+#: scan.l:517
 msgid "unterminated hexadecimal string literal"
 msgstr "una cadena hexadecimal está inconclusa"
 
-#: scan.l:581
+#: scan.l:567
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "uso inseguro de literal de cadena con escapes Unicode"
 
-#: scan.l:582
+#: scan.l:568
 #, 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:643
+#: scan.l:629
 msgid "unhandled previous state in xqs"
 msgstr "estado previo no manejado en xqs"
 
-#: scan.l:717
+#: scan.l:703
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Los escapes Unicode deben ser \\uXXXX o \\UXXXXXXXX."
 
-#: scan.l:728
+#: scan.l:714
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "uso inseguro de \\' en un literal de cadena"
 
-#: scan.l:729
+#: scan.l:715
 #, 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:801
+#: scan.l:787
 msgid "unterminated dollar-quoted string"
 msgstr "una cadena separada por $ está inconclusa"
 
-#: scan.l:818 scan.l:828
+#: scan.l:804 scan.l:814
 msgid "zero-length delimited identifier"
 msgstr "un identificador delimitado tiene largo cero"
 
-#: scan.l:839 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "un identificador entre comillas está inconcluso"
 
-#: scan.l:1002
+#: scan.l:988
 msgid "operator too long"
 msgstr "el operador es demasiado largo"
 
-#: scan.l:1015
+#: scan.l:1001
+msgid "parameter number too large"
+msgstr "el número de parámetro es demasiado grande"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "basura sigue después de un parámetro"
 
-#: scan.l:1036
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "entero hexadecimal no válido"
 
-#: scan.l:1040
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "entero octal no válido"
 
-#: scan.l:1044
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "entero binario no válido"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1239
+#: scan.l:1231
 #, 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:1247
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
 
-#: scan.l:1439
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "uso no estandar de \\' en un literal de cadena"
 
-#: scan.l:1440
+#: scan.l:1432
 #, 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:1449
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "uso no estandar de \\\\ en un literal de cadena"
 
-#: scan.l:1450
+#: scan.l:1442
 #, 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:1464
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "uso no estandar de escape en un literal de cadena"
 
-#: scan.l:1465
+#: scan.l:1457
 #, 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'."
+
+#, c-format
+#~ msgid "unrecognized CLUSTER option \"%s\""
+#~ msgstr "opción de CLUSTER «%s» no reconocida"
+
+#, c-format
+#~ msgid "unrecognized DROP DATABASE option \"%s\""
+#~ msgstr "opción de DROP DATABASE «%s» no reconocida"
+
+#, c-format
+#~ msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+#~ msgstr "valor no reconocido para la opción de EXPLAIN «%s»: «%s»"
+
+#, c-format
+#~ msgid "unrecognized EXPLAIN option \"%s\""
+#~ msgstr "opción de EXPLAIN «%s» no reconocida"
+
+#, c-format
+#~ msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
+#~ msgstr "las opciones ANALYZE y GENERIC_PLAN de EXPLAIN no pueden usarse juntas"
+
+#, c-format
+#~ msgid "unrecognized REINDEX option \"%s\""
+#~ msgstr "opción de REINDEX «%s» no reconocida"
+
+#, c-format
+#~ msgid "unrecognized ANALYZE option \"%s\""
+#~ msgstr "opción de ANALYZE «%s» no reconocida"
+
+#, c-format
+#~ msgid "unrecognized VACUUM option \"%s\""
+#~ msgstr "opción de VACUUM «%s» no reconocida"
+
+#, c-format
+#~ msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
+#~ msgstr "el trabajador de sincronización de slots de replicación está apagándose al recibir SIGINT"
+
+#, c-format
+#~ msgid "replication origin \"%s\" already exists"
+#~ msgstr "el origen de replicación «%s» ya existe"
+
+#, c-format
+#~ msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
+#~ msgstr "valor no reconocido para la opción de CREATE_REPLICATION_SLOT «%s»: «%s»"
diff --git a/src/backend/po/ja.po b/src/backend/po/ja.po
index 5309f0ca14d..02f26abdea7 100644
--- a/src/backend/po/ja.po
+++ b/src/backend/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgres (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-09 09:36+0900\n"
-"PO-Revision-Date: 2025-04-09 10:06+0900\n"
+"POT-Creation-Date: 2026-02-10 09:27+0900\n"
+"PO-Revision-Date: 2026-02-10 09:57+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -82,24 +82,24 @@ msgstr "圧縮アルゴリズム\"%s\"は長距離モードをサポートしま
 msgid "not recorded"
 msgstr "記録されていません"
 
-#: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97 commands/copyfrom.c:1879 commands/extension.c:3807 utils/adt/genfile.c:123 utils/time/snapmgr.c:1437
+#: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97 commands/copyfrom.c:1879 commands/extension.c:3960 utils/adt/genfile.c:123 utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "ファイル\"%s\"を読み込み用にオープンできませんでした: %m"
 
-#: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110 access/transam/timeline.c:143 access/transam/timeline.c:362 access/transam/twophase.c:1353 access/transam/xlog.c:3621 access/transam/xlog.c:4512 access/transam/xlogrecovery.c:1246 access/transam/xlogrecovery.c:1344 access/transam/xlogrecovery.c:1381 access/transam/xlogrecovery.c:1448 backup/basebackup.c:2128 backup/walsummary.c:283 commands/extension.c:3817 libpq/hba.c:769
-#: replication/logical/origin.c:745 replication/logical/origin.c:781 replication/logical/reorderbuffer.c:5236 replication/logical/snapbuild.c:1903 replication/slot.c:2430 replication/slot.c:2471 replication/walsender.c:629 storage/file/buffile.c:470 storage/file/copydir.c:201 utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
+#: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110 access/transam/timeline.c:143 access/transam/timeline.c:362 access/transam/twophase.c:1353 access/transam/xlog.c:3478 access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257 access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392 access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128 backup/walsummary.c:283 commands/extension.c:3970 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804 replication/logical/reorderbuffer.c:5366 replication/logical/snapbuild.c:1951 replication/slot.c:2546 replication/slot.c:2587 replication/walsender.c:643 storage/file/buffile.c:470 storage/file/copydir.c:201 utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ファイル\"%s\"の読み込みに失敗しました: %m"
 
-#: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119 access/transam/xlog.c:3626 access/transam/xlog.c:4517 replication/logical/origin.c:750 replication/logical/origin.c:789 replication/logical/snapbuild.c:1908 replication/slot.c:2434 replication/slot.c:2475 replication/walsender.c:634 utils/cache/relmapper.c:833
+#: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119 access/transam/xlog.c:3483 access/transam/xlog.c:4374 replication/logical/origin.c:773 replication/logical/origin.c:812 replication/logical/snapbuild.c:1956 replication/slot.c:2550 replication/slot.c:2591 replication/walsender.c:648 utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "ファイル\"%1$s\"を読み込めませんでした: %3$zuバイトのうち%2$dバイトを読み込みました"
 
-#: ../common/controldata_utils.c:128 ../common/controldata_utils.c:132 ../common/controldata_utils.c:277 ../common/controldata_utils.c:280 access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246 access/transam/timeline.c:392 access/transam/timeline.c:438 access/transam/timeline.c:512 access/transam/twophase.c:1365 access/transam/twophase.c:1783 access/transam/xlog.c:3467 access/transam/xlog.c:3661 access/transam/xlog.c:3666 access/transam/xlog.c:3802
-#: access/transam/xlog.c:4482 access/transam/xlog.c:5458 commands/copyfrom.c:1929 commands/copyto.c:598 libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545 replication/logical/origin.c:683 replication/logical/origin.c:822 replication/logical/reorderbuffer.c:5288 replication/logical/snapbuild.c:1648 replication/logical/snapbuild.c:1774 replication/slot.c:2319 replication/slot.c:2482 replication/walsender.c:644 storage/file/copydir.c:224 storage/file/copydir.c:229
+#: ../common/controldata_utils.c:128 ../common/controldata_utils.c:132 ../common/controldata_utils.c:277 ../common/controldata_utils.c:280 access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246 access/transam/timeline.c:392 access/transam/timeline.c:438 access/transam/timeline.c:512 access/transam/twophase.c:1365 access/transam/twophase.c:1783 access/transam/xlog.c:3324 access/transam/xlog.c:3518 access/transam/xlog.c:3523 access/transam/xlog.c:3659
+#: access/transam/xlog.c:4339 access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598 libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545 replication/logical/origin.c:706 replication/logical/origin.c:845 replication/logical/reorderbuffer.c:5418 replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822 replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658 storage/file/copydir.c:224 storage/file/copydir.c:229
 #: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828 storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841 utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -122,28 +122,29 @@ msgstr ""
 "されるものと一致しないようです。この場合以下の結果は不正確になります。また、\n"
 "PostgreSQLインストレーションはこのデータディレクトリと互換性がなくなります。"
 
-#: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230 ../common/file_utils.c:69 ../common/file_utils.c:370 ../common/file_utils.c:428 ../common/file_utils.c:502 access/heap/rewriteheap.c:1229 access/transam/timeline.c:111 access/transam/timeline.c:251 access/transam/timeline.c:348 access/transam/twophase.c:1309 access/transam/xlog.c:3357 access/transam/xlog.c:3537 access/transam/xlog.c:3576 access/transam/xlog.c:3769 access/transam/xlog.c:4502
-#: access/transam/xlogrecovery.c:4285 access/transam/xlogrecovery.c:4386 access/transam/xlogutils.c:825 backup/basebackup.c:549 backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626 postmaster/syslogger.c:1512 replication/logical/origin.c:735 replication/logical/reorderbuffer.c:3889 replication/logical/reorderbuffer.c:4443 replication/logical/reorderbuffer.c:5216 replication/logical/snapbuild.c:1603 replication/logical/snapbuild.c:1715
-#: replication/slot.c:2402 replication/walsender.c:602 replication/walsender.c:3056 storage/file/copydir.c:167 storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575 storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:675 utils/cache/relmapper.c:818 utils/cache/relmapper.c:935 utils/error/elog.c:2149 utils/init/miscinit.c:1585 utils/init/miscinit.c:1719 utils/init/miscinit.c:1796 utils/misc/guc.c:4774 utils/misc/guc.c:4824
+#: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230 ../common/file_utils.c:69 ../common/file_utils.c:370 ../common/file_utils.c:428 ../common/file_utils.c:502 access/heap/rewriteheap.c:1229 access/transam/timeline.c:111 access/transam/timeline.c:251 access/transam/timeline.c:348 access/transam/twophase.c:1309 access/transam/xlog.c:3214 access/transam/xlog.c:3394 access/transam/xlog.c:3433 access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408 access/transam/xlogutils.c:825 backup/basebackup.c:549 backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626 postmaster/syslogger.c:1512 replication/logical/origin.c:758 replication/logical/reorderbuffer.c:4019 replication/logical/reorderbuffer.c:4573 replication/logical/reorderbuffer.c:5346 replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616 replication/walsender.c:3094 storage/file/copydir.c:167 storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575 storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686 utils/cache/relmapper.c:818 utils/cache/relmapper.c:935 utils/error/elog.c:2132 utils/init/miscinit.c:1586 utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779 utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ファイル\"%s\"をオープンできませんでした: %m"
 
-#: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249 access/transam/twophase.c:1756 access/transam/twophase.c:1765 access/transam/xlog.c:9467 access/transam/xlogfuncs.c:699 backup/basebackup_server.c:173 backup/basebackup_server.c:266 backup/walsummary.c:304 postmaster/postmaster.c:4098 postmaster/syslogger.c:1523 postmaster/syslogger.c:1536 postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
+#: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249 access/transam/twophase.c:1756 access/transam/twophase.c:1765 access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699 backup/basebackup_server.c:173 backup/basebackup_server.c:266 backup/walsummary.c:304 postmaster/postmaster.c:4105 postmaster/syslogger.c:1523 postmaster/syslogger.c:1536 postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "ファイル\"%s\"を書き出せませんでした: %m"
 
-#: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268 ../common/file_utils.c:440 ../common/file_utils.c:510 access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135 access/heap/rewriteheap.c:1240 access/transam/timeline.c:432 access/transam/timeline.c:506 access/transam/twophase.c:1777 access/transam/xlog.c:3457 access/transam/xlog.c:3655 access/transam/xlog.c:4475 access/transam/xlog.c:8853 access/transam/xlog.c:8897
-#: backup/basebackup_server.c:207 commands/dbcommands.c:515 replication/logical/snapbuild.c:1641 replication/slot.c:2305 replication/slot.c:2412 storage/file/fd.c:820 storage/file/fd.c:3916 storage/smgr/md.c:1455 storage/smgr/md.c:1515 storage/sync/sync.c:446 utils/misc/guc.c:4527
+#: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268 ../common/file_utils.c:440 ../common/file_utils.c:510 access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135 access/heap/rewriteheap.c:1240 access/transam/timeline.c:432 access/transam/timeline.c:506 access/transam/twophase.c:1777 access/transam/xlog.c:3314 access/transam/xlog.c:3512 access/transam/xlog.c:4332 access/transam/xlog.c:8726 access/transam/xlog.c:8770
+#: backup/basebackup_server.c:207 commands/dbcommands.c:515 replication/logical/snapbuild.c:1689 replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820 storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529 storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "ファイル\"%s\"をfsyncできませんでした: %m"
 
-#: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158 ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588 ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325 ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339 ../common/jsonapi.c:2407 ../common/md5_common.c:156 ../common/parse_manifest.c:157 ../common/parse_manifest.c:852 ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829 ../port/path.c:866
-#: ../port/path.c:883 access/transam/twophase.c:1418 access/transam/xlogrecovery.c:570 lib/dshash.c:253 libpq/auth.c:1345 libpq/auth.c:1389 libpq/auth.c:1951 libpq/be-secure-gssapi.c:527 postmaster/bgworker.c:355 postmaster/bgworker.c:1022 postmaster/postmaster.c:3568 postmaster/walsummarizer.c:942 replication/libpqwalreceiver/libpqwalreceiver.c:351 replication/logical/logical.c:210 replication/walsender.c:811 storage/buffer/localbuf.c:745 storage/file/fd.c:912
-#: storage/file/fd.c:1447 storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465 storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224 storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436 utils/adt/pg_locale.c:509 utils/adt/pg_locale.c:583 utils/adt/pg_locale_icu.c:364 utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302 utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:219 utils/hash/dynahash.c:516 utils/hash/dynahash.c:616
-#: utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401 utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841 utils/misc/guc.c:647 utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505 utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1230 utils/mmgr/slab.c:370
+#: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158 ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588 ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325 ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339 ../common/jsonapi.c:2410 ../common/md5_common.c:156 ../common/parse_manifest.c:157 ../common/parse_manifest.c:852 ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829 ../port/path.c:866
+#: ../port/path.c:883 access/transam/twophase.c:1418 access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353 libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537 libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355 postmaster/bgworker.c:1023 postmaster/postmaster.c:3575 postmaster/walsummarizer.c:938 replication/libpqwalreceiver/libpqwalreceiver.c:364 replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447 storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465 storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224 storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436 utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517 utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358 utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234 utils/hash/dynahash.c:517 utils/hash/dynahash.c:617 utils/hash/dynahash.c:1100 utils/mb/mbutils.c:410 utils/mb/mbutils.c:438 utils/mb/mbutils.c:823 utils/mb/mbutils.c:850 utils/misc/guc.c:647 utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505 utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "メモリ不足です"
@@ -180,7 +181,7 @@ msgstr "実行すべき\"%s\"がありませんでした"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "パス\"%s\"を絶対パス形式に変換できませんでした: %m"
 
-#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863 commands/copyto.c:934 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863 commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "コマンド\"%s\"を実行できませんでした: %m"
@@ -195,7 +196,7 @@ msgstr "コマンド\"%s\"から読み取れませんでした: %m"
 msgid "no data was returned by command \"%s\""
 msgstr "コマンド\"%s\"からデータが返却されませんでした"
 
-#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:782 storage/ipc/waiteventset.c:962 storage/ipc/waiteventset.c:1202 storage/ipc/waiteventset.c:1364 storage/ipc/waiteventset.c:1490
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783 storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203 storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() が失敗しました: %m"
@@ -215,8 +216,8 @@ msgstr "nullポインタは複製できません(内部エラー)\n"
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "ファイル\"%s\"に対してファイルシステムを同期できませんでした: %m"
 
-#: ../common/file_utils.c:123 ../common/file_utils.c:588 ../common/file_utils.c:592 access/transam/twophase.c:1321 access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235 backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626 backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1889 commands/copyto.c:980 commands/extension.c:3796 commands/tablespace.c:804 commands/tablespace.c:893 postmaster/pgarch.c:682
-#: replication/logical/snapbuild.c:1498 replication/logical/snapbuild.c:2025 storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629 utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355 utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
+#: ../common/file_utils.c:123 ../common/file_utils.c:588 ../common/file_utils.c:592 access/transam/twophase.c:1321 access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235 backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626 backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979 commands/extension.c:3949 commands/tablespace.c:804 commands/tablespace.c:893 postmaster/pgarch.c:682 replication/logical/snapbuild.c:1546
+#: replication/logical/snapbuild.c:2073 storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629 utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355 utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "ファイル\"%s\"のstatに失敗しました: %m"
@@ -236,7 +237,7 @@ msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
 msgid "could not read directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を読み取れませんでした: %m"
 
-#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389 postmaster/pgarch.c:836 postmaster/syslogger.c:1560 replication/logical/snapbuild.c:1660 replication/slot.c:987 replication/slot.c:2191 replication/slot.c:2333 storage/file/fd.c:838 utils/time/snapmgr.c:1262
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389 postmaster/pgarch.c:836 postmaster/syslogger.c:1560 replication/logical/snapbuild.c:1708 replication/slot.c:1027 replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838 utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %m"
@@ -245,106 +246,106 @@ msgstr "ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %
 msgid "internal error"
 msgstr "内部エラー"
 
-#: ../common/jsonapi.c:2432
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "再帰降下パーサーは差分字句解析器を使用できません。"
 
-#: ../common/jsonapi.c:2434
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "差分パーサーは差分字句解析器を必要とします。"
 
-#: ../common/jsonapi.c:2436
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSONのネストが深すぎます、可能な最大の深さは6400です。"
 
-#: ../common/jsonapi.c:2438
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "エスケープシーケンス\"\\%.*s\"は不正です。"
 
-#: ../common/jsonapi.c:2442
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "0x%02x値を持つ文字はエスケープしなければなりません"
 
-#: ../common/jsonapi.c:2446
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "入力の終端を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2449
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "配列要素または\"]\"を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2452
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "\",\"または\"]\"を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2455
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "\":\"を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2458
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON値を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2461
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "入力文字列が予期せず終了しました。"
 
-#: ../common/jsonapi.c:2463
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "文字列または\"}\"を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2466
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "\",\"または\"}\"を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2469
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "文字列を想定していましたが、\"%.*s\"でした。"
 
-#: ../common/jsonapi.c:2472
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "トークン\"%.*s\"は不正です。"
 
-#: ../common/jsonapi.c:2478 jsonpath_scan.l:585
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 はテキストに変換できません。"
 
-#: ../common/jsonapi.c:2480
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\"の後には16進数の4桁が続かなければなりません。"
 
-#: ../common/jsonapi.c:2483
+#: ../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "エンコーディングがUTF-8ではない場合、コードポイントの値が 007F 以上についてはUnicodeエスケープの値は使用できません。"
 
-#: ../common/jsonapi.c:2492
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Unicodeエスケープの値がサーバーエンコーディング%sに変換できませんでした。"
 
-#: ../common/jsonapi.c:2499 jsonpath_scan.l:618
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicodeのハイサロゲートはハイサロゲートに続いてはいけません。"
 
-#: ../common/jsonapi.c:2501 jsonpath_scan.l:629 jsonpath_scan.l:639 jsonpath_scan.l:691
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639 jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicodeのローサロゲートはハイサロゲートに続かなければなりません。"
 
-#: ../common/jsonapi.c:2523
+#: ../common/jsonapi.c:2526
 msgid "out of memory while constructing error description"
 msgstr "エラー記述の構築中のメモリ不足"
 
@@ -525,7 +526,7 @@ msgstr "目録チェックサムの不一致"
 msgid "could not parse backup manifest: %s"
 msgstr "バックアップ目録をパースできませんでした: %s"
 
-#: ../common/percentrepl.c:79 ../common/percentrepl.c:85 ../common/percentrepl.c:118 ../common/percentrepl.c:124 tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205 utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6929 utils/misc/guc.c:6970
+#: ../common/percentrepl.c:79 ../common/percentrepl.c:85 ../common/percentrepl.c:118 ../common/percentrepl.c:124 tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205 utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940 utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "パラメータ\"%s\"の値が不正です: \"%s\""
@@ -585,8 +586,8 @@ msgstr "制限付きトークンで再実行できませんでした: %lu"
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "サブプロセスの終了コードを取得できませんでした: エラーコード %lu"
 
-#: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214 access/transam/twophase.c:1716 access/transam/xlogarchive.c:119 access/transam/xlogarchive.c:399 postmaster/postmaster.c:1069 postmaster/syslogger.c:1489 replication/logical/origin.c:591 replication/logical/reorderbuffer.c:4711 replication/logical/snapbuild.c:1541 replication/logical/snapbuild.c:1997 replication/slot.c:2386 storage/file/fd.c:878 storage/file/fd.c:3443 storage/file/fd.c:3505
-#: storage/file/reinit.c:261 storage/ipc/dsm.c:343 storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243 utils/time/snapmgr.c:1598
+#: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214 access/transam/twophase.c:1716 access/transam/xlogarchive.c:119 access/transam/xlogarchive.c:399 backup/walsummary.c:254 postmaster/postmaster.c:1069 postmaster/syslogger.c:1489 replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841 replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045 replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343 storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243 utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "ファイル\"%s\"を削除できませんでした: %m"
@@ -703,25 +704,25 @@ msgstr "\"%s\"のジャンクションを取得できませんでした: %s"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "\"%s\"のジャンクションを取得できませんでした: %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "ファイル\"%s\"をオープンできませんでした: %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "ロック違反"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "共有違反"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "再試行を30秒間続けます。"
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "データベースシステムに干渉するアンチウィルス、バックアップといったソフトウェアが存在する可能性があります。"
@@ -756,7 +757,7 @@ msgstr "アクセストークンのメンバーシップを確認できません
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "インデックス\"%s\" ページ%uのBRIN範囲要約のリクエストは登録されていません"
 
-#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040 access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323 access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447 statistics/attribute_stats.c:190 statistics/attribute_stats.c:931 statistics/relation_stats.c:97
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040 access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323 access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447 statistics/attribute_stats.c:191 statistics/attribute_stats.c:936 statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "リカバリは現在進行中です"
@@ -781,7 +782,7 @@ msgstr "\"%s\"はBRINインデックスではありません"
 msgid "could not open parent table of index \"%s\""
 msgstr "インデックス\"%s\"の親テーブルをオープンできませんでした"
 
-#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085 parser/parse_utilcmd.c:2433
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085 parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "インデックス\"%s\"は有効ではありません"
@@ -891,7 +892,7 @@ msgstr "インデックス列数(%d)が上限(%d)を超えています"
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "インデックス行が%zuバイトを必要としますが最大値は%zuです"
 
-#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106 tcop/fastpath.c:453 tcop/postgres.c:1951
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106 tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "非サポートの書式コード: %d"
@@ -914,67 +915,72 @@ msgstr "ユーザー定義リレーションのパラメータ型の制限を超
 msgid "RESET must not include values for parameters"
 msgstr "RESETにはパラメータの値を含めてはいけません"
 
-#: access/common/reloptions.c:1274
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "認識できないパラメータ namaspace \"%s\""
 
-#: access/common/reloptions.c:1311 commands/variable.c:1242
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "不正なオプション名\"%s\": \"=\"が含まれていてはなりません"
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "WITH OIDSと定義されたテーブルはサポートされません"
 
-#: access/common/reloptions.c:1479
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "認識できないラメータ \"%s\""
 
-#: access/common/reloptions.c:1591
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "パラメータ\"%s\"が複数回指定されました"
 
-#: access/common/reloptions.c:1607
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "不正なブール型オプションの値 \"%s\": %s"
 
-#: access/common/reloptions.c:1619
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "不正な整数型オプションの値 \"%s\": %s"
 
-#: access/common/reloptions.c:1625 access/common/reloptions.c:1645
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "値%sはオプション\"%s\"の範囲外です"
 
-#: access/common/reloptions.c:1627
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "有効な値の範囲は\"%d\"～\"%d\"です。"
 
-#: access/common/reloptions.c:1639
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "不正な浮動小数点型オプションの値 \"%s\": %s"
 
-#: access/common/reloptions.c:1647
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "有効な値の範囲は\"%f\"～\"%f\"です。"
 
-#: access/common/reloptions.c:1669
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "不正な列挙型オプションの値 \"%s\": %s"
 
-#: access/common/reloptions.c:2016
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "パーティション親テーブルに対してストレージパラメータは指定できません"
 
-#: access/common/reloptions.c:2017
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "代わりにリーフパーティションに対してストレージパラメータを指定してください。"
@@ -1019,17 +1025,17 @@ msgstr "他のセッションの一時インデックスにはアクセスでき
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "インデックス\"%s\"内で行の再検索に失敗しました"
 
-#: access/gin/gininsert.c:1283 access/gin/ginutil.c:152 executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963 utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726 utils/adt/rowtypes.c:974
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152 executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963 utils/adt/arrayfuncs.c:4034 utils/adt/arrayfuncs.c:6732 utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "%s型の比較関数が見つかりません"
 
-#: access/gin/ginscan.c:437
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "古いGINインデックスはインデックス全体のスキャンやnullの検索をサポートしていません"
 
-#: access/gin/ginscan.c:438
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "これを修復するには REINDEX INDEX \"%s\" をおこなってください。"
@@ -1049,17 +1055,17 @@ msgstr "アクセスメソッド\"%2$s\"の演算子クラス\"%1$s\"はサポ
 msgid "support function number %d is invalid for access method %s"
 msgstr "サポート関数番号%dはアクセスメソッド%sに対して不正です"
 
-#: access/gist/gist.c:765 access/gist/gistvacuum.c:462
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "インデックス\"%s\"内に無効と判断されている内部タプルがあります"
 
-#: access/gist/gist.c:767 access/gist/gistvacuum.c:464
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "これは、PostgreSQL 9.1へアップグレードする前のクラッシュリカバリにおける不完全なページ分割が原因で発生します。"
 
-#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812 access/gist/gistvacuum.c:465 access/hash/hashutil.c:226 access/hash/hashutil.c:237 access/hash/hashutil.c:249 access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813 access/nbtree/nbtpage.c:824
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812 access/gist/gistvacuum.c:466 access/hash/hashutil.c:226 access/hash/hashutil.c:237 access/hash/hashutil.c:249 access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813 access/nbtree/nbtpage.c:824
 #, c-format
 msgid "Please REINDEX it."
 msgstr "REINDEXを行ってください。"
@@ -1099,13 +1105,13 @@ msgstr "アクセスメソッド\"%2$s\"の演算子族\"%1$s\"は演算子%3$s
 msgid "operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s"
 msgstr "アクセスメソッド\"%2$s\"の演算子族\"%1$s\"は演算子%3$sに対する正しくないORDER BY演算子族を含んでいます"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:332 utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
+#: access/hash/hashfunc.c:280 access/hash/hashfunc.c:335 utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "文字列のハッシュ値計算で使用する照合順序を特定できませんでした"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:679 catalog/heap.c:685 commands/createas.c:203 commands/createas.c:516 commands/indexcmds.c:2090 commands/tablecmds.c:19879 commands/view.c:80 regex/regc_pg_locale.c:245 utils/adt/formatting.c:1655 utils/adt/formatting.c:1719 utils/adt/formatting.c:1783 utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194 utils/adt/like_support.c:1020 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1592
+#: access/hash/hashfunc.c:281 access/hash/hashfunc.c:336 catalog/heap.c:688 catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515 commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80 regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655 utils/adt/formatting.c:1719 utils/adt/formatting.c:1783 utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194 utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1610
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "照合順序を明示するには COLLATE 句を使います。"
@@ -1155,37 +1161,37 @@ msgstr "アクセスメソッド\"%2$s\"の演算子族\"%1$s\"は演算子%3$s
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "アクセスメソッド\"%2$s\"の演算子族\"%1$s\"は異なる型間に対応する演算子を含んでいません"
 
-#: access/heap/heapam.c:2257
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "並列ワーカーではタプルの挿入はできません"
 
-#: access/heap/heapam.c:2776
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "並列処理中はタプルの削除はできません"
 
-#: access/heap/heapam.c:2823
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "不可視のタプルを削除しようとしました"
 
-#: access/heap/heapam.c:3271 access/index/genam.c:829
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "並列処理中はタプルの更新はできません"
 
-#: access/heap/heapam.c:3448
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "不可視のタプルを更新しようとしました"
 
-#: access/heap/heapam.c:4959 access/heap/heapam.c:4997 access/heap/heapam.c:5262 access/heap/heapam_handler.c:470
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031 access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "リレーション\"%s\"の行ロックを取得できませんでした"
 
-#: access/heap/heapam.c:6376 commands/trigger.c:3350 executor/nodeModifyTable.c:2545 executor/nodeModifyTable.c:2635
+#: access/heap/heapam.c:6425 commands/trigger.c:3401 executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "更新対象のタプルはすでに現在のコマンドによって起動された操作によって変更されています"
@@ -1205,8 +1211,8 @@ msgstr "行が大きすぎます: サイズは%zu、上限は%zu"
 msgid "could not write to file \"%s\", wrote %d of %d: %m"
 msgstr "ファイル\"%1$s\"に書き込めませんでした、%3$dバイト中%2$dバイト書き込みました: %m"
 
-#: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094 access/transam/timeline.c:329 access/transam/timeline.c:481 access/transam/xlog.c:3382 access/transam/xlog.c:3590 access/transam/xlog.c:4454 access/transam/xlog.c:9456 access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149 backup/basebackup_server.c:242 commands/dbcommands.c:495 postmaster/launch_backend.c:354 postmaster/postmaster.c:4085 postmaster/walsummarizer.c:1219
-#: replication/logical/origin.c:603 replication/slot.c:2252 storage/file/copydir.c:173 storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1241
+#: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094 access/transam/timeline.c:329 access/transam/timeline.c:481 access/transam/xlog.c:3239 access/transam/xlog.c:3447 access/transam/xlog.c:4311 access/transam/xlog.c:9329 access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149 backup/basebackup_server.c:242 commands/dbcommands.c:495 postmaster/launch_backend.c:354 postmaster/postmaster.c:4092 postmaster/walsummarizer.c:1215
+#: replication/logical/origin.c:626 replication/slot.c:2360 storage/file/copydir.c:173 storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "ファイル\"%s\"を作成できませんでした: %m"
@@ -1216,171 +1222,171 @@ msgstr "ファイル\"%s\"を作成できませんでした: %m"
 msgid "could not truncate file \"%s\" to %u: %m"
 msgstr "ファイル\"%s\"を%uバイトに切り詰められませんでした: %m"
 
-#: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384 access/transam/timeline.c:424 access/transam/timeline.c:498 access/transam/xlog.c:3443 access/transam/xlog.c:3646 access/transam/xlog.c:4466 commands/dbcommands.c:507 postmaster/launch_backend.c:365 postmaster/launch_backend.c:377 replication/logical/origin.c:615 replication/logical/origin.c:657 replication/logical/origin.c:676 replication/logical/snapbuild.c:1617 replication/slot.c:2287
-#: storage/file/buffile.c:545 storage/file/copydir.c:213 utils/init/miscinit.c:1660 utils/init/miscinit.c:1671 utils/init/miscinit.c:1679 utils/misc/guc.c:4488 utils/misc/guc.c:4519 utils/misc/guc.c:5673 utils/misc/guc.c:5691 utils/time/snapmgr.c:1246 utils/time/snapmgr.c:1253
+#: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384 access/transam/timeline.c:424 access/transam/timeline.c:498 access/transam/xlog.c:3300 access/transam/xlog.c:3503 access/transam/xlog.c:4323 commands/dbcommands.c:507 postmaster/launch_backend.c:365 postmaster/launch_backend.c:377 replication/logical/origin.c:638 replication/logical/origin.c:680 replication/logical/origin.c:699 replication/logical/snapbuild.c:1665 replication/slot.c:2396
+#: storage/file/buffile.c:545 storage/file/copydir.c:213 utils/init/miscinit.c:1661 utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488 utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696 utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "ファイル\"%s\"を書き出せませんでした: %m"
 
-#: access/heap/vacuumlazy.c:814
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\"に対して積極的VACUUMを実行しています"
 
-#: access/heap/vacuumlazy.c:819
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\"に対してVACUUMを実行しています"
 
-#: access/heap/vacuumlazy.c:987
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "テーブル\"%s.%s.%s\"のVACUUM完了: インデックススキャン: %d\n"
 
-#: access/heap/vacuumlazy.c:998
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "テーブル\"%s.%s.%s\"の周回防止のための積極的自動VACUUM: インデックススキャン: %d\n"
 
-#: access/heap/vacuumlazy.c:1000
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "テーブル\"%s.%s.%s\"の周回防止のための自動VACUUM: インデックススキャン: %d\n"
 
-#: access/heap/vacuumlazy.c:1005
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "テーブル\"%s.%s.%s\"の積極的自動VACUUM: インデックススキャン: %d\n"
 
-#: access/heap/vacuumlazy.c:1007
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "テーブル\"%s.%s.%s\"の自動VACUUM: インデックススキャン: %d\n"
 
-#: access/heap/vacuumlazy.c:1014
+#: access/heap/vacuumlazy.c:1015
 #, c-format
 msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
 msgstr "ページ: %u削除、%u残存、%uスキャン (全体の%.2f%%)、%u貪欲スキャン\n"
 
-#: access/heap/vacuumlazy.c:1023
+#: access/heap/vacuumlazy.c:1024
 #, c-format
 msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
 msgstr "タプル:%<PRId64>削除、%<PRId64>残存、%<PRId64>が削除されているがまだ除去できません\n"
 
-#: access/heap/vacuumlazy.c:1029
+#: access/heap/vacuumlazy.c:1030
 #, c-format
 msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
 msgstr "未処理のタプル: クリーンナップロックの競合により、%2$uページ中の%1$<PRId64>行の削除済みタプルは除去されません\n"
 
-#: access/heap/vacuumlazy.c:1035
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "削除可能限界: %u、これは処理完了時には%d XID分過去になります\n"
 
-#: access/heap/vacuumlazy.c:1042
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "新しいrelfrozenxid: %u、これは前回の値よりも%d XID分進んでいます\n"
 
-#: access/heap/vacuumlazy.c:1050
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr ""
 "新しいrelminmxid: %u、これは前回の値よりも%d MXID分進んでいます\n"
 "\n"
 
-#: access/heap/vacuumlazy.c:1053
+#: access/heap/vacuumlazy.c:1054
 #, c-format
 msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
 msgstr "凍結: テーブルから%uページ(全体の%.2f%%)で%<PRId64>タプルが凍結されました\n"
 
-#: access/heap/vacuumlazy.c:1061
+#: access/heap/vacuumlazy.c:1062
 #, c-format
 msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
 msgstr "可視性マップ: %uページが全可視 (all-visible)、%uページが全凍結 (all-frozen) (前回は%uページが全可視でした)\n"
 
-#: access/heap/vacuumlazy.c:1069
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "インデックススキャンは不要です: "
 
-#: access/heap/vacuumlazy.c:1071
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "インデックススキャンが必要です: "
 
-#: access/heap/vacuumlazy.c:1073
+#: access/heap/vacuumlazy.c:1074
 #, c-format
 msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
 msgstr "テーブル内の%uページ(全体の%.2f%%)にあった%<PRId64>行の削除行識別子が削除されました\n"
 
-#: access/heap/vacuumlazy.c:1078
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "インデックススキャンはスキップされました: "
 
-#: access/heap/vacuumlazy.c:1080
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "フェイルセーフによりインデックススキャンがスキップされました: "
 
-#: access/heap/vacuumlazy.c:1082
+#: access/heap/vacuumlazy.c:1083
 #, c-format
 msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
 msgstr "テーブル内の%uページ(全体の%.2f%%)には%<PRId64>行の削除行識別子があります\n"
 
-#: access/heap/vacuumlazy.c:1097
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "インデックス\"%s\": ページ数: 合計%u、新規削除%u、削除済%u、再利用可%u\n"
 
-#: access/heap/vacuumlazy.c:1112 commands/analyze.c:817
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
 #, c-format
 msgid "delay time: %.3f ms\n"
 msgstr "遅延時間: %.3f ミリ秒\n"
 
-#: access/heap/vacuumlazy.c:1120 commands/analyze.c:825
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "I/O時間: 読み込み: %.3fミリ秒, 書き込み: %.3fミリ秒\n"
 
-#: access/heap/vacuumlazy.c:1130 commands/analyze.c:828
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "平均読み込み速度: %.3f MB/s, 平均書き込み速度: %.3f MB/s\n"
 
-#: access/heap/vacuumlazy.c:1133 commands/analyze.c:830
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
 msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
 msgstr "バッファ使用: ヒット %<PRId64>, 読み込み %<PRId64>, ダーティ化 %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:1138 commands/analyze.c:835
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
 msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
 msgstr "WAL使用量: %<PRId64>のレコード, %<PRId64>の全ページイメージ, %<PRIu64>バイト, %<PRId64>のバッファフル\n"
 
-#: access/heap/vacuumlazy.c:1143 commands/analyze.c:840
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "システム使用状況: %s"
 
-#: access/heap/vacuumlazy.c:1431
+#: access/heap/vacuumlazy.c:1432
 #, c-format
-msgid "disabling eager scanning after freezing %u eagerly scanned blocks of \"%s.%s.%s\""
-msgstr "\"%2$s.%3$s.%4$s\"を貪欲スキャンで%1$uブロックを凍結した後、貪欲スキャンを無効にします"
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
+msgstr "リレーション\"%2$s.%3$s.%4$s\"を貪欲スキャンにより%1$uブロックを凍結したため、貪欲スキャンを無効にしました"
 
-#: access/heap/vacuumlazy.c:2820
+#: access/heap/vacuumlazy.c:2821
 #, c-format
 msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
 msgstr "テーブル\"%1$s\": %3$uページ内の%2$<PRId64>の削除済み行識別子を除去"
 
-#: access/heap/vacuumlazy.c:2992
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "%4$d回のインデックススキャンののち、フェイルセーフとしてテーブル\"%1$s.%2$s.%3$s\"の必須ではないメンテナンスをスキップします"
 
-#: access/heap/vacuumlazy.c:2995
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "このテーブルのrelfrozenxidまたはrelminmxidは古すぎます。"
 
-#: access/heap/vacuumlazy.c:2996
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
@@ -1389,67 +1395,67 @@ msgstr ""
 "設定パラメータ\"maintenance_work_mem\"または\"autovacuum_work_mem\"を増やすことを検討してください。\n"
 "VACUUMがトランザクションIDの割り当てに追従できるようにする他の方法を検討する必要があるかもしれません。"
 
-#: access/heap/vacuumlazy.c:3258
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\":競合するロックが存在するため切り詰めを中断します"
 
-#: access/heap/vacuumlazy.c:3328
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "テーブル\"%s\": %uページから%uページに切り詰め"
 
-#: access/heap/vacuumlazy.c:3390
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "テーブル\"%s\": 競合するロック要求が存在するため、切り詰めを保留します"
 
-#: access/heap/vacuumlazy.c:3509
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "\"%s\"のVACUUMに対するパラレルオプションを無効化します --- 一時テーブルは並列にVACUUMできません"
 
-#: access/heap/vacuumlazy.c:3776
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "リレーション\"%3$s.%4$s\"のブロック%1$u、オフセット%2$uのスキャン中"
 
-#: access/heap/vacuumlazy.c:3779
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "リレーション\\\"%2$s.%3$s\\\"のブロック%1$uのスキャン中"
 
-#: access/heap/vacuumlazy.c:3783
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "リレーション\"%s.%s\"のスキャン中"
 
-#: access/heap/vacuumlazy.c:3791
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "リレーション\"%3$s.%4$s\"のブロック%1$u、オフセット%2$uのVACUUM処理中"
 
-#: access/heap/vacuumlazy.c:3794
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "リレーション\\\"%2$s.%3$s\\\"のブロック%1$uのVACUUM処理中"
 
-#: access/heap/vacuumlazy.c:3798
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "リレーション\"%s.%s\"のVACUUM処理中"
 
-#: access/heap/vacuumlazy.c:3803 commands/vacuumparallel.c:1126
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "リレーション\\\"%2$s.%3$s\\\"のインデックス%1$sのVACUUM処理中"
 
-#: access/heap/vacuumlazy.c:3808 commands/vacuumparallel.c:1132
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "リレーション\\\"%2$s.%3$s\\\"のインデックス%1$sのクリーンアップ処理中"
 
-#: access/heap/vacuumlazy.c:3814
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "リレーション \"%s.%s\"を%uブロックに切り詰め中"
@@ -1474,7 +1480,7 @@ msgstr "システムカタログのスキャン中にトランザクションが
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "再作成中であるためインデックス\"%s\"にアクセスできません"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1361 commands/indexcmds.c:2982 commands/tablecmds.c:284 commands/tablecmds.c:308 commands/tablecmds.c:19568 commands/tablecmds.c:21488
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361 commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308 commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\"はインデックスではありません"
@@ -1499,7 +1505,7 @@ msgstr "キー %s はすでに存在します。"
 msgid "This may be because of a non-immutable index expression."
 msgstr "これは不変でないインデックス式が原因である可能性があります"
 
-#: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611 parser/parse_utilcmd.c:2483
+#: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611 parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "インデックス\"%s\"はbtreeではありません"
@@ -1519,17 +1525,17 @@ msgstr "インデックス\"%s\"に削除処理中の内部ページがありま
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "これは9.3かそれ以前のバージョンで、アップグレード前にVACUUMが中断された際に起きた可能性があります。REINDEXしてください。"
 
-#: access/nbtree/nbtutils.c:4247
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "インデックス行サイズ%1$zuはインデックス\"%4$s\"でのbtreeバージョン %2$u の最大値%3$zuを超えています"
 
-#: access/nbtree/nbtutils.c:4252
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "インデックス行はリレーション\"%3$s\"のタプル(%1$u,%2$u)を参照しています。"
 
-#: access/nbtree/nbtutils.c:4256
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1543,7 +1549,7 @@ msgstr ""
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "アクセスメソッド\"%2$s\"の演算子族\"%1$s\"は型%3$sと%4$sに対応するサポート関数を含んでいません"
 
-#: access/sequence/sequence.c:75 access/table/table.c:145 optimizer/util/plancat.c:144
+#: access/sequence/sequence.c:75 access/table/table.c:145 optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "リレーション\"%s\"はopenできません"
@@ -1578,7 +1584,7 @@ msgstr "tid (%u, %u) はリレーション\"%s\"に対して妥当ではあり
 msgid "\"%s\" cannot be empty."
 msgstr "\"%s\"は空にはできません。"
 
-#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4879
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "\"%s\"が長過ぎます（最大%d文字）。"
@@ -1618,12 +1624,12 @@ msgstr "プライマリサーバーで設定パラメータ\"%s\"がonに設定
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "設定パラメータ\"%s\"が設定されていることを確認してください。"
 
-#: access/transam/multixact.c:1097
+#: access/transam/multixact.c:1179
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "データベース\"%s\"はMultiXactIds周回によるデータ損失を防ぐために、新規のMultiXactIdsを割り当てるコマンドを受け付けていません"
 
-#: access/transam/multixact.c:1099 access/transam/multixact.c:1106 access/transam/multixact.c:1130 access/transam/multixact.c:1139 access/transam/varsup.c:158 access/transam/varsup.c:165
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188 access/transam/multixact.c:1212 access/transam/multixact.c:1221 access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
 "Execute a database-wide VACUUM in that database.\n"
@@ -1632,61 +1638,66 @@ msgstr ""
 "そのデータベース全体の VACUUM を実行してください。\n"
 "古い準備済みトランザクションのコミットまたはロールバック、もしくは古いレプリケーションスロットの削除も必要かもしれません。"
 
-#: access/transam/multixact.c:1104
+#: access/transam/multixact.c:1186
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "OID %u のデータベースは周回によるデータ損失を防ぐために、新規のMultiXactIdsを割り当てるコマンドを受け付けていません"
 
-#: access/transam/multixact.c:1125 access/transam/multixact.c:2482
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, 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] "データベース\"%s\"はあと%u個のMultiXactIdが使われる前にVACUUMする必要があります"
 
-#: access/transam/multixact.c:1134 access/transam/multixact.c:2491
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, 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] "OID %u のデータベースはあと%u個のMultiXactIdが使われる前にVACUUMする必要があります"
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "マルチトランザクションの\"メンバ\"が制限を超えました"
 
-#: access/transam/multixact.c:1196
+#: access/transam/multixact.c:1281
 #, 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] "このコマンドで%u個のメンバを持つマルチトランザクションが生成されますが、残りのスペースは %u 個のメンバ分しかありません。"
 
-#: access/transam/multixact.c:1201
+#: access/transam/multixact.c:1286
 #, 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 "\"vacuum_multixact_freeze_min_age\"と\"vacuum_multixact_freeze_table_age\"をより小さな値に設定してOID %u のデータベースでデータベース全体にVACUUMを実行してください。"
 
-#: access/transam/multixact.c:1232
+#: access/transam/multixact.c:1317
 #, c-format
 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] "OID %u のデータベースは更に%d個のマルチトランザクションメンバが使用される前にVACUUMを実行する必要があります"
 
-#: access/transam/multixact.c:1237
+#: access/transam/multixact.c:1322
 #, 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 "\"vacuum_multixact_freeze_min_age\"'と\"vacuum_multixact_freeze_table_age\"をより小さな値に設定した上で、そのデータベースでVACUUMを実行してください。"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %uはもう存在しません: 周回しているようです"
 
-#: access/transam/multixact.c:1383
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %uを作成できませんでした: 周回している様子"
 
-#: access/transam/multixact.c:2487 access/transam/multixact.c:2496
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "MultiXact %u の次のオフセットが不正です"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
@@ -1695,61 +1706,66 @@ msgstr ""
 "MultiXactIdの割り当て失敗を防ぐために、このデータベースでデータベース全体に対するVACUUMを実行してください。\n"
 "古い準備済みトランザクションのコミットまたはロールバック、もしくは古いレプリケーションスロットの削除も必要かもしれません。"
 
-#: access/transam/multixact.c:2775
+#: access/transam/multixact.c:2845
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "最古のチェックポイント済みのマルチトランザクション%uがディスク上に存在しないため、マルチトランザクションメンバーの周回防止機能を無効にしました"
 
-#: access/transam/multixact.c:2797
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "マルチトランザクションメンバーの周回防止機能が有効になりました"
 
-#: access/transam/multixact.c:3188
+#: access/transam/multixact.c:3258
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "最古のマルチトランザクション%uが見つかりません、アクセス可能な最古のものは%u、切り詰めをスキップします"
 
-#: access/transam/multixact.c:3206
+#: access/transam/multixact.c:3276
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "マルチトランザクション%uがディスク上に存在しないため、そこまでの切り詰めができません、切り詰めをスキップします"
 
-#: access/transam/multixact.c:3525
+#: access/transam/multixact.c:3293
+#, c-format
+msgid "cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation"
+msgstr "マルチトランザクション%uのオフセットが不正なため、そこまでの切り詰めができません、切り詰めをスキップします"
+
+#: access/transam/multixact.c:3638
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "不正なMultiXactId: %u"
 
-#: access/transam/parallel.c:752 access/transam/parallel.c:871
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "パラレルワーカーの初期化に失敗しました"
 
-#: access/transam/parallel.c:753 access/transam/parallel.c:872
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "詳細な情報がサーバーログにあるかもしれません。"
 
-#: access/transam/parallel.c:933
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "並列処理中にpostmasterが終了しました"
 
-#: access/transam/parallel.c:1120
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "パラレルワーカーへの接続を失いました"
 
-#: access/transam/parallel.c:1176 access/transam/parallel.c:1178
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "パラレルワーカー"
 
-#: access/transam/parallel.c:1348 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "動的共有メモリセグメントをマップできませんでした"
 
-#: access/transam/parallel.c:1353 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "動的共有メモリセグメントのマジックナンバーが不正です"
@@ -1809,62 +1825,62 @@ msgstr "ID %d の既存の独自リソースマネージャが同じ名前です
 msgid "registered custom resource manager \"%s\" with ID %d"
 msgstr "独自リソースマネージャ\"%s\"をID %dで登録しました"
 
-#: access/transam/slru.c:360
+#: access/transam/slru.c:361
 #, c-format
 msgid "\"%s\" must be a multiple of %d."
 msgstr "\"%s\"は%dの倍数でなければなりません。"
 
-#: access/transam/slru.c:832
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "ファイル\"%s\"が存在しません。ゼロとして読み込みます"
 
-#: access/transam/slru.c:1061 access/transam/slru.c:1067 access/transam/slru.c:1075 access/transam/slru.c:1080 access/transam/slru.c:1087 access/transam/slru.c:1092 access/transam/slru.c:1099 access/transam/slru.c:1106
+#: access/transam/slru.c:1062 access/transam/slru.c:1068 access/transam/slru.c:1076 access/transam/slru.c:1081 access/transam/slru.c:1088 access/transam/slru.c:1093 access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "トランザクション%uのステータスにアクセスできませんでした"
 
-#: access/transam/slru.c:1062
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "ファイル\"%s\"をオープンできませんでした: %m。"
 
-#: access/transam/slru.c:1068
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "ファイル\"%s\"のオフセット%dにシークできませんでした: %m。"
 
-#: access/transam/slru.c:1076
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "ファイル\"%s\"のオフセット%dを読み取れませんでした: %m。"
 
-#: access/transam/slru.c:1081
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "ファイル\"%s\"のオフセット%dを読み取れませんでした: 読み込んだバイト数が足りません。"
 
-#: access/transam/slru.c:1088
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "ファイル\"%s\"のオフセット%dに書き出せませんでした: %m。"
 
-#: access/transam/slru.c:1093
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "ファイル\"%s\"のオフセット%dに書き出せませんでした: 書き込んだバイト数が足りません。"
 
-#: access/transam/slru.c:1100
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "ファイル\"%s\"をfsyncできませんでした: %m。"
 
-#: access/transam/slru.c:1107
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "ファイル\"%s\"をクローズできませんでした: %m。"
 
-#: access/transam/slru.c:1433
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "ディレクトリ\"%s\"を切り詰めできませんでした: 明らかに周回しています"
@@ -2005,7 +2021,7 @@ msgstr "ファイル\"%s\"内に格納されているサイズが不正です"
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "算出されたCRCチェックサムがファイル\"%s\"に格納されている値と一致しません"
 
-#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:571 postmaster/walsummarizer.c:943 replication/logical/logical.c:211 replication/walsender.c:812
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572 postmaster/walsummarizer.c:939 replication/logical/logical.c:213 replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "WALリーダの割り当てに中に失敗しました。"
@@ -2081,7 +2097,7 @@ msgstr "トランザクション%uの2相状態ファイルを復元できませ
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr "2相状態ファイルがWALレコード%X/%Xで見つかりましたが、このトランザクションはすでにディスクから復元済みです。"
 
-#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:199
+#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "ファイル\"%s\"にアクセスできませんでした: %m"
@@ -2233,397 +2249,392 @@ msgstr "パラレル処理中にセーブポイントのロールバックはで
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "1トランザクション内には 2^32-1 個より多くのサブトランザクションを作成できません"
 
-#: access/transam/xlog.c:1552
+#: access/transam/xlog.c:1544
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr "生成されたWALより先の位置までのフラッシュ要求; 要求 %X/%X, 現在位置 %X/%X"
 
-#: access/transam/xlog.c:1779
+#: access/transam/xlog.c:1771
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr "生成されたWALより先の位置までの読み込み要求; 要求 %X/%X, 現在位置 %X/%X"
 
-#: access/transam/xlog.c:2342 access/transam/xlog.c:4690
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WALセグメントサイズは1MBから1GBまでの間の2の累乗でなければなりません。"
 
-#: access/transam/xlog.c:2360
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "バイナリアップグレードモード中は\"%s\"は-1に設定されている必要があります。"
-
-#: access/transam/xlog.c:2597
+#: access/transam/xlog.c:2454
 #, 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:3883 access/transam/xlogutils.c:820 replication/walsender.c:3050
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820 replication/walsender.c:3088
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "要求された WAL セグメント %s はすでに削除されています"
 
-#: access/transam/xlog.c:4205
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "ファイル\"%s\"の名前を変更できませんでした: %m"
 
-#: access/transam/xlog.c:4248 access/transam/xlog.c:4259 access/transam/xlog.c:4280
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116 access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "WALディレクトリ\"%s\"は存在しません"
 
-#: access/transam/xlog.c:4265 access/transam/xlog.c:4286
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "なかったWALディレクトリ\"%s\"を作成しています"
 
-#: access/transam/xlog.c:4269 access/transam/xlog.c:4289 commands/dbcommands.c:3276
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146 commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "なかったディレクトリ\"%s\"の作成に失敗しました: %m"
 
-#: access/transam/xlog.c:4356
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "秘密の認証トークンを生成できませんでした"
 
-#: access/transam/xlog.c:4534 access/transam/xlog.c:4544 access/transam/xlog.c:4570 access/transam/xlog.c:4580 access/transam/xlog.c:4590 access/transam/xlog.c:4596 access/transam/xlog.c:4606 access/transam/xlog.c:4616 access/transam/xlog.c:4626 access/transam/xlog.c:4636 access/transam/xlog.c:4646 access/transam/xlog.c:4656 access/transam/xlog.c:4668 access/transam/xlog.c:4676 utils/init/miscinit.c:1817
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401 access/transam/xlog.c:4427 access/transam/xlog.c:4437 access/transam/xlog.c:4447 access/transam/xlog.c:4453 access/transam/xlog.c:4463 access/transam/xlog.c:4473 access/transam/xlog.c:4483 access/transam/xlog.c:4493 access/transam/xlog.c:4503 access/transam/xlog.c:4513 access/transam/xlog.c:4525 access/transam/xlog.c:4533 utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "データベースファイルがサーバーと互換性がありません"
 
-#: access/transam/xlog.c:4535
+#: access/transam/xlog.c:4392
 #, 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 "データベースクラスタはPG_CONTROL_VERSION %d (0x%08x)で初期化されましたが、サーバーはPG_CONTROL_VERSION %d (0x%08x)でコンパイルされています。"
 
-#: access/transam/xlog.c:4539
+#: access/transam/xlog.c:4396
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "これはバイトオーダの不整合の可能性があります。initdbを実行する必要がありそうです。"
 
-#: access/transam/xlog.c:4545
+#: access/transam/xlog.c:4402
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "データベースクラスタはPG_CONTROL_VERSION %d で初期化されましたが、サーバーは PG_CONTROL_VERSION %d でコンパイルされています。"
 
-#: access/transam/xlog.c:4548 access/transam/xlog.c:4576 access/transam/xlog.c:4586 access/transam/xlog.c:4592
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433 access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "initdbが必要のようです。"
 
-#: access/transam/xlog.c:4560
+#: access/transam/xlog.c:4417
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "制御ファイル内のチェックサムが不正です"
 
 #. translator: %s is a variable name and %d is its value
-#: access/transam/xlog.c:4572 access/transam/xlog.c:4582 access/transam/xlog.c:4598 access/transam/xlog.c:4608 access/transam/xlog.c:4618 access/transam/xlog.c:4628 access/transam/xlog.c:4638 access/transam/xlog.c:4648 access/transam/xlog.c:4658
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439 access/transam/xlog.c:4455 access/transam/xlog.c:4465 access/transam/xlog.c:4475 access/transam/xlog.c:4485 access/transam/xlog.c:4495 access/transam/xlog.c:4505 access/transam/xlog.c:4515
 #, c-format
 msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
 msgstr "データベースクラスタは %s  %d で初期化されましたが、サーバーは %s  %d でコンパイルされています。"
 
-#: access/transam/xlog.c:4591
+#: access/transam/xlog.c:4448
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "データベースクラスタはサーバー実行ファイルと異なる浮動小数点書式を使用しているようです。"
 
-#: access/transam/xlog.c:4602 access/transam/xlog.c:4612 access/transam/xlog.c:4622 access/transam/xlog.c:4632 access/transam/xlog.c:4642 access/transam/xlog.c:4652 access/transam/xlog.c:4662 access/transam/xlog.c:4671 access/transam/xlog.c:4679
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469 access/transam/xlog.c:4479 access/transam/xlog.c:4489 access/transam/xlog.c:4499 access/transam/xlog.c:4509 access/transam/xlog.c:4519 access/transam/xlog.c:4528 access/transam/xlog.c:4536
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "再コンパイルもしくは initdb が必要そうです。"
 
-#: access/transam/xlog.c:4669
+#: access/transam/xlog.c:4526
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "データベースクラスタは USE_FLOAT8_BYVAL なしで初期化されましたが、サーバー側は USE_FLOAT8_BYVAL 付きでコンパイルされています。"
 
-#: access/transam/xlog.c:4677
+#: access/transam/xlog.c:4534
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "データベースクラスタは USE_FLOAT8_BYVAL 付きで初期化されましたが、サーバー側は USE_FLOAT8_BYVAL なしでコンパイルされています。"
 
-#: access/transam/xlog.c:4686
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "制御ファイル中の不正なWALセグメントサイズ (%dバイト)"
 
 #. translator: both %s are GUC names
-#: access/transam/xlog.c:4700 access/transam/xlog.c:4706
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
 msgid "\"%s\" must be at least twice \"%s\""
 msgstr "\"%s\"は\"%s\"の2倍以上でなければなりません"
 
-#: access/transam/xlog.c:4868 catalog/namespace.c:4696 commands/tablespace.c:1210 commands/user.c:2542 commands/variable.c:72 replication/slot.c:2655 tcop/postgres.c:3631 utils/error/elog.c:2274
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699 commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72 replication/slot.c:2768 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "リスト文法が無効です"
 
-#: access/transam/xlog.c:4914 commands/user.c:2558 commands/variable.c:173 tcop/postgres.c:3647 utils/error/elog.c:2300
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173 tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "不明なキーワードです: \"%s\""
 
-#: access/transam/xlog.c:5341
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "ブートストラップの先行書き込みログファイルに書き込めませんでした: %m"
 
-#: access/transam/xlog.c:5349
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "ブートストラップの先行書き込みログファイルをfsyncできませんでした: %m"
 
-#: access/transam/xlog.c:5355
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "ブートストラップの先行書き込みログファイルをクローズできませんでした: %m"
 
-#: access/transam/xlog.c:5580
+#: access/transam/xlog.c:5433
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "\"wal_level=minimal\"でWALが生成されました、リカバリは続行不可です"
 
-#: access/transam/xlog.c:5581
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "これはこのサーバーで一時的に\"wal_level=minimal\"にした場合に起こります。"
 
-#: access/transam/xlog.c:5582
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "\"wal_level\"を\"minimal\"より上位に設定したあとに取得したバックアップを使用してください。"
 
-#: access/transam/xlog.c:5647
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "制御ファイル内のチェックポイント位置が不正です"
 
-#: access/transam/xlog.c:5658
+#: access/transam/xlog.c:5511
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "データベースシステムは %s にシャットダウンしました"
 
-#: access/transam/xlog.c:5664
+#: access/transam/xlog.c:5517
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "データベースシステムはリカバリ中 %s にシャットダウンしました"
 
-#: access/transam/xlog.c:5670
+#: access/transam/xlog.c:5523
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "データベースシステムはシャットダウン中に中断されました; %s まで動作していたことは確認できます"
 
-#: access/transam/xlog.c:5676
+#: access/transam/xlog.c:5529
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "データベースシステムはリカバリ中 %s に中断されました"
 
-#: access/transam/xlog.c:5678
+#: access/transam/xlog.c:5531
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "これはおそらくデータ破損があり、リカバリのために直前のバックアップを使用しなければならないことを意味します。"
 
-#: access/transam/xlog.c:5684
+#: access/transam/xlog.c:5537
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "データベースシステムはリカバリ中ログ時刻 %s に中断されました"
 
-#: access/transam/xlog.c:5686
+#: access/transam/xlog.c:5539
 #, 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 "これが1回以上起きた場合はデータが破損している可能性があるため、より以前のリカバリ目標を選ぶ必要があるかもしれません。"
 
-#: access/transam/xlog.c:5692
+#: access/transam/xlog.c:5545
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "データベースシステムは中断されました: %s まで動作していたことは確認できます"
 
-#: access/transam/xlog.c:5699
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "制御ファイル内のデータベース・クラスタ状態が不正です"
 
-#: access/transam/xlog.c:6087
+#: access/transam/xlog.c:5940
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "オンラインバックアップの終了より前にWALが終了しました"
 
-#: access/transam/xlog.c:6088
+#: access/transam/xlog.c:5941
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "オンラインバックアップ中に生成されたすべてのWALがリカバリで利用可能である必要があります。"
 
-#: access/transam/xlog.c:6092
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WALが一貫性があるリカバリポイントより前で終了しました"
 
-#: access/transam/xlog.c:6138
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "新しいタイムラインIDを選択: %u"
 
-#: access/transam/xlog.c:6171
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "アーカイブリカバリが完了しました"
 
-#: access/transam/xlog.c:6803
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "シャットダウンしています"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6842
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "リスタートポイント開始:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6854
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "チェックポイント開始:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6919
+#: access/transam/xlog.c:6769
 #, c-format
 msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr "リスタートポイント完了: %d個のバッファを出力 (%.1f%%), %d個のSLRUバッファを出力; %d個のWALファイルを追加、%d個を削除、%d個を再利用; 書き出し=%ld.%03d秒, 同期=%ld.%03d秒, 全体=%ld.%03d秒; 同期したファイル=%d, 最長=%ld.%03d秒, 平均=%ld.%03d秒; 距離=%d kB, 予測=%d kB; lsn=%X/%X, 再生lsn=%X/%X"
 
-#: access/transam/xlog.c:6943
+#: access/transam/xlog.c:6793
 #, c-format
 msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr "チェックポイント完了: %d個のバッファを出力 (%.1f%%), %d個のSLRUバッファを出力; %d個のWALファイルを追加、%d個を削除、%d個を再利用; 書き出し=%ld.%03d秒, 同期=%ld.%03d秒, 全体=%ld.%03d秒; 同期したファイル=%d, 最長=%ld.%03d秒, 平均=%ld.%03d秒; 距離=%d kB, 予測=%d kB; lsn=%X/%X, 再生lsn=%X/%X"
 
-#: access/transam/xlog.c:7429
+#: access/transam/xlog.c:7279
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "データベースのシャットダウンに並行して、先行書き込みログが発生しました"
 
-#: access/transam/xlog.c:8016
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "リカバリ再開ポイントは%X/%Xです"
 
-#: access/transam/xlog.c:8018
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "最後に完了したトランザクションはログ時刻 %s のものです"
 
-#: access/transam/xlog.c:8280
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "復帰ポイント\"%s\"が%X/%Xに作成されました"
 
-#: access/transam/xlog.c:8487
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "オンラインバックアップはキャンセルされ、リカバリを継続できません"
 
-#: access/transam/xlog.c:8545
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "シャットダウンチェックポイントレコードにおいて想定外のタイムラインID %u(%uのはず)がありました"
 
-#: access/transam/xlog.c:8603
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "オンラインチェックポイントレコードにおいて想定外のタイムラインID %u(%uのはず)がありました"
 
-#: access/transam/xlog.c:8632
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "リカバリ終了チェックポイントレコードにおいて想定外のタイムラインID %u(%uのはず)がありました"
 
-#: access/transam/xlog.c:8902
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "ライトスルーファイル\"%s\"をfsyncできませんでした: %m"
 
-#: access/transam/xlog.c:8907
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "ファイル\"%s\"をfdatasyncできませんでした: %m"
 
-#: access/transam/xlog.c:8984 access/transam/xlog.c:9320
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "オンラインバックアップを行うにはWALレベルが不十分です"
 
-#: access/transam/xlog.c:8985 access/transam/xlog.c:9321 access/transam/xlogfuncs.c:249
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194 access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "サーバーの開始時に\"wal_level\"を\"replica\"または \"logical\"にセットする必要があります。"
 
-#: access/transam/xlog.c:8990
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "バックアップラベルが長すぎます (最大%dバイト)"
 
-#: access/transam/xlog.c:9111
+#: access/transam/xlog.c:8984
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed since last restartpoint"
 msgstr "\"full_page_writes=off\"で生成されたWALが最終リスタートポイント以降に再生されました"
 
-#: access/transam/xlog.c:9113 access/transam/xlog.c:9409
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, 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 primary, and then try an online backup again."
 msgstr "つまりこのスタンバイで取得されたバックアップは破損しており、使用すべきではありません。プライマリで\"full_page_writes\"を有効にしCHECKPOINTを実行したのち、再度オンラインバックアップを試行してください。"
 
-#: access/transam/xlog.c:9193 backup/basebackup.c:1419 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "シンボリックリンク\"%s\"を読めませんでした: %m"
 
-#: access/transam/xlog.c:9200 backup/basebackup.c:1424 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "シンボリックリンク\"%s\"の参照先が長すぎます"
 
-#: access/transam/xlog.c:9359 backup/basebackup.c:1283
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "オンラインバックアップ中にスタンバイが昇格しました"
 
-#: access/transam/xlog.c:9360 backup/basebackup.c:1284
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "つまり取得中のバックアップは破損しているため使用してはいけません。再度オンラインバックアップを取得してください。"
 
-#: access/transam/xlog.c:9407
+#: access/transam/xlog.c:9280
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed during online backup"
 msgstr "\"full_page_writes=off\"で生成されたWALがオンラインバックアップ中に再生されました"
 
-#: access/transam/xlog.c:9523
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "ベースバックアップ完了、必要な WAL セグメントがアーカイブされるのを待っています"
 
-#: access/transam/xlog.c:9537
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "まだ必要なすべての WAL セグメントがアーカイブされるのを待っています（%d 秒経過）"
 
-#: access/transam/xlog.c:9539
+#: access/transam/xlog.c:9412
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, but the database backup will not be usable without all the WAL segments."
 msgstr "\"archive_command\"が正しく実行されていることを確認してください。バックアップ処理は安全に取り消すことができますが、全てのWALセグメントがそろわなければこのバックアップは利用できません。"
 
-#: access/transam/xlog.c:9546
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "必要なすべての WAL セグメントがアーカイブされました"
 
-#: access/transam/xlog.c:9550
+#: access/transam/xlog.c:9423
 #, 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 アーカイブが有効になっていません。バックアップを完了させるには、すべての必要なWALセグメントが他の方法でコピーされたことを確認してください。"
 
-#: access/transam/xlog.c:9589
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "バックエンドがpg_backup_stopの呼び出し前に終了したため、バックアップは異常終了しました"
@@ -2719,7 +2730,7 @@ msgstr "リカバリが進行中ではありません"
 #: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554 access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601 access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
-msgstr "リカバリ制御関数リカバリ中にのみを実行可能です。"
+msgstr "リカバリ制御関数はリカバリ中にのみ実行可能です。"
 
 #: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
@@ -2772,162 +2783,162 @@ msgstr "%X/%Xのレコードオフセットが不正です:最低でも%uを期
 msgid "contrecord is requested by %X/%X"
 msgstr "%X/%Xでは継続レコードが必要です"
 
-#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1135
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "%X/%Xのレコード長が不正です:長さは最低でも%uを期待していましたが、実際は%uでした"
 
-#: access/transam/xlogreader.c:759
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "%X/%Xでcontrecordフラグがありません"
 
-#: access/transam/xlogreader.c:772
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "%3$X/%4$Xの継続レコードの長さ%1$u(正しくは%2$lld)は不正です"
 
-#: access/transam/xlogreader.c:1143
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "%2$X/%3$XのリソースマネージャID %1$uは不正です"
 
-#: access/transam/xlogreader.c:1156 access/transam/xlogreader.c:1172
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "%3$X/%4$Xのレコードの後方リンク%1$X/%2$Xが不正です"
 
-#: access/transam/xlogreader.c:1210
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "%X/%Xのレコード内のリソースマネージャデータのチェックサムが不正です"
 
-#: access/transam/xlogreader.c:1244
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "WALセグメント%2$s、LSN %3$X/%4$X、オフセット%5$uで不正なマジックナンバー%1$04X"
 
-#: access/transam/xlogreader.c:1259 access/transam/xlogreader.c:1301
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "WALセグメント %2$s、LSN %3$X/%4$X、オフセット%5$uで不正な情報ビット列%1$04X"
 
-#: access/transam/xlogreader.c:1275
+#: access/transam/xlogreader.c:1285
 #, c-format
 msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr "WALファイルは異なるデータベースシステム由来のものです: WALファイルのデータベースシステム識別子は %<PRIu64>で、pg_control におけるデータベースシステム識別子は %<PRIu64>です"
 
-#: access/transam/xlogreader.c:1283
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL ファイルは異なるデータベースシステム由来のものです: ページヘッダーのセグメントサイズが正しくありません"
 
-#: access/transam/xlogreader.c:1289
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL ファイルは異なるデータベースシステム由来のものです: ページヘッダーのXLOG_BLCKSZが正しくありません"
 
-#: access/transam/xlogreader.c:1321
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "WALセグメント%3$s、LSN %4$X/%5$X、オフセット%6$uで想定外のページアドレス%1$X/%2$X"
 
-#: access/transam/xlogreader.c:1347
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "WALセグメント%3$s、LSN %4$X/%5$X、オフセット%6$uで異常な順序のタイムラインID %1$u(%2$uの後)"
 
-#: access/transam/xlogreader.c:1759
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %uが%X/%Xで不正です"
 
-#: access/transam/xlogreader.c:1783
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATAが設定されていますが、%X/%Xにデータがありません"
 
-#: access/transam/xlogreader.c:1790
+#: access/transam/xlogreader.c:1800
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATAが設定されていませんが、%2$X/%3$Xのデータ長は%1$uです"
 
-#: access/transam/xlogreader.c:1826
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLEが設定されていますが、%4$X/%5$Xでホールオフセット%1$u、長さ%2$u、ブロックイメージ長%3$uです"
 
-#: access/transam/xlogreader.c:1842
+#: access/transam/xlogreader.c:1852
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLEが設定されていませんが、%3$X/%4$Xにおけるホールオフセット%1$uの長さが%2$uです"
 
-#: access/transam/xlogreader.c:1856
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSEDが設定されていますが、%2$X/%3$Xにおいてブロックイメージ長が%1$uです"
 
-#: access/transam/xlogreader.c:1871
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLEもBKPIMAGE_COMPRESSEDも設定されていませんが、%2$X/%3$Xにおいてブロックイメージ長が%1$uです"
 
-#: access/transam/xlogreader.c:1887
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_RELが設定されていますが、%X/%Xにおいて以前のリレーションがありません"
 
-#: access/transam/xlogreader.c:1899
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "%2$X/%3$Xにおけるblock_id %1$uが不正です"
 
-#: access/transam/xlogreader.c:1966
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "%X/%Xのレコードのサイズが不正です"
 
-#: access/transam/xlogreader.c:1992
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "WALレコード中ID %dのバックアップブロックを特定できませんでした"
 
-#: access/transam/xlogreader.c:2076
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "%X/%Xで不正なブロック%dが指定されているためイメージが復元できませんでした"
 
-#: access/transam/xlogreader.c:2083
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "%X/%Xでブロック%dのイメージが不正な状態であるため復元できませんでした"
 
-#: access/transam/xlogreader.c:2110 access/transam/xlogreader.c:2127
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "%1$X/%2$Xで、ブロック%4$dがこのビルドでサポートされない圧縮方式%3$sで圧縮されているため復元できませんでした"
 
-#: access/transam/xlogreader.c:2136
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "%X/%Xでブロック%dのイメージが不明な方式で圧縮されているため復元できませんでした"
 
-#: access/transam/xlogreader.c:2144
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "%X/%Xのブロック%dが伸張できませんでした"
 
-#: access/transam/xlogrecovery.c:623
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "タイムラインID %5$u上でREDO LSN %1$X/%2$X、チェックポイントLSN %3$X/%4$Xからのバックアップ・リカバリを開始しました"
 
-#: access/transam/xlogrecovery.c:655
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "%3$X/%4$Xのチェックポイントレコードが参照しているredo位置%1$X/%2$Xを見つけられませんでした"
 
-#: access/transam/xlogrecovery.c:657 access/transam/xlogrecovery.c:668
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
@@ -2939,454 +2950,465 @@ msgstr ""
 " バックアップからの復旧でなければ、\"%s/backup_label\"の削除を試みてください。.\n"
 "バックアップからの復旧で\"%s/backup_label\"を削除すると、クラスタが破壊されることに注意してください。"
 
-#: access/transam/xlogrecovery.c:666
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "必須のチェックポイントが%X/%Xで見つかりませんでした"
 
-#: access/transam/xlogrecovery.c:696 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "シンボリックリンク\"%s\"を作成できませんでした: %m"
 
-#: access/transam/xlogrecovery.c:729 access/transam/xlogrecovery.c:735
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "ファイル\"%2$s\"が存在しないためファイル\"%1$s\"を無視します"
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "ファイル\"%s\"は\"%s\"にリネームされました。"
 
-#: access/transam/xlogrecovery.c:737
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %m。"
 
-#: access/transam/xlogrecovery.c:776
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "REDO LSN %X/%Xのバックアプリカバリを再開しました"
 
-#: access/transam/xlogrecovery.c:801
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "%X/%Xには有効なチェックポイントレコードがありませんでした"
 
-#: access/transam/xlogrecovery.c:812
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "%3$X/%4$08Xのチェックポイントレコードが参照しているredo位置%1$X/%2$08Xを見つけられませんでした"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "スタンバイモードに入ります"
 
-#: access/transam/xlogrecovery.c:815
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "XID%uまでのポイントインタイムリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:819
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "%sまでのポイントインタイムリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:823
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "\"%s\"までのポイントインタイムリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:827
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "WAL位置(LSN) \"%X/%X\"までのポイントインタイムリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:831
+#: access/transam/xlogrecovery.c:842
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "最も古い一貫性確保点までのポイントインタイムリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:834
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "アーカイブリカバリを開始しています"
 
-#: access/transam/xlogrecovery.c:855
+#: access/transam/xlogrecovery.c:866
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "要求されたタイムライン%uはこのサーバーの履歴からの子孫ではありません"
 
 #. translator: %s is a backup_label file or a pg_control file
-#: access/transam/xlogrecovery.c:858
+#: access/transam/xlogrecovery.c:869
 #, c-format
 msgid "Latest checkpoint in file \"%s\" 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 "ファイル\"%1$s\"での最終チェックポイントはタイムライン%4$uの%2$X/%3$Xですが、要求されたタイムラインの履歴上、サーバーはそのタイムラインから%5$X/%6$Xで分岐しています。"
 
-#: access/transam/xlogrecovery.c:873
+#: access/transam/xlogrecovery.c:884
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "要求されたタイムライン%1$uはタイムライン%4$uの最小リカバリポイント%2$X/%3$Xを含みません"
 
-#: access/transam/xlogrecovery.c:901
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "次のトランザクションIDが不正です"
 
-#: access/transam/xlogrecovery.c:906
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "チェックポイントレコード内の不正なREDO"
 
-#: access/transam/xlogrecovery.c:917
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "シャットダウン・チェックポイントにおける不正なREDOレコード"
 
-#: access/transam/xlogrecovery.c:946
+#: access/transam/xlogrecovery.c:957
 #, c-format
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "データベースシステムは正しくシャットダウンされていません; 自動リカバリを実行中"
 
-#: access/transam/xlogrecovery.c:950
+#: access/transam/xlogrecovery.c:961
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "タイムライン%uから、タイムライン%uを目標としてクラッシュリカバリを開始します"
 
-#: access/transam/xlogrecovery.c:993
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_labelに制御ファイルと整合しないデータが含まれます"
 
-#: access/transam/xlogrecovery.c:994
+#: access/transam/xlogrecovery.c:1005
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "これはバックアップが破損しており、リカバリには他のバックアップを使用しなければならないことを意味します。"
 
-#: access/transam/xlogrecovery.c:1048
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "リカバリコマンドファイル \"%s\"の使用はサポートされません"
 
-#: access/transam/xlogrecovery.c:1113
+#: access/transam/xlogrecovery.c:1124
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr "スタンバイモードはシングルユーザーサーバーではサポートされません"
 
-#: access/transam/xlogrecovery.c:1130
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "\"primary_conninfo\"と\"restore_command\"のどちらも指定されていません"
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr "データベースサーバーはpg_walサブディレクトリに置かれたファイルを定期的に確認します。"
 
-#: access/transam/xlogrecovery.c:1139
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "スタンバイモードを有効にしない場合は、\"restore_command\"の指定が必要です"
 
-#: access/transam/xlogrecovery.c:1177
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "リカバリ目標タイムライン%uが存在しません"
 
-#: access/transam/xlogrecovery.c:1260 access/transam/xlogrecovery.c:1267 access/transam/xlogrecovery.c:1326 access/transam/xlogrecovery.c:1414 access/transam/xlogrecovery.c:1423 access/transam/xlogrecovery.c:1443
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278 access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425 access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "ファイル\"%s\"内の不正なデータ"
 
-#: access/transam/xlogrecovery.c:1327
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "読み取られたタイムラインIDは%uでしたが、%uであるはずです。"
 
-#: access/transam/xlogrecovery.c:1338
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "これはデータディレクトリではなく、差分バックアップです"
 
-#: access/transam/xlogrecovery.c:1339
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "有効なデータディレクトリを再構築するにはpg_combinebackupを使ってください。"
 
-#: access/transam/xlogrecovery.c:1725
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "REDOポイント%X/%Xで想定外のレコードタイプが見つかりました"
 
-#: access/transam/xlogrecovery.c:1748
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "REDOを%X/%Xから開始します"
 
-#: access/transam/xlogrecovery.c:1761
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "REDO進行中、経過時間 %ld.%02d秒, 現在のLSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1851
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "要求されたリカバリ停止ポイントは、一貫性があるリカバリポイントより前にあります"
 
-#: access/transam/xlogrecovery.c:1883
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "REDOが%X/%Xで終了しました、システム使用状況: %s"
 
-#: access/transam/xlogrecovery.c:1889
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "最後に完了したトランザクションのログ時刻は%sでした"
 
-#: access/transam/xlogrecovery.c:1898
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "REDOは必要ありません"
 
-#: access/transam/xlogrecovery.c:1910
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "指定したリカバリターゲットに到達する前にリカバリが終了しました"
 
-#: access/transam/xlogrecovery.c:2104
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "%X/%Xで%sに上書きされて失われた継続行を正常にスキップしました"
 
-#: access/transam/xlogrecovery.c:2171
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "%2$s で想定外のディレクトリエントリ\"%1$s\"が見つかりました"
 
-#: access/transam/xlogrecovery.c:2173
+#: access/transam/xlogrecovery.c:2184
 #, c-format
 msgid "All directory entries in %s/ should be symbolic links."
 msgstr "%s 内のすべてのディレクトリエントリは、シンボリックリンクである必要があります。"
 
-#: access/transam/xlogrecovery.c:2175
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr "これらのディレクトリを削除するか、または\"allow_in_place_tablespaces\"を一時的にONに設定することでリカバリを完了させることができます。"
 
-#: access/transam/xlogrecovery.c:2227
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "REDO LSN%X/%X、終了LSN %X/%Xのバックアップ・リカバリが完了しました"
 
-#: access/transam/xlogrecovery.c:2258
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "%X/%X でリカバリの一貫性が確保されました"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2296
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "%X/%Xにある%sのWAL再生"
 
-#: access/transam/xlogrecovery.c:2394
+#: access/transam/xlogrecovery.c:2405
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "チェックポイントレコードにおいて想定外の前回のタイムラインID %u(現在のタイムラインIDは%u)がありました"
 
-#: access/transam/xlogrecovery.c:2403
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "チェックポイントレコードにおいて想定外のタイムラインID %u (%uの後)がありました"
 
-#: access/transam/xlogrecovery.c:2419
+#: access/transam/xlogrecovery.c:2430
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "タイムライン%4$uの最小リカバリポイント%2$X/%3$Xに達する前のチェックポイントレコード内の想定外のタイムラインID%1$u。"
 
-#: access/transam/xlogrecovery.c:2603 access/transam/xlogrecovery.c:2879
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "リカバリ処理は一貫性確保後に停止します"
 
-#: access/transam/xlogrecovery.c:2624
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "リカバリ処理はWAL位置(LSN)\"%X/%X\"の前で停止します"
 
-#: access/transam/xlogrecovery.c:2714
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "リカバリ処理はトランザクション%uのコミット、時刻%sの前に停止します"
 
-#: access/transam/xlogrecovery.c:2721
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "リカバリ処理はトランザクション%uのアボート、時刻%sの前に停止します"
 
-#: access/transam/xlogrecovery.c:2774
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "リカバリ処理は復元ポイント\"%s\"、時刻%s に停止します"
 
-#: access/transam/xlogrecovery.c:2792
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "リカバリ処理はWAL位置(LSN)\"%X/%X\"の後で停止します"
 
-#: access/transam/xlogrecovery.c:2859
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "リカバリ処理はトランザクション%uのコミット、時刻%sの後に停止します"
 
-#: access/transam/xlogrecovery.c:2867
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "リカバリ処理はトランザクション%uのアボート、時刻%sの後に停止します"
 
-#: access/transam/xlogrecovery.c:2948
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "リカバリ完了位置で一時停止しています"
 
-#: access/transam/xlogrecovery.c:2949
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "再開するには pg_wal_replay_resume() を実行してください"
 
-#: access/transam/xlogrecovery.c:2952 access/transam/xlogrecovery.c:4698
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "リカバリは一時停止中です"
 
-#: access/transam/xlogrecovery.c:2953
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "再開するには pg_xlog_replay_resume() を実行してください"
 
-#: access/transam/xlogrecovery.c:3216
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "WALセグメント%2$s、LSN %3$X/%4$X、オフセット%5$uで想定外のタイムラインID%1$u"
 
-#: access/transam/xlogrecovery.c:3432
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "WALセグメント%s、LSN %X/%X、オフセット%uを読み取れませんでした: %m"
 
-#: access/transam/xlogrecovery.c:3439
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "WALセグメント%1$s、LSN %2$X/%3$X、オフセット%4$uを読み取れませんでした: %6$zu 中 %5$d の読み込み"
 
-#: access/transam/xlogrecovery.c:4082
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "不正なチェックポイント位置"
 
-#: access/transam/xlogrecovery.c:4092
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "チェックポイントレコードが不正です"
 
-#: access/transam/xlogrecovery.c:4098
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "チェックポイントレコード内のリソースマネージャIDがで不正です"
 
-#: access/transam/xlogrecovery.c:4106
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "チェックポイントレコード内のxl_infoが不正です"
 
-#: access/transam/xlogrecovery.c:4112
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "チェックポイントレコード長が不正です"
 
-#: access/transam/xlogrecovery.c:4166
+#: access/transam/xlogrecovery.c:4188
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "新しいタイムライン%uはデータベースシステムのタイムライン%uの子ではありません"
 
-#: access/transam/xlogrecovery.c:4180
+#: access/transam/xlogrecovery.c:4202
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "新しいタイムライン%uは現在のデータベースシステムのタイムライン%uから現在のリカバリポイント%X/%Xより前に分岐しています"
 
-#: access/transam/xlogrecovery.c:4199
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "新しい目標タイムラインは%uです"
 
-#: access/transam/xlogrecovery.c:4400
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "wal receiverプロセスのシャットダウンが要求されました"
 
-#: access/transam/xlogrecovery.c:4460
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "昇格要求を受信しました"
 
-#: access/transam/xlogrecovery.c:4689
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "不十分なパラメータ設定のため、ホットスタンバイを使用できません"
 
-#: access/transam/xlogrecovery.c:4690 access/transam/xlogrecovery.c:4717 access/transam/xlogrecovery.c:4747
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739 access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d はプライマリサーバーの設定値より小さいです、プライマリサーバーではこの値は%dでした。"
 
-#: access/transam/xlogrecovery.c:4699
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "リカバリの一時停止を解除すると、サーバーはシャットダウンします。"
 
-#: access/transam/xlogrecovery.c:4700
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "その後、必要な設定変更を行った後にサーバーを再起動できます。"
 
-#: access/transam/xlogrecovery.c:4711
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "不十分なパラメータ設定のため、昇格できません"
 
-#: access/transam/xlogrecovery.c:4721
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "必要な設定変更を行ったのち、サーバーを再起動してください。"
 
-#: access/transam/xlogrecovery.c:4745
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "不十分なパラメータ設定値のためリカバリが停止しました"
 
-#: access/transam/xlogrecovery.c:4751
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "必要な設定変更を行うことでサーバーを再起動できます。"
 
-#: access/transam/xlogrecovery.c:4792
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795 catalog/dependency.c:1153 catalog/dependency.c:1160 catalog/dependency.c:1171 commands/tablecmds.c:1519 commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302 commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211 executor/execExprInterp.c:5219 libpq/auth.c:320 replication/logical/applyparallelworker.c:1048 replication/slot.c:1705 replication/slot.c:2783
+#: replication/slot.c:2785 replication/syncrep.c:1079 storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137 storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207 utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868 utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "複数のリカバリ目標が指定されています"
 
-#: access/transam/xlogrecovery.c:4793
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "\" recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time, recovery_target_xid\" はこの中の1つまで設定可能です。"
 
-#: access/transam/xlogrecovery.c:4804
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "\"immediate\"のみが指定可能です。"
 
-#: access/transam/xlogrecovery.c:4958
+#: access/transam/xlogrecovery.c:4991
 #, c-format
 msgid "Timestamp out of range: \"%s\"."
 msgstr "timestampが範囲外です: \"%s\"。"
 
-#: access/transam/xlogrecovery.c:5003
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "\"recovery_target_timeline\"が数値として妥当ではありません。"
@@ -3416,7 +3438,7 @@ msgstr "失敗したアーカイブコマンドは次のとおりです: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "アーカイブコマンドが例外0x%Xで終了しました"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:2843
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "16進値の説明についてはC インクルードファイル\"ntstatus.h\"を参照してください。"
@@ -3648,12 +3670,12 @@ msgstr "WAL集計がタイムライン%u上の%X/%Xから%X/%Xまで必要です
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "この範囲で集計されていない最初のLSNは%X/%Xです。"
 
-#: backup/basebackup_incremental.c:934
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "バックアップ目録のバージョン1は差分バックアップをサポートしていません"
 
-#: backup/basebackup_incremental.c:952
+#: backup/basebackup_incremental.c:966
 #, c-format
 msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
 msgstr "バックアップ目録中のシステム識別子が%<PRIu64>ですが、データベースのシステム識別子は%<PRIu64>です"
@@ -3678,7 +3700,7 @@ msgstr "\"%s\"ロールの権限を持つロールのみが、サーバー上に
 msgid "relative path not allowed for backup stored on server"
 msgstr "サーバー上に格納されるバックアップでは相対パスは指定できません"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:478 commands/tablespace.c:157 commands/tablespace.c:173 commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2179 storage/file/copydir.c:58
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478 commands/tablespace.c:157 commands/tablespace.c:173 commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287 storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を作成できませんでした: %m"
@@ -3688,12 +3710,12 @@ msgstr "ディレクトリ\"%s\"を作成できませんでした: %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "ディレクトリ\"%s\"は存在しますが、空ではありません"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1171
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"にアクセスできませんでした: %m"
 
-#: backup/basebackup_server.c:175 backup/basebackup_server.c:182 backup/basebackup_server.c:268 backup/basebackup_server.c:275 backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526 storage/smgr/md.c:608 storage/smgr/md.c:630 storage/smgr/md.c:1123
+#: backup/basebackup_server.c:175 backup/basebackup_server.c:182 backup/basebackup_server.c:268 backup/basebackup_server.c:275 backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526 storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "ディスクの空き容量をチェックしてください。"
@@ -3733,17 +3755,17 @@ msgstr "長距離モードを有効化できませんでした: %s"
 msgid "invalid timeline %<PRId64>"
 msgstr "不正なタイムライン%<PRId64>"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3863
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
 #, c-format
 msgid "--%s must be first argument"
 msgstr "--%sは最初の引数でなければなりません"
 
-#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3877
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%sには値が必要です"
 
-#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3882
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %sは値が必要です"
@@ -3808,12 +3830,12 @@ msgstr "\"%s\"に対して一部の権限が剥奪できませんでした"
 msgid "grantor must be current user"
 msgstr "権限付与者は現在のユーザーでなければなりません"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:982
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "リレーションに対する不正な権限のタイプ %s"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:986
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "シーケンスに対する不正な権限のタイプ %s"
@@ -3828,7 +3850,7 @@ msgstr "データベースに対する不正な権限タイプ %s"
 msgid "invalid privilege type %s for domain"
 msgstr "ドメインに対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:990
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "関数に対する不正な権限タイプ %s"
@@ -3838,22 +3860,22 @@ msgstr "関数に対する不正な権限タイプ %s"
 msgid "invalid privilege type %s for language"
 msgstr "言語に対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:504 catalog/aclchk.c:1010
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "ラージオブジェクトに対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1006
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "スキーマに対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:994
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "プロシージャに対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:998
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "ルーチンに対する不正な権限のタイプ %s"
@@ -3863,7 +3885,7 @@ msgstr "ルーチンに対する不正な権限のタイプ %s"
 msgid "invalid privilege type %s for tablespace"
 msgstr "テーブル空間に対する不正な権限タイプ %s"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1002
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "型に対する不正な権限タイプ %s"
@@ -3888,506 +3910,501 @@ msgstr "パラメータに対する不正な権限タイプ %s"
 msgid "column privileges are only valid for relations"
 msgstr "列権限はリレーションに対してのみ有効です"
 
-#: catalog/aclchk.c:1043
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "デフォルト権限は列には設定できません"
 
-#: catalog/aclchk.c:1079
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "デフォルト権限を変更する権限がありません"
 
-#: catalog/aclchk.c:1197
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "GRANT/REVOKE ON SCHEMAS を使っている時には IN SCHEMA 句は指定できません"
-
-#: catalog/aclchk.c:1207
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
 #, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
-msgstr "GRANT/REVOKE ON LARGE OBJECTS を使っている時には IN SCHEMA 句は指定できません"
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "%s の使用時には IN SCHEMA 句は指定できません"
 
-#: catalog/aclchk.c:1561 catalog/catalog.c:655 catalog/heap.c:2611 catalog/heap.c:2930 catalog/objectaddress.c:1528 catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1000 commands/sequence.c:1655 commands/tablecmds.c:7750 commands/tablecmds.c:7928 commands/tablecmds.c:8129 commands/tablecmds.c:8258 commands/tablecmds.c:8387 commands/tablecmds.c:8481 commands/tablecmds.c:8584 commands/tablecmds.c:8750 commands/tablecmds.c:8780
-#: commands/tablecmds.c:8935 commands/tablecmds.c:9038 commands/tablecmds.c:9172 commands/tablecmds.c:9285 commands/tablecmds.c:14325 commands/tablecmds.c:14525 commands/tablecmds.c:14686 commands/tablecmds.c:15891 commands/tablecmds.c:18658 commands/trigger.c:947 parser/analyze.c:2660 parser/parse_relation.c:749 parser/parse_target.c:1070 parser/parse_type.c:144 parser/parse_utilcmd.c:3641 parser/parse_utilcmd.c:3681 parser/parse_utilcmd.c:3723
-#: statistics/attribute_stats.c:209 statistics/attribute_stats.c:948 utils/adt/acl.c:2921 utils/adt/ruleutils.c:2858
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621 catalog/heap.c:2941 catalog/objectaddress.c:1528 catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039 commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929 commands/tablecmds.c:8130 commands/tablecmds.c:8259 commands/tablecmds.c:8413 commands/tablecmds.c:8507 commands/tablecmds.c:8610 commands/tablecmds.c:8776 commands/tablecmds.c:8806
+#: commands/tablecmds.c:8961 commands/tablecmds.c:9064 commands/tablecmds.c:9198 commands/tablecmds.c:9311 commands/tablecmds.c:14397 commands/tablecmds.c:14600 commands/tablecmds.c:14761 commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948 parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070 parser/parse_type.c:144 parser/parse_utilcmd.c:3662 parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955 utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は存在しません"
 
-#: catalog/aclchk.c:1806
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\"はインデックスです"
 
-#: catalog/aclchk.c:1813 commands/tablecmds.c:16048 commands/tablecmds.c:19577
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\"は複合型です"
 
-#: catalog/aclchk.c:1821 catalog/objectaddress.c:1368 commands/tablecmds.c:266 commands/tablecmds.c:19541 utils/adt/acl.c:2105 utils/adt/acl.c:2135 utils/adt/acl.c:2168 utils/adt/acl.c:2204 utils/adt/acl.c:2235 utils/adt/acl.c:2266
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266 commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152 utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252 utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\"はシーケンスではありません"
 
-#: catalog/aclchk.c:1859
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "シーケンス \"%s\"では USAGE, SELECT, UPDATE 権限のみをサポートします"
 
-#: catalog/aclchk.c:1876
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "テーブルに対する権限タイプ%sは不正です"
 
-#: catalog/aclchk.c:2041
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "列では権限タイプ %s は無効です"
 
-#: catalog/aclchk.c:2054
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "シーケンス \"%s\"では USAGE, SELECT, UPDATE のみをサポートします"
 
-#: catalog/aclchk.c:2245
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "言語\"%s\"は信頼されていません"
 
-#: catalog/aclchk.c:2247
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "信頼されない言語はスーパーユーザーのみが使用可能なため、GRANTとREVOKEは信頼されない言語上では実行不可です。"
 
-#: catalog/aclchk.c:2398
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "配列型の権限を設定できません"
 
-#: catalog/aclchk.c:2399
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "代わりに要素型の権限を設定してください。"
 
-#: catalog/aclchk.c:2403
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "複範囲型の権限を設定できません"
 
-#: catalog/aclchk.c:2404
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "代わりに範囲型の権限を設定してください。"
 
-#: catalog/aclchk.c:2587
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "認識できない権限タイプ\"%s\""
 
-#: catalog/aclchk.c:2654
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "集約 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2657
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "照合順序 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2660
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "列 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2663
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "変換 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2666
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "データベース %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2669
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "ドメイン %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2672
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "イベントトリガ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2675
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "機能拡張 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2678
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "外部データラッパ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2681
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "外部サーバー %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2684
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "外部テーブル %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2687
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "関数 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2690
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "インデックス %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2693
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "言語 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2696
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "ラージオブジェクト %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2699
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "実体化ビュー %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2702
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "演算子クラス %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2705
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "演算子 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2708
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "演算子族 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2711
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "パラメータ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2714
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "ポリシ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2717
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "プロシージャ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "パブリケーション%sへのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "ルーチン %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "スキーマ %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2729 commands/sequence.c:654 commands/sequence.c:880 commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880 commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "シーケンス %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "統計情報オブジェクト %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "サブスクリプション %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "テーブル %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "テーブル空間 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "テキスト検索設定 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "テキスト検索辞書 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "型 %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "ビュー %s へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "集約 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "照合順序 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2795
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "変換 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "データベース %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "ドメイン %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "イベントトリガ %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "機能拡張 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "外部データラッパー %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "外部サーバー %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "外部テーブル %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "関数 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2822
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "インデックス %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2825
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "言語 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2828
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "ラージオブジェクト %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2831
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "実体化ビュー %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2834
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "演算子クラス %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2837
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "演算子 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2840
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "演算子族 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2843
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "プロシージャ %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2846
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "パブリケーション %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2849
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "ルーチン %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2852
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "シーケンス %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "サブスクリプション %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "テーブル %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "型 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "ビュー %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "スキーマ %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "統計情報オブジェクト %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "テーブル空間 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "テキスト検索設定 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "テキスト検索辞書 %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2893
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "リレーション %s の所有者である必要があります"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "リレーション\"%2$s\"の列\"%1$s\"へのアクセスが拒否されました"
 
-#: catalog/aclchk.c:3173 catalog/aclchk.c:3192
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "OID %2$uのリレーションに属性%1$dは存在しません"
 
-#: catalog/aclchk.c:3230 catalog/aclchk.c:3293 catalog/aclchk.c:3932
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "OID %uのリレーションは存在しません"
 
-#: catalog/aclchk.c:3478
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "OID %uのパラメータACLは存在しません"
 
-#: catalog/aclchk.c:3557 catalog/objectaddress.c:1055 catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323 storage/large_object/inv_api.c:247
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055 catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323 storage/large_object/inv_api.c:247
 #, c-format
 msgid "large object %u does not exist"
 msgstr "ラージオブジェクト%uは存在しません"
 
-#: catalog/aclchk.c:3651 commands/collationcmds.c:849 commands/publicationcmds.c:1846
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849 commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "OID %uのスキーマは存在しません"
 
-#: catalog/aclchk.c:3725 catalog/aclchk.c:3752 catalog/aclchk.c:3781 utils/cache/typcache.c:473 utils/cache/typcache.c:528
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797 utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "OID %uの型は存在しません"
 
-#: catalog/catalog.c:475
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "リレーション\"%s\"での未使用のOIDを探索を継続中"
 
-#: catalog/catalog.c:477
+#: catalog/catalog.c:506
 #, c-format
 msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
 msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
 msgstr[0] "OID候補のチェックを%<PRIu64>回行いましたが、使用されていないOIDはまだ見つかっていません。"
 
-#: catalog/catalog.c:502
+#: catalog/catalog.c:531
 #, c-format
 msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
 msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
 msgstr[0] "リレーション\\\"%s\\\"で%<PRIu64>回の試行後に新しいOIDが割り当てられました"
 
-#: catalog/catalog.c:633 catalog/catalog.c:700
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "%s()を呼び出すにはスーパーユーザーである必要があります"
 
-#: catalog/catalog.c:642
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() はシステムカタログでのみ使用できます"
 
-#: catalog/catalog.c:647 parser/parse_utilcmd.c:2426
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "インデックス\"%s\"はテーブル\"%s\"には属していません"
 
-#: catalog/catalog.c:664
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "列\"%s\"はoid型ではありません"
 
-#: catalog/catalog.c:671
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "インデックス\"%s\"は列\"%s\"に対するインデックスではありません"
@@ -4434,12 +4451,6 @@ msgstr[0] ""
 msgid "cannot drop %s because other objects depend on it"
 msgstr "他のオブジェクトが依存しているため%sを削除できません"
 
-#: catalog/dependency.c:1153 catalog/dependency.c:1160 catalog/dependency.c:1171 commands/tablecmds.c:1518 commands/tablecmds.c:16642 commands/tablespace.c:460 commands/user.c:1302 commands/vacuum.c:224 commands/view.c:441 executor/execExprInterp.c:5211 executor/execExprInterp.c:5219 libpq/auth.c:312 replication/logical/applyparallelworker.c:1041 replication/slot.c:1594 replication/syncrep.c:1012 storage/aio/method_io_uring.c:191 storage/lmgr/deadlock.c:1137
-#: storage/lmgr/proc.c:1526 utils/misc/guc.c:3166 utils/misc/guc.c:3207 utils/misc/guc.c:3282 utils/misc/guc.c:6823 utils/misc/guc.c:6857 utils/misc/guc.c:6891 utils/misc/guc.c:6934 utils/misc/guc.c:6976
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4466,7 +4477,7 @@ msgstr "%s型の定数をここで使用することはできません"
 msgid "transition table \"%s\" cannot be referenced in a persistent object"
 msgstr "遷移テーブル\"%s\"は永続オブジェクトからは参照できません"
 
-#: catalog/dependency.c:2390 parser/parse_relation.c:3513 parser/parse_relation.c:3523 statistics/attribute_stats.c:221
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513 parser/parse_relation.c:3523 statistics/attribute_stats.c:224 statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "リレーション\"%2$s\"の列\"%1$d\"は存在しません"
@@ -4481,12 +4492,12 @@ msgstr "\"%s.%s\"を作成する権限がありません"
 msgid "System catalog modifications are currently disallowed."
 msgstr "システムカタログの更新は現在禁止されています"
 
-#: catalog/heap.c:463 commands/tablecmds.c:2561 commands/tablecmds.c:3013 commands/tablecmds.c:7360
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014 commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "テーブルは最大で%d列までしか持てません"
 
-#: catalog/heap.c:481 commands/tablecmds.c:7662
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "列名\"%s\"はシステム用の列名に使われています"
@@ -4517,183 +4528,208 @@ msgstr "仮想生成列\"%s\"ではドメイン型は使用できません"
 msgid "composite type %s cannot be made a member of itself"
 msgstr "複合型 %s がそれ自身のメンバーになることはできません"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "仮想生成列\"%s\"ではユーザー定義関数は使用できません"
+
+#: catalog/heap.c:674 catalog/heap.c:3295
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "ユーザー定義型を使用した仮想生成列は未サポートです。"
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:677
+#: catalog/heap.c:686
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr "照合可能な型 %2$s のパーティションキー列%1$sのための照合順序が見つかりませんでした"
 
-#: catalog/heap.c:683 commands/createas.c:200 commands/createas.c:513
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr "照合可能な型 %2$s を持つ列\"%1$s\"のための照合順序を決定できませんでした"
 
-#: catalog/heap.c:1169 catalog/index.c:901 commands/createas.c:409 commands/tablecmds.c:4295
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408 commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "リレーション\"%s\"はすでに存在します"
 
-#: catalog/heap.c:1185 catalog/pg_type.c:434 catalog/pg_type.c:805 catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265 commands/typecmds.c:758 commands/typecmds.c:1205 commands/typecmds.c:1431 commands/typecmds.c:1611 commands/typecmds.c:2586
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805 catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265 commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439 commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "型\"%s\"はすでに存在します"
 
-#: catalog/heap.c:1186
+#: catalog/heap.c:1196
 #, 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 "リレーションは同じ名前の関連する型を持ちます。このため既存の型と競合しない名前である必要があります。"
 
-#: catalog/heap.c:1226
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にTOASTのrelfilenumberの値が設定されていません"
 
-#: catalog/heap.c:1237
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_classのヒープOIDが設定されていません"
 
-#: catalog/heap.c:1247
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にrelfilenumberの値が設定されていません"
 
-#: catalog/heap.c:2192
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "パーティション親テーブル\"%s\"に NO INHERIT 制約は追加できません"
 
-#: catalog/heap.c:2515
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "検査制約\"%s\"はすでに存在します"
 
-#: catalog/heap.c:2616 catalog/heap.c:2936
+#: catalog/heap.c:2626 catalog/heap.c:2947
 #, c-format
 msgid "cannot add not-null constraint on system column \"%s\""
 msgstr "システム列\"%s\"に対して非NULL制約を追加することはできません"
 
-#: catalog/heap.c:2643 catalog/heap.c:2769 catalog/heap.c:3020 catalog/index.c:915 catalog/pg_constraint.c:1000 commands/tablecmds.c:9765
+#: catalog/heap.c:2654 catalog/heap.c:2780 catalog/heap.c:3031 catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9821
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "すでに制約\"%s\"はリレーション\"%s\"に存在します"
 
-#: catalog/heap.c:2776
+#: catalog/heap.c:2787
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "制約\"%s\"は、リレーション\"%s\"上の継承されていない制約と競合します"
 
-#: catalog/heap.c:2787
+#: catalog/heap.c:2798
 #, c-format
 msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr "制約\"%s\"は、リレーション\"%s\"上の継承された制約と競合します"
 
-#: catalog/heap.c:2797
+#: catalog/heap.c:2808
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
 msgstr "制約\"%s\"は、リレーション\"%s\"上の NOT VALID 制約と競合します"
 
-#: catalog/heap.c:2809
+#: catalog/heap.c:2820
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
 msgstr "制約\"%s\"は、リレーション\"%s\"上の \\NOT ENFORCED制約と競合します"
 
-#: catalog/heap.c:2814
+#: catalog/heap.c:2825
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "継承された定義により制約\"%s\"をマージしています"
 
-#: catalog/heap.c:2838 catalog/pg_constraint.c:778 catalog/pg_constraint.c:1129 commands/tablecmds.c:3178 commands/tablecmds.c:3498 commands/tablecmds.c:7285 commands/tablecmds.c:7966 commands/tablecmds.c:17485 commands/tablecmds.c:17667
+#: catalog/heap.c:2849 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154 commands/tablecmds.c:3179 commands/tablecmds.c:3499 commands/tablecmds.c:7286 commands/tablecmds.c:7967 commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "継承の親テーブルが多すぎます"
 
-#: catalog/heap.c:2955 parser/parse_utilcmd.c:2634
+#: catalog/heap.c:2966 parser/parse_utilcmd.c:2655
 #, c-format
 msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
 msgstr "列\"%s\"に対する非NULL制約にNO INHERIT宣言が競合しています"
 
-#: catalog/heap.c:2969
+#: catalog/heap.c:2980
 #, c-format
 msgid "conflicting not-null constraint names \"%s\" and \"%s\""
 msgstr "非NULL制約の名前\"%s\"と\"%s\"が競合しています"
 
-#: catalog/heap.c:2999
+#: catalog/heap.c:3010
 #, c-format
-msgid "cannot define not-null constraint on column \"%s\" with NO INHERIT"
-msgstr "NO INHERIT指定されている列\"%s\"に対して非NULL制約を定義することはできません"
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "列\"%s\"に対して非NULL制約をNO INHERITと同時に定義することはできません"
 
-#: catalog/heap.c:3001
+#: catalog/heap.c:3012
 #, c-format
 msgid "The column has an inherited not-null constraint."
 msgstr "この列には継承された非NULL制約が存在します。"
 
-#: catalog/heap.c:3191
+#: catalog/heap.c:3202
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "生成カラム\"%s\"はカラム生成式中では使用できません"
 
-#: catalog/heap.c:3193
+#: catalog/heap.c:3204
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "生成カラムは他の生成カラムを参照できません。"
 
-#: catalog/heap.c:3199
+#: catalog/heap.c:3210
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr "列生成式内では行全体参照は使用できません"
 
-#: catalog/heap.c:3200
+#: catalog/heap.c:3211
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "これは生成列を自身の値に依存させることにつながります。"
 
-#: catalog/heap.c:3255
+#: catalog/heap.c:3278
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "生成式でユーザー定義関数が使用されています"
+
+#: catalog/heap.c:3279
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr "ユーザー定義関数を使用した仮想生成列は未サポートです。"
+
+#: catalog/heap.c:3294
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "生成式でユーザー定義型が使用されています"
+
+#: catalog/heap.c:3346
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "生成式は不変ではありません"
 
-#: catalog/heap.c:3283 rewrite/rewriteHandler.c:1285
+#: catalog/heap.c:3378 rewrite/rewriteHandler.c:1288
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "列\"%s\"の型は%sですが、デフォルト式の型は%sです"
 
-#: catalog/heap.c:3288 commands/prepare.c:335 parser/analyze.c:2991 parser/parse_target.c:595 parser/parse_target.c:885 parser/parse_target.c:895 rewrite/rewriteHandler.c:1290
+#: catalog/heap.c:3383 commands/prepare.c:334 parser/analyze.c:2906 parser/parse_target.c:595 parser/parse_target.c:885 parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "式を書き換えるかキャストする必要があります。"
 
-#: catalog/heap.c:3335
+#: catalog/heap.c:3430
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "検査制約ではテーブル\"%s\"のみを参照することができます"
 
-#: catalog/heap.c:3641
+#: catalog/heap.c:3736
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "ON COMMITと外部キーの組み合わせはサポートされていません"
 
-#: catalog/heap.c:3642
+#: catalog/heap.c:3737
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "テーブル\"%s\"は\"%s\"を参照します。しかし、これらのON COMMIT設定は同一ではありません。"
 
-#: catalog/heap.c:3647
+#: catalog/heap.c:3742
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "外部キー制約で参照されているテーブルを削除できません"
 
-#: catalog/heap.c:3648
+#: catalog/heap.c:3743
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "テーブル\"%s\"は\"%s\"を参照します。"
 
-#: catalog/heap.c:3650
+#: catalog/heap.c:3745
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "同時にテーブル\"%s\"がtruncateされました。TRUNCATE ... CASCADEを使用してください。"
 
-#: catalog/index.c:220 parser/parse_utilcmd.c:2331
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "テーブル\"%s\"に複数のプライマリキーを持たせることはできません"
@@ -4738,7 +4774,7 @@ msgstr "排他制約のためのインデックスの並列的作成はサポー
 msgid "shared indexes cannot be created after initdb"
 msgstr "initdbの後に共有インデックスを作成できません"
 
-#: catalog/index.c:893 commands/createas.c:424 commands/sequence.c:159 parser/parse_utilcmd.c:210
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159 parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "リレーション\"%s\"はすでに存在します、スキップします"
@@ -4748,7 +4784,7 @@ msgstr "リレーション\"%s\"はすでに存在します、スキップしま
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_classのインデックスOIDが設定されていません"
 
-#: catalog/index.c:953 utils/cache/relcache.c:3781
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にインデックスのrelfilenumberの値が設定されていません"
@@ -4763,12 +4799,12 @@ msgstr "DROP INDEX CONCURRENTLYはトランザクション内で最初の操作
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルはインデクス再構築できません"
 
-#: catalog/index.c:3740 commands/indexcmds.c:3757
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "TOASTテーブルの無効なインデックスの再作成はできません"
 
-#: catalog/index.c:3756 commands/indexcmds.c:3635 commands/indexcmds.c:3781 commands/tablecmds.c:3702
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815 commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "システムリレーション\"%s\"を移動できません"
@@ -4783,7 +4819,7 @@ msgstr "インデックス\"%s\"のインデックス再構築が完了しまし
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "TOASTテーブルの無効なインデックス \"%s.%s\"の再作成はできません、スキップします "
 
-#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758 commands/trigger.c:5780
+#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758 commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "データベース間の参照は実装されていません: \"%s.%s.%s\""
@@ -4803,7 +4839,7 @@ msgstr "リレーション\"%s.%s\"のロックを取得できませんでした
 msgid "could not obtain lock on relation \"%s\""
 msgstr "リレーション\"%s\"のロックを取得できませんでした"
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1447 statistics/stat_utils.c:231
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "リレーション\"%s.%s\"は存在しません"
@@ -4813,7 +4849,7 @@ msgstr "リレーション\"%s.%s\"は存在しません"
 msgid "relation \"%s\" does not exist"
 msgstr "リレーション\"%s\"は存在しません"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1804 commands/extension.c:1810
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1933 commands/extension.c:1939
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "作成先のスキーマが選択されていません"
@@ -4838,97 +4874,97 @@ msgstr "一時スキーマの中には一時リレーションしか作成でき
 msgid "statistics object \"%s\" does not exist"
 msgstr "統計情報オブジェクト\"%s\"は存在しません"
 
-#: catalog/namespace.c:2761
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "テキスト検索パーサ\"%s\"は存在しません"
 
-#: catalog/namespace.c:2906 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "テキスト検索辞書\"%s\"は存在しません"
 
-#: catalog/namespace.c:3052
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "テキスト検索テンプレート\"%s\"は存在しません"
 
-#: catalog/namespace.c:3197 commands/tsearchcmds.c:1168 utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168 utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "テキスト検索設定\"%s\"は存在しません"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:866 parser/parse_target.c:1262
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "データベース間の参照は実装されていません: %s"
 
-#: catalog/namespace.c:3335 gram.y:19418 gram.y:19458 parser/parse_expr.c:873 parser/parse_target.c:1269
+#: catalog/namespace.c:3338 gram.y:19355 gram.y:19395 parser/parse_expr.c:874 parser/parse_target.c:1269
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "修飾名が不適切です(ドット区切りの名前が多すぎます): %s"
 
-#: catalog/namespace.c:3465
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "一時スキーマへ、または一時スキーマからオブジェクトを移動できません"
 
-#: catalog/namespace.c:3471
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "TOASTスキーマへ、またはTOASTスキーマからオブジェクトを移動できません"
 
-#: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344 commands/tablecmds.c:1463 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344 commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "スキーマ\"%s\"は存在しません"
 
-#: catalog/namespace.c:3575
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "リレーション名が不適切です(ドット区切りの名前が多すぎます): %s"
 
-#: catalog/namespace.c:4016 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "エンコーディング\"%2$s\"の照合順序\"%1$s\"は存在しません"
 
-#: catalog/namespace.c:4071
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "変換\"%sは存在しません"
 
-#: catalog/namespace.c:4412
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "データベース\"%s\"に一時テーブルを作成する権限がありません"
 
-#: catalog/namespace.c:4428
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "リカバリ中は一時テーブルを作成できません"
 
-#: catalog/namespace.c:4434
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "並行処理中は一時テーブルを作成できません"
 
-#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373 commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2386 commands/tablecmds.c:14460
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373 commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387 commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\"はテーブルではありません"
 
-#: catalog/objectaddress.c:1383 commands/tablecmds.c:272 commands/tablecmds.c:19546 commands/view.c:113
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272 commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\"はビューではありません"
 
-#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278 commands/tablecmds.c:19551
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278 commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\"は実体化ビューではありません"
 
-#: catalog/objectaddress.c:1397 commands/tablecmds.c:296 commands/tablecmds.c:19556
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296 commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\"は外部テーブルではありません"
@@ -4948,7 +4984,7 @@ msgstr "列名を修飾する必要があります"
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"に対するデフォルト値が存在しません"
 
-#: catalog/objectaddress.c:1623 commands/functioncmds.c:132 commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3834 parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801 utils/adt/acl.c:4558
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132 commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842 parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801 utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "型\"%s\"は存在しません"
@@ -4973,7 +5009,7 @@ msgstr "%4$s の関数 %1$d (%2$s, %3$s) がありません"
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "ユーザー\"%s\"に対するユーザーマッピングがサーバー\"%s\"には存在しません"
 
-#: catalog/objectaddress.c:1839 commands/foreigncmds.c:430 commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441 commands/foreigncmds.c:1004 commands/foreigncmds.c:1367 foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "サーバー\"%s\"は存在しません"
@@ -5509,7 +5545,7 @@ msgstr "\"%s\"は仮説集合集約です。"
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "集約関数の直接引数の数は変更できません"
 
-#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701 commands/typecmds.c:2015 commands/typecmds.c:2061 commands/typecmds.c:2113 commands/typecmds.c:2150 commands/typecmds.c:2184 commands/typecmds.c:2218 commands/typecmds.c:2252 commands/typecmds.c:2281 commands/typecmds.c:2368 commands/typecmds.c:2410 parser/parse_func.c:417 parser/parse_func.c:448 parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611 parser/parse_func.c:631
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701 commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121 commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226 commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376 commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448 parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611 parser/parse_func.c:631
 #: parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
@@ -5605,42 +5641,57 @@ msgstr "照合順序\"%s\"はすでに存在します"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "エンコーディング\"%2$s\"の照合順序\"%1$s\"はすでに存在します"
 
-#: catalog/pg_constraint.c:758 commands/tablecmds.c:7951
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7952
 #, c-format
 msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
 msgstr "リレーション\"%2$s\"の非NULL制約\"%1$s\"のNO INHERIT設定は変更できません"
 
-#: catalog/pg_constraint.c:768
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9584
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "%s を用いて既存の制約を継承可能にする必要があるかもしれません。"
+
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8301
 #, c-format
 msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
 msgstr "リレーション\"%2$s\"上の NOT VALID 制約\"%1$s\"は非互換です"
 
-#: catalog/pg_constraint.c:770
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8303 commands/tablecmds.c:9596
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "%s を用いてこの制約を検証する必要があるかもしれません。"
+
+#: catalog/pg_constraint.c:792
 #, c-format
-msgid "You will need to use ALTER TABLE ... VALIDATE CONSTRAINT to validate it."
-msgstr "ALTER TABLE ... VALIDATE CONSTRAINT を使用してこの制約を検証すべきです。"
+msgid "cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr "テーブル \"%3$s\"の列\"%2$s\"に対して非NULL制約\"%1$s\"を作成することはできません"
 
-#: catalog/pg_constraint.c:1008
+#: catalog/pg_constraint.c:794
+#, c-format
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "その列に対する\"%s\"という名前の非NULL制約はすでに存在します。"
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "ドメイン\"%2$s\"の制約\"%1$s\"はすでに存在します"
 
-#: catalog/pg_constraint.c:1209 catalog/pg_constraint.c:1302
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "テーブル\"%2$s\"の制約\"%1$s\"は存在しません"
 
-#: catalog/pg_constraint.c:1402
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "ドメイン\"%2$s\"に対する制約\"%1$s\"は存在しません"
 
-#: catalog/pg_constraint.c:1656
+#: catalog/pg_constraint.c:1681
 #, c-format
 msgid "invalid type for PERIOD part of foreign key"
 msgstr "外部キーのPERIOD部に対して不正な型"
 
-#: catalog/pg_constraint.c:1657
+#: catalog/pg_constraint.c:1682
 #, c-format
 msgid "Only range and multirange are supported."
 msgstr "範囲型および副範囲型のみがサポートされます。"
@@ -5655,27 +5706,27 @@ msgstr "変換\"%s\"はすでに存在します"
 msgid "default conversion for %s to %s already exists"
 msgstr "%sから%sへのデフォルトの変換はすでに存在します"
 
-#: catalog/pg_depend.c:223 commands/extension.c:3665
+#: catalog/pg_depend.c:225 commands/extension.c:3818
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%sはすでに機能拡張\"%s\"のメンバです"
 
-#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3705
+#: catalog/pg_depend.c:232 catalog/pg_depend.c:283 commands/extension.c:3858
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s は機能拡張\"%s\"のメンバではありません"
 
-#: catalog/pg_depend.c:233
+#: catalog/pg_depend.c:235
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "機能拡張は自身が所有していないオブジェクトを置き換えることができません。"
 
-#: catalog/pg_depend.c:284
+#: catalog/pg_depend.c:286
 #, c-format
 msgid "An extension may only use CREATE ... IF NOT EXISTS to skip object creation if the conflicting object is one that it already owns."
 msgstr "機能拡張はCREATE ... IF NOT EXISTSを自身がすでに所有しているオブジェクトと競合するオブジェクトの生成をスキップするためにのみ使用することができます。"
 
-#: catalog/pg_depend.c:647
+#: catalog/pg_depend.c:649
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "システムオブジェクトであるため、%sの依存関係を削除できません。"
@@ -5725,7 +5776,7 @@ msgstr "パーティション\"%s\"を取り外せません"
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "このパーティションは今現在取り外し中であるか取り外し処理が未完了の状態です。"
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4915 commands/tablecmds.c:17793
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916 commands/tablecmds.c:17891
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "ALTER TABLE ... DETACH PARTITION ... FINALIZE を実行して保留中の取り外し処理を完了させてください。"
@@ -5755,7 +5806,7 @@ msgstr "\"%s\"は有効な演算子名ではありません"
 msgid "operator %s already exists"
 msgstr "演算子%sはすでに存在します"
 
-#: catalog/pg_operator.c:445 commands/operatorcmds.c:600
+#: catalog/pg_operator.c:445 commands/operatorcmds.c:633
 #, c-format
 msgid "operator cannot be its own negator"
 msgstr "演算子は自身の否定子になることはできません"
@@ -6049,12 +6100,12 @@ msgstr "データベースシステムが必要としているため%sが所有
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "データベースシステムが必要としているため%sが所有するオブジェクトの所有者を再割り当てできません"
 
-#: catalog/pg_subscription.c:469
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "サブスクリプション\"%s\"に対するリレーションマッピングを削除できませんでした"
 
-#: catalog/pg_subscription.c:471
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "リレーション\\\"%s\\\"のテーブル同期が進行中で、状態は\\\"%c\\\"です。"
@@ -6062,7 +6113,7 @@ msgstr "リレーション\\\"%s\\\"のテーブル同期が進行中で、状
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:478
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "サブスクリプションが有効にされていない場合は%sを実行して有効化するか、%sを実行してこのサブスクリプションを削除してください。"
@@ -6092,7 +6143,7 @@ msgstr "値渡し型の場合、内部サイズ%dは不正です"
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "可変長型の場合、アラインメント\"%c\"は不正です"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4354
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "固定長型の場合はPLAIN格納方式でなければなりません"
@@ -6107,10 +6158,10 @@ msgstr "\"%s\"の複範囲型の作成中に失敗しました。"
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "\"multirange_type_name\"属性で複範囲型の型名を手動で指定することができます。"
 
-#: catalog/storage.c:549 storage/buffer/bufmgr.c:7269
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "リレーション%2$sのブロック%1$uに不正なページ"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "リレーション\"%2$s\"のブロック%1$uに不正なページ"
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -6202,17 +6253,17 @@ msgstr "パラメータ\"parallel\"はSAVE、RESTRICTEDまたはUNSAFEのいず
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "パラメータ\"%s\"は READ_ONLY、SHAREABLE または READ_WRITE でなくてはなりません"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "イベントトリガ\"%s\"はすでに存在します"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "外部データラッパー\"%s\"はすでに存在します"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "サーバー\"%s\"はすでに存在します"
@@ -6222,7 +6273,7 @@ msgstr "サーバー\"%s\"はすでに存在します"
 msgid "language \"%s\" already exists"
 msgstr "言語\"%s\"はすでに存在します"
 
-#: commands/alter.c:95 commands/publicationcmds.c:865
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "パブリケーション\"%s\"はすでに存在します"
@@ -6267,12 +6318,12 @@ msgstr "テキスト検索設定\"%s\"はすでにスキーマ\"%s\"存在しま
 msgid "must be superuser to rename %s"
 msgstr "%sの名前を変更するにはスーパーユーザーである必要があります"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:608 commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231 commands/subscriptioncmds.c:1989
+#: commands/alter.c:256 commands/subscriptioncmds.c:608 commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231 commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=falseはスーパーユーザーのみ可能です"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:609 commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232 commands/subscriptioncmds.c:1990
+#: commands/alter.c:257 commands/subscriptioncmds.c:609 commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232 commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "password_requiredオプションがfalseに設定されたサブスクリプションはスーパーユーザのみ作成と変更が可能です。"
@@ -6307,7 +6358,7 @@ msgstr "アクセスメソッド\"%s\"は存在しません"
 msgid "handler function is not specified"
 msgstr "ハンドラ関数の指定がありません"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200 commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:705 parser/parse_clause.c:941
+#: commands/amcmds.c:264 commands/event_trigger.c:204 commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706 parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "関数%sは型%sを返さなければなりません"
@@ -6362,27 +6413,27 @@ msgstr "継承ツリー\"%s.%s\"のANALYZEをスキップします --- このツ
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "継承ツリー\"%s.%s\"のANALYZEをスキップします --- このツリーにはアナライズ可能な子テーブルがありません"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "チャネル名が空であることはできません"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "チャネル名が長すぎます"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "ペイロード文字列が長すぎます"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "LISTEN / UNLISTEN / NOTIFY を実行しているトランザクションは PREPARE できません"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "NOTIFY キューで発生した通知イベントが多すぎます"
@@ -6402,10 +6453,10 @@ msgstr "PID %d のサーバープロセスは、この中で最も古いトラ
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "このプロセスが現在のトランザクションを終了するまで NOTYFY キューを空にすることはできません"
 
-#: commands/cluster.c:127
+#: commands/cluster.c:127 commands/dbcommands.c:2356 commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234 commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "認識できないCLUSTERオプション \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "%s のオプション\"%s\"が認識できません"
 
 #: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
@@ -6417,7 +6468,7 @@ msgstr "他のセッションの一時テーブルをクラスタ化できませ
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "テーブル\"%s\"には事前にクラスタ化されたインデックスはありません"
 
-#: commands/cluster.c:190 commands/tablecmds.c:16349 commands/tablecmds.c:18415
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "テーブル\"%2$s\"にはインデックス\"%1$s\"は存在しません"
@@ -6432,7 +6483,7 @@ msgstr "共有カタログをクラスタ化できません"
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルに対してはVACUUMを実行できません"
 
-#: commands/cluster.c:507 commands/tablecmds.c:18425
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\"はテーブル\"%s\"のインデックスではありません"
@@ -6496,8 +6547,8 @@ msgstr "\"%s\"のクラスタ化を行う権限がありません、スキップ
 msgid "collation attribute \"%s\" not recognized"
 msgstr "照合順序の属性\"%s\"が認識できません"
 
-#: commands/collationcmds.c:123 commands/collationcmds.c:129 commands/define.c:375 commands/tablecmds.c:8368 replication/pgoutput/pgoutput.c:320 replication/pgoutput/pgoutput.c:343 replication/pgoutput/pgoutput.c:357 replication/pgoutput/pgoutput.c:367 replication/pgoutput/pgoutput.c:377 replication/pgoutput/pgoutput.c:387 replication/pgoutput/pgoutput.c:399 replication/walsender.c:1123 replication/walsender.c:1145 replication/walsender.c:1155
-#: replication/walsender.c:1164 replication/walsender.c:1406 replication/walsender.c:1415
+#: commands/collationcmds.c:123 commands/collationcmds.c:129 commands/define.c:375 commands/tablecmds.c:8394 replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344 replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372 replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392 replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137 replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420 replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "競合するオプション、あるいは余計なオプションがあります"
@@ -6529,7 +6580,7 @@ msgstr "認識できないの照合順序プロバイダ: %s"
 msgid "parameter \"%s\" must be specified"
 msgstr "パラメータ\"%s\"の指定が必要です"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1148
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "ICUロケール\"%s\"の標準形式\"%s\"を使用します"
@@ -6539,7 +6590,7 @@ msgstr "ICUロケール\"%s\"の標準形式\"%s\"を使用します"
 msgid "nondeterministic collations not supported with this provider"
 msgstr "非決定的照合順序はこのプロバイダではサポートされません"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1101
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "ICUルールはロケールプロバイダがICUでなければ指定できません"
@@ -6566,22 +6617,22 @@ msgstr "デフォルト照合順序のバーションはリフレッシュでき
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445 commands/tablecmds.c:8145 commands/tablecmds.c:8155 commands/tablecmds.c:8157 commands/tablecmds.c:16051 commands/tablecmds.c:19579 commands/tablecmds.c:19600 commands/typecmds.c:3778 commands/typecmds.c:3863 commands/typecmds.c:4217
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445 commands/tablecmds.c:8146 commands/tablecmds.c:8156 commands/tablecmds.c:8158 commands/tablecmds.c:16149 commands/tablecmds.c:19677 commands/tablecmds.c:19698 commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "代わりに%sを使用してください"
 
-#: commands/collationcmds.c:476 commands/dbcommands.c:2580
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "バージョン%sから%sへの変更"
 
-#: commands/collationcmds.c:491 commands/dbcommands.c:2593
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "バージョンが変わっていません"
 
-#: commands/collationcmds.c:524 commands/dbcommands.c:2763 utils/adt/dbsize.c:180
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789 utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "OID %uのデータベースは存在しません"
@@ -6601,7 +6652,7 @@ msgstr "システム照合順序をインポートするにはスーパーユー
 msgid "no usable system locales were found"
 msgstr "使用できるシステムロケールが見つかりません"
 
-#: commands/comment.c:61 commands/dbcommands.c:1679 commands/dbcommands.c:1897 commands/dbcommands.c:2009 commands/dbcommands.c:2207 commands/dbcommands.c:2447 commands/dbcommands.c:2540 commands/dbcommands.c:2664 commands/dbcommands.c:3175 utils/init/postinit.c:1027 utils/init/postinit.c:1091 utils/init/postinit.c:1164
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922 commands/dbcommands.c:2034 commands/dbcommands.c:2232 commands/dbcommands.c:2473 commands/dbcommands.c:2566 commands/dbcommands.c:2690 commands/dbcommands.c:3201 utils/init/postinit.c:1016 utils/init/postinit.c:1080 utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "データベース\"%s\"は存在しません"
@@ -6686,166 +6737,176 @@ msgstr "COPYでファイルへの出力を行う権限がありません"
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "\"%s\"ロールの権限を持つロールのみがCOPYによるファイルへの出力を行うことができます。"
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "生成列は COPY FROM の WHERE 条件ではサポートされていません"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824 commands/tablecmds.c:19906 commands/trigger.c:660 rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "列\"%s\"は生成カラムです。"
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM で行レベルセキュリティはサポートされていません"
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "代わりにINSERTを文使用してください。"
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "COPY TO の HEADERで\"%s\"は使用できません"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "パラメータ\"%s\"はBoolean値または\"match\"のみを取ります"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:818 commands/copy.c:834 commands/copy.c:851 commands/copy.c:877 commands/copy.c:887
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873 commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s は %s と同時には使えません"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:474
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "COPY %s \"%s\"を認識できません"
 
-#: commands/copy.c:436 commands/define.c:73 commands/define.c:84 commands/define.c:178 commands/define.c:196 commands/define.c:211 commands/define.c:229
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84 commands/define.c:178 commands/define.c:196 commands/define.c:211 commands/define.c:229
 #, c-format
 msgid "%s requires a numeric value"
 msgstr "%sは数値が必要です"
 
-#: commands/copy.c:446
+#: commands/copy.c:485
 #, c-format
 msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
 msgstr "REJECT_LIMIT (%<PRId64>)は0より大きくなければなりません"
 
-#: commands/copy.c:536
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "COPY フォーマット\"%s\"を認識できません"
 
-#: commands/copy.c:594 commands/copy.c:609 commands/copy.c:624 commands/copy.c:643
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663 commands/copy.c:682
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "オプション\"%s\"の引数は列名のリストでなければなりません"
 
-#: commands/copy.c:655
+#: commands/copy.c:694
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "オプション\"%s\"の引数は有効なエンコーディング名でなければなりません"
 
-#: commands/copy.c:683 commands/dbcommands.c:880 commands/dbcommands.c:2395
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "タイムゾーン\"%s\"を認識できません"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:696 commands/copy.c:701 commands/copy.c:706 commands/copy.c:776
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745 commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "BINARYモードでは%sを指定できません"
 
-#: commands/copy.c:728
+#: commands/copy.c:767
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "COPYの区切り文字は単一の1バイト文字でなければなりません"
 
-#: commands/copy.c:735
+#: commands/copy.c:774
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPYの区切り文字は改行や復帰記号とすることができません"
 
-#: commands/copy.c:741
+#: commands/copy.c:780
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "COPYのNULL表現には改行や復帰記号を使用することはできません"
 
-#: commands/copy.c:751
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "COPYのデフォルト表現には改行や復帰記号を使用することはできません"
 
-#: commands/copy.c:769
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "COPYの区切り文字を\"%s\"とすることはできません"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:783 commands/copy.c:800 commands/copy.c:812 commands/copy.c:827 commands/copy.c:843
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851 commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "COPY %s はCSVモードを要求します"
 
-#: commands/copy.c:788
+#: commands/copy.c:827
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "COPYの引用符は単一の1バイト文字でなければなりません"
 
-#: commands/copy.c:793
+#: commands/copy.c:832
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "COPYの区切り文字と引用符は異なる文字でなければなりません"
 
-#: commands/copy.c:805
+#: commands/copy.c:844
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "COPYのエスケープは単一の1バイト文字でなければなりません"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:859 commands/copy.c:895
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "COPYの区切り文字は%s指定では使用できません"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:868 commands/copy.c:904
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "COPYの引用符は%s指定では使用できません"
 
-#: commands/copy.c:913
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "NULL指定とDEFAULT指定は同じにはできません"
 
-#: commands/copy.c:919
+#: commands/copy.c:958
 #, c-format
 msgid "only ON_ERROR STOP is allowed in BINARY mode"
 msgstr "BINARYモードではN_ERROR STOPのみ使用可能です"
 
 #. translator: first and second %s are the names of COPY option, e.g.
 #. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
-#: commands/copy.c:926
+#: commands/copy.c:965
 #, c-format
 msgid "COPY %s requires %s to be set to %s"
 msgstr "COPY %s では %s が %s に設定されている必要があります"
 
-#: commands/copy.c:988
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "列\"%s\"は生成カラムです"
 
-#: commands/copy.c:990
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "生成カラムはCOPYでは使えません。"
 
-#: commands/copy.c:1005 commands/indexcmds.c:1959 commands/statscmds.c:239 commands/tablecmds.c:2592 commands/tablecmds.c:3100 commands/tablecmds.c:3929 parser/parse_relation.c:3798 parser/parse_relation.c:3808 parser/parse_relation.c:3826 parser/parse_relation.c:3833 parser/parse_relation.c:3847 utils/adt/tsvector_op.c:2853
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260 commands/tablecmds.c:2593 commands/tablecmds.c:3101 commands/tablecmds.c:3930 parser/parse_relation.c:3798 parser/parse_relation.c:3808 parser/parse_relation.c:3826 parser/parse_relation.c:3833 parser/parse_relation.c:3847 utils/adt/tsvector_op.c:2857
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "列\"%s\"は存在しません"
 
-#: commands/copy.c:1012 commands/tablecmds.c:2618 commands/trigger.c:956 parser/parse_target.c:1086 parser/parse_target.c:1097
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957 parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "列\"%s\"が複数指定されました"
@@ -6938,12 +6999,12 @@ msgstr[0] "%<PRIu64>行がデータ型の不適合によりスキップされま
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:881
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "%s指定された列\"%s\"はCOPYで参照されません"
 
-#: commands/copyfrom.c:1707 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:394
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "符号化方式\"%s\"から\"%s\"用のデフォルト変換関数は存在しません"
@@ -6953,7 +7014,7 @@ msgstr "符号化方式\"%s\"から\"%s\"用のデフォルト変換関数は存
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY FROMによってPostgreSQLサーバープロセスはファイルを読み込みます。psqlの \\copy のようなクライアント側の仕組みが必要かもしれません"
 
-#: commands/copyfrom.c:1895 commands/copyto.c:986
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\"はディレクトリです"
@@ -7003,17 +7064,17 @@ msgstr "COPYファイルのヘッダが不正です(サイズが不正です)"
 msgid "could not read from COPY file: %m"
 msgstr "COPYファイルから読み込めませんでした: %m"
 
-#: commands/copyfromparse.c:278 commands/copyfromparse.c:303 replication/walsender.c:732 replication/walsender.c:758 tcop/postgres.c:369
+#: commands/copyfromparse.c:278 commands/copyfromparse.c:303 replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "トランザクションを実行中のクライアント接続で想定外のEOFがありました"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:748
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "標準入力からのCOPY中に想定外のメッセージタイプ0x%02Xがありました"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:779
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "標準入力からのCOPYが失敗しました: %s"
@@ -7168,7 +7229,7 @@ msgstr "COPY (SELECT ...) TO構文を試してください"
 msgid "cannot copy from unpopulated materialized view \"%s\""
 msgstr "データ未投入の実体化ビュー\"%s\"からのコピーはできません"
 
-#: commands/copyto.c:662 executor/execUtils.c:761
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
 msgid "Use the REFRESH MATERIALIZED VIEW command."
 msgstr "REFRESH MATERIALIZED VIEWコマンドを使用してください。"
@@ -7233,27 +7294,27 @@ msgstr "COPY文中の問い合わせではRETURNING句が必須です"
 msgid "relation referenced by COPY statement has changed"
 msgstr "COPY文で参照されているリレーションが変更されました"
 
-#: commands/copyto.c:951
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "ファイルへのCOPYでは相対パスは指定できません"
 
-#: commands/copyto.c:970
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "ファイル\"%s\"を書き込み用にオープンできませんでした: %m"
 
-#: commands/copyto.c:973
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY TOによってPostgreSQLサーバープロセスはファイルの書き込みを行います。psqlの \\copy のようなクライアント側の仕組みが必要かもしれません"
 
-#: commands/createas.c:212 commands/createas.c:524
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "指定された列別名が多すぎます"
 
-#: commands/createas.c:547
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "このコマンドにはポリシは実装されていません"
@@ -7288,7 +7349,7 @@ msgstr "%sは有効な符号化方式名ではありません"
 msgid "unrecognized locale provider: %s"
 msgstr "認識できない照合順序プロバイダ: %s"
 
-#: commands/dbcommands.c:958 commands/dbcommands.c:2428 commands/user.c:300 commands/user.c:739
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299 commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "不正な接続数制限: %d"
@@ -7308,7 +7369,7 @@ msgstr "テンプレートデータベース\"%s\"は存在しません"
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "無効なデータベース\"%s\"はテンプレートとして使用できません"
 
-#: commands/dbcommands.c:1014 commands/dbcommands.c:2458 utils/init/postinit.c:1106
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484 utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "DROP DATABASEを使用して無効なデータベースを削除してください。"
@@ -7333,296 +7394,296 @@ msgstr "有効な方法は\"wal_log\"と\"file_copy\"です。"
 msgid "invalid server encoding %d"
 msgstr "サーバーの符号化方式%dは不正です"
 
-#: commands/dbcommands.c:1070
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077 commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "LC_COLLATEのロケール名\"%s\"は不正です"
 
-#: commands/dbcommands.c:1071 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "ロケール名がICU特有のものである場合は、ICU_LOCALEを使用してください。"
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "ロケール名がビルトインプロバイダ特有のものである場合は、BUILTIN_LOCALEを使用してください。"
 
-#: commands/dbcommands.c:1076
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
+#, c-format
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "ロケール名がICUプロバイダ特有のものである場合は、ICU_LOCALEを使用してください。"
+
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095 commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "LC_CTYPEのロケール名\"%s\"は不正です"
 
-#: commands/dbcommands.c:1088
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALEはロケールプロバイダがbuiltinでなければ指定できません"
 
-#: commands/dbcommands.c:1096
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICUロケールはロケールプロバイダがICUでなければ指定できません"
 
-#: commands/dbcommands.c:1114
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "LOCALEかBUILTIN_LOCALEのいずれかを指定しなければなりません"
 
-#: commands/dbcommands.c:1123
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "エンコーディング\"%s\"はICUではサポートされていません"
 
-#: commands/dbcommands.c:1133
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "LOCALEかICU_LOCALEのいずれかを指定しなければなりません"
 
-#: commands/dbcommands.c:1177
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "新しい符号化方式(%s)はテンプレートデータベースの符号化方式(%s)と互換性がありません"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースの符号化方式と同じものを使うか、もしくは template0 をテンプレートとして使用してください"
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "新しい照合順序(%s)はテンプレートデータベースの照合順序(%s)と互換性がありません"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースの照合順序と同じものを使うか、もしくは template0 をテンプレートとして使用してください"
 
-#: commands/dbcommands.c:1192
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "新しいLC_CTYPE(%s)はテンプレートデータベース(%s)のLC_CTYPEと互換性がありません"
 
-#: commands/dbcommands.c:1194
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースのLC_CTYPEと同じものを使うか、もしくはtemplate0をテンプレートとして使用してください"
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "新しいロケール・プロバイダ(%s)はテンプレートデータベースのロケール・プロバイダ(%s)と一致しません"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースと同じロケールプロバイダを使うか、もしくは template0 をテンプレートとして使用してください"
 
-#: commands/dbcommands.c:1213
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "新しいICUロケール(%s)はテンプレートデータベースのICUロケール(%s)と互換性がありません"
 
-#: commands/dbcommands.c:1215
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースと同じICUロケールを使うか、もしくは template0 をテンプレートとして使用してください。"
 
-#: commands/dbcommands.c:1226
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "新しいICU照合順序ルール(%s)はテンプレートデータベースのICU照合順序(%s)と互換性がありません"
 
-#: commands/dbcommands.c:1228
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "テンプレートデータベースのICU照合順序ルールと同じものを使うか、もしくは template0 をテンプレートとして使用してください"
 
-#: commands/dbcommands.c:1257
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "テンプレートデータベース\"%s\"には照合順序のバージョンが設定されていますが、実際の照合順序バージョンが特定できません"
 
-#: commands/dbcommands.c:1262
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "テンプレートデータベース\"%s\"では照合順序バージョンの不一致が起きています"
 
-#: commands/dbcommands.c:1264
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "データベース中の照合順序はバージョン%sで作成されていますが、オペレーティングシステムはバージョン%sを提供しています。"
 
-#: commands/dbcommands.c:1267
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "デフォルトの照合順序を使用しているテンプレート・データベースの全てのオブジェクトを再構築して、ALTER DATABASE %s REFRESH COLLATION VERSIONを実行するか、正しいバージョンのライブラリを用いてPostgreSQLをビルドしてください。"
 
-#: commands/dbcommands.c:1312 commands/dbcommands.c:2055
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "デフォルトのテーブル空間としてpg_globalを使用できません"
 
-#: commands/dbcommands.c:1338
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "新しいデフォルトのテーブル空間\"%s\"を割り当てられません"
 
-#: commands/dbcommands.c:1340
+#: commands/dbcommands.c:1365
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr "データベース\"%s\"のいくつかテーブルはすでにこのテーブル空間にあるため、競合しています。"
 
-#: commands/dbcommands.c:1370 commands/dbcommands.c:1926
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "データベース\"%s\"はすでに存在します"
 
-#: commands/dbcommands.c:1384
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "元となるデータベース\"%s\"は他のユーザーによってアクセスされています"
 
-#: commands/dbcommands.c:1406
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "データベースOID %uはすでにデータベース\"%s\"で使用されています"
 
-#: commands/dbcommands.c:1412
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "指定されたOID %uのデータディレクトリはすでに存在します"
 
-#: commands/dbcommands.c:1585 commands/dbcommands.c:1600 utils/adt/pg_locale.c:1515
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625 utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "符号化方式\"%s\"がロケール\"%s\"に合いません"
 
-#: commands/dbcommands.c:1588
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "選択されたLC_CTYPEを設定するには、符号化方式\"%s\"である必要があります。"
 
-#: commands/dbcommands.c:1603
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "選択されたLC_COLLATEを設定するには、符号化方式\"%s\"である必要があります。"
 
-#: commands/dbcommands.c:1686
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "データベース\"%s\"は存在しません、スキップします"
 
-#: commands/dbcommands.c:1710
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "テンプレートデータベースを削除できません"
 
-#: commands/dbcommands.c:1716
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "現在オープンしているデータベースを削除できません"
 
-#: commands/dbcommands.c:1729
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "データベース\"%s\"は有効な論理レプリケーションスロットで使用中です"
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "%d 個のアクティブなスロットがあります。"
 
-#: commands/dbcommands.c:1745
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "データベース\"%s\"は論理レプリケーションのサブスクリプションで使用中です"
 
-#: commands/dbcommands.c:1747
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "%d個のサブスクリプションがあります"
 
-#: commands/dbcommands.c:1768 commands/dbcommands.c:1948 commands/dbcommands.c:2077
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973 commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "データベース\"%s\"は他のユーザーからアクセスされています"
 
-#: commands/dbcommands.c:1908
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "データベースの名前を変更する権限がありません"
 
-#: commands/dbcommands.c:1937
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "現在のデータベースの名前を変更できません"
 
-#: commands/dbcommands.c:2033
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "現在オープン中のデータベースのテーブルスペースは変更できません"
 
-#: commands/dbcommands.c:2139
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "データベース\"%s\"のリレーションの中に、テーブルスペース\"%s\"にすでに存在するものがあります"
 
-#: commands/dbcommands.c:2141
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "このコマンドを使う前に、データベースのデフォルトのテーブルスペースに戻す必要があります。"
 
-#: commands/dbcommands.c:2270 commands/dbcommands.c:3013 commands/dbcommands.c:3313 commands/dbcommands.c:3426
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039 commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "元のデータベースのディレクトリ\"%s\"に不要なファイルが残っているかもしれません"
 
-#: commands/dbcommands.c:2331
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "DROP DATABASEのオプション\"%s\"が認識できません"
-
-#: commands/dbcommands.c:2409
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "オプション\"%s\"は他のオプションと一緒に指定はできません"
 
-#: commands/dbcommands.c:2457
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "無効なデータベース\"%s\"は変更できません"
 
-#: commands/dbcommands.c:2474
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "現在のデータベースへの接続は禁止できません"
 
-#: commands/dbcommands.c:2704
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "データベースの所有者を変更する権限がありません"
 
-#: commands/dbcommands.c:3119
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "他にこのデータベースを使っている %d 個のセッションと %d 個の準備済みトランザクションがあります。"
 
-#: commands/dbcommands.c:3122
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "他にこのデータベースを使っている %d 個のセッションがあります。"
 
-#: commands/dbcommands.c:3127 storage/ipc/procarray.c:3860
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "このデータベースを使用する準備されたトランザクションが%d存在します。"
 
-#: commands/dbcommands.c:3269
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "ディレクトリ\"%s\"がありません"
 
-#: commands/dbcommands.c:3327 commands/tablespace.c:184 commands/tablespace.c:633
+#: commands/dbcommands.c:3353 commands/tablespace.c:184 commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"のstatができませんでした: %m"
@@ -7667,12 +7728,12 @@ msgstr "\"%s\"は集約関数です"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "集約関数を削除するにはDROP AGGREGATEを使用してください"
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4013 commands/tablecmds.c:4174 commands/tablecmds.c:4226 commands/tablecmds.c:18856 tcop/utility.c:1328
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014 commands/tablecmds.c:4175 commands/tablecmds.c:4227 commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "リレーション\"%s\"は存在しません、スキップします"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1468
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "スキーマ\"%s\"は存在しません、スキップします"
@@ -7697,7 +7758,7 @@ msgstr "照合順序\"%s\"は存在しません、スキップします"
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "変換\"%sは存在しません、スキップします"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:682
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "統計情報オブジェクト\"%s\"は存在しません、スキップします"
@@ -7792,7 +7853,7 @@ msgstr "リレーション\"%2$s\"のルール\"%1$s\"は存在しません、
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "外部データラッパ\"%s\"は存在しません、スキップします"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "外部データラッパ\"%s\"は存在しません、スキップします"
@@ -7812,91 +7873,86 @@ msgstr "アクセスメソッド\"%2$s\"に対する演算子族\"%1$s\"は存
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "パブリケーション\"%s\"は存在しません、スキップします"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "イベントトリガ \"%s\"を作成する権限がありません"
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "イベントトリガを作成するにはスーパーユーザーである必要があります。"
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "識別できないイベント名\"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "識別できないフィルタ変数\"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "タグフィルタリングはログインイベントトリガーではサポートされていません"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "フィルタの値\"%s\"はフィルタ変数\"%s\"では認識されません"
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "%sではイベントトリガはサポートされません"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "フィルタ変数\"%s\"が複数指定されました"
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490 commands/event_trigger.c:584
+#: commands/event_trigger.c:442 commands/event_trigger.c:494 commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "イベントトリガ\"%s\"は存在しません"
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "OID %uのイベントトリガは存在しません"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "イベントトリガ\"%s\"の所有者を変更する権限がありません"
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "イベントトリガの所有者はスーパーユーザーでなければなりません"
 
-#: commands/event_trigger.c:1404
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%sはsql_dropイベントトリガ関数内でのみ呼び出すことができます"
 
-#: commands/event_trigger.c:1497 commands/event_trigger.c:1518
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%sはtable_rewriteイベントトリガ関数でのみ呼び出すことができます"
 
-#: commands/event_trigger.c:1931
+#: commands/event_trigger.c:2063
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%sはイベントトリガ関数でのみ呼び出すことができます"
 
-#: commands/explain_state.c:133 commands/explain_state.c:158
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "EXPLAIN オプション\"%s\"が認識できない値です: \"%s\""
-
-#: commands/explain_state.c:165
+#: commands/explain_state.c:133 commands/explain_state.c:158 replication/walsender.c:1151
 #, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "EXPLAIN オプション\"%s\"が認識できません"
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "%s のオプション\"%s\"に対する認識できない値: \"%s\""
 
 #: commands/explain_state.c:174 commands/explain_state.c:186 commands/explain_state.c:192
 #, c-format
@@ -7905,405 +7961,410 @@ msgstr "EXPLAINのオプション %s には ANALYZE 指定が必要です"
 
 #: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "EXPLAINのオプションANALYZEとGENERIC_PLANは同時に使用できません"
+msgid "%s options %s and %s cannot be used together"
+msgstr "%s のオプション %s と %s は同時には使用できません"
 
-#: commands/extension.c:174 commands/extension.c:3299
+#: commands/extension.c:198 commands/extension.c:3452
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "機能拡張\"%s\"は存在しません"
 
-#: commands/extension.c:239 commands/extension.c:248 commands/extension.c:260 commands/extension.c:270
+#: commands/extension.c:371 commands/extension.c:380 commands/extension.c:392 commands/extension.c:402
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "機能拡張名が不正です: \"%s\""
 
-#: commands/extension.c:240
+#: commands/extension.c:372
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "機能拡張名が無効です: 空であってはなりません"
 
-#: commands/extension.c:249
+#: commands/extension.c:381
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "機能拡張名に\"--\"が含まれていてはなりません"
 
-#: commands/extension.c:261
+#: commands/extension.c:393
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "機能拡張名が\"-\"で始まったり終わったりしてはなりません"
 
-#: commands/extension.c:271
+#: commands/extension.c:403
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "機能拡張名にディレクトリの区切り文字が含まれていてはなりません"
 
-#: commands/extension.c:286 commands/extension.c:295 commands/extension.c:304 commands/extension.c:314
+#: commands/extension.c:418 commands/extension.c:427 commands/extension.c:436 commands/extension.c:446
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "機能拡張のバージョン名が不正す: \"%s\""
 
-#: commands/extension.c:287
+#: commands/extension.c:419
 #, c-format
 msgid "Version names must not be empty."
 msgstr "バージョン名が無効です: 空であってはなりません"
 
-#: commands/extension.c:296
+#: commands/extension.c:428
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "バージョン名に\"--\"が含まれていてはなりません"
 
-#: commands/extension.c:305
+#: commands/extension.c:437
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "バージョン名が\"-\"で始まったり終わったりしてはなりません"
 
-#: commands/extension.c:315
+#: commands/extension.c:447
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "バージョン名にディレクトリの区切り文字が含まれていてはなりません"
 
-#: commands/extension.c:549
+#: commands/extension.c:672
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "機能拡張\"%s\" は利用できません"
 
-#: commands/extension.c:550
+#: commands/extension.c:673
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "PostgreSQLが稼働しているシステムで、事前に機能拡張がインストールされている必要があります。"
 
-#: commands/extension.c:564
+#: commands/extension.c:695
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "機能拡張の制御ファイル\"%s\"をオープンできませんでした: %m"
 
-#: commands/extension.c:587 commands/extension.c:597
+#: commands/extension.c:718 commands/extension.c:728
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "セカンダリの機能拡張制御ファイルにパラメータ\"%s\"を設定できません"
 
-#: commands/extension.c:619 commands/extension.c:627 commands/extension.c:635 utils/misc/guc.c:3144
+#: commands/extension.c:750 commands/extension.c:758 commands/extension.c:766 utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "パラメータ\"%s\"にはbooleanを指定します"
 
-#: commands/extension.c:644
+#: commands/extension.c:775
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\"は有効な符号化方式名ではありません"
 
-#: commands/extension.c:658 commands/extension.c:673
+#: commands/extension.c:789 commands/extension.c:804
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "パラメータ\"%s\"は機能拡張名のリストでなければなりません"
 
-#: commands/extension.c:680
+#: commands/extension.c:811
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "ファイル\"%2$s\"中に認識できないパラメータ\"%1$s\"があります"
 
-#: commands/extension.c:689
+#: commands/extension.c:820
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "\"relocatable\"が真の場合はパラメータ\"schema\"は指定できません"
 
-#: commands/extension.c:865
+#: commands/extension.c:996
 #, c-format
 msgid "SQL statement \"%.*s\""
 msgstr "SQL文 \"%.*s\""
 
-#: commands/extension.c:894
+#: commands/extension.c:1025
 #, c-format
 msgid "extension script file \"%s\", near line %d"
 msgstr "機能拡張スクリプトファイル \"%s\"、%d 行目付近"
 
-#: commands/extension.c:898
+#: commands/extension.c:1029
 #, c-format
 msgid "extension script file \"%s\""
 msgstr "機能拡張スクリプトファイル \"%s\""
 
-#: commands/extension.c:1012
+#: commands/extension.c:1141
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "トランザクション制御ステートメントを機能拡張スクリプトの中に書くことはできません"
 
-#: commands/extension.c:1094
+#: commands/extension.c:1223
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "機能拡張\"%s\"を作成する権限がありません"
 
-#: commands/extension.c:1097
+#: commands/extension.c:1226
 #, c-format
 msgid "Must have CREATE privilege on current database to create this extension."
 msgstr "この機能拡張を生成するには現在のデータベースのCREATE権限が必要です。"
 
-#: commands/extension.c:1098
+#: commands/extension.c:1227
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "この機能拡張を生成するにはスーパーユーザーである必要があります。"
 
-#: commands/extension.c:1102
+#: commands/extension.c:1231
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "機能拡張\"%s\"を更新する権限がありません"
 
-#: commands/extension.c:1105
+#: commands/extension.c:1234
 #, c-format
 msgid "Must have CREATE privilege on current database to update this extension."
 msgstr "この機能拡張を更新するには現在のデータベースのCREATE権限が必要です。"
 
-#: commands/extension.c:1106
+#: commands/extension.c:1235
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "この機能拡張を更新するにはスーパーユーザーである必要があります。"
 
-#: commands/extension.c:1239
+#: commands/extension.c:1368
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "機能拡張の所有者名に不正な文字: \"%s\"のいずれの文字も含むことはできません"
 
-#: commands/extension.c:1263 commands/extension.c:1290
+#: commands/extension.c:1392 commands/extension.c:1419
 #, c-format
 msgid "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr "機能拡張\"%s\"のスキーマ名に不正な文字: \"%s\"のいずれの文字も含むことはできません"
 
-#: commands/extension.c:1485
+#: commands/extension.c:1614
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "機能拡張\"%s\"について、バージョン\"%s\"からバージョン\"%s\"へのアップデートパスがありません"
 
-#: commands/extension.c:1693 commands/extension.c:3357
+#: commands/extension.c:1822 commands/extension.c:3510
 #, c-format
 msgid "version to install must be specified"
 msgstr "インストールするバージョンを指定してください"
 
-#: commands/extension.c:1730
+#: commands/extension.c:1859
 #, c-format
 msgid "extension \"%s\" has no installation script nor update path for version \"%s\""
 msgstr "機能拡張\"%s\"にはバージョン\"%s\"のインストールスクリプトもアップデートパスもありません"
 
-#: commands/extension.c:1764
+#: commands/extension.c:1893
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "機能拡張\"%s\"はスキーマ\"%s\"内にインストールされていなければなりません"
 
-#: commands/extension.c:1924
+#: commands/extension.c:2053
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "機能拡張\"%s\"と\"%s\"の間に循環依存関係が検出されました"
 
-#: commands/extension.c:1929
+#: commands/extension.c:2058
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "必要な機能拡張をインストールします:\"%s\""
 
-#: commands/extension.c:1952
+#: commands/extension.c:2081
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "要求された機能拡張\"%s\"はインストールされていません"
 
-#: commands/extension.c:1955
+#: commands/extension.c:2084
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr "必要な機能拡張を一緒にインストールするには CREATE EXTENSION ... CASCADE を使ってください。"
 
-#: commands/extension.c:1990
+#: commands/extension.c:2119
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "機能拡張\"%s\"はすでに存在します、スキップします"
 
-#: commands/extension.c:1997
+#: commands/extension.c:2126
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "機能拡張\"%s\"はすでに存在します"
 
-#: commands/extension.c:2008
+#: commands/extension.c:2137
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "入れ子の CREATE EXTENSION はサポートされません"
 
-#: commands/extension.c:2172
+#: commands/extension.c:2301
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "変更されているため拡張\"%s\"を削除できません"
 
-#: commands/extension.c:2665
+#: commands/extension.c:2818
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s はCREATE EXTENSIONにより実行されるSQLスクリプトからのみ呼び出すことができます"
 
-#: commands/extension.c:2677
+#: commands/extension.c:2830
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u がテーブルを参照していません"
 
-#: commands/extension.c:2682
+#: commands/extension.c:2835
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "テーブル\"%s\"は生成されようとしている機能拡張のメンバではありません"
 
-#: commands/extension.c:3081
+#: commands/extension.c:3234
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "機能拡張がそのスキーマを含んでいるため、機能拡張\"%s\"をスキーマ\"%s\"に移動できません"
 
-#: commands/extension.c:3122 commands/extension.c:3216
+#: commands/extension.c:3275 commands/extension.c:3369
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "機能拡張\"%s\"は SET SCHEMA をサポートしていません"
 
-#: commands/extension.c:3179
+#: commands/extension.c:3332
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "他の機能拡張によって禁止されているため、機能拡張\"%s\"の SET SCHEMAが実行できません"
 
-#: commands/extension.c:3181
+#: commands/extension.c:3334
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "機能拡張\"%s\"は機能拡張\"%s\"の再配置禁止を要求しています。"
 
-#: commands/extension.c:3218
+#: commands/extension.c:3371
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "機能拡張のスキーマ\"%2$s\"に%1$sが見つかりません"
 
-#: commands/extension.c:3279
+#: commands/extension.c:3432
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "入れ子になった ALTER EXTENSION はサポートされていません"
 
-#: commands/extension.c:3368
+#: commands/extension.c:3521
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "機能拡張 \"%2$s\"のバージョン\"%1$s\"はすでにインストールされています"
 
-#: commands/extension.c:3579
+#: commands/extension.c:3732
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "この型のオブジェクトは機能拡張に追加できません"
 
-#: commands/extension.c:3677
+#: commands/extension.c:3830
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "スキーマ\"%s\"を拡張\"%s\"に追加できません。そのスキーマにその拡張が含まれているためです"
 
-#: commands/extension.c:3759 commands/typecmds.c:4033 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3912 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "データ型%sの複範囲型がありませんでした"
 
-#: commands/extension.c:3801
+#: commands/extension.c:3954
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "ファイル\"%s\"は大きすぎます"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:4047 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "パラメータ\"%s\"に絶対パスではない要素が含まれています"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "オプション\"%s\"が見つかりません"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "オプション\"%s\"が2回以上指定されました"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "外部データラッパー\"%s\"の所有者を変更する権限がありません"
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "外部データラッパーの所有者を変更するにはスーパーユーザーである必要があります。"
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "外部データラッパーの所有者はスーパーユーザーでなければなりません"
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "外部データラッパー\"%s\"は存在しません"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "OID %uの外部データラッパーは存在しません"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "OID %uの外部サーバーは存在しません"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "外部データラッパー\"%s\"を作成する権限がありません"
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "外部データラッパを作成するにはスーパーユーザーである必要があります。"
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "外部データラッパー\"%s\"を変更する権限がありません"
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "外部データラッパーを更新するにはスーパーユーザーである必要があります。"
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "外部データラッパーのハンドラーを変更すると、既存の外部テーブルの振る舞いが変わることがあります"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr "外部データラッパーのバリデータ（検証用関数）を変更すると、それに依存するオプションが不正になる場合があります"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "サーバー\"%s\"はすでに存在します、スキップします"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "\"%s\"のユーザーマッピングはサーバー\"%s\"に対してすでに存在します、スキップします"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "\"%s\"のユーザーマッピングはサーバー\"%s\"に対してすでに存在します"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "\"%s\"のユーザーマッピングはサーバー\"%s\"に対しては存在しません"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "\"%s\"のユーザーマッピングはサーバー\"%s\"に対しては存在しません、スキップします"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "外部データラッパー\"%s\"にはハンドラがありません"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "外部データラッパー\"%s\"は IMPORT FOREIGN SCHEMA をサポートしていません"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "外部テーブル\"%s\"をインポートします"
@@ -8699,12 +8760,12 @@ msgstr "パーティション親テーブル\"%s\"には CREATE INDEX CONCURRENT
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルに対するインデックスを作成できません"
 
-#: commands/indexcmds.c:786 commands/tablecmds.c:891 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "パーティション親リレーションにはデフォルトテーブル空間は指定できません"
 
-#: commands/indexcmds.c:818 commands/tablecmds.c:922 commands/tablecmds.c:3709
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "共有リレーションのみをpg_globalテーブル空間に格納することができます"
@@ -8749,7 +8810,7 @@ msgstr "パーティションキー定義では %s 制約はサポートして
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "%s 制約はパーティションキーが式を含む場合は使用できません"
 
-#: commands/indexcmds.c:1056 commands/indexcmds.c:2469 commands/indexcmds.c:2488 executor/execReplication.c:329 parser/parse_cte.c:303 parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553 utils/adt/arrayfuncs.c:3864 utils/adt/arrayfuncs.c:4419 utils/adt/arrayfuncs.c:6440 utils/adt/rowtypes.c:1220
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469 commands/indexcmds.c:2488 executor/execReplication.c:329 parser/parse_cte.c:303 parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553 utils/adt/arrayfuncs.c:3870 utils/adt/arrayfuncs.c:4425 utils/adt/arrayfuncs.c:6446 utils/adt/rowtypes.c:1220
 #, c-format
 msgid "could not identify an equality operator for type %s"
 msgstr "型%sの等価演算子を特定できませんでした"
@@ -8809,12 +8870,12 @@ msgstr "テーブル\"%s\"は外部テーブルを子テーブルとして含ん
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "インデックスの述部の関数はIMMUTABLEマークが必要です"
 
-#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2714 parser/parse_utilcmd.c:2897
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735 parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "キーとして指名された列\"%s\"は存在しません"
 
-#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1967
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "包含列では式はサポートされません"
@@ -8849,7 +8910,7 @@ msgstr "包含列は NULLS FIRST/LAST オプションをサポートしません
 msgid "could not determine which collation to use for index expression"
 msgstr "インデックス式で使用する照合順序を特定できませんでした"
 
-#: commands/indexcmds.c:2097 commands/tablecmds.c:19886 commands/typecmds.c:812 parser/parse_expr.c:2801 parser/parse_type.c:568 parser/parse_utilcmd.c:4043 utils/adt/misc.c:630
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812 parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4064 utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "%s 型では照合順序はサポートされません"
@@ -8884,7 +8945,7 @@ msgstr "アクセスメソッド\"%s\"はASC/DESCオプションをサポート
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "アクセスメソッド\"%s\"はNULLS FIRST/LASTオプションをサポートしません"
 
-#: commands/indexcmds.c:2277 commands/tablecmds.c:19911 commands/tablecmds.c:19917 commands/typecmds.c:2341
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019 commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "アクセスメソッド\"%2$s\"にはデータ型%1$s用のデフォルトの演算子クラスがありません"
@@ -8899,7 +8960,7 @@ msgstr "このインデックスの演算子クラスを指定するか、ある
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "アクセスメソッド\"%2$s\"用の演算子クラス\"%1$s\"は存在しません"
 
-#: commands/indexcmds.c:2330 commands/typecmds.c:2329
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "演算子クラス\"%s\"はデータ型%sを受け付けません"
@@ -8919,92 +8980,87 @@ msgstr "型%sの重複検出演算子を特定できませんでした"
 msgid "could not identify a contained-by operator for type %s"
 msgstr "型%sの被包含演算子を特定できませんでした"
 
-#: commands/indexcmds.c:2472 commands/tablecmds.c:10302
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
 #, c-format
-msgid "Could not translate compare type %d for operator family \"%s\", input type %s, access method \"%s\"."
-msgstr "演算子ファミリー\"%2$s\"、入力型 %3$s、アクセスメソッド\"%4$s\"に対応する比較方式%1$dを変換できませんでした。"
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "アクセスメソッド\"%3$s\"の演算子ファミリー\"%2$s\"の比較方式%1$dを変換できませんでした。"
 
-#: commands/indexcmds.c:2812
-#, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "認識できないREINDEXのオプション \"%s\""
-
-#: commands/indexcmds.c:3044
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "テーブル\"%s\"には並行インデックス再作成が可能なインデックスがありません"
 
-#: commands/indexcmds.c:3058
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "テーブル\"%s\"には再構築すべきインデックスはありません"
 
-#: commands/indexcmds.c:3105 commands/indexcmds.c:3616 commands/indexcmds.c:3746
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650 commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "システムカタログではインデックスの並行再構築はできません"
 
-#: commands/indexcmds.c:3129
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "現在オープンしているデータベースのみをインデックス再構築することができます"
 
-#: commands/indexcmds.c:3221
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "システムカタログではインデックスの並行再構築はできません、全てスキップします"
 
-#: commands/indexcmds.c:3254
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "システムリレーションは移動できません、すべてスキップします"
 
-#: commands/indexcmds.c:3300
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "パーティションテーブル\"%s.%s\"のインデックス再構築中"
 
-#: commands/indexcmds.c:3303
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "パーティションインデックス\"%s.%s\"のインデックス再構築中"
 
-#: commands/indexcmds.c:3496 commands/indexcmds.c:4388
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "テーブル\"%s.%s\"のインデックス再構築が完了しました"
 
-#: commands/indexcmds.c:3648 commands/indexcmds.c:3701
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "無効なインデックス\"%s.%s\"の再構築をスキップします"
 
-#: commands/indexcmds.c:3651 commands/indexcmds.c:3704
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "DROP INDEXあるいはREINDEX INDEXを使用してください。"
 
-#: commands/indexcmds.c:3655
+#: commands/indexcmds.c:3689
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "排他制約インデックス\"%s.%s\"を並行再構築することはできません、スキップします "
 
-#: commands/indexcmds.c:3811
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "このタイプのリレーションでインデックス並列再構築はできません"
 
-#: commands/indexcmds.c:3829
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "テーブルスペース\"%s\"への非共有リレーションの移動はできません"
 
-#: commands/indexcmds.c:4369 commands/indexcmds.c:4381
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr " インデックス\"%s.%s\"の再構築が完了しました "
 
-#: commands/indexcmds.c:4371 commands/indexcmds.c:4390
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s。"
@@ -9019,7 +9075,7 @@ msgstr "リレーション\"%s\"はロックできません"
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "実体化ビューにデータが投入されていない場合はCONCURRENTLYを使用することはできません"
 
-#: commands/matview.c:214 gram.y:19148
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "%sオプションと%sオプションとを同時に使用することはできません"
@@ -9034,20 +9090,20 @@ msgstr "実体化ビュー\"%s\"を平行的に最新化することはできま
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr "実体化ビュー上の1つ以上の列に対してWHERE句を持たないユニークインデックスを作成してください。"
 
-#: commands/matview.c:683
+#: commands/matview.c:682
 #, c-format
 msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
 msgstr "実体化ビュー\"%s\"に対する新しいデータにはNULL列を持たない重複行があります"
 
-#: commands/matview.c:685
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "行: %s"
 
-#: commands/matview.c:839
+#: commands/matview.c:838
 #, c-format
-msgid "could not find suitable unique index on materialized view"
-msgstr "実体化ビューに適切なユニークインデックスがありませんでした"
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "実体化ビュー\"%s\"に適切なユニークインデックスがありませんでした"
 
 #: commands/opclasscmds.c:124
 #, c-format
@@ -9289,7 +9345,7 @@ msgstr "アクセスメソッド\"%2$s\"用の演算子族\"%1$s\"はスキー
 msgid "SETOF type not allowed for operator argument"
 msgstr "演算子の引数にはSETOF型を使用できません"
 
-#: commands/operatorcmds.c:154 commands/operatorcmds.c:554
+#: commands/operatorcmds.c:154 commands/operatorcmds.c:587
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "演算子の属性\"%s\"は不明です"
@@ -9314,42 +9370,52 @@ msgstr "演算子の引数型を指定する必要があります"
 msgid "Postfix operators are not supported."
 msgstr "後置演算子はサポートされていません。"
 
-#: commands/operatorcmds.c:292
+#: commands/operatorcmds.c:291
 #, c-format
 msgid "restriction estimator function %s must return type %s"
 msgstr "制約推定関数 %s は %s型を返す必要があります"
 
-#: commands/operatorcmds.c:335
+#: commands/operatorcmds.c:309
+#, c-format
+msgid "must be superuser to specify a non-built-in restriction estimator function"
+msgstr "組み込みではない制約推定関数を指定するにはスーパーユーザーである必要があります"
+
+#: commands/operatorcmds.c:355
 #, c-format
 msgid "join estimator function %s has multiple matches"
 msgstr "JOIN推定関数 %s が複数合致しました"
 
-#: commands/operatorcmds.c:350
+#: commands/operatorcmds.c:370
 #, c-format
 msgid "join estimator function %s must return type %s"
 msgstr "JOIN推定関数 %s は %s型を返す必要があります"
 
-#: commands/operatorcmds.c:388 parser/parse_oper.c:119 parser/parse_oper.c:637 utils/adt/regproc.c:509 utils/adt/regproc.c:683
+#: commands/operatorcmds.c:379
+#, c-format
+msgid "must be superuser to specify a non-built-in join estimator function"
+msgstr "組み込みではない結合推定関数を指定するにはスーパーユーザーである必要があります"
+
+#: commands/operatorcmds.c:421 parser/parse_oper.c:119 parser/parse_oper.c:637 utils/adt/regproc.c:509 utils/adt/regproc.c:683
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "演算子が存在しません: %s"
 
-#: commands/operatorcmds.c:396 parser/parse_oper.c:702 parser/parse_oper.c:815
+#: commands/operatorcmds.c:429 parser/parse_oper.c:702 parser/parse_oper.c:815
 #, c-format
 msgid "operator is only a shell: %s"
 msgstr "演算子は単なるシェルです: %s"
 
-#: commands/operatorcmds.c:548
+#: commands/operatorcmds.c:581
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed"
 msgstr "演算子の属性\"%s\"は変更できません"
 
-#: commands/operatorcmds.c:615 commands/operatorcmds.c:622 commands/operatorcmds.c:628 commands/operatorcmds.c:634
+#: commands/operatorcmds.c:648 commands/operatorcmds.c:655 commands/operatorcmds.c:661 commands/operatorcmds.c:667
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "演算子の属性\"%s\"は、すでに設定されている場合には変更できません"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146 commands/tablecmds.c:1799 commands/tablecmds.c:2399 commands/tablecmds.c:3823 commands/tablecmds.c:6792 commands/tablecmds.c:10058 commands/tablecmds.c:19467 commands/tablecmds.c:19502 commands/trigger.c:318 commands/trigger.c:1337 commands/trigger.c:1447 rewrite/rewriteDefine.c:268 rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152 commands/tablecmds.c:1800 commands/tablecmds.c:2400 commands/tablecmds.c:3824 commands/tablecmds.c:6793 commands/tablecmds.c:10114 commands/tablecmds.c:19565 commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338 commands/trigger.c:1448 rewrite/rewriteDefine.c:268 rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "権限がありません: \"%s\"はシステムカタログです"
@@ -9389,7 +9455,7 @@ msgstr "テーブル\"%2$s\"に対するポリシ\"%1$s\"は存在しません"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "SELECT、DELETEにはUSING式のみが指定可能です"
 
-#: commands/portalcmds.c:63 commands/portalcmds.c:192 commands/portalcmds.c:243
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "カーソル名が不正です: 空ではいけません"
@@ -9399,7 +9465,7 @@ msgstr "カーソル名が不正です: 空ではいけません"
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "セキュリティー制限操作中は、WITH HOLD指定のカーソルを作成できません"
 
-#: commands/portalcmds.c:200 commands/portalcmds.c:253 executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252 executor/execCurrent.c:70 utils/adt/xml.c:2937 utils/adt/xml.c:3107
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "カーソル\"%s\"は存在しません"
@@ -9409,32 +9475,32 @@ msgstr "カーソル\"%s\"は存在しません"
 msgid "invalid statement name: must not be empty"
 msgstr "不正な文の名前: 空ではいけません"
 
-#: commands/prepare.c:231 commands/prepare.c:236
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "準備された文はSELECTではありません"
 
-#: commands/prepare.c:296
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "準備された文\"%s\"のパラメータ数が間違っています"
 
-#: commands/prepare.c:298
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "%dパラメータを想定しましたが、%dパラメータでした"
 
-#: commands/prepare.c:331
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "パラメータ$%dの型%sを想定している型%sに強制することができません"
 
-#: commands/prepare.c:415
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "準備された文\"%s\"はすでに存在します"
 
-#: commands/prepare.c:454
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "準備された文\"%s\"は存在しません"
@@ -9444,204 +9510,209 @@ msgstr "準備された文\"%s\"は存在しません"
 msgid "must be superuser to create custom procedural language"
 msgstr "手続き言語を生成するためにはスーパーユーザーである必要があります"
 
-#: commands/publicationcmds.c:130 libpq/auth-oauth.c:850 postmaster/postmaster.c:1130 postmaster/postmaster.c:1232 utils/init/miscinit.c:1870
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850 postmaster/postmaster.c:1130 postmaster/postmaster.c:1232 utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "パラメータ\"%s\"のリスト構文が不正です"
 
-#: commands/publicationcmds.c:149
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "パブリケーションオプション\"%s\"に対する認識できない値: \"%s\""
 
-#: commands/publicationcmds.c:170
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "識別できないパブリケーションのパラメータ: \"%s\""
 
-#: commands/publicationcmds.c:211
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "SURRENT_SCHEMAでスキーマの選択ができませんでした"
 
-#: commands/publicationcmds.c:592
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "システム列は使用できません。"
 
-#: commands/publicationcmds.c:599 commands/publicationcmds.c:604 commands/publicationcmds.c:621
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609 commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "ユーザー定義演算子は使用できません。"
 
-#: commands/publicationcmds.c:645
+#: commands/publicationcmds.c:650
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "列、定数、組み込み演算子、組み込みデータ型、組み込み照合順序、そして不変組み込み関数のみ使用可能です。"
 
-#: commands/publicationcmds.c:657
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "ユーザー定義型は使用できません。"
 
-#: commands/publicationcmds.c:660
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "ユーザー定義または組み込みの不変関数は使用できません。"
 
-#: commands/publicationcmds.c:663
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
 msgstr "ユーザー定義照合順序は使用できません。"
 
-#: commands/publicationcmds.c:673
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "パブリケーションのWHERE式が不正です"
 
-#: commands/publicationcmds.c:726
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "リレーション\"%s\"に対してはパブリケーションのWHERE句は使用できません"
 
-#: commands/publicationcmds.c:728
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "%sが偽のときはWHERE句をパーティション親テーブルに対して使用することはできません。"
 
-#: commands/publicationcmds.c:801 commands/publicationcmds.c:815
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "パブリケーション\"%3$s\"のリレーション\"%1$s.%2$s\"に対して列リストを使用することはできません"
 
-#: commands/publicationcmds.c:804
+#: commands/publicationcmds.c:809
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "FOR TABLES IN SCHEMA要素を含むパブリケーションで列リストは指定できません。"
 
-#: commands/publicationcmds.c:818
+#: commands/publicationcmds.c:823
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "%sが偽のときはパーティション親テーブルに対して列リストを使用できません。"
 
-#: commands/publicationcmds.c:855
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "FOR ALL TABLE 指定のパブリケーションを生成するためにはスーパーユーザーである必要があります"
 
-#: commands/publicationcmds.c:930
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "FOR TABLES IN SCHEMA設定のパブリケーションを作成するにはスーパーユーザーである必要があります"
 
-#: commands/publicationcmds.c:966
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "\"wal_level\"が論理更新情報のパブリッシュには不十分です"
 
-#: commands/publicationcmds.c:967
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "サブスクリプションを作成する前に\"wal_level\"を\"logical\"に設定にしてください。"
 
-#: commands/publicationcmds.c:1067 commands/publicationcmds.c:1075
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "パブリケーション\"%2$s\"に対してパラメーター\"%1$s\"を偽に設定することはできません"
 
-#: commands/publicationcmds.c:1070
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "このパブリケーションはパーティション親テーブル\"%s\"に対するWHERE句を含んでいますが、これは\"%s\" が偽の場合は許可されません。"
 
-#: commands/publicationcmds.c:1078
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "このパブリケーションはパーティション親テーブルに\"%s\"対する列リストを含んでいますが、これは\"%s\" が偽の場合は許可されません。"
 
-#: commands/publicationcmds.c:1399
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "パブリケーション\"%s\"にはスキーマは追加できません"
 
-#: commands/publicationcmds.c:1401
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "カラムリストが指定されているテーブルがパブリケーションに含まれている場合はスキーマの追加ができません。"
 
-#: commands/publicationcmds.c:1449
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "スキーマを追加または設定するにはスーパーユーザーである必要があります"
 
-#: commands/publicationcmds.c:1458 commands/publicationcmds.c:1466
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "パブリケーション\"%s\"は　FOR ALL TABLES と定義されています"
 
-#: commands/publicationcmds.c:1460
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "FOR ALL TABLES指定のパブリケーションではスキーマの追加や削除はできません。"
 
-#: commands/publicationcmds.c:1468
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "FOR ALL TABLES指定のパブリケーションではテーブルの追加や削除はできません。"
 
-#: commands/publicationcmds.c:1492 commands/publicationcmds.c:1531 commands/publicationcmds.c:2068 utils/cache/lsyscache.c:3774
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536 commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "パブリケーション\"%s\"は存在しません"
 
-#: commands/publicationcmds.c:1694 commands/publicationcmds.c:1757
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "テーブル\"%s\"でWHERE句が衝突しているか重複しています"
 
-#: commands/publicationcmds.c:1701 commands/publicationcmds.c:1769
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "テーブル\"%s\"で列リストが衝突しているか重複しています"
 
-#: commands/publicationcmds.c:1903
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "ALTER PUBLICATION ... DROPでは、列リストは指定できません"
 
-#: commands/publicationcmds.c:1915
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "リレーション\"%s\"はパブリケーションの一部ではありません"
 
-#: commands/publicationcmds.c:1922
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "テーブルをパブリケーションから削除する際にはWHERE句を指定できません"
 
-#: commands/publicationcmds.c:1982
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "スキーマ\"%s\"のテーブルはこのパブリケーションに含まれてません"
 
-#: commands/publicationcmds.c:2025 commands/publicationcmds.c:2032
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "パブリケーション\"%s\"の所有者を変更する権限がありません"
 
-#: commands/publicationcmds.c:2027
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "FOR ALL TABLES設定のパブリケーションの所有者はスーパーユーザーである必要があります"
 
-#: commands/publicationcmds.c:2034
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "FOR TABLES IN SCHEMA設定のパブリケーションの所有者はスーパーユーザーでなければなりません。"
 
-#: commands/publicationcmds.c:2100
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "OID %uのパブリケーションは存在しません"
 
-#: commands/publicationcmds.c:2133
+#: commands/publicationcmds.c:2138
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "パブリケーションパラメータ\"%s\"の値が不正です: \"%s\""
+
+#: commands/publicationcmds.c:2139
 #, c-format
-msgid "%s requires a \"none\" or \"stored\" value"
-msgstr "%sの値は\"none\"または\"stored\"である必要があります"
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "有効な値は\"%s\"と\"%s\"です。"
 
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
@@ -9799,12 +9870,12 @@ msgstr "シーケンスは関連するテーブルと同じスキーマでなけ
 msgid "cannot change ownership of identity sequence"
 msgstr "識別シーケンスの所有者は変更できません"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:16038 commands/tablecmds.c:18876
+#: commands/sequence.c:1671 commands/tablecmds.c:16136 commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "シーケンス\"%s\"はテーブル\"%s\"にリンクされています"
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1886
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "CREATE STATISTICSで指定可能なリレーションは一つのみです"
@@ -9814,82 +9885,82 @@ msgstr "CREATE STATISTICSで指定可能なリレーションは一つのみで
 msgid "cannot define statistics for relation \"%s\""
 msgstr "リレーション\"%s\"に対して統計情報を定義できません"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "統計情報オブジェクト\"%s\"はすでに存在します、スキップします"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "統計情報オブジェクト\"%s\"はすでに存在します"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "統計情報は%dを超える列を使用できません"
 
-#: commands/statscmds.c:247 commands/statscmds.c:276 commands/statscmds.c:316
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "システム列に対する統計情報の作成はサポートされていません"
 
-#: commands/statscmds.c:253 commands/statscmds.c:282 commands/statscmds.c:322
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
 #, c-format
 msgid "statistics creation on virtual generated columns is not supported"
 msgstr "仮想生成列に対する統計情報の作成はサポートされていません"
 
-#: commands/statscmds.c:260 commands/statscmds.c:289
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "列\"%s\"の型%sはデフォルトのbtreeオペレータクラスを持たないため統計情報では利用できません"
 
-#: commands/statscmds.c:339
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr "式の型%sがデフォルトbtree演算子クラスを持たないためこの式は多値統計情報では使用できません"
 
-#: commands/statscmds.c:360
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "単一式上の統計情報の構築時には、統計種別は指定できません"
 
-#: commands/statscmds.c:389
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "認識できない統計情報種別\"%s\""
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "拡張統計情報には最低でも2つの列が必要です"
 
-#: commands/statscmds.c:436
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "定形情報定義中の列名が重複しています"
 
-#: commands/statscmds.c:471
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "統計情報定義内に重複した式"
 
-#: commands/statscmds.c:646 commands/tablecmds.c:8913
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "統計情報目標%dは小さすぎます"
 
-#: commands/statscmds.c:654 commands/tablecmds.c:8921
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "統計情報目標を%dに減らします"
 
-#: commands/statscmds.c:678
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "統計情報オブジェクト\"%s.%s\"は存在しません、スキップします"
 
-#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:410
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "識別できないoriginの値: \"%s\""
@@ -9967,7 +10038,7 @@ msgstr "有効にされているサブスクリプションにはオプション
 msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
 msgstr "スロット名を指定されていないサブスクリプションのオプション\"%s\"を設定することはできません"
 
-#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1663 commands/subscriptioncmds.c:2044 utils/cache/lsyscache.c:3824
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665 commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "サブスクリプション\"%s\"は存在しません"
@@ -9979,13 +10050,13 @@ msgstr "有効にされているサブスクリプションには %s を指定
 
 #: commands/subscriptioncmds.c:1270
 #, c-format
-msgid "slot_name and two_phase cannot be altered at the same time"
-msgstr "slot_nameとtwo_phaseは同時に変更できません"
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "\"slot_name\"と\"two_phase\"は同時に変更できません"
 
 #: commands/subscriptioncmds.c:1286
 #, c-format
-msgid "cannot alter two_phase when logical replication worker is still running"
-msgstr "論理レプリケーションワーカーがまだ実行中のためtwo_phaseは変更できません"
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "論理レプリケーションワーカーがまだ実行中のため\"two_phase\"は変更できません"
 
 #: commands/subscriptioncmds.c:1287
 #, c-format
@@ -9994,8 +10065,8 @@ msgstr "少し待ってから再試行してください。"
 
 #: commands/subscriptioncmds.c:1300
 #, c-format
-msgid "cannot disable two_phase when prepared transactions are present"
-msgstr "準備済みトランザクションが存在するためtwo_phaseを無効にできません"
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "準備済みトランザクションが存在するため\"two_phase\"を無効にできません"
 
 #: commands/subscriptioncmds.c:1301
 #, c-format
@@ -10053,84 +10124,84 @@ msgstr "ALTER SUBSCRIPTION ... REFRESH を copy_data = false を指定して実
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "WAL読み飛ばし位置(LSN %X/%X)は基点LSN %X/%Xより大きくなければなりません"
 
-#: commands/subscriptioncmds.c:1667
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "サブスクリプション\"%s\"は存在しません、スキップします"
 
-#: commands/subscriptioncmds.c:1934
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "パブリッシャ上でレプリケーションスロット\"%s\"を削除しました"
 
-#: commands/subscriptioncmds.c:1943 commands/subscriptioncmds.c:1951
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "パブリッシャ上でのレプリケーションスロット\"%s\"の削除に失敗しました: %s"
 
-#: commands/subscriptioncmds.c:2076
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "OID %uのサブスクリプションは存在しません"
 
-#: commands/subscriptioncmds.c:2150 commands/subscriptioncmds.c:2274
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "パブリッシャから複製テーブルの一覧を受け取れませんでした: %s"
 
-#: commands/subscriptioncmds.c:2186
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr "サブスクリプション\"%s\"がcopy_dataをorigin = NONEで要求しましたが、異なる基点を持つデータをコピーする可能性があります"
 
-#: commands/subscriptioncmds.c:2188
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
 msgstr[0] "作成中のサブスクリプションは他のサブスクリプションによって書き込まれるテーブルを含むパブリケーション(%s)をサブスクライブします"
 
-#: commands/subscriptioncmds.c:2191
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr "パブリッシャテーブルからコピーされた初期データが異なる起源からのものでないことを確認してください。"
 
-#: commands/subscriptioncmds.c:2296 replication/logical/tablesync.c:904 replication/pgoutput/pgoutput.c:1162
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933 replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr "テーブル\"%s.%s\"に対して、異なるパブリケーションで異なる列リストを使用することはできません"
 
-#: commands/subscriptioncmds.c:2346
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "レプリケーションスロット\"%s\"を削除する際にパブリッシャへの接続に失敗しました: %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2349
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "%s でサブスクリプションを無効化してから、%s でスロットとの関連付けを解除してください。"
 
-#: commands/subscriptioncmds.c:2380
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "パブリケーション名\"%s\"が2回以上使われています"
 
-#: commands/subscriptioncmds.c:2424
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "パブリケーション\"%s\"はサブスクリプション\"%s\"にすでに存在します"
 
-#: commands/subscriptioncmds.c:2438
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "パブリケーション\"%s\"はサブスクリプション\"%s\"にはありません"
 
-#: commands/subscriptioncmds.c:2449
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "サブスクリプションからすべてのパブリケーションを削除することはできません"
 
-#: commands/subscriptioncmds.c:2506
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "パラメータ\"%s\"はBoolean値または\"parallel\"のみを取ります"
@@ -10191,7 +10262,7 @@ msgstr "実体化ビュー\"%s\"は存在しません、スキップします"
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "実体化ビューを削除するにはDROP MATERIALIZED VIEWを使用してください。"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21531 parser/parse_utilcmd.c:2407
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651 parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "インデックス\"%s\"は存在しません"
@@ -10214,7 +10285,7 @@ msgstr "\"%s\"は型ではありません"
 msgid "Use DROP TYPE to remove a type."
 msgstr "型を削除するにはDROP TYPEを使用してください"
 
-#: commands/tablecmds.c:294 commands/tablecmds.c:15877 commands/tablecmds.c:18578
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975 commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "外部テーブル\"%s\"は存在しません"
@@ -10228,1517 +10299,1507 @@ msgstr "外部テーブル\"%s\"は存在しません、スキップします"
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "外部テーブルを削除するには DROP FOREIGN TABLE を使用してください。"
 
-#: commands/tablecmds.c:801
+#: commands/tablecmds.c:802
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMITは一時テーブルでのみ使用できます"
 
-#: commands/tablecmds.c:818
+#: commands/tablecmds.c:819
 #, c-format
 msgid "partitioned tables cannot be unlogged"
 msgstr "パーティションテーブルはログ非取得にはできません"
 
-#: commands/tablecmds.c:838
+#: commands/tablecmds.c:839
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "セキュリティー制限操作中は、一時テーブルを作成できません"
 
-#: commands/tablecmds.c:874 commands/tablecmds.c:17302
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "リレーション\"%s\"が複数回継承されました"
 
-#: commands/tablecmds.c:1132
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "\"%s\"はパーティションされていません"
 
-#: commands/tablecmds.c:1226
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "%d以上の列を使ったパーティションはできません"
 
-#: commands/tablecmds.c:1282
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "パーティションテーブル\"%s\"では外部子テーブルを作成できません"
 
-#: commands/tablecmds.c:1284
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "テーブル\"%s\"はユニークインデックスを持っています"
 
-#: commands/tablecmds.c:1414 commands/tablecmds.c:14877
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "配列の次元多すぎます"
 
-#: commands/tablecmds.c:1419 parser/parse_clause.c:772 parser/parse_relation.c:1929
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772 parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "列\"%s\"はSETOFとして宣言できません"
 
-#: commands/tablecmds.c:1548
+#: commands/tablecmds.c:1549
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLYは複数オブジェクトの削除をサポートしていません"
 
-#: commands/tablecmds.c:1552
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLYはCASCADEをサポートしません"
 
-#: commands/tablecmds.c:1656
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "パーティション親インデックス\"%s\"は並行的に削除することはできません"
 
-#: commands/tablecmds.c:1944
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "パーティションの親テーブルのみの切り詰めはできません"
 
-#: commands/tablecmds.c:1945
+#: commands/tablecmds.c:1946
 #, c-format
 msgid "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly."
 msgstr "ONLY キーワードを指定しないでください、もしくは子テーブルに対して直接 TRUNCATE ONLY を実行してください。"
 
-#: commands/tablecmds.c:2018
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "テーブル\"%s\"へのカスケードを削除します"
 
-#: commands/tablecmds.c:2379
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "外部テーブル\"%s\"の切り詰めはできません"
 
-#: commands/tablecmds.c:2436
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルを削除できません"
 
-#: commands/tablecmds.c:2674 commands/tablecmds.c:17199
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "パーティション親テーブル\"%s\"からの継承はできません"
 
-#: commands/tablecmds.c:2679
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "パーティション子テーブル\"%s\"からの継承はできません"
 
-#: commands/tablecmds.c:2687 parser/parse_utilcmd.c:2678 parser/parse_utilcmd.c:2866
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699 parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "継承しようとしたリレーション\"%s\"はテーブルまたは外部テーブルではありません"
 
-#: commands/tablecmds.c:2699
+#: commands/tablecmds.c:2700
 #, c-format
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "一時リレーションを永続リレーション\"%s\"のパーティション子テーブルとして作ることはできません"
 
-#: commands/tablecmds.c:2708 commands/tablecmds.c:17178
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "一時リレーション\"%s\"から継承することはできません"
 
-#: commands/tablecmds.c:2718 commands/tablecmds.c:17186
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "他のセッションの一時リレーションから継承することはできません"
 
-#: commands/tablecmds.c:2873 commands/tablecmds.c:2927 commands/tablecmds.c:14560 parser/parse_utilcmd.c:1418 parser/parse_utilcmd.c:1463 parser/parse_utilcmd.c:1895 parser/parse_utilcmd.c:2003
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928 commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440 parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916 parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "行全体テーブル参照を変換できません"
 
-#: commands/tablecmds.c:2874 parser/parse_utilcmd.c:1419
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "制約\"%s\"はテーブル\"%s\"への行全体参照を含みます。"
 
-#: commands/tablecmds.c:2928 parser/parse_utilcmd.c:1464
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "制約\"%s\"はテーブル\"%s\"への行全体参照を含みます。"
 
-#: commands/tablecmds.c:3050 commands/tablecmds.c:3344
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "列\"%s\"は生成列を継承しますが、default 指定がされています"
 
-#: commands/tablecmds.c:3055 commands/tablecmds.c:3349
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr "列\"%s\"は生成列を継承しますが、識別列と指定されています"
 
-#: commands/tablecmds.c:3063 commands/tablecmds.c:3357
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "子テーブルの列\"%s\"は生成式を指定しています"
 
-#: commands/tablecmds.c:3065 commands/tablecmds.c:3359
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "子テーブルの列は、親となる列が生成列でなければ生成列にはできません。"
 
-#: commands/tablecmds.c:3071 commands/tablecmds.c:3365 commands/tablecmds.c:17464
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366 commands/tablecmds.c:17562
 #, c-format
 msgid "column \"%s\" inherits from generated column of different kind"
 msgstr "列\"%s\"は異なる種類の生成列を継承しています"
 
-#: commands/tablecmds.c:3073 commands/tablecmds.c:3367 commands/tablecmds.c:17465
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368 commands/tablecmds.c:17563
 #, c-format
 msgid "Parent column is %s, child column is %s."
 msgstr "親の列は %s、子の列は %s です。"
 
-#: commands/tablecmds.c:3120
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "列\"%s\"は競合する生成式を継承します"
 
-#: commands/tablecmds.c:3122
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "この競合を解消するには明示的に生成式を指定してください。"
 
-#: commands/tablecmds.c:3126
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "列\"%s\"は競合するデフォルト値を継承します"
 
-#: commands/tablecmds.c:3128
+#: commands/tablecmds.c:3129
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "競合を解消するには明示的にデフォルトを指定してください"
 
-#: commands/tablecmds.c:3195
+#: commands/tablecmds.c:3196
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr "異なる式を持つ検査制約名\"%s\"が複数あります。"
 
-#: commands/tablecmds.c:3248
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "継承される定義で列\"%s\"をマージしています"
 
-#: commands/tablecmds.c:3252
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "継承される定義で列\"%s\"を移動してマージします"
 
-#: commands/tablecmds.c:3253
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "ユーザーが指定した列が継承した列の位置に移動されました。"
 
-#: commands/tablecmds.c:3265
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "列\"%s\"の型が競合しています"
 
-#: commands/tablecmds.c:3267 commands/tablecmds.c:3301 commands/tablecmds.c:3317 commands/tablecmds.c:3433 commands/tablecmds.c:3461 commands/tablecmds.c:3477 parser/parse_coerce.c:2190 parser/parse_coerce.c:2210 parser/parse_coerce.c:2230 parser/parse_coerce.c:2251 parser/parse_coerce.c:2306 parser/parse_coerce.c:2340 parser/parse_coerce.c:2416 parser/parse_coerce.c:2447 parser/parse_coerce.c:2486 parser/parse_coerce.c:2553 parser/parse_param.c:224
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302 commands/tablecmds.c:3318 commands/tablecmds.c:3434 commands/tablecmds.c:3462 commands/tablecmds.c:3478 parser/parse_coerce.c:2190 parser/parse_coerce.c:2210 parser/parse_coerce.c:2230 parser/parse_coerce.c:2251 parser/parse_coerce.c:2306 parser/parse_coerce.c:2340 parser/parse_coerce.c:2416 parser/parse_coerce.c:2447 parser/parse_coerce.c:2486 parser/parse_coerce.c:2553 parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s対%s"
 
-#: commands/tablecmds.c:3279
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "列\"%s\"の照合順序が競合しています"
 
-#: commands/tablecmds.c:3281 commands/tablecmds.c:3447 commands/tablecmds.c:7276
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448 commands/tablecmds.c:7277 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\"対\"%s\""
 
-#: commands/tablecmds.c:3299
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "列\"%s\"でストレージパラメータが競合しています"
 
-#: commands/tablecmds.c:3315 commands/tablecmds.c:3475
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "列\"%s\"で圧縮方式が競合しています"
 
-#: commands/tablecmds.c:3419
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "複数の継承される列\"%s\"の定義をマージしています"
 
-#: commands/tablecmds.c:3431
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "継承される列\"%s\"の型が競合しています"
 
-#: commands/tablecmds.c:3445
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "継承される列 \"%s\"の照合順序が競合しています"
 
-#: commands/tablecmds.c:3459
+#: commands/tablecmds.c:3460
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "継承される列\"%s\"でストレージパラメータが競合しています"
 
-#: commands/tablecmds.c:3487
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "継承された列 \"%s\"の生成が競合しています"
 
-#: commands/tablecmds.c:3718
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルを移動できません"
 
-#: commands/tablecmds.c:3791
+#: commands/tablecmds.c:3792
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "型付けされたテーブルの列をリネームできません"
 
-#: commands/tablecmds.c:3810
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "リレーション\"%s\"の列名は変更できません"
 
-#: commands/tablecmds.c:3905
+#: commands/tablecmds.c:3906
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "継承される列\"%s\"の名前を子テーブルでも変更する必要があります"
 
-#: commands/tablecmds.c:3937
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "システム列%s\"の名前を変更できません"
 
-#: commands/tablecmds.c:3952
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "継承される列\"%s\"の名前を変更できません"
 
-#: commands/tablecmds.c:4107
+#: commands/tablecmds.c:4108
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "継承される制約\"%s\"の名前を子テーブルでも変更する必要があります"
 
-#: commands/tablecmds.c:4114
+#: commands/tablecmds.c:4115
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "継承される制約\"%s\"の名前を変更できません"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4414
+#: commands/tablecmds.c:4415
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "このセッションで実行中の問い合わせで使用されているため\"%2$s\"を%1$sできません"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4423
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "保留中のトリガイベントがあるため\"%2$s\"を%1$sできません"
 
-#: commands/tablecmds.c:4449
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルは変更できません"
 
-#: commands/tablecmds.c:4913
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "パーティション子テーブル\"%s\"は不完全な取り外し状態であるため変更できません"
 
-#: commands/tablecmds.c:5142
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "永続性設定の変更は2度はできません"
 
-#: commands/tablecmds.c:5159
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "SET ACCESS METHODサブコマンドを複数指定できません"
 
-#: commands/tablecmds.c:5893
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "システムリレーション\"%sを書き換えられません"
 
-#: commands/tablecmds.c:5899
+#: commands/tablecmds.c:5900
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "カタログテーブルとして使用されているテーブル\"%s\"は書き換えられません"
 
-#: commands/tablecmds.c:5911
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルを書き換えられません"
 
-#: commands/tablecmds.c:6447 commands/tablecmds.c:6467
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"にNULL値があります"
 
-#: commands/tablecmds.c:6484
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "一部の行がリレーション\"%2$s\"の検査制約\"%1$s\"に違反してます"
 
-#: commands/tablecmds.c:6504 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid "updated partition constraint for default partition \"%s\" would be violated by some row"
 msgstr "デフォルトパーティション\"%s\"の一部の行が更新後のパーティション制約に違反しています"
 
-#: commands/tablecmds.c:6510
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "一部の行がリレーション\"%s\"のパーティション制約に違反しています"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6775
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "ALTERのアクション%sはリレーション\"%s\"では実行できません"
 
-#: commands/tablecmds.c:7030 commands/tablecmds.c:7037
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "型\"%s\"を変更できません。列\"%s\".\"%s\"でその型を使用しているためです"
 
-#: commands/tablecmds.c:7044
+#: commands/tablecmds.c:7045
 #, c-format
 msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "列%2$s\".\"%3$s\"がその行型を使用しているため、外部テーブル\"%1$s\"を変更できません。"
 
-#: commands/tablecmds.c:7051
+#: commands/tablecmds.c:7052
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "テーブル\"%s\"を変更できません。その行型を列\"%s\".\"%s\"で使用しているためです"
 
-#: commands/tablecmds.c:7107
+#: commands/tablecmds.c:7108
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "型付けされたテーブルの型であるため、外部テーブル\"%s\"を変更できません。"
 
-#: commands/tablecmds.c:7109
+#: commands/tablecmds.c:7110
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "型付けされたテーブルを変更する場合も ALTER .. CASCADE を使用してください"
 
-#: commands/tablecmds.c:7155
+#: commands/tablecmds.c:7156
 #, c-format
 msgid "type %s is the row type of another table"
 msgstr "型\"%s\"は他のテーブルの行型です"
 
-#: commands/tablecmds.c:7157
+#: commands/tablecmds.c:7158
 #, c-format
 msgid "A typed table must use a stand-alone composite type created with CREATE TYPE."
 msgstr "型付きテーブルは、CREATE TYPEで作成された独立した複合型を使用する必要があります。"
 
-#: commands/tablecmds.c:7162
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "型 %s は複合型ではありません"
 
-#: commands/tablecmds.c:7189
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "型付けされたテーブルに列を追加できません"
 
-#: commands/tablecmds.c:7239
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "パーティションに列は追加できません"
 
-#: commands/tablecmds.c:7268 commands/tablecmds.c:17420
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "子テーブル\"%s\"に異なる型の列\"%s\"があります"
 
-#: commands/tablecmds.c:7274 commands/tablecmds.c:17426
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "子テーブル\"%s\"に異なる照合順序の列\"%s\"があります"
 
-#: commands/tablecmds.c:7292
+#: commands/tablecmds.c:7293
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "子\"%2$s\"の列\"%1$s\"の定義をマージしています"
 
-#: commands/tablecmds.c:7345
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "子テーブルを持つテーブルに識別列を再帰的に追加することはできません"
 
-#: commands/tablecmds.c:7592
+#: commands/tablecmds.c:7593
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "列は子テーブルでも追加する必要があります"
 
-#: commands/tablecmds.c:7670
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"はすでに存在します、スキップします"
 
-#: commands/tablecmds.c:7677
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"はすでに存在します"
 
-#: commands/tablecmds.c:7768 commands/tablecmds.c:7935 commands/tablecmds.c:8136 commands/tablecmds.c:8267 commands/tablecmds.c:8396 commands/tablecmds.c:8490 commands/tablecmds.c:8593 commands/tablecmds.c:8789 commands/tablecmds.c:8955 commands/tablecmds.c:9046 commands/tablecmds.c:9180 commands/tablecmds.c:14335 commands/tablecmds.c:15900 commands/tablecmds.c:18667
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936 commands/tablecmds.c:8137 commands/tablecmds.c:8268 commands/tablecmds.c:8422 commands/tablecmds.c:8516 commands/tablecmds.c:8619 commands/tablecmds.c:8815 commands/tablecmds.c:8981 commands/tablecmds.c:9072 commands/tablecmds.c:9206 commands/tablecmds.c:14407 commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "システム列\"%s\"を変更できません"
 
-#: commands/tablecmds.c:7774 commands/tablecmds.c:8142 commands/tablecmds.c:14096
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143 commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は識別列です"
 
-#: commands/tablecmds.c:7791
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "列\"%s\"は親テーブルでNOT NULL指定されています"
 
-#: commands/tablecmds.c:8013 commands/tablecmds.c:9957
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "制約は子テーブルにも追加する必要があります"
 
-#: commands/tablecmds.c:8014 commands/tablecmds.c:8245 commands/tablecmds.c:8352 commands/tablecmds.c:8469 commands/tablecmds.c:9353 commands/tablecmds.c:12159
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246 commands/tablecmds.c:8378 commands/tablecmds.c:8495 commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
 msgid "Do not specify the ONLY keyword."
 msgstr "ONLYキーワードを指定しないでください。"
 
-#: commands/tablecmds.c:8151
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は生成カラムです"
 
-#: commands/tablecmds.c:8244
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr "パーティション親テーブルのみで列を識別列とすることはできません"
 
-#: commands/tablecmds.c:8250
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "パーティション子テーブルの列を識別列とすることはできません"
 
-#: commands/tablecmds.c:8278
+#: commands/tablecmds.c:8279
 #, c-format
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "識別列を追加するにはリレーション\"%s\"の列\"%s\"はNOT NULLと宣言されている必要があります"
 
-#: commands/tablecmds.c:8284
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"はすでに識別列です"
 
-#: commands/tablecmds.c:8290
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"はすでにデフォルト値が指定されています"
 
-#: commands/tablecmds.c:8351
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "パーティション親テーブルのみで列の識別列属性を変更することはできません"
 
-#: commands/tablecmds.c:8357
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "パーティション子テーブルの列の識別列属性を変更することはできません"
 
-#: commands/tablecmds.c:8402 commands/tablecmds.c:8498
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は識別列ではありません"
 
-#: commands/tablecmds.c:8468
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "パーティション親テーブルのみで列の識別列属性を削除することはできません"
 
-#: commands/tablecmds.c:8474
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "パーティション子テーブルの列の識別列属性を削除することはできません"
 
-#: commands/tablecmds.c:8503
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は識別列ではありません、スキップします"
 
-#: commands/tablecmds.c:8600 commands/tablecmds.c:8810
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は生成列ではありません"
 
-#: commands/tablecmds.c:8611
+#: commands/tablecmds.c:8637
 #, c-format
-msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns on tables with check constraints"
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
 msgstr "ALTER TABLE / SET EXPRESSION は、チェック制約のあるテーブルの仮想生成列ではサポートされていません"
 
-#: commands/tablecmds.c:8612 commands/tablecmds.c:8630 commands/tablecmds.c:8802
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656 commands/tablecmds.c:8828
 #, c-format
 msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は仮想生成列です。"
 
-#: commands/tablecmds.c:8629
+#: commands/tablecmds.c:8655
 #, c-format
-msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns on tables that are part of a publication"
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
 msgstr "ALTER TABLE / SET EXPRESSION は、パブリケーションに含まれるテーブルの仮想生成列ではサポートされていません"
 
-#: commands/tablecmds.c:8736
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSIONは子テーブルに対しても適用されなくてはなりません"
 
-#: commands/tablecmds.c:8758
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "継承列から生成式を削除することはできません"
 
-#: commands/tablecmds.c:8801
+#: commands/tablecmds.c:8827
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
 msgstr "ALTER TABLE / DROP EXPRESSIONは仮想生成列ではサポートされていません"
 
-#: commands/tablecmds.c:8815
+#: commands/tablecmds.c:8841
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は生成列ではありません、スキップします"
 
-#: commands/tablecmds.c:8893
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "非インデックス列を番号で参照することはできません"
 
-#: commands/tablecmds.c:8945
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "リレーション \"%2$s\"の列 %1$d は存在しません"
 
-#: commands/tablecmds.c:8965
+#: commands/tablecmds.c:8991
 #, c-format
 msgid "cannot alter statistics on virtual generated column \"%s\""
 msgstr "仮想生成列\"%s\"の統計情報は変更できません"
 
-#: commands/tablecmds.c:8974
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "インデックス\"%2$s\"の包含列\"%1$s\"への統計情報の変更はできません"
 
-#: commands/tablecmds.c:8979
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr "インデックス \"%2$s\"の非式列\"%1$s\"の統計情報の変更はできません"
 
-#: commands/tablecmds.c:8981
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "代わりにテーブルカラムの統計情報を変更してください。"
 
-#: commands/tablecmds.c:9227
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "型付けされたテーブルから列を削除できません"
 
-#: commands/tablecmds.c:9291
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は存在しません、スキップします"
 
-#: commands/tablecmds.c:9304
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "システム列\"%s\"を削除できません"
 
-#: commands/tablecmds.c:9314
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "継承される列\"%s\"を削除できません"
 
-#: commands/tablecmds.c:9327
+#: commands/tablecmds.c:9353
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "列\"%s\"はリレーション\"%s\"のパーティションキーの一部であるため、削除できません"
 
-#: commands/tablecmds.c:9352
+#: commands/tablecmds.c:9378
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr "子テーブルが存在する場合にはパーティション親テーブルのみから列を削除することはできません"
 
-#: commands/tablecmds.c:9479
+#: commands/tablecmds.c:9543
 #, c-format
 msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
 msgstr "テーブル\"%2$s\"の列\"%1$s\"は非NULLに設定されていません"
 
-#: commands/tablecmds.c:9507 commands/tablecmds.c:9519
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
 #, c-format
 msgid "cannot create primary key on column \"%s\""
 msgstr "列%s\"に主キーを作成することはできません"
 
-#. translator: third %s is a constraint characteristic such as NOT VALID
-#: commands/tablecmds.c:9510 commands/tablecmds.c:9522
-#, c-format
-msgid "The constraint \"%s\" on column \"%s\", marked %s, is incompatible with a primary key."
-msgstr " %3$s とマークされている列 \"%2$s\" の制約 \"%1$s\" は、主キーと非互換です"
-
-#: commands/tablecmds.c:9512
-#, c-format
-msgid "You will need to make it inheritable using %s."
-msgstr "%s を用いてこの制約を継承可能にすべきです。"
-
-#: commands/tablecmds.c:9524
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
 #, c-format
-msgid "You will need to validate it using %s."
-msgstr "%s を用いてこの制約を検証してください。"
+msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
+msgstr " %4$s とマークされているテーブル \"%3$s\"の列 \"%2$s\" への制約 \"%1$s\" は、主キーの要件を満たしていません。"
 
-#: commands/tablecmds.c:9661
+#: commands/tablecmds.c:9717
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX はパーティションテーブルではサポートされていません"
 
-#: commands/tablecmds.c:9686
+#: commands/tablecmds.c:9742
 #, 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:10044
+#: commands/tablecmds.c:10100
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr "パーティションテーブル\"%s\"上のリレーション\"%s\"を参照する外部キー定義ではONLY指定はできません "
 
-#: commands/tablecmds.c:10052 commands/tablecmds.c:10679
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "参照先のリレーション\"%s\"はテーブルではありません"
 
-#: commands/tablecmds.c:10075
+#: commands/tablecmds.c:10131
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "永続テーブルの制約は永続テーブルだけを参照できます"
 
-#: commands/tablecmds.c:10082
+#: commands/tablecmds.c:10138
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "UNLOGGEDテーブルに対する制約は、永続テーブルまたはUNLOGGEDテーブルだけを参照する場合があります"
 
-#: commands/tablecmds.c:10088
+#: commands/tablecmds.c:10144
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "一時テーブルに対する制約は一時テーブルだけを参照する場合があります"
 
-#: commands/tablecmds.c:10092
+#: commands/tablecmds.c:10148
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "一時テーブルに対する制約にはこのセッションの一時テーブルを加える必要があります"
 
-#: commands/tablecmds.c:10107 commands/tablecmds.c:10135
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
 #, c-format
 msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
 msgstr "外部キーが参照先テーブル上ではPERIODを使用していますが、参照元テーブルでは使用していません"
 
-#: commands/tablecmds.c:10147
+#: commands/tablecmds.c:10203
 #, c-format
 msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
 msgstr "外部キーが参照元テーブル上ではPERIODを使用していますが、参照先テーブルでは使用していません"
 
-#: commands/tablecmds.c:10161
+#: commands/tablecmds.c:10217
 #, c-format
-msgid "foreign key must use PERIOD when referencing a primary using WITHOUT OVERLAPS"
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
 msgstr "主キーがWITHOUT OVERLAPSを使用している場合は外部キーはPERIODを使用する必要があります"
 
-#: commands/tablecmds.c:10185 commands/tablecmds.c:10191
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "生成カラムを含む外部キー制約に対する不正な %s 処理"
 
-#: commands/tablecmds.c:10206
+#: commands/tablecmds.c:10262
 #, c-format
 msgid "foreign key constraints on virtual generated columns are not supported"
 msgstr "外部キー制約は仮想生成列ではサポートされていません"
 
-#: commands/tablecmds.c:10220 commands/tablecmds.c:10229
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
 #, c-format
 msgid "unsupported %s action for foreign key constraint using PERIOD"
 msgstr "PERIODを使用する外部キー制約に対するサポートされない %s 処理"
 
-#: commands/tablecmds.c:10244
+#: commands/tablecmds.c:10300
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "外部キーの参照列数と被参照列数が合いません"
 
-#: commands/tablecmds.c:10300
+#: commands/tablecmds.c:10356
 #, c-format
 msgid "could not identify an overlaps operator for foreign key"
 msgstr "外部キーに使用する重複検出演算子を特定できませんでした"
 
-#: commands/tablecmds.c:10301
+#: commands/tablecmds.c:10357
 #, c-format
 msgid "could not identify an equality operator for foreign key"
 msgstr "外部キーに使用する等価演算子を特定できませんでした"
 
-#: commands/tablecmds.c:10366 commands/tablecmds.c:10400
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "外部キー制約\"%sは実装されていません"
 
-#: commands/tablecmds.c:10368
+#: commands/tablecmds.c:10424
 #, c-format
 msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
 msgstr "キー列である参照元テーブルの\"%1$s\"と参照先テーブルの\"%2$s\"の型に互換性がありません: %3$sと%4$s。"
 
-#: commands/tablecmds.c:10401
+#: commands/tablecmds.c:10457
 #, c-format
 msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
 msgstr "キー列である参照元テーブルの\"%1$s\"と参照先テーブルの\"%2$s\"の照合順序に互換性がありません: %3$sと%4$s。いずれかの照合順序が非決定的である場合は両方の照合順序が同一である必要があります。"
 
-#: commands/tablecmds.c:10607
+#: commands/tablecmds.c:10663
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr "ON DELETE SETアクションで参照されている列\"%s\"は外部キーの一部である必要があります"
 
-#: commands/tablecmds.c:10989 commands/tablecmds.c:11435 parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480 parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "外部テーブルでは外部キー制約はサポートされていません"
 
-#: commands/tablecmds.c:11418
+#: commands/tablecmds.c:11463
 #, c-format
 msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
 msgstr "外部キー\"%2$s\"で参照されているため、テーブル\"%1$s\"を子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:11699
+#: commands/tablecmds.c:11744
 #, c-format
 msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
 msgstr "制約\"%1$s\"の強制性が、リレーション\"%3$s\"上の制約\"%2$s\"と競合しています"
 
-#: commands/tablecmds.c:12158
+#: commands/tablecmds.c:12206
 #, c-format
 msgid "constraint must be altered in child tables too"
 msgstr "制約は子テーブルでも変更される必要があります"
 
-#: commands/tablecmds.c:12187 commands/tablecmds.c:12881 commands/tablecmds.c:13975 commands/tablecmds.c:14204
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932 commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"は存在しません"
 
-#: commands/tablecmds.c:12194
+#: commands/tablecmds.c:12242
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"は外部キー制約ではありません"
 
-#: commands/tablecmds.c:12199
+#: commands/tablecmds.c:12247
 #, c-format
 msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"の強制性を変更できません"
 
-#: commands/tablecmds.c:12205
+#: commands/tablecmds.c:12253
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"は非NULL制約ではありません"
 
-#: commands/tablecmds.c:12213
+#: commands/tablecmds.c:12261
 #, c-format
 msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
 msgstr "リレーション\"%2$s\"の継承された制約\"%1$s\"を変更できません"
 
-#: commands/tablecmds.c:12253
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"を変更できません"
 
-#: commands/tablecmds.c:12256
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "制約\"%1$s\"は、リレーション\"%3$s\"上の制約\"%2$s\"から派生しています。"
 
-#: commands/tablecmds.c:12258
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "この制約の代わりに派生元の制約を変更することは可能です。"
 
-#: commands/tablecmds.c:12890
+#: commands/tablecmds.c:12941
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" is not a foreign key, check, or not-null constraint"
-msgstr "リレーション\"%2$s\"の制約\"%1$s\"は外部キー制約、検査制約、非NULL制約のいずれでもありません"
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "リレーション\"%2$s\"の制約\"%1$s\"を検証できません"
 
-#: commands/tablecmds.c:12896
+#: commands/tablecmds.c:12943
+#, c-format
+msgid "This operation is not supported for this type of constraint."
+msgstr "この操作はこのタイプの制約に対してはサポートされていません。"
+
+#: commands/tablecmds.c:12948
 #, c-format
 msgid "cannot validate NOT ENFORCED constraint"
 msgstr "NOT ENFORCED制約は検証できません"
 
-#: commands/tablecmds.c:13085 commands/tablecmds.c:13185
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "制約は子テーブルでも検証される必要があります"
 
-#: commands/tablecmds.c:13262
+#: commands/tablecmds.c:13334
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "外部キー制約で参照される列\"%s\"が存在しません"
 
-#: commands/tablecmds.c:13268
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "システム列は外部キーに使用できません"
 
-#: commands/tablecmds.c:13272
+#: commands/tablecmds.c:13344
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "外部キーでは%dを超えるキーを持つことができません"
 
-#: commands/tablecmds.c:13340
+#: commands/tablecmds.c:13412
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "被参照テーブル\"%s\"には遅延可能プライマリキーは使用できません"
 
-#: commands/tablecmds.c:13357
+#: commands/tablecmds.c:13429
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "被参照テーブル\"%s\"にはプライマリキーがありません"
 
-#: commands/tablecmds.c:13430
+#: commands/tablecmds.c:13502
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "外部キーの被参照列リストには重複があってはなりません"
 
-#: commands/tablecmds.c:13533
+#: commands/tablecmds.c:13605
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "被参照テーブル\"%s\"に対しては、遅延可能な一意性制約は使用できません"
 
-#: commands/tablecmds.c:13538
+#: commands/tablecmds.c:13610
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr "被参照テーブル\"%s\"に、指定したキーに一致する一意性制約がありません"
 
-#: commands/tablecmds.c:13979
+#: commands/tablecmds.c:14051
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "リレーション\"%2$s\"の制約\"%1$s\"は存在しません、スキップします"
 
-#: commands/tablecmds.c:14024
+#: commands/tablecmds.c:14096
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "リレーション\"%2$s\"の継承された制約\"%1$s\"を削除できません"
 
-#: commands/tablecmds.c:14076
+#: commands/tablecmds.c:14148
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "列\"%s\"はプライマリキーで使用しています"
 
-#: commands/tablecmds.c:14084
+#: commands/tablecmds.c:14156
 #, c-format
 msgid "column \"%s\" is in index used as replica identity"
 msgstr "列\"%s\"は複製識別として使用中のインデックスに含まれています"
 
-#: commands/tablecmds.c:14317
+#: commands/tablecmds.c:14389
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "型付けされたテーブルの列の型を変更できません"
 
-#: commands/tablecmds.c:14345
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "生成列の型変更の際にはUSINGを指定することはできません"
 
-#: commands/tablecmds.c:14346 commands/tablecmds.c:19726 commands/tablecmds.c:19819 commands/trigger.c:659 rewrite/rewriteHandler.c:949 rewrite/rewriteHandler.c:984
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "列\"%s\"は生成カラムです。"
-
-#: commands/tablecmds.c:14357
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "継承される列\"%s\"を変更できません"
 
-#: commands/tablecmds.c:14366
+#: commands/tablecmds.c:14438
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "列\"%s\"はリレーション\"%s\"のパーティションキーの一部であるため、変更できません"
 
-#: commands/tablecmds.c:14421
+#: commands/tablecmds.c:14493
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "列\"%s\"に対するUSING句の結果は自動的に%s型に型変換できません"
 
-#: commands/tablecmds.c:14424
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "必要に応じて明示的な型変換を追加してください。"
 
-#: commands/tablecmds.c:14428
+#: commands/tablecmds.c:14500
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "列\"%s\"は型%sには自動的に型変換できません"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:14432
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "必要に応じて\"USING %s::%s\"を追加してください。"
 
-#: commands/tablecmds.c:14532
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "リレーション\"%2$s\"の継承列\"%1$s\"は変更できません"
 
-#: commands/tablecmds.c:14561
+#: commands/tablecmds.c:14636
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr "USING式が行全体テーブル参照を含んでいます。"
 
-#: commands/tablecmds.c:14572
+#: commands/tablecmds.c:14647
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "継承される列\"%s\"の型を子テーブルで変更しなければなりません"
 
-#: commands/tablecmds.c:14697
+#: commands/tablecmds.c:14772
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "列\"%s\"の型を2回変更することはできません"
 
-#: commands/tablecmds.c:14735
+#: commands/tablecmds.c:14810
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr "カラム\"%s\"に対する生成式は自動的に%s型にキャストできません"
 
-#: commands/tablecmds.c:14740
+#: commands/tablecmds.c:14815
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "列\"%s\"のデフォルト値を自動的に%s型にキャストできません"
 
-#: commands/tablecmds.c:15044
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "関数またはプロシージャで使用される列の型は変更できません"
 
-#: commands/tablecmds.c:15045 commands/tablecmds.c:15060 commands/tablecmds.c:15080 commands/tablecmds.c:15099 commands/tablecmds.c:15158
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135 commands/tablecmds.c:15155 commands/tablecmds.c:15174 commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%sは列\"%s\"に依存しています"
 
-#: commands/tablecmds.c:15059
+#: commands/tablecmds.c:15134
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "ビューまたはルールで使用される列の型は変更できません"
 
-#: commands/tablecmds.c:15079
+#: commands/tablecmds.c:15154
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "トリガー定義で使用される列の型は変更できません"
 
-#: commands/tablecmds.c:15098
+#: commands/tablecmds.c:15173
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "ポリシ定義で使用されている列の型は変更できません"
 
-#: commands/tablecmds.c:15129
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "生成カラムで使用される列の型は変更できません"
 
-#: commands/tablecmds.c:15130
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "カラム\"%s\"は生成カラム\"%s\"で使われています。"
 
-#: commands/tablecmds.c:15157
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "パブリケーションのWHERE句で使用される列の型は変更できません"
 
-#: commands/tablecmds.c:16008 commands/tablecmds.c:16020
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "インデックス\"%s\"の所有者を変更できません"
 
-#: commands/tablecmds.c:16010 commands/tablecmds.c:16022
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "代わりにインデックスのテーブルの所有者を変更してください。"
 
-#: commands/tablecmds.c:16036
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "シーケンス\"%s\"の所有者を変更できません"
 
-#: commands/tablecmds.c:16061
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "リレーション\"%s\"の所有者を変更できません"
 
-#: commands/tablecmds.c:16528
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "SET TABLESPACEサブコマンドを複数指定できません"
 
-#: commands/tablecmds.c:16607
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "リレーション\"%s\"のオプションは設定できません"
 
-#: commands/tablecmds.c:16641 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTIONは自動更新可能ビューでのみサポートされます"
 
-#: commands/tablecmds.c:16894
+#: commands/tablecmds.c:16992
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "テーブルスペースにはテーブル、インデックスおよび実体化ビューしかありません"
 
-#: commands/tablecmds.c:16906
+#: commands/tablecmds.c:17004
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "pg_globalテーブルスペースとの間のリレーションの移動はできません"
 
-#: commands/tablecmds.c:16998
+#: commands/tablecmds.c:17096
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "リレーション\"%s.%s\"のロックが獲得できなかったため中断します"
 
-#: commands/tablecmds.c:17014
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "テーブルスペース\"%s\"には合致するリレーションはありませんでした"
 
-#: commands/tablecmds.c:17136
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "型付けされたテーブルの継承を変更できません"
 
-#: commands/tablecmds.c:17141 commands/tablecmds.c:17725
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "パーティションの継承は変更できません"
 
-#: commands/tablecmds.c:17146
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "パーティションテーブルの継承は変更できません"
 
-#: commands/tablecmds.c:17193
+#: commands/tablecmds.c:17291
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "他のセッションの一時テーブルを継承できません"
 
-#: commands/tablecmds.c:17206
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "パーティションからの継承はできません"
 
-#: commands/tablecmds.c:17228 commands/tablecmds.c:20239
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "循環継承を行うことはできません"
 
-#: commands/tablecmds.c:17229 commands/tablecmds.c:20240
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\"はすでに\"%s\"の子です"
 
-#: commands/tablecmds.c:17242
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "トリガ\"%s\"によってテーブル\"%s\"が継承子テーブルになることができません"
 
-#: commands/tablecmds.c:17244
+#: commands/tablecmds.c:17342
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "遷移テーブルを使用したROWトリガは継承関係ではサポートされていません。"
 
-#: commands/tablecmds.c:17445 commands/tablecmds.c:17694
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
 msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
 msgstr "子テーブル\"%2$s\"の列\"%1$s\"は非NULLに設定されていません"
 
-#: commands/tablecmds.c:17455
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "子テーブルの列\"%s\"は生成列である必要があります"
 
-#: commands/tablecmds.c:17459
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "子テーブルの列\"%s\"は生成列であってはなりません"
 
-#: commands/tablecmds.c:17505
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "子テーブルには列\"%s\"がありません"
 
-#: commands/tablecmds.c:17622
+#: commands/tablecmds.c:17720
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "子テーブル\"%s\"では検査制約\"%s\"に異なった定義がされています"
 
-#: commands/tablecmds.c:17631
+#: commands/tablecmds.c:17729
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "制約\"%s\"は子テーブル\"%s\"上の継承されない制約と競合します"
 
-#: commands/tablecmds.c:17642
+#: commands/tablecmds.c:17740
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
 msgstr "制約\"%s\"は子テーブル\"%s\"のNOT VALID制約と衝突しています"
 
-#: commands/tablecmds.c:17653
+#: commands/tablecmds.c:17751
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
 msgstr "制約\"%s\"は子テーブル\"%s\"のNOT ENFORCED制約と衝突しています"
 
-#: commands/tablecmds.c:17702
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "子テーブルには制約\"%s\"がありません"
 
-#: commands/tablecmds.c:17789
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "パーティション\"%s\"はすでにパーティションテーブル\"%s.%s\"からの取り外し保留中です"
 
-#: commands/tablecmds.c:17818 commands/tablecmds.c:17866
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "リレーション\"%s\"はリレーション\"%s\"のパーティション子テーブルではありません"
 
-#: commands/tablecmds.c:17872
+#: commands/tablecmds.c:17970
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "リレーション\"%s\"はリレーション\"%s\"の親ではありません"
 
-#: commands/tablecmds.c:18143
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "型付けされたテーブルは継承できません"
 
-#: commands/tablecmds.c:18173
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "テーブルには列\"%s\"がありません"
 
-#: commands/tablecmds.c:18184
+#: commands/tablecmds.c:18282
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "テーブルには列\"%s\"がありますが型は\"%s\"を必要としています"
 
-#: commands/tablecmds.c:18193
+#: commands/tablecmds.c:18291
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "テーブル\"%s\"では列\"%s\"の型が異なっています"
 
-#: commands/tablecmds.c:18207
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "テーブルに余分な列\"%s\"があります"
 
-#: commands/tablecmds.c:18259
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\"は型付けされたテーブルではありません"
 
-#: commands/tablecmds.c:18439
+#: commands/tablecmds.c:18537
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "非ユニークインデックス\"%s\"は複製識別としては使用できません"
 
-#: commands/tablecmds.c:18445
+#: commands/tablecmds.c:18543
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "一意性を即時検査しないインデックス\"%s\"は複製識別には使用できません"
 
-#: commands/tablecmds.c:18451
+#: commands/tablecmds.c:18549
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "式インデックス\"%s\"は複製識別としては使用できません"
 
-#: commands/tablecmds.c:18457
+#: commands/tablecmds.c:18555
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "部分インデックス\"%s\"を複製識別としては使用できません"
 
-#: commands/tablecmds.c:18474
+#: commands/tablecmds.c:18572
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
 msgstr "列%2$dはシステム列であるためインデックス\"%1$s\"は複製識別には使えません"
 
-#: commands/tablecmds.c:18481
+#: commands/tablecmds.c:18579
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "列\"%2$s\"はnull可であるためインデックス\"%1$s\"は複製識別には使えません"
 
-#: commands/tablecmds.c:18730
+#: commands/tablecmds.c:18828
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "テーブル\"%s\"は一時テーブルであるため、ログ出力設定を変更できません"
 
-#: commands/tablecmds.c:18754
+#: commands/tablecmds.c:18852
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "テーブル\"%s\"はパブリケーションの一部であるため、UNLOGGEDに変更できません"
 
-#: commands/tablecmds.c:18756
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "UNLOGGEDリレーションはレプリケーションできません。"
 
-#: commands/tablecmds.c:18801
+#: commands/tablecmds.c:18899
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr "テーブル\"%s\"はUNLOGGEDテーブル\"%s\"を参照しているためLOGGEDには設定できません"
 
-#: commands/tablecmds.c:18811
+#: commands/tablecmds.c:18909
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr "テーブル\"%s\"はLOGGEDテーブル\"%s\"を参照しているためUNLOGGEDには設定できません"
 
-#: commands/tablecmds.c:18875
+#: commands/tablecmds.c:18973
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "所有するシーケンスを他のスキーマに移動することができません"
 
-#: commands/tablecmds.c:18983
+#: commands/tablecmds.c:19081
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "リレーション\"%s\"はスキーマ\"%s\"内にすでに存在します"
 
-#: commands/tablecmds.c:19408
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\"はテーブルや実体化ビューではありません"
 
-#: commands/tablecmds.c:19561
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\"は複合型ではありません"
 
-#: commands/tablecmds.c:19591
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "インデックス\"%s\"のスキーマを変更できません"
 
-#: commands/tablecmds.c:19593 commands/tablecmds.c:19607
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "代わりにこのテーブルのスキーマを変更してください。"
 
-#: commands/tablecmds.c:19597
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "複合型%sのスキーマは変更できません"
 
-#: commands/tablecmds.c:19605
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "TOASTテーブル\"%s\"のスキーマは変更できません"
 
-#: commands/tablecmds.c:19637
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "\"list\"パーティションストラテジは2つ以上の列に対しては使えません"
 
-#: commands/tablecmds.c:19703
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "パーティションキーに指定されている列\"%s\"は存在しません"
 
-#: commands/tablecmds.c:19711
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "パーティションキーでシステム列\"%s\"は使用できません"
 
-#: commands/tablecmds.c:19725 commands/tablecmds.c:19818
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "パーティションキーで生成カラムは使用できません"
 
-#: commands/tablecmds.c:19798
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "パーティションキー式はシステム列への参照を含むことができません"
 
-#: commands/tablecmds.c:19848
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "パーティションキー式で使われる関数はIMMUTABLE指定されている必要があります"
 
-#: commands/tablecmds.c:19857
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "定数式をパーティションキーとして使うことはできません"
 
-#: commands/tablecmds.c:19878
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "パーティション式で使用する照合順序を特定できませんでした"
 
-#: commands/tablecmds.c:19913
+#: commands/tablecmds.c:20021
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr "ハッシュ演算子クラスを指定するか、もしくはこのデータ型にデフォルトのハッシュ演算子クラスを定義する必要があります。"
 
-#: commands/tablecmds.c:19919
+#: commands/tablecmds.c:20027
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr "btree演算子クラスを指定するか、もしくはこのデータ型にデフォルトのbtree演算子クラスを定義するかする必要があります。"
 
-#: commands/tablecmds.c:20179
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\"はすでパーティションです"
 
-#: commands/tablecmds.c:20185
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "型付けされたテーブルをパーティションにアタッチすることはできません"
 
-#: commands/tablecmds.c:20201
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "継承子テーブルをパーティションにアタッチすることはできません"
 
-#: commands/tablecmds.c:20215
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "継承親テーブルをパーティションにアタッチすることはできません"
 
-#: commands/tablecmds.c:20249
+#: commands/tablecmds.c:20357
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "一時リレーションを永続リレーション \"%s\" のパーティション子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:20257
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "永続リレーションを一時リレーション\"%s\"のパーティション子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:20265
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "他セッションの一時リレーションのパーティション子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:20272
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "他セッションの一時リレーションにパーティション子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:20292
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "アタッチ対象のテーブル\"%s\"には識別列\"%s\"が含まれています"
 
-#: commands/tablecmds.c:20294
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "新しいパーティションは識別列を含むことはできません"
 
-#: commands/tablecmds.c:20302
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "テーブル\"%1$s\"は親テーブル\"%3$s\"にない列\"%2$s\"を含んでいます"
 
-#: commands/tablecmds.c:20305
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "新しいパーティションは親に存在する列のみを含むことができます。"
 
-#: commands/tablecmds.c:20317
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "トリガ\"%s\"のため、テーブル\"%s\"はパーティション子テーブルにはなれません"
 
-#: commands/tablecmds.c:20319
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "遷移テーブルを使用するROWトリガはパーティションではサポートされません。"
 
-#: commands/tablecmds.c:20501
+#: commands/tablecmds.c:20609
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "外部テーブル\"%s\"はパーティションテーブル\"%s\"の子テーブルとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:20504
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "パーティション親テーブル\"%s\"はユニークインデックスを持っています。"
 
-#: commands/tablecmds.c:20827
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "デフォルトパーティションを持つパーティションは並列的に取り外しはできません"
 
-#: commands/tablecmds.c:20936
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "パーティション親テーブル\"%s\"には CREATE INDEX CONCURRENTLY は実行できません"
 
-#: commands/tablecmds.c:20942
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "パーティション子テーブル\\\"%s\\\"は同時に削除されました"
 
-#: commands/tablecmds.c:21565 commands/tablecmds.c:21585 commands/tablecmds.c:21606 commands/tablecmds.c:21625 commands/tablecmds.c:21674
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705 commands/tablecmds.c:21726 commands/tablecmds.c:21745 commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "インデックス\"%s\"をインデックス\"%s\"の子インデックスとしてアタッチすることはできません"
 
-#: commands/tablecmds.c:21568
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "インデックス\"%s\"はすでに別のインデックスにアタッチされています。"
 
-#: commands/tablecmds.c:21588
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "インデックス\"%s\"はテーブル\"%s\"のどの子テーブルのインデックスでもありません。"
 
-#: commands/tablecmds.c:21609
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "インデックス定義が合致しません。"
 
-#: commands/tablecmds.c:21628
+#: commands/tablecmds.c:21748
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr "インデックス\"%s\"はテーブル\"%s\"の制約に属していますが、インデックス\"%s\"には制約がありません。"
 
-#: commands/tablecmds.c:21677
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "子テーブル\"%s\"にはすでに他のインデックスがアタッチされています。"
 
-#: commands/tablecmds.c:21800
+#: commands/tablecmds.c:21920
 #, c-format
 msgid "invalid primary key definition"
 msgstr "不正な主キー定義"
 
-#: commands/tablecmds.c:21801
+#: commands/tablecmds.c:21921
 #, c-format
 msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
 msgstr "リレーション\"%2$s\"の列\"%1$s\"は非NULLに設定されていません。"
 
-#: commands/tablecmds.c:21936
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "列データ型%sは圧縮をサポートしていません"
 
-#: commands/tablecmds.c:21943
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "無効な圧縮方式\"%s\""
 
-#: commands/tablecmds.c:21969
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "不正な格納タイプ\"%s\""
 
-#: commands/tablecmds.c:21979
+#: commands/tablecmds.c:22099
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "列のデータ型%sは格納タイプPLAINしか取ることができません"
@@ -11863,272 +11924,277 @@ msgstr "テーブル空間%u用のディレクトリを削除することがで
 msgid "You can remove the directories manually if necessary."
 msgstr "必要ならば手作業でこのディレクトリを削除することができます"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\"はテーブルです"
 
-#: commands/trigger.c:229 commands/trigger.c:240
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "テーブルは INSTEAD OF トリガーを持つことができません"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\"はパーティション親テーブルです"
 
-#: commands/trigger.c:263
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "遷移テーブルを使用するROWトリガはパーティション親テーブルではサポートされません。"
 
-#: commands/trigger.c:275 commands/trigger.c:282 commands/trigger.c:446
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\"はビューです"
 
-#: commands/trigger.c:277
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "ビューは行レベルの BEFORE / AFTER トリガーを持つことができません"
 
-#: commands/trigger.c:284
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "ビューは TRUNCATE トリガーを持つことができません"
 
-#: commands/trigger.c:292 commands/trigger.c:304 commands/trigger.c:439
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\"は外部テーブルです"
 
-#: commands/trigger.c:294
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "外部テーブルは INSTEAD OF トリガを持つことができません。"
 
-#: commands/trigger.c:306
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "外部テーブルは制約トリガを持つことができません。"
 
-#: commands/trigger.c:311 commands/trigger.c:1330 commands/trigger.c:1437
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "リレーション\"%s\"にはトリガーを設定できません"
 
-#: commands/trigger.c:382
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW トリガはサポートされていません"
 
-#: commands/trigger.c:390
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF トリガーは FOR EACH ROW でなければなりません"
 
-#: commands/trigger.c:394
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF トリガーは WHEN 条件を持つことができません"
 
-#: commands/trigger.c:398
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF トリガーは列リストを持つことができません"
 
-#: commands/trigger.c:427
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "REFERENCING句でのROW変数の命名はサポートされていません"
 
-#: commands/trigger.c:428
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "遷移テーブルを指定するには OLD　TABLE または NEW TABLE を使ってください"
 
-#: commands/trigger.c:441
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "外部テーブルに対するトリガは遷移テーブルを持てません。"
 
-#: commands/trigger.c:448
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "ビューに対するトリガは遷移テーブルを持てません。"
 
-#: commands/trigger.c:464
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "遷移テーブルを使用するROWトリガはパーティションではサポートされません"
 
-#: commands/trigger.c:468
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "遷移テーブルをもったROWトリガは継承子テーブルではサポートされません"
 
-#: commands/trigger.c:474
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "遷移テーブル名はAFTERトリガでの指定可能です"
 
-#: commands/trigger.c:479
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "遷移テーブルを使用するTRUNCATEトリガはサポートされていません"
 
-#: commands/trigger.c:496
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "2つ以上のイベントに対するトリガには遷移テーブルは指定できません"
 
-#: commands/trigger.c:507
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "列リストを指定したトリガに対しては遷移テーブルは指定できません"
 
-#: commands/trigger.c:524
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE はINSERTまたはUPDATEトリガに対してのみ指定可能です"
 
-#: commands/trigger.c:529
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE は複数回指定できません"
 
-#: commands/trigger.c:539
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE はDELETEまたはUPDATEトリガに対してのみ指定可能です"
 
-#: commands/trigger.c:544
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE は複数回指定できません"
 
-#: commands/trigger.c:554
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "OLD TABLE の名前と NEW TABLE の名前は同じにはできません"
 
-#: commands/trigger.c:618 commands/trigger.c:631
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "ステートメントトリガーの WHEN 条件では列の値を参照できません"
 
-#: commands/trigger.c:623
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "INSERT トリガーの WHEN 条件では OLD 値を参照できません"
 
-#: commands/trigger.c:636
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "DELETE トリガーの WHEN 条件では NEW 値を参照できません"
 
-#: commands/trigger.c:641
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "BEFORE トリガーの WHEN 条件では NEW システム列を参照できません"
 
-#: commands/trigger.c:650 commands/trigger.c:658
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "BEFORE トリガーの WHEN 条件では NEW の生成列を参照できません"
 
-#: commands/trigger.c:651
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr "行全体参照が使われていてかつ、このテーブルは生成カラムを含んでいます。"
 
-#: commands/trigger.c:766 commands/trigger.c:1613
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "リレーション\"%2$s\"用のトリガ\"%1$s\"はすでに存在します"
 
-#: commands/trigger.c:779
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "リレーション\"%2$s\"のトリガー\"%1$s\"は内部トリガーまたは子トリガーです"
 
-#: commands/trigger.c:798
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "リレーション\"%2$s\"のトリガー\"%1$s\"は制約トリガーです"
 
-#: commands/trigger.c:1402 commands/trigger.c:1556 commands/trigger.c:1837
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "テーブル\"%2$s\"のトリガ\"%1$s\"は存在しません"
 
-#: commands/trigger.c:1528
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "テーブル\"%2$s\"のトリガー\"%1$s\"の名前は変更できません"
 
-#: commands/trigger.c:1530
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "代わりにパーティション親テーブル\"%s\"でこのトリガーの名前を変更してください。"
 
-#: commands/trigger.c:1630
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "リレーション\"%2$s\"のトリガー\"%1$s\"の名前を変更しました"
 
-#: commands/trigger.c:1776
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "権限がありません: \"%s\"はシステムトリガです"
 
-#: commands/trigger.c:2385
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "トリガ関数%uはNULL値を返しました"
 
-#: commands/trigger.c:2445 commands/trigger.c:2665 commands/trigger.c:2918 commands/trigger.c:3273
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949 commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "BEFORE STATEMENTトリガは値を返すことができません"
 
-#: commands/trigger.c:2523
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "BEFORE FOR EACH ROWトリガの実行では、他のパーティションへの行の移動はサポートされていません"
 
-#: commands/trigger.c:2524
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "トリガ\"%s\"の実行前には、この行はパーティション\"%s.%s\"に置かれるはずでした。"
 
-#: commands/trigger.c:3351 executor/nodeModifyTable.c:1665 executor/nodeModifyTable.c:1739 executor/nodeModifyTable.c:2546 executor/nodeModifyTable.c:2636 executor/nodeModifyTable.c:3308 executor/nodeModifyTable.c:3478
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "外部子テーブルからは遷移タプルを収集できません"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687 executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569 executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322 executor/nodeModifyTable.c:3514
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "他の行への変更を伝搬させるためにBEFOREトリガではなくAFTERトリガの使用を検討してください"
 
-#: commands/trigger.c:3392 executor/nodeLockRows.c:228 executor/nodeLockRows.c:237 executor/nodeModifyTable.c:368 executor/nodeModifyTable.c:1681 executor/nodeModifyTable.c:2562 executor/nodeModifyTable.c:2787
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228 executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389 executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585 executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "更新が同時に行われたためアクセスの直列化ができませんでした"
 
-#: commands/trigger.c:3400 executor/nodeModifyTable.c:1771 executor/nodeModifyTable.c:2653 executor/nodeModifyTable.c:2811 executor/nodeModifyTable.c:3326
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793 executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826 executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "削除が同時に行われたためアクセスの直列化ができませんでした"
 
-#: commands/trigger.c:4635
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "セキュリティー制限操作中は、遅延トリガーは発火させられません"
 
-#: commands/trigger.c:5831
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "制約\"%s\"は遅延可能ではありません"
 
-#: commands/trigger.c:5854
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "制約\"%s\"は存在しません"
@@ -12238,7 +12304,7 @@ msgstr "基本型を作成するにはスーパーユーザーである必要が
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr "最初に型をシェル型として生成して、続いてI/O関数を生成した後に完全な CREATE TYPE を実行してください。"
 
-#: commands/typecmds.c:331 commands/typecmds.c:1486 commands/typecmds.c:4471
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "型の属性\"%s\"は不明です"
@@ -12258,7 +12324,7 @@ msgstr "%sを配列要素の型にすることはできません"
 msgid "alignment \"%s\" not recognized"
 msgstr "アライメント\"%s\"は不明です"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4345
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "格納方式\"%s\"は不明です"
@@ -12293,342 +12359,347 @@ msgstr "\"%s\"はドメインの基本型として無効です"
 msgid "multiple default expressions"
 msgstr "デフォルト式が複数あります"
 
-#: commands/typecmds.c:945 commands/typecmds.c:960
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "NULL制約とNOT NULL制約が競合しています"
 
-#: commands/typecmds.c:950
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "重複した非NULL制約定義"
+
+#: commands/typecmds.c:958
 #, c-format
 msgid "not-null constraints for domains cannot be marked NO INHERIT"
 msgstr "ドメインに対する非NULL制約はNO INHERIT指定できません"
 
-#: commands/typecmds.c:977
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "ドメインに対する検査制約はNO INHERITとマークすることができません"
 
-#: commands/typecmds.c:988
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "ドメインでは一意性制約は使用できません"
 
-#: commands/typecmds.c:995
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "ドメインではプライマリキー制約はできません"
 
-#: commands/typecmds.c:1002
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "ドメインでは排除制約は使用できません"
 
-#: commands/typecmds.c:1009
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "ドメイン用の外部キー制約はできません"
 
-#: commands/typecmds.c:1019
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "ドメインでは制約遅延の指定はサポートしていません"
 
-#: commands/typecmds.c:1027
+#: commands/typecmds.c:1035
 #, c-format
 msgid "specifying GENERATED not supported for domains"
 msgstr "ドメインではGENERATEDの指定はサポートしていません"
 
-#: commands/typecmds.c:1035
+#: commands/typecmds.c:1043
 #, c-format
 msgid "specifying constraint enforceability not supported for domains"
 msgstr "ドメインでは制約の強制性指定はサポートしていません"
 
-#: commands/typecmds.c:1353 utils/cache/typcache.c:2745
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s は数値ではありません"
 
-#: commands/typecmds.c:1494
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "型の属性\"subtype\"が必要です"
 
-#: commands/typecmds.c:1499
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "範囲の派生元型を%sにすることはできません"
 
-#: commands/typecmds.c:1518
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr "範囲の照合順序が指定されましたが、派生もと型が照合順序をサポートしていません"
 
-#: commands/typecmds.c:1528
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "事前にシェル型を生成せずに正規化関数を指定することはできません"
 
-#: commands/typecmds.c:1529
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr "最初に型をシェル型として生成して、続いて正規化関数を生成した後に完全な CREATE TYPE を実行してください。"
 
-#: commands/typecmds.c:2005
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "型の入力関数%sが複数合致します"
 
-#: commands/typecmds.c:2023
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "型の入力関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2039
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "型の入力関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2067
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "型の出力関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2074
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "型の出力関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2103
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "型の受信関数 %s が複数合致しました"
 
-#: commands/typecmds.c:2121
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "型の受信関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2128
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "型の受信関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2156
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "型の送信関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2163
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "型の送信関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2190
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "typmod_in関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2197
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "型修正子の入力関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2224
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "typmod_out関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2231
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "型修正子の出力関数%sはvolatileであってはなりません"
 
-#: commands/typecmds.c:2258
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "型のANALYZE関数%sは%s型を返す必要があります"
 
-#: commands/typecmds.c:2287
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "型の添字処理関数%sは型%sを返す必要があります"
 
-#: commands/typecmds.c:2297
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "ユーザー定義型は添字処理関数%sを使用できません"
 
-#: commands/typecmds.c:2343
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr "この範囲型に演算子クラスを指定するか、派生元の型でデフォルト演算子クラスを定義する必要があります。"
 
-#: commands/typecmds.c:2374
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "範囲の正規化関数 %s は範囲型を返す必要があります"
 
-#: commands/typecmds.c:2380
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "範囲の正規化関数 %s は不変関数でなければなりません"
 
-#: commands/typecmds.c:2416
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "範囲の派生元の型の差分関数 %s は %s型を返す必要があります"
 
-#: commands/typecmds.c:2423
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "範囲の派生元の型の差分関数 %s は不変関数である必要があります"
 
-#: commands/typecmds.c:2450
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_typeの配列型OIDが設定されていません"
 
-#: commands/typecmds.c:2483
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_typeの複範囲型OIDの値が設定されていません"
 
-#: commands/typecmds.c:2516
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_typeの複範囲配列型OIDの値が設定されていません"
 
-#: commands/typecmds.c:2898 commands/typecmds.c:3080
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "ドメイン\"%2$s\"の制約\"%1$s\"は存在しません"
 
-#: commands/typecmds.c:2902
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "ドメイン\"%2$s\"の制約\"%1$s\"は存在しません、スキップします"
 
-#: commands/typecmds.c:3087
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "ドメイン\"%2$s\"の制約\"%1$s\"は検査制約ではありません"
 
-#: commands/typecmds.c:3167
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "テーブル\"%2$s\"の列\"%1$s\"にNULL値があります"
 
-#: commands/typecmds.c:3256
+#: commands/typecmds.c:3264
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "テーブル\"%2$s\"の列\"%1$s\"に新しい制約に違反する値があります"
 
-#: commands/typecmds.c:3485 commands/typecmds.c:3763 commands/typecmds.c:3848 commands/typecmds.c:4064
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856 commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s はドメインではありません"
 
-#: commands/typecmds.c:3519 commands/typecmds.c:3675
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "ドメイン\"%2$s\"の制約\"%1$s\"はすでに存在します"
 
-#: commands/typecmds.c:3570
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "ドメインの検査制約ではテーブル参照を使用できません"
 
-#: commands/typecmds.c:3775 commands/typecmds.c:3860 commands/typecmds.c:4214
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%sはテーブルの行型です"
 
-#: commands/typecmds.c:3785 commands/typecmds.c:3870 commands/typecmds.c:4112
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "配列型%sを変更できません"
 
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4114
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "型%sを変更することができます。これは同時にその配列型も変更します。"
 
-#: commands/typecmds.c:3883
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "複範囲型%sを変更できません"
 
-#: commands/typecmds.c:3886
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "型%sを変更することができます。これは同時にその複範囲型も変更します。"
 
-#: commands/typecmds.c:4193
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "型\"%s\"はスキーマ\"%s\"内にすでに存在します"
 
-#: commands/typecmds.c:4373
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "型の格納方式をPLAINには変更できません"
 
-#: commands/typecmds.c:4466
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "型の属性\"%s\"は変更できません"
 
-#: commands/typecmds.c:4484
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "型の変更を行うにはスーパーユーザーである必要があります"
 
-#: commands/typecmds.c:4505 commands/typecmds.c:4514
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "\"%s\"は基本型ではありません"
 
-#: commands/user.c:201
+#: commands/user.c:200
 #, c-format
 msgid "SYSID can no longer be specified"
 msgstr "SYSIDはもう指定することができません"
 
-#: commands/user.c:319 commands/user.c:325 commands/user.c:331 commands/user.c:337 commands/user.c:343
+#: commands/user.c:318 commands/user.c:324 commands/user.c:330 commands/user.c:336 commands/user.c:342
 #, c-format
 msgid "permission denied to create role"
 msgstr "ロールを作成する権限がありません"
 
-#: commands/user.c:320
+#: commands/user.c:319
 #, c-format
 msgid "Only roles with the %s attribute may create roles."
 msgstr "%s属性を持つロールのみがロールを作成できます。"
 
-#: commands/user.c:326 commands/user.c:332 commands/user.c:338 commands/user.c:344
+#: commands/user.c:325 commands/user.c:331 commands/user.c:337 commands/user.c:343
 #, c-format
 msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "%s属性を持つロールのみが%s属性を持つロールを作成できます。"
 
-#: commands/user.c:355 commands/user.c:1386 commands/user.c:1393 gram.y:17493 gram.y:17539 utils/adt/acl.c:5690 utils/adt/acl.c:5696
+#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17473 gram.y:17519 utils/adt/acl.c:5707 utils/adt/acl.c:5713
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "ロール名\"%s\"は予約されています"
 
-#: commands/user.c:357 commands/user.c:1388 commands/user.c:1395
+#: commands/user.c:356 commands/user.c:1388 commands/user.c:1395
 #, c-format
 msgid "Role names starting with \"pg_\" are reserved."
 msgstr "\"pg_\"で始まるロール名は予約されています。"
 
-#: commands/user.c:378 commands/user.c:1410
+#: commands/user.c:377 commands/user.c:1410
 #, c-format
 msgid "role \"%s\" already exists"
 msgstr "ロール\"%s\"はすでに存在します"
 
-#: commands/user.c:440 commands/user.c:924
+#: commands/user.c:439 commands/user.c:924
 #, c-format
 msgid "empty string is not a valid password, clearing password"
 msgstr "空の文字列はパスワードとして使えません、パスワードを消去します"
 
-#: commands/user.c:469
+#: commands/user.c:468
 #, c-format
 msgid "pg_authid OID value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にpg_authidのOIDが設定されていません"
@@ -12697,7 +12768,7 @@ msgstr "%s属性および削除対象ロールに対する%sオプションを
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "DROP ROLE で特殊ロールの識別子は使えません"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864 commands/variable.c:867 commands/variable.c:983 commands/variable.c:986 utils/adt/acl.c:366 utils/adt/acl.c:386 utils/adt/acl.c:5545 utils/adt/acl.c:5593 utils/adt/acl.c:5621 utils/adt/acl.c:5640 utils/adt/regproc.c:1571 utils/init/miscinit.c:804
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864 commands/variable.c:867 commands/variable.c:983 commands/variable.c:986 utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562 utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657 utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "ロール\"%s\"は存在しません"
@@ -12762,7 +12833,7 @@ msgstr "%1$s属性とロール\"%3$s\"に対する%2$sオプションを持つ
 msgid "MD5 password cleared because of role rename"
 msgstr "ロール名が変更されたためMD5パスワードがクリアされました"
 
-#: commands/user.c:1518 gram.y:1286
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "ロールオプション\"%s\"が認識できません"
@@ -12822,192 +12893,182 @@ msgstr "%sオプションはもとの付与者に付与し返すことはでき
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "ロール\"%s\"はすでにロール\"%s\"のメンバ権限をロール\"%s\"によって付与されています"
 
-#: commands/user.c:2036
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "ロール\"%s\"はロール\"%s\"のメンバ権限をロール\"%s\"によって付与されていません"
 
-#: commands/user.c:2137
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "ロール\"%s\"は明示的なメンバーを持てません"
 
-#: commands/user.c:2148 commands/user.c:2171
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "ロール\"%s\"権限を付与する権限がありません"
 
-#: commands/user.c:2150
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "%s属性を持つロールのみが%s属性を持つロールの権限を付与できます。"
 
-#: commands/user.c:2155 commands/user.c:2178
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "ロール\"%s\"の権限を剥奪する権限がありません"
 
-#: commands/user.c:2157
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "%s属性を持つロールのみが%s属性を持つロールの権限を剥奪できます。"
 
-#: commands/user.c:2173
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "ロール\"%2$s\"に対する%1$sオプションを持つロールのみがこのロール権限を付与できます。"
 
-#: commands/user.c:2180
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "ロール\"%2$s\"に対する%1$sオプションを持つロールのみがこのロール権限を剥奪できます。"
 
-#: commands/user.c:2260 commands/user.c:2269
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "ロール\"%s\"として権限を付与する権限がありません"
 
-#: commands/user.c:2262
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "ロール\"%s\"の権限を持つロールのみがこのロールとして権限を付与できます。"
 
-#: commands/user.c:2271
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "付与者はロール\"%s\"に対する%sオプションを持つ必要があります。"
 
-#: commands/user.c:2279
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "ロール\"%s\"によって付与された権限を剥奪する権限がありません"
 
-#: commands/user.c:2281
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "ロール\"%s\"の権限を持つロールのみがこのロールが付与した権限を剥奪できます。"
 
-#: commands/user.c:2504 utils/adt/acl.c:1325
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "依存する権限が存在します"
 
-#: commands/user.c:2505 utils/adt/acl.c:1326
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "これらも剥奪するにはCASCADEを使用してください"
 
-#: commands/vacuum.c:146
+#: commands/vacuum.c:148
 #, c-format
 msgid "\"%s\" must be 0 or between %d kB and %d kB."
 msgstr "\"%s\"は0または%d kBと%d kBとの間でなければなりません。"
 
-#: commands/vacuum.c:222
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "BUFFER_USAGE_LIMITオプションは0または%d kBと%d kBの間でなければなりません"
 
-#: commands/vacuum.c:232
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "ANALYZEオプション\"%s\"が認識できません"
-
-#: commands/vacuum.c:272
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "パラレルオプションには0から%dまでの値である必要があります"
 
-#: commands/vacuum.c:284
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "VACUUMの並列ワーカーの数はは0から%dまでの値でなければなりません"
 
-#: commands/vacuum.c:305
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "認識できないVACUUMオプション \"%s\""
-
-#: commands/vacuum.c:331
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULLは並列実行できません"
 
-#: commands/vacuum.c:342
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "BUFFER_USAGE_LIMITはVACUUM FULLに対しては指定できません"
 
-#: commands/vacuum.c:356
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "ANALYZE オプションは列リストが与えられているときのみ指定できます"
 
-#: commands/vacuum.c:368
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "VACUUM のオプションDISABLE_PAGE_SKIPPINGはFULLと同時には指定できません"
 
-#: commands/vacuum.c:375
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "VACUUM FULLではPROCESS_TOASTの指定が必須です"
 
-#: commands/vacuum.c:384
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATSはテーブルのリストと一緒に指定することはできません"
 
-#: commands/vacuum.c:393
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATSは他のVACUUMオプションと一緒に指定することはできません"
 
-#: commands/vacuum.c:533
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%sはVACUUMやANALYZEからは実行できません"
 
-#: commands/vacuum.c:745
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "列%sのVACUUMを行う権限がありません、スキップします"
 
-#: commands/vacuum.c:758
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "列%sのANALYZEを行う権限がありません、スキップします"
 
-#: commands/vacuum.c:836 commands/vacuum.c:937
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "\"%s\"のVACUUM処理をスキップしています -- ロックを獲得できませんでした"
 
-#: commands/vacuum.c:841
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "\"%s\"のVACUUM処理をスキップしています -- リレーションはすでに存在しません"
 
-#: commands/vacuum.c:857 commands/vacuum.c:942
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "\"%s\"のANALYZEをスキップしています --- ロック獲得できませんでした"
 
-#: commands/vacuum.c:862
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "\"%s\"のANALYZEをスキップします --- リレーションはすでに存在しません"
 
-#: commands/vacuum.c:978
+#: commands/vacuum.c:992
 #, c-format
 msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
 msgstr "パーティション親テーブル\"%s\"に対する VACUUM ONLY は効果がありません"
 
-#: commands/vacuum.c:1169
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "タプルの削除およびフリーズのカットオフ値が古すぎます"
 
-#: commands/vacuum.c:1170 commands/vacuum.c:1175
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -13016,37 +13077,37 @@ msgstr ""
 "周回問題を回避するためにすぐに実行中のトランザクションを終了してください。\n"
 "古い準備済みトランザクションのコミットまたはロールバック、もしくは古いレプリケーションスロットの削除が必要な場合もあります。"
 
-#: commands/vacuum.c:1174
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "マルチトランザクションのフリーズのカットオフ値が古すぎます"
 
-#: commands/vacuum.c:1936
+#: commands/vacuum.c:1950
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "データベースの一部は20億トランザクション以上の間にVACUUMを実行されていませんでした"
 
-#: commands/vacuum.c:1937
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "トランザクションの周回によるデータ損失が発生している可能性があります"
 
-#: commands/vacuum.c:2116
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "\"%s\"をスキップしています --- テーブルではないものや、特別なシステムテーブルに対してはVACUUMを実行できません"
 
-#: commands/vacuum.c:2617
+#: commands/vacuum.c:2659
 #, c-format
 msgid "scanned index \"%s\" to remove %<PRId64> row versions"
 msgstr "インデックス\"%s\"をスキャンして%<PRId64>の行バージョンを削除しました"
 
-#: commands/vacuum.c:2636
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "現在インデックス\"%s\"は%.0f行バージョンを%uページで含んでいます"
 
-#: commands/vacuum.c:2640
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -13179,12 +13240,12 @@ msgstr "ロール\"%s\"を設定する権限がありません"
 msgid "permission denied to set role \"%s\""
 msgstr "ロール\"%s\"を設定する権限がありません"
 
-#: commands/variable.c:1228
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "このビルドでは bonjour はサポートされていません"
 
-#: commands/variable.c:1256
+#: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "このインストレーションではSSLはサポートされていません"
@@ -13284,27 +13345,27 @@ msgstr "パラメータの型%d(%s)が実行計画(%s)を準備する時点と
 msgid "no value found for parameter %d"
 msgstr "パラメータ%dの値がありません"
 
-#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680 executor/execExprInterp.c:5440 executor/execExprInterp.c:5457 executor/execExprInterp.c:5556 executor/nodeModifyTable.c:210 executor/nodeModifyTable.c:221 executor/nodeModifyTable.c:238 executor/nodeModifyTable.c:246
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680 executor/execExprInterp.c:5439 executor/execExprInterp.c:5456 executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211 executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247 executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "テーブルの行型と問い合わせで指定した行型が一致しません"
 
-#: executor/execExpr.c:668 executor/nodeModifyTable.c:211
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "問い合わせの列が多すぎます"
 
-#: executor/execExpr.c:675 executor/nodeModifyTable.c:239
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "問い合わせで %d 番目に削除される列の値を指定しています。"
 
-#: executor/execExpr.c:681 executor/execExprInterp.c:5458 executor/nodeModifyTable.c:222
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457 executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "テーブルでは %2$d 番目の型は %1$s ですが、問い合わせでは %3$s を想定しています。"
 
-#: executor/execExpr.c:1157 parser/parse_agg.c:843
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "ウィンドウ関数の呼び出しを入れ子にすることはできません"
@@ -13325,17 +13386,17 @@ msgid "cannot pass more than %d argument to a function"
 msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "関数に%dを超える引数を渡せません"
 
-#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1474 utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604 utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "このコンテキストで集合値の関数は集合を受け付けられません"
 
-#: executor/execExpr.c:3262 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr "添字をサポートしないため、型%sには添字をつけられません"
 
-#: executor/execExpr.c:3390 executor/execExpr.c:3412
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "型%sは添字を使った代入をサポートしません"
@@ -13375,7 +13436,7 @@ msgstr "互換性がない配列をマージできません"
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "要素型%sの配列を要素型%sのARRAY式に含められません"
 
-#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305 utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5605 utils/adt/arrayfuncs.c:6124 utils/adt/arraysubs.c:151 utils/adt/arraysubs.c:489
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305 utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5611 utils/adt/arrayfuncs.c:6130 utils/adt/arraysubs.c:151 utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "配列の次数(%d)が上限(%d)を超えています"
@@ -13385,8 +13446,8 @@ msgstr "配列の次数(%d)が上限(%d)を超えています"
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "多次元配列の配列式の次数があっていなければなりません"
 
-#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274 utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494 utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533 utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356 utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634 utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949 utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305 utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5377
-#: utils/adt/arrayfuncs.c:6216 utils/adt/arrayfuncs.c:6560 utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92 utils/adt/arrayutils.c:99
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274 utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494 utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533 utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356 utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634 utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949 utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305 utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5383
+#: utils/adt/arrayfuncs.c:6222 utils/adt/arrayfuncs.c:6566 utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92 utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "配列の次数が上限(%d)を超えています"
@@ -13422,13 +13483,13 @@ msgstr "指定されたパスに対応するSQL/JSON項目が見つかりませ
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "%s式(%s)をRETURNING型に強制変換できませんでした"
 
-#: executor/execExprInterp.c:5441
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "テーブル行には%d属性ありますが、問い合わせでは%dを想定しています。"
 
-#: executor/execExprInterp.c:5557 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "序数位置%dの削除された属性における物理格納形式が一致しません。"
@@ -13473,147 +13534,147 @@ msgstr "キーが既存のキーと衝突しています"
 msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
 msgstr "リレーション\"%2$s\"の列\"%1$s\"に空のWITHOUT OVERLAPS値が見つかりました"
 
-#: executor/execMain.c:1171
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "シーケンス\"%s\"を変更できません"
 
-#: executor/execMain.c:1177
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "TOASTリレーション\"%s\"を変更できません"
 
-#: executor/execMain.c:1196
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "実体化ビュー\"%s\"を変更できません"
 
-#: executor/execMain.c:1208
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "外部テーブル\"%s\"への挿入ができません"
 
-#: executor/execMain.c:1214
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "外部テーブル\"%s\"は挿入を許しません"
 
-#: executor/execMain.c:1221
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "外部テーブル \"%s\"の更新ができません"
 
-#: executor/execMain.c:1227
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "外部テーブル\"%s\"は更新を許しません"
 
-#: executor/execMain.c:1234
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "外部テーブル\"%s\"からの削除ができません"
 
-#: executor/execMain.c:1240
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "外部テーブル\"%s\"は削除を許しません"
 
-#: executor/execMain.c:1251
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "リレーション\"%s\"を変更できません"
 
-#: executor/execMain.c:1278
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "シーケンス\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:1285
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "TOAST リレーション\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:1292
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "ビュー\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:1300
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "実体化ビュー\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:1309 executor/execMain.c:2941 executor/nodeLockRows.c:135
+#: executor/execMain.c:1227 executor/execMain.c:2869 executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "外部テーブル\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:1315
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "リレーション\"%s\"では行のロックはできません"
 
-#: executor/execMain.c:2038
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "リレーション\"%s\"の新しい行はパーティション制約に違反しています"
 
-#: executor/execMain.c:2040 executor/execMain.c:2152 executor/execMain.c:2290 executor/execMain.c:2398
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218 executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "失敗した行は%sを含みます"
 
-#: executor/execMain.c:2150
+#: executor/execMain.c:2078
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "リレーション\"%s\"の新しい行は検査制約\"%s\"に違反しています"
 
-#: executor/execMain.c:2287
+#: executor/execMain.c:2215
 #, c-format
 msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
 msgstr "リレーション\"%2$s\"の列\"%1$s\"のNULL値が非NULL制約に違反しています"
 
-#: executor/execMain.c:2396
+#: executor/execMain.c:2324
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "新しい行はビュー\"%s\"のチェックオプションに違反しています"
 
-#: executor/execMain.c:2406
+#: executor/execMain.c:2334
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr "新しい行はテーブル\"%2$s\"行レベルセキュリティポリシ\"%1$s\"に違反しています"
 
-#: executor/execMain.c:2411
+#: executor/execMain.c:2339
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr "新しい行はテーブル\"%s\"の行レベルセキュリティポリシに違反しています"
 
-#: executor/execMain.c:2419
+#: executor/execMain.c:2347
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "ターゲットの行はテーブル\"%s\"の行レベルセキュリティポリシ\"%s\"(USING式)に違反しています"
 
-#: executor/execMain.c:2424
+#: executor/execMain.c:2352
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "ターゲットの行はテーブル\"%s\"の行レベルセキュリティポリシ(USING式)に違反しています"
 
-#: executor/execMain.c:2431
+#: executor/execMain.c:2359
 #, c-format
 msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "新しい行はテーブル\"%1$s\"の行レベルセキュリティポリシ\"%2$s\"(USING式)に違反しています"
 
-#: executor/execMain.c:2436
+#: executor/execMain.c:2364
 #, c-format
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "新しい行はテーブル\"%s\"の行レベルセキュリティポリシ(USING式)に違反しています"
 
-#: executor/execPartition.c:331
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "行に対応するパーティションがリレーション\"%s\"に見つかりません"
 
-#: executor/execPartition.c:334
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "失敗した行のパーティションキーは%sを含みます。"
@@ -13739,89 +13800,89 @@ msgstr "このタイプのタプルのトランザクション情報は持たな
 msgid "don't have a storage tuple in this context"
 msgstr "この文脈ではストレージタプルを保持しないでください"
 
-#: executor/execUtils.c:759
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "実体化ビュー\"%s\"にはデータが格納されていません"
 
-#: executor/functions.c:293
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "%sと宣言された引数の型を特定できませんでした"
 
-#: executor/functions.c:726
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "SQL関数の中ではCOPY文によるクライアントとの間の入出力はできません"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:732
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "SQL関数では%sは使用不可です"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:740 executor/spi.c:1746 executor/spi.c:2660
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "volatile関数以外では%sは許可されません"
 
-#: executor/functions.c:1135 executor/functions.c:2129 executor/functions.c:2167 executor/functions.c:2181 executor/functions.c:2271 executor/functions.c:2304 executor/functions.c:2318
+#: executor/functions.c:1185 executor/functions.c:2224 executor/functions.c:2262 executor/functions.c:2276 executor/functions.c:2366 executor/functions.c:2399 executor/functions.c:2413
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "%sを返すと宣言された関数において戻り値型が一致しません"
 
-#: executor/functions.c:1137 executor/functions.c:2131
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
 msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
 msgstr "関数中の最後の文はSELECTまたはINSERT/UPDATE/DELETE/MERGE RETURNING のいずれかである必要があります。"
 
-#: executor/functions.c:1220 utils/cache/plancache.c:869
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "キャッシュした実行計画は結果型を変更してはなりません"
 
-#: executor/functions.c:1822 executor/functions.c:1853
+#: executor/functions.c:1922 executor/functions.c:1953
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "SQL関数\"%s\"の起動中"
 
-#: executor/functions.c:1850
+#: executor/functions.c:1950
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "SQL関数\"%s\"の行番号 %d"
 
-#: executor/functions.c:1980
+#: executor/functions.c:2075
 #, c-format
 msgid "calling procedures with output arguments is not supported in SQL functions"
 msgstr "出力引数を持つプロシージャの呼び出しはSQL関数ではサポートされていません"
 
-#: executor/functions.c:2169
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "最後のステートメントはちょうど1列を返さなければなりません。"
 
-#: executor/functions.c:2183
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "実際の戻り値型は%sです。"
 
-#: executor/functions.c:2273
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "最後のステートメントが返す列が多すぎます。"
 
-#: executor/functions.c:2306
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "最後のステートメントが列%3$dで%2$sではなく%1$sを返しました。"
 
-#: executor/functions.c:2320
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "最後のステートメントが返す列が少なすぎます。"
 
-#: executor/functions.c:2348
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "戻り値型%sはSQL関数でサポートされていません"
@@ -13831,7 +13892,7 @@ msgstr "戻り値型%sはSQL関数でサポートされていません"
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "集約%uは入力データ型と遷移用の型間で互換性が必要です"
 
-#: executor/nodeAgg.c:4062 parser/parse_agg.c:685 parser/parse_agg.c:713
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "集約関数の呼び出しを入れ子にすることはできません"
@@ -13871,63 +13932,68 @@ msgstr "RIGHT JOINはマージ結合可能な結合条件でのみサポート
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOINはマージ結合可能な結合条件でのみサポートされています"
 
-#: executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "問い合わせで %d 番目に生成列の値を指定しています。"
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "問い合わせの列が少なすぎます。"
 
-#: executor/nodeModifyTable.c:1664 executor/nodeModifyTable.c:1738
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr "削除対象のタプルはすでに現在のコマンドによって引き起こされた操作によって変更されています"
 
-#: executor/nodeModifyTable.c:1937
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "不正な ON UPDATE 指定です"
 
-#: executor/nodeModifyTable.c:1938
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr "結果タプルをもとのパーティションではなく異なるパーティションに追加しようとしました。"
 
-#: executor/nodeModifyTable.c:2394
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr "ソースパーティションのルート以外の上位パーティションが外部キーで直接参照されている場合はパーティション間でタプルを移動させることができません"
 
-#: executor/nodeModifyTable.c:2395
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr "外部キーがパーティションルートテーブル\"%2$s\"ではなくパーティション親テーブル\"%1$s\"を指しています。"
 
-#: executor/nodeModifyTable.c:2398
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "テーブル\"%s\"上に外部キー制約を定義することを検討してください。"
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2765 executor/nodeModifyTable.c:3314 executor/nodeModifyTable.c:3484
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328 executor/nodeModifyTable.c:3520
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "%sコマンドは単一の行に2度は適用できません"
 
-#: executor/nodeModifyTable.c:2767
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "同じコマンドでの挿入候補の行が同じ制約値を持つことがないようにしてください"
 
-#: executor/nodeModifyTable.c:3307 executor/nodeModifyTable.c:3477
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3513
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "更新または削除対象のタプルは、現在のコマンドによって発火した操作トリガーによってすでに更新されています"
 
-#: executor/nodeModifyTable.c:3316 executor/nodeModifyTable.c:3486
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "ソース行が2行以上ターゲット行に合致しないようにしてください。"
 
-#: executor/nodeModifyTable.c:3385
+#: executor/nodeModifyTable.c:3399
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
 msgstr "マージ対象のタプルは同時に行われた更新によってすでに他の子テーブルに移動されています"
@@ -13942,7 +14008,7 @@ msgstr "TABLESAMPLEパラメータにnullは指定できません"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "TABLESAMPLE REPEATABLE パラメータにnullは指定できません"
 
-#: executor/nodeSubplan.c:317 executor/nodeSubplan.c:343 executor/nodeSubplan.c:397 executor/nodeSubplan.c:1182
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324 executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "式として使用された副問い合わせが2行以上の行を返しました"
@@ -14002,79 +14068,79 @@ msgstr "フレームの終了オフセットは負数であってはなりませ
 msgid "aggregate function %s does not support use as a window function"
 msgstr "集約関数 %s はウィンドウ関数としての使用をサポートしていません"
 
-#: executor/spi.c:242 executor/spi.c:342
+#: executor/spi.c:241 executor/spi.c:341
 #, c-format
 msgid "invalid transaction termination"
 msgstr "不正なトランザクション終了"
 
-#: executor/spi.c:257
+#: executor/spi.c:256
 #, c-format
 msgid "cannot commit while a subtransaction is active"
 msgstr "サブトランザクションの実行中はコミットできません"
 
-#: executor/spi.c:348
+#: executor/spi.c:347
 #, c-format
 msgid "cannot roll back while a subtransaction is active"
 msgstr "サブトランザクションの実行中はロールバックできません"
 
-#: executor/spi.c:472
+#: executor/spi.c:471
 #, c-format
 msgid "transaction left non-empty SPI stack"
 msgstr "トランザクションは空でないSPIスタックを残しました"
 
-#: executor/spi.c:473 executor/spi.c:533
+#: executor/spi.c:472 executor/spi.c:532
 #, c-format
 msgid "Check for missing \"SPI_finish\" calls."
 msgstr "\"SPI_finish\"呼出の抜けを確認ください"
 
-#: executor/spi.c:532
+#: executor/spi.c:531
 #, c-format
 msgid "subtransaction left non-empty SPI stack"
 msgstr "サブトランザクションが空でないSPIスタックを残しました"
 
-#: executor/spi.c:1603
+#: executor/spi.c:1602
 #, c-format
 msgid "cannot open multi-query plan as cursor"
 msgstr "カーソルにマルチクエリの実行計画を開くことができません"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1613
+#: executor/spi.c:1612
 #, c-format
 msgid "cannot open %s query as cursor"
 msgstr "カーソルで%s問い合わせを開くことができません"
 
-#: executor/spi.c:1720
+#: executor/spi.c:1718
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHAREはサポートされていません"
 
-#: executor/spi.c:1721 parser/analyze.c:3161
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "スクロール可能カーソルは読み取り専用である必要があります。"
 
-#: executor/spi.c:2498
+#: executor/spi.c:2496
 #, c-format
 msgid "empty query does not return tuples"
 msgstr "空の問い合わせは結果を返却しません"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:2573
+#: executor/spi.c:2570
 #, c-format
 msgid "%s query does not return tuples"
 msgstr "%s問い合わせがタプルを返しません"
 
-#: executor/spi.c:3004
+#: executor/spi.c:2987
 #, c-format
 msgid "PL/pgSQL expression \"%s\""
 msgstr "PL/pgSQL式 \"%s\""
 
-#: executor/spi.c:3009
+#: executor/spi.c:2992
 #, c-format
 msgid "PL/pgSQL assignment \"%s\""
 msgstr "PL/pgSQL代入\"%s\""
 
-#: executor/spi.c:3012
+#: executor/spi.c:2995
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "SQL文 \"%s\""
@@ -14084,415 +14150,425 @@ msgstr "SQL文 \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "共有メモリキューにタプルを送出できませんでした"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "ユーザー\"%s\"、サーバー\"%s\"に対するユーザーマッピングが見つかりません"
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7228 optimizer/util/plancat.c:538
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299 optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr "非システムの外部テーブルへのアクセスは制限されています"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "不正なオプション\"%s\""
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "おそらくオプション\"%s\"なのではないでしょうか。"
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "このコンテクストで有効なオプションはありません。"
 
-#: gram.y:1223
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD は今後サポートされません"
 
-#: gram.y:1224
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "UNENCRYPTED を削除してください。そうすれば替わりにパスワードを暗号化形式で格納します。"
 
-#: gram.y:1551 gram.y:1567
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTSにはスキーマ要素を含めることはできません"
 
-#: gram.y:1728
+#: gram.y:1727
 #, c-format
 msgid "current database cannot be changed"
 msgstr "現在のデータベースを変更できません"
 
-#: gram.y:1869
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "タイムゾーンの間隔はHOURまたはHOUR TO MINUTEでなければなりません"
 
-#: gram.y:2501
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "列番号は1から%dまでの範囲でなければなりません"
 
-#: gram.y:3120
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "制約をNOT VALIDに変更することはできません"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "シーケンスのオプション\"%s\"はここではサポートされていません"
 
-#: gram.y:3159
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "ハッシュパーティションで法(除数)が2回以上指定されています"
 
-#: gram.y:3168
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "ハッシュパーティションで剰余が2回以上指定されています"
 
-#: gram.y:3175
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "ハッシュパーティションの境界条件\"%s\"が認識できません"
 
-#: gram.y:3183
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "ハッシュパーティションでは法(除数)の指定が必要です"
 
-#: gram.y:3188
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "ハッシュパーティションでは剰余の指定が必要です"
 
-#: gram.y:3397 gram.y:3432
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUTはPROGRAMと同時に使用できません"
 
-#: gram.y:3403
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "COPY TO で WHERE 句は使用できません"
 
-#: gram.y:3752 gram.y:3759 gram.y:13184 gram.y:13192
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "一時テーブル作成におけるGLOBALは廃止予定です"
 
-#: gram.y:4041
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "生成カラムに対しては GENERATED ALWAYS の指定が必須です"
 
-#: gram.y:4450 utils/adt/ri_triggers.c:2259
+#: gram.y:4454 utils/adt/ri_triggers.c:2259
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MMATCH PARTIAL はまだ実装されていません"
 
-#: gram.y:4542
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "%sが指定された列リストはON DELETEのアクションに対してのみサポートされます"
 
-#: gram.y:5261
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM はすでにサポートされていません"
 
-#: gram.y:5959
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "認識できない行セキュリティオプション \"%s\""
 
-#: gram.y:5960
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "現時点ではPERMISSIVEもしくはRESTRICTIVEポリシのみがサポートされています"
 
-#: gram.y:6045
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGERはサポートされません"
 
-#: gram.y:6083
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "重複したトリガーイベントが指定されました"
 
-#: gram.y:6225 parser/parse_utilcmd.c:3925 parser/parse_utilcmd.c:3951
+#: gram.y:6229 parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "INITIALLY DEFERREDと宣言された制約はDEFERRABLEでなければなりません"
 
-#: gram.y:6233
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "制約属性の競合"
 
-#: gram.y:6334
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTIONはまだ実装されていません"
 
-#: gram.y:6652
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "列挙型の値の削除は実装されていません"
 
-#: gram.y:8632
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "集約は出力の引数を持つことができません"
 
-#: gram.y:9096 utils/adt/regproc.c:670
+#: gram.y:9100 utils/adt/regproc.c:670
 #, c-format
 msgid "missing argument"
 msgstr "引数が足りません"
 
-#: gram.y:9097 utils/adt/regproc.c:671
+#: gram.y:9101 utils/adt/regproc.c:671
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "単項演算子の存在しない引数を表すにはNONEを使用してください。"
 
-#: gram.y:11325 gram.y:11344
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTIONは再帰ビューではサポートされていません"
 
-#: gram.y:13331
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "LIMIT #,#構文は実装されていません"
 
-#: gram.y:13332
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "分割してLIMITとOFFSET句を使用してください"
 
-#: gram.y:14220
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "DEFAULT値は一つだけ指定可能です"
 
-#: gram.y:14229
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "列一つにつきPATH値は一つだけ指定可能です"
 
-#: gram.y:14238
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "列\"%s\"でNULL / NOT NULL宣言が衝突しているか重複しています"
 
-#: gram.y:14247
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "認識できない列オプション \"%s\""
 
-#: gram.y:14329
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "オプション名 \"%s\" は XMLTABLE の中では使用できません"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "JSON_TABLEパス指定では文字列定数のみがサポートされます"
 
-#: gram.y:14651
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "浮動小数点数の型の精度は最低でも1ビット必要です"
 
-#: gram.y:14660
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "浮動小数点型の精度は54ビットより低くなければなりません"
 
-#: gram.y:15177
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "OVERLAPS式の左辺のパラメータ数が間違っています"
 
-#: gram.y:15182
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "OVERLAPS式の右辺のパラメータ数が間違っています"
 
-#: gram.y:15359
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE 述部はまだ実装されていません"
 
-#: gram.y:15773
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "複数のORDER BY句はWITHIN GROUPと一緒には使用できません"
 
-#: gram.y:15778
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT は WITHIN GROUP と同時には使えません"
 
-#: gram.y:15783
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC は WITHIN GROUP と同時には使えません"
 
-#: gram.y:16510 gram.y:16534
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "フレームの開始は UNBOUNDED FOLLOWING であってはなりません"
 
-#: gram.y:16515
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "次の行から始まるフレームは、現在行では終了できません"
 
-#: gram.y:16539
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "フレームの終了は UNBOUNDED PRECEDING であってはなりません"
 
-#: gram.y:16545
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "現在行から始まるフレームは、先行する行を含むことができません"
 
-#: gram.y:16552
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "次の行から始まるフレームは、先行する行を含むことができません"
 
-#: gram.y:17101
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "不明なJSON符号化方式: \"%s\""
 
-#: gram.y:17426
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "型修正子はパラメータ名を持つことはできません"
 
-#: gram.y:17432
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "型修正子はORDER BYを持つことはできません"
 
-#: gram.y:17500 gram.y:17507 gram.y:17514
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%sはここではロール名として使用できません"
 
-#: gram.y:17604 gram.y:19135
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIESはORDER BY句なしでは指定できません"
 
-#: gram.y:18828 gram.y:19003
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "\"*\"の使い方が不適切です"
 
-#: gram.y:18966 gram.y:18983 tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999 tsearch/spell.c:1016 tsearch/spell.c:1082
+#: gram.y:18905 gram.y:18922 tsearch/spell.c:963 tsearch/spell.c:979 tsearch/spell.c:995 tsearch/spell.c:1011 tsearch/spell.c:1076
 #, c-format
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: gram.y:19067
+#: gram.y:19006
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "VARIADIC直接引数を使った順序集合集約は同じデータタイプのVARIADIC集約引数を一つ持つ必要があります"
 
-#: gram.y:19104
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "複数のORDER BY句は使用できません"
 
-#: gram.y:19115
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "複数のOFFSET句は使用できません"
 
-#: gram.y:19124
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "複数のLIMIT句は使用できません"
 
-#: gram.y:19160
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "複数の WITH 句は使用できません"
 
-#: gram.y:19358
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "テーブル関数では OUT と INOUT 引数は使用できません"
 
-#: gram.y:19492
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "複数の COLLATE 句は使用できません"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19532 gram.y:19545
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "%s制約は遅延可能にはできません"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19558
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "%s制約をNOT VALIDとマークすることはできません"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19571
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s制約をNO INHERITをマークすることはできません"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19584
+#: gram.y:19521
 #, c-format
 msgid "%s constraints cannot be marked NOT ENFORCED"
 msgstr "%s制約をNOT ENFORCEDとマークすることはできません"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19606
+#: gram.y:19543
 #, c-format
 msgid "%s constraints cannot be marked ENFORCED"
 msgstr "%s制約をENFORCEDとマークすることはできません"
 
-#: gram.y:19628
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "識別できないパーティションストラテジ \"%s\""
 
-#: gram.y:19652
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "不正なパブリケーションオブジェクトリスト"
 
-#: gram.y:19653
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr "テーブル名やスキーマ名を単独記述の前にTABLEまたはTABLES IN SCHEMAのいずれかを指定する必要があります。"
 
-#: gram.y:19669
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "不正なテーブル名"
 
-#: gram.y:19690
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "WHERE句はスキーマに対しては使用できません"
 
-#: gram.y:19697
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "列指定はスキーマに対しては使用できません"
 
-#: gram.y:19711
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "不正なスキーマ名"
@@ -14552,12 +14628,12 @@ msgstr ".decimal()では\"精度[,スケール]\"のオプションを1つだけ
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "LIKE_REGEX 述語の中に認識できないフラグ文字\"%.*s\"があります。"
 
-#: jsonpath_gram.y:631 tsearch/spell.c:751 utils/adt/regexp.c:223
+#: jsonpath_gram.y:632 tsearch/spell.c:752 utils/adt/regexp.c:223
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "正規表現が不正です: %s"
 
-#: jsonpath_gram.y:679
+#: jsonpath_gram.y:680
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "XQueryの\"x\"フラグ(拡張正規表現)は実装されていません"
@@ -14765,7 +14841,7 @@ msgstr "バリデータがロードされていない状態で、OAuthトーク
 msgid "internal error in OAuth validator module"
 msgstr "OAuthバリデータの内部エラー"
 
-#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:294
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
 #, c-format
 msgid "OAuth bearer authentication failed for user \"%s\""
 msgstr "ユーザー \"%s\" の OAuth Bearer 認証に失敗しました"
@@ -14807,7 +14883,7 @@ msgstr "認証方式 %s では、oauth_validator_libraries を設定しなけれ
 
 #: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884 libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271 libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388 libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442 libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565 libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630 libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680
 #: libpq/hba.c:1692 libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807 libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930 libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993 libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115 libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176 libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393 libpq/hba.c:2422 libpq/hba.c:2435
-#: libpq/hba.c:2458 libpq/hba.c:2480 libpq/hba.c:2517 tsearch/ts_locale.c:196
+#: libpq/hba.c:2458 libpq/hba.c:2480 libpq/hba.c:2517 tsearch/ts_locale.c:201
 #, c-format
 msgid "line %d of configuration file \"%s\""
 msgstr "設定ファイル \"%2$s\" の %1$d 行目"
@@ -14942,549 +15018,549 @@ msgstr "client-final-message 中の proof の形式が不正です"
 msgid "Garbage found at the end of client-final-message."
 msgstr "client-final-message の終端に不要なデータがあります。"
 
-#: libpq/auth.c:254
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "ユーザー\"%s\"の認証に失敗しました: ホストを拒絶しました"
 
-#: libpq/auth.c:257
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"の\"trust\"認証に失敗しました"
 
-#: libpq/auth.c:260
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のIdent認証に失敗しました"
 
-#: libpq/auth.c:263
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"で対向(peer)認証に失敗しました"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のパスワード認証に失敗しました"
 
-#: libpq/auth.c:273
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のGSSAPI認証に失敗しました"
 
-#: libpq/auth.c:276
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のSSPI認証に失敗しました"
 
-#: libpq/auth.c:279
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のPAM認証に失敗しました"
 
-#: libpq/auth.c:282
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のBSD認証に失敗しました"
 
-#: libpq/auth.c:285
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"のLDAP認証に失敗しました"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"の証明書認証に失敗しました"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "ユーザー\"%s\"の RADIUS 認証に失敗しました"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "ユーザー\"%s\"の認証に失敗しました: 認証方式が不正です"
 
-#: libpq/auth.c:301
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "接続はファイル%sの行%dに一致しました: \"%s\""
 
-#: libpq/auth.c:346
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "認証識別子が2度以上設定されました"
 
-#: libpq/auth.c:347
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "以前の識別子: \"%s\"; 新しい識別子: \"%s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "接続認証完了: 識別名=\"%s\" 方式=%s (%s:%d)"
 
-#: libpq/auth.c:397
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "クライアント証明書はルート証明書ストアが利用できる場合にのみ検証されます"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "この接続には有効なクライアント証明が必要です"
 
-#: libpq/auth.c:439 libpq/auth.c:485
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "GSS暗号化"
 
-#: libpq/auth.c:442 libpq/auth.c:488
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "SSL暗号化"
 
-#: libpq/auth.c:444 libpq/auth.c:490
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "暗号化なし"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:450
+#: libpq/auth.c:458
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf の設定でホスト \"%s\"、ユーザー \"%s\", %s 用のレプリケーション接続を拒否しました"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:457
+#: libpq/auth.c:465
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf の設定でホスト \"%s\"、ユーザー \"%s\"、データベース \"%s\", %sの接続を拒否しました"
 
-#: libpq/auth.c:495
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "クライアントIPアドレスは\"%s\"に解決され、前方検索と一致しました。"
 
-#: libpq/auth.c:498
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "クライアントIPアドレスは\"%s\"に解決されました。前方検索は検査されません。"
 
-#: libpq/auth.c:501
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "クライアントIPアドレスは\"%s\"に解決され、前方検索と一致しませんでした。"
 
-#: libpq/auth.c:504
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "クライアントのホスト名\"%s\"をIPアドレスに変換できませんでした: %s。"
 
-#: libpq/auth.c:509
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "クライアントのIPアドレスをホスト名に解決できませんでした: %s。"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:517
+#: libpq/auth.c:525
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf にホスト\"%s\"、ユーザー\"%s\", %s用のエントリがありません"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:525
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf にホスト\"%s\"、ユーザー\"%s\"、データベース\"%s, %s用のエントリがありません"
 
-#: libpq/auth.c:649
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "接続認証完了: ユーザー=\"%s\" 方式=%s (%s:%d)"
 
-#: libpq/auth.c:718
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "パスワード応答を想定しましたが、メッセージタイプ%dを受け取りました"
 
-#: libpq/auth.c:739
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "パスワードパケットのサイズが不正です"
 
-#: libpq/auth.c:757
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "クライアントから空のパスワードが返されました"
 
-#: libpq/auth.c:885
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "ランダムなMD5ソルトの生成に失敗しました"
 
-#: libpq/auth.c:936 libpq/be-secure-gssapi.c:543
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "環境を設定できません: %m"
 
-#: libpq/auth.c:975
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "GSS応答を想定しましたが、メッセージタイプ %d を受け取りました"
 
-#: libpq/auth.c:1041
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "GSSセキュリティコンテキストの受け付けに失敗しました"
 
-#: libpq/auth.c:1082
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "GSSユーザー名の受信に失敗しました"
 
-#: libpq/auth.c:1228
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "SSPIの資格ハンドルを入手できませんでした"
 
-#: libpq/auth.c:1253
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "SSPI応答を想定しましたが、メッセージタイプ%dを受け取りました"
 
-#: libpq/auth.c:1331
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "SSPIセキュリティコンテキストを受け付けられませんでした"
 
-#: libpq/auth.c:1372
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "SSPIセキュリティコンテキストからトークンを入手できませんでした"
 
-#: libpq/auth.c:1508 libpq/auth.c:1527
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "名前の変換ができませんでした"
 
-#: libpq/auth.c:1540
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "realm名が長すぎます"
 
-#: libpq/auth.c:1555
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "変換後のアカウント名が長すぎます"
 
-#: libpq/auth.c:1734
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "Ident接続用のソケットを作成できませんでした: %m"
 
-#: libpq/auth.c:1749
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "ローカルアドレス\"%s\"にバインドできませんでした: %m"
 
-#: libpq/auth.c:1761
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "アドレス\"%s\"、ポート%sのIdentサーバーに接続できませんでした: %m"
 
-#: libpq/auth.c:1783
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "アドレス\"%s\"、ポート%sのIdentサーバーに問い合わせを送信できませんでした: %m"
 
-#: libpq/auth.c:1800
+#: libpq/auth.c:1808
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "アドレス\"%s\"、ポート%sのIdentサーバーからの応答を受信できませんでした: %m"
 
-#: libpq/auth.c:1810
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "Identサーバーからの応答の書式が不正です: \"%s\""
 
-#: libpq/auth.c:1866
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "このプラットフォームでは対向(peer)認証はサポートされていません"
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "ピアの資格証明を入手できませんでした: %m"
 
-#: libpq/auth.c:1880
+#: libpq/auth.c:1888
 #, c-format
 msgid "could not look up local user ID %ld: %m"
 msgstr "ローカルユーザーID %ldの参照に失敗しました: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1894
 #, c-format
 msgid "local user with ID %ld does not exist"
 msgstr "ID %ld を持つローカルユーザーは存在しません"
 
-#: libpq/auth.c:1986
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "背後のPAM層でエラーがありました: %s"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "非サポートのPAM変換%d/\"%s\""
 
-#: libpq/auth.c:2054
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "PAM authenticatorを作成できませんでした: %s"
 
-#: libpq/auth.c:2065
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER)が失敗しました: %s"
 
-#: libpq/auth.c:2097
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST)が失敗しました: %s"
 
-#: libpq/auth.c:2109
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "\"pam_set_item(PAM_CONV)が失敗しました: %s"
 
-#: libpq/auth.c:2122
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "\"pam_authenticateが失敗しました: %s"
 
-#: libpq/auth.c:2135
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmtが失敗しました: %s"
 
-#: libpq/auth.c:2146
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "PAM authenticatorを解放できませんでした: %s"
 
-#: libpq/auth.c:2226
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "LDAPを初期化できませんでした: %d"
 
-#: libpq/auth.c:2263
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "ldapbasedn からドメイン名を抽出できませんでした"
 
-#: libpq/auth.c:2271
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "LDAP認証で\"%s\"に対する DNS SRV レコードが見つかりませんでした"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "LDAPサーバー名を明示的に指定してください。"
 
-#: libpq/auth.c:2325
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "LDAPを初期化できませんでした: %s"
 
-#: libpq/auth.c:2335
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "この LDAP ライブラリでは ldaps はサポートされていません"
 
-#: libpq/auth.c:2343
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "LDAPを初期化できませんでした: %m"
 
-#: libpq/auth.c:2353
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "LDAPプロトコルバージョンを設定できませんでした: %s"
 
-#: libpq/auth.c:2369
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "LDAP TLSセッションを開始できませんでした: %s"
 
-#: libpq/auth.c:2446
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP サーバーも ldapbasedn も指定されていません"
 
-#: libpq/auth.c:2453
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP サーバーの指定がありません"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "LDAP 認証でユーザー名の中に不正な文字があります"
 
-#: libpq/auth.c:2532
+#: libpq/auth.c:2540
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "サーバー\"%2$s\"で、ldapbinddn \"%1$s\"によるLDAPバインドを実行できませんでした: %3$s"
 
-#: libpq/auth.c:2562
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "サーバー\"%2$s\"で、フィルタ\"%1$s\"によるLDAP検索ができませんでした: %3$s"
 
-#: libpq/auth.c:2578
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "LDAPサーバー\"%s\"は存在しません"
 
-#: libpq/auth.c:2579
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "サーバー\"%2$s\"で、フィルタ\"%1$s\"によるLDAP検索が何も返しませんでした。"
 
-#: libpq/auth.c:2583
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "LDAPユーザー\"%s\"は一意ではありません"
 
-#: libpq/auth.c:2584
+#: libpq/auth.c:2592
 #, 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] "サーバー\"%2$s\"で、フィルタ\"%1$s\"によるLDAP検索が%3$d項目返しました。"
 
-#: libpq/auth.c:2604
+#: libpq/auth.c:2612
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "サーバー\"%2$s\"で\"%1$s\"にマッチする最初のエントリの dn を取得できません: %3$s"
 
-#: libpq/auth.c:2631
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "サーバー\"%2$s\"でユーザー\"%1$s\"のLDAPログインが失敗しました: %3$s"
 
-#: libpq/auth.c:2663
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "LDAP診断: %s"
 
-#: libpq/auth.c:2701
+#: libpq/auth.c:2709
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "ユーザー \"%s\" の証明書認証に失敗しました: クライアント証明書にユーザー名が含まれていません"
 
-#: libpq/auth.c:2722
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "ユーザー\"%s\"の証明書認証に失敗しました: サブジェクト識別名(DN)が取得できません"
 
-#: libpq/auth.c:2745
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "ユーザー\"%s\"に対する証明書の検証(clientcert=verify-full) に失敗しました: DN 不一致"
 
-#: libpq/auth.c:2750
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "ユーザー\"%s\"に対する証明書の検証(clientcert=verify-full) に失敗しました: CN 不一致"
 
-#: libpq/auth.c:2852
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS サーバーが指定されていません"
 
-#: libpq/auth.c:2859
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS secret が指定されていません"
 
-#: libpq/auth.c:2873
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "RADIUS認証では%d文字より長いパスワードはサポートしていません"
 
-#: libpq/auth.c:2975 libpq/hba.c:2391
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "RADIUS サーバー名\"%s\"をアドレスに変換できませんでした: %s"
 
-#: libpq/auth.c:2989
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "ランダムな暗号化ベクトルを生成できませんでした"
 
-#: libpq/auth.c:3026
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "パスワードのMD5暗号化に失敗しました: %s"
 
-#: libpq/auth.c:3053
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "RADIUSのソケットを作成できませんでした: %m"
 
-#: libpq/auth.c:3069
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "ローカルの RADIUS ソケットをバインドできませんでした: %m"
 
-#: libpq/auth.c:3079
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "RADIUS パケットを送信できませんでした: %m"
 
-#: libpq/auth.c:3113 libpq/auth.c:3139
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "%sからのRADIUSの応答待ちがタイムアウトしました"
 
-#: libpq/auth.c:3132
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "RADIUSソケットの状態をチェックできませんでした: %m"
 
-#: libpq/auth.c:3162
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "RADIUS応答を読めませんでした: %m"
 
-#: libpq/auth.c:3170
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "%sからのRADIUS応答が誤ったポートから送られてきました: %d"
 
-#: libpq/auth.c:3178
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "%sからのRADIUS応答が短すぎます: %d"
 
-#: libpq/auth.c:3185
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "%sからのRADIUS応答が間違った長さを保持しています: %d（実際の長さは%d）"
 
-#: libpq/auth.c:3193
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "%sからのRADIUS応答は異なるリクエストに対するものです: %d (%d であるはず)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "受信パケットのMD5暗号化に失敗しました: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "%sからのRADIUS応答が間違ったMD5シグネチャを保持しています"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "%1$sからのRADIUS応答がユーザー\"%3$s\"にとって不正なコード(%2$d)を保持しています"
@@ -15574,44 +15650,39 @@ msgstr "秘密鍵ファイル\"%s\"はグループまたは全員からアクセ
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "ファイルはデータベースユーザーの所有の場合は u=rw (0600) かそれよりも低いパーミッション、root所有の場合は  u=rw,g=r (0640) かそれよりも低いパーミッションである必要があります"
 
-#: libpq/be-secure-gssapi.c:202
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI名ラップエラー"
 
-#: libpq/be-secure-gssapi.c:209
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "送出されるGSSAPIメッセージに機密性が適用されません"
 
-#: libpq/be-secure-gssapi.c:216 libpq/be-secure-gssapi.c:637
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "サーバーは過大なサイズのGSSAPIパケットを送信しようとしました: (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:352
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "過大なサイズのGSSAPIパケットがクライアントから送出されました: (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:390
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPIアンラップエラー"
 
-#: libpq/be-secure-gssapi.c:397
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "到着したGSSAPIメッセージには機密性が適用されていません"
 
-#: libpq/be-secure-gssapi.c:578
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "過大なサイズのGSSAPIパケットがクライアントから送出されました: (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:603
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "GSSAPIセキュリティコンテキストを受け入れられませんでした"
 
-#: libpq/be-secure-gssapi.c:704
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "GSSAPIサイズチェックエラー"
 
@@ -15807,7 +15878,7 @@ msgstr "DH: DHパラメータを設定できませんでした: %s"
 
 #: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "failed to set group names specified in ssl_groups: %s"
+msgid "could not set group names specified in ssl_groups: %s"
 msgstr "ssl_groupsで指定されたグループ名の設定に失敗しました: %s"
 
 #: libpq/be-secure-openssl.c:1441
@@ -15816,8 +15887,8 @@ msgstr "有効なグループが見つかりませんでした"
 
 #: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL"
-msgstr "すべてのグループ名が正しく記述されおり、インストールされているバージョンのOpenSSLでサポートされていることを確認してください"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "すべてのグループ名が正しく記述されおり、インストールされているバージョンのOpenSSLでサポートされていることを確認してください。"
 
 #: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
@@ -16372,7 +16443,7 @@ msgstr "クライアント接続がありません"
 msgid "could not receive data from client: %m"
 msgstr "クライアントからデータを受信できませんでした: %m"
 
-#: libpq/pqcomm.c:1151 tcop/postgres.c:4505
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "プロトコルの同期が失われたためコネクションを終了します"
@@ -16726,12 +16797,12 @@ msgstr "拡張可能ノードタイプ\"%s\"はすでに存在します"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "ExtensibleNodeMethods \"%s\"は登録されていません"
 
-#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2306
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "リレーション\"%s\"は複合型を持っていません"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602 parser/parse_coerce.c:2740 parser/parse_coerce.c:2787 parser/parse_expr.c:2118 parser/parse_func.c:710 parser/parse_oper.c:869 utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602 parser/parse_coerce.c:2740 parser/parse_coerce.c:2787 parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869 utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "データ型%sの配列型がありませんでした"
@@ -16746,12 +16817,12 @@ msgstr "パラメータを持つポータル\"%s\": %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "パラメータを持つ無名ポータル: %s"
 
-#: optimizer/path/joinrels.c:973
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN はマージ結合可能もしくはハッシュ結合可能な場合のみサポートされています"
 
-#: optimizer/plan/createplan.c:7250 parser/parse_merge.c:203 rewrite/rewriteHandler.c:1689
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203 rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "リレーション\"%s\"に対してMERGEは実行できません"
@@ -16763,42 +16834,42 @@ msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "外部結合のNULL可な側では%sを適用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1459 parser/analyze.c:1900 parser/analyze.c:2159 parser/analyze.c:3480
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074 parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "UNION/INTERSECT/EXCEPTでは%sを使用できません"
 
-#: optimizer/plan/planner.c:2202 optimizer/plan/planner.c:4045
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "GROUP BY を実行できませんでした"
 
-#: optimizer/plan/planner.c:2203 optimizer/plan/planner.c:4046 optimizer/plan/planner.c:4727 optimizer/prep/prepunion.c:1073
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145 optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid "Some of the datatypes only support hashing, while others only support sorting."
 msgstr "一部のデータ型がハッシュのみをサポートする一方で、別の型はソートのみをサポートしています。"
 
-#: optimizer/plan/planner.c:4726
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "DISTINCTを実行できませんでした"
 
-#: optimizer/plan/planner.c:6188
+#: optimizer/plan/planner.c:6322
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "ウィンドウの PARTITION BY を実行できませんでした"
 
-#: optimizer/plan/planner.c:6189
+#: optimizer/plan/planner.c:6323
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "ウィンドウ分割に使用する列は、ソート可能なデータ型でなければなりません。"
 
-#: optimizer/plan/planner.c:6193
+#: optimizer/plan/planner.c:6327
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "ウィンドウの ORDER BY を実行できませんでした"
 
-#: optimizer/plan/planner.c:6194
+#: optimizer/plan/planner.c:6328
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "ウィンドウの順序付けをする列は、ソート可能なデータ型でなければなりません。"
@@ -16829,590 +16900,600 @@ msgstr "リレーション\"%2$s\"の属性\"%1$s\"は親での型と一致し
 msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
 msgstr "リレーション\"%2$s\"の属性\"%1$s\"は親での照合順序と一致していません"
 
-#: optimizer/util/clauses.c:4966
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "SQL関数\"%s\"のインライン化処理中"
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "リカバリ中は一時テーブルやUNLOGGEDテーブルにはアクセスできません"
 
-#: optimizer/util/plancat.c:770
+#: optimizer/util/plancat.c:776
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr "行全体に渡るユニークインデックスの推定指定はサポートされていません"
 
-#: optimizer/util/plancat.c:787
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "ON CONFLICT句中の制約には関連付けられるインデックスがありません"
 
-#: optimizer/util/plancat.c:837
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATEでの排除制約の使用はサポートされていません"
 
-#: optimizer/util/plancat.c:954
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "ON CONFLICT 指定に合致するユニーク制約または排除制約がありません"
 
-#: parser/analyze.c:954 parser/analyze.c:1679
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VALUESリストはすべて同じ長さでなければなりません"
 
-#: parser/analyze.c:1156
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERTに対象列よりも多くの式があります"
 
-#: parser/analyze.c:1174
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERTに式よりも多くの対象列があります"
 
-#: parser/analyze.c:1178
+#: parser/analyze.c:1093
 #, c-format
 msgid "The insertion source is a row expression containing the same number of columns expected by the INSERT. Did you accidentally use extra parentheses?"
 msgstr "挿入ソースがINSERTが期待するのと同じ列数を含む行表現になっています。うっかり余計なカッコをつけたりしませんでしたか？"
 
-#: parser/analyze.c:1486 parser/analyze.c:1873
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "ここではSELECT ... INTOは許可されません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1802 parser/analyze.c:3712
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%sをVALUESに使用できません"
 
-#: parser/analyze.c:2040
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "不正なUNION/INTERSECT/EXCEPT ORDER BY句です"
 
-#: parser/analyze.c:2041
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr "式や関数ではなく、結果列の名前のみが使用できます。"
 
-#: parser/analyze.c:2042
+#: parser/analyze.c:1957
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "式/関数をすべてのSELECTにつけてください。またはこのUNIONをFROM句に移動してください。"
 
-#: parser/analyze.c:2149
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTOはUNION/INTERSECT/EXCEPTの最初のSELECTでのみ使用できます"
 
-#: parser/analyze.c:2221
+#: parser/analyze.c:2136
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "UNION/INTERSECT/EXCEPTの要素となる文では同一問い合わせレベルの他のリレーションを参照できません"
 
-#: parser/analyze.c:2308
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "すべての%s問い合わせは同じ列数を返す必要があります"
 
-#: parser/analyze.c:2665
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "SETの対象列はリレーション名で修飾することはできません。"
 
 #. translator: %s is OLD or NEW
-#: parser/analyze.c:2753 parser/analyze.c:2763
+#: parser/analyze.c:2668 parser/analyze.c:2678
 #, c-format
 msgid "%s cannot be specified multiple times"
 msgstr "%s は複数回指定できません"
 
-#: parser/analyze.c:2775 parser/parse_relation.c:473
+#: parser/analyze.c:2690 parser/parse_relation.c:473
 #, c-format
 msgid "table name \"%s\" specified more than once"
 msgstr "テーブル名\"%s\"が複数指定されました"
 
-#: parser/analyze.c:2823
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNINGには少なくとも1つの列が必要です"
 
-#: parser/analyze.c:2925
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "代入元が%d個の列を返しました"
 
-#: parser/analyze.c:2986
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "変数\"%s\"は型%sですが、式は型%sでした"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:3111 parser/analyze.c:3119
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "%sと%sの両方を同時には指定できません"
 
-#: parser/analyze.c:3139
+#: parser/analyze.c:3055
 #, 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:3147
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %sはサポートされていません"
 
-#: parser/analyze.c:3150
+#: parser/analyze.c:3066
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "保持可能カーソルは読み取り専用である必要があります。"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3158
+#: parser/analyze.c:3074
 #, 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:3169
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %sはが不正です"
 
-#: parser/analyze.c:3172
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "INSENSITIVEカーソルは読み取り専用である必要があります。"
 
-#: parser/analyze.c:3266
+#: parser/analyze.c:3182
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "実体化ビューではWITH句にデータを変更する文を含んではなりません"
 
-#: parser/analyze.c:3276
+#: parser/analyze.c:3192
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "実体化ビューでは一時テーブルやビューを使用してはいけません"
 
-#: parser/analyze.c:3286
+#: parser/analyze.c:3202
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "実体化ビューは境界パラメータを用いて定義してはなりません"
 
-#: parser/analyze.c:3298
+#: parser/analyze.c:3214
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "実体化ビューをログ非取得にはできません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3487
+#: parser/analyze.c:3403
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "DISTINCT句では%sを使用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3494
+#: parser/analyze.c:3410
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "GROUP BY句で%sを使用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3501
+#: parser/analyze.c:3417
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "HAVING 句では%sを使用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3508
+#: parser/analyze.c:3424
 #, 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:3515
+#: parser/analyze.c:3431
 #, 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:3522
+#: parser/analyze.c:3438
 #, 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:3621
+#: parser/analyze.c:3537
 #, 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:3685
+#: parser/analyze.c:3601
 #, 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:3694
+#: parser/analyze.c:3610
 #, 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:3703
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%sはテーブル関数には適用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3721
+#: parser/analyze.c:3637
 #, 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:3730
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%sは名前付きタプルストアには適用できません"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3750
+#: parser/analyze.c:3666
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "%2$s句のリレーション\"%1$s\"はFROM句にありません"
 
-#: parser/parse_agg.c:215 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "型%sの順序演算子を特定できませんでした"
 
-#: parser/parse_agg.c:217
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "DISTINCT 付きの集約関数は、入力がソート可能である必要があります。"
 
-#: parser/parse_agg.c:275
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPINGの引数は32より少くなければなりません"
 
-#: parser/parse_agg.c:378
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "JOIN条件で集約関数を使用できません"
 
-#: parser/parse_agg.c:380
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "グルーピング演算はJOIN条件の中では使用できません"
 
-#: parser/parse_agg.c:390
+#: parser/parse_agg.c:394
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "集約関数は自身の問い合わせレベルのFROM句の中では使用できません"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "グルーピング演算は自身のクエリレベルのFROM句の中では使用できません"
 
-#: parser/parse_agg.c:397
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "集約関数はFROM句内の関数では使用できません"
 
-#: parser/parse_agg.c:399
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "グルーピング演算はFROM句内の関数では使用できません"
 
-#: parser/parse_agg.c:407
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "集約関数はポリシ式では使用できません"
 
-#: parser/parse_agg.c:409
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "グルーピング演算はポリシ式では使用できません"
 
-#: parser/parse_agg.c:426
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "集約関数はウィンドウRANGEの中では集約関数を使用できません"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "ウィンドウ定義のRANGE句の中ではグルーピング演算は使用できません"
 
-#: parser/parse_agg.c:433
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "ウィンドウ定義のROWS句では集約関数は使用できません"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "ウィンドウ定義のROWS句ではグルーピング演算は使用できません"
 
-#: parser/parse_agg.c:440
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "ウィンドウ定義のGROUPS句では集約関数は使用できません"
 
-#: parser/parse_agg.c:442
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "ウィンドウ定義のGROUPS句ではグルーピング演算は使用できません"
 
-#: parser/parse_agg.c:455
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "MERGE WHEN条件では集約関数を使用できません"
 
-#: parser/parse_agg.c:457
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "MERGE WHEN条件ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:484
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "検査制約では集約関数を使用できません"
 
-#: parser/parse_agg.c:486
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "検査制約ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:493
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "DEFAULT式では集約関数を使用できません"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "DEFAULT式ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:500
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "インデックス式では集約関数を使用できません"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "インデックス式ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:507
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "インデックス述語では集約関数を使用できません"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "インデックス述語ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:514
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "統計情報式では集約関数を使用できません"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "統計情報式ではグルーピング演算使用できません"
 
-#: parser/parse_agg.c:521
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "変換式では集約関数を使用できません"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "変換式ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:528
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "EXECUTEのパラメータでは集約関数を使用できません"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "EXECUTEのパラメータではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:535
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "トリガのWHEN条件では集約関数を使用できません"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "トリガのWHEN条件ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:542
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "集約関数はパーティション境界では使用できません"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "グルーピング演算はパーティション境界では使用できません"
 
-#: parser/parse_agg.c:549
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "パーティションキー式では集約関数は使用できません"
 
-#: parser/parse_agg.c:551
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "パーティションキー式ではグルーピング演算は使用できません"
 
-#: parser/parse_agg.c:557
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "集約関数はカラム生成式では使用できません"
 
-#: parser/parse_agg.c:559
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "グルーピング演算はカラム生成式では使用できません"
 
-#: parser/parse_agg.c:565
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "CALLの引数では集約関数を使用できません"
 
-#: parser/parse_agg.c:567
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "CALLの引数ではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:573
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "集約関数は COPY FROM の WHERE 条件では使用できません"
 
-#: parser/parse_agg.c:575
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "グルーピング演算は COPY FROM の WHERE 条件の中では使用できません"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:602 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "%sでは集約関数を使用できません"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:605
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "%sではグルーピング演算を使用できません"
 
-#: parser/parse_agg.c:706
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "上位レベルの集約では、下位レベルのCTEを使用することはできません"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "CTE \"%s\" は、この集約のクエリレベルよりも下位にあります。"
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr "アウタレベルの集約は直接引数に低位の変数を含むことができません"
 
-#: parser/parse_agg.c:784
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "集合返却関数の呼び出しに集約関数の呼び出しを含むことはできません"
 
-#: parser/parse_agg.c:785 parser/parse_expr.c:1760 parser/parse_expr.c:2251 parser/parse_func.c:885
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265 parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr "この集合返却関数をLATERAL FROM項目に移動できるかもしれません。"
 
-#: parser/parse_agg.c:790
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "集約関数の呼び出しにウィンドウ関数の呼び出しを含むことはできません"
 
-#: parser/parse_agg.c:869
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "JOIN条件ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:876
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "FROM句内の関数ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:882
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "ポリシ式ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:895
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "ウィンドウ定義ではウィンドウ関数は使用できません"
 
-#: parser/parse_agg.c:906
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "MERGE WHEN条件ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:931
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "検査制約の中ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:935
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "DEFAULT式の中ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:938
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "インデックス式ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:941
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "統計情報式ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:944
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "インデックス述語ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:947
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "変換式ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:950
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "EXECUTEパラメータではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:953
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "トリガのWHEN条件ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:956
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "ウィンドウ関数はパーティション境界では使用できません"
 
-#: parser/parse_agg.c:959
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "パーティションキー式ではウィンドウ関数は使用できません"
 
-#: parser/parse_agg.c:962
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "CALLの引数ではウィンドウ関数は使用できません"
 
-#: parser/parse_agg.c:965
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "ウィンドウ関数は COPY FROM の WHERE 条件では使用できません"
 
-#: parser/parse_agg.c:968
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "ウィンドウ関数はカラム生成式では使用できません"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:991 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "%sの中ではウィンドウ関数を使用できません"
 
-#: parser/parse_agg.c:1025 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "ウィンドウ\"%s\"は存在しません"
 
-#: parser/parse_agg.c:1115
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "グルーピングセットの数が多すぎます (最大4096)"
 
-#: parser/parse_agg.c:1276
+#: parser/parse_agg.c:1329
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "再帰問い合わせの再帰項では集約関数を使用できません"
 
-#: parser/parse_agg.c:1499
+#: parser/parse_agg.c:1552
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr "列\"%s.%s\"はGROUP BY句で指定するか、集約関数内で使用しなければなりません"
 
-#: parser/parse_agg.c:1502
+#: parser/parse_agg.c:1555
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "順序集合集約の直接引数はグルーピングされた列のみを使用しなければなりません。"
 
-#: parser/parse_agg.c:1507
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "外部問い合わせから副問い合わせがグループ化されていない列\"%s.%s\"を使用しています"
 
-#: parser/parse_agg.c:1672
+#: parser/parse_agg.c:1725
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr "GROUPINGの引数は関連するクエリレベルのグルーピング式でなければなりません"
@@ -17687,7 +17768,7 @@ msgstr "offset PRECEDING/FOLLOWING を伴った RANGE は列型 %s とオフセ
 msgid "Cast the offset value to the exact intended type."
 msgstr "オフセット値を意図した型そのものにキャストしてください。"
 
-#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086 parser/parse_coerce.c:1104 parser/parse_coerce.c:1119 parser/parse_expr.c:2152 parser/parse_expr.c:2770 parser/parse_expr.c:3421 parser/parse_expr.c:3650 parser/parse_target.c:1001
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086 parser/parse_coerce.c:1104 parser/parse_coerce.c:1119 parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435 parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "型%sから%sへの型変換ができません"
@@ -18017,328 +18098,328 @@ msgstr "再帰問い合わせ内の FOR UPDATE/SHARE は実装されていませ
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "問い合わせ\"%s\"への再帰参照が2回以上現れてはなりません"
 
-#: parser/parse_expr.c:311
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "この文脈ではDEFAULTは使えません"
 
-#: parser/parse_expr.c:404 parser/parse_relation.c:3797 parser/parse_relation.c:3807 parser/parse_relation.c:3825 parser/parse_relation.c:3832 parser/parse_relation.c:3846
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797 parser/parse_relation.c:3807 parser/parse_relation.c:3825 parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "列%s.%sは存在しません"
 
-#: parser/parse_expr.c:416
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "データ型%2$sの列\"%1$s\"はありません"
 
-#: parser/parse_expr.c:422
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "レコードデータ型の列\"%s\"を特定できませんでした"
 
-#: parser/parse_expr.c:428
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "列記法 .%sが型%sに使用されましたが、この型は複合型ではありません"
 
-#: parser/parse_expr.c:459 parser/parse_target.c:735
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "\"*\"を通した行展開は、ここではサポートされていません"
 
-#: parser/parse_expr.c:582
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "列参照はDEFAULT式では使用できません"
 
-#: parser/parse_expr.c:585
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "列参照はパーティション境界式では使用できません"
 
-#: parser/parse_expr.c:844 parser/parse_relation.c:848 parser/parse_relation.c:930 parser/parse_target.c:1241
+#: parser/parse_expr.c:845 parser/parse_relation.c:848 parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "列参照\"%s\"は曖昧です"
 
-#: parser/parse_expr.c:900 parser/parse_param.c:111 parser/parse_param.c:143 parser/parse_param.c:205 parser/parse_param.c:304
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143 parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "パラメータ$%dがありません"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1101 parser/parse_expr.c:3081
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "%sは真偽値を得るために = 演算子を必要とします"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1107 parser/parse_expr.c:3088
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%sは集合を返してはなりません"
 
-#: parser/parse_expr.c:1393
+#: parser/parse_expr.c:1405
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
 msgstr "MERGE_ACTION()はMERGEコマンドのRETURNINGリストの中でのみ使用可能です"
 
-#: parser/parse_expr.c:1517 parser/parse_expr.c:1549
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "列の数がVALUESの数と一致しません"
 
-#: parser/parse_expr.c:1563
+#: parser/parse_expr.c:1575
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr "複数列のUPDATE項目のソースは副問合せまたはROW()式でなければなりません"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1758 parser/parse_expr.c:2249 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "集合返却関数は%sでは使用できません"
 
-#: parser/parse_expr.c:1822
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "検査制約では副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1826
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "DEFAULT式には副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1829
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "式インデックスには副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1832
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "インデックスの述部に副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1835
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "時計情報式では副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1838
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in transform expression"
 msgstr "変換式では副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1841
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "EXECUTEのパラメータに副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1844
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "トリガーの WHEN 条件では副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1847
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "副問い合わせはパーティション境界では使用できません"
 
-#: parser/parse_expr.c:1850
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "パーティションキー式では副問い合わせを使用できません"
 
-#: parser/parse_expr.c:1853
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "CALLの引数で副問い合わせは使用できません"
 
-#: parser/parse_expr.c:1856
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "副問い合わせは COPY FROM の WHERE 条件では使用できません"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "副問い合わせはカラム生成式では使用できません"
 
-#: parser/parse_expr.c:1912 parser/parse_expr.c:3780
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "副問い合わせは1列のみを返さなければなりません"
 
-#: parser/parse_expr.c:1983
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "副問い合わせの列が多すぎます"
 
-#: parser/parse_expr.c:1988
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "副問い合わせの列が少なすぎます"
 
-#: parser/parse_expr.c:2092
+#: parser/parse_expr.c:2104
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "空の配列のデータ型を決定できません"
 
-#: parser/parse_expr.c:2093
+#: parser/parse_expr.c:2105
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "必要な型に明示的にキャストしてください。例: ARRAY[]::integer[]"
 
-#: parser/parse_expr.c:2107
+#: parser/parse_expr.c:2119
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "データ型%sの要素を見つけられませんでした"
 
-#: parser/parse_expr.c:2190
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW式は最大でも%dエントリまでしか持てません"
 
-#: parser/parse_expr.c:2395
+#: parser/parse_expr.c:2409
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "無名のXML属性値は列参照でなければなりません"
 
-#: parser/parse_expr.c:2396
+#: parser/parse_expr.c:2410
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "無名のXML要素値は列参照でなければなりません"
 
-#: parser/parse_expr.c:2411
+#: parser/parse_expr.c:2425
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "XML属性名\"%s\"が複数あります"
 
-#: parser/parse_expr.c:2519
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "XMLSERIALIZE の結果を %s へキャストできません"
 
-#: parser/parse_expr.c:2843 parser/parse_expr.c:3039
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "行式において項目数が一致しません"
 
-#: parser/parse_expr.c:2853
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "長さ0の行を比較できません"
 
-#: parser/parse_expr.c:2878
+#: parser/parse_expr.c:2892
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "行比較演算子は型%sではなくbooleanを返さなければなりません"
 
-#: parser/parse_expr.c:2885
+#: parser/parse_expr.c:2899
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "行比較演算子は集合を返してはいけません"
 
-#: parser/parse_expr.c:2944 parser/parse_expr.c:2985
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "行比較演算子%sの解釈を特定できませんでした"
 
-#: parser/parse_expr.c:2946
+#: parser/parse_expr.c:2960
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "行比較演算子はbtree演算子族と関連付けされなければなりません。"
 
-#: parser/parse_expr.c:2987
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "同程度の適合度の候補が複数存在します。"
 
-#: parser/parse_expr.c:3322
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "JSON ENCODING句は入力型がbyteaの場合にのみ使用可能です"
 
-#: parser/parse_expr.c:3386
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr "非文字列型は暗黙のFORMAT JSON句とともには使用できません"
 
-#: parser/parse_expr.c:3387
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr "非文字列型は明示的なFORMAT JSON句とともには使用できません"
 
-#: parser/parse_expr.c:3476
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "JSONフォーマットは非文字列出力型とともには使用できません"
 
-#: parser/parse_expr.c:3489
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "bytrea以外の出力型に対してはJSON符号化方式は設定できません"
 
-#: parser/parse_expr.c:3494
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "サポートされてないJSON符号化方式"
 
-#: parser/parse_expr.c:3495
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "JSON符号化方式ではUTF8のみがサポートされています。"
 
-#: parser/parse_expr.c:3532
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "SQL/JSON関数ではSETOF型の返却はサポートされていません"
 
-#: parser/parse_expr.c:3537
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "SQL/JSON関数では疑似型の返却はサポートされていません"
 
-#: parser/parse_expr.c:3865 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "ウィンドウ関数に対する集約の ORDER BY は実装されていません"
 
-#: parser/parse_expr.c:4088
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr "bytrea以外の入力型に対しては JSON FORMAT ENCODING句は使用できません"
 
-#: parser/parse_expr.c:4108
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "JSON述語では型%sを使用できません"
 
-#: parser/parse_expr.c:4134 parser/parse_expr.c:4255
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
 #, c-format
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "%s()のRETURNING節では型%sは指定できません"
 
-#: parser/parse_expr.c:4136
+#: parser/parse_expr.c:4150
 #, c-format
 msgid "Try returning json or jsonb."
 msgstr "jsonまたはjsonbでの返却を試してください。"
 
-#: parser/parse_expr.c:4184
+#: parser/parse_expr.c:4198
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr "非文字列型はWITH UNIQUE KEYS句とともには使用できません"
 
-#: parser/parse_expr.c:4258
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "文字列型またはBYTEA型での返却を試してください。"
 
-#: parser/parse_expr.c:4323
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr "%s()のRETURNING節ではFORMAT JSONは指定できません"
 
-#: parser/parse_expr.c:4336
+#: parser/parse_expr.c:4353
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
 msgstr "WITH WRAPPERが使われてるときにはSQL/JSONのQUOTESの挙動は指定できまえん"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4350 parser/parse_expr.c:4379 parser/parse_expr.c:4410 parser/parse_expr.c:4436 parser/parse_expr.c:4462 parser/parse_jsontable.c:92
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427 parser/parse_expr.c:4453 parser/parse_expr.c:4479 parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "不正な%s挙動指定"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4353 parser/parse_expr.c:4382
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
 msgstr "%2$sに対する%1$s句ではERROR, NULL, EMPTY ARRAY, EMPTY OBJECTまたはDEFAULT式のみが使用可能です。"
@@ -18346,67 +18427,72 @@ msgstr "%2$sに対する%1$s句ではERROR, NULL, EMPTY ARRAY, EMPTY OBJECTま
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4360 parser/parse_expr.c:4389 parser/parse_expr.c:4418 parser/parse_expr.c:4446 parser/parse_expr.c:4472
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435 parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "列\"%s\"に対する不正な%s挙動指定"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4363 parser/parse_expr.c:4392
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
 msgstr "フォーマット化対象列に対する%s句ではERROR, NULL, EMPTY ARRAY, EMPTY OBJECTまたはDEFAULT式のみが使用可能です。"
 
-#: parser/parse_expr.c:4411
+#: parser/parse_expr.c:4428
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
 msgstr "%2$sに対する%1$s句ではERROR, TRUE, FALSEまたはUNKNOWNのみが使用可能です。"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4421
+#: parser/parse_expr.c:4438
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
 msgstr "EXIST列に対する%s句ではERROR, TRUE, FALSEまたはUNKNOWNのみが使用可能です。"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4439 parser/parse_expr.c:4465
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr "%2$sに対する%1$s句ではERROR, NULLまたはDEFAULT式のみが使用可能です。"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4449 parser/parse_expr.c:4475
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
 msgstr "スカラー列に対する%s句ではERROR, NULLまたはDEFAULT式のみが使用可能です。"
 
-#: parser/parse_expr.c:4505
+#: parser/parse_expr.c:4526
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "JSONパス式は型%2$sではなく%1$s型でなければなりません"
 
-#: parser/parse_expr.c:4723
+#: parser/parse_expr.c:4766
 #, c-format
 msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
 msgstr "DEFAULTには定数、非集約関数、および演算子式のみ指定可能です"
 
-#: parser/parse_expr.c:4728
+#: parser/parse_expr.c:4771
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "DEFAULT式は列参照を含むことができません"
 
-#: parser/parse_expr.c:4733
+#: parser/parse_expr.c:4776
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "DEFAULT式は集合を返してはなりません"
 
-#: parser/parse_expr.c:4809 parser/parse_expr.c:4818
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr "DEFAULT式の照合順序がRETURNING句と競合しています"
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "型%sの挙動式の%sへの型変換はできません"
 
-#: parser/parse_expr.c:4812
+#: parser/parse_expr.c:4873
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "式を%s型に明示的にキャストする必要があります。"
@@ -19177,257 +19263,257 @@ msgstr "外部テーブルでは除外制約はサポートされていません
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "LIKE句ではリレーション\"%s\"は不正です"
 
-#: parser/parse_utilcmd.c:1896 parser/parse_utilcmd.c:2004
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "インデックス\"%s\"には行全体テーブル参照が含まれます"
 
-#: parser/parse_utilcmd.c:2398
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "CREATE TABLE では既存のインデックスを使えません"
 
-#: parser/parse_utilcmd.c:2418
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "インデックス\"%s\"はすでに1つの制約に割り当てられています"
 
-#: parser/parse_utilcmd.c:2444
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\"はユニークインデックスではありません"
 
-#: parser/parse_utilcmd.c:2445 parser/parse_utilcmd.c:2452 parser/parse_utilcmd.c:2459 parser/parse_utilcmd.c:2535
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473 parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "このようなインデックスを使ってプライマリキーや一意性制約を作成することはできません"
 
-#: parser/parse_utilcmd.c:2451
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "インデックス\"%s\"は式を含んでいます"
 
-#: parser/parse_utilcmd.c:2458
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\"は部分インデックスです"
 
-#: parser/parse_utilcmd.c:2470
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\"は遅延可能インデックスです"
 
-#: parser/parse_utilcmd.c:2471
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr "遅延可能インデックスを使った遅延不可制約は作れません。"
 
-#: parser/parse_utilcmd.c:2534
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "インデックス\"%s\"の列番号%dにはデフォルトのソート動作がありません"
 
-#: parser/parse_utilcmd.c:2726
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "列\"%s\"がプライマリキー制約内に2回出現します"
 
-#: parser/parse_utilcmd.c:2732
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "列\"%s\"が一意性制約内に2回出現します"
 
-#: parser/parse_utilcmd.c:2777
+#: parser/parse_utilcmd.c:2798
 #, c-format
 msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
 msgstr "WITHOUT OVERLAPS中の列\"%s\"は範囲型でも副範囲型でもありません"
 
-#: parser/parse_utilcmd.c:2805
+#: parser/parse_utilcmd.c:2826
 #, c-format
 msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
 msgstr "WITHOUT OVERLAPSを使用する制約では少なくとも2つの列が必要です"
 
-#: parser/parse_utilcmd.c:3102
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr "インデックス式と述語はインデックス付けされるテーブルのみを参照できます"
 
-#: parser/parse_utilcmd.c:3174
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "統計情報式は参照されているテーブルのみを参照できます"
 
-#: parser/parse_utilcmd.c:3217
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "実体化ビューに対するルールはサポートされません"
 
-#: parser/parse_utilcmd.c:3277
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "ルールのWHERE条件に他のリレーションへの参照を持たせられません"
 
-#: parser/parse_utilcmd.c:3349
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "ルールのWHERE条件はSELECT、INSERT、UPDATE、DELETE動作のみを持つことができます"
 
-#: parser/parse_utilcmd.c:3367 parser/parse_utilcmd.c:3468 rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1234
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489 rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "条件付きのUNION/INTERSECT/EXCEPT文は実装されていません"
 
-#: parser/parse_utilcmd.c:3385
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON SELECTルールではOLDを使用できません"
 
-#: parser/parse_utilcmd.c:3389
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON SELECTルールではNEWを使用できません"
 
-#: parser/parse_utilcmd.c:3398
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON INSERTルールではOLDを使用できません"
 
-#: parser/parse_utilcmd.c:3404
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON DELETEルールではNEWを使用できません"
 
-#: parser/parse_utilcmd.c:3432
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "WITH 問い合わせ内では OLD は参照できません"
 
-#: parser/parse_utilcmd.c:3439
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "WITH 問い合わせ内では NEW は参照できません"
 
-#: parser/parse_utilcmd.c:3897
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "DEFERRABLE句の場所が間違っています"
 
-#: parser/parse_utilcmd.c:3902 parser/parse_utilcmd.c:3917
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "複数のDEFERRABLE/NOT DEFERRABLE句を使用できません"
 
-#: parser/parse_utilcmd.c:3912
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "NOT DEFERRABLE句の場所が間違っています"
 
-#: parser/parse_utilcmd.c:3933
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "INITIALLY DEFERRED句の場所が間違っています<"
 
-#: parser/parse_utilcmd.c:3938 parser/parse_utilcmd.c:3964
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "複数のINITIALLY IMMEDIATE/DEFERRED句を使用できません"
 
-#: parser/parse_utilcmd.c:3959
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "INITIALLY IMMEDIATE句の場所が間違っています<"
 
-#: parser/parse_utilcmd.c:3976
+#: parser/parse_utilcmd.c:3997
 #, c-format
 msgid "misplaced ENFORCED clause"
 msgstr "ENFORCED句の場所が間違っています"
 
-#: parser/parse_utilcmd.c:3981 parser/parse_utilcmd.c:3998
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
 #, c-format
 msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
 msgstr "複数のENFORCED/NOT ENFORCED句は指定できません"
 
-#: parser/parse_utilcmd.c:3993
+#: parser/parse_utilcmd.c:4014
 #, c-format
 msgid "misplaced NOT ENFORCED clause"
 msgstr "NOT ENFORCED句の場所が間違っています"
 
-#: parser/parse_utilcmd.c:4191
+#: parser/parse_utilcmd.c:4212
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATEで指定したスキーマ(%s)が作成先のスキーマ(%s)と異なります"
 
-#: parser/parse_utilcmd.c:4226
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
 msgstr "\"%s\"はパーティションテーブルではありません"
 
-#: parser/parse_utilcmd.c:4233
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "テーブル\"%s\"はパーティションされていません"
 
-#: parser/parse_utilcmd.c:4240
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "インデックス\"%s\"はパーティションされていません"
 
-#: parser/parse_utilcmd.c:4280
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "ハッシュパーティションテーブルはデフォルトパーティションを持つことができません"
 
-#: parser/parse_utilcmd.c:4297
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "ハッシュパーティションに対する不正な境界指定"
 
-#: parser/parse_utilcmd.c:4303 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "ハッシュパーティションの法は0より大きい整数にする必要があります"
 
-#: parser/parse_utilcmd.c:4310 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "ハッシュパーティションの剰余は法よりも小さくなければなりません"
 
-#: parser/parse_utilcmd.c:4323
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "リストパーティションに対する不正な境界指定"
 
-#: parser/parse_utilcmd.c:4376
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "範囲パーティションに対する不正な境界指定"
 
-#: parser/parse_utilcmd.c:4382
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "FROMは全てのパーティション列ごとに一つの値を指定しなければなりません"
 
-#: parser/parse_utilcmd.c:4386
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "TOは全てのパーティション列ごとに一つの値を指定しなければなりません"
 
-#: parser/parse_utilcmd.c:4500
+#: parser/parse_utilcmd.c:4523
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "範囲境界でNULLは使用できません"
 
-#: parser/parse_utilcmd.c:4549
+#: parser/parse_utilcmd.c:4571
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "MAXVALUEに続く境界値はMAXVALUEでなければなりません"
 
-#: parser/parse_utilcmd.c:4556
+#: parser/parse_utilcmd.c:4578
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "MINVALUEに続く境界値はMINVALUEでなければなりません"
 
-#: parser/parse_utilcmd.c:4599
+#: parser/parse_utilcmd.c:4621
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "指定した値は列\"%s\"の%s型に変換できません"
@@ -19445,7 +19531,7 @@ msgstr "不正なUnicodeエスケープ文字"
 msgid "invalid Unicode escape value"
 msgstr "不正なUnicodeエスケープシーケンスの値"
 
-#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6842
+#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6863
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "不正なUnicodeエスケープ"
@@ -19455,7 +19541,7 @@ msgstr "不正なUnicodeエスケープ"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Unicodeエスケープは\\XXXXまたは\\+XXXXXXでなければなりません。"
 
-#: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695 utils/adt/varlena.c:6867
+#: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695 utils/adt/varlena.c:6888
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "不正なUnicodeサロゲートペア"
@@ -19530,7 +19616,7 @@ msgstr "パーティションキーの列%dは%s型です、しかし与えら
 msgid "column %d of the partition key has type \"%s\", but supplied value is of type \"%s\""
 msgstr "パーティションキーの列 %d は  \"%s\"型です、しかし与えられた値は \"%s\"型です"
 
-#: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209 port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209 port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "データディレクトリ\"%s\"のstatに失敗しました: %m"
@@ -19597,27 +19683,27 @@ msgstr "このプラットフォームではヒュージページをサポート
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "ヒュージページは現在の\"shared_memory_type\"の設定ではサポートされません"
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1406
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "既存の共有メモリブロック(キー%lu、ID %lu)がまだ使用中です"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1408
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr "データディレクトリ \"%s\". に対応する古いサーバープロセスをすべて終了させてください。"
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "セマフォを作成できませんでした: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "失敗したシステムコールはsemget(%lu, %d, 0%o)です。"
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
@@ -19626,7 +19712,7 @@ msgstr ""
 "このエラーは、ディスクが足りなくなったことを意味していません。この原因はセマフォセット数が上限(SEMMNI)に達したか、またはシステム全体でのセマフォ数を上限まで(SEMMNS)を使いきるような場合です。対処としては、対応するカーネルのパラメータを増やす必要があります。もしくは PostgreSQLの\"max_connections\"設定をを減らすことで、消費するセマフォの数を減らしてください。\n"
 "PostgreSQL向けの共有メモリ設定に関する詳細情報は、PostgreSQL のドキュメントに記載されています。"
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr ""
@@ -19755,42 +19841,42 @@ msgstr "失敗したシステムコールはMapViewOfFileExです。"
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "自動VACUUMワーカーの起動に時間がかかりすぎています; キャンセルしました"
 
-#: postmaster/autovacuum.c:2221
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "自動VACUUM: 孤立した一時テーブル\"%s.%s.%s\"を削除します"
 
-#: postmaster/autovacuum.c:2457
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "テーブル\"%s.%s.%s\"に対する自動VACUUM"
 
-#: postmaster/autovacuum.c:2460
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "テーブル\"%s.%s.%s\"に対する自動ANALYZE"
 
-#: postmaster/autovacuum.c:2654
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "リレーション\"%s.%s.%s\"の作業エントリを処理しています"
 
-#: postmaster/autovacuum.c:3312
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "誤設定のため自動VACUUMが起動できません"
 
-#: postmaster/autovacuum.c:3313
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "\"track_counts\"オプションを有効にしてください。"
 
-#: postmaster/autovacuum.c:3435
+#: postmaster/autovacuum.c:3471
 #, c-format
 msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
 msgstr "\"autovacuum_max_workers\" (%d) は \"autovacuum_worker_slots\" (%d) 以下でなければなりません"
 
-#: postmaster/autovacuum.c:3437
+#: postmaster/autovacuum.c:3473
 #, c-format
 msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
 msgstr "このサーバーは、同時に最大 \"autovacuum_worker_slots\" (%d) プロセスの自動バキュームワーカーを起動します。"
@@ -19800,79 +19886,79 @@ msgstr "このサーバーは、同時に最大 \"autovacuum_worker_slots\" (%d)
 msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
 msgstr "バックグラウンドワーカー状態の不整合 (\"max_worker_processes\"=%d, スロット総数=%d)"
 
-#: postmaster/bgworker.c:645
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr "バックグラウンドワーカー\"%s\": 共有メモリアクセスを伴わないバックグラウンドワーカーはサポートされません"
 
-#: postmaster/bgworker.c:656
+#: postmaster/bgworker.c:657
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "バックグラウンドワーカー\"%s\": postmaster起動中に起動している場合にはデータベースアクセスを要求することはできません"
 
-#: postmaster/bgworker.c:670
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "バックグラウンドワーカー\"%s\": 不正な再起動間隔"
 
-#: postmaster/bgworker.c:685
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "バックグラウンドワーカー\"%s\": パラレルワーカーは再起動するように設定してはいけません"
 
-#: postmaster/bgworker.c:709 tcop/postgres.c:3345
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "管理者コマンドによりバックグラウンドワーカー\"%s\"を終了しています"
 
-#: postmaster/bgworker.c:868 postmaster/bgworker.c:902
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "登録時にデータベース接続の必要性が示されていません"
 
-#: postmaster/bgworker.c:878 postmaster/bgworker.c:912
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "バックグラウンドワーカー内の不正な処理モード"
 
-#: postmaster/bgworker.c:965
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr "バックグラウンドワーカー\"%s\": \"shared_preload_libraries\"に登録されていなければなりません"
 
-#: postmaster/bgworker.c:988
+#: postmaster/bgworker.c:989
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "バックグラウンドワーカー\"%s\": 動的バックグラウンドワーカーのみが通知を要求できます"
 
-#: postmaster/bgworker.c:1003
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "バックグラウンドワーカーが多すぎます"
 
-#: postmaster/bgworker.c:1004
+#: postmaster/bgworker.c:1005
 #, 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] "現在の設定では最大%dのバックグラウンドワーカーを登録することができます。"
 
-#: postmaster/bgworker.c:1008 postmaster/checkpointer.c:459
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "設定パラメータ\"%s\"を増やすことを検討してください。"
 
-#: postmaster/checkpointer.c:455
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "チェックポイントの発生周期が短すぎます(%d秒間隔)"
 
-#: postmaster/checkpointer.c:1125
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "チェックポイント要求が失敗しました"
 
-#: postmaster/checkpointer.c:1126
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "詳細はサーバーログの最近のメッセージを調査してください"
@@ -19987,27 +20073,27 @@ msgstr "孤立したアーカイブステータスファイル\"%s\"の削除の
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr "先行書き込みログファイル\"%s\"のアーカイブ処理の失敗回数が超過しました、後で再度試します"
 
-#: postmaster/pgarch.c:885 postmaster/pgarch.c:924
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "\"archive_command\"と\"archive_library\"が両方設定されています"
 
-#: postmaster/pgarch.c:886 postmaster/pgarch.c:925
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "\"archive_command\"と\"archive_library\"のいずれか一方のみ設定できます。"
 
-#: postmaster/pgarch.c:903
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr "\"archive_library\"の設定が変更されたためアーカイバプロセスを再起動します"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "アーカイブモジュールはシンボル%sを定義しなくてはなりません"
 
-#: postmaster/pgarch.c:946
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "アーカイブモジュールはアーカイブコールバックを登録しなくてはなりません"
@@ -20123,7 +20209,7 @@ msgstr "%s\"をロードできませんでした"
 msgid "postmaster became multithreaded during startup"
 msgstr "postmasterは起動処理中はマルチスレッドで動作します"
 
-#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3661
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "LC_ALL環境変数を使用可能なロケールに設定してください。"
@@ -20269,114 +20355,114 @@ msgstr "追跡されていない子プロセス"
 msgid "background worker \"%s\""
 msgstr "バックグラウンドワーカー\"%s\""
 
-#: postmaster/postmaster.c:2797
+#: postmaster/postmaster.c:2804
 #, 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:2830
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d)は終了コード%dで終了しました"
 
-#: postmaster/postmaster.c:2832 postmaster/postmaster.c:2844 postmaster/postmaster.c:2854 postmaster/postmaster.c:2865
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851 postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:2841
+#: postmaster/postmaster.c:2848
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d)は例外%Xで終了しました"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2858
 #, 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:2863
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d)は認識できないステータス%dで終了しました"
 
-#: postmaster/postmaster.c:3154
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "データベースシステムは異常にシャットダウンしました"
 
-#: postmaster/postmaster.c:3180
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "起動プロセスの失敗のためシャットダウンしています"
 
-#: postmaster/postmaster.c:3186
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "\"restart_after_crash\"がoffであるためシャットダウンします"
 
-#: postmaster/postmaster.c:3198
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "全てのサーバープロセスが終了しました: 再初期化しています"
 
-#: postmaster/postmaster.c:3591
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "接続用の新しいプロセスをforkできませんでした: %m"
 
-#: postmaster/postmaster.c:3626
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "接続用の新しいプロセスをforkできませんでした"
 
-#: postmaster/postmaster.c:3660
+#: postmaster/postmaster.c:3667
 #, c-format
 msgid "postmaster became multithreaded"
 msgstr "postmasterがマルチスレッド動作になっています"
 
-#: postmaster/postmaster.c:3738
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "データベースシステムはリードオンリー接続の受け付け準備ができました"
 
-#: postmaster/postmaster.c:3839
+#: postmaster/postmaster.c:3846
 #, c-format
 msgid "WAL was shut down unexpectedly"
 msgstr "WALが予期せずシャットダウンされました。"
 
-#: postmaster/postmaster.c:3964
+#: postmaster/postmaster.c:3971
 #, c-format
 msgid "no slot available for new autovacuum worker process"
 msgstr "新しい自動VACUUMワーカープロセスに割り当て可能なスロットがありません"
 
-#: postmaster/postmaster.c:3979
+#: postmaster/postmaster.c:3986
 #, c-format
 msgid "could not fork \"%s\" process: %m"
 msgstr "\"%s\"プロセスをforkできませんでした: %m"
 
-#: postmaster/postmaster.c:4138
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "新しいバックグラウンドワーカープロセスに割り当て可能なスロットがありません"
 
-#: postmaster/postmaster.c:4156
+#: postmaster/postmaster.c:4163
 #, c-format
 msgid "could not fork background worker process: %m"
 msgstr "バックグランドワーカープロセスをforkできませんでした: %m"
 
-#: postmaster/postmaster.c:4489
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "子プロセスの終了コードの読み込みができませんでした\n"
 
-#: postmaster/postmaster.c:4531
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "個プロセスの終了コードを投稿できませんでした\n"
@@ -20452,27 +20538,27 @@ msgstr[0] "%3$ld秒経過しましたが、WAL集計が%1$X/%2$Xに到達する
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "集計がディスク上で%X/%X、メモリ上で%X/%Xに到達しました。"
 
-#: postmaster/walsummarizer.c:1007
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "%X/%Xの後に有効なレコードが見つかりませんでした"
 
-#: postmaster/walsummarizer.c:1052
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "%X/%Xでタイムライン%uのWALを読み取れませんでした: %s"
 
-#: postmaster/walsummarizer.c:1058
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "%X/%Xでタイムライン%uのWALを読み取れませんでした"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "正規表現で使用する照合規則を特定できませんでした"
 
-#: regex/regc_pg_locale.c:265
+#: regex/regc_pg_locale.c:262
 #, c-format
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "非決定的照合順序は正規表現ではサポートされていません"
@@ -20486,136 +20572,136 @@ msgstr "タイムライン%uは不正です"
 msgid "invalid streaming start location"
 msgstr "不正なストリーミング開始位置"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:230 replication/libpqwalreceiver/libpqwalreceiver.c:322
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243 replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "パスワードが必要です"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:231
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "非スーパーユーザーはサーバーがパスワードを要求してこない場合は接続できません。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:232
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr "接続先サーバーの認証方式を変更するか、サブスクリプション属性でpassword_requiredをfalseに設定する必要があります。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:249
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "search_pathを消去できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:295 replication/libpqwalreceiver/libpqwalreceiver.c:483
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308 replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "不正な接続文字列の構文: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:323
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "非スーパーユーザーは接続文字列中でパスワードを指定する必要があります。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:350
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "接続文字列をパースできませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:425
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr "プライマリサーバーからデータベースシステムの識別子とタイムライン ID を受信できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:442 replication/libpqwalreceiver/libpqwalreceiver.c:737
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455 replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "プライマリサーバーからの応答が不正です"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:443
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr "システムを識別できませんでした: 受信したのは%d行で%d列、期待していたのは%d行で%d以上の列でした。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:572 replication/libpqwalreceiver/libpqwalreceiver.c:579 replication/libpqwalreceiver/libpqwalreceiver.c:611
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597 replication/libpqwalreceiver/libpqwalreceiver.c:604 replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "WAL ストリーミングを開始できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:635
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "プライマリにストリーミングの終了メッセージを送信できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:659
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "ストリーミングの終了後の想定外の結果セット"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:675
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "ストリーミングCOPY終了中のエラー: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:686
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "ストリーミングコマンドの結果読み取り中のエラー: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:696 replication/libpqwalreceiver/libpqwalreceiver.c:832
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721 replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "CommandComplete後の想定外の結果: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:725
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "プライマリサーバーからタイムライン履歴ファイルを受信できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:738
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "2個のフィールドを持つ1個のタプルを期待していましたが、%2$d 個のフィールドを持つ %1$d 個のタプルを受信しました。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:793 replication/libpqwalreceiver/libpqwalreceiver.c:848 replication/libpqwalreceiver/libpqwalreceiver.c:855
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818 replication/libpqwalreceiver/libpqwalreceiver.c:873 replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "WAL ストリームからデータを受信できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:875
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "WAL ストリームにデータを送信できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:978
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "レプリケーションスロット\"%s\"を作成できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1030
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "レプリケーションスロット\"%s\"を変更できませんでした: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1064
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "不正な問い合わせ応答"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1065
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "%d個の列を期待していましたが、%d列を受信しました。"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1135
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "クエリインタフェースの動作にはデータベースコネクションが必要です"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1169
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "空の問い合わせ"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "想定されていないパイプラインモード"
 
@@ -20629,26 +20715,26 @@ msgstr "サブスクリプション\"%s\"に対応する論理レプリケーシ
 msgid "lost connection to the logical replication apply worker"
 msgstr "論理レプリケーション適用ワーカーへの接続を失いました"
 
-#: replication/logical/applyparallelworker.c:1024 replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031 replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "論理レプリケーション並列適用ワーカー"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr "論理レプリケーション並列適用ワーカーがエラーにより終了しました"
 
-#: replication/logical/applyparallelworker.c:1127 replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134 replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "論理レプリケーション並列適用ワーカーへの接続を失いました"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "共有メモリキューにデータを送出できませんでした"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr "論理レプリケーションt起用ワーカーはリモートトランザクション%uの残りの変更をシリアライズしてファイルに格納します"
@@ -20723,23 +20809,23 @@ msgstr "キー %s"
 
 #: replication/logical/conflict.c:364
 #, c-format
-msgid "existing local tuple %s"
-msgstr "存在するローカルタプル %s"
+msgid "existing local row %s"
+msgstr "存在するローカル行 %s"
 
 #: replication/logical/conflict.c:369
 #, c-format
-msgid "Existing local tuple %s"
-msgstr "存在するローカルタプル %s"
+msgid "Existing local row %s"
+msgstr "存在するローカル行 %s"
 
 #: replication/logical/conflict.c:396
 #, c-format
-msgid "remote tuple %s"
-msgstr "リモートタプル %s"
+msgid "remote row %s"
+msgstr "リモート行 %s"
 
 #: replication/logical/conflict.c:400
 #, c-format
-msgid "Remote tuple %s"
-msgstr "リモートタプル %s"
+msgid "Remote row %s"
+msgstr "リモート行 %s"
 
 #: replication/logical/conflict.c:434
 #, c-format
@@ -20761,113 +20847,113 @@ msgstr "複製識別 %s"
 msgid "Replica identity full %s"
 msgstr "全列複製識別 %s"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "スタンバイ上で論理デコードを行うためにはプライマリ上で\"wal_level\" >= \"logical\"である必要があります"
 
-#: replication/logical/launcher.c:331
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when \"max_active_replication_origins\"=0"
-msgstr "\"max_active_replication_origins\"=0 の時は論理レプリケーションワーカーは起動できません"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "\"max_active_replication_origins\"が0の時は論理レプリケーションワーカーは起動できません"
 
-#: replication/logical/launcher.c:424
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "論理レプリケーションワーカースロットは全て使用中です"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/launcher.c:425 replication/logical/launcher.c:511 replication/slot.c:1556 replication/slot.c:1579 storage/lmgr/lock.c:1039 storage/lmgr/lock.c:1077 storage/lmgr/lock.c:2966 storage/lmgr/lock.c:4371 storage/lmgr/lock.c:4436 storage/lmgr/lock.c:4786 storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494 storage/lmgr/predicate.c:3891
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524 replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042 storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374 storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789 storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494 storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "\"%s\"を大きくする必要があるかもしれません。"
 
-#: replication/logical/launcher.c:510
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "バックグラウンドワーカースロットが足りません"
 
-#: replication/logical/launcher.c:717
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "論理レプリケーションワーカースロット%dが空いていないため接続できません"
 
-#: replication/logical/launcher.c:726
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr "論理レプリケーションワーカースロット%dが既に他のワーカーに使用されているため接続できません"
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "論理デコードを行うためには\"wal_level\" >= \"logical\" である必要があります"
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "論理デコードを行うにはデータベース接続が必要です"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "物理レプリケーションスロットを論理デコードに使用するとはできません"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "レプリケーションスロット\"%s\"はこのデータベースでは作成されていません"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "論理レプリケーションスロットは書き込みを行ったトランザクションの中で生成することはできません"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "レプリケーションスロット\"%s\"は論理デコードには使用できません"
 
-#: replication/logical/logical.c:542 replication/slot.c:828 replication/slot.c:863
+#: replication/logical/logical.c:546 replication/slot.c:858 replication/slot.c:903
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "このレプリケーションスロットはプライマリサーバーからの同期中です。"
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "他のレプリケーションスロットを指定してください。"
 
-#: replication/logical/logical.c:609
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "スロット\"%s\"の論理デコードを開始します"
 
-#: replication/logical/logical.c:611
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr "%3$X/%4$XからWALを読み取って、%1$X/%2$X以降にコミットされるトランザクションをストリーミングします。"
 
-#: replication/logical/logical.c:759
+#: replication/logical/logical.c:763
 #, 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:765
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "スロット\"%s\", 出力プラグイン\"%s\", %sコールバックの処理中"
 
-#: replication/logical/logical.c:936 replication/logical/logical.c:981 replication/logical/logical.c:1026 replication/logical/logical.c:1072
+#: replication/logical/logical.c:940 replication/logical/logical.c:985 replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "プリペア時の論理レプリケーションを行うには%sコールバックが必要です"
 
-#: replication/logical/logical.c:1304 replication/logical/logical.c:1353 replication/logical/logical.c:1394 replication/logical/logical.c:1480 replication/logical/logical.c:1529
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357 replication/logical/logical.c:1398 replication/logical/logical.c:1484 replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "論理ストリーミングを行うには%sコールバックが必要です"
 
-#: replication/logical/logical.c:1439
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "プリペア時の論理ストリーミングを行うには%sコールバックが必要です"
@@ -20917,72 +21003,82 @@ msgstr "リカバリ中はレプリケーション基点を操作できません
 msgid "replication origin \"%s\" does not exist"
 msgstr "レプリケーション基点\"%s\"は存在しません"
 
-#: replication/logical/origin.c:336
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "レプリケーション起源名が長すぎます"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "レプリケーション起源名は%dバイト以下でなければなりません。"
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "レプリケーション基点IDの空きがありません"
 
-#: replication/logical/origin.c:370
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "ID%dのレプリケーション基点を削除できません, PID%dで使用中です"
 
-#: replication/logical/origin.c:497
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "IDが%dのレプリケーション基点がありません"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "レプリケーションチェックポイントのマジックナンバー%uは不正です、正しい値は%u"
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
 msgid "could not find free replication state, increase \"max_active_replication_origins\""
 msgstr "使用可能なレプリケーション状態領域がありません、\"max_active_replication_origins\"を増やしてください"
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "ノード%dのレプリケーション状態を%X/%Xに復元します"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "レプリケーションスロットチェックポイントのチェックサム%uは間違っています、正しくは%uです"
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "ID%dのレプリケーション基点は既にPID%dで使用中です"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr "ID%dのレプリケーション基点に対するレプリケーション状態スロットの空きがありません"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
 msgid "Increase \"max_active_replication_origins\" and try again."
 msgstr "\"max_active_replication_origins\"を増やして再度試してください"
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "既に初期化されている場合はレプリケーション基点の初期化はできません"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415 replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438 replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "レプリケーション基点が構成されていません"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "レプリケーション基点名\"%s\"は予約されています"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "\"%s\"、\"%s\"、および\"pg_\"で始まる基点名は予約されています。"
@@ -21018,93 +21114,88 @@ msgstr "論理レプリケーションのターゲットリレーション\"%s.%
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "論理レプリケーション先のリレーション\"%s.%s\"は存在しません"
 
-#: replication/logical/reorderbuffer.c:4122
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "XID%uのためのデータファイルの書き出しに失敗しました: %m"
 
-#: replication/logical/reorderbuffer.c:4468 replication/logical/reorderbuffer.c:4493
+#: replication/logical/reorderbuffer.c:4598 replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "並べ替えバッファのあふれファイルの読み込みに失敗しました: %m"
 
-#: replication/logical/reorderbuffer.c:4472 replication/logical/reorderbuffer.c:4497
+#: replication/logical/reorderbuffer.c:4602 replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "並べ替えバッファのあふれファイルの読み込みに失敗しました: %2$uバイトのはずが%1$dバイトでした"
 
-#: replication/logical/reorderbuffer.c:4746
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
 msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
 msgstr "%2$s/%3$s/xid* の削除中にファイル\"%1$s\"が削除できませんでした: %4$m"
 
-#: replication/logical/reorderbuffer.c:5243
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "ファイル\"%1$s\"の読み込みに失敗しました: %3$dバイトのはずが%2$dバイトでした"
 
-#: replication/logical/slotsync.c:214
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:596
 #, c-format
-msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
-msgstr "リモートのスロットがローカルのスロットよりも進んでいるためレプリケーションスロット\"%s\"を同期できませんでした"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "レプリケーションスロット\"%s\"を同期できませんでした"
 
 #: replication/logical/slotsync.c:216
 #, c-format
-msgid "The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u."
-msgstr "リモートスロットのLSNは%X/%Xでカタログxminは%uですが, ローカルスロットのLSNは%X/%Xでカタログxminは%uです。"
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
+msgstr "リモートスロットでは LSN %X/%X のWALとカタログxmin %u が必要ですが、スタンバイ側では LSN %X/%X、カタログxmin %u となっており、同期を行うとデータが失われる可能性があります。"
 
-#: replication/logical/slotsync.c:460
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "OID %2$uのデータベースのレプリケーションスロット\"%1$s\"を削除しました"
 
-#: replication/logical/slotsync.c:580
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "レプリケーションスロット\"%s\"を同期できませんでした"
-
-#: replication/logical/slotsync.c:581
+#: replication/logical/slotsync.c:597
 #, c-format
-msgid "Logical decoding could not find consistent point from local slot's LSN %X/%X."
-msgstr "論理デコードが一貫性ポイントをローカルスロットのLSN%X/%Xから見つけられませんでした。"
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr "スタンバイがLSN %X/%XのWALをデコードするために必要な一貫性のあるスナップショットを作成できないため、同期によってデータが失われる可能性があります。"
 
-#: replication/logical/slotsync.c:590
+#: replication/logical/slotsync.c:606
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "新規に作成したレプリケーションスロット\"%s\"が同期可能になりました"
 
-#: replication/logical/slotsync.c:629
+#: replication/logical/slotsync.c:645
 #, c-format
 msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
 msgstr "受信したスロット\"%3$s\"のスロット同期LSN%1$X/%2$XがスタンバイのLSN%4$X/%5$Xよりも進んでいるためスロット同期をスキップします"
 
-#: replication/logical/slotsync.c:651
+#: replication/logical/slotsync.c:667
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
 msgstr "スタンバイに同名のスロット\"%s\"がすでに存在するため、スロット同期を終了しました"
 
-#: replication/logical/slotsync.c:820
+#: replication/logical/slotsync.c:838
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "プライマリサーバーからフェイルオーバー属性を持つ論理スロットを取得できませんでした: %s"
 
-#: replication/logical/slotsync.c:969
+#: replication/logical/slotsync.c:987
 #, c-format
 msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
 msgstr "プライマリサーバーからプライマリのスロット名\"%s\"の情報を取得できませんでした: %s"
 
-#: replication/logical/slotsync.c:971
+#: replication/logical/slotsync.c:989
 #, c-format
 msgid "Check if \"primary_slot_name\" is configured correctly."
 msgstr "\"primary_slot_name\"が正しく設定されているか確認してください。"
 
-#: replication/logical/slotsync.c:991
+#: replication/logical/slotsync.c:1009
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "スタンバイサーバーからのリプリケーションスロットの同期ができませんでした"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:1000
+#: replication/logical/slotsync.c:1018
 #, c-format
 msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
 msgstr "%2$sで指定されたレプリケーションスロット\"%1$s\"はプライマリサーバーに存在しません"
@@ -21112,60 +21203,60 @@ msgstr "%2$sで指定されたレプリケーションスロット\"%1$s\"はプ
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1033
+#: replication/logical/slotsync.c:1051
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "レプリケーションスロットの同期を行う際は\"%2$s\"で\"%1$s\"が指定されている必要があります"
 
-#: replication/logical/slotsync.c:1054
+#: replication/logical/slotsync.c:1070
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "レプリケーションスロットの同期を行う際は\"wal_level\" >= \"logical\" である必要があります"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1067 replication/logical/slotsync.c:1095
+#: replication/logical/slotsync.c:1085 replication/logical/slotsync.c:1113
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "レプリケーションスロットの同期を行う際は\"%s\"が設定されている必要があります"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1081
+#: replication/logical/slotsync.c:1099
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "レプリケーションスロットの同期を行う際は\"%s\"が有効になっている必要があります"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1133
+#: replication/logical/slotsync.c:1151
 #, c-format
 msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
 msgstr "\"%s\"が無効にされたため、レプリケーションスロット同期ワーカーがシャットダウンします"
 
-#: replication/logical/slotsync.c:1142
+#: replication/logical/slotsync.c:1160
 #, c-format
 msgid "replication slot synchronization worker will restart because of a parameter change"
 msgstr "パラメータの変更があったため、レプリケーションスロット同期ワーカーが再起動します"
 
-#: replication/logical/slotsync.c:1166
+#: replication/logical/slotsync.c:1184
 #, c-format
-msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr "SIGINTを受信したためレプリケーションスロット同期ワーカーがシャットダウンします"
+msgid "replication slot synchronization worker is shutting down because promotion is triggered"
+msgstr "昇格がトリガーされたため、レプリケーションスロット同期ワーカーがシャットダウンします"
 
-#: replication/logical/slotsync.c:1291
+#: replication/logical/slotsync.c:1309
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "スタンバイの昇格処理中はリプリケーションスロットの同期はできません"
 
-#: replication/logical/slotsync.c:1299
+#: replication/logical/slotsync.c:1317
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "複数のレプリケーションスロットの並行同期はできません"
 
-#: replication/logical/slotsync.c:1407
+#: replication/logical/slotsync.c:1425
 #, c-format
 msgid "slot sync worker started"
 msgstr "スロット同期ワーカーが起動しました"
 
-#: replication/logical/slotsync.c:1470 replication/slotfuncs.c:929
+#: replication/logical/slotsync.c:1487 replication/slotfuncs.c:928
 #, c-format
 msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
 msgstr "同期ワーカー\"%s\"はプライマリ・サーバーに接続できませんでした: %s"
@@ -21181,57 +21272,57 @@ msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
 msgstr[0] "エクスポートされた論理デコードスナップショット: \"%s\" (%u個のトランザクションID を含む)"
 
-#: replication/logical/snapbuild.c:1265 replication/logical/snapbuild.c:1362 replication/logical/snapbuild.c:1868
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410 replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "論理デコードは一貫性ポイントを%X/%Xで発見しました"
 
-#: replication/logical/snapbuild.c:1267
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "実行中のトランザクションはありません。"
 
-#: replication/logical/snapbuild.c:1314
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "論理デコードは初期開始点を%X/%Xで発見しました"
 
-#: replication/logical/snapbuild.c:1316 replication/logical/snapbuild.c:1340
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "%2$uより古いトランザクション(おおよそ%1$d個)の完了を待っています"
 
-#: replication/logical/snapbuild.c:1338
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr "論理デコードは初期の一貫性ポイントを%X/%Xで発見しました"
 
-#: replication/logical/snapbuild.c:1364
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "古いトランザクションはこれ以上はありません"
 
-#: replication/logical/snapbuild.c:1735
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "スナップショット構築状態ファイル\"%1$s\"のマジックナンバーが不正です: %3$uのはずが%2$uでした"
 
-#: replication/logical/snapbuild.c:1741
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr "スナップショット状態ファイル\"%1$s\"のバージョン%2$uはサポート外です: %3$uのはずが%2$uでした"
 
-#: replication/logical/snapbuild.c:1782
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr "スナップショット生成状態ファイル\"%s\"のチェックサムが一致しません: %uですが、%uであるべきです"
 
-#: replication/logical/snapbuild.c:1870
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "論理デコードは保存されたスナップショットを使って開始します。"
 
-#: replication/logical/snapbuild.c:1977
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "ファイル名\"%s\"をパースできませんでした"
@@ -21241,582 +21332,561 @@ msgstr "ファイル名\"%s\"をパースできませんでした"
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr "サブスクリプション\"%s\"、テーブル\"%s\"に対する論理レプリケーションテーブル同期ワーカーが終了しました"
 
-#: replication/logical/tablesync.c:640
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr "two_phaseを有効化可能にするため、サブスクリプション\"%s\"に対応する論理レプリケーション適用ワーカーを再起動します"
 
-#: replication/logical/tablesync.c:830 replication/logical/tablesync.c:971
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "パブリッシャからテーブル\"%s.%s\"のテーブル情報を取得できませんでした: %s"
 
-#: replication/logical/tablesync.c:837
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "テーブル\"%s.%s\"がパブリッシャ上で見つかりませんでした"
 
-#: replication/logical/tablesync.c:890
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "パブリッシャからテーブル\"%s.%s\"の列リスト情報を取得できませんでした: %s"
 
-#: replication/logical/tablesync.c:1069
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr "パブリッシャからテーブル\"%s.%s\"のテーブルのテーブルWHERE句を取得できませんでした: %s"
 
-#: replication/logical/tablesync.c:1236
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "テーブル\"%s.%s\"の初期内容のコピーを開始できませんでした: %s"
 
-#: replication/logical/tablesync.c:1351
+#: replication/logical/tablesync.c:1380
 #, c-format
 msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
 msgstr "サブスクリプション\"%s\"のテーブル同期ワーカーがパブリッシャに接続できませんでした: %s"
 
-#: replication/logical/tablesync.c:1436
+#: replication/logical/tablesync.c:1480
 #, c-format
 msgid "table copy could not start transaction on publisher: %s"
 msgstr "テーブルコピー中にパブリッシャ上でのトランザクション開始に失敗しました: %s"
 
-#: replication/logical/tablesync.c:1479
-#, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "レプリケーション基点\"%s\"はすでに存在します"
-
-#: replication/logical/tablesync.c:1512 replication/logical/worker.c:2383
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr "ユーザー\"%s\"は行レベルセキュリティが有効なリレーションへのレプリケーションはできません: \"%s\""
 
-#: replication/logical/tablesync.c:1525
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "テーブルコピー中にパブリッシャ上でのトランザクション終了に失敗しました: %s"
 
-#: replication/logical/worker.c:479
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "サブスクリプション\"%s\"に対応する論理レプリケーション並列適用ワーカーが停止します"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr "すべてのテーブルの同期が完了するまでは、ストリームされたトランザクションを適用ワーカーで扱うことはできません。"
 
-#: replication/logical/worker.c:851 replication/logical/worker.c:966
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "論理レプリケーション列%dのバイナリデータ書式が不正です"
 
-#: replication/logical/worker.c:2530
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr "論理レプリケーション先のリレーション\"%s.%s\"は複製の識別列を期待していましたが、パブリッシャは送信しませんでした"
 
-#: replication/logical/worker.c:2537
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr "論理レプリケーション先のリレーション\"%s.%s\"が識別列インデックスも主キーをもっておらず、かつパブリッシュされたリレーションがREPLICA IDENTITY FULLとなっていません"
 
-#: replication/logical/worker.c:3472
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "不正な論理レプリケーションのメッセージタイプ \"??? (%d)\""
 
-#: replication/logical/worker.c:3644
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "パブリッシャからのデータストリームが終了しました"
 
-#: replication/logical/worker.c:3798
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "タイムアウトにより論理レプリケーションワーカーを終了しています"
 
-#: replication/logical/worker.c:3995
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr "サブスクリプション\"%s\"が削除されたため、このサブスクリプションに対応する論理レプリケーションワーカーが停止します"
 
-#: replication/logical/worker.c:4009
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr "サブスクリプション\"%s\"が無効化されたため、このサブスクリプションに対応する論理レプリケーションワーカーが停止します"
 
-#: replication/logical/worker.c:4040
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr "パラメータの変更があったため、サブスクリプション\"%s\"に対応する論理レプリケーション並列適用ワーカーが停止します"
 
-#: replication/logical/worker.c:4044
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr "パラメータの変更があったため、サブスクリプション\"%s\"に対応する論理レプリケーションワーカーが再起動します"
 
-#: replication/logical/worker.c:4058
+#: replication/logical/worker.c:4053
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
 msgstr "サブスクリプション\"%s\"の所有者のスーパーユーザー権限が剥奪されたため、このサブスクリプションに対応する論理レプリケーション並列適用ワーカーが停止します"
 
-#: replication/logical/worker.c:4062
+#: replication/logical/worker.c:4057
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
 msgstr "サブスクリプション\"%s\"の所有者のスーパーユーザー権限が剥奪されたため、このサブスクリプションに対応する論理レプリケーションワーカーが再起動します"
 
-#: replication/logical/worker.c:4564
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "サブスクリプションにレプリケーションスロットが設定されていません"
 
-#: replication/logical/worker.c:4589
+#: replication/logical/worker.c:4592
 #, c-format
 msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
 msgstr "サブスクリプション\"%s\"の適用ワーカーがパブリッシャに接続できませんでした: %s"
 
-#: replication/logical/worker.c:4678
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr "サブスクリプション%uが起動中に削除されたため、このサブスクリプションに対応する論理レプリケーションワーカーは起動しません"
 
-#: replication/logical/worker.c:4694
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr "サブスクリプション\"%s\"が起動中に無効化されたため、このサブスクリプションに対応する論理レプリケーションワーカーは起動しません"
 
-#: replication/logical/worker.c:4718
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr "サブスクリプション\"%s\"、テーブル\"%s\"に対応する論理レプリケーションテーブル同期ワーカーが起動しました"
 
-#: replication/logical/worker.c:4723
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "サブスクリプション\"%s\"に対応する論理レプリケーション適用ワーカーが起動しました"
 
-#: replication/logical/worker.c:4845
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "サブスクリプション\"%s\"はエラーのため無効化されました"
 
-#: replication/logical/worker.c:4893
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "論理レプリケーションは%X/%Xででトランザクションのスキップを開始します"
 
-#: replication/logical/worker.c:4907
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "論理レプリケーションは%X/%Xでトランザクションのスキップを完了しました"
 
-#: replication/logical/worker.c:4989
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "サブスクリプションの\"%s\"スキップLSNをクリアしました"
 
-#: replication/logical/worker.c:4990
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr "リモートトランザクションの完了WAL位置(LSN) %X/%XがスキップLSN %X/%X と一致しません。"
 
-#: replication/logical/worker.c:5027
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr "メッセージタイプ \"%2$s\"でレプリケーション基点\"%1$s\"のリモートからのデータを処理中"
 
-#: replication/logical/worker.c:5031
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr "トランザクション%3$u中、メッセージタイプ\"%2$s\"でレプリケーション基点\"%1$s\"のリモートからのデータを処理中"
 
-#: replication/logical/worker.c:5036
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr "%4$X/%5$Xで終了したトランザクション%3$u中、メッセージタイプ\"%2$s\"でレプリケーション基点\"%1$s\"のリモートからのデータを処理中"
 
-#: replication/logical/worker.c:5047
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr "レプリケーション起点\"%1$s\"のリモートデータ処理中、トランザクション%5$uのレプリケーション対象リレーション\"%3$s.%4$s\"に対するメッセージタイプ\"%2$s\"内"
 
-#: replication/logical/worker.c:5054
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr "%6$X/%7$Xで終了したトランザクション%5$u中、レプリケーション先リレーション\"%3$s.%4$s\"に対するメッセージタイプ\"%2$s\"でレプリケーション基点\"%1$s\"のリモートからのデータを処理中"
 
-#: replication/logical/worker.c:5065
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr "レプリケーション起点\"%1$s\"のリモートデータ処理中、トランザクション%6$uのレプリケーション対象リレーション\"%3$s.%4$s\"、列\"%5$s\"に対するメッセージタイプ\"%2$s\"内"
 
-#: replication/logical/worker.c:5073
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr "%7$X/%8$Xで終了したトランザクション%6$u中、レプリケーション先リレーション\"%3$s.%4$s\"、列\"%5$s\"に対するメッセージタイプ\"%2$s\"でレプリケーション基点\"%1$s\"のリモートからのデータを処理中"
 
-#: replication/pgoutput/pgoutput.c:328
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "不正なproto_version"
 
-#: replication/pgoutput/pgoutput.c:333
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_version \"%s\"は範囲外です"
 
-#: replication/pgoutput/pgoutput.c:350
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "publication_namesの構文が不正です"
 
-#: replication/pgoutput/pgoutput.c:420 replication/pgoutput/pgoutput.c:424
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "オプション\"%s\"が指定されていません"
 
-#: replication/pgoutput/pgoutput.c:469
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "クライアントが proto_version=%d を送信してきましたが、サーバーはバージョン%d以下のプロトコルのみしかサポートしていません"
 
-#: replication/pgoutput/pgoutput.c:475
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "クライアントが proto_version=%d を送信してきましたが、サーバーはバージョン%d以上のプロトコルのみしかサポートしていません"
 
-#: replication/pgoutput/pgoutput.c:490
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr "要求されたproto_version=%dではストリーミングをサポートしていません、%d以上が必要です"
 
-#: replication/pgoutput/pgoutput.c:496
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr "要求された proto_version=%d は並列ストリーミングをサポートしません、%d以上である必要があります"
 
-#: replication/pgoutput/pgoutput.c:501
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "ストリーミングが要求されましたが、出力プラグインでサポートされていません"
 
-#: replication/pgoutput/pgoutput.c:515
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr "要求されたproto_version=%dは2相コミットをサポートしていません、%d以上が必要です"
 
-#: replication/pgoutput/pgoutput.c:520
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "2相コミットが要求されました、しかし出力プラグインではサポートされていません"
 
-#: replication/pgoutput/pgoutput.c:1085
+#: replication/pgoutput/pgoutput.c:1112
 #, c-format
 msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
 msgstr "異なるパブリケーションでテーブル\"%s.%s\"に対してpublish_generated_columnsの値を異なる設定にすることはできません"
 
-#: replication/pgoutput/pgoutput.c:1792
+#: replication/pgoutput/pgoutput.c:1815
 #, c-format
-msgid "skipped loading publication: %s"
-msgstr "パブリケーションの読み込みをスキップしました: %s"
+msgid "skipped loading publication \"%s\""
+msgstr "パブリケーションの読み込みをスキップしました\"%s\""
 
-#: replication/pgoutput/pgoutput.c:1793
+#: replication/pgoutput/pgoutput.c:1816
 #, c-format
 msgid "The publication does not exist at this point in the WAL."
 msgstr "このパブリケーションはWALのこの時点では存在しません。"
 
-#: replication/pgoutput/pgoutput.c:1794
+#: replication/pgoutput/pgoutput.c:1817
 #, c-format
 msgid "Create the publication if it does not exist."
 msgstr "パブリケーションが存在しない場合は作成してください。"
 
-#: replication/slot.c:275
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "レプリケーションスロット名\"%s\"は短すぎます"
 
-#: replication/slot.c:284
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "レプリケーションスロット名\"%s\"は長すぎます"
 
-#: replication/slot.c:297
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "レプリケーションスロット名\"%s\"は不正な文字を含んでいます"
 
-#: replication/slot.c:299
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr "レプリケーションスロット名は小文字、数字とアンダースコアのみを含むことができます。"
 
-#: replication/slot.c:348
+#: replication/slot.c:377
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr "スタンバイ上で作成したレプリケーションスロットのフェイルオーバーを有効にすることはできません"
 
-#: replication/slot.c:360 replication/slot.c:885
+#: replication/slot.c:389 replication/slot.c:925
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "一時レプリケーションスロットのフェイルオーバーを有効にすることはできません"
 
-#: replication/slot.c:385
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "レプリケーションスロット\"%s\"はすでに存在します"
 
-#: replication/slot.c:395
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "レプリケーションスロットは全て使用中です"
 
-#: replication/slot.c:396
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "どれか一つを解放するか、\"max_replication_slots\"を大きくしてください。"
 
-#: replication/slot.c:579 replication/slotfuncs.c:664 utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
+#: replication/slot.c:609 replication/slotfuncs.c:664 utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "レプリケーションスロット\"%s\"は存在しません"
 
-#: replication/slot.c:634 replication/slot.c:1388
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "レプリケーションスロット\"%s\"はPID%dで使用中です"
 
-#: replication/slot.c:651
+#: replication/slot.c:681
 #, c-format
 msgid "can no longer access replication slot \"%s\""
 msgstr "レプリケーションスロット\"%s\"にはすでにアクセスできなくなっています"
 
-#: replication/slot.c:653
+#: replication/slot.c:683
 #, c-format
 msgid "This replication slot has been invalidated due to \"%s\"."
 msgstr "このレプリケーションスロットは\"%s\"によって無効化されています。"
 
-#: replication/slot.c:672
+#: replication/slot.c:702
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "論理レプリケーションスロット\"%s\"を取得しました"
 
-#: replication/slot.c:674
+#: replication/slot.c:704
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "物理レプリケーションスロット\"%s\"を取得しました"
 
-#: replication/slot.c:759
+#: replication/slot.c:789
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "論理レプリケーションスロット\"%s\"を解放しました"
 
-#: replication/slot.c:761
+#: replication/slot.c:791
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "物理レプリケーションスロット\"%s\"を解放しました"
 
-#: replication/slot.c:827
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "レプリケーションスロット\"%s\"を削除できませんでした"
 
-#: replication/slot.c:850
+#: replication/slot.c:890
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "%sは物理レプリケーションスロットでは使用できません"
 
-#: replication/slot.c:862
+#: replication/slot.c:902
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "レプリケーションスロット\"%s\"を変更できませんでした"
 
-#: replication/slot.c:872
+#: replication/slot.c:912
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "スタンバイ上ではレプリケーションスロットのフェイルオーバーを有効にすることはできません"
 
-#: replication/slot.c:1020 replication/slot.c:2120 replication/slot.c:2505
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "ディレクトリ\"%s\"を削除できませんでした"
 
-#: replication/slot.c:1423
+#: replication/slot.c:1534
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr "レプリケーションスロットは\"max_replication_slots\" > 0 のときだけ使用できます"
 
-#: replication/slot.c:1428
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "レプリケーションスロットは\"wal_level\" >= \"replica\" のときだけ使用できます"
 
-#: replication/slot.c:1440
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "レプリケーションスロットを使用する権限がありません"
 
-#: replication/slot.c:1441
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "%s属性を持つロールのみがレプリケーションスロットを使用できます。"
 
-#: replication/slot.c:1550
+#: replication/slot.c:1664
 #, c-format
 msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
 msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
 msgstr[0] "このスロットのrestart_lsn %X/%Xは制限を%<PRIu64>バイト超過しています。"
 
-#: replication/slot.c:1561
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "このスロットはXID地平線%uと競合しました。"
 
-#: replication/slot.c:1566
+#: replication/slot.c:1680
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "論理デコードを行うためにはプライマリサーバー上で\"wal_level\" >= \"logical\" である必要があります。"
 
 #. translator: %s is a GUC variable name
-#: replication/slot.c:1575
+#: replication/slot.c:1686
 #, c-format
-msgid "The slot's idle time of %dmin %02ds exceeds the configured \"%s\" duration of %dmin."
-msgstr "このスロットのアイドル時間 %d分%02d秒が、\"%s\"で設定された %d分を超えています。"
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr "このスロットのアイドル時間 %ld秒が、\"%s\"で設定された %d秒を超えています。"
 
-#: replication/slot.c:1589
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "プロセス%dを終了してレプリケーションスロット\"%s\"を解放します"
 
-#: replication/slot.c:1591
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "使用不能のレプリケーションスロット\"%s\"を無効化します"
 
-#: replication/slot.c:2443
+#: replication/slot.c:2559
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "レプリケーションスロットファイル\"%1$s\"のマジックナンバーが不正です: %3$uのはずが%2$uでした"
 
-#: replication/slot.c:2450
+#: replication/slot.c:2566
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "レプリケーションスロットファイル\"%s\"はサポート外のバージョン%uです"
 
-#: replication/slot.c:2457
+#: replication/slot.c:2573
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "レプリケーションスロットファイル\"%s\"のサイズ%uは異常です"
 
-#: replication/slot.c:2493
+#: replication/slot.c:2609
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "レプリケーションスロットファイル\"%s\"のチェックサムが一致しません: %uですが、%uであるべきです"
 
-#: replication/slot.c:2529
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "論理レプリケーションスロット\"%s\"がありますが、\"wal_level\" < \"logical\" です"
 
-#: replication/slot.c:2531
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "\"wal_level\"を\"logical\"もしくはそれより上位の設定にしてください。"
 
-#: replication/slot.c:2543
+#: replication/slot.c:2659
 #, c-format
 msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
 msgstr "論理レプリケーションスロット\"%s\"がありますが、\"hot_standby\" = \"off\" です"
 
-#: replication/slot.c:2545
+#: replication/slot.c:2661
 #, c-format
 msgid "Change \"hot_standby\" to be \"on\"."
 msgstr "\"hot_standby\" を \"on\" に変更してください。"
 
-#: replication/slot.c:2550
+#: replication/slot.c:2666
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "物理レプリケーションスロット\"%s\"がありますが、\"wal_level\" < \"replica\" です"
 
-#: replication/slot.c:2552
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "\"wal_level\"を\"replica\"もしくはそれより上位の設定にしてください。"
 
-#: replication/slot.c:2598
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "シャットダウン前のアクティブなレプリケーションスロットの数が多すぎます"
 
-#: replication/slot.c:2599
+#: replication/slot.c:2716
 #, c-format
 msgid "Increase \"max_replication_slots\" and try again."
 msgstr "\"max_replication_slots\"を増やして再度試してください"
 
-#: replication/slot.c:2676
-#, c-format
-msgid "Replication slot \"%s\" does not exist."
-msgstr "レプリケーションスロット\"%s\"は存在しません。"
-
-#: replication/slot.c:2684
-#, c-format
-msgid "\"%s\" is not a physical replication slot."
-msgstr "\"%s\"は物理レプリケーションスロットではありません。"
-
-#: replication/slot.c:2863
+#: replication/slot.c:2953
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "パラメータ\"%2$s\"で指定されているレプリケーションスロット\"%1$s\"は存在しません"
 
-#: replication/slot.c:2865 replication/slot.c:2899 replication/slot.c:2914
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
 #, c-format
 msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
 msgstr "論理レプリケーションはレプリケーションスロット”%s\"に対応するスタンバイを待っています。 "
 
-#: replication/slot.c:2867
+#: replication/slot.c:2957
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "レプリケーションスロット\"%s\"を作成するか、パラメータ\"%s\"を修正してください。"
 
-#: replication/slot.c:2877
+#: replication/slot.c:2967
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "パラメータ\"%2$s\"では論理レプリケーションスロット\"%1$s\"は指定できません"
 
-#: replication/slot.c:2879
+#: replication/slot.c:2969
 #, c-format
 msgid "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "論理レプリケーションはレプリケーションスロット\"%s\"が修正されるのを待っています。"
 
-#: replication/slot.c:2881
+#: replication/slot.c:2971
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "論理レプリケーションスロット\"%s\"をパラメータ\"%s\"から削除してください。"
 
-#: replication/slot.c:2897
+#: replication/slot.c:2987
 #, c-format
 msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
 msgstr "パラメータ\"%2$s\"で指定された物理レプリケーションスロット\"%1$s\"は無効化されています"
 
-#: replication/slot.c:2901
+#: replication/slot.c:2991
 #, c-format
 msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "レプリケーションスロット\"%s\"を削除して再作成するか、パラメータ\"%s\"を修正してください。"
 
-#: replication/slot.c:2912
+#: replication/slot.c:3002
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
 msgstr "\"%2$s\"で指定されたレプリケーションスロット\"%1$s\"にはactive_pidがありません"
 
-#: replication/slot.c:2916
+#: replication/slot.c:3006
 #, c-format
 msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "レプリケーションスロット\"%s\"に関連付けられているスタンバイを起動するか、パラメータ%sを修正してください。"
 
-#: replication/slot.c:3008
-#, c-format
-msgid "\"%s\" must be set to 0 during binary upgrade mode."
-msgstr "バイナリアップグレードモード中は\"%s\"は0に設定されている必要があります。"
-
 #: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
@@ -21892,38 +21962,38 @@ msgstr "コピー元のレプリケーションスロットがコピー処理中
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "レプリケーションスロットはスタンバイサーバーへのみ同期可能です"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "管理者コマンドにより同期レプリケーションの待ち状態をキャンセルし、接続を終了しています"
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, c-format
 msgid "The transaction has already committed locally, but might not have been replicated to the standby."
 msgstr "トランザクションはローカルではすでにコミット済みですが、スタンバイ側にはレプリケーションされていない可能性があります。"
 
-#: replication/syncrep.c:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "ユーザーからの要求により同期レプリケーションの待ち状態をキャンセルしています"
 
 # y, c-format
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "スタンバイ\"%s\"は優先度%dの同期スタンバイになりました"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "スタンバイ\"%s\"は定足数同期スタンバイの候補になりました"
 
-#: replication/syncrep.c:1014
+#: replication/syncrep.c:1081
 #, c-format
 msgid "\"%s\" parser failed."
 msgstr "\"%s\"のパーサーが失敗しました。"
 
-#: replication/syncrep.c:1021
+#: replication/syncrep.c:1088
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "同期スタンバイの数(%d)は1以上である必要があります"
@@ -21998,123 +22068,118 @@ msgstr "プライマリサーバーからライムライン%u用のタイムラ
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "WALファイルセグメント%sのオフセット%d、長さ%luの書き込みが失敗しました: %m"
 
-#: replication/walsender.c:505
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "%sは論理レプリケーションスロットでは使用できません"
 
-#: replication/walsender.c:609 storage/smgr/md.c:1867
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "ファイル\"%s\"の終端へシークできませんでした: %m"
 
-#: replication/walsender.c:613
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "ファイル\"%s\"の先頭にシークできませんでした: %m"
 
-#: replication/walsender.c:829
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "論理レプリケーションスロットは物理レプリケーションには使用できません"
 
-#: replication/walsender.c:895
+#: replication/walsender.c:909
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "タイムライン%3$u上の要求された開始ポイント%1$X/%2$Xはサーバーの履歴にありません"
 
-#: replication/walsender.c:898
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "サーバーの履歴はタイムライン%uの%X/%Xからフォークしました。"
 
-#: replication/walsender.c:942
+#: replication/walsender.c:956
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "要求された開始ポイント%X/%XはサーバーのWALフラッシュ位置%X/%Xより進んでいます"
 
-#: replication/walsender.c:1137
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "CREATE_REPLICATION_SLOTのオプション\"%s\"に対する認識できない値: \"%s\""
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1243
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%sはトランザクション内では呼び出せません"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1253
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%sはトランザクション内で呼び出さなければなりません"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1259
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s は REPEATABLE READ 分離レベルのトランザクションで呼び出されなければなりません"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1264
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%sは読み取り専用トランザクションの中で呼び出さなければなりません"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1270
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s は問い合わせの実行前に呼び出されなければなりません"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s はサブトランザクション内では呼び出せません"
 
-#: replication/walsender.c:1453
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "昇格後にWAL送信プロセスを終了します"
 
-#: replication/walsender.c:1994
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "WAL送信プロセスが停止モードの間は新しいコマンドを実行できません"
 
-#: replication/walsender.c:2029
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "物理レプリケーション用のWAL送信プロセスでSQLコマンドは実行できません"
 
-#: replication/walsender.c:2060
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "レプリケーションコマンドを受信しました: %s"
 
-#: replication/walsender.c:2068 tcop/fastpath.c:208 tcop/postgres.c:1137 tcop/postgres.c:1495 tcop/postgres.c:1747 tcop/postgres.c:2253 tcop/postgres.c:2690 tcop/postgres.c:2767
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137 tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251 tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr "現在のトランザクションがアボートしました。トランザクションブロックが終わるまでコマンドは無視されます"
 
-#: replication/walsender.c:2225 replication/walsender.c:2260
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "スタンバイ接続で想定外のEOFがありました"
 
-#: replication/walsender.c:2248
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "スタンバイのメッセージタイプ\"%c\"は不正です"
 
-#: replication/walsender.c:2337
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "想定しないメッセージタイプ\"%c\""
 
-#: replication/walsender.c:2751
+#: replication/walsender.c:2789
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "レプリケーションタイムアウトにより WAL 送信プロセスを終了しています"
@@ -22299,280 +22364,280 @@ msgstr "ON SELECTルールの名前を変更することはできません"
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr "WITH の問い合わせ名\"%s\"が、ルールのアクションと書き換えられようとしている問い合わせの両方に現れています"
 
-#: rewrite/rewriteHandler.c:617
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "INSERT ... SELECTルールのアクションはWITHにデータ更新文を持つ問い合わせに対してはサポートされません"
 
-#: rewrite/rewriteHandler.c:671
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "複数ルールではRETURNINGリストを持つことはできません"
 
-#: rewrite/rewriteHandler.c:908 rewrite/rewriteHandler.c:947
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "列\"%s\"への非デフォルト値の挿入はできません"
 
-#: rewrite/rewriteHandler.c:910 rewrite/rewriteHandler.c:976
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "列\"%s\"は GENERATED ALWAYS として定義されています。"
 
-#: rewrite/rewriteHandler.c:912
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "OVERRIDING SYSTEM VALUE を指定することで挿入を強制できます。"
 
-#: rewrite/rewriteHandler.c:974 rewrite/rewriteHandler.c:982
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "列\"%s\"はDEFAULTにのみ更新可能です"
 
-#: rewrite/rewriteHandler.c:1118 rewrite/rewriteHandler.c:1136
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "同じ列\"%s\"に複数の代入があります"
 
-#: rewrite/rewriteHandler.c:1691
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGEはルールを持つリレーションに対してはサポートされません。"
 
-#: rewrite/rewriteHandler.c:1731 rewrite/rewriteHandler.c:3271
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr "非システムのビュー\"%s\"へのアクセスは制限されています"
 
-#: rewrite/rewriteHandler.c:2130 rewrite/rewriteHandler.c:4265
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "リレーション\"%s\"のルールで無限再帰を検出しました"
 
-#: rewrite/rewriteHandler.c:2235
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "リレーション\"%s\"のポリシで無限再帰を検出しました"
 
-#: rewrite/rewriteHandler.c:2598
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "ジャンクビュー列は更新不可です。"
 
-#: rewrite/rewriteHandler.c:2603
+#: rewrite/rewriteHandler.c:2606
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "基底リレーションの列ではないビュー列は更新不可です。"
 
-#: rewrite/rewriteHandler.c:2606
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that refer to system columns are not updatable."
 msgstr "システム列を参照するビュー列は更新不可です。"
 
-#: rewrite/rewriteHandler.c:2609
+#: rewrite/rewriteHandler.c:2612
 msgid "View columns that return whole-row references are not updatable."
 msgstr "行全体参照を返すビュー列は更新不可です。"
 
-#: rewrite/rewriteHandler.c:2670
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "DISTINCTを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2673
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "GROUP BYを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2676
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "HAVINGを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2679
+#: rewrite/rewriteHandler.c:2682
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "UNION、INTERSECT、EXCEPTを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2682
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "WITHを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2685
+#: rewrite/rewriteHandler.c:2688
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "LIMIT、OFFSETを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2697
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "集約関数を返すビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2700
+#: rewrite/rewriteHandler.c:2703
 msgid "Views that return window functions are not automatically updatable."
 msgstr "ウィンドウ関数を返すビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2703
+#: rewrite/rewriteHandler.c:2706
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "集合返却関数を返すビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2710 rewrite/rewriteHandler.c:2714 rewrite/rewriteHandler.c:2722
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717 rewrite/rewriteHandler.c:2725
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "単一のテーブルまたはビューからselectしていないビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2725
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "TABLESAMPLEを含むビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:2749
+#: rewrite/rewriteHandler.c:2752
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "更新可能な列を持たないビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:3130 rewrite/rewriteHandler.c:3165
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "ビュー\"%s\"へは挿入(INSERT)できません"
 
-#: rewrite/rewriteHandler.c:3133
+#: rewrite/rewriteHandler.c:3136
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "ビューへの挿入を可能にするために、INSTEAD OF INSERTトリガまたは無条件のON INSERT DO INSTEADルールを作成してください。"
 
-#: rewrite/rewriteHandler.c:3138 rewrite/rewriteHandler.c:3174
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "ビュー\"%s\"は更新できません"
 
-#: rewrite/rewriteHandler.c:3141
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "ビューへの更新を可能にするために、INSTEAD OF UPDATEトリガまたは無条件のON UPDATE DO INSTEADルールを作成してください。"
 
-#: rewrite/rewriteHandler.c:3146 rewrite/rewriteHandler.c:3183
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "ビュー\"%s\"からは削除できません"
 
-#: rewrite/rewriteHandler.c:3149
+#: rewrite/rewriteHandler.c:3152
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "ビューからの削除を可能にするために、INSTEAD OF DELETEトリガまたは無条件のON DELETE DO INSTEADルールを作成してください。"
 
-#: rewrite/rewriteHandler.c:3168
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
 msgstr "MERGEを用いたビューへの挿入を可能にするには、INSTEAD OF INSERTトリガーを作成してください。"
 
-#: rewrite/rewriteHandler.c:3177
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
 msgstr "MERGEを用いたビューの更新を可能にするには、INSTEAD OF UPDATEトリガーを作成してください。"
 
-#: rewrite/rewriteHandler.c:3186
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
 msgstr "MERGEを用いたビューからの削除を可能にするためには、INSTEAD OF DELETEトリガーを作成してください。"
 
-#: rewrite/rewriteHandler.c:3361
+#: rewrite/rewriteHandler.c:3364
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "ビュー\"%2$s\"の列\"%1$s\"への挿入はできません"
 
-#: rewrite/rewriteHandler.c:3369
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "ビュー\"%2$s\"の列\"%1$s\"は更新できません"
 
-#: rewrite/rewriteHandler.c:3377
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "ビュー\"%2$s\"の列\"%1$s\"への統合はできません"
 
-#: rewrite/rewriteHandler.c:3405
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "ビュー\"%s\"への統合はできません"
 
-#: rewrite/rewriteHandler.c:3407
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
 msgstr "MERGEはINSTEAD OFトリガーが全てではなく一部のアクションに対してのみ設定されてるビューではサポートされません。"
 
-#: rewrite/rewriteHandler.c:3408
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
 msgstr "ビューへの統合を可能にするためには、完全なINSTEAD OF INSERTトリガーを作成するか、または既存のINSTEAD OFトリガーを削除してください。"
 
-#: rewrite/rewriteHandler.c:3923
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr "DO INSTEAD NOTIFYルールはWITH内のデータ更新文に対してはサポートされません"
 
-#: rewrite/rewriteHandler.c:3934
+#: rewrite/rewriteHandler.c:3953
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr "WITH にデータを変更するステートメントがある場合は DO INSTEAD NOTHING ルールはサポートされません"
 
-#: rewrite/rewriteHandler.c:3948
+#: rewrite/rewriteHandler.c:3967
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "WITH にデータを変更するステートメントがある場合は、条件付き DO INSTEAD ルールはサポートされません"
 
-#: rewrite/rewriteHandler.c:3952
+#: rewrite/rewriteHandler.c:3971
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "WITH にデータを変更するステートメントがある場合は DO ALSO ルールはサポートされません"
 
-#: rewrite/rewriteHandler.c:3957
+#: rewrite/rewriteHandler.c:3976
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "WITH にデータを変更するステートメントがある場合はマルチステートメントの DO INSTEAD ルールはサポートされません"
 
-#: rewrite/rewriteHandler.c:4217
+#: rewrite/rewriteHandler.c:4237
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr "条件付きDO INSTEADルールを持つビューは自動更新できません。"
 
-#: rewrite/rewriteHandler.c:4314
+#: rewrite/rewriteHandler.c:4335
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "リレーション\"%s\"へのINSERT RETURNINGを行うことはできません"
 
-#: rewrite/rewriteHandler.c:4316
+#: rewrite/rewriteHandler.c:4337
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr "RETURNING句を持つ無条件のON INSERT DO INSTEADルールが必要です。"
 
-#: rewrite/rewriteHandler.c:4321
+#: rewrite/rewriteHandler.c:4342
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "リレーション\"%s\"へのUPDATE RETURNINGを行うことはできません"
 
-#: rewrite/rewriteHandler.c:4323
+#: rewrite/rewriteHandler.c:4344
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "RETURNING句を持つ無条件のON UPDATE DO INSTEADルールが必要です。"
 
-#: rewrite/rewriteHandler.c:4328
+#: rewrite/rewriteHandler.c:4349
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "リレーション\"%s\"へのDELETE RETURNINGを行うことはできません"
 
-#: rewrite/rewriteHandler.c:4330
+#: rewrite/rewriteHandler.c:4351
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr "RETURNING句を持つ無条件のON DELETE DO INSTEADルールが必要です。"
 
-#: rewrite/rewriteHandler.c:4348
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "ON CONFLICT句を伴うINSERTは、INSERTまたはUPDATEルールを持つテーブルでは使えません"
 
-#: rewrite/rewriteHandler.c:4405
+#: rewrite/rewriteHandler.c:4426
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "複数問い合わせに対するルールにより書き換えられた問い合わせでは WITH を使用できません"
 
-#: rewrite/rewriteManip.c:1222
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "条件付きのユーティリティ文は実装されていません"
 
-#: rewrite/rewriteManip.c:1567
+#: rewrite/rewriteManip.c:1520
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "ビューに対するWHERE CURRENT OFは実装されていません"
 
-#: rewrite/rewriteManip.c:1970
+#: rewrite/rewriteManip.c:1923
 #, 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 "ON UPDATE ルールのNEW変数は、対象のUPDATEコマンドでの複数列代入の一部となる列を参照することはできません"
@@ -22726,72 +22791,57 @@ msgstr "認識できないSnowballパラメータ: \"%s\""
 msgid "missing Language parameter"
 msgstr "Languageパラメータがありません"
 
-#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:932 statistics/relation_stats.c:98
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937 statistics/relation_stats.c:98
 #, c-format
 msgid "Statistics cannot be modified during recovery."
 msgstr "リカバリ中は統計情報の更新はできません。"
 
-#: statistics/attribute_stats.c:202
+#: statistics/attribute_stats.c:205
 #, c-format
-msgid "cannot specify both attname and attnum"
-msgstr "attname と attnum の両方を指定することはできません"
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "\"%s\"と\"%s\"の両方を同時には指定できません"
 
-#: statistics/attribute_stats.c:228
+#: statistics/attribute_stats.c:231
 #, c-format
-msgid "must specify either attname or attnum"
-msgstr "attname または attnum のいずれかを指定する必要があります"
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "\"%s\"または\"%s\"のいずれかを指定する必要があります"
 
-#: statistics/attribute_stats.c:236
+#: statistics/attribute_stats.c:239
 #, c-format
 msgid "cannot modify statistics on system column \"%s\""
 msgstr "システム列\"%s\"の統計情報は更新できません"
 
-#: statistics/attribute_stats.c:300
-#, c-format
-msgid "unable to determine element type of attribute \"%s\""
-msgstr "属性 \"%s\" の要素型を特定できません"
-
-#: statistics/attribute_stats.c:301
-#, c-format
-msgid "Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST."
-msgstr "STATISTIC_KIND_MCELEM および STATISTIC_KIND_DECHIST は設定できません。"
-
-#: statistics/attribute_stats.c:316
-#, c-format
-msgid "could not determine less-than operator for attribute \"%s\""
-msgstr "属性 \"%s\" の小なり演算子(<)を特定できませんでした"
-
-#: statistics/attribute_stats.c:317
+#: statistics/attribute_stats.c:303
 #, c-format
-msgid "Cannot set STATISTIC_KIND_HISTOGRAM or STATISTIC_KIND_CORRELATION."
-msgstr "STATISTIC_KIND_HISTOGRAM および STATISTIC_KIND_CORRELATION は設定できません。"
+msgid "could not determine element type of column \"%s\""
+msgstr "列\"%s\"の要素型を特定できません"
 
-#: statistics/attribute_stats.c:330
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321 statistics/attribute_stats.c:336
 #, c-format
-msgid "attribute \"%s\" is not a range type"
-msgstr "属性 \"%s\" は範囲型ではありません"
+msgid "Cannot set %s or %s."
+msgstr "%s と %s はいずれも設定できません。"
 
-#: statistics/attribute_stats.c:331
+#: statistics/attribute_stats.c:320
 #, c-format
-msgid "Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM."
-msgstr "STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM および STATISTIC_KIND_BOUNDS_HISTOGRAM は設定できません。"
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "列\"%s\"に対する小なり演算子(<)を特定できませんでした"
 
-#: statistics/attribute_stats.c:590 statistics/attribute_stats.c:598
+#: statistics/attribute_stats.c:335
 #, c-format
-msgid "attribute %d of relation \"%s\" does not exist"
-msgstr "リレーション \"%2$s\" の属性%1$dは存在しません"
+msgid "column \"%s\" is not a range type"
+msgstr "列\"%s\"は範囲型ではありません"
 
-#: statistics/attribute_stats.c:732 statistics/stat_utils.c:80
+#: statistics/attribute_stats.c:738
 #, c-format
-msgid "\"%s\" array cannot contain NULL values"
-msgstr "\"%s\" の配列はNULL値を格納できません"
+msgid "\"%s\" array must not contain null values"
+msgstr "\"%s\"配列にはNULL値を含められません"
 
-#: statistics/attribute_stats.c:775
+#: statistics/attribute_stats.c:781
 #, c-format
 msgid "maximum number of statistics slots exceeded: %d"
 msgstr "統計情報スロットの最大数を超過しました: %d"
 
-#: statistics/attribute_stats.c:942
+#: statistics/attribute_stats.c:949
 #, c-format
 msgid "cannot clear statistics on system column \"%s\""
 msgstr "システム列\"%s\"の統計情報はクリアできません"
@@ -22806,195 +22856,211 @@ msgstr "統計オブジェクト\"%s.%s\"がリレーション\"%s.%s\"に対し
 msgid "function returning record called in context that cannot accept type record"
 msgstr "レコード型を受け付けられないコンテキストでレコードを返す関数が呼び出されました"
 
-#: statistics/relation_stats.c:115
+#: statistics/relation_stats.c:117
 #, c-format
-msgid "reltuples cannot be < -1.0"
-msgstr "reltuplesは-1.0未満にはできません"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "引数\"%s\"は -1.0 以上でなければなりません"
 
-#: statistics/stat_utils.c:44
+#: statistics/stat_utils.c:47
 #, c-format
-msgid "\"%s\" cannot be NULL"
-msgstr "\"%s\"はNULLにはできません"
+msgid "argument \"%s\" must not be null"
+msgstr "引数\"%s\"はnullであってはなりません"
 
-#: statistics/stat_utils.c:71
+#: statistics/stat_utils.c:74
 #, c-format
-msgid "\"%s\" cannot be a multidimensional array"
-msgstr "\"%s\"は多次元配列にはなれません"
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "引数\"%s\"は多次元配列であってはなりません"
 
-#: statistics/stat_utils.c:111
+#: statistics/stat_utils.c:83
 #, c-format
-msgid "\"%s\" must be specified when \"%s\" is specified"
-msgstr "\"%s” は、\"%s\"が指定される際には必ず指定される必要があります"
+msgid "argument \"%s\" array must not contain null values"
+msgstr "引数\"%s\"配列にはNULL値を含んでいてはなりません"
 
-#: statistics/stat_utils.c:178
+#: statistics/stat_utils.c:114
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "引数\"%s\"は、引数\"%s\"が指定される際には必ず指定される必要があります"
+
+#: statistics/stat_utils.c:177
+#, c-format
+msgid "index \"%s\" was concurrently dropped"
+msgstr "インデックス\"%s\"の削除が同時に行われました"
+
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "インデックス\"%s\"の作成が同時に行われました"
+
+#: statistics/stat_utils.c:212
 #, c-format
 msgid "cannot modify statistics for relation \"%s\""
 msgstr "リレーション\"%s\"の統計情報は変更できません"
 
-#: statistics/stat_utils.c:199
+#: statistics/stat_utils.c:220
 #, c-format
 msgid "cannot modify statistics for shared relation"
 msgstr "共有リレーションの統計情報は変更できません"
 
-#: statistics/stat_utils.c:252
+#: statistics/stat_utils.c:260
 #, c-format
 msgid "unrecognized argument name: \"%s\""
 msgstr "識別できない引数名: \"%s\""
 
-#: statistics/stat_utils.c:266
+#: statistics/stat_utils.c:274
 #, c-format
-msgid "argument \"%s\" has type \"%s\", expected type \"%s\""
-msgstr "引数\"%s\"の型は\"%s\"ですが、期待される型は\"%s\"です"
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "引数\"%s\"の型は %s ですが、期待される型は %s です"
 
-#: statistics/stat_utils.c:307
+#: statistics/stat_utils.c:315
 #, c-format
 msgid "variadic arguments must be name/value pairs"
 msgstr "可変長引数は名前/値のペアである必要があります"
 
-#: statistics/stat_utils.c:308
+#: statistics/stat_utils.c:316
 #, c-format
 msgid "Provide an even number of variadic arguments that can be divided into pairs."
 msgstr "2つ組に分割できるよう、偶数個の可変長引数を指定してください。"
 
-#: statistics/stat_utils.c:322
+#: statistics/stat_utils.c:330
 #, c-format
-msgid "name at variadic position %d is NULL"
-msgstr "可変長引数の位置%dの名前がNULLです"
+msgid "name at variadic position %d is null"
+msgstr "可変長引数の位置%dの名前がnullです"
 
-#: statistics/stat_utils.c:326
+#: statistics/stat_utils.c:334
 #, c-format
-msgid "name at variadic position %d has type \"%s\", expected type \"%s\""
-msgstr "可変長引数の位置%dの名前の型が\"%s\"ですが、期待される型は\"%s\"です"
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "可変長引数の位置%dの名前の型が %s ですが、期待される型は %s です"
 
-#: storage/aio/aio.c:1222
+#: storage/aio/aio.c:1343
 #, c-format
 msgid "Only -1 or values bigger than 0 are valid."
 msgstr "-1または0より大きい値のみ有効です。"
 
-#: storage/aio/method_io_uring.c:171
+#: storage/aio/method_io_uring.c:369
 msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
 msgstr "io_uringが無効化されていないかを /proc/sys/kernel/io_uring_disabled で確認してください。"
 
-#: storage/aio/method_io_uring.c:176
+#: storage/aio/method_io_uring.c:374
 #, c-format
 msgid "Consider increasing \"ulimit -n\" to at least %d."
 msgstr "\"ulimit -n\"を少なくとも%dに増やすことを検討してください。"
 
-#: storage/aio/method_io_uring.c:182
-msgid "Kernel does not support io_uring."
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
 msgstr "カーネルはio_uringをサポートしていません。"
 
-#: storage/aio/method_io_uring.c:190
+#: storage/aio/method_io_uring.c:388
 #, c-format
 msgid "could not setup io_uring queue: %m"
 msgstr "io_uringキューのセットアップに失敗しました: %m"
 
-#: storage/aio/method_io_uring.c:324
+#: storage/aio/method_io_uring.c:522
 #, c-format
 msgid "completing I/O on behalf of process %d"
 msgstr "プロセス %d に代わってI/O完了させています"
 
-#: storage/aio/method_worker.c:379
+#: storage/aio/method_worker.c:382
 #, c-format
 msgid "I/O worker executing I/O on behalf of process %d"
 msgstr "I/Oワーカーがプロセス %d に代わってI/Oを実行中"
 
-#: storage/buffer/bufmgr.c:655 storage/buffer/bufmgr.c:811
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
 #, c-format
 msgid "cannot access temporary tables of other sessions"
 msgstr "他のセッションの一時テーブルにはアクセスできません"
 
-#: storage/buffer/bufmgr.c:2701 storage/buffer/localbuf.c:393
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "リレーション\"%s\"を%uブロックを超えて拡張できません"
 
-#: storage/buffer/bufmgr.c:2772
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "リレーション %2$s の %1$u ブロック目で、EOF の先に想定外のデータを検出しました"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "リレーション\"%2$s\"の%1$uブロック目で、EOF の先に想定外のデータを検出しました"
 
-#: storage/buffer/bufmgr.c:2775
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr "これはカーネルの不具合で発生した模様です。システムの更新を検討してください。"
 
-#: storage/buffer/bufmgr.c:6115
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "%u ブロックを %s に書き出せませんでした"
 
-#: storage/buffer/bufmgr.c:6119
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "複数回失敗しました ---ずっと書き込みエラーが続くかもしれません。"
 
-#: storage/buffer/bufmgr.c:6136 storage/buffer/bufmgr.c:6151
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "ブロック %u を リレーション %s に書き込んでいます"
+msgid "writing block %u of relation \"%s\""
+msgstr "リレーション\"%2$s\"のブロック%1$uの書き込み中"
 
-#: storage/buffer/bufmgr.c:7250
+#: storage/buffer/bufmgr.c:7317
 #, c-format
-msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation %s"
-msgstr "リレーション %5$s のブロック %3$u..%4$u の間で%1$uページをゼロクリアして、%2$u件のチェックサムエラーを無視しています"
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr "リレーション\"%5$s\"のブロック%3$u..%4$uの間の%1$uページをゼロクリアし、%2$u件のチェックサムエラーを無視します"
 
-#: storage/buffer/bufmgr.c:7253 storage/buffer/bufmgr.c:7279
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
 #, c-format
-msgid "Block %u held first zeroed page."
-msgstr "ゼロクリアした最初のページはブロック %u にありました。"
+msgid "Block %u held the first zeroed page."
+msgstr "ゼロクリアした最初のページはブロック%uにありました。"
 
-#: storage/buffer/bufmgr.c:7255
+#: storage/buffer/bufmgr.c:7322
 #, c-format
-msgid "See server log for details about the other %u invalid block(s)."
-msgstr "他の%u個の不正なブロックの詳細については、サーバーログを参照してください。"
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "他の%d個の不正なブロックの詳細については、サーバーログを参照してください。"
 
-#: storage/buffer/bufmgr.c:7270
+#: storage/buffer/bufmgr.c:7339
 #, c-format
-msgid "%u invalid pages among blocks %u..%u of relation %s"
-msgstr "リレーション%4$sのブロック%2$u..%3$uに%1$uの不正なページ"
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "リレーション\"%4$s\"のブロック%2$u..%3$uで%1$uの不正なページ"
 
-#: storage/buffer/bufmgr.c:7271
+#: storage/buffer/bufmgr.c:7340
 #, c-format
-msgid "Block %u held first invalid page."
-msgstr "最初の不正なページはブロック %u にありました。"
+msgid "Block %u held the first invalid page."
+msgstr "最初の不正なページはブロック%uにありました。"
 
-#: storage/buffer/bufmgr.c:7272
+#: storage/buffer/bufmgr.c:7341
 #, c-format
 msgid "See server log for the other %u invalid block(s)."
 msgstr "他の%u個の不正なブロックについてはサーバーログを参照してください。"
 
-#: storage/buffer/bufmgr.c:7277
+#: storage/buffer/bufmgr.c:7346
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
-msgstr "リレーション %2$s の %1$u ブロック目のページが不正です: ページをゼロで埋めました"
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr "リレーション\"%2$s\"の%1$uブロック目のページが不正です: ページをゼロクリアします"
 
-#: storage/buffer/bufmgr.c:7278
+#: storage/buffer/bufmgr.c:7347
 #, c-format
-msgid "zeroing out %u invalid pages among blocks %u..%u of relation %s"
-msgstr "リレーション %4$s のブロック%2$u～%3$uにある%1$u個の不正なページをゼロクリアします"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "リレーション\"%4$s\"のブロック%2$u..%3$u間の%1$u個の不正なページをゼロクリアします"
 
-#: storage/buffer/bufmgr.c:7280
+#: storage/buffer/bufmgr.c:7349
 #, c-format
 msgid "See server log for the other %u zeroed block(s)."
 msgstr "他の%u個の0クリアしたブロックについてはサーバーログを参照してください。"
 
-#: storage/buffer/bufmgr.c:7285
+#: storage/buffer/bufmgr.c:7354
 #, c-format
-msgid "ignoring checksum failure in block %u of relation %s"
-msgstr "リレーション%2$sでのブロック%1$uのチェックサムエラーを無視します"
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "リレーション\"%2$s\"のブロック%1$uでのチェックサムエラーを無視します"
 
-#: storage/buffer/bufmgr.c:7286
+#: storage/buffer/bufmgr.c:7355
 #, c-format
-msgid "ignoring %u checksum failures among blocks %u..%u of relation %s"
-msgstr "リレーション%4$sでのブロック%2$u..%3$uの%1$u件のチェックサムエラーを無視します"
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "リレーション\"%4$s\"のブロック%2$u..%3$uでの%1$u件のチェックサムエラーを無視します"
 
-#: storage/buffer/bufmgr.c:7287
+#: storage/buffer/bufmgr.c:7356
 #, c-format
-msgid "Block %u held first ignored page."
-msgstr "無視した最初のページはブロック %u にありました。"
+msgid "Block %u held the first ignored page."
+msgstr "無視した最初のページはブロック%uにありました。"
 
-#: storage/buffer/bufmgr.c:7288
+#: storage/buffer/bufmgr.c:7357
 #, c-format
 msgid "See server log for the other %u ignored block(s)."
 msgstr "他の%u個のエラーを無視したブロックについてはサーバーログを参照してください。"
@@ -23039,7 +23105,7 @@ msgstr "BufFile \"%s\"の一時ファイル\"%s\"のサイズの確認に失敗
 msgid "could not delete fileset \"%s\": %m"
 msgstr "ファイルセット\"%s\"を削除できませんでした: %m"
 
-#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1318
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "ファイル\"%s\"の切り詰め処理ができませんでした: %m"
@@ -23164,7 +23230,7 @@ msgstr "データディレクトリを同期しています(fsync)、経過時
 msgid "\"%s\" is not supported on this platform."
 msgstr "このプラットフォームでは\"%s\"をサポートしていません。"
 
-#: storage/file/fd.c:4030
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
 #, c-format
 msgid "Invalid list syntax in parameter \"%s\"."
 msgstr "パラメータ\"%s\"のリスト構文が不正です。"
@@ -23264,27 +23330,27 @@ msgstr "共有メモリセグメント\"%s\"をクローズできませんでし
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "\"%s\"のハンドルの複製ができませんでした: %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "DSMセグメント名は空文字列にはできません"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "DSMセグメント名が長すぎます"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "DSMセグメントサイズは0以外の値である必要があります"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
-msgstr "要求されたDSMセグメントサイズが既存のセグメントのサイズと異なっています"
+msgstr "要求されたDSMセグメントのサイズが既存のセグメントのサイズと一致しません"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:458 tcop/backend_startup.c:343
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457 tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "現在クライアント数が多すぎます"
@@ -23309,17 +23375,22 @@ msgstr "%s属性を持つロールのみが%s属性を持つロールが接続
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr "終了させようとしているプロセスに接続しているロールの権限を持つロール、または\"%sロール権限を持つロールのみがこのプロセスを終了できます。"
 
-#: storage/ipc/procsignal.c:450
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr "PID %dのバックエンドがProcSignalBarrierを受け付けるのを待っています"
 
-#: storage/ipc/procsignal.c:786
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "PID 0の不正なキャンセル要求"
+
+#: storage/ipc/procsignal.c:788
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "プロセス%dに対するキャンセル要求においてキーが間違っています"
 
-#: storage/ipc/procsignal.c:795
+#: storage/ipc/procsignal.c:797
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "キャンセル要求内のPID %dがどのプロセスにも一致しません"
@@ -23334,32 +23405,32 @@ msgstr "共有メモリキュー経由で大きさ%zuのメッセージは送信
 msgid "invalid message size %zu in shared memory queue"
 msgstr "共有メモリキュー内の不正なメッセージ長%zu"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1038 storage/lmgr/lock.c:1076 storage/lmgr/lock.c:2965 storage/lmgr/lock.c:4370 storage/lmgr/lock.c:4435 storage/lmgr/lock.c:4785 storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493 storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937 utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041 storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373 storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788 storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493 storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937 utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "共有メモリが足りません"
 
-#: storage/ipc/shmem.c:159 storage/ipc/shmem.c:255
+#: storage/ipc/shmem.c:161 storage/ipc/shmem.c:257
 #, c-format
 msgid "out of shared memory (%zu bytes requested)"
 msgstr "共有メモリが足りません (%zu バイト要求しました)"
 
-#: storage/ipc/shmem.c:434
+#: storage/ipc/shmem.c:436
 #, c-format
 msgid "could not create ShmemIndex entry for data structure \"%s\""
 msgstr "データ構造体\"%s\"のためのShmemIndexエントリを作成できませんでした"
 
-#: storage/ipc/shmem.c:449
+#: storage/ipc/shmem.c:451
 #, c-format
 msgid "ShmemIndex entry size is wrong for data structure \"%s\": expected %zu, actual %zu"
 msgstr "データ構造体\"%s\"のためのShmemIndexエントリのサイズが誤っています: %zuバイトを期待しましたが、実際は%zuバイトでした"
 
-#: storage/ipc/shmem.c:468
+#: storage/ipc/shmem.c:470
 #, c-format
 msgid "not enough shared memory for data structure \"%s\" (%zu bytes requested)"
 msgstr "データ構造体\"%s\"のための共有メモリが不足しています ( %zu バイトが必要)"
 
-#: storage/ipc/shmem.c:500 storage/ipc/shmem.c:519
+#: storage/ipc/shmem.c:502 storage/ipc/shmem.c:521
 #, c-format
 msgid "requested shared memory size overflows size_t"
 msgstr "要求された共有メモリのサイズはsize_tを超えています"
@@ -23369,7 +23440,7 @@ msgstr "要求された共有メモリのサイズはsize_tを超えています
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %dはPostgreSQLバックエンドプロセスではありません"
 
-#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1547 utils/adt/mcxtfuncs.c:314 utils/adt/mcxtfuncs.c:412
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546 utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "プロセス%dにシグナルを送信できませんでした: %m"
@@ -23430,12 +23501,12 @@ msgstr "リカバリは%ld.%03dミリ秒経過後待機継続中: %s"
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "リカバリは%ld.%03dミリ秒で待機終了: %s"
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:3225
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "リカバリで競合が発生したためステートメントをキャンセルしています"
 
-#: storage/ipc/standby.c:922 tcop/postgres.c:2575
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "リカバリ時にユーザーのトランザクションがバッファのデッドロックを引き起こしました。"
@@ -23517,127 +23588,127 @@ msgstr "デッドロックを検出しました"
 msgid "See server log for query details."
 msgstr "問い合わせの詳細はサーバーログを参照してください"
 
-#: storage/lmgr/lmgr.c:856
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプル(%1$u,%2$u)の更新中"
 
-#: storage/lmgr/lmgr.c:859
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプル(%1$u,%2$u)の削除中"
 
-#: storage/lmgr/lmgr.c:862
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプル(%1$u,%2$u)のロック中"
 
-#: storage/lmgr/lmgr.c:865
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプルの更新後バージョン(%1$u,%2$u)のロック中"
 
-#: storage/lmgr/lmgr.c:868
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のインデックスタプル(%1$u,%2$u)の挿入中"
 
-#: storage/lmgr/lmgr.c:871
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプル(%1$u,%2$u)の一意性の確認中"
 
-#: storage/lmgr/lmgr.c:874
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"の更新されたタプル(%1$u,%2$u)の再チェック中"
 
-#: storage/lmgr/lmgr.c:877
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr "リレーション\"%3$s\"のタプル(%1$u,%2$u)に対する排除制約のチェック中"
 
-#: storage/lmgr/lmgr.c:1249
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "データベース%2$uのリレーション%1$u"
 
-#: storage/lmgr/lmgr.c:1255
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "データベース%2$uのリレーション%1$uの拡張"
 
-#: storage/lmgr/lmgr.c:1261
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "データベース%uのpg_database.datfrozenxid"
 
-#: storage/lmgr/lmgr.c:1266
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "データベース%3$uのリレーション%2$uのページ%1$u"
 
-#: storage/lmgr/lmgr.c:1273
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "データベース%4$uのリレーション%3$uのタプル(%2$u,%1$u)"
 
-#: storage/lmgr/lmgr.c:1281
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "トランザクション %u"
 
-#: storage/lmgr/lmgr.c:1286
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "仮想トランザクション %d/%u"
 
-#: storage/lmgr/lmgr.c:1292
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "トランザクション%2$uの投機的書き込みトークン%1$u"
 
-#: storage/lmgr/lmgr.c:1298
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "データベース%3$uのリレーション%2$uのオブジェクト%1$u"
 
-#: storage/lmgr/lmgr.c:1306
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "ユーザーロック[%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1313
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "アドバイザリ・ロック[%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1321
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "データベース%3$uのサブスクリプション%2$uのリモートトランザクション%1$u"
 
-#: storage/lmgr/lmgr.c:1328
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "ロックタグタイプ%dは不明です"
 
-#: storage/lmgr/lock.c:866
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "リカバリの実行中はデータベースオブジェクトでロックモード %s を獲得できません"
 
-#: storage/lmgr/lock.c:868
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "リカバリの実行中は、データベースオブジェクトで RowExclusiveLock もしくはそれ以下だけが獲得できます"
 
-#: storage/lmgr/lock.c:1182
+#: storage/lmgr/lock.c:1185
 #, c-format
 msgid "process %d could not obtain %s on %s"
 msgstr "プロセス%1$dは、%3$sの%2$sを取得できませんでした"
 
-#: storage/lmgr/lock.c:3423 storage/lmgr/lock.c:3491 storage/lmgr/lock.c:3607
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "同一オブジェクト上にセッションレベルとトランザクションレベルのロックの両方を保持している時にPREPAREすることはできません"
@@ -23672,12 +23743,12 @@ msgstr "このデフォルトを変更するためには\"SET default_transactio
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "スナップショットをインポートするトランザクションはREAD ONLY DEFERRABLEではいけません"
 
-#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:556 utils/time/snapmgr.c:562
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567 utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "要求したスナップショットをインポートできませんでした"
 
-#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:563
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "PID%dであるソースプロセスは既に実行中ではありません。"
@@ -23692,32 +23763,32 @@ msgstr "トランザクション間で read/write の依存性があったため
 msgid "The transaction might succeed if retried."
 msgstr "リトライが行われた場合、このトランザクションは成功するかもしれません"
 
-#: storage/lmgr/proc.c:454
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid "number of requested standby connections exceeds \"max_wal_senders\" (currently %d)"
 msgstr "要求されたスタンバイ接続が\"max_wal_senders を超えています\" (現在は %d)"
 
-#: storage/lmgr/proc.c:1592
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "プロセス%1$dは、%4$ld.%5$03d ms後にキューの順番を再調整することで、%3$s上の%2$sに対するデッドロックを防ぎました。"
 
-#: storage/lmgr/proc.c:1607
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "プロセス%1$dは、%3$s上の%2$sに対し%4$ld.%5$03d ms待機するデッドロックを検知しました"
 
-#: storage/lmgr/proc.c:1616
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "プロセス%dは%sを%sで待機しています。%ld.%03dミリ秒後"
 
-#: storage/lmgr/proc.c:1623
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "プロセス%1$dは%4$ld.%5$03d ms後に%3$s上の%2$sを獲得しました"
 
-#: storage/lmgr/proc.c:1640
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "プロセス%1$dは%4$ld.%5$03d ms後に%3$s上で%2$sを獲得することに失敗しました"
@@ -23752,7 +23823,7 @@ msgstr "ラインポインタが破損しています: オフセット = %u サ
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "ファイル\"%s\"を%uブロック以上に拡張できません"
 
-#: storage/smgr/md.c:517 storage/smgr/md.c:628
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "ファイル\"%s\"を拡張できませんでした: %m"
@@ -23762,62 +23833,62 @@ msgstr "ファイル\"%s\"を拡張できませんでした: %m"
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "ファイル\"%1$s\"を拡張できませんでした: %4$uブロックで%3$dバイト中%2$dバイト分のみを書き出しました。"
 
-#: storage/smgr/md.c:606
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "ファイル\"%s\"をFileFallocate()で拡張できませんでした: %m"
 
-#: storage/smgr/md.c:899 storage/smgr/md.c:2047
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "ファイル\"%3$s\"でブロック範囲 %1$u...%2$u を読み取れませんでした: %3$m"
 
-#: storage/smgr/md.c:946 storage/smgr/md.c:2060
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "ファイル\"%3$s\"でブロック範囲 %1$u...%2$u を読み取れませんでした: %5$zuバイト中%4$zuバイト分のみ読み込みました"
 
-#: storage/smgr/md.c:1023
+#: storage/smgr/md.c:1034
 #, c-format
 msgid "could not start reading blocks %u..%u in file \"%s\": %m"
 msgstr "ファイル\"%3$s\"のブロック範囲 %1$u...%2$u の読み取りを開始できませんでした: %m"
 
-#: storage/smgr/md.c:1119
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "ファイル\"%3$s\"でブロック範囲 %1$u...%2$u を書き込めませんでした:  %3$m"
 
-#: storage/smgr/md.c:1289
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "ファイル\"%s\"を%uブロックに切り詰められませんでした: 現在は%uブロックのみとなりました"
 
-#: storage/smgr/md.c:1344
+#: storage/smgr/md.c:1358
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "ファイル\"%s\"を%uブロックに切り詰められませんでした: %m"
 
-#: storage/smgr/md.c:1832
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr "ファイル\"%s\"(対象ブロック%u)をオープンできませんでした: 直前のセグメントは%uブロックだけでした"
 
-#: storage/smgr/md.c:1846
+#: storage/smgr/md.c:1860
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "ファイル \"%s\"（対象ブロック %u）をオープンできませんでした: %m"
 
-#: storage/smgr/smgr.c:1106
+#: storage/smgr/smgr.c:1115
 #, c-format
 msgid "file \"%s\""
 msgstr "ファイル\"%s\""
 
-#: storage/smgr/smgr.c:1108
+#: storage/smgr/smgr.c:1117
 #, c-format
 msgid "block %u in file \"%s\""
 msgstr "ファイル\"%2$s\"のブロック%1$u"
 
-#: storage/smgr/smgr.c:1112
+#: storage/smgr/smgr.c:1121
 #, c-format
 msgid "blocks %u..%u in file \"%s\""
 msgstr "ファイル\"%3$s\"でブロック範囲 %1$u...%2$u"
@@ -23974,24 +24045,19 @@ msgstr "開始パケットで指定されたPostgreSQLユーザー名は存在
 
 #: tcop/backend_startup.c:884
 #, c-format
-msgid "invalid length of query cancel packet"
-msgstr "不正なキャンセルパケット長"
+msgid "invalid length of cancel request packet"
+msgstr "不正なキャンセル要求パケット長"
 
 #: tcop/backend_startup.c:892
 #, c-format
-msgid "invalid length of query cancel key"
-msgstr "不正なキャンセルパケットキー長"
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "キャンセル要求パケット中の不正なキャンセルキー長"
 
 #: tcop/backend_startup.c:1022
 #, c-format
 msgid "Cannot specify log_connections option \"%s\" in a list with other options."
 msgstr "log_connectionsオプション\"%s\"は、リスト内で他のオプションと同時に指定できません。"
 
-#: tcop/backend_startup.c:1080
-#, c-format
-msgid "Invalid list syntax in parameter \"log_connections\"."
-msgstr "パラメータ\"log_connections\"のリスト構文が不正です。"
-
 #: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
@@ -24007,7 +24073,7 @@ msgstr "関数\"%s\"は高速呼び出しインタフェースでの呼び出し
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "近道関数呼び出し: \"%s\"(OID %u）)"
 
-#: tcop/fastpath.c:312 tcop/postgres.c:1364 tcop/postgres.c:1600 tcop/postgres.c:2079 tcop/postgres.c:2351
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599 tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "期間: %s ミリ秒"
@@ -24037,7 +24103,7 @@ msgstr "関数呼び出しメッセージ内の引数サイズ%dが不正です"
 msgid "incorrect binary data format in function argument %d"
 msgstr "関数引数%dのバイナリデータ書式が不正です"
 
-#: tcop/postgres.c:455 tcop/postgres.c:5023
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "フロントエンドメッセージタイプ%dが不正です"
@@ -24047,145 +24113,145 @@ msgstr "フロントエンドメッセージタイプ%dが不正です"
 msgid "statement: %s"
 msgstr "文: %s"
 
-#: tcop/postgres.c:1369
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "期間: %s ミリ秒  文: %s"
 
-#: tcop/postgres.c:1475
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "準備された文に複数のコマンドを挿入できません"
 
-#: tcop/postgres.c:1605
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "期間: %s ミリ秒  パース%s : %s"
 
-#: tcop/postgres.c:1672 tcop/postgres.c:2671
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "無名の準備された文が存在しません"
 
-#: tcop/postgres.c:1724
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "バインドメッセージは%dパラメータ書式ありましたがパラメータは%dでした"
 
-#: tcop/postgres.c:1730
+#: tcop/postgres.c:1729
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr "バインドメッセージは%dパラメータを提供しましたが、準備された文\"%s\"では%d必要でした"
 
-#: tcop/postgres.c:1944
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "バインドパラメータ%dにおいてバイナリデータ書式が不正です"
 
-#: tcop/postgres.c:2084
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "期間: %s ミリ秒  バインド %s%s%s: %s"
 
-#: tcop/postgres.c:2139 tcop/postgres.c:2753
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "ポータル\"%s\"は存在しません"
 
-#: tcop/postgres.c:2232
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2234 tcop/postgres.c:2359
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "取り出し実行"
 
-#: tcop/postgres.c:2235 tcop/postgres.c:2360
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "実行"
 
-#: tcop/postgres.c:2356
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "期間: %s ミリ秒  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2504
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "準備: %s"
 
-#: tcop/postgres.c:2529
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "パラメータ: %s"
 
-#: tcop/postgres.c:2544
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "異常終了の理由: リカバリ衝突"
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "ユーザーが共有バッファ・ピンを長く保持し過ぎていました"
 
-#: tcop/postgres.c:2563
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "ユーザーリレーションのロックを長く保持し過ぎていました"
 
-#: tcop/postgres.c:2566
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "削除されるべきテーブルスペースをユーザーが使っていました（もしくはその可能性がありました）。"
 
-#: tcop/postgres.c:2569
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "削除されるべきバージョンの行をユーザー問い合わせが参照しなければならなかった可能性がありました。"
 
-#: tcop/postgres.c:2572
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "無効化されるべき論理レプリケーションスロットをユーザーが使用していました。"
 
-#: tcop/postgres.c:2578
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "削除されるべきデータベースにユーザーが接続していました。"
 
-#: tcop/postgres.c:2617
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "ポータル\"%s\" パラメータ$%d = %s"
 
-#: tcop/postgres.c:2620
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "ポータル\"%s\" パラメータ $%d"
 
-#: tcop/postgres.c:2626
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "無名ポータルパラメータ $%d = %s"
 
-#: tcop/postgres.c:2629
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "無名ポータルパラメータ $%d"
 
-#: tcop/postgres.c:2984
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "予期しないSIGQUITシグナルによりコネクションを終了します"
 
-#: tcop/postgres.c:2990
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "他のサーバープロセスがクラッシュしたため接続を終了します"
 
-#: tcop/postgres.c:2991
+#: tcop/postgres.c:2989
 #, 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 ""
@@ -24193,177 +24259,177 @@ msgstr ""
 "postmasterはこのサーバープロセスに対し、現在のトランザクションをロールバック\n"
 "し終了するよう指示しました。"
 
-#: tcop/postgres.c:2995 tcop/postgres.c:3248
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr "この後、データベースに再接続し、コマンドを繰り返さなければなりません。"
 
-#: tcop/postgres.c:3002
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "即時シャットダウンコマンドによりコネクションを終了します"
 
-#: tcop/postgres.c:3080
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "浮動小数点例外"
 
-#: tcop/postgres.c:3081
+#: tcop/postgres.c:3079
 #, 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 "不正な浮動小数点演算がシグナルされました。おそらくこれは、範囲外の結果もしくは0除算のような不正な演算によるものです。"
 
-#: tcop/postgres.c:3246
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "リカバリで競合が発生したため、接続を終了しています"
 
-#: tcop/postgres.c:3318
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "タイムアウトにより認証処理をキャンセルしています"
 
-#: tcop/postgres.c:3322
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "管理者コマンドにより自動VACUUM処理を終了しています"
 
-#: tcop/postgres.c:3326
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "管理者コマンドにより、論理レプリケーションワーカーを終了します"
 
-#: tcop/postgres.c:3341
+#: tcop/postgres.c:3339
 #, c-format
 msgid "terminating walreceiver process due to administrator command"
 msgstr "管理者コマンドにより WAL 受信プロセスを終了しています"
 
-#: tcop/postgres.c:3357
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "管理者コマンドにより接続を終了しています"
 
-#: tcop/postgres.c:3388
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "クライアントへの接続が切れました。"
 
-#: tcop/postgres.c:3440
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "ロックのタイムアウトのためステートメントをキャンセルしています"
 
-#: tcop/postgres.c:3447
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "ステートメントのタイムアウトのためステートメントをキャンセルしています"
 
-#: tcop/postgres.c:3454
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "自動VACUUM処理をキャンセルしています"
 
-#: tcop/postgres.c:3467
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "ユーザーからの要求により文をキャンセルしています"
 
-#: tcop/postgres.c:3488
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "トランザクション中アイドルタイムアウトのため接続を終了します"
 
-#: tcop/postgres.c:3501
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "トランザクションタイムアウトのため接続を終了します"
 
-#: tcop/postgres.c:3514
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "アイドルセッションタイムアウトにより接続を終了します"
 
-#: tcop/postgres.c:3553
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr "このプラットフォームでは\"client_connection_check_interval\"を0に設定する必要があります。"
 
-#: tcop/postgres.c:3574
+#: tcop/postgres.c:3569
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "\"log_statement_stats\"が真の場合、パラメータを有効にできません"
 
-#: tcop/postgres.c:3589
+#: tcop/postgres.c:3584
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "\"log_parser_stats\"、\"log_planner_stats\"、または\"log_executor_stats\"のいずれかがtrueの場合は\"log_statement_stats\"を有効にできません。"
 
-#: tcop/postgres.c:4029
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "サーバープロセスに対する不正なコマンドライン引数: %s"
 
-#: tcop/postgres.c:4030 tcop/postgres.c:4036
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "詳細は\"%s --help\"を実行してください。"
 
-#: tcop/postgres.c:4034
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: 不正なコマンドライン引数: %s"
 
-#: tcop/postgres.c:4087
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: データベース名もユーザー名も指定されていません"
 
-#: tcop/postgres.c:4280
+#: tcop/postgres.c:4275
 #, c-format
 msgid "could not generate random cancel key"
 msgstr "ランダムなキャンセルキーを生成できませんでした"
 
-#: tcop/postgres.c:4682
+#: tcop/postgres.c:4677
 #, c-format
 msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
 msgstr "接続完了: 所要時間=%.3fミリ秒、fork=%.3fミリ秒、認証処理=%.3fミリ秒"
 
-#: tcop/postgres.c:4913
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "不正なCLOSEメッセージのサブタイプ%d"
 
-#: tcop/postgres.c:4950
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "不正なDESCRIBEメッセージのサブタイプ%d"
 
-#: tcop/postgres.c:5044
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "レプリケーション接続では高速関数呼び出しはサポートされていません"
 
-#: tcop/postgres.c:5048
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "レプリケーション接続では拡張問い合わせプロトコルはサポートされていません"
 
-#: tcop/postgres.c:5194
+#: tcop/postgres.c:5189
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "接続を切断: セッション時間: %d:%02d:%02d.%03d ユーザー=%s データベース=%s ホスト=%s%s%s"
 
-#: tcop/pquery.c:674
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "バインドメッセージは%dの結果書式がありましたが、問い合わせは%d列でした"
 
-#: tcop/pquery.c:972 tcop/pquery.c:1734
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "カーゾルは前方へのスキャンしかできません"
 
-#: tcop/pquery.c:973 tcop/pquery.c:1735
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "後方スキャンを有効にするためにはSCROLLオプションを付けて宣言してください。"
@@ -24409,6 +24475,11 @@ msgstr "%sコマンドを実行する権限がありません"
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "\"%s\"ロールの権限を持つロールのみがこのコマンドを実行できます。"
 
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS はFROM句にあるリレーション名のみをサポートしています"
+
 #: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
@@ -24529,57 +24600,57 @@ msgstr "認識できないシソーラスパラメータ \"%s\""
 msgid "missing Dictionary parameter"
 msgstr "Dictionaryパラメータがありません"
 
-#: tsearch/spell.c:383 tsearch/spell.c:400 tsearch/spell.c:409 tsearch/spell.c:1046
+#: tsearch/spell.c:384 tsearch/spell.c:401 tsearch/spell.c:410 tsearch/spell.c:1041
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "不正な接辞フラグ\"%s\""
 
-#: tsearch/spell.c:387 tsearch/spell.c:1050
+#: tsearch/spell.c:388 tsearch/spell.c:1045
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "接辞フラグ\"%s\"は範囲外です"
 
-#: tsearch/spell.c:417
+#: tsearch/spell.c:418
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "接辞フラグ中の不正な文字\"%s\""
 
-#: tsearch/spell.c:437
+#: tsearch/spell.c:438
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "\"long\"フラグ値を伴った不正な接辞フラグ\"%s\""
 
-#: tsearch/spell.c:527
+#: tsearch/spell.c:528
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "辞書ファイル\"%s\"をオープンできませんでした: %m"
 
-#: tsearch/spell.c:1174 tsearch/spell.c:1186 tsearch/spell.c:1751 tsearch/spell.c:1756 tsearch/spell.c:1761
+#: tsearch/spell.c:1168 tsearch/spell.c:1180 tsearch/spell.c:1744 tsearch/spell.c:1749 tsearch/spell.c:1754
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "不正な接辞の別名 \"%s\""
 
-#: tsearch/spell.c:1227 tsearch/spell.c:1298 tsearch/spell.c:1447
+#: tsearch/spell.c:1221 tsearch/spell.c:1292 tsearch/spell.c:1441
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "affixファイル\"%s\"をオープンできませんでした: %m"
 
-#: tsearch/spell.c:1281
+#: tsearch/spell.c:1275
 #, c-format
 msgid "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag values"
 msgstr "Ispell辞書はフラグ値\"default\"、\"long\"および\"num\"のみをサポートします"
 
-#: tsearch/spell.c:1325
+#: tsearch/spell.c:1319
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "不正な数のフラグベクタの別名"
 
-#: tsearch/spell.c:1348
+#: tsearch/spell.c:1342
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "別名の数が指定された数 %d を超えています"
 
-#: tsearch/spell.c:1563
+#: tsearch/spell.c:1556
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "接辞ファイルが新旧両方の形式のコマンドを含んでいます"
@@ -24589,7 +24660,7 @@ msgstr "接辞ファイルが新旧両方の形式のコマンドを含んでい
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "TSベクターのための文字列が長すぎます(%dバイト、最大は%dバイト)"
 
-#: tsearch/ts_locale.c:191
+#: tsearch/ts_locale.c:196
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "設定ファイル\"%2$s\"の%1$d行目: \"%3$s\""
@@ -24619,112 +24690,112 @@ msgstr "ストップワードファイル\"%s\"をオープンできませんで
 msgid "text search parser does not support headline creation"
 msgstr "テキスト検索パーサは見出し作成をサポートしません"
 
-#: tsearch/wparser_def.c:2664
+#: tsearch/wparser_def.c:2665
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "認識できない見出しパラメータ: \"%s\""
 
-#: tsearch/wparser_def.c:2674
+#: tsearch/wparser_def.c:2675
 #, c-format
 msgid "%s must be less than %s"
 msgstr "\"%s\"は\"%s\"より小さくなければなりません"
 
-#: tsearch/wparser_def.c:2678
+#: tsearch/wparser_def.c:2679
 #, c-format
 msgid "%s must be positive"
 msgstr "%sは正数でなければなりまsん"
 
-#: tsearch/wparser_def.c:2682 tsearch/wparser_def.c:2686
+#: tsearch/wparser_def.c:2683 tsearch/wparser_def.c:2687
 #, c-format
 msgid "%s must be >= 0"
 msgstr "%sは0以上でなければなりません"
 
-#: utils/activity/pgstat.c:533
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "永続統計情報ファイル\"%s\"をunlinkできませんでした: %m"
 
-#: utils/activity/pgstat.c:1443
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "不正な統計情報種別: \"%s\""
 
-#: utils/activity/pgstat.c:1488
+#: utils/activity/pgstat.c:1471
 #, c-format
 msgid "custom cumulative statistics name is invalid"
 msgstr "独自集積統計情報の名前が不正です"
 
-#: utils/activity/pgstat.c:1489
+#: utils/activity/pgstat.c:1472
 #, c-format
 msgid "Provide a non-empty name for the custom cumulative statistics."
 msgstr "独自集積統計情報の名前には空ではない文字列を設定してください。"
 
-#: utils/activity/pgstat.c:1492
+#: utils/activity/pgstat.c:1475
 #, c-format
 msgid "custom cumulative statistics ID %u is out of range"
 msgstr "独自集積統計情報のID %uは範囲外です"
 
-#: utils/activity/pgstat.c:1493
+#: utils/activity/pgstat.c:1476
 #, c-format
 msgid "Provide a custom cumulative statistics ID between %u and %u."
 msgstr "独自集積統計情報IDは%uから%uの間の値で指定してください。"
 
-#: utils/activity/pgstat.c:1498 utils/activity/pgstat.c:1525 utils/activity/pgstat.c:1538
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508 utils/activity/pgstat.c:1521
 #, c-format
 msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
 msgstr "独自集積統計情報\"%s\"のID %uでの登録に失敗しました"
 
-#: utils/activity/pgstat.c:1499
+#: utils/activity/pgstat.c:1482
 #, c-format
 msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
 msgstr "独自集積統計情報は\"shared_preload_libraries\"にあるモジュールの初期化中に登録する必要があります。"
 
-#: utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1491
 #, c-format
 msgid "custom cumulative statistics property is invalid"
 msgstr "独自集積統計情報の特性が不正です"
 
-#: utils/activity/pgstat.c:1509
+#: utils/activity/pgstat.c:1492
 #, c-format
 msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
 msgstr "独自集積統計情報は固定数のオブジェクトのための共有メモリのサイズを必要とします。"
 
-#: utils/activity/pgstat.c:1526
+#: utils/activity/pgstat.c:1509
 #, c-format
 msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
 msgstr "独自集積統計情報\"%s\"はすでに同一のIDで登録されています。"
 
-#: utils/activity/pgstat.c:1539
+#: utils/activity/pgstat.c:1522
 #, c-format
 msgid "Existing cumulative statistics with ID %u has the same name."
 msgstr "ID %uの既存の独自集積統計情報が同じ名前です。"
 
-#: utils/activity/pgstat.c:1545
+#: utils/activity/pgstat.c:1528
 #, c-format
 msgid "registered custom cumulative statistics \"%s\" with ID %u"
 msgstr "独自集積統計情報\"%s\"をID %uで登録しました"
 
-#: utils/activity/pgstat.c:1614
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "一時統計情報ファイル\"%s\"をオープンできませんでした: %m"
 
-#: utils/activity/pgstat.c:1735
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "一時統計情報ファイル\"%s\"に書き込みできませんでした: %m"
 
-#: utils/activity/pgstat.c:1744
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "一時統計情報ファイル\"%s\"をクローズできませんでした: %m"
 
-#: utils/activity/pgstat.c:1798
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "統計情報ファイル\"%s\"をオープンできませんでした: %m"
 
-#: utils/activity/pgstat.c:2030
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "統計情報ファイル\"%s\"が破損しています"
@@ -24734,6 +24805,11 @@ msgstr "統計情報ファイル\"%s\"が破損しています"
 msgid "function call to dropped function"
 msgstr "削除された関数の呼び出し"
 
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "エントリ %u/%u/%<PRIu64> の割り当て中に失敗しました。"
+
 #: utils/activity/pgstat_xact.c:366
 #, c-format
 msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
@@ -24749,102 +24825,102 @@ msgstr "待機イベント\"%s\"は待機イベントタイプ\"%s\"内にすで
 msgid "too many custom wait events"
 msgstr "独自待機イベントの数が多すぎます"
 
-#: utils/adt/acl.c:187 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "識別子が長すぎます"
 
-#: utils/adt/acl.c:188 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "識別子は%d文字より短くなければなりません。"
 
-#: utils/adt/acl.c:276
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "キーワードが不明です: \"%s\""
 
-#: utils/adt/acl.c:277
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "ACLキーワードは\"group\"または\"user\"でなければなりません。"
 
-#: utils/adt/acl.c:285
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "名前がありません"
 
-#: utils/adt/acl.c:286
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "\"group\"または\"user\"キーワードの後には名前が必要です。"
 
-#: utils/adt/acl.c:292
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "\"=\"記号がありません"
 
-#: utils/adt/acl.c:351
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "不正なモード文字: \"%s\"の一つでなければなりません"
 
-#: utils/adt/acl.c:381
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "\"/\"記号の後には名前が必要です"
 
-#: utils/adt/acl.c:393
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "権限付与者をデフォルトのユーザーID %uにしています"
 
-#: utils/adt/acl.c:579
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "ACL配列に不正なデータ型があります。"
 
-#: utils/adt/acl.c:583
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "ACL配列は1次元の配列でなければなりません"
 
-#: utils/adt/acl.c:587
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "ACL配列にはNULL値を含めてはいけません"
 
-#: utils/adt/acl.c:616
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "ACL指定の後に余計なごみがあります"
 
-#: utils/adt/acl.c:1264
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "グラントオプションでその権限付与者に権限を付与し返すことはできません"
 
-#: utils/adt/acl.c:1580
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsertはもうサポートされていません"
 
-#: utils/adt/acl.c:1590
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremoveはもうサポートされていません"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "権限タイプが不明です: \"%s\""
 
-#: utils/adt/acl.c:3548 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "関数\"%s\"は存在しません"
 
-#: utils/adt/acl.c:5330
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "SET ROLE\"%s\"ができなければなりません"
@@ -24859,8 +24935,8 @@ msgstr "入力データ型を特定できませんでした"
 msgid "input data type is not an array"
 msgstr "入力データ型は配列ではありません"
 
-#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249 utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107 utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800 utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859 utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011 utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072 utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199 utils/adt/int.c:1263
-#: utils/adt/int.c:1331 utils/adt/int.c:1337 utils/adt/int8.c:1256 utils/adt/numeric.c:2039 utils/adt/numeric.c:4557 utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565 utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143 utils/adt/varlena.c:3184 utils/adt/varlena.c:4118
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249 utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107 utils/adt/float.c:4145 utils/adt/int.c:807 utils/adt/int.c:829 utils/adt/int.c:843 utils/adt/int.c:857 utils/adt/int.c:888 utils/adt/int.c:909 utils/adt/int.c:1026 utils/adt/int.c:1040 utils/adt/int.c:1054 utils/adt/int.c:1087 utils/adt/int.c:1101 utils/adt/int.c:1115 utils/adt/int.c:1146 utils/adt/int.c:1228 utils/adt/int.c:1292
+#: utils/adt/int.c:1360 utils/adt/int.c:1366 utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558 utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565 utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1148 utils/adt/varlena.c:3202 utils/adt/varlena.c:4136
 #, c-format
 msgid "integer out of range"
 msgstr "integerの範囲外です"
@@ -24895,7 +24971,7 @@ msgstr "異なる要素次数の配列の連結には互換性がありません
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "異なる次数の配列の連結には互換性がありません。"
 
-#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059 utils/adt/arrayfuncs.c:5628 utils/adt/arrayfuncs.c:5634
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059 utils/adt/arrayfuncs.c:5634 utils/adt/arrayfuncs.c:5640
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "次元の異なる配列は結合できません"
@@ -25000,7 +25076,7 @@ msgstr "配列要素が正しくクォートされていません"
 msgid "Unexpected end of input."
 msgstr "想定外の入力の終端。"
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511 utils/adt/arrayfuncs.c:6120
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511 utils/adt/arrayfuncs.c:6126
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "不正な次元数: %d"
@@ -25035,7 +25111,7 @@ msgstr "型%sにはバイナリ出力関数がありません"
 msgid "slices of fixed-length arrays not implemented"
 msgstr "固定長配列の部分配列は実装されていません"
 
-#: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267 utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570 utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6106 utils/adt/arrayfuncs.c:6132 utils/adt/arrayfuncs.c:6143 utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317 utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887 utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
+#: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267 utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570 utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138 utils/adt/arrayfuncs.c:6149 utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317 utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887 utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "配列の添え字が不正な数値です"
@@ -25075,72 +25151,72 @@ msgstr "元の配列が小さすぎます"
 msgid "null array element not allowed in this context"
 msgstr "この文脈ではNULLの配列要素は許可されません"
 
-#: utils/adt/arrayfuncs.c:3840 utils/adt/arrayfuncs.c:4011 utils/adt/arrayfuncs.c:4402
+#: utils/adt/arrayfuncs.c:3846 utils/adt/arrayfuncs.c:4017 utils/adt/arrayfuncs.c:4408
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "要素型の異なる配列を比較できません"
 
-#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2805 utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1425 utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
+#: utils/adt/arrayfuncs.c:4195 utils/adt/multirangetypes.c:2806 utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425 utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "型 %s のハッシュ関数を特定できません"
 
-#: utils/adt/arrayfuncs.c:4317 utils/adt/rowtypes.c:2014
+#: utils/adt/arrayfuncs.c:4323 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "型 %s の拡張ハッシュ関数を特定できませんでした"
 
-#: utils/adt/arrayfuncs.c:5518
+#: utils/adt/arrayfuncs.c:5524
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "データ型%sは配列型ではありません"
 
-#: utils/adt/arrayfuncs.c:5573
+#: utils/adt/arrayfuncs.c:5579
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "null配列は連結できません"
 
-#: utils/adt/arrayfuncs.c:5601
+#: utils/adt/arrayfuncs.c:5607
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "空の配列は連結できません"
 
-#: utils/adt/arrayfuncs.c:6004 utils/adt/arrayfuncs.c:6044
+#: utils/adt/arrayfuncs.c:6010 utils/adt/arrayfuncs.c:6050
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "次元配列もしくは下限値配列が NULL であってはなりません"
 
-#: utils/adt/arrayfuncs.c:6107 utils/adt/arrayfuncs.c:6133
+#: utils/adt/arrayfuncs.c:6113 utils/adt/arrayfuncs.c:6139
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "次元配列は1次元でなければなりません"
 
-#: utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138
+#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "次元値にnullにはできません"
 
-#: utils/adt/arrayfuncs.c:6144
+#: utils/adt/arrayfuncs.c:6150
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "下限配列が次元配列のサイズと異なっています"
 
-#: utils/adt/arrayfuncs.c:6425
+#: utils/adt/arrayfuncs.c:6431
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "多次元配列からの要素削除はサポートされません"
 
-#: utils/adt/arrayfuncs.c:6702
+#: utils/adt/arrayfuncs.c:6708
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "閾値は1次元の配列でなければなりません"
 
-#: utils/adt/arrayfuncs.c:6707
+#: utils/adt/arrayfuncs.c:6713
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "閾値配列にはNULL値を含めてはいけません"
 
-#: utils/adt/arrayfuncs.c:6940
+#: utils/adt/arrayfuncs.c:6946
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "削除する要素の数は0と%dとの間でなければなりません"
@@ -25181,8 +25257,8 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "%s符号化方式からASCIIへの変換はサポートされていません"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4258 utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308 utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510 utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974 utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462 utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665 utils/adt/geo_ops.c:4672 utils/adt/int.c:174
-#: utils/adt/int.c:186 utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226 utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7324 utils/adt/numeric.c:7527 utils/adt/numeric.c:8474 utils/adt/numutils.c:356 utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917 utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025 utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80 utils/adt/tid.c:94
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264 utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308 utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510 utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974 utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462 utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665 utils/adt/geo_ops.c:4672 utils/adt/int.c:198
+#: utils/adt/int.c:210 utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226 utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325 utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356 utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917 utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025 utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80 utils/adt/tid.c:94
 #: utils/adt/tid.c:103 utils/adt/timestamp.c:512 utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
@@ -25193,13 +25269,13 @@ msgstr "\"%s\"型の入力構文が不正です: \"%s\""
 msgid "money out of range"
 msgstr "マネー型の値が範囲外です"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106 utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039 utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167 utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942 utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164 utils/adt/numeric.c:3294 utils/adt/numeric.c:3317 utils/adt/numeric.c:3402 utils/adt/numeric.c:3420 utils/adt/numeric.c:3516 utils/adt/numeric.c:9399
-#: utils/adt/numeric.c:9923 utils/adt/numeric.c:10039 utils/adt/numeric.c:11550 utils/adt/timestamp.c:3772
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106 utils/adt/int.c:872 utils/adt/int.c:988 utils/adt/int.c:1068 utils/adt/int.c:1130 utils/adt/int.c:1168 utils/adt/int.c:1196 utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942 utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164 utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403 utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551 utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "0 による除算が行われました"
 
-#: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327 utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350 utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923 utils/adt/numutils.c:962 utils/adt/numutils.c:1009
+#: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327 utils/adt/cash.c:367 utils/adt/int.c:204 utils/adt/numutils.c:350 utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923 utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "値\"%s\"は型%sの範囲外です"
@@ -25229,12 +25305,12 @@ msgstr "(%d)%sの精度は負ではいけません"
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%sの位取りを許容最大値%dまで減らしました"
 
-#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4171 utils/adt/formatting.c:4180 utils/adt/formatting.c:4285 utils/adt/formatting.c:4295
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172 utils/adt/formatting.c:4181 utils/adt/formatting.c:4286 utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "日付が範囲外です: \"%s\""
 
-#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609 utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609 utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2553
 #, c-format
 msgid "date out of range"
 msgstr "日付が範囲外です"
@@ -25269,15 +25345,15 @@ msgstr "単位\"%s\"は型%sに対してはサポートされていません"
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "単位\"%s\"は型%sに対しては認識できません"
 
-#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984 utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934 utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1817 utils/adt/formatting.c:4016 utils/adt/formatting.c:4052 utils/adt/formatting.c:4139 utils/adt/formatting.c:4261 utils/adt/json.c:375 utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282 utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984 utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934 utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826 utils/adt/formatting.c:4017 utils/adt/formatting.c:4053 utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375 utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282 utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
 #: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827 utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134 utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156 utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188 utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205 utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216 utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278 utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304 utils/adt/timestamp.c:3325
 #: utils/adt/timestamp.c:3338 utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360 utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371 utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591 utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733 utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902 utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075 utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827 utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
-#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382 utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509 utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554 utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612 utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2574 utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382 utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509 utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554 utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612 utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2575 utils/adt/xml.c:2582 utils/adt/xml.c:2602 utils/adt/xml.c:2609
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestampの範囲外です"
 
-#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4344
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "時刻が範囲外です"
@@ -25302,7 +25378,7 @@ msgstr "無限大のintervalのtimeへの加算はできません"
 msgid "cannot subtract infinite interval from time"
 msgstr "無限大のintervalのtimeからの減算できません"
 
-#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043 utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682 utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2698 utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906 utils/adt/timestamp.c:3947
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043 utils/adt/float.c:1119 utils/adt/int.c:664 utils/adt/int.c:711 utils/adt/int.c:746 utils/adt/int8.c:413 utils/adt/numeric.c:2699 utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906 utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "ウィンドウ関数での不正なサイズの PRECEDING または FOLLOWING 指定"
@@ -25322,32 +25398,32 @@ msgstr "タイムゾーンのインターバル\"%s\"は有限でなければな
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "intervalによるタイムゾーン\"%s\"には月または日を含めてはいけません"
 
-#: utils/adt/datetime.c:3324 utils/adt/datetime.c:4243 utils/adt/datetime.c:4249 utils/adt/timestamp.c:530
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249 utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "タイムゾーン\"%s\"は不明です"
 
-#: utils/adt/datetime.c:4217 utils/adt/datetime.c:4224
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "日付時刻のフィールドが範囲外です: \"%s\""
 
-#: utils/adt/datetime.c:4226
+#: utils/adt/datetime.c:4232
 #, c-format
 msgid "Perhaps you need a different \"DateStyle\" setting."
 msgstr "他の\"DateStyle\"設定が必要かもしれません。"
 
-#: utils/adt/datetime.c:4231
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "intervalフィールドの値が範囲外です: \"%s\""
 
-#: utils/adt/datetime.c:4237
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "タイムゾーンの置換が範囲外です: \"%s\""
 
-#: utils/adt/datetime.c:4251
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "このタイムゾーンはタイムゾーン省略名\"%s\"の構成ファイルにあるようです。"
@@ -25477,32 +25553,32 @@ msgstr "型realでは\"%s\"は範囲外です"
 msgid "\"%s\" is out of range for type double precision"
 msgstr "型double precisionでは\"%s\"は範囲外です"
 
-#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355 utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929 utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213 utils/adt/int8.c:1277 utils/adt/numeric.c:4696 utils/adt/numeric.c:4701 utils/adt/varlena.c:4093
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:384 utils/adt/int.c:922 utils/adt/int.c:944 utils/adt/int.c:958 utils/adt/int.c:972 utils/adt/int.c:1004 utils/adt/int.c:1242 utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702 utils/adt/varlena.c:4111
 #, c-format
 msgid "smallint out of range"
 msgstr "smallintの範囲外です"
 
-#: utils/adt/float.c:1454 utils/adt/numeric.c:3812 utils/adt/numeric.c:10454
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "負の値の平方根を取ることができません"
 
-#: utils/adt/float.c:1522 utils/adt/numeric.c:4100 utils/adt/numeric.c:4212
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "0 の負数乗は定義されていません"
 
-#: utils/adt/float.c:1526 utils/adt/numeric.c:4104 utils/adt/numeric.c:11345
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "負数を整数でない数でべき乗すると、結果が複雑になります"
 
-#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4012 utils/adt/numeric.c:11125
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013 utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "ゼロの対数を取ることができません"
 
-#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3950 utils/adt/numeric.c:4007 utils/adt/numeric.c:11129
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951 utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "負の値の対数を取ることができません"
@@ -25512,22 +25588,22 @@ msgstr "負の値の対数を取ることができません"
 msgid "input is out of range"
 msgstr "入力が範囲外です"
 
-#: utils/adt/float.c:4085 utils/adt/numeric.c:1979
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "カウントは0より大きくなければなりません"
 
-#: utils/adt/float.c:4090 utils/adt/numeric.c:1990
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
-msgstr "オペランド、下限、上限をNaNにすることはできません"
+msgstr "オペランド、下限および上限をNaNにすることはできません"
 
-#: utils/adt/float.c:4096 utils/adt/numeric.c:1995
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "下限および上限は有限でなければなりません"
 
-#: utils/adt/float.c:4162 utils/adt/numeric.c:2009
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "下限を上限と同じにできません"
@@ -25682,7 +25758,7 @@ msgstr "フィールドには%d文字必要ですが、%d文字しか残って
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr "元の文字列が固定長でない場合は、修飾子\"FM\"を試してみてください。"
 
-#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269 utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269 utils/adt/formatting.c:2490 utils/adt/formatting.c:3390 utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "\"%2$s\"に対する不正な値\"%1$s\""
@@ -25697,7 +25773,7 @@ msgstr "このフィールドには%d文字必要ですが、%d文字しかパ
 msgid "Value must be an integer."
 msgstr "値は整数でなければなりません。"
 
-#: utils/adt/formatting.c:2276
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "もとの文字列において\"%s\"に対応する値が範囲外です"
@@ -25732,77 +25808,67 @@ msgstr "合致しないフォーマット文字\"%s\""
 msgid "Time zone abbreviation is not recognized."
 msgstr "タイムゾーン省略名が認識されません。"
 
-#: utils/adt/formatting.c:3593
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr " \"Y,YYY\"に対応する入力文字列が不正です"
-
-#: utils/adt/formatting.c:3600
-#, c-format
-msgid "value for \"Y,YYY\" in source string is out of range"
-msgstr "もとの文字列内の\"Y,YYY\"に対応する値が範囲外です"
-
-#: utils/adt/formatting.c:3689
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "datetime書式に対して入力文字列が短すぎます"
 
-#: utils/adt/formatting.c:3697
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "datetimeフォーマット後に文字が入力文字列中に残っています"
 
-#: utils/adt/formatting.c:4241
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "timestamptz型に対応する入力に時間帯がありません"
 
-#: utils/adt/formatting.c:4247
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptzの範囲外です"
 
-#: utils/adt/formatting.c:4275
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "datetimeフォーマットで時間帯は指定されていますが、時刻が指定されていません"
 
-#: utils/adt/formatting.c:4324
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "timetz型に対する入力文字列中に時間帯がありません"
 
-#: utils/adt/formatting.c:4330
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetzの範囲外です"
 
-#: utils/adt/formatting.c:4356
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "datetimeフォーマットで日付は指定されていますが、時間が指定されていません"
 
-#: utils/adt/formatting.c:4533
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "12時間形式では\"%d\"時は不正です"
 
-#: utils/adt/formatting.c:4535
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "24時間形式を使うか、もしくは 1 から 12 の間で指定してください。"
 
-#: utils/adt/formatting.c:4712
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "年の情報なしでは年内の日数は計算できません"
 
-#: utils/adt/formatting.c:5833
+#: utils/adt/formatting.c:5836
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\"は入力としてサポートしていません"
 
-#: utils/adt/formatting.c:6110
+#: utils/adt/formatting.c:6113
 #, c-format
 msgid "invalid Roman numeral"
 msgstr "不正なローマ数字"
@@ -25817,7 +25883,7 @@ msgstr "絶対パスは許可されていません"
 msgid "path must be in or below the data directory"
 msgstr "パスはデータディレクトリ内もしくはより下層でなければなりません"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206 utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:855 utils/adt/oracle_compat.c:1158
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206 utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:864 utils/adt/oracle_compat.c:1167
 #, c-format
 msgid "requested length too large"
 msgstr "要求した長さが長すぎます"
@@ -25877,18 +25943,23 @@ msgstr "半径0の円を多角形に返還できません"
 msgid "must request at least 2 points"
 msgstr "少なくとも2ポイントを要求しなければなりません"
 
-#: utils/adt/int.c:264
+#: utils/adt/int.c:158
+#, c-format
+msgid "array is not a valid int2vector"
+msgstr "配列は有効な int2vector ではありません"
+
+#: utils/adt/int.c:292
 #, c-format
 msgid "invalid int2vector data"
 msgstr "不正なint2vectorデータ"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1767 utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
+#: utils/adt/int.c:1558 utils/adt/int8.c:1403 utils/adt/numeric.c:1767 utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "ステップ数をゼロにすることはできません"
 
 #: utils/adt/int8.c:448 utils/adt/int8.c:471 utils/adt/int8.c:485 utils/adt/int8.c:499 utils/adt/int8.c:530 utils/adt/int8.c:554 utils/adt/int8.c:636 utils/adt/int8.c:704 utils/adt/int8.c:710 utils/adt/int8.c:736 utils/adt/int8.c:750 utils/adt/int8.c:774 utils/adt/int8.c:787 utils/adt/int8.c:899 utils/adt/int8.c:913 utils/adt/int8.c:927 utils/adt/int8.c:958 utils/adt/int8.c:980 utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041 utils/adt/int8.c:1055
-#: utils/adt/int8.c:1069 utils/adt/int8.c:1100 utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150 utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4645 utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612 utils/adt/varbit.c:1676 utils/adt/varlena.c:4143
+#: utils/adt/int8.c:1069 utils/adt/int8.c:1100 utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150 utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646 utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612 utils/adt/varbit.c:1676 utils/adt/varlena.c:4161
 #, c-format
 msgid "bigint out of range"
 msgstr "bigintの範囲外です"
@@ -25939,7 +26010,7 @@ msgstr "配列は最低でも2つの列が必要です"
 msgid "mismatched array dimensions"
 msgstr "配列の次元が合っていません"
 
-#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1963
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "JSONオブジェクトキー値の重複"
@@ -26004,22 +26075,22 @@ msgstr "jsonbオブジェクトは%s型へはキャストできません"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "jsonbの配列またはオブジェクトは%s型へはキャストできません"
 
-#: utils/adt/jsonb_util.c:763
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "jsonbオブジェクトペア数が許された最大の値(%zu)を上回っています"
 
-#: utils/adt/jsonb_util.c:804
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "jsonbの配列要素の数が許された最大の値(%zu)を上回っています"
 
-#: utils/adt/jsonb_util.c:1678 utils/adt/jsonb_util.c:1698
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "jsonb配列全体のサイズが最大値%dバイトを超えています"
 
-#: utils/adt/jsonb_util.c:1759 utils/adt/jsonb_util.c:1794 utils/adt/jsonb_util.c:1814
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800 utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "jsonbオブジェクト要素全体のサイズが最大値%dを超えています"
@@ -26456,7 +26527,7 @@ msgstr "列\"%s\"に対するJSONパス式は単一のスカラー要素を返
 msgid "JSON path expression in JSON_VALUE must return single scalar item"
 msgstr "JSON_VALUE中のJSONパス式は単一のスカラー要素を返却する必要があります"
 
-#: utils/adt/levenshtein.c:132
+#: utils/adt/levenshtein.c:134
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "レーベンシュタイン距離関数の引数の長さが上限の%d文字を超えています"
@@ -26481,12 +26552,12 @@ msgstr "非決定的照合順序はILIKEではサポートされません"
 msgid "LIKE pattern must not end with escape character"
 msgstr "LIKE パターンはエスケープ文字で終わってはなりません"
 
-#: utils/adt/like_match.c:437 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:804
 #, c-format
 msgid "invalid escape string"
 msgstr "不正なエスケープ文字列"
 
-#: utils/adt/like_match.c:438 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:805
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "エスケープ文字は空か1文字でなければなりません。"
@@ -26516,16 +26587,11 @@ msgstr "macaddr8データがmacaddr型に変換するには範囲外です"
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr "左から4、5バイト目にFFとFEがあるアドレス、具体的には xx:xx:xx:ff:fe:xx:xx:xx のみがmacaddr8からmacaddrに変換できます。"
 
-#: utils/adt/mcxtfuncs.c:305 utils/adt/mcxtfuncs.c:391
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %dはPostgreSQLサーバープロセスではありません"
 
-#: utils/adt/mcxtfuncs.c:480
-#, c-format
-msgid "PID %d is no longer a PostgreSQL server process"
-msgstr "PID %dはすでにPostgreSQLサーバープロセスではありません"
-
 #: utils/adt/misc.c:237
 #, c-format
 msgid "global tablespace never has databases"
@@ -26615,12 +26681,12 @@ msgstr "範囲の開始を予期していました。"
 msgid "Expected comma or end of multirange."
 msgstr "カンマまたは複範囲の終了を予期していました。"
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "複範囲型は多次元配列からは生成できません"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "複範囲値はnullの要素を持てません"
@@ -26635,7 +26701,7 @@ msgstr "不正なCIDR値: \"%s\""
 msgid "Value has bits set to right of mask."
 msgstr "値ではマスクの右側のビットがセットされています。"
 
-#: utils/adt/network.c:152 utils/adt/network.c:1151 utils/adt/network.c:1176 utils/adt/network.c:1201
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174 utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "inet値を整形できませんでした: %m"
@@ -26663,42 +26729,42 @@ msgstr "外部の\"%s\"値内の不正な長さ"
 msgid "invalid external \"cidr\" value"
 msgstr "\"cidr\"の外部値が不正です"
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "不正なマスク長: %d"
 
-#: utils/adt/network.c:1219
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "cidr値を整形できませんでした: %m"
 
-#: utils/adt/network.c:1452
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "異なるファミリのアドレスは結合できません"
 
-#: utils/adt/network.c:1860
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "サイズが異なるinet値のANDはできません"
 
-#: utils/adt/network.c:1892
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "サイズが異なるinet値のORはできません"
 
-#: utils/adt/network.c:1953 utils/adt/network.c:2029
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "結果が範囲外です"
 
-#: utils/adt/network.c:1994
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "サイズが異なるinet値の引き算はできません"
 
-#: utils/adt/numeric.c:795 utils/adt/numeric.c:3762 utils/adt/numeric.c:7319 utils/adt/numeric.c:7522 utils/adt/numeric.c:7994 utils/adt/numeric.c:10928 utils/adt/numeric.c:11403 utils/adt/numeric.c:11497 utils/adt/numeric.c:11632
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320 utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929 utils/adt/numeric.c:11404 utils/adt/numeric.c:11498 utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "値がnumericの形式でオーバフローします"
@@ -26763,92 +26829,97 @@ msgstr "加算量はNaNにはできません"
 msgid "step size cannot be infinity"
 msgstr "加算量は無限大にはできません"
 
-#: utils/adt/numeric.c:3752
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "負数の階乗は定義されていません"
 
-#: utils/adt/numeric.c:4359
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "下限をNaNにすることはできません"
 
-#: utils/adt/numeric.c:4363
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "下限を無限値にすることはできません"
 
-#: utils/adt/numeric.c:4370
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "上限をNaNにすることはできません"
 
-#: utils/adt/numeric.c:4374
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "上限を無限値にすることはできません"
 
-#: utils/adt/numeric.c:4535 utils/adt/numeric.c:4623 utils/adt/numeric.c:4683 utils/adt/numeric.c:4879
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684 utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "NaNを%sには変換できません"
 
-#: utils/adt/numeric.c:4539 utils/adt/numeric.c:4627 utils/adt/numeric.c:4687 utils/adt/numeric.c:4883
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688 utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "無限大を%sに変換できません"
 
-#: utils/adt/numeric.c:4892
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsnの範囲外です"
 
-#: utils/adt/numeric.c:8084 utils/adt/numeric.c:8135
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "numericフィールドのオーバーフロー"
 
-#: utils/adt/numeric.c:8085
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr "精度%d、位取り%dを持つフィールドは、%s%dより小さな絶対値に丸められます。"
 
-#: utils/adt/numeric.c:8136
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "精度%d、位取り%dを持つフィールドは、無限大値を格納できません。"
 
-#: utils/adt/numeric.c:11701 utils/adt/pseudorandomfuncs.c:135 utils/adt/pseudorandomfuncs.c:159
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135 utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
 msgstr "下限は上限と同じあるいはより小さい必要があります"
 
-#: utils/adt/oid.c:217
+#: utils/adt/oid.c:131
+#, c-format
+msgid "array is not a valid oidvector"
+msgstr "配列は有効な oidvector ではありません"
+
+#: utils/adt/oid.c:245
 #, c-format
 msgid "invalid oidvector data"
 msgstr "不正なoidvectorデータ"
 
-#: utils/adt/oracle_compat.c:992
+#: utils/adt/oracle_compat.c:1001
 #, c-format
 msgid "requested character too large"
 msgstr "要求された文字が大きすぎます"
 
-#: utils/adt/oracle_compat.c:1036
+#: utils/adt/oracle_compat.c:1045
 #, c-format
 msgid "character number must be positive"
 msgstr "文字番号は正数でなければなりません"
 
-#: utils/adt/oracle_compat.c:1040
+#: utils/adt/oracle_compat.c:1049
 #, c-format
 msgid "null character not permitted"
 msgstr "NULL文字は許可されません"
 
-#: utils/adt/oracle_compat.c:1058 utils/adt/oracle_compat.c:1111
+#: utils/adt/oracle_compat.c:1067 utils/adt/oracle_compat.c:1120
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "要求された文字は符号化するには大きすぎます: %u"
 
-#: utils/adt/oracle_compat.c:1099
+#: utils/adt/oracle_compat.c:1108
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "要求された文字は符号化方式に対して不正です: %u"
@@ -26858,102 +26929,102 @@ msgstr "要求された文字は符号化方式に対して不正です: %u"
 msgid "percentile value %g is not between 0 and 1"
 msgstr "百分位数の値%gが0と1の間ではありません"
 
-#: utils/adt/pg_locale.c:303 utils/adt/pg_locale.c:335
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "ロケール名\"%s\"は不正な非ASCII文字を含んでいます"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "照合順序\"%s\"には実際のバージョンがありませんが、バージョンが記録されています"
 
-#: utils/adt/pg_locale.c:1125
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "照合順序\"%s\"でバージョンの不一致が起きています"
 
-#: utils/adt/pg_locale.c:1127
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr "データベース中の照合順序はバージョン%sで作成されていますが、オペレーティングシステムはバージョン%sを提供しています。"
 
-#: utils/adt/pg_locale.c:1130
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr "この照合順序の影響を受ける全てのオブジェクトを再構築して、ALTER COLLATION %s REFRESH VERSIONを実行するか、正しいバージョンのライブラリを用いてPostgreSQLをビルドしてください。"
 
-#: utils/adt/pg_locale.c:1481 utils/adt/pg_locale.c:1508 utils/adt/pg_locale_builtin.c:186
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525 utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "ロケール名\"%s\"は組み込みプロバイダでは不正です"
 
-#: utils/adt/pg_locale.c:1573
+#: utils/adt/pg_locale.c:1590
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "ロケール名\"%s\"を、言語タグに変換できませんでした: %s"
 
-#: utils/adt/pg_locale.c:1582 utils/adt/pg_locale.c:1657 utils/adt/pg_locale_icu.c:221
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674 utils/adt/pg_locale_icu.c:215
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "このビルドではICUはサポートされていません"
 
-#: utils/adt/pg_locale.c:1615
+#: utils/adt/pg_locale.c:1632
 #, c-format
 msgid "could not get language from ICU locale \"%s\": %s"
 msgstr "ICUロケール\"%s\"から言語を取得できませんでした: %s"
 
-#: utils/adt/pg_locale.c:1617 utils/adt/pg_locale.c:1647
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
 msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
 msgstr "ICUロケールを無効にするには、パラメータ\"%s\"を\"%s\"に設定してください。"
 
-#: utils/adt/pg_locale.c:1645
+#: utils/adt/pg_locale.c:1662
 #, c-format
 msgid "ICU locale \"%s\" has unknown language \"%s\""
 msgstr "ICUロケール\"%s\"には未知の言語\"%s\"が含まれています"
 
-#: utils/adt/pg_locale_icu.c:270
+#: utils/adt/pg_locale_icu.c:264
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "ロケール\"%s\"から言語を取得できませんでした: %s"
 
-#: utils/adt/pg_locale_icu.c:292 utils/adt/pg_locale_icu.c:309
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
 #, c-format
 msgid "could not open collator for locale \"%s\": %s"
 msgstr "ロケール\"%s\"の照合器をオープンできませんでした: %s"
 
-#: utils/adt/pg_locale_icu.c:380
+#: utils/adt/pg_locale_icu.c:374
 #, c-format
 msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
 msgstr "ルール\"%2$s\"を持つロケール\"%1$s\"の照合器をオープンできませんでした: %3$s"
 
-#: utils/adt/pg_locale_icu.c:494
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
 msgid "collation failed: %s"
 msgstr "照合順序による比較に失敗しました: %s"
 
-#: utils/adt/pg_locale_icu.c:573 utils/adt/pg_locale_icu.c:837
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "ソートキーの生成に失敗しました: %s"
 
-#: utils/adt/pg_locale_icu.c:647 utils/adt/pg_locale_icu.c:659 utils/adt/pg_locale_icu.c:884 utils/adt/pg_locale_icu.c:905
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653 utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
 msgid "%s failed: %s"
 msgstr "%s が失敗しました: %s"
 
-#: utils/adt/pg_locale_icu.c:688
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
 msgid "case conversion failed: %s"
 msgstr "文字ケースの変換に失敗しました: %s"
 
-#: utils/adt/pg_locale_icu.c:857
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "エンコーディング\"%s\"はICUではサポートされていません"
 
-#: utils/adt/pg_locale_icu.c:864
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "エンコーディング\"%s\"のICU変換器をオープンできませんでした: %s"
@@ -27118,43 +27189,43 @@ msgstr "カンマが多すぎます"
 msgid "Junk after right parenthesis or bracket."
 msgstr "右括弧または右角括弧の後にごみがあります"
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4475
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2068 utils/adt/varlena.c:4493
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "正規表現が失敗しました: %s"
 
-#: utils/adt/regexp.c:445 utils/adt/regexp.c:680
+#: utils/adt/regexp.c:445 utils/adt/regexp.c:681
 #, c-format
 msgid "invalid regular expression option: \"%.*s\""
 msgstr "不正な正規表現オプション: \"%.*s\""
 
-#: utils/adt/regexp.c:682
+#: utils/adt/regexp.c:683
 #, c-format
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr "regexp_replace()でパラメータstartを指定したいのであれば、4番目のパラメータを明示的に整数にキャストしてください。"
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082 utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164 utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862 utils/adt/regexp.c:1871 utils/misc/guc.c:6818 utils/misc/guc.c:6852
+#: utils/adt/regexp.c:717 utils/adt/regexp.c:726 utils/adt/regexp.c:1154 utils/adt/regexp.c:1218 utils/adt/regexp.c:1227 utils/adt/regexp.c:1236 utils/adt/regexp.c:1245 utils/adt/regexp.c:1925 utils/adt/regexp.c:1934 utils/adt/regexp.c:1943 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "パラメータ\"%s\"の値が無効です: %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:951
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr "SQL正規表現はエスケープされたダブルクオートを2つより多く含むことはできません"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271 utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753 utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1165 utils/adt/regexp.c:1256 utils/adt/regexp.c:1343 utils/adt/regexp.c:1382 utils/adt/regexp.c:1770 utils/adt/regexp.c:1825 utils/adt/regexp.c:1954
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%sは\"global\"オプションをサポートしません"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1384
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "代わりにregexp_matchesを使ってください。"
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1572
 #, c-format
 msgid "too many regular expression matches"
 msgstr "正規表現のマッチが多過ぎます"
@@ -27169,7 +27240,7 @@ msgstr "\"%s\"という名前の関数が複数あります"
 msgid "more than one operator named %s"
 msgstr "%sという名前の演算子が複数あります"
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10826 utils/adt/ruleutils.c:11039
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836 utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "引数が多すぎます"
@@ -27179,7 +27250,7 @@ msgstr "引数が多すぎます"
 msgid "Provide two argument types for operator."
 msgstr "演算子では2つの引数型を指定してください"
 
-#: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810 utils/adt/regproc.c:1815 utils/adt/varlena.c:3481 utils/adt/varlena.c:3486
+#: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810 utils/adt/regproc.c:1815 utils/adt/varlena.c:3499 utils/adt/varlena.c:3504
 #, c-format
 msgid "invalid name syntax"
 msgstr "不正な名前の構文"
@@ -27620,37 +27691,37 @@ msgstr "識別不能な重み付け: \"%c\""
 msgid "ts_stat query must return one tsvector column"
 msgstr "ts_statは1つのtsvector列のみを返さなければなりません"
 
-#: utils/adt/tsvector_op.c:2788
+#: utils/adt/tsvector_op.c:2792
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "tsvector列\"%s\"は存在しません"
 
-#: utils/adt/tsvector_op.c:2795
+#: utils/adt/tsvector_op.c:2799
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "値\"%s\"は型tsvectorではありません"
 
-#: utils/adt/tsvector_op.c:2807
+#: utils/adt/tsvector_op.c:2811
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "設定列\"%s\"は存在しません"
 
-#: utils/adt/tsvector_op.c:2813
+#: utils/adt/tsvector_op.c:2817
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "%s列はregconfig型ではありません"
 
-#: utils/adt/tsvector_op.c:2820
+#: utils/adt/tsvector_op.c:2824
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "設定列\"%s\"をNULLにすることはできません"
 
-#: utils/adt/tsvector_op.c:2833
+#: utils/adt/tsvector_op.c:2837
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "テキスト検索設定名称\"%s\"はスキーマ修飾しなければなりません"
 
-#: utils/adt/tsvector_op.c:2858
+#: utils/adt/tsvector_op.c:2862
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "列\"%s\"は文字型ではありません"
@@ -27660,12 +27731,12 @@ msgstr "列\"%s\"は文字型ではありません"
 msgid "syntax error in tsvector: \"%s\""
 msgstr "tsvector内の構文エラー: %s"
 
-#: utils/adt/tsvector_parser.c:221
+#: utils/adt/tsvector_parser.c:220
 #, c-format
 msgid "there is no escaped character: \"%s\""
 msgstr "エスケープ文字がありません: \"%s\""
 
-#: utils/adt/tsvector_parser.c:339
+#: utils/adt/tsvector_parser.c:334
 #, c-format
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "tsvector内の位置情報が間違っています: \"%s\""
@@ -27715,7 +27786,7 @@ msgstr "ビット列の外部値の不正な長さ"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "ビット列は型bit varying(%d)には長すぎます"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919 utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3102 utils/adt/varlena.c:3180
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:922 utils/adt/varlena.c:986 utils/adt/varlena.c:1144 utils/adt/varlena.c:3120 utils/adt/varlena.c:3198
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "負の長さのsubstringは許可されません"
@@ -27740,7 +27811,7 @@ msgstr "サイズが異なるビット列のXORはできません"
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "ビットのインデックス%dが有効範囲0..%dの間にありません"
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3384
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3402
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "新しいビットは0か1でなければなりません"
@@ -27755,92 +27826,92 @@ msgstr "値は型character(%d)としては長すぎます"
 msgid "value too long for type character varying(%d)"
 msgstr "値は型character varying(%d)としては長すぎます"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1591
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1609
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "文字列比較で使用する照合順序を特定できませんでした"
 
-#: utils/adt/varlena.c:1864
+#: utils/adt/varlena.c:1882
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "非決定的照合順序は部分文字列探索ではサポートされません"
 
-#: utils/adt/varlena.c:3268 utils/adt/varlena.c:3335
+#: utils/adt/varlena.c:3286 utils/adt/varlena.c:3353
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "インデックス%dは有効範囲0..%dの間にありません"
 
-#: utils/adt/varlena.c:3299 utils/adt/varlena.c:3371
+#: utils/adt/varlena.c:3317 utils/adt/varlena.c:3389
 #, c-format
 msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
 msgstr "インデックス%<PRId64>は有効範囲0..%<PRId64>の間にありません"
 
-#: utils/adt/varlena.c:4587
+#: utils/adt/varlena.c:4605
 #, c-format
 msgid "field position must not be zero"
 msgstr "フィールド位置には0は指定できません"
 
-#: utils/adt/varlena.c:5832
+#: utils/adt/varlena.c:5853
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "終端されていないformat()型指定子"
 
-#: utils/adt/varlena.c:5833 utils/adt/varlena.c:5967 utils/adt/varlena.c:6088
+#: utils/adt/varlena.c:5854 utils/adt/varlena.c:5988 utils/adt/varlena.c:6109
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "一つの\"%%\"には\"%%%%\"を使ってください。"
 
-#: utils/adt/varlena.c:5965 utils/adt/varlena.c:6086
+#: utils/adt/varlena.c:5986 utils/adt/varlena.c:6107
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "認識できない format() の型指定子\"%.*s\""
 
-#: utils/adt/varlena.c:5978 utils/adt/varlena.c:6035
+#: utils/adt/varlena.c:5999 utils/adt/varlena.c:6056
 #, c-format
 msgid "too few arguments for format()"
 msgstr "format()の引数が少なすぎます"
 
-#: utils/adt/varlena.c:6131 utils/adt/varlena.c:6313
+#: utils/adt/varlena.c:6152 utils/adt/varlena.c:6334
 #, c-format
 msgid "number is out of range"
 msgstr "数値が範囲外です"
 
-#: utils/adt/varlena.c:6194 utils/adt/varlena.c:6222
+#: utils/adt/varlena.c:6215 utils/adt/varlena.c:6243
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "書式は引数0を指定していますが、引数が1から始まっています"
 
-#: utils/adt/varlena.c:6215
+#: utils/adt/varlena.c:6236
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "width引数の位置は\"$\"で終わらなければなりません"
 
-#: utils/adt/varlena.c:6260
+#: utils/adt/varlena.c:6281
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "NULLはSQL識別子として書式付けできません"
 
-#: utils/adt/varlena.c:6468
+#: utils/adt/varlena.c:6489
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr "Unicode正規化はサーバーエンコーディングがUTF-8の場合にのみ実行されます"
 
-#: utils/adt/varlena.c:6481
+#: utils/adt/varlena.c:6502
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "不正な正規化形式: %s"
 
-#: utils/adt/varlena.c:6526
+#: utils/adt/varlena.c:6547
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr "Unicodeカテゴリー分類はサーバーエンコーディングがUTF-8の場合にのみ実行可能です"
 
-#: utils/adt/varlena.c:6743 utils/adt/varlena.c:6778 utils/adt/varlena.c:6813
+#: utils/adt/varlena.c:6764 utils/adt/varlena.c:6799 utils/adt/varlena.c:6834
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "不正なUnicodeコードポイント: %04X"
 
-#: utils/adt/varlena.c:6843
+#: utils/adt/varlena.c:6864
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr "Unicodeエスケープは \\XXXX、\\+XXXXXX、\\uXXXX または \\UXXXXXXXX でなければなりません。"
@@ -27875,7 +27946,7 @@ msgstr "非サポートのXML機能です。"
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "この機能はlibxmlサポート付きでビルドされたサーバーを必要とします。"
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:636
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "不正な符号化方式名\"%s\""
@@ -27890,136 +27961,136 @@ msgstr "無効なXMLコメント"
 msgid "not an XML document"
 msgstr "XML文書ではありません"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "無効なXML処理命令です"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "XML処理命令の対象名を\"%s\"とすることができませんでした。"
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML処理命令には\"?>\"を含めることはできません。"
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "XML の妥当性検査は実装されていません"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "XMLライブラリを初期化できませんでした"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2が互換性がない文字型を持ちます: sizeof(char)=%zu、sizeof(xmlChar)=%zu"
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "XMLエラーハンドラを設定できませんでした"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, 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 "これはおそらく使用するlibxml2のバージョンがPostgreSQLを構築する時に使用したlibxml2ヘッダと互換性がないことを示します。"
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "文字の値が有効ではありません"
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "スペースをあけてください。"
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone には 'yes' か 'no' だけが有効です。"
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "不正な形式の宣言: バージョンがありません。"
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "テキスト宣言にエンコーディングの指定がありません。"
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "XML 宣言のパース中: '>?' が必要です。"
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "認識できないlibxml のエラーコード: %d"
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2554
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XMLはデータ値として無限をサポートしません。"
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2576 utils/adt/xml.c:2603
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XMLタイムスタンプ値としては無限をサポートしません。"
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3019
 #, c-format
 msgid "invalid query"
 msgstr "不正な無効な問い合わせ"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3111
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "ポータル\"%s\"はタプルを返却しません"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4363
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "XML名前空間マッピングに対する不正な配列"
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4364
 #, c-format
 msgid "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "この配列は第2軸の長さが2である2次元配列でなければなりません。"
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4388
 #, c-format
 msgid "empty XPath expression"
 msgstr "空のXPath式"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4440
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "名前空間名もURIもnullにはできません"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4447
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "\"%s\"という名前のXML名前空間およびURI\"%s\"を登録できませんでした"
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4796
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "デフォルト名前空間は実装されていません"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4825
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "行パスフィルタは空文字列であってはなりません"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4859
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "列パスフィルタ空文字列であってはなりません"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5006
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "列XPath式が2つ以上の値を返却しました"
@@ -28054,27 +28125,27 @@ msgstr "型%sの利用可能な出力関数がありません"
 msgid "operator class \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "アクセスメソッド %2$s の演算子クラス\"%1$s\"は%4$s型に対応するサポート関数%3$dを含んでいません"
 
-#: utils/cache/relcache.c:3791
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "バイナリアップグレードモード中にヒープのrelfilenumberの値が設定されていません"
 
-#: utils/cache/relcache.c:3799
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "バイナリアップグレードモード中に、予期しない新規relfilenumberの要求がありました"
 
-#: utils/cache/relcache.c:6616
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "リレーションキャッシュ初期化ファイル\"%sを作成できません: %m"
 
-#: utils/cache/relcache.c:6618
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "とりあえず続行しますが、何かがおかしいです。"
 
-#: utils/cache/relcache.c:6948
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "キャッシュファイル\"%s\"を削除できませんでした: %m"
@@ -28114,181 +28185,176 @@ msgstr "TRAP: Assert(\"%s\")が失敗、ファイル: \"%s\"、行: %d、PID: %d
 msgid "error occurred before error message processing is available\n"
 msgstr "エラーメッセージの処理が可能になる前にエラーが発生しました\n"
 
-#: utils/error/elog.c:2159
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "ファイル\"%s\"の標準エラー出力としての再オープンに失敗しました: %m"
 
-#: utils/error/elog.c:2172
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "ファイル\"%s\"の標準出力としての再オープンに失敗しました: %m"
 
-#: utils/error/elog.c:2208
+#: utils/error/elog.c:2191
 #, c-format
 msgid "Invalid character."
 msgstr "不正な文字。"
 
-#: utils/error/elog.c:2918 utils/error/elog.c:2945 utils/error/elog.c:2961
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[不明]"
 
-#: utils/error/elog.c:3263 utils/error/elog.c:3587 utils/error/elog.c:3694
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "エラーテキストがありません"
 
-#: utils/error/elog.c:3266 utils/error/elog.c:3269
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr "(%d文字目)"
 
-#: utils/error/elog.c:3279 utils/error/elog.c:3286
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "詳細:  "
 
-#: utils/error/elog.c:3293
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "ヒント:  "
 
-#: utils/error/elog.c:3300
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "問い合わせ:  "
 
-#: utils/error/elog.c:3307
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "文脈:  "
 
-#: utils/error/elog.c:3317
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "場所:  %s, %s:%d\n"
 
-#: utils/error/elog.c:3324
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "場所:  %s:%d\n"
 
-#: utils/error/elog.c:3331
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "バックトレース:  "
 
-#: utils/error/elog.c:3343
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "文:  "
 
-#: utils/error/elog.c:3739
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3743
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3746
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3749
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: utils/error/elog.c:3753
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "WARNING"
 
-#: utils/error/elog.c:3756
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "ERROR"
 
-#: utils/error/elog.c:3759
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3762
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "PANIC"
 
-#: utils/fmgr/dfmgr.c:118
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "ファイル\"%2$s\"内に関数\"%1$s\"がありませんでした"
 
-#: utils/fmgr/dfmgr.c:237
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "ライブラリ\"%s\"をロードできませんでした: %s"
 
-#: utils/fmgr/dfmgr.c:274
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "\"%s\"は互換性がないライブラリです。マジックブロックの欠落"
 
-#: utils/fmgr/dfmgr.c:276
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "拡張ライブラリはPG_MODULE_MAGICマクロを使用しなければなりません。"
 
-#: utils/fmgr/dfmgr.c:322
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "\"%s\"は互換性がないライブラリです: バージョンの不一致"
 
-#: utils/fmgr/dfmgr.c:324
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "サーバーはバージョン%d、ライブラリはバージョン%sです。"
 
-#: utils/fmgr/dfmgr.c:336
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "非互換のライブラリ\"%s\": ABIの不一致"
 
-#: utils/fmgr/dfmgr.c:338
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "サーバー側ABIは\"%s\"、ライブラリ側は\"%s\"です。"
 
 #. translator: %s is a variable name and %d its values
-#: utils/fmgr/dfmgr.c:357 utils/fmgr/dfmgr.c:367 utils/fmgr/dfmgr.c:377
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
 msgid "Server has %s = %d, library has %d."
 msgstr "サーバー側では %s = %d ですが、ライブラリ側は %d です。"
 
 #. translator: %s is a variable name and %d its values
-#: utils/fmgr/dfmgr.c:387
+#: utils/fmgr/dfmgr.c:402
 #, c-format
 msgid "Server has %s = %s, library has %s."
 msgstr "サーバー側では %s = \"%s\"ですが、ライブラリ側は\"%s\"です。"
 
-#: utils/fmgr/dfmgr.c:394
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "マジックブロックが意図しない長さであるか、またはパディングが異なります。"
 
-#: utils/fmgr/dfmgr.c:397
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "\"%s\"は互換性がないライブラリです: マジックブロックの不一致"
 
-#: utils/fmgr/dfmgr.c:520
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "ライブラリ\"%s\"へのアクセスは許可されません"
 
-#: utils/fmgr/dfmgr.c:547
+#: utils/fmgr/dfmgr.c:554
 #, c-format
 msgid "invalid macro name in path: %s"
 msgstr "パス内のマクロ名が無効です: %s"
 
-#: utils/fmgr/dfmgr.c:599
+#: utils/fmgr/dfmgr.c:606
 #, c-format
 msgid "zero-length component in parameter \"%s\""
 msgstr "パラメータ\"%s\"に長さ0の構成要素があります"
 
-#: utils/fmgr/dfmgr.c:618
-#, c-format
-msgid "component in parameter \"%s\" is not an absolute path"
-msgstr "パラメータ\"%s\"に絶対パスではない要素が含まれています"
-
 #: utils/fmgr/fmgr.c:236
 #, c-format
 msgid "internal function \"%s\" is not in internal lookup table"
@@ -28481,112 +28547,112 @@ msgstr "ロール\"%s\"からの接続が多すぎます"
 msgid "invalid role OID: %u"
 msgstr "不正なロールID: %u"
 
-#: utils/init/miscinit.c:1197
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "データベースシステムはシャットダウンしました"
 
-#: utils/init/miscinit.c:1284
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "ロックファイル\"%s\"を作成できませんでした: %m"
 
-#: utils/init/miscinit.c:1298
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "ロックファイル\"%s\"をオープンできませんでした: %m"
 
-#: utils/init/miscinit.c:1305
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "ロックファイル\"%s\"を読み取れませんでした: %m"
 
-#: utils/init/miscinit.c:1314
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "ロックファイル\"%s\"が空です"
 
-#: utils/init/miscinit.c:1315
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "他のサーバーが稼働しているか、前回のサーバー起動失敗のためロックファイルが残っているかのいずれかです"
 
-#: utils/init/miscinit.c:1359
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "ロックファイル\"%s\"はすでに存在します"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "他のpostgres(PID %d)がデータディレクトリ\"%s\"で稼動していませんか?"
 
-#: utils/init/miscinit.c:1365
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "他のpostmaster(PID %d)がデータディレクトリ\"%s\"で稼動していませんか?"
 
-#: utils/init/miscinit.c:1368
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "他のpostgres(PID %d)がソケットファイル\"%s\"を使用していませんか?"
 
-#: utils/init/miscinit.c:1370
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "他のpostmaster(PID %d)がソケットファイル\"%s\"を使用していませんか?"
 
-#: utils/init/miscinit.c:1421
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "古いロックファイル\"%s\"を削除できませんでした: %m"
 
-#: utils/init/miscinit.c:1423
+#: utils/init/miscinit.c:1424
 #, 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 "このファイルは偶然残ってしまったようですが、削除できませんでした。手作業でこれを削除し再実行してください。"
 
-#: utils/init/miscinit.c:1460 utils/init/miscinit.c:1474 utils/init/miscinit.c:1485
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475 utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "ロックファイル\"%s\"に書き出せませんでした: %m"
 
-#: utils/init/miscinit.c:1596 utils/init/miscinit.c:1738 utils/misc/guc.c:5763
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "ファイル\"%s\"から読み取れませんでした: %m"
 
-#: utils/init/miscinit.c:1726
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "ファイル\"%s\"をオープンできませんでした: %m; とりあえず続けます"
 
-#: utils/init/miscinit.c:1751
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "ロックファイル\"%s\"が誤ったPIDをもっています: %ld、正しくは%ld"
 
-#: utils/init/miscinit.c:1790 utils/init/miscinit.c:1806
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\"は有効なデータディレクトリではありません"
 
-#: utils/init/miscinit.c:1792
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "ファイル\"%s\"が存在しません"
 
-#: utils/init/miscinit.c:1808
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "ファイル\"%s\"に有効なデータがありません。"
 
-#: utils/init/miscinit.c:1810
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "initdbする必要があるかもしれません"
 
-#: utils/init/miscinit.c:1818
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "データディレクトリはPostgreSQLバージョン%sで初期化されましたが、これはバージョン%sとは互換性がありません"
@@ -28709,57 +28775,57 @@ msgstr "サーバープロセス数の設定が大きすぎます"
 msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
 msgstr "\"max_connections\" (%d) + \"autovacuum_worker_slots\" (%d) + \"max_worker_processes\" (%d) + \"max_wal_senders\" (%d)は%dより小さくなければなりません。"
 
-#: utils/init/postinit.c:889
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "データベースシステム内でロールが定義されていません"
 
-#: utils/init/postinit.c:890
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "すぐに CREATE USER \"%s\" SUPERUSER; を実行してください。"
 
-#: utils/init/postinit.c:935
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "バイナリアップグレードモード中に接続するにはスーパーユーザーである必要があります"
 
-#: utils/init/postinit.c:955
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "残りの接続枠は%s属性を持つロールのために予約されています"
 
-#: utils/init/postinit.c:961
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "残りの接続枠は\"%s\"ロールの権限を持つロールのために予約されています"
 
-#: utils/init/postinit.c:973
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "WAL送信プロセスを開始する権限がありません"
 
-#: utils/init/postinit.c:974
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "%s属性を持つロールのみがWAL送信プロセスを開始できます。"
 
-#: utils/init/postinit.c:1092
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "削除またはリネームされたばかりのようです。"
 
-#: utils/init/postinit.c:1096
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "データベース %u は存在しません"
 
-#: utils/init/postinit.c:1105
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "無効なデータベース\"%s\"への接続はできません"
 
-#: utils/init/postinit.c:1166
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "データベースのサブディレクトリ\"%s\"がありません。"
@@ -28784,47 +28850,47 @@ msgstr "ISO8859文字セットに対する符号化方式ID %dは想定外です
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "WIN文字セットに対する符号化方式ID %dは想定外です<"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:306 utils/mb/mbutils.c:909
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "%sと%s間の変換はサポートされていません"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815 utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:411 utils/mb/mbutils.c:439 utils/mb/mbutils.c:824 utils/mb/mbutils.c:851
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "%dバイトの文字列は符号化変換では長すぎます。"
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:577
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "不正な変換元符号化方式名: \"%s\""
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:582
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "不正な変換先符号化方式名: \"%s\""
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:722
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "符号化方式\"%s\"に対する不正なバイト値: 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:886
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "不正なUnicodeコードポイント"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1325
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codesetが失敗しました"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1849
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "符号化方式\"%s\"に対する不正なバイト列です: %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1896
 #, c-format
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr "符号化方式\"%2$s\"においてバイト列%1$sである文字は符号化方式\"%3$s\"で等価な文字を持ちません"
@@ -28986,7 +29052,7 @@ msgstr "パラメータ\"%s\"を変更できません"
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "現在パラメータ\"%s\"を変更できません"
 
-#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668 utils/misc/guc.c:6754
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668 utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "パラメータ\"%s\"を設定する権限がありません"
@@ -29011,12 +29077,12 @@ msgstr "パラメータ\"%s\"は設定できません"
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "パラメータ\"%s\"は関数内では変更できません"
 
-#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5448
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "”%s\"を参照する権限がありません"
 
-#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5449
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "\"%s\"ロールの権限を持つロールのみがこのパラメータを参照することができます。"
@@ -29031,47 +29097,47 @@ msgstr "ALTER SYSTEMはこの環境では許可されていません"
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "ALTER SYSTEM RESET ALLを行う権限がありません"
 
-#: utils/misc/guc.c:4737
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr "ALTER SYSTEMでのパラメータ値は改行を含んではいけません"
 
-#: utils/misc/guc.c:4782
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "ファイル\"%s\"の内容をパースできませんでした"
 
-#: utils/misc/guc.c:4965
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "パラメータ\"%s\"を再定義しようとしています"
 
-#: utils/misc/guc.c:5304
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "設定パラメータ名\"%s\"は不正です、削除します"
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "\"%s\" は予約された接頭辞になりました。"
 
-#: utils/misc/guc.c:6177
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "パラメータ\"%s\"の\"%s\"への変更中"
 
-#: utils/misc/guc.c:6346
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "パラメータ\"%s\"を設定できません"
 
-#: utils/misc/guc.c:6436
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "パラメータ\"%s\"の設定をパースできません"
 
-#: utils/misc/guc.c:6886
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "パラメータ\"%s\"の値が無効です: %g"
@@ -29096,2264 +29162,2268 @@ msgstr "SET %sは1つの引数のみを取ります"
 msgid "SET requires parameter name"
 msgstr "SETにはパラメータ名が必要です"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "その他"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "ファイルの位置"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "接続と認証/接続設定"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "接続と認証/TCP設定"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "接続と認証/認証"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "接続と認証/SSL"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "使用リソース/メモリ"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "使用リソース/ディスク"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
 msgstr "使用リソース/カーネルリソース"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "使用リソース / バックグラウンド・ライタ"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:711
 msgid "Resource Usage / I/O"
 msgstr "使用リソース/ I/O"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:712
 msgid "Resource Usage / Worker Processes"
 msgstr "使用リソース/ワーカープロセス"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "先行書き込みログ / 設定"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "先行書き込みログ / チェックポイント"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "先行書き込みログ / アーカイビング"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "先行書き込みログ / リカバリ"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "先行書き込みログ / アーカイブリカバリ"
 
-#: utils/misc/guc_tables.c:709
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "先行書き込みログ / チェックポイント"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "先行書き込みログ / 集約"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "レプリケーション / 送信サーバー"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "レプリケーション / プライマリサーバー"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "レプリケーション / スタンバイサーバー"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "レプリケーション / サブスクライバ"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "問い合わせのチューニング / プランナ手法設定"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "問い合わせのチューニング / プランナコスト定数"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "問い合わせのチューニング / 遺伝的問い合わせオプティマイザ"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "問い合わせのチューニング / その他のプランオプション"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "レポートとログ出力 / ログの出力先"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "レポートとログ出力 / ログのタイミング"
 
-#: utils/misc/guc_tables.c:721
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "レポートとログ出力 / ログの内容"
 
-#: utils/misc/guc_tables.c:722
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "レポートとログ出力 / プロセス表記"
 
-#: utils/misc/guc_tables.c:723
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "統計情報 / 監視"
 
-#: utils/misc/guc_tables.c:724
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "統計情報 / 問い合わせとインデックスの累積統計情報"
 
-#: utils/misc/guc_tables.c:725
+#: utils/misc/guc_tables.c:734
 msgid "Vacuuming / Automatic Vacuuming"
 msgstr "VACUUM / 自動VACUUM"
 
-#: utils/misc/guc_tables.c:726
+#: utils/misc/guc_tables.c:735
 msgid "Vacuuming / Cost-Based Vacuum Delay"
 msgstr "VACUUM / コストベースVACUUM遅延"
 
-#: utils/misc/guc_tables.c:727
+#: utils/misc/guc_tables.c:736
 msgid "Vacuuming / Default Behavior"
 msgstr "VACUUM / デフォルト動作"
 
-#: utils/misc/guc_tables.c:728
+#: utils/misc/guc_tables.c:737
 msgid "Vacuuming / Freezing"
 msgstr "VACUUM / 凍結"
 
-#: utils/misc/guc_tables.c:729
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "クライアント接続のデフォルト設定 / 文の振舞い"
 
-#: utils/misc/guc_tables.c:730
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "クライアント接続のデフォルト設定 / ロケールと整形"
 
-#: utils/misc/guc_tables.c:731
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "クライアント接続のデフォルト設定 / ライブラリの事前読み込み"
 
-#: utils/misc/guc_tables.c:732
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "クライアント接続のデフォルト設定 / その他のデフォルト設定"
 
-#: utils/misc/guc_tables.c:733
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "ロック管理"
 
-#: utils/misc/guc_tables.c:734
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "バージョンおよびプラットフォーム間の互換性 / PostgreSQLの以前のバージョン"
 
-#: utils/misc/guc_tables.c:735
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "バージョンおよびプラットフォーム間の互換性 / 他のプラットフォームおよびクライアント"
 
-#: utils/misc/guc_tables.c:736
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "エラーハンドリング"
 
-#: utils/misc/guc_tables.c:737
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "事前設定オプション"
 
-#: utils/misc/guc_tables.c:738
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "独自オプション"
 
-#: utils/misc/guc_tables.c:739
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "開発者向けオプション"
 
-#: utils/misc/guc_tables.c:794
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "プランナでのシーケンシャルスキャンプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:804
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "プランナでのインデックススキャンプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:814
+#: utils/misc/guc_tables.c:823
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "プランナでのインデックスオンリースキャンプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:824
+#: utils/misc/guc_tables.c:833
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "プランナでのビットマップスキャンプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:834
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "プランナでのTIDスキャンプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:844
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "プランナでの明示的ソートの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:854
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "プランナでの差分ソート処理の使用を有効にします。"
 
-#: utils/misc/guc_tables.c:864
+#: utils/misc/guc_tables.c:873
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "プランナでのハッシュ集約プランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:874
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "プランナでの実体化の使用を有効にします。"
 
-#: utils/misc/guc_tables.c:884
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "プランナでのメモ化の使用を有効にします。"
 
-#: utils/misc/guc_tables.c:894
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "プランナでのネストループジョインプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:904
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "プランナでのマージジョインプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:914
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "プランナでのハッシュジョインプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:924
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "プランナでのギャザーマージプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:934
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "パーティション単位ジョインを有効にします。"
 
-#: utils/misc/guc_tables.c:944
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "パーティション単位の集約およびグルーピングを有効にします。"
 
-#: utils/misc/guc_tables.c:954
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "プランナでの並列アペンドプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:964
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "プランナでの並列ハッシュプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:974
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "実行計画作成時および実行時のパーティション除外処理を有効にします。"
 
-#: utils/misc/guc_tables.c:975
+#: utils/misc/guc_tables.c:984
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr "実行計画時と実行時の、クエリ中の条件とパーティション境界の比較に基づいたパーティション単位のスキャン除外処理を許可します。"
 
-#: utils/misc/guc_tables.c:986
+#: utils/misc/guc_tables.c:995
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr "プランナにおいてORDER BY / DISTINCT集約関数に対してソート済みの入力を供給する実行計画の生成を有効化します。"
 
-#: utils/misc/guc_tables.c:989
+#: utils/misc/guc_tables.c:998
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr "問い合わせプランナがORDER BY / DISTINCT句を使用する集約関数に対してソート済みの入力を供給する実行計画を生成することを許可します。無効にすると、実行時にソートが常に暗黙的に実行されるようになります。"
 
-#: utils/misc/guc_tables.c:1001
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr "プランナでの非同期アペンドプランの使用を有効にします。"
 
-#: utils/misc/guc_tables.c:1011
+#: utils/misc/guc_tables.c:1020
 msgid "Enables removal of unique self-joins."
 msgstr "ユニークな自己結合の削除を有効にします。"
 
-#: utils/misc/guc_tables.c:1021
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
 msgstr "GROUP BYキーによる再ソートを有効化します。"
 
-#: utils/misc/guc_tables.c:1031
-msgid "Enables reordering of DISTINCT pathkeys."
-msgstr "DISTINCTパスキーの順序変更を有効にします。"
+#: utils/misc/guc_tables.c:1040
+msgid "Enables reordering of DISTINCT keys."
+msgstr "DISTINCTキーの順序変更を有効にします。"
 
-#: utils/misc/guc_tables.c:1041
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "遺伝的問い合わせ最適化を有効にします。"
 
-#: utils/misc/guc_tables.c:1042
+#: utils/misc/guc_tables.c:1051
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "このアルゴリズムでは、全数探索を伴わずに行う実行計画の作成を試みます。"
 
-#: utils/misc/guc_tables.c:1056
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "現在のユーザーがスーパーユーザーかどうかを表示します。"
 
-#: utils/misc/guc_tables.c:1071
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "ALTER SYSTEMコマンドの実行を許可します。"
 
-#: utils/misc/guc_tables.c:1072
+#: utils/misc/guc_tables.c:1081
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
 msgstr "グローバル設定の変更を他の方法で行うべき環境ではoffにすることができます。"
 
-#: utils/misc/guc_tables.c:1082
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "Bonjour を経由したサーバーのアドバタイズを有効にします。"
 
-#: utils/misc/guc_tables.c:1091
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "トランザクションのコミット時刻を収集します。"
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "SSL接続を有効にします。"
 
-#: utils/misc/guc_tables.c:1109
+#: utils/misc/guc_tables.c:1118
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr "サーバーリロード時に\"ssl_passphrase_command\"を呼び出すかどうかを制御します。"
 
-#: utils/misc/guc_tables.c:1118
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
 msgstr "サーバー側の暗号スイート順序を優先します。"
 
-#: utils/misc/guc_tables.c:1127
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "強制的に更新をディスクに同期します。"
 
-#: utils/misc/guc_tables.c:1128
+#: utils/misc/guc_tables.c:1137
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures that a database cluster will recover to a consistent state after an operating system or hardware crash."
 msgstr "サーバーは、確実に更新が物理的にディスクに書き込まれるように複数の場所でfsync()システムコールを使用します。これにより、オペレーティングシステムやハードウェアがクラッシュした後でもデータベースクラスタは一貫した状態に復旧することができます。"
 
-#: utils/misc/guc_tables.c:1139
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "チェックサムエラーの発生時に処理を継続します。"
 
-#: utils/misc/guc_tables.c:1140
+#: utils/misc/guc_tables.c:1149
 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 "チェックサムエラーを検知すると、通常PostgreSQLはエラーの報告を行ない、現在のトランザクションを中断させます。ignore_checksum_failureを真に設定することによりエラーを無視します（代わりに警告を報告します）この動作はクラッシュや他の深刻な問題を引き起こすかもしれません。チェックサムが有効な場合にのみ効果があります。"
 
-#: utils/misc/guc_tables.c:1154
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "破損したページヘッダがあっても処理を継続します。"
 
-#: utils/misc/guc_tables.c:1155
+#: utils/misc/guc_tables.c:1164
 msgid "Detection of a damaged page header normally causes PostgreSQL to report an error, aborting the current transaction. Setting \"zero_damaged_pages\" to true causes the system to instead report a warning, zero out the damaged page, and continue processing. This behavior will destroy data, namely all the rows on the damaged page."
 msgstr "ページヘッダの障害が検出されると、通常PostgreSQLはエラーの報告を行ない、現在のトランザクションを中断させます。\"zero_damaged_pages\"をtrueに設定することにより、システムは代わりに警告を報告し、障害のあるページをゼロで埋め、処理を継続します。 この動作により、障害のあったページ上にある全ての行のデータが破壊されます。"
 
-#: utils/misc/guc_tables.c:1168
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr "不正ページエラーの発生時に処理を継続します。"
 
-#: utils/misc/guc_tables.c:1169
+#: utils/misc/guc_tables.c:1178
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
 msgstr "リカバリ中に不正なページへの参照を行うWALレコードを検出した場合、PostgreSQLはPANICレベルのエラーを出力してリカバリを中断します。”ignore_invalid_pages\"をtrueに設定するとシステムはWALレコード中の不正なページへの参照を無視してリカバリを継続します(ただし、引き続き警告は出力します)。この挙動はクラッシュ、データ損失、破壊の伝播ないしは隠蔽または他の深刻な問題を引き起こします。リカバリモードもしくはスタンバイモードでのみ有効となります。"
 
-#: utils/misc/guc_tables.c:1187
+#: utils/misc/guc_tables.c:1196
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "チェックポイントの後最初に変更された際にページ全体をWALに出力します。"
 
-#: utils/misc/guc_tables.c:1188
+#: utils/misc/guc_tables.c:1197
 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 "ページ書き込み処理中にオペレーティングシステムがクラッシュすると、ディスクへの書き込みが一部分のみ行われる可能性があります。リカバリでは、WALに保存された行の変更だけでは完全に復旧させることができません。このオプションにより、チェックポイントの後の最初の更新時にWALにページを出力するため、完全な復旧が可能になります。"
 
-#: utils/misc/guc_tables.c:1201
+#: utils/misc/guc_tables.c:1210
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
 msgstr "チェックポイントの後最初に更新された時に、重要な更新ではなくてもページ全体をWALに書き出します。"
 
-#: utils/misc/guc_tables.c:1211
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "新しいWALファイルの使用前にゼロを書き込みます。"
 
-#: utils/misc/guc_tables.c:1221
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "WALファイルを名前を変更して再利用します。"
 
-#: utils/misc/guc_tables.c:1231
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "チェックポイントをログに記録します。"
 
-#: utils/misc/guc_tables.c:1240
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
 msgstr "認証前接続ハンドシェークの詳細をログに出力します。"
 
-#: utils/misc/guc_tables.c:1250
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "セッションの終了時刻とその期間をログに記録します。"
 
-#: utils/misc/guc_tables.c:1259
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "各レプリケーションコマンドをログに記録します。"
 
-#: utils/misc/guc_tables.c:1268
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "起動中のサーバーがアサーションチェックを有効にしているかどうかを表示します。"
 
-#: utils/misc/guc_tables.c:1279
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "何からのエラーがあればセッションを終了します"
 
-#: utils/misc/guc_tables.c:1288
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "バックエンドがクラッシュした後サーバーを再初期化します"
 
-#: utils/misc/guc_tables.c:1297
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "バックエンドのクラッシュ後に一時ファイルを削除します。"
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "バックエンドのクラッシュ後にSIGQUITではなくSIGABRTを子プロセスに送信します。"
 
-#: utils/misc/guc_tables.c:1317
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "固まっているプロセスにSIGKILLではなくSIGABRTを送信します。"
 
-#: utils/misc/guc_tables.c:1328
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "完了したSQL全ての実行時間をログに記録します。"
 
-#: utils/misc/guc_tables.c:1338
+#: utils/misc/guc_tables.c:1347
 msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
 msgstr "これを設定すると、すべてのパースおよび実行計画ツリーがcopyObject()を通過するようになり、copyObject()でのエラーや処理漏れを検出しやすくします。"
 
-#: utils/misc/guc_tables.c:1355
+#: utils/misc/guc_tables.c:1364
 msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
 msgstr "これを設定すると、すべてのパースおよび実行計画ツリーがoutfuncs.c/readfuncs.cを通過するようになり、これらのモジュールでのエラーや処理漏れを検出しやすくします。"
 
-#: utils/misc/guc_tables.c:1372
+#: utils/misc/guc_tables.c:1381
 msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
 msgstr "これを設定すると、DML文のすべての未処理のパースツリーがraw_expression_tree_walker()でスキャンされ、この関数でのエラーや処理漏れを検出しやすくします。"
 
-#: utils/misc/guc_tables.c:1390
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "問い合わせのパースツリーをログに記録します。"
 
-#: utils/misc/guc_tables.c:1399
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "リライト後の問い合わせのパースツリーをログに記録します。"
 
-#: utils/misc/guc_tables.c:1408
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "問い合わせの実行計画をログに記録します。"
 
-#: utils/misc/guc_tables.c:1417
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr "パースツリーと実行計画ツリーの表示をインデントします。"
 
-#: utils/misc/guc_tables.c:1426
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "パーサの性能統計情報をサーバーログに出力します。"
 
-#: utils/misc/guc_tables.c:1435
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "プランナの性能統計情報をサーバーログに出力します。"
 
-#: utils/misc/guc_tables.c:1444
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "エグゼキュータの性能統計情報をサーバーログに出力します。"
 
-#: utils/misc/guc_tables.c:1453
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "累積の性能統計情報をサーバーログに出力します。"
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1472
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "B-treeの各種操作に関するシステムリソース(メモリとCPU)の使用統計をログに記録します。"
 
-#: utils/misc/guc_tables.c:1475
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "実行中のコマンドに関する情報を収集します。"
 
-#: utils/misc/guc_tables.c:1476
+#: utils/misc/guc_tables.c:1485
 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 "そのコマンドが実行を開始した時刻を伴った、各セッションでの現時点で実行中のコマンドに関する情報の収集を有効にします。"
 
-#: utils/misc/guc_tables.c:1486
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "データベースの活動について統計情報を収集します。"
 
-#: utils/misc/guc_tables.c:1495
+#: utils/misc/guc_tables.c:1504
 msgid "Collects timing statistics for cost-based vacuum delay."
 msgstr "コストベースのVACUUM遅延に関する時間統計を収集します。"
 
-#: utils/misc/guc_tables.c:1504
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for database I/O activity."
 msgstr "データベースのI/O処理時間に関する統計情報を収集します。"
 
-#: utils/misc/guc_tables.c:1513
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "WALのI/O処理時間に関する統計情報を収集します。"
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1532
 msgid "Updates the process title to show the active SQL command."
 msgstr "活動中のSQLコマンドを表示するようプロセスタイトルを更新します。"
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1533
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr "新しいSQLコマンドをサーバーが受信する度に行うプロセスタイトルの更新を有効にします。"
 
-#: utils/misc/guc_tables.c:1533
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "autovacuumサブプロセスを起動します。"
 
-#: utils/misc/guc_tables.c:1543
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "LISTENとNOTIFYコマンドのためのデバッグ出力を生成します。"
 
-#: utils/misc/guc_tables.c:1555
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "ロック使用状況に関する情報を出力します。"
 
-#: utils/misc/guc_tables.c:1565
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "ユーザーロックの使用状況に関する情報を出力します。"
 
-#: utils/misc/guc_tables.c:1575
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "軽量ロックの使用状況に関する情報を出力します。"
 
-#: utils/misc/guc_tables.c:1585
+#: utils/misc/guc_tables.c:1594
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "デッドロックの発生時点の全てのロックについての情報をダンプします。"
 
-#: utils/misc/guc_tables.c:1597
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "長時間のロック待機をログに記録します。"
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1615
 msgid "Logs lock failures."
 msgstr "ロックの失敗をログ出力します。"
 
-#: utils/misc/guc_tables.c:1615
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr "スタンバイのリカバリ衝突による待機をログ出力します。"
 
-#: utils/misc/guc_tables.c:1624
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "接続ログ内でホスト名を出力します。"
 
-#: utils/misc/guc_tables.c:1625
+#: utils/misc/guc_tables.c:1634
 msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
 msgstr "デフォルトでは、接続ログメッセージには接続ホストのIPアドレスのみが表示されます。 このオプションを有効にすることで、ホスト名もログに表示されるようになります。 ホスト名解決の設定によってはで、無視できないほどの性能の悪化が起きうることに注意してください。"
 
-#: utils/misc/guc_tables.c:1636
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "\"expr=NULL\"という形の式は\"expr IS NULL\"として扱います。"
 
-#: utils/misc/guc_tables.c:1637
+#: utils/misc/guc_tables.c:1646
 msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)."
 msgstr "有効にした場合、expr = NULL(またはNULL = expr)という形の式はexpr IS NULLとして扱われます。つまり、exprの評価がNULL値の場合に真を、さもなくば偽を返します。expr = NULLのSQL仕様に基づいた正しい動作は常にNULL(未知)を返すことです。"
 
-#: utils/misc/guc_tables.c:1649
+#: utils/misc/guc_tables.c:1658
 msgid "Sets the default read-only status of new transactions."
 msgstr "新しいトランザクションのリードオンリー設定のデフォルト値を設定。"
 
-#: utils/misc/guc_tables.c:1659
+#: utils/misc/guc_tables.c:1668
 msgid "Sets the current transaction's read-only status."
 msgstr "現在のトランザクションのリードオンリー設定を設定。"
 
-#: utils/misc/guc_tables.c:1669
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr "新しいトランザクションの遅延可否設定のデフォルト値を設定。"
 
-#: utils/misc/guc_tables.c:1678
+#: utils/misc/guc_tables.c:1687
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "リードオンリーのシリアライズ可能なトランザクションを、シリアライズに失敗することなく実行できるまで遅延させるかどうか"
 
-#: utils/misc/guc_tables.c:1688
+#: utils/misc/guc_tables.c:1697
 msgid "Enables row security."
 msgstr "行セキュリティを有効にします。"
 
-#: utils/misc/guc_tables.c:1689
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr "有効にすると、行セキュリティが全てのユーザーに適用されます。"
 
-#: utils/misc/guc_tables.c:1697
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "CREATE FUNCTIONおよびCREATE PROCEDUREにおいて関数本体を検査します。"
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1715
 msgid "Enables input of NULL elements in arrays."
 msgstr "配列内のNULL要素入力を有効化。"
 
-#: utils/misc/guc_tables.c:1707
+#: utils/misc/guc_tables.c:1716
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr "有効にすると、配列入力値における引用符のないNULLはNULL値を意味するようになります。さもなくば文字通りに解釈されます。"
 
-#: utils/misc/guc_tables.c:1723
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS は今後サポートされません; false のみに設定可能です。"
 
-#: utils/misc/guc_tables.c:1733
+#: utils/misc/guc_tables.c:1742
 msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr "標準エラー出力、CSVログ、および/またはJSONログをログファイルに記録するための子プロセスを開始します。"
 
-#: utils/misc/guc_tables.c:1742
+#: utils/misc/guc_tables.c:1751
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "ログローテーション時に既存の同一名称のログファイルを切り詰めます。"
 
-#: utils/misc/guc_tables.c:1752
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "ソート中にリソース使用状況に関する情報を出力します。"
 
-#: utils/misc/guc_tables.c:1765
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "同期スキャン処理のデバッグ出力を生成します。"
 
-#: utils/misc/guc_tables.c:1780
+#: utils/misc/guc_tables.c:1789
 msgid "Enables bounded sorting using heap sort."
 msgstr "ヒープソートを使用した有界ソート処理を有効にします。"
 
-#: utils/misc/guc_tables.c:1793
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "WAL関連のデバッグ出力を出力します。"
 
-#: utils/misc/guc_tables.c:1805
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "日付時刻が整数ベースかどうかを表示します。"
 
-#: utils/misc/guc_tables.c:1816
+#: utils/misc/guc_tables.c:1825
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "KerberosおよびGSSAPIユーザー名を大文字小文字を区別して扱うかどうかを設定します。"
 
-#: utils/misc/guc_tables.c:1826
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "GSSAPI資格証明委任をクライアントから受け付けるかどかを設定します。"
 
-#: utils/misc/guc_tables.c:1836
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "普通の文字列リテラル内のバックスラッシュエスケープを警告します。"
 
-#: utils/misc/guc_tables.c:1846
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "'...' 文字列はバックスラッシュをそのまま扱います。"
 
-#: utils/misc/guc_tables.c:1857
+#: utils/misc/guc_tables.c:1866
 msgid "Enables synchronized sequential scans."
 msgstr "同期シーケンシャルスキャンを有効にします。"
 
-#: utils/misc/guc_tables.c:1867
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "リカバリ目標のトランザクションを含めるか除外するかを設定。"
 
-#: utils/misc/guc_tables.c:1877
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "差分バックアップを可能にするためのWAL集約プロセスを起動します。"
 
-#: utils/misc/guc_tables.c:1887
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr "リカバリ中でも接続と問い合わせを受け付けます"
 
-#: utils/misc/guc_tables.c:1897
+#: utils/misc/guc_tables.c:1906
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "問い合わせの衝突を避けるためのホットスタンバイからプライマリへのフィードバックを受け付けます"
 
-#: utils/misc/guc_tables.c:1907
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "現在ホットスタンバイが有効であるかどうかを示します。"
 
-#: utils/misc/guc_tables.c:1918
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "システムテーブル構造の変更を許可。"
 
-#: utils/misc/guc_tables.c:1929
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "システムインデックスの読み込みを無効にします。"
 
-#: utils/misc/guc_tables.c:1930
+#: utils/misc/guc_tables.c:1939
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "これはインデックスの更新は妨げないため使用しても安全です。最も大きな悪影響は低速化です。"
 
-#: utils/misc/guc_tables.c:1941
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "pg_tblspc直下のテーブル空間を許可します、テスト用。"
 
-#: utils/misc/guc_tables.c:1952
+#: utils/misc/guc_tables.c:1961
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "ラージオブジェクトで権限チェックを行う際、後方互換性モードを有効にします。"
 
-#: utils/misc/guc_tables.c:1953
+#: utils/misc/guc_tables.c:1962
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "9.0 より前のPostgreSQLとの互換のため、ラージオブジェクトを読んだり変更したりする際に権限チェックをスキップする。"
 
-#: utils/misc/guc_tables.c:1963
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "SQL文を生成する時に、すべての識別子を引用符で囲みます。"
 
-#: utils/misc/guc_tables.c:1973
+#: utils/misc/guc_tables.c:1982
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "データチェックサムがこのクラスタで有効になっているかどうかを表示します。"
 
-#: utils/misc/guc_tables.c:1984
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "シーケンス番号を付加することでsyslogメッセージの重複を防ぎます。"
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "syslogに送出するメッセージを行単位で分割して、1024バイトに収まるようにします。"
 
-#: utils/misc/guc_tables.c:2004
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Gather および Gather Merge でも下位プランを実行するかどうかを制御します。"
 
-#: utils/misc/guc_tables.c:2005
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "Gather ノードでも下位プランを実行するのか、もしくはただタプルの収集のみを行うのか?"
 
-#: utils/misc/guc_tables.c:2015
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "JITコンパイルを許可します。"
 
-#: utils/misc/guc_tables.c:2026
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "JITコンパイルされた関数をデバッガに登録します。"
 
-#: utils/misc/guc_tables.c:2043
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "LLVMビットコードを出力して、JITデバッグを容易にします。"
 
-#: utils/misc/guc_tables.c:2054
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "式のJITコンパイルを許可します。"
 
-#: utils/misc/guc_tables.c:2065
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "perfプロファイラにJITコンパイルされた関数を登録します。"
 
-#: utils/misc/guc_tables.c:2082
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "タプル分解処理のJITコンパイルを許可します。"
 
-#: utils/misc/guc_tables.c:2093
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "データファイルの同期失敗の後に処理を継続するかどうか。"
 
-#: utils/misc/guc_tables.c:2102
+#: utils/misc/guc_tables.c:2111
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr "永続レプリケーションスロットがない場合にWALレシーバが一時スロットを作成するかどうかを設定します。"
 
-#: utils/misc/guc_tables.c:2111
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
 msgstr "イベントトリガを有効にします。"
 
-#: utils/misc/guc_tables.c:2112
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr "有効にすると、イベントトリガは適用可能なすべての文に対して発火します。"
 
-#: utils/misc/guc_tables.c:2121
+#: utils/misc/guc_tables.c:2130
 msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
 msgstr "物理スタンバイがプライマリサーバーから論理フェイルオーバーレプリケーションスロットを同期できるようにする。"
 
-#: utils/misc/guc_tables.c:2130
+#: utils/misc/guc_tables.c:2139
 msgid "Enables deprecation warnings for MD5 passwords."
 msgstr "MD5パスワードの非推奨警告を有効にする。"
 
-#: utils/misc/guc_tables.c:2139
+#: utils/misc/guc_tables.c:2148
 msgid "Enables vacuum to truncate empty pages at the end of the table."
 msgstr "VACUUMの際にテーブル末尾の空のページを切り詰めるようにします。"
 
-#: utils/misc/guc_tables.c:2157
+#: utils/misc/guc_tables.c:2166
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "次のWALへの強制切り替え時間を設定します。"
 
-#: utils/misc/guc_tables.c:2159 utils/misc/guc_tables.c:2313 utils/misc/guc_tables.c:2732 utils/misc/guc_tables.c:2743 utils/misc/guc_tables.c:2754 utils/misc/guc_tables.c:2765 utils/misc/guc_tables.c:2776
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322 utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752 utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774 utils/misc/guc_tables.c:2785
 msgid "0 disables the timeout."
 msgstr "0でこのタイムアウトを無効にします。"
 
-#: utils/misc/guc_tables.c:2168
+#: utils/misc/guc_tables.c:2177
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr "接続開始時の認証後の待ち時間を設定します。"
 
-#: utils/misc/guc_tables.c:2170 utils/misc/guc_tables.c:2908
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "これによりデバッガがプロセスに接続できます。"
 
-#: utils/misc/guc_tables.c:2179
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "デフォルトの統計情報収集目標を設定。"
 
-#: utils/misc/guc_tables.c:2180
+#: utils/misc/guc_tables.c:2189
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr "ALTER TABLE SET STATISTICS経由で列固有の目標値を持たないテーブル列についての統計情報収集目標を設定します。"
 
-#: utils/misc/guc_tables.c:2189
+#: utils/misc/guc_tables.c:2198
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr "副問い合わせを展開する上限のFROMリストのサイズを設定。"
 
-#: utils/misc/guc_tables.c:2191
+#: utils/misc/guc_tables.c:2200
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr "最終的なFROMリストがこの値より多くの要素を持たない時に、プランナは副問い合わせを上位問い合わせにマージします。"
 
-#: utils/misc/guc_tables.c:2202
+#: utils/misc/guc_tables.c:2211
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr "JOIN式を平坦化する上限のFROMリストのサイズを設定。"
 
-#: utils/misc/guc_tables.c:2204
+#: utils/misc/guc_tables.c:2213
 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 "最終的にFROMリストの項目数がこの値を超えない時には常に、プランナは明示的なJOIN構文をFROM項目のリストに組み込みます。"
 
-#: utils/misc/guc_tables.c:2215
+#: utils/misc/guc_tables.c:2224
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr "この数を超えるとGEQOを使用するFROM項目数の閾値を設定。"
 
-#: utils/misc/guc_tables.c:2225
+#: utils/misc/guc_tables.c:2234
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: effortは他のGEQOパラメータのデフォルトを設定するために使用されます。"
 
-#: utils/misc/guc_tables.c:2235
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: 集団内の個体数。"
 
-#: utils/misc/guc_tables.c:2236 utils/misc/guc_tables.c:2246
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
 msgid "0 means use a suitable default value."
 msgstr "0は適切なデフォルト値を選択します。"
 
-#: utils/misc/guc_tables.c:2245
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: アルゴリズムの反復回数です。"
 
-#: utils/misc/guc_tables.c:2257
+#: utils/misc/guc_tables.c:2266
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "デッドロック状態があるかどうかを調べる前にロックを待つ時間を設定。"
 
-#: utils/misc/guc_tables.c:2268
+#: utils/misc/guc_tables.c:2277
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr "ホットスタンバイサーバーがアーカイブされた WAL データを処理している場合は、問い合わせをキャンセルする前に遅延秒数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:2269 utils/misc/guc_tables.c:2280
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
 msgid "-1 means wait forever."
 msgstr "-1は無期限を意味します。"
 
-#: utils/misc/guc_tables.c:2279
+#: utils/misc/guc_tables.c:2288
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr "ホットスタンバイサーバーがストリームの WAL データを処理している場合は、問い合わせをキャンセルする前に遅延秒数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:2290
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "リカバリ中の変更の適用の最小遅延時間を設定します。"
 
-#: utils/misc/guc_tables.c:2301
+#: utils/misc/guc_tables.c:2310
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr "WAL受信プロセスが送出側サーバーへ行う状況報告の最大間隔を設定。"
 
-#: utils/misc/guc_tables.c:2312
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr "送出側サーバーからのデータ受信を待機する最長時間を設定。"
 
-#: utils/misc/guc_tables.c:2323
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "同時接続数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:2334
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "スーパーユーザーによる接続用に予約される接続スロットの数を設定。"
 
-#: utils/misc/guc_tables.c:2344
+#: utils/misc/guc_tables.c:2353
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr "pg_use_reserved_connections権限を持つロールのために予約する接続スロットの数を設定。"
 
-#: utils/misc/guc_tables.c:2355
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "起動時に予約される動的共有メモリの量。"
 
-#: utils/misc/guc_tables.c:2370
+#: utils/misc/guc_tables.c:2379
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "サーバーで使用される共有メモリのバッファ数を設定。"
 
-#: utils/misc/guc_tables.c:2381
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "VACUUM, ANALYZE, および自動VACUUMで使用するバッファプールのサイズを設定します。"
 
-#: utils/misc/guc_tables.c:2392
+#: utils/misc/guc_tables.c:2401
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr "サーバーの主共有メモリ領域のサイズを表示します(MB単位に切り上げられます)"
 
-#: utils/misc/guc_tables.c:2403
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "主共有メモリ領域に必要となるヒュージページの数を表示します。"
 
-#: utils/misc/guc_tables.c:2404
+#: utils/misc/guc_tables.c:2413
 msgid "-1 means huge pages are not supported."
 msgstr "-1はヒュージページがサポートされていないことを示します。"
 
-#: utils/misc/guc_tables.c:2414
+#: utils/misc/guc_tables.c:2423
 msgid "Shows the number of semaphores required for the server."
 msgstr "サーバーで必要となるセマフォの数を表示。"
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2434
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
 msgstr "コミットタイムスタンプのキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2426 utils/misc/guc_tables.c:2481 utils/misc/guc_tables.c:2492
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490 utils/misc/guc_tables.c:2501
 msgid "0 means use a fraction of \"shared_buffers\"."
 msgstr "0で\"shared_buffers\"の一部を使用します。"
 
-#: utils/misc/guc_tables.c:2436
+#: utils/misc/guc_tables.c:2445
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
 msgstr "マルチトランザクションメンバーのキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2447
+#: utils/misc/guc_tables.c:2456
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
 msgstr "マルチトランザクションオフセットのキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2467
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
 msgstr "LISTEN/NOTIFYのメッセージキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2478
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
 msgstr "直列化可能トランザクションのキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2480
+#: utils/misc/guc_tables.c:2489
 msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr "サブトランザクションキャッシュ専用のバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2491
+#: utils/misc/guc_tables.c:2500
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
 msgstr "トランザクション状態のキャッシュで専有するバッファプールのサイズを設定する。"
 
-#: utils/misc/guc_tables.c:2502
+#: utils/misc/guc_tables.c:2511
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "各セッションで使用される一時バッファの最大数を設定。"
 
-#: utils/misc/guc_tables.c:2513
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "サーバーが接続を監視するTCPポートを設定。"
 
-#: utils/misc/guc_tables.c:2523
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Unixドメインソケットのアクセス権限を設定。"
 
-#: utils/misc/guc_tables.c:2524
+#: utils/misc/guc_tables.c:2533
 msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
 msgstr "Unixドメインソケットは、通常のUnixファイルシステム権限の設定を使います。 このパラメータ値は chmod と umask システムコールが受け付ける数値のモード指定を想定しています（慣習的な8進数書式を使うためには、0(ゼロ)で始めなくてはなりません）。 "
 
-#: utils/misc/guc_tables.c:2538
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "ログファイルのパーミッションを設定。"
 
-#: utils/misc/guc_tables.c:2539
+#: utils/misc/guc_tables.c:2548
 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 "このパタメータ値は chmod や umask システムコールで使えるような数値モード指定であることが想定されます（慣習的な記法である8進数書式を使う場合は先頭に0(ゼロ) をつけてください）。 "
 
-#: utils/misc/guc_tables.c:2553
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "データディレクトリのモードを表示します。"
 
-#: utils/misc/guc_tables.c:2554
+#: utils/misc/guc_tables.c:2563
 msgid "The parameter value is 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 "このパタメータ値は chmod や umask システムコールが受け付ける数値形式のモード指定です（慣習的な8進形式を使う場合は先頭に0(ゼロ) をつけてください）。 "
 
-#: utils/misc/guc_tables.c:2567
+#: utils/misc/guc_tables.c:2576
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "問い合わせの作業用空間として使用されるメモリの最大値を設定。"
 
-#: utils/misc/guc_tables.c:2568
+#: utils/misc/guc_tables.c:2577
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr "内部ソート操作とハッシュテーブルで使われるメモリの量がこの量に達した時に一時ディスクファイルへの切替えを行います。"
 
-#: utils/misc/guc_tables.c:2585
+#: utils/misc/guc_tables.c:2594
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "保守作業で使用される最大メモリ量を設定。"
 
-#: utils/misc/guc_tables.c:2586
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "VACUUMやCREATE INDEXなどの作業が含まれます。"
 
-#: utils/misc/guc_tables.c:2596
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "論理デコーディングで使用するメモリ量の上限を設定します。"
 
-#: utils/misc/guc_tables.c:2597
+#: utils/misc/guc_tables.c:2606
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr "個々の内部リオーダバッファはディスクに書き出す前にこれだけの量のメモリを使用することができます。"
 
-#: utils/misc/guc_tables.c:2613
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "スタック長の最大値をキロバイト単位で設定。"
 
-#: utils/misc/guc_tables.c:2624
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "各プロセスで使用される全ての一時ファイルの合計サイズを制限します。"
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1は無制限を意味します。"
 
-#: utils/misc/guc_tables.c:2635
+#: utils/misc/guc_tables.c:2644
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "バッファキャッシュにある1つのページをVACUUM処理する際のコスト。"
 
-#: utils/misc/guc_tables.c:2645
+#: utils/misc/guc_tables.c:2654
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "バッファキャッシュにない1つのページをVACUUM処理する際のコスト。"
 
-#: utils/misc/guc_tables.c:2655
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "VACUUM処理が1つのページをダーティにした際に課すコスト。"
 
-#: utils/misc/guc_tables.c:2665
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr "VACUUM処理を一時休止させるまでに使用できるコスト。"
 
-#: utils/misc/guc_tables.c:2675
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "自動VACUUM用のVACUUM処理を一時休止させるまでに使用できるコスト。"
 
-#: utils/misc/guc_tables.c:2676
+#: utils/misc/guc_tables.c:2685
 msgid "-1 means use \"vacuum_cost_limit\"."
 msgstr "-1で\"vacuum_cost_limit\"を使用します。"
 
-#: utils/misc/guc_tables.c:2685
+#: utils/misc/guc_tables.c:2694
 msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
 msgstr "各サーバープロセスで同時にオープンできるファイルの最大数を設定。"
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "同時に準備状態にできるトランザクションの最大数を設定。"
 
-#: utils/misc/guc_tables.c:2709
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "ロックの追跡を行うテーブルの最小のOIDを設定。"
 
-#: utils/misc/guc_tables.c:2710
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "システムテーブルに関するの出力を避けるために使います。"
 
-#: utils/misc/guc_tables.c:2719
+#: utils/misc/guc_tables.c:2728
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "無条件でロックの追跡を行うテーブルのOIDを設定。"
 
-#: utils/misc/guc_tables.c:2731
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "あらゆる文に対して実行時間として許容する上限値を設定。"
 
-#: utils/misc/guc_tables.c:2742
+#: utils/misc/guc_tables.c:2751
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "ロックの待機の最大許容時間を設定。"
 
-#: utils/misc/guc_tables.c:2753
+#: utils/misc/guc_tables.c:2762
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "問い合わせ間のアイドル時間のトランザクション内における最大許容値を設定。"
 
-#: utils/misc/guc_tables.c:2764
+#: utils/misc/guc_tables.c:2773
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
 msgstr "(準備済みトランザクションではない)セッション内のトランザクションの最大許容時間を設定。"
 
-#: utils/misc/guc_tables.c:2775
+#: utils/misc/guc_tables.c:2784
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "問い合わせ間のアイドル時間のトランザクション外における最大許容値を設定。"
 
-#: utils/misc/guc_tables.c:2786
+#: utils/misc/guc_tables.c:2795
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "VACUUM にテーブル行の凍結をさせる最小のトランザクションID差分。"
 
-#: utils/misc/guc_tables.c:2796
+#: utils/misc/guc_tables.c:2805
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr "行の凍結のためのテーブル全体スキャンを強制させる時のトランザクションID差分。"
 
-#: utils/misc/guc_tables.c:2806
+#: utils/misc/guc_tables.c:2815
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "テーブル行でのマルチトランザクションIDの凍結を強制する最小のマルチトランザクション差分。"
 
-#: utils/misc/guc_tables.c:2816
+#: utils/misc/guc_tables.c:2825
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "行の凍結のためにテーブル全体スキャンを強制する時点のマルチトランザクション差分。"
 
-#: utils/misc/guc_tables.c:2826
+#: utils/misc/guc_tables.c:2835
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "VACUUMにおいて周回による停止を回避するためのフェイルセーフを実行されるまでの経過トランザクション数。"
 
-#: utils/misc/guc_tables.c:2835
+#: utils/misc/guc_tables.c:2844
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "VACUUMにおいて周回による停止を回避するためのフェイルセーフが実行されるまでの経過マルチトランザクション数。"
 
-#: utils/misc/guc_tables.c:2848
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "1トランザクション当たりのロック数の上限を設定。"
 
-#: utils/misc/guc_tables.c:2849
+#: utils/misc/guc_tables.c:2858
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "共有ロックテーブルの大きさは、サーバープロセスまたは準備済みトランザクションごとに最大で\"max_locks_per_transaction\"個のオブジェクトが同時にロックされることを前提として決定されます。"
 
-#: utils/misc/guc_tables.c:2860
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "1トランザクション当たりの述語ロック数の上限を設定。"
 
-#: utils/misc/guc_tables.c:2861
+#: utils/misc/guc_tables.c:2870
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "共有述語ロックテーブルの大きさは、サーバープロセスまたは準備済みトランザクションごとに最大で\"max_pred_locks_per_transaction\"個のオブジェクトが同時にロックされることを前提として決定されます。"
 
-#: utils/misc/guc_tables.c:2872
+#: utils/misc/guc_tables.c:2881
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "1リレーション当たりで述語ロックされるページとタプルの数の上限値を設定。"
 
-#: utils/misc/guc_tables.c:2873
+#: utils/misc/guc_tables.c:2882
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr "あるコネクションで、同じリレーション内でロックされるページ数とタプル数の合計がこの値を超えたときには、これらのロックはリレーションレベルのロックに置き換えられます。"
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "1ページあたりで述語ロックされるタプル数の上限値を設定。"
 
-#: utils/misc/guc_tables.c:2884
+#: utils/misc/guc_tables.c:2893
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr "あるコネクションで 、同じページ上でロックされるタプルの数がこの値を超えたときには、これらのロックはページレベルのロックに置き換えられます。"
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:2903
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "クライアント認証の完了までの最大許容時間を設定。"
 
-#: utils/misc/guc_tables.c:2906
+#: utils/misc/guc_tables.c:2915
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr "接続開始時の認証前の待ち時間を設定します。"
 
-#: utils/misc/guc_tables.c:2918
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "LISTEN / NOTIFYキュー用に割り当てられるページ数の上限を設定。"
 
-#: utils/misc/guc_tables.c:2928
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "リカバリ中のWAL先読みバッファのサイズ。"
 
-#: utils/misc/guc_tables.c:2929
+#: utils/misc/guc_tables.c:2938
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr "参照先データブロックの先行読み込みのためのWAL先読みの最大量。"
 
-#: utils/misc/guc_tables.c:2939
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "スタンバイサーバーのために確保するWALの量を設定します。"
 
-#: utils/misc/guc_tables.c:2950
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "WALを縮小させる際の最小のサイズを設定。"
 
-#: utils/misc/guc_tables.c:2962
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "チェックポイントの契機となるWALのサイズを指定。"
 
-#: utils/misc/guc_tables.c:2974
+#: utils/misc/guc_tables.c:2983
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "自動WALチェックポイントの最大間隔を設定。"
 
-#: utils/misc/guc_tables.c:2985
+#: utils/misc/guc_tables.c:2994
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr "WALの量契機のチェックポイントが高頻度で起きる場合に、警告を発するまでの回数を設定。"
 
-#: utils/misc/guc_tables.c:2987
+#: utils/misc/guc_tables.c:2996
 msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
 msgstr "チェックポイントセグメントファイルを使い切ることが原因で起きるチェックポイントがこの時間間隔よりも頻繁に発生する場合、サーバーログにメッセージを書き出します。0でこの警告を無効にします。 "
 
-#: utils/misc/guc_tables.c:3000 utils/misc/guc_tables.c:3230 utils/misc/guc_tables.c:3322
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239 utils/misc/guc_tables.c:3331
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr "すでに実行された書き込みがディスクに書き出されるまでのページ数。"
 
-#: utils/misc/guc_tables.c:3001 utils/misc/guc_tables.c:3231 utils/misc/guc_tables.c:3323
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240 utils/misc/guc_tables.c:3332
 msgid "0 disables forced writeback."
 msgstr "0で強制ライトバックを無効にします。"
 
-#: utils/misc/guc_tables.c:3011
+#: utils/misc/guc_tables.c:3020
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "共有メモリ内に割り当てられた、WALデータ用のディスクページバッファ数を設定。"
 
-#: utils/misc/guc_tables.c:3012
+#: utils/misc/guc_tables.c:3021
 msgid "-1 means use a fraction of \"shared_buffers\"."
 msgstr "-1で\"shared_buffers\"の一部を使用します。"
 
-#: utils/misc/guc_tables.c:3022
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "WALライタで実行する書き出しの時間間隔。"
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "書き出しが実行されるまでにWALライタで出力するWALの量。"
 
-#: utils/misc/guc_tables.c:3044
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "WALを出力する代わりにfsyncを使用する新規ファイルの最小サイズ。"
 
-#: utils/misc/guc_tables.c:3055
+#: utils/misc/guc_tables.c:3064
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "WAL送信プロセスの最大同時実行数を設定。"
 
-#: utils/misc/guc_tables.c:3066
+#: utils/misc/guc_tables.c:3075
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "同時に定義できるレプリケーションスロットの数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3076
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "レプリケーションスロットで確保できるWALの量の最大値を設定します。"
 
-#: utils/misc/guc_tables.c:3077
+#: utils/misc/guc_tables.c:3086
 msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
 msgstr "ディスク内のWALがこの量に達すると、レプリケーションスロットは停止とマークされ、セグメントは削除あるいは再利用のために解放されます。-1で上限なしとなります。"
 
-#: utils/misc/guc_tables.c:3089
+#: utils/misc/guc_tables.c:3098
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "WALレプリケーションを待つ時間の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3100
+#: utils/misc/guc_tables.c:3109
 msgid "Sets the duration a replication slot can remain idle before it is invalidated."
 msgstr "レプリケーションスロットが無効化されるまでのアイドル時間を設定。"
 
-#: utils/misc/guc_tables.c:3112
+#: utils/misc/guc_tables.c:3121
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr "トランザクションのコミットからWALのディスク書き出しまでの遅延時間をマイクロ秒単位で設定。"
 
-#: utils/misc/guc_tables.c:3124
+#: utils/misc/guc_tables.c:3133
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
 msgstr "”commit_delay\"の実行に必要となる、同時に開いているトランザクション数の最小値を設定。"
 
-#: utils/misc/guc_tables.c:3135
+#: utils/misc/guc_tables.c:3144
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "浮動小数点値の表示桁数を設定。"
 
-#: utils/misc/guc_tables.c:3136
+#: utils/misc/guc_tables.c:3145
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr "このパラメータは、real、double precision、幾何データ型に影響します。ゼロまたは負のパラメータ値は標準的な桁数(FLT_DIG もしくは DBL_DIGどちらか適切な方)に追加されます。正の値は直接出力形式を指定します。"
 
-#: utils/misc/guc_tables.c:3148
+#: utils/misc/guc_tables.c:3157
 msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
 msgstr "文がログ出力の対象となる最小の実行時間を設定します。サンプリングは\"log_statement_sample_rate\"で決定されます。"
 
-#: utils/misc/guc_tables.c:3151
+#: utils/misc/guc_tables.c:3160
 msgid "-1 disables sampling. 0 means sample all statements."
 msgstr "-1 でサンプリングを無効にします。0 はすべての文をサンプルすることを意味します。"
 
-#: utils/misc/guc_tables.c:3161
+#: utils/misc/guc_tables.c:3170
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr "全ての文のログを記録する最小の実行時間を設定。"
 
-#: utils/misc/guc_tables.c:3163
+#: utils/misc/guc_tables.c:3172
 msgid "-1 disables logging statement durations. 0 means log all statement durations."
 msgstr "-1 で文の実行時間のログ出力を無効にします。0 はすべての文の実行時間を記録することを意味します。"
 
-#: utils/misc/guc_tables.c:3173
+#: utils/misc/guc_tables.c:3182
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr "自動VACUUMの活動のログを記録する最小の実行時間を設定。"
 
-#: utils/misc/guc_tables.c:3175
+#: utils/misc/guc_tables.c:3184
 msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
 msgstr "-1 で自動VACUUMの実行ログ出力を無効にします。0 はすべての自動VACUUMの実行を記録することを意味します。"
 
-#: utils/misc/guc_tables.c:3185
+#: utils/misc/guc_tables.c:3194
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr "問い合わせ文をログ出力する際に、出力するbindパラメータ値データの最大バイト数を設定。"
 
-#: utils/misc/guc_tables.c:3187 utils/misc/guc_tables.c:3199
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
 msgid "-1 means log values in full."
 msgstr "-1 で値全体を出力します。"
 
-#: utils/misc/guc_tables.c:3197
+#: utils/misc/guc_tables.c:3206
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr "エラー時の問い合わせ文をログ出力する際に、出力するbindパラメータ値データの最大バイト数を設定。"
 
-#: utils/misc/guc_tables.c:3209
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr "バックグランドライタの周期毎の待機時間"
 
-#: utils/misc/guc_tables.c:3220
+#: utils/misc/guc_tables.c:3229
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "バックグランドライタが1周期で書き出すLRUページ数の最大値。"
 
-#: utils/misc/guc_tables.c:3221
+#: utils/misc/guc_tables.c:3230
 msgid "0 disables background writing."
 msgstr "0でバックグラウンド書き込みを無効にします。"
 
-#: utils/misc/guc_tables.c:3243
+#: utils/misc/guc_tables.c:3252
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr "ディスクサブシステムが効率的に処理可能な同時並行リクエスト数"
 
-#: utils/misc/guc_tables.c:3244 utils/misc/guc_tables.c:3258
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
 msgid "0 disables simultaneous requests."
 msgstr "0で同時並列リクエストを無効にします。"
 
-#: utils/misc/guc_tables.c:3257
+#: utils/misc/guc_tables.c:3266
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr "保守作業に使用される\"effective_io_concurrency\"の亜種。"
 
-#: utils/misc/guc_tables.c:3272
+#: utils/misc/guc_tables.c:3281
 msgid "Server-wide limit that clamps io_combine_limit."
 msgstr "io_combine_limit の上限を制約する、サーバ全体の制限。"
 
-#: utils/misc/guc_tables.c:3286
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
 msgstr "データの読み込みとか書き込みのサイズ制限"
 
-#: utils/misc/guc_tables.c:3300
+#: utils/misc/guc_tables.c:3309
 msgid "Max number of IOs that one process can execute simultaneously."
 msgstr "ひとつのプロセスが同時に実行できるIOの最大数。"
 
-#: utils/misc/guc_tables.c:3312
+#: utils/misc/guc_tables.c:3321
 msgid "Number of IO worker processes, for io_method=worker."
 msgstr "io_method=worker の場合のIOワーカープロセス数。"
 
-#: utils/misc/guc_tables.c:3335
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "同時に実行されるワーカープロセス数の最大値です。"
 
-#: utils/misc/guc_tables.c:3347
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr "レプリケーションワーカープロセス数の最大値です。"
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "サブスクリプション毎のテーブル同期ワーカー数の最大値です。"
 
-#: utils/misc/guc_tables.c:3371
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "サブスクリプション毎のテーブル適用ワーカー数の最大値です。"
 
-#: utils/misc/guc_tables.c:3383
+#: utils/misc/guc_tables.c:3392
 msgid "Sets the maximum number of active replication origins."
 msgstr "有効なレプリケーション起源の最大数を設定します。"
 
-#: utils/misc/guc_tables.c:3393
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "ログファイルのローテーションを行う時間間隔を設定します。"
 
-#: utils/misc/guc_tables.c:3395
+#: utils/misc/guc_tables.c:3404
 msgid "0 disables time-based creation of new log files."
 msgstr "0で時間ベースでのログファイル作成を無効にします。"
 
-#: utils/misc/guc_tables.c:3405
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "ローテートされるまでに許容するログファイルの最大サイズを設定します。"
 
-#: utils/misc/guc_tables.c:3407
+#: utils/misc/guc_tables.c:3416
 msgid "0 disables size-based creation of new log files."
 msgstr "0でサイズベースでのログファイル作成を無効にします。"
 
-#: utils/misc/guc_tables.c:3417
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "関数の引数の最大数を示します。"
 
-#: utils/misc/guc_tables.c:3428
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "インデックスキーの最大数を示します。"
 
-#: utils/misc/guc_tables.c:3439
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "識別子の最大長を示します。"
 
-#: utils/misc/guc_tables.c:3450
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "ディスクブロックサイズを示します。"
 
-#: utils/misc/guc_tables.c:3461
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "ディスクファイルごとのページ数を表示します。"
 
-#: utils/misc/guc_tables.c:3472
+#: utils/misc/guc_tables.c:3481
 msgid "Shows the block size in the write ahead log."
 msgstr "先行書き込みログ(WAL)におけるブロックサイズを表示します"
 
-#: utils/misc/guc_tables.c:3483
+#: utils/misc/guc_tables.c:3492
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr "WALの取り出しの失敗後に再試行する回数を設定。"
 
-#: utils/misc/guc_tables.c:3495
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "先行書き込みログ(WAL)セグメントのサイズを表示します"
 
-#: utils/misc/guc_tables.c:3508
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
 msgstr "WAL集約ファイルを保持する時間。"
 
-#: utils/misc/guc_tables.c:3509
+#: utils/misc/guc_tables.c:3518
 msgid "0 disables automatic summary file deletion."
 msgstr "0で集約ファイルの自動削除を無効にします。"
 
-#: utils/misc/guc_tables.c:3521
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "自動VACUUMの実行開始間隔。"
 
-#: utils/misc/guc_tables.c:3531
+#: utils/misc/guc_tables.c:3540
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "VACUUMを行うまでの、タプルを更新または削除した回数の最小値。"
 
-#: utils/misc/guc_tables.c:3540
+#: utils/misc/guc_tables.c:3549
 msgid "Maximum number of tuple updates or deletes prior to vacuum."
 msgstr "VACUUMを行うまでの、タプルを更新または削除した回数の最大値。"
 
-#: utils/misc/guc_tables.c:3541
+#: utils/misc/guc_tables.c:3550
 msgid "-1 disables the maximum threshold."
 msgstr "-1で上限を無効にします。"
 
-#: utils/misc/guc_tables.c:3549
+#: utils/misc/guc_tables.c:3558
 msgid "Minimum number of tuple inserts prior to vacuum."
 msgstr "VACUUMを行うまでの、タプルを挿入した回数の最小値。"
 
-#: utils/misc/guc_tables.c:3550
+#: utils/misc/guc_tables.c:3559
 msgid "-1 disables insert vacuums."
 msgstr "-1で挿入契機のVACUUMを無効にします。"
 
-#: utils/misc/guc_tables.c:3558
+#: utils/misc/guc_tables.c:3567
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "ANALYZEが実行されるまでの、タプルを挿入、更新、削除した回数の最小値。"
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3577
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "トランザクションID周回を防ぐためにテーブルを自動VACUUMする時点のトランザクションID差分。"
 
-#: utils/misc/guc_tables.c:3580
+#: utils/misc/guc_tables.c:3589
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "マルチトランザクション周回を防止するためにテーブルを自動VACUUMする、マルチトランザクション差分。"
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3599
 msgid "Sets the number of backend slots to allocate for autovacuum workers."
 msgstr "自動VACUUMプロセスに割り当てるバックエンドスロット数を設定。"
 
-#: utils/misc/guc_tables.c:3599
+#: utils/misc/guc_tables.c:3608
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "自動VACUUMのワーカープロセスの最大同時実行数を設定。"
 
-#: utils/misc/guc_tables.c:3609
+#: utils/misc/guc_tables.c:3618
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "ひとつの保守作業に割り当てる並列処理プロセスの数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3619
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "エグゼキュータノードあたりの並列処理プロセスの数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3630
+#: utils/misc/guc_tables.c:3639
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "同時に活動可能な並列処理ワーカーの数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3641
+#: utils/misc/guc_tables.c:3650
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "自動VACUUMプロセスで使用するメモリ量の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3642
+#: utils/misc/guc_tables.c:3651
 msgid "-1 means use \"maintenance_work_mem\"."
 msgstr "-1で\"maintenance_work_mem\"を使用します。"
 
-#: utils/misc/guc_tables.c:3652
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "TCPキープアライブを発行する時間間隔。"
 
-#: utils/misc/guc_tables.c:3653 utils/misc/guc_tables.c:3664 utils/misc/guc_tables.c:3787 utils/misc/guc_tables.c:3798
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673 utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
 msgid "0 means use the system default."
 msgstr "0でシステムのデフォルト値を使用します。"
 
-#: utils/misc/guc_tables.c:3663
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "TCPキープアライブの再送信の時間間隔。"
 
-#: utils/misc/guc_tables.c:3674
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "SSLの再ネゴシエーションは今後サポートされません; 0のみに設定可能です。"
 
-#: utils/misc/guc_tables.c:3685
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "TCPキープアライブの再送信回数の最大値です。"
 
-#: utils/misc/guc_tables.c:3686
+#: utils/misc/guc_tables.c:3695
 msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
 msgstr "接続が失われると判断するまでに再送信される、ひとつづきのキープアライブの数。0でシステムのデフォルト値を使用します。"
 
-#: utils/misc/guc_tables.c:3697
+#: utils/misc/guc_tables.c:3706
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "GINによる正確な検索に対して許容する結果数の最大値を設定。"
 
-#: utils/misc/guc_tables.c:3698
+#: utils/misc/guc_tables.c:3707
 msgid "0 means no limit."
 msgstr "0は無制限を意味します。"
 
-#: utils/misc/guc_tables.c:3707
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "プランナが想定するデータキャッシュ全体のサイズを設定。"
 
-#: utils/misc/guc_tables.c:3708
+#: utils/misc/guc_tables.c:3717
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr "つまり、PostgreSQLのデータファイルに対して使用されるキャッシュ(カーネルキャッシュおよび共有バッファ)全体の量です。これは通常8KBのディスクページを単位とします。"
 
-#: utils/misc/guc_tables.c:3719
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "並列スキャンを検討するテーブルデータの量の最小値を設定。"
 
-#: utils/misc/guc_tables.c:3720
+#: utils/misc/guc_tables.c:3729
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "この限度に到達できないような少ないテーブルページ数しか読み取らないとプランナが見積もった場合、並列スキャンは検討されません。"
 
-#: utils/misc/guc_tables.c:3730
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "並列スキャンを検討するインデックスデータの量の最小値を設定。"
 
-#: utils/misc/guc_tables.c:3731
+#: utils/misc/guc_tables.c:3740
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "この限度に到達できないような少ないページ数しか読み取らないとプランナが見積もった場合、並列スキャンは検討されません。"
 
-#: utils/misc/guc_tables.c:3742
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "サーバーのバージョンを整数値で表示します。"
 
-#: utils/misc/guc_tables.c:3753
+#: utils/misc/guc_tables.c:3762
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "このキロバイト数よりも大きな一時ファイルの使用をログに記録します。"
 
-#: utils/misc/guc_tables.c:3754
+#: utils/misc/guc_tables.c:3763
 msgid "-1 disables logging temporary files. 0 means log all temporary files."
 msgstr "-1で一時ファイルのログへの記録を無効にします。0ですべての一時ファイルをログに記録します。"
 
-#: utils/misc/guc_tables.c:3764
+#: utils/misc/guc_tables.c:3773
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "pg_stat_activity.queryのために予約するサイズをバイト単位で設定。"
 
-#: utils/misc/guc_tables.c:3775
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "GINインデックスの保留リストの最大サイズを設定。"
 
-#: utils/misc/guc_tables.c:3786
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "TCPユーザータイムアウト。"
 
-#: utils/misc/guc_tables.c:3797
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "要求が見込まれるヒュージページのサイズ。"
 
-#: utils/misc/guc_tables.c:3808
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "デバッグ目的のために積極的にシステムキャッシュを消去する。"
 
-#: utils/misc/guc_tables.c:3809
+#: utils/misc/guc_tables.c:3818
 msgid "0 means use normal caching behavior."
 msgstr "0で通常のキャッシュ動作を行います。"
 
-#: utils/misc/guc_tables.c:3831
+#: utils/misc/guc_tables.c:3840
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr "問い合わせ実行中に接続確認を行う時間間隔を設定します。"
 
-#: utils/misc/guc_tables.c:3832
+#: utils/misc/guc_tables.c:3841
 msgid "0 disables connection checks."
 msgstr "0で接続チェックを無効にします。"
 
-#: utils/misc/guc_tables.c:3842
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr "起動処理が長引いた際のステータス更新の時間間隔。"
 
-#: utils/misc/guc_tables.c:3844
+#: utils/misc/guc_tables.c:3853
 msgid "0 disables progress updates."
 msgstr "0で進捗情報の更新を無効にします。"
 
-#: utils/misc/guc_tables.c:3854
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "SCRAMシークレット生成の際の反復回数を設定。"
 
-#: utils/misc/guc_tables.c:3874
+#: utils/misc/guc_tables.c:3883
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr "ひと続きに読み込むディスクページについてプランナで使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3885
+#: utils/misc/guc_tables.c:3894
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr "ひと続きでは読み込めないディスクページについてプランナで使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3896
+#: utils/misc/guc_tables.c:3905
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "一つのタプル(行)の処理についてプランナで使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3907
+#: utils/misc/guc_tables.c:3916
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr "インデックススキャンにおける一つのインデックスエントリの処理についてプランナで使用する見積もりコストを設定。 "
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:3927
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr "一つの演算子または関数の処理についてプランナで使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:3938
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr "並列処理ワーカーからリーダーバックエンドへの一つのタプル(行)の受け渡しについてプランナが使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3940
+#: utils/misc/guc_tables.c:3949
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr "並列問い合わせ実行のためのワーカープロセスの起動についてプランナで使用する見積もりコストを設定。"
 
-#: utils/misc/guc_tables.c:3952
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "問い合わせがこの値より高コストであればJITコンパイルを実行します。"
 
-#: utils/misc/guc_tables.c:3953
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 でJITコンパイルを禁止します。"
 
-#: utils/misc/guc_tables.c:3963
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "問い合わせがこの値より高コストであればJITコンパイルされた関数を最適化します。"
 
-#: utils/misc/guc_tables.c:3964
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1で最適化を行わなくなります。"
 
-#: utils/misc/guc_tables.c:3974
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "問い合わせがこの値より高コストであればJITコンパイルされた関数をインライン化します。"
 
-#: utils/misc/guc_tables.c:3975
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 でインライン化を禁止します。"
 
-#: utils/misc/guc_tables.c:3985
+#: utils/misc/guc_tables.c:3994
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr "カーソルから取り出される行数の全行に対する割合についてプランナで使用する値を設定。"
 
-#: utils/misc/guc_tables.c:3997
+#: utils/misc/guc_tables.c:4006
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr "再帰問い合わせでプランナが使用する中間テーブルの平均見積もりサイズを設定します。"
 
-#: utils/misc/guc_tables.c:4009
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: 集合内の選択圧力。"
 
-#: utils/misc/guc_tables.c:4020
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: ランダムパス選択用のシード"
 
-#: utils/misc/guc_tables.c:4031
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "ハッシュテーブルで使用する\"work_mem\"に対する倍率。"
 
-#: utils/misc/guc_tables.c:4042
+#: utils/misc/guc_tables.c:4051
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "周期ごとに解放するバッファ数の平均バッファ使用量に対する倍数"
 
-#: utils/misc/guc_tables.c:4052
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "乱数生成用のシードを設定。"
 
-#: utils/misc/guc_tables.c:4063
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "ミリ秒単位のコストベースのVACUUM処理の遅延時間です。"
 
-#: utils/misc/guc_tables.c:4074
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "自動VACUUM用のミリ秒単位のコストベースのVACUUM処理の遅延時間です。"
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4084
 msgid "-1 means use \"vacuum_cost_delay\"."
 msgstr "-1で\"vacuum_cost_delay\"を使用します。"
 
-#: utils/misc/guc_tables.c:4085
+#: utils/misc/guc_tables.c:4094
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "VACUUMが実行されるまでのタプルの更新または削除回数のreltuplesに対する割合。"
 
-#: utils/misc/guc_tables.c:4095
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "VACUUMが実行されるまでのタプルの挿入行数のreltuplesに対する割合。"
 
-#: utils/misc/guc_tables.c:4105
+#: utils/misc/guc_tables.c:4114
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "ANALYZEが実行されるまでのタプルの更新または削除回数のreltuplesに対する割合。"
 
-#: utils/misc/guc_tables.c:4115
+#: utils/misc/guc_tables.c:4124
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr "チェックポイント中にダーティバッファの書き出しに使う時間のチェックポイント間隔に対する割合。"
 
-#: utils/misc/guc_tables.c:4125
+#: utils/misc/guc_tables.c:4134
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr "\"log_min_duration_sample\"を超過した文のうちログ出力を行う割合。"
 
-#: utils/misc/guc_tables.c:4126
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "0.0(ログ出力しない)から1.0(すべてログ出力する)の間の値を指定してください。"
 
-#: utils/misc/guc_tables.c:4135
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "すべての文をログ出力するトランザクションの割合を設定します。"
 
-#: utils/misc/guc_tables.c:4136
+#: utils/misc/guc_tables.c:4145
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr "0.0 (ログ出力しない)から 1.0 (全てのトランザクションの全ての文をログ出力する)の間の値を指定してください。"
 
-#: utils/misc/guc_tables.c:4146
+#: utils/misc/guc_tables.c:4155
 msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
 msgstr "VACUUMが貪欲スキャンを無効にする前にスキャンできるページ数の、リレーション全体に対する割合"
 
-#: utils/misc/guc_tables.c:4147
+#: utils/misc/guc_tables.c:4156
 msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
 msgstr "0.0で貪欲スキャンを無効にし、1.0ではリレーション内の全可視ページを最大100%まで貪欲にスキャンします。ページの凍結を複数回のVACUUMに分散させることを目的としているため、VACUUMがスキャンしたページの凍結に成功した場合には、この上限は100%を下回ることがあります。"
 
 # hoge
-#: utils/misc/guc_tables.c:4165
+#: utils/misc/guc_tables.c:4174
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "WALファイルの保管のために呼び出されるシェルスクリプトを設定。"
 
-#: utils/misc/guc_tables.c:4166
+#: utils/misc/guc_tables.c:4175
 msgid "An empty string means use \"archive_library\"."
 msgstr "空文字列で”archive_library\"を使用します。"
 
 # hoge
-#: utils/misc/guc_tables.c:4175
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "WALファイルのアーカイブのために呼び出すライブラリを設定します。"
 
-#: utils/misc/guc_tables.c:4176
+#: utils/misc/guc_tables.c:4185
 msgid "An empty string means use \"archive_command\"."
 msgstr "空文字列で\"archive_command\"を使用します。"
 
 # hoge
-#: utils/misc/guc_tables.c:4185
+#: utils/misc/guc_tables.c:4194
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "アーカイブされたWALファイルを取り出すために呼び出すシェルコマンドを設定します。"
 
 # hoge
-#: utils/misc/guc_tables.c:4195
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "リスタートポイントの時に実行するシェルコマンドを設定。"
 
 # hoge
-#: utils/misc/guc_tables.c:4205
+#: utils/misc/guc_tables.c:4214
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr "リカバリ終了時に1度だけ実行されるシェルコマンドを設定。"
 
-#: utils/misc/guc_tables.c:4215
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "リカバリの目標タイムラインを指定します。"
 
-#: utils/misc/guc_tables.c:4225
+#: utils/misc/guc_tables.c:4234
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr "\"immediate\"を指定すると一貫性が確保できた時点でリカバリを終了します。"
 
-#: utils/misc/guc_tables.c:4234
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "リカバリを指定したトランザクションIDまで進めます。"
 
-#: utils/misc/guc_tables.c:4243
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "リカバリを指定したタイムスタンプの時刻まで進めます。"
 
-#: utils/misc/guc_tables.c:4252
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "リカバリを指定した名前のリストアポイントまで進めます。"
 
-#: utils/misc/guc_tables.c:4261
+#: utils/misc/guc_tables.c:4270
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr "リカバリを先行書き込みログの指定したLSNまで進めます。"
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "送出側サーバーへの接続に使用する接続文字列をしています。"
 
-#: utils/misc/guc_tables.c:4282
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "送出サーバーで使用するレプリケーションスロットの名前を設定。"
 
-#: utils/misc/guc_tables.c:4292
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "クライアントの文字集合の符号化方式を設定。"
 
-#: utils/misc/guc_tables.c:4303
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "各ログ行の前に付ける情報を制御します。"
 
-#: utils/misc/guc_tables.c:4304
+#: utils/misc/guc_tables.c:4313
 msgid "An empty string means no prefix."
 msgstr "空文字列で何も付加しません。"
 
-#: utils/misc/guc_tables.c:4313
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "ログメッセージ使用するタイムゾーンを設定。"
 
-#: utils/misc/guc_tables.c:4323
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "日付時刻値の表示用書式を設定。"
 
-#: utils/misc/guc_tables.c:4324
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "曖昧な日付の入力の解釈も制御します。"
 
-#: utils/misc/guc_tables.c:4335
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "新規テーブルで使用されるデフォルトテーブルアクセスメソッドを設定。"
 
-#: utils/misc/guc_tables.c:4346
+#: utils/misc/guc_tables.c:4355
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "テーブルとインデックスの作成先となるデフォルトのテーブル空間を設定。"
 
-#: utils/misc/guc_tables.c:4347 utils/misc/guc_tables.c:4358
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
 msgid "An empty string means use the database's default tablespace."
 msgstr "空文字列でデータベースのデフォルトのテーブル空間を使用します。"
 
-#: utils/misc/guc_tables.c:4357
+#: utils/misc/guc_tables.c:4366
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "一時テーブルとファイルのソートで使用されるテーブル空間を設定。"
 
-#: utils/misc/guc_tables.c:4368
+#: utils/misc/guc_tables.c:4377
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr "CREATEROLEを持つユーザーが自動的にそのロールを自身にGRANTするかどうかを対象となるオプションとともに設定します"
 
-#: utils/misc/guc_tables.c:4370
+#: utils/misc/guc_tables.c:4379
 msgid "An empty string disables automatic self grants."
 msgstr "空文字列で自動の自己権限付与を無効にします。"
 
-#: utils/misc/guc_tables.c:4380
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "動的ロード可能モジュールのパスを設定。"
 
-#: utils/misc/guc_tables.c:4381
+#: utils/misc/guc_tables.c:4390
 msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
 msgstr "オープンする必要がある動的ロード可能なモジュールについて、指定されたファイル名にディレクトリ要素がない(つまり、名前にスラッシュが含まれない)場合、システムは指定されたファイルをこのパスから検索します。 "
 
-#: utils/misc/guc_tables.c:4394
+#: utils/misc/guc_tables.c:4403
 msgid "Sets the path for extension control files."
 msgstr "機能拡張制御ファイルのパスを設定。"
 
-#: utils/misc/guc_tables.c:4395
+#: utils/misc/guc_tables.c:4404
 msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
 msgstr "残りの機能拡張スクリプトと二次制御ファイルは、主制御ファイルと同じディレクトリから読み込まれます。"
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Kerberosサーバーキーファイルの場所を設定。"
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Bonjour サービス名を設定。"
 
-#: utils/misc/guc_tables.c:4418
+#: utils/misc/guc_tables.c:4427
 msgid "An empty string means use the computer name."
 msgstr "空文字列でコンピューター名を使用します。"
 
-#: utils/misc/guc_tables.c:4427
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "表示用メッセージの言語を設定。"
 
-#: utils/misc/guc_tables.c:4428 utils/misc/guc_tables.c:4438 utils/misc/guc_tables.c:4448 utils/misc/guc_tables.c:4458
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447 utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
 msgid "An empty string means use the operating system setting."
 msgstr "空文字列でオペレーティングシステムの設定を使用します。"
 
-#: utils/misc/guc_tables.c:4437
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "通貨書式で使用するロケールを設定。 "
 
-#: utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "数字の書式で使用するロケールを設定。"
 
-#: utils/misc/guc_tables.c:4457
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "日付と時間の書式で使用するロケールを設定。"
 
-#: utils/misc/guc_tables.c:4467
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr "各バックエンドに事前ロードする共有ライブラリを列挙します。"
 
-#: utils/misc/guc_tables.c:4478
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "サーバーに事前ロードする共有ライブラリを列挙します。"
 
-#: utils/misc/guc_tables.c:4489
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "各バックエンドに事前読み込みする非特権共有ライブラリを列挙します。"
 
-#: utils/misc/guc_tables.c:4500
+#: utils/misc/guc_tables.c:4509
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "スキーマ部を含まない名前に対するスキーマの検索順を設定。"
 
-#: utils/misc/guc_tables.c:4512
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "サーバー(データベース)文字セット符号化方式を表示します。"
 
-#: utils/misc/guc_tables.c:4524
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "サーバーのバージョンを表示します。"
 
-#: utils/misc/guc_tables.c:4536
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "現在のロールを設定。"
 
-#: utils/misc/guc_tables.c:4548
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "セッションユーザー名を設定。"
 
-#: utils/misc/guc_tables.c:4559
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "サーバーログの出力先を設定。"
 
-#: utils/misc/guc_tables.c:4560
+#: utils/misc/guc_tables.c:4569
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr "有効な値は、プラットフォームに依存しますが\"stderr\"、\"syslog\"、\"csvlog\"、\"jsonlog\"そして\"eventlog\"の組み合わせです。"
 
-#: utils/misc/guc_tables.c:4571
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "ログファイルの格納ディレクトリを設定。"
 
-#: utils/misc/guc_tables.c:4572
+#: utils/misc/guc_tables.c:4581
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "データディレクトリからの相対パスでも絶対パスでも指定できます"
 
-#: utils/misc/guc_tables.c:4582
+#: utils/misc/guc_tables.c:4591
 msgid "Sets the file name pattern for log files."
 msgstr "ログファイルのファイル名パターンを設定。"
 
-#: utils/misc/guc_tables.c:4593
+#: utils/misc/guc_tables.c:4602
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "syslog内でPostgreSQLのメッセージを識別するために使用されるプログラム名を設定。"
 
-#: utils/misc/guc_tables.c:4604
+#: utils/misc/guc_tables.c:4613
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "イベントログ内でPostgreSQLのメッセージを識別するために使用されるアプリケーション名を設定。"
 
-#: utils/misc/guc_tables.c:4615
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "タイムスタンプの表示と解釈に使用するタイムゾーンを設定。"
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "タイムゾーン省略形用のファイルを選択します。"
 
-#: utils/misc/guc_tables.c:4635
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Unixドメインソケットを所有するグループを設定。"
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4645
 msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
 msgstr "ソケットを所有するユーザーは常にサーバーを開始したユーザーです。空文字列でユーザのデフォルトグループを使用します。"
 
-#: utils/misc/guc_tables.c:4646
+#: utils/misc/guc_tables.c:4655
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Unixドメインソケットの作成先ディレクトリを設定。"
 
-#: utils/misc/guc_tables.c:4657
+#: utils/misc/guc_tables.c:4666
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "接続を監視するホスト名またはIPアドレスを設定。"
 
-#: utils/misc/guc_tables.c:4672
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "サーバーのデータディレクトリを設定。"
 
-#: utils/misc/guc_tables.c:4683
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "サーバーのメイン設定ファイルを設定。"
 
-#: utils/misc/guc_tables.c:4694
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "サーバーの\"hba\"設定ファイルを設定。"
 
-#: utils/misc/guc_tables.c:4705
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "サーバーの\"ident\"設定ファイルを設定。"
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "postmasterのPIDを指定したファイルに書き込みます。"
 
-#: utils/misc/guc_tables.c:4727
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "SSLライブラリの名前を表示します。"
 
-#: utils/misc/guc_tables.c:4742
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "SSLサーバー証明書ファイルの場所です"
 
-#: utils/misc/guc_tables.c:4752
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "SSLサーバー秘密鍵ファイルの場所です。"
 
-#: utils/misc/guc_tables.c:4762
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "SSL認証局ファイルの場所です"
 
-#: utils/misc/guc_tables.c:4772
+#: utils/misc/guc_tables.c:4781
 msgid "Location of the SSL certificate revocation list file."
 msgstr "SSL証明書失効リストファイルの場所です。"
 
-#: utils/misc/guc_tables.c:4782
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "SSL証明書失効リストディレクトリの場所です。"
 
-#: utils/misc/guc_tables.c:4792
+#: utils/misc/guc_tables.c:4801
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr "同期スタンバイの数と同期スタンバイ候補の名前の一覧。"
 
-#: utils/misc/guc_tables.c:4803
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "デフォルトのテキスト検索設定を設定します。"
 
-#: utils/misc/guc_tables.c:4813
+#: utils/misc/guc_tables.c:4822
 msgid "Sets the list of allowed TLSv1.3 cipher suites."
 msgstr "使用を許可するTLSv1.3の暗号スイートのリストを設定。"
 
-#: utils/misc/guc_tables.c:4814
+#: utils/misc/guc_tables.c:4823
 msgid "An empty string means use the default cipher suites."
 msgstr "空文字列でデフォルトの暗号スイートを使用します。"
 
-#: utils/misc/guc_tables.c:4824
+#: utils/misc/guc_tables.c:4833
 msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
 msgstr "使用可能なTLSv1.2(およびそれ以前)の暗号方式のリストを設定。"
 
-#: utils/misc/guc_tables.c:4839
+#: utils/misc/guc_tables.c:4848
 msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
 msgstr "Diffie-Hellman鍵交換で使用するグループ(群)を設定。"
 
-#: utils/misc/guc_tables.c:4840
-msgid "Multiple groups can be specified using colon-separated list."
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
 msgstr "複数のグループはコロン区切りのリストとして指定できます。"
 
-#: utils/misc/guc_tables.c:4854
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "SSLのDHパラメータファイルの場所です。"
 
-#: utils/misc/guc_tables.c:4855
+#: utils/misc/guc_tables.c:4864
 msgid "An empty string means use compiled-in default parameters."
 msgstr "空文字列でコンパイル時設定のデフォルトのパラメーターを使用します。"
 
-#: utils/misc/guc_tables.c:4865
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "SSLのパスフレーズを取得するコマンド。"
 
-#: utils/misc/guc_tables.c:4866
+#: utils/misc/guc_tables.c:4875
 msgid "An empty string means use the built-in prompting mechanism."
 msgstr "空文字列で内蔵のパスワード入力機構を使用します。"
 
-#: utils/misc/guc_tables.c:4876
+#: utils/misc/guc_tables.c:4885
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "統計やログで報告されるアプリケーション名を設定。"
 
-#: utils/misc/guc_tables.c:4887
+#: utils/misc/guc_tables.c:4896
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "プロセスのタイトルに含まれるクラスタ名を指定。"
 
-#: utils/misc/guc_tables.c:4898
+#: utils/misc/guc_tables.c:4907
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "WALの整合性チェックを行う対象とするリソースマネージャを設定。"
 
-#: utils/misc/guc_tables.c:4899
+#: utils/misc/guc_tables.c:4908
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr "全ページイメージが全てのデータブロックに対して記録され、WAL再生の結果とクロスチェックされます。"
 
-#: utils/misc/guc_tables.c:4909
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "使用するJITプロバイダ。"
 
-#: utils/misc/guc_tables.c:4920
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "これらの関数でエラーが起きた場合にはバックトレースをログに出力します。"
 
-#: utils/misc/guc_tables.c:4931
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "ファイルアクセスに直接I/Oを使用します。"
 
-#: utils/misc/guc_tables.c:4932
+#: utils/misc/guc_tables.c:4941
 msgid "An empty string disables direct I/O."
 msgstr "空文字列で直接I/Oを無効にします。"
 
-#: utils/misc/guc_tables.c:4942
+#: utils/misc/guc_tables.c:4951
 msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
 msgstr "論理WAL senderプロセスが待ち受け対象とするストリーミングレプリケーションのスタンバイサーバーのレプリケーションスロット名を列挙します。"
 
-#: utils/misc/guc_tables.c:4944
+#: utils/misc/guc_tables.c:4953
 msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
 msgstr "論理WAL senderプロセスは指定されたレプリケーションスロットによるWALの受け取り確認後に初めてデコードされた変更を出力プラグインに送出します。"
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:4965
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr "指定した種別の非システムリレーションへのアクセスを禁止します。"
 
-#: utils/misc/guc_tables.c:4967
+#: utils/misc/guc_tables.c:4976
 msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
 msgstr "OAuth v2 の Bearer トークンを検証するために使用できるライブラリの一覧。"
 
-#: utils/misc/guc_tables.c:4978
+#: utils/misc/guc_tables.c:4987
 msgid "Logs specified aspects of connection establishment and setup."
 msgstr "接続の確立やセットアップに関する指定された情報をログに記録します。"
 
-#: utils/misc/guc_tables.c:4999
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "文字列リテラルで\"\\'\"が許可されるかどうかを設定。"
 
-#: utils/misc/guc_tables.c:5009
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "bytea の出力フォーマットを設定。"
 
-#: utils/misc/guc_tables.c:5019
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "クライアントに送信される最小のメッセージレベルを設定。"
 
-#: utils/misc/guc_tables.c:5020 utils/misc/guc_tables.c:5116 utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125 utils/misc/guc_tables.c:5136
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr " 各レベルにはそのレベル以下の全てが含まれます。レベルを低くするほど、送信されるメッセージはより少なくなります。 "
 
-#: utils/misc/guc_tables.c:5030
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "問い合わせ識別子の内部生成を有効にする。"
 
-#: utils/misc/guc_tables.c:5040
+#: utils/misc/guc_tables.c:5049
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "問い合わせの最適化の際にプランナに制約を利用させる。"
 
-#: utils/misc/guc_tables.c:5041
+#: utils/misc/guc_tables.c:5050
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "制約により、問い合わせに一致する行がないことが保証されているテーブルをスキップします。"
 
-#: utils/misc/guc_tables.c:5052
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "圧縮可能な値に対して使用されるデフォルト圧縮方式を設定。"
 
-#: utils/misc/guc_tables.c:5063
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "新規トランザクションのトランザクション分離レベルを設定。"
 
-#: utils/misc/guc_tables.c:5073
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "現在のトランザクションの分離レベルを設定。"
 
-#: utils/misc/guc_tables.c:5084
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "インターバル値の表示フォーマットを設定。"
 
-#: utils/misc/guc_tables.c:5095
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "不正なICUロケール設定の報告に使用するログレベル。"
 
-#: utils/misc/guc_tables.c:5105
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "ログ出力メッセージの詳細度を設定。"
 
-#: utils/misc/guc_tables.c:5115
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "ログに出力するメッセージレベルを設定。"
 
-#: utils/misc/guc_tables.c:5126
+#: utils/misc/guc_tables.c:5135
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "このレベル以上のエラーを発生させた全てのSQL文をログに記録します。"
 
-#: utils/misc/guc_tables.c:5137
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "ログ出力する文の種類を設定。"
 
-#: utils/misc/guc_tables.c:5147
+#: utils/misc/guc_tables.c:5156
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "syslogを有効にした場合に使用するsyslog \"facility\"を設定。"
 
-#: utils/misc/guc_tables.c:5158
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "トリガと書き換えルールに関するセッションの動作を設定。"
 
-#: utils/misc/guc_tables.c:5168
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "現在のトランザクションの同期レベルを設定。"
 
-#: utils/misc/guc_tables.c:5178
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "\"archive_command\"を使用したWALファイルのアーカイブ処理を許可します。"
 
-#: utils/misc/guc_tables.c:5188
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "リカバリ目標に到達した際の動作を設定。"
 
-#: utils/misc/guc_tables.c:5198
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "データベースの動作に関して、関数レベルの統計情報を収集します。"
 
-#: utils/misc/guc_tables.c:5209
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "統計情報読み出し時の一貫性レベルを設定します。"
 
-#: utils/misc/guc_tables.c:5219
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "WALファイルに出力される全ページ出力を指定した方式で圧縮します。"
 
-#: utils/misc/guc_tables.c:5229
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "WALに書き出される情報のレベルを設定します。"
 
-#: utils/misc/guc_tables.c:5239
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "動的共有メモリで使用する実装を選択します。"
 
-#: utils/misc/guc_tables.c:5249
+#: utils/misc/guc_tables.c:5258
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr "主共有メモリ領域に使用する共有メモリ実装を選択します。"
 
-#: utils/misc/guc_tables.c:5259
+#: utils/misc/guc_tables.c:5268
 msgid "Selects the file copy method."
 msgstr "ファイルのコピー方式を選択します。"
 
-#: utils/misc/guc_tables.c:5269
+#: utils/misc/guc_tables.c:5278
+msgid "Selects the method used for extending data files."
+msgstr "データファイルを拡張するための方法を選択します。"
+
+#: utils/misc/guc_tables.c:5288
 msgid "Selects the method used for forcing WAL updates to disk."
-msgstr "WAL更新のディスクへの書き出しを強制するめの方法を選択します。"
+msgstr "WAL更新のディスクへの書き出しを強制するための方法を選択します。"
 
-#: utils/misc/guc_tables.c:5279
+#: utils/misc/guc_tables.c:5298
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "XMLでどのようにバイナリ値を符号化するかを設定します。"
 
-#: utils/misc/guc_tables.c:5289
+#: utils/misc/guc_tables.c:5308
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr "暗黙的なパースおよび直列化操作においてXMLデータを文書とみなすか断片とみなすかを設定します。"
 
-#: utils/misc/guc_tables.c:5300
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "LinuxおよびWindowsでヒュージページを使用。"
 
-#: utils/misc/guc_tables.c:5310
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
 msgstr "ヒュージページの状態を表示。"
 
-#: utils/misc/guc_tables.c:5321
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "リカバリ中に被参照ブロックの事前読み込みを行う。"
 
-#: utils/misc/guc_tables.c:5322
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "キャッシュされていないデータへの参照の検出のためにWALの先読みを行う。"
 
-#: utils/misc/guc_tables.c:5331
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "プランナに並列問い合わせノードの使用を強制します。"
 
-#: utils/misc/guc_tables.c:5332
+#: utils/misc/guc_tables.c:5351
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr "これは並列問い合わせ機構のテストの際に、プランナにワーカーとメインプロセスとの間でタプルのやり取りを行わせるノードを含む実行計画を強制的に生成させるために使用できます。"
 
-#: utils/misc/guc_tables.c:5344
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "パスワードの暗号化に使用するアルゴリズムを選択する。"
 
-#: utils/misc/guc_tables.c:5354
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "プランナでのカスタムプランと汎用プランの選択を制御。"
 
-#: utils/misc/guc_tables.c:5355
+#: utils/misc/guc_tables.c:5374
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr "プリペアド文は個別プランと一般プランを持ち、プランナはよりよいプランの選択を試みます。これを設定することでそのデフォルト動作を変更できます。"
 
-#: utils/misc/guc_tables.c:5367
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "使用する SSL/TLSプロトコルの最小バージョンを設定。"
 
-#: utils/misc/guc_tables.c:5379
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "使用可能な最大の SSL/TLS プロトコルバージョンを指定します。"
 
-#: utils/misc/guc_tables.c:5391
+#: utils/misc/guc_tables.c:5410
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr "クラシュリカバリ前に行うデータディレクトリの同期の方法を設定する。"
 
-#: utils/misc/guc_tables.c:5400
+#: utils/misc/guc_tables.c:5419
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr "大きなトランザクションにおいて、即時ストリーミングまたは変更のシリアライズを強制します。"
 
-#: utils/misc/guc_tables.c:5401
+#: utils/misc/guc_tables.c:5420
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr "パブリッシャでは、この設定はロジカルでコーディングで個々の変更のストリーミングまたはシリアル化を実行させます。サブスクライバではすべての変更をファイルへシリアライズし、トランザクション終了時にその変更情報の読み出しおよび適用の実行をパラレルワーカーに指示するようにします。"
 
-#: utils/misc/guc_tables.c:5413
+#: utils/misc/guc_tables.c:5432
 msgid "Selects the method for executing asynchronous I/O."
 msgstr "非同期I/Oの実行方式を選択します。"
 
@@ -31482,12 +31552,12 @@ msgstr "メモリコンテキスト\"%s\"の作成時に失敗しました"
 msgid "could not attach to dynamic shared area"
 msgstr "動的共有エリアをアタッチできませんでした"
 
-#: utils/mmgr/mcxt.c:1231
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "メモリコンテクスト\"%2$s\"でサイズ%1$zuの要求が失敗しました。"
 
-#: utils/mmgr/mcxt.c:1391
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "PID %dのメモリコンテクストを記録します"
@@ -31502,27 +31572,27 @@ msgstr "カーソル\"%s\"はすでに存在します"
 msgid "closing existing cursor \"%s\""
 msgstr "既存のカーソル\"%s\"をクローズしています"
 
-#: utils/mmgr/portalmem.c:403
+#: utils/mmgr/portalmem.c:401
 #, c-format
 msgid "portal \"%s\" cannot be run"
 msgstr "ポータル\"%s\"を実行できません"
 
-#: utils/mmgr/portalmem.c:481
+#: utils/mmgr/portalmem.c:479
 #, c-format
 msgid "cannot drop pinned portal \"%s\""
 msgstr "固定されたポータル\"%s\"は削除できません"
 
-#: utils/mmgr/portalmem.c:489
+#: utils/mmgr/portalmem.c:487
 #, c-format
 msgid "cannot drop active portal \"%s\""
 msgstr "アクティブなポータル\"%s\"は削除できません"
 
-#: utils/mmgr/portalmem.c:740
+#: utils/mmgr/portalmem.c:738
 #, c-format
 msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
 msgstr "WITH HOLD 付きのカーソルを作成したトランザクションは PREPARE できません"
 
-#: utils/mmgr/portalmem.c:1234
+#: utils/mmgr/portalmem.c:1232
 #, c-format
 msgid "cannot perform transaction commands inside a cursor loop that is not read-only"
 msgstr "読み込み専用ではないカーソルのループ内ではトランザクション命令は実行できません"
@@ -31532,12 +31602,12 @@ msgstr "読み込み専用ではないカーソルのループ内ではトラン
 msgid "could not seek to block %<PRId64> of temporary file"
 msgstr "一時ファイルのブロック%<PRId64>へのシークに失敗しました"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr "タプルストア共有一時ファイル内に予期しないチャンクがありました"
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "共有タプルストア一時ファイルのブロック%uへのシークに失敗しました"
@@ -31547,17 +31617,17 @@ msgstr "共有タプルストア一時ファイルのブロック%uへのシー
 msgid "cannot have more than %d runs for an external sort"
 msgstr "外部ソートでは%d以上のラン数は扱えません"
 
-#: utils/sort/tuplesortvariants.c:1671
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "ユニークインデックス\"%s\"を作成できませんでした"
 
-#: utils/sort/tuplesortvariants.c:1673
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "キー%sは重複しています。"
 
-#: utils/sort/tuplesortvariants.c:1674
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "重複したキーが存在します。"
@@ -31567,52 +31637,130 @@ msgstr "重複したキーが存在します。"
 msgid "could not seek in tuplestore temporary file"
 msgstr "タプルストア一時ファイルのシークに失敗しました"
 
-#: utils/time/snapmgr.c:557
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "元となるトランザクションはすでに実行中ではありません。"
 
-#: utils/time/snapmgr.c:1143
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "サブトランザクションからスナップショットをエクスポートすることはできません"
 
-#: utils/time/snapmgr.c:1303 utils/time/snapmgr.c:1308 utils/time/snapmgr.c:1313 utils/time/snapmgr.c:1328 utils/time/snapmgr.c:1333 utils/time/snapmgr.c:1338 utils/time/snapmgr.c:1353 utils/time/snapmgr.c:1358 utils/time/snapmgr.c:1363 utils/time/snapmgr.c:1477 utils/time/snapmgr.c:1493 utils/time/snapmgr.c:1518
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319 utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339 utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349 utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369 utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488 utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "ファイル\"%s\"内のスナップショットデータが不正です"
 
-#: utils/time/snapmgr.c:1400
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOTを全ての問い合わせの前に呼び出さなければなりません"
 
-#: utils/time/snapmgr.c:1409
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "スナップショットをインポートするトランザクションはSERIALIZABLEまたはREPEATABLE READ分離レベルでなければなりません"
 
-#: utils/time/snapmgr.c:1418
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "無効なスナップショット識別子: \"%s\""
 
-#: utils/time/snapmgr.c:1433
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "スナップショット\"%s\"は存在しません"
 
-#: utils/time/snapmgr.c:1531
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "シリアライザブルトランザクションはシリアライザブルではないトランザクションからのスナップショットをインポートできません"
 
-#: utils/time/snapmgr.c:1535
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "読み取り専用のシリアライザブルトランザクションでは、読み取り専用トランザクションからスナップショットをインポートすることができません"
 
-#: utils/time/snapmgr.c:1550
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "異なるデータベースからのスナップショットを読み込むことはできません"
+
+#~ msgid "\"%s\" array cannot contain NULL values"
+#~ msgstr "\"%s\" の配列はNULL値を格納できません"
+
+#~ msgid "\"%s\" cannot be NULL"
+#~ msgstr "\"%s\"はNULLにはできません"
+
+#~ msgid "\"%s\" is not a physical replication slot."
+#~ msgstr "\"%s\"は物理レプリケーションスロットではありません。"
+
+#~ msgid "\"%s\" must be set to -1 during binary upgrade mode."
+#~ msgstr "バイナリアップグレードモード中は\"%s\"は-1に設定されている必要があります。"
+
+#~ msgid "\"%s\" must be set to 0 during binary upgrade mode."
+#~ msgstr "バイナリアップグレードモード中は\"%s\"は0に設定されている必要があります。"
+
+#~ msgid "Cannot set STATISTIC_KIND_HISTOGRAM or STATISTIC_KIND_CORRELATION."
+#~ msgstr "STATISTIC_KIND_HISTOGRAM および STATISTIC_KIND_CORRELATION は設定できません。"
+
+#~ msgid "Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST."
+#~ msgstr "STATISTIC_KIND_MCELEM および STATISTIC_KIND_DECHIST は設定できません。"
+
+#~ msgid "Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM."
+#~ msgstr "STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM および STATISTIC_KIND_BOUNDS_HISTOGRAM は設定できません。"
+
+#~ msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
+#~ msgstr "EXPLAINのオプションANALYZEとGENERIC_PLANは同時に使用できません"
+
+#~ msgid "Replication slot \"%s\" does not exist."
+#~ msgstr "レプリケーションスロット\"%s\"は存在しません。"
+
+#~ msgid "attribute \"%s\" is not a range type"
+#~ msgstr "属性 \"%s\" は範囲型ではありません"
+
+#~ msgid "attribute %d of relation \"%s\" does not exist"
+#~ msgstr "リレーション \"%2$s\" の属性%1$dは存在しません"
+
+#~ msgid "cannot specify both attname and attnum"
+#~ msgstr "attname と attnum の両方を指定することはできません"
+
+#~ msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
+#~ msgstr "GRANT/REVOKE ON LARGE OBJECTS を使っている時には IN SCHEMA 句は指定できません"
+
+#~ msgid "reltuples cannot be < -1.0"
+#~ msgstr "reltuplesは-1.0未満にはできません"
+
+#~ msgid "replication origin \"%s\" already exists"
+#~ msgstr "レプリケーション基点\"%s\"はすでに存在します"
+
+#~ msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
+#~ msgstr "SIGINTを受信したためレプリケーションスロット同期ワーカーがシャットダウンします"
+
+#~ msgid "requested DSM segment \"%s\" failed initialization"
+#~ msgstr "要求されたDSMセグメント\"%s\"の初期化に失敗しました"
+
+#~ msgid "unrecognized ANALYZE option \"%s\""
+#~ msgstr "ANALYZEオプション\"%s\"が認識できません"
+
+#~ msgid "unrecognized CLUSTER option \"%s\""
+#~ msgstr "認識できないCLUSTERオプション \"%s\""
+
+#~ msgid "unrecognized DROP DATABASE option \"%s\""
+#~ msgstr "DROP DATABASEのオプション\"%s\"が認識できません"
+
+#~ msgid "unrecognized EXPLAIN option \"%s\""
+#~ msgstr "EXPLAIN オプション\"%s\"が認識できません"
+
+#~ msgid "unrecognized REINDEX option \"%s\""
+#~ msgstr "認識できないREINDEXのオプション \"%s\""
+
+#~ msgid "unrecognized VACUUM option \"%s\""
+#~ msgstr "認識できないVACUUMオプション \"%s\""
+
+#~ msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
+#~ msgstr "CREATE_REPLICATION_SLOTのオプション\"%s\"に対する認識できない値: \"%s\""
+
+#~ msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+#~ msgstr "EXPLAIN オプション\"%s\"が認識できない値です: \"%s\""
diff --git a/src/backend/po/ka.po b/src/backend/po/ka.po
index 23730e71818..0f86441e2b3 100644
--- a/src/backend/po/ka.po
+++ b/src/backend/po/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgres (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-18 10:14+0000\n"
-"PO-Revision-Date: 2025-04-19 04:44+0200\n"
+"POT-Creation-Date: 2026-02-08 14:43+0000\n"
+"PO-Revision-Date: 2026-02-08 17:07+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
 #: ../common/binaryheap.c:121 ../common/binaryheap.c:159
 #, c-format
@@ -76,24 +76,24 @@ msgstr "შეკუმშვის ალგორითმს \"%s\" long-dist
 msgid "not recorded"
 msgstr "ჩაწერილი არაა"
 
-#: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97 commands/copyfrom.c:1879 commands/extension.c:3807 utils/adt/genfile.c:123 utils/time/snapmgr.c:1437
+#: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97 commands/copyfrom.c:1879 commands/extension.c:3831 utils/adt/genfile.c:123 utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110 access/transam/timeline.c:143 access/transam/timeline.c:362 access/transam/twophase.c:1353 access/transam/xlog.c:3621 access/transam/xlog.c:4512 access/transam/xlogrecovery.c:1246 access/transam/xlogrecovery.c:1344 access/transam/xlogrecovery.c:1381 access/transam/xlogrecovery.c:1448 backup/basebackup.c:2128 backup/walsummary.c:283 commands/extension.c:3817 libpq/hba.c:769
-#: replication/logical/origin.c:745 replication/logical/origin.c:781 replication/logical/reorderbuffer.c:5236 replication/logical/snapbuild.c:1943 replication/slot.c:2430 replication/slot.c:2471 replication/walsender.c:629 storage/file/buffile.c:470 storage/file/copydir.c:201 utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
+#: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110 access/transam/timeline.c:143 access/transam/timeline.c:362 access/transam/twophase.c:1353 access/transam/xlog.c:3478 access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257 access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392 access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128 backup/walsummary.c:283 commands/extension.c:3841 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804 replication/logical/reorderbuffer.c:5366 replication/logical/snapbuild.c:1951 replication/slot.c:2546 replication/slot.c:2587 replication/walsender.c:643 storage/file/buffile.c:470 storage/file/copydir.c:201 utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ფაილის (%s) წაკითხვის შეცდომა: %m"
 
-#: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119 access/transam/xlog.c:3626 access/transam/xlog.c:4517 replication/logical/origin.c:750 replication/logical/origin.c:789 replication/logical/snapbuild.c:1948 replication/slot.c:2434 replication/slot.c:2475 replication/walsender.c:634 utils/cache/relmapper.c:833
+#: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119 access/transam/xlog.c:3483 access/transam/xlog.c:4374 replication/logical/origin.c:773 replication/logical/origin.c:812 replication/logical/snapbuild.c:1956 replication/slot.c:2550 replication/slot.c:2591 replication/walsender.c:648 utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "\"%s\"-ის წაკითხვის შეცდომა: წაკითხულია %d %zu-დან"
 
-#: ../common/controldata_utils.c:128 ../common/controldata_utils.c:132 ../common/controldata_utils.c:277 ../common/controldata_utils.c:280 access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246 access/transam/timeline.c:392 access/transam/timeline.c:438 access/transam/timeline.c:512 access/transam/twophase.c:1365 access/transam/twophase.c:1783 access/transam/xlog.c:3467 access/transam/xlog.c:3661 access/transam/xlog.c:3666 access/transam/xlog.c:3802
-#: access/transam/xlog.c:4482 access/transam/xlog.c:5458 commands/copyfrom.c:1929 commands/copyto.c:598 libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545 replication/logical/origin.c:683 replication/logical/origin.c:822 replication/logical/reorderbuffer.c:5288 replication/logical/snapbuild.c:1688 replication/logical/snapbuild.c:1814 replication/slot.c:2319 replication/slot.c:2482 replication/walsender.c:644 storage/file/copydir.c:224 storage/file/copydir.c:229
+#: ../common/controldata_utils.c:128 ../common/controldata_utils.c:132 ../common/controldata_utils.c:277 ../common/controldata_utils.c:280 access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246 access/transam/timeline.c:392 access/transam/timeline.c:438 access/transam/timeline.c:512 access/transam/twophase.c:1365 access/transam/twophase.c:1783 access/transam/xlog.c:3324 access/transam/xlog.c:3518 access/transam/xlog.c:3523 access/transam/xlog.c:3659
+#: access/transam/xlog.c:4339 access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598 libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545 replication/logical/origin.c:706 replication/logical/origin.c:845 replication/logical/reorderbuffer.c:5418 replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822 replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658 storage/file/copydir.c:224 storage/file/copydir.c:229
 #: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828 storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841 utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -115,28 +115,29 @@ msgstr ""
 "ბაიტების მიმდევრობა შესაძლოა არ ემთხვეოდეს ამ პროგრამის მიერ გამოყენებულს. ამ შემთხვევაში  ქვემოთ \n"
 "მოცემული შედეგები არასწორი იქნება და PostgreSQL ეს აგება ამ მონაცემთა საქაღალდესთან შეუთავსებელი იქნება."
 
-#: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230 ../common/file_utils.c:69 ../common/file_utils.c:370 ../common/file_utils.c:428 ../common/file_utils.c:502 access/heap/rewriteheap.c:1229 access/transam/timeline.c:111 access/transam/timeline.c:251 access/transam/timeline.c:348 access/transam/twophase.c:1309 access/transam/xlog.c:3357 access/transam/xlog.c:3537 access/transam/xlog.c:3576 access/transam/xlog.c:3769 access/transam/xlog.c:4502
-#: access/transam/xlogrecovery.c:4285 access/transam/xlogrecovery.c:4386 access/transam/xlogutils.c:825 backup/basebackup.c:549 backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626 postmaster/syslogger.c:1512 replication/logical/origin.c:735 replication/logical/reorderbuffer.c:3889 replication/logical/reorderbuffer.c:4443 replication/logical/reorderbuffer.c:5216 replication/logical/snapbuild.c:1643 replication/logical/snapbuild.c:1755
-#: replication/slot.c:2402 replication/walsender.c:602 replication/walsender.c:3056 storage/file/copydir.c:167 storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575 storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:675 utils/cache/relmapper.c:818 utils/cache/relmapper.c:935 utils/error/elog.c:2149 utils/init/miscinit.c:1585 utils/init/miscinit.c:1719 utils/init/miscinit.c:1796 utils/misc/guc.c:4774 utils/misc/guc.c:4824
+#: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230 ../common/file_utils.c:69 ../common/file_utils.c:370 ../common/file_utils.c:428 ../common/file_utils.c:502 access/heap/rewriteheap.c:1229 access/transam/timeline.c:111 access/transam/timeline.c:251 access/transam/timeline.c:348 access/transam/twophase.c:1309 access/transam/xlog.c:3214 access/transam/xlog.c:3394 access/transam/xlog.c:3433 access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408 access/transam/xlogutils.c:825 backup/basebackup.c:549 backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626 postmaster/syslogger.c:1512 replication/logical/origin.c:758 replication/logical/reorderbuffer.c:4019 replication/logical/reorderbuffer.c:4573 replication/logical/reorderbuffer.c:5346 replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616 replication/walsender.c:3094 storage/file/copydir.c:167 storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575 storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686 utils/cache/relmapper.c:818 utils/cache/relmapper.c:935 utils/error/elog.c:2132 utils/init/miscinit.c:1586 utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779 utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249 access/transam/twophase.c:1756 access/transam/twophase.c:1765 access/transam/xlog.c:9467 access/transam/xlogfuncs.c:699 backup/basebackup_server.c:173 backup/basebackup_server.c:266 backup/walsummary.c:304 postmaster/postmaster.c:4098 postmaster/syslogger.c:1523 postmaster/syslogger.c:1536 postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
+#: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249 access/transam/twophase.c:1756 access/transam/twophase.c:1765 access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699 backup/basebackup_server.c:173 backup/basebackup_server.c:266 backup/walsummary.c:304 postmaster/postmaster.c:4105 postmaster/syslogger.c:1523 postmaster/syslogger.c:1536 postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "ფაილში (%s) ჩაწერის შეცდომა: %m"
 
-#: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268 ../common/file_utils.c:440 ../common/file_utils.c:510 access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135 access/heap/rewriteheap.c:1240 access/transam/timeline.c:432 access/transam/timeline.c:506 access/transam/twophase.c:1777 access/transam/xlog.c:3457 access/transam/xlog.c:3655 access/transam/xlog.c:4475 access/transam/xlog.c:8853 access/transam/xlog.c:8897
-#: backup/basebackup_server.c:207 commands/dbcommands.c:515 replication/logical/snapbuild.c:1681 replication/slot.c:2305 replication/slot.c:2412 storage/file/fd.c:820 storage/file/fd.c:3916 storage/smgr/md.c:1455 storage/smgr/md.c:1515 storage/sync/sync.c:446 utils/misc/guc.c:4527
+#: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268 ../common/file_utils.c:440 ../common/file_utils.c:510 access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135 access/heap/rewriteheap.c:1240 access/transam/timeline.c:432 access/transam/timeline.c:506 access/transam/twophase.c:1777 access/transam/xlog.c:3314 access/transam/xlog.c:3512 access/transam/xlog.c:4332 access/transam/xlog.c:8726 access/transam/xlog.c:8770
+#: backup/basebackup_server.c:207 commands/dbcommands.c:515 replication/logical/snapbuild.c:1689 replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820 storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529 storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "ფაილის (%s) fsync-ის შეცდომა: %m"
 
-#: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158 ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588 ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325 ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339 ../common/jsonapi.c:2407 ../common/md5_common.c:156 ../common/parse_manifest.c:157 ../common/parse_manifest.c:852 ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829 ../port/path.c:866
-#: ../port/path.c:883 access/transam/twophase.c:1418 access/transam/xlogrecovery.c:570 lib/dshash.c:253 libpq/auth.c:1345 libpq/auth.c:1389 libpq/auth.c:1951 libpq/be-secure-gssapi.c:527 postmaster/bgworker.c:355 postmaster/bgworker.c:1022 postmaster/postmaster.c:3568 postmaster/walsummarizer.c:942 replication/libpqwalreceiver/libpqwalreceiver.c:351 replication/logical/logical.c:210 replication/walsender.c:811 storage/buffer/localbuf.c:745 storage/file/fd.c:912
-#: storage/file/fd.c:1447 storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465 storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224 storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436 utils/adt/pg_locale.c:509 utils/adt/pg_locale.c:583 utils/adt/pg_locale_icu.c:358 utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302 utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:219 utils/hash/dynahash.c:516 utils/hash/dynahash.c:616
-#: utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401 utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841 utils/misc/guc.c:647 utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505 utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1230 utils/mmgr/slab.c:370
+#: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158 ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588 ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325 ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339 ../common/jsonapi.c:2410 ../common/md5_common.c:156 ../common/parse_manifest.c:157 ../common/parse_manifest.c:852 ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829 ../port/path.c:866
+#: ../port/path.c:883 access/transam/twophase.c:1418 access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353 libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537 libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355 postmaster/bgworker.c:1023 postmaster/postmaster.c:3575 postmaster/walsummarizer.c:938 replication/libpqwalreceiver/libpqwalreceiver.c:364 replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447 storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465 storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224 storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436 utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517 utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358 utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234 utils/hash/dynahash.c:517 utils/hash/dynahash.c:617 utils/hash/dynahash.c:1100 utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815 utils/mb/mbutils.c:842 utils/misc/guc.c:647 utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505 utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "არასაკმარისი მეხსიერება"
@@ -173,7 +174,7 @@ msgstr "გასაშვებად ფაილის \"%s\" პოვნა
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "ბილიკის (\"%s\") აბსოლუტურ ფორმაში ამოხსნის შეცდომა: %m"
 
-#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863 commands/copyto.c:934 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863 commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "ბრძანების (\"%s\") შესრულების შეცდომა: %m"
@@ -188,7 +189,7 @@ msgstr "ბრძანებიდან \"%s\" წაკითხვის შ
 msgid "no data was returned by command \"%s\""
 msgstr "ბრძანებამ \"%s\" მონაცემები არ დააბრუნა"
 
-#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:782 storage/ipc/waiteventset.c:962 storage/ipc/waiteventset.c:1202 storage/ipc/waiteventset.c:1364 storage/ipc/waiteventset.c:1490
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783 storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203 storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s()-ის შეცდომა: %m"
@@ -208,8 +209,8 @@ msgstr "ნულოვანი მაჩვენებლის დუბლ
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "შეუძლებელია ფაილური სისტემის სინქრონიზაცია ფაილისთვის \"%s\": %m"
 
-#: ../common/file_utils.c:123 ../common/file_utils.c:588 ../common/file_utils.c:592 access/transam/twophase.c:1321 access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235 backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626 backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1889 commands/copyto.c:980 commands/extension.c:3796 commands/tablespace.c:804 commands/tablespace.c:893 postmaster/pgarch.c:682
-#: replication/logical/snapbuild.c:1538 replication/logical/snapbuild.c:2065 storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629 utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355 utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
+#: ../common/file_utils.c:123 ../common/file_utils.c:588 ../common/file_utils.c:592 access/transam/twophase.c:1321 access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235 backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626 backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979 commands/extension.c:3820 commands/tablespace.c:804 commands/tablespace.c:893 postmaster/pgarch.c:682 replication/logical/snapbuild.c:1546
+#: replication/logical/snapbuild.c:2073 storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629 utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355 utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "ფაილი \"%s\" არ არსებობს: %m"
@@ -229,7 +230,7 @@ msgstr "საქაღალდის (%s) გახსნის შეცდ
 msgid "could not read directory \"%s\": %m"
 msgstr "საქაღალდის (%s) წაკითხვის შეცდომა: %m"
 
-#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389 postmaster/pgarch.c:836 postmaster/syslogger.c:1560 replication/logical/snapbuild.c:1700 replication/slot.c:987 replication/slot.c:2191 replication/slot.c:2333 storage/file/fd.c:838 utils/time/snapmgr.c:1262
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389 postmaster/pgarch.c:836 postmaster/syslogger.c:1560 replication/logical/snapbuild.c:1708 replication/slot.c:1027 replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838 utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "გადარქმევის შეცდომა %s - %s: %m"
@@ -238,106 +239,106 @@ msgstr "გადარქმევის შეცდომა %s - %s: %m"
 msgid "internal error"
 msgstr "შიდა შეცდომა"
 
-#: ../common/jsonapi.c:2432
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "რეკურსიულ დაღმავალ დამმუშავებელს ინკრემენტული lexer-ის გამოყენება არ შეუძლია."
 
-#: ../common/jsonapi.c:2434
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "ინკრემენტულ დამმუშავებელს ინკრემენტული lexer სჭირდება."
 
-#: ../common/jsonapi.c:2436
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON მეტისმეტად ღრმადაა ერთმანეთში ჩალაგებული. მაქსიმალური დასაშვები სიღრმეა 6400."
 
-#: ../common/jsonapi.c:2438
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "სპეციალური მიმდევრობა \"\\%.*s\" არასწორია."
 
-#: ../common/jsonapi.c:2442
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "სიმბოლო კოდით 0x%02x აუცილებლად ეკრანირებული უნდა იყოს."
 
-#: ../common/jsonapi.c:2446
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "მოველოდი შეყვანის დასასრულს, მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2449
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "მოველოდი მასივის ელემენტს ან \"]\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2452
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "მოველოდი \",\" ან \"]\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2455
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "მოველოდი \":\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2458
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "მოველოდი JSON მნიშვნელობას. მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2461
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "შეყვანის სტრიქონი მოულოდნელად დასრულდა."
 
-#: ../common/jsonapi.c:2463
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "მოველოდი სტრიქონს ან \"}\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2466
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "მოველოდი \",\", ან \"}\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2469
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "მოველოდი სტრიქონს, მაგრამ მივიღე \"%.*s\"."
 
-#: ../common/jsonapi.c:2472
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "კოდი \"%.*s\" არასწორია."
 
-#: ../common/jsonapi.c:2478 jsonpath_scan.l:585
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 ტექსტად ვერ გარდაიქმნება."
 
-#: ../common/jsonapi.c:2480
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" ს თექვსმეტობითი ციფრები უნდა მოჰყვებოდეს."
 
-#: ../common/jsonapi.c:2483
+#: ../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "უნიკოდის სპეციალური კოდების გამოყენება კოდის წერტილის მნიშვნელობებად 007F-ის ზემოთ შეუძლებელია, თუ კოდირება UTF-8 არაა."
 
-#: ../common/jsonapi.c:2492
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "უნიკოდის სპეციალური კოდების სერვერის კოდირებაში (%s) თარგმნა შეუძლებელია."
 
-#: ../common/jsonapi.c:2499 jsonpath_scan.l:618
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "უნიკოდის მაღალ სუროგატს მაღალი სუროგატი არ უნდა მოსდევდეს."
 
-#: ../common/jsonapi.c:2501 jsonpath_scan.l:629 jsonpath_scan.l:639 jsonpath_scan.l:691
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639 jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "უნიკოდის დაბალი სუროგატი მაღალ სუროგატს უნდა მისდევდეს."
 
-#: ../common/jsonapi.c:2523
+#: ../common/jsonapi.c:2526
 msgid "out of memory while constructing error description"
 msgstr "არასაკმარისი მეხსიერება შეცდომის აღწერის აგებისას"
 
@@ -518,7 +519,7 @@ msgstr "მანიფესტის საკონტროლო ჯამ
 msgid "could not parse backup manifest: %s"
 msgstr "მარქაფის მანიფესტის დამუშავების შეცრომა: %s"
 
-#: ../common/percentrepl.c:79 ../common/percentrepl.c:85 ../common/percentrepl.c:118 ../common/percentrepl.c:124 tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205 utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6929 utils/misc/guc.c:6970
+#: ../common/percentrepl.c:79 ../common/percentrepl.c:85 ../common/percentrepl.c:118 ../common/percentrepl.c:124 tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205 utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940 utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "არასწორი მნიშვნელობა პარამეტრისთვის \"%s\": \"%s\""
@@ -578,8 +579,8 @@ msgstr "შეზღუდულ კოდის ხელახლა შეს
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "ქვეპროცესიდან გასასვლელი კოდი ვერ მივიღე: შეცდომის კოდი %lu"
 
-#: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214 access/transam/twophase.c:1716 access/transam/xlogarchive.c:119 access/transam/xlogarchive.c:399 postmaster/postmaster.c:1069 postmaster/syslogger.c:1489 replication/logical/origin.c:591 replication/logical/reorderbuffer.c:4711 replication/logical/snapbuild.c:1581 replication/logical/snapbuild.c:2037 replication/slot.c:2386 storage/file/fd.c:878 storage/file/fd.c:3443 storage/file/fd.c:3505
-#: storage/file/reinit.c:261 storage/ipc/dsm.c:343 storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243 utils/time/snapmgr.c:1598
+#: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214 access/transam/twophase.c:1716 access/transam/xlogarchive.c:119 access/transam/xlogarchive.c:399 backup/walsummary.c:254 postmaster/postmaster.c:1069 postmaster/syslogger.c:1489 replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841 replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045 replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343 storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243 utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "ფაილის წაშლის შეცდომა \"%s\": %m"
@@ -696,25 +697,25 @@ msgstr "\"%s\"-ისთვის შეერთების მიღება
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "\"%s\"-ისთვის შეერთების მიღება ვერ მოხერხდა: %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "ფაილის გახსნის შეცდომა \"%s\": %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "ბლოკის დარღვევა"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "გაზიარების დარღვევა"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "ვაგრძელებ თავიდან ცდას 30 წამით."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "შეიძლება თქვენი ანტივირუსი, მარქაფი ან რამე სხვა პროგრამა ხელს უშლის მონაცემთა ბაზის სისტემის მუშაობას."
@@ -749,7 +750,7 @@ msgstr "კოდის წევრობის წვდომის შემ
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "\"BRIN\" შეჯამების დიაპაზონის ინდექსისთვის \"%s\" გვერდი %u ჩაწერილი არაა"
 
-#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040 access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323 access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447 statistics/attribute_stats.c:190 statistics/attribute_stats.c:931 statistics/relation_stats.c:97
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040 access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323 access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447 statistics/attribute_stats.c:191 statistics/attribute_stats.c:936 statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "აღდგენა მიმდინარეობს"
@@ -774,7 +775,7 @@ msgstr "\"%s\" BRIN ინდექსი არაა"
 msgid "could not open parent table of index \"%s\""
 msgstr "ინდექსის \"%s\" მშობელი ცხრილის გახსნის შეცდომა"
 
-#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085 parser/parse_utilcmd.c:2433
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085 parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "ინდექსი არასწორია: \"%s\""
@@ -884,7 +885,7 @@ msgstr "ინდექსის სვეტების რაოდენო
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "ინდექსის მწკრივი მოითხოვს %zu ბაიტს, მაქსიმალური ზომა %zu"
 
-#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106 tcop/fastpath.c:453 tcop/postgres.c:1951
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106 tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "ფორმატის მხარდაუჭერელი კოდი: %d"
@@ -907,67 +908,72 @@ msgstr "მომხმარებლის მიერ განსაზღ
 msgid "RESET must not include values for parameters"
 msgstr "RESET პარამეტრების მნიშვნელობებს არ უნდა შეიცავდეს"
 
-#: access/common/reloptions.c:1274
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "პარამეტრების სახელების უცნობი სივრცე: \"%s\""
 
-#: access/common/reloptions.c:1311 commands/variable.c:1242
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "არასწორი პარამეტრის სახელი \"%s\": არ უნდა შეიცავდეს სიმბოლოს \"=\""
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "ცხრილები, აღწერილი WITH OIDS-ით, მხარდაუჭერელია"
 
-#: access/common/reloptions.c:1479
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "უცნობი პარამეტრი\"%s\""
 
-#: access/common/reloptions.c:1591
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "პარამეტრი \"%s\" ერთზე მეტჯერაა მითთებული"
 
-#: access/common/reloptions.c:1607
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "არასწორი მნიშვნელობა ლოგიკური პარამეტრისთვის \"%s\": %s"
 
-#: access/common/reloptions.c:1619
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "არასწორი მნიშვნელობა მთელი რიცხვის პარამეტრისთვის \"%s\": %s"
 
-#: access/common/reloptions.c:1625 access/common/reloptions.c:1645
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "მნიშვნელობა %s პარამეტრისთვის \"%s\" საზღვრებს გარეთაა"
 
-#: access/common/reloptions.c:1627
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "სწორი მნიშვნელობები \"%d\"-სა და \"%d\"-ს შორისაა."
 
-#: access/common/reloptions.c:1639
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "წილადი პარამეტრის (\"%s\") არასწორი მნიშვნელობა: %s"
 
-#: access/common/reloptions.c:1647
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "სწორი მნიშვნელობების დიაპაზონია \"%f\"-სა და \"%f\"-ს შორის."
 
-#: access/common/reloptions.c:1669
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "ჩამონათვალი პარამეტრის \"%s\" არასწორი მნიშვნელობა: %s"
 
-#: access/common/reloptions.c:2016
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "დაყოფილი ცხრილისთვის საცავის პარამეტრების მითითება შეუძლებელია"
 
-#: access/common/reloptions.c:2017
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr ""
@@ -1012,17 +1018,17 @@ msgstr "სხვა სესიების დროებით ინდე
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "კორტეჟის თავიდან პოვნის შეცდომა ინდექსში \"%s\""
 
-#: access/gin/gininsert.c:1283 access/gin/ginutil.c:152 executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963 utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726 utils/adt/rowtypes.c:974
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152 executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963 utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726 utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "ტიპისთვის \"%s\" შედარების ფუნქცია ვერ ვიპოვე"
 
-#: access/gin/ginscan.c:437
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "ძველ GIN ინდექსებს არც ინდექსების სრული სკანირების მხარდაჭერა აქვს, არც ნულების ძებნის"
 
-#: access/gin/ginscan.c:438
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "გასასწორებლად გაუშვით REINDEX INDEX \"%s\"."
@@ -1042,17 +1048,17 @@ msgstr "ოპერატორის ოჯახი \"%s\" (წვდომ
 msgid "support function number %d is invalid for access method %s"
 msgstr "მხარდაჭერის ფუნქცია ნომრით %d არასწორია წვდომის მეთოდისთვის: %s"
 
-#: access/gist/gist.c:765 access/gist/gistvacuum.c:462
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "ინდექსი (\"%s\") შეიცავს შიდა კორტეჟს, რომელიც მონიშნულია, როგორც არასწორი"
 
-#: access/gist/gist.c:767 access/gist/gistvacuum.c:464
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "გამოწვეულია ავარიის აღდგენისას გვერდის არასწორი დაყოფისგან, PostgreSQL 9.1-მდე განახლებამდე."
 
-#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812 access/gist/gistvacuum.c:465 access/hash/hashutil.c:226 access/hash/hashutil.c:237 access/hash/hashutil.c:249 access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813 access/nbtree/nbtpage.c:824
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812 access/gist/gistvacuum.c:466 access/hash/hashutil.c:226 access/hash/hashutil.c:237 access/hash/hashutil.c:249 access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813 access/nbtree/nbtpage.c:824
 #, c-format
 msgid "Please REINDEX it."
 msgstr "გადაატარეთ REINDEX."
@@ -1097,8 +1103,8 @@ msgstr "ოპერატორის ოჯახი \"%s\" (წვდომ
 msgid "could not determine which collation to use for string hashing"
 msgstr "სტრიქონების ჰეშირებისთვის საჭირო კოლაციის გარკვევა შეუძლებელია"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:679 catalog/heap.c:685 commands/createas.c:203 commands/createas.c:516 commands/indexcmds.c:2090 commands/tablecmds.c:19910 commands/view.c:80 regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655 utils/adt/formatting.c:1719 utils/adt/formatting.c:1783 utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194 utils/adt/like_support.c:1020 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1592
+#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:688 catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515 commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80 regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655 utils/adt/formatting.c:1719 utils/adt/formatting.c:1783 utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194 utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1603
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "კოლაციის ხელით მისათითებლად გამოიყენეთ COLLATE."
@@ -1148,37 +1154,37 @@ msgstr "ოპერატორის ოჯახს \"%s\" (წვდომ
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "ოპერატორის ოჯახს \"%s\" წვდომის მეთოდში %s ჯვარედინი ტიპის ოპერატორები აკლია"
 
-#: access/heap/heapam.c:2257
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "პარალელურ დამხმარე პროცესში კორტეჟებს ვერ ჩასვამთ"
 
-#: access/heap/heapam.c:2776
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "პარალელური ოპერაციის დროს კორტეჟის წაშლა შეუძლებელია"
 
-#: access/heap/heapam.c:2823
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "უხილავი კორტეჟის წაშლის მცდელობა"
 
-#: access/heap/heapam.c:3271 access/index/genam.c:829
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "პარალელური ოპერაციის დროს კორტეჟის განახლება შეუძლებელია"
 
-#: access/heap/heapam.c:3448
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "უხილავი კორტეჟის განახლების მცდელობა"
 
-#: access/heap/heapam.c:4959 access/heap/heapam.c:4997 access/heap/heapam.c:5262 access/heap/heapam_handler.c:470
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031 access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "ურთიერთობაში \"%s\" მწკრივის დაბლოკვის შეცდომა"
 
-#: access/heap/heapam.c:6376 commands/trigger.c:3350 executor/nodeModifyTable.c:2565 executor/nodeModifyTable.c:2655
+#: access/heap/heapam.c:6425 commands/trigger.c:3401 executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr ""
@@ -1198,8 +1204,8 @@ msgstr "მწკრივი ძალიან დიდია: ზომა %
 msgid "could not write to file \"%s\", wrote %d of %d: %m"
 msgstr "ფაილში \"%s\" ჩაწერა შეუძლებელია. ჩაწერილია %d %d-დან: %m"
 
-#: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094 access/transam/timeline.c:329 access/transam/timeline.c:481 access/transam/xlog.c:3382 access/transam/xlog.c:3590 access/transam/xlog.c:4454 access/transam/xlog.c:9456 access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149 backup/basebackup_server.c:242 commands/dbcommands.c:495 postmaster/launch_backend.c:354 postmaster/postmaster.c:4085 postmaster/walsummarizer.c:1219
-#: replication/logical/origin.c:603 replication/slot.c:2252 storage/file/copydir.c:173 storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1241
+#: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094 access/transam/timeline.c:329 access/transam/timeline.c:481 access/transam/xlog.c:3239 access/transam/xlog.c:3447 access/transam/xlog.c:4311 access/transam/xlog.c:9329 access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149 backup/basebackup_server.c:242 commands/dbcommands.c:495 postmaster/launch_backend.c:354 postmaster/postmaster.c:4092 postmaster/walsummarizer.c:1215
+#: replication/logical/origin.c:626 replication/slot.c:2360 storage/file/copydir.c:173 storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "ფაილის (%s) შექმნის შეცდომა: %m"
@@ -1209,169 +1215,169 @@ msgstr "ფაილის (%s) შექმნის შეცდომა: %m"
 msgid "could not truncate file \"%s\" to %u: %m"
 msgstr "ფაილის (%s) %u-მდე მოკვეთის შეცდომა: %m"
 
-#: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384 access/transam/timeline.c:424 access/transam/timeline.c:498 access/transam/xlog.c:3443 access/transam/xlog.c:3646 access/transam/xlog.c:4466 commands/dbcommands.c:507 postmaster/launch_backend.c:365 postmaster/launch_backend.c:377 replication/logical/origin.c:615 replication/logical/origin.c:657 replication/logical/origin.c:676 replication/logical/snapbuild.c:1657 replication/slot.c:2287
-#: storage/file/buffile.c:545 storage/file/copydir.c:213 utils/init/miscinit.c:1660 utils/init/miscinit.c:1671 utils/init/miscinit.c:1679 utils/misc/guc.c:4488 utils/misc/guc.c:4519 utils/misc/guc.c:5673 utils/misc/guc.c:5691 utils/time/snapmgr.c:1246 utils/time/snapmgr.c:1253
+#: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384 access/transam/timeline.c:424 access/transam/timeline.c:498 access/transam/xlog.c:3300 access/transam/xlog.c:3503 access/transam/xlog.c:4323 commands/dbcommands.c:507 postmaster/launch_backend.c:365 postmaster/launch_backend.c:377 replication/logical/origin.c:638 replication/logical/origin.c:680 replication/logical/origin.c:699 replication/logical/snapbuild.c:1665 replication/slot.c:2396
+#: storage/file/buffile.c:545 storage/file/copydir.c:213 utils/init/miscinit.c:1661 utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488 utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696 utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "ფაილში (%s) ჩაწერის შეცდომა: %m"
 
-#: access/heap/vacuumlazy.c:814
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "აგრესიული დამტვერსასრუტება \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:819
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "დამტვერსასრუტება \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:987
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "მომტვერსასრუტება დასრულებულია \"%s.%s.%s\": დასკანერებული ინდექსები: %d\n"
 
-#: access/heap/vacuumlazy.c:998
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "ჩაციკვლის თავიდან ასაცილებლად ავტომატური აგრესიული მომტვერსასრუტება ცხრილისთვის \"%s.%s.%s\": ინდექსის სკანირების რიცხვი: %d\n"
 
-#: access/heap/vacuumlazy.c:1000
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "ჩაციკვლის თავიდან ასაცილებლად ავტომატური მომტვერსასრუტება ცხრილისთვის \"%s.%s.%s\": ინდექსის სკანირების რიცხვი: %d\n"
 
-#: access/heap/vacuumlazy.c:1005
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "ცხრილის (\"%s.%s.%s\") ავტომატური აგრესიული მომტვერსასრუტება: %d\n"
 
-#: access/heap/vacuumlazy.c:1007
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "ცხრილის (\"%s.%s.%s\") ავტომატური მომტვერსასრუტება: ინდექსების სკანირება: %d\n"
 
-#: access/heap/vacuumlazy.c:1014
+#: access/heap/vacuumlazy.c:1015
 #, c-format
 msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
 msgstr "გვერდები: %u წაშლილი, %u რჩება, %u დასკანერებული (სულ %.2f%%), %u სასწრაფოდ სკანირებული\n"
 
-#: access/heap/vacuumlazy.c:1023
+#: access/heap/vacuumlazy.c:1024
 #, c-format
 msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
 msgstr "კორტეჟები: %<PRId64> წაიშალა, %<PRId64> დარჩა, %<PRId64> მკვდარია, მაგრამ ჯერ ვერ წავშლი\n"
 
-#: access/heap/vacuumlazy.c:1029
+#: access/heap/vacuumlazy.c:1030
 #, c-format
 msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
 msgstr "აცდენილი კორტეჟები: %<PRId64> მკვდრები არ წაშლილა %u გვერდიდან გასუფთავების ბლოკის დაბლოკვის გამო\n"
 
-#: access/heap/vacuumlazy.c:1035
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "წაშლადი ამოჭრილი: %u, რომელიც იყო %d XID ასაკის, როცა ოპერაცია დასრულდა\n"
 
-#: access/heap/vacuumlazy.c:1042
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "ახალი relfrozenxid: %u, რომელიც წინა მნიშვნელობაზე %d XID-ით წინაა\n"
 
-#: access/heap/vacuumlazy.c:1050
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "ახალი relminmxid: %u, რომელიც წინა მნიშვნელობაზე %d MXID-ით წინაა\n"
 
-#: access/heap/vacuumlazy.c:1053
+#: access/heap/vacuumlazy.c:1054
 #, c-format
 msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
 msgstr "გაყინული : %u გვერდს ცხრილიდან (%.2f%% სრული რაოდენობიდან) %<PRId64> კორტეჟი აქვს გაყინული\n"
 
-#: access/heap/vacuumlazy.c:1061
+#: access/heap/vacuumlazy.c:1062
 #, c-format
 msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
 msgstr ""
 
-#: access/heap/vacuumlazy.c:1069
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "ინდექსების სკანირება საჭირო არაა: "
 
-#: access/heap/vacuumlazy.c:1071
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "ინდექსების სკანირება საჭიროა: "
 
-#: access/heap/vacuumlazy.c:1073
+#: access/heap/vacuumlazy.c:1074
 #, c-format
 msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
 msgstr "ცხრილის %u გვერდიდან (სულ %.2f%%) წაშლილია %<PRId64> ჩანაწერის მკვდარი იდენტიფიკატორი\n"
 
-#: access/heap/vacuumlazy.c:1078
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "სკანირებისას გამოტოვებული ინდექსები: "
 
-#: access/heap/vacuumlazy.c:1080
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "სკანირებისას უსაფრთხოების გამო გამოტოვებული ინდექსები: "
 
-#: access/heap/vacuumlazy.c:1082
+#: access/heap/vacuumlazy.c:1083
 #, c-format
 msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
 msgstr "ცხრილის %u გვერდზე (სულ %.2f%%) ნაპოვნია %<PRId64> ჩანაწერის მკვდარი იდენტიფიკატორი\n"
 
-#: access/heap/vacuumlazy.c:1097
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "ინდექსი \"%s\": გვერდები: %u ჯამში %u ახლად წაშლილი, %u ამჟამად წაშლილი, %u მრავალჯერადი\n"
 
-#: access/heap/vacuumlazy.c:1112 commands/analyze.c:817
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
 #, c-format
 msgid "delay time: %.3f ms\n"
 msgstr "დაყოვნების დრო: %.3f მწმ\n"
 
-#: access/heap/vacuumlazy.c:1120 commands/analyze.c:825
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "I/O დროები: კითხვა: %.3f მწმ, ჩაწერა: %.3f მწმ\n"
 
-#: access/heap/vacuumlazy.c:1130 commands/analyze.c:828
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "კითხვის საშ. სიჩქარე: %.3f მბ/წმ, ჩაწერის საშ. სიჩქარე: %.3f მბ/წმ\n"
 
-#: access/heap/vacuumlazy.c:1133 commands/analyze.c:830
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
 msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
 msgstr "ბუფერის გამოყენება: %<PRId64> მოხვედრა, %<PRId64> წაკითხვა, %<PRId64> ტურტლიანი\n"
 
-#: access/heap/vacuumlazy.c:1138 commands/analyze.c:835
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
 msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
 msgstr "WAL გამოყენება: %<PRId64> ჩანაწერი, %<PRId64> სრული გვერდის ასლი, %<PRIu64> ბაიტი, %<PRId64> ბუფერი სავსეა\n"
 
-#: access/heap/vacuumlazy.c:1143 commands/analyze.c:840
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "სისტემური გამოყენება: %s"
 
-#: access/heap/vacuumlazy.c:1431
+#: access/heap/vacuumlazy.c:1432
 #, c-format
-msgid "disabling eager scanning after freezing %u eagerly scanned blocks of \"%s.%s.%s\""
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
 msgstr ""
 
-#: access/heap/vacuumlazy.c:2820
+#: access/heap/vacuumlazy.c:2821
 #, c-format
 msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
 msgstr "ცხრილი \"%s\": წაიშალა %<PRId64> მკვდარი ჩანაწერის იდენტიფიკატორი %u გვერდზე"
 
-#: access/heap/vacuumlazy.c:2992
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "ცხრილის \"%s.%s.%s\" უმნიშვნელო ოპერაციის გამოტოვება დაცვის მიზნით %d ინდექსის სკანირების შემდეგ"
 
-#: access/heap/vacuumlazy.c:2995
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "ცხრილის relfrozenxid -ის და relminmxid -ის მნიშვნელობები ძალიან უკანაა წარშულში."
 
-#: access/heap/vacuumlazy.c:2996
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
@@ -1380,67 +1386,67 @@ msgstr ""
 "მხედველობაში იქონიეთ, რომ საჭიროა კონფიგურაციის პარამეტრის \"maintenance_work_mem\" ან \"autovacuum_work_mem\" გაზრდა.\n"
 "ასევე შეიძლება დაგჭირდეთ განიხილოთ მომტვერსასრუტების სხვა გზები, რომ დაეწიოთ ტრანზაქცების ID-ების გამოყოფას."
 
-#: access/heap/vacuumlazy.c:3258
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "%s: წაკვეთის შეჩერება ბლოკირების კონფლიქტური მოთხოვნის გამო"
 
-#: access/heap/vacuumlazy.c:3328
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "ცხრილი \"%s\": წაიკვეთა %u-დან %u გვერდზე"
 
-#: access/heap/vacuumlazy.c:3390
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "ცხრილი %s: წაკვეთის შეჩერება ბლოკირების კონფლიქტური მოთხოვნის გამო"
 
-#: access/heap/vacuumlazy.c:3509
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "%s-ზე პარალელური მომტვერსასრუტების გამორთვა --- დროებითი ცხრილების პარალელური მომტვერსასრუტება შეუძლებელია"
 
-#: access/heap/vacuumlazy.c:3776
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "ურთიერთობის(%3$s.%4$s) წანაცვლების(%2$u) ბლოკის(%1$u) სკანირებისას"
 
-#: access/heap/vacuumlazy.c:3779
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "%u ბლოკის (ურთიერთობის %s.%s) სკანირებისას"
 
-#: access/heap/vacuumlazy.c:3783
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "ურთიერთობის სკანირებისას \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3791
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "ბლოკის %u, წანაცვლება %u (ურთიერთობის \"%s.%s\") მომტვერსასრუტებისას"
 
-#: access/heap/vacuumlazy.c:3794
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "ბლოკის (%u) მომტვერსასრუტებისას (ურთიერთობიდან \"%s.%s\")"
 
-#: access/heap/vacuumlazy.c:3798
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "ურთერთობის დამტვერსასრუტებისას \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3803 commands/vacuumparallel.c:1126
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "ინდექსის (%s) მომტვერსასრუტებისას (ურთიერთობიდან \"%s.%s\")"
 
-#: access/heap/vacuumlazy.c:3808 commands/vacuumparallel.c:1132
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "ინდექსის \"%s\" მოსუფთავებისას, რომელიც ეკუთვნის ურთიერთობას \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3814
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "ურთიერთობის \"%s.%s\" %u ბლოკამდე მოკვეთისას"
@@ -1465,7 +1471,7 @@ msgstr "ტრანზაქცია გაუქმდა სისტემ
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "ინდექსთან \"%s\" წვდომა მაშინ, როცა მისი რეინდექსი მიმდინარეობს, შეუძლებელია"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1361 commands/indexcmds.c:2982 commands/tablecmds.c:284 commands/tablecmds.c:308 commands/tablecmds.c:19599 commands/tablecmds.c:21519
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361 commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308 commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" ინდექსი არაა"
@@ -1490,7 +1496,7 @@ msgstr "გასაღები უკვე არსებობს: %s."
 msgid "This may be because of a non-immutable index expression."
 msgstr "შეიძლებa ინდექსის გამოსახულების შეცვლადობის ბრალი იყოს."
 
-#: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611 parser/parse_utilcmd.c:2483
+#: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611 parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "ინდექსი \"%s\" ორობითი ხე არაა"
@@ -1510,17 +1516,17 @@ msgstr "ინდექსი (\"%s\") ნახევრად მკვდა
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "შესაძლებელია გამოწვეული იყოს შეწყვეტილი მომტვერსასრუტების მიერ 9.3 ან უფრო ძველ ვერსიაში. განახლებამდე საჭიროა REINDEX-ის გადატარება."
 
-#: access/nbtree/nbtutils.c:4247
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "ინდექსის სტრიქონის ზომა %zu btree-ის ვერსიის (%u) მაქსიმალურ  (%zu) მნიშვნელობაზე მეტია, ინდექსისთვის \"%s\""
 
-#: access/nbtree/nbtutils.c:4252
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "ინდექსის მწკრივები გადაბმულია კორტეჟზე (%u, %u) ურთიერთობაში \"%s\"."
 
-#: access/nbtree/nbtutils.c:4256
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1534,7 +1540,7 @@ msgstr ""
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "ოპერატორის ოჯახი \"%s\" წვდომის მეთოდის %s აკლია მხარდაჭერის ფუნქცია ტიპებისთვის %s და %s"
 
-#: access/sequence/sequence.c:75 access/table/table.c:145 optimizer/util/plancat.c:144
+#: access/sequence/sequence.c:75 access/table/table.c:145 optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "ურთიერთობის (\"%s\") გახსნა შეუძლებელია"
@@ -1569,7 +1575,7 @@ msgstr "კორტეჟის იდენტიფიკატორი (%u,
 msgid "\"%s\" cannot be empty."
 msgstr "\"%s\" ცარიელი არ შეიძლება იყოს."
 
-#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4879
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "\"%s\" ძალიან გრძელია (მაქს %d სიმბოლო)"
@@ -1609,12 +1615,12 @@ msgstr "დარწმუნდით, რომ ძირითად სე
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "დარწმუნდით, რომ კონფიგურაციის პარამეტრი \"%s\" დაყენებულია."
 
-#: access/transam/multixact.c:1097
+#: access/transam/multixact.c:1179
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "ბაზაში (\"%s\") მონაცემების ჩაციკვლის თავიდან ასაცილებლად მონაცემთა ბაზა ბრძანებებს, რომლებიც ახალ მულტიტრანზაქციებს ანიჭებენ, არ იღებს"
 
-#: access/transam/multixact.c:1099 access/transam/multixact.c:1106 access/transam/multixact.c:1130 access/transam/multixact.c:1139 access/transam/varsup.c:158 access/transam/varsup.c:165
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188 access/transam/multixact.c:1212 access/transam/multixact.c:1221 access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
 "Execute a database-wide VACUUM in that database.\n"
@@ -1623,65 +1629,70 @@ msgstr ""
 "გაუშვით მთელი ბაზის მომტვერსასრუტება.\n"
 "ასევე შეიძლება დაგჭირდეთ ძველი მომზადებული ტრანზაქციების გადაცემა ან გაუქმება, ან წაშალეთ გაჭედილი რეპლიკაციის სლოტები."
 
-#: access/transam/multixact.c:1104
+#: access/transam/multixact.c:1186
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "ბაზაში (OID-ით \"%u\") მონაცემების გადატანის თავიდან ასაცილებლად მონაცემთა ბაზა ბრძანებებს, რომლებიც ახალ მულტიტრანზაქციებს ანიჭებენ, არ იღებს"
 
-#: access/transam/multixact.c:1125 access/transam/multixact.c:2482
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, 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] "კიდევ %2$u მულტიტრანზაქციის გამოსაყენებლად ბაზის (%1$s) მომტვერსასრუტებაა საჭირო"
 msgstr[1] "კიდევ %2$u მულტიტრანზაქციის გამოსაყენებლად ბაზის (%1$s) მომტვერსასრუტებაა საჭირო"
 
-#: access/transam/multixact.c:1134 access/transam/multixact.c:2491
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, 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] "კიდევ %2$u მულტიტრანზაქციის გამოსაყენებლად OID-ი %1$u -ის მქონე ბაზა ჯერ უნდა დამტვერსასრუტდეს"
 msgstr[1] "კიდევ %2$u მულტიტრანზაქციის გამოსაყენებლად OID-ი %1$u -ის მქონე ბაზა ჯერ უნდა დამტვერსასრუტდეს"
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "მულტიტრანზაქციული \"წევრების\" ლიმიტი გადაჭარბებულია"
 
-#: access/transam/multixact.c:1196
+#: access/transam/multixact.c:1281
 #, 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] "ბრძანება კი შექმნიდა %u-წევრიან მულტიტრანზაქციას, მაგრამ დარჩენილი ადგილი მხოლოდ %u წევრს ეყოფა."
 msgstr[1] "ბრძანება კი შექმნიდა %u-წევრიან მულტიტრანზაქციას, მაგრამ დარჩენილი ადგილი მხოლოდ %u წევრს ეყოფა."
 
-#: access/transam/multixact.c:1201
+#: access/transam/multixact.c:1286
 #, 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 "მთელ ბაზაზე მომტვერსასრუტების შესრულება ბაზაში OID-ით %u შემცირებული \"vacuum_multixact_freeze_min_age\" და \"vacuum_multixact_freeze_table_age\" პარამეტრებით."
 
-#: access/transam/multixact.c:1232
+#: access/transam/multixact.c:1317
 #, c-format
 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] "ბაზა OID-ით %u უნდა მომტვერსასრუტდეს მანამდე, სანამ კიდევ %d მულტიტრანზაქციული წევრი იქნება გამოყენებული"
 msgstr[1] "ბაზა OID-ით %u უნდა მომტვერსასრუტდეს მანამდე, სანამ კიდევ %d მულტიტრანზაქციული წევრი იქნება გამოყენებული"
 
-#: access/transam/multixact.c:1237
+#: access/transam/multixact.c:1322
 #, 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 "მთელ ბაზაზე მომტვერსასრუტების შესრულება მითითებულ ბაზაში შემცირებული \"vacuum_multixact_freeze_min_age\" და \"vacuum_multixact_freeze_table_age\" პარამეტრებით."
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u აღარ არსებობს - აშკარა გადატანა"
 
-#: access/transam/multixact.c:1383
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u ჯერ არ არის შექმნილი - აშკარა გადატანა"
 
-#: access/transam/multixact.c:2487 access/transam/multixact.c:2496
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "მულტიტრანზაქციას %u არასწორი წანაცვლება აქვს"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
@@ -1690,61 +1701,66 @@ msgstr ""
 "მულტიტრანზაქციების მინიჭებების თავიდან ასაცილებლად გაუშვით VACUUM მთელ ბაზაზე იმ მონაცემთა ბაზისთვის.\n"
 "შეიძლება, ასევე, დაგჭირდეთ ძველი მომზადებული ტრანზაქციების კომიტი ან დაბრუნება, ან გამოუყენებელი რეპლიკაციის სლოტების წაშლა."
 
-#: access/transam/multixact.c:2775
+#: access/transam/multixact.c:2845
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "მულტიტრანზაქციული წევრის გადატანის დაცვის ფუნქციები გათიშულია, რადგან უძველესი საკონტროლო წერტილის მქონე მულტიტრანზაქცია %u დისკზე არ არსებობს"
 
-#: access/transam/multixact.c:2797
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "მულტიტრანზაქციების ჩაციკვლისგან დაცვის მექანიზმები ახლა ჩართულია"
 
-#: access/transam/multixact.c:3188
+#: access/transam/multixact.c:3258
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "უძველესი მულტიტრანზაქცია %u ვერ ვიპოვე. უახლესი მულტიტრანზაქციაა %u. წაკვეთა გამოტოვებული იქნება"
 
-#: access/transam/multixact.c:3206
+#: access/transam/multixact.c:3276
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "მულტიტრანზაქციამდე %u მოკვეთა შეუძლებელია, რადგან ის დისკზე არ არსებობს. მოკვეთა გამოტოვებული იქნება"
 
-#: access/transam/multixact.c:3525
+#: access/transam/multixact.c:3293
+#, c-format
+msgid "cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation"
+msgstr "მულტიტრანზაქციამდე %u მოკვეთა შეუძლებელია, რადგან მისი წანაცვლება არასწორია. მოკვეთა გამოტოვებული იქნება"
+
+#: access/transam/multixact.c:3638
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "არასწორი MultiXactId: %u"
 
-#: access/transam/parallel.c:752 access/transam/parallel.c:871
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "პარალელური დამხმარე პროცესის ინიციალიზაციის შეცდომა"
 
-#: access/transam/parallel.c:753 access/transam/parallel.c:872
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "მეტი დეტალები შეიძლება სერვერის ჟურნალში იყოს ხელმისაწვდომი."
 
-#: access/transam/parallel.c:933
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster-ი დასრულდა პარალელური ტრანზაქციისას"
 
-#: access/transam/parallel.c:1120
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "პარალელური დამხმარე პროცესთან კავშირი დაკარგულია"
 
-#: access/transam/parallel.c:1176 access/transam/parallel.c:1178
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "პარალელური დამხმარე პროცესი"
 
-#: access/transam/parallel.c:1348 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "დინამიური გაზიარებული მეხსიერების სეგმენტის მიბმის შეცდომა"
 
-#: access/transam/parallel.c:1353 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "დინამიური გაზიარებული მეხსიერების სეგმენტის არასწორი მაგიური რიცხვი"
@@ -1804,62 +1820,62 @@ msgstr "რესურსის მმართველს ID-ით %d იგ
 msgid "registered custom resource manager \"%s\" with ID %d"
 msgstr "რეგისტრირებულია მორგებული რესურსის მმართველი \"%s\" ID-ით %d"
 
-#: access/transam/slru.c:360
+#: access/transam/slru.c:361
 #, c-format
 msgid "\"%s\" must be a multiple of %d."
 msgstr "\"%s\" %d-ის ნამრავლი უნდა იყოს."
 
-#: access/transam/slru.c:832
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "ფაილი \"%s\" არ არსებობს. წაკითხული იქნება, როგორც ნულებ"
 
-#: access/transam/slru.c:1061 access/transam/slru.c:1067 access/transam/slru.c:1075 access/transam/slru.c:1080 access/transam/slru.c:1087 access/transam/slru.c:1092 access/transam/slru.c:1099 access/transam/slru.c:1106
+#: access/transam/slru.c:1062 access/transam/slru.c:1068 access/transam/slru.c:1076 access/transam/slru.c:1081 access/transam/slru.c:1088 access/transam/slru.c:1093 access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "ტრანზაქციის %u სტატუსის წვდომის შეცდომა"
 
-#: access/transam/slru.c:1062
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m."
 
-#: access/transam/slru.c:1068
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "ფაილში \"%s\" წანაცვლებაზე %d გადახვევის შეცდომა: %m."
 
-#: access/transam/slru.c:1076
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "კითხვის შეცდომა ფაილიდან \"%s\" წანაცვლებასთან %d: %m."
 
-#: access/transam/slru.c:1081
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "კითხვის შეცდომა ფაილიდან \"%s\" წანაცვლებასთან %d: ყველა ბაიტის წაკითხვა შეუძლებელია."
 
-#: access/transam/slru.c:1088
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "ფაილში (\"%s\") ჩაწერის შეცდომა წანაცვლებასთან %d: %m."
 
-#: access/transam/slru.c:1093
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "ფაილში (\"%s\") ჩაწერის შეცდომა წანაცვლებასთან %d: ყველა ბაიტის ჩაწერა შეუძლებელია."
 
-#: access/transam/slru.c:1100
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "ფაილის (%s) fsync-ის შეცდომა: %m."
 
-#: access/transam/slru.c:1107
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "ფაილის (%s) დახურვის შეცდომა: %m."
 
-#: access/transam/slru.c:1433
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "საქაღალდის გასუფთავების შეცდომა: \"%s\" აშკარა ჩაციკვლა"
@@ -2001,7 +2017,7 @@ msgstr "ფაილში (\"%s\") დამახსოვრებული 
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "გამოთვლილი CRC საკონტროლო ჯამი არ ემთხვევა მნიშვნელობას, რომელიც ფაილში \"%s\" წერია"
 
-#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:571 postmaster/walsummarizer.c:943 replication/logical/logical.c:211 replication/walsender.c:812
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572 postmaster/walsummarizer.c:939 replication/logical/logical.c:213 replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "შეცდომა WAL კითხვის პროცესორის გამოყოფისას."
@@ -2078,7 +2094,7 @@ msgstr "ორფაზიანი მდგომარეობის ფა
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr ""
 
-#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:199
+#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "ფაილის (%s) წვდომის შეცდომა: %m"
@@ -2230,118 +2246,113 @@ msgstr "პარალელური ოპერაციის დროს
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "ტრანზაქციაში 2^32-1 ქვეტრანზაქციაზე მეტი ვერ იქნება"
 
-#: access/transam/xlog.c:1552
+#: access/transam/xlog.c:1544
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1779
+#: access/transam/xlog.c:1771
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2342 access/transam/xlog.c:4690
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL სეგმენტის ზომა ორის ხარისხი უნდა იყოს, შუალედიდან 1მბ-1გბ."
 
-#: access/transam/xlog.c:2360
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "ბინარული განახლების რეჟიმისას \"%s\"-ის მნიშვნელობა -1-ზე უნდა დააყენოთ."
-
-#: access/transam/xlog.c:2597
+#: access/transam/xlog.c:2454
 #, 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:3883 access/transam/xlogutils.c:820 replication/walsender.c:3050
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820 replication/walsender.c:3088
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "მოთხოვნილი WAL სეგმენტი %s უკვე წაშლილია"
 
-#: access/transam/xlog.c:4205
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "ფაილის გადარქმევის შეცდომა %s: %m"
 
-#: access/transam/xlog.c:4248 access/transam/xlog.c:4259 access/transam/xlog.c:4280
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116 access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "wal-ის აუცილებელი საქაღალდე \"%s\" არ არსებობს"
 
-#: access/transam/xlog.c:4265 access/transam/xlog.c:4286
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "ნაკლული WAL საქაღალდის შექმნა: \"%s\""
 
-#: access/transam/xlog.c:4269 access/transam/xlog.c:4289 commands/dbcommands.c:3276
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146 commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "ნაკლული საქაღალდის (\"%s\") შექმნის შეცდომა: %m"
 
-#: access/transam/xlog.c:4356
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "ავთენტიკაციისთვის ერთჯერადი კოდის გენერაციის შეცდომა"
 
-#: access/transam/xlog.c:4534 access/transam/xlog.c:4544 access/transam/xlog.c:4570 access/transam/xlog.c:4580 access/transam/xlog.c:4590 access/transam/xlog.c:4596 access/transam/xlog.c:4606 access/transam/xlog.c:4616 access/transam/xlog.c:4626 access/transam/xlog.c:4636 access/transam/xlog.c:4646 access/transam/xlog.c:4656 access/transam/xlog.c:4668 access/transam/xlog.c:4676 utils/init/miscinit.c:1817
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401 access/transam/xlog.c:4427 access/transam/xlog.c:4437 access/transam/xlog.c:4447 access/transam/xlog.c:4453 access/transam/xlog.c:4463 access/transam/xlog.c:4473 access/transam/xlog.c:4483 access/transam/xlog.c:4493 access/transam/xlog.c:4503 access/transam/xlog.c:4513 access/transam/xlog.c:4525 access/transam/xlog.c:4533 utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "ბაზის ფაილები სერვერთან თავსებადი არაა"
 
-#: access/transam/xlog.c:4535
+#: access/transam/xlog.c:4392
 #, 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 "ბაზის კლასტერის ინიციალიზაცია მოხდა PG_CONTROL_VERSION %d (0x%08x)-ით, მაგრამ სერვერის აგებისას PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4539
+#: access/transam/xlog.c:4396
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "ეს შეიძლება ბაიტების არასწორი დალაგების პრობლემაც იყოს.  როგორც ჩანს, initdb გჭირდებათ."
 
-#: access/transam/xlog.c:4545
+#: access/transam/xlog.c:4402
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "ბაზის კლასტერის ინიციალიზაცია მოხდა PG_CONTROL_VERSION %d, მაგრამ სერვერის აგებისას PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4548 access/transam/xlog.c:4576 access/transam/xlog.c:4586 access/transam/xlog.c:4592
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433 access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "როგორც ჩანს, initdb გჭირდებათ."
 
-#: access/transam/xlog.c:4560
+#: access/transam/xlog.c:4417
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "არასწორი საკონტროლო ჯამი pg_control-ის ფაილში"
 
 #. translator: %s is a variable name and %d is its value
-#: access/transam/xlog.c:4572 access/transam/xlog.c:4582 access/transam/xlog.c:4598 access/transam/xlog.c:4608 access/transam/xlog.c:4618 access/transam/xlog.c:4628 access/transam/xlog.c:4638 access/transam/xlog.c:4648 access/transam/xlog.c:4658
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439 access/transam/xlog.c:4455 access/transam/xlog.c:4465 access/transam/xlog.c:4475 access/transam/xlog.c:4485 access/transam/xlog.c:4495 access/transam/xlog.c:4505 access/transam/xlog.c:4515
 #, c-format
 msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
 msgstr "მონაცემთა ბაზის კლასტერის ინიციალიზაცია მოხდა %s %d -ით, მაგრამ სერვერი აგებულია %s %d-ით."
 
-#: access/transam/xlog.c:4591
+#: access/transam/xlog.c:4448
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "როგორც ჩანს, ბაზის კლასტერი წილადი რიცხვების სხვა ფორმატს იყენებს, ვიდრე სერვერის გამშვები ფაილი."
 
-#: access/transam/xlog.c:4602 access/transam/xlog.c:4612 access/transam/xlog.c:4622 access/transam/xlog.c:4632 access/transam/xlog.c:4642 access/transam/xlog.c:4652 access/transam/xlog.c:4662 access/transam/xlog.c:4671 access/transam/xlog.c:4679
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469 access/transam/xlog.c:4479 access/transam/xlog.c:4489 access/transam/xlog.c:4499 access/transam/xlog.c:4509 access/transam/xlog.c:4519 access/transam/xlog.c:4528 access/transam/xlog.c:4536
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "როგორც ჩანს, გჭირდებათ თავიდან ააგოთ პროდუქტი, ან initdb."
 
-#: access/transam/xlog.c:4669
+#: access/transam/xlog.c:4526
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "მონაცემთა ბაზის კლასტერის ინიციალიზაცია მოხდა USE_FLOAT8_BYVAL-ის გარეშე, მაგრამ სერვერი აგებულია USE_FLOAT8_BYVAL-ით."
 
-#: access/transam/xlog.c:4677
+#: access/transam/xlog.c:4534
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "მონაცემთა ბაზის კლასტერის ინიციალიზაცია მოხდა USE_FLOAT8_BYVA -ის გარეშე, მაგრამ სერვერი აგებულია USE_FLOAT8_BYVAL-ით."
 
-#: access/transam/xlog.c:4686
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -2349,279 +2360,279 @@ msgstr[0] "არასწორი WAL სეგმენტის ზომა
 msgstr[1] "არასწორი WAL სეგმენტის ზომა კონტროლის ფაილში (%d ბაიტი)"
 
 #. translator: both %s are GUC names
-#: access/transam/xlog.c:4700 access/transam/xlog.c:4706
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
 msgid "\"%s\" must be at least twice \"%s\""
 msgstr "\"%s\", სულ ცოტა, ორჯერ მეტი უნდა იყოს \"%s\"-ზე"
 
-#: access/transam/xlog.c:4868 catalog/namespace.c:4696 commands/tablespace.c:1210 commands/user.c:2542 commands/variable.c:72 replication/slot.c:2655 tcop/postgres.c:3631 utils/error/elog.c:2274
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699 commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72 replication/slot.c:2768 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "სია სინტაქსი არასწორია."
 
-#: access/transam/xlog.c:4914 commands/user.c:2558 commands/variable.c:173 tcop/postgres.c:3647 utils/error/elog.c:2300
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173 tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "უცნობი საკვანძო სიტყვა: \"%s\"."
 
-#: access/transam/xlog.c:5341
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "ფაილში წინასწარ-ჩაწერადი ჟურნალის ფაილის დასაწყისის ჩაწერის შეცდომა: %m"
 
-#: access/transam/xlog.c:5349
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "ფაილში წინასწარ-ჩაწერადი ჟურნალის ფაილის დასაწყისის fsync-ის შეცდომა: %m"
 
-#: access/transam/xlog.c:5355
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "ფაილში წინასწარ-ჩაწერადი ჟურნალის ფაილის დასაწყისის დახურვის შეცდომა: %m"
 
-#: access/transam/xlog.c:5580
+#: access/transam/xlog.c:5433
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "WAL-ი გენერირებული იყო \"wal_level=minimal\"-ით. აღდგენა ვერ გაგრძელდება"
 
-#: access/transam/xlog.c:5581
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "ეს ხდება, თუ სერვერზე დროებით \"wal_level=minimal\"-ს დააყენებთ."
 
-#: access/transam/xlog.c:5582
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "გამოიყენეთ მარქაფი, რომელიც \"wal_level\"-ის \"minimal\"-ზე მეტზე დაყენების შემდეგ აიღეთ."
 
-#: access/transam/xlog.c:5647
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "საკონტროლო ფაილი საკონტროლო წერტილის არასწორ მდებარეობას შეიცავს"
 
-#: access/transam/xlog.c:5658
+#: access/transam/xlog.c:5511
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "მონაცემთა ბაზის სისტემის გათიშვის დრო: %s"
 
-#: access/transam/xlog.c:5664
+#: access/transam/xlog.c:5517
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "მონაცემთა ბაზის სისტემის აღდგენისას გათიშვის დრო: %s"
 
-#: access/transam/xlog.c:5670
+#: access/transam/xlog.c:5523
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "მონაცემთა ბაზა შეწყვეტილია; ბოლოს ჩართული იყო: %s"
 
-#: access/transam/xlog.c:5676
+#: access/transam/xlog.c:5529
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "მონაცემთა ბაზის სისტემის აღდგენისას გათიშვის დრო: %s"
 
-#: access/transam/xlog.c:5678
+#: access/transam/xlog.c:5531
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "ეს ალბათ ნიშნავს, რომ ზოგიერთი მონაცემი დაზიანებულია და აღდგენისთვის ბოლო მარქაფის გამოყენება მოგიწევთ."
 
-#: access/transam/xlog.c:5684
+#: access/transam/xlog.c:5537
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "მონაცემთა ბაზის სისტემა გაითიშა აღდგენისას ჟურნალის დროს %s"
 
-#: access/transam/xlog.c:5686
+#: access/transam/xlog.c:5539
 #, 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 "თუ ეს კიდევ ერთხელ მაინც მოხდა, ეს ნიშნავს, რომ მონაცემები დაზიანებულია და უფრო ძველი აღდგენის სამიზნე უნდა აირჩიოთ."
 
-#: access/transam/xlog.c:5692
+#: access/transam/xlog.c:5545
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "მონაცემთა ბაზა შეწყვეტილია; ბოლოს ჩართული იყო: %s"
 
-#: access/transam/xlog.c:5699
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "კონტროლის ფაილი ბაზის კლასტერის არასწორ მდგომარეობას შეიცავს"
 
-#: access/transam/xlog.c:6087
+#: access/transam/xlog.c:5940
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL ონლაინ მარქაფის დასასრულამდე მთავრდება"
 
-#: access/transam/xlog.c:6088
+#: access/transam/xlog.c:5941
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "აღდგენისას ონლაინ მარქაფის აღებისას გენერირებული ყველა WAL-ი ხელმისაწვდომი უნდა იყოს."
 
-#: access/transam/xlog.c:6092
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL აღდგენის შეთანხმებულ წერტილამდე მთავრდება"
 
-#: access/transam/xlog.c:6138
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "დროის ახალი ხაზის არჩეული ID: %u"
 
-#: access/transam/xlog.c:6171
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "არქივიდან აღდგენა დასრულდა"
 
-#: access/transam/xlog.c:6803
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "მიმდინარეობს გამორთვა"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6842
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "გადატვირთვის წერტილი დაიწყო:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6854
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "საკონტროლო წერტილი იწყება:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6919
+#: access/transam/xlog.c:6769
 #, c-format
 msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:6943
+#: access/transam/xlog.c:6793
 #, c-format
 msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:7429
+#: access/transam/xlog.c:7279
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "კონკურენტული წინასწარ-ჩაწერადი ჟურნალის აქტივობა, სანამ მონაცემთა ბაზა მუშაობას ასრულებს"
 
-#: access/transam/xlog.c:8016
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "აღდგენის გადატვირთვის წერტილი: %X/%X"
 
-#: access/transam/xlog.c:8018
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "უკანასკნელად დასრულებული ტრანზაქცია მოხდა ჟურნალის დროით %s."
 
-#: access/transam/xlog.c:8280
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "აღდგენის წერტილი \"%s\" შექმნილია %X/%X -სთან"
 
-#: access/transam/xlog.c:8487
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "ონლაინ მარქაფი გაუქმდა. აღდგენა ვერ გაგრძელდება"
 
-#: access/transam/xlog.c:8545
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "გამორთვის საკონტროლო წერტილში ნაპოვნია დროის ხაზი %u მოულოდნელია (უნდა იყოს %u)"
 
-#: access/transam/xlog.c:8603
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "ჩართვის საკონტროლო წერტილში ნაპოვნია დროის ხაზი %u მოულოდნელია (უნდა იყოს %u)"
 
-#: access/transam/xlog.c:8632
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "აღდგენის ბოლო საკონტროლო წერტილში ნაპოვნია დროის ხაზი %u მოულოდნელია (უნდა იყოს %u)"
 
-#: access/transam/xlog.c:8902
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "გამჭოლად-ჩაწერადი ფაილის (%s) fsync-ის შეცდომა: %m"
 
-#: access/transam/xlog.c:8907
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "ფაილის \"%s\" fdatasync შეუძლებელია: %m"
 
-#: access/transam/xlog.c:8984 access/transam/xlog.c:9320
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "ონლაინ მარქაფისთვის WAL-ის მიმდინარე დონე საკმარისი არაა"
 
-#: access/transam/xlog.c:8985 access/transam/xlog.c:9321 access/transam/xlogfuncs.c:249
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194 access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "სერვისის გაშვებისას \"wal_level\"-ის მნიშვნელობა უნდა იყოს \"replica\" ან \"logical\"."
 
-#: access/transam/xlog.c:8990
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "მარქაფის ჭდე ძალიან გრძელია (max %d ბაიტი)"
 
-#: access/transam/xlog.c:9111
+#: access/transam/xlog.c:8984
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed since last restartpoint"
 msgstr ""
 
-#: access/transam/xlog.c:9113 access/transam/xlog.c:9409
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, 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 primary, and then try an online backup again."
 msgstr "ეს ნიშნავს, რომ უქმეზე აღებული მარქაფი დაზიანებულია და არ უნდა გამოიყენოთ. ჩართეთ ძირითად სერვერზე \"full_page_writes\" და გაუშვით CHECKPOINT და მხოლოდ შემდეგ სცადეთ ონლაინ აღდგენა."
 
-#: access/transam/xlog.c:9193 backup/basebackup.c:1419 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "სიმბოლური ბმის \"%s\" წაკითხვის შეცდომა: %m"
 
-#: access/transam/xlog.c:9200 backup/basebackup.c:1424 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "%s: სიმბმული ძალიან გრძელია"
 
-#: access/transam/xlog.c:9359 backup/basebackup.c:1283
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "უქმე წახალისდა ონლაინ მარქაფის მიმდინარეობის დროს"
 
-#: access/transam/xlog.c:9360 backup/basebackup.c:1284
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "ეს ნიშნავს, რომ მარქაფი, რომლის აღებაც მიმდინარეობს, დაზიანებულია და არ უნდა გამოიყენოთ. სცადეთ, სხვა ონლაინ მარქაფი აიღოთ."
 
-#: access/transam/xlog.c:9407
+#: access/transam/xlog.c:9280
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed during online backup"
 msgstr ""
 
-#: access/transam/xlog.c:9523
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "ძირითადი მარქაფი დასრულდა. ველოდები აუცილებელი WAL-ის სეგმენტების დაარქივებას"
 
-#: access/transam/xlog.c:9537
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "ჯერ კიდევ ველოდები ყველა აუცილებელი WAL სეგმენტის დაარქივებას (გასულია %d წამი)"
 
-#: access/transam/xlog.c:9539
+#: access/transam/xlog.c:9412
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, but the database backup will not be usable without all the WAL segments."
 msgstr ""
 
-#: access/transam/xlog.c:9546
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "ყველა საჭირო WAL სეგმენტი დაარქივებულია"
 
-#: access/transam/xlog.c:9550
+#: access/transam/xlog.c:9423
 #, 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 ""
 
-#: access/transam/xlog.c:9589
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "მარქაფი გაუქმდა, რადგან უკანაბოლომ მუშაობა pg_backup_stop-ის გამოძახებამდე დაასრულა"
@@ -2771,162 +2782,162 @@ msgstr "ჩანაწერის არასწორი წანაცვ
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord მოთხოვნილია %X/%X-ის მიერ"
 
-#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1135
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "ჩანაწერის არასწორი სიგრძე მისამართზე %X/%X: მოველოდი მინიმუმ %u, მივიღე %u"
 
-#: access/transam/xlogreader.c:759
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "მისამართზე %X/%X contrecord ალამი არ არსებობს"
 
-#: access/transam/xlogreader.c:772
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "contrecord -ის არასწორი სიგრძე %u (მოველოდი %lld) მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1143
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "რესურსის მმართველის არასწორი ID %u მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1156 access/transam/xlogreader.c:1172
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "ჩანაწერი არასწორი წინა ბმულით %X/%X მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1210
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "რესურსის მმართველის მონაცემების არასწორი საკონტროლო რიცხვი ჩანაწერში მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1244
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "არასწორი მაგიური რიცხვი %04X ჟურნალის სეგმენტში %s, LSN %X/%X, წანაცვლება %u"
 
-#: access/transam/xlogreader.c:1259 access/transam/xlogreader.c:1301
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "არასწორი საინფორმაციო ბიტები %04X ჟურნალის სეგმენტში %s, LSN %X/%X, წანაცვლება %u"
 
-#: access/transam/xlogreader.c:1275
+#: access/transam/xlogreader.c:1285
 #, c-format
 msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr "WAL ფაილი სხვა მონაცემთა ბაზის სისტემიდანაა: WAL ფაილის ბაზის სისტემის იდენტიფიკატორია %<PRIu64>, pg_control-ის ბაზის სისტემის იდენტიფიკატორია %<PRIu64>"
 
-#: access/transam/xlogreader.c:1283
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL ფაილი სხვა მონაცემთა ბაზის სისტემიდანაა: გვერდის თავსართში მითითებული სეგმენტის ზომა არასწორია"
 
-#: access/transam/xlogreader.c:1289
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL ფაილი სხვა მონაცემთა ბაზის სისტემიდანაა: გვერდის თავსართში მითითებული XLOG_BLKSZ არასწორია"
 
-#: access/transam/xlogreader.c:1321
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "მოულოდნელი pageaddr %X/%X ჟურნალის სეგმენტში %s, LSN %X/%X, წანაცვლება %u"
 
-#: access/transam/xlogreader.c:1347
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "მიმდევრობის-გარე დროის ხაზის ID %u (%u-ის შემდეგ) ჟურნალის სეგმენტში %s, LSN %X/%X, წანაცვლება %u"
 
-#: access/transam/xlogreader.c:1759
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "ურიგო block_id %u მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1783
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA დაყენებულია, მაგრამ მონაცემები მისამართზე %X/%X არ არსებობს"
 
-#: access/transam/xlogreader.c:1790
+#: access/transam/xlogreader.c:1800
 #, 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:1826
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE დაყენებულია, მაგრამ ნახვრეტის წანაცვლება %u სიგრძე %u ბლოკის ასლის სიგრძე %u მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1842
+#: access/transam/xlogreader.c:1852
 #, 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:1856
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED დაყენებულია, მაგრამ ბლოკის ასლის სიგრძეა %u მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1871
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "არც BKPIMAGE_HAS_HOLE და არც BKPIMAGE_COMPRESSED დაყენებული არაა, მაგრამ ბლოკის ასლის სიგრძე %u-ა, მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1887
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL დაყენებულია, მაგრამ წინა მნიშვნელობა მითითებული არაა მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1899
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "არასწორი block_id %u %X/%X"
 
-#: access/transam/xlogreader.c:1966
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "ჩანაწერი არასწორი სიგრძით მისამართზე %X/%X"
 
-#: access/transam/xlogreader.c:1992
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "შეცდომა WAL ჩანაწერში მარქაფი ბლოკის, ID-ით %d, მოძებნისას"
 
-#: access/transam/xlogreader.c:2076
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "შეუძლებელია ასლის აღდგენა მისამართზე %X/%X, როცა მითითებულია არასწორი ბლოკი %d"
 
-#: access/transam/xlogreader.c:2083
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "არასწორად შეკუმშული ასლი მისამართზე %X/%X, ბლოკი %d"
 
-#: access/transam/xlogreader.c:2110 access/transam/xlogreader.c:2127
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "%3$s მეთოდით შეკუმშული ასლი მისამართზე %1$X/%2$X, ბლოკი %4$d მხარდაუჭერელია ამ აგების მიერ"
 
-#: access/transam/xlogreader.c:2136
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "ასლის აღდგენის შეცდომა მისამართზე %X/%X შეკუმშული უცნობი მეთოდით, ბლოკი %d"
 
-#: access/transam/xlogreader.c:2144
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "არასწორად შეკუმშული ასლი მისამართზე %X/%X, ბლოკი %d"
 
-#: access/transam/xlogrecovery.c:623
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "იწყება მარქაფის აღდგენა გამეორების LSN-ით %X/%X საკონტროლო წერტილზე %X/%X დროის ხაზზე ID-ით %u"
 
-#: access/transam/xlogrecovery.c:655
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "ვერ ვიპოვე გამეორების მდებარეობა %X/%X, რომელსაც მიმართავს საკონტროლო წერტილის ჩანაწერი მისამართზე %X/%X"
 
-#: access/transam/xlogrecovery.c:657 access/transam/xlogrecovery.c:668
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
@@ -2934,454 +2945,465 @@ msgid ""
 "Be careful: removing \"%s/backup_label\" will result in a corrupt cluster if restoring from a backup."
 msgstr ""
 
-#: access/transam/xlogrecovery.c:666
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "აუცილებელი საკონტროლო წერტილის მოძებნა შეუძლებელია მისამართზე %X/%X"
 
-#: access/transam/xlogrecovery.c:696 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "სიმბმულის შექმნის შეცდომა %s: %m"
 
-#: access/transam/xlogrecovery.c:729 access/transam/xlogrecovery.c:735
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "ფაილის (\"%s\") იგნორირება იმიტომ, რომ ფაილი \"%s\" არ არსებობს"
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "სახელშეცვლილია '%s' -დან '%s'-ზე."
 
-#: access/transam/xlogrecovery.c:737
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "გადარქმევის შეცდომა %s - %s: %m."
 
-#: access/transam/xlogrecovery.c:776
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "მარქაფის აღდგენის თავიდან გაშვება გამეორების LSN-ით %X/%X"
 
-#: access/transam/xlogrecovery.c:801
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "სწორი საკონტროლო წერტილის ჩანაწერის მოძებნა შეუძლებელია მისამართზე %X/%X"
 
-#: access/transam/xlogrecovery.c:812
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "ვერ ვიპოვე გამეორების მდებარეობა %X/%08X, რომელსაც მიმართავს საკონტროლო წერტილის ჩანაწერი მისამართზე %X/%08X"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "უქმე რეჟიმზე გადართვა"
 
-#: access/transam/xlogrecovery.c:815
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "დროში-მითითებული-წერტილით აღდგენის დასაწყისი XID-მდე %u"
 
-#: access/transam/xlogrecovery.c:819
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "დროში-მითითებული-წერტილით აღდგენის დასაწყისი %s"
 
-#: access/transam/xlogrecovery.c:823
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "დროში-მითითებული-წერტილით აღდგენის დასაწყისი \"%s\""
 
-#: access/transam/xlogrecovery.c:827
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr ""
 
-#: access/transam/xlogrecovery.c:831
+#: access/transam/xlogrecovery.c:842
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "უახლოეს თანმიმდევრულ წერტილამდე დროში-მითითებული-წერტილით აღდგენის დასაწყისი"
 
-#: access/transam/xlogrecovery.c:834
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "არქივიდან აღდგენა დაიწყო"
 
-#: access/transam/xlogrecovery.c:855
+#: access/transam/xlogrecovery.c:866
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "მოთხოვნილი დროის ხაზი %u სერვერის ისტორიის შვილი არაა"
 
 #. translator: %s is a backup_label file or a pg_control file
-#: access/transam/xlogrecovery.c:858
+#: access/transam/xlogrecovery.c:869
 #, c-format
 msgid "Latest checkpoint in file \"%s\" 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 ""
 
-#: access/transam/xlogrecovery.c:873
+#: access/transam/xlogrecovery.c:884
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr ""
 
-#: access/transam/xlogrecovery.c:901
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "შემდეგი ტრანზაქციის არასწორი ID"
 
-#: access/transam/xlogrecovery.c:906
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "არასწორი გამეორება საკონტროლო წერტილის ჩანაწერში"
 
-#: access/transam/xlogrecovery.c:917
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "გამეორების არასწორი ჩანაწერი გამორთვის საკონტროლო წერტილში"
 
-#: access/transam/xlogrecovery.c:946
+#: access/transam/xlogrecovery.c:957
 #, c-format
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "მონაცემთა ბაზა არასწორად გამოირთო; მიმდინარეობს ავტომატური აღდეგენა"
 
-#: access/transam/xlogrecovery.c:950
+#: access/transam/xlogrecovery.c:961
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "ავარიიდან აღდგენა იწყება დროის ხაზზე %u და სამიზნედ დროის ხაზი %u აქვს"
 
-#: access/transam/xlogrecovery.c:993
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label შეიცავს მონაცემებს, რომელიც კონტროლის ფაილს არ შეესაბამება"
 
-#: access/transam/xlogrecovery.c:994
+#: access/transam/xlogrecovery.c:1005
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "ეს ნიშნავს, რომ მარქაფი დაზიანებულია და აღდგენისთვის სხვა მარქაფის გამოყენება მოგიწევთ."
 
-#: access/transam/xlogrecovery.c:1048
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "აღდგენის ბრძანების ფაილი \"%s\" მხარდაუჭერელია"
 
-#: access/transam/xlogrecovery.c:1113
+#: access/transam/xlogrecovery.c:1124
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr "ერთმომხმარებლიან სერვერებს უქმე რეჟიმი არ გააჩნიათ"
 
-#: access/transam/xlogrecovery.c:1130
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "მითითებულია არც\" primary_conninfo\" და არც \"restore_command\""
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr ""
 
-#: access/transam/xlogrecovery.c:1139
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "როცა უქმე რეჟიმი ჩართული არაა, \"restore_command\" პარამეტრის მითითება აუცილებელია"
 
-#: access/transam/xlogrecovery.c:1177
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "აღდგენის სამიზნე დროის ხაზი არ არსებობს: %u"
 
-#: access/transam/xlogrecovery.c:1260 access/transam/xlogrecovery.c:1267 access/transam/xlogrecovery.c:1326 access/transam/xlogrecovery.c:1414 access/transam/xlogrecovery.c:1423 access/transam/xlogrecovery.c:1443
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278 access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425 access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "არასწორი მონაცემები ფაილში \"%s\""
 
-#: access/transam/xlogrecovery.c:1327
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "დროის დამუშავებული ID %u-ა. მოველოდი მნშვნელობას %u."
 
-#: access/transam/xlogrecovery.c:1338
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "ეს ინკრემენტული მარქაფია და არა მონაცემების საქაღალდე"
 
-#: access/transam/xlogrecovery.c:1339
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "სწორი მონაცემების საქაღალდის თავიდან ასაგებად გამოიყენეთ ბრძანება pg_combinebackup."
 
-#: access/transam/xlogrecovery.c:1725
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "აღმოჩენილია მოულოდნელი ჩანაწერის ტიპი გამეორების წერტილზე %X/%X"
 
-#: access/transam/xlogrecovery.c:1748
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "გამეორება დაიწყება მისამართიდან %X/%X"
 
-#: access/transam/xlogrecovery.c:1761
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "მიმდინარეობს გამეორება. გასული დრო: %ld.%02d მიმდინარე LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1851
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "მოთხოვნილი აღდგენის წერტილი მუდმივი აღდგენის წერტილამდეა"
 
-#: access/transam/xlogrecovery.c:1883
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "გამეორება დასრულდა %X/%X -სთან. სისტემის დატვირთვა: %s"
 
-#: access/transam/xlogrecovery.c:1889
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "უკანასკნელად დასრულებული ტრანზაქცია მოხდა ჟურნალის დროით %s"
 
-#: access/transam/xlogrecovery.c:1898
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "გამეორება საჭირო არაა"
 
-#: access/transam/xlogrecovery.c:1910
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "აღდგენა მითითებული აღდგენის სამიზნის მიღწევამდე დასრულდა"
 
-#: access/transam/xlogrecovery.c:2104
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr ""
 
-#: access/transam/xlogrecovery.c:2171
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "%2$s-ში ნაპოვნია მოულოდნელი საქაღალდის ჩანაწერი \"%1$s\""
 
-#: access/transam/xlogrecovery.c:2173
+#: access/transam/xlogrecovery.c:2184
 #, c-format
 msgid "All directory entries in %s/ should be symbolic links."
 msgstr "ყველა საქაღალდის ტიპის ელემენტი \"%s/-ში სიმბმულს უნდა წარმოადგენდეს."
 
-#: access/transam/xlogrecovery.c:2175
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr ""
 
-#: access/transam/xlogrecovery.c:2227
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr ""
 
-#: access/transam/xlogrecovery.c:2258
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "თანმიმდევრული აღდგენის მდგომარეობა მიღწეულია მისამართზე %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2296
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "WAL გამეორება %X/%X %s-სთვის"
 
-#: access/transam/xlogrecovery.c:2394
+#: access/transam/xlogrecovery.c:2405
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "მოულოდნელი წინა დროის ხაზის ID %u (მიმდინარე დროის ხაზის ID %u) საკონტროლო წერტილის ჩანაწერში"
 
-#: access/transam/xlogrecovery.c:2403
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "მოულოდნელი დროის ხაზის ID %u (%u-ის შემდეგ) საკონტროლო წერტილის ჩანაწერში"
 
-#: access/transam/xlogrecovery.c:2419
+#: access/transam/xlogrecovery.c:2430
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr ""
 
-#: access/transam/xlogrecovery.c:2603 access/transam/xlogrecovery.c:2879
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "აღდგენა შეთანხმებული მდგომარეობის მიღწევისას დასრულდება"
 
-#: access/transam/xlogrecovery.c:2624
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "აღდგენა შეწყდა WAL-ის მდებარეობამდე (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2714
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "აღდგენა შეწყდა ტრანზაქციის (%u) გადაცემამდე. დრო %s"
 
-#: access/transam/xlogrecovery.c:2721
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "აღდგენა შეწყდა ტრანზაქციის (%u) გაუქმებამდე. დრო %s"
 
-#: access/transam/xlogrecovery.c:2774
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "აღდგენა შეწყდა აღდგენის წერტილთან \"%s\". დრო %s"
 
-#: access/transam/xlogrecovery.c:2792
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "აღდგენა შეწყდა WAL-ის მდებარეობამდე (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2859
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "აღდგენა შეწყდა ტრანზაქციის (%u) გადაცემამდე. დრო %s"
 
-#: access/transam/xlogrecovery.c:2867
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "აღდგენა ტრანზაქციის (%u) გაუქმების შემდეგ შეწყდა. დრო %s"
 
-#: access/transam/xlogrecovery.c:2948
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "შეჩერება აღდგენის ბოლოს"
 
-#: access/transam/xlogrecovery.c:2949
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "წასახალისებლად გაუშვით pg_wal_replay_resume()."
 
-#: access/transam/xlogrecovery.c:2952 access/transam/xlogrecovery.c:4698
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "აღდგენა შეჩერდა"
 
-#: access/transam/xlogrecovery.c:2953
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "გასაგრძელებლად გაუშვით pg_wal_replay_resume()."
 
-#: access/transam/xlogrecovery.c:3216
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "მოულოდნელი დროის ხაზის ID %u WAL სეგმენტში %s, LSN %X/%X, წანაცვლება %u"
 
-#: access/transam/xlogrecovery.c:3432
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "ჟურნალის სეგმენტიდან (%s, LSN %X/%X, წანაცვლება %u) წაკითხვის შეცდომა: %m"
 
-#: access/transam/xlogrecovery.c:3439
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "ჟურნალის სეგმენტიდან (%s, LSN %X/%X, წანაცვლება %u) წაკითხვის შეცდომა: წავიკითხე %d %zu-დან"
 
-#: access/transam/xlogrecovery.c:4082
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "საკონტროლო წერტილის არასწორი მდებარეობა"
 
-#: access/transam/xlogrecovery.c:4092
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "საკონტროლო წერტილის არასწორი ჩანაწერი"
 
-#: access/transam/xlogrecovery.c:4098
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "რესურსის მმართველის არასწორი ID საკონტროლო წერტილის ჩანაწერში"
 
-#: access/transam/xlogrecovery.c:4106
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "საკონტროლო წერტილის არასწორი xl_info"
 
-#: access/transam/xlogrecovery.c:4112
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "საკონტროლო წერტილის ჩანაწერის არასწორი სიგრძე"
 
-#: access/transam/xlogrecovery.c:4166
+#: access/transam/xlogrecovery.c:4188
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "ახალი დროის ხაზი %u ბაზის სისტემის დროის ხაზის %u შვილი არაა"
 
-#: access/transam/xlogrecovery.c:4180
+#: access/transam/xlogrecovery.c:4202
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr ""
 
-#: access/transam/xlogrecovery.c:4199
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "ახალი სამიზნის დროის ხაზია %u"
 
-#: access/transam/xlogrecovery.c:4400
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "მოთხოვნილია WAL-ის მიმღები პროცესის გამორთვა"
 
-#: access/transam/xlogrecovery.c:4460
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "მიღებულა დაწინაურების მოთხოვნა"
 
-#: access/transam/xlogrecovery.c:4689
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "ცხელი მომლოდინე სერვერის არსებობა შეუძლებელია არასაკმარისი პარამეტრის მნიშვნელობების გამო"
 
-#: access/transam/xlogrecovery.c:4690 access/transam/xlogrecovery.c:4717 access/transam/xlogrecovery.c:4747
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739 access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d ნაკლებია, ვიდრე ძირითად სერვერზე, სადაც მისი მნიშვნელობაა %d."
 
-#: access/transam/xlogrecovery.c:4699
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "თუ აღდგენა გაგრძელდება, სერვერი გამოირთვება."
 
-#: access/transam/xlogrecovery.c:4700
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "კონფიგურაციაში საჭირო ცვლილებების შეტანის შემდეგ შეგიძლიათ სერვერი დაარესტარტოთ."
 
-#: access/transam/xlogrecovery.c:4711
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "დაწინაურება შეუძლებელია არასაკმარისი პარამეტრების მნიშვნელობების გამო"
 
-#: access/transam/xlogrecovery.c:4721
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "კონფიგურაციაში საჭირო ცვლილებების შეტანის შემდეგ გადატვირთეთ სერვერი."
 
-#: access/transam/xlogrecovery.c:4745
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "აღდგენა შეწყვეტილია არასაკმარისი პარამეტრების მნიშვნელობების გამო"
 
-#: access/transam/xlogrecovery.c:4751
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "კონფიგურაციაში საჭირო ცვლილებების შეტანის შემდეგ შეგიძლიათ სერვერი დაარესტარტოთ."
 
-#: access/transam/xlogrecovery.c:4792
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795 catalog/dependency.c:1153 catalog/dependency.c:1160 catalog/dependency.c:1171 commands/tablecmds.c:1519 commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302 commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211 executor/execExprInterp.c:5219 libpq/auth.c:320 replication/logical/applyparallelworker.c:1048 replication/slot.c:1705 replication/slot.c:2783
+#: replication/slot.c:2785 replication/syncrep.c:1079 storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137 storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207 utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868 utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "მითითებულია აღდგენის მრავალი სამიზნე"
 
-#: access/transam/xlogrecovery.c:4793
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "პარამეტრებიდან \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\" და \"recovery_target_xid\" მხოლოდ ერთის დაყენება შეგიძლიათ."
 
-#: access/transam/xlogrecovery.c:4804
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "დაშვებულია მხოლოდ ერთი მნიშვნელობა: \"immediate\"."
 
-#: access/transam/xlogrecovery.c:4958
+#: access/transam/xlogrecovery.c:4991
 #, c-format
 msgid "Timestamp out of range: \"%s\"."
 msgstr "დროის შტამპი დიაპაზონს გარეთაა: \"%s\"."
 
-#: access/transam/xlogrecovery.c:5003
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "\"recovery_target_timeline\" სწორი რიცხვი არაა."
@@ -3411,7 +3433,7 @@ msgstr "არქივირების წარუმატებლად 
 msgid "archive command was terminated by exception 0x%X"
 msgstr "არქივაციის ბრძანება დასრულდა გამონაკლისით 0x%X"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:2843
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "თექვსმეტობითი მნიშვნელობის აღწერისთვის იხილეთ C-ის ჩასასმელი ფაილი \"ntstatus.h\"."
@@ -3645,12 +3667,12 @@ msgstr ""
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr ""
 
-#: backup/basebackup_incremental.c:934
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "მარქაფის მანიფესტის ვერსიას 1 ინკრემენტული მარქაფების მხარდაჭერა არ გააჩნია"
 
-#: backup/basebackup_incremental.c:952
+#: backup/basebackup_incremental.c:966
 #, c-format
 msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
 msgstr "სისტემის იდენტიფიკატორი სარეზერვო მანიფესტში არის %<PRIu64>, მაგრამ მონაცემთა ბაზის სისტემის იდენტიფიკატორია %<PRIu64>"
@@ -3675,7 +3697,7 @@ msgstr "სერვერზე შენახული მარქაფი
 msgid "relative path not allowed for backup stored on server"
 msgstr "სერვერზე დამახსოვრებული მარქაფისთვის ფარდობითი ბილიკი დაშვებული არაა"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:478 commands/tablespace.c:157 commands/tablespace.c:173 commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2179 storage/file/copydir.c:58
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478 commands/tablespace.c:157 commands/tablespace.c:173 commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287 storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "საქაღალდის (%s) შექმნის შეცდომა: %m"
@@ -3685,12 +3707,12 @@ msgstr "საქაღალდის (%s) შექმნის შეცდ
 msgid "directory \"%s\" exists but is not empty"
 msgstr "საქაღალდე \"%s\" არსებობს, მაგრამ ცარიელი არაა"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1171
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "საქაღალდის (%s) წვდომის შეცდომა: %m"
 
-#: backup/basebackup_server.c:175 backup/basebackup_server.c:182 backup/basebackup_server.c:268 backup/basebackup_server.c:275 backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526 storage/smgr/md.c:608 storage/smgr/md.c:630 storage/smgr/md.c:1123
+#: backup/basebackup_server.c:175 backup/basebackup_server.c:182 backup/basebackup_server.c:268 backup/basebackup_server.c:275 backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526 storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "შეამოწმეთ, დისკზე ადგილი დარჩა, თუ არა."
@@ -3730,17 +3752,17 @@ msgstr "long-distance რეჟიმი ვერ ჩავრთე: %s"
 msgid "invalid timeline %<PRId64>"
 msgstr "არასწორი დროის ხაზი %<PRId64>"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3863
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
 #, c-format
 msgid "--%s must be first argument"
 msgstr "--%s პირველი არგუმენტი უნდა იყოს"
 
-#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3877
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s მნიშვნელობა სჭირდება"
 
-#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3882
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s მნიშვნელობა სჭირდება"
@@ -3805,12 +3827,12 @@ msgstr "\"%s\"-ზე ყველა პრივილეგიის გა
 msgid "grantor must be current user"
 msgstr "მიმნიჭებელი მიმდინარე მომხმარებელი უნდა იყოს"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:982
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "ურთიერთობის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:986
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "მიმდევრობის პრივილეგიის არასწორი ტიპი: %s"
@@ -3825,7 +3847,7 @@ msgstr "ბაზის პრივილეგიის არასწორ
 msgid "invalid privilege type %s for domain"
 msgstr "დომენის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:990
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "ფუნქციის პრივილეგიის არასწორი ტიპი: %s"
@@ -3835,22 +3857,22 @@ msgstr "ფუნქციის პრივილეგიის არას
 msgid "invalid privilege type %s for language"
 msgstr "ენის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:504 catalog/aclchk.c:1010
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "დიდი ობიექტის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1006
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "სქემის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:994
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "პროცედურის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:998
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "ქვეპროგრამის პრივილეგიის არასწორი ტიპი: %s"
@@ -3860,7 +3882,7 @@ msgstr "ქვეპროგრამის პრივილეგიის 
 msgid "invalid privilege type %s for tablespace"
 msgstr "ცხრილის სივრცის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1002
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "ტიპის პრივილეგიის არასწორი ტიპი: %s"
@@ -3885,508 +3907,503 @@ msgstr "პარამეტრის პრივილეგიის არ
 msgid "column privileges are only valid for relations"
 msgstr "სვეტის პრივილეგიები მხოლოდ ურთიერთობებისთვის მოქმედებს"
 
-#: catalog/aclchk.c:1043
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "სვეტებისთვის ნაგულისხმევი პრივილეგიების დაყენება შეუძლებელია"
 
-#: catalog/aclchk.c:1079
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "ნაგულისხმევი პრივილეგიების შეცვლის წვდომა აკრძალულია"
 
-#: catalog/aclchk.c:1197
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "'IN SCHEMA' პირობის გამოყენება GRANT/REVOKE ON SCHEMAS-ის გამოყენებისას შეუძლებელია"
-
-#: catalog/aclchk.c:1207
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
 #, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
-msgstr "'IN SCHEMA' პირობის გამოყენება GRANT/REVOKE ON LARGE OBJECT-ის გამოყენებისას შეუძლებელია"
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "'IN SCHEMA' პირობის გამოყენება %s-ის გამოყენებისას შეუძლებელია"
 
-#: catalog/aclchk.c:1561 catalog/catalog.c:686 catalog/heap.c:2611 catalog/heap.c:2930 catalog/objectaddress.c:1528 catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1000 commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929 commands/tablecmds.c:8130 commands/tablecmds.c:8259 commands/tablecmds.c:8388 commands/tablecmds.c:8482 commands/tablecmds.c:8585 commands/tablecmds.c:8751 commands/tablecmds.c:8781
-#: commands/tablecmds.c:8936 commands/tablecmds.c:9039 commands/tablecmds.c:9173 commands/tablecmds.c:9286 commands/tablecmds.c:14356 commands/tablecmds.c:14556 commands/tablecmds.c:14717 commands/tablecmds.c:15922 commands/tablecmds.c:18689 commands/trigger.c:947 parser/analyze.c:2660 parser/parse_relation.c:749 parser/parse_target.c:1070 parser/parse_type.c:144 parser/parse_utilcmd.c:3641 parser/parse_utilcmd.c:3681 parser/parse_utilcmd.c:3723
-#: statistics/attribute_stats.c:209 statistics/attribute_stats.c:948 utils/adt/acl.c:2921 utils/adt/ruleutils.c:2858
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621 catalog/heap.c:2941 catalog/objectaddress.c:1528 catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039 commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929 commands/tablecmds.c:8130 commands/tablecmds.c:8259 commands/tablecmds.c:8413 commands/tablecmds.c:8507 commands/tablecmds.c:8610 commands/tablecmds.c:8776 commands/tablecmds.c:8806
+#: commands/tablecmds.c:8961 commands/tablecmds.c:9064 commands/tablecmds.c:9198 commands/tablecmds.c:9311 commands/tablecmds.c:14397 commands/tablecmds.c:14600 commands/tablecmds.c:14761 commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948 parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070 parser/parse_type.c:144 parser/parse_utilcmd.c:3662 parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955 utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "სვეტი \"%s\" ურთიერთობაში %s არ არსებობს"
 
-#: catalog/aclchk.c:1806
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" ინდექსია"
 
-#: catalog/aclchk.c:1813 commands/tablecmds.c:16079 commands/tablecmds.c:19608
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" კომპოზიტური ტიპია"
 
-#: catalog/aclchk.c:1821 catalog/objectaddress.c:1368 commands/tablecmds.c:266 commands/tablecmds.c:19572 utils/adt/acl.c:2105 utils/adt/acl.c:2135 utils/adt/acl.c:2168 utils/adt/acl.c:2204 utils/adt/acl.c:2235 utils/adt/acl.c:2266
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266 commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152 utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252 utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\" მიმდევრობა არაა"
 
-#: catalog/aclchk.c:1859
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "მიმდევრობა \"%s\"-ს მხოლოდ USAGE, SELECT და UPDATE პრივილეგიების მხარდაჭერა გააჩნიათ"
 
-#: catalog/aclchk.c:1876
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "ცხრილის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:2041
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "სვეტის პრივილეგიის არასწორი ტიპი: %s"
 
-#: catalog/aclchk.c:2054
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "მიმდევრობა \"%s\"-ს მხოლოდ SELECT სვეტის პრივილეგიების მხარდაჭერა გააჩნია"
 
-#: catalog/aclchk.c:2245
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "ენა \"%s\" სანდო არაა"
 
-#: catalog/aclchk.c:2247
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "GRANT და REVOKE არასანდო ენებზე დაშვებული არაა, რადგან არასანდო ენების გამოყენება მხოლოდ ზემომხმარებლებს შეუძლიათ."
 
-#: catalog/aclchk.c:2398
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "მასივის ტიპების პრივილეგიის დაყენება შეუძლებელია"
 
-#: catalog/aclchk.c:2399
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "ნაცვლად დააყენეთ ელემენტის ტიპის პრივილეგიები."
 
-#: catalog/aclchk.c:2403
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "მრავალშუალედიანი ტიპების პრივილეგიების დაყენება შეუძლებელია"
 
-#: catalog/aclchk.c:2404
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "სანაცვლოდ შუალედის ტიპის პრივილეგიების დაყენება."
 
-#: catalog/aclchk.c:2587
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "პრივილეგიის უცნობი ტიპი \"%s\""
 
-#: catalog/aclchk.c:2654
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "წვდომა აკრძალულია აგრეგატზე: \"%s\""
 
-#: catalog/aclchk.c:2657
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "წვდომა აკრძალულია კოლაციაზე: \"%s\""
 
-#: catalog/aclchk.c:2660
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "წვდომა აკრძალულია სვეტზე: \"%s\""
 
-#: catalog/aclchk.c:2663
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "წვდომა აკრძალულია გადაყვანაზე: \"%s\""
 
-#: catalog/aclchk.c:2666
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "წვდომა აკრძალულია აგრეგატზე: \"%s\""
 
-#: catalog/aclchk.c:2669
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "წვდომა აკრძალულია დომენზე: \"%s\""
 
-#: catalog/aclchk.c:2672
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "წვდომა აკრძალულია მოვლენის ტრიგერზე: \"%s\""
 
-#: catalog/aclchk.c:2675
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "წვდომა აკრძალულია გაფართოებაზე: \"%s\""
 
-#: catalog/aclchk.c:2678
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "წვდომა აკრძალულია გარე მონაცემების გადამტანზე: \"%s\""
 
-#: catalog/aclchk.c:2681
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "წვდომა აკრძალულია გარე სერვერზე: \"%s\""
 
-#: catalog/aclchk.c:2684
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "წვდომა აკრძალულია გარე ცხრილზე: \"%s\""
 
-#: catalog/aclchk.c:2687
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "წვდომა აკრძალულია ფუნქციაზე: \"%s\""
 
-#: catalog/aclchk.c:2690
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "წვდომა აკრძალულია ინდექზე: \"%s\""
 
-#: catalog/aclchk.c:2693
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "წვდომა აკრძალულია ენაზე: \"%s\""
 
-#: catalog/aclchk.c:2696
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "წვდომა აკრძალულია დიდ ობიექტზე: \"%s\""
 
-#: catalog/aclchk.c:2699
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "წვდომა აკრძალულია მატერიალიზებულ ხედზე: \"%s\""
 
-#: catalog/aclchk.c:2702
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "წვდომა აკრძალულია ოპერატორის კლასზე: \"%s\""
 
-#: catalog/aclchk.c:2705
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "წვდომა აკრძალულია ოპერატორზე: \"%s\""
 
-#: catalog/aclchk.c:2708
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "წვდომა აკრძალულია ოპერატორის ოჯახზე: \"%s\""
 
-#: catalog/aclchk.c:2711
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "წვდომა აკრძალულია პარამეტრზე: \"%s\""
 
-#: catalog/aclchk.c:2714
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "წვდომა აკრძალულია წესზე: \"%s\""
 
-#: catalog/aclchk.c:2717
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "წვდომა აკრძალულია პროცედურაზე: \"%s\""
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "წვდომა აკრძალულია პუბლიკაციაზე: \"%s\""
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "წვდომა აკრძალულია ქვეპროგრამაზე: \"%s\""
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "წვდომა აკრძალულია სქემაზე: \"%s\""
 
-#: catalog/aclchk.c:2729 commands/sequence.c:654 commands/sequence.c:880 commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880 commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "წვდომა აკრძალულია მიმდევრობაზე: \"%s\""
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "წვდომა აკრძალულია სტატისტიკის ობიექტზე: \"%s\""
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "წვდომა აკრძალულია გამოწერაზე: \"%s\""
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "წვდომა აკრძალულია ცხრილზე: \"%s\""
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "წვდომა აკრძალულია ცხრილების სივრცეზე: \"%s\""
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "წვდომა აკრძალულია ტექსტის ძებნის კონფიგურაციაზე: \"%s\""
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "წვდომა აკრძალულია ტექსტის ძებნის ლექსიკონზე: \"%s\""
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "წვდომა აკრძალულია ტიპტზე: \"%s\""
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "წვდომა აკრძალულია ხედზე: \"%s\""
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "უნდა ბრძანდებოდეთ აგრეგატის მფლობელი: %s"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "უნდა ბრძანდებოდეთ კოლაციის მფლობელი: %s"
 
-#: catalog/aclchk.c:2795
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "უნდა ბრძანდებოდეთ გადაყვანის მფლობელი: %s"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "უნდა ბრძანდებოდეთ ბაზის მფლობელი: %s"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "უნდა ბრძანდებოდეთ დომენის მფლობელი: %s"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "უნდა ბრძანდებოდეთ მოვლენის ტრიგერის მფლობელი: %s"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "უნდა ბრძანდებოდეთ გაფართოების მფლობელი: %s"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "უნდა ბრძანდებოდეთ გარე ინფორმაციის გადამტანის მფლობელი: %s"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "უნდა ბრძანდებოდეთ გარე სერვერის მფლობელი: %s"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "უნდა ბრძანდებოდეთ გარე ცხრილის მფლობელი: %s"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "უნდა ბრძანდებოდეთ ფუნქციის მფლობელი: %s"
 
-#: catalog/aclchk.c:2822
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "უნდა ბრძანდებოდეთ ინდექსის მფლობელი: %s"
 
-#: catalog/aclchk.c:2825
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "უნდა ბრძანდებოდეთ ენის მფლობელი: %s"
 
-#: catalog/aclchk.c:2828
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "უნდა ბრძანდებოდეთ დიდი ობიექტის მფლობელი: %s"
 
-#: catalog/aclchk.c:2831
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "უნდა ბრძანდებოდეთ მატერიალიზებული ხედის მფლობელი: %s"
 
-#: catalog/aclchk.c:2834
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "უნდა ბრძანდებოდეთ ოპერატორის კლასის მფლობელი: %s"
 
-#: catalog/aclchk.c:2837
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "უნდა ბრძანდებოდეთ ოპერატორის მფლობელი: %s"
 
-#: catalog/aclchk.c:2840
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "უნდა ბრძანდებოდეთ ოპერატორის ოჯახის მფლობელი: %s"
 
-#: catalog/aclchk.c:2843
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "უნდა ბრძანდებოდეთ პროცედურის მფლობელი: %s"
 
-#: catalog/aclchk.c:2846
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "უნდა ბრძანდებოდეთ პუბლიკაციისმფლობელი: %s"
 
-#: catalog/aclchk.c:2849
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "უნდა ბრძანდებოდეთ ქვეპროგრამის მფლობელი: %s"
 
-#: catalog/aclchk.c:2852
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "უნდა ბრძანდებოდეთ მიმდევრობის მფლობელი: %s"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "უნდა ბრძანდებოდეთ გამოწერის მფლობელი: %s"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "უნდა ბრძანდებოდეთ ცხრილის მფლობელი: %s"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "უნდა ბრძანდებოდეთ ტიპის მფლობელი: %s"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "უნდა ბრძანდებოდეთ ხედის მფლობელი: %s"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "უნდა ბრძანდებოდეთ სქემის მფლობელი: %s"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "უნდა ბრძანდებოდეთ სტატისტიკის ობიექტის მფლობელი: %s"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "უნდა ბრძანდებოდეთ ცხრილების სივრცის მფლობელი: %s"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "უნდა ბრძანდებოდეთ ტექსტის ძებნის კონფიგურაციის მფლობელი: %s"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "უნდა ბრძანდებოდეთ ტექსტის ძებნის ლექსიკონის მფლობელი: %s"
 
-#: catalog/aclchk.c:2893
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "უნდა ბრძანდებოდეთ ურთიერთობის მფლობელი: %s"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "რელაციის (%2$s) სვეტზე (%1$s) წვდომა აკრძალულია"
 
-#: catalog/aclchk.c:3173 catalog/aclchk.c:3192
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "ურთერთობის (OID-ით %2$u) ატრიბუტი არ არსებობს: %1$d"
 
-#: catalog/aclchk.c:3230 catalog/aclchk.c:3293 catalog/aclchk.c:3932
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "ურთიერთობა OID-ით %u არ არსებობს"
 
-#: catalog/aclchk.c:3478
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "პარამეტრის ACL OID-ით %u არ არსებობს"
 
-#: catalog/aclchk.c:3557 catalog/objectaddress.c:1055 catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323 storage/large_object/inv_api.c:247
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055 catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323 storage/large_object/inv_api.c:247
 #, c-format
 msgid "large object %u does not exist"
 msgstr "დიდი ობიექტი %u არ არსებობს"
 
-#: catalog/aclchk.c:3651 commands/collationcmds.c:849 commands/publicationcmds.c:1846
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849 commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "სქემა OID-ით %u არ არსებობს"
 
-#: catalog/aclchk.c:3725 catalog/aclchk.c:3752 catalog/aclchk.c:3781 utils/cache/typcache.c:473 utils/cache/typcache.c:528
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797 utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "ტიპი OID-ით %u არ არსებობს"
 
-#: catalog/catalog.c:506
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "ურთიერთობაში \"%s\" გამოუყენებელი OID-ების ძებნა ჯერ კიდევ მიმდინარეობს"
 
-#: catalog/catalog.c:508
+#: catalog/catalog.c:506
 #, c-format
 msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
 msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
 msgstr[0] "OID-ის კანდიდატები %<PRIu64>-ჯერ შემოწმდა, მაგრამ გამოუყენებელი OID-ი ნაპოვნი არაა."
 msgstr[1] "OID-ის კანდიდატები %<PRIu64>-ჯერ შემოწმდა, მაგრამ გამოუყენებელი OID-ი ნაპოვნი არაა."
 
-#: catalog/catalog.c:533
+#: catalog/catalog.c:531
 #, c-format
 msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
 msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
 msgstr[0] "ახალი OID მინიჭებულია ურთიერთობაში \"%s\" %<PRIu64> ცდის შემდეგ"
 msgstr[1] "ახალი OID მინიჭებულია ურთიერთობაში \"%s\" %<PRIu64> ცდის შემდეგ"
 
-#: catalog/catalog.c:664 catalog/catalog.c:731
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "%s()-ის გამოსაძახებლად ზემომხმარებელი უნდა იყოთ"
 
-#: catalog/catalog.c:673
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() მხოლოდ სისტემურ კატალოგებზე შეიძლება იყოს გამოყენებული"
 
-#: catalog/catalog.c:678 parser/parse_utilcmd.c:2426
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "ინდექსი %s ცხრილს \"%s\" არ მიეკუთვნება"
 
-#: catalog/catalog.c:695
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "სვეტი \"%s\" oild-ის ტიპი არაა"
 
-#: catalog/catalog.c:702
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "ინდექსი \"%s\" სვეტის \"%s\" ინდექსი არაა"
@@ -4436,12 +4453,6 @@ msgstr[1] ""
 msgid "cannot drop %s because other objects depend on it"
 msgstr "%s-ის წაშლა შეუძლებელია, რადგან არის ობიექტები, რომლებიც მას ეყრდნობა"
 
-#: catalog/dependency.c:1153 catalog/dependency.c:1160 catalog/dependency.c:1171 commands/tablecmds.c:1519 commands/tablecmds.c:16673 commands/tablespace.c:460 commands/user.c:1302 commands/vacuum.c:224 commands/view.c:441 executor/execExprInterp.c:5211 executor/execExprInterp.c:5219 libpq/auth.c:312 replication/logical/applyparallelworker.c:1041 replication/slot.c:1594 replication/syncrep.c:1079 storage/aio/method_io_uring.c:191 storage/lmgr/deadlock.c:1137
-#: storage/lmgr/proc.c:1526 utils/misc/guc.c:3166 utils/misc/guc.c:3207 utils/misc/guc.c:3282 utils/misc/guc.c:6823 utils/misc/guc.c:6857 utils/misc/guc.c:6891 utils/misc/guc.c:6934 utils/misc/guc.c:6976
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4469,7 +4480,7 @@ msgstr "%s ტიპის კონსტანტის აქ გამოყ
 msgid "transition table \"%s\" cannot be referenced in a persistent object"
 msgstr "გარდასვლის ცხრილზე \"%s\" მიმართვა შეუძლებელია მუდმივი ობიექტიდან"
 
-#: catalog/dependency.c:2390 parser/parse_relation.c:3513 parser/parse_relation.c:3523 statistics/attribute_stats.c:221
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513 parser/parse_relation.c:3523 statistics/attribute_stats.c:224 statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "სვეტი \"%d\" ურთიერთობაში %s არ არსებობს"
@@ -4520,183 +4531,208 @@ msgstr "ვირტუალურ გენერირებულ სვე
 msgid "composite type %s cannot be made a member of itself"
 msgstr "კომპოზიტური ტიპი %s საკუთარი თავის წევრი არ შეიძლება გახდეს"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "ვირტუალურ გენერირებულ სვეტს \"%s\" მომხმარებლის აღწერილი ტიპი ვერ ექნება"
+
+#: catalog/heap.c:674 catalog/heap.c:3295
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "ვირტუალურ გენერირებულ სვეტებზე მომხმარებლის აღწერილი ინდექსების შექმნა, ჯერ, მხარდაჭერილი არაა."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:677
+#: catalog/heap.c:686
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr ""
 
-#: catalog/heap.c:683 commands/createas.c:200 commands/createas.c:513
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
 
-#: catalog/heap.c:1169 catalog/index.c:901 commands/createas.c:409 commands/tablecmds.c:4296
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408 commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "ურთიერთობა \"%s\" უკვე არსებობს"
 
-#: catalog/heap.c:1185 catalog/pg_type.c:434 catalog/pg_type.c:805 catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265 commands/typecmds.c:758 commands/typecmds.c:1205 commands/typecmds.c:1431 commands/typecmds.c:1611 commands/typecmds.c:2586
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805 catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265 commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439 commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "ტიპი \"%s\" უკვე არსებობს"
 
-#: catalog/heap.c:1186
+#: catalog/heap.c:1196
 #, 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 "ურთიერთობას იგივე სახელის მქონე ტიპი აქვს ასოცირებული, ასე რომ თქვენ უნდა გამოიყენოთ სახელი, რომელიც არც ერთ არსებულ ტიპთან კონფლიქტში არ შედის."
 
-#: catalog/heap.c:1226
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "toast relfilenumber-ის მნიშვნელობა ბინარული განახლების დროს დაყენებული არაა"
 
-#: catalog/heap.c:1237
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "ბინარული განახლების რეჟიმში pg_class-ის დროებითი მეხსიერების OID-ის მნიშვნელობა დაყენებული არაა"
 
-#: catalog/heap.c:1247
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "relfilenumber-ის მნიშვნელობა ბინარული განახლების დროს დაყენებული არაა"
 
-#: catalog/heap.c:2192
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "დაყოფილი ცხრილს (\"%s\") NO INHERIT შეზღუდვას ვერ დაამატებთ"
 
-#: catalog/heap.c:2515
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "შეზღუდვის შემმოწმებელი \"%s\" უკვე არსებობს"
 
-#: catalog/heap.c:2616 catalog/heap.c:2936
+#: catalog/heap.c:2626 catalog/heap.c:2947
 #, c-format
 msgid "cannot add not-null constraint on system column \"%s\""
 msgstr "არანულოვანი შეზღუდვის დამატება შეუძლებელია სისტემურ სვეტზე \"%s\""
 
-#: catalog/heap.c:2643 catalog/heap.c:2769 catalog/heap.c:3020 catalog/index.c:915 catalog/pg_constraint.c:1003 commands/tablecmds.c:9796
+#: catalog/heap.c:2654 catalog/heap.c:2780 catalog/heap.c:3031 catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9821
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "შეზღუდვა \"%s\" ურთიერთობისთვის \"%s\" უკვე არსებობს"
 
-#: catalog/heap.c:2776
+#: catalog/heap.c:2787
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია არა-მემკვიდრეობით მიღებულ შეზღუდვასთან ურთიერთობაზე \"%s\""
 
-#: catalog/heap.c:2787
+#: catalog/heap.c:2798
 #, c-format
 msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია მემკვიდრეობით მიღებულ შეზღუდვასთან ურთიერთობაზე \"%s\""
 
-#: catalog/heap.c:2797
+#: catalog/heap.c:2808
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია შეზღუდვასთან NOT VALID ურთიერთობაზე \"%s\""
 
-#: catalog/heap.c:2809
+#: catalog/heap.c:2820
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია შეზღუდვასთან NOT ENFORCED ურთიერთობაზე \"%s\""
 
-#: catalog/heap.c:2814
+#: catalog/heap.c:2825
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "შეზღუდვის (\"%s\") შერწყმა მემკვიდრეობითი აღწერით"
 
-#: catalog/heap.c:2838 catalog/pg_constraint.c:781 catalog/pg_constraint.c:1132 commands/tablecmds.c:3179 commands/tablecmds.c:3499 commands/tablecmds.c:7286 commands/tablecmds.c:7967 commands/tablecmds.c:17516 commands/tablecmds.c:17698
+#: catalog/heap.c:2849 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154 commands/tablecmds.c:3179 commands/tablecmds.c:3499 commands/tablecmds.c:7286 commands/tablecmds.c:7967 commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "მეტისმეტად ბევრი მემკვიდრეობის მშობლები"
 
-#: catalog/heap.c:2955 parser/parse_utilcmd.c:2634
+#: catalog/heap.c:2966 parser/parse_utilcmd.c:2655
 #, c-format
 msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
 msgstr ""
 
-#: catalog/heap.c:2969
+#: catalog/heap.c:2980
 #, c-format
 msgid "conflicting not-null constraint names \"%s\" and \"%s\""
 msgstr "ურთიერთგამომრიცხავი არანულოვანი შეზღუდვის სახელები \"%s\" და \"%s\""
 
-#: catalog/heap.c:2999
+#: catalog/heap.c:3010
 #, c-format
-msgid "cannot define not-null constraint on column \"%s\" with NO INHERIT"
-msgstr "არანულოვანი შეზღუდვების აღწერა სვეტზე \"%s\" შეუძლებელია NO INHERIT-თან ერთად"
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "არანულოვანი შეზღუდვების აღწერა NO INHERIT-თან ერთად სვეტზე \"%s\" შეუძლებელია"
 
-#: catalog/heap.c:3001
+#: catalog/heap.c:3012
 #, c-format
 msgid "The column has an inherited not-null constraint."
 msgstr "სვეტს მემკვიდრეობით მიღებული არანულოვანი შეზღუდვა გააჩნია."
 
-#: catalog/heap.c:3191
+#: catalog/heap.c:3202
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "სვეტის გენერაციის გამოსახულებაში გენერირებული სვეტის (%s) გამოყენება შეუძლებელია"
 
-#: catalog/heap.c:3193
+#: catalog/heap.c:3204
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "გენერირებული სვეტი სხვა გენერირებული სვეტის მიმართვა ვერ იქნება."
 
-#: catalog/heap.c:3199
+#: catalog/heap.c:3210
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr ""
 
-#: catalog/heap.c:3200
+#: catalog/heap.c:3211
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "ამან შეიძლება დაგენერირებული სვეტის თავის საკუთარ მნიშვნელობაზე დამოკიდებულება გამოიწვიოს."
 
-#: catalog/heap.c:3255
+#: catalog/heap.c:3278
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "თაობის გამოსახულება მომხმარებლის აღწერილ ფუნქციას იყენებს"
+
+#: catalog/heap.c:3279
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr ""
+
+#: catalog/heap.c:3294
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "თაობის გამოსახულება მომხმარებლის აღწერილ ტიპს იყენებს"
+
+#: catalog/heap.c:3346
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "თაობის გამოსახულება უცვლელი არაა"
 
-#: catalog/heap.c:3283 rewrite/rewriteHandler.c:1285
+#: catalog/heap.c:3378 rewrite/rewriteHandler.c:1288
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "სვეტის \"%s\" ტიპია %s, მაგრამ ნაგულისხმევი გამოსახულების ტიპია %s"
 
-#: catalog/heap.c:3288 commands/prepare.c:335 parser/analyze.c:2991 parser/parse_target.c:595 parser/parse_target.c:885 parser/parse_target.c:895 rewrite/rewriteHandler.c:1290
+#: catalog/heap.c:3383 commands/prepare.c:334 parser/analyze.c:2906 parser/parse_target.c:595 parser/parse_target.c:885 parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "საჭიროა გამოსახულების გარდაქმნა ან გადაყვანა."
 
-#: catalog/heap.c:3335
+#: catalog/heap.c:3430
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "შემოწმების შეზღუდვაში მხოლოდ %s ცხრილზე მიმართვა შეიძლება"
 
-#: catalog/heap.c:3641
+#: catalog/heap.c:3736
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "\"ON COMMIT\"-ისა და გარე გასაღების წყვილი მხარდაუჭერელია"
 
-#: catalog/heap.c:3642
+#: catalog/heap.c:3737
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "ცხრილი \"%s\", მითითება \"%s\", მაგრამ მათ იგივე ON COMMIT პარამეტრი არ აქვთ."
 
-#: catalog/heap.c:3647
+#: catalog/heap.c:3742
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "გარე გასაღების შეზღუდვაში მიმართული ცხრილის შემცველობის დაცარიელება შეუძლებელია"
 
-#: catalog/heap.c:3648
+#: catalog/heap.c:3743
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "ცხრილი \"%s\" მიუთითებს \"%s\"."
 
-#: catalog/heap.c:3650
+#: catalog/heap.c:3745
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "წაშალეთ შემცველობა ცხრილისთვის \"%s\" პარალელურად, ან გამოიყენეთ TRUNCATE ... CASCADE."
 
-#: catalog/index.c:220 parser/parse_utilcmd.c:2331
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "ცხრილისთვის \"%s\" ერთზე მეტი ძირითადი გასაღები დაუშვებელია"
@@ -4741,7 +4777,7 @@ msgstr "პარალელური ინდექსის შექმნ
 msgid "shared indexes cannot be created after initdb"
 msgstr "გაზიარებული ინდექსების შექმნა შეუძლებელია initdb-ის შემდეგ"
 
-#: catalog/index.c:893 commands/createas.c:424 commands/sequence.c:159 parser/parse_utilcmd.c:210
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159 parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "შეერთება \"%s\" უკვე არსებობს, გამოტოვება"
@@ -4766,12 +4802,12 @@ msgstr "DROP INDEX CONCURRENTLY ტრანზაქციის პირვ
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "სხვა სესიების დროებითი ცხრილების რეინდექსი შეუძლებელია"
 
-#: catalog/index.c:3740 commands/indexcmds.c:3757
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "\"TOAST\" ცხრილზე არასწორი ინდექსის რეინდექსი შეუძლებელია"
 
-#: catalog/index.c:3756 commands/indexcmds.c:3635 commands/indexcmds.c:3781 commands/tablecmds.c:3703
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815 commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "სისტემური ურთიერთობის გაადაადგილება არ შეიძლება: \"%s\""
@@ -4786,7 +4822,7 @@ msgstr "\"%s\"-ის რეინდექსი დასრულდა"
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "'TOAST' ცხრილზე მდებარე არასწორი ინდექსის \"%s.%s\" რეინდექსი შეუძლებელია. გამოტოვება"
 
-#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758 commands/trigger.c:5780
+#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758 commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "ბაზებს შორის ბმულები განხორციელებული არაა: \"%s.%s.%s\""
@@ -4806,7 +4842,7 @@ msgstr "ბლოკის მიღების შეცდომა ურთ
 msgid "could not obtain lock on relation \"%s\""
 msgstr "ბლოკის მიღების შეცდომა ურთიერთობაზე %s\""
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1447 statistics/stat_utils.c:231
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "ურთიერთობა \"%s.%s\" არ არსებობს"
@@ -4816,7 +4852,7 @@ msgstr "ურთიერთობა \"%s.%s\" არ არსებობს
 msgid "relation \"%s\" does not exist"
 msgstr "ურთიერთობა \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1804 commands/extension.c:1810
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1804 commands/extension.c:1810
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "შიგნით შესაქმნელი სქემა მონიშნული არაა"
@@ -4841,97 +4877,97 @@ msgstr "დროებით სქემებში მხოლოდ დრ
 msgid "statistics object \"%s\" does not exist"
 msgstr "სტატისტიკის ობიექტი \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:2761
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "ტექსტის ძებნის დამმუშავებელი \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:2906 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "ტექსტის ძებნის ლექსიკონი \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:3052
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "ტექსტის ძებნის შაბლონი \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:3197 commands/tsearchcmds.c:1168 utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168 utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "ტექსტის ძებნის კონფიგურაცია \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:866 parser/parse_target.c:1262
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ბაზებს შორის ბმულები განხორციელებული არაა: %s"
 
-#: catalog/namespace.c:3335 gram.y:19418 gram.y:19458 parser/parse_expr.c:873 parser/parse_target.c:1269
+#: catalog/namespace.c:3338 gram.y:19355 gram.y:19395 parser/parse_expr.c:874 parser/parse_target.c:1269
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "არასწორი სრული სახელი (ძალიან ბევრი წერტილიანი სახელი): %s"
 
-#: catalog/namespace.c:3465
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "ობიექტის დროებითი სქემიდან გამოტანა ან სქემაში შეტანა შეუძლებელია"
 
-#: catalog/namespace.c:3471
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "\"TOAST\" სქემიდან ობიექტს ვერც გამოიტანთ, ვერც შეიტანთ"
 
-#: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344 commands/tablecmds.c:1464 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344 commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "სქემა \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:3575
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "ურთიერთობის არასწორი სახელი (ძალიან ბევრი წერტილიანი სახელი): %s"
 
-#: catalog/namespace.c:4016 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "კოლაცია \"%s\" კოდირებისთვის \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:4071
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "გადაყვანა \"%s\" არ არსებობს"
 
-#: catalog/namespace.c:4412
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "ბაზაში \"%s\" დროებითი ცხრილების შექმნის წვდომა აკრძალულია"
 
-#: catalog/namespace.c:4428
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "აღდგენისას დროებითი ცხრილების შექმნა შეუძლებელია"
 
-#: catalog/namespace.c:4434
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "პარალელური ოპერაციის მიმდინარეობისას დროებითი ცხრილების შექმნა შეუძლებელია"
 
-#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373 commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387 commands/tablecmds.c:14491
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373 commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387 commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" ცხრილი არაა"
 
-#: catalog/objectaddress.c:1383 commands/tablecmds.c:272 commands/tablecmds.c:19577 commands/view.c:113
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272 commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" ხედი არაა"
 
-#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278 commands/tablecmds.c:19582
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278 commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" არ არის მატერიალიზებული ხედი"
 
-#: catalog/objectaddress.c:1397 commands/tablecmds.c:296 commands/tablecmds.c:19587
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296 commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" გარე ცხრილი არაა"
@@ -4951,7 +4987,7 @@ msgstr "სვეტს სახელი სრულად უნდა მ
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "ურთიერთობის (%2$s) სვეტის (%1$s) ნაგულისხმევი მნიშვნელობა არ არსებობს"
 
-#: catalog/objectaddress.c:1623 commands/functioncmds.c:132 commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3834 parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801 utils/adt/acl.c:4558
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132 commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842 parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801 utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "ტიპი \"%s\" არ არსებობს"
@@ -4976,7 +5012,7 @@ msgstr "ფუნქცია %d (%s, %s) %s-დან არ არსებო
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "სერვერზე (%2$s) მომხმარებლის ბმა %1$s-სთვის არ არსებობს"
 
-#: catalog/objectaddress.c:1839 commands/foreigncmds.c:430 commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441 commands/foreigncmds.c:1004 commands/foreigncmds.c:1367 foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "სერვერი \"%s\" არ არსებობს"
@@ -5513,7 +5549,7 @@ msgstr "\"%s\" ჰიპოთეტიკური-სეტის აგრე
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr ""
 
-#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701 commands/typecmds.c:2015 commands/typecmds.c:2061 commands/typecmds.c:2113 commands/typecmds.c:2150 commands/typecmds.c:2184 commands/typecmds.c:2218 commands/typecmds.c:2252 commands/typecmds.c:2281 commands/typecmds.c:2368 commands/typecmds.c:2410 parser/parse_func.c:417 parser/parse_func.c:448 parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611 parser/parse_func.c:631
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701 commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121 commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226 commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376 commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448 parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611 parser/parse_func.c:631
 #: parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
@@ -5609,47 +5645,57 @@ msgstr "კოლაცია \"%s\" უკვე არსებობს"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "კოლაცია \"%s\" კოდირებისთვის \"%s\" უკვე არსებობს"
 
-#: catalog/pg_constraint.c:758 commands/tablecmds.c:7952
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7952
 #, c-format
 msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
 msgstr "ურთიერთობაზე \"%2$s\" NOT NULL შეზღუდვის \"%1$s\" NO INHERIT სტატუსს ვერ შეცვლით"
 
-#: catalog/pg_constraint.c:760 commands/tablecmds.c:9559
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9584
 #, c-format
 msgid "You might need to make the existing constraint inheritable using %s."
 msgstr ""
 
-#: catalog/pg_constraint.c:770
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8301
 #, c-format
 msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
 msgstr "შეუთავსებელი NOT VALID შეზღუდვა \"%s\" ურთიერთობაზე \"%s\""
 
-#: catalog/pg_constraint.c:772 commands/tablecmds.c:9571
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8303 commands/tablecmds.c:9596
 #, c-format
 msgid "You might need to validate it using %s."
 msgstr "როგორც ჩანს, საჭიროა მისი სისწორე %s-ით დაამოწმოთ."
 
-#: catalog/pg_constraint.c:1011
+#: catalog/pg_constraint.c:792
+#, c-format
+msgid "cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr "არანულოვანი შეზღუდვის \"%s\" დამატება შეუძლებელია სვეტზე \"%s\" ცხრილში \"%s\""
+
+#: catalog/pg_constraint.c:794
+#, c-format
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "არანულოვანი შეზღუდვა სახელით \"%s\" ამ სვეტისთვის უკვე არსებობს."
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "შეზღუდვა \"%s\" დომენისთვის %s უკვე არსებობს"
 
-#: catalog/pg_constraint.c:1212 catalog/pg_constraint.c:1305
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "ცხრილის (%2$s) შეზღუდვა (%1$s) არ არსებობს"
 
-#: catalog/pg_constraint.c:1405
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "დომენის (%2$s) შეზღუდვა (%1$s) არ არსებობს"
 
-#: catalog/pg_constraint.c:1659
+#: catalog/pg_constraint.c:1681
 #, c-format
 msgid "invalid type for PERIOD part of foreign key"
 msgstr "გარე გასაღების PRIOD ნაწილის ტიპი არასწორია"
 
-#: catalog/pg_constraint.c:1660
+#: catalog/pg_constraint.c:1682
 #, c-format
 msgid "Only range and multirange are supported."
 msgstr "მხარდაჭერილია, მხოლოდ, შუალედი და მრავალი შუალედი."
@@ -5664,12 +5710,12 @@ msgstr "გადაყვანა უკვე არსებობს: \"%s\
 msgid "default conversion for %s to %s already exists"
 msgstr "%s-დან %s-ზე ნაგულისხმევი გადაყვანა უკვე არსებობს"
 
-#: catalog/pg_depend.c:223 commands/extension.c:3665
+#: catalog/pg_depend.c:223 commands/extension.c:3689
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s გაფართოების (\"%s\") წევრს უკვე წარმოადგენს"
 
-#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3705
+#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3729
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s გაფართოების \"%s\"წევრი არაა"
@@ -5734,7 +5780,7 @@ msgstr "დანაყოფის \"%s\" მოხსნის შეცდო
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "ხდება დანაყოფის პარალელური მოხსნა ან მოხსნა დაუმთავრებელია."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916 commands/tablecmds.c:17824
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916 commands/tablecmds.c:17891
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "მოხსნის ოპერაციის დასასრულებლად გამოიყენეთ ALTER TABLE ... DETACH PARTITION ... FINALIZE ."
@@ -6063,12 +6109,12 @@ msgstr "%s-ის წაშლა შეუძლებელია. საჭ
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "%s-ის მფლობელობაში მყოფი ობიექტების წვდომების თავიდან მინიჭება შეუძლებელია, რადგან ისინი ბაზის სისტემისთვისაა საჭირო"
 
-#: catalog/pg_subscription.c:469
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "გამოწერისთვის \"%s\" ურთიერთობის მიბმის წაშლა შეუძლებელია"
 
-#: catalog/pg_subscription.c:471
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "მიმდინარეობს ცხრილის სინქრონიზაცია ურთიერთობისთვის \"%s\" და მისი მდგომარეობაა \"%c\"."
@@ -6076,7 +6122,7 @@ msgstr "მიმდინარეობს ცხრილის სინქ
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:478
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "გამოწერის ჩასართავად, თუ ის უკვე ჩართული არაა, %s გამოიყენეთ, ან, %s, გამოწერის წასაშლელად."
@@ -6106,7 +6152,7 @@ msgstr "შიდა ზომა %d მნიშვნელობით-გა
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "სწორება \"%c\" არასწორია ცვლადი-სიგრძის ტიპისთვის"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4354
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "ფიქსირებული ზომის ტიპებს უნდა PLAIN ტიპის საცავი უნდა ჰქონდეთ"
@@ -6121,10 +6167,10 @@ msgstr "შეცდომა მრავალდიაპაზონია
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "მრავალდიაპაზონიანი ტიპის სახელი ხელით, \"multirange_type_name\" ატრიბუტით უნდა მიუთითოთ."
 
-#: catalog/storage.c:549 storage/buffer/bufmgr.c:7339
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "ურთიერთობის (%2$s) ბლოკის (%1$u) არასწორ გვერდი"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "არასწორი გვერდი ბლოკში %u ურთიერთობისთვის \"%s\""
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -6216,17 +6262,17 @@ msgstr "პარამეტრი \"parallel\" SAFE, RESTRICTED ან UNSAFE
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "პარამეტრი \"%s\" READ_ONLY, SHAREABLE, ან READ_WRITE უნდა იყოს"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "მოვლენის ტრიგერი უკვე არსებობს: %s"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "გარე მონაცემების გადამტანი უკვე არსებობს: %s"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "სერვერი \"%s\" უკვე არსებობს"
@@ -6236,7 +6282,7 @@ msgstr "სერვერი \"%s\" უკვე არსებობს"
 msgid "language \"%s\" already exists"
 msgstr "ენა \"%s\" უკვე არსებობს"
 
-#: commands/alter.c:95 commands/publicationcmds.c:865
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "პუბლიკაცია \"%s\" უკვე არსებობს"
@@ -6281,12 +6327,12 @@ msgstr "ტექსტის ძიების კონფიგურაც
 msgid "must be superuser to rename %s"
 msgstr "%s -ის სახელის გადარქმევისთვის საჭიროა ზემომხმარებლის უფლებები"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:608 commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231 commands/subscriptioncmds.c:1989
+#: commands/alter.c:256 commands/subscriptioncmds.c:608 commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231 commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false მხოლოდ superuser-only-სთვისაა"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:609 commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232 commands/subscriptioncmds.c:1990
+#: commands/alter.c:257 commands/subscriptioncmds.c:609 commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232 commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "გამოწერები, რომლის password_required პარამეტრი ჭეშმარიტი არაა, მხოლოდ ზემომხმარებლის მიერ შეიძლება შეიქმნას და შეიცვალოს."
@@ -6321,7 +6367,7 @@ msgstr "წვდომის მეთოდი \"%s\" არ არსებ
 msgid "handler function is not specified"
 msgstr "დამმუშავებელი ფუნქცია მითითებული არაა"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200 commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:705 parser/parse_clause.c:941
+#: commands/amcmds.c:264 commands/event_trigger.c:204 commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706 parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "ფუნქციამ (%s) აუცილებლად უნდა დააბრუნოს ტიპი %s"
@@ -6376,27 +6422,27 @@ msgstr "\"%s.%s\"-ის მემკვიდრეობის ხის ა
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "\"%s.%s\"-ის მემკვიდრეობის ხის ანალიზის გამოტოვება --- მემკვიდრეობითობის ხე გაანალიზებად შვილ ცხრილებს არ შეიცავს"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "არხის სახელი ცარიელი არ შეიძლება იყოს"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "არხის სახელი ძალიან გრძელია"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "სასარგებლო დატვირთვის სტრიქონი ძალიან გრძელია"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "შეუძლებელია განვახორციელო PREPARE ტრანზაქციაზე, რომელმაც შეასრულა LISTEN, UNLSTEN ან NOTIFY"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "\"NOTIFY\" რიგში მეტისმეტად ბევრი გაფრთხილებაა"
@@ -6416,10 +6462,10 @@ msgstr "სერვერის პროცესი PID-ით %d უძვ
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "რიგის NOTIFY დაცარიელება პროცესის მიერ მიმდინარე ტრანზაქციის დასრულებამდე შეუძლებელია."
 
-#: commands/cluster.c:127
+#: commands/cluster.c:127 commands/dbcommands.c:2356 commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234 commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "\"CLUSTER\"-ის უცნობი პარამეტრი \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "უცნობი %s-ის პარამეტრი: \"%s\""
 
 #: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
@@ -6431,7 +6477,7 @@ msgstr "სხვა სესიების დროებით ცხრი
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "ცხრილისთვის \"%s\" წინასწარ დაკლასტერებული ინდექსი არ არსებობს"
 
-#: commands/cluster.c:190 commands/tablecmds.c:16380 commands/tablecmds.c:18446
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "ინდექსი %s ცხრილისთვის %s არ არსებობს"
@@ -6446,7 +6492,7 @@ msgstr "გაზიარებული კატალოგის დაკ
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "სხვა სესიების დროებითი ცხრილების მომტვერსასრუტება შეუძლებელია"
 
-#: commands/cluster.c:507 commands/tablecmds.c:18456
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" არ წარმოადგენს ინდექსს ცხრილისთვის \"%s\""
@@ -6510,8 +6556,8 @@ msgstr "კლასტერისთვის \"%s\" წვდომა აკ
 msgid "collation attribute \"%s\" not recognized"
 msgstr "კოლაციის უცნობი ატრიბუტი: \"%s\""
 
-#: commands/collationcmds.c:123 commands/collationcmds.c:129 commands/define.c:375 commands/tablecmds.c:8369 replication/pgoutput/pgoutput.c:320 replication/pgoutput/pgoutput.c:343 replication/pgoutput/pgoutput.c:357 replication/pgoutput/pgoutput.c:367 replication/pgoutput/pgoutput.c:377 replication/pgoutput/pgoutput.c:387 replication/pgoutput/pgoutput.c:399 replication/walsender.c:1123 replication/walsender.c:1145 replication/walsender.c:1155
-#: replication/walsender.c:1164 replication/walsender.c:1406 replication/walsender.c:1415
+#: commands/collationcmds.c:123 commands/collationcmds.c:129 commands/define.c:375 commands/tablecmds.c:8394 replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344 replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372 replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392 replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137 replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420 replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "კონფლიქტური ან ზედმეტი პარამეტრები"
@@ -6541,7 +6587,7 @@ msgstr "კოლაციის უცნობი მომწოდებე
 msgid "parameter \"%s\" must be specified"
 msgstr "პარამეტრის \"%s\" მითითება აუცილებელია"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1148
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "ვიყენებ სტანდარტულ ფორმას \"%s\" ICU ლოკალისთვის \"%s\""
@@ -6551,7 +6597,7 @@ msgstr "ვიყენებ სტანდარტულ ფორმას
 msgid "nondeterministic collations not supported with this provider"
 msgstr "არადემინისტური კოლაციები, რომლებიც არ არის მხარდაჭერილი ამ მომწოდებელთან"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1101
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "ICU-ის წესების მითითება მანამდე, სანამ ლოკალის მომწოდებელი ICU არაა, შეუძლებელია"
@@ -6578,22 +6624,22 @@ msgstr "ნაგულისხმევი კოლაციის ვერ
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445 commands/tablecmds.c:8146 commands/tablecmds.c:8156 commands/tablecmds.c:8158 commands/tablecmds.c:16082 commands/tablecmds.c:19610 commands/tablecmds.c:19631 commands/typecmds.c:3778 commands/typecmds.c:3863 commands/typecmds.c:4217
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445 commands/tablecmds.c:8146 commands/tablecmds.c:8156 commands/tablecmds.c:8158 commands/tablecmds.c:16149 commands/tablecmds.c:19677 commands/tablecmds.c:19698 commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "ამის ნაცვლად %s გამოიყენეთ."
 
-#: commands/collationcmds.c:476 commands/dbcommands.c:2580
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "ვერსიის შეცვლა %s-დან %s-ზე"
 
-#: commands/collationcmds.c:491 commands/dbcommands.c:2593
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "ვერსია არ შეცვლილა"
 
-#: commands/collationcmds.c:524 commands/dbcommands.c:2763 utils/adt/dbsize.c:180
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789 utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "ბაზა OID-ით %u არ არსებობს"
@@ -6613,7 +6659,7 @@ msgstr "სისტემური კოლაციების შემო
 msgid "no usable system locales were found"
 msgstr "გამოყენებადი სისტემური ენები ნაპოვნი არაა"
 
-#: commands/comment.c:61 commands/dbcommands.c:1679 commands/dbcommands.c:1897 commands/dbcommands.c:2009 commands/dbcommands.c:2207 commands/dbcommands.c:2447 commands/dbcommands.c:2540 commands/dbcommands.c:2664 commands/dbcommands.c:3175 utils/init/postinit.c:1027 utils/init/postinit.c:1091 utils/init/postinit.c:1164
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922 commands/dbcommands.c:2034 commands/dbcommands.c:2232 commands/dbcommands.c:2473 commands/dbcommands.c:2566 commands/dbcommands.c:2690 commands/dbcommands.c:3201 utils/init/postinit.c:1016 utils/init/postinit.c:1080 utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "მონაცემთა ბაზა \"%s\" არ არსებობს"
@@ -6698,166 +6744,176 @@ msgstr "ფაილში COPY-ის წვდომა აკრძალუ
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "ფაილში COPY-ის უფლებები მხოლოდ '%s' როლს გააჩნია."
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "გენერირებული სვეტები COPY FROM WHERE პირობებში მხარდაჭერილი არაა"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824 commands/tablecmds.c:19906 commands/trigger.c:660 rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "სვეტი \"%s\" გენერირებული სვეტია."
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "მწკრივის-დონის უსაფრთხოებით COPY FROM მხარდაჭერილი არაა"
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "უკეთესია გამოიყენოთ INSERT ოპერატორი."
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "\"COPY TO\"-ში %s-ის HEADER-თან ერთად გამოყენება შეუძლებელია"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "%s -ს ლოგიკური მნიშვნელობა უნდა ჰქონდეს, ან \"match\""
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:818 commands/copy.c:834 commands/copy.c:851 commands/copy.c:877 commands/copy.c:887
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873 commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s-ს %s-სთან ერთად ვერ გამოიყენებთ"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:474
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "COPY %s \"%s\" უცნობია"
 
-#: commands/copy.c:436 commands/define.c:73 commands/define.c:84 commands/define.c:178 commands/define.c:196 commands/define.c:211 commands/define.c:229
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84 commands/define.c:178 commands/define.c:196 commands/define.c:211 commands/define.c:229
 #, c-format
 msgid "%s requires a numeric value"
 msgstr "%s მოითხოვს რიცხვით მნიშვნელობას"
 
-#: commands/copy.c:446
+#: commands/copy.c:485
 #, c-format
 msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
 msgstr "REJECT_LIMIT (%<PRId64>) ნულზე მეტი უნდა იყოს"
 
-#: commands/copy.c:536
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "COPY-ის უცნობი ფორმატი: \"%s\""
 
-#: commands/copy.c:594 commands/copy.c:609 commands/copy.c:624 commands/copy.c:643
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663 commands/copy.c:682
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "პარამეტრის (%s) არგუმენტი სვეტების სახელების სია უნდა იყოს"
 
-#: commands/copy.c:655
+#: commands/copy.c:694
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "პარამეტრის (%s) არგუმენტი კოდირების სწორი სახელი უნდა იყოს"
 
-#: commands/copy.c:683 commands/dbcommands.c:880 commands/dbcommands.c:2395
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "უცნობი პარამეტრი: %s"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:696 commands/copy.c:701 commands/copy.c:706 commands/copy.c:776
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745 commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "რეჟიმში BINARY \"%s\"-ს ვერ მიუთითებთ"
 
-#: commands/copy.c:728
+#: commands/copy.c:767
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "COPY-ის გამყოფი ერთბაიტიანი სიმბოლო უნდა იყოს"
 
-#: commands/copy.c:735
+#: commands/copy.c:774
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPY-ის გამყოფი ხაზის გადატანა ან კარეტის დაბრუნება არ უნდა იყოს"
 
-#: commands/copy.c:741
+#: commands/copy.c:780
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "COPY-ის ნულოვან რეპრეზენტაციას ახალი ხაზის ან კარეტის დაბრუნება გამოყენება არ შეუძლია"
 
-#: commands/copy.c:751
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "COPY-ის ნაგულისხმევ რეპრეზენტაციას ახალი ხაზის ან კარეტის დაბრუნება გამოყენება არ შეუძლია"
 
-#: commands/copy.c:769
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "COPY-ის გამყოფი \"%s\" არ შეიძლება იყოს"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:783 commands/copy.c:800 commands/copy.c:812 commands/copy.c:827 commands/copy.c:843
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851 commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "COPY %s-ს CSV რეჟიმი სჭირდება"
 
-#: commands/copy.c:788
+#: commands/copy.c:827
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "COPY-ის ბრჭყალი ერთბაიტიანი სიმბოლო უნდა იყოს"
 
-#: commands/copy.c:793
+#: commands/copy.c:832
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "COPY-ის გამყოფი და ბრჭყალი სხვადასხვა სიმბოლო უნდა იყოს"
 
-#: commands/copy.c:805
+#: commands/copy.c:844
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "COPY-ის სპეცსიმბოლო ერთბაიტიანი სიმბოლო უნდა იყოს"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:859 commands/copy.c:895
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "COPY-ის გამყოფი სიმბოლო %s-ის სპეციფიკაციაში არ უნდა ჩანდეს"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:868 commands/copy.c:904
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "CSV-ის ბრჭყალის სიმბოლო %s-ის სპეციფიკაციაში არ უნდა გამოჩნდეს"
 
-#: commands/copy.c:913
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "NULL-ის სპეციფიკაცია და DEFAULT-ის სპეციფიკაცია ერთი და იგივე ვერ იქნება"
 
-#: commands/copy.c:919
+#: commands/copy.c:958
 #, c-format
 msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr ""
+msgstr "BINARY რეჟიმში დაშვებულია, მხოლოდ, ON_ERROR_STOP"
 
 #. translator: first and second %s are the names of COPY option, e.g.
 #. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
-#: commands/copy.c:926
+#: commands/copy.c:965
 #, c-format
 msgid "COPY %s requires %s to be set to %s"
 msgstr "COPY %s-ს სჭირდება %s დაყენებული იყოს მნიშვნელობაზე %s"
 
-#: commands/copy.c:988
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "სვეტი \"%s\" გენერირებული სვეტია"
 
-#: commands/copy.c:990
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "გენერირებული სვეტები COPY-ში არ გამოიყენება."
 
-#: commands/copy.c:1005 commands/indexcmds.c:1959 commands/statscmds.c:239 commands/tablecmds.c:2593 commands/tablecmds.c:3101 commands/tablecmds.c:3930 parser/parse_relation.c:3798 parser/parse_relation.c:3808 parser/parse_relation.c:3826 parser/parse_relation.c:3833 parser/parse_relation.c:3847 utils/adt/tsvector_op.c:2853
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260 commands/tablecmds.c:2593 commands/tablecmds.c:3101 commands/tablecmds.c:3930 parser/parse_relation.c:3798 parser/parse_relation.c:3808 parser/parse_relation.c:3826 parser/parse_relation.c:3833 parser/parse_relation.c:3847 utils/adt/tsvector_op.c:2853
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "სვეტი არ არსებობს: \"%s\""
 
-#: commands/copy.c:1012 commands/tablecmds.c:2619 commands/trigger.c:956 parser/parse_target.c:1086 parser/parse_target.c:1097
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957 parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "სვეტი ერთზე მეტჯერაა მითითებული: \"%s\""
@@ -6951,12 +7007,12 @@ msgstr[1] "გამოტოვებულია %<PRIu64> მწკრივ
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:881
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "%s-ის სვეტი \"%s\"-ს COPY არ მიმართავს"
 
-#: commands/copyfrom.c:1707 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:386
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "ნაგულისხმევი გადაყვანის ფუნქცია კოდირებისთვის \"%s\"-დან %s-ზე არ არსებობს"
@@ -6966,7 +7022,7 @@ msgstr "ნაგულისხმევი გადაყვანის ფ
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "ინსტრუქცია 'COPY TO' PostgreSQL-ის სერვერის პროცესს ფაილიდან წაკითხვას უბრძანებს. შეიძლება გნებავთ კლიენტის მხარე, როგორიცაა psql-ის \\copy."
 
-#: commands/copyfrom.c:1895 commands/copyto.c:986
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" საქაღალდეა"
@@ -7016,17 +7072,17 @@ msgstr "\"COPY\"-ის ფაილის არასწორი თავს
 msgid "could not read from COPY file: %m"
 msgstr "\"COPY\" ფაილიდან წაკითხვის შეცდომა: %m"
 
-#: commands/copyfromparse.c:278 commands/copyfromparse.c:303 replication/walsender.c:732 replication/walsender.c:758 tcop/postgres.c:369
+#: commands/copyfromparse.c:278 commands/copyfromparse.c:303 replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "მოულოდნელი EOF ღია ტრანზაქციის მქონე კლიენტის შეერთებაზე"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:748
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "stdin-დან COPY ოპერაციისას მიღებულია მოულოდნელი შეტყობინების ტიპი 0x%02X"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:779
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "COPY-ი stdin-დან წარუმატებელია: %s"
@@ -7181,7 +7237,7 @@ msgstr "სცადეთ COPY (SELECT ...) TO ვარიანტი."
 msgid "cannot copy from unpopulated materialized view \"%s\""
 msgstr "არაშევსებული მატერიალიზებული ხედიდან კოპირების შეცდომა: %s"
 
-#: commands/copyto.c:662 executor/execUtils.c:761
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
 msgid "Use the REFRESH MATERIALIZED VIEW command."
 msgstr "გამოიყენეთ ბრძანება REFRESH MATERIALIZED VIEW."
@@ -7246,27 +7302,27 @@ msgstr "COPY მოთხოვნას RETURNING პირობა აუც
 msgid "relation referenced by COPY statement has changed"
 msgstr ""
 
-#: commands/copyto.c:951
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "ფაილში COPY-სთვის შედარებითი ბილიკის მითითება დაუშვებელია"
 
-#: commands/copyto.c:970
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "ფაილის (\"%s\") ჩასაწერად გახსნა შეუძლებელია: %m"
 
-#: commands/copyto.c:973
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "ინსტრუქცია 'COPY TO' PostgreSQL-ის სერვერის პროცესს ფაილში ჩაწერას უბრძანებს. შეიძლება გნებავთ კლიენტის მხარე, როგორიცაა psql-ის \\copy."
 
-#: commands/createas.c:212 commands/createas.c:524
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "მითითებულია მეტისმეტად ბევრი სვეტის სახელი"
 
-#: commands/createas.c:547
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "ამ ბრძანებისთვის წესები ჯერ არ არსებობს"
@@ -7301,7 +7357,7 @@ msgstr "\"%s\" კოდირების სწორ სახელს ა
 msgid "unrecognized locale provider: %s"
 msgstr "ენის უცნობი მომწოდებელი: %s"
 
-#: commands/dbcommands.c:958 commands/dbcommands.c:2428 commands/user.c:300 commands/user.c:739
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299 commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "კავშირის არასწორი ლიმიტი: %d"
@@ -7321,7 +7377,7 @@ msgstr "შაბლონური ბაზა \"%s\" არ არსებ
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "არასწორი მონაცემთა ბაზის \"%s\" შაბლონად გამოყენება შეუძლებელია"
 
-#: commands/dbcommands.c:1014 commands/dbcommands.c:2458 utils/init/postinit.c:1106
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484 utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "არასწორი მონაცემთა ბაზების წასაშლელად გამოიყენეთ ბრძანება DROP DATABASE."
@@ -7346,300 +7402,300 @@ msgstr "სწორი სტრატეგიებია \"wal_log\" და
 msgid "invalid server encoding %d"
 msgstr "სერვერის არასწორი კოდირება %d"
 
-#: commands/dbcommands.c:1070
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077 commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "არასწორი LC_COLLATE ლოკალის სახელი: \"%s\""
 
-#: commands/dbcommands.c:1071 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "თუ ლოკალის სახელი სპეფიციკურია ჩაშენებული მომწოდებლისთვის, გამოიყენეთ BUILTIN_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
+#, c-format
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
 msgstr "თუ ლოკალის სახელი მხოლოდ ICU-სთვისა დამახასიათებელი, ICU_LOCALE გამოიყენეთ."
 
-#: commands/dbcommands.c:1076
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095 commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "არასწორი LC_TYPE ლოკალის სახელი: \"%s\""
 
-#: commands/dbcommands.c:1088
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALE-ის მითითება შეუძლებელია, სანამ ლოკალის მომწოდებელი builtin არაა"
 
-#: commands/dbcommands.c:1096
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICU-ის ენის მითითება მანამდე, სანამ ლოკალის მომწოდებელი ICU არაა, შეუძლებელია"
 
-#: commands/dbcommands.c:1114
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "LOCALE-ის ან BUILTIN_LOCALE-ის მითითება აუცილებელია"
 
-#: commands/dbcommands.c:1123
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "მონაცემთა ბაზის კოდირება \"%s\" ICU მომწოდებელთან ერთად მხარდაჭერილი არაა"
 
-#: commands/dbcommands.c:1133
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "LOCALE-ის ან ICU_LOCALE-ის მითითება აუცილებელია"
 
-#: commands/dbcommands.c:1177
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "ახალი კოდირება (%s) შაბლონის ბაზის (%s) კოდირებასთან თავსებადი არაა"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე კოდირება, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "ახალი კოლაცია (%s) შაბლონის ბაზის (%s) კოლაციასთან თავსებადი არაა"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე კოლაცია, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1192
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "ახალი LC_TYPE (%s) შაბლონის ბაზის (%s) LC_TYPE-სთან თავსებადი არაა"
 
-#: commands/dbcommands.c:1194
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე LC_CTYPE, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "ახალი ლოკალის მომწოდებელი (%s) შაბლონის ბაზის (%s) ლოკალის მომწოდებელს არ ემთხვევა"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე ლოკალის მომწოდებელი, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1213
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "ახალი ICU ლოკალი (%s) შაბლონის ბაზის (%s) ICU ლოკალთან თავსებადი არაა"
 
-#: commands/dbcommands.c:1215
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე ICU ლოკალი, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1226
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "ახალი ICU კოლაციის წესები (%s) შაბლონის ბაზის (%s) ICU კოლაციის წესებთან თავსებადი არაა"
 
-#: commands/dbcommands.c:1228
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "გამოიყენეთ იგივე ICU კოლაციის წესები, რაც შაბლონის ბაზას გააჩნია, ან შაბლონად template0 გამოიყენეთ."
 
-#: commands/dbcommands.c:1257
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "შაბლონის ბაზას \"%s\" კოლაცია გააჩნია, მაგრამ ნამდვილი კოლაციის ვერსიის დადგენა შეუძლებელია"
 
-#: commands/dbcommands.c:1262
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "შაბლონული ბაზის (%s) კოლაციის ვერსია არ ემთხვევა"
 
-#: commands/dbcommands.c:1264
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "ნიმუში ბაზა შეიქმნა კოლაციის ვერსიით %s, მაგრამ ოპერაციული სისტემის ვერსიაა %s."
 
-#: commands/dbcommands.c:1267
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "სანიმუშე ბაზაში ყველა ობიექტი, რომლებიც ნაგულისხმევ კოლაციას იყენებს, თავიან ააგეთ და გაუშვით ALTER DATABASE %s REFRESH COLLATION VERSION, ან PostgreSQL სწორი ბიბლიოთეკის ვერსიით ააგეთ."
 
-#: commands/dbcommands.c:1312 commands/dbcommands.c:2055
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global არ შეიძლება გამოყენებულ იქნას როგორც ნაგულისხმევი ცხრილის სივრცე"
 
-#: commands/dbcommands.c:1338
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "ცხრილების ახალი ნაგულისხმევი სივრცის \"%s\" მინიჭება შეუძლებელია"
 
-#: commands/dbcommands.c:1340
+#: commands/dbcommands.c:1365
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr "არსებობს კონფლიქტი, რადგან მონაცემთა ბაზას \"%s\" ამ ცხრილების სივრცეში ცხრილები უკვე გააჩნია."
 
-#: commands/dbcommands.c:1370 commands/dbcommands.c:1926
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "ბაზა \"%s\" უკვე არსებობს"
 
-#: commands/dbcommands.c:1384
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "საწყის ბაზა %s-სთან ამჟამად სხვა მომხმარებლებიცაა მიერთებული"
 
-#: commands/dbcommands.c:1406
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "ბაზის OID %u უკვე გამოიყენება ბაზის \"%s\" მიერ"
 
-#: commands/dbcommands.c:1412
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "მონაცემების საქაღალდე მითითებული OID-ით (%u) უკვე არსებობს"
 
-#: commands/dbcommands.c:1585 commands/dbcommands.c:1600 utils/adt/pg_locale.c:1517
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625 utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "კოდირება (%s) ენას (%s) არ ემთხვევა"
 
-#: commands/dbcommands.c:1588
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "\"LC_CTYPE\"-ის არჩეულ პარამეტრს სჭირდება კოდირება: \"%s\"."
 
-#: commands/dbcommands.c:1603
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "\"LC_COLLATE\"-ის არჩეულ პარამეტრს სჭირდება კოდირება: \"%s\"."
 
-#: commands/dbcommands.c:1686
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "მონაცემთა ბაზა \"%s\" არ არსებობს, გამოტოვება"
 
-#: commands/dbcommands.c:1710
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "შაბლონური ბაზის წაშლა შეუძლებელია"
 
-#: commands/dbcommands.c:1716
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "ღია ბაზის წაშლა შეუძლებელია"
 
-#: commands/dbcommands.c:1729
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "ბაზა %s აქტიური ლოგიკური რეპლიკაციის სლოტის მიერ გამოიყენება"
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "ხელმისაწვდომია %d აქტიური სლოტი."
 msgstr[1] "ხელმისაწვდომია %d აქტიური სლოტი."
 
-#: commands/dbcommands.c:1745
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "ბაზა %s ლოგიკური რეპლიკაციის გამოწერის მიერ გამოიყენება"
 
-#: commands/dbcommands.c:1747
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "აღმოჩენილია %d გამოწერა."
 msgstr[1] "აღმოჩენილია %d გამოწერა."
 
-#: commands/dbcommands.c:1768 commands/dbcommands.c:1948 commands/dbcommands.c:2077
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973 commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "ბაზა %s-სთან ამჟამად სხვა მომხმარებლებიცაა მიერთებული"
 
-#: commands/dbcommands.c:1908
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "ბაზის სახელის გადარქმევის წვდომა აკრძალულია"
 
-#: commands/dbcommands.c:1937
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "მიმდინარე ბაზის სახელის გადარქმევა შეუძლებელია"
 
-#: commands/dbcommands.c:2033
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "ღია ბაზის ცხრილების სივრცის შეცვლა შეუძლებელია"
 
-#: commands/dbcommands.c:2139
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "ბაზის (%s) ზოგიერთი ურთიერთობა ცხრილების სივრცეში \"%s\" უკვე იმყოფება"
 
-#: commands/dbcommands.c:2141
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "ამ ბრძანების გამოყენებამდე ბაზის ნაგულისხმევ ცხრილების სივრცეში უნდა დაბრუნდეთ."
 
-#: commands/dbcommands.c:2270 commands/dbcommands.c:3013 commands/dbcommands.c:3313 commands/dbcommands.c:3426
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039 commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "ძველი ბაზის საქაღალდეში \"%s\" შეიძლება რამდენიმე გამოუსადეგარი ფაილი დარჩა"
 
-#: commands/dbcommands.c:2331
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "\"DROP DATABASE\"-ის უცნობი პარამეტრი \"%s\""
-
-#: commands/dbcommands.c:2409
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "პარამეტრის \"%s\" მითითება სხვა პარამეტრებთან ერთად აკრძალულია"
 
-#: commands/dbcommands.c:2457
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "არასწორი ბაზის (\"%s\") შეცვლა შეუძლებელია"
 
-#: commands/dbcommands.c:2474
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "მიმდინარე ბაზასთან დაკავშირების უარყოფა შეუძლებელია"
 
-#: commands/dbcommands.c:2704
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "ბაზის მფლობელის შეცვლის წვდომა აკრძალულია"
 
-#: commands/dbcommands.c:3119
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "ამ ბაზას %d სხვა სესია და %d მომზადებული ტრანზაქცია იყენებს."
 
-#: commands/dbcommands.c:3122
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "%d სხვა სესია, რომელიც ბაზას იყენებს."
 msgstr[1] "%d სხვა სესია, რომელიც ბაზას იყენებს."
 
-#: commands/dbcommands.c:3127 storage/ipc/procarray.c:3860
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "ბაზას %d მომზადებული ტრანზაქცია იყენებს."
 msgstr[1] "ბაზას %d მომზადებული ტრანზაქცია იყენებს."
 
-#: commands/dbcommands.c:3269
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "ნაკლული საქაღალდე \"%s\""
 
-#: commands/dbcommands.c:3327 commands/tablespace.c:184 commands/tablespace.c:633
+#: commands/dbcommands.c:3353 commands/tablespace.c:184 commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "საქაღალდის \"%s\" პოვნა შეუძლებელია: %m"
@@ -7684,7 +7740,7 @@ msgstr "\"%s\" აგრეგატული ფუნქციაა"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "აგრეგირებული ფუნქციების წასაშლელად გამოიყენეთ DROP AGGREGATE."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014 commands/tablecmds.c:4175 commands/tablecmds.c:4227 commands/tablecmds.c:18887 tcop/utility.c:1328
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014 commands/tablecmds.c:4175 commands/tablecmds.c:4227 commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "ურთიერთობა \"%s\" არ არსებობს, გამოტოვებს"
@@ -7714,7 +7770,7 @@ msgstr "კოლაცია \"%s\" არ არსებობს, გამ
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "გადაყვანა\"%s\" არ არსებობს, გამოტოვება"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:682
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "სტატისტიკის ობიექტი \"%s\" არ არსებობს, გამოტოვება"
@@ -7809,7 +7865,7 @@ msgstr "წესი %s ურთიერთობისთვის \"%s\" ა
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "გარე მონაცემების გადამტანი \"%s\" არ არსებობს. გამოტოვება"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "სერვერი \"%s\" არ არსებობს, გამოტოვება"
@@ -7829,91 +7885,86 @@ msgstr "ოპერატორის ოჯახი \"%s\" წვდომი
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "პუბლიკაცია \"%s\" არ არსებობს, გამოტოვება"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "მოვლენის ტრიგერის (\"%s\") შექმნის წვდომა აკრძალულია"
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "მოვლენის ტრიგერის შესაქმნელად საჭიროა ზემომხმარებლის პრივილეგიები."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "მოვლენის უცნობი სახელი \"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "ფილტრის უცნობი ცვლადი \"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "ჭდის გაფილტვრა მხარდაუჭერელია შესვლის მოვლენის ტრიგერისთვის"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "ფილტრის მნიშვნელობა \"%s\" ფილტრის ცვლადისთვის \"%s\" უცნობია"
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "მოვლენის ტრიგერები %s-ისთვის მხარდაჭერილი არაა"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "ფილტრის ცვლადი ერთზე მეტჯერაა მითითებული: %s"
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490 commands/event_trigger.c:584
+#: commands/event_trigger.c:442 commands/event_trigger.c:494 commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "მოვლენის ტრიგერი არ არსებობს: \"%s\""
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "მოვლენის ტრიგერი OID-ით %u არ არსებობს"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "მოვლენის ტრიგერის მფლობელის შეცვლის წვდომა აკრძალულია: %s"
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "მოვლენის ტრიგერის მფლობელი ზემომხმარებელი უნდა იყოს."
 
-#: commands/event_trigger.c:1404
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s-ის გამოძახება sql_drop მოვლენის ტრიგერიდან შეგიძლიათ"
 
-#: commands/event_trigger.c:1497 commands/event_trigger.c:1518
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%s-ის გამოძახება table_rewrite მოვლენის ტრიგერიდან შეგიძლიათ"
 
-#: commands/event_trigger.c:1931
+#: commands/event_trigger.c:2063
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s-ის გამოძახება მხოლოდ მოვლენის ტრიგერის ფუნქციიდან შეგიძლიათ"
 
-#: commands/explain_state.c:133 commands/explain_state.c:158
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "\"EXPLAIN\"-ის უცნობი პარამეტრი \"%s\": \"%s\""
-
-#: commands/explain_state.c:165
+#: commands/explain_state.c:133 commands/explain_state.c:158 replication/walsender.c:1151
 #, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "\"EXPLAIN\"-ის უცნობი პარამეტრი \"%s\""
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "უცნობი მნიშვნელობა %s პარამეტრისთვის \"%s\": \"%s\""
 
 #: commands/explain_state.c:174 commands/explain_state.c:186 commands/explain_state.c:192
 #, c-format
@@ -7922,120 +7973,120 @@ msgstr "EXPLAIN -ის პარამეტრს %s ANALYZE სჭირდ
 
 #: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "EXPLAIN-ის პარამეტრები ANALYZE და GENERIC_PLAN ერთად არ შეიძლება, გამოიყენოთ"
+msgid "%s options %s and %s cannot be used together"
+msgstr "%s-ის პარამეტრებს %s და %s ერთად ვერ გამოიყენებთ"
 
-#: commands/extension.c:174 commands/extension.c:3299
+#: commands/extension.c:177 commands/extension.c:3323
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "გაფართოება %s არ არსებობს"
 
-#: commands/extension.c:239 commands/extension.c:248 commands/extension.c:260 commands/extension.c:270
+#: commands/extension.c:242 commands/extension.c:251 commands/extension.c:263 commands/extension.c:273
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "გაფართოების არასწორი სახელი: \"%s\""
 
-#: commands/extension.c:240
+#: commands/extension.c:243
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "გაფართოების სახელები ცარიელი არ უნდა იყოს."
 
-#: commands/extension.c:249
+#: commands/extension.c:252
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "გაფართოების სახელები არ უნდა შეიცავდეს \"---\"."
 
-#: commands/extension.c:261
+#: commands/extension.c:264
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "გაფართოების სახელები არ უნდა დაიწყოს ან დასრულდეს \"-\"."
 
-#: commands/extension.c:271
+#: commands/extension.c:274
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "გაფართოების სახელები არ უნდა შეიცავდეს საქაღალდის გამყოფი სიმბოლოს."
 
-#: commands/extension.c:286 commands/extension.c:295 commands/extension.c:304 commands/extension.c:314
+#: commands/extension.c:289 commands/extension.c:298 commands/extension.c:307 commands/extension.c:317
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "გაფართოების არასწორი ვერსია: \"%s\""
 
-#: commands/extension.c:287
+#: commands/extension.c:290
 #, c-format
 msgid "Version names must not be empty."
 msgstr "ვერსიის სახელები არ უნდა იყოს ცარიელი."
 
-#: commands/extension.c:296
+#: commands/extension.c:299
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "ვერსიის სახელები არ უნდა შეიცავდეს \"---\"."
 
-#: commands/extension.c:305
+#: commands/extension.c:308
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "ვერსიის სახელები არ უნდა დაიწყოს ან დასრულდეს \"-\"."
 
-#: commands/extension.c:315
+#: commands/extension.c:318
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "ვერსიის სახელები არ უნდა შეიცავდეს საქაღალდის გამყოფ სიმბოლოებს."
 
-#: commands/extension.c:549
+#: commands/extension.c:543
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "გაფართოება \"%s\" ხელმიუწვდომელია"
 
-#: commands/extension.c:550
+#: commands/extension.c:544
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "ჯერ გაფართოება უნდა დააყენოთ სისტემაზე, სადაც PostgreSQL-ია გაშვებული."
 
-#: commands/extension.c:564
+#: commands/extension.c:566
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "გაფართოების კონტროლის ფაილის (\"%s\") გახსნის შეცდომა: %m"
 
-#: commands/extension.c:587 commands/extension.c:597
+#: commands/extension.c:589 commands/extension.c:599
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "პარამეტრს \"%s\" მეორადი გაფართოების კონტროლის ფაილში ვერ დააყენებთ"
 
-#: commands/extension.c:619 commands/extension.c:627 commands/extension.c:635 utils/misc/guc.c:3144
+#: commands/extension.c:621 commands/extension.c:629 commands/extension.c:637 utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "პარამეტრს %s ლოგიკური მნიშვნელობა სჭირდება"
 
-#: commands/extension.c:644
+#: commands/extension.c:646
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" კოდირების სწორ სახელს არ წარმოადგენს"
 
-#: commands/extension.c:658 commands/extension.c:673
+#: commands/extension.c:660 commands/extension.c:675
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "პარამეტრი \"%s\" გაფართოებების სახელების სიას უნდა შეიცავდეს"
 
-#: commands/extension.c:680
+#: commands/extension.c:682
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "უცნობი პარამეტრი \"%s\" ფაილში \"%s\""
 
-#: commands/extension.c:689
+#: commands/extension.c:691
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "როცა \"relocatable\" ჭეშმარიტია, პარამეტრს \"schema\" ვერ მიუთითებთ"
 
-#: commands/extension.c:865
+#: commands/extension.c:867
 #, c-format
 msgid "SQL statement \"%.*s\""
 msgstr "SQL ოპერატორი \"%.*s\""
 
-#: commands/extension.c:894
+#: commands/extension.c:896
 #, c-format
 msgid "extension script file \"%s\", near line %d"
 msgstr "გაფართოების სკრიპტის ფაილი \"%s\" ხაზთან %d"
 
-#: commands/extension.c:898
+#: commands/extension.c:900
 #, c-format
 msgid "extension script file \"%s\""
 msgstr "გაფართოების სკრიპტის ფაილი \"%s\""
@@ -8090,7 +8141,7 @@ msgstr "არასწორი სიმბოლო გაფართოე
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "გაფართოებას \"%s\" ვერსიიდან  \"%s\" ვერსიამდე \"%s\" განახლების ბილიკი არ გააჩნია"
 
-#: commands/extension.c:1693 commands/extension.c:3357
+#: commands/extension.c:1693 commands/extension.c:3381
 #, c-format
 msgid "version to install must be specified"
 msgstr "საჭიროა დასაყენებელი ვერსიის მითითება"
@@ -8145,182 +8196,187 @@ msgstr "ჩადგმული CREATE EXTENSION მხარდაუჭერ
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "გაფართოების \"%s\" წაშლა შეუძლებელია, რადგან მიმდინარეობს მისი ჩასწორება"
 
-#: commands/extension.c:2665
+#: commands/extension.c:2689
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s-ის გამოძახება მხოლოდ CREATE EXTENSION-ის მიერ შესრულებულ SQL სკრიპტიდან შეგიძლიათ"
 
-#: commands/extension.c:2677
+#: commands/extension.c:2701
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u ცხრილს არ ეხება"
 
-#: commands/extension.c:2682
+#: commands/extension.c:2706
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "ცხრილი (%s) არ წარმოადგენს იმ გაფართოების წევრს, რომლის შექმნაც მიმდინარეობს"
 
-#: commands/extension.c:3081
+#: commands/extension.c:3105
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "გაფართოების (\"%s\") სქემაში (\"%s\") გადატანა შეუძლებელია იმიტომ, რომ გაფართოება სქემას შეიცავს"
 
-#: commands/extension.c:3122 commands/extension.c:3216
+#: commands/extension.c:3146 commands/extension.c:3240
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "გაფართოებას SET SCHEMA-ის მხარდაჭერა არ გააჩნია: %s"
 
-#: commands/extension.c:3179
+#: commands/extension.c:3203
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "გაფართოება \"%s\"-ის SET SCHEMA შეუძლებელია, რადგან ეს იკრძალება სხვა გაფართოებების მიერ"
 
-#: commands/extension.c:3181
+#: commands/extension.c:3205
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "გაფართოება \"%s\" გაფართოების \"%s\" გადაადგილებას არ მოითხოვს."
 
-#: commands/extension.c:3218
+#: commands/extension.c:3242
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s არ წარმოადგენს გაფართოების სქემას \"%s\""
 
-#: commands/extension.c:3279
+#: commands/extension.c:3303
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "ჩადგმული ALTER EXTENSION მხარდაუჭერელია"
 
-#: commands/extension.c:3368
+#: commands/extension.c:3392
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "გაფართოების %2$s ვერსია %1$s უკვე დაყენებულია"
 
-#: commands/extension.c:3579
+#: commands/extension.c:3603
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "ამ ტიპის ობიექტის გაფართოებაზე დამატება შეუძლებელია"
 
-#: commands/extension.c:3677
+#: commands/extension.c:3701
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "სქემის (\"%s\") გაფართოებაში (\"%s\") ჩამატება შეუძლებელია, რადგან სქემა გაფართოებას შეიცავს"
 
-#: commands/extension.c:3759 commands/typecmds.c:4033 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3783 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "მონაცემების ტიპისთვის %s მრავალდიაპაზონიანი ტიპი ვერ ვიპოვე"
 
-#: commands/extension.c:3801
+#: commands/extension.c:3825
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "%s: ფაილი ძალიან დიდია"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:3918 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "პარამეტრში \"%s\" კომპონენტი აბსოლუტური ბილიკი არაა"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "პარამეტრი \"%s\" არ არსებობს"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "პარამეტრი ერთზე მეტჯერაა მითითებული: \"%s\""
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "გარე მონაცემების გადამტანის მფლობელის შეცვლის წვდომა აკრძალულია : \"%s\""
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "გარე მონაცემების გადამტანის მფლობელის შეცვლას ზემომხმარებლის წვდომები სჭირდება."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "გარე მონაცემების გადამტანის მფლობელი ზემომხმარებელი უნდა იყოს."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "გარე მონაცემების გადამტანი არ არსებობს: %s"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "გარე მონაცემების გადამტანი OID-ით %u არ არსებობს"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "გარე სერვერი OID-ით %u არ არსებობს"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "გარე მონაცემების გადამტანის შექმნის წვდომა აკრძალულია: %s"
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "გარე მონაცემების გადამტანის შესაქმნელად ზემომხმარებელი უნდა ბრძანდებოდეთ."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "გარე მონაცემების გადამტანის შეცვლის წვდომა აკრძალულია: %s"
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "გარე მონაცემების გადამტანის შესაცვლელად ზემომხმარებელი უნდა ბრძანდებოდეთ."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "გარე მონაცემების გადამტანის დამმუშავებლის შეცვლას შეუძლია არსებული გარე ცხრილების ქცევა შეცვალოს"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr ""
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "სერვერი \"%s\" უკვე არსებობს, გამოტოვება"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "მომხმარებლის ბმა %s სერვერისთვის %s უკვე არსებობს. გამოტოვება"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "მომხმარებლის ბმა %s სერვერისთვის %s უკვე არსებობს"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "მომხმარებლის ბმა %s სერვერისთვის %s არ არსებობს"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "მომხმარებლის ბმა %s სერვერისთვის %s არ არსებობს, გამოტოვება"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "გარე-მონაცემების გადამტანს დამმუშავებელი არ გააჩნია: %s"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "გარე მონაცემების გადამტანს IMPORT FOREIGN SCHEMA-ის მხარდაჭერა არ გააჩნია: %s"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "გარე ცხრილის შემოტანა (\"%s\")"
@@ -8683,7 +8739,7 @@ msgstr "ჩადგმული კოდი მითითებული ა
 #: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
-msgstr ""
+msgstr "ენას \"%s\" ხაზშივე კოდის შესრულების მხარდაჭერა არ აქვს"
 
 #: commands/functioncmds.c:2263
 #, c-format
@@ -8827,12 +8883,12 @@ msgstr "ცხრილი (%s) შეიცავს დანაყოფე
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "ფუნქციები ინდექსის პრედიკატში მონიშნეთ, როგორც IMMUTABLE"
 
-#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2714 parser/parse_utilcmd.c:2897
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735 parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "გასაღებში დასახელებული სვეტი არ არსებობს: %s"
 
-#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1967
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "ჩასმულ სვეტებში გამოსახულებები მხარდაჭერილი არაა"
@@ -8867,7 +8923,7 @@ msgstr "ჩასმულ სვეტს NULLS FIRST/LAST მხარდა
 msgid "could not determine which collation to use for index expression"
 msgstr "ინდექსის გამოსახულებისთვის გამოსაყენებელი კოლაციის გამოცნობა შეუძლებელია"
 
-#: commands/indexcmds.c:2097 commands/tablecmds.c:19917 commands/typecmds.c:812 parser/parse_expr.c:2801 parser/parse_type.c:568 parser/parse_utilcmd.c:4043 utils/adt/misc.c:630
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812 parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4064 utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "ტიპს \"%s\" კოლაციების მხარდაჭერა არ გააჩნია"
@@ -8902,7 +8958,7 @@ msgstr "წვდომის მეთოდს \"%s\" ASC/DESC პარამ
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "წვდომის მეთოდს \"%s\" 'NULLS FIRST/LAST' პარამეტრების მხარდაჭერა არ გააჩნია"
 
-#: commands/indexcmds.c:2277 commands/tablecmds.c:19942 commands/tablecmds.c:19948 commands/typecmds.c:2341
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019 commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "მონაცემის ტიპს %s წვდომის მეთოდისთვის \"%s\" ნაგულისხმევი ოპერატორის კლასი არ გააჩნია"
@@ -8917,7 +8973,7 @@ msgstr "აუცილებელია მიუთითოთ ოპერ
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "ოპერატორის კლასი \"%s\" წვდომის მეთოდისთვის \"%s\" არ არსებობს"
 
-#: commands/indexcmds.c:2330 commands/typecmds.c:2329
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "ოპერატორის კლასი \"%s\" მონაცემების ტიპს %s არ იღებს"
@@ -8937,92 +8993,87 @@ msgstr "ვერ აღმოვაჩინე გადაფარვებ
 msgid "could not identify a contained-by operator for type %s"
 msgstr "ტიპისთვის \"%s\" ოპერატორი constained-by ვერ ვიპოვე"
 
-#: commands/indexcmds.c:2472 commands/tablecmds.c:10333
-#, c-format
-msgid "Could not translate compare type %d for operator family \"%s\", input type %s, access method \"%s\"."
-msgstr "ვერ ვთარგმნე შედარების ტიპი %d ოპერატორის ოჯახისთვის \"%s\". შეყვანის ტიპი %s, წვდომის მეთოდი \"%s\"."
-
-#: commands/indexcmds.c:2812
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
 #, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "\"REINDEX\"-ის უცნობი პარამეტრი \"%s\""
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "ვერ ვთარგმნე შედარების ტიპი %d ოპერატორის ოჯახისთვის \"%s\" წვდომის მეთოდის \"%s\"."
 
-#: commands/indexcmds.c:3044
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "ცხრილს \"%s\" არ გააჩნია ინდექსები, რომლების პარალელური რეინდექსიც შესაძლებელია"
 
-#: commands/indexcmds.c:3058
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "ცხრილს \"%s\" რეინდექსისთვის ცხრილები არ არ გააჩნია"
 
-#: commands/indexcmds.c:3105 commands/indexcmds.c:3616 commands/indexcmds.c:3746
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650 commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "სისტემური კატალოგების ერთდროული რეინდექსი შეუძლებელია"
 
-#: commands/indexcmds.c:3129
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "შესაძლებელია მხოლოდ ამჟამად ღია ბაზის რეინდექსი"
 
-#: commands/indexcmds.c:3221
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "სისტემური კატალოგების ერთდროული რეინდექსი შეუძლებელია. ყველას გამოტოვება"
 
-#: commands/indexcmds.c:3254
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "სისტემური დანაყოფების გადაადგილება შეუძლებელია. ყველას გამოტოვება"
 
-#: commands/indexcmds.c:3300
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "დაყოფილი ცხრილის რეინდექსისას: \"%s.%s\""
 
-#: commands/indexcmds.c:3303
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "დაყოფილი ინდექსის რეინდექსისას: \"%s.%s\""
 
-#: commands/indexcmds.c:3496 commands/indexcmds.c:4388
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "\"%s.%s\"-ის რეინდექსი დასრულდა"
 
-#: commands/indexcmds.c:3648 commands/indexcmds.c:3701
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "რეინდექსის გამოტოვება არასწორი ინდექსისთვის \"%s.%s\""
 
-#: commands/indexcmds.c:3651 commands/indexcmds.c:3704
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "გამოიყენეთ DROP INDEX ან REINDEX INDEX."
 
-#: commands/indexcmds.c:3655
+#: commands/indexcmds.c:3689
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "გამორიცხვის შეზღუდვის ინდექსის \"%s.%s\" პარალელური რეინდექსი შეუძლებელია. გამოტოვება"
 
-#: commands/indexcmds.c:3811
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "ამ ტიპის ურთიერთობის პარალელური რეინდექსი შეუძლებელია"
 
-#: commands/indexcmds.c:3829
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "არაგაზიარებული ურთიერთობის ცხრილების სივრცეში \"%s\" გადატანა შეუძლებელია"
 
-#: commands/indexcmds.c:4369 commands/indexcmds.c:4381
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "\"%s.%s\"-ის რეინდექსი დასრულდა"
 
-#: commands/indexcmds.c:4371 commands/indexcmds.c:4390
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -9037,7 +9088,7 @@ msgstr "ურთიერთობის დაბლოკვა (\"%s\") შ
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "CONCURRENTLY-ის გამოყენება შეუძლებელია, როცა მატერიალიზებული ხედი შევსებული არაა"
 
-#: commands/matview.c:214 gram.y:19148
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "პარამეტრები %s და %s შეუთავსებლებია"
@@ -9052,20 +9103,20 @@ msgstr "მატერიალიზებული ხედის (%s) პ
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr ""
 
-#: commands/matview.c:683
+#: commands/matview.c:682
 #, c-format
 msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
 msgstr "ახალი მონაცემები მატერიალიზებულ ხედისთვის \"%s\" დუბლირებულ მწკრივებს შეიცავს, ნულოვანი მწკრივების გარეშე"
 
-#: commands/matview.c:685
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "მწკრივი: %s"
 
-#: commands/matview.c:839
+#: commands/matview.c:838
 #, c-format
-msgid "could not find suitable unique index on materialized view"
-msgstr "მატერიალიზებულ ხედზე შესაბამისი უნიკალური ინდექსი ვერ ვიპოვე"
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "მატერიალიზებულ ხედზე \"%s\" შესაბამისი უნიკალური ინდექსი ვერ ვიპოვე"
 
 #: commands/opclasscmds.c:124
 #, c-format
@@ -9367,7 +9418,7 @@ msgstr "ოპერატორის ატრიბუტის შეცვ
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "ოპერატორის ატრიბუტს \"%s\", თუ ის უკვე დაყენებულია, ვერ შეცვლით"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146 commands/tablecmds.c:1800 commands/tablecmds.c:2400 commands/tablecmds.c:3824 commands/tablecmds.c:6793 commands/tablecmds.c:10089 commands/tablecmds.c:19498 commands/tablecmds.c:19533 commands/trigger.c:318 commands/trigger.c:1337 commands/trigger.c:1447 rewrite/rewriteDefine.c:268 rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152 commands/tablecmds.c:1800 commands/tablecmds.c:2400 commands/tablecmds.c:3824 commands/tablecmds.c:6793 commands/tablecmds.c:10114 commands/tablecmds.c:19565 commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338 commands/trigger.c:1448 rewrite/rewriteDefine.c:268 rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "წვდომა აკრძალულია: '%s\" სისტემური კატალოგია"
@@ -9407,7 +9458,7 @@ msgstr "წესი \"%s\" ცხრილისთვის \"%s\" არ ა
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "\"SELECT\" და DELETE-სთვის მხოლოდ USING გამოსახულებაა ნებადართული"
 
-#: commands/portalcmds.c:63 commands/portalcmds.c:192 commands/portalcmds.c:243
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "კურსორის არასწორი სახელი. ცარიელი არ უნდა იყოს"
@@ -9417,7 +9468,7 @@ msgstr "კურსორის არასწორი სახელი. 
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "უსაფრთხოებაზე-შეზღუდული ოპერაციის შიგნით კურსორს WITH HOLD ვერ შექმნით"
 
-#: commands/portalcmds.c:200 commands/portalcmds.c:253 executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252 executor/execCurrent.c:70 utils/adt/xml.c:2938 utils/adt/xml.c:3108
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "კურსორი \"%s\" არ არსებობს"
@@ -9427,32 +9478,32 @@ msgstr "კურსორი \"%s\" არ არსებობს"
 msgid "invalid statement name: must not be empty"
 msgstr "ოეპრატორის არასწორი სახელი: ცარიელი არ უნდა იყოს"
 
-#: commands/prepare.c:231 commands/prepare.c:236
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "მომზადებული ოპერატორი SELECT არაა"
 
-#: commands/prepare.c:296
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "პარამეტრების არასწორი რაოდენობა მომზადებული გამოსახულებისთვის \"%s\""
 
-#: commands/prepare.c:298
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "მოსალოდნელი %d პარამეტრის მაგიერ მივიღე %d."
 
-#: commands/prepare.c:331
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr ""
 
-#: commands/prepare.c:415
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "მომზადებული ოპერატორი \"%s\" უკვე არსებობს"
 
-#: commands/prepare.c:454
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "მომზადებული ოპერატორი \"%s\" არ არსებობს"
@@ -9462,204 +9513,209 @@ msgstr "მომზადებული ოპერატორი \"%s\" ა
 msgid "must be superuser to create custom procedural language"
 msgstr "პროცედურული ენის ხელით მისათითებლად ზემომხმარებლის პრივილეგიებია საჭირო"
 
-#: commands/publicationcmds.c:130 libpq/auth-oauth.c:850 postmaster/postmaster.c:1130 postmaster/postmaster.c:1232 utils/init/miscinit.c:1870
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850 postmaster/postmaster.c:1130 postmaster/postmaster.c:1232 utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "არასწორი სიის სინტაქსი პარამეტრში \"%s\""
 
-#: commands/publicationcmds.c:149
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "პუბლიკაციის პარამეტრის (\"%s\") უცნობი მნიშვნელობა: \"%s\""
 
-#: commands/publicationcmds.c:170
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "პუბლიკაციის უცნობი პარამეტრი: \"%s\""
 
-#: commands/publicationcmds.c:211
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "'CURRENT_SCHEMA'-სთვის სქემა არჩეული არაა"
 
-#: commands/publicationcmds.c:592
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "სისტემური სვეტები დაუშვებელია."
 
-#: commands/publicationcmds.c:599 commands/publicationcmds.c:604 commands/publicationcmds.c:621
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609 commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "მომხმარებლის მიერ აღწერილი ოპერატორები დაშვებული არაა."
 
-#: commands/publicationcmds.c:645
+#: commands/publicationcmds.c:650
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "დაშვებულია მხოლოდ სვეტები, მუდმივები, ჩაშენებული ოპერატორები, ჩაშენებული მონაცემის ტიპები, ჩაშენებული კოლაციები და არადადუმებადი ჩაშენებული ფუნქციები."
 
-#: commands/publicationcmds.c:657
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "მომხმარებლის მიერ განსაზღვრული ტიპები დაშვებული არაა."
 
-#: commands/publicationcmds.c:660
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "მომხმარებლის-მიერ-აღწერილი ან ჩაშენებული დადუმებადი ფუნქციები დაშვებული არაა."
 
-#: commands/publicationcmds.c:663
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
 msgstr "მომხმარებლის მიერ განსაზღვრული კოლაციები დაუშვებელია."
 
-#: commands/publicationcmds.c:673
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "პუბლიკაციის არასწორი WHERE გამოსახულება"
 
-#: commands/publicationcmds.c:726
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "ურთიერთობისთვის \"%s\"გამოცემის პირობას WHERE ვერ გამოიყენებთ"
 
-#: commands/publicationcmds.c:728
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "დაყოფილ ცხრილზე პირობის WHERE გამოყენება შეუძლებელია, როცა %s ჭეშმარიტი არაა."
 
-#: commands/publicationcmds.c:801 commands/publicationcmds.c:815
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "შეუძლებელია სვეტების სიის გამოყენება ურთიერთობისთვის \"%s.%s\" პუბლიკაციაში \"%s\""
 
-#: commands/publicationcmds.c:804
+#: commands/publicationcmds.c:809
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "გამოცემებში რომლებიც ელემენტებს FOR TABLES IN SCHEMA შეიცავენ, სვეტების სიას ვერ მიუთითებთ."
 
-#: commands/publicationcmds.c:818
+#: commands/publicationcmds.c:823
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "სვეტების სია შეუძლებელია მიუთითოთ დაყოფილ ცხრილს, როცა %s false-ა."
 
-#: commands/publicationcmds.c:855
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "'FOR ALL TABLES' პუბლიკაციის შექმნისთვის ზემომხმარებლის უფლებები აუცილებელია"
 
-#: commands/publicationcmds.c:930
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "\"FOR TABLES IN SCHEMA\" პუბლიკაციის შესაქმნელად ზემომხმარებელი უნდა ბრძანდებოდეთ"
 
-#: commands/publicationcmds.c:966
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "\"wal_level\" არასაკმარისია ლოგიკური ცვლილებების გამოსაქვეყნებლად"
 
-#: commands/publicationcmds.c:967
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "გამოწერების შექმნამდე საჭიროა \"wal_level\" -ის \"logical\" (ლოგიკურზე) დაყენება."
 
-#: commands/publicationcmds.c:1067 commands/publicationcmds.c:1075
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "პარამეტრის (\"%s\") false-ზე დაყენება პუბლიკაციისთვის \"%s\" შეუძლებელია"
 
-#: commands/publicationcmds.c:1070
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "გამოცემა შეიცავს პირობას WHERE დაყოფილი ცხრილისთვის \"%s\", რაც, მაშინ, როცა \"%s\" ჭეშმარიტი არა, დაშვებული არაა."
 
-#: commands/publicationcmds.c:1078
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "გამოცემა შეიცავს სვეტების სიას დაყოფილი ცხრილისთვის \"%s\", რაც მაშინ, როცა \"%s\" ჭეშმარიტი არაა, დაუშვებელია."
 
-#: commands/publicationcmds.c:1399
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "პუბლიკაციისთვის (%s) სქემის დამატება შეუძლებელია"
 
-#: commands/publicationcmds.c:1401
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "სქემების დამატება შეუძლებელია, თუ ნებისმიერი ცხრილი, რომელიც შეიცავს სვეტების სიას, რომელიც უკვე გამოცემის ნაწილია."
 
-#: commands/publicationcmds.c:1449
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "სქემის დამატების ან დაყენებისთვის ზემომხმარებლის უფლებებია საჭირო"
 
-#: commands/publicationcmds.c:1458 commands/publicationcmds.c:1466
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "პუბლიკაცია %s აღწერილია, როგორც FOR ALL TABLES"
 
-#: commands/publicationcmds.c:1460
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "სქემების FOR ALL TABLES გამოცემებიდან წაშლა ან მასში ჩამატება შეუძლებელია."
 
-#: commands/publicationcmds.c:1468
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "FOR ALL TABLES გამოცემებში ცხრილების ჩამატება ან მათი წაშლა შეუძლებელია."
 
-#: commands/publicationcmds.c:1492 commands/publicationcmds.c:1531 commands/publicationcmds.c:2068 utils/cache/lsyscache.c:3774
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536 commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "პუბლიკაცია \"%s\" არ არსებობს"
 
-#: commands/publicationcmds.c:1694 commands/publicationcmds.c:1757
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "კონფლიქტური ან ზედმეტი WHERE პირობები ცხრილისთვის \"%s\""
 
-#: commands/publicationcmds.c:1701 commands/publicationcmds.c:1769
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "კონფლიქტური ან ზედმეტი სვეტის სიები ცხრილისთვის \"%s\""
 
-#: commands/publicationcmds.c:1903
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "column list must not be specified in ALTER PUBLICATION ... DROP"
 
-#: commands/publicationcmds.c:1915
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "ურთიერთობა (%s) პუბლიკაციის ნაწილს არ წარმოადგენს"
 
-#: commands/publicationcmds.c:1922
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "გამოცემის ცხრილიდან წაშლისას პირობას WHERE ვერ გამოიყენებთ"
 
-#: commands/publicationcmds.c:1982
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "ცხრილი სქემიდან \"%s\" პუბლიკაციის ნაწილს არ წარმოადგენს"
 
-#: commands/publicationcmds.c:2025 commands/publicationcmds.c:2032
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "პუბლიკაციის (%s) მფლობელის შეცვლის წვდომა აკრძალულია"
 
-#: commands/publicationcmds.c:2027
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "FOR ALL TABLES გამოცემის მფლობელი ზემომხმარებელი უნდა იყოს."
 
-#: commands/publicationcmds.c:2034
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "FOR TABLES IN SCHEMA პუბლიკაციის მფლობელი ზემომხმარებელი უნდა იყოს."
 
-#: commands/publicationcmds.c:2100
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "პუბლიკაცია OID-ით %u არ არსებობს"
 
-#: commands/publicationcmds.c:2133
+#: commands/publicationcmds.c:2138
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "არასწორი მნიშვნელობა გამოცემის პარამეტრისთვის \"%s\": \"%s\""
+
+#: commands/publicationcmds.c:2139
 #, c-format
-msgid "%s requires a \"none\" or \"stored\" value"
-msgstr "%s მოითხოვს მნიშვნელობას \"none' ან \"stored\""
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "სწორი მნიშვნელობებია \"%s\" და \"%s\"."
 
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
@@ -9816,12 +9872,12 @@ msgstr "მიმდევრობას იგივე სქემა უნ
 msgid "cannot change ownership of identity sequence"
 msgstr "იდენტიფიკაციის მიმდევრობის მფლობელის შეცვლა შეუძლებელია"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:16069 commands/tablecmds.c:18907
+#: commands/sequence.c:1671 commands/tablecmds.c:16136 commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "მიმდევრობა %s მიბმულია ცხრილზე \"%s\"."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1886
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "'CREATE STATISTICS'-ში მხოლოდ ერთი ურთიერთობაა დაშვებული"
@@ -9831,82 +9887,82 @@ msgstr "'CREATE STATISTICS'-ში მხოლოდ ერთი ურთი
 msgid "cannot define statistics for relation \"%s\""
 msgstr "სტატისტიკის აღწერა ურთიერთობისთვის %s შეუძლებელია"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "სტატისტიკის ობიექტის %s უკვე არსებობს. გამოტოვება"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "სტატისტიკის ობიექტი უკვე არსებობს: %s"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "სტატისტიკაში %d-ზე მეტი სვეტი ვერ გექნებათ"
 
-#: commands/statscmds.c:247 commands/statscmds.c:276 commands/statscmds.c:316
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "სისტემურ სვეტებზე სტატისტიკის შექმნა შეუძლებელია"
 
-#: commands/statscmds.c:253 commands/statscmds.c:282 commands/statscmds.c:322
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
 #, c-format
 msgid "statistics creation on virtual generated columns is not supported"
 msgstr "ვირტუალურ გენერირებულ სვეტებზე სტატისტიკის შექმნა მხარდაჭერილი არაა"
 
-#: commands/statscmds.c:260 commands/statscmds.c:289
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "სვეტს \"%s\" სტატისტიკაში ვერ გამოიყენებთ, რადგან მის ტიპს (\"%s\") ნაგულისხმევი ორობითი ხის ოპერატორის კლასი არ გააჩნია"
 
-#: commands/statscmds.c:339
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr ""
 
-#: commands/statscmds.c:360
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "როცა სტატისტიკის აგება ერთ გამოსახულებაზე მიმდინარეობს, სტატისტიკის ტიპის მითითება შეუძლებელია"
 
-#: commands/statscmds.c:389
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "სტატისტიკის უცნობი ტიპი: \"%s\""
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "გაფართოებულ სტატისტიკას მინიმუმ 2 სვეტი სჭირდება"
 
-#: commands/statscmds.c:436
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "სვეტის დუბლირებული სახელი სტატისტიკის აღწერაში"
 
-#: commands/statscmds.c:471
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "დუბლირებული გამოსახულება სტატისტიკის აღწერაში"
 
-#: commands/statscmds.c:646 commands/tablecmds.c:8914
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "სტატისტიკის სამიზნე %d ძალიან დაბალია"
 
-#: commands/statscmds.c:654 commands/tablecmds.c:8922
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "სტატისტიკის სამიზნის ჩამოწევა %d-მდე"
 
-#: commands/statscmds.c:678
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "სტატისტიკის ობიექტი \"%s.%s\" არ არსებობს, გამოტოვება"
 
-#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:410
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "\"origin\"-ის უცნობი მნიშვნელობა: \"%s\""
@@ -9985,7 +10041,7 @@ msgstr "ჩართული გამოწერისთვის პარ
 msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
 msgstr "გამოწერებისთვის, რომლებსაც სლოტის სახელი არ აქვთ, პარამეტრს %s ვერ დავაყენებ"
 
-#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1663 commands/subscriptioncmds.c:2044 utils/cache/lsyscache.c:3824
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665 commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "გამოწერა \"%s\" არ არსებობს"
@@ -9997,13 +10053,13 @@ msgstr "ჩართული გამოწერისთვის %s-ის
 
 #: commands/subscriptioncmds.c:1270
 #, c-format
-msgid "slot_name and two_phase cannot be altered at the same time"
-msgstr "slot_name და two_phase ერთდროულად ვერ შეიცვლება"
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "\"slot_name\" და \"two_phase\" ერთდროულად ვერ შეიცვლება"
 
 #: commands/subscriptioncmds.c:1286
 #, c-format
-msgid "cannot alter two_phase when logical replication worker is still running"
-msgstr "two_phase-ის შეცვლა შეუძლებელია, როცა ლოგიკური რეპლიკაციის დამხმარე პროცესი ჯერ კიდევ გაშვებულია"
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "\"two_phase\"-ის შეცვლა შეუძლებელია, როცა ლოგიკური რეპლიკაციის დამხმარე პროცესი ჯერ კიდევ გაშვებულია"
 
 #: commands/subscriptioncmds.c:1287
 #, c-format
@@ -10012,8 +10068,8 @@ msgstr "სცადეთ კიდევ ერთხელ რაღაც 
 
 #: commands/subscriptioncmds.c:1300
 #, c-format
-msgid "cannot disable two_phase when prepared transactions are present"
-msgstr ""
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "ვერ გამოვრთავ \"two_phase\"-ს, როცა არსებობს მომზადებული ტრანზაქციები"
 
 #: commands/subscriptioncmds.c:1301
 #, c-format
@@ -10071,85 +10127,85 @@ msgstr "გამოიყენეთ ALTER SUBSCRIPTION ... REFRESH 'copy_data
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "გამოტოვება WAL-ის მდებარეობა (LSN %X/%X) საწყის LSN-ზე %X/%X დიდი უნდა იყოს"
 
-#: commands/subscriptioncmds.c:1667
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "გამოწერა \"%s\" არ არსებობს. გამოტოვება"
 
-#: commands/subscriptioncmds.c:1934
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "გამომცემელზე რეპლიკაციის სეტი \"%s\" წაშლილია"
 
-#: commands/subscriptioncmds.c:1943 commands/subscriptioncmds.c:1951
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "შეუძლებელია რეპლიკაციის სლოტის \"%s\" წაშლა გამომცემელზე: %s"
 
-#: commands/subscriptioncmds.c:2076
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "გამოწერა OID-ით %u არ არსებობს"
 
-#: commands/subscriptioncmds.c:2150 commands/subscriptioncmds.c:2274
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "შეცდომა რეპლიცირებული ცხრილების სიის მიგება გამომცემლისგან: %s"
 
-#: commands/subscriptioncmds.c:2186
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr ""
 
-#: commands/subscriptioncmds.c:2188
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: commands/subscriptioncmds.c:2191
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr ""
 
-#: commands/subscriptioncmds.c:2296 replication/logical/tablesync.c:904 replication/pgoutput/pgoutput.c:1162
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933 replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr ""
 
-#: commands/subscriptioncmds.c:2346
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "რეპლიკაციის სლოტის \"%s\" წაშლის მცდელობისას გამომცემელთან მიერთება შეუძლებელია: %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2349
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "გამოწერის გასათიშად გამოიყენეთ %s, შემდეგ კი, სლოტთან ასოცირების მოსახსნელად, %s გამოიყენეთ."
 
-#: commands/subscriptioncmds.c:2380
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "პუბლიკაციის სახელი \"%s\" ერთზე მეტჯერ გამოიყენება"
 
-#: commands/subscriptioncmds.c:2424
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "პუბლიკაცია \"%s\" უკვე \"%s\" გამოწერაშია"
 
-#: commands/subscriptioncmds.c:2438
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "პუბლიკაცია \"%s\" \"%s\" გამოწერაში არაა"
 
-#: commands/subscriptioncmds.c:2449
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "გამოწერიდან ყველა პუბლიკაციას ვერ წაშლით"
 
-#: commands/subscriptioncmds.c:2506
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s -ს ლოგიკური მნიშვნელობა უნდა ჰქონდეს, ან \"parallel\""
@@ -10210,7 +10266,7 @@ msgstr "მატერიალიზებული ხედი \"%s\" არ
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "მატერიალიზებული ხედის წასაშლელად გამოიყენეთ DROP MATERIALIZED VIEW."
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21562 parser/parse_utilcmd.c:2407
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651 parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "ინდექსი \"%s\" არ არსებობს"
@@ -10233,7 +10289,7 @@ msgstr "\"%s\" ტიპი არაა"
 msgid "Use DROP TYPE to remove a type."
 msgstr "ტიპის წასაშლელად გამოიყენეთ DROP TYPE."
 
-#: commands/tablecmds.c:294 commands/tablecmds.c:15908 commands/tablecmds.c:18609
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975 commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "გარე ცხრილი \"%s\" არ არსებობს"
@@ -10262,7 +10318,7 @@ msgstr "დაყოფილი ცხრილების ჟურნალ
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "უსაფრთხოებაზე-შეზღუდული ოპერაციის შიგნით დროებითი ცხრილის შექმნა შეუძლებელია"
 
-#: commands/tablecmds.c:875 commands/tablecmds.c:17333
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "ურთიერთობა \"%s\" მემკვირდრეობით ერზე მეტჯერ იქნებოდა მიღებული"
@@ -10287,7 +10343,7 @@ msgstr "დაყოფილი ცხრილის (%s) გარე და
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "ცხრილი %s შეიცავს სვეტებს, რომლებიც უნიკალურია."
 
-#: commands/tablecmds.c:1415 commands/tablecmds.c:14908
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "მასივის მეტისმეტად ბევრი განზომილება"
@@ -10337,7 +10393,7 @@ msgstr "გარე ცხრილის (\"%s\") მოკვეთის შ
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "სხვა სესიების დროებითი ცხრილების მოკვეთის შეცდომა"
 
-#: commands/tablecmds.c:2675 commands/tablecmds.c:17230
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "დაყოფილი ცხრილიდან \"%s\" მემკვიდრეობის მიღება შეუძლებელია"
@@ -10347,7 +10403,7 @@ msgstr "დაყოფილი ცხრილიდან \"%s\" მემკ
 msgid "cannot inherit from partition \"%s\""
 msgstr "დანაყოფიდან \"%s\" მემკვიდრეობის მიღება შეუძლებელია"
 
-#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2678 parser/parse_utilcmd.c:2866
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699 parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "მემკვიდრეობით მიღებული ურთიერთობა \"%s\" ცხრილს ან გარე ცხრილს არ წარმოადგენს"
@@ -10357,27 +10413,27 @@ msgstr "მემკვიდრეობით მიღებული ურ
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "შეუძლებელია შექმნათ დროებით ურთიერთობა, რომელიც მუდმივი ურთიერთობის \"%s\" დანაყოფი იქნება"
 
-#: commands/tablecmds.c:2709 commands/tablecmds.c:17209
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "დროებითი ურთიერთობიდან (%s) მემკვიდრეობითობა შეუძლებელია"
 
-#: commands/tablecmds.c:2719 commands/tablecmds.c:17217
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "სხვა სესიის დროებითი ურთიერთობიდან მემკვიდრეობითობა შეუძლებელია"
 
-#: commands/tablecmds.c:2874 commands/tablecmds.c:2928 commands/tablecmds.c:14591 parser/parse_utilcmd.c:1418 parser/parse_utilcmd.c:1463 parser/parse_utilcmd.c:1895 parser/parse_utilcmd.c:2003
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928 commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440 parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916 parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr ""
 
-#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1419
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr ""
 
-#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1464
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr ""
@@ -10402,12 +10458,12 @@ msgstr "შვილი სვეტისთვის \"%s\" მითითე
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "შვილი ცხრილის სვეტი არ შეიძლება, გენერირებული იყოს, თუ მისი მშობელიც არაა."
 
-#: commands/tablecmds.c:3072 commands/tablecmds.c:3366 commands/tablecmds.c:17495
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366 commands/tablecmds.c:17562
 #, c-format
 msgid "column \"%s\" inherits from generated column of different kind"
 msgstr "ცხრილი \"%s\" მემკვიდრეობით იღებს სხვა ტიპის გენერირებული სვეტიდან"
 
-#: commands/tablecmds.c:3074 commands/tablecmds.c:3368 commands/tablecmds.c:17496
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368 commands/tablecmds.c:17563
 #, c-format
 msgid "Parent column is %s, child column is %s."
 msgstr "მშობელი სვეტია %s, შვილი სვეტია %s."
@@ -10467,7 +10523,7 @@ msgstr "%s-ი %s-ის წინააღმდეგ"
 msgid "column \"%s\" has a collation conflict"
 msgstr "კოლაციის კონფლიქტი სვეტში \"%s\""
 
-#: commands/tablecmds.c:3282 commands/tablecmds.c:3448 commands/tablecmds.c:7277
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448 commands/tablecmds.c:7277 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "'%s\" -ი \"%s\"-ის წინააღმდეგ"
@@ -10670,12 +10726,12 @@ msgstr "ტიპიზირებულ ცხრილში სვეტე
 msgid "cannot add column to a partition"
 msgstr "დანაყოფს სვეტს ვერ დაუმატებთ"
 
-#: commands/tablecmds.c:7269 commands/tablecmds.c:17451
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "შვილ ცხრილს \"%s\" სვეტისთვის \"%s\" სხვა ტიპი გააჩნია"
 
-#: commands/tablecmds.c:7275 commands/tablecmds.c:17457
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "შვილ ცხრილს \"%s\" სვეტისთვის \"%s\" სხვა კოლაცია გააჩნია"
@@ -10705,12 +10761,12 @@ msgstr "ურთიერთობის (%2$s) სვეტი %1$s უკვ
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "ურთიერთობის (%2$s) სვეტი %1$s უკვე რსებობს"
 
-#: commands/tablecmds.c:7769 commands/tablecmds.c:7936 commands/tablecmds.c:8137 commands/tablecmds.c:8268 commands/tablecmds.c:8397 commands/tablecmds.c:8491 commands/tablecmds.c:8594 commands/tablecmds.c:8790 commands/tablecmds.c:8956 commands/tablecmds.c:9047 commands/tablecmds.c:9181 commands/tablecmds.c:14366 commands/tablecmds.c:15931 commands/tablecmds.c:18698
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936 commands/tablecmds.c:8137 commands/tablecmds.c:8268 commands/tablecmds.c:8422 commands/tablecmds.c:8516 commands/tablecmds.c:8619 commands/tablecmds.c:8815 commands/tablecmds.c:8981 commands/tablecmds.c:9072 commands/tablecmds.c:9206 commands/tablecmds.c:14407 commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "სისტემური სვეტის \"%s\" შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:7775 commands/tablecmds.c:8143 commands/tablecmds.c:14127
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143 commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" იდენტიფიკატორი სვეტია"
@@ -10720,12 +10776,12 @@ msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" ი
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "სვეტი \"%s\" მშობელ ცხრილში NOT NULL-ით დანიშნული არაა"
 
-#: commands/tablecmds.c:8014 commands/tablecmds.c:9988
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "შეზღუდვა შვილ ცხრილებსაც უნდა დაემატოთ"
 
-#: commands/tablecmds.c:8015 commands/tablecmds.c:8246 commands/tablecmds.c:8353 commands/tablecmds.c:8470 commands/tablecmds.c:9354 commands/tablecmds.c:12190
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246 commands/tablecmds.c:8378 commands/tablecmds.c:8495 commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
 msgid "Do not specify the ONLY keyword."
 msgstr "ONLY არ მიუთითოთ."
@@ -10750,1004 +10806,1004 @@ msgstr "დანაყოფს სვეტს იდენტიფიკა
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" უნდა აღწეროთ როგორც NOT NULL მანამდე, სანამ იდენტიფიკაციას დაამატებთ"
 
-#: commands/tablecmds.c:8285
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" უკვე იდენტიფიკატორი სვეტია"
 
-#: commands/tablecmds.c:8291
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "ურთიერთობის \"%2$s\" სვეტს \"%1$s\" ნაგულისხმევი მნიშვნელობა უკვე გააჩნია"
 
-#: commands/tablecmds.c:8352
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "მხოლოდ, დაყოფილი ცხრილის იდენტიფიკაციის სვეტს ვერ შეცვლით"
 
-#: commands/tablecmds.c:8358
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "დანაყოფის იდენტიფიკაციის სვეტს ვერ შეცვლით"
 
-#: commands/tablecmds.c:8403 commands/tablecmds.c:8499
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" იდენტიფიკატორი სვეტი არაა"
 
-#: commands/tablecmds.c:8469
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "მხოლოდ, დაყოფილი ცხრილში სვეტიდან იდენტიფიკაციას ვერ წაშლით"
 
-#: commands/tablecmds.c:8475
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "დანაყოფს სვეტიდან იდენტიფიკატორს ვერ წაშლით"
 
-#: commands/tablecmds.c:8504
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" იდენტიფიკატორი სვეტი არაა. გამოტოვება"
 
-#: commands/tablecmds.c:8601 commands/tablecmds.c:8811
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" გენერირებული სვეტი არაა"
 
-#: commands/tablecmds.c:8612
+#: commands/tablecmds.c:8637
 #, c-format
-msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns on tables with check constraints"
-msgstr "ALTER TABLE / SET EXPRESSION მხარდაჭერილი არაა შემოწმების შეზღუდვების მქონე ვირტუალური გენერირებული სვეტებისთვის"
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
+msgstr "ALTER TABLE / SET EXPRESSION მხარდაჭერილი არაა ვირტუალური გენერირებული სვეტებისთვის შეზღუდვების შემოწმების მქონე ცხრილებში"
 
-#: commands/tablecmds.c:8613 commands/tablecmds.c:8631 commands/tablecmds.c:8803
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656 commands/tablecmds.c:8828
 #, c-format
 msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" ვირტუალური გენერირებული სვეტია."
 
-#: commands/tablecmds.c:8630
+#: commands/tablecmds.c:8655
 #, c-format
-msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns on tables that are part of a publication"
-msgstr "ALTER TABLE / SET EXPRESSION მხარდაჭერილი არაა ვირტუალურ გენერირებულ სვეტებზე ცხრილებზე, რომლებიც გამოცემის ნაწილი არიან"
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
+msgstr "ALTER TABLE / SET EXPRESSION მხარდაჭერილი არაა ვირტუალურ გენერირებულ სვეტებზე ცხრილებში, რომლებიც გამოცემის ნაწილი არიან"
 
-#: commands/tablecmds.c:8737
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION შვილ ცხრილებზეც უნდა გადატარდეს"
 
-#: commands/tablecmds.c:8759
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "მემკვიდრეობითი სვეტიდან გენერაციის გამოსახულების წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:8802
+#: commands/tablecmds.c:8827
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
 msgstr "ALTER TABLE / DROP EXPRESSION ვირტუალურ გენერირებულ სვეტებზე მხარდაჭერილი არაა"
 
-#: commands/tablecmds.c:8816
+#: commands/tablecmds.c:8841
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" გენერირებული სვეტი არაა. გამოტოვება"
 
-#: commands/tablecmds.c:8894
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "არა-ინდექსი სვეტის ნომრით მიმართვა შეუძლებელია"
 
-#: commands/tablecmds.c:8946
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "ურთიერთობის (%2$s) სვეტი (%1$d) არ არსებობს"
 
-#: commands/tablecmds.c:8966
+#: commands/tablecmds.c:8991
 #, c-format
 msgid "cannot alter statistics on virtual generated column \"%s\""
 msgstr "შეუძლებელია სტატისტიკის შეცვლა ვირტუალურ გენერირებულ სვეტზე \"%s\""
 
-#: commands/tablecmds.c:8975
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "ინდექსის \"%2$s\" ჩასმული სვეტის \"%1$s\" სტატისტიკის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:8980
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:8982
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "ამის ნაცვლად ცხრილის სვეტის სტატისტიკა შეცვალეთ."
 
-#: commands/tablecmds.c:9228
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "ტიპიზირებული ცხრილის სვეტის წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:9292
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "სვეტი \"%s\" ურთიერთობაში \"%s\" არ არსებობს. გამოტოვება"
 
-#: commands/tablecmds.c:9305
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "სისტემური სვეტის \"%s\" წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:9315
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "მემკვიდრეობით მიღებული სვეტის \"%s\" წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:9328
+#: commands/tablecmds.c:9353
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:9353
+#: commands/tablecmds.c:9378
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr ""
 
-#: commands/tablecmds.c:9518
+#: commands/tablecmds.c:9543
 #, c-format
 msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
 msgstr "ცხრილის \"%2$s\" სვეტი \"%1$s\" არაა დანიშნული, როგორც NOT NULL"
 
-#: commands/tablecmds.c:9554 commands/tablecmds.c:9566
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
 #, c-format
 msgid "cannot create primary key on column \"%s\""
 msgstr "ძირითადი გასაღების შექმნა სვეტზე \"%s\" შეუძლებელია"
 
 #. translator: fourth %s is a constraint characteristic such as NOT VALID
-#: commands/tablecmds.c:9556 commands/tablecmds.c:9568
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
 #, c-format
 msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
 msgstr ""
 
-#: commands/tablecmds.c:9692
+#: commands/tablecmds.c:9717
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX დაყოფილ ცხრილებზე მხარდაუჭერელია"
 
-#: commands/tablecmds.c:9717
+#: commands/tablecmds.c:9742
 #, 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:10075
+#: commands/tablecmds.c:10100
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:10083 commands/tablecmds.c:10710
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "მითითებული ურთიერთობა \"%s\" ცხრილი არაა"
 
-#: commands/tablecmds.c:10106
+#: commands/tablecmds.c:10131
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "მუდმივ ცხრილებზე არსებული შეზღუდვები მხოლოდ მუდმივ ცხრილებზე შეიძლება, მიუთითებდეს"
 
-#: commands/tablecmds.c:10113
+#: commands/tablecmds.c:10138
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "ჟურნალის გარეშე მყოფი ცხრილების შეზღუდვები მხოლოდ მუდმივ ან ჟურნალის გარეშე მყოფ ცხრილებზე შეიძლება, მიუთითებდეს"
 
-#: commands/tablecmds.c:10119
+#: commands/tablecmds.c:10144
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "დროებით ცხრილებზე არსებული შეზღუდვები მხოლოდ დროებით ცხრილებზე შეიძლება, მიუთითებდეს"
 
-#: commands/tablecmds.c:10123
+#: commands/tablecmds.c:10148
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "დროებითი ცხრილის შეზღუდვები მიმდინარე სესიის დროებით ცხრილებს უნდა მიმართავდეს"
 
-#: commands/tablecmds.c:10138 commands/tablecmds.c:10166
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
 #, c-format
 msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
 msgstr ""
 
-#: commands/tablecmds.c:10178
+#: commands/tablecmds.c:10203
 #, c-format
 msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
 msgstr ""
 
-#: commands/tablecmds.c:10192
+#: commands/tablecmds.c:10217
 #, c-format
-msgid "foreign key must use PERIOD when referencing a primary using WITHOUT OVERLAPS"
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
 msgstr ""
 
-#: commands/tablecmds.c:10216 commands/tablecmds.c:10222
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "არასწორი ქმედება %s გარე გასაღების შეზღუდვის შემცველი გენერირებული სვეტისთვის"
 
-#: commands/tablecmds.c:10237
+#: commands/tablecmds.c:10262
 #, c-format
 msgid "foreign key constraints on virtual generated columns are not supported"
 msgstr "ვირტუალურ გენერირებულ სვეტებზე გარე გასაღების შეზღუდვები მხარდაჭერილი არაა"
 
-#: commands/tablecmds.c:10251 commands/tablecmds.c:10260
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
 #, c-format
 msgid "unsupported %s action for foreign key constraint using PERIOD"
 msgstr "მხარდაუჭერელი %s ქმედება გარე გასაღების შეზღუდვისთვის, რომელიც PERIOD-ს იყენებს"
 
-#: commands/tablecmds.c:10275
+#: commands/tablecmds.c:10300
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:10331
+#: commands/tablecmds.c:10356
 #, c-format
 msgid "could not identify an overlaps operator for foreign key"
 msgstr "ვერ აღმოვაჩინე გადაფარვების ოპერატორი გარე გასაღებისთვის"
 
-#: commands/tablecmds.c:10332
+#: commands/tablecmds.c:10357
 #, c-format
 msgid "could not identify an equality operator for foreign key"
 msgstr "გარე გასაღებისთვის ტოლობის ოპერატორი ვერ ვიპოვე"
 
-#: commands/tablecmds.c:10397 commands/tablecmds.c:10431
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "გარე გასაღების შეზღუდვის \"%s\" განხორციელება შეუძლებელია"
 
-#: commands/tablecmds.c:10399
+#: commands/tablecmds.c:10424
 #, c-format
 msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
 msgstr "მიმმართველი ცხრილის გასაღების სვეტები \"%s\" და მიმართვადი ცხრილის გასაღების სვეტები \"%s\" შეუთავსებელი ტიპისაა: %s და %s."
 
-#: commands/tablecmds.c:10432
+#: commands/tablecmds.c:10457
 #, c-format
 msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
 msgstr ""
 
-#: commands/tablecmds.c:10638
+#: commands/tablecmds.c:10663
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr ""
 
-#: commands/tablecmds.c:11020 commands/tablecmds.c:11466 parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480 parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "გარე გასაღების შეზღუდვები გარე ცხრილებზე მხარდაჭერილი არაა"
 
-#: commands/tablecmds.c:11449
+#: commands/tablecmds.c:11463
 #, c-format
 msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
 msgstr "ცხრილს \"%s\" ვერ მივამაგრებ დანაყოფს, რომელსაც მიმართავს გარე გარე გასაღები \"%s\""
 
-#: commands/tablecmds.c:11730
+#: commands/tablecmds.c:11744
 #, c-format
 msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
 msgstr "შეზღუდვის \"%s\" ნაძალადევობა კონფლიქტშია შეზღუდვასთან \"%s\" ურთიერთობაზე \"%s\""
 
-#: commands/tablecmds.c:12189
+#: commands/tablecmds.c:12206
 #, c-format
 msgid "constraint must be altered in child tables too"
 msgstr "შეზღუდვა შვილ ცხრილებშიც უნდა შეიცვალოს"
 
-#: commands/tablecmds.c:12218 commands/tablecmds.c:12912 commands/tablecmds.c:14006 commands/tablecmds.c:14235
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932 commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "ურთიერთობის \"%2$s\" შეზღუდვა \"%1$s\" არ არსებობს"
 
-#: commands/tablecmds.c:12225
+#: commands/tablecmds.c:12242
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "ურთიერთობის (\"%2$s\") შეზღუდვა \"%1$s\" გარე გასაღების შეზღუდვა არაა"
 
-#: commands/tablecmds.c:12230
+#: commands/tablecmds.c:12247
 #, c-format
 msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
 msgstr "ურთიერთობაზე \"%2$s\" შეზღუდვის \"%1$s\" ძალით დაყენებადობის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:12236
+#: commands/tablecmds.c:12253
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
 msgstr "ურთიერთობის \"%2$s\" შეზღუდვა \"%1$s\" არანულოვანი შეზღუდვა არაა"
 
-#: commands/tablecmds.c:12244
+#: commands/tablecmds.c:12261
 #, c-format
 msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
 msgstr "ურთიერთობაზე \"%2$s\" მემკვიდრეობით მიღებული შეზღუდვის \"%1$s\" წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:12284
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "ურთიერთობაზე \"%2$s\" შეზღუდვის \"%1$s\" შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:12287
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "შეზღუდვა \"%1$s\" ურთიერთობის \"%3$s\" შეზღუდვიდანა \"%2$s\"-ია ნაწარმოები."
 
-#: commands/tablecmds.c:12289
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "ამის მაგიერ, შეიგძლიათ, შეცვალოთ შეზღუდვა, რომლიდანაც ის მიღებულია."
 
-#: commands/tablecmds.c:12921
+#: commands/tablecmds.c:12941
+#, c-format
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "ვერ გადავამოწმე შეზღუდვა \"%s\" ურთიერთობისთვის \"%s\""
+
+#: commands/tablecmds.c:12943
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" is not a foreign key, check, or not-null constraint"
-msgstr "შეზღუდვა \"%s\" ურთიერთობისთვის \"%s\" გარე გასაღებს, შემოწმებას, ან არანულოვან შეზღუდვას არ წარმოადგენს"
+msgid "This operation is not supported for this type of constraint."
+msgstr "ეს ოპერაცია ამ ტიპის შეზღუდვისთვის მხარდაჭერილი არაა."
 
-#: commands/tablecmds.c:12927
+#: commands/tablecmds.c:12948
 #, c-format
 msgid "cannot validate NOT ENFORCED constraint"
 msgstr "შეზღუდვის NOT ENFORCED დადასტურება შეუძლებელია"
 
-#: commands/tablecmds.c:13116 commands/tablecmds.c:13216
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "შეზღუდვა შვილ ცხრილებზეც უნდა გადამოწმდეს"
 
-#: commands/tablecmds.c:13293
+#: commands/tablecmds.c:13334
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "გარე გასაღების შეზღუდვაში მითითებული სვეტი \"%s\" არ არსებობს"
 
-#: commands/tablecmds.c:13299
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "უცხო გასაღებებში სისტემურ სვეტებს ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:13303
+#: commands/tablecmds.c:13344
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "გარე გასაღებში %d გასაღებზე მეტი ვერ გექნებათ"
 
-#: commands/tablecmds.c:13371
+#: commands/tablecmds.c:13412
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:13388
+#: commands/tablecmds.c:13429
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "მითითებული ცხრილისთვის \"%s\" ძირითადი გასაღები არ არსებობს"
 
-#: commands/tablecmds.c:13461
+#: commands/tablecmds.c:13502
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr ""
 
-#: commands/tablecmds.c:13564
+#: commands/tablecmds.c:13605
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:13569
+#: commands/tablecmds.c:13610
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:14010
+#: commands/tablecmds.c:14051
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "ურთიერთობის (\"%2$s\") შეზღუდვა (\"%1$s\") არ არსებობს. გამოტოვება"
 
-#: commands/tablecmds.c:14055
+#: commands/tablecmds.c:14096
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "მემკვიდრეობით მიღებული ურთიერთობის \"%2$s\" შეზღუდვის \"%1$s\" წაშლა შეუძლებელია"
 
-#: commands/tablecmds.c:14107
+#: commands/tablecmds.c:14148
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "სვეტი \"%s\" პირველადი გასაღებია"
 
-#: commands/tablecmds.c:14115
+#: commands/tablecmds.c:14156
 #, c-format
 msgid "column \"%s\" is in index used as replica identity"
 msgstr "სვეტი \"%s\" რეპლიკის იდენტიფიკატორად გამოყენებული ინდექსია"
 
-#: commands/tablecmds.c:14348
+#: commands/tablecmds.c:14389
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "ტიპიზირებული ცხრილის სვეტის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:14376
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "გენერირებული სვეტის ტიპის შეცვლისას USING-ს ვერ მიუთითებთ"
 
-#: commands/tablecmds.c:14377 commands/tablecmds.c:19757 commands/tablecmds.c:19850 commands/trigger.c:659 rewrite/rewriteHandler.c:949 rewrite/rewriteHandler.c:984
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "სვეტი \"%s\" გენერირებული სვეტია."
-
-#: commands/tablecmds.c:14388
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "მემკვიდრეობით მიღებული სვეტის \"%s\" შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:14397
+#: commands/tablecmds.c:14438
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "სვეტის \"%s\" შეცვლა შეუძლებელია, რადგან ის ურთიერთობის \"%s\" დანაყოფის გასაღების ნაწილია"
 
-#: commands/tablecmds.c:14452
+#: commands/tablecmds.c:14493
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 
-#: commands/tablecmds.c:14455
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "შეიძლება აშკარა დაკასტვა უნდა დაამატოთ."
 
-#: commands/tablecmds.c:14459
+#: commands/tablecmds.c:14500
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "სვეტის \"%s\" ავტომატური დაკასტვა ტიპამდე %s შეუძლებელია"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:14463
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "შეიძლება, გჭირდებათ, მიუთითოთ \"USING %s::%s\"."
 
-#: commands/tablecmds.c:14563
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "ურთიერთობის \"%2$s\" სვეტის \"%1$s\" შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:14592
+#: commands/tablecmds.c:14636
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr ""
 
-#: commands/tablecmds.c:14603
+#: commands/tablecmds.c:14647
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:14728
+#: commands/tablecmds.c:14772
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "სვეტის (\"%s\") ტიპის ორჯერ შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:14766
+#: commands/tablecmds.c:14810
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 
-#: commands/tablecmds.c:14771
+#: commands/tablecmds.c:14815
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 
-#: commands/tablecmds.c:15075
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "ფუნქციის ან პროცედურის მიერ გამოყენებული სვეტის ტიპის შექმნა შეუძლებელია"
 
-#: commands/tablecmds.c:15076 commands/tablecmds.c:15091 commands/tablecmds.c:15111 commands/tablecmds.c:15130 commands/tablecmds.c:15189
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135 commands/tablecmds.c:15155 commands/tablecmds.c:15174 commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s ეყრდნობა სვეტს \"%s\""
 
-#: commands/tablecmds.c:15090
+#: commands/tablecmds.c:15134
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "ხედის ან წესის მიერ გამოყენებული სვეტის ტიპის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:15110
+#: commands/tablecmds.c:15154
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "ტრიგერის აღწერაში გამოყენებული სვეტის ტიპის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:15129
+#: commands/tablecmds.c:15173
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "პოლიტიკის აღწერაში გამოყენებული სვეტის ტიპის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:15160
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "გენერირებული სვეტის მიერ გამოყენებული სვეტის ტიპის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:15161
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "სვეტი (%s\") გენერირებული სვეტის (%s) მიერ გამოიყენება."
 
-#: commands/tablecmds.c:15188
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "გამოცემის WHERE პირობის მიერ გამოყენებული სვეტის ტიპის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:16039 commands/tablecmds.c:16051
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "ინდექსის \"%s\" მფლობელის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:16041 commands/tablecmds.c:16053
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "ამის მაგიერ ინდექსის ცხრილის მფლობელი შეცვალეთ."
 
-#: commands/tablecmds.c:16067
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "მიმდევრობის \"%s\" მფლობელის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:16092
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "ურთიერთობის \"%s\" მფლობელის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:16559
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "ერთზე მეტი SET TABLESPACE ქვებრძანება ვერ გექნებათ"
 
-#: commands/tablecmds.c:16638
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "ურთიერთობის (%s) პარამეტრების დაყენება შეუძლებელია"
 
-#: commands/tablecmds.c:16672 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION მხოლოდ ავტომატურად განახლებად ხედებზეა მხარდაჭერილი"
 
-#: commands/tablecmds.c:16925
+#: commands/tablecmds.c:16992
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "ცხრილის სივრცეში მხოლოდ ცხრილები, ინდექსები და მატერიალიზებული ხედები შეიძლება არსებობდეს"
 
-#: commands/tablecmds.c:16937
+#: commands/tablecmds.c:17004
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "ცხრილების სივრცეში pg_globl ურთიერთობების შეტანა/გამოტანა შეუძლებელია"
 
-#: commands/tablecmds.c:17029
+#: commands/tablecmds.c:17096
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "შეწყვეტა, რადგან ბლოკი ურთიერთობაზე \"%s.%s\" ხელმისაწვდომი არაა"
 
-#: commands/tablecmds.c:17045
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "ცხრილების სივრცეში \"%s\" ურთიერთობა, რომელიც ემთხვევა, ვერ ვიპოვე"
 
-#: commands/tablecmds.c:17167
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "ტიპიზირებული ცხრილის მემკვიდრეობითობის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:17172 commands/tablecmds.c:17756
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "დანაყოფის მემკვიდრეობითობის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:17177
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "დაყოფილი ცხრილის მემკვიდრეობითობის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:17224
+#: commands/tablecmds.c:17291
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "სხვა სესიის დროებითი ურთიერთობის მემკვიდრეობით მიღება შეუძლებელია"
 
-#: commands/tablecmds.c:17237
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "დანაყოფიდან მემკვიდრეობითობა შეუძლებელია"
 
-#: commands/tablecmds.c:17259 commands/tablecmds.c:20270
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "წრიული მემკვიდრეობითობა დაუშვებელია"
 
-#: commands/tablecmds.c:17260 commands/tablecmds.c:20271
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" უკვე \"%s\"-ის შვილია."
 
-#: commands/tablecmds.c:17273
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "ტრიგერი \"%s\" ხელს უშლის ცხრილს \"%s\" მემკვიდრეობის შვილად გადაიქცეს"
 
-#: commands/tablecmds.c:17275
+#: commands/tablecmds.c:17342
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "ROW ტრიგერები, რომლებსაც გარდამავალი ცხრილები გააჩნიათ, მემკვიდრეობითობის იერარქიებში მხარდაჭერილი არაა."
 
-#: commands/tablecmds.c:17476 commands/tablecmds.c:17725
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
 msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
 msgstr "სვეტი \"%s\" შვილ ცხრილში \"%s\" NOT NULL-ით უნდა იყოს დანიშნული"
 
-#: commands/tablecmds.c:17486
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "შვილ ცხრილში სვეტი \"%s\" გენერირებული სვეტი არ უნდა იყოს"
 
-#: commands/tablecmds.c:17490
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "შვილ ცხრილში სვეტი \"%s\" გენერირებული სვეტი არ უნდა იყოს"
 
-#: commands/tablecmds.c:17536
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "შვილ ცხრილს აკლია სვეტი \"%s\""
 
-#: commands/tablecmds.c:17653
+#: commands/tablecmds.c:17720
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "შვილ ცხრილს \"%s\" შემოწმების შეზღუდვისთვის \"%s\" სხვა განსაზღვრება გააჩნია"
 
-#: commands/tablecmds.c:17662
+#: commands/tablecmds.c:17729
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია არა-მემკვიდრეობით მიღებულ შეზღუდვასთან შვილ ცხრილზე \"%s\""
 
-#: commands/tablecmds.c:17673
+#: commands/tablecmds.c:17740
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია შეზღუდვასთან NOT VALID შვილ ცხრილზე \"%s\""
 
-#: commands/tablecmds.c:17684
+#: commands/tablecmds.c:17751
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
 msgstr "შეზღუდვა \"%s\" კონფლიქტშია შეზღუდვასთან NOT ENFORCED შვილ ცხრილზე \"%s\""
 
-#: commands/tablecmds.c:17733
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "შვილ ცხრილს აკლია შეზღუდვა \"%s\""
 
-#: commands/tablecmds.c:17820
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "დანაყოფი \"%s\" უკვე დაყოფილი ცხრილიდან \"%s.%s\" მოხსნის რიგშია"
 
-#: commands/tablecmds.c:17849 commands/tablecmds.c:17897
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "ურთიერთობა \"%s\" ურთიერთობის \"%s\" დანაყოფს არ წარმოადგენს"
 
-#: commands/tablecmds.c:17903
+#: commands/tablecmds.c:17970
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "ურთიერთობა \"%s\" ურთიერთობის \"%s\" მშობელს არ წარმოადგენს"
 
-#: commands/tablecmds.c:18174
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "ტიპიზირებულ ცხრილებს მემკვიდრეობითობა არ შეუძლიათ"
 
-#: commands/tablecmds.c:18204
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "ცხრილს აკლია სვეტი \"%s\""
 
-#: commands/tablecmds.c:18215
+#: commands/tablecmds.c:18282
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "ცხრილს აქვს სვეტი \"%s\" მაშინ, როცა ტიპი \"%s\"-ს მოითხოვს"
 
-#: commands/tablecmds.c:18224
+#: commands/tablecmds.c:18291
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "ცხრილს \"%s\" სვეტისთვის \"%s\" სხვა ტიპი აქვს"
 
-#: commands/tablecmds.c:18238
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "ცხრილს აქვს დამატებითი სვეტი \"%s\""
 
-#: commands/tablecmds.c:18290
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" ტიპიზირებული ცხრილი არაა"
 
-#: commands/tablecmds.c:18470
+#: commands/tablecmds.c:18537
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "არაუნიკალურ ინდექსს \"%s\" რეპლიკის იდენტიფიკაციისთვის ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:18476
+#: commands/tablecmds.c:18543
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "არასაუყოვნებლივ ინდექსს \"%s\" რეპლიკის იდენფიტიკაციისთვის ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:18482
+#: commands/tablecmds.c:18549
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "გამოსახულების ინდექსს \"%s\" რეპლიკის იდენტიფიკაციისთვის ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:18488
+#: commands/tablecmds.c:18555
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "ნაწილობრივი ინდექსის (\"%s\") რეპლიკის იდენტიფიკატორად გამოყენება შეუძლებელია"
 
-#: commands/tablecmds.c:18505
+#: commands/tablecmds.c:18572
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
 msgstr "ინდექსს \"%s\" რეპლიკის იდენტიფიკაციისთვის ვერ გამოიყენებთ, რადგან სვეტი %d სისტემური სვეტია"
 
-#: commands/tablecmds.c:18512
+#: commands/tablecmds.c:18579
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "ინდექსს \"%s\" რეპლიკის იდენტიფიკაციისთვის ვერ გამოიყენებთ, რადგან სვეტი %s განულებადია"
 
-#: commands/tablecmds.c:18761
+#: commands/tablecmds.c:18828
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "ცხრილის \"%s\" ჟურნალში ჩაწერის სტატუსის შეცვლა შეუძლებელია, რადგან ის დროებითია"
 
-#: commands/tablecmds.c:18785
+#: commands/tablecmds.c:18852
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr ""
 
-#: commands/tablecmds.c:18787
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "უჟურნალო ურთიერთობების რეპლიკაცია შეუძლებელია."
 
-#: commands/tablecmds.c:18832
+#: commands/tablecmds.c:18899
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:18842
+#: commands/tablecmds.c:18909
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:18906
+#: commands/tablecmds.c:18973
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "მფლობელობაში არსებული მიმდევრობის სხვა სქემაში გადატანა შეუძლებელია"
 
-#: commands/tablecmds.c:19014
+#: commands/tablecmds.c:19081
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "სქემაში (%2$s) ურთიერთობა (%1$s) უკვე არსებობს"
 
-#: commands/tablecmds.c:19439
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" ცხრილი ან მატერიალიზებული ხედი არაა"
 
-#: commands/tablecmds.c:19592
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "ტიპი %s კომპოზიტური არაა"
 
-#: commands/tablecmds.c:19622
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "ინდექსის (%s) სქემის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:19624 commands/tablecmds.c:19638
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "ამის მაგიერ ცხრილის სქემა შეცვლათ."
 
-#: commands/tablecmds.c:19628
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "კომპოზიტური ტიპის (%s) სქემის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:19636
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "\"TOAST\" ცხრილის (%s) სქემის შეცვლა შეუძლებელია"
 
-#: commands/tablecmds.c:19668
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "ერთზე მეტ სვეტთან ერთად დაყოფის სტრატეგიას \"list\" ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:19734
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "დანაყოფის გასაღებში დასახელებული სვეტი \"%s\" არ არსებობს"
 
-#: commands/tablecmds.c:19742
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "დანაყოფის გასაღებში სისტემური სვეტის (%s) გამოყენება შეუძლებელია"
 
-#: commands/tablecmds.c:19756 commands/tablecmds.c:19849
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "გენერირებულ სვეტს დანაყოფის გასაღებში ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:19829
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "დანაყოფის გასაღების გამოსახულებები, არ შეიძლება, სისტემურ სვეტზე მითითებებს შეიცავდნენ"
 
-#: commands/tablecmds.c:19879
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "ფუნქცია დანაყოფის გასაღების გამოსახულებაში აუცილებლად უნდა იყოს მონიშნული, როგორც IMMUTABLE"
 
-#: commands/tablecmds.c:19888
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "დაყოფის გასაღების გამოსახულებაში მუდმივ გამოსახულებას ვერ გამოიყენებთ"
 
-#: commands/tablecmds.c:19909
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "დანაყოფის გამოსახულებისათვის კოლაციის დადგენა შეუძლებელია"
 
-#: commands/tablecmds.c:19944
+#: commands/tablecmds.c:20021
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr ""
 
-#: commands/tablecmds.c:19950
+#: commands/tablecmds.c:20027
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr ""
 
-#: commands/tablecmds.c:20210
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\" უკვე დანაყოფია"
 
-#: commands/tablecmds.c:20216
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "ტიპიზირებული ცხრილის, როგორც დანაყოფის მიბმა შეუძლებელია"
 
-#: commands/tablecmds.c:20232
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "მემკვიდრეობის შვილის დანაყოფად მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20246
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "მემკვიდრეობის მშობლის დანაყოფად მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20280
+#: commands/tablecmds.c:20357
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "დროებითი ურითერთობის, როგორც მუდმივი ურთიერთობის (\"%s\") დანაყოფის მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20288
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "მუდმივი ურთიერთობის, როგორც დროებითი ურთიერთობის (%s) დანაყოფის მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20296
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "სხვა სესიის დროებითი ურთიერთობის დანაყოფის მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20303
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "სხვა სესიის დროებითი ურთიერთობის დანაყოფად მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20323
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "ცხრილი \"%s\", რომლის მიმაგრებაც მიმდინარეობს, შეიცავს იდენტიფიკაციის სვეტს \"%s\""
 
-#: commands/tablecmds.c:20325
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "ახალი დანაყოფი არ შეიძლება, იდენტიფიკატორის სვეტს შეიცავდეს."
 
-#: commands/tablecmds.c:20333
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "ცხრილი \"%s\" შეიცავს სვეტს \"%s\", რომელიც მშობელში \"%s\" აღმოჩენილი არაა"
 
-#: commands/tablecmds.c:20336
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "ახალი დანაყოფი მხოლოდ მშობელში არსებულ სვეტებს შეიძლება, შეიცავდეს."
 
-#: commands/tablecmds.c:20348
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "ტრიგერი \"%s\" ხელს უშლის ცხრილს \"%s\" დანაყოფად გადაიქცეს"
 
-#: commands/tablecmds.c:20350
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "დანაყოფებზე იდენტიფიკაციის სვეტები მხარდაჭერილი არაა."
 
-#: commands/tablecmds.c:20532
+#: commands/tablecmds.c:20609
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "გარე ცხრილის \"%s\" დაყოფილი ცხრილის (\"%s\") დანაყოფის სახით მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:20535
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "დაყოფილი ცხრილი \"%s\" უნიკალურ ცხრილებს შეიცავს."
 
-#: commands/tablecmds.c:20858
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "ნაგულისხმევი დანაყოფის არსებობის შემთხვევაში დანაყოფების ერთდროული მოხსნა შეუძლებელია"
 
-#: commands/tablecmds.c:20967
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "დაყოფილი ცხრილი \"%s\" ერთდროულად წაიშალა"
 
-#: commands/tablecmds.c:20973
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "დანაყოფი \"%s\" ერთდროულად წაიშალა"
 
-#: commands/tablecmds.c:21596 commands/tablecmds.c:21616 commands/tablecmds.c:21637 commands/tablecmds.c:21656 commands/tablecmds.c:21705
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705 commands/tablecmds.c:21726 commands/tablecmds.c:21745 commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "ერთი ინდექსის ინდექსის (%s) მეორე ინდექსის (\"%s) დანაყოფად მიმაგრება შეუძლებელია"
 
-#: commands/tablecmds.c:21599
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "ინდექსი %s სხვა ინდექსზეა უკვე მიმაგრებული."
 
-#: commands/tablecmds.c:21619
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "ინდექსი %s ცხრილის (%s) არცერთი დანაყოფის ინდექსი არაა."
 
-#: commands/tablecmds.c:21640
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "ინდექსის აღწერები არ ემთხვევა."
 
-#: commands/tablecmds.c:21659
+#: commands/tablecmds.c:21748
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr ""
 
-#: commands/tablecmds.c:21708
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "ცხრილისთვის %s სხვა ინდექსი უკვე მიმაგრებულია."
 
-#: commands/tablecmds.c:21831
+#: commands/tablecmds.c:21920
 #, c-format
 msgid "invalid primary key definition"
 msgstr "არასწორი ძირითადი გასაღების აღწერა"
 
-#: commands/tablecmds.c:21832
+#: commands/tablecmds.c:21921
 #, c-format
 msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
 msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" არაა დანიშნული, როგორც NOT NULL."
 
-#: commands/tablecmds.c:21967
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "სვეტის მონაცემის ტიპს (%s) შეკუმშვის მხარდაჭერა არ გააჩნია"
 
-#: commands/tablecmds.c:21974
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "შეკუმშვის არასწორი მეთოდი \"%s\""
 
-#: commands/tablecmds.c:22000
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "საცავის არასწორი ტიპი \"%s\""
 
-#: commands/tablecmds.c:22010
+#: commands/tablecmds.c:22099
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "სვეტის მონაცემების ტიპს %s საცავის ტიპად მხოლოდ PLAIN შეიძლება, ჰქონდეს"
@@ -11872,272 +11928,277 @@ msgstr "ცხრილების სივრცის (%u) საქაღ
 msgid "You can remove the directories manually if necessary."
 msgstr "თუ გჭირდებათ, საქაღალდეები შეგიძლიათ ხელითაც წაშალოთ."
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\" ცხრილია"
 
-#: commands/trigger.c:229 commands/trigger.c:240
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "ცხრილებს INSTEAD OF ტიპის ტრიგერები ვერ ექნებათ."
 
-#: commands/trigger.c:261
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\" დაყოფილი ცხრილია"
 
-#: commands/trigger.c:263
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "დანაყოფებზე იდენტიფიკაციის სვეტები მხარდაჭერილი არაა."
 
-#: commands/trigger.c:275 commands/trigger.c:282 commands/trigger.c:446
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\" ხედია"
 
-#: commands/trigger.c:277
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "ხედებს მწკრივის დონის BEFORE და AFTER ტრიგერები ვერ ექნებათ."
 
-#: commands/trigger.c:284
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "ხედებს TRUNCATE ტიპის ტრიგერები ვერ ექნებათ."
 
-#: commands/trigger.c:292 commands/trigger.c:304 commands/trigger.c:439
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\" გარე ცხრილია"
 
-#: commands/trigger.c:294
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "გარე ცხრილებს INSTEAD OF ტრიგერები ვერ ექნებათ."
 
-#: commands/trigger.c:306
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "გარე ცხრილებს შეზღუდვის ტრიგერები ვერ ექნებათ."
 
-#: commands/trigger.c:311 commands/trigger.c:1330 commands/trigger.c:1437
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "ურთიერთობას \"%s\" ტრიგერები არ შეიძლება ჰქონდეთ"
 
-#: commands/trigger.c:382
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW ტრიგერები მხარდაუჭერელია"
 
-#: commands/trigger.c:390
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF ტრიგერები უნდა იყოს FOR EACH ROW"
 
-#: commands/trigger.c:394
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF ტრიგერებს WHEN პირობები არ შეიძლება ჰქონდეს"
 
-#: commands/trigger.c:398
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF ტრიგერებს სვეტების სიები არ შეიძლება ჰქონდეთ"
 
-#: commands/trigger.c:427
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr ""
 
-#: commands/trigger.c:428
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "გარდამავალი ცხრილების სახელებისთვის OLD TABLE ან NEW TABLE გამოიყენეთ."
 
-#: commands/trigger.c:441
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "გარე ცხრილებზე არსებულ ტრიგერებს გარდამავალი ცხრილები ვერ ექნებათ."
 
-#: commands/trigger.c:448
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "ხედებზე არსებულ ტრიგერებს გარდამავალი ცხრილები ვერ ექნებათ."
 
-#: commands/trigger.c:464
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "ROW ტრიგერები გარდამავალი ცხრილებით დანაყოფებზე მხარდაჭერილი არაა"
 
-#: commands/trigger.c:468
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "ROW ტრიგერები გარდამავალი ცხრილებით მემკვიდრეობის შვილებზე მხარდაჭერილი არაა"
 
-#: commands/trigger.c:474
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "გარდამავალი ცხრილის სახელი მხოლოდ ტრიგერისთვის AFTER შეგიძლიათ, მიუთითოთ"
 
-#: commands/trigger.c:479
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "ტრიგერები TRUNCATE გარდამავალი ცხრილებით მხარდაჭერილი არაა"
 
-#: commands/trigger.c:496
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "გარდამავალი ცხრილების მითითება ტრიგერებისთვის, რომლებსაც ერთზე მეტი მოვლენა გააჩნიათ, შეუძლებელია"
 
-#: commands/trigger.c:507
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "გარდამავალი ცხრილების მითითება ტრიგერებისთვის, რომლებსაც სვეტების სიები გააჩნიათ, შეუძლებელია"
 
-#: commands/trigger.c:524
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE მხოლოდ INSERT ან UPDATE ტრიგერისთვის შეგიძლიათ, მიუთითოთ"
 
-#: commands/trigger.c:529
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE -ის რამდენჯერმე მითითება აკრძალულია"
 
-#: commands/trigger.c:539
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE მხოლოდ DELETE ან UPDATE ტრიგერისთვის შეგიძლიათ, მიუთითოთ"
 
-#: commands/trigger.c:544
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE -ის რამდენჯერმე მითითება აკრძალულია"
 
-#: commands/trigger.c:554
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "OLD TABLE-ის და NEW TABLE-ის სახელები ერთი და იგივე ვერ იქნება"
 
-#: commands/trigger.c:618 commands/trigger.c:631
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "გამოსახულების ტრიგერის WHEN პირობა არ შეუძლება, სვეტის მნიშვნელობებზე მიუთითებდეს"
 
-#: commands/trigger.c:623
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "INSERT-ის ტრიგერის WHEN პირობა არ შეიძლება, OLD მნიშვნელობებზე მიუთითებდეს"
 
-#: commands/trigger.c:636
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "DELETE-ის ტრიგერის WHEN პირობა არ შეიძლება, NEW მნიშვნელობებზე მიუთითებდეს"
 
-#: commands/trigger.c:641
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "BEFORE-ის ტრიგერის WHEN პირობა არ შეიძლება, NEW სისტემურ სვეტებზე მიუთითებდეს"
 
-#: commands/trigger.c:650 commands/trigger.c:658
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "BEFORE-ის ტრიგერის WHEN პირობა არ შეიძლება, NEW გენერირებულ სვეტებზე მიუთითებდეს"
 
-#: commands/trigger.c:651
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr ""
 
-#: commands/trigger.c:766 commands/trigger.c:1613
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "ტრიგერი \"%s\" ურთიერთობისთვის \"%s\" უკვე არსებობს"
 
-#: commands/trigger.c:779
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "ტრიგერი \"%s\" ურთიერთობისთვის \"%s\" შიდა ან შვილი ტრიგერია"
 
-#: commands/trigger.c:798
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "ტრიგერი \"%s\" ურთიერთობისთვის \"%s\", შეზღუდვის ტრიგერია"
 
-#: commands/trigger.c:1402 commands/trigger.c:1556 commands/trigger.c:1837
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "ტრიგერი \"%s\" ცხრილისთვის \"%s\" არ არსებობს"
 
-#: commands/trigger.c:1528
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "ტრიგერის (%s) (ცხრილზე %s) სახელის გადარქმევა შეუძლებელია"
 
-#: commands/trigger.c:1530
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "ამის მაგიერ დაყოფილ ცხრილზე ('%s\") ტრიგერს გადაარქვით სახელი."
 
-#: commands/trigger.c:1630
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "ურთიერთობაზე \"%2$s\" ტრიგერს \"%1$s\" სახელი გადაერქვა"
 
-#: commands/trigger.c:1776
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "წვდომა აკრძალულია: %s სისტემური ტრიგერია"
 
-#: commands/trigger.c:2385
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "ტრიგერის ფუნქციამ %u ნულოვანი მნიშვნელობა დააბრუნა"
 
-#: commands/trigger.c:2445 commands/trigger.c:2665 commands/trigger.c:2918 commands/trigger.c:3273
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949 commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "BEFORE STATEMENT ტრიგერს მნიშვნელობის დაბრუნება არ შეუძლია"
 
-#: commands/trigger.c:2523
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "მწკრივის სხვა დანაყოფში გადატანა BEFORE FOR EACH ROW ტრიგერის დროს მხარდაჭერილი არაა"
 
-#: commands/trigger.c:2524
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "ტრიგერის \"%s\" შესრულებამდე სვეტი დანაყოფში \"%s.%s\" უნდა ყოფილიყო."
 
-#: commands/trigger.c:3351 executor/nodeModifyTable.c:1685 executor/nodeModifyTable.c:1759 executor/nodeModifyTable.c:2566 executor/nodeModifyTable.c:2656 executor/nodeModifyTable.c:3328 executor/nodeModifyTable.c:3498
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "გარდასვლის კორტეჟების მოგროვება შეუძლებელია შვილი უცხო ცხრილებიდან"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687 executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569 executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322 executor/nodeModifyTable.c:3514
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr ""
 
-#: commands/trigger.c:3392 executor/nodeLockRows.c:228 executor/nodeLockRows.c:237 executor/nodeModifyTable.c:388 executor/nodeModifyTable.c:1701 executor/nodeModifyTable.c:2582 executor/nodeModifyTable.c:2807
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228 executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389 executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585 executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "ერთდროული განახლების გამო წვდომის სერიალიზაცია შეუძლებელია"
 
-#: commands/trigger.c:3400 executor/nodeModifyTable.c:1791 executor/nodeModifyTable.c:2673 executor/nodeModifyTable.c:2831 executor/nodeModifyTable.c:3346
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793 executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826 executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "ერთდროული წაშლის გამო წვდომის სერიალიზაცია შეუძლებელია"
 
-#: commands/trigger.c:4635
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr ""
 
-#: commands/trigger.c:5831
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "შეზღუდვა გადადებადი არაა %s"
 
-#: commands/trigger.c:5854
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "შეზღუდვა \"%s\" არ არსებობს"
@@ -12247,7 +12308,7 @@ msgstr "საბაზისო ტიპის შესაცვლელა
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr ""
 
-#: commands/typecmds.c:331 commands/typecmds.c:1486 commands/typecmds.c:4471
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "ტიპის უცნობი ატრიბუტი: %s"
@@ -12267,7 +12328,7 @@ msgstr "%s მასივის ელემენტის ტიპი არ
 msgid "alignment \"%s\" not recognized"
 msgstr "სწორება \"%s\" უცნობია"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4345
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "საცავი \"%s\" უცნობია"
@@ -12302,342 +12363,347 @@ msgstr "%s დომენისთვის სწორ ბაზისურ
 msgid "multiple default expressions"
 msgstr "ერთზე მეტი ნაგულისხმევი გამოსახულება"
 
-#: commands/typecmds.c:945 commands/typecmds.c:960
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "კონფლიქტური NULL/NOT NULL შეზღუდვები"
 
-#: commands/typecmds.c:950
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "დამატებითი NOT NULL შეზღუდვის აღწერა"
+
+#: commands/typecmds.c:958
 #, c-format
 msgid "not-null constraints for domains cannot be marked NO INHERIT"
 msgstr "არანულოვანი შეზღუდვები დომენებისთვის არ შეიძლება, NO INHERIT-ით მონიშნოთ"
 
-#: commands/typecmds.c:977
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "დომენის შემოწმების შეზღუდვების, როგორც NO INHERIT, მონიშვნა შეუძლებელია"
 
-#: commands/typecmds.c:988
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "უნიკალური შეზღუდვები დომენებისთვის შეუძლებელია"
 
-#: commands/typecmds.c:995
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "ძირითადი გასაღების შეზღუდვა დომენებისთვის შეუძლებელია"
 
-#: commands/typecmds.c:1002
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "გაშვების შეზღუდვა დომენებისთვის შეუძლებელია"
 
-#: commands/typecmds.c:1009
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "გარე გასაღების შეზღუდვა დომენებისთვის შეუძლებელია"
 
-#: commands/typecmds.c:1019
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr ""
 
-#: commands/typecmds.c:1027
+#: commands/typecmds.c:1035
 #, c-format
 msgid "specifying GENERATED not supported for domains"
 msgstr "დომენებისთვის GENERATED-ის მითითება მხარდაჭერილი არაა"
 
-#: commands/typecmds.c:1035
+#: commands/typecmds.c:1043
 #, c-format
 msgid "specifying constraint enforceability not supported for domains"
 msgstr "შეზღუდვის ნაძალადევობის მითითება დომენებისთვის მხარდაჭერილი არაა"
 
-#: commands/typecmds.c:1353 utils/cache/typcache.c:2745
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s ჩამონათვალი არაა"
 
-#: commands/typecmds.c:1494
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "ტიპის ატრიბუტი \"subtype\" აუცილებელია"
 
-#: commands/typecmds.c:1499
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "%s დიაპაზონის ქვეტიპი ვერ იქნება"
 
-#: commands/typecmds.c:1518
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr ""
 
-#: commands/typecmds.c:1528
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr ""
 
-#: commands/typecmds.c:1529
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr ""
 
-#: commands/typecmds.c:2005
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "ტიპის შეყვანის ფუნქციის (%s) რამდენიმე ასლი არსებობს"
 
-#: commands/typecmds.c:2023
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "ტიპის შეყვანის ფუნქციამ (\"%s\") უნდა დააბრუნოს ტიპი \"%s\""
 
-#: commands/typecmds.c:2039
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "ტიპის შეყვანის ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2067
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "ტიპის გამოტანის ფუნქციამ (%s) უნდა დააბრუნოს ტიპი \"%s\""
 
-#: commands/typecmds.c:2074
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "ტიპის გამოტანის ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2103
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "ტიპის მიღების ფუქნციის (%s) რამდენიმე ასლი არსებობს"
 
-#: commands/typecmds.c:2121
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "ტიპის მიღების ფუნქციამ (%s) უნდა დააბრუნოს ტიპი %s"
 
-#: commands/typecmds.c:2128
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "ტიპის მიღების ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2156
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "ტიპის გაგზავნის ფუნქციამ (%s) უნდა დააბრუნოს ტიპი \"%s\""
 
-#: commands/typecmds.c:2163
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "ტიპის გაგზავნის ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2190
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "typmod_in ფუნქციამ (%s) უნდა დააბრუნოს ტიპი %s"
 
-#: commands/typecmds.c:2197
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "ტიპის მოდიფიკატორის შეყვანის ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2224
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "typmod_out ფუნქციამ (%s) უნდა დააბრუნოს ტიპი %s"
 
-#: commands/typecmds.c:2231
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "ტიპის მოდიფიკატორის გამოტანის ფუნქცია (%s) ცვალებადი არ უნდა იყოს"
 
-#: commands/typecmds.c:2258
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "ტიპის ანალიზის ფუნქციამ (%s) უნდა დააბრუნოს ტიპი %s"
 
-#: commands/typecmds.c:2287
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr ""
 
-#: commands/typecmds.c:2297
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "მომხმარებლის აღწერილ ტიპებს არ შეუძლიათ, გამოიყენონ გამოწერის ფუნქცია %s"
 
-#: commands/typecmds.c:2343
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr ""
 
-#: commands/typecmds.c:2374
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "კანონიკური დიაპაზონის ფუნქციამ (%s) დიაპაზონის ტიპი უნდა დააბრუნოს"
 
-#: commands/typecmds.c:2380
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "კანონიკური დიაპაზონის ფუნქცია (%s) მუდმივი უნდა იყოს"
 
-#: commands/typecmds.c:2416
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "დიაპაზონის ქვეტიპის განსხვავების ფუნქციამ (%s) უნდა დააბრუნოს ტიპი: %s"
 
-#: commands/typecmds.c:2423
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "დიაპაზონის ქვეტიპის განსხვავების ფუნქცია (%s) უცვლელი უნდა იყოს"
 
-#: commands/typecmds.c:2450
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "ბინარული განახლების რეჟიმში pg_type-ის მასივის OID-ის მნიშვნელობა დაყენებული არაა"
 
-#: commands/typecmds.c:2483
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "ბინარული განახლების რეჟიმში pg_type-ის მრავალდიაპაზონიანი OID-ის მნიშვნელობა დაყენებული არაა"
 
-#: commands/typecmds.c:2516
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "ბინარული განახლების რეჟიმში pg_type-ის მრავალდიაპაზონიანი მასივის OID-ის მნიშვნელობა დაყენებული არაა"
 
-#: commands/typecmds.c:2898 commands/typecmds.c:3080
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "დომენის (\"%2$s\") შეზღუდვა (\"%1$s\") არ არსებობს"
 
-#: commands/typecmds.c:2902
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "დომენის (\"%2$s\") შეზღუდვა (\"%1$s\") არ არსებობს. გამოტოვება"
 
-#: commands/typecmds.c:3087
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "დომენის (\"%2$s\") შეზღუდვა (\"%1$s\") შეზღუდვის შემოწმება არაა"
 
-#: commands/typecmds.c:3167
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "სვეტი \"%s\" (ცხრილში %s) ნულოვან მნიშვნელობებს შეიცავს"
 
-#: commands/typecmds.c:3256
+#: commands/typecmds.c:3264
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "სვეტი \"%s\" ცხრილიდან \"%s\" შეიცავს მნიშვნელობებს, რომელიც ახალ შეზღუდვას არღვევს"
 
-#: commands/typecmds.c:3485 commands/typecmds.c:3763 commands/typecmds.c:3848 commands/typecmds.c:4064
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856 commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "\"%s\" დომენი არაა"
 
-#: commands/typecmds.c:3519 commands/typecmds.c:3675
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "შეზღუდვა \"%s\" დომენისთვის %s უკვე არსებობს"
 
-#: commands/typecmds.c:3570
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr ""
 
-#: commands/typecmds.c:3775 commands/typecmds.c:3860 commands/typecmds.c:4214
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s ცხრილის მწკრივის ტიპია"
 
-#: commands/typecmds.c:3785 commands/typecmds.c:3870 commands/typecmds.c:4112
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "მასივის ტიპის (\"%s\") შეცვლა შეუძლებელია"
 
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4114
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "ტიპი %s შეგიძლიათ, შეცვალოთ, რაც მასივის ტიპსაც შეცვლის."
 
-#: commands/typecmds.c:3883
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "მრავალშუალედანი ტიპის %s შეცვლა შეუძლებელია"
 
-#: commands/typecmds.c:3886
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "შეგიძლიათ შეცვალოთ ტიპი %s, რომელიც მრავალშუალედიან ტიპსაც შეცვლის."
 
-#: commands/typecmds.c:4193
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "ტიპი \"%s\" სქემაში \"%s\" უკვე არსებობს"
 
-#: commands/typecmds.c:4373
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "ტიპის საცავს PLAIN-ზე ვერ შეცვლით"
 
-#: commands/typecmds.c:4466
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "ტიპის ატრიბუტის შეცვლა შეუძლებელია: %s"
 
-#: commands/typecmds.c:4484
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "ტიპის შესაცვლელად ზემომხმარებლის უფლებებია საჭირო"
 
-#: commands/typecmds.c:4505 commands/typecmds.c:4514
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "%s საბაზისო ტიპი არაა"
 
-#: commands/user.c:201
+#: commands/user.c:200
 #, c-format
 msgid "SYSID can no longer be specified"
 msgstr "SYSID-ის შეცვლა ახლა უკვე შეუძლებელია"
 
-#: commands/user.c:319 commands/user.c:325 commands/user.c:331 commands/user.c:337 commands/user.c:343
+#: commands/user.c:318 commands/user.c:324 commands/user.c:330 commands/user.c:336 commands/user.c:342
 #, c-format
 msgid "permission denied to create role"
 msgstr "როლის შექმნის წვდომა აკრძალულია"
 
-#: commands/user.c:320
+#: commands/user.c:319
 #, c-format
 msgid "Only roles with the %s attribute may create roles."
 msgstr "როლების შექმნა მხოლოდ %s ატრიბუტის მქონე როლებს შეუძლიათ."
 
-#: commands/user.c:326 commands/user.c:332 commands/user.c:338 commands/user.c:344
+#: commands/user.c:325 commands/user.c:331 commands/user.c:337 commands/user.c:343
 #, c-format
 msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "მხოლოდ როლებს, რომლებსაც %s ატრიბუტი გააჩნიათ, შეუძლიათ როლის შექმნა, რომელსაც აქვს ატრიბუტი %s."
 
-#: commands/user.c:355 commands/user.c:1386 commands/user.c:1393 gram.y:17493 gram.y:17539 utils/adt/acl.c:5690 utils/adt/acl.c:5696
+#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17473 gram.y:17519 utils/adt/acl.c:5707 utils/adt/acl.c:5713
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "როლის სახელი \"%s\" დაცულია"
 
-#: commands/user.c:357 commands/user.c:1388 commands/user.c:1395
+#: commands/user.c:356 commands/user.c:1388 commands/user.c:1395
 #, c-format
 msgid "Role names starting with \"pg_\" are reserved."
 msgstr "როლის სახელები, რომლებიც \"pg_\"-ით იწყება, დაცულია."
 
-#: commands/user.c:378 commands/user.c:1410
+#: commands/user.c:377 commands/user.c:1410
 #, c-format
 msgid "role \"%s\" already exists"
 msgstr "როლი \"%s\" უკვე არსებობს"
 
-#: commands/user.c:440 commands/user.c:924
+#: commands/user.c:439 commands/user.c:924
 #, c-format
 msgid "empty string is not a valid password, clearing password"
 msgstr "ცარიელი სტრიქონი არ არის სწორი პაროლი, პაროლის გაწმენდა"
 
-#: commands/user.c:469
+#: commands/user.c:468
 #, c-format
 msgid "pg_authid OID value not set when in binary upgrade mode"
 msgstr "ბინარული განახლების რეჟიმში pg_authid-ის OID-ის მნიშვნელობა დაყენებული არაა"
@@ -12706,7 +12772,7 @@ msgstr "როლების წაშლა მხოლოდ სამიზ
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "სპეციალური როლის მიმთითებლის გამოყენება DROP ROLE-ში შეუძლებელია"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864 commands/variable.c:867 commands/variable.c:983 commands/variable.c:986 utils/adt/acl.c:366 utils/adt/acl.c:386 utils/adt/acl.c:5545 utils/adt/acl.c:5593 utils/adt/acl.c:5621 utils/adt/acl.c:5640 utils/adt/regproc.c:1571 utils/init/miscinit.c:804
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864 commands/variable.c:867 commands/variable.c:983 commands/variable.c:986 utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562 utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657 utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "როლი არ არსებობს: \"%s\""
@@ -12771,7 +12837,7 @@ msgstr "ამ როლის სახელის გადარქმევ
 msgid "MD5 password cleared because of role rename"
 msgstr "MD5 პაროლი გასუფთავდა როლის სახელის შეცვლის გამო"
 
-#: commands/user.c:1518 gram.y:1286
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "როლის უცნობი პარამეტრი: \"%s\""
@@ -12831,229 +12897,219 @@ msgstr "%s პარამეტრს მომნიჭებელს ვე
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "როლი \"%s\" უკვე გაწევრდა როლში \"%s\" \"%s\" როლის მიერ"
 
-#: commands/user.c:2036
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "როლს \"%s\" უარი ეთქვა როლში \"%s\" გაწევრებაზე \"%s\" როლის მიერ"
 
-#: commands/user.c:2137
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "როლი \"%s\" არ შეიძლება, აშკარა წევრებს შეიცავდეს"
 
-#: commands/user.c:2148 commands/user.c:2171
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "როლის (\"%s\") დაყენების წვდომა აკრძალულია"
 
-#: commands/user.c:2150
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "მხოლოდ როლებს, რომლებსაც %s ატრიბუტი გააჩნიათ, შეუძლიათ, როლებს %s ატრიბუტი მიანიჭონ."
 
-#: commands/user.c:2155 commands/user.c:2178
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "როლის (\"%s\") გაუქმების წვდომა აკრძალულია"
 
-#: commands/user.c:2157
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "მხოლოდ როლებს, რომლებსაც %s ატრიბუტი გააჩნიათ, შეუძლიათ, როლებს %s ატრიბუტი მოაცილონ."
 
-#: commands/user.c:2173
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "მხოლოდ როლებს, რომლებსაც როლზე \"%2$s\" პარამეტრი \"%1$s\" გააჩნიათ, შეუძლიათ, მიანიჭონ ეს როლი."
 
-#: commands/user.c:2180
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "მხოლოდ როლებს, რომლებსაც როლზე \"%2$s\" პარამეტრი \"%1$s\" გააჩნიათ, შეუძლიათ, მოაცილონ ეს როლი."
 
-#: commands/user.c:2260 commands/user.c:2269
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "როლის (\"%s\") მინიჭების წვდომა აკრძალულია"
 
-#: commands/user.c:2262
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "მხოლოდ როლებს, რომლებსაც როლის \"%s\" პრივილეგიები გააჩნიათ, შეუძლიათ პრივილეგიები, როგორც, ამ როლმა, მიანიჭონ."
 
-#: commands/user.c:2271
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "მიმნიჭებელს უნდა ჰქონდეს %s პარამეტრი როლზე \"%s\"."
 
-#: commands/user.c:2279
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "როლის (\"%s\") მიერ მინიჭებული პრივილეგიების გაუქმების წვდომა აკრძალულია"
 
-#: commands/user.c:2281
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "მხოლოდ როლებს, რომლებსაც როლის \"%s\" პრივილეგიები გააჩნიათ, შეუძლიათ ამ როლის მიერ მინიჭებული პრივილეგიები მოაცილონ."
 
-#: commands/user.c:2504 utils/adt/acl.c:1325
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "დამოკიდებული პრივილეგიები არსებობს"
 
-#: commands/user.c:2505 utils/adt/acl.c:1326
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "მათ გასაუქმებლადაც CASCADE გამოიყენეთ."
 
-#: commands/vacuum.c:146
+#: commands/vacuum.c:148
 #, c-format
 msgid "\"%s\" must be 0 or between %d kB and %d kB."
 msgstr "\"%s\"-ის მნიშვნელობა 0 ან %d კბ-სა და %d კბ-ს შორის უნდა იყოს."
 
-#: commands/vacuum.c:222
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "BUFFER_USAGE_LIMIT პარამეტრი 0 ან %d კბ-სა და %d კბ-ს შორის უნდა იყოს"
 
-#: commands/vacuum.c:232
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "\"ANALYZE\"-ის უცნობი პარამეტრი: %s"
-
-#: commands/vacuum.c:272
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "პარალელურ პარამეტრს ესაჭიროება მნიშვნელობა 0-სა და %d-ს შორის"
 
-#: commands/vacuum.c:284
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "პარალელური დამხმარე პროცესების რაოდენობა მომტვერსასრუტებისთვის 0-სა და %d-ს შორის უნდა იყოს"
 
-#: commands/vacuum.c:305
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "\"VACUUM\"-ის უცნობი პარამეტრი: %s"
-
-#: commands/vacuum.c:331
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL პარალელურად ვერ შესრულდება"
 
-#: commands/vacuum.c:342
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "VACUUM FULL-სთვის BUFFER_USAGE_LIMIT-ს ვერ მიუთითებთ"
 
-#: commands/vacuum.c:356
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "როცა მიწოდებულია სვეტების სია, პარამეტრის ANALYZE მითითება აუცილებელია"
 
-#: commands/vacuum.c:368
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "VACUUM-ის პარამეტრს 'DISABLE_PAGE_SKIPPING' FULL-თან ერთად ვერ გამოიყენებთ"
 
-#: commands/vacuum.c:375
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "VACUUM FULL-თან ერთად PROCESS_TOAST აუცილებელია"
 
-#: commands/vacuum.c:384
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS -ის მითითება ცხრილების სიასთან ერთად შეუძლებელია"
 
-#: commands/vacuum.c:393
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STAT-ის მითითება სხვა VACUMM პარამეტრებთან ერთად შეუძლებელია"
 
-#: commands/vacuum.c:533
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s-ს VACUUM-დან ან ANALYZE-დან ვერ შეასარულებთ"
 
-#: commands/vacuum.c:745
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "\"%s\"-ის მომტვერსასრუტების წვდომა აკრძალულია. გამოტოვება"
 
-#: commands/vacuum.c:758
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "\"%s\"-ის ანალიზისთვის წვდომა აკრძალულია. გამოტოვება"
 
-#: commands/vacuum.c:836 commands/vacuum.c:937
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "\"%s\"-ის მომტვერსასრუტება გამოტოვებულია -- ბლოკი ხელმისაწვდომი არაა"
 
-#: commands/vacuum.c:841
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "\"%s\"-ის მომტვერსასრუტება გამოტოვებულია -- ურთიერთობა აღარ არსებობს"
 
-#: commands/vacuum.c:857 commands/vacuum.c:942
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "\"%s\"-ის ანალიზი გამოტოვებულია -- ბლოკი ხელმისაწვდომი არაა"
 
-#: commands/vacuum.c:862
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "\"%s\"-ის ანალიზი გამოტოვებულია -- ურთიერთობა აღარ არსებობს"
 
-#: commands/vacuum.c:978
+#: commands/vacuum.c:992
 #, c-format
 msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
 msgstr "დაყოფილ ცხრილზე \"%s\" ბრძანებას VACUUM ONLY გავლენა არ აქვს"
 
-#: commands/vacuum.c:1169
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr ""
 
-#: commands/vacuum.c:1170 commands/vacuum.c:1175
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
 msgstr ""
 
-#: commands/vacuum.c:1174
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr ""
 
-#: commands/vacuum.c:1936
+#: commands/vacuum.c:1950
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "ზოგიერთი ბაზა 2 მილიარდ ტრანზაქციაზე მეტია, რაც არ მომტვერსასრუტებულა"
 
-#: commands/vacuum.c:1937
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: commands/vacuum.c:2116
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
 
-#: commands/vacuum.c:2617
+#: commands/vacuum.c:2659
 #, c-format
 msgid "scanned index \"%s\" to remove %<PRId64> row versions"
 msgstr "სკანირებული ინდექსი \"%s\" %<PRId64> მწკრივის ვერსიის წაშლას აპირებს"
 
-#: commands/vacuum.c:2636
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "ინდექსი \"%s\" ახლა %.0f მწკრივის ვერსიას შეიცავს, %u გვერდში"
 
-#: commands/vacuum.c:2640
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -13185,12 +13241,12 @@ msgstr "როლის (\"%s\") დაყენების წვდომა
 msgid "permission denied to set role \"%s\""
 msgstr "როლის (\"%s\") დაყენების წვდომა აკრძალულია"
 
-#: commands/variable.c:1228
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "ამ აგებაში Bonjour -ის მხარდაჭერა არ არსებბს"
 
-#: commands/variable.c:1256
+#: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "ამ აგებაში SSL-ის მხარდაჭერა არ არსებბს"
@@ -13290,27 +13346,27 @@ msgstr "პარამეტრის %d (%s) ტიპი არ ემთხ
 msgid "no value found for parameter %d"
 msgstr "პარამეტრისთვის მნიშვნელობების პოვნა შეუძლებელია: %d"
 
-#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680 executor/execExprInterp.c:5440 executor/execExprInterp.c:5457 executor/execExprInterp.c:5556 executor/nodeModifyTable.c:210 executor/nodeModifyTable.c:229 executor/nodeModifyTable.c:246 executor/nodeModifyTable.c:256 executor/nodeModifyTable.c:266
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680 executor/execExprInterp.c:5439 executor/execExprInterp.c:5456 executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211 executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247 executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr ""
 
-#: executor/execExpr.c:668 executor/nodeModifyTable.c:211
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "მოთხოვნას მეტისმეტად ბევრი სვეტ აქვს."
 
-#: executor/execExpr.c:675 executor/nodeModifyTable.c:230
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr ""
 
-#: executor/execExpr.c:681 executor/execExprInterp.c:5458 executor/nodeModifyTable.c:257
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457 executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr ""
 
-#: executor/execExpr.c:1157 parser/parse_agg.c:843
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "ფანჯრის ფუნქციის გამოძახებებს ერთმანეთში ვერ ჩადგამთ"
@@ -13332,20 +13388,20 @@ msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "ფუნქციისთვის %d -ზე მეტი არგუმენტის გადაცემა შეუძლებელია"
 msgstr[1] "ფუნქციისთვის %d -ზე მეტი არგუმენტის გადაცემა შეუძლებელია"
 
-#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1558 utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604 utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "ფუნქცია, რომელიც სეტს აბრუნებს, გამოძახებულია კონტექსტში, რომელიც სეტებს ვერ იღებს"
 
-#: executor/execExpr.c:3262 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr ""
 
-#: executor/execExpr.c:3390 executor/execExpr.c:3412
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
-msgstr ""
+msgstr "ტიპს %s გამოწერილი მინიჭების მხარდაჭერა არ გააჩნია"
 
 #: executor/execExprInterp.c:2415
 #, c-format
@@ -13429,14 +13485,14 @@ msgstr "მითითებულ ბილიკზე SQL/JSON ელემ
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "ვერ შევაკავე %s გამოსახულება (%s) ტპზე RETURNING"
 
-#: executor/execExprInterp.c:5441
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "ცხრილის მწკრივი %d ატრიბუტს შეიცავს, მოთხოვნა კი %d-ს მოელოდა."
 msgstr[1] "ცხრილის მწკრივი %d ატრიბუტს შეიცავს, მოთხოვნა კი %d-ს მოელოდა."
 
-#: executor/execExprInterp.c:5557 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr ""
@@ -13481,147 +13537,147 @@ msgstr "გასაღები აქტიურ გასაღებთა
 msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1171
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "მიმდევრობის შეცვლა შეუძლებელია: \"%s\""
 
-#: executor/execMain.c:1177
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "'TOAST' ტიპის ურთიერთობის \"%s\" შეცვლა შეუძლებელია"
 
-#: executor/execMain.c:1196
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "მატერიალიზებული ხედის შეცვლა შეუძლებელია: %s"
 
-#: executor/execMain.c:1208
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "გარე ცხრილში ჩამატების შეცდომა: %s"
 
-#: executor/execMain.c:1214
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "გარე ცხრილი ჩამატების საშუალებას არ იძლევა: %s"
 
-#: executor/execMain.c:1221
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "გარე ცხრილის განახლების შეცდომა: %s"
 
-#: executor/execMain.c:1227
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "გარე ცხრილი განახლებების საშუალებას არ იძლევა: %s"
 
-#: executor/execMain.c:1234
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "გარე ცხრილიდან წაშლის შეცდომა: %s"
 
-#: executor/execMain.c:1240
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "გარე ცხრილი წაშლის საშუალებას არ იძლევა: %s"
 
-#: executor/execMain.c:1251
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "ურთიერთობის შეცვლის შეცდომა: %s"
 
-#: executor/execMain.c:1278
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "მიმდევრობაში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:1285
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "\"TOAST\" ურთიერთობაში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:1292
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "ხედში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:1300
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "მატერიალიზებულ ხედში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:1309 executor/execMain.c:2941 executor/nodeLockRows.c:135
+#: executor/execMain.c:1227 executor/execMain.c:2869 executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "გარე ცხრილში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:1315
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "ურთიერთობაში მწკრივების ჩაკეტვა შეუძლებელია: %s"
 
-#: executor/execMain.c:2038
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "ახალი მწკრივი ურთიერთობისთვის \"%s\" დანაყოფის შეზღუდვას არღვევს"
 
-#: executor/execMain.c:2040 executor/execMain.c:2152 executor/execMain.c:2290 executor/execMain.c:2398
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218 executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "შეცდომიანი მწკრივი \"%s\"-ს შეიცავს."
 
-#: executor/execMain.c:2150
+#: executor/execMain.c:2078
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "ახალი მწკრივი ურთიერთობისთვის \"%s\" არღვევს შემოწმების შეზღუდვას \"%s\""
 
-#: executor/execMain.c:2287
+#: executor/execMain.c:2215
 #, c-format
 msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
 msgstr "ნულოვანი მნიშვნელობა სვეტში \"%s\" ურთიერთობისთვის \"%s\" არანულოვან შეზღუდვას არღვევს"
 
-#: executor/execMain.c:2396
+#: executor/execMain.c:2324
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "ახალი მწკრივი არღვევს შემოწმების პარამეტრს ხედისთვის \"%s\""
 
-#: executor/execMain.c:2406
+#: executor/execMain.c:2334
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr "ახალი მწკრივი არღვევს მწკრივის-დონის უსაფრთხოების პოლიტიკას \"%s\" ცხრილისთვის \"%s\""
 
-#: executor/execMain.c:2411
+#: executor/execMain.c:2339
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr "ახალი მწკრივი ცხრილისთვის \"%s\" მწკრივის-დონის უსაფრთხოების პოლიტიკა არღვევს"
 
-#: executor/execMain.c:2419
+#: executor/execMain.c:2347
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr ""
 
-#: executor/execMain.c:2424
+#: executor/execMain.c:2352
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr ""
 
-#: executor/execMain.c:2431
+#: executor/execMain.c:2359
 #, c-format
 msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr ""
 
-#: executor/execMain.c:2436
+#: executor/execMain.c:2364
 #, c-format
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr ""
 
-#: executor/execPartition.c:331
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "მწკრივისთვის ურთიერთობის \"%s\" დანაყოფი ვერ ვიპოვე"
 
-#: executor/execPartition.c:334
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "შეცდომიანი მწკრივის დანაყოფის გასაღები \"%s\"-ს შეიცავს."
@@ -13748,89 +13804,89 @@ msgstr ""
 msgid "don't have a storage tuple in this context"
 msgstr "ამ კონტექსტში საცავის კორტეჟი არ აქვს"
 
-#: executor/execUtils.c:759
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "მატერიალიზებული ხედი \"%s\" შევსებული არაა"
 
-#: executor/functions.c:288
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "არგუმენტის, აღწერილის, როგორც '%s' ტიპის დადგენა შეუძლებელია"
 
-#: executor/functions.c:711
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "'SQL' ფუნქციაში კლიენტიდან/კლიენტამდე COPY შეუძლებელია"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:717
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "%s SQL ფუნქციაში დაშვებული არაა"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:725 executor/spi.c:1746 executor/spi.c:2660
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s-ის გამოყენება არააქროლად ფუნქციაში დაუშვებელია"
 
-#: executor/functions.c:1159 executor/functions.c:2182 executor/functions.c:2220 executor/functions.c:2234 executor/functions.c:2324 executor/functions.c:2357 executor/functions.c:2371
+#: executor/functions.c:1185 executor/functions.c:2224 executor/functions.c:2262 executor/functions.c:2276 executor/functions.c:2366 executor/functions.c:2399 executor/functions.c:2413
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "დაბრუნების ტიპის შეცდომა ფუნქციაში, რომელსაც აღწერილი აქვს, დააბრუნოს %s"
 
-#: executor/functions.c:1161 executor/functions.c:2184
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
 msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
 msgstr "ფუნქციის ბოლო გამოსახულება SELECT ან INSERT/UPDATE/DELETE/MERGE RETURNING უნდა იყოს."
 
-#: executor/functions.c:1244 utils/cache/plancache.c:869
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "დაკეშილი გეგმა შედეგის ტიპს არ უნდა ცვლიდეს"
 
-#: executor/functions.c:1880 executor/functions.c:1911
+#: executor/functions.c:1922 executor/functions.c:1953
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "SQL ფუნქცია \"%s\" გაშვებისას"
 
-#: executor/functions.c:1908
+#: executor/functions.c:1950
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "SQL ფუნქცია \"%s\" გამოსახულება %d"
 
-#: executor/functions.c:2033
+#: executor/functions.c:2075
 #, c-format
 msgid "calling procedures with output arguments is not supported in SQL functions"
 msgstr "გამოტანის არგუმენტების მქონე პროცედურების გამოძახება SQL-ის ფუნქციებში მხარდაჭერილი არაა"
 
-#: executor/functions.c:2222
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "პირველი გამოსახულება ზუსტად ერთ სვეტს უნდა აბრუნებდეს."
 
-#: executor/functions.c:2236
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "დაბრუნების ნამდვილი ტიპია %s."
 
-#: executor/functions.c:2326
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "პირველი გამოსახულება მეტისმეტად ბევრ სვეტს აბრუნებს."
 
-#: executor/functions.c:2359
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr ""
 
-#: executor/functions.c:2373
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "ბოლო გამოსახულება მეტისმეტად ცოტა სვეტს აბრუნებს."
 
-#: executor/functions.c:2401
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "დაბრუნების ტიპი %s SQL ფუნქციებში მხარდაჭერილი არაა"
@@ -13840,7 +13896,7 @@ msgstr "დაბრუნების ტიპი %s SQL ფუნქციე
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: executor/nodeAgg.c:4062 parser/parse_agg.c:685 parser/parse_agg.c:713
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "აგრეგატულ ფუნქციებს ერთანეთში ვერ ჩადგამთ"
@@ -13880,68 +13936,68 @@ msgstr ""
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr ""
 
-#: executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:248
 #, c-format
 msgid "Query provides a value for a generated column at ordinal position %d."
 msgstr ""
 
-#: executor/nodeModifyTable.c:267
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "მოთხოვნას ძალიან ცოტა სვეტი აქვს."
 
-#: executor/nodeModifyTable.c:1684 executor/nodeModifyTable.c:1758
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr ""
 
-#: executor/nodeModifyTable.c:1957
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "\"ON UPDATE\"-ის არასწორი სპეციფიკაცია"
 
-#: executor/nodeModifyTable.c:1958
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr ""
 
-#: executor/nodeModifyTable.c:2414
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr ""
 
-#: executor/nodeModifyTable.c:2415
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr ""
 
-#: executor/nodeModifyTable.c:2418
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "განიხილეთ გარე გასაღების აღწერა ცხრილზე \"%s\"."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2785 executor/nodeModifyTable.c:3334 executor/nodeModifyTable.c:3504
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328 executor/nodeModifyTable.c:3520
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "ბრძანებას %s მწკრივის მეორედ შეცვლა არ შეუძლია"
 
-#: executor/nodeModifyTable.c:2787
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr ""
 
-#: executor/nodeModifyTable.c:3327 executor/nodeModifyTable.c:3497
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3513
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "გასაახლებელი ან წასაშლელ კორტეჟი მიმდინარე ბრძანების მიერ დატრიგერებულმა ოპერაციამ უკვე შეცვალა"
 
-#: executor/nodeModifyTable.c:3336 executor/nodeModifyTable.c:3506
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr ""
 
-#: executor/nodeModifyTable.c:3405
+#: executor/nodeModifyTable.c:3399
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
 msgstr "შესარწყმელი კორტეჟები პარალელური განახლების გამო უკვე სხვა დანაყოფშია გადატანილი"
@@ -13956,7 +14012,7 @@ msgstr "TABLESAMPLE პარამეტრი ნულოვანი ვე
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "TABLESAMPLE REPEATABLE პარამეტრი ნულოვანი ვერ იქნება"
 
-#: executor/nodeSubplan.c:317 executor/nodeSubplan.c:343 executor/nodeSubplan.c:397 executor/nodeSubplan.c:1182
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324 executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr ""
@@ -14016,79 +14072,79 @@ msgstr "ჩარჩოს ბოლოს წანაცვლება უა
 msgid "aggregate function %s does not support use as a window function"
 msgstr "აგრეგატულ ფუნქციას %s ფანჯრის ფუნქციად გაშვების მხარდაჭერა არ გააჩნია"
 
-#: executor/spi.c:242 executor/spi.c:342
+#: executor/spi.c:241 executor/spi.c:341
 #, c-format
 msgid "invalid transaction termination"
 msgstr "ტრანზაქციის არასწორი დასასრული"
 
-#: executor/spi.c:257
+#: executor/spi.c:256
 #, c-format
 msgid "cannot commit while a subtransaction is active"
 msgstr "როცა ქვეტრანზაქცია აქტიურია, კომიტი შეუძლებელია"
 
-#: executor/spi.c:348
+#: executor/spi.c:347
 #, c-format
 msgid "cannot roll back while a subtransaction is active"
 msgstr "როცა ქვეტრანზაქცია აქტიურია, ტრანზაქციის გაუქმება შეუძლებელია"
 
-#: executor/spi.c:472
+#: executor/spi.c:471
 #, c-format
 msgid "transaction left non-empty SPI stack"
 msgstr "ტრანზაქცის შემდეგ დარჩენილი SPI სტეკი ცარიელი არაა"
 
-#: executor/spi.c:473 executor/spi.c:533
+#: executor/spi.c:472 executor/spi.c:532
 #, c-format
 msgid "Check for missing \"SPI_finish\" calls."
 msgstr "ნაკლულ \"SPI_finish\" გამოძახებებზე შემოწმება."
 
-#: executor/spi.c:532
+#: executor/spi.c:531
 #, c-format
 msgid "subtransaction left non-empty SPI stack"
 msgstr "ქვეტრანზაქცის შემდეგ დარჩენილი SPI სტეკი ცარიელი არაა"
 
-#: executor/spi.c:1603
+#: executor/spi.c:1602
 #, c-format
 msgid "cannot open multi-query plan as cursor"
 msgstr "მრავალმოთხოვნიანი გეგმის კურსორის სახით გახსნა შეუძლებელია"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1613
+#: executor/spi.c:1612
 #, c-format
 msgid "cannot open %s query as cursor"
 msgstr "%s გამოსახულების კურსორის სახით გახნა შეუძლებელია"
 
-#: executor/spi.c:1720
+#: executor/spi.c:1718
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE მხარდაჭერილი არაა"
 
-#: executor/spi.c:1721 parser/analyze.c:3161
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "გადახვევადი კურსორები READ ONLY უნდა იყოს."
 
-#: executor/spi.c:2498
+#: executor/spi.c:2496
 #, c-format
 msgid "empty query does not return tuples"
 msgstr "ცარიელი მოთხოვნა კორტეჟებს არ აბრუნებს"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:2573
+#: executor/spi.c:2570
 #, c-format
 msgid "%s query does not return tuples"
 msgstr "მოთხოვნა %s კორტეჟებს არ აბრუნებს"
 
-#: executor/spi.c:3004
+#: executor/spi.c:2987
 #, c-format
 msgid "PL/pgSQL expression \"%s\""
 msgstr "PL/pgSQL გამოსახულება \"%s\""
 
-#: executor/spi.c:3009
+#: executor/spi.c:2992
 #, c-format
 msgid "PL/pgSQL assignment \"%s\""
 msgstr "PL/pgSQL მინიჭება \"%s\""
 
-#: executor/spi.c:3012
+#: executor/spi.c:2995
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "SQL ოპერატორი \"%s\""
@@ -14098,415 +14154,425 @@ msgstr "SQL ოპერატორი \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "გაზიარებული-მეხსიერების მქონე რიგში კორტეჟის გაგზავნა შეუძლებელია"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "\"%s\"-სთვის მომხმარებლის ასახვა ვერ ვიპოვე. სერვერი \"%s\""
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7228 optimizer/util/plancat.c:538
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299 optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr ""
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "არასწორი პარამეტრი \"%s\""
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "შესაძლოა, გულისხმობდით პარამეტრს \"%s\"."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "ამ კონტექსტში სწორი პარამეტრები არ არსებობს."
 
-#: gram.y:1223
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD მხარდაჭერილი აღარაა"
 
-#: gram.y:1224
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "პაროლის დაშიფრულ ფორმაში დასამახსოვრებლად წაშალეთ UNENCRYPTED."
 
-#: gram.y:1551 gram.y:1567
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS არ შეიძლება, სქემის ელემენტებს შეიცავდეს"
 
-#: gram.y:1728
+#: gram.y:1727
 #, c-format
 msgid "current database cannot be changed"
 msgstr "მიმდინარე ბაზის შეცვლა შეუძლებელია"
 
-#: gram.y:1869
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "დროის სარტყლის ინტერვალი HOUR ან HOUR TO MINUTE უნდა იყოს"
 
-#: gram.y:2501
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "სვეტის ნომერი უნდა იყოს 1-დან %d-მდე"
 
-#: gram.y:3120
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "შეზღუდვების შეცვლა, რომ ისინი NOT VALID გახდნენ, შეუძლებელია"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "მიმდევრობის პარამეტრი \"%s\" აქ მხარდაჭერილი არაა"
 
-#: gram.y:3159
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "ჰეშ-დანაყოფის მოდული ერთზე მეტჯერაა მითითებული"
 
-#: gram.y:3168
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "დარჩენილი ნაწილი ჰეშ-დანაყოფისთვის ერთზე მეტჯერაა მითითებული"
 
-#: gram.y:3175
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr ""
 
-#: gram.y:3183
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "საჭიროა ჰეშ დანაყოფის მოდულის მითითება"
 
-#: gram.y:3188
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "საჭიროა ჰეშ დანაყოფის ნაშთის მითითება"
 
-#: gram.y:3397 gram.y:3432
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT-ი PROGRAM-თან ერთად დაშვებული არაა"
 
-#: gram.y:3403
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "პირობა 'WHERE' 'COPY TO'-სთან ერთად დაშვებული არაა"
 
-#: gram.y:3752 gram.y:3759 gram.y:13184 gram.y:13192
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "დროებითი ცხრილის შექმნაში GLOBAL-ი მოძველებულია"
 
-#: gram.y:4041
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "გენერირებული სვეტისთვის GENERATED ALWAYS-ის მითითება აუცილებელია"
 
-#: gram.y:4450 utils/adt/ri_triggers.c:2259
+#: gram.y:4454 utils/adt/ri_triggers.c:2259
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL ჯერ განხორციელებული არაა"
 
-#: gram.y:4542
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr ""
 
-#: gram.y:5261
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM უკვე მხარდაუჭერელია"
 
-#: gram.y:5959
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "მწკრივის უსაფრთხოების უცნობი პარამეტრი:\"%s\""
 
-#: gram.y:5960
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr ""
 
-#: gram.y:6045
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER მხარდაუჭერელია"
 
-#: gram.y:6083
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "მითითებულია ტრიგერი მეორდება"
 
-#: gram.y:6225 parser/parse_utilcmd.c:3925 parser/parse_utilcmd.c:3951
+#: gram.y:6229 parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "შეზღუდვა, რომელიც აღწერილია, როგორც 'INITIALLY DEFERRED' DEFERRABLE ტიპის უნდა იყოს"
 
-#: gram.y:6233
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "ერთმანეთთან შეუთავსებელი შეზღუდვის თვისებები"
 
-#: gram.y:6334
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION ჯერ განუხორცელებია"
 
-#: gram.y:6652
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "ჩამონათვლის მნიშვნელობის მოცილება განხორციელებული არაა"
 
-#: gram.y:8632
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "აგრეგატებს გამოტანის არგუმენტები ვერ ექნება"
 
-#: gram.y:9096 utils/adt/regproc.c:670
+#: gram.y:9100 utils/adt/regproc.c:670
 #, c-format
 msgid "missing argument"
 msgstr "ნაკლული არგუმენტი"
 
-#: gram.y:9097 utils/adt/regproc.c:671
+#: gram.y:9101 utils/adt/regproc.c:671
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr ""
 
-#: gram.y:11325 gram.y:11344
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION რეკურსიულ ხედებზე მხარდაუჭერელია"
 
-#: gram.y:13331
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "LIMIT #,# სინტაქსი მხარდაჭერილი არაა"
 
-#: gram.y:13332
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "გამოიყენეთ განცალკევებული LIMIT და OFFSET პირობები."
 
-#: gram.y:14220
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "დასაშვებია DEFAULT_ის მხოლოდ ერთი მნიშვნელობა"
 
-#: gram.y:14229
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "ყოველ სვეტზე PATH-ის მხოლოდ ერთი მნიშვნელობაა დასაშვები"
 
-#: gram.y:14238
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr ""
 
-#: gram.y:14247
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "სვეტის უცნობი პარამეტრი %s"
 
-#: gram.y:14329
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "პარამეტრის სახელს \"%s\" ვერ გამოიყენებთ XMLTABLE-ში"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr ""
 
-#: gram.y:14651
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "წილადი რიცხვების სიზუსტე 1 ბიტი მაინც უნდა იყოს"
 
-#: gram.y:14660
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "წილადი რიცხვების სიზუსტე 54 ბიტზე მეტი ვერ იქნება"
 
-#: gram.y:15177
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr ""
 
-#: gram.y:15182
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr ""
 
-#: gram.y:15359
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "პრედიკატი UNIQUE ჯერ განხორციელებული არაა"
 
-#: gram.y:15773
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "'WITHIN GROUP'-თან ერთად ერთზე მეტი ORDER BY პირობის გამოყენება შეუძლებელია"
 
-#: gram.y:15778
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "\"DISTINCT\"-ს \"WITHIN GROUP\"-თან ერთად ვერ გამოიყენებთ"
 
-#: gram.y:15783
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "\"VARIADIC\"-ს \"WITHIN GROUP\"-თან ერთად ვერ გამოიყენებთ"
 
-#: gram.y:16510 gram.y:16534
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "ჩარჩოს დასაწყისი UNBOUNDED FOLLOWING ვერ იქნება"
 
-#: gram.y:16515
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "ჩარჩო, რომელიც შემდეგი მწკრივიდან იწყება, მიმდინარე მწკრივზე ვერ დასრულდება"
 
-#: gram.y:16539
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "ჩარჩოს დასასრული UNBOUNDED PRECEDING ვერ იქნება"
 
-#: gram.y:16545
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "ჩარჩოს, რომელიც მიმდინარე მწკრივიდან იწყება, წინა ჩარჩოები ვერ ექნება"
 
-#: gram.y:16552
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "ჩარჩოს, რომელიც შემდეგი მწკრივიდან იწყება, წინა ჩარჩოები ვერ ექნება"
 
-#: gram.y:17101
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "უცნობი JSON კოდირება \"%s\""
 
-#: gram.y:17426
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "ტიპის მოდიფიკატორს პარამეტრის სახელი ვერ ექნება"
 
-#: gram.y:17432
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "ტიპის მოდიფიკატორს ORDER BY ვერ ექნება"
 
-#: gram.y:17500 gram.y:17507 gram.y:17514
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s აქ როგორც როლის სახელს ვერ გამოიყენებთ"
 
-#: gram.y:17604 gram.y:19135
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES-ს ORDER BY პირობის გარეშე ვერ მიუთითებთ"
 
-#: gram.y:18828 gram.y:19003
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "\"*\"-ის არასათანადო გამოყენება"
 
-#: gram.y:18966 gram.y:18983 tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999 tsearch/spell.c:1016 tsearch/spell.c:1082
+#: gram.y:18905 gram.y:18922 tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999 tsearch/spell.c:1016 tsearch/spell.c:1082
 #, c-format
 msgid "syntax error"
 msgstr "სინტაქსის შეცდომა"
 
-#: gram.y:19067
+#: gram.y:19006
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr ""
 
-#: gram.y:19104
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "\"ORDER BY\"-ის გამოყენება მხოლოდ ერთხელ შეგიძლიათ"
 
-#: gram.y:19115
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "\"OFFSET\"-ის გამოყენება მხოლოდ ერთხელ შეგიძლიათ"
 
-#: gram.y:19124
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "\"LIMIT\"-ის გამოყენება მხოლოდ ერთხელ შეგიძლიათ"
 
-#: gram.y:19160
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "\"WITH\"-ის გამოყენება მხოლოდ ერთხელ შეგიძლიათ"
 
-#: gram.y:19358
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr ""
 
-#: gram.y:19492
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "\"COLLATE\"-ის გამოყენება მხოლოდ ერთხელ შეგიძლიათ"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19532 gram.y:19545
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "%s -ის შეზღუდვებიs, როგორც DEFERRABLE, მონიშვნა შეუძლებელია"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19558
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "%s -ის შეზღუდვებიs, როგორც NOT VALID, მონიშვნა შეუძლებელია"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19571
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s -ის შეზღუდვებიs, როგორც NO INHERIT, მონიშვნა შეუძლებელია"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19584
+#: gram.y:19521
 #, c-format
 msgid "%s constraints cannot be marked NOT ENFORCED"
 msgstr "%s -ის შეზღუდვების, როგორც NOT ENFORCED, მონიშვნა შეუძლებელია"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19606
+#: gram.y:19543
 #, c-format
 msgid "%s constraints cannot be marked ENFORCED"
 msgstr "%s -ის შეზღუდვებიs, როგორც ENFORCED, მონიშვნა შეუძლებელია"
 
-#: gram.y:19628
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "დაყოფის უცნობი სტრატეგია: %s"
 
-#: gram.y:19652
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "პუბლიკაციების ობიექტების არასწორი სია"
 
-#: gram.y:19653
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr ""
 
-#: gram.y:19669
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "არასწორი ცხრილის სახელი"
 
-#: gram.y:19690
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "WHERE პირობა სქემისთვის დაშვებული არაა"
 
-#: gram.y:19697
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "სქემისთვის სვეტის მითითება დაშვებული არაა"
 
-#: gram.y:19711
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "არასწორი სქემის სახელი"
@@ -14779,7 +14845,7 @@ msgstr ""
 msgid "internal error in OAuth validator module"
 msgstr ""
 
-#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:294
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
 #, c-format
 msgid "OAuth bearer authentication failed for user \"%s\""
 msgstr "OAuth-ის წარმდგენის ავთენტიკაცია ჩავარდა მომხმარებლისთვის \"%s\""
@@ -14797,7 +14863,7 @@ msgstr ""
 #: libpq/auth-oauth.c:760
 #, c-format
 msgid "%s module \"%s\" must define the symbol %s"
-msgstr ""
+msgstr "%s მოდულმა \"%s\" უნდა აღწეროს სიმბოლო %s"
 
 #: libpq/auth-oauth.c:773
 #, c-format
@@ -14807,7 +14873,7 @@ msgstr "%s-ის მოდული \"%s\": ჯადოსნური რი
 #: libpq/auth-oauth.c:775
 #, c-format
 msgid "Server has magic number 0x%08X, module has 0x%08X."
-msgstr ""
+msgstr "სერვერს აქვს ჯადოსნური რიცხვი 0x%08X, მოდულს აქვს 0x%08X."
 
 #: libpq/auth-oauth.c:784
 #, c-format
@@ -14956,550 +15022,550 @@ msgstr ""
 msgid "Garbage found at the end of client-final-message."
 msgstr "კლიენტის-საბოლოო-შეტყობინების ბოლოში აღმოჩენილია ნაგავი."
 
-#: libpq/auth.c:254
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "ავთენტიკაციის შეცდომა მომხმარებლისთვის \"%s\": ჰოსტმა ის უარყო"
 
-#: libpq/auth.c:257
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "\"ნდობით\" ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:260
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "იდენტიფიკაციით ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:263
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "პარტნიორის ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "პაროლით ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:273
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "GSSAPI ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:276
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "SSPI ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:279
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "PAM ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:282
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "BSD ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:285
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "LDAP ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "სერტიფიკატით ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "რადიუსით ავთენტიფიკაცია მომხმარებლისთვის \"%s\" ვერ მოხერხდა"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "ავთენტიკაციის შეცდომა მომხმარებლისთვის \"%s\": არასწორი ავთენტიკაციის მეთოდი"
 
-#: libpq/auth.c:301
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "მიერთება დაემთხვა ფაილ %s-ს ხაზზე %d: \"%s\""
 
-#: libpq/auth.c:346
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "ავთენტიფიკაციის იდენტიფიკატორი ერთზე მეტჯერაა დაყენებული"
 
-#: libpq/auth.c:347
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "წინა იდენტიფიკატორი: \"%s\"; ახალი იდენტიფიკატორი: \"%s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "მიერთება ავთენტიფიცირებულია: იდენტიფიკატორი=\"%s\" მეთოდი=%s (%s:%d)"
 
-#: libpq/auth.c:397
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "კლიენტის სერტიფიკატების შემოწმება მხოლოდ მაშინაა შესაძლებელი, როცა ხელმისაწვდომია ძირითადი სერტიფიკატების საცავი"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "მიერთების მცდელობას კლიენტის სწორი სერტიფიკატი ესაჭიროება"
 
-#: libpq/auth.c:439 libpq/auth.c:485
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "GSS დაშიფვრა"
 
-#: libpq/auth.c:442 libpq/auth.c:488
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "SSL დაშიფვრა"
 
-#: libpq/auth.c:444 libpq/auth.c:490
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "დაშიფვრის გარეშე"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:450
+#: libpq/auth.c:458
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf უარყოფს რეპლიკაციის მიერთებას ჰოსტისთვის \"%s\", მომხმარებელი \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:457
+#: libpq/auth.c:465
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf უარყოფს მიერთებას ჰოსტისთვის \"%s\", მომხმარებელი \"%s\", ბაზა \"%s\", %s"
 
-#: libpq/auth.c:495
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "კლიენტის IP მისამართი იხსნება \"%s\" პირდაპირი DNS ემთხვევა."
 
-#: libpq/auth.c:498
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "კლიენტის IP მისამართი იხსნება \"%s\" პირდაპირი DNS არ შემოწმებულა."
 
-#: libpq/auth.c:501
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "კლიენტის IP მისამართი იხსნება \"%s\" პირდაპირი DNS არ ემთხვევა."
 
-#: libpq/auth.c:504
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "კლიენტის ჰოსტის სახელის (\"%s\") IP მისამართში თარგმნის შეცდომა: %s."
 
-#: libpq/auth.c:509
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "კლიენტის IP მისამართიდან ჰოსტის სახელის ამოხსნის შეცდომა: %s."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:517
+#: libpq/auth.c:525
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf-ში ჩანაწერი რეპლიკაციის შეერთების შესახებ ჰოსტიდან \"%s\" მომხმარებელი \"%s\", %s აღმოჩენილი არაა"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:525
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf-ში ჩანაწერი ჰოსტისთვის \"%s\" მომხმარებელი \"%s\", ბაზა \"%s\", %s აღმოჩენილი არაა"
 
-#: libpq/auth.c:649
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "მიერთება ავთენტიფიცირებულია: მომხმარებელი =\"%s\" მეთოდი=%s (%s:%d)"
 
-#: libpq/auth.c:718
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "მოველოდი პაროლის პასუხს, მივიღე შეტყობინების ტიპი %d"
 
-#: libpq/auth.c:739
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "პაროლის პაკეტის არასწორი ზომა"
 
-#: libpq/auth.c:757
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "კლიენტმა ცარიელი პაროლი დააბრუნა"
 
-#: libpq/auth.c:885
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "შემთხვევითი MD5 მარილის გენერაციის შეცდომა"
 
-#: libpq/auth.c:936 libpq/be-secure-gssapi.c:543
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "გარემოს მორგების შეცდომა: %m"
 
-#: libpq/auth.c:975
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "მოველოდი GSS პასუხს, მივიღე შეტყობინების ტიპი %d"
 
-#: libpq/auth.c:1041
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "'GSS'-ის უსაფრთხოების კონტექსტის მიღების შეცდომა"
 
-#: libpq/auth.c:1082
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "'GSS'-ის მომხმარებლის სახელის მიღების შეცდომა"
 
-#: libpq/auth.c:1228
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "შეცდომა SSPI-ის მომხმ./პაროლის მიღებისას"
 
-#: libpq/auth.c:1253
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "მოველოდი SSPI პასუხს, მივიღე შეტყობინების ტიპი %d"
 
-#: libpq/auth.c:1331
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "'SSPI'-ის უსაფრთხოების კონტექსტის მიღების შეცდომა"
 
-#: libpq/auth.c:1372
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "'SSPI'-ის უსაფრთხოების კონტექსტიდან კოდის მიღების შეცდომა"
 
-#: libpq/auth.c:1508 libpq/auth.c:1527
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "სახელის თარგმნა შეუძლებელია"
 
-#: libpq/auth.c:1540
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "რეალმის სახელი ძალიან გრძელია"
 
-#: libpq/auth.c:1555
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "ანგარიშის ნათარგმნი სახელი ძალიან გრძელია"
 
-#: libpq/auth.c:1734
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "ident მიერთებისთვის სოკეტის შექმნა შეუძლებელია: %m"
 
-#: libpq/auth.c:1749
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "ლოკალურ მისამართზე \"%s\" მიბმის შეცდომა: %m"
 
-#: libpq/auth.c:1761
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "შეცდომა LDAP სერვერთან მიერთებისას. მისამართი - \"%s\",პორტი - %s: %m"
 
-#: libpq/auth.c:1783
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "შეცდომა LDAP სერვერზე მოთხოვნის გაგზავნისას. მისამართი - \"%s\", პორტი - %s: %m"
 
-#: libpq/auth.c:1800
+#: libpq/auth.c:1808
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "პასუხი Ident-ის სერვერიდან მისამართით \"%s\" პორტზე %s ვერ მივიღე: %m"
 
-#: libpq/auth.c:1810
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "არასწორად დაფორმატებული პასუხი Ident სერვერიდან: \"%s\""
 
-#: libpq/auth.c:1866
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "ამ პლატფორმაზე პარტნიორის ავთენტიკაცია მხარდაჭერილი არაა"
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "პარტნიორის ავტორიზაციის დეტალების მიღების შეცდომა: %m"
 
-#: libpq/auth.c:1880
+#: libpq/auth.c:1888
 #, c-format
 msgid "could not look up local user ID %ld: %m"
 msgstr "ლოკალური მომხმარებლის ID-ით %ld მოძებნა შეუძლებელია: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1894
 #, c-format
 msgid "local user with ID %ld does not exist"
 msgstr "ლოკალური მომხმარებელი ID-ით %ld არ არსებობს"
 
-#: libpq/auth.c:1986
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "შეცდომა ქვედა PAM ფენიდან: %s"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "მხარდაუჭერელი PAM საუბარი %d/\"%s\""
 
-#: libpq/auth.c:2054
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "შეცდომა PAM ავთენტიკატორის შექმნისას: %s"
 
-#: libpq/auth.c:2065
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) -ის შეცდომა: %s"
 
-#: libpq/auth.c:2097
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST) -ის შეცდომა: %s"
 
-#: libpq/auth.c:2109
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) -ის შეცდომა: %s"
 
-#: libpq/auth.c:2122
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate -ის შეცდომა: %s"
 
-#: libpq/auth.c:2135
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt-ის შეცდომა: %s"
 
-#: libpq/auth.c:2146
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "შეცდომა PAM ავთენტიკატორის მოხსნისას: %s"
 
-#: libpq/auth.c:2226
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "შეცდომა LDAP-ის ინიციალიზაციისას: შეცდომის კოდი %d"
 
-#: libpq/auth.c:2263
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "ldapbasedn-დან დომენის სახელის გამოღება შეუძლებელია"
 
-#: libpq/auth.c:2271
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "LDAP ავთენტიკაციამ \"%s\"-სთვის DNS SRV ჩანაწერები ვერ იპოვა"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "LDAP სერვერის სახელი აშკარად უნდა დააყენოთ."
 
-#: libpq/auth.c:2325
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "\"LDAP\"-ის ინიციალიზაციის შეცდომა: %s"
 
-#: libpq/auth.c:2335
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "ამ LDAP ბიბლიოთეკას ldaps-ის მხარდაჭერა არ გააჩნია"
 
-#: libpq/auth.c:2343
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "\"LDAP\"-ის ინიციალიზაციის შეცდომა: %m"
 
-#: libpq/auth.c:2353
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "\"LDAP\"-ის ვერსიის დაყენების შეცდომა: %s"
 
-#: libpq/auth.c:2369
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "\"LDAP TLS\" სესიის დაწყების შეცდომა: %s"
 
-#: libpq/auth.c:2446
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP სერვერი და ldapbasedn მითითებული არაა"
 
-#: libpq/auth.c:2453
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP სერვერი მითითებული არაა"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "არასწორი სიმბოლო მომხმარებლის სახელში LDAP-ით ავთენტიკაციისას"
 
-#: libpq/auth.c:2532
+#: libpq/auth.c:2540
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "ldapbinddn \"%s\"-სთვის სერვერზე \"%s\" საწყისი LDAP მიბმა ვერ განვახორციელე: %s"
 
-#: libpq/auth.c:2562
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "ფილტრისთვის \"%s\" სერვერზე \"%s\" LDAP ძებნის გაშვება შეუძლებელია: %s"
 
-#: libpq/auth.c:2578
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "LDAP-ის მომხმარებელი \"%s\" არ არსებობს"
 
-#: libpq/auth.c:2579
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "LDAP ძებნამ ფილტრისთვის \"%s\" სერვერზე \"%s\" ჩანაწერები არ დააბრუნა."
 
-#: libpq/auth.c:2583
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "LDAP-ის მომხმარებელი \"%s\" უნიკალური არაა"
 
-#: libpq/auth.c:2584
+#: libpq/auth.c:2592
 #, 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 ძებნამ ფილტრისთვის \"%s\" სერვერზე \"%s\" %d ჩანაწერი დააბრუნა."
 msgstr[1] "LDAP ძებნამ ფილტრისთვის \"%s\" სერვერზე \"%s\" %d ჩანაწერი დააბრუნა."
 
-#: libpq/auth.c:2604
+#: libpq/auth.c:2612
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr ""
 
-#: libpq/auth.c:2631
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "LDAP-ით შესვლის შეცდომა მომხმარებლისთვის \"%s\" სერვერზე \"%s\": %s"
 
-#: libpq/auth.c:2663
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "LDAP-ის დიაგნოსტიკა: %s"
 
-#: libpq/auth.c:2701
+#: libpq/auth.c:2709
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "სერტიფიკატით ავთენტიკაციის შეცდომა მომხმარებლისთვის \"%s\": კლიენტის სერტიფიკატი მომხმარებლის სახელს არ შეიცავს"
 
-#: libpq/auth.c:2722
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "სერტიფიკატით ავთენტიკაცია ჩავარდა მომხმარებლისთვის \"%s\": სათაურის DN-ის მიღება შეუძლებელა"
 
-#: libpq/auth.c:2745
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "სერტიფიკატის გადამოწმების (clientcert=verify-full) შეცდომა მომხმარებლისთვის \"%s\": DN არ ემთხვევა"
 
-#: libpq/auth.c:2750
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "სერტიფიკატის გადამოწმების (clientcert=verify-full) შეცდომა მომხმარებლისთვის \"%s\": CN არ ემთხვევა"
 
-#: libpq/auth.c:2852
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS სერვერი მითითებული არაა"
 
-#: libpq/auth.c:2859
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS-ის პაროლი მითითებული არაა"
 
-#: libpq/auth.c:2873
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "RADIUS-ით ავთენტიკაციისას %d სიმბოლოზე გრძელი პაროლები მხარდაჭერილი არაა"
 
-#: libpq/auth.c:2975 libpq/hba.c:2391
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "შეცდომა RADIUS სერვერის სახელის \"%s\" მისამართში თარგმნისას: %s"
 
-#: libpq/auth.c:2989
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "შემთხვევითი დაშიფვრის ვექტორის გენერაციის შეცდომა"
 
-#: libpq/auth.c:3026
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "პაროლის MD5-ით დაშიფვრა შეუძლებელია: %s"
 
-#: libpq/auth.c:3053
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "შეცდომა RADIUS სოკეტის შექმნისას: %m"
 
-#: libpq/auth.c:3069
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "ლოკალურ RADIUS სოკეტზე მიბმის შეცდომა: %m"
 
-#: libpq/auth.c:3079
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "შეცდომა RADIUS პაკეტის გაგზავნისას: %m"
 
-#: libpq/auth.c:3113 libpq/auth.c:3139
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "%s-დან RADIUS პასუხის მოლოდინის ვადა ამოიწურა"
 
-#: libpq/auth.c:3132
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "შეცდომა RADIUS სოკეტის სტატუსის შემოწმებისას: %m"
 
-#: libpq/auth.c:3162
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "შეცდომა RADIUS პასუხის წაკითხვისას: %m"
 
-#: libpq/auth.c:3170
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "RADIUS პასუხი \"%s\" გამოგზავნილია არასწორი პორტიდან: %d"
 
-#: libpq/auth.c:3178
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "RADIUS პასუხი %s-დან მეტისმეტად მოკლეა: %d"
 
-#: libpq/auth.c:3185
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "RADIUS პასუხს %s-დან დაზიანებული სიგრძე გააჩნია: %d (რეალური სიგრძე %d)"
 
-#: libpq/auth.c:3193
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "RADIUS პასუხი %s-დან სხვა მოთხოვნას ეკუთვნის: %d (უნდა იყოს %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "მიღებული პაკეტის MD5-ით დაშიფვრა შეუძლებელია: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "%s-დან მიღებული RADIUS პასუხის MD5 ხელმოწერა არასწორია"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "%s-დან მიღებულ RADIUS-ს პასუხს არასწორი კოდი (%d) გააჩნია მომხმარებლისთვის \"%s\""
@@ -15589,44 +15655,39 @@ msgstr "პირადი გასაღების ფაილზე \"%s\"
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "ფაილებს u=rw (0600) ან ნაკლები წვდომები უნდა ჰქონდეს, თუ მათი მფლობელი ბაზის მომხმარებელია, ან წვდომები u=rw,g=r (0640), თუ მფლობელი root-ია."
 
-#: libpq/be-secure-gssapi.c:202
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI -ის გადატანის შეცდომა"
 
-#: libpq/be-secure-gssapi.c:209
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "გამავალი GSSAPI შეტყობინება კონფიდენციალობას ვერ იყენებს"
 
-#: libpq/be-secure-gssapi.c:216 libpq/be-secure-gssapi.c:637
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "სერვერმა ძალიან დიდი GSSAPI პაკეტის გამოგზავნა სცადა (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:352
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "კლიენტის მიერ გამოგზავნილი GSSAPI-ის პაკეტი ძალიან დიდია (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:390
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-ის გადატანის მოხსნის შეცდომა"
 
-#: libpq/be-secure-gssapi.c:397
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "შემომავალი GSSAPI შეტყობინება კონფიდენციალობას ვერ იყენებს"
 
-#: libpq/be-secure-gssapi.c:578
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "კლიენტის მიერ გამოგზავნილი GSSAPI-ის პაკეტი ძალიან დიდია (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:603
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "\"GSSAPI\"-ის უსაფრთხოების კონტექსტის მიღების შეცდომა"
 
-#: libpq/be-secure-gssapi.c:704
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-ის ზომის შემოწმების შეცდომა"
 
@@ -15822,8 +15883,8 @@ msgstr "DH: DH-ის პარამეტრების დაყენებ
 
 #: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "failed to set group names specified in ssl_groups: %s"
-msgstr ""
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "ssl_groups-ში მითითებული ჯგუფის სახელები ვერ დავაყენე: %s"
 
 #: libpq/be-secure-openssl.c:1441
 msgid "No valid groups found"
@@ -15831,8 +15892,8 @@ msgstr "სწორი ჯგუფები აღმოჩენილი ა
 
 #: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL"
-msgstr "დარწმუნდით, რომ თითოეული ჯგუფის სახელის მართლწერა სწორია და მხარდაჭერილია OpenSSL-ის დაყენებული ვერსიის მიერ"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "დარწმუნდით, რომ თითოეული ჯგუფის სახელის მართლწერა სწორია და მხარდაჭერილია OpenSSL-ის დაყენებული ვერსიის მიერ."
 
 #: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
@@ -16385,7 +16446,7 @@ msgstr "კლიენტის მიერთება არ არსებ
 msgid "could not receive data from client: %m"
 msgstr "კლიენტიდან მონაცემების მიღების შეცდომა: %m"
 
-#: libpq/pqcomm.c:1151 tcop/postgres.c:4505
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "მიერთება შეწყდება, რადგან პროტოკოლის სინქრონიზაცია დაიკარგა"
@@ -16723,12 +16784,12 @@ msgstr "გაფართოებადი კვანძის ტიპი
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "ExtensibleNodeMethods \"%s\" რეგისტრირებული არ იყო"
 
-#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2306
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "ურთიერთობას \"%s\" კომპოზიტური ტიპი არ გააჩნია"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602 parser/parse_coerce.c:2740 parser/parse_coerce.c:2787 parser/parse_expr.c:2118 parser/parse_func.c:710 parser/parse_oper.c:869 utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602 parser/parse_coerce.c:2740 parser/parse_coerce.c:2787 parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869 utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "მონაცემების ტიპისთვის %s მასივის ტიპი ვერ ვიპოვე"
@@ -16743,12 +16804,12 @@ msgstr "პორტალი \"%s\" პარამეტრებით: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "უსახელო პორტალი პარამეტრებით: %s"
 
-#: optimizer/path/joinrels.c:973
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr ""
 
-#: optimizer/plan/createplan.c:7250 parser/parse_merge.c:203 rewrite/rewriteHandler.c:1689
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203 rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "ურთიერთობაზე \"%s\" MERGE-ს ვერ გაუშვებთ"
@@ -16760,42 +16821,42 @@ msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr ""
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1459 parser/analyze.c:1900 parser/analyze.c:2159 parser/analyze.c:3480
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074 parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s აკრძალულია UNION/INTERSECT/EXCEPT-სთან ერთად"
 
-#: optimizer/plan/planner.c:2202 optimizer/plan/planner.c:4045
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "\"GROUP BY\"-ის განხორციელება შეუძლებელია"
 
-#: optimizer/plan/planner.c:2203 optimizer/plan/planner.c:4046 optimizer/plan/planner.c:4727 optimizer/prep/prepunion.c:1073
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145 optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid "Some of the datatypes only support hashing, while others only support sorting."
 msgstr "ზოგიერთ მონაცემის ტიპს მხოლოდ ჰეშირების მხარდაჭერა გააჩნია, მაშინ, როცა სხვებს მხოლოდ დალაგება შეუძლიათ."
 
-#: optimizer/plan/planner.c:4726
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "\"DISTINCT\"-ის განხორციელება შეუძლებელია"
 
-#: optimizer/plan/planner.c:6188
+#: optimizer/plan/planner.c:6322
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "ფანჯრის, \"PARTITION BY\" განხორციელება შეუძლებელია"
 
-#: optimizer/plan/planner.c:6189
+#: optimizer/plan/planner.c:6323
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "ფანჯრის დამყოფი სვეტები დალაგებადი მონაცემის ტიპის უნდა იყოს."
 
-#: optimizer/plan/planner.c:6193
+#: optimizer/plan/planner.c:6327
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "ფანჯრის, \"ORDER BY\" განხორციელება შეუძლებელია"
 
-#: optimizer/plan/planner.c:6194
+#: optimizer/plan/planner.c:6328
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "ფანჯრის დამლაგებელი სვეტები დალაგებადი მონაცემის ტიპის უნდა იყოს."
@@ -16826,591 +16887,601 @@ msgstr "ურთიერთობის \"%2$s\" ატრიბუტი \"%1
 msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
 msgstr "ურთიერთობის \"%2$s\" ატრიბუტი \"%1$s\" მშობლის კოლაციას არ ემთხვევა"
 
-#: optimizer/util/clauses.c:4966
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "SQL ფუნქცია \"%s\" ხაზში ჩასმისას"
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "აღდგენისას დროებით ან უჟურნალო ურთიერთობებთან წვდომა შეუძლებელია"
 
-#: optimizer/util/plancat.c:770
+#: optimizer/util/plancat.c:776
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr ""
 
-#: optimizer/util/plancat.c:787
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "შეზღუდვას ON CONFLICT პირობაში ასოცირებული ინდექსი არ გააჩნია"
 
-#: optimizer/util/plancat.c:837
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE გამორიცხვის შეზღუდვებთან ერთად მხარდაჭერილი არაა"
 
-#: optimizer/util/plancat.c:954
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "უნიკალური ან გამორიცხვის შეზღუდვა, რომელიც ON CONFLICT-ის აღწერას ემთხვევა, არ არსებობს"
 
-#: parser/analyze.c:954 parser/analyze.c:1679
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VALUES-ის სიები ყველა ტოლი სიგრძის უნდა იყოს"
 
-#: parser/analyze.c:1156
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT-ს მეტი გამოსახულება გააჩნია, ვიდრე სამიზნე სვეტი"
 
-#: parser/analyze.c:1174
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT-ს მეტი სამიზნე სვეტი გააჩნია, ვიდრე გამოსახულება"
 
-#: parser/analyze.c:1178
+#: parser/analyze.c:1093
 #, c-format
 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 ""
 
-#: parser/analyze.c:1486 parser/analyze.c:1873
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO აქ დაშვებული არაა"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1802 parser/analyze.c:3712
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s-ს VALUES-ზე ვერ გამოიყენებთ"
 
-#: parser/analyze.c:2040
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "არასწორი UNION/INTERSECT/EXCEPT ORDER BY პირობა"
 
-#: parser/analyze.c:2041
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
 
-#: parser/analyze.c:2042
+#: parser/analyze.c:1957
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr ""
 
-#: parser/analyze.c:2149
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2221
+#: parser/analyze.c:2136
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr ""
 
-#: parser/analyze.c:2308
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "ყოველ %s მოთხოვნას სვეტების ტოლი რაოდენობა უნდა ჰქონდეს"
 
-#: parser/analyze.c:2665
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr ""
 
 #. translator: %s is OLD or NEW
-#: parser/analyze.c:2753 parser/analyze.c:2763
+#: parser/analyze.c:2668 parser/analyze.c:2678
 #, c-format
 msgid "%s cannot be specified multiple times"
 msgstr "%s-ის რამდენჯერმე მითითება აკრძალულია"
 
-#: parser/analyze.c:2775 parser/parse_relation.c:473
+#: parser/analyze.c:2690 parser/parse_relation.c:473
 #, c-format
 msgid "table name \"%s\" specified more than once"
-msgstr ""
+msgstr "ცხრილის სახელი \"%s\" ერთზე მეტჯერაა მითითებული"
 
-#: parser/analyze.c:2823
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING-ს ერთი სვეტი მაინც უნდა ჰქონდეს"
 
-#: parser/analyze.c:2925
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "მინიჭების წყარომ %d სვეტი დააბრუნა"
 msgstr[1] "მინიჭების წყარომ %d სვეტი დააბრუნა"
 
-#: parser/analyze.c:2986
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "\"%s\" ცვლადის ტიპია \"%s\", მაგრამ გამოსახულება %s ტიპისაა"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:3111 parser/analyze.c:3119
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "ორივე, %s და %s ერთად მითითება შეუძლებელია"
 
-#: parser/analyze.c:3139
+#: parser/analyze.c:3055
 #, 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:3147
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s მხარდაჭერილი არაა"
 
-#: parser/analyze.c:3150
+#: parser/analyze.c:3066
 #, 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:3158
+#: parser/analyze.c:3074
 #, 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:3169
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s არასწორია"
 
-#: parser/analyze.c:3172
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "დამოუკიდებელი კურსორები READ ONLY ტიპის უნდა იყოს."
 
-#: parser/analyze.c:3266
+#: parser/analyze.c:3182
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "მატერიალიზებულმა ხედებმა WITH-ში მონაცემების-შემცვლელი გამოსახულებები არ უნდა გამოიყენონ"
 
-#: parser/analyze.c:3276
+#: parser/analyze.c:3192
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "მატერიალიზებულმა ხედებმა დროებითი ცხრილები ან ხედები არ უნდა გამოიყენონ"
 
-#: parser/analyze.c:3286
+#: parser/analyze.c:3202
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "მატერიალიზებული ხედის აღწერა მიმაგრებული პარამეტრების გამოყენებით შეუძლებელია"
 
-#: parser/analyze.c:3298
+#: parser/analyze.c:3214
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "მატერიალიზებული ხედების ჟურნალის გამორთვა შეუძლებელია"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3487
+#: parser/analyze.c:3403
 #, 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:3494
+#: parser/analyze.c:3410
 #, 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:3501
+#: parser/analyze.c:3417
 #, 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:3508
+#: parser/analyze.c:3424
 #, 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:3515
+#: parser/analyze.c:3431
 #, 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:3522
+#: parser/analyze.c:3438
 #, 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:3621
+#: parser/analyze.c:3537
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr ""
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3685
+#: parser/analyze.c:3601
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s join-ზე ვერ გადატარდება"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3694
+#: parser/analyze.c:3610
 #, 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:3703
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s ცხრილის ფუნქციაზე ვერ გადატარდება"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3721
+#: parser/analyze.c:3637
 #, 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:3730
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr ""
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3750
+#: parser/analyze.c:3666
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr ""
 
-#: parser/parse_agg.c:215 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "ტიპისთვის %s დალაგების ოპერატორის იდენტიფიკაცია შეუძლებელია"
 
-#: parser/parse_agg.c:217
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "DISTINCT-ის მქონე აგრეგატებს შეყვანილი ინფორმაციის დალაგება თვითონ უნდა შეეძლოთ."
 
-#: parser/parse_agg.c:275
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING-ის არგუმენტების რიცხვი 32-ზე ნაკლები უნდა იყოს"
 
-#: parser/parse_agg.c:378
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "აგრეგატულ ფუნქციებს JOIN-ის პირობებში ვერ გამოიყენებთ"
 
-#: parser/parse_agg.c:380
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "დაჯგუფების ოპერაციებს JOIN-ის პირობებში ვერ გამოიყენებთ"
 
-#: parser/parse_agg.c:390
+#: parser/parse_agg.c:394
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "აგრეგატული ფუნქციები მათი საკუთარი მოთხოვნის დონის FROM პირობაში დაშვებული არაა"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "დაჯგუფების ფუნქციები მათი საკუთარი მოთხოვნის დონის FROM პირობაში დაშვებული არაა"
 
-#: parser/parse_agg.c:397
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "აგრეგატულ ფუნქციებს FROM-ში ვერ გამოიყენებთ"
 
-#: parser/parse_agg.c:399
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "დაჯგუფების ოპერაციებს FROM-ში ვერ გამოიყენებთ"
 
-#: parser/parse_agg.c:407
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "წესის გამოსახულებებში აგრეგატული ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:409
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "წესის გამოსახულებებში დაჯგუფების ოპერაციები დაუშვებელია"
 
-#: parser/parse_agg.c:426
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "ფანჯრის RANGE-ში აგრეგატული ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "ფანჯრის RANGE-ში დაჯგუფების ოპერაციები დაუშვებელია"
 
-#: parser/parse_agg.c:433
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "ფანჯრის ROWS-ში აგრეგატული ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "ფანჯრის ROWS_ში დაჯგუფების ოპერაციები დაუშვებელია"
 
-#: parser/parse_agg.c:440
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "აგრეგატული ფუნქციები ფანჯრის GROUPS-ში დაშვებული არაა"
 
-#: parser/parse_agg.c:442
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "დაჯგუფების ფუნქციები ფანჯრის GROUPS-ში დაშვებული არაა"
 
-#: parser/parse_agg.c:455
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "აგრეგატული ფუნქციები MERGE WHEN-ის პირობებში დაშვებული არაა"
 
-#: parser/parse_agg.c:457
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "დაჯგუფების ფუნქციები MERGE WHEN-ის პირობებში დაშვებული არაა"
 
-#: parser/parse_agg.c:484
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "აგრეგატული ფუნქციები შეზღუდვის შემოწმებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:486
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "დაჯგუფების ფუნქციები შეზღუდვის შემოწმებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:493
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "აგრეგატული ფუნქციები DEFAULT გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "დაჯგუფების ფუნქციები DEFAULT გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:500
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "აგრეგატული ფუნქციები ინდექსის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "დაჯგუფების ფუნქციები ინდექსის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:507
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "აგრეგატული ფუნქციები ინდექსის პრედიკატებში დაშვებული არაა"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "დაშვებული ფუნქციები ინდექსის პრედიკატებში დაშვებული არაა"
 
-#: parser/parse_agg.c:514
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "აგრეგატული ფუნქციები სტატისტიკის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "დაჯგუფების ფუნქციები სტატისტიკის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:521
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "აგრეგატული ფუნქციები გადაყვანის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "დაჯგუფების ფუნქციები გადაყვანის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:528
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "აგრეგატული ფუნქციები EXECUTE-ის პარამეტრებში დაშვებული არაა"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "დაჯგუფების ფუნქციები EXECUTE-ის პარამეტრებში დაშვებული არაა"
 
-#: parser/parse_agg.c:535
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "აგრეგატული ფუნქციები WHEN-ის ტრიგერის პირობებში დაშვებული არაა"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "დაჯგუფების ფუნქციები WHEN-ის ტრიგერის პირობებში დაშვებული არაა"
 
-#: parser/parse_agg.c:542
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "აგრეგატული ფუნქციები დანაყოფის საზღვარში დაშვებული არაა"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "დაჯგუფების ფუნქციები დანაყოფის საზღვარში დაშვებული არაა"
 
-#: parser/parse_agg.c:549
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "აგრეგატული ფუნქციები დანაყოფის გასაღების გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:551
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "დაჯგუფების ფუნქციები დანაყოფის გასაღების გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:557
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "აგრეგატული ფუნქციები სვეტის გენერაციის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:559
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "დაჯგუფების ფუნქციები სვეტის გენერაციის გამოსახულებებში დაშვებული არაა"
 
-#: parser/parse_agg.c:565
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "აგრეგატული ფუნქციები CALL-ის არგუმენტებში დაშვებული არაა"
 
-#: parser/parse_agg.c:567
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "დაჯგუფების ფუნქციები CALL-ის არგუმენტებში დაშვებული არაა"
 
-#: parser/parse_agg.c:573
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "აგრეგატული ფუნქციები COPY FROM WHERE პირობებში დაშვებული არაა"
 
-#: parser/parse_agg.c:575
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "დაჯგუფების ფუნქციები COPY FROM WHERE პირობებში დაშვებული არაა"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:602 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "აგრეგატული ფუნქციები %s-ში დაშვებული არაა"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:605
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "დაჯგუფების ფუნქციები %s-ში დაშვებული არაა"
 
-#: parser/parse_agg.c:706
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "გარე დონის აგრეგატი ერთმანეთში ჩასმულ CTE-ს ვერ გამოიყენებს"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr ""
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr ""
 
-#: parser/parse_agg.c:784
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "აგრეგატული ფუნქციის გამოძახებები არ შეძლება, სეტების დამბრუნებელი ფუნქციის გამოძახებებს შეიცავდეს"
 
-#: parser/parse_agg.c:785 parser/parse_expr.c:1760 parser/parse_expr.c:2251 parser/parse_func.c:885
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265 parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr ""
 
-#: parser/parse_agg.c:790
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "აგრეგატული ფუნქციის გამოძახებები არ შეიძლება, ფანჯრის ფუნქციის გამოძახებებს შეიცავდეს"
 
-#: parser/parse_agg.c:869
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "\"JOIN\"-ის პირობებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:876
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "\"FROM\"-ის ფუნქციებში ფანჯრების ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:882
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "წესების გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:895
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "ფანჯრის აღწერებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:906
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "\"MERGE WHEN\" პირობებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:931
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "შეზღუდვის შემოწმებაში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:935
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "ნაგულისხმევ გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:938
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "ინდექსის გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:941
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "სტატისტიკის გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:944
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "ინდექსის პრედიკატებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:947
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "გადაყვანის გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:950
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "\"EXECUTE\"-ის პარამეტრებში ფანჯრის ფუნქციები დაუშვებელია\""
 
-#: parser/parse_agg.c:953
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "\"WHEN\"-ის პირობების ტრიგერში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:956
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "დანაყოფის საზღვარში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:959
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "დანაყოფის გასაღების გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:962
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "\"CALL\"-ის არგუმენტებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:965
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "\"COPY FROM WHERE\"-ის პირობებში ფანჯრის ფუნქციები დაუშვებელია"
 
-#: parser/parse_agg.c:968
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "სვეტის გენერაციის გამოსახულებებში ფანჯრის ფუნქციები დაუშვებელია"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:991 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "ფანჯრის ფუნქციები არ არის დაშვებული %s-ში"
 
-#: parser/parse_agg.c:1025 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "ფანჯარა \"%s\" არ არსებობს"
 
-#: parser/parse_agg.c:1115
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "ძალიან ბევრი დაჯგუფების ნაკრებია (მაქსიმუმ 4096)"
 
-#: parser/parse_agg.c:1276
+#: parser/parse_agg.c:1329
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr ""
 
-#: parser/parse_agg.c:1499
+#: parser/parse_agg.c:1552
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr ""
 
-#: parser/parse_agg.c:1502
+#: parser/parse_agg.c:1555
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr ""
 
-#: parser/parse_agg.c:1507
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "ქვემოთხოვნა outer მოთხოვნიდან დაუჯგუფებელ სვეტს \"%s.%s\" იყენებს"
 
-#: parser/parse_agg.c:1672
+#: parser/parse_agg.c:1725
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr ""
@@ -17686,7 +17757,7 @@ msgstr ""
 msgid "Cast the offset value to the exact intended type."
 msgstr "წანაცვლების მნიშვნელობის ზუსტად განსაზღვრულ ტიპში დაკასტვა."
 
-#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086 parser/parse_coerce.c:1104 parser/parse_coerce.c:1119 parser/parse_expr.c:2152 parser/parse_expr.c:2770 parser/parse_expr.c:3421 parser/parse_expr.c:3650 parser/parse_target.c:1001
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086 parser/parse_coerce.c:1104 parser/parse_coerce.c:1119 parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435 parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "%s ტიპის %s-ში გადაყვანა შეუძლებელია"
@@ -18016,328 +18087,328 @@ msgstr "რეკურსიულ მოთხოვნაში FOR UPDATE/SH
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr ""
 
-#: parser/parse_expr.c:311
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "ამ კონტექსტში ნაგულისხმევს ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:404 parser/parse_relation.c:3797 parser/parse_relation.c:3807 parser/parse_relation.c:3825 parser/parse_relation.c:3832 parser/parse_relation.c:3846
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797 parser/parse_relation.c:3807 parser/parse_relation.c:3825 parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "სვეტი %s.%s არ არსებობს"
 
-#: parser/parse_expr.c:416
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "სვეტი \"%s\" მონაცემის ტიპში %s აღმოჩენილი არაა"
 
-#: parser/parse_expr.c:422
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "ჩანაწერის მონაცემის ტიპში სვეტის \"%s\" იდენტიფიკაცია შეუძლებელია"
 
-#: parser/parse_expr.c:428
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr ""
 
-#: parser/parse_expr.c:459 parser/parse_target.c:735
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr ""
 
-#: parser/parse_expr.c:582
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr ""
 
-#: parser/parse_expr.c:585
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr ""
 
-#: parser/parse_expr.c:844 parser/parse_relation.c:848 parser/parse_relation.c:930 parser/parse_target.c:1241
+#: parser/parse_expr.c:845 parser/parse_relation.c:848 parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "სვეტის მითითება \"%s\" ორაზროვანია"
 
-#: parser/parse_expr.c:900 parser/parse_param.c:111 parser/parse_param.c:143 parser/parse_param.c:205 parser/parse_param.c:304
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143 parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "პარამეტრი $%d არ არსებობს"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1101 parser/parse_expr.c:3081
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "%s-სთვის აუცილებელია = ოპერატორი, რომ ლოგიკური მნიშვნელობა დააბრუნოს"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1107 parser/parse_expr.c:3088
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s -მა სეტი არ უნდა დააბრუნოს"
 
-#: parser/parse_expr.c:1393
+#: parser/parse_expr.c:1405
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
 msgstr ""
 
-#: parser/parse_expr.c:1517 parser/parse_expr.c:1549
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr ""
 
-#: parser/parse_expr.c:1563
+#: parser/parse_expr.c:1575
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr ""
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1758 parser/parse_expr.c:2249 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "%s-ში სეტის-დამბრუნებელი ფუნქციები დაშვებული არაა"
 
-#: parser/parse_expr.c:1822
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "შეზღუდვის შემმოწმებელში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1826
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "ნაგულისხმევ გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1829
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "ინდექსის გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1832
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "ინდექსის პრედიკატში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1835
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "სტატისტიკის გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1838
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in transform expression"
 msgstr "გარდაქმნის გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1841
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "პარამეტრში \"EXECUTE\" ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1844
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "\"WHEN\" პირობის ტრიგერში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1847
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "დანაყოფის საზღვარში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1850
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "დანაყოფის გასაღების გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1853
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "\"CALL\"-ის არგუმენტში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1856
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "\"COPY FROM WHERE\" პირობაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "სვეტების გენერაციის გამოსახულებაში ქვემოთხოვნას ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:1912 parser/parse_expr.c:3780
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "ქვემოთხოვნამ მხოლოდ ერთი სვეტი უნდა დააბრუნოს"
 
-#: parser/parse_expr.c:1983
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "ქვემოთხოვნას ძალიან ბევრი სვეტი აქვს"
 
-#: parser/parse_expr.c:1988
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "ქვემოთხოვნას ძალიან ცოტა სვეტი აქვს"
 
-#: parser/parse_expr.c:2092
+#: parser/parse_expr.c:2104
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "ცარიელი მასივის ტიპის დადგენა შეუძლებელია"
 
-#: parser/parse_expr.c:2093
+#: parser/parse_expr.c:2105
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr ""
 
-#: parser/parse_expr.c:2107
+#: parser/parse_expr.c:2119
 #, c-format
 msgid "could not find element type for data type %s"
-msgstr ""
+msgstr "ვერ ვიპოვე ელემენტის ტიპი მონაცემების ტიპისთვის %s"
 
-#: parser/parse_expr.c:2190
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW გამოსახულებებს მაქსიმუმ %d ელემენტი შეიძლება ჰქონდეს"
 
-#: parser/parse_expr.c:2395
+#: parser/parse_expr.c:2409
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "უსახელო XML ატრიბუტის მნიშვნელობა სვეტის მიმართვას უნდა წარმოადგენდეს"
 
-#: parser/parse_expr.c:2396
+#: parser/parse_expr.c:2410
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "უსახელო XML ელემენტის მნიშვნელობა სვეტის მიმართვას უნდა წარმოადგენდეს"
 
-#: parser/parse_expr.c:2411
+#: parser/parse_expr.c:2425
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "XML ატრიბუტის სახელი \"%s\" ერთზე მეტჯერ გამოჩნდა"
 
-#: parser/parse_expr.c:2519
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "'XMLSERIALIZE'-ის შედეგის %s-ში დაკასტვა შეუძლებელია"
 
-#: parser/parse_expr.c:2843 parser/parse_expr.c:3039
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "მწკრივის გამოსახულებებში ჩანაწერების რაოდენობა ტოლი არაა"
 
-#: parser/parse_expr.c:2853
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "ნულოვანი სიგრძის მწკრივების შედარება შეუძლებელია"
 
-#: parser/parse_expr.c:2878
+#: parser/parse_expr.c:2892
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "მწკრივის შედარების ოპერატორმა ლოგიკური მნიშვნელობა უნდა დააბრუნოს და არა ტიპი %s"
 
-#: parser/parse_expr.c:2885
+#: parser/parse_expr.c:2899
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "მწკრივის შედარების ოპერატორმა სეტი არ უნდა დააბრუნოს"
 
-#: parser/parse_expr.c:2944 parser/parse_expr.c:2985
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "მწკრივის შედარების ოპერატორის %s ინტერპრეტაციის დადგენა შეუძლებელია"
 
-#: parser/parse_expr.c:2946
+#: parser/parse_expr.c:2960
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "მწკრივის შედარების ოპერატორები ბინარული ხის ოპერატორის ოჯახებთან უნდა იყოს ასოცირებული."
 
-#: parser/parse_expr.c:2987
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr ""
 
-#: parser/parse_expr.c:3322
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr ""
 
-#: parser/parse_expr.c:3386
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
-msgstr ""
+msgstr "ვერ ვიპოვე არამწკრივი ტიპები ცხადი FORMAT JSON პირობისთვის"
 
-#: parser/parse_expr.c:3387
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
-msgstr ""
+msgstr "ვერ ვიპოვე არამწკრივი ტიპები არაცხადი FORMAT JSON პირობისთვის"
 
-#: parser/parse_expr.c:3476
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "'JSON' ფორმატის არა-სტრიქონის გამოტანის ტიპებთან ერთად გამოყენება შეუძლებელია"
 
-#: parser/parse_expr.c:3489
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr ""
 
-#: parser/parse_expr.c:3494
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "\"JSON\"-ის არასწორი კოდირება"
 
-#: parser/parse_expr.c:3495
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "მხარდაჭერილია მხოლოდ UTF8 JSON კოდირება."
 
-#: parser/parse_expr.c:3532
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr ""
 
-#: parser/parse_expr.c:3537
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "ფსევდოტიპების დაბრუნება SQL/JSON ფუნქციებში მხარდაჭერილი არაა"
 
-#: parser/parse_expr.c:3865 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "ფანჯრის ფუნქციებისთვის აგრეგატული ORDER BY განხორციელებული არაა"
 
-#: parser/parse_expr.c:4088
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr ""
 
-#: parser/parse_expr.c:4108
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "%s ტიპის IS JSON პრედიკატში გამოყენება შეუძლებელია"
 
-#: parser/parse_expr.c:4134 parser/parse_expr.c:4255
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
 #, c-format
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "%s ტიპის გამოყენება %s-ის RETURNING პირობაში შეუძლებელია"
 
-#: parser/parse_expr.c:4136
+#: parser/parse_expr.c:4150
 #, c-format
 msgid "Try returning json or jsonb."
-msgstr ""
+msgstr "სცადეთ, დააბრუნოთ json ან jsonb."
 
-#: parser/parse_expr.c:4184
+#: parser/parse_expr.c:4198
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
-msgstr ""
+msgstr "არასტრიქონის ტიპებს WITH UNIQUE KEYS პირობასთან ერთად ვერ გამოიყენებთ"
 
-#: parser/parse_expr.c:4258
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
-msgstr ""
+msgstr "სცადეთ, დააბრუნოთ სტრიქონის ტიპი, ან bytea."
 
-#: parser/parse_expr.c:4323
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr ""
 
-#: parser/parse_expr.c:4336
+#: parser/parse_expr.c:4353
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
 msgstr ""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4350 parser/parse_expr.c:4379 parser/parse_expr.c:4410 parser/parse_expr.c:4436 parser/parse_expr.c:4462 parser/parse_jsontable.c:92
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427 parser/parse_expr.c:4453 parser/parse_expr.c:4479 parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "%s-ის არასწორი ქცევა"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4353 parser/parse_expr.c:4382
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
 msgstr ""
@@ -18345,67 +18416,72 @@ msgstr ""
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4360 parser/parse_expr.c:4389 parser/parse_expr.c:4418 parser/parse_expr.c:4446 parser/parse_expr.c:4472
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435 parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "%s-ის არასწორი ქცევა სვეტისთვის \"%s\""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4363 parser/parse_expr.c:4392
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
 msgstr ""
 
-#: parser/parse_expr.c:4411
+#: parser/parse_expr.c:4428
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
 msgstr ""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4421
+#: parser/parse_expr.c:4438
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
 msgstr ""
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4439 parser/parse_expr.c:4465
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr ""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4449 parser/parse_expr.c:4475
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
 msgstr ""
 
-#: parser/parse_expr.c:4505
+#: parser/parse_expr.c:4526
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "JSON ბილიკის გამოსახულების ტიპი %s უნდა იყოს და არა %s"
 
-#: parser/parse_expr.c:4723
+#: parser/parse_expr.c:4766
 #, c-format
 msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
 msgstr ""
 
-#: parser/parse_expr.c:4728
+#: parser/parse_expr.c:4771
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "DEFAULT გამოსახულება სვეტზე მიმართვებს არ უნდა შეიცავდეს"
 
-#: parser/parse_expr.c:4733
+#: parser/parse_expr.c:4776
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "DEFAULT გამოსახულებამ სეტი არ უნდა დააბრუნოს"
 
-#: parser/parse_expr.c:4809 parser/parse_expr.c:4818
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr ""
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "%s ქცევის გამოსახულების ტიპის %s-ში გადაყვანა შეუძლებელია"
 
-#: parser/parse_expr.c:4812
+#: parser/parse_expr.c:4873
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "დაგჭირდებათ გამოსახულების აშკარად გადაყვანა ტიპში %s."
@@ -19042,12 +19118,12 @@ msgstr ""
 #: parser/parse_target.c:890
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr ""
+msgstr "ქვეხედს \"%s\" აქვს ტიპი %s, მაგრამ გამოსახულების ტიპია %s"
 
 #: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
-msgstr ""
+msgstr "SELECT * ცხრილების მითითების გარეშე სწორი არაა"
 
 #: parser/parse_type.c:100
 #, c-format
@@ -19179,257 +19255,257 @@ msgstr ""
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "პირობაში LIKE ურთიერთობა \"%s\" არასწორია"
 
-#: parser/parse_utilcmd.c:1896 parser/parse_utilcmd.c:2004
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr ""
 
-#: parser/parse_utilcmd.c:2398
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "'CREATE TABLE'-ში არსებულ ინდექსს ვერ გამოიყენებთ"
 
-#: parser/parse_utilcmd.c:2418
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "ინდექსი \"%s\" შეზღუდვასთან უკვე ასოცირებულია"
 
-#: parser/parse_utilcmd.c:2444
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" უნიკალური ინდექსი არაა"
 
-#: parser/parse_utilcmd.c:2445 parser/parse_utilcmd.c:2452 parser/parse_utilcmd.c:2459 parser/parse_utilcmd.c:2535
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473 parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr ""
 
-#: parser/parse_utilcmd.c:2451
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "ინდექსი \"%s\" გამოსახულებებს შეიცავს"
 
-#: parser/parse_utilcmd.c:2458
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" ნაწილობრივი ინდექსია"
 
-#: parser/parse_utilcmd.c:2470
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" გადადებადი ინდექსია"
 
-#: parser/parse_utilcmd.c:2471
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr ""
 
-#: parser/parse_utilcmd.c:2534
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr ""
 
-#: parser/parse_utilcmd.c:2726
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr ""
 
-#: parser/parse_utilcmd.c:2732
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr ""
 
-#: parser/parse_utilcmd.c:2777
+#: parser/parse_utilcmd.c:2798
 #, c-format
 msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
 msgstr ""
 
-#: parser/parse_utilcmd.c:2805
+#: parser/parse_utilcmd.c:2826
 #, c-format
 msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
 msgstr ""
 
-#: parser/parse_utilcmd.c:3102
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr ""
 
-#: parser/parse_utilcmd.c:3174
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr ""
 
-#: parser/parse_utilcmd.c:3217
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "მატერიალიზებულ ხედებზე წესები მხარდაჭერილი არაა"
 
-#: parser/parse_utilcmd.c:3277
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr ""
 
-#: parser/parse_utilcmd.c:3349
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr ""
 
-#: parser/parse_utilcmd.c:3367 parser/parse_utilcmd.c:3468 rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1234
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489 rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "პირობითი UNION/INTERSECT/EXCEPT ოპერატორები განხორციელებული არაა"
 
-#: parser/parse_utilcmd.c:3385
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON SELECT წესში OLD-ს ვერ გამოიყენებთ"
 
-#: parser/parse_utilcmd.c:3389
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON SELECT წესში NEW-ს ვერ გამოიყენებთ"
 
-#: parser/parse_utilcmd.c:3398
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON INSERT წესში OLD-ს ვერ გამოიყენებთ"
 
-#: parser/parse_utilcmd.c:3404
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON DELETE წესში NEW-ს ვერ გამოიყენებთ"
 
-#: parser/parse_utilcmd.c:3432
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "'WITH' მოთხოვნაში OLD-ზე მიმართვა შეუძლებელია"
 
-#: parser/parse_utilcmd.c:3439
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "'WITH' მოთხოვნაში NEW-ზე მიმართვა შეუძლებელია"
 
-#: parser/parse_utilcmd.c:3897
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "არასწორ ადგილას დასმული DEFERRABLE პირობა"
 
-#: parser/parse_utilcmd.c:3902 parser/parse_utilcmd.c:3917
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "ერთზე მეტი DEFERRABLE/NOT DEFERRABLE პირობა დაშვებული არაა"
 
-#: parser/parse_utilcmd.c:3912
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "არასწორ ადგილას დასმული NOT DEFERRABLE პირობა"
 
-#: parser/parse_utilcmd.c:3933
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "არასწორ ადგილას დასმული INITIALLY DEFERRABLE პირობა"
 
-#: parser/parse_utilcmd.c:3938 parser/parse_utilcmd.c:3964
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "ერთზე მეტი INITIALLY IMMEDIATE/DEFERRED დაშვებული არაა"
 
-#: parser/parse_utilcmd.c:3959
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "არასწორ ადგილას დასმული INITIALLY IMMEDIATE პირობა"
 
-#: parser/parse_utilcmd.c:3976
+#: parser/parse_utilcmd.c:3997
 #, c-format
 msgid "misplaced ENFORCED clause"
 msgstr "არასწორ ადგილას დასმული ENFORCED პირობა"
 
-#: parser/parse_utilcmd.c:3981 parser/parse_utilcmd.c:3998
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
 #, c-format
 msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
 msgstr "ერთზე მეტი ENFORCED/NOT ENFORCED პირობა დაშვებული არაა"
 
-#: parser/parse_utilcmd.c:3993
+#: parser/parse_utilcmd.c:4014
 #, c-format
 msgid "misplaced NOT ENFORCED clause"
 msgstr "არასწორ ადგილას დასმული NOT ENFORCED პირობა"
 
-#: parser/parse_utilcmd.c:4191
+#: parser/parse_utilcmd.c:4212
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4226
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
 msgstr "\"%s\" დაყოფილი ცხრილი არაა"
 
-#: parser/parse_utilcmd.c:4233
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "ცხრილი \"%s\" დაყოფილი არაა"
 
-#: parser/parse_utilcmd.c:4240
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "ინდექსი \"%s\" დაყოფილი არაა"
 
-#: parser/parse_utilcmd.c:4280
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4297
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4303 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4310 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4323
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4376
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4382
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4386
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr ""
 
-#: parser/parse_utilcmd.c:4500
+#: parser/parse_utilcmd.c:4523
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "დიაპაზონის საზღვრებში NULL-ის მითითება შეუძლებელია"
 
-#: parser/parse_utilcmd.c:4549
+#: parser/parse_utilcmd.c:4571
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "ყოველი MAXVALUE საზღვის შემდეგ ყველა MAXVALUE უნდა იყოს"
 
-#: parser/parse_utilcmd.c:4556
+#: parser/parse_utilcmd.c:4578
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "ყოველი MINVALUE საზღვის შემდეგ ყველა MINVALUE უნდა იყოს"
 
-#: parser/parse_utilcmd.c:4599
+#: parser/parse_utilcmd.c:4621
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr ""
@@ -19447,7 +19523,7 @@ msgstr "უნიკოდის სპეცკოდის არასწო
 msgid "invalid Unicode escape value"
 msgstr "უნიკოდის სპეცკოდის არასწორი მნიშვნელობა"
 
-#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6842
+#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6853
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "უნიკოდის არასწორი სპეცკოდი"
@@ -19457,7 +19533,7 @@ msgstr "უნიკოდის არასწორი სპეცკოდ
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "უნიკოდის სპეცკოდების შესაძლო ვარიანტებია \\XXXX და \\+XXXXXXXX."
 
-#: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695 utils/adt/varlena.c:6867
+#: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695 utils/adt/varlena.c:6878
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "უნკოდის არასწორი სუროგატული წყვილი"
@@ -19532,7 +19608,7 @@ msgstr ""
 msgid "column %d of the partition key has type \"%s\", but supplied value is of type \"%s\""
 msgstr ""
 
-#: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209 port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209 port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "მონაცემების საქაღალდის (%s) პოვნა შეუძლებელია: %m"
@@ -19593,34 +19669,34 @@ msgstr "ამ პლატფორმაზე უზარმაზარი
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "\"shared_memory_type\" პარამეტრთან ერთად უზარმაზარი გვერდები მხარდაჭერილი არაა"
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1406
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "უკვე არსებული გაზიარებული მეხსიერების ბლოკი (გასაღები %lu, ID %lu) ჯერ კიდევ გამოიყენება"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1408
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr ""
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "სემაფორების შექმნის შეცდომა: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "ავარიული სისტემური ფუნქცია იყო semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
 "The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
 msgstr ""
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr ""
@@ -19747,42 +19823,42 @@ msgstr "წარუმატებლად გამოძახებულ
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "ავტომომტვერსასრუტების დამხმარე პროცესის გაშვებას მეტისმეტად დიდი დრო მოუნდა. ის გაუქმდა"
 
-#: postmaster/autovacuum.c:2221
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "ავტომომტვერსასრუტება: წაიშლება მიტოვებული დროებითი ცხრილი \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2457
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "ცხრილის ავტოდამტვერსასრუტება: \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2460
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "ცხრილის ავტოანალიზი: \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2654
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr ""
 
-#: postmaster/autovacuum.c:3312
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "ავტომომტვერსასრუტება არ გაშვებულა კონფიგურაციის შეცდომის გამო"
 
-#: postmaster/autovacuum.c:3313
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "ჩართეთ \"track_counts\" პარამეტრი."
 
-#: postmaster/autovacuum.c:3435
+#: postmaster/autovacuum.c:3471
 #, c-format
 msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
 msgstr ""
 
-#: postmaster/autovacuum.c:3437
+#: postmaster/autovacuum.c:3473
 #, c-format
 msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
 msgstr ""
@@ -19792,81 +19868,81 @@ msgstr ""
 msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
 msgstr ""
 
-#: postmaster/bgworker.c:645
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr ""
 
-#: postmaster/bgworker.c:656
+#: postmaster/bgworker.c:657
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr ""
 
-#: postmaster/bgworker.c:670
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "ფონური დამხმარე პროცესი \"%s\": არასწორი გადატვირთვის ინტერვალი"
 
-#: postmaster/bgworker.c:685
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr ""
 
-#: postmaster/bgworker.c:709 tcop/postgres.c:3345
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr ""
 
-#: postmaster/bgworker.c:868 postmaster/bgworker.c:902
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr ""
 
-#: postmaster/bgworker.c:878 postmaster/bgworker.c:912
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "არასწორი დამუშავების რეჟიმი ფონურ დამხმარე პროცესში"
 
-#: postmaster/bgworker.c:965
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr "ფონური დამხმარე პროცესი \"%s\": \"shared_preload_libraries\"-ში დარეგისტრირებული უნდა იყოს"
 
-#: postmaster/bgworker.c:988
+#: postmaster/bgworker.c:989
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "ფონური დახმამრე პროცესი \"%s\": გაფრთხილების მოთხოვნა მხოლოდ დინამიკურ ფონურ დამხმარე პროცესებს შეუძლიათ"
 
-#: postmaster/bgworker.c:1003
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "მეტისმეტად ბევრი ფონური დამხმარე პროცესი"
 
-#: postmaster/bgworker.c:1004
+#: postmaster/bgworker.c:1005
 #, 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] ""
 msgstr[1] ""
 
-#: postmaster/bgworker.c:1008 postmaster/checkpointer.c:459
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "გაითვალისწინეთ, რომ შეიძლება კონფიგურაციის პარამეტრის \"%s\" გაზრდა გჭირდებათ."
 
-#: postmaster/checkpointer.c:455
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "საკონტროლო წერტილები მეტისმეტად ხშირად ხდება (%d წამიანი შუალედით)"
 msgstr[1] "საკონტროლო წერტილები მეტისმეტად ხშირად ხდება (%d წამიანი შუალედით)"
 
-#: postmaster/checkpointer.c:1125
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "საკონტროლო წერტილის მოთხოვნის შეცდომა"
 
-#: postmaster/checkpointer.c:1126
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "დეტალებისთვის იხილეთ სერვერის ჟურნალის უახლესი შეტყობინებები."
@@ -19981,27 +20057,27 @@ msgstr ""
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr ""
 
-#: postmaster/pgarch.c:885 postmaster/pgarch.c:924
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "დაყენებულია ორივე, \"archive_command\" და \"archive_library\""
 
-#: postmaster/pgarch.c:886 postmaster/pgarch.c:925
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "\"archive_command\"-დან და \"archive_library\"-დან, მხოლოდ, ერთ-ერთი შეგიძლიათ, დააყენოთ."
 
-#: postmaster/pgarch.c:903
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr ""
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr ""
 
-#: postmaster/pgarch.c:946
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr ""
@@ -20117,7 +20193,7 @@ msgstr "%s-ის ჩატვირთვა შეუძლებელია"
 msgid "postmaster became multithreaded during startup"
 msgstr "პროცესი postmaster გაშვებისას მრავალნაკადიანი გახდა"
 
-#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3661
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "დააყენეთ LC_ALL გარემოს ცვლადი სწორ ლოკალზე."
@@ -20260,114 +20336,114 @@ msgstr "შვილი პროცესი ტრეკინგის გა
 msgid "background worker \"%s\""
 msgstr "ფონური დამხმარე პროცესი \"%s\""
 
-#: postmaster/postmaster.c:2797
+#: postmaster/postmaster.c:2804
 #, 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:2830
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) დასრულდა სტატუსით %d"
 
-#: postmaster/postmaster.c:2832 postmaster/postmaster.c:2844 postmaster/postmaster.c:2854 postmaster/postmaster.c:2865
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851 postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:2841
+#: postmaster/postmaster.c:2848
 #, 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:2851
+#: postmaster/postmaster.c:2858
 #, 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:2863
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) დასრულდა უცნობი სტატუსით %d"
 
-#: postmaster/postmaster.c:3154
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "მონაცემთა ბაზის სისტემის არანორმალური გამორთვა"
 
-#: postmaster/postmaster.c:3180
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "მუშაობის დასრულება გამშვები პროცესის შეცდომის გამო"
 
-#: postmaster/postmaster.c:3186
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "მუშაობა დასრულდება. რადგან \"restart_after_crash\" გამორთულია"
 
-#: postmaster/postmaster.c:3198
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "სერვერის ყველა პროცესი დასრულდა; მიმდინარეობს რეინიციალიზაცია"
 
-#: postmaster/postmaster.c:3591
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "ახალი პროცესის ფორკის შეცდომა შეერთებისთვის: %m"
 
-#: postmaster/postmaster.c:3626
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "ახალი პროცესის ფორკის შეცდომა შეერთებისთვის: "
 
-#: postmaster/postmaster.c:3660
+#: postmaster/postmaster.c:3667
 #, c-format
 msgid "postmaster became multithreaded"
 msgstr "postmaster მრავალნაკადიანი გახდა"
 
-#: postmaster/postmaster.c:3738
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "მონაცემთა ბაზის სისტემა მზადაა მხოლოდ-კითხვადი შეერთებების მისაღებად"
 
-#: postmaster/postmaster.c:3839
+#: postmaster/postmaster.c:3846
 #, c-format
 msgid "WAL was shut down unexpectedly"
 msgstr "WAL მოულოდნელად გაითიშა"
 
-#: postmaster/postmaster.c:3964
+#: postmaster/postmaster.c:3971
 #, c-format
 msgid "no slot available for new autovacuum worker process"
 msgstr "ავტომომტვერსასრუტების ფონური დამხმარე პროცესისთვის სლოტი ხელმისაწვდომი არაა"
 
-#: postmaster/postmaster.c:3979
+#: postmaster/postmaster.c:3986
 #, c-format
 msgid "could not fork \"%s\" process: %m"
 msgstr "\"%s\" პროცესის ფორკის შეცდომა: %m"
 
-#: postmaster/postmaster.c:4138
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "ახალი ფონური დამხმარე პროცესისთვის სლოტი ხელმისაწვდომი არაა"
 
-#: postmaster/postmaster.c:4156
+#: postmaster/postmaster.c:4163
 #, c-format
 msgid "could not fork background worker process: %m"
 msgstr "ფონური დამხმარე პროცესის ფორკის შეცდომა: %m"
 
-#: postmaster/postmaster.c:4489
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "პროცესის გამოსვლის კოდის წაკითხვის შეცდომა\n"
 
-#: postmaster/postmaster.c:4531
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "შვილი პროცესის დასრულების სტატუსის წაკითხვის შეცდომა\n"
@@ -20444,17 +20520,17 @@ msgstr[1] ""
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr ""
 
-#: postmaster/walsummarizer.c:1007
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "%X/%X -ის შემდეგ სწორი ჩანაწერი არ არსებობს"
 
-#: postmaster/walsummarizer.c:1052
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "ვერ წავიკითხე WAL დროის ხაზიდან %u მისამართზე %X/%X: %s"
 
-#: postmaster/walsummarizer.c:1058
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "ვერ წავიკითხე WAL დროის ხაზიდან %u მისამართზე %X/%X"
@@ -20478,136 +20554,136 @@ msgstr "დროის არასწორი ხაზი: %u"
 msgid "invalid streaming start location"
 msgstr "ნაკადის დასაწყისის არასწორი მდებარეობა"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:230 replication/libpqwalreceiver/libpqwalreceiver.c:322
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243 replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "პაროლი სავალდებულოა"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:231
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:232
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:249
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "ძებნის ბილიკების გასუფთავების შეცდომა: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:295 replication/libpqwalreceiver/libpqwalreceiver.c:483
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308 replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "შეერთების სტრიქონის არასწორი სინტაქსი: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:323
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:350
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "შეერთების სტრიქონის დამუშავების შეცდომა: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:425
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:442 replication/libpqwalreceiver/libpqwalreceiver.c:737
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455 replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "ძირითადი სერვერის არასწორი პასუხი"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:443
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:572 replication/libpqwalreceiver/libpqwalreceiver.c:579 replication/libpqwalreceiver/libpqwalreceiver.c:611
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597 replication/libpqwalreceiver/libpqwalreceiver.c:604 replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "wal ნაკადის დაწყების შეცდომა: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:635
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:659
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:675
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:686
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:696 replication/libpqwalreceiver/libpqwalreceiver.c:832
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721 replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "მოულოდნელი შედეგი CommandComplete-ის შემდეგ: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:725
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:738
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr ""
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:793 replication/libpqwalreceiver/libpqwalreceiver.c:848 replication/libpqwalreceiver/libpqwalreceiver.c:855
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818 replication/libpqwalreceiver/libpqwalreceiver.c:873 replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "\"WAL\" ნაკადიდან მონაცემების მიღების შეცდომა: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:875
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "'WAL' ნაკადისთვის მონაცემების გაგზავნა შეუძლებელია: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:978
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "რეპლიკაციის სლოტის \"%s\" შექმნის შეცდომა: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1030
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "რეპლიკაციის სლოტის \"%s\" შეცვლა შეუძლებელია: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1064
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "მოთხოვნის არასწორი პასუხი"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1065
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "მოველოდი %d ველს. მივიღე %d."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1135
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "მოთხოვნის ინტერფეისს ბაზასთან მიერთება სჭირდება"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1169
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "ცარიელი მოთხოვნა"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "არხის მოულოდნელი რეჟიმი"
 
@@ -20621,26 +20697,26 @@ msgstr ""
 msgid "lost connection to the logical replication apply worker"
 msgstr "ლოგიკური რეპლიკაციის გადატარების დამხმარე პროცესთან კავშირი დაკარგულია"
 
-#: replication/logical/applyparallelworker.c:1024 replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031 replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "ლოგიკური რეპლიკაციის პარალელური გადატარების დამხმარე პროცესი"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr ""
 
-#: replication/logical/applyparallelworker.c:1127 replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134 replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "ლოგიკური რეპლიკაციის პარალელური გადატარების დამხმარე პროცესთან კავშირი დაკარგულია"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "გაზიარებული-მეხსიერების მქონე რიგში მონაცემების გაგზავნა შეუძლებელია"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr ""
@@ -20711,27 +20787,27 @@ msgstr "წასაშლელი მწკრივის აღმოჩე
 #: replication/logical/conflict.c:347
 #, c-format
 msgid "Key %s"
-msgstr ""
+msgstr "გასაღები %s"
 
 #: replication/logical/conflict.c:364
 #, c-format
-msgid "existing local tuple %s"
-msgstr ""
+msgid "existing local row %s"
+msgstr "არსებული ლოკალური მწკრივი %s"
 
 #: replication/logical/conflict.c:369
 #, c-format
-msgid "Existing local tuple %s"
-msgstr ""
+msgid "Existing local row %s"
+msgstr "არსებული ლოკალური მწკრივი %s"
 
 #: replication/logical/conflict.c:396
 #, c-format
-msgid "remote tuple %s"
-msgstr "დაშორებული კორტეჟი %s"
+msgid "remote row %s"
+msgstr "დაშორებული მწკრივი %s"
 
 #: replication/logical/conflict.c:400
 #, c-format
-msgid "Remote tuple %s"
-msgstr "დაშორებული კორტეჟი %s"
+msgid "Remote row %s"
+msgstr "დაშორებული მწკრივი %s"
 
 #: replication/logical/conflict.c:434
 #, c-format
@@ -20753,113 +20829,113 @@ msgstr "რეპლიკის იდენტიფიკატორი %s"
 msgid "Replica identity full %s"
 msgstr "რეპლიკის იდენტიფიკატორი სრული %s"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "ლოგიკურ გაშიფვრას უქმეზე ძირითად სერვერზე \"wal_level\" >= \"logical\" ესაჭიროება"
 
-#: replication/logical/launcher.c:331
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when \"max_active_replication_origins\"=0"
-msgstr "შეუძლებელია ლოგიკური რეპლიკაციის დამხმარე პროცესების გაშვება, როცა \"max_active_replication_origins\"=0"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "შეუძლებელია ლოგიკური რეპლიკაციის დამხმარე პროცესების გაშვება, როცა \"max_active_replication_origins\" არის 0"
 
-#: replication/logical/launcher.c:424
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "ლოგიკური რეპლიკაციის დამხმარე პროგრამის სლოტები არასაკმარისია"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/launcher.c:425 replication/logical/launcher.c:511 replication/slot.c:1556 replication/slot.c:1579 storage/lmgr/lock.c:1039 storage/lmgr/lock.c:1077 storage/lmgr/lock.c:2966 storage/lmgr/lock.c:4371 storage/lmgr/lock.c:4436 storage/lmgr/lock.c:4786 storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494 storage/lmgr/predicate.c:3891
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524 replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042 storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374 storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789 storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494 storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "როგორც ჩანს, გჭირდებათ, \"%s\" გაზარდოთ."
 
-#: replication/logical/launcher.c:510
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "ფონური დამხმარე პროცესების სლოტები არასაკმარისია"
 
-#: replication/logical/launcher.c:717
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr ""
 
-#: replication/logical/launcher.c:726
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr ""
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "ლოგიკურ გაშიფვრას \"wal_level\" >= \"logical\" ესაჭიროება"
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "ლოგიკურ გაშიფვრას ბაზასთან მიერთება ესაჭიროება"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "ლოგიკური გაშიფვრისთვის ფიზიკური რეპლიკაციის სლოტის გამოყენება შეუძლებელია"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "რეპლიკაციის სლოტი \"%s\" ამ ბაზაში არ შექმნილა"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "შეუძლებელია ლოგიკური რეპლიკაციის სლოტის შექმნა ტრანზაქციაში, რომელიც ჩაწერებს ახორციელებს"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "ლოგიკური გაშიფვრისთვის რეპლიკაციის სლოტის \"%s\" გამოყენება შეუძლებელია"
 
-#: replication/logical/logical.c:542 replication/slot.c:828 replication/slot.c:863
+#: replication/logical/logical.c:546 replication/slot.c:858 replication/slot.c:903
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "მიმდინარეობს ამ რეპლიკაციის სლოტის სინქრონიზაცია ძირითადი სერვერიდან."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "მიუთითეთ სხვა რეპლიკაციის სლოტი."
 
-#: replication/logical/logical.c:609
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "იწყება ლოგიკური გაშიფვრა სლოტისთვის \"%s\""
 
-#: replication/logical/logical.c:611
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr ""
 
-#: replication/logical/logical.c:759
+#: replication/logical/logical.c:763
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr ""
 
-#: replication/logical/logical.c:765
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr ""
 
-#: replication/logical/logical.c:936 replication/logical/logical.c:981 replication/logical/logical.c:1026 replication/logical/logical.c:1072
+#: replication/logical/logical.c:940 replication/logical/logical.c:985 replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr ""
 
-#: replication/logical/logical.c:1304 replication/logical/logical.c:1353 replication/logical/logical.c:1394 replication/logical/logical.c:1480 replication/logical/logical.c:1529
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357 replication/logical/logical.c:1398 replication/logical/logical.c:1484 replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr ""
 
-#: replication/logical/logical.c:1439
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr ""
@@ -20909,72 +20985,82 @@ msgstr "აღდგენისა რეპლიკაციის წყა
 msgid "replication origin \"%s\" does not exist"
 msgstr "რეპლიკაციის წყარო \"%s\" არ არსებობს"
 
-#: replication/logical/origin.c:336
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "რეპლიკაციის წყაროს სახელი მეტისმეტად გრძელია"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "რეპლიკაციის წყაროს სახელები %d ბაიტზე გრძელი არ უნდა იყოს."
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "თავისუფალი რეპლიკაციის წყაროს ID-ის პოვნა შეუძლებელია"
 
-#: replication/logical/origin.c:370
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "რეპლიკაციის წყაროს, ID-ით %d გადაგდების შეცდომა. გამოიყენება PID-ის მიერ %d"
 
-#: replication/logical/origin.c:497
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "რეპლიკაციის წყარო ID-ით %d არ არსებობს"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr ""
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
 msgid "could not find free replication state, increase \"max_active_replication_origins\""
 msgstr "თავისუფალი რეპლიკაციის მდგომარეობის პოვნა შეუძლებელია. გაზარდეთ \"max_active_replication_origins\""
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "აღდგენილია კვანძის %d რეპლიკაციის მდგომარეობა %X/%X-მდე"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr ""
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "რეპლიკაციის წყარო ID-ით %d უკვე აქტიურია PID-სთვის %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr ""
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
 msgid "Increase \"max_active_replication_origins\" and try again."
 msgstr "გაზარდეთ \"max_active_replication_origins\"-ის მნიშვნელობა და თავიდან სცადეთ."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "რეპლიკაციის წყაროს მორგება მაშინ, როცა ის უკვე მორგებულია, შეუძლებელია"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415 replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438 replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "რეპლიკაციის წყარო მორგებული არაა"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "რეპლიკაციის წყაროს სახელი \"%s\" დაცულია"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "საწყისი სახელები, \"%s\", \"%s\" და სახელები, რომლებიც \"pg_\"-ით იწყება, დარეზერვებულია."
@@ -21012,93 +21098,88 @@ msgstr ""
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr ""
 
-#: replication/logical/reorderbuffer.c:4122
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "შეცდომა მონაცემის ფაილში ჩაწერისას XID-სთვის %u: %m"
 
-#: replication/logical/reorderbuffer.c:4468 replication/logical/reorderbuffer.c:4493
+#: replication/logical/reorderbuffer.c:4598 replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr ""
 
-#: replication/logical/reorderbuffer.c:4472 replication/logical/reorderbuffer.c:4497
+#: replication/logical/reorderbuffer.c:4602 replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr ""
 
-#: replication/logical/reorderbuffer.c:4746
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
 msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
 msgstr "ვერ წავშალე ფაილი \"%s\" %s/%s/xid*-ის წაშლისას: %m"
 
-#: replication/logical/reorderbuffer.c:5243
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr ""
 
-#: replication/logical/slotsync.c:214
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:596
 #, c-format
-msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
-msgstr "რეპლიკაციის სლოტის სინქრონიზაცია \"%s\" შეუძლებელია, რადგან დაშორებული სლოტი წინ უსწრებს ლოკალურ სლოტს"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "რეპლიკაციის სლოტის \"%s\" სინქრონიზაცია შეუძლებელია"
 
 #: replication/logical/slotsync.c:216
 #, c-format
-msgid "The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u."
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
 msgstr ""
 
-#: replication/logical/slotsync.c:460
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "წაიშალა რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზიდან OID-ით %u"
 
-#: replication/logical/slotsync.c:580
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "რეპლიკაციის სლოტის \"%s\" სინქრონიზაცია შეუძლებელია"
-
-#: replication/logical/slotsync.c:581
+#: replication/logical/slotsync.c:597
 #, c-format
-msgid "Logical decoding could not find consistent point from local slot's LSN %X/%X."
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
 msgstr ""
 
-#: replication/logical/slotsync.c:590
+#: replication/logical/slotsync.c:606
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "ახლად შექმნილი რეპლიკაციის სლოტი \"%s\" ახლა სინქრონიზებულია"
 
-#: replication/logical/slotsync.c:629
+#: replication/logical/slotsync.c:645
 #, c-format
 msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
 msgstr ""
 
-#: replication/logical/slotsync.c:651
+#: replication/logical/slotsync.c:667
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
 msgstr ""
 
-#: replication/logical/slotsync.c:820
+#: replication/logical/slotsync.c:838
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "ვერ გამოვითხოვე გადართვის ლოგიკური სლოტების ინფორმაცია ძირითადი სერვერიდან: %s"
 
-#: replication/logical/slotsync.c:969
+#: replication/logical/slotsync.c:987
 #, c-format
 msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
 msgstr "ვერ გამოვითხოვე ძირითადი სლოტის სახელის \"%s\" ინფორმაცია ძირითადი სერვერიდან: %s"
 
-#: replication/logical/slotsync.c:971
+#: replication/logical/slotsync.c:989
 #, c-format
 msgid "Check if \"primary_slot_name\" is configured correctly."
 msgstr ""
 
-#: replication/logical/slotsync.c:991
+#: replication/logical/slotsync.c:1009
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "უქმე სერვერიდან რეპლიკაციის სლოტების სინქრონიზაცია შეუძლებელია"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:1000
+#: replication/logical/slotsync.c:1018
 #, c-format
 msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
 msgstr "რეპლიკაციის სლოტი \"%s\", რომელიც \"%s\"-მა მიუთითა, არ არსებობს ძირითად სერვერზე"
@@ -21106,60 +21187,60 @@ msgstr "რეპლიკაციის სლოტი \"%s\", რომე
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1033
+#: replication/logical/slotsync.c:1051
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "რეპლიკაციის სლოტის სინქრონიზაციას სჭირდება, რომ \"%s\" მითითებული იყოს \"%s\"-ში"
 
-#: replication/logical/slotsync.c:1054
+#: replication/logical/slotsync.c:1070
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "რეპლიკაციის სლოტის სინქრონიზაციას \"wal_level\" >= \"logical\" ესაჭიროება"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1067 replication/logical/slotsync.c:1095
+#: replication/logical/slotsync.c:1085 replication/logical/slotsync.c:1113
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "რეპლიკაციის სლოტის სინქრონიზაციას \"%s\"-ის დაყენება სჭირდება"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1081
+#: replication/logical/slotsync.c:1099
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "რეპლიკაციის სლოტის სინქრონიზაციას \"%s\"-ის ჩართვა სჭირდება"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1133
+#: replication/logical/slotsync.c:1151
 #, c-format
 msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
 msgstr ""
 
-#: replication/logical/slotsync.c:1142
+#: replication/logical/slotsync.c:1160
 #, c-format
 msgid "replication slot synchronization worker will restart because of a parameter change"
 msgstr ""
 
-#: replication/logical/slotsync.c:1166
+#: replication/logical/slotsync.c:1184
 #, c-format
-msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr ""
+msgid "replication slot synchronization worker is shutting down because promotion is triggered"
+msgstr "რეპლიკაციის სლოტის სინქრონიზაციის დამხმარე პროგრამა ითიშება, რადგან დატრიგერდა წახალისება"
 
-#: replication/logical/slotsync.c:1291
+#: replication/logical/slotsync.c:1309
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "რეპლიკაციის სლოტების სინქრონიზაცია შეუძლებელია უქმეს წახალისების მიმდინარეობისას"
 
-#: replication/logical/slotsync.c:1299
+#: replication/logical/slotsync.c:1317
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "რეპლიკაციის სლოტების ერთდროული სინქრონიზაცია შეუძლებელია"
 
-#: replication/logical/slotsync.c:1407
+#: replication/logical/slotsync.c:1425
 #, c-format
 msgid "slot sync worker started"
 msgstr "სლოტის სინქრონიზაციის დამხმარე პროცესი გაეშვა"
 
-#: replication/logical/slotsync.c:1470 replication/slotfuncs.c:929
+#: replication/logical/slotsync.c:1487 replication/slotfuncs.c:928
 #, c-format
 msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
 msgstr "სინქრონიზაციის დამხმარე პროცესი \"%s\" ვერ მიუერთდა ძირითად სერვერს: %s"
@@ -21176,57 +21257,57 @@ msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs
 msgstr[0] ""
 msgstr[1] ""
 
-#: replication/logical/snapbuild.c:1305 replication/logical/snapbuild.c:1402 replication/logical/snapbuild.c:1908
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410 replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1307
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "გაშვებული ტრანზაქციების გარეშე."
 
-#: replication/logical/snapbuild.c:1354
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1356 replication/logical/snapbuild.c:1380
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr ""
 
-#: replication/logical/snapbuild.c:1378
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1404
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "ძველი ტრანზაქციები აღარ დარჩა."
 
-#: replication/logical/snapbuild.c:1775
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1781
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1822
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr ""
 
-#: replication/logical/snapbuild.c:1910
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "ლოგიკური გაშიფვრა შენახული სწრაფი ასლის გამოყენებას დაიწყებს."
 
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "ფაილის სახელის დამუშავების შეცდომა: \"%s\""
@@ -21236,583 +21317,562 @@ msgstr "ფაილის სახელის დამუშავები
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr ""
 
-#: replication/logical/tablesync.c:640
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr ""
 
-#: replication/logical/tablesync.c:830 replication/logical/tablesync.c:971
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr ""
 
-#: replication/logical/tablesync.c:837
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "ცხრილი \"%s.%s\" გამომცემელზე ნაპოვნი არაა"
 
-#: replication/logical/tablesync.c:890
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr ""
 
-#: replication/logical/tablesync.c:1069
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr ""
 
-#: replication/logical/tablesync.c:1236
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr ""
 
-#: replication/logical/tablesync.c:1351
+#: replication/logical/tablesync.c:1380
 #, c-format
 msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
 msgstr ""
 
-#: replication/logical/tablesync.c:1436
+#: replication/logical/tablesync.c:1480
 #, c-format
 msgid "table copy could not start transaction on publisher: %s"
 msgstr "ცხრილის კოპირებამ ვერ გაუშვა ტრანზაქცია გამომცემელზე: %s"
 
-#: replication/logical/tablesync.c:1479
-#, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "რეპლიკაციის წყარო \"%s\" უკვე არსებობს"
-
-#: replication/logical/tablesync.c:1512 replication/logical/worker.c:2383
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr ""
 
-#: replication/logical/tablesync.c:1525
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "ცხრილის კოპირებამ ვერ დაასრულა ტრანზაქცია გამომცემელზე: %s"
 
-#: replication/logical/worker.c:479
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr ""
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr ""
 
-#: replication/logical/worker.c:851 replication/logical/worker.c:966
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr ""
 
-#: replication/logical/worker.c:2530
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr ""
 
-#: replication/logical/worker.c:2537
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr ""
 
-#: replication/logical/worker.c:3472
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "არასწორი ლოგიკური რეპლიკაციის შეტყობინების ტიპი \"??? (%d)\""
 
-#: replication/logical/worker.c:3644
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "გამომცემლის მონაცემების ნაკადი დასრულდა"
 
-#: replication/logical/worker.c:3798
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "ლოგიკური რეპლიკაციის დამხმარე პროცესის შეწყვეტა მოლოდინის ვადის ამოწურვის გამო"
 
-#: replication/logical/worker.c:3995
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr ""
 
-#: replication/logical/worker.c:4009
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr ""
 
-#: replication/logical/worker.c:4040
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr ""
 
-#: replication/logical/worker.c:4044
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr ""
 
-#: replication/logical/worker.c:4058
+#: replication/logical/worker.c:4053
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
 msgstr "ლოგიკური რეპლიკაციის პარალელური გადატარების დამხმარე პროცესი გამოწერისთვის \"%s\" გაჩერდება, რადგან გამოწერის მფლობელის ზემომხმარებლის პრივილეგიები გაუქმდა"
 
-#: replication/logical/worker.c:4062
+#: replication/logical/worker.c:4057
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
 msgstr ""
 
-#: replication/logical/worker.c:4564
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "გამოწერას რეპლიკაციის სლოტი დაყენებული არ აქვს"
 
-#: replication/logical/worker.c:4589
+#: replication/logical/worker.c:4592
 #, c-format
 msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
 msgstr "დამხმარე პროცესის გამოყენება გამოწერისთვის \"%s\" ვერ მიუერთდა გამომცემელს: %s"
 
-#: replication/logical/worker.c:4678
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr ""
 
-#: replication/logical/worker.c:4694
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr ""
 
-#: replication/logical/worker.c:4718
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr ""
 
-#: replication/logical/worker.c:4723
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "გაეშვა ლოგიკური რეპლიკაციის გადატარების დამხმარე პროცესი გამოწერისთვის \"%s\""
 
-#: replication/logical/worker.c:4845
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "გამოწერა \"%s\" გაითიშა შეცდომის გამო"
 
-#: replication/logical/worker.c:4893
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "ლოგიკური რეპლიკაცია იწყებს ტრანზაქციის გამოტოვებას მისამართზე LSN %X/%X"
 
-#: replication/logical/worker.c:4907
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "ლოგიკურმა რეპლიკაციამ დაასრულა ტრანზაქციის გამოტოვება მისამართზე LSN %X/%X"
 
-#: replication/logical/worker.c:4989
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "skip-LSN გამოწერისთვის \"%s\" გასუფთავებულია"
 
-#: replication/logical/worker.c:4990
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr ""
 
-#: replication/logical/worker.c:5027
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr ""
 
-#: replication/logical/worker.c:5031
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr ""
 
-#: replication/logical/worker.c:5036
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr ""
 
-#: replication/logical/worker.c:5047
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr ""
 
-#: replication/logical/worker.c:5054
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr ""
 
-#: replication/logical/worker.c:5065
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr ""
 
-#: replication/logical/worker.c:5073
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:328
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "არასწორი proto_version"
 
-#: replication/pgoutput/pgoutput.c:333
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_version \"%s\" დიაპაზონს გარეთაა"
 
-#: replication/pgoutput/pgoutput.c:350
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "არასწორი  publication_names syntax"
 
-#: replication/pgoutput/pgoutput.c:420 replication/pgoutput/pgoutput.c:424
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "პარამეტრი \"%s\" აკლია"
 
-#: replication/pgoutput/pgoutput.c:469
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "კლიენტმა გამოაგზავნა proto_version=%d მაგრამ სერვერს მხოლოდ %d პროტოკოლის და ქვემოთ გააჩნია მხარდაჭერა"
 
-#: replication/pgoutput/pgoutput.c:475
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "კლიენტმა გამოაგზავნა proto_version=%d მაგრამ სერვერს მხოლოდ %d პროტოკოლის და ზემოთ გააჩნია მხარდაჭერა"
 
-#: replication/pgoutput/pgoutput.c:490
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:496
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:501
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:515
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:520
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:1085
+#: replication/pgoutput/pgoutput.c:1112
 #, c-format
 msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
 msgstr ""
 
-#: replication/pgoutput/pgoutput.c:1792
+#: replication/pgoutput/pgoutput.c:1815
 #, c-format
-msgid "skipped loading publication: %s"
-msgstr "გამოტოვებულია ჩატვირთვა პუბლიკაციისთვის: %s"
+msgid "skipped loading publication \"%s\""
+msgstr "გამოტოვებულია ჩატვირთვა პუბლიკაციისთვის \"%s\""
 
-#: replication/pgoutput/pgoutput.c:1793
+#: replication/pgoutput/pgoutput.c:1816
 #, c-format
 msgid "The publication does not exist at this point in the WAL."
 msgstr "WAL-ში ამ წერტილთან პუბლიკაცია არ არსებობს."
 
-#: replication/pgoutput/pgoutput.c:1794
+#: replication/pgoutput/pgoutput.c:1817
 #, c-format
 msgid "Create the publication if it does not exist."
 msgstr "პუბლიკაციის შექმნა, თუ ის არ არსებობს."
 
-#: replication/slot.c:275
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "რეპლიკაციის სლოტის სახელი \"%s\" ძალიან მოკლეა"
 
-#: replication/slot.c:284
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "რეპლიკაციის სლოტის სახელი \"%s\" ძალიან გრძელია"
 
-#: replication/slot.c:297
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "რეპლიკაციის სლოტის სახელი \"%s\" არასწორ სიმბოლოს შეიცავს"
 
-#: replication/slot.c:299
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr ""
 
-#: replication/slot.c:348
+#: replication/slot.c:377
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr ""
 
-#: replication/slot.c:360 replication/slot.c:885
+#: replication/slot.c:389 replication/slot.c:925
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "დროებითი რეპლიკაციის სლოტისთვის გადართვის ჩართვა შეუძლებელია"
 
-#: replication/slot.c:385
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "რეპლიკაციის სლოტი \"%s\" უკვე არსებობს"
 
-#: replication/slot.c:395
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "ყველა რეპლიკაციის სლოტი გამოიყენება"
 
-#: replication/slot.c:396
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "გაათავისუფლეთ ერთი მაინც ან გაზარდეთ \"max_replication_slots\"."
 
-#: replication/slot.c:579 replication/slotfuncs.c:664 utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
+#: replication/slot.c:609 replication/slotfuncs.c:664 utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "რეპლიკაციის სლოტი არ არსებობს: %s"
 
-#: replication/slot.c:634 replication/slot.c:1388
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "რეპლიკაციის სლოტი (%s) აქტიურია PID-ისთვის %d"
 
-#: replication/slot.c:651
+#: replication/slot.c:681
 #, c-format
 msgid "can no longer access replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტთან \"%s\" წვდომა აღარ მაქვს"
 
-#: replication/slot.c:653
+#: replication/slot.c:683
 #, c-format
 msgid "This replication slot has been invalidated due to \"%s\"."
 msgstr "ეს რეპლიკაციის სლოტი მონიშნულია, როგორც არასწორი \"%s\"-ის გამო."
 
-#: replication/slot.c:672
+#: replication/slot.c:702
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "მივიღე ლოგიკური რეპლიკაციის სლოტი \"%s\""
 
-#: replication/slot.c:674
+#: replication/slot.c:704
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "მივიღე ფიზიკური რეპლიკაციის სლოტი \"%s\""
 
-#: replication/slot.c:759
+#: replication/slot.c:789
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "გათავისუფლდა ლოგიკური რეპლიკაციის სლოტი \"%s\""
 
-#: replication/slot.c:761
+#: replication/slot.c:791
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "გათავისუფლდა ფიზიკური რეპლიკაციის სლოტი \"%s\""
 
-#: replication/slot.c:827
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტის \"%s\" წაშლის შეცდომა"
 
-#: replication/slot.c:850
+#: replication/slot.c:890
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "%s-ის გამოყენება ფიზიკური რეპლიკაციის სლოტთან ერთად შეუძლებელია"
 
-#: replication/slot.c:862
+#: replication/slot.c:902
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტის \"%s\" შეცვლა შეუძლებელია"
 
-#: replication/slot.c:872
+#: replication/slot.c:912
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr ""
 
-#: replication/slot.c:1020 replication/slot.c:2120 replication/slot.c:2505
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "საქაღალდის (\"%s\") წაშლის შეცდომა"
 
-#: replication/slot.c:1423
+#: replication/slot.c:1534
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr "რეპლიკაციის სლოტების გამოყენება შესაძლებელია, მხოლოდ, როცა \"max_replication_slots\" > 0"
 
-#: replication/slot.c:1428
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "რეპლიკაციის სლოტების გამოყენება შესაძლებელია, მხოლოდ, როცა \"wal_level\" >= \"replica\""
 
-#: replication/slot.c:1440
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "რეპლიკაციის სლოტების გამოყენების წვდომა აკრძალულია"
 
-#: replication/slot.c:1441
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr ""
 
-#: replication/slot.c:1550
+#: replication/slot.c:1664
 #, c-format
 msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
 msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
 msgstr[0] ""
 msgstr[1] ""
 
-#: replication/slot.c:1561
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "სლოტი კონფლიქტშია XID-ის ჰორიზონტთან %u."
 
-#: replication/slot.c:1566
+#: replication/slot.c:1680
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "ლოგიკურ გაშიფვრას უქმეზე ძირითად სერვერზე \"wal_level\" >= \"logical\" ესაჭიროება."
 
 #. translator: %s is a GUC variable name
-#: replication/slot.c:1575
+#: replication/slot.c:1686
 #, c-format
-msgid "The slot's idle time of %dmin %02ds exceeds the configured \"%s\" duration of %dmin."
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
 msgstr ""
 
-#: replication/slot.c:1589
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტის (%2$s) გასათავისუფლებლად მოხდება პროცესის მოკვლა: %1$d"
 
-#: replication/slot.c:1591
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "მოძველებული რეპლიკაციის სლოტის (\"%s\") არასწორად გამოცხადება"
 
-#: replication/slot.c:2443
+#: replication/slot.c:2559
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "რეპლიკაციის სლოტის (%s) ფაილის არასწორი მაგიური რიცხვი: %u (უნდა იყოს %u)"
 
-#: replication/slot.c:2450
+#: replication/slot.c:2566
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "რეპლიკაციის სლოტის ფაილის (%s) მხარდაუჭერელი ვერსია %u"
 
-#: replication/slot.c:2457
+#: replication/slot.c:2573
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "რეპლიკაციის სლოტის ფაილის (%s) დაზიანებული სიგრძე: %u"
 
-#: replication/slot.c:2493
+#: replication/slot.c:2609
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr ""
 
-#: replication/slot.c:2529
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "ლოგიკური რეპლიკაციის სლოტი\"%s\" არსებობს, მაგრამ \"wal_level\" < \"logical\""
 
-#: replication/slot.c:2531
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "შეცვალეთ \"wal_level\" \"logical\"-ზე ან უფრო მაღალზე."
 
-#: replication/slot.c:2543
+#: replication/slot.c:2659
 #, c-format
 msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
 msgstr "ლოგიკური რეპლიკაციის სლოტი\"%s\" არსებობს, მაგრამ \"hot_standby\" = \"off\""
 
-#: replication/slot.c:2545
+#: replication/slot.c:2661
 #, c-format
 msgid "Change \"hot_standby\" to be \"on\"."
 msgstr ""
 
-#: replication/slot.c:2550
+#: replication/slot.c:2666
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "ფიზიკური რეპლიკაციის სლოტი\"%s\" არსებობს, მაგრამ \"wal_level\" < \"replica\""
 
-#: replication/slot.c:2552
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "შეცვალეთ \"wal_level\" \"replica\"-ზე ან ზემოთ."
 
-#: replication/slot.c:2598
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "გამორთვამდე მეტისმეტად ბევრი რეპლიკაციის სლოტი იყო აქტიური"
 
-#: replication/slot.c:2599
+#: replication/slot.c:2716
 #, c-format
 msgid "Increase \"max_replication_slots\" and try again."
 msgstr "გაზარდეთ \"max_replication_slots\"-ის მნიშვნელობა და თავიდან სცადეთ."
 
-#: replication/slot.c:2676
-#, c-format
-msgid "Replication slot \"%s\" does not exist."
-msgstr "რეპლიკაციის სლოტი \"%s\" არ არსებობს."
-
-#: replication/slot.c:2684
-#, c-format
-msgid "\"%s\" is not a physical replication slot."
-msgstr "\"%s\" ფიზიკური რეპლიკაციის სლოტი არაა."
-
-#: replication/slot.c:2863
+#: replication/slot.c:2953
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "რეპლიკაციის სლოტი \"%s\", მითითებული პარამეტრში %s, არ არსებობს"
 
-#: replication/slot.c:2865 replication/slot.c:2899 replication/slot.c:2914
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
 #, c-format
 msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
 msgstr "ლოგიკური რეპლიკაცია ელოდება უქმე სლოტს, რომელიც დაკავშირებულია რეპლიკაციის სლოტთან \"%s\"."
 
-#: replication/slot.c:2867
+#: replication/slot.c:2957
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "შექმენით რეპლიკაციის სლოტი \"%s\" ან შეცვალეთ პარამეტრი \"%s\"."
 
-#: replication/slot.c:2877
+#: replication/slot.c:2967
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "ვერ მიუთითებთ ლოგიკური რეპლიკაციის სლოტს \"%s\" პარამეტრში \"%s\""
 
-#: replication/slot.c:2879
+#: replication/slot.c:2969
 #, c-format
 msgid "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "ლოგიკური რეპლიკაცია ელოდება კორექტირებას რეპლიკაციის სლოტზე \"%s\"."
 
-#: replication/slot.c:2881
+#: replication/slot.c:2971
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "წაშალეთ ლოგიკური რეპლიკაციის სლოტი \"%s\" პარამეტრიდან \"%s\"."
 
-#: replication/slot.c:2897
+#: replication/slot.c:2987
 #, c-format
 msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
 msgstr "ფიზიკური რეპლიკაციის სლოტი \"%s\", მითითებული პარამეტრში \"%s\", გაუქმებულია"
 
-#: replication/slot.c:2901
+#: replication/slot.c:2991
 #, c-format
 msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "განიხილეთ მოცილება ან თავიდან შექმნა სლოტისთვის \"%s\" ან მიაწერეთ პარამეტრი \"%s\"."
 
-#: replication/slot.c:2912
+#: replication/slot.c:3002
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
 msgstr "რეპლიკაციის სლოტი \"%s\", რომელიც მითითებულია პარამეტრში \"%s\", active_pid არ გააჩნია"
 
-#: replication/slot.c:2916
+#: replication/slot.c:3006
 #, c-format
 msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "გაუშვით უქმე, ასოცირებული რეპლიკაციის სლოტთან \"%s\", ან მიაწერეთ პარამეტრი \"%s\"."
 
-#: replication/slot.c:3008
-#, c-format
-msgid "\"%s\" must be set to 0 during binary upgrade mode."
-msgstr "ბინარული განახლების რეჟიმისას \"%s\"-ის მნიშვნელობა 0-ზე უნდა დააყენოთ."
-
 #: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
@@ -21993,123 +22053,118 @@ msgstr ""
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "'WAL'-ის სეგმენტში (%s) ჩაწერის შეცდომა. წანაცვლება %d, სიგრძე %lu: %m"
 
-#: replication/walsender.c:505
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "%s-ის გამოყენება ლოგიკური რეპლიკაციის სლოტთან ერთად შეუძლებელია"
 
-#: replication/walsender.c:609 storage/smgr/md.c:1867
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "ფაილის (\"%s\") ბოლოში გადახვევის პრობლემა: %m"
 
-#: replication/walsender.c:613
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "ფაილის (\"%s\") დასაწყისში გადახვევის პრობლემა: %m"
 
-#: replication/walsender.c:829
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr ""
 
-#: replication/walsender.c:895
+#: replication/walsender.c:909
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr ""
 
-#: replication/walsender.c:898
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr ""
 
-#: replication/walsender.c:942
+#: replication/walsender.c:956
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr ""
 
-#: replication/walsender.c:1137
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "უცნობი მნიშვნელობა CREATE_REPLICATION_SLOT-ის პარამეტრისთვის \"%s\": \"%s\""
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1243
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s ტრანზაქცის შიგნიდან არ უნდა გამოიძახოთ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1253
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s ტრანზაქციის შიგნიდან უნდა გამოიძახოთ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1259
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr ""
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1264
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s მხოლოდ-წაკითხვად ტრანზაქციაში უნდა გამოიძახოთ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1270
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s ყველა მოთხოვნაზე ადრე უნდა გამოიძახოთ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s ქვეტრანზაქციაში არ უნდა გამოიძახოთ"
 
-#: replication/walsender.c:1453
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "walsender პროცესის შეწყვეტა დაწინაურების შემდეგ"
 
-#: replication/walsender.c:1994
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "'WAL'-გამგზავნის გაჩერების რეჟიმში ყოფნის დროს ახალი ბრძანებების შესრულება შეუძლებელია"
 
-#: replication/walsender.c:2029
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "ფიზიკური რეპლიკაციისთვის WAL-ის გამგზავნში SQL ბრძანებების შესრულება შეუძლებელია"
 
-#: replication/walsender.c:2060
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "მიღებულია რეპლიკაციის ბრძანება: %s"
 
-#: replication/walsender.c:2068 tcop/fastpath.c:208 tcop/postgres.c:1137 tcop/postgres.c:1495 tcop/postgres.c:1747 tcop/postgres.c:2253 tcop/postgres.c:2690 tcop/postgres.c:2767
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137 tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251 tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr ""
 
-#: replication/walsender.c:2225 replication/walsender.c:2260
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "მოულოდნელი EOF მომლოდინის მიერთებაზე"
 
-#: replication/walsender.c:2248
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "არასწორი მომლოდინის შეტყობინების ტიპი \"%c\""
 
-#: replication/walsender.c:2337
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "შეტყობინების მოულოდნელი ტიპი: \"%c\""
 
-#: replication/walsender.c:2751
+#: replication/walsender.c:2789
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "walsender პროცესის შეწყვეტა რეპლიკაციის მოლოდინის ვადის ამოწურვის გამო"
@@ -22294,280 +22349,280 @@ msgstr "'ON SELECT' წესზე სახელის გადარქმ
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:617
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "INSERT … SELECT წესის ქმედებები მხარდაუჭერელია მოთხოვნებისთვის, რომლებსაც WITH-ის შემცველი მონაცემების შემცვლელი გამოსახულებები გააჩნიათ"
 
-#: rewrite/rewriteHandler.c:671
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:908 rewrite/rewriteHandler.c:947
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:910 rewrite/rewriteHandler.c:976
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:912
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "გადასაფარად გამოიყენეთ OVERRIDING SYSTEM VALUE."
 
-#: rewrite/rewriteHandler.c:974 rewrite/rewriteHandler.c:982
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "სვეტი \"%s\" მხოლოდ DEFAULT-მდე შეიძლება, განახლდეს"
 
-#: rewrite/rewriteHandler.c:1118 rewrite/rewriteHandler.c:1136
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1691
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "წესების მქონე ურთიერთობებისთვის MERGE მხარდაჭერილი არაა."
 
-#: rewrite/rewriteHandler.c:1731 rewrite/rewriteHandler.c:3271
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:2130 rewrite/rewriteHandler.c:4265
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:2235
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:2598
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "ნაგვის ნახვის სვეტები განახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2603
+#: rewrite/rewriteHandler.c:2606
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "ხედის სვეტები, რომლებიც მათი საბაზისო ურთიერთობის სვეტები არიან, განახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2606
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that refer to system columns are not updatable."
 msgstr "ხედის სვეტები, რომლებიც სისტემურ სვეტებზეა მიბმული, განახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2609
+#: rewrite/rewriteHandler.c:2612
 msgid "View columns that return whole-row references are not updatable."
 msgstr "ხედის სვეტები, რომლებიც მთელ-მწკრივიან ბმებზე მიუთითებენ, განახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2670
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "\"DISTINCT\"-ის შემცველი ხედები განახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2673
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "\"GROUP BY\"-ის შემცველი ხედები თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2676
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "\"HAVING\"-ის შემცველი ხედები თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2679
+#: rewrite/rewriteHandler.c:2682
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "\"UNION\"-ის, \"INTERSECT\"-ის და \"EXCEPT\"-ის შემცველი ხედები თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2682
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "\"WITH\"-ის შემცველი ხედები თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2685
+#: rewrite/rewriteHandler.c:2688
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "\"LIMIT\"-ის და \"OFFSET\"-ის შემცველი ხედები თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2697
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "ხედები, რომლებიც აგრეგატულ ფუნქციებს აბრუნებენ, თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2700
+#: rewrite/rewriteHandler.c:2703
 msgid "Views that return window functions are not automatically updatable."
 msgstr "ხედები, რომლებიც ფანჯრის ფუნქციებს აბრუნებენ, თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2703
+#: rewrite/rewriteHandler.c:2706
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "ხედები, რომლებიც აბრუნებენ ფუნქციებს, რომლებიც სეტებს აბრუნებენ, თვითგანახლებადი არაა."
 
-#: rewrite/rewriteHandler.c:2710 rewrite/rewriteHandler.c:2714 rewrite/rewriteHandler.c:2722
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717 rewrite/rewriteHandler.c:2725
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:2725
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:2749
+#: rewrite/rewriteHandler.c:2752
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "ხედები, რომლებსაც განახლებადი ცხრილები არ გააჩნია, ავტომატურად განახლებადები არ არიან."
 
-#: rewrite/rewriteHandler.c:3130 rewrite/rewriteHandler.c:3165
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "ხედში ჩამატება შეუძლებელია: %s"
 
-#: rewrite/rewriteHandler.c:3133
+#: rewrite/rewriteHandler.c:3136
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3138 rewrite/rewriteHandler.c:3174
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "ხედის განახლება შეუძლებელია: %s"
 
-#: rewrite/rewriteHandler.c:3141
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3146 rewrite/rewriteHandler.c:3183
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "ხედიდან წაშლა შეუძლებელია: %s"
 
-#: rewrite/rewriteHandler.c:3149
+#: rewrite/rewriteHandler.c:3152
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3168
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
 msgstr "ხედში MERGE-ით ჩასმის ჩასართავად მიუთითეთ INSTEAD OF INSERT ტრიგერი."
 
-#: rewrite/rewriteHandler.c:3177
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
 msgstr "ხედის MERGE-ით განახლების ჩასართავად მიუთითეთ INSTEAD OF UPDATE ტრიგერი."
 
-#: rewrite/rewriteHandler.c:3186
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
 msgstr "ამ ხედიდან MERGE-ის საშუალებით წაშლის ჩასართავად მიუთითეთ INSTEAD OF DELETE ტრიგერი."
 
-#: rewrite/rewriteHandler.c:3361
+#: rewrite/rewriteHandler.c:3364
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "ხედის (\"%2$s\") სვეტში \"%1$s\" მონაცემის ჩასმა შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:3369
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "ხედის (\"%2$s\") სვეტის \"%1$s\" განახლება შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:3377
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "ხედის (\"%2$s\") სვეტთან \"%1$s\" შერწყმა შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:3405
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "შეუძლებელია შერწყმა ხედში \"%s\""
 
-#: rewrite/rewriteHandler.c:3407
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3408
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
 msgstr "ამ ხედში შერწყმის ჩასართავად, ან შეიყვანეთ INSTEAD OF ტრიგერების სრული სია, ან წაშალეთ არსებული INSTEAD OF ტრიგერები."
 
-#: rewrite/rewriteHandler.c:3923
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3934
+#: rewrite/rewriteHandler.c:3953
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3948
+#: rewrite/rewriteHandler.c:3967
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3952
+#: rewrite/rewriteHandler.c:3971
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:3957
+#: rewrite/rewriteHandler.c:3976
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4217
+#: rewrite/rewriteHandler.c:4237
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4314
+#: rewrite/rewriteHandler.c:4335
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "ურთიერთობაზე \"%s\" 'INSERT RETURNING'-ის განხორციელება შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:4316
+#: rewrite/rewriteHandler.c:4337
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4321
+#: rewrite/rewriteHandler.c:4342
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "ურთიერთობაზე \"%s\" 'UPDATE RETURNING'-ის განხორციელება შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:4323
+#: rewrite/rewriteHandler.c:4344
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4328
+#: rewrite/rewriteHandler.c:4349
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "ურთიერთობაზე \"%s\" 'DELETE RETURNING'-ის განხორციელება შეუძლებელია"
 
-#: rewrite/rewriteHandler.c:4330
+#: rewrite/rewriteHandler.c:4351
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4348
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:4405
+#: rewrite/rewriteHandler.c:4426
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr ""
 
-#: rewrite/rewriteManip.c:1222
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "პირობითი სამსახურეობრივი გამოსახულებები განხორციელებული არაა"
 
-#: rewrite/rewriteManip.c:1567
+#: rewrite/rewriteManip.c:1520
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "WHERE CURRENT OF ხედზე განხორციელებული არაა"
 
-#: rewrite/rewriteManip.c:1970
+#: rewrite/rewriteManip.c:1923
 #, 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 ""
@@ -22721,72 +22776,57 @@ msgstr ""
 msgid "missing Language parameter"
 msgstr "აკლია პარამეტრი Language"
 
-#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:932 statistics/relation_stats.c:98
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937 statistics/relation_stats.c:98
 #, c-format
 msgid "Statistics cannot be modified during recovery."
 msgstr "აღდგენის დროს სტატისტიკას ვერ შეცვლით."
 
-#: statistics/attribute_stats.c:202
+#: statistics/attribute_stats.c:205
 #, c-format
-msgid "cannot specify both attname and attnum"
-msgstr "ორივეს attname და attnum ვერ მიუთითებთ"
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "ორივეს, \"%s\" და \"%s\" ერთად მითითება შეუძლებელია"
 
-#: statistics/attribute_stats.c:228
+#: statistics/attribute_stats.c:231
 #, c-format
-msgid "must specify either attname or attnum"
-msgstr "აუცილებელია, მიუთითოთ attname ან attnum"
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "უნდა მიუთითოთ \"%s\" ან \"%s\""
 
-#: statistics/attribute_stats.c:236
+#: statistics/attribute_stats.c:239
 #, c-format
 msgid "cannot modify statistics on system column \"%s\""
 msgstr "სტატისტიკის შეცვლა შეუძლებელია სისტემურ სვეტზე \"%s\""
 
-#: statistics/attribute_stats.c:300
+#: statistics/attribute_stats.c:303
 #, c-format
-msgid "unable to determine element type of attribute \"%s\""
-msgstr "ატრიბუტის \"%s\" ელემენტის დადგენა შეუძლებელია"
+msgid "could not determine element type of column \"%s\""
+msgstr "სვეტისთვის \"%s\" ელემენტის ტიპის დადგენა შეუძლებელია"
 
-#: statistics/attribute_stats.c:301
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321 statistics/attribute_stats.c:336
 #, c-format
-msgid "Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST."
-msgstr ""
+msgid "Cannot set %s or %s."
+msgstr "%s-ის ან %s-ის დაყენება შეუძლებელია."
 
-#: statistics/attribute_stats.c:316
+#: statistics/attribute_stats.c:320
 #, c-format
-msgid "could not determine less-than operator for attribute \"%s\""
-msgstr "შეუძლებელია ნაკლებია ვიდრე ოპერატორის დადგენა ატრიბუტისთვის \"%s\""
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "შეუძლებელია ნაკლებია ვიდრე ოპერატორის დადგენა სვეტისთვის \"%s\""
 
-#: statistics/attribute_stats.c:317
+#: statistics/attribute_stats.c:335
 #, c-format
-msgid "Cannot set STATISTIC_KIND_HISTOGRAM or STATISTIC_KIND_CORRELATION."
-msgstr ""
+msgid "column \"%s\" is not a range type"
+msgstr "სვეტი \"%s\" შუალედის ტიპი არაა"
 
-#: statistics/attribute_stats.c:330
+#: statistics/attribute_stats.c:738
 #, c-format
-msgid "attribute \"%s\" is not a range type"
-msgstr "ატრიბუტი \"%s\" შუალედის ტიპი არაა"
+msgid "\"%s\" array must not contain null values"
+msgstr "\"%s\" მასივები ნულოვან მნიშვნელობებს არ უნდა შეიცავდეს"
 
-#: statistics/attribute_stats.c:331
-#, c-format
-msgid "Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM."
-msgstr ""
-
-#: statistics/attribute_stats.c:590 statistics/attribute_stats.c:598
-#, c-format
-msgid "attribute %d of relation \"%s\" does not exist"
-msgstr "ატრიბუტი %d ურთიერთობისთვის \"%s\" არ არსებობს"
-
-#: statistics/attribute_stats.c:732 statistics/stat_utils.c:80
-#, c-format
-msgid "\"%s\" array cannot contain NULL values"
-msgstr "\"%s\" მასივი, არ შეიძლება, NULL მნიშვნელობებს შეიცავდეს"
-
-#: statistics/attribute_stats.c:775
+#: statistics/attribute_stats.c:781
 #, c-format
 msgid "maximum number of statistics slots exceeded: %d"
 msgstr "გადაცილებულია სტატისტიკის სლოტების მაქსიმალური რაოდენობა: %d"
 
-#: statistics/attribute_stats.c:942
+#: statistics/attribute_stats.c:949
 #, c-format
 msgid "cannot clear statistics on system column \"%s\""
 msgstr "სტატისტიკის გასუფთავება შეუძლებელია სისტემურ სვეტზე \"%s\""
@@ -22801,95 +22841,110 @@ msgstr ""
 msgid "function returning record called in context that cannot accept type record"
 msgstr "ფუნქცია, რომელიც ჩანაწერს აბრუნებს, გამოძახებულია კონტექსტში, რომელსაც ჩანაწერის მიღება არ შეუძლია"
 
-#: statistics/relation_stats.c:115
+#: statistics/relation_stats.c:117
+#, c-format
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "არგუმენტი \"%s\" -1.0-ზე ნაკლები არ უნდა იყოს"
+
+#: statistics/stat_utils.c:47
+#, c-format
+msgid "argument \"%s\" must not be null"
+msgstr "არგუმენტი \"%s\" ნულოვანი არ უნდა იყოს"
+
+#: statistics/stat_utils.c:74
 #, c-format
-msgid "reltuples cannot be < -1.0"
-msgstr "reltuples ვერ იქნება < -1.0"
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "\"%s\" მრავალგანზომილებიანი მასივი არ უნდა იყოს"
 
-#: statistics/stat_utils.c:44
+#: statistics/stat_utils.c:83
 #, c-format
-msgid "\"%s\" cannot be NULL"
-msgstr "\"%s\" არ შეიძლება, NULL იყოს"
+msgid "argument \"%s\" array must not contain null values"
+msgstr "არგუმენტის \"%s\" მასივები ნულოვან მნიშვნელობებს არ უნდა შეიცავდეს"
 
-#: statistics/stat_utils.c:71
+#: statistics/stat_utils.c:114
 #, c-format
-msgid "\"%s\" cannot be a multidimensional array"
-msgstr "\"%s\" მრავალგანზომილებიანი მასივი ვერ იქნება"
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "არგუმენტის \"%s\" მითითება აუცილებელია, როცა მითითებულია არგუმენტი \"%s\""
 
-#: statistics/stat_utils.c:111
+#: statistics/stat_utils.c:177
 #, c-format
-msgid "\"%s\" must be specified when \"%s\" is specified"
-msgstr "\"%s\"-ის მითითება აუცილებელია, როცა მიუთითებთ \"%s\"-ს"
+msgid "index \"%s\" was concurrently dropped"
+msgstr "ინდექსი \"%s\" სხვა პროცესის მიერ წაიშალა"
 
-#: statistics/stat_utils.c:178
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "ინდექსი \"%s\" სხვა პროცესის მიერ შეიქმნა"
+
+#: statistics/stat_utils.c:212
 #, c-format
 msgid "cannot modify statistics for relation \"%s\""
 msgstr "სტატისტიკის შეცვლა ურთიერთობისთვის \"%s\" შეუძლებელია"
 
-#: statistics/stat_utils.c:199
+#: statistics/stat_utils.c:220
 #, c-format
 msgid "cannot modify statistics for shared relation"
 msgstr "გაზიარებული ურთიერთობისთვის სტატისტიკის შეცვლა შეუძლებელია"
 
-#: statistics/stat_utils.c:252
+#: statistics/stat_utils.c:260
 #, c-format
 msgid "unrecognized argument name: \"%s\""
 msgstr "უცნობი არგუმენტის სახელი: \"%s\""
 
-#: statistics/stat_utils.c:266
+#: statistics/stat_utils.c:274
 #, c-format
-msgid "argument \"%s\" has type \"%s\", expected type \"%s\""
-msgstr "არგუმენტს \"%s\" აქვს ტიპი \"%s\". მოველოდი ტიპს \"%s\""
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "არგუმენტს \"%s\" აქვს ტიპი %s. მოველოდი ტიპს %s"
 
-#: statistics/stat_utils.c:307
+#: statistics/stat_utils.c:315
 #, c-format
 msgid "variadic arguments must be name/value pairs"
 msgstr "variadic არგუმენტები სახელი/მნიშვნელობის წყვილები უნდა იყოს"
 
-#: statistics/stat_utils.c:308
+#: statistics/stat_utils.c:316
 #, c-format
 msgid "Provide an even number of variadic arguments that can be divided into pairs."
 msgstr ""
 
-#: statistics/stat_utils.c:322
+#: statistics/stat_utils.c:330
 #, c-format
-msgid "name at variadic position %d is NULL"
-msgstr "სახელი variadic მდებარეობაზე %d NULL-ს უდრის"
+msgid "name at variadic position %d is null"
+msgstr "სახელი variadic მდებარეობაზე %d ნულოვანია"
 
-#: statistics/stat_utils.c:326
+#: statistics/stat_utils.c:334
 #, c-format
-msgid "name at variadic position %d has type \"%s\", expected type \"%s\""
+msgid "name at variadic position %d has type %s, expected type %s"
 msgstr ""
 
-#: storage/aio/aio.c:1222
+#: storage/aio/aio.c:1343
 #, c-format
 msgid "Only -1 or values bigger than 0 are valid."
 msgstr ""
 
-#: storage/aio/method_io_uring.c:171
+#: storage/aio/method_io_uring.c:369
 msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
 msgstr ""
 
-#: storage/aio/method_io_uring.c:176
+#: storage/aio/method_io_uring.c:374
 #, c-format
 msgid "Consider increasing \"ulimit -n\" to at least %d."
 msgstr "განიხილეთ 'ulimit -n'-ის გაზრდა მინიმუმ %d-მდე."
 
-#: storage/aio/method_io_uring.c:182
-msgid "Kernel does not support io_uring."
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
 msgstr "ბირთვს io_uring_ის მხარდაჭერა არ გააჩნია."
 
-#: storage/aio/method_io_uring.c:190
+#: storage/aio/method_io_uring.c:388
 #, c-format
 msgid "could not setup io_uring queue: %m"
 msgstr "io_uring რიგის მორგება შეუძლებელია: %m"
 
-#: storage/aio/method_io_uring.c:324
+#: storage/aio/method_io_uring.c:522
 #, c-format
 msgid "completing I/O on behalf of process %d"
 msgstr ""
 
-#: storage/aio/method_worker.c:379
+#: storage/aio/method_worker.c:382
 #, c-format
 msgid "I/O worker executing I/O on behalf of process %d"
 msgstr ""
@@ -22899,97 +22954,99 @@ msgstr ""
 msgid "cannot access temporary tables of other sessions"
 msgstr "სხვა სესიების დროებით ცხრილებთან წვდომა შეუძლებელია"
 
-#: storage/buffer/bufmgr.c:2708 storage/buffer/localbuf.c:393
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:2779
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr ""
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "მოულოდნელი მონაცემები EOF-ის მიღმა ბლოკში %u ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:2782
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:6185
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "%2$s-ის %1$u ბლოკის ჩაწერა შეუძლებელია"
 
-#: storage/buffer/bufmgr.c:6189
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "ბევრი შეცდომა --- ჩაწერის შეცდომა შეიძლება მუდმივი იყოს."
 
-#: storage/buffer/bufmgr.c:6206 storage/buffer/bufmgr.c:6221
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr ""
+msgid "writing block %u of relation \"%s\""
+msgstr "მიმდინარეობს %u ბლოკის ჩაწერა ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7320
+#: storage/buffer/bufmgr.c:7317
 #, c-format
-msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation %s"
-msgstr ""
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr "%u გვერდის განულება და %u საკონტროლო ჯამის ჩავარდნა ბლოკების %u..%u გასწვრივ ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7323 storage/buffer/bufmgr.c:7349
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
 #, c-format
-msgid "Block %u held first zeroed page."
+msgid "Block %u held the first zeroed page."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:7325
+#: storage/buffer/bufmgr.c:7322
 #, c-format
-msgid "See server log for details about the other %u invalid block(s)."
-msgstr ""
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "სხვა %d ბლოკის დეტალების შესახებ ინფორმაციისთვის იხილეთ სერვერის ჟურნალი."
+msgstr[1] "სხვა %d ბლოკის დეტალების შესახებ ინფორმაციისთვის იხილეთ სერვერის ჟურნალი."
 
-#: storage/buffer/bufmgr.c:7340
+#: storage/buffer/bufmgr.c:7339
 #, c-format
-msgid "%u invalid pages among blocks %u..%u of relation %s"
-msgstr "%u არასწორი გვერდი ბლოკების %u..%u გასწვრივ ურთიერთობისთვის %s"
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u არასწორი გვერდი ბლოკების %u..%u გასწვრივ ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7341
+#: storage/buffer/bufmgr.c:7340
 #, c-format
-msgid "Block %u held first invalid page."
+msgid "Block %u held the first invalid page."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:7342
+#: storage/buffer/bufmgr.c:7341
 #, c-format
 msgid "See server log for the other %u invalid block(s)."
 msgstr "დარჩენილი %u არასწორი ბლოკისთვის იხილეთ სერვერის ჟურნალი."
 
-#: storage/buffer/bufmgr.c:7347
+#: storage/buffer/bufmgr.c:7346
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
-msgstr ""
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr "არასწორი გვერდი ბლოკში %u ურთიერთობისთვის \"%s\". გვერდი განულდება"
 
-#: storage/buffer/bufmgr.c:7348
+#: storage/buffer/bufmgr.c:7347
 #, c-format
-msgid "zeroing out %u invalid pages among blocks %u..%u of relation %s"
-msgstr "მიმდინარეობს %u არასწორი გვერდის განულება ბლოკების %u..%u გასწვრივ ურთიერთობისთვის %s"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "მიმდინარეობს %u არასწორი გვერდის განულება ბლოკების %u..%u გასწვრივ ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7350
+#: storage/buffer/bufmgr.c:7349
 #, c-format
 msgid "See server log for the other %u zeroed block(s)."
 msgstr "დარჩენილი %u განულებული ბლოკისთვის იხილეთ სერვერის ჟურნალი."
 
-#: storage/buffer/bufmgr.c:7355
+#: storage/buffer/bufmgr.c:7354
 #, c-format
-msgid "ignoring checksum failure in block %u of relation %s"
-msgstr "ურთიერთობის (%2$s) ბლოკის (%1$u) საკონტროლო ჯამის გამოთვლის ჩავარდნა გამოტოვებული იქნება"
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "საკონტროლო ჯამის ჩავარდნის იგნორი ბლოკში %u ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7356
+#: storage/buffer/bufmgr.c:7355
 #, c-format
-msgid "ignoring %u checksum failures among blocks %u..%u of relation %s"
-msgstr "გამოტოვებული იქნება %u საკონტროლო ჯამის გამოთვლის ჩავარდნა ბლოკების %u..%u გასწვრივ ურთიერთობისთვის %s"
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "გამოტოვებული იქნება %u საკონტროლო ჯამის გამოთვლის ჩავარდნა ბლოკების %u..%u გასწვრივ ურთიერთობისთვის \"%s\""
 
-#: storage/buffer/bufmgr.c:7357
+#: storage/buffer/bufmgr.c:7356
 #, c-format
-msgid "Block %u held first ignored page."
+msgid "Block %u held the first ignored page."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:7358
+#: storage/buffer/bufmgr.c:7357
 #, c-format
 msgid "See server log for the other %u ignored block(s)."
 msgstr "დარჩენილი %u გამოტოვებული ბლოკისთვის იხილეთ სერვერის ჟურნალი."
@@ -23034,7 +23091,7 @@ msgstr ""
 msgid "could not delete fileset \"%s\": %m"
 msgstr "ფაილების სეტის (\"%s\") წაშლის შეცდომა: %m"
 
-#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1318
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "ფაილის (%s) მოკვეთის შეცდომა: %m"
@@ -23159,7 +23216,7 @@ msgstr ""
 msgid "\"%s\" is not supported on this platform."
 msgstr "ამ პლატფორმაზე \"%s\" მხარდაჭერილი არაა."
 
-#: storage/file/fd.c:4030
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
 #, c-format
 msgid "Invalid list syntax in parameter \"%s\"."
 msgstr "არასწორი სიის სინტაქსი პარამეტრში \"%s\"."
@@ -23259,27 +23316,27 @@ msgstr "მეხსიერების გაზიარებული ს
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "\"%s\"-ის დამმუშავებლის დუბლირება შეუძლებელია: %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "DSM სეგმენტის სახელი, ცარიელი, არ შეიძლება იყოს"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "DSM სეგმენტის სახელი მეტისმეტად გრძელია"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "DSM სეგმენტის ზომა არანულოვანი უნდა იყოს"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr ""
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:458 tcop/backend_startup.c:343
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457 tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "უკაცრავად, უკვე მეტისმეტად ბევრი კლიენტია"
@@ -23304,17 +23361,22 @@ msgstr ""
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr ""
 
-#: storage/ipc/procsignal.c:450
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr ""
 
-#: storage/ipc/procsignal.c:786
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "არასწორი გაუქმების მოთხოვნა PID-ით 0"
+
+#: storage/ipc/procsignal.c:788
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "არასწორი გასაღები გაუქმების მოთხოვნაში პროცესისთვის %d"
 
-#: storage/ipc/procsignal.c:795
+#: storage/ipc/procsignal.c:797
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "PID %d, მოთხოვნილი გაუქმების მოთხოვნაში, არც ერთ პროცესს არ ემთხვევა"
@@ -23329,7 +23391,7 @@ msgstr "გაზიარებული მეხსიერების რ
 msgid "invalid message size %zu in shared memory queue"
 msgstr "გაზიარებული მეხსიერების რიგში არსებული შეტყობინების ზომა %zu არასწორია"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1038 storage/lmgr/lock.c:1076 storage/lmgr/lock.c:2965 storage/lmgr/lock.c:4370 storage/lmgr/lock.c:4435 storage/lmgr/lock.c:4785 storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493 storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937 utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041 storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373 storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788 storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493 storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937 utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "არასაკმარისი გაზიარებული მეხსიერება"
@@ -23364,7 +23426,7 @@ msgstr "მოთხოვნილი გაზიარებული მე
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "პროცესი PID-ით %d PostgreSQL-ის უკანაბოლოს პროცესს არ წარმოადგენს"
 
-#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1547 utils/adt/mcxtfuncs.c:314 utils/adt/mcxtfuncs.c:412
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546 utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "პროცესისთვის %d სიგნალის გაგზავნა შეუძლებელია: %m"
@@ -23426,12 +23488,12 @@ msgstr ""
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr ""
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:3225
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "გამოსახულების გაუქმება აღდგენასთან კონფლიქტის გამო"
 
-#: storage/ipc/standby.c:922 tcop/postgres.c:2575
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr ""
@@ -23513,127 +23575,127 @@ msgstr "ნაპოვნია ურთიერთბლოკირებ
 msgid "See server log for query details."
 msgstr "მოთხოვნის დეტალებისთვის იხილეთ სერვერის ჟურნალი."
 
-#: storage/lmgr/lmgr.c:856
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "კორტეჟის (%u,%u) განახლებისას ურთიერთობაში \"%s\""
 
-#: storage/lmgr/lmgr.c:859
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "კორტეჟის (%u,%u) წაშლისას ურთიერთობაში \"%s\""
 
-#: storage/lmgr/lmgr.c:862
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "კორტეჟის (%u,%u) დაბლოკვისას ურთიერთობაში \"%s\""
 
-#: storage/lmgr/lmgr.c:865
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "კორტეჟის (%u,%u) განახლებული ვერსიის დაბლოკვისას ურთიერთობაში \"%s\""
 
-#: storage/lmgr/lmgr.c:868
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr ""
 
-#: storage/lmgr/lmgr.c:871
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr ""
 
-#: storage/lmgr/lmgr.c:874
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr ""
 
-#: storage/lmgr/lmgr.c:877
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr ""
 
-#: storage/lmgr/lmgr.c:1249
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "ურთიერთობა %u ბაზისთვის %u"
 
-#: storage/lmgr/lmgr.c:1255
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "ურთიერთობის %u გაფართოება ბაზისთვის %u"
 
-#: storage/lmgr/lmgr.c:1261
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid ბაზისთვის %u"
 
-#: storage/lmgr/lmgr.c:1266
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "გვერდი %u ურთიერთობისთვის %u ბაზისთვის %u"
 
-#: storage/lmgr/lmgr.c:1273
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:1281
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "ტრანზაქცია %u"
 
-#: storage/lmgr/lmgr.c:1286
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "ვირტუალური ტრანზაქცია %d/%u"
 
-#: storage/lmgr/lmgr.c:1292
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:1298
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:1306
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "მომხმარებლის ბლოკი [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1313
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "რეკომენდებული ბლოკი [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1321
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "დაშორებული ტრანზაქცია %u გამოწერა %u ბაზისთვის %u"
 
-#: storage/lmgr/lmgr.c:1328
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "locktag-ის უცნობი ტიპი %d"
 
-#: storage/lmgr/lock.c:866
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr ""
 
-#: storage/lmgr/lock.c:868
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr ""
 
-#: storage/lmgr/lock.c:1182
+#: storage/lmgr/lock.c:1185
 #, c-format
 msgid "process %d could not obtain %s on %s"
 msgstr "პროცესმა %d ვერ მიიღო %s %s-ზე"
 
-#: storage/lmgr/lock.c:3423 storage/lmgr/lock.c:3491 storage/lmgr/lock.c:3607
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr ""
@@ -23668,12 +23730,12 @@ msgstr ""
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr ""
 
-#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:556 utils/time/snapmgr.c:562
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567 utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "მოთხოვნილი სწრაფი ასლის შემოტანა შეუძლებელია"
 
-#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:563
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "საწყისი პროცესი PID-ით %d გაშვებული აღარაა."
@@ -23688,32 +23750,32 @@ msgstr ""
 msgid "The transaction might succeed if retried."
 msgstr "ტრანზაქცია შეიძლება გაიტანოს, თუ გაიმეორებთ."
 
-#: storage/lmgr/proc.c:454
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid "number of requested standby connections exceeds \"max_wal_senders\" (currently %d)"
 msgstr ""
 
-#: storage/lmgr/proc.c:1592
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr ""
 
-#: storage/lmgr/proc.c:1607
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr ""
 
-#: storage/lmgr/proc.c:1616
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr ""
 
-#: storage/lmgr/proc.c:1623
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr ""
 
-#: storage/lmgr/proc.c:1640
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr ""
@@ -23748,7 +23810,7 @@ msgstr ""
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr ""
 
-#: storage/smgr/md.c:517 storage/smgr/md.c:628
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "ფაილის გაფართოების შეცდომა \"%s\": %m"
@@ -23758,62 +23820,62 @@ msgstr "ფაილის გაფართოების შეცდომ
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr ""
 
-#: storage/smgr/md.c:606
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "ფაილის (\"%s\") FileFallocate()-ით გაფართოების შეცდომა: %m"
 
-#: storage/smgr/md.c:899 storage/smgr/md.c:2047
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "ბლოკების %u..%u წაკითხვის შეცდომა ფაილში \"%s\": %m"
 
-#: storage/smgr/md.c:946 storage/smgr/md.c:2060
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "ვერ წავიკითხე ბლოკები %u..%u ფაილში \"%s\": წავიკითხე, მხოლოდ, %zu ბაიტი %zu-დან"
 
-#: storage/smgr/md.c:1023
+#: storage/smgr/md.c:1034
 #, c-format
 msgid "could not start reading blocks %u..%u in file \"%s\": %m"
 msgstr "ბლოკების %u..%u წაკითხვის დაწყების შეცდომა ფაილში \"%s\": %m"
 
-#: storage/smgr/md.c:1119
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "ბლოკის %u..%u ჩაწერის შეცდომა ფაილში \"%s\": %m"
 
-#: storage/smgr/md.c:1289
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr ""
 
-#: storage/smgr/md.c:1344
+#: storage/smgr/md.c:1358
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr ""
 
-#: storage/smgr/md.c:1832
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr ""
 
-#: storage/smgr/md.c:1846
+#: storage/smgr/md.c:1860
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:1106
+#: storage/smgr/smgr.c:1115
 #, c-format
 msgid "file \"%s\""
 msgstr "ფაილი \"%s\""
 
-#: storage/smgr/smgr.c:1108
+#: storage/smgr/smgr.c:1117
 #, c-format
 msgid "block %u in file \"%s\""
 msgstr "ბლოკი %u ფაილში \"%s\""
 
-#: storage/smgr/smgr.c:1112
+#: storage/smgr/smgr.c:1121
 #, c-format
 msgid "blocks %u..%u in file \"%s\""
 msgstr "ბლოკები %u..%u ფაილში \"%s\""
@@ -23906,12 +23968,12 @@ msgstr "გაშვების პაკეტის არასწორი
 #: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
-msgstr ""
+msgstr "SSLRequest მიღებულია"
 
 #: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
-msgstr ""
+msgstr "SSLRequest უარყოფილია"
 
 #: tcop/backend_startup.c:609
 #, c-format
@@ -23931,12 +23993,12 @@ msgstr ""
 #: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
-msgstr ""
+msgstr "GSSENCRequest მიღებულია"
 
 #: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
-msgstr ""
+msgstr "GSSENCRequest უარყოფილია"
 
 #: tcop/backend_startup.c:663
 #, c-format
@@ -23970,24 +24032,19 @@ msgstr "გაშვების პაკეტში PostgreSQL-ის მო
 
 #: tcop/backend_startup.c:884
 #, c-format
-msgid "invalid length of query cancel packet"
+msgid "invalid length of cancel request packet"
 msgstr "მოთხოვნის გაუქმების პაკეტის სიგრძე არასწორია"
 
 #: tcop/backend_startup.c:892
 #, c-format
-msgid "invalid length of query cancel key"
-msgstr "მოთხოვნის გაუქმების გასაღების სიგრძე არასწორია"
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "გაუქმების გასაღების არასწორი სიგრძე მოთხოვნის გაუქმების პაკეტში"
 
 #: tcop/backend_startup.c:1022
 #, c-format
 msgid "Cannot specify log_connections option \"%s\" in a list with other options."
 msgstr "ვერ მიუთითებთ log_connections-ის პარამეტრს \"%s\" სიაში, სადაც სხვა პარამეტრებიცაა."
 
-#: tcop/backend_startup.c:1080
-#, c-format
-msgid "Invalid list syntax in parameter \"log_connections\"."
-msgstr "არასწორი სიის სინტაქსი პარამეტრში \"log_connections\"."
-
 #: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
@@ -24003,7 +24060,7 @@ msgstr ""
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr ""
 
-#: tcop/fastpath.c:312 tcop/postgres.c:1364 tcop/postgres.c:1600 tcop/postgres.c:2079 tcop/postgres.c:2351
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599 tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "ხანგრძლივობა: %s მწმ"
@@ -24033,7 +24090,7 @@ msgstr ""
 msgid "incorrect binary data format in function argument %d"
 msgstr ""
 
-#: tcop/postgres.c:455 tcop/postgres.c:5023
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "არასწორი წინაბოლოს შეტყობინების ტიპი %d"
@@ -24043,320 +24100,320 @@ msgstr "არასწორი წინაბოლოს შეტყობ
 msgid "statement: %s"
 msgstr "ოპერატორი: %s"
 
-#: tcop/postgres.c:1369
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "ხანგრძლივობა: %s მწმ  გამოსახულება: %s"
 
-#: tcop/postgres.c:1475
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr ""
 
-#: tcop/postgres.c:1605
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "ხანგრძლივობა: %s მწმ  %s-ის დამუშავება: %s"
 
-#: tcop/postgres.c:1672 tcop/postgres.c:2671
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr ""
 
-#: tcop/postgres.c:1724
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr ""
 
-#: tcop/postgres.c:1730
+#: tcop/postgres.c:1729
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr ""
 
-#: tcop/postgres.c:1944
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr ""
 
-#: tcop/postgres.c:2084
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "ხანგრძლივობა: %s მწმ  მიბმა %s%s%s: %s"
 
-#: tcop/postgres.c:2139 tcop/postgres.c:2753
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "პორტალი \"%s\" არ არსებობს"
 
-#: tcop/postgres.c:2232
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2234 tcop/postgres.c:2359
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr ""
 
-#: tcop/postgres.c:2235 tcop/postgres.c:2360
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "გაშვება"
 
-#: tcop/postgres.c:2356
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "ხანგრძლივობა: %s მწმs  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2504
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "მომზადება: %s"
 
-#: tcop/postgres.c:2529
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "პარამეტრები: %s"
 
-#: tcop/postgres.c:2544
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "გაუქმების მიზეზი: აღდგენის კონფლიქტი"
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr ""
 
-#: tcop/postgres.c:2563
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr ""
 
-#: tcop/postgres.c:2566
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr ""
 
-#: tcop/postgres.c:2569
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr ""
 
-#: tcop/postgres.c:2572
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr ""
 
-#: tcop/postgres.c:2578
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr ""
 
-#: tcop/postgres.c:2617
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "პორტალის \"%s\" პარამეტრი $%d = %s"
 
-#: tcop/postgres.c:2620
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "პორტალის \"%s\" პარამეტრი $%d"
 
-#: tcop/postgres.c:2626
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "უსახელო პორტალის პარამეტრი $%d = %s"
 
-#: tcop/postgres.c:2629
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "უსახელო პორტალის პარამეტრი $%d"
 
-#: tcop/postgres.c:2984
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr ""
 
-#: tcop/postgres.c:2990
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr ""
 
-#: tcop/postgres.c:2991
+#: tcop/postgres.c:2989
 #, 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 ""
 
-#: tcop/postgres.c:2995 tcop/postgres.c:3248
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr ""
 
-#: tcop/postgres.c:3002
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "მიერთების შეწყვეტა დაუყოვნებლივი გამორთვის ბრძანების გამო"
 
-#: tcop/postgres.c:3080
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "წილადი რიცხვების ანგარიშის შეცდომა"
 
-#: tcop/postgres.c:3081
+#: tcop/postgres.c:3079
 #, 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 ""
 
-#: tcop/postgres.c:3246
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "მიერთების შეწყვეტა აღდგენასთან კონფლიქტის გამო"
 
-#: tcop/postgres.c:3318
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "ავთენტიკაცია გაუქმდა მოლოდინის ვადის ამოწურვის გამო"
 
-#: tcop/postgres.c:3322
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "ავტომომტვერსასრუტების პროცესის შეწყვეტა ადმინისტრატორის ბრძანების გამო"
 
-#: tcop/postgres.c:3326
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "ლოგიკური რეპლიკაციის დამხმარე პროცესის შეწყვეტა ადმინისტრატორის ბრძანების გამო"
 
-#: tcop/postgres.c:3341
+#: tcop/postgres.c:3339
 #, c-format
 msgid "terminating walreceiver process due to administrator command"
 msgstr "walreceiver პროგრამის შეწყვეტა ადმინისტრატორის ბრძანების გამო"
 
-#: tcop/postgres.c:3357
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "მიერთების შეწყვეტა ადმინისტრატორის ბრძანების გამო"
 
-#: tcop/postgres.c:3388
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "კლიენტთან შეერთების შეცდომა"
 
-#: tcop/postgres.c:3440
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "გამოსახულება გაუქმდება ბლოკის მოლოდინის ვადის ამოწურვის გამო"
 
-#: tcop/postgres.c:3447
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr ""
 
-#: tcop/postgres.c:3454
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "ავტომომტვერსასრუტების ამოცანის გაუქმება"
 
-#: tcop/postgres.c:3467
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr ""
 
-#: tcop/postgres.c:3488
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr ""
 
-#: tcop/postgres.c:3501
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "მიერთების შეწყვეტა ტრანზაქციის მოლოდინის ვადის ამოწურვის გამო"
 
-#: tcop/postgres.c:3514
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr ""
 
-#: tcop/postgres.c:3553
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr "ამ პლატფორმაზე \"client_connection_check_interval\" 0 უნდა იყოს."
 
-#: tcop/postgres.c:3574
+#: tcop/postgres.c:3569
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "პარამეტრის ჩართვა მაშინ, როცა \"log_statement_stats\" ჩართულია, შეუძლებელია."
 
-#: tcop/postgres.c:3589
+#: tcop/postgres.c:3584
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "ვერ ჩართავთ \"log_statement_stats\"-ს, როცა \"when log_parser_stats\", \"log_planner_stats\", ან \"log_executor_stats\" ჭეშმარიტია."
 
-#: tcop/postgres.c:4029
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr ""
 
-#: tcop/postgres.c:4030 tcop/postgres.c:4036
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'."
 
-#: tcop/postgres.c:4034
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: არასწორი ბრძანების სტრიქონის არგუმენტი: %s"
 
-#: tcop/postgres.c:4087
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: არც ბაზა, არც მომხმარებელი მითითებული არაა"
 
-#: tcop/postgres.c:4280
+#: tcop/postgres.c:4275
 #, c-format
 msgid "could not generate random cancel key"
 msgstr "შემთხვევითი გაუქმების გასაღების გენერაცია შეუძლებელია"
 
-#: tcop/postgres.c:4682
+#: tcop/postgres.c:4677
 #, c-format
 msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
 msgstr ""
 
-#: tcop/postgres.c:4913
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "არასწორი CLOSE შეტყობინების ქვეტიპი %d"
 
-#: tcop/postgres.c:4950
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "არასწორი DESCRIBE შეტყობინების ქვეტიპი %d"
 
-#: tcop/postgres.c:5044
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr ""
 
-#: tcop/postgres.c:5048
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr ""
 
-#: tcop/postgres.c:5194
+#: tcop/postgres.c:5189
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr ""
 
-#: tcop/pquery.c:674
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
 
-#: tcop/pquery.c:972 tcop/pquery.c:1734
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "კურსორს მხოლოდ წინ სკანირება შეუძლია"
 
-#: tcop/pquery.c:973 tcop/pquery.c:1735
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr ""
@@ -24402,6 +24459,11 @@ msgstr "ბრძანების შესრულების წვდო
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "ამ ბრძანების შესრულება მხოლოდ \"%s\" როლის პრივილეგიების მქონეებს შეუძლიათ."
 
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr ""
+
 #: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
@@ -24630,94 +24692,94 @@ msgstr "%s დადებითი უნდა იყოს"
 #: tsearch/wparser_def.c:2682 tsearch/wparser_def.c:2686
 #, c-format
 msgid "%s must be >= 0"
-msgstr ""
+msgstr "%s უნდა იყოს >= 0"
 
-#: utils/activity/pgstat.c:533
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr ""
 
-#: utils/activity/pgstat.c:1443
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "სტატისტიკის არასწორი ტიპი: \"%s\""
 
-#: utils/activity/pgstat.c:1488
+#: utils/activity/pgstat.c:1471
 #, c-format
 msgid "custom cumulative statistics name is invalid"
 msgstr "კუმულატიური სტატისტიკის ხელით მითითებული სახელი არასწორია"
 
-#: utils/activity/pgstat.c:1489
+#: utils/activity/pgstat.c:1472
 #, c-format
 msgid "Provide a non-empty name for the custom cumulative statistics."
 msgstr "მიუთითეთ არაცარიელი სახელი მორგებული დაგროვებადი სტატისტიკისთვის."
 
-#: utils/activity/pgstat.c:1492
+#: utils/activity/pgstat.c:1475
 #, c-format
 msgid "custom cumulative statistics ID %u is out of range"
 msgstr "კუმულატიური სტატისტიკის ხელით მითითებული ID %u დიაპაზონს გარეთაა"
 
-#: utils/activity/pgstat.c:1493
+#: utils/activity/pgstat.c:1476
 #, c-format
 msgid "Provide a custom cumulative statistics ID between %u and %u."
 msgstr "შეიყვანეთ რესურსების ხელით მითითებული კუმულაციური სტატისტიკის ID %u-დან %u-მდე შუალედიდან."
 
-#: utils/activity/pgstat.c:1498 utils/activity/pgstat.c:1525 utils/activity/pgstat.c:1538
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508 utils/activity/pgstat.c:1521
 #, c-format
 msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
 msgstr "ვერ დარეგისტრირდა მორგებული დაგროვებითი სტატისტიკა \"%s\" ID-ით %u"
 
-#: utils/activity/pgstat.c:1499
+#: utils/activity/pgstat.c:1482
 #, c-format
 msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
 msgstr "მომხმარებლის კუმულაციური სტატისტიკის რეგისტრაცია \"shared_preload_libraries\"-ში მოდულების ინიციალიზაციისას უნდა მოხდეს."
 
-#: utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1491
 #, c-format
 msgid "custom cumulative statistics property is invalid"
 msgstr ""
 
-#: utils/activity/pgstat.c:1509
+#: utils/activity/pgstat.c:1492
 #, c-format
 msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
 msgstr ""
 
-#: utils/activity/pgstat.c:1526
+#: utils/activity/pgstat.c:1509
 #, c-format
 msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
 msgstr "მორგებული კუმულაციური სტატისტიკა \"%s\" უკვე რეგისტრირებულია, იგივე ID-ით."
 
-#: utils/activity/pgstat.c:1539
+#: utils/activity/pgstat.c:1522
 #, c-format
 msgid "Existing cumulative statistics with ID %u has the same name."
 msgstr "არსებულ კუმულატიურ სტატისტიკას ID-ით %u იგივე სახელი აქვს."
 
-#: utils/activity/pgstat.c:1545
+#: utils/activity/pgstat.c:1528
 #, c-format
 msgid "registered custom cumulative statistics \"%s\" with ID %u"
 msgstr "რეგისტრირებულია მორგებული კუმულაციური სტატისტიკა \"%s\" ID-ით %u"
 
-#: utils/activity/pgstat.c:1614
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "სტატისტიკის დროებითი ფაილის (\"%s\") გახსნა შეუძლებელია: %m"
 
-#: utils/activity/pgstat.c:1735
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "სტატისტიკის დროებითი ფაილში (\"%s\") ჩაწერა შეუძლებელია: %m"
 
-#: utils/activity/pgstat.c:1744
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "სტატისტიკის დროებითი ფაილის (\"%s\") დახურვა შეუძლებელია: %m"
 
-#: utils/activity/pgstat.c:1798
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "სტატისტიკის ფაილის (\"%s\") გახსნა შეუძლებელია: %m"
 
-#: utils/activity/pgstat.c:2030
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "სტატისტიკის დაზიანებული ფაილი \"%s\""
@@ -24727,6 +24789,11 @@ msgstr "სტატისტიკის დაზიანებული ფ
 msgid "function call to dropped function"
 msgstr "ფუნქცია წაშლილ ფუნქციას იძახებს"
 
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr ""
+
 #: utils/activity/pgstat_xact.c:366
 #, c-format
 msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
@@ -24742,102 +24809,102 @@ msgstr "მოცდის მოვლენა \"%s\" უკვე არს
 msgid "too many custom wait events"
 msgstr "მეტისმეტად ბევრი მორგებული მოცდის მოვლენა"
 
-#: utils/adt/acl.c:187 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "იდენტიფიკატორი ძალიან გრძელია"
 
-#: utils/adt/acl.c:188 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr ""
 
-#: utils/adt/acl.c:276
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "უცნობი საკვანძო სიტყვა: \"%s\""
 
-#: utils/adt/acl.c:277
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "ACL-ის საკვანძო სიტყვა უნდა იყოს \"group\" ან \"user\"."
 
-#: utils/adt/acl.c:285
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "სახელი აკლია"
 
-#: utils/adt/acl.c:286
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr ""
 
-#: utils/adt/acl.c:292
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "აკლია \"=\" ნიშანი"
 
-#: utils/adt/acl.c:351
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "არასწორი რეჟიმის სიმბოლო: უნდა იყოს ერთ-ერთი სიიდან \"%s\""
 
-#: utils/adt/acl.c:381
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "\"/\" სიმბოლოს სახელი უნდა მოჰყვებოდეს"
 
-#: utils/adt/acl.c:393
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr ""
 
-#: utils/adt/acl.c:579
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "ACL-ის მასივი მონაცემების არასწორ ტიპს შეიცავს"
 
-#: utils/adt/acl.c:583
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "ACL-ის მასივები ერთგანზომილებიანი უნდა იყოს"
 
-#: utils/adt/acl.c:587
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "ACL-ის მასივები ნულოვან მნიშვნელობებს არ უნდა შეიცავდეს"
 
-#: utils/adt/acl.c:616
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr ""
 
-#: utils/adt/acl.c:1264
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr ""
 
-#: utils/adt/acl.c:1580
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert მხარდაჭერილი აღარაა"
 
-#: utils/adt/acl.c:1590
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove მხარდაჭერილი აღარაა"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "პრივილეგიის უცნობი ტიპი \"%s\""
 
-#: utils/adt/acl.c:3548 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "ფუნქცია არ არსებობს: \"%s\""
 
-#: utils/adt/acl.c:5330
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "უნდა შეეძლოს SET ROLE \"%s\""
@@ -24853,7 +24920,7 @@ msgid "input data type is not an array"
 msgstr "შემოტანის მონაცემების ტიპი მასივი არაა"
 
 #: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249 utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107 utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800 utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859 utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011 utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072 utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199 utils/adt/int.c:1263
-#: utils/adt/int.c:1331 utils/adt/int.c:1337 utils/adt/int8.c:1256 utils/adt/numeric.c:2039 utils/adt/numeric.c:4557 utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565 utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143 utils/adt/varlena.c:3184 utils/adt/varlena.c:4118
+#: utils/adt/int.c:1331 utils/adt/int.c:1337 utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558 utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565 utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143 utils/adt/varlena.c:3195 utils/adt/varlena.c:4129
 #, c-format
 msgid "integer out of range"
 msgstr "მთელი მნიშვნელობა დიაპაზონს გარეთაა"
@@ -25073,7 +25140,7 @@ msgstr "ნულოვანი მასივის ელემენტი
 msgid "cannot compare arrays of different element types"
 msgstr "განსხვავებული ელემენტის ტიპების მქონე მასივების შედარება შეუძლებელია"
 
-#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2805 utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1425 utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
+#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2806 utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425 utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "ტიპისთვის \"%s\" ჰეშის ფუნქცია ვერ ვიპოვე"
@@ -25174,8 +25241,8 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr ""
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4258 utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308 utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510 utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974 utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462 utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665 utils/adt/geo_ops.c:4672 utils/adt/int.c:174
-#: utils/adt/int.c:186 utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226 utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7324 utils/adt/numeric.c:7527 utils/adt/numeric.c:8474 utils/adt/numutils.c:356 utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917 utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025 utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80 utils/adt/tid.c:94
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264 utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308 utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510 utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974 utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462 utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665 utils/adt/geo_ops.c:4672 utils/adt/int.c:174
+#: utils/adt/int.c:186 utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226 utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325 utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356 utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917 utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025 utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80 utils/adt/tid.c:94
 #: utils/adt/tid.c:103 utils/adt/timestamp.c:512 utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
@@ -25186,8 +25253,8 @@ msgstr "არასწორი შეყვანის სინტაქს
 msgid "money out of range"
 msgstr "ფული შუალედს გარეთაა"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106 utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039 utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167 utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942 utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164 utils/adt/numeric.c:3294 utils/adt/numeric.c:3317 utils/adt/numeric.c:3402 utils/adt/numeric.c:3420 utils/adt/numeric.c:3516 utils/adt/numeric.c:9399
-#: utils/adt/numeric.c:9923 utils/adt/numeric.c:10039 utils/adt/numeric.c:11550 utils/adt/timestamp.c:3772
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106 utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039 utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167 utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942 utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164 utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403 utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551 utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "ნულზე გაყოფა"
@@ -25222,12 +25289,12 @@ msgstr "TIME(%d)%s-ის სიზუსტე უარყოფით არ
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr ""
 
-#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4171 utils/adt/formatting.c:4180 utils/adt/formatting.c:4285 utils/adt/formatting.c:4295
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172 utils/adt/formatting.c:4181 utils/adt/formatting.c:4286 utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "თარიღი დიაპაზონს გარეთაა: \"%s\""
 
-#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609 utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609 utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2554
 #, c-format
 msgid "date out of range"
 msgstr "თარიღი დიაპაზონს გარეთაა"
@@ -25262,15 +25329,15 @@ msgstr "ერთეული \"%s\" ტიპისთვის %s მხარ
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "ერთეული \"%s\" ტიპისთვის %s შეუძლებელია"
 
-#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984 utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934 utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1817 utils/adt/formatting.c:4016 utils/adt/formatting.c:4052 utils/adt/formatting.c:4139 utils/adt/formatting.c:4261 utils/adt/json.c:375 utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282 utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984 utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934 utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826 utils/adt/formatting.c:4017 utils/adt/formatting.c:4053 utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375 utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282 utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
 #: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827 utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134 utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156 utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188 utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205 utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216 utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278 utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304 utils/adt/timestamp.c:3325
 #: utils/adt/timestamp.c:3338 utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360 utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371 utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591 utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733 utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902 utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075 utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827 utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
-#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382 utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509 utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554 utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612 utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2574 utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382 utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509 utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554 utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612 utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2576 utils/adt/xml.c:2583 utils/adt/xml.c:2603 utils/adt/xml.c:2610
 #, c-format
 msgid "timestamp out of range"
 msgstr "დროის შტამპი დიაპაზონს გარეთაა"
 
-#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4344
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "დროის მნიშვნელობა დიაპაზონს გარეთაა"
@@ -25295,7 +25362,7 @@ msgstr "დროისთვის უსასრულო ინტერვ
 msgid "cannot subtract infinite interval from time"
 msgstr "დროისთვის უსასრულო ინტერვალების გამოკლება შეუძლებელია"
 
-#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043 utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682 utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2698 utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906 utils/adt/timestamp.c:3947
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043 utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682 utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2699 utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906 utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr ""
@@ -25315,32 +25382,32 @@ msgstr "ინტერვალის დროის სარტყელი
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "ინტერვალის დროის სარტყელი \"%s\" თვეებს ან დღეებს არ უნდა შეიცავდეს"
 
-#: utils/adt/datetime.c:3324 utils/adt/datetime.c:4243 utils/adt/datetime.c:4249 utils/adt/timestamp.c:530
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249 utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "უცნობი დროის სარტყელი: %s"
 
-#: utils/adt/datetime.c:4217 utils/adt/datetime.c:4224
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "დროის/თარიღის ველის მნიშვნელობა დიაპაზონს გარეთაა: \"%s\""
 
-#: utils/adt/datetime.c:4226
+#: utils/adt/datetime.c:4232
 #, c-format
 msgid "Perhaps you need a different \"DateStyle\" setting."
 msgstr ""
 
-#: utils/adt/datetime.c:4231
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "ინტერვალის ველის მნიშვნელობა დიაპაზონს გარეთაა: \"%s\""
 
-#: utils/adt/datetime.c:4237
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr ""
 
-#: utils/adt/datetime.c:4251
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr ""
@@ -25470,32 +25537,32 @@ msgstr "%s დიაპაზონს გარეთაა ტიპისთ
 msgid "\"%s\" is out of range for type double precision"
 msgstr "%s დიაპაზონს გარეთაა ტიპისთვის: double precision"
 
-#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355 utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929 utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213 utils/adt/int8.c:1277 utils/adt/numeric.c:4696 utils/adt/numeric.c:4701 utils/adt/varlena.c:4093
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355 utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929 utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213 utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702 utils/adt/varlena.c:4104
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint დიაპაზონს გარეთაა"
 
-#: utils/adt/float.c:1454 utils/adt/numeric.c:3812 utils/adt/numeric.c:10454
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "უარყოფითი რიცხვიდან ფესვის ამოღება შეუძლებელია"
 
-#: utils/adt/float.c:1522 utils/adt/numeric.c:4100 utils/adt/numeric.c:4212
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "ნული უარყოფით ხარისხში განუსაზღვრელია"
 
-#: utils/adt/float.c:1526 utils/adt/numeric.c:4104 utils/adt/numeric.c:11345
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr ""
 
-#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4012 utils/adt/numeric.c:11125
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013 utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "ნულის ლოგარითმის აღება შეუძლებელია"
 
-#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3950 utils/adt/numeric.c:4007 utils/adt/numeric.c:11129
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951 utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "უარყოფითი რიცხვის ლოგარითმის აღება შეუძლებელია"
@@ -25505,22 +25572,22 @@ msgstr "უარყოფითი რიცხვის ლოგარით
 msgid "input is out of range"
 msgstr "შეყვანილი მნიშვნელობა დიაპაზონის გარეთაა"
 
-#: utils/adt/float.c:4085 utils/adt/numeric.c:1979
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "რაოდენობა ნულზე მეტი უნდა იყოს"
 
-#: utils/adt/float.c:4090 utils/adt/numeric.c:1990
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr ""
 
-#: utils/adt/float.c:4096 utils/adt/numeric.c:1995
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "ქვედა და ზედა ზღვრები სასრული უნდა ყოს"
 
-#: utils/adt/float.c:4162 utils/adt/numeric.c:2009
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "ქვედა ზღვარი ზედა ზღვარის ტოლი ვერ იქნება"
@@ -25675,7 +25742,7 @@ msgstr "ველს %d სიმბოლო სჭირდება, მა
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr ""
 
-#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269 utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269 utils/adt/formatting.c:2490 utils/adt/formatting.c:3390 utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "მნიშვნელობა \"%s\" \"%s\"-თვის არასწორია"
@@ -25690,7 +25757,7 @@ msgstr ""
 msgid "Value must be an integer."
 msgstr "მნიშვნელობა მთელი რიცხვი უნდა იყოს."
 
-#: utils/adt/formatting.c:2276
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "საწყის სტრიქონში \"%s\"-ის მნიშვნელობა დიაპაზონს გარეთაა"
@@ -25725,77 +25792,67 @@ msgstr ""
 msgid "Time zone abbreviation is not recognized."
 msgstr "დროის სარტყელის აბრევიატურა უცნობია."
 
-#: utils/adt/formatting.c:3593
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "არასწორი შეყვანილი სტრიქონი \"Y,YYY\"-სთვის"
-
-#: utils/adt/formatting.c:3600
-#, c-format
-msgid "value for \"Y,YYY\" in source string is out of range"
-msgstr "წყარო სტრიქონში \"Y,YYY\"-ის მნიშვნელობები დიაპაზონს გარეთაა"
-
-#: utils/adt/formatting.c:3689
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "შეყვანილი სტრიქონი datetime ფორმატისთვის მეტისმეტად მოკლეა"
 
-#: utils/adt/formatting.c:3697
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr ""
 
-#: utils/adt/formatting.c:4241
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr ""
 
-#: utils/adt/formatting.c:4247
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz დიაპაზონს გარეთაა"
 
-#: utils/adt/formatting.c:4275
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr ""
 
-#: utils/adt/formatting.c:4324
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr ""
 
-#: utils/adt/formatting.c:4330
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz დიაპაზონს გარეთაა"
 
-#: utils/adt/formatting.c:4356
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr ""
 
-#: utils/adt/formatting.c:4533
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "საათი \"%d\" არასწორია 12-საათიანი ათვლისთვის"
 
-#: utils/adt/formatting.c:4535
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "გამოიყენეთ 24-საათიანი ათვლა ან მიუთითეთ საათი დიაპაზონიდან 1-12."
 
-#: utils/adt/formatting.c:4712
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "წლის დღის გამოთვლა წლის მითითების გარეშე შეუძლებელია"
 
-#: utils/adt/formatting.c:5833
+#: utils/adt/formatting.c:5834
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" შეყვანისთვის მხარდაჭერილი არაა"
 
-#: utils/adt/formatting.c:6110
+#: utils/adt/formatting.c:6111
 #, c-format
 msgid "invalid Roman numeral"
 msgstr "არასწორი რომაული რიცხვი"
@@ -25881,7 +25938,7 @@ msgid "step size cannot equal zero"
 msgstr "ბიჯის ზომა ნულის ტოლი ვერ იქნება"
 
 #: utils/adt/int8.c:448 utils/adt/int8.c:471 utils/adt/int8.c:485 utils/adt/int8.c:499 utils/adt/int8.c:530 utils/adt/int8.c:554 utils/adt/int8.c:636 utils/adt/int8.c:704 utils/adt/int8.c:710 utils/adt/int8.c:736 utils/adt/int8.c:750 utils/adt/int8.c:774 utils/adt/int8.c:787 utils/adt/int8.c:899 utils/adt/int8.c:913 utils/adt/int8.c:927 utils/adt/int8.c:958 utils/adt/int8.c:980 utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041 utils/adt/int8.c:1055
-#: utils/adt/int8.c:1069 utils/adt/int8.c:1100 utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150 utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4645 utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612 utils/adt/varbit.c:1676 utils/adt/varlena.c:4143
+#: utils/adt/int8.c:1069 utils/adt/int8.c:1100 utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150 utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646 utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612 utils/adt/varbit.c:1676 utils/adt/varlena.c:4154
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint დიაპაზონს გარეთაა"
@@ -25932,7 +25989,7 @@ msgstr "მასივს ორი სვეტი უნდა ჰქონ
 msgid "mismatched array dimensions"
 msgstr "მასივის ზომები არ ემთხვევა"
 
-#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1963
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "დუბლირებული JSON ობიექტის გასაღების მნიშვნელობა"
@@ -25997,22 +26054,22 @@ msgstr "jsonb ობიექტის %s-ის ტიპში გადაყ
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "jsonb ობიექტის ან მასივის %s-ის ტიპში გადაყვანა შეუძლებელია"
 
-#: utils/adt/jsonb_util.c:763
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr ""
 
-#: utils/adt/jsonb_util.c:804
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr ""
 
-#: utils/adt/jsonb_util.c:1678 utils/adt/jsonb_util.c:1698
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "jsonb მასივის ელემენტების სრული ზომება მაქსიმუმ დასაშვებზე (%d ბაიტი) დიდია"
 
-#: utils/adt/jsonb_util.c:1759 utils/adt/jsonb_util.c:1794 utils/adt/jsonb_util.c:1814
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800 utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr ""
@@ -26474,12 +26531,12 @@ msgstr ""
 msgid "LIKE pattern must not end with escape character"
 msgstr ""
 
-#: utils/adt/like_match.c:437 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:801
 #, c-format
 msgid "invalid escape string"
 msgstr "არასწორი სპეციალური სიმბოლო"
 
-#: utils/adt/like_match.c:438 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:802
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr ""
@@ -26509,16 +26566,11 @@ msgstr ""
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr ""
 
-#: utils/adt/mcxtfuncs.c:305 utils/adt/mcxtfuncs.c:391
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "პროცესი PID-ით %d PostgreSQL-ის სერვერის პროცესს არ წარმოადგენს"
 
-#: utils/adt/mcxtfuncs.c:480
-#, c-format
-msgid "PID %d is no longer a PostgreSQL server process"
-msgstr "პროცესი PID-ით %d PostgreSQL-ის სერვერის პროცესს აღარ წარმოადგენს"
-
 #: utils/adt/misc.c:237
 #, c-format
 msgid "global tablespace never has databases"
@@ -26608,12 +26660,12 @@ msgstr "მოველოდი დიაპაზონის დასაწ
 msgid "Expected comma or end of multirange."
 msgstr "მოველოდი მძიმეს ან მულტიდიაპაზონის დასასრულს."
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "მულტიდიაპაზონი მრავალგანზომილებიანი მასივებისგან ვერ შეიქმნება"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "მულტიდიაპაზონიანი მნიშვნელობები ნულოვან მწკრივებს არ შეიძლება შეიცავდეს"
@@ -26691,7 +26743,7 @@ msgstr "შედეგი დიაპაზონს გარეთაა"
 msgid "cannot subtract inet values of different sizes"
 msgstr ""
 
-#: utils/adt/numeric.c:795 utils/adt/numeric.c:3762 utils/adt/numeric.c:7319 utils/adt/numeric.c:7522 utils/adt/numeric.c:7994 utils/adt/numeric.c:10928 utils/adt/numeric.c:11403 utils/adt/numeric.c:11497 utils/adt/numeric.c:11632
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320 utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929 utils/adt/numeric.c:11404 utils/adt/numeric.c:11498 utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "მნიშვნელობა გადაავსებს რიცხვის ფორმატს"
@@ -26756,62 +26808,62 @@ msgstr "ბიჯის ზომა NaN ვერ იქნება"
 msgid "step size cannot be infinity"
 msgstr "ბიჯის ზომა უსასრულო ვერ იქნება"
 
-#: utils/adt/numeric.c:3752
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "უასრყოფითი რიცხვის ფაქტორიალი გაურკვეველია"
 
-#: utils/adt/numeric.c:4359
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "ქვედა ზღვარი ნულოვანი ვერ იქნება"
 
-#: utils/adt/numeric.c:4363
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "ქვედა ზღვარი უსასრულობა ვერ იქნება"
 
-#: utils/adt/numeric.c:4370
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "ზედა ზღვარი ნულოვანი ვერ იქნება"
 
-#: utils/adt/numeric.c:4374
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "ზედა ზღვარი უსასრულობა ვერ იქნება"
 
-#: utils/adt/numeric.c:4535 utils/adt/numeric.c:4623 utils/adt/numeric.c:4683 utils/adt/numeric.c:4879
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684 utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "\"NaN\"-ის %s-ში გადაყვანა შეუძლებელია"
 
-#: utils/adt/numeric.c:4539 utils/adt/numeric.c:4627 utils/adt/numeric.c:4687 utils/adt/numeric.c:4883
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688 utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "უსასრულობის %s-ში გადაყვანა შეუძლებელია"
 
-#: utils/adt/numeric.c:4892
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn დიაპაზონს გარეთაა"
 
-#: utils/adt/numeric.c:8084 utils/adt/numeric.c:8135
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "რიცხვითი ველის გადავსება"
 
-#: utils/adt/numeric.c:8085
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr ""
 
-#: utils/adt/numeric.c:8136
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr ""
 
-#: utils/adt/numeric.c:11701 utils/adt/pseudorandomfuncs.c:135 utils/adt/pseudorandomfuncs.c:159
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135 utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
 msgstr "ქვედა ზღვარი ზედა ზღვარზე ნაკლები ან ტოლი უნდა იყოს"
@@ -26851,57 +26903,57 @@ msgstr "მოთხოვნილი სიმბოლო არასწო
 msgid "percentile value %g is not between 0 and 1"
 msgstr ""
 
-#: utils/adt/pg_locale.c:303 utils/adt/pg_locale.c:335
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "ლოკალის სახელი \"%s\" არა-ASCII სიმბოლოებს შეიცავს"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr ""
 
-#: utils/adt/pg_locale.c:1125
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "კოლაციის ვერსია არ ემთხვევა: %s"
 
-#: utils/adt/pg_locale.c:1127
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr ""
 
-#: utils/adt/pg_locale.c:1130
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr ""
 
-#: utils/adt/pg_locale.c:1483 utils/adt/pg_locale.c:1510 utils/adt/pg_locale_builtin.c:186
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525 utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "არასწორი ლოკალის სახელი \"%s\" ჩაშენებული მომწოდებლისთვის"
 
-#: utils/adt/pg_locale.c:1575
+#: utils/adt/pg_locale.c:1590
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "მდებარეობის კოდის \"%s\" ენის ჭდეში (%s) გადაყვანის შეცდომა"
 
-#: utils/adt/pg_locale.c:1584 utils/adt/pg_locale.c:1659 utils/adt/pg_locale_icu.c:215
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674 utils/adt/pg_locale_icu.c:215
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ამ აგებაში ICU-ის მხარდაჭერა არ არსებბს"
 
-#: utils/adt/pg_locale.c:1617
+#: utils/adt/pg_locale.c:1632
 #, c-format
 msgid "could not get language from ICU locale \"%s\": %s"
 msgstr "'ICU' ლოკალიდან \"%s\" ენის მიღების შეცდომა: %s"
 
-#: utils/adt/pg_locale.c:1619 utils/adt/pg_locale.c:1649
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
 msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
 msgstr "ICU ლოკალის გადამოწმების გასათიშად პარამეტრი \"%s\" დააყენეთ მნიშვნელობაზე \"%s\"."
 
-#: utils/adt/pg_locale.c:1647
+#: utils/adt/pg_locale.c:1662
 #, c-format
 msgid "ICU locale \"%s\" has unknown language \"%s\""
 msgstr "ICU ლოკალს \"%s\" გააჩნია უცნობი ენა \"%s\""
@@ -27111,7 +27163,7 @@ msgstr "ძალიან ბევრი მძიმე."
 msgid "Junk after right parenthesis or bracket."
 msgstr "ნაგავი მარჯვენა ფრჩხილის ან მრგვალი ფრჩხილის შემდეგ."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4475
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2065 utils/adt/varlena.c:4486
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "რეგულარული გამოსახულების შეცდომა: %s"
@@ -27126,28 +27178,28 @@ msgstr "რეგულარული გამოსახულების 
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr ""
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082 utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164 utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862 utils/adt/regexp.c:1871 utils/misc/guc.c:6818 utils/misc/guc.c:6852
+#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1151 utils/adt/regexp.c:1215 utils/adt/regexp.c:1224 utils/adt/regexp.c:1233 utils/adt/regexp.c:1242 utils/adt/regexp.c:1922 utils/adt/regexp.c:1931 utils/adt/regexp.c:1940 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "არასწორი მნიშვნელობა პარამეტრისთვის \"%s\": %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:948
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr ""
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271 utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753 utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1162 utils/adt/regexp.c:1253 utils/adt/regexp.c:1340 utils/adt/regexp.c:1379 utils/adt/regexp.c:1767 utils/adt/regexp.c:1822 utils/adt/regexp.c:1951
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s-ს პარამეტრის \"global\" მხარდაჭერა არ გააჩნია"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1381
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "სამაგიეროდ ფუნქცია regexp_matches გამოიყენეთ."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1569
 #, c-format
 msgid "too many regular expression matches"
 msgstr "რეგულარული გამოსახულების ძალიან ბევრი დამთხვევა"
@@ -27162,7 +27214,7 @@ msgstr "ერთზე მეტი ფუნქცია სახელწო
 msgid "more than one operator named %s"
 msgstr "ერთზე მეტი ოპერატორი, სახელად %s"
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10826 utils/adt/ruleutils.c:11039
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836 utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "მეტისმეტად ბევრი არგუმენტი"
@@ -27172,7 +27224,7 @@ msgstr "მეტისმეტად ბევრი არგუმენტ
 msgid "Provide two argument types for operator."
 msgstr "ოპერატორისთვის ორი არგუმენტის ტიპი მიაწოდეთ."
 
-#: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810 utils/adt/regproc.c:1815 utils/adt/varlena.c:3481 utils/adt/varlena.c:3486
+#: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810 utils/adt/regproc.c:1815 utils/adt/varlena.c:3492 utils/adt/varlena.c:3497
 #, c-format
 msgid "invalid name syntax"
 msgstr "სახელის არასწორი სინტაქსი"
@@ -27380,7 +27432,7 @@ msgstr ""
 #: utils/adt/tid.c:369
 #, c-format
 msgid "the view has no rules"
-msgstr ""
+msgstr "ხედს წესები არ აქვს"
 
 #: utils/adt/tid.c:381
 #, c-format
@@ -27405,7 +27457,7 @@ msgstr "დროის შტამპი დიაპაზონს გარ
 #: utils/adt/timestamp.c:396
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
-msgstr ""
+msgstr "timestamp(%d)-ის სიზუსტე უნდა იყოს შუალედიდან %d - %d"
 
 #: utils/adt/timestamp.c:514
 #, c-format
@@ -27708,7 +27760,7 @@ msgstr "გარე ბიტური სტრიქონის არას
 msgid "bit string too long for type bit varying(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919 utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3102 utils/adt/varlena.c:3180
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919 utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3113 utils/adt/varlena.c:3191
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "ქვესტრიქონის სიგრძე უარყოფითი არ შეიძლება იყოს"
@@ -27733,7 +27785,7 @@ msgstr "განსხვავებული სიგრძის სტრ
 msgid "bit index %d out of valid range (0..%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3384
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3395
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "ახალი ბიტი უნდა იყოს 0 ან 1"
@@ -27748,92 +27800,92 @@ msgstr "მნიშვნელობა სიმბოლოს ტიპი
 msgid "value too long for type character varying(%d)"
 msgstr ""
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1591
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1602
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr ""
 
-#: utils/adt/varlena.c:1864
+#: utils/adt/varlena.c:1875
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr ""
 
-#: utils/adt/varlena.c:3268 utils/adt/varlena.c:3335
+#: utils/adt/varlena.c:3279 utils/adt/varlena.c:3346
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "ინდექსი %d დასაშვებ დიაპაზონს (0..%d) გარეთაა"
 
-#: utils/adt/varlena.c:3299 utils/adt/varlena.c:3371
+#: utils/adt/varlena.c:3310 utils/adt/varlena.c:3382
 #, c-format
 msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
 msgstr "ინდექსი %<PRId64> დასაშვებ დიაპაზონს (0..%<PRId64>) გარეთაა"
 
-#: utils/adt/varlena.c:4587
+#: utils/adt/varlena.c:4598
 #, c-format
 msgid "field position must not be zero"
 msgstr "ველის მდებარეობა ნულოვანი ვერ იქნება"
 
-#: utils/adt/varlena.c:5832
+#: utils/adt/varlena.c:5843
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr ""
 
-#: utils/adt/varlena.c:5833 utils/adt/varlena.c:5967 utils/adt/varlena.c:6088
+#: utils/adt/varlena.c:5844 utils/adt/varlena.c:5978 utils/adt/varlena.c:6099
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "ერთი \"%%\"-სთვის გამოიყენეთ \"%%%%\"."
 
-#: utils/adt/varlena.c:5965 utils/adt/varlena.c:6086
+#: utils/adt/varlena.c:5976 utils/adt/varlena.c:6097
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr ""
 
-#: utils/adt/varlena.c:5978 utils/adt/varlena.c:6035
+#: utils/adt/varlena.c:5989 utils/adt/varlena.c:6046
 #, c-format
 msgid "too few arguments for format()"
 msgstr "format()-ის არგუმენტები საკმარისი არაა"
 
-#: utils/adt/varlena.c:6131 utils/adt/varlena.c:6313
+#: utils/adt/varlena.c:6142 utils/adt/varlena.c:6324
 #, c-format
 msgid "number is out of range"
 msgstr "რიცხვი დიაპაზონს გარეთაა"
 
-#: utils/adt/varlena.c:6194 utils/adt/varlena.c:6222
+#: utils/adt/varlena.c:6205 utils/adt/varlena.c:6233
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr ""
 
-#: utils/adt/varlena.c:6215
+#: utils/adt/varlena.c:6226
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr ""
 
-#: utils/adt/varlena.c:6260
+#: utils/adt/varlena.c:6271
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr ""
 
-#: utils/adt/varlena.c:6468
+#: utils/adt/varlena.c:6479
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr ""
 
-#: utils/adt/varlena.c:6481
+#: utils/adt/varlena.c:6492
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "ნორმალიზაციის არასწორი ფორმა: %s"
 
-#: utils/adt/varlena.c:6526
+#: utils/adt/varlena.c:6537
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr ""
 
-#: utils/adt/varlena.c:6743 utils/adt/varlena.c:6778 utils/adt/varlena.c:6813
+#: utils/adt/varlena.c:6754 utils/adt/varlena.c:6789 utils/adt/varlena.c:6824
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "უნიკოდის კოდის არასწორი წერტილი: %04X"
 
-#: utils/adt/varlena.c:6843
+#: utils/adt/varlena.c:6854
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr ""
@@ -27868,7 +27920,7 @@ msgstr "\"XML\"-ის მხარდაუჭერელი ფუნქც
 msgid "This functionality requires the server to be built with libxml support."
 msgstr ""
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:628
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "კოდირების არასწორი სახელი: \"%s\""
@@ -27883,136 +27935,136 @@ msgstr "არასწორი XML კომენტარი"
 msgid "not an XML document"
 msgstr "არ არის XML დოკუმენტი"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "xml-ის დამუშავების არასწორი ინსტრუქცია"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr ""
+msgstr "XML-ის დამუშავების ინსტრუქციის სამიზნე არ შეიძლება, იყოს \"%s\"."
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
-msgstr ""
+msgstr "XML-ის დამუშავების ინსტრუქცია არ შეიძლება, შეიცავდეს სიმბოლოს \"?>\"."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate განხორციელებული არაა"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "xml ბიბლიოთეკის ინიციალიზება ვერ მოხერხდა"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2 აქვს შეუთავსებელი char ტიპის: ზომა (char)=%zu, sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "\"XML\" შეცდომების დამმუშავებლის მორგების შეცდომა"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, 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 ""
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "სტრიქონის არასწორი მნშვნელობა."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "საჭიროა გამოტოვება."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone-ის მნიშვნელობა შეიძლება იყოს \"yes\"(დიახ) ან \"no\"(არა)."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "არასწორი აღწერა: ვერსია მითითებული არაა."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "ტექსტის აღწერაში კოდირება მითითებული არაა."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
-msgstr ""
+msgstr "XML-ის აღწერის დამუშავება: მოველოდი '?>'."
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Libxml-ის შეცდომის უცნობი კოდი: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2555
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML-ს უსასრულო თარიღის მნიშვნელობების მხარდაჭერა არ გააჩნია."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2577 utils/adt/xml.c:2604
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML-ს უსასრულო დროის შტამპის მნიშვნელობების მხარდაჭერა არ გააჩნია."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3020
 #, c-format
 msgid "invalid query"
 msgstr "არასწორი მოთხოვნა"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3112
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "პორტალი \"%s\" კორტეჟებს არ აბრუნებს"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4364
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr ""
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4365
 #, c-format
 msgid "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr ""
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4389
 #, c-format
 msgid "empty XPath expression"
 msgstr "ცარიელი XPath გამოხატულება"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4441
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "სახელების სივრცის სახელი და URI ნულოვანი არ შეიძლება, იყოს"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4448
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr ""
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4797
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "სახელების სივრცე DEFAULT მხარდაუჭერელია"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4826
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "მწკრივის ბილიკის ფილტრი ცარიელი სტრიქონი არ შეიძლება იყოს"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4860
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "სვეტის ბილიკის ფილტრი ცარიელი სტრიქონი არ შეიძლება იყოს"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5007
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr ""
@@ -28057,17 +28109,17 @@ msgstr "heap relfilenumber-ის მნიშვნელობა ბინა
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "ახალი relfilenumber-ის მოულოდნელი მოთხოვნა ბინარული განახლების რეჟიმში"
 
-#: utils/cache/relcache.c:6630
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr ""
 
-#: utils/cache/relcache.c:6632
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "მაინც ვაგრძელებ, მაგრამ რაღაც ცუდი ხდება."
 
-#: utils/cache/relcache.c:6962
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "კეშის ფაილის \"%s\" წაშლის შეცდომა: %m"
@@ -28107,181 +28159,176 @@ msgstr "ხაფანგი: გამოთხოვის შეცდომ
 msgid "error occurred before error message processing is available\n"
 msgstr "აღმოჩენილია შეცდომა მანამდე, სანამ შეცდომის შეტყობინებების დამუშავება ხელმისაწვდომი გახდებოდა\n"
 
-#: utils/error/elog.c:2159
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr ""
 
-#: utils/error/elog.c:2172
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr ""
 
-#: utils/error/elog.c:2208
+#: utils/error/elog.c:2191
 #, c-format
 msgid "Invalid character."
 msgstr "არასწორი სიმბოლო."
 
-#: utils/error/elog.c:2918 utils/error/elog.c:2945 utils/error/elog.c:2961
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[უცნობი]"
 
-#: utils/error/elog.c:3263 utils/error/elog.c:3587 utils/error/elog.c:3694
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "შეცდომის ტექსტი ხელმიუწვდომელია"
 
-#: utils/error/elog.c:3266 utils/error/elog.c:3269
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " სიმბოლოსთან %d"
 
-#: utils/error/elog.c:3279 utils/error/elog.c:3286
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "დეტალები:  "
 
-#: utils/error/elog.c:3293
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "მინიშნება:  "
 
-#: utils/error/elog.c:3300
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "მოთხოვნა:  "
 
-#: utils/error/elog.c:3307
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "კონტექსტი:  "
 
-#: utils/error/elog.c:3317
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "მდებარეობა:   %s, %s:%d\n"
 
-#: utils/error/elog.c:3324
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "მდებარეობა:   %s:%d\n"
 
-#: utils/error/elog.c:3331
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "სტეკი:  "
 
-#: utils/error/elog.c:3343
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "ოპერატორი:  "
 
-#: utils/error/elog.c:3739
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "გამართვა"
 
-#: utils/error/elog.c:3743
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "ჟურნალი"
 
-#: utils/error/elog.c:3746
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "ინფორმაცია"
 
-#: utils/error/elog.c:3749
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "გაფრთხილება"
 
-#: utils/error/elog.c:3753
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "გაფრთხილება"
 
-#: utils/error/elog.c:3756
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "შეცდომა"
 
-#: utils/error/elog.c:3759
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "ფატალური"
 
-#: utils/error/elog.c:3762
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "პანიკა"
 
-#: utils/fmgr/dfmgr.c:118
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "ფაილში \"%1$s\" ფუნქცია \"%2$s\" არ არსებობს"
 
-#: utils/fmgr/dfmgr.c:237
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "ბიბლიოთეკის (\"%s\") ჩატვირთვის შეცდომა: %s"
 
-#: utils/fmgr/dfmgr.c:274
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "არათავსებადი ბიბლიოთეკა \"%s\": მაგიური ბლოკი აღმოჩენილი არაა"
 
-#: utils/fmgr/dfmgr.c:276
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "გაფართოების ბიბლიოთეკების მიერ PG_MODULE_MAGIC მაკროს გამოყენება აუცილებელია."
 
-#: utils/fmgr/dfmgr.c:322
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "არათავსებადი ბიბლიოთეკა \"%s\": შეუსაბამო ვერსია"
 
-#: utils/fmgr/dfmgr.c:324
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "სერვერის ვერსიაა %d. ბიბლიოთეკის კი %s."
 
-#: utils/fmgr/dfmgr.c:336
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "არათავსებადი ბიბლიოთეკა \"%s\": ABI არ ემთხვევა"
 
-#: utils/fmgr/dfmgr.c:338
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "სერვერის ABI \"%s\"-ა, ბიბლიოთეკის კი \"%s\"."
 
 #. translator: %s is a variable name and %d its values
-#: utils/fmgr/dfmgr.c:357 utils/fmgr/dfmgr.c:367 utils/fmgr/dfmgr.c:377
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
 msgid "Server has %s = %d, library has %d."
 msgstr "სერვერს აქვს %s = %d, ბიბლიოთეკას აქვს %d."
 
 #. translator: %s is a variable name and %d its values
-#: utils/fmgr/dfmgr.c:387
+#: utils/fmgr/dfmgr.c:402
 #, c-format
 msgid "Server has %s = %s, library has %s."
 msgstr "სერვერს აქვს %s = %s, ბიბლიოთეკას აქვს %s."
 
-#: utils/fmgr/dfmgr.c:394
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:397
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "არათავსებადი ბიბლიოთეკა \"%s\": მაგიური ბლოკი არ ემთხვევა"
 
-#: utils/fmgr/dfmgr.c:520
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "წვდომა ბიბლიოთეკასთან \"%s\""
 
-#: utils/fmgr/dfmgr.c:547
+#: utils/fmgr/dfmgr.c:554
 #, c-format
 msgid "invalid macro name in path: %s"
 msgstr "მაკროს არასწორი სახელი ბილიკში: %s"
 
-#: utils/fmgr/dfmgr.c:599
+#: utils/fmgr/dfmgr.c:606
 #, c-format
 msgid "zero-length component in parameter \"%s\""
 msgstr "ნულოვანი სიგრძის კომპონენტი პარამეტრში \"%s\""
 
-#: utils/fmgr/dfmgr.c:618
-#, c-format
-msgid "component in parameter \"%s\" is not an absolute path"
-msgstr "პარამეტრში \"%s\" კომპონენტი აბსოლუტური ბილიკი არაა"
-
 #: utils/fmgr/fmgr.c:236
 #, c-format
 msgid "internal function \"%s\" is not in internal lookup table"
@@ -28474,112 +28521,112 @@ msgstr "მეტისმეტად ბევრი კავშირი რ
 msgid "invalid role OID: %u"
 msgstr "როლის არასწორი OID: %u"
 
-#: utils/init/miscinit.c:1197
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "მონაცემთა ბაზის სისტემა გათიშულია"
 
-#: utils/init/miscinit.c:1284
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "ბლოკის ფაილის (%s) შექმნის შეცდომა: %m"
 
-#: utils/init/miscinit.c:1298
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "ბლოკის ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: utils/init/miscinit.c:1305
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "ბლოკის ფაილის (%s) წაკითხვის შეცდომა: %m"
 
-#: utils/init/miscinit.c:1314
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "ბლოკის ფაილი (\"%s\") ცარიელია"
 
-#: utils/init/miscinit.c:1315
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr ""
 
-#: utils/init/miscinit.c:1359
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "ბლოკის ფაილი (\"%s\") უკვე არსებობს"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "არის სხვა postgres (PID %d) გაშვებული მონაცემების საქაღალდეში \"%s\"?"
 
-#: utils/init/miscinit.c:1365
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "არის სხვა postmaster (PID %d) გაშვებული მონაცემების საქაღლდეში \"%s\"?"
 
-#: utils/init/miscinit.c:1368
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "იყენებს სხვა postgres (PID %d) სოკეტის ფაილს \"%s\"?"
 
-#: utils/init/miscinit.c:1370
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "იყენებს სხვა postmaster (PID %d) სოკეტის ფაილს \"%s\"?"
 
-#: utils/init/miscinit.c:1421
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "ბლოკის ძველი ფაილის წაშლის შეცდომა \"%s\": %m"
 
-#: utils/init/miscinit.c:1423
+#: utils/init/miscinit.c:1424
 #, 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 ""
 
-#: utils/init/miscinit.c:1460 utils/init/miscinit.c:1474 utils/init/miscinit.c:1485
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475 utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "ბლოკის ფაილში (%s) ჩაწერის შეცდომა: %m"
 
-#: utils/init/miscinit.c:1596 utils/init/miscinit.c:1738 utils/misc/guc.c:5763
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "ფაილიდან (\"%s\") წაკითხვის შეცდომა: %m"
 
-#: utils/init/miscinit.c:1726
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "შეცდომა ფაილის (\"%s\") გახსნისას: %m; მაინც ვაგრძელებ"
 
-#: utils/init/miscinit.c:1751
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "ბლოკის ფაილი \"%s\" შეიცავს არასწორ PID-ს: %ld-ს %ld-ის მაგიერ"
 
-#: utils/init/miscinit.c:1790 utils/init/miscinit.c:1806
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "%s მონაცემების არასწორი საქაღალდეა"
 
-#: utils/init/miscinit.c:1792
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "ფაილი \"%s\" აკლია."
 
-#: utils/init/miscinit.c:1808
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "ფაილი \"%s\" სწორ მონაცემებს არ შეიცავს."
 
-#: utils/init/miscinit.c:1810
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "როგორც ჩანს, initdb გჭირდებათ."
 
-#: utils/init/miscinit.c:1818
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "მონაცემის საქაღალდე ინიციალიზებული იყო PostgreSQL-ის %s ვერსიით, რომელიც ამ ვერსიასთან, %s, თავსებადი არაა."
@@ -28702,57 +28749,57 @@ msgstr "მორგებულია მეტისმეტად ბევ
 msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
 msgstr ""
 
-#: utils/init/postinit.c:889
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "ამ მონაცემთა ბაზაში როლები აღწერილი არაა"
 
-#: utils/init/postinit.c:890
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "მაშინვე უნდა გაუშვათ CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:935
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "ორობითი განახლებისას მისაერთებლად ზემომხმარებელი უნდა ბრძანდებოდეთ"
 
-#: utils/init/postinit.c:955
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "დარჩენილი მიერთების სლოტები დაცულია %s ატრიბუტის მქონე როლებისთვის"
 
-#: utils/init/postinit.c:961
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "დარჩენილი მიერთების სლოტები დაცულია %s როლის პრივილეგიების მქონე როლებისთვის"
 
-#: utils/init/postinit.c:973
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "'WAL' გამგზავნის გაშვების წვდომა აკრძალულია"
 
-#: utils/init/postinit.c:974
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr ""
 
-#: utils/init/postinit.c:1092
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "როგორც ჩანს, ახლახანს წაიშალა ან სახელი გადაერქვა."
 
-#: utils/init/postinit.c:1096
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "ბაზა არ არსებობს: %u"
 
-#: utils/init/postinit.c:1105
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "არასწორ მონაცემთა ბაზასთან \"%s\" დაკავშირება ვერ მოხერხდა"
 
-#: utils/init/postinit.c:1166
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "ბაზის ქვესაქაღალდე არ არსებობს: %s."
@@ -28777,47 +28824,47 @@ msgstr "მოულოდნელი დაშიფვრის ID %d 'ISO 88
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "მოულოდნელი დაშიფვრის ID %d WIN სიმბოლოების ნაკრებებისთვის"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:298 utils/mb/mbutils.c:901
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "%s-დან %s-ზე გადაყვანა მხარდაჭერილი არაა"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815 utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:403 utils/mb/mbutils.c:431 utils/mb/mbutils.c:816 utils/mb/mbutils.c:843
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "%d ბაიტიანი სტრიქონი კოდირების გადაყვანისთვის მეტისმეტად გრძელია."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:569
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "წყაროს კოდირების არასწორი სახელი: \"%s\""
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:574
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "სამიზნის კოდირების არასწორი სახელი: \"%s\""
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:714
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "არასწორი ბაიტის მნიშვნელობა კოდირებისთვის \"%s\": 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:878
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "უნიკოდის კოდის არასწორი წერტილი"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1202
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codeset-ის შეცდომა"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1719
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "ბაიტების არასწორი მიმდევრობა კოდირებისთვის \"%s\": %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1760
 #, c-format
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr ""
@@ -28969,7 +29016,7 @@ msgstr "პარამეტრი \"%s\" არ შეიძლება შ
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "პარამეტრი \"%s\" ახლა არ შეიძლება შეიცვალოს"
 
-#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668 utils/misc/guc.c:6754
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668 utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "პარამეტრის (\"%s\") დაყენების წვდომა აკრძალულია"
@@ -28994,12 +29041,12 @@ msgstr "პარამეტრის საწყის მნიშვნე
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "პარამეტრი \"%s\"-ის ფუნქციებში ლოკალურად დაყენება შეუძლებელია"
 
-#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5448
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "\"%s\"-ის მოსინჯვის წვდომა აკრძალულია"
 
-#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5449
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "ამ პარამეტრის შემოწმება მხოლოდ \"%s\" პრივილეგიის მქონე როლებს შეუძლიათ."
@@ -29014,47 +29061,47 @@ msgstr "ამ გარემოში ALTER SYSTEM დაშვებული
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "\"ALTER SYSTEM RESET ALL\"-ის შესრულების წვდომა აკრძალულია"
 
-#: utils/misc/guc.c:4737
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr "პარამეტრის მნიშვნელობა ALTER SYSTEM-სთვის არ შეიძლება, ახალი ხაზის სიმბოლოს შეიცავდეს"
 
-#: utils/misc/guc.c:4782
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "ფაილის დშემცველობის ამუშავების შეცდომა \"%s\""
 
-#: utils/misc/guc.c:4965
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "პარამეტრის თავიდან აღწერის მცდელობა: \"%s\""
 
-#: utils/misc/guc.c:5304
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "კონფიგურაციის პარამეტრის არასწორი სახელი: \"%s\". წაიშლება"
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "\"%s\" ახლა დაცული პრეფიქსია."
 
-#: utils/misc/guc.c:6177
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "პარამეტრის \"%s\" \"%s\"-ზე დაყენებისას"
 
-#: utils/misc/guc.c:6346
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "პარამეტრის დაყენების შეცდომა: \"%s\""
 
-#: utils/misc/guc.c:6436
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "პარამეტრის მნიშვნელობის დამუშავების შეცდომა: %s"
 
-#: utils/misc/guc.c:6886
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "არასწორი მნიშვნელობა პარამეტრისთვის \"%s\": %g"
@@ -29079,2259 +29126,2263 @@ msgstr "SET %s მხოლოდ ერთ არგუმენტს იღ
 msgid "SET requires parameter name"
 msgstr "SET მოითხოვს პარამეტრის სახელს"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "დაჯგუფება მოხსნილია"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "ფაილის მდებარეობები"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "დაკავშირება და ავთენტიკაცია / შეერთების პარამეტრები"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "დაკავშირება და ავთენტიკაცია / TCP-ის პარამეტრები"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "დაკავშირება და ავთენტიკაცია / ავთენტიკაცია"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "დაკავშირება და ავთენტიკაცია / SSL"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "რესურსების გამოყენება / მეხსიერება"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "რესურსების გამოყენება / დისკი"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
 msgstr "რესურსების გამოყენება / ბირთვის რესურსები"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "რესურსების გამოყენება / ფონური ჩამწერი"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:711
 msgid "Resource Usage / I/O"
 msgstr "რესურსების გამოყენება / შეტ/გამოტ"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:712
 msgid "Resource Usage / Worker Processes"
 msgstr "რესურსების გამოყენება / დამხმარე პროცესის რესურსები"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / მორგება"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / საკონტროლო წერტილები"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / არქივირება"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / აღდგენა"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / არქივის აღდგენა"
 
-#: utils/misc/guc_tables.c:709
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / სამიზნის აღდგენა"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "წინასწარ-ჩაწერი ჟურნალი / შეჯამება"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "რეპლიკაცია / სერვერების გაგზავნა"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "რეპლიკაცია / ძირითადი სერვერი"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "რეპლიკაცია / უქმე სერვერები"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "რეპლიკაცია / გამომწერები"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "მოთხოვნის მორგება / დამგეგმავის მეთოდის კონფიგურაცია"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "მოთხოვნის მორგება / დამგეგმავის ფასის შეზღუდვები"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "მოთხოვნის მორგება / მოთხოვნის ზოგადი ოპტიმიზატორი"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "მოთხოვნის მორგება / დამგეგმავის სხვა პარამეტრები"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "ანგარიშები და ჟურნალი / სად ჩავწერო ჟურნალი"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "ანგარიშები და ჟურნალი / როდის ჩავწერო ჟურნალი"
 
-#: utils/misc/guc_tables.c:721
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "ანგარიშები და ჟურნალი / რა ჩავწერო ჟურნალში"
 
-#: utils/misc/guc_tables.c:722
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "ანგარიშები და ჟურნალი / პროცესის სათაური"
 
-#: utils/misc/guc_tables.c:723
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "სტატისტიკა / მონიტორინგი"
 
-#: utils/misc/guc_tables.c:724
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "სტატისტიკა / კუმულაციური მოთხოვნისა და ინდექსის სტატისტიკა"
 
-#: utils/misc/guc_tables.c:725
+#: utils/misc/guc_tables.c:734
 msgid "Vacuuming / Automatic Vacuuming"
 msgstr "მომტვერსასრუტება / ავტომატური მომტვერსასრუტება"
 
-#: utils/misc/guc_tables.c:726
+#: utils/misc/guc_tables.c:735
 msgid "Vacuuming / Cost-Based Vacuum Delay"
 msgstr "მომტვერსასრუტება / ფასზე-დამოკიდებული მომტვერსასრუტების დაყოვნება"
 
-#: utils/misc/guc_tables.c:727
+#: utils/misc/guc_tables.c:736
 msgid "Vacuuming / Default Behavior"
 msgstr "მომტვერსასრუტება / ნაგულისხმევი ქცევა"
 
-#: utils/misc/guc_tables.c:728
+#: utils/misc/guc_tables.c:737
 msgid "Vacuuming / Freezing"
 msgstr "მომტვერსასრუტება / გაყინვა"
 
-#: utils/misc/guc_tables.c:729
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "კლიენტის შეერთების ნაგულისხმევი პარამეტრები / ბრძანების ქცევა"
 
-#: utils/misc/guc_tables.c:730
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "კლიენტის შეერთების ნაგულისხმევი პარამეტრები / ენა და ფორმატირება"
 
-#: utils/misc/guc_tables.c:731
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "კლიენტის შეერთების ნაგულისხმევი პარამეტრები / გაზიარებული ბიბლიოთეკის წინასწარი ჩატვირთვა"
 
-#: utils/misc/guc_tables.c:732
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "კლიენტის შეერთების ნაგულისხმევი პარამეტრები / სხვა ნაგულისხმევი პარამეტრები"
 
-#: utils/misc/guc_tables.c:733
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "ბლოკის მართვა"
 
-#: utils/misc/guc_tables.c:734
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "ვერსიისა და პლატფორმის თავსებადობა / PostgreSQL-ის წინა ვერსიები"
 
-#: utils/misc/guc_tables.c:735
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "ვერსიისა და პლატფორმის თავსებადობა / სხვა პლატფორმები და კლიენტები"
 
-#: utils/misc/guc_tables.c:736
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "შეცდომების დამუშავება"
 
-#: utils/misc/guc_tables.c:737
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "პრესეტის მორგება"
 
-#: utils/misc/guc_tables.c:738
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "ხელით მითითებული პარამეტრები"
 
-#: utils/misc/guc_tables.c:739
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "პროგრამისტის პარამეტრები"
 
-#: utils/misc/guc_tables.c:794
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "დამგეგმავისთვის მიმდევრობითი სკანირების გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:804
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "დამგეგმავისთვის ინდექსის სკანირების გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:814
+#: utils/misc/guc_tables.c:823
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "დამგეგმავისთვის მხოლოდ ინდექსის სკანირების გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:824
+#: utils/misc/guc_tables.c:833
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "დამგეგმავისთვის ბიტური რუკების სკანირების გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:834
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "დამგეგმავისთვის TID-ის სკანირების გეგმების გამოყენების უფლები მიცემა."
 
-#: utils/misc/guc_tables.c:844
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "დამგეგმავისთვის აშკარა დალაგების ნაბიჯების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:854
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "დამგეგმავისთვის ინკრემენტული დალაგების ნაბიჯების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:864
+#: utils/misc/guc_tables.c:873
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "დამგეგმავისთვის დაჰეშიილი აგრეგაციის გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:874
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "დამგეგმავისთვის მატერიალიზაციის გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:884
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "დამგეგმავისთვის მემოიზაციის გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:894
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "დამგეგმავისთვის ერთმანეთში ჩალაგებული მარყუჟი შერწყმის გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:904
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "დამგეგმავისთვის შეერთების გეგმების შერწყმის გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:914
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "დამგეგმავისთვის ჰეშის შეერთების გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:924
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "დამგეგმავისთვის შერწყმის გეგმების შეგროვების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:934
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "დანაყოფის გათვალისწინებით შეერთების ჩართვა."
 
-#: utils/misc/guc_tables.c:944
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "დანაყოფის გათვალისწინებით აგრეგაციისა და დაჯგუფებს ჩართვა."
 
-#: utils/misc/guc_tables.c:954
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "დამგეგმავისთვის პარალელური ბოლოში მიწერის გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:964
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "დამგეგმავისთვის პარალელური ჰეშის გეგმების გამოყენების უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:974
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr ""
 
-#: utils/misc/guc_tables.c:975
+#: utils/misc/guc_tables.c:984
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr ""
 
-#: utils/misc/guc_tables.c:986
+#: utils/misc/guc_tables.c:995
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr ""
 
-#: utils/misc/guc_tables.c:989
+#: utils/misc/guc_tables.c:998
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1001
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1011
+#: utils/misc/guc_tables.c:1020
 msgid "Enables removal of unique self-joins."
 msgstr "უნიკალური თვითშერწყმების წაშლის ჩართვა."
 
-#: utils/misc/guc_tables.c:1021
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
 msgstr "გასაღების (GROUP BY) გადალაგების ჩართვა."
 
-#: utils/misc/guc_tables.c:1031
-msgid "Enables reordering of DISTINCT pathkeys."
-msgstr "ჩართავს DISTINCT ბილიკის გასაღებების გადალაგებას."
+#: utils/misc/guc_tables.c:1040
+msgid "Enables reordering of DISTINCT keys."
+msgstr "ჩართავს DISTINCT გასაღებების გადალაგებას."
 
-#: utils/misc/guc_tables.c:1041
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "მოთხოვნების ზოგადი ოპტიმიზაციის ჩართვა."
 
-#: utils/misc/guc_tables.c:1042
+#: utils/misc/guc_tables.c:1051
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1056
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "აჩვენებს, არის მიმდინარე მომხმარებელი ზემომხმარებელი, თუ არა."
 
-#: utils/misc/guc_tables.c:1071
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "ALTER SYSTEM ბრძანების გაშვების დაშვება."
 
-#: utils/misc/guc_tables.c:1072
+#: utils/misc/guc_tables.c:1081
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1082
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "სერვისის Bonjour-ით გამოქვეყნების ჩართვა."
 
-#: utils/misc/guc_tables.c:1091
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "აგროვებს ტრანზაქციის გადაცემის დროს."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "SSL შეერთებების ჩართვა."
 
-#: utils/misc/guc_tables.c:1109
+#: utils/misc/guc_tables.c:1118
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1118
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
-msgstr ""
+msgstr "პრიორიტეტის მინიჭება სერვერის შიფრების მიმდევრობისთვის."
 
-#: utils/misc/guc_tables.c:1127
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "დისკის განახლებების ნაძალადევი სინქრონიზაცია."
 
-#: utils/misc/guc_tables.c:1128
+#: utils/misc/guc_tables.c:1137
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures that a database cluster will recover to a consistent state after an operating system or hardware crash."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1139
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "აგრძელებს დამუშავებას საკონტროლო ჯამის ჩავარდნის შემდეგ."
 
-#: utils/misc/guc_tables.c:1140
+#: utils/misc/guc_tables.c:1149
 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 ""
 
-#: utils/misc/guc_tables.c:1154
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "აგრძელებს დამუშავებას დაზიანებული გვერდის თავსართების შემდეგ."
 
-#: utils/misc/guc_tables.c:1155
+#: utils/misc/guc_tables.c:1164
 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 ""
 
-#: utils/misc/guc_tables.c:1168
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr "აგრძელებს აღდგენას არასწორი გვერდის ჩავარდნების შემდეგ."
 
-#: utils/misc/guc_tables.c:1169
+#: utils/misc/guc_tables.c:1178
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1187
+#: utils/misc/guc_tables.c:1196
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1188
+#: utils/misc/guc_tables.c:1197
 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 ""
 
-#: utils/misc/guc_tables.c:1201
+#: utils/misc/guc_tables.c:1210
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1211
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "ახალ WAL-ის ფაილებში მათ პირველ გამოყენებამდე ნულიანების ჩაწერა."
 
-#: utils/misc/guc_tables.c:1221
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "WAL-ის ფაილების თავიდან გამოყენება მათი სახელის გადარქმევით."
 
-#: utils/misc/guc_tables.c:1231
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "საკონტროლო წერტილების ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:1240
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
 msgstr "ჩაიწერს ავთენტიკაციამდე მიერთების ხელის ჩამორთმევის დეტალებს."
 
-#: utils/misc/guc_tables.c:1250
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "სესიის დასრულების ჟურნალში ჩაწერა, ხანგრძლივობის ჩართვლით."
 
-#: utils/misc/guc_tables.c:1259
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "რეპლიკაციის ყოველი ბრძანების ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:1268
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1279
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "სესიის დასრულება ნებისმიერი შეცდომის შემთხვევაში."
 
-#: utils/misc/guc_tables.c:1288
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "უკანაბოლოს ავარიის შემდეგ სერვერის თავიდან ინიციალიზაცია."
 
-#: utils/misc/guc_tables.c:1297
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "უკანაბოლოს ავარიის შემდეგ დროებითი ფაილების წაშლა."
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "უკანაბოლოს ავარიის შემდეგ შვილი პროცესებისთვის SIGQUIT-ის მაგიერ SIGABRT-ის გაგზავნა."
 
-#: utils/misc/guc_tables.c:1317
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "გაჭედილი შვილი პროცესებისთვის SIGKILL-ის მაგიერ SIGABRT-ის გაგზავნა."
 
-#: utils/misc/guc_tables.c:1328
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "თითოეული დასრულებული SQL გამოსახულების ხანგრძლივობის ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:1338
+#: utils/misc/guc_tables.c:1347
 msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1355
+#: utils/misc/guc_tables.c:1364
 msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1372
+#: utils/misc/guc_tables.c:1381
 msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1390
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "ჟურნალში თითოეული მოთხოვნის დამუშავების ხის ჩაწერა."
 
-#: utils/misc/guc_tables.c:1399
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "ჟურნალში თითოეული მოთხოვნის გადაწერილი დამუშავების ხის ჩაწერა."
 
-#: utils/misc/guc_tables.c:1408
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "ჟურნალში თითოეული მოთხოვნის შესრულების გეგმის ჩაწერა."
 
-#: utils/misc/guc_tables.c:1417
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1426
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "დამმუშავებლის წარმადობის სტატისტიკას სერვერის ჟურნალში ჩაწერს."
 
-#: utils/misc/guc_tables.c:1435
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "დამგეგმავის წარმადობის სტატისტიკას სერვერის ჟურნალში ჩაწერს."
 
-#: utils/misc/guc_tables.c:1444
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "შემსრულებლის წარმადობის სტატისტიკას სერვერის ჟურნალში ჩაწერს."
 
-#: utils/misc/guc_tables.c:1453
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "საერთო წარმადობის სტატისტიკას სერვერის ჟურნალში ჩაწერს."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1472
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1475
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "აგროვებს ინფორმაციას ბრძანებების შესრულების შესახებ."
 
-#: utils/misc/guc_tables.c:1476
+#: utils/misc/guc_tables.c:1485
 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 ""
 
-#: utils/misc/guc_tables.c:1486
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "აგროვებს სტატისტიკას ბაზის აქტივობების შესახებ."
 
-#: utils/misc/guc_tables.c:1495
+#: utils/misc/guc_tables.c:1504
 msgid "Collects timing statistics for cost-based vacuum delay."
 msgstr "აგროვებს დროის სტატისტიკას ფასზე დამყარებული მომტვერსასრუტების დაყოვნებისთვის."
 
-#: utils/misc/guc_tables.c:1504
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for database I/O activity."
 msgstr "აგროვებს ბაზის შეყვანა/გამოტანის აქტივობების დროით სტატისტიკას."
 
-#: utils/misc/guc_tables.c:1513
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "აგროვებს WAL-ის შეყვანა/გამოტანის აქტივობების დროით სტატისტიკას."
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1532
 msgid "Updates the process title to show the active SQL command."
 msgstr "განახლებს პროცესის სათაურს, რათა მან აქტიური SQL ბრძანება აჩვენოს."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1533
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1533
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "ავტომომტვერსასრუტების ქვეპროცესის გაშვება."
 
-#: utils/misc/guc_tables.c:1543
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "LISTEN-ის და NOTIFY-ის გამართვის შეტყობინებების გენერაცია."
 
-#: utils/misc/guc_tables.c:1555
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "ბლოკის გამოყენების შესახებ ინფორმაციის გამოტანა."
 
-#: utils/misc/guc_tables.c:1565
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "მომხმარებლის ბლოკის გამოყენების შესახებ ინფორმაციის გამოტანა."
 
-#: utils/misc/guc_tables.c:1575
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "მსუბუქი ბლოკის გამოყენების შესახებ ინფორმაციის გამოტანა."
 
-#: utils/misc/guc_tables.c:1585
+#: utils/misc/guc_tables.c:1594
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1597
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "ბლოკირების დიდხნიანია ლოდინის ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1615
 msgid "Logs lock failures."
 msgstr "ჩაწერს ჟურნალში დაბლოკვის ჩავარდნებს."
 
-#: utils/misc/guc_tables.c:1615
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr "მომლოდინის აღდგენის კონფლიქტის ლოდინების ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:1624
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "ჟურნალში ჰოსტის სახელის ჩაწერა."
 
-#: utils/misc/guc_tables.c:1625
+#: utils/misc/guc_tables.c:1634
 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 ""
 
-#: utils/misc/guc_tables.c:1636
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "\"expr=NULL\" მიღებული იქნება, როგორც \"expr IS NULL\"."
 
-#: utils/misc/guc_tables.c:1637
+#: utils/misc/guc_tables.c:1646
 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 ""
 
-#: utils/misc/guc_tables.c:1649
+#: utils/misc/guc_tables.c:1658
 msgid "Sets the default read-only status of new transactions."
 msgstr "ახალი ტრანზაქციების მხოლოდ კითხვადობის სტატუსის ნაგულისხმევად დაყენება."
 
-#: utils/misc/guc_tables.c:1659
+#: utils/misc/guc_tables.c:1668
 msgid "Sets the current transaction's read-only status."
 msgstr "მიმდინარე ტრანზაქციის მხოლოდ-კითხვადობის სტატუსის დაყენება."
 
-#: utils/misc/guc_tables.c:1669
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1678
+#: utils/misc/guc_tables.c:1687
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1688
+#: utils/misc/guc_tables.c:1697
 msgid "Enables row security."
 msgstr "ჩართავს მწკრივების უსაფრთხოებას."
 
-#: utils/misc/guc_tables.c:1689
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr "თუ ჩართავთ, მწკრივის უსაფრთხოება ყველა მომხმარებელზე გადატარდება."
 
-#: utils/misc/guc_tables.c:1697
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "ქვეპროგრამის სხეულების შემოწმება CREATE FUNCTION-ის და CREATE PROCEDURE-ის დროს."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1715
 msgid "Enables input of NULL elements in arrays."
 msgstr "მასივებში NULL ტიპის ელემენტების შეყვანის ჩართვა."
 
-#: utils/misc/guc_tables.c:1707
+#: utils/misc/guc_tables.c:1716
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1723
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS მხარდაჭერილი აღარაა. ის ყოველთვის ნულის ტოლია."
 
-#: utils/misc/guc_tables.c:1733
+#: utils/misc/guc_tables.c:1742
 msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1742
+#: utils/misc/guc_tables.c:1751
 msgid "Truncate existing log files of same name during log rotation."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1752
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "ინფორმაციის გამოტანა დალაგების მიერ რესურსების გამოყენების შესახებ."
 
-#: utils/misc/guc_tables.c:1765
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "სინქრონიზებული სკანირების შესახებ გამართვის ინფორმაციის გამოტანა."
 
-#: utils/misc/guc_tables.c:1780
+#: utils/misc/guc_tables.c:1789
 msgid "Enables bounded sorting using heap sort."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1793
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "'WAL'-თან დაკავშირებული გამართვის ინფორმაციის გამოტანა."
 
-#: utils/misc/guc_tables.c:1805
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "აჩვენებს, არის თუ არა თარიღი და დრო მთელი რიცხვი."
 
-#: utils/misc/guc_tables.c:1816
+#: utils/misc/guc_tables.c:1825
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "იქნება Kerberos-ის და GSSAPI-ის მომხმარებლის სახელები რეგისტრზე-დამოკიდებული, თუ არა."
 
-#: utils/misc/guc_tables.c:1826
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "მივიღებთ კლიენტიდან GSSAPI-ის დელეგაციას, თუ არა."
 
-#: utils/misc/guc_tables.c:1836
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1846
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1857
+#: utils/misc/guc_tables.c:1866
 msgid "Enables synchronized sequential scans."
 msgstr "ჩართავს სინქრონული მიმდევრობითი სკანირებებს."
 
-#: utils/misc/guc_tables.c:1867
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "აყენებს იქნება ჩასმული ტრანზაქცია აღდგენის სამიზნესთან ერთად, თუ არა."
 
-#: utils/misc/guc_tables.c:1877
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1887
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr "აღდგენისას მიერთებების და მოთხოვნების დაშვება."
 
-#: utils/misc/guc_tables.c:1897
+#: utils/misc/guc_tables.c:1906
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr ""
 
-#: utils/misc/guc_tables.c:1907
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "აჩვენებს, ამჟამად ცხელი მომლოდინე აქტიურია, თუ არა."
 
-#: utils/misc/guc_tables.c:1918
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "სისტემური ცხრილების სტრუქტურის ცვლილების დაშვება."
 
-#: utils/misc/guc_tables.c:1929
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "სისტემური ინდექსებიდან კითხვის გამორთვა."
 
-#: utils/misc/guc_tables.c:1930
+#: utils/misc/guc_tables.c:1939
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "ის ინდექსების განახლებას ხელს არ უშლის, ასე რომ, გამოსაყენებლად უსაფრთხოა.  ყველაზე ცუდი, რაც სჭირს, ნელია."
 
-#: utils/misc/guc_tables.c:1941
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "გამოსაცდელად ცხრილის სივრცეების პირდაპირ ph_tblspc-ში დაშვება."
 
-#: utils/misc/guc_tables.c:1952
+#: utils/misc/guc_tables.c:1961
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "დიდი ობიექტების პრივილეგიების შემოწმების წინა ვერსიებთან თავსებადი რეჟიმის ჩართვა."
 
-#: utils/misc/guc_tables.c:1953
+#: utils/misc/guc_tables.c:1962
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "PostgreSQL-ის 9.0 და უფრო ძველ ვერსიებთან თავსებადობისთვის პრივილეგიების შემოწმების გამოტოვება, დიდი ობიექტების კითხვისა და შეცვლისას."
 
-#: utils/misc/guc_tables.c:1963
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "SQL ფრაგმენტების გენერაციისას ყველა იდენტიფიკატორის ბრჭყალებში ჩასმა."
 
-#: utils/misc/guc_tables.c:1973
+#: utils/misc/guc_tables.c:1982
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "აჩვენებს, ამ კლასტერზე მონაცემების საკონტროლო ჯამები ჩართულია, თუ არა."
 
-#: utils/misc/guc_tables.c:1984
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "დუბლირებული შეტყობინებების შეკვეცის თავიდან ასაცილებლად ჟურნალში გაგზავნილი შეტყობინებებისთვის მიმდევრობის ნომრის დამატება."
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "Syslog-ისთვის გაგზავნილი შეტყობინებების დაჭრა და 1024 ბაიტში ჩატევა."
 
-#: utils/misc/guc_tables.c:2004
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2005
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr ""
 
-#: utils/misc/guc_tables.c:2015
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "JIT კომპილაციის ჩართვა."
 
-#: utils/misc/guc_tables.c:2026
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "JIT-ით კომპილირებული ფუნქციების გამმართველთან რეგისტრაცია."
 
-#: utils/misc/guc_tables.c:2043
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2054
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "გამოსახულებების JIT კომპილაციის დაშვება."
 
-#: utils/misc/guc_tables.c:2065
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2082
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "კორტეჟის დეფორმაციის JIT კომპილაციის დაშვება."
 
-#: utils/misc/guc_tables.c:2093
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "გაგრძელდება მუშაობა მონაცემის ფაილების სინქრონიზაციის ჩავარდნის შემდეგ, თუ არა."
 
-#: utils/misc/guc_tables.c:2102
+#: utils/misc/guc_tables.c:2111
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2111
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
 msgstr "ჩართავს მოვლენის ტრიგერებს."
 
-#: utils/misc/guc_tables.c:2112
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2121
+#: utils/misc/guc_tables.c:2130
 msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
 msgstr "საშუალებას აძლევს ფიზიკურ უქმეს სინქრონიზაციას ლოგიკური წარუმატებლობის რეპლიკაციის სლოტები პირველადი სერვერიდან."
 
-#: utils/misc/guc_tables.c:2130
+#: utils/misc/guc_tables.c:2139
 msgid "Enables deprecation warnings for MD5 passwords."
 msgstr "მოძველებულობის გაფრთხილებების ჩართვა MD5 პაროლებისთვის."
 
-#: utils/misc/guc_tables.c:2139
+#: utils/misc/guc_tables.c:2148
 msgid "Enables vacuum to truncate empty pages at the end of the table."
 msgstr "უფლებას აძლევს მომტვერსასრუტებას, მოკვეთოს ცარიელი გვერდები ცხრილის ბოლოში."
 
-#: utils/misc/guc_tables.c:2157
+#: utils/misc/guc_tables.c:2166
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2159 utils/misc/guc_tables.c:2313 utils/misc/guc_tables.c:2732 utils/misc/guc_tables.c:2743 utils/misc/guc_tables.c:2754 utils/misc/guc_tables.c:2765 utils/misc/guc_tables.c:2776
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322 utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752 utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774 utils/misc/guc_tables.c:2785
 msgid "0 disables the timeout."
 msgstr "0 გამორთავს მოლოდინის ვადას."
 
-#: utils/misc/guc_tables.c:2168
+#: utils/misc/guc_tables.c:2177
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2170 utils/misc/guc_tables.c:2908
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "პროცესისთვის გამმართველის მიბმის უფლების მიცემა."
 
-#: utils/misc/guc_tables.c:2179
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "სტატისტიკის ნაგულისხმევი სამიზნის დაყენება."
 
-#: utils/misc/guc_tables.c:2180
+#: utils/misc/guc_tables.c:2189
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2189
+#: utils/misc/guc_tables.c:2198
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2191
+#: utils/misc/guc_tables.c:2200
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2202
+#: utils/misc/guc_tables.c:2211
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2204
+#: utils/misc/guc_tables.c:2213
 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 ""
 
-#: utils/misc/guc_tables.c:2215
+#: utils/misc/guc_tables.c:2224
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2225
+#: utils/misc/guc_tables.c:2234
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2235
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: ინდივიდების რაოდენობა პოპულაციაში."
 
-#: utils/misc/guc_tables.c:2236 utils/misc/guc_tables.c:2246
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
 msgid "0 means use a suitable default value."
 msgstr "0 ნიშნავს შესაბამისი ნაგულისხმევი მნიშვნელობის გამოყენებას."
 
-#: utils/misc/guc_tables.c:2245
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: ალგორითმის იტერაციების რაოდენობა."
 
-#: utils/misc/guc_tables.c:2257
+#: utils/misc/guc_tables.c:2266
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2268
+#: utils/misc/guc_tables.c:2277
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2269 utils/misc/guc_tables.c:2280
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
 msgid "-1 means wait forever."
 msgstr "-1 ნიშნავს უსაზღვროდ ლოდინს."
 
-#: utils/misc/guc_tables.c:2279
+#: utils/misc/guc_tables.c:2288
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2290
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "აღდგენისას ცვლილებების გადატარების მინიმალური დაყოვნების დაყენება."
 
-#: utils/misc/guc_tables.c:2301
+#: utils/misc/guc_tables.c:2310
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2312
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2323
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "აყენებს ერთდროული შეერთებების მაქსიმალურ რაოდენობას."
 
-#: utils/misc/guc_tables.c:2334
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "აყენებს ზემომხმარებლებისთვის რეზერვირებული შეერთების სლოტებს."
 
-#: utils/misc/guc_tables.c:2344
+#: utils/misc/guc_tables.c:2353
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2355
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "გაშვებისას დარეზერვებული დინამიური გაზიარებული მეხსიერების რაოდენობა."
 
-#: utils/misc/guc_tables.c:2370
+#: utils/misc/guc_tables.c:2379
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "სერვერის მიერ გამოყენებული გაზიარებული მეხსიერების ბაფერების რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2381
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "ბუფერი პულის ზომა VACUUM, ANALYZE და ავტომომტვერსასრუტებისთვის."
 
-#: utils/misc/guc_tables.c:2392
+#: utils/misc/guc_tables.c:2401
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2403
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2404
+#: utils/misc/guc_tables.c:2413
 msgid "-1 means huge pages are not supported."
 msgstr "-1 ნიშნავს, რომ უზარმაზარი გვერდები მხარდაჭერილი არაა."
 
-#: utils/misc/guc_tables.c:2414
+#: utils/misc/guc_tables.c:2423
 msgid "Shows the number of semaphores required for the server."
 msgstr "აჩვენებს სერვერის მიერ გამოყენებული სემაფორების რაოდენობას."
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2434
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2426 utils/misc/guc_tables.c:2481 utils/misc/guc_tables.c:2492
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490 utils/misc/guc_tables.c:2501
 msgid "0 means use a fraction of \"shared_buffers\"."
 msgstr "0 ნიშნავს \"shared_buffers\"-ის ნაწილის გამოყენებას."
 
-#: utils/misc/guc_tables.c:2436
+#: utils/misc/guc_tables.c:2445
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2447
+#: utils/misc/guc_tables.c:2456
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2467
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2478
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2480
+#: utils/misc/guc_tables.c:2489
 msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2491
+#: utils/misc/guc_tables.c:2500
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2502
+#: utils/misc/guc_tables.c:2511
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2513
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "TCP პორტის მითითება, რომელზეც სერვერი უსმენს."
 
-#: utils/misc/guc_tables.c:2523
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Unix-დომენის სოკეტზე წვდომის უფლებების დაყენება."
 
-#: utils/misc/guc_tables.c:2524
+#: utils/misc/guc_tables.c:2533
 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 ""
 
-#: utils/misc/guc_tables.c:2538
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "ჟურნალის ფაილების წვდომების დაყენება."
 
-#: utils/misc/guc_tables.c:2539
+#: utils/misc/guc_tables.c:2548
 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 ""
 
-#: utils/misc/guc_tables.c:2553
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "მონაცემების საქაღალდის წვდომის ჩვენება."
 
-#: utils/misc/guc_tables.c:2554
+#: utils/misc/guc_tables.c:2563
 msgid "The parameter value is 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 ""
 
-#: utils/misc/guc_tables.c:2567
+#: utils/misc/guc_tables.c:2576
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "მოთხოვნის სამუშაო სივრცის მიერ გამოყენებული მეხსიერების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2568
+#: utils/misc/guc_tables.c:2577
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2585
+#: utils/misc/guc_tables.c:2594
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "ტექნიკური ოპერაციებისთვის გამოყენებული მეხსიერების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2586
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "მოიცავს ისეთ ოპერაციებს, როგორებიცაა VACUUM და CREATE INDEX."
 
-#: utils/misc/guc_tables.c:2596
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "ლოგიკური გაშიფვრისთვის გამოყენებული მეხსიერების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2597
+#: utils/misc/guc_tables.c:2606
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2613
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "სტეკის მაქსიმალური სიღრმე კილობაიტებში."
 
-#: utils/misc/guc_tables.c:2624
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1 ნიშნავს ლიმიტის გარეშე."
 
-#: utils/misc/guc_tables.c:2635
+#: utils/misc/guc_tables.c:2644
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "ბაფერის ქეშში ნაპოვნი გვერდის მომტვერსასრუტების ფასი."
 
-#: utils/misc/guc_tables.c:2645
+#: utils/misc/guc_tables.c:2654
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "ბაფერის ქეშში გვერდის მომტვერსასრუტების ფასი ნაპოვნი არაა."
 
-#: utils/misc/guc_tables.c:2655
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2665
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2675
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2676
+#: utils/misc/guc_tables.c:2685
 msgid "-1 means use \"vacuum_cost_limit\"."
 msgstr "-1 ნიშნავს \"vacuum_cost_limit\"-ის გამოყენებას."
 
-#: utils/misc/guc_tables.c:2685
+#: utils/misc/guc_tables.c:2694
 msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
 msgstr "თითოეული სერვერის პროცესისთვის ერთდროულად გახსნილი ფაილების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2709
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2710
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "გამოიყენება სისტემურ ცხრილებზე გამოტანის თავიდან ასაცილებლად."
 
-#: utils/misc/guc_tables.c:2719
+#: utils/misc/guc_tables.c:2728
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2731
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "აყენებს ნებისმიერი გამოსახულების დაშვებულ მაქსიმალურ ხანგრძლივობას."
 
-#: utils/misc/guc_tables.c:2742
+#: utils/misc/guc_tables.c:2751
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "აყენებს ბლოკირების ნებისმიერი მოლოდინისთვის დაშვებულ მაქსიმალურ ხანგრძლივობას."
 
-#: utils/misc/guc_tables.c:2753
+#: utils/misc/guc_tables.c:2762
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "აყენებს მაქსიმალურ დაყოვნებას მოთხოვნებს შორის, როცა ის ტრანზაქციაშია."
 
-#: utils/misc/guc_tables.c:2764
+#: utils/misc/guc_tables.c:2773
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
 msgstr "აყენებს მაქსიმალურ დაშვებულ ხანგრძლივობას ნებისმიერი ტრანზაქციისთვის სესიის შიგნით (მომზადებული ტრანზაქცია არაა)."
 
-#: utils/misc/guc_tables.c:2775
+#: utils/misc/guc_tables.c:2784
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "აყენებს მაქსიმალურ დაყოვნებას მოთხოვნებს შორის, როცა ის ტრანზაქციაში არაა."
 
-#: utils/misc/guc_tables.c:2786
+#: utils/misc/guc_tables.c:2795
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2796
+#: utils/misc/guc_tables.c:2805
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2806
+#: utils/misc/guc_tables.c:2815
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2816
+#: utils/misc/guc_tables.c:2825
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2826
+#: utils/misc/guc_tables.c:2835
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2835
+#: utils/misc/guc_tables.c:2844
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2848
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "ტრანზაქციაში ბლოკების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:2849
+#: utils/misc/guc_tables.c:2858
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2860
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2861
+#: utils/misc/guc_tables.c:2870
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2872
+#: utils/misc/guc_tables.c:2881
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2873
+#: utils/misc/guc_tables.c:2882
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2884
+#: utils/misc/guc_tables.c:2893
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:2903
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "კლიენტის ავთენტიკაციის დასრულებისთვის დაშვებული მაქსიმალური დროის დაყენება."
 
-#: utils/misc/guc_tables.c:2906
+#: utils/misc/guc_tables.c:2915
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2918
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "აყენებს გამოყოფილი გვერდების მაქსიმალურ რაოდენობას NOTIFY / LISTEN რიგისთვის."
 
-#: utils/misc/guc_tables.c:2928
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "აღდგენისას WAL-ში წინასწარ-კითხვის ბაფერის ზომა."
 
-#: utils/misc/guc_tables.c:2929
+#: utils/misc/guc_tables.c:2938
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2939
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "მომლოდინე სერვერებისთვის WAL ფაილებისთვის შენახული ზომის დაყენება."
 
-#: utils/misc/guc_tables.c:2950
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "WAL-ის შემცირების მინიმალური ზომის დაყენება."
 
-#: utils/misc/guc_tables.c:2962
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "აყენებს WAL-ის ზომას, რომელიც საკონტროლო წერტილს ატრიგერებს."
 
-#: utils/misc/guc_tables.c:2974
+#: utils/misc/guc_tables.c:2983
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "ავტომატური WAL საკონტროლო წერტილებს შორის მაქსიმალური დროის დაყენება."
 
-#: utils/misc/guc_tables.c:2985
+#: utils/misc/guc_tables.c:2994
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr ""
 
-#: utils/misc/guc_tables.c:2987
+#: utils/misc/guc_tables.c:2996
 msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3000 utils/misc/guc_tables.c:3230 utils/misc/guc_tables.c:3322
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239 utils/misc/guc_tables.c:3331
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3001 utils/misc/guc_tables.c:3231 utils/misc/guc_tables.c:3323
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240 utils/misc/guc_tables.c:3332
 msgid "0 disables forced writeback."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3011
+#: utils/misc/guc_tables.c:3020
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3012
+#: utils/misc/guc_tables.c:3021
 msgid "-1 means use a fraction of \"shared_buffers\"."
 msgstr "-1 ნიშნავს \"shared_buffers\"-ის ნაწილის გამოყენებას."
 
-#: utils/misc/guc_tables.c:3022
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3044
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3055
+#: utils/misc/guc_tables.c:3064
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3066
+#: utils/misc/guc_tables.c:3075
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3076
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3077
+#: utils/misc/guc_tables.c:3086
 msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3089
+#: utils/misc/guc_tables.c:3098
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "WAL რეპლიკაციის მოლოდინის მაქსიმალური ვადის დაყენება."
 
-#: utils/misc/guc_tables.c:3100
+#: utils/misc/guc_tables.c:3109
 msgid "Sets the duration a replication slot can remain idle before it is invalidated."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3112
+#: utils/misc/guc_tables.c:3121
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3124
+#: utils/misc/guc_tables.c:3133
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
 msgstr "დააყენებს \"commit_delay\"-ის შესრულებამდე საჭირო ერთდროული ღია ტრანზაქციების მინიმალურ რაოდენობას."
 
-#: utils/misc/guc_tables.c:3135
+#: utils/misc/guc_tables.c:3144
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3136
+#: utils/misc/guc_tables.c:3145
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3148
+#: utils/misc/guc_tables.c:3157
 msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3151
+#: utils/misc/guc_tables.c:3160
 msgid "-1 disables sampling. 0 means sample all statements."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3161
+#: utils/misc/guc_tables.c:3170
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3163
+#: utils/misc/guc_tables.c:3172
 msgid "-1 disables logging statement durations. 0 means log all statement durations."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3173
+#: utils/misc/guc_tables.c:3182
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3175
+#: utils/misc/guc_tables.c:3184
 msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3185
+#: utils/misc/guc_tables.c:3194
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3187 utils/misc/guc_tables.c:3199
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
 msgid "-1 means log values in full."
 msgstr "-1 მნიშვნელობების ჟურნალში სრულად ჩაწერას."
 
-#: utils/misc/guc_tables.c:3197
+#: utils/misc/guc_tables.c:3206
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3209
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3220
+#: utils/misc/guc_tables.c:3229
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3221
+#: utils/misc/guc_tables.c:3230
 msgid "0 disables background writing."
 msgstr "0 გამორთავს ფონურ ჩაწერას."
 
-#: utils/misc/guc_tables.c:3243
+#: utils/misc/guc_tables.c:3252
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3244 utils/misc/guc_tables.c:3258
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
 msgid "0 disables simultaneous requests."
 msgstr "0 გამორთავს ერთდროულ მოთხოვნებს."
 
-#: utils/misc/guc_tables.c:3257
+#: utils/misc/guc_tables.c:3266
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr "\"effective_io_concurency\"-ის ვარიანტი, რომელიც სარემონტო სამუშაოებისთვის გამოიყენება."
 
-#: utils/misc/guc_tables.c:3272
+#: utils/misc/guc_tables.c:3281
 msgid "Server-wide limit that clamps io_combine_limit."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3286
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3300
+#: utils/misc/guc_tables.c:3309
 msgid "Max number of IOs that one process can execute simultaneously."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3312
+#: utils/misc/guc_tables.c:3321
 msgid "Number of IO worker processes, for io_method=worker."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3335
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "ერთდროულად გაშვებული დამხმარე პროცესების მაქსიმალური რაოდენობა."
 
-#: utils/misc/guc_tables.c:3347
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr "ლოგიკური რეპლიკაციის დამხმარე პროცესების მაქსიმალური რაოდენობა."
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "თითოეული გამოწერის ცხრილის სინქრონიზაციის დამხმარე პროცესების მაქსიმალური რაოდენობა."
 
-#: utils/misc/guc_tables.c:3371
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "თითოეული გამოწერის პარალელური გადატარების დამხმარე პროცესების მაქსიმალური რაოდენობა."
 
-#: utils/misc/guc_tables.c:3383
+#: utils/misc/guc_tables.c:3392
 msgid "Sets the maximum number of active replication origins."
 msgstr "აყენებს აქტიური რეპლიკაციის ძრავების მაქსიმალურ რაოდენობას."
 
-#: utils/misc/guc_tables.c:3393
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3395
+#: utils/misc/guc_tables.c:3404
 msgid "0 disables time-based creation of new log files."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3405
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3407
+#: utils/misc/guc_tables.c:3416
 msgid "0 disables size-based creation of new log files."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3417
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "ფუნქციის არგუმენტების მაქსიმალური რაოდენობის ჩვენება."
 
-#: utils/misc/guc_tables.c:3428
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "ინდექსის გასაღებების მაქსიმალური რაოდენობის ჩვენება."
 
-#: utils/misc/guc_tables.c:3439
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "იდენტიფიკატორის მაქსიმალური სიგრძის ჩვენება."
 
-#: utils/misc/guc_tables.c:3450
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "დისკის ბლოკის ზომის ჩვენება."
 
-#: utils/misc/guc_tables.c:3461
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "ფაილში არსებული გვერდების რაოდენობის ჩვენება."
 
-#: utils/misc/guc_tables.c:3472
+#: utils/misc/guc_tables.c:3481
 msgid "Shows the block size in the write ahead log."
 msgstr "წინასწარ-ჩაწერადი ჟურნალის ბლოკის ზომის ჩვენება."
 
-#: utils/misc/guc_tables.c:3483
+#: utils/misc/guc_tables.c:3492
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3495
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "წინასწარ-ჩაწერადი ჟურნალის სეგმენტების ზომის ჩვენება."
 
-#: utils/misc/guc_tables.c:3508
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3509
+#: utils/misc/guc_tables.c:3518
 msgid "0 disables automatic summary file deletion."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3521
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "ძილის დრო ავტომომტვერსასრუტებების გაშვებებს შორის."
 
-#: utils/misc/guc_tables.c:3531
+#: utils/misc/guc_tables.c:3540
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3540
+#: utils/misc/guc_tables.c:3549
 msgid "Maximum number of tuple updates or deletes prior to vacuum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3541
+#: utils/misc/guc_tables.c:3550
 msgid "-1 disables the maximum threshold."
 msgstr "-1 გამორთავს მაქსიმალურ ზღვარს."
 
-#: utils/misc/guc_tables.c:3549
+#: utils/misc/guc_tables.c:3558
 msgid "Minimum number of tuple inserts prior to vacuum."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3550
+#: utils/misc/guc_tables.c:3559
 msgid "-1 disables insert vacuums."
 msgstr "-1 გამორთავს ვაკუუმების ჩასმას."
 
-#: utils/misc/guc_tables.c:3558
+#: utils/misc/guc_tables.c:3567
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3577
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3580
+#: utils/misc/guc_tables.c:3589
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3599
 msgid "Sets the number of backend slots to allocate for autovacuum workers."
 msgstr "აყენებს უკანაბოლოს სლოტების რაოდენობას გამოსაყოფად ავტომომტვერსასრუტების დამხმარე პროცესებისთვის."
 
-#: utils/misc/guc_tables.c:3599
+#: utils/misc/guc_tables.c:3608
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "ერთდროულად გაშვებული ავტომომტვერსასრუტების დამხმარე პროცესების რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:3609
+#: utils/misc/guc_tables.c:3618
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "თითოეული რემონტის ოპერაციისთვის პარალელური პროცესების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:3619
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "თითოეული შემსრულებელი კვანძისთვის პარალელურად გაშვებული პროცესების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:3630
+#: utils/misc/guc_tables.c:3639
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "ერთდროულად აქტიური პარალელური დამხმარე პროცესების მაქსიმალური რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:3641
+#: utils/misc/guc_tables.c:3650
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "თითოეული ავტომომტვერსასრუტების დამხმარე პროცესის მიერ გამოყენებული მაქსიმალური მეხსიერების რაოდენობის დაყენება."
 
-#: utils/misc/guc_tables.c:3642
+#: utils/misc/guc_tables.c:3651
 msgid "-1 means use \"maintenance_work_mem\"."
 msgstr "-1 ნიშნავს \"maintenance_work_mem\"-ის გამოყენებას."
 
-#: utils/misc/guc_tables.c:3652
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "დაყოვნება TCP keepalive პაკეტებს შორის."
 
-#: utils/misc/guc_tables.c:3653 utils/misc/guc_tables.c:3664 utils/misc/guc_tables.c:3787 utils/misc/guc_tables.c:3798
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673 utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
 msgid "0 means use the system default."
 msgstr "0 ნიშნავს სისტემის ნაგულისხმევის გამოყენებას."
 
-#: utils/misc/guc_tables.c:3663
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "დაყოვნება TCP keepalive პაკეტების გადაგზავნებს შორის."
 
-#: utils/misc/guc_tables.c:3674
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "SSL-ის თავიდან დაყენება უკვე მხარდაუჭერელია. შეგიძლიათ დააყენოთ მხოლოდ 0."
 
-#: utils/misc/guc_tables.c:3685
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "TCP Keepalive-ების გადაგზავნის მაქსიმალური რაოდენობა."
 
-#: utils/misc/guc_tables.c:3686
+#: utils/misc/guc_tables.c:3695
 msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3697
+#: utils/misc/guc_tables.c:3706
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3698
+#: utils/misc/guc_tables.c:3707
 msgid "0 means no limit."
 msgstr "0 ნიშნავს უსაზღვროს."
 
-#: utils/misc/guc_tables.c:3707
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3708
+#: utils/misc/guc_tables.c:3717
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3719
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "ცხრილის მონაცემების მინიმალური რაოდენობა პარალელური სკანირებისთვის."
 
-#: utils/misc/guc_tables.c:3720
+#: utils/misc/guc_tables.c:3729
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3730
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3731
+#: utils/misc/guc_tables.c:3740
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3742
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "სერვერის ვერსიას, როგორც მთელ რიცხვს, ისე აჩვენებს."
 
-#: utils/misc/guc_tables.c:3753
+#: utils/misc/guc_tables.c:3762
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "მითითებული რაოდენობა კილობაიტზე უფრო დიდი დროებითი ფაილების გამოყენების ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:3754
+#: utils/misc/guc_tables.c:3763
 msgid "-1 disables logging temporary files. 0 means log all temporary files."
 msgstr "-1 გათიშავს დროებით ფაილების ჟურნალში ჩაწერას. 0 ნიშნავს ყველა დროებითი ფაილის ჟურნალში ჩაწერას."
 
-#: utils/misc/guc_tables.c:3764
+#: utils/misc/guc_tables.c:3773
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "'pg_stat_activity.query'-სთვის დაცული მეხსიერების ზომის დაყნება, ბაიტებში."
 
-#: utils/misc/guc_tables.c:3775
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3786
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "TCP მომხმარებლის ლოდინის ვადა."
 
-#: utils/misc/guc_tables.c:3797
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "მოსათხოვი უზარმაზარი გვერდების (hugepages) ზომა."
 
-#: utils/misc/guc_tables.c:3808
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3809
+#: utils/misc/guc_tables.c:3818
 msgid "0 means use normal caching behavior."
-msgstr ""
+msgstr "0 ნიშნავს ნორმალური კეშინგის ქცევის გამოყენებას."
 
-#: utils/misc/guc_tables.c:3831
+#: utils/misc/guc_tables.c:3840
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3832
+#: utils/misc/guc_tables.c:3841
 msgid "0 disables connection checks."
 msgstr "0 კავშირის შემოწმებას გამორთავს."
 
-#: utils/misc/guc_tables.c:3842
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3844
+#: utils/misc/guc_tables.c:3853
 msgid "0 disables progress updates."
-msgstr ""
+msgstr "0 გათიშავს მიმდევრობის განახლებებს."
 
-#: utils/misc/guc_tables.c:3854
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "აყენებს იტერაციების რიცხვს SCRAM-ის პაროლის გენერაციისთვის."
 
-#: utils/misc/guc_tables.c:3874
+#: utils/misc/guc_tables.c:3883
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3885
+#: utils/misc/guc_tables.c:3894
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3896
+#: utils/misc/guc_tables.c:3905
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3907
+#: utils/misc/guc_tables.c:3916
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:3927
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:3938
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3940
+#: utils/misc/guc_tables.c:3949
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3952
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "თუ მოთხოვნა უფრო ძვირია, JIT კომპილაციის შესრულება."
 
-#: utils/misc/guc_tables.c:3953
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 JIT კომპილაციას გამორთავს."
 
-#: utils/misc/guc_tables.c:3963
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3964
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1 ოპტიმიზაციას გამორთავს."
 
-#: utils/misc/guc_tables.c:3974
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3975
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 გამორთავს კოდის ჩადგმას."
 
-#: utils/misc/guc_tables.c:3985
+#: utils/misc/guc_tables.c:3994
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr ""
 
-#: utils/misc/guc_tables.c:3997
+#: utils/misc/guc_tables.c:4006
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4009
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: შერჩევითი ზეწოლა პოპულაციაში."
 
-#: utils/misc/guc_tables.c:4020
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4031
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4042
+#: utils/misc/guc_tables.c:4051
 msgid "Multiple of the average buffer usage to free per round."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4052
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "აყენებს თესლს შემთხვევითი რიცხვების გენერაციისთვის."
 
-#: utils/misc/guc_tables.c:4063
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "დამტვერსასრუტების დაყოვნება მილიწამებში."
 
-#: utils/misc/guc_tables.c:4074
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "დამტვერსასრუტების დაყოვნება მილიწამებში, ავტოდამტვერსასრუტებისთვის."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4084
 msgid "-1 means use \"vacuum_cost_delay\"."
 msgstr "-1 ნიშნავს \"vacuum_cost_delay\"-ის გამოყენებას."
 
-#: utils/misc/guc_tables.c:4085
+#: utils/misc/guc_tables.c:4094
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4095
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4105
+#: utils/misc/guc_tables.c:4114
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4115
+#: utils/misc/guc_tables.c:4124
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4125
+#: utils/misc/guc_tables.c:4134
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4126
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "გამოიყენეთ მნიშვნელობები 0.0-დან (არასოდეს ჩაწერო ჟურნალში) და 1.0-ს (ჟურნალში ყოველთვის ჩაწერა) შუა."
 
-#: utils/misc/guc_tables.c:4135
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "ადგენს ტრანზაქციის ნაწილს, რომლის შემდეგაც ყველა ოპერატორი ჟურნალში ჩაიწერება."
 
-#: utils/misc/guc_tables.c:4136
+#: utils/misc/guc_tables.c:4145
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4146
+#: utils/misc/guc_tables.c:4155
 msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4147
+#: utils/misc/guc_tables.c:4156
 msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4165
+#: utils/misc/guc_tables.c:4174
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4166
+#: utils/misc/guc_tables.c:4175
 msgid "An empty string means use \"archive_library\"."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4175
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4176
+#: utils/misc/guc_tables.c:4185
 msgid "An empty string means use \"archive_command\"."
 msgstr "ცარიელი სტრიქონი ნიშნავს \"archive_command\"-ის გამოყენებას."
 
-#: utils/misc/guc_tables.c:4185
+#: utils/misc/guc_tables.c:4194
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "არქივირებული WAL ფაილის მისაღებად გამოსაძახებელი გარსის ბრძანების დაყენება."
 
-#: utils/misc/guc_tables.c:4195
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "ყოველ გადატვირთვის წერტილზე გასაშვები გარსის ბრძანების დაყენება."
 
-#: utils/misc/guc_tables.c:4205
+#: utils/misc/guc_tables.c:4214
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4215
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "აღდგენისთვის დროის მითითება."
 
-#: utils/misc/guc_tables.c:4225
+#: utils/misc/guc_tables.c:4234
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4234
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "ტრანზაქციის ID, რომლამდეც აღდგენა მოხდება."
 
-#: utils/misc/guc_tables.c:4243
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4252
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4261
+#: utils/misc/guc_tables.c:4270
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4282
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4292
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "კლიენტის სიმბოლოების კოდირების დაყენება."
 
-#: utils/misc/guc_tables.c:4303
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "ჟურნალის თითოეული ჩანაწერის პრეფიქსის კონტროლი."
 
-#: utils/misc/guc_tables.c:4304
+#: utils/misc/guc_tables.c:4313
 msgid "An empty string means no prefix."
-msgstr ""
+msgstr "ცარიელი სტრიქონი ნიშნავს პრეფიქსის არქონას."
 
-#: utils/misc/guc_tables.c:4313
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "ჟურნალის შეტყობინებების დასამახსოვრებლად გამოყენებული დროის სარტყლის დაყენება."
 
-#: utils/misc/guc_tables.c:4323
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "თარიღისა და დროის მნიშვნელობების ფორმატის დაყენება."
 
-#: utils/misc/guc_tables.c:4324
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4335
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "ახალი ცხრილების ნაგულისხმევი წვდომის უფლებების მითითება."
 
-#: utils/misc/guc_tables.c:4346
+#: utils/misc/guc_tables.c:4355
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4347 utils/misc/guc_tables.c:4358
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
 msgid "An empty string means use the database's default tablespace."
 msgstr "ცარიელი სტრიქონი ბაზის ნაგულისხმევ ცხრილების სივრცეს ნიშნავს."
 
-#: utils/misc/guc_tables.c:4357
+#: utils/misc/guc_tables.c:4366
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4368
+#: utils/misc/guc_tables.c:4377
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4370
+#: utils/misc/guc_tables.c:4379
 msgid "An empty string disables automatic self grants."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4380
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "დინამიურად ჩატვირთული მოდულების ბილიკის დაყენება."
 
-#: utils/misc/guc_tables.c:4381
+#: utils/misc/guc_tables.c:4390
 msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
 msgstr "თუ საჭიროა დინამიურად ჩატვირთვადი მოდულის გახსნა და მითითებულ სახელს არ გააჩნია საქაღალდის კომპონენტი (ანუ სახელი არ შეიცავს დახრილ ხაზს), სისტემა მითითებულ ფაილს ამ ბილიკებში მოძებნის."
 
-#: utils/misc/guc_tables.c:4394
+#: utils/misc/guc_tables.c:4403
 msgid "Sets the path for extension control files."
 msgstr "დააყენეთ ბილიკი გაფართოების კონტროლის ფაილებისთვის."
 
-#: utils/misc/guc_tables.c:4395
+#: utils/misc/guc_tables.c:4404
 msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Kerberos-ის სერვერის გასაღების ფაილის მდებარეობის მითითება."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Bonjour-ის სერვისის სახელის დაყენება."
 
-#: utils/misc/guc_tables.c:4418
+#: utils/misc/guc_tables.c:4427
 msgid "An empty string means use the computer name."
-msgstr ""
+msgstr "ცარიელი სტრიქონი ნიშნავს კომპიუტერის სახელის გამოყენებას."
 
-#: utils/misc/guc_tables.c:4427
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "შეტყობინებების საჩვენებელი ენის მითითება."
 
-#: utils/misc/guc_tables.c:4428 utils/misc/guc_tables.c:4438 utils/misc/guc_tables.c:4448 utils/misc/guc_tables.c:4458
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447 utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
 msgid "An empty string means use the operating system setting."
-msgstr ""
+msgstr "ცარიელი სტრიქონი ნიშნავს ოპერაციული სისტემის პარამეტრის გამოყენებას."
 
-#: utils/misc/guc_tables.c:4437
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "თანხის რიცხვების ფორმატირების სტანდარტის დაყენება."
 
-#: utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "რიცხვების ფორმატირების ენის დაყენება."
 
-#: utils/misc/guc_tables.c:4457
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "თარიღისა და დროის ფორმატირების ენის დაყენება."
 
-#: utils/misc/guc_tables.c:4467
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr "თითოეული უკანაბოლოსთვის გაშვებამდე ჩასატვირთი გაზიარებული ბიბლიოთეკების სია."
 
-#: utils/misc/guc_tables.c:4478
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "სერვერის გაშვებამდე ჩასატვირთი გაზიარებული ბიბლიოთეკების სია."
 
-#: utils/misc/guc_tables.c:4489
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "თითოეული უკანაბოლოსთვის გაშვებამდე ჩასატვირთი არაპრივილეგირებული გაზიარებული ბიბლიოთეკების სია."
 
-#: utils/misc/guc_tables.c:4500
+#: utils/misc/guc_tables.c:4509
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4512
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "სერვერის (ბაზის) სიმბოლოების კოდირების ჩვენება."
 
-#: utils/misc/guc_tables.c:4524
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "სერვერის ვერსიის ჩვენება."
 
-#: utils/misc/guc_tables.c:4536
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "მიმდინარე როლის დაყენება."
 
-#: utils/misc/guc_tables.c:4548
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "სესიის მომხმარებლი სახელის დაყენება."
 
-#: utils/misc/guc_tables.c:4559
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "სერვერის ჟურნალის გამოტანის სამიზნის დაყენება."
 
-#: utils/misc/guc_tables.c:4560
+#: utils/misc/guc_tables.c:4569
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4571
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "ჟურნალის ფაილების საქაღალდის დაყენება."
 
-#: utils/misc/guc_tables.c:4572
+#: utils/misc/guc_tables.c:4581
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4582
+#: utils/misc/guc_tables.c:4591
 msgid "Sets the file name pattern for log files."
 msgstr "ჟურნალის ფაილების სახელის შაბლონის დაყენება."
 
-#: utils/misc/guc_tables.c:4593
+#: utils/misc/guc_tables.c:4602
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Syslog-ში PostgreSQL-ის შეტყობინებების იდენტიფიკატორი პროგრამის სახელის დაყენება."
 
-#: utils/misc/guc_tables.c:4604
+#: utils/misc/guc_tables.c:4613
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "მოვლენების ჟურნალში PostgreSQL-ის შეტყობინებების იდენტიფიკატორი აპლიკაციის სახელის დაყენება."
 
-#: utils/misc/guc_tables.c:4615
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "დროის სარტყლების აბრევიატურების ფაილის მითითება."
 
-#: utils/misc/guc_tables.c:4635
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Unix-დომენის სოკეტის მფლობლის ჯგუფის დაყენება."
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4645
 msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
 msgstr "სოკეტის მფლობელი მომხმარებელი ყოველთვის იგივე მომხმარებელია, ვინც სერვერი გაუშვა. ცარიელი სტრიქონი მომხმარებლის ნაგულისხმევ ჯგუფს ნიშნავს."
 
-#: utils/misc/guc_tables.c:4646
+#: utils/misc/guc_tables.c:4655
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "აყენებს საქაღალდეებს, სადაც Unix-ის სოკეტები შეიქმნება."
 
-#: utils/misc/guc_tables.c:4657
+#: utils/misc/guc_tables.c:4666
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "მოსასმენი IP მისამართი ან ჰოსტის სახელი."
 
-#: utils/misc/guc_tables.c:4672
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "სერვერის მონაცმების საქაღალდის დაყენება."
 
-#: utils/misc/guc_tables.c:4683
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "სერვერის კონფიგურაციის მთავარი ფაილის დაყენება."
 
-#: utils/misc/guc_tables.c:4694
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "სერვერის hba კონფიგურაციის ფაილის დაყენება."
 
-#: utils/misc/guc_tables.c:4705
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "სერვერის ident კონფიგურაციის ფაილის დაყენება."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Postmaster-ის PID-ის მითითებულ ფაილში ჩაწერა."
 
-#: utils/misc/guc_tables.c:4727
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "SSL ბიბლიოთეკის სახელის ჩვენება."
 
-#: utils/misc/guc_tables.c:4742
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "SSL სერვერის სერტიფიკატის ფაილის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4752
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "SSL სერვერის პირადი გასაღების ფაილის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4762
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "SSL სერვერის CA ფაილის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4772
+#: utils/misc/guc_tables.c:4781
 msgid "Location of the SSL certificate revocation list file."
 msgstr "SSL სერვერის გაუქმებული სერტიფიკატების სიის ფაილის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4782
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "SSL სერვერის გაუქმებული სერტიფიკატების სიის საქაღალდის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4792
+#: utils/misc/guc_tables.c:4801
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4803
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "ტექსტის ძებნის ნაგულისხმევი კონფიგურაციის დაყენება."
 
-#: utils/misc/guc_tables.c:4813
+#: utils/misc/guc_tables.c:4822
 msgid "Sets the list of allowed TLSv1.3 cipher suites."
 msgstr "აყენებს TLSv1.3-ის დაშვებულ შიფრების ნაკრებებს."
 
-#: utils/misc/guc_tables.c:4814
+#: utils/misc/guc_tables.c:4823
 msgid "An empty string means use the default cipher suites."
 msgstr "ცარიელი სტრიქონი ნაგულისხმევი შიფრების ნაკრების გამოყენებას ნიშნავს."
 
-#: utils/misc/guc_tables.c:4824
+#: utils/misc/guc_tables.c:4833
 msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
 msgstr "აყენებს TLSv1.2-ის (და უფრო ძველი) დაშვებულ შიფრების ნაკრებებს."
 
-#: utils/misc/guc_tables.c:4839
+#: utils/misc/guc_tables.c:4848
 msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4840
-msgid "Multiple groups can be specified using colon-separated list."
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4854
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "SSH DH პარამეტრების ფაილის მდებარეობა."
 
-#: utils/misc/guc_tables.c:4855
+#: utils/misc/guc_tables.c:4864
 msgid "An empty string means use compiled-in default parameters."
 msgstr "ცარიელი სტრიქონი კომპილაციის დროს მითითებული ნაგულისხმევი პარამეტრების გამოყენებას ნიშნავს."
 
-#: utils/misc/guc_tables.c:4865
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "SSL-ის საკვანძო ფრაზების მისაღები ბრძანება."
 
-#: utils/misc/guc_tables.c:4866
+#: utils/misc/guc_tables.c:4875
 msgid "An empty string means use the built-in prompting mechanism."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4876
+#: utils/misc/guc_tables.c:4885
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4887
+#: utils/misc/guc_tables.c:4896
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4898
+#: utils/misc/guc_tables.c:4907
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4899
+#: utils/misc/guc_tables.c:4908
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4909
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "JIT სერვისის მომწოდებელი."
 
-#: utils/misc/guc_tables.c:4920
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "მითითებულ ფუნქციებში შეცდომის შემთხვევაში სტეკის ჟურნალში ჩაწერა."
 
-#: utils/misc/guc_tables.c:4931
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "ფაილებთან წვდომისთვის პირდაპირი შეტანა/გამოტანის გამოყენება."
 
-#: utils/misc/guc_tables.c:4932
+#: utils/misc/guc_tables.c:4941
 msgid "An empty string disables direct I/O."
 msgstr "ცარიელი სტრიქონი გამორთავს პირდაპირ I/O-ს."
 
-#: utils/misc/guc_tables.c:4942
+#: utils/misc/guc_tables.c:4951
 msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4944
+#: utils/misc/guc_tables.c:4953
 msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:4965
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4967
+#: utils/misc/guc_tables.c:4976
 msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4978
+#: utils/misc/guc_tables.c:4987
 msgid "Logs specified aspects of connection establishment and setup."
 msgstr ""
 
-#: utils/misc/guc_tables.c:4999
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "შეიძლება თუ არა ტექსტურ სტრიქონებში \"\\\" სიმბოლოს გამოყენება."
 
-#: utils/misc/guc_tables.c:5009
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "\"bytea\"-ის გამოსატანი ფორმატის დაყენება."
 
-#: utils/misc/guc_tables.c:5019
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "კლიენტთან გაგზავნილი შეტყობინების დონეების დაყენება."
 
-#: utils/misc/guc_tables.c:5020 utils/misc/guc_tables.c:5116 utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125 utils/misc/guc_tables.c:5136
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5030
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "მოთხოვნის იდენტიფიკატორის ბირთვის-შიდა გამოთვლის ჩართვა."
 
-#: utils/misc/guc_tables.c:5040
+#: utils/misc/guc_tables.c:5049
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "მგეგმავისთვის შეზღუდვების ჩართვა, მოთხოვნების ოპტიმიზაციისთვის."
 
-#: utils/misc/guc_tables.c:5041
+#: utils/misc/guc_tables.c:5050
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5052
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "შეკუმშვადი მნიშვნელობების ნაგულისხმევი შეკუმშვის მეთოდის დაყენება."
 
-#: utils/misc/guc_tables.c:5063
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "ახალი ტრანზაქციების იზოლაციის დონის დაყენება."
 
-#: utils/misc/guc_tables.c:5073
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "მიმდინარე ტრანზაქციის იზოლაციის დონის დაყენება."
 
-#: utils/misc/guc_tables.c:5084
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "ინტერვალის მნიშვნელობების საჩვენებელი ფორმატის დაყენება."
 
-#: utils/misc/guc_tables.c:5095
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "ჟურნალის დონე არასწორი ICU ლოკალის სტრიქონების ანგარიშისთვის."
 
-#: utils/misc/guc_tables.c:5105
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "ჟურნალში ჩაწერილი შეტყობინებების დეტალურობის დაყენება."
 
-#: utils/misc/guc_tables.c:5115
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "ჟურნალში ჩასაწერი შეტყობინების დონეების დაყენება."
 
-#: utils/misc/guc_tables.c:5126
+#: utils/misc/guc_tables.c:5135
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "შეცდომის მითითებული ან უფრო ზედა კოდების ჟურნალში ჩაწერის მითითება."
 
-#: utils/misc/guc_tables.c:5137
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "ჟურნალში ჩასაწერი ოპერატორის ტიპების დაყენება."
 
-#: utils/misc/guc_tables.c:5147
+#: utils/misc/guc_tables.c:5156
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "თუ სისტემურ ჟურნალში ჩაწერა ჩართულია, მიუთითებს syslog-ის \"facility\"-ის."
 
-#: utils/misc/guc_tables.c:5158
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "სესიის ქცევის დაყენება ტრიგერებისა და გადაწერის წესებისთვის."
 
-#: utils/misc/guc_tables.c:5168
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "მიმდინარე ტრანზაქციის სინქრონიზაციის დონის დაყენება."
 
-#: utils/misc/guc_tables.c:5178
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "'WAL' ფაილების დაარქივების დაშვება 'archive_command'-ის გამოყენებით."
 
-#: utils/misc/guc_tables.c:5188
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5198
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "აგროვებს ფუნქციის დონის სტატისტიკას ბაზის აქტივობების შესახებ."
 
-#: utils/misc/guc_tables.c:5209
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "სტატისტიკის მონაცემებთან წვდომის მიმდევრობის დაყენება."
 
-#: utils/misc/guc_tables.c:5219
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "'WAL' ფაილში მითითებული მეთოდით ჩაწერილი სრული გვერდის ჩაწერების შეკუმშვა."
 
-#: utils/misc/guc_tables.c:5229
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "WAL-ში ჩაწერილი ინფორმაციის დონის დაყენება."
 
-#: utils/misc/guc_tables.c:5239
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "გამოყენებული გაზიარებული მეხსიერების განხორციელების არჩევა."
 
-#: utils/misc/guc_tables.c:5249
+#: utils/misc/guc_tables.c:5258
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5259
+#: utils/misc/guc_tables.c:5268
 msgid "Selects the file copy method."
-msgstr ""
+msgstr "ირჩევს ფაილის კოპირების მეთოდს."
 
-#: utils/misc/guc_tables.c:5269
+#: utils/misc/guc_tables.c:5278
+msgid "Selects the method used for extending data files."
+msgstr "ირჩევს მეთოდს, რომელიც მონაცემთა ფაილების გაფართოებისთვის გამოიყენება."
+
+#: utils/misc/guc_tables.c:5288
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "WAL-ისთვის დისკზე განახლებების ნაძალადევად ჩაწერის მეთოდის დაყენება."
 
-#: utils/misc/guc_tables.c:5279
+#: utils/misc/guc_tables.c:5298
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "XML-ში ბინარული მნიშვნელობების კოდირების ტიპის დაყენება."
 
-#: utils/misc/guc_tables.c:5289
+#: utils/misc/guc_tables.c:5308
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5300
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Linux-ზე და Windows-ზე უზარმაზარი გვერდების გამოყენება."
 
-#: utils/misc/guc_tables.c:5310
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
 msgstr "აჩვენებს უზარმაზარი გვერდების სტატუსს."
 
-#: utils/misc/guc_tables.c:5321
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "აღდგენისას მიბმული ბლოკების წინასწარ გამოთხოვა."
 
-#: utils/misc/guc_tables.c:5322
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5331
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "დამგეგმავის მიერ პარალელური მოთხოვნის კვანძების ნაძალადევი გამოყენების ჩართვა."
 
-#: utils/misc/guc_tables.c:5332
+#: utils/misc/guc_tables.c:5351
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5344
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "აირჩიეთ პაროლების დასაშიფრად გამოყენებული ალგორითმი."
 
-#: utils/misc/guc_tables.c:5354
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5355
+#: utils/misc/guc_tables.c:5374
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5367
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "SSL/TLS-ის პროტოკოლის მინიმალური ვერსიის დაყენება."
 
-#: utils/misc/guc_tables.c:5379
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "SSL/TLS-ის პროტოკოლის მაქსიმალური ვერსიის დაყენება."
 
-#: utils/misc/guc_tables.c:5391
+#: utils/misc/guc_tables.c:5410
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5400
+#: utils/misc/guc_tables.c:5419
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5401
+#: utils/misc/guc_tables.c:5420
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr ""
 
-#: utils/misc/guc_tables.c:5413
+#: utils/misc/guc_tables.c:5432
 msgid "Selects the method for executing asynchronous I/O."
 msgstr "აირჩიეთ მეთოდი ასინქრონული შეყვანა/გამოყვანის შესასრულებლად."
 
@@ -31460,12 +31511,12 @@ msgstr "შეცდომა მეხსიერების კონტე
 msgid "could not attach to dynamic shared area"
 msgstr "დინამიური გაზიარებული მეხსიერების მიმაგრების შეცდომა"
 
-#: utils/mmgr/mcxt.c:1231
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "%zu ზომის მეხსიერების კონტექსტიდან \"%s\" გამოთხოვა ჩავარდა."
 
-#: utils/mmgr/mcxt.c:1391
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "პროცესის, PID-ით %d მეხსიერების კონტექსტები ჟურნალში ჩაიწერება"
@@ -31480,27 +31531,27 @@ msgstr "კურსორი \"%s\" უკვე არსებობს"
 msgid "closing existing cursor \"%s\""
 msgstr "არსებული კურსორის დახურვა \"%s\""
 
-#: utils/mmgr/portalmem.c:403
+#: utils/mmgr/portalmem.c:401
 #, c-format
 msgid "portal \"%s\" cannot be run"
 msgstr "პორტალის \"%s\" გაშვება შეუძლებელია"
 
-#: utils/mmgr/portalmem.c:481
+#: utils/mmgr/portalmem.c:479
 #, c-format
 msgid "cannot drop pinned portal \"%s\""
 msgstr "მიჭიკარტებული პორტალის წაშლა შეუძლებელია:\"%s\""
 
-#: utils/mmgr/portalmem.c:489
+#: utils/mmgr/portalmem.c:487
 #, c-format
 msgid "cannot drop active portal \"%s\""
 msgstr "აქტიური პორტალის წაშლა სეუძლებელია: %s"
 
-#: utils/mmgr/portalmem.c:740
+#: utils/mmgr/portalmem.c:738
 #, c-format
 msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
 msgstr ""
 
-#: utils/mmgr/portalmem.c:1234
+#: utils/mmgr/portalmem.c:1232
 #, c-format
 msgid "cannot perform transaction commands inside a cursor loop that is not read-only"
 msgstr ""
@@ -31510,12 +31561,12 @@ msgstr ""
 msgid "could not seek to block %<PRId64> of temporary file"
 msgstr "დროებითი ფაილის %<PRId64>-ე ბლოკზე გადახვევა შეუძლებელია"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr ""
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr ""
@@ -31525,17 +31576,17 @@ msgstr ""
 msgid "cannot have more than %d runs for an external sort"
 msgstr ""
 
-#: utils/sort/tuplesortvariants.c:1671
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "უნიკალური ინდექსის შექმნა შეუძლებელია: \"%s\""
 
-#: utils/sort/tuplesortvariants.c:1673
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "გასაღები %s დუბლირებულია."
 
-#: utils/sort/tuplesortvariants.c:1674
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "არსებობს დუბლიკატი გასაღებები."
@@ -31545,52 +31596,52 @@ msgstr "არსებობს დუბლიკატი გასაღე
 msgid "could not seek in tuplestore temporary file"
 msgstr "კორტეჟების საცავი დროებითი ფაილის გადახვევა შეუძლებელია"
 
-#: utils/time/snapmgr.c:557
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "საწყისი ტრანზაქცია გაშვებული აღარაა."
 
-#: utils/time/snapmgr.c:1143
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "ქვეტრანზაქციიდან სწრაფი ასლის გამოტანა შეუძლებელია"
 
-#: utils/time/snapmgr.c:1303 utils/time/snapmgr.c:1308 utils/time/snapmgr.c:1313 utils/time/snapmgr.c:1328 utils/time/snapmgr.c:1333 utils/time/snapmgr.c:1338 utils/time/snapmgr.c:1353 utils/time/snapmgr.c:1358 utils/time/snapmgr.c:1363 utils/time/snapmgr.c:1477 utils/time/snapmgr.c:1493 utils/time/snapmgr.c:1518
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319 utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339 utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349 utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369 utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488 utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "სწრაფი ასლის არასწორი მონაცემები ფაილში \"%s\""
 
-#: utils/time/snapmgr.c:1400
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT ყველა მოთხოვნაზე ადრე უნდა გამოიძახოთ"
 
-#: utils/time/snapmgr.c:1409
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr ""
 
-#: utils/time/snapmgr.c:1418
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "სწრაფი ასლის არასწორი იდენტიფიკატორი: \"%s\""
 
-#: utils/time/snapmgr.c:1433
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "სწრაფი ასლი \"%s\" არ არსებობს"
 
-#: utils/time/snapmgr.c:1531
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr ""
 
-#: utils/time/snapmgr.c:1535
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr ""
 
-#: utils/time/snapmgr.c:1550
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "სხვა ბაზიდან სწრაფი ასლის შემოტანა შეუძლებელია"
@@ -31599,10 +31650,30 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid " GSS (authenticated=%s, encrypted=%s)"
 #~ msgstr " GSS (ავთენტიფიცირებული=%s, დაშიფრული=%s)"
 
+#, c-format
+#~ msgid "\"%s\" array cannot contain NULL values"
+#~ msgstr "\"%s\" მასივი, არ შეიძლება, NULL მნიშვნელობებს შეიცავდეს"
+
+#, c-format
+#~ msgid "\"%s\" cannot be NULL"
+#~ msgstr "\"%s\" არ შეიძლება, NULL იყოს"
+
 #, c-format
 #~ msgid "\"%s\" is not a partition"
 #~ msgstr "\"%s\" დანაყოფი არაა"
 
+#, c-format
+#~ msgid "\"%s\" is not a physical replication slot."
+#~ msgstr "\"%s\" ფიზიკური რეპლიკაციის სლოტი არაა."
+
+#, c-format
+#~ msgid "\"%s\" must be set to -1 during binary upgrade mode."
+#~ msgstr "ბინარული განახლების რეჟიმისას \"%s\"-ის მნიშვნელობა -1-ზე უნდა დააყენოთ."
+
+#, c-format
+#~ msgid "\"%s\" must be set to 0 during binary upgrade mode."
+#~ msgstr "ბინარული განახლების რეჟიმისას \"%s\"-ის მნიშვნელობა 0-ზე უნდა დააყენოთ."
+
 #, c-format
 #~ msgid "\"%s\" must be set to 0 on platforms that lack support for issuing read-ahead advice."
 #~ msgstr "\"%s\" უნდა იყოს 0 პლატფორმებზე, რომლებსაც წინასწარ-წაკითხვის მითითების მხარდაჭერა არ გააჩნიათ."
@@ -31639,6 +31710,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "%s cannot be executed within a pipeline"
 #~ msgstr "%s ფუნქციიდან ვერ გაეშვება"
 
+#, c-format
+#~ msgid "%s requires a \"none\" or \"stored\" value"
+#~ msgstr "%s მოითხოვს მნიშვნელობას \"none' ან \"stored\""
+
 #, c-format
 #~ msgid "%s with OID %u does not exist"
 #~ msgstr "%s OID-ით %u არ არსებობს"
@@ -31774,6 +31849,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "EXPLAIN option TIMING requires ANALYZE"
 #~ msgstr "EXPLAIN -ის პარამეტრ TIMING-ს ANALYZE სჭირდება"
 
+#, c-format
+#~ msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
+#~ msgstr "EXPLAIN-ის პარამეტრები ANALYZE და GENERIC_PLAN ერთად არ შეიძლება, გამოიყენოთ"
+
 #~ msgid "Enables logging of recovery-related debugging information."
 #~ msgstr "აღდგენასთან კავშირში მყოფი გამართვის ინფორმაციის ჟურნალში ჩაწერის ჩართვა."
 
@@ -31810,6 +31889,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "Incremental parser requires incremental lexer"
 #~ msgstr "ინკრემენტულ დამმუშავებელს ინკრემენტული lexer სჭირდება"
 
+#, c-format
+#~ msgid "Invalid list syntax in parameter \"log_connections\"."
+#~ msgstr "არასწორი სიის სინტაქსი პარამეტრში \"log_connections\"."
+
 #, c-format
 #~ msgid "Invalid list syntax in parameter %s"
 #~ msgstr "არასწორი სიის სინტაქსი პარამეტრში %s"
@@ -31859,6 +31942,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "Object keys should be text."
 #~ msgstr "ობიექტის გასაღებები ტექსტი უნდა იყოს."
 
+#, c-format
+#~ msgid "PID %d is no longer a PostgreSQL server process"
+#~ msgstr "პროცესი PID-ით %d PostgreSQL-ის სერვერის პროცესს აღარ წარმოადგენს"
+
 #, c-format
 #~ msgid "Please report this to <%s>."
 #~ msgstr "გთხოვთ, შეატყობინოთ <%s>."
@@ -31870,6 +31957,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "Recursive descent parser cannot use incremental lexer"
 #~ msgstr "რეკურსიულ დაღმავალ დამმუშავებელს ინკრემენტული lexer-ის გამოყენება არ შეუძლია"
 
+#, c-format
+#~ msgid "Replication slot \"%s\" does not exist."
+#~ msgstr "რეპლიკაციის სლოტი \"%s\" არ არსებობს."
+
 #~ msgid "Resource Usage / Asynchronous Behavior"
 #~ msgstr "რესურსების გამოყენება / ასინქრონული ქცევა"
 
@@ -32000,6 +32091,14 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "argument %d cannot be null"
 #~ msgstr "არგუმენტი %d ნულოვანი ვერ იქნება"
 
+#, c-format
+#~ msgid "attribute \"%s\" is not a range type"
+#~ msgstr "ატრიბუტი \"%s\" შუალედის ტიპი არაა"
+
+#, c-format
+#~ msgid "attribute %d of relation \"%s\" does not exist"
+#~ msgstr "ატრიბუტი %d ურთიერთობისთვის \"%s\" არ არსებობს"
+
 #, c-format
 #~ msgid "authentication file token too long, skipping: \"%s\""
 #~ msgstr "ავთენტიკაციის ფაილის კოდი ძალიან გრძელია. გამოტოვება: \"%s\""
@@ -32075,6 +32174,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "cannot specify HEADER in BINARY mode"
 #~ msgstr "რეჟიმში BINARY \"HEADER\"-ს ვერ მიუთითებთ"
 
+#, c-format
+#~ msgid "cannot specify both attname and attnum"
+#~ msgstr "ორივეს attname და attnum ვერ მიუთითებთ"
+
 #, c-format
 #~ msgid "cannot start subtransactions during a parallel operation"
 #~ msgstr "პარალელური ოპერაციის დროს ქვეტრანსაქციების დაწყება შეუძლებელია"
@@ -32083,6 +32186,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "cannot subtract infinite timestamps"
 #~ msgstr "უსასრულო დროის შტამპების გამოკლება შეუძლებელია"
 
+#, c-format
+#~ msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
+#~ msgstr "'IN SCHEMA' პირობის გამოყენება GRANT/REVOKE ON LARGE OBJECT-ის გამოყენებისას შეუძლებელია"
+
 #, c-format
 #~ msgid "cannot use RETURNING type %s in %s"
 #~ msgstr "'RETURNING'-ის ტიპს '%s' %s-ში ვერ გამოიყენებთ"
@@ -32103,6 +32210,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
 #~ msgstr "ურთიერთობის \"%2$s\" სვეტი \"%1$s\" დამახსოვრებული გენერირებული სვეტი არაა"
 
+#, c-format
+#~ msgid "constraint \"%s\" of relation \"%s\" is not a foreign key, check, or not-null constraint"
+#~ msgstr "შეზღუდვა \"%s\" ურთიერთობისთვის \"%s\" გარე გასაღებს, შემოწმებას, ან არანულოვან შეზღუდვას არ წარმოადგენს"
+
 #, c-format
 #~ msgid "conversion with OID %u does not exist"
 #~ msgstr "გადაყვანა OID-ით %u არ არსებობს"
@@ -32199,6 +32310,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "could not sync slot \"%s\""
 #~ msgstr "სლოტის \"%s\" სინქრონიზაცია შეუძლებელია"
 
+#, c-format
+#~ msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
+#~ msgstr "რეპლიკაციის სლოტის სინქრონიზაცია \"%s\" შეუძლებელია, რადგან დაშორებული სლოტი წინ უსწრებს ლოკალურ სლოტს"
+
 #, c-format
 #~ msgid "could not unlink file \"%s\": %m"
 #~ msgstr "ფაილის (%s) ბმულის მოხსნის შეცდომა: %m"
@@ -32271,10 +32386,18 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "invalid checkpoint link in backup_label file"
 #~ msgstr "backup_label ფაილში არსებული საკონტროლო წერტილი არასწორია"
 
+#, c-format
+#~ msgid "invalid input string for \"Y,YYY\""
+#~ msgstr "არასწორი შეყვანილი სტრიქონი \"Y,YYY\"-სთვის"
+
 #, c-format
 #~ msgid "invalid length of primary checkpoint record"
 #~ msgstr "ძირითადი საკონტროლო წერტილის ჩანაწერის არასწორი სიგრძე"
 
+#, c-format
+#~ msgid "invalid length of query cancel key"
+#~ msgstr "მოთხოვნის გაუქმების გასაღების სიგრძე არასწორია"
+
 #, c-format
 #~ msgid "invalid parameter name \"%s\""
 #~ msgstr "პარამეტრის არასწორი სახელი \"%s\""
@@ -32441,6 +32564,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "out of memory while trying to decode a record of length %u"
 #~ msgstr "%u სიგრძის მქონე ჩანაწერის დეკოდირებისთვის მეხსიერება საკმარისი არაა"
 
+#, c-format
+#~ msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
+#~ msgstr "კლიენტის მიერ გამოგზავნილი GSSAPI-ის პაკეტი ძალიან დიდია (%zu > %d)"
+
 #, c-format
 #~ msgid "parameter \"lc_collate\" must be specified"
 #~ msgstr "უნდა იყოს მითითებული პარამეტრი \"lc_collate\""
@@ -32477,6 +32604,14 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "record length %u at %X/%X too long"
 #~ msgstr "ჩანაწერის სიგრძე %u მისამართზე %X/%X ძალიან გრძელია"
 
+#, c-format
+#~ msgid "reltuples cannot be < -1.0"
+#~ msgstr "reltuples ვერ იქნება < -1.0"
+
+#, c-format
+#~ msgid "replication origin \"%s\" already exists"
+#~ msgstr "რეპლიკაციის წყარო \"%s\" უკვე არსებობს"
+
 #~ msgid "server process"
 #~ msgstr "სერვერის პროცესი"
 
@@ -32551,6 +32686,38 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "unlinked permanent statistics file \"%s\""
 #~ msgstr "სტატისტიკის მუდმივი ფაილი მოხსნილია: %s"
 
+#, c-format
+#~ msgid "unrecognized ANALYZE option \"%s\""
+#~ msgstr "\"ANALYZE\"-ის უცნობი პარამეტრი: %s"
+
+#, c-format
+#~ msgid "unrecognized CLUSTER option \"%s\""
+#~ msgstr "\"CLUSTER\"-ის უცნობი პარამეტრი \"%s\""
+
+#, c-format
+#~ msgid "unrecognized DROP DATABASE option \"%s\""
+#~ msgstr "\"DROP DATABASE\"-ის უცნობი პარამეტრი \"%s\""
+
+#, c-format
+#~ msgid "unrecognized EXPLAIN option \"%s\""
+#~ msgstr "\"EXPLAIN\"-ის უცნობი პარამეტრი \"%s\""
+
+#, c-format
+#~ msgid "unrecognized REINDEX option \"%s\""
+#~ msgstr "\"REINDEX\"-ის უცნობი პარამეტრი \"%s\""
+
+#, c-format
+#~ msgid "unrecognized VACUUM option \"%s\""
+#~ msgstr "\"VACUUM\"-ის უცნობი პარამეტრი: %s"
+
+#, c-format
+#~ msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
+#~ msgstr "უცნობი მნიშვნელობა CREATE_REPLICATION_SLOT-ის პარამეტრისთვის \"%s\": \"%s\""
+
+#, c-format
+#~ msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+#~ msgstr "\"EXPLAIN\"-ის უცნობი პარამეტრი \"%s\": \"%s\""
+
 #, c-format
 #~ msgid "upper bound of partition \"%s\" is greater than upper bound of split partition"
 #~ msgstr "ზედა ზღვარი დანაყოფისთვის \"%s\" დაყოფილი დანაყოფის ზედა საზღვარზე მეტია"
@@ -32559,6 +32726,10 @@ msgstr "სხვა ბაზიდან სწრაფი ასლის 
 #~ msgid "upper bound of partition \"%s\" is not equal to upper bound of split partition"
 #~ msgstr "ზედა ზღვარი დანაყოფისთვის \"%s\" არ უდრის დაყოფილი დანაყოფის ზედა საზღვარს"
 
+#, c-format
+#~ msgid "value for \"Y,YYY\" in source string is out of range"
+#~ msgstr "წყარო სტრიქონში \"Y,YYY\"-ის მნიშვნელობები დიაპაზონს გარეთაა"
+
 #, c-format
 #~ msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
 #~ msgstr "სერვისის გაშვებისას wal_level -ის მნიშვნელობა უნდა იყოს \"replica\" ან \"logical\"."
diff --git a/src/backend/po/ko.po b/src/backend/po/ko.po
index d71eed4b6c0..7729b52ff00 100644
--- a/src/backend/po/ko.po
+++ b/src/backend/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: postgres (PostgreSQL) 17\n"
+"Project-Id-Version: postgres (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:41+0000\n"
-"PO-Revision-Date: 2025-01-20 16:44+0900\n"
+"POT-Creation-Date: 2025-09-11 21:41+0000\n"
+"PO-Revision-Date: 2025-09-12 11:14+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -81,34 +81,34 @@ msgid "not recorded"
 msgstr "기록되어 있지 않음"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1739 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3807 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "\"%s\" 파일 일기 모드로 열기 실패: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1369 access/transam/xlog.c:3477
-#: access/transam/xlog.c:4341 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5113
-#: replication/logical/snapbuild.c:2052 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1353 access/transam/xlog.c:3479
+#: access/transam/xlog.c:4370 access/transam/xlogrecovery.c:1246
+#: access/transam/xlogrecovery.c:1344 access/transam/xlogrecovery.c:1381
+#: access/transam/xlogrecovery.c:1448 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3817 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2485
+#: replication/slot.c:2526 replication/walsender.c:629
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3482 access/transam/xlog.c:4346
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2057 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3484 access/transam/xlog.c:4375
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2489
+#: replication/slot.c:2530 replication/walsender.c:634
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -118,18 +118,19 @@ msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %zu"
 #: ../common/controldata_utils.c:277 ../common/controldata_utils.c:280
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
-#: access/transam/timeline.c:512 access/transam/twophase.c:1381
-#: access/transam/twophase.c:1800 access/transam/xlog.c:3323
-#: access/transam/xlog.c:3517 access/transam/xlog.c:3522
-#: access/transam/xlog.c:3658 access/transam/xlog.c:4311
-#: access/transam/xlog.c:5246 commands/copyfrom.c:1799 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5165
-#: replication/logical/snapbuild.c:1819 replication/logical/snapbuild.c:1943
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/timeline.c:512 access/transam/twophase.c:1365
+#: access/transam/twophase.c:1783 access/transam/xlog.c:3325
+#: access/transam/xlog.c:3519 access/transam/xlog.c:3524
+#: access/transam/xlog.c:3660 access/transam/xlog.c:4340
+#: access/transam/xlog.c:5312 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2373 replication/slot.c:2537 replication/walsender.c:644
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:825
+#: storage/file/fd.c:3815 storage/file/fd.c:3921 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -155,105 +156,107 @@ msgstr ""
 "현재 PostgreSQL 설치본과 이 데이터 디렉터리가 호환하지 않습니다."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1325 access/transam/xlog.c:3230
-#: access/transam/xlog.c:3393 access/transam/xlog.c:3432
-#: access/transam/xlog.c:3625 access/transam/xlog.c:4331
-#: access/transam/xlogrecovery.c:4263 access/transam/xlogrecovery.c:4366
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3766
-#: replication/logical/reorderbuffer.c:4320
-#: replication/logical/reorderbuffer.c:5093
-#: replication/logical/snapbuild.c:1774 replication/logical/snapbuild.c:1884
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2124
-#: utils/init/miscinit.c:1580 utils/init/miscinit.c:1714
-#: utils/init/miscinit.c:1791 utils/misc/guc.c:4777 utils/misc/guc.c:4827
+#: access/transam/twophase.c:1309 access/transam/xlog.c:3215
+#: access/transam/xlog.c:3395 access/transam/xlog.c:3434
+#: access/transam/xlog.c:3627 access/transam/xlog.c:4360
+#: access/transam/xlogrecovery.c:4285 access/transam/xlogrecovery.c:4386
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2457 replication/walsender.c:602
+#: replication/walsender.c:3080 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:800 storage/file/fd.c:3572
+#: storage/file/fd.c:3802 storage/file/fd.c:3892 storage/smgr/md.c:675
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1773 access/transam/twophase.c:1782
-#: access/transam/xlog.c:9280 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1756 access/transam/twophase.c:1765
+#: access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4124
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4105
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1794
-#: access/transam/xlog.c:3316 access/transam/xlog.c:3511
-#: access/transam/xlog.c:4304 access/transam/xlog.c:8655
-#: access/transam/xlog.c:8700 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1812
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1331 storage/smgr/md.c:1376
-#: storage/sync/sync.c:446 utils/misc/guc.c:4530
+#: access/transam/timeline.c:506 access/transam/twophase.c:1777
+#: access/transam/xlog.c:3315 access/transam/xlog.c:3513
+#: access/transam/xlog.c:4333 access/transam/xlog.c:8726
+#: access/transam/xlog.c:8770 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2359 replication/slot.c:2467 storage/file/fd.c:817
+#: storage/file/fd.c:3913 storage/smgr/md.c:1455 storage/smgr/md.c:1515
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일 fsync 실패: %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:852 ../common/psprintf.c:143
-#: ../common/scram-common.c:268 ../common/stringinfo.c:314 ../port/path.c:751
-#: ../port/path.c:788 ../port/path.c:805 access/transam/twophase.c:1434
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3558 postmaster/postmaster.c:4018
-#: postmaster/postmaster.c:4380 postmaster/walsummarizer.c:935
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:210 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1465
-#: storage/ipc/procarray.c:2219 storage/ipc/procarray.c:2226
-#: storage/ipc/procarray.c:2731 storage/ipc/procarray.c:3435
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:532
-#: utils/adt/pg_locale.c:696 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4508 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2410 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1418
+#: access/transam/xlogrecovery.c:570 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3575
+#: postmaster/walsummarizer.c:938
+#: replication/libpqwalreceiver/libpqwalreceiver.c:351
+#: replication/logical/logical.c:212 replication/walsender.c:811
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:909 storage/file/fd.c:1444
+#: storage/file/fd.c:1605 storage/file/fd.c:2589 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:510
+#: utils/adt/pg_locale.c:584 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:402 utils/mb/mbutils.c:430
+#: utils/mb/mbutils.c:815 utils/mb/mbutils.c:842 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1159 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "성공"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "대상 버퍼가 너무 작습니다."
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "OpenSSL 실패"
 
@@ -278,34 +281,34 @@ msgstr "\"%s\" 실행 파일을 찾을 수 없음"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "\"%s\" 상대 경로를 절대 경로로 바꿀 수 없음: %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1723
-#: commands/copyto.c:654 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "\"%s\" 명령을 실행할 수 없음: %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "\"%s\" 명령에서 읽을 수 없음: %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "\"%s\" 명령은 아무런 데이터도 반환하지 않았음"
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1582 storage/ipc/latch.c:1744
-#: storage/ipc/latch.c:1870
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:782
+#: storage/ipc/waiteventset.c:962 storage/ipc/waiteventset.c:1202
+#: storage/ipc/waiteventset.c:1364 storage/ipc/waiteventset.c:1490
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:753 ../port/path.c:790
-#: ../port/path.c:807 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "메모리 부족\n"
@@ -315,51 +318,51 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3578
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일 대상으로 파일 시스템 동기화를 할 수 없습니다: %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1337
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1321
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1749
-#: commands/copyto.c:700 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:2173
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1889
+#: commands/copyto.c:979 commands/extension.c:3796 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1969 storage/file/fd.c:2057 storage/file/fd.c:3626
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1468
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1496
+#: storage/file/fd.c:2994 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3006
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1831 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:988
+#: replication/slot.c:2245 replication/slot.c:2387 storage/file/fd.c:835
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -368,87 +371,87 @@ msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
 msgid "internal error"
 msgstr "내부 오류"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "재귀적 하향 구문분석기는 증분 토큰분석기을 사용할 수 없습니다."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "증분 구문분석기는 증분 토큰분석기를 필요로 합니다."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON 계층이 너무 깊음, 허용하는 최대 깊이는 6400입니다."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "잘못된 이스케이프 조합: \"\\%.*s\""
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "0x%02x 값의 문자는 이스케이프 처리를 해야함."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "입력 자료의 끝을 기대했는데, \"%.*s\" 값이 더 있음."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "배열 요소나 \"]\" 가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "\",\" 또는 \"]\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "\":\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "입력 문자열이 예상치 않게 끝났음."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "문자열이나 \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "\",\" 또는 \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "문자열 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "잘못된 토큰: \"%.*s\""
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 값은 text 형으로 변환할 수 없음."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" 표기법은 뒤에 4개의 16진수가 와야 합니다."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -456,39 +459,43 @@ msgstr ""
 "서버 인코딩이 UTF8이 아닌 경우 007F보다 큰 코드 지점 값에는 유니코드 이스케이"
 "프 값을 사용할 수 없음"
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "유니코드 이스케이프 값을 %s 서버 인코딩으로 변환할 수 없음."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드)는 상위 딸림 코드 뒤에 오면 안됨."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드) 뒤에는 하위 딸림 코드가 있어야 함."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "오류 설명을 작성하는 중 메모리 부족"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -583,7 +590,7 @@ msgstr "파일 이름을 디코딩할 수 없음"
 msgid "file size is not an integer"
 msgstr "파일 크기가 정수가 아님"
 
-#: ../common/parse_manifest.c:699 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "알 수 없는 체크섬 알고리즘: \"%s\""
@@ -652,9 +659,9 @@ msgstr "백업 매니페스트 분석 실패: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4712 utils/misc/guc.c:6931
-#: utils/misc/guc.c:6972
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "잘못된 \"%s\" 매개 변수의 값: \"%s\""
@@ -715,22 +722,22 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "하위 프로세스의 종료 코드를 구할 수 없음: 오류 코드 %lu"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1733 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4589
-#: replication/logical/snapbuild.c:1712 replication/logical/snapbuild.c:2146
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1716 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1069
+#: postmaster/syslogger.c:1489 replication/logical/origin.c:614
+#: replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2441 storage/file/fd.c:875 storage/file/fd.c:3440
+#: storage/file/fd.c:3502 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "\"%s\" 파일을 삭제할 수 없음: %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3432
+#: storage/file/fd.c:3841
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 삭제할 수 없음: %m"
@@ -747,19 +754,24 @@ msgstr "저장 키를 인코드할 수 없음"
 msgid "could not encode server key"
 msgstr "서버 키를 인코드할 수 없음"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "문자열 버퍼가 최대치 (%zu 바이트)를 초과했음"
+
+#: ../common/stringinfo.c:363
 #, c-format
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "%d바이트가 포함된 문자열 버퍼를 %d바이트 더 확장할 수 없습니다."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
 msgid ""
-"out of memory\n"
+"string buffer exceeds maximum allowed length (%zu bytes)\n"
 "\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
 msgstr ""
-"메모리 부족\n"
+"문자열 버퍼가 최대치 (%zu 바이트)를 초과했습니다.\n"
 "\n"
 "%d 바이트가 포함된 문자열 버퍼를 %d 바이트 더 확장할 수 없습니다.\n"
 
@@ -768,7 +780,7 @@ msgstr ""
 msgid "could not look up effective user ID %ld: %s"
 msgstr "%ld UID를 찾을 수 없음: %s"
 
-#: ../common/username.c:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "사용자 없음"
 
@@ -807,12 +819,12 @@ msgstr "하위 프로그램은 %d 신호에 의해서 종료되었습니다: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "하위 프로그램 프로그램은 예상치 못한 %d 상태값으로 종료되었습니다"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "\"%s\" 코드 세트 환경에 사용할 인코딩을 결정할 수 없습니다"
 
-#: ../port/chklocale.c:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr ""
@@ -865,7 +877,7 @@ msgstr ""
 "바이러스 백신 프로그램, 백업 또는 유사한 소프트웨어가 데이터베이스 시스템을 "
 "방해할 수 있습니다."
 
-#: ../port/path.c:775
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "현재 작업 디렉터리를 알 수 없음: %m\n"
@@ -875,16 +887,6 @@ msgstr "현재 작업 디렉터리를 알 수 없음: %m\n"
 msgid "operating system error %d"
 msgstr "운영체제 오류 %d"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "UID %d에 해당하는 로컬 사용자를 찾을 수 없음: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "%d OID에 해당하는 로컬 사용자가 없음"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -900,50 +902,52 @@ msgstr "PowerUsers 그룹의 SID를 가져올 수 없음: 오류 코드 %lu\n"
 msgid "could not check access token membership: error code %lu\n"
 msgstr "토큰 맴버쉽 접근을 확인 할 수 없음: 오류 코드 %lu\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid ""
 "request for BRIN range summarization for index \"%s\" page %u was not "
 "recorded"
 msgstr "\"%s\" 인덱스에서 BRIN 범위 요약 요청이 기록되지 못함, 해당 페이지: %u"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:190 statistics/attribute_stats.c:934
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "복구 작업 진행 중"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "BRIN 제어 함수는 복구 작업 중에는 실행 될 수 없음"
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "블록 번호가 범위를 벗어남: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "블록 번호가 범위를 벗어남: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "\"%s\" 개체는 BRIN 인덱스가 아닙니다"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "\"%s\" 인덱스에 대한 파티션 테이블을 열 수 없음"
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2277
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "\"%s\" 인덱스는 사용가능 상태가 아님"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -954,7 +958,7 @@ msgstr "%s 형식의 값은 사용할 수 없음"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -970,9 +974,9 @@ msgstr "BRIN 인덱스 속상: 범위 지도가 연결되지 않음"
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "예상치 못한 0x%04X 페이지 타입: \"%s\" BRIN 인덱스 %u 블록"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains function %s with invalid "
@@ -981,9 +985,9 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 포함된 %s 함수가 잘못된 지원 번호 %d "
 "로 지정되었습니다."
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains function %s with wrong "
@@ -992,9 +996,9 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 포함된 %s 함수가 잘못된 signature 지원 "
 "번호 %d 로 지정되었습니다."
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains operator %s with invalid "
@@ -1003,9 +1007,9 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 포함된 %s 연산자의 %d 번 전략 번호가 잘"
 "못되었습니다."
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains invalid ORDER BY "
@@ -1014,9 +1018,9 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 %s 연산자가 잘못된 ORDER BY 명세를 사용"
 "합니다."
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains operator %s with wrong "
@@ -1024,8 +1028,8 @@ msgid ""
 msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 %s 연산자가 잘못된 기호를 사용합니다."
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing operator(s) for types "
@@ -1033,7 +1037,7 @@ msgid ""
 msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에는 %s, %s 자료형용 연산자가 없습니다"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function(s) "
@@ -1042,38 +1046,40 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에는 %s, %s 자료형용으로 쓸 함수가 없습니"
 "다"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "\"%s\" 연산자 클래스(접근 방법: %s)에 연산자가 빠졌습니다"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid ""
 "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "\"%s\" 연산자 클래스(접근 방법: %s)에 %d 지원 함수가 빠졌습니다."
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
+msgid ""
+"Returned type %s does not match expected type %s in column \"%s\" (position "
+"%d)."
 msgstr ""
-"반환 자료형으로 %s 형을 지정했지만, 칼럼은 %s 자료형입니다. 해당 칼럼: %d 번"
-"째 칼럼"
+"반환 자료형으로 %s 형을 지정했지만, %s 자료형을 \"%s\" 칼럼에서 사용하고 있습"
+"니다.(위치 %d 번째)"
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid ""
 "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "반환할 칼럼 수(%d)와 예상되는 칼럼수(%d)가 다릅니다."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "로우 자료형을 변환 할 수 없음"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, c-format
 msgid ""
 "Attribute \"%s\" of type %s does not match corresponding attribute of type "
@@ -1081,12 +1087,12 @@ msgid ""
 msgstr ""
 " \"%s\" 속성(대상 자료형 %s)이 %s 자료형의 속성 가운데 관련된 것이 없습니다"
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "\"%s\" 속성(대상 자료형 %s)이 %s 자료형에는 없습니다."
 
-#: access/common/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "칼럼 개수(%d)가 최대값(%d)을 초과했습니다"
@@ -1096,96 +1102,101 @@ msgstr "칼럼 개수(%d)가 최대값(%d)을 초과했습니다"
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "인덱스 칼럼 개수(%d)가 최대값(%d)을 초과했습니다"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "인덱스 행(row)은 %zu 바이트를 필요로 함, 최대 크기는 %zu"
 
-#: access/common/printtup.c:292 commands/explain.c:5376 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1956
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "지원하지 않는 포맷 코드: %d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "유효한 값: \"on\", \"off\", \"auto\""
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "사용할 수 있는 값은 \"local\" 또는 \"cascaded\" 입니다"
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "사용자 정의 관계 매개 변수 형식 제한을 초과함"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "매개 변수의 값으로 RESET은 올 수 없음"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "\"%s\" 매개 변수 네임스페이스를 인식할 수 없음"
 
-#: access/common/reloptions.c:1300 commands/variable.c:1214
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "\"%s\" 옵션 이름이 잘못됨: \"=\" 문자가 포함될 수 없음"
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "WITH OIDS 테이블을 지원하지 않음"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "알 수 없는 환경 설정 이름입니다 \"%s\""
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "\"%s\" 매개 변수가 여러 번 지정됨"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "\"%s\" 불리언 옵션 값이 잘못됨: %s"
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "\"%s\" 정수 옵션 값이 잘못됨: %s"
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "값 %s은(는) \"%s\" 옵션 범위를 벗어남"
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "유효한 값은 \"%d\"에서 \"%d\" 사이입니다."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "\"%s\" 부동 소수점 옵션 값이 잘못됨: %s"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "유효한 값은 \"%f\"에서 \"%f\" 사이입니다."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "\"%s\" enum 옵션 값이 잘못됨: %s"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "파티션 상위 테이블 대상으로는 스토리지 매개 변수를 지정할 수 없음"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr ""
@@ -1231,27 +1242,28 @@ msgstr "다른 세션의 임시 인덱스는 접근할 수 없음"
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "\"%s\" 인덱스에서 튜플 재검색 실패"
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1283 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963
+#: utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726
+#: utils/adt/rowtypes.c:974
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "%s 자료형에서 사용할 비교함수를 찾을 수 없습니다."
+
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr ""
 "GIN 인덱스가 옛날 버전이어서 인덱스 전체 탐색, null 탐색 기능을 사용할 수 없"
 "습니다."
 
-#: access/gin/ginscan.c:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "이 문제를 고치려면, 다음 명령을 수행하세요: REINDEX INDEX \"%s\""
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2200
-#: utils/adt/arrayfuncs.c:4016 utils/adt/arrayfuncs.c:6712
-#: utils/adt/rowtypes.c:974
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "%s 자료형에서 사용할 비교함수를 찾을 수 없습니다."
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains support function %s with "
@@ -1260,7 +1272,7 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 서로 다른 양쪽 입력 자료형 인자를 사용"
 "할 수 있는 %s 지원 함수가 포함되어 있음"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid ""
 "operator class \"%s\" of access method %s is missing support function %d or "
@@ -1268,18 +1280,18 @@ msgid ""
 msgstr ""
 "\"%s\" 연산자 클래스(접근 방법: %s)에는 %d 또는 %d 지원 함수가 빠졌습니다"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "지원 함수 번호 %d 잘못됨, 대상 접근 방법: %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "\"%s\" 인덱스에 잘못된 내부 튜플이 있다고 확인되었습니다."
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid ""
 "This is caused by an incomplete page split at crash recovery before "
@@ -1288,8 +1300,8 @@ msgstr ""
 "이 문제는 PostgreSQL 9.1 버전으로 업그레이드 하기 전에 장애 복구 처리에서 잘"
 "못된 페이지 분리 때문에 발생했습니다."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1297,7 +1309,7 @@ msgstr ""
 msgid "Please REINDEX it."
 msgstr "REINDEX 명령으로 다시 인덱스를 만드세요"
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "\"%s\" 인덱스의 불완전한 분기 수정중,  블록번호: %u"
@@ -1316,19 +1328,19 @@ msgstr ""
 "인덱스가 최적화되지 않았습니다. 최적화하려면 개발자에게 문의하거나, CREATE "
 "INDEX 명령에서 해당 칼럼을 두 번째 인덱스로 사용하십시오."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "\"%s\" 인덱스의 %u번째 블럭에서 예상치 않은 zero page가 있습니다"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "\"%s\" 인덱스트 %u번째 블럭이 속상되었습니다"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains unsupported ORDER BY "
@@ -1337,7 +1349,7 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 %s 연산자가 지원하지 않는 ORDER BY 명세"
 "를 사용합니다."
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains incorrect ORDER BY "
@@ -1346,19 +1358,20 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 %s 연산자가 잘못된 ORDER BY 명세를 사용"
 "합니다."
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:333
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1065
+#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:332
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "문자열 해시 작업에 사용할 정렬규칙(collation)을 결정할 수 없음"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:334 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:508
-#: commands/indexcmds.c:2021 commands/tablecmds.c:18178 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1066 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:688
+#: catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2090 commands/tablecmds.c:19952 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655
+#: utils/adt/formatting.c:1719 utils/adt/formatting.c:1783
+#: utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1592
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "명시적으로 정렬 규칙을 지정하려면 COLLATE 절을 사용하세요."
@@ -1369,7 +1382,7 @@ msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "인덱스 행 크기가 초과됨: 현재값 %zu, 최대값 %zu"
 
 #: access/hash/hashinsert.c:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "버퍼 페이지보다 큰 값은 인덱싱할 수 없습니다."
@@ -1384,7 +1397,7 @@ msgstr "잘못된 오버플로우 블록 번호: %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "\"%s\" 해시 인덱스에서 오버플로우 페이지 초과"
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "해시 인덱스는 whole-index scan을 지원하지 않음"
@@ -1399,52 +1412,52 @@ msgstr "\"%s\" 인덱스는 해시 인덱스가 아님"
 msgid "index \"%s\" has wrong hash version"
 msgstr "\"%s\" 인덱스는 잘못된 해시 버전임"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s lacks support function for "
 "operator %s"
 msgstr "\"%s\" 연산자 패밀리(접근 방법: %s)에 %s 연산자용 지원 함수가 없음"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "%s 연산자 패밀리(접근 방법: %s)에 cross-type 연산자가 빠졌음"
 
-#: access/heap/heapam.c:2204
+#: access/heap/heapam.c:2280
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "병렬 작업자는 튜플을 추가 할 수 없음"
 
-#: access/heap/heapam.c:2723
+#: access/heap/heapam.c:2803
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "병렬 작업 중에는 튜플을 지울 수 없음"
 
-#: access/heap/heapam.c:2770
+#: access/heap/heapam.c:2850
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "볼 수 없는 튜플을 삭제 하려고 함"
 
-#: access/heap/heapam.c:3218 access/heap/heapam.c:6454 access/index/genam.c:818
+#: access/heap/heapam.c:3300 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "병렬 작업 중에 튜플 갱신은 할 수 없음"
 
-#: access/heap/heapam.c:3350
+#: access/heap/heapam.c:3477
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "볼 수 없는 튜플을 변경하려고 함"
 
-#: access/heap/heapam.c:4861 access/heap/heapam.c:4899
-#: access/heap/heapam.c:5164 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4988 access/heap/heapam.c:5026
+#: access/heap/heapam.c:5291 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "\"%s\" 릴레이션의 잠금 정보를 구할 수 없음"
 
-#: access/heap/heapam.c:6267 commands/trigger.c:3340
-#: executor/nodeModifyTable.c:2376 executor/nodeModifyTable.c:2467
+#: access/heap/heapam.c:6405 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, c-format
 msgid ""
 "tuple to be updated was already modified by an operation triggered by the "
@@ -1452,7 +1465,7 @@ msgid ""
 msgstr ""
 "현재 명령으로 실행된 트리거 작업으로 변경해야할 자료가 이미 바뀌었습니다."
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid ""
 "tuple to be locked was already moved to another partition due to concurrent "
@@ -1471,14 +1484,14 @@ msgstr "\"%s\" 파일 쓰기 실패, %d / %d 기록함: %m."
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3255 access/transam/xlog.c:3446
-#: access/transam/xlog.c:4283 access/transam/xlog.c:9269
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:340 postmaster/postmaster.c:4111
-#: postmaster/walsummarizer.c:1212 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3240 access/transam/xlog.c:3448
+#: access/transam/xlog.c:4312 access/transam/xlog.c:9329
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4092
+#: postmaster/walsummarizer.c:1215 replication/logical/origin.c:626
+#: replication/slot.c:2306 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "\"%s\" 파일을 만들 수 없음: %m"
@@ -1490,36 +1503,36 @@ msgstr "\"%s\" 파일을 %u 크기로 정리할 수 없음: %m"
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3305 access/transam/xlog.c:3502
-#: access/transam/xlog.c:4295 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:351 postmaster/launch_backend.c:363
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1788
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1655
-#: utils/init/miscinit.c:1666 utils/init/miscinit.c:1674 utils/misc/guc.c:4491
-#: utils/misc/guc.c:4522 utils/misc/guc.c:5675 utils/misc/guc.c:5693
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3301 access/transam/xlog.c:3504
+#: access/transam/xlog.c:4324 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2341 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "적극적으로 \"%s.%s.%s\" 청소 중"
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\" 청소 중"
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "\"%s.%s.%s\" 테이블 청소 끝남: 인덱스 탐색: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid ""
 "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": "
@@ -1528,7 +1541,7 @@ msgstr ""
 "트랙젝션 ID 겹침 방지를 위한 적극적인 \"%s.%s.%s\" 테이블 자동 청소: 인덱스 "
 "탐색: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid ""
 "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: "
@@ -1536,90 +1549,108 @@ msgid ""
 msgstr ""
 "트랙젝션 ID 겹침 방지를 위한 \"%s.%s.%s\" 테이블 자동 청소: 인덱스 탐색: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "적극적인 \"%s.%s.%s\" 테이블 자동 청소: 인덱스 탐색: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "\"%s.%s.%s\" 테이블 자동 청소: 인덱스 탐색: %d\n"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
-msgstr "페이지: %u 삭제됨, %u 남음, %u 검사됨 (전체의 %.2f%%)\n"
+msgid ""
+"pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly "
+"scanned\n"
+msgstr ""
+"페이지: %u 삭제됨, %u 남음, %u 검사됨 (전체의 %.2f%%), %u 적극적 검사\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
 msgid ""
-"tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
+"tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet "
+"removable\n"
 msgstr ""
-"튜플: %.lld 삭제됨, %lld 남음, 아직 %lld 개의 튜플을 지워야하지만 못지웠음\n"
+"튜플: %<PRId64> 삭제됨, %<PRId64> 남음, 아직 %<PRId64> 개의 튜플을 지워야하지"
+"만 못지웠음\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
 msgid ""
-"tuples missed: %lld dead from %u pages not removed due to cleanup lock "
+"tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock "
 "contention\n"
 msgstr ""
-"놓친 튜플: %lld 개의 죽은 튜플이 %u 개의 페이지 안에 있음: cleanup 잠금 연결 "
-"때문\n"
+"놓친 튜플: %<PRId64> 개의 죽은 튜플이 %u 개의 페이지 안에 있음: cleanup 잠금 "
+"충돌 때문\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "삭제 가능한 컷오프: %u, which was %d XIDs old when operation ended\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "새 relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "새 relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
+msgid ""
+"frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
 msgstr ""
-"영구보관: 테이블의 %u개 페이지(전체의 %.2f%%)에서 %lld 개의 튜플을 영구 보관"
-"함\n"
+"영구보관: 테이블의 %u개 페이지(전체의 %.2f%%)에서 %<PRId64> 개의 튜플을 영구 "
+"보관함\n"
+
+#: access/heap/vacuumlazy.c:1062
+#, c-format
+msgid ""
+"visibility map: %u pages set all-visible, %u pages set all-frozen (%u were "
+"all-visible)\n"
+msgstr ""
+"가시성 맵: %u 페이지가 모두 보임으로 설정됨, %u 페이지가 모두 영구보관됨 (%u "
+"페이지는 이미 모두 보임)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "인덱스 검사 필요 없음: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "인덱스 검사 필요함: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
 msgid ""
-"%u pages from table (%.2f%% of total) had %lld dead item identifiers "
+"%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers "
 "removed\n"
 msgstr ""
-"테이블의 %u개 페이지(전체의 %.2f%%)에서 %lld 개의 죽은 항목 식별자를 지웠음\n"
+"테이블의 %u개 페이지(전체의 %.2f%%)에서 %<PRId64> 개의 죽은 항목 식별자를 지"
+"웠음\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "인덱스 검사 통과됨: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "failsafe의 의해 인덱스 검사 통과됨: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
+msgid ""
+"%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
 msgstr ""
-"테이블의 %u 개 페이지(전체의 %.2f%%)에서 %lld 개의 죽은 항목 식별자가 있음\n"
+"테이블의 %u 개 페이지(전체의 %.2f%%)에서 %<PRId64> 개의 죽은 항목 식별자가 있"
+"음\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid ""
 "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u "
@@ -1628,38 +1659,56 @@ msgstr ""
 "\"%s\" 인덱스: 페이지: 전체 가운데 %u, 새롭게 지운거 %u, 현재 지운거 %u, 재사"
 "용한 것 %u\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "지연 시간: %.3f ms\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "I/O 속도: 읽기: %.3f ms, 쓰기: %.3f ms\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:797
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "평균 읽기 속도: %.3f MB/s, 평균 쓰기 속도: %.3f MB/s\n"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:799
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
-msgstr "버퍼 사용량: %lld 조회, %lld 놓침, %lld 변경됨\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
+msgstr "버퍼 사용량: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
-msgstr "WAL 사용량: %lld 레코드, %lld full page 이미지, %llu 바이트\n"
+msgid ""
+"WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, "
+"%<PRId64> buffers full\n"
+msgstr ""
+"WAL 사용량: %<PRId64> 레코드, %<PRId64> full page 이미지, %<PRIu64> 바이트, "
+"%<PRId64> buffers full\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:803
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "시스템 사용량: %s"
 
-#: access/heap/vacuumlazy.c:2170
+#: access/heap/vacuumlazy.c:1432
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
+msgid ""
+"disabling eager scanning after freezing %u eagerly scanned blocks of "
+"relation \"%s.%s.%s\""
+msgstr ""
+"%u개의 블록을 적극적으로 스캔하여 영구보관한 후, 릴레이션 \"%s.%s.%s\"에서 적"
+"극적 스캔을 비활성화합니다"
+
+#: access/heap/vacuumlazy.c:2821
+#, c-format
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
 msgstr ""
-"\"%s\" 테이블: %lld 개의 죽은 항목 실별자를 %u 개의 페이지에서 삭제했음"
+"\"%s\" 테이블: %<PRId64> 개의 죽은 항목 실별자를 %u 개의 페이지에서 삭제했음"
 
-#: access/heap/vacuumlazy.c:2324
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid ""
 "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after "
@@ -1668,12 +1717,12 @@ msgstr ""
 "\"%s.%s.%s\" 테이블의 불필요한 관리 작업은 통과했음, %d 번의 인덱스 검사로 굳"
 "이 필요 없음"
 
-#: access/heap/vacuumlazy.c:2327
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "해당 테이블의 relfrozenxid 나 relminmxid 값이 너무 오래 된 것입니다."
 
-#: access/heap/vacuumlazy.c:2328
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or "
@@ -1686,22 +1735,22 @@ msgstr ""
 "VACUUM 작업이 트랜잭션 ID가 증가하는 것을 따라 잡을 있는 다른 방법도 해 봐야 "
 "할 것 같습니다."
 
-#: access/heap/vacuumlazy.c:2590
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": 잠금 요청 충돌로 자료 비우기 작업을 중지합니다"
 
-#: access/heap/vacuumlazy.c:2660
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "\"%s\" 테이블: %u 에서 %u 페이지로 정리했음"
 
-#: access/heap/vacuumlazy.c:2722
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "\"%s\" 테이블: 잠금 요청 충돌로 자료 비우기 작업이 지연되고 있음"
 
-#: access/heap/vacuumlazy.c:2841
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid ""
 "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary "
@@ -1710,47 +1759,47 @@ msgstr ""
 "\"%s\" 청소 작업에서의 병렬 옵션은 무시함 --- 임시 테이블은 병렬 처리로 청소 "
 "할 수 없음"
 
-#: access/heap/vacuumlazy.c:3108
+#: access/heap/vacuumlazy.c:3766
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "%u 블록 %u 오프셋 탐색 중 (해당 릴레이션: \"%s.%s\")"
 
-#: access/heap/vacuumlazy.c:3111
+#: access/heap/vacuumlazy.c:3769
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "%u 블록(해당 릴레이션: \"%s.%s\")을 탐색 중"
 
-#: access/heap/vacuumlazy.c:3115
+#: access/heap/vacuumlazy.c:3773
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "\"%s.%s\" 릴레이션을 탐색 중"
 
-#: access/heap/vacuumlazy.c:3123
+#: access/heap/vacuumlazy.c:3781
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "%u 블록 %u 오프셋 청소 중 (해당 릴레이션: \"%s.%s\")"
 
-#: access/heap/vacuumlazy.c:3126
+#: access/heap/vacuumlazy.c:3784
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "%u 블록(해당 릴레이션: \"%s.%s\")을 청소 중"
 
-#: access/heap/vacuumlazy.c:3130
+#: access/heap/vacuumlazy.c:3788
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "\"%s.%s\" 릴레이션 청소 중"
 
-#: access/heap/vacuumlazy.c:3135 commands/vacuumparallel.c:1112
+#: access/heap/vacuumlazy.c:3793 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "\"%s\" 인덱스(해당 릴레이션 \"%s.%s\") 청소 중"
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1118
+#: access/heap/vacuumlazy.c:3798 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "\"%s\" 인덱스 (해당 릴레이션 \"%s.%s\")을 정돈(clean up) 중"
 
-#: access/heap/vacuumlazy.c:3146
+#: access/heap/vacuumlazy.c:3804
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "\"%s.%s\" 릴레이션을 %u 블럭으로 줄이는 중"
@@ -1765,24 +1814,24 @@ msgstr "\"%s\" 접근 방법은 %s 자료형에는 쓸 수 없음"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "\"%s\" 인덱스 접근 방법에 대한 핸들러가 없음"
 
-#: access/index/genam.c:489
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "시스템 카탈로그 탐색 중 트랜잭션 중지됨"
 
-#: access/index/genam.c:657 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "reindex 시작할 때는 \"%s\" 인덱스를 접근할 없음"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2851 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17873 commands/tablecmds.c:19740
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19641 commands/tablecmds.c:21569
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" 개체는 인덱스가 아닙니다"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "%s 연산자 클래스는 옵션이 없습니다"
@@ -1803,7 +1852,7 @@ msgid "This may be because of a non-immutable index expression."
 msgstr "이 문제는 non-immutable 인덱스 표현식 때문인듯 합니다."
 
 #: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2323
+#: parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "\"%s\" 인덱스는 btree 인덱스가 아닙니다"
@@ -1831,7 +1880,7 @@ msgstr ""
 "이 문제는 9.3 버전 이하 환경에서 VACUUM 작업이 중지되고, 그 상태로 업그레이드"
 "되었을 가능성이 큽니다.  해당 인덱스를 다시 만드십시오."
 
-#: access/nbtree/nbtutils.c:5108
+#: access/nbtree/nbtutils.c:4196
 #, c-format
 msgid ""
 "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
@@ -1839,12 +1888,12 @@ msgstr ""
 "인덱스 행 크기(%zu)가 btree(%u 버전)의 최대값(%zu)을 초과함 (해당 인덱스: "
 "\"%s\")"
 
-#: access/nbtree/nbtutils.c:5114
+#: access/nbtree/nbtutils.c:4201
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "인덱스 로우가 %u,%u 튜플(해당 릴레이션 \"%s\")을 참조함."
 
-#: access/nbtree/nbtutils.c:5118
+#: access/nbtree/nbtutils.c:4205
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1854,7 +1903,7 @@ msgstr ""
 "버퍼 페이지의 1/3보다 큰 값은 인덱싱할 수 없습니다.\n"
 "값의 MD5 해시 함수 인덱스를 고려하거나 전체 텍스트 인덱싱을 사용하십시오."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function for "
@@ -1869,23 +1918,23 @@ msgstr ""
 msgid "cannot open relation \"%s\""
 msgstr "\"%s\" 릴레이션을 열 수 없음"
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid ""
 "compress method must be defined when leaf type is different from input type"
 msgstr "입력 자료형에서 리프 유형이 다를 때 압축 방법은 반드시 정의해야 함"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "SP-GiST 내부 튜플 크기가 초과됨: 현재값 %zu, 최대값 %zu"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr "%s 형이 SP-GiST 리프 자료형인데, 선언은 %s 형으로 했음"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function %d "
@@ -1894,27 +1943,27 @@ msgstr ""
 "\"%s\" 연산자 패밀리(접근 방법: %s)에 %d 지원 함수가 %s 자료형용으로 없습니"
 "다."
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "tid (%u, %u)가 바르지 않음, 해당 릴레이션: \"%s\""
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "\"%s\" 값은 비워 둘 수 없음"
 
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4858
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4879
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "\"%s\" 설정값이 너무 깁니다 (최대 %d 문자)"
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "\"%s\" 테이블 접근 방법이 없습니다"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "\"%s\" 테이블 접근 방법이 없습니다."
@@ -1945,7 +1994,7 @@ msgstr "운영 서버에서 \"%s\" 환경 설정 매개 변수를 설정했는
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "\"%s\" 환경 설정 매개 변수를 지정하세요."
 
-#: access/transam/multixact.c:1091
+#: access/transam/multixact.c:1097
 #, c-format
 msgid ""
 "database is not accepting commands that assign new MultiXactIds to avoid "
@@ -1954,8 +2003,8 @@ msgstr ""
 "\"%s\" 데이터베이스 자료 손실을 막기 위해 새로운 MultiXactId 만드는 작업을 "
 "더 이상 할 수 없습니다."
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1099 access/transam/multixact.c:1106
+#: access/transam/multixact.c:1130 access/transam/multixact.c:1139
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
@@ -1967,7 +2016,7 @@ msgstr ""
 "또한 오래된 트랜잭션을 커밋 또는 롤백하거나 잠긴 복제 슬롯을 지울 필요가 있습"
 "니다."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1104
 #, c-format
 msgid ""
 "database is not accepting commands that assign new MultiXactIds to avoid "
@@ -1976,7 +2025,7 @@ msgstr ""
 "%u OID 데이터베이스 자료 손실을 막기 위해 새로운 MultiXactId 만드는 작업을 "
 "더 이상 할 수 없습니다."
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1125 access/transam/multixact.c:2482
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural ""
@@ -1985,7 +2034,7 @@ msgstr[0] ""
 "\"%s\" 데이터베이스는 %u번의 트랜잭션이 발생되기 전에 VACUUM 작업을 해야 합니"
 "다."
 
-#: access/transam/multixact.c:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1134 access/transam/multixact.c:2491
 #, c-format
 msgid ""
 "database with OID %u must be vacuumed before %u more MultiXactId is used"
@@ -1995,12 +2044,12 @@ msgstr[0] ""
 "%u OID 데이터베이스는 %u번의 트랜잭션이 발생되기 전에 VACUUM 작업을 해야 합니"
 "다."
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1195
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "multixact \"회수\" 초과"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1196
 #, c-format
 msgid ""
 "This command would create a multixact with %u members, but the remaining "
@@ -2011,17 +2060,17 @@ msgid_plural ""
 msgstr[0] ""
 "이 명령은 %u 개의 multixact를 써야하는데, 쓸 수 있는 공간은 %u 개 뿐입니다."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1201
 #, 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."
+"\"vacuum_multixact_freeze_min_age\" and \"vacuum_multixact_freeze_table_age"
+"\" settings."
 msgstr ""
 "\"vacuum_multixact_freeze_min_age\", \"vacuum_multixact_freeze_table_age\" 값"
 "을 조정하고, %u OID 데이터베이스 대상으로 VACUUM 작업을 하십시오."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1232
 #, c-format
 msgid ""
 "database with OID %u must be vacuumed before %d more multixact member is used"
@@ -2032,28 +2081,28 @@ msgstr[0] ""
 "%u OID 데이터베이스는 %d 개의 멀티트랜잭션을 사용하기 전에 vacuum 작업을 해"
 "야 합니다."
 
-#: access/transam/multixact.c:1231
+#: access/transam/multixact.c:1237
 #, 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."
+"\"vacuum_multixact_freeze_min_age\" and \"vacuum_multixact_freeze_table_age"
+"\" settings."
 msgstr ""
 "\"vacuum_multixact_freeze_min_age\" 설정값과 "
 "\"vacuum_multixact_freeze_table_age\" 값을 줄여서 데이터베이스 단위로 VACUUM "
 "작업을 진행하세요."
 
-#: access/transam/multixact.c:1371
+#: access/transam/multixact.c:1377
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "%u번 MultiXactId 더이상 없음 -- 번호 겹침 현상 발생"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1383
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "%u번 MultiXactId를 만들 수 없음 -- 번호 겹침 현상 발생"
 
-#: access/transam/multixact.c:2479 access/transam/multixact.c:2488
+#: access/transam/multixact.c:2487 access/transam/multixact.c:2496
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in "
@@ -2066,7 +2115,7 @@ msgstr ""
 "또한 오래된 트랜잭션을 커밋 또는 롤백 하거나, 잠긴 복제 슬롯을 지울 필요가 있"
 "습니다."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2775
 #, c-format
 msgid ""
 "MultiXact member wraparound protections are disabled because oldest "
@@ -2075,19 +2124,19 @@ msgstr ""
 "가장 오래된 체크포인트 작업이 완료된 %u 멀티 트랜잭션 번호가 디스크에 없기 때"
 "문에, 멀티 트랜잭션 번호 겹침 방지 기능이 비활성화 되어 있습니다."
 
-#: access/transam/multixact.c:2789
+#: access/transam/multixact.c:2797
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "멀티 트랜잭션 번호 겹침 방지 기능이 활성화 되었음"
 
-#: access/transam/multixact.c:3180
+#: access/transam/multixact.c:3188
 #, c-format
 msgid ""
 "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr ""
 "가장 오래된 멀티 트랜잭션 번호는 %u, 가장 최신 것은 %u, truncate 작업 건너뜀"
 
-#: access/transam/multixact.c:3198
+#: access/transam/multixact.c:3206
 #, c-format
 msgid ""
 "cannot truncate up to MultiXact %u because it does not exist on disk, "
@@ -2096,41 +2145,41 @@ msgstr ""
 "디스크에 해당 멀티 트랜잭션 번호가 없어, %u 멀티 트랜잭션 번호로 truncate 못"
 "함, truncate 작업 건너뜀"
 
-#: access/transam/multixact.c:3517
+#: access/transam/multixact.c:3525
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "잘못된 MultiXactId: %u"
 
-#: access/transam/parallel.c:748 access/transam/parallel.c:867
+#: access/transam/parallel.c:752 access/transam/parallel.c:871
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "병렬 작업자 초기화 실패"
 
-#: access/transam/parallel.c:749 access/transam/parallel.c:868
+#: access/transam/parallel.c:753 access/transam/parallel.c:872
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "보다 자세한 내용은 서버 로그에 남겨졌을 수 있습니다."
 
-#: access/transam/parallel.c:929
+#: access/transam/parallel.c:933
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "병렬 트랜잭션 처리 중 postmaster 종료됨"
 
-#: access/transam/parallel.c:1116
+#: access/transam/parallel.c:1120
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "병렬 처리 작업자 프로세스 연결 끊김"
 
-#: access/transam/parallel.c:1172 access/transam/parallel.c:1174
+#: access/transam/parallel.c:1176 access/transam/parallel.c:1178
 msgid "parallel worker"
 msgstr "병렬 처리 작업자"
 
-#: access/transam/parallel.c:1344 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1348 replication/logical/applyparallelworker.c:890
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "동적 공유 메모리 세그먼트를 할당할 수 없음"
 
-#: access/transam/parallel.c:1349 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1353 replication/logical/applyparallelworker.c:896
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "동적 공유 메모리 세그먼트에 잘못된 매직 번호가 있음"
@@ -2201,63 +2250,63 @@ msgstr "\"%s\" 사용자 정의 자원 관리자가 %d ID로 등록됨"
 
 #: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
+msgid "\"%s\" must be a multiple of %d."
 msgstr "\"%s\" 값은 %d의 배수여야 함"
 
-#: access/transam/slru.c:830
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "\"%s\" 파일 없음, 0으로 읽음"
 
-#: access/transam/slru.c:1059 access/transam/slru.c:1065
-#: access/transam/slru.c:1073 access/transam/slru.c:1078
-#: access/transam/slru.c:1085 access/transam/slru.c:1090
-#: access/transam/slru.c:1097 access/transam/slru.c:1104
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "%u 트랜잭션의 상태를 액세스할 수 없음"
 
-#: access/transam/slru.c:1060
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "\"%s\" 파일을 열 수 없음: %m."
 
-#: access/transam/slru.c:1066
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "\"%s\" 파일에서 %d 위치를 찾을 수 없음: %m."
 
-#: access/transam/slru.c:1074
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "\"%s\" 파일에서 %d 위치를 읽을 수 없음: %m."
 
-#: access/transam/slru.c:1079
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "\"%s\" 파일에서 %d 위치를 읽을 수 없음: 너무 적은 바이트를 읽음."
 
-#: access/transam/slru.c:1086
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "\"%s\" 파일에서 %d 위치에 쓸 수 없음: %m."
 
-#: access/transam/slru.c:1091
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "\"%s\" 파일에서 %d 위치에 쓸 수 없음: 너무 적은 바이트를 씀."
 
-#: access/transam/slru.c:1098
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "\"%s\" 파일 fsync 실패: %m."
 
-#: access/transam/slru.c:1105
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "\"%s\" 파일을 닫을 수 없음: %m."
 
-#: access/transam/slru.c:1431
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "\"%s\" 디렉터리를 비울 수 없음: 랩어라운드 발생"
@@ -2322,12 +2371,12 @@ msgstr "\"max_prepared_transactions\" 설정값을 0이 아닌 값으로 설정
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "\"%s\" 이름의 트랜잭션 식별자가 이미 사용 중입니다"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2547
+#: access/transam/twophase.c:404 access/transam/twophase.c:2530
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "준비된 트랜잭션의 최대 개수를 모두 사용했습니다"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2548
+#: access/transam/twophase.c:405 access/transam/twophase.c:2531
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr "\"max_prepared_transactions\" 값을 늘려주세요 (현재 %d)."
@@ -2363,70 +2412,70 @@ msgstr "작업을 마치려면 그 준비된 트랜잭션이 있는 데이터베
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "\"%s\" 이름의 준비된 트랜잭션이 없습니다"
 
-#: access/transam/twophase.c:1190
+#: access/transam/twophase.c:1174
 #, c-format
 msgid "two-phase state file maximum length exceeded"
 msgstr "2단계 상태 파일 최대 길이를 초과함"
 
-#: access/transam/twophase.c:1345
+#: access/transam/twophase.c:1329
 #, c-format
 msgid "incorrect size of file \"%s\": %lld byte"
 msgid_plural "incorrect size of file \"%s\": %lld bytes"
 msgstr[0] "\"%s\" 파일 크기가 이상함: %lld 바이트"
 
-#: access/transam/twophase.c:1354
+#: access/transam/twophase.c:1338
 #, c-format
 msgid "incorrect alignment of CRC offset for file \"%s\""
 msgstr "\"%s\" 파일의 CRC 값 맞춤 실패"
 
-#: access/transam/twophase.c:1372
+#: access/transam/twophase.c:1356
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %lld"
 
-#: access/transam/twophase.c:1387
+#: access/transam/twophase.c:1371
 #, c-format
 msgid "invalid magic number stored in file \"%s\""
 msgstr "\"%s\" 파일에 잘못된 매직 번호가 저장되어 있음"
 
-#: access/transam/twophase.c:1393
+#: access/transam/twophase.c:1377
 #, c-format
 msgid "invalid size stored in file \"%s\""
 msgstr "\"%s\" 파일 크기가 이상함"
 
-#: access/transam/twophase.c:1405
+#: access/transam/twophase.c:1389
 #, c-format
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "계산된 CRC 체크섬 값이 파일에 \"%s\" 파일에 저장된 값과 다름"
 
-#: access/transam/twophase.c:1435 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:936 replication/logical/logical.c:211
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:571
+#: postmaster/walsummarizer.c:939 replication/logical/logical.c:213
+#: replication/walsender.c:812
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "WAL 읽기 프로세서를 할당하는 중에 오류 발생"
 
-#: access/transam/twophase.c:1445
+#: access/transam/twophase.c:1429
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X: %s"
 msgstr "two-phase 상태정보을 읽을 수 없음 WAL 위치: %X/%X, %s"
 
-#: access/transam/twophase.c:1450
+#: access/transam/twophase.c:1434
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X"
 msgstr "two-phase 상태정보을 읽을 수 없음 WAL 위치: %X/%X"
 
-#: access/transam/twophase.c:1458
+#: access/transam/twophase.c:1442
 #, c-format
 msgid "expected two-phase state data is not present in WAL at %X/%X"
 msgstr "WAL %X/%X 위치에 2단계 커밋 상태 자료가 없습니다"
 
-#: access/transam/twophase.c:1761
+#: access/transam/twophase.c:1744
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "\"%s\" 파일을 다시 만들 수 없음: %m"
 
-#: access/transam/twophase.c:1888
+#: access/transam/twophase.c:1871
 #, c-format
 msgid ""
 "%u two-phase state file was written for a long-running prepared transaction"
@@ -2435,48 +2484,48 @@ msgid_plural ""
 msgstr[0] ""
 "긴 실행 미리 준비된 트랜잭션 용 %u 개의 2단계 상태 파일이 저장되었음"
 
-#: access/transam/twophase.c:2123
+#: access/transam/twophase.c:2106
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "공유 메모리에서 %u 준비된 트랜잭션을 복구함"
 
-#: access/transam/twophase.c:2216
+#: access/transam/twophase.c:2199
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 오래된 two-phase 상태정보 파일을 삭제함"
 
-#: access/transam/twophase.c:2223
+#: access/transam/twophase.c:2206
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr ""
 "%u 트랜잭션에서 사용하는 오래된 two-phase 상태정보를 공유 메모리에서 삭제함"
 
-#: access/transam/twophase.c:2236
+#: access/transam/twophase.c:2219
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 future two-phase 상태정보 파일을 삭제함"
 
-#: access/transam/twophase.c:2243
+#: access/transam/twophase.c:2226
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 future two-phase 상태정보를 메모리에서 삭제함"
 
-#: access/transam/twophase.c:2268
+#: access/transam/twophase.c:2251
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 two-phase 상태정보 파일이 손상되었음"
 
-#: access/transam/twophase.c:2273
+#: access/transam/twophase.c:2256
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 메모리에 있는 two-phase 상태정보가 손상되었음"
 
-#: access/transam/twophase.c:2530
+#: access/transam/twophase.c:2513
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "%u 트랜잭션에서 사용하는 two-phase 상태정보 파일을 복구할 없음"
 
-#: access/transam/twophase.c:2532
+#: access/transam/twophase.c:2515
 #, c-format
 msgid ""
 "Two-phase state file has been found in WAL record %X/%X, but this "
@@ -2485,7 +2534,7 @@ msgstr ""
 "WAL 레코드 %X/%X 에서 2PC 상태 파일을 찾았지만, 그 트랜잭션은 이미 디스크에 "
 "기록한 상태입니다."
 
-#: access/transam/twophase.c:2540 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2523 storage/file/fd.c:511 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "\"%s\" 파일에 액세스할 수 없음: %m"
@@ -2544,134 +2593,128 @@ msgstr ""
 "또한 오래된 트랜잭션을 커밋 또는 롤백 하거나, 잠긴 복제 슬롯을 지울 필요가 있"
 "습니다."
 
-#: access/transam/xact.c:649
+#: access/transam/xact.c:652
 #, c-format
 msgid "cannot assign transaction IDs during a parallel operation"
 msgstr "병렬 처리 중에는 트랜잭션 ID를 지정할 수 없음"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "병렬 작업자는 자료 변경을 할 수 없음"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "병렬 처리 중에는 명령을 시작할 수 없음"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "하나의 트랜잭션 안에서는 2^32-2 개의 명령을 초과할 수 없음"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "커밋된 하위 트랜잭션 수(%d)가 최대치를 초과함"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr "임시 개체 대해 실행된 트랜잭션을 PREPARE할 수 없음"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "스냅샷으로 내보낸 트랜잭션은 PREPARE 작업을 할 수 없음"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3593
+#: access/transam/xact.c:3657
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s 명령은 트랜잭션 블럭안에서 실행할 수 없음"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3603
+#: access/transam/xact.c:3667
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s 명령은 서브트랜잭션 블럭안에서 실행할 수 없음"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s 절은 파이프라인에서 실행될 수 없음"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s 절은 함수에서 실행될 수 없음"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s 명령은 트랜잭션 블럭에서만 사용될 수 있음"
 
-#: access/transam/xact.c:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "이미 트랜잭션 작업이 진행 중입니다"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "현재 트랜잭션 작업을 하지 않고 있습니다"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "데이터베이스 트랜잭션을 commit 할 수 없음"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "병렬 작업 중에는 중지 할 수 없음"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "병렬 작업 중에는 savepoint 지정을 할 수 없음"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "병렬 작업 중에는 savepoint를 지울 수 없음"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "\"%s\" 이름의 저장위치가 없음"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr "현재 저장위치 수준에서 \"%s\" 이름의 저장위치가 없음"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "병렬 작업 중에는 savepoint 지정 취소 작업을 할 수 없음"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, c-format
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "하나의 트랜잭션 안에서는 2^32-1 개의 하위트랜잭션을 초과할 수 없음"
 
-#: access/transam/xlog.c:1542
+#: access/transam/xlog.c:1545
 #, c-format
 msgid ""
 "request to flush past end of generated WAL; request %X/%X, current position "
 "%X/%X"
 msgstr "생성된 WAL의 끝을 지난 flush 요청, 요청위치: %X/%X, 현재위치: %X/%X"
 
-#: access/transam/xlog.c:1769
+#: access/transam/xlog.c:1772
 #, c-format
 msgid ""
 "cannot read past end of generated WAL: requested %X/%X, current position %X/"
@@ -2679,67 +2722,62 @@ msgid ""
 msgstr ""
 "생성된 WAL의 끝을 지나서 읽을 수 없음: 요청위치: %X/%X, 현재위치: %X/%X"
 
-#: access/transam/xlog.c:2210 access/transam/xlog.c:4501
+#: access/transam/xlog.c:2219 access/transam/xlog.c:4548
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL 조각 파일은 1MB부터 1GB 사이 2^n 크기여야 합니다."
 
-#: access/transam/xlog.c:2228
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "바이너리 업그레이드 모드 중는 \"%s\" 값은 -1이어야 합니다."
-
-#: access/transam/xlog.c:2477
+#: access/transam/xlog.c:2455
 #, 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:3739 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3741 access/transam/xlogutils.c:820
+#: replication/walsender.c:3074
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "요청한 %s WAL 조각 파일은 이미 지워졌음"
 
-#: access/transam/xlog.c:4061
+#: access/transam/xlog.c:4063
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "\"%s\" 파일의 이름을 바꿀 수 없음: %m"
 
-#: access/transam/xlog.c:4104 access/transam/xlog.c:4115
-#: access/transam/xlog.c:4136
+#: access/transam/xlog.c:4106 access/transam/xlog.c:4117
+#: access/transam/xlog.c:4138
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "필요한 WAL 디렉터리 \"%s\"이(가) 없음"
 
-#: access/transam/xlog.c:4121 access/transam/xlog.c:4142
+#: access/transam/xlog.c:4123 access/transam/xlog.c:4144
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "누락된 WAL 디렉터리 \"%s\"을(를) 만드는 중"
 
-#: access/transam/xlog.c:4125 access/transam/xlog.c:4145
-#: commands/dbcommands.c:3262
+#: access/transam/xlog.c:4127 access/transam/xlog.c:4147
+#: commands/dbcommands.c:3301
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "누락된 \"%s\" 디렉터리를 만들 수 없음: %m"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4214
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "비밀 인증 토큰을 만들 수 없음"
 
-#: access/transam/xlog.c:4363 access/transam/xlog.c:4373
-#: access/transam/xlog.c:4399 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4415 access/transam/xlog.c:4421
-#: access/transam/xlog.c:4429 access/transam/xlog.c:4437
-#: access/transam/xlog.c:4445 access/transam/xlog.c:4453
-#: access/transam/xlog.c:4461 access/transam/xlog.c:4469
-#: access/transam/xlog.c:4479 access/transam/xlog.c:4487
-#: utils/init/miscinit.c:1812
+#: access/transam/xlog.c:4392 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4428 access/transam/xlog.c:4438
+#: access/transam/xlog.c:4448 access/transam/xlog.c:4454
+#: access/transam/xlog.c:4464 access/transam/xlog.c:4474
+#: access/transam/xlog.c:4484 access/transam/xlog.c:4494
+#: access/transam/xlog.c:4504 access/transam/xlog.c:4514
+#: access/transam/xlog.c:4526 access/transam/xlog.c:4534
+#: utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "데이터베이스 파일들이 서버와 호환성이 없습니다"
 
-#: access/transam/xlog.c:4364
+#: access/transam/xlog.c:4393
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
@@ -2748,7 +2786,7 @@ msgstr ""
 "데이터베이스 클러스터는 PG_CONTROL_VERSION %d (0x%08x)(으)로 초기화되었지만 "
 "서버는 PG_CONTROL_VERSION %d (0x%08x)(으)로 컴파일되었습니다."
 
-#: access/transam/xlog.c:4368
+#: access/transam/xlog.c:4397
 #, c-format
 msgid ""
 "This could be a problem of mismatched byte ordering.  It looks like you need "
@@ -2756,7 +2794,7 @@ msgid ""
 msgstr ""
 "이것은 바이트 순서 불일치 문제일 수 있습니다.  initdb 작업이 필요해 보입니다."
 
-#: access/transam/xlog.c:4374
+#: access/transam/xlog.c:4403
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -2765,36 +2803,32 @@ msgstr ""
 "이 데이터베이스 클러스터는 PG_CONTROL_VERSION %d 버전으로 초기화 되었지만, 서"
 "버는 PG_CONTROL_VERSION %d 버전으로 컴파일 되어있습니다."
 
-#: access/transam/xlog.c:4377 access/transam/xlog.c:4403
-#: access/transam/xlog.c:4411 access/transam/xlog.c:4417
+#: access/transam/xlog.c:4406 access/transam/xlog.c:4434
+#: access/transam/xlog.c:4444 access/transam/xlog.c:4450
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "initdb 명령이 필요한 듯 합니다"
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4418
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "컨트롤 파일에 잘못된 체크섬 값이 있습니다"
 
-#: access/transam/xlog.c:4400
-#, c-format
-msgid ""
-"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
-"server was compiled with CATALOG_VERSION_NO %d."
-msgstr ""
-"이 데이터베이스 클러스터는 CATALOG_VERSION_NO %d 버전으로 초기화 되었지만, 서"
-"버는 CATALOG_VERSION_NO %d 버전으로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4408
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4430 access/transam/xlog.c:4440
+#: access/transam/xlog.c:4456 access/transam/xlog.c:4466
+#: access/transam/xlog.c:4476 access/transam/xlog.c:4486
+#: access/transam/xlog.c:4496 access/transam/xlog.c:4506
+#: access/transam/xlog.c:4516
 #, c-format
 msgid ""
-"The database cluster was initialized with MAXALIGN %d, but the server was "
-"compiled with MAXALIGN %d."
+"The database cluster was initialized with %s %d, but the server was compiled "
+"with %s %d."
 msgstr ""
-"이 데이터베이스 클러스터는 MAXALIGN %d (으)로 초기화 되었지만, 서버는 "
-"MAXALIGN %d (으)로 컴파일 되어있습니다."
+"이 데이터베이스 클러스터는 %s %d (으)로 초기화 되었지만, 서버는 %s %d (으)로 "
+"컴파일 되어있습니다."
 
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4449
 #, c-format
 msgid ""
 "The database cluster appears to use a different floating-point number format "
@@ -2803,81 +2837,18 @@ msgstr ""
 "데이터베이스 클러스터와 서버 실행 파일이 서로 다른 부동 소수점 숫자 형식을 사"
 "용하고 있습니다."
 
-#: access/transam/xlog.c:4422
-#, c-format
-msgid ""
-"The database cluster was initialized with BLCKSZ %d, but the server was "
-"compiled with BLCKSZ %d."
-msgstr ""
-"이 데이터베이스 클러스터는 BLCKSZ %d (으)로 초기화 되었지만, 서버는 BLCKSZ "
-"%d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4425 access/transam/xlog.c:4433
-#: access/transam/xlog.c:4441 access/transam/xlog.c:4449
-#: access/transam/xlog.c:4457 access/transam/xlog.c:4465
-#: access/transam/xlog.c:4473 access/transam/xlog.c:4482
-#: access/transam/xlog.c:4490
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4480 access/transam/xlog.c:4490
+#: access/transam/xlog.c:4500 access/transam/xlog.c:4510
+#: access/transam/xlog.c:4520 access/transam/xlog.c:4529
+#: access/transam/xlog.c:4537
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr ""
 "서버를 새로 컴파일 하거나 initdb 명령을 사용해 새로 데이터베이스 클러스터를 "
 "다시 만들거나 해야할 것 같습니다."
 
-#: access/transam/xlog.c:4430
-#, c-format
-msgid ""
-"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
-"compiled with RELSEG_SIZE %d."
-msgstr ""
-"이 데이터베이스 클러스터는 RELSEG_SIZE %d (으)로 초기화 되었지만, 서버는 "
-"RELSEG_SIZE %d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4438
-#, c-format
-msgid ""
-"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
-"compiled with XLOG_BLCKSZ %d."
-msgstr ""
-"이 데이터베이스 클러스터는 XLOG_BLCKSZ %d (으)로 초기화 되었지만, 서버는 "
-"XLOG_BLCKSZ %d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4446
-#, c-format
-msgid ""
-"The database cluster was initialized with NAMEDATALEN %d, but the server was "
-"compiled with NAMEDATALEN %d."
-msgstr ""
-"이 데이터베이스 클러스터는 NAMEDATALEN %d (으)로 초기화 되었지만, 서버는 "
-"NAMEDATALEN %d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4454
-#, c-format
-msgid ""
-"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
-"was compiled with INDEX_MAX_KEYS %d."
-msgstr ""
-"이 데이터베이스 클러스터는 INDEX_MAX_KEYS %d (으)로 초기화 되었지만, 서버는 "
-"INDEX_MAX_KEYS %d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4462
-#, c-format
-msgid ""
-"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
-"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr ""
-"데이터베이스 클러스터는 TOAST_MAX_CHUNK_SIZE %d(으)로 초기화되었지만 서버는 "
-"TOAST_MAX_CHUNK_SIZE %d(으)로 컴파일 되었습니다."
-
-#: access/transam/xlog.c:4470
-#, c-format
-msgid ""
-"The database cluster was initialized with LOBLKSIZE %d, but the server was "
-"compiled with LOBLKSIZE %d."
-msgstr ""
-"이 데이터베이스 클러스터는 LOBLKSIZE %d(으)로 초기화 되었지만, 서버는 "
-"LOBLKSIZE %d (으)로 컴파일 되어있습니다."
-
-#: access/transam/xlog.c:4480
+#: access/transam/xlog.c:4527
 #, c-format
 msgid ""
 "The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
@@ -2886,7 +2857,7 @@ msgstr ""
 "데이터베이스 클러스터는 USE_FLOAT8_BYVAL 없이 초기화되었지만, 서버는 "
 "USE_FLOAT8_BYVAL을 사용하여 컴파일되었습니다."
 
-#: access/transam/xlog.c:4488
+#: access/transam/xlog.c:4535
 #, c-format
 msgid ""
 "The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
@@ -2895,51 +2866,47 @@ msgstr ""
 "데이터베이스 클러스터는 USE_FLOAT8_BYVAL을 사용하여 초기화되었지만, 서버는 "
 "USE_FLOAT8_BYVAL 없이 컴파일되었습니다."
 
-#: access/transam/xlog.c:4497
+#: access/transam/xlog.c:4544
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "컨트롤 파일 안 잘못된 WAL 조각 크기 (%d 바이트)"
 
-#: access/transam/xlog.c:4510
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"min_wal_size\" 값은 \"wal_segment_size\" 값의 최소 2배 이상이어야 함"
-
-#: access/transam/xlog.c:4514
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4558 access/transam/xlog.c:4564
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"max_wal_size\" 값은 \"wal_segment_size\" 값의 최소 2배 이상이어야 함"
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "\"%s\" 값은 \"%s\"의 배수여야 함"
 
-#: access/transam/xlog.c:4662 catalog/namespace.c:4696
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 tcop/postgres.c:3715 utils/error/elog.c:2247
+#: access/transam/xlog.c:4726 catalog/namespace.c:4696
+#: commands/tablespace.c:1210 commands/user.c:2542 commands/variable.c:72
+#: replication/slot.c:2711 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "목록 문법이 틀렸습니다."
 
-#: access/transam/xlog.c:4708 commands/user.c:2545 commands/variable.c:173
-#: tcop/postgres.c:3731 utils/error/elog.c:2273
+#: access/transam/xlog.c:4772 commands/user.c:2558 commands/variable.c:173
+#: tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "알 수 없는 키워드: \"%s\""
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5195
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "bootstrap 트랜잭션 로그 파일을 쓸 수 없음: %m"
 
-#: access/transam/xlog.c:5137
+#: access/transam/xlog.c:5203
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "bootstrap 트랜잭션 로그 파일을 fsync할 수 없음: %m"
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5209
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "bootstrap 트랜잭션 로그 파일을 닫을 수 없음: %m"
 
-#: access/transam/xlog.c:5368
+#: access/transam/xlog.c:5434
 #, c-format
 msgid ""
 "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
@@ -2947,7 +2914,7 @@ msgstr ""
 "WAL 내용이 \"wal_level=minimal\" 설정으로 만들여졌습니다. 복구 작업을 계속 "
 "할 수 없음"
 
-#: access/transam/xlog.c:5369
+#: access/transam/xlog.c:5435
 #, c-format
 msgid ""
 "This happens if you temporarily set \"wal_level=minimal\" on the server."
@@ -2955,40 +2922,40 @@ msgstr ""
 "이 문제는 서버가 일시적으로 \"wal_level=minimal\" 설정으로 운영된 적이 있다"
 "면 발생합니다."
 
-#: access/transam/xlog.c:5370
+#: access/transam/xlog.c:5436
 #, c-format
 msgid ""
 "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "\"wal_level\" 값을 \"minimal\" 보다 높은 것으로 설정해서 백업하세요."
 
-#: access/transam/xlog.c:5435
+#: access/transam/xlog.c:5501
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "컨트롤 파일에 잘못된 체크포인트 위치가 있습니다"
 
-#: access/transam/xlog.c:5446
+#: access/transam/xlog.c:5512
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "데이터베이스 시스템 마지막 가동 중지 시각: %s"
 
-#: access/transam/xlog.c:5452
+#: access/transam/xlog.c:5518
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "복구 중 데이터베이스 시스템 마지막 가동 중지 시각: %s"
 
-#: access/transam/xlog.c:5458
+#: access/transam/xlog.c:5524
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr ""
 "데이터베이스 시스템 셧다운 작업이 비정상적으로 종료되었음; 마지막 운영시간: "
 "%s"
 
-#: access/transam/xlog.c:5464
+#: access/transam/xlog.c:5530
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "데이터베이스 시스템 복구하는 도중 비정상적으로 가동 중지된 시각: %s"
 
-#: access/transam/xlog.c:5466
+#: access/transam/xlog.c:5532
 #, c-format
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
@@ -2997,12 +2964,12 @@ msgstr ""
 "이 사태는 몇몇 데이터가 손상되었을 의미할 수도 있습니다. 확인해 보고, 필요하"
 "다면, 마지막 백업 자료로 복구해서 사용하세요."
 
-#: access/transam/xlog.c:5472
+#: access/transam/xlog.c:5538
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "데이터베이스 시스템이 로그 시간 %s에 복구 도중 중지 되었음"
 
-#: access/transam/xlog.c:5474
+#: access/transam/xlog.c:5540
 #, c-format
 msgid ""
 "If this has occurred more than once some data might be corrupted and you "
@@ -3011,22 +2978,22 @@ msgstr ""
 "이 사태로 몇몇 자료가 손상되었을 수도 있는데, 이런 경우라면,확인해 보고, 필요"
 "하다면, 마지막 백업 자료로 복구해서 사용하세요."
 
-#: access/transam/xlog.c:5480
+#: access/transam/xlog.c:5546
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "데이터베이스 시스템이 비정상적으로 종료되었음; 마지막 운영시간: %s"
 
-#: access/transam/xlog.c:5487
+#: access/transam/xlog.c:5553
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "컨트롤 파일에 잘못된 데이터베이스 클러스터 상태값이 있습니다"
 
-#: access/transam/xlog.c:5875
+#: access/transam/xlog.c:5941
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "온라인 백업 작업 끝나기전에 WAL 작업 종료됨"
 
-#: access/transam/xlog.c:5876
+#: access/transam/xlog.c:5942
 #, c-format
 msgid ""
 "All WAL generated while online backup was taken must be available at "
@@ -3035,121 +3002,119 @@ msgstr ""
 "온라인 백업 중 만들어진 WAL 조각 파일은 복구 작업에서 반드시 모두 있어야 합니"
 "다."
 
-#: access/transam/xlog.c:5880
+#: access/transam/xlog.c:5946
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL이 일치하는 복구 지점 앞에서 종료됨"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5992
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "지정한 새 타임라인 ID: %u"
 
-#: access/transam/xlog.c:5959
+#: access/transam/xlog.c:6025
 #, c-format
 msgid "archive recovery complete"
 msgstr "아카이브 복구 완료"
 
-#: access/transam/xlog.c:6612
+#: access/transam/xlog.c:6654
 #, c-format
 msgid "shutting down"
 msgstr "서비스를 멈추고 있습니다"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6651
+#: access/transam/xlog.c:6693
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "restartpoint 시작:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6663
+#: access/transam/xlog.c:6705
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "체크포인트 시작:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6728
+#: access/transam/xlog.c:6770
 #, c-format
 msgid ""
-"restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d "
-"removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; "
-"sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, "
-"estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+"restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d "
+"WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d "
+"s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; "
+"distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr ""
-"restartpoint 작업완료: %d개(%.1f%%) 버퍼 씀; %d개 WAL 파일 추가됨, %d개 지웠"
-"음, %d개 재활용; 쓰기시간: %ld.%03d s, 동기화시간: %ld.%03d s, 전체시간: %ld."
-"%03d s; 동기화 파일 개수: %d, 최장시간: %ld.%03d s, 평균시간: %ld.%03d s; 실"
-"제작업량: %d kB, 예상한작업량: %d kB; lsn=%X/%X, redo lsn=%X/%X"
+"restartpoint 작업완료: %d개(%.1f%%) 버퍼 씀, %d개 SLRU 버퍼 씀; %d개 WAL 파"
+"일 추가됨, %d개 지웠음, %d개 재활용; 쓰기시간: %ld.%03d s, 동기화시간: %ld."
+"%03d s, 전체시간: %ld.%03d s; 동기화 파일 개수: %d, 최장시간: %ld.%03d s, 평"
+"균시간: %ld.%03d s; 실제작업량: %d kB, 예상한작업량: %d kB; lsn=%X/%X, redo "
+"lsn=%X/%X"
 
-#: access/transam/xlog.c:6751
+#: access/transam/xlog.c:6794
 #, c-format
 msgid ""
-"checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d "
-"removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; "
-"sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, "
-"estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr ""
-"채크포인트 작업완료: %d개(%.1f%%) 버퍼 씀; %d개 WAL 파일 추가됨, %d개 지웠"
-"음, %d개 재활용; 쓰기시간: %ld.%03d s, 동기화시간: %ld.%03d s, 전체시간: %ld."
-"%03d s; 동기화 파일 개수: %d, 최장시간: %ld.%03d s, 평균시간: %ld.%03d s; 실"
-"제작업량: %d kB, 예상한작업량: %d kB; lsn=%X/%X, redo lsn=%X/%X"
+"checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d "
+"WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d "
+"s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; "
+"distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "체크포인트 작업완료: %d개(%.1f%%) 버퍼 씀, %d개 SLRU 버퍼 씀; %d개 WAL 파일 추가됨, %d개 지웠음, %d개 재활용; 쓰기시간: %ld.%03d s, 동기화시간: %ld.%03d s, 전체시간: %ld.%03d s; 동기화 파일 개수: %d, 최장시간: %ld.%03d s, 평균시간: %ld.%03d s; 실제작업량: %d kB, 예상한작업량: %d kB; lsn=%X/%X, redo lsn=%X/%X"
 
-#: access/transam/xlog.c:7233
+#: access/transam/xlog.c:7280
 #, c-format
 msgid ""
 "concurrent write-ahead log activity while database system is shutting down"
 msgstr "데이터베이스 시스템이 중지되는 동안 동시 트랜잭션 로그가 활성화 되었음"
 
-#: access/transam/xlog.c:7818
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "%X/%X에서 복구 작업 시작함"
 
-#: access/transam/xlog.c:7820
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "마지막 완료된 트랜잭션 기록 시간은 %s 입니다."
 
-#: access/transam/xlog.c:8082
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "\"%s\" 이름의 복구 위치는 %X/%X에 만들었음"
 
-#: access/transam/xlog.c:8289
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "온라인 백어이 취소되었음, 복구를 계속 할 수 없음"
 
-#: access/transam/xlog.c:8347
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "셧다운 체크포인트 레코드에 잘못된 타임라인 ID 값: %u (기대값: %u)"
 
-#: access/transam/xlog.c:8405
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "온라인 체크포인트 레코드에 잘못된 타임라인 ID 값: %u (기대값: %u)"
 
-#: access/transam/xlog.c:8434
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "복구끝 레코드에 잘못된 타임라인 ID 값: %u (기대값: %u)"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "\"%s\" write-through 파일을 fsync할 수 없음: %m"
 
-#: access/transam/xlog.c:8710
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "\"%s\" 파일 fdatasync 실패: %m"
 
-#: access/transam/xlog.c:8797 access/transam/xlog.c:9133
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "온라인 백업 작업을 하기 위한 WAL 수준이 충분치 않습니다."
 
-#: access/transam/xlog.c:8798 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid ""
 "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
@@ -3157,12 +3122,12 @@ msgstr ""
 "\"wal_level\" 값을 \"replica\" 또는 \"logical\"로 지정하고 서버를 실행하십시"
 "오."
 
-#: access/transam/xlog.c:8803
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "백업 라벨 이름이 너무 긺(최대 %d 바이트)"
 
-#: access/transam/xlog.c:8924
+#: access/transam/xlog.c:8984
 #, c-format
 msgid ""
 "WAL generated with \"full_page_writes=off\" was replayed since last "
@@ -3171,7 +3136,7 @@ msgstr ""
 "마지막 재시작 위치부터 재반영된 WAL 내용이 \"full_page_writes=off\" 설정으로 "
 "만들어진 내용입니다."
 
-#: access/transam/xlog.c:8926 access/transam/xlog.c:9222
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, c-format
 msgid ""
 "This means that the backup being taken on the standby is corrupt and should "
@@ -3182,28 +3147,22 @@ msgstr ""
 "\"full_page_writes\" 설정을 활성화 하고, 주 서버에서 CHECKPOINT 명령을 실행하"
 "고, 온라인 백업을 다시 해서 사용하세요."
 
-#: access/transam/xlog.c:9006 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "\"%s\" 심볼릭 링크 파일을 읽을 수 없음: %m"
 
-#: access/transam/xlog.c:9013 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "\"%s\" 심볼릭 링크의 대상이 너무 긺"
 
-#: access/transam/xlog.c:9134
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr ""
-"wal_level 값을 \"replica\" 또는 \"logical\"로 지정하고 서버를 실행하십시오."
-
-#: access/transam/xlog.c:9172 backup/basebackup.c:1281
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "대기 서버가 온라인 백업 중 주 서버로 전환되었습니다"
 
-#: access/transam/xlog.c:9173 backup/basebackup.c:1282
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, c-format
 msgid ""
 "This means that the backup being taken is corrupt and should not be used. "
@@ -3212,7 +3171,7 @@ msgstr ""
 "이런 경우, 해당 백업 자료가 손상되었을 가능성이 있습니다. 다른 백업본을 이용"
 "하세요."
 
-#: access/transam/xlog.c:9220
+#: access/transam/xlog.c:9280
 #, c-format
 msgid ""
 "WAL generated with \"full_page_writes=off\" was replayed during online backup"
@@ -3220,14 +3179,14 @@ msgstr ""
 "온라인 백업 도중 \"full_page_writes=off\" 설정으로 만들어진 WAL 내용이 재반영"
 "되었습니다."
 
-#: access/transam/xlog.c:9336
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr ""
 "베이스 백업이 끝났습니다. 필요한 WAL 조각 파일이 아카이브 되길 기다리고 있습"
 "니다."
 
-#: access/transam/xlog.c:9350
+#: access/transam/xlog.c:9410
 #, c-format
 msgid ""
 "still waiting for all required WAL segments to be archived (%d seconds "
@@ -3235,7 +3194,7 @@ msgid ""
 msgstr ""
 "필요한 WAL 조각 파일 아카이빙이 완료되기를 계속 기다리고 있음 (%d초 경과)"
 
-#: access/transam/xlog.c:9352
+#: access/transam/xlog.c:9412
 #, c-format
 msgid ""
 "Check that your \"archive_command\" is executing properly.  You can safely "
@@ -3245,12 +3204,12 @@ msgstr ""
 "\"archive_command\" 설정을 살펴보세요.  이 백업 작업은 안전하게 취소 할 수 있"
 "지만, 데이터베이스 백업은 모든 WAL 조각 없이는 사용될 수 없습니다."
 
-#: access/transam/xlog.c:9359
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "모든 필요한 WAL 조각들이 아카이브 되었습니다."
 
-#: access/transam/xlog.c:9363
+#: access/transam/xlog.c:9423
 #, c-format
 msgid ""
 "WAL archiving is not enabled; you must ensure that all required WAL segments "
@@ -3260,7 +3219,7 @@ msgstr ""
 "모든 WAL 조각 파일들을 직접 찾아서 따로 보관해 두어야 바르게 복구 할 수 있습"
 "니다."
 
-#: access/transam/xlog.c:9402
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr ""
@@ -3304,35 +3263,35 @@ msgstr "\"%s\" archive status 파일을 만들 수 없습니다: %m"
 msgid "could not write archive status file \"%s\": %m"
 msgstr "\"%s\" archive status 파일에 쓸 수 없습니다: %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "이미 이 세션에서 백업 작업이 진행 중입니다"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "현재 백업 작업을 하지 않고 있습니다"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "pg_backup_start() 함수를 호출했나요?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "WAL 제어 함수는 복구 작업 중에는 실행 될 수 없음"
 
-#: access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "복구 작업 중에는 %s 명령을 실행할 수 없습니다."
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid ""
 "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
@@ -3340,140 +3299,140 @@ msgstr ""
 "pg_log_standby_snapshot() 함수는 \"wal_level\" >= \"replica\" 상태에서 사용"
 "될 수 있습니다."
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "WAL 수준이 복원 위치를 만들 수 없는 수준입니다"
 
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "복원 위치 이름이 너무 깁니다. (최대값, %d 글자)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "잘못된 WAL 파일 이름: \"%s\""
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "현재 복구 작업 상태가 아닙니다"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr "복구 제어 함수는 복구 작업일 때만 실행할 수 있습니다."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "대기 서버가 운영 서버로 전환 중입니다."
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s 함수는 운영 전환 중에는 실행될 수 없음."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "\"wait_seconds\" 값은 음수나 0을 사용할 수 없음"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "postmaster로 시그널 보내기 실패: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "postmaster의 예상치 못한 종료로 연결을 종료합니다"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
 msgstr "주 서버로 전환하는 것을 기다리는 중"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
 msgstr[0] "%d 초 이내에 운영 전환을 하지 못했습니다."
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
 msgid ""
-"\"recovery_prefetch\" is not supported on platforms that lack "
-"posix_fadvise()."
+"\"recovery_prefetch\" is not supported on platforms that lack support for "
+"issuing read-ahead advice."
 msgstr ""
-"이 OS는 posix_fadvise() 함수를 지원하지 않아, \"recovery_prefetch\" 설정을 지"
-"원하지 않습니다."
+"이 OS는 미리 읽기 기능을 지원하지 않아, \"recovery_prefetch\" 기능을 사용할 "
+"수 없습니다."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 오프셋: 위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "%X/%X에서 contrecord를 필요로 함"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 길이: 위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "%X/%X 위치에 contrecord 플래그가 없음"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "잘못된 contrecord 길이 %u (기대값: %lld), 위치 %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "잘못된 자원 관리 ID %u, 위치: %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "레코드의 잘못된 프리링크 %X/%X, 해당 레코드 %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "잘못된 자원관리자 데이터 체크섬, 위치: %X/%X 레코드"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "%04X 매직 번호가 잘못됨, WAL 조각 파일 %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 정보 비트 %04X, WAL 조각 파일 %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
-"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %llu, "
-"pg_control 의 식별자는 %llu"
+"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %<PRIu64>, "
+"pg_control 의 식별자는 %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -3482,7 +3441,7 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더에 지정된 값이 잘"
 "못된 조각 크기임"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -3491,12 +3450,12 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더의 XLOG_BLCKSZ 값"
 "이 바르지 않음"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 페이지 주소 %X/%X, WAL 조각 파일 %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -3505,22 +3464,22 @@ msgstr ""
 "타임라인 범위 벗어남 %u (이전 번호 %u), WAL 조각 파일 %s, LSN %X/%X, offset "
 "%u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "%u block_id는 범위를 벗어남, 위치 %X/%X"
 
-#: access/transam/xlogreader.c:1773
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA 지정했지만, %X/%X 에 자료가 없음"
 
-#: access/transam/xlogreader.c:1780
+#: access/transam/xlogreader.c:1800
 #, 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:1816
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -3529,19 +3488,19 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE 설정이 되어 있지만, 옵셋: %u, 길이: %u, 블록 이미지 길이: "
 "%u, 대상: %X/%X"
 
-#: access/transam/xlogreader.c:1832
+#: access/transam/xlogreader.c:1852
 #, 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:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED 설정이 되어 있지만, 블록 이미지 길이: %u, 대상: %X/%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -3550,68 +3509,68 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE, BKPIMAGE_COMPRESSED 지정 안되어 있으나, 블록 이미지 길이"
 "는 %u, 대상: %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL 설정이 되어 있지만, %X/%X 에 이전 릴레이션 없음"
 
-#: access/transam/xlogreader.c:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "잘못된 block_id %u, 위치 %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "잘못된 레코드 길이, 위치 %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "WAL 레코드에서 %d ID의 백업 블록을 찾을 수 없음"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "%X/%X 위치에 이미지를 복원할 수 없음 %d 블록이 잘못 지정됨"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "%X/%X 위치에 이미지를 복원할 수 없음, %d 블록의 상태가 이상함"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
 "block %d"
 msgstr "%X/%X 위치에 압축된 이미지 복원 실패, %s 지원 하지 않음, 해당 블록: %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "알 수 없는 방법으로 이미지 압축 복원 실패: 위치 %X/%X, 블록 %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "이미지 압축 풀기 실패, 위치 %X/%X, 블록 %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:623
 #, c-format
 msgid ""
 "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on "
 "timeline ID %u"
 msgstr "백업 복구 시작: 리두LSN=%X/%X, 체크포인트LSN=%X/%X, 타임라인ID=%u"
 
-#: access/transam/xlogrecovery.c:649
+#: access/transam/xlogrecovery.c:655
 #, c-format
 msgid ""
 "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "%X/%X 위치의 redo lsn을 찾을 수 없음: 참조하는 체크포인트 레코드=%X/%X"
 
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:657 access/transam/xlogrecovery.c:668
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/"
@@ -3628,91 +3587,93 @@ msgstr ""
 "주의: 백업 복원 작업을 하는데, \"%s/backup_label\" 파일을 지운다면, 클러스터"
 "가 손상 될 수 있습니다."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:666
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "요청된 체크포인트 레코드의 위치(%X/%X)를 잡을 수 없음"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:696 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "\"%s\" 심벌릭 링크를 만들 수 없음: %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:729 access/transam/xlogrecovery.c:735
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "\"%s\" 파일 무시함,  \"%s\" 파일 없음"
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:731
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿨습니다."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:737
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
 
-#: access/transam/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:776
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "\"%X/%X\" redo LSN에서 백업 복구 작업을 다시 시작합니다"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:801
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "%X/%X에서 바른 체크포인트 레코드를 잡을 수 없음"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:812
 #, c-format
 msgid "entering standby mode"
 msgstr "대기 모드로 전환합니다"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:815
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "%u XID까지 시점 기반 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:819
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "%s 까지 시점 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "\"%s\" 복구 대상 이름까지 시점 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:827
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "\"%X/%X\" 위치(LSN)까지 시점 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:831
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "동기화 할 수 있는 마지막 지점까지 시점 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting archive recovery"
 msgstr "아카이브 복구 작업을 시작합니다"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:855
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "요청한 %u 타임라인은 서버 타임라인의 하위가 아님"
 
-#: access/transam/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:858
 #, 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."
+"Latest checkpoint in file \"%s\" 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 ""
-"마지막 체크포인트 위치는 %X/%X (%u 타임라인)입니다. 하지만, 요청받은 타임라"
-"인 내역파일에는 그 타임라인 %X/%X 위치에서 분기되었습니다."
+"\"%s\" 파일의 마지막 체크포인트 위치는 %X/%X (%u 타임라인)입니다. 하지만, 요"
+"청받은 타임라인 내역파일에는 그 타임라인 %X/%X 위치에서 분기되었습니다."
 
-#: access/transam/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:873
 #, c-format
 msgid ""
 "requested timeline %u does not contain minimum recovery point %X/%X on "
@@ -3720,22 +3681,22 @@ msgid ""
 msgstr ""
 "요청한 %u 타임라인은 %X/%X 최소 복구 위치가 없습니다, 기존 타임라인: %u"
 
-#: access/transam/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:901
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "잘못된 다음 트랜잭션 ID"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:906
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "체크포인트 레코드 안에 잘못된 redo 정보가 있음"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "운영 중지 체크포인트에서 잘못된 재실행 정보 발견"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:946
 #, c-format
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
@@ -3743,18 +3704,18 @@ msgstr ""
 "데이터베이스 시스템이 정상적으로 종료되지 못했습니다, 자동 복구 작업을 진행합"
 "니다"
 
-#: access/transam/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:950
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr ""
 "%u 타임라인으로 비정상 중지에 대한 복구작업을 시작함, 기존 타임라인: %u"
 
-#: access/transam/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:993
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label 파일 안에 컨트롤 파일과 일관성이 맞지 않는 자료가 있음"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:994
 #, c-format
 msgid ""
 "This means that the backup is corrupted and you will have to use another "
@@ -3763,22 +3724,22 @@ msgstr ""
 "이 문제는 백업 자료 자체가 손상 되었음을 말합니다. 다른 백업본으로 복구 작업"
 "을 진행해야 합니다."
 
-#: access/transam/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1048
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "\"%s\" 복구 명령 파일을 사용하는 것을 지원하지 않습니다"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1113
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr "단일 사용자 서버를 대상으로 대기 모드를 사용할 수 없습니다."
 
-#: access/transam/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1130
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "\"primary_conninfo\" 설정도, \"restore_command\" 설정도 없음"
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1131
 #, c-format
 msgid ""
 "The database server will regularly poll the pg_wal subdirectory to check for "
@@ -3787,97 +3748,97 @@ msgstr ""
 "데이터베이스 서버는 일반적으로 주 서버에서 발생한 트랜잭션 로그를 반영하기 위"
 "해 pg_wal 하위 디렉터리를 조사할 것입니다."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1139
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr ""
 "대기 모드를 활성화 하지 않았다면(standby_mode = off), \"restore_command\" 설"
 "정은 반드시 있어야 함"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1177
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "%u 복구 대상 타임라인이 없음"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1260 access/transam/xlogrecovery.c:1267
+#: access/transam/xlogrecovery.c:1326 access/transam/xlogrecovery.c:1414
+#: access/transam/xlogrecovery.c:1423 access/transam/xlogrecovery.c:1443
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "\"%s\" 파일에 유효하지 않은 자료가 있습니다"
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1327
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "타임라인 ID가 %u 값으로 분석했지만, 기대값은 %u 임"
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "이것은 증분 백업 디렉터리로 데이터 디렉터리가 아님"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1339
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr ""
 "바른 데이터 디렉터리로 재구축하려면 pg_combinebackup 명령을 이용하세요."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1725
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "%X/%X redo 위치에 잘못된 레크드 형태가 발견됨"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1748
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "%X/%X에서 redo 작업 시작됨"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1761
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "redo 진행 중, 예상시간: %ld.%02d s, 현재 LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1851
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "요청한 복구 중지 지점이 일치하는 복구 지점 앞에 있음"
 
-#: access/transam/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1883
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "%X/%X에서 redo 작업 완료, 시스템 사용량: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1889
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "마지막 완료된 트랜잭션 기록 시간: %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1898
 #, c-format
 msgid "redo is not required"
 msgstr "재반영해야 할 트랜잭션이 없음"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1910
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "지정한 recovery target 도달 전에 복구 끝남"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2104
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "%X/%X에 빠진 contrecord를 건너뜀, %s에 덮어씀"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2171
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "잘못된 디렉터리 엔트리 \"%s\", 위치: %s"
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2173
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr "pg_tblspc/ 안 모든 디렉터리 엔트리는 심볼릭 링크여야 함"
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "%s/ 안 모든 디렉터리 엔트리는 심볼릭 링크여야 함"
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2175
 #, c-format
 msgid ""
 "Remove those directories, or set \"allow_in_place_tablespaces\" to ON "
@@ -3886,23 +3847,23 @@ msgstr ""
 "그 디렉터리를 지우든가, \"allow_in_place_tablespaces\" 설정을 ON으로 바꿔 임"
 "시로 복구 작업을 완료하든가 하세요."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2227
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "redo LSN %X/%X 부터 end LSN %X/%X 까지 백업 복구 완료"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2258
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "%X/%X 위치에서 복구 일관성을 맞춤"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2296
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "WAL redo 위치: %X/%X, 대상: %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2394
 #, c-format
 msgid ""
 "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint "
@@ -3910,12 +3871,12 @@ msgid ""
 msgstr ""
 "체크포인트 레코드에 예기치 않은 이전 타임라인ID %u(현재 타임라인ID: %u)"
 
-#: access/transam/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2403
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "체크포인트 레코드에 예기치 않은 타임라인 ID %u이(가) 있음(%u 뒤)"
 
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2419
 #, c-format
 msgid ""
 "unexpected timeline ID %u in checkpoint record, before reaching minimum "
@@ -3924,113 +3885,113 @@ msgstr ""
 "체크포인트 내역 안에 %u 타임라인 ID가 기대한 것과 다릅니다. 발생 위치: %X/%X "
 "(타임라인: %u) 최소 복구 위치 이전"
 
-#: access/transam/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2603 access/transam/xlogrecovery.c:2879
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "일관성을 다 맞추어 복구 작업을 중지합니다."
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2624
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "복구 중지 위치(LSN): \"%X/%X\" 이전"
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2714
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "%u 트랜잭션 커밋 전 복구 중지함, 시간 %s"
 
-#: access/transam/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2721
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "%u 트랜잭션 중단 전 복구 중지함, 시간 %s"
 
-#: access/transam/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2774
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "복구 중지함, 복구 위치 \"%s\", 시간 %s"
 
-#: access/transam/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2792
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "복구 중지 위치(LSN): \"%X/%X\" 이후"
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2859
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "%u 트랜잭션 커밋 후 복구 중지함, 시간 %s"
 
-#: access/transam/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2867
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "%u 트랜잭션 중단 후 복구 중지함, 시간 %s"
 
-#: access/transam/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2948
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "복구 끝에 기다리는 중"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2949
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "운영 서버로 바꾸려면, pg_wal_replay_resume() 함수를 호출하세요."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4678
+#: access/transam/xlogrecovery.c:2952 access/transam/xlogrecovery.c:4698
 #, c-format
 msgid "recovery has paused"
 msgstr "복구 작업이 일시 중지 됨"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2953
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "계속 진행하려면, pg_wal_replay_resume() 함수를 호출하세요."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3216
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "예상치 못한 타임라인 ID %u, WAL 조각 파일: %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3432
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "%s WAL 조각에서 읽기 실패, LSN %X/%X, offset %u: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3439
 #, c-format
 msgid ""
 "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "%s WAL 조각에서 읽기 실패, LSN %X/%X, offset %u: read %d / %zu"
 
-#: access/transam/xlogrecovery.c:4060
+#: access/transam/xlogrecovery.c:4082
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "잘못된 checkpoint 위치"
 
-#: access/transam/xlogrecovery.c:4070
+#: access/transam/xlogrecovery.c:4092
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "잘못된 checkpoint 레코드"
 
-#: access/transam/xlogrecovery.c:4076
+#: access/transam/xlogrecovery.c:4098
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "checkpoint 레코드에서 잘못된 자원 관리자 ID 발견"
 
-#: access/transam/xlogrecovery.c:4084
+#: access/transam/xlogrecovery.c:4106
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "checkpoint 레코드에서 잘못된 xl_info 발견"
 
-#: access/transam/xlogrecovery.c:4090
+#: access/transam/xlogrecovery.c:4112
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "checkpoint 레코드 길이가 잘못되었음"
 
-#: access/transam/xlogrecovery.c:4144
+#: access/transam/xlogrecovery.c:4166
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "요청한 %u 타임라인은 %u 데이터베이스 시스템 타임라인의 하위가 아님"
 
-#: access/transam/xlogrecovery.c:4158
+#: access/transam/xlogrecovery.c:4180
 #, c-format
 msgid ""
 "new timeline %u forked off current database system timeline %u before "
@@ -4039,28 +4000,28 @@ msgstr ""
 "복구 위치까지 복구하기 전에 새 타임라인 %u번으로 분기됨, 기존 데이터베이스 타"
 "임라인: %u, 기대한 복구 위치 %X/%X"
 
-#: access/transam/xlogrecovery.c:4177
+#: access/transam/xlogrecovery.c:4199
 #, c-format
 msgid "new target timeline is %u"
 msgstr "새 대상 타임라인: %u"
 
-#: access/transam/xlogrecovery.c:4380
+#: access/transam/xlogrecovery.c:4400
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "WAL receiver 프로세스가 중지 요청을 받았습니다."
 
-#: access/transam/xlogrecovery.c:4440
+#: access/transam/xlogrecovery.c:4460
 #, c-format
 msgid "received promote request"
 msgstr "운영 전환 신호를 받았습니다."
 
-#: access/transam/xlogrecovery.c:4669
+#: access/transam/xlogrecovery.c:4689
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "불충분한 서버 설정으로 hot standby 서버를 운영할 수 없음"
 
-#: access/transam/xlogrecovery.c:4670 access/transam/xlogrecovery.c:4697
-#: access/transam/xlogrecovery.c:4727
+#: access/transam/xlogrecovery.c:4690 access/transam/xlogrecovery.c:4717
+#: access/transam/xlogrecovery.c:4747
 #, c-format
 msgid ""
 "%s = %d is a lower setting than on the primary server, where its value was "
@@ -4069,45 +4030,45 @@ msgstr ""
 "이 서버의 현재 %s = %d 설정은 주 서버의 설정값(%d)보다 낮게 설정 되어 있기 때"
 "문입니다."
 
-#: access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:4699
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "복구 후 멈춰 있을 수 없으면 서버는 종료될 것입니다."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4700
 #, c-format
 msgid ""
 "You can then restart the server after making the necessary configuration "
 "changes."
 msgstr "환경 설정을 바꾸어 서버를 다시 시작할 수 있습니다."
 
-#: access/transam/xlogrecovery.c:4691
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "운영 서버로 전환할 수 없습니다. 설정이 불충분합니다."
 
-#: access/transam/xlogrecovery.c:4701
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "필요한 설정을 바꾸어 서버를 다시 시작하세요."
 
-#: access/transam/xlogrecovery.c:4725
+#: access/transam/xlogrecovery.c:4745
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "복구 작업이 불충분한 설정으로 중지 되었습니다."
 
-#: access/transam/xlogrecovery.c:4731
+#: access/transam/xlogrecovery.c:4751
 #, c-format
 msgid ""
 "You can restart the server after making the necessary configuration changes."
 msgstr "필요한 설정을 바꾸어 서버를 다시 시작할 수 있습니다."
 
-#: access/transam/xlogrecovery.c:4773
+#: access/transam/xlogrecovery.c:4792
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "복구 대상을 다중 지정했음"
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4793
 #, c-format
 msgid ""
 "At most one of \"recovery_target\", \"recovery_target_lsn\", "
@@ -4118,28 +4079,27 @@ msgstr ""
 "\"recovery_target_time\", \"recovery_target_xid\" 이들 중 하나는 지정해야합니"
 "다."
 
-#: access/transam/xlogrecovery.c:4785
+#: access/transam/xlogrecovery.c:4804
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "이 값으로는 \"immediate\" 만 허용합니다."
 
-#: access/transam/xlogrecovery.c:4937 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4958
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "타임스탬프 값이 범위를 벗어났음: \"%s\""
+msgid "Timestamp out of range: \"%s\"."
+msgstr "타임스탬프 값이 범위를 벗어났음: \"%s\"."
 
-#: access/transam/xlogrecovery.c:4982
+#: access/transam/xlogrecovery.c:5003
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "\"recovery_target_timeline\" 값으로 잘못된 숫자입니다."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "%s WAL 조각에서 읽기 실패, offset %d: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr "%s WAL 조각에서 읽기 실패, 위치: %d, %d 읽음(전체: %d)"
@@ -4160,7 +4120,7 @@ msgstr "실패한 아카이브 명령: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "0x%X 예외로 인해 아카이브 명령이 종료됨"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3093
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
@@ -4176,133 +4136,133 @@ msgstr "%d번 시그널로 인해 아카이브 명령이 종료됨: %s"
 msgid "archive command exited with unrecognized status %d"
 msgstr "아카이브 명령이 인식할 수 없는 %d 상태로 종료됨"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "%u 타임라인이 끝이어야하는데, %u 타임라인임"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "시작 타임라인이 %u 여야하는데, %u 타임라인임"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "%u 시작 타임라인이 %u 타임라인 내역안에 없음"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "임시 파일을 되감을 수 없음"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "어떤 WAL 파일도 찾을 수 없음"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "\"%s\" WAL 파일 찾기 실패"
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "\"%s\" WAL 파일의 크기가 알맞지 않음"
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
 msgstr[0] "%lld 전체 체크섬 검사 실패"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "베이스 백업 중 체크섬 검사 실패"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "\"%s\" 옵션을 두 번 지정했습니다"
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "알 수 없는 체크포인트 종류: \"%s\""
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr "증분 백업은 summarize_wal=on 상태에서만 가능함"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr ""
 "%d 값은 \"%s\" 매개 변수의 값으로 타당한 범위(%d .. %d)를 벗어났습니다."
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "인식할 수 없는 메니페스트 옵션 \"%s\""
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "알 수 없는 압축 알고리즘: \"%s\""
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "인식할 수 없는 베이스 백업 옵션: \"%s\""
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "매니페스트 체크섬은 하나의 백업 메니페스트를 필요로 함"
 
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "타켓 지정 없이 타켓 세부정보를 지정할 수 없음"
 
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "\"%s\" 타켓은 타켓 세부정보를 지정할 수 없음"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "압축을 사용하지 않으면 압축 세부 정보를 지정할 수 없음"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "잘못된 압축 명세: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
 msgstr "증북 BASE_BACKUP 수행 전에 UPLOAD_MANIFEST 있어야 함"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "파일 또는 디렉터리 \"%s\"의 상태를 확인할 수 없음: %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "\"%s\" 특수 파일을 건너뜀"
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid ""
 "could not verify checksum in file \"%s\", block %u: read buffer size %d and "
@@ -4311,13 +4271,13 @@ msgstr ""
 "\"%s\" 파일(%u 블록)에서 체크섬 검사 실패: 읽기 버퍼(%d)와 페이지 크기(%d)가 "
 "서로 다름"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
 msgstr[0] "\"%s\" 파일에서 전체 %d 건 체크섬 검사 실패"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid ""
 "checksum verification failed in file \"%s\", block %u: calculated %X but "
@@ -4325,7 +4285,7 @@ msgid ""
 msgstr ""
 "\"%s\" 파일  체크섬 검사 실패(해당 블럭 %u): 계산된 체크섬 %X (기대값 %X)"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid ""
 "further checksum verification failures in file \"%s\" will not be reported"
@@ -4333,20 +4293,20 @@ msgstr ""
 "계속해서 발생하는 \"%s\"에서의 체크섬 검사 실패는 더 이상 보고하지 않을 것입"
 "니다."
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "tar 파일로 묶기에는 파일 이름이 너무 긺: \"%s\""
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, c-format
 msgid ""
 "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
 msgstr ""
-"tar 포멧을 사용하기에는 심볼릭 링크의 대상 경로가 너무 깁니다: 파일 이름 "
-"\"%s\", 대상 \"%s\""
+"tar 포멧을 사용하기에는 심볼릭 링크의 대상 경로가 너무 깁니다: 파일 이름 \"%s"
+"\", 대상 \"%s\""
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "\"%s\" 파일을 읽을 수 없음: %zd 읽음, 전체 %zu"
@@ -4361,44 +4321,44 @@ msgstr "gzip 압축 기능을 뺀 채로 서버가 만들어졌습니다."
 msgid "could not initialize compression library"
 msgstr "압축 라이브러리를 초기화할 수 없음"
 
-#: backup/basebackup_incremental.c:294
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
 msgstr "매니페스트에 필요한 WAL 범위가 없음"
 
-#: backup/basebackup_incremental.c:349
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "매니페스트에 있는 타임라인 %u번이 이 서버 백업 이력 파일에는 없음"
 
-#: backup/basebackup_incremental.c:414
+#: backup/basebackup_incremental.c:412
 #, c-format
 msgid ""
 "manifest requires WAL from initial timeline %u starting at %X/%X, but that "
 "timeline begins at %X/%X"
 msgstr ""
-"매니페스트에는 시작 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필요한데, "
-"그 타임라인은 %X/%X에 있음"
+"매니페스트에는 시작 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필"
+"요한데, 그 타임라인은 %X/%X에 있음"
 
-#: backup/basebackup_incremental.c:424
+#: backup/basebackup_incremental.c:422
 #, c-format
 msgid ""
 "manifest requires WAL from continuation timeline %u starting at %X/%X, but "
 "that timeline begins at %X/%X"
 msgstr ""
-"매니페스트에는 연결 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필요한데, "
-"그 타임라인은 %X/%X에 있음"
+"매니페스트에는 연결 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필"
+"요한데, 그 타임라인은 %X/%X에 있음"
 
-#: backup/basebackup_incremental.c:435
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid ""
 "manifest requires WAL from final timeline %u ending at %X/%X, but this "
 "backup starts at %X/%X"
 msgstr ""
-"매니페스트에는 최종 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필요한데, "
-"이 백업은 %X/%X에서 시작됨"
+"매니페스트에는 최종 타임라인이 %u번으로 %X/%X에 있다고 해서 그 WAL 파일이 필"
+"요한데, 이 백업은 %X/%X에서 시작됨"
 
-#: backup/basebackup_incremental.c:439
+#: backup/basebackup_incremental.c:437
 #, c-format
 msgid ""
 "This can happen for incremental backups on a standby if there was little "
@@ -4407,51 +4367,51 @@ msgstr ""
 "이 현상은 이전 백업 이후 DB 사용이 거의 없었는데, 대기 서버에서 증분 백업을 "
 "받는 경우 발생합니다."
 
-#: backup/basebackup_incremental.c:446
+#: backup/basebackup_incremental.c:444
 #, c-format
 msgid ""
 "manifest requires WAL from non-final timeline %u ending at %X/%X, but this "
 "server switched timelines at %X/%X"
 msgstr ""
-"매니페스트에는 %u 타임라인을 끝내는 것이 %X/%X에 있어 그 WAL 파일이 필요한데, "
-"서버는 %X/%X에서 타임라인이 바뀌었음"
+"매니페스트에는 %u 타임라인을 끝내는 것이 %X/%X에 있어 그 WAL 파일이 필요한"
+"데, 서버는 %X/%X에서 타임라인이 바뀌었음"
 
-#: backup/basebackup_incremental.c:527
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid ""
 "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no "
 "summaries for that timeline and LSN range exist"
 msgstr ""
-"WAL 요약 정보에서는 %u번 타임라인은 %X/%X에서 %X/%X까지인데, "
-"이 타임라인과 범위에 대한 요약을 못 찾음"
+"WAL 요약 정보에서는 %u번 타임라인은 %X/%X에서 %X/%X까지인데, 이 타임라인과 범"
+"위에 대한 요약을 못 찾음"
 
-#: backup/basebackup_incremental.c:534
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid ""
 "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the "
 "summaries for that timeline and LSN range are incomplete"
 msgstr ""
-"WAL 요약 정보에서는 %u번 타임라인은 %X/%X에서 %X/%X까지인데, "
-"이 타임라인과 범위에 대한 요약이 불완전함"
+"WAL 요약 정보에서는 %u번 타임라인은 %X/%X에서 %X/%X까지인데, 이 타임라인과 범"
+"위에 대한 요약이 불완전함"
 
-#: backup/basebackup_incremental.c:538
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "이 범위 안의 첫번째 요약푼 LSN은 %X/%X입니다."
 
-#: backup/basebackup_incremental.c:938
+#: backup/basebackup_incremental.c:934
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "백업 매니페이스 버전이 1인데, 이것은 증분 백업을 지원하지 않음"
 
-#: backup/basebackup_incremental.c:956
+#: backup/basebackup_incremental.c:952
 #, c-format
 msgid ""
-"system identifier in backup manifest is %llu, but database system identifier "
-"is %llu"
+"system identifier in backup manifest is %<PRIu64>, but database system "
+"identifier is %<PRIu64>"
 msgstr ""
-"백업 매니페스트에는 시스템 식별자 번호가 %llu인데, 데이터베이스 시스템 식별자는 "
-"%llu임"
+"백업 매니페스트에는 시스템 식별자 번호가 %<PRIu64>인데, 데이터베이스 시스템 "
+"식별자는 %<PRIu64>임"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -4475,10 +4435,10 @@ msgstr "서버에 백업 결과를 파일로 저장하려면, \"%s\" 롤 구성
 msgid "relative path not allowed for backup stored on server"
 msgstr "백업을 서버에 저장할 경로 이름으로 상대경로는 사용할 수 없습니다"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2233
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
@@ -4488,15 +4448,15 @@ msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "\"%s\" 디렉터리가 비어있지 않습니다."
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1178
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 액세스할 수 없습니다: %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:608 storage/smgr/md.c:630 storage/smgr/md.c:1123
 #, c-format
 msgid "Check free disk space."
 msgstr "디스크 여유 공간을 확인해 주십시오."
@@ -4534,26 +4494,31 @@ msgstr "long-distance 모드를 활성화 할 수 없음: %s"
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "잘못된 타임라인 번호 %lld"
+msgid "invalid timeline %<PRId64>"
+msgstr "잘못된 타임라인 번호 %<PRId64>"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s 인자는 첫번째로 와야합니다"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3946
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s 옵션은 해당 값을 지정해야 합니다"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3951
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s 옵션은 해당 값을 지정해야 합니다"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:763
+#: postmaster/postmaster.c:776
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "자제한 사항은 \"%s --help\" 명령으로 살펴보십시오.\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: 잘못된 명령행 인자\n"
@@ -4609,12 +4574,12 @@ msgstr "\"%s\"에 대한 일부 권한을 취소할 수 없음"
 msgid "grantor must be current user"
 msgstr "권한 수여자는 현재 사용자여야합니다"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:1055
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "릴레이션의 %s 권한은 잘못된 종류임"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:1059
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "시퀀스의 %s 권한은 잘못된 종류임"
@@ -4629,7 +4594,7 @@ msgstr "%s 권한은 데이터베이스에는 사용할 수 없은 권한 형태
 msgid "invalid privilege type %s for domain"
 msgstr "%s 권한은 도메인에서 유효하지 않음"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:1063
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "%s 권한은 함수에서 사용할 수 없은 권한 형태임"
@@ -4639,22 +4604,22 @@ msgstr "%s 권한은 함수에서 사용할 수 없은 권한 형태임"
 msgid "invalid privilege type %s for language"
 msgstr "%s 권한은 프로시주얼 언어에서 사용할 수 없은 권한 형태임"
 
-#: catalog/aclchk.c:504
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "%s 권한은 대형 개체에서 사용할 수 없은 권한 형태임"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1079
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "%s 권한은 스키마(schema)에서 사용할 수 없은 권한 형태임"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:1067
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "프로시져용 %s 권한 종류가 잘못됨"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:1071
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "루틴용 %s 권한 종류가 잘못됨"
@@ -4664,7 +4629,7 @@ msgstr "루틴용 %s 권한 종류가 잘못됨"
 msgid "invalid privilege type %s for tablespace"
 msgstr "%s 권한은 테이블스페이스에서 사용할 수 없은 권한 형태임"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1075
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "%s 권한은 자료형에서 사용할 수 없은 권한 형태임"
@@ -4689,91 +4654,92 @@ msgstr "잘못된 환경 설정 매개 변수용 권한 형태: %s"
 msgid "column privileges are only valid for relations"
 msgstr "칼럼 권한은 릴레이션에서만 유효함"
 
-#: catalog/aclchk.c:738 catalog/aclchk.c:3629 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "%u large object 없음"
-
-#: catalog/aclchk.c:1112
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "default privileges 설정은 칼럼 대상으로 할 수 없음"
 
-#: catalog/aclchk.c:1148
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "default privileges 변경 권한 없음"
 
-#: catalog/aclchk.c:1266
+#: catalog/aclchk.c:1211
 #, c-format
 msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
 msgstr "GRANT/REVOKE ON SCHEMAS 구문을 쓸 때는 IN SCHEMA 구문을 쓸 수 없음"
 
-#: catalog/aclchk.c:1617 catalog/catalog.c:659 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:951
-#: commands/sequence.c:1655 commands/tablecmds.c:7541 commands/tablecmds.c:7695
-#: commands/tablecmds.c:7745 commands/tablecmds.c:7819
-#: commands/tablecmds.c:7889 commands/tablecmds.c:8019
-#: commands/tablecmds.c:8148 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8343 commands/tablecmds.c:8470
-#: commands/tablecmds.c:8500 commands/tablecmds.c:8642
-#: commands/tablecmds.c:8735 commands/tablecmds.c:8869
-#: commands/tablecmds.c:8981 commands/tablecmds.c:12797
-#: commands/tablecmds.c:12989 commands/tablecmds.c:13150
-#: commands/tablecmds.c:14339 commands/tablecmds.c:16966 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3409
-#: parser/parse_utilcmd.c:3449 parser/parse_utilcmd.c:3491 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2812
+#: catalog/aclchk.c:1221
+#, c-format
+msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
+msgstr ""
+"GRANT/REVOKE ON LARGE OBJECTS 구문을 쓸 때는 IN SCHEMA 구문을 쓸 수 없음"
+
+#: catalog/aclchk.c:1575 catalog/catalog.c:684 catalog/heap.c:2621
+#: catalog/heap.c:2940 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1000
+#: commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929
+#: commands/tablecmds.c:8130 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8388 commands/tablecmds.c:8482
+#: commands/tablecmds.c:8585 commands/tablecmds.c:8751
+#: commands/tablecmds.c:8781 commands/tablecmds.c:8936
+#: commands/tablecmds.c:9039 commands/tablecmds.c:9173
+#: commands/tablecmds.c:9286 commands/tablecmds.c:14372
+#: commands/tablecmds.c:14575 commands/tablecmds.c:14736
+#: commands/tablecmds.c:15964 commands/tablecmds.c:18731 commands/trigger.c:948
+#: parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3662
+#: parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:209 statistics/attribute_stats.c:951
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "\"%s\" 칼럼은 \"%s\" 릴레이션(relation)에 없음"
 
-#: catalog/aclchk.c:1862
+#: catalog/aclchk.c:1820
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" 개체는 인덱스임"
 
-#: catalog/aclchk.c:1869 commands/tablecmds.c:14496 commands/tablecmds.c:17882
+#: catalog/aclchk.c:1827 commands/tablecmds.c:16121 commands/tablecmds.c:19650
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" 개체는 복합 자료형입니다"
 
-#: catalog/aclchk.c:1877 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17846 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1835 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19614 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\" 시퀀스가 아님"
 
-#: catalog/aclchk.c:1915
+#: catalog/aclchk.c:1873
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "\"%s\" 시퀀스는 USAGE, SELECT 및 UPDATE 권한만 지원함"
 
-#: catalog/aclchk.c:1932
+#: catalog/aclchk.c:1890
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "%s 권한은 테이블에서 사용할 수 없은 권한 형태임"
 
-#: catalog/aclchk.c:2097
+#: catalog/aclchk.c:2055
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "%s 권한 형식은 칼럼에서 유효하지 않음"
 
-#: catalog/aclchk.c:2110
+#: catalog/aclchk.c:2068
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "\"%s\" 시퀀스는 SELECT 열 권한만 지원함"
 
-#: catalog/aclchk.c:2301
+#: catalog/aclchk.c:2259
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "\"%s\" 프로시주얼 언어는 안전하지 못합니다"
 
-#: catalog/aclchk.c:2303
+#: catalog/aclchk.c:2261
 #, c-format
 msgid ""
 "GRANT and REVOKE are not allowed on untrusted languages, because only "
@@ -4782,448 +4748,446 @@ msgstr ""
 "안전하지 않은 프로시져 언어에 대해서는 GRANT 또는 REVOKE 작업을 허용하지 않습"
 "니다, 안전하지 않은 프로시져 언어는 슈퍼유저만 사용할 수 있기 때문입니다."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2412
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "배열형 자료형에 권한 설정을 할 수 없음"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2413
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "그 배열 요소에 해당하는 자료형에 대해서 접근 권한 설정을 하세요."
 
-#: catalog/aclchk.c:2459
+#: catalog/aclchk.c:2417
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "다중 범위 자료형에 권한 설정을 할 수 없음"
 
-#: catalog/aclchk.c:2460
+#: catalog/aclchk.c:2418
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "해당하는 범위 자료형에 대해서 접근 권한 설정을 하세요."
 
-#: catalog/aclchk.c:2467 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" 이름의 개체는 도메인이 아닙니다"
-
-#: catalog/aclchk.c:2653
+#: catalog/aclchk.c:2601
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "알 수 없는 권한 타입 \"%s\""
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2668
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "%s 집계함수에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2671
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "%s 정렬정의(collation) 접근 권한 없음"
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2674
 #, c-format
 msgid "permission denied for column %s"
 msgstr "%s 칼럼에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2729
+#: catalog/aclchk.c:2677
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "%s 문자코드변환규칙(conversion) 접근 권한 없음"
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2680
 #, c-format
 msgid "permission denied for database %s"
 msgstr "%s 데이터베이스 접근 권한 없음"
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2683
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "%s 도메인에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2686
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "%s 이벤트 트리거 접근 권한 없음"
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2689
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "%s 확장 모듈 접근 권한 없음"
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2692
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "%s 외부 데이터 래퍼 접근 권한 없음"
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2695
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "%s 외부 서버 접근 권한 없음"
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2698
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "%s 외부 테이블 접근 권한 없음"
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2701
 #, c-format
 msgid "permission denied for function %s"
 msgstr "%s 함수 접근 권한 없음"
 
-#: catalog/aclchk.c:2756
+#: catalog/aclchk.c:2704
 #, c-format
 msgid "permission denied for index %s"
 msgstr "%s 인덱스 접근 권한 없음"
 
-#: catalog/aclchk.c:2759
+#: catalog/aclchk.c:2707
 #, c-format
 msgid "permission denied for language %s"
 msgstr "%s 프로시주얼 언어 접근 권한 없음"
 
-#: catalog/aclchk.c:2762
+#: catalog/aclchk.c:2710
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "%s 대형 개체 접근 권한 없음"
 
-#: catalog/aclchk.c:2765
+#: catalog/aclchk.c:2713
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "%s 구체화된 뷰에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2768
+#: catalog/aclchk.c:2716
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "%s 연산자 클래스 접근 권한 없음"
 
-#: catalog/aclchk.c:2771
+#: catalog/aclchk.c:2719
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "%s 연산자 접근 권한 없음"
 
-#: catalog/aclchk.c:2774
+#: catalog/aclchk.c:2722
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "%s 연산자 패밀리 접근 권한 없음"
 
-#: catalog/aclchk.c:2777
+#: catalog/aclchk.c:2725
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "%s 환경 설정 매개 변수 접근 권한 없음"
 
-#: catalog/aclchk.c:2780
+#: catalog/aclchk.c:2728
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "%s 정책에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2783
+#: catalog/aclchk.c:2731
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "%s 프로시져에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2786
+#: catalog/aclchk.c:2734
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "%s 발행 접근 권한 없음"
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2737
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "%s 루틴에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2740
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "%s 스키마(schema) 접근 권한 없음"
 
-#: catalog/aclchk.c:2795 commands/sequence.c:654 commands/sequence.c:880
+#: catalog/aclchk.c:2743 commands/sequence.c:654 commands/sequence.c:880
 #: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
-#: commands/sequence.c:1799
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "%s 시퀀스 접근 권한 없음"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2746
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "%s 개체 통계정보 접근 권한 없음"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2749
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "%s 구독 접근 권한 없음"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2752
 #, c-format
 msgid "permission denied for table %s"
 msgstr "%s 테이블에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2755
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "%s 테이블스페이스 접근 권한 없음"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2758
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "%s 전문 검색 구성 접근 권한 없음"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2761
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "%s 전문 검색 사전 접근 권한 없음"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2764
 #, c-format
 msgid "permission denied for type %s"
 msgstr "%s 자료형 접근 권한 없음"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2767
 #, c-format
 msgid "permission denied for view %s"
 msgstr "%s 뷰에 대한 접근 권한 없음"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2803
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "%s 집계함수의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2806
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "%s 정렬정의(collation)의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2809
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "%s 문자코드변환규칙(conversion)의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2812
 #, c-format
 msgid "must be owner of database %s"
 msgstr "%s 데이터베이스의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2815
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "%s 도메인의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2818
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "%s 이벤트 트리거의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2821
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "%s 확장 모듈의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2824
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "%s 외부 데이터 래퍼의 소유주여야 함"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2827
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "%s 외부 서버의 소유주여야 함"
 
-#: catalog/aclchk.c:2882
+#: catalog/aclchk.c:2830
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "%s 외부 테이블의 소유주여야 함"
 
-#: catalog/aclchk.c:2885
+#: catalog/aclchk.c:2833
 #, c-format
 msgid "must be owner of function %s"
 msgstr "%s 함수의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2888
+#: catalog/aclchk.c:2836
 #, c-format
 msgid "must be owner of index %s"
 msgstr "%s 인덱스의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2891
+#: catalog/aclchk.c:2839
 #, c-format
 msgid "must be owner of language %s"
 msgstr "%s 프로시주얼 언어의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2894
+#: catalog/aclchk.c:2842
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "%s 대형 개체의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2897
+#: catalog/aclchk.c:2845
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "%s 구체화된 뷰의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2900
+#: catalog/aclchk.c:2848
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "%s 연산자 클래스의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2903
+#: catalog/aclchk.c:2851
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "%s 연산자의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2906
+#: catalog/aclchk.c:2854
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "%s 연산자 패밀리의 소유주여야 함"
 
-#: catalog/aclchk.c:2909
+#: catalog/aclchk.c:2857
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "%s 프로시져의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2912
+#: catalog/aclchk.c:2860
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "%s 발행의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2915
+#: catalog/aclchk.c:2863
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "%s 루틴의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2918
+#: catalog/aclchk.c:2866
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "%s 시퀀스의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2921
+#: catalog/aclchk.c:2869
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "%s 구독의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2924
+#: catalog/aclchk.c:2872
 #, c-format
 msgid "must be owner of table %s"
 msgstr "%s 테이블의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2927
+#: catalog/aclchk.c:2875
 #, c-format
 msgid "must be owner of type %s"
 msgstr "%s 자료형의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2930
+#: catalog/aclchk.c:2878
 #, c-format
 msgid "must be owner of view %s"
 msgstr "%s 뷰의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2933
+#: catalog/aclchk.c:2881
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "%s 스키마(schema)의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2936
+#: catalog/aclchk.c:2884
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "%s 통계정보 개체의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2887
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "%s 테이블스페이스의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:2942
+#: catalog/aclchk.c:2890
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "%s 전문 검색 구성의 소유주여야 함"
 
-#: catalog/aclchk.c:2945
+#: catalog/aclchk.c:2893
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "%s 전문 검색 사전의 소유주여야 함"
 
-#: catalog/aclchk.c:2959
+#: catalog/aclchk.c:2907
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "%s 릴레이션(relation)의 소유주여야만 합니다"
 
-#: catalog/aclchk.c:3005
+#: catalog/aclchk.c:2953
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\") 접근 권한 없음"
 
-#: catalog/aclchk.c:3162 catalog/aclchk.c:4170 catalog/aclchk.c:4201
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s (해당 OID %u) 없음"
-
-#: catalog/aclchk.c:3245 catalog/aclchk.c:3264
+#: catalog/aclchk.c:3187 catalog/aclchk.c:3206
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "%d번째 속성(해당 릴레이션 OID: %u)이 없음"
 
-#: catalog/aclchk.c:3302 catalog/aclchk.c:3365 catalog/aclchk.c:4004
+#: catalog/aclchk.c:3244 catalog/aclchk.c:3307 catalog/aclchk.c:3946
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "OID %u 릴레이션(relation) 없음"
 
-#: catalog/aclchk.c:3550
+#: catalog/aclchk.c:3492
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "OID %u 환경 설정 매개 변수 ACL이 없음"
 
-#: catalog/aclchk.c:3723 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3571 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "%u large object 없음"
+
+#: catalog/aclchk.c:3665 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1846
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "OID %u 스키마 없음"
 
-#: catalog/aclchk.c:3797 catalog/aclchk.c:3824 catalog/aclchk.c:3853
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3739 catalog/aclchk.c:3766 catalog/aclchk.c:3795
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "OID %u 자료형 없음"
 
-#: catalog/catalog.c:477
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 사용되지 않는 OID를 여전히 찾는 중"
 
-#: catalog/catalog.c:479
+#: catalog/catalog.c:506
 #, c-format
 msgid ""
-"OID candidates have been checked %llu time, but no unused OID has been found "
-"yet."
+"OID candidates have been checked %<PRIu64> time, but no unused OID has been "
+"found yet."
 msgid_plural ""
-"OID candidates have been checked %llu times, but no unused OID has been "
+"OID candidates have been checked %<PRIu64> times, but no unused OID has been "
 "found yet."
 msgstr[0] ""
-"OID 후보를 뽑기 위해 %llu 번 시도했지만, 아직 사용되지 않는 OID를 찾지 못함"
+"OID 후보를 뽑기 위해 %<PRIu64> 번 시도했지만, 아직 사용되지 않는 OID를 찾지 "
+"못함"
 
-#: catalog/catalog.c:504
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "\"%s\" 릴레이션의 새 OID를 %llu 시도 끝에 배정함"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural ""
+"new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "\"%s\" 릴레이션의 새 OID를 %<PRIu64> 시도 끝에 배정함"
 
-#: catalog/catalog.c:637 catalog/catalog.c:704
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "%s() 호출은 슈퍼유저만 할 수 있음"
 
-#: catalog/catalog.c:646
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() 함수는 시스템 카탈로그 대상 전용임"
 
-#: catalog/catalog.c:651 parser/parse_utilcmd.c:2270
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "\"%s\" 인덱스가 \"%s\" 테이블용이 아님"
 
-#: catalog/catalog.c:668
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "\"%s\" 칼럼은 oid 자료형이 아님"
 
-#: catalog/catalog.c:675
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "\"%s\" 인덱스는 \"%s\" 칼럼용 인덱스가 아님"
@@ -5271,15 +5235,16 @@ msgid "cannot drop %s because other objects depend on it"
 msgstr "기타 다른 개체들이 이 개체에 의존하고 있어, %s 삭제할 수 없음"
 
 #: catalog/dependency.c:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1459
-#: commands/tablecmds.c:15088 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 executor/execExprInterp.c:4655
-#: executor/execExprInterp.c:4663 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1432 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6825
-#: utils/misc/guc.c:6859 utils/misc/guc.c:6893 utils/misc/guc.c:6936
-#: utils/misc/guc.c:6978
+#: catalog/dependency.c:1171 commands/tablecmds.c:1519
+#: commands/tablecmds.c:16715 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:225 commands/view.c:441 executor/execExprInterp.c:5211
+#: executor/execExprInterp.c:5219 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1041 replication/slot.c:1635
+#: replication/syncrep.c:1079 storage/aio/method_io_uring.c:389
+#: storage/lmgr/deadlock.c:1137 storage/lmgr/proc.c:1525 utils/misc/guc.c:3166
+#: utils/misc/guc.c:3207 utils/misc/guc.c:3282 utils/misc/guc.c:6834
+#: utils/misc/guc.c:6868 utils/misc/guc.c:6902 utils/misc/guc.c:6945
+#: utils/misc/guc.c:6987
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -5307,56 +5272,80 @@ msgstr[0] "%d개의 다른 개체에 대한 관련 항목 삭제"
 msgid "constant of the type %s cannot be used here"
 msgstr "%s 자료형은 여기서 사용할 수 없음"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "\"%s\" transition 테이블은 영구 객체안에서 참조될 수 없음"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:221
+#: statistics/attribute_stats.c:593 statistics/attribute_stats.c:601
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "%d번째 칼럼이 없습니다. 해당 릴레이션: \"%s\""
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "\"%s.%s\" 만들 권한이 없음"
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "시스템 카탈로그 변경은 현재 허용하지 않습니다."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2495 commands/tablecmds.c:2917
-#: commands/tablecmds.c:7163
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014
+#: commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "한 테이블에 지정할 수 있는 최대 열 수는 %d입니다"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7432
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "\"%s\" 열 이름은 시스템 열 이름과 충돌합니다"
 
-#: catalog/heap.c:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "\"%s\" 칼럼 이름이 여러 번 지정됨"
 
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:579
+#: catalog/heap.c:575
 #, c-format
 msgid "partition key column %s has pseudo-type %s"
 msgstr "\"%s\" 파티션 키 칼럼은 %s 의사 자료형(pseudo-type)을 사용합니다"
 
-#: catalog/heap.c:584
+#: catalog/heap.c:580
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "\"%s\" 칼럼은 %s 의사 자료형(pseudo-type)을 사용합니다"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:595
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "\"%s\" 가상의 미리 계산된 칼럼은 도메인 자료형을 사용할 수 없음"
+
+#: catalog/heap.c:622
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "%s 복합 자료형은 자기 자신의 구성원으로 만들 수 없음"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "\"%s\" 가상의 미리 계산된 칼럼은 사용자 정의 자료형을 사용할 수 없음"
+
+#: catalog/heap.c:674 catalog/heap.c:3294
+#, c-format
+msgid ""
+"Virtual generated columns that make use of user-defined types are not yet "
+"supported."
+msgstr ""
+"사용자 정의 자료형을 사용하는 가상 계산된 칼럼은 아직 지원하지 않습니다."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:686
 #, c-format
 msgid ""
 "no collation was derived for partition key column %s with collatable type %s"
@@ -5364,27 +5353,27 @@ msgstr ""
 "\"%s\" 파티션 키 칼럼에 사용하는 %s 자료형에서 사용할 정렬규칙을 결정할 수없"
 "습니다."
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:505
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
 "\"%s\" 칼럼에 사용하는 %s 자료형에서 사용할 정렬규칙을 결정할 수 없습니다."
 
-#: catalog/heap.c:1161 catalog/index.c:899 commands/createas.c:401
-#: commands/tablecmds.c:4171
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "\"%s\" 이름의 릴레이션(relation)이 이미 있습니다"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "\"%s\" 자료형이 이미 있습니다"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1196
 #, c-format
 msgid ""
 "A relation has an associated type of the same name, so you must use a name "
@@ -5393,119 +5382,171 @@ msgstr ""
 "하나의 릴레이션은 그 이름과 같은 자료형과 관계합니다. 그래서, 이미 같은 이름"
 "의 자료형이 있다면 해당 릴레이션을 만들 수 없습니다. 다른 이름을 사용하세요."
 
-#: catalog/heap.c:1218
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, toast relfilenumber 값이 지정되지 않았습니다"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, pg_class 자료 OID 값이 지정되지 않았습니다"
 
-#: catalog/heap.c:1239
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, relfilenumber 값이 지정되지 않았습니다"
 
-#: catalog/heap.c:2130
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "\"%s\" 파티션 테이블에는 NO INHERIT 조건을 사용할 수 없음"
 
-#: catalog/heap.c:2402
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "\"%s\" 이름의 체크 제약 조건이 이미 있습니다"
 
-#: catalog/heap.c:2574 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9356
+#: catalog/heap.c:2626 catalog/heap.c:2946
+#, c-format
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "\"%s\" 시스템 칼럼에는 not null 제약 조건을 추가할 수 없음"
+
+#: catalog/heap.c:2653 catalog/heap.c:2779 catalog/heap.c:3030
+#: catalog/index.c:915 catalog/pg_constraint.c:1008 commands/tablecmds.c:9796
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr ""
 "\"%s\" 제약 조건이 이미 \"%s\" 릴레이션(relation)에서 사용되고 있습니다"
 
-#: catalog/heap.c:2581
+#: catalog/heap.c:2786
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr ""
 "\"%s\" 제약 조건이 비상속 제약 조건과 충돌합니다, 해당 릴레이션: \"%s\""
 
-#: catalog/heap.c:2592
+#: catalog/heap.c:2797
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr "\"%s\" 제약 조건이 상속 제약 조건과 충돌합니다, 해당 릴레이션: \"%s\""
 
-#: catalog/heap.c:2602
+#: catalog/heap.c:2807
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
 msgstr ""
 "\"%s\" 제약 조건이 NOT VALID 제약 조건과 충돌합니다, 해당 릴레이션: \"%s\""
 
-#: catalog/heap.c:2607
+#: catalog/heap.c:2819
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
+msgstr ""
+"\"%s\" 제약 조건이 NOT ENFORCED 제약 조건과 충돌합니다, 해당 릴레이션: \"%s\""
+
+#: catalog/heap.c:2824
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "\"%s\" 제약 조건을 상속된 정의와 병합하는 중"
 
-#: catalog/heap.c:2633 catalog/pg_constraint.c:853 commands/tablecmds.c:3074
-#: commands/tablecmds.c:3377 commands/tablecmds.c:7089
-#: commands/tablecmds.c:15907 commands/tablecmds.c:16038
+#: catalog/heap.c:2848 catalog/pg_constraint.c:786 catalog/pg_constraint.c:1137
+#: commands/tablecmds.c:3179 commands/tablecmds.c:3499
+#: commands/tablecmds.c:7286 commands/tablecmds.c:7967
+#: commands/tablecmds.c:17558 commands/tablecmds.c:17740
 #, c-format
 msgid "too many inheritance parents"
 msgstr "너무 많은 상속 부모"
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:2965 parser/parse_utilcmd.c:2655
+#, c-format
+msgid ""
+"conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr "\"%s\" 칼럼 대상 not null 제약 조건과 NO INHERIT 옵션이 충돌함"
+
+#: catalog/heap.c:2979
+#, c-format
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "두 이름의 not null 제약 조건이 이름에서 충돌함: \"%s\", \"%s\""
+
+#: catalog/heap.c:3009
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "\"%s\" 칼럼 대상 NO INHERIT 옵션이 not null 제약 조건과 충돌함"
+
+#: catalog/heap.c:3011
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "해당 칼럼 대상으로 상속된 not null 제약 조건이 있습니다."
+
+#: catalog/heap.c:3201
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
-msgstr "\"%s\" 계산된 칼럼은 칼럼 생성 표현식에서는 사용될 수 없음"
+msgstr "\"%s\" 미리 계산된 칼럼은 칼럼 생성식에서는 사용될 수 없음"
 
-#: catalog/heap.c:2719
+#: catalog/heap.c:3203
 #, c-format
 msgid "A generated column cannot reference another generated column."
-msgstr "계산된 칼럼은 다른 계산된 칼럼을 참조할 수 없음"
+msgstr "미리 계산된 칼럼은 다른 계산된 칼럼을 참조할 수 없음"
 
-#: catalog/heap.c:2725
+#: catalog/heap.c:3209
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
-msgstr "미리 계산된 칼럼 생성 표현식에 row 전체 변수는 사용할 수 없음"
+msgstr "미리 계산된 칼럼 생성식에 row 전체 변수는 사용할 수 없음"
 
-#: catalog/heap.c:2726
+#: catalog/heap.c:3210
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "이 오류는 미리 계산된 칼럼 자체를 그 칼럼 값으로 지정할 때 발생합니다."
 
-#: catalog/heap.c:2781
+#: catalog/heap.c:3277
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr ""
+"미리 계산된 칼럼을 위한 생성식에서 사용자 정의 함수를 사용하고 있습니다."
+
+#: catalog/heap.c:3278
+#, c-format
+msgid ""
+"Virtual generated columns that make use of user-defined functions are not "
+"yet supported."
+msgstr "가상 계산된 칼럼에는 사용자 정의 함수 사용을 아직 지원하지 않습니다."
+
+#: catalog/heap.c:3293
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "계산된 칼럼을 위한 생성식에서 사용자 정의 자료형을 사용하고 있습니다."
+
+#: catalog/heap.c:3345
 #, c-format
 msgid "generation expression is not immutable"
-msgstr "미리 계산되는 생성 표현식 결과가 immutable이 아님"
+msgstr "미리 계산되는 생성식 결과가 immutable이 아님"
 
-#: catalog/heap.c:2809 rewrite/rewriteHandler.c:1288
+#: catalog/heap.c:3377 rewrite/rewriteHandler.c:1285
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr ""
 "\"%s\" 칼럼의 자료형은 %s 인데, default 표현식에서는 %s 자료형을 사용했습니다"
 
-#: catalog/heap.c:2814 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1293
+#: catalog/heap.c:3382 commands/prepare.c:334 parser/analyze.c:2906
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1290
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "다시 정의하거나 형변환자를 사용해보십시오"
 
-#: catalog/heap.c:2861
+#: catalog/heap.c:3429
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "\"%s\" 테이블만이 체크 제약 조건에서 참조될 수 있습니다"
 
-#: catalog/heap.c:3167
+#: catalog/heap.c:3735
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "ON COMMIT 및 외래 키 조합이 지원되지 않음"
 
-#: catalog/heap.c:3168
+#: catalog/heap.c:3736
 #, c-format
 msgid ""
 "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
@@ -5513,113 +5554,113 @@ msgid ""
 msgstr ""
 "\"%s\" 테이블에서 \"%s\" 테이블을 참조하는데 ON COMMIT 설정이 같지 않습니다."
 
-#: catalog/heap.c:3173
+#: catalog/heap.c:3741
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr ""
 "_^_ 테이블 내용을 모두 삭제할 수 없음, 참조키(foreign key) 제약 조건 안에서"
 
-#: catalog/heap.c:3174
+#: catalog/heap.c:3742
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "\"%s\" 테이블은 \"%s\" 개체를 참조합니다."
 
-#: catalog/heap.c:3176
+#: catalog/heap.c:3744
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr ""
 "\"%s\" 테이블도 함께 자료를 지우거나, TRUNCATE ... CASCADE 구문을 사용하세요."
 
-#: catalog/index.c:219 parser/parse_utilcmd.c:2176
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "\"%s\" 테이블에는 이미 기본키가 있습니다"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "기본키(primary key)는 NULLS NOT DISTINCT 인덱스를 사용할 수 없음"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "기본키(primary key)를 표현할 수 없음"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "\"%s\" 파티션 키 칼럼에 NOT NULL 속성을 지정해야 함"
 
-#: catalog/index.c:798 catalog/index.c:1915
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "시스템 카탈로그 테이블에는 사용자 정의 인덱스를 지정할 수 없습니다"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr "\"%s\" 연산자 클래스용으로 자동 결정 가능한 정렬 규칙은 지원하지 않음"
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "시스템 카탈로그 테이블은 잠금 없는 인덱스 만들기는 지원하지 않습니다"
 
-#: catalog/index.c:862 catalog/index.c:1331
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr "exclusion 제약 조건용 잠금 없는 인덱스 만들기는 지원하지 않습니다"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr ""
 "공유되는 인덱스들은 initdb 명령으로 데이터베이스 클러스터를 만든 다음에는 만"
 "들 수 없습니다"
 
-#: catalog/index.c:891 commands/createas.c:416 commands/sequence.c:159
-#: parser/parse_utilcmd.c:209
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "\"%s\" 이름의 릴레이션(relation)이 이미 있습니다, 건너뜀"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, pg_class 인덱스 OID 값이 지정되지 않았습니다"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3791
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, 인덱스 relfilenumber 값이 지정되지 않았습니다"
 
-#: catalog/index.c:2214
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY 명령은 트랜잭션 내 가장 처음에 있어야 합니다"
 
-#: catalog/index.c:3668
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "임시 테이블의 인덱스 재생성 작업은 다른 세션에서 할 수 없음"
 
-#: catalog/index.c:3679 commands/indexcmds.c:3626
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "TOAST 테이블에 딸린 잘못된 인덱스에 대해 재색인 작업을 할 수 없음"
 
-#: catalog/index.c:3695 commands/indexcmds.c:3504 commands/indexcmds.c:3650
-#: commands/tablecmds.c:3581
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815
+#: commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "\"%s\" 시스템 릴레이션입니다. 이동할 수 없습니다"
 
-#: catalog/index.c:3832
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "\"%s\" 인덱스가 다시 만들어졌음"
 
-#: catalog/index.c:3998
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr ""
@@ -5627,7 +5668,7 @@ msgstr ""
 "음, 건너뜀"
 
 #: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
-#: commands/trigger.c:5731
+#: commands/trigger.c:5817
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "서로 다른 데이터베이스간의 참조는 구현되어있지 않습니다: \"%s.%s.%s\""
@@ -5647,19 +5688,20 @@ msgstr "\"%s.%s\" 릴레이션의 잠금 정보를 구할 수 없음"
 msgid "could not obtain lock on relation \"%s\""
 msgstr "\"%s\" 릴레이션의 잠금 정보를 구할 수 없음"
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
+#: statistics/stat_utils.c:231
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "\"%s.%s\" 이름의 릴레이션(relation)이 없습니다"
 
-#: catalog/namespace.c:638 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "\"%s\" 이름의 릴레이션(relation)이 없습니다"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1804
+#: commands/extension.c:1810
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "선택된 스키마 없음, 대상:"
@@ -5705,13 +5747,13 @@ msgstr "\"%s\" 전문 검색 템플릿이 없음"
 msgid "text search configuration \"%s\" does not exist"
 msgstr "\"%s\" 전문 검색 구성이 없음"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:868 parser/parse_target.c:1259
+#: catalog/namespace.c:3329 parser/parse_expr.c:866 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "서로 다른 데이터베이스간의 참조는 구현되어있지 않습니다: %s"
 
-#: catalog/namespace.c:3335 parser/parse_expr.c:875 parser/parse_target.c:1266
-#: gram.y:19181 gram.y:19221
+#: catalog/namespace.c:3335 parser/parse_expr.c:873 parser/parse_target.c:1269
+#: gram.y:19355 gram.y:19395
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "적당하지 않은 qualified 이름 입니다 (너무 많은 점이 있네요): %s"
@@ -5727,7 +5769,7 @@ msgid "cannot move objects into or out of TOAST schema"
 msgstr "TOAST 스키마로(에서) 개체를 이동할 수 없습니다"
 
 #: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1404 utils/adt/regproc.c:1688
+#: commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "\"%s\" 스키마(schema) 없음"
@@ -5763,243 +5805,249 @@ msgstr "복구 작업 중에는 임시 테이블을 만들 수 없음"
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "병렬 작업 중에 임시 테이블을 만들 수 없음"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2327
-#: commands/tablecmds.c:12925
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387
+#: commands/tablecmds.c:14510
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" 개체는 테이블이 아님"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17851 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19619 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" 개체는 뷰가 아님"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:199 commands/tablecmds.c:275
-#: commands/tablecmds.c:17856
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19624
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" 개체는 구체화된 뷰(materialized view)가 아닙니다"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17861
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19629
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" 개체는 외부 테이블이 아님"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "릴레이션과 개체 이름을 지정해야 합니다"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "칼럼 이름으로 적당하지 않습니다"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")의 기본값을 지정하지 않았음"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "\"%s\" 자료형 없음"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" 이름의 개체는 도메인이 아닙니다"
+
+#: catalog/objectaddress.c:1742
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "%d (%s, %s)  연산자(대상 %s) 없음"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "%d (%s, %s)  함수(대상 %s) 없음"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "\"%s\" 사용자에 대한 사용자 맵핑 정보(대상 서버: \"%s\")가 없음"
 
-#: catalog/objectaddress.c:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1004 commands/foreigncmds.c:1367
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "\"%s\" 이름의 서버가 없음"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "\"%s\" 발행 릴레이션은  \"%s\" 발행에 없습니다."
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "\"%s\" 발행 스키마는 \"%s\" 발행에 없습니다."
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "알 수 없는 기본 ACL 개체 타입 \"%c\""
 
-#: catalog/objectaddress.c:2007
+#: catalog/objectaddress.c:2015
 #, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
-msgstr "유효한 개체 형태는 \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgstr "유효한 개체 형태는 \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "\"%s\" 사용자용 기본 ACL 없음. (해당 스키마: \"%s\", 해당 개체: %s)"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "\"%s\" 사용자용 기본 ACL 없음. (해당 개체: %s)"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "이름이나 인자 목록에는 null이 포함되지 않아야 함"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "\"%s\" 형 지원하지 않음"
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "이름 목록 길이는 %d 이어야 합니다."
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "대형 개체 OID는 null 값을 사용할 수 없음"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "이름 목록 길이는 적어도 %d 개 이상이어야 함"
 
-#: catalog/objectaddress.c:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "인자 목록은 %d 개여야 함"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "%u 대경 개체의 소유주여야만 합니다"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "%s, %s 자료형의 소유주여야 합니다"
 
-#: catalog/objectaddress.c:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "권한 없음"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "현재 사용자는 %s 속성이 있어야합니다."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "현재 사용자는 %s 옵션을 지정해야함, 해당 롤: \"%s\""
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "슈퍼유져여야함"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "알 수 없는 개체 형태 \"%s\""
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2928
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr " %s 칼럼(%s 의)"
 
-#: catalog/objectaddress.c:2943
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "%s 함수"
 
-#: catalog/objectaddress.c:2956
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "%s 자료형"
 
-#: catalog/objectaddress.c:2993
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "%s 자료형을 %s 자료형으로 바꾸는 작업"
 
-#: catalog/objectaddress.c:3026
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "collation %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3057
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "%s 제약 조건(해당 개체: %s)"
 
-#: catalog/objectaddress.c:3063
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "%s 제약 조건"
 
-#: catalog/objectaddress.c:3095
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "%s 문자코드변환규칙"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3117
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "%s 용 기본값"
 
-#: catalog/objectaddress.c:3128
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "프로시주얼 언어 %s"
 
-#: catalog/objectaddress.c:3136
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "%u 대형 개체"
 
-#: catalog/objectaddress.c:3149
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "%s 연산자"
 
-#: catalog/objectaddress.c:3186
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "%s 연산자 클래스, %s 인덱스 액세스 방법"
 
-#: catalog/objectaddress.c:3214
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "%s 접근 방법"
@@ -6008,7 +6056,7 @@ msgstr "%s 접근 방법"
 #. 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:3269
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "%d (%s, %s) 연산자 (연산자 패밀리: %s): %s"
@@ -6017,239 +6065,244 @@ msgstr "%d (%s, %s) 연산자 (연산자 패밀리: %s): %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3334
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "%d (%s, %s) 함수 (연산자 패밀리: %s): %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3388
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "%s 룰(rule), 해당 테이블: %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3434
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "%s 트리거, 해당 테이블: %s"
 
-#: catalog/objectaddress.c:3454
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "%s 스키마"
 
-#: catalog/objectaddress.c:3482
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "%s 통계정보 개체"
 
-#: catalog/objectaddress.c:3513
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "%s 전문 검색 파서"
 
-#: catalog/objectaddress.c:3544
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "%s 전문 검색 사전"
 
-#: catalog/objectaddress.c:3575
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "%s 전문 검색 템플릿"
 
-#: catalog/objectaddress.c:3606
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "%s 전문 검색 구성"
 
-#: catalog/objectaddress.c:3619
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "%s 롤"
 
-#: catalog/objectaddress.c:3656 catalog/objectaddress.c:5505
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "%s 롤 구성원(해당 롤: %s)"
 
-#: catalog/objectaddress.c:3677
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "%s 데이터베이스"
 
-#: catalog/objectaddress.c:3693
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "%s 테이블스페이스"
 
-#: catalog/objectaddress.c:3704
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "%s 외부 데이터 래퍼"
 
-#: catalog/objectaddress.c:3714
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "%s 서버"
 
-#: catalog/objectaddress.c:3747
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "%s에 대한 사용자 매핑, 해당 서버: %s"
 
-#: catalog/objectaddress.c:3799
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr ""
 "%s 롤(해당 스키마: %s)이 새 테이블을 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3803
+#: catalog/objectaddress.c:3812
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "%s 롤이 새 테이블을 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3809
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr ""
 "%s 롤(해당 스키마: %s)이 새 시퀀스를 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3813
+#: catalog/objectaddress.c:3822
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "%s 롤이 새 시퀀스를 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3819
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "%s 롤(해당 스키마: %s)이 새 함수를 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3823
+#: catalog/objectaddress.c:3832
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "%s 롤이 새 함수를 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3829
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr ""
 "%s 롤(해당 스키마: %s)이 새 자료형을 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3833
+#: catalog/objectaddress.c:3842
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "%s 롤이 새 자료형을 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3839
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "%s 롤이 새 시퀀스를 만들 때 기본적으로 지정할 접근 권한"
 
-#: catalog/objectaddress.c:3846
+#: catalog/objectaddress.c:3854
+#, c-format
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "%s 롤이 새 대형 객체를 만들 때 기본적으로 지정할 접근 권한"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr "%s 롤(해당 스키마: %s)의 기본 접근 권한"
 
-#: catalog/objectaddress.c:3850
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "%s 롤의 기본 접근 권한"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "%s 확장 모듈"
 
-#: catalog/objectaddress.c:3889
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "%s 이벤트 트리거"
 
-#: catalog/objectaddress.c:3913
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "매개 변수 %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3956
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "%s 정책(%s 의)"
 
-#: catalog/objectaddress.c:3970
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "%s 발행"
 
-#: catalog/objectaddress.c:3983
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "%s 스키마 발행 (해당 발행이름: %s)"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:4014
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "%s 발행 (해당 발행이름: %s)"
 
-#: catalog/objectaddress.c:4027
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "%s 구독"
 
-#: catalog/objectaddress.c:4048
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "%s 형 변환자, 대상언어: %s"
 
-#: catalog/objectaddress.c:4117
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "%s 테이블"
 
-#: catalog/objectaddress.c:4122
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "%s 인덱스"
 
-#: catalog/objectaddress.c:4126
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "%s 시퀀스"
 
-#: catalog/objectaddress.c:4130
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "%s 토스트 테이블"
 
-#: catalog/objectaddress.c:4134
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "%s 뷰"
 
-#: catalog/objectaddress.c:4138
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "%s 구체화된 뷰"
 
-#: catalog/objectaddress.c:4142
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "%s 복합 자료형"
 
-#: catalog/objectaddress.c:4146
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "%s 외부 테이블"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "%s 릴레이션"
 
-#: catalog/objectaddress.c:4192
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "%s 연산자 페밀리, 접근 방법: %s"
@@ -6298,7 +6351,7 @@ msgstr ""
 msgid "return type of inverse transition function %s is not %s"
 msgstr "%s inverse transition 함수의 반환 자료형이 %s 형이 아닙니다."
 
-#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:2991
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3057
 #, c-format
 msgid ""
 "strictness of aggregate's forward and inverse transition functions must match"
@@ -6314,7 +6367,7 @@ msgstr "부가 인자를 쓰는 마침 함수는 STRICT 옵션이 없어야 함"
 msgid "return type of combine function %s is not %s"
 msgstr "%s combine 함수의 반환 자료형이 %s 형이 아닙니다"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr ""
@@ -6330,12 +6383,12 @@ msgstr "%s serialization 함수의 반환 자료형이 %s 형이 아닙니다."
 msgid "return type of deserialization function %s is not %s"
 msgstr "%s deserialization 함수의 반환 자료형이 %s 형이 아닙니다"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "결과 자료형을 결정할 수 없음"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "\"internal\" 의사-자료형의 사용이 안전하지 않습니다"
@@ -6354,53 +6407,53 @@ msgstr ""
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "정렬 연산자는 단일 인자 집계에만 지정할 수 있음"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "루틴 종류를 바꿀 수 없음"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "\"%s\" 개체는 ordinary 집계 함수입니다"
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "\"%s\" 개체는 정렬된 집합 집계 함수입니다"
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "\"%s\" 함수는 가상 집합 집계 함수입니다."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "집계 함수의 direct 인자 번호는 바꿀 수 없음"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "%s 이름의 함수가 없음"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "%s 함수는 한 set을 리턴함"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr "%s 함수가 이 집계작업에 사용되려면 VARIADIC ANY 형을 수용해야 합니다."
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "%s 함수는  run-time type coercion을 필요로 함"
@@ -6480,21 +6533,55 @@ msgstr "\"%s\" 정렬규칙이 이미 있습니다"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "\"%s\" 정렬규칙이 \"%s\" 인코딩에 이미 지정되어 있습니다"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:763 commands/tablecmds.c:7952
+#, c-format
+msgid ""
+"cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation "
+"\"%s\""
+msgstr ""
+"\"%s\" NOT NULL 제약 조건(해당 테이블: \"%s\")이 있는 경우는 NO INHERIT 속성"
+"을 바꿀 수 없음"
+
+#: catalog/pg_constraint.c:765 commands/tablecmds.c:9559
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "먼저 %s 명령을 이용해 제약 조건을 상속 가능하게 만들 필요가 있습니다."
+
+#: catalog/pg_constraint.c:775
+#, c-format
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr "\"%s\" NOT VALID 제약 조건(해당 테이블: \"%s\")이 호환되지 않음"
+
+#: catalog/pg_constraint.c:777 commands/tablecmds.c:9571
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "%s 명령을 이용해 VALID로 바꿀 필요가 있습니다."
+
+#: catalog/pg_constraint.c:1016
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "\"%s\" 제약 조건이 %s 도메인에 이미 지정되어 있습니다"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1217 catalog/pg_constraint.c:1310
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "\"%s\" 제약 조건은 \"%s\" 테이블에 없음"
 
-#: catalog/pg_constraint.c:1125
+#: catalog/pg_constraint.c:1410
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "\"%s\" 제약 조건은 %s 도메인에 없음"
 
+#: catalog/pg_constraint.c:1664
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "외래 키의 PERIOD 부분에 잘못된 형식이 있습니다"
+
+#: catalog/pg_constraint.c:1665
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "range와 multirange만 지원됩니다."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -6505,22 +6592,22 @@ msgstr "\"%s\" 이름의 변환규칙(conversion)이 이미 있음"
 msgid "default conversion for %s to %s already exists"
 msgstr "%s 코드에서 %s 코드로 변환하는 기본 변환규칙(conversion)은 이미 있음"
 
-#: catalog/pg_depend.c:224 commands/extension.c:3397
+#: catalog/pg_depend.c:223 commands/extension.c:3665
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s 개체는 \"%s\" 확장모듈에 이미 구성원입니다"
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3705
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "\"%s\" 개체는 \"%s\" 확장 모듈의 구성 요소가 아닙니다"
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:233
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "확장 모듈이 자기 소유 객체가 아닌 객체를 덮어 쓸 수는 없습니다."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:284
 #, c-format
 msgid ""
 "An extension may only use CREATE ... IF NOT EXISTS to skip object creation "
@@ -6529,7 +6616,7 @@ msgstr ""
 "이미 있는 객체와 충돌을 피하기 위해 이미 있는 객체 생성을 건너뛰려면, 확장 모"
 "듈에서 CREATE ... IF NOT EXISTS 구문을 사용해야합니다."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:647
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "%s 객체가 시스템 객체이기 때문에 의존성을 없앨 수 없습니다."
@@ -6583,8 +6670,8 @@ msgstr ""
 "이 파티션은 이미 concurrently 옵션을 사용해서 떼기 작업을 했거나, 아직 떼기"
 "가 안 끝났습니다."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4800
-#: commands/tablecmds.c:16153
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916
+#: commands/tablecmds.c:17866
 #, c-format
 msgid ""
 "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending "
@@ -6693,43 +6780,43 @@ msgstr "%s negator 연산자는 이미 %u 연산자의 negator임"
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "\"%s\" 매개 변수 ACL이 없음"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "함수는 %d개 이상의 인자를 사용할 수 없음"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "이미 같은 인자 자료형을 사용하는 \"%s\" 함수가 있습니다"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "\"%s\" 개체는 집계 함수입니다"
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "\"%s\" 개체는 함수입니다."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "\"%s\" 개체는 프로시져입니다."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "\"%s\" 개체는 윈도우 함수입니다."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "프로시져는 출력 매개 변수를 사용하도록 변경 할 수 없음"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "이미 있는 함수의 리턴 자료형은 바꿀 수 없습니다"
@@ -6738,110 +6825,111 @@ msgstr "이미 있는 함수의 리턴 자료형은 바꿀 수 없습니다"
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "먼저 %s %s 명령을 사용하세요."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "OUT 매개 변수에 정의된 행 형식이 다릅니다."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "\"%s\" 입력 매개 변수 이름을 바꿀 수 없음"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr "기존 함수에서 매개 변수 기본 값을 제거할 수 없음"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr "기존 매개 변수 기본 값의 데이터 형식을 바꿀 수 없음"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "\"%s\" 이름의 내장 함수가 없음"
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL 함수는 %s 자료형을 리턴할 수 없음"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL 함수의 인자로 %s 자료형은 사용될 수 없습니다"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1468
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "\"%s\" SQL 함수"
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "\"%s\" 릴레이션을 발행에 추가할 수 없음"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "이 작업은 시스템 테이블 대상으로 지원하지 않습니다."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "이 작업은 임시 테이블 대상으로 지원하지 않습니다."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "이 작업은 언로그드 테이블 대상으로 지원하지 않습니다."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "\"%s\" 스키마를 발행에 추가할 수 없음"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "이 작업은 시스템 스키마 대상으로 지원하지 않습니다."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "임시 스키마는 복제할 수 없습니다."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "\"%s\" 릴레이션은 이미 \"%s\" 발행에 포함되어 있습니다"
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr "\"%s\" 칼럼은 시스템 칼럼입니다. 발행 칼럼 목록에 포함될 수 없습니다."
 
-#: catalog/pg_publication.c:540
+#: catalog/pg_publication.c:582
 #, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
 msgstr ""
-"\"%s\" 칼럼은 미리 계산된 칼럼으로 발행 칼럼 목록에 포함될 수 없습니다."
+"\"%s\" 칼럼은 가상의 미리 계산된 칼럼으로 발행 칼럼 목록에 포함될 수 없습니"
+"다."
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "\"%s\" 칼럼이 발행 칼럼 목록에 중복 되었습니다."
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "\"%s\" 스키마는 이미 \"%s\" 발행에 포함되어 있습니다"
@@ -6923,22 +7011,22 @@ msgstr ""
 "%s 소유주의 개체 삭제는 그 데이터베이스 시스템에서 필요하기 때문에 삭제 될 "
 "수 없음"
 
-#: catalog/pg_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "\"%s\" 구독용 릴레이션 맵핑 삭제 실패"
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid ""
-"Table synchronization for relation \"%s\" is in progress and is in state "
-"\"%c\"."
+"Table synchronization for relation \"%s\" is in progress and is in state \"%c"
+"\"."
 msgstr "\"%s\" 릴레이션의 동기화 작업은 현재 진행중이고, 상태가 \"%c\" 임."
 
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid ""
 "Use %s to enable subscription if not already enabled or use %s to drop the "
@@ -6973,7 +7061,7 @@ msgstr "내부 크기 %d은(는) 전달 값 형식에 유효하지 않음"
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "\"%c\" 정렬은 가변 길이 형식에 유효하지 않음"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "_^_ 고정크기 자료형은 PLAIN 저장방법을 가져야만 합니다"
@@ -6992,10 +7080,10 @@ msgstr ""
 "\"multirange_type_name\" 속성을 사용해서 이 다중 범위 자료형 이름을 직접 지정"
 "하세요."
 
-#: catalog/storage.c:533 storage/buffer/bufmgr.c:1540
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7334
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "%u 블록(해당 릴레이션: %s)에 잘못된 페이지가 있음"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "%u 블록(해당 릴레이션: \"%s\")에 잘못된 페이지가 있음"
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -7081,7 +7169,7 @@ msgid ""
 msgstr ""
 "SERIALFUNC, DESERIALFUNC 함수를 모두 지정하거나 모두 지정하지 않거나 하세요."
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr "\"parallel\" 옵션 값은 SAFE, RESTRICTED, UNSAFE 만 지정할 수 있음"
@@ -7091,17 +7179,17 @@ msgstr "\"parallel\" 옵션 값은 SAFE, RESTRICTED, UNSAFE 만 지정할 수 
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "\"%s\" 인자값은 READ_ONLY, SHAREABLE, READ_WRITE 셋 중 하나여야 함"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:194
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "\"%s\" 이름의 이벤트 트리거가 이미 있음"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "\"%s\" 이름의 외부 자료 래퍼가 이미 있음"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "\"%s\" 이름의 서버가 이미 있음"
@@ -7111,12 +7199,12 @@ msgstr "\"%s\" 이름의 서버가 이미 있음"
 msgid "language \"%s\" already exists"
 msgstr "\"%s\" 이름의 프로시주얼 언어가 이미 있습니다"
 
-#: commands/alter.c:95 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:865
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "\"%s\" 이름의 발행이 이미 있습니다"
 
-#: commands/alter.c:98 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "\"%s\" 이름의 구독이 이미 있습니다"
@@ -7156,16 +7244,16 @@ msgstr "\"%s\" 전문 검색 구성이 \"%s\" 스키마 안에 이미 있음"
 msgid "must be superuser to rename %s"
 msgstr "%s 이름 변경 작업은 슈퍼유저만 할 수 있음"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false 는 슈퍼유저 전용임"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid ""
 "Subscriptions with the password_required option set to false may only be "
@@ -7174,7 +7262,7 @@ msgstr ""
 "구독 옵션으로 password_required 옵션값을 false 지정하거나 변경하는 것은 슈퍼"
 "유저만 할 수 있습니다."
 
-#: commands/alter.c:735
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "%s의 스키마 지정은 슈퍼유져여야 합니다"
@@ -7194,7 +7282,7 @@ msgstr "슈퍼유저만 접근 방법을 만들 수 있습니다."
 msgid "access method \"%s\" already exists"
 msgstr "\"%s\" 이름의 인덱스 접근 방법이 이미 있습니다."
 
-#: commands/amcmds.c:154 commands/indexcmds.c:224 commands/indexcmds.c:850
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
 #: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
@@ -7205,45 +7293,50 @@ msgstr "\"%s\" 인덱스 접근 방법이 없습니다"
 msgid "handler function is not specified"
 msgstr "핸들러 함수 부분이 빠졌습니다"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:203
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "%s 함수는 %s 자료형을 반환해야 함"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "\"%s\" 건너뜀 --- 외부 테이블은 분석할 수 없음"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr ""
 "\"%s\" 건너뜀 --- 테이블이 아니거나, 특수 시스템 테이블들은 분석할 수 없음"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "\"%s.%s\" 상속 관계 분석중"
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "\"%s.%s\" 자료 통계 수집 중"
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "\"%s\" 칼럼이 \"%s\" 릴레이션에서 두 번 이상 사용되었음"
 
-#: commands/analyze.c:785
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "\"%s.%s.%s\" 테이블 자동 분석\n"
 
-#: commands/analyze.c:1300
+#: commands/analyze.c:805
+#, c-format
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "\"%s.%s.%s\" 테이블 통계 수집 완료\n"
+
+#: commands/analyze.c:1346
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -7252,7 +7345,7 @@ msgstr ""
 "\"%s\": 탐색한 페이지: %d, 전체페이지: %u, 실자료: %.0f개, 쓰레기자료: %.0f"
 "개; 표본 추출 자료: %d개, 예상한 총 자료: %.0f개"
 
-#: commands/analyze.c:1384
+#: commands/analyze.c:1430
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -7261,7 +7354,7 @@ msgstr ""
 "\"%s.%s\" 상속 나무의 통계 수집 건너뜀 --- 이 상속 나무에는 하위 테이블이 없"
 "음"
 
-#: commands/analyze.c:1482
+#: commands/analyze.c:1528
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -7317,42 +7410,42 @@ msgid ""
 msgstr ""
 "이 프로세스의 현재 트랜잭션을 종료하지 않으면, NOTIFY 큐를 비울 수 없습니다"
 
-#: commands/cluster.c:128
+#: commands/cluster.c:127
 #, c-format
 msgid "unrecognized CLUSTER option \"%s\""
 msgstr "알 수 없는 CLUSTER 옵션 \"%s\""
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블은 cluster 작업을 할 수 없습니다"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "\"%s\" 테이블을 위한 previously clustered 인덱스가 없음"
 
-#: commands/cluster.c:191 commands/tablecmds.c:14797 commands/tablecmds.c:16729
+#: commands/cluster.c:190 commands/tablecmds.c:16422 commands/tablecmds.c:18488
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "\"%s\" 인덱스는 \"%s\" 테이블에 없음"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "공유된 카탈로그는 클러스터 작업을 할 수 없음"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블은 vacuum 작업을 할 수 없음"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16739
+#: commands/cluster.c:507 commands/tablecmds.c:18498
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" 개체는 \"%s\" 테이블을 위한 인덱스가 아님"
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, c-format
 msgid ""
 "cannot cluster on index \"%s\" because access method does not support "
@@ -7360,38 +7453,38 @@ msgid ""
 msgstr ""
 "\"%s\" 인덱스는 자료 액세스 방법이 cluster 작업을 할 수 없는 방법입니다."
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr ""
 "\"%s\" 인덱스가 부분인덱스(partial index)라서 cluster 작업을 할 수 없습니다"
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "잘못된 \"%s\" 인덱스에 대해 클러스터링할 수 없음"
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "파티션된 테이블 대상으로 인덱스 클러스터 표시를 할 수 없음"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr " \"%s.%s\" 클러스터링 중 (사용 인덱스: \"%s\")"
 
-#: commands/cluster.c:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "순차 탐색과 정렬을 이용해서 \"%s.%s\" 개체 클러스터링 중"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "\"%s.%s\" 청소 중"
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid ""
 "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
@@ -7399,7 +7492,7 @@ msgstr ""
 "\"%s.%s\": 삭제가능한 %.0f개, 삭제불가능한 %.0f개의 행 버전을 %u 페이지에서 "
 "발견했음."
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7408,7 +7501,7 @@ msgstr ""
 "%.0f 개의 사용하지 않는 로우 버전을 아직 지우지 못했음.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "\"%s\" 클러스터 권한 없음, 건너뜀"
@@ -7419,13 +7512,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "\"%s\" 연산자 속성을 처리할 수 없음"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8129
-#: replication/pgoutput/pgoutput.c:314 replication/pgoutput/pgoutput.c:337
-#: replication/pgoutput/pgoutput.c:351 replication/pgoutput/pgoutput.c:361
-#: replication/pgoutput/pgoutput.c:371 replication/pgoutput/pgoutput.c:381
-#: replication/pgoutput/pgoutput.c:393 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8369
+#: replication/pgoutput/pgoutput.c:320 replication/pgoutput/pgoutput.c:343
+#: replication/pgoutput/pgoutput.c:357 replication/pgoutput/pgoutput.c:367
+#: replication/pgoutput/pgoutput.c:377 replication/pgoutput/pgoutput.c:387
+#: replication/pgoutput/pgoutput.c:399 replication/walsender.c:1123
+#: replication/walsender.c:1145 replication/walsender.c:1155
+#: replication/walsender.c:1164 replication/walsender.c:1406
+#: replication/walsender.c:1415
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "상충하거나 중복된 옵션들"
@@ -7456,7 +7550,7 @@ msgstr "알 수 없는 정렬규칙 제공자 이름: %s"
 msgid "parameter \"%s\" must be specified"
 msgstr "\"%s\" 매개 변수를 지정해야 함"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "\"%s\"에서 표준을 사용함(해당 ICU 로케일: \"%s\")"
@@ -7466,7 +7560,7 @@ msgstr "\"%s\"에서 표준을 사용함(해당 ICU 로케일: \"%s\")"
 msgid "nondeterministic collations not supported with this provider"
 msgstr "이 제공자는 DETERMINISTIC = false 옵션을 지원하지 않음"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "ICU 규칙은 로케일 제공자로 ICU로 지정했을 때만 사용할 수 있습니다."
@@ -7476,68 +7570,69 @@ msgstr "ICU 규칙은 로케일 제공자로 ICU로 지정했을 때만 사용
 msgid "current database's encoding is not supported with this provider"
 msgstr "이 제공자는 현재 데이터베이스 인코딩을 지원하지 않음"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr "\"%s\" 정렬규칙(대상 인코딩: \"%s\")이 \"%s\" 스키마 안에 이미 있음"
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "\"%s\" 정렬규칙이 \"%s\" 스키마에 이미 있습니다"
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "기본 문자 정렬의 버전을 갱신할 수 없음"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7905 commands/tablecmds.c:7915
-#: commands/tablecmds.c:7917 commands/tablecmds.c:14499
-#: commands/tablecmds.c:17884 commands/tablecmds.c:17905
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8146 commands/tablecmds.c:8156
+#: commands/tablecmds.c:8158 commands/tablecmds.c:16124
+#: commands/tablecmds.c:19652 commands/tablecmds.c:19673
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "대신에 %s 명령을 사용하십시오."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2566
+#: commands/collationcmds.c:476 commands/dbcommands.c:2605
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "%s에서 %s 버전으로 바꿉니다"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2579
+#: commands/collationcmds.c:491 commands/dbcommands.c:2618
 #, c-format
 msgid "version has not changed"
 msgstr "버전이 바뀌지 않았습니다"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2749
+#: commands/collationcmds.c:524 commands/dbcommands.c:2788
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "OID %u 데이터베이스 없음"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "OID %u 정렬정의(collation) 없음"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr "시스템 정렬규칙을 가져오려면 슈퍼유저여야함"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "사용할 수 있는 시스템 로케일이 없음"
 
-#: commands/comment.c:61 commands/dbcommands.c:1665 commands/dbcommands.c:1883
-#: commands/dbcommands.c:1995 commands/dbcommands.c:2193
-#: commands/dbcommands.c:2433 commands/dbcommands.c:2526
-#: commands/dbcommands.c:2650 commands/dbcommands.c:3161
-#: utils/init/postinit.c:1034 utils/init/postinit.c:1098
-#: utils/init/postinit.c:1171
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2472 commands/dbcommands.c:2565
+#: commands/dbcommands.c:2689 commands/dbcommands.c:3200
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "\"%s\" 데이터베이스 없음"
@@ -7547,12 +7642,12 @@ msgstr "\"%s\" 데이터베이스 없음"
 msgid "cannot set comment on relation \"%s\""
 msgstr "\"%s\" 릴레이션에 주석을 달 수 없음"
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "\"%s\" 함수가 트리거 관리자에서 호출되지 않았음"
 
-#: commands/constraint.c:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "AFTER ROW에서 \"%s\" 함수를 실행해야 함"
@@ -7650,209 +7745,233 @@ msgstr "%s 값은 불리언 값 또는 \"match\" 이어야 합니다."
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:782 commands/copy.c:798
-#: commands/copy.c:815 commands/copy.c:841 commands/copy.c:851
+#: commands/copy.c:402 commands/copy.c:818 commands/copy.c:834
+#: commands/copy.c:851 commands/copy.c:877 commands/copy.c:887
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s 옵션은 %s 옵션과 함께 쓸 수 없음"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:441
+#: commands/copy.c:416 commands/copy.c:474
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "COPY %s \"%s\" 구문은 지원하지 않음"
 
-#: commands/copy.c:502
+#: commands/copy.c:436 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s 숫자값을 필요로 함"
+
+#: commands/copy.c:446
+#, c-format
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "REJECT_LIMIT (%<PRId64>) 값은 0(zero)보다 커야 합니다"
+
+#: commands/copy.c:536
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "\"%s\" COPY 양식은 지원하지 않음"
 
-#: commands/copy.c:560 commands/copy.c:575 commands/copy.c:590
-#: commands/copy.c:609
+#: commands/copy.c:594 commands/copy.c:609 commands/copy.c:624
+#: commands/copy.c:643
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "\"%s\" 옵션에 대한 인자는 칼럼 이름 목록이어야 합니다."
 
-#: commands/copy.c:621
+#: commands/copy.c:655
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "\"%s\" 옵션에 대한 인자는 인코딩 이름이어야 합니다."
 
-#: commands/copy.c:642 commands/dbcommands.c:866 commands/dbcommands.c:2381
+#: commands/copy.c:683 commands/dbcommands.c:880 commands/dbcommands.c:2420
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "\"%s\" 옵션은 타당하지 않습니다."
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:655 commands/copy.c:660 commands/copy.c:665
-#: commands/copy.c:740
+#: commands/copy.c:696 commands/copy.c:701 commands/copy.c:706
+#: commands/copy.c:776
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "BINARY 모드에서는 %s 값을 지정할 수 없음"
 
-#: commands/copy.c:670
-#, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr "BINARY 모드에서는 ON_ERROR STOP만 허용함"
-
-#: commands/copy.c:692
+#: commands/copy.c:728
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "COPY 구분자는 1바이트의 단일 문자여야 함"
 
-#: commands/copy.c:699
+#: commands/copy.c:735
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPY 명령에서 사용할 칼럼 구분자로 줄바꿈 문자들을 사용할 수 없습니다"
 
-#: commands/copy.c:705
+#: commands/copy.c:741
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "COPY null 표현에서 줄바꿈 또는 캐리지 리턴을 사용할 수 없음"
 
-#: commands/copy.c:715
+#: commands/copy.c:751
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "COPY 기본 동작에서는 줄바꿈 또는 캐리지 리턴을 사용할 수 없음"
 
-#: commands/copy.c:733
+#: commands/copy.c:769
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "COPY 구분자는 \"%s\"일 수 없음"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:747 commands/copy.c:764 commands/copy.c:776
-#: commands/copy.c:791 commands/copy.c:807
+#: commands/copy.c:783 commands/copy.c:800 commands/copy.c:812
+#: commands/copy.c:827 commands/copy.c:843
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "%s COPY 명령 옵션은 CSV 모드가 필요함"
 
-#: commands/copy.c:752
+#: commands/copy.c:788
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "COPY 따옴표는 1바이트의 단일 문자여야 함"
 
-#: commands/copy.c:757
+#: commands/copy.c:793
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "COPY 구분자 및 따옴표는 서로 달라야 함"
 
-#: commands/copy.c:769
+#: commands/copy.c:805
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "COPY 이스케이프는 1바이트의 단일 문자여야 함"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:823 commands/copy.c:859
+#: commands/copy.c:859 commands/copy.c:895
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "COPY 구분자는 %s 정의에 없어야 함"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:832 commands/copy.c:868
+#: commands/copy.c:868 commands/copy.c:904
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "CSV 인용 문자는 %s 정의에 없어야 함"
 
-#: commands/copy.c:877
+#: commands/copy.c:913
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "NULL 지정과 DEFAULT 지정이 같을 수는 없음"
 
-#: commands/copy.c:939
+#: commands/copy.c:919
+#, c-format
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "BINARY 모드에서는 ON_ERROR STOP만 허용함"
+
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:926
+#, c-format
+msgid "COPY %s requires %s to be set to %s"
+msgstr "%s COPY 명령 옵션은 %s 설정값을 %s 로 해야함"
+
+#: commands/copy.c:988
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "\"%s\" 칼럼은 미리 계산된 칼럼임"
 
-#: commands/copy.c:941
+#: commands/copy.c:990
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "미리 계산된 칼럼은 COPY 작업 대상이 아님"
 
-#: commands/copy.c:956 commands/indexcmds.c:1890 commands/statscmds.c:239
-#: commands/tablecmds.c:2526 commands/tablecmds.c:2997
-#: commands/tablecmds.c:3808 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
+#: commands/copy.c:1005 commands/indexcmds.c:1959 commands/statscmds.c:239
+#: commands/tablecmds.c:2593 commands/tablecmds.c:3101
+#: commands/tablecmds.c:3930 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
 #: utils/adt/tsvector_op.c:2853
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "\"%s\" 이름의 칼럼은 없습니다"
 
-#: commands/copy.c:963 commands/tablecmds.c:2552 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1012 commands/tablecmds.c:2619 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "\"%s\" 칼럼을 하나 이상 지정했음"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, %llu번째 줄, %s 열"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, %<PRIu64>번째 줄, %s 열"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, %llu번째 줄"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, %<PRIu64>번째 줄"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, %llu번째 줄, %s 열: \"%s\""
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, %<PRIu64>번째 줄, %s 열: \"%s\""
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, %llu행, %s 열: null 입력"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, %<PRIu64>행, %s 열: null 입력"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, %llu번째 줄: \"%s\""
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, %<PRIu64>번째 줄: \"%s\""
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "\"%s\" 뷰로 복사할 수 없음"
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr "뷰를 통해 자료를 입력하려면, INSTEAD OF INSERT 트리거를 사용하세요"
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "\"%s\" 구체화된 뷰(view)에 복사할 수 없음"
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "\"%s\" 시퀀스에 복사할 수 없음"
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "\"%s\" 개체는 테이블이 아닌 릴레이션(relation)이기에 복사할 수 없음"
 
-#: commands/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "파티션 된 테이블에는 COPY FREEZE 수행할 수 없음"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, c-format
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "외부 테이블 대상으로는 COPY FREEZE 수행할 수 없음"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr ""
 "먼저 시작한 다른 트랜잭션이 아직 활성 상태여서 COPY FREEZE 작업은 진행할 수 "
 "없음"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid ""
 "cannot perform COPY FREEZE because the table was not created or truncated in "
@@ -7861,27 +7980,34 @@ msgstr ""
 "현재 하위 트랜잭션에서 만들어지거나 비워진 테이블이 아니기 때문에 COPY "
 "FREEZE 작업을 할 수 없음"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
+#, c-format
+msgid ""
+"skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type "
+"incompatibility"
+msgstr "REJECT_LIMIT (%<PRId64>) 개의 로우가 자료형이 호환되지 않아 건너뜀"
+
+#: commands/copyfrom.c:1474
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] "%llu개의 로우가 자료형이 호환되지 않아 건너뜀"
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "%<PRIu64>개의 로우가 자료형이 호환되지 않아 건너뜀"
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1448 commands/copyfrom.c:1491 commands/copyto.c:601
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "%s 옵션(해당 칼럼: \"%s\")은 COPY에서 참조되지 않음"
 
-#: commands/copyfrom.c:1544 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:386
 #, c-format
 msgid ""
 "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr ""
 "\"%s\" 인코딩을 \"%s\" 인코딩으로 변환할 기본 변환규칙(conversion)이 없음"
 
-#: commands/copyfrom.c:1742
+#: commands/copyfrom.c:1882
 #, c-format
 msgid ""
 "COPY FROM instructs the PostgreSQL server process to read a file. You may "
@@ -7891,17 +8017,17 @@ msgstr ""
 "언트 쪽에 있는 파일을 읽어 처리 하려면, psql의 \\copy 내장 명령어를 사용하세"
 "요."
 
-#: commands/copyfrom.c:1755 commands/copyto.c:706
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 디렉터리임"
 
-#: commands/copyfrom.c:1823 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "외부 명령으로 파이프를 닫을 수 없음: %m"
 
-#: commands/copyfrom.c:1838 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "\"%s\" 프로그램 실패"
@@ -7942,262 +8068,269 @@ msgid "could not read from COPY file: %m"
 msgstr "COPY 명령에 사용할 파일을 읽을 수 없습니다: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:381
+#: replication/walsender.c:732 replication/walsender.c:758 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "열린 트랜잭션과 함께 클라이언트 연결에서 예상치 않은 EOF 발견됨"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:748
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr ""
 "COPY 명령으로 stdin으로 자료를 가져오는 동안 예상치 않은 메시지 타입 0x%02X "
 "발견됨"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:779
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "COPY 명령에서 stdin으로 자료 가져오기 실패: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "헤더 줄에 필드 수가 잘못됨: %d개 확인, 기대값: %d개"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid ""
 "column name mismatch in header line field %d: got null value (\"%s\"), "
 "expected \"%s\""
 msgstr ""
-"헤더 %d 번째 필드의 칼럼 이름이 일치하지 않음: null 값 발견(\"%s\"), 기대값"
-"=\"%s\""
+"헤더 %d 번째 필드의 칼럼 이름이 일치하지 않음: null 값 발견(\"%s\"), 기대값="
+"\"%s\""
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid ""
 "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
 msgstr ""
-"헤더 줄 %d 번째 필드의 칼럼 이름이 일치하지 않음: 해당이름=\"%s\", 기대값"
-"=\"%s\""
+"헤더 줄 %d 번째 필드의 칼럼 이름이 일치하지 않음: 해당이름=\"%s\", 기대값="
+"\"%s\""
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "마지막 칼럼을 초과해서 또 다른 데이터가 있음"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "\"%s\" 칼럼의 자료가 빠졌음"
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
 msgid ""
-"skipping row due to data type incompatibility at line %llu for column "
+"skipping row due to data type incompatibility at line %<PRIu64> for column "
 "\"%s\": \"%s\""
 msgstr ""
-"%llu 줄에서 자료형이 호환되지 않아, 로우를 건너 뜀(해당 칼럼: \"%s\"): \"%s\""
+"%<PRIu64>번째 줄에서 자료형이 호환되지 않아, 로우를 건너 뜀(해당 칼럼: \"%s"
+"\"): \"%s\""
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
 msgid ""
-"skipping row due to data type incompatibility at line %llu for column "
+"skipping row due to data type incompatibility at line %<PRIu64> for column "
 "\"%s\": null input"
 msgstr ""
-"%llu 줄에서 자료형이 호환되지 않아, 로우를 건너 뜀(해당 칼럼: \"%s\"): null 입력"
+"%<PRIu64>번째 줄에서 자료형이 호환되지 않아, 로우를 건너 뜀(해당 칼럼: \"%s"
+"\"): null 입력"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "EOF 표시 뒤에도 복사 데이터를 받았음"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "행(row) 필드 갯수가 %d 임, 예상값은 %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "데이터에 carriage return 값이 잘못되었음"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "데이터에 carriage return 값 표기가 잘못 되었음"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "carriage return값으로 \"\\r\" 문자를 사용하세요"
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr ""
 "carriage return 문자를 그대로 적용하려면, quoted CSV 필드를 사용하세요."
 
-#: commands/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "데이터에 newline 값이 잘못되었음"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "데이터에 newline 값이 잘못 되었음"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "newline 값으로 \"\\n\" 문자를 사용하세요"
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "newline 문자를 그대로 적용하려면, quoted CSV 필드를 사용하세요."
 
-#: commands/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "end-of-copy 마크는 이전 newline 모양가 틀립니다"
 
-#: commands/copyfromparse.c:1428 commands/copyfromparse.c:1444
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
 #, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "end-of-copy 마크가 잘못되었음"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "end-of-copy 마크는 그 줄에 하나만 있어야 함"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "COPY 자료 안에 예상치 않은 기본 마커"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "\"%s\" 칼럼은 DEFAULT 값이 없음."
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "종료되지 않은 CSV 따옴표 필드"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "복사 자료 안에 예상치 않은 EOF 발견"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "잘못된 필드 크기"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "잘못된 바이너리 자료 포맷"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "COPY 프로그램으로 파일을 쓸 수 없습니다: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "COPY 파일로로 파일을 쓸 수 없습니다: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "\"%s\" 이름의 개체는 뷰(view)입니다. 자료를 내보낼 수 없습니다"
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "COPY (SELECT ...) TO 변형을 시도하십시오."
 
-#: commands/copyto.c:385
+#: commands/copyto.c:660
+#, c-format
+msgid "cannot copy from unpopulated materialized view \"%s\""
+msgstr "\"%s\" unpopulated 구체화된 뷰에서는 copy 할 수 없음"
+
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
-msgid "cannot copy from materialized view \"%s\""
-msgstr "\"%s\" 이름의 개체는 구체화된 뷰입니다. 자료를 내보낼 수 없습니다"
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "REFRESH MATERIALIZED VIEW 명령을 사용하세요."
 
-#: commands/copyto.c:391
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "\"%s\" 이름의 개체는 외부 테이블입니다. 자료를 내보낼 수 없습니다"
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "\"%s\" 이름의 개체는 시퀀스입니다. 자료를 내보낼 수 없습니다"
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "\"%s\" 파티션 된 테이블에서 복사할 수 없음"
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr ""
 "\"%s\" 개체는 테이블이 아닌 릴레이션(relation)이기에 자료를 내보낼 수 없습니"
 "다"
 
-#: commands/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "DO INSTEAD NOTHING 룰(rule)은 COPY 구문에서 지원하지 않습니다."
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "선택적 DO INSTEAD 룰은 COPY 구문에서 지원하지 않음"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
 msgid "DO ALSO rules are not supported for COPY"
 msgstr "DO ALSO 룰은 COPY 구문에서 지원하지 않음"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "다중 구문 DO INSTEAD 룰은 COPY 구문에서 지원하지 않음"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) 지원하지 않음"
 
-#: commands/copyto.c:499
+#: commands/copyto.c:778
 #, c-format
 msgid "COPY query must not be a utility command"
 msgstr "COPY 쿼리는 DDL, DCL 명령이 아니여야 함"
 
-#: commands/copyto.c:515
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "COPY 쿼리는 RETURNING 절이 있어야 함"
 
-#: commands/copyto.c:544
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "COPY 문에 의해 참조된 릴레이션이 변경 되었음"
 
-#: commands/copyto.c:671
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "COPY 명령에 사용할 파일 이름으로 상대경로는 사용할 수 없음"
 
-#: commands/copyto.c:690
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "\"%s\" 파일 열기 실패: %m"
 
-#: commands/copyto.c:693
+#: commands/copyto.c:972
 #, c-format
 msgid ""
 "COPY TO instructs the PostgreSQL server process to write a file. You may "
@@ -8207,142 +8340,150 @@ msgstr ""
 "저장된다. 클라이언트 쪽에서 그 결과를 저장하려면, psql \\copy 명령으로 처리"
 "할 수 있다."
 
-#: commands/createas.c:210 commands/createas.c:516
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "너무 많은 칼럼 이름을 지정했습니다."
 
-#: commands/createas.c:539
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "이 명령을 위한 정책은 아직 구현되어 있지 않습니다"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION 예약어는 이제 더이상 지원하지 않습니다"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "대신에 테이블스페이스를 이용하세요."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "시스템 객체용으로 사용할 미리 예약된 최대 %u OID 보다 작을 수는 없음"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d 값은 잘못된 인코딩 코드임"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s 이름은 잘못된 인코딩 이름임"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "알 수 없는 로케일 제공자 이름: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2414 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2453 commands/user.c:300
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "잘못된 연결 제한: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "데이터베이스를 만들 권한이 없음"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "\"%s\" 템플릿 데이터베이스 없음"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "\"%s\" 데이터베이스 잘못된 것으로 템플릿으로 사용할 수 없음"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2444
-#: utils/init/postinit.c:1113
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2483
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr ""
 "바르지 않은 데이터베이스를 삭제하려면, DROP DATABASE 명령을 사용하세요."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "\"%s\" 데이터베이스를 복사할 권한이 없음"
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "잘못된 데이터베이스 만들기 전략: \"%s\""
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "사용할 수 있는 전략값은 \"wal_log\" 또는 \"file_copy\""
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "잘못된 서버 인코딩 %d"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "LC_COLLATE 로케일 이름이 잘못됨: \"%s\""
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, c-format
+msgid ""
+"If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "내장 제공자의 로케일 이름을 지정하려면, BUILTIN_LOCALE을 사용하세요."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "ICU 로케일 이름을 사용하려면, ICU_LOCALE을 사용하세요."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "ICU 제공자의 로케일 이름을 지정하려면, ICU_LOCALE을 사용하세요."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "LC_CTYPE 로케일 이름이 잘못됨: \"%s\""
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALE 옵션은 로케일 제공자 중에 빌트인이 있어야 쓸 수 있음"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICU 로케일은 ICU 로케일 제공자를 지정해야만 쓸 수 있습니다."
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "LOCALE 또는 BUILTIN_LOCALE을 지정해야 합니다."
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "\"%s\" 인코딩은 ICU 제공자에서 지원하지 않음"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "LOCALE 또는 ICU_LOCALE을 지정해야 합니다."
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid ""
 "new encoding (%s) is incompatible with the encoding of the template database "
 "(%s)"
 msgstr "새 인코딩(%s)이 템플릿 데이터베이스의 인코딩(%s)과 호환되지 않음"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid ""
 "Use the same encoding as in the template database, or use template0 as "
@@ -8351,7 +8492,7 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 인코딩을 사용하거나 template0을 템플릿으로 사용"
 "하십시오."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid ""
 "new collation (%s) is incompatible with the collation of the template "
@@ -8360,7 +8501,7 @@ msgstr ""
 "새 데이터 정렬 규칙 (%s)이 템플릿 데이터베이스의 데이터 정렬 규칙(%s)과 호환"
 "되지 않음"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid ""
 "Use the same collation as in the template database, or use template0 as "
@@ -8369,14 +8510,14 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 데이터 정렬 규칙을 사용하거나 template0을 템플릿"
 "으로 사용하십시오."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid ""
 "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
 "(%s)"
 msgstr "새 LC_CTYPE (%s)이 템플릿 데이터베이스의 LC_CTYPE (%s)과 호환되지 않음"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid ""
 "Use the same LC_CTYPE as in the template database, or use template0 as "
@@ -8385,7 +8526,7 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 LC_CTYPE을 사용하거나 template0을 템플릿으로 사"
 "용하십시오."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid ""
 "new locale provider (%s) does not match locale provider of the template "
@@ -8393,7 +8534,7 @@ msgid ""
 msgstr ""
 "새 로케일 제공자(%s)는 템플릿 데이터베이스의 로케일 제공자(%s)와 같지 않음"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid ""
 "Use the same locale provider as in the template database, or use template0 "
@@ -8402,7 +8543,7 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 로케일 제공자를 사용하거나 template0을 템플릿으"
 "로 사용하십시오."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid ""
 "new ICU locale (%s) is incompatible with the ICU locale of the template "
@@ -8410,7 +8551,7 @@ msgid ""
 msgstr ""
 "새 ICU 로케일(%s)이 템플릿 데이터베이스의 ICU 로케일(%s)과 호환되지 않음"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid ""
 "Use the same ICU locale as in the template database, or use template0 as "
@@ -8419,7 +8560,7 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 ICU 로케일을 사용하거나 template0을 템플릿으로 "
 "사용하십시오."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid ""
 "new ICU collation rules (%s) are incompatible with the ICU collation rules "
@@ -8428,7 +8569,7 @@ msgstr ""
 "새 ICU 문자열 정렬 규칙 (%s)이 템플릿 데이터베이스의 ICU 문자열 정렬 규칙(%s)"
 "과 호환되지 않음"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid ""
 "Use the same ICU collation rules as in the template database, or use "
@@ -8437,7 +8578,7 @@ msgstr ""
 "템플릿 데이터베이스와 동일한 ICU 문자열 정렬 규칙을 사용하거나 template0을 템"
 "플릿으로 사용하십시오."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid ""
 "template database \"%s\" has a collation version, but no actual collation "
@@ -8446,12 +8587,12 @@ msgstr ""
 "\"%s\" 템플릿 데이터베이스에는 문자 정렬 규칙 버전이 있는데, 그 실제 버전을 "
 "알 수 없음"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "\"%s\" 템플릿 데이터베이스의 문자 정렬 규칙 버전이 바르지 않음"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid ""
 "The template database was created using collation version %s, but the "
@@ -8460,7 +8601,7 @@ msgstr ""
 "템플릿 데이터베이스는 문자 정렬 규칙 버전이 %s 이고, 운영체제는 %s 버전을 지"
 "원합니다."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid ""
 "Rebuild all objects in the template database that use the default collation "
@@ -8471,17 +8612,17 @@ msgstr ""
 "고, ALTER DATABASE %s REFRESH COLLATION VERSION 명령을 실행하거나, 바른 버전"
 "의 라이브러리를 사용해서 PostgreSQL 엔진을 다시 만드십시오."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2041
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global을 기본 테이블스페이스로 사용할 수 없음"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "새 \"%s\" 테이블스페이스를 지정할 수 없습니다."
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, c-format
 msgid ""
 "There is a conflict because database \"%s\" already has some tables in this "
@@ -8490,107 +8631,107 @@ msgstr ""
 "\"%s\" 데이터베이스 소속 몇몇 테이블들이 이 테이블스페이스안에 있어서 충돌이 "
 "일어납니다."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1912
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "\"%s\" 이름의 데이터베이스는 이미 있음"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "\"%s\" 원본 데이터베이스를 다른 사용자가 액세스하기 시작했습니다"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "%u OID 데이터베이스는 이미 \"%s\" 데이터베이스가 쓰고 있음"
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "%u OID에 해당하는 데이터 디렉터리가 이미 있습니다."
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2588
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1518
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "\"%s\" 인코딩은 \"%s\" 로케일과 일치하지 않음"
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "선택한 LC_CTYPE 설정에는 \"%s\" 인코딩이 필요합니다."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "선택한 LC_COLLATE 설정에는 \"%s\" 인코딩이 필요합니다."
 
-#: commands/dbcommands.c:1672
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "\"%s\" 데이터베이스 없음, 건너 뜀"
 
-#: commands/dbcommands.c:1696
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "템플릿 데이터베이스는 삭제할 수 없습니다"
 
-#: commands/dbcommands.c:1702
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "현재 열려 있는 데이터베이스는 삭제할 수 없습니다"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "\"%s\" 데이터베이스는 논리 복제 슬롯이 활성화 되어 있습니다"
 
-#: commands/dbcommands.c:1717
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "%d 개의 활성 슬롯이 있습니다."
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "\"%s\" 데이터베이스가 논리 복제 구독으로 사용되었음"
 
-#: commands/dbcommands.c:1733
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "%d 개의 구독이 있습니다."
 
-#: commands/dbcommands.c:1754 commands/dbcommands.c:1934
-#: commands/dbcommands.c:2063
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "\"%s\" 데이터베이스를 다른 사용자가 액세스하기 시작했습니다"
 
-#: commands/dbcommands.c:1894
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "데이터베이스 이름을 바꿀 권한이 없습니다"
 
-#: commands/dbcommands.c:1923
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "현재 데이터베이스의 이름을 바꿀 수 없음"
 
-#: commands/dbcommands.c:2019
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "현재 열려 있는 데이터베이스의 테이블스페이스를 바꿀 수 없음"
 
-#: commands/dbcommands.c:2125
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr ""
 "\"%s\" 데이터베이스의 일부 릴레이션들이 \"%s\" 테이블스페이스에 이미 있음"
 
-#: commands/dbcommands.c:2127
+#: commands/dbcommands.c:2166
 #, c-format
 msgid ""
 "You must move them back to the database's default tablespace before using "
@@ -8599,39 +8740,39 @@ msgstr ""
 "이 명령을 사용하기 전에 데이터베이스의 기본 테이블스페이스로 다시 이동해야 합"
 "니다."
 
-#: commands/dbcommands.c:2256 commands/dbcommands.c:2999
-#: commands/dbcommands.c:3299 commands/dbcommands.c:3412
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3038
+#: commands/dbcommands.c:3338 commands/dbcommands.c:3451
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr ""
 "불필요한 일부 파일이 이전 데이터베이스 디렉터리 \"%s\"에 남아 있을 수 있음"
 
-#: commands/dbcommands.c:2317
+#: commands/dbcommands.c:2356
 #, c-format
 msgid "unrecognized DROP DATABASE option \"%s\""
 msgstr "알 수 없는 DROP DATABASE 옵션: \"%s\""
 
-#: commands/dbcommands.c:2395
+#: commands/dbcommands.c:2434
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "\"%s\" 옵션은 다른 옵션들과 함께 사용할 수 없습니다."
 
-#: commands/dbcommands.c:2443
+#: commands/dbcommands.c:2482
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "잘못된 \"%s\" 데이터베이스에 대해 변경 작업을 할 수 없음"
 
-#: commands/dbcommands.c:2460
+#: commands/dbcommands.c:2499
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "현재 데이터베이스 연결을 허용하지 않습니다."
 
-#: commands/dbcommands.c:2690
+#: commands/dbcommands.c:2729
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "데이터베이스 소유주를 바꿀 권한이 없습니다"
 
-#: commands/dbcommands.c:3105
+#: commands/dbcommands.c:3144
 #, c-format
 msgid ""
 "There are %d other session(s) and %d prepared transaction(s) using the "
@@ -8639,68 +8780,62 @@ msgid ""
 msgstr ""
 "데이터베이스를 사용하는 %d개의 다른 세션과 %d개의 준비된 트랜잭션이 있습니다."
 
-#: commands/dbcommands.c:3108
+#: commands/dbcommands.c:3147
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "데이터베이스를 사용하는 %d개의 다른 세션이 있습니다."
 
-#: commands/dbcommands.c:3113 storage/ipc/procarray.c:3859
+#: commands/dbcommands.c:3152 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "데이터베이스를 사용하는 %d개의 준비된 트랜잭션이 있습니다."
 
-#: commands/dbcommands.c:3255
+#: commands/dbcommands.c:3294
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "\"%s\" 디렉터리가 빠졌음"
 
-#: commands/dbcommands.c:3313 commands/tablespace.c:184
+#: commands/dbcommands.c:3352 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 상태를 파악할 수 없음: %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s 매개 변수를 필요로 함"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s 숫자값을 필요로 함"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "%s 값은 불리언 값이어야 합니다."
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s 하나의 정수값이 필요함"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "%s의 인자는 이름이어야 합니다"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "%s의 인자는 자료형 이름이어야 합니다"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "%s의 잘못된 인자: \"%s\""
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2910
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "\"%s\" 함수는 집계 함수입니다"
@@ -8710,19 +8845,19 @@ msgstr "\"%s\" 함수는 집계 함수입니다"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "집계 함수는 DROP AGGREGATE 명령으로 삭제할 수 있습니다"
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3892
-#: commands/tablecmds.c:4050 commands/tablecmds.c:4102
-#: commands/tablecmds.c:17161 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014
+#: commands/tablecmds.c:4175 commands/tablecmds.c:4227
+#: commands/tablecmds.c:18929 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "\"%s\" 릴레이션 없음, 건너뜀"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1409
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "\"%s\" 스키마(schema) 없음, 건너뜀"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "\"%s\" 자료형 없음, 건너뜀"
@@ -8742,7 +8877,7 @@ msgstr "\"%s\" 정렬규칙 없음, 건너뜀"
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "\"%s\" 문자코드변환규칙(conversion) 없음, 건너뜀"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:682
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "\"%s\" 통계정보 개체 없음, 무시함"
@@ -8837,7 +8972,7 @@ msgstr " \"%s\" 룰(rule)이  \"%s\" 릴레이션에 지정된 것이 없음, 
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "\"%s\" 외부 자료 래퍼가 없음, 건너뜀"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "\"%s\" 서버가 없음, 건너뜀"
@@ -8859,238 +8994,239 @@ msgstr "\"%s\" 연산자 패밀리(\"%s\" 접근 방법)가 없음, 건너뜀"
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "\"%s\" 발행 없음, 건너뜀"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:140
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "\"%s\" 이벤트 트리거를 만들 권한이 없음"
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:142
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "슈퍼유저만 이벤트 트리거를 만들 수 있습니다."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:152
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "알 수 없는 이벤트 이름: \"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:169
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "알 수 없는 필터 변수: \"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:184
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "태그 필터링은 로그인 이벤트 트리거용으로 쓸 수 없음"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:227
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "\"%s\" 필터값은 \"%s\" 필터 변수으로 쓸 수 없음"
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:233 commands/event_trigger.c:255
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "%s 용 이벤트 트리거는 지원하지 않음"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:268
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "\"%s\" 필터 변수가 한 번 이상 사용되었습니다."
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490
-#: commands/event_trigger.c:584
+#: commands/event_trigger.c:441 commands/event_trigger.c:493
+#: commands/event_trigger.c:587
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "\"%s\" 이벤트 트리거 없음"
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:525
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "OID %u 이벤트 트리거가 없음"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:555
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "\"%s\" 이벤트 트리거 소유주를 변경할 권한이 없음"
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:557
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "이벤트 트리거 소유주는 슈퍼유저여야 합니다."
 
-#: commands/event_trigger.c:1409
+#: commands/event_trigger.c:1451
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s 개체는 sql_drop 이벤트 트리거 함수 안에서만 호출 되어야 합니다."
 
-#: commands/event_trigger.c:1502 commands/event_trigger.c:1523
+#: commands/event_trigger.c:1544 commands/event_trigger.c:1565
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr ""
 "%s 개체는 table_rewrite 이벤트 트리거 함수 안에서만 호출 되어야 합니다."
 
-#: commands/event_trigger.c:1936
+#: commands/event_trigger.c:1978
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s 개체는 이벤트 트리거 함수 안에서만 호출 되어야 합니다."
 
-#: commands/explain.c:241 commands/explain.c:266
+#: commands/explain_state.c:133 commands/explain_state.c:158
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "\"%s\" EXPLAIN 옵션에서 쓸 수 없는 값: \"%s\""
 
-#: commands/explain.c:273
+#: commands/explain_state.c:165
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "잘못된 EXPLAIN 옵션: \"%s\""
 
-#: commands/explain.c:282
-#, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
-msgstr "WAL 옵션은 EXPLAIN ANALYZE에서만 쓸 수 있습니다."
-
-#: commands/explain.c:291
-#, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "TIMING 옵션은 EXPLAIN ANALYZE에서만 쓸 수 있습니다."
-
-#: commands/explain.c:297
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
 #, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "SERIALIZE 옵션은 EXPLAIN ANALYZE에서만 쓸 수 있습니다."
+msgid "EXPLAIN option %s requires ANALYZE"
+msgstr "%s EXPLAIN 옵션은 ANALYZE 옵션을 필요로 함"
 
-#: commands/explain.c:303
+#: commands/explain_state.c:198
 #, c-format
 msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
 msgstr ""
 "EXPLAIN 옵션으로 ANALYZE 옵션과 GENERIC_PLAN 옵션을 함께 사용할 수 없습니다."
 
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:177 commands/extension.c:3299
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "\"%s\" 이름의 확장 모듈이 없습니다"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:242 commands/extension.c:251 commands/extension.c:263
+#: commands/extension.c:273
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "잘못된 확장 모듈 이름: \"%s\""
 
-#: commands/extension.c:278
+#: commands/extension.c:243
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "확장 모듈 이름을 지정하세요."
 
-#: commands/extension.c:287
+#: commands/extension.c:252
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "확장 모듈 이름에 \"--\" 문자가 포함될 수 없습니다."
 
-#: commands/extension.c:299
+#: commands/extension.c:264
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "확장 모듈 이름의 시작과 끝에는 \"-\" 문자를 사용할 수 없습니다."
 
-#: commands/extension.c:309
+#: commands/extension.c:274
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "확장 모듈 이름에는 디렉터리 구분 문자를 사용할 수 없습니다."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:289 commands/extension.c:298 commands/extension.c:307
+#: commands/extension.c:317
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "잘못된 확장 모듈 버전 이름: \"%s\""
 
-#: commands/extension.c:325
+#: commands/extension.c:290
 #, c-format
 msgid "Version names must not be empty."
 msgstr "버전 이름은 비어있으면 안됩니다"
 
-#: commands/extension.c:334
+#: commands/extension.c:299
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "버전 이름에 \"--\" 문자가 포함될 수 없습니다."
 
-#: commands/extension.c:343
+#: commands/extension.c:308
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "버전 이름의 앞 뒤에 \"-\" 문자를 쓸 수 없습니다."
 
-#: commands/extension.c:353
+#: commands/extension.c:318
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "버전 이름에는 디렉터리 분리 문자를 쓸 수 없습니다."
 
-#: commands/extension.c:507
+#: commands/extension.c:543
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "\"%s\" 이름의 확장 모듈을 사용할 수 없습니다"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "\"%s\" 확장 모듈 제어 파일 열기 실패: %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:544
 #, c-format
 msgid ""
 "The extension must first be installed on the system where PostgreSQL is "
 "running."
 msgstr "해당 확장 모듈은 PostgreSQL 시작 전에 먼저 설치 되어 있어야합니다."
 
-#: commands/extension.c:514
+#: commands/extension.c:566
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "\"%s\" 확장 모듈 제어 파일 열기 실패: %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:589 commands/extension.c:599
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "\"%s\" 매개 변수는 이차 확장 모듈 제어 파일에서는 사용할 수 없습니다."
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:621 commands/extension.c:629 commands/extension.c:637
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "\"%s\" 매개 변수의 값은 불리언 값이어야 합니다."
 
-#: commands/extension.c:594
+#: commands/extension.c:646
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" 이름은 잘못된 인코딩 이름임"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:660 commands/extension.c:675
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "\"%s\" 매개 변수는 확장 모듈 이름 목록이어야 함"
 
-#: commands/extension.c:630
+#: commands/extension.c:682
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "알 수 없는 \"%s\" 매개 변수가 \"%s\" 파일 안에 있습니다."
 
-#: commands/extension.c:639
+#: commands/extension.c:691
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr ""
 "\"relocatable\" 값이 true 인 경우 \"schema\" 매개 변수는 사용할 수 없습니다."
 
-#: commands/extension.c:817
+#: commands/extension.c:867
+#, c-format
+msgid "SQL statement \"%.*s\""
+msgstr "SQL 구문: \"%.*s\""
+
+#: commands/extension.c:896
+#, c-format
+msgid "extension script file \"%s\", near line %d"
+msgstr "\"%s\" 확장 모듈 스크립트 파일, %d 번째 줄"
+
+#: commands/extension.c:900
+#, c-format
+msgid "extension script file \"%s\""
+msgstr "\"%s\" 확장 모듈 스크립트 파일"
+
+#: commands/extension.c:1012
 #, c-format
 msgid ""
 "transaction control statements are not allowed within an extension script"
 msgstr "확장 모듈 스크립트 안에서는 트랜잭션 제어 구문은 사용할 수 없습니다."
 
-#: commands/extension.c:897
+#: commands/extension.c:1094
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "\"%s\" 확장 모듈을 만들 권한이 없습니다"
 
-#: commands/extension.c:900
+#: commands/extension.c:1097
 #, c-format
 msgid ""
 "Must have CREATE privilege on current database to create this extension."
@@ -9098,17 +9234,17 @@ msgstr ""
 "이 확장 모듈을 설치하려면 현재 데이터베이스에 대해서 CREATE 권한이 있어야 합"
 "니다."
 
-#: commands/extension.c:901
+#: commands/extension.c:1098
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "확장 모듈은 슈퍼유저만 만들 수 있습니다."
 
-#: commands/extension.c:905
+#: commands/extension.c:1102
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "\"%s\" 확장 모듈을 업데이트할 권한이 없습니다."
 
-#: commands/extension.c:908
+#: commands/extension.c:1105
 #, c-format
 msgid ""
 "Must have CREATE privilege on current database to update this extension."
@@ -9116,24 +9252,24 @@ msgstr ""
 "이 확장 모듈을 업데이트 하려면 현재 데이터베이스에 대해서 CREATE 권한이 있어"
 "야 합니다."
 
-#: commands/extension.c:909
+#: commands/extension.c:1106
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "슈퍼유저만 해당 모듈을 업데이트 할 수 있습니다."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1239
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "해당 모듈 소유주 이름에 잘못된 문자: \"%s\" 문자는 허용하지 않음"
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1263 commands/extension.c:1290
 #, c-format
 msgid ""
 "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr ""
 "확장 모듈 \"%s\" 스키마 이름에 잘못된 문자: \"%s\" 문자는 허용하지 않음"
 
-#: commands/extension.c:1288
+#: commands/extension.c:1485
 #, c-format
 msgid ""
 "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
@@ -9141,96 +9277,96 @@ msgstr ""
 "\"%s\" 확장 모듈을 \"%s\" 버전에서 \"%s\" 버전으로 업데이트할 방법이 없습니"
 "다."
 
-#: commands/extension.c:1496 commands/extension.c:3089
+#: commands/extension.c:1693 commands/extension.c:3357
 #, c-format
 msgid "version to install must be specified"
 msgstr "설치할 버전을 지정해야 합니다."
 
-#: commands/extension.c:1533
+#: commands/extension.c:1730
 #, c-format
 msgid ""
-"extension \"%s\" has no installation script nor update path for version "
-"\"%s\""
+"extension \"%s\" has no installation script nor update path for version \"%s"
+"\""
 msgstr ""
 "\"%s\" 확장 모듈에는 \"%s\" 버전용 설치나 업데이트 스크립트가 없습니다."
 
-#: commands/extension.c:1567
+#: commands/extension.c:1764
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "\"%s\" 확장 모듈은 \"%s\" 스키마 안에 설치되어야 합니다."
 
-#: commands/extension.c:1727
+#: commands/extension.c:1924
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "\"%s\" 확장 모듈과 \"%s\" 확장 모듈이 서로 의존 관계입니다"
 
-#: commands/extension.c:1732
+#: commands/extension.c:1929
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "\"%s\" 확장 모듈이 필요해서 실치 하는 중"
 
-#: commands/extension.c:1755
+#: commands/extension.c:1952
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "\"%s\" 확장 모듈이 필요한데, 설치되어 있지 않습니다."
 
-#: commands/extension.c:1758
+#: commands/extension.c:1955
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr ""
 "필요한 모듈을 함께 설치하려면, CREATE EXTENSION ... CASCADE 구문을 사용하세"
 "요."
 
-#: commands/extension.c:1793
+#: commands/extension.c:1990
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "\"%s\" 확장 모듈이 이미 있음, 건너뜀"
 
-#: commands/extension.c:1800
+#: commands/extension.c:1997
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "\"%s\" 이름의 확장 모듈이 이미 있습니다"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2008
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "중첩된 CREATE EXTENSION 구문은 지원하지 않습니다."
 
-#: commands/extension.c:1975
+#: commands/extension.c:2172
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "%s 의존개체들은 시스템 개체이기 때문에 삭제 될 수 없습니다"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2665
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr ""
 "%s 함수는 CREATE EXTENSION 명령에서 내부적으로 사용하는 SQL 스크립트 내에서"
 "만 사용할 수 있습니다."
 
-#: commands/extension.c:2462
+#: commands/extension.c:2677
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "%u OID 자료가 테이블에 없습니다"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2682
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "\"%s\" 테이블은 만들려고 하는 확장 모듈의 구성 요소가 아닙니다."
 
-#: commands/extension.c:2813
+#: commands/extension.c:3081
 #, c-format
 msgid ""
 "cannot move extension \"%s\" into schema \"%s\" because the extension "
 "contains the schema"
 msgstr "\"%s\" 확장 모듈이 \"%s\" 스키마에 이미 있어 옮길 수 없습니다."
 
-#: commands/extension.c:2854 commands/extension.c:2948
+#: commands/extension.c:3122 commands/extension.c:3216
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "\"%s\" 확장 모듈은 SET SCHEMA 구문을 지원하지 않음"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3179
 #, c-format
 msgid ""
 "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
@@ -9238,32 +9374,32 @@ msgstr ""
 "다른 확장 모듈이 해당 스키마를 선점하고 있어, \"%s\" 확장 모듈은 SET SCHEMA "
 "작업을 할 수 없음."
 
-#: commands/extension.c:2913
+#: commands/extension.c:3181
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "\"%s\" 확장 모듈은 \"%s\" 확장모듈의 위치 변경을 금지합니다."
 
-#: commands/extension.c:2950
+#: commands/extension.c:3218
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s 개체가 확장 모듈 스키마인 \"%s\" 안에 없음"
 
-#: commands/extension.c:3011
+#: commands/extension.c:3279
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "중첩된 ALTER EXTENSION 구문을 지원하지 않음"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3368
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "\"%s\" 버전의 \"%s\" 확장 모듈이 이미 설치 되어 있음"
 
-#: commands/extension.c:3311
+#: commands/extension.c:3579
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "해당 확장 모듈에 이런 형태의 객체는 추가 할 수 없음"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3677
 #, c-format
 msgid ""
 "cannot add schema \"%s\" to extension \"%s\" because the schema contains the "
@@ -9272,77 +9408,82 @@ msgstr ""
 "\"%s\" 스키마에  \"%s\" 확장 모듈을 추가할 수 없음, 이미 해당 스키마 안에 포"
 "함되어 있음"
 
-#: commands/extension.c:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3759 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "%s 자료형용 multirange 형을 찾을 수 없음"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3801
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "\"%s\" 파일이 너무 큽니다."
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:3894 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "\"%s\" 매개 변수 값의 구성요소로 절대 경로를 사용할 수 없음"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "\"%s\" 옵션을 찾을 수 없음"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "\"%s\" 옵션이 여러 번 제공되었음"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "\"%s\" 외부 자료 래퍼의 소유주를 변경할 권한이 없음"
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "슈퍼유저만 외부 자료 래퍼의 소유주를 바꿀 수 있습니다."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "외부 자료 래퍼의 소유주는 슈퍼유저여야 합니다."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "\"%s\" 외부 자료 래퍼가 없음"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "OID가 %u인 외부 데이터 래퍼가 없음"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "OID가 %u인 외부 서버가 없음"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "\"%s\" 외부 자료 래퍼를 만들 권한이 없음"
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "슈퍼유저만 외부 자료 래퍼를 만들 수 있습니다."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "\"%s\" 외부 자료 래퍼를 변경할 권한이 없음"
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "슈퍼유저만 외부 자료 래퍼를 바꿀 수 있습니다."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid ""
 "changing the foreign-data wrapper handler can change behavior of existing "
@@ -9351,7 +9492,7 @@ msgstr ""
 "외부 자료 랩퍼 핸들러를 바꾸면, 그것을 사용하는 외부 테이블의 내용이 바뀔 수 "
 "있습니다."
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid ""
 "changing the foreign-data wrapper validator can cause the options for "
@@ -9360,42 +9501,42 @@ msgstr ""
 "외부 자료 래퍼 유효성 검사기를 바꾸면 종속 개체에 대한 옵션이 유효하지 않을 "
 "수 있음"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "\"%s\" 이름의 외부 서버가 이미 있음, 건너뜀"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "\"%s\" 사용자 매핑이 \"%s\" 서버용으로 이미 있음, 건너뜀"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "\"%s\" 사용자 매핑이 \"%s\" 서버용으로 이미 있음"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "\"%s\" 사용자 매핑이 \"%s\" 서버용으로 없음"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "\"%s\" 사용자 매핑이 \"%s\" 서버용으로 없음, 건너뜀"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "\"%s\" 외부 자료 래퍼용 핸들러가 없음"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "\"%s\" 외부 자료 래퍼는 IMPORT FOREIGN SCHEMA 구문을 지원하지 않음"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블 가져 오는 중"
@@ -9430,199 +9571,199 @@ msgstr "셸 타입 정의를 만들고 있습니다"
 msgid "SQL function cannot accept shell type %s"
 msgstr "SQL 함수는 셸 타입 %s 수용할 수 없음"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "집계 함수는 셸 타입 %s 수용할 수 없음"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "%s 인자 자료형은 단지 셸입니다"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "%s 자료형 없음"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "집계 함수는 세트 인자를 입력 인자로 쓸 수 없음"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "프로시져에서는 집합 인자를 입력 인자로 쓸 수 없음"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "함수는 세트 인자를 쓸 수 없음"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "VARIADIC 매개 변수는 마지막 입력 매개 변수여야 함"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "VARIADIC 매개 변수는 마지막 매개 변수여야 함"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "VARIADIC 매개 변수는 배열이어야 함"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "\"%s\" 매개 변수가 여러 번 사용 됨"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "입력 매개 변수에서만 기본값을 사용할 수 있음"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "입력 매개 변수 초기값으로 테이블 참조형은 사용할 수 없음"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr ""
 "기본 값이 있는 입력 매개 변수 뒤에 오는 입력 매개 변수에도 기본 값이 있어야 "
 "함"
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr "프로시지 OUT 매개 변수는 기본값이 있는 매개 변수 뒤에 지정하면 안됨"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "프로시져 정의에 잘못된 속성이 있음"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "%s support 함수는 %s 자료형을 반환해야 함"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "support 함수를 지정하려면 슈퍼유져여야 합니다"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "COST는 양수여야 함"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "ROWS는 양수여야 함"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "함수 본문(body) 부분이 빠졌습니다"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "함수 본문(body) 부분을 중복 지정했습니다"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "함수의 language 값이 SQL일 때만 인라인 SQL 함수 본문을 쓸 수 있음"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid ""
 "SQL function with unquoted function body cannot have polymorphic arguments"
 msgstr ""
 "따옴표 없는 함수 본문을 사용하는 SQL 함수는 다형 자료형 인자를 쓸 수 없음"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr "%s 구문은 따옴표 없는 SQL 함수 본문 안에서 지원하지 않음"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "\"%s\" 언어에는 하나의 AS 항목만 필요함"
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "처리할 프로시주얼 언어를 지정하지 않았습니다"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2117
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "\"%s\" 프로시주얼 언어 없음"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2119
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr ""
 "데이터베이스 내에서 프로시주얼 언어를 사용하려면 먼저 CREATE EXTENSION 명령으"
 "로 사용할 언어를 등록하세요."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr "슈퍼유저만 leakproof 함수를 만들 수 있습니다"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "OUT 매개 변수로 인해 함수 결과 형식은 %s이어야 함"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "함수의 리턴 자료형을 지정해야 합니다"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "함수에서 세트를 반환하지 않는 경우 ROWS를 적용할 수 없음"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "%s 원본 자료형이 의사자료형(pseudo-type) 입니다"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "%s 대상 자료형이 의사자료형(pseudo-type) 입니다"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "원본 자료형이 도메인이어서 자료형 변환을 무시합니다."
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "대상 자료형이 도메인이어서 자료형 변환을 무시합니다."
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "형변환 함수는 1-3개의 인자만 지정할 수 있습니다"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid ""
 "argument of cast function must match or be binary-coercible from source data "
@@ -9631,17 +9772,17 @@ msgstr ""
 "형변환 함수의 인자로 쓸 자료형은 원본 자료형과 일치하거나 바이너리 차원으로 "
 "같은 자료형이어야 함"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "형변화 함수의 두번째 인자 자료형은 반드시 %s 형이여야 합니다"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "형변화 함수의 세번째 인자 자료형은 반드시 %s 형이여야 합니다"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid ""
 "return data type of cast function must match or be binary-coercible to "
@@ -9650,213 +9791,231 @@ msgstr ""
 "형변환 함수의 반환 자료형은 대상 자료형과 일치하거나 바이너리 차원으로 같은 "
 "자료형이어야 함"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "형변환 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "형변환 함수는 일반 함수여야 합니다"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "형변환 함수는 세트(set)를 리턴할 수 없습니다"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "CREATE CAST ... WITHOUT FUNCTION 명령은 슈퍼유저만 실행할 수 있습니다"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "원본 자료형과 대상 자료형이 서로 논리적인 호환성이 없습니다"
 
-#: commands/functioncmds.c:1709
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "복합 자료형은 바이너리와 호환되지 않음"
 
-#: commands/functioncmds.c:1715
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "배열 자료형은 바이너리와 호환되지 않음"
 
-#: commands/functioncmds.c:1723
+#: commands/functioncmds.c:1741
 #, c-format
 msgid "range data types are not binary-compatible"
 msgstr "범위 자료형은 바이너리와 호환되지 않음"
 
-#: commands/functioncmds.c:1729
+#: commands/functioncmds.c:1747
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "열거 자료형은 바이너리와 호환되지 않음"
 
-#: commands/functioncmds.c:1746
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "도메인 자료형은 바이너리와 호환되지 않음"
 
-#: commands/functioncmds.c:1756
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "원본 자료형과 대상 자료형의 형태가 같습니다"
 
-#: commands/functioncmds.c:1789
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "형변환 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/functioncmds.c:1793
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "형변환 함수는 일반 함수여야 합니다."
 
-#: commands/functioncmds.c:1797
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "형변환 함수는 세트(set)를 리턴할 수 없습니다"
 
-#: commands/functioncmds.c:1801
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "형변환 함수는 1개의 인자만 지정할 수 있습니다"
 
-#: commands/functioncmds.c:1805
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "형변화 함수의 첫번째 인자 자료형은 반드시 %s 형이여야 합니다"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "%s 자료형은 의사자료형(pseudo-type) 입니다"
 
-#: commands/functioncmds.c:1850
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "%s 자료형은 도메인입니다"
 
-#: commands/functioncmds.c:1890
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "FROM SQL 함수의 반환 자료형은 %s 형이어야 함"
 
-#: commands/functioncmds.c:1916
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "TO SQL 함수의 반환 자료형은 변환 자료형이어야 함"
 
-#: commands/functioncmds.c:1943
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "%s 자료형(대상 언어: \"%s\")을 위한 형변환 규칙은 이미 있습니다."
 
-#: commands/functioncmds.c:2029
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "%s 자료형(대상 언어: \"%s\")을 위한 형변환 규칙은 없습니다."
 
-#: commands/functioncmds.c:2053
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "%s 함수는 이미 \"%s\" 스키마안에 있습니다"
 
-#: commands/functioncmds.c:2104
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "내장 코드가 빠졌습니다"
 
-#: commands/functioncmds.c:2150
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "\"%s\" 프로시주얼 언어는 내장 코드 실행 기능을 지원하지 않습니다"
 
-#: commands/functioncmds.c:2245
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
 msgstr[0] "프로시져에 %d개의 인자 이상을 전달할 수 없음"
 
-#: commands/indexcmds.c:656
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "적어도 하나 이상의 칼럼을 지정해 주십시오"
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "하나의 인덱스에서는 %d개보다 많은 칼럼을 사용할 수 없습니다"
 
-#: commands/indexcmds.c:703
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "\"%s\" 릴레이션 대상으로 인덱스를 만들 수 없음"
 
-#: commands/indexcmds.c:729
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr "\"%s\" 파티션된 테이블 대상으로 동시에 인덱스를 만들 수 없음"
 
-#: commands/indexcmds.c:739
+#: commands/indexcmds.c:748
 #, c-format
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블에 인덱스를 만들 수는 없습니다"
 
-#: commands/indexcmds.c:777 commands/tablecmds.c:818 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "파티션 테이블용 기본 테이블스페이스를 지정할 수 없습니다."
 
-#: commands/indexcmds.c:809 commands/tablecmds.c:849 commands/tablecmds.c:3588
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "공유 관계만 pg_global 테이블스페이스에 배치할 수 있음"
 
-#: commands/indexcmds.c:842
+#: commands/indexcmds.c:851
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "사용하지 않는 \"rtree\" 방법을 \"gist\" 액세스 방법으로 대체하는 중"
 
-#: commands/indexcmds.c:863
+#: commands/indexcmds.c:872
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "\"%s\" 인덱스 접근 방법은 고유 인덱스를 지원하지 않습니다"
 
-#: commands/indexcmds.c:868
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "\"%s\" 인덱스 접근 방법은 포함된 칼럼을 지원하지 않습니다"
 
-#: commands/indexcmds.c:873
+#: commands/indexcmds.c:882
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "\"%s\" 인덱스 접근 방법은 다중 열 인덱스를 지원하지 않습니다"
 
-#: commands/indexcmds.c:878
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "\"%s\" 인덱스 접근 방법은  제외 제약 조건을 지원하지 않습니다"
 
-#: commands/indexcmds.c:1007
+#: commands/indexcmds.c:892
 #, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr "\"%s\" 접근 방법을 사용하는 인덱스와 파티션 키가 일치하지 않습니다"
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "\"%s\" 접근 방법은 WITHOUT OVERLAPS 제약 조건을 지원하지 않습니다"
 
-#: commands/indexcmds.c:1017
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr "파티션 키 정의에는 %s 제약조건을 지원하지 않음"
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "%s 제약조건은 파티션 키 포함 표현식에 사용할 수 없습니다"
 
-#: commands/indexcmds.c:1069
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469
+#: commands/indexcmds.c:2488 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553
+#: utils/adt/arrayfuncs.c:3864 utils/adt/arrayfuncs.c:4419
+#: utils/adt/arrayfuncs.c:6440 utils/adt/rowtypes.c:1220
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr ""
+"%s 자료형에서 사용할 동등 연산자(equality operator)를 찾을 수 없습니다."
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2491
+#, c-format
+msgid ""
+"There is no suitable operator in operator family \"%s\" for access method "
+"\"%s\"."
+msgstr "\"%s\" 연산자 페밀리 안에 적당한 연산자가 없음, 접근 방법: \"%s\""
+
+#: commands/indexcmds.c:1077
 #, c-format
 msgid ""
 "cannot match partition key to index on column \"%s\" using non-equal "
@@ -9865,13 +10024,13 @@ msgstr ""
 "\"%s\" 컬럼에서 같지 않음 연산자(\"%s\")를 사용하는데 이것을 파티션 키와 매치"
 "할 수 없음"
 
-#: commands/indexcmds.c:1085
+#: commands/indexcmds.c:1093
 #, c-format
 msgid ""
 "unique constraint on partitioned table must include all partitioning columns"
 msgstr "하위 테이블 용 유니크 제약조건에는 모든 파티션 칼럼이 포함되어야 함"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1094
 #, c-format
 msgid ""
 "%s constraint on table \"%s\" lacks column \"%s\" which is part of the "
@@ -9880,93 +10039,108 @@ msgstr ""
 "%s 제약조건(해당 테이블: \"%s\")에 기본키의 한 부분인 \"%s\" 칼럼이 빠져있습"
 "니다."
 
-#: commands/indexcmds.c:1105 commands/indexcmds.c:1124
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1147
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "시스템 카탈로그 테이블에 대한 인덱스 만들기는 지원하지 않습니다"
 
-#: commands/indexcmds.c:1354 tcop/utility.c:1515
+#: commands/indexcmds.c:1123
+#, c-format
+msgid "primary keys on virtual generated columns are not supported"
+msgstr "가상의 미리 계산된 칼럼 대상 기본키 지정은 지원하지 않습니다"
+
+#: commands/indexcmds.c:1125 commands/indexcmds.c:1164
+#, c-format
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr "가상의 미리 계산된 칼럼 대상 유니크 제약 조건 지정은 지원하지 않습니다"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1165
+#, c-format
+msgid "indexes on virtual generated columns are not supported"
+msgstr "가상의 미리 계산된 칼럼 대상 인덱스는 생성은 지원하지 않습니다"
+
+#: commands/indexcmds.c:1397 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "\"%s\" 파티션된 테이블 대상으로 유니크 인덱스를 만들 수 없음"
 
-#: commands/indexcmds.c:1356 tcop/utility.c:1517
+#: commands/indexcmds.c:1399 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "\"%s\" 테이블은 하위 테이블로 외부 테이블을 사용함."
 
-#: commands/indexcmds.c:1806
+#: commands/indexcmds.c:1857
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr ""
 "인덱스 술어(predicate)에서 사용하는 함수는 IMMUTABLE 특성이 있어야 합니다"
 
-#: commands/indexcmds.c:1885 parser/parse_utilcmd.c:2519
-#: parser/parse_utilcmd.c:2654
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735
+#: parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "키에서 지정한 \"%s\" 칼럼이 없습니다"
 
-#: commands/indexcmds.c:1909 parser/parse_utilcmd.c:1807
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "포함된 칼럼에 쓰인 표현식을 지원하지 않음"
 
-#: commands/indexcmds.c:1950
+#: commands/indexcmds.c:2019
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "인덱스 식(expression)에 사용하는 함수는 IMMUTABLE 특성이 있어야 합니다"
 
-#: commands/indexcmds.c:1965
+#: commands/indexcmds.c:2034
 #, c-format
 msgid "including column does not support a collation"
 msgstr "포함된 칼럼은 문자정렬규칙을 지원하지 않음"
 
-#: commands/indexcmds.c:1969
+#: commands/indexcmds.c:2038
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "포함된 칼럼은 연산자 클래스를 지원하지 않음"
 
-#: commands/indexcmds.c:1973
+#: commands/indexcmds.c:2042
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "포함된 칼럼은 ASC/DESC 옵션을 지원하지 않음"
 
-#: commands/indexcmds.c:1977
+#: commands/indexcmds.c:2046
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "포함된 칼럼은 NULLS FIRST/LAST 옵션을 지원하지 않음"
 
-#: commands/indexcmds.c:2020
+#: commands/indexcmds.c:2089
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "해당 인덱스에서 사용할 정렬규칙(collation)을 결정할 수 없습니다."
 
-#: commands/indexcmds.c:2028 commands/tablecmds.c:18185 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3771
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19959 commands/typecmds.c:812
+#: parser/parse_expr.c:2805 parser/parse_type.c:568 parser/parse_utilcmd.c:4064
 #: utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "%s 자료형은 collation 지원 안함"
 
-#: commands/indexcmds.c:2095
+#: commands/indexcmds.c:2164
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "%s 연산자는 교환법칙이 성립하지 않습니다"
 
-#: commands/indexcmds.c:2097
+#: commands/indexcmds.c:2166
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
 "exclude 제약조건용 인덱스를 만들 때는 교환법칙이 성립하는 연산자만 사용할 수 "
 "있습니다."
 
-#: commands/indexcmds.c:2123
+#: commands/indexcmds.c:2176
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "%s 연산자는 \"%s\" 연산자 패밀리 구성원이 아닙니다."
 
-#: commands/indexcmds.c:2126
+#: commands/indexcmds.c:2179
 #, c-format
 msgid ""
 "The exclusion operator must be related to the index operator class for the "
@@ -9974,25 +10148,25 @@ msgid ""
 msgstr ""
 "제외 연산자는 해당 제약 조건용 인덱스 연산자 클래스의 소속이어야 합니다."
 
-#: commands/indexcmds.c:2161
+#: commands/indexcmds.c:2228
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "\"%s\" 접근 방법은 ASC/DESC 옵션을 지원하지 않음"
 
-#: commands/indexcmds.c:2166
+#: commands/indexcmds.c:2233
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "\"%s\" 접근 방법은 NULLS FIRST/LAST 옵션을 지원하지 않음"
 
-#: commands/indexcmds.c:2210 commands/tablecmds.c:18210
-#: commands/tablecmds.c:18216 commands/typecmds.c:2311
+#: commands/indexcmds.c:2277 commands/tablecmds.c:19984
+#: commands/tablecmds.c:19990 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 "%s 자료형은 \"%s\" 인덱스 액세스 방법을 위한 기본 연산자 클래스(operator "
 "class)가 없습니다. "
 
-#: commands/indexcmds.c:2212
+#: commands/indexcmds.c:2279
 #, c-format
 msgid ""
 "You must specify an operator class for the index or define a default "
@@ -10001,87 +10175,106 @@ msgstr ""
 "이 인덱스를 위한 연산자 클래스를 지정하거나 먼저 이 자료형을 위한 기본 연산"
 "자 클래스를 정의해 두어야 합니다"
 
-#: commands/indexcmds.c:2241 commands/indexcmds.c:2249
+#: commands/indexcmds.c:2308 commands/indexcmds.c:2316
 #: commands/opclasscmds.c:205
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr ""
 "\"%s\" 연산자 클래스는 \"%s\" 인덱스 액세스 방법에서 사용할 수 없습니다"
 
-#: commands/indexcmds.c:2263 commands/typecmds.c:2299
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "\"%s\" 연산자 클래스는 %s 자료형을 사용할 수 없습니다"
 
-#: commands/indexcmds.c:2353
+#: commands/indexcmds.c:2420
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr "%s 자료형을 위한 기본 연산자 클래스가 여러개 있습니다"
 
-#: commands/indexcmds.c:2681
+#: commands/indexcmds.c:2470 commands/indexcmds.c:2489
+#, c-format
+msgid "could not identify an overlaps operator for type %s"
+msgstr "%s 자료형용 겹침 연산자를 알 수 없음"
+
+#: commands/indexcmds.c:2471 commands/indexcmds.c:2490
+#, c-format
+msgid "could not identify a contained-by operator for type %s"
+msgstr "%s 자료형용 포함 연산자를 알 수 없음"
+
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10333
+#, c-format
+msgid ""
+"Could not translate compare type %d for operator family \"%s\" of access "
+"method \"%s\"."
+msgstr ""
+"%d 자료형 비교를 해석할 수 없음, 해당 연산자 패밀리: \"%s\", 해당 접근 방법: "
+"\"%s\""
+
+#: commands/indexcmds.c:2846
 #, c-format
 msgid "unrecognized REINDEX option \"%s\""
 msgstr "알 수 없는 REINDEX 옵션: \"%s\""
 
-#: commands/indexcmds.c:2913
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "\"%s\" 테이블에는 잠금 없는 재색인 작업을 할 대상 인덱스가 없음"
 
-#: commands/indexcmds.c:2927
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "\"%s\" 테이블에는 재색인 작업을 할 인덱스가 없습니다"
 
-#: commands/indexcmds.c:2974 commands/indexcmds.c:3485
-#: commands/indexcmds.c:3615
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650
+#: commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "시스템 카탈로그 테이블 대상으로 잠금 없는 인덱스를 만들 수 없음"
 
-#: commands/indexcmds.c:2998
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "열려있는 현재 데이터베이스에서만 reindex 명령을 사용할 수 있습니다"
 
-#: commands/indexcmds.c:3090
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr ""
 "시스템 카탈로그 테이블 대상으로 잠금 없는 재색인 작업을 할 수 없음, 모두 건너"
 "뜀"
 
-#: commands/indexcmds.c:3123
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "시스템 릴레이션은 이동할 수 없습니다, 모두 건너뜀"
 
-#: commands/indexcmds.c:3169
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "\"%s.%s\" 파티션된 테이블 대상으로 인덱스 다시 만드는 중"
 
-#: commands/indexcmds.c:3172
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "\"%s.%s\" 파티션된 인덱스를 다시 만드는 중"
 
-#: commands/indexcmds.c:3365 commands/indexcmds.c:4241
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "\"%s.%s\" 테이블의 인덱스들을 다시 만들었습니다."
 
-#: commands/indexcmds.c:3517 commands/indexcmds.c:3570
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "\"%s.%s\" 인덱스가 정상적이지 않아 인덱스 다시 만들기를 건너뜀"
 
-#: commands/indexcmds.c:3520 commands/indexcmds.c:3573
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "DROP INDEX 또는 REINDEX INDEX 명령을 사용하세요."
 
-#: commands/indexcmds.c:3524
+#: commands/indexcmds.c:3689
 #, c-format
 msgid ""
 "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
@@ -10089,22 +10282,22 @@ msgstr ""
 "\"%s.%s\" exclusion 제약조건을 대상으로 잠금 없는 재색인 작업을 할 수 없음, "
 "건너뜀"
 
-#: commands/indexcmds.c:3680
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "해당 개체에 대해서는 잠금 없는 재색인 작업을 할 수 없음"
 
-#: commands/indexcmds.c:3698
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "비공유 릴레이션은 \"%s\" 테이블스페이스로 이동할 수 없습니다"
 
-#: commands/indexcmds.c:4222 commands/indexcmds.c:4234
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "\"%s.%s\" 인덱스가 다시 만들어졌음"
 
-#: commands/indexcmds.c:4224 commands/indexcmds.c:4243
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -10114,24 +10307,24 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "\"%s\" 릴레이션 잠그기 실패"
 
-#: commands/matview.c:206
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr ""
 "구체화된 뷰의 자료가 정리되고 있을 때는 CONCURRENTLY 옵션을 사용할 수 없습니"
 "다."
 
-#: commands/matview.c:212 gram.y:18918
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "%s 옵션과, %s 옵션을 함께 사용할 수 없습니다."
 
-#: commands/matview.c:269
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "\"%s\" 구체화된 뷰를 동시에 재갱신 할 수 없습니다."
 
-#: commands/matview.c:272
+#: commands/matview.c:276
 #, c-format
 msgid ""
 "Create a unique index with no WHERE clause on one or more columns of the "
@@ -10140,7 +10333,7 @@ msgstr ""
 "구체화된 뷰의 하나 또는 하나 이상의 칼럼에 대한 WHERE 절 없는 고유 인덱스를 "
 "만드세요."
 
-#: commands/matview.c:666
+#: commands/matview.c:682
 #, c-format
 msgid ""
 "new data for materialized view \"%s\" contains duplicate rows without any "
@@ -10149,15 +10342,20 @@ msgstr ""
 "\"%s\" 구체화된 뷰의 새 자료에 아무런 null 칼럼 없이 중복된 로우를 포함하고 "
 "있습니다"
 
-#: commands/matview.c:668
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "로우: %s"
 
+#: commands/matview.c:838
+#, c-format
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "\"%s\" 구체화된 뷰 대상 적당한 유니크 인덱스를 찾을 수 없음"
+
 #: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "\"%s\" 연산자  없음, 해당 접근 방법: \"%s\""
+msgstr "\"%s\" 연산자 패밀리 없음, 해당 접근 방법: \"%s\""
 
 #: commands/opclasscmds.c:267
 #, c-format
@@ -10277,119 +10475,135 @@ msgstr "바른 연산자 클래스 옵션 구문 분석 함수는 %s."
 
 #: commands/opclasscmds.c:1259
 #, c-format
-msgid "btree comparison functions must have two arguments"
-msgstr "btree 비교 함수는 두 개의 인자가 있어야 함"
+msgid "ordering comparison functions must have two arguments"
+msgstr "비교 연산용 함수는 두 개의 인자가 있어야 함"
 
 #: commands/opclasscmds.c:1263
 #, c-format
-msgid "btree comparison functions must return integer"
-msgstr "btree 비교 함수는 반드시 integer 자료형을 반환해야 함"
+msgid "ordering comparison functions must return integer"
+msgstr "비교 연산용 함수는 반드시 integer 자료형을 반환해야 함"
 
 #: commands/opclasscmds.c:1280
 #, c-format
-msgid "btree sort support functions must accept type \"internal\""
+msgid "ordering sort support functions must accept type \"internal\""
 msgstr ""
-"btree 정렬 지원 함수는 반드시 \"internal\" 자료형 입력 인자로 사용해야함"
+"정렬 지원 연산용 함수는 반드시 \"internal\" 자료형 입력 인자로 사용해야함"
 
 #: commands/opclasscmds.c:1284
 #, c-format
-msgid "btree sort support functions must return void"
-msgstr "btree 정렬 지원 함수는 반드시 void 값을 반환해야 함"
+msgid "ordering sort support functions must return void"
+msgstr "정렬 지원 연산용 함수는 반드시 void 값을 반환해야 함"
 
 #: commands/opclasscmds.c:1295
 #, c-format
-msgid "btree in_range functions must have five arguments"
-msgstr "btree in_range 함수는 다섯개의 인자가 필요합니다"
+msgid "ordering in_range functions must have five arguments"
+msgstr "in_range 연산용 함수는 다섯개의 인자가 필요합니다"
 
 #: commands/opclasscmds.c:1299
 #, c-format
-msgid "btree in_range functions must return boolean"
-msgstr "btree in_range 함수는 불리언 자료형을 반환해야 합니다"
+msgid "ordering in_range functions must return boolean"
+msgstr "in_range 연산용 함수는 불리언 자료형을 반환해야 합니다"
 
 #: commands/opclasscmds.c:1315
 #, c-format
-msgid "btree equal image functions must have one argument"
-msgstr "btree equal image 함수는 한 개의 인자가 필요합니다"
+msgid "ordering equal image functions must have one argument"
+msgstr "equal image 연산용 함수는 한 개의 인자가 필요합니다"
 
 #: commands/opclasscmds.c:1319
 #, c-format
-msgid "btree equal image functions must return boolean"
-msgstr "btree equal image 함수는 불리언 자료형을 반환해야 합니다"
+msgid "ordering equal image functions must return boolean"
+msgstr "equal image 연산용 함수는 불리언 자료형을 반환해야 합니다"
 
 #: commands/opclasscmds.c:1332
 #, c-format
-msgid "btree equal image functions must not be cross-type"
-msgstr "btree equal image 함수는 교차형(cross-type)이 아니여야 합니다"
+msgid "ordering equal image functions must not be cross-type"
+msgstr "equal image 연산용 함수는 교차형(cross-type)이 아니여야 합니다"
+
+#: commands/opclasscmds.c:1340
+#, c-format
+msgid "btree skip support functions must accept type \"internal\""
+msgstr ""
+"btree skip 지원 함수는 반드시 \"internal\" 자료형 입력 인자로 사용해야함"
+
+#: commands/opclasscmds.c:1344
+#, c-format
+msgid "btree skip support functions must return void"
+msgstr "btree skip 지원 함수는 반드시 void 값을 반환해야 함"
+
+#: commands/opclasscmds.c:1357
+#, c-format
+msgid "btree skip support functions must not be cross-type"
+msgstr "btree skip 지원 함수는 교차형(cross-type)이 아니여야 합니다"
 
-#: commands/opclasscmds.c:1342
+#: commands/opclasscmds.c:1367
 #, c-format
 msgid "hash function 1 must have one argument"
 msgstr "해시 함수는 1개의 인자만 지정할 수 있습니다"
 
-#: commands/opclasscmds.c:1346
+#: commands/opclasscmds.c:1371
 #, c-format
 msgid "hash function 1 must return integer"
 msgstr "해시 프로시저는 정수를 반환해야 함"
 
-#: commands/opclasscmds.c:1353
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "해시 함수 2는 2개의 인자만 지정할 수 있습니다"
 
-#: commands/opclasscmds.c:1357
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "해시 함수 2는 bigint형을 반환해야 함"
 
-#: commands/opclasscmds.c:1382
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "인덱스 지원 함수에 대해 관련 데이터 형식을 지정해야 함"
 
-#: commands/opclasscmds.c:1407
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "함수 번호 %d이(가) (%s,%s)에 대해 여러 번 표시됨"
 
-#: commands/opclasscmds.c:1414
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "연산자 번호 %d이(가) (%s,%s)에 대해 여러 번 표시됨"
 
-#: commands/opclasscmds.c:1460
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "%d(%s,%s) 연산자가 \"%s\" 연산자 패밀리에 이미 있음"
 
-#: commands/opclasscmds.c:1589
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "%d(%s,%s) 함수가 \"%s\" 연산자 패밀리에 이미 있음"
 
-#: commands/opclasscmds.c:1744
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "%d(%s,%s) 연산자가 \"%s\" 연산자 패밀리에 없음"
 
-#: commands/opclasscmds.c:1784
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "%d(%s,%s) 함수가 \"%s\" 연산자 패밀리에 없음"
 
-#: commands/opclasscmds.c:1815
+#: commands/opclasscmds.c:1840
 #, c-format
 msgid ""
-"operator class \"%s\" for access method \"%s\" already exists in schema "
-"\"%s\""
+"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
 msgstr ""
 "\"%s\" 연산자 클래스(\"%s\" 액세스 방법을 사용하는)는 이미 \"%s\" 스키마 안"
 "에 있습니다"
 
-#: commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1863
 #, c-format
 msgid ""
-"operator family \"%s\" for access method \"%s\" already exists in schema "
-"\"%s\""
+"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
 msgstr "\"%s\" 연산자 패밀리(접근 방법: \"%s\")가 \"%s\" 스키마에 이미 있음"
 
 #: commands/operatorcmds.c:113 commands/operatorcmds.c:121
@@ -10460,11 +10674,11 @@ msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "이미 설정 되어 \"%s\" 연산자 속성 바꿀 수 없음"
 
 #: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1740 commands/tablecmds.c:2340
-#: commands/tablecmds.c:3702 commands/tablecmds.c:6605
-#: commands/tablecmds.c:9637 commands/tablecmds.c:17772
-#: commands/tablecmds.c:17807 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/tablecmds.c:1800 commands/tablecmds.c:2400
+#: commands/tablecmds.c:3824 commands/tablecmds.c:6793
+#: commands/tablecmds.c:10089 commands/tablecmds.c:19540
+#: commands/tablecmds.c:19575 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -10505,54 +10719,54 @@ msgstr "\"%s\" 정책이 \"%s\" 테이블에 없음"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "USING 구문만 SELECT, DELETE 작업에 쓸 수 있음"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "잘못된 커서 이름: 비어있으면 안됩니다"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr ""
 "엄격한 보안 제한 작업 내에서 WITH HOLD 옵션을 사용하는 커서는 만들 수 없음"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2938 utils/adt/xml.c:3108
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "\"%s\" 이름의 커서가 없음"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "잘못된 명령문 이름: 비어있으면 안됩니다"
 
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "준비된 명령문이 SELECT 구문이 아닙니다."
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "prepared statement  \"%s\"에 매개 변수 수가 틀렸습니다"
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "%d 개의 매개 변수가 요구되는데 %d 개만이 존재합니다"
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "??? parameter $%d of type %s 는 expected type %s 로 강요할 수 없다"
 
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "\"%s\" 이름의 준비된 명령문(prepared statement)이 이미 있습니다"
 
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "\"%s\" 이름의 준비된 명령문(prepared statement) 없음"
@@ -10562,37 +10776,38 @@ msgstr "\"%s\" 이름의 준비된 명령문(prepared statement) 없음"
 msgid "must be superuser to create custom procedural language"
 msgstr "슈퍼유저만 사용자 지정 프로시저 언어를 만들 수 있음"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1865
+#: commands/publicationcmds.c:130 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1130 postmaster/postmaster.c:1232
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "\"%s\" 매개 변수 구문이 잘못 되었습니다"
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:149
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "발행용 \"%s\" 옵션에서 쓸 수 없는 값: \"%s\""
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:170
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "인식할 수 없는 발행 매개 변수: \"%s\""
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:211
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "CURRENT_SCHEMA 용 실제 스키마 없음"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:592
 msgid "System columns are not allowed."
 msgstr "시스템 칼럼은 허용하지 않음."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:599 commands/publicationcmds.c:604
+#: commands/publicationcmds.c:621
 msgid "User-defined operators are not allowed."
 msgstr "사용자 정의 연산자는 허용하지 않음."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:645
 msgid ""
 "Only columns, constants, built-in operators, built-in data types, built-in "
 "collations, and immutable built-in functions are allowed."
@@ -10600,39 +10815,39 @@ msgstr ""
 "칼럼, 상수, 내장 연산자, 내장 자료형, 내장 문자 정렬 규칙, 불변형 내장 함수"
 "만 허용합니다."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:657
 msgid "User-defined types are not allowed."
 msgstr "사용자 정의 자료형은 허용하지 않음."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:660
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "사용자 정의나 내장 함수가 mutable 인 경우 허용하지 않음."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:663
 msgid "User-defined collations are not allowed."
 msgstr "사용자 정의 문자 정렬 규칙은 허용하지 않음."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:673
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "잘못된 구독 WHERE 절 구문"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:726
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "\"%s\" 릴레이션용 구독 WHERE 절은 사용할 수 없음"
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:728
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "%s 값이 false 일때, 파티션 된 테이블에서는 WHERE 절을 사용할 수 없음."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:801 commands/publicationcmds.c:815
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "\"%s.%s\" 릴레이션용 칼럼 목록을 사용할 수 없음(해당 구독: \"%s\")"
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:804
 #, c-format
 msgid ""
 "Column lists cannot be specified in publications containing FOR TABLES IN "
@@ -10641,39 +10856,39 @@ msgstr ""
 "FOR TABLES IN SCHEMA 구문을 이용해서 구독을 만들 때는 칼럼 목록을 지정할 수 "
 "없습니다."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:818
 #, c-format
 msgid ""
 "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr ""
 "%s 값이 false 일때, 파티션 상위 테이블을 위한 칼럼 목록은 지정할 수 없습니다."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:855
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "FOR ALL TABLES 옵션의 발행을 만드려면 슈퍼유저여야만 합니다"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:930
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "FOR TABLES IN SCHEMA 구문을 사용하는 구독은 슈퍼 유저만 쓸 수 있음"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:966
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "\"wal_level\" 수준이 논리 변경 사항 발행을 하기에는 부족합니다"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:967
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "\"wal_level\" 값을 \"logical\"로 바꾸고 구독을 만들세요"
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1067 commands/publicationcmds.c:1075
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "\"%s\" 매개 변수 값으로 false를 지정할 수 없음, 해당 구독: \"%s\""
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1070
 #, c-format
 msgid ""
 "The publication contains a WHERE clause for partitioned table \"%s\", which "
@@ -10682,21 +10897,21 @@ msgstr ""
 "이 구독은 \"%s\" 파티션 상위테이블 대상 WHERE 절을 포함하고 있습니다. \"%s\" "
 "값이 false 때는 이 조건을 허용하지 않습니다."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1078
 #, c-format
 msgid ""
 "The publication contains a column list for partitioned table \"%s\", which "
 "is not allowed when \"%s\" is false."
 msgstr ""
-"이 구독은 \"%s\" 파티션 상위테이블 대상 칼럼 목록을 포함하고 있습니다. "
-"\"%s\" 값이 false 때는 이런 사용을 허용하지 않습니다."
+"이 구독은 \"%s\" 파티션 상위테이블 대상 칼럼 목록을 포함하고 있습니다. \"%s"
+"\" 값이 false 때는 이런 사용을 허용하지 않습니다."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1399
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "\"%s\" 구독에 스키마는 추가 할 수 없음"
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1401
 #, c-format
 msgid ""
 "Schemas cannot be added if any tables that specify a column list are already "
@@ -10705,83 +10920,93 @@ msgstr ""
 "이미 해당 발행에 한 부분으로 어떤 테이블의 칼럼 목록을 사용하고 있다면, 그 테"
 "이블이 있는 그 스키마는 스키마 단위로 발행에 추가 할 수 없습니다."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1449
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "스키마 지정은 슈퍼유져여야 합니다"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1458 commands/publicationcmds.c:1466
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "\"%s\" 발행은 FOR ALL TABLES 옵션으로 정의되어 있습니다."
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1460
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "FOR ALL TABLES 발행에 스키마를 추가하거나 뺄 수 없습니다."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1468
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr ""
 "FOR ALL TABLES 발행에 새 테이블을 추가하거나 한 테이블을 뺄 수 없습니다."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1492 commands/publicationcmds.c:1531
+#: commands/publicationcmds.c:2068 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "\"%s\" 이름의 발행은 없습니다"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1694 commands/publicationcmds.c:1757
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "\"%s\" 테이블 용 WHERE 절이 충돌나거나, 중복되었음"
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1701 commands/publicationcmds.c:1769
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "\"%s\" 테이블 용 칼럼 목록이 충돌나거나, 중복되었음"
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1903
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "ALTER PUBLICATION ... DROP 구문에서는 칼럼 목록을 지정하지 말아야함"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1915
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "\"%s\" 릴레이션은 해당 발행에 포함되어 있지 않습니다"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1922
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "발행에서 테이블을 뺄 때, WHERE 절은 사용할 수 없습니다."
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1982
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "\"%s\" 스키마의 테이블들은 해당 발행에 포함되어 있지 않습니다"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2025 commands/publicationcmds.c:2032
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "\"%s\" 발행의 소유주를 바꿀 권한이 없습니다"
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2027
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "FOR ALL TABLES 옵션용 발행의 소유주는 슈퍼유저여야만 합니다"
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2034
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "FOR ALL TABLES IN SCHEMA 구독의 소유주는 슈퍼유저여야만 합니다"
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2100
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "OID %u 발행 없음"
 
+#: commands/publicationcmds.c:2133
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "잘못된 발행 \"%s\" 매개 변수의 값: \"%s\""
+
+#: commands/publicationcmds.c:2134
+#, c-format
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "유효한 값은 \"%s\" 와 \"%s\" 입니다."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -10826,13 +11051,13 @@ msgstr "\"%s\" 릴레이션에 보안 라벨을 지정할 수 없음"
 
 #: commands/sequence.c:748
 #, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
-msgstr "nextval:  \"%s\" 시퀀스의 최대값(%lld)이 되었습니다"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval:  \"%s\" 시퀀스의 최대값(%<PRId64>)이 되었습니다"
 
 #: commands/sequence.c:767
 #, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
-msgstr "nextval: \"%s\" 시퀀스의 최소값(%lld)이 되었습니다"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: \"%s\" 시퀀스의 최소값(%<PRId64>)이 되었습니다"
 
 #: commands/sequence.c:886
 #, c-format
@@ -10846,8 +11071,12 @@ msgstr "이 세션에는 lastval 값이 아직까지 지정되지 않았습니
 
 #: commands/sequence.c:991
 #, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
-msgstr "setval: %lld 값은 \"%s\" 시퀀스의 범위(%lld..%lld)를 벗어났습니다"
+msgid ""
+"setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>.."
+"%<PRId64>)"
+msgstr ""
+"setval: %<PRId64> 값은 \"%s\" 시퀀스의 범위(%<PRId64>..%<PRId64>)를 벗어났습"
+"니다"
 
 #: commands/sequence.c:1357
 #, c-format
@@ -10871,43 +11100,43 @@ msgstr "INCREMENT 값은 0(zero)이 될 수 없습니다"
 
 #: commands/sequence.c:1466
 #, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) 값이 허용 범위 밖임, 해당 시퀀스 자료형: %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MAXVALUE (%<PRId64>) 값이 허용 범위 밖임, 해당 시퀀스 자료형: %s"
 
 #: commands/sequence.c:1498
 #, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) 값이 허용 범위 밖임, 해당 시퀀스 자료형: %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MINVALUE (%<PRId64>) 값이 허용 범위 밖임, 해당 시퀀스 자료형: %s"
 
 #: commands/sequence.c:1506
 #, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
-msgstr "MINVALUE (%lld) 값은 MAXVALUE (%lld) 값보다 작아야 합니다"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
+msgstr "MINVALUE (%<PRId64>) 값은 MAXVALUE (%<PRId64>) 값보다 작아야 합니다"
 
 #: commands/sequence.c:1527
 #, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "START 값(%lld)은 MINVALUE(%lld)보다 작을 수 없음"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "START 값(%<PRId64>)은 MINVALUE(%<PRId64>)보다 작을 수 없음"
 
 #: commands/sequence.c:1533
 #, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "START 값(%lld)은 MAXVALUE(%lld)보다 클 수 없음"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "START 값(%<PRId64>)은 MAXVALUE(%<PRId64>)보다 클 수 없음"
 
 #: commands/sequence.c:1557
 #, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "RESTART 값(%lld)은 MINVALUE(%lld)보다 작을 수 없음"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "RESTART 값(%<PRId64>)은 MINVALUE(%<PRId64>)보다 작을 수 없음"
 
 #: commands/sequence.c:1563
 #, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "RESTART 값(%lld)은 MAXVALUE(%lld)보다 클 수 없음"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "RESTART 값(%<PRId64>)은 MAXVALUE(%<PRId64>)보다 클 수 없음"
 
 #: commands/sequence.c:1574
 #, c-format
-msgid "CACHE (%lld) must be greater than zero"
-msgstr "CACHE (%lld) 값은 0(zero)보다 커야 합니다"
+msgid "CACHE (%<PRId64>) must be greater than zero"
+msgstr "CACHE (%<PRId64>) 값은 0(zero)보다 커야 합니다"
 
 #: commands/sequence.c:1610
 #, c-format
@@ -10939,13 +11168,13 @@ msgstr "시퀀스 및 이 시퀀스가 연결된 테이블이 같은 스키마
 msgid "cannot change ownership of identity sequence"
 msgstr "식별 시퀀스의 소유주는 바꿀 수 없음"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:14486
-#: commands/tablecmds.c:17181
+#: commands/sequence.c:1671 commands/tablecmds.c:16111
+#: commands/tablecmds.c:18949
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "\"%s\" 시퀀스는 \"%s\" 테이블에 종속되어 있습니다."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "CREATE STATISTICS 명령에서는 하나의 릴레이션만 사용할 수 있음"
@@ -10970,12 +11199,18 @@ msgstr "\"%s\" 이름의 통계정보 개체가 이미 있음"
 msgid "cannot have more than %d columns in statistics"
 msgstr "통계정보 개체에서는 %d개보다 많은 칼럼을 사용할 수 없습니다"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:247 commands/statscmds.c:276 commands/statscmds.c:316
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "시스템 칼럼에 대한 통계정보 개체 만들기는 지원하지 않습니다"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:253 commands/statscmds.c:282 commands/statscmds.c:322
+#, c-format
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr ""
+"가상의 미리 계산된 칼럼에 대한 통계정보 개체 만들기는 지원하지 않습니다"
+
+#: commands/statscmds.c:260 commands/statscmds.c:289
 #, c-format
 msgid ""
 "column \"%s\" cannot be used in statistics because its type %s has no "
@@ -10984,7 +11219,7 @@ msgstr ""
 "\"%s\" 칼럼은 사용자 통계정보 수집이 불가능합니다. %s 자료형은 기본 btree 연"
 "산자 클래스를 정의하지 않았습니다"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:339
 #, c-format
 msgid ""
 "expression cannot be used in multivariate statistics because its type %s has "
@@ -10993,7 +11228,7 @@ msgstr ""
 "%s 자료형에는 기본 btree 연산자 클래스가 없어서, 표현식은 다변적인 통계 정보"
 "에서 사용될 수 없음"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:360
 #, c-format
 msgid ""
 "when building statistics on a single expression, statistics kinds may not be "
@@ -11001,109 +11236,108 @@ msgid ""
 msgstr ""
 "단일 표현식으로 통계 정보를 만들 때, 통계 정보 종류는 지정할 수 없습니다."
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:389
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "알 수 없는 통계정보 종류 \"%s\""
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:418
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "확장된 통계정보는 두 개 이상의 칼럼이 필요합니다."
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:436
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "통계정보 정의에서 사용하는 칼럼이 중복되었습니다"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:471
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "통계정보 정의에서 표현식이 중복되었습니다"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8620
+#: commands/statscmds.c:646 commands/tablecmds.c:8914
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "대상 통계값(%d)이 너무 낮습니다"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8628
+#: commands/statscmds.c:654 commands/tablecmds.c:8922
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "%d 값으로 대상 통계값을 낮춥니다"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:678
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "\"%s.%s\" 통계정보 개체 없음, 무시함"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "알 수 없는 구독 매개 변수: \"%s\""
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:404
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:410
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "알 수 없는 오리진 값: \"%s\""
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "잘못된 WAL 위치 (LSN): %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "알 수 없는 구독 매개 변수: \"%s\""
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "%s 옵션과 %s 옵션은 함께 사용할 수 없음"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "%s 구독하려면, %s 설정이 필요함"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "발행자에게서 발행 목록을 받을 수 없음: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
 msgstr[0] "해당 발행자에게는 \"%s\" 이름의 발행은 없습니다"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "구독을 만들기 위한 권한 없음"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "\"%s\" 롤이 부여된 사용자만 구독을 만들 수 있습니다."
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
 #, c-format
-msgid "could not connect to the publisher: %s"
-msgstr "발행 서버에 연결 할 수 없음: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
+msgstr "\"%s\" 구독이 발행 서버에 연결 할 수 없음: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "\"%s\" 이름의 복제 슬롯이 없습니다"
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "구독을 만들었지만, 발행 서버로 접속은 안했습니다."
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid ""
 "To initiate replication, you must manually create the replication slot, "
@@ -11112,29 +11346,63 @@ msgstr ""
 "복제 초기화 작업은 먼저 수동으로 복제 슬롯을 만들고, 구독을 활성화하고, 해당 "
 "구독을 새로고침 하는 순서로 진행합니다."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, c-format
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "활성화된 구독에서는 \"%s\" 옵션을 설정 할 수 없음"
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid ""
+"cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr "슬롯 이름 없이는 구독에 \"%s\" 옵션을 지정할 수 없음"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "\"%s\" 이름의 구독은 없습니다."
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "구독 활성화를 위해서는 %s 설정은 할 수 없음"
 
-#: commands/subscriptioncmds.c:1233
+#: commands/subscriptioncmds.c:1270
+#, c-format
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "\"slot_name\" 속성과 \"two_phase\" 속성을 동시에 변경할 수는 없음"
+
+#: commands/subscriptioncmds.c:1286
 #, c-format
 msgid ""
-"cannot set option \"%s\" for a subscription that does not have a slot name"
-msgstr "슬롯 이름 없이는 구독에 \"%s\" 옵션을 지정할 수 없음"
+"cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr ""
+"논리 복제 작업자가 실행 중인 상태에서는 \"two_phase\" 속성을 바꿀 수 없음"
+
+#: commands/subscriptioncmds.c:1287
+#, c-format
+msgid "Try again after some time."
+msgstr "잠시 뒤에 다시 시도해 보세요."
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1300
+#, c-format
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr ""
+"미리 준비된 트랜잭션이 있는 상태에서는 \"two_phase\" 기능을 비활성화 할 수 없"
+"음"
+
+#: commands/subscriptioncmds.c:1301
+#, c-format
+msgid "Resolve these transactions and try again."
+msgstr "트랜잭션은 정리하고 다시 시도하세요."
+
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "슬롯 이름 없이는 구독을 활성화 할 수 없음"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
@@ -11142,14 +11410,14 @@ msgstr ""
 "비활성화 상태인 구독에 대해서는 ALTER SUBSCRIPTION 명령으로 갱신할 수 없습니"
 "다"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr ""
 "ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false) 명령을 사용"
 "하세요."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase "
@@ -11158,7 +11426,7 @@ msgstr ""
 "two_phase 값이 true인 상태에서는 ALTER SUBSCRIPTION 명령에서 refresh나 "
 "copy_data 옵션을 사용할 수 없습니다."
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid ""
 "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with "
@@ -11168,7 +11436,7 @@ msgstr ""
 "copy_data = false 구문을 추가하거나 DROP/CREATE SUBSCRIPTION 작업을 하세요."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid ""
 "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE "
@@ -11177,7 +11445,7 @@ msgstr ""
 "%s 명령에서 refresh = false 또는 copy_data = false 옵션을 추가하거나, DROP/"
 "CREATE SUBSCRIPTION 작업을 하세요."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
@@ -11185,7 +11453,7 @@ msgstr ""
 "비활성화 상태인 구독에 대해서는 ALTER SUBSCRIPTION ... REFRESH 명령을 허용하"
 "지 않습니다."
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase "
@@ -11194,7 +11462,7 @@ msgstr ""
 "two_phase 값이 true인 상태에서는 ALTER SUBSCRIPTION 명령에서 copy_data 옵션"
 "을 사용할 수 없습니다."
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid ""
 "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/"
@@ -11203,38 +11471,38 @@ msgstr ""
 "ALTER SUBSCRIPTION ... REFRESH 다음 copy_data = false 구문을 추가하거나 DROP/"
 "CREATE SUBSCRIPTION 작업을 하세요."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr ""
 "WAL 위치 (LSN %X/%X)를 건너뛰려면, 그 값이 원본 LSN %X/%X 보다 커야합니다"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "\"%s\" 구독 없음, 건너뜀"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "발행에서 \"%s\" 복제 슬롯을 삭제했음"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "발행용 \"%s\" 복제 슬롯을 삭제 할 수 없음: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "OID %u 구독 없음"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "해당 발행자로부터 복제 테이블 목록을 구할 수 없음: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid ""
 "subscription \"%s\" requested copy_data with origin = NONE but might copy "
@@ -11243,7 +11511,7 @@ msgstr ""
 "\"%s\" 구독이 copy_data 옵션과 origin = NONE 설정을 요구했지만, copy 자료가 "
 "다른 오리진 것입니다."
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid ""
 "The subscription being created subscribes to a publication (%s) that "
@@ -11252,9 +11520,10 @@ msgid_plural ""
 "The subscription being created subscribes to publications (%s) that contain "
 "tables that are written to by other subscriptions."
 msgstr[0] ""
-"만들어질 구독은 다른 구독에 의해 쓰여진 테이블이 포함된 발행(%s)을 구독합니다."
+"만들어질 구독은 다른 구독에 의해 쓰여진 테이블이 포함된 발행(%s)을 구독합니"
+"다."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid ""
 "Verify that initial data copied from the publisher tables did not come from "
@@ -11262,8 +11531,8 @@ msgid ""
 msgstr ""
 "복사된 초기 자료가 해당 발행의 다른 오리진에서 복사되었는지 확인하세요."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1143
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1162
 #, c-format
 msgid ""
 "cannot use different column lists for table \"%s.%s\" in different "
@@ -11272,15 +11541,15 @@ msgstr ""
 "서로 다른 발행에서 \"%s.%s\" 테이블에 대한 서로 다른 칼럼 목록을 사용할 수 없"
 "음."
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid ""
-"could not connect to publisher when attempting to drop replication slot "
-"\"%s\": %s"
+"could not connect to publisher when attempting to drop replication slot \"%s"
+"\": %s"
 msgstr "\"%s\" 복제 슬롯을 삭제하는 중에는 발행 서버로 접속할 수 없음: %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid ""
 "Use %s to disable the subscription, and then use %s to disassociate it from "
@@ -11289,194 +11558,199 @@ msgstr ""
 "구독을 중지하려면 %s 명령을 한 뒤, 슬롯 관계를 끊기 위해 %s 명령을 사용하세"
 "요."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "\"%s\" 발행 이름이 여러 번 사용 됨"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "\"%s\" 이름의 발행이 \"%s\" 구독 안에 이미 있습니다"
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "\"%s\" 발행이 \"%s\" 구독 안에 없습니다"
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "한 구독안에 있는 모든 발행은 지울 수 없음"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s 값은 불리언 값 또는 \"parallel\" 이어야 합니다."
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "\"%s\" 테이블 없음"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "\"%s\" 테이블 없음, 무시함"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "테이블을 삭제하려면, DROP TABLE 명령을 사용하세요."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "\"%s\" 시퀀스 없음"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "\"%s\" 시퀀스 없음, 무시함"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "시퀀스를 삭제하려면 DROP SEQUENCE 명령을 사용하세요."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "\"%s\" 뷰(view) 없음"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "\"%s\" 뷰(view) 없음, 무시함"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "뷰를 삭제하려면, DROP VIEW 명령을 사용하세요."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "\"%s\" 이름의 구체화된 뷰가 없음"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "\"%s\" 구체화된 뷰 없음, 건너뜀"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "구체화된 뷰를 삭제하려면, DROP MATERIALIZED VIEW 명령을 사용하세요."
 
-#: commands/tablecmds.c:279 commands/tablecmds.c:303 commands/tablecmds.c:19783
-#: parser/parse_utilcmd.c:2251
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21612
+#: parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "\"%s\" 인덱스 없음"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "\"%s\" 인덱스 없음, 무시함"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "인덱스를 삭제하려면, DROP INDEX 명령을 사용하세요."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\" 개체는 자료형이 아님"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "자료형을 삭제하려면 DROP TYPE 명령을 사용하세요."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14325
-#: commands/tablecmds.c:16886
+#: commands/tablecmds.c:294 commands/tablecmds.c:15950
+#: commands/tablecmds.c:18651
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "\"%s\" 외부 테이블 없음"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "\"%s\" 외부 테이블 없음, 건너뜀"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "외부 테이블을 삭제하려면, DROP FOREIGN TABLE 명령을 사용하세요."
 
-#: commands/tablecmds.c:734
+#: commands/tablecmds.c:802
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT 옵션은 임시 테이블에서만 사용될 수 있습니다"
 
-#: commands/tablecmds.c:765
+#: commands/tablecmds.c:819
+#, c-format
+msgid "partitioned tables cannot be unlogged"
+msgstr "파티션된 테이블은 UNLOGGED 설정을 할 수 없음"
+
+#: commands/tablecmds.c:839
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "보안 제한 작업 내에서 임시 테이블을 만들 수 없음"
 
-#: commands/tablecmds.c:801 commands/tablecmds.c:15745
+#: commands/tablecmds.c:875 commands/tablecmds.c:17375
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "\"%s\" 테이블이 여러 번 상속됨"
 
-#: commands/tablecmds.c:1067
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "\"%s\" 파티션 된 테이블 아님"
 
-#: commands/tablecmds.c:1161
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "%d개보다 많은 칼럼을 이용해서 파티션할 수 없음"
 
-#: commands/tablecmds.c:1217
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "\"%s\" 파티션된 테이블의 외부 파티션을 만들 수 없음"
 
-#: commands/tablecmds.c:1219
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "\"%s\" 테이블은 유니크 인덱스를 포함 하고 있음."
 
-#: commands/tablecmds.c:1338 commands/tablecmds.c:13341
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14927
 #, c-format
 msgid "too many array dimensions"
 msgstr "너무 많은 배열 차수"
 
-#: commands/tablecmds.c:1343 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "\"%s\" 칼럼은 SETOF를 지정할 수 없습니다"
 
-#: commands/tablecmds.c:1489
+#: commands/tablecmds.c:1549
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY 명령은 하나의 인덱스만 지울 수 있습니다"
 
-#: commands/tablecmds.c:1493
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY 명령에서는 CASCADE 옵션을 사용할 수 없음"
 
-#: commands/tablecmds.c:1597
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr ""
 "\"%s\" 파티션된 테이블의 인덱스에 대해서는 CONCURRENTLY 옵션을 사용할 수 없음"
 
-#: commands/tablecmds.c:1885
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "파티션 된 테이블만 truncate 할 수 없음"
 
-#: commands/tablecmds.c:1886
+#: commands/tablecmds.c:1946
 #, c-format
 msgid ""
 "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions "
@@ -11485,38 +11759,38 @@ msgstr ""
 "ONLY 옵션을 빼고 사용하거나, 하위 파티션 테이블을 대상으로 직접 TRUNCATE "
 "ONLY 명령을 사용하세요."
 
-#: commands/tablecmds.c:1959
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "\"%s\" 개체의 자료도 함께 삭제됨"
 
-#: commands/tablecmds.c:2320
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블에 자료를 비울 수 없음"
 
-#: commands/tablecmds.c:2377
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블 자료는 비울(truncate) 수 없습니다"
 
-#: commands/tablecmds.c:2606 commands/tablecmds.c:15642
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17272
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "\"%s\" 파티션 된 테이블로부터 상속할 수 없습니다"
 
-#: commands/tablecmds.c:2611
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "\"%s\" 파티션 테이블입니다, 그래서 상속 대상이 될 수 없습니다"
 
-#: commands/tablecmds.c:2619 parser/parse_utilcmd.c:2481
-#: parser/parse_utilcmd.c:2623
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "상속할 \"%s\" 릴레이션(relation)은 테이블도, 외부 테이블도 아닙니다"
 
-#: commands/tablecmds.c:2631
+#: commands/tablecmds.c:2700
 #, c-format
 msgid ""
 "cannot create a temporary relation as partition of permanent relation \"%s\""
@@ -11524,25 +11798,25 @@ msgstr ""
 "\"%s\" 테이블은 일반 테이블입니다. 임시 테이블을 이것의 파티션 테이블로 만들 "
 "수 없습니다"
 
-#: commands/tablecmds.c:2640 commands/tablecmds.c:15621
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17251
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "\"%s\" 임시 테이블입니다, 그래서 상속 대상이 될 수 없습니다"
 
-#: commands/tablecmds.c:2650 commands/tablecmds.c:15629
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17259
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "다른 세션의 임시 테이블입니다, 그래서 상속 대상이 될 수 없습니다"
 
-#: commands/tablecmds.c:2791 commands/tablecmds.c:2845
-#: commands/tablecmds.c:13024 parser/parse_utilcmd.c:1265
-#: parser/parse_utilcmd.c:1308 parser/parse_utilcmd.c:1735
-#: parser/parse_utilcmd.c:1843
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928
+#: commands/tablecmds.c:14610 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "전체 로우 테이블 참조형으로 변환할 수 없음"
 
-#: commands/tablecmds.c:2792 parser/parse_utilcmd.c:1266
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid ""
 "Generation expression for column \"%s\" contains a whole-row reference to "
@@ -11551,55 +11825,67 @@ msgstr ""
 "\"%s\" 칼럼용 미리 계산된 칼럼 생성식에 \"%s\" 테이블 전체 로우 참조가 있습니"
 "다"
 
-#: commands/tablecmds.c:2846 parser/parse_utilcmd.c:1309
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "\"%s\" 제약조건에 \"%s\" 테이블 전체 로우 참조가 있습니다"
 
-#: commands/tablecmds.c:2956 commands/tablecmds.c:3227
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "상속 받은 \"%s\" 칼럼은 미리 계산된 칼럼인데, 기본값이 설정되어 있음"
 
-#: commands/tablecmds.c:2961 commands/tablecmds.c:3232
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr ""
 "상속 받은 \"%s\" 칼럼은 미리 계산된 칼럼인데, 일련번호 식별 옵션이 있음"
 
-#: commands/tablecmds.c:2969 commands/tablecmds.c:3240
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr ""
 "\"%s\" 칼럼은 상속 받은 칼럼임. 미리 계산된 칼럼의 생성식을 사용할 수 없음"
 
-#: commands/tablecmds.c:2971 commands/tablecmds.c:3242
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr ""
 "하위 테이블의 계산된 칼럼은 상위 테이블에서 이미 계산된 칼럼이어야 합니다."
 
-#: commands/tablecmds.c:3017
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366
+#: commands/tablecmds.c:17537
+#, c-format
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "상속 받은 \"%s\" 칼럼은 미리 계산된 칼럼인데, 종류가 다름"
+
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
+#: commands/tablecmds.c:17538
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "상위 칼럼은 %s, 하위 칼럼은 %s."
+
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "상속 받는 \"%s\" 칼럼에 지정된 미리 계산된 생성식이 충돌합니다"
 
-#: commands/tablecmds.c:3019
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "이 충돌을 피하려면, 명시적으로 미리 계산된 생성식을 지정하십시오."
 
-#: commands/tablecmds.c:3023
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "상속 받는 \"%s\" 칼럼의 default 값이 충돌함"
 
-#: commands/tablecmds.c:3025
+#: commands/tablecmds.c:3129
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "이 충돌을 피하려면, default 값을 바르게 지정하십시오."
 
-#: commands/tablecmds.c:3080
+#: commands/tablecmds.c:3196
 #, c-format
 msgid ""
 "check constraint name \"%s\" appears multiple times but with different "
@@ -11607,188 +11893,188 @@ msgid ""
 msgstr ""
 "\"%s\" 체크 제약 조건 이름이 여러 번 나타나지만, 각각 다른 식으로 되어있음"
 
-#: commands/tablecmds.c:3131
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "\"%s\" 칼럼을 상속된 정의와 병합하는 중"
 
-#: commands/tablecmds.c:3135
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "\"%s\" 칼럼을 상속된 정의와 이동, 병합하는 중"
 
-#: commands/tablecmds.c:3136
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "사용자 지정 칼럼이 상속된 칼럼의 위치로 이동되었습니다"
 
-#: commands/tablecmds.c:3148
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "\"%s\" 칼럼의 자료형이 충돌합니다"
 
-#: commands/tablecmds.c:3150 commands/tablecmds.c:3184
-#: commands/tablecmds.c:3200 commands/tablecmds.c:3307
-#: commands/tablecmds.c:3340 commands/tablecmds.c:3356
-#: parser/parse_coerce.c:2155 parser/parse_coerce.c:2175
-#: parser/parse_coerce.c:2195 parser/parse_coerce.c:2216
-#: parser/parse_coerce.c:2271 parser/parse_coerce.c:2305
-#: parser/parse_coerce.c:2381 parser/parse_coerce.c:2412
-#: parser/parse_coerce.c:2451 parser/parse_coerce.c:2518
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302
+#: commands/tablecmds.c:3318 commands/tablecmds.c:3434
+#: commands/tablecmds.c:3462 commands/tablecmds.c:3478
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s 형과 %s 형"
 
-#: commands/tablecmds.c:3162
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "\"%s\" 칼럼의 정렬규칙이 충돌합니다"
 
-#: commands/tablecmds.c:3164 commands/tablecmds.c:3326
-#: commands/tablecmds.c:7080
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448
+#: commands/tablecmds.c:7277
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\" 형과 \"%s\" 형"
 
-#: commands/tablecmds.c:3182
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "\"%s\" 칼럼의 스토리지 설정값이 충돌합니다"
 
-#: commands/tablecmds.c:3198 commands/tablecmds.c:3354
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "\"%s\" 칼럼의 압축 방법이 충돌합니다"
 
-#: commands/tablecmds.c:3293
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "\"%s\" 칼럼이 중복되어 상속됩니다."
 
-#: commands/tablecmds.c:3305
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "상위 테이블에서 지정한 \"%s\" 칼럼의 자료형들이 일치하지 않습니다"
 
-#: commands/tablecmds.c:3324
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "상속 받은 \"%s\" 칼럼의 정렬규칙에서 충돌합니다."
 
-#: commands/tablecmds.c:3338
+#: commands/tablecmds.c:3460
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "상속 받은 \"%s\" 칼럼의 스토리지 설정값에서 충돌합니다"
 
-#: commands/tablecmds.c:3366
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "상속된 \"%s\" 칼럼에 대한 생성 충돌 발생"
 
-#: commands/tablecmds.c:3597
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블들은 이동할 수 없습니다"
 
-#: commands/tablecmds.c:3670
+#: commands/tablecmds.c:3792
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "칼럼 이름을 바꿀 수 없음"
 
-#: commands/tablecmds.c:3689
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "\"%s\" 릴레이션의 칼럼 이름을 바꿀 수 없음"
 
-#: commands/tablecmds.c:3784
+#: commands/tablecmds.c:3906
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "하위 테이블에서도 상속된 \"%s\" 칼럼의 이름을 바꾸어야 함"
 
-#: commands/tablecmds.c:3816
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "\"%s\" 이름의 칼럼은 시스템 칼럼입니다, 이름을 바꿀 수 없습니다"
 
-#: commands/tablecmds.c:3831
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "\"%s\" 이름의 칼럼은 상속 받은 칼럼입니다, 이름을 바꿀 수 없습니다"
 
-#: commands/tablecmds.c:3983
+#: commands/tablecmds.c:4108
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr ""
 "하위 테이블에서도 상속된 \"%s\" 제약조건은 하위 테이블에서도 이름이 바뀌어야 "
 "함"
 
-#: commands/tablecmds.c:3990
+#: commands/tablecmds.c:4115
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "\"%s\" 상속된 제약조건은 이름을 바꿀 수 없습니다"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4290
+#: commands/tablecmds.c:4415
 #, c-format
 msgid ""
 "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "이 세션의 활성 쿼리에서 사용 중이므로 %s \"%s\" 작업을 할 수 없음"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4299
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "보류 중인 트리거 이벤트가 있으므로 %s \"%s\" 작업을 할 수 없음"
 
-#: commands/tablecmds.c:4325
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블에 대해서는 alter 작업을 할 수 없음"
 
-#: commands/tablecmds.c:4798
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr ""
 "\"%s\" 파티션 테이블은 불완전한 detach 상태이기에 alter 작업을 할 수 없음"
 
-#: commands/tablecmds.c:5002 commands/tablecmds.c:5017
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "로그 사용/미사용 옵션을 중복 해서 지정했음"
 
-#: commands/tablecmds.c:5038
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "다중 SET ACCESS METHOD 구문은 사용할 수 없음"
 
-#: commands/tablecmds.c:5768
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "\"%s\" 시스템 릴레이션을 다시 쓰기(rewrite) 할 수 없음"
 
-#: commands/tablecmds.c:5774
+#: commands/tablecmds.c:5900
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "카탈로그 테이블로 사용되어 \"%s\" 테이블을 rewrite 못함"
 
-#: commands/tablecmds.c:5786
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "다른 세션의 임시 테이블을 다시 쓰기(rewrite) 할 수 없음"
 
-#: commands/tablecmds.c:6281
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "\"%s\" 열(해당 릴레이션 \"%s\")의 자료 가운데 null 값이 있습니다"
 
-#: commands/tablecmds.c:6298
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr ""
 "\"%s\" 체크 제약 조건(해당 릴레이션 \"%s\")을 위반하는 몇몇 자료가 있습니다"
 
-#: commands/tablecmds.c:6317 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid ""
 "updated partition constraint for default partition \"%s\" would be violated "
@@ -11796,173 +12082,164 @@ msgid ""
 msgstr ""
 "몇몇 자료가 \"%s\" 기본 파티션용에서 변경된 파티션 제약조건을 위배한 것 같음"
 
-#: commands/tablecmds.c:6323
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "\"%s\" 릴레이션의 파티션 제약 조건을 위반하는 몇몇 자료가 있습니다"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6588
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "%s ALTER 작업은 \"%s\" 릴레이션 대상으로 수행할 수 없음"
 
-#: commands/tablecmds.c:6843 commands/tablecmds.c:6850
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "\"%s\" 자료형 바꿀 수 없음(\"%s.%s\" 칼럼에서 해당 형식을 사용함)"
 
-#: commands/tablecmds.c:6857
+#: commands/tablecmds.c:7045
 #, c-format
 msgid ""
 "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
 "\"%s\" 외부 테이블을 바꿀 수 없음(\"%s.%s\" 칼럼에서 해당 로우 형을 사용함)"
 
-#: commands/tablecmds.c:6864
+#: commands/tablecmds.c:7052
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
 "\"%s\" 테이블을 바꿀 수 없음(\"%s.%s\" 칼럼에서 해당 로우 형식을 사용함)"
 
-#: commands/tablecmds.c:6920
+#: commands/tablecmds.c:7108
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr ""
 "\"%s\" 자료형을 바꿀 수 없음, 이 자료형은 typed 테이블의 자료형이기 때문"
 
-#: commands/tablecmds.c:6922
+#: commands/tablecmds.c:7110
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr ""
 "이 개체와 관계된 모든 개체들을 함께 변경하려면 ALTER ... CASCADE 명령을 사용"
 "하십시오"
 
-#: commands/tablecmds.c:6968
+#: commands/tablecmds.c:7156
+#, c-format
+msgid "type %s is the row type of another table"
+msgstr "%s 자료형은 다른 테이블의 로우형임"
+
+#: commands/tablecmds.c:7158
+#, c-format
+msgid ""
+"A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr ""
+"테이블 형태 자료형은 CREATE TYPE 명령으로 만들어 독립된 복합 자료형으로 사용"
+"해야 합니다."
+
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "%s 자료형은 복합 자료형이 아닙니다"
 
-#: commands/tablecmds.c:6995
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "typed 테이블에는 칼럼을 추가 할 수 없음"
 
-#: commands/tablecmds.c:7043
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "파티션 테이블에는 칼럼을 추가 할 수 없습니다"
 
-#: commands/tablecmds.c:7072 commands/tablecmds.c:15860
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17493
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr ""
 "\"%s\" 상속된 테이블의 \"%s\" 열 자료형이 상위 테이블의 자료형과 틀립니다"
 
-#: commands/tablecmds.c:7078 commands/tablecmds.c:15866
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17499
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr ""
 "\"%s\" 상속된 테이블의 \"%s\" 칼럼 정렬규칙이 상위 테이블의 정렬규칙과 틀립니"
 "다"
 
-#: commands/tablecmds.c:7096
+#: commands/tablecmds.c:7293
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "\"%s\" 열(\"%s\" 하위)의 정의를 병합하는 중"
 
-#: commands/tablecmds.c:7149
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "하위 테이블에 재귀적으로 식별 칼럼을 추가할 수는 없음"
 
-#: commands/tablecmds.c:7362
+#: commands/tablecmds.c:7593
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "하위 테이블에도 칼럼을 추가해야 함"
 
-#: commands/tablecmds.c:7440
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "\"%s\" 이름의 칼럼이 \"%s\" 릴레이션에 이미 있습니다, 건너뜀"
 
-#: commands/tablecmds.c:7447
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "\"%s\" 이름의 칼럼은 \"%s\" 릴레이션에 이미 있습니다"
 
-#: commands/tablecmds.c:7513 commands/tablecmds.c:12652
-#, c-format
-msgid ""
-"cannot remove constraint from only the partitioned table when partitions "
-"exist"
-msgstr "하위 테이블이 있는 경우, 상위 테이블의 제약조건만 지울 수는 없음"
-
-#: commands/tablecmds.c:7514 commands/tablecmds.c:7828
-#: commands/tablecmds.c:8006 commands/tablecmds.c:8113
-#: commands/tablecmds.c:8230 commands/tablecmds.c:9049
-#: commands/tablecmds.c:12653
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "ONLY 옵션을 빼고 사용하세요."
-
-#: commands/tablecmds.c:7550 commands/tablecmds.c:7754
-#: commands/tablecmds.c:7896 commands/tablecmds.c:8028
-#: commands/tablecmds.c:8157 commands/tablecmds.c:8251
-#: commands/tablecmds.c:8352 commands/tablecmds.c:8509
-#: commands/tablecmds.c:8662 commands/tablecmds.c:8743
-#: commands/tablecmds.c:8877 commands/tablecmds.c:12806
-#: commands/tablecmds.c:14348 commands/tablecmds.c:16975
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936
+#: commands/tablecmds.c:8137 commands/tablecmds.c:8268
+#: commands/tablecmds.c:8397 commands/tablecmds.c:8491
+#: commands/tablecmds.c:8594 commands/tablecmds.c:8790
+#: commands/tablecmds.c:8956 commands/tablecmds.c:9047
+#: commands/tablecmds.c:9181 commands/tablecmds.c:14382
+#: commands/tablecmds.c:15973 commands/tablecmds.c:18740
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "\"%s\" 칼럼은 시스템 칼럼입니다. 그래서 바꿀 수 없습니다"
 
-#: commands/tablecmds.c:7556 commands/tablecmds.c:7902
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143
+#: commands/tablecmds.c:14143
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")은 식별 칼럼입니다."
 
-#: commands/tablecmds.c:7597
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "\"%s\" 칼럼은 기본키 칼럼입니다"
-
-#: commands/tablecmds.c:7602
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "\"%s\" 칼럼 대상 인덱스는 복제 식별자로 사용 됨"
-
-#: commands/tablecmds.c:7625
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "파티션 테이블에서 \"%s\" 칼럼은 NOT NULL 속성으로 되어 있습니다"
 
-#: commands/tablecmds.c:7825 commands/tablecmds.c:9533
+#: commands/tablecmds.c:8014 commands/tablecmds.c:9988
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "하위 테이블에도 제약 조건을 추가해야 함"
 
-#: commands/tablecmds.c:7826
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246
+#: commands/tablecmds.c:8353 commands/tablecmds.c:8470
+#: commands/tablecmds.c:9354 commands/tablecmds.c:12182
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")은 이미 NOT NULL 속성이 없습니다."
+msgid "Do not specify the ONLY keyword."
+msgstr "ONLY 옵션을 빼고 사용하세요."
 
-#: commands/tablecmds.c:7911
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")은 계산된 칼럼입니다."
 
-#: commands/tablecmds.c:8005
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr "상위 파티션 테이블 단독으로 식별자 속성의 칼럼을 지정할 수 없음"
 
-#: commands/tablecmds.c:8011
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "한 하위 테이블에 식별자 속성의 칼럼을 지정할 수는 없음"
 
-#: commands/tablecmds.c:8039
+#: commands/tablecmds.c:8279
 #, c-format
 msgid ""
 "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity "
@@ -11971,120 +12248,151 @@ msgstr ""
 "식별자 옵션을 사용하려면, \"%s\" 칼럼(해당 릴레이션: \"%s\")에 NOT NULL 옵션"
 "이 있어야 합니다."
 
-#: commands/tablecmds.c:8045
+#: commands/tablecmds.c:8285
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "\"%s\" 이름의 칼럼(해당 릴레이션: \"%s\")은 이미 식별 칼럼입니다"
 
-#: commands/tablecmds.c:8051
+#: commands/tablecmds.c:8291
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "\"%s\" 이름의 칼럼(해당 릴레이션: \"%s\")은 이미 default 입니다"
 
-#: commands/tablecmds.c:8112
+#: commands/tablecmds.c:8352
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "상위 파티션 테이블만 대상으로 식별자 속성 칼럼을 바꿀 수는 없음"
 
-#: commands/tablecmds.c:8118
+#: commands/tablecmds.c:8358
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "한 하위 파티션 테이블만 대상으로 식별자 속성 칼럼을 바꿀 수는 없음"
 
-#: commands/tablecmds.c:8163 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8403 commands/tablecmds.c:8499
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "\"%s\" 이름의 칼럼(해당 릴레이션: \"%s\")은 식별 칼럼이 아닙니다"
 
-#: commands/tablecmds.c:8229
+#: commands/tablecmds.c:8469
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "상위 파티션 테이블만 대상으로 식별자 속성 칼럼을 삭제할 수는 없음"
 
-#: commands/tablecmds.c:8235
+#: commands/tablecmds.c:8475
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "한 하위 파티션 테이블만 대상으로 식별자 속성 칼럼을 삭제할 수는 없음"
 
-#: commands/tablecmds.c:8264
+#: commands/tablecmds.c:8504
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "\"%s\" 이름의 칼럼(해당 릴레이션: \"%s\")은 식별 칼럼이 아님, 건너뜀"
 
-#: commands/tablecmds.c:8358
+#: commands/tablecmds.c:8601 commands/tablecmds.c:8811
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")은 계산된 칼럼이 아님"
 
-#: commands/tablecmds.c:8456
+#: commands/tablecmds.c:8612
+#, c-format
+msgid ""
+"ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns "
+"in tables with check constraints"
+msgstr ""
+"ALTER TABLE / SET EXPRESSION 구문은 체크 제약 조건이 있는 테이블의 가상의 미"
+"리 계산된칼럼을 대상으로는 지원하지 않음"
+
+#: commands/tablecmds.c:8613 commands/tablecmds.c:8631
+#: commands/tablecmds.c:8803
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")은 가상의 미리 계산된 칼럼입니다."
+
+#: commands/tablecmds.c:8630
+#, c-format
+msgid ""
+"ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns "
+"in tables that are part of a publication"
+msgstr ""
+"ALTER TABLE / SET EXPRESSION 구문은 발행에서 사용하는 테이블의 칼럼을 대상으"
+"로는 지원하지 않음"
+
+#: commands/tablecmds.c:8737
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION 작업은 하위 테이블에도 적용되어야함"
 
-#: commands/tablecmds.c:8478
+#: commands/tablecmds.c:8759
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "상속 받은 칼럼에서는 미리 계산된 표현식을 못 없앰"
 
-#: commands/tablecmds.c:8517
+#: commands/tablecmds.c:8802
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
-msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")은 미리 계산된 칼럼이 아님"
+msgid ""
+"ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
+msgstr ""
+"ALTER TABLE / DROP EXPRESSION 작업은 가상의 미리 계산된 칼럼을 대상으로 지원"
+"하지 않음"
 
-#: commands/tablecmds.c:8522
+#: commands/tablecmds.c:8816
 #, c-format
-msgid ""
-"column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
 msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")은 미리 계산된 칼럼이 아님, 건너뜀"
 
-#: commands/tablecmds.c:8600
+#: commands/tablecmds.c:8894
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "숫자로 인덱스 사용하지 않는 칼럼을 참조할 수 없음"
 
-#: commands/tablecmds.c:8652
+#: commands/tablecmds.c:8946
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "%d번째 칼럼이 없습니다. 해당 릴레이션: \"%s\""
 
-#: commands/tablecmds.c:8671
+#: commands/tablecmds.c:8966
+#, c-format
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "\"%s\" 가상의 미리 계산된 칼럼 대상 관련 통계정보를 수정할 수 없음"
+
+#: commands/tablecmds.c:8975
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr ""
 "\"%s\" 포함된 칼럼 (해당 인덱스: \"%s\") 관련 통계정보를 수정할 수 없음"
 
-#: commands/tablecmds.c:8676
+#: commands/tablecmds.c:8980
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr ""
 "\"%s\" 비표현식 칼럼 (해당 인덱스: \"%s\") 관련 통계정보를 수정할 수 없음"
 
-#: commands/tablecmds.c:8678
+#: commands/tablecmds.c:8982
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "대신에 테이블 칼럼 대상으로 통계정보를 수정하세요."
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9228
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "typed 테이블에서 칼럼을 삭제할 수 없음"
 
-#: commands/tablecmds.c:8987
+#: commands/tablecmds.c:9292
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "\"%s\" 칼럼은 \"%s\" 릴레이션에 없음, 건너뜀"
 
-#: commands/tablecmds.c:9000
+#: commands/tablecmds.c:9305
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "\"%s\" 칼럼은 시스템 칼럼입니다, 삭제될 수 없습니다"
 
-#: commands/tablecmds.c:9010
+#: commands/tablecmds.c:9315
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "\"%s\" 칼럼은 상속받은 칼럼입니다, 삭제될 수 없습니다"
 
-#: commands/tablecmds.c:9023
+#: commands/tablecmds.c:9328
 #, c-format
 msgid ""
 "cannot drop column \"%s\" because it is part of the partition key of "
@@ -12092,14 +12400,34 @@ msgid ""
 msgstr ""
 "\"%s\" 칼럼은 \"%s\" 릴레이션의 파티션 키로 사용되고 있어 삭제 될 수 없음"
 
-#: commands/tablecmds.c:9048
+#: commands/tablecmds.c:9353
 #, c-format
 msgid ""
 "cannot drop column from only the partitioned table when partitions exist"
 msgstr ""
 "파티션 테이블이 있는 파티션된 테이블에서 그 테이블만 칼럼을 삭제 할 수 없음"
 
-#: commands/tablecmds.c:9253
+#: commands/tablecmds.c:9518
+#, c-format
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")은 NOT NULL 마크가 되어 있지 않음"
+
+#: commands/tablecmds.c:9554 commands/tablecmds.c:9566
+#, c-format
+msgid "cannot create primary key on column \"%s\""
+msgstr "\"%s\" 칼럼 대상으로는 기본키를 만들 수 없음"
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9556 commands/tablecmds.c:9568
+#, c-format
+msgid ""
+"The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is "
+"incompatible with a primary key."
+msgstr ""
+"해당 제약 조건: \"%s\", 해당 칼럼: \"%s\", 해당 테이블: \"%s\", %s 마크됨, 이"
+"것은 기본키로 호환되지 않습니다."
+
+#: commands/tablecmds.c:9692
 #, c-format
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned "
@@ -12108,7 +12436,7 @@ msgstr ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX 작업은 파티션 된 테이블 대상으로는 "
 "지원하지 않음"
 
-#: commands/tablecmds.c:9278
+#: commands/tablecmds.c:9717
 #, c-format
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
@@ -12116,7 +12444,7 @@ msgstr ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX 작업은 \"%s\" 인덱스를 \"%s\" 이름으"
 "로 바꿀 것입니다."
 
-#: commands/tablecmds.c:9615
+#: commands/tablecmds.c:10075
 #, c-format
 msgid ""
 "cannot use ONLY for foreign key on partitioned table \"%s\" referencing "
@@ -12125,31 +12453,17 @@ msgstr ""
 "\"%s\" 파티션 상위 테이블의 참조키에는 ONLY 옵션을 사용할 수 없음. 이 테이블"
 "은 \"%s\" 릴레이션을 참조 함"
 
-#: commands/tablecmds.c:9621
-#, c-format
-msgid ""
-"cannot add NOT VALID foreign key on partitioned table \"%s\" referencing "
-"relation \"%s\""
-msgstr ""
-"\"%s\" 파타션된 테이블에 NOT VALID 참조키를 추가할 수 없음 (참조 하는 테이"
-"블: \"%s\")"
-
-#: commands/tablecmds.c:9624
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr "이 기능은 파티션 된 테이블 대상으로는 아직 지원하지 않습니다."
-
-#: commands/tablecmds.c:9631 commands/tablecmds.c:10092
+#: commands/tablecmds.c:10083 commands/tablecmds.c:10710
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "참조된 \"%s\" 릴레이션은 테이블이 아닙니다"
 
-#: commands/tablecmds.c:9654
+#: commands/tablecmds.c:10106
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "영구 저장용 테이블의 제약 조건은 영구 저장용 테이블을 참조 합니다."
 
-#: commands/tablecmds.c:9661
+#: commands/tablecmds.c:10113
 #, c-format
 msgid ""
 "constraints on unlogged tables may reference only permanent or unlogged "
@@ -12158,54 +12472,113 @@ msgstr ""
 "unlogged 테이블의 제약 조건은 영구 저장용 테이블 또는 unlogged 테이블을 참조"
 "합니다."
 
-#: commands/tablecmds.c:9667
+#: commands/tablecmds.c:10119
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "임시 테이블의 제약 조건은 임시 테이블에 대해서만 참조할 것입니다."
 
-#: commands/tablecmds.c:9671
+#: commands/tablecmds.c:10123
 #, c-format
 msgid ""
 "constraints on temporary tables must involve temporary tables of this session"
 msgstr ""
 "임시 테이블의 제약 조건은 이 세션용 임시 테이블에 대해서만 적용 됩니다."
 
-#: commands/tablecmds.c:9735 commands/tablecmds.c:9741
+#: commands/tablecmds.c:10138 commands/tablecmds.c:10166
+#, c-format
+msgid ""
+"foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr ""
+"외래키가 참조되는 테이블에 대해서 PERIOD 옵션을 사용하고 있지만 참조하는 테이"
+"블은 그렇지 않음"
+
+#: commands/tablecmds.c:10178
+#, c-format
+msgid ""
+"foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr ""
+"외래키가 참조하는 테이블에 대해서 PERIOD 옵션을 사용하고 있지만 참조되는 테이"
+"블은 그렇지 않음"
+
+#: commands/tablecmds.c:10192
+#, c-format
+msgid ""
+"foreign key must use PERIOD when referencing a primary key using WITHOUT "
+"OVERLAPS"
+msgstr ""
+"WITHOUT OVERLAPS 옵션이 있는 기본키를 참조할 때는 외래키는 PERIOD 옵션을 사용"
+"해야 함"
+
+#: commands/tablecmds.c:10216 commands/tablecmds.c:10222
 #, c-format
 msgid ""
 "invalid %s action for foreign key constraint containing generated column"
 msgstr "계산된 칼럼을 포함하는 참조키 제약조건용 %s 액션은 잘못 되었음"
 
-#: commands/tablecmds.c:9757
+#: commands/tablecmds.c:10237
+#, c-format
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr "가상의 미리 계산된 칼럼 대상으로는 외래키 만들기를 지원하지 않음"
+
+#: commands/tablecmds.c:10251 commands/tablecmds.c:10260
+#, c-format
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr "PERIOD 옵션을 사용하는 외래키 대상 %s 액션은 지원하지 않음"
+
+#: commands/tablecmds.c:10275
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "참조키(foreign key) disagree를 위한 참조하는, 또는 참조되는 열 수"
 
-#: commands/tablecmds.c:9864
+#: commands/tablecmds.c:10331
+#, c-format
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "외래키를 위한 겹침 연산자를 찾을 수 없음"
+
+#: commands/tablecmds.c:10332
+#, c-format
+msgid "could not identify an equality operator for foreign key"
+msgstr "외래키를 위한 동등 연산자를 찾을 수 없음"
+
+#: commands/tablecmds.c:10397 commands/tablecmds.c:10431
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "\"%s\" 참조키(foreign key) 제약 조건은 구현되어질 수 없습니다"
 
-#: commands/tablecmds.c:9866
+#: commands/tablecmds.c:10399
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+msgid ""
+"Key columns \"%s\" of the referencing table and \"%s\" of the referenced "
+"table are of incompatible types: %s and %s."
+msgstr ""
+"참조하는 테이블의 \"%s\" 키 칼럼과 참조되는 테이블의 \"%s\" 칼럼 자료형이 호"
+"환되지 않음: %s vs %s"
+
+#: commands/tablecmds.c:10432
+#, c-format
+msgid ""
+"Key columns \"%s\" of the referencing table and \"%s\" of the referenced "
+"table have incompatible collations: \"%s\" and \"%s\".  If either collation "
+"is nondeterministic, then both collations have to be the same."
 msgstr ""
-"\"%s\" 열과 \"%s\" 열 인덱스는 함께 사용할 수 없는 자료형입니다: %s and %s."
+"참조하는 테이블의 \"%s\" 키 칼럼과 참조되는 테이블의 \"%s\" 칼럼의 문자 정렬 "
+"규칙이 호환되지 않음: \"%s\" 및 \"%s\". 두 정렬 규칙 중 하나가 비결정적이면 "
+"두 정렬 규칙은 동일해야 합니다."
 
-#: commands/tablecmds.c:10035
+#: commands/tablecmds.c:10638
 #, c-format
 msgid ""
 "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr ""
 "ON DELETE SET 동작을 지정하려는 \"%s\" 칼럼은 참조키의 한 부분이어야 합니다."
 
-#: commands/tablecmds.c:10392 commands/tablecmds.c:10832
-#: parser/parse_utilcmd.c:822 parser/parse_utilcmd.c:945
+#: commands/tablecmds.c:11022 commands/tablecmds.c:11455
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "참조키 제약 조건은 외부 테이블에서는 사용할 수 없음"
 
-#: commands/tablecmds.c:10815
+#: commands/tablecmds.c:11438
 #, c-format
 msgid ""
 "cannot attach table \"%s\" as a partition because it is referenced by "
@@ -12214,120 +12587,167 @@ msgstr ""
 "\"%s\" 테이블은 하위 테이블로 추가 될 수 없음, 이 테이블은 \"%s\" 참조키의 대"
 "상이기 때문"
 
-#: commands/tablecmds.c:11416 commands/tablecmds.c:11697
-#: commands/tablecmds.c:12609 commands/tablecmds.c:12683
+#: commands/tablecmds.c:11719
+#, c-format
+msgid ""
+"constraint \"%s\" enforceability conflicts with constraint \"%s\" on "
+"relation \"%s\""
+msgstr ""
+"\"%s\" 제약 조건의 ENFORCED 속성이 \"%s\" 제약 조건과 충돌합니다, 해당 릴레이"
+"션: \"%s\""
+
+#: commands/tablecmds.c:12181
+#, c-format
+msgid "constraint must be altered in child tables too"
+msgstr "하위 테이블에도 제약 조건을 바꿔야 함"
+
+#: commands/tablecmds.c:12210 commands/tablecmds.c:12907
+#: commands/tablecmds.c:14022 commands/tablecmds.c:14251
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "\"%s\" 제약 조건이 \"%s\" 릴레이션에 없습니다."
 
-#: commands/tablecmds.c:11423
+#: commands/tablecmds.c:12217
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")은 참조키 제약조건이 아닙니다."
 
-#: commands/tablecmds.c:11461
+#: commands/tablecmds.c:12222
+#, c-format
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")을 ENFORCED로 바꿀 수 없음"
+
+#: commands/tablecmds.c:12228
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")은 not null 제약 조건이 아님"
+
+#: commands/tablecmds.c:12236
+#, c-format
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "상속된 \"%s\" 제약 조건(해당 테이블: \"%s\")을 변경 할 수 없음"
+
+#: commands/tablecmds.c:12276
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")을 바꿀 수 없음"
 
-#: commands/tablecmds.c:11464
+#: commands/tablecmds.c:12279
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr ""
 "\"%s\" 제약 조건은 \"%s\" 제약 조건에서 파생되었음, 해당 릴레이션: \"%s\""
 
-#: commands/tablecmds.c:11466
+#: commands/tablecmds.c:12281
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "대신에, 원 제약 조건을 변경 하세요."
 
-#: commands/tablecmds.c:11705
+#: commands/tablecmds.c:12916
 #, c-format
-msgid ""
-"constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
-msgstr ""
-"\"%s\" 제약 조건(해당 테이블: \"%s\")은 참조키도 체크 제약 조건도 아닙니다."
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")의 유효성 검사를 할 수 없음"
+
+#: commands/tablecmds.c:12918
+#, c-format
+msgid "This operation is not supported for this type of constraint."
+msgstr "이 유형의 제약 조건 검사를 지원하지 않습니다."
+
+#: commands/tablecmds.c:12923
+#, c-format
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "NOT ENFORCED 제약 조건이 유효하지 않음"
 
-#: commands/tablecmds.c:11782
+#: commands/tablecmds.c:13132 commands/tablecmds.c:13232
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "하위 테이블에도 제약 조건이 유효해야 함"
 
-#: commands/tablecmds.c:11869
+#: commands/tablecmds.c:13309
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "참조키(foreign key) 제약 조건에서 참조하는 \"%s\" 칼럼이 없음"
 
-#: commands/tablecmds.c:11875
+#: commands/tablecmds.c:13315
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "시스템 칼럼은 참조키로 사용될 수 없음"
 
-#: commands/tablecmds.c:11879
+#: commands/tablecmds.c:13319
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "참조키(foreign key)에서 %d 키 개수보다 많이 가질 수 없음"
 
-#: commands/tablecmds.c:11944
+#: commands/tablecmds.c:13387
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "참조되는 \"%s\" 테이블의 지연 가능한 기본키를 사용할 수 없음"
 
-#: commands/tablecmds.c:11961
+#: commands/tablecmds.c:13404
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "참조되는 \"%s\" 테이블에는 기본키(primary key)가 없습니다"
 
-#: commands/tablecmds.c:12029
+#: commands/tablecmds.c:13477
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "참조키의 참조 칼럼 목록에 칼럼이 중복되면 안됩니다"
 
-#: commands/tablecmds.c:12121
+#: commands/tablecmds.c:13580
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "참조되는 \"%s\" 테이블의 지연 가능한 유니크 제약 조건을 사용할 수 없음"
 
-#: commands/tablecmds.c:12126
+#: commands/tablecmds.c:13585
 #, c-format
 msgid ""
 "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr ""
 "참조되는 \"%s\" 테이블을 위한 주워진 키와 일치하는 고유 제약 조건이 없습니다"
 
-#: commands/tablecmds.c:12565
+#: commands/tablecmds.c:14026
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")이 없음, 건너뜀"
+
+#: commands/tablecmds.c:14071
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "상속된 \"%s\" 제약 조건(해당 테이블: \"%s\")을 삭제할 수 없음"
 
-#: commands/tablecmds.c:12615
+#: commands/tablecmds.c:14123
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "\"%s\" 제약 조건(해당 테이블: \"%s\")이 없음, 건너뜀"
+msgid "column \"%s\" is in a primary key"
+msgstr "\"%s\" 칼럼은 기본키 칼럼입니다"
 
-#: commands/tablecmds.c:12790
+#: commands/tablecmds.c:14131
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "\"%s\" 칼럼 대상 인덱스는 복제 식별자로 사용 됨"
+
+#: commands/tablecmds.c:14364
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "typed 테이블의 칼럼 자료형은 바꿀 수 없음"
 
-#: commands/tablecmds.c:12816
+#: commands/tablecmds.c:14392
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "미리 계산된 칼럼의 자료형을 바꿀 때는 USING 구문을 지정할 수 없음"
 
-#: commands/tablecmds.c:12817 commands/tablecmds.c:18028
-#: commands/tablecmds.c:18118 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:941 rewrite/rewriteHandler.c:976
+#: commands/tablecmds.c:14393 commands/tablecmds.c:19799
+#: commands/tablecmds.c:19892 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:949 rewrite/rewriteHandler.c:984
 #, c-format
 msgid "Column \"%s\" is a generated column."
 msgstr "\"%s\" 칼럼은 미리 계산된 칼럼입니다."
 
-#: commands/tablecmds.c:12827
+#: commands/tablecmds.c:14404
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "\"%s\" 이름의 칼럼은 상속 받은 칼럼입니다, 이름을 바꿀 수 없습니다"
 
-#: commands/tablecmds.c:12836
+#: commands/tablecmds.c:14413
 #, c-format
 msgid ""
 "cannot alter column \"%s\" because it is part of the partition key of "
@@ -12336,7 +12756,7 @@ msgstr ""
 "\"%s\" 칼럼은  \"%s\" 테이블의 파티션 키 가운데 하나이기 때문에, alter 작업"
 "을 할 수 없음"
 
-#: commands/tablecmds.c:12886
+#: commands/tablecmds.c:14468
 #, c-format
 msgid ""
 "result of USING clause for column \"%s\" cannot be cast automatically to "
@@ -12344,197 +12764,197 @@ msgid ""
 msgstr ""
 "\"%s\" 칼럼에서 쓰인 USING 절의 결과가 %s 자료형으로 자동 형변환을 할 수 없음"
 
-#: commands/tablecmds.c:12889
+#: commands/tablecmds.c:14471
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "명시적 형변환을 해야할 것 같습니다."
 
-#: commands/tablecmds.c:12893
+#: commands/tablecmds.c:14475
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "\"%s\" 칼럼의 자료형을 %s 형으로 형변환할 수 없음"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:12897
+#: commands/tablecmds.c:14479
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "\"USING %s::%s\" 구문을 추가해야 할 것 같습니다."
 
-#: commands/tablecmds.c:12996
+#: commands/tablecmds.c:14582
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr ""
 "\"%s\" 칼럼은 \"%s\" 테이블의 상속된 칼럼이기에 alter 작업을 할 수 없음"
 
-#: commands/tablecmds.c:13025
+#: commands/tablecmds.c:14611
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr "USING 표현식에서 전체 로우 테이블 참조를 포함하고 있습니다."
 
-#: commands/tablecmds.c:13036
+#: commands/tablecmds.c:14622
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "하위 테이블에서도 상속된 \"%s\" 칼럼의 형식을 바꾸어야 함"
 
-#: commands/tablecmds.c:13161
+#: commands/tablecmds.c:14747
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "\"%s\" 칼럼의 자료형을 중복해서 바꿀 수는 없음"
 
-#: commands/tablecmds.c:13199
+#: commands/tablecmds.c:14785
 #, c-format
 msgid ""
 "generation expression for column \"%s\" cannot be cast automatically to type "
 "%s"
 msgstr "\"%s\" 칼럼의 생성 구문은 %s 형으로 자동 형변환할 수 없음"
 
-#: commands/tablecmds.c:13204
+#: commands/tablecmds.c:14790
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "\"%s\" 칼럼의 기본 값을 %s 형으로 형변환할 수 없음"
 
-#: commands/tablecmds.c:13508
+#: commands/tablecmds.c:15094
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "함수나 프로시져에서 사용하는 칼럼의 자료형 변경은 할 수 없음"
 
-#: commands/tablecmds.c:13509 commands/tablecmds.c:13524
-#: commands/tablecmds.c:13544 commands/tablecmds.c:13563
-#: commands/tablecmds.c:13622
+#: commands/tablecmds.c:15095 commands/tablecmds.c:15110
+#: commands/tablecmds.c:15130 commands/tablecmds.c:15149
+#: commands/tablecmds.c:15208
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s 의존대상 열: \"%s\""
 
-#: commands/tablecmds.c:13523
+#: commands/tablecmds.c:15109
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "뷰 또는 규칙에서 사용하는 칼럼의 형식을 바꿀 수 없음"
 
-#: commands/tablecmds.c:13543
+#: commands/tablecmds.c:15129
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "트리거 정의에서 사용하는 칼럼의 자료형을 바꿀 수 없음"
 
-#: commands/tablecmds.c:13562
+#: commands/tablecmds.c:15148
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "정책 정의에서 사용하는 칼럼의 자료형을 바꿀 수 없음"
 
-#: commands/tablecmds.c:13593
+#: commands/tablecmds.c:15179
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "미리 계산된 칼럼의 자료형을 바꿀 수 없음"
 
-#: commands/tablecmds.c:13594
+#: commands/tablecmds.c:15180
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "\"%s\" 칼럼은 미리 계산된 칼럼인 \"%s\"에서 사용되고 있음."
 
-#: commands/tablecmds.c:13621
+#: commands/tablecmds.c:15207
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "WHERE절이 있는 발행에서 사용되는 칼럼은 자료형을 바꿀 수 없음"
 
-#: commands/tablecmds.c:14456 commands/tablecmds.c:14468
+#: commands/tablecmds.c:16081 commands/tablecmds.c:16093
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "\"%s\" 인덱스의 소유주를 바꿀 수 없음"
 
-#: commands/tablecmds.c:14458 commands/tablecmds.c:14470
+#: commands/tablecmds.c:16083 commands/tablecmds.c:16095
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "대신에 그 인덱스의 해당 테이블 소유자을 변경하세요."
 
-#: commands/tablecmds.c:14484
+#: commands/tablecmds.c:16109
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "\"%s\" 시퀀스의 소유주를 바꿀 수 없음"
 
-#: commands/tablecmds.c:14509
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "\"%s\" 릴레이션의 소유주를 바꿀 수 없음"
 
-#: commands/tablecmds.c:14976
+#: commands/tablecmds.c:16601
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "SET TABLESPACE 구문이 중복 사용되었습니다"
 
-#: commands/tablecmds.c:15053
+#: commands/tablecmds.c:16680
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "\"%s\" 릴레이션용 옵션을 지정할 수 없음"
 
-#: commands/tablecmds.c:15087 commands/view.c:440
+#: commands/tablecmds.c:16714 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr ""
 "WITH CHECK OPTION 옵션은 자동 갱신 가능한 뷰에 대해서만 사용할 수 있습니다"
 
-#: commands/tablecmds.c:15338
+#: commands/tablecmds.c:16967
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "테이블스페이스에 테이블과 인덱스와 구체화된 뷰만 있습니다."
 
-#: commands/tablecmds.c:15350
+#: commands/tablecmds.c:16979
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr ""
 "해당 개체를 pg_global 테이블스페이스로 옮기거나 그 반대로 작업할 수 없음"
 
-#: commands/tablecmds.c:15442
+#: commands/tablecmds.c:17071
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "\"%s.%s\" 릴레이션을 잠글 수 없어 중지 중입니다"
 
-#: commands/tablecmds.c:15458
+#: commands/tablecmds.c:17087
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "검색조건에 일치하는 릴레이션이 \"%s\" 테이블스페이스에 없음"
 
-#: commands/tablecmds.c:15580
+#: commands/tablecmds.c:17209
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "typed 테이블의 상속 정보는 바꿀 수 없음"
 
-#: commands/tablecmds.c:15585 commands/tablecmds.c:16085
+#: commands/tablecmds.c:17214 commands/tablecmds.c:17798
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "파티션 테이블의 상속 정보는 바꿀 수 없음"
 
-#: commands/tablecmds.c:15590
+#: commands/tablecmds.c:17219
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "파티션된 테이블의 상속 정보는 바꿀 수 없음"
 
-#: commands/tablecmds.c:15636
+#: commands/tablecmds.c:17266
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "다른 세션의 임시 테이블을 상속할 수 없음"
 
-#: commands/tablecmds.c:15649
+#: commands/tablecmds.c:17279
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "파티션 테이블에서 상속 할 수 없음"
 
-#: commands/tablecmds.c:15671 commands/tablecmds.c:18529
+#: commands/tablecmds.c:17301 commands/tablecmds.c:20312
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "순환 되는 상속은 허용하지 않습니다"
 
-#: commands/tablecmds.c:15672 commands/tablecmds.c:18530
+#: commands/tablecmds.c:17302 commands/tablecmds.c:20313
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" 개체는 이미 \"%s\" 개체로부터 상속받은 상태입니다."
 
-#: commands/tablecmds.c:15685
+#: commands/tablecmds.c:17315
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr ""
 "\"%s\" 트리거(해당 테이블 \"%s\")은 하위테이블 상속과 관련되어 보호되고 있습"
 "니다."
 
-#: commands/tablecmds.c:15687
+#: commands/tablecmds.c:17317
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported in inheritance "
@@ -12542,119 +12962,128 @@ msgid ""
 msgstr ""
 "transition 테이블의 ROW 트리거들은 계층적 상속 테이블에서는 지원하지 않음"
 
-#: commands/tablecmds.c:15876
+#: commands/tablecmds.c:17518 commands/tablecmds.c:17767
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "자식 테이블의 \"%s\" 칼럼은 NOT NULL 속성이 있어야 합니다"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr "\"%s\" 칼럼(해당 하위 테이블: \"%s\")은 NOT NULL 마크가 되어야 함"
 
-#: commands/tablecmds.c:15885
+#: commands/tablecmds.c:17528
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "자식 테이블의 \"%s\" 칼럼은 미리 계산된 칼럼이어야 함"
 
-#: commands/tablecmds.c:15889
+#: commands/tablecmds.c:17532
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "자식 테이블의 \"%s\" 칼럼은 미리 계산된 칼럼이 아니여야 합니다."
 
-#: commands/tablecmds.c:15927
+#: commands/tablecmds.c:17578
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "자식 테이블에는 \"%s\" 칼럼이 없습니다"
 
-#: commands/tablecmds.c:16008
+#: commands/tablecmds.c:17695
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "\"%s\" 하위 테이블에 \"%s\" 체크 제약 조건에 대한 다른 정의가 있음"
 
-#: commands/tablecmds.c:16015
+#: commands/tablecmds.c:17704
 #, c-format
 msgid ""
-"constraint \"%s\" conflicts with non-inherited constraint on child table "
-"\"%s\""
+"constraint \"%s\" conflicts with non-inherited constraint on child table \"%s"
+"\""
 msgstr ""
 "\"%s\" 제약 조건이 \"%s\" 하위 테이블에 있는 비 상속 제약 조건과 충돌합니다"
 
-#: commands/tablecmds.c:16025
+#: commands/tablecmds.c:17715
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
 msgstr ""
 "\"%s\" 제약 조건이 \"%s\" 하위 테이블에 있는 NOT VALID 제약 조건과 충돌합니다"
 
-#: commands/tablecmds.c:16063
+#: commands/tablecmds.c:17726
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s"
+"\""
+msgstr ""
+"\"%s\" 제약 조건이 \"%s\" 하위 테이블에 있는 NOT ENFORCED 제약 조건과 충돌합"
+"니다"
+
+#: commands/tablecmds.c:17775
 #, c-format
 msgid "child table is missing constraint \"%s\""
-msgstr "자식 테이블에 \"%s\" 제약 조건이 없습니다"
+msgstr "하위 테이블에 \"%s\" 제약 조건이 없습니다"
 
-#: commands/tablecmds.c:16149
+#: commands/tablecmds.c:17862
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr ""
 "\"%s\" 하위 파티션과 \"%s.%s\" 상위 파티션 테이블과 분리 작업을 이미 진행, 지"
 "연 되고 있습니다."
 
-#: commands/tablecmds.c:16178 commands/tablecmds.c:16224
+#: commands/tablecmds.c:17891 commands/tablecmds.c:17939
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "\"%s\" 릴레이션은 \"%s\" 릴레이션의 파티션이 아닙니다"
 
-#: commands/tablecmds.c:16230
+#: commands/tablecmds.c:17945
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "\"%s\" 릴레이션은 \"%s\" 릴레이션의 부모가 아닙니다"
 
-#: commands/tablecmds.c:16457
+#: commands/tablecmds.c:18216
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "typed 테이블은 상속할 수 없음"
 
-#: commands/tablecmds.c:16487
+#: commands/tablecmds.c:18246
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "테이블에는 \"%s\" 칼럼이 없습니다"
 
-#: commands/tablecmds.c:16498
+#: commands/tablecmds.c:18257
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "\"%s\" 칼럼은 \"%s\" 자료형입니다."
 
-#: commands/tablecmds.c:16507
+#: commands/tablecmds.c:18266
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "\"%s\" 테이블의 \"%s\" 칼럼 자료형 틀립니다"
 
-#: commands/tablecmds.c:16521
+#: commands/tablecmds.c:18280
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "\"%s\" 칼럼은 확장형입니다"
 
-#: commands/tablecmds.c:16573
+#: commands/tablecmds.c:18332
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" 테이블은 typed 테이블이 아닙니다"
 
-#: commands/tablecmds.c:16747
+#: commands/tablecmds.c:18512
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "\"%s\" 인덱스는 유니크 인덱스가 아니여서, 복제 식별자로 사용할 수 없음"
 
-#: commands/tablecmds.c:16753
+#: commands/tablecmds.c:18518
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "\"%s\" non-immediate 인덱스는 복제 식별자로 사용할 수 없음"
 
-#: commands/tablecmds.c:16759
+#: commands/tablecmds.c:18524
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "\"%s\" 인덱스는 expression 인덱스여서, 복제 식별자로 사용할 수 없음"
 
-#: commands/tablecmds.c:16765
+#: commands/tablecmds.c:18530
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "\"%s\" 인덱스가 부분인덱스여서, 복제 식별자로 사용할 수 없음"
 
-#: commands/tablecmds.c:16782
+#: commands/tablecmds.c:18547
 #, c-format
 msgid ""
 "index \"%s\" cannot be used as replica identity because column %d is a "
@@ -12662,7 +13091,7 @@ msgid ""
 msgstr ""
 "\"%s\" 인덱스는 복제 식별자로 사용할 수 없음, %d 번째 칼럼이 시스템 칼럼임"
 
-#: commands/tablecmds.c:16789
+#: commands/tablecmds.c:18554
 #, c-format
 msgid ""
 "index \"%s\" cannot be used as replica identity because column \"%s\" is "
@@ -12671,23 +13100,23 @@ msgstr ""
 "\"%s\" 인덱스는 복제 식별자로 사용할 수 없음, \"%s\" 칼럼이 null 값 사용가능 "
 "속성임"
 
-#: commands/tablecmds.c:17041
+#: commands/tablecmds.c:18803
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "\"%s\" 테이블은 임시 테이블이기에, 통계 정보를 변경 할 수 없음"
 
-#: commands/tablecmds.c:17065
+#: commands/tablecmds.c:18827
 #, c-format
 msgid ""
 "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "\"%s\" 테이블은 발생에 사용하고 있어,  unlogged 속성으로 바꿀 수 없음"
 
-#: commands/tablecmds.c:17067
+#: commands/tablecmds.c:18829
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "unlogged 릴레이션 복제할 수 없습니다."
 
-#: commands/tablecmds.c:17112
+#: commands/tablecmds.c:18874
 #, c-format
 msgid ""
 "could not change table \"%s\" to logged because it references unlogged table "
@@ -12696,7 +13125,7 @@ msgstr ""
 "\"%s\" 테이블이 \"%s\" unlogged 테이블을 참조하고 있어 logged 속성으로 바꿀 "
 "수 없음"
 
-#: commands/tablecmds.c:17122
+#: commands/tablecmds.c:18884
 #, c-format
 msgid ""
 "could not change table \"%s\" to unlogged because it references logged table "
@@ -12705,87 +13134,87 @@ msgstr ""
 "\"%s\" 테이블이 \"%s\" logged 테이블을 참조하고 있어 unlogged 속성으로 바꿀 "
 "수 없음"
 
-#: commands/tablecmds.c:17180
+#: commands/tablecmds.c:18948
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "소유된 시퀀스를 다른 스키마로 이동할 수 없음"
 
-#: commands/tablecmds.c:17288
+#: commands/tablecmds.c:19056
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "\"%s\" 릴레이션이 \"%s\" 스키마에 이미 있습니다"
 
-#: commands/tablecmds.c:17713
+#: commands/tablecmds.c:19481
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" 개체는 테이블도 구체화된 뷰도 아닙니다"
 
-#: commands/tablecmds.c:17866
+#: commands/tablecmds.c:19634
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" 개체는 복합 자료형입니다"
 
-#: commands/tablecmds.c:17896
+#: commands/tablecmds.c:19664
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "\"%s\" 인덱스의 스키마를 바꿀 수 없음"
 
-#: commands/tablecmds.c:17898 commands/tablecmds.c:17912
+#: commands/tablecmds.c:19666 commands/tablecmds.c:19680
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "대신에 그 인덱스의 해당 테이블 스키마를 변경하세요."
 
-#: commands/tablecmds.c:17902
+#: commands/tablecmds.c:19670
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "\"%s\" 복합 자료형의 스키마를 바꿀 수 없음"
 
-#: commands/tablecmds.c:17910
+#: commands/tablecmds.c:19678
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "\"%s\" TOAST 테이블의 스키마를 바꿀 수 없음"
 
-#: commands/tablecmds.c:17942
+#: commands/tablecmds.c:19710
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "둘 이상의 칼럼을 사용할 \"list\" 파티션은 사용할 수 없습니다"
 
-#: commands/tablecmds.c:18008
+#: commands/tablecmds.c:19776
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "\"%s\" 칼럼이 파티션 키로 사용되고 있지 않습니다"
 
-#: commands/tablecmds.c:18016
+#: commands/tablecmds.c:19784
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "\"%s\" 칼럼은 시스템 칼럼입니다. 그래서 파티션 키로 사용될 수 없습니다"
 
-#: commands/tablecmds.c:18027 commands/tablecmds.c:18117
+#: commands/tablecmds.c:19798 commands/tablecmds.c:19891
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "미리 계산된 칼럼은 파티션 키로 사용할 수 없음"
 
-#: commands/tablecmds.c:18100
+#: commands/tablecmds.c:19871
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "파티션 키 표현식에서는 시스템 칼럼 참조를 포함할 수 없습니다"
 
-#: commands/tablecmds.c:18147
+#: commands/tablecmds.c:19921
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "파티션 키로 사용할 함수는 IMMUTABLE 특성이 있어야 합니다"
 
-#: commands/tablecmds.c:18156
+#: commands/tablecmds.c:19930
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "파티션 키로 상수는 쓸 수 없습니다"
 
-#: commands/tablecmds.c:18177
+#: commands/tablecmds.c:19951
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "파티션 표현식에 쓸 문자 정렬 규칙을 결정할 수 없습니다"
 
-#: commands/tablecmds.c:18212
+#: commands/tablecmds.c:19986
 #, c-format
 msgid ""
 "You must specify a hash operator class or define a default hash operator "
@@ -12794,7 +13223,7 @@ msgstr ""
 "해당 자료형을 위한 해시 연산자 클래스를 지정하거나 기본 해시 연산자 클래스를 "
 "정의해 두어야 합니다"
 
-#: commands/tablecmds.c:18218
+#: commands/tablecmds.c:19992
 #, c-format
 msgid ""
 "You must specify a btree operator class or define a default btree operator "
@@ -12803,134 +13232,134 @@ msgstr ""
 "해당 자료형을 위한 btree 연산자 클래스를 지정하거나 기본 btree 연산자 클래스"
 "를 정의해 두어야 합니다"
 
-#: commands/tablecmds.c:18469
+#: commands/tablecmds.c:20252
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\" 이름의 파티션 테이블이 이미 있습니다"
 
-#: commands/tablecmds.c:18475
+#: commands/tablecmds.c:20258
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "파티션 테이블로 typed 테이블을 추가할 수 없음"
 
-#: commands/tablecmds.c:18491
+#: commands/tablecmds.c:20274
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "파티션 테이블로 상속을 이용한 하위 테이블을 추가할 수 없음"
 
-#: commands/tablecmds.c:18505
+#: commands/tablecmds.c:20288
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "파티션 테이블로 상속용 상위 테이블을 추가할 수 없음"
 
-#: commands/tablecmds.c:18539
+#: commands/tablecmds.c:20322
 #, c-format
 msgid ""
 "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr ""
 "\"%s\" 테이블은 일반 테이블입니다, 임시 파티션 테이블을 추가할 수 없습니다"
 
-#: commands/tablecmds.c:18547
+#: commands/tablecmds.c:20330
 #, c-format
 msgid ""
 "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr ""
 "\"%s\" 테이블은 임시 테이블입니다, 일반 파티션 테이블을 추가할 수 없습니다"
 
-#: commands/tablecmds.c:18555
+#: commands/tablecmds.c:20338
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "다른 세션의 임시 테이블을 파티션 테이블로 추가할 수 없습니다"
 
-#: commands/tablecmds.c:18562
+#: commands/tablecmds.c:20345
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "다른 세션의 임시 테이블을 파티션 테이블로 추가할 수 없습니다"
 
-#: commands/tablecmds.c:18582
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr ""
 "\"%s\" 테이블의 \"%s\" 칼럼에 식별자 속성이 있는데 하위 테이블이 되려고 합니"
 "다."
 
-#: commands/tablecmds.c:18584
+#: commands/tablecmds.c:20367
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr ""
 "새로 만들어지는 하위 테이블에는 해당 칼럼에 식별자 속성이 없을 수 있습니다."
 
-#: commands/tablecmds.c:18592
+#: commands/tablecmds.c:20375
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "\"%s\" 테이블의 \"%s\" 칼럼이 상위 테이블인 \"%s\"에 없음"
 
-#: commands/tablecmds.c:18595
+#: commands/tablecmds.c:20378
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "새 파티션 테이블은 상위 테이블의 칼럼과 동일해야 합니다."
 
-#: commands/tablecmds.c:18607
+#: commands/tablecmds.c:20390
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr ""
 "\"%s\" 트리거가 \"%s\" 테이블에 있어 파티션 테이블로 포함 될 수 없습니다"
 
-#: commands/tablecmds.c:18609
+#: commands/tablecmds.c:20392
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr ""
 "transition 테이블의 ROW 트리거들은 파티션 하위 테이블에서는 쓸 수 없습니다."
 
-#: commands/tablecmds.c:18785
+#: commands/tablecmds.c:20574
 #, c-format
 msgid ""
 "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "\"%s\" 외부 테이블을 파티션된 \"%s\" 테이블의 부분으로 추가 할 수 없음"
 
-#: commands/tablecmds.c:18788
+#: commands/tablecmds.c:20577
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "\"%s\" 파티션 상위 테이블에 유니크 인덱스가 있습니다."
 
-#: commands/tablecmds.c:19110
+#: commands/tablecmds.c:20900
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "기본 하위 파티션이 있을 때는 하위 파티션 테이블 분리 작업을 할 수 없음"
 
-#: commands/tablecmds.c:19219
+#: commands/tablecmds.c:21009
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "\"%s\" 파티션 상위 테이블이 온라인 모드로 삭제 되었음"
 
-#: commands/tablecmds.c:19225
+#: commands/tablecmds.c:21015
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "\"%s\" 파티션 하위 테이블이 온라인 모드로 삭제 되었음"
 
-#: commands/tablecmds.c:19817 commands/tablecmds.c:19837
-#: commands/tablecmds.c:19858 commands/tablecmds.c:19877
-#: commands/tablecmds.c:19919
+#: commands/tablecmds.c:21646 commands/tablecmds.c:21666
+#: commands/tablecmds.c:21687 commands/tablecmds.c:21706
+#: commands/tablecmds.c:21755
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "\"%s\" 인덱스를 \"%s\" 인덱스의 파티션으로 추가할 수 없음"
 
-#: commands/tablecmds.c:19820
+#: commands/tablecmds.c:21649
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "\"%s\" 인덱스는 이미 다른 인덱스에 추가되어 있음."
 
-#: commands/tablecmds.c:19840
+#: commands/tablecmds.c:21669
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "\"%s\" 인덱스는 \"%s\" 테이블의 하위 파티션 대상 인덱스가 아닙니다."
 
-#: commands/tablecmds.c:19861
+#: commands/tablecmds.c:21690
 #, c-format
 msgid "The index definitions do not match."
 msgstr "인덱스 정의가 일치하지 않습니다."
 
-#: commands/tablecmds.c:19880
+#: commands/tablecmds.c:21709
 #, c-format
 msgid ""
 "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint "
@@ -12939,27 +13368,37 @@ msgstr ""
 "\"%s\" 인덱스는 \"%s\" 테이블의 제약조건과 연결되어 있는데, \"%s\" 인덱스를 "
 "위한 제약조건이 없습니다."
 
-#: commands/tablecmds.c:19922
+#: commands/tablecmds.c:21758
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "\"%s\" 파티션 용으로 다른 인덱스가 추가되어 있습니다."
 
-#: commands/tablecmds.c:20158
+#: commands/tablecmds.c:21881
+#, c-format
+msgid "invalid primary key definition"
+msgstr "잘못된 기본키 정의"
+
+#: commands/tablecmds.c:21882
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")에는 NOT NULL 마크가 없습니다."
+
+#: commands/tablecmds.c:22017
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "%s 형의 칼럼 자료형은 압축을 지원하지 않음"
 
-#: commands/tablecmds.c:20165
+#: commands/tablecmds.c:22024
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "잘못된 압축 방법: \"%s\""
 
-#: commands/tablecmds.c:20191
+#: commands/tablecmds.c:22050
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "잘못된 STORAGE 값: \"%s\""
 
-#: commands/tablecmds.c:20201
+#: commands/tablecmds.c:22060
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "%s 자료형의 column의 STORAGE 값은 반드시 PLAIN 이어야 합니다"
@@ -13086,246 +13525,246 @@ msgstr "%u OID 테이블스페이스용 디렉터리는 삭제될 수 없음"
 msgid "You can remove the directories manually if necessary."
 msgstr "필요하다면 OS 작업으로 그 디레터리를 삭제하세요"
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\" 개체는 테이블임"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "테이블에 INSTEAD OF 트리거는 설정할 수 없음"
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\" 개체는 파티션 상위 테이블임"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr ""
 "transition 테이블의 ROW 트리거들은 파티션 상위 테이블에서 지원하지 않음."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\" 개체는 뷰임"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "뷰에 로우 단위 BEFORE, AFTER 트리거는 설정할 수 없음"
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "뷰에 TRUNCATE 트리거는 설정할 수 없음"
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\" 개체는 외부 테이블임"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "외부테이블에 INSTEAD OF 트리거는 설정할 수 없음"
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "외부 테이블에 제약 조건 트리거는 설정할 수 없음"
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "\"%s\" 릴레이션에는 트리거를 지정할 수 없음"
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW 트리거는 지원되지 않음"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF 트리거는 FOR EACH ROW 옵션으로 설정해야 함"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF 트리거는 WHEN 조건을 사용할 수 없음"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF 트리거는 칼럼 목록을 사용할 수 없음"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "REFERENCING 절에 ROW 변수 이름 붙이기를 지원하지 않습니다."
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "이름 기반 전환 테이블은 OLD TABLE 또는 NEW TABLE 을 사용하세요."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "외부 테이블의 트리거들은 전환 테이블을 가질 수 없음."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "뷰에 정의한 트리거들은 전환 테이블을 가질 수 없음."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr ""
 "ROW 트리거들이 있는 테이블을 파티션 테이블로 포함하는 기능은 지원하지 않습니"
 "다"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "전환 테이블용 ROW 트리거는 하위 상속 테이블에서는 지정할 수 없습니다."
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "전환 테이블 이름은 AFTER 트리거에서만 사용할 수 있습니다."
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "전환 테이블에서 TRUNCATE 트리거는 지원하지 않습니다"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid ""
 "transition tables cannot be specified for triggers with more than one event"
 msgstr "전환 테이블은 하나 이상의 이벤트에 대한 트리거를 지정할 수 없습니다"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "전환 테이블은 칼럼 목록들에 대한 트리거를 지정할 수 없습니다"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE 옵션은 INSERT 또는 UPDATE 트리거에서만 사용할 수 있습니다."
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE 옵션은 중복해서 사용할 수 없음"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE 옵션은 DELETE 또는 UPDATE 트리거에서만 사용할 수 있습니다."
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE 옵션은 중복해서 사용할 수 없음"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "OLD TABLE 과 NEW TABLE 뒤에 오는 이름이 같을 수는 없습니다."
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "트리거의 WHEN 조건에는 칼럼 값을 참조할 수는 없음"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "INSERT 트리거에서의 WHEN 조건에는 OLD 값을 참조할 수 없음"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "DELETE 트리거에서의 WHEN 조건에는 NEW 값을 참조할 수 없음"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "WHEN 조건절이 있는 BEFORE 트리거는 NEW 시스템 칼럼을 참조할 수 없음"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr ""
 "WHEN 조건절이 있는 BEFORE 트리거는 NEW 미리 계산된 칼럼을 참조할 수 없음"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr ""
 "로우 전체 참조가 사용되었고, 그 테이블에는 미리 계산된 칼럼이 있습니다."
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "\"%s\" 이름의 트리거가 \"%s\" 테이블에 이미 있습니다"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "\"%s\" 트리거가 \"%s\" 테이블에 내장 또는 하위 트리거로 있음"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr " \"%s\" 트리거가  \"%s\" 릴레이션에 제약 조건 트리거로 있음"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "\"%s\" 트리거는 \"%s\" 테이블에 없음"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "\"%s\" 트리거(해당 테이블: \"%s\") 이름을 바꿀 수 없음"
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "대신에 상위 파티션 테이블인 \"%s\" 테이블의 트리거 이름을 바꾸세요."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "\"%s\" 트리거(해당 테이블: \"%s\") 이름을 바꿨음"
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "액세스 권한 없음: \"%s\" 개체는 시스템 트리거임"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "%u 트리거 함수가 null 값을 리턴했습니다"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "BEFORE STATEMENT 트리거는 리턴값이 있으면 안됩니다"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid ""
 "moving row to another partition during a BEFORE FOR EACH ROW trigger is not "
@@ -13334,17 +13773,22 @@ msgstr ""
 "BEFORE FOR EACH ROW 트리거가 실행 중일 때 다른 파티션으로 로우는 옮기는 것은 "
 "지원 하지 않습니다."
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid ""
 "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr ""
 "\"%s\" 트리거가 실행되기 전에, 그 로우는 \"%s.%s\" 파티션에 있었습니다."
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1541
-#: executor/nodeModifyTable.c:1615 executor/nodeModifyTable.c:2377
-#: executor/nodeModifyTable.c:2468 executor/nodeModifyTable.c:3132
-#: executor/nodeModifyTable.c:3302
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "하위 외부 테이블에서 transition 튜플을 모을 수 없음"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3331
+#: executor/nodeModifyTable.c:3502
 #, c-format
 msgid ""
 "Consider using an AFTER trigger instead of a BEFORE trigger to propagate "
@@ -13353,32 +13797,32 @@ msgstr ""
 "다른 로우를 변경하는 일을 BEFORE 트리거 대신에 AFTER 트리거 사용을 고려해 보"
 "십시오"
 
-#: commands/trigger.c:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:314
-#: executor/nodeModifyTable.c:1557 executor/nodeModifyTable.c:2394
-#: executor/nodeModifyTable.c:2618
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "동시 업데이트 때문에 순차적 액세스가 불가능합니다"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1647
-#: executor/nodeModifyTable.c:2485 executor/nodeModifyTable.c:2642
-#: executor/nodeModifyTable.c:3150
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2834
+#: executor/nodeModifyTable.c:3349
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "동시 삭제 작업 때문에 순차적 액세스가 불가능합니다"
 
-#: commands/trigger.c:4601
+#: commands/trigger.c:4687
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "보안 제한 작업 내에서는 지연 속성 트리거를 실행할 수 없음"
 
-#: commands/trigger.c:5782
+#: commands/trigger.c:5868
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "\"%s\" 제약 조건은 DEFERRABLE 속성으로 만들어지지 않았습니다"
 
-#: commands/trigger.c:5805
+#: commands/trigger.c:5891
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "\"%s\" 이름의 제약 조건이 없음"
@@ -13492,7 +13936,7 @@ msgstr ""
 "쉘 타입으로 그 자료형을 만들고, 그것을 쓰기 위한 I/O 함수를 만들고, 끝으로 "
 "CREATE TYPE 명령을 사용해서 자료형을 만드세요."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "잘못된 \"%s\" 속성의 자료형"
@@ -13512,7 +13956,7 @@ msgstr "배열 요소의 자료형으로 %s 자료형을 사용할 수 없습니
 msgid "alignment \"%s\" not recognized"
 msgstr "잘못된 ALIGNMENT 값: \"%s\""
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "잘못된 STORAGE 값: \"%s\""
@@ -13545,74 +13989,94 @@ msgstr ""
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "\"%s\" 자료형은 도메인의 기반 자료형이 아닙니다"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "default 표현식 여러개 있음"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "NULL/NOT NULL 조건이 함께 있음"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "중복된 NOT NULL 제약 조건 정의"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "도메인용 not null 제약 조건에는 NO INHERIT 옵션을 사용할 수 없음"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "도메인용 체크 제약 조건에는 NO INHERIT 옵션을 사용할 수 없음"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "고유 제약 조건은 도메인 정의에 사용할 수 없음"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "기본키 제약 조건을 도메인 정의에 사용할 수 없음"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "exclusion 제약 조건은 도메인에는 사용할 수 없음"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "참조키(foreign key) 제약 조건은 도메인(domain) 정의에 사용할 수 없음"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "도메인에 대해 제약 조건 지연을 지정할 수 없음"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
+#, c-format
+msgid "specifying GENERATED not supported for domains"
+msgstr "도메인에 대해 GENERATED 옵션을 지정할 수 없음"
+
+#: commands/typecmds.c:1043
+#, c-format
+msgid "specifying constraint enforceability not supported for domains"
+msgstr "도메인에 대해 ENFORCED 옵션을 지정할 수 없음"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s 개체는 나열형이 아님"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "\"subtype\" 속성이 필요함"
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "range subtype은 %s 아니여야 함"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr ""
 "range 형에 정렬 규칙을 지정했지만, 소속 자료형이 그 정렬 규칙을 지원하지 않습"
 "니다"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "미리 만들어진 쉘 타입 없는 canonical 함수를 지정할 수 없음"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid ""
 "Create the type as a shell type, then create its canonicalization function, "
@@ -13621,92 +14085,92 @@ msgstr ""
 "먼저 쉘 타입 자료형을 만들고, canonical 함수를 만든 다음 CREATE TYPE 명령으"
 "로 해당 자료형을 만드세요."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "자료형 %s 입력 함수가 여러 개 있습니다"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "자료형 %s 입력 함수의 %s 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "%s 자료형 입력 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "%s 자료형 출력 함수는 %s 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "%s 자료형 출력 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "%s 자료형 receive 함수가 여러 개 있습니다"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "%s 자료형 receive 함수는 %s 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "%s 자료형 수신 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "%s 자료형 전송 함수는 %s 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "%s 자료형 송신 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "%s typmod_in 함수는 %s 자료형을 반환해야 함"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "%s 자료형 형변환 입력 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "%s typmod_out 함수는 %s 자료형을 반환해야 함"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "%s 자료형 형변환 출력 함수는 volatile 특성이 없어야 합니다"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "%s 자료형 분석 함수는 %s 자료형을 반환해야 함"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "%s subscripting 함수의 반환값 자료형은 %s 형이어야 함"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "사용자 정의 자료형은 %s subscripting 함수에서 쓸 수 없음"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid ""
 "You must specify an operator class for the range type or define a default "
@@ -13715,64 +14179,64 @@ msgstr ""
 "subtype을 위한 기본 연산자 클래스나 range 자료형을 위한 하나의 연산자 클래스"
 "를 지정해야 합니다"
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "%s 범위 기준 함수는 range 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "%s 범위 기준 함수는 immutable 속성이어야 합니다"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "%s 범위 하위 자료 비교 함수는  %s 자료형을 반환해야 합니다"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "%s 범위 하위 자료 비교 함수는 immutable 속성이어야 합니다"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때 pg_type 배열 OID 값이 지정되지 않았습니다"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr ""
 "이진 업그레이드 작업 때 pg_type multirange OID 값이 지정되지 않았습니다"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr ""
 "이진 업그레이드 작업 때 pg_type multirange 배열 OID 값이 지정되지 않았습니다"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "\"%s\" 제약 조건 \"%s\" 도메인에 포함되어 있지 않습니다."
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "\"%s\" 제약 조건 \"%s\" 도메인에 포함되어 있지 않음, 건너뜀"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "\"%s\" 제약 조건(해당 도메인: \"%s\")은 check 제약조건이 아님"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "\"%s\" 열(해당 테이블 \"%s\")의 자료 가운데 null 값이 있습니다"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, c-format
 msgid ""
 "column \"%s\" of table \"%s\" contains values that violate the new constraint"
@@ -13780,119 +14244,119 @@ msgstr ""
 "\"%s\" 열(해당 테이블 \"%s\")의 자료 중에, 새 제약 조건을 위반하는 자료가 있"
 "습니다"
 
-#: commands/typecmds.c:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "\"%s\" 이름의 개체는 도메인이 아닙니다"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "\"%s\" 제약 조건이 \"%s\" 도메인에 이미 지정되어 있습니다"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "도메인 용 체크 제약 조건에서는 테이블 참조를 사용할 수 없습니다"
 
-#: commands/typecmds.c:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s 자료형은 테이블의 행 자료형(row type)입니다"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "%s 배열 자료형을 바꿀 수 없음"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr ""
 "%s 자료형을 바꿀 수 있으며, 이렇게 하면 해당 자료형 배열의 자료형도 변경됩니"
 "다."
 
-#: commands/typecmds.c:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "%s 다중 범위 자료형은 바꿀 수 없음"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "%s 자료형을 바꿀 수 있으며, 이렇게 하면 다중 범위 자료형도 변경됩니다."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "%s 자료형이 이미 \"%s\" 스키마 안에 있습니다"
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "저장 옵션을 PLAIN으로 바꿀 수 없음"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "\"%s\" 자료형 속성 바꿀 수 없음"
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "슈퍼유저만 자료형 속성을 바꿀 수 있음"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "\"%s\" 개체는 기본 자료형이 아님"
 
-#: commands/user.c:200
+#: commands/user.c:201
 #, c-format
 msgid "SYSID can no longer be specified"
 msgstr "SYSID는 더 이상 지정할 수 없음"
 
-#: commands/user.c:318 commands/user.c:324 commands/user.c:330
-#: commands/user.c:336 commands/user.c:342
+#: commands/user.c:319 commands/user.c:325 commands/user.c:331
+#: commands/user.c:337 commands/user.c:343
 #, c-format
 msgid "permission denied to create role"
 msgstr "롤 만들 권한 없음"
 
-#: commands/user.c:319
+#: commands/user.c:320
 #, c-format
 msgid "Only roles with the %s attribute may create roles."
 msgstr "%s 속성을 가지고 있는 롤만이 롤을 만들 수 있습니다."
 
-#: commands/user.c:325 commands/user.c:331 commands/user.c:337
-#: commands/user.c:343
+#: commands/user.c:326 commands/user.c:332 commands/user.c:338
+#: commands/user.c:344
 #, c-format
 msgid ""
 "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "%s 속성을 가지고 있는 롤만 %s 속성을 가진 롤을 만들 수 있습니다."
 
-#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393
-#: utils/adt/acl.c:5574 utils/adt/acl.c:5580 gram.y:17310 gram.y:17356
+#: commands/user.c:355 commands/user.c:1386 commands/user.c:1393
+#: utils/adt/acl.c:5707 utils/adt/acl.c:5713 gram.y:17473 gram.y:17519
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "\"%s\" 롤 이름은 내부적으로 사용되고 있습니다"
 
-#: commands/user.c:356 commands/user.c:1388 commands/user.c:1395
+#: commands/user.c:357 commands/user.c:1388 commands/user.c:1395
 #, c-format
 msgid "Role names starting with \"pg_\" are reserved."
 msgstr "\"pg_\"로 시작하는 롤 이름은 사용할 수 없습니다."
 
-#: commands/user.c:377 commands/user.c:1410
+#: commands/user.c:378 commands/user.c:1410
 #, c-format
 msgid "role \"%s\" already exists"
 msgstr "\"%s\" 롤 이름이 이미 있습니다"
 
-#: commands/user.c:439 commands/user.c:924
+#: commands/user.c:440 commands/user.c:924
 #, c-format
 msgid "empty string is not a valid password, clearing password"
 msgstr "비밀번호로 빈 문자열을 사용할 수 없습니다. 비밀번호를 없앱니다"
 
-#: commands/user.c:468
+#: commands/user.c:469
 #, c-format
 msgid "pg_authid OID value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때 pg_authid OID 값이 지정되지 않았습니다"
@@ -13976,11 +14440,11 @@ msgstr ""
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "DROP ROLE 명령으로 삭제할 수 없는 특별한 롤입니다"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:851
-#: commands/variable.c:854 commands/variable.c:971 commands/variable.c:974
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:799
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "\"%s\" 롤(role) 없음"
@@ -14052,7 +14516,7 @@ msgstr ""
 msgid "MD5 password cleared because of role rename"
 msgstr "롤 이름이 변경 되어 MD5 암호를 지웠습니다"
 
-#: commands/user.c:1518 gram.y:1294
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "인식할 수 없는 롤 옵션 \"%s\""
@@ -14093,91 +14557,91 @@ msgstr "\"%s\" 롤의 권한을 가진 롤만 해당 객체의 소유주를 바
 msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr "\"%s\" 롤의 권한을 가진 롤만 해당 객체를 다시 지정 할 수 있습니다."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "\"%s\" 롤은 다른 롤의 맴버가 될 수 없음"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "\"%s\" 롤은  \"%s\" 롤의 구성원입니다"
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "%s 옵션은 이 롤에 권한 부여한 롤에게 다시 부여될 수 없습니다."
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid ""
 "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "\"%s\" 롤은 \"%s\"롤의 구성원입니다, 해당 작업 롤: \"%s\""
 
-#: commands/user.c:2024
+#: commands/user.c:2036
 #, c-format
 msgid ""
 "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "\"%s\" 롤은 \"%s\"롤의 구성원이 아닙니다, 해당 작업 롤: \"%s\""
 
-#: commands/user.c:2124
+#: commands/user.c:2137
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "\"%s\" 롤은 명시적 맴버를 가질 수 없음"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2148 commands/user.c:2171
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "\"%s\" 롤 권한을 지정할 수 없음"
 
-#: commands/user.c:2137
+#: commands/user.c:2150
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "%s 속성이 있는 롤만 %s 속성 권한을 부여할 수 있음."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2155 commands/user.c:2178
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "\"%s\" 롤 권한 회수할 수 없음"
 
-#: commands/user.c:2144
+#: commands/user.c:2157
 #, c-format
 msgid ""
 "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "%s 속성이 있는 롤만이 %s 속성 권한을 회수할 수 있음."
 
-#: commands/user.c:2160
+#: commands/user.c:2173
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "%s 옵션을 롤(해당 롤: \"%s\")만이 이 롤 권한을 부여할 수 있음."
 
-#: commands/user.c:2167
+#: commands/user.c:2180
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "%s 옵션을 롤(해당 롤: \"%s\")만이 이 롤 권한을 회수할 수 있음."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2260 commands/user.c:2269
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "\"%s\" 롤 권한을 부여할 수 없음"
 
-#: commands/user.c:2249
+#: commands/user.c:2262
 #, c-format
 msgid ""
 "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "\"%s\" 롤 권한이 있는 롤만이 이 롤 권한을 부여할 수 있음."
 
-#: commands/user.c:2258
+#: commands/user.c:2271
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "권한 부여자는 %s 옵션(해당 롤: \"%s\")이 있어야 함"
 
-#: commands/user.c:2266
+#: commands/user.c:2279
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "\"%s\" 롤이 부여한 권한을 회수 할 수 있는 권한 없음"
 
-#: commands/user.c:2268
+#: commands/user.c:2281
 #, c-format
 msgid ""
 "Only roles with privileges of role \"%s\" may revoke privileges granted by "
@@ -14185,126 +14649,130 @@ msgid ""
 msgstr ""
 "\"%s\" 롤 권한이 있는 롤만이 이 롤에 의해 부여한 권한을 회수할 수 있음."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2504 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "의존적인 권한이 존재합니다"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2505 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "그것들을 취소하려면 \"CASCADE\"를 사용하세요."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:147
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
-msgstr ""
-"\"vacuum_buffer_usage_limit\" 값은 0 이거나 %d kB에서 %d kB 사이값이여야 함"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
+msgstr "\"%s\" 값은 0 이거나 %d kB에서 %d kB 사이값이여야 함"
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:223
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "BUFFER_USAGE_LIMIT 옵션 값은 0 이거나 %d kB에서 %d kB 사이값이여야 함"
 
-#: commands/vacuum.c:219
+#: commands/vacuum.c:233
 #, c-format
 msgid "unrecognized ANALYZE option \"%s\""
 msgstr "알 수 없는 ANALYZE 옵션: \"%s\""
 
-#: commands/vacuum.c:259
+#: commands/vacuum.c:273
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "병렬 옵션은 0부터 %d까지 값만 사용할 수 있음"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:285
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "청소용 병렬 작업자수는 0부터 %d까지 값만 사용할 수 있음"
 
-#: commands/vacuum.c:292
+#: commands/vacuum.c:306
 #, c-format
 msgid "unrecognized VACUUM option \"%s\""
 msgstr "알 수 없는 VACUUM 옵션 \"%s\""
 
-#: commands/vacuum.c:318
+#: commands/vacuum.c:332
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL 작업은 병렬로 처리할 수 없음"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:343
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "VACUUM FULL 작업에서는 BUFFER_USAGE_LIMIT 설정을 지정할 수 없음"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:357
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "ANALYZE 옵션은 칼럼 목록이 제공될 때 사용할 수 있습니다"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:369
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr ""
 "VACUUM 명령에서 DISABLE_PAGE_SKIPPING 옵션과 FULL 옵션을 함께 사용할 수 없습"
 "니다."
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:376
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "VACUUM FULL 작업은 PROCESS_TOAST 옵션이 포함되어야 함"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:385
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS 옵션은 여러 테이블 목록 대상으로는 사용할 수 없음"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:394
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr ""
 "ONLY_DATABASE_STATS 옵션은 다른 VACUUM 옵션들과 함께 사용할 수 없습니다."
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:534
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s 명령은 VACUUM, ANALYZE 명령에서 실행 될 수 없음"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:756
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "\"%s\" 청소할 접근 권한 없음, 건너 뜀"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:769
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "\"%s\" 통계정보 수집할 권한 없음, 건너 뜀"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:847 commands/vacuum.c:948
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "\"%s\" 개체 vacuum 건너뜀 --- 사용 가능한 잠금이 없음"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:852
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "\"%s\" 개체 vacuum 건너뜀 --- 해당 릴레이션 없음"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:868 commands/vacuum.c:953
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "\"%s\" 분석 건너뜀 --- 잠글 수 없음"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:873
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "\"%s\" 분석 건너뜀 --- 릴레이션어 없음"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:989
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "\"%s\" 파티션 상위 테이블 대상 VACUUM ONLY 작업은 아무 효과가 없음"
+
+#: commands/vacuum.c:1180
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "튜플을 지우고, 얼려버려기 위한 시작점이 너무 옛날 시점입니다."
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1181 commands/vacuum.c:1186
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -14317,41 +14785,41 @@ msgstr ""
 "합니다."
 
 # # search5 부분
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1185
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "영구 보관 처리할 multixact 값이 너무 옛날 것입니다."
 
-#: commands/vacuum.c:1900
+#: commands/vacuum.c:1947
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "몇몇 데이터베이스가 20억 이상의 트랜잭션을 처리했음에도 불구하고 청소가되지 "
 "않았습니다"
 
-#: commands/vacuum.c:1901
+#: commands/vacuum.c:1948
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "이미 트래잭션 ID 겹침 현상으로 자료 손실이 발생했을 수도 있습니다."
 
-#: commands/vacuum.c:2080
+#: commands/vacuum.c:2134
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
 "\"%s\" 건너뜀 --- 테이블이 아닌 것 또는 특별 시스템 테이블 등은 청소할 수 없"
 "음"
 
-#: commands/vacuum.c:2512
+#: commands/vacuum.c:2650
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr "\"%s\" 인덱스를 스캔해서 %lld개의 행 버전을 지웠음"
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "\"%s\" 인덱스를 스캔해서 %<PRId64>개의 행 버전을 지웠음"
 
-#: commands/vacuum.c:2531
+#: commands/vacuum.c:2669
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "\"%s\" 인덱스는 %.0f 행 버전을 %u 페이지에서 포함하고 있습니다."
 
-#: commands/vacuum.c:2535
+#: commands/vacuum.c:2673
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -14362,14 +14830,14 @@ msgstr ""
 "%u개 인덱스 페이지를 새롭게 삭제했습니다.\n"
 "%u개 인덱스 페이지를 현재 삭제해서, %u개 페이지를 다시 사용합니다."
 
-#: commands/vacuumparallel.c:707
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural ""
 "launched %d parallel vacuum workers for index vacuuming (planned: %d)"
 msgstr[0] "인덱스 청소를 위해 %d 개의 병렬 청소 작업자가 실행됨 (예상값: %d)"
 
-#: commands/vacuumparallel.c:713
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural ""
@@ -14379,8 +14847,8 @@ msgstr[0] ""
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "\"datestyle\" 지정이 충돌함"
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "\"DateStyle\" 지정이 충돌함"
 
 #: commands/variable.c:307
 #, c-format
@@ -14392,12 +14860,12 @@ msgstr "타임 존 간격에 달을 지정할 수 없음"
 msgid "Cannot specify days in time zone interval."
 msgstr "타임 존 간격에 일을 지정할 수 없음"
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "\"%s\" time zone 에서 leap second를 사용합니다"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL에서는 leap second를 지원하지 않습니다"
@@ -14407,117 +14875,99 @@ msgstr "PostgreSQL에서는 leap second를 지원하지 않습니다"
 msgid "UTC timezone offset is out of range."
 msgstr "UTC 타입존 오프세트 범위가 벗어남."
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "읽기 전용 트랜잭션 내에서 트랜잭션을 읽기/쓰기 모드로 설정할 수 없음"
 
-#: commands/variable.c:559
+#: commands/variable.c:561
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr "읽기/쓰기 모드 트랜잭션은 모든 쿼리 앞에 지정해야 합니다."
 
-#: commands/variable.c:566
+#: commands/variable.c:568
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr "복구 작업 중에는 트랜잭션을 읽기/쓰기 모드로 설정할 수 없음"
 
-#: commands/variable.c:592
+#: commands/variable.c:596
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "쿼리보다 먼저 SET TRANSACTION ISOLATION LEVEL을 호출해야 함"
 
-#: commands/variable.c:599
+#: commands/variable.c:603
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr "하위 트랜잭션에서 SET TRANSACTION ISOLATION LEVEL을 호출하지 않아야 함"
 
-#: commands/variable.c:606 storage/lmgr/predicate.c:1685
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "읽기 전용 보조 서버 상태에서는 serializable 모드를 사용할 수 없음"
 
-#: commands/variable.c:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "대신에, REPEATABLE READ 명령을 사용할 수 있음."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, c-format
 msgid ""
 "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr ""
 "하위 트랜잭션에서 SET TRANSACTION [NOT] DEFERRABLE 구문은 사용할 수 없음"
 
-#: commands/variable.c:631
+#: commands/variable.c:639
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr "모든 쿼리보다 먼저 SET TRANSACTION [NOT] DEFERRABLE 구문을 사용해야 함"
 
-#: commands/variable.c:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr "병렬 작업 중에는 \"client_encoding\" 설정을 바꿀 수 없습니다."
+
+#: commands/variable.c:743
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "%s 인코딩과 %s 인코딩 사이의 변환은 지원하지 않습니다"
 
-#: commands/variable.c:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "\"client_encoding\" 값을 지금은 바꿀 수 없음"
 
-#: commands/variable.c:781
-#, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr "병렬 작업 중에는 \"client_encoding\" 설정을 할 수 없음"
-
-#: commands/variable.c:876
+#: commands/variable.c:889
 #, c-format
 msgid "permission will be denied to set session authorization \"%s\""
 msgstr "set session authorization \"%s\" 작업 권한 거부될 것임"
 
-#: commands/variable.c:881
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "set session authorization \"%s\" 작업 권한 없음"
 
-#: commands/variable.c:991
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
 msgstr "set role \"%s\" 작업 권한 거부될 것임"
 
-#: commands/variable.c:996
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "set role \"%s\" 작업 권한 없음"
 
-#: commands/variable.c:1200
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour 기능을 뺀 채로 서버가 만들어졌습니다."
 
-#: commands/variable.c:1228
-#, c-format
-msgid ""
-"\"effective_io_concurrency\" must be set to 0 on platforms that lack "
-"posix_fadvise()."
-msgstr ""
-"posix_fadvise() 함수에 문제가 있는 플랫폼에서는 \"effective_io_concurrency\" "
-"설정값이 0 이어야 합니다."
-
-#: commands/variable.c:1241
-#, c-format
-msgid ""
-"\"maintenance_io_concurrency\" must be set to 0 on platforms that lack "
-"posix_fadvise()."
-msgstr ""
-"posix_fadvise() 함수에 문제가 있는 플랫폼에서는 "
-"\"maintenance_io_concurrency\" 설정값이 0 이어야 합니다."
-
 #: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL 접속 기능을 뺀 채로 서버가 만들어졌습니다."
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr "\"%s\" 칼럼 자료 처리를 위한 정렬 규칙을 결정할 수 없음"
@@ -14611,121 +15061,121 @@ msgstr "\"%s\" 커서가 로우에 놓여 있지 않음"
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "\"%s\" 커서는 \"%s\" 테이블의 단순 업데이트 가능한 스캔이 아님"
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3093
 #, c-format
 msgid ""
 "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr ""
 "%d번째 매개 변수의 자료형(%s)이 미리 준비된 실행계획의 자료형(%s)과 다릅니다"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2567
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3105
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "%d번째 매개 변수 값이 없습니다"
 
-#: executor/execExpr.c:642 executor/execExpr.c:649 executor/execExpr.c:655
-#: executor/execExprInterp.c:4852 executor/execExprInterp.c:4869
-#: executor/execExprInterp.c:4968 executor/nodeModifyTable.c:203
-#: executor/nodeModifyTable.c:214 executor/nodeModifyTable.c:231
-#: executor/nodeModifyTable.c:239
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5439 executor/execExprInterp.c:5456
+#: executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "테이블 행 형식과 쿼리 지정 행 형식이 일치하지 않음"
 
-#: executor/execExpr.c:643 executor/nodeModifyTable.c:204
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "쿼리에 칼럼이 너무 많습니다."
 
-#: executor/execExpr.c:650 executor/nodeModifyTable.c:232
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "쿼리에서 서수 위치 %d에 있는 삭제된 칼럼의 값을 제공합니다."
 
-#: executor/execExpr.c:656 executor/execExprInterp.c:4870
-#: executor/nodeModifyTable.c:215
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr ""
 "테이블에는 %s 형식이 있는데(서수 위치 %d) 쿼리에는 %s이(가) 필요합니다."
 
-#: executor/execExpr.c:1104 parser/parse_agg.c:838
+#: executor/execExpr.c:1157 parser/parse_agg.c:843
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "윈도우 함수 호출을 중첩할 수 없음"
 
-#: executor/execExpr.c:1649
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "대상 자료형이 배열이 아닙니다."
 
-#: executor/execExpr.c:1989
+#: executor/execExpr.c:2033
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "ROW() 칼럼은 %s 자료형을 가집니다. %s 자료형 대신에"
 
-#: executor/execExpr.c:2653 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
 msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "함수에 최대 %d개의 인자를 전달할 수 있음"
 
-#: executor/execExpr.c:2680 executor/execSRF.c:738 executor/functions.c:1068
-#: utils/adt/jsonfuncs.c:4054 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "set-values 함수(테이블 리턴 함수)가 set 정의 없이 사용되었습니다 (테이블과 해"
 "당 열 alias 지정하세요)"
 
-#: executor/execExpr.c:3086 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3262 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr ""
 "이 자료형은 subscript 형을 지원하지 않기 때문에, %s subscript 자료형을 사용"
 "할 수 없음"
 
-#: executor/execExpr.c:3214 executor/execExpr.c:3236
+#: executor/execExpr.c:3390 executor/execExpr.c:3412
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "%s 자료형은 subscript 지정을 지원하지 않음"
 
-#: executor/execExprInterp.c:2019
+#: executor/execExprInterp.c:2415
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "%d 번째 속성(대상 자료형 %s)이 삭제되었음"
 
-#: executor/execExprInterp.c:2025
+#: executor/execExprInterp.c:2421
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "%d 번째 속성(대상 자료형 %s)의 자료형이 잘못되었음"
 
-#: executor/execExprInterp.c:2027 executor/execExprInterp.c:3226
-#: executor/execExprInterp.c:3272
+#: executor/execExprInterp.c:2423 executor/execExprInterp.c:3782
+#: executor/execExprInterp.c:3828
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "테이블에는 %s 자료형이지만, 쿼리에서는 %s 자료형입니다."
 
-#: executor/execExprInterp.c:2107 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2503 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "%s 자료형은 복합 자료형이 아닙니다"
 
-#: executor/execExprInterp.c:2710
+#: executor/execExprInterp.c:3266
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF 구문은 이 테이블 형 대상으로 지원하지 않습니다."
 
-#: executor/execExprInterp.c:2923
+#: executor/execExprInterp.c:3479
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "배열 형태가 서로 틀려 병합할 수 없습니다"
 
-#: executor/execExprInterp.c:2924
+#: executor/execExprInterp.c:3480
 #, c-format
 msgid ""
 "Array with element type %s cannot be included in ARRAY construct with "
@@ -14734,79 +15184,79 @@ msgstr ""
 "%s 자료형의 요소로 구성된 배열은 %s 자료형의 요소로 구성된 ARRAY 구문에 포함"
 "될 수 없습니다."
 
-#: executor/execExprInterp.c:2945 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3503 utils/adt/arrayfuncs.c:5593
-#: utils/adt/arrayfuncs.c:6110 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5605
+#: utils/adt/arrayfuncs.c:6124 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "지정한 배열 크기(%d)가 최대치(%d)를 초과했습니다"
 
-#: executor/execExprInterp.c:2965 executor/execExprInterp.c:3000
+#: executor/execExprInterp.c:3521 executor/execExprInterp.c:3556
 #, c-format
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "다차원 배열에는 일치하는 차원이 포함된 배열 식이 있어야 함"
 
-#: executor/execExprInterp.c:2977 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
 #: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
 #: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
-#: utils/adt/arrayfuncs.c:3533 utils/adt/arrayfuncs.c:5365
-#: utils/adt/arrayfuncs.c:6202 utils/adt/arrayfuncs.c:6546
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5377
+#: utils/adt/arrayfuncs.c:6216 utils/adt/arrayfuncs.c:6560
 #: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
 #: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "배열 크기가 최대치 (%d)를 초과했습니다"
 
-#: executor/execExprInterp.c:3225 executor/execExprInterp.c:3271
+#: executor/execExprInterp.c:3781 executor/execExprInterp.c:3827
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "%d 속성의 형식이 잘못됨"
 
-#: executor/execExprInterp.c:3857 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4413 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "%s 도메인에서는 null 값을 허용하지 않습니다"
 
-#: executor/execExprInterp.c:3872 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4428 utils/adt/domains.c:196
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "%s 도메인용 값이 \"%s\" 체크 제약 조건을 위반했습니다"
 
-#: executor/execExprInterp.c:4447
+#: executor/execExprInterp.c:5003
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
 msgstr "\"%s\" 칼럼에 지정한 패스에서는 SQL/JSON 아이템을 찾을 수 없음"
 
-#: executor/execExprInterp.c:4452
+#: executor/execExprInterp.c:5008
 #, c-format
 msgid "no SQL/JSON item found for specified path"
 msgstr "지정한 패스에서는 SQL/JSON 아이템을 찾을 수 없음"
 
 #. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
-#: executor/execExprInterp.c:4652 executor/execExprInterp.c:4660
+#: executor/execExprInterp.c:5208 executor/execExprInterp.c:5216
 #, c-format
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "%s 표현식 (%s)은 RETURNING 형식으로 바꿀 수 없음"
 
-#: executor/execExprInterp.c:4853
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] ""
 "테이블 행에는 %d개 속성이 포함되어 있는데 쿼리에는 %d개가 필요합니다."
 
-#: executor/execExprInterp.c:4969 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "서수 위치 %d의 삭제된 속성에서 실제 스토리지 불일치가 발생합니다."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:608
 #, c-format
 msgid ""
 "ON CONFLICT does not support deferrable unique constraints/exclusion "
@@ -14815,129 +15265,139 @@ msgstr ""
 "지연 가능한 고유 제약조건이나 제외 제약 조건은 ON CONFLICT 판별자로 사용할 "
 "수 없습니다."
 
-#: executor/execIndexing.c:870
+#: executor/execIndexing.c:911
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "\"%s\" exclusion 제약 조건을 만들 수 없음"
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:914
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "%s 키와 %s 가 충돌함"
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:916
 #, c-format
 msgid "Key conflicts exist."
 msgstr "키 충돌 발생"
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:922
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "\"%s\" exclusion 제약 조건에 따라 키 값 충돌이 발생했습니다."
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:925
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "%s 키가 이미 있는 %s 키와 충돌합니다."
 
-#: executor/execIndexing.c:886
+#: executor/execIndexing.c:927
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "키가 기존 키와 충돌함"
 
-#: executor/execMain.c:1039
+#: executor/execIndexing.c:1172
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr "\"%s\" 칼럼(해당 테이블: \"%s\")에서 빈 WITHOUT OVERLAPS 값이 발견됨"
+
+#: executor/execMain.c:1085
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "\"%s\" 시퀀스를 바꿀 수 없음"
 
-#: executor/execMain.c:1045
+#: executor/execMain.c:1091
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "\"%s\" TOAST 릴레이션을 바꿀 수 없음"
 
-#: executor/execMain.c:1064
+#: executor/execMain.c:1110
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "\"%s\" 구체화된 뷰를 바꿀 수 없음"
 
-#: executor/execMain.c:1076
+#: executor/execMain.c:1122
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블에 자료를 입력할 수 없음"
 
-#: executor/execMain.c:1082
+#: executor/execMain.c:1128
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "\"%s\" 외부 테이블은 자료 입력을 허용하지 않음"
 
-#: executor/execMain.c:1089
+#: executor/execMain.c:1135
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블에 자료를 변경 할 수 없음"
 
-#: executor/execMain.c:1095
+#: executor/execMain.c:1141
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "\"%s\" 외부 테이블은 자료 변경을 허용하지 않음"
 
-#: executor/execMain.c:1102
+#: executor/execMain.c:1148
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블에 자료를 삭제 할 수 없음"
 
-#: executor/execMain.c:1108
+#: executor/execMain.c:1154
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "\"%s\" 외부 테이블은 자료 삭제를 허용하지 않음"
 
-#: executor/execMain.c:1119
+#: executor/execMain.c:1165
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "\"%s\" 릴레이션을 바꿀 수 없음"
 
-#: executor/execMain.c:1146
+#: executor/execMain.c:1192
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "\"%s\" 시퀀스에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1153
+#: executor/execMain.c:1199
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "\"%s\" TOAST 릴레이션에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1160
+#: executor/execMain.c:1206
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "\"%s\" 뷰에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1168
+#: executor/execMain.c:1214
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "\"%s\" 구체화된 뷰에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1177 executor/execMain.c:2687
+#: executor/execMain.c:1223 executor/execMain.c:2855
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "\"%s\" 외부 테이블에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1183
+#: executor/execMain.c:1229
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 로우를 잠글 수 없음"
 
-#: executor/execMain.c:1901
+#: executor/execMain.c:1952
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "새 자료가 \"%s\" 릴레이션의 파티션 제약 조건을 위반했습니다"
 
-#: executor/execMain.c:1903 executor/execMain.c:1987 executor/execMain.c:2038
-#: executor/execMain.c:2148
+#: executor/execMain.c:1954 executor/execMain.c:2066 executor/execMain.c:2204
+#: executor/execMain.c:2312
 #, c-format
 msgid "Failing row contains %s."
 msgstr "실패한 자료: %s"
 
-#: executor/execMain.c:1984
+#: executor/execMain.c:2064
+#, c-format
+msgid "new row for relation \"%s\" violates check constraint \"%s\""
+msgstr "새 자료가 \"%s\" 릴레이션의 \"%s\" 체크 제약 조건을 위반했습니다"
+
+#: executor/execMain.c:2201
 #, c-format
 msgid ""
 "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
@@ -14945,28 +15405,23 @@ msgstr ""
 "\"%s\" 칼럼(해당 릴레이션 \"%s\")의 null 값이 not null 제약조건을 위반했습니"
 "다."
 
-#: executor/execMain.c:2036
-#, c-format
-msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "새 자료가 \"%s\" 릴레이션의 \"%s\" 체크 제약 조건을 위반했습니다"
-
-#: executor/execMain.c:2146
+#: executor/execMain.c:2310
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "새 자료가 \"%s\" 뷰의 체크 제약 조건을 위반했습니다"
 
-#: executor/execMain.c:2156
+#: executor/execMain.c:2320
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr ""
 "새 자료가 \"%s\" 로우 단위 보안 정책을 위반했습니다, 해당 테이블: \"%s\""
 
-#: executor/execMain.c:2161
+#: executor/execMain.c:2325
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr "새 자료가 \"%s\" 테이블의 로우 단위 보안 정책을 위반했습니다."
 
-#: executor/execMain.c:2169
+#: executor/execMain.c:2333
 #, c-format
 msgid ""
 "target row violates row-level security policy \"%s\" (USING expression) for "
@@ -14975,7 +15430,7 @@ msgstr ""
 "대상 로우가 \"%s\" 로우 단위 보안 정책(USING 절 사용)을 위반했습니다, 해당 테"
 "이블: \"%s\""
 
-#: executor/execMain.c:2174
+#: executor/execMain.c:2338
 #, c-format
 msgid ""
 "target row violates row-level security policy (USING expression) for table "
@@ -14984,7 +15439,7 @@ msgstr ""
 "대상 로우가 \"%s\" 테이블의 로우 단위 보안 정책(USING 절 사용)을 위반했습니"
 "다."
 
-#: executor/execMain.c:2181
+#: executor/execMain.c:2345
 #, c-format
 msgid ""
 "new row violates row-level security policy \"%s\" (USING expression) for "
@@ -14993,25 +15448,25 @@ msgstr ""
 "새 자료가 \"%s\" 로우 단위 보안 정책(USING 절 사용)을 위반했습니다, 해당 테이"
 "블: \"%s\""
 
-#: executor/execMain.c:2186
+#: executor/execMain.c:2350
 #, c-format
 msgid ""
-"new row violates row-level security policy (USING expression) for table "
-"\"%s\""
+"new row violates row-level security policy (USING expression) for table \"%s"
+"\""
 msgstr ""
 "새 자료가 \"%s\" 테이블의 로우 단위 보안 정책(USING 절 사용)을 위반했습니다."
 
-#: executor/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "해당 로우를 위한 \"%s\" 릴레이션용 파티션이 없음"
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "실패한 로우의 파티션 키 값: %s"
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid ""
 "tuple to be locked was already moved to another partition due to concurrent "
@@ -15019,50 +15474,47 @@ msgid ""
 msgstr ""
 "다른 업데이트 작업으로 잠굴 튜플이 이미 다른 파티션으로 이동되었음, 재시도함"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "동시 업데이트, 다시 시도 중"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "동시 삭제, 다시 시도 중"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3852
-#: utils/adt/arrayfuncs.c:4407 utils/adt/arrayfuncs.c:6426
-#: utils/adt/rowtypes.c:1220
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr ""
-"%s 자료형에서 사용할 동등 연산자(equality operator)를 찾을 수 없습니다."
-
-#: executor/execReplication.c:687 executor/execReplication.c:693
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "\"%s\" 테이블에 자료를 변경 할 수 없음"
 
-#: executor/execReplication.c:689 executor/execReplication.c:701
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid ""
 "Column used in the publication WHERE expression is not part of the replica "
 "identity."
 msgstr "발행의 WHERE 절에서 사용한 칼럼이 복제 식별자의 한 부분이 아닙니다."
 
-#: executor/execReplication.c:695 executor/execReplication.c:707
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid ""
 "Column list used by the publication does not cover the replica identity."
 msgstr "발행에서 사용되는 칼럼 목록이 복제 식별자를 모두 포함하지 못했습니다."
 
-#: executor/execReplication.c:699 executor/execReplication.c:705
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr "복제 식별자는 발행되지 않은 미리 계산된 칼럼을 포함하고 있지 않아야 함"
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "\"%s\" 테이블에 자료를 삭제 할 수 없음"
 
-#: executor/execReplication.c:725
+#: executor/execReplication.c:859
 #, c-format
 msgid ""
 "cannot update table \"%s\" because it does not have a replica identity and "
@@ -15071,26 +15523,26 @@ msgstr ""
 "\"%s\" 테이블 업데이트 실패, 이 테이블에는 복제용 식별자를 지정하지 않았거"
 "나, updates 옵션 없이 발행했습니다"
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr ""
 "업데이트를 하려면, ALTER TABLE 명령어에서 REPLICA IDENTITY 옵션을 사용하세요"
 
-#: executor/execReplication.c:731
+#: executor/execReplication.c:865
 #, c-format
 msgid ""
 "cannot delete from table \"%s\" because it does not have a replica identity "
 "and publishes deletes"
 msgstr "\"%s\" 테이블 자료 삭제 실패, 복제 식별자와 deletes 발행을 안함"
 
-#: executor/execReplication.c:733
+#: executor/execReplication.c:867
 #, c-format
 msgid ""
 "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "삭제 하려면, ALTER TABLE 명령어에서 REPLICA IDENTITY 옵션을 사용하세요"
 
-#: executor/execReplication.c:749
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr "\"%s.%s\" 릴레이션은 논리 복제 대상이 될 수 없음"
@@ -15141,78 +15593,58 @@ msgstr[0] ""
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "반환된 형식은 %s인데(서수 위치 %d) 쿼리에는 %s이(가) 필요합니다."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "이 컨텍스트에는 시스템 칼럼을 찾을 수 없음"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
 msgstr "튜플의 이런 형태에 대한 트랜잭션 정보가 없음"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
+#: executor/execTuples.c:391 executor/execTuples.c:796
 #, c-format
 msgid "don't have a storage tuple in this context"
 msgstr "이 컨텍스트에는 a storage tuple 을 가질 수 없음."
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "\"%s\" 구체화된 뷰가 아직 구체화되지 못했습니다."
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "REFRESH MATERIALIZED VIEW 명령을 사용하세요."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "%s 인자의 자료형으로 지정한 자료형의 기본 자료형을 찾을 수 없습니다"
 
-#: executor/functions.c:513
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "SQL 함수에서 클라이언트 대상 COPY to/from 작업을 할 수 없음"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:519
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "SQL 함수에서는 %s 구문을 허용하지 않음"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:527 executor/spi.c:1744 executor/spi.c:2657
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s 구문은 비휘발성 함수(non-volatile function)에서 허용하지 않습니다"
 
-#: executor/functions.c:1452
-#, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL 함수 \"%s\"의 문 %d"
-
-#: executor/functions.c:1478
-#, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "시작 중 SQL 함수 \"%s\""
-
-#: executor/functions.c:1563
-#, c-format
-msgid ""
-"calling procedures with output arguments is not supported in SQL functions"
-msgstr "출력 인자를 포함한 프로시져 호출은 SQL 함수에서 지원하지 않습니다."
-
-#: executor/functions.c:1698 executor/functions.c:1736
-#: executor/functions.c:1750 executor/functions.c:1845
-#: executor/functions.c:1878 executor/functions.c:1892
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "리턴 자료형이 함수 정의에서 지정한 %s 리턴 자료형과 틀립니다"
 
-#: executor/functions.c:1700
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
 msgid ""
 "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE "
@@ -15221,44 +15653,65 @@ msgstr ""
 "함수 내용의 맨 마지막 구문은 SELECT 또는 INSERT/UPDATE/DELETE/MERGE RETURNING"
 "이어야 합니다."
 
-#: executor/functions.c:1738
+#: executor/functions.c:1270 utils/cache/plancache.c:860
+#, c-format
+msgid "cached plan must not change result type"
+msgstr "캐시된 계획에서 결과 형식을 바꾸지 않아야 함"
+
+#: executor/functions.c:1922 executor/functions.c:1953
+#, c-format
+msgid "SQL function \"%s\" during startup"
+msgstr "시작 중 SQL 함수 \"%s\""
+
+#: executor/functions.c:1950
+#, c-format
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL 함수 \"%s\"의 문 %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid ""
+"calling procedures with output arguments is not supported in SQL functions"
+msgstr "출력 인자를 포함한 프로시져 호출은 SQL 함수에서 지원하지 않습니다."
+
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "맨 마지막 구문은 정확히 하나의 칼럼만 반환해야 합니다."
 
-#: executor/functions.c:1752
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "실재 반환 자료형은 %s"
 
-#: executor/functions.c:1847
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "맨 마지막 구문이 너무 많은 칼럼을 반환합니다."
 
-#: executor/functions.c:1880
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr ""
 "맨 마지막 구문이 %s(기대되는 자료형: %s) 자료형을 %d 번째 칼럼에서 반환합니"
 "다."
 
-#: executor/functions.c:1894
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "맨 마지막 구문이 너무 적은 칼럼을 반환합니다."
 
-#: executor/functions.c:1922
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "반환 자료형인 %s 자료형은 SQL 함수에서 지원되지 않음"
 
-#: executor/nodeAgg.c:3936 executor/nodeWindowAgg.c:2975
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3041
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "%u OID 집계함수에 호환 가능한 입력 형식과 변환 형식이 있어야 함"
 
-#: executor/nodeAgg.c:3966 parser/parse_agg.c:680 parser/parse_agg.c:708
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:685 parser/parse_agg.c:713
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "집계 함수는 중첩되어 호출 할 수 없음"
@@ -15268,12 +15721,12 @@ msgstr "집계 함수는 중첩되어 호출 할 수 없음"
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "\"%s\" 이름의 칼럼 탐색은 MarkPos 기능을 지원하지 않음"
 
-#: executor/nodeHashjoin.c:1131 executor/nodeHashjoin.c:1161
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "해시-조인 임시 파일을 되감을 수 없음"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr "lossy distance 함수들은 인덱스 단독 탐색을 지원하지 않음"
@@ -15288,41 +15741,46 @@ msgstr "OFFSET은 음수가 아니어야 함"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT는 음수가 아니어야 함"
 
-#: executor/nodeMergejoin.c:1579
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN은 병합-조인 가능 조인 조건에서만 지원됨"
 
-#: executor/nodeMergejoin.c:1597
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN은 병합-조인 가능 조인 조건에서만 지원됨"
 
-#: executor/nodeModifyTable.c:240
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "쿼리에서 서수 위치 %d에 있는 미리 계산된 칼럼의 값을 제공합니다."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "쿼리에 칼럼이 너무 적습니다."
 
-#: executor/nodeModifyTable.c:1540 executor/nodeModifyTable.c:1614
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid ""
 "tuple to be deleted was already modified by an operation triggered by the "
 "current command"
 msgstr "현재 명령으로 실행된 트리거 작업으로 지울 자료가 이미 바뀌었습니다."
 
-#: executor/nodeModifyTable.c:1769
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "잘못된 ON UPDATE 옵션"
 
-#: executor/nodeModifyTable.c:1770
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid ""
 "The result tuple would appear in a different partition than the original "
 "tuple."
 msgstr "결과 튜플이 원래 튜플이 아닌 다른 파티션에서 나타날 것입니다."
 
-#: executor/nodeModifyTable.c:2226
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid ""
 "cannot move tuple across partitions when a non-root ancestor of the source "
@@ -15331,7 +15789,7 @@ msgstr ""
 "참조키가 바로 해당 하위 파티션 테이블을 참조하는 경우 파티션 간 자료 이동은 "
 "할 수 없습니다."
 
-#: executor/nodeModifyTable.c:2227
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid ""
 "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
@@ -15339,19 +15797,19 @@ msgstr ""
 "참조키가 \"%s\" 하위 파티션 테이블을 대상으로 합니다. 상위 파티션 테이블은 "
 "\"%s\" 테이블입니다."
 
-#: executor/nodeModifyTable.c:2230
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "\"%s\" 테이블에 참조키 정의를 고려하세요."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2596 executor/nodeModifyTable.c:3138
-#: executor/nodeModifyTable.c:3308
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3337
+#: executor/nodeModifyTable.c:3508
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "%s 명령은 두번째 작업에는 아무런 영향을 주 않음"
 
-#: executor/nodeModifyTable.c:2598
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid ""
 "Ensure that no rows proposed for insertion within the same command have "
@@ -15360,7 +15818,7 @@ msgstr ""
 "동일한 명령 내에서 삽입하도록 제안된 행에 중복된 제한 값이 없는지 확인하십시"
 "오."
 
-#: executor/nodeModifyTable.c:3131 executor/nodeModifyTable.c:3301
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3501
 #, c-format
 msgid ""
 "tuple to be updated or deleted was already modified by an operation "
@@ -15369,12 +15827,12 @@ msgstr ""
 "현재 명령으로 실행된 트리거 작업으로 변경하거나 지울 자료가 이미 바뀌었습니"
 "다."
 
-#: executor/nodeModifyTable.c:3140 executor/nodeModifyTable.c:3310
+#: executor/nodeModifyTable.c:3339 executor/nodeModifyTable.c:3510
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "둘 이상의 소스 행이 하나의 대상 행과 일치하지 않는지 확인하십시오."
 
-#: executor/nodeModifyTable.c:3209
+#: executor/nodeModifyTable.c:3408
 #, c-format
 msgid ""
 "tuple to be merged was already moved to another partition due to concurrent "
@@ -15391,8 +15849,8 @@ msgstr "TABLESAMPLE 절에는 반드시 부가 옵션값들이 있어야 합니
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "TABLESAMPLE REPEATABLE 절은 더 이상의 부가 옵션을 쓰면 안됩니다."
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "표현식에 사용된 서브쿼리 결과가 하나 이상의 행을 리턴했습니다"
@@ -15427,27 +15885,27 @@ msgstr "\"%s\" 칼럼은 null 값을 허용하지 않습니다"
 msgid "moving-aggregate transition function must not return null"
 msgstr "moving-aggregate transition 함수는 null 값을 반환하면 안됩니다."
 
-#: executor/nodeWindowAgg.c:2083
+#: executor/nodeWindowAgg.c:2106
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "프래임 시작 위치값으로 null 값을 사용할 수 없습니다."
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2120
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "프래임 시작 위치으로 음수 값을 사용할 수 없습니다."
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2133
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "프래임 끝 위치값으로 null 값을 사용할 수 없습니다."
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2147
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "프래임 끝 위치값으로 음수 값을 사용할 수 없습니다."
 
-#: executor/nodeWindowAgg.c:2891
+#: executor/nodeWindowAgg.c:2957
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr "%s 집계 함수는 윈도우 함수로 사용될 수 없습니다"
@@ -15498,7 +15956,7 @@ msgstr "%s 쿼리로 커서를 열 수 없음."
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE는 지원되지 않음"
 
-#: executor/spi.c:1719 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3076
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "스크롤 가능 커서는 READ ONLY여야 합니다."
@@ -15516,8 +15974,8 @@ msgstr "%s 쿼리는 집합을 반환할 수 없습니다."
 
 #: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "SQL 표현식: \"%s\""
+msgid "PL/pgSQL expression \"%s\""
+msgstr "PL/pgSQL 표현식: \"%s\""
 
 #: executor/spi.c:2992
 #, c-format
@@ -15534,28 +15992,28 @@ msgstr "SQL 구문: \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "공유 메모리 큐로 튜플을 보낼 수 없음"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "\"%s\"에 대한 사용자 매핑을 \"%s\" 서버에서 찾을 수 없음"
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7153
-#: optimizer/util/plancat.c:540
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7293
+#: optimizer/util/plancat.c:538
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr "non-system 외부 테이블을 접근하는 것은 제한되었음"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "\"%s\" 옵션이 잘못됨"
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "아마 \"%s\" 옵션을 뜻하는 것 같습니다."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "이 컨텍스트에서 유효한 옵션이 없음."
@@ -15566,82 +16024,290 @@ msgstr "이 컨텍스트에서 유효한 옵션이 없음."
 msgid "Failed on DSA request of size %zu."
 msgstr "크기가 %zu인 DSA 요청에서 오류가 발생했습니다."
 
-#: libpq/auth-sasl.c:97
-#, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "SASL 응답이 필요한데 메시지 형식 %d을(를) 받음"
-
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
 msgid "client selected an invalid SASL authentication mechanism"
 msgstr "클라이언트가 잘못된 SASL 인증 메카니즘을 선택했음"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
+#, c-format
+msgid "malformed OAUTHBEARER message"
+msgstr "OAUTHBEARER 메시지가 형식에 맞지 않습니다"
+
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
+#, c-format
+msgid "The message is empty."
+msgstr "메시지가 비었습니다."
+
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
+#, c-format
+msgid "Message length does not match input length."
+msgstr "메시지 길이가 입력 길이와 같지 않습니다."
+
+#: libpq/auth-oauth.c:193
+#, c-format
+msgid "Client did not send a kvsep response."
+msgstr "클라이언트가 kvsep 응답을 보내지 않았습니다."
+
+#: libpq/auth-oauth.c:221
+#, c-format
+msgid ""
+"The server does not support channel binding for OAuth, but the client "
+"message includes channel binding data."
+msgstr ""
+"서버에서는 OAuth 채널 바인딩을 지원하지 않는데, 클라이언트 메시지에는 채널 바"
+"인딩 데이터가 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
+#, c-format
+msgid "Comma expected, but found character \"%s\"."
+msgstr "쉼표가 와야하는데, \"%s\" 문자가 발견되었음."
+
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
+#, c-format
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "예상치 못한 채널 바인딩 플래그 \"%s\"."
+
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
+#, c-format
+msgid "client uses authorization identity, but it is not supported"
+msgstr ""
+"클라이언트는 authorization identity를 사용하지만, 이것을 지원하지 않습니다."
+
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
+#, c-format
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "client-first-message 안에 \"%s\" 속성이 잘못됨"
+
+#: libpq/auth-oauth.c:264
+#, c-format
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr "키-값 분리문자를 예상하는데, \"%s\" 문자가 발견되었음."
+
+#: libpq/auth-oauth.c:273
+#, c-format
+msgid "Message does not contain an auth value."
+msgstr "메시지에 auth 값이 포함되어 있지 않습니다."
+
+#: libpq/auth-oauth.c:280
+#, c-format
+msgid "Message contains additional data after the final terminator."
+msgstr "메시지 끝 표시 뒤에 추가 자료가 더 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:343
+#, c-format
+msgid "Message contains an empty key name."
+msgstr "메시지에 빈 키 이름이 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:350
+#, c-format
+msgid "Message contains an invalid key name."
+msgstr "메시지에 잘못된 키 이름이 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:376
+#, c-format
+msgid "Message contains an invalid value."
+msgstr "메시지에 잘못된 값이 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:421
+#, c-format
+msgid "Message contains an unterminated key/value pair."
+msgstr "메시지에 종료되지 않은 키/값 쌍이 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:439
+#, c-format
+msgid "Message contains a key without a value."
+msgstr "메시지에 값이 없는 키가 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:453
+#, c-format
+msgid "Message contains multiple auth values."
+msgstr "메시지에 여러 auth 값이 포함되어 있습니다."
+
+#: libpq/auth-oauth.c:473
+#, c-format
+msgid "Message did not contain a final terminator."
+msgstr "메시지에 마침 표시가 없습니다."
+
+#: libpq/auth-oauth.c:499
+#, c-format
+msgid "OAuth is not properly configured for this user"
+msgstr "OAuth는 이 사용자를 위한 구성을 할 수 없는 것 같음"
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr "issuer와 scope 설정을 pg_hba.conf 에 해야 합니다."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, c-format
+msgid "malformed OAuth bearer token"
+msgstr "잘못된 OAuth bearer 토큰"
+
+#: libpq/auth-oauth.c:586
+#, c-format
+msgid "Client response indicated a non-Bearer authentication scheme."
+msgstr "클라이언트 응답이 non-Bearer 인증 체계를 지시했습니다."
+
+#: libpq/auth-oauth.c:603
+#, c-format
+msgid "Bearer token is empty."
+msgstr "bearer 토큰이 비었음."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "bearer 토큰이 올바른 포멧안에 없습니다."
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "유효성 검사기를 불러오지 못한 채 OAuth 토큰 유효성 검사를 했습니다."
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "OAuth 유효성 검사기 모듈안에 내부 오류"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, c-format
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr "\"%s\" 사용자에 대한 OAuth bearer 인증을 실패했습니다."
+
+#: libpq/auth-oauth.c:681
+#, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "제공된 토큰에 대한 인증 검사를 실패했습니다."
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "유효성 검사기를 식별할 수 없습니다."
+
+#: libpq/auth-oauth.c:760
+#, c-format
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "%s 모듈 \"%s\" 에는 %s 심볼이 정의되어 있어야 함"
+
+#: libpq/auth-oauth.c:773
+#, c-format
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "%s 모듈 \"%s\": magic 번호 틀림"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "서버 매직 번호는 0x%08X, 모듈은 0x%08X"
+
+#: libpq/auth-oauth.c:784
+#, c-format
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "%s module \"%s\"에서 %s 콜백 함수를 제공해야 함"
+
+#: libpq/auth-oauth.c:833
+#, c-format
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr "%s 인증 방법을 이용하려면, oauth_validator_libraries 설정을 해야함"
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:196
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "%d번째 줄(\"%s\" 환경 설정 파일)"
+
+#: libpq/auth-oauth.c:867
+#, c-format
+msgid ""
+"authentication method \"oauth\" requires argument \"validator\" to be set "
+"when oauth_validator_libraries contains multiple options"
+msgstr ""
+"oauth_validator_libraries 설정에서 여러 옵션이 있는 경우, \"oauth\" 인증 방법"
+"은 \"validator\" 인자 설정을 해야 함"
+
+#: libpq/auth-oauth.c:882
+#, c-format
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "\"%s\" 유효성 검사기는 %s 설정에서 허용되지 않음"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "SASL 응답이 필요한데 메시지 형식 %d을(를) 받음"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
 #, c-format
 msgid "invalid SCRAM secret for user \"%s\""
 msgstr "\"%s\" 사용자에 대한 잘못된 SCRAM secret"
 
-#: libpq/auth-scram.c:298
+#: libpq/auth-scram.c:302
 #, c-format
 msgid "User \"%s\" does not have a valid SCRAM secret."
 msgstr "\"%s\" 사용자용 바른 SCRAM secret이 없습니다."
 
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
 #, c-format
 msgid "malformed SCRAM message"
 msgstr "SCRAM 메시지가 형식에 맞지 않습니다"
 
-#: libpq/auth-scram.c:379
-#, c-format
-msgid "The message is empty."
-msgstr "메시지가 비었습니다."
-
-#: libpq/auth-scram.c:384
-#, c-format
-msgid "Message length does not match input length."
-msgstr "메시지 길이가 입력 길이와 같지 않습니다."
-
-#: libpq/auth-scram.c:416
+#: libpq/auth-scram.c:420
 #, c-format
 msgid "invalid SCRAM response"
 msgstr "잘못된 SCRAM 응답"
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-scram.c:421
 #, c-format
 msgid "Nonce does not match."
 msgstr "토큰 불일치"
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-scram.c:504
 #, c-format
 msgid "could not generate random salt"
 msgstr "무작위 솔트 생성 실패"
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-scram.c:752
 #, c-format
 msgid "Expected attribute \"%c\" but found \"%s\"."
 msgstr "\"%c\" 속성이어야 하는데, \"%s\" 임."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
 #, c-format
 msgid "Expected character \"=\" for attribute \"%c\"."
 msgstr "\"%c\" 속성에는 \"=\" 문자가 와야 합니다."
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-scram.c:865
 #, c-format
 msgid "Attribute expected, but found end of string."
 msgstr "속성값이 와야하는데, 문자열 끝이 발견되었음."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-scram.c:878
 #, c-format
 msgid "Attribute expected, but found invalid character \"%s\"."
 msgstr "속성값이 와야하는데, \"%s\" 잘못된 문자가 발견되었음."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
 #, c-format
 msgid ""
 "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not "
@@ -15650,17 +16316,12 @@ msgstr ""
 "해당 클라이언트가 SCRAM-SHA-256-PLUS 규약을 선택했는데, SCRAM 메시지에 채널 "
 "바인딩 데이터가 없습니다."
 
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
-#, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "쉼표가 와야하는데, \"%s\" 문자가 발견되었음."
-
-#: libpq/auth-scram.c:1010
+#: libpq/auth-scram.c:1024
 #, c-format
 msgid "SCRAM channel binding negotiation error"
 msgstr "SCRAM 채널 바인딩 협상 오류"
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-scram.c:1025
 #, c-format
 msgid ""
 "The client supports SCRAM channel binding but thinks the server does not.  "
@@ -15669,7 +16330,7 @@ msgstr ""
 "해당 클라이언트는 SCRAM 채널 바인딩을 지원하지만, 서버는 그렇지 않은 것 같습"
 "니다. 그런데, 이 서버는 채널 바인딩을 지원합니다."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-scram.c:1047
 #, c-format
 msgid ""
 "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM "
@@ -15678,153 +16339,137 @@ msgstr ""
 "해당 클라이언트가 채널 바인딩을 하지 않는 SCRAM-SHA-256 규약을 선택했는데, "
 "SCRAM 메시지에 채널 바인딩 데이터가 있습니다."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-scram.c:1058
 #, c-format
 msgid "unsupported SCRAM channel-binding type \"%s\""
 msgstr "지원하지 않는 SCRAM 채널 바인드 종류 \"%s\""
 
-#: libpq/auth-scram.c:1051
-#, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "예상치 못한 채널 바인딩 플래그 \"%s\"."
-
-#: libpq/auth-scram.c:1061
-#, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr ""
-"클라이언트는 authorization identity를 사용하지만, 이것을 지원하지 않습니다."
-
-#: libpq/auth-scram.c:1066
-#, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "client-first-message 안에 \"%s\" 속성이 잘못됨"
-
-#: libpq/auth-scram.c:1082
+#: libpq/auth-scram.c:1096
 #, c-format
 msgid "client requires an unsupported SCRAM extension"
 msgstr "클라이언트가 지원하지 않는 SCRAM 확장을 요구합니다."
 
-#: libpq/auth-scram.c:1096
+#: libpq/auth-scram.c:1110
 #, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "SCRAM 토큰에 인쇄할 수 없는 문자가 있음"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "무작위 토큰을 만들 수 없음"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "임의 nonce를 인코드할 수 없음"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
 msgstr "SCRAM 채널 바인딩 검사 실패"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr "client-final-message 안에 예상치 못한 SCRAM 채널 바인딩 속성이 있음"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "client-final-message 안에 잘못된 증명"
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "client-final-message 끝에 추가로 쓸모 없는 값이 있음"
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "사용자 \"%s\"의 인증을 실패했습니다: 호스트 거부됨"
 
-#: libpq/auth.c:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 \"trust\" 인증을 실패했습니다."
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 Ident 인증을 실패했습니다."
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 peer 인증을 실패했습니다."
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 password 인증을 실패했습니다"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "\"%s\" 사용자에 대한 GSSAPI 인증을 실패했습니다."
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "\"%s\" 사용자에 대한 SSPI 인증을 실패했습니다."
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 PAM 인증을 실패했습니다."
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "\"%s\" 사용자에 대한 BSD 인증을 실패했습니다."
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "\"%s\" 사용자의 LDAP 인증을 실패했습니다."
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 인증서 인증을 실패했습니다"
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "사용자 \"%s\"의 RADIUS 인증을 실패했습니다."
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "사용자 \"%s\"의 인증을 실패했습니다: 잘못된 인증 방법"
 
-#: libpq/auth.c:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "\"%s\" 파일의 %d번째 줄에 지정한 인증 설정이 사용됨: \"%s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "인증 식별자가 여러 번 사용 됨"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "이전 식별자: \"%s\"; 새 식별자: \"%s\""
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "연결 인증됨: 식별자=\"%s\" 인증방법=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid ""
 "client certificates can only be checked if a root certificate store is "
@@ -15832,25 +16477,25 @@ msgid ""
 msgstr ""
 "루트 인증서 저장소가 사용 가능한 경우에만 클라이언트 인증서를 검사할 수 있음"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "연결에 유효한 클라이언트 인증서가 필요함"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "GSS 암호화"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "암호화 안함"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, c-format
 msgid ""
 "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
@@ -15859,288 +16504,293 @@ msgstr ""
 "에 따라 거부됩니다"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, c-format
 msgid ""
-"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database "
-"\"%s\", %s"
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
+"\", %s"
 msgstr ""
 "호스트 \"%s\", 사용자 \"%s\", 데이터베이스 \"%s\",  %s 연결이 pg_hba.conf 파"
 "일 설정에 따라 거부됩니다"
 
-#: libpq/auth.c:506
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr ""
 "클라이언트 IP 주소가 \"%s\" 이름으로 확인됨, 호스트 이름 확인 기능으로 맞음"
 
-#: libpq/auth.c:509
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr ""
 "클라이언트 IP 주소가 \"%s\" 이름으로 확인됨, 호스트 이름 확인 기능 사용안함"
 
-#: libpq/auth.c:512
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr ""
 "클라이언트 IP 주소가 \"%s\" 이름으로 확인됨, 호스트 이름 확인 기능으로 틀림"
 
-#: libpq/auth.c:515
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "\"%s\" 클라이언트 호스트 이름을 %s IP 주소로 전환할 수 없음."
 
-#: libpq/auth.c:520
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "클라이언트 IP 주소를 파악할 수 없음: 대상 호스트 이름: %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, c-format
 msgid ""
-"no pg_hba.conf entry for replication connection from host \"%s\", user "
-"\"%s\", %s"
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
+"\", %s"
 msgstr ""
 "호스트 \"%s\", 사용자 \"%s\", %s 연결이 복제용 연결로 pg_hba.conf 파일에 설정"
 "되어 있지 않습니다"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "호스트 \"%s\", 사용자 \"%s\", 데이터베이스 \"%s\", %s 연결에 대한 설정이 "
 "pg_hba.conf 파일에 없습니다."
 
-#: libpq/auth.c:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "연결 인증됨: 사용자=\"%s\" 인증방법=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "메시지 타입 %d를 얻는 예상된 암호 응답"
 
-#: libpq/auth.c:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "유효하지 않은 암호 패킷 사이즈"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "비어있는 암호는 클라이언트에 의해 돌려보냈습니다"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "무작위 MD5 솔트 생성 실패"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "환경변수를 지정할 수 없음: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "GSS 응답이 필요한데 메시지 형식 %d을(를) 받음"
 
-#: libpq/auth.c:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "GSS 보안 컨텍스트를 수락하지 못함"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "GSS 사용자 이름을 검색하지 못함"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "SSPI 자격 증명을 가져올 수 없음"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "SSPI 응답이 필요한데 메시지 형식 %d을(를) 받음"
 
-#: libpq/auth.c:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "SSPI 보안 컨텍스트를 수락할 수 없음"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "SSPI 보안 컨텍스트에서 토큰을 가져올 수 없음"
 
-#: libpq/auth.c:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "이름을 변환할 수 없음"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "realm 이름이 너무 긺"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
-msgstr "변환된 접속자 이름이 너무 깁니다"
+msgstr "변환된 접속자 이름이 너무 긺"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "Ident 연결에 소켓을 생성할 수 없습니다: %m"
 
-#: libpq/auth.c:1756
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "로컬 주소 \"%s\"에 바인드할 수 없습니다: %m"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "주소 \"%s\", 포트 %s의 Ident 서버에게 연결할 수 없습니다: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "주소 \"%s\", 포트 %s의 Ident 서버에게 질의를 보낼 수 없습니다: %m"
 
-#: libpq/auth.c:1807
+#: libpq/auth.c:1808
 #, c-format
 msgid ""
 "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "주소 \"%s\", 포트 %s의 Ident 서버로부터 응답을 받지 못했습니다: %m"
 
-#: libpq/auth.c:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "Ident 서버로부터 잘못된 형태의 응답를 보냈습니다: \"%s\""
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "이 플랫폼에서는 peer 인증이 지원되지 않음"
 
-#: libpq/auth.c:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "신뢰성 피어를 얻을 수 없습니다: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "%ld 로컬 사용자 ID를 찾을 수 없음: %m"
+
+#: libpq/auth.c:1894
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "UID %ld 해당하는 사용자를 찾을 수 없음: %s"
+msgid "local user with ID %ld does not exist"
+msgstr "%ld 로컬 사용자 ID를 찾을 수 없음"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "잠재적인 PAM 레이어에서의 에러: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "지원하지 않는 PAM conversation %d/\"%s\""
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "PAM 인증자를 생성할 수 없습니다: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) 실패: %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST) 실패: %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) 실패: %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "PAM 인증 실패: %s"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt 실패: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "PAM 인증자를 릴리즈할 수 없습니다: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "LDAP 초기화 실패: 오류번호 %d"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "ldapbasedn에서 도메인 이름을 뽑을 수 없음"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "\"%s\"용 LDAP 인증 작업에서 DNS SRV 레코드를 찾을 수 없음"
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "명시적으로 LDAP 서버 이름을 지정하세요."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "LDAP 초기화 실패: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "ldap 인증으로 사용할 수 없는 LDAP 라이브러리"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "LDAP 초기화 실패: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "LDAP 프로토콜 버전을 지정할 수 없음: %s"
 
-#: libpq/auth.c:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "LDAP TLS 세션을 시작할 수 없음: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP 서버도 ldapbasedn도 지정하지 않았음"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP 서버가 지정되지 않음"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "LDAP 인증을 위한 사용자 이름에 사용할 수 없는 문자가 있습니다"
 
-#: libpq/auth.c:2534
+#: libpq/auth.c:2540
 #, c-format
 msgid ""
 "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
@@ -16149,50 +16799,50 @@ msgstr ""
 "\"%s\" ldapbinddn (해당 서버: \"%s\") 설정에 대한 LDAP 바인드 초기화를 할 수 "
 "없음: %s"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "\"%s\" 필터로 LDAP 검색 실패함, 대상 서버: \"%s\": %s"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "\"%s\" LDAP 사용자가 없음"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "\"%s\" 필터로 \"%s\" 서버에서 LDAP 검색을 했으나, 해당 자료가 없음"
 
-#: libpq/auth.c:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "\"%s\" LDAP 사용자가 유일하지 않습니다"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, 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] "\"%s\" 필터로 \"%s\" 서버에서 LDAP 검색 결과 %d 항목을 반환함"
 
-#: libpq/auth.c:2606
+#: libpq/auth.c:2612
 #, c-format
 msgid ""
 "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "\"%s\" 첫번째 항목 조회용 dn 값을 \"%s\" 서버에서 찾을 수 없음: %s"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "\"%s\" 사용자의 \"%s\" LDAP 서버 로그인 실패: %s"
 
-#: libpq/auth.c:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "LDAP 진단: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": client certificate "
@@ -16201,14 +16851,14 @@ msgstr ""
 "\"%s\" 사용자에 대한 인증서 로그인 실패: 클라이언트 인증서에 사용자 이름이 없"
 "음"
 
-#: libpq/auth.c:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": unable to retrieve "
 "subject DN"
 msgstr "사용자 \"%s\"의 인증서 인증을 실패했습니다: DN 주체가 없음"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid ""
 "certificate validation (clientcert=verify-full) failed for user \"%s\": DN "
@@ -16217,115 +16867,115 @@ msgstr ""
 "\"%s\" 사용자를 위한 인증서 유효성 검사(clientcert=verify-full)를 실패 함: "
 "DN 같지 않음"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid ""
 "certificate validation (clientcert=verify-full) failed for user \"%s\": CN "
 "mismatch"
 msgstr "\"%s\" 사용자를 위한 인증서 유효성 검사를 실패 함: CN 같지 않음"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS 서버가 지정되지 않음"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS 비밀키가 지정되지 않음"
 
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid ""
 "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "RADIUS 인증은 %d 글자 보다 큰 비밀번호 인증을 지원하지 않습니다"
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "\"%s\" RADIUS 서버 이름을 주소로 바꿀 수 없음: %s"
 
-#: libpq/auth.c:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "무작위 암호화 벡터를 만들 수 없음"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "비밀번호의 MD5 암호를 만들 수 없음: %s"
 
 #  translator: %s is IPv4, IPv6, or Unix
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "RADIUS 소켓을 생성할 수 없습니다: %m"
 
 #  translator: %s is IPv4, IPv6, or Unix
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "RADIUS 소켓에 바인드할 수 없습니다: %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "RADIUS 패킷을 보낼 수 없음: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "%s 에서 RADIUS 응답 대기 시간 초과"
 
 #  translator: %s is IPv4, IPv6, or Unix
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "RADIUS 소켓 상태를 확인할 수 없음: %m"
 
-#: libpq/auth.c:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "RADIUS 응답을 읽을 수 없음: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "%s에서 RADIUS 응답이 바르지 않은 포트로부터 보내졌음: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "%s에서 RADIUS 응답이 너무 짧음: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "%s에서 RADIUS 응답 길이가 이상함: %d (실재 길이: %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "%s에서 RADIUS 응답이 요청과 다름: %d (기대값: %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "받은 패킷을 대상으로 MD5 암호화 작업할 수 없음: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "%s에서 RADIUS 응답의 MD5 값이 이상함"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "%s에서 RADIUS 응답이 바르지 않은 값임 (%d), 대상 사용자: \"%s\""
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "유효하지 않은 대형 개체 설명: %d"
@@ -16335,7 +16985,7 @@ msgstr "유효하지 않은 대형 개체 설명: %d"
 msgid "large object descriptor %d was not opened for reading"
 msgstr "%d번 대형 개체 기술자가 읽기 모드로 열려있지 않습니다"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "%d번 대형 개체 기술자가 쓰기 모드로 열려있지 않습니다"
@@ -16350,32 +17000,32 @@ msgstr "%d번 대형 개체 기술자에 대한 lo_lseek 반환값이 범위를
 msgid "lo_tell result out of range for large-object descriptor %d"
 msgstr "%d번 대형 개체 기술자에 대한 lo_tell 반환값이 범위를 벗어남"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "서버 파일 \"%s\"을 열 수 없습니다: %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "서버 파일 \"%s\"을 읽을 수 없습니다: %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "서버 파일 \"%s\"의 생성을 할 수 없습니다: %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "서버 파일 \"%s\"에 쓸 수 없습니다: %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "대형 개체 읽기 요청이 너무 큽니다"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "요청한 길이는 음수일 수 없음"
@@ -16416,58 +17066,53 @@ msgstr ""
 "(0600) 또는 더 작게 설정하고, root가 소유주라면 u=rw,g=r (0640) 권한으로 지정"
 "하세요"
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI 감싸기 오류"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "GSSAPI 출력 메시지는 기밀성을 유지하면 안됩니다."
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "서버가 너무 큰 GSSAPI 패킷을 보내려고 합니다(%zu > %zu)."
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "클라이언트가 너무 큰 GSSAPI 패킷을 보냈습니다(%zu > %zu)."
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI 벗기기 오류"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "GSSAPI 입력 메시지는 기밀성을 유지하면 안됩니다."
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "클라이언트가 너무 큰 GSSAPI 패킷을 보냈습니다(%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "GSSAPI 보안 내용을 받아드릴 수 없음"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "GSSAPI 크기 검사 오류"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "SSL 컨텍스트 정보를 생성할 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "서버 인증서 파일 \"%s\"을 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid ""
 "private key file \"%s\" cannot be reloaded because it requires a passphrase"
@@ -16475,102 +17120,107 @@ msgstr ""
 "\"%s\" 개인 키 파일은 비밀번호를 입력해야 해서 자동으로 다시 불러올 수 없습니"
 "다."
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "비밀키 파일 \"%s\"을 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "비밀키의 확인 실패: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "\"%s\" 의 \"%s\" 설정 기능을 빼고 빌드 되었음"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "최소 SSL 프로토콜 버전을 설정할 수 없음"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "최대 SSL 프로토콜 버전을 설정할 수 없음"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "SSL 프로토콜 버전 범위를 지정할 수 없음"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "\"%s\" 값은 \"%s\" 보다 높을 수 없음"
 
-#: libpq/be-secure-openssl.c:307
+#: libpq/be-secure-openssl.c:295
+#, c-format
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr "TLSv1.2 cipher 목록을 설정할 수 없음 (유효한 cipher가 없음)"
+
+#: libpq/be-secure-openssl.c:310
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "cipher 목록을 설정할 수 없음 (유요한 cipher가 없음)"
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr "TLSv1.3 cipher 목록을 설정할 수 없음 (유효한 cipher가 없음)"
 
-#: libpq/be-secure-openssl.c:327
+#: libpq/be-secure-openssl.c:331
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "root 인증서 파일 \"%s\"을 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:376
+#: libpq/be-secure-openssl.c:380
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "\"%s\" SSL 인증서 회수 목록 파일을 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:384
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr "\"%s\" SSL 인증서 회수 목록 디렉터리를 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid ""
-"could not load SSL certificate revocation list file \"%s\" or directory "
-"\"%s\": %s"
+"could not load SSL certificate revocation list file \"%s\" or directory \"%s"
+"\": %s"
 msgstr ""
 "\"%s\" SSL 인증서 회수 목록 파일이나 \"%s\" 디렉터리를 불러들일 수 없습니다: "
 "%s"
 
-#: libpq/be-secure-openssl.c:450
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr "SSL연결을 초기화할 수 없습니다: SSL 컨텍스트를 설정 못함"
 
-#: libpq/be-secure-openssl.c:464
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "SSL연결을 초기화할 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:472
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "SSL 소켓을 지정할 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:528
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "SSL 연결을 받아드릴 수 없습니다: %m"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "SSL 연결을 받아드릴 수 없습니다: EOF 감지됨"
 
-#: libpq/be-secure-openssl.c:573
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "SSL 연결을 받아드릴 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:577
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid ""
 "This may indicate that the client does not support any SSL protocol version "
@@ -16579,392 +17229,408 @@ msgstr ""
 "이런 경우는 클라이언트가 %s부터 %s까지 SSL 프로토콜 버전을 지원하지 않는 경우"
 "에 발생하기도 합니다."
 
-#: libpq/be-secure-openssl.c:594 libpq/be-secure-openssl.c:809
-#: libpq/be-secure-openssl.c:879
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "인식되지 않은 SSL 에러 코드 %d"
 
-#: libpq/be-secure-openssl.c:622
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
 msgstr "수신된 SSL 연결은 예상치 않은 ALPN 프로토콜을 요구함"
 
-#: libpq/be-secure-openssl.c:666
+#: libpq/be-secure-openssl.c:670
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "SSL 인증서의 일반 이름에 포함된 null이 있음"
 
-#: libpq/be-secure-openssl.c:712
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "SSL 인증서의 식별자 이름에 포함된 null이 있음"
 
-#: libpq/be-secure-openssl.c:798 libpq/be-secure-openssl.c:863
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL 에러: %s"
 
-#: libpq/be-secure-openssl.c:1038
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "\"%s\" DH 매개 변수 파일을 열 수 없습니다: %m"
 
-#: libpq/be-secure-openssl.c:1050
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "DH 매개 변수 파일을 불러들일 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:1060
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "잘못된 DH 매개 변수: %s"
 
-#: libpq/be-secure-openssl.c:1069
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "잘못된 DH 매개 변수값: p는 prime 아님"
 
-#: libpq/be-secure-openssl.c:1078
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr "잘못된 DH 매개 변수값: 타당한 생성자도 아니고, 안전한 prime도 아님"
 
-#: libpq/be-secure-openssl.c:1214
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "%d 번째 깊이에서 클라이언트 인증서 유효성 검사 실패: %s."
 
-#: libpq/be-secure-openssl.c:1251
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid ""
 "Failed certificate data (unverified): subject \"%s\", serial number %s, "
 "issuer \"%s\"."
 msgstr ""
-"데이터 인증 실패 (검증 안됨): subject \"%s\", serial number %s, issuer "
-"\"%s\"."
+"데이터 인증 실패 (검증 안됨): subject \"%s\", serial number %s, issuer \"%s"
+"\"."
 
-#: libpq/be-secure-openssl.c:1252
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "알수없음"
 
-#: libpq/be-secure-openssl.c:1389
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: DH 매개 변수 불러오기 실패"
 
-#: libpq/be-secure-openssl.c:1397
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: DH 매개 변수 설정 실패: %s"
 
-#: libpq/be-secure-openssl.c:1424
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: 알 수 없는 curve 이름: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "ssl_groups 설정에서 그룹 이름을 세팅할 수 없습니다: %s"
 
-#: libpq/be-secure-openssl.c:1433
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "올바른 그룹을 못 찾음"
+
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: 키 생성 실패"
+msgid ""
+"Ensure that each group name is spelled correctly and supported by the "
+"installed version of OpenSSL."
+msgstr "설치되어 있는 OpenSSL 버전에서 지원하는 그룹 이름이 맞는지 확인하세요."
 
-#: libpq/be-secure-openssl.c:1461
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "SSL 오류 없음"
 
-#: libpq/be-secure-openssl.c:1479
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL 오류 번호 %lu"
 
-#: libpq/be-secure-openssl.c:1636
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "BIO 만들기 실패"
 
-#: libpq/be-secure-openssl.c:1646
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "ASN1_OBJECT 객체용 NID 구할 수 없음"
 
-#: libpq/be-secure-openssl.c:1654
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "ASN1_OBJECT 구조체에서 %d NID를 변환할 수 없음"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "\"%s\" 롤 없음"
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "\"%s\" 사용자 비밀번호가 아직 할당되지 않음"
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "\"%s\" 사용자 비밀번호가 기한 만료되었습니다."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, c-format
+msgid "encrypted password is too long"
+msgstr "암호화된 비밀번호가 너무 긺"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "암호화된 비밀번호는 %d 바이트를 넘지 않아야합니다."
+
+#: libpq/crypt.c:183
+#, c-format
+msgid "setting an MD5-encrypted password"
+msgstr "MD5-암호화 비밀번호를 사용 중"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid ""
+"MD5 password support is deprecated and will be removed in a future release "
+"of PostgreSQL."
+msgstr ""
+"다음 버전 PostgreSQL에서는 MD5 비밀번호를 더 이상 지원하지 않을 예정입니다."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid ""
+"Refer to the PostgreSQL documentation for details about migrating to another "
+"password type."
+msgstr ""
+"다른 비밀번호 인증 방법으로 바꾸는 자세한 내용은 PostgreSQL 문서를 참조하세"
+"요."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr "\"%s\" 사용자의 비밀번호는 MD5 인증용이 아닙니다."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "\"%s\" 사용자의 비밀번호가 틀립니다."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "\"%s\" 사용자의 비밀번호 암호화 기법을 알 수 없습니다."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "\"%s\" 정규식이 잘못됨: %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "%d번째 줄(\"%s\" 환경 설정 파일)"
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "\"%s\" 인증 설정파일이 없으나 건너뜀"
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "\"%s\" 파일을 열 수 없습니다: 최대 디렉터리 깊이를 초과했음"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "네트워크 인터페이스 이뮬레이트 하기 실패: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid ""
 "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "\"%s\" 인증 옵션은 %s 인증 방법에만 유효함"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "\"%s\" 인증 방법의 경우 \"%s\" 인자를 설정해야 함"
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "줄의 끝 라인에 빠진 엔트리가 있음"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "ident 자리에 여러 값이 있음"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "연결 형식 자리에 여러 값이 있음"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "한 줄에 하나의 연결 형태만 지정해야 합니다"
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "SSL 기능이 꺼져있어 hostssl 설정을 사용할 수 없습니다"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
 msgstr "postgresql.conf 파일에 \"ssl = on\" 설정을 하세요."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr ""
 "이 서버는 ssl 접속 기능을 지원하지 않아 hostssl 인증을 지원하지 않습니다."
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid ""
 "hostgssenc record cannot match because GSSAPI is not supported by this build"
 msgstr ""
 "이 서버는 GSSAPI 접속 기능을 지원하지 않아 hostgssenc 레코드가 적당하지 않음"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "\"%s\" 값은 잘못된 연결 형식입니다"
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "데이터베이스 지정 전에 줄 끝에 도달함"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "롤 지정 전에 줄 끝에 도달함"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "IP 주소 지정 전에 줄 끝에 도달함"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "호스트 주소 부분에  여러 값이 지정됨"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "한 줄에 하나의 주소 범위가 있어야 합니다."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "\"%s\" 형태는 잘못된 IP 주소 형태입니다: %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
 msgstr "호스트 이름과 CIDR 마스크는 함께 쓸 수 없습니다: \"%s\""
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "\"%s\" 주소에 잘못된 CIDR 마스크가 있음"
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "넷마스크 지정 전에 줄 끝에 도달함"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid ""
 "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr "주소 범위는 CIDR 표기법을 쓰거나 넷마스크 표기법을 쓰세요"
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "넷마스크 부분에 여러 값이 지정됨"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "잘못된 IP 마스크, \"%s\": %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "IP 주소와 마스크가 맞지 않습니다"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "인증 방법 전에 줄 끝에 도달함"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "인증 방법 부분에 여러 값이 지정됨"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "하나의 인증 방법에 대해서 한 줄씩 지정해야 합니다"
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "\"%s\" 인증 방법이 잘못됨"
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr "\"%s\" 인증 방법이 잘못됨: 이 서버에서 지원되지 않음"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "gssapi 인증은 로컬 소켓에서 지원되지 않음"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "peer 인증은 로컬 소켓에서만 지원함"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "cert 인증은 hostssl 연결에서만 지원됨"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "인증 옵션이 이름=값 형태가 아님: %s"
 
-#: libpq/hba.c:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid ""
-"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
-"ldapsearchfilter, or ldapurl together with ldapprefix"
-msgstr ""
-"ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
-"ldapsearchfilter, ldapurl 옵션은 ldapprefix 옵션과 함께 사용할 수 없음"
+msgid "cannot mix options for simple bind and search+bind modes"
+msgstr "simple bind와 search+bind 모드를 위한 옵션은 함께 사용할 수 없음"
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, c-format
 msgid ""
-"authentication method \"ldap\" requires argument \"ldapbasedn\", "
-"\"ldapprefix\", or \"ldapsuffix\" to be set"
+"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
+"\", or \"ldapsuffix\" to be set"
 msgstr ""
 "\"ldap\" 인증 방법의 경우 \"ldapbasedn\", \"ldapprefix\", \"ldapsuffix\"옵션"
 "이 있어야 함"
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "ldapsearchattribute 옵션은 ldapsearchfilter 옵션과 함께 사용할 수 없음"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "RADIUS 서버 목록은 비어 있을 수 없음"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "RADIUS 비밀키 목록은 비어 있을 수 없음"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid ""
 "the number of RADIUS secrets (%d) must be 1 or the same as the number of "
@@ -16972,217 +17638,224 @@ msgid ""
 msgstr ""
 "RADIUS 비밀번호 개수(%d)는 하나이거나, RADIUS 서버 개수(%d)와 같아야 함"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid ""
 "the number of RADIUS ports (%d) must be 1 or the same as the number of "
 "RADIUS servers (%d)"
 msgstr "RADIUS 포트 개수(%d)는 하나이거나, RADIUS 서버 개수(%d)와 같아야 함"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid ""
 "the number of RADIUS identifiers (%d) must be 1 or the same as the number of "
 "RADIUS servers (%d)"
 msgstr "RADIUS 계정 개수(%d)는 하나이거나, RADIUS 서버 개수(%d)와 같아야 함"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi 및 cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s 옵션은 %s 옵션과 함께 쓸 수 없음"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert 및 oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert는 \"hostssl\" 행에 대해서만 구성할 수 있음"
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid ""
 "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
 msgstr ""
 "\"cert\" 인증을 사용하는 경우 clientcert 값은 \"verify-full\" 만 허용함"
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "잘못된 clientcert 값: \"%s\""
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname 설정은 \"hostssl\" 줄에만 지정할 수 있음"
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "잘못된 clientname 값: \"%s\""
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "\"%s\" LDAP URL을 분석할 수 없음: %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "지원하지 않는 LDAP URL 스킴: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "이 플랫폼에서는 LDAP URL 기능을 지원하지 않음."
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "잘못된 ldapscheme 값: \"%s\""
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "LDAP 포트 번호가 잘못됨: \"%s\""
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi 및 sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "RADIUS 서버 목록 분석 실패: \"%s\""
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "RADIUS 서버 포트 목록 분석 실패: \"%s\""
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "RADIUS 포트 번호가 잘못됨: \"%s\""
 
 #  translator: %s is IPv4, IPv6, or Unix
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "RADIUS 서버 비밀키 목록 분석 실패: \"%s\""
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "RADIUS 서버 식별자 목록 분석 실패: \"%s\""
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "알 수 없는 인증 옵션 이름: \"%s\""
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "\"%s\" 설정 파일에 구성 항목이 없음"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "\"%s\"에 대한 정규식 일치 실패: %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, c-format
 msgid ""
 "regular expression \"%s\" has no subexpressions as requested by "
 "backreference in \"%s\""
 msgstr "\"%s\" 정규식에는 \"%s\"의 backreference에서 요청된 하위 식이 없음"
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "제공된 사용자 이름(%s) 및 인증된 사용자 이름(%s)이 일치하지 않음"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
 "\"%s\" 사용자맵 파일에 \"%s\" 사용자를 \"%s\" 사용자로 인증할 설정이 없음"
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "%s(%s) 실패: %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "소켓을 nonblocking 모드로 지정할 수 없음: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "\"%s\" 유닉스 도메인 소켓 경로가 너무 깁니다 (최대 %d 바이트)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "호스트 이름 \"%s\", 서비스 \"%s\"를 변환할 수 없습니다. 주소 : %s"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "서비스 \"%s\"를 변환할 수 없습니다. 주소 : %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "최대 접속자 수 MAXLISTEN (%d) 초과로 더 이상 접속이 불가능합니다"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "유닉스"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "%d는 인식되지 않는 가족 주소입니다"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "%s 소켓 만들기 실패, 대상 주소: \"%s\": %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "%s(%s) 실패, 연결 종류: %s, 대상 주소: \"%s\": %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "%s 바인드 실패, 대상 주소: \"%s\": %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "다른 postmaster 가 포트 %d에서 이미 실행중인것 같습니다?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid ""
 "Is another postmaster already running on port %d? If not, wait a few seconds "
@@ -17192,89 +17865,89 @@ msgstr ""
 "를 기다렸다가 다시 시도해보십시오."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "%s 리슨 실패, 대상 주소: \"%s\": %m"
 
 #  translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "\"%s\" 유닉스 도메인 소켓으로 접속을 허용합니다"
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "%s, 주소: \"%s\", 포트 %d 번으로 접속을 허용합니다"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "\"%s\" 그룹 없음"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "파일 \"%s\" 의 그룹을 세팅할 수 없습니다: %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "파일 \"%s\" 의 퍼미션을 세팅할 수 없습니다: %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "새로운 연결을 생성할 수 없습니다: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "클라이언트 연결이 없음"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "클라이언트에게 데이터를 받을 수 없습니다: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4533
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "프로토콜 동기화 작업 실패로 연결을 종료합니다"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "예상치 못한 EOF가 메시지의 길이 워드안에서 발생했습니다."
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "메시지의 길이가 유효하지 않습니다"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "클라이언트으로부터의 완전하지 못한 메시지입니다"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "클라이언트에게 데이터를 보낼 수 없습니다: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) 실패: 오류 코드 %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "keepalive idle time 지정하는 것은 지원하지 않음"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) 지원하지 않음"
@@ -17285,7 +17958,7 @@ msgid "no data left in message"
 msgstr "메시지에 아무런 데이터가 없습니다"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:873 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -17303,12 +17976,12 @@ msgstr "메시지 포맷이 유효하지 않습니다."
 
 # # search5 끝
 # # advance 부분
-#: main/main.c:236
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup 작업 실패: %d\n"
 
-#: main/main.c:324
+#: main/main.c:386
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -17317,7 +17990,7 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 서버입니다.\n"
 "\n"
 
-#: main/main.c:325
+#: main/main.c:387
 #, c-format
 msgid ""
 "Usage:\n"
@@ -17328,107 +18001,107 @@ msgstr ""
 "  %s [옵션]...\n"
 "\n"
 
-#: main/main.c:326
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "옵션들:\n"
 
-#: main/main.c:327
+#: main/main.c:389
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        공유 버퍼 개수\n"
 
-#: main/main.c:328
+#: main/main.c:390
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NAME=VALUE      실시간 매개 변수 지정\n"
 
-#: main/main.c:329
+#: main/main.c:391
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NAME            실시간 매개 변수 값을 보여주고 마침\n"
 
-#: main/main.c:330
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             디버깅 수준\n"
 
-#: main/main.c:331
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR         데이터 디렉터리\n"
 
-#: main/main.c:332
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 날짜 입력 양식이 유럽형(DMY)을 사용함\n"
 
-#: main/main.c:333
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 fsync 기능 끔\n"
 
-#: main/main.c:334
+#: main/main.c:396
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h HOSTNAME        서버로 사용할 호스트 이름 또는 IP\n"
 
-#: main/main.c:335
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr "  -i                 TCP/IP 연결 사용함 (옛 버전 호환용)\n"
 
-#: main/main.c:336
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k DIRECTORY       유닉스 도메인 소켓 위치\n"
 
-#: main/main.c:338
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 SSL 연결 기능 사용함\n"
 
-#: main/main.c:340
+#: main/main.c:402
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-CONNECT     최대 동시 연결 개수\n"
 
-#: main/main.c:341
+#: main/main.c:403
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            서버 포트 번호\n"
 
-#: main/main.c:342
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 각 쿼리 뒤에 통계정보를 보여줌\n"
 
-#: main/main.c:343
+#: main/main.c:405
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S WORK-MEM        정렬작업에 사용할 메모리 크기(kb 단위)를 지정\n"
 
-#: main/main.c:344
+#: main/main.c:406
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      버전 정보 보여주고 마침\n"
 
-#: main/main.c:345
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NAME=VALUE       실시간 매개 변수 지정\n"
 
-#: main/main.c:346
+#: main/main.c:408
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  서버 환경 설정값에 대한 설명을 보여주고 마침\n"
 
-#: main/main.c:347
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         이 도움말을 보여주고 마침\n"
 
-#: main/main.c:349
+#: main/main.c:411
 #, c-format
 msgid ""
 "\n"
@@ -17437,27 +18110,27 @@ msgstr ""
 "\n"
 "개발자 옵션들:\n"
 
-#: main/main.c:350
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h 쿼리최적화기의 기능을 제한 함\n"
 
-#: main/main.c:351
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 시스템 테이블의 구조를 바꿀 수 있도록 함\n"
 
-#: main/main.c:352
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 시스템 인덱스들을 사용하지 않음\n"
 
-#: main/main.c:353
+#: main/main.c:415
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        각 쿼리 다음 작업시간을 보여줌\n"
 
-#: main/main.c:354
+#: main/main.c:416
 #, c-format
 msgid ""
 "  -T                 send SIGABRT to all backend processes if one dies\n"
@@ -17465,13 +18138,13 @@ msgstr ""
 "  -T                 하나의 하위 서버 프로세스가 비정상으로 마치며 모든\n"
 "                     다른 백엔드 프로세스에게 SIGABRT 신호를 보냄\n"
 
-#: main/main.c:355
+#: main/main.c:417
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr ""
 "  -W NUM             디버그 작업을 위해 지정한 숫자의 초만큼 기다린다\n"
 
-#: main/main.c:357
+#: main/main.c:419
 #, c-format
 msgid ""
 "\n"
@@ -17480,28 +18153,28 @@ msgstr ""
 "\n"
 "단일사용자 모드에서 사용할 수 있는 옵션들:\n"
 
-#: main/main.c:358
+#: main/main.c:420
 #, c-format
 msgid ""
 "  --single           selects single-user mode (must be first argument)\n"
 msgstr "  --single           단일 사용자 모드 선택 (인자의 첫번째로 와야함)\n"
 
-#: main/main.c:359
+#: main/main.c:421
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  DBNAME             데이터베이스 이름 (초기값: 사용자이름)\n"
 
-#: main/main.c:360
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             디버깅 수준\n"
 
-#: main/main.c:361
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 실행하기 전에 작업명령을 출력함\n"
 
-#: main/main.c:362
+#: main/main.c:424
 #, c-format
 msgid ""
 "  -j                 do not use newline as interactive query delimiter\n"
@@ -17509,14 +18182,14 @@ msgstr ""
 "  -j                 대화형 쿼리의 명령 실행 구분 문자로 줄바꿈문자를 쓰지 않"
 "음\n"
 
-#: main/main.c:363 main/main.c:369
+#: main/main.c:425 main/main.c:431
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr ""
 "  -r FILENAME        stdout, stderr 쪽으로 보내는 내용을 FILENAME 파일로 저장"
 "함\n"
 
-#: main/main.c:365
+#: main/main.c:427
 #, c-format
 msgid ""
 "\n"
@@ -17525,25 +18198,25 @@ msgstr ""
 "\n"
 "부트스트랩 모드에서 사용할 수 있는 옵션들:\n"
 
-#: main/main.c:366
+#: main/main.c:428
 #, c-format
 msgid ""
 "  --boot             selects bootstrapping mode (must be first argument)\n"
 msgstr "  --boot             부트스트랩 모드로 실행 (첫번째 인자로 와야함)\n"
 
-#: main/main.c:367
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr "  --check            체크 모드 선택 (첫번째 인자로 와야함)\n"
 
-#: main/main.c:368
+#: main/main.c:430
 #, c-format
 msgid ""
 "  DBNAME             database name (mandatory argument in bootstrapping "
 "mode)\n"
 msgstr "  DBNAME             데이터베이스 이름 (부트스트랩 모드에서 필수)\n"
 
-#: main/main.c:371
+#: main/main.c:433
 #, c-format
 msgid ""
 "\n"
@@ -17560,12 +18233,12 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: main/main.c:375
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: main/main.c:386
+#: main/main.c:448
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -17578,12 +18251,12 @@ msgstr ""
 "반드시 일반 사용자 ID(시스템 관리자 권한이 없는 ID)로 서버를 실행하십시오.\n"
 "Server를 어떻게 안전하게 기동하는가 하는 것은 문서를 참조하시기 바랍니다.\n"
 
-#: main/main.c:403
+#: main/main.c:465
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: real 또는 effective user ID 들은 반드시 일치되어야 한다.\n"
 
-#: main/main.c:410
+#: main/main.c:472
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -17607,15 +18280,15 @@ msgstr "\"%s\" 이름의 확장가능한 노드 형이 이미 있습니다"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "\"%s\" ExtensibleNodeMethods가 등록되어 있지 않음"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "\"%s\" 릴레이션에 해당하는 복합 자료형이 없음"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2567
-#: parser/parse_coerce.c:2705 parser/parse_coerce.c:2752
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2120 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "자료형 %s 에 대해서는 배열 자료형을 사용할 수 없습니다"
@@ -17630,7 +18303,7 @@ msgstr "\"%s\" 포탈의 매개 변수: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "이름 없는 포탈의 매개 변수: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid ""
 "FULL JOIN is only supported with merge-joinable or hash-joinable join "
@@ -17639,14 +18312,14 @@ msgstr ""
 "FULL JOIN 구문은 머지 조인이나, 해시 조인이 가능한 상황에서만 사용할 수 있습"
 "니다"
 
-#: optimizer/plan/createplan.c:7175 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1702
+#: optimizer/plan/createplan.c:7315 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1689
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 MERGE 명령을 실행할 수 없음"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr ""
@@ -17654,67 +18327,78 @@ msgstr ""
 "다"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1380 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1495 parser/analyze.c:1815 parser/analyze.c:2074
+#: parser/analyze.c:3395
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s 구문은 UNION/INTERSECT/EXCEPT 예약어들과 함께 사용할 수 없습니다."
 
-#: optimizer/plan/planner.c:2121 optimizer/plan/planner.c:4108
+#: optimizer/plan/planner.c:2238 optimizer/plan/planner.c:4124
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "GROUP BY를 구현할 수 없음"
 
-#: optimizer/plan/planner.c:2122 optimizer/plan/planner.c:4109
-#: optimizer/plan/planner.c:4790 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2239 optimizer/plan/planner.c:4125
+#: optimizer/plan/planner.c:4806 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid ""
 "Some of the datatypes only support hashing, while others only support "
 "sorting."
 msgstr "해싱만 지원하는 자료형도 있고, 정렬만 지원하는 자료형도 있습니다."
 
-#: optimizer/plan/planner.c:4789
+#: optimizer/plan/planner.c:4805
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "DISTINCT를 구현할 수 없음"
 
-#: optimizer/plan/planner.c:6134
+#: optimizer/plan/planner.c:6267
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "창 PARTITION BY를 구현할 수 없음"
 
-#: optimizer/plan/planner.c:6135
+#: optimizer/plan/planner.c:6268
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "창 분할 칼럼은 정렬 가능한 데이터 형식이어야 합니다."
 
-#: optimizer/plan/planner.c:6139
+#: optimizer/plan/planner.c:6272
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "창 ORDER BY를 구현할 수 없음"
 
-#: optimizer/plan/planner.c:6140
+#: optimizer/plan/planner.c:6273
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "창 순서 지정 칼럼은 정렬 가능한 데이터 형식이어야 합니다."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "재귀 UNION을 구현할 수 없음"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "모든 열 데이터 형식은 해시 가능해야 합니다."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "%s 구문은 구현할 수 없음"
 
-#: optimizer/util/clauses.c:4963
+#: optimizer/util/appendinfo.c:165
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "\"%s\" 속성(해당 릴레이션: \"%s\")이 상위 릴레이션의 자료형과 다륾"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr ""
+"\"%s\" 속성(해당 릴레이션: \"%s\")이 상위 릴레이션의 문자정렬규칙과 다륾"
+
+#: optimizer/util/clauses.c:4966
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "\"%s\" SQL 함수를 인라인으로 바꾸는 중"
@@ -17724,22 +18408,22 @@ msgstr "\"%s\" SQL 함수를 인라인으로 바꾸는 중"
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "복구 작업 중에는 임시 테이블이나, 언로그드 테이블을 접근할 수 없음"
 
-#: optimizer/util/plancat.c:768
+#: optimizer/util/plancat.c:770
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr "전체 로우 유니크 인덱스 인터페이스 규약은 지원하지 않습니다."
 
-#: optimizer/util/plancat.c:785
+#: optimizer/util/plancat.c:787
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "ON CONFLICT 처리를 위해 관련된 인덱스가 없습니다"
 
-#: optimizer/util/plancat.c:835
+#: optimizer/util/plancat.c:837
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "제외 제약 조건이 있어 ON CONFLICT DO UPDATE 작업은 할 수 없습니다"
 
-#: optimizer/util/plancat.c:945
+#: optimizer/util/plancat.c:954
 #, c-format
 msgid ""
 "there is no unique or exclusion constraint matching the ON CONFLICT "
@@ -17747,23 +18431,23 @@ msgid ""
 msgstr ""
 "ON CONFLICT 절을 사용하는 경우, unique 나 exclude 제약 조건이 있어야 함"
 
-#: parser/analyze.c:824 parser/analyze.c:1550
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VALUES 목록은 모두 같은 길이여야 함"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT 구문에 target columns 보다 더 많은 표현식이 존재하고 있다"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr ""
 "INSERT 구문에 target columns 보다 더 많은 표현식(expressions)이 존재하고 있다"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1093
 #, c-format
 msgid ""
 "The insertion source is a row expression containing the same number of "
@@ -17772,40 +18456,40 @@ msgstr ""
 "삽입 소스는 INSERT 작업에서 기대하는 칼럼 수와 같은 로우 표현식입니다. 실수"
 "로 괄호를 추가한 것은 아닌지 확인하세요."
 
-#: parser/analyze.c:1357 parser/analyze.c:1744
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO 구문은 여기서는 사용할 수 없음"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1717 parser/analyze.c:3627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s 구문은 VALUES 에 적용할 수 없음"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "UNION/INTERSECT/EXCEPT ORDER BY 절이 잘못됨"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr "결과 열 이름만 사용할 수 있고 식 또는 함수는 사용할 수 없습니다."
 
-#: parser/analyze.c:1913
+#: parser/analyze.c:1957
 #, c-format
 msgid ""
 "Add the expression/function to every SELECT, or move the UNION into a FROM "
 "clause."
 msgstr "모든 SELECT에 식/함수를 추가하거나 UNION을 FROM 절로 이동하십시오."
 
-#: parser/analyze.c:2019
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO 는 UNION/INTERSECT/EXCEPT 의 첫번째 SELECT 에만 허용된다"
 
-#: parser/analyze.c:2091
+#: parser/analyze.c:2136
 #, c-format
 msgid ""
 "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
@@ -17814,39 +18498,50 @@ msgstr ""
 "UNION/INTERSECT/EXCEPT 멤버 문에서 같은 쿼리 수준의 다른 관계를 참조할 수 없"
 "음"
 
-#: parser/analyze.c:2178
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "각각의 %s query 는 같은 수의 columns 를 가져야 한다."
 
-#: parser/analyze.c:2535
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "SET 대상 칼럼들은 해당 릴레이션 이름으로 한정할 수 없습니다."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2668 parser/analyze.c:2678
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s 옵션은 중복해서 사용할 수 없음"
+
+#: parser/analyze.c:2690 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "테이블 이름 \"%s\" 가 한번 이상 명시되어 있습니다."
+
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING 절에는 적어도 하나 이상의 칼럼이 있어야 합니다"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "지정된 소스가 %d개의 칼럼을 반환했음"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "변수 \"%s\" 는 %s 자료형인데 표현식은 %s 자료형입니다."
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3026 parser/analyze.c:3034
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "%s, %s 둘다를 명시할 수 없다"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3054
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr ""
@@ -17854,331 +18549,331 @@ msgstr ""
 "다"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2914
+#: parser/analyze.c:3062
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s 구문은 지원되지 않음"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3065
 #, 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:2925
+#: parser/analyze.c:3073
 #, 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:2936
+#: parser/analyze.c:3084
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s 구문이 잘못됨"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3087
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "민감하지 않은 커서는 READ ONLY여야 합니다."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3181
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr ""
 "구체화된 뷰 정의에 사용한 WITH 절 안에는 자료 변경 구문이 없어야 합니다"
 
-#: parser/analyze.c:3043
+#: parser/analyze.c:3191
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "구체화된 뷰는 임시 테이블이나 뷰를 사용할 수 없습니다"
 
-#: parser/analyze.c:3053
+#: parser/analyze.c:3201
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "구체화딘 뷰는 바운드 매개 변수를 이용해서 정의할 수 없습니다"
 
-#: parser/analyze.c:3065
+#: parser/analyze.c:3213
 #, 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:3254
+#: parser/analyze.c:3402
 #, 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:3261
+#: parser/analyze.c:3409
 #, 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:3268
+#: parser/analyze.c:3416
 #, 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:3275
+#: parser/analyze.c:3423
 #, 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:3282
+#: parser/analyze.c:3430
 #, 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:3289
+#: parser/analyze.c:3437
 #, 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:3388
+#: parser/analyze.c:3536
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s 절에는 unqualified 릴레이션 이름을 지정해야 합니다."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3452
+#: parser/analyze.c:3600
 #, 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:3461
+#: parser/analyze.c:3609
 #, 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:3470
+#: parser/analyze.c:3618
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s 절은 테이블 함수에 적용할 수 없습니다."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3636
 #, 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:3497
+#: parser/analyze.c:3645
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s 절은 named tuplestore에 적용할 수 없음"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3665
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "\"%s\" 릴레이션 (대상 구문: %s) 이 FROM 절 내에 없습니다"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:215 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "%s 자료형에서 사용할 순서 정하는 연산자를 찾을 수 없습니다."
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:217
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr ""
 "DISTINCT와 함께 작업하는 집계 작업은 그 입력 자료가 정렬될 수 있어야 합니다"
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:275
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING 인자로는 32개 이내로 지정해야 합니다"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:378
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "JOIN 조건문에서는 집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:375
+#: parser/parse_agg.c:380
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "JOIN 조건문에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:385
+#: parser/parse_agg.c:390
 msgid ""
 "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "집계 함수는 자신의 쿼리 수준의 FROM 절에서는 사용할 수 없습니다."
 
-#: parser/parse_agg.c:387
+#: parser/parse_agg.c:392
 msgid ""
 "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "자체 쿼리 수준의 FROM 절에는 그룹핑 작업을 허용하지 않습니다."
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:397
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "FROM 절 내의 함수 표현식 내에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:394
+#: parser/parse_agg.c:399
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "FROM 절 내의 함수 표현식 내에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:402
+#: parser/parse_agg.c:407
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "정책 표현식에서는 집계 함수 사용을 허용하지 않습니다"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:409
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "정책 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:421
+#: parser/parse_agg.c:426
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "윈도우 RANGE 안에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:423
+#: parser/parse_agg.c:428
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "윈도우 RANGE 안에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:433
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "윈도우 ROWS 안에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:430
+#: parser/parse_agg.c:435
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "윈도우 ROWS 안에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:440
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "윈도우 GROUPS 안에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:442
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "윈도우 GROUPS 안에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:450
+#: parser/parse_agg.c:455
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "MERGE WHEN 조건절에  집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:457
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "MERGE WHEN 조건절에 그룹핑 작업이 허용되지 않습니다"
 
-#: parser/parse_agg.c:479
+#: parser/parse_agg.c:484
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "체크 제약 조건에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:486
 msgid "grouping operations are not allowed in check constraints"
 msgstr "체크 제약 조건에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:488
+#: parser/parse_agg.c:493
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "DEFAULT 표현식에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:495
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "DEFAULT 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:500
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "인덱스 표현식에서는 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:497
+#: parser/parse_agg.c:502
 msgid "grouping operations are not allowed in index expressions"
 msgstr "인덱스 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:507
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "집계 함수는 함수 기반 인덱스의 함수로 사용할 수 없습니다"
 
-#: parser/parse_agg.c:504
+#: parser/parse_agg.c:509
 msgid "grouping operations are not allowed in index predicates"
 msgstr "그룹핑 작업은 함수 기반 인덱스의 함수로 사용할 수 없습니다"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:514
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "정책 표현식에서는 집계 함수 사용을 허용하지 않습니다"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:516
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "통계 정보 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:521
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "transform 식(expression)에 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:518
+#: parser/parse_agg.c:523
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "transform 식(expression)에 그룹핑 작업를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:528
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "EXECUTE 매개 변수로 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:525
+#: parser/parse_agg.c:530
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "EXECUTE 매개 변수로 그룹핑 작업을 사용할 수 없습니다"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:535
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "트리거의 WHEN 조건절에  집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:537
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "트리거의 WHEN 조건절에 그룹핑 작업이 허용되지 않습니다"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:542
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "파티션 범위 표현식에는 집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:544
 msgid "grouping operations are not allowed in partition bound"
 msgstr "파티션 범위 표현식에는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:549
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "파티션 키 표현식에서는 집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:551
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "파티션 키 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:552
+#: parser/parse_agg.c:557
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "미리 계산된 칼럼 표현식에서는 집계 함수 사용을 허용하지 않습니다"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:559
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "미리 계산된 칼럼 표현식에서는 그룹핑 연산이 허용되지 않습니다"
 
-#: parser/parse_agg.c:560
+#: parser/parse_agg.c:565
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "CALL 매개 변수로 집계 함수를 사용할 수 없습니다"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:567
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "CALL 매개 변수로 그룹핑 연산을 사용할 수 없습니다"
 
-#: parser/parse_agg.c:568
+#: parser/parse_agg.c:573
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "COPY FROM WHERE 조건문에서는 집계 함수가 허용되지 않습니다"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:575
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "COPY FROM WHERE 조건문에서는 그룹핑 연산이 허용되지 않습니다"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:597 parser/parse_clause.c:1962
+#: parser/parse_agg.c:602 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "집계 함수는 %s 절에서 사용할 수 없습니다."
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:600
+#: parser/parse_agg.c:605
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "그룹핑 작업은 %s 절에서 사용할 수 없습니다."
 
-#: parser/parse_agg.c:701
+#: parser/parse_agg.c:706
 #, c-format
 msgid ""
 "outer-level aggregate cannot contain a lower-level variable in its direct "
@@ -18186,12 +18881,12 @@ msgid ""
 msgstr ""
 "출력 수준 집계는 그 직접적인 인자 안에 저수준 변수를 포함할 수 없습니다."
 
-#: parser/parse_agg.c:779
+#: parser/parse_agg.c:784
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "집계 함수 호출은 집합 반환 함수 호출을 포함할 수 없음"
 
-#: parser/parse_agg.c:780 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:785 parser/parse_expr.c:1762 parser/parse_expr.c:2255
 #: parser/parse_func.c:885
 #, c-format
 msgid ""
@@ -18199,106 +18894,106 @@ msgid ""
 "item."
 msgstr "집합 반환 함수를 LATERAL FROM 쪽으로 옮겨서 구현할 수도 있습니다."
 
-#: parser/parse_agg.c:785
+#: parser/parse_agg.c:790
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "집계 함수 호출은 윈도우 함수 호출을 포함할 수 없음"
 
-#: parser/parse_agg.c:864
+#: parser/parse_agg.c:869
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "윈도우 함수는 JOIN 조건에 사용할 수 없음"
 
-#: parser/parse_agg.c:871
+#: parser/parse_agg.c:876
 msgid "window functions are not allowed in functions in FROM"
 msgstr "윈도우 함수는 FROM 절에 있는 함수로 사용할 수 없음"
 
-#: parser/parse_agg.c:877
+#: parser/parse_agg.c:882
 msgid "window functions are not allowed in policy expressions"
 msgstr "윈도우 함수는 정책 식에 사용할 수 없음"
 
-#: parser/parse_agg.c:890
+#: parser/parse_agg.c:895
 msgid "window functions are not allowed in window definitions"
 msgstr "윈도우 함수는 윈도우 함수 정의에 사용할 수 없음"
 
-#: parser/parse_agg.c:901
+#: parser/parse_agg.c:906
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "윈도우 함수는 MERGE WHEN 조건절에서 사용할 수 없음"
 
-#: parser/parse_agg.c:926
+#: parser/parse_agg.c:931
 msgid "window functions are not allowed in check constraints"
 msgstr "윈도우 함수는 check 제약조건에 사용할 수 없음"
 
-#: parser/parse_agg.c:930
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "윈도우 함수는 DEFAULT 식에서 사용할 수 없음"
 
-#: parser/parse_agg.c:933
+#: parser/parse_agg.c:938
 msgid "window functions are not allowed in index expressions"
 msgstr "윈도우 함수는 인덱스 식에서 사용할 수 없음"
 
-#: parser/parse_agg.c:936
+#: parser/parse_agg.c:941
 msgid "window functions are not allowed in statistics expressions"
 msgstr "윈도우 함수는 통계 정보식에 사용할 수 없음"
 
-#: parser/parse_agg.c:939
+#: parser/parse_agg.c:944
 msgid "window functions are not allowed in index predicates"
 msgstr "윈도우 함수는 함수 기반 인덱스에서 사용할 수 없음"
 
-#: parser/parse_agg.c:942
+#: parser/parse_agg.c:947
 msgid "window functions are not allowed in transform expressions"
 msgstr "윈도우 함수는 transform 식에서 사용할 수 없음"
 
-#: parser/parse_agg.c:945
+#: parser/parse_agg.c:950
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "윈도우 함수는 EXECUTE 매개 변수 설정 값으로 사용할 수 없음"
 
-#: parser/parse_agg.c:948
+#: parser/parse_agg.c:953
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "윈도우 함수는 트리거의 WHEN 조건절에서 사용할 수 없음"
 
-#: parser/parse_agg.c:951
+#: parser/parse_agg.c:956
 msgid "window functions are not allowed in partition bound"
 msgstr "윈도우 함수는 파티션 범위 표현식에서 사용할 수 없음"
 
-#: parser/parse_agg.c:954
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in partition key expressions"
 msgstr "윈도우 함수는 파티션 키 표현식에서 사용할 수 없음"
 
-#: parser/parse_agg.c:957
+#: parser/parse_agg.c:962
 msgid "window functions are not allowed in CALL arguments"
 msgstr "윈도우 함수는 CALL 매개 변수 설정 값으로 사용할 수 없음"
 
-#: parser/parse_agg.c:960
+#: parser/parse_agg.c:965
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "윈도우 함수는 COPY FROM WHERE 조건에 사용할 수 없음"
 
-#: parser/parse_agg.c:963
+#: parser/parse_agg.c:968
 msgid "window functions are not allowed in column generation expressions"
-msgstr "윈도우 함수는 미리 계산된 칼럼 생성 표현식에 사용할 수 없음"
+msgstr "윈도우 함수는 미리 계산된 칼럼 생성식에 사용할 수 없음"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:986 parser/parse_clause.c:1971
+#: parser/parse_agg.c:991 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "%s 안에서는 윈도우 함수를 사용할 수 없음"
 
-#: parser/parse_agg.c:1020 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1025 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "\"%s\" 윈도우 함수가 없음"
 
-#: parser/parse_agg.c:1108
+#: parser/parse_agg.c:1115
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "너무 많은 그룹핑 세트가 있습니다 (최대값 4096)"
 
-#: parser/parse_agg.c:1248
+#: parser/parse_agg.c:1276
 #, c-format
 msgid ""
 "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "집계 함수는 재귀 쿼리의 재귀 조건에 사용할 수 없음"
 
-#: parser/parse_agg.c:1441
+#: parser/parse_agg.c:1499
 #, c-format
 msgid ""
 "column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
@@ -18307,60 +19002,60 @@ msgstr ""
 "column \"%s.%s\" 는 반드시 GROUP BY 절내에 있어야 하던지 또는 집계 함수 내에"
 "서 사용되어져야 한다"
 
-#: parser/parse_agg.c:1444
+#: parser/parse_agg.c:1502
 #, c-format
 msgid ""
 "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "순서있는 집합 집계 함수의 직접 인자는 그룹화된 칼럼만 사용해야합니다."
 
-#: parser/parse_agg.c:1449
+#: parser/parse_agg.c:1507
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr ""
 "subquery 가 outer query 에서 그룹화 되지 않은 열인 \"%s.%s\"를 사용합니다"
 
-#: parser/parse_agg.c:1613
+#: parser/parse_agg.c:1672
 #, c-format
 msgid ""
 "arguments to GROUPING must be grouping expressions of the associated query "
 "level"
 msgstr "GROUPING의 인자는 그 관련 쿼리 수준의 그룹핑 표현식이어야 합니다."
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "\"%s\" 릴레이션은 자료 변경 구문의 대상이 될 수 없음"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr "집합 변환 함수는 FROM 절의 최상위 수준에서만 사용할 수 있습니다."
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr "다중 칼럼 정의 목록은 같은 함수용으로 허용하지 않음"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid ""
 "ROWS FROM() with multiple functions cannot have a column definition list"
 msgstr ""
 "여러 함수를 사용하는 ROWS FROM() 구문에는 칼럼 정의 목록을 지정하면 안됩니다."
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid ""
 "Put a separate column definition list for each function inside ROWS FROM()."
 msgstr "ROWS FROM() 안 각 함수용 칼럼 정의 목록을 구분해 주세요."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr ""
 "여러 인자를 사용하는 UNNEST()에서는 칼럼 정의 목록을 사용할 수 없습니다."
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid ""
 "Use separate UNNEST() calls inside ROWS FROM(), and attach a column "
@@ -18368,78 +19063,78 @@ msgid ""
 msgstr ""
 "ROWS FROM() 안에 UNNEST() 호출을 분리하고, 각각 칼럼 정의 목록을 추가하세요."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr "WITH ORDINALITY 구문은 칼럼 정의 목록과 함께 쓸 수 없습니다."
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "ROWS FROM() 안에 칼럼 정의 목록을 넣으세요."
 
-#: parser/parse_clause.c:762 parser/parse_jsontable.c:295
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "하나의 FOR ORDINALITY 칼럼만 허용합니다."
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "\"%s\" 칼럼은 유일성을 가지지 못합니다(not unique)"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "\"%s\" 네임스페이스는 유일성을 가지지 못합니다(not unique)"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "기본 네임스페이스는 하나만 허용합니다"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "\"%s\" 테이블 샘플링 방법이 없습니다"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
 msgstr[0] "\"%s\" 테이블 샘플링 방법 %d개 인자를 지정해야함, (현재 %d개)"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "\"%s\" 테이블 샘플링 방법은 REPEATABLE 옵션을 지원하지 않음"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr "TABLESAMPLE 절은 테이블과 구체화된 뷰에서만 사용할 수 있습니다"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "USING 절 내에 열 이름 \"%s\" 가 한번 이상 사용되었습니다"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "left table 내에 common column 이름  \"%s\" 가 한번 이상 사용되었다"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr "USING 조건절에서 지정한 \"%s\" 칼럼이 왼쪽 테이블에 없음"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "common column name \"%s\"가 right table 에 한번 이상 사용되었다"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr "USING 조건절에서 지정한 \"%s\" 칼럼이 오른쪽 테이블에 없음"
@@ -18591,7 +19286,7 @@ msgid ""
 msgstr ""
 "순서 지정 연산자는 btree 연산자 패밀리의 \"<\" or \">\" 멤버여야 합니다."
 
-#: parser/parse_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
@@ -18599,7 +19294,7 @@ msgstr ""
 "PRECEDING/FOLLOWING 옵셋과 함께 쓰는 RANGE 구문은 칼럼의 %s 자로형을 지원하"
 "지 않습니다."
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s "
@@ -18608,12 +19303,12 @@ msgstr ""
 "PRECEDING/FOLLOWING 옵셋과 함께 쓰는 RANGE 구문은 %s 자료형 칼럼과 %s 옵셋 형"
 "식을 지원하지 않습니다."
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "옵셋 값을 적당한 자료형으로 변환하세요."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for "
@@ -18622,150 +19317,150 @@ msgstr ""
 "PRECEDING/FOLLOWING 옵셋과 함께 쓰는 RANGE 구문이 %s 자료형 칼럼과 %s 옵셋 형"
 "식 계산에서 여러 가지로 해석될 수 있습니다."
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "옵셋 값을 분명한 자료형으로 형변환 하세요."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3405
-#: parser/parse_expr.c:3634 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2154 parser/parse_expr.c:2774 parser/parse_expr.c:3425
+#: parser/parse_expr.c:3654 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "%s 자료형을 %s 자료형으로 형변환할 수 없습니다."
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "입력에 너무 적은 칼럼을 지정했습니다."
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "%s 자료형을 %s 자료형으로 형변환할 수 없습니다 해당 열 %d."
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1122
 #, c-format
 msgid "Input has too many columns."
 msgstr "입력에 너무 많은 칼럼을 지정했습니다."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "%s의 인자는 %s 자료형이어야 함(%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:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "%s 의 인자는 set(집합) 을 return할수 없습니다."
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1383
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "%s 자료형 %s 와 %s 는 서로 매치되지 않습니다"
 
-#: parser/parse_coerce.c:1499
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "인자 자료형으로 %s 와 %s 는 서로 매치되지 않습니다"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1551
+#: parser/parse_coerce.c:1586
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s 는 자료형 %s 자료형에서 %s 자료형으로 변환될 수 없습니다."
 
-#: parser/parse_coerce.c:2154 parser/parse_coerce.c:2174
-#: parser/parse_coerce.c:2194 parser/parse_coerce.c:2215
-#: parser/parse_coerce.c:2270 parser/parse_coerce.c:2304
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "\"%s\" 로 선언된 인자들이 모두 같지 않습니다."
 
-#: parser/parse_coerce.c:2249 parser/parse_coerce.c:2362
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "%s 이름으로 선언된 인자가 array가 아니고, %s 자료형입니다"
 
-#: parser/parse_coerce.c:2282 parser/parse_coerce.c:2432
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "%s 로 선언된 인자가 range 자료형이 아니고, %s 자료형입니다"
 
-#: parser/parse_coerce.c:2316 parser/parse_coerce.c:2396
-#: parser/parse_coerce.c:2529 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "%s 로 선언된 인자가 multirange 자료형이 아니고, %s 자료형입니다"
 
-#: parser/parse_coerce.c:2353
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "\"anyarray\" 인자의 각 요소 자료형을 확인할 수 없음"
 
-#: parser/parse_coerce.c:2379 parser/parse_coerce.c:2410
-#: parser/parse_coerce.c:2449 parser/parse_coerce.c:2515
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr ""
 "%s 이름으로 선언된 인자가 %s 형으로 선언된 인자들과 일관성이 없습니다질 않습"
 "니다"
 
-#: parser/parse_coerce.c:2474
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr "입력에 %s 형이 있어 다변 형식을 확인할 수 없음"
 
-#: parser/parse_coerce.c:2488
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "anynonarray에 일치된 형식이 배열 형식임: %s"
 
-#: parser/parse_coerce.c:2498
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "anyenum에 일치된 형식이 열거 형식이 아님: %s"
 
-#: parser/parse_coerce.c:2559
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr "anycompatible 계열 인자는 일반 자료형으로 변환할 수 없습니다."
 
-#: parser/parse_coerce.c:2577 parser/parse_coerce.c:2598
-#: parser/parse_coerce.c:2648 parser/parse_coerce.c:2653
-#: parser/parse_coerce.c:2717 parser/parse_coerce.c:2729
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr "%s 다형 자료형을 결정할 수 없음, 입력 자료형이 %s 임"
 
-#: parser/parse_coerce.c:2587
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr ""
 "%s 자료형이 anycompatiblerange인데, 해당 %s anycompatible 자료형을 찾을 수 없"
 "음"
 
-#: parser/parse_coerce.c:2608
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr ""
 "%s 자료형이 anycompatiblemultirange 형인데, 해당 %s anycompatible 자료형을 찾"
 "을 수 없음"
 
-#: parser/parse_coerce.c:2622
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr "일치한 anycompatiblenonarray 자료형이 배열 자료형임: %s"
 
-#: parser/parse_coerce.c:2857
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anyrange or "
@@ -18774,7 +19469,7 @@ msgstr ""
 "%s 형 반환 자료형은 anyrange 형이나, anymultirange 형 중 하나를 입력 자료형으"
 "로 필요합니다."
 
-#: parser/parse_coerce.c:2874
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anycompatiblerange "
@@ -18783,7 +19478,7 @@ msgstr ""
 "%s 형 반환 자료형은 anycompatiblerange 형이나, anycompatiblemultirange 형 중 "
 "하나를 입력 자료형으로 필요합니다."
 
-#: parser/parse_coerce.c:2886
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anyelement, "
@@ -18792,7 +19487,7 @@ msgstr ""
 "%s 형 반환 자료형은 anyarray, anynonarray, anyenum, anyrange, 또는 "
 "anymultirange 형 중 하나를 입력 자료형으로 필요합니다."
 
-#: parser/parse_coerce.c:2898
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anycompatible, "
@@ -18803,7 +19498,7 @@ msgstr ""
 "anycompatiblenonarray, anycompatiblerange, anycompatiblemultirange 자료형 중 "
 "하나 이상이 필요로 합니다."
 
-#: parser/parse_coerce.c:2928
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr ""
 "internal 형의 결과는 적어도 하나 이상의 internal 형의 입력 자료형이 필요합니"
@@ -18858,23 +19553,23 @@ msgstr "\"%s\" 쿼리에 대한 재귀 참조가 INTERSECT 내에 표시되지 
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "\"%s\" 쿼리에 대한 재귀 참조가 EXCEPT 내에 표시되지 않아야 함"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "\"%s\" WITH 쿼리 이름이 여러 번 지정됨"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "%s 자료형용 부등식 연산자를 알 수 없음"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid ""
 "WITH clause containing a data-modifying statement must be at the top level"
 msgstr "자료를 변경하는 구문이 있는 WITH 절은 최상위 수준에 있어야 합니다"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, c-format
 msgid ""
 "recursive query \"%s\" column %d has type %s in non-recursive term but type "
@@ -18883,12 +19578,12 @@ msgstr ""
 "\"%s\" 재귀 쿼리의 %d 번째 칼럼은 비재귀 조건에 %s 자료형을 포함하는데 전체적"
 "으로는 %s 자료형임"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "비재귀 조건의 출력을 올바른 형식으로 형변환하십시오."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, c-format
 msgid ""
 "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
@@ -18897,42 +19592,42 @@ msgstr ""
 "\"%s\" 재귀 쿼리의 %d 번째 칼럼은 비재귀 조건에 %s 자료형을 포함하는데 전체적"
 "으로는 %s 자료형임"
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr ""
 "비 재귀형 요소들의 문자 정렬 규칙을 지정할 때는 COLLATE 절을 추가하세요."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "WITH 쿼리가 재귀 쿼리 형식이 아님"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid ""
 "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr ""
 "SEARCH 또는 CYCLE 절을 사용할 때는 UNION 왼쪽 구문은 SELECT 여야 합니다."
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid ""
 "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr ""
 "SEARCH 또는 CYCLE 절을 사용할 때는 UNION 오른쪽 구문은 SELECT 여야 합니다."
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "\"%s\" search용 칼럼이 WITH 쿼리 칼럼 목록에 없음"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "\"%s\" search용 칼럼을 하나 이상 지정했음"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid ""
 "search sequence column name \"%s\" already used in WITH query column list"
@@ -18940,154 +19635,154 @@ msgstr ""
 "\"%s\" 이름의 search sequence 칼럼 이름은 WITH 쿼리 칼럼 목록 안에서 이미 사"
 "용되고 있습니다."
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "\"%s\" cycle용 칼럼이 WITH 쿼리 칼럼 목록에 없습니다"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "\"%s\" cycle용 칼럼을 하나 이상 지정했음"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr ""
 "\"%s\" cycle mark 칼럼 이름이 WITH 쿼리 칼럼 목록 안에서 이미 사용되고 있습니"
 "다."
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr ""
 "\"%s\" cycle path 칼럼 이름이 WITH 쿼리 칼럼 목록 안에서 이미 사용되고 있습니"
 "다."
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "cycle mark 칼럼 이름과 cycle path 칼럼 이름이 같습니다."
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr "search sequence 칼럼 이름과 cycle mark 칼럼 이름이 같습니다."
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr "search sequence 칼럼 이름과 cycle path 칼럼 이름이 같습니다."
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 "\"%s\" WITH 쿼리에는 %d개의 칼럼을 사용할 수 있는데 %d개의 칼럼이 지정됨"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "WITH 항목 간의 상호 재귀가 구현되지 않음"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr "\"%s\" 재귀 쿼리에 자료 변경 구문이 포함될 수 없습니다."
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, c-format
 msgid ""
 "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
 "recursive-term"
 msgstr "\"%s\" 재귀 쿼리에 비재귀 조건 형태의 UNION [ALL] 재귀 조건이 없음"
 
-#: parser/parse_cte.c:911
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "재귀 쿼리의 ORDER BY가 구현되지 않음"
 
-#: parser/parse_cte.c:917
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "재귀 쿼리의 OFFSET이 구현되지 않음"
 
-#: parser/parse_cte.c:923
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "재귀 쿼리의 LIMIT가 구현되지 않음"
 
-#: parser/parse_cte.c:929
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "재귀 쿼리의 FOR UPDATE/SHARE가 구현되지 않음"
 
-#: parser/parse_cte.c:1008
+#: parser/parse_cte.c:1074
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "\"%s\" 쿼리에 대한 재귀 참조가 여러 번 표시되지 않아야 함"
 
-#: parser/parse_expr.c:313
+#: parser/parse_expr.c:311
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "이 영역에서는 DEFAULT를 사용할 수 없습니다"
 
-#: parser/parse_expr.c:406 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:404 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "%s.%s 칼럼 없음"
 
-#: parser/parse_expr.c:418
+#: parser/parse_expr.c:416
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "\"%s\" 칼럼은 %s 자료형을 찾을 수 없음"
 
-#: parser/parse_expr.c:424
+#: parser/parse_expr.c:422
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "레코드 데이터 형식에서 \"%s\" 칼럼을 식별할 수 없음"
 
-#: parser/parse_expr.c:430
+#: parser/parse_expr.c:428
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr ""
 ".%s 표현이 %s 자료형 사용되었는데, 이는 복소수형 (complex type)이 아닙니다"
 
-#: parser/parse_expr.c:461 parser/parse_target.c:732
+#: parser/parse_expr.c:459 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "\"*\"를 통한 칼럼 확장은 여기서 지원되지 않음"
 
-#: parser/parse_expr.c:584
+#: parser/parse_expr.c:582
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "DEFAULT 표현식에서는 열 reference를 사용할 수 없음"
 
-#: parser/parse_expr.c:587
+#: parser/parse_expr.c:585
 msgid "cannot use column reference in partition bound expression"
 msgstr "파티션 범위 표현식에서 칼럼 참조를 사용할 수 없음"
 
-#: parser/parse_expr.c:846 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:844 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "칼럼 참조 \"%s\" 가 모호합니다."
 
-#: parser/parse_expr.c:902 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:900 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "$%d 매개 변수가 없습니다"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1103 parser/parse_expr.c:3065
+#: parser/parse_expr.c:1101 parser/parse_expr.c:3085
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "%s 절은 불리언 값을 얻기 위해서 = 연산자를 필요로 합니다"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3072
+#: parser/parse_expr.c:1107 parser/parse_expr.c:3092
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s에서는 집합을 반환할 수 없습니다."
@@ -19096,8 +19791,7 @@ msgstr "%s에서는 집합을 반환할 수 없습니다."
 #, c-format
 msgid ""
 "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
-msgstr ""
-"MERGE_ACTION()은 MERGE 명령의 RETURNING 목록 안에서만 사용될 수 있음"
+msgstr "MERGE_ACTION()은 MERGE 명령의 RETURNING 목록 안에서만 사용될 수 있음"
 
 #: parser/parse_expr.c:1519 parser/parse_expr.c:1551
 #, c-format
@@ -19113,7 +19807,7 @@ msgstr ""
 "다중 칼럼 UPDATE 요소를 위한 소스는 서브셀렉트나 ROW() 표현식이어야 합니다."
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1760 parser/parse_expr.c:2253 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "%s 안에서는 집합 반환 함수를 사용할 수 없음"
@@ -19168,9 +19862,9 @@ msgstr "COPY FROM WHERE 조건절에서는 서브쿼리를 사용할 수 없습
 
 #: parser/parse_expr.c:1861
 msgid "cannot use subquery in column generation expression"
-msgstr "미리 계산된 칼럼 생성 표현식에 서브쿼리를 사용할 수 없습니다"
+msgstr "미리 계산된 칼럼 생성식에 서브쿼리를 사용할 수 없습니다"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3764
+#: parser/parse_expr.c:1914 parser/parse_expr.c:3784
 #, c-format
 msgid "subquery must return only one column"
 msgstr "subquery는 오로지 한개의 열만을 돌려 주어야 합니다."
@@ -19185,210 +19879,210 @@ msgstr "subquery 에가 너무 많은 칼럼을 가집니다"
 msgid "subquery has too few columns"
 msgstr "subquery 에 명시된 열 수가 너무 적다"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2094
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "빈 배열의 자료형을 확인할 수 없음"
 
-#: parser/parse_expr.c:2087
+#: parser/parse_expr.c:2095
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "원하는 형식으로 명시적으로 형변환하십시오(예: ARRAY[]::integer[])."
 
-#: parser/parse_expr.c:2101
+#: parser/parse_expr.c:2109
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "%s 자료형의 요소 자료형을 찾을 수 없음"
 
-#: parser/parse_expr.c:2184
+#: parser/parse_expr.c:2194
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW 표현식은 최대 %d 개의 항목을 지정할 수 있습니다"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2399
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "이름이 지정되지 않은 XML 속성 값은 열 참조여야 함"
 
-#: parser/parse_expr.c:2390
+#: parser/parse_expr.c:2400
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "이름이 지정되지 않은 XML 요소 값은 열 참조여야 함"
 
-#: parser/parse_expr.c:2405
+#: parser/parse_expr.c:2415
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "\"%s\" XML 속성 이름이 여러 번 표시됨"
 
-#: parser/parse_expr.c:2513
+#: parser/parse_expr.c:2523
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "XMLSERIALIZE 결과를 %s 형으로 바꿀 수 없음"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2847 parser/parse_expr.c:3043
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "행 표현식에서 항목 수가 일치하지 않습니다"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2857
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "길이가 영(0)인 행들은 비교할 수 없습니다"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2882
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr ""
 "행 비교 연산자는 불리언형을 리턴해야 합니다. %s 자료형을 사용할 수 없습니다"
 
-#: parser/parse_expr.c:2869
+#: parser/parse_expr.c:2889
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "행 비교 연산자는 set을 리턴할 수 없습니다"
 
-#: parser/parse_expr.c:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2948 parser/parse_expr.c:2989
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "%s 행 비교 연산자의 구문을 분석할 수 없습니다"
 
-#: parser/parse_expr.c:2930
+#: parser/parse_expr.c:2950
 #, c-format
 msgid ""
 "Row comparison operators must be associated with btree operator families."
 msgstr "로우 비교 연산자를 btree 연산자 패밀리와 연결해야 함"
 
-#: parser/parse_expr.c:2971
+#: parser/parse_expr.c:2991
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "여러 가지 등식들이 성립할 수 있는 가능성이 있습니다"
 
-#: parser/parse_expr.c:3306
+#: parser/parse_expr.c:3326
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "JSON ENCODING 절은 입력 자료형이 bytea 일때만 허용합니다."
 
-#: parser/parse_expr.c:3370
+#: parser/parse_expr.c:3390
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr ""
 "FORMAT JSON 절과 관련된 자료형이 문자열이 아닌 자료형인 경우는 사용할 수 없습"
 "니다."
 
-#: parser/parse_expr.c:3371
+#: parser/parse_expr.c:3391
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr ""
 "FORMAT JSON 절과 관련된 자료형이 문자열이 아닌 자료형인 경우는 사용할 수 없습"
 "니다."
 
-#: parser/parse_expr.c:3460
+#: parser/parse_expr.c:3480
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "비 문자열 출력 형으로 JSON 포멧을 사용할 수 없음"
 
-#: parser/parse_expr.c:3473
+#: parser/parse_expr.c:3493
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "이진 자료형이 아닌 출력 자료형을 위한 JSON 인코딩을 지정할 수 없음"
 
-#: parser/parse_expr.c:3478
+#: parser/parse_expr.c:3498
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "지원하지 않는 JSON 인코딩"
 
-#: parser/parse_expr.c:3479
+#: parser/parse_expr.c:3499
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "UTF8 JSON 인코딩만 지원합니다."
 
-#: parser/parse_expr.c:3516
+#: parser/parse_expr.c:3536
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "SQL/JSON 함수들은 SETOF 반환 자료형을 지원하지 않음"
 
-#: parser/parse_expr.c:3521
+#: parser/parse_expr.c:3541
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "SQL/JSON 함수들은  반환 자료형으로 의사 자료형을 지원하지 않음"
 
-#: parser/parse_expr.c:3849 parser/parse_func.c:866
+#: parser/parse_expr.c:3869 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "윈도우 함수에 대해 집계용 ORDER BY가 구현되지 않음"
 
-#: parser/parse_expr.c:4072
+#: parser/parse_expr.c:4092
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr ""
 "이진 자료형이 아닌 입력 자료형을 위한 JSON FORMAT ENCODING 구문을 사용할 수 "
 "없음"
 
-#: parser/parse_expr.c:4092
+#: parser/parse_expr.c:4112
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "IS JSON 술어(predicate)에 %s 자료형을 사용할 수 없음"
 
-#: parser/parse_expr.c:4118 parser/parse_expr.c:4239
+#: parser/parse_expr.c:4138 parser/parse_expr.c:4259
 #, c-format
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "%s 자료형은 %s RETURNING 절에서 사용할 수 없음"
 
-#: parser/parse_expr.c:4120
+#: parser/parse_expr.c:4140
 #, c-format
 msgid "Try returning json or jsonb."
 msgstr "json 또는 jsonb 형을 반환하세요."
 
-#: parser/parse_expr.c:4168
+#: parser/parse_expr.c:4188
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr "문자열이 아닌 자료형은 WITH UNIQUE KEYS 절과 함께 사용할 수 없음"
 
-#: parser/parse_expr.c:4242
+#: parser/parse_expr.c:4262
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "문자열이나 bytea 자료형을 반환하도록 하세요."
 
-#: parser/parse_expr.c:4307
+#: parser/parse_expr.c:4327
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr "%s()의 RETURNING 절안에는 FORMAT JSON 옵션을 지정할 수 없음"
 
-#: parser/parse_expr.c:4320
+#: parser/parse_expr.c:4340
 #, c-format
 msgid ""
 "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
 msgstr "WITH WRAPPER 옵션을 사용할 때는 SQL/JSON QUOTES 옵션을 지정하면 안됨"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4334 parser/parse_expr.c:4363 parser/parse_expr.c:4394
-#: parser/parse_expr.c:4420 parser/parse_expr.c:4446
-#: parser/parse_jsontable.c:94
+#: parser/parse_expr.c:4354 parser/parse_expr.c:4383 parser/parse_expr.c:4414
+#: parser/parse_expr.c:4440 parser/parse_expr.c:4466
+#: parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "%s 절은 바르지 않음"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4337 parser/parse_expr.c:4366
+#: parser/parse_expr.c:4357 parser/parse_expr.c:4386
 #, c-format
 msgid ""
 "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is "
 "allowed in %s for %s."
 msgstr ""
-"%s 옵션(대상: %s)에는  ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, 또는 "
-"DEFAULT 표현식만 쓸 수 있음"
+"%s 옵션(대상: %s)에는  ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, 또는 DEFAULT "
+"표현식만 쓸 수 있음"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4344 parser/parse_expr.c:4373 parser/parse_expr.c:4402
-#: parser/parse_expr.c:4430 parser/parse_expr.c:4456
+#: parser/parse_expr.c:4364 parser/parse_expr.c:4393 parser/parse_expr.c:4422
+#: parser/parse_expr.c:4450 parser/parse_expr.c:4476
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "%s 절은 \"%s\" 칼럼 대상으로는 사용할 수 없음"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4347 parser/parse_expr.c:4376
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396
 #, c-format
 msgid ""
 "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is "
@@ -19397,62 +20091,62 @@ msgstr ""
 "포멧된 칼럼용 %s 옵션에는  ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, 또는 "
 "DEFAULT 표현식만 쓸 수 있음"
 
-#: parser/parse_expr.c:4395
+#: parser/parse_expr.c:4415
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
-msgstr "%s 옵션 값으로는 ERROR, TRUE, FALSE, 또는 UNKNOWN 만 쓸 수 있음: 대상=%s"
+msgstr ""
+"%s 옵션 값으로는 ERROR, TRUE, FALSE, 또는 UNKNOWN 만 쓸 수 있음: 대상=%s"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4405
+#: parser/parse_expr.c:4425
 #, c-format
 msgid ""
 "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
-msgstr "EXISTS 칼럼용 %s 옵션에는 ERROR, TRUE, FALSE, 또는 UNKNOWN 만 쓸 수 있음."
+msgstr ""
+"EXISTS 칼럼용 %s 옵션에는 ERROR, TRUE, FALSE, 또는 UNKNOWN 만 쓸 수 있음."
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4423 parser/parse_expr.c:4449
+#: parser/parse_expr.c:4443 parser/parse_expr.c:4469
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr "%s 옵션 값으로는 ERROR, NULL, 또는 DEFAULT 만 쓸 수 있음: 대상=%s"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4433 parser/parse_expr.c:4459
+#: parser/parse_expr.c:4453 parser/parse_expr.c:4479
 #, c-format
 msgid ""
 "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
 msgstr "스칼라 칼럼용 %s 옵션에는 ERROR, NULL, 또는 DEFAULT 만 쓸 수 있음."
 
-
-#: parser/parse_expr.c:4489
+#: parser/parse_expr.c:4509
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "JSON 패스 표현식은 %s 자료형이어야 함(%s 자료형이 아님)"
 
-#: parser/parse_expr.c:4707
+#: parser/parse_expr.c:4727
 #, c-format
 msgid ""
 "can only specify a constant, non-aggregate function, or operator expression "
 "for DEFAULT"
-msgstr ""
-"DEFAULT로는 상수, 비집계 함수, 또는 연산자 표현식만 쓸 수 있음"
+msgstr "DEFAULT로는 상수, 비집계 함수, 또는 연산자 표현식만 쓸 수 있음"
 
-#: parser/parse_expr.c:4712
+#: parser/parse_expr.c:4732
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "DEFAULT 표현식에서는 칼럼 참조를 포함할 수 없습니다"
 
-#: parser/parse_expr.c:4717
+#: parser/parse_expr.c:4737
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "DEFAULT 표현식에서는 집합을 반환할 수 없습니다."
 
-#: parser/parse_expr.c:4793 parser/parse_expr.c:4802
+#: parser/parse_expr.c:4813 parser/parse_expr.c:4822
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "%s 자료형을 %s 자료형으로 형변환할 수 없습니다."
 
-#: parser/parse_expr.c:4796
+#: parser/parse_expr.c:4816
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "%s형으로 변환하는 형변환자를 사용해보십시오"
@@ -19829,14 +20523,13 @@ msgid ""
 "set-returning functions are not allowed in column generation expressions"
 msgstr "집합 반환 함수는 미리 계산된 칼럼의 생성식에 사용할 수 없음"
 
-#: parser/parse_jsontable.c:95
+#: parser/parse_jsontable.c:93
 #, c-format
 msgid ""
 "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
-msgstr ""
-"EMPTY [ ARRAY ] 또는 ERROR는 최상위 수준 ON ERROR 절에서만 쓸 수 있음"
+msgstr "EMPTY [ ARRAY ] 또는 ERROR는 최상위 수준 ON ERROR 절에서만 쓸 수 있음"
 
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
 msgstr "JSON_TABLE 칼럼이나 패스 이름이 중복됨: %s"
@@ -19932,38 +20625,33 @@ msgstr "op ANY/ALL (array) 는 불리언을 얻기 위한 연산자가 필요합
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (array) 는 set 을 return 하지 않는 연산자가 요구 됩니다."
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "inconsistent types deduced for parameter $%d"
 
-#: parser/parse_param.c:309 tcop/postgres.c:744
+#: parser/parse_param.c:310 tcop/postgres.c:734
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "$%d 매개 변수의 자료형을 알수가 없습니다."
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "테이블 참조 \"%s\" 가 명확하지 않습니다 (ambiguous)."
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "테이블 참조 %u 가 명확하지 않습니다 (ambiguous)."
 
-#: parser/parse_relation.c:465
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "테이블 이름 \"%s\" 가 한번 이상 명시되어 있습니다."
-
-#: parser/parse_relation.c:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "\"%s\" 테이블을 사용하는 FROM 절에 대한 참조가 잘못 되었습니다."
 
-#: parser/parse_relation.c:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, c-format
 msgid ""
 "There is an entry for table \"%s\", but it cannot be referenced from this "
@@ -19971,42 +20659,42 @@ msgid ""
 msgstr ""
 "\"%s\" 테이블에 대한 항목이 있지만 이 쿼리 부분에서 참조할 수 없습니다."
 
-#: parser/parse_relation.c:500
+#: parser/parse_relation.c:508
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "LATERAL 옵션을 사용할 때는 그 조인 형태가 INNER 또는 LEFT여야 합니다."
 
-#: parser/parse_relation.c:703
+#: parser/parse_relation.c:711
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "제약 조건에서 참조하는 \"%s\" 시스템 칼럼이 없음"
 
-#: parser/parse_relation.c:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr ""
 "\"%s\" 칼럼은 시스템 칼럼임. 미리 계산된 칼럼의 생성식에 사용할 수 없음"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "\"%s\" 칼럼은 시스템 칼럼입니다. MERGE WHEN 조건절에서 사용될 수 없음"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 "테이블 \"%s\" 에는 %d 개의 칼럼이 있는데, %d 개의 칼럼만 명시되었습니다."
 
-#: parser/parse_relation.c:1445
+#: parser/parse_relation.c:1462
 #, c-format
 msgid ""
 "There is a WITH item named \"%s\", but it cannot be referenced from this "
 "part of the query."
 msgstr "\"%s\"(이)라는 WITH 항목이 있지만 이 쿼리 부분에서 참조할 수 없습니다."
 
-#: parser/parse_relation.c:1447
+#: parser/parse_relation.c:1464
 #, c-format
 msgid ""
 "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
@@ -20014,92 +20702,92 @@ msgstr ""
 "WITH RECURSIVE를 사용하거나 WITH 항목의 순서를 변경하여 정방향 참조를 제거하"
 "십시오."
 
-#: parser/parse_relation.c:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid ""
 "a column definition list is redundant for a function with OUT parameters"
 msgstr "칼럼 정의 목록이 OUT 매개 변수를 사용하는 함수에서 중복되었음"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid ""
 "a column definition list is redundant for a function returning a named "
 "composite type"
 msgstr "칼럼 정의 목록이 이름 기반 복합 자료형을 반환하는 함수에서 중복되었음"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, c-format
 msgid ""
 "a column definition list is only allowed for functions returning \"record\""
 msgstr ""
 "칼럼 정의 목록는 오로지 \"record\" 를 리턴하는 함수 내에서만 허용됩니다."
 
-#: parser/parse_relation.c:1857
+#: parser/parse_relation.c:1874
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "칼럼 정의 목록은 \"record\" 를 리턴하는 함수를 필요로 합니다"
 
-#: parser/parse_relation.c:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "칼럼 정의 목록은 최대 %d 개의 항목을 지정할 수 있습니다"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr ""
 "FROM 절 내의 함수 \"%s\" 에 지원되지 않는 return 자료형 %s 이 있습니다."
 
-#: parser/parse_relation.c:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "FROM 절에 쓰는 함수는 최대 %d개의 칼럼을 반환하는 것이여야 함"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "%s 함수는 %d 개의 칼럼을 반환하는데, %d 개의 칼럼만 명시되었습니다."
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr ""
 "VALUES 뒤에 오는 \"%s\" 구문에는 %d개의 칼럼이 있는데, 지정한 칼럼은 %d개 입"
 "니다"
 
-#: parser/parse_relation.c:2242
+#: parser/parse_relation.c:2259
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "조인에는 최대 %d개의 칼럼을 포함할 수 있음"
 
-#: parser/parse_relation.c:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid ""
 "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 "\"%s\" 조인식에는 %d 개의 칼럼이 있는데, %d 개의 칼럼만 명시되었습니다."
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "\"%s\" WITH 쿼리에 RETURNING 절이 없습니다."
 
-#: parser/parse_relation.c:3635
+#: parser/parse_relation.c:3741
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "아 \"%s\" alias를 참조해야 할 것 같습니다."
 
-#: parser/parse_relation.c:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr "그 테이블을 참조하려면, 서브쿼리에 LATERAL 예약어를 사용하세요."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "테이블 \"%s\"에 FROM 절이 빠져 있습니다."
 
-#: parser/parse_relation.c:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid ""
 "There are columns named \"%s\", but they are in tables that cannot be "
@@ -20108,12 +20796,12 @@ msgstr ""
 "\"%s\" 이름의 칼럼이 테이블에 있지만, 이 쿼리의 이 부분에서는 참조될 수 없습"
 "니다."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "테이블을 지정할 수 있는 이름을 사용하세요."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, c-format
 msgid ""
 "There is a column named \"%s\" in table \"%s\", but it cannot be referenced "
@@ -20122,48 +20810,48 @@ msgstr ""
 "\"%s\" 이름의 칼럼이 \"%s\" 테이블에 있지만, 이 쿼리의 이 부분에서는 참조될 "
 "수 없습니다."
 
-#: parser/parse_relation.c:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr "해당 칼럼을 참조하려면, LATERAL 옵션이 있는 서브쿼리를 사용하세요."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr "해당 칼럼을 참조하려면, 테이블 지정 이름을 사용하세요."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "아마 \"%s.%s\" 칼럼을 참조하는 것 같습니다."
 
-#: parser/parse_relation.c:3742
+#: parser/parse_relation.c:3848
 #, 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:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "시스템 열 \"%s\"에 할당할 수 없습니다."
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "배열 요소를 DEFAULT 로 설정할 수 없습니다."
 
-#: parser/parse_target.c:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "하위필드를 DEFAULT로 설정할 수 없습니다."
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "열 \"%s\"은(는) %s 자료형인데 표현식은 %s 자료형입니다."
 
-#: parser/parse_target.c:779
+#: parser/parse_target.c:782
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
@@ -20172,7 +20860,7 @@ msgstr ""
 "\"%s\" 필드 (대상 열 \"%s\")를 지정할 수 없음, %s 자료형은 복합자료형이 아니"
 "기 때문"
 
-#: parser/parse_target.c:788
+#: parser/parse_target.c:791
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because there is no such "
@@ -20181,7 +20869,7 @@ msgstr ""
 "\"%s\" 필드 (대상 열 \"%s\")를 지정할 수 없음, %s 자료형에서 그런 칼럼을 찾"
 "을 수 없음"
 
-#: parser/parse_target.c:877
+#: parser/parse_target.c:880
 #, c-format
 msgid ""
 "subscripted assignment to \"%s\" requires type %s but expression is of type "
@@ -20189,12 +20877,12 @@ msgid ""
 msgstr ""
 "\"%s\" subscript 자료형은 %s 형이 필요하지만, 현재 표현식은 %s 자료형입니다"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "하위필드 \"%s\"  는 %s 자료형인데 표현식은 %s 자료형입니다."
 
-#: parser/parse_target.c:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "테이블이 명시되지 않은 SELECT * 구문은 유효하지 않습니다."
@@ -20216,8 +20904,8 @@ msgstr ""
 msgid "type reference %s converted to %s"
 msgstr "ype reference %s 가 %s 로 변환되었습니다."
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "자료형 \"%s\" 는 오로지 shell 에만 있습니다. "
@@ -20237,77 +20925,91 @@ msgstr "자료형 한정자는 단순 상수 또는 식별자여야 함"
 msgid "invalid type name \"%s\""
 msgstr "\"%s\" 자료형 이름은 유효하지 않은 자료형입니다."
 
-#: parser/parse_utilcmd.c:263
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "상속 하위 테이블로 파티션된 테이블을 만들 수 없음"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:504
 #, c-format
 msgid "cannot set logged status of a temporary sequence"
 msgstr "임시 시퀀스의 기록된 상태를 지정할 수 없음"
 
-#: parser/parse_utilcmd.c:611
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "serial 배열이 구현되지 않음"
 
-#: parser/parse_utilcmd.c:690 parser/parse_utilcmd.c:702
-#: parser/parse_utilcmd.c:761
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid ""
 "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "NULL/NOT NULL 선언이 서로 충돌합니다 : column \"%s\" of table \"%s\""
 
-#: parser/parse_utilcmd.c:714
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr ""
+"상위 파티션 테이블 대상 not null 체크 제약 조건에 NO INHERIT 옵션을 사용할 "
+"수 없음"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid ""
+"conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr ""
+"\"%s\" 칼럼에 지정된 not null 제약 조건 때문에, NO INHERIT 설정이 충돌남"
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "\"%s\" 칼럼(\"%s\" 테이블)에 대해 여러 개의 기본 값이 지정됨"
 
-#: parser/parse_utilcmd.c:731
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr ""
 "식별 칼럼은 타입드 테이블(typed table - 자료형으로써 테이블)에서는 쓸 수 없음"
 
-#: parser/parse_utilcmd.c:735
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "식별 칼럼은 파티션된 테이블에서는 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:744
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr "\"%s\" 칼럼(\"%s\" 테이블)에 대해 여러 개의 식별자 지정이 사용되었음"
 
-#: parser/parse_utilcmd.c:774
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr ""
 "미리 계산된 칼럼은 타입드 테이블(typed table - 자료형으로써 테이블)에서는 쓸 "
 "수 없음"
 
-#: parser/parse_utilcmd.c:778
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr "\"%s\" 칼럼(\"%s\" 테이블)에 대해 여러 개의 생성식이 지정됨"
 
-#: parser/parse_utilcmd.c:796 parser/parse_utilcmd.c:911
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "기본키 제약 조건을 외부 테이블에서는 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:805 parser/parse_utilcmd.c:921
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "유니크 제약 조건은 외부 테이블에서는 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:850
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr "\"%s\" 칼럼(\"%s\" 테이블)에 대해 default와 식별자 정의가 함께 있음"
 
-#: parser/parse_utilcmd.c:858
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid ""
 "both default and generation expression specified for column \"%s\" of table "
@@ -20316,7 +21018,7 @@ msgstr ""
 "\"%s\" 칼럼(해당 테이블 \"%s\")에 대해 default 정의와 미리 계산된 표현식이 함"
 "께 있음"
 
-#: parser/parse_utilcmd.c:866
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid ""
 "both identity and generation expression specified for column \"%s\" of table "
@@ -20325,105 +21027,113 @@ msgstr ""
 "\"%s\" 칼럼(해당 테이블 \"%s\")에 대해 identity 정의와 미리 계산된 표현식이 "
 "함께 있음"
 
-#: parser/parse_utilcmd.c:931
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "제외 제약 조건은 외부 테이블에서는 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:996
-#, c-format
-msgid "LIKE is not supported for creating foreign tables"
-msgstr "외부 테이블을 만들 때는 LIKE 옵션을 쓸 수 없음"
-
-#: parser/parse_utilcmd.c:1009
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "\"%s\" 릴레이션은 LIKE 절에서 바르지 않음"
 
-#: parser/parse_utilcmd.c:1736 parser/parse_utilcmd.c:1844
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "\"%s\" 인덱스는 전체 로우 테이블 참조를 포함하고 있습니다."
 
-#: parser/parse_utilcmd.c:2242
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "CREATE TABLE 명령에서 이미 있는 인덱스는 사용할 수 없습니다."
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "\"%s\" 인덱스는 이미 한 제약 조건에서 사용 중입니다."
 
-#: parser/parse_utilcmd.c:2283
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" 개체는 유니크 인덱스가 아닙니다"
 
-#: parser/parse_utilcmd.c:2284 parser/parse_utilcmd.c:2291
-#: parser/parse_utilcmd.c:2298 parser/parse_utilcmd.c:2375
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473
+#: parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "이 인덱스를 이용하는 기본키나 유니크 제약조건은 만들 수 없습니다."
 
-#: parser/parse_utilcmd.c:2290
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "\"%s\" 인덱스에 표현식이 포함되어 있음"
 
-#: parser/parse_utilcmd.c:2297
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" 개체는 부분 인덱스임"
 
-#: parser/parse_utilcmd.c:2309
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" 개체는 지연가능한 인덱스임"
 
-#: parser/parse_utilcmd.c:2310
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr ""
 "지연 가능한 인덱스를 사용해서 지연 불가능한 제약 조건은 만들 수 없습니다."
 
-#: parser/parse_utilcmd.c:2374
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "\"%s\" 인덱스 %d 번째 칼럼의 기본 정렬 방법이 없음"
 
-#: parser/parse_utilcmd.c:2531
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "기본키 제약 조건에서 \"%s\" 칼럼이 두 번 지정되었습니다"
 
-#: parser/parse_utilcmd.c:2537
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "고유 제약 조건에서 \"%s\" 칼럼이 두 번 지정되었습니다"
 
-#: parser/parse_utilcmd.c:2871
+#: parser/parse_utilcmd.c:2798
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr ""
+"WITHOUT OVERLAPS 옵션이 지정된 \"%s\" 칼럼은 range multirage 자료형이 아님"
+
+#: parser/parse_utilcmd.c:2826
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr ""
+"WITHOUT OVERLAPS 옵션을 사용하는 제약 조건은 적어도 두 개 이상의 칼럼 조합으"
+"로 구성해야함"
+
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid ""
 "index expressions and predicates can refer only to the table being indexed"
 msgstr "인덱스 식 및 술어는 인덱싱되는 테이블만 참조할 수 있음"
 
-#: parser/parse_utilcmd.c:2943
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "통계 정보 식은 참조되는 테이블만 대상이어야 함"
 
-#: parser/parse_utilcmd.c:2986
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "구체화된 뷰에서의 룰은 지원하지 않음"
 
-#: parser/parse_utilcmd.c:3046
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "룰에서 지정한 WHERE 조건에 다른 릴레이션에 대한 참조를 포함할 수 없음"
 
-#: parser/parse_utilcmd.c:3118
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid ""
 "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
@@ -20432,154 +21142,169 @@ msgstr ""
 "룰에서 지정한 WHERE 조건이 있는 규칙에는 SELECT, INSERT, UPDATE 또는 DELETE "
 "작업만 포함할 수 있음"
 
-#: parser/parse_utilcmd.c:3136 parser/parse_utilcmd.c:3237
-#: rewrite/rewriteHandler.c:544 rewrite/rewriteManip.c:1095
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489
+#: rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1190
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "conditional UNION/INTERSECT/EXCEPT 구문은 구현되어 있지 않다"
 
-#: parser/parse_utilcmd.c:3154
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON SELECT 룰은 OLD를 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:3158
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON SELECT 룰은 NEW를 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:3167
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON INSERT 룰은 OLD를 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:3173
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON DELETE 룰은 NEW를 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:3201
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "WITH 쿼리 안에서 OLD 예약어를 참조할 수 없습니다."
 
-#: parser/parse_utilcmd.c:3208
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "WITH 쿼리 안에서 NEW 예약어를 참조할 수 없습니다."
 
-#: parser/parse_utilcmd.c:3664
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "DEFERABLE 절이 잘못 놓여져 있습니다"
 
-#: parser/parse_utilcmd.c:3669 parser/parse_utilcmd.c:3684
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "여러 개의 DEFERRABLE/NOT DEFERRABLE절은 사용할 수 없습니다"
 
-#: parser/parse_utilcmd.c:3679
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "NOT DEFERABLE 절이 잘못 놓여 있습니다"
 
-#: parser/parse_utilcmd.c:3692 parser/parse_utilcmd.c:3718 gram.y:6114
+#: parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972 gram.y:6229
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "INITIALLY DEFERRED 로 선언된 조건문은 반드시 DEFERABLE 여야만 한다"
 
-#: parser/parse_utilcmd.c:3700
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "INITIALLY DEFERRED 절이 잘못 놓여 있습니다"
 
-#: parser/parse_utilcmd.c:3705 parser/parse_utilcmd.c:3731
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "여러 개의 INITIALLY IMMEDIATE/DEFERRED 절은 허용되지 않습니다"
 
-#: parser/parse_utilcmd.c:3726
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "INITIALLY IMMEDIATE 절이 잘못 놓여 있습니다"
 
-#: parser/parse_utilcmd.c:3919
+#: parser/parse_utilcmd.c:3997
+#, c-format
+msgid "misplaced ENFORCED clause"
+msgstr "ENFORCED 옵션 지정 위치가 바르지 않습니다"
+
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
+#, c-format
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "여러 개의 ENFORCED/NOT ENFORCED 절은 사용할 수 없습니다"
+
+#: parser/parse_utilcmd.c:4014
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "NOT ENFORCED 옵션 지정 위치가 바르지 않습니다"
+
+#: parser/parse_utilcmd.c:4212
 #, c-format
 msgid ""
 "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATE 구문에 명시된 schema (%s) 가 생성된 (%s) 의 것과 다릅니다"
 
-#: parser/parse_utilcmd.c:3954
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
-msgstr "\"%s\" 개체는 파티션된 테이블이 아님"
+msgstr "\"%s\" 개체는 상위 파티션 테이블이 아님"
 
-#: parser/parse_utilcmd.c:3961
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "\"%s\" 테이블은 파티션되어 있지 않음"
 
-#: parser/parse_utilcmd.c:3968
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "\"%s\" 인덱스는 파티션 된 인덱스가 아님"
 
-#: parser/parse_utilcmd.c:4008
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "해시 파티션된 테이블은 기본 파티션을 가질 수 없음"
 
-#: parser/parse_utilcmd.c:4025
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "해시 파티션용 범위 명세가 잘못됨"
 
-#: parser/parse_utilcmd.c:4031 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "해시 파티션용 모듈은 영(0)보다 큰 정수 값이어야 함"
 
-#: parser/parse_utilcmd.c:4038 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "해시 파티션용 나머지 처리기는 modulus 보다 작아야 함"
 
-#: parser/parse_utilcmd.c:4051
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "list 파티션을 위한 범위 설정이 잘못됨"
 
-#: parser/parse_utilcmd.c:4104
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "range 파티션을 위한 범위 설정이 잘못됨"
 
-#: parser/parse_utilcmd.c:4110
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "FROM에는 파티션 칼럼 당 딱 하나의 값만 지정해야 함"
 
-#: parser/parse_utilcmd.c:4114
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "TO에는 파티션 칼럼 당 딱 하나의 값만 지정해야 함"
 
-#: parser/parse_utilcmd.c:4228
+#: parser/parse_utilcmd.c:4521
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "range 범위에는 NULL 값을 사용할 수 없음"
 
-#: parser/parse_utilcmd.c:4277
+#: parser/parse_utilcmd.c:4570
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "MAXVALUE 뒤에 오는 모든 범위는 MAXVALUE 여야합니다."
 
-#: parser/parse_utilcmd.c:4284
+#: parser/parse_utilcmd.c:4577
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "MINVALUE 뒤에 오는 모든 범위는 MINVALUE 여야합니다."
 
-#: parser/parse_utilcmd.c:4327
+#: parser/parse_utilcmd.c:4620
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "지정된 값은 %s 형으로 형변환 할 수 없음, 해당 칼럼: \"%s\""
@@ -20592,12 +21317,12 @@ msgstr "UESCAPE 표현식은 앞에 한글자만 있어야합니다."
 msgid "invalid Unicode escape character"
 msgstr "잘못된 유니코드 이스케이프 문자"
 
-#: parser/parser.c:347 scan.l:1393
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "잘못된 유니코드 이스케이프 값"
 
-#: parser/parser.c:494 utils/adt/varlena.c:6640 scan.l:716
+#: parser/parser.c:494 utils/adt/varlena.c:6842 scan.l:702
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "잘못된 유니코드 이스케이프 값"
@@ -20607,8 +21332,8 @@ msgstr "잘못된 유니코드 이스케이프 값"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "유니코드 이스케이프는 \\XXXX 또는 \\+XXXXXX 형태여야 합니다."
 
-#: parser/parser.c:523 utils/adt/varlena.c:6665 scan.l:677 scan.l:693
-#: scan.l:709
+#: parser/parser.c:523 utils/adt/varlena.c:6867 scan.l:663 scan.l:679
+#: scan.l:695
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "잘못된 유니코드 대리 쌍"
@@ -20636,8 +21361,8 @@ msgid ""
 "The new modulus %d is not a factor of %d, the modulus of existing partition "
 "\"%s\"."
 msgstr ""
-"새 해시 파티션 구분값(나머지값) %d 값은 %d의 인수가 아닙니다. 이미 있는 "
-"\"%s\" 하위 파티션은 이 값을 구분값으로 사용합니다."
+"새 해시 파티션 구분값(나머지값) %d 값은 %d의 인수가 아닙니다. 이미 있는 \"%s"
+"\" 하위 파티션은 이 값을 구분값으로 사용합니다."
 
 #: partitioning/partbounds.c:2992
 #, c-format
@@ -20707,7 +21432,7 @@ msgstr ""
 "\"%s\" 자료형을 사용했습니다."
 
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "\"%s\" 데이터 디렉터리 상태를 파악할 수 없음: %m"
@@ -20784,8 +21509,8 @@ msgid ""
 msgstr ""
 "이 오류는 일반적으로 PostgreSQL에서 사용할 공유 메모리를 확보하지 못 했을 때 "
 "발생합니다(물리 메모리, 스왑, huge page).  현재 요구 크기(%zu 바이트)를 좀 줄"
-"여 보십시오. 줄이는 방법은, \"shared_buffers\"나 \"max_connections\" 값"
-"을 줄여 보십시오."
+"여 보십시오. 줄이는 방법은, \"shared_buffers\"나 \"max_connections\" 값을 줄"
+"여 보십시오."
 
 #: port/pg_shmem.c:725 port/sysv_shmem.c:725
 #, c-format
@@ -20798,29 +21523,29 @@ msgid ""
 "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "현재 \"shared_memory_type\" 설정은 huge page 사용을 지원하지 않습니다."
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1401
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "미리 확보된 공유 메모리 영역 (%lu 키, %lu ID)이 여전히 사용중입니다"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1403
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid ""
 "Terminate any old server processes associated with data directory \"%s\"."
 msgstr ""
 "\"%s\" 데이터 디렉터리를 사용하는 옛 서버 프로세스들을 모두 중지시키세요."
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "세마포어를 만들 수 없음: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "semget(%lu, %d, 0%o) 호출에 의한 시스템 콜 실패"
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs "
@@ -20837,11 +21562,11 @@ msgstr ""
 "이 오류는 시스템에서 지정한 최소 세마포어 수(SEMMNI)가 너무 크거나, 최대 세마"
 "포어 수(SEMMNS)가 너무 적어서 서버를 실행할 수 없을 때 발생합니다. 이에 따"
 "라, 정상적으로 서버가 실행되려면, 시스템 값들을 조정할 필요가 있습니다. 아니"
-"면, 다른 방법으로, PostgreSQL의 환경 설정에서 \"max_connections\" 값을 줄여서 세"
-"마포어 사용 수를 줄여보십시오.\n"
+"면, 다른 방법으로, PostgreSQL의 환경 설정에서 \"max_connections\" 값을 줄여"
+"서 세마포어 사용 수를 줄여보십시오.\n"
 "보다 자세한 내용은 PostgreSQL 관리자 메뉴얼을 참조 하십시오."
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid ""
 "You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
@@ -20976,52 +21701,68 @@ msgstr "실패한 시스템 호출은 DuplicateHandle입니다."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "실패한 시스템 호출은 MapViewOfFileEx입니다."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "autovacuum 작업자가 너무 오래전에 시작되어 중지됨"
 
-#: postmaster/autovacuum.c:2203
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr ""
 "autovacuum: 더 이상 사용하지 않는 \"%s.%s.%s\" 임시 테이블을 삭제하는 중"
 
-#: postmaster/autovacuum.c:2439
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\" 테이블 대상으로 자동 vacuum 작업 함"
 
-#: postmaster/autovacuum.c:2442
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\" 테이블 자동 분석"
 
-#: postmaster/autovacuum.c:2636
+#: postmaster/autovacuum.c:2674
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "\"%s.%s.%s\" 릴레이션 작업 항목 작업 중"
 
-#: postmaster/autovacuum.c:3254
+#: postmaster/autovacuum.c:3345
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "서버 설정 정보가 잘못되어 자동 청소 작업이 실행되지 못했습니다."
 
-#: postmaster/autovacuum.c:3255
+#: postmaster/autovacuum.c:3346
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "\"track_counts\" 옵션을 사용하십시오."
 
+#: postmaster/autovacuum.c:3468
+#, c-format
+msgid ""
+"\"autovacuum_max_workers\" (%d) should be less than or equal to "
+"\"autovacuum_worker_slots\" (%d)"
+msgstr ""
+"\"autovacuum_max_workers\" (%d) 값은 \"autovacuum_worker_slots\" (%d) 값보다 "
+"작거나 같아야 함"
+
+#: postmaster/autovacuum.c:3470
+#, c-format
+msgid ""
+"The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum "
+"workers at a given time."
+msgstr "\"autovacuum_worker_slots\" (%d) 값은 서버가 시작할 때만 반영 됩니다."
+
 #: postmaster/bgworker.c:260
 #, c-format
 msgid ""
-"inconsistent background worker state (max_worker_processes=%d, "
-"total_slots=%d)"
+"inconsistent background worker state (\"max_worker_processes\"=%d, total "
+"slots=%d)"
 msgstr ""
-"백그라운드 작업자의 정합성이 맞지 않음 (max_worker_processes=%d, "
+"백그라운드 작업자의 정합성이 맞지 않음 (\"max_worker_processes\"=%d, "
 "total_slots=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid ""
 "background worker \"%s\": background workers without shared memory access "
@@ -21030,7 +21771,7 @@ msgstr ""
 "\"%s\" 백그라운드 작업자: 공유 메모리 접근 않는 백그라운드 작업자를 지원하지 "
 "않음"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, c-format
 msgid ""
 "background worker \"%s\": cannot request database access if starting at "
@@ -21039,31 +21780,43 @@ msgstr ""
 "\"%s\" 백그라운드 작업자: postmaster 시작 중인 상태라면, 데이터베이스 접근을 "
 "요청할 수 없음"
 
-#: postmaster/bgworker.c:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "\"%s\" 백그라운드 작업자: 잘못된 재실행 간격"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid ""
 "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "\"%s\" 백그라운드 작업자: 이 병렬 작업자는 재실행 설정이 없음"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3312
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "관리자 명령에 의해 \"%s\" 백그라운드 작업자를 종료합니다."
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, c-format
+msgid "database connection requirement not indicated during registration"
+msgstr ""
+"백그라운드 프로세스 초기화 중에 데이터베이스 연결 요구 사항이 충족되지 않았습"
+"니다."
+
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "백그라운드 작업자에서 잘못된 프로세싱 모드가 사용됨"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid ""
 "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr ""
-"\"%s\" 백그라운드 작업자: 먼저 \"shared_preload_libraries\" 설정값으로 등록되어"
-"야 합니다."
+"\"%s\" 백그라운드 작업자: 먼저 \"shared_preload_libraries\" 설정값으로 등록되"
+"어야 합니다."
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, c-format
 msgid ""
 "background worker \"%s\": only dynamic background workers can request "
@@ -21071,140 +21824,141 @@ msgid ""
 msgstr ""
 "\"%s\" 백그라운드 작업자: 동적 백그라운드 작업자만 알림을 요청할 수 있음"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "백그라운드 작업자가 너무 많음"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, 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] "현재 설정으로는 %d개의 백그라운드 작업자를 사용할 수 있습니다."
 
-#: postmaster/bgworker.c:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "\"%s\" 환경 매개 변수 값을 좀 늘려보십시오."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "체크포인트가 너무 자주 발생함 (%d초 간격)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "체크포인트 요청 실패"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "더 자세한 것은 서버 로그 파일을 살펴보십시오."
 
-#: postmaster/launch_backend.c:381
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "\"%s\" 서버 프로세스를 실행할 수 없음: %m"
 
-#: postmaster/launch_backend.c:434
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr "백엔드 매개 변수 맵핑 파일을 만들 수 없음: 오류 코드 %lu"
 
-#: postmaster/launch_backend.c:442
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr "백엔드 매개 변수 메모리를 맵핑할 수 없음: 오류 코드 %lu"
 
-#: postmaster/launch_backend.c:459
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "서브프로세스 명령행이 너무 깁니다."
 
-#: postmaster/launch_backend.c:477
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "CreateProcess() 호출 실패: %m (오류 코드 %lu)"
 
-#: postmaster/launch_backend.c:504
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr "백엔드 매개 변수 파일의 view를 unmap할 수 없음: 오류 코드 %lu"
 
-#: postmaster/launch_backend.c:508
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr "백엔드 매개 변수 파일을 닫을 수 없음: 오류 코드 %lun"
 
-#: postmaster/launch_backend.c:530
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr "공유 메모리 확보 작업을 여러 번 시도했으나 실패 함"
 
-#: postmaster/launch_backend.c:531
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "이 현상은 ASLR 또는 바이러스 검사 소프트웨어 때문일 수 있습니다."
 
-#: postmaster/launch_backend.c:834
+#: postmaster/launch_backend.c:854
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr "백엔드에서 사용하기 위해 %d 소켓을 복사할 수 없음: 오류 코드 %d"
 
-#: postmaster/launch_backend.c:866
+#: postmaster/launch_backend.c:886
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "상속된 소켓을 만들 수 없음: 오류 코드 %d\n"
 
-#: postmaster/launch_backend.c:895
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
 msgstr "\"%s\" 백엔드 변수 파일을 열 수 없음: %m\n"
 
-#: postmaster/launch_backend.c:901
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
 msgstr "\"%s\" 백엔드 변수 파일을 읽을 수 없음: %m\n"
 
-#: postmaster/launch_backend.c:912
+#: postmaster/launch_backend.c:932
 #, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
 msgstr "\"%s\" 백엔드 변수 파일에서 시작 데이터를 읽을 수 없음: %m\n"
 
-#: postmaster/launch_backend.c:924
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
 msgstr "\"%s\" 파일을 삭제할 수 없음: %m\n"
 
-#: postmaster/launch_backend.c:940
+#: postmaster/launch_backend.c:960
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "백엔드 변수 파일의 view를 map할 수 없음: 오류 코드 %lu\n"
 
-#: postmaster/launch_backend.c:959
+#: postmaster/launch_backend.c:979
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "백엔드 변수 파일의 view를 unmap할 수 없음: 오류 코드 %lu\n"
 
-#: postmaster/launch_backend.c:966
+#: postmaster/launch_backend.c:986
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "백엔드 변수 파일을 닫을 수 없음: 오류 코드 %lu\n"
 
-#: postmaster/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
-msgstr "\"archive_mode\"가 활성화 되었지만 아카이브 관련 세부 설정이 되어있지 않음"
+msgstr ""
+"\"archive_mode\"가 활성화 되었지만 아카이브 관련 세부 설정이 되어있지 않음"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "필요 없는 \"%s\" 아카이브 상태 파일이 삭제됨"
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid ""
 "removal of orphan archive status file \"%s\" failed too many times, will try "
@@ -21213,7 +21967,7 @@ msgstr ""
 "필요 없는 \"%s\" 아카이브 상태 파일 삭제 작업이 계속 실패하고 있습니다. 다음"
 "에 또 시도할 것입니다."
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid ""
 "archiving write-ahead log file \"%s\" failed too many times, will try again "
@@ -21222,168 +21976,169 @@ msgstr ""
 "\"%s\" 트랜잭션 로그 파일 아카이브 작업이 계속 실패하고 있습니다. 다음에 또 "
 "시도할 것입니다."
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
-msgstr "\"archive_command\", \"archive_library\" 두 설정 모두 값을 지정했습니다."
+msgstr ""
+"\"archive_command\", \"archive_library\" 두 설정 모두 값을 지정했습니다."
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "\"archive_command\", \"archive_library\" 둘 중 하나만 지정하세요."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid ""
 "restarting archiver process because value of \"archive_library\" was changed"
 msgstr ""
 "\"archive_library\" 설정값이 바뀌어서 archiver 프로세스를 다시 시작 합니다."
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "아카이브 모듈은 %s 심볼을 정의해야합니다."
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "아카이브 모듈은 아카이브 콜백 함수를 등록해야합니다."
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:678
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: -f 옵션의 잘못된 인자: \"%s\"\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:751
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: -t 옵션의 잘못된 인자: \"%s\"\n"
 
-#: postmaster/postmaster.c:757
+#: postmaster/postmaster.c:774
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: 잘못된 인자: \"%s\"\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:842
 #, c-format
 msgid ""
-"%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" "
-"(%d) must be less than \"max_connections\" (%d)\n"
+"%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections"
+"\" (%d) must be less than \"max_connections\" (%d)\n"
 msgstr ""
-"%s: \"superuser_reserved_connections\" (%d) 값 + \"reserved_connections\" (%d) 값은 "
-"\"max_connections\" (%d) 값보다 작아야함\n"
+"%s: \"superuser_reserved_connections\" (%d) 값 + \"reserved_connections"
+"\" (%d) 값은 \"max_connections\" (%d) 값보다 작아야함\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:850
 #, c-format
 msgid "WAL archival cannot be enabled when \"wal_level\" is \"minimal\""
 msgstr "\"wal_level\" 값이 \"minimal\"일 때는 아카이브 작업을 할 수 없습니다."
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:853
 #, c-format
 msgid ""
 "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be "
 "\"replica\" or \"logical\""
 msgstr ""
-"WAL 스트리밍 작업(\"max_wal_senders\" > 0 인경우)은 \"wal_level\" 값이 \"replica\" 또"
-"는 \"logical\" 이어야 합니다."
+"WAL 스트리밍 작업(\"max_wal_senders\" > 0 인경우)은 \"wal_level\" 값이 "
+"\"replica\" 또는 \"logical\" 이어야 합니다."
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "\"wal_level\" 값이 \"minimal\"일 때는 아카이브 작업을 할 수 없습니다."
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:864
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: 잘못된 datetoken 테이블들, 복구하십시오.\n"
 
-#: postmaster/postmaster.c:1004
+#: postmaster/postmaster.c:1025
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "하위 대기열에 대해 I/O 완료 포트를 만들 수 없음"
 
-#: postmaster/postmaster.c:1069
+#: postmaster/postmaster.c:1091
 #, c-format
 msgid "ending log output to stderr"
 msgstr "stderr 쪽 로그 출력을 중지합니다."
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1092
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "자세한 로그는 \"%s\" 쪽으로 기록됩니다."
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1103
 #, c-format
 msgid "starting %s"
 msgstr "%s 서버를 시작합니다."
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1165
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "\"%s\" 응당 소켓을 만들 수 없습니다"
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1171
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "TCP/IP 소켓을 만들 수 없습니다."
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1203
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "DNSServiceRegister() 실패: 오류 코드 %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "\"%s\" 디렉터리에 유닉스 도메인 소켓을 만들 수 없습니다"
 
-#: postmaster/postmaster.c:1240
+#: postmaster/postmaster.c:1262
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "유닉스 도메인 소켓을 만들 수 없습니다"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1273
 #, c-format
 msgid "no socket created for listening"
 msgstr "서버 접속 대기 작업을 위한 소켓을 만들 수 없음"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1304
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: \"%s\" 외부 PID 파일의 접근 권한을 바꿀 수 없음: %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1308
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: 외부 pid 파일 \"%s\" 를 쓸 수 없음: %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1336 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "%s 파일을 로드 할 수 없음"
 
-#: postmaster/postmaster.c:1340
+#: postmaster/postmaster.c:1364
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "포스트마스터가 시작하면서 멀티쓰레드 환경이 되었습니다."
 
-#: postmaster/postmaster.c:1341
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "LC_ALL 환경 설정값으로 알맞은 로케일 이름을 지정하세요."
 
-#: postmaster/postmaster.c:1440
+#: postmaster/postmaster.c:1468
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: 실행 가능 경로를 확정할 수 없음"
 
-#: postmaster/postmaster.c:1447
+#: postmaster/postmaster.c:1475
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: 실행가능한 postgres 프로그램을 찾을 수 없습니다"
 
-#: postmaster/postmaster.c:1470 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1498 utils/misc/tzparser.c:342
 #, c-format
 msgid ""
 "This may indicate an incomplete PostgreSQL installation, or that the file "
@@ -21392,7 +22147,7 @@ msgstr ""
 "이 문제는 PostgreSQL 설치가 불완전하게 되었거나, \"%s\" 파일이 올바른 위치에 "
 "있지 않아서 발생했습니다."
 
-#: postmaster/postmaster.c:1497
+#: postmaster/postmaster.c:1525
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -21404,342 +22159,327 @@ msgstr ""
 "\"%s\" 파일을 열 수가 없었습니다: %m\n"
 
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1787
+#: postmaster/postmaster.c:1762
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "하위 프로세스 정리를 위해 %s 신호 보냄"
 
-#: postmaster/postmaster.c:1809
+#: postmaster/postmaster.c:1784
 #, c-format
 msgid ""
 "performing immediate shutdown because data directory lock file is invalid"
 msgstr "데이터 디렉터리 잠금 파일이 잘못되어 즉시 종료 작업을 진행합니다."
 
-#: postmaster/postmaster.c:1872
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "프로세스 %d에 대한 취소 요청에 잘못된 키가 있음"
-
-#: postmaster/postmaster.c:1884
-#, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "취소 요청의 PID %d과(와) 일치하는 프로세스가 없음"
-
-#: postmaster/postmaster.c:2104
+#: postmaster/postmaster.c:2004
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "SIGHUP 신호를 받아서, 환경설정파일을 다시 읽고 있습니다."
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2132 postmaster/postmaster.c:2136
+#: postmaster/postmaster.c:2012 postmaster/postmaster.c:2016
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s 파일을 다시 불러오지 않았음"
 
-#: postmaster/postmaster.c:2146
+#: postmaster/postmaster.c:2026
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "SSL 설정이 다시 로드되지 않았음"
 
-#: postmaster/postmaster.c:2232
+#: postmaster/postmaster.c:2112
 #, c-format
 msgid "received smart shutdown request"
 msgstr "smart 중지 요청을 받았습니다."
 
-#: postmaster/postmaster.c:2273
+#: postmaster/postmaster.c:2153
 #, c-format
 msgid "received fast shutdown request"
 msgstr "fast 중지 요청을 받았습니다."
 
-#: postmaster/postmaster.c:2291
+#: postmaster/postmaster.c:2171
 #, c-format
 msgid "aborting any active transactions"
 msgstr "모든 활성화 되어있는 트랜잭션을 중지하고 있습니다."
 
-#: postmaster/postmaster.c:2315
+#: postmaster/postmaster.c:2195
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "immediate 중지 요청을 받았습니다."
 
-#: postmaster/postmaster.c:2387
+#: postmaster/postmaster.c:2270
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "복구 타겟에서 중지함"
 
-#: postmaster/postmaster.c:2405 postmaster/postmaster.c:2441
+#: postmaster/postmaster.c:2288 postmaster/postmaster.c:2324
 msgid "startup process"
 msgstr "시작 프로세스"
 
-#: postmaster/postmaster.c:2408
+#: postmaster/postmaster.c:2291
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "시작 프로세스 실패 때문에 서버 시작이 중지 되었습니다"
 
-#: postmaster/postmaster.c:2483
+#: postmaster/postmaster.c:2347
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "이제 데이터베이스 서버로 접속할 수 있습니다"
 
-#: postmaster/postmaster.c:2504
+#: postmaster/postmaster.c:2369
 msgid "background writer process"
 msgstr "백그라운드 writer 프로세스"
 
-#: postmaster/postmaster.c:2551
+#: postmaster/postmaster.c:2402
 msgid "checkpointer process"
 msgstr "체크포인트 프로세스"
 
-#: postmaster/postmaster.c:2567
+#: postmaster/postmaster.c:2419
 msgid "WAL writer process"
 msgstr "WAL 쓰기 프로세스"
 
-#: postmaster/postmaster.c:2582
+#: postmaster/postmaster.c:2435
 msgid "WAL receiver process"
 msgstr "WAL 수신 프로세스"
 
-#: postmaster/postmaster.c:2596
+#: postmaster/postmaster.c:2450
 msgid "WAL summarizer process"
 msgstr "WAL 요약 프로세스"
 
-#: postmaster/postmaster.c:2611
+#: postmaster/postmaster.c:2466
 msgid "autovacuum launcher process"
 msgstr "autovacuum 실행기 프로세스"
 
-#: postmaster/postmaster.c:2629
+#: postmaster/postmaster.c:2482
 msgid "archiver process"
 msgstr "archiver 프로세스"
 
-#: postmaster/postmaster.c:2642
+#: postmaster/postmaster.c:2497
 msgid "system logger process"
 msgstr "시스템 로그 프로세스"
 
-#: postmaster/postmaster.c:2659
+#: postmaster/postmaster.c:2515
 msgid "slot sync worker process"
 msgstr "슬롯 동기화 작업 프로세스"
 
-#: postmaster/postmaster.c:2715
+#: postmaster/postmaster.c:2523 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "io worker"
+
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2547
+msgid "untracked child process"
+msgstr "하위 프로세스를 버렸음"
+
+#: postmaster/postmaster.c:2580
 #, c-format
 msgid "background worker \"%s\""
 msgstr "백그라운드 작업자 \"%s\""
 
-#: postmaster/postmaster.c:2794 postmaster/postmaster.c:2814
-#: postmaster/postmaster.c:2821 postmaster/postmaster.c:2839
-msgid "server process"
-msgstr "서버 프로세스"
-
-#: postmaster/postmaster.c:2893
+#: postmaster/postmaster.c:2804
 #, 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:3080
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) 프로그램은 %d 코드로 마쳤습니다"
 
-#: postmaster/postmaster.c:3082 postmaster/postmaster.c:3094
-#: postmaster/postmaster.c:3104 postmaster/postmaster.c:3115
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:3091
+#: postmaster/postmaster.c:2848
 #, 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:3101
+#: postmaster/postmaster.c:2858
 #, 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:3113
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) 프로세스가 인식할 수 없는 %d 상태로 종료됨"
 
-#: postmaster/postmaster.c:3329
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "비정상적인 데이터베이스 시스템 서비스를 중지"
 
-#: postmaster/postmaster.c:3355
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "시작 작업 실패로 중지합니다."
 
-#: postmaster/postmaster.c:3361
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "\"restart_after_crash\" 값이 off 로 지정되어 중지합니다."
 
-#: postmaster/postmaster.c:3373
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "모든 서버 프로세스가 중지 되었습니다; 재 초기화 중"
 
-#: postmaster/postmaster.c:3572 postmaster/postmaster.c:3982
-#: postmaster/postmaster.c:4371
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "무작위 취소 키를 만들 수 없음"
-
-#: postmaster/postmaster.c:3605
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "연결을 위한 새 프로세스 할당(fork) 실패: %m"
 
-#: postmaster/postmaster.c:3647
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "연결을 위한 새 프로세스 할당(fork) 실패: "
 
-#: postmaster/postmaster.c:3681
+#: postmaster/postmaster.c:3667
 #, c-format
-msgid "Please report this to <%s>."
-msgstr "이 내용을 <%s> 주소로 보고하십시오."
+msgid "postmaster became multithreaded"
+msgstr "포스트마스터가 시작하면서 멀티쓰레드 환경으로 작동했음"
 
-#: postmaster/postmaster.c:3749
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "데이터베이스 시스템이 읽기 전용으로 연결을 수락할 준비가 되었습니다."
 
-#: postmaster/postmaster.c:3932
+#: postmaster/postmaster.c:3846
 #, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "\"%s\" 프로세스 할당(fork) 실패: %m"
-
-#: postmaster/postmaster.c:4170 postmaster/postmaster.c:4204
-#, c-format
-msgid "database connection requirement not indicated during registration"
-msgstr ""
-"백그라운드 프로세스 초기화 중에 데이터베이스 연결 요구 사항이 충족되지 않았습"
-"니다."
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL 작업이 예상치 않게 끝났음"
 
-#: postmaster/postmaster.c:4180 postmaster/postmaster.c:4214
+#: postmaster/postmaster.c:3971
 #, c-format
-msgid "invalid processing mode in background worker"
-msgstr "백그라운드 작업자에서 잘못된 프로세싱 모드가 사용됨"
+msgid "no slot available for new autovacuum worker process"
+msgstr "새 autovacuum 작업자 프로세스에서 쓸 슬롯이 없음"
 
-#: postmaster/postmaster.c:4274
+#: postmaster/postmaster.c:3986
 #, c-format
-msgid "could not fork background worker process: %m"
-msgstr "백그라운드 작업자 프로세스를 할당(fork)할 수 없습니다: %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "\"%s\" 프로세스 할당(fork) 실패: %m"
 
-#: postmaster/postmaster.c:4357
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "새 백그라운드 작업자 프로세스에서 쓸 슬롯이 없음"
 
-#: postmaster/postmaster.c:4620
+#: postmaster/postmaster.c:4163
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "백그라운드 작업자 프로세스를 할당(fork)할 수 없습니다: %m"
+
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "프로세스의 종료 코드를 읽을 수 없음\n"
 
-#: postmaster/postmaster.c:4662
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "하위 완료 상태를 게시할 수 없음\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "로그 파이프에서 읽기 실패: %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "syslog에서 사용할 파이프를 만들 수 없습니다: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "시스템 로거(logger)를 확보하질 못 했습니다: %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "서버 로그를 로그 수집 프로세스로 보냅니다."
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "이제부터 서버 로그는 \"%s\" 디렉터리에 보관됩니다."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "표준출력을 redirect 하지 못했습니다: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "표준오류(stderr)를 redirect 하지 못했습니다: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "로그파일 쓰기 실패: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "\"%s\" 잠금파일을 열 수 없음: %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr ""
 "로그파일 자동 교체 기능을 금지합니다(교체하려면 SIGHUP 시그널을 사용함)"
 
-#: postmaster/walsummarizer.c:740
+#: postmaster/walsummarizer.c:743
 #, c-format
 msgid "WAL summarization is not progressing"
 msgstr "WAL 요약정보 처리 작업이 진행 중이지 않음"
 
-#: postmaster/walsummarizer.c:741
+#: postmaster/walsummarizer.c:744
 #, c-format
 msgid ""
 "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/"
 "%X in memory."
 msgstr ""
-"요약정보 처리 작업은 %X/%X에서 필요한데, 디스크의 %X/%X, 메모리의 %X/%X에서 멈추어 있음"
+"요약정보 처리 작업은 %X/%X에서 필요한데, 디스크의 %X/%X, 메모리의 %X/%X에서 "
+"멈추어 있음"
 
-#: postmaster/walsummarizer.c:755
+#: postmaster/walsummarizer.c:758
 #, c-format
 msgid "still waiting for WAL summarization through %X/%X after %ld second"
 msgid_plural ""
 "still waiting for WAL summarization through %X/%X after %ld seconds"
-msgstr[0] ""
-"%X/%X에서 여전히 %ld초 동안 WAL 요약정보 처리 작업이 멈춰 있음"
+msgstr[0] "%X/%X에서 여전히 %ld초 동안 WAL 요약정보 처리 작업이 멈춰 있음"
 
-#: postmaster/walsummarizer.c:760
+#: postmaster/walsummarizer.c:763
 #, c-format
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "요약정보 처리 작업이 디스크의 %X/%X에, 메모리의 %X/%X에 다달았음"
 
-#: postmaster/walsummarizer.c:1000
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "%X/%X 뒤에 올바른 레코드를 찾을 수 없음"
 
-#: postmaster/walsummarizer.c:1045
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "%u번 타임라인의 %X/%X에서 WAL를 읽을 수 없음: %s"
 
-#: postmaster/walsummarizer.c:1051
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "타임라인 %u, 위치 %X/%X 에서 WAL를 읽을 없음"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "정규식 처리에 쓰일 정렬규칙(collation)을 찾을 수 없음"
@@ -21749,18 +22489,18 @@ msgstr "정규식 처리에 쓰일 정렬규칙(collation)을 찾을 수 없음"
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "정규식 처리에 쓰일 비결정 정렬규칙(collation)을 지원하지 않음"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:230
+#: replication/libpqwalreceiver/libpqwalreceiver.c:322
 #, c-format
 msgid "password is required"
 msgstr "비밀번호가 필요함"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:231
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "해당 서버로 비밀번호 없이 접속한다며, 일반 사용자는 접속할 수 없음"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:232
 #, c-format
 msgid ""
 "Target server's authentication method must be changed, or set "
@@ -21769,28 +22509,28 @@ msgstr ""
 "대상 서버의 인증 방법을 바꾸거나, 또는 구독 속성으로 password_required=false "
 "로 지정하세요."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:249
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "search path를 지울 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:295
+#: replication/libpqwalreceiver/libpqwalreceiver.c:483
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "잘못된 연결 문자열 구문: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:323
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "일반 사용자로 접속한다면, 연결 문자열에 비밀번호를 지정하세요."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:350
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "접속 문자열을 분석할 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:425
 #, c-format
 msgid ""
 "could not receive database system identifier and timeline ID from the "
@@ -21798,13 +22538,13 @@ msgid ""
 msgstr ""
 "주 서버에서 데이터베이스 시스템 식별번호와 타임라인 번호를 받을 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:442
+#: replication/libpqwalreceiver/libpqwalreceiver.c:737
 #, c-format
 msgid "invalid response from primary server"
 msgstr "주 서버에서 잘못된 응답이 왔음"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:443
 #, c-format
 msgid ""
 "Could not identify system: got %d rows and %d fields, expected %d rows and "
@@ -21813,91 +22553,91 @@ msgstr ""
 "시스템을 식별할 수 없음: 로우수 %d, 필드수 %d, 예상값: 로우수 %d, 필드수 %d "
 "이상"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:572
+#: replication/libpqwalreceiver/libpqwalreceiver.c:579
+#: replication/libpqwalreceiver/libpqwalreceiver.c:611
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "WAL 스트리밍 작업을 시작할 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:635
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "주 서버로 스트리밍 종료 메시지를 보낼 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:659
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "스트리밍 종료 요청에 대한 잘못된 응답을 받음"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:675
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "COPY 스트리밍 종료 중 오류 발생: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:686
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "스트리밍 명령에 대한 결과 처리에서 오류 발생: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:696
+#: replication/libpqwalreceiver/libpqwalreceiver.c:832
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "CommandComplete 작업 후 예상치 못한 결과를 받음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:725
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "주 서버에서 타임라인 내역 파일을 받을 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:738
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "2개의 칼럼으로 된 하나의 튜플을 예상하지만, %d 튜플 (%d 칼럼)을 수신함"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:793
+#: replication/libpqwalreceiver/libpqwalreceiver.c:848
+#: replication/libpqwalreceiver/libpqwalreceiver.c:855
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "WAL 스트림에서 자료 받기 실패: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:875
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "WAL 스트림에 데이터를 보낼 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:978
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "\"%s\" 복제 슬롯을 만들 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1030
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "\"%s\" 복제 슬롯을 변경할 수 없음: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1064
 #, c-format
 msgid "invalid query response"
 msgstr "잘못된 쿼리 응답"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1065
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "%d개의 칼럼을 예상하지만, %d개의 칼럼을 수신함"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1135
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "이 쿼리 인터페이스는 데이터베이스 연결이 필요합니다"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1169
 msgid "empty query"
 msgstr "빈 쿼리"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
 msgid "unexpected pipeline mode"
 msgstr "예기치 않은 파이프라인 모드"
 
@@ -21943,45 +22683,181 @@ msgstr ""
 "논리 복제 반영 작업자는 %u 원격 트랜잭션의 남아 있는 변경 사항을 파일로 직렬"
 "화 할 것입니다."
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/conflict.c:126
+#, c-format
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "\"%s.%s\" 릴레이션에서 충돌이 감지됨: 충돌=%s"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified locally in transaction "
+"%u at %s."
+msgstr ""
+"키가 이미 \"%s\" 유니크 인덱스 안에 있는데, %u 트랜잭션이 %s에 로컬에서 변경"
+"했습니다."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified by origin \"%s\" in "
+"transaction %u at %s."
+msgstr ""
+"키가 이미 \"%s\" 유니크 인덱스 안에 있는데, \"%s\" 오리진에서 %u 트랜잭션이 "
+"%s에 변경했습니다."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified by a non-existent origin "
+"in transaction %u at %s."
+msgstr ""
+"키가 이미 \"%s\" 유니크 인덱스 안에 있는데, %u 트랜잭션이 %s에 non-existent "
+"오리진에서 변경했습니다."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr "키가 이미 \"%s\" 유니크 인덱스 안에 있는데, %u 트랜잭션이 변경함"
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr "%u 트랜잭션이 로컬에서 %s에 변경한 로우를 업데이트 합니다."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid ""
+"Updating the row that was modified by a different origin \"%s\" in "
+"transaction %u at %s."
+msgstr "\"%s\" 다른 오리진의 %u 트랜잭션이 %s에 변경한 로우를 업데이트 합니다."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid ""
+"Updating the row that was modified by a non-existent origin in transaction "
+"%u at %s."
+msgstr ""
+"non-existent 오리진의 %u 트랜잭션이 %s에 변경한 로우를 업데이트 합니다."
+
+#: replication/logical/conflict.c:265
+msgid "Could not find the row to be updated."
+msgstr "업데이트할 로우를 찾을 수 없습니다."
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "%u 트랜잭션이 로컬에서 %s에 변경한 로우를 지웁니다."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid ""
+"Deleting the row that was modified by a different origin \"%s\" in "
+"transaction %u at %s."
+msgstr "\"%s\" 다른 오리진의 %u 트랜잭션이 %s에 변경한 로우를 지웁니다."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid ""
+"Deleting the row that was modified by a non-existent origin in transaction "
+"%u at %s."
+msgstr "non-existent 오리진의 %u 트랜잭션이 %s에 변경한 로우를 지웁니다."
+
+#  translator: %s is IPv4, IPv6, or Unix
+#: replication/logical/conflict.c:284
+msgid "Could not find the row to be deleted."
+msgstr "지울 로우를 찾을 수 없습니다."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "%s 키"
+
+#: replication/logical/conflict.c:364
+#, c-format
+msgid "existing local row %s"
+msgstr "이미 있는 \"%s\" 커서를 닫습니다"
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "%s개의 로컬 로우 있음"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "%s개 원격 로우"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "%s 원격 로우"
+
+#: replication/logical/conflict.c:434
+#, c-format
+msgid "replica identity %s"
+msgstr "%s 복제 식별자"
+
+#: replication/logical/conflict.c:435
+#, c-format
+msgid "replica identity full %s"
+msgstr "%s full 복제 식별자"
+
+#: replication/logical/conflict.c:440
+#, c-format
+msgid "Replica identity %s"
+msgstr "%s 복제 식별자"
+
+#: replication/logical/conflict.c:441
+#, c-format
+msgid "Replica identity full %s"
+msgstr "%s full 복제 식별자"
+
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid ""
 "logical decoding on standby requires \"wal_level\" >= \"logical\" on the "
 "primary"
 msgstr ""
-"대기 서버에서 논리적 디코딩은 주서버 설정이 \"wal_level\" >= \"logical\" 이어야 함"
+"대기 서버에서 논리적 디코딩은 주서버 설정이 \"wal_level\" >= \"logical\" 이어"
+"야 함"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
+msgid ""
+"cannot start logical replication workers when "
+"\"max_active_replication_origins\" is 0"
 msgstr ""
-"max_replication_slots = 0 설정 때문에 논리 복제 작업자를 시작 할 수 없습니다"
+"\"max_active_replication_origins = 0\" 설정 때문에 논리 복제 작업자를 시작 "
+"할 수 없습니다"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "더 이상의 논리 복제 작업자용 슬롯이 없습니다"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:985 storage/lmgr/lock.c:1023
-#: storage/lmgr/lock.c:2836 storage/lmgr/lock.c:4221 storage/lmgr/lock.c:4286
-#: storage/lmgr/lock.c:4636 storage/lmgr/predicate.c:2469
-#: storage/lmgr/predicate.c:2484 storage/lmgr/predicate.c:3881
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1600 replication/slot.c:1620 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "\"%s\" 설정값을 늘릴 필요가 있습니다."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "백그라운 작업자 슬롯이 모자랍니다"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "%d 번 논리 복제 작업자 슬롯이 비어있습니다, 붙일 수 없습니다."
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid ""
 "logical replication worker slot %d is already used by another worker, cannot "
@@ -21990,27 +22866,27 @@ msgstr ""
 "%d 번 논리 복제 작업자 슬롯을 이미 다른 작업자가 쓰고 있습니다. 붙일 수 없습"
 "니다."
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "논리적 디코딩 기능은 \"wal_level\" 값이 \"logical\" 이상이어야 함"
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "논리적 디코딩 기능은 데이터베이스 연결이 필요합니다"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:521
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "논리적 디코딩에서는 물리적 복제 슬롯을 사용할 수 없음"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:531
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "\"%s\" 복제 슬롯이 이 데이터베이스 만들어져있지 않음"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid ""
 "cannot create logical replication slot in transaction that has performed "
@@ -22018,77 +22894,59 @@ msgid ""
 msgstr ""
 "자료 변경 작업이 있는 트랜잭션 안에서는 논리적 복제 슬롯을 만들 수 없음"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:542
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "논리적 디코딩에서는 \"%s\" 슬롯을 사용할 수 없음"
 
-#: replication/logical/logical.c:542 replication/slot.c:798
-#: replication/slot.c:829
+#: replication/logical/logical.c:544 replication/slot.c:829
+#: replication/slot.c:864
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "이 복제 슬롯은 해당 주 서버로부터 동기화 되었습니다."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:545
 #, c-format
 msgid "Specify another replication slot."
 msgstr "다른 복제 슬롯을 지정하세요."
 
-#: replication/logical/logical.c:554 replication/logical/logical.c:561
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "\"%s\" 복제 슬롯에서 변경 사항을 더 찾을 수 없음"
-
-#: replication/logical/logical.c:556
-#, c-format
-msgid ""
-"This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr "최대 예약 크기를 초과해서 이 슬롯은 정상적이지 않은 것으로 바꿨습니다."
-
-#: replication/logical/logical.c:563
-#, c-format
-msgid ""
-"This slot has been invalidated because it was conflicting with recovery."
-msgstr ""
-"이 슬롯은 복구 작업으로 충돌이 일어나 사용할 수 없는 것으로 처리했습니다."
-
-#: replication/logical/logical.c:628
+#: replication/logical/logical.c:611
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "\"%s\" 이름의 논리적 복제 슬롯을 만드는 중"
 
-#: replication/logical/logical.c:630
+#: replication/logical/logical.c:613
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr ""
 "%X/%X 이후 트랜잭션 커밋 정보를 스트리밍 하는 중, %X/%X 위치부터 WAL 읽는 중"
 
-#: replication/logical/logical.c:778
+#: replication/logical/logical.c:761
 #, 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:784
+#: replication/logical/logical.c:767
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "슬롯: \"%s\", 출력 플러그인: \"%s\", 해당 콜백함수: %s"
 
-#: replication/logical/logical.c:955 replication/logical/logical.c:1000
-#: replication/logical/logical.c:1045 replication/logical/logical.c:1091
+#: replication/logical/logical.c:938 replication/logical/logical.c:983
+#: replication/logical/logical.c:1028 replication/logical/logical.c:1074
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "준비 시간에 논리 복제가 %s 콜백을 필요로 합니다."
 
-#: replication/logical/logical.c:1323 replication/logical/logical.c:1372
-#: replication/logical/logical.c:1413 replication/logical/logical.c:1499
-#: replication/logical/logical.c:1548
+#: replication/logical/logical.c:1306 replication/logical/logical.c:1355
+#: replication/logical/logical.c:1396 replication/logical/logical.c:1482
+#: replication/logical/logical.c:1531
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "논리적 스트리밍이 %s 콜백을 필요로 합니다"
 
-#: replication/logical/logical.c:1458
+#: replication/logical/logical.c:1441
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "준비 시간에 논리적 스트리밍이 %s 콜백을 필요로 합니다"
@@ -22113,7 +22971,7 @@ msgstr "배열은 일차원 배열이어야 합니다"
 msgid "array must not contain nulls"
 msgstr "배열에는 null 값을 포함할 수 없습니다"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1420
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -22128,112 +22986,123 @@ msgstr ""
 "\"%s\" 논리 복제 출력 플러그인은 이진 자료를 출력하지만, \"%s\" 함수는 텍스"
 "트 자료를 사용함"
 
-#: replication/logical/origin.c:190
+#: replication/logical/origin.c:195
 #, c-format
 msgid ""
-"cannot query or manipulate replication origin when \"max_replication_slots\" "
-"is 0"
+"cannot query or manipulate replication origin when "
+"\"max_active_replication_origins\" is 0"
 msgstr ""
-"\"max_replication_slots\" = 0 상황에서는 복제 오리진을 질의하거나 관리할 수 없음"
+"\"max_active_replication_origins\" = 0 상황에서는 다중 복제 오리진을 질의하거"
+"나 관리할 수 없음"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "복구 작업 중에는 복제 오리진을 관리할 수 없음"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "\"%s\" 이름의 복제 오리진이 없습니다"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "복제 오리진 이름이 너무 긺"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "복제 오리진 이름은 최대 %d 바이트입니다."
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "비어있는 복제 오리진 OID를 찾을 수 없음"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "%d ID의 복제 오리진은 삭제 될 수 없음, %d PID가 사용중임"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "%d ID의 복제 오리진이 없음"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "복제 체크포인트의 잘못된 매직 번호: %u, 기대값: %u"
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
 msgid ""
-"could not find free replication state, increase \"max_replication_slots\""
+"could not find free replication state, increase "
+"\"max_active_replication_origins\""
 msgstr ""
-"사용 가능한 복제 슬롯이 부족합니다. \"max_replication_slots\" 값을 늘리세요"
+"사용 가능한 복제 상태를 찾을 수 없습니다. \"max_active_replication_origins\" "
+"값을 늘리세요"
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "%d 노드 %X/%X 위치로 복제 상태가 복구됨"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "복제 슬롯 체크포인트의 체크섬 값이 잘못됨: %u, 기대값 %u"
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "%d ID의 복제 오리진이 %d PID 프로세스가 사용중입니다."
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid ""
 "could not find free replication state slot for replication origin with ID %d"
 msgstr "%d ID 복제 오리진을 위한 여유 복제 슬롯을 찾을 수 없음"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
-msgid "Increase \"max_replication_slots\" and try again."
-msgstr "\"max_replication_slots\" 값을 늘린 후 다시 시도해 보세요"
+msgid "Increase \"max_active_replication_origins\" and try again."
+msgstr "\"max_active_replication_origins\" 값을 늘린 후 다시 시도해 보세요"
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "하나가 이미 설정되어 더 이상 복제 오리진 설정을 할 수 없음"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "복제 오리진 설정이 없습니다"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "\"%s\" 복제 오리진 이름은 사용할 수 없음"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid ""
 "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr ""
 "\"%s\", \"%s\", \"pg_\"로 시작하는 오리진 이름은 미리 예약된 이름입니다."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", \"%s\""
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" is missing replicated column: "
@@ -22243,7 +23112,19 @@ msgid_plural ""
 "%s"
 msgstr[0] "\"%s.%s\" 이름의 논리 복제 대상 릴레이션에 관련된 칼럼이 빠졌음: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, c-format
+msgid ""
+"logical replication target relation \"%s.%s\" has incompatible generated "
+"column: %s"
+msgid_plural ""
+"logical replication target relation \"%s.%s\" has incompatible generated "
+"columns: %s"
+msgstr[0] ""
+"\"%s.%s\" 이름의 논리 복제 대상 릴레이션에 호환되지 않는 미리 계산된 칼럼이 "
+"있음: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" uses system columns in REPLICA "
@@ -22252,78 +23133,77 @@ msgstr ""
 "\"%s.%s\" 논리 복제 대상 릴레이션이 REPLICA IDENTITY 인덱스에서 시스템 칼럼"
 "을 사용하고 있습니다."
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "\"%s.%s\" 이름의 논리 복제 대상 릴레이션이 없습니다."
 
-#: replication/logical/reorderbuffer.c:3999
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "%u XID 내용을 데이터 파일에 쓸 수 없음: %m"
 
-#: replication/logical/reorderbuffer.c:4345
-#: replication/logical/reorderbuffer.c:4370
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "reorderbuffer 처리용 파일에서 읽기 실패: %m"
 
-#: replication/logical/reorderbuffer.c:4349
-#: replication/logical/reorderbuffer.c:4374
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid ""
 "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr ""
 "reorderbuffer 처리용 파일에서 읽기 실패: %d 바이트 읽음, 기대값 %u 바이트"
 
-#: replication/logical/reorderbuffer.c:4624
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
-msgstr "\"%s\" 파일을 지울 수 없음, pg_replslot/%s/xid* 삭제 작업 중: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
+msgstr "\"%s\" 파일을 지울 수 없음, %s/%s/xid* 삭제 작업 중: %m"
 
-#: replication/logical/reorderbuffer.c:5120
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "\"%s\" 파일에서 읽기 실패: %d 바이트 읽음, 기대값 %d 바이트"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:595
 #, c-format
-msgid ""
-"could not synchronize replication slot \"%s\" because remote slot precedes "
-"local slot"
-msgstr "원격 슬롯이 로컬 슬롯 보다 우선이어서 복제 슬롯(\"%s\")을 동기화 할 수 없음"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "\"%s\" 복제 슬롯을 동기화 할 수 없음"
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:216
 #, c-format
 msgid ""
-"The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has "
-"LSN %X/%X and catalog xmin %u."
+"Synchronization could lead to data loss, because the remote slot needs WAL "
+"at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog "
+"xmin %u."
 msgstr ""
-"원격 슬롯에는 LSN %X/%X, catalog xmin %u 정보가 있지만, "
-"로컬 슬롯은 LSN %X/%X, catalog xmin %u 상태입니다."
+"동기화 작업에서 자료를 잃을 가능성이 있습니다. 원격 슬롯에는 LSN %X/%X, "
+"catalog xmin %u 정보가 필요한데, 대기 서버에서는 LSN %X/%X, catalog xmin %u "
+"상태입니다."
 
-#: replication/logical/slotsync.c:459
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "\"%s\" 복제 슬롯을 %u OID 데이터베이스에서 삭제했음"
 
-#: replication/logical/slotsync.c:579
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "\"%s\" 복제 슬롯을 동기화 할 수 없음"
-
-#: replication/logical/slotsync.c:580
+#: replication/logical/slotsync.c:596
 #, c-format
 msgid ""
-"Logical decoding could not find consistent point from local slot's LSN %X/%X."
-msgstr "논리적 디코딩이 로컬 슬롯 %X/%X에서 일관성 위치를 찾지 못함"
+"Synchronization could lead to data loss, because the standby could not build "
+"a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr ""
+"동기화 작업에서 자료를 잃을 가능성이 있습니다. "
+"대기 서버가 LSN %X/%X 위치에서 WAL 디코드하기 위한 일관성 스냅샷으로 "
+"구축되지 않았습니다."
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:605
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "새롭게 만들어진 \"%s\" 복제 슬롯은 이제 동기화 준비 상태임"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:644
 #, c-format
 msgid ""
 "skipping slot synchronization because the received slot sync LSN %X/%X for "
@@ -22332,7 +23212,7 @@ msgstr ""
 "슬롯 동기화가 건너뜀, 수신된 슬롯 동기화 LSN은 %X/%X(해당 슬롯: \"%s\")인데 "
 "이는 대기 서버 위치인 %X/%X 보다 앞섭니다."
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:666
 #, c-format
 msgid ""
 "exiting from slot synchronization because same name slot \"%s\" already "
@@ -22340,29 +23220,29 @@ msgid ""
 msgstr ""
 "\"%s\" 이름의 슬롯이 대기 서버에도 이미 있어, 슬롯 동기화 작업이 이미 있음"
 
-#: replication/logical/slotsync.c:819
+#: replication/logical/slotsync.c:835
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "주 서버에서 failover 논리 복제 슬롯을 찾지 못했음: %s"
 
-#: replication/logical/slotsync.c:965
+#: replication/logical/slotsync.c:984
 #, c-format
 msgid ""
-"could not fetch primary_slot_name \"%s\" info from the primary server: %s"
-msgstr "주 서버에서 \"%s\" primary_slot_name을 찾지 못했음: %s"
+"could not fetch primary slot name \"%s\" info from the primary server: %s"
+msgstr "주 서버에서 \"%s\" 이름의 주 슬롯 정보를 찾지 못했음: %s"
 
-#: replication/logical/slotsync.c:967
+#: replication/logical/slotsync.c:986
 #, c-format
-msgid "Check if primary_slot_name is configured correctly."
-msgstr "primary_slot_name 설정값을 확인하세요."
+msgid "Check if \"primary_slot_name\" is configured correctly."
+msgstr "\"primary_slot_name\" 설정값이 바른지 확인하세요."
 
-#: replication/logical/slotsync.c:987
+#: replication/logical/slotsync.c:1006
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "대기 서버에서 복제 슬롯을 동기화 할 수 없음"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:996
+#: replication/logical/slotsync.c:1015
 #, c-format
 msgid ""
 "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
@@ -22371,153 +23251,149 @@ msgstr "\"%s\" 이름의 복제 슬롯(\"%s\" 설정에 지정된)이 주 서버
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1029
+#: replication/logical/slotsync.c:1048
 #, c-format
 msgid ""
 "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr ""
 "복제 슬롯 동기화는 \"%s\" 설정을 필요로 합니다. 해당 환경 설정 변수: \"%s\""
 
-#: replication/logical/slotsync.c:1050
+#: replication/logical/slotsync.c:1067
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "복제 슬롯 동기화는 \"wal_level\" >= \"logical\" 설정이 필요함"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
+#: replication/logical/slotsync.c:1082 replication/logical/slotsync.c:1110
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "복제 슬롯 동기화는 \"%s\" 설정이 필요함"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1077
+#: replication/logical/slotsync.c:1096
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "복제 슬롯 동기화는 \"%s\" 설정이 활성화 되어야 함"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1148
 #, c-format
 msgid ""
 "replication slot synchronization worker will shut down because \"%s\" is "
 "disabled"
-msgstr ""
-"\"%s\" 설정이 비활성화되어 복제 슬롯 동기화 작업이 중지될 것임"
+msgstr "\"%s\" 설정이 비활성화되어 복제 슬롯 동기화 작업이 중지될 것임"
 
-#: replication/logical/slotsync.c:1138
+#: replication/logical/slotsync.c:1157
 #, c-format
 msgid ""
 "replication slot synchronization worker will restart because of a parameter "
 "change"
-msgstr ""
-"매개 변수가 바뀌어서 복제 슬롯 동기화 작업이 중지될 것임"
+msgstr "매개 변수가 바뀌어서 복제 슬롯 동기화 작업이 중지될 것임"
 
-#: replication/logical/slotsync.c:1162
+#: replication/logical/slotsync.c:1181
 #, c-format
 msgid ""
 "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr ""
-"SIGINT 신호를 받아 복제 슬롯 동기화 작업자를 종료함"
+msgstr "SIGINT 신호를 받아 복제 슬롯 동기화 작업자를 종료함"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1306
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "대기 서버가 주 서버로 전환 중이여서 복제 슬롯 동기화를 할 수 없음"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1314
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "복제 슬롯을 동시에 동기화 할 수 없음"
 
-#: replication/logical/slotsync.c:1403
+#: replication/logical/slotsync.c:1422
 #, c-format
 msgid "slot sync worker started"
 msgstr "슬롯 동기화 작업자 시작됨"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
+#: replication/logical/slotsync.c:1484 replication/slotfuncs.c:928
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "주 서버에 연결 할 수 없음: %s"
+msgid ""
+"synchronization worker \"%s\" could not connect to the primary server: %s"
+msgstr "\"%s\" 동기화 작업자가 주 서버에 연결 할 수 없음: %s"
 
-#: replication/logical/snapbuild.c:653
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "초기 슬롯 스냅샷이 너무 큽니다."
 
-#: replication/logical/snapbuild.c:707
+#: replication/logical/snapbuild.c:568
 #, 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] ""
-"추출된 논리 디코딩 스냅샷: \"%s\" 스냅샷, %u개 트랜잭션 ID"
+msgstr[0] "추출된 논리 디코딩 스냅샷: \"%s\" 스냅샷, %u개 트랜잭션 ID"
 
-#: replication/logical/snapbuild.c:1404 replication/logical/snapbuild.c:1501
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "논리적 디코딩 이어서 시작할 위치: %X/%X"
 
-#: replication/logical/snapbuild.c:1406
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "실행할 트랜잭션이 없음"
 
-#: replication/logical/snapbuild.c:1453
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "논리적 디코딩 시작 위치: %X/%X"
 
-#: replication/logical/snapbuild.c:1455 replication/logical/snapbuild.c:1479
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "(대략 %d개) %u 보다 오래된 트랜잭션이 종료되길 기다리고 있습니다."
 
-#: replication/logical/snapbuild.c:1477
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr "논리적 디코딩을 이어서 시작할 위치: %X/%X"
 
-#: replication/logical/snapbuild.c:1503
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "더이상 오래된 트랜잭션이 없습니다."
 
-#: replication/logical/snapbuild.c:1904
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "\"%s\" snapbuild 상태 파일의 매직 번호가 이상함: 현재값 %u, 기대값 %u"
 
-#: replication/logical/snapbuild.c:1910
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr "\"%s\" snapbuild 상태 파일의 버전이 이상함: 현재값 %u, 기대값 %u"
 
-#: replication/logical/snapbuild.c:1951
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr ""
 "\"%s\" snapbuild 상태 파일의 체크섬이 일치하지 않음: 조회값 %u, 기대값 %u"
 
-#: replication/logical/snapbuild.c:2019
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "저장된 스냅샷을 이용해서 논리적 디코딩을 시작할 것입니다."
 
-#: replication/logical/snapbuild.c:2126
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "\"%s\" 파일 이름을 분석할 수 없음"
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid ""
 "logical replication table synchronization worker for subscription \"%s\", "
 "table \"%s\" has finished"
 msgstr "\"%s\" 구독용 논리 복제 테이블 동기화 작업자가, \"%s\" 테이블 완료함"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid ""
 "logical replication apply worker for subscription \"%s\" will restart so "
@@ -22526,44 +23402,51 @@ msgstr ""
 "two_phase 활성화를 위해 \"%s\" 구독을 위해 논리 복제 적용 작업자가 다시 시작"
 "됩니다."
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "\"%s.%s\" 테이블용 테이블 정보를 구할 수 없습니다, 해당 발행: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr " \"%s.%s\" 테이블이 발행 안에 없습니다."
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "\"%s.%s\" 테이블용 칼럼 목록 정보를 구할 수 없습니다, 해당 발행: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid ""
 "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: "
 "%s"
 msgstr "\"%s.%s\" 테이블용 WHERE 절을 구할 수 없습니다, 해당 발행: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "\"%s.%s\" 테이블용 초기 자료 복사를 시작할 수 없습니다: %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
+#, c-format
+msgid ""
+"table synchronization worker for subscription \"%s\" could not connect to "
+"the publisher: %s"
+msgstr "\"%s\" 구독용 테이블 동기화 작업자가 발행 서버에 연결할 수 없음: %s"
+
+#: replication/logical/tablesync.c:1466
 #, c-format
 msgid "table copy could not start transaction on publisher: %s"
 msgstr "발행 서버에서는 테이블 복사 트랜잭션을 시작할 수 없음: %s"
 
-#: replication/logical/tablesync.c:1472
+#: replication/logical/tablesync.c:1509
 #, c-format
 msgid "replication origin \"%s\" already exists"
 msgstr "\"%s\" 이름의 복제 오리진이 이미 있습니다."
 
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1542 replication/logical/worker.c:2378
 #, c-format
 msgid ""
 "user \"%s\" cannot replicate into relation with row-level security enabled: "
@@ -22572,18 +23455,18 @@ msgstr ""
 "\"%s\" 사용자는 로우 수준 보안 활성화 상태에서 릴레이션으로 복제할 수 없음: "
 "\"%s\""
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1555
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "발행 서버에서 테이블 복사 트랜잭션을 마칠 수 없음: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "\"%s\" 구독을 위한 논리 복제 병렬 반영 작업자가 중지됩니다."
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid ""
 "Cannot handle streamed replication transactions using parallel apply workers "
@@ -22592,12 +23475,12 @@ msgstr ""
 "모든 테이블 동기화 끝나기 전까지는 병렬 반영 작업자를 사용하는 스트리밍 복제 "
 "트랜잭셕은 처리할 수 없습니다."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "%d 번째 논리 복제 칼럼 안에 잘못된 바이너리 자료 형식 발견됨"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid ""
 "publisher did not send replica identity column expected by the logical "
@@ -22606,7 +23489,7 @@ msgstr ""
 "발행 서버에서 \"%s.%s\" 논리 복제 대상 릴레이션의 복제 식별자 칼럼을 보내지 "
 "않았습니다."
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY "
@@ -22617,22 +23500,22 @@ msgstr ""
 "KEY 도 없고, 발행 쪽 해당 테이블에 REPLICA IDENTITY FULL 속성 칼럼도 없습니"
 "다."
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "잘못된 논리 복제 메시지 형태 \"??? (%d)\""
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "발행 서버로부터의 데이터 스트림이 끝났습니다"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "시간 제한으로 논리 복제 작업자를 중지합니다."
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will stop because the "
@@ -22641,7 +23524,7 @@ msgstr ""
 "\"%s\" 구독이 지워졌기 때문에, 해당 구독용 논리 복제 작업자가 중지 될 것입니"
 "다."
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will stop because the "
@@ -22650,7 +23533,7 @@ msgstr ""
 "\"%s\" 구독이 비활성화 되었기 때문에, 해당 구독용 논리 복제 작업자가 중지 될 "
 "것입니다."
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop "
@@ -22659,7 +23542,7 @@ msgstr ""
 "매개 변수가 바뀌어서 \"%s\" 구독을 위해 논리 복제 병렬 반영 작업자가 중지 될 "
 "것입니다."
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will restart because of a "
@@ -22667,30 +23550,36 @@ msgid ""
 msgstr ""
 "매개 변수가 바뀌어서 \"%s\" 구독을 위해 논리 복제 작업자가 중지 될 것입니다."
 
-#: replication/logical/worker.c:3954
+#: replication/logical/worker.c:4053
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop "
 "because the subscription owner's superuser privileges have been revoked"
 msgstr ""
-"구독 소유주의 슈퍼유저 권한이 회수되어 \"%s\" 구독용 논리 복제 병렬 반영 "
-"작업자가 중지 될 것임"
+"구독 소유주의 슈퍼유저 권한이 회수되어 \"%s\" 구독용 논리 복제 병렬 반영 작업"
+"자가 중지 될 것임"
 
-#: replication/logical/worker.c:3958
+#: replication/logical/worker.c:4057
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will restart because the "
 "subscription owner's superuser privileges have been revoked"
 msgstr ""
-"구독 소유주의 슈퍼유저 권한이 회수되어 \"%s\" 구독용 논리 복제 병렬 반영 "
-"작업자가 재실행 될 것임"
+"구독 소유주의 슈퍼유저 권한이 회수되어 \"%s\" 구독용 논리 복제 병렬 반영 작업"
+"자가 재실행 될 것임"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "구독에서 사용할 복제 슬롯 세트가 없습니다."
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, c-format
+msgid ""
+"apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "\"%s\" 구독용 변경 내용 반영 작업자가 발행 서버로 연결할 수 없음: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid ""
 "logical replication worker for subscription %u will not start because the "
@@ -22699,7 +23588,7 @@ msgstr ""
 "해당 구독이 시작하는 사이 지워져서 구독번호 %u 번용 논리 복제 작업자가 작동되"
 "지 못했습니다."
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will not start because "
@@ -22707,7 +23596,7 @@ msgid ""
 msgstr ""
 "\"%s\" 구독이 시작되는 사이 지워져서 논리 복제 작업자가 작동되지 못했습니다."
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid ""
 "logical replication table synchronization worker for subscription \"%s\", "
@@ -22716,125 +23605,124 @@ msgstr ""
 "\"%s\" 구독, \"%s\" 테이블을 위한 논리 복제 테이블 동기화 작업자가 시작되었습"
 "니다."
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "\"%s\" 구독을 위한 논리 복제 반영 작업자가 시작되었습니다."
 
-#: replication/logical/worker.c:4758
+#: replication/logical/worker.c:4871
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "\"%s\" 구독이 오류로 비활성화 되었습니다."
 
-#: replication/logical/worker.c:4806
+#: replication/logical/worker.c:4919
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "%X/%X LSN 에서 트랜잭션 건너 뛰어 논리 복제를 시작함"
 
-#: replication/logical/worker.c:4820
+#: replication/logical/worker.c:4933
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "논리 복제가 %X/%X LSN까지 트랜잭션을 건너뛰었습니다."
 
-#: replication/logical/worker.c:4902
+#: replication/logical/worker.c:5021
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "\"%s\" 이름의 구독의 LSN 건너뛰기 완료함"
 
-#: replication/logical/worker.c:4903
+#: replication/logical/worker.c:5022
 #, c-format
 msgid ""
 "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN "
 "%X/%X."
 msgstr "원력 트랜잭션 마침 WAL 위치 %X/%X LSN이 skip-LSN %X/%X와 같지 않음"
 
-#: replication/logical/worker.c:4940
+#: replication/logical/worker.c:5050
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\""
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\""
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\""
 
-#: replication/logical/worker.c:4944
+#: replication/logical/worker.c:5054
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" in transaction %u"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" in transaction %u"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 트랜잭션: %u"
 
-#: replication/logical/worker.c:4949
+#: replication/logical/worker.c:5059
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" in transaction %u, finished at %X/%X"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" in transaction %u, finished at %X/%X"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 트랜잭션: %u, 마침 위치: %X/%X"
 
-#: replication/logical/worker.c:4960
+#: replication/logical/worker.c:5070
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" for replication target relation \"%s.%s\" in transaction %u"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 복제 대상 릴레이션: \"%s.%s\", 해당 트랜잭션: %u"
 
-#: replication/logical/worker.c:4967
+#: replication/logical/worker.c:5077
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" for replication target relation \"%s.%s\" in transaction %u, finished "
-"at %X/%X"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" for replication target relation \"%s.%s\" in transaction %u, finished at "
+"%X/%X"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 복제 대상 릴레이션: \"%s.%s\", 해당 트랜잭션: %u, 마침 위치: %X/%X"
 
-#: replication/logical/worker.c:4978
+#: replication/logical/worker.c:5088
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" for replication target relation \"%s.%s\" column \"%s\" in "
-"transaction %u"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 복제 대상 릴레이션: \"%s.%s\", 해당 칼럼 \"%s\", 해당 트랜잭션: %u"
 
-#: replication/logical/worker.c:4986
+#: replication/logical/worker.c:5096
 #, c-format
 msgid ""
-"processing remote data for replication origin \"%s\" during message type "
-"\"%s\" for replication target relation \"%s.%s\" column \"%s\" in "
-"transaction %u, finished at %X/%X"
+"processing remote data for replication origin \"%s\" during message type \"%s"
+"\" for replication target relation \"%s.%s\" column \"%s\" in transaction "
+"%u, finished at %X/%X"
 msgstr ""
 "\"%s\" 복제 오리진용 원격 데이터를 처리합니다. 해당 메시지 유형: \"%s\", 해"
 "당 복제 대상 릴레이션: \"%s.%s\", 해당 칼럼 \"%s\", 해당 트랜잭션: %u, 마침 "
 "위치: %X/%X"
 
-#: replication/pgoutput/pgoutput.c:322
+#: replication/pgoutput/pgoutput.c:328
 #, c-format
 msgid "invalid proto_version"
 msgstr "잘못된 proto_version"
 
-#: replication/pgoutput/pgoutput.c:327
+#: replication/pgoutput/pgoutput.c:333
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_verson \"%s\" 범위 벗어남"
 
-#: replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:350
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "잘못된 publication_names 구문"
 
-#: replication/pgoutput/pgoutput.c:414 replication/pgoutput/pgoutput.c:418
+#: replication/pgoutput/pgoutput.c:420 replication/pgoutput/pgoutput.c:424
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "\"%s\" 옵션 빠졌음"
 
-#: replication/pgoutput/pgoutput.c:478
+#: replication/pgoutput/pgoutput.c:469
 #, c-format
 msgid ""
 "client sent proto_version=%d but server only supports protocol %d or lower"
@@ -22842,7 +23730,7 @@ msgstr ""
 "클라이언트가 proto_version=%d 값을 보냈지만, %d 버전 또는 그 이하 버전 프로토"
 "콜만 지원합니다."
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:475
 #, c-format
 msgid ""
 "client sent proto_version=%d but server only supports protocol %d or higher"
@@ -22850,7 +23738,7 @@ msgstr ""
 "클라이언트가 proto_version=%d 값을 보냈지만, %d 버전 또는 그 이상 버전 프로토"
 "콜만 지원합니다."
 
-#: replication/pgoutput/pgoutput.c:499
+#: replication/pgoutput/pgoutput.c:490
 #, c-format
 msgid ""
 "requested proto_version=%d does not support streaming, need %d or higher"
@@ -22858,7 +23746,7 @@ msgstr ""
 "요청한 %d 버전 proto_version은 스트리밍을 지원하지 않습니다. %d 또는 그 이상 "
 "버전이 필요합니다."
 
-#: replication/pgoutput/pgoutput.c:505
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid ""
 "requested proto_version=%d does not support parallel streaming, need %d or "
@@ -22867,12 +23755,12 @@ msgstr ""
 "요청한 proto_version=%d 값은 스트리밍을 지원하지 않습니다. %d 또는 그 이상 버"
 "전이 필요합니다."
 
-#: replication/pgoutput/pgoutput.c:510
+#: replication/pgoutput/pgoutput.c:501
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "스트리밍을 요청했지만, 출력 플러그인이 지원하지 않습니다."
 
-#: replication/pgoutput/pgoutput.c:524
+#: replication/pgoutput/pgoutput.c:515
 #, c-format
 msgid ""
 "requested proto_version=%d does not support two-phase commit, need %d or "
@@ -22881,27 +23769,51 @@ msgstr ""
 "요청한 proto_version=%d 값은 2PC를 지원하지 않습니다. %d 또는 그 이상 버전이 "
 "필요합니다."
 
-#: replication/pgoutput/pgoutput.c:529
+#: replication/pgoutput/pgoutput.c:520
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "2PC를 요청했지만, 출력 플러그인이 지원하지 않습니다."
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1085
 #, c-format
-msgid "replication slot name \"%s\" is too short"
-msgstr "\"%s\" 복제 슬롯 이름이 너무 짧음"
+msgid ""
+"cannot use different values of publish_generated_columns for table \"%s.%s\" "
+"in different publications"
+msgstr ""
+"서로 다른 발행에서 \"%s.%s\" 테이블에 대한 publish_generated_columns 의 서로 "
+"다른 값을 사용할 수 없음"
 
-#: replication/slot.c:269
+#: replication/pgoutput/pgoutput.c:1792
 #, c-format
-msgid "replication slot name \"%s\" is too long"
-msgstr "\"%s\" 복제 슬롯 이름이 너무 긺"
+msgid "skipped loading publication \"%s\""
+msgstr "\"%s\" 발행 불러오기를 건너뜀"
 
-#: replication/slot.c:282
+#: replication/pgoutput/pgoutput.c:1793
 #, c-format
-msgid "replication slot name \"%s\" contains invalid character"
-msgstr "\"%s\" 복제 슬롯 이름에 사용할 수 없는 문자가 있음"
+msgid "The publication does not exist at this point in the WAL."
+msgstr "해당 발행이 그 WAL 그 위치에 없습니다."
 
-#: replication/slot.c:284
+#: replication/pgoutput/pgoutput.c:1794
+#, c-format
+msgid "Create the publication if it does not exist."
+msgstr "없다면 해당 발행을 만드세요."
+
+#: replication/slot.c:275
+#, c-format
+msgid "replication slot name \"%s\" is too short"
+msgstr "\"%s\" 복제 슬롯 이름이 너무 짧음"
+
+#: replication/slot.c:284
+#, c-format
+msgid "replication slot name \"%s\" is too long"
+msgstr "\"%s\" 복제 슬롯 이름이 너무 긺"
+
+#: replication/slot.c:297
+#, c-format
+msgid "replication slot name \"%s\" contains invalid character"
+msgstr "\"%s\" 복제 슬롯 이름에 사용할 수 없는 문자가 있음"
+
+#: replication/slot.c:299
 #, c-format
 msgid ""
 "Replication slot names may only contain lower case letters, numbers, and the "
@@ -22910,314 +23822,372 @@ msgstr ""
 "복제 슬롯 이름으로 사용할 수 있는 문자는 영문 소문자, 숫자, 밑줄(_) 문자입니"
 "다."
 
-#: replication/slot.c:333
+#: replication/slot.c:348
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr "대기 서버에서 만들어진 복제 슬롯에는 failover 설정을 활성화 할 수 없음"
 
-#: replication/slot.c:345 replication/slot.c:849
+#: replication/slot.c:360 replication/slot.c:886
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "임시 복제 슬롯에는 failover 설정을 활성화 할 수 없음"
 
-#: replication/slot.c:370
+#: replication/slot.c:385
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "\"%s\" 이름의 복제 슬롯이 이미 있습니다."
 
-#: replication/slot.c:380
+#: replication/slot.c:395
 #, c-format
 msgid "all replication slots are in use"
 msgstr "모든 복제 슬롯이 사용 중입니다."
 
-#: replication/slot.c:381
+#: replication/slot.c:396
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "하나를 비우든지, \"max_replication_slots\" 설정값을 늘리세요."
 
-#: replication/slot.c:560 replication/slot.c:2450 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:580 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "\"%s\" 이름의 복제 슬롯이 없습니다"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:635 replication/slot.c:1431
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "\"%s\" 이름의 복제 슬롯을 %d PID 프로세스가 사용중입니다."
 
-#: replication/slot.c:638
+#: replication/slot.c:652
+#, c-format
+msgid "can no longer access replication slot \"%s\""
+msgstr "\"%s\" 복제 슬롯에 더 이상 접근할 수 없음"
+
+#: replication/slot.c:654
+#, c-format
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "이 복제 슬롯은 바르지 않습니다, 이유: \"%s\"."
+
+#: replication/slot.c:673
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "\"%s\" 논리 복제 슬롯을 획득함"
 
-#: replication/slot.c:640
+#: replication/slot.c:675
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "\"%s\" 물리 복제 슬롯을 획득함"
 
-#: replication/slot.c:729
+#: replication/slot.c:760
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "\"%s\" 논리 복제 슬롯을 반환함"
 
-#: replication/slot.c:731
+#: replication/slot.c:762
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "\"%s\" 물리 복제 슬롯을 반환함"
 
-#: replication/slot.c:797
+#: replication/slot.c:828
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "\"%s\" 복제 슬롯을 삭제할 수 없음"
 
-#: replication/slot.c:816
+#: replication/slot.c:851
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "물리 복제 슬롯과 함께 %s 사용할 수 없음"
 
-#: replication/slot.c:828
+#: replication/slot.c:863
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "\"%s\" 복제 슬롯을 변경 할 수 없음"
 
-#: replication/slot.c:838
+#: replication/slot.c:873
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "대기 서버의 복제 슬롯에는 failover 설정을 활성화 할 수 없음"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1021 replication/slot.c:2174 replication/slot.c:2560
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "\"%s\" 디렉터리를 삭제할 수 없음"
 
-#: replication/slot.c:1372
+#: replication/slot.c:1466
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr "복제 슬롯은 \"max_replication_slots\" > 0 상태에서만 사용할 수 있음"
 
-#: replication/slot.c:1377
+#: replication/slot.c:1471
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "복제 슬롯은 \"wal_level\" >= \"replica\" 상태에서만 사용할 수 있음"
 
-#: replication/slot.c:1389
+#: replication/slot.c:1483
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "복제 슬롯을 사용할 권한 없음"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1484
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "복제 슬롯은 %s 속성을 가진 롤만 사용할 수 있습니다."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1594
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural ""
+"The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
 msgstr[0] ""
-"해당 슬롯 restart_lsn %X/%X 값은 %llu 바이트로 그 크기를 초과했습니다."
+"해당 슬롯 restart_lsn %X/%X 값은 %<PRIu64> 바이트로 그 크기를 초과했습니다."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1605
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "해당 슬롯이 xid horizon %u 값으로 충돌합니다."
 
-#: replication/slot.c:1511
+#: replication/slot.c:1610
 msgid ""
 "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the "
 "primary server."
 msgstr ""
-"대기 서버의 논리적 디코딩 기능은 주서버의 \"wal_level\" >= \"logical\" 설정이 필요합"
-"니다."
+"대기 서버의 논리적 디코딩 기능은 주서버의 \"wal_level\" >= \"logical\" 설정"
+"이 필요합니다."
+
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1616
+#, c-format
+msgid ""
+"The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr ""
+"%ld 초의 슬롯 휴지 시간이 \"%s\" 설정값인 %d 초를 초과합니다."
 
-#: replication/slot.c:1519
+#: replication/slot.c:1630
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "%d번 프로세스를 중지합니다. \"%s\" 복제 슬롯이 삭제될 것입니다."
 
-#: replication/slot.c:1521
+#: replication/slot.c:1632
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "\"%s\" 복제 슬롯이 사용되지 않아 삭제될 것입니다."
 
-#: replication/slot.c:2249
+#: replication/slot.c:2498
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "\"%s\" 복제 슬롯 파일의 매직 번호가 이상합니다: 현재값 %u, 기대값 %u"
 
-#: replication/slot.c:2256
+#: replication/slot.c:2505
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "\"%s\" 복제 슬롯 파일은 지원하지 않는 %u 버전 파일입니다"
 
-#: replication/slot.c:2263
+#: replication/slot.c:2512
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "\"%s\" 복제 슬롯 파일이 %u 길이로 손상되었습니다."
 
-#: replication/slot.c:2299
+#: replication/slot.c:2548
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "\"%s\" 복제 슬롯 파일의 체크섬 값이 이상합니다: 현재값 %u, 기대값 %u"
 
-#: replication/slot.c:2333
+#: replication/slot.c:2584
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "\"%s\" 논리 복제 슬롯이 있지만, \"wal_level\" < \"logical\" 설정임"
 
-#: replication/slot.c:2335
+#: replication/slot.c:2586
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "\"wal_level\" 값을 \"logical\" 또는 그 이상으로 지정하세요."
 
-#: replication/slot.c:2339
+#: replication/slot.c:2598
+#, c-format
+msgid ""
+"logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = "
+"\"off\""
+msgstr ""
+"대기 서버에 \"%s\" 논리 복제 슬롯이 있지만, \"hot_standby\" = \"off\" 임"
+
+#: replication/slot.c:2600
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "\"hot_standby\" 값을 \"on\"으로 바꾸세요."
+
+#: replication/slot.c:2605
 #, c-format
 msgid ""
 "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "\"%s\" 물리 복제 슬롯이 있지만, \"wal_level\" < \"replica\" 설정임"
 
-#: replication/slot.c:2341
+#: replication/slot.c:2607
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "\"wal_level\" 값을 \"replica\" 또는 그 이상으로 지정하세요."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2654
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "서버 중지 전에 너무 많은 복제 슬롯이 활성화 상태입니다"
 
-#: replication/slot.c:2458
+#: replication/slot.c:2655
+#, c-format
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "\"max_replication_slots\" 값을 늘린 후 다시 시도해 보세요"
+
+#: replication/slot.c:2732
+#, c-format
+msgid "Replication slot \"%s\" does not exist."
+msgstr "\"%s\" 이름의 복제 슬롯이 없습니다."
+
+#: replication/slot.c:2740
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "\"%s\" 슬롯은 물리 복제 슬롯이 아님"
+msgid "\"%s\" is not a physical replication slot."
+msgstr "\"%s\" 슬롯은 물리 복제 슬롯이 아닙니다."
 
-#: replication/slot.c:2635
+#: replication/slot.c:2919
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "\"%s\" 복제 슬롯에는 \"%s\" 매개 변수 설정이 없음"
 
-#: replication/slot.c:2637 replication/slot.c:2671 replication/slot.c:2686
+#: replication/slot.c:2921 replication/slot.c:2955 replication/slot.c:2970
 #, c-format
 msgid ""
 "Logical replication is waiting on the standby associated with replication "
 "slot \"%s\"."
 msgstr "논리 복제가 \"%s\" 복제 슬롯과 연결된 대기 서버에서 대기 중"
 
-#: replication/slot.c:2639
+#: replication/slot.c:2923
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "\"%s\" 이름의 복제 슬롯을 만들든가, \"%s\" 설정을 바꾸세요."
 
-#: replication/slot.c:2649
+#: replication/slot.c:2933
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "\"%s\" 논리 복제 슬롯을 \"%s\" 설정에 지정할 수 없음"
 
-#: replication/slot.c:2651
+#: replication/slot.c:2935
 #, c-format
 msgid ""
 "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "논리 복제가 \"%s\" 복제 슬롯 수정을 기다리고 있습니다."
 
-#: replication/slot.c:2653
+#: replication/slot.c:2937
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "\"%s\" 논리 복제 슬롯을 \"%s\" 설정에서 빼세요."
 
-#: replication/slot.c:2669
+#: replication/slot.c:2953
 #, c-format
 msgid ""
 "physical replication slot \"%s\" specified in parameter \"%s\" has been "
 "invalidated"
 msgstr "\"%s\" 물리 복제 슬롯이 \"%s\" 설정에서 invalid 상태가 되었음"
 
-#: replication/slot.c:2673
+#: replication/slot.c:2957
 #, c-format
 msgid ""
 "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "\"%s\" 복제 슬롯을 삭제하고 다시 만들거나,  \"%s\" 설정을 바꾸세요."
 
-#: replication/slot.c:2684
+#: replication/slot.c:2968
 #, c-format
 msgid ""
 "replication slot \"%s\" specified in parameter \"%s\" does not have "
 "active_pid"
 msgstr "\"%s\" 복제 슬롯(\"%s\" 설정에 지정된)에 대응하는 active_pid가 없음"
 
-#: replication/slot.c:2688
+#: replication/slot.c:2972
 #, c-format
 msgid ""
 "Start the standby associated with the replication slot \"%s\", or amend "
 "parameter \"%s\"."
-msgstr "\"%s\" 복제 슬롯과 관계된 대기 서버를 시작하거나, \"%s\" 설정을 바꾸세요."
+msgstr ""
+"\"%s\" 복제 슬롯과 관계된 대기 서버를 시작하거나, \"%s\" 설정을 바꾸세요."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "잘못된 대상 WAL LSN"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "\"%s\" 이름의 복제 슬롯은 사용할 수 없음"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid ""
 "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "이 슬롯은 한 번도 WAL를 예약한 적이 없거나, 잘못된 것임"
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr "복제 슬롯 위치를 %X/%X 로 바꿀 수 없습니다. 최소값은 %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid ""
 "cannot copy physical replication slot \"%s\" as a logical replication slot"
 msgstr "물리 복제 슬롯(\"%s\")을 논리 복제 슬롯으로 복사할 수 없음"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid ""
 "cannot copy logical replication slot \"%s\" as a physical replication slot"
 msgstr "논리 복제 슬롯(\"%s\")을 물리 복제 슬롯으로 복사할 수 없음"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "WAL을 확보하지 않은 복제 슬롯은 복사할 수 없음"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "\"%s\" 복제 슬롯은 정상적이지 않아 복사할 수 없음"
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "\"%s\" 복제 슬롯을 복사할 수 없음"
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid ""
 "The source replication slot was modified incompatibly during the copy "
 "operation."
 msgstr "복사 작업 중 원본 복제 슬롯이 비정상적으로 변경되었습니다."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr "논리 복제가 끝나지 않은 \"%s\" 슬롯은 복사할 수 없음"
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr "원본 복제 슬롯의 confirmed_flush_lsn 값이 타당할 때 다시 시도하세요."
 
-#: replication/slotfuncs.c:877
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "\"%s\" 복제 슬롯을 복사할 수 없음"
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "복사 작업 중 원본 복제 슬롯이 비정상적으로 변경되었습니다."
+
+#: replication/slotfuncs.c:906
 #, c-format
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "복제 슬롯은 대기 서버에만 동기화 될 수 있음"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid ""
 "canceling the wait for synchronous replication and terminating connection "
@@ -23225,7 +24195,7 @@ msgid ""
 msgstr ""
 "관리자 명령에 의해 동기식 복제의 대기 작업과 접속 끊기 작업을 취소합니다."
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, c-format
 msgid ""
 "The transaction has already committed locally, but might not have been "
@@ -23234,204 +24204,206 @@ msgstr ""
 "주 서버에서는 이 트랜잭션이 커밋되었지만, 복제용 대기 서버에서는 아직 커밋 되"
 "지 않았을 가능성이 있습니다."
 
-#: replication/syncrep.c:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "사용자 요청에 의해 동기식 복제 작업을 취소합니다."
 
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "\"%s\" 대기 서버의 동기식 복제 우선순위가 %d 순위로 변경되었음"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "\"%s\" 대기 서버가 동기식 대기 서버 후보가 되었습니다"
 
-#: replication/syncrep.c:1013
+#: replication/syncrep.c:1081
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr "\"synchronous_standby_names\" 값을 분석할 수 없음"
+msgid "\"%s\" parser failed."
+msgstr "\"%s\" 구문 분석을 실패했습니다."
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1088
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "동기식 대기 서버 수 (%d)는 0보다 커야 합니다."
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "관리자 명령으로 인해 WAL 수신기를 종료합니다."
+msgid ""
+"streaming replication receiver \"%s\" could not connect to the primary "
+"server: %s"
+msgstr "\"%s\" 스트리밍 복제 수신자가 주 서버에 연결 할 수 없음: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "데이터베이스 시스템 식별번호가 주 서버와 대기 서버가 서로 다름"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "주 서버: %s, 대기 서버: %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr ""
 "주 서버의 제일 최신의 타임라인은 %u 인데, 복구 타임라인 %u 보다 옛것입니다"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr "주 서버의 WAL 스트리밍 시작 위치: %X/%X (타임라인 %u)"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "WAL 스트리밍 재시작 위치: %X/%X (타임라인 %u)"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "WAL 스트리밍 계속할 수 없음, 복구가 이미 종료됨"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "주 서버에 의해서 복제가 끝남"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "타임라인 %u, 위치 %X/%X 에서 WAL 끝에 도달함"
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "시간 제한으로 wal 수신기를 중지합니다."
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr "주 서버에는 요청 받은 %u 타임라인의 WAL가 더 이상 없습니다."
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "%s WAL 조각 파일을 닫을 수 없음: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "주 서버에서 %u 타임라인용 타임라인 내역 파일을 가져옵니다."
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "%s WAL 조각 파일 쓰기 실패: 위치 %d, 길이 %lu: %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:505
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "논리 복제 슬롯으로 %s 사용할 수 없음"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1735
+#: replication/walsender.c:609 storage/smgr/md.c:1867
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "\"%s\" 파일의 끝을 찾을 수 없음: %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:613
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "\"%s\" 파일에서 시작 위치를 찾을 수 없음: %m"
 
-#: replication/walsender.c:853
+#: replication/walsender.c:829
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "물리적 복제에서 논리적 복제 슬롯을 사용할 수 없음"
 
-#: replication/walsender.c:919
+#: replication/walsender.c:895
 #, c-format
 msgid ""
 "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "요청된 %X/%X 시작 위치(타임라인 %u)가 이 서버 내역에 없습니다."
 
-#: replication/walsender.c:922
+#: replication/walsender.c:898
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "이 서버의 시작 위치: 타임라인 %u, 위치 %X/%X"
 
-#: replication/walsender.c:966
+#: replication/walsender.c:942
 #, c-format
 msgid ""
 "requested starting point %X/%X is ahead of the WAL flush position of this "
 "server %X/%X"
 msgstr "%X/%X 위치는 서버의 %X/%X 보다 미래의 것입니다."
 
-#: replication/walsender.c:1160
+#: replication/walsender.c:1137
 #, c-format
 msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
 msgstr "\"%s\" CREATE_REPLICATION_SLOT 옵션에서 쓸 수 없는 값: \"%s\""
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1243
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s 명령은 트랜잭션 블럭안에서 실행할 수 없음"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1253
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s 명령은 트랜잭션 블럭안에서 실행할 수 있음"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1259
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s 구문은 격리 수준이 REPEATABLE READ 일때만 사용할 수 있습니다."
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1264
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s 명령은 읽기 전용 트랜잭션 블럭안에서만 실행할 수 있음"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1270
 #, c-format
 msgid "%s must be called before any query"
 msgstr "어떤 쿼리보다 먼저 %s 명령을 호출해야 함"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1276
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s 명령은 서브트랜잭션 블럭안에서 실행할 수 없음"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1453
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "운영전환 뒤 wal 송신기 프로세스를 중지합니다."
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:1996
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "WAL 송신기가 중지 중일 때는 새 명령을 실행할 수 없습니다."
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2050
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "물리적 복제를 위한 WAL 송신기에서 SQL 명령을 실행할 수 없음"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2081
 #, c-format
 msgid "received replication command: %s"
 msgstr "수신된 복제 명령: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1142
-#: tcop/postgres.c:1500 tcop/postgres.c:1752 tcop/postgres.c:2234
-#: tcop/postgres.c:2672 tcop/postgres.c:2749
+#: replication/walsender.c:2089 tcop/fastpath.c:208 tcop/postgres.c:1137
+#: tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251
+#: tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid ""
 "current transaction is aborted, commands ignored until end of transaction "
@@ -23440,22 +24412,22 @@ msgstr ""
 "현재 트랜잭션은 중지되어 있습니다. 이 트랜잭션을 종료하기 전까지는 모든 명령"
 "이 무시될 것입니다"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2249 replication/walsender.c:2284
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "대기 서버 연결에서 예상치 못한 EOF 발견함"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2272
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "잘못된 대기 서버 메시지 형태 \"%c\""
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2361
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "예상치 못한 메시지 형태: \"%c\""
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2775
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "복제 시간 제한으로 wal 송신기 프로세스를 종료합니다."
@@ -23641,14 +24613,14 @@ msgstr " \"%s\" 룰(rule)이  \"%s\" 관계(relation)에 지정된 것이 없음
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "ON SELECT 룰의 이름 바꾸기는 허용하지 않습니다"
 
-#: rewrite/rewriteHandler.c:588
+#: rewrite/rewriteHandler.c:590
 #, c-format
 msgid ""
 "WITH query name \"%s\" appears in both a rule action and the query being "
 "rewritten"
 msgstr "\"%s\" 이름의 WITH 쿼리가 룰 동작과 쿼리 재작성 두 곳 모두에 보입니다."
 
-#: rewrite/rewriteHandler.c:615
+#: rewrite/rewriteHandler.c:617
 #, c-format
 msgid ""
 "INSERT ... SELECT rule actions are not supported for queries having data-"
@@ -23656,117 +24628,117 @@ msgid ""
 msgstr ""
 "INSERT...SELECT 룰 액션에는 WITH 절 안에 자료 변경 구문을 지원하지 않습니다."
 
-#: rewrite/rewriteHandler.c:668
+#: rewrite/rewriteHandler.c:671
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "multiple rule에 RETURNING 목록을 지정할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:900 rewrite/rewriteHandler.c:939
+#: rewrite/rewriteHandler.c:908 rewrite/rewriteHandler.c:947
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "\"%s\" 칼럼에 non-DEFAULT 값을 입력할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:902 rewrite/rewriteHandler.c:968
+#: rewrite/rewriteHandler.c:910 rewrite/rewriteHandler.c:976
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "\"%s\" 칼럼은 GENERATED ALWAYS 속성의 식별자 칼럼입니다."
 
-#: rewrite/rewriteHandler.c:904
+#: rewrite/rewriteHandler.c:912
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "이 속성을 무시하려면, OVERRIDING SYSTEM VALUE 옵션을 사용하세요."
 
-#: rewrite/rewriteHandler.c:966 rewrite/rewriteHandler.c:974
+#: rewrite/rewriteHandler.c:974 rewrite/rewriteHandler.c:982
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "\"%s\" 칼럼은 DEFAULT 로만 업데이트 가능합니다"
 
-#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
+#: rewrite/rewriteHandler.c:1118 rewrite/rewriteHandler.c:1136
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "같은 \"%s\" 열에 지정값(assignment)이 중복되었습니다"
 
-#: rewrite/rewriteHandler.c:1704
+#: rewrite/rewriteHandler.c:1691
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE 명령은 룰을 사용하는 릴레이션에서 사용할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:1744 rewrite/rewriteHandler.c:3284
+#: rewrite/rewriteHandler.c:1731 rewrite/rewriteHandler.c:3271
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr "\"%s\"는 non-system 뷰로 접근이 제한됨"
 
-#: rewrite/rewriteHandler.c:2144 rewrite/rewriteHandler.c:4276
+#: rewrite/rewriteHandler.c:2130 rewrite/rewriteHandler.c:4265
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr ""
 "\"%s\" 릴레이션(relation)에서 지정된 룰에서 잘못된 재귀호출이 발견되었습니다"
 
-#: rewrite/rewriteHandler.c:2249
+#: rewrite/rewriteHandler.c:2235
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "\"%s\" 릴레이션의 정책에서 무한 재귀 호출이 발견 됨"
 
-#: rewrite/rewriteHandler.c:2611
+#: rewrite/rewriteHandler.c:2598
 msgid "Junk view columns are not updatable."
 msgstr "정크 뷰 칼럼은 업데이트할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2616
+#: rewrite/rewriteHandler.c:2603
 msgid ""
 "View columns that are not columns of their base relation are not updatable."
 msgstr ""
 "뷰의 바탕이 되는 릴레이션의 칼럼이 아닌 뷰 칼럼은 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2619
+#: rewrite/rewriteHandler.c:2606
 msgid "View columns that refer to system columns are not updatable."
 msgstr "시스템 칼럼이 원본인 뷰 칼럼은 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2622
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that return whole-row references are not updatable."
 msgstr "로우 전체를 참조하는 뷰 칼럼은 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2683
+#: rewrite/rewriteHandler.c:2670
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "DISTINCT 조건이 있는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2686
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "GROUP BY 절이 있는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2689
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "HAVING 절이 있는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2692
+#: rewrite/rewriteHandler.c:2679
 msgid ""
 "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr ""
 "UNION, INTERSECT, EXCEPT를 포함하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2695
+#: rewrite/rewriteHandler.c:2682
 msgid "Views containing WITH are not automatically updatable."
 msgstr "WITH 절을 포함하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2698
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr ""
 "LIMIT 또는 OFFSET 구문을 포함하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2710
+#: rewrite/rewriteHandler.c:2697
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "집계 함수를 반환하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2713
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return window functions are not automatically updatable."
 msgstr "윈도우 함수를 반환하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2716
+#: rewrite/rewriteHandler.c:2703
 msgid ""
 "Views that return set-returning functions are not automatically updatable."
 msgstr "집합 반환 함수를 반환하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2723 rewrite/rewriteHandler.c:2727
-#: rewrite/rewriteHandler.c:2735
+#: rewrite/rewriteHandler.c:2710 rewrite/rewriteHandler.c:2714
+#: rewrite/rewriteHandler.c:2722
 msgid ""
 "Views that do not select from a single table or view are not automatically "
 "updatable."
@@ -23774,20 +24746,20 @@ msgstr ""
 "단일 테이블 또는 단일 뷰를 SELECT 하지 않는 뷰는 자동으로 업데이트 될 수 없습"
 "니다."
 
-#: rewrite/rewriteHandler.c:2738
+#: rewrite/rewriteHandler.c:2725
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "TABLESAMPLE 구문을 포함하는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:2762
+#: rewrite/rewriteHandler.c:2749
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "업데이트 가능한 칼럼이 없는 뷰는 자동으로 업데이트 될 수 없습니다."
 
-#: rewrite/rewriteHandler.c:3143 rewrite/rewriteHandler.c:3178
+#: rewrite/rewriteHandler.c:3130 rewrite/rewriteHandler.c:3165
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "\"%s\" 뷰에 자료를 입력할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:3146
+#: rewrite/rewriteHandler.c:3133
 #, c-format
 msgid ""
 "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or "
@@ -23796,12 +24768,12 @@ msgstr ""
 "뷰를 통해 자료를 입력하려면, INSTEAD OF INSERT 트리거나 ON INSERT DO INSTEAD "
 "룰을 사용하세요"
 
-#: rewrite/rewriteHandler.c:3151 rewrite/rewriteHandler.c:3187
+#: rewrite/rewriteHandler.c:3138 rewrite/rewriteHandler.c:3174
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "\"%s\" 뷰로는 자료를 갱신할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:3154
+#: rewrite/rewriteHandler.c:3141
 #, c-format
 msgid ""
 "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an "
@@ -23810,12 +24782,12 @@ msgstr ""
 "뷰 자료 갱신 기능은 INSTEAD OF UPDATE 트리거를 사용하거나, ON UPDATE DO "
 "INSTEAD 속성으로 룰을 만들어서 사용해 보세요."
 
-#: rewrite/rewriteHandler.c:3159 rewrite/rewriteHandler.c:3196
+#: rewrite/rewriteHandler.c:3146 rewrite/rewriteHandler.c:3183
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "\"%s\" 뷰로는 자료를 삭제할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:3162
+#: rewrite/rewriteHandler.c:3149
 #, c-format
 msgid ""
 "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an "
@@ -23824,72 +24796,74 @@ msgstr ""
 "뷰 자료 삭제 기능은 INSTEAD OF DELETE 트리거를 사용하거나, ON DELETE DO "
 "INSTEAD 속성으로 룰을 만들어서 사용해 보세요."
 
-#: rewrite/rewriteHandler.c:3181
+#: rewrite/rewriteHandler.c:3168
 #, c-format
 msgid ""
 "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT "
 "trigger."
-msgstr "뷰를 통해 자료를 입력하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
+msgstr ""
+"뷰를 통해 자료를 입력하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
 
-#: rewrite/rewriteHandler.c:3190
+#: rewrite/rewriteHandler.c:3177
 #, c-format
 msgid ""
 "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE "
 "trigger."
-msgstr "뷰를 통해 자료를 변경하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
+msgstr ""
+"뷰를 통해 자료를 변경하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
 
-#: rewrite/rewriteHandler.c:3199
+#: rewrite/rewriteHandler.c:3186
 #, c-format
 msgid ""
 "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE "
 "trigger."
-msgstr "뷰를 통해 자료를 삭제하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
+msgstr ""
+"뷰를 통해 자료를 삭제하려면, MERGE나 INSTEAD OF INSERT 트리거를 사용하세요"
 
-#: rewrite/rewriteHandler.c:3374
+#: rewrite/rewriteHandler.c:3361
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "\"%s\" 칼럼 (해당 뷰: \"%s\")에 자료를 입력할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:3382
+#: rewrite/rewriteHandler.c:3369
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "\"%s\" 칼럼 (해당 뷰: \"%s\")에 자료를 갱신할 수 없습니다"
 
-#: rewrite/rewriteHandler.c:3390
+#: rewrite/rewriteHandler.c:3377
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "\"%s\" 칼럼 (해당 뷰: \"%s\")에 병합할 수 없음"
 
-#: rewrite/rewriteHandler.c:3418
+#: rewrite/rewriteHandler.c:3405
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "\"%s\" 뷰에 병합할 수 없음"
 
-#: rewrite/rewriteHandler.c:3420
+#: rewrite/rewriteHandler.c:3407
 #, c-format
 msgid ""
 "MERGE is not supported for views with INSTEAD OF triggers for some actions "
 "but not all."
-msgstr ""
-"MERGE 명령은 몇몇 action용 INSTEAD OF 트리거가 있는 뷰를 지원하지 않음"
+msgstr "MERGE 명령은 몇몇 action용 INSTEAD OF 트리거가 있는 뷰를 지원하지 않음"
 
-#: rewrite/rewriteHandler.c:3421
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid ""
 "To enable merging into the view, either provide a full set of INSTEAD OF "
 "triggers or drop the existing INSTEAD OF triggers."
 msgstr ""
-"뷰에 병합을 활성화하려면 INSTEAD OF 트리거의 전체 세트를 제공하거나 "
-"기존 INSTEAD OF 트리거를 삭제하세요"
+"뷰에 병합을 활성화하려면 INSTEAD OF 트리거의 전체 세트를 제공하거나 기존 "
+"INSTEAD OF 트리거를 삭제하세요"
 
-#: rewrite/rewriteHandler.c:3934
+#: rewrite/rewriteHandler.c:3923
 #, c-format
 msgid ""
 "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in "
 "WITH"
 msgstr "DO INSTEAD NOTIFY 룰에서는 WITH 절 안에 자료 변경 구문이 없어야 합니다"
 
-#: rewrite/rewriteHandler.c:3945
+#: rewrite/rewriteHandler.c:3934
 #, c-format
 msgid ""
 "DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
@@ -23897,19 +24871,19 @@ msgid ""
 msgstr ""
 "DO INSTEAD NOTHING 룰에서는 WITH 절 안에 자료 변경 구문이 없어야 합니다"
 
-#: rewrite/rewriteHandler.c:3959
+#: rewrite/rewriteHandler.c:3948
 #, c-format
 msgid ""
 "conditional DO INSTEAD rules are not supported for data-modifying statements "
 "in WITH"
 msgstr "선택적 DO INSTEAD 룰에서는 WITH 절 안에 자료 변경 구문이 없어야 합니다"
 
-#: rewrite/rewriteHandler.c:3963
+#: rewrite/rewriteHandler.c:3952
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "DO ALSO 룰에서는 WITH 절 안에 자료 변경 구문이 없어야 합니다"
 
-#: rewrite/rewriteHandler.c:3968
+#: rewrite/rewriteHandler.c:3957
 #, c-format
 msgid ""
 "multi-statement DO INSTEAD rules are not supported for data-modifying "
@@ -23918,18 +24892,18 @@ msgstr ""
 "여러 구문으로 구성된 DO INSTEAD 룰에서는 WITH 절 안에 자료 변경 구문이 없어"
 "야 합니다"
 
-#: rewrite/rewriteHandler.c:4228
+#: rewrite/rewriteHandler.c:4217
 msgid ""
 "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr ""
 "선택적 DO INSTEAD 룰을 포함한 뷰는 자동 업데이트 기능을 사용할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:4325
+#: rewrite/rewriteHandler.c:4314
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 INSERT RETURNING 관련을 구성할 수 없음"
 
-#: rewrite/rewriteHandler.c:4327
+#: rewrite/rewriteHandler.c:4316
 #, c-format
 msgid ""
 "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
@@ -23937,12 +24911,12 @@ msgstr ""
 "RETURNING 절에서는 무조건 ON INSERT DO INSTEAD 속성으로 rule이 사용되어야 합"
 "니다."
 
-#: rewrite/rewriteHandler.c:4332
+#: rewrite/rewriteHandler.c:4321
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 UPDATE RETURNING 관련을 구성할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:4334
+#: rewrite/rewriteHandler.c:4323
 #, c-format
 msgid ""
 "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
@@ -23950,12 +24924,12 @@ msgstr ""
 "RETURNING 절에서는 무조건 ON UPDATE DO INSTEAD 속성으로 rule이 사용되어야 합"
 "니다."
 
-#: rewrite/rewriteHandler.c:4339
+#: rewrite/rewriteHandler.c:4328
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "\"%s\" 릴레이션에서 DELETE RETURNING 관련을 구성할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:4341
+#: rewrite/rewriteHandler.c:4330
 #, c-format
 msgid ""
 "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
@@ -23963,7 +24937,7 @@ msgstr ""
 "TURNING 절에서는 무조건 ON DELETE DO INSTEAD 속성으로 rule이 사용되어야 합니"
 "다"
 
-#: rewrite/rewriteHandler.c:4359
+#: rewrite/rewriteHandler.c:4348
 #, c-format
 msgid ""
 "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or "
@@ -23972,7 +24946,7 @@ msgstr ""
 "INSERT 또는 UPDATE 룰이 지정된 테이블을 대상으로 INSERT ... ON CONFLICT 구문"
 "은 사용할 수 없습니다."
 
-#: rewrite/rewriteHandler.c:4416
+#: rewrite/rewriteHandler.c:4405
 #, c-format
 msgid ""
 "WITH cannot be used in a query that is rewritten by rules into multiple "
@@ -23981,19 +24955,19 @@ msgstr ""
 "WITH 절은 다중 쿼리 작업을 하는 룰로 재작성되는 쿼리 안에서는 사용할 수 없습"
 "니다."
 
-#: rewrite/rewriteManip.c:1083
+#: rewrite/rewriteManip.c:1178
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr ""
 "조건 유틸리티 명령 구문(conditional utility statement)은 구현되어있지 않습니"
 "다"
 
-#: rewrite/rewriteManip.c:1430
+#: rewrite/rewriteManip.c:1523
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "뷰에 대한 WHERE CURRENT OF 구문이 구현되지 않음"
 
-#: rewrite/rewriteManip.c:1765
+#: rewrite/rewriteManip.c:1926
 #, c-format
 msgid ""
 "NEW variables in ON UPDATE rules cannot reference columns that are part of a "
@@ -24011,33 +24985,90 @@ msgstr ""
 "재귀 호출을 이용하는 \"%s\" WITH 쿼리를 SEARCH 또는 CYCLE 절과 함께 쓸 때는 "
 "오른편 SELECT는 최상위 수준이어야 합니다."
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr "\"%s\" 언어 및 \"%s\" 인코딩에 사용 가능한 Snowball stemmer가 없음"
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "StopWords 매개 변수가 여러 개 있음"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "여러 개의 언어 매개 변수가 있음"
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "인식할 수 없는 Snowball 매개 변수: \"%s\""
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "Language 매개 변수가 누락됨"
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:935
+#: statistics/relation_stats.c:98
+#, c-format
+msgid "Statistics cannot be modified during recovery."
+msgstr "통계 정보는 복구 중에는 변경될 수 없습니다."
+
+#: statistics/attribute_stats.c:202
+#, c-format
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "%s, %s 함께 지정할 수 없음"
+
+#: statistics/attribute_stats.c:228
+#, c-format
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "%s, %s 둘 중 하나만 지정해야 함"
+
+#: statistics/attribute_stats.c:236
+#, c-format
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "시스템 열 \"%s\"에 대한 통계 정보는 변경할 수 없음"
+
+#: statistics/attribute_stats.c:300
+#, c-format
+msgid "could not determine element type of column \"%s\""
+msgstr "\"%s\" 칼럼의 자료형을 알수가 없음"
+
+#: statistics/attribute_stats.c:301 statistics/attribute_stats.c:318
+#: statistics/attribute_stats.c:333
+#, c-format
+msgid "Cannot set %s or %s."
+msgstr "%s 또는 %s 로 설정할 수 없습니다."
+
+#: statistics/attribute_stats.c:317
+#, c-format
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "\"%s\" 칼럼용 작다 연산자를 결정할 수 없음"
+
+#: statistics/attribute_stats.c:332
+#, c-format
+msgid "column \"%s\" is not a range type"
+msgstr "\"%s\" 칼럼은 범위 자료형이 아님"
+
+#: statistics/attribute_stats.c:735
+#, c-format
+msgid "\"%s\" array must not contain null values"
+msgstr "\"%s\" 배열에는 null 값을 포함할 수 없습니다"
+
+#: statistics/attribute_stats.c:778
+#, c-format
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "통계 슬롯 수가 최대치를 초과함: %d"
+
+#: statistics/attribute_stats.c:945
+#, c-format
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "시스템 칼럼 \"%s\"의 통계 정보는 지울 수 없음"
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid ""
 "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
@@ -24049,60 +25080,229 @@ msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr "반환 자료형이 record인데 함수가 그 자료형으로 반환하지 않음"
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:115
 #, c-format
-msgid "cannot access temporary tables of other sessions"
-msgstr "다른 세션의 임시 테이블에 액세스할 수 없음"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "%s 의 인자는 -1.0 이상 커야 함"
+
+#: statistics/stat_utils.c:44
+#, c-format
+msgid "argument \"%s\" must not be null"
+msgstr "\"%s\" 인자는 null이면 안됨"
+
+#: statistics/stat_utils.c:71
+#, c-format
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "\"%s\" 인자는 1차원 배열이어야 함"
+
+#: statistics/stat_utils.c:80
+#, c-format
+msgid "argument \"%s\" array must not contain null values"
+msgstr "\"%s\" 인자의 배열에는 null 값을 포함할 수 없습니다"
+
+#: statistics/stat_utils.c:111
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "\"%s\" 인자 지정이 필요함, \"%s\" 인자를 지정했기 때문"
+
+#: statistics/stat_utils.c:178
+#, c-format
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "\"%s\" 릴레이션용 통계정보를 바꿀 수 없음"
+
+#: statistics/stat_utils.c:199
+#, c-format
+msgid "cannot modify statistics for shared relation"
+msgstr "공용 릴레이션 통계정보를 바꿀 수 없음"
 
-#: storage/buffer/bufmgr.c:1532
+#: statistics/stat_utils.c:252
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
+msgid "unrecognized argument name: \"%s\""
+msgstr "알 수 없는 인자 이름: \"%s\""
+
+#: statistics/stat_utils.c:266
+#, c-format
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "\"%s\" 인자는 %s 자료형임(기대 자료형: %s)"
+
+#: statistics/stat_utils.c:307
+#, c-format
+msgid "variadic arguments must be name/value pairs"
+msgstr "가변 인자는 이름/값 쌍으로 지정해야 함"
+
+#: statistics/stat_utils.c:308
+#, c-format
+msgid ""
+"Provide an even number of variadic arguments that can be divided into pairs."
+msgstr "짝수로 나눠지도록 짝지어 지정해 주세요."
+
+#: statistics/stat_utils.c:322
+#, c-format
+msgid "name at variadic position %d is null"
+msgstr "%d 번째 가변 인자 이름이 없음"
+
+#: statistics/stat_utils.c:326
+#, c-format
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "%d 번째 가변 인자의 자료형이 %s임, 기대 자료형: %s"
+
+#: storage/aio/aio.c:1340
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "-1 또는 0보다 큰값을 지정하세요."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
 msgstr ""
-"%u 블록(해당 릴레이션: %s)에 잘못된 페이지 헤더가 있음, 페이지를 삭제하는 중"
+"io_uring 기능이 비활성화 되었다면, /proc/sys/kernel/io_uring_disabled 설정을 "
+"살펴보세요."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "\"ulimit -n\" 설정으로 %d 보다 큰 값을 지정하세요."
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
+msgstr "이 커널은 io_uring 기능을 지원하지 않습니다."
+
+#: storage/aio/method_io_uring.c:388
+#, c-format
+msgid "could not setup io_uring queue: %m"
+msgstr "io_uring 큐를 설정할 수 없음: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "%d 프로세스 대신해서 I/O 작업을 완료 하는 중"
+
+#: storage/aio/method_worker.c:382
+#, c-format
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "%d 프로세스를 대신해서 I/O 작업자가 I/O 작업을 하는 중"
+
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
+#, c-format
+msgid "cannot access temporary tables of other sessions"
+msgstr "다른 세션의 임시 테이블에 액세스할 수 없음"
+
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "%s 릴레이션은 %u개 블록을 초과하여 확장할 수 없음"
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "%u 블록(해당 릴레이션: %s)에 EOF 범위를 넘는 예기치 않은 데이터가 있음"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr ""
+"%u 블록(해당 릴레이션: \"%s\")에 EOF 범위를 넘는 예기치 않은 데이터가 있음"
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid ""
 "This has been seen to occur with buggy kernels; consider updating your "
 "system."
 msgstr "이 문제는 커널의 문제로 알려졌습니다. 시스템을 업데이트하십시오."
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "%u/%s 블록을 쓸 수 없음"
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "여러 번 실패 --- 쓰기 오류가 영구적일 수 있습니다."
 
-#: storage/buffer/bufmgr.c:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
+#, c-format
+msgid "writing block %u of relation \"%s\""
+msgstr "%u 블록(해당 릴레이션: \"%s\")을 쓰는 중"
+
+#: storage/buffer/bufmgr.c:7313
+#, c-format
+msgid ""
+"zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u "
+"of relation \"%s\""
+msgstr ""
+"%u개의 페이지를 비우고, %u개는 체크섬 실패로 무시함, 대상 블록: %u..%u, 대상 릴레이션: \"%s\""
+
+#: storage/buffer/bufmgr.c:7316 storage/buffer/bufmgr.c:7344
+#, c-format
+msgid "Block %u held the first zeroed page."
+msgstr "첫번째로 비운 페이지는 %u 블록입니다."
+
+#: storage/buffer/bufmgr.c:7318
+#, c-format
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "나머지 %d 개의 잘못된 블록 정보는 서버 로그를 참조하십시오."
+
+#: storage/buffer/bufmgr.c:7335
+#, c-format
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr ""
+"%u개의 잘못된 페이지가 있음: 해당 블록 범위: %u..%u, 해당 릴레이션: \"%s\""
+
+#: storage/buffer/bufmgr.c:7336
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr "%u 번째 블록이 잘못된 페이지 가운데 첫페이지입니다."
+
+#: storage/buffer/bufmgr.c:7337
+#, c-format
+msgid "See server log for the other %u invalid block(s)."
+msgstr "나머지 %u 개의 잘못된 블록 정보는 서버 로그를 참조하세요."
+
+#: storage/buffer/bufmgr.c:7342
+#, c-format
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr ""
+"%u 블록(해당 릴레이션: \"%s\")에 잘못된 페이지가 있음, 페이지를 삭제하는 중"
+
+#: storage/buffer/bufmgr.c:7343
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "%u 블록(해당 릴레이션: %s)을 쓰는 중"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr ""
+"%u개의 잘못된 페이지를 삭제 중, 해당 블록 범위: %u..%u, 해당 릴레이션: \"%s\""
+
+#: storage/buffer/bufmgr.c:7345
+#, c-format
+msgid "See server log for the other %u zeroed block(s)."
+msgstr "나머지 %u 개의 삭제 처리한 블록에 대한 것은 서버 로그를 참조하세요."
+
+#: storage/buffer/bufmgr.c:7350
+#, c-format
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "%u 블록(해당 릴레이션: \"%s\")에 잘못된 체크섬을 무시 하는 중"
+
+#: storage/buffer/bufmgr.c:7351
+#, c-format
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr ""
+"%u개의 체크섬 무시를 하는 중, 해당 블록 범위: %u..%u, 해당 릴레이션: \"%s\""
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/bufmgr.c:7352
+#, c-format
+msgid "Block %u held the first ignored page."
+msgstr "무시한 페이지의 첫번째는 %u 블록입니다."
+
+#: storage/buffer/bufmgr.c:7353
+#, c-format
+msgid "See server log for the other %u ignored block(s)."
+msgstr "나머지 %u 블록 무시에 대한 것은 서버 로그를 참조하세요."
+
+#: storage/buffer/localbuf.c:272
 #, c-format
 msgid "no empty local buffer available"
 msgstr "비어 있는 로컬 버퍼가 없습니다"
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/localbuf.c:736
 #, c-format
 msgid "cannot access temporary tables during a parallel operation"
 msgstr "병렬 작업 중에 임시 테이블에 액세스할 수 없음"
 
-#: storage/buffer/localbuf.c:712
+#: storage/buffer/localbuf.c:876
 #, c-format
 msgid ""
 "\"temp_buffers\" cannot be changed after any temporary tables have been "
@@ -24126,43 +25326,48 @@ msgstr "\"%s\" 파일 세트를 읽을 수 없음: %zu 바이트만 읽음 (전
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "임시 파일을 읽을 수 없음: %zu 바이트만 읽음 (전체: %zu)"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid ""
 "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "\"%s\" 임시 파일의 크기를 알 수 없음, 버퍼파일: \"%s\": %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "\"%s\" 파일 세트를 지울 수 없음: %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1194
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1318
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "\"%s\" 파일을 비울 수 없음: %m"
 
-#: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, c-format
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "\"%s\" 파일을 \"%s\" 파일로 clone 작업을 할 수 없음: %m"
+
+#: storage/file/fd.c:580 storage/file/fd.c:652 storage/file/fd.c:688
 #, c-format
 msgid "could not flush dirty data: %m"
 msgstr "dirty 자료를 flush 할 수 없음: %m"
 
-#: storage/file/fd.c:613
+#: storage/file/fd.c:610
 #, c-format
 msgid "could not determine dirty data size: %m"
 msgstr "dirty 자료 크기를 확인할 수 없음: %m"
 
-#: storage/file/fd.c:665
+#: storage/file/fd.c:662
 #, c-format
 msgid "could not munmap() while flushing data: %m"
 msgstr "자료 flush 작업 도중 munmap() 호출 실패: %m"
 
-#: storage/file/fd.c:983
+#: storage/file/fd.c:980
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit 실패: %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1071
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr ""
@@ -24170,86 +25375,86 @@ msgstr ""
 "그램에서 너무 많은 파일을 열어 두고 있습니다. 다른 프로그램들을 좀 닫고 다시 "
 "시도해 보십시오"
 
-#: storage/file/fd.c:1074
+#: storage/file/fd.c:1072
 #, c-format
-msgid "System allows %d, server needs at least %d."
-msgstr "시스템 허용치 %d, 서버 최소 허용치 %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
+msgstr "시스템 허용치 %d, 서버 최소 허용치 %d, 현재 열려 있는 파일 수 %d"
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1161 storage/file/fd.c:2676 storage/file/fd.c:2785
+#: storage/file/fd.c:2939
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr ""
 "열려 있는 파일이 너무 많습니다: %m; 다른 프로그램들을 좀 닫고 다시 시도해 보"
 "십시오"
 
-#: storage/file/fd.c:1536
+#: storage/file/fd.c:1537
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "임시 파일: 경로 \"%s\", 크기 %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1676
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "\"%s\" 임시 디렉터리를 만들 수 없음: %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1683
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "\"%s\" 임시 하위 디렉터리를 만들 수 없음: %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1880
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "\"%s\" 임시 파일을 만들 수 없습니다: %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1916
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "\"%s\" 임시 파일을 열 수 없음: %m"
 
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1957
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "\"%s\" 임시 파일을 지울 수 없음: %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2047
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "\"%s\" 파일을 지울 수 없음: %m"
 
-#: storage/file/fd.c:2234
+#: storage/file/fd.c:2286
 #, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
-msgstr "임시 파일 크기가 temp_file_limit (%dkB)를 초과했습니다"
+msgid "temporary file size exceeds \"temp_file_limit\" (%dkB)"
+msgstr "임시 파일 크기가 \"temp_file_limit\" (%dkB)를 초과했습니다"
 
-#: storage/file/fd.c:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2652 storage/file/fd.c:2711
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "maxAllocatedDescs (%d) 초과됨, \"%s\" 파일 열기 시도 중에."
 
-#: storage/file/fd.c:2698
+#: storage/file/fd.c:2756
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "maxAllocatedDescs (%d) 초과됨, \"%s\" 명령을 시도 중에."
 
-#: storage/file/fd.c:2854
+#: storage/file/fd.c:2915
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "maxAllocatedDescs (%d) 초과됨, \"%s\" 디렉터리 열기 시도 중에."
 
-#: storage/file/fd.c:3384
+#: storage/file/fd.c:3446
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "임시 디렉터리에서 예상치 못한 파일 발견: \"%s\""
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3564
 #, c-format
 msgid ""
 "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
 msgstr "데이터 디렉터리 동기화(syncfs), 소요 시간: %ld.%02d s, 현재 경로: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3791
 #, c-format
 msgid ""
 "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: "
@@ -24257,40 +25462,37 @@ msgid ""
 msgstr ""
 "데이터 디렉터리 동기화(pre-fsync), 소요 시간: %ld.%02d s, 현재 경로: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3823
 #, c-format
 msgid ""
 "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "데이터 디렉터리 동기화(fsync), 소요 시간: %ld.%02d s, 현재 경로: %s"
 
-#: storage/file/fd.c:3950
+#: storage/file/fd.c:4012
 #, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr "\"debug_io_direct\" 설정은 이 플랫폼에서 지원되지 않음"
+msgid "\"%s\" is not supported on this platform."
+msgstr "이 플랫폼에서는 \"%s\" 기능을 지원하지 않습니다."
 
-#: storage/file/fd.c:3964
+#: storage/file/fd.c:4027 tcop/backend_startup.c:1080
 #, c-format
-msgid "Invalid list syntax in parameter \"%s\""
-msgstr "\"%s\" 매개 변수의 값으로 목록 문법이 잘못됨"
+msgid "Invalid list syntax in parameter \"%s\"."
+msgstr "\"%s\" 매개 변수의 값으로 목록 문법이 잘못되었습니다."
 
-#: storage/file/fd.c:3984
+#: storage/file/fd.c:4047 tcop/backend_startup.c:1054
 #, c-format
-msgid "Invalid option \"%s\""
-msgstr "\"%s\" 옵션이 잘못됨"
+msgid "Invalid option \"%s\"."
+msgstr "\"%s\" 옵션이 잘못되었습니다."
 
-#: storage/file/fd.c:3997
+#: storage/file/fd.c:4060
 #, c-format
-msgid ""
-"\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
-msgstr ""
-"XLOG_BLCKSZ 값이 너무 작은 WAL을 사용하고 있어 \"debug_io_direct\" 기능을 지원하"
-"지 않습니다."
+msgid "\"%s\" is not supported for WAL because %s is too small."
+msgstr "WAL을 위한 \"%s\" 설정을 지원하지 않습니다, 이유: %s 값이 너무 적음."
 
-#: storage/file/fd.c:4004
+#: storage/file/fd.c:4068
 #, c-format
-msgid ""
-"\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
-msgstr "BLCKSZ 값이 너무 작아 \"debug_io_direct\" 기능을 지원하지 않습니다."
+msgid "\"%s\" is not supported for data because %s is too small."
+msgstr ""
+"데이터를 위한 \"%s\" 설정은 지원하지 않습니다, 이유: %s 값이 너무 적음."
 
 #: storage/file/reinit.c:145
 #, c-format
@@ -24403,24 +25605,25 @@ msgstr "DSM 조각 크기는 0이 아니여야 함"
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr "요청된 DSM 조각 크기는 기존 조각 크기와 맞지 않음"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:357
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "최대 동시 접속자 수를 초과했습니다."
 
-#: storage/ipc/procarray.c:3857
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "\"%s\" 데이터베이스가 미리 준비된 트랜잭션에서 사용중임"
 
-#: storage/ipc/procarray.c:3893 storage/ipc/procarray.c:3901
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "프로세스 종료 권한 없음"
 
-#: storage/ipc/procarray.c:3894 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid ""
 "Only roles with the %s attribute may terminate processes of roles with the "
@@ -24428,19 +25631,34 @@ msgid ""
 msgstr ""
 "%s 속성이 있는 롤만이 %s 속성을 가진 롤이 실행한 쿼리를 중지 할 수 있습니다."
 
-#: storage/ipc/procarray.c:3902 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid ""
 "Only roles with privileges of the role whose process is being terminated or "
 "with privileges of the \"%s\" role may terminate this process."
 msgstr "\"%s\" 롤 권한이 있는 롤만 프로세스를 종료할 수 있습니다."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr ""
 "%d PID 백엔드 프로세스가 ProcSignalBarrier 작업을 수락하기를 기다리고 있음"
 
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "PID 0에 잘못된 작업 취소 요청"
+
+#: storage/ipc/procsignal.c:788
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "프로세스 %d에 대한 취소 요청에 잘못된 키가 있음"
+
+#: storage/ipc/procsignal.c:797
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "취소 요청의 PID %d과(와) 일치하는 프로세스가 없음"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -24451,12 +25669,12 @@ msgstr "공유 메모리 큐를 통해 %zu 크기의 메시지를 보낼 수 없
 msgid "invalid message size %zu in shared memory queue"
 msgstr "동적 공유 메모리 큐에 메시지 길이(%zu)가 잘못됨"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:984
-#: storage/lmgr/lock.c:1022 storage/lmgr/lock.c:2835 storage/lmgr/lock.c:4220
-#: storage/lmgr/lock.c:4285 storage/lmgr/lock.c:4635
-#: storage/lmgr/predicate.c:2468 storage/lmgr/predicate.c:2483
-#: storage/lmgr/predicate.c:3880 storage/lmgr/predicate.c:4927
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "공유 메모리 부족"
@@ -24490,23 +25708,24 @@ msgstr "\"%s\" 자료 구조체용 공유 메모리가 부족함 (%zu 바이트
 msgid "requested shared memory size overflows size_t"
 msgstr "지정한 공유 메모리 사이즈가 size_t 크기를 초과했습니다"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d 프로그램은 PostgreSQL 백엔드 프로세스가 아닙니다"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1453
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "%d 프로세스로 시스템신호(signal)를 보낼 수 없습니다: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "쿼리 중지 권한 없음"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid ""
 "Only roles with the %s attribute may cancel queries of roles with the %s "
@@ -24514,250 +25733,266 @@ msgid ""
 msgstr ""
 "%s 속성이 있는 롤만이 %s 속성이 있는 롤이 실행한 쿼리를 중지 할 수 있습니다."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid ""
+"Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr "autovacuum 작업자의 작업을 취소하려면, \"%s\" 롤 소속원이어야 합니다."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid ""
 "Only roles with privileges of the role whose query is being canceled or with "
 "privileges of the \"%s\" role may cancel this query."
 msgstr "쿼리 실행 중지 작업은 \"%s\" 롤 권한이 부여된 롤만 할 수 있습니다."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr "%d PID 백엔드 프로세스의 존재를 확인할 수 없음: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "%d PID 백엔드 프로세스를 %lld ms 내에 종료하지 못했음"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural ""
+"backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "%d PID 백엔드 프로세스를 %<PRId64> ms 내에 종료하지 못했음"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "\"timeout\" 값은 음수가 아니어야 함"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid ""
+"Only roles with privileges of the \"%s\" role may terminate autovacuum "
+"workers."
+msgstr ""
+"autovacuum 작업자의 작업을 끝내려면, \"%s\" 롤 권한이 있는 롤만 할 수 있습니"
+"다."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "로그 수집이 활성 상태가 아니므로 회전할 수 없음"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "%ld.%03d ms 기다린 뒤에도 여전히 복구 중: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "%ld.%03d ms 기다려서 복구 완료: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3196
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "복구 작업 중 충돌이 발생해 작업을 중지합니다."
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:2557
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "복구 작업 중 사용자 트랜잭션이 버퍼 데드락을 만들었습니다."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "알 수 없는 이유"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "버퍼 핀에서 복구 충돌"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "잠금에서 복구 충돌"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "테이블스페이스에서 복구 충돌"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "스냅샷에서 복구 충돌"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "복제 슬롯에서 복구 충돌"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "버퍼 데드락에서 복구 충돌"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "데이터베이스에서 복구 충돌"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr ""
 "OID %u (해당 페이지 %d) 를 위한 pg_largeobject 항목의 %d 크기의 데이터 필드"
 "가 잘못되었음"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "대형 개체를 열기 위한 플래그가 잘못 됨: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "%u 대형 개체에 대한 접근 권한 없음"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "잘못된 이동 위치: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "유효하지 않은 대형 개체의 쓰기 요청된 크기: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr ""
 "%d 프로세스가 %s 상태로 지연되고 있음(해당 작업: %s); %d 프로세스에 의해 블록"
 "킹되었음"
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "프로세스 %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "deadlock 발생했음"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "쿼리 상세 정보는 서버 로그를 참조하십시오."
 
-#: storage/lmgr/lmgr.c:848
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 튜플(해당 릴레이션 \"%s\")을 갱신하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:851
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 튜플(해당 릴레이션 \"%s\")을 삭제하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:854
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 튜플을 \"%s\" 릴레이션에서 잠그는 중에 발생"
 
-#: storage/lmgr/lmgr.c:857
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "%u,%u 업데이트된 버전 튜플(해당 릴레이션 \"%s\")을 잠그는 중에 발생"
 
-#: storage/lmgr/lmgr.c:860
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 튜플 인덱스(해당 릴레이션 \"%s\")를 삽입하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:863
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 튜플(해당 릴레이션: \"%s\")의 고유성을 검사하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:866
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "%u,%u 갱신된 튜플(해당 릴레이션: \"%s\")을 재확인하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:869
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr ""
 "%u,%u 튜플(해당 릴레이션: \"%s\")의 제외 제약 조건을 검사하는 중에 발생"
 
-#: storage/lmgr/lmgr.c:1239
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "릴레이션 %u, 데이터베이스 %u"
 
-#: storage/lmgr/lmgr.c:1245
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "%u 관계(%u 데이터베이스) 확장"
 
-#: storage/lmgr/lmgr.c:1251
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "데이터베이스 %u의 pg_database.datfrozenxid"
 
-#: storage/lmgr/lmgr.c:1256
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "페이지 %u, 릴레이션 %u, 데이터베이스 %u"
 
-#: storage/lmgr/lmgr.c:1263
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "튜플 (%u,%u), 릴레이션 %u, 데이터베이스 %u"
 
-#: storage/lmgr/lmgr.c:1271
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "트랜잭션 %u"
 
-#: storage/lmgr/lmgr.c:1276
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "가상 트랜잭션 %d/%u"
 
-#: storage/lmgr/lmgr.c:1282
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "%u 위험한 토큰, 대상 트랜잭션 %u"
 
-#: storage/lmgr/lmgr.c:1288
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "개체 %u, 클래스 %u, 데이터베이스 %u"
 
-#: storage/lmgr/lmgr.c:1296
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "user lock [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1303
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "advisory lock [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1311
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "원격 트랜잭션: %u, 해당 구독: %u, 해당 데이터베이스 %u"
 
-#: storage/lmgr/lmgr.c:1318
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "알 수 없는 locktag 형태 %d"
 
-#: storage/lmgr/lock.c:812
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid ""
 "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "복구 작업 중 데이터베이스 객체 대상 %s 잠금 상태 취득 실패"
 
-#: storage/lmgr/lock.c:814
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid ""
 "Only RowExclusiveLock or less can be acquired on database objects during "
@@ -24766,7 +26001,12 @@ msgstr ""
 "복구 중에는 해당 객체를 RowExclusiveLock 또는 그 보다 낮은 수준의 잠금만 할 "
 "수 있습니다."
 
-#: storage/lmgr/lock.c:3284 storage/lmgr/lock.c:3352 storage/lmgr/lock.c:3468
+#: storage/lmgr/lock.c:1185
+#, c-format
+msgid "process %d could not obtain %s on %s"
+msgstr "%d 프로세스가 %s 모드를 획득할 수 없었음, 해당 데이터: %s"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid ""
 "cannot PREPARE while holding both session-level and transaction-level locks "
@@ -24785,7 +26025,8 @@ msgstr "읽기/쓰기 충돌을 기록하기 위한 RWConflictPool 안에 충분
 msgid ""
 "You might need to run fewer transactions at a time or increase "
 "\"max_connections\"."
-msgstr "동시 발생하는 트랜잭션 수를 줄이든가, \"max_connections\" 값을 늘리세요."
+msgstr ""
+"동시 발생하는 트랜잭션 수를 줄이든가, \"max_connections\" 값을 늘리세요."
 
 #: storage/lmgr/predicate.c:678
 #, c-format
@@ -24796,13 +26037,13 @@ msgstr ""
 "필수적인 읽기/쓰기 충돌을 기록하기 위한 RWConflictPool 안에 충분한 요소가 없"
 "음"
 
-#: storage/lmgr/predicate.c:1686
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr ""
 "\"default_transaction_isolation\" 설정값이 \"serializable\"로 지정되었습니다."
 
-#: storage/lmgr/predicate.c:1687
+#: storage/lmgr/predicate.c:1697
 #, c-format
 msgid ""
 "You can use \"SET default_transaction_isolation = 'repeatable read'\" to "
@@ -24811,50 +26052,50 @@ msgstr ""
 "이 기본값은 \"SET default_transaction_isolation = 'repeatable read'\" 명령으"
 "로 바꿀 수 있습니다."
 
-#: storage/lmgr/predicate.c:1738
+#: storage/lmgr/predicate.c:1748
 #, c-format
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr ""
 "스냅샷 가져오기 트랜잭션은 READ ONLY DEFERRABLE 속성이 아니여야 합니다."
 
-#: storage/lmgr/predicate.c:1817 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "요청한 스냅샷 가지오기 실패"
 
-#: storage/lmgr/predicate.c:1818 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "%d PID 소스 프로세스는 더이상 실행 중이지 않습니다."
 
-#: storage/lmgr/predicate.c:3991 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4060 storage/lmgr/predicate.c:4068
-#: storage/lmgr/predicate.c:4107 storage/lmgr/predicate.c:4337
-#: storage/lmgr/predicate.c:4656 storage/lmgr/predicate.c:4668
-#: storage/lmgr/predicate.c:4715 storage/lmgr/predicate.c:4751
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, c-format
 msgid ""
 "could not serialize access due to read/write dependencies among transactions"
 msgstr "트랜잭션간 읽기/쓰기 의존성 때문에 serialize 접근을 할 수 없음"
 
-#: storage/lmgr/predicate.c:3993 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4062 storage/lmgr/predicate.c:4070
-#: storage/lmgr/predicate.c:4109 storage/lmgr/predicate.c:4339
-#: storage/lmgr/predicate.c:4658 storage/lmgr/predicate.c:4670
-#: storage/lmgr/predicate.c:4717 storage/lmgr/predicate.c:4753
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "재시도하면 그 트랜잭션이 성공할 것입니다."
 
-#: storage/lmgr/proc.c:353
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid ""
-"number of requested standby connections exceeds \"max_wal_senders\" "
-"(currently %d)"
+"number of requested standby connections exceeds \"max_wal_senders"
+"\" (currently %d)"
 msgstr "대기 서버 연결 수가 \"max_wal_senders\" 설정값(현재 %d)을 초과했습니다"
 
-#: storage/lmgr/proc.c:1546
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid ""
 "process %d avoided deadlock for %s on %s by rearranging queue order after "
@@ -24863,211 +26104,244 @@ msgstr ""
 "%d PID 프로세스는 %s(%s)에 대해 교착 상태가 발생하지 않도록 %ld.%03dms 후에 "
 "대기열 순서를 다시 조정함"
 
-#: storage/lmgr/proc.c:1561
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid ""
 "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "%d PID 프로세스에서 %s(%s) 대기중 %ld.%03dms 후에 교착 상태를 감지함"
 
-#: storage/lmgr/proc.c:1570
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "%d PID 프로세스에서 여전히 %s(%s) 작업을 기다리고 있음(%ld.%03dms 후)"
 
-#: storage/lmgr/proc.c:1577
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "%d PID 프로세스가 %s(%s) 작업을 위해 잠금 취득함(%ld.%03dms 후)"
 
-#: storage/lmgr/proc.c:1594
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "프로세스 %d에서 %s(%s)을(를) 취득하지 못함(%ld.%03dms 후)"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "페이지 검사 실패, 계산된 체크섬은 %u, 기대값은 %u"
 
-#: storage/page/bufpage.c:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "손상된 페이지 위치: 하위값 = %u, 상위값 = %u, 특수값 = %u"
 
-#: storage/page/bufpage.c:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "손상된 줄 위치: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "손상된 아이템 길이: 전체 %u, 사용가능한 공간 %u"
 
-#: storage/page/bufpage.c:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "손상된 줄 위치: 오프셋 = %u, 크기 = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "\"%s\" 파일을 %u개 블록을 초과하여 확장할 수 없음"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:628
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "\"%s\" 파일을 확장할 수 없음: %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "\"%s\" 파일을 확장할 수 없음: %d/%d바이트만 %u 블록에 썼음"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:606
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "FileFallocate() 함수로 \"%s\" 파일을 확장할 수 없음: %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:899 storage/smgr/md.c:2047
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "%u..%u 블럭을 \"%s\" 파일에서 읽을 수 없음: %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:946 storage/smgr/md.c:2060
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "%u..%u 블럭을 \"%s\" 파일에서 읽을 수 없음: %zu / %zu 바이트만 읽음"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1023
+#, c-format
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "%u..%u 블럭을 \"%s\" 파일에서 읽을 수 없음: %m"
+
+#: storage/smgr/md.c:1119
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "%u..%u 블럭을 \"%s\" 파일에 쓸 수 없음: %m"
 
-#: storage/smgr/md.c:1165
+#: storage/smgr/md.c:1289
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "\"%s\" 파일을 %u 블럭으로 비울 수 없음: 현재 %u 블럭 뿐 임"
 
-#: storage/smgr/md.c:1220
+#: storage/smgr/md.c:1344
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "\"%s\" 파일을 %u 블럭으로 정리할 수 없음: %m"
 
-#: storage/smgr/md.c:1700
+#: storage/smgr/md.c:1832
 #, c-format
 msgid ""
 "could not open file \"%s\" (target block %u): previous segment is only %u "
 "blocks"
 msgstr "\"%s\" 파일을 열기 실패(대상 블록: %u): 이전 조각은 %u 블럭 뿐임"
 
-#: storage/smgr/md.c:1714
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "\"%s\" 파일을 열기 실패(대상 블록: %u): %m"
 
-#: tcop/backend_startup.c:85
+#: storage/smgr/smgr.c:1106
+#, c-format
+msgid "file \"%s\""
+msgstr "해당 파일: \"%s\""
+
+#: storage/smgr/smgr.c:1108
+#, c-format
+msgid "block %u in file \"%s\""
+msgstr "해당 블록: %u, 해당 파일: \"%s\""
+
+#: storage/smgr/smgr.c:1112
+#, c-format
+msgid "blocks %u..%u in file \"%s\""
+msgstr "해당 블록: %u..%u, 해당 파일: \"%s\""
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "하위 프로세스에서 SSL 환경 설정을 못했음"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "접속 수락: host=%s port=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "접속 수락: host=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "데이터베이스 시스템이 새로 가동 중입니다."
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "해당 데이터베이스 시스템은 접속을 허용하지 않습니다."
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "Hot standby 모드가 비활성화 되었습니다."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "해당 데이터베이스 시스템은 아직 접속을 허용하지 않습니다."
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "일관성 복구 작업을 아직 끝내지 못했습니다."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr "스냅샷 복구는 아직 hot 대기서버에서 준비되지 않았습니다."
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "해당 데이터베이스 시스템은 접속을 허용하지 않습니다."
+msgid ""
+"To enable hot standby, close write transactions with more than %d "
+"subtransactions on the primary server."
+msgstr ""
+"hot 대기서버가 활성화되려면, 주 서버에서 %d 개 이상의 서브트랜잭션을 "
+"정리해야 합니다."
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "Hot standby 모드가 비활성화 되었습니다."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "일관성 복구 작업을 아직 끝내지 못했습니다."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "데이터베이스 시스템이 중지 중입니다"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "데이터베이스 시스템이 자동 복구 작업 중입니다."
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid ""
 "received direct SSL connection request without ALPN protocol negotiation "
 "extension"
-msgstr ""
-"수신된 직접 SSL 연결은 ALPN 프로토콜 채결 확장 없이 요청되었음"
+msgstr "수신된 직접 SSL 연결은 ALPN 프로토콜 채결 확장 없이 요청되었음"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
 msgstr "직접 SSL 연결 수락됨"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
 msgstr "직접 SSL 연결 거절됨"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "아직 완료되지 않은 시작 패킷"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "시작 패킷의 길이가 잘못 되었습니다"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
 msgstr "SSLRequest 수락됨"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
 msgstr "SSLRequest 거절됨"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "SSL 연결 작업에 오류가 발생했습니다: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "SSL 요청 뒤에 암호화 되지 않은 데이터를 받았음"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid ""
 "This could be either a client-software bug or evidence of an attempted man-"
@@ -25076,130 +26350,148 @@ msgstr ""
 "이 현상은 클라이언트 소프트웨어 버그이거나, 중간자 공격으로 발생했을 것입니"
 "다."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
 msgstr "GSSENCRequest 수락됨"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
 msgstr "GSSENCRequest 거절됨"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "GSSAPI 협상 응답을 보내지 못했습니다: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "GSSAPI 암호화 요청 뒤에 암호화 되지 않은 데이터를 받았습니다."
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 "지원하지 않는 frontend 프로토콜 %u.%u: 서버에서 지원하는 프로토콜 %u.0 .. %u."
 "%u"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "사용할 수 있는 값: \"false\", 0, \"true\", 1, \"database\"."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "잘못된 시작 패킷 레이아웃: 마지막 바이트로 종결문자가 발견되었음"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "시작 패킷에서 지정한 사용자는 PostgreSQL 사용자 이름이 아닙니다"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, c-format
+msgid "invalid length of cancel request packet"
+msgstr "취소 요청 패킷의 길이가 잘못 되었음"
+
+#: tcop/backend_startup.c:892
+#, c-format
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "취소 요청 패킷안의 취소 키 길이가 잘못 되었음"
+
+#: tcop/backend_startup.c:1022
+#, c-format
+msgid ""
+"Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr ""
+"log_connections의 \"%s\" 옵션을 다른 옵션을 포함하는 목록안에 지정할 수 없습"
+"니다."
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "OID %u 함수 없음"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "fastpath 인터페이스를 이용한 \"%s\" 함수 호출 실패"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "fastpath 함수 호출: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1369 tcop/postgres.c:1605
-#: tcop/postgres.c:2071 tcop/postgres.c:2333
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599
+#: tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "실행시간: %s ms"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "작업시간: %s ms  fastpath 함수 호출: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:353
+#: tcop/fastpath.c:352
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr "함수 호출 메시지는 %d 인자를 사용하지만, 함수는 %d 인자가 필요합니다"
 
-#: tcop/fastpath.c:361
+#: tcop/fastpath.c:360
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr "함수 호출 메시지는 %d 인자를 사용하지만, 함수는 %d 인자가 필요합니다"
 
-#: tcop/fastpath.c:385
+#: tcop/fastpath.c:384
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "함수 호출 메시지 안에 있는 잘못된 %d 인자 크기"
 
-#: tcop/fastpath.c:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "함수 인자 %d 안에 잘못된 바이너리 자료 형식 발견됨"
 
-#: tcop/postgres.c:467 tcop/postgres.c:5012
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "잘못된 frontend 메시지 형태 %d"
 
-#: tcop/postgres.c:1076
+#: tcop/postgres.c:1070
 #, c-format
 msgid "statement: %s"
 msgstr "명령 구문: %s"
 
-#: tcop/postgres.c:1374
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "실행시간: %s ms  명령 구문: %s"
 
-#: tcop/postgres.c:1480
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "준비된 명령 구문에는 다중 명령을 삽입할 수 없습니다"
 
-#: tcop/postgres.c:1610
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "실행시간: %s ms  %s 구문분석: %s"
 
-#: tcop/postgres.c:1677 tcop/postgres.c:2653
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "이름없는 준비된 명령 구문(unnamed prepared statement) 없음"
 
-#: tcop/postgres.c:1729
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "바인드 메시지는 %d 매개 변수 형태지만, %d 매개 변수여야함"
 
-#: tcop/postgres.c:1735
+#: tcop/postgres.c:1729
 #, c-format
 msgid ""
 "bind message supplies %d parameters, but prepared statement \"%s\" requires "
@@ -25208,115 +26500,115 @@ msgstr ""
 "바인드 메시지는 %d개의 매개 변수를 지원하지만, \"%s\" 준비된 명령 구문"
 "(prepared statement)에서는%d 개의 매개 변수가 필요합니다"
 
-#: tcop/postgres.c:1949
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "바인드 매개 변수 %d 안에 잘못된 바이너리 자료 형태가 있음"
 
-#: tcop/postgres.c:2076
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "실행시간: %s ms  %s%s%s 접속: %s"
 
-#: tcop/postgres.c:2131 tcop/postgres.c:2735
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "\"%s\" portal 없음"
 
-#: tcop/postgres.c:2213
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2215 tcop/postgres.c:2341
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "자료뽑기"
 
-#: tcop/postgres.c:2216 tcop/postgres.c:2342
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "쿼리실행"
 
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "수행시간: %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2486
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "prepare: %s"
 
-#: tcop/postgres.c:2511
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "매개 변수: %s"
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "중지 이유: 복구 충돌"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "사용자가 너무 오랫동안 공유 버퍼 핀을 붙잡고 있습니다."
 
-#: tcop/postgres.c:2545
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "사용자가 너무 오랫동안 릴레이션 잠금을 하고 있습니다."
 
-#: tcop/postgres.c:2548
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "삭제할 테이블스페이스를 사용자가 사용했거나, 사용하고 있습니다."
 
-#: tcop/postgres.c:2551
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "사용자 쿼리가 삭제해야할 로우 버전를 볼 필요가 있는 것 같습니다."
 
-#: tcop/postgres.c:2554
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "사용자가 잘못된 논리 복제 슬롯을 사용했습니다."
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "삭제 되어져야할 데이터베이스에 사용자가 접속해 있습니다."
 
-#: tcop/postgres.c:2599
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "\"%s\" 포탈 $%d 매개 변수 = %s"
 
-#: tcop/postgres.c:2602
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "\"%s\" 포탈 $%d 매개 변수"
 
-#: tcop/postgres.c:2608
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "이름없는 포탈 $%d 매개 변수 = %s"
 
-#: tcop/postgres.c:2611
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "이름없는 포탈 $%d 매개 변수"
 
-#: tcop/postgres.c:2955
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "예상치 못한 SIGQUIT 신호로 연결을 끝냅니다"
 
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "다른 서버 프로세스가 손상을 입어 현재 연결을 중지합니다"
 
-#: tcop/postgres.c:2962
+#: tcop/postgres.c:2989
 #, c-format
 msgid ""
 "The postmaster has commanded this server process to roll back the current "
@@ -25327,24 +26619,24 @@ msgstr ""
 "와의 연결을 끊으라는 명령을 보냈습니다. 왜냐하면, 다른 서버 프로세스가 비정상"
 "적으로 중지되어 공유 메모리가 손상되었을 가능성이 있기 때문입니다"
 
-#: tcop/postgres.c:2966 tcop/postgres.c:3219
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid ""
 "In a moment you should be able to reconnect to the database and repeat your "
 "command."
 msgstr "잠시 뒤에 다시 연결 해서 작업을 계속 하십시오"
 
-#: tcop/postgres.c:2973
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "immediate 종료 명령으로 연결을 끝냅니다"
 
-#: tcop/postgres.c:3051
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "부동소수점 예외발생"
 
-#: tcop/postgres.c:3052
+#: tcop/postgres.c:3079
 #, c-format
 msgid ""
 "An invalid floating-point operation was signaled. This probably means an out-"
@@ -25353,108 +26645,88 @@ msgstr ""
 "잘못된 부동소수점 작업이 감지 되었습니다. 이것은 아마도 결과값 범위초과나 0으"
 "로 나누는 작업과 같은 잘못된 연산 때문에 발생한 것 같습니다"
 
-#: tcop/postgres.c:3217
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "복구 작업 중 충돌로 연결을 끝냅니다"
 
-#: tcop/postgres.c:3289
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "시간 초과로 인증 작업을 취소합니다."
 
-#: tcop/postgres.c:3293
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "관리자 명령으로 인해 자동 청소 프로세스를 끝냅니다"
 
-#: tcop/postgres.c:3297
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "관리자 요청에 의해서 논리 복제 작업자를 끝냅니다"
 
-#: tcop/postgres.c:3317
+#: tcop/postgres.c:3339
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "관리자 명령으로 인해 WAL 수신기를 종료합니다."
+
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "관리자 요청에 의해서 연결을 끝냅니다"
 
-#: tcop/postgres.c:3348
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "서버로부터 연결이 끊어졌습니다."
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "잠금 대기 시간 초과로 작업을 취소합니다."
 
-#: tcop/postgres.c:3407
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "명령실행시간 초과로 작업을 취소합니다."
 
-#: tcop/postgres.c:3414
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "자동 청소 작업을 취소하는 중"
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "사용자 요청에 의해 작업을 취소합니다."
 
-#: tcop/postgres.c:3448
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "idle-in-transaction 시간 초과로 연결을 끝냅니다"
 
-#: tcop/postgres.c:3461
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "트랜잭션 시간(transaction_timeout) 초과로 연결을 끝냅니다"
 
-#: tcop/postgres.c:3474
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "idle-session 시간 초과로 연결을 끝냅니다"
 
-#: tcop/postgres.c:3564
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "스택 깊이를 초과했습니다"
-
-#: tcop/postgres.c:3565
+#: tcop/postgres.c:3548
 #, c-format
-msgid ""
-"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
-"after ensuring the platform's stack depth limit is adequate."
+msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr ""
-"먼저 OS에서 지원하는 스택 depth 최대값을 확인한 뒤, 허용범위 안에서 "
-"\"max_stack_depth\" (현재값: %dkB) 매개 변수 값의 설정치를 증가시키세요."
+"이 플랫폼에서는 \"client_connection_check_interval\" 값은 0 이어야 합니다."
 
-#: tcop/postgres.c:3612
+#: tcop/postgres.c:3569
 #, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "\"max_stack_depth\" 값은 %ldkB를 초과할 수 없습니다"
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr "\"log_statement_stats\" 값이 true 일 때는 이 값을 활성화할 수 없습니다"
 
-#: tcop/postgres.c:3614
-#, c-format
-msgid ""
-"Increase the platform's stack depth limit via \"ulimit -s\" or local "
-"equivalent."
-msgstr "OS의 \"ulimit -s\" 명령과 같은 것으로 스택 깊이를 늘려주십시오."
-
-#: tcop/postgres.c:3637
-#, c-format
-msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
-msgstr "이 플랫폼에서는 \"client_connection_check_interval\" 값은 0 이어야 합니다."
-
-#: tcop/postgres.c:3658
-#, c-format
-msgid "Cannot enable parameter when \"log_statement_stats\" is true."
-msgstr "\"log_statement_stats\" 값이 true 일 때는 이 값을 활성화할 수 없습니다"
-
-#: tcop/postgres.c:3673
+#: tcop/postgres.c:3584
 #, c-format
 msgid ""
 "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
@@ -25463,67 +26735,79 @@ msgstr ""
 "\"log_parser_stats\", \"log_planner_stats\", \"log_executor_stats\" 설정값들 "
 "중 하나가 true 일 때는 \"log_statement_stats\" 설정을 활성화할 수 없습니다"
 
-#: tcop/postgres.c:4098
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "서버 프로세스의 명령행 인자가 잘못되었습니다: %s"
 
-#: tcop/postgres.c:4099 tcop/postgres.c:4105
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: tcop/postgres.c:4103
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: 잘못된 명령행 인자: %s"
 
-#: tcop/postgres.c:4156
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: 데이터베이스와 사용자를 지정하지 않았습니다"
 
-#: tcop/postgres.c:4909
+#: tcop/postgres.c:4275
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "무작위 취소 키를 만들 수 없음"
+
+#: tcop/postgres.c:4677
+#, c-format
+msgid ""
+"connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr ""
+"연결 준비: 셋업 전체=%.3f ms, 포크=%.3f ms, 인증=%.3f ms"
+
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "잘못된 CLOSE 메시지 서브타입 %d"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "잘못된 DESCRIBE 메시지 서브타입 %d"
 
-#: tcop/postgres.c:5033
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "복제 연결에서는 fastpath 함수 호출을 지원하지 않습니다"
 
-#: tcop/postgres.c:5037
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "복제 연결에서는 확장된 쿼리 프로토콜을 지원하지 않습니다"
 
-#: tcop/postgres.c:5217
+#: tcop/postgres.c:5189
 #, c-format
 msgid ""
-"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s "
-"host=%s%s%s"
+"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
+"%s"
 msgstr ""
-"연결종료: 세션 시간: %d:%02d:%02d.%03d 사용자=%s 데이터베이스=%s 호스트"
-"=%s%s%s"
+"연결종료: 세션 시간: %d:%02d:%02d.%03d 사용자=%s 데이터베이스=%s 호스트=%s%s"
+"%s"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
 "바인드 메시지는 %d 결과 포멧을 가지고 있고, 쿼리는 %d 칼럼을 가지고 있습니다"
 
-#: tcop/pquery.c:942 tcop/pquery.c:1696
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "이 커서는 앞으로 이동 전용입니다"
 
-#: tcop/pquery.c:943 tcop/pquery.c:1697
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr ""
@@ -25554,68 +26838,81 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "보안 제한 작업 내에서 %s을(를) 실행할 수 없음"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "백그라운드 프로세스에서는 %s 명령을 실행할 수 없습니다."
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "%s 명령 실행 권한 없음"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "이 명령 실행은 \"%s\" 롤 권한이 있는 롤만 할 수 있습니다."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "cannot create statistics on the specified relation"
+msgstr "지정한 릴레이션의 통계 정보를 만들 수 없음"
+
+#: tcop/utility.c:1887
+#, c-format
+msgid ""
+"CREATE STATISTICS only supports tables, foreign tables and materialized "
+"views."
+msgstr ""
+"CREATE STATISTICS 작업은 테이블, 외부 테이블, 구체화된 뷰만 지원합니다."
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "DictFile 매개 변수가 여러 개 있음"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "AffFile 매개 변수가 여러 개 있음"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "인식할 수 없는 Ispell 매개 변수: \"%s\""
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "AffFile 매개 변수가 누락됨"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "DictFile 매개 변수가 누락됨"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "Accept 매개 변수가 여러 개 있음"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "인식할 수 없는 simple 사전 매개 변수: \"%s\""
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "인식할 수 없는 synonym 매개 변수: \"%s\""
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "Synonyms 매개 변수가 누락됨"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "\"%s\" 동의어 파일을 열 수 없음: %m"
@@ -25692,92 +26989,87 @@ msgstr "인식할 수 없는 Thesaurus 매개 변수: \"%s\""
 msgid "missing Dictionary parameter"
 msgstr "Dictionary 매개 변수가 누락됨"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:383 tsearch/spell.c:400 tsearch/spell.c:409
+#: tsearch/spell.c:1046
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "잘못된 affix 플래그: \"%s\""
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:387 tsearch/spell.c:1050
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "affix 플래그 범위 초과: \"%s\""
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:417
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "affix 플래그에 이상한 문자가 있음: \"%s\""
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:437
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "\"long\" 플래그 값을 포함하는 잘못된 affix 플래그: \"%s\""
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:527
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "\"%s\" 사전 파일을 열 수 없음: %m"
 
-#: tsearch/spell.c:749 utils/adt/regexp.c:223 jsonpath_gram.y:629
+#: tsearch/spell.c:751 utils/adt/regexp.c:223 jsonpath_gram.y:631
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "잘못된 정규식: %s"
 
-#: tsearch/spell.c:963 tsearch/spell.c:980 tsearch/spell.c:997
-#: tsearch/spell.c:1014 tsearch/spell.c:1079 gram.y:18735 gram.y:18752
+#: tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999
+#: tsearch/spell.c:1016 tsearch/spell.c:1082 gram.y:18905 gram.y:18922
 #, c-format
 msgid "syntax error"
 msgstr "구문 오류"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1174 tsearch/spell.c:1186 tsearch/spell.c:1751
+#: tsearch/spell.c:1756 tsearch/spell.c:1761
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "잘못된 affix 별칭: \"%s\""
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1227 tsearch/spell.c:1298 tsearch/spell.c:1447
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "\"%s\" affix 파일을 열 수 없음: %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1281
 #, c-format
 msgid ""
 "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag "
 "values"
 msgstr "Ispell 사전은  \"default\", \"long\", \"num\"  플래그 값만 지원함"
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1325
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "잘못된 플래그 백터 별칭 개수"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1348
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "alias 수가 지정한 %d 개수를 초과함"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1563
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "affix 파일에 옛방식과 새방식 명령이 함께 있습니다"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr ""
 "문자열이 너무 길어서 tsvector에 사용할 수 없음(%d바이트, 최대 %d바이트)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:191
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "%d번째 줄(해당 파일: \"%s\"): \"%s\""
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "wchar_t에서 서버 인코딩으로 변환하지 못함: %m"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -25790,12 +27082,12 @@ msgstr "단어가 너무 길어서 인덱싱할 수 없음"
 msgid "Words longer than %d characters are ignored."
 msgstr "%d자보다 긴 단어는 무시됩니다."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "\"%s\" 전문 검색 구성 파일 이름이 잘못됨"
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "\"%s\" 중지 단어 파일을 열 수 없음: %m"
@@ -25812,60 +27104,114 @@ msgstr "인식할 수 없는 headline 매개 변수: \"%s\""
 
 #: tsearch/wparser_def.c:2674
 #, c-format
-msgid "MinWords should be less than MaxWords"
-msgstr "MinWords는 MaxWords보다 작아야 함"
+msgid "%s must be less than %s"
+msgstr "%s 값은 %s보다 작아야 함"
 
 #: tsearch/wparser_def.c:2678
 #, c-format
-msgid "MinWords should be positive"
-msgstr "MinWords는 양수여야 함"
-
-#: tsearch/wparser_def.c:2682
-#, c-format
-msgid "ShortWord should be >= 0"
-msgstr "ShortWord는 0보다 크거나 같아야 함"
+msgid "%s must be positive"
+msgstr "%s 값은 양수여야 함"
 
-#: tsearch/wparser_def.c:2686
+#: tsearch/wparser_def.c:2682 tsearch/wparser_def.c:2686
 #, c-format
-msgid "MaxFragments should be >= 0"
-msgstr "MaxFragments는 0보다 크거나 같아야 함"
+msgid "%s must be >= 0"
+msgstr "%s 값은 >=0 이어야 함"
 
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "\"%s\" 매개 변수 통계 파일을 지울 수 없음: %m"
 
-#: utils/activity/pgstat.c:1255
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "잘못된 통계정보 종류: \"%s\""
 
-#: utils/activity/pgstat.c:1335
+#: utils/activity/pgstat.c:1471
+#, c-format
+msgid "custom cumulative statistics name is invalid"
+msgstr "사용자 정의 누적 통계 정보 수집기 이름이 바르지 않음"
+
+#: utils/activity/pgstat.c:1472
+#, c-format
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "사용자 정의 누적 통계 정보 수집기 이름은 비워둘 수 없습니다."
+
+#: utils/activity/pgstat.c:1475
+#, c-format
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr "사용자 정의 누적 통계 정보 수집기의 ID %u가 범위를 벗어남"
+
+#: utils/activity/pgstat.c:1476
+#, c-format
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr "사용자 정의 누적 통계 정보 수집기 ID 범위는 %u 에서 %u 까지입니다."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, c-format
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr "\"%s\" 사용자 정의 누적 통계 정보 수집기를 %u ID로 등록할 수 없음"
+
+#: utils/activity/pgstat.c:1482
+#, c-format
+msgid ""
+"Custom cumulative statistics must be registered while initializing modules "
+"in \"shared_preload_libraries\"."
+msgstr ""
+"사용자 정의 누적 통계 정보 수집기를 사용하려면 먼저 "
+"\"shared_preload_libraries\" 설정값으로 등록되어야 합니다."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr "사용자 정의 누적 통계 정보 수집기가 잘못 되었음"
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid ""
+"Custom cumulative statistics require a shared memory size for fixed-numbered "
+"objects."
+msgstr ""
+"사용자 정의 누죽 통계 정보 수집기는 고정된 수의 객체용 공유 메모리 확보가 필요합니다."
+
+#: utils/activity/pgstat.c:1509
+#, c-format
+msgid ""
+"Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr "\"%s\" 사용자 정의 누적 통계 정보 수집기 ID가 이미 등록되어 있습니다."
+
+#: utils/activity/pgstat.c:1522
+#, c-format
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr "%u ID 의 누적 통계 정보 수집기가 같은 이름입니다."
+
+#: utils/activity/pgstat.c:1528
+#, c-format
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr "등록된 \"%s\" 사용자 정의 누적 통계 정보 수집기의 ID는 %u 임"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "\"%s\" 임시 통계 파일을 열 수 없음: %m"
 
-#: utils/activity/pgstat.c:1455
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "\"%s\" 임시 통계 파일에 쓰기 실패: %m"
 
-#: utils/activity/pgstat.c:1464
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "\"%s\" 임시 통계 파일을 닫을 수 없습니다: %m"
 
-#: utils/activity/pgstat.c:1472
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "\"%s\" 임시 통계 파일 이름을 \"%s\" (으)로 바꿀 수 없습니다: %m"
-
-#: utils/activity/pgstat.c:1521
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "\"%s\" 통계 파일을 열 수 없음: %m"
 
-#: utils/activity/pgstat.c:1683
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "\"%s\" 통계 파일이 손상되었음"
@@ -25875,203 +27221,208 @@ msgstr "\"%s\" 통계 파일이 손상되었음"
 msgid "function call to dropped function"
 msgstr "삭제될 함수를 호출함"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "%u/%u/%<PRIu64> 엔트리 할당하는 동안 오류가 발생했습니다."
+
+#: utils/activity/pgstat_xact.c:366
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "%s 종류의 기존 통계 정보를 초기화합니다, db=%u, oid=%u"
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "%s 종류의 기존 통계 정보를 초기화합니다, db=%u, oid=%<PRIu64>"
 
-#: utils/activity/wait_event.c:207 utils/activity/wait_event.c:232
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
 msgid "wait event \"%s\" already exists in type \"%s\""
 msgstr "\"%s\" 대기 이벤트는 이미 \"%s\" 자료형 안에 있음"
 
-#: utils/activity/wait_event.c:246
+#: utils/activity/wait_event.c:245
 #, c-format
 msgid "too many custom wait events"
 msgstr "너무 많은 사용자 대기 이벤트"
 
 # # nonun 부분 begin
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "식별자(identifier)가 너무 깁니다."
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "식별자(Identifier)는 %d 글자 이상일 수 없습니다."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "알 수 없는 않은 키워드: \"%s\""
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "ACL 키워드는 \"group\" 또는 \"user\" 중에 하나여야 합니다."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "이름이 빠졌습니다."
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "이름은 \"group\" 또는 \"user\" 키워드 뒤에 있어야 합니다."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "\"=\" 기호가 빠졌습니다."
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "잘못된 조건: \"%s\" 중에 한 가지여야 합니다."
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "이름은 \"/\"기호 뒤에 있어야 합니다."
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "%u 사용자 ID에서 기본 권한자로 할당하고 있습니다"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "ACL 배열에 잘못된 자료형을 사용하고 있습니다"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "ACL 배열은 일차원 배열이어야 합니다"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "ACL 배열에는 null 값을 포함할 수 없습니다"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "ACL 설정 정보 끝에 끝에 쓸모 없는 내용들이 더 포함되어있습니다"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "부여 옵션을 해당 부여자에게 다시 부여할 수 없음"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert 더이상 지원하지 않음"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremovie 더이상 지원하지 않음"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "알 수 없는 권한 타입: \"%s\""
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "\"%s\" 함수가 없습니다."
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "SET ROLE \"%s\" 작업이 있어야 함"
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:118 utils/adt/array_userfuncs.c:565
+#: utils/adt/array_userfuncs.c:942 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, c-format
 msgid "could not determine input data type"
 msgstr "입력 자료형을 결정할 수 없음"
 
-#: utils/adt/array_userfuncs.c:107
+#: utils/adt/array_userfuncs.c:123
 #, c-format
 msgid "input data type is not an array"
 msgstr "입력 자료형이 배열이 아닙니다."
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800
 #: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
 #: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
 #: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
 #: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
 #: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1917 utils/adt/numeric.c:4454
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143
+#: utils/adt/varlena.c:3184 utils/adt/varlena.c:4118
 #, c-format
 msgid "integer out of range"
 msgstr "정수 범위를 벗어남"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:174 utils/adt/array_userfuncs.c:259
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "인자는 비어있거나 1차원 배열이어야 합니다."
 
-#: utils/adt/array_userfuncs.c:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:410
+#: utils/adt/array_userfuncs.c:447 utils/adt/array_userfuncs.c:476
+#: utils/adt/array_userfuncs.c:504
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "연결할 수 없는 배열들 입니다."
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:372
 #, c-format
 msgid ""
 "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "%s 자료형의 배열과 %s 자료형의 배열은 연결할 수 없습니다."
 
-#: utils/adt/array_userfuncs.c:335
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "%d차원(배열 깊이) 배열과 %d차원 배열은 연결할 수 없습니다."
 
-#: utils/adt/array_userfuncs.c:372
+#: utils/adt/array_userfuncs.c:448
 #, c-format
 msgid ""
 "Arrays with differing element dimensions are not compatible for "
 "concatenation."
 msgstr "차원(배열 깊이)이 다른 배열들을 서로 합칠 수 없습니다"
 
-#: utils/adt/array_userfuncs.c:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:477 utils/adt/array_userfuncs.c:505
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "차원(배열 깊이)이 다른 배열들을 서로 합칠 수 없습니다"
 
-#: utils/adt/array_userfuncs.c:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5622
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059
+#: utils/adt/arrayfuncs.c:5628 utils/adt/arrayfuncs.c:5634
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "배열 차수가 서로 틀린 배열은 누적할 수 없음"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1348 utils/adt/array_userfuncs.c:1502
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "다차원 배열에서 요소 검색 기능은 지원하지 않음"
 
-#: utils/adt/array_userfuncs.c:1301
+#: utils/adt/array_userfuncs.c:1377
 #, c-format
 msgid "initial position must not be null"
 msgstr "초기 위치값은 null값이 아니여야 함"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1750
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "샘플 크기는 0에서 %d 사이여야 함"
@@ -26156,7 +27507,7 @@ msgstr "예기치 않은 배열 요소"
 msgid "Specified array dimensions do not match array contents."
 msgstr "지정한 배열 차원에 해당하는 배열이 없습니다."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2598
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "다차원 배열에는 일치하는 차원이 포함된 배열 식이 있어야 함"
@@ -26167,14 +27518,14 @@ msgid "Incorrectly quoted array element."
 msgstr "바르지 않은 따옴표 배열 요소입니다."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "입력의 예상치 못한 종료."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3499
-#: utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6120
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "잘못된 배열 차원(배열 깊이): %d"
@@ -26190,7 +27541,7 @@ msgid "binary data has array element type %u (%s) instead of expected %u (%s)"
 msgstr "이진 자료에 있는 배열 요소 자료형이 %u (%s) 입니다. 기대값: %u (%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3098
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "%s 자료형에서 사용할 바이너리 입력 함수가 없습니다."
@@ -26201,7 +27552,7 @@ msgid "improper binary format in array element %d"
 msgstr "%d 번째 배열 요소의 포맷이 부적절합니다."
 
 #: utils/adt/arrayfuncs.c:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3131
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "%s 자료형에서 사용할 바이너리 출력 함수가 없습니다."
@@ -26213,11 +27564,11 @@ msgstr "특정 크기로 배열을 절단하는 기능은 구현되지 않습니
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6092
-#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6129
-#: utils/adt/json.c:1433 utils/adt/json.c:1505 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4710 utils/adt/jsonfuncs.c:4863
-#: utils/adt/jsonfuncs.c:4974 utils/adt/jsonfuncs.c:5022
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:6132 utils/adt/arrayfuncs.c:6143
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "잘못된 배열 하위 스크립트(1,2...차원 배열 표시 문제)"
@@ -26255,90 +27606,90 @@ msgstr "빈 배열 대상으로 자르기를 할 때는 자르기 범위가 전
 msgid "source array too small"
 msgstr "원본 배열이 너무 작습니다."
 
-#: utils/adt/arrayfuncs.c:3657
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "이 구문에서는 배열의 null 요소를 허용하지 않습니다"
 
-#: utils/adt/arrayfuncs.c:3828 utils/adt/arrayfuncs.c:3999
-#: utils/adt/arrayfuncs.c:4390
+#: utils/adt/arrayfuncs.c:3840 utils/adt/arrayfuncs.c:4011
+#: utils/adt/arrayfuncs.c:4402
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "배열 요소 자료형이 서로 틀린 배열은 비교할 수 없습니다."
 
-#: utils/adt/arrayfuncs.c:4177 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2805
+#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "%s 자료형에서 사용할 해시 함수를 찾을 수 없습니다."
 
-#: utils/adt/arrayfuncs.c:4305 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4317 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "%s 자료형에서 사용할 확장된 해시 함수를 찾을 수 없습니다."
 
-#: utils/adt/arrayfuncs.c:5506
+#: utils/adt/arrayfuncs.c:5518
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "%s 자료형은 배열이 아닙니다."
 
-#: utils/adt/arrayfuncs.c:5561
+#: utils/adt/arrayfuncs.c:5573
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "null 배열을 누적할 수 없음"
 
-#: utils/adt/arrayfuncs.c:5589
+#: utils/adt/arrayfuncs.c:5601
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "빈 배열을 누적할 수 없음"
 
-#: utils/adt/arrayfuncs.c:5990 utils/adt/arrayfuncs.c:6030
+#: utils/adt/arrayfuncs.c:6004 utils/adt/arrayfuncs.c:6044
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "차원 배열 또는 하한 배열은 NULL일 수 없음"
 
-#: utils/adt/arrayfuncs.c:6093 utils/adt/arrayfuncs.c:6119
+#: utils/adt/arrayfuncs.c:6107 utils/adt/arrayfuncs.c:6133
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "차원 배열은 일차원 배열이어야 합니다."
 
-#: utils/adt/arrayfuncs.c:6098 utils/adt/arrayfuncs.c:6124
+#: utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "차원 값은 null일 수 없음"
 
-#: utils/adt/arrayfuncs.c:6130
+#: utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "하한 배열의 크기가 차원 배열과 다릅니다."
 
-#: utils/adt/arrayfuncs.c:6411
+#: utils/adt/arrayfuncs.c:6425
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "다차원 배열에서 요소 삭제기능은 지원되지 않음"
 
-#: utils/adt/arrayfuncs.c:6688
+#: utils/adt/arrayfuncs.c:6702
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "threshold 값은 1차원 배열이어야 합니다."
 
-#: utils/adt/arrayfuncs.c:6693
+#: utils/adt/arrayfuncs.c:6707
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "threshold 배열에는 null이 포함되지 않아야 함"
 
-#: utils/adt/arrayfuncs.c:6926
+#: utils/adt/arrayfuncs.c:6940
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "요소 자름 수는 0부터 %d까지입니다"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "배열 요소 번호는 정수형이어야 합니다."
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "배열 요소 지정하는 번호값으로 null 값을 사용할 수 없습니다"
@@ -26369,21 +27720,21 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "%s 인코딩을 ASCII 인코딩으로의 변환은 지원하지 않습니다."
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:354 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
 #: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:803 utils/adt/numeric.c:7221
-#: utils/adt/numeric.c:7424 utils/adt/numeric.c:8371 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:360
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "%s 자료형 대한 잘못된 입력: \"%s\""
@@ -26394,23 +27745,23 @@ msgstr "%s 자료형 대한 잘못된 입력: \"%s\""
 msgid "money out of range"
 msgstr "money 자료형 값 범위를 벗어남"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:723 utils/adt/float.c:99
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
 #: utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039
 #: utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167
 #: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
 #: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
-#: utils/adt/numeric.c:3191 utils/adt/numeric.c:3214 utils/adt/numeric.c:3299
-#: utils/adt/numeric.c:3317 utils/adt/numeric.c:3413 utils/adt/numeric.c:8920
-#: utils/adt/numeric.c:9233 utils/adt/numeric.c:9581 utils/adt/numeric.c:9697
-#: utils/adt/numeric.c:11208 utils/adt/timestamp.c:3713
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "0으로는 나눌수 없습니다."
 
 #: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
 #: utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "입력한 \"%s\" 값은 %s 자료형 범위를 초과했습니다"
@@ -26425,189 +27776,189 @@ msgstr "\"char\" 범위를 벗어났습니다."
 msgid "could not compute %s hash: %s"
 msgstr "%s 해시 계산 실패: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "잘못된 자료형 한정자"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "TIME(%d)%s 정밀도로 음수를 사용할 수 없습니다"
 
-#: utils/adt/date.c:82
+#: utils/adt/date.c:83
 #, c-format
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%s 정밀도는 최대값(%d)으로 줄였습니다"
 
-#: utils/adt/date.c:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172
+#: utils/adt/formatting.c:4181 utils/adt/formatting.c:4286
+#: utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "날짜 범위가 벗어났음: \"%s\""
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2554
 #, c-format
 msgid "date out of range"
 msgstr "날짜가 범위를 벗어남"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "날짜 필드의 값이 범위를 벗어남: %d-%02d-%02d"
 
-#: utils/adt/date.c:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "날짜 범위가 벗어났음: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "무한 날짜를 뺄 수 없음"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "날짜가 타임스탬프 범위를 벗어남"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "\"%s\" 단위는 %s 자료형의 값 단위로 지원하지 않음"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "\"%s\" 는 %s 자료형의 단위로 인식될 수 없음"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2574
-#: utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4017 utils/adt/formatting.c:4053
+#: utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2576
+#: utils/adt/xml.c:2583 utils/adt/xml.c:2603 utils/adt/xml.c:2610
 #, c-format
 msgid "timestamp out of range"
 msgstr "타임스탬프 범위를 벗어남"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "시간 범위를 벗어남"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "시간 필드의 값이 범위를 벗어남: %d:%02d:%02g"
 
-#: utils/adt/date.c:2020
+#: utils/adt/date.c:2085
 #, c-format
 msgid "cannot convert infinite interval to time"
 msgstr "infinite interval 자료형은 time 자료형으로 변환할 수 없음"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
 #, c-format
 msgid "cannot add infinite interval to time"
 msgstr "infinite interval 자료형 + time 자료형 계산은 할 수 없음"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
 #, c-format
 msgid "cannot subtract infinite interval from time"
 msgstr "infinite interval 자료형 - 시간 자료형 계산은 할 수 없음"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2595
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682
+#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "윈도우 함수에서 앞에 오거나 뒤에 따라오는 크기가 잘못됨"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "타임 존 변위가 범위를 벗어남"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
-msgstr ""
-"\"%s\" 시간대 간격(interval time zone) 값은 유한해야 함"
+msgstr "\"%s\" 시간대 간격(interval time zone) 값은 유한해야 함"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr ""
 "\"%s\" 시간대 간격(interval time zone) 값으로 달(month) 또는 일(day)을 포함"
 "할 수 없습니다"
 
-#: utils/adt/datetime.c:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "\"%s\" 이름의 시간대는 없습니다."
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "날짜/시간 필드의 값이 범위를 벗어남: \"%s\""
 
-#: utils/adt/datetime.c:4110
+#: utils/adt/datetime.c:4232
 #, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "날짜 표현 방식(\"datestyle\")을 다른 것으로 사용하고 있는 듯 합니다."
+msgid "Perhaps you need a different \"DateStyle\" setting."
+msgstr "날짜 표현 방식(\"DateStyle\")을 다른 것으로 사용하고 있는 듯 합니다."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "interval 필드의 값이 범위를 벗어남: \"%s\""
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "표준시간대 범위를 벗어남: \"%s\""
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid ""
 "This time zone name appears in the configuration file for time zone "
@@ -26620,17 +27971,22 @@ msgstr ""
 msgid "invalid Datum pointer"
 msgstr "잘못된 Datum 포인터"
 
-#: utils/adt/dbsize.c:764 utils/adt/dbsize.c:840
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "OID %u 테이블스페이스 없음"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "잘못된 크기: \"%s\""
 
-#: utils/adt/dbsize.c:841
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "잘못된 크기 단위: \"%s\""
 
-#: utils/adt/dbsize.c:842
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid ""
 "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
@@ -26657,40 +28013,40 @@ msgstr "인코딩 변환 결과가 너무 깁니다"
 msgid "result of decoding conversion is too large"
 msgstr "디코딩 변환 결과가 너무 깁니다"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "잘못된 16진수: \"%.*s\""
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "잘못된 16진수 데이터: 데이터의 길이가 홀수 입니다."
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "base64 자료를 디코딩 하는 중 예상치 못한 \"=\" 문자 발견"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "base64 자료를 디코딩 하는 중 잘못된 \"%.*s\" 기호 발견"
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "base64 마침 조합이 잘못되었음"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr "입력값에 여백 처리값이 빠졌거나, 자료가 손상되었습니다."
 
-#: utils/adt/encode.c:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:659
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374 jsonpath_gram.y:266
-#: jsonpath_gram.y:598 jsonpath_scan.l:640 jsonpath_scan.l:651
-#: jsonpath_scan.l:661 jsonpath_scan.l:712
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:341 utils/adt/varlena.c:382 jsonpath_gram.y:268
+#: jsonpath_gram.y:600 jsonpath_scan.l:617 jsonpath_scan.l:628
+#: jsonpath_scan.l:638 jsonpath_scan.l:690
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "%s 자료형에 대한 잘못된 입력 구문"
@@ -26727,355 +28083,367 @@ msgstr "실제 열거형의 자료형을 확인할 수 없음"
 msgid "enum %s contains no values"
 msgstr "\"%s\" 열거형 자료에 값이 없음"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "값이 범위를 벗어남: 오버플로"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "값이 범위를 벗어남: 언더플로"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\"는 real 자료형의 범위를 벗어납니다."
 
-#: utils/adt/float.c:482
+#: utils/adt/float.c:489
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\"는 double precision 자료형의 범위를 벗어납니다."
 
-#: utils/adt/float.c:1247 utils/adt/float.c:1321 utils/adt/int.c:355
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355
 #: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
 #: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4593 utils/adt/numeric.c:4598
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4093
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint의 범위를 벗어났습니다."
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3709 utils/adt/numeric.c:10112
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "음수의 제곱근을 구할 수 없습니다."
 
-#: utils/adt/float.c:1515 utils/adt/numeric.c:3997 utils/adt/numeric.c:4109
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "0의 음수 거듭제곱이 정의되어 있지 않음"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:4001 utils/adt/numeric.c:11003
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "음수의 비정수 거듭제곱을 계산하면 복잡한 결과가 생성됨"
 
-#: utils/adt/float.c:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3909
-#: utils/adt/numeric.c:10783
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "0의 대수를 구할 수 없습니다."
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3847
-#: utils/adt/numeric.c:3904 utils/adt/numeric.c:10787
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "음수의 대수를 구할 수 없습니다."
 
-#: utils/adt/float.c:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "입력값이 범위를 벗어났습니다."
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1857
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "카운트 값은 0 보다 커야 합니다"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1868
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "피연산자, 하한 및 상한은 NaN일 수 없음"
 
-#: utils/adt/float.c:4011 utils/adt/numeric.c:1873
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "하한 및 상한은 유한한 값이어야 함"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1887
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "하한값은 상한값과 같을 수 없습니다"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "간격 값에 대한 형식 지정이 잘못됨"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "간격이 특정 달력 날짜에 연결되어 있지 않습니다."
 
-#: utils/adt/formatting.c:1161
+#: utils/adt/formatting.c:1197
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\"는 사용된 마지막 패턴이어야 합니다."
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1205
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\"는 \"PR\" 앞에 있어야 합니다."
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1221
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\"은 \"PR\" 앞에 있어야 합니다."
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1248
 #, c-format
 msgid "multiple decimal points"
 msgstr "소숫점이 여러개 있습니다."
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1252 utils/adt/formatting.c:1339
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "\"V\" 와 소숫점을 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1228
+#: utils/adt/formatting.c:1264
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "\"S\"를 두 번 사용할 수 없음"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1268
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "\"S\" 와 \"PL\"/\"MI\"/\"SG\"/\"PR\" 를 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1252
+#: utils/adt/formatting.c:1288
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "\"S\" 와 \"MI\" 를 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1298
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "\"S\" 와 \"PL\" 를 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1308
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "\"S\" 와 \"SG\" 를 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1317
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "\"PR\" 와 \"S\"/\"PL\"/\"MI\"/\"SG\" 를 함께 쓸 수 없습니다."
 
-#: utils/adt/formatting.c:1307
+#: utils/adt/formatting.c:1326
+#, c-format
+msgid "cannot use \"RN\" twice"
+msgstr "\"RN\"을 두 번 사용할 수 없음"
+
+#: utils/adt/formatting.c:1347
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "\"EEEE\"를 두 번 사용할 수 없음"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1353
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\"는 다른 포맷과 호환하지 않습니다"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1354
 #, c-format
 msgid ""
 "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr "\"EEEE\"는 숫자와 소수점 패턴, 이 두 형식과 함께 사용되어야 합니다."
 
-#: utils/adt/formatting.c:1398
+#: utils/adt/formatting.c:1363
+#, c-format
+msgid "\"RN\" is incompatible with other formats"
+msgstr "\"RN\"은 다른 포맷과 호환하지 않습니다"
+
+#: utils/adt/formatting.c:1364
+#, c-format
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "\"RN\"은 \"FM\"과만 사용되어야 합니다."
+
+#: utils/adt/formatting.c:1445
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "잘못된 datetime 양식 구분자: \"%s\""
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1572
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\"는 숫자가 아닙니다."
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "잘못된 형 변환 규칙: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1653 utils/adt/formatting.c:1717
+#: utils/adt/formatting.c:1781 utils/adt/formatting.c:1845
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr "%s 함수에서 사용할 정렬규칙(collation)을 결정할 수 없음"
 
-#: utils/adt/formatting.c:2410
+#: utils/adt/formatting.c:1853
+#, c-format
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr "유니코드 대소문자 구분은 서버 인코딩이 UTF8 일때만 할 수 있습니다."
+
+#: utils/adt/formatting.c:2150
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "날짜 변환을 위한 잘못된 조합"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2151
 #, c-format
 msgid ""
 "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr ""
 "형식 템플릿에 그레고리오력과 ISO week date 변환을 함께 사용하지 마십시오."
 
-#: utils/adt/formatting.c:2433
+#: utils/adt/formatting.c:2173
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "형식 문자열에서 \"%s\" 필드의 값이 충돌함"
 
-#: utils/adt/formatting.c:2435
+#: utils/adt/formatting.c:2175
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "이 값은 동일한 필드 형식의 이전 설정과 모순됩니다."
 
-#: utils/adt/formatting.c:2502
+#: utils/adt/formatting.c:2242
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "소스 문자열이 너무 짧아서 \"%s\" 형식 필드에 사용할 수 없음"
 
-#: utils/adt/formatting.c:2504
+#: utils/adt/formatting.c:2244
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "필드에 %d자가 필요한데 %d자만 남았습니다."
 
-#: utils/adt/formatting.c:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2246 utils/adt/formatting.c:2260
 #, c-format
 msgid ""
 "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr "소스 문자열이 고정 너비가 아닌 경우 \"FM\" 한정자를 사용해 보십시오."
 
-#: utils/adt/formatting.c:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269
+#: utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "\"%s\" 값은 \"%s\"에 유효하지 않음"
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2258
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "필드에 %d자가 필요한데 %d자만 구문 분석할 수 있습니다."
 
-#: utils/adt/formatting.c:2531
+#: utils/adt/formatting.c:2271
 #, c-format
 msgid "Value must be an integer."
 msgstr "값은 정수여야 합니다."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "소스 문자열의 \"%s\" 값이 범위를 벗어남"
 
-#: utils/adt/formatting.c:2538
+#: utils/adt/formatting.c:2278
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "값은 %d에서 %d 사이의 범위에 있어야 합니다."
 
-#: utils/adt/formatting.c:2752
+#: utils/adt/formatting.c:2492
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "지정된 값이 이 필드에 허용되는 값과 일치하지 않습니다."
 
-#: utils/adt/formatting.c:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2728
+#: utils/adt/formatting.c:2748 utils/adt/formatting.c:2768
+#: utils/adt/formatting.c:2787 utils/adt/formatting.c:2806
+#: utils/adt/formatting.c:2830 utils/adt/formatting.c:2848
+#: utils/adt/formatting.c:2866 utils/adt/formatting.c:2884
+#: utils/adt/formatting.c:2901 utils/adt/formatting.c:2918
 #, c-format
 msgid "localized string format value too long"
 msgstr "자국어화 문자열 포멧 값이 너무 깁니다"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3198
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "맞지 않는 구분자 포멧 \"%c\""
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3259
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "짝이 안 맞는 \"%s\" 문자"
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3392
 #, c-format
 msgid "Time zone abbreviation is not recognized."
 msgstr "시간대 약어를 알 수 없습니다."
 
-#: utils/adt/formatting.c:3853
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "\"Y,YYY\"에 대한 입력 문자열이 잘못됨"
-
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "입력 문자열이 datetime 양식용으로는 너무 짧습니다"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "날짜 및 시간 형식 후 입력 문자열에 남은 문자가 있습니다."
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "timestamptz 자료형을 위한 입력 문자열에 시간대가 누락되었습니다."
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz 범위를 벗어남"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "datetime 양식이 지역시간대값이 있는데, 시간값이 아님"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "timetz 자료형을 위한 입력 문자열에 시간대가 누락되었습니다."
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz 범위를 벗어남"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "날짜시간 형식이 날짜도 아니고, 시간도 아닙니다."
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "시간 \"%d\"은(는) 12시간제에 유효하지 않음"
 
-#: utils/adt/formatting.c:4788
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "24시간제를 사용하거나 1에서 12 사이의 시간을 지정하십시오."
 
-#: utils/adt/formatting.c:4900
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "연도 정보 없이 몇번째 날(day of year) 인지 계산할 수 없습니다."
 
-#: utils/adt/formatting.c:5852
+#: utils/adt/formatting.c:5834
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" 입력 양식은 지원되지 않습니다."
 
-#: utils/adt/formatting.c:5864
+#: utils/adt/formatting.c:6111
 #, c-format
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\"  입력 양식은 지원되지 않습니다."
+msgid "invalid Roman numeral"
+msgstr "잘못된 로마자 숫자"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -27087,9 +28455,9 @@ msgstr "절대 경로는 허용하지 않음"
 msgid "path must be in or below the data directory"
 msgstr "경로는 현재 디렉터리 안이거나, 데이터 디렉터리 이하여야함"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:855
+#: utils/adt/oracle_compat.c:1158
 #, c-format
 msgid "requested length too large"
 msgstr "요청된 길이가 너무 깁니다"
@@ -27104,11 +28472,6 @@ msgstr "\"%s\" 파일에서 seek 작업을 할 수 없음: %m"
 msgid "file length too large"
 msgstr "파일 길이가 너무 깁니다"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "OID %u 테이블스페이스 없음"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -27160,8 +28523,8 @@ msgstr "적어도 2개의 point들이 필요합니다."
 msgid "invalid int2vector data"
 msgstr "잘못된 int2vector 자료"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1765
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "단계 크기는 0일 수 없음"
@@ -27175,9 +28538,9 @@ msgstr "단계 크기는 0일 수 없음"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4542
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4143
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint의 범위를 벗어났습니다."
@@ -27187,50 +28550,50 @@ msgstr "bigint의 범위를 벗어났습니다."
 msgid "OID out of range"
 msgstr "OID의 범위를 벗어났습니다."
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr ""
 "키 값은 스칼라 형이어야 함. 배열, 복합 자료형, json 형은 사용할 수 없음"
 
-#: utils/adt/json.c:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "%d번째 인자의 자료형을 알수가 없습니다."
 
-#: utils/adt/json.c:1067 utils/adt/json.c:1266 utils/adt/json.c:1449
-#: utils/adt/json.c:1527 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "개체 키 값으로 null 을 허용하지 않음"
 
-#: utils/adt/json.c:1117 utils/adt/json.c:1288
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "JSON 객체 키 값 중복: %s"
 
-#: utils/adt/json.c:1226 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "인자 목록은 요소수의 짝수개여야 합니다."
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1228 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "%s 함수의 인자들은 각각 key, value 쌍으로 있어야 합니다."
 
-#: utils/adt/json.c:1427 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "배열은 두개의 칼럼이어야 함"
 
-#: utils/adt/json.c:1516 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "배열 차수가 안맞음"
 
-#: utils/adt/json.c:1702 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "JSON 객체 키 값 중복"
@@ -27296,23 +28659,23 @@ msgstr "jsonb object 값을 %s 자료형으로 형 변환 할 수 없음"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "jsonb object나 배열 값을 %s 자료형으로 형 변환 할 수 없음"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "jsonb 개체 쌍의 개수가 최대치를 초과함 (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "jsonb 배열 요소 개수가 최대치를 초과함 (%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "jsonb 배열 요소 총 크기가 최대치를 초과함 (%d 바이트)"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "jsonb 개체 요소들의 총 크기가 최대치를 초과함 (%d 바이트)"
@@ -27347,108 +28710,108 @@ msgstr "배열 서브스크립트는 반드시 문자열이어야합니다."
 msgid "jsonb subscript in assignment must not be null"
 msgstr "jsonb 서브스크립트로 null 값이 올 수 없음"
 
-#: utils/adt/jsonfuncs.c:583 utils/adt/jsonfuncs.c:830
-#: utils/adt/jsonfuncs.c:2439 utils/adt/jsonfuncs.c:3015
-#: utils/adt/jsonfuncs.c:3948 utils/adt/jsonfuncs.c:4295
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "스칼라형에서는 %s 호출 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:588 utils/adt/jsonfuncs.c:815
-#: utils/adt/jsonfuncs.c:3017 utils/adt/jsonfuncs.c:3935
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "배열형에서는 %s 호출 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:647 jsonpath_scan.l:607
+#: utils/adt/jsonfuncs.c:649 jsonpath_scan.l:584
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "지원하지 않는 유니코드 이스케이프 조합"
 
-#: utils/adt/jsonfuncs.c:724
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "JSON 자료, %d 번째 줄: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1883 utils/adt/jsonfuncs.c:1920
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "스칼라형의 배열 길이를 구할 수 없음"
 
-#: utils/adt/jsonfuncs.c:1887 utils/adt/jsonfuncs.c:1906
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "비배열형 자료의 배열 길이를 구할 수 없음"
 
-#: utils/adt/jsonfuncs.c:1986
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "비개체형에서 %s 호출 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2174
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "배열을 객체로 해체할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2188
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "스칼라형으로 재구축할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2233
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "스칼라형에서 요소를 추출할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2237
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "개체형에서 요소를 추출할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2424 utils/adt/jsonfuncs.c:4173
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "비배열형에서 %s 호출 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:2515 utils/adt/jsonfuncs.c:2520
-#: utils/adt/jsonfuncs.c:2538 utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "예기치 않은 json 배열"
 
-#: utils/adt/jsonfuncs.c:2516
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "\"%s\" 키의 값을 지정하세요"
 
-#: utils/adt/jsonfuncs.c:2539
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "%s 배열 요소, 해당 키: \"%s\" 참조"
 
-#: utils/adt/jsonfuncs.c:2545
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "배열 요소: %s 참조"
 
-#: utils/adt/jsonfuncs.c:2597
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "잘못된 json 배열"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3647
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "%s의 첫번째 인자는 row 형이어야 합니다"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3671
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "%s 함수의 반환 로우 자료형을 알수가 없음"
 
-#: utils/adt/jsonfuncs.c:3673
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid ""
 "Provide a non-null record argument, or call the function in the FROM clause "
@@ -27457,52 +28820,52 @@ msgstr ""
 "non-null 레코드 인자를 지정하거나, 함수를 호출 할 때 FROM 절에서 칼럼 정의 목"
 "록도 함께 지정해야 합니다."
 
-#: utils/adt/jsonfuncs.c:4059 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "materialize 모드가 필요합니다만, 이 구문에서는 허용되지 않습니다"
 
-#: utils/adt/jsonfuncs.c:4190 utils/adt/jsonfuncs.c:4274
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "%s의 인자는 개체의 배열이어야 합니다"
 
-#: utils/adt/jsonfuncs.c:4223
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "개체에서 %s 호출할 수 없음"
 
-#: utils/adt/jsonfuncs.c:4656 utils/adt/jsonfuncs.c:4715
-#: utils/adt/jsonfuncs.c:4795
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "스칼라형에서 삭제 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:4800
+#: utils/adt/jsonfuncs.c:4824
 #, c-format
 msgid "cannot delete from object using integer index"
 msgstr "인덱스 번호를 사용해서 개체에서 삭제 할 수 없음"
 
-#: utils/adt/jsonfuncs.c:4868 utils/adt/jsonfuncs.c:5027
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "스칼라형에는 path 를 지정할 수 없음"
 
-#: utils/adt/jsonfuncs.c:4909 utils/adt/jsonfuncs.c:4951
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid ""
 "null_value_treatment must be \"delete_key\", \"return_target\", "
 "\"use_json_null\", or \"raise_exception\""
 msgstr ""
-"null_value_treatment 값은 \"delete_key\", \"return_target\", "
-"\"use_json_null\" 또는 \"raise_exception\" 이어야 합니다."
+"null_value_treatment 값은 \"delete_key\", \"return_target\", \"use_json_null"
+"\" 또는 \"raise_exception\" 이어야 합니다."
 
-#: utils/adt/jsonfuncs.c:4922
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "JSON 값으로 null을 사용할 수 없음"
 
-#: utils/adt/jsonfuncs.c:4923
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid ""
 "Exception was raised because null_value_treatment is \"raise_exception\"."
@@ -27510,7 +28873,7 @@ msgstr ""
 "null_value_treatment 설정값이 \"raise_exception\"으로 되어 있어 예외를 일으켰"
 "습니다."
 
-#: utils/adt/jsonfuncs.c:4924
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid ""
 "To avoid, either change the null_value_treatment argument or ensure that an "
@@ -27519,61 +28882,61 @@ msgstr ""
 "이 상황을 피하려면, null_value_treatment 설정을 바꾸든지, SQL NULL 값을 사용"
 "하지 않아야 합니다."
 
-#: utils/adt/jsonfuncs.c:4979
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "스칼라형에서 path를 지울 수 없음"
 
-#: utils/adt/jsonfuncs.c:5193
+#: utils/adt/jsonfuncs.c:5217
 #, c-format
 msgid "path element at position %d is null"
 msgstr "%d 위치의 path 요소는 null 입니다."
 
-#: utils/adt/jsonfuncs.c:5212 utils/adt/jsonfuncs.c:5243
-#: utils/adt/jsonfuncs.c:5316
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "이미 있는 키로는 대체할 수 없음"
 
-#: utils/adt/jsonfuncs.c:5213 utils/adt/jsonfuncs.c:5244
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr "path assumes key는 복합 자료형인데, 스칼라 값이 사용되고 있습니다."
 
-#: utils/adt/jsonfuncs.c:5317
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "키 값을 변경하려면, jsonb_set 함수를 사용하세요."
 
-#: utils/adt/jsonfuncs.c:5421
+#: utils/adt/jsonfuncs.c:5445
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
 msgstr "%d 번째 위치의 path 요소는 정수가 아님: \"%s\""
 
-#: utils/adt/jsonfuncs.c:5438
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "%d 번째 위치의 path 요소는 범위를 벗어남: %d"
 
-#: utils/adt/jsonfuncs.c:5590
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "잘못된 플래그 자료형, 배열이나, 스칼라 형만 허용합니다."
 
-#: utils/adt/jsonfuncs.c:5597
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "플래그 배열 요소가 문자열이 아님"
 
-#: utils/adt/jsonfuncs.c:5598 utils/adt/jsonfuncs.c:5620
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid ""
-"Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and "
-"\"all\"."
+"Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all"
+"\"."
 msgstr ""
 "사용 가능한 값: \"string\", \"numeric\", \"boolean\", \"key\", \"all\"."
 
-#: utils/adt/jsonfuncs.c:5618
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "플래그 배열 안에 잘못된 플래그: \"%s\""
@@ -27588,248 +28951,219 @@ msgstr "@ 기호는 루트 표현식에서는 사용할 수 없음"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST 키워드는 배열 하위 스크립트 전용임"
 
-#: utils/adt/jsonpath_exec.c:491
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "단일 불리언 반환값이 예상 됨"
 
-#: utils/adt/jsonpath_exec.c:851
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr "jsonpath wildcard array accessor는 하나의 배열을 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:874
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr "jsonpath wildcard member accessor는 하나의 객체를 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:923
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "jsonpath 배열 하위 스크립트 범위를 초과했습니다"
 
-#: utils/adt/jsonpath_exec.c:980
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr "jsonpath array accessor는 하나의 배열을 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:1044
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "JSON 객체 안에 \"%s\" 이름의 키가 없습니다."
 
-#: utils/adt/jsonpath_exec.c:1056
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr "jsonpath member accessor는 하나의 객체를 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:1114
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "jsonpath .%s() item method는 하나의 배열을 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:1167 utils/adt/jsonpath_exec.c:1193
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
 #, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type double "
-"precision"
-msgstr ""
-"\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 double precision형임"
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 %s 형임"
 
-#: utils/adt/jsonpath_exec.c:1172 utils/adt/jsonpath_exec.c:1198
-#: utils/adt/jsonpath_exec.c:1414 utils/adt/jsonpath_exec.c:1446
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
+#: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
 msgstr "jsonpath item method .%s()용으로 NaN 또는 Infinity는 허용하지 않음"
 
-#: utils/adt/jsonpath_exec.c:1211 utils/adt/jsonpath_exec.c:1313
-#: utils/adt/jsonpath_exec.c:1455 utils/adt/jsonpath_exec.c:1593
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a string or numeric value"
 msgstr "jsonpath item method .%s() 대상은 문자열이나, 숫자 값만 허용합니다."
 
-#: utils/adt/jsonpath_exec.c:1281 utils/adt/jsonpath_exec.c:1305
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr ""
-"\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 bigint형임"
-
-#: utils/adt/jsonpath_exec.c:1357 utils/adt/jsonpath_exec.c:1377
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr ""
-"\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 boolean형임"
-
-#: utils/adt/jsonpath_exec.c:1386
+#: utils/adt/jsonpath_exec.c:1385
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a boolean, string, or "
 "numeric value"
-msgstr "jsonpath item method .%s() 대상은 불리언, 문자열이나, 숫자 값만 허용합니다."
-
-#: utils/adt/jsonpath_exec.c:1439 utils/adt/jsonpath_exec.c:1528
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
 msgstr ""
-"\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 numeric형임"
+"jsonpath item method .%s() 대상은 불리언, 문자열이나, 숫자 값만 허용합니다."
 
-#: utils/adt/jsonpath_exec.c:1487
+#: utils/adt/jsonpath_exec.c:1486
 #, c-format
 msgid ""
 "precision of jsonpath item method .%s() is out of range for type integer"
-msgstr ""
-"jsonpath 아이템 메서드 .%s() 의 precision이 정수 범위를 벗어남"
+msgstr "jsonpath 아이템 메서드 .%s() 의 precision이 정수 범위를 벗어남"
 
-#: utils/adt/jsonpath_exec.c:1501
+#: utils/adt/jsonpath_exec.c:1500
 #, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
-msgstr ""
-"jsonpath 아이템 메서드 .%s() 의 스케일이 정수 범위를 벗어남"
-
-#: utils/adt/jsonpath_exec.c:1561 utils/adt/jsonpath_exec.c:1585
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr ""
-"\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 integer형임"
+msgstr "jsonpath 아이템 메서드 .%s() 의 스케일이 정수 범위를 벗어남"
 
-#: utils/adt/jsonpath_exec.c:1648
+#: utils/adt/jsonpath_exec.c:1647
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a boolean, string, "
 "numeric, or datetime value"
-msgstr "jsonpath item method .%s() 대상은 불리언, 문자열이나, 숫자 값만 허용합니다."
+msgstr ""
+"jsonpath item method .%s() 대상은 불리언, 문자열이나, 숫자 값만 허용합니다."
 
-#: utils/adt/jsonpath_exec.c:2137
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr "jsonpath %s 연산자의 왼쪽 값이 단일 숫자값이 아닙니다."
 
-#: utils/adt/jsonpath_exec.c:2144
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr "jsonpath %s 연산자의 오른쪽 값이 단일 숫자값이 아닙니다."
 
-#: utils/adt/jsonpath_exec.c:2212
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr "jsonpath %s 단항 연산용 값이 숫자가 아닙니다."
 
-#: utils/adt/jsonpath_exec.c:2311
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "jsonpath .%s() 항목 메서드는 숫자값만 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:2357
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "jsonpath .%s() 항목 메서드는 문자열만 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:2450
+#: utils/adt/jsonpath_exec.c:2449
 #, c-format
 msgid ""
 "time precision of jsonpath item method .%s() is out of range for type integer"
-msgstr ""
-"jsonpath 아이템 메서드 .%s()의 time precision이 정수 범위를 벗어남"
+msgstr "jsonpath 아이템 메서드 .%s()의 time precision이 정수 범위를 벗어남"
 
-#: utils/adt/jsonpath_exec.c:2484 utils/adt/jsonpath_exec.c:2490
-#: utils/adt/jsonpath_exec.c:2517 utils/adt/jsonpath_exec.c:2545
-#: utils/adt/jsonpath_exec.c:2598 utils/adt/jsonpath_exec.c:2649
-#: utils/adt/jsonpath_exec.c:2720
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
 #, c-format
 msgid "%s format is not recognized: \"%s\""
 msgstr "%s 포멧은 알 수 없음: \"%s\""
 
-#: utils/adt/jsonpath_exec.c:2486
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr "입력 자료 형식을 지정하는 datetime 템플릿 인자를 사용하세요."
 
-#: utils/adt/jsonpath_exec.c:2679 utils/adt/jsonpath_exec.c:2760
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
 #, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
-msgstr ""
-"jsonpath 아이템 메서드 .%s() 의 time precision이 잘못됨"
-"남"
+msgstr "jsonpath 아이템 메서드 .%s() 의 time precision이 잘못됨남"
 
-#: utils/adt/jsonpath_exec.c:2840
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "jsonpath .%s() 항목 메서드는 객체만 대상으로 합니다."
 
-#: utils/adt/jsonpath_exec.c:3124
+#: utils/adt/jsonpath_exec.c:3123
 #, c-format
 msgid "could not convert value of type %s to jsonpath"
 msgstr "%s 자료형의 값이 jsonpath 형으로 변환될 수 없음"
 
-#: utils/adt/jsonpath_exec.c:3158
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "\"%s\" jsonpath 변수 찾기 실패"
 
-#: utils/adt/jsonpath_exec.c:3211
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "\"vars\" 인자가 객체가 아닙니다."
 
-#: utils/adt/jsonpath_exec.c:3212
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid ""
 "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
 msgstr "jsonpath 매개 변수는 \"vars\" 객체의 키-값 쌍으로 인코드 되어야합니다."
 
-#: utils/adt/jsonpath_exec.c:3475
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "jsonpath 배열 첨자가 단일 숫자값이 아닙니다."
 
-#: utils/adt/jsonpath_exec.c:3487
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "jsonpath 배열 하위 스크립트가 정수 범위를 초과했음"
 
-#: utils/adt/jsonpath_exec.c:3671
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "지역 시간대 지정 없이는 %s에서 %s로 값을 바꿀 수 없습니다."
 
-#: utils/adt/jsonpath_exec.c:3673
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "지역 시간대를 지정하려면, *_tz() 함수를 사용하세요."
 
-#: utils/adt/jsonpath_exec.c:3981
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
 msgid ""
-"JSON path expression for column \"%s\" should return single item without "
-"wrapper"
+"JSON path expression for column \"%s\" must return single item when no "
+"wrapper is requested"
 msgstr ""
 "\"%s\" 칼럼의 JSON 패스 표현식은 wrapper 없이 단일 아이템을 반환해야 함"
 
-#: utils/adt/jsonpath_exec.c:3983 utils/adt/jsonpath_exec.c:3988
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
 msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
 msgstr "SQL/JSON 아이템을 배열로 만들려면, WITH WRAPPER 절을 사용하세요."
 
-#: utils/adt/jsonpath_exec.c:3987
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
 msgid ""
-"JSON path expression in JSON_QUERY should return single item without wrapper"
+"JSON path expression in JSON_QUERY must return single item when no wrapper "
+"is requested"
 msgstr ""
 "JSON_QUERY 안 JSON 패스 표현식은 wrapper 없이 단일 아이템을 반환해야 함"
 
-#: utils/adt/jsonpath_exec.c:4045 utils/adt/jsonpath_exec.c:4069
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
-msgid "JSON path expression for column \"%s\" should return single scalar item"
+msgid "JSON path expression for column \"%s\" must return single scalar item"
 msgstr "\"%s\" 칼럼을 위한 JSON 패스 표현식은 단일 스칼라 아이템을 반환해야 함"
 
-#: utils/adt/jsonpath_exec.c:4050 utils/adt/jsonpath_exec.c:4074
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
-msgid "JSON path expression in JSON_VALUE should return single scalar item"
+msgid "JSON path expression in JSON_VALUE must return single scalar item"
 msgstr "JSON_VALUE 안 JSON 패스 표현식은 단일 스칼라 아이템을 반환해야 함"
 
 #: utils/adt/levenshtein.c:132
@@ -27837,42 +29171,43 @@ msgstr "JSON_VALUE 안 JSON 패스 표현식은 단일 스칼라 아이템을 
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "levenshtein 인자값으로 그 길이가 %d 문자의 최대 길이를 초과했음"
 
-#: utils/adt/like.c:159
+#: utils/adt/like.c:162
 #, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "LIKE 연산에서 사용할 비결정 정렬규칙(collation)은 지원하지 않음"
+msgid "could not determine which collation to use for LIKE"
+msgstr "LIKE 연산에서 사용할 정렬규칙(collation)을 결정할 수 없음"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "ILIKE 연산에서 사용할 정렬규칙(collation)을 결정할 수 없음"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "ILIKE 연산에서 사용할 비결정 정렬규칙(collation)은 지원하지 않음"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "LIKE 패턴은 이스케이프 문자로 끝나지 않아야 함"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:803
 #, c-format
 msgid "invalid escape string"
 msgstr "잘못된 이스케이프 문자열"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:804
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "이스케이프 문자열은 비어있거나 한개의 문자여야 합니다."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
 msgstr "bytea 형식에서는 대/소문자를 구분하지 않는 일치가 지원되지 않음"
 
-#: utils/adt/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "bytea 형식에서는 정규식 일치가 지원되지 않음"
@@ -27897,7 +29232,7 @@ msgstr ""
 "macaddr8에서 macaddr 형으로 변환 할 수 있는 값은 왼쪽에서 4번째, 5번째 바이트"
 "가 FF와 FE 값(예: xx:xx:xx:ff:fe:xx:xx:xx)인 경우일 때만입니다."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d 프로그램은 PostgreSQL 서버 프로세스가 아닙니다"
@@ -28014,8 +29349,8 @@ msgstr "cidr 자료형에 대한 잘못된 입력: \"%s\""
 msgid "Value has bits set to right of mask."
 msgstr "마스크 오른쪽에 설정된 비트가 값에 포함되어 있습니다."
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "inet 값의 형식을 지정할 수 없음: %m"
@@ -28043,157 +29378,157 @@ msgstr "외부 \"%s\" 값의 길이가 잘못 되었음"
 msgid "invalid external \"cidr\" value"
 msgstr "외부 \"cidr\" 값이 잘못됨"
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "잘못된 마스크 길이: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "cidr 값을 처리할 수 없음: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "서로 다른 페밀리에서는 주소를 병합할 수 없음"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "서로 크기가 틀린 inet 값들은 AND 연산을 할 수 없습니다."
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "서로 크기가 틀린 inet 값들은 OR 연산을 할 수 없습니다."
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "결과가 범위를 벗어났습니다."
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "inet 값에서 서로 크기가 틀리게 부분 추출(subtract)할 수 없음"
 
-#: utils/adt/numeric.c:793 utils/adt/numeric.c:3659 utils/adt/numeric.c:7216
-#: utils/adt/numeric.c:7419 utils/adt/numeric.c:7891 utils/adt/numeric.c:10586
-#: utils/adt/numeric.c:11061 utils/adt/numeric.c:11155
-#: utils/adt/numeric.c:11290
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "값이 수치 형식에 넘처남"
 
-#: utils/adt/numeric.c:1106
+#: utils/adt/numeric.c:1108
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "외부 \"numeric\" 값의 부호가 잘못됨"
 
-#: utils/adt/numeric.c:1112
+#: utils/adt/numeric.c:1114
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "외부 \"numeric\" 값의 잘못된 스케일"
 
-#: utils/adt/numeric.c:1121
+#: utils/adt/numeric.c:1123
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "외부 \"numeric\" 값의 숫자가 잘못됨"
 
-#: utils/adt/numeric.c:1336 utils/adt/numeric.c:1350
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "NUMERIC 정밀도 %d 값은 범위(1 .. %d)를 벗어났습니다."
 
-#: utils/adt/numeric.c:1341
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "NUMERIC 스케일 %d 값은 %d부터 %d까지 입니다."
 
-#: utils/adt/numeric.c:1359
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "잘못된 NUMERIC 형식 한정자"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "시작값은 NaN 일 수 없음"
 
-#: utils/adt/numeric.c:1729
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "시작 값은 무한일 수 없음"
 
-#: utils/adt/numeric.c:1736
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "종료값은 NaN 일 수 없음"
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "종료값은 무한일 수 없음"
 
-#: utils/adt/numeric.c:1753
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "단계 크기는 NaN 일 수 없음"
 
-#: utils/adt/numeric.c:1757
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "단계 크기는 무한일 수 없음"
 
-#: utils/adt/numeric.c:3649
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "음수 거듭제곱이 정의되어 있지 않음"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "lower bound는 NaN 일 수 없음"
 
-#: utils/adt/numeric.c:4260
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "lower bound는 무한일 수 없음"
 
-#: utils/adt/numeric.c:4267
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "upper bound는 NaN 일 수 없음"
 
-#: utils/adt/numeric.c:4271
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "upper bound는 무한일 수 없음"
 
-#: utils/adt/numeric.c:4432 utils/adt/numeric.c:4520 utils/adt/numeric.c:4580
-#: utils/adt/numeric.c:4776
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "NaN 값을 %s 형으로 변환할 수 없습니다"
 
-#: utils/adt/numeric.c:4436 utils/adt/numeric.c:4524 utils/adt/numeric.c:4584
-#: utils/adt/numeric.c:4780
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "무한은 %s 형으로 변환할 수 없음"
 
-#: utils/adt/numeric.c:4789
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn 값의 범위를 벗어났습니다."
 
-#: utils/adt/numeric.c:7981 utils/adt/numeric.c:8032
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "수치 필드 오버플로우"
 
-#: utils/adt/numeric.c:7982
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid ""
 "A field with precision %d, scale %d must round to an absolute value less "
@@ -28202,12 +29537,12 @@ msgstr ""
 "전체 자릿수 %d, 소수 자릿수 %d의 필드는 %s%d보다 작은 절대 값으로 반올림해야 "
 "합니다."
 
-#: utils/adt/numeric.c:8033
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "전체 자릿수 %d, 소수 자릿수 %d의 필드는 무한 값을 처리할 수 없음."
 
-#: utils/adt/numeric.c:11359 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
@@ -28218,27 +29553,27 @@ msgstr "lower bound는 upper bound보다 작거나 같아야 함"
 msgid "invalid oidvector data"
 msgstr "잘못된 oidvector 자료"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:992
 #, c-format
 msgid "requested character too large"
 msgstr "요청된 문자가 너무 큼"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1036
 #, c-format
 msgid "character number must be positive"
 msgstr "문자 번호는 양수여야 함"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1040
 #, c-format
 msgid "null character not permitted"
 msgstr "null 문자는 허용되지 않음"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1058 utils/adt/oracle_compat.c:1111
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "요청한 문자가 너무 커서 인코딩할 수 없음: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1099
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "요청한 문자가 인코딩용으로 타당치 않음: %u"
@@ -28249,54 +29584,22 @@ msgstr "요청한 문자가 인코딩용으로 타당치 않음: %u"
 msgid "percentile value %g is not between 0 and 1"
 msgstr "%g 퍼센트 값이 0과 1사이가 아닙니다."
 
-#: utils/adt/pg_locale.c:326 utils/adt/pg_locale.c:358
+#: utils/adt/pg_locale.c:304 utils/adt/pg_locale.c:336
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "\"%s\" 로케일 이름에 사용할 수 없는 문자(non-ASCII)가 있음"
 
-#: utils/adt/pg_locale.c:1507
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr "\"%s\" 로케일(해당 규칙 \"%s\")용 문자 정렬 규칙 열기 실패: %s"
-
-#: utils/adt/pg_locale.c:1518 utils/adt/pg_locale.c:2992
-#: utils/adt/pg_locale.c:3065
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU 지원 기능을 뺀 채로 서버가 만들어졌습니다."
-
-#: utils/adt/pg_locale.c:1546
-#, c-format
-msgid "could not create locale \"%s\": %m"
-msgstr "\"%s\" 로케일을 만들 수 없음: %m"
-
-#: utils/adt/pg_locale.c:1549
-#, c-format
-msgid ""
-"The operating system could not find any locale data for the locale name "
-"\"%s\"."
-msgstr "운영체제에서 \"%s\" 로케일 이름에 대한 로케일 파일을 찾을 수 없습니다."
-
-#: utils/adt/pg_locale.c:1670
-#, c-format
-msgid ""
-"collations with different collate and ctype values are not supported on this "
-"platform"
-msgstr ""
-"이 플랫폼에서는 서로 다른 정렬규칙(collation)과 문자집합(ctype)을 함께 쓸 수 "
-"없습니다."
-
-#: utils/adt/pg_locale.c:1717
+#: utils/adt/pg_locale.c:1120
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "\"%s\" 문자 정렬 규칙은 버전이 없는데 버전을 지정했음"
 
-#: utils/adt/pg_locale.c:1723
+#: utils/adt/pg_locale.c:1126
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "\"%s\" 문자 정렬 규칙은 버전이 맞지 않음"
 
-#: utils/adt/pg_locale.c:1725
+#: utils/adt/pg_locale.c:1128
 #, c-format
 msgid ""
 "The collation in the database was created using version %s, but the "
@@ -28305,7 +29608,7 @@ msgstr ""
 "데이터베이스를 만들때 %s 버전으로 문자 정렬 규칙을 만들었는데, 현재 OS는 %s "
 "버전을 제공하고 있습니다."
 
-#: utils/adt/pg_locale.c:1728
+#: utils/adt/pg_locale.c:1131
 #, c-format
 msgid ""
 "Rebuild all objects affected by this collation and run ALTER COLLATION %s "
@@ -28315,94 +29618,131 @@ msgstr ""
 "VERSION 명령을 실행하거나, 바른 라이브러리 버전을 지정해서, PostgreSQL을 빌드"
 "하세요."
 
-#: utils/adt/pg_locale.c:1772 utils/adt/pg_locale.c:2556
-#: utils/adt/pg_locale.c:2581
+#: utils/adt/pg_locale.c:1484 utils/adt/pg_locale.c:1511
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "내장 제공자용 로케일 이름이 잘못됨: \"%s\""
 
-#: utils/adt/pg_locale.c:1814
+#: utils/adt/pg_locale.c:1576
 #, c-format
-msgid "could not load locale \"%s\""
-msgstr "\"%s\" 로케일을 불러올 수 없음"
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "\"%s\" 로케일 이름을 언어 태그로 변환할 수 없음: %s"
 
-#: utils/adt/pg_locale.c:1839
+#: utils/adt/pg_locale.c:1585 utils/adt/pg_locale.c:1660
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
-msgstr "\"%s\" 로케일용 정렬 변환 규칙을 구할 수 없음: 오류 코드 %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU 지원 기능을 뺀 채로 서버가 만들어졌습니다."
 
-#: utils/adt/pg_locale.c:1895 utils/adt/pg_locale.c:1908
+#: utils/adt/pg_locale.c:1618
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "UTF-16 인코딩으로 문자열을 변환할 수 없음: 오류번호 %lu"
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "\"%s\" ICU 로케일에서 언어 찾기 실패: %s"
 
-#: utils/adt/pg_locale.c:1920
+#: utils/adt/pg_locale.c:1620 utils/adt/pg_locale.c:1650
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "유니코드 문자열 비교 실패: %m"
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
+msgstr "ICU 로케일 검사를 하지 않으려면, \"%s\" 값을 \"%s\"로 지정하세요."
+
+#: utils/adt/pg_locale.c:1648
+#, c-format
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "\"%s\" ICU 로케일은 알 수 없는 \"%s\" 언어를 사용합니다."
+
+#: utils/adt/pg_locale_icu.c:264
+#, c-format
+msgid "could not get language from locale \"%s\": %s"
+msgstr "\"%s\" 로케일에서 언어를 찾을 수 없음: %s"
+
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
+#, c-format
+msgid "could not open collator for locale \"%s\": %s"
+msgstr "\"%s\" 로케일용 문자 정렬 규칙 열기 실패: %s"
+
+#: utils/adt/pg_locale_icu.c:374
+#, c-format
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr "\"%s\" 로케일(해당 규칙 \"%s\")용 문자 정렬 규칙 열기 실패: %s"
 
-#: utils/adt/pg_locale.c:2094
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
 msgid "collation failed: %s"
 msgstr "문자열 정렬: %s"
 
-#: utils/adt/pg_locale.c:2313 utils/adt/pg_locale.c:2345
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "정렬 키 생성 실패: %s"
 
-#: utils/adt/pg_locale.c:2635
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653
+#: utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
-msgid "could not get language from locale \"%s\": %s"
-msgstr "\"%s\" 로케일에서 언어를 찾을 수 없음: %s"
+msgid "%s failed: %s"
+msgstr "%s 실패: %s"
 
-#: utils/adt/pg_locale.c:2656 utils/adt/pg_locale.c:2672
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
-msgid "could not open collator for locale \"%s\": %s"
-msgstr "\"%s\" 로케일용 문자 정렬 규칙 열기 실패: %s"
+msgid "case conversion failed: %s"
+msgstr "잘못된 형 변환 규칙: %s"
 
-#: utils/adt/pg_locale.c:2697
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "\"%s\" 인코딩은 ICU 기능을 지원하지 않음"
 
-#: utils/adt/pg_locale.c:2704
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "\"%s\" 인코딩용 ICU 변환기 열기 실패: %s"
 
-#: utils/adt/pg_locale.c:2722 utils/adt/pg_locale.c:2741
-#: utils/adt/pg_locale.c:2797 utils/adt/pg_locale.c:2808
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "%s failed: %s"
-msgstr "%s 실패: %s"
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
+msgstr ""
+"이 플랫폼에서는 서로 다른 정렬규칙(collation)과 문자집합(ctype)을 함께 쓸 수 "
+"없습니다."
 
-#: utils/adt/pg_locale.c:2983
+#: utils/adt/pg_locale_libc.c:683
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "\"%s\" 로케일 이름을 언어 태그로 변환할 수 없음: %s"
+msgid "could not load locale \"%s\""
+msgstr "\"%s\" 로케일을 불러올 수 없음"
 
-#: utils/adt/pg_locale.c:3024
+#: utils/adt/pg_locale_libc.c:708
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "\"%s\" ICU 로케일에서 언어 찾기 실패: %s"
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr "\"%s\" 로케일용 정렬 변환 규칙을 구할 수 없음: 오류 코드 %lu"
 
-#: utils/adt/pg_locale.c:3026 utils/adt/pg_locale.c:3055
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr "ICU 로케일 검사를 하지 않으려면, \"%s\" 값을 \"%s\"로 지정하세요."
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "UTF-16 인코딩으로 문자열을 변환할 수 없음: 오류번호 %lu"
 
-#: utils/adt/pg_locale.c:3053
+#: utils/adt/pg_locale_libc.c:793
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "\"%s\" ICU 로케일은 알 수 없는 \"%s\" 언어를 사용합니다."
+msgid "could not compare Unicode strings: %m"
+msgstr "유니코드 문자열 비교 실패: %m"
+
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "\"%s\" 로케일을 만들 수 없음: %m"
+
+#: utils/adt/pg_locale_libc.c:828
+#, c-format
+msgid ""
+"The operating system could not find any locale data for the locale name \"%s"
+"\"."
+msgstr "운영체제에서 \"%s\" 로케일 이름에 대한 로케일 파일을 찾을 수 없습니다."
 
-#: utils/adt/pg_locale.c:3204
+#: utils/adt/pg_locale_libc.c:1000
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "로케일을 위한 잘못된 멀티바이트 문자"
 
-#: utils/adt/pg_locale.c:3205
+#: utils/adt/pg_locale_libc.c:1001
 #, c-format
 msgid ""
 "The server's LC_CTYPE locale is probably incompatible with the database "
@@ -28419,22 +29759,22 @@ msgstr "NaN 값을 pg_lsn 형으로 변환할 수 없습니다"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "pg_lsn 에서는 NaN 형을 빼낼 수 없습니다"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr "함수는 서버가 이진 업그레이드 상태에서만 호출 될 수 있습니다"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "잘못된 명령어 이름: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1909
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "알 수 없는 리셋 타겟: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1910
 #, c-format
 msgid ""
 "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", "
@@ -28443,7 +29783,7 @@ msgstr ""
 "사용 가능한 타겟은 \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", "
 "\"recovery_prefetch\", \"slru\", \"wal\" 입니다."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2027
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "잘못된 구독 OID %u"
@@ -28468,72 +29808,72 @@ msgstr "셸 형태 값은 사용할 수 없음"
 msgid "cannot display a value of a shell type"
 msgstr "shell 형식의 값은 표시할 수 없음"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "range 자료형 구성자 플래그 인자로 null을 사용할 수 없음"
 
-#: utils/adt/rangetypes.c:1021
+#: utils/adt/rangetypes.c:1023
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "범위 차이 결과가 연속적이지 않습니다."
 
-#: utils/adt/rangetypes.c:1082
+#: utils/adt/rangetypes.c:1084
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "범위 결합 결과가 연속적이지 않습니다."
 
-#: utils/adt/rangetypes.c:1757
+#: utils/adt/rangetypes.c:1821
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "range 자료형의 하한값은 상한값과 같거나 작아야 합니다"
 
-#: utils/adt/rangetypes.c:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "잘못된 range 구성 플래그"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "유효한 값은 \"[]\", \"[)\", \"(]\", \"()\"."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "비정상적인 range 문자: \"%s\""
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr " \"empty\" 키워드 뒤에 정크가 있음"
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "왼쪽 괄호가 빠졌음"
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "하한값 뒤에 쉼표가 빠졌음"
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "칼럼이 너무 많습니다."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "오른쪽 괄호 다음에 정크가 있음"
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2022 utils/adt/varlena.c:4475
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "잘못된 정규식: %s"
@@ -28552,15 +29892,15 @@ msgstr ""
 "시작 위치를 지정하려는 regexp_replace() 함수 사용인 경우, 네번째 인자는 정수"
 "형을 지정해야합니다."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6820 utils/misc/guc.c:6854
+#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1108
+#: utils/adt/regexp.c:1172 utils/adt/regexp.c:1181 utils/adt/regexp.c:1190
+#: utils/adt/regexp.c:1199 utils/adt/regexp.c:1879 utils/adt/regexp.c:1888
+#: utils/adt/regexp.c:1897 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "잘못된 \"%s\" 매개 변수의 값: %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:939
 #, c-format
 msgid ""
 "SQL regular expression may not contain more than two escape-double-quote "
@@ -28569,19 +29909,19 @@ msgstr ""
 "SQL 정규 표현식에서는 두 개 이상의 이스케이프 큰 따옴표 구분자를 쓸 수 없음"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1119 utils/adt/regexp.c:1210 utils/adt/regexp.c:1297
+#: utils/adt/regexp.c:1336 utils/adt/regexp.c:1724 utils/adt/regexp.c:1779
+#: utils/adt/regexp.c:1908
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s 함수는 \"global\" 옵션을 지원하지 않음"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1338
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "대신에 regexp_matches 함수를 사용하세요."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1526
 #, c-format
 msgid "too many regular expression matches"
 msgstr "너무 많음 정규식 매치"
@@ -28596,18 +29936,18 @@ msgstr "\"%s\"(이)라는 함수가 두 개 이상 있음"
 msgid "more than one operator named %s"
 msgstr "%s(이)라는 연산자가 두 개 이상 있음"
 
-#: utils/adt/regproc.c:670 gram.y:8992
+#: utils/adt/regproc.c:670 gram.y:9100
 #, c-format
 msgid "missing argument"
 msgstr "인자가 빠졌음"
 
-#: utils/adt/regproc.c:671 gram.y:8993
+#: utils/adt/regproc.c:671 gram.y:9101
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "단항 연산자에서 인자 없음을 표시할 때는 NONE 인자를 사용하세요."
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10509
-#: utils/adt/ruleutils.c:10722
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "인자가 너무 많습니다"
@@ -28618,7 +29958,7 @@ msgid "Provide two argument types for operator."
 msgstr "연산자를 위해서는 두개의 인자 자료형을 지정하십시오."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3481 utils/adt/varlena.c:3486
 #, c-format
 msgid "invalid name syntax"
 msgstr "잘못된 이름 구문"
@@ -28643,40 +29983,40 @@ msgstr "자료형 이름을 지정하십시오"
 msgid "improper type name"
 msgstr "부적절한 형식 이름"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 "\"%s\" 테이블에서 자료 추가, 갱신 작업이 \"%s\" 참조키(foreign key) 제약 조건"
 "을 위배했습니다"
 
-#: utils/adt/ri_triggers.c:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, c-format
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL에 null 키 값과 nonnull 키 값을 함께 사용할 수 없습니다."
 
-#: utils/adt/ri_triggers.c:2036
+#: utils/adt/ri_triggers.c:2192
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "INSERT에 대해 \"%s\" 함수를 실행해야 함"
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2198
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "UPDATE에 대해 \"%s\" 함수를 실행해야 함"
 
-#: utils/adt/ri_triggers.c:2048
+#: utils/adt/ri_triggers.c:2204
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "DELETE에 대해 \"%s\" 함수를 실행해야 함"
 
-#: utils/adt/ri_triggers.c:2071
+#: utils/adt/ri_triggers.c:2227
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "\"%s\" 트리거(해당 테이블: \"%s\")에 대한 pg_constraint 항목이 없음"
 
-#: utils/adt/ri_triggers.c:2073
+#: utils/adt/ri_triggers.c:2229
 #, c-format
 msgid ""
 "Remove this referential integrity trigger and its mates, then do ALTER TABLE "
@@ -28685,12 +30025,12 @@ msgstr ""
 "해당 트리거 관련 개체를 제거한 후 ALTER TABLE ADD CONSTRAINT 명령으로 추가하"
 "세요"
 
-#: utils/adt/ri_triggers.c:2103 gram.y:4340
+#: utils/adt/ri_triggers.c:2259 gram.y:4454
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL 기능은 아직 구현 안되었습니다"
 
-#: utils/adt/ri_triggers.c:2426
+#: utils/adt/ri_triggers.c:2599
 #, c-format
 msgid ""
 "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
@@ -28699,32 +30039,51 @@ msgstr ""
 "\"%s\"에 대한 참조 무결성 쿼리(제약조건: \"%s\", 해당 릴레이션: \"%s\")를 실"
 "행하면 예기치 않은 결과가 발생함"
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "이 문제는 주로 룰이 재작성 되었을 때 발생합니다."
 
-#: utils/adt/ri_triggers.c:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr "\"%s\" 파티션 지우기는 \"%s\" 참조키 제약조건을 위반함"
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "(%s)=(%s) 키가 \"%s\" 테이블에서 여전히 참조됩니다."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "(%s)=(%s) 키가 \"%s\" 테이블에 없습니다."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "\"%s\" 테이블에 키가 없습니다."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, c-format
+msgid ""
+"update or delete on table \"%s\" violates RESTRICT setting of foreign key "
+"constraint \"%s\" on table \"%s\""
+msgstr ""
+"\"%s\" 테이블의 자료 갱신, 삭제 작업이 RESTRICT \"%s\" 참조키(foreign key) 제"
+"약 조건 - \"%s\" 테이블 - 을 위반했습니다"
+
+#: utils/adt/ri_triggers.c:2792
+#, c-format
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "(%s)=(%s) 키가 \"%s\" 테이블에서 여전히 참조됩니다."
+
+#: utils/adt/ri_triggers.c:2795
+#, c-format
+msgid "Key is referenced from table \"%s\"."
+msgstr "\"%s\" 테이블에서 키가 여전히 참조됩니다."
+
+#: utils/adt/ri_triggers.c:2801
 #, c-format
 msgid ""
 "update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
@@ -28733,7 +30092,7 @@ msgstr ""
 "\"%s\" 테이블의 자료 갱신, 삭제 작업이 \"%s\" 참조키(foreign key) 제약 조건 "
 "- \"%s\" 테이블 - 을 위반했습니다"
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "\"%s\" 테이블에서 키가 여전히 참조됩니다."
@@ -28785,146 +30144,175 @@ msgstr "바이너리 자료형이 %u (%s) 임. 기대 자료형: %u (%s), 해당
 msgid "improper binary format in record column %d"
 msgstr "%d 번째 레코드 열에서 잘못된 바이너리 포맷이 있습니다"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "서로 다른 열 형식 %s과(와) %s(레코드 열 %d)을(를) 비교할 수 없음"
 
 #: utils/adt/rowtypes.c:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "칼럼 수가 서로 다른 레코드 자료형을 비교할 수 없음"
 
-#: utils/adt/ruleutils.c:2694
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "입력값이 expression이 아니라, query 임"
 
-#: utils/adt/ruleutils.c:2706
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "expression이 하나 이상의 릴레이션 변수를 포함하고 있음"
 
-#: utils/adt/ruleutils.c:2713
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "expression이 변수들을 포함하고 있음"
 
-#: utils/adt/ruleutils.c:5246
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "\"%s\" 룰은 %d 이벤트 형태를 지원하지 않습니다"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, c-format
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "\"%s.%s\" 릴레이션용 최신 볼 수 있는 tid를 찾을 수 없음"
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr "ctid는 TID 형이 아님"
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr "currtid는 no CTID 뷰를 처리할 수 없음"
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr "해당 뷰에 룰이 정의 되어 있지 않음"
+
+#: utils/adt/tid.c:381
+#, c-format
+msgid "only one select rule is allowed in views"
+msgstr "뷰에는 하나의 select 룰만 허용함"
+
+#: utils/adt/timestamp.c:130
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "TIMESTAMP(%d)%s 정밀도로 음수를 사용할 수 없습니다"
 
-#: utils/adt/timestamp.c:134
+#: utils/adt/timestamp.c:136
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIMESTAMP(%d)%s 정밀도는 최대값(%d)으로 줄였습니다"
 
-#: utils/adt/timestamp.c:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "타임스탬프 값이 범위를 벗어났음: \"%s\""
+
+#: utils/adt/timestamp.c:396
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "타임스탬프(%d) 정밀도는 %d에서 %d 사이여야 함"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "숫자형 타임 존 형식은 처음에 \"-\" 또는 \"+\" 문자가 있어야 합니다."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "\"%s\" 숫자형 타임 존 범위 벗어남"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "타임스탬프 값이 범위를 벗어났음: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "타임스탬프 값으로 NaN 값을 지정할 수 없음"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "타임스탬프 값이 범위를 벗어났음: \"%g\""
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "간격이 범위를 벗어남"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "잘못된 INTERVAL 형식 한정자"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d) 정밀도로 음수값이 올 수 없습니다"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d) 정밀도는 허용 최대치(%d)로 감소 되었습니다"
 
-#: utils/adt/timestamp.c:1506
+#: utils/adt/timestamp.c:1497
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "간격(%d) 정밀도는 %d에서 %d 사이여야 함"
 
-#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "오리진의 범위를 벗어났습니다."
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
 #, c-format
 msgid "timestamps cannot be binned into infinite intervals"
 msgstr "timestamp값은 무한 interval 형으로 바인드할 수 없음"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr "timestamp값은 월이나 년을 포함하는 interval 형으로 바인드할 수 없음"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "stride 값은 0 보다 커야 합니다"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "달에는 보통 분수형태의 주간이 있습니다."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "단계 크기는 무한일 수 없음"
@@ -29005,32 +30393,32 @@ msgstr ""
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "ts_rewrite 쿼리는 두 개의 tsquery 칼럼을 반환해야 함"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "가중치 배열은 일차원 배열이어야 함"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "가중치 배열이 너무 짧음"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "가중치 배열에는 null이 포함되지 않아야 함"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "가중치가 범위를 벗어남"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "단어가 너무 긺(%ld바이트, 최대 %ld바이트)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr ""
@@ -29111,7 +30499,7 @@ msgstr "이스케이프 문자가 없음: \"%s\""
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "tsvector에 잘못된 위치 정보가 있음: \"%s\""
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "무작위 값 생성 실패"
@@ -29157,9 +30545,9 @@ msgstr "외부 비트 문자열의 길이가 잘못되었습니다"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "비트 문자열이 너무 깁니다(해당 자료형 bit varying(%d))"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919
+#: utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3102
+#: utils/adt/varlena.c:3180
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "substring에서 음수 길이는 허용하지 않음"
@@ -29184,7 +30572,7 @@ msgstr "서로 크기가 틀린 비트 문자열은 XOR 연산을 할 수 없습
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "비트 %d 인덱스의 범위를 벗어남 (0..%d)"
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3384
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "새 비트값은 0 또는 1 이어야 합니다"
@@ -29199,95 +30587,94 @@ msgstr "character(%d) 자료형에 너무 긴 자료를 담으려고 합니다."
 msgid "value too long for type character varying(%d)"
 msgstr "character varying(%d) 자료형에 너무 긴 자료를 담으려고 합니다."
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1591
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "문자열 비교 작업에 사용할 정렬규칙(collation)을 결정할 수 없음"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1864
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "문자열 검색 작업에 사용할 비결정 정렬규칙(collation)을 지원하지 않음"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3268 utils/adt/varlena.c:3335
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "%d 인덱스의 범위를 벗어남, 0..%d"
 
-#: utils/adt/varlena.c:3252 utils/adt/varlena.c:3324
+#: utils/adt/varlena.c:3299 utils/adt/varlena.c:3371
 #, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "%lld 인덱스의 범위를 벗어남, 0..%lld"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "%<PRId64> 인덱스의 범위를 벗어남, 0..%<PRId64>"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4587
 #, c-format
 msgid "field position must not be zero"
 msgstr "필드 위치 값은 0 이 아니여야 함"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5832
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "마무리 안된 format() 형 식별자"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5833 utils/adt/varlena.c:5967 utils/adt/varlena.c:6088
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "하나의 \"%%\" 문자를 표시하려면, \"%%%%\" 형태로 사용하세요"
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:5965 utils/adt/varlena.c:6086
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "인식할 수 없는 format() 형 식별자 \"%.*s\""
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:5978 utils/adt/varlena.c:6035
 #, c-format
 msgid "too few arguments for format()"
 msgstr "format() 작업을 위한 인자가 너무 적음"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6131 utils/adt/varlena.c:6313
 #, c-format
 msgid "number is out of range"
 msgstr "수치 범위를 벗어남"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6194 utils/adt/varlena.c:6222
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr ""
 "format 함수에서 사용할 수 있는 인자 위치 번호는 0이 아니라, 1부터 시작합니다"
 
-#: utils/adt/varlena.c:6013
+#: utils/adt/varlena.c:6215
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "넓이 인자 위치값은 \"$\" 문자로 끝나야 합니다"
 
-#: utils/adt/varlena.c:6058
+#: utils/adt/varlena.c:6260
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "null 값은 SQL 식별자로 포멧될 수 없음"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6468
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr ""
 "유니코드 normalization 작업은 서버 인코딩이 UTF8 일때만 할 수 있습니다."
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6481
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "잘못된 normalization 형식: %s"
 
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6526
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
-msgstr ""
-"유니코드 분류 작업은 서버 인코딩이 UTF8 일때만 할 수 있습니다."
+msgstr "유니코드 분류 작업은 서버 인코딩이 UTF8 일때만 할 수 있습니다."
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6743 utils/adt/varlena.c:6778 utils/adt/varlena.c:6813
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "잘못된 유니코드 코드 포인트: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6843
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr ""
@@ -29304,12 +30691,12 @@ msgstr "ntile의 인자는 0보다 커야 함"
 msgid "argument of nth_value must be greater than zero"
 msgstr "nth_value의 인자는 0보다 커야 함"
 
-#: utils/adt/xid8funcs.c:124
+#: utils/adt/xid8funcs.c:120
 #, c-format
-msgid "transaction ID %llu is in the future"
-msgstr "%llu 트랜잭션 ID는 미래의 것입니다"
+msgid "transaction ID %<PRIu64> is in the future"
+msgstr "%<PRIu64> 트랜잭션 ID는 미래의 것입니다"
 
-#: utils/adt/xid8funcs.c:553
+#: utils/adt/xid8funcs.c:522
 #, c-format
 msgid "invalid external pg_snapshot data"
 msgstr "외부 pg_snapshot 자료가 잘못됨"
@@ -29324,7 +30711,7 @@ msgstr "지원되지 않는 XML 기능"
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "이 기능을 사용하려면 libxml 지원으로 서버를 빌드해야 합니다."
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:628
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "\"%s\" 인코딩 이름이 잘못됨"
@@ -29339,45 +30726,45 @@ msgstr "잘못된 XML 주석"
 msgid "not an XML document"
 msgstr "XML 문서가 아님"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "잘못된 XML 처리 명령"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "XML 처리 명령 대상 이름은 \"%s\"일 수 없습니다."
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML 처리 명령에는 \"?&gt;\"를 포함할 수 없습니다."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate가 구현되어 있지 않음"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "XML 라이브러리를 초기화할 수 없음"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid ""
 "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr ""
-"libxml2에 호환되지 않는 문자 자료형 있음: sizeof(char)=%zu, "
-"sizeof(xmlChar)=%zu"
+"libxml2에 호환되지 않는 문자 자료형 있음: sizeof(char)=%zu, sizeof(xmlChar)="
+"%zu"
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "XML 오류 핸들러를 설정할 수 없음"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, c-format
 msgid ""
 "This probably indicates that the version of libxml2 being used is not "
@@ -29386,121 +30773,127 @@ msgstr ""
 "이 문제는 PostgreSQL 서버를 만들 때 사용한 libxml2 헤더 파일이 호환성이 없는 "
 "것 같습니다."
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "잘못된 문자 값입니다."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "공간이 필요합니다."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "독립 실행형은 &apos;yes&apos; 또는 &apos;no&apos;만 허용합니다."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "선언 형식이 잘못됨: 버전이 누락되었습니다."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "텍스트 선언에서 인코딩이 누락되었습니다."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "XML 선언 구문 분석 중: &apos;?&gt;&apos;가 필요합니다."
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "인식할 수 없는 libxml 오류 코드: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2555
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML은 무한 날짜 값을 지원하지 않습니다."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2577 utils/adt/xml.c:2604
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML은 무한 타임스탬프 값을 지원하지 않습니다."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3020
 #, c-format
 msgid "invalid query"
 msgstr "잘못된 쿼리"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3112
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "\"%s\" 포털은 집합을 반환할 수 없습니다."
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4364
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "XML 네임스페이스 매핑에 사용할 배열이 잘못됨"
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4365
 #, c-format
 msgid ""
 "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr ""
 "이 배열은 key, value로 구성된 배열을 요소로 하는 2차원 배열이어야 합니다."
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4389
 #, c-format
 msgid "empty XPath expression"
 msgstr "XPath 식이 비어 있음"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4441
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "네임스페이스 이름 및 URI는 null일 수 없음"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4448
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr ""
 "이름 \"%s\" 및 URI \"%s\"을(를) 사용하여 XML 네임스페이스를 등록할 수 없음"
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4797
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "DEFAULT 네임스페이스는 지원하지 않습니다."
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4826
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "로우 경로 필터는 비어있으면 안됩니다"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4860
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "칼럼 경로 필터는 비어있으면 안됩니다"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5007
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "칼럼 XPath 표현식에 사용된 결과가 하나 이상의 값을 사용합니다"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "다형적 함수 \"%s\"의 실제 인수 형식을 확인할 수 없음"
+
+#: utils/cache/lsyscache.c:1109
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "%s 형에서 %s 형으로 바꾸는 형변환 규칙(cast)가 없음"
 
 # # nonun 부분 end
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3027 utils/cache/lsyscache.c:3060
+#: utils/cache/lsyscache.c:3093 utils/cache/lsyscache.c:3126
 #, c-format
 msgid "type %s is only a shell"
 msgstr "%s 형식은 셸일 뿐임"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3032
 #, c-format
 msgid "no input function available for type %s"
 msgstr "%s 자료형을 위한 입력 함수가 없습니다"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3065
 #, c-format
 msgid "no output function available for type %s"
 msgstr "%s 자료형을 위한 출력 함수가 없습니다"
@@ -29514,32 +30907,27 @@ msgstr ""
 "\"%s\" 연산자 클래스(접근 방법: %s)에는 %d 개의 지원 지원 함수(해당 자료형 "
 "%s)가 빠졌습니다"
 
-#: utils/cache/plancache.c:747
-#, c-format
-msgid "cached plan must not change result type"
-msgstr "캐시된 계획에서 결과 형식을 바꾸지 않아야 함"
-
-#: utils/cache/relcache.c:3801
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "이진 업그레이드 작업 때, 힙 relfilenumber 값이 지정되지 않았습니다"
 
-#: utils/cache/relcache.c:3809
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "바이너리 업그레이드 모드 중에 새 relfilenumber 값 요청이 실패"
 
-#: utils/cache/relcache.c:6539
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "\"%s\" 릴레이션-캐시 초기화 파일을 만들 수 없음: %m"
 
-#: utils/cache/relcache.c:6541
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "어쨌든 계속하는데, 뭔가 잘못 된 것이 있습니다."
 
-#: utils/cache/relcache.c:6871
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "\"%s\" 캐쉬 파일을 삭제할 수 없음: %m"
@@ -29559,7 +30947,7 @@ msgstr "\"%s\" 릴레이션 맵핑 파일에 잘못된 데이터가 있습니다
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "\"%s\" 릴레이션 맵핑 파일에 잘못된 checksum 값이 있음"
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "레코드 형식이 등록되지 않았음"
@@ -29574,193 +30962,180 @@ msgstr "TRAP: ExceptionalCondition: %d PID 안에 잘못된 인자\n"
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "TRAP: Assert 실패(\"%s\"), 파일: \"%s\", 줄: %d, PID: %d\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "오류 메시지 처리가 활성화 되기 전에 오류가 발생했습니다\n"
 
-#: utils/error/elog.c:2134
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "stderr 로 사용하기 위해 \"%s\" 파일 다시 열기 실패: %m"
 
-#: utils/error/elog.c:2147
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "표준출력(stdout)으로 사용하기 위해 \"%s\" 파일 다시 열기 실패: %m"
 
-#: utils/error/elog.c:2183
+#: utils/error/elog.c:2191
 #, c-format
-msgid "Invalid character"
-msgstr "잘못된 문자"
+msgid "Invalid character."
+msgstr "잘못된 문자입니다."
 
-#: utils/error/elog.c:2889 utils/error/elog.c:2916 utils/error/elog.c:2932
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[알수없음]"
 
-#: utils/error/elog.c:3202 utils/error/elog.c:3526 utils/error/elog.c:3633
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "오류 내용을 뺍니다"
 
-#: utils/error/elog.c:3205 utils/error/elog.c:3208
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " %d 번째 문자 부근"
 
-#: utils/error/elog.c:3218 utils/error/elog.c:3225
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "상세정보:  "
 
-#: utils/error/elog.c:3232
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "힌트:  "
 
-#: utils/error/elog.c:3239
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "쿼리:"
 
-#: utils/error/elog.c:3246
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "내용:  "
 
-#: utils/error/elog.c:3256
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "위치: %s, %s:%d\n"
 
-#: utils/error/elog.c:3263
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "위치: %s:%d\n"
 
-#: utils/error/elog.c:3270
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "역추적:  "
 
-#: utils/error/elog.c:3282
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "명령 구문:  "
 
-#: utils/error/elog.c:3678
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "디버그"
 
-#: utils/error/elog.c:3682
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "로그"
 
-#: utils/error/elog.c:3685
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "정보"
 
-#: utils/error/elog.c:3688
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "알림"
 
-#: utils/error/elog.c:3692
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "경고"
 
-#: utils/error/elog.c:3695
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "오류"
 
-#: utils/error/elog.c:3698
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "치명적오류"
 
-#: utils/error/elog.c:3701
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "손상"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "\"%s\" 함수를 \"%s\" 파일에서 찾을 수 없음"
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "\"%s\" 라이브러리를 불러 올 수 없음: %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "\"%s\" 라이브러리는 사용할 수 없습니다: magic black 없음"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "확장 라이브러리를 만들 때, PG_MODULE_MAGIC 매크로를 사용해서 만드세요."
 
-#: utils/fmgr/dfmgr.c:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "\"%s\" 라이브러리는 사용할 수 없습니다: 버전이 틀림"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "서버 버전 = %d, 라이브러리 버전 %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "\"%s\" 라이브러리는 호환되지 않음: ABI 틀림"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "서버 ABI는 \"%s\", 라이브러리 ABI는 \"%s\"."
 
-#: utils/fmgr/dfmgr.c:361
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "서버의 경우 FUNC_MAX_ARGS = %d인데 라이브러리에 %d이(가) 있습니다."
-
-#: utils/fmgr/dfmgr.c:370
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "서버의 경우 INDEX_MAX_KEYS = %d인데 라이브러리에 %d이(가) 있습니다."
-
-#: utils/fmgr/dfmgr.c:379
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "서버의 경우 NAMEDATALEN = %d인데 라이브러리에 %d이(가) 있습니다."
+msgid "Server has %s = %d, library has %d."
+msgstr "서버의 경우 %s = %d인데, 라이브러리는 %d 입니다."
 
-#: utils/fmgr/dfmgr.c:388
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
 #, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "서버의 경우 FLOAT8PASSBYVAL = %s인데 라이브러리에 %s이(가) 있습니다."
+msgid "Server has %s = %s, library has %s."
+msgstr "서버의 경우 %s = %s인데, 라이브러리는 %s 입니다."
 
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "매직 블록에 예기치 않은 길이 또는 여백 차이가 있습니다."
 
-#: utils/fmgr/dfmgr.c:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "\"%s\" 라이브러리는 사용할 수 없습니다: magic black 틀림"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "\"%s\" 라이브러리 사용이 금지되어있습니다"
 
-#: utils/fmgr/dfmgr.c:501
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "동적 라이브러리 경로에서 잘못된 매크로 이름: %s"
-
-#: utils/fmgr/dfmgr.c:541
+#: utils/fmgr/dfmgr.c:554
 #, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "\"dynamic_library_path\" 매개 변수 값으로 길이가 0인 값을 사용했음"
+msgid "invalid macro name in path: %s"
+msgstr "패스 안에 잘못된 매크로 이름: %s"
 
-#: utils/fmgr/dfmgr.c:560
+#: utils/fmgr/dfmgr.c:606
 #, c-format
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "\"dynamic_library_path\" 매개 변수 값으로 절대 경로를 사용할 수 없음"
+msgid "zero-length component in parameter \"%s\""
+msgstr "\"%s\" 매개 변수 값으로 길이가 0인 값을 사용했음"
 
 #: utils/fmgr/fmgr.c:236
 #, c-format
@@ -29822,97 +31197,169 @@ msgstr "열 별칭이 제공되지 않았음"
 msgid "could not determine row description for function returning record"
 msgstr "레코드를 리턴하는 함수를 위한 행(row) 구성 정보를 구할 수 없음"
 
-#: utils/init/miscinit.c:353
-#, c-format
-msgid "data directory \"%s\" does not exist"
-msgstr "\"%s\" 데이터 디렉터리 없음"
+#: utils/init/miscinit.c:265
+msgid "unknown process type"
+msgstr "알 수 없는 프로세스 유형"
+
+#: utils/init/miscinit.c:270
+msgid "not initialized"
+msgstr "초기화 할 수 없음"
+
+#: utils/init/miscinit.c:273
+msgid "archiver"
+msgstr "archiver"
+
+#: utils/init/miscinit.c:276
+msgid "autovacuum launcher"
+msgstr "autovacuum 관리자"
+
+#: utils/init/miscinit.c:279
+msgid "autovacuum worker"
+msgstr "autovacuum 작업자"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "클라이언트 백엔드"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr "끊긴 클라이언트 백엔드"
+
+#: utils/init/miscinit.c:288
+msgid "background worker"
+msgstr "백그라운드 작업자"
+
+#: utils/init/miscinit.c:291
+msgid "background writer"
+msgstr "백그라운드 writer"
+
+#: utils/init/miscinit.c:294
+msgid "checkpointer"
+msgstr "체크포인터"
+
+#: utils/init/miscinit.c:300
+msgid "logger"
+msgstr "로거"
+
+#: utils/init/miscinit.c:303
+msgid "slotsync worker"
+msgstr "슬롯 동기화 작업자"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr "독립 백엔드"
+
+#: utils/init/miscinit.c:309
+msgid "startup"
+msgstr "startup"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr "walreceiver"
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr "walsender"
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr "walsummarizer"
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr "walwriter"
 
 #: utils/init/miscinit.c:358
 #, c-format
+msgid "data directory \"%s\" does not exist"
+msgstr "\"%s\" 데이터 디렉터리 없음"
+
+#: utils/init/miscinit.c:363
+#, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 읽기 권한 없음: %m"
 
-#: utils/init/miscinit.c:366
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "지정한 \"%s\" 데이터 디렉터리는 디렉터리가 아님"
 
-#: utils/init/miscinit.c:382
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "\"%s\" 데이터 디렉터리 소유주가 잘못 되었습니다."
 
-#: utils/init/miscinit.c:384
+#: utils/init/miscinit.c:389
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr "서버는 지정한 데이터 디렉터리의 소유주 권한으로 시작되어야 합니다."
 
-#: utils/init/miscinit.c:402
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "\"%s\" 데이터 디렉터리 접근 권한에 문제가 있습니다."
 
-#: utils/init/miscinit.c:404
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "액세스 권한은 u=rwx (0700) 또는 u=rwx,o=rx (0750) 값이어야 합니다."
 
-#: utils/init/miscinit.c:462
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "\"%s\" 이름의 디렉터리로 이동할 수 없습니다: %m"
 
-#: utils/init/miscinit.c:720 utils/misc/guc.c:3650
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "보안 제한 작업 내에서 \"%s\" 매개 변수를 설정할 수 없음"
 
-#: utils/init/miscinit.c:807
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "%u OID 롤이 없음"
 
-#: utils/init/miscinit.c:853
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "\"%s\" 롤은 접속을 허용하지 않음"
 
-#: utils/init/miscinit.c:874
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "\"%s\" 롤의 최대 동시 접속수를 초과했습니다"
 
-#: utils/init/miscinit.c:1045
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "잘못된 롤 OID: %u"
 
-#: utils/init/miscinit.c:1192
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "데이터베이스 시스템 서비스를 중지했습니다"
 
-#: utils/init/miscinit.c:1279
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "\"%s\" 잠금 파일을 만들 수 없음: %m"
 
-#: utils/init/miscinit.c:1293
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "\"%s\" 잠금파일을 열 수 없음: %m"
 
-#: utils/init/miscinit.c:1300
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "\"%s\" 잠금 파일을 읽을 수 없음: %m"
 
-#: utils/init/miscinit.c:1309
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "\"%s\" 잠금 파일이 비었음"
 
-#: utils/init/miscinit.c:1310
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid ""
 "Either another server is starting, or the lock file is the remnant of a "
@@ -29921,43 +31368,43 @@ msgstr ""
 "다른 서버가 실행 중이거나, 이전 서버 시작 작업을 실패 해서 잠금 파일이 남아 "
 "있는 경우입니다."
 
-#: utils/init/miscinit.c:1354
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "\"%s\" 잠금 파일이 이미 있음"
 
-#: utils/init/miscinit.c:1358
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr ""
 "다른 postgres 프로그램(PID %d)이 \"%s\" 데이터 디렉터리를 사용해서 실행중입니"
 "까?"
 
-#: utils/init/miscinit.c:1360
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr ""
 "다른 postmaster 프로그램(PID %d)이 \"%s\" 데이터 디렉터리를 사용해서 실행중입"
 "니까?"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr ""
 "다른 postgres 프로그램(PID %d)이 \"%s\" 소켓 파일을 사용해서 실행중입니까?"
 
-#: utils/init/miscinit.c:1365
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr ""
 "다른 postmaster 프로그램(PID %d)이 \"%s\" 소켓 파일을 사용해서 실행중입니까?"
 
-#: utils/init/miscinit.c:1416
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "\"%s\" 옛 잠금 파일을 삭제할 수 없음: %m"
 
-#: utils/init/miscinit.c:1418
+#: utils/init/miscinit.c:1424
 #, c-format
 msgid ""
 "The file seems accidentally left over, but it could not be removed. Please "
@@ -29967,48 +31414,48 @@ msgstr ""
 "셸 명령을 이용해서 파일을 삭제 하고 다시 시도해 보십시오. - 내용 참 거시기 하"
 "네"
 
-#: utils/init/miscinit.c:1455 utils/init/miscinit.c:1469
-#: utils/init/miscinit.c:1480
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "\"%s\" 잠금 파일에 쓸 수 없음: %m"
 
-#: utils/init/miscinit.c:1591 utils/init/miscinit.c:1733 utils/misc/guc.c:5765
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
 
-#: utils/init/miscinit.c:1721
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "\"%s\" 파일을 열 수 없음: %m; 어째든 계속 진행함"
 
-#: utils/init/miscinit.c:1746
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "\"%s\" 잠금 파일에 있는 PID 값이 이상합니다: 현재값 %ld, 원래값 %ld"
 
-#: utils/init/miscinit.c:1785 utils/init/miscinit.c:1801
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" 값은 바른 데이터디렉터리가 아닙니다"
 
-#: utils/init/miscinit.c:1787
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "\"%s\" 파일이 없습니다."
 
-#: utils/init/miscinit.c:1803
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "\"%s\" 파일에 잘못된 자료가 기록되어 있습니다."
 
-#: utils/init/miscinit.c:1805
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "initdb 명령을 실행해 새 클러스터를 만들어야 할 수도 있습니다."
 
-#: utils/init/miscinit.c:1813
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid ""
 "The data directory was initialized by PostgreSQL version %s, which is not "
@@ -30017,91 +31464,91 @@ msgstr ""
 "이 데이터 디렉터리는 PostgreSQL %s 버전으로 초기화 되어있는데, 이 서버의 %s "
 "버전은 이 버전과 호환성이 없습니다."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "복제 연결 인증: user=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "연결 인증: user=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr " database=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " application_name=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr " SSL 활성화 (protocol=%s, cipher=%s, bits=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid ""
 " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 msgstr ""
 " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "no"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "yes"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "\"%s\" 데이터베이스는 pg_database 항목에 없습니다"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "데이터베이스 OID %u이(가) 현재 \"%s\"에 속해 있는 것 같습니다."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "\"%s\" 데이터베이스는 현재 접속을 허용하지 않습니다"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "\"%s\" 데이터베이스 액세스 권한 없음"
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "사용자에게 CONNECT 권한이 없습니다."
 
-#: utils/init/postinit.c:389
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "\"%s\" 데이터베이스 최대 접속수를 초과했습니다"
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "데이터베이스 로케일이 운영 체제와 호환되지 않음"
 
-#: utils/init/postinit.c:414
+#: utils/init/postinit.c:423
 #, c-format
 msgid ""
 "The database was initialized with LC_COLLATE \"%s\",  which is not "
@@ -30110,14 +31557,14 @@ msgstr ""
 "데이터베이스가 setlocale()에서 인식할 수 없는 LC_COLLATE \"%s\"(으)로 초기화"
 "되었습니다."
 
-#: utils/init/postinit.c:416 utils/init/postinit.c:423
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid ""
 "Recreate the database with another locale or install the missing locale."
 msgstr ""
 "다른 로케일로 데이터베이스를 다시 만들거나 누락된 로케일을 설치하십시오."
 
-#: utils/init/postinit.c:421
+#: utils/init/postinit.c:430
 #, c-format
 msgid ""
 "The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
@@ -30126,12 +31573,12 @@ msgstr ""
 "setlocale()에서 인식할 수 없는 \"%s\" LC_CTYPE 값으로 데이터베이스가 초기화되"
 "었습니다."
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "\"%s\" 데이터베이스의 문자 정렬 규칙은 버전이 맞지 않음"
 
-#: utils/init/postinit.c:495
+#: utils/init/postinit.c:473
 #, c-format
 msgid ""
 "The database was created using collation version %s, but the operating "
@@ -30140,7 +31587,7 @@ msgstr ""
 "데이터베이스를 만들때 %s 버전으로 문자 정렬 규칙을 만들었는데, 현재 OS는 %s "
 "버전을 제공하고 있습니다."
 
-#: utils/init/postinit.c:498
+#: utils/init/postinit.c:476
 #, c-format
 msgid ""
 "Rebuild all objects in this database that use the default collation and run "
@@ -30151,59 +31598,75 @@ msgstr ""
 "VERSION 명령을 실행하거나, 바른 라이브러리 버전을 지정해서, PostgreSQL을 빌드"
 "하세요."
 
-#: utils/init/postinit.c:904
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr "너무 많은 서버 프로세스가 구성됨"
+
+#: utils/init/postinit.c:567
+#, c-format
+msgid ""
+"\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus "
+"\"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less "
+"than %d."
+msgstr ""
+"\"max_connections\" (%d) + \"autovacuum_worker_slots\" (%d) + "
+"\"max_worker_processes\" (%d) + \"max_wal_senders\" (%d) 값은 "
+"%d 보다 작아야 합니다."
+
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "이 데이터베이스에는 어떠한 롤 정의도 없습니다"
 
-#: utils/init/postinit.c:905
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "다음 명령을 먼저 실행하십시오: CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:942
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "슈퍼유저만 바이너리 업그레이드 모드 중에 연결 할 수 있음"
 
-#: utils/init/postinit.c:962
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "남은 연결 슬롯은 %s 속성을 가진 롤용으로 남겨 놓았음"
 
-#: utils/init/postinit.c:968
+#: utils/init/postinit.c:950
 #, c-format
 msgid ""
-"remaining connection slots are reserved for roles with privileges of the "
-"\"%s\" role"
+"remaining connection slots are reserved for roles with privileges of the \"%s"
+"\" role"
 msgstr "남은 연결 슬롯은 \"%s\" 롤 권한이 있는 롤용으로 남겨 놓았음"
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "WAL 송신기 시작할 권한 없음"
 
-#: utils/init/postinit.c:981
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "WAL 송시기 시작은 %s 속성이 있는 롤만 할 수 있습니다."
 
-#: utils/init/postinit.c:1099
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "삭제되었거나 이름이 바뀐 것 같습니다."
 
-#: utils/init/postinit.c:1103
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "%u 데이터베이스가 없음"
 
-#: utils/init/postinit.c:1112
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "잘못된 \"%s\" 데이터베이스로 접속할 수 없음"
 
-#: utils/init/postinit.c:1173
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "데이터베이스 디렉터리에 \"%s\" 하위 디렉터리가 없습니다"
@@ -30218,60 +31681,60 @@ msgstr "\"%s\" 롤은 \"%s\" 롤로 SET ROLE 작업 할 수 없음"
 msgid "invalid encoding number: %d"
 msgstr "잘못된 인코딩 번호: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "%d은(는) ISO 8859 문자 집합에 대한 예기치 않은 인코딩 ID임"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "%d은(는) WIN 문자 집합에 대한 예기치 않은 인코딩 ID임"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:298 utils/mb/mbutils.c:901
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "%s 인코딩과 %s 인코딩 사이의 변환은 지원하지 않습니다"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:403 utils/mb/mbutils.c:431 utils/mb/mbutils.c:816
+#: utils/mb/mbutils.c:843
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "%d바이트의 문자열은 너무 길어서 인코딩 규칙에 맞지 않습니다."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:569
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "\"%s\" 원본 인코딩 이름이 타당치 못함"
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:574
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "\"%s\" 대상 인코딩 이름이 타당치 못함"
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:714
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "\"%s\" 인코딩에서 사용할 수 없는 바이트: 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:878
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "잘못된 유니코드 코드 포인트"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1202
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codeset 실패"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1719
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "\"%s\" 인코딩에서 사용할 수 없는 문자가 있음: %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1760
 #, c-format
 msgid ""
 "character with byte sequence %s in encoding \"%s\" has no equivalent in "
@@ -30290,13 +31753,13 @@ msgstr "비어 있는 환경 설정 디렉터리 이름: \"%s\""
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "\"%s\" 환경 설정 디렉터리를 열 수 없습니다: %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid ""
 "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr ""
 "이 매개 변수에 유효한 단위는 \"B\", \"kB\", \"MB\",\"GB\", \"TB\" 입니다."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid ""
 "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", "
 "and \"d\"."
@@ -30304,50 +31767,50 @@ msgstr ""
 "이 매개 변수에 유효한 단위는 \"us\", \"ms\", \"s\", \"min\", \"h\", \"d\" 입"
 "니다."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "알 수 없는 환경 매개 변수 이름 \"%s\", 해당 파일: \"%s\", 줄번호: %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3504 utils/misc/guc.c:3748
-#: utils/misc/guc.c:3846 utils/misc/guc.c:3944 utils/misc/guc.c:4071
-#: utils/misc/guc.c:4212
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "\"%s\" 매개 변수는 서버 재실행 없이 지금 변경 될 수 없음"
 
-#: utils/misc/guc.c:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr "환경설정 파일에 \"%s\" 매개 변수가 빠졌음, 초기값을 사용함"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "\"%s\" 매개 변수 값을 \"%s\"(으)로 바꿨음"
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "\"%s\" 환경 설정파일에 오류가 있음"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid ""
 "configuration file \"%s\" contains errors; unaffected changes were applied"
 msgstr "\"%s\" 환경 설정 파일에 오류가 있어 새로 변경될 설정이 없습니다"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "\"%s\" 환경 설정 파일에 오류가 있어 아무 설정도 반영되지 않았습니다."
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "알 수 없는 환경 매개 변수 이름 \"%s\""
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid ""
 "Custom parameter names must be two or more simple identifiers separated by "
@@ -30356,22 +31819,22 @@ msgstr ""
 "사용자 정의 환경 설정 변수 이름은 두 글자 이상의 식별자 이름과 점(.)을 구분자"
 "로 하는 이름이어야 합니다."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "\"%s\" 이름은 예약된 접두사입니다."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "알 수 없는 환경 매개 변수 이름: \"%s\""
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: \"%s\" 디렉터리에 액세스할 수 없음: %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid ""
 "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
@@ -30379,7 +31842,7 @@ msgstr ""
 "initdb 명령이나, pg_basebackup 명령으로 PostgreSQL 데이터 디렉터리를 초기화 "
 "하세요.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -30391,12 +31854,12 @@ msgstr ""
 "PGDATA 이름의 환경 변수를 만들고 그 값으로 해당 디렉터리를 지정한 뒤,\n"
 "이 프로그램을 다시 실행해 보십시오.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s: \"%s\" 환경 설정 파일을 접근할 수 없습니다: %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -30409,7 +31872,7 @@ msgstr ""
 "PGDATA 이름의 환경 변수를 만들고 그 값으로 해당 디렉터리를 지정한 뒤,\n"
 "이 프로그램을 다시 실행해 보십시오.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -30422,7 +31885,7 @@ msgstr ""
 "PGDATA 이름의 환경 변수를 만들고 그 값으로 해당 디렉터리를 지정한 뒤,\n"
 "이 프로그램을 다시 실행해 보십시오.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -30435,126 +31898,128 @@ msgstr ""
 "PGDATA 이름의 환경 변수를 만들고 그 값으로 해당 디렉터리를 지정한 뒤,\n"
 "이 프로그램을 다시 실행해 보십시오.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "값이 정수 범위를 초과합니다."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid ""
 "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
-msgstr "%d%s%s 값은 \"%s\" 매개 변수의 값으로 타당한 범위(%d%s%s .. %d%s%s)를 벗어남"
+msgstr ""
+"%d%s%s 값은 \"%s\" 매개 변수의 값으로 타당한 범위(%d%s%s .. %d%s%s)를 벗어남"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid ""
 "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
-msgstr "%g%s%s 값은 \"%s\" 매개 변수의 값으로 타당한 범위(%g%s%s .. %g%s%s)를 벗어남"
+msgstr ""
+"%g%s%s 값은 \"%s\" 매개 변수의 값으로 타당한 범위(%g%s%s .. %g%s%s)를 벗어남"
 
-#: utils/misc/guc.c:3465
+#: utils/misc/guc.c:3462
 #, c-format
 msgid "parameter \"%s\" cannot be set during a parallel operation"
 msgstr "병렬 작업 중에는 \"%s\" 설정을 할 수 없음"
 
-#: utils/misc/guc.c:3481 utils/misc/guc.c:4696
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "\"%s\" 매개 변수는 바꿀 수 없음"
 
-#: utils/misc/guc.c:3514
+#: utils/misc/guc.c:3511
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "\"%s\" 매개 변수는 지금 바꿀 수 없음"
 
-#: utils/misc/guc.c:3541 utils/misc/guc.c:3603 utils/misc/guc.c:4671
-#: utils/misc/guc.c:6756
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "\"%s\" 매개 변수를 지정할 권한이 없습니다."
 
-#: utils/misc/guc.c:3583
+#: utils/misc/guc.c:3580
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "\"%s\" 매개 변수값은 연결 시작한 뒤에는 바꿀 수 없습니다"
 
-#: utils/misc/guc.c:3642
+#: utils/misc/guc.c:3639
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "보안 정의자 함수 내에서 \"%s\" 매개 변수를 설정할 수 없음"
 
-#: utils/misc/guc.c:3663
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "\"%s\" 매개 변수는 리셋할 수 없음"
 
-#: utils/misc/guc.c:3670
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "\"%s\" 매개 변수값은 함수 안에서 지역적으로 지정할 수 없습니다"
 
-#: utils/misc/guc.c:4370 utils/misc/guc.c:4418 utils/misc/guc.c:5450
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "\"%s\" 검사 권한 없음"
 
-#: utils/misc/guc.c:4371 utils/misc/guc.c:4419 utils/misc/guc.c:5451
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid ""
 "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "이 매개 변수의 검사는 \"%s\" 롤 권한이 있는 롤만 할 수 있습니다."
 
-#: utils/misc/guc.c:4629
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "ALTER SYSTEM 명령은 이 환경에서는 허용하지 않음"
 
-#: utils/misc/guc.c:4661
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "ALTER SYSTEM RESET ALL 실행 권한 없음"
 
-#: utils/misc/guc.c:4740
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr ""
 "ALTER SYSTEM 명령으로 지정하는 매개 변수 값에는 줄바꿈 문자가 없어야 합니다"
 
-#: utils/misc/guc.c:4785
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "\"%s\" 파일의 내용을 분석할 수 없음"
 
-#: utils/misc/guc.c:4967
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "\"%s\" 매개 변수를 다시 정의하려고 함"
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "알 수 없는 환경 매개 변수 이름 \"%s\", 이 설정은 지웁니다."
 
-#: utils/misc/guc.c:5308
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "\"%s\" 이름은 현재 예약된 접두사입니다."
 
-#: utils/misc/guc.c:6179
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "\"%s\" 매개 변수 값을 \"%s\" (으)로 바꾸는 중"
 
-#: utils/misc/guc.c:6348
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "\"%s\" 매개 변수는 설정할 수 없음"
 
-#: utils/misc/guc.c:6438
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "지정한 \"%s\" 매개 변수값의 구문분석을 실패했습니다."
 
-#: utils/misc/guc.c:6888
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "잘못된 \"%s\" 매개 변수의 값: %g"
@@ -30579,263 +32044,275 @@ msgstr "SET %s 명령은 하나의 값만 지정해야 합니다"
 msgid "SET requires parameter name"
 msgstr "SET 명령은 매개 변수 이름이 필요합니다"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:692
 msgid "Ungrouped"
 msgstr "소속그룹없음"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:693
 msgid "File Locations"
 msgstr "파일 위치"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:694
 msgid "Connections and Authentication / Connection Settings"
 msgstr "연결과 인증 / 연결 설정"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:695
 msgid "Connections and Authentication / TCP Settings"
 msgstr "연결과 인증 / TCP 설정"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:696
 msgid "Connections and Authentication / Authentication"
 msgstr "연결과 인증 / 인증"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:697
 msgid "Connections and Authentication / SSL"
 msgstr "연결과 인증 / SSL"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:698
 msgid "Resource Usage / Memory"
 msgstr "자원 사용량 / 메모리"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:699
 msgid "Resource Usage / Disk"
 msgstr "자원 사용량 / 디스크"
 
-#: utils/misc/guc_tables.c:684
+#: utils/misc/guc_tables.c:700
 msgid "Resource Usage / Kernel Resources"
 msgstr "자원 사용량 / 커널 자원"
 
-#: utils/misc/guc_tables.c:685
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "자원 사용량 / 비용기반 청소 지연"
-
-#: utils/misc/guc_tables.c:686
+#: utils/misc/guc_tables.c:701
 msgid "Resource Usage / Background Writer"
 msgstr "자원 사용량 / 백그라운드 쓰기"
 
-#: utils/misc/guc_tables.c:687
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "자원 사용량 / 비동기 기능"
+#: utils/misc/guc_tables.c:702
+msgid "Resource Usage / I/O"
+msgstr "자원 사용량 / I/O"
+
+#: utils/misc/guc_tables.c:703
+msgid "Resource Usage / Worker Processes"
+msgstr "자원 사용량 / 작업자 프로세스"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:704
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead 로그 / 설정값"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:705
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead 로그 / 체크포인트"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:706
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead 로그 / 아카이브"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:707
 msgid "Write-Ahead Log / Recovery"
 msgstr "Write-Ahead 로그 / 복구"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:708
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Write-Ahead 로그 / 아카이브 복구"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:709
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Write-Ahead 로그 / 복구 대상"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:710
 msgid "Write-Ahead Log / Summarization"
 msgstr "Write-Ahead 로그 / 요약"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:711
 msgid "Replication / Sending Servers"
 msgstr "복제 / 보내기 서버"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:712
 msgid "Replication / Primary Server"
 msgstr "복제 / 주 서버"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:713
 msgid "Replication / Standby Servers"
 msgstr "복제 / 대기 서버"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:714
 msgid "Replication / Subscribers"
 msgstr "복제 / 구독"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:715
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "쿼리 튜닝 / 실행계획기 메서드 설정"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:716
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "쿼리 튜닝 / 실행계획기 비용 상수"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:717
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "쿼리 튜닝 / 일반적인 쿼리 최적화기"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:718
 msgid "Query Tuning / Other Planner Options"
 msgstr "쿼리 튜닝 / 기타 실행계획기 옵션들"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:719
 msgid "Reporting and Logging / Where to Log"
 msgstr "보고와 로그 / 로그 위치"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:720
 msgid "Reporting and Logging / When to Log"
 msgstr "보고와 로그 / 로그 시점"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:721
 msgid "Reporting and Logging / What to Log"
 msgstr "보고와 로그 / 로그 내용"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:722
 msgid "Reporting and Logging / Process Title"
 msgstr "보고와 로그 / 프로세스 타이틀"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:723
 msgid "Statistics / Monitoring"
 msgstr "통계 / 모니터링"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:724
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "통계 / 쿼리 및 인덱스 누적 통계"
 
-#: utils/misc/guc_tables.c:709
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/misc/guc_tables.c:725
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr "청소 / 자동 청소"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:726
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "청소 / 비용기반 청소 지연"
+
+#: utils/misc/guc_tables.c:727
+msgid "Vacuuming / Default Behavior"
+msgstr "청소 / 기본 동작"
+
+#: utils/misc/guc_tables.c:728
+msgid "Vacuuming / Freezing"
+msgstr "청소 / 영구보관"
+
+#: utils/misc/guc_tables.c:729
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "클라이언트 연결 초기값 / 구문 특성"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:730
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "클라이언트 연결 초기값 / 로케일과 출력양식"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:731
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "클라이언트 연결 초기값 / 공유 라이브러리 미리 로딩"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:732
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "클라이언트 연결 초기값 / 기타 초기값"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:733
 msgid "Lock Management"
 msgstr "잠금 관리"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:734
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "버전과 플랫폼 호환성 / 이전 PostgreSQL 버전"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:735
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "버전과 플랫폼 호환성 / 다른 플랫폼과 클라이언트"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:736
 msgid "Error Handling"
 msgstr "오류 처리"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:737
 msgid "Preset Options"
 msgstr "프리셋 옵션들"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:738
 msgid "Customized Options"
 msgstr "사용자 정의 옵션들"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:739
 msgid "Developer Options"
 msgstr "개발자 옵션들"
 
-#: utils/misc/guc_tables.c:775
+#: utils/misc/guc_tables.c:794
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "실행계획자가 순차적-스캔(sequential-sca) 계획을 사용함"
 
-#: utils/misc/guc_tables.c:785
+#: utils/misc/guc_tables.c:804
 msgid "Enables the planner's use of index-scan plans."
 msgstr "실행계획자가 인덱스-스캔 계획을 사용함."
 
-#: utils/misc/guc_tables.c:795
+#: utils/misc/guc_tables.c:814
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "실행계획자가 인덱스-전용-탐색 계획을 사용함."
 
-#: utils/misc/guc_tables.c:805
+#: utils/misc/guc_tables.c:824
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "실행계획기가 bitmap-scan 계획을 사용하도록 함"
 
-#: utils/misc/guc_tables.c:815
+#: utils/misc/guc_tables.c:834
 msgid "Enables the planner's use of TID scan plans."
 msgstr "실행계획자가 TID 스캔 계획을 사용함"
 
-#: utils/misc/guc_tables.c:825
+#: utils/misc/guc_tables.c:844
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "실행계획자가 명시 정렬 단계(explicit sort step)를 사용함"
 
-#: utils/misc/guc_tables.c:835
+#: utils/misc/guc_tables.c:854
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "실행계획자가 증분 정렬 단계(incremental sort step)를 사용함"
 
-#: utils/misc/guc_tables.c:845
+#: utils/misc/guc_tables.c:864
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "실행계획자가 해시된 집계 계획을 사용함"
 
-#: utils/misc/guc_tables.c:855
+#: utils/misc/guc_tables.c:874
 msgid "Enables the planner's use of materialization."
 msgstr "실행계획자가 materialization 계획을 사용함"
 
-#: utils/misc/guc_tables.c:865
+#: utils/misc/guc_tables.c:884
 msgid "Enables the planner's use of memoization."
 msgstr "실행계획자가 memoization 계획을 사용함"
 
-#: utils/misc/guc_tables.c:875
+#: utils/misc/guc_tables.c:894
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "실행계획자가 근접순환 조인(nested-loop join) 계획을 사용함"
 
-#: utils/misc/guc_tables.c:885
+#: utils/misc/guc_tables.c:904
 msgid "Enables the planner's use of merge join plans."
 msgstr "실행계획자가 병합 조인(merge join) 계획을 사용함"
 
-#: utils/misc/guc_tables.c:895
+#: utils/misc/guc_tables.c:914
 msgid "Enables the planner's use of hash join plans."
 msgstr "실행계획자가 해시 조인(hash join) 계획을 사용함"
 
-#: utils/misc/guc_tables.c:905
+#: utils/misc/guc_tables.c:924
 msgid "Enables the planner's use of gather merge plans."
 msgstr "실행계획자가 병합 수집(gather merge) 계획을 사용함"
 
-#: utils/misc/guc_tables.c:915
+#: utils/misc/guc_tables.c:934
 msgid "Enables partitionwise join."
 msgstr "partitionwise join 활성화"
 
-#: utils/misc/guc_tables.c:925
+#: utils/misc/guc_tables.c:944
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "partitionwise 집계 및 그룹핑 활성화"
 
-#: utils/misc/guc_tables.c:935
+#: utils/misc/guc_tables.c:954
 msgid "Enables the planner's use of parallel append plans."
 msgstr "실행계획자가 병렬 추가 계획을 사용함"
 
-#: utils/misc/guc_tables.c:945
+#: utils/misc/guc_tables.c:964
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "실행계획자가 병렬 해시 계획을 사용함"
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:974
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "파티션 프루닝 계획수립 및 실행 시간 활성화"
 
-#: utils/misc/guc_tables.c:956
+#: utils/misc/guc_tables.c:975
 msgid ""
 "Allows the query planner and executor to compare partition bounds to "
 "conditions in the query to determine which partitions must be scanned."
@@ -30843,7 +32320,7 @@ msgstr ""
 "쿼리 실행 계획기와 실행기가 조회해야할 파티션들이 어떤 것들인지 쿼리에서 범위"
 "를 판단하는 것을 허용함"
 
-#: utils/misc/guc_tables.c:967
+#: utils/misc/guc_tables.c:986
 msgid ""
 "Enables the planner's ability to produce plans that provide presorted input "
 "for ORDER BY / DISTINCT aggregate functions."
@@ -30851,7 +32328,7 @@ msgstr ""
 "ORDER BY / DISTINCT 집계 함수 처리를 위해 미리 정렬된 입력을 제공하는 계획을 "
 "생성하는 실행 계획기 기능을 활성화함"
 
-#: utils/misc/guc_tables.c:970
+#: utils/misc/guc_tables.c:989
 msgid ""
 "Allows the query planner to build plans that provide presorted input for "
 "aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, "
@@ -30861,64 +32338,74 @@ msgstr ""
 "정렬된 입력을 제공하는 계획을 작성할 수 있습니다. 비활성화하면 쿼리 실행 중"
 "에 암묵적인 정렬을 항상 합니다."
 
-#: utils/misc/guc_tables.c:982
+#: utils/misc/guc_tables.c:1001
 msgid "Enables the planner's use of async append plans."
 msgstr "실행계획자가 비동기 추가 계획을 사용함"
 
-#: utils/misc/guc_tables.c:992
+#: utils/misc/guc_tables.c:1011
+msgid "Enables removal of unique self-joins."
+msgstr "unique self-join 사용 금지 활성화"
+
+#: utils/misc/guc_tables.c:1021
 msgid "Enables reordering of GROUP BY keys."
 msgstr "GROUP BY 키들의 재정렬 활성화"
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1031
+msgid "Enables reordering of DISTINCT keys."
+msgstr "DISTINCT 키들의 재정렬 활성화"
+
+#: utils/misc/guc_tables.c:1041
 msgid "Enables genetic query optimization."
 msgstr "유전적 쿼리 최적화(GEQO)를 사용함"
 
-#: utils/misc/guc_tables.c:1003
+#: utils/misc/guc_tables.c:1042
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "이 알고리즘은 실행계획기의 과도한 작업 비용을 낮춥니다"
 
-#: utils/misc/guc_tables.c:1017
+#: utils/misc/guc_tables.c:1056
 msgid "Shows whether the current user is a superuser."
 msgstr "현재 사용자가 슈퍼유저인지 보여줍니다."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1071
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "ALTER SYSTEM 명령 실행 허용"
 
-#: utils/misc/guc_tables.c:1033
+#: utils/misc/guc_tables.c:1072
 msgid ""
 "Can be set to off for environments where global configuration changes should "
 "be made using a different method."
-msgstr "다른 방법으로 전역 환경설정 값을 관리하는 환경에서는 off로 설정할 수 있습니다."
+msgstr ""
+"다른 방법으로 전역 환경설정 값을 관리하는 환경에서는 off로 설정할 수 있습니"
+"다."
 
-#: utils/misc/guc_tables.c:1043
+#: utils/misc/guc_tables.c:1082
 msgid "Enables advertising the server via Bonjour."
 msgstr "Bonjour 서버 사용"
 
-#: utils/misc/guc_tables.c:1052
+#: utils/misc/guc_tables.c:1091
 msgid "Collects transaction commit time."
 msgstr "트랜잭션 커밋 시간을 수집함"
 
-#: utils/misc/guc_tables.c:1061
+#: utils/misc/guc_tables.c:1100
 msgid "Enables SSL connections."
 msgstr "SSL 연결을 가능하게 함."
 
-#: utils/misc/guc_tables.c:1070
+#: utils/misc/guc_tables.c:1109
 msgid ""
 "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr ""
-"서버 reload 작업 중 \"ssl_passphrase_command\" 로 지정한 명령을 실행 할 것인지를 "
-"제어함."
+"서버 reload 작업 중 \"ssl_passphrase_command\" 로 지정한 명령을 실행 할 것인"
+"지를 제어함."
 
-#: utils/misc/guc_tables.c:1079
+#: utils/misc/guc_tables.c:1118
 msgid "Give priority to server ciphersuite order."
 msgstr "SSL 인증 알고리즘 우선 순위를 정함"
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1127
 msgid "Forces synchronization of updates to disk."
 msgstr "강제로 변경된 버퍼 자료를 디스크와 동기화 시킴."
 
-#: utils/misc/guc_tables.c:1089
+#: utils/misc/guc_tables.c:1128
 msgid ""
 "The server will use the fsync() system call in several places to make sure "
 "that updates are physically written to disk. This ensures that a database "
@@ -30930,11 +32417,11 @@ msgstr ""
 "스템의 비정상적인 동작이나, 하드웨어에서 오류가 발생되었을 경우에도 자료를 안"
 "전하게 지킬 수 있도록 도와줄 것입니다."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1139
 msgid "Continues processing after a checksum failure."
 msgstr "체크섬 실패 후 처리 계속 함"
 
-#: utils/misc/guc_tables.c:1101
+#: utils/misc/guc_tables.c:1140
 msgid ""
 "Detection of a checksum failure normally causes PostgreSQL to report an "
 "error, aborting the current transaction. Setting ignore_checksum_failure to "
@@ -30949,11 +32436,11 @@ msgstr ""
 "니다.  이 설정은 데이터 클러스터에서 체크섬 기능이 활성화 되어 있는 경우에만 "
 "영향을 받습니다."
 
-#: utils/misc/guc_tables.c:1115
+#: utils/misc/guc_tables.c:1154
 msgid "Continues processing past damaged page headers."
 msgstr "손상된 자료 헤더 발견시 작업 진행 여부 선택"
 
-#: utils/misc/guc_tables.c:1116
+#: utils/misc/guc_tables.c:1155
 msgid ""
 "Detection of a damaged page header normally causes PostgreSQL to report an "
 "error, aborting the current transaction. Setting \"zero_damaged_pages\" to "
@@ -30962,17 +32449,17 @@ msgid ""
 "the rows on the damaged page."
 msgstr ""
 "일반적으로 손상된 페이지 헤더를 발견하게 되면, PostgreSQL에서는 오류를 발생하"
-"고, 현재 트랜잭션을 중지합니다. \"zero_damaged_pages\" 값을 true로 지정하면, 이"
-"런 손상된 페이지를 발견하면, 경고 메시지를 보여주고, 그 페이지의 크기를 0으"
+"고, 현재 트랜잭션을 중지합니다. \"zero_damaged_pages\" 값을 true로 지정하면, "
+"이런 손상된 페이지를 발견하면, 경고 메시지를 보여주고, 그 페이지의 크기를 0으"
 "로 만들고 작업을 계속 진행합니다. 이 기능을 사용한다 함은 손상된 자료를 없애"
 "겠다는 것을 의미합니다. 이것은 곧 저장되어있는 자료가 삭제 될 수도 있음을 의"
 "미하기도 합니다."
 
-#: utils/misc/guc_tables.c:1129
+#: utils/misc/guc_tables.c:1168
 msgid "Continues recovery after an invalid pages failure."
 msgstr "잘못된 페이지 실패 후 복구 계속 함"
 
-#: utils/misc/guc_tables.c:1130
+#: utils/misc/guc_tables.c:1169
 msgid ""
 "Detection of WAL records having references to invalid pages during recovery "
 "causes PostgreSQL to raise a PANIC-level error, aborting the recovery. "
@@ -30983,17 +32470,17 @@ msgid ""
 "in standby mode."
 msgstr ""
 "PostgreSQL은 WAL 기반 복구 작업에서 해당 페이지가 잘못되어 있으면, PANIC 오류"
-"를 내고 복구 작업을 중지하고 멈춥니다.  \"ignore_invalid_pages\" 값을  true로 지"
-"정하면, 이런 손상된 페이지가 있을 때, 경고 메시지를 보여주고, 복구 작업 계속 "
-"진행합니다. 이 기능을 사용하면 서버 비정상 종료나 자료 손실 숨은 손상, 기타 "
-"심각한 문제가 일어 날 수 있습니다.  이 설정은 복구 작업 때나 대기 모드 상태에"
-"서만 작동합니다."
+"를 내고 복구 작업을 중지하고 멈춥니다.  \"ignore_invalid_pages\" 값을  true"
+"로 지정하면, 이런 손상된 페이지가 있을 때, 경고 메시지를 보여주고, 복구 작업 "
+"계속 진행합니다. 이 기능을 사용하면 서버 비정상 종료나 자료 손실 숨은 손상, "
+"기타 심각한 문제가 일어 날 수 있습니다.  이 설정은 복구 작업 때나 대기 모드 "
+"상태에서만 작동합니다."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1187
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "체크포인트 후 처음 수정할 때 전체 페이지를 WAL에 씁니다."
 
-#: utils/misc/guc_tables.c:1149
+#: utils/misc/guc_tables.c:1188
 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 "
@@ -31005,7 +32492,7 @@ msgstr ""
 "없을 수도 있습니다.  이 옵션은 안전하게 복구가 가능하도록 체크포인트 후 처음 "
 "수정한 페이지는 그 페이지 전체를 WAL에 씁니다."
 
-#: utils/misc/guc_tables.c:1162
+#: utils/misc/guc_tables.c:1201
 msgid ""
 "Writes full pages to WAL when first modified after a checkpoint, even for a "
 "non-critical modification."
@@ -31013,106 +32500,128 @@ msgstr ""
 "체크포인트 작업 후 자료 페이지에 첫 변경이 있는 경우, 치명적인 변경이 아닐지"
 "라도 해당 페이지 전체를 기록합니다."
 
-#: utils/misc/guc_tables.c:1172
+#: utils/misc/guc_tables.c:1211
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "처음 사용 되기 전에 WAL 파일을 0으로 채웁니다."
 
-#: utils/misc/guc_tables.c:1182
+#: utils/misc/guc_tables.c:1221
 msgid "Recycles WAL files by renaming them."
 msgstr "파일 이름 변경으로 WAL 파일을 재사용합니다."
 
-#: utils/misc/guc_tables.c:1192
+#: utils/misc/guc_tables.c:1231
 msgid "Logs each checkpoint."
 msgstr "체크포인트 관련 정보를 기록합니다."
 
-#: utils/misc/guc_tables.c:1201
-msgid "Logs each successful connection."
-msgstr "연결 성공한 정보들 모두를 기록함"
-
-#: utils/misc/guc_tables.c:1210
+#: utils/misc/guc_tables.c:1240
 msgid "Logs details of pre-authentication connection handshake."
 msgstr "연결 맺기를 위한 사전 인증작업 관련 세부사항을 기록합니다."
 
-#: utils/misc/guc_tables.c:1220
+#: utils/misc/guc_tables.c:1250
 msgid "Logs end of a session, including duration."
 msgstr "기간을 포함하여 세션의 끝을 기록합니다."
 
-#: utils/misc/guc_tables.c:1229
+#: utils/misc/guc_tables.c:1259
 msgid "Logs each replication command."
 msgstr "복제 관련 작업 내역을 기록합니다."
 
-#: utils/misc/guc_tables.c:1238
+#: utils/misc/guc_tables.c:1268
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "서버가 assertion 검사 기능이 활성화 되어 실행되는지 보여 줌"
 
-#: utils/misc/guc_tables.c:1249
+#: utils/misc/guc_tables.c:1279
 msgid "Terminate session on any error."
 msgstr "어떤 오류가 생기면 세션을 종료함"
 
-#: utils/misc/guc_tables.c:1258
+#: utils/misc/guc_tables.c:1288
 msgid "Reinitialize server after backend crash."
 msgstr "백엔드가 비정상 종료되면 서버를 재초기화함"
 
-#: utils/misc/guc_tables.c:1267
+#: utils/misc/guc_tables.c:1297
 msgid "Remove temporary files after backend crash."
 msgstr "백엔드 비정상 종료 뒤에는 임시 파일을 지웁니다."
 
-#: utils/misc/guc_tables.c:1277
+#: utils/misc/guc_tables.c:1307
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr ""
 "백엔드 비정상 종료 될 때 하위 프로세스에게 SIGQUIT 대신에 SIGABRT 신호를 보냄"
 
-#: utils/misc/guc_tables.c:1287
+#: utils/misc/guc_tables.c:1317
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "멈춘 하위 프로세스에게 SIGKILL 대신에 SIGABRT 신호를 보냄"
 
-#: utils/misc/guc_tables.c:1298
+#: utils/misc/guc_tables.c:1328
 msgid "Logs the duration of each completed SQL statement."
 msgstr "SQL 명령 구문의 실행완료 시간을 기록함"
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1338
+msgid ""
+"Set this to force all parse and plan trees to be passed through "
+"copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr ""
+"이것을 설정하면 모든 구문 분석 및 계획 트리가 copyObject()를 "
+"통해 전달되어 copyObject()에서 발생하는 오류와 누락을 쉽게 잡을 수 있습니다."
+
+#: utils/misc/guc_tables.c:1355
+msgid ""
+"Set this to force all parse and plan trees to be passed through outfuncs.c/"
+"readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr ""
+"이것을 설정하면 모든 구문 분석 및 계획 트리가 outfuncs.c/readfuncs.c를 "
+"통해 전달되어 해당 모듈에서 발생하는 오류와 누락을 쉽게 잡을 수 있습니다."
+
+#: utils/misc/guc_tables.c:1372
+msgid ""
+"Set this to force all raw parse trees for DML statements to be scanned by "
+"raw_expression_tree_walker(), to facilitate catching errors and omissions in "
+"that function."
+msgstr ""
+"이 값을 설정하면 raw_expression_tree_walker()가 DML 명령문의 모든 원시 "
+"구문 분석 트리를 검사하여 해당 함수에서 발생하는 오류와 누락을 쉽게 "
+"잡을 수 있습니다."
+
+#: utils/misc/guc_tables.c:1390
 msgid "Logs each query's parse tree."
 msgstr "각 쿼리의 구문 분석 트리를 기록합니다."
 
-#: utils/misc/guc_tables.c:1316
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's rewritten parse tree."
 msgstr "각 쿼리의 재작성된 구문 분석 트리를 기록합니다."
 
-#: utils/misc/guc_tables.c:1325
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's execution plan."
 msgstr "각 쿼리의 실행 계획을 기록합니다."
 
-#: utils/misc/guc_tables.c:1334
+#: utils/misc/guc_tables.c:1417
 msgid "Indents parse and plan tree displays."
 msgstr "구문과 실행계획을 보여 줄때, 들여쓰기를 함."
 
-#: utils/misc/guc_tables.c:1343
+#: utils/misc/guc_tables.c:1426
 msgid "Writes parser performance statistics to the server log."
 msgstr "구문분석 성능 통계를 서버 로그에 기록함."
 
-#: utils/misc/guc_tables.c:1352
+#: utils/misc/guc_tables.c:1435
 msgid "Writes planner performance statistics to the server log."
 msgstr "실행계획자 성능 통계를 서버 로그에 기록함."
 
-#: utils/misc/guc_tables.c:1361
+#: utils/misc/guc_tables.c:1444
 msgid "Writes executor performance statistics to the server log."
 msgstr "실행자 성능 통계를 서버 로그에 기록함."
 
-#: utils/misc/guc_tables.c:1370
+#: utils/misc/guc_tables.c:1453
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "누적 성능 통계를 서버 로그에 기록함."
 
-#: utils/misc/guc_tables.c:1380
+#: utils/misc/guc_tables.c:1463
 msgid ""
 "Logs system resource usage statistics (memory and CPU) on various B-tree "
 "operations."
 msgstr "다양한 B트리 작업에 자원(메모리, CPU) 사용 통계를 기록에 남기"
 
-#: utils/misc/guc_tables.c:1392
+#: utils/misc/guc_tables.c:1475
 msgid "Collects information about executing commands."
 msgstr "명령 실행에 대한 정보를 수집함"
 
-#: utils/misc/guc_tables.c:1393
+#: utils/misc/guc_tables.c:1476
 msgid ""
 "Enables the collection of information on the currently executing command of "
 "each session, along with the time at which that command began execution."
@@ -31120,67 +32629,75 @@ msgstr ""
 "각 세션에서 사용하고 있는 현재 실행 중인 명령의 수행 시간, 명령 내용등에 대"
 "한 정보를 수집하도록 함"
 
-#: utils/misc/guc_tables.c:1403
+#: utils/misc/guc_tables.c:1486
 msgid "Collects statistics on database activity."
 msgstr "데이터베이스 활동에 대한 통계를 수집합니다."
 
-#: utils/misc/guc_tables.c:1412
+#: utils/misc/guc_tables.c:1495
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "비용 기반 청소 지연을 위한 시간 통계를 수집합니다."
+
+#: utils/misc/guc_tables.c:1504
 msgid "Collects timing statistics for database I/O activity."
 msgstr "데이터베이스 I/O 활동에 대한 통계를 수집합니다."
 
-#: utils/misc/guc_tables.c:1421
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "WAL I/O 활동에 작업 시간 통계를 수집합니다."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1523
 msgid "Updates the process title to show the active SQL command."
 msgstr "활성 SQL 명령을 표시하도록 프로세스 제목을 업데이트합니다."
 
-#: utils/misc/guc_tables.c:1432
+#: utils/misc/guc_tables.c:1524
 msgid ""
 "Enables updating of the process title every time a new SQL command is "
 "received by the server."
 msgstr ""
 "서버가 새 SQL 명령을 받을 때마다 프로세스 제목이 업데이트될 수 있도록 합니다."
 
-#: utils/misc/guc_tables.c:1441
+#: utils/misc/guc_tables.c:1533
 msgid "Starts the autovacuum subprocess."
 msgstr "자동 청소 하위 프로세스를 실행함"
 
-#: utils/misc/guc_tables.c:1451
+#: utils/misc/guc_tables.c:1543
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "LISTEN, NOTIFY 명령 사용을 위한 디버깅 출력을 만듦."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1555
 msgid "Emits information about lock usage."
 msgstr "잠금 사용 정보를 로그로 남김"
 
-#: utils/misc/guc_tables.c:1473
+#: utils/misc/guc_tables.c:1565
 msgid "Emits information about user lock usage."
 msgstr "사용자 잠금 사용 정보를 로그로 남김"
 
-#: utils/misc/guc_tables.c:1483
+#: utils/misc/guc_tables.c:1575
 msgid "Emits information about lightweight lock usage."
 msgstr "가벼운 잠금 사용 정보를 로그로 남김"
 
-#: utils/misc/guc_tables.c:1493
+#: utils/misc/guc_tables.c:1585
 msgid ""
 "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "교착 잠금 시간 제한 상황이 발생하면 그 때의 모든 잠금 정보를 보여줌"
 
-#: utils/misc/guc_tables.c:1505
+#: utils/misc/guc_tables.c:1597
 msgid "Logs long lock waits."
 msgstr "긴 잠금 대기를 기록합니다."
 
-#: utils/misc/guc_tables.c:1514
+#: utils/misc/guc_tables.c:1606
+msgid "Logs lock failures."
+msgstr "잠금 실패를 기록합니다."
+
+#: utils/misc/guc_tables.c:1615
 msgid "Logs standby recovery conflict waits."
 msgstr "대기 서버 복구 충돌에 따른 대기 정보를 로그에 남깁니다."
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1624
 msgid "Logs the host name in the connection logs."
 msgstr "연결 기록에서 호스트 이름을 기록함."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1625
 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 "
@@ -31191,11 +32708,11 @@ msgstr ""
 "true로 바꾼다면, 이 IP의 호스트 이름을 구해서 이 이름을 사용합니다 이것의 성"
 "능은 OS의 IP에서 이름구하기 성능과 관계됩니다."
 
-#: utils/misc/guc_tables.c:1535
+#: utils/misc/guc_tables.c:1636
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "\"표현식=NULL\" 식을 \"표현식 IS NULL\"로 취급함."
 
-#: utils/misc/guc_tables.c:1536
+#: utils/misc/guc_tables.c:1637
 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 "
@@ -31206,19 +32723,19 @@ msgstr ""
 "표현식 = NULL 구문을 표현식 IS NULL 구문으로 바꾸어서 처리하도록 해서 계산에 "
 "따라 true, false를 반환합니다."
 
-#: utils/misc/guc_tables.c:1548
+#: utils/misc/guc_tables.c:1649
 msgid "Sets the default read-only status of new transactions."
 msgstr "새로운 트랜잭션의 상태를 초기값으로 읽기전용으로 설정합니다."
 
-#: utils/misc/guc_tables.c:1558
+#: utils/misc/guc_tables.c:1659
 msgid "Sets the current transaction's read-only status."
 msgstr "현재 트랜잭셕의 읽기 전용 상태를 지정합니다."
 
-#: utils/misc/guc_tables.c:1568
+#: utils/misc/guc_tables.c:1669
 msgid "Sets the default deferrable status of new transactions."
 msgstr "새 트랜잭션의 기본 지연 가능한 상태를 지정"
 
-#: utils/misc/guc_tables.c:1577
+#: utils/misc/guc_tables.c:1678
 msgid ""
 "Whether to defer a read-only serializable transaction until it can be "
 "executed with no possible serialization failures."
@@ -31226,25 +32743,25 @@ msgstr ""
 "읽기 전용 직렬화 가능한 트랜잭션이 직렬 처리에서 오류가 없을 때까지 그 트랜잭"
 "션을 지연할 것이지 결정함"
 
-#: utils/misc/guc_tables.c:1587
-msgid "Enable row security."
-msgstr "로우 단위 보안 기능을 활성화"
+#: utils/misc/guc_tables.c:1688
+msgid "Enables row security."
+msgstr "로우 단위 보안 기능을 활성화 합니다."
 
-#: utils/misc/guc_tables.c:1588
+#: utils/misc/guc_tables.c:1689
 msgid "When enabled, row security will be applied to all users."
 msgstr "이 값이 활성화 되면 로우 단위 보안 기능이 모든 사용자 대상으로 적용됨"
 
-#: utils/misc/guc_tables.c:1596
+#: utils/misc/guc_tables.c:1697
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr ""
 "CREATE FUNCTION, CREATE PROCEDURE 명령을 실행할 때 본문 부분의 구문을 검사합"
 "니다."
 
-#: utils/misc/guc_tables.c:1605
-msgid "Enable input of NULL elements in arrays."
+#: utils/misc/guc_tables.c:1706
+msgid "Enables input of NULL elements in arrays."
 msgstr "배열에 NULL 요소가 입력될 수 있도록 합니다."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1707
 msgid ""
 "When turned on, unquoted NULL in an array input value means a null value; "
 "otherwise it is taken literally."
@@ -31252,42 +32769,42 @@ msgstr ""
 "이 값이 on이면 배열 입력 값에 따옴표 없이 입력된 NULL이 null 값을 의미하고, "
 "그렇지 않으면 문자 그대로 처리됩니다."
 
-#: utils/misc/guc_tables.c:1622
+#: utils/misc/guc_tables.c:1723
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS 구문은 더 이상 지원하지 않음; 이 값은 false만 허용합니다."
 
-#: utils/misc/guc_tables.c:1632
+#: utils/misc/guc_tables.c:1733
 msgid ""
-"Start a subprocess to capture stderr output and/or csvlogs into log files."
+"Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr ""
-"로그 기록 하위 프로세스를 시작하여 stderr 출력 및/또는 csvlog를 로그 파일에 "
-"씁니다."
+"로그 기록 하위 프로세스를 시작하여 stderr, csvlog, jsonlog 형식으로 로그 파일"
+"에 씁니다."
 
-#: utils/misc/guc_tables.c:1641
+#: utils/misc/guc_tables.c:1742
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "로그 회전 중 동일한 이름의 기존 로그 파일을 자릅니다."
 
-#: utils/misc/guc_tables.c:1652
+#: utils/misc/guc_tables.c:1752
 msgid "Emit information about resource usage in sorting."
 msgstr "정렬 시 리소스 사용 정보를 내보냅니다."
 
-#: utils/misc/guc_tables.c:1666
+#: utils/misc/guc_tables.c:1765
 msgid "Generate debugging output for synchronized scanning."
 msgstr "동기화된 스캔을 위해 디버깅 출력을 생성합니다."
 
-#: utils/misc/guc_tables.c:1681
-msgid "Enable bounded sorting using heap sort."
+#: utils/misc/guc_tables.c:1780
+msgid "Enables bounded sorting using heap sort."
 msgstr "힙 정렬을 통해 제한적 정렬을 사용합니다."
 
-#: utils/misc/guc_tables.c:1694
+#: utils/misc/guc_tables.c:1793
 msgid "Emit WAL-related debugging output."
 msgstr "WAL 관련 디버깅 출력을 내보냅니다."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1805
 msgid "Shows whether datetimes are integer based."
 msgstr "date, time 값을 정수 기반으로 할지를 보여줍니다."
 
-#: utils/misc/guc_tables.c:1717
+#: utils/misc/guc_tables.c:1816
 msgid ""
 "Sets whether Kerberos and GSSAPI user names should be treated as case-"
 "insensitive."
@@ -31295,54 +32812,54 @@ msgstr ""
 "Kerberos 및 GSSAPI 사용자 이름에서 대/소문자를 구분하지 않을지 여부를 설정합"
 "니다."
 
-#: utils/misc/guc_tables.c:1727
+#: utils/misc/guc_tables.c:1826
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "클라이언트에서 GSSAPI 위임을 수락할지 여부를 설정합니다."
 
-#: utils/misc/guc_tables.c:1737
+#: utils/misc/guc_tables.c:1836
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "일반 문자열 리터럴의 백슬래시 이스케이프에 대해 경고합니다."
 
-#: utils/misc/guc_tables.c:1747
+#: utils/misc/guc_tables.c:1846
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "&apos;...&apos; 문자열에서 백슬래시가 리터럴로 처리되도록 합니다."
 
-#: utils/misc/guc_tables.c:1758
-msgid "Enable synchronized sequential scans."
+#: utils/misc/guc_tables.c:1857
+msgid "Enables synchronized sequential scans."
 msgstr "동기화된 순차적 스캔을 사용합니다."
 
-#: utils/misc/guc_tables.c:1768
+#: utils/misc/guc_tables.c:1867
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "복구 대상에서 트랜잭션을 포함할지 제외할지 선택합니다."
 
-#: utils/misc/guc_tables.c:1778
+#: utils/misc/guc_tables.c:1877
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "증분 백업을 허용하기 위해 WAL 요약 프로세스를 시작합니다."
 
-#: utils/misc/guc_tables.c:1788
+#: utils/misc/guc_tables.c:1887
 msgid "Allows connections and queries during recovery."
 msgstr "복구 중에서도 접속과 쿼리 사용을 허용함"
 
-#: utils/misc/guc_tables.c:1798
+#: utils/misc/guc_tables.c:1897
 msgid ""
 "Allows feedback from a hot standby to the primary that will avoid query "
 "conflicts."
 msgstr ""
 "읽기 전용 보조 서버가 보내는 쿼리 충돌을 피하기 위한 피드백을 주 서버가 받음"
 
-#: utils/misc/guc_tables.c:1808
+#: utils/misc/guc_tables.c:1907
 msgid "Shows whether hot standby is currently active."
 msgstr "hot standby 가 활성화 되었는지 보여줌"
 
-#: utils/misc/guc_tables.c:1819
+#: utils/misc/guc_tables.c:1918
 msgid "Allows modifications of the structure of system tables."
 msgstr "시스템 테이블의 구조를 수정할 수 있도록 합니다."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1929
 msgid "Disables reading from system indexes."
 msgstr "시스템 인덱스 읽기를 금지함"
 
-#: utils/misc/guc_tables.c:1831
+#: utils/misc/guc_tables.c:1930
 msgid ""
 "It does not prevent updating the indexes, so it is safe to use.  The worst "
 "consequence is slowness."
@@ -31350,16 +32867,16 @@ msgstr ""
 "이 설정이 활성화 되어도 그 인덱스는 갱신되어 사용하는데는 안전합니다.  하지"
 "만 서버가 전체적으로 늦어질 수 있습니다."
 
-#: utils/misc/guc_tables.c:1842
+#: utils/misc/guc_tables.c:1941
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "테이블스페이스를 pg_tblspc 안에 바로 만듦, 테스팅용"
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1952
 msgid ""
 "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "대형 개체에 대한 접근 권한 검사를 위한 하위 호환성이 있게 함"
 
-#: utils/misc/guc_tables.c:1854
+#: utils/misc/guc_tables.c:1953
 msgid ""
 "Skips privilege checks when reading or modifying large objects, for "
 "compatibility with PostgreSQL releases prior to 9.0."
@@ -31367,99 +32884,116 @@ msgstr ""
 "PostgreSQL 9.0 이전 버전의 호환성을 위해 대형 개체에 대한 읽기, 변경 시 접근 "
 "권한 검사를 안 하도록 설정함"
 
-#: utils/misc/guc_tables.c:1864
+#: utils/misc/guc_tables.c:1963
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "SQL 구문을 만들 때, 모든 식별자는 따옴표를 사용함"
 
-#: utils/misc/guc_tables.c:1874
+#: utils/misc/guc_tables.c:1973
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "이 클러스터에서 자료 체크섬 기능을 사용하는지 보여줌"
 
-#: utils/misc/guc_tables.c:1885
+#: utils/misc/guc_tables.c:1984
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "syslog 사용시 메시지 중복을 방지하기 위해 일련 번호를 매깁니다."
 
-#: utils/misc/guc_tables.c:1895
+#: utils/misc/guc_tables.c:1994
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "syslog 사용시 메시지를 한 줄에 1024 바이트만 쓰도록 나눕니다"
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2004
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Gather와 Gather Merge 작업을 서브플랜에서도 할지를 제어함."
 
-#: utils/misc/guc_tables.c:1906
+#: utils/misc/guc_tables.c:2005
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "서브플랜에서 gather 노드를 실행할지, 단지 튜플만 모을지 지정"
 
-#: utils/misc/guc_tables.c:1916
+#: utils/misc/guc_tables.c:2015
 msgid "Allow JIT compilation."
 msgstr "JIT 짜깁기 허용"
 
-#: utils/misc/guc_tables.c:1927
+#: utils/misc/guc_tables.c:2026
 msgid "Register JIT-compiled functions with debugger."
 msgstr "디버거용 JIT 컴파일된 함수 등록"
 
-#: utils/misc/guc_tables.c:1944
+#: utils/misc/guc_tables.c:2043
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "LLVM bitcode 출력에 JIT 디버깅 정보 함께 기록"
 
-#: utils/misc/guc_tables.c:1955
+#: utils/misc/guc_tables.c:2054
 msgid "Allow JIT compilation of expressions."
 msgstr "표현식의 JIT 짜깁기 허용"
 
-#: utils/misc/guc_tables.c:1966
+#: utils/misc/guc_tables.c:2065
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "perf 프로파일러용 JIT 컴파일된 함수 등록"
 
-#: utils/misc/guc_tables.c:1983
+#: utils/misc/guc_tables.c:2082
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "튜플 deform에 JIT 짜깁기 허용"
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2093
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "데이터 파일 동기화 작업 실패 뒤에도 실행을 계속할지 선택함"
 
-#: utils/misc/guc_tables.c:2003
+#: utils/misc/guc_tables.c:2102
 msgid ""
 "Sets whether a WAL receiver should create a temporary replication slot if no "
 "permanent slot is configured."
 msgstr ""
 "WAL 수신기가 영구 슬롯 설정이 되어 있지 않을 때, 임시 복제 슬롯을 만들지 지정"
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2111
 msgid "Enables event triggers."
 msgstr "이벤트 트리거 활성화합니다."
 
-#: utils/misc/guc_tables.c:2013
+#: utils/misc/guc_tables.c:2112
 msgid "When enabled, event triggers will fire for all applicable statements."
-msgstr "활성화 되면, 구현 가능한 모든 구문에 대해서 이벤트 트리거가 실행됩니다."
+msgstr ""
+"활성화 되면, 구현 가능한 모든 구문에 대해서 이벤트 트리거가 실행됩니다."
 
-#: utils/misc/guc_tables.c:2022
+#: utils/misc/guc_tables.c:2121
 msgid ""
 "Enables a physical standby to synchronize logical failover replication slots "
 "from the primary server."
 msgstr ""
-"물리 복제 대기 서버가 주 서버로부터 논리 failover 복제 슬롯 동기화 하도록 합니다."
+"물리 복제 대기 서버가 주 서버로부터 논리 failover 복제 슬롯 동기화 하도록 합"
+"니다."
+
+#: utils/misc/guc_tables.c:2130
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr "MD5 비밀번호 사용할 때 지원 중단 경고를 보여줍니다."
 
-#: utils/misc/guc_tables.c:2040
+#: utils/misc/guc_tables.c:2139
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "테이블 끝에 있는 빈 페이지를 vacuum 작업에서 버리도록 허용합니다."
+
+#: utils/misc/guc_tables.c:2157
 msgid ""
 "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "다음 WAL 파일로 강제 전환하기 전에 대기할 시간 지정"
 
-#: utils/misc/guc_tables.c:2051
+#: utils/misc/guc_tables.c:2159 utils/misc/guc_tables.c:2313
+#: utils/misc/guc_tables.c:2732 utils/misc/guc_tables.c:2743
+#: utils/misc/guc_tables.c:2754 utils/misc/guc_tables.c:2765
+#: utils/misc/guc_tables.c:2776
+msgid "0 disables the timeout."
+msgstr "0으로 설정하면 제한시간 없음."
+
+#: utils/misc/guc_tables.c:2168
 msgid ""
 "Sets the amount of time to wait after authentication on connection startup."
 msgstr "연결 작업시 인증이 끝난 뒤 대기 시간 지정"
 
-#: utils/misc/guc_tables.c:2053 utils/misc/guc_tables.c:2780
+#: utils/misc/guc_tables.c:2170 utils/misc/guc_tables.c:2908
 msgid "This allows attaching a debugger to the process."
 msgstr "이렇게 하면 디버거를 프로세스에 연결할 수 있습니다."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2179
 msgid "Sets the default statistics target."
 msgstr "기본 통계 대상을 지정합니다."
 
-#: utils/misc/guc_tables.c:2063
+#: utils/misc/guc_tables.c:2180
 msgid ""
 "This applies to table columns that have not had a column-specific target set "
 "via ALTER TABLE SET STATISTICS."
@@ -31467,12 +33001,12 @@ msgstr ""
 "특정 칼럼을 지정하지 않고 ALTER TABLE SET STATISTICS 명령을 사용했을 때, 통"
 "계 대상이 될 칼럼을 지정합니다."
 
-#: utils/misc/guc_tables.c:2072
+#: utils/misc/guc_tables.c:2189
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
 "이 크기를 초과할 경우 하위 쿼리가 축소되지 않는 FROM 목록 크기를 설정합니다."
 
-#: utils/misc/guc_tables.c:2074
+#: utils/misc/guc_tables.c:2191
 msgid ""
 "The planner will merge subqueries into upper queries if the resulting FROM "
 "list would have no more than this many items."
@@ -31480,12 +33014,12 @@ msgstr ""
 "<qbq>결과 FROM 목록에 포함된 항목이 이 개수를 넘지 않는 경우 계획 관리자가 하"
 "위 쿼리를 상위 쿼리에 병합합니다."
 
-#: utils/misc/guc_tables.c:2085
+#: utils/misc/guc_tables.c:2202
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
 "이 크기를 초과할 경우 JOIN 구문이 결합되지 않는 FROM 목록 크기를 설정합니다."
 
-#: utils/misc/guc_tables.c:2087
+#: utils/misc/guc_tables.c:2204
 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."
@@ -31493,32 +33027,32 @@ msgstr ""
 "<qbq>결과 목록에 포함된 항목이 이 개수를 넘지 않을 때마다 계획 관리자가 명시"
 "적 JOIN 구문을 FROM 항목 목록에 결합합니다."
 
-#: utils/misc/guc_tables.c:2098
+#: utils/misc/guc_tables.c:2215
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr ""
 "이 임계값을 초과할 경우 GEQO가 사용되는 FROM 항목의 임계값을 설정합니다."
 
-#: utils/misc/guc_tables.c:2108
+#: utils/misc/guc_tables.c:2225
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: 다른 GEQO 매개 변수의 기본 값을 설정하는 데 사용됩니다."
 
-#: utils/misc/guc_tables.c:2118
+#: utils/misc/guc_tables.c:2235
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: 모집단의 개인 수입니다."
 
-#: utils/misc/guc_tables.c:2119 utils/misc/guc_tables.c:2129
-msgid "Zero selects a suitable default value."
+#: utils/misc/guc_tables.c:2236 utils/misc/guc_tables.c:2246
+msgid "0 means use a suitable default value."
 msgstr "0을 지정하면 적절한 기본 값이 선택됩니다."
 
-#: utils/misc/guc_tables.c:2128
+#: utils/misc/guc_tables.c:2245
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: 알고리즘의 반복 수입니다."
 
-#: utils/misc/guc_tables.c:2140
+#: utils/misc/guc_tables.c:2257
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "교착 상태를 확인하기 전에 잠금을 기다릴 시간을 설정합니다."
 
-#: utils/misc/guc_tables.c:2151
+#: utils/misc/guc_tables.c:2268
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing archived WAL data."
@@ -31526,38 +33060,42 @@ msgstr ""
 "읽기 전용 보조 서버가 아카이브된 WAL 자료를 처리할 때, 지연될 수 있는 최대 시"
 "간"
 
-#: utils/misc/guc_tables.c:2162
+#: utils/misc/guc_tables.c:2269 utils/misc/guc_tables.c:2280
+msgid "-1 means wait forever."
+msgstr "-1은 영원히 기다림."
+
+#: utils/misc/guc_tables.c:2279
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing streamed WAL data."
 msgstr ""
 "읽기 전용 보조 서버가 스트림 WAL 자료를 처리할 때, 지연될 수 있는 최대 시간"
 
-#: utils/misc/guc_tables.c:2173
+#: utils/misc/guc_tables.c:2290
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "변경 사항 반영을 위한 최소 지연 시간 지정"
 
-#: utils/misc/guc_tables.c:2184
+#: utils/misc/guc_tables.c:2301
 msgid ""
 "Sets the maximum interval between WAL receiver status reports to the sending "
 "server."
 msgstr "WAL 정보를 보내는 서버에게 WAL 수신기 상태를 보고하는 최대 간격"
 
-#: utils/misc/guc_tables.c:2195
+#: utils/misc/guc_tables.c:2312
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr ""
 "WAL 정보를 보내는 서버로부터 보낸 자료를 받기위해 기다릴 수 있는 최대 허용 시"
 "간을 설정합니다."
 
-#: utils/misc/guc_tables.c:2206
+#: utils/misc/guc_tables.c:2323
 msgid "Sets the maximum number of concurrent connections."
 msgstr "최대 동시 접속수를 지정합니다."
 
-#: utils/misc/guc_tables.c:2217
+#: utils/misc/guc_tables.c:2334
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "superuser 동시 접속수를 지정합니다."
 
-#: utils/misc/guc_tables.c:2227
+#: utils/misc/guc_tables.c:2344
 msgid ""
 "Sets the number of connection slots reserved for roles with privileges of "
 "pg_use_reserved_connections."
@@ -31565,92 +33103,95 @@ msgstr ""
 "pg_use_reserved_connections 권한이 있는 롤의 예약된 연결 슬롯 수를 설정합니"
 "다."
 
-#: utils/misc/guc_tables.c:2238
+#: utils/misc/guc_tables.c:2355
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "시작시 확보할 동적 공유 메모리 크기"
 
-#: utils/misc/guc_tables.c:2253
+#: utils/misc/guc_tables.c:2370
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "서버에서 사용할 공유 메모리 버퍼 개수를 지정함"
 
-#: utils/misc/guc_tables.c:2264
+#: utils/misc/guc_tables.c:2381
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "VACUUM, ANALYZE, autovacuum 작업용 버퍼 풀 크기를 설정합니다."
 
-#: utils/misc/guc_tables.c:2275
+#: utils/misc/guc_tables.c:2392
 msgid ""
 "Shows the size of the server's main shared memory area (rounded up to the "
 "nearest MB)."
 msgstr "서버의 메인 공유 메모리 영역 크기를 보여줌(MB 단위로 근사값처리함)"
 
-#: utils/misc/guc_tables.c:2286
+#: utils/misc/guc_tables.c:2403
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "메인 공유 메모리 영역용 huge 페이지 개수를 보여줌"
 
-#: utils/misc/guc_tables.c:2287
-msgid "-1 indicates that the value could not be determined."
-msgstr "-1 은 사용하지 않음을 뜻함"
+#: utils/misc/guc_tables.c:2404
+msgid "-1 means huge pages are not supported."
+msgstr "-1은 huge page를 지원하지 않습니다."
 
-#: utils/misc/guc_tables.c:2297
+#: utils/misc/guc_tables.c:2414
+msgid "Shows the number of semaphores required for the server."
+msgstr "서버에서 필요한 세마포어 수를 보여줍니다."
+
+#: utils/misc/guc_tables.c:2425
 msgid ""
 "Sets the size of the dedicated buffer pool used for the commit timestamp "
 "cache."
 msgstr "커밋 시간 캐시용 버퍼 풀 크기 지정"
 
-#: utils/misc/guc_tables.c:2298 utils/misc/guc_tables.c:2353
-#: utils/misc/guc_tables.c:2364
-msgid ""
-"Specify 0 to have this value determined as a fraction of shared_buffers."
-msgstr "이 값을 shared_buffers의 일부로 하려면 0을 지정합니다."
+#: utils/misc/guc_tables.c:2426 utils/misc/guc_tables.c:2481
+#: utils/misc/guc_tables.c:2492
+msgid "0 means use a fraction of \"shared_buffers\"."
+msgstr "0을 지정하면 \"shared_buffers\" 일부를 사용합니다."
 
-#: utils/misc/guc_tables.c:2308
+#: utils/misc/guc_tables.c:2436
 msgid ""
 "Sets the size of the dedicated buffer pool used for the MultiXact member "
 "cache."
 msgstr "MultiXact 번호 캐시용 버퍼 풀 크기 지정"
 
-#: utils/misc/guc_tables.c:2319
+#: utils/misc/guc_tables.c:2447
 msgid ""
 "Sets the size of the dedicated buffer pool used for the MultiXact offset "
 "cache."
 msgstr "MultiXact offset 캐시용 버퍼 풀 크기 지정"
 
-#: utils/misc/guc_tables.c:2330
+#: utils/misc/guc_tables.c:2458
 msgid ""
 "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY "
 "message cache."
 msgstr "LISTEN/NOTIFY 메시지 캐시용 버퍼 풀 크기 지정"
 
-#: utils/misc/guc_tables.c:2341
+#: utils/misc/guc_tables.c:2469
 msgid ""
 "Sets the size of the dedicated buffer pool used for the serializable "
 "transaction cache."
 msgstr "직렬화 가능한 트랜잭션 캐시용 버퍼 풀 크기 지정"
 
-#: utils/misc/guc_tables.c:2352
+#: utils/misc/guc_tables.c:2480
 msgid ""
 "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr "하위트랜잭션 캐시를 위한 버퍼 풀 크기를 지정합니다."
 
-#: utils/misc/guc_tables.c:2363
+#: utils/misc/guc_tables.c:2491
 msgid ""
 "Sets the size of the dedicated buffer pool used for the transaction status "
 "cache."
 msgstr "트랜잭션 상태 캐시를 위한 버퍼 풀 크기를 지정합니다."
 
-#: utils/misc/guc_tables.c:2374
+#: utils/misc/guc_tables.c:2502
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "각 세션에서 사용하는 임시 버퍼의 최대 개수를 지정"
 
-#: utils/misc/guc_tables.c:2385
+#: utils/misc/guc_tables.c:2513
 msgid "Sets the TCP port the server listens on."
 msgstr "TCP 포트 번호를 지정함."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2523
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "유닉스 도메인 소켓 파일의 액세스 권한을 지정함"
 
-#: utils/misc/guc_tables.c:2396
+#: utils/misc/guc_tables.c:2524
 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 "
@@ -31661,11 +33202,11 @@ msgstr ""
 "수 값은 chmod 및 umask 시스템 호출에서 수락되는 형태의 숫자 모드 지정이어야 "
 "합니다. (일반적인 8진수 형식을 사용하려면 숫자가 0으로 시작해야 합니다.)"
 
-#: utils/misc/guc_tables.c:2410
+#: utils/misc/guc_tables.c:2538
 msgid "Sets the file permissions for log files."
 msgstr "로그 파일의 파일 접근 권한을 지정합니다."
 
-#: utils/misc/guc_tables.c:2411
+#: utils/misc/guc_tables.c:2539
 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 "
@@ -31675,11 +33216,11 @@ msgstr ""
 "이어야 합니다. (일반적인 8진수 형식을 사용하려면 숫자가 0으로 시작해야 합니"
 "다.)"
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2553
 msgid "Shows the mode of the data directory."
 msgstr "데이터 디렉터리의 모드값을 보여줌"
 
-#: utils/misc/guc_tables.c:2426
+#: utils/misc/guc_tables.c:2554
 msgid ""
 "The parameter value is a numeric mode specification in the form accepted by "
 "the chmod and umask system calls. (To use the customary octal format the "
@@ -31689,11 +33230,11 @@ msgstr ""
 "이어야 합니다. (일반적인 8진수 형식을 사용하려면 숫자가 0으로 시작해야 합니"
 "다.)"
 
-#: utils/misc/guc_tables.c:2439
+#: utils/misc/guc_tables.c:2567
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "쿼리 작업공간을 위해 사용될 메모리의 최대값을 지정함."
 
-#: utils/misc/guc_tables.c:2440
+#: utils/misc/guc_tables.c:2568
 msgid ""
 "This much memory can be used by each internal sort operation and hash table "
 "before switching to temporary disk files."
@@ -31701,136 +33242,137 @@ msgstr ""
 "임시 디스크 파일로 전환하기 전에 각 내부 정렬 작업과 해시 테이블에서 이 크기"
 "의 메모리를 사용할 수 있습니다."
 
-#: utils/misc/guc_tables.c:2457
+#: utils/misc/guc_tables.c:2585
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "관리 작업을 위해 사용될 메모리의 최대값을 지정함."
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2586
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "관리작업은 VACUUM, CREATE INDEX 같은 작업을 뜻합니다."
 
-#: utils/misc/guc_tables.c:2468
+#: utils/misc/guc_tables.c:2596
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "논리 디코딩 작업을 위해 사용될 메모리의 최대값을 지정함."
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2597
 msgid ""
 "This much memory can be used by each internal reorder buffer before spilling "
 "to disk."
 msgstr "이 메모리는 디스크 기록 전에 각 내부 재정렬 버퍼로 사용될 수 있습니다."
 
-#: utils/misc/guc_tables.c:2485
+#: utils/misc/guc_tables.c:2613
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "스택깊이(KB 단위) 최대값을 지정합니다."
 
-#: utils/misc/guc_tables.c:2496
+#: utils/misc/guc_tables.c:2624
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "각 프로세스에서 사용하는 모든 임시 파일의 총 크기 제한"
 
-#: utils/misc/guc_tables.c:2497
+#: utils/misc/guc_tables.c:2625
 msgid "-1 means no limit."
 msgstr "-1은 제한 없음"
 
-#: utils/misc/guc_tables.c:2507
+#: utils/misc/guc_tables.c:2635
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "버퍼 캐시에 있는 페이지의 청소 비용입니다."
 
-#: utils/misc/guc_tables.c:2517
+#: utils/misc/guc_tables.c:2645
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "버퍼 캐시에 없는 페이지의 청소 비용입니다."
 
-#: utils/misc/guc_tables.c:2527
+#: utils/misc/guc_tables.c:2655
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "청소로 페이지 변경 시 부과되는 비용입니다."
 
-#: utils/misc/guc_tables.c:2537
+#: utils/misc/guc_tables.c:2665
 msgid "Vacuum cost amount available before napping."
 msgstr "청소가 중지되는 청소 비용 합계입니다."
 
-#: utils/misc/guc_tables.c:2547
+#: utils/misc/guc_tables.c:2675
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "자동 청소에 대한 청소가 중지되는 청소 비용 합계입니다."
 
-#: utils/misc/guc_tables.c:2557
+#: utils/misc/guc_tables.c:2676
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1은 \"vacuum_cost_limit\" 값을 사용합니다."
+
+#: utils/misc/guc_tables.c:2685
 msgid ""
-"Sets the maximum number of simultaneously open files for each server process."
-msgstr "각각의 서버 프로세스에서 동시에 열릴 수 있는 최대 파일 갯수를 지정함."
+"Sets the maximum number of files each server process is allowed to open "
+"simultaneously."
+msgstr ""
+"각각의 서버 프로세스가 각자 동시에 열릴 수 있는 최대 파일 갯수를 지정함."
 
-#: utils/misc/guc_tables.c:2570
+#: utils/misc/guc_tables.c:2698
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "동시에 준비된 트랜잭션 최대 개수 지정"
 
-#: utils/misc/guc_tables.c:2581
+#: utils/misc/guc_tables.c:2709
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "잠금 추적을 위한 테이블의 최소 OID 지정"
 
-#: utils/misc/guc_tables.c:2582
+#: utils/misc/guc_tables.c:2710
 msgid "Is used to avoid output on system tables."
 msgstr "시스템 테이블 출력 방지용"
 
-#: utils/misc/guc_tables.c:2591
+#: utils/misc/guc_tables.c:2719
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "무조건 잠금 추적용 테이블 OID 지정"
 
-#: utils/misc/guc_tables.c:2603
+#: utils/misc/guc_tables.c:2731
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "모든 쿼리문에 적용되는 허용되는 최대 수행시간"
 
-#: utils/misc/guc_tables.c:2604 utils/misc/guc_tables.c:2615
-#: utils/misc/guc_tables.c:2626 utils/misc/guc_tables.c:2637
-#: utils/misc/guc_tables.c:2648
-msgid "A value of 0 turns off the timeout."
-msgstr "이 값이 0이면 이런 제한이 없음."
-
-#: utils/misc/guc_tables.c:2614
+#: utils/misc/guc_tables.c:2742
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "모든 잠금에 적용되는 기다리는 최대 대기 시간"
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2753
 msgid ""
 "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "idle-in-transaction 상태로 있을 수 있는 최대 시간 지정"
 
-#: utils/misc/guc_tables.c:2636
+#: utils/misc/guc_tables.c:2764
 msgid ""
 "Sets the maximum allowed duration of any transaction within a session (not a "
 "prepared transaction)."
-msgstr "한 세션에서 최대 유지할 수 있는 트랜잭션(미리 준비된 트랜잭션 아님) "
-"시간을 지정합니다."
+msgstr ""
+"한 세션에서 최대 유지할 수 있는 트랜잭션(미리 준비된 트랜잭션 아님) 시간을 지"
+"정합니다."
 
-#: utils/misc/guc_tables.c:2647
+#: utils/misc/guc_tables.c:2775
 msgid ""
 "Sets the maximum allowed idle time between queries, when not in a "
 "transaction."
 msgstr "idle 상태로 있을 수 있는 최대 시간 지정"
 
-#: utils/misc/guc_tables.c:2658
+#: utils/misc/guc_tables.c:2786
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "VACUUM에서 테이블 행을 동결할 때까지의 최소 기간입니다."
 
-#: utils/misc/guc_tables.c:2668
+#: utils/misc/guc_tables.c:2796
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 "VACUUM에서 튜플을 동결하기 위해 전체 테이블을 스캔할 때까지의 기간입니다."
 
-#: utils/misc/guc_tables.c:2678
+#: utils/misc/guc_tables.c:2806
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "VACUUM에서 테이블 MultiXactId 동결할 때까지의 최소 기간입니다."
 
-#: utils/misc/guc_tables.c:2688
+#: utils/misc/guc_tables.c:2816
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 "VACUUM에서 튜플을 동결하기 위해 전체 테이블을 스캔할 때까지의 멀티트랜잭션 기"
 "간입니다."
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2826
 msgid ""
 "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr ""
 "VACUUM 작업에서 트랜잭션ID 겹침 방지를 피하기 위한 freeze 작업을 하는 테이블 "
 "나이"
 
-#: utils/misc/guc_tables.c:2707
+#: utils/misc/guc_tables.c:2835
 msgid ""
 "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound "
 "outage."
@@ -31838,40 +33380,40 @@ msgstr ""
 "VACUUM 작업에서 트랜잭션ID 겹침 방지를 피하기 위한 freeze 작업을 하는 멀티트"
 "랜잭션 나이"
 
-#: utils/misc/guc_tables.c:2720
+#: utils/misc/guc_tables.c:2848
 msgid "Sets the maximum number of locks per transaction."
 msgstr "하나의 트랜잭션에서 사용할 수 있는 최대 잠금 횟수를 지정함."
 
-#: utils/misc/guc_tables.c:2721
+#: utils/misc/guc_tables.c:2849
 msgid ""
 "The shared lock table is sized on the assumption that at most "
 "\"max_locks_per_transaction\" objects per server process or prepared "
 "transaction will need to be locked at any one time."
 msgstr ""
 "공유 잠금 테이블은 한 번에 잠궈야 할 고유 개체 수가 "
-"\"max_locks_per_transaction\" * (\"max_connections\" 또는 미리 준비된 트랜잭션 수)를 "
-"넘지 않는다는 가정 하에 크기가 지정됩니다."
+"\"max_locks_per_transaction\" * (\"max_connections\" 또는 미리 준비된 트랜잭"
+"션 수)를 넘지 않는다는 가정 하에 크기가 지정됩니다."
 
-#: utils/misc/guc_tables.c:2732
+#: utils/misc/guc_tables.c:2860
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "하나의 트랜잭션에서 사용할 수 있는 최대 잠금 횟수를 지정함."
 
-#: utils/misc/guc_tables.c:2733
+#: utils/misc/guc_tables.c:2861
 msgid ""
 "The shared predicate lock table is sized on the assumption that at most "
 "\"max_pred_locks_per_transaction\" objects per server process or prepared "
 "transaction will need to be locked at any one time."
 msgstr ""
 "공유 predicate 잠금 테이블은 한 번에 잠궈야 할 고유 개체 수가 "
-"\"max_pred_locks_per_transaction\" * (\"max_connections\" 또는 미리 준비된 트랜잭션 "
-"수)를 넘지 않는다는 가정 하에 크기가 지정됩니다."
+"\"max_pred_locks_per_transaction\" * (\"max_connections\" 또는 미리 준비된 트"
+"랜잭션 수)를 넘지 않는다는 가정 하에 크기가 지정됩니다."
 
-#: utils/misc/guc_tables.c:2744
+#: utils/misc/guc_tables.c:2872
 msgid ""
 "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "릴레이션 당 최대 predicate-lock 페이지와 튜플 수 지정"
 
-#: utils/misc/guc_tables.c:2745
+#: utils/misc/guc_tables.c:2873
 msgid ""
 "If more than this total of pages and tuples in the same relation are locked "
 "by a connection, those locks are replaced by a relation-level lock."
@@ -31879,11 +33421,11 @@ msgstr ""
 "한 연결에서 같은 릴레이션 대상으로 이 값보다 큰 페이지와 튜플을 잠근다면, 그 "
 "잠금은 릴레이션 수준 잠금으로 변경 된다."
 
-#: utils/misc/guc_tables.c:2755
+#: utils/misc/guc_tables.c:2883
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "페이지당 predicate-lock 튜플 최대 수 지정."
 
-#: utils/misc/guc_tables.c:2756
+#: utils/misc/guc_tables.c:2884
 msgid ""
 "If more than this number of tuples on the same page are locked by a "
 "connection, those locks are replaced by a page-level lock."
@@ -31891,132 +33433,143 @@ msgstr ""
 "한 연결에서 같은 페이지 대상으로 이 값보다 튜플을 잠근다면, 그 잠금은 페이지 "
 "수준 잠금으로 변경 된다."
 
-#: utils/misc/guc_tables.c:2766
+#: utils/misc/guc_tables.c:2894
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "클라이언트 인증을 완료할 수 있는 최대 허용 시간을 설정합니다."
 
-#: utils/misc/guc_tables.c:2778
+#: utils/misc/guc_tables.c:2906
 msgid ""
 "Sets the amount of time to wait before authentication on connection startup."
 msgstr "연결 할 때 인증 전 기다리는 시간 지정"
 
-#: utils/misc/guc_tables.c:2790
+#: utils/misc/guc_tables.c:2918
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "NOTIFY / LISTEN 큐용 할당된 페이지 최대치 지정"
 
-#: utils/misc/guc_tables.c:2800
+#: utils/misc/guc_tables.c:2928
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "복구에서 WAL 미리 읽을 버퍼 크기"
 
-#: utils/misc/guc_tables.c:2801
+#: utils/misc/guc_tables.c:2929
 msgid ""
 "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr ""
 "참조된 데이터 블록을 미리 가져오기 위해 WAL에서 미리 읽을 수 있는 최대 거리."
 
-#: utils/misc/guc_tables.c:2811
+#: utils/misc/guc_tables.c:2939
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "대기 서버를 위해 보관하고 있을 WAL 파일 크기를 지정"
 
-#: utils/misc/guc_tables.c:2822
+#: utils/misc/guc_tables.c:2950
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "WAL 최소 크기"
 
-#: utils/misc/guc_tables.c:2834
+#: utils/misc/guc_tables.c:2962
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "체크포인트 작업을 할 WAL 크기 지정"
 
-#: utils/misc/guc_tables.c:2846
+#: utils/misc/guc_tables.c:2974
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "자동 WAL 체크포인트 사이의 최대 간격을 설정합니다."
 
-#: utils/misc/guc_tables.c:2857
+#: utils/misc/guc_tables.c:2985
 msgid ""
 "Sets the maximum time before warning if checkpoints triggered by WAL volume "
 "happen too frequently."
 msgstr ""
 "WAL 기록 때문에 자주 발생하는 체크포인트 경고를 보이지 않는 최대 시간 지정"
 
-#: utils/misc/guc_tables.c:2859
+#: utils/misc/guc_tables.c:2987
 msgid ""
 "Write a message to the server log if checkpoints caused by the filling of "
-"WAL segment files happen more frequently than this amount of time. Zero "
-"turns off the warning."
+"WAL segment files happen more frequently than this amount of time. 0 "
+"disables the warning."
 msgstr ""
 "체크포인트 작업이 지금 지정한 시간(초)보다 자주 체크포인트 세그먼트 파일에 내"
 "용이 꽉 차는 사태가 발생하면 경고 메시지를 서버 로그에 남깁니다. 이 값을 0으"
 "로 지정하면 경고 남기지 않음"
 
-#: utils/misc/guc_tables.c:2872 utils/misc/guc_tables.c:3090
-#: utils/misc/guc_tables.c:3144
+#: utils/misc/guc_tables.c:3000 utils/misc/guc_tables.c:3230
+#: utils/misc/guc_tables.c:3322
 msgid ""
 "Number of pages after which previously performed writes are flushed to disk."
 msgstr "쓰기 작업 뒤 디스크 동기화를 수행할 페이지 수"
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:3001 utils/misc/guc_tables.c:3231
+#: utils/misc/guc_tables.c:3323
+msgid "0 disables forced writeback."
+msgstr "0은 강제 writeback 비활성화"
+
+#: utils/misc/guc_tables.c:3011
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr ""
 "WAL 기능을 위해 공유 메모리에서 사용할 디스크 페이지 버퍼 개수를 지정함."
 
-#: utils/misc/guc_tables.c:2884
-msgid ""
-"Specify -1 to have this value determined as a fraction of shared_buffers."
-msgstr "shared_buffers 일부로 지정하려면 -1"
+#: utils/misc/guc_tables.c:3012
+msgid "-1 means use a fraction of \"shared_buffers\"."
+msgstr "\"shared_buffers\"의 일부를 사용하려면 지정하려면 -1"
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:3022
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "WAL 기록자가 지정 시간 만큼 쉬고 쓰기 작업을 반복함"
 
-#: utils/misc/guc_tables.c:2905
+#: utils/misc/guc_tables.c:3033
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "WAL 쓰기 프로세스가 이 양만큼 쓰고 flush 합니다."
 
-#: utils/misc/guc_tables.c:2916
+#: utils/misc/guc_tables.c:3044
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "WAL 쓰기 대신해서 fsync할 새 파일의 최소 크기"
 
-#: utils/misc/guc_tables.c:2927
+#: utils/misc/guc_tables.c:3055
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "동시에 작동할 WAL 송신 프로세스 최대 수 지정"
 
-#: utils/misc/guc_tables.c:2938
+#: utils/misc/guc_tables.c:3066
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "동시에 사용할 수 있는 복제 슬롯 최대 수 지정"
 
-#: utils/misc/guc_tables.c:2948
+#: utils/misc/guc_tables.c:3076
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "복제 슬롯을 위해 보관할 최대 WAL 크기 지정"
 
-#: utils/misc/guc_tables.c:2949
+#: utils/misc/guc_tables.c:3077
 msgid ""
 "Replication slots will be marked as failed, and segments released for "
-"deletion or recycling, if this much space is occupied by WAL on disk."
+"deletion or recycling, if this much space is occupied by WAL on disk. -1 "
+"means no maximum."
 msgstr ""
-"디스크에서 WAL이 이 정도의 공간을 차지하면 복제 슬롯은 실패로 표시되고, "
-"WAL 조각 파일들은 삭제 또는 재활용 됩니다."
+"WAL 파일이 많이 남아 디스크 공간이 부족해 진다면, 복제 슬롯이 문제가 있는 것"
+"으로 표시할 것이며, WAL 조각 파일들은 삭제 또는 재활용 됩니다. -1은 제한 없음"
 
-#: utils/misc/guc_tables.c:2961
+#: utils/misc/guc_tables.c:3089
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "WAL 복제를 위해 기다릴 최대 시간 설정"
 
-#: utils/misc/guc_tables.c:2972
+#: utils/misc/guc_tables.c:3100
+msgid ""
+"Sets the duration a replication slot can remain idle before it is "
+"invalidated."
+msgstr "복제 슬롯에 문제가 있음으로 처리하기 위한 최대 복제 간극을 지정합니다."
+
+#: utils/misc/guc_tables.c:3112
 msgid ""
 "Sets the delay in microseconds between transaction commit and flushing WAL "
 "to disk."
 msgstr ""
 "트랜잭션과 트랜잭션 로그의 적용 사이의 간격을 microsecond 단위로 지정함"
 
-#: utils/misc/guc_tables.c:2984
+#: utils/misc/guc_tables.c:3124
 msgid ""
 "Sets the minimum number of concurrent open transactions required before "
 "performing \"commit_delay\"."
 msgstr "\"commit_delay\" 처리하기 전에 있는 최소 동시 열려 있는 트랜잭션 개수."
 
-#: utils/misc/guc_tables.c:2995
+#: utils/misc/guc_tables.c:3135
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "부동소수형 값을 표기할 때 "
 
-#: utils/misc/guc_tables.c:2996
+#: utils/misc/guc_tables.c:3136
 msgid ""
 "This affects real, double precision, and geometric data types. A zero or "
 "negative parameter value is added to the standard number of digits (FLT_DIG "
@@ -32027,28 +33580,30 @@ msgstr ""
 "은 정수여야 합니다(FLT_DIG or DBL_DIG as appropriate - 무슨 말인지). 음수면 "
 "그 만큼 소숫점 자리를 더 많이 생략해서 정확도를 떨어뜨립니다."
 
-#: utils/misc/guc_tables.c:3008
+#: utils/misc/guc_tables.c:3148
 msgid ""
 "Sets the minimum execution time above which a sample of statements will be "
-"logged. Sampling is determined by log_statement_sample_rate."
+"logged. Sampling is determined by \"log_statement_sample_rate\"."
 msgstr ""
-"log_statement_sample_rate 설정으로 수집할 로그 가운데, 기록할 최소 쿼리 수행 "
-"시간"
+"\"log_statement_sample_rate\" 설정으로 수집할 로그 가운데, 기록할 최소 쿼리 "
+"수행 시간"
 
-#: utils/misc/guc_tables.c:3011
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "0을 지정하면 모든 쿼리를 로깅하고, -1을 지정하면 이 기능이 해제됩니다."
+#: utils/misc/guc_tables.c:3151
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr "-1은 샘플링 안함, 0은 모든 구문에 대해서 샘플링 함."
 
-#: utils/misc/guc_tables.c:3021
+#: utils/misc/guc_tables.c:3161
 msgid ""
 "Sets the minimum execution time above which all statements will be logged."
 msgstr "모든 실행 쿼리문을 로그로 남길 최소 실행 시간을 설정합니다."
 
-#: utils/misc/guc_tables.c:3023
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "0을 지정하면 모든 쿼리를 로깅하고, -1을 지정하면 이 기능이 해제됩니다."
+#: utils/misc/guc_tables.c:3163
+msgid ""
+"-1 disables logging statement durations. 0 means log all statement durations."
+msgstr ""
+"-1 = 구문 실행시간 로그 안보임, 0 = 모든 구문을 대상으로 로그 남김"
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3173
 msgid ""
 "Sets the minimum execution time above which autovacuum actions will be "
 "logged."
@@ -32056,208 +33611,265 @@ msgstr ""
 "이 시간을 초과할 경우 자동 청소 작업 로그를 남길  최소 실행 시간을 설정합니"
 "다."
 
-#: utils/misc/guc_tables.c:3035
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
+#: utils/misc/guc_tables.c:3175
+msgid ""
+"-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
 msgstr ""
-"0을 지정하면 모든 작업을 로깅하고, -1을 지정하면 자동 청소관련 로그를 남기지 "
-"않음"
+"-1 = autovacuum 작업 로깅 중지, 0 = 모든 autovacuum 작업 로깅"
 
-#: utils/misc/guc_tables.c:3045
+#: utils/misc/guc_tables.c:3185
 msgid ""
 "Sets the maximum length in bytes of data logged for bind parameter values "
 "when logging statements."
 msgstr "쿼리문 로그 저장에 쓸 매개변수 값의 최대 길이 바이트"
 
-#: utils/misc/guc_tables.c:3047 utils/misc/guc_tables.c:3059
-msgid "-1 to print values in full."
+#: utils/misc/guc_tables.c:3187 utils/misc/guc_tables.c:3199
+msgid "-1 means log values in full."
 msgstr "-1은 길이 제한 없이 전체"
 
-#: utils/misc/guc_tables.c:3057
+#: utils/misc/guc_tables.c:3197
 msgid ""
 "Sets the maximum length in bytes of data logged for bind parameter values "
 "when logging statements, on error."
 msgstr "쿼리 오류 시 쿼리문 로그 저장에 쓸 매개변수 값의 최대 길이 바이트"
 
-#: utils/misc/guc_tables.c:3069
+#: utils/misc/guc_tables.c:3209
 msgid "Background writer sleep time between rounds."
 msgstr "백그라운드 기록자의 잠자는 시간"
 
-#: utils/misc/guc_tables.c:3080
+#: utils/misc/guc_tables.c:3220
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "라운드당 플러시할 백그라운드 작성기 최대 LRU 페이지 수입니다."
 
-#: utils/misc/guc_tables.c:3103
+#: utils/misc/guc_tables.c:3221
+msgid "0 disables background writing."
+msgstr "0은 백그라운드 쓰기 비활성화."
+
+#: utils/misc/guc_tables.c:3243
 msgid ""
 "Number of simultaneous requests that can be handled efficiently by the disk "
 "subsystem."
 msgstr "디스크 하위 시스템에서 효율적으로 처리할 수 있는 동시 요청 수입니다."
 
-#: utils/misc/guc_tables.c:3117
+#: utils/misc/guc_tables.c:3244 utils/misc/guc_tables.c:3258
+msgid "0 disables simultaneous requests."
+msgstr "0 = 동시 요청 안함"
+
+#: utils/misc/guc_tables.c:3257
 msgid ""
 "A variant of \"effective_io_concurrency\" that is used for maintenance work."
-msgstr ""
-"유지보수 작업에 사용되는 \"effective_io_concurrency\"의 변형입니다."
+msgstr "유지보수 작업에 사용되는 \"effective_io_concurrency\"의 변형입니다."
+
+#: utils/misc/guc_tables.c:3272
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr "io_combine_limit 제한하는 서버 전역 제한입니다."
 
-#: utils/misc/guc_tables.c:3132
+#: utils/misc/guc_tables.c:3286
 msgid "Limit on the size of data reads and writes."
 msgstr "데이터 읽기 쓰기 크기의 제한을 겁니다."
 
-#: utils/misc/guc_tables.c:3157
+#: utils/misc/guc_tables.c:3300
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr "하나의 프로세스가 동시에 실행할 수 있는 IO의 최대 수"
+
+#: utils/misc/guc_tables.c:3312
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr "io_method=worker 일때 준비할 IO 작업자 프로세스 수"
+
+#: utils/misc/guc_tables.c:3335
 msgid "Maximum number of concurrent worker processes."
 msgstr "동시 작업자 프로세스의 최대 수"
 
-#: utils/misc/guc_tables.c:3169
+#: utils/misc/guc_tables.c:3347
 msgid "Maximum number of logical replication worker processes."
 msgstr "논리 복제 작업자 프로세스의 최대 수"
 
-#: utils/misc/guc_tables.c:3181
+#: utils/misc/guc_tables.c:3359
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "구독을 위한 테이블 동기화 작업자의 최대 수"
 
-#: utils/misc/guc_tables.c:3193
+#: utils/misc/guc_tables.c:3371
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "구독을 위한 테이블 병렬 동기화 작업자의 최대 수"
 
-#: utils/misc/guc_tables.c:3203
+#: utils/misc/guc_tables.c:3383
+msgid "Sets the maximum number of active replication origins."
+msgstr "활성 복제 오리진 최대 수를 지정합니다."
+
+#: utils/misc/guc_tables.c:3393
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "강제 로그 파일 바꾸기 전 대기 시간 지정"
 
-#: utils/misc/guc_tables.c:3215
+#: utils/misc/guc_tables.c:3395
+msgid "0 disables time-based creation of new log files."
+msgstr "0은 시간 기반 새 로그 만들기를 비활성화 함"
+
+#: utils/misc/guc_tables.c:3405
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "로그 파일 바꾸기 전 최대 로그 파일 크기 지정"
 
-#: utils/misc/guc_tables.c:3227
+#: utils/misc/guc_tables.c:3407
+msgid "0 disables size-based creation of new log files."
+msgstr "0 = 크기 기반 새 로그 만들기 안함"
+
+#: utils/misc/guc_tables.c:3417
 msgid "Shows the maximum number of function arguments."
 msgstr "함수 인자의 최대 갯수를 보여줍니다"
 
-#: utils/misc/guc_tables.c:3238
+#: utils/misc/guc_tables.c:3428
 msgid "Shows the maximum number of index keys."
 msgstr "인덱스 키의 최대개수를 보여줍니다."
 
-#: utils/misc/guc_tables.c:3249
+#: utils/misc/guc_tables.c:3439
 msgid "Shows the maximum identifier length."
 msgstr "최대 식별자 길이를 표시합니다."
 
-#: utils/misc/guc_tables.c:3260
+#: utils/misc/guc_tables.c:3450
 msgid "Shows the size of a disk block."
 msgstr "디스크 블록의 크기를 표시합니다."
 
-#: utils/misc/guc_tables.c:3271
+#: utils/misc/guc_tables.c:3461
 msgid "Shows the number of pages per disk file."
 msgstr "디스크 파일당 페이지 수를 표시합니다."
 
-#: utils/misc/guc_tables.c:3282
+#: utils/misc/guc_tables.c:3472
 msgid "Shows the block size in the write ahead log."
 msgstr "미리 쓰기 로그의 블록 크기를 표시합니다."
 
-#: utils/misc/guc_tables.c:3293
+#: utils/misc/guc_tables.c:3483
 msgid ""
 "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr ""
 "실패한 시도 후 WAL 검색을 다시 시도하기 전에 기다리는 시간을 설정합니다."
 
-#: utils/misc/guc_tables.c:3305
+#: utils/misc/guc_tables.c:3495
 msgid "Shows the size of write ahead log segments."
 msgstr "미리 쓰기 로그 세그먼트당 페이지 크기를 표시합니다."
 
-#: utils/misc/guc_tables.c:3318
+#: utils/misc/guc_tables.c:3508
 msgid "Time for which WAL summary files should be kept."
 msgstr "WAL 요약 파일을 보관해야 하는 시간입니다."
 
-#: utils/misc/guc_tables.c:3331
+#: utils/misc/guc_tables.c:3509
+msgid "0 disables automatic summary file deletion."
+msgstr "0 = 자동 요약 파일 지우기 금지"
+
+#: utils/misc/guc_tables.c:3521
 msgid "Time to sleep between autovacuum runs."
 msgstr "자동 청소 실행 사이의 절전 모드 시간입니다."
 
-#: utils/misc/guc_tables.c:3341
+#: utils/misc/guc_tables.c:3531
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "청소 전의 최소 튜플 업데이트 또는 삭제 수입니다."
 
-#: utils/misc/guc_tables.c:3350
-msgid ""
-"Minimum number of tuple inserts prior to vacuum, or -1 to disable insert "
-"vacuums."
-msgstr "청소를 위한 최소 튜플 삽입 수입니다. -1은 insert는 vacuum에서 제외"
+#: utils/misc/guc_tables.c:3540
+msgid "Maximum number of tuple updates or deletes prior to vacuum."
+msgstr "청소 전의 업데이트 또는 삭제된 최대 튜플 수"
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3541
+msgid "-1 disables the maximum threshold."
+msgstr "-1 = 최대 임계치 설정 비활성화"
+
+#: utils/misc/guc_tables.c:3549
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "청소 전의 삽입된 최소 튜플 수"
+
+#: utils/misc/guc_tables.c:3550
+msgid "-1 disables insert vacuums."
+msgstr "-1 = insert 작업에 대한 청소 비활성화"
+
+#: utils/misc/guc_tables.c:3558
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "통계 정보 수집을 위한  최소 튜플 삽입, 업데이트 또는 삭제 수입니다."
 
-#: utils/misc/guc_tables.c:3369
+#: utils/misc/guc_tables.c:3568
 msgid ""
 "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
 "트랜잭션 ID 겹침 방지를 위해 테이블에 대해 autovacuum 작업을 수행할 테이블 나"
 "이를 지정합니다."
 
-#: utils/misc/guc_tables.c:3381
+#: utils/misc/guc_tables.c:3580
 msgid ""
 "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr ""
 "멀티 트랜잭션 ID 겹침 방지를 위해 테이블에 대해 autovacuum 작업을 수행할 트랜"
 "잭션 나이를 지정합니다."
 
-#: utils/misc/guc_tables.c:3391
+#: utils/misc/guc_tables.c:3590
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr "autovacuum 작업자 용도 미리 할당된 백엔드 슬롯 수 지정"
+
+#: utils/misc/guc_tables.c:3599
 msgid ""
 "Sets the maximum number of simultaneously running autovacuum worker "
 "processes."
 msgstr "동시에 작업할 수 있는 autovacuum 작업자 최대 수 지정"
 
-#: utils/misc/guc_tables.c:3401
+#: utils/misc/guc_tables.c:3609
 msgid ""
 "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "유지보수 작업에서 사용할 병렬 프로세스 최대 수를 지정"
 
-#: utils/misc/guc_tables.c:3411
+#: utils/misc/guc_tables.c:3619
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "실행 노드당 최대 병렬 처리 수 지정"
 
-#: utils/misc/guc_tables.c:3422
+#: utils/misc/guc_tables.c:3630
 msgid ""
 "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "한번에 작업할 수 있는 병렬 작업자 최대 수 지정"
 
-#: utils/misc/guc_tables.c:3433
+#: utils/misc/guc_tables.c:3641
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "각 autovacuum 작업자 프로세스가 사용할 메모리 최대치"
 
-#: utils/misc/guc_tables.c:3444
+#: utils/misc/guc_tables.c:3642
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "-1은 \"maintenance_work_mem\" 설정값을 사용함."
+
+#: utils/misc/guc_tables.c:3652
 msgid "Time between issuing TCP keepalives."
 msgstr "TCP 연결 유지 실행 간격입니다."
 
-#: utils/misc/guc_tables.c:3445 utils/misc/guc_tables.c:3456
-#: utils/misc/guc_tables.c:3580
-msgid "A value of 0 uses the system default."
+#: utils/misc/guc_tables.c:3653 utils/misc/guc_tables.c:3664
+#: utils/misc/guc_tables.c:3787 utils/misc/guc_tables.c:3798
+msgid "0 means use the system default."
 msgstr "이 값이 0이면 시스템 기본 값"
 
-#: utils/misc/guc_tables.c:3455
+#: utils/misc/guc_tables.c:3663
 msgid "Time between TCP keepalive retransmits."
 msgstr "TCP keepalive 시간 설정"
 
-#: utils/misc/guc_tables.c:3466
+#: utils/misc/guc_tables.c:3674
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "SSL 재협상은 더 이상 지원되지 않습니다. 이 값은 0만 가능합니다."
 
-#: utils/misc/guc_tables.c:3477
+#: utils/misc/guc_tables.c:3685
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "TCP keepalive 확인 최대 횟수"
 
-#: utils/misc/guc_tables.c:3478
+#: utils/misc/guc_tables.c:3686
 msgid ""
 "Number of consecutive keepalive retransmits that can be lost before a "
-"connection is considered dead. A value of 0 uses the system default."
+"connection is considered dead. 0 means use the system default."
 msgstr ""
 "연결이 중단된 것으로 간주되기 전에 연결 유지 요청을 위한 연속적인 keepalive "
 "패킷 전송 수. 0을 지정하면 시스템 기본 값이 사용됩니다."
 
-#: utils/misc/guc_tables.c:3489
+#: utils/misc/guc_tables.c:3697
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "정확한 GIN 기준 검색에 허용되는 최대 결과 수를 설정합니다."
 
-#: utils/misc/guc_tables.c:3500
+#: utils/misc/guc_tables.c:3698
+msgid "0 means no limit."
+msgstr "0은 제한 없음"
+
+#: utils/misc/guc_tables.c:3707
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "디스크 캐시 총 크기에 대한 계획 관리자의 가정을 설정합니다."
 
-#: utils/misc/guc_tables.c:3501
+#: utils/misc/guc_tables.c:3708
 msgid ""
 "That is, the total size of the caches (kernel cache and shared buffers) used "
 "for PostgreSQL data files. This is measured in disk pages, which are "
@@ -32266,89 +33878,97 @@ msgstr ""
 "즉, PostgreSQL에서 사용하는 총 캐시 크기입니다(커널 캐시와 공유 버퍼 모두 포"
 "함). 이 값은 디스크 페이지 단위로 측정되며, 일반적으로 각각 8kB입니다."
 
-#: utils/misc/guc_tables.c:3512
+#: utils/misc/guc_tables.c:3719
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "병렬 조회를 위한 최소 테이블 자료량 지정"
 
-#: utils/misc/guc_tables.c:3513
+#: utils/misc/guc_tables.c:3720
 msgid ""
 "If the planner estimates that it will read a number of table pages too small "
 "to reach this limit, a parallel scan will not be considered."
 msgstr ""
-"실행계획기가 이 한계에 도달하기에는 너무 작은 수의 테이블 페이지를 읽을 것으로 "
-"추정하는 경우 병렬 스캔은 고려하지 않습니다."
+"실행계획기가 이 한계에 도달하기에는 너무 작은 수의 테이블 페이지를 읽을 것으"
+"로 추정하는 경우 병렬 스캔은 고려하지 않습니다."
 
-#: utils/misc/guc_tables.c:3523
+#: utils/misc/guc_tables.c:3730
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "병렬 조회를 위한 최소 인덱스 자료량 지정"
 
-#: utils/misc/guc_tables.c:3524
+#: utils/misc/guc_tables.c:3731
 msgid ""
 "If the planner estimates that it will read a number of index pages too small "
 "to reach this limit, a parallel scan will not be considered."
 msgstr ""
-"실행계획기가 이 한계에 도달하기에는 너무 작은 수의 인덱스 페이지를 읽을 것으로 "
-"추정하는 경우 병렬 스캔은 고려하지 않습니다."
+"실행계획기가 이 한계에 도달하기에는 너무 작은 수의 인덱스 페이지를 읽을 것으"
+"로 추정하는 경우 병렬 스캔은 고려하지 않습니다."
 
-#: utils/misc/guc_tables.c:3535
+#: utils/misc/guc_tables.c:3742
 msgid "Shows the server version as an integer."
 msgstr "서버 버전을 정수형으로 보여줍니다"
 
-#: utils/misc/guc_tables.c:3546
+#: utils/misc/guc_tables.c:3753
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "이 킬로바이트 수보다 큰 임시 파일의 사용을 기록합니다."
 
-#: utils/misc/guc_tables.c:3547
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#: utils/misc/guc_tables.c:3754
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
 msgstr ""
-"0을 지정하면 모든 파일이 기록됩니다. 기본 값은 -1로, 이 기능이 해제됩니다."
+"-1은 임시 파일 사용 로그 비활성화, 0은 임시 파일 사용에 대해 모두 로그함"
 
-#: utils/misc/guc_tables.c:3557
+#: utils/misc/guc_tables.c:3764
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "pg_stat_activity.query에 예약되는 크기(바이트)를 설정합니다."
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3775
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "GIN 인덱스를 위한 팬딩(pending) 목록의 최대 크기 지정"
 
-#: utils/misc/guc_tables.c:3579
+#: utils/misc/guc_tables.c:3786
 msgid "TCP user timeout."
 msgstr "TCP 사용자 제한시간."
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3797
 msgid "The size of huge page that should be requested."
 msgstr "요청되는 huge page 크기"
 
-#: utils/misc/guc_tables.c:3601
+#: utils/misc/guc_tables.c:3808
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "디버킹 처리를 위해 적극적으로 시스템 캐시를 비웁니다."
 
-#: utils/misc/guc_tables.c:3624
+#: utils/misc/guc_tables.c:3809
+msgid "0 means use normal caching behavior."
+msgstr "0 = 일반적인 캐싱 동작"
+
+#: utils/misc/guc_tables.c:3831
 msgid ""
 "Sets the time interval between checks for disconnection while running "
 "queries."
 msgstr "쿼리 실행 중에 연결을 끊을지 검사하는 간격을 지정합니다."
 
-#: utils/misc/guc_tables.c:3635
+#: utils/misc/guc_tables.c:3832
+msgid "0 disables connection checks."
+msgstr "0은 연결 검사 안함"
+
+#: utils/misc/guc_tables.c:3842
 msgid "Time between progress updates for long-running startup operations."
 msgstr "연결 작업이 오래 진행되는 경우 진행 상태 갱신 주기"
 
-#: utils/misc/guc_tables.c:3637
-msgid "0 turns this feature off."
-msgstr "0을 지정하면 이 기능이 해제됩니다."
+#: utils/misc/guc_tables.c:3844
+msgid "0 disables progress updates."
+msgstr "0 = 진행 상태 갱신 안함"
 
-#: utils/misc/guc_tables.c:3647
+#: utils/misc/guc_tables.c:3854
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "SCRAM 비밀번호 생성용 이터레이션 수를 지정합니다."
 
-#: utils/misc/guc_tables.c:3667
+#: utils/misc/guc_tables.c:3874
 msgid ""
 "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr ""
 "순차적으로 접근하는 디스크 페이지에 대한 계획 관리자의 예상 비용을 설정합니"
 "다."
 
-#: utils/misc/guc_tables.c:3678
+#: utils/misc/guc_tables.c:3885
 msgid ""
 "Sets the planner's estimate of the cost of a nonsequentially fetched disk "
 "page."
@@ -32356,11 +33976,11 @@ msgstr ""
 "비순차적으로 접근하는 디스크 페이지에 대한 계획 관리자의 예상 비용을 설정합니"
 "다."
 
-#: utils/misc/guc_tables.c:3689
+#: utils/misc/guc_tables.c:3896
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "각 튜플(행)에 대한 계획 관리자의 예상 처리 비용을 설정합니다."
 
-#: utils/misc/guc_tables.c:3700
+#: utils/misc/guc_tables.c:3907
 msgid ""
 "Sets the planner's estimate of the cost of processing each index entry "
 "during an index scan."
@@ -32368,7 +33988,7 @@ msgstr ""
 "실행 계획기의 비용 계산에 사용될 인덱스 스캔으로 각 인덱스 항목을 처리하는 예"
 "상 처리 비용을 설정합니다."
 
-#: utils/misc/guc_tables.c:3711
+#: utils/misc/guc_tables.c:3918
 msgid ""
 "Sets the planner's estimate of the cost of processing each operator or "
 "function call."
@@ -32376,7 +33996,7 @@ msgstr ""
 "실행 계획기의 비용 계산에 사용될 함수 호출이나 연산자 연산 처리하는 예상 처"
 "리 비용을 설정합니다."
 
-#: utils/misc/guc_tables.c:3722
+#: utils/misc/guc_tables.c:3929
 msgid ""
 "Sets the planner's estimate of the cost of passing each tuple (row) from "
 "worker to leader backend."
@@ -32384,7 +34004,7 @@ msgstr ""
 "각 튜플(행)을 작업자에서 리더 백엔드로 보내는 예상 비용을 실행계획기에 설정합"
 "니다."
 
-#: utils/misc/guc_tables.c:3733
+#: utils/misc/guc_tables.c:3940
 msgid ""
 "Sets the planner's estimate of the cost of starting up worker processes for "
 "parallel query."
@@ -32392,71 +34012,75 @@ msgstr ""
 "병렬 쿼리를 위해 작업자 프로세스 시작하는데 드는 예상 비용을 실행계획기에 설"
 "정합니다."
 
-#: utils/misc/guc_tables.c:3745
+#: utils/misc/guc_tables.c:3952
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "쿼리 수행 예상 비용이 이 값보다 크면, JIT 짜깁기를 수행"
 
-#: utils/misc/guc_tables.c:3746
+#: utils/misc/guc_tables.c:3953
 msgid "-1 disables JIT compilation."
 msgstr "-1 = JIT 짜깁기 안함"
 
-#: utils/misc/guc_tables.c:3756
+#: utils/misc/guc_tables.c:3963
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "쿼리 수행 예상 비용이 이 값보다 크면, JIT-컴파일된 함수 최적화 함"
 
-#: utils/misc/guc_tables.c:3757
+#: utils/misc/guc_tables.c:3964
 msgid "-1 disables optimization."
 msgstr "-1 = 최적화 비활성화"
 
-#: utils/misc/guc_tables.c:3767
+#: utils/misc/guc_tables.c:3974
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "쿼리 수행 예상 비용이 이 값보다 크면, JIT 인라인 작업 수행"
 
-#: utils/misc/guc_tables.c:3768
+#: utils/misc/guc_tables.c:3975
 msgid "-1 disables inlining."
 msgstr "-1 = 인라인 기능 끔"
 
-#: utils/misc/guc_tables.c:3778
+#: utils/misc/guc_tables.c:3985
 msgid ""
 "Sets the planner's estimate of the fraction of a cursor's rows that will be "
 "retrieved."
 msgstr "<qbq>검색될 커서 행에 대한 계획 관리자의 예상 분수 값을 설정합니다."
 
-#: utils/misc/guc_tables.c:3790
+#: utils/misc/guc_tables.c:3997
 msgid ""
 "Sets the planner's estimate of the average size of a recursive query's "
 "working table."
 msgstr "재귀 호출 쿼리 대상 테이블의 평균 크기를 실행 계획기에 설정 함"
 
-#: utils/misc/guc_tables.c:3802
+#: utils/misc/guc_tables.c:4009
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: 모집단 내의 선택 압력입니다."
 
-#: utils/misc/guc_tables.c:3813
+#: utils/misc/guc_tables.c:4020
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: 무작위 경로 선택을 위한 씨드"
 
-#: utils/misc/guc_tables.c:3824
+#: utils/misc/guc_tables.c:4031
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "테이블 해시 작업에서 쓸 \"work_mem\" 값의 배율"
 
-#: utils/misc/guc_tables.c:3835
+#: utils/misc/guc_tables.c:4042
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "라운드당 해제할 평균 버퍼 사용의 배수입니다."
 
-#: utils/misc/guc_tables.c:3845
+#: utils/misc/guc_tables.c:4052
 msgid "Sets the seed for random-number generation."
 msgstr "난수 생성 속도를 설정합니다."
 
-#: utils/misc/guc_tables.c:3856
+#: utils/misc/guc_tables.c:4063
 msgid "Vacuum cost delay in milliseconds."
 msgstr "청소 비용 지연(밀리초)입니다."
 
-#: utils/misc/guc_tables.c:3867
+#: utils/misc/guc_tables.c:4074
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "자동 청소에 대한 청소 비용 지연(밀리초)입니다."
 
-#: utils/misc/guc_tables.c:3878
+#: utils/misc/guc_tables.c:4075
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr "-1 = \"vacuum_cost_delay\" 값 사용"
+
+#: utils/misc/guc_tables.c:4085
 msgid ""
 "Number of tuple updates or deletes prior to vacuum as a fraction of "
 "reltuples."
@@ -32464,11 +34088,11 @@ msgstr ""
 "vacuum 작업을 진행할 update, delete 작업량을 전체 자료에 대한 분수값으로 지정"
 "합니다."
 
-#: utils/misc/guc_tables.c:3888
+#: utils/misc/guc_tables.c:4095
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "vacuum을 위한 전체 튜플 대비 insert 튜플의 비율"
 
-#: utils/misc/guc_tables.c:3898
+#: utils/misc/guc_tables.c:4105
 msgid ""
 "Number of tuple inserts, updates, or deletes prior to analyze as a fraction "
 "of reltuples."
@@ -32476,148 +34100,173 @@ msgstr ""
 "통계 수집 작업을 진행할 insert, update, delete 작업량을 전체 자료에 대한 분수"
 "값으로 지정합니다."
 
-#: utils/misc/guc_tables.c:3908
+#: utils/misc/guc_tables.c:4115
 msgid ""
 "Time spent flushing dirty buffers during checkpoint, as fraction of "
 "checkpoint interval."
 msgstr "체크포인트 반복 주기 안에 작업을 완료할 분수값(1=100%)"
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:4125
 msgid ""
 "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr "\"log_min_duration_sample\" 로그의 비율"
 
-#: utils/misc/guc_tables.c:3919
+#: utils/misc/guc_tables.c:4126
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "0.0 (로그 안남김)에서 1.0(모두 남김) 값을 지정할 수 있음"
 
-#: utils/misc/guc_tables.c:3928
+#: utils/misc/guc_tables.c:4135
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "모든 구문을 로그로 남기려고 할 때, 그 남길 비율"
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:4136
 msgid ""
 "Use a value between 0.0 (never log) and 1.0 (log all statements for all "
 "transactions)."
 msgstr "0.0(모두 안 남김) 부터 1.0 (모두 남김)까지 지정할 수 있습니다."
 
-#: utils/misc/guc_tables.c:3948
+#: utils/misc/guc_tables.c:4146
+msgid ""
+"Fraction of pages in a relation vacuum can scan and fail to freeze before "
+"disabling eager scanning."
+msgstr ""
+"릴레이션 청소 작업에서 검사 대상이 되는 페이지 비율."
+"0 보다 크게 설정하면, 적극적 검사를 하지 않아 "
+"영구 보관 작업이 완전하지 않을 수 있음."
+
+#: utils/misc/guc_tables.c:4147
+msgid ""
+"A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan "
+"up to 100 percent of the all-visible pages in the relation. If vacuum "
+"successfully freezes these pages, the cap is lower than 100 percent, because "
+"the goal is to amortize page freezing across multiple vacuums."
+msgstr ""
+"0 = 적극적 검사 금지, 1 = 100% 적극적 검사, 대상은 릴레이션에 자료가 있는 모든 페이지. "
+"청소 작업으로 이들 페이지 대상 영구 보관 작업이 성공한다면, "
+"상한은 100%보다 낮습니다. 왜냐하면, 여러 번의 청소 작업으로 "
+"영구 보관 작업을 분산하는 것이기 목표이기 때문입니다."
+
+#: utils/misc/guc_tables.c:4165
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "WAL 파일을 아카이빙하기 위해 호출될 셸 명령을 설정합니다."
 
-#: utils/misc/guc_tables.c:3949
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "이 설정은 \"archive_library\" 설정이 안되어 있을 때만 작동합니다."
+#: utils/misc/guc_tables.c:4166
+msgid "An empty string means use \"archive_library\"."
+msgstr "비워두면 \"archive_library\" 설정값을 사용함"
 
-#: utils/misc/guc_tables.c:3958
+#: utils/misc/guc_tables.c:4175
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "WAL 파일을 아카이빙하기 위해 호출될 셸 명령을 설정합니다."
 
-#: utils/misc/guc_tables.c:3959
-msgid "An empty string indicates that \"archive_command\" should be used."
-msgstr "\"archive_command\" 설정값은 빈 문자열이어야 합니다."
+#: utils/misc/guc_tables.c:4176
+msgid "An empty string means use \"archive_command\"."
+msgstr "빈 문자열이면 \"archive_command\" 설정값을 사용함."
 
-#: utils/misc/guc_tables.c:3968
+#: utils/misc/guc_tables.c:4185
 msgid ""
 "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "아카이브된 WAL 파일을 재 반영할 쉘 명령어를 설정합니다."
 
-#: utils/misc/guc_tables.c:3978
+#: utils/misc/guc_tables.c:4195
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "매 복구 작업이 끝난 다음 실행할 쉘 명령어를 설정합니다."
 
-#: utils/misc/guc_tables.c:3988
+#: utils/misc/guc_tables.c:4205
 msgid ""
 "Sets the shell command that will be executed once at the end of recovery."
 msgstr "복구 작업 끝에 한 번 실행될 쉘 명령어를 설정합니다."
 
-#: utils/misc/guc_tables.c:3998
+#: utils/misc/guc_tables.c:4215
 msgid "Specifies the timeline to recover into."
 msgstr "복구할 타임라인을 지정합니다."
 
-#: utils/misc/guc_tables.c:4008
+#: utils/misc/guc_tables.c:4225
 msgid ""
 "Set to \"immediate\" to end recovery as soon as a consistent state is "
 "reached."
 msgstr "복구를 끝내는 지점을 가장 최근으로 하려면, \"immediate\"로 지정하세요."
 
-#: utils/misc/guc_tables.c:4017
+#: utils/misc/guc_tables.c:4234
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "복구를 끝낼 마지막 트랜잭션 ID 지정"
 
-#: utils/misc/guc_tables.c:4026
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "복구를 끝낼 마지막 시간 지정"
 
-#: utils/misc/guc_tables.c:4035
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "복구를 끝낼 복구 지점 이름 지정"
 
-#: utils/misc/guc_tables.c:4044
+#: utils/misc/guc_tables.c:4261
 msgid ""
 "Sets the LSN of the write-ahead log location up to which recovery will "
 "proceed."
 msgstr "복구용 미리 쓰기 로그의 복구 지점 LSN 지정"
 
-#: utils/misc/guc_tables.c:4054
+#: utils/misc/guc_tables.c:4271
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "트랜잭션 로그를 보내는 서버로 접속하기 위한 접속 문자열 지정"
 
-#: utils/misc/guc_tables.c:4065
+#: utils/misc/guc_tables.c:4282
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "복제 슬롯 이름을 지정합니다."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4292
 msgid "Sets the client's character set encoding."
 msgstr "클라이언트 문자 세트 인코딩을 지정함"
 
-#: utils/misc/guc_tables.c:4086
+#: utils/misc/guc_tables.c:4303
 msgid "Controls information prefixed to each log line."
 msgstr "각 로그 줄 앞에 추가할 정보를 제어합니다."
 
-#: utils/misc/guc_tables.c:4087
-msgid "If blank, no prefix is used."
-msgstr "비워 두면 접두사가 사용되지 않습니다."
+#: utils/misc/guc_tables.c:4304
+msgid "An empty string means no prefix."
+msgstr "비워두면 추가 정보 없음"
 
-#: utils/misc/guc_tables.c:4096
+#: utils/misc/guc_tables.c:4313
 msgid "Sets the time zone to use in log messages."
 msgstr "로그 메시지에 사용할 표준 시간대를 설정합니다."
 
-#: utils/misc/guc_tables.c:4106
+#: utils/misc/guc_tables.c:4323
 msgid "Sets the display format for date and time values."
 msgstr "날짜와 시간 값을 나타내는 모양을 지정합니다."
 
-#: utils/misc/guc_tables.c:4107
+#: utils/misc/guc_tables.c:4324
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "또한 모호한 날짜 입력의 해석을 제어합니다."
 
-#: utils/misc/guc_tables.c:4118
+#: utils/misc/guc_tables.c:4335
 msgid "Sets the default table access method for new tables."
 msgstr "새 테이블에서 사용할 기본 테이블 접근 방법을 지정합니다."
 
-#: utils/misc/guc_tables.c:4129
+#: utils/misc/guc_tables.c:4346
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "테이블 및 인덱스를 만들 기본 테이블스페이스를 설정합니다."
 
-#: utils/misc/guc_tables.c:4130
-msgid "An empty string selects the database's default tablespace."
-msgstr "빈 문자열을 지정하면 데이터베이스의 기본 테이블스페이스가 선택됩니다."
+#: utils/misc/guc_tables.c:4347 utils/misc/guc_tables.c:4358
+msgid "An empty string means use the database's default tablespace."
+msgstr "빈 문자열을 지정하면 데이터베이스의 기본 테이블스페이스를 사용함."
 
-#: utils/misc/guc_tables.c:4140
+#: utils/misc/guc_tables.c:4357
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "임시 테이블 및 정렬 파일에 사용할 테이블스페이스를 설정합니다."
 
-#: utils/misc/guc_tables.c:4151
+#: utils/misc/guc_tables.c:4368
 msgid ""
 "Sets whether a CREATEROLE user automatically grants the role to themselves, "
 "and with which options."
 msgstr "CREATEROLE 권한이 있는 사용자가 자동으로 스스로에게 부여할 옵션 지정"
 
-#: utils/misc/guc_tables.c:4163
+#: utils/misc/guc_tables.c:4370
+msgid "An empty string disables automatic self grants."
+msgstr "비워두면 자동 권한 부여 없음"
+
+#: utils/misc/guc_tables.c:4380
 msgid "Sets the path for dynamically loadable modules."
 msgstr "동적으로 불러올 수 있는 모듈들이 있는 경로를 지정함."
 
-#: utils/misc/guc_tables.c:4164
+#: utils/misc/guc_tables.c:4381
 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 "
@@ -32627,68 +34276,89 @@ msgstr ""
 "가 없는 경우(즉, 이름에 슬래시 기호가 없는 경우) 시스템은 이 경로에서 지정한 "
 "파일을 검색합니다."
 
-#: utils/misc/guc_tables.c:4177
+#: utils/misc/guc_tables.c:4394
+msgid "Sets the path for extension control files."
+msgstr "확장 모듈 컨트롤 파일을 위한 경로를 지정"
+
+#: utils/misc/guc_tables.c:4395
+msgid ""
+"The remaining extension script and secondary control files are then loaded "
+"from the same directory where the primary control file was found."
+msgstr ""
+"남아 있는 확장 모듈 스크립트와 두번째 컨트롤 파일은 "
+"기본 컨트롤 파일이 있는 디렉터리와 같은 곳에서 불러옵니다."
+
+#: utils/misc/guc_tables.c:4406
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Kerberos 서버 키 파일의 위치를 지정함."
 
-#: utils/misc/guc_tables.c:4188
+#: utils/misc/guc_tables.c:4417
 msgid "Sets the Bonjour service name."
 msgstr "Bonjour 서비스 이름을 지정"
 
-#: utils/misc/guc_tables.c:4198
+#: utils/misc/guc_tables.c:4418
+msgid "An empty string means use the computer name."
+msgstr "비워두면 컴퓨터 이름을 사용함"
+
+#: utils/misc/guc_tables.c:4427
 msgid "Sets the language in which messages are displayed."
 msgstr "보여질 메시지로 사용할 언어 지정."
 
-#: utils/misc/guc_tables.c:4208
+#: utils/misc/guc_tables.c:4428 utils/misc/guc_tables.c:4438
+#: utils/misc/guc_tables.c:4448 utils/misc/guc_tables.c:4458
+msgid "An empty string means use the operating system setting."
+msgstr "비워두면 OS 설정값을 사용함"
+
+#: utils/misc/guc_tables.c:4437
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "통화금액 표현 양식으로 사용할 로케일 지정."
 
-#: utils/misc/guc_tables.c:4218
+#: utils/misc/guc_tables.c:4447
 msgid "Sets the locale for formatting numbers."
 msgstr "숫자 표현 양식으로 사용할 로케일 지정."
 
-#: utils/misc/guc_tables.c:4228
+#: utils/misc/guc_tables.c:4457
 msgid "Sets the locale for formatting date and time values."
 msgstr "날짜와 시간 값을 표현할 양식으로 사용할 로케일 지정."
 
-#: utils/misc/guc_tables.c:4238
+#: utils/misc/guc_tables.c:4467
 msgid "Lists shared libraries to preload into each backend."
 msgstr "각각의 백엔드에 미리 불러올 공유 라이브러리들을 지정합니다"
 
-#: utils/misc/guc_tables.c:4249
+#: utils/misc/guc_tables.c:4478
 msgid "Lists shared libraries to preload into server."
 msgstr "서버에 미리 불러올 공유 라이브러리들을 지정합니다"
 
-#: utils/misc/guc_tables.c:4260
+#: utils/misc/guc_tables.c:4489
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr ""
 "각각의 백엔드에 미리 불러올 접근제한 없는 공유 라이브러리들을 지정합니다"
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4500
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "스키마로 한정되지 않은 이름의 스키마 검색 순서를 설정합니다."
 
-#: utils/misc/guc_tables.c:4283
+#: utils/misc/guc_tables.c:4512
 msgid "Shows the server (database) character set encoding."
 msgstr "서버 (데이터베이스) 문자 세트 인코딩 보여줌"
 
-#: utils/misc/guc_tables.c:4295
+#: utils/misc/guc_tables.c:4524
 msgid "Shows the server version."
 msgstr "서버 버전 보임."
 
-#: utils/misc/guc_tables.c:4307
+#: utils/misc/guc_tables.c:4536
 msgid "Sets the current role."
 msgstr "현재 롤을 지정"
 
-#: utils/misc/guc_tables.c:4319
+#: utils/misc/guc_tables.c:4548
 msgid "Sets the session user name."
 msgstr "세션 사용자 이름 지정."
 
-#: utils/misc/guc_tables.c:4330
+#: utils/misc/guc_tables.c:4559
 msgid "Sets the destination for server log output."
 msgstr "서버 로그 출력을 위한 대상을 지정합니다."
 
-#: utils/misc/guc_tables.c:4331
+#: utils/misc/guc_tables.c:4560
 msgid ""
 "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", "
 "\"jsonlog\", and \"eventlog\", depending on the platform."
@@ -32696,138 +34366,161 @@ msgstr ""
 "유효한 값은 플랫폼에 따라 \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\" 및 "
 "\"eventlog\"의 조합입니다."
 
-#: utils/misc/guc_tables.c:4342
+#: utils/misc/guc_tables.c:4571
 msgid "Sets the destination directory for log files."
 msgstr "로그 파일의 대상 디렉터리를 설정합니다."
 
-#: utils/misc/guc_tables.c:4343
+#: utils/misc/guc_tables.c:4572
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "데이터 디렉터리의 상대 경로 또는 절대 경로로 지정할 수 있습니다."
 
-#: utils/misc/guc_tables.c:4353
+#: utils/misc/guc_tables.c:4582
 msgid "Sets the file name pattern for log files."
 msgstr "로그 파일의 파일 이름 패턴을 설정합니다."
 
-#: utils/misc/guc_tables.c:4364
+#: utils/misc/guc_tables.c:4593
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "syslog에서 구분할 PostgreSQL 메시지에 사용될 프로그램 이름을 지정."
 
-#: utils/misc/guc_tables.c:4375
+#: utils/misc/guc_tables.c:4604
 msgid ""
 "Sets the application name used to identify PostgreSQL messages in the event "
 "log."
 msgstr ""
 "이벤트 로그에서 PostgreSQL 메시지 식별자로 사용할 응용프로그램 이름 지정"
 
-#: utils/misc/guc_tables.c:4386
+#: utils/misc/guc_tables.c:4615
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "시간대(time zone)를 지정함."
 
-#: utils/misc/guc_tables.c:4396
+#: utils/misc/guc_tables.c:4625
 msgid "Selects a file of time zone abbreviations."
 msgstr "표준 시간대 약어 파일을 선택합니다."
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4635
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "유닉스 도메인 소켓의 소유주를 지정"
 
-#: utils/misc/guc_tables.c:4407
+#: utils/misc/guc_tables.c:4636
 msgid ""
-"The owning user of the socket is always the user that starts the server."
-msgstr "소켓 소유자는 항상 서버를 시작하는 사용자입니다."
+"The owning user of the socket is always the user that starts the server. An "
+"empty string means use the user's default group."
+msgstr ""
+"소켓 소유자는 항상 서버를 시작하는 사용자입니다. 이 값이 비어있으면 그 사용자"
+"의 그룹을 사용함."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4646
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "유닉스 도메인 소켓을 만들 디렉터리를 지정합니다."
 
-#: utils/misc/guc_tables.c:4428
+#: utils/misc/guc_tables.c:4657
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "서비스할 호스트이름이나, IP를 지정함."
 
-#: utils/misc/guc_tables.c:4443
+#: utils/misc/guc_tables.c:4672
 msgid "Sets the server's data directory."
 msgstr "서버의 데이터 디렉터리 위치를 지정합니다."
 
-#: utils/misc/guc_tables.c:4454
+#: utils/misc/guc_tables.c:4683
 msgid "Sets the server's main configuration file."
 msgstr "서버의 기본 환경설정 파일 경로를 지정합니다."
 
-#: utils/misc/guc_tables.c:4465
+#: utils/misc/guc_tables.c:4694
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "서버의 \"hba\" 구성 파일을 설정합니다."
 
-#: utils/misc/guc_tables.c:4476
+#: utils/misc/guc_tables.c:4705
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "서버의 \"ident\" 구성 파일을 설정합니다."
 
-#: utils/misc/guc_tables.c:4487
+#: utils/misc/guc_tables.c:4716
 msgid "Writes the postmaster PID to the specified file."
 msgstr "postmaster PID가 기록된 파일의 경로를 지정합니다."
 
-#: utils/misc/guc_tables.c:4498
+#: utils/misc/guc_tables.c:4727
 msgid "Shows the name of the SSL library."
 msgstr "SSL 라이브러리 이름을 보여줌"
 
-#: utils/misc/guc_tables.c:4513
+#: utils/misc/guc_tables.c:4742
 msgid "Location of the SSL server certificate file."
 msgstr "서버 인증서 파일 위치를 지정함"
 
-#: utils/misc/guc_tables.c:4523
+#: utils/misc/guc_tables.c:4752
 msgid "Location of the SSL server private key file."
 msgstr "SSL 서버 개인 키 파일의 위치를 지정함."
 
-#: utils/misc/guc_tables.c:4533
+#: utils/misc/guc_tables.c:4762
 msgid "Location of the SSL certificate authority file."
 msgstr "SSL 인증 authority 파일 위치"
 
-#: utils/misc/guc_tables.c:4543
+#: utils/misc/guc_tables.c:4772
 msgid "Location of the SSL certificate revocation list file."
 msgstr "SSL 인증서 파기 목록 파일의 위치"
 
-#: utils/misc/guc_tables.c:4553
+#: utils/misc/guc_tables.c:4782
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "SSL 인증서 파기 목록 디렉터리 위치"
 
-#: utils/misc/guc_tables.c:4563
+#: utils/misc/guc_tables.c:4792
 msgid ""
 "Number of synchronous standbys and list of names of potential synchronous "
 "ones."
 msgstr "동기식 복제용 대기 서버 수와 운영 서버 전환 대상이 되는 서버 이름 목록"
 
-#: utils/misc/guc_tables.c:4574
+#: utils/misc/guc_tables.c:4803
 msgid "Sets default text search configuration."
 msgstr "기본 텍스트 검색 구성을 설정합니다."
 
-#: utils/misc/guc_tables.c:4584
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "허용되는 SSL 암호 목록을 설정합니다."
+#: utils/misc/guc_tables.c:4813
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "허용되는 TLSv1.3 암호 알고리즘 목록을 설정합니다."
+
+#: utils/misc/guc_tables.c:4814
+msgid "An empty string means use the default cipher suites."
+msgstr "빈 문자열이면 기본 암호 알고리즘 목록을 사용함."
+
+#: utils/misc/guc_tables.c:4824
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
+msgstr "허용되는 TLSv1.2 (그 이하 포함) 암호 목록을 설정합니다."
 
-#: utils/misc/guc_tables.c:4599
-msgid "Sets the curve to use for ECDH."
-msgstr "ECDH에 사용할 curve 설정"
+#: utils/misc/guc_tables.c:4839
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr "Diffie-Hellman 키 교환용으로 사용할 그룹 지정"
 
-#: utils/misc/guc_tables.c:4614
+#: utils/misc/guc_tables.c:4840
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr "쉼표로 구분해서 여러 그룹을 지정할 수 있음"
+
+#: utils/misc/guc_tables.c:4854
 msgid "Location of the SSL DH parameters file."
 msgstr "SSL DH 매개 변수 파일의 위치."
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4855
+msgid "An empty string means use compiled-in default parameters."
+msgstr "빈 문자열을 지정하면 컴파일 할 때 지정한 기본 매개변수값이 사용됨"
+
+#: utils/misc/guc_tables.c:4865
 msgid "Command to obtain passphrases for SSL."
 msgstr "SSL 비밀번호 입력을 위한 명령"
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4866
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr "비워두면 내장 프롬프트 메카니즘을 사용함"
+
+#: utils/misc/guc_tables.c:4876
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "통계정보와 로그에 포함될 응용프로그램 이름 지정"
 
-#: utils/misc/guc_tables.c:4647
+#: utils/misc/guc_tables.c:4887
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "프로세스 타이틀에 포함될 클러스터 이름 지정"
 
-#: utils/misc/guc_tables.c:4658
+#: utils/misc/guc_tables.c:4898
 msgid ""
 "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "WAL 동시성 검사 완료용 WAL 자원 관리자 지정"
 
-#: utils/misc/guc_tables.c:4659
+#: utils/misc/guc_tables.c:4899
 msgid ""
 "Full-page images will be logged for all data blocks and cross-checked "
 "against the results of WAL replay."
@@ -32835,51 +34528,63 @@ msgstr ""
 "풀페이지 이미지가 모든 데이터 블록을 위해 기록될 것이며 WAL 재반영 결과를 이"
 "중 검증을 합니다."
 
-#: utils/misc/guc_tables.c:4669
+#: utils/misc/guc_tables.c:4909
 msgid "JIT provider to use."
 msgstr "사용할 JIT 제공자"
 
-#: utils/misc/guc_tables.c:4680
+#: utils/misc/guc_tables.c:4920
 msgid "Log backtrace for errors in these functions."
 msgstr "이 함수들 안에 오류 추적용 로그를 남김"
 
-#: utils/misc/guc_tables.c:4691
+#: utils/misc/guc_tables.c:4931
 msgid "Use direct I/O for file access."
 msgstr "파일 접근을 위해 직접 I/O를 사용합니다."
 
-#: utils/misc/guc_tables.c:4702
+#: utils/misc/guc_tables.c:4932
+msgid "An empty string disables direct I/O."
+msgstr "비워두면 다이렉트 I/O 비활성화"
+
+#: utils/misc/guc_tables.c:4942
 msgid ""
 "Lists streaming replication standby server replication slot names that "
 "logical WAL sender processes will wait for."
 msgstr ""
 "논리 WAL 송신 프로세스가 기다릴 스트리밍 복제 대기 서버 복제 슬롯 이름 목록"
 
-#: utils/misc/guc_tables.c:4704
+#: utils/misc/guc_tables.c:4944
 msgid ""
 "Logical WAL sender processes will send decoded changes to output plugins "
 "only after the specified replication slots have confirmed receiving WAL."
 msgstr ""
-"논리 WAL 송신 프로세스는 지정된 복제 슬롯이 WAL 수신을 확인한 후에만 "
-"디코딩된 변경 사항을 출력 플러그인으로 전송합니다."
+"논리 WAL 송신 프로세스는 지정된 복제 슬롯이 WAL 수신을 확인한 후에만 디코딩"
+"된 변경 사항을 출력 플러그인으로 전송합니다."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4956
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr "지정된 종류의 non-system 릴레이션에 대한 접근을 금지합니다."
 
-#: utils/misc/guc_tables.c:4736
+#: utils/misc/guc_tables.c:4967
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr "OAuth v2 bearer 토큰 유효성 검사 때 사용하는 라이브러리 목록"
+
+#: utils/misc/guc_tables.c:4978
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr "연결 작업 때 일어나는 일들을 로그로 남김"
+
+#: utils/misc/guc_tables.c:4999
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "문자열에서 \"\\'\" 문자 사용을 허용할 것인지를 정하세요"
 
-#: utils/misc/guc_tables.c:4746
+#: utils/misc/guc_tables.c:5009
 msgid "Sets the output format for bytea."
 msgstr "bytea 값의 표시 형식을 설정합니다."
 
-#: utils/misc/guc_tables.c:4756
+#: utils/misc/guc_tables.c:5019
 msgid "Sets the message levels that are sent to the client."
 msgstr "클라이언트 측에 보여질 메시지 수준을 지정함."
 
-#: utils/misc/guc_tables.c:4757 utils/misc/guc_tables.c:4853
-#: utils/misc/guc_tables.c:4864
+#: utils/misc/guc_tables.c:5020 utils/misc/guc_tables.c:5116
+#: utils/misc/guc_tables.c:5127
 msgid ""
 "Each level includes all the levels that follow it. The later the level, the "
 "fewer messages are sent."
@@ -32887,114 +34592,118 @@ msgstr ""
 "각 수준은 이 수준 뒤에 있는 모든 수준이 포함됩니다. 수준이 뒤에 있을수록 전송"
 "되는 메시지 수가 적습니다."
 
-#: utils/misc/guc_tables.c:4767
+#: utils/misc/guc_tables.c:5030
 msgid "Enables in-core computation of query identifiers."
 msgstr "query_id를 내부적으로 사용함"
 
-#: utils/misc/guc_tables.c:4777
+#: utils/misc/guc_tables.c:5040
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "실행계획기가 쿼리 최적화 작업에서 제약 조건을 사용하도록 함"
 
-#: utils/misc/guc_tables.c:4778
+#: utils/misc/guc_tables.c:5041
 msgid ""
 "Table scans will be skipped if their constraints guarantee that no rows "
 "match the query."
 msgstr ""
 "제약 조건에 의해 쿼리와 일치하는 행이 없는 경우 테이블 스캔을 건너뜁니다."
 
-#: utils/misc/guc_tables.c:4789
+#: utils/misc/guc_tables.c:5052
 msgid "Sets the default compression method for compressible values."
 msgstr "압축 가능한 값을 압축하기 위한 기본 압축 방법을 지정합니다."
 
-#: utils/misc/guc_tables.c:4800
+#: utils/misc/guc_tables.c:5063
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "각 새 트랜잭션의 트랜잭션 격리 수준을 설정합니다."
 
-#: utils/misc/guc_tables.c:4810
+#: utils/misc/guc_tables.c:5073
 msgid "Sets the current transaction's isolation level."
 msgstr "현재 트랜잭션 독립성 수준(isolation level)을 지정함."
 
-#: utils/misc/guc_tables.c:4821
+#: utils/misc/guc_tables.c:5084
 msgid "Sets the display format for interval values."
 msgstr "간격 값의 표시 형식을 설정합니다."
 
-#: utils/misc/guc_tables.c:4832
+#: utils/misc/guc_tables.c:5095
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "잘못된 ICU 로케일 설정을 보고할 로그 수준"
 
-#: utils/misc/guc_tables.c:4842
+#: utils/misc/guc_tables.c:5105
 msgid "Sets the verbosity of logged messages."
 msgstr "기록되는 메시지의 상세 정도를 지정합니다."
 
-#: utils/misc/guc_tables.c:4852
+#: utils/misc/guc_tables.c:5115
 msgid "Sets the message levels that are logged."
 msgstr "서버 로그에 기록될 메시지 수준을 지정함."
 
-#: utils/misc/guc_tables.c:4863
+#: utils/misc/guc_tables.c:5126
 msgid ""
 "Causes all statements generating error at or above this level to be logged."
 msgstr ""
 "오류가 있는 모든 쿼리문이나 지정한 로그 레벨 이상의 쿼리문을 로그로 남김"
 
-#: utils/misc/guc_tables.c:4874
+#: utils/misc/guc_tables.c:5137
 msgid "Sets the type of statements logged."
 msgstr "서버로그에 기록될 구문 종류를 지정합니다."
 
-#: utils/misc/guc_tables.c:4884
+#: utils/misc/guc_tables.c:5147
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "syslog 기능을 사용할 때, 사용할 syslog \"facility\" 값을 지정."
 
-#: utils/misc/guc_tables.c:4895
+#: utils/misc/guc_tables.c:5158
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "트리거 및 다시 쓰기 규칙에 대한 세션의 동작을 설정합니다."
 
-#: utils/misc/guc_tables.c:4905
+#: utils/misc/guc_tables.c:5168
 msgid "Sets the current transaction's synchronization level."
 msgstr "현재 트랜잭션 격리 수준(isolation level)을 지정함."
 
-#: utils/misc/guc_tables.c:4915
+#: utils/misc/guc_tables.c:5178
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "\"archive_command\"를 사용하여 WAL 파일을 따로 보관하도록 설정합니다."
 
-#: utils/misc/guc_tables.c:4925
+#: utils/misc/guc_tables.c:5188
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "복구 타켓에 도달했을 때 수행할 액션을 지정합니다."
 
-#: utils/misc/guc_tables.c:4935
+#: utils/misc/guc_tables.c:5198
 msgid "Collects function-level statistics on database activity."
 msgstr "데이터베이스 활동에 대한 함수 수준 통계를 수집합니다."
 
-#: utils/misc/guc_tables.c:4946
+#: utils/misc/guc_tables.c:5209
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "통계 자료 접근의 동시성을 지정합니다."
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:5219
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "WAL 파일에 페이지 전체를 기록할 때 사용할 압축 방법"
 
-#: utils/misc/guc_tables.c:4966
+#: utils/misc/guc_tables.c:5229
 msgid "Sets the level of information written to the WAL."
 msgstr "WAL에 저장할 내용 수준을 지정합니다."
 
-#: utils/misc/guc_tables.c:4976
+#: utils/misc/guc_tables.c:5239
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "사용할 동적 공유 메모리 관리방식을 선택합니다."
 
-#: utils/misc/guc_tables.c:4986
+#: utils/misc/guc_tables.c:5249
 msgid ""
 "Selects the shared memory implementation used for the main shared memory "
 "region."
 msgstr "사용할 동적 공유 메모리 관리방식을 선택합니다."
 
-#: utils/misc/guc_tables.c:4996
+#: utils/misc/guc_tables.c:5259
+msgid "Selects the file copy method."
+msgstr "파일 복사 방법을 선택"
+
+#: utils/misc/guc_tables.c:5269
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "디스크에 대한 강제 WAL 업데이트에 사용되는 방법을 선택합니다."
 
-#: utils/misc/guc_tables.c:5006
+#: utils/misc/guc_tables.c:5279
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "XML에서 바이너리 값이 인코딩되는 방식을 설정합니다."
 
-#: utils/misc/guc_tables.c:5016
+#: utils/misc/guc_tables.c:5289
 msgid ""
 "Sets whether XML data in implicit parsing and serialization operations is to "
 "be considered as documents or content fragments."
@@ -33002,84 +34711,86 @@ msgstr ""
 "암시적 구문 분석 및 직렬화 작업의 XML 데이터를 문서 또는 내용 조각으로 간주할"
 "지 여부를 설정합니다."
 
-#: utils/misc/guc_tables.c:5027
+#: utils/misc/guc_tables.c:5300
 msgid "Use of huge pages on Linux or Windows."
 msgstr "리눅스 또는 Windows huge 페이지 사용 여부"
 
-#: utils/misc/guc_tables.c:5037
+#: utils/misc/guc_tables.c:5310
 msgid "Indicates the status of huge pages."
 msgstr "huge page 상태를 보고할지 지정"
 
-#: utils/misc/guc_tables.c:5048
+#: utils/misc/guc_tables.c:5321
 msgid "Prefetch referenced blocks during recovery."
 msgstr "복구 작업 중에 참조하는 블록을 미리 준비하는 방법."
 
-#: utils/misc/guc_tables.c:5049
+#: utils/misc/guc_tables.c:5322
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "따라잡지 못한 데이터를 WAL에서 미리 준비함"
 
-#: utils/misc/guc_tables.c:5058
+#: utils/misc/guc_tables.c:5331
 msgid "Forces the planner's use parallel query nodes."
 msgstr "병렬 쿼리를 강제로 사용하도록 지정합니다."
 
-#: utils/misc/guc_tables.c:5059
+#: utils/misc/guc_tables.c:5332
 msgid ""
 "This can be useful for testing the parallel query infrastructure by forcing "
 "the planner to generate plans that contain nodes that perform tuple "
 "communication between workers and the main process."
 msgstr ""
-"이것은 실행계획기가 작업자와 메인 프로세스 간에 튜플 통신을 수행하는 "
-"노드가 포함된 플랜을 생성하도록 강제하여 병렬 쿼리 환경을 테스트하는 "
-"데 유용할 수 있습니다."
+"이것은 실행계획기가 작업자와 메인 프로세스 간에 튜플 통신을 수행하는 노드가 "
+"포함된 플랜을 생성하도록 강제하여 병렬 쿼리 환경을 테스트하는 데 유용할 수 있"
+"습니다."
 
-#: utils/misc/guc_tables.c:5071
+#: utils/misc/guc_tables.c:5344
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "비밀번호 암호화 알고리즘 선택"
 
-#: utils/misc/guc_tables.c:5081
+#: utils/misc/guc_tables.c:5354
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "실행계획기가 사용자 정의 계획이나, 일반적 계획을 선택하는 것을 조정함"
 
-#: utils/misc/guc_tables.c:5082
+#: utils/misc/guc_tables.c:5355
 msgid ""
 "Prepared statements can have custom and generic plans, and the planner will "
 "attempt to choose which is better.  This can be set to override the default "
 "behavior."
 msgstr ""
-"미리 준비된 구문에는 사용자 정의 및 일반 계획이 있을 수 있으며, "
-"실행계획기는 어느 것이 더 나은지 선택하려고 시도합니다. "
-"이 설정은 기본 동작을 재정의하도록 설정할 수 있습니다."
+"미리 준비된 구문에는 사용자 정의 및 일반 계획이 있을 수 있으며, 실행계획기는 "
+"어느 것이 더 나은지 선택하려고 시도합니다. 이 설정은 기본 동작을 재정의하도"
+"록 설정할 수 있습니다."
 
-#: utils/misc/guc_tables.c:5094
+#: utils/misc/guc_tables.c:5367
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "사용할 최소 SSL/TLS 프로토콜 버전을 지정합니다."
 
-#: utils/misc/guc_tables.c:5106
+#: utils/misc/guc_tables.c:5379
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "사용할 최대 SSL/TLS 프로토콜 버전을 지정합니다."
 
-#: utils/misc/guc_tables.c:5118
+#: utils/misc/guc_tables.c:5391
 msgid ""
 "Sets the method for synchronizing the data directory before crash recovery."
-msgstr ""
-"충돌 복구 전에 데이터 디렉토리를 동기화하는 방법을 설정합니다."
+msgstr "충돌 복구 전에 데이터 디렉토리를 동기화하는 방법을 설정합니다."
 
-#: utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5400
 msgid ""
 "Forces immediate streaming or serialization of changes in large transactions."
-msgstr ""
-"대량 트랜잭션에서 변경 사항을 강제로 즉시 스트리밍하거나 직렬화합니다."
+msgstr "대량 트랜잭션에서 변경 사항을 강제로 즉시 스트리밍하거나 직렬화합니다."
 
-#: utils/misc/guc_tables.c:5128
+#: utils/misc/guc_tables.c:5401
 msgid ""
 "On the publisher, it allows streaming or serializing each change in logical "
 "decoding. On the subscriber, it allows serialization of all changes to files "
 "and notifies the parallel apply workers to read and apply them at the end of "
 "the transaction."
 msgstr ""
-"발행 서버에서 논리 디코딩의 각 변경 사항을 스트리밍하거나 직렬화할 수 있습니다. "
-"구독 서버에서 파일에 대한 모든 변경 사항을 직렬화할 수 있으며, "
-"병렬 반영 작업자에게 트랜잭션이 끝날 때 읽고 적용하도록 알립니다."
+"발행 서버에서 논리 디코딩의 각 변경 사항을 스트리밍하거나 직렬화할 수 있습니"
+"다. 구독 서버에서 파일에 대한 모든 변경 사항을 직렬화할 수 있으며, 병렬 반영 "
+"작업자에게 트랜잭션이 끝날 때 읽고 적용하도록 알립니다."
+
+#: utils/misc/guc_tables.c:5413
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "비동기 I/O 작업 실행을 위한 방법을 선택합니다."
 
 #: utils/misc/help_config.c:129
 #, c-format
@@ -33111,6 +34822,32 @@ msgstr ""
 "테이블 소유주를 위해 정책을 비활성하려면, ALTER TABLE NO FORCE ROW LEVEL "
 "SECURITY 명령을 사용하세요"
 
+#: utils/misc/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "스택 깊이를 초과했습니다"
+
+#: utils/misc/stack_depth.c:102
+#, c-format
+msgid ""
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
+msgstr ""
+"먼저 OS에서 지원하는 스택 depth 최대값을 확인한 뒤, 허용범위 안에서 "
+"\"max_stack_depth\" (현재값: %dkB) 매개 변수 값의 설정치를 증가시키세요."
+
+#: utils/misc/stack_depth.c:149
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "\"max_stack_depth\" 값은 %zdkB를 초과할 수 없습니다"
+
+#: utils/misc/stack_depth.c:151
+#, c-format
+msgid ""
+"Increase the platform's stack depth limit via \"ulimit -s\" or local "
+"equivalent."
+msgstr "OS의 \"ulimit -s\" 명령과 같은 것으로 스택 깊이를 늘려주십시오."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -33132,62 +34869,62 @@ msgstr ""
 "%d 타임 존 오프셋 값이 범위를 벗어났습니다(\"%s\" 타임 존 파일의 %d번째 줄에 "
 "있음)."
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr "\"%s\" time zone 파일의 %d번째 줄에 time zone 생략형이 빠졌음"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr "\"%s\" time zone 파일의 %d번째 줄에 time zone 옵셋이 빠졌음"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr ""
 "\"%s\" 표준 시간대 파일의 %d번째 줄에서 표준 시간대 오프셋 숫자가 잘못됨"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "\"%s\" time zone 파일의 %d번째 줄에 구문 오류"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "표준 시간대 약어 \"%s\"은(는) 배수로 정의됨"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid ""
-"Entry in time zone file \"%s\", line %d, conflicts with entry in file "
-"\"%s\", line %d."
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
 msgstr ""
 "\"%s\" 타임 존 파일의 %d번째 줄에 있는 항목이 \"%s\" 파일의 %d번째 줄에 있는 "
 "항목과 충돌합니다."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "잘못된 time zone 파일 이름: \"%s\""
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "\"%s\" 파일에서 time zone 파일 재귀호출 최대치를 초과했음"
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "\"%s\" time zone 파일을 읽을 수 없음: %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "\"%s\" 표준 시간대 파일의 %d번째 줄이 너무 깁니다."
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "\"%s\" 표준 시간대 파일의 %d번째 줄에 파일 이름이 없는 @INCLUDE가 있음"
@@ -33203,12 +34940,12 @@ msgstr "\"%s\" 메모리 컨텍스트를 만드는 동안 오류가 발생했습
 msgid "could not attach to dynamic shared area"
 msgstr "동적 공유 메모리 영역을 할당할 수 없음"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1160
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "크기가 %zu인 요청에서 오류가 발생했습니다. 해당 메모리 컨텍스트 \"%s\""
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1304
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "%d번 PID의 메모리 현황을 로깅함"
@@ -33248,13 +34985,12 @@ msgstr "WITH HOLD 옵션으로 커서를 만든 트랜잭션을 PREPARE할 수 
 msgid ""
 "cannot perform transaction commands inside a cursor loop that is not read-"
 "only"
-msgstr ""
-"읽기 전용이 아닌 커서 루프 내에서 트랜잭션 명령을 수행할 수 없습니다"
+msgstr "읽기 전용이 아닌 커서 루프 내에서 트랜잭션 명령을 수행할 수 없습니다"
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
 #, c-format
-msgid "could not seek to block %lld of temporary file"
-msgstr "임시 파일의 %lld 블럭을 찾을 수 없음"
+msgid "could not seek to block %<PRId64> of temporary file"
+msgstr "임시 파일의 %<PRId64> 블럭을 찾을 수 없음"
 
 #: utils/sort/sharedtuplestore.c:466
 #, c-format
@@ -33266,61 +35002,61 @@ msgstr "공유된 tuplestore 임시 파일에서 예상치 못한 청크"
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "공유 tuplestore 임시 파일에서 %u 블록을 찾을 수 없음"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "외부 정렬을 위해 %d 개 이상의 런을 만들 수 없음"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1671
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "\"%s\" 고유 인덱스를 만들 수 없음"
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1673
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "%s 키가 중복됨"
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1674
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "중복된 키가 있음"
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1308 utils/sort/tuplestore.c:1373
+#: utils/sort/tuplestore.c:1382
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "tuplestore 임시 파일에서 seek 작업을 할 수 없음"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "소스 트랜잭션이 더 이상 실행중이지 않음"
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "서브트랜잭션에서 스냅샷을 내보낼 수 없음"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "\"%s\" 파일에 유효하지 않은 스냅샷 자료가 있습니다"
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "쿼리보다 먼저 SET TRANSACTION SNAPSHOP 명령을 호출해야 함"
 
-#: utils/time/snapmgr.c:1402
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid ""
 "a snapshot-importing transaction must have isolation level SERIALIZABLE or "
@@ -33329,17 +35065,17 @@ msgstr ""
 "스냅샷 가져오기 트랜잭션은 그 격리 수준이 SERIALIZABLE 또는 REPEATABLE READ "
 "여야 함"
 
-#: utils/time/snapmgr.c:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "잘못된 스냅샷 식별자: \"%s\""
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "\"%s\" 이름의 스냅샷이 없음"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid ""
 "a serializable transaction cannot import a snapshot from a non-serializable "
@@ -33348,7 +35084,7 @@ msgstr ""
 "직렬화 가능한 트랜잭션은 직렬화 가능하지 않은 트랜잭션에서 스냅샷을 가져올 "
 "수 없음"
 
-#: utils/time/snapmgr.c:1528
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid ""
 "a non-read-only serializable transaction cannot import a snapshot from a "
@@ -33356,22 +35092,22 @@ msgid ""
 msgstr ""
 "읽기-쓰기 직렬화된 트랜잭션이 읽기 전용 트랜잭션의 스냅샷을 가져올 수 없음"
 
-#: utils/time/snapmgr.c:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "서로 다른 데이터베이스를 대상으로는 스냅샷을 가져올 수 없음"
 
-#: gram.y:1231
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD 옵션은 더이상 지원하지 않음"
 
-#: gram.y:1232
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "비밀번호를 암호화된 형태로 저장하려면 UNENCRYPTED를 빼세요."
 
-#: gram.y:1559 gram.y:1575
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr ""
@@ -33382,413 +35118,421 @@ msgstr ""
 msgid "current database cannot be changed"
 msgstr "현재 데이터베이스를 바꿀 수 없음"
 
-#: gram.y:1860
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr ""
 "지역시간대 간격(time zone interval) 값은 시(HOUR) 또는 시분(HOUR TO MINUTE) "
 "값이어야 합니다"
 
-#: gram.y:2487
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "칼럼 번호는 1 - %d 사이의 범위에 있어야 합니다."
 
-#: gram.y:3083
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "제약조건들은 NOT VALID 로 변경할 수 없음"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "\"%s\" 시퀀스 옵션은 지원되지 않음"
 
-#: gram.y:3122
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "해시 파티션용 모듈을 한 번 이상 지정했습니다"
 
-#: gram.y:3131
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "해시 파티션용 나머지 처리기를 한 번 이상 지정했습니다"
 
-#: gram.y:3138
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "잘못된 해시 파티션 범위 명세 \"%s\""
 
-#: gram.y:3146
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "해시 파티션용 모듈을 지정하세요"
 
-#: gram.y:3150
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "해시 파티션용 나머지 처리기를 지정하세요"
 
-#: gram.y:3358 gram.y:3392
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "PROGRAM 옵션과 STDIN/STDOUT 옵션은 함께 쓸 수 없습니다"
 
-#: gram.y:3364
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "WHERE 절은 COPY TO 구문을 허용하지 않음"
 
-#: gram.y:3712 gram.y:3719 gram.y:13023 gram.y:13031
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL 예약어는 임시 테이블 만들기에서 더 이상 사용하지 않습니다"
 
-#: gram.y:3995
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "계산된 칼럼을 사용하려면, GENERATED ALWAYS 옵션이 있어야 함"
 
-#: gram.y:4432
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "%s의 칼럼 목록은 ON DELETE 액션용으로만 지원합니다."
 
-#: gram.y:5151
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM 구문은 지원하지 않습니다."
 
-#: gram.y:5849
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "인식할 수 없는 로우 단위 보안 옵션 \"%s\""
 
-#: gram.y:5850
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "PERMISSIVE 또는 RESTRICTIVE 정책만 현재 지원합니다."
 
-#: gram.y:5935
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER 구문은 지원하지 않습니다."
 
-#: gram.y:5972
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "중복 트리거 이벤트가 지정됨"
 
-#: gram.y:6121
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "제약조건 속성이 충돌함"
 
-#: gram.y:6220
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION 명령은 아직 구현 되지 않았습니다"
 
-#: gram.y:6537
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "구현되지 않은 enum 값을 삭제 중"
 
-#: gram.y:6655
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK는 더 이상 필요하지 않음"
-
-#: gram.y:6656
-#, c-format
-msgid "Update your data type."
-msgstr "자료형을 업데이트하십시오."
-
-#: gram.y:8529
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "집계 함수는 output 인자를 지정할 수 없음"
 
-#: gram.y:11221 gram.y:11240
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION 구문은 재귀적인 뷰에서 지원하지 않습니다"
 
-#: gram.y:13162
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "LIMIT #,# 구문은 지원하지 않습니다."
 
-#: gram.y:13163
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "LIMIT # OFFSET # 구문을 사용하세요."
 
-#: gram.y:14038
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "DEFAULT 값은 하나만 허용함"
 
-#: gram.y:14047
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "PATH 값은 칼럼당 하나만 허용함"
 
-#: gram.y:14056
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "NULL/NOT NULL 선언이 서로 충돌합니다 : \"%s\" 칼럼"
 
-#: gram.y:14065
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "인식할 수 없는 칼럼 옵션 \"%s\""
 
-#: gram.y:14147
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "\"%s\" 옵션은 XMLTABLE 안에서 사용할 수 없음"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "JSON_TABLE 경로 명세에서는 문자열 상수만 지원함"
 
-#: gram.y:14469
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "실수형 자료의 정밀도 값으로는 적어도 1 bit 이상을 지정해야 합니다."
 
-#: gram.y:14478
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "실수형 자료의 정밀도 값으로 최대 54 bit 까지입니다."
 
-#: gram.y:14995
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "OVERLAPS 식의 왼쪽에 있는 매개 변수 수가 잘못됨"
 
-#: gram.y:15000
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "OVERLAPS 식의 오른쪽에 있는 매개 변수 수가 잘못됨"
 
-#: gram.y:15177
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE 술어는 아직 구현되지 못했습니다"
 
-#: gram.y:15591
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "WITHIN GROUP 구문 안에서 중복된 ORDER BY 구문은 허용하지 않습니다"
 
-#: gram.y:15596
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT과 WITHIN GROUP을 함께 쓸 수 없습니다"
 
-#: gram.y:15601
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC과 WITHIN GROUP을 함께 쓸 수 없습니다"
 
-#: gram.y:16328 gram.y:16352
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "프레임 시작은 UNBOUNDED FOLLOWING일 수 없음"
 
-#: gram.y:16333
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "따라오는 로우의 프레임 시작은 현재 로우의 끝일 수 없습니다"
 
-#: gram.y:16357
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "프레임 끝은 UNBOUNDED PRECEDING일 수 없음"
 
-#: gram.y:16363
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "현재 로우의 프레임 시작은 선행하는 로우를 가질 수 없습니다"
 
-#: gram.y:16370
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "따라오는 로우의 프레임 시작은 선행하는 로우를 가질 수 없습니다"
 
-#: gram.y:16919
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "알 수 없는 JSON 인코딩: %s"
 
-#: gram.y:17243
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "자료형 한정자는 매개 변수 이름을 사용할 수 없음"
 
-#: gram.y:17249
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "자료형 한정자는 ORDER BY 구문을 사용할 수 없음"
 
-#: gram.y:17317 gram.y:17324 gram.y:17331
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s 이름은 여기서 롤 이름으로 사용할 수 없음"
 
-#: gram.y:17421 gram.y:18906
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES 절은 ORDER BY 절과 함께 사용되어야 함"
 
-#: gram.y:18597 gram.y:18772
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "\"*\" 사용이 잘못됨"
 
-#: gram.y:18836
+#: gram.y:19006
 #, c-format
 msgid ""
 "an ordered-set aggregate with a VARIADIC direct argument must have one "
 "VARIADIC aggregated argument of the same data type"
 msgstr ""
-"VARIADIC 직접 인자가 있는 정렬된 집합 집계 함수는 동일한 자료형의 VARIADIC "
-"집계된 인자가 하나 있어야 합니다."
+"VARIADIC 직접 인자가 있는 정렬된 집합 집계 함수는 동일한 자료형의 VARIADIC 집"
+"계된 인자가 하나 있어야 합니다."
 
-#: gram.y:18873
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "중복된 ORDER BY 구문은 허용하지 않습니다"
 
-#: gram.y:18884
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "중복된 OFFSET 구문은 허용하지 않습니다"
 
-#: gram.y:18893
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "중복된 LIMIT 구문은 허용하지 않습니다"
 
-#: gram.y:18902
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "중복된 limit 옵션은 허용하지 않음"
-
-#: gram.y:18929
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "중복된 WITH 절은 허용하지 않음"
 
-#: gram.y:19122
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "OUT 및 INOUT 인자는 TABLE 함수에 사용할 수 없음"
 
-#: gram.y:19255
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "중복된 COLLATE 구문은 허용하지 않습니다"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19293 gram.y:19306
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "%s 제약조건에는 DEFERRABLE 옵션을 쓸 수 없음"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19319
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "%s 제약조건에는 NOT VALID 옵션을 쓸 수 없음"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19332
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s 제약조건에는 NO INHERIT 옵션을 쓸 수 없음"
 
-#: gram.y:19354
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, c-format
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "%s 제약조건은 NOT ENFORCED 설정을 할 수 없음"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, c-format
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "%s 제약조건은 ENFORCED 설정을 할 수 없음"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "알 수 없는 파티션 규칙 \"%s\""
 
-#: gram.y:19378
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "잘못된 발행 객체 목록"
 
-#: gram.y:19379
+#: gram.y:19590
 #, c-format
 msgid ""
 "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table "
 "or schema name."
 msgstr ""
-"TABLE이나 TABLES IN SCHEMA 중 하나가 독립 테이블이나 스키마 이름 앞에 있어야 합니다."
+"TABLE이나 TABLES IN SCHEMA 중 하나가 독립 테이블이나 스키마 이름 앞에 있어야 "
+"합니다."
 
-#: gram.y:19395
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "잘못된 테이블 이름"
 
-#: gram.y:19416
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "WHERE 절은 스키마용으로 허용하지 않음"
 
-#: gram.y:19423
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "칼럼 명세는 스키마용으로 허용하지 않음"
 
-#: gram.y:19437
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "잘못된 스키마 이름"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "비어있는 환경 설정 파일 이름: \"%s\""
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid ""
 "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr "설정 파일 \"%s\"을 열 수 없습니다: 최대 디렉터리 깊이를 초과했음"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "\"%s\" 안에 환경 설정파일이 서로 참조함"
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "\"%s\" 설정 파일 을 열수 없습니다: %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "\"%s\" 환경 설정파일이 없으나 건너뜀"
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
 msgstr "\"%s\" 파일 %u 줄 끝부분에서 구문 오류 있음"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "\"%s\" 파일 %u 줄에서 구문 오류 있음, \"%s\" 토큰 부근"
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr "구문 오류가 너무 많습니다. \"%s\" 파일을 무시합니다"
 
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
 msgstr ".decimal() 함수는 precision[,scale] 만 선택적으로 쓸 수 있음."
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "LIKE_REGEX 구문에서 알 수 없는 플래그 문자: \"%.*s\""
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:679
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "XQuery \"x\" 플래그 (확장된 정규 표현식)는 구현되지 않았습니다."
@@ -33805,99 +35549,99 @@ msgstr "잘못된 16진수 문자 순차연결"
 msgid "unexpected end after backslash"
 msgstr "백슬래시 뒤 예기치 않은 줄 끝"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:756
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "마무리 안된 따옴표 안의 문자열"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "주석 뒤 예기치 않은 줄 끝"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "잘못된 숫자 문자열"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1064
-#: scan.l:1068 scan.l:1072 scan.l:1076
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "숫자 뒤에 쓸모 없는 값이 더 있음"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s, jsonpath 입력 끝부분"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s, jsonpath 입력 \"%s\" 부근"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "잘못된 입력"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "잘못된 16진수"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "유니코드를 서버 인코딩으로 바꿀 수 없음"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "잘못된 타임라인: %u"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "잘못된 스트리밍 시작 위치"
 
 # # advance 끝
-#: scan.l:497
+#: scan.l:483
 msgid "unterminated /* comment"
 msgstr "마무리 안된 /* 주석"
 
-#: scan.l:517
+#: scan.l:503
 msgid "unterminated bit string literal"
 msgstr "마무리 안된 비트 문자열 문자"
 
-#: scan.l:531
+#: scan.l:517
 msgid "unterminated hexadecimal string literal"
 msgstr "마무리 안된 16진수 문자열 문자"
 
-#: scan.l:581
+#: scan.l:567
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "유니코드 이스케이프와 함께 문자열 상수를 사용하는 것은 안전하지 않음"
 
-#: scan.l:582
+#: scan.l:568
 #, c-format
 msgid ""
 "String constants with Unicode escapes cannot be used when "
 "\"standard_conforming_strings\" is off."
 msgstr ""
-"\"standard_conforming_strings\" = off 인 경우 문자열 상수 표기에서 유니코드 이스"
-"케이프를 사용할 수 없습니다."
+"\"standard_conforming_strings\" = off 인 경우 문자열 상수 표기에서 유니코드 "
+"이스케이프를 사용할 수 없습니다."
 
-#: scan.l:643
+#: scan.l:629
 msgid "unhandled previous state in xqs"
 msgstr "xqs 안에 처리할 수 없는 이전 상태"
 
-#: scan.l:717
+#: scan.l:703
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "유니코드 이스케이프는 \\uXXXX 또는 \\UXXXXXXXX 형태여야 합니다."
 
-#: scan.l:728
+#: scan.l:714
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "문자열 안에 \\' 사용이 안전하지 않습니다"
 
-#: scan.l:729
+#: scan.l:715
 #, c-format
 msgid ""
 "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
@@ -33905,92 +35649,399 @@ msgstr ""
 "작은 따옴표는 '' 형태로 사용하십시오. \\' 표기법은 클라이언트 전용 인코딩에"
 "서 안전하지 않습니다."
 
-#: scan.l:801
+#: scan.l:787
 msgid "unterminated dollar-quoted string"
 msgstr "마무리 안된 달러-따옴표 안의 문자열"
 
-#: scan.l:818 scan.l:828
+#: scan.l:804 scan.l:814
 msgid "zero-length delimited identifier"
 msgstr "길이가 0인 구분 식별자"
 
-#: scan.l:839 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "마무리 안된 따옴표 안의 식별자"
 
 # # nonun 부분 begin
-#: scan.l:1002
+#: scan.l:988
 msgid "operator too long"
 msgstr "연산자가 너무 깁니다."
 
-#: scan.l:1015
+#: scan.l:1001
+msgid "parameter number too large"
+msgstr "매개 변수값 숫자가 너무 큼"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "매개 변수 뒤에 쓸모 없는 값이 더 있음"
 
-#: scan.l:1036
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "잘못된 16진수"
 
-#: scan.l:1040
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "잘못된 8진수"
 
-#: scan.l:1044
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "잘못된 바이너리 숫자"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1239
+#: scan.l:1231
 #, c-format
 msgid "%s at end of input"
 msgstr "%s, 입력 끝부분"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1247
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s, \"%s\" 부근"
 
-#: scan.l:1439
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "문자열 안에 있는 \\' 문자는 표준이 아닙니다"
 
-#: scan.l:1440
+#: scan.l:1432
 #, c-format
 msgid ""
 "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr "작은 따옴표는 '' 형태니, 인용부호 표기법(E'...') 형태로 사용하십시오."
 
-#: scan.l:1449
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "문자열 안에 있는 \\\\ 문자는 표준이 아닙니다"
 
-#: scan.l:1450
+#: scan.l:1442
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "백슬래시 표기는 인용부호 표기법으로 사용하세요, 예, E'\\\\'."
 
-#: scan.l:1464
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "문자열 안에 비표준 escape 문자를 사용하고 있습니다"
 
-#: scan.l:1465
+#: scan.l:1457
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "인용부호 표기법을 사용하세요, 예, E'\\r\\n'."
 
-#, c-format
+#~ msgid "\"%s\" must be set to -1 during binary upgrade mode."
+#~ msgstr "바이너리 업그레이드 모드 중는 \"%s\" 값은 -1이어야 합니다."
+
+#~ msgid "\"RN\" not supported for input"
+#~ msgstr "\"RN\"  입력 양식은 지원되지 않습니다."
+
+#~ msgid "\"debug_io_direct\" is not supported on this platform."
+#~ msgstr "\"debug_io_direct\" 설정은 이 플랫폼에서 지원되지 않음"
+
+#~ msgid ""
+#~ "\"effective_io_concurrency\" must be set to 0 on platforms that lack "
+#~ "posix_fadvise()."
+#~ msgstr ""
+#~ "posix_fadvise() 함수에 문제가 있는 플랫폼에서는 \"effective_io_concurrency"
+#~ "\" 설정값이 0 이어야 합니다."
+
+#~ msgid ""
+#~ "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack "
+#~ "posix_fadvise()."
+#~ msgstr ""
+#~ "posix_fadvise() 함수에 문제가 있는 플랫폼에서는 "
+#~ "\"maintenance_io_concurrency\" 설정값이 0 이어야 합니다."
+
+#~ msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
+#~ msgstr ""
+#~ "\"max_wal_size\" 값은 \"wal_segment_size\" 값의 최소 2배 이상이어야 함"
+
+#~ msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
+#~ msgstr ""
+#~ "\"min_wal_size\" 값은 \"wal_segment_size\" 값의 최소 2배 이상이어야 함"
+
+#~ msgid "\"synchronous_standby_names\" parser failed"
+#~ msgstr "\"synchronous_standby_names\" 값을 분석할 수 없음"
+
+#~ msgid "%s cannot be executed within a pipeline"
+#~ msgstr "%s 절은 파이프라인에서 실행될 수 없음"
+
+#~ msgid "%s with OID %u does not exist"
+#~ msgstr "%s (해당 OID %u) 없음"
+
+#~ msgid "-1 indicates that the value could not be determined."
+#~ msgstr "-1 은 사용하지 않음을 뜻함"
+
+#~ msgid "0 turns this feature off."
+#~ msgstr "0을 지정하면 이 기능이 해제됩니다."
+
+#~ msgid "A value of 0 turns off the timeout."
+#~ msgstr "이 값이 0이면 이런 제한이 없음."
+
+#~ msgid "Could not open extension control file \"%s\": %m."
+#~ msgstr "\"%s\" 확장 모듈 제어 파일 열기 실패: %m."
+
+#~ msgid "ECDH: could not create key"
+#~ msgstr "ECDH: 키 생성 실패"
+
+#~ msgid "ECDH: unrecognized curve name: %s"
+#~ msgstr "ECDH: 알 수 없는 curve 이름: %s"
+
+#~ msgid "EXPLAIN option SERIALIZE requires ANALYZE"
+#~ msgstr "SERIALIZE 옵션은 EXPLAIN ANALYZE에서만 쓸 수 있습니다."
+
+#~ msgid "EXPLAIN option TIMING requires ANALYZE"
+#~ msgstr "TIMING 옵션은 EXPLAIN ANALYZE에서만 쓸 수 있습니다."
+
+#~ msgid "If blank, no prefix is used."
+#~ msgstr "비워 두면 접두사가 사용되지 않습니다."
+
+#~ msgid "LIKE is not supported for creating foreign tables"
+#~ msgstr "외부 테이블을 만들 때는 LIKE 옵션을 쓸 수 없음"
+
+#~ msgid ""
+#~ "Logical decoding could not find consistent point from local slot's LSN %X/"
+#~ "%X."
+#~ msgstr "논리적 디코딩이 로컬 슬롯 %X/%X에서 일관성 위치를 찾지 못함"
+
+#~ msgid "Logs each successful connection."
+#~ msgstr "연결 성공한 정보들 모두를 기록함"
+
+#~ msgid "MaxFragments should be >= 0"
+#~ msgstr "MaxFragments는 0보다 크거나 같아야 함"
+
+#~ msgid "MinWords should be less than MaxWords"
+#~ msgstr "MinWords는 MaxWords보다 작아야 함"
+
+#~ msgid "MinWords should be positive"
+#~ msgstr "MinWords는 양수여야 함"
+
+#~ msgid ""
+#~ "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert "
+#~ "vacuums."
+#~ msgstr "청소를 위한 최소 튜플 삽입 수입니다. -1은 insert는 vacuum에서 제외"
+
+#~ msgid "Please report this to <%s>."
+#~ msgstr "이 내용을 <%s> 주소로 보고하십시오."
+
+#~ msgid "RECHECK is no longer required"
+#~ msgstr "RECHECK는 더 이상 필요하지 않음"
+
+#~ msgid "Resource Usage / Asynchronous Behavior"
+#~ msgstr "자원 사용량 / 비동기 기능"
+
+#~ msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+#~ msgstr ""
+#~ "서버의 경우 FLOAT8PASSBYVAL = %s인데 라이브러리에 %s이(가) 있습니다."
+
+#~ msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+#~ msgstr "서버의 경우 FUNC_MAX_ARGS = %d인데 라이브러리에 %d이(가) 있습니다."
+
+#~ msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+#~ msgstr "서버의 경우 INDEX_MAX_KEYS = %d인데 라이브러리에 %d이(가) 있습니다."
+
+#~ msgid "Sets the curve to use for ECDH."
+#~ msgstr "ECDH에 사용할 curve 설정"
+
+#~ msgid "ShortWord should be >= 0"
+#~ msgstr "ShortWord는 0보다 크거나 같아야 함"
+
+#~ msgid ""
+#~ "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
+#~ "server was compiled with CATALOG_VERSION_NO %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 CATALOG_VERSION_NO %d 버전으로 초기화 되었지"
+#~ "만, 서버는 CATALOG_VERSION_NO %d 버전으로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with INDEX_MAX_KEYS %d, but the "
+#~ "server was compiled with INDEX_MAX_KEYS %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 INDEX_MAX_KEYS %d (으)로 초기화 되었지만, 서버"
+#~ "는 INDEX_MAX_KEYS %d (으)로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with LOBLKSIZE %d, but the server "
+#~ "was compiled with LOBLKSIZE %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 LOBLKSIZE %d(으)로 초기화 되었지만, 서버는 "
+#~ "LOBLKSIZE %d (으)로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with MAXALIGN %d, but the server was "
+#~ "compiled with MAXALIGN %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 MAXALIGN %d (으)로 초기화 되었지만, 서버는 "
+#~ "MAXALIGN %d (으)로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with NAMEDATALEN %d, but the server "
+#~ "was compiled with NAMEDATALEN %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 NAMEDATALEN %d (으)로 초기화 되었지만, 서버는 "
+#~ "NAMEDATALEN %d (으)로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with RELSEG_SIZE %d, but the server "
+#~ "was compiled with RELSEG_SIZE %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 RELSEG_SIZE %d (으)로 초기화 되었지만, 서버는 "
+#~ "RELSEG_SIZE %d (으)로 컴파일 되어있습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but "
+#~ "the server was compiled with TOAST_MAX_CHUNK_SIZE %d."
+#~ msgstr ""
+#~ "데이터베이스 클러스터는 TOAST_MAX_CHUNK_SIZE %d(으)로 초기화되었지만 서버"
+#~ "는 TOAST_MAX_CHUNK_SIZE %d(으)로 컴파일 되었습니다."
+
+#~ msgid ""
+#~ "The database cluster was initialized with XLOG_BLCKSZ %d, but the server "
+#~ "was compiled with XLOG_BLCKSZ %d."
+#~ msgstr ""
+#~ "이 데이터베이스 클러스터는 XLOG_BLCKSZ %d (으)로 초기화 되었지만, 서버는 "
+#~ "XLOG_BLCKSZ %d (으)로 컴파일 되어있습니다."
+
+#~ msgid "This feature is not yet supported on partitioned tables."
+#~ msgstr "이 기능은 파티션 된 테이블 대상으로는 아직 지원하지 않습니다."
+
+#~ msgid "This is used only if \"archive_library\" is not set."
+#~ msgstr "이 설정은 \"archive_library\" 설정이 안되어 있을 때만 작동합니다."
+
+#~ msgid ""
+#~ "This slot has been invalidated because it exceeded the maximum reserved "
+#~ "size."
+#~ msgstr ""
+#~ "최대 예약 크기를 초과해서 이 슬롯은 정상적이지 않은 것으로 바꿨습니다."
+
+#~ msgid ""
+#~ "This slot has been invalidated because it was conflicting with recovery."
+#~ msgstr ""
+#~ "이 슬롯은 복구 작업으로 충돌이 일어나 사용할 수 없는 것으로 처리했습니다."
+
+#~ msgid "Update your data type."
+#~ msgstr "자료형을 업데이트하십시오."
+
+#~ msgid "Zero logs a sample of all queries. -1 turns this feature off."
+#~ msgstr ""
+#~ "0을 지정하면 모든 쿼리를 로깅하고, -1을 지정하면 이 기능이 해제됩니다."
+
+#~ msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#~ msgstr ""
+#~ "0을 지정하면 모든 파일이 기록됩니다. 기본 값은 -1로, 이 기능이 해제됩니다."
+
+#~ msgid "Zero prints all actions. -1 turns autovacuum logging off."
+#~ msgstr ""
+#~ "0을 지정하면 모든 작업을 로깅하고, -1을 지정하면 자동 청소관련 로그를 남기"
+#~ "지 않음"
+
+#~ msgid "Zero prints all queries. -1 turns this feature off."
+#~ msgstr ""
+#~ "0을 지정하면 모든 쿼리를 로깅하고, -1을 지정하면 이 기능이 해제됩니다."
+
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
+#~ msgstr ""
+#~ "\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 boolean형임"
+
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type double "
+#~ "precision"
+#~ msgstr ""
+#~ "\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 double "
+#~ "precision형임"
+
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
+#~ msgstr ""
+#~ "\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 integer형임"
+
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
+#~ msgstr ""
+#~ "\"%s\" 인자(대상 jsonpath 아이템 메서드: .%s())는 바르지 않은 numeric형임"
+
+#~ msgid ""
+#~ "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing "
+#~ "relation \"%s\""
+#~ msgstr ""
+#~ "\"%s\" 파타션된 테이블에 NOT VALID 참조키를 추가할 수 없음 (참조 하는 테이"
+#~ "블: \"%s\")"
+
+#~ msgid "cannot match partition key to an index using access method \"%s\""
+#~ msgstr "\"%s\" 접근 방법을 사용하는 인덱스와 파티션 키가 일치하지 않습니다"
+
+#~ msgid ""
+#~ "cannot remove constraint from only the partitioned table when partitions "
+#~ "exist"
+#~ msgstr "하위 테이블이 있는 경우, 상위 테이블의 제약조건만 지울 수는 없음"
+
+#~ msgid ""
+#~ "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
+#~ "ldapsearchfilter, or ldapurl together with ldapprefix"
+#~ msgstr ""
+#~ "ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
+#~ "ldapsearchfilter, ldapurl 옵션은 ldapprefix 옵션과 함께 사용할 수 없음"
+
+#~ msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
+#~ msgstr "\"%s\" 칼럼(해당 릴레이션: \"%s\")은 미리 계산된 칼럼이 아님"
+
+#~ msgid ""
+#~ "constraint \"%s\" of relation \"%s\" is not a foreign key or check "
+#~ "constraint"
+#~ msgstr ""
+#~ "\"%s\" 제약 조건(해당 테이블: \"%s\")은 참조키도 체크 제약 조건도 아닙니"
+#~ "다."
+
+#~ msgid "conversion from wchar_t to server encoding failed: %m"
+#~ msgstr "wchar_t에서 서버 인코딩으로 변환하지 못함: %m"
+
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "UID %d에 해당하는 로컬 사용자를 찾을 수 없음: %s"
+
+#~ msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+#~ msgstr "\"%s\" 임시 통계 파일 이름을 \"%s\" (으)로 바꿀 수 없습니다: %m"
+
+#~ msgid ""
+#~ "could not synchronize replication slot \"%s\" because remote slot "
+#~ "precedes local slot"
+#~ msgstr ""
+#~ "원격 슬롯이 로컬 슬롯 보다 우선이어서 복제 슬롯(\"%s\")을 동기화 할 수 없"
+#~ "음"
+
+#~ msgid "end-of-copy marker corrupt"
+#~ msgstr "end-of-copy 마크가 잘못되었음"
+
+#~ msgid "index %lld out of valid range, 0..%lld"
+#~ msgstr "%lld 인덱스의 범위를 벗어남, 0..%lld"
+
+#~ msgid "invalid input string for \"Y,YYY\""
+#~ msgstr "\"Y,YYY\"에 대한 입력 문자열이 잘못됨"
+
+#~ msgid "multiple limit options not allowed"
+#~ msgstr "중복된 limit 옵션은 허용하지 않음"
+
+#~ msgid "nondeterministic collations are not supported for LIKE"
+#~ msgstr "LIKE 연산에서 사용할 비결정 정렬규칙(collation)은 지원하지 않음"
+
+#~ msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
+#~ msgstr "클라이언트가 너무 큰 GSSAPI 패킷을 보냈습니다(%zu > %d)"
+
 #~ msgid "removing future two-phase state file of epoch %u for transaction %u"
 #~ msgstr ""
 #~ "epoch %u의 future two-phase 상태정보 파일을 삭제함, 대상 트랜잭션: %u"
 
-#, c-format
 #~ msgid "removing past two-phase state file of epoch %u for transaction %u"
 #~ msgstr "epoch %u의 past two-phase 상태정보 파일을 삭제함, 대상 트랜잭션: %u"
 
-#, c-format
 #~ msgid "removing past two-phase state from memory for transaction %u"
 #~ msgstr ""
 #~ "%u 트랜잭션에서 사용하는 past two-phase 상태정보를 메모리에서 삭제함"
+
+#~ msgid "server process"
+#~ msgstr "서버 프로세스"
+
+#~ msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
+#~ msgstr ""
+#~ "wal_level 값을 \"replica\" 또는 \"logical\"로 지정하고 서버를 실행하십시"
+#~ "오."
diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po
index f8e7152cd84..85393f15e74 100644
--- a/src/backend/po/ru.po
+++ b/src/backend/po/ru.po
@@ -4,14 +4,14 @@
 # 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-2025.
+# SPDX-FileCopyrightText: 2012-2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 # Maxim Yablokov <m.yablokov@postgrespro.ru>, 2021, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: postgres (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2025-02-08 08:50+0200\n"
+"POT-Creation-Date: 2026-02-21 05:19+0200\n"
+"PO-Revision-Date: 2026-02-21 05:29+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -88,34 +88,34 @@ msgid "not recorded"
 msgstr "не записано"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1739 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3960 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1353 access/transam/xlog.c:3477
-#: access/transam/xlog.c:4341 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5113
-#: replication/logical/snapbuild.c:2052 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1353 access/transam/xlog.c:3478
+#: access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257
+#: access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392
+#: access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3970 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2546
+#: replication/slot.c:2587 replication/walsender.c:643
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3482 access/transam/xlog.c:4346
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2057 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3483 access/transam/xlog.c:4374
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2550
+#: replication/slot.c:2591 replication/walsender.c:648
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -126,17 +126,18 @@ msgstr "не удалось прочитать файл \"%s\" (прочитан
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
 #: access/transam/timeline.c:512 access/transam/twophase.c:1365
-#: access/transam/twophase.c:1784 access/transam/xlog.c:3323
-#: access/transam/xlog.c:3517 access/transam/xlog.c:3522
-#: access/transam/xlog.c:3658 access/transam/xlog.c:4311
-#: access/transam/xlog.c:5246 commands/copyfrom.c:1799 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5165
-#: replication/logical/snapbuild.c:1819 replication/logical/snapbuild.c:1943
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/twophase.c:1783 access/transam/xlog.c:3324
+#: access/transam/xlog.c:3518 access/transam/xlog.c:3523
+#: access/transam/xlog.c:3659 access/transam/xlog.c:4339
+#: access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828
+#: storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -161,105 +162,107 @@ msgstr ""
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1309 access/transam/xlog.c:3230
-#: access/transam/xlog.c:3393 access/transam/xlog.c:3432
-#: access/transam/xlog.c:3625 access/transam/xlog.c:4331
-#: access/transam/xlogrecovery.c:4264 access/transam/xlogrecovery.c:4367
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3766
-#: replication/logical/reorderbuffer.c:4320
-#: replication/logical/reorderbuffer.c:5093
-#: replication/logical/snapbuild.c:1774 replication/logical/snapbuild.c:1884
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2124
-#: utils/init/miscinit.c:1580 utils/init/miscinit.c:1714
-#: utils/init/miscinit.c:1791 utils/misc/guc.c:4777 utils/misc/guc.c:4827
+#: access/transam/twophase.c:1309 access/transam/xlog.c:3214
+#: access/transam/xlog.c:3394 access/transam/xlog.c:3433
+#: access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616
+#: replication/walsender.c:3094 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575
+#: storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1757 access/transam/twophase.c:1766
-#: access/transam/xlog.c:9280 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1756 access/transam/twophase.c:1765
+#: access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4127
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4105
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1778
-#: access/transam/xlog.c:3316 access/transam/xlog.c:3511
-#: access/transam/xlog.c:4304 access/transam/xlog.c:8655
-#: access/transam/xlog.c:8700 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1812
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1331 storage/smgr/md.c:1376
-#: storage/sync/sync.c:446 utils/misc/guc.c:4530
+#: access/transam/timeline.c:506 access/transam/twophase.c:1777
+#: access/transam/xlog.c:3314 access/transam/xlog.c:3512
+#: access/transam/xlog.c:4332 access/transam/xlog.c:8726
+#: access/transam/xlog.c:8770 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820
+#: storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:852 ../common/psprintf.c:143
-#: ../common/scram-common.c:268 ../common/stringinfo.c:314 ../port/path.c:828
-#: ../port/path.c:865 ../port/path.c:882 access/transam/twophase.c:1418
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3560 postmaster/postmaster.c:4021
-#: postmaster/postmaster.c:4383 postmaster/walsummarizer.c:935
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:210 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1465
-#: storage/ipc/procarray.c:2219 storage/ipc/procarray.c:2226
-#: storage/ipc/procarray.c:2731 storage/ipc/procarray.c:3435
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:532
-#: utils/adt/pg_locale.c:696 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4508 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2410 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1418
+#: access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3575
+#: postmaster/walsummarizer.c:938
+#: replication/libpqwalreceiver/libpqwalreceiver.c:364
+#: replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447
+#: storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517
+#: utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:410 utils/mb/mbutils.c:438
+#: utils/mb/mbutils.c:823 utils/mb/mbutils.c:850 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "успех"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "буфер назначения слишком мал"
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "ошибка OpenSSL"
 
@@ -283,34 +286,34 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1723
-#: commands/copyto.c:654 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1589 storage/ipc/latch.c:1751
-#: storage/ipc/latch.c:1877
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783
+#: storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203
+#: storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:830 ../port/path.c:867
-#: ../port/path.c:884 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка памяти\n"
@@ -320,51 +323,51 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3581
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1321
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1321
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1749
-#: commands/copyto.c:700 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:2173
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979
+#: commands/extension.c:3949 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1470
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1496
+#: storage/file/fd.c:2997 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3009
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1831 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:1027
+#: replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -373,92 +376,92 @@ msgstr "не удалось переименовать файл \"%s\" в \"%s\"
 msgid "internal error"
 msgstr "внутренняя ошибка"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr ""
 "Инкрементальный лексический анализатор не подходит для нисходящего "
 "рекурсивного разбора."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr ""
 "Для инкрементального разбора требуется инкрементальный лексический "
 "анализатор."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr ""
 "Слишком большая вложенность JSON, максимальная допустимая глубина: 6400."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Неверная спецпоследовательность: \"\\%.*s\"."
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ с кодом 0x%02x необходимо экранировать."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Ожидался конец текста, но обнаружено продолжение \"%.*s\"."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Ожидался элемент массива или \"]\", но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Ожидалась \",\" или \"]\", но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Ожидалось \":\", но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Ожидалось значение JSON, но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Неожиданный конец входной строки."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Ожидалась строка или \"}\", но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Ожидалась \",\" или \"}\", но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Ожидалась строка, но обнаружено \"%.*s\"."
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Ошибочный элемент \"%.*s\"."
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 нельзя преобразовать в текст."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" должны следовать четыре шестнадцатеричные цифры."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -466,40 +469,44 @@ msgstr ""
 "Спецкоды Unicode для значений выше 007F можно использовать только с "
 "кодировкой UTF8."
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Спецкод Unicode нельзя преобразовать в серверную кодировку %s."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr ""
 "Старшее слово суррогата Unicode не может следовать за другим старшим словом."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Младшее слово суррогата Unicode должно следовать за старшим словом."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "нехватка памяти при составлении описания ошибки"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -594,7 +601,7 @@ msgstr "не удалось декодировать имя файла"
 msgid "file size is not an integer"
 msgstr "размер файла не является целочисленным"
 
-#: ../common/parse_manifest.c:699 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нераспознанный алгоритм расчёта контрольных сумм: \"%s\""
@@ -663,9 +670,9 @@ msgstr "не удалось разобрать манифест копии: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4712 utils/misc/guc.c:6931
-#: utils/misc/guc.c:6972
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "неверное значение для параметра \"%s\": \"%s\""
@@ -727,22 +734,22 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "не удалось получить код выхода от подпроцесса (код ошибки: %lu)"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1717 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4589
-#: replication/logical/snapbuild.c:1712 replication/logical/snapbuild.c:2146
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1716 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 backup/walsummary.c:254
+#: postmaster/postmaster.c:1069 postmaster/syslogger.c:1489
+#: replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "не удалось стереть файл \"%s\": %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3435
+#: storage/file/fd.c:3844
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "ошибка при удалении каталога \"%s\": %m"
@@ -759,20 +766,25 @@ msgstr "не удалось закодировать сохранённый кл
 msgid "could not encode server key"
 msgstr "не удалось закодировать ключ сервера"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "размер строкового буфера превышает предел (%zu Б)"
+
+#: ../common/stringinfo.c:363
 #, c-format
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr ""
 "Не удалось увеличить строковый буфер (в буфере байт: %d, требовалось ещё %d)."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
 msgid ""
-"out of memory\n"
+"string buffer exceeds maximum allowed length (%zu bytes)\n"
 "\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
 msgstr ""
-"нехватка памяти\n"
+"размер строкового буфера превышает предел (%zu Б)\n"
 "\n"
 "Не удалось увеличить строковый буфер (в буфере байт: %d, требовалось ещё "
 "%d).\n"
@@ -782,7 +794,7 @@ msgstr ""
 msgid "could not look up effective user ID %ld: %s"
 msgstr "выяснить эффективный идентификатор пользователя (%ld) не удалось: %s"
 
-#: ../common/username.c:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "пользователь не существует"
 
@@ -821,12 +833,12 @@ msgstr "дочерний процесс завершён по сигналу %d:
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний процесс завершился с нераспознанным кодом состояния %d"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "не удалось определить кодировку для набора символов \"%s\""
 
-#: ../port/chklocale.c:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr ""
@@ -852,25 +864,25 @@ msgstr "не удалось получить связь для каталога
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удалось получить связь для каталога \"%s\": %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "не удалось открыть файл \"%s\": %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "нарушение блокировки"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "нарушение совместного доступа"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "Попытки будут продолжены в течение 30 секунд."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 msgid ""
 "You might have antivirus, backup, or similar software interfering with the "
@@ -879,7 +891,7 @@ msgstr ""
 "Возможно, работе СУБД мешает антивирус, программа резервного копирования или "
 "что-то подобное."
 
-#: ../port/path.c:852
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "не удалось определить текущий рабочий каталог: %m\n"
@@ -889,16 +901,6 @@ msgstr "не удалось определить текущий рабочий 
 msgid "operating system error %d"
 msgstr "ошибка ОС %d"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "найти локального пользователя по идентификатору (%d) не удалось: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локальный пользователь с ID %d не существует"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -916,7 +918,7 @@ msgid "could not check access token membership: error code %lu\n"
 msgstr ""
 "не удалось проверить вхождение в маркере безопасности (код ошибки: %lu)\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid ""
 "request for BRIN range summarization for index \"%s\" page %u was not "
@@ -925,43 +927,45 @@ msgstr ""
 "запрос на расчёт сводки диапазона BRIN для индекса \"%s\" страницы %u не был "
 "записан"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:936
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "идёт процесс восстановления"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "Функции управления BRIN нельзя использовать в процессе восстановления."
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "номер блока вне диапазона: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "номер блока вне диапазона: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "\"%s\" - это не индекс BRIN"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "не удалось открыть родительскую таблицу индекса \"%s\""
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2277
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "индекс \"%s\" - нерабочий"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -972,7 +976,7 @@ msgstr "значение типа %s нельзя ввести"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -989,9 +993,9 @@ msgstr "испорченный индекс BRIN: несогласованнос
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "неожиданный тип страницы 0x%04X в BRIN-индексе \"%s\" (блок: %u)"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains function %s with invalid "
@@ -1000,9 +1004,9 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит функцию %s с "
 "неправильным опорным номером %d"
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains function %s with wrong "
@@ -1011,9 +1015,9 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит функцию %s с "
 "неподходящим объявлением для опорного номера %d"
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains operator %s with invalid "
@@ -1022,9 +1026,9 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит оператор %s с "
 "неправильным номером стратегии %d"
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains invalid ORDER BY "
@@ -1033,9 +1037,9 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит некорректное "
 "определение ORDER BY для оператора %s"
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains operator %s with wrong "
@@ -1044,8 +1048,8 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит оператор %s с "
 "неподходящим объявлением"
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing operator(s) for types "
@@ -1054,7 +1058,7 @@ msgstr ""
 "в семействе операторов \"%s\" метода доступа %s нет оператора(ов) для типов "
 "%s и %s"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function(s) "
@@ -1063,37 +1067,41 @@ msgstr ""
 "в семействе операторов \"%s\" метода доступа %s нет опорных функций для "
 "типов %s и %s"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "в классе операторов \"%s\" метода доступа %s нет оператора(ов)"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid ""
 "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "в классе операторов \"%s\" метода доступа %s нет опорной функции %d"
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Возвращаемый тип %s не соответствует ожидаемому типу %s в столбце %d."
+msgid ""
+"Returned type %s does not match expected type %s in column \"%s\" (position "
+"%d)."
+msgstr ""
+"Возвращаемый тип %s не соответствует ожидаемому типу %s в столбце "
+"\"%s\" (позиция %d)."
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid ""
 "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr ""
 "Число возвращённых столбцов (%d) не соответствует ожидаемому числу (%d)."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "не удалось преобразовать тип строки"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, c-format
 msgid ""
 "Attribute \"%s\" of type %s does not match corresponding attribute of type "
@@ -1101,12 +1109,12 @@ msgid ""
 msgstr ""
 "Атрибут \"%s\" типа %s несовместим с соответствующим атрибутом типа %s."
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "Атрибут \"%s\" типа %s не существует в типе %s."
 
-#: access/common/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "число столбцов (%d) превышает предел (%d)"
@@ -1116,96 +1124,101 @@ msgstr "число столбцов (%d) превышает предел (%d)"
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "число столбцов индекса (%d) превышает предел (%d)"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "строка индекса требует байт: %zu, при максимуме: %zu"
 
-#: access/common/printtup.c:292 commands/explain.c:5376 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1956
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "неподдерживаемый код формата: %d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "Допускаются только значения \"on\", \"off\" и \"auto\"."
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Допускаются только значения \"local\" и \"cascaded\"."
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "превышен предел пользовательских типов реляционных параметров"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "В RESET не должно передаваться значение параметров"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "нераспознанное пространство имён параметров \"%s\""
 
-#: access/common/reloptions.c:1300 commands/variable.c:1214
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "некорректное имя параметра \"%s\": имя не может содержать \"=\""
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "таблицы со свойством WITH OIDS не поддерживаются"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "нераспознанный параметр \"%s\""
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "параметр \"%s\" указан неоднократно"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "неверное значение для логического параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "неверное значение для целочисленного параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "значение %s вне допустимых пределов параметра \"%s\""
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Допускаются значения только от \"%d\" до \"%d\"."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "неверное значение для численного параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Допускаются значения только от \"%f\" до \"%f\"."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "неверное значение для параметра-перечисления \"%s\": %s"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "задать параметры хранения для секционированной таблицы нельзя"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "Задайте параметры хранения для её конечных секций."
@@ -1250,26 +1263,27 @@ msgstr "обращаться к временным индексам других
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "не удалось повторно найти кортеж в индексе \"%s\""
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963
+#: utils/adt/arrayfuncs.c:4034 utils/adt/arrayfuncs.c:6732
+#: utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "не удалось найти функцию сравнения для типа %s"
+
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr ""
 "старые GIN-индексы не поддерживают сканирование всего индекса и поиск NULL"
 
-#: access/gin/ginscan.c:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Для исправления выполните REINDEX INDEX \"%s\"."
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2200
-#: utils/adt/arrayfuncs.c:4016 utils/adt/arrayfuncs.c:6712
-#: utils/adt/rowtypes.c:974
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "не удалось найти функцию сравнения для типа %s"
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains support function %s with "
@@ -1278,7 +1292,7 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит опорную функцию %s с "
 "межтиповой регистрацией"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid ""
 "operator class \"%s\" of access method %s is missing support function %d or "
@@ -1286,18 +1300,18 @@ msgid ""
 msgstr ""
 "в классе операторов \"%s\" метода доступа %s нет опорной функции %d или %d"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "номер опорной функции %d не подходит для метода доступа %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "индекс \"%s\" содержит внутренний кортеж, отмеченный как ошибочный"
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid ""
 "This is caused by an incomplete page split at crash recovery before "
@@ -1306,8 +1320,8 @@ msgstr ""
 "Это вызвано неполным разделением страницы при восстановлении после сбоя в "
 "PostgreSQL до версии 9.1."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1315,7 +1329,7 @@ msgstr ""
 msgid "Please REINDEX it."
 msgstr "Пожалуйста, выполните REINDEX для него."
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "исправление неполного разделения в индексе \"%s\" (блок: %u)"
@@ -1335,19 +1349,19 @@ msgstr ""
 "разработчиками или попробуйте указать этот столбец в команде CREATE INDEX "
 "вторым."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "в индексе \"%s\" неожиданно оказалась нулевая страница в блоке %u"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "индекс \"%s\" содержит испорченную страницу в блоке %u"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains unsupported ORDER BY "
@@ -1356,7 +1370,7 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит неподдерживаемое "
 "определение ORDER BY для оператора %s"
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s contains incorrect ORDER BY "
@@ -1365,21 +1379,22 @@ msgstr ""
 "семейство операторов \"%s\" метода доступа %s содержит некорректное "
 "определение ORDER BY для оператора %s"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:333
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1065
+#: access/hash/hashfunc.c:280 access/hash/hashfunc.c:335
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr ""
 "не удалось определить, какое правило сортировки использовать для хеширования "
 "строк"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:334 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:508
-#: commands/indexcmds.c:2021 commands/tablecmds.c:18178 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1066 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:281 access/hash/hashfunc.c:336 catalog/heap.c:688
+#: catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655
+#: utils/adt/formatting.c:1719 utils/adt/formatting.c:1783
+#: utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1648
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Задайте правило сортировки явно в предложении COLLATE."
@@ -1390,7 +1405,7 @@ msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "размер строки индекса (%zu) больше предельного размера хеша (%zu)"
 
 #: access/hash/hashinsert.c:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "Значения, не умещающиеся в страницу буфера, нельзя проиндексировать."
@@ -1405,7 +1420,7 @@ msgstr "неверный номер блока переполнения: %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "в хеш-индексе \"%s\" не хватает страниц переполнения"
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "хеш-индексы не поддерживают сканирование всего индекса"
@@ -1420,7 +1435,7 @@ msgstr "индекс \"%s\" не является хеш-индексом"
 msgid "index \"%s\" has wrong hash version"
 msgstr "индекс \"%s\" имеет неправильную версию хеша"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s lacks support function for "
@@ -1429,46 +1444,46 @@ msgstr ""
 "в семействе операторов \"%s\" метода доступа %s не хватает опорной функции "
 "для оператора %s"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr ""
 "в семействе операторов \"%s\" метода доступа %s нет межтипового оператора(ов)"
 
-#: access/heap/heapam.c:2206
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "вставлять кортежи в параллельном исполнителе нельзя"
 
-#: access/heap/heapam.c:2725
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "удалять кортежи во время параллельных операций нельзя"
 
-#: access/heap/heapam.c:2772
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "попытка удаления невидимого кортежа"
 
-#: access/heap/heapam.c:3220 access/heap/heapam.c:6501 access/index/genam.c:818
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "изменять кортежи во время параллельных операций нельзя"
 
-#: access/heap/heapam.c:3397
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "попытка изменения невидимого кортежа"
 
-#: access/heap/heapam.c:4908 access/heap/heapam.c:4946
-#: access/heap/heapam.c:5211 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031
+#: access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "не удалось получить блокировку строки в таблице \"%s\""
 
-#: access/heap/heapam.c:6314 commands/trigger.c:3340
-#: executor/nodeModifyTable.c:2376 executor/nodeModifyTable.c:2467
+#: access/heap/heapam.c:6425 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, c-format
 msgid ""
 "tuple to be updated was already modified by an operation triggered by the "
@@ -1477,7 +1492,7 @@ msgstr ""
 "кортеж, который должен быть изменён, уже модифицирован в операции, вызванной "
 "текущей командой"
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid ""
 "tuple to be locked was already moved to another partition due to concurrent "
@@ -1498,14 +1513,14 @@ msgstr "не удалось записать в файл \"%s\" (записан
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3255 access/transam/xlog.c:3446
-#: access/transam/xlog.c:4283 access/transam/xlog.c:9269
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:340 postmaster/postmaster.c:4114
-#: postmaster/walsummarizer.c:1212 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3239 access/transam/xlog.c:3447
+#: access/transam/xlog.c:4311 access/transam/xlog.c:9329
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4092
+#: postmaster/walsummarizer.c:1215 replication/logical/origin.c:626
+#: replication/slot.c:2360 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "не удалось создать файл \"%s\": %m"
@@ -1517,36 +1532,36 @@ msgstr "не удалось обрезать файл \"%s\" до нужного
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3305 access/transam/xlog.c:3502
-#: access/transam/xlog.c:4295 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:351 postmaster/launch_backend.c:363
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1788
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1655
-#: utils/init/miscinit.c:1666 utils/init/miscinit.c:1674 utils/misc/guc.c:4491
-#: utils/misc/guc.c:4522 utils/misc/guc.c:5675 utils/misc/guc.c:5693
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3300 access/transam/xlog.c:3503
+#: access/transam/xlog.c:4323 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2396 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "не удалось записать в файл \"%s\": %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "агрессивная очистка \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "очистка \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "закончена очистка \"%s.%s.%s\": сканирований индекса: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid ""
 "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": "
@@ -1555,7 +1570,7 @@ msgstr ""
 "автоматическая агрессивная очистка, предотвращающая зацикливание, таблицы "
 "\"%s.%s.%s\": сканирований индекса: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid ""
 "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: "
@@ -1564,104 +1579,118 @@ msgstr ""
 "автоматическая очистка, предотвращающая зацикливание, таблицы \"%s.%s.%s\": "
 "сканирований индекса: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr ""
 "автоматическая агрессивная очистка таблицы \"%s.%s.%s\": сканирований "
 "индекса: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr ""
 "автоматическая очистка таблицы \"%s.%s.%s\": сканирований индекса: %d\n"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
+msgid ""
+"pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly "
+"scanned\n"
 msgstr ""
 "страниц удалено: %u, осталось: %u, просканировано: %u (%.2f%% от общего "
-"числа)\n"
+"числа), инициативно просканировано: %u\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
 msgid ""
-"tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
+"tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet "
+"removable\n"
 msgstr ""
-"версий строк: удалено: %lld, осталось: %lld, «мёртвых», но ещё не подлежащих "
-"удалению: %lld\n"
+"версий строк: удалено: %<PRId64>, осталось: %<PRId64>, «мёртвых», но ещё не "
+"подлежащих удалению: %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
 msgid ""
-"tuples missed: %lld dead from %u pages not removed due to cleanup lock "
+"tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock "
 "contention\n"
 msgstr ""
-"из-за конфликта блокировки очистки пропущено версий строк: %lld, на "
+"из-за конфликта блокировки очистки пропущено версий строк: %<PRId64>, на "
 "страницах: %u\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr ""
 "XID отсечки удаления: %u, на момент завершения операции он имел возраст: %d "
 "XID\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr ""
 "новое значение relfrozenxid: %u, оно продвинулось вперёд от предыдущего "
 "значения на %d XID\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr ""
 "новое значение relminmxid: %u, оно продвинулось вперёд от предыдущего "
 "значения на %d MXID\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
+msgid ""
+"frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
 msgstr ""
 "замораживание: на страницах таблицы (%u, %.2f%% от общего числа) заморожено "
-"кортежей: %lld\n"
+"кортежей: %<PRId64>\n"
+
+#: access/heap/vacuumlazy.c:1062
+#, c-format
+msgid ""
+"visibility map: %u pages set all-visible, %u pages set all-frozen (%u were "
+"all-visible)\n"
+msgstr ""
+"карта видимости: новых полностью видимых страниц: %u, новых полностью "
+"замороженных страниц: %u (из них полностью видимыми были: %u)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "сканирование индекса не требуется: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "сканирование индекса требуется: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
 msgid ""
-"%u pages from table (%.2f%% of total) had %lld dead item identifiers "
+"%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers "
 "removed\n"
 msgstr ""
 "на страницах таблицы (%u, %.2f%% от общего числа) удалено мёртвых "
-"идентификаторов элементов: %lld\n"
+"идентификаторов элементов: %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "сканирование индекса пропущено: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "сканирование индекса пропущено из-за защиты: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
+msgid ""
+"%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
 msgstr ""
 "на страницах таблицы (%u, %.2f%% от общего числа) находится мёртвых "
-"идентификаторов элементов: %lld\n"
+"идентификаторов элементов: %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid ""
 "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u "
@@ -1670,43 +1699,60 @@ msgstr ""
 "индекс \"%s\": всего страниц: %u, сейчас удалено: %u, удалено на данный "
 "момент: %u, свободно: %u\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "время задержки: %.3f ms\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "время ввода/вывода: чтение: %.3f мс, запись: %.3f мс\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:797
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr ""
 "средняя скорость чтения: %.3f МБ/с, средняя скорость записи: %.3f МБ/с\n"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:799
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
 msgstr ""
-"использование буфера: попаданий: %lld, промахов: %lld, «грязных» записей: "
-"%lld\n"
+"использование буфера: попаданий: %<PRId64>, промахов: %<PRId64>, «грязных» "
+"записей: %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
+msgid ""
+"WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, "
+"%<PRId64> buffers full\n"
 msgstr ""
-"использование WAL: записей: %lld, полных образов страниц: %lld, байт: %llu\n"
+"использование WAL: записей: %<PRId64>, полных образов страниц: %<PRId64>, "
+"байт: %<PRIu64>, полных буферов: %<PRId64>\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:803
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "нагрузка системы: %s"
 
-#: access/heap/vacuumlazy.c:2170
+#: access/heap/vacuumlazy.c:1432
+#, c-format
+msgid ""
+"disabling eager scanning after freezing %u eagerly scanned blocks of "
+"relation \"%s.%s.%s\""
+msgstr ""
+"отключение инициативного сканирования после замораживания %u инициативно "
+"просканированных блоков отношения \"%s.%s.%s\""
+
+#: access/heap/vacuumlazy.c:2821
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
 msgstr ""
-"таблица \"%s\": удалено мёртвых идентификаторов элементов: %lld, на "
+"таблица \"%s\": удалено мёртвых идентификаторов элементов: %<PRId64>, на "
 "страницах: %u"
 
-#: access/heap/vacuumlazy.c:2324
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid ""
 "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after "
@@ -1715,12 +1761,12 @@ msgstr ""
 "несущественная операция обслуживания таблицы \"%s.%s.%s\" пропускается в "
 "качестве меры защиты после %d сканирований индекса"
 
-#: access/heap/vacuumlazy.c:2327
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "Значение relfrozenxid или relminmxid таблицы слишком далеко в прошлом."
 
-#: access/heap/vacuumlazy.c:2328
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or "
@@ -1733,23 +1779,23 @@ msgstr ""
 "Также можно рассмотреть другие способы обеспечения производительности "
 "VACUUM, соответствующей скорости выделения идентификаторов транзакций."
 
-#: access/heap/vacuumlazy.c:2590
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": остановка усечения из-за конфликтующего запроса блокировки"
 
-#: access/heap/vacuumlazy.c:2660
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "таблица \"%s\": усечение (было страниц: %u, стало: %u)"
 
-#: access/heap/vacuumlazy.c:2722
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr ""
 "таблица \"%s\": приостановка усечения из-за конфликтующего запроса блокировки"
 
-#: access/heap/vacuumlazy.c:2841
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid ""
 "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary "
@@ -1758,47 +1804,47 @@ msgstr ""
 "отключение параллельного режима очистки \"%s\" --- создавать временные "
 "таблицы в параллельном режиме нельзя"
 
-#: access/heap/vacuumlazy.c:3108
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "при сканировании блока %u (смещение %u) отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3111
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "при сканировании блока %u отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3115
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "при сканировании отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3123
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "при очистке блока %u (смещение %u) отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3126
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "при очистке блока %u отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3130
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "при очистке отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3135 commands/vacuumparallel.c:1112
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "при очистке индекса \"%s\" отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1118
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "при уборке индекса \"%s\" отношения \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3146
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "при усечении отношения \"%s.%s\" до %u блок."
@@ -1813,24 +1859,24 @@ msgstr "метод доступа \"%s\" имеет не тип %s"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "для метода доступа индекса \"%s\" не задан обработчик"
 
-#: access/index/genam.c:489
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "транзакция прервана во время сканирования системного каталога"
 
-#: access/index/genam.c:657 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "индекс \"%s\" перестраивается, обращаться к нему нельзя"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2851 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17873 commands/tablecmds.c:19762
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" - это не индекс"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "у класса операторов %s нет параметров"
@@ -1851,7 +1897,7 @@ msgid "This may be because of a non-immutable index expression."
 msgstr "Возможно, это вызвано переменной природой индексного выражения."
 
 #: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2323
+#: parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "индекс \"%s\" не является b-деревом"
@@ -1879,7 +1925,7 @@ msgstr ""
 "Причиной тому могло быть прерывание операции VACUUM в версии 9.3 или старее, "
 "до обновления. Этот индекс нужно перестроить (REINDEX)."
 
-#: access/nbtree/nbtutils.c:5108
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid ""
 "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
@@ -1887,12 +1933,12 @@ msgstr ""
 "размер строки индекса (%zu) больше предельного для btree версии %u размера "
 "(%zu) (индекс \"%s\")"
 
-#: access/nbtree/nbtutils.c:5114
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "Строка индекса ссылается на кортеж (%u,%u) в отношении \"%s\"."
 
-#: access/nbtree/nbtutils.c:5118
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1904,7 +1950,7 @@ msgstr ""
 "Возможно, вам стоит применить индекс функции с MD5-хешем значения или "
 "полнотекстовую индексацию."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function for "
@@ -1914,12 +1960,12 @@ msgstr ""
 "типов %s и %s"
 
 #: access/sequence/sequence.c:75 access/table/table.c:145
-#: optimizer/util/plancat.c:144
+#: optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "открыть отношение \"%s\" нельзя"
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid ""
 "compress method must be defined when leaf type is different from input type"
@@ -1927,19 +1973,19 @@ msgstr ""
 "метод сжатия должен быть определён, когда тип листьев отличается от входного "
 "типа"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "внутренний размер кортежа SP-GiST (%zu) превышает максимум (%zu)"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr ""
 "в листовом кортеже SP-GiST тип данных %s не соответствует объявленному типу "
 "%s"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid ""
 "operator family \"%s\" of access method %s is missing support function %d "
@@ -1948,28 +1994,28 @@ msgstr ""
 "в семействе операторов \"%s\" метода доступа %s нет опорной функции %d для "
 "типа %s"
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "идентификатор кортежа (%u, %u) недопустим для отношения \"%s\""
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "Значение \"%s\" не может быть пустым."
 
 # well-spelled: симв
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4859
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "Длина \"%s\" превышает предел (%d симв.)."
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "табличный метод доступа \"%s\" не существует"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "Табличный метод доступа \"%s\" не существует."
@@ -2001,7 +2047,7 @@ msgstr ""
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Убедитесь, что в конфигурации установлен параметр \"%s\"."
 
-#: access/transam/multixact.c:1091
+#: access/transam/multixact.c:1179
 #, c-format
 msgid ""
 "database is not accepting commands that assign new MultiXactIds to avoid "
@@ -2010,8 +2056,8 @@ msgstr ""
 "база данных не принимает команды, назначающие новые MultiXactId, во "
 "избежание потери данных из-за зацикливания в базе данных \"%s\""
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188
+#: access/transam/multixact.c:1212 access/transam/multixact.c:1221
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
@@ -2023,7 +2069,7 @@ msgstr ""
 "Возможно, вам также придётся зафиксировать или откатить старые "
 "подготовленные транзакции и удалить неиспользуемые слоты репликации."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1186
 #, c-format
 msgid ""
 "database is not accepting commands that assign new MultiXactIds to avoid "
@@ -2032,7 +2078,7 @@ msgstr ""
 "база данных не принимает команды, назначающие новые MultiXactId, во "
 "избежание потери данных из-за зацикливания в базе данных с OID %u"
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural ""
@@ -2047,7 +2093,7 @@ msgstr[2] ""
 "база данных \"%s\" должна быть очищена, прежде чем будут использованы "
 "оставшиеся MultiXactId (%u)"
 
-#: access/transam/multixact.c:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, c-format
 msgid ""
 "database with OID %u must be vacuumed before %u more MultiXactId is used"
@@ -2063,12 +2109,12 @@ msgstr[2] ""
 "база данных с OID %u должна быть очищена, прежде чем будут использованы "
 "оставшиеся MultiXactId (%u)"
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "слишком много членов мультитранзакции"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1281
 #, c-format
 msgid ""
 "This command would create a multixact with %u members, but the remaining "
@@ -2086,7 +2132,7 @@ msgstr[2] ""
 "Мультитранзакция, создаваемая этой командой, должна включать членов: %u, но "
 "оставшегося места хватает только для %u."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1286
 #, c-format
 msgid ""
 "Execute a database-wide VACUUM in database with OID %u with reduced "
@@ -2096,7 +2142,7 @@ msgstr ""
 "Выполните очистку (VACUUM) всей базы данных с OID %u, уменьшив значения "
 "\"vacuum_multixact_freeze_min_age\" и \"vacuum_multixact_freeze_table_age\"."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1317
 #, c-format
 msgid ""
 "database with OID %u must be vacuumed before %d more multixact member is used"
@@ -2113,7 +2159,7 @@ msgstr[2] ""
 "база данных с OID %u должна быть очищена, пока не использованы оставшиеся "
 "члены мультитранзакций (%d)"
 
-#: access/transam/multixact.c:1231
+#: access/transam/multixact.c:1322
 #, c-format
 msgid ""
 "Execute a database-wide VACUUM in that database with reduced "
@@ -2123,17 +2169,22 @@ msgstr ""
 "Выполните очистку (VACUUM) всей этой базы данных, уменьшив значения "
 "\"vacuum_multixact_freeze_min_age\" и \"vacuum_multixact_freeze_table_age\"."
 
-#: access/transam/multixact.c:1371
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u прекратил существование: видимо, произошло зацикливание"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u ещё не был создан: видимо, произошло зацикливание"
 
-#: access/transam/multixact.c:2479 access/transam/multixact.c:2488
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "для мультитранзакции %u получено некорректное следующее смещение"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in "
@@ -2146,7 +2197,7 @@ msgstr ""
 "Возможно, вам также придётся зафиксировать или откатить старые "
 "подготовленные транзакции и удалить неиспользуемые слоты репликации."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2845
 #, c-format
 msgid ""
 "MultiXact member wraparound protections are disabled because oldest "
@@ -2155,12 +2206,12 @@ msgstr ""
 "Защита от зацикливания членов мультитранзакций отключена, так как старейшая "
 "отмеченная мультитранзакция %u не найдена на диске"
 
-#: access/transam/multixact.c:2789
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "Защита от зацикливания мультитранзакций сейчас включена"
 
-#: access/transam/multixact.c:3180
+#: access/transam/multixact.c:3258
 #, c-format
 msgid ""
 "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
@@ -2168,7 +2219,7 @@ msgstr ""
 "старейшая мультитранзакция %u не найдена, новейшая мультитранзакция: %u, "
 "усечение пропускается"
 
-#: access/transam/multixact.c:3198
+#: access/transam/multixact.c:3276
 #, c-format
 msgid ""
 "cannot truncate up to MultiXact %u because it does not exist on disk, "
@@ -2177,41 +2228,50 @@ msgstr ""
 "выполнить усечение до мультитранзакции %u нельзя ввиду её отсутствия на "
 "диске, усечение пропускается"
 
-#: access/transam/multixact.c:3517
+#: access/transam/multixact.c:3293
+#, c-format
+msgid ""
+"cannot truncate up to MultiXact %u because it has invalid offset, skipping "
+"truncation"
+msgstr ""
+"выполнить усечение до мультитранзакции %u нельзя из-за некорректного "
+"смещения, усечение пропускается"
+
+#: access/transam/multixact.c:3628
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "неверный MultiXactId: %u"
 
-#: access/transam/parallel.c:748 access/transam/parallel.c:867
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "не удалось инициализировать параллельный исполнитель"
 
-#: access/transam/parallel.c:749 access/transam/parallel.c:868
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "Дополнительная информация может быть в журнале сервера."
 
-#: access/transam/parallel.c:929
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster завершился в процессе параллельной транзакции"
 
-#: access/transam/parallel.c:1116
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "потеряно подключение к параллельному исполнителю"
 
-#: access/transam/parallel.c:1172 access/transam/parallel.c:1174
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "параллельный исполнитель"
 
-#: access/transam/parallel.c:1344 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "не удалось отобразить динамический сегмент разделяемой памяти"
 
-#: access/transam/parallel.c:1349 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "неверное магическое число в динамическом сегменте разделяемой памяти"
@@ -2284,65 +2344,65 @@ msgstr "зарегистрирован пользовательский мене
 
 #: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
-msgstr "значение \"%s\" должно быть кратно %d"
+msgid "\"%s\" must be a multiple of %d."
+msgstr "Значение \"%s\" должно быть кратно %d."
 
-#: access/transam/slru.c:830
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "файл \"%s\" не существует, считается нулевым"
 
-#: access/transam/slru.c:1059 access/transam/slru.c:1065
-#: access/transam/slru.c:1073 access/transam/slru.c:1078
-#: access/transam/slru.c:1085 access/transam/slru.c:1090
-#: access/transam/slru.c:1097 access/transam/slru.c:1104
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "не удалось получить состояние транзакции %u"
 
-#: access/transam/slru.c:1060
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "Не удалось открыть файл \"%s\": %m."
 
-#: access/transam/slru.c:1066
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "Не удалось переместиться в файле \"%s\" к смещению %d: %m."
 
-#: access/transam/slru.c:1074
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "Не удалось прочитать файл \"%s\" (по смещению %d): %m."
 
-#: access/transam/slru.c:1079
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr ""
 "Не удалось прочитать файл \"%s\" (по смещению %d): прочитаны не все байты."
 
-#: access/transam/slru.c:1086
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "Не удалось записать в файл \"%s\" (по смещению %d): %m."
 
-#: access/transam/slru.c:1091
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr ""
 "Не удалось записать в файл \"%s\" (по смещению %d): записаны не все байты."
 
-#: access/transam/slru.c:1098
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "Не удалось синхронизировать с ФС файл \"%s\": %m."
 
-#: access/transam/slru.c:1105
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "Не удалось закрыть файл \"%s\": %m."
 
-#: access/transam/slru.c:1431
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "не удалось очистить каталог \"%s\": видимо, произошло зацикливание"
@@ -2408,12 +2468,12 @@ msgstr "Установите ненулевое значение парамет
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "идентификатор транзакции \"%s\" уже используется"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2531
+#: access/transam/twophase.c:404 access/transam/twophase.c:2530
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "достигнут предел числа подготовленных транзакций"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2532
+#: access/transam/twophase.c:405 access/transam/twophase.c:2531
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr ""
@@ -2495,9 +2555,9 @@ msgstr ""
 "вычисленная контрольная сумма (CRC) не соответствует значению, сохранённому "
 "в файле \"%s\""
 
-#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:936 replication/logical/logical.c:211
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572
+#: postmaster/walsummarizer.c:939 replication/logical/logical.c:213
+#: replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "Не удалось разместить обработчик журнала транзакций."
@@ -2519,12 +2579,12 @@ msgstr ""
 "ожидаемые данные состояния двухфазной фиксации отсутствуют в WAL в позиции "
 "%X/%X"
 
-#: access/transam/twophase.c:1745
+#: access/transam/twophase.c:1744
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "пересоздать файл \"%s\" не удалось: %m"
 
-#: access/transam/twophase.c:1872
+#: access/transam/twophase.c:1871
 #, c-format
 msgid ""
 "%u two-phase state file was written for a long-running prepared transaction"
@@ -2537,47 +2597,47 @@ msgstr[1] ""
 msgstr[2] ""
 "для длительных подготовленных транзакций записано файлов состояния 2PC: %u"
 
-#: access/transam/twophase.c:2107
+#: access/transam/twophase.c:2106
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "восстановление подготовленной транзакции %u из разделяемой памяти"
 
-#: access/transam/twophase.c:2200
+#: access/transam/twophase.c:2199
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "удаление устаревшего файла состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2207
+#: access/transam/twophase.c:2206
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr "удаление из памяти устаревшего состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2220
+#: access/transam/twophase.c:2219
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "удаление файла будущего состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2227
+#: access/transam/twophase.c:2226
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "удаление из памяти будущего состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2252
+#: access/transam/twophase.c:2251
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "испорчен файл состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2257
+#: access/transam/twophase.c:2256
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "испорчено состояние 2PC в памяти для транзакции %u"
 
-#: access/transam/twophase.c:2514
+#: access/transam/twophase.c:2513
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "не удалось восстановить файл состояния 2PC для транзакции %u"
 
-#: access/transam/twophase.c:2516
+#: access/transam/twophase.c:2515
 #, c-format
 msgid ""
 "Two-phase state file has been found in WAL record %X/%X, but this "
@@ -2586,7 +2646,7 @@ msgstr ""
 "Для WAL-записи %X/%X найден файл состояния двухфазной фиксации, но эта "
 "транзакция уже была восстановлена с диска."
 
-#: access/transam/twophase.c:2524 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "ошибка при обращении к файлу \"%s\": %m"
@@ -2650,130 +2710,124 @@ msgstr ""
 "Возможно, вам также придётся зафиксировать или откатить старые "
 "подготовленные транзакции и удалить неиспользуемые слоты репликации."
 
-#: access/transam/xact.c:649
+#: access/transam/xact.c:652
 #, c-format
 msgid "cannot assign transaction IDs during a parallel operation"
 msgstr ""
 "идентификаторы транзакций не могут назначаться во время параллельных операций"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "модифицировать данные в параллельном исполнителе нельзя"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "начинать команды во время параллельной операции нельзя"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "в одной транзакции не может быть больше 2^32-2 команд"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "превышен предел числа зафиксированных подтранзакций (%d)"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr ""
 "нельзя выполнить PREPARE для транзакции, оперирующей с временными объектами"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "нельзя выполнить PREPARE для транзакции, снимки которой экспортированы"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3593
+#: access/transam/xact.c:3657
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s не может выполняться внутри блока транзакции"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3603
+#: access/transam/xact.c:3667
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s не может выполняться внутри подтранзакции"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s нельзя выполнять в конвейере"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s нельзя выполнять внутри функции"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s может выполняться только внутри блоков транзакций"
 
-#: access/transam/xact.c:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "транзакция уже выполняется"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "нет незавершённой транзакции"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "фиксировать транзакции во время параллельных операций нельзя"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "прерывание во время параллельных операций невозможно"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "определять точки сохранения во время параллельных операций нельзя"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "высвобождать точки сохранения во время параллельных операций нельзя"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "точка сохранения \"%s\" не существует"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr ""
 "точка сохранения \"%s\" на текущем уровне точек сохранения не существует"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "откатиться к точке сохранения во время параллельных операций нельзя"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, c-format
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "в одной транзакции не может быть больше 2^32-1 подтранзакций"
 
-#: access/transam/xlog.c:1542
+#: access/transam/xlog.c:1544
 #, c-format
 msgid ""
 "request to flush past end of generated WAL; request %X/%X, current position "
@@ -2782,7 +2836,7 @@ msgstr ""
 "запрос на сброс данных за концом сгенерированного WAL; запрошена позиция %X/"
 "%X, текущая позиция %X/%X"
 
-#: access/transam/xlog.c:1769
+#: access/transam/xlog.c:1771
 #, c-format
 msgid ""
 "cannot read past end of generated WAL: requested %X/%X, current position %X/"
@@ -2791,69 +2845,64 @@ msgstr ""
 "чтение за концом сгенерированного WAL невозможно: запрошена позиция %X/%X, "
 "текущая позиция %X/%X"
 
-#: access/transam/xlog.c:2210 access/transam/xlog.c:4501
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr ""
 "Размер сегмента WAL должен задаваться степенью 2 в интервале от 1 МБ до 1 ГБ."
 
-#: access/transam/xlog.c:2228
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "Параметр \"%s\" должен быть равен -1 в режиме двоичного обновления."
-
-#: access/transam/xlog.c:2477
+#: access/transam/xlog.c:2454
 #, 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:3739 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820
+#: replication/walsender.c:3088
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "запрошенный сегмент WAL %s уже удалён"
 
-#: access/transam/xlog.c:4061
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\": %m"
 
-#: access/transam/xlog.c:4104 access/transam/xlog.c:4115
-#: access/transam/xlog.c:4136
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116
+#: access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "требуемый каталог WAL \"%s\" не существует"
 
-#: access/transam/xlog.c:4121 access/transam/xlog.c:4142
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "создаётся отсутствующий каталог WAL \"%s\""
 
-#: access/transam/xlog.c:4125 access/transam/xlog.c:4145
-#: commands/dbcommands.c:3262
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146
+#: commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "не удалось создать отсутствующий каталог \"%s\": %m"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "не удалось сгенерировать случайное число для аутентификации"
 
-#: access/transam/xlog.c:4363 access/transam/xlog.c:4373
-#: access/transam/xlog.c:4399 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4415 access/transam/xlog.c:4421
-#: access/transam/xlog.c:4429 access/transam/xlog.c:4437
-#: access/transam/xlog.c:4445 access/transam/xlog.c:4453
-#: access/transam/xlog.c:4461 access/transam/xlog.c:4469
-#: access/transam/xlog.c:4479 access/transam/xlog.c:4487
-#: utils/init/miscinit.c:1812
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4437
+#: access/transam/xlog.c:4447 access/transam/xlog.c:4453
+#: access/transam/xlog.c:4463 access/transam/xlog.c:4473
+#: access/transam/xlog.c:4483 access/transam/xlog.c:4493
+#: access/transam/xlog.c:4503 access/transam/xlog.c:4513
+#: access/transam/xlog.c:4525 access/transam/xlog.c:4533
+#: utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "файлы базы данных несовместимы с сервером"
 
-#: access/transam/xlog.c:4364
+#: access/transam/xlog.c:4392
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
@@ -2862,7 +2911,7 @@ msgstr ""
 "Кластер баз данных был инициализирован с PG_CONTROL_VERSION %d (0x%08x), но "
 "сервер скомпилирован с PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4368
+#: access/transam/xlog.c:4396
 #, c-format
 msgid ""
 "This could be a problem of mismatched byte ordering.  It looks like you need "
@@ -2871,7 +2920,7 @@ msgstr ""
 "Возможно, проблема вызвана разным порядком байт. Кажется, вам надо выполнить "
 "initdb."
 
-#: access/transam/xlog.c:4374
+#: access/transam/xlog.c:4402
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -2880,36 +2929,32 @@ msgstr ""
 "Кластер баз данных был инициализирован с PG_CONTROL_VERSION %d, но сервер "
 "скомпилирован с PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4377 access/transam/xlog.c:4403
-#: access/transam/xlog.c:4411 access/transam/xlog.c:4417
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433
+#: access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Кажется, вам надо выполнить initdb."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4417
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "ошибка контрольной суммы в файле pg_control"
 
-#: access/transam/xlog.c:4400
-#, c-format
-msgid ""
-"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
-"server was compiled with CATALOG_VERSION_NO %d."
-msgstr ""
-"Кластер баз данных был инициализирован с CATALOG_VERSION_NO %d, но сервер "
-"скомпилирован с CATALOG_VERSION_NO %d."
-
-#: access/transam/xlog.c:4408
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439
+#: access/transam/xlog.c:4455 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4475 access/transam/xlog.c:4485
+#: access/transam/xlog.c:4495 access/transam/xlog.c:4505
+#: access/transam/xlog.c:4515
 #, c-format
 msgid ""
-"The database cluster was initialized with MAXALIGN %d, but the server was "
-"compiled with MAXALIGN %d."
+"The database cluster was initialized with %s %d, but the server was compiled "
+"with %s %d."
 msgstr ""
-"Кластер баз данных был инициализирован с MAXALIGN %d, но сервер "
-"скомпилирован с MAXALIGN %d."
+"Кластер баз данных был инициализирован с %s %d, но сервер скомпилирован с %s "
+"%d."
 
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4448
 #, c-format
 msgid ""
 "The database cluster appears to use a different floating-point number format "
@@ -2918,79 +2963,16 @@ msgstr ""
 "Кажется, в кластере баз данных и в программе сервера используются разные "
 "форматы чисел с плавающей точкой."
 
-#: access/transam/xlog.c:4422
-#, c-format
-msgid ""
-"The database cluster was initialized with BLCKSZ %d, but the server was "
-"compiled with BLCKSZ %d."
-msgstr ""
-"Кластер баз данных был инициализирован с BLCKSZ %d, но сервер скомпилирован "
-"с BLCKSZ %d."
-
-#: access/transam/xlog.c:4425 access/transam/xlog.c:4433
-#: access/transam/xlog.c:4441 access/transam/xlog.c:4449
-#: access/transam/xlog.c:4457 access/transam/xlog.c:4465
-#: access/transam/xlog.c:4473 access/transam/xlog.c:4482
-#: access/transam/xlog.c:4490
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469
+#: access/transam/xlog.c:4479 access/transam/xlog.c:4489
+#: access/transam/xlog.c:4499 access/transam/xlog.c:4509
+#: access/transam/xlog.c:4519 access/transam/xlog.c:4528
+#: access/transam/xlog.c:4536
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Кажется, вам надо перекомпилировать сервер или выполнить initdb."
 
-#: access/transam/xlog.c:4430
-#, c-format
-msgid ""
-"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
-"compiled with RELSEG_SIZE %d."
-msgstr ""
-"Кластер баз данных был инициализирован с RELSEG_SIZE %d, но сервер "
-"скомпилирован с RELSEG_SIZE %d."
-
-#: access/transam/xlog.c:4438
-#, c-format
-msgid ""
-"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
-"compiled with XLOG_BLCKSZ %d."
-msgstr ""
-"Кластер баз данных был инициализирован с XLOG_BLCKSZ %d, но сервер "
-"скомпилирован с XLOG_BLCKSZ %d."
-
-#: access/transam/xlog.c:4446
-#, c-format
-msgid ""
-"The database cluster was initialized with NAMEDATALEN %d, but the server was "
-"compiled with NAMEDATALEN %d."
-msgstr ""
-"Кластер баз данных был инициализирован с NAMEDATALEN %d, но сервер "
-"скомпилирован с NAMEDATALEN %d."
-
-#: access/transam/xlog.c:4454
-#, c-format
-msgid ""
-"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
-"was compiled with INDEX_MAX_KEYS %d."
-msgstr ""
-"Кластер баз данных был инициализирован с INDEX_MAX_KEYS %d, но сервер "
-"скомпилирован с INDEX_MAX_KEYS %d."
-
-#: access/transam/xlog.c:4462
-#, c-format
-msgid ""
-"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
-"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr ""
-"Кластер баз данных был инициализирован с TOAST_MAX_CHUNK_SIZE %d, но сервер "
-"скомпилирован с TOAST_MAX_CHUNK_SIZE %d."
-
-#: access/transam/xlog.c:4470
-#, c-format
-msgid ""
-"The database cluster was initialized with LOBLKSIZE %d, but the server was "
-"compiled with LOBLKSIZE %d."
-msgstr ""
-"Кластер баз данных был инициализирован с LOBLKSIZE %d, но сервер "
-"скомпилирован с LOBLKSIZE %d."
-
-#: access/transam/xlog.c:4480
+#: access/transam/xlog.c:4526
 #, c-format
 msgid ""
 "The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
@@ -2999,7 +2981,7 @@ msgstr ""
 "Кластер баз данных был инициализирован без USE_FLOAT8_BYVAL, но сервер "
 "скомпилирован с USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4488
+#: access/transam/xlog.c:4534
 #, c-format
 msgid ""
 "The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
@@ -3008,7 +2990,7 @@ msgstr ""
 "Кластер баз данных был инициализирован с USE_FLOAT8_BYVAL, но сервер был "
 "скомпилирован без USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4497
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -3016,45 +2998,41 @@ msgstr[0] "управляющий файл содержит неверный р
 msgstr[1] "управляющий файл содержит неверный размер сегмента WAL (%d Б)"
 msgstr[2] "управляющий файл содержит неверный размер сегмента WAL (%d Б)"
 
-#: access/transam/xlog.c:4510
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"min_wal_size\" должен быть минимум вдвое больше \"wal_segment_size\""
-
-#: access/transam/xlog.c:4514
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"max_wal_size\" должен быть минимум вдвое больше \"wal_segment_size\""
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "\"%s\" должно быть как минимум вдвое больше \"%s\""
 
-#: access/transam/xlog.c:4662 catalog/namespace.c:4696
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 tcop/postgres.c:3715 utils/error/elog.c:2247
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699
+#: commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72
+#: replication/slot.c:2768 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Ошибка синтаксиса в списке."
 
-#: access/transam/xlog.c:4708 commands/user.c:2545 commands/variable.c:173
-#: tcop/postgres.c:3731 utils/error/elog.c:2273
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173
+#: tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "нераспознанное ключевое слово: \"%s\"."
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "не удалось записать начальный файл журнала предзаписи: %m"
 
-#: access/transam/xlog.c:5137
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "не удалось сбросить на диск начальный файл журнала предзаписи: %m"
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "не удалось закрыть начальный файл журнала предзаписи: %m"
 
-#: access/transam/xlog.c:5368
+#: access/transam/xlog.c:5433
 #, c-format
 msgid ""
 "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
@@ -3062,13 +3040,13 @@ msgstr ""
 "WAL был создан с параметром \"wal_level=minimal\", продолжение "
 "восстановления невозможно"
 
-#: access/transam/xlog.c:5369
+#: access/transam/xlog.c:5434
 #, c-format
 msgid ""
 "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "Это происходит, если вы на время устанавливали \"wal_level=minimal\"."
 
-#: access/transam/xlog.c:5370
+#: access/transam/xlog.c:5435
 #, c-format
 msgid ""
 "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
@@ -3076,32 +3054,32 @@ msgstr ""
 "Используйте резервную копию, сделанную после переключения \"wal_level\" на "
 "любой уровень выше \"minimal\"."
 
-#: access/transam/xlog.c:5435
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "файл pg_control содержит неправильную позицию контрольной точки"
 
-#: access/transam/xlog.c:5446
+#: access/transam/xlog.c:5511
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "система БД была выключена: %s"
 
-#: access/transam/xlog.c:5452
+#: access/transam/xlog.c:5517
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "система БД была выключена в процессе восстановления: %s"
 
-#: access/transam/xlog.c:5458
+#: access/transam/xlog.c:5523
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "выключение системы БД было прервано; последний момент работы: %s"
 
-#: access/transam/xlog.c:5464
+#: access/transam/xlog.c:5529
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "работа системы БД была прервана во время восстановления: %s"
 
-#: access/transam/xlog.c:5466
+#: access/transam/xlog.c:5531
 #, c-format
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
@@ -3110,14 +3088,14 @@ msgstr ""
 "Это скорее всего означает, что некоторые данные повреждены и вам придётся "
 "восстановить БД из последней резервной копии."
 
-#: access/transam/xlog.c:5472
+#: access/transam/xlog.c:5537
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
 "работа системы БД была прервана в процессе восстановления, время в журнале: "
 "%s"
 
-#: access/transam/xlog.c:5474
+#: access/transam/xlog.c:5539
 #, c-format
 msgid ""
 "If this has occurred more than once some data might be corrupted and you "
@@ -3126,22 +3104,22 @@ msgstr ""
 "Если это происходит постоянно, возможно, какие-то данные были испорчены и "
 "для восстановления стоит выбрать более раннюю точку."
 
-#: access/transam/xlog.c:5480
+#: access/transam/xlog.c:5545
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "работа системы БД была прервана; последний момент работы: %s"
 
-#: access/transam/xlog.c:5487
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "файл pg_control содержит неверный код состояния кластера"
 
-#: access/transam/xlog.c:5875
+#: access/transam/xlog.c:5940
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL закончился без признака окончания копирования"
 
-#: access/transam/xlog.c:5876
+#: access/transam/xlog.c:5941
 #, c-format
 msgid ""
 "All WAL generated while online backup was taken must be available at "
@@ -3150,69 +3128,69 @@ msgstr ""
 "Все журналы WAL, созданные во время резервного копирования \"на ходу\", "
 "должны быть в наличии для восстановления."
 
-#: access/transam/xlog.c:5880
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL закончился до согласованной точки восстановления"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "выбранный ID новой линии времени: %u"
 
-#: access/transam/xlog.c:5959
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "восстановление архива завершено"
 
-#: access/transam/xlog.c:6612
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "выключение"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6651
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "начата точка перезапуска:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6663
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "начата контрольная точка:%s%s%s%s%s%s%s%s"
 
 # well-spelled: синхр
-#: access/transam/xlog.c:6728
+#: access/transam/xlog.c:6769
 #, c-format
 msgid ""
-"restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d "
-"removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; "
-"sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, "
-"estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+"restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d "
+"WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d "
+"s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; "
+"distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr ""
-"точка перезапуска завершена: записано буферов: %d (%.1f%%); добавлено файлов "
-"WAL %d, удалено: %d, переработано: %d; запись=%ld.%03d сек., синхр.=%ld.%03d "
-"сек., всего=%ld.%03d сек.; синхронизировано_файлов=%d, самая_долгая_синхр."
-"=%ld.%03d сек., средняя=%ld.%03d сек.; расстояние=%d kB, ожидалось=%d kB; "
-"lsn=%X/%X, lsn redo=%X/%X"
+"точка перезапуска завершена: записано буферов: %d (%.1f%%), записано SLRU-"
+"буферов: %d; добавлено файлов WAL %d, удалено: %d, переработано: %d; "
+"запись=%ld.%03d сек., синхр.=%ld.%03d сек., всего=%ld.%03d сек.; "
+"синхронизировано_файлов=%d, самая_долгая_синхр.=%ld.%03d сек., средняя=%ld."
+"%03d сек.; расстояние=%d КБ, ожидалось=%d КБ; lsn=%X/%X, lsn redo=%X/%X"
 
 # well-spelled: синхр
-#: access/transam/xlog.c:6751
+#: access/transam/xlog.c:6793
 #, c-format
 msgid ""
-"checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d "
-"removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; "
-"sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, "
-"estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+"checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d "
+"WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d "
+"s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; "
+"distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
 msgstr ""
-"контрольная точка завершена: записано буферов: %d (%.1f%%); добавлено файлов "
-"WAL %d, удалено: %d, переработано: %d; запись=%ld.%03d сек., синхр.=%ld.%03d "
-"сек., всего=%ld.%03d сек.; синхронизировано_файлов=%d, самая_долгая_синхр."
-"=%ld.%03d сек., средняя=%ld.%03d сек.; расстояние=%d kB, ожидалось=%d kB; "
-"lsn=%X/%X, lsn redo=%X/%X"
+"контрольная точка завершена: записано буферов: %d (%.1f%%), записано SLRU-"
+"буферов: %d; добавлено файлов WAL %d, удалено: %d, переработано: %d; "
+"запись=%ld.%03d сек., синхр.=%ld.%03d сек., всего=%ld.%03d сек.; "
+"синхронизировано_файлов=%d, самая_долгая_синхр.=%ld.%03d сек., средняя=%ld."
+"%03d сек.; расстояние=%d КБ, ожидалось=%d КБ; lsn=%X/%X, lsn redo=%X/%X"
 
-#: access/transam/xlog.c:7233
+#: access/transam/xlog.c:7279
 #, c-format
 msgid ""
 "concurrent write-ahead log activity while database system is shutting down"
@@ -3220,64 +3198,65 @@ msgstr ""
 "во время выключения системы баз данных отмечена активность в журнале "
 "предзаписи"
 
-#: access/transam/xlog.c:7818
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "точка перезапуска восстановления в позиции %X/%X"
 
-#: access/transam/xlog.c:7820
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "Последняя завершённая транзакция была выполнена в %s."
 
-#: access/transam/xlog.c:8082
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "точка восстановления \"%s\" создана в позиции %X/%X"
 
-#: access/transam/xlog.c:8289
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr ""
 "резервное копирование \"на ходу\" было отменено, продолжить восстановление "
 "нельзя"
 
-#: access/transam/xlog.c:8347
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr ""
 "неожиданный ID линии времени %u (должен быть %u) в записи точки выключения"
 
-#: access/transam/xlog.c:8405
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr ""
 "неожиданный ID линии времени %u (должен быть %u) в записи точки активности"
 
-#: access/transam/xlog.c:8434
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr ""
 "неожиданный ID линии времени %u (должен быть %u) в записи конец-"
 "восстановления"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл сквозной записи %s: %m"
 
-#: access/transam/xlog.c:8710
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС данные (fdatasync) файла \"%s\": %m"
 
-#: access/transam/xlog.c:8797 access/transam/xlog.c:9133
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr ""
 "Выбранный уровень WAL недостаточен для резервного копирования \"на ходу\""
 
-#: access/transam/xlog.c:8798 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid ""
 "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
@@ -3285,12 +3264,12 @@ msgstr ""
 "Параметр \"wal_level\" должен иметь значение \"replica\" или \"logical\" при "
 "запуске сервера."
 
-#: access/transam/xlog.c:8803
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "длина метки резервной копии превышает предел (%d байт)"
 
-#: access/transam/xlog.c:8924
+#: access/transam/xlog.c:8984
 #, c-format
 msgid ""
 "WAL generated with \"full_page_writes=off\" was replayed since last "
@@ -3299,7 +3278,7 @@ msgstr ""
 "после последней точки перезапуска был воспроизведён WAL, созданный в режиме "
 "\"full_page_writes=off\""
 
-#: access/transam/xlog.c:8926 access/transam/xlog.c:9222
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, c-format
 msgid ""
 "This means that the backup being taken on the standby is corrupt and should "
@@ -3311,28 +3290,23 @@ msgstr ""
 "CHECKPOINT на ведущем сервере, а затем попробуйте резервное копирование \"на "
 "ходу\" ещё раз."
 
-#: access/transam/xlog.c:9006 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "не удалось прочитать символическую ссылку \"%s\": %m"
 
-#: access/transam/xlog.c:9013 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "целевой путь символической ссылки \"%s\" слишком длинный"
 
-#: access/transam/xlog.c:9134
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr "Установите wal_level \"replica\" или \"logical\" при запуске сервера."
-
-#: access/transam/xlog.c:9172 backup/basebackup.c:1281
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr ""
 "ведомый сервер был повышен в процессе резервного копирования \"на ходу\""
 
-#: access/transam/xlog.c:9173 backup/basebackup.c:1282
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, c-format
 msgid ""
 "This means that the backup being taken is corrupt and should not be used. "
@@ -3341,7 +3315,7 @@ msgstr ""
 "Это означает, что создаваемая резервная копия испорчена и использовать её не "
 "следует. Попробуйте резервное копирование \"на ходу\" ещё раз."
 
-#: access/transam/xlog.c:9220
+#: access/transam/xlog.c:9280
 #, c-format
 msgid ""
 "WAL generated with \"full_page_writes=off\" was replayed during online backup"
@@ -3349,13 +3323,13 @@ msgstr ""
 "в процессе резервного копирования \"на ходу\" был воспроизведён WAL, "
 "созданный в режиме \"full_page_writes=off\""
 
-#: access/transam/xlog.c:9336
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr ""
 "базовое копирование выполнено, ожидается архивация нужных сегментов WAL"
 
-#: access/transam/xlog.c:9350
+#: access/transam/xlog.c:9410
 #, c-format
 msgid ""
 "still waiting for all required WAL segments to be archived (%d seconds "
@@ -3363,7 +3337,7 @@ msgid ""
 msgstr ""
 "продолжается ожидание архивации всех нужных сегментов WAL (прошло %d сек.)"
 
-#: access/transam/xlog.c:9352
+#: access/transam/xlog.c:9412
 #, c-format
 msgid ""
 "Check that your \"archive_command\" is executing properly.  You can safely "
@@ -3374,12 +3348,12 @@ msgstr ""
 "копирования можно отменить безопасно, но резервная копия базы будет "
 "непригодна без всех сегментов WAL."
 
-#: access/transam/xlog.c:9359
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "все нужные сегменты WAL заархивированы"
 
-#: access/transam/xlog.c:9363
+#: access/transam/xlog.c:9423
 #, c-format
 msgid ""
 "WAL archiving is not enabled; you must ensure that all required WAL segments "
@@ -3388,7 +3362,7 @@ msgstr ""
 "архивация WAL не настроена; вы должны обеспечить копирование всех требуемых "
 "сегментов WAL другими средствами для получения резервной копии"
 
-#: access/transam/xlog.c:9402
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr ""
@@ -3435,35 +3409,35 @@ msgstr "не удалось создать файл состояния архи
 msgid "could not write archive status file \"%s\": %m"
 msgstr "не удалось записать файл состояния архива \"%s\": %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "резервное копирование уже выполняется в этом сеансе"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "резервное копирование не выполняется"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "Вы вызывали pg_backup_start()?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "Функции управления WAL нельзя использовать в процессе восстановления."
 
-#: access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "выполнить %s во время восстановления нельзя."
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid ""
 "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
@@ -3471,69 +3445,69 @@ msgstr ""
 "pg_log_standby_snapshot() можно использовать, только если \"wal_level\" >= "
 "\"replica\""
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "Выбранный уровень WAL не достаточен для создания точки восстановления"
 
 # well-spelled: симв
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "значение для точки восстановления превышает предел (%d симв.)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "неправильное имя файла WAL \"%s\""
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "восстановление не выполняется"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr ""
 "Функции управления восстановлением можно использовать только в процессе "
 "восстановления."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "производится повышение ведомого"
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s нельзя выполнять, когда производится повышение."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "значение \"wait_seconds\" не должно быть отрицательным или нулевым"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "отправить сигнал процессу postmaster не удалось: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "закрытие подключения из-за неожиданного завершения главного процесса"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
 msgstr "в процессе ожидания повышения"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
@@ -3541,81 +3515,81 @@ msgstr[0] "повышение сервера не завершилось за %d
 msgstr[1] "повышение сервера не завершилось за %d секунды"
 msgstr[2] "повышение сервера не завершилось за %d секунд"
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
 msgid ""
-"\"recovery_prefetch\" is not supported on platforms that lack "
-"posix_fadvise()."
+"\"recovery_prefetch\" is not supported on platforms that lack support for "
+"issuing read-ahead advice."
 msgstr ""
 "\"recovery_prefetch\" не поддерживается на платформах, где отсутствует "
-"posix_fadvise()."
+"поддержка рекомендации упреждающего чтения."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверное смещение записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "в позиции %X/%X запрошено продолжение записи"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверная длина записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "нет флага contrecord в позиции %X/%X"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неверная длина contrecord: %u (ожидалась %lld) в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "неверный ID менеджера ресурсов %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запись с неверной ссылкой назад %X/%X в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "некорректная контрольная сумма данных менеджера ресурсов в записи в позиции "
 "%X/%X"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверное магическое число %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверные информационные биты %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
 "файл WAL принадлежит другой СУБД: в нём указан идентификатор системы БД "
-"%llu, а идентификатор системы pg_control: %llu"
+"%<PRIu64>, а идентификатор системы pg_control: %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -3624,7 +3598,7 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный размер сегмента в заголовке "
 "страницы"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -3633,12 +3607,12 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный XLOG_BLCKSZ в заголовке "
 "страницы"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неожиданный pageaddr %X/%X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -3647,23 +3621,23 @@ msgstr ""
 "нарушение последовательности ID линии времени %u (после %u) в сегменте WAL "
 "%s, LSN %X/%X, смещение %u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "идентификатор блока %u идёт не по порядку в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1773
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA установлен, но данных в позиции %X/%X нет"
 
-#: access/transam/xlogreader.c:1780
+#: access/transam/xlogreader.c:1800
 #, 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:1816
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -3672,21 +3646,21 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE установлен, но для пропуска заданы смещение %u и длина %u "
 "при длине образа блока %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1832
+#: access/transam/xlogreader.c:1852
 #, 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:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED установлен, но длина образа блока равна %u в позиции %X/"
 "%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -3695,41 +3669,41 @@ msgstr ""
 "ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_COMPRESSED не установлены, но длина образа "
 "блока равна %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr ""
 "BKPBLOCK_SAME_REL установлен, но предыдущее значение не задано в позиции %X/"
 "%X"
 
-#: access/transam/xlogreader.c:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "неверный идентификатор блока %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запись с неверной длиной в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не удалось найти копию блока с ID %d в записи журнала WAL"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с указанным неверным блоком %d"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с неверным состоянием, блок %d"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
@@ -3738,7 +3712,7 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый методом %s, который не "
 "поддерживается этой сборкой, блок %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
@@ -3746,12 +3720,12 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый неизвестным методом, "
 "блок %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не удалось развернуть образ в позиции %X/%X, блок %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid ""
 "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on "
@@ -3760,7 +3734,7 @@ msgstr ""
 "начинается восстановление копии с LSN redo %X/%X, LSN контрольной точки %X/"
 "%X, на линии времени %u"
 
-#: access/transam/xlogrecovery.c:649
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid ""
 "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
@@ -3768,7 +3742,7 @@ msgstr ""
 "не удалось найти положение REDO %X/%X, указанное в записи контрольной точки "
 "в %X/%X"
 
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/"
@@ -3784,93 +3758,104 @@ msgstr ""
 "Будьте осторожны: при восстановлении резервной копии удаление \"%s/"
 "backup_label\" приведёт к повреждению кластера."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "не удалось найти нужную запись контрольной точки в %X/%X"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\": %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "файл \"%s\" игнорируется ввиду отсутствия файла \"%s\""
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Файл \"%s\" был переименован в \"%s\"."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "Не удалось переименовать файл \"%s\" в \"%s\" (%m)."
 
-#: access/transam/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "перезапуск восстановления копии с LSN redo %X/%X"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "не удалось найти корректную запись контрольной точки в %X/%X"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid ""
+"could not find redo location %X/%08X referenced by checkpoint record at %X/"
+"%08X"
+msgstr ""
+"не удалось найти положение REDO %X/%08X, указанное в записи контрольной "
+"точки в %X/%08X"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "переход в режим резервного сервера"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "начинается восстановление точки во времени до XID %u"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "начинается восстановление точки во времени до %s"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "начинается восстановление точки во времени до \"%s\""
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr ""
 "начинается восстановление точки во времени до позиции в WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:842
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr ""
 "начинается восстановление точки во времени до первой точки согласованности"
 
-#: access/transam/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "начинается восстановление архива"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:866
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "в истории сервера нет ответвления запрошенной линии времени %u"
 
-#: access/transam/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:869
 #, 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."
+"Latest checkpoint in file \"%s\" 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 ""
-"Последняя контрольная точка: %X/%X на линии времени %u, но в истории "
-"запрошенной линии времени сервер ответвился с этой линии в %X/%X."
+"Последняя контрольная точка в файле \"%s\": %X/%X на линии времени %u, но в "
+"истории запрошенной линии времени сервер ответвился с этой линии в %X/%X."
 
-#: access/transam/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:884
 #, c-format
 msgid ""
 "requested timeline %u does not contain minimum recovery point %X/%X on "
@@ -3879,22 +3864,22 @@ msgstr ""
 "запрошенная линия времени %u не содержит минимальную точку восстановления %X/"
 "%X на линии времени %u"
 
-#: access/transam/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "неверный ID следующей транзакции"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "неверная запись REDO в контрольной точке"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "неверная запись REDO в контрольной точке выключения"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:957
 #, c-format
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
@@ -3902,19 +3887,19 @@ msgstr ""
 "система БД была остановлена нештатно; производится автоматическое "
 "восстановление"
 
-#: access/transam/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:961
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr ""
 "восстановление после сбоя начинается на линии времени %u, целевая линия "
 "времени: %u"
 
-#: access/transam/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label содержит данные, не согласованные с файлом pg_control"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:1005
 #, c-format
 msgid ""
 "This means that the backup is corrupted and you will have to use another "
@@ -3923,24 +3908,24 @@ msgstr ""
 "Это означает, что резервная копия повреждена и для восстановления БД "
 "придётся использовать другую копию."
 
-#: access/transam/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr ""
 "использование файла с конфигурацией восстановления \"%s\" не поддерживается"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1124
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr ""
 "режим резервного сервера не поддерживается однопользовательским сервером"
 
-#: access/transam/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "не указано ни \"primary_conninfo\", ни \"restore_command\""
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid ""
 "The database server will regularly poll the pg_wal subdirectory to check for "
@@ -3949,103 +3934,102 @@ msgstr ""
 "Сервер БД будет регулярно опрашивать подкаталог pg_wal и проверять "
 "содержащиеся в нём файлы."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr ""
 "необходимо задать \"restore_command\", если не выбран режим резервного "
 "сервера"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "целевая линия времени для восстановления %u не существует"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278
+#: access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425
+#: access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "неверные данные в файле \"%s\""
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "Получен идентификатор линии времени %u, но ожидался %u."
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "это каталог инкрементальной копии, не каталог данных"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr ""
 "Реконструируйте полноценный каталог данных, используя pg_combinebackup."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "в точке redo %X/%X обнаружена запись неожиданного типа"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "запись REDO начинается со смещения %X/%X"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr ""
 "выполняется воспроизведение, прошло времени: %ld.%02d с, текущий LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr ""
 "запрошенная точка остановки восстановления предшествует согласованной точке "
 "восстановления"
 
-#: access/transam/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "записи REDO обработаны до смещения %X/%X, нагрузка системы: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "последняя завершённая транзакция была выполнена в %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "данные REDO не требуются"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "восстановление окончилось до достижения заданной цели восстановления"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr ""
 "успешно пропущена отсутствующая запись contrecord в %X/%X, перезаписанная в "
 "%s"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "в %2$s обнаружен недопустимый элемент-каталог \"%1$s\""
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2184
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr ""
-"Все элементы-каталоги в pg_tblspc/ должны быть символическими ссылками."
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "Все элементы-каталоги в %s/ должны быть символическими ссылками."
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid ""
 "Remove those directories, or set \"allow_in_place_tablespaces\" to ON "
@@ -4054,23 +4038,23 @@ msgstr ""
 "Удалите эти каталоги или на время установите в "
 "\"allow_in_place_tablespaces\" значение ON, чтобы восстановление завершилось."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "завершено восстановление копии с LSN redo %X/%X и конечным LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "согласованное состояние восстановления достигнуто в позиции %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "запись REDO в WAL в позиции %X/%X для %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2405
 #, c-format
 msgid ""
 "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint "
@@ -4079,13 +4063,13 @@ msgstr ""
 "неожиданный ID предыдущей линии времени %u (ID текущей линии времени %u) в "
 "записи контрольной точки"
 
-#: access/transam/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "неожиданный ID линии времени %u (после %u) в записи контрольной точки"
 
 # skip-rule: capital-letter-first
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2430
 #, c-format
 msgid ""
 "unexpected timeline ID %u in checkpoint record, before reaching minimum "
@@ -4094,83 +4078,83 @@ msgstr ""
 "неожиданный ID линии времени %u в записи контрольной точки, до достижения "
 "минимальной к. т. %X/%X на линии времени %u"
 
-#: access/transam/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr ""
 "восстановление останавливается после достижения согласованного состояния"
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "восстановление останавливается перед позицией в WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr ""
 "восстановление останавливается перед фиксированием транзакции %u, время %s"
 
-#: access/transam/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr ""
 "восстановление останавливается перед прерыванием транзакции %u, время %s"
 
-#: access/transam/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "восстановление останавливается в точке восстановления \"%s\", время %s"
 
-#: access/transam/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "восстановление останавливается после позиции в WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr ""
 "восстановление останавливается после фиксирования транзакции %u, время %s"
 
-#: access/transam/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr ""
 "восстановление останавливается после прерывания транзакции %u, время %s"
 
-#: access/transam/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "остановка в конце восстановления"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "Выполните pg_wal_replay_resume() для повышения."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "восстановление приостановлено"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "Выполните pg_wal_replay_resume() для продолжения."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неожиданный ID линии времени %u в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "не удалось прочитать сегмент WAL %s, LSN %X/%X, смещение %u: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid ""
 "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
@@ -4178,38 +4162,38 @@ msgstr ""
 "не удалось прочитать сегмент WAL %s, LSN %X/%X, смещение %u (прочитано байт: "
 "%d из %zu)"
 
-#: access/transam/xlogrecovery.c:4061
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "неверное положение контрольной точки"
 
-#: access/transam/xlogrecovery.c:4071
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "неверная запись контрольной точки"
 
-#: access/transam/xlogrecovery.c:4077
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "неверный ID менеджера ресурсов в записи контрольной точки"
 
-#: access/transam/xlogrecovery.c:4085
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "неверные флаги xl_info в записи контрольной точки"
 
-#: access/transam/xlogrecovery.c:4091
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "неверная длина записи контрольной точки"
 
-#: access/transam/xlogrecovery.c:4145
+#: access/transam/xlogrecovery.c:4188
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr ""
 "новая линия времени %u не является ответвлением линии времени системы БД %u"
 
-#: access/transam/xlogrecovery.c:4159
+#: access/transam/xlogrecovery.c:4202
 #, c-format
 msgid ""
 "new timeline %u forked off current database system timeline %u before "
@@ -4218,30 +4202,30 @@ msgstr ""
 "новая линия времени %u ответвилась от текущей линии времени базы данных %u "
 "до текущей точки восстановления %X/%X"
 
-#: access/transam/xlogrecovery.c:4178
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "новая целевая линия времени %u"
 
-#: access/transam/xlogrecovery.c:4381
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "получен запрос на выключение процесса приёмника WAL"
 
-#: access/transam/xlogrecovery.c:4441
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "получен запрос повышения статуса"
 
-#: access/transam/xlogrecovery.c:4670
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr ""
 "режим горячего резерва невозможен из-за отсутствия достаточных значений "
 "параметров"
 
-#: access/transam/xlogrecovery.c:4671 access/transam/xlogrecovery.c:4698
-#: access/transam/xlogrecovery.c:4728
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739
+#: access/transam/xlogrecovery.c:4769
 #, c-format
 msgid ""
 "%s = %d is a lower setting than on the primary server, where its value was "
@@ -4249,12 +4233,12 @@ msgid ""
 msgstr ""
 "Параметр %s = %d меньше, чем на ведущем сервере, где его значение было %d."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "В случае возобновления восстановления сервер отключится."
 
-#: access/transam/xlogrecovery.c:4681
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid ""
 "You can then restart the server after making the necessary configuration "
@@ -4263,24 +4247,24 @@ msgstr ""
 "Затем вы можете перезапустить сервер после внесения необходимых изменений "
 "конфигурации."
 
-#: access/transam/xlogrecovery.c:4692
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "повышение невозможно из-за отсутствия достаточных значений параметров"
 
-#: access/transam/xlogrecovery.c:4702
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr ""
 "Перезапустите сервер после внесения необходимых изменений конфигурации."
 
-#: access/transam/xlogrecovery.c:4726
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr ""
 "восстановление прервано из-за отсутствия достаточных значений параметров"
 
-#: access/transam/xlogrecovery.c:4732
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid ""
 "You can restart the server after making the necessary configuration changes."
@@ -4288,12 +4272,28 @@ msgstr ""
 "Вы можете перезапустить сервер после внесения необходимых изменений "
 "конфигурации."
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795
+#: catalog/dependency.c:1153 catalog/dependency.c:1160
+#: catalog/dependency.c:1171 commands/tablecmds.c:1519
+#: commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211
+#: executor/execExprInterp.c:5219 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1048 replication/slot.c:1705
+#: replication/slot.c:2783 replication/slot.c:2785 replication/syncrep.c:1079
+#: storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137
+#: storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207
+#: utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868
+#: utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "указано несколько целей восстановления"
 
-#: access/transam/xlogrecovery.c:4775
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid ""
 "At most one of \"recovery_target\", \"recovery_target_lsn\", "
@@ -4304,28 +4304,27 @@ msgstr ""
 "\"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", "
 "\"recovery_target_xid\"."
 
-#: access/transam/xlogrecovery.c:4786
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Единственное допустимое значение: \"immediate\"."
 
-#: access/transam/xlogrecovery.c:4938 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4991
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp вне диапазона: \"%s\""
+msgid "Timestamp out of range: \"%s\"."
+msgstr "Timestamp вне диапазона: \"%s\"."
 
-#: access/transam/xlogrecovery.c:4983
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "Значение \"recovery_target_timeline\" не является допустимым числом."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "не удалось прочитать из сегмента WAL %s по смещению %d: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr ""
@@ -4348,7 +4347,7 @@ msgstr "Команда архивации с ошибкой: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "команда архивации была прервана исключением 0x%X"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3095
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
@@ -4366,42 +4365,42 @@ msgstr "команда архивации завершена по сигналу
 msgid "archive command exited with unrecognized status %d"
 msgstr "команда архивации завершилась с нераспознанным кодом состояния %d"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "ожидался конец линии времени %u, но обнаружена линия времени %u"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "ожидалось начало линии времени %u, но обнаружена линия времени %u"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "начальная линия времени %u не найдена в истории линии времени %u"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "не удалось переместиться во временном файле"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "не удалось найти ни одного файла WAL"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "не удалось найти файл WAL \"%s\""
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "неприемлемый размер файла WAL \"%s\""
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
@@ -4409,95 +4408,95 @@ msgstr[0] "всего ошибок контрольных сумм: %lld"
 msgstr[1] "всего ошибок контрольных сумм: %lld"
 msgstr[2] "всего ошибок контрольных сумм: %lld"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "при базовом резервном копировании выявлены ошибки контрольных сумм"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "повторяющийся параметр \"%s\""
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "нераспознанный тип контрольной точки: \"%s\""
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr ""
 "сделать инкрементальную копию можно, только когда включено обобщение WAL"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d вне диапазона, допустимого для параметра \"%s\" (%d .. %d)"
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "нераспознанный параметр в манифесте: \"%s\""
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нераспознанный алгоритм сжатия: \"%s\""
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "нераспознанный параметр операции базового копирования: \"%s\""
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "контрольные суммы не могут рассчитываться без манифеста копии"
 
 # skip-rule: capital-letter-first
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "доп. информацию о получателе нельзя задать без указания получателя"
 
 # skip-rule: capital-letter-first
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "получатель \"%s\" не принимает доп. информацию"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "параметры сжатия нельзя указывать, если не включено сжатие"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неправильное указание сжатия: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
 msgstr ""
 "инкрементальной команде BASE_BACKUP должна предшествовать UPLOAD_MANIFEST"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "не удалось получить информацию о файле или каталоге \"%s\": %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "специальный файл \"%s\" пропускается"
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid ""
 "could not verify checksum in file \"%s\", block %u: read buffer size %d and "
@@ -4506,7 +4505,7 @@ msgstr ""
 "не удалось проверить контрольную сумму в файле \"%s\", блоке %u: размер "
 "прочитанного буфера (%d) отличается от размера страницы (%d)"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
@@ -4514,7 +4513,7 @@ msgstr[0] "всего в файле \"%s\" обнаружено ошибок к
 msgstr[1] "всего в файле \"%s\" обнаружено ошибок контрольных сумм: %d"
 msgstr[2] "всего в файле \"%s\" обнаружено ошибок контрольных сумм: %d"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid ""
 "checksum verification failed in file \"%s\", block %u: calculated %X but "
@@ -4523,19 +4522,19 @@ msgstr ""
 "ошибка контрольной суммы в файле \"%s\", блоке %u: вычислено значение %X, но "
 "ожидалось %X"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid ""
 "further checksum verification failures in file \"%s\" will not be reported"
 msgstr ""
 "о дальнейших ошибках контрольных сумм в файле \"%s\" сообщаться не будет"
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "слишком длинное имя файла для формата tar: \"%s\""
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, c-format
 msgid ""
 "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
@@ -4543,7 +4542,7 @@ msgstr ""
 "цель символической ссылки слишком длинная для формата tar: имя файла \"%s\", "
 "цель \"%s\""
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %zd из %zu)"
@@ -4558,17 +4557,17 @@ msgstr "сжатие gzip не поддерживается в данной сб
 msgid "could not initialize compression library"
 msgstr "не удалось инициализировать библиотеку сжатия"
 
-#: backup/basebackup_incremental.c:294
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
 msgstr "в манифесте не указаны нужные диапазоны WAL"
 
-#: backup/basebackup_incremental.c:349
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "в манифесте найдена линия времени %u, но её нет в истории сервера"
 
-#: backup/basebackup_incremental.c:414
+#: backup/basebackup_incremental.c:412
 #, c-format
 msgid ""
 "manifest requires WAL from initial timeline %u starting at %X/%X, but that "
@@ -4577,7 +4576,7 @@ msgstr ""
 "манифест требует наличия WAL с изначальной линии времени %u, начиная с "
 "позиции %X/%X, но эта линия времени начинается с %X/%X"
 
-#: backup/basebackup_incremental.c:424
+#: backup/basebackup_incremental.c:422
 #, c-format
 msgid ""
 "manifest requires WAL from continuation timeline %u starting at %X/%X, but "
@@ -4586,7 +4585,7 @@ msgstr ""
 "манифест требует наличия WAL с последующей линии времени %u, начиная с "
 "позиции %X/%X, но эта линия времени начинается с %X/%X"
 
-#: backup/basebackup_incremental.c:435
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid ""
 "manifest requires WAL from final timeline %u ending at %X/%X, but this "
@@ -4595,7 +4594,7 @@ msgstr ""
 "манифест требует наличия WAL с последней линии времени %u, завершающейся в "
 "%X/%X, но эта копия начинается с %X/%X"
 
-#: backup/basebackup_incremental.c:439
+#: backup/basebackup_incremental.c:437
 #, c-format
 msgid ""
 "This can happen for incremental backups on a standby if there was little "
@@ -4604,7 +4603,7 @@ msgstr ""
 "Такая ситуация возможна, когда инкрементальная копия создаётся на резервном "
 "сервере при незначительной активности после создания предыдущей копии."
 
-#: backup/basebackup_incremental.c:446
+#: backup/basebackup_incremental.c:444
 #, c-format
 msgid ""
 "manifest requires WAL from non-final timeline %u ending at %X/%X, but this "
@@ -4613,7 +4612,7 @@ msgstr ""
 "манифест требует наличия WAL с промежуточной линии времени %u, завершающейся "
 "в %X/%X, но этот сервер переключил линии времени в %X/%X"
 
-#: backup/basebackup_incremental.c:527
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid ""
 "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no "
@@ -4622,7 +4621,7 @@ msgstr ""
 "требуются обобщения WAL для линии времени %u с позиции %X/%X по %X/%X, но "
 "они не найдены"
 
-#: backup/basebackup_incremental.c:534
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid ""
 "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the "
@@ -4631,25 +4630,25 @@ msgstr ""
 "требуются обобщения WAL для линии времени %u с позиции %X/%X по %X/%X, но "
 "обобщения для этой линии времени и этого диапазона LSN неполные"
 
-#: backup/basebackup_incremental.c:538
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "Первый необобщённый LSN в этом диапазоне: %X/%X."
 
-#: backup/basebackup_incremental.c:938
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr ""
 "с версией 1 манифеста копии инкрементальное копирование не поддерживается"
 
-#: backup/basebackup_incremental.c:956
+#: backup/basebackup_incremental.c:966
 #, c-format
 msgid ""
-"system identifier in backup manifest is %llu, but database system identifier "
-"is %llu"
+"system identifier in backup manifest is %<PRIu64>, but database system "
+"identifier is %<PRIu64>"
 msgstr ""
-"в манифесте копии указан идентификатор системы: %llu, но идентификатор "
-"системы базы данных: %llu"
+"в манифесте копии указан идентификатор системы: %<PRIu64>, но идентификатор "
+"системы базы данных: %<PRIu64>"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -4677,10 +4676,10 @@ msgstr ""
 "для копии, сохраняемой на стороне сервера, нельзя указывать относительный "
 "путь"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
@@ -4690,15 +4689,15 @@ msgstr "не удалось создать каталог \"%s\": %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" существует, но он не пуст"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1178
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ошибка при обращении к каталогу \"%s\": %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "Проверьте, есть ли место на диске."
@@ -4729,7 +4728,7 @@ msgstr "сжатие zstd не поддерживается в данной сб
 #: backup/basebackup_zstd.c:117
 #, c-format
 msgid "could not set compression worker count to %d: %s"
-msgstr "не удалось установить для zstd число потоков %d: %s"
+msgstr "не удалось установить число потоков сжатия %d: %s"
 
 #: backup/basebackup_zstd.c:129
 #, c-format
@@ -4738,26 +4737,31 @@ msgstr "не удалось включить режим большой дист
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "неверная линия времени %lld"
+msgid "invalid timeline %<PRId64>"
+msgstr "неверная линия времени %<PRId64>"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s должно быть первым аргументом"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3946
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "для --%s требуется значение"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3951
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "для -c %s требуется значение"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:763
+#: postmaster/postmaster.c:776
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: неверные аргументы командной строки\n"
@@ -4814,12 +4818,12 @@ msgstr "для объекта \"%s\" были отозваны не все пр
 msgid "grantor must be current user"
 msgstr "праводателем должен быть текущий пользователь"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:1055
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "право %s неприменимо для отношений"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:1059
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "право %s неприменимо для последовательностей"
@@ -4834,7 +4838,7 @@ msgstr "право %s неприменимо для баз данных"
 msgid "invalid privilege type %s for domain"
 msgstr "право %s неприменимо для домена"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:1063
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "право %s неприменимо для функций"
@@ -4844,22 +4848,22 @@ msgstr "право %s неприменимо для функций"
 msgid "invalid privilege type %s for language"
 msgstr "право %s неприменимо для языков"
 
-#: catalog/aclchk.c:504
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "право %s неприменимо для больших объектов"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1079
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "право %s неприменимо для схем"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:1067
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "право %s неприменимо для процедур"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:1071
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "право %s неприменимо для подпрограмм"
@@ -4869,7 +4873,7 @@ msgstr "право %s неприменимо для подпрограмм"
 msgid "invalid privilege type %s for tablespace"
 msgstr "право %s неприменимо для табличных пространств"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1075
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "право %s неприменимо для типа"
@@ -4894,93 +4898,88 @@ msgstr "неверный тип прав %s для параметра"
 msgid "column privileges are only valid for relations"
 msgstr "права для столбцов применимы только к отношениям"
 
-#: catalog/aclchk.c:738 catalog/aclchk.c:3629 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "большой объект %u не существует"
-
-#: catalog/aclchk.c:1112
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "права по умолчанию нельзя определить для столбцов"
 
-#: catalog/aclchk.c:1148
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "нет полномочий для изменения прав доступа по умолчанию"
 
-#: catalog/aclchk.c:1266
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "предложение IN SCHEMA нельзя использовать в GRANT/REVOKE ON SCHEMAS"
-
-#: catalog/aclchk.c:1617 catalog/catalog.c:659 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:951
-#: commands/sequence.c:1655 commands/tablecmds.c:7541 commands/tablecmds.c:7695
-#: commands/tablecmds.c:7745 commands/tablecmds.c:7819
-#: commands/tablecmds.c:7889 commands/tablecmds.c:8019
-#: commands/tablecmds.c:8148 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8343 commands/tablecmds.c:8470
-#: commands/tablecmds.c:8500 commands/tablecmds.c:8642
-#: commands/tablecmds.c:8735 commands/tablecmds.c:8869
-#: commands/tablecmds.c:8981 commands/tablecmds.c:12797
-#: commands/tablecmds.c:12989 commands/tablecmds.c:13150
-#: commands/tablecmds.c:14339 commands/tablecmds.c:16966 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3409
-#: parser/parse_utilcmd.c:3449 parser/parse_utilcmd.c:3491 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2812
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
+#, c-format
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "предложение IN SCHEMA нельзя использовать в %s"
+
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621
+#: catalog/heap.c:2941 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039
+#: commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929
+#: commands/tablecmds.c:8130 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8413 commands/tablecmds.c:8507
+#: commands/tablecmds.c:8610 commands/tablecmds.c:8776
+#: commands/tablecmds.c:8806 commands/tablecmds.c:8961
+#: commands/tablecmds.c:9064 commands/tablecmds.c:9198
+#: commands/tablecmds.c:9311 commands/tablecmds.c:14397
+#: commands/tablecmds.c:14600 commands/tablecmds.c:14761
+#: commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948
+#: parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3662
+#: parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "столбец \"%s\" в таблице \"%s\" не существует"
 
-#: catalog/aclchk.c:1862
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" - это индекс"
 
-#: catalog/aclchk.c:1869 commands/tablecmds.c:14496 commands/tablecmds.c:17882
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" - это составной тип"
 
-#: catalog/aclchk.c:1877 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17846 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\" - это не последовательность"
 
-#: catalog/aclchk.c:1915
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr ""
 "для последовательности \"%s\" применимы только права USAGE, SELECT и UPDATE"
 
-#: catalog/aclchk.c:1932
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "право %s неприменимо для таблиц"
 
-#: catalog/aclchk.c:2097
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "право %s неприменимо для столбцов"
 
-#: catalog/aclchk.c:2110
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "для последовательности \"%s\" применимо только право SELECT"
 
 # TO REVIEW
-#: catalog/aclchk.c:2301
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "язык \"%s\" не является доверенным"
 
-#: catalog/aclchk.c:2303
+#: catalog/aclchk.c:2263
 #, c-format
 msgid ""
 "GRANT and REVOKE are not allowed on untrusted languages, because only "
@@ -4989,457 +4988,454 @@ msgstr ""
 "GRANT и REVOKE не допускаются для недоверенных языков, так как использовать "
 "такие языки могут только суперпользователи."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "для типов массивов нельзя определить права"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "Вместо этого установите права для типа элемента."
 
-#: catalog/aclchk.c:2459
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "для мультидиапазонных типов нельзя определить права"
 
-#: catalog/aclchk.c:2460
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "Вместо этого установите права для диапазонного типа."
 
-#: catalog/aclchk.c:2467 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" - это не домен"
-
-#: catalog/aclchk.c:2653
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "нераспознанное право: \"%s\""
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "нет доступа к агрегату %s"
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "нет доступа к правилу сортировки %s"
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "нет доступа к столбцу %s"
 
-#: catalog/aclchk.c:2729
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "нет доступа к преобразованию %s"
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "нет доступа к базе данных %s"
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "нет доступа к домену %s"
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "нет доступа к событийному триггеру %s"
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "нет доступа к расширению %s"
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "нет доступа к обёртке сторонних данных %s"
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "нет доступа к стороннему серверу %s"
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "нет доступа к сторонней таблице %s"
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "нет доступа к функции %s"
 
-#: catalog/aclchk.c:2756
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "нет доступа к индексу %s"
 
-#: catalog/aclchk.c:2759
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "нет доступа к языку %s"
 
-#: catalog/aclchk.c:2762
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "нет доступа к большому объекту %s"
 
-#: catalog/aclchk.c:2765
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "нет доступа к материализованному представлению %s"
 
-#: catalog/aclchk.c:2768
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "нет доступа к классу операторов %s"
 
-#: catalog/aclchk.c:2771
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "нет доступа к оператору %s"
 
-#: catalog/aclchk.c:2774
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "нет доступа к семейству операторов %s"
 
-#: catalog/aclchk.c:2777
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "нет доступа к параметру %s"
 
-#: catalog/aclchk.c:2780
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "нет доступа к политике %s"
 
-#: catalog/aclchk.c:2783
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "нет доступа к процедуре %s"
 
-#: catalog/aclchk.c:2786
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "нет доступа к публикации %s"
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "нет доступа к подпрограмме %s"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "нет доступа к схеме %s"
 
-#: catalog/aclchk.c:2795 commands/sequence.c:654 commands/sequence.c:880
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880
 #: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
-#: commands/sequence.c:1799
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "нет доступа к последовательности %s"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "нет доступа к объекту статистики %s"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "нет доступа к подписке %s"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "нет доступа к таблице %s"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "нет доступа к табличному пространству %s"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "нет доступа к конфигурации текстового поиска %s"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "нет доступа к словарю текстового поиска %s"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "нет доступа к типу %s"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "нет доступа к представлению %s"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "нужно быть владельцем агрегата %s"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "нужно быть владельцем правила сортировки %s"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "нужно быть владельцем преобразования %s"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "нужно быть владельцем базы %s"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "нужно быть владельцем домена %s"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "нужно быть владельцем событийного триггера %s"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "нужно быть владельцем расширения %s"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "нужно быть владельцем обёртки сторонних данных %s"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "нужно быть \"владельцем\" стороннего сервера %s"
 
-#: catalog/aclchk.c:2882
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "нужно быть владельцем сторонней таблицы %s"
 
-#: catalog/aclchk.c:2885
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "нужно быть владельцем функции %s"
 
-#: catalog/aclchk.c:2888
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "нужно быть владельцем индекса %s"
 
-#: catalog/aclchk.c:2891
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "нужно быть владельцем языка %s"
 
-#: catalog/aclchk.c:2894
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "нужно быть владельцем большого объекта %s"
 
-#: catalog/aclchk.c:2897
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "нужно быть владельцем материализованного представления %s"
 
-#: catalog/aclchk.c:2900
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "нужно быть владельцем класса операторов %s"
 
-#: catalog/aclchk.c:2903
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "нужно быть владельцем оператора %s"
 
-#: catalog/aclchk.c:2906
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "нужно быть владельцем семейства операторов %s"
 
-#: catalog/aclchk.c:2909
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "нужно быть владельцем процедуры %s"
 
-#: catalog/aclchk.c:2912
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "нужно быть владельцем публикации %s"
 
-#: catalog/aclchk.c:2915
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "нужно быть владельцем подпрограммы %s"
 
-#: catalog/aclchk.c:2918
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "нужно быть владельцем последовательности %s"
 
-#: catalog/aclchk.c:2921
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "нужно быть владельцем подписки %s"
 
-#: catalog/aclchk.c:2924
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "нужно быть владельцем таблицы %s"
 
-#: catalog/aclchk.c:2927
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "нужно быть владельцем типа %s"
 
-#: catalog/aclchk.c:2930
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "нужно быть владельцем представления %s"
 
-#: catalog/aclchk.c:2933
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "нужно быть владельцем схемы %s"
 
-#: catalog/aclchk.c:2936
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "нужно быть владельцем объекта статистики %s"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "нужно быть владельцем табличного пространства %s"
 
-#: catalog/aclchk.c:2942
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "нужно быть владельцем конфигурации текстового поиска %s"
 
-#: catalog/aclchk.c:2945
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "нужно быть владельцем словаря текстового поиска %s"
 
-#: catalog/aclchk.c:2959
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "нужно быть владельцем отношения %s"
 
-#: catalog/aclchk.c:3005
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "нет доступа к столбцу \"%s\" отношения \"%s\""
 
-#: catalog/aclchk.c:3162 catalog/aclchk.c:4170 catalog/aclchk.c:4201
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s с OID %u не существует"
-
-#: catalog/aclchk.c:3245 catalog/aclchk.c:3264
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "атрибут %d отношения с OID %u не существует"
 
-#: catalog/aclchk.c:3302 catalog/aclchk.c:3365 catalog/aclchk.c:4004
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "отношение с OID %u не существует"
 
-#: catalog/aclchk.c:3550
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "ACL параметра с OID %u не существует"
 
-#: catalog/aclchk.c:3723 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "большой объект %u не существует"
+
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "схема с OID %u не существует"
 
-#: catalog/aclchk.c:3797 catalog/aclchk.c:3824 catalog/aclchk.c:3853
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "тип с OID %u не существует"
 
-#: catalog/catalog.c:477
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "продолжается поиск неиспользованного OID в отношении \"%s\""
 
-#: catalog/catalog.c:479
+#: catalog/catalog.c:506
 #, c-format
 msgid ""
-"OID candidates have been checked %llu time, but no unused OID has been found "
-"yet."
+"OID candidates have been checked %<PRIu64> time, but no unused OID has been "
+"found yet."
 msgid_plural ""
-"OID candidates have been checked %llu times, but no unused OID has been "
+"OID candidates have been checked %<PRIu64> times, but no unused OID has been "
 "found yet."
 msgstr[0] ""
-"Потенциальные OID были проверены %llu раз, но неиспользуемые OID ещё не были "
-"найдены."
-msgstr[1] ""
-"Потенциальные OID были проверены %llu раза, но неиспользуемые OID ещё не "
+"Потенциальные OID были проверены %<PRIu64> раз, но неиспользуемые OID ещё не "
 "были найдены."
+msgstr[1] ""
+"Потенциальные OID были проверены %<PRIu64> раза, но неиспользуемые OID ещё "
+"не были найдены."
 msgstr[2] ""
-"Потенциальные OID были проверены %llu раз, но неиспользуемые OID ещё не были "
-"найдены."
+"Потенциальные OID были проверены %<PRIu64> раз, но неиспользуемые OID ещё не "
+"были найдены."
 
-#: catalog/catalog.c:504
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "новый OID был назначен в отношении \"%s\" после %llu попытки"
-msgstr[1] "новый OID был назначен в отношении \"%s\" после %llu попыток"
-msgstr[2] "новый OID был назначен в отношении \"%s\" после %llu попыток"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural ""
+"new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "новый OID был назначен в отношении \"%s\" после %<PRIu64> попытки"
+msgstr[1] "новый OID был назначен в отношении \"%s\" после %<PRIu64> попыток"
+msgstr[2] "новый OID был назначен в отношении \"%s\" после %<PRIu64> попыток"
 
-#: catalog/catalog.c:637 catalog/catalog.c:704
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "вызывать %s() может только суперпользователь"
 
-#: catalog/catalog.c:646
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() можно использовать только для системных каталогов"
 
-#: catalog/catalog.c:651 parser/parse_utilcmd.c:2270
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "индекс \"%s\" не принадлежит таблице \"%s\""
 
-#: catalog/catalog.c:668
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "столбец \"%s\" имеет тип не oid"
 
-#: catalog/catalog.c:675
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "индекс \"%s\" не является индексом столбца \"%s\""
@@ -5492,20 +5488,6 @@ msgstr[2] ""
 msgid "cannot drop %s because other objects depend on it"
 msgstr "удалить объект %s нельзя, так как от него зависят другие объекты"
 
-#: catalog/dependency.c:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1459
-#: commands/tablecmds.c:15088 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 executor/execExprInterp.c:4655
-#: executor/execExprInterp.c:4663 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1432 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6825
-#: utils/misc/guc.c:6859 utils/misc/guc.c:6893 utils/misc/guc.c:6936
-#: utils/misc/guc.c:6978
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -5530,56 +5512,82 @@ msgstr[2] "удаление распространяется на ещё %d об
 msgid "constant of the type %s cannot be used here"
 msgstr "константу типа %s здесь использовать нельзя"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "на переходную таблицу \"%s\" нельзя ссылаться в постоянном объекте"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:224
+#: statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "столбец %d отношения \"%s\" не существует"
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "нет прав для создания отношения \"%s.%s\""
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Изменение системного каталога в текущем состоянии запрещено."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2495 commands/tablecmds.c:2917
-#: commands/tablecmds.c:7163
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014
+#: commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "максимальное число столбцов в таблице: %d"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7432
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "имя столбца \"%s\" конфликтует с системным столбцом"
 
-#: catalog/heap.c:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "имя столбца \"%s\" указано неоднократно"
 
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:579
+#: catalog/heap.c:575
 #, c-format
 msgid "partition key column %s has pseudo-type %s"
 msgstr "столбец \"%s\" ключа разбиения имеет псевдотип %s"
 
-#: catalog/heap.c:584
+#: catalog/heap.c:580
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "столбец \"%s\" имеет псевдотип %s"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:595
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "виртуальный генерируемый столбец \"%s\" не может иметь доменный тип"
+
+#: catalog/heap.c:622
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "составной тип %s не может содержать себя же"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr ""
+"виртуальный генерируемый столбец \"%s\" не может иметь пользовательский тип"
+
+#: catalog/heap.c:674 catalog/heap.c:3295
+#, c-format
+msgid ""
+"Virtual generated columns that make use of user-defined types are not yet "
+"supported."
+msgstr ""
+"Виртуальные генерируемые столбцы, использующие пользовательские типы, на "
+"данный момент не поддерживаются."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:686
 #, c-format
 msgid ""
 "no collation was derived for partition key column %s with collatable type %s"
@@ -5587,28 +5595,28 @@ msgstr ""
 "для входящего в ключ разбиения столбца \"%s\" с сортируемым типом %s не "
 "удалось получить правило сортировки"
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:505
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
 "для столбца \"%s\" с сортируемым типом %s не удалось получить правило "
 "сортировки"
 
-#: catalog/heap.c:1161 catalog/index.c:899 commands/createas.c:401
-#: commands/tablecmds.c:4171
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "отношение \"%s\" уже существует"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "тип \"%s\" уже существует"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1196
 #, c-format
 msgid ""
 "A relation has an associated type of the same name, so you must use a name "
@@ -5617,54 +5625,59 @@ msgstr ""
 "С отношением уже связан тип с таким же именем; выберите имя, не "
 "конфликтующее с существующими типами."
 
-#: catalog/heap.c:1218
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr ""
 "значение relfilenumber для TOAST не задано в режиме двоичного обновления"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "значение OID кучи в pg_class не задано в режиме двоичного обновления"
 
-#: catalog/heap.c:1239
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "значение relfilenumber не задано в режиме двоичного обновления"
 
-#: catalog/heap.c:2130
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr ""
 "добавить ограничение NO INHERIT к секционированной таблице \"%s\" нельзя"
 
-#: catalog/heap.c:2402
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "ограничение-проверка \"%s\" уже существует"
 
-#: catalog/heap.c:2574 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9356
+#: catalog/heap.c:2626 catalog/heap.c:2947
+#, c-format
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "добавить ограничение NOT NULL для системного столбца \"%s\" нельзя"
+
+#: catalog/heap.c:2654 catalog/heap.c:2780 catalog/heap.c:3031
+#: catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9821
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "ограничение \"%s\" для отношения \"%s\" уже существует"
 
-#: catalog/heap.c:2581
+#: catalog/heap.c:2787
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr ""
 "ограничение \"%s\" конфликтует с ненаследуемым ограничением таблицы \"%s\""
 
-#: catalog/heap.c:2592
+#: catalog/heap.c:2798
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr ""
 "ограничение \"%s\" конфликтует с наследуемым ограничением таблицы \"%s\""
 
-#: catalog/heap.c:2602
+#: catalog/heap.c:2808
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
@@ -5672,71 +5685,123 @@ msgstr ""
 "ограничение \"%s\" конфликтует с непроверенным (NOT VALID) ограничением "
 "таблицы \"%s\""
 
-#: catalog/heap.c:2607
+#: catalog/heap.c:2820
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
+msgstr ""
+"ограничение \"%s\" конфликтует с неконтролируемым (NOT ENFORCED) "
+"ограничением таблицы \"%s\""
+
+#: catalog/heap.c:2825
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "слияние ограничения \"%s\" с унаследованным определением"
 
-#: catalog/heap.c:2633 catalog/pg_constraint.c:853 commands/tablecmds.c:3074
-#: commands/tablecmds.c:3377 commands/tablecmds.c:7089
-#: commands/tablecmds.c:15907 commands/tablecmds.c:16038
+#: catalog/heap.c:2849 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154
+#: commands/tablecmds.c:3179 commands/tablecmds.c:3499
+#: commands/tablecmds.c:7286 commands/tablecmds.c:7967
+#: commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "слишком много родителей в иерархии наследования"
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:2966 parser/parse_utilcmd.c:2655
+#, c-format
+msgid ""
+"conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr ""
+"конфликтующее объявление NO INHERIT для ограничения NOT NULL столбца \"%s\""
+
+#: catalog/heap.c:2980
+#, c-format
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "конфликтующие имена ограничений NOT NULL \"%s\" и \"%s\""
+
+#: catalog/heap.c:3010
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr ""
+"добавить ограничение NOT NULL со свойством NO INHERIT для столбца \"%s\" "
+"нельзя"
+
+#: catalog/heap.c:3012
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "Столбец имеет наследуемое ограничение NOT NULL."
+
+#: catalog/heap.c:3202
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr ""
 "использовать генерируемый столбец \"%s\" в выражении генерируемого столбца "
 "нельзя"
 
-#: catalog/heap.c:2719
+#: catalog/heap.c:3204
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr ""
 "Генерируемый столбец не может ссылаться на другой генерируемый столбец."
 
-#: catalog/heap.c:2725
+#: catalog/heap.c:3210
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr ""
 "в выражении генерируемого столбца нельзя использовать переменные «вся строка»"
 
-#: catalog/heap.c:2726
+#: catalog/heap.c:3211
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr ""
 "Это сделало бы генерируемый столбец зависимым от собственного значения."
 
-#: catalog/heap.c:2781
+#: catalog/heap.c:3278
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "генерирующее выражение использует пользовательскую функцию"
+
+#: catalog/heap.c:3279
+#, c-format
+msgid ""
+"Virtual generated columns that make use of user-defined functions are not "
+"yet supported."
+msgstr ""
+"Виртуальные генерируемые столбцы, использующие пользовательские функции, на "
+"данный момент не поддерживаются."
+
+#: catalog/heap.c:3294
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "генерирующее выражение использует пользовательский тип"
+
+#: catalog/heap.c:3346
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "генерирующее выражение не является постоянным"
 
-#: catalog/heap.c:2809 rewrite/rewriteHandler.c:1276
+#: catalog/heap.c:3378 rewrite/rewriteHandler.c:1288
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "столбец \"%s\" имеет тип %s, но тип выражения по умолчанию %s"
 
-#: catalog/heap.c:2814 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1281
+#: catalog/heap.c:3383 commands/prepare.c:334 parser/analyze.c:2906
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Перепишите выражение или преобразуйте его тип."
 
-#: catalog/heap.c:2861
+#: catalog/heap.c:3430
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "в ограничении-проверке можно ссылаться только на таблицу \"%s\""
 
-#: catalog/heap.c:3167
+#: catalog/heap.c:3736
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "неподдерживаемое сочетание внешнего ключа с ON COMMIT"
 
-#: catalog/heap.c:3168
+#: catalog/heap.c:3737
 #, c-format
 msgid ""
 "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
@@ -5744,118 +5809,118 @@ msgid ""
 msgstr ""
 "Таблица \"%s\" ссылается на \"%s\", и для них задан разный режим ON COMMIT."
 
-#: catalog/heap.c:3173
+#: catalog/heap.c:3742
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "опустошить таблицу, на которую ссылается внешний ключ, нельзя"
 
-#: catalog/heap.c:3174
+#: catalog/heap.c:3743
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Таблица \"%s\" ссылается на \"%s\"."
 
-#: catalog/heap.c:3176
+#: catalog/heap.c:3745
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr ""
 "Опустошите таблицу \"%s\" параллельно или используйте TRUNCATE ... CASCADE."
 
-#: catalog/index.c:219 parser/parse_utilcmd.c:2176
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "таблица \"%s\" не может иметь несколько первичных ключей"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "для первичных ключей нельзя использовать индексы с NULLS NOT DISTINCT"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "первичные ключи не могут быть выражениями"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "столбец первичного ключа \"%s\" не помечен как NOT NULL"
 
-#: catalog/index.c:798 catalog/index.c:1915
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr ""
 "пользовательские индексы в таблицах системного каталога не поддерживаются"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr ""
 "недетерминированные правила сортировки не поддерживаются для класса "
 "операторов \"%s\""
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr ""
 "параллельное создание индекса в таблицах системного каталога не "
 "поддерживается"
 
-#: catalog/index.c:862 catalog/index.c:1331
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr ""
 "параллельное создание индекса для ограничений-исключений не поддерживается"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr "нельзя создать разделяемые индексы после initdb"
 
-#: catalog/index.c:891 commands/createas.c:416 commands/sequence.c:159
-#: parser/parse_utilcmd.c:209
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "отношение \"%s\" уже существует, пропускается"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr ""
 "значение OID индекса в pg_class не задано в режиме двоичного обновления"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3791
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr ""
 "значение relfilenumber для индекса не задано в режиме двоичного обновления"
 
-#: catalog/index.c:2214
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY должен быть первым действием в транзакции"
 
-#: catalog/index.c:3668
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "переиндексировать временные таблицы других сеансов нельзя"
 
-#: catalog/index.c:3679 commands/indexcmds.c:3626
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "перестроить нерабочий индекс в таблице TOAST нельзя"
 
-#: catalog/index.c:3695 commands/indexcmds.c:3504 commands/indexcmds.c:3650
-#: commands/tablecmds.c:3581
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815
+#: commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "переместить системную таблицу \"%s\" нельзя"
 
-#: catalog/index.c:3832
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "индекс \"%s\" был перестроен"
 
-#: catalog/index.c:3998
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr ""
@@ -5863,7 +5928,7 @@ msgstr ""
 "пропускается"
 
 #: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
-#: commands/trigger.c:5729
+#: commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "ссылки между базами не реализованы: \"%s.%s.%s\""
@@ -5883,19 +5948,19 @@ msgstr "не удалось получить блокировку таблицы
 msgid "could not obtain lock on relation \"%s\""
 msgstr "не удалось получить блокировку таблицы \"%s\""
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "отношение \"%s.%s\" не существует"
 
-#: catalog/namespace.c:638 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "отношение \"%s\" не существует"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1933
+#: commands/extension.c:1939
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "схема для создания объектов не выбрана"
@@ -5920,325 +5985,332 @@ msgstr "во временных схемах можно создавать то
 msgid "statistics object \"%s\" does not exist"
 msgstr "объект статистики \"%s\" не существует"
 
-#: catalog/namespace.c:2761
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "анализатор текстового поиска \"%s\" не существует"
 
-#: catalog/namespace.c:2906 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "словарь текстового поиска \"%s\" не существует"
 
-#: catalog/namespace.c:3052
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "шаблон текстового поиска \"%s\" не существует"
 
-#: catalog/namespace.c:3197 commands/tsearchcmds.c:1168
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168
 #: utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "конфигурация текстового поиска \"%s\" не существует"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:868 parser/parse_target.c:1259
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ссылки между базами не реализованы: %s"
 
-#: catalog/namespace.c:3335 parser/parse_expr.c:875 parser/parse_target.c:1266
-#: gram.y:19181 gram.y:19221
+#: catalog/namespace.c:3338 parser/parse_expr.c:874 parser/parse_target.c:1269
+#: gram.y:19355 gram.y:19395
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное имя (слишком много компонентов): %s"
 
-#: catalog/namespace.c:3465
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "перемещать объекты в/из внутренних схем нельзя"
 
-#: catalog/namespace.c:3471
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "перемещать объекты в/из схем TOAST нельзя"
 
-#: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1404 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344
+#: commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "схема \"%s\" не существует"
 
-#: catalog/namespace.c:3575
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "неверное имя отношения (слишком много компонентов): %s"
 
-#: catalog/namespace.c:4016 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "правило сортировки \"%s\" для кодировки \"%s\" не существует"
 
-#: catalog/namespace.c:4071
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "преобразование \"%s\" не существует"
 
-#: catalog/namespace.c:4412
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "нет прав для создания временных таблиц в базе \"%s\""
 
-#: catalog/namespace.c:4428
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "создавать временные таблицы в процессе восстановления нельзя"
 
-#: catalog/namespace.c:4434
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "создавать временные таблицы во время параллельных операций нельзя"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2327
-#: commands/tablecmds.c:12925
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387
+#: commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" - это не таблица"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17851 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" - это не представление"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:199 commands/tablecmds.c:275
-#: commands/tablecmds.c:17856
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" - это не материализованное представление"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17861
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" - это не сторонняя таблица"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "необходимо указать имя отношения и объекта"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "имя столбца нужно указать в полной форме"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr ""
 "значение по умолчанию для столбца \"%s\" отношения \"%s\" не существует"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "тип \"%s\" не существует"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" - это не домен"
+
+#: catalog/objectaddress.c:1742
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "оператор %d (%s, %s) из семейства %s не существует"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "функция %d (%s, %s) из семейства %s не существует"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "сопоставление для пользователя \"%s\" на сервере \"%s\" не существует"
 
-#: catalog/objectaddress.c:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1004 commands/foreigncmds.c:1367
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "сервер \"%s\" не существует"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "публикуемое отношение \"%s\" в публикации \"%s\" не существует"
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "публикуемая схема \"%s\" в публикации \"%s\" не существует"
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "нераспознанный тип объекта ACL по умолчанию: \"%c\""
 
-#: catalog/objectaddress.c:2007
+#: catalog/objectaddress.c:2015
 #, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
-msgstr "Допустимые типы объектов: \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgstr ""
+"Допустимые типы объектов: \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr ""
 "ACL по умолчанию для пользователя \"%s\" в схеме \"%s\" для объекта %s не "
 "существует"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr ""
 "ACL по умолчанию для пользователя \"%s\" и для объекта %s не существует"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "списки имён и аргументов не должны содержать NULL"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "неподдерживаемый тип объекта: \"%s\""
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "длина списка имён должна быть равна %d"
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "OID большого объекта не может быть NULL"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "длина списка аргументов должна быть не меньше %d"
 
-#: catalog/objectaddress.c:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "длина списка аргументов должна быть равна %d"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "нужно быть владельцем большого объекта %u"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "это разрешено только владельцу типа %s или %s"
 
-#: catalog/objectaddress.c:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "нет доступа"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "Текущий пользователь должен иметь атрибут %s."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "Текущий пользователь должен иметь привилегию %s для роли \"%s\"."
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "требуются права суперпользователя"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "нераспознанный тип объекта \"%s\""
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2928
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr "столбец %s отношения %s"
 
-#: catalog/objectaddress.c:2943
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "функция %s"
 
-#: catalog/objectaddress.c:2956
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "тип %s"
 
-#: catalog/objectaddress.c:2993
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "приведение %s к %s"
 
-#: catalog/objectaddress.c:3026
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "правило сортировки %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3057
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "ограничение %s в отношении %s"
 
-#: catalog/objectaddress.c:3063
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "ограничение %s"
 
-#: catalog/objectaddress.c:3095
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "преобразование %s"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3117
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "значение по умолчанию для %s"
 
-#: catalog/objectaddress.c:3128
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "язык %s"
 
-#: catalog/objectaddress.c:3136
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "большой объект %u"
 
-#: catalog/objectaddress.c:3149
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "оператор %s"
 
-#: catalog/objectaddress.c:3186
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "класс операторов %s для метода доступа %s"
 
-#: catalog/objectaddress.c:3214
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "метод доступа %s"
@@ -6247,7 +6319,7 @@ msgstr "метод доступа %s"
 #. 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:3269
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "оператор %d (%s, %s) из семейства \"%s\": %s"
@@ -6256,241 +6328,246 @@ msgstr "оператор %d (%s, %s) из семейства \"%s\": %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3334
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "функция %d (%s, %s) из семейства \"%s\": %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3388
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "правило %s для отношения %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3434
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "триггер %s в отношении %s"
 
-#: catalog/objectaddress.c:3454
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "схема %s"
 
-#: catalog/objectaddress.c:3482
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "объект статистики %s"
 
-#: catalog/objectaddress.c:3513
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "анализатор текстового поиска %s"
 
-#: catalog/objectaddress.c:3544
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "словарь текстового поиска %s"
 
-#: catalog/objectaddress.c:3575
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "шаблон текстового поиска %s"
 
-#: catalog/objectaddress.c:3606
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "конфигурация текстового поиска %s"
 
-#: catalog/objectaddress.c:3619
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "роль %s"
 
-#: catalog/objectaddress.c:3656 catalog/objectaddress.c:5505
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "членство роли %s в роли %s"
 
-#: catalog/objectaddress.c:3677
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "база данных %s"
 
-#: catalog/objectaddress.c:3693
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "табличное пространство %s"
 
-#: catalog/objectaddress.c:3704
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "обёртка сторонних данных %s"
 
-#: catalog/objectaddress.c:3714
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "сервер %s"
 
-#: catalog/objectaddress.c:3747
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "сопоставление для пользователя %s на сервере %s"
 
-#: catalog/objectaddress.c:3799
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr ""
 "права по умолчанию для новых отношений, принадлежащих роли %s в схеме %s"
 
-#: catalog/objectaddress.c:3803
+#: catalog/objectaddress.c:3812
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "права по умолчанию для новых отношений, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3809
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr ""
 "права по умолчанию для новых последовательностей, принадлежащих роли %s в "
 "схеме %s"
 
-#: catalog/objectaddress.c:3813
+#: catalog/objectaddress.c:3822
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr ""
 "права по умолчанию для новых последовательностей, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3819
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "права по умолчанию для новых функций, принадлежащих роли %s в схеме %s"
 
-#: catalog/objectaddress.c:3823
+#: catalog/objectaddress.c:3832
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "права по умолчанию для новых функций, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3829
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr "права по умолчанию для новых типов, принадлежащих роли %s в схеме %s"
 
-#: catalog/objectaddress.c:3833
+#: catalog/objectaddress.c:3842
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "права по умолчанию для новых типов, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3839
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "права по умолчанию для новых схем, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3846
+#: catalog/objectaddress.c:3854
+#, c-format
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "права по умолчанию для новых больших объектов, принадлежащих роли %s"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr ""
 "права по умолчанию для новых объектов, принадлежащих роли %s в схеме %s"
 
-#: catalog/objectaddress.c:3850
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "права по умолчанию для новых объектов, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "расширение %s"
 
-#: catalog/objectaddress.c:3889
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "событийный триггер %s"
 
-#: catalog/objectaddress.c:3913
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "параметр %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3956
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "политика %s отношения %s"
 
-#: catalog/objectaddress.c:3970
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "публикация %s"
 
-#: catalog/objectaddress.c:3983
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "публикация схемы %s в публикации %s"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:4014
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "публикуемое отношение %s в публикации %s"
 
-#: catalog/objectaddress.c:4027
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "подписка %s"
 
-#: catalog/objectaddress.c:4048
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "преобразование для %s, языка %s"
 
-#: catalog/objectaddress.c:4117
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "таблица %s"
 
-#: catalog/objectaddress.c:4122
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "индекс %s"
 
-#: catalog/objectaddress.c:4126
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "последовательность %s"
 
-#: catalog/objectaddress.c:4130
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "TOAST-таблица %s"
 
-#: catalog/objectaddress.c:4134
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "представление %s"
 
-#: catalog/objectaddress.c:4138
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "материализованное представление %s"
 
-#: catalog/objectaddress.c:4142
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "составной тип %s"
 
-#: catalog/objectaddress.c:4146
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "сторонняя таблица %s"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "отношение %s"
 
-#: catalog/objectaddress.c:4192
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "семейство операторов %s для метода доступа %s"
@@ -6543,7 +6620,7 @@ msgstr ""
 msgid "return type of inverse transition function %s is not %s"
 msgstr "обратная функция перехода %s должна возвращать тип %s"
 
-#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:2991
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3057
 #, c-format
 msgid ""
 "strictness of aggregate's forward and inverse transition functions must match"
@@ -6562,7 +6639,7 @@ msgstr ""
 msgid "return type of combine function %s is not %s"
 msgstr "комбинирующая функция %s должна возвращать тип %s"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr ""
@@ -6579,12 +6656,12 @@ msgstr "функция сериализации %s должна возвраща
 msgid "return type of deserialization function %s is not %s"
 msgstr "функция десериализации %s должна возвращать тип %s"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "не удалось определить тип результата"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "небезопасное использование псевдотипа \"internal\""
@@ -6605,55 +6682,55 @@ msgstr ""
 "оператор сортировки можно указать только для агрегатных функций с одним "
 "аргументом"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "тип подпрограммы изменить нельзя"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "\"%s\" — обычная агрегатная функция."
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "\"%s\" — сортирующая агрегатная функция."
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "\"%s\" — гипотезирующая агрегатная функция."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "изменить число непосредственных аргументов агрегатной функции нельзя"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "функция %s не существует"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "функция %s возвращает множество"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr ""
 "для использования в этой агрегатной функции функция %s должна принимать "
 "VARIADIC ANY"
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "функции %s требуется приведение типов во время выполнения"
@@ -6734,21 +6811,70 @@ msgstr "правило сортировки \"%s\" уже существует"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "правило сортировки \"%s\" для кодировки \"%s\" уже существует"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7952
+#, c-format
+msgid ""
+"cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation "
+"\"%s\""
+msgstr ""
+"изменить статус NO INHERIT ограничения NOT NULL \"%s\" для отношения \"%s\" "
+"нельзя"
+
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9584
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr ""
+"Возможно, существующее ограничение нужно сделать наследуемым, выполнив %s."
+
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8301
+#, c-format
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr ""
+"несовместимое непроверенное (NOT VALID) ограничение \"%s\" в отношении \"%s\""
+
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8303
+#: commands/tablecmds.c:9596
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "Возможно, следует проверить его, выполнив %s."
+
+#: catalog/pg_constraint.c:792
+#, c-format
+msgid ""
+"cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr ""
+"создать ограничение NOT NULL \"%s\" для столбца \"%s\" таблицы \"%s\" нельзя"
+
+#: catalog/pg_constraint.c:794
+#, c-format
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "Ограничение-проверка NOT NULL \"%s\" для этого столбца уже существует."
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "ограничение \"%s\" для домена %s уже существует"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "ограничение \"%s\" для таблицы \"%s\" не существует"
 
-#: catalog/pg_constraint.c:1125
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "ограничение \"%s\" для домена %s не существует"
 
+#: catalog/pg_constraint.c:1681
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "неправильный тип для компонента PERIOD внешнего ключа"
+
+#: catalog/pg_constraint.c:1682
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "Поддерживаются только диапазоны и мультидиапазоны."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -6759,23 +6885,23 @@ msgstr "преобразование \"%s\" уже существует"
 msgid "default conversion for %s to %s already exists"
 msgstr "преобразование по умолчанию из %s в %s уже существует"
 
-#: catalog/pg_depend.c:224 commands/extension.c:3397
+#: catalog/pg_depend.c:225 commands/extension.c:3818
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s уже относится к расширению \"%s\""
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:232 catalog/pg_depend.c:283 commands/extension.c:3858
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s не относится к расширению \"%s\""
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:235
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr ""
 "Расширениям не разрешается заменять объекты, которые им не принадлежат."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:286
 #, c-format
 msgid ""
 "An extension may only use CREATE ... IF NOT EXISTS to skip object creation "
@@ -6784,7 +6910,7 @@ msgstr ""
 "Расширение может выполнять CREATE ... IF NOT EXISTS только для того, чтобы "
 "не создавать объект, когда оно уже владеет конфликтующим объектом."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:649
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr ""
@@ -6840,8 +6966,8 @@ msgstr ""
 "Эта секция отсоединяется параллельно или для неё не была завершена операция "
 "отсоединения."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4800
-#: commands/tablecmds.c:16153
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916
+#: commands/tablecmds.c:17891
 #, c-format
 msgid ""
 "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending "
@@ -6875,7 +7001,7 @@ msgstr "имя \"%s\" недопустимо для оператора"
 msgid "operator %s already exists"
 msgstr "оператор %s уже существует"
 
-#: catalog/pg_operator.c:445 commands/operatorcmds.c:600
+#: catalog/pg_operator.c:445 commands/operatorcmds.c:633
 #, c-format
 msgid "operator cannot be its own negator"
 msgstr "оператор не может быть обратным к себе"
@@ -6956,7 +7082,7 @@ msgstr "обратный оператор %s уже является обрат
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "ACL параметра \"%s\" не существует"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
@@ -6964,37 +7090,37 @@ msgstr[0] "функции не могут иметь больше %d аргум
 msgstr[1] "функции не могут иметь больше %d аргументов"
 msgstr[2] "функции не могут иметь больше %d аргументов"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "функция \"%s\" с аргументами таких типов уже существует"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "\"%s\" — агрегатная функция."
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "\"%s\" — функция."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "\"%s\" — процедура."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "\"%s\" — оконная функция."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "определить выходные параметры для процедуры нельзя"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "изменить тип возврата существующей функции нельзя"
@@ -7003,113 +7129,114 @@ msgstr "изменить тип возврата существующей фун
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "Сначала выполните %s %s."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "Параметры OUT определяют другой тип строки."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "изменить имя входного параметра \"%s\" нельзя"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr ""
 "для существующей функции нельзя убрать значения параметров по умолчанию"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr ""
 "для существующего значения параметра по умолчанию нельзя изменить тип данных"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "встроенной функции \"%s\" нет"
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL-функции не могут возвращать тип %s"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-функции не могут иметь аргументы типа %s"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1468
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "SQL-функция \"%s\""
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "добавить отношение \"%s\" в публикацию нельзя"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "Эта операция не поддерживается для системных таблиц."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "Эта операция не поддерживается для временных таблиц."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "Эта операция не поддерживается для нежурналируемых таблиц."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "добавить схему \"%s\" в публикацию нельзя"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "Эта операция не поддерживается для системных схем."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "Временные схемы нельзя реплицировать."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "отношение \"%s\" уже включено в публикацию \"%s\""
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr ""
 "в списке публикуемых столбцов нельзя использовать системный столбец \"%s\""
 
-#: catalog/pg_publication.c:540
+#: catalog/pg_publication.c:582
 #, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
 msgstr ""
-"в списке публикуемых столбцов нельзя использовать генерируемый столбец \"%s\""
+"в списке публикуемых столбцов нельзя использовать виртуальный генерируемый "
+"столбец \"%s\""
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "в списке публикуемых столбцов повторяется столбец \"%s\""
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "схема \"%s\" уже включена в публикацию \"%s\""
@@ -7199,12 +7326,12 @@ msgstr ""
 "изменить владельца объектов, принадлежащих роли %s, нельзя, так как они "
 "нужны системе баз данных"
 
-#: catalog/pg_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "удалить сопоставление отношений для подписки \"%s\" не получилось"
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid ""
 "Table synchronization for relation \"%s\" is in progress and is in state "
@@ -7214,7 +7341,7 @@ msgstr "Выполняется синхронизация отношения \"%
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid ""
 "Use %s to enable subscription if not already enabled or use %s to drop the "
@@ -7251,7 +7378,7 @@ msgstr "внутренний размер %d не подходит для тип
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "выравнивание \"%c\" не подходит для типа переменной длины"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "для типов постоянного размера применим только режим хранения PLAIN"
@@ -7270,10 +7397,10 @@ msgstr ""
 "Имя мультидиапазонного типа можно указать вручную, воспользовавшись "
 "атрибутом \"multirange_type_name\"."
 
-#: catalog/storage.c:533 storage/buffer/bufmgr.c:1540
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "неверная страница в блоке %u отношения %s"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "некорректная страница в блоке %u отношения \"%s\""
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -7360,7 +7487,7 @@ msgid ""
 "must specify both or neither of serialization and deserialization functions"
 msgstr "функции сериализации и десериализации должны задаваться совместно"
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr ""
@@ -7373,17 +7500,17 @@ msgstr ""
 "параметр \"%s\" должен иметь характеристику READ_ONLY, SHAREABLE или "
 "READ_WRITE"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "событийный триггер \"%s\" уже существует"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "обёртка сторонних данных \"%s\" уже существует"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "сервер \"%s\" уже существует"
@@ -7393,12 +7520,12 @@ msgstr "сервер \"%s\" уже существует"
 msgid "language \"%s\" already exists"
 msgstr "язык \"%s\" уже существует"
 
-#: commands/alter.c:95 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "публикация \"%s\" уже существует"
 
-#: commands/alter.c:98 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "подписка \"%s\" уже существует"
@@ -7438,16 +7565,16 @@ msgstr "конфигурация текстового поиска \"%s\" уже
 msgid "must be superuser to rename %s"
 msgstr "переименовать \"%s\" может только суперпользователь"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "задать password_required=false может только суперпользователь"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid ""
 "Subscriptions with the password_required option set to false may only be "
@@ -7456,7 +7583,7 @@ msgstr ""
 "Подписки с параметром password_required option, равным false, могут "
 "создавать или изменять только суперпользователи."
 
-#: commands/alter.c:735
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "для назначения схемы объекта %s нужно быть суперпользователем"
@@ -7476,7 +7603,7 @@ msgstr "Для создания метода доступа нужно быть
 msgid "access method \"%s\" already exists"
 msgstr "метод доступа \"%s\" уже существует"
 
-#: commands/amcmds.c:154 commands/indexcmds.c:224 commands/indexcmds.c:850
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
 #: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
@@ -7487,46 +7614,51 @@ msgstr "метод доступа \"%s\" не существует"
 msgid "handler function is not specified"
 msgstr "не указана функция-обработчик"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:204
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "функция %s должна возвращать тип %s"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "\"%s\" пропускается --- анализировать эту стороннюю таблицу нельзя"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr ""
 "\"%s\" пропускается --- анализировать не таблицы или специальные системные "
 "таблицы нельзя"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "анализируется дерево наследования \"%s.%s\""
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "анализируется \"%s.%s\""
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "столбец \"%s\" отношения \"%s\" указан неоднократно"
 
-#: commands/analyze.c:785
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "автоматический анализ таблицы \"%s.%s.%s\"\n"
 
-#: commands/analyze.c:1300
+#: commands/analyze.c:805
+#, c-format
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "закончен анализ таблицы \"%s.%s.%s\"\n"
+
+#: commands/analyze.c:1346
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -7536,7 +7668,7 @@ msgstr ""
 "%.0f, \"мёртвых\" строк: %.0f; строк в выборке: %d, примерное общее число "
 "строк: %.0f"
 
-#: commands/analyze.c:1384
+#: commands/analyze.c:1430
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -7545,7 +7677,7 @@ msgstr ""
 "пропускается анализ дерева наследования \"%s.%s\" --- это дерево "
 "наследования не содержит дочерних таблиц"
 
-#: commands/analyze.c:1482
+#: commands/analyze.c:1528
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -7554,22 +7686,22 @@ msgstr ""
 "пропускается анализ дерева наследования \"%s.%s\" --- это дерево "
 "наследования не содержит анализируемых дочерних таблиц"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "имя канала не может быть пустым"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "слишком длинное имя канала"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "слишком длинная строка сообщения-нагрузки"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid ""
 "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
@@ -7577,7 +7709,7 @@ msgstr ""
 "выполнить PREPARE для транзакции с командами LISTEN, UNLISTEN или NOTIFY "
 "нельзя"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "слишком много уведомлений в очереди NOTIFY"
@@ -7604,42 +7736,44 @@ msgstr ""
 "Очередь NOTIFY можно будет освободить, только когда этот процесс завершит "
 "текущую транзакцию."
 
-#: commands/cluster.c:128
+#: commands/cluster.c:127 commands/dbcommands.c:2356
+#: commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234
+#: commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "нераспознанный параметр CLUSTER: \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "нераспознанный параметр %s \"%s\""
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "кластеризовать временные таблицы других сеансов нельзя"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "таблица \"%s\" ранее не кластеризовалась по какому-либо индексу"
 
-#: commands/cluster.c:191 commands/tablecmds.c:14797 commands/tablecmds.c:16729
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "индекс \"%s\" для таблицы \"%s\" не существует"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "кластеризовать разделяемый каталог нельзя"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "очищать временные таблицы других сеансов нельзя"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16739
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" не является индексом таблицы \"%s\""
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, c-format
 msgid ""
 "cannot cluster on index \"%s\" because access method does not support "
@@ -7647,38 +7781,38 @@ msgid ""
 msgstr ""
 "кластеризация по индексу \"%s\" невозможна, её не поддерживает метод доступа"
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "кластеризовать по частичному индексу \"%s\" нельзя"
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "нельзя кластеризовать таблицу по неверному индексу \"%s\""
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "пометить индекс как кластеризованный в секционированной таблице нельзя"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "кластеризация \"%s.%s\" путём сканирования индекса \"%s\""
 
-#: commands/cluster.c:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr ""
 "кластеризация \"%s.%s\" путём последовательного сканирования и сортировки"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "очистка \"%s.%s\""
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid ""
 "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
@@ -7686,7 +7820,7 @@ msgstr ""
 "\"%s.%s\": найдено удаляемых версий строк: %.0f, неудаляемых: %.0f, "
 "просмотрено страниц: %u"
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7695,7 +7829,7 @@ msgstr ""
 "В данный момент нельзя удалить \"мёртвых\" строк %.0f.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "нет прав для кластеризации отношения \"%s\", оно пропускается"
@@ -7706,13 +7840,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "атрибут COLLATION \"%s\" не распознан"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8129
-#: replication/pgoutput/pgoutput.c:314 replication/pgoutput/pgoutput.c:337
-#: replication/pgoutput/pgoutput.c:351 replication/pgoutput/pgoutput.c:361
-#: replication/pgoutput/pgoutput.c:371 replication/pgoutput/pgoutput.c:381
-#: replication/pgoutput/pgoutput.c:393 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8394
+#: replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372
+#: replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392
+#: replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137
+#: replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420
+#: replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "конфликтующие или избыточные параметры"
@@ -7743,7 +7878,7 @@ msgstr "нераспознанный провайдер правил сорти
 msgid "parameter \"%s\" must be specified"
 msgstr "необходимо указать параметр \"%s\""
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "используется стандартная форма \"%s\" локали ICU \"%s\""
@@ -7754,7 +7889,7 @@ msgid "nondeterministic collations not supported with this provider"
 msgstr ""
 "недетерминированные правила сортировки не поддерживаются данным провайдером"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "правила ICU можно указать, только если выбран провайдер локали ICU"
@@ -7764,70 +7899,71 @@ msgstr "правила ICU можно указать, только если вы
 msgid "current database's encoding is not supported with this provider"
 msgstr "кодировка текущей БД не поддерживается данным провайдером"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr ""
 "правило сортировки \"%s\" для кодировки \"%s\" уже существует в схеме \"%s\""
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "правило сортировки \"%s\" уже существует в схеме \"%s\""
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "нельзя обновить версию правила сортировки по умолчанию"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7905 commands/tablecmds.c:7915
-#: commands/tablecmds.c:7917 commands/tablecmds.c:14499
-#: commands/tablecmds.c:17884 commands/tablecmds.c:17905
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8146 commands/tablecmds.c:8156
+#: commands/tablecmds.c:8158 commands/tablecmds.c:16149
+#: commands/tablecmds.c:19677 commands/tablecmds.c:19698
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "Выполните %s."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2566
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "изменение версии с %s на %s"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2579
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "версия не была изменена"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2749
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "база данных с OID %u не существует"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "правило сортировки с OID %u не существует"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr ""
 "импортировать системные правила сортировки может только суперпользователь"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "пригодные системные локали не найдены"
 
-#: commands/comment.c:61 commands/dbcommands.c:1665 commands/dbcommands.c:1883
-#: commands/dbcommands.c:1995 commands/dbcommands.c:2193
-#: commands/dbcommands.c:2433 commands/dbcommands.c:2526
-#: commands/dbcommands.c:2650 commands/dbcommands.c:3161
-#: utils/init/postinit.c:1034 utils/init/postinit.c:1098
-#: utils/init/postinit.c:1171
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2473 commands/dbcommands.c:2566
+#: commands/dbcommands.c:2690 commands/dbcommands.c:3201
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "база данных \"%s\" не существует"
@@ -7837,12 +7973,12 @@ msgstr "база данных \"%s\" не существует"
 msgid "cannot set comment on relation \"%s\""
 msgstr "задать комментарий для отношения \"%s\" нельзя"
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "функция \"%s\" была вызвана не менеджером триггеров"
 
-#: commands/constraint.c:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "функция \"%s\" должна запускаться в триггере AFTER для строк"
@@ -7925,236 +8061,272 @@ msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr ""
 "Выполнять COPY с записью в файл могут только роли с правами роли \"%s\"."
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "генерируемые столбцы не поддерживаются в условиях COPY FROM WHERE"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824
+#: commands/tablecmds.c:19906 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "Столбец \"%s\" является генерируемым."
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM не поддерживается с защитой на уровне строк."
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Используйте операторы INSERT."
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "использовать \"%s\" с параметром HEADER в COPY TO нельзя"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "%s требует логическое значение или \"match\""
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:782 commands/copy.c:798
-#: commands/copy.c:815 commands/copy.c:841 commands/copy.c:851
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873
+#: commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s нельзя использовать с %s"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:441
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "параметр COPY %s \"%s\" не распознан"
 
-#: commands/copy.c:502
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s требует числовое значение"
+
+#: commands/copy.c:485
+#, c-format
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "значение REJECT_LIMIT (%<PRId64>) должно быть больше нуля"
+
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "формат \"%s\" для COPY не распознан"
 
-#: commands/copy.c:560 commands/copy.c:575 commands/copy.c:590
-#: commands/copy.c:609
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663
+#: commands/copy.c:682
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "аргументом параметра \"%s\" должен быть список имён столбцов"
 
-#: commands/copy.c:621
+#: commands/copy.c:694
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "аргументом параметра \"%s\" должно быть название допустимой кодировки"
 
-#: commands/copy.c:642 commands/dbcommands.c:866 commands/dbcommands.c:2381
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "параметр \"%s\" не распознан"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:655 commands/copy.c:660 commands/copy.c:665
-#: commands/copy.c:740
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745
+#: commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "в режиме BINARY нельзя указывать %s"
 
-#: commands/copy.c:670
-#, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr "в режиме BINARY допускается только ON_ERROR STOP"
-
-#: commands/copy.c:692
+#: commands/copy.c:767
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "разделитель для COPY должен быть однобайтным символом"
 
-#: commands/copy.c:699
+#: commands/copy.c:774
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr ""
 "разделителем для COPY не может быть символ новой строки или возврата каретки"
 
-#: commands/copy.c:705
+#: commands/copy.c:780
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr ""
 "представление NULL для COPY не может включать символ новой строки или "
 "возврата каретки"
 
-#: commands/copy.c:715
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr ""
 "представление DEFAULT для COPY не может включать символ новой строки или "
 "возврата каретки"
 
-#: commands/copy.c:733
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "\"%s\" не может быть разделителем для COPY"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:747 commands/copy.c:764 commands/copy.c:776
-#: commands/copy.c:791 commands/copy.c:807
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851
+#: commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "для COPY %s требуется режим CSV"
 
-#: commands/copy.c:752
+#: commands/copy.c:827
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "символ кавычек для COPY должен быть однобайтным"
 
-#: commands/copy.c:757
+#: commands/copy.c:832
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "символ кавычек для COPY должен отличаться от разделителя"
 
-#: commands/copy.c:769
+#: commands/copy.c:844
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "спецсимвол для COPY должен быть однобайтным"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:823 commands/copy.c:859
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "символ разделителя для COPY не должен присутствовать в указании %s"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:832 commands/copy.c:868
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "символ кавычек в CSV не должен присутствовать в указании %s"
 
-#: commands/copy.c:877
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "представления NULL и DEFAULT не могут быть одинаковыми"
 
-#: commands/copy.c:939
+#: commands/copy.c:958
+#, c-format
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "в режиме BINARY допускается только ON_ERROR STOP"
+
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:965
+#, c-format
+msgid "COPY %s requires %s to be set to %s"
+msgstr "для COPY %s требуется установить %s %s"
+
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "столбец \"%s\" — генерируемый"
 
-#: commands/copy.c:941
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "Генерируемые столбцы нельзя использовать в COPY."
 
-#: commands/copy.c:956 commands/indexcmds.c:1890 commands/statscmds.c:239
-#: commands/tablecmds.c:2526 commands/tablecmds.c:2997
-#: commands/tablecmds.c:3808 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
-#: utils/adt/tsvector_op.c:2853
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260
+#: commands/tablecmds.c:2593 commands/tablecmds.c:3101
+#: commands/tablecmds.c:3930 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
+#: utils/adt/tsvector_op.c:2857
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "столбец \"%s\" не существует"
 
-#: commands/copy.c:963 commands/tablecmds.c:2552 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "столбец \"%s\" указан неоднократно"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, строка %llu, столбец %s"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, строка %<PRIu64>, столбец %s"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, строка %llu"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, строка %<PRIu64>"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, строка %llu, столбец %s: \"%s\""
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, строка %<PRIu64>, столбец %s: \"%s\""
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, строка %llu, столбец %s: значение NULL"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, строка %<PRIu64>, столбец %s: значение NULL"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, строка %llu: \"%s\""
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, строка %<PRIu64>: \"%s\""
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "копировать в представление \"%s\" нельзя"
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr ""
 "Чтобы представление допускало копирование данных в него, установите триггер "
 "INSTEAD OF INSERT."
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "копировать в материализованное представление \"%s\" нельзя"
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "копировать в последовательность \"%s\" нельзя"
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "копировать в отношение \"%s\", не являющееся таблицей, нельзя"
 
-#: commands/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "выполнить COPY FREEZE в секционированной таблице нельзя"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, c-format
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "выполнить COPY FREEZE в сторонней таблице нельзя"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr "выполнить COPY FREEZE нельзя из-за предыдущей активности в транзакции"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid ""
 "cannot perform COPY FREEZE because the table was not created or truncated in "
@@ -8163,29 +8335,38 @@ msgstr ""
 "выполнить COPY FREEZE нельзя, так как таблица не была создана или усечена в "
 "текущей подтранзакции"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
+#, c-format
+msgid ""
+"skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type "
+"incompatibility"
+msgstr ""
+"из-за несовместимости типов данных пропущено более чем REJECT_LIMIT "
+"(%<PRId64>) строк"
+
+#: commands/copyfrom.c:1474
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] "из-за несовместимости типов данных пропущена %llu строка"
-msgstr[1] "из-за несовместимости типов данных пропущены %llu строки"
-msgstr[2] "из-за несовместимости типов данных пропущены %llu строк"
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "из-за несовместимости типов данных пропущена %<PRIu64> строка"
+msgstr[1] "из-за несовместимости типов данных пропущены %<PRIu64> строки"
+msgstr[2] "из-за несовместимости типов данных пропущены %<PRIu64> строк"
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1448 commands/copyfrom.c:1491 commands/copyto.c:601
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "столбец %s \"%s\" не входит в список столбцов COPY"
 
-#: commands/copyfrom.c:1544 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:394
 #, c-format
 msgid ""
 "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr ""
 "стандартной функции преобразования из кодировки \"%s\" в \"%s\" не существует"
 
-#: commands/copyfrom.c:1742
+#: commands/copyfrom.c:1882
 #, c-format
 msgid ""
 "COPY FROM instructs the PostgreSQL server process to read a file. You may "
@@ -8195,17 +8376,17 @@ msgstr ""
 "файла. Возможно, на самом деле вам нужно клиентское средство, например, "
 "\\copy в psql."
 
-#: commands/copyfrom.c:1755 commands/copyto.c:706
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" - это каталог"
 
-#: commands/copyfrom.c:1823 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "не удалось закрыть канал сообщений с внешней командой: %m"
 
-#: commands/copyfrom.c:1838 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "сбой программы \"%s\""
@@ -8246,27 +8427,27 @@ msgid "could not read from COPY file: %m"
 msgstr "не удалось прочитать файл COPY: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:381
+#: replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "неожиданный обрыв соединения с клиентом при открытой транзакции"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "неожиданный тип сообщения 0x%02X при вводе данных COPY из stdin"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "ошибка при вводе данных COPY из stdin: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "неверное число полей в строке заголовка: %d, ожидалось: %d"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid ""
 "column name mismatch in header line field %d: got null value (\"%s\"), "
@@ -8275,7 +8456,7 @@ msgstr ""
 "несоответствие имени столбца в поле %d строки заголовка: получено значение "
 "null (\"%s\"), ожидалось \"%s\""
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid ""
 "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
@@ -8283,222 +8464,228 @@ msgstr ""
 "несоответствие имени столбца в поле %d строки заголовка: получено \"%s\", "
 "ожидалось \"%s\""
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "лишние данные после содержимого последнего столбца"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "нет данных для столбца \"%s\""
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
 msgid ""
-"skipping row due to data type incompatibility at line %llu for column "
+"skipping row due to data type incompatibility at line %<PRIu64> for column "
 "\"%s\": \"%s\""
 msgstr ""
-"строка пропускается из-за несовместимости данных в строке %llu, столбце "
+"строка пропускается из-за несовместимости данных в строке %<PRIu64>, столбце "
 "\"%s\": \"%s\""
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
 msgid ""
-"skipping row due to data type incompatibility at line %llu for column "
+"skipping row due to data type incompatibility at line %<PRIu64> for column "
 "\"%s\": null input"
 msgstr ""
-"строка пропускается из-за несовместимости данных в строке %llu, столбце "
+"строка пропускается из-за несовместимости данных в строке %<PRIu64>, столбце "
 "\"%s\": значение null"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "после маркера конца файла продолжаются данные COPY"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "количество полей в строке: %d, ожидалось: %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "в данных обнаружен явный возврат каретки"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "в данных обнаружен возврат каретки не в кавычках"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Представьте возврат каретки как \"\\r\"."
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Заключите возврат каретки в кавычки CSV."
 
-#: commands/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "в данных обнаружен явный символ новой строки"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "в данных обнаружен явный символ новой строки не в кавычках"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Представьте символ новой строки как \"\\n\"."
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Заключите символ новой строки в кавычки CSV."
 
-#: commands/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "маркер \"конец копии\" не соответствует предыдущему стилю новой строки"
 
-#: commands/copyfromparse.c:1428 commands/copyfromparse.c:1444
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
 #, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "маркер \"конец копии\" испорчен"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "в строке с маркером \"конец копии\" есть лишние данные"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "неожиданный маркер DEFAULT в данных COPY"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "Для столбца \"%s\" не определено значение по умолчанию."
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "незавершённое поле в кавычках CSV"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "неожиданный конец данных COPY"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "неверный размер поля"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "неверный двоичный формат данных"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "не удалось записать в канал программы COPY: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "не удалось записать в файл COPY: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "копировать из представления \"%s\" нельзя"
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Попробуйте вариацию COPY (SELECT ...) TO."
 
-#: commands/copyto.c:385
+#: commands/copyto.c:660
+#, c-format
+msgid "cannot copy from unpopulated materialized view \"%s\""
+msgstr ""
+"копировать из ненаполненного материализованного представления \"%s\" нельзя"
+
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
-msgid "cannot copy from materialized view \"%s\""
-msgstr "копировать из материализованного представления \"%s\" нельзя"
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "Примените команду REFRESH MATERIALIZED VIEW."
 
-#: commands/copyto.c:391
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "копировать из сторонней таблицы \"%s\" нельзя"
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "копировать из последовательности \"%s\" нельзя"
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "копировать из секционированной таблицы \"%s\" нельзя"
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "копировать из отношения \"%s\", не являющегося таблицей, нельзя"
 
-#: commands/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "правила DO INSTEAD NOTHING не поддерживаются с COPY"
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "условные правила DO INSTEAD не поддерживаются с COPY"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
 msgid "DO ALSO rules are not supported for COPY"
 msgstr "правила DO ALSO не поддерживаются с COPY"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "составные правила DO INSTEAD не поддерживаются с COPY"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) не поддерживается"
 
-#: commands/copyto.c:499
+#: commands/copyto.c:778
 #, c-format
 msgid "COPY query must not be a utility command"
 msgstr "служебная команда в запросе COPY не допускается"
 
-#: commands/copyto.c:515
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "в запросе COPY должно быть предложение RETURNING"
 
-#: commands/copyto.c:544
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "отношение, задействованное в операторе COPY, изменилось"
 
-#: commands/copyto.c:671
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "при выполнении COPY в файл нельзя указывать относительный путь"
 
-#: commands/copyto.c:690
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не удалось открыть файл \"%s\" для записи: %m"
 
-#: commands/copyto.c:693
+#: commands/copyto.c:972
 #, c-format
 msgid ""
 "COPY TO instructs the PostgreSQL server process to write a file. You may "
@@ -8508,135 +8695,145 @@ msgstr ""
 "Возможно, на самом деле вам нужно клиентское средство, например, \\copy в "
 "psql."
 
-#: commands/createas.c:210 commands/createas.c:516
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "указано слишком много имён столбцов"
 
-#: commands/createas.c:539
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "политики для этой команды ещё не реализованы"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION больше не поддерживается"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "Рассмотрите возможность использования табличных пространств."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "значения OID меньше %u зарезервированы для системных объектов"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d не является верным кодом кодировки"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s не является верным названием кодировки"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нераспознанный провайдер локали: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2414 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "неверный предел подключений: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "нет прав для создания базы данных"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "шаблон базы данных \"%s\" не существует"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "использовать некорректную базу \"%s\" в качестве шаблона нельзя"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2444
-#: utils/init/postinit.c:1113
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "Выполните DROP DATABASE для удаления некорректных баз данных."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "нет прав для копирования базы данных \"%s\""
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "неверная стратегия создания БД \"%s\""
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "Возможные стратегии: \"wal_log\" и \"file_copy\"."
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "неверная кодировка для сервера: %d"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "неверное имя локали LC_COLLATE: \"%s\""
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, c-format
+msgid ""
+"If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr ""
+"Если эта локаль свойственна встроенному провайдеру, используйте "
+"BUILTIN_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "Если эта локаль свойственна ICU, используйте ICU_LOCALE."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "Если эта локаль свойственна провайдеру ICU, используйте ICU_LOCALE."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "неверное имя локали LC_CTYPE: \"%s\""
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr ""
 "BUILTIN_LOCALE можно указать, только если выбран встроенный провайдер локали"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "локаль ICU можно указать, только если выбран провайдер локали ICU"
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "необходимо указать LOCALE или BUILTIN_LOCALE"
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "кодировка \"%s\" не поддерживается провайдером ICU"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "необходимо задать LOCALE или ICU_LOCALE"
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid ""
 "new encoding (%s) is incompatible with the encoding of the template database "
@@ -8644,7 +8841,7 @@ msgid ""
 msgstr ""
 "новая кодировка (%s) несовместима с кодировкой шаблона базы данных (%s)"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid ""
 "Use the same encoding as in the template database, or use template0 as "
@@ -8653,7 +8850,7 @@ msgstr ""
 "Используйте кодировку шаблона базы данных или выберите в качестве шаблона "
 "template0."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid ""
 "new collation (%s) is incompatible with the collation of the template "
@@ -8662,7 +8859,7 @@ msgstr ""
 "новое правило сортировки (%s) несовместимо с правилом в шаблоне базы данных "
 "(%s)"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid ""
 "Use the same collation as in the template database, or use template0 as "
@@ -8671,7 +8868,7 @@ msgstr ""
 "Используйте то же правило сортировки, что и в шаблоне базы данных, или "
 "выберите в качестве шаблона template0."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid ""
 "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
@@ -8680,7 +8877,7 @@ msgstr ""
 "новый параметр LC_CTYPE (%s) несовместим с LC_CTYPE в шаблоне базы данных "
 "(%s)"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid ""
 "Use the same LC_CTYPE as in the template database, or use template0 as "
@@ -8689,7 +8886,7 @@ msgstr ""
 "Используйте тот же LC_CTYPE, что и в шаблоне базы данных, или выберите в "
 "качестве шаблона template0."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid ""
 "new locale provider (%s) does not match locale provider of the template "
@@ -8698,7 +8895,7 @@ msgstr ""
 "новый провайдер локали (%s) не соответствует провайдеру локали в базе-"
 "шаблоне (%s)"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid ""
 "Use the same locale provider as in the template database, or use template0 "
@@ -8707,14 +8904,14 @@ msgstr ""
 "Используйте тот же провайдер локали, что и в базе-шаблоне, или выберите в "
 "качестве шаблона template0."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid ""
 "new ICU locale (%s) is incompatible with the ICU locale of the template "
 "database (%s)"
 msgstr "новая локаль ICU (%s) несовместима с локалью ICU в базе-шаблоне (%s)"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid ""
 "Use the same ICU locale as in the template database, or use template0 as "
@@ -8723,7 +8920,7 @@ msgstr ""
 "Используйте ту же локаль ICU, что и в базе-шаблоне, или выберите в качестве "
 "шаблона template0."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid ""
 "new ICU collation rules (%s) are incompatible with the ICU collation rules "
@@ -8732,7 +8929,7 @@ msgstr ""
 "новые правила сортировки ICU (%s) несовместимы с правилами сортировки в "
 "шаблоне базы данных (%s)"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid ""
 "Use the same ICU collation rules as in the template database, or use "
@@ -8741,7 +8938,7 @@ msgstr ""
 "Используйте те же правила сортировки, что и в шаблоне базы данных, или "
 "выберите в качестве шаблона template0."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid ""
 "template database \"%s\" has a collation version, but no actual collation "
@@ -8750,13 +8947,13 @@ msgstr ""
 "в шаблоне \"%s\" имеется версия правила сортировки, но фактическую версию "
 "правила сортировки определить нельзя"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr ""
 "в базе-шаблоне \"%s\" обнаружено несоответствие версии правила сортировки"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid ""
 "The template database was created using collation version %s, but the "
@@ -8765,7 +8962,7 @@ msgstr ""
 "База-шаблон была создана с версией правила сортировки %s, но операционная "
 "система предоставляет версию %s."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid ""
 "Rebuild all objects in the template database that use the default collation "
@@ -8776,18 +8973,18 @@ msgstr ""
 "сортировки, и выполните ALTER DATABASE %s REFRESH COLLATION VERSION, либо "
 "соберите PostgreSQL с правильной версией библиотеки."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2041
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr ""
 "pg_global нельзя использовать в качестве табличного пространства по умолчанию"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "не удалось назначить новое табличное пространство по умолчанию \"%s\""
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, c-format
 msgid ""
 "There is a conflict because database \"%s\" already has some tables in this "
@@ -8796,63 +8993,63 @@ msgstr ""
 "База данных \"%s\" содержит таблицы, которые уже находятся в этом табличном "
 "пространстве."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1912
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "база данных \"%s\" уже существует"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "исходная база \"%s\" занята другими пользователями"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "OID базы данных %u уже используется базой данных \"%s\""
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "каталог данных с указанным OID %u уже существует"
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2588
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "кодировка \"%s\" не соответствует локали \"%s\""
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "Для выбранного параметра LC_CTYPE требуется кодировка \"%s\"."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "Для выбранного параметра LC_COLLATE требуется кодировка \"%s\"."
 
-#: commands/dbcommands.c:1672
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "база данных \"%s\" не существует, пропускается"
 
-#: commands/dbcommands.c:1696
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "удалить шаблон базы данных нельзя"
 
-#: commands/dbcommands.c:1702
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "удалить базу данных, открытую в данный момент, нельзя"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "база \"%s\" используется активным слотом логической репликации"
 
-#: commands/dbcommands.c:1717
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
@@ -8860,12 +9057,12 @@ msgstr[0] "Обнаружен %d активный слот."
 msgstr[1] "Обнаружены %d активных слота."
 msgstr[2] "Обнаружено %d активных слотов."
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "база \"%s\" используется в подписке с логической репликацией"
 
-#: commands/dbcommands.c:1733
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
@@ -8873,36 +9070,36 @@ msgstr[0] "Обнаружена %d подписка."
 msgstr[1] "Обнаружены %d подписки."
 msgstr[2] "Обнаружено %d подписок."
 
-#: commands/dbcommands.c:1754 commands/dbcommands.c:1934
-#: commands/dbcommands.c:2063
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "база данных \"%s\" занята другими пользователями"
 
-#: commands/dbcommands.c:1894
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "нет прав для переименования базы данных"
 
-#: commands/dbcommands.c:1923
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "нельзя переименовать текущую базу данных"
 
-#: commands/dbcommands.c:2019
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr ""
 "изменить табличное пространство открытой в данный момент базы данных нельзя"
 
-#: commands/dbcommands.c:2125
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr ""
 "некоторые отношения базы данных \"%s\" уже находятся в табличном "
 "пространстве \"%s\""
 
-#: commands/dbcommands.c:2127
+#: commands/dbcommands.c:2166
 #, c-format
 msgid ""
 "You must move them back to the database's default tablespace before using "
@@ -8911,38 +9108,33 @@ msgstr ""
 "Прежде чем выполнять эту команду, вы должны вернуть их назад в табличное "
 "пространство по умолчанию для этой базы данных."
 
-#: commands/dbcommands.c:2256 commands/dbcommands.c:2999
-#: commands/dbcommands.c:3299 commands/dbcommands.c:3412
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039
+#: commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "в старом каталоге базы данных \"%s\" могли остаться ненужные файлы"
 
-#: commands/dbcommands.c:2317
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "нераспознанный параметр DROP DATABASE: \"%s\""
-
-#: commands/dbcommands.c:2395
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "параметр \"%s\" нельзя задать с другими параметрами"
 
-#: commands/dbcommands.c:2443
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "изменить свойства некорректной базы \"%s\" нельзя"
 
-#: commands/dbcommands.c:2460
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "запретить подключения к текущей базе данных нельзя"
 
-#: commands/dbcommands.c:2690
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "нет прав для изменения владельца базы данных"
 
-#: commands/dbcommands.c:3105
+#: commands/dbcommands.c:3145
 #, c-format
 msgid ""
 "There are %d other session(s) and %d prepared transaction(s) using the "
@@ -8951,7 +9143,7 @@ msgstr ""
 "С этой базой данных связаны другие сеансы (%d) и подготовленные транзакции "
 "(%d)."
 
-#: commands/dbcommands.c:3108
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
@@ -8959,7 +9151,7 @@ msgstr[0] "Эта база данных используется ещё в %d с
 msgstr[1] "Эта база данных используется ещё в %d сеансах."
 msgstr[2] "Эта база данных используется ещё в %d сеансах."
 
-#: commands/dbcommands.c:3113 storage/ipc/procarray.c:3859
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
@@ -8967,56 +9159,50 @@ msgstr[0] "С этой базой данных связана %d подгото
 msgstr[1] "С этой базой данных связаны %d подготовленные транзакции."
 msgstr[2] "С этой базой данных связаны %d подготовленных транзакций."
 
-#: commands/dbcommands.c:3255
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "отсутствует каталог \"%s\""
 
-#: commands/dbcommands.c:3313 commands/tablespace.c:184
+#: commands/dbcommands.c:3353 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "не удалось получить информацию о каталоге \"%s\": %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s требует параметр"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s требует числовое значение"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "%s требует логическое значение"
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s требует целое значение"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "аргументом %s должно быть имя"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "аргументом %s должно быть имя типа"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "неверный аргумент для %s: \"%s\""
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2910
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "функция \"%s\" является агрегатной"
@@ -9026,19 +9212,19 @@ msgstr "функция \"%s\" является агрегатной"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Используйте DROP AGGREGATE для удаления агрегатных функций."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3892
-#: commands/tablecmds.c:4050 commands/tablecmds.c:4102
-#: commands/tablecmds.c:17161 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014
+#: commands/tablecmds.c:4175 commands/tablecmds.c:4227
+#: commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "отношение \"%s\" не существует, пропускается"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1409
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "схема \"%s\" не существует, пропускается"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "тип \"%s\" не существует, пропускается"
@@ -9058,7 +9244,7 @@ msgstr "правило сортировки \"%s\" не существует, п
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "преобразование \"%s\" не существует, пропускается"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "объект статистики \"%s\" не существует, пропускается"
@@ -9153,7 +9339,7 @@ msgstr "правило \"%s\" для отношения \"%s\" не сущест
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "обёртка сторонних данных \"%s\" не существует, пропускается"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "сервер \"%s\" не существует, пропускается"
@@ -9177,184 +9363,164 @@ msgstr ""
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "публикация \"%s\" не существует, пропускается"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "нет прав для создания событийного триггера \"%s\""
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "Для создания событийного триггера нужно быть суперпользователем."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "нераспознанное имя события \"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "нераспознанная переменная фильтра \"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "фильтрация по тегу для событийных триггеров входа не поддерживается"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "значение фильтра \"%s\" неприемлемо для переменной фильтра \"%s\""
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "для %s событийные триггеры не поддерживаются"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "переменная фильтра \"%s\" указана больше одного раза"
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490
-#: commands/event_trigger.c:584
+#: commands/event_trigger.c:442 commands/event_trigger.c:494
+#: commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "событийный триггер \"%s\" не существует"
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "событийный триггер с OID %u не существует"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "нет прав для изменения владельца событийного триггера \"%s\""
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "Владельцем событийного триггера должен быть суперпользователь."
 
-#: commands/event_trigger.c:1409
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s можно вызывать только в событийной триггерной функции sql_drop"
 
-#: commands/event_trigger.c:1502 commands/event_trigger.c:1523
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%s можно вызывать только в событийной триггерной функции table_rewrite"
 
-#: commands/event_trigger.c:1936
+#: commands/event_trigger.c:2063
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s можно вызывать только в событийной триггерной функции"
 
-#: commands/explain.c:241 commands/explain.c:266
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "нераспознанное значение параметра EXPLAIN \"%s\": \"%s\""
-
-#: commands/explain.c:273
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "нераспознанный параметр EXPLAIN: \"%s\""
-
-#: commands/explain.c:282
-#, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
-msgstr "параметр WAL оператора EXPLAIN требует указания ANALYZE"
-
-#: commands/explain.c:291
+#: commands/explain_state.c:133 commands/explain_state.c:158
+#: replication/walsender.c:1151
 #, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "параметр TIMING оператора EXPLAIN требует указания ANALYZE"
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "нераспознанное значение для параметра %s \"%s\": \"%s\""
 
-#: commands/explain.c:297
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
 #, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "параметр SERIALIZE оператора EXPLAIN требует указания ANALYZE"
+msgid "EXPLAIN option %s requires ANALYZE"
+msgstr "параметр %s оператора EXPLAIN требует указания ANALYZE"
 
-#: commands/explain.c:303
+#: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr ""
-"параметры ANALYZE и GENERIC_PLAN оператора EXPLAIN нельзя использовать "
-"одновременно"
+msgid "%s options %s and %s cannot be used together"
+msgstr "параметры %s %s и %s исключают друг друга"
 
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:198 commands/extension.c:3452
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "расширение \"%s\" не существует"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:371 commands/extension.c:380 commands/extension.c:392
+#: commands/extension.c:402
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "неверное имя расширения: \"%s\""
 
-#: commands/extension.c:278
+#: commands/extension.c:372
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "Имя расширения не может быть пустым."
 
-#: commands/extension.c:287
+#: commands/extension.c:381
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "Имя расширения не может содержать \"--\"."
 
-#: commands/extension.c:299
+#: commands/extension.c:393
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Имя расширения не может начинаться или заканчиваться символом \"-\"."
 
-#: commands/extension.c:309
+#: commands/extension.c:403
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "Имя расширения не может содержать разделители пути."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:418 commands/extension.c:427 commands/extension.c:436
+#: commands/extension.c:446
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "неверный идентификатор версии расширения: \"%s\""
 
-#: commands/extension.c:325
+#: commands/extension.c:419
 #, c-format
 msgid "Version names must not be empty."
 msgstr "Идентификатор версии не может быть пустым."
 
-#: commands/extension.c:334
+#: commands/extension.c:428
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "Идентификатор версии не может содержать \"--\"."
 
-#: commands/extension.c:343
+#: commands/extension.c:437
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr ""
 "Идентификатор версии не может начинаться или заканчиваться символом \"-\"."
 
-#: commands/extension.c:353
+#: commands/extension.c:447
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "Идентификатор версии не может содержать разделители пути."
 
-#: commands/extension.c:507
+#: commands/extension.c:672
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "расширение \"%s\" отсутствует"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "Не удалось открыть управляющий файл расширения \"%s\": %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:673
 #, c-format
 msgid ""
 "The extension must first be installed on the system where PostgreSQL is "
@@ -9362,91 +9528,106 @@ msgid ""
 msgstr ""
 "Сначала расширение нужно установить в системе, где работает PostgreSQL."
 
-#: commands/extension.c:514
+#: commands/extension.c:695
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "не удалось открыть управляющий файл расширения \"%s\": %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:718 commands/extension.c:728
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr ""
 "параметр \"%s\" нельзя задавать в дополнительном управляющем файле расширения"
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:750 commands/extension.c:758 commands/extension.c:766
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "параметр \"%s\" требует логическое значение"
 
-#: commands/extension.c:594
+#: commands/extension.c:775
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" не является верным названием кодировки"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:789 commands/extension.c:804
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "параметр \"%s\" должен содержать список имён расширений"
 
-#: commands/extension.c:630
+#: commands/extension.c:811
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "нераспознанный параметр \"%s\" в файле \"%s\""
 
-#: commands/extension.c:639
+#: commands/extension.c:820
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr ""
 "параметр \"schema\" не может быть указан вместе с \"relocatable\" = true"
 
-#: commands/extension.c:817
+#: commands/extension.c:996
+#, c-format
+msgid "SQL statement \"%.*s\""
+msgstr "SQL-оператор: \"%.*s\""
+
+#: commands/extension.c:1025
+#, c-format
+msgid "extension script file \"%s\", near line %d"
+msgstr "файл скрипта расширения \"%s\", в строке %d"
+
+#: commands/extension.c:1029
+#, c-format
+msgid "extension script file \"%s\""
+msgstr "файл скрипта расширения \"%s\""
+
+#: commands/extension.c:1141
 #, c-format
 msgid ""
 "transaction control statements are not allowed within an extension script"
 msgstr "в скрипте расширения не должно быть операторов управления транзакциями"
 
-#: commands/extension.c:897
+#: commands/extension.c:1223
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "нет прав для создания расширения \"%s\""
 
-#: commands/extension.c:900
+#: commands/extension.c:1226
 #, c-format
 msgid ""
 "Must have CREATE privilege on current database to create this extension."
 msgstr "Для создания этого расширения нужно иметь право CREATE в текущей базе."
 
-#: commands/extension.c:901
+#: commands/extension.c:1227
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Для создания этого расширения нужно быть суперпользователем."
 
-#: commands/extension.c:905
+#: commands/extension.c:1231
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "нет прав для изменения расширения \"%s\""
 
-#: commands/extension.c:908
+#: commands/extension.c:1234
 #, c-format
 msgid ""
 "Must have CREATE privilege on current database to update this extension."
 msgstr ""
 "Для обновления этого расширения нужно иметь право CREATE в текущей базе."
 
-#: commands/extension.c:909
+#: commands/extension.c:1235
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Для изменения этого расширения нужно быть суперпользователем."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1368
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr ""
 "недопустимый символ в имени владельца расширения: имя не должно содержать "
 "\"%s\""
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1392 commands/extension.c:1419
 #, c-format
 msgid ""
 "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
@@ -9454,7 +9635,7 @@ msgstr ""
 "недопустимый символ в имени схемы расширения \"%s\": имя не должно содержать "
 "\"%s\""
 
-#: commands/extension.c:1288
+#: commands/extension.c:1614
 #, c-format
 msgid ""
 "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
@@ -9462,12 +9643,12 @@ msgstr ""
 "для расширения \"%s\" не определён путь обновления с версии \"%s\" до версии "
 "\"%s\""
 
-#: commands/extension.c:1496 commands/extension.c:3089
+#: commands/extension.c:1822 commands/extension.c:3510
 #, c-format
 msgid "version to install must be specified"
 msgstr "нужно указать версию для установки"
 
-#: commands/extension.c:1533
+#: commands/extension.c:1859
 #, c-format
 msgid ""
 "extension \"%s\" has no installation script nor update path for version "
@@ -9476,71 +9657,71 @@ msgstr ""
 "для расширения \"%s\" не определён путь установки или обновления для версии "
 "\"%s\""
 
-#: commands/extension.c:1567
+#: commands/extension.c:1893
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "расширение \"%s\" должно устанавливаться в схему \"%s\""
 
-#: commands/extension.c:1727
+#: commands/extension.c:2053
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "выявлена циклическая зависимость между расширениями \"%s\" и \"%s\""
 
-#: commands/extension.c:1732
+#: commands/extension.c:2058
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "установка требуемого расширения \"%s\""
 
-#: commands/extension.c:1755
+#: commands/extension.c:2081
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "требуемое расширение \"%s\" не установлено"
 
-#: commands/extension.c:1758
+#: commands/extension.c:2084
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr ""
 "Выполните CREATE EXTENSION ... CASCADE, чтобы установить также требуемые "
 "расширения."
 
-#: commands/extension.c:1793
+#: commands/extension.c:2119
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "расширение \"%s\" уже существует, пропускается"
 
-#: commands/extension.c:1800
+#: commands/extension.c:2126
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "расширение \"%s\" уже существует"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2137
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "вложенные операторы CREATE EXTENSION не поддерживаются"
 
-#: commands/extension.c:1975
+#: commands/extension.c:2301
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "удалить расширение \"%s\" нельзя, так как это модифицируемый объект"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2818
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr ""
 "%s можно вызывать только из SQL-скрипта, запускаемого командой CREATE "
 "EXTENSION"
 
-#: commands/extension.c:2462
+#: commands/extension.c:2830
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u не относится к таблице"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2835
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "таблица \"%s\" не относится к созданному расширению"
 
-#: commands/extension.c:2813
+#: commands/extension.c:3234
 #, c-format
 msgid ""
 "cannot move extension \"%s\" into schema \"%s\" because the extension "
@@ -9549,12 +9730,12 @@ msgstr ""
 "переместить расширение \"%s\" в схему \"%s\" нельзя, так как оно содержит "
 "схему"
 
-#: commands/extension.c:2854 commands/extension.c:2948
+#: commands/extension.c:3275 commands/extension.c:3369
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "расширение \"%s\" не поддерживает SET SCHEMA"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3332
 #, c-format
 msgid ""
 "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
@@ -9562,32 +9743,32 @@ msgstr ""
 "выполнить SET SCHEMA для расширения \"%s\" нельзя, так как этому "
 "препятствуют другие расширения"
 
-#: commands/extension.c:2913
+#: commands/extension.c:3334
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "Расширение \"%s\" не допускает перемещения расширения \"%s\"."
 
-#: commands/extension.c:2950
+#: commands/extension.c:3371
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "объект %s не принадлежит схеме расширения \"%s\""
 
-#: commands/extension.c:3011
+#: commands/extension.c:3432
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "вложенные операторы ALTER EXTENSION не поддерживаются"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3521
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "версия \"%s\" расширения \"%s\" уже установлена"
 
-#: commands/extension.c:3311
+#: commands/extension.c:3732
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "добавить объект этого типа к расширению нельзя"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3830
 #, c-format
 msgid ""
 "cannot add schema \"%s\" to extension \"%s\" because the schema contains the "
@@ -9596,78 +9777,83 @@ msgstr ""
 "добавить схему \"%s\" к расширению \"%s\" нельзя, так как схема содержит "
 "расширение"
 
-#: commands/extension.c:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3912 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "тип мультидиапазона для типа данных %s не найден"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3954
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "файл \"%s\" слишком большой"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:4047 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "компонент в параметре \"%s\" не является абсолютным путём"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "нераспознанный параметр \"%s\""
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "параметр \"%s\" указан неоднократно"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "нет прав для изменения владельца обёртки сторонних данных \"%s\""
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr ""
 "Для смены владельца обёртки сторонних данных нужно быть суперпользователем."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Владельцем обёртки сторонних данных должен быть суперпользователь."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "обёртка сторонних данных \"%s\" не существует"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "обёртка сторонних данных с OID %u не существует"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "сторонний сервер с OID %u не существует"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "нет прав для создания обёртки сторонних данных \"%s\""
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Для создания обёртки сторонних данных нужно быть суперпользователем."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "нет прав для изменения обёртки сторонних данных \"%s\""
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Для изменения обёртки сторонних данных нужно быть суперпользователем."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid ""
 "changing the foreign-data wrapper handler can change behavior of existing "
@@ -9676,7 +9862,7 @@ msgstr ""
 "при изменении обработчика в обёртке сторонних данных может измениться "
 "поведение существующих сторонних таблиц"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid ""
 "changing the foreign-data wrapper validator can cause the options for "
@@ -9685,46 +9871,46 @@ msgstr ""
 "при изменении функции проверки в обёртке сторонних данных параметры "
 "зависимых объектов могут стать неверными"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "сервер \"%s\" уже существует, пропускается"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr ""
 "сопоставление пользователя \"%s\" для сервера \"%s\" уже существует, "
 "пропускается"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "сопоставление пользователя \"%s\" для сервера \"%s\" уже существует"
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "сопоставление пользователя \"%s\" для сервера \"%s\" не существует"
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr ""
 "сопоставление пользователя \"%s\" для сервера \"%s\" не существует, "
 "пропускается"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "обёртка сторонних данных \"%s\" не имеет обработчика"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "обёртка сторонних данных \"%s\" не поддерживает IMPORT FOREIGN SCHEMA"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "импорт сторонней таблицы \"%s\""
@@ -9759,121 +9945,121 @@ msgstr "Создание определения типа-пустышки."
 msgid "SQL function cannot accept shell type %s"
 msgstr "SQL-функция не может принимать значение типа-пустышки %s"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "агрегатная функция не может принимать значение типа-пустышки %s"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "тип аргумента %s - лишь пустышка"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "тип %s не существует"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "агрегатные функции не принимают в аргументах множества"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "процедуры не принимают в аргументах множества"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "функции не принимают аргументы-множества"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "параметр VARIADIC должен быть последним в списке входных параметров"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "параметр VARIADIC должен быть последним в списке параметров"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "параметр VARIADIC должен быть массивом"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "имя параметра \"%s\" указано неоднократно"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "значения по умолчанию могут быть только у входных параметров"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "в значениях параметров по умолчанию нельзя ссылаться на таблицы"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr ""
 "входные параметры, следующие за параметром со значением по умолчанию, также "
 "должны иметь значения по умолчанию"
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr ""
 "в объявлении процедуры параметры OUT не могут находиться после параметра со "
 "значением по умолчанию"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "некорректный атрибут в определении процедуры"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "вспомогательная функция %s должна возвращать тип %s"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "для указания вспомогательной функции нужно быть суперпользователем"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "значение COST должно быть положительным"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "значение ROWS должно быть положительным"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "не указано тело функции"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "тело функции задано неоднократно"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "встроенное тело функции SQL допускается только для языка SQL"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid ""
 "SQL function with unquoted function body cannot have polymorphic arguments"
@@ -9881,84 +10067,84 @@ msgstr ""
 "у SQL-функции с телом, задаваемым не в кавычках, не может быть полиморфных "
 "аргументов"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr ""
 "%s на данный момент не поддерживается в теле SQL-функции, задаваемом не в "
 "кавычках"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "для языка \"%s\" нужно только одно выражение AS"
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "язык не указан"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2117
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "язык \"%s\" не существует"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2119
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr "Выполните CREATE EXTENSION, чтобы загрузить язык в базу данных."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr ""
 "только суперпользователь может определить функцию с атрибутом LEAKPROOF"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr ""
 "результат функции должен иметь тип %s (в соответствии с параметрами OUT)"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "необходимо указать тип результата функции"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "указание ROWS неприменимо, когда функция возвращает не множество"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "исходный тип данных %s является псевдотипом"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "целевой тип данных %s является псевдотипом"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr ""
 "приведение будет проигнорировано, так как исходные данные имеют тип домен"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr ""
 "приведение будет проигнорировано, так как целевые данные имеют тип домен"
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "функция приведения должна принимать от одного до трёх аргументов"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid ""
 "argument of cast function must match or be binary-coercible from source data "
@@ -9967,17 +10153,17 @@ msgstr ""
 "аргумент функции приведения должен совпадать или быть двоично-совместимым с "
 "исходным типом данных"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "второй аргумент функции приведения должен иметь тип %s"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "третий аргумент функции приведения должен иметь тип %s"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid ""
 "return data type of cast function must match or be binary-coercible to "
@@ -9986,132 +10172,132 @@ msgstr ""
 "тип возвращаемых данных функции приведения должен совпадать или быть двоично-"
 "совместимым с целевым типом данных"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "функция приведения не может быть изменчивой (volatile)"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "функция приведения должна быть обычной функцией"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "функция приведения не может возвращать множество"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "для создания приведения WITHOUT FUNCTION нужно быть суперпользователем"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "исходный и целевой типы данных несовместимы физически"
 
-#: commands/functioncmds.c:1709
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "составные типы данных несовместимы на двоичном уровне"
 
-#: commands/functioncmds.c:1715
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "типы-массивы несовместимы на двоичном уровне"
 
-#: commands/functioncmds.c:1723
+#: commands/functioncmds.c:1741
 #, c-format
 msgid "range data types are not binary-compatible"
 msgstr "диапазонные типы несовместимы на двоичном уровне"
 
-#: commands/functioncmds.c:1729
+#: commands/functioncmds.c:1747
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "типы-перечисления несовместимы на двоичном уровне"
 
-#: commands/functioncmds.c:1746
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "типы-домены не могут считаться двоично-совместимыми"
 
-#: commands/functioncmds.c:1756
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "исходный тип данных совпадает с целевым"
 
-#: commands/functioncmds.c:1789
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "функция преобразования не может быть изменчивой"
 
-#: commands/functioncmds.c:1793
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "функция преобразования должна быть обычной функцией"
 
-#: commands/functioncmds.c:1797
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "функция преобразования не может возвращать множество"
 
-#: commands/functioncmds.c:1801
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "функция преобразования должна принимать один аргумент"
 
-#: commands/functioncmds.c:1805
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "первый аргумент функции преобразования должен иметь тип %s"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "тип данных %s является псевдотипом"
 
-#: commands/functioncmds.c:1850
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "тип данных \"%s\" является доменом"
 
-#: commands/functioncmds.c:1890
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "результат функции FROM SQL должен иметь тип %s"
 
-#: commands/functioncmds.c:1916
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "результат функции TO SQL должен иметь тип данных преобразования"
 
-#: commands/functioncmds.c:1943
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "преобразование для типа %s, языка \"%s\" уже существует"
 
-#: commands/functioncmds.c:2029
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "преобразование для типа %s, языка \"%s\" не существует"
 
-#: commands/functioncmds.c:2053
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "функция %s уже существует в схеме \"%s\""
 
-#: commands/functioncmds.c:2104
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "нет внедрённого кода"
 
-#: commands/functioncmds.c:2150
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "язык \"%s\" не поддерживает выполнение внедрённого кода"
 
-#: commands/functioncmds.c:2245
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
@@ -10119,91 +10305,108 @@ msgstr[0] "процедуре нельзя передать больше %d ар
 msgstr[1] "процедуре нельзя передать больше %d аргументов"
 msgstr[2] "процедуре нельзя передать больше %d аргументов"
 
-#: commands/indexcmds.c:656
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "нужно указать минимум один столбец"
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "число столбцов в индексе не может превышать %d"
 
-#: commands/indexcmds.c:703
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "создать индекс для отношения \"%s\" нельзя"
 
-#: commands/indexcmds.c:729
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr ""
 "создать индекс в секционированной таблице \"%s\" параллельным способом нельзя"
 
-#: commands/indexcmds.c:739
+#: commands/indexcmds.c:748
 #, c-format
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "создавать индексы во временных таблицах других сеансов нельзя"
 
-#: commands/indexcmds.c:777 commands/tablecmds.c:818 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr ""
 "для секционированных отношений нельзя назначить табличное пространство по "
 "умолчанию"
 
-#: commands/indexcmds.c:809 commands/tablecmds.c:849 commands/tablecmds.c:3588
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr ""
 "в табличное пространство pg_global можно поместить только разделяемые таблицы"
 
-#: commands/indexcmds.c:842
+#: commands/indexcmds.c:851
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "устаревший метод доступа \"rtree\" подменяется методом \"gist\""
 
-#: commands/indexcmds.c:863
+#: commands/indexcmds.c:872
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "метод доступа \"%s\" не поддерживает уникальные индексы"
 
-#: commands/indexcmds.c:868
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "метод доступа \"%s\" не поддерживает включаемые столбцы"
 
-#: commands/indexcmds.c:873
+#: commands/indexcmds.c:882
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "метод доступа \"%s\" не поддерживает индексы по многим столбцам"
 
-#: commands/indexcmds.c:878
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "метод доступа \"%s\" не поддерживает ограничения-исключения"
 
-#: commands/indexcmds.c:1007
+#: commands/indexcmds.c:892
 #, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr ""
-"сопоставить ключ секционирования с индексом, использующим метод доступа "
-"\"%s\", нельзя"
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "метод доступа \"%s\" не поддерживает ограничения WITHOUT OVERLAPS"
 
-#: commands/indexcmds.c:1017
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr ""
 "неподдерживаемое ограничение \"%s\" с определением ключа секционирования"
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr ""
 "Ограничения %s не могут использоваться, когда ключи секционирования включают "
 "выражения."
 
-#: commands/indexcmds.c:1069
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469
+#: commands/indexcmds.c:2488 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553
+#: utils/adt/arrayfuncs.c:3870 utils/adt/arrayfuncs.c:4425
+#: utils/adt/arrayfuncs.c:6446 utils/adt/rowtypes.c:1220
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "не удалось найти оператор равенства для типа %s"
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2491
+#, c-format
+msgid ""
+"There is no suitable operator in operator family \"%s\" for access method "
+"\"%s\"."
+msgstr ""
+"В семействе операторов \"%s\" нет подходящего оператора для метода доступа "
+"\"%s\"."
+
+#: commands/indexcmds.c:1077
 #, c-format
 msgid ""
 "cannot match partition key to index on column \"%s\" using non-equal "
@@ -10212,7 +10415,7 @@ msgstr ""
 "сопоставить ключ секционирования с индексом, построенному по столбцу \"%s\" "
 "с оператором неравенства \"%s\", нельзя"
 
-#: commands/indexcmds.c:1085
+#: commands/indexcmds.c:1093
 #, c-format
 msgid ""
 "unique constraint on partitioned table must include all partitioning columns"
@@ -10220,7 +10423,7 @@ msgstr ""
 "ограничение уникальности в секционированной таблице должно включать все "
 "секционирующие столбцы"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1094
 #, c-format
 msgid ""
 "%s constraint on table \"%s\" lacks column \"%s\" which is part of the "
@@ -10229,92 +10432,110 @@ msgstr ""
 "В ограничении %s таблицы \"%s\" не хватает столбца \"%s\", входящего в ключ "
 "секционирования."
 
-#: commands/indexcmds.c:1105 commands/indexcmds.c:1124
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1147
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "создание индекса для системных столбцов не поддерживается"
 
-#: commands/indexcmds.c:1354 tcop/utility.c:1515
+#: commands/indexcmds.c:1123
+#, c-format
+msgid "primary keys on virtual generated columns are not supported"
+msgstr ""
+"первичные ключи с виртуальными генерируемыми столбцами не поддерживаются"
+
+#: commands/indexcmds.c:1125 commands/indexcmds.c:1164
+#, c-format
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr ""
+"ограничения уникальности с виртуальными генерируемыми столбцами не "
+"поддерживаются"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1165
+#, c-format
+msgid "indexes on virtual generated columns are not supported"
+msgstr "индексы с виртуальными генерируемыми столбцами не поддерживаются"
+
+#: commands/indexcmds.c:1397 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "создать уникальный индекс в секционированной таблице \"%s\" нельзя"
 
-#: commands/indexcmds.c:1356 tcop/utility.c:1517
+#: commands/indexcmds.c:1399 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "Таблица \"%s\" содержит секции, являющиеся сторонними таблицами."
 
-#: commands/indexcmds.c:1806
+#: commands/indexcmds.c:1857
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "функции в предикате индекса должны быть помечены как IMMUTABLE"
 
-#: commands/indexcmds.c:1885 parser/parse_utilcmd.c:2519
-#: parser/parse_utilcmd.c:2654
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735
+#: parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "указанный в ключе столбец \"%s\" не существует"
 
-#: commands/indexcmds.c:1909 parser/parse_utilcmd.c:1807
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "выражения во включаемых столбцах не поддерживаются"
 
-#: commands/indexcmds.c:1950
+#: commands/indexcmds.c:2019
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "функции в индексном выражении должны быть помечены как IMMUTABLE"
 
-#: commands/indexcmds.c:1965
+#: commands/indexcmds.c:2034
 #, c-format
 msgid "including column does not support a collation"
 msgstr "включаемые столбцы не поддерживают правила сортировки"
 
-#: commands/indexcmds.c:1969
+#: commands/indexcmds.c:2038
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "включаемые столбцы не поддерживают классы операторов"
 
-#: commands/indexcmds.c:1973
+#: commands/indexcmds.c:2042
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "включаемые столбцы не поддерживают сортировку ASC/DESC"
 
-#: commands/indexcmds.c:1977
+#: commands/indexcmds.c:2046
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "включаемые столбцы не поддерживают указания NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:2020
+#: commands/indexcmds.c:2089
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "не удалось определить правило сортировки для индексного выражения"
 
-#: commands/indexcmds.c:2028 commands/tablecmds.c:18185 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3771
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812
+#: parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4064
 #: utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "тип %s не поддерживает сортировку (COLLATION)"
 
-#: commands/indexcmds.c:2095
+#: commands/indexcmds.c:2164
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "оператор %s не коммутативен"
 
-#: commands/indexcmds.c:2097
+#: commands/indexcmds.c:2166
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
 "В ограничениях-исключениях могут использоваться только коммутативные "
 "операторы."
 
-#: commands/indexcmds.c:2123
+#: commands/indexcmds.c:2176
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "оператор \"%s\" не входит в семейство операторов \"%s\""
 
-#: commands/indexcmds.c:2126
+#: commands/indexcmds.c:2179
 #, c-format
 msgid ""
 "The exclusion operator must be related to the index operator class for the "
@@ -10323,25 +10544,25 @@ msgstr ""
 "Оператор исключения для ограничения должен относиться к классу операторов "
 "индекса."
 
-#: commands/indexcmds.c:2161
+#: commands/indexcmds.c:2228
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "метод доступа \"%s\" не поддерживает сортировку ASC/DESC"
 
-#: commands/indexcmds.c:2166
+#: commands/indexcmds.c:2233
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "метод доступа \"%s\" не поддерживает параметр NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:2210 commands/tablecmds.c:18210
-#: commands/tablecmds.c:18216 commands/typecmds.c:2311
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019
+#: commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 "для типа данных %s не определён класс операторов по умолчанию для метода "
 "доступа \"%s\""
 
-#: commands/indexcmds.c:2212
+#: commands/indexcmds.c:2279
 #, c-format
 msgid ""
 "You must specify an operator class for the index or define a default "
@@ -10350,89 +10571,103 @@ msgstr ""
 "Вы должны указать класс операторов для индекса или определить класс "
 "операторов по умолчанию для этого типа данных."
 
-#: commands/indexcmds.c:2241 commands/indexcmds.c:2249
+#: commands/indexcmds.c:2308 commands/indexcmds.c:2316
 #: commands/opclasscmds.c:205
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "класс операторов \"%s\" для метода доступа \"%s\" не существует"
 
-#: commands/indexcmds.c:2263 commands/typecmds.c:2299
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "класс операторов \"%s\" не принимает тип данных %s"
 
-#: commands/indexcmds.c:2353
+#: commands/indexcmds.c:2420
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr ""
 "для типа данных %s определено несколько классов операторов по умолчанию"
 
-#: commands/indexcmds.c:2681
+#: commands/indexcmds.c:2470 commands/indexcmds.c:2489
+#, c-format
+msgid "could not identify an overlaps operator for type %s"
+msgstr "для типа %s не удалось найти оператор пересечения"
+
+#: commands/indexcmds.c:2471 commands/indexcmds.c:2490
+#, c-format
+msgid "could not identify a contained-by operator for type %s"
+msgstr "не удалось найти оператор «содержится в» для типа %s"
+
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
 #, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "нераспознанный параметр REINDEX: \"%s\""
+msgid ""
+"Could not translate compare type %d for operator family \"%s\" of access "
+"method \"%s\"."
+msgstr ""
+"Не удалось перевести тип сравнения %d для семейства операторов \"%s\" метода "
+"доступа \"%s\"."
 
-#: commands/indexcmds.c:2913
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr ""
 "в таблице \"%s\" нет индексов, которые можно переиндексировать неблокирующим "
 "способом"
 
-#: commands/indexcmds.c:2927
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "в таблице \"%s\" нет индексов для переиндексации"
 
-#: commands/indexcmds.c:2974 commands/indexcmds.c:3485
-#: commands/indexcmds.c:3615
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650
+#: commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "Переиндексировать системные каталоги неблокирующим способом нельзя"
 
-#: commands/indexcmds.c:2998
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "переиндексировать можно только текущую базу данных"
 
-#: commands/indexcmds.c:3090
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr ""
 "все системные каталоги пропускаются, так как их нельзя переиндексировать "
 "неблокирующим способом"
 
-#: commands/indexcmds.c:3123
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "переместить системные отношения нельзя, все они пропускаются"
 
-#: commands/indexcmds.c:3169
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "при переиндексировании секционированной таблицы \"%s.%s\""
 
-#: commands/indexcmds.c:3172
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "при перестроении секционированного индекса \"%s.%s\""
 
-#: commands/indexcmds.c:3365 commands/indexcmds.c:4241
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "таблица \"%s.%s\" переиндексирована"
 
-#: commands/indexcmds.c:3517 commands/indexcmds.c:3570
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "индекс \"%s.%s\" — нерабочий, переиндексация пропускается"
 
-#: commands/indexcmds.c:3520 commands/indexcmds.c:3573
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "Выполните DROP INDEX или REINDEX INDEX."
 
-#: commands/indexcmds.c:3524
+#: commands/indexcmds.c:3689
 #, c-format
 msgid ""
 "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
@@ -10440,24 +10675,24 @@ msgstr ""
 "перестроить индекс ограничения-исключения \"%s.%s\" неблокирующим способом "
 "нельзя, он пропускается"
 
-#: commands/indexcmds.c:3680
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "переиндексировать отношение такого типа неблокирующим способом нельзя"
 
-#: commands/indexcmds.c:3698
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr ""
 "переместить отношение, не являющееся разделяемым, в табличное пространство "
 "\"%s\" нельзя"
 
-#: commands/indexcmds.c:4222 commands/indexcmds.c:4234
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "индекс \"%s.%s\" был перестроен"
 
-#: commands/indexcmds.c:4224 commands/indexcmds.c:4243
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -10467,24 +10702,24 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "заблокировать отношение \"%s\" нельзя"
 
-#: commands/matview.c:206
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr ""
 "CONCURRENTLY нельзя использовать, когда материализованное представление не "
 "наполнено"
 
-#: commands/matview.c:212 gram.y:18918
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "параметры %s и %s исключают друг друга"
 
-#: commands/matview.c:269
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "обновить материализованное представление \"%s\" параллельно нельзя"
 
-#: commands/matview.c:272
+#: commands/matview.c:276
 #, c-format
 msgid ""
 "Create a unique index with no WHERE clause on one or more columns of the "
@@ -10493,7 +10728,7 @@ msgstr ""
 "Создайте уникальный индекс без предложения WHERE для одного или нескольких "
 "столбцов материализованного представления."
 
-#: commands/matview.c:666
+#: commands/matview.c:682
 #, c-format
 msgid ""
 "new data for materialized view \"%s\" contains duplicate rows without any "
@@ -10502,11 +10737,18 @@ msgstr ""
 "новые данные для материализованного представления \"%s\" содержат "
 "дублирующиеся строки (без учёта столбцов с NULL)"
 
-#: commands/matview.c:668
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "Строка: %s"
 
+#: commands/matview.c:838
+#, c-format
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr ""
+"не удалось найти подходящий уникальный индекс в материализованном "
+"представлении \"%s\""
+
 #: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
@@ -10634,105 +10876,128 @@ msgstr ""
 
 #: commands/opclasscmds.c:1259
 #, c-format
-msgid "btree comparison functions must have two arguments"
-msgstr "функции сравнения btree должны иметь два аргумента"
+msgid "ordering comparison functions must have two arguments"
+msgstr "функции сравнения для упорядочивания должны иметь два аргумента"
 
 #: commands/opclasscmds.c:1263
 #, c-format
-msgid "btree comparison functions must return integer"
-msgstr "функции сравнения btree должны возвращать целое число"
+msgid "ordering comparison functions must return integer"
+msgstr "функции сравнения для упорядочивания должны возвращать целое число"
 
 #: commands/opclasscmds.c:1280
 #, c-format
-msgid "btree sort support functions must accept type \"internal\""
-msgstr "опорные функции сортировки btree должны принимать тип \"internal\""
+msgid "ordering sort support functions must accept type \"internal\""
+msgstr ""
+"опорные функции сортировки для упорядочивания должны принимать тип "
+"\"internal\""
 
 #: commands/opclasscmds.c:1284
 #, c-format
-msgid "btree sort support functions must return void"
-msgstr "опорные функции сортировки btree должны возвращать пустое (void)"
+msgid "ordering sort support functions must return void"
+msgstr ""
+"опорные функции сортировки для упорядочивания должны возвращать пустое (void)"
 
 #: commands/opclasscmds.c:1295
 #, c-format
-msgid "btree in_range functions must have five arguments"
-msgstr "функции in_range для btree должны принимать пять аргументов"
+msgid "ordering in_range functions must have five arguments"
+msgstr "функции in_range для упорядочивания должны принимать пять аргументов"
 
 #: commands/opclasscmds.c:1299
 #, c-format
-msgid "btree in_range functions must return boolean"
-msgstr "функции in_range для btree должны возвращать логическое значение"
+msgid "ordering in_range functions must return boolean"
+msgstr ""
+"функции in_range для упорядочивания должны возвращать логическое значение"
 
 #: commands/opclasscmds.c:1315
 #, c-format
-msgid "btree equal image functions must have one argument"
-msgstr "функции равенства образов btree должны иметь один аргумент"
+msgid "ordering equal image functions must have one argument"
+msgstr ""
+"функции равенства образов для упорядочивания должны иметь один аргумент"
 
 #: commands/opclasscmds.c:1319
 #, c-format
-msgid "btree equal image functions must return boolean"
-msgstr "функции равенства образов должны возвращать логическое значение"
+msgid "ordering equal image functions must return boolean"
+msgstr ""
+"функции равенства образов для упорядочивания должны возвращать логическое "
+"значение"
 
 #: commands/opclasscmds.c:1332
 #, c-format
-msgid "btree equal image functions must not be cross-type"
-msgstr "функции равенства образов не должны быть межтиповыми"
+msgid "ordering equal image functions must not be cross-type"
+msgstr ""
+"функции равенства образов для упорядочивания не должны быть межтиповыми"
+
+#: commands/opclasscmds.c:1340
+#, c-format
+msgid "btree skip support functions must accept type \"internal\""
+msgstr "опорные функции пропуска в btree должны принимать тип \"internal\""
 
-#: commands/opclasscmds.c:1342
+#: commands/opclasscmds.c:1344
+#, c-format
+msgid "btree skip support functions must return void"
+msgstr "опорные функции пропуска в btree должны возвращать пустое (void)"
+
+#: commands/opclasscmds.c:1357
+#, c-format
+msgid "btree skip support functions must not be cross-type"
+msgstr "опорные функции пропуска в btree не должны быть межтиповыми"
+
+#: commands/opclasscmds.c:1367
 #, c-format
 msgid "hash function 1 must have one argument"
 msgstr "функция хеширования 1 должна принимать один аргумент"
 
-#: commands/opclasscmds.c:1346
+#: commands/opclasscmds.c:1371
 #, c-format
 msgid "hash function 1 must return integer"
 msgstr "функция хеширования 1 должна возвращать целое число"
 
-#: commands/opclasscmds.c:1353
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "функция хеширования 2 должна принимать два аргумента"
 
-#: commands/opclasscmds.c:1357
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "функция хеширования 2 должна возвращать значение bigint"
 
-#: commands/opclasscmds.c:1382
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "для опорной функции индексов должны быть указаны связанные типы данных"
 
-#: commands/opclasscmds.c:1407
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "номер функции %d для (%s,%s) дублируется"
 
-#: commands/opclasscmds.c:1414
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "номер оператора %d для (%s,%s) дублируется"
 
-#: commands/opclasscmds.c:1460
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "оператор %d(%s,%s) уже существует в семействе \"%s\""
 
-#: commands/opclasscmds.c:1589
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "функция %d(%s,%s) уже существует в семействе операторов \"%s\""
 
-#: commands/opclasscmds.c:1744
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "оператор %d(%s,%s) не существует в семействе операторов \"%s\""
 
-#: commands/opclasscmds.c:1784
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "функция %d(%s,%s) не существует в семействе операторов \"%s\""
 
-#: commands/opclasscmds.c:1815
+#: commands/opclasscmds.c:1840
 #, c-format
 msgid ""
 "operator class \"%s\" for access method \"%s\" already exists in schema "
@@ -10741,7 +11006,7 @@ msgstr ""
 "класс операторов \"%s\" для метода доступа \"%s\" уже существует в схеме "
 "\"%s\""
 
-#: commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1863
 #, c-format
 msgid ""
 "operator family \"%s\" for access method \"%s\" already exists in schema "
@@ -10755,7 +11020,7 @@ msgstr ""
 msgid "SETOF type not allowed for operator argument"
 msgstr "аргументом оператора не может быть тип SETOF"
 
-#: commands/operatorcmds.c:154 commands/operatorcmds.c:554
+#: commands/operatorcmds.c:154 commands/operatorcmds.c:587
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "атрибут оператора \"%s\" не распознан"
@@ -10780,49 +11045,64 @@ msgstr "нужно указать тип правого аргумента оп
 msgid "Postfix operators are not supported."
 msgstr "Постфиксные операторы не поддерживаются."
 
-#: commands/operatorcmds.c:292
+#: commands/operatorcmds.c:291
 #, c-format
 msgid "restriction estimator function %s must return type %s"
 msgstr "функция оценки ограничения %s должна возвращать тип %s"
 
-#: commands/operatorcmds.c:335
+#: commands/operatorcmds.c:309
+#, c-format
+msgid ""
+"must be superuser to specify a non-built-in restriction estimator function"
+msgstr ""
+"для указания дополнительной функции оценки ограничения нужно быть "
+"суперпользователем"
+
+#: commands/operatorcmds.c:355
 #, c-format
 msgid "join estimator function %s has multiple matches"
 msgstr "функция оценки соединения %s присутствует в нескольких экземплярах"
 
-#: commands/operatorcmds.c:350
+#: commands/operatorcmds.c:370
 #, c-format
 msgid "join estimator function %s must return type %s"
 msgstr "функция оценки соединения %s должна возвращать тип %s"
 
-#: commands/operatorcmds.c:388 parser/parse_oper.c:119 parser/parse_oper.c:637
+#: commands/operatorcmds.c:379
+#, c-format
+msgid "must be superuser to specify a non-built-in join estimator function"
+msgstr ""
+"для указания дополнительной функции оценки соединения нужно быть "
+"суперпользователем"
+
+#: commands/operatorcmds.c:421 parser/parse_oper.c:119 parser/parse_oper.c:637
 #: utils/adt/regproc.c:509 utils/adt/regproc.c:683
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "оператор не существует: %s"
 
-#: commands/operatorcmds.c:396 parser/parse_oper.c:702 parser/parse_oper.c:815
+#: commands/operatorcmds.c:429 parser/parse_oper.c:702 parser/parse_oper.c:815
 #, c-format
 msgid "operator is only a shell: %s"
 msgstr "оператор \"%s\" - лишь оболочка"
 
-#: commands/operatorcmds.c:548
+#: commands/operatorcmds.c:581
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed"
 msgstr "атрибут оператора \"%s\" нельзя изменить"
 
-#: commands/operatorcmds.c:615 commands/operatorcmds.c:622
-#: commands/operatorcmds.c:628 commands/operatorcmds.c:634
+#: commands/operatorcmds.c:648 commands/operatorcmds.c:655
+#: commands/operatorcmds.c:661 commands/operatorcmds.c:667
 #, c-format
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "атрибут оператора \"%s\" нельзя изменить, если он уже установлен"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1740 commands/tablecmds.c:2340
-#: commands/tablecmds.c:3702 commands/tablecmds.c:6605
-#: commands/tablecmds.c:9637 commands/tablecmds.c:17772
-#: commands/tablecmds.c:17807 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152
+#: commands/tablecmds.c:1800 commands/tablecmds.c:2400
+#: commands/tablecmds.c:3824 commands/tablecmds.c:6793
+#: commands/tablecmds.c:10114 commands/tablecmds.c:19565
+#: commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -10863,58 +11143,58 @@ msgstr "политика \"%s\" для таблицы \"%s\" не существ
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "для SELECT, DELETE допускается только выражение USING"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "имя курсора не может быть пустым"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr ""
 "в рамках операции с ограничениями по безопасности нельзя создать курсор WITH "
 "HOLD"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2937 utils/adt/xml.c:3107
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не существует"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "неверный оператор: имя не должно быть пустым"
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "подготовленный оператор - не SELECT"
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "неверное число параметров для подготовленного оператора \"%s\""
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "Ожидалось параметров: %d, получено: %d."
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "параметр $%d типа %s нельзя привести к ожидаемому типу %s"
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "подготовленный оператор \"%s\" уже существует"
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "подготовленный оператор \"%s\" не существует"
@@ -10925,37 +11205,38 @@ msgid "must be superuser to create custom procedural language"
 msgstr ""
 "для создания дополнительного процедурного языка нужно быть суперпользователем"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1865
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1130 postmaster/postmaster.c:1232
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "неверный формат списка в параметре \"%s\""
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "нераспознанное значение параметра публикации \"%s\": \"%s\""
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "нераспознанный параметр репликации: \"%s\""
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "для CURRENT_SCHEMA требуется, чтобы была выбрана схема"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "Системные столбцы не допускаются."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609
+#: commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "Пользовательские операторы не допускаются."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:650
 msgid ""
 "Only columns, constants, built-in operators, built-in data types, built-in "
 "collations, and immutable built-in functions are allowed."
@@ -10963,43 +11244,43 @@ msgstr ""
 "Допускаются только столбцы, константы, встроенные операторы, встроенные типы "
 "данных, встроенные правила сортировки и встроенные постоянные функции."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "Пользовательские типы не допускаются."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "Пользовательские или встроенные непостоянные функции не допускаются."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
 msgstr "Пользовательские правила сортировки не допускаются."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "неверное выражение в предложении WHERE публикации"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr ""
 "использовать в публикации предложение WHERE для отношения \"%s\" нельзя"
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr ""
 "Предложение WHERE нельзя использовать для секционированной таблицы, когда %s "
 "равен false."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr ""
 "использовать список столбцов отношения \"%s.%s\" в публикации \"%s\" нельзя"
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:809
 #, c-format
 msgid ""
 "Column lists cannot be specified in publications containing FOR TABLES IN "
@@ -11008,7 +11289,7 @@ msgstr ""
 "Списки столбцов нельзя задавать в публикациях, содержащих элементы FOR "
 "TABLES IN SCHEMA."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:823
 #, c-format
 msgid ""
 "Column lists cannot be specified for partitioned tables when %s is false."
@@ -11016,34 +11297,34 @@ msgstr ""
 "Списки столбцов нельзя задавать для секционированных таблиц, когда %s равен "
 "false."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "для создания публикации всех таблиц нужно быть суперпользователем"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr ""
 "для создания публикации вида FOR ALL TABLES IN SCHEMA нужно быть "
 "суперпользователем"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "уровень \"wal_level\" недостаточен для публикации логических изменений"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "Задайте для \"wal_level\" значение \"logical\" до создания подписок."
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "параметру \"%s\" публикации \"%s\" нельзя присвоить false"
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid ""
 "The publication contains a WHERE clause for partitioned table \"%s\", which "
@@ -11052,7 +11333,7 @@ msgstr ""
 "Публикация содержит предложение WHERE для секционированной таблицы \"%s\", "
 "что не допускается, когда \"%s\" равен false."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid ""
 "The publication contains a column list for partitioned table \"%s\", which "
@@ -11061,12 +11342,12 @@ msgstr ""
 "Публикация содержит список столбцов для секционированной таблицы \"%s\", что "
 "не допускается, когда \"%s\" равен false."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "добавить схему в публикацию \"%s\" нельзя"
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid ""
 "Schemas cannot be added if any tables that specify a column list are already "
@@ -11075,86 +11356,96 @@ msgstr ""
 "Схемы нельзя добавлять в публикацию, если в неё уже добавлены таблицы, для "
 "которых задан список столбцов."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "для добавления или замены схем нужно быть суперпользователем"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "публикация \"%s\" определена для всех таблиц (FOR ALL TABLES)"
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "В публикации вида FOR ALL TABLES нельзя добавлять или удалять таблицы."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "В публикации всех таблиц нельзя добавлять или удалять таблицы."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536
+#: commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "публикация \"%s\" не существует"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "конфликтующие или избыточные предложения WHERE для таблицы \"%s\""
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "конфликтующие или избыточные списки столбцов для таблицы \"%s\""
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "в ALTER PUBLICATION ... DROP не должен задаваться список столбцов"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "отношение \"%s\" не включено в публикацию"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "использовать WHERE при удалении таблицы из публикации нельзя"
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "таблицы из схемы \"%s\" не являются частью публикации"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "нет прав для изменения владельца публикации \"%s\""
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr ""
 "Владельцем публикации всех таблиц (FOR ALL TABLES) должен быть "
 "суперпользователь."
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr ""
 "Владельцем публикации вида FOR TABLES IN SCHEMA должен быть "
 "суперпользователь."
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "публикация с OID %u не существует"
 
+#: commands/publicationcmds.c:2138
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "неверное значение для параметра публикации \"%s\": \"%s\""
+
+#: commands/publicationcmds.c:2139
+#, c-format
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "Допустимые значения: \"%s\" и \"%s\"."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -11200,14 +11491,15 @@ msgstr "задать метку безопасности для отношени
 
 #: commands/sequence.c:748
 #, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
 msgstr ""
-"функция nextval достигла максимума для последовательности \"%s\" (%lld)"
+"функция nextval достигла максимума для последовательности \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:767
 #, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
-msgstr "функция nextval достигла минимума для последовательности \"%s\" (%lld)"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
+msgstr ""
+"функция nextval достигла минимума для последовательности \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:886
 #, c-format
@@ -11223,10 +11515,12 @@ msgstr "последнее значение (lastval) ещё не определ
 
 #: commands/sequence.c:991
 #, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
+msgid ""
+"setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>.."
+"%<PRId64>)"
 msgstr ""
-"функции setval передано значение %lld вне пределов последовательности "
-"\"%s\" (%lld..%lld)"
+"функции setval передано значение %<PRId64> вне пределов последовательности "
+"\"%s\" (%<PRId64>..%<PRId64>)"
 
 #: commands/sequence.c:1357
 #, c-format
@@ -11252,43 +11546,45 @@ msgstr "INCREMENT не может быть нулевым"
 
 #: commands/sequence.c:1466
 #, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) выходит за пределы типа данных последовательности %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr ""
+"MAXVALUE (%<PRId64>) выходит за пределы типа данных последовательности %s"
 
 #: commands/sequence.c:1498
 #, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MINVALUE (%lld) выходит за пределы типа данных последовательности %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr ""
+"MINVALUE (%<PRId64>) выходит за пределы типа данных последовательности %s"
 
 #: commands/sequence.c:1506
 #, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
-msgstr "MINVALUE (%lld) должно быть меньше MAXVALUE (%lld)"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
+msgstr "MINVALUE (%<PRId64>) должно быть меньше MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1527
 #, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "значение START (%lld) не может быть меньше MINVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "значение START (%<PRId64>) не может быть меньше MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1533
 #, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "значение START (%lld) не может быть больше MAXVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "значение START (%<PRId64>) не может быть больше MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1557
 #, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "значение RESTART (%lld) не может быть меньше MINVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "значение RESTART (%<PRId64>) не может быть меньше MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1563
 #, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "значение RESTART (%lld) не может быть больше MAXVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "значение RESTART (%<PRId64>) не может быть больше MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1574
 #, c-format
-msgid "CACHE (%lld) must be greater than zero"
-msgstr "значение CACHE (%lld) должно быть больше нуля"
+msgid "CACHE (%<PRId64>) must be greater than zero"
+msgstr "значение CACHE (%<PRId64>) должно быть больше нуля"
 
 #: commands/sequence.c:1610
 #, c-format
@@ -11325,13 +11621,13 @@ msgstr ""
 msgid "cannot change ownership of identity sequence"
 msgstr "сменить владельца последовательности идентификации нельзя"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:14486
-#: commands/tablecmds.c:17181
+#: commands/sequence.c:1671 commands/tablecmds.c:16136
+#: commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Последовательность \"%s\" связана с таблицей \"%s\"."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "в CREATE STATISTICS можно указать только одно отношение"
@@ -11341,27 +11637,33 @@ msgstr "в CREATE STATISTICS можно указать только одно о
 msgid "cannot define statistics for relation \"%s\""
 msgstr "для отношения \"%s\" нельзя определить объект статистики"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "объект статистики \"%s\" уже существует, пропускается"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "объект статистики \"%s\" уже существует"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "в статистике не может быть больше %d столбцов"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "создание статистики для системных столбцов не поддерживается"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
+#, c-format
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr ""
+"создание статистики для виртуальных генерируемых столбцов не поддерживается"
+
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid ""
 "column \"%s\" cannot be used in statistics because its type %s has no "
@@ -11370,7 +11672,7 @@ msgstr ""
 "столбец \"%s\" нельзя использовать в статистике, так как для его типа %s не "
 "определён класс операторов B-дерева по умолчанию"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:360
 #, c-format
 msgid ""
 "expression cannot be used in multivariate statistics because its type %s has "
@@ -11379,7 +11681,7 @@ msgstr ""
 "выражение нельзя использовать в многовариантной статистике, так как для его "
 "типа %s не определён класс операторов btree по умолчанию"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:381
 #, c-format
 msgid ""
 "when building statistics on a single expression, statistics kinds may not be "
@@ -11388,76 +11690,76 @@ msgstr ""
 "при построении статистики по единственному выражению указывать виды "
 "статистики нельзя"
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "нераспознанный вид статистики \"%s\""
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "для расширенной статистики требуются минимум 2 столбца"
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "повторяющееся имя столбца в определении статистики"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "повторяющееся выражение в определении статистики"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8620
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "ориентир статистики слишком мал (%d)"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8628
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "ориентир статистики снижается до %d"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "объект статистики \"%s.%s\" не существует, пропускается"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "нераспознанный параметр подписки: \"%s\""
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:404
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "нераспознанное значение origin: \"%s\""
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "неверная позиция в WAL (LSN): %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "нераспознанный параметр подписки: \"%s\""
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "указания %s и %s являются взаимоисключающими"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "для подписки с параметром %s необходимо также задать %s"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "не удалось получить список публикаций с публикующего сервера: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
@@ -11465,34 +11767,33 @@ msgstr[0] "публикация %s не существует на публику
 msgstr[1] "публикации %s не существуют на публикующем сервере"
 msgstr[2] "публикации %s не существуют на публикующем сервере"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "нет прав для создания подписки"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "Создавать подписки могут только роли с правами роли \"%s\"."
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
 #, c-format
-msgid "could not connect to the publisher: %s"
-msgstr "не удалось подключиться к серверу публикации: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
+msgstr "подключить подписку \"%s\" к серверу публикации не удалось: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "на сервере публикации создан слот репликации \"%s\""
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "подписка создана, но не подключена"
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid ""
 "To initiate replication, you must manually create the replication slot, "
@@ -11501,43 +11802,77 @@ msgstr ""
 "Чтобы начать репликацию, вы должны вручную создать слот репликации, включить "
 "подписку, а затем обновить её."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, c-format
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "для включённой подписки нельзя задать параметр \"%s\""
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid ""
+"cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr ""
+"задать параметр \"%s\" для подписки, для которой не задано имя слота, нельзя"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "подписка \"%s\" не существует"
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "для включённой подписки нельзя задать %s"
 
-#: commands/subscriptioncmds.c:1233
+#: commands/subscriptioncmds.c:1270
+#, c-format
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "параметры \"slot_name\" и \"two_phase\" нельзя изменить одновременно"
+
+#: commands/subscriptioncmds.c:1286
 #, c-format
 msgid ""
-"cannot set option \"%s\" for a subscription that does not have a slot name"
+"cannot alter \"two_phase\" when logical replication worker is still running"
 msgstr ""
-"задать параметр \"%s\" для подписки, для которой не задано имя слота, нельзя"
+"изменить параметр \"two_phase\", пока выполняется рабочий процесс логической "
+"репликации, нельзя"
+
+#: commands/subscriptioncmds.c:1287
+#, c-format
+msgid "Try again after some time."
+msgstr "Повторите попытку позже."
+
+#: commands/subscriptioncmds.c:1300
+#, c-format
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr ""
+"отключить \"two_phase\" нельзя, когда существуют подготовленные транзакции"
+
+#: commands/subscriptioncmds.c:1301
+#, c-format
+msgid "Resolve these transactions and try again."
+msgstr "Повторите попытку после завершения этих транзакций."
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "включить подписку, для которой не задано имя слота, нельзя"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
 msgstr ""
 "ALTER SUBSCRIPTION с обновлением для отключённых подписок не допускается"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr ""
 "Выполните ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase "
@@ -11546,7 +11881,7 @@ msgstr ""
 "ALTER SUBSCRIPTION с параметром публикации refresh в режиме copy_data не "
 "допускается, когда включён параметр two_phase"
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid ""
 "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with "
@@ -11556,7 +11891,7 @@ msgstr ""
 "copy_data = false либо выполните DROP/CREATE SUBSCRIPTION."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid ""
 "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE "
@@ -11565,13 +11900,13 @@ msgstr ""
 "Выполните %s с refresh = false или с copy_data = false либо выполните DROP/"
 "CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION ... REFRESH для отключённых подписок не допускается"
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid ""
 "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase "
@@ -11580,7 +11915,7 @@ msgstr ""
 "ALTER SUBSCRIPTION ... REFRESH в режиме copy_data не допускается, когда "
 "включён параметр two_phase"
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid ""
 "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/"
@@ -11589,39 +11924,39 @@ msgstr ""
 "Выполните ALTER SUBSCRIPTION ... REFRESH с copy_data = false либо выполните "
 "DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr ""
 "позиция пропуска в WAL (LSN %X/%X) должна быть больше начального LSN %X/%X"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "подписка \"%s\" не существует, пропускается"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "слот репликации \"%s\" удалён на сервере репликации"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "слот репликации \"%s\" на сервере публикации не был удалён: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "подписка с OID %u не существует"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr ""
 "не удалось получить список реплицируемых таблиц с сервера репликации: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid ""
 "subscription \"%s\" requested copy_data with origin = NONE but might copy "
@@ -11630,7 +11965,7 @@ msgstr ""
 "для подписки \"%s\" выбран режим copy_data с origin = NONE, но в неё могут "
 "попасть данные из другого источника"
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid ""
 "The subscription being created subscribes to a publication (%s) that "
@@ -11648,7 +11983,7 @@ msgstr[2] ""
 "Создаваемая подписка связана с публикациями (%s), содержащими таблицы, в "
 "которые записывают другие подписки."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid ""
 "Verify that initial data copied from the publisher tables did not come from "
@@ -11657,8 +11992,8 @@ msgstr ""
 "Убедитесь, что начальные данные, скопированные из таблиц публикации, "
 "поступили не из других источников."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1143
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid ""
 "cannot use different column lists for table \"%s.%s\" in different "
@@ -11667,7 +12002,7 @@ msgstr ""
 "использовать различные списки столбцов таблицы \"%s.%s\" в разных "
 "публикациях нельзя"
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid ""
 "could not connect to publisher when attempting to drop replication slot "
@@ -11677,7 +12012,7 @@ msgstr ""
 "\"%s\": %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid ""
 "Use %s to disable the subscription, and then use %s to disassociate it from "
@@ -11686,197 +12021,202 @@ msgstr ""
 "Выполните %s, чтобы отключить подписку, а затем выполните %s, чтобы отвязать "
 "её от слота."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "имя публикации \"%s\" используется неоднократно"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "публикация \"%s\" уже имеется в подписке \"%s\""
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "публикация \"%s\" отсутствует в подписке \"%s\""
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "удалить все публикации из подписки нельзя"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s требует логическое значение или \"parallel\""
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "таблица \"%s\" не существует"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "таблица \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "Выполните DROP TABLE для удаления таблицы."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "последовательность \"%s\" не существует"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "последовательность \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Выполните DROP SEQUENCE для удаления последовательности."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "представление \"%s\" не существует"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "представление \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "Выполните DROP VIEW для удаления представления."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "материализованное представление \"%s\" не существует"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "материализованное представление \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr ""
 "Выполните DROP MATERIALIZED VIEW для удаления материализованного "
 "представления."
 
-#: commands/tablecmds.c:279 commands/tablecmds.c:303 commands/tablecmds.c:19805
-#: parser/parse_utilcmd.c:2251
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651
+#: parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "индекс \"%s\" не существует"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "индекс \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "Выполните DROP INDEX для удаления индекса."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\" - это не тип"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "Выполните DROP TYPE для удаления типа."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14325
-#: commands/tablecmds.c:16886
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975
+#: commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "сторонняя таблица \"%s\" не существует"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "сторонняя таблица \"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Выполните DROP FOREIGN TABLE для удаления сторонней таблицы."
 
-#: commands/tablecmds.c:734
+#: commands/tablecmds.c:802
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT можно использовать только для временных таблиц"
 
-#: commands/tablecmds.c:765
+#: commands/tablecmds.c:819
+#, c-format
+msgid "partitioned tables cannot be unlogged"
+msgstr "секционированные таблицы не могут быть нежурналируемыми"
+
+#: commands/tablecmds.c:839
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr ""
 "в рамках операции с ограничениями по безопасности нельзя создать временную "
 "таблицу"
 
-#: commands/tablecmds.c:801 commands/tablecmds.c:15745
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "отношение \"%s\" наследуется неоднократно"
 
-#: commands/tablecmds.c:1067
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "отношение \"%s\" не является секционированным"
 
-#: commands/tablecmds.c:1161
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "число столбцов в ключе секционирования не может превышать %d"
 
-#: commands/tablecmds.c:1217
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "создать стороннюю секцию для секционированной таблицы \"%s\" нельзя"
 
-#: commands/tablecmds.c:1219
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "Таблица \"%s\" содержит индексы, являющиеся уникальными."
 
-#: commands/tablecmds.c:1338 commands/tablecmds.c:13341
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "слишком много размерностей массива"
 
-#: commands/tablecmds.c:1343 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "столбец \"%s\" не может быть объявлен как SETOF"
 
-#: commands/tablecmds.c:1489
+#: commands/tablecmds.c:1549
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY не поддерживает удаление нескольких объектов"
 
-#: commands/tablecmds.c:1493
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY не поддерживает режим CASCADE"
 
-#: commands/tablecmds.c:1597
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "удалить секционированный индекс \"%s\" параллельным способом нельзя"
 
-#: commands/tablecmds.c:1885
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "опустошить собственно секционированную таблицу нельзя"
 
-#: commands/tablecmds.c:1886
+#: commands/tablecmds.c:1946
 #, c-format
 msgid ""
 "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions "
@@ -11885,39 +12225,39 @@ msgstr ""
 "Не указывайте ключевое слово ONLY или выполните TRUNCATE ONLY "
 "непосредственно для секций."
 
-#: commands/tablecmds.c:1959
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "опустошение распространяется на таблицу %s"
 
-#: commands/tablecmds.c:2320
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "опустошить стороннюю таблицу \"%s\" нельзя"
 
-#: commands/tablecmds.c:2377
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "временные таблицы других сеансов нельзя опустошить"
 
-#: commands/tablecmds.c:2606 commands/tablecmds.c:15642
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "наследование от секционированной таблицы \"%s\" не допускается"
 
-#: commands/tablecmds.c:2611
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "наследование от секции \"%s\" не допускается"
 
-#: commands/tablecmds.c:2619 parser/parse_utilcmd.c:2481
-#: parser/parse_utilcmd.c:2623
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr ""
 "наследуемое отношение \"%s\" не является таблицей или сторонней таблицей"
 
-#: commands/tablecmds.c:2631
+#: commands/tablecmds.c:2700
 #, c-format
 msgid ""
 "cannot create a temporary relation as partition of permanent relation \"%s\""
@@ -11925,25 +12265,25 @@ msgstr ""
 "создать временное отношение в качестве секции постоянного отношения \"%s\" "
 "нельзя"
 
-#: commands/tablecmds.c:2640 commands/tablecmds.c:15621
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "временное отношение \"%s\" не может наследоваться"
 
-#: commands/tablecmds.c:2650 commands/tablecmds.c:15629
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "наследование от временного отношения другого сеанса невозможно"
 
-#: commands/tablecmds.c:2791 commands/tablecmds.c:2845
-#: commands/tablecmds.c:13024 parser/parse_utilcmd.c:1265
-#: parser/parse_utilcmd.c:1308 parser/parse_utilcmd.c:1735
-#: parser/parse_utilcmd.c:1843
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928
+#: commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "преобразовать ссылку на тип всей строки таблицы нельзя"
 
-#: commands/tablecmds.c:2792 parser/parse_utilcmd.c:1266
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid ""
 "Generation expression for column \"%s\" contains a whole-row reference to "
@@ -11952,58 +12292,70 @@ msgstr ""
 "Генерирующее выражение столбца \"%s\" ссылается на тип всей строки в таблице "
 "\"%s\"."
 
-#: commands/tablecmds.c:2846 parser/parse_utilcmd.c:1309
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Ограничение \"%s\" ссылается на тип всей строки в таблице \"%s\"."
 
-#: commands/tablecmds.c:2956 commands/tablecmds.c:3227
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr ""
 "столбец \"%s\" наследуется от генерируемого столбца, но для него задано "
 "значение по умолчанию"
 
-#: commands/tablecmds.c:2961 commands/tablecmds.c:3232
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr ""
 "столбец \"%s\" наследуется от генерируемого столбца, но для него задано "
 "свойство идентификации"
 
-#: commands/tablecmds.c:2969 commands/tablecmds.c:3240
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "для дочернего столбца \"%s\" указано генерирующее выражение"
 
-#: commands/tablecmds.c:2971 commands/tablecmds.c:3242
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr ""
 "Дочерний столбец может быть генерируемым, только если родительский столбец "
 "является таковым."
 
-#: commands/tablecmds.c:3017
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366
+#: commands/tablecmds.c:17562
+#, c-format
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "столбец \"%s\" наследуется от генерируемого столбца другого вида"
+
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
+#: commands/tablecmds.c:17563
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "Родительский столбец: %s, дочерний столбец: %s."
+
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "столбец \"%s\" наследует конфликтующие генерирующие выражения"
 
-#: commands/tablecmds.c:3019
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "Для разрешения конфликта укажите генерирующее выражение явно."
 
-#: commands/tablecmds.c:3023
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "столбец \"%s\" наследует конфликтующие значения по умолчанию"
 
-#: commands/tablecmds.c:3025
+#: commands/tablecmds.c:3129
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Для решения конфликта укажите желаемое значение по умолчанию."
 
-#: commands/tablecmds.c:3080
+#: commands/tablecmds.c:3196
 #, c-format
 msgid ""
 "check constraint name \"%s\" appears multiple times but with different "
@@ -12012,132 +12364,132 @@ msgstr ""
 "имя ограничения-проверки \"%s\" фигурирует несколько раз, но с разными "
 "выражениями"
 
-#: commands/tablecmds.c:3131
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "слияние столбца \"%s\" с наследованным определением"
 
-#: commands/tablecmds.c:3135
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "перемещение и слияние столбца \"%s\" с наследуемым определением"
 
-#: commands/tablecmds.c:3136
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr ""
 "Определённый пользователем столбец перемещён в позицию наследуемого столбца."
 
-#: commands/tablecmds.c:3148
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "конфликт типов в столбце \"%s\""
 
-#: commands/tablecmds.c:3150 commands/tablecmds.c:3184
-#: commands/tablecmds.c:3200 commands/tablecmds.c:3307
-#: commands/tablecmds.c:3340 commands/tablecmds.c:3356
-#: parser/parse_coerce.c:2192 parser/parse_coerce.c:2212
-#: parser/parse_coerce.c:2232 parser/parse_coerce.c:2253
-#: parser/parse_coerce.c:2308 parser/parse_coerce.c:2342
-#: parser/parse_coerce.c:2418 parser/parse_coerce.c:2449
-#: parser/parse_coerce.c:2488 parser/parse_coerce.c:2555
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302
+#: commands/tablecmds.c:3318 commands/tablecmds.c:3434
+#: commands/tablecmds.c:3462 commands/tablecmds.c:3478
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s и %s"
 
-#: commands/tablecmds.c:3162
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "конфликт правил сортировки в столбце \"%s\""
 
-#: commands/tablecmds.c:3164 commands/tablecmds.c:3326
-#: commands/tablecmds.c:7080
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448
+#: commands/tablecmds.c:7277 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\" и \"%s\""
 
-#: commands/tablecmds.c:3182
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "конфликт параметров хранения в столбце \"%s\""
 
-#: commands/tablecmds.c:3198 commands/tablecmds.c:3354
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "в столбце \"%s\" возник конфликт методов сжатия"
 
-#: commands/tablecmds.c:3293
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "слияние нескольких наследованных определений столбца \"%s\""
 
-#: commands/tablecmds.c:3305
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "конфликт типов в наследованном столбце \"%s\""
 
-#: commands/tablecmds.c:3324
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "конфликт правил сортировки в наследованном столбце \"%s\""
 
-#: commands/tablecmds.c:3338
+#: commands/tablecmds.c:3460
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "конфликт параметров хранения в наследованном столбце \"%s\""
 
-#: commands/tablecmds.c:3366
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "конфликт свойства генерирования в наследованном столбце \"%s\""
 
-#: commands/tablecmds.c:3597
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "перемещать временные таблицы других сеансов нельзя"
 
-#: commands/tablecmds.c:3670
+#: commands/tablecmds.c:3792
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "переименовать столбец типизированной таблицы нельзя"
 
-#: commands/tablecmds.c:3689
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "переименовывать столбцы отношения \"%s\" нельзя"
 
-#: commands/tablecmds.c:3784
+#: commands/tablecmds.c:3906
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr ""
 "наследованный столбец \"%s\" должен быть также переименован в дочерних "
 "таблицах"
 
-#: commands/tablecmds.c:3816
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "нельзя переименовать системный столбец \"%s\""
 
-#: commands/tablecmds.c:3831
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "нельзя переименовать наследованный столбец \"%s\""
 
-#: commands/tablecmds.c:3983
+#: commands/tablecmds.c:4108
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr ""
 "наследуемое ограничение \"%s\" должно быть также переименовано в дочерних "
 "таблицах"
 
-#: commands/tablecmds.c:3990
+#: commands/tablecmds.c:4115
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "нельзя переименовать наследованное ограничение \"%s\""
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4290
+#: commands/tablecmds.c:4415
 #, c-format
 msgid ""
 "cannot %s \"%s\" because it is being used by active queries in this session"
@@ -12146,59 +12498,59 @@ msgstr ""
 "запросами в данном сеансе"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4299
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr ""
 "нельзя выполнить %s \"%s\", так как с этим объектом связаны отложенные "
 "события триггеров"
 
-#: commands/tablecmds.c:4325
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "модифицировать временные таблицы других сеансов нельзя"
 
-#: commands/tablecmds.c:4798
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "нельзя изменить секцию \"%s\", которая не полностью отсоединена"
 
-#: commands/tablecmds.c:5002 commands/tablecmds.c:5017
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "изменить характеристику хранения дважды нельзя"
 
-#: commands/tablecmds.c:5038
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "множественные подкоманды SET ACCESS METHOD не допускаются"
 
-#: commands/tablecmds.c:5768
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "перезаписать системное отношение \"%s\" нельзя"
 
-#: commands/tablecmds.c:5774
+#: commands/tablecmds.c:5900
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "перезаписать таблицу \"%s\", используемую как таблицу каталога, нельзя"
 
-#: commands/tablecmds.c:5786
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "перезаписывать временные таблицы других сеансов нельзя"
 
-#: commands/tablecmds.c:6281
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "столбец \"%s\" отношения \"%s\" содержит значения NULL"
 
-#: commands/tablecmds.c:6298
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "ограничение-проверку \"%s\" отношения \"%s\" нарушает некоторая строка"
 
-#: commands/tablecmds.c:6317 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid ""
 "updated partition constraint for default partition \"%s\" would be violated "
@@ -12207,24 +12559,24 @@ msgstr ""
 "изменённое ограничение секции для секции по умолчанию \"%s\" будет нарушено "
 "некоторыми строками"
 
-#: commands/tablecmds.c:6323
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "ограничение секции отношения \"%s\" нарушает некоторая строка"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6588
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "действие ALTER %s нельзя выполнить с отношением \"%s\""
 
-#: commands/tablecmds.c:6843 commands/tablecmds.c:6850
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr ""
 "изменить тип \"%s\" нельзя, так как он задействован в столбце \"%s.%s\""
 
-#: commands/tablecmds.c:6857
+#: commands/tablecmds.c:7045
 #, c-format
 msgid ""
 "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
@@ -12232,152 +12584,141 @@ msgstr ""
 "изменить стороннюю таблицу \"%s\" нельзя, так как столбец \"%s.%s\" "
 "задействует тип её строки"
 
-#: commands/tablecmds.c:6864
+#: commands/tablecmds.c:7052
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
 "изменить таблицу \"%s\" нельзя, так как столбец \"%s.%s\" задействует тип её "
 "строки"
 
-#: commands/tablecmds.c:6920
+#: commands/tablecmds.c:7108
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "изменить тип \"%s\", так как это тип типизированной таблицы"
 
-#: commands/tablecmds.c:6922
+#: commands/tablecmds.c:7110
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr ""
 "Чтобы изменить также типизированные таблицы, выполните ALTER ... CASCADE."
 
-#: commands/tablecmds.c:6968
+#: commands/tablecmds.c:7156
+#, c-format
+msgid "type %s is the row type of another table"
+msgstr "тип %s представляет тип строки другой таблицы"
+
+#: commands/tablecmds.c:7158
+#, c-format
+msgid ""
+"A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr ""
+"Для типизированной таблицы должен использоваться отдельный составной тип, "
+"созданный командой CREATE TYPE."
+
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "тип %s не является составным"
 
-#: commands/tablecmds.c:6995
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "добавить столбец в типизированную таблицу нельзя"
 
-#: commands/tablecmds.c:7043
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "добавить столбец в секцию нельзя"
 
-#: commands/tablecmds.c:7072 commands/tablecmds.c:15860
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "дочерняя таблица \"%s\" имеет другой тип для столбца \"%s\""
 
-#: commands/tablecmds.c:7078 commands/tablecmds.c:15866
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr ""
 "дочерняя таблица \"%s\" имеет другое правило сортировки для столбца \"%s\""
 
-#: commands/tablecmds.c:7096
+#: commands/tablecmds.c:7293
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "объединение определений столбца \"%s\" для потомка \"%s\""
 
-#: commands/tablecmds.c:7149
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr ""
 "добавить столбец идентификации в таблицу, у которой есть дочерние, нельзя"
 
-#: commands/tablecmds.c:7362
+#: commands/tablecmds.c:7593
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "столбец также должен быть добавлен к дочерним таблицам"
 
-#: commands/tablecmds.c:7440
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "столбец \"%s\" отношения \"%s\" уже существует, пропускается"
 
-#: commands/tablecmds.c:7447
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "столбец \"%s\" отношения \"%s\" уже существует"
 
-#: commands/tablecmds.c:7513 commands/tablecmds.c:12652
-#, c-format
-msgid ""
-"cannot remove constraint from only the partitioned table when partitions "
-"exist"
-msgstr ""
-"удалить ограничение только из секционированной таблицы, когда существуют "
-"секции, нельзя"
-
-#: commands/tablecmds.c:7514 commands/tablecmds.c:7828
-#: commands/tablecmds.c:8006 commands/tablecmds.c:8113
-#: commands/tablecmds.c:8230 commands/tablecmds.c:9049
-#: commands/tablecmds.c:12653
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "Не указывайте ключевое слово ONLY."
-
-#: commands/tablecmds.c:7550 commands/tablecmds.c:7754
-#: commands/tablecmds.c:7896 commands/tablecmds.c:8028
-#: commands/tablecmds.c:8157 commands/tablecmds.c:8251
-#: commands/tablecmds.c:8352 commands/tablecmds.c:8509
-#: commands/tablecmds.c:8662 commands/tablecmds.c:8743
-#: commands/tablecmds.c:8877 commands/tablecmds.c:12806
-#: commands/tablecmds.c:14348 commands/tablecmds.c:16975
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936
+#: commands/tablecmds.c:8137 commands/tablecmds.c:8268
+#: commands/tablecmds.c:8422 commands/tablecmds.c:8516
+#: commands/tablecmds.c:8619 commands/tablecmds.c:8815
+#: commands/tablecmds.c:8981 commands/tablecmds.c:9072
+#: commands/tablecmds.c:9206 commands/tablecmds.c:14407
+#: commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "системный столбец \"%s\" нельзя изменить"
 
-#: commands/tablecmds.c:7556 commands/tablecmds.c:7902
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143
+#: commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "столбец \"%s\" отношения \"%s\" является столбцом идентификации"
 
-#: commands/tablecmds.c:7597
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "столбец \"%s\" входит в первичный ключ"
-
-#: commands/tablecmds.c:7602
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "столбец \"%s\" входит в индекс, используемый для идентификации реплики"
-
-#: commands/tablecmds.c:7625
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "столбец \"%s\" в родительской таблице помечен как NOT NULL"
 
-#: commands/tablecmds.c:7825 commands/tablecmds.c:9533
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "ограничение также должно быть добавлено к дочерним таблицам"
 
-#: commands/tablecmds.c:7826
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246
+#: commands/tablecmds.c:8378 commands/tablecmds.c:8495
+#: commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "Столбец \"%s\" отношения \"%s\" уже имеет свойство NOT NULL."
+msgid "Do not specify the ONLY keyword."
+msgstr "Не указывайте ключевое слово ONLY."
 
-#: commands/tablecmds.c:7911
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "столбец \"%s\" отношения \"%s\" является генерируемым"
 
-#: commands/tablecmds.c:8005
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr ""
 "сделать столбцом идентификации столбец одной лишь секционированной таблицы "
 "нельзя"
 
-#: commands/tablecmds.c:8011
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "сделать столбцом идентификации столбец одной секции нельзя"
 
-#: commands/tablecmds.c:8039
+#: commands/tablecmds.c:8279
 #, c-format
 msgid ""
 "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity "
@@ -12386,128 +12727,159 @@ msgstr ""
 "столбец \"%s\" отношения \"%s\" должен быть объявлен как NOT NULL, чтобы его "
 "можно было сделать столбцом идентификации"
 
-#: commands/tablecmds.c:8045
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "столбец \"%s\" отношения \"%s\" уже является столбцом идентификации"
 
-#: commands/tablecmds.c:8051
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "столбец \"%s\" отношения \"%s\" уже имеет значение по умолчанию"
 
-#: commands/tablecmds.c:8112
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr ""
 "изменить столбец идентификации для одной лишь секционированной таблицы нельзя"
 
-#: commands/tablecmds.c:8118
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "изменить столбец идентификации для одной секции нельзя"
 
-#: commands/tablecmds.c:8163 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "столбец \"%s\" отношения \"%s\" не является столбцом идентификации"
 
-#: commands/tablecmds.c:8229
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr ""
 "лишить свойства идентификации столбец одной лишь секционированной таблицы "
 "нельзя"
 
-#: commands/tablecmds.c:8235
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "лишить свойства идентификации столбец одной секции нельзя"
 
-#: commands/tablecmds.c:8264
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr ""
 "столбец \"%s\" отношения \"%s\" не является столбцом идентификации, "
 "пропускается"
 
-#: commands/tablecmds.c:8358
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "столбец \"%s\" отношения \"%s\" не является генерируемым столбцом"
 
-#: commands/tablecmds.c:8456
+#: commands/tablecmds.c:8637
+#, c-format
+msgid ""
+"ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns "
+"in tables with check constraints"
+msgstr ""
+"ALTER TABLE / SET EXPRESSION не поддерживается для виртуальных генерируемых "
+"столбцов в таблицах с ограничениями-проверками"
+
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656
+#: commands/tablecmds.c:8828
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr ""
+"Столбец \"%s\" отношения \"%s\" является виртуальным генерируемым столбцом."
+
+#: commands/tablecmds.c:8655
+#, c-format
+msgid ""
+"ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns "
+"in tables that are part of a publication"
+msgstr ""
+"ALTER TABLE / SET EXPRESSION не поддерживается для виртуальных генерируемых "
+"столбцов в таблицах, включённых в публикацию"
+
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr ""
 "ALTER TABLE / DROP EXPRESSION нужно применять также к дочерним таблицам"
 
-#: commands/tablecmds.c:8478
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "нельзя удалить генерирующее выражение из наследуемого столбца"
 
-#: commands/tablecmds.c:8517
+#: commands/tablecmds.c:8827
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
+msgid ""
+"ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
 msgstr ""
-"столбец \"%s\" отношения \"%s\" не является сохранённым генерируемым столбцом"
+"ALTER TABLE / DROP EXPRESSION не поддерживается для виртуальных генерируемых "
+"столбцов"
 
-#: commands/tablecmds.c:8522
+#: commands/tablecmds.c:8841
 #, c-format
-msgid ""
-"column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
 msgstr ""
 "столбец \"%s\" отношения \"%s\" пропускается, так как не является "
-"сохранённым генерируемым столбцом"
+"генерируемым столбцом"
 
-#: commands/tablecmds.c:8600
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "по номеру можно ссылаться только на столбец в индексе"
 
-#: commands/tablecmds.c:8652
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "столбец с номером %d отношения \"%s\" не существует"
 
-#: commands/tablecmds.c:8671
+#: commands/tablecmds.c:8991
+#, c-format
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "изменить статистику виртуального генерируемого столбца \"%s\" нельзя"
+
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "изменить статистику включённого столбца \"%s\" индекса \"%s\" нельзя"
 
-#: commands/tablecmds.c:8676
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr ""
 "изменить статистику столбца \"%s\" (не выражения) индекса \"%s\" нельзя"
 
-#: commands/tablecmds.c:8678
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "Вместо этого измените статистику для столбца в таблице."
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "нельзя удалить столбец в типизированной таблице"
 
-#: commands/tablecmds.c:8987
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "столбец \"%s\" в таблице\"%s\" не существует, пропускается"
 
-#: commands/tablecmds.c:9000
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "нельзя удалить системный столбец \"%s\""
 
-#: commands/tablecmds.c:9010
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "нельзя удалить наследованный столбец \"%s\""
 
-#: commands/tablecmds.c:9023
+#: commands/tablecmds.c:9353
 #, c-format
 msgid ""
 "cannot drop column \"%s\" because it is part of the partition key of "
@@ -12516,7 +12888,7 @@ msgstr ""
 "удалить столбец \"%s\" нельзя, так как он входит в ключ разбиения отношения "
 "\"%s\""
 
-#: commands/tablecmds.c:9048
+#: commands/tablecmds.c:9378
 #, c-format
 msgid ""
 "cannot drop column from only the partitioned table when partitions exist"
@@ -12524,7 +12896,27 @@ msgstr ""
 "удалить столбец только из секционированной таблицы, когда существуют секции, "
 "нельзя"
 
-#: commands/tablecmds.c:9253
+#: commands/tablecmds.c:9543
+#, c-format
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "столбец \"%s\" таблицы \"%s\" не помечен как NOT NULL"
+
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
+#, c-format
+msgid "cannot create primary key on column \"%s\""
+msgstr "создать первичный ключ со столбцом \"%s\" нельзя"
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
+#, c-format
+msgid ""
+"The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is "
+"incompatible with a primary key."
+msgstr ""
+"Ограничение \"%s\" для столбца \"%s\" таблицы \"%s\", помеченное %s, "
+"несовместимо с первичным ключом."
+
+#: commands/tablecmds.c:9717
 #, c-format
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned "
@@ -12533,14 +12925,14 @@ msgstr ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX не поддерживается с "
 "секционированными таблицами"
 
-#: commands/tablecmds.c:9278
+#: commands/tablecmds.c:9742
 #, 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:9615
+#: commands/tablecmds.c:10100
 #, c-format
 msgid ""
 "cannot use ONLY for foreign key on partitioned table \"%s\" referencing "
@@ -12549,34 +12941,19 @@ msgstr ""
 "нельзя использовать ONLY для стороннего ключа в секционированной таблице "
 "\"%s\", ссылающегося на отношение \"%s\""
 
-#: commands/tablecmds.c:9621
-#, c-format
-msgid ""
-"cannot add NOT VALID foreign key on partitioned table \"%s\" referencing "
-"relation \"%s\""
-msgstr ""
-"нельзя добавить с характеристикой NOT VALID сторонний ключ в "
-"секционированной таблице \"%s\", ссылающийся на отношение \"%s\""
-
-#: commands/tablecmds.c:9624
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr ""
-"Эта функциональность с секционированными таблицами пока не поддерживается."
-
-#: commands/tablecmds.c:9631 commands/tablecmds.c:10092
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "указанный объект \"%s\" не является таблицей"
 
-#: commands/tablecmds.c:9654
+#: commands/tablecmds.c:10131
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr ""
 "ограничения в постоянных таблицах могут ссылаться только на постоянные "
 "таблицы"
 
-#: commands/tablecmds.c:9661
+#: commands/tablecmds.c:10138
 #, c-format
 msgid ""
 "constraints on unlogged tables may reference only permanent or unlogged "
@@ -12585,13 +12962,13 @@ msgstr ""
 "ограничения в нежурналируемых таблицах могут ссылаться только на постоянные "
 "или нежурналируемые таблицы"
 
-#: commands/tablecmds.c:9667
+#: commands/tablecmds.c:10144
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
 "ограничения во временных таблицах могут ссылаться только на временные таблицы"
 
-#: commands/tablecmds.c:9671
+#: commands/tablecmds.c:10148
 #, c-format
 msgid ""
 "constraints on temporary tables must involve temporary tables of this session"
@@ -12599,7 +12976,28 @@ msgstr ""
 "ограничения во временных таблицах должны ссылаться только на временные "
 "таблицы текущего сеанса"
 
-#: commands/tablecmds.c:9735 commands/tablecmds.c:9741
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
+#, c-format
+msgid ""
+"foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr "внешний ключ использует PERIOD в целевой таблице, но не в ссылающейся"
+
+#: commands/tablecmds.c:10203
+#, c-format
+msgid ""
+"foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr "внешний ключ использует PERIOD в ссылающейся таблице, но не в целевой"
+
+#: commands/tablecmds.c:10217
+#, c-format
+msgid ""
+"foreign key must use PERIOD when referencing a primary key using WITHOUT "
+"OVERLAPS"
+msgstr ""
+"внешний ключ должен использовать PERIOD, ссылаясь на первичный ключ, "
+"использующий WITHOUT OVERLAPS"
+
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid ""
 "invalid %s action for foreign key constraint containing generated column"
@@ -12607,22 +13005,62 @@ msgstr ""
 "некорректное действие %s для ограничения внешнего ключа, содержащего "
 "генерируемый столбец"
 
-#: commands/tablecmds.c:9757
+#: commands/tablecmds.c:10262
+#, c-format
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr ""
+"ограничения внешних ключей с виртуальными генерируемыми столбцами не "
+"поддерживаются"
+
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
+#, c-format
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr ""
+"неподдерживаемое действие %s для ограничения внешнего ключа с указанием "
+"PERIOD"
+
+#: commands/tablecmds.c:10300
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "число столбцов в источнике и назначении внешнего ключа не совпадает"
 
-#: commands/tablecmds.c:9864
+#: commands/tablecmds.c:10356
+#, c-format
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "не удалось найти оператор пересечения для внешнего ключа"
+
+#: commands/tablecmds.c:10357
+#, c-format
+msgid "could not identify an equality operator for foreign key"
+msgstr "не удалось найти оператор равенства для внешнего ключа"
+
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "ограничение внешнего ключа \"%s\" нельзя реализовать"
 
-#: commands/tablecmds.c:9866
+#: commands/tablecmds.c:10424
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "Столбцы ключа \"%s\" и \"%s\" имеют несовместимые типы: %s и %s."
+msgid ""
+"Key columns \"%s\" of the referencing table and \"%s\" of the referenced "
+"table are of incompatible types: %s and %s."
+msgstr ""
+"Столбцы ключа \"%s\" ссылающейся таблицы и \"%s\" целевой таблицы имеют "
+"несовместимые типы: %s и %s."
 
-#: commands/tablecmds.c:10035
+#: commands/tablecmds.c:10457
+#, c-format
+msgid ""
+"Key columns \"%s\" of the referencing table and \"%s\" of the referenced "
+"table have incompatible collations: \"%s\" and \"%s\".  If either collation "
+"is nondeterministic, then both collations have to be the same."
+msgstr ""
+"Столбцы ключа \"%s\" ссылающейся таблицы и \"%s\" целевой таблицы имеют "
+"несовместимые правила сортировки: \"%s\" и \"%s\". Если одно из правил "
+"сортировки является недетерминированным, оба правила сортировки должны "
+"совпадать."
+
+#: commands/tablecmds.c:10663
 #, c-format
 msgid ""
 "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
@@ -12630,13 +13068,13 @@ msgstr ""
 "столбец \"%s\", фигурирующий в действии ON DELETE SET, должен входить во "
 "внешний ключ"
 
-#: commands/tablecmds.c:10392 commands/tablecmds.c:10832
-#: parser/parse_utilcmd.c:822 parser/parse_utilcmd.c:945
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "ограничения внешнего ключа для сторонних таблиц не поддерживаются"
 
-#: commands/tablecmds.c:10815
+#: commands/tablecmds.c:11463
 #, c-format
 msgid ""
 "cannot attach table \"%s\" as a partition because it is referenced by "
@@ -12645,86 +13083,123 @@ msgstr ""
 "присоединить таблицу \"%s\" в качестве секции нельзя, так как на неё "
 "ссылается внешний ключ \"%s\""
 
-#: commands/tablecmds.c:11416 commands/tablecmds.c:11697
-#: commands/tablecmds.c:12609 commands/tablecmds.c:12683
+#: commands/tablecmds.c:11744
+#, c-format
+msgid ""
+"constraint \"%s\" enforceability conflicts with constraint \"%s\" on "
+"relation \"%s\""
+msgstr ""
+"ограничение \"%s\" имеет свойство контролируемости, отличное от ограничения "
+"\"%s\" в отношении \"%s\""
+
+#: commands/tablecmds.c:12206
+#, c-format
+msgid "constraint must be altered in child tables too"
+msgstr "ограничение должно быть изменено также и в дочерних таблицах"
+
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932
+#: commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "ограничение \"%s\" в таблице \"%s\" не существует"
 
-#: commands/tablecmds.c:11423
+#: commands/tablecmds.c:12242
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "ограничение \"%s\" в таблице \"%s\" не является внешним ключом"
 
-#: commands/tablecmds.c:11461
+#: commands/tablecmds.c:12247
+#, c-format
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr ""
+"изменить свойство контролируемости ограничения \"%s\" отношения \"%s\" нельзя"
+
+#: commands/tablecmds.c:12253
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "ограничение \"%s\" в таблице \"%s\" не является ограничением NOT NULL"
+
+#: commands/tablecmds.c:12261
+#, c-format
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "изменить наследуемое ограничение \"%s\" в отношении \"%s\" нельзя"
+
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "изменить ограничение \"%s\" таблицы \"%s\" нельзя"
 
-#: commands/tablecmds.c:11464
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr ""
 "Ограничение \"%s\" является производным от ограничения \"%s\" таблицы \"%s\"."
 
-#: commands/tablecmds.c:11466
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "Вместо этого вы можете изменить родительское ограничение."
 
-#: commands/tablecmds.c:11705
+#: commands/tablecmds.c:12941
 #, c-format
-msgid ""
-"constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
-msgstr ""
-"ограничение \"%s\" в таблице \"%s\" не является внешним ключом или "
-"ограничением-проверкой"
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "проверить ограничение \"%s\" отношения \"%s\" нельзя"
+
+#: commands/tablecmds.c:12943
+#, c-format
+msgid "This operation is not supported for this type of constraint."
+msgstr "Эта операция не поддерживается для ограничений данного типа."
+
+#: commands/tablecmds.c:12948
+#, c-format
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "проверить отношение NOT ENFORCED нельзя"
 
-#: commands/tablecmds.c:11782
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "ограничение также должно соблюдаться в дочерних таблицах"
 
-#: commands/tablecmds.c:11869
+#: commands/tablecmds.c:13334
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "столбец \"%s\", указанный в ограничении внешнего ключа, не существует"
 
-#: commands/tablecmds.c:11875
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "системные столбцы нельзя использовать во внешних ключах"
 
-#: commands/tablecmds.c:11879
+#: commands/tablecmds.c:13344
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "во внешнем ключе не может быть больше %d столбцов"
 
-#: commands/tablecmds.c:11944
+#: commands/tablecmds.c:13412
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
 "использовать откладываемый первичный ключ в целевой внешней таблице \"%s\" "
 "нельзя"
 
-#: commands/tablecmds.c:11961
+#: commands/tablecmds.c:13429
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "в целевой внешней таблице \"%s\" нет первичного ключа"
 
-#: commands/tablecmds.c:12029
+#: commands/tablecmds.c:13502
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "в списке столбцов внешнего ключа не должно быть повторений"
 
-#: commands/tablecmds.c:12121
+#: commands/tablecmds.c:13605
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 "использовать откладываемое ограничение уникальности в целевой внешней "
 "таблице \"%s\" нельзя"
 
-#: commands/tablecmds.c:12126
+#: commands/tablecmds.c:13610
 #, c-format
 msgid ""
 "there is no unique constraint matching given keys for referenced table \"%s\""
@@ -12732,39 +13207,42 @@ msgstr ""
 "в целевой внешней таблице \"%s\" нет ограничения уникальности, "
 "соответствующего данным ключам"
 
-#: commands/tablecmds.c:12565
+#: commands/tablecmds.c:14051
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "ограничение \"%s\" в таблице \"%s\" не существует, пропускается"
+
+#: commands/tablecmds.c:14096
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "удалить наследованное ограничение \"%s\" таблицы \"%s\" нельзя"
 
-#: commands/tablecmds.c:12615
+#: commands/tablecmds.c:14148
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "ограничение \"%s\" в таблице \"%s\" не существует, пропускается"
+msgid "column \"%s\" is in a primary key"
+msgstr "столбец \"%s\" входит в первичный ключ"
 
-#: commands/tablecmds.c:12790
+#: commands/tablecmds.c:14156
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "столбец \"%s\" входит в индекс, используемый для идентификации реплики"
+
+#: commands/tablecmds.c:14389
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "изменить тип столбца в типизированной таблице нельзя"
 
-#: commands/tablecmds.c:12816
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "изменяя тип генерируемого столбца, нельзя указывать USING"
 
-#: commands/tablecmds.c:12817 commands/tablecmds.c:18028
-#: commands/tablecmds.c:18118 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:941 rewrite/rewriteHandler.c:976
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "Столбец \"%s\" является генерируемым."
-
-#: commands/tablecmds.c:12827
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "изменить наследованный столбец \"%s\" нельзя"
 
-#: commands/tablecmds.c:12836
+#: commands/tablecmds.c:14438
 #, c-format
 msgid ""
 "cannot alter column \"%s\" because it is part of the partition key of "
@@ -12773,7 +13251,7 @@ msgstr ""
 "изменить столбец \"%s\" нельзя, так как он входит в ключ разбиения отношения "
 "\"%s\""
 
-#: commands/tablecmds.c:12886
+#: commands/tablecmds.c:14493
 #, c-format
 msgid ""
 "result of USING clause for column \"%s\" cannot be cast automatically to "
@@ -12781,45 +13259,45 @@ msgid ""
 msgstr ""
 "результат USING для столбца \"%s\" нельзя автоматически привести к типу %s"
 
-#: commands/tablecmds.c:12889
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Возможно, необходимо добавить явное приведение."
 
-#: commands/tablecmds.c:12893
+#: commands/tablecmds.c:14500
 #, 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:12897
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Возможно, необходимо указать \"USING %s::%s\"."
 
-#: commands/tablecmds.c:12996
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "изменить наследованный столбец \"%s\" отношения \"%s\" нельзя"
 
-#: commands/tablecmds.c:13025
+#: commands/tablecmds.c:14636
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr "Выражение USING ссылается на тип всей строки таблицы."
 
-#: commands/tablecmds.c:13036
+#: commands/tablecmds.c:14647
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 "тип наследованного столбца \"%s\" должен быть изменён и в дочерних таблицах"
 
-#: commands/tablecmds.c:13161
+#: commands/tablecmds.c:14772
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "нельзя изменить тип столбца \"%s\" дважды"
 
-#: commands/tablecmds.c:13199
+#: commands/tablecmds.c:14810
 #, c-format
 msgid ""
 "generation expression for column \"%s\" cannot be cast automatically to type "
@@ -12828,160 +13306,160 @@ msgstr ""
 "генерирующее выражение для столбца \"%s\" нельзя автоматически привести к "
 "типу %s"
 
-#: commands/tablecmds.c:13204
+#: commands/tablecmds.c:14815
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 "значение по умолчанию для столбца \"%s\" нельзя автоматически привести к "
 "типу %s"
 
-#: commands/tablecmds.c:13508
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "изменить тип столбца, задействованного в функции или процедуре, нельзя"
 
-#: commands/tablecmds.c:13509 commands/tablecmds.c:13524
-#: commands/tablecmds.c:13544 commands/tablecmds.c:13563
-#: commands/tablecmds.c:13622
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135
+#: commands/tablecmds.c:15155 commands/tablecmds.c:15174
+#: commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s зависит от столбца \"%s\""
 
-#: commands/tablecmds.c:13523
+#: commands/tablecmds.c:15134
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr ""
 "изменить тип столбца, задействованного в представлении или правиле, нельзя"
 
-#: commands/tablecmds.c:13543
+#: commands/tablecmds.c:15154
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "изменить тип столбца, задействованного в определении триггера, нельзя"
 
-#: commands/tablecmds.c:13562
+#: commands/tablecmds.c:15173
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "изменить тип столбца, задействованного в определении политики, нельзя"
 
-#: commands/tablecmds.c:13593
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "изменить тип столбца, задействованного в генерируемом столбце, нельзя"
 
-#: commands/tablecmds.c:13594
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "Столбец \"%s\" используется генерируемым столбцом \"%s\"."
 
-#: commands/tablecmds.c:13621
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr ""
 "изменить тип столбца, задействованного в заданном для публикации предложении "
 "WHERE, нельзя"
 
-#: commands/tablecmds.c:14456 commands/tablecmds.c:14468
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "сменить владельца индекса \"%s\" нельзя"
 
-#: commands/tablecmds.c:14458 commands/tablecmds.c:14470
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "Однако возможно сменить владельца таблицы, содержащей этот индекс."
 
-#: commands/tablecmds.c:14484
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "сменить владельца последовательности \"%s\" нельзя"
 
-#: commands/tablecmds.c:14509
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "сменить владельца отношения \"%s\" нельзя"
 
-#: commands/tablecmds.c:14976
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "в одной инструкции не может быть несколько подкоманд SET TABLESPACE"
 
-#: commands/tablecmds.c:15053
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "задать параметры отношения \"%s\" нельзя"
 
-#: commands/tablecmds.c:15087 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr ""
 "WITH CHECK OPTION поддерживается только с автообновляемыми представлениями"
 
-#: commands/tablecmds.c:15338
+#: commands/tablecmds.c:16992
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr ""
 "в табличных пространствах есть только таблицы, индексы и материализованные "
 "представления"
 
-#: commands/tablecmds.c:15350
+#: commands/tablecmds.c:17004
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "перемещать объекты в/из табличного пространства pg_global нельзя"
 
-#: commands/tablecmds.c:15442
+#: commands/tablecmds.c:17096
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr ""
 "обработка прерывается из-за невозможности заблокировать отношение \"%s.%s\""
 
-#: commands/tablecmds.c:15458
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "в табличном пространстве \"%s\" не найдены подходящие отношения"
 
-#: commands/tablecmds.c:15580
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "изменить наследование типизированной таблицы нельзя"
 
-#: commands/tablecmds.c:15585 commands/tablecmds.c:16085
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "изменить наследование секции нельзя"
 
-#: commands/tablecmds.c:15590
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "изменить наследование секционированной таблицы нельзя"
 
-#: commands/tablecmds.c:15636
+#: commands/tablecmds.c:17291
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "наследование для временного отношения другого сеанса невозможно"
 
-#: commands/tablecmds.c:15649
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "наследование от секции невозможно"
 
-#: commands/tablecmds.c:15671 commands/tablecmds.c:18529
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "циклическое наследование недопустимо"
 
-#: commands/tablecmds.c:15672 commands/tablecmds.c:18530
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" уже является потомком \"%s\"."
 
-#: commands/tablecmds.c:15685
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr ""
 "триггер \"%s\" не позволяет таблице \"%s\" стать потомком в иерархии "
 "наследования"
 
-#: commands/tablecmds.c:15687
+#: commands/tablecmds.c:17342
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported in inheritance "
@@ -12990,34 +13468,35 @@ msgstr ""
 "Триггеры ROW с переходными таблицами не поддерживаются в иерархиях "
 "наследования."
 
-#: commands/tablecmds.c:15876
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "столбец \"%s\" в дочерней таблице должен быть помечен как NOT NULL"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr ""
+"столбец \"%s\" в дочерней таблице \"%s\" должен быть помечен как NOT NULL"
 
-#: commands/tablecmds.c:15885
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "столбец \"%s\" в дочерней таблице должен быть генерируемым"
 
-#: commands/tablecmds.c:15889
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "столбец \"%s\" в дочерней таблице должен быть не генерируемым"
 
-#: commands/tablecmds.c:15927
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "в дочерней таблице не хватает столбца \"%s\""
 
-#: commands/tablecmds.c:16008
+#: commands/tablecmds.c:17720
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr ""
 "дочерняя таблица \"%s\" содержит другое определение ограничения-проверки "
 "\"%s\""
 
-#: commands/tablecmds.c:16015
+#: commands/tablecmds.c:17729
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with non-inherited constraint on child table "
@@ -13026,7 +13505,7 @@ msgstr ""
 "ограничение \"%s\" конфликтует с ненаследуемым ограничением дочерней таблицы "
 "\"%s\""
 
-#: commands/tablecmds.c:16025
+#: commands/tablecmds.c:17740
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
@@ -13034,82 +13513,91 @@ msgstr ""
 "ограничение \"%s\" конфликтует с непроверенным (NOT VALID) ограничением "
 "дочерней таблицы \"%s\""
 
-#: commands/tablecmds.c:16063
+#: commands/tablecmds.c:17751
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT ENFORCED constraint on child table "
+"\"%s\""
+msgstr ""
+"ограничение \"%s\" конфликтует с неконтролируемым (NOT ENFORCED) "
+"ограничением дочерней таблицы \"%s\""
+
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "в дочерней таблице не хватает ограничения \"%s\""
 
-#: commands/tablecmds.c:16149
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr ""
 "секция \"%s\" уже ожидает отсоединения от секционированной таблицы \"%s.%s\""
 
-#: commands/tablecmds.c:16178 commands/tablecmds.c:16224
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "отношение \"%s\" не является секцией отношения \"%s\""
 
-#: commands/tablecmds.c:16230
+#: commands/tablecmds.c:17970
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "отношение \"%s\" не является предком отношения \"%s\""
 
-#: commands/tablecmds.c:16457
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "типизированные таблицы не могут наследоваться"
 
-#: commands/tablecmds.c:16487
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "в таблице не хватает столбца \"%s\""
 
-#: commands/tablecmds.c:16498
+#: commands/tablecmds.c:18282
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "таблица содержит столбец \"%s\", тогда как тип требует \"%s\""
 
-#: commands/tablecmds.c:16507
+#: commands/tablecmds.c:18291
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "таблица \"%s\" содержит столбец \"%s\" другого типа"
 
-#: commands/tablecmds.c:16521
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "таблица содержит лишний столбец \"%s\""
 
-#: commands/tablecmds.c:16573
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" - это не типизированная таблица"
 
-#: commands/tablecmds.c:16747
+#: commands/tablecmds.c:18537
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr ""
 "для идентификации реплики нельзя использовать неуникальный индекс \"%s\""
 
-#: commands/tablecmds.c:16753
+#: commands/tablecmds.c:18543
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr ""
 "для идентификации реплики нельзя использовать не непосредственный индекс "
 "\"%s\""
 
-#: commands/tablecmds.c:16759
+#: commands/tablecmds.c:18549
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr ""
 "для идентификации реплики нельзя использовать индекс с выражением \"%s\""
 
-#: commands/tablecmds.c:16765
+#: commands/tablecmds.c:18555
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "для идентификации реплики нельзя использовать частичный индекс \"%s\""
 
-#: commands/tablecmds.c:16782
+#: commands/tablecmds.c:18572
 #, c-format
 msgid ""
 "index \"%s\" cannot be used as replica identity because column %d is a "
@@ -13118,7 +13606,7 @@ msgstr ""
 "индекс \"%s\" нельзя использовать для идентификации реплики, так как столбец "
 "%d - системный"
 
-#: commands/tablecmds.c:16789
+#: commands/tablecmds.c:18579
 #, c-format
 msgid ""
 "index \"%s\" cannot be used as replica identity because column \"%s\" is "
@@ -13127,13 +13615,13 @@ msgstr ""
 "индекс \"%s\" нельзя использовать для идентификации реплики, так как столбец "
 "\"%s\" допускает NULL"
 
-#: commands/tablecmds.c:17041
+#: commands/tablecmds.c:18828
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr ""
 "изменить состояние журналирования таблицы %s нельзя, так как она временная"
 
-#: commands/tablecmds.c:17065
+#: commands/tablecmds.c:18852
 #, c-format
 msgid ""
 "cannot change table \"%s\" to unlogged because it is part of a publication"
@@ -13141,12 +13629,12 @@ msgstr ""
 "таблицу \"%s\" нельзя сделать нежурналируемой, так как она включена в "
 "публикацию"
 
-#: commands/tablecmds.c:17067
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "Нежурналируемые отношения не поддерживают репликацию."
 
-#: commands/tablecmds.c:17112
+#: commands/tablecmds.c:18899
 #, c-format
 msgid ""
 "could not change table \"%s\" to logged because it references unlogged table "
@@ -13155,7 +13643,7 @@ msgstr ""
 "не удалось сделать таблицу \"%s\" журналируемой, так как она ссылается на "
 "нежурналируемую таблицу \"%s\""
 
-#: commands/tablecmds.c:17122
+#: commands/tablecmds.c:18909
 #, c-format
 msgid ""
 "could not change table \"%s\" to unlogged because it references logged table "
@@ -13164,91 +13652,91 @@ msgstr ""
 "не удалось сделать таблицу \"%s\" нежурналируемой, так как она ссылается на "
 "журналируемую таблицу \"%s\""
 
-#: commands/tablecmds.c:17180
+#: commands/tablecmds.c:18973
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "переместить последовательность с владельцем в другую схему нельзя"
 
-#: commands/tablecmds.c:17288
+#: commands/tablecmds.c:19081
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "отношение \"%s\" уже существует в схеме \"%s\""
 
-#: commands/tablecmds.c:17713
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" - это не таблица и не материализованное представление"
 
-#: commands/tablecmds.c:17866
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" - это не составной тип"
 
-#: commands/tablecmds.c:17896
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "сменить схему индекса \"%s\" нельзя"
 
-#: commands/tablecmds.c:17898 commands/tablecmds.c:17912
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "Однако возможно сменить владельца таблицы."
 
-#: commands/tablecmds.c:17902
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "сменить схему составного типа \"%s\" нельзя"
 
-#: commands/tablecmds.c:17910
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "сменить схему TOAST-таблицы \"%s\" нельзя"
 
-#: commands/tablecmds.c:17942
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "стратегия секционирования по списку не поддерживает несколько столбцов"
 
-#: commands/tablecmds.c:18008
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "столбец \"%s\", упомянутый в ключе секционирования, не существует"
 
-#: commands/tablecmds.c:18016
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "системный столбец \"%s\" нельзя использовать в ключе секционирования"
 
-#: commands/tablecmds.c:18027 commands/tablecmds.c:18117
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "генерируемый столбец нельзя использовать в ключе секционирования"
 
-#: commands/tablecmds.c:18100
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr ""
 "выражения ключей секционирования не могут содержать ссылки на системный "
 "столбец"
 
-#: commands/tablecmds.c:18147
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr ""
 "функции в выражении ключа секционирования должны быть помечены как IMMUTABLE"
 
-#: commands/tablecmds.c:18156
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr ""
 "в качестве ключа секционирования нельзя использовать константное выражение"
 
-#: commands/tablecmds.c:18177
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "не удалось определить правило сортировки для выражения секционирования"
 
-#: commands/tablecmds.c:18212
+#: commands/tablecmds.c:20021
 #, c-format
 msgid ""
 "You must specify a hash operator class or define a default hash operator "
@@ -13257,7 +13745,7 @@ msgstr ""
 "Вы должны указать класс операторов хеширования или определить класс "
 "операторов хеширования по умолчанию для этого типа данных."
 
-#: commands/tablecmds.c:18218
+#: commands/tablecmds.c:20027
 #, c-format
 msgid ""
 "You must specify a btree operator class or define a default btree operator "
@@ -13266,27 +13754,27 @@ msgstr ""
 "Вы должны указать класс операторов B-дерева или определить класс операторов "
 "B-дерева по умолчанию для этого типа данных."
 
-#: commands/tablecmds.c:18469
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\" уже является секцией"
 
-#: commands/tablecmds.c:18475
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "подключить типизированную таблицу в качестве секции нельзя"
 
-#: commands/tablecmds.c:18491
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "подключить потомок в иерархии наследования в качестве секции нельзя"
 
-#: commands/tablecmds.c:18505
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "подключить родитель в иерархии наследования в качестве секции нельзя"
 
-#: commands/tablecmds.c:18539
+#: commands/tablecmds.c:20357
 #, c-format
 msgid ""
 "cannot attach a temporary relation as partition of permanent relation \"%s\""
@@ -13294,7 +13782,7 @@ msgstr ""
 "подключить временное отношение в качестве секции постоянного отношения "
 "\"%s\" нельзя"
 
-#: commands/tablecmds.c:18547
+#: commands/tablecmds.c:20365
 #, c-format
 msgid ""
 "cannot attach a permanent relation as partition of temporary relation \"%s\""
@@ -13302,102 +13790,102 @@ msgstr ""
 "подключить постоянное отношение в качестве секции временного отношения "
 "\"%s\" нельзя"
 
-#: commands/tablecmds.c:18555
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "подключить секцию к временному отношению в другом сеансе нельзя"
 
-#: commands/tablecmds.c:18562
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr ""
 "подключить временное отношение из другого сеанса в качестве секции нельзя"
 
-#: commands/tablecmds.c:18582
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "присоединяемая таблица \"%s\" содержит столбец идентификации \"%s\""
 
-#: commands/tablecmds.c:18584
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "Новая секция не может содержать столбец идентификации."
 
-#: commands/tablecmds.c:18592
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr ""
 "таблица \"%s\" содержит столбец \"%s\", отсутствующий в родителе \"%s\""
 
-#: commands/tablecmds.c:18595
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr ""
 "Новая секция может содержать только столбцы, имеющиеся в родительской "
 "таблице."
 
-#: commands/tablecmds.c:18607
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "триггер \"%s\" не позволяет сделать таблицу \"%s\" секцией"
 
-#: commands/tablecmds.c:18609
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "Триггеры ROW с переходными таблицами для секций не поддерживаются."
 
-#: commands/tablecmds.c:18785
+#: commands/tablecmds.c:20609
 #, c-format
 msgid ""
 "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr ""
 "нельзя присоединить стороннюю таблицу \"%s\" в качестве секции таблицы \"%s\""
 
-#: commands/tablecmds.c:18788
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "Секционированная таблица \"%s\" содержит уникальные индексы."
 
-#: commands/tablecmds.c:19110
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr ""
 "секции нельзя отсоединять в режиме CONCURRENTLY, когда существует секция по "
 "умолчанию"
 
-#: commands/tablecmds.c:19219
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "секционированная таблица \"%s\" была параллельно удалена"
 
-#: commands/tablecmds.c:19225
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "секция \"%s\" была параллельно удалена"
 
-#: commands/tablecmds.c:19839 commands/tablecmds.c:19859
-#: commands/tablecmds.c:19880 commands/tablecmds.c:19899
-#: commands/tablecmds.c:19941
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705
+#: commands/tablecmds.c:21726 commands/tablecmds.c:21745
+#: commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "нельзя присоединить индекс \"%s\" в качестве секции индекса \"%s\""
 
-#: commands/tablecmds.c:19842
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "Индекс \"%s\" уже присоединён к другому индексу."
 
-#: commands/tablecmds.c:19862
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "Индекс \"%s\" не является индексом какой-либо секции таблицы \"%s\"."
 
-#: commands/tablecmds.c:19883
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "Определения индексов не совпадают."
 
-#: commands/tablecmds.c:19902
+#: commands/tablecmds.c:21748
 #, c-format
 msgid ""
 "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint "
@@ -13406,27 +13894,37 @@ msgstr ""
 "Индекс \"%s\" принадлежит ограничению в таблице \"%s\", но для индекса "
 "\"%s\" ограничения нет."
 
-#: commands/tablecmds.c:19944
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "К секции \"%s\" уже присоединён другой индекс."
 
-#: commands/tablecmds.c:20180
+#: commands/tablecmds.c:21920
+#, c-format
+msgid "invalid primary key definition"
+msgstr "неверная определение первичного ключа"
+
+#: commands/tablecmds.c:21921
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "Столбец \"%s\" отношения \"%s\" не имеет свойства NOT NULL."
+
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "тим данных столбца %s не поддерживает сжатие"
 
-#: commands/tablecmds.c:20187
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "неверный метод сжатия \"%s\""
 
-#: commands/tablecmds.c:20213
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "неверный тип хранилища \"%s\""
 
-#: commands/tablecmds.c:20223
+#: commands/tablecmds.c:22099
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "тип данных столбца %s совместим только с хранилищем PLAIN"
@@ -13556,22 +14054,22 @@ msgstr "удалить каталоги табличного пространс
 msgid "You can remove the directories manually if necessary."
 msgstr "При необходимости вы можете удалить их вручную."
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\" - это таблица"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "У таблиц не может быть триггеров INSTEAD OF."
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\" - секционированная таблица"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported on partitioned tables."
@@ -13579,88 +14077,88 @@ msgstr ""
 "Триггеры ROW с переходными таблицами не поддерживаются в секционированных "
 "таблицах."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\" - это представление"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "У представлений не может быть строковых триггеров BEFORE/AFTER."
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "У представлений не может быть триггеров TRUNCATE."
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\" - сторонняя таблица"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "У сторонних таблиц не может быть триггеров INSTEAD OF."
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "У сторонних таблиц не может быть ограничивающих триггеров."
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "в отношении \"%s\" не может быть триггеров"
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "триггеры TRUNCATE FOR EACH ROW не поддерживаются"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "триггеры INSTEAD OF должны иметь тип FOR EACH ROW"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "триггеры INSTEAD OF несовместимы с условиями WHEN"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "для триггеров INSTEAD OF нельзя задать список столбцов"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr ""
 "указание переменной типа кортеж в предложении REFERENCING не поддерживается"
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "Используйте OLD TABLE или NEW TABLE для именования переходных таблиц."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "Триггеры сторонних таблиц не могут использовать переходные таблицы."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "Триггеры представлений не могут использовать переходные таблицы."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "триггеры ROW с переходными таблицами для секций не поддерживаются"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid ""
 "ROW triggers with transition tables are not supported on inheritance children"
@@ -13668,17 +14166,17 @@ msgstr ""
 "триггеры ROW с переходными таблицами для потомков в иерархии наследования не "
 "поддерживаются"
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "имя переходной таблицы можно задать только для триггера AFTER"
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "триггеры TRUNCATE с переходными таблицами не поддерживаются"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid ""
 "transition tables cannot be specified for triggers with more than one event"
@@ -13686,127 +14184,127 @@ msgstr ""
 "переходные таблицы нельзя задать для триггеров, назначаемых для нескольких "
 "событий"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "переходные таблицы нельзя задать для триггеров со списками столбцов"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE можно задать только для триггеров INSERT или UPDATE"
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE нельзя задать несколько раз"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE можно задать только для триггеров DELETE или UPDATE"
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE нельзя задать несколько раз"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "имя OLD TABLE не должно совпадать с именем NEW TABLE"
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr ""
 "в условии WHEN для операторного триггера нельзя ссылаться на значения "
 "столбцов"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "в условии WHEN для триггера INSERT нельзя ссылаться на значения OLD"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "в условии WHEN для триггера DELETE нельзя ссылаться на значения NEW"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr ""
 "в условии WHEN для триггера BEFORE нельзя ссылаться на системные столбцы NEW"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr ""
 "в условии WHEN для триггера BEFORE нельзя ссылаться на генерируемые столбцы "
 "NEW"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr ""
 "Используется ссылка на всю строку таблицы, а таблица содержит генерируемые "
 "столбцы."
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "триггер \"%s\" для отношения \"%s\" уже существует"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "триггер \"%s\" для отношения \"%s\" является внутренним или дочерним"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr ""
 "триггер \"%s\" для отношения \"%s\" является триггером, реализующим "
 "ограничение"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "триггер \"%s\" для таблицы \"%s\" не существует"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "переименовать триггер \"%s\" в таблице \"%s\" нельзя"
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "Однако можно переименовать триггер в секционированной таблице \"%s\"."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "триггер \"%s\" в отношении \"%s\" переименован"
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "нет доступа: \"%s\" - это системный триггер"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "триггерная функция %u вернула значение NULL"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "триггер BEFORE STATEMENT не может возвращать значение"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid ""
 "moving row to another partition during a BEFORE FOR EACH ROW trigger is not "
@@ -13814,7 +14312,7 @@ msgid ""
 msgstr ""
 "в триггере BEFORE FOR EACH ROW нельзя перемещать строку в другую секцию"
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid ""
 "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
@@ -13822,10 +14320,15 @@ msgstr ""
 "До выполнения триггера \"%s\" строка должна была находиться в секции \"%s."
 "%s\"."
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1541
-#: executor/nodeModifyTable.c:1615 executor/nodeModifyTable.c:2377
-#: executor/nodeModifyTable.c:2468 executor/nodeModifyTable.c:3132
-#: executor/nodeModifyTable.c:3302
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "собрать переходные кортежи из дочерних сторонних таблиц нельзя"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322
+#: executor/nodeModifyTable.c:3514
 #, c-format
 msgid ""
 "Consider using an AFTER trigger instead of a BEFORE trigger to propagate "
@@ -13834,34 +14337,34 @@ msgstr ""
 "Возможно, для распространения изменений в другие строки следует использовать "
 "триггер AFTER вместо BEFORE."
 
-#: commands/trigger.c:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:314
-#: executor/nodeModifyTable.c:1557 executor/nodeModifyTable.c:2394
-#: executor/nodeModifyTable.c:2618
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "не удалось сериализовать доступ из-за параллельного изменения"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1647
-#: executor/nodeModifyTable.c:2485 executor/nodeModifyTable.c:2642
-#: executor/nodeModifyTable.c:3150
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826
+#: executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "не удалось сериализовать доступ из-за параллельного удаления"
 
-#: commands/trigger.c:4599
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr ""
 "в рамках операции с ограничениями по безопасности нельзя вызвать отложенный "
 "триггер"
 
-#: commands/trigger.c:5780
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "ограничение \"%s\" не является откладываемым"
 
-#: commands/trigger.c:5803
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "ограничение \"%s\" не существует"
@@ -13976,7 +14479,7 @@ msgstr ""
 "Создайте тип в виде оболочки, затем определите для него функции ввода-вывода "
 "и в завершение выполните полноценную команду CREATE TYPE."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "атрибут типа \"%s\" не распознан"
@@ -13996,7 +14499,7 @@ msgstr "типом элемента массива не может быть %s"
 msgid "alignment \"%s\" not recognized"
 msgstr "тип выравнивания \"%s\" не распознан"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "неизвестная стратегия хранения \"%s\""
@@ -14031,78 +14534,100 @@ msgstr ""
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "\"%s\" - неподходящий базовый тип для домена"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "неоднократное определение значения типа по умолчанию"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "конфликтующие ограничения NULL/NOT NULL"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "избыточное определение ограничения NOT NULL"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "ограничения NOT NULL для доменов не могут иметь свойства NO INHERIT"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
-msgstr ""
-"ограничения-проверки для доменов не могут иметь характеристики NO INHERIT"
+msgstr "ограничения-проверки для доменов не могут иметь свойства NO INHERIT"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "ограничения уникальности невозможны для доменов"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "ограничения первичного ключа невозможны для доменов"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "ограничения-исключения невозможны для доменов"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "ограничения внешних ключей невозможны для доменов"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr ""
 "возможность определения отложенных ограничений для доменов не поддерживается"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
+#, c-format
+msgid "specifying GENERATED not supported for domains"
+msgstr ""
+"возможность определения свойства GENERATED для доменов не поддерживается"
+
+#: commands/typecmds.c:1043
+#, c-format
+msgid "specifying constraint enforceability not supported for domains"
+msgstr ""
+"возможность определения контролируемости ограничения для доменов не "
+"поддерживается"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "\"%s\" не является перечислением"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "требуется атрибут типа \"subtype\""
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "%s не может быть подтипом диапазона"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr ""
 "указано правило сортировки для диапазона, но подтип не поддерживает "
 "сортировку"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr ""
 "функцию получения канонического диапазона нельзя задать без предварительно "
 "созданного типа-пустышки"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid ""
 "Create the type as a shell type, then create its canonicalization function, "
@@ -14111,96 +14636,96 @@ msgstr ""
 "Создайте тип в виде оболочки, затем определите для него функции приведения к "
 "каноническому виду и в завершение выполните полноценную команду CREATE TYPE."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "функция ввода типа %s присутствует в нескольких экземплярах"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "функция ввода типа %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "функция ввода типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "функция вывода типа %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "функция вывода типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "функция получения типа %s присутствует в нескольких экземплярах"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "функция получения типа %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "функция получения типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "функция отправки типа %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "функция отправки типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "функция TYPMOD_IN %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "функция ввода модификатора типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "функция TYPMOD_OUT %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "функция вывода модификатора типа %s не должна быть изменчивой"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "функция анализа типа %s должна возвращать тип %s"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr ""
 "функция %s, реализующая для типа обращение по индексу, должна возвращать тип "
 "%s"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr ""
 "для пользовательских типов нельзя использовать функцию-обработчик обращения "
 "по индексу %s"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid ""
 "You must specify an operator class for the range type or define a default "
@@ -14209,141 +14734,141 @@ msgstr ""
 "Вы должны указать класс операторов для типа диапазона или определить класс "
 "операторов по умолчанию для этого подтипа."
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr ""
 "функция получения канонического диапазона %s должна возвращать диапазон"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr ""
 "функция получения канонического диапазона %s должна быть постоянной "
 "(IMMUTABLE)"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "функция различий для подтипа диапазона (%s) должна возвращать тип %s"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr ""
 "функция различий для подтипа диапазона (%s) должна быть постоянной "
 "(IMMUTABLE)"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "значение OID массива в pg_type не задано в режиме двоичного обновления"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr ""
 "значение OID мультидиапазона в pg_type не задано в режиме двоичного "
 "обновления"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr ""
 "значение OID массива мультидиапазонов в pg_type не задано в режиме двоичного "
 "обновления"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "ограничение \"%s\" для домена \"%s\" не существует"
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "ограничение \"%s\" для домена \"%s\" не существует, пропускается"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr ""
 "ограничение \"%s\" для домена \"%s\" не является ограничением-проверкой"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "столбец \"%s\" таблицы \"%s\" содержит значения NULL"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, c-format
 msgid ""
 "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr ""
 "столбец \"%s\" таблицы \"%s\" содержит значения, нарушающие новое ограничение"
 
-#: commands/typecmds.c:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "\"%s\" - это не домен"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "ограничение \"%s\" для домена \"%s\" уже существует"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "в ограничении-проверке для домена нельзя ссылаться на таблицы"
 
-#: commands/typecmds.c:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s - это тип строк таблицы"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "изменить тип массива \"%s\" нельзя"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Однако можно изменить тип %s, что повлечёт изменение типа массива."
 
-#: commands/typecmds.c:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "изменить мультидиапазонный тип %s нельзя"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr ""
 "Однако можно изменить тип %s, что повлечёт изменение мультидиапазонного типа."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "тип \"%s\" уже существует в схеме \"%s\""
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "сменить вариант хранения типа на PLAIN нельзя"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "у типа нельзя изменить атрибут \"%s\""
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "для модификации типа нужно быть суперпользователем"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "%s — не базовый тип"
@@ -14372,7 +14897,7 @@ msgid ""
 msgstr "Создавать роли с атрибутом %s могут только роли с атрибутом %s."
 
 #: commands/user.c:354 commands/user.c:1386 commands/user.c:1393
-#: utils/adt/acl.c:5574 utils/adt/acl.c:5580 gram.y:17310 gram.y:17356
+#: utils/adt/acl.c:5707 utils/adt/acl.c:5713 gram.y:17473 gram.y:17519
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "имя роли \"%s\" зарезервировано"
@@ -14479,11 +15004,11 @@ msgstr ""
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "использовать специальную роль в DROP ROLE нельзя"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:851
-#: commands/variable.c:854 commands/variable.c:971 commands/variable.c:974
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:799
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "роль \"%s\" не существует"
@@ -14557,7 +15082,7 @@ msgstr ""
 msgid "MD5 password cleared because of role rename"
 msgstr "в результате переименования роли очищен MD5-хеш пароля"
 
-#: commands/user.c:1518 gram.y:1294
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "нераспознанный параметр роли \"%s\""
@@ -14602,96 +15127,96 @@ msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr ""
 "Только роли с правами роли \"%s\" могут назначать её владельцем объектов."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "роль \"%s\" не может быть членом другой роли"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "роль \"%s\" включена в роль \"%s\""
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "привилегию %s нельзя вернуть тому, кто назначил её вам"
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid ""
 "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "роль \"%s\" уже назначена членом роли \"%s\" ролью \"%s\""
 
-#: commands/user.c:2024
+#: commands/user.c:2025
 #, c-format
 msgid ""
 "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "роль \"%s\" не была назначена членом роли \"%s\" ролью \"%s\""
 
-#: commands/user.c:2124
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "роль \"%s\" не может содержать явных членов"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "нет прав для назначения членства в роли \"%s\""
 
-#: commands/user.c:2137
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr ""
 "Только роли с атрибутом %s могут назначать членов в ролях с атрибутов %s."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "нет прав для лишения членства в роли \"%s\""
 
-#: commands/user.c:2144
+#: commands/user.c:2146
 #, c-format
 msgid ""
 "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr ""
 "Только роли с атрибутом %s могут лишать членства в ролях с атрибутом %s."
 
-#: commands/user.c:2160
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr ""
 "Только роли с привилегией %s для роли \"%s\" могут назначать членов в ней."
 
-#: commands/user.c:2167
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr ""
 "Только роли с привилегией %s для роли \"%s\" могут лишать членства в ней."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "нет полномочий для назначения прав доступа роли \"%s\""
 
-#: commands/user.c:2249
+#: commands/user.c:2251
 #, c-format
 msgid ""
 "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr ""
 "Только роли с правами роли \"%s\" могут назначать права от имени этой роли."
 
-#: commands/user.c:2258
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "Праводатель должен иметь привилегию %s для роли \"%s\"."
 
-#: commands/user.c:2266
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "нет полномочий для отзыва прав доступа, назначенных ролью \"%s\""
 
-#: commands/user.c:2268
+#: commands/user.c:2270
 #, c-format
 msgid ""
 "Only roles with privileges of role \"%s\" may revoke privileges granted by "
@@ -14699,127 +15224,121 @@ msgid ""
 msgstr ""
 "Только роли с правами роли \"%s\" могут отзывать права от имени этой роли."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "существуют зависимые права"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "Используйте CASCADE, чтобы отозвать и их."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:148
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
 msgstr ""
-"значение \"vacuum_buffer_usage_limit\" должно быть нулевым или лежать в "
-"диапазоне от %d kB до %d kB"
+"Значение \"%s\" должно быть нулевым или лежать в интервале от %d КБ до %d КБ."
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr ""
 "параметр BUFFER_USAGE_LIMIT должен быть нулевым или лежать в диапазоне от %d "
-"kB до %d kB"
-
-#: commands/vacuum.c:219
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "нераспознанный параметр ANALYZE: \"%s\""
+"КБ до %d КБ"
 
-#: commands/vacuum.c:259
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "для параметра parallel требуется значение от 0 до %d"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr ""
 "число параллельных исполнителей для выполнения очистки должно быть от 0 до %d"
 
-#: commands/vacuum.c:292
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "нераспознанный параметр VACUUM: \"%s\""
-
-#: commands/vacuum.c:318
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL нельзя выполнять в параллельном режиме"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "параметр BUFFER_USAGE_LIMIT нельзя задавать для VACUUM FULL"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "если задаётся список столбцов, необходимо указать ANALYZE"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "Параметр VACUUM DISABLE_PAGE_SKIPPING нельзя использовать с FULL"
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "VACUUM FULL работает только с PROCESS_TOAST"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS нельзя задавать со списком таблиц"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATS нельзя задавать с другими параметрами VACUUM"
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s нельзя выполнить в ходе VACUUM или ANALYZE"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "нет доступа для очистки отношения \"%s\", оно пропускается"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "нет доступа для анализа отношения \"%s\", оно пропускается"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "очистка \"%s\" пропускается --- блокировка недоступна"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "очистка \"%s\" пропускается --- это отношение более не существует"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "анализ \"%s\" пропускается --- блокировка недоступна"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "анализ \"%s\" пропускается --- это отношение более не существует"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:992
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "VACUUM ONLY для секционированной таблицы \"%s\" не имеет смысла"
+
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "момент отсечки для удаления и замораживания кортежей далеко в прошлом"
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -14831,42 +15350,42 @@ msgstr ""
 "Возможно, вам также придётся зафиксировать или откатить старые "
 "подготовленные транзакции и удалить неиспользуемые слоты репликации."
 
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "момент отсечки для замораживания мультитранзакций далеко в прошлом"
 
-#: commands/vacuum.c:1900
+#: commands/vacuum.c:1950
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "есть базы данных, которые не очищались на протяжении более чем 2 миллиардов "
 "транзакций"
 
-#: commands/vacuum.c:1901
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr ""
 "Возможно, вы уже потеряли данные в результате зацикливания ID транзакций."
 
-#: commands/vacuum.c:2080
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
 "\"%s\" пропускается --- очищать не таблицы или специальные системные таблицы "
 "нельзя"
 
-#: commands/vacuum.c:2512
+#: commands/vacuum.c:2659
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr "просканирован индекс \"%s\", удалено версий строк: %lld"
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "просканирован индекс \"%s\", удалено версий строк: %<PRId64>"
 
-#: commands/vacuum.c:2531
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "индекс \"%s\" теперь содержит версий строк: %.0f, в страницах: %u"
 
-#: commands/vacuum.c:2535
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -14878,7 +15397,7 @@ msgstr ""
 "На данный момент удалено страниц индекса: %u, из них свободны для "
 "использования: %u."
 
-#: commands/vacuumparallel.c:707
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural ""
@@ -14893,7 +15412,7 @@ msgstr[2] ""
 "запущено %d параллельных процессов очистки для очистки индекса "
 "(планировалось: %d)"
 
-#: commands/vacuumparallel.c:713
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural ""
@@ -14910,8 +15429,8 @@ msgstr[2] ""
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "Конфликтующие спецификации стиля дат."
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "Конфликтующие спецификации \"DateStyle\"."
 
 #: commands/variable.c:307
 #, c-format
@@ -14923,12 +15442,12 @@ msgstr "В интервале, задающем часовой пояс, нел
 msgid "Cannot specify days in time zone interval."
 msgstr "В интервале, задающем часовой пояс, нельзя указывать дни."
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "часовой пояс \"%s\" видимо использует координационные секунды"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL не поддерживает координационные секунды."
@@ -14938,126 +15457,108 @@ msgstr "PostgreSQL не поддерживает координационные
 msgid "UTC timezone offset is out of range."
 msgstr "смещение часового пояса UTC вне диапазона"
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr ""
 "нельзя установить режим транзакции \"чтение-запись\" внутри транзакции "
 "\"только чтение\""
 
-#: commands/variable.c:559
+#: commands/variable.c:561
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr ""
 "режим транзакции \"чтение-запись\" должен быть установлен до выполнения "
 "запросов"
 
-#: commands/variable.c:566
+#: commands/variable.c:568
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr ""
 "нельзя установить режим транзакции \"чтение-запись\" в процессе "
 "восстановления"
 
-#: commands/variable.c:592
+#: commands/variable.c:596
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "команда SET TRANSACTION ISOLATION LEVEL должна выполняться до запросов"
 
-#: commands/variable.c:599
+#: commands/variable.c:603
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr ""
 "команда SET TRANSACTION ISOLATION LEVEL не должна вызываться в подтранзакции"
 
-#: commands/variable.c:606 storage/lmgr/predicate.c:1685
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "использовать сериализуемый режим в горячем резерве нельзя"
 
-#: commands/variable.c:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Используйте REPEATABLE READ."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, c-format
 msgid ""
 "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr ""
 "команда SET TRANSACTION [NOT] DEFERRABLE не может вызываться в подтранзакции"
 
-#: commands/variable.c:631
+#: commands/variable.c:639
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr ""
 "команда SET TRANSACTION [NOT] DEFERRABLE должна выполняться до запросов"
 
-#: commands/variable.c:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr ""
+"Изменить параметр \"client_encoding\" во время параллельной операции нельзя."
+
+#: commands/variable.c:743
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "Преобразование кодировок %s <-> %s не поддерживается."
 
-#: commands/variable.c:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "Изменить клиентскую кодировку сейчас нельзя."
 
-#: commands/variable.c:781
-#, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr ""
-"изменить параметр \"client_encoding\" во время параллельной операции нельзя"
-
-#: commands/variable.c:876
+#: commands/variable.c:889
 #, c-format
 msgid "permission will be denied to set session authorization \"%s\""
 msgstr "в доступе для смены объекта авторизации \"%s\" будет отказано"
 
-#: commands/variable.c:881
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "нет доступа для смены объекта авторизации в сеансе \"%s\""
 
-#: commands/variable.c:991
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
 msgstr "нет прав установить роль \"%s\""
 
-#: commands/variable.c:996
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "нет прав установить роль \"%s\""
 
-#: commands/variable.c:1200
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour не поддерживается в данной сборке"
 
-#: commands/variable.c:1228
-#, c-format
-msgid ""
-"\"effective_io_concurrency\" must be set to 0 on platforms that lack "
-"posix_fadvise()."
-msgstr ""
-"Значение \"effective_io_concurrency\" должно равняться 0 на платформах, где "
-"отсутствует posix_fadvise()."
-
-#: commands/variable.c:1241
-#, c-format
-msgid ""
-"\"maintenance_io_concurrency\" must be set to 0 on platforms that lack "
-"posix_fadvise()."
-msgstr ""
-"Значение \"maintenance_io_concurrency\" должно равняться 0 на платформах, "
-"где отсутствует posix_fadvise()."
-
 #: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL не поддерживается в данной сборке"
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
@@ -15153,7 +15654,7 @@ msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr ""
 "для курсора \"%s\" не выполняется обновляемое сканирование таблицы \"%s\""
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3093
 #, c-format
 msgid ""
 "type of parameter %d (%s) does not match that when preparing the plan (%s)"
@@ -15161,55 +15662,55 @@ msgstr ""
 "тип параметра %d (%s) не соответствует тому, с которым подготавливался план "
 "(%s)"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2567
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3105
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "не найдено значение параметра %d"
 
-#: executor/execExpr.c:642 executor/execExpr.c:649 executor/execExpr.c:655
-#: executor/execExprInterp.c:4852 executor/execExprInterp.c:4869
-#: executor/execExprInterp.c:4968 executor/nodeModifyTable.c:203
-#: executor/nodeModifyTable.c:214 executor/nodeModifyTable.c:231
-#: executor/nodeModifyTable.c:239
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5439 executor/execExprInterp.c:5456
+#: executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "тип строки таблицы отличается от типа строки-результата запроса"
 
-#: executor/execExpr.c:643 executor/nodeModifyTable.c:204
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "Запрос возвращает больше столбцов."
 
-#: executor/execExpr.c:650 executor/nodeModifyTable.c:232
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr ""
 "Запрос выдаёт значение для удалённого столбца (с порядковым номером %d)."
 
-#: executor/execExpr.c:656 executor/execExprInterp.c:4870
-#: executor/nodeModifyTable.c:215
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr ""
 "В таблице определён тип %s (номер столбца: %d), а в запросе предполагается "
 "%s."
 
-#: executor/execExpr.c:1104 parser/parse_agg.c:838
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "вложенные вызовы оконных функций недопустимы"
 
-#: executor/execExpr.c:1649
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "целевой тип не является массивом"
 
-#: executor/execExpr.c:1989
+#: executor/execExpr.c:2033
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "столбец ROW() имеет тип %s, а должен - %s"
 
-#: executor/execExpr.c:2653 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
@@ -15218,60 +15719,60 @@ msgstr[0] "функции нельзя передать больше %d аргу
 msgstr[1] "функции нельзя передать больше %d аргументов"
 msgstr[2] "функции нельзя передать больше %d аргументов"
 
-#: executor/execExpr.c:2680 executor/execSRF.c:738 executor/functions.c:1068
-#: utils/adt/jsonfuncs.c:4054 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функция, возвращающая множество, вызвана в контексте, где ему нет места"
 
-#: executor/execExpr.c:3086 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr ""
 "к элементам типа %s нельзя обращаться по индексам, так как он это не "
 "поддерживает"
 
-#: executor/execExpr.c:3214 executor/execExpr.c:3236
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "тип %s не поддерживает изменение элемента по индексу"
 
-#: executor/execExprInterp.c:2019
+#: executor/execExprInterp.c:2415
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "атрибут %d типа %s был удалён"
 
-#: executor/execExprInterp.c:2025
+#: executor/execExprInterp.c:2421
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "атрибут %d типа %s имеет неправильный тип"
 
-#: executor/execExprInterp.c:2027 executor/execExprInterp.c:3226
-#: executor/execExprInterp.c:3272
+#: executor/execExprInterp.c:2423 executor/execExprInterp.c:3782
+#: executor/execExprInterp.c:3828
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "В таблице задан тип %s, а в запросе ожидается %s."
 
-#: executor/execExprInterp.c:2107 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2503 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "тип %s не является составным"
 
-#: executor/execExprInterp.c:2710
+#: executor/execExprInterp.c:3266
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF для таблиц такого типа не поддерживается"
 
-#: executor/execExprInterp.c:2923
+#: executor/execExprInterp.c:3479
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "не удалось объединить несовместимые массивы"
 
-#: executor/execExprInterp.c:2924
+#: executor/execExprInterp.c:3480
 #, c-format
 msgid ""
 "Array with element type %s cannot be included in ARRAY construct with "
@@ -15280,15 +15781,15 @@ msgstr ""
 "Массив с типом элементов %s нельзя включить в конструкцию ARRAY с типом "
 "элементов %s."
 
-#: executor/execExprInterp.c:2945 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3503 utils/adt/arrayfuncs.c:5593
-#: utils/adt/arrayfuncs.c:6110 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5611
+#: utils/adt/arrayfuncs.c:6130 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "число размерностей массива (%d) превышает предел (%d)"
 
-#: executor/execExprInterp.c:2965 executor/execExprInterp.c:3000
+#: executor/execExprInterp.c:3521 executor/execExprInterp.c:3556
 #, c-format
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
@@ -15296,53 +15797,53 @@ msgstr ""
 "для многомерных массивов должны задаваться выражения с соответствующими "
 "размерностями"
 
-#: executor/execExprInterp.c:2977 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
 #: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
 #: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
-#: utils/adt/arrayfuncs.c:3533 utils/adt/arrayfuncs.c:5365
-#: utils/adt/arrayfuncs.c:6202 utils/adt/arrayfuncs.c:6546
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5383
+#: utils/adt/arrayfuncs.c:6222 utils/adt/arrayfuncs.c:6566
 #: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
 #: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "размер массива превышает предел (%d)"
 
-#: executor/execExprInterp.c:3225 executor/execExprInterp.c:3271
+#: executor/execExprInterp.c:3781 executor/execExprInterp.c:3827
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "атрибут %d имеет неверный тип"
 
-#: executor/execExprInterp.c:3857 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4413 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "домен %s не допускает значения null"
 
-#: executor/execExprInterp.c:3872 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4428 utils/adt/domains.c:196
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "значение домена %s нарушает ограничение-проверку \"%s\""
 
-#: executor/execExprInterp.c:4447
+#: executor/execExprInterp.c:5003
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
 msgstr "по заданному для столбца \"%s\" пути не найден элемент SQL/JSON"
 
-#: executor/execExprInterp.c:4452
+#: executor/execExprInterp.c:5008
 #, c-format
 msgid "no SQL/JSON item found for specified path"
 msgstr "по заданному пути не найден элемент SQL/JSON"
 
 #. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
-#: executor/execExprInterp.c:4652 executor/execExprInterp.c:4660
+#: executor/execExprInterp.c:5208 executor/execExprInterp.c:5216
 #, c-format
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "привести выражение %s (%s) к типу RETURNING не удалось"
 
-#: executor/execExprInterp.c:4853
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
@@ -15350,14 +15851,14 @@ msgstr[0] "Строка таблицы содержит %d атрибут, а в
 msgstr[1] "Строка таблицы содержит %d атрибута, а в запросе ожидается %d."
 msgstr[2] "Строка таблицы содержит %d атрибутов, а в запросе ожидается %d."
 
-#: executor/execExprInterp.c:4969 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr ""
 "Несоответствие параметров физического хранения удалённого атрибута (под "
 "номером %d)."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:608
 #, c-format
 msgid ""
 "ON CONFLICT does not support deferrable unique constraints/exclusion "
@@ -15366,159 +15867,165 @@ msgstr ""
 "ON CONFLICT не поддерживает откладываемые ограничения уникальности/"
 "ограничения-исключения в качестве определяющего индекса"
 
-#: executor/execIndexing.c:870
+#: executor/execIndexing.c:911
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "не удалось создать ограничение-исключение \"%s\""
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:914
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Ключ %s конфликтует с ключом %s."
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:916
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Обнаружен конфликт ключей."
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:922
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "конфликтующее значение ключа нарушает ограничение-исключение \"%s\""
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:925
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Ключ %s конфликтует с существующим ключом %s."
 
-#: executor/execIndexing.c:886
+#: executor/execIndexing.c:927
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Ключ конфликтует с уже существующим."
 
-#: executor/execMain.c:1039
+#: executor/execIndexing.c:1172
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr ""
+"в столбце \"%s\" отношения \"%s\" найдено пустое значение WITHOUT OVERLAPS"
+
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "последовательность \"%s\" изменить нельзя"
 
-#: executor/execMain.c:1045
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "TOAST-отношение \"%s\" изменить нельзя"
 
-#: executor/execMain.c:1064
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "изменить материализованное представление \"%s\" нельзя"
 
-#: executor/execMain.c:1076
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "вставлять данные в стороннюю таблицу \"%s\" нельзя"
 
-#: executor/execMain.c:1082
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "сторонняя таблица \"%s\" не допускает добавления"
 
-#: executor/execMain.c:1089
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "изменять данные в сторонней таблице \"%s\""
 
-#: executor/execMain.c:1095
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "сторонняя таблица \"%s\" не допускает изменения"
 
-#: executor/execMain.c:1102
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "удалять данные из сторонней таблицы \"%s\" нельзя"
 
-#: executor/execMain.c:1108
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "сторонняя таблица \"%s\" не допускает удаления"
 
-#: executor/execMain.c:1119
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "отношение \"%s\" изменить нельзя"
 
-#: executor/execMain.c:1146
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "блокировать строки в последовательности \"%s\" нельзя"
 
-#: executor/execMain.c:1153
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "блокировать строки в TOAST-отношении \"%s\" нельзя"
 
-#: executor/execMain.c:1160
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "блокировать строки в представлении \"%s\" нельзя"
 
-#: executor/execMain.c:1168
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "блокировать строки в материализованном представлении \"%s\" нельзя"
 
-#: executor/execMain.c:1177 executor/execMain.c:2687
+#: executor/execMain.c:1227 executor/execMain.c:2869
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "блокировать строки в сторонней таблице \"%s\" нельзя"
 
-#: executor/execMain.c:1183
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "блокировать строки в отношении \"%s\" нельзя"
 
-#: executor/execMain.c:1901
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "новая строка в отношении \"%s\" нарушает ограничение секции"
 
-#: executor/execMain.c:1903 executor/execMain.c:1987 executor/execMain.c:2038
-#: executor/execMain.c:2148
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218
+#: executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "Ошибочная строка содержит %s."
 
-#: executor/execMain.c:1984
+#: executor/execMain.c:2078
+#, c-format
+msgid "new row for relation \"%s\" violates check constraint \"%s\""
+msgstr "новая строка в отношении \"%s\" нарушает ограничение-проверку \"%s\""
+
+#: executor/execMain.c:2215
 #, c-format
 msgid ""
 "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
 msgstr ""
 "значение NULL в столбце \"%s\" отношения \"%s\" нарушает ограничение NOT NULL"
 
-#: executor/execMain.c:2036
-#, c-format
-msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "новая строка в отношении \"%s\" нарушает ограничение-проверку \"%s\""
-
-#: executor/execMain.c:2146
+#: executor/execMain.c:2324
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "новая строка нарушает ограничение-проверку для представления \"%s\""
 
-#: executor/execMain.c:2156
+#: executor/execMain.c:2334
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr ""
 "новая строка нарушает политику защиты на уровне строк \"%s\" для таблицы "
 "\"%s\""
 
-#: executor/execMain.c:2161
+#: executor/execMain.c:2339
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr ""
 "новая строка нарушает политику защиты на уровне строк для таблицы \"%s\""
 
-#: executor/execMain.c:2169
+#: executor/execMain.c:2347
 #, c-format
 msgid ""
 "target row violates row-level security policy \"%s\" (USING expression) for "
@@ -15527,7 +16034,7 @@ msgstr ""
 "целевая строка нарушает политику защиты на уровне строк \"%s\" (выражение "
 "USING) для таблицы \"%s\""
 
-#: executor/execMain.c:2174
+#: executor/execMain.c:2352
 #, c-format
 msgid ""
 "target row violates row-level security policy (USING expression) for table "
@@ -15536,7 +16043,7 @@ msgstr ""
 "новая строка нарушает политику защиты на уровне строк (выражение USING) для "
 "таблицы \"%s\""
 
-#: executor/execMain.c:2181
+#: executor/execMain.c:2359
 #, c-format
 msgid ""
 "new row violates row-level security policy \"%s\" (USING expression) for "
@@ -15545,7 +16052,7 @@ msgstr ""
 "новая строка нарушает политику защиты на уровне строк \"%s\" (выражение "
 "USING) для таблицы \"%s\""
 
-#: executor/execMain.c:2186
+#: executor/execMain.c:2364
 #, c-format
 msgid ""
 "new row violates row-level security policy (USING expression) for table "
@@ -15554,17 +16061,17 @@ msgstr ""
 "новая строка нарушает политику защиты на уровне строк (выражение USING) для "
 "таблицы \"%s\""
 
-#: executor/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "для строки не найдена секция в отношении \"%s\""
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "Ключ секционирования для неподходящей строки содержит %s."
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid ""
 "tuple to be locked was already moved to another partition due to concurrent "
@@ -15573,31 +16080,23 @@ msgstr ""
 "кортеж, подлежащий блокировке, был перемещён в другую секцию в результате "
 "параллельного изменения; следует повторная попытка"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "параллельное изменение; следует повторная попытка"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "параллельное удаление; следует повторная попытка"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3852
-#: utils/adt/arrayfuncs.c:4407 utils/adt/arrayfuncs.c:6426
-#: utils/adt/rowtypes.c:1220
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "не удалось найти оператор равенства для типа %s"
-
-#: executor/execReplication.c:687 executor/execReplication.c:693
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "изменять данные в таблице \"%s\" нельзя"
 
-#: executor/execReplication.c:689 executor/execReplication.c:701
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid ""
 "Column used in the publication WHERE expression is not part of the replica "
@@ -15606,7 +16105,7 @@ msgstr ""
 "Столбец, фигурирующий в выражении WHERE публикации, не входит в "
 "идентификатор реплики."
 
-#: executor/execReplication.c:695 executor/execReplication.c:707
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid ""
 "Column list used by the publication does not cover the replica identity."
@@ -15614,12 +16113,20 @@ msgstr ""
 "Список столбцов, используемых в публикации, не покрывает идентификатор "
 "реплики."
 
-#: executor/execReplication.c:699 executor/execReplication.c:705
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr ""
+"Идентификатор реплики не должен содержать неопубликованные генерируемые "
+"столбцы."
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "удалять данные из таблицы \"%s\" нельзя"
 
-#: executor/execReplication.c:725
+#: executor/execReplication.c:859
 #, c-format
 msgid ""
 "cannot update table \"%s\" because it does not have a replica identity and "
@@ -15628,14 +16135,14 @@ msgstr ""
 "изменение в таблице \"%s\" невозможно, так как в ней отсутствует "
 "идентификатор реплики, но она публикует изменения"
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr ""
 "Чтобы эта таблица поддерживала изменение, установите REPLICA IDENTITY, "
 "выполнив ALTER TABLE."
 
-#: executor/execReplication.c:731
+#: executor/execReplication.c:865
 #, c-format
 msgid ""
 "cannot delete from table \"%s\" because it does not have a replica identity "
@@ -15644,7 +16151,7 @@ msgstr ""
 "удаление из таблицы \"%s\" невозможно, так как в ней отсутствует "
 "идентификатор реплики, но она публикует удаления"
 
-#: executor/execReplication.c:733
+#: executor/execReplication.c:867
 #, c-format
 msgid ""
 "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
@@ -15652,7 +16159,7 @@ msgstr ""
 "Чтобы эта таблица поддерживала удаление, установите REPLICA IDENTITY, "
 "выполнив ALTER TABLE."
 
-#: executor/execReplication.c:749
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr ""
@@ -15708,79 +16215,58 @@ msgstr[2] ""
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "Возвращён тип %s (номер столбца: %d), а в запросе предполагается %s."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "системный столбец нельзя получить в данном контексте"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
 msgstr "для этого типа кортежей транзакционная информация отсутствует"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
+#: executor/execTuples.c:391 executor/execTuples.c:796
 #, c-format
 msgid "don't have a storage tuple in this context"
 msgstr "в данном контексте хранимый кортеж отсутствует"
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "материализованное представление \"%s\" не было наполнено"
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "Примените команду REFRESH MATERIALIZED VIEW."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "не удалось определить фактический тип аргумента, объявленного как %s"
 
-#: executor/functions.c:513
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "в функции SQL нельзя выполнить COPY с участием клиента"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:519
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "%s нельзя использовать в SQL-функции"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:527 executor/spi.c:1744 executor/spi.c:2657
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s нельзя использовать в не изменчивой (volatile) функции"
 
-#: executor/functions.c:1452
-#, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL-функция \"%s\", оператор %d"
-
-#: executor/functions.c:1478
-#, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "SQL-функция \"%s\" (при старте)"
-
-#: executor/functions.c:1563
-#, c-format
-msgid ""
-"calling procedures with output arguments is not supported in SQL functions"
-msgstr ""
-"вызов процедур с выходными аргументами в функциях SQL не поддерживается"
-
-#: executor/functions.c:1698 executor/functions.c:1736
-#: executor/functions.c:1750 executor/functions.c:1845
-#: executor/functions.c:1878 executor/functions.c:1892
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "несовпадение типа возврата в функции (в объявлении указан тип %s)"
 
-#: executor/functions.c:1700
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
 msgid ""
 "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE "
@@ -15789,43 +16275,65 @@ msgstr ""
 "Последним оператором в функции должен быть SELECT или INSERT/UPDATE/DELETE/"
 "MERGE RETURNING."
 
-#: executor/functions.c:1738
+#: executor/functions.c:1270 utils/cache/plancache.c:860
+#, c-format
+msgid "cached plan must not change result type"
+msgstr "в кешированном плане не должен изменяться тип результата"
+
+#: executor/functions.c:1922 executor/functions.c:1953
+#, c-format
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL-функция \"%s\" (при старте)"
+
+#: executor/functions.c:1950
+#, c-format
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL-функция \"%s\", оператор %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid ""
+"calling procedures with output arguments is not supported in SQL functions"
+msgstr ""
+"вызов процедур с выходными аргументами в функциях SQL не поддерживается"
+
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "Последний оператор должен возвращать один столбец."
 
-#: executor/functions.c:1752
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Фактический тип возврата: %s."
 
-#: executor/functions.c:1847
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "Последний оператор возвращает слишком много столбцов."
 
-#: executor/functions.c:1880
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "Последний оператор возвращает %s вместо %s для столбца %d."
 
-#: executor/functions.c:1894
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "Последний оператор возвращает слишком мало столбцов."
 
-#: executor/functions.c:1922
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "для SQL-функций тип возврата %s не поддерживается"
 
-#: executor/nodeAgg.c:3936 executor/nodeWindowAgg.c:2975
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3041
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 "агрегатная функция %u должна иметь совместимые входной и переходный типы"
 
-#: executor/nodeAgg.c:3966 parser/parse_agg.c:680 parser/parse_agg.c:708
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "вложенные вызовы агрегатных функций недопустимы"
@@ -15835,12 +16343,12 @@ msgstr "вложенные вызовы агрегатных функций не
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "нестандартное сканирование \"%s\" не поддерживает MarkPos"
 
-#: executor/nodeHashjoin.c:1131 executor/nodeHashjoin.c:1161
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "не удалось переместиться во временном файле хеш-соединения"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr ""
@@ -15857,25 +16365,31 @@ msgstr "OFFSET не может быть отрицательным"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT не может быть отрицательным"
 
-#: executor/nodeMergejoin.c:1579
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr ""
 "RIGHT JOIN поддерживается только с условиями, допускающими соединение "
 "слиянием"
 
-#: executor/nodeMergejoin.c:1597
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr ""
 "FULL JOIN поддерживается только с условиями, допускающими соединение слиянием"
 
-#: executor/nodeModifyTable.c:240
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr ""
+"Запрос выдаёт значение для генерируемого столбца (с порядковым номером %d)."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "Запрос возвращает меньше столбцов."
 
-#: executor/nodeModifyTable.c:1540 executor/nodeModifyTable.c:1614
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid ""
 "tuple to be deleted was already modified by an operation triggered by the "
@@ -15884,12 +16398,12 @@ msgstr ""
 "кортеж, который должен быть удалён, уже модифицирован в операции, вызванной "
 "текущей командой"
 
-#: executor/nodeModifyTable.c:1769
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "неверное указание ON UPDATE"
 
-#: executor/nodeModifyTable.c:1770
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid ""
 "The result tuple would appear in a different partition than the original "
@@ -15898,7 +16412,7 @@ msgstr ""
 "Результирующий кортеж окажется перемещённым из секции исходного кортежа в "
 "другую."
 
-#: executor/nodeModifyTable.c:2226
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid ""
 "cannot move tuple across partitions when a non-root ancestor of the source "
@@ -15907,26 +16421,26 @@ msgstr ""
 "нельзя переместить кортеж между секциями, когда внешний ключ непосредственно "
 "ссылается на предка исходной секции, который не является корнем иерархии"
 
-#: executor/nodeModifyTable.c:2227
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid ""
 "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr ""
 "Внешний ключ ссылается на предка \"%s\", а не на корневого предка \"%s\"."
 
-#: executor/nodeModifyTable.c:2230
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "Возможно, имеет смысл перенацелить внешний ключ на таблицу \"%s\"."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2596 executor/nodeModifyTable.c:3138
-#: executor/nodeModifyTable.c:3308
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328
+#: executor/nodeModifyTable.c:3520
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "команда %s не может подействовать на строку дважды"
 
-#: executor/nodeModifyTable.c:2598
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid ""
 "Ensure that no rows proposed for insertion within the same command have "
@@ -15935,7 +16449,7 @@ msgstr ""
 "Проверьте, не содержат ли строки, которые должна добавить команда, "
 "дублирующиеся значения, подпадающие под ограничения."
 
-#: executor/nodeModifyTable.c:3131 executor/nodeModifyTable.c:3301
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3513
 #, c-format
 msgid ""
 "tuple to be updated or deleted was already modified by an operation "
@@ -15944,14 +16458,14 @@ msgstr ""
 "кортеж, который должен быть изменён или удалён, уже модифицирован в "
 "операции, вызванной текущей командой"
 
-#: executor/nodeModifyTable.c:3140 executor/nodeModifyTable.c:3310
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr ""
 "Проверьте, не может ли какой-либо целевой строке соответствовать более одной "
 "исходной строки."
 
-#: executor/nodeModifyTable.c:3209
+#: executor/nodeModifyTable.c:3399
 #, c-format
 msgid ""
 "tuple to be merged was already moved to another partition due to concurrent "
@@ -15970,8 +16484,8 @@ msgstr "параметр TABLESAMPLE не может быть NULL"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "параметр TABLESAMPLE REPEATABLE не может быть NULL"
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "подзапрос в выражении вернул больше одной строки"
@@ -16006,27 +16520,27 @@ msgstr "в столбце \"%s\" не допускается NULL"
 msgid "moving-aggregate transition function must not return null"
 msgstr "функция перехода движимого агрегата не должна возвращать NULL"
 
-#: executor/nodeWindowAgg.c:2083
+#: executor/nodeWindowAgg.c:2106
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "смещение начала рамки не может быть NULL"
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2120
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "смещение начала рамки не может быть отрицательным"
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2133
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "смещение конца рамки не может быть NULL"
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2147
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "смещение конца рамки не может быть отрицательным"
 
-#: executor/nodeWindowAgg.c:2891
+#: executor/nodeWindowAgg.c:2957
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr ""
@@ -16079,7 +16593,7 @@ msgstr "не удалось открыть запрос %s как курсор"
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE не поддерживается"
 
-#: executor/spi.c:1719 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Прокручиваемые курсоры должны быть READ ONLY."
@@ -16097,8 +16611,8 @@ msgstr "запрос %s не возвращает кортежи"
 
 #: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "SQL-выражение \"%s\""
+msgid "PL/pgSQL expression \"%s\""
+msgstr "выражение PL/pgSQL \"%s\""
 
 #: executor/spi.c:2992
 #, c-format
@@ -16115,28 +16629,28 @@ msgstr "SQL-оператор: \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "не удалось передать кортеж в очередь в разделяемой памяти"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "сопоставление для пользователя \"%s\", сервера \"%s\" не найдено"
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7153
-#: optimizer/util/plancat.c:540
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299
+#: optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr "доступ к несистемным сторонним таблицам ограничен"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "неверный параметр \"%s\""
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "Возможно, предполагался параметр \"%s\"."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "В данном контексте недопустимы никакие параметры."
@@ -16147,82 +16661,294 @@ msgstr "В данном контексте недопустимы никакие
 msgid "Failed on DSA request of size %zu."
 msgstr "Ошибка при запросе памяти DSA (%zu Б)."
 
-#: libpq/auth-sasl.c:97
-#, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "ожидался ответ SASL, но получено сообщение %d"
-
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
 msgid "client selected an invalid SASL authentication mechanism"
 msgstr "клиент выбрал неверный механизм аутентификации SASL"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
+#, c-format
+msgid "malformed OAUTHBEARER message"
+msgstr "неправильное сообщение OAUTHBEARER"
+
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
+#, c-format
+msgid "The message is empty."
+msgstr "Сообщение пустое."
+
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
+#, c-format
+msgid "Message length does not match input length."
+msgstr "Длина сообщения не соответствует входной длине."
+
+#: libpq/auth-oauth.c:193
+#, c-format
+msgid "Client did not send a kvsep response."
+msgstr "Клиент не передал ответ kvsep."
+
+#: libpq/auth-oauth.c:221
+#, c-format
+msgid ""
+"The server does not support channel binding for OAuth, but the client "
+"message includes channel binding data."
+msgstr ""
+"Сервер не поддерживает связывание каналов для OAuth, но клиентское сообщение "
+"содержит данные связывания."
+
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
+#, c-format
+msgid "Comma expected, but found character \"%s\"."
+msgstr "Ожидалась запятая, но обнаружен символ \"%s\"."
+
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
+#, c-format
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "Неожиданный флаг связывания каналов \"%s\"."
+
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
+#, c-format
+msgid "client uses authorization identity, but it is not supported"
+msgstr "клиент передал идентификатор для авторизации, но это не поддерживается"
+
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
+#, c-format
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "Неожиданный атрибут \"%s\" в первом сообщении клиента."
+
+#: libpq/auth-oauth.c:264
+#, c-format
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr ""
+"Ожидался разделитель между ключом и значением, но обнаружен символ \"%s\"."
+
+#: libpq/auth-oauth.c:273
+#, c-format
+msgid "Message does not contain an auth value."
+msgstr "Сообщение не содержит значение auth."
+
+#: libpq/auth-oauth.c:280
+#, c-format
+msgid "Message contains additional data after the final terminator."
+msgstr "Сообщение содержит дополнительные данные после завершения."
+
+#: libpq/auth-oauth.c:343
+#, c-format
+msgid "Message contains an empty key name."
+msgstr "Сообщение содержит пустое имя ключа."
+
+#: libpq/auth-oauth.c:350
+#, c-format
+msgid "Message contains an invalid key name."
+msgstr "Сообщение содержит некорректное имя ключа."
+
+#: libpq/auth-oauth.c:376
+#, c-format
+msgid "Message contains an invalid value."
+msgstr "Сообщение содержит некорректное значение."
+
+#: libpq/auth-oauth.c:421
+#, c-format
+msgid "Message contains an unterminated key/value pair."
+msgstr "Сообщение содержит незавершённую пару ключ/значение."
+
+#: libpq/auth-oauth.c:439
+#, c-format
+msgid "Message contains a key without a value."
+msgstr "Сообщение содержит ключ без значения."
+
+#: libpq/auth-oauth.c:453
+#, c-format
+msgid "Message contains multiple auth values."
+msgstr "Сообщение содержит несколько значений auth."
+
+#: libpq/auth-oauth.c:473
+#, c-format
+msgid "Message did not contain a final terminator."
+msgstr "Сообщение не имеет завершения."
+
+#: libpq/auth-oauth.c:499
+#, c-format
+msgid "OAuth is not properly configured for this user"
+msgstr "протокол OAuth не настроен правильно для данного пользователя"
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr ""
+"В pg_hba.conf должны задаваться параметры, определяющие издателя и область "
+"действия."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, c-format
+msgid "malformed OAuth bearer token"
+msgstr "неправильный токен предъявителя в OAuth"
+
+#: libpq/auth-oauth.c:586
+#, c-format
+msgid "Client response indicated a non-Bearer authentication scheme."
+msgstr "В ответе клиента указана схема аутентификации, отличная от Bearer."
+
+#: libpq/auth-oauth.c:603
+#, c-format
+msgid "Bearer token is empty."
+msgstr "Токен предъявителя пустой."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "Токен предъявителя имеет некорректный формат."
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "запрошена проверка токена OAuth, но модуль проверки не загружен"
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "внутренняя ошибка в модуле проверки OAuth"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, c-format
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr ""
+"пользователь \"%s\" не прошёл проверку подлинности предъявителя в OAuth"
+
+#: libpq/auth-oauth.c:681
+#, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "Модуль проверки не смог авторизовать предоставленный токен."
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "Модуль проверки не предоставил удостоверение."
+
+#: libpq/auth-oauth.c:760
+#, c-format
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "в модуле %s \"%s\" должен быть определён символ %s"
+
+#: libpq/auth-oauth.c:773
+#, c-format
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "модуль %s \"%s\": несовпадение магического числа"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "Магическое число в сервере: 0x%08X, в модуле: 0x%08X."
+
+#: libpq/auth-oauth.c:784
+#, c-format
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "модуль %s \"%s\" должен предоставить функцию обратного вызова %s"
+
+#: libpq/auth-oauth.c:833
+#, c-format
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr ""
+"для метода аутентификации %s необходимо задать oauth_validator_libraries"
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:201
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "строка %d файла конфигурации \"%s\""
+
+#: libpq/auth-oauth.c:867
+#, c-format
+msgid ""
+"authentication method \"oauth\" requires argument \"validator\" to be set "
+"when oauth_validator_libraries contains multiple options"
+msgstr ""
+"для метода проверки подлинности \"oauth\" требуется определить аргумент "
+"\"validator\", когда oauth_validator_libraries содержит несколько значений"
+
+#: libpq/auth-oauth.c:882
+#, c-format
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "модуль проверки \"%s\" не разрешён параметром %s"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "ожидался ответ SASL, но получено сообщение %d"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
 #, c-format
 msgid "invalid SCRAM secret for user \"%s\""
 msgstr "неверная запись секрета SCRAM для пользователя \"%s\""
 
-#: libpq/auth-scram.c:298
+#: libpq/auth-scram.c:302
 #, c-format
 msgid "User \"%s\" does not have a valid SCRAM secret."
 msgstr "Для пользователя \"%s\" нет подходящей записи секрета SCRAM."
 
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
 #, c-format
 msgid "malformed SCRAM message"
 msgstr "неправильное сообщение SCRAM"
 
-#: libpq/auth-scram.c:379
-#, c-format
-msgid "The message is empty."
-msgstr "Сообщение пустое."
-
-#: libpq/auth-scram.c:384
-#, c-format
-msgid "Message length does not match input length."
-msgstr "Длина сообщения не соответствует входной длине."
-
-#: libpq/auth-scram.c:416
+#: libpq/auth-scram.c:420
 #, c-format
 msgid "invalid SCRAM response"
 msgstr "неверный ответ SCRAM"
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-scram.c:421
 #, c-format
 msgid "Nonce does not match."
 msgstr "Разовый код не совпадает."
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-scram.c:504
 #, c-format
 msgid "could not generate random salt"
 msgstr "не удалось сгенерировать случайную соль"
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-scram.c:752
 #, c-format
 msgid "Expected attribute \"%c\" but found \"%s\"."
 msgstr "Ожидался атрибут \"%c\", но обнаружено \"%s\"."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
 #, c-format
 msgid "Expected character \"=\" for attribute \"%c\"."
 msgstr "Ожидался символ \"=\" для атрибута \"%c\"."
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-scram.c:865
 #, c-format
 msgid "Attribute expected, but found end of string."
 msgstr "Ожидался атрибут, но обнаружен конец строки."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-scram.c:878
 #, c-format
 msgid "Attribute expected, but found invalid character \"%s\"."
 msgstr "Ожидался атрибут, но обнаружен неправильный символ \"%s\"."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
 #, c-format
 msgid ""
 "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not "
@@ -16231,17 +16957,12 @@ msgstr ""
 "Клиент выбрал алгоритм SCRAM-SHA-256-PLUS, но в сообщении SCRAM отсутствуют "
 "данные связывания каналов."
 
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
-#, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "Ожидалась запятая, но обнаружен символ \"%s\"."
-
-#: libpq/auth-scram.c:1010
+#: libpq/auth-scram.c:1024
 #, c-format
 msgid "SCRAM channel binding negotiation error"
 msgstr "Ошибка согласования связывания каналов SCRAM"
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-scram.c:1025
 #, c-format
 msgid ""
 "The client supports SCRAM channel binding but thinks the server does not.  "
@@ -16250,7 +16971,7 @@ msgstr ""
 "Клиент поддерживает связывание каналов SCRAM, но полагает, что оно не "
 "поддерживается сервером. Однако сервер тоже поддерживает связывание каналов."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-scram.c:1047
 #, c-format
 msgid ""
 "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM "
@@ -16259,155 +16980,140 @@ msgstr ""
 "Клиент выбрал алгоритм SCRAM-SHA-256 без связывания каналов, но сообщение "
 "SCRAM содержит данные связывания каналов."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-scram.c:1058
 #, c-format
 msgid "unsupported SCRAM channel-binding type \"%s\""
 msgstr "неподдерживаемый тип связывания каналов SCRAM \"%s\""
 
-#: libpq/auth-scram.c:1051
-#, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "Неожиданный флаг связывания каналов \"%s\"."
-
-#: libpq/auth-scram.c:1061
-#, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr "клиент передал идентификатор для авторизации, но это не поддерживается"
-
-#: libpq/auth-scram.c:1066
-#, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "Неожиданный атрибут \"%s\" в первом сообщении клиента."
-
-#: libpq/auth-scram.c:1082
+#: libpq/auth-scram.c:1096
 #, c-format
 msgid "client requires an unsupported SCRAM extension"
 msgstr "клиенту требуется неподдерживаемое расширение SCRAM"
 
-#: libpq/auth-scram.c:1096
+#: libpq/auth-scram.c:1110
 #, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "непечатаемые символы в разовом коде SCRAM"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "не удалось сгенерировать разовый код"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "не удалось оформить разовый код"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
 msgstr "ошибка проверки связывания каналов SCRAM"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr ""
 "неожиданный атрибут связывания каналов в последнем сообщении клиента SCRAM"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "Некорректное подтверждение в последнем сообщении клиента."
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "Мусор в конце последнего сообщения клиента."
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr ""
 "пользователь \"%s\" не прошёл проверку подлинности: не разрешённый компьютер"
 
-#: libpq/auth.c:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (\"trust\")"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (Ident)"
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (Peer)"
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (по паролю)"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (GSSAPI)"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (SSPI)"
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (PAM)"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (BSD)"
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (LDAP)"
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (по сертификату)"
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинности (RADIUS)"
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
 "пользователь \"%s\" не прошёл проверку подлинности: неверный метод проверки"
 
-#: libpq/auth.c:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "Подключение соответствует строке %2$d в \"%1$s\": \"%3$s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "аутентификационный идентификатор указан повторно"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "предыдущий идентификатор: \"%s\"; новый: \"%s\""
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "соединение аутентифицировано: идентификатор=\"%s\" метод=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid ""
 "client certificates can only be checked if a root certificate store is "
@@ -16416,25 +17122,25 @@ msgstr ""
 "сертификаты клиентов могут проверяться, только если доступно хранилище "
 "корневых сертификатов"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "для подключения требуется годный сертификат клиента"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "Шифрование GSS"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "Шифрование SSL"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "без шифрования"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, c-format
 msgid ""
 "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
@@ -16443,7 +17149,7 @@ msgstr ""
 "пользователь \"%s\", \"%s\""
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database "
@@ -16452,38 +17158,38 @@ msgstr ""
 "pg_hba.conf отвергает подключение: компьютер \"%s\", пользователь \"%s\", "
 "база данных \"%s\", %s"
 
-#: libpq/auth.c:506
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr ""
 "IP-адрес клиента разрешается в \"%s\", соответствует прямому преобразованию."
 
-#: libpq/auth.c:509
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr ""
 "IP-адрес клиента разрешается в \"%s\", прямое преобразование не проверялось."
 
-#: libpq/auth.c:512
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr ""
 "IP-адрес клиента разрешается в \"%s\", это не соответствует прямому "
 "преобразованию."
 
-#: libpq/auth.c:515
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr ""
 "Преобразовать имя клиентского компьютера \"%s\" в IP-адрес не удалось: %s."
 
-#: libpq/auth.c:520
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Получить имя компьютера из IP-адреса клиента не удалось: %s."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user "
@@ -16493,242 +17199,247 @@ msgstr ""
 "компьютера \"%s\" для пользователя \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "в pg_hba.conf нет записи для компьютера \"%s\", пользователя \"%s\", базы "
 "\"%s\", %s"
 
-#: libpq/auth.c:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "соединение аутентифицировано: пользователь=\"%s\" метод=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "ожидался ответ с паролем, но получено сообщение %d"
 
-#: libpq/auth.c:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "неверный размер пакета с паролем"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "клиент возвратил пустой пароль"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "не удалось сгенерировать случайную соль для MD5"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "не удалось задать переменную окружения: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "ожидался ответ GSS, но получено сообщение %d"
 
-#: libpq/auth.c:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "принять контекст безопасности GSS не удалось"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "получить имя пользователя GSS не удалось"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "не удалось получить удостоверение SSPI"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "ожидался ответ SSPI, но получено сообщение %d"
 
-#: libpq/auth.c:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "принять контекст безопасности SSPI не удалось"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "не удалось получить маркер из контекста безопасности SSPI"
 
-#: libpq/auth.c:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "не удалось преобразовать имя"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "имя области слишком длинное"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "преобразованное имя учётной записи слишком длинное"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "не удалось создать сокет для подключения к серверу Ident: %m"
 
-#: libpq/auth.c:1756
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "не удалось привязаться к локальному адресу \"%s\": %m"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "не удалось подключиться к серверу Ident по адресу \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "не удалось отправить запрос серверу Ident по адресу \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1807
+#: libpq/auth.c:1808
 #, c-format
 msgid ""
 "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "не удалось получить ответ от сервера Ident по адресу \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "неверно форматированный ответ от сервера Ident: \"%s\""
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "проверка подлинности peer в этой ОС не поддерживается"
 
-#: libpq/auth.c:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "не удалось получить данные пользователя через механизм peer: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "найти локального пользователя по идентификатору (%ld) не удалось: %m"
+
+#: libpq/auth.c:1894
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "найти локального пользователя по идентификатору (%ld) не удалось: %s"
+msgid "local user with ID %ld does not exist"
+msgstr "локальный пользователь с ID %ld не существует"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "ошибка в нижележащем слое PAM: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "неподдерживаемое сообщение ответа PAM %d/\"%s\""
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "не удалось создать аутентификатор PAM: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "ошибка в pam_set_item(PAM_USER): %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "ошибка в pam_set_item(PAM_RHOST): %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "ошибка в pam_set_item(PAM_CONV): %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "ошибка в pam_authenticate: %s"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "ошибка в pam_acct_mgmt: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "не удалось освободить аутентификатор PAM: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "не удалось инициализировать LDAP (код ошибки: %d)"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "не удалось извлечь имя домена из ldapbasedn"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "для аутентификации LDAP не удалось найти записи DNS SRV для \"%s\""
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "Задайте имя сервера LDAP явным образом."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "не удалось инициализировать LDAP: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "протокол ldaps с текущей библиотекой LDAP не поддерживается"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "не удалось инициализировать LDAP: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "не удалось задать версию протокола LDAP: %s"
 
-#: libpq/auth.c:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "не удалось начать сеанс LDAP TLS: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP-сервер не задан и значение ldapbasedn не определено"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-сервер не определён"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "недопустимый символ в имени пользователя для проверки подлинности LDAP"
 
-#: libpq/auth.c:2534
+#: libpq/auth.c:2540
 #, c-format
 msgid ""
 "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
@@ -16737,28 +17448,28 @@ msgstr ""
 "не удалось выполнить начальную привязку LDAP для ldapbinddn \"%s\" на "
 "сервере \"%s\": %s"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr ""
 "не удалось выполнить LDAP-поиск по фильтру \"%s\" на сервере \"%s\": %s"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "в LDAP нет пользователя \"%s\""
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "LDAP-поиск по фильтру \"%s\" на сервере \"%s\" не вернул результатов"
 
-#: libpq/auth.c:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "пользователь LDAP \"%s\" не уникален"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural ""
@@ -16767,7 +17478,7 @@ msgstr[0] "LDAP-поиск по фильтру \"%s\" на сервере \"%s\"
 msgstr[1] "LDAP-поиск по фильтру \"%s\" на сервере \"%s\" вернул %d записи."
 msgstr[2] "LDAP-поиск по фильтру \"%s\" на сервере \"%s\" вернул %d записей."
 
-#: libpq/auth.c:2606
+#: libpq/auth.c:2612
 #, c-format
 msgid ""
 "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
@@ -16775,18 +17486,18 @@ msgstr ""
 "не удалось получить dn для первого результата, соответствующего \"%s\" на "
 "сервере \"%s\": %s"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "ошибка при регистрации в LDAP пользователя \"%s\" на сервере \"%s\": %s"
 
-#: libpq/auth.c:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "Диагностика LDAP: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": client certificate "
@@ -16795,7 +17506,7 @@ msgstr ""
 "ошибка проверки подлинности пользователя \"%s\" по сертификату: сертификат "
 "клиента не содержит имя пользователя"
 
-#: libpq/auth.c:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": unable to retrieve "
@@ -16804,7 +17515,7 @@ msgstr ""
 "пользователь \"%s\" не прошёл проверку подлинности по сертификату: не "
 "удалось получить DN субъекта"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid ""
 "certificate validation (clientcert=verify-full) failed for user \"%s\": DN "
@@ -16813,7 +17524,7 @@ msgstr ""
 "проверка сертификата (clientcert=verify-full) для пользователя \"%s\" не "
 "прошла: отличается DN"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid ""
 "certificate validation (clientcert=verify-full) failed for user \"%s\": CN "
@@ -16822,106 +17533,106 @@ msgstr ""
 "проверка сертификата (clientcert=verify-full) для пользователя \"%s\" не "
 "прошла: отличается CN"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-сервер не определён"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "секрет RADIUS не определён"
 
 # well-spelled: симв
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid ""
 "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "проверка подлинности RADIUS не поддерживает пароли длиннее %d симв."
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "не удалось преобразовать имя сервера RADIUS \"%s\" в адрес: %s"
 
-#: libpq/auth.c:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "не удалось сгенерировать случайный вектор шифрования"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "не удалось вычислить MD5-хеш пароля: %s"
 
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "не удалось создать сокет RADIUS: %m"
 
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "не удалось привязаться к локальному сокету RADIUS: %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "не удалось отправить пакет RADIUS: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "превышено время ожидания ответа RADIUS от %s"
 
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "не удалось проверить состояние сокета RADIUS: %m"
 
-#: libpq/auth.c:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "не удалось прочитать ответ RADIUS: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "ответ RADIUS от %s был отправлен с неверного порта: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "слишком короткий ответ RADIUS от %s: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "в ответе RADIUS от %s испорчена длина: %d (фактическая длина %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "пришёл ответ RADIUS от %s на другой запрос: %d (ожидался %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "не удалось вычислить MD5-хеш для принятого пакета: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "ответ RADIUS от %s содержит неверную подпись MD5"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "ответ RADIUS от %s содержит неверный код (%d) для пользователя \"%s\""
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "неверный дескриптор большого объекта: %d"
@@ -16931,7 +17642,7 @@ msgstr "неверный дескриптор большого объекта: %
 msgid "large object descriptor %d was not opened for reading"
 msgstr "дескриптор большого объекта %d не был открыт для чтения"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "дескриптор большого объекта %d не был открыт для записи"
@@ -16950,32 +17661,32 @@ msgstr ""
 "результат lo_tell для дескриптора большого объекта %d вне допустимого "
 "диапазона"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "не удалось открыть файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "не удалось прочитать файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "не удалось создать файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "не удалось записать файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "при чтении большого объекта запрошен чрезмерный размер"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "запрошенная длина не может быть отрицательной"
@@ -17017,123 +17728,125 @@ msgstr ""
 "он принадлежит пользователю сервера, либо u=rw,g=r (0640) или более строгие, "
 "если он принадлежит root."
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "ошибка обёртывания сообщения в GSSAPI"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "исходящее сообщение GSSAPI не будет защищено"
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "сервер попытался передать чрезмерно большой пакет GSSAPI (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "клиент передал чрезмерно большой пакет GSSAPI (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "ошибка развёртывания сообщения в GSSAPI"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "входящее сообщение GSSAPI не защищено"
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "клиент передал чрезмерно большой пакет GSSAPI (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "принять контекст безопасности GSSAPI не удалось"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "ошибка проверки размера в GSSAPI"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "не удалось создать контекст SSL: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "не удалось загрузить сертификат сервера \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid ""
 "private key file \"%s\" cannot be reloaded because it requires a passphrase"
 msgstr ""
 "файл закрытого ключа \"%s\" нельзя перезагрузить, так как он защищён паролем"
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "не удалось загрузить файл закрытого ключа \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "ошибка при проверке закрытого ключа: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "для параметра \"%s\" значение \"%s\" не поддерживается в данной сборке"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "не удалось задать минимальную версию протокола SSL"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "не удалось задать максимальную версию протокола SSL"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "не удалось задать диапазон версий протокола SSL"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "Версия \"%s\" не может быть выше \"%s\""
 
-#: libpq/be-secure-openssl.c:307
+#: libpq/be-secure-openssl.c:295
+#, c-format
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr ""
+"не удалось установить список шифров TLSv1.2 (подходящие шифры отсутствуют)"
+
+#: libpq/be-secure-openssl.c:310
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "не удалось установить список шифров (подходящие шифры отсутствуют)"
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr ""
+"не удалось установить комплекты шифров TLSv1.3 (подходящие шифры отсутствуют)"
 
-#: libpq/be-secure-openssl.c:327
+#: libpq/be-secure-openssl.c:331
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "не удалось загрузить файл корневых сертификатов \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:376
+#: libpq/be-secure-openssl.c:380
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr ""
 "не удалось загрузить список отзыва сертификатов SSL из файла \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:384
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr ""
 "не удалось загрузить списки отзыва сертификатов SSL из каталога \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid ""
 "could not load SSL certificate revocation list file \"%s\" or directory "
@@ -17142,38 +17855,38 @@ msgstr ""
 "не удалось загрузить списки отзыва сертификатов SSL из файла \"%s\" или "
 "каталога \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:450
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr ""
 "инициализировать SSL-подключение не удалось: контекст SSL не установлен"
 
-#: libpq/be-secure-openssl.c:464
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "инициализировать SSL-подключение не удалось: %s"
 
-#: libpq/be-secure-openssl.c:472
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "не удалось создать SSL-сокет: %s"
 
-#: libpq/be-secure-openssl.c:528
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "не удалось принять SSL-подключение: %m"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "не удалось принять SSL-подключение: обрыв данных"
 
-#: libpq/be-secure-openssl.c:573
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "не удалось принять SSL-подключение: %s"
 
-#: libpq/be-secure-openssl.c:577
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid ""
 "This may indicate that the client does not support any SSL protocol version "
@@ -17182,65 +17895,65 @@ msgstr ""
 "Это может указывать на то, что клиент не поддерживает ни одну версию "
 "протокола SSL между %s и %s."
 
-#: libpq/be-secure-openssl.c:594 libpq/be-secure-openssl.c:809
-#: libpq/be-secure-openssl.c:879
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "нераспознанный код ошибки SSL: %d"
 
-#: libpq/be-secure-openssl.c:622
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
 msgstr "получен запрос на SSL-подключение с неизвестным протоколом ALPN"
 
-#: libpq/be-secure-openssl.c:666
+#: libpq/be-secure-openssl.c:670
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Имя SSL-сертификата включает нулевой байт"
 
-#: libpq/be-secure-openssl.c:712
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "уникальное имя (DN) в SSL-сертификате содержит нулевой байт"
 
-#: libpq/be-secure-openssl.c:798 libpq/be-secure-openssl.c:863
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "ошибка SSL: %s"
 
-#: libpq/be-secure-openssl.c:1038
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "не удалось открыть файл параметров DH \"%s\": %m"
 
-#: libpq/be-secure-openssl.c:1050
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "не удалось загрузить файл параметров DH: %s"
 
-#: libpq/be-secure-openssl.c:1060
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "неверные параметры DH: %s"
 
-#: libpq/be-secure-openssl.c:1069
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "неверные параметры DH: p - не простое число"
 
-#: libpq/be-secure-openssl.c:1078
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr ""
 "неверные параметры DH: нет подходящего генератора или небезопасное простое "
 "число"
 
-#: libpq/be-secure-openssl.c:1214
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "Ошибка при проверке клиентского сертификата на глубине %d: %s."
 
-#: libpq/be-secure-openssl.c:1251
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid ""
 "Failed certificate data (unverified): subject \"%s\", serial number %s, "
@@ -17249,173 +17962,196 @@ msgstr ""
 "Данные ошибочного сертификата (непроверенные): субъект \"%s\", серийный "
 "номер %s, издатель \"%s\"."
 
-#: libpq/be-secure-openssl.c:1252
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "н/д"
 
-#: libpq/be-secure-openssl.c:1389
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: не удалось загрузить параметры DH"
 
-#: libpq/be-secure-openssl.c:1397
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: не удалось задать параметры DH: %s"
 
-#: libpq/be-secure-openssl.c:1424
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: нераспознанное имя кривой: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "не удалось задать имена групп, указанные в ssl_groups: %s"
+
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "Подходящие группы не найдены"
 
-#: libpq/be-secure-openssl.c:1433
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: не удалось создать ключ"
+msgid ""
+"Ensure that each group name is spelled correctly and supported by the "
+"installed version of OpenSSL."
+msgstr ""
+"Убедитесь в том, что имена всех групп записаны корректно и поддерживаются "
+"установленной версией OpenSSL."
 
-#: libpq/be-secure-openssl.c:1461
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "нет сообщения об ошибке SSL"
 
-#: libpq/be-secure-openssl.c:1479
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "код ошибки SSL: %lu"
 
-#: libpq/be-secure-openssl.c:1636
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "не удалось создать BIO"
 
-#: libpq/be-secure-openssl.c:1646
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "не удалось получить NID для объекта ASN1_OBJECT"
 
-#: libpq/be-secure-openssl.c:1654
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "не удалось преобразовать NID %d в структуру ASN1_OBJECT"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "Роль \"%s\" не существует."
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "Пользователь \"%s\" не имеет пароля."
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "Срок действия пароля пользователя \"%s\" истёк."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, c-format
+msgid "encrypted password is too long"
+msgstr "зашифрованный пароль слишком длинный"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "Зашифрованные пароли не должны быть длиннее %d байт."
+
+#: libpq/crypt.c:183
+#, c-format
+msgid "setting an MD5-encrypted password"
+msgstr "устанавливается пароль с шифрованием MD5"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid ""
+"MD5 password support is deprecated and will be removed in a future release "
+"of PostgreSQL."
+msgstr ""
+"Поддержка паролей MD5 считается устаревшей и будет удалена в будущей версии "
+"PostgreSQL."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid ""
+"Refer to the PostgreSQL documentation for details about migrating to another "
+"password type."
+msgstr ""
+"Обратитесь к документации PostgreSQL за информацией о том, как перейти к "
+"другому типу паролей."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr ""
 "Пользователь \"%s\" имеет пароль, неподходящий для аутентификации по MD5."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "Пароль не подходит для пользователя \"%s\"."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "Пароль пользователя \"%s\" представлен в неизвестном формате."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "неверное регулярное выражение \"%s\": %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "строка %d файла конфигурации \"%s\""
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "отсутствующий файл настройки аутентификации \"%s\" пропускается"
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "открыть файл \"%s\" не удалось: превышен предел вложенности"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "ошибка при перечислении сетевых интерфейсов: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid ""
 "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "параметр проверки подлинности \"%s\" допускается только для методов %s"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr ""
 "для метода проверки подлинности \"%s\" требуется определить аргумент \"%s\""
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "отсутствует запись в конце строки"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "множественные значения в поле ident"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "для типа подключения указано несколько значений"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "Определите в строке единственный тип подключения."
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "запись с hostssl недействительна, так как поддержка SSL отключена"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
 msgstr "Установите \"ssl = on\" в postgresql.conf."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr ""
 "запись с hostssl недействительна, так как SSL не поддерживается в этой сборке"
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid ""
 "hostgssenc record cannot match because GSSAPI is not supported by this build"
@@ -17423,135 +18159,133 @@ msgstr ""
 "запись с hostgssenc недействительна, так как GSSAPI не поддерживается в этой "
 "сборке"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "неверный тип подключения \"%s\""
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "конец строки перед определением базы данных"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "конец строки перед определением роли"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "конец строки перед определением IP-адресов"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "для адреса узла указано несколько значений"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "Определите в строке один диапазон адресов."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "неверный IP-адрес \"%s\": %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
 msgstr "указать одновременно и имя узла, и маску CIDR нельзя: \"%s\""
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "неверная маска CIDR в адресе \"%s\""
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "конец строки перед определением маски сети"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid ""
 "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr ""
 "Укажите диапазон адресов в формате CIDR или задайте отдельную маску сети."
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "для сетевой маски указано несколько значений"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "неверная маска IP \"%s\": %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "IP-адрес не соответствует маске"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "конец строки перед методом проверки подлинности"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "для типа проверки подлинности указано несколько значений"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "Определите в строке единственный тип проверки подлинности."
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "неверный метод проверки подлинности \"%s\""
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr ""
 "неверный метод проверки подлинности \"%s\": не поддерживается в этой сборке"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "проверка подлинности gssapi для локальных сокетов не поддерживается"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "проверка подлинности peer поддерживается только для локальных сокетов"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr ""
 "проверка подлинности cert поддерживается только для подключений hostssl"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "параметр проверки подлинности указан не в формате имя=значение: %s"
 
-#: libpq/hba.c:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid ""
-"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
-"ldapsearchfilter, or ldapurl together with ldapprefix"
+msgid "cannot mix options for simple bind and search+bind modes"
 msgstr ""
-"нельзя использовать ldapbasedn, ldapbinddn, ldapbindpasswd, "
-"ldapsearchattribute, ldapsearchfilter или ldapurl вместе с ldapprefix"
+"смешивать параметры для режима простого связывания и режима поиск+связывание "
+"нельзя"
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, c-format
 msgid ""
 "authentication method \"ldap\" requires argument \"ldapbasedn\", "
@@ -17560,22 +18294,22 @@ msgstr ""
 "для метода проверки подлинности \"ldap\" требуется установить аргументы "
 "\"ldapbasedn\" и \"ldapprefix\" или \"ldapsuffix\""
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "нельзя использовать ldapsearchattribute вместе с ldapsearchfilter"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "список серверов RADIUS не может быть пустым"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "список секретов RADIUS не может быть пустым"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid ""
 "the number of RADIUS secrets (%d) must be 1 or the same as the number of "
@@ -17584,7 +18318,7 @@ msgstr ""
 "количество секретов RADIUS (%d) должно равняться 1 или количеству серверов "
 "RADIUS (%d)"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid ""
 "the number of RADIUS ports (%d) must be 1 or the same as the number of "
@@ -17593,7 +18327,7 @@ msgstr ""
 "количество портов RADIUS (%d) должно равняться 1 или количеству серверов "
 "RADIUS (%d)"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid ""
 "the number of RADIUS identifiers (%d) must be 1 or the same as the number of "
@@ -17602,16 +18336,22 @@ msgstr ""
 "количество идентификаторов RADIUS (%d) должно равняться 1 или количеству "
 "серверов RADIUS (%d)"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi и cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s нельзя использовать совместно с %s"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert и oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert можно определить только в строках \"hostssl\""
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid ""
 "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
@@ -17619,95 +18359,95 @@ msgstr ""
 "с проверкой подлинности \"cert\" для clientcert допускается только значение "
 "\"verify-full\""
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "неверное значение для clientcert: \"%s\""
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname можно определить только в строках \"hostssl\""
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "неверное значение для clientname: \"%s\""
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "не удалось разобрать URL-адрес LDAP \"%s\": %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "неподдерживаемая схема в URL-адресе LDAP: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "URL-адреса LDAP не поддерживаются в этой ОС"
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "неверное значение ldapscheme: \"%s\""
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "неверный номер порта LDAP: \"%s\""
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi и sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "не удалось разобрать список серверов RADIUS \"%s\""
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "не удалось разобрать список портов RADIUS \"%s\""
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "неверный номер порта RADIUS: \"%s\""
 
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "не удалось разобрать список секретов RADIUS \"%s\""
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "не удалось разобрать список идентификаторов RADIUS \"%s\""
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "нераспознанное имя атрибута проверки подлинности: \"%s\""
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "файл конфигурации \"%s\" не содержит записей"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "ошибка при поиске по регулярному выражению для \"%s\": %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, c-format
 msgid ""
 "regular expression \"%s\" has no subexpressions as requested by "
@@ -17716,96 +18456,97 @@ msgstr ""
 "в регулярном выражении \"%s\" нет подвыражений, требуемых для обратной "
 "ссылки в \"%s\""
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr ""
 "указанное имя пользователя (%s) не совпадает с именем прошедшего проверку "
 "(%s)"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
 "нет соответствия в файле сопоставлений \"%s\" для пользователя \"%s\", "
 "прошедшего проверку как \"%s\""
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "ошибка в %s(%s): %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "не удалось перевести сокет в неблокирующий режим: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "длина пути Unix-сокета \"%s\" превышает предел (%d байт)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "перевести имя узла \"%s\", службы \"%s\" в адрес не удалось: %s"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "не удалось перевести имя службы \"%s\" в адрес: %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr ""
 "не удалось привязаться ко всем запрошенным адресам: превышен предел "
 "MAXLISTEN (%d)"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "нераспознанное семейство адресов: %d"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "не удалось создать сокет %s для адреса \"%s\": %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "ошибка в %s(%s) для адреса %s \"%s\": %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "не удалось привязаться к адресу %s \"%s\": %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "Возможно, порт %d занят другим процессом postmaster?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid ""
 "Is another postmaster already running on port %d? If not, wait a few seconds "
@@ -17815,88 +18556,88 @@ msgstr ""
 "попытку через несколько секунд."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "не удалось привязаться к адресу %s \"%s\": %m"
 
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "для приёма подключений открыт Unix-сокет \"%s\""
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "для приёма подключений по адресу %s \"%s\" открыт порт %d"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "группа \"%s\" не существует"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "не удалось установить группу для файла \"%s\": %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "не удалось установить права доступа для файла \"%s\": %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "не удалось принять новое подключение: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "нет клиентского подключения"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "не удалось получить данные от клиента: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4533
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "закрытие подключения из-за потери синхронизации протокола"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "неожиданный обрыв данных в слове длины сообщения"
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "неверная длина сообщения"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "неполное сообщение от клиента"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "не удалось послать данные клиенту: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "ошибка в %s(%s): код ошибки %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "изменение значения keepalives_idle не поддерживается"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) не поддерживается"
@@ -17907,7 +18648,7 @@ msgid "no data left in message"
 msgstr "в сообщении не осталось данных"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:873 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -17923,12 +18664,12 @@ msgstr "неверная строка в сообщении"
 msgid "invalid message format"
 msgstr "неверный формат сообщения"
 
-#: main/main.c:236
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: ошибка WSAStartup: %d\n"
 
-#: main/main.c:324
+#: main/main.c:386
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -17937,7 +18678,7 @@ msgstr ""
 "%s - сервер PostgreSQL.\n"
 "\n"
 
-#: main/main.c:325
+#: main/main.c:387
 #, c-format
 msgid ""
 "Usage:\n"
@@ -17948,110 +18689,110 @@ msgstr ""
 "  %s [ПАРАМЕТР]...\n"
 "\n"
 
-#: main/main.c:326
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: main/main.c:327
+#: main/main.c:389
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B ЧИСЛО_БУФ       число разделяемых буферов\n"
 
-#: main/main.c:328
+#: main/main.c:390
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c ИМЯ=ЗНАЧЕНИЕ    установить параметр выполнения\n"
 
-#: main/main.c:329
+#: main/main.c:391
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C ИМЯ             вывести значение параметра выполнения и выйти\n"
 
-#: main/main.c:330
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             уровень отладочных сообщений\n"
 
-#: main/main.c:331
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D КАТ_ДАННЫХ      каталог с данными\n"
 
 # well-spelled: ДМГ
-#: main/main.c:332
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 использовать европейский формат дат (ДМГ)\n"
 
-#: main/main.c:333
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 выключить синхронизацию с ФС\n"
 
-#: main/main.c:334
+#: main/main.c:396
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h ИМЯ             имя или IP-адрес для приёма сетевых соединений\n"
 
-#: main/main.c:335
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr ""
 "  -i                 включить соединения TCP/IP (устаревший параметр)\n"
 
-#: main/main.c:336
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k КАТАЛОГ         расположение Unix-сокетов\n"
 
-#: main/main.c:338
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 разрешить SSL-подключения\n"
 
 # well-spelled: ПОДКЛ
-#: main/main.c:340
+#: main/main.c:402
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N МАКС_ПОДКЛ      предельное число подключений\n"
 
-#: main/main.c:341
+#: main/main.c:403
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p ПОРТ            номер порта для приёма подключений\n"
 
-#: main/main.c:342
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 показывать статистику после каждого запроса\n"
 
-#: main/main.c:343
+#: main/main.c:405
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S РАБ_ПАМЯТЬ      задать объём памяти для сортировки (в КБ)\n"
 
-#: main/main.c:344
+#: main/main.c:406
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      показать версию и выйти\n"
 
-#: main/main.c:345
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --ИМЯ=ЗНАЧЕНИЕ     установить параметр выполнения\n"
 
-#: main/main.c:346
+#: main/main.c:408
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  вывести параметры конфигурации и выйти\n"
 
-#: main/main.c:347
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         показать эту справку и выйти\n"
 
-#: main/main.c:349
+#: main/main.c:411
 #, c-format
 msgid ""
 "\n"
@@ -18060,27 +18801,27 @@ msgstr ""
 "\n"
 "Параметры для разработчиков:\n"
 
-#: main/main.c:350
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h запретить некоторые типы планов\n"
 
-#: main/main.c:351
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 разрешить изменять структуру системных таблиц\n"
 
-#: main/main.c:352
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 отключить системные индексы\n"
 
-#: main/main.c:353
+#: main/main.c:415
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        показать время каждого запроса\n"
 
-#: main/main.c:354
+#: main/main.c:416
 #, c-format
 msgid ""
 "  -T                 send SIGABRT to all backend processes if one dies\n"
@@ -18088,13 +18829,13 @@ msgstr ""
 "  -T                 посылать сигнал SIGABRT всем серверным процессам\n"
 "                     при отключении одного\n"
 
-#: main/main.c:355
+#: main/main.c:417
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr ""
 "  -W СЕК             ждать заданное число секунд для подключения отладчика\n"
 
-#: main/main.c:357
+#: main/main.c:419
 #, c-format
 msgid ""
 "\n"
@@ -18103,7 +18844,7 @@ msgstr ""
 "\n"
 "Параметры для монопольного режима:\n"
 
-#: main/main.c:358
+#: main/main.c:420
 #, c-format
 msgid ""
 "  --single           selects single-user mode (must be first argument)\n"
@@ -18111,22 +18852,22 @@ msgstr ""
 "  --single           включить монопольный режим\n"
 "                     (этот аргумент должен быть первым)\n"
 
-#: main/main.c:359
+#: main/main.c:421
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  ИМЯ_БД             база данных (по умолчанию - имя пользователя)\n"
 
-#: main/main.c:360
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             переопределить уровень отладочных сообщений\n"
 
-#: main/main.c:361
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 выводить SQL-операторы перед выполнением\n"
 
-#: main/main.c:362
+#: main/main.c:424
 #, c-format
 msgid ""
 "  -j                 do not use newline as interactive query delimiter\n"
@@ -18134,12 +18875,12 @@ msgstr ""
 "  -j                 не считать конец строки разделителем интерактивных "
 "запросов\n"
 
-#: main/main.c:363 main/main.c:369
+#: main/main.c:425 main/main.c:431
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r ИМЯ_ФАЙЛА       перенаправить STDOUT и STDERR в указанный файл\n"
 
-#: main/main.c:365
+#: main/main.c:427
 #, c-format
 msgid ""
 "\n"
@@ -18148,7 +18889,7 @@ msgstr ""
 "\n"
 "Параметры для режима инициализации:\n"
 
-#: main/main.c:366
+#: main/main.c:428
 #, c-format
 msgid ""
 "  --boot             selects bootstrapping mode (must be first argument)\n"
@@ -18156,14 +18897,14 @@ msgstr ""
 "  --boot             включить режим инициализации\n"
 "                     (этот аргумент должен быть первым)\n"
 
-#: main/main.c:367
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr ""
 "  --check            включить режим проверки (этот аргумент должен быть "
 "первым)\n"
 
-#: main/main.c:368
+#: main/main.c:430
 #, c-format
 msgid ""
 "  DBNAME             database name (mandatory argument in bootstrapping "
@@ -18171,7 +18912,7 @@ msgid ""
 msgstr ""
 "  ИМЯ_БД             имя базы данных (необходимо в режиме инициализации)\n"
 
-#: main/main.c:371
+#: main/main.c:433
 #, c-format
 msgid ""
 "\n"
@@ -18188,12 +18929,12 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: main/main.c:375
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: main/main.c:386
+#: main/main.c:448
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -18206,12 +18947,12 @@ msgstr ""
 "должен запускать обычный пользователь. Подробнее о том, как\n"
 "правильно запускать сервер, вы можете узнать в документации.\n"
 
-#: main/main.c:403
+#: main/main.c:465
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: фактический и эффективный ID пользователя должны совпадать\n"
 
-#: main/main.c:410
+#: main/main.c:472
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -18236,15 +18977,15 @@ msgstr "расширенный тип узла \"%s\" уже существуе
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "методы расширенного узла \"%s\" не зарегистрированы"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "отношение \"%s\" не имеет составного типа"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2604
-#: parser/parse_coerce.c:2742 parser/parse_coerce.c:2789
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "тип массива для типа данных %s не найден"
@@ -18259,7 +19000,7 @@ msgstr "портал \"%s\" с параметрами: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "неименованный портал с параметрами: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid ""
 "FULL JOIN is only supported with merge-joinable or hash-joinable join "
@@ -18268,32 +19009,32 @@ msgstr ""
 "FULL JOIN поддерживается только с условиями, допускающими соединение "
 "слиянием или хеш-соединение"
 
-#: optimizer/plan/createplan.c:7175 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1680
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "выполнить MERGE для отношения \"%s\" нельзя"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "%s не может применяться к NULL-содержащей стороне внешнего соединения"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1380 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074
+#: parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s несовместимо с UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:2121 optimizer/plan/planner.c:4108
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "не удалось реализовать GROUP BY"
 
-#: optimizer/plan/planner.c:2122 optimizer/plan/planner.c:4109
-#: optimizer/plan/planner.c:4790 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145
+#: optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid ""
 "Some of the datatypes only support hashing, while others only support "
@@ -18302,77 +19043,89 @@ msgstr ""
 "Одни типы данных поддерживают только хеширование, а другие - только "
 "сортировку."
 
-#: optimizer/plan/planner.c:4789
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "не удалось реализовать DISTINCT"
 
-#: optimizer/plan/planner.c:6134
+#: optimizer/plan/planner.c:6322
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "не удалось реализовать PARTITION BY для окна"
 
-#: optimizer/plan/planner.c:6135
+#: optimizer/plan/planner.c:6323
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Столбцы, разбивающие окна, должны иметь сортируемые типы данных."
 
-#: optimizer/plan/planner.c:6139
+#: optimizer/plan/planner.c:6327
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "не удалось реализовать ORDER BY для окна"
 
-#: optimizer/plan/planner.c:6140
+#: optimizer/plan/planner.c:6328
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Столбцы, сортирующие окна, должны иметь сортируемые типы данных."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "не удалось реализовать рекурсивный UNION"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "Все столбцы должны иметь хешируемые типы данных."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "не удалось реализовать %s"
 
-#: optimizer/util/clauses.c:4963
+#: optimizer/util/appendinfo.c:165
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "атрибут \"%s\" отношения \"%s\" не соответствует родительскому типу"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr ""
+"атрибут \"%s\" отношения \"%s\" не соответствует родительскому правилу "
+"сортировки"
+
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "внедрённая в код SQL-функция \"%s\""
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr ""
 "обращаться к временным или нежурналируемым отношениям в процессе "
 "восстановления нельзя"
 
-#: optimizer/util/plancat.c:768
+#: optimizer/util/plancat.c:776
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr ""
 "указания со ссылкой на всю строку для выбора уникального индекса не "
 "поддерживаются"
 
-#: optimizer/util/plancat.c:785
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "ограничению в ON CONFLICT не соответствует индекс"
 
-#: optimizer/util/plancat.c:835
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE не поддерживается с ограничениями-исключениями"
 
-#: optimizer/util/plancat.c:945
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid ""
 "there is no unique or exclusion constraint matching the ON CONFLICT "
@@ -18381,22 +19134,22 @@ msgstr ""
 "нет уникального ограничения или ограничения-исключения, соответствующего "
 "указанию ON CONFLICT"
 
-#: parser/analyze.c:824 parser/analyze.c:1550
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "списки VALUES должны иметь одинаковую длину"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT содержит больше выражений, чем целевых столбцов"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT содержит больше целевых столбцов, чем выражений"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1093
 #, c-format
 msgid ""
 "The insertion source is a row expression containing the same number of "
@@ -18405,29 +19158,29 @@ msgstr ""
 "Источником данных является строка, включающая столько же столбцов, сколько "
 "требуется для INSERT. Вы намеренно использовали скобки?"
 
-#: parser/analyze.c:1357 parser/analyze.c:1744
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO здесь не допускается"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s нельзя применять к VALUES"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "неверное предложение UNION/INTERSECT/EXCEPT ORDER BY"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
 "Допустимо использование только имён столбцов, но не выражений или функций."
 
-#: parser/analyze.c:1913
+#: parser/analyze.c:1957
 #, c-format
 msgid ""
 "Add the expression/function to every SELECT, or move the UNION into a FROM "
@@ -18436,12 +19189,12 @@ msgstr ""
 "Добавьте выражение/функцию в каждый SELECT или перенесите UNION в "
 "предложение FROM."
 
-#: parser/analyze.c:2019
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO можно добавить только в первый SELECT в UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:2091
+#: parser/analyze.c:2136
 #, c-format
 msgid ""
 "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
@@ -18450,22 +19203,33 @@ msgstr ""
 "оператор, составляющий UNION/INTERSECT/EXCEPT, не может ссылаться на другие "
 "отношения на том же уровне запроса"
 
-#: parser/analyze.c:2178
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "все запросы в %s должны возвращать одинаковое число столбцов"
 
-#: parser/analyze.c:2535
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "К именам целевых столбцов в SET нельзя добавлять имя отношения."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2668 parser/analyze.c:2678
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s нельзя указывать несколько раз"
+
+#: parser/analyze.c:2690 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "имя таблицы \"%s\" указано больше одного раза"
+
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "в RETURNING должен быть минимум один столбец"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
@@ -18473,356 +19237,366 @@ msgstr[0] "источник присваиваемого значения выд
 msgstr[1] "источник присваиваемого значения выдал %d столбца"
 msgstr[2] "источник присваиваемого значения выдал %d столбцов"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "переменная \"%s\" имеет тип %s, а выражение - тип %s"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "указать %s и %s одновременно нельзя"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3055
 #, 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:2914
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s не поддерживается"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3066
 #, 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:2925
+#: parser/analyze.c:3074
 #, 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:2936
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s не допускается"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Независимые курсоры должны быть READ ONLY."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3182
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr ""
 "в материализованных представлениях не должны использоваться операторы, "
 "изменяющие данные в WITH"
 
-#: parser/analyze.c:3043
+#: parser/analyze.c:3192
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr ""
 "в материализованных представлениях не должны использоваться временные "
 "таблицы и представления"
 
-#: parser/analyze.c:3053
+#: parser/analyze.c:3202
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr ""
 "определять материализованные представления со связанными параметрами нельзя"
 
-#: parser/analyze.c:3065
+#: parser/analyze.c:3214
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "материализованные представления не могут быть нежурналируемыми"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3254
+#: parser/analyze.c:3403
 #, 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:3261
+#: parser/analyze.c:3410
 #, 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:3268
+#: parser/analyze.c:3417
 #, 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:3275
+#: parser/analyze.c:3424
 #, 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:3282
+#: parser/analyze.c:3431
 #, 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:3289
+#: parser/analyze.c:3438
 #, 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:3388
+#: parser/analyze.c:3537
 #, 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:3452
+#: parser/analyze.c:3601
 #, 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:3461
+#: parser/analyze.c:3610
 #, 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:3470
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s нельзя применить к табличной функции"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3637
 #, 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:3497
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s нельзя применить к именованному хранилищу кортежей"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3666
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "отношение \"%s\" в определении %s отсутствует в предложении FROM"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "для типа %s не удалось найти оператор сортировки"
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Агрегатным функциям с DISTINCT необходимо сортировать входные данные."
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "у GROUPING должно быть меньше 32 аргументов"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "агрегатные функции нельзя применять в условиях JOIN"
 
-#: parser/parse_agg.c:375
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "операции группировки нельзя применять в условиях JOIN"
 
-#: parser/parse_agg.c:385
+#: parser/parse_agg.c:394
 msgid ""
 "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr ""
 "агрегатные функции нельзя применять в предложении FROM их уровня запроса"
 
-#: parser/parse_agg.c:387
+#: parser/parse_agg.c:396
 msgid ""
 "grouping operations are not allowed in FROM clause of their own query level"
 msgstr ""
 "операции группировки нельзя применять в предложении FROM их уровня запроса"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "агрегатные функции нельзя применять в функциях во FROM"
 
-#: parser/parse_agg.c:394
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "операции группировки нельзя применять в функциях во FROM"
 
-#: parser/parse_agg.c:402
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "агрегатные функции нельзя применять в выражениях политик"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "операции группировки нельзя применять в выражениях политик"
 
-#: parser/parse_agg.c:421
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "агрегатные функции нельзя применять в указании RANGE для окна"
 
-#: parser/parse_agg.c:423
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "операции группировки нельзя применять в указании RANGE для окна"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "агрегатные функции нельзя применять в указании ROWS для окна"
 
-#: parser/parse_agg.c:430
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "операции группировки нельзя применять в указании ROWS для окна"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "агрегатные функции нельзя применять в указании GROUPS для окна"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "операции группировки нельзя применять в указании GROUPS для окна"
 
-#: parser/parse_agg.c:450
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "агрегатные функции нельзя применять в условиях MERGE WHEN"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "операции группировки нельзя применять в условиях MERGE WHEN"
 
-#: parser/parse_agg.c:479
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "агрегатные функции нельзя применять в ограничениях-проверках"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "операции группировки нельзя применять в ограничениях-проверках"
 
-#: parser/parse_agg.c:488
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "агрегатные функции нельзя применять в выражениях DEFAULT"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "операции группировки нельзя применять в выражениях DEFAULT"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "агрегатные функции нельзя применять в выражениях индексов"
 
-#: parser/parse_agg.c:497
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "операции группировки нельзя применять в выражениях индексов"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "агрегатные функции нельзя применять в предикатах индексов"
 
-#: parser/parse_agg.c:504
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "операции группировки нельзя применять в предикатах индексов"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "агрегатные функции нельзя применять в выражениях статистики"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "операции группировки нельзя применять в выражениях статистики"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "агрегатные функции нельзя применять в выражениях преобразований"
 
-#: parser/parse_agg.c:518
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "операции группировки нельзя применять в выражениях преобразований"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "агрегатные функции нельзя применять в параметрах EXECUTE"
 
-#: parser/parse_agg.c:525
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "операции группировки нельзя применять в параметрах EXECUTE"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "агрегатные функции нельзя применять в условиях WHEN для триггеров"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "операции группировки нельзя применять в условиях WHEN для триггеров"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "агрегатные функции нельзя применять в выражении границы секции"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "операции группировки нельзя применять в выражении границы секции"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "агрегатные функции нельзя применять в выражениях ключа секционирования"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr ""
 "операции группировки нельзя применять в выражениях ключа секционирования"
 
-#: parser/parse_agg.c:552
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "агрегатные функции нельзя применять в выражениях генерируемых столбцов"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr ""
 "операции группировки нельзя применять в выражениях генерируемых столбцов"
 
-#: parser/parse_agg.c:560
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "агрегатные функции нельзя применять в аргументах CALL"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "операции группировки нельзя применять в аргументах CALL"
 
-#: parser/parse_agg.c:568
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "агрегатные функции нельзя применять в условиях COPY FROM WHERE"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "операции группировки нельзя применять в условиях COPY FROM WHERE"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:597 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "агрегатные функции нельзя применять в конструкции %s"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:600
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "операции группировки нельзя применять в конструкции %s"
 
-#: parser/parse_agg.c:701
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "агрегатная функция внешнего уровня не может использовать вложенное CTE"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "CTE \"%s\" находится ниже семантического уровня агрегатной функции."
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid ""
 "outer-level aggregate cannot contain a lower-level variable in its direct "
@@ -18831,14 +19605,14 @@ msgstr ""
 "агрегатная функция внешнего уровня не может содержать в своих аргументах "
 "переменные нижнего уровня"
 
-#: parser/parse_agg.c:779
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr ""
 "вызовы агрегатных функций не могут включать вызовы функций, возвращающих "
 "множества"
 
-#: parser/parse_agg.c:780 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265
 #: parser/parse_func.c:885
 #, c-format
 msgid ""
@@ -18848,107 +19622,107 @@ msgstr ""
 "Исправить ситуацию можно, переместив функцию, возвращающую множество, в "
 "элемент LATERAL FROM."
 
-#: parser/parse_agg.c:785
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "вызовы агрегатных функций не могут включать вызовы оконных функции"
 
-#: parser/parse_agg.c:864
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "оконные функции нельзя применять в условиях JOIN"
 
-#: parser/parse_agg.c:871
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "оконные функции нельзя применять в функциях во FROM"
 
-#: parser/parse_agg.c:877
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "оконные функции нельзя применять в выражениях политик"
 
-#: parser/parse_agg.c:890
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "оконные функции нельзя применять в определении окна"
 
-#: parser/parse_agg.c:901
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "оконные функции нельзя применять в условиях MERGE WHEN"
 
-#: parser/parse_agg.c:926
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "оконные функции нельзя применять в ограничениях-проверках"
 
-#: parser/parse_agg.c:930
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "оконные функции нельзя применять в выражениях DEFAULT"
 
-#: parser/parse_agg.c:933
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "оконные функции нельзя применять в выражениях индексов"
 
-#: parser/parse_agg.c:936
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "оконные функции нельзя применять в выражениях статистики"
 
-#: parser/parse_agg.c:939
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "оконные функции нельзя применять в предикатах индексов"
 
-#: parser/parse_agg.c:942
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "оконные функции нельзя применять в выражениях преобразований"
 
-#: parser/parse_agg.c:945
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "оконные функции нельзя применять в параметрах EXECUTE"
 
-#: parser/parse_agg.c:948
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "оконные функции нельзя применять в условиях WHEN для триггеров"
 
-#: parser/parse_agg.c:951
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "оконные функции нельзя применять в выражении границы секции"
 
-#: parser/parse_agg.c:954
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "оконные функции нельзя применять в выражениях ключа секционирования"
 
-#: parser/parse_agg.c:957
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "оконные функции нельзя применять в аргументах CALL"
 
-#: parser/parse_agg.c:960
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "оконные функции нельзя применять в условиях COPY FROM WHERE"
 
-#: parser/parse_agg.c:963
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "оконные функции нельзя применять в выражениях генерируемых столбцов"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:986 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "оконные функции нельзя применять в конструкции %s"
 
-#: parser/parse_agg.c:1020 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "окно \"%s\" не существует"
 
-#: parser/parse_agg.c:1108
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "слишком много наборов группирования (при максимуме 4096)"
 
-#: parser/parse_agg.c:1248
+#: parser/parse_agg.c:1329
 #, c-format
 msgid ""
 "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr ""
 "в рекурсивной части рекурсивного запроса агрегатные функции недопустимы"
 
-#: parser/parse_agg.c:1441
+#: parser/parse_agg.c:1552
 #, c-format
 msgid ""
 "column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
@@ -18957,7 +19731,7 @@ msgstr ""
 "столбец \"%s.%s\" должен фигурировать в предложении GROUP BY или "
 "использоваться в агрегатной функции"
 
-#: parser/parse_agg.c:1444
+#: parser/parse_agg.c:1555
 #, c-format
 msgid ""
 "Direct arguments of an ordered-set aggregate must use only grouped columns."
@@ -18965,13 +19739,13 @@ msgstr ""
 "Прямые аргументы сортирующей агрегатной функции могут включать только "
 "группируемые столбцы."
 
-#: parser/parse_agg.c:1449
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr ""
 "подзапрос использует негруппированный столбец \"%s.%s\" из внешнего запроса"
 
-#: parser/parse_agg.c:1613
+#: parser/parse_agg.c:1725
 #, c-format
 msgid ""
 "arguments to GROUPING must be grouping expressions of the associated query "
@@ -18980,25 +19754,25 @@ msgstr ""
 "аргументами GROUPING должны быть выражения группирования для "
 "соответствующего уровня запроса"
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "отношение \"%s\" не может быть целевым в операторе, изменяющем данные"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr ""
 "функции, возвращающие множества, должны находиться на верхнем уровне FROM"
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr ""
 "для одной и той же функции нельзя задать разные списки с определениями "
 "столбцов"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid ""
 "ROWS FROM() with multiple functions cannot have a column definition list"
@@ -19006,7 +19780,7 @@ msgstr ""
 "у ROWS FROM() с несколькими функциями не может быть списка с определениями "
 "столбцов"
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid ""
 "Put a separate column definition list for each function inside ROWS FROM()."
@@ -19014,14 +19788,14 @@ msgstr ""
 "Добавьте отдельные списки с определениями столбцов для каждой функции в ROWS "
 "FROM()."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr ""
 "у UNNEST() с несколькими аргументами не может быть списка с определениями "
 "столбцов"
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid ""
 "Use separate UNNEST() calls inside ROWS FROM(), and attach a column "
@@ -19030,43 +19804,43 @@ msgstr ""
 "Напишите отдельные вызовы UNNEST() внутри ROWS FROM() и добавьте список "
 "определений столбцов к каждому."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr ""
 "WITH ORDINALITY нельзя использовать со списком с определениями столбцов"
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "Поместите список определений столбцов внутрь ROWS FROM()."
 
-#: parser/parse_clause.c:762 parser/parse_jsontable.c:295
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "FOR ORDINALITY допускается только для одного столбца"
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "имя столбца \"%s\" не уникально"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "имя пространства имён \"%s\" не уникально"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "допускается только одно пространство имён по умолчанию"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "метод %s для получения выборки не существует"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
@@ -19074,39 +19848,39 @@ msgstr[0] "метод %s для получения выборки требует
 msgstr[1] "метод %s для получения выборки требует аргументов: %d, получено: %d"
 msgstr[2] "метод %s для получения выборки требует аргументов: %d, получено: %d"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "метод %s для получения выборки не поддерживает REPEATABLE"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr ""
 "предложение TABLESAMPLE можно применять только к таблицам и "
 "материализованным представлениям"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "имя столбца \"%s\" фигурирует в предложении USING неоднократно"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "имя общего столбца \"%s\" фигурирует в таблице слева неоднократно"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr "в таблице слева нет столбца \"%s\", указанного в предложении USING"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "имя общего столбца \"%s\" фигурирует в таблице справа неоднократно"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr "в таблице справа нет столбца \"%s\", указанного в предложении USING"
@@ -19262,14 +20036,14 @@ msgstr ""
 "Операторы сортировки должны быть членами \"<\" или \">\" семейств операторов "
 "btree."
 
-#: parser/parse_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
 msgstr ""
 "RANGE со смещением PRECEDING/FOLLOWING не поддерживается для типа столбца %s"
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s "
@@ -19278,12 +20052,12 @@ msgstr ""
 "RANGE со смещением PRECEDING/FOLLOWING не поддерживается для типа столбца %s "
 "и типа смещения %s"
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "Приведите значение смещения к подходящему типу."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid ""
 "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for "
@@ -19292,155 +20066,155 @@ msgstr ""
 "RANGE со смещением PRECEDING/FOLLOWING допускает несколько интерпретаций для "
 "типа столбца %s и типа смещения %s"
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "Приведите значение смещения в точности к желаемому типу."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3405
-#: parser/parse_expr.c:3634 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435
+#: parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "привести тип %s к %s нельзя"
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "Во входных данных недостаточно столбцов."
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Не удалось привести тип %s к %s в столбце %d."
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1122
 #, c-format
 msgid "Input has too many columns."
 msgstr "Во входных данных больше столбцов."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "аргумент конструкции %s должен иметь тип %s, а не %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:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "аргумент конструкции %s не должен возвращать множество"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1420
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "в конструкции %s типы %s и %s не имеют общего"
 
-#: parser/parse_coerce.c:1536
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "типы аргументов %s и %s не имеют общего"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1588
+#: parser/parse_coerce.c:1586
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "в конструкции %s нельзя преобразовать тип %s в %s"
 
-#: parser/parse_coerce.c:2191 parser/parse_coerce.c:2211
-#: parser/parse_coerce.c:2231 parser/parse_coerce.c:2252
-#: parser/parse_coerce.c:2307 parser/parse_coerce.c:2341
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "аргументы, объявленные как \"%s\", должны быть однотипными"
 
-#: parser/parse_coerce.c:2286 parser/parse_coerce.c:2399
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "аргумент, объявленный как \"%s\", оказался не массивом, а типом %s"
 
-#: parser/parse_coerce.c:2319 parser/parse_coerce.c:2469
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "аргумент, объявленный как \"%s\", имеет не диапазонный тип, а %s"
 
-#: parser/parse_coerce.c:2353 parser/parse_coerce.c:2433
-#: parser/parse_coerce.c:2566 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "аргумент, объявленный как \"%s\", имеет не мультидиапазонный тип, а %s"
 
-#: parser/parse_coerce.c:2390
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "тип элемента аргумента \"anyarray\" определить нельзя"
 
-#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
-#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2552
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr "аргумент, объявленный как \"%s\", не согласуется с аргументом %s"
 
-#: parser/parse_coerce.c:2511
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr ""
 "не удалось определить полиморфный тип, так как входные аргументы имеют тип %s"
 
-#: parser/parse_coerce.c:2525
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr ""
 "в нарушение объявления \"anynonarray\" соответствующий аргумент оказался "
 "массивом: %s"
 
-#: parser/parse_coerce.c:2535
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr ""
 "в нарушение объявления \"anyenum\" соответствующий аргумент оказался не "
 "перечислением: %s"
 
-#: parser/parse_coerce.c:2596
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr ""
 "аргументы семейства anycompatible не могут быть приведены к общему типу"
 
-#: parser/parse_coerce.c:2614 parser/parse_coerce.c:2635
-#: parser/parse_coerce.c:2685 parser/parse_coerce.c:2690
-#: parser/parse_coerce.c:2754 parser/parse_coerce.c:2766
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr ""
 "не удалось определить полиморфный тип %s, так как входные аргументы имеют "
 "тип %s"
 
-#: parser/parse_coerce.c:2624
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr "тип %s (anycompatiblerange) не соответствует типу %s (anycompatible)"
 
-#: parser/parse_coerce.c:2645
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr ""
 "тип %s (anycompatiblemultirange) не соответствует типу %s (anycompatible)"
 
-#: parser/parse_coerce.c:2659
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr ""
 "в нарушение объявления \"anycompatiblenonarray\" соответствующий аргумент "
 "оказался массивом: %s"
 
-#: parser/parse_coerce.c:2894
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anyrange or "
@@ -19449,7 +20223,7 @@ msgstr ""
 "Для результата типа %s требуется минимум один аргумент типа anyrange или "
 "anymultirange."
 
-#: parser/parse_coerce.c:2911
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anycompatiblerange "
@@ -19458,7 +20232,7 @@ msgstr ""
 "Для результата типа %s требуется минимум один аргумент типа "
 "anycompatiblerange или anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2923
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anyelement, "
@@ -19467,7 +20241,7 @@ msgstr ""
 "Для результата типа %s требуется минимум один аргумент типа anyelement, "
 "anyarray, anynonarray, anyenum, anyrange или anymultirange."
 
-#: parser/parse_coerce.c:2935
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid ""
 "A result of type %s requires at least one input of type anycompatible, "
@@ -19478,7 +20252,7 @@ msgstr ""
 "anycompatiblearray, anycompatiblenonarray, anycompatiblerange или "
 "anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2965
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr ""
 "Для результата типа internal требуется минимум один аргумент типа internal."
@@ -19537,17 +20311,17 @@ msgstr "рекурсивная ссылка на запрос \"%s\" не дол
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "рекурсивная ссылка на запрос \"%s\" не должна фигурировать в EXCEPT"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "имя запроса WITH \"%s\" указано неоднократно"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "не удалось найти оператор неравенства для типа %s"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid ""
 "WITH clause containing a data-modifying statement must be at the top level"
@@ -19555,7 +20329,7 @@ msgstr ""
 "предложение WITH, содержащее оператор, изменяющий данные, должно быть на "
 "верхнем уровне"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, c-format
 msgid ""
 "recursive query \"%s\" column %d has type %s in non-recursive term but type "
@@ -19564,12 +20338,12 @@ msgstr ""
 "в рекурсивном запросе \"%s\" столбец %d имеет тип %s в нерекурсивной части, "
 "но в результате тип %s"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Приведите результат нерекурсивной части к правильному типу."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, c-format
 msgid ""
 "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
@@ -19578,43 +20352,43 @@ msgstr ""
 "в рекурсивном запросе \"%s\" у столбца %d правило сортировки \"%s\" в не "
 "рекурсивной части, но в результате правило \"%s\""
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr ""
 "Измените правило сортировки в нерекурсивной части, добавив предложение "
 "COLLATE."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "запрос WITH не рекурсивный"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid ""
 "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr ""
 "с предложением SEARCH или CYCLE в левой стороне UNION должен быть SELECT"
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid ""
 "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr ""
 "с предложением SEARCH или CYCLE в правой стороне UNION должен быть SELECT"
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "столбец поиска \"%s\" отсутствует в списке столбцов запроса WITH"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "столбец поиска \"%s\" указан неоднократно"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid ""
 "search sequence column name \"%s\" already used in WITH query column list"
@@ -19622,64 +20396,64 @@ msgstr ""
 "имя столбца последовательности поиска \"%s\" уже используется в списке "
 "столбцов запроса WITH"
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "столбец цикла \"%s\" отсутствует в списке столбцов запроса WITH"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "столбец цикла \"%s\" указан неоднократно"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr ""
 "имя столбца пометки цикла \"%s\" уже используется в списке столбцов запроса "
 "WITH"
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr ""
 "имя столбца пути цикла \"%s\" уже используется в списке столбцов запроса WITH"
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "имя столбца пометки цикла совпадает с именем столбца пути цикла"
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr ""
 "имя столбца последовательности поиска совпадает с именем столбца пометки "
 "цикла"
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr ""
 "имя столбца последовательности поиска совпадает с именем столбца пути цикла"
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr "запрос WITH \"%s\" содержит столбцов: %d, но указано: %d"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "взаимная рекурсия между элементами WITH не реализована"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr ""
 "рекурсивный запрос \"%s\" не должен содержать операторов, изменяющих данные"
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, c-format
 msgid ""
 "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
@@ -19688,110 +20462,110 @@ msgstr ""
 "рекурсивный запрос \"%s\" должен иметь форму {нерекурсивная часть} UNION "
 "[ALL] {рекурсивная часть}"
 
-#: parser/parse_cte.c:911
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY в рекурсивном запросе не поддерживается"
 
-#: parser/parse_cte.c:917
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET в рекурсивном запросе не поддерживается"
 
-#: parser/parse_cte.c:923
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT в рекурсивном запросе не поддерживается"
 
-#: parser/parse_cte.c:929
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE в рекурсивном запросе не поддерживается"
 
-#: parser/parse_cte.c:1008
+#: parser/parse_cte.c:1074
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "рекурсивная ссылка на запрос \"%s\" указана неоднократно"
 
-#: parser/parse_expr.c:313
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "DEFAULT не допускается в данном контексте"
 
-#: parser/parse_expr.c:406 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "столбец %s.%s не существует"
 
-#: parser/parse_expr.c:418
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "столбец \"%s\" не найден в типе данных %s"
 
-#: parser/parse_expr.c:424
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "не удалось идентифицировать столбец \"%s\" в типе записи"
 
 # skip-rule: space-before-period
-#: parser/parse_expr.c:430
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr ""
 "запись имени столбца .%s применена к типу %s, который не является составным"
 
-#: parser/parse_expr.c:461 parser/parse_target.c:732
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "расширение строки через \"*\" здесь не поддерживается"
 
-#: parser/parse_expr.c:584
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "в выражении DEFAULT (по умолчанию) нельзя ссылаться на столбцы"
 
-#: parser/parse_expr.c:587
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "в выражении границы секции нельзя ссылаться на столбцы"
 
-#: parser/parse_expr.c:846 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:845 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "неоднозначная ссылка на столбец \"%s\""
 
-#: parser/parse_expr.c:902 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "параметр $%d не существует"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1103 parser/parse_expr.c:3065
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "для %s требуется, чтобы оператор = возвращал логическое значение"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3072
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s не должна возвращать множество"
 
-#: parser/parse_expr.c:1395
+#: parser/parse_expr.c:1405
 #, c-format
 msgid ""
 "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
 msgstr ""
 "MERGE_ACTION() может использоваться только в списке RETURNING команды MERGE"
 
-#: parser/parse_expr.c:1519 parser/parse_expr.c:1551
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "число столбцов не равно числу значений"
 
-#: parser/parse_expr.c:1565
+#: parser/parse_expr.c:1575
 #, c-format
 msgid ""
 "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() "
@@ -19801,250 +20575,250 @@ msgstr ""
 "SELECT или выражение ROW()"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "функции, возвращающие множества, нельзя применять в конструкции %s"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "в ограничении-проверке нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1828
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "в выражении DEFAULT нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1831
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "в индексном выражении нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1834
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "в предикате индекса нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1837
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "в выражении статистики нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1840
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in transform expression"
 msgstr "нельзя использовать подзапрос в выражении преобразования"
 
-#: parser/parse_expr.c:1843
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "в качестве параметра EXECUTE нельзя использовать подзапрос"
 
-#: parser/parse_expr.c:1846
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "в условии WHEN для триггера нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1849
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "в выражении границы секции нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1852
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "в выражении ключа секционирования нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1855
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "в качестве аргумента CALL нельзя использовать подзапрос"
 
-#: parser/parse_expr.c:1858
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "в условии COPY FROM WHERE нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1861
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "в выражении генерируемого столбца нельзя использовать подзапросы"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3764
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "подзапрос должен вернуть только один столбец"
 
-#: parser/parse_expr.c:1985
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "в подзапросе слишком много столбцов"
 
-#: parser/parse_expr.c:1990
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "в подзапросе недостаточно столбцов"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2104
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "тип пустого массива определить нельзя"
 
-#: parser/parse_expr.c:2087
+#: parser/parse_expr.c:2105
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr ""
 "Приведите его к желаемому типу явным образом, например ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:2101
+#: parser/parse_expr.c:2119
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "не удалось определить тип элемента для типа данных %s"
 
-#: parser/parse_expr.c:2184
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "число элементов в выражениях ROW ограничено %d"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2409
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "вместо значения XML-атрибута без имени должен указываться столбец"
 
-#: parser/parse_expr.c:2390
+#: parser/parse_expr.c:2410
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "вместо значения XML-элемента без имени должен указываться столбец"
 
-#: parser/parse_expr.c:2405
+#: parser/parse_expr.c:2425
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "имя XML-атрибута \"%s\" указано неоднократно"
 
-#: parser/parse_expr.c:2513
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "привести результат XMLSERIALIZE к типу %s нельзя"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "разное число элементов в строках"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "строки нулевой длины сравнивать нельзя"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2892
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr ""
 "оператор сравнения строк должен выдавать результат логического типа, а не %s"
 
-#: parser/parse_expr.c:2869
+#: parser/parse_expr.c:2899
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "оператор сравнения строк не должен возвращать множество"
 
-#: parser/parse_expr.c:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "не удалось выбрать интерпретацию оператора сравнения строк %s"
 
-#: parser/parse_expr.c:2930
+#: parser/parse_expr.c:2960
 #, c-format
 msgid ""
 "Row comparison operators must be associated with btree operator families."
 msgstr ""
 "Операторы сравнения строк должны быть связаны с семейством операторов btree."
 
-#: parser/parse_expr.c:2971
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Оказалось несколько равноценных кандидатур."
 
-#: parser/parse_expr.c:3306
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr ""
 "предложение JSON ENCODING можно добавить только для входного типа bytea"
 
-#: parser/parse_expr.c:3370
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr ""
 "с неявным предложением FORMAT JSON можно использовать только строковые типы"
 
-#: parser/parse_expr.c:3371
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr ""
 "с явным предложением FORMAT JSON можно использовать только строковые типы"
 
-#: parser/parse_expr.c:3460
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "формат JSON можно использовать, только если возвращаемый тип строковый"
 
-#: parser/parse_expr.c:3473
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr ""
 "кодировку JSON можно использовать, только если возвращаемый тип — bytea"
 
-#: parser/parse_expr.c:3478
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "неподдерживаемая кодировка JSON"
 
-#: parser/parse_expr.c:3479
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "Для JSON поддерживается только кодировка UTF-8."
 
-#: parser/parse_expr.c:3516
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "функции SQL/JSON не могут возвращать типы SETOF"
 
-#: parser/parse_expr.c:3521
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "функции SQL/JSON не могут возвращать псевдотипы"
 
-#: parser/parse_expr.c:3849 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "агрегатное предложение ORDER BY для оконных функций не реализовано"
 
-#: parser/parse_expr.c:4072
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr ""
 "предложение JSON FORMAT ENCODING можно использовать только с типом bytea"
 
-#: parser/parse_expr.c:4092
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "в предикате IS JSON нельзя использовать тип %s"
 
-#: parser/parse_expr.c:4118 parser/parse_expr.c:4239
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
 #, c-format
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "тип %s нельзя использовать в предложении RETURNING функции %s"
 
-#: parser/parse_expr.c:4120
+#: parser/parse_expr.c:4150
 #, c-format
 msgid "Try returning json or jsonb."
 msgstr "Попробуйте возвратить тип json или jsonb."
 
-#: parser/parse_expr.c:4168
+#: parser/parse_expr.c:4198
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr ""
 "с предложением WITH UNIQUE KEYS можно использовать только строковые типы "
 "данных"
 
-#: parser/parse_expr.c:4242
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "Попробуйте возвратить строковый тип или bytea."
 
-#: parser/parse_expr.c:4307
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr "FORMAT JSON не может указываться в предложении RETURNING %s()"
 
-#: parser/parse_expr.c:4320
+#: parser/parse_expr.c:4353
 #, c-format
 msgid ""
 "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
@@ -20052,16 +20826,16 @@ msgstr ""
 "когда используется WITH WRAPPER, поведение QUOTES в SQL/JSON задать нельзя"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4334 parser/parse_expr.c:4363 parser/parse_expr.c:4394
-#: parser/parse_expr.c:4420 parser/parse_expr.c:4446
-#: parser/parse_jsontable.c:94
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427
+#: parser/parse_expr.c:4453 parser/parse_expr.c:4479
+#: parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "неверное поведение %s"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4337 parser/parse_expr.c:4366
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
 msgid ""
 "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is "
@@ -20073,14 +20847,14 @@ msgstr ""
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4344 parser/parse_expr.c:4373 parser/parse_expr.c:4402
-#: parser/parse_expr.c:4430 parser/parse_expr.c:4456
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435
+#: parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "неверное поведение %s для столбца \"%s\""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4347 parser/parse_expr.c:4376
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
 msgid ""
 "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is "
@@ -20089,13 +20863,13 @@ msgstr ""
 "В %s для форматируемых столбцов допускается только ERROR, NULL, EMPTY ARRAY, "
 "EMPTY OBJECT или выражение DEFAULT."
 
-#: parser/parse_expr.c:4395
+#: parser/parse_expr.c:4428
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
 msgstr "В %s для %s допускается только ERROR, TRUE, FALSE или UNKNOWN."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4405
+#: parser/parse_expr.c:4438
 #, c-format
 msgid ""
 "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
@@ -20104,13 +20878,13 @@ msgstr ""
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4423 parser/parse_expr.c:4449
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr "В %s для %s допускается только ERROR, NULL или выражение DEFAULT."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4433 parser/parse_expr.c:4459
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
 #, c-format
 msgid ""
 "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
@@ -20118,12 +20892,12 @@ msgstr ""
 "В %s для скалярных столбцов допускается только ERROR, NULL или выражение "
 "DEFAULT."
 
-#: parser/parse_expr.c:4489
+#: parser/parse_expr.c:4526
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "выражение пути JSON должно быть типа %s, а не типа %s"
 
-#: parser/parse_expr.c:4707
+#: parser/parse_expr.c:4766
 #, c-format
 msgid ""
 "can only specify a constant, non-aggregate function, or operator expression "
@@ -20132,22 +20906,28 @@ msgstr ""
 "в DEFAULT может задаваться только константа, вызов не агрегатной функции или "
 "выражение с оператором"
 
-#: parser/parse_expr.c:4712
+#: parser/parse_expr.c:4771
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "выражения в DEFAULT не могут содержать ссылки на столбцы"
 
-#: parser/parse_expr.c:4717
+#: parser/parse_expr.c:4776
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "выражение в DEFAULT не может возвращать множество"
 
-#: parser/parse_expr.c:4793 parser/parse_expr.c:4802
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr ""
+"правило сортировки выражения DEFAULT конфликтует с предложением RETURNING"
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "привести выражение поведения, имеющее тип %s, к типу %s нельзя"
 
-#: parser/parse_expr.c:4796
+#: parser/parse_expr.c:4873
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "Приведите выражение к типу %s явно."
@@ -20555,7 +21335,7 @@ msgstr ""
 "функции, возвращающие множества, нельзя применять в выражениях генерируемых "
 "столбцов"
 
-#: parser/parse_jsontable.c:95
+#: parser/parse_jsontable.c:93
 #, c-format
 msgid ""
 "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
@@ -20563,7 +21343,7 @@ msgstr ""
 "На верхнем уровне предложения ON ERROR допускается только EMPTY [ ARRAY ] "
 "или ERROR."
 
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
 msgstr "повторяющийся столбец или имя пути в JSON_TABLE: %s"
@@ -20660,38 +21440,33 @@ msgstr ""
 "для операторов ANY/ALL (с массивом) требуется, чтобы оператор возвращал не "
 "множество"
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "для параметра $%d выведены несогласованные типы"
 
-#: parser/parse_param.c:309 tcop/postgres.c:744
+#: parser/parse_param.c:310 tcop/postgres.c:734
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "не удалось определить тип данных параметра $%d"
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "ссылка на таблицу \"%s\" неоднозначна"
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "ссылка на таблицу %u неоднозначна"
 
-#: parser/parse_relation.c:465
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "имя таблицы \"%s\" указано больше одного раза"
-
-#: parser/parse_relation.c:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "в элементе предложения FROM неверная ссылка на таблицу \"%s\""
 
-#: parser/parse_relation.c:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, c-format
 msgid ""
 "There is an entry for table \"%s\", but it cannot be referenced from this "
@@ -20700,35 +21475,35 @@ msgstr ""
 "Таблица \"%s\" присутствует в запросе, но сослаться на неё из этой части "
 "запроса нельзя."
 
-#: parser/parse_relation.c:500
+#: parser/parse_relation.c:508
 #, 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:703
+#: parser/parse_relation.c:711
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "в ограничении-проверке указан недопустимый системный столбец \"%s\""
 
-#: parser/parse_relation.c:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr ""
 "системный столбец \"%s\" нельзя использовать в выражении генерируемого "
 "столбца"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "системный столбец \"%s\" нельзя использовать в условии MERGE WHEN"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "в таблице \"%s\" содержится столбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:1445
+#: parser/parse_relation.c:1462
 #, c-format
 msgid ""
 "There is a WITH item named \"%s\", but it cannot be referenced from this "
@@ -20737,7 +21512,7 @@ msgstr ""
 "В WITH есть элемент \"%s\", но на него нельзя ссылаться из этой части "
 "запроса."
 
-#: parser/parse_relation.c:1447
+#: parser/parse_relation.c:1464
 #, c-format
 msgid ""
 "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
@@ -20745,13 +21520,13 @@ msgstr ""
 "Используйте WITH RECURSIVE или исключите ссылки вперёд, переупорядочив "
 "элементы WITH."
 
-#: parser/parse_relation.c:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid ""
 "a column definition list is redundant for a function with OUT parameters"
 msgstr "список определений столбцов не нужен для функции с параметрами OUT"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid ""
 "a column definition list is redundant for a function returning a named "
@@ -20760,79 +21535,79 @@ msgstr ""
 "список определений столбцов не нужен для функции, возвращающий именованный "
 "составной тип"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, c-format
 msgid ""
 "a column definition list is only allowed for functions returning \"record\""
 msgstr ""
 "список определений столбцов может быть только у функций, возвращающих запись"
 
-#: parser/parse_relation.c:1857
+#: parser/parse_relation.c:1874
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr ""
 "у функций, возвращающих запись, должен быть список определений столбцов"
 
-#: parser/parse_relation.c:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "число элементов в списках определения столбцов ограничено %d"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr ""
 "функция \"%s\", используемая во FROM, возвращает неподдерживаемый тип %s"
 
-#: parser/parse_relation.c:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "число столбцов, возвращаемых функциями во FROM, ограничено %d"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "функция %s выдаёт столбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr "в списках VALUES \"%s\" содержится столбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:2242
+#: parser/parse_relation.c:2259
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "число столбцов в соединениях ограничено %d"
 
-#: parser/parse_relation.c:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid ""
 "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr "в выражении соединения \"%s\" имеется столбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "в запросе \"%s\" в WITH нет предложения RETURNING"
 
-#: parser/parse_relation.c:3635
+#: parser/parse_relation.c:3741
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Возможно, предполагалась ссылка на псевдоним таблицы \"%s\"."
 
-#: parser/parse_relation.c:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr ""
 "Чтобы обратиться к этой таблице, нужно добавить для данного подзапроса "
 "пометку LATERAL."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "таблица \"%s\" отсутствует в предложении FROM"
 
-#: parser/parse_relation.c:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid ""
 "There are columns named \"%s\", but they are in tables that cannot be "
@@ -20841,12 +21616,12 @@ msgstr ""
 "Имеются столбцы с именем \"%s\", но они относятся к таблицам, к которым "
 "нельзя обратиться из этой части запроса."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "Попробуйте использовать имя с указанием таблицы."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, c-format
 msgid ""
 "There is a column named \"%s\" in table \"%s\", but it cannot be referenced "
@@ -20855,52 +21630,52 @@ msgstr ""
 "Столбец \"%s\" есть в таблице \"%s\", но на него нельзя ссылаться из этой "
 "части запроса."
 
-#: parser/parse_relation.c:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr ""
 "Чтобы обратиться к этому столбцу, нужно добавить для данного подзапроса "
 "пометку LATERAL."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr ""
 "Чтобы обратиться к этому столбцу, нужно использовать имя с указанием таблицы."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Возможно, предполагалась ссылка на столбец \"%s.%s\"."
 
-#: parser/parse_relation.c:3742
+#: parser/parse_relation.c:3848
 #, 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:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "присвоить значение системному столбцу \"%s\" нельзя"
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "элементу массива нельзя присвоить значение по умолчанию"
 
-#: parser/parse_target.c:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "вложенному полю нельзя присвоить значение по умолчанию"
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "столбец \"%s\" имеет тип %s, а выражение - %s"
 
-#: parser/parse_target.c:779
+#: parser/parse_target.c:782
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
@@ -20909,7 +21684,7 @@ msgstr ""
 "присвоить значение полю \"%s\" столбца \"%s\" нельзя, так как тип %s не "
 "является составным"
 
-#: parser/parse_target.c:788
+#: parser/parse_target.c:791
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because there is no such "
@@ -20918,7 +21693,7 @@ msgstr ""
 "присвоить значение полю \"%s\" столбца \"%s\" нельзя, так как в типе данных "
 "%s нет такого столбца"
 
-#: parser/parse_target.c:877
+#: parser/parse_target.c:880
 #, c-format
 msgid ""
 "subscripted assignment to \"%s\" requires type %s but expression is of type "
@@ -20927,12 +21702,12 @@ msgstr ""
 "для присваивания \"%s\" значения по индексу требуется тип %s, однако "
 "выражение имеет тип %s"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "вложенное поле \"%s\" имеет тип %s, а выражение - %s"
 
-#: parser/parse_target.c:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * должен ссылаться на таблицы"
@@ -20952,8 +21727,8 @@ msgstr "неправильное указание %%TYPE (слишком мно
 msgid "type reference %s converted to %s"
 msgstr "ссылка на тип %s преобразована в тип %s"
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "тип \"%s\" является пустышкой"
@@ -20973,79 +21748,93 @@ msgstr "модификатором типа должна быть простая
 msgid "invalid type name \"%s\""
 msgstr "неверное имя типа \"%s\""
 
-#: parser/parse_utilcmd.c:263
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "создать секционированную таблицу в виде потомка нельзя"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:504
 #, c-format
 msgid "cannot set logged status of a temporary sequence"
 msgstr "изменить состояние журналирования временной последовательности нельзя"
 
-#: parser/parse_utilcmd.c:611
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "массивы с типом serial не реализованы"
 
-#: parser/parse_utilcmd.c:690 parser/parse_utilcmd.c:702
-#: parser/parse_utilcmd.c:761
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid ""
 "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "конфликт NULL/NOT NULL в объявлении столбца \"%s\" таблицы \"%s\""
 
-#: parser/parse_utilcmd.c:714
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr ""
+"ограничения NOT NULL для секционированных таблиц не могут иметь свойства NO "
+"INHERIT"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid ""
+"conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr ""
+"конфликтующие объявления NO INHERIT для ограничений NOT NULL столбца \"%s\""
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr ""
 "для столбца \"%s\" таблицы \"%s\" указано несколько значений по умолчанию"
 
-#: parser/parse_utilcmd.c:731
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr "столбцы идентификации не поддерживаются с типизированными таблицами"
 
-#: parser/parse_utilcmd.c:735
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "столбцы идентификации не поддерживаются с секциями"
 
-#: parser/parse_utilcmd.c:744
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr ""
 "для столбца \"%s\" таблицы \"%s\" свойство identity задано неоднократно"
 
-#: parser/parse_utilcmd.c:774
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr "генерируемые столбцы не поддерживаются с типизированными таблицами"
 
-#: parser/parse_utilcmd.c:778
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr ""
 "для столбца \"%s\" таблицы \"%s\" указано несколько генерирующих выражений"
 
-#: parser/parse_utilcmd.c:796 parser/parse_utilcmd.c:911
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "ограничения первичного ключа для сторонних таблиц не поддерживаются"
 
-#: parser/parse_utilcmd.c:805 parser/parse_utilcmd.c:921
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "ограничения уникальности для сторонних таблиц не поддерживаются"
 
-#: parser/parse_utilcmd.c:850
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr ""
 "для столбца \"%s\" таблицы \"%s\" задано и значение по умолчанию, и свойство "
 "identity"
 
-#: parser/parse_utilcmd.c:858
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid ""
 "both default and generation expression specified for column \"%s\" of table "
@@ -21054,7 +21843,7 @@ msgstr ""
 "для столбца \"%s\" таблицы \"%s\" задано и значение по умолчанию, и "
 "генерирующее выражение"
 
-#: parser/parse_utilcmd.c:866
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid ""
 "both identity and generation expression specified for column \"%s\" of table "
@@ -21063,88 +21852,96 @@ msgstr ""
 "для столбца \"%s\" таблицы \"%s\" задано и генерирующее выражение, и "
 "свойство identity"
 
-#: parser/parse_utilcmd.c:931
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "ограничения-исключения для сторонних таблиц не поддерживаются"
 
-#: parser/parse_utilcmd.c:996
-#, c-format
-msgid "LIKE is not supported for creating foreign tables"
-msgstr "LIKE при создании сторонних таблиц не поддерживается"
-
-#: parser/parse_utilcmd.c:1009
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "отношение \"%s\" не подходит для предложения LIKE"
 
-#: parser/parse_utilcmd.c:1736 parser/parse_utilcmd.c:1844
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "Индекс \"%s\" ссылается на тип всей строки таблицы."
 
-#: parser/parse_utilcmd.c:2242
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "в CREATE TABLE нельзя использовать существующий индекс"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "индекс \"%s\" уже связан с ограничением"
 
-#: parser/parse_utilcmd.c:2283
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" не является уникальным индексом"
 
-#: parser/parse_utilcmd.c:2284 parser/parse_utilcmd.c:2291
-#: parser/parse_utilcmd.c:2298 parser/parse_utilcmd.c:2375
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473
+#: parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr ""
 "Создать первичный ключ или ограничение уникальности для такого индекса "
 "нельзя."
 
-#: parser/parse_utilcmd.c:2290
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "индекс \"%s\" содержит выражения"
 
-#: parser/parse_utilcmd.c:2297
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" - частичный индекс"
 
-#: parser/parse_utilcmd.c:2309
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" - откладываемый индекс"
 
-#: parser/parse_utilcmd.c:2310
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr ""
 "Создать не откладываемое ограничение на базе откладываемого индекса нельзя."
 
-#: parser/parse_utilcmd.c:2374
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr ""
 "в индексе \"%s\" для столбца номер %d не определено поведение сортировки по "
 "умолчанию"
 
-#: parser/parse_utilcmd.c:2531
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "столбец \"%s\" фигурирует в первичном ключе дважды"
 
-#: parser/parse_utilcmd.c:2537
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "столбец \"%s\" фигурирует в ограничении уникальности дважды"
 
-#: parser/parse_utilcmd.c:2871
+#: parser/parse_utilcmd.c:2798
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr ""
+"столбец \"%s\" в WITHOUT OVERLAPS не диапазонного или мультидиапазонного типа"
+
+#: parser/parse_utilcmd.c:2826
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr ""
+"для ограничения, использующего WITHOUT OVERLAPS, требуются минимум два "
+"столбца"
+
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid ""
 "index expressions and predicates can refer only to the table being indexed"
@@ -21152,22 +21949,22 @@ msgstr ""
 "индексные выражения и предикаты могут ссылаться только на индексируемую "
 "таблицу"
 
-#: parser/parse_utilcmd.c:2943
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "выражения статистики могут ссылаться только на целевую таблицу"
 
-#: parser/parse_utilcmd.c:2986
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "правила для материализованных представлений не поддерживаются"
 
-#: parser/parse_utilcmd.c:3046
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "в условиях WHERE для правил нельзя ссылаться на другие отношения"
 
-#: parser/parse_utilcmd.c:3118
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid ""
 "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
@@ -21176,158 +21973,173 @@ msgstr ""
 "правила с условиями WHERE могут содержать только действия SELECT, INSERT, "
 "UPDATE или DELETE"
 
-#: parser/parse_utilcmd.c:3136 parser/parse_utilcmd.c:3237
-#: rewrite/rewriteHandler.c:544 rewrite/rewriteManip.c:1096
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489
+#: rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "условные операторы UNION/INTERSECT/EXCEPT не реализованы"
 
-#: parser/parse_utilcmd.c:3154
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "в правиле ON SELECT нельзя использовать OLD"
 
-#: parser/parse_utilcmd.c:3158
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "в правиле ON SELECT нельзя использовать NEW"
 
-#: parser/parse_utilcmd.c:3167
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "в правиле ON INSERT нельзя использовать OLD"
 
-#: parser/parse_utilcmd.c:3173
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "в правиле ON DELETE нельзя использовать NEW"
 
-#: parser/parse_utilcmd.c:3201
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "в запросе WITH нельзя ссылаться на OLD"
 
-#: parser/parse_utilcmd.c:3208
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "в запросе WITH нельзя ссылаться на NEW"
 
-#: parser/parse_utilcmd.c:3664
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "предложение DEFERRABLE расположено неправильно"
 
-#: parser/parse_utilcmd.c:3669 parser/parse_utilcmd.c:3684
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "DEFERRABLE/NOT DEFERRABLE можно указать только один раз"
 
-#: parser/parse_utilcmd.c:3679
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "предложение NOT DEFERRABLE расположено неправильно"
 
-#: parser/parse_utilcmd.c:3692 parser/parse_utilcmd.c:3718 gram.y:6114
+#: parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972 gram.y:6229
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr ""
-"ограничение с характеристикой INITIALLY DEFERRED должно быть объявлено как "
+"ограничение со свойством INITIALLY DEFERRED должно быть объявлено как "
 "DEFERRABLE"
 
-#: parser/parse_utilcmd.c:3700
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "предложение INITIALLY DEFERRED расположено неправильно"
 
-#: parser/parse_utilcmd.c:3705 parser/parse_utilcmd.c:3731
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "INITIALLY IMMEDIATE/DEFERRED можно указать только один раз"
 
-#: parser/parse_utilcmd.c:3726
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "предложение INITIALLY IMMEDIATE расположено неправильно"
 
-#: parser/parse_utilcmd.c:3919
+#: parser/parse_utilcmd.c:3997
+#, c-format
+msgid "misplaced ENFORCED clause"
+msgstr "предложение ENFORCED расположено неправильно"
+
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
+#, c-format
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "ENFORCED/NOT ENFORCED можно указать только один раз"
+
+#: parser/parse_utilcmd.c:4014
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "предложение NOT ENFORCED расположено неправильно"
+
+#: parser/parse_utilcmd.c:4212
 #, c-format
 msgid ""
 "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "в CREATE указана схема (%s), отличная от создаваемой (%s)"
 
-#: parser/parse_utilcmd.c:3954
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
 msgstr "\"%s\" — не секционированная таблица"
 
-#: parser/parse_utilcmd.c:3961
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "таблица \"%s\" не является секционированной"
 
-#: parser/parse_utilcmd.c:3968
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "индекс \"%s\" не секционирован"
 
-#: parser/parse_utilcmd.c:4008
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "у секционированной по хешу таблицы не может быть секции по умолчанию"
 
-#: parser/parse_utilcmd.c:4025
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "неправильное указание ограничения для хеш-секции"
 
-#: parser/parse_utilcmd.c:4031 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "модуль для хеш-секции должен быть положительным целым"
 
-#: parser/parse_utilcmd.c:4038 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "остаток для хеш-секции должен быть меньше модуля"
 
-#: parser/parse_utilcmd.c:4051
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "неправильное указание ограничения для секции по списку"
 
-#: parser/parse_utilcmd.c:4104
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "неправильное указание ограничения для секции по диапазону"
 
-#: parser/parse_utilcmd.c:4110
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr ""
 "во FROM должно указываться ровно одно значение для секционирующего столбца"
 
-#: parser/parse_utilcmd.c:4114
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr ""
 "в TO должно указываться ровно одно значение для секционирующего столбца"
 
-#: parser/parse_utilcmd.c:4228
+#: parser/parse_utilcmd.c:4523
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "указать NULL в диапазонном ограничении нельзя"
 
-#: parser/parse_utilcmd.c:4277
+#: parser/parse_utilcmd.c:4571
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "за границей MAXVALUE могут следовать только границы MAXVALUE"
 
-#: parser/parse_utilcmd.c:4284
+#: parser/parse_utilcmd.c:4578
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "за границей MINVALUE могут следовать только границы MINVALUE"
 
-#: parser/parse_utilcmd.c:4327
+#: parser/parse_utilcmd.c:4621
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "указанное значение нельзя привести к типу %s столбца \"%s\""
@@ -21340,12 +22152,12 @@ msgstr "За UESCAPE должна следовать простая строко
 msgid "invalid Unicode escape character"
 msgstr "неверный символ спецкода Unicode"
 
-#: parser/parser.c:347 scan.l:1393
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "неверное значение спецкода Unicode"
 
-#: parser/parser.c:494 utils/adt/varlena.c:6640 scan.l:716
+#: parser/parser.c:494 utils/adt/varlena.c:6901 scan.l:702
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "неверный спецкод Unicode"
@@ -21355,8 +22167,8 @@ msgstr "неверный спецкод Unicode"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Спецкоды Unicode должны иметь вид \\XXXX или \\+XXXXXX."
 
-#: parser/parser.c:523 utils/adt/varlena.c:6665 scan.l:677 scan.l:693
-#: scan.l:709
+#: parser/parser.c:523 utils/adt/varlena.c:6926 scan.l:663 scan.l:679
+#: scan.l:695
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "неверная суррогатная пара Unicode"
@@ -21457,7 +22269,7 @@ msgstr ""
 "значение типа \"%s\""
 
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "не удалось получить информацию о каталоге данных \"%s\": %m"
@@ -21555,14 +22367,14 @@ msgstr ""
 "огромные страницы не поддерживаются с текущим значением "
 "\"shared_memory_type\""
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1401
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr ""
 "ранее выделенный блок разделяемой памяти (ключ %lu, ID %lu) по-прежнему "
 "используется"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1403
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid ""
 "Terminate any old server processes associated with data directory \"%s\"."
@@ -21570,17 +22382,17 @@ msgstr ""
 "Завершите все старые серверные процессы, работающие с каталогом данных "
 "\"%s\"."
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "не удалось создать семафоры: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "Ошибка в системном вызове semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs "
@@ -21600,7 +22412,7 @@ msgstr ""
 "Подробная информация о настройке разделяемой памяти содержится в "
 "документации PostgreSQL."
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid ""
 "You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
@@ -21742,52 +22554,70 @@ msgstr "Ошибка в системном вызове DuplicateHandle."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Ошибка в системном вызове MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "процесс автоочистки запускался слишком долго; его запуск отменён"
 
 # skip-rule: capital-letter-first
-#: postmaster/autovacuum.c:2203
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "автоочистка: удаление устаревшей врем. таблицы \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2439
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "автоматическая очистка таблицы \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2442
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "автоматический анализ таблицы \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2636
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "обработка рабочей записи для отношения \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:3254
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "автоочистка не запущена из-за неправильной конфигурации"
 
-#: postmaster/autovacuum.c:3255
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Включите параметр \"track_counts\"."
 
+#: postmaster/autovacuum.c:3471
+#, c-format
+msgid ""
+"\"autovacuum_max_workers\" (%d) should be less than or equal to "
+"\"autovacuum_worker_slots\" (%d)"
+msgstr ""
+"значение \"autovacuum_max_workers\" (%d) должно быть меньше или равно "
+"\"autovacuum_worker_slots\" (%d)"
+
+#: postmaster/autovacuum.c:3473
+#, c-format
+msgid ""
+"The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum "
+"workers at a given time."
+msgstr ""
+"Сервер будет запускать не более чем \"autovacuum_worker_slots\" (%d) рабочих "
+"процессов автоочистки в один момент времени."
+
 #: postmaster/bgworker.c:260
 #, c-format
 msgid ""
-"inconsistent background worker state (max_worker_processes=%d, "
-"total_slots=%d)"
+"inconsistent background worker state (\"max_worker_processes\"=%d, total "
+"slots=%d)"
 msgstr ""
 "несогласованное состояние фонового рабочего процесса "
-"(max_worker_processes=%d, total_slots=%d)"
+"(\"max_worker_processes\"=%d, total slots=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid ""
 "background worker \"%s\": background workers without shared memory access "
@@ -21796,7 +22626,7 @@ msgstr ""
 "фоновый процесс \"%s\": фоновые процессы, не обращающиеся к общей памяти, не "
 "поддерживаются"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, c-format
 msgid ""
 "background worker \"%s\": cannot request database access if starting at "
@@ -21805,12 +22635,12 @@ msgstr ""
 "фоновый процесс \"%s\" не может получить доступ к БД, если он запущен при "
 "старте главного процесса"
 
-#: postmaster/bgworker.c:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "фоновый процесс \"%s\": неправильный интервал перезапуска"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid ""
 "background worker \"%s\": parallel workers may not be configured for restart"
@@ -21818,12 +22648,24 @@ msgstr ""
 "фоновый процесс \"%s\": параллельные исполнители не могут быть настроены для "
 "перезапуска"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3312
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "завершение фонового процесса \"%s\" по команде администратора"
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, c-format
+msgid "database connection requirement not indicated during registration"
+msgstr ""
+"при регистрации фонового процесса не указывалось, что ему требуется "
+"подключение к БД"
+
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "неправильный режим обработки в фоновом процессе"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid ""
 "background worker \"%s\": must be registered in \"shared_preload_libraries\""
@@ -21831,7 +22673,7 @@ msgstr ""
 "фоновой процесс \"%s\" должен быть зарегистрирован в "
 "\"shared_preload_libraries\""
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, c-format
 msgid ""
 "background worker \"%s\": only dynamic background workers can request "
@@ -21840,12 +22682,12 @@ msgstr ""
 "фоновый процесс \"%s\": только динамические фоновые процессы могут "
 "запрашивать уведомление"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "слишком много фоновых процессов"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural ""
@@ -21857,12 +22699,12 @@ msgstr[1] ""
 msgstr[2] ""
 "Максимально возможное число фоновых процессов при текущих параметрах: %d."
 
-#: postmaster/bgworker.c:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "Возможно, стоит увеличить параметр \"%s\"."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
@@ -21870,128 +22712,128 @@ msgstr[0] "контрольные точки происходят слишком
 msgstr[1] "контрольные точки происходят слишком часто (через %d сек.)"
 msgstr[2] "контрольные точки происходят слишком часто (через %d сек.)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "сбой при запросе контрольной точки"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "Смотрите подробности в протоколе сервера."
 
-#: postmaster/launch_backend.c:381
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "запустить серверный процесс \"%s\" не удалось: %m"
 
-#: postmaster/launch_backend.c:434
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr ""
 "создать отображение файла серверных параметров не удалось (код ошибки: %lu)"
 
-#: postmaster/launch_backend.c:442
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr ""
 "отобразить файл серверных параметров в память не удалось (код ошибки: %lu)"
 
-#: postmaster/launch_backend.c:459
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "слишком длинная командная строка подпроцесса"
 
-#: postmaster/launch_backend.c:477
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "ошибка в CreateProcess(): %m (код ошибки: %lu)"
 
-#: postmaster/launch_backend.c:504
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr ""
 "отключить отображение файла серверных параметров не удалось (код ошибки: %lu)"
 
-#: postmaster/launch_backend.c:508
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr ""
 "закрыть указатель файла серверных параметров не удалось (код ошибки: %lu)"
 
-#: postmaster/launch_backend.c:530
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr ""
 "число повторных попыток резервирования разделяемой памяти достигло предела"
 
-#: postmaster/launch_backend.c:531
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "Это может быть вызвано антивирусным ПО или механизмом ASLR."
 
-#: postmaster/launch_backend.c:834
+#: postmaster/launch_backend.c:854
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr ""
 "продублировать сокет %d для серверного процесса не удалось (код ошибки: %d)"
 
-#: postmaster/launch_backend.c:866
+#: postmaster/launch_backend.c:886
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "создать наследуемый сокет не удалось (код ошибки: %d)\n"
 
-#: postmaster/launch_backend.c:895
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
 msgstr "открыть файл серверных переменных \"%s\" не удалось: %m\n"
 
-#: postmaster/launch_backend.c:901
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
 msgstr "прочитать файл серверных переменных \"%s\" не удалось: %m\n"
 
-#: postmaster/launch_backend.c:912
+#: postmaster/launch_backend.c:932
 #, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
 msgstr ""
 "прочитать стартовые данные из файла серверных переменных \"%s\" не удалось: "
 "%m\n"
 
-#: postmaster/launch_backend.c:924
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
 msgstr "не удалось стереть файл \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:940
+#: postmaster/launch_backend.c:960
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "отобразить файл серверных переменных не удалось (код ошибки: %lu)\n"
 
-#: postmaster/launch_backend.c:959
+#: postmaster/launch_backend.c:979
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr ""
 "отключить отображение файла серверных переменных не удалось (код ошибки: "
 "%lu)\n"
 
-#: postmaster/launch_backend.c:966
+#: postmaster/launch_backend.c:986
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr ""
 "закрыть указатель файла серверных переменных не удалось (код ошибки: %lu)\n"
 
-#: postmaster/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
 msgstr "параметр \"archive_mode\" включён, но архивирование ещё не настроено"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "удалён ненужный файл состояния архива \"%s\""
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid ""
 "removal of orphan archive status file \"%s\" failed too many times, will try "
@@ -22000,7 +22842,7 @@ msgstr ""
 "удалить ненужный файл состояния архива \"%s\" не получилось много раз "
 "подряд; следующая попытка будет сделана позже"
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid ""
 "archiving write-ahead log file \"%s\" failed too many times, will try again "
@@ -22009,19 +22851,19 @@ msgstr ""
 "заархивировать файл журнала предзаписи \"%s\" не удалось много раз подряд; "
 "следующая попытка будет сделана позже"
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "\"archive_command\" и \"archive_library\" заданы одновременно"
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr ""
 "Только один из параметров \"archive_command\", \"archive_library\" может "
 "иметь значение."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid ""
 "restarting archiver process because value of \"archive_library\" was changed"
@@ -22029,32 +22871,32 @@ msgstr ""
 "процесс архиватора перезапускается, так как было изменено значение "
 "\"archive_library\""
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "в модулях архивирования должен объявляться символ %s"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "модули архивирования должны регистрировать обработчик вызова архивации"
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:678
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: неверный аргумент для параметра -f: \"%s\"\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:751
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: неверный аргумент для параметра -t: \"%s\"\n"
 
-#: postmaster/postmaster.c:757
+#: postmaster/postmaster.c:774
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: неверный аргумент: \"%s\"\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:842
 #, c-format
 msgid ""
 "%s: \"superuser_reserved_connections\" (%d) plus "
@@ -22063,12 +22905,12 @@ msgstr ""
 "%s: значение \"superuser_reserved_connections\" (%d) плюс "
 "\"reserved_connections\" (%d) должно быть меньше \"max_connections\" (%d)\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:850
 #, c-format
 msgid "WAL archival cannot be enabled when \"wal_level\" is \"minimal\""
 msgstr "архивацию WAL нельзя включить, если \"wal_level\" = \"minimal\""
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:853
 #, c-format
 msgid ""
 "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be "
@@ -22077,103 +22919,103 @@ msgstr ""
 "для потоковой трансляции WAL (\"max_wal_senders\" > 0) \"wal_level\" должен "
 "быть \"replica\" или \"logical\""
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "обобщение WAL нельзя включить, если выбран \"wal_level\" \"minimal\""
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:864
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ошибка в таблицах маркеров времени, требуется исправление\n"
 
-#: postmaster/postmaster.c:1004
+#: postmaster/postmaster.c:1025
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "не удалось создать порт завершения ввода/вывода для очереди потомков"
 
-#: postmaster/postmaster.c:1069
+#: postmaster/postmaster.c:1091
 #, c-format
 msgid "ending log output to stderr"
 msgstr "завершение вывода в stderr"
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1092
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "В дальнейшем протокол будет выводиться в \"%s\"."
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1103
 #, c-format
 msgid "starting %s"
 msgstr "запускается %s"
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1165
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "не удалось создать принимающий сокет для \"%s\""
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1171
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "не удалось создать сокеты TCP/IP"
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1203
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "функция DNSServiceRegister() выдала ошибку с кодом %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "не удалось создать Unix-сокет в каталоге \"%s\""
 
-#: postmaster/postmaster.c:1240
+#: postmaster/postmaster.c:1262
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "ни один Unix-сокет создать не удалось"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1273
 #, c-format
 msgid "no socket created for listening"
 msgstr "отсутствуют принимающие сокеты"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1304
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: не удалось поменять права для внешнего файла PID \"%s\": %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1308
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: не удалось записать внешний файл PID \"%s\": %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1336 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "не удалось загрузить %s"
 
-#: postmaster/postmaster.c:1342
+#: postmaster/postmaster.c:1364
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "процесс postmaster стал многопоточным при запуске"
 
-#: postmaster/postmaster.c:1343 postmaster/postmaster.c:3684
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Установите в переменной окружения LC_ALL правильную локаль."
 
-#: postmaster/postmaster.c:1442
+#: postmaster/postmaster.c:1468
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: не удалось найти путь к собственному исполняемому файлу"
 
-#: postmaster/postmaster.c:1449
+#: postmaster/postmaster.c:1475
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: подходящий исполняемый файл postgres не найден"
 
-#: postmaster/postmaster.c:1472 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1498 utils/misc/tzparser.c:342
 #, c-format
 msgid ""
 "This may indicate an incomplete PostgreSQL installation, or that the file "
@@ -22182,7 +23024,7 @@ msgstr ""
 "Возможно, PostgreSQL установлен не полностью или файла \"%s\" нет в "
 "положенном месте."
 
-#: postmaster/postmaster.c:1499
+#: postmaster/postmaster.c:1525
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -22195,306 +23037,292 @@ msgstr ""
 
 # well-spelled: неподчиняющимся
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1789
+#: postmaster/postmaster.c:1762
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "неподчиняющимся потомкам посылается %s"
 
-#: postmaster/postmaster.c:1811
+#: postmaster/postmaster.c:1784
 #, c-format
 msgid ""
 "performing immediate shutdown because data directory lock file is invalid"
 msgstr ""
 "немедленное отключение из-за ошибочного файла блокировки каталога данных"
 
-#: postmaster/postmaster.c:1874
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "неправильный ключ в запросе на отмену процесса %d"
-
-#: postmaster/postmaster.c:1886
-#, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "процесс с кодом %d, полученным в запросе на отмену, не найден"
-
-#: postmaster/postmaster.c:2106
+#: postmaster/postmaster.c:2004
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "получен SIGHUP, файлы конфигурации перезагружаются"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2134 postmaster/postmaster.c:2138
+#: postmaster/postmaster.c:2012 postmaster/postmaster.c:2016
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s не был перезагружен"
 
-#: postmaster/postmaster.c:2148
+#: postmaster/postmaster.c:2026
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "конфигурация SSL не была перезагружена"
 
-#: postmaster/postmaster.c:2234
+#: postmaster/postmaster.c:2112
 #, c-format
 msgid "received smart shutdown request"
 msgstr "получен запрос на \"вежливое\" выключение"
 
-#: postmaster/postmaster.c:2275
+#: postmaster/postmaster.c:2153
 #, c-format
 msgid "received fast shutdown request"
 msgstr "получен запрос на быстрое выключение"
 
-#: postmaster/postmaster.c:2293
+#: postmaster/postmaster.c:2171
 #, c-format
 msgid "aborting any active transactions"
 msgstr "прерывание всех активных транзакций"
 
-#: postmaster/postmaster.c:2317
+#: postmaster/postmaster.c:2195
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "получен запрос на немедленное выключение"
 
-#: postmaster/postmaster.c:2389
+#: postmaster/postmaster.c:2270
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "выключение при достижении цели восстановления"
 
-#: postmaster/postmaster.c:2407 postmaster/postmaster.c:2443
+#: postmaster/postmaster.c:2288 postmaster/postmaster.c:2324
 msgid "startup process"
 msgstr "стартовый процесс"
 
-#: postmaster/postmaster.c:2410
+#: postmaster/postmaster.c:2291
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "прерывание запуска из-за ошибки в стартовом процессе"
 
-#: postmaster/postmaster.c:2485
+#: postmaster/postmaster.c:2347
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "система БД готова принимать подключения"
 
-#: postmaster/postmaster.c:2506
+#: postmaster/postmaster.c:2369
 msgid "background writer process"
 msgstr "процесс фоновой записи"
 
-#: postmaster/postmaster.c:2553
+#: postmaster/postmaster.c:2402
 msgid "checkpointer process"
 msgstr "процесс контрольных точек"
 
-#: postmaster/postmaster.c:2569
+#: postmaster/postmaster.c:2419
 msgid "WAL writer process"
 msgstr "процесс записи WAL"
 
-#: postmaster/postmaster.c:2584
+#: postmaster/postmaster.c:2435
 msgid "WAL receiver process"
 msgstr "процесс считывания WAL"
 
-#: postmaster/postmaster.c:2598
+#: postmaster/postmaster.c:2450
 msgid "WAL summarizer process"
 msgstr "процесс обобщения WAL"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2466
 msgid "autovacuum launcher process"
 msgstr "процесс запуска автоочистки"
 
-#: postmaster/postmaster.c:2631
+#: postmaster/postmaster.c:2482
 msgid "archiver process"
 msgstr "процесс архивации"
 
-#: postmaster/postmaster.c:2644
+#: postmaster/postmaster.c:2497
 msgid "system logger process"
 msgstr "процесс системного протоколирования"
 
-#: postmaster/postmaster.c:2661
+#: postmaster/postmaster.c:2515
 msgid "slot sync worker process"
 msgstr "рабочий процесс синхронизации слотов"
 
-#: postmaster/postmaster.c:2717
+#: postmaster/postmaster.c:2523 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "рабочий процесс ввода/вывода"
+
+# well-spelled: неотслеживаемый
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2547
+msgid "untracked child process"
+msgstr "неотслеживаемый дочерний процесс"
+
+#: postmaster/postmaster.c:2580
 #, c-format
 msgid "background worker \"%s\""
 msgstr "фоновый процесс \"%s\""
 
-#: postmaster/postmaster.c:2796 postmaster/postmaster.c:2816
-#: postmaster/postmaster.c:2823 postmaster/postmaster.c:2841
-msgid "server process"
-msgstr "процесс сервера"
-
-#: postmaster/postmaster.c:2895
+#: postmaster/postmaster.c:2804
 #, 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:3082
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) завершился с кодом выхода %d"
 
-#: postmaster/postmaster.c:3084 postmaster/postmaster.c:3096
-#: postmaster/postmaster.c:3106 postmaster/postmaster.c:3117
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:3093
+#: postmaster/postmaster.c:2848
 #, 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:3103
+#: postmaster/postmaster.c:2858
 #, 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:3115
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) завершился с нераспознанным кодом состояния %d"
 
-#: postmaster/postmaster.c:3331
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "аварийное выключение системы БД"
 
-#: postmaster/postmaster.c:3357
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "сервер останавливается из-за ошибки в стартовом процессе"
 
-#: postmaster/postmaster.c:3363
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "сервер останавливается, так как \"restart_after_crash\" = \"off\""
 
-#: postmaster/postmaster.c:3375
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "все серверные процессы завершены... переинициализация"
 
-#: postmaster/postmaster.c:3574 postmaster/postmaster.c:3985
-#: postmaster/postmaster.c:4374
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "не удалось сгенерировать случайный ключ отмены"
-
-#: postmaster/postmaster.c:3607
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "породить новый процесс для соединения не удалось: %m"
 
-#: postmaster/postmaster.c:3649
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "породить новый процесс для соединения не удалось: "
 
-#: postmaster/postmaster.c:3683
+#: postmaster/postmaster.c:3667
 #, c-format
 msgid "postmaster became multithreaded"
 msgstr "процесс postmaster стал многопоточным"
 
-#: postmaster/postmaster.c:3752
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "система БД готова принимать подключения в режиме \"только чтение\""
 
-#: postmaster/postmaster.c:3935
+#: postmaster/postmaster.c:3846
 #, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "породить процесс \"%s\" не удалось: %m"
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL был неожиданно остановлен"
 
-#: postmaster/postmaster.c:4173 postmaster/postmaster.c:4207
+#: postmaster/postmaster.c:3971
 #, c-format
-msgid "database connection requirement not indicated during registration"
-msgstr ""
-"при регистрации фонового процесса не указывалось, что ему требуется "
-"подключение к БД"
+msgid "no slot available for new autovacuum worker process"
+msgstr "для нового рабочего процесса автоочистки не нашлось слота"
 
-#: postmaster/postmaster.c:4183 postmaster/postmaster.c:4217
+#: postmaster/postmaster.c:3986
 #, c-format
-msgid "invalid processing mode in background worker"
-msgstr "неправильный режим обработки в фоновом процессе"
-
-#: postmaster/postmaster.c:4277
-#, c-format
-msgid "could not fork background worker process: %m"
-msgstr "породить фоновый рабочий процесс не удалось: %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "породить процесс \"%s\" не удалось: %m"
 
-#: postmaster/postmaster.c:4360
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "для нового фонового рабочего процесса нет свободного слота"
 
-#: postmaster/postmaster.c:4623
+#: postmaster/postmaster.c:4163
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "породить фоновый рабочий процесс не удалось: %m"
+
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "прочитать код завершения процесса не удалось\n"
 
-#: postmaster/postmaster.c:4665
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "отправить состояние завершения потомка не удалось\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "не удалось прочитать из канала протоколирования: %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "не удалось создать канал для syslog: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "не удалось породить процесс системного протоколирования: %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "передача вывода в протокол процессу сбора протоколов"
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "В дальнейшем протоколы будут выводиться в каталог \"%s\"."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "не удалось перенаправить stdout: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "не удалось перенаправить stderr: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "не удалось записать в файл протокола: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не удалось открыть файл протокола \"%s\": %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "отключение автопрокрутки (чтобы включить, передайте SIGHUP)"
 
-#: postmaster/walsummarizer.c:740
+#: postmaster/walsummarizer.c:743
 #, c-format
 msgid "WAL summarization is not progressing"
 msgstr "процесс обобщения WAL не продвигается"
 
-#: postmaster/walsummarizer.c:741
+#: postmaster/walsummarizer.c:744
 #, c-format
 msgid ""
 "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/"
@@ -22503,7 +23331,7 @@ msgstr ""
 "Обобщение должно охватить %X/%X, но оно остановилось на позиции %X/%X на "
 "диске и %X/%X в памяти."
 
-#: postmaster/walsummarizer.c:755
+#: postmaster/walsummarizer.c:758
 #, c-format
 msgid "still waiting for WAL summarization through %X/%X after %ld second"
 msgid_plural ""
@@ -22512,27 +23340,27 @@ msgstr[0] "ожидание обобщения позиции %X/%X продол
 msgstr[1] "ожидание обобщения позиции %X/%X продолжается %ld сек."
 msgstr[2] "ожидание обобщения позиции %X/%X продолжается %ld сек."
 
-#: postmaster/walsummarizer.c:760
+#: postmaster/walsummarizer.c:763
 #, c-format
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "Процесс обобщения достиг позиции %X/%X на диске и %X/%X в памяти."
 
-#: postmaster/walsummarizer.c:1000
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "не удалось найти корректную запись после %X/%X"
 
-#: postmaster/walsummarizer.c:1045
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "не удалось прочитать WAL с линии времени %u в позиции %X/%X: %s"
 
-#: postmaster/walsummarizer.c:1051
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "не удалось прочитать WAL с линии времени %u в позиции %X/%X"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr ""
@@ -22546,19 +23374,19 @@ msgstr ""
 "недетерминированные правила сортировки не поддерживаются для регулярных "
 "выражений"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243
+#: replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "требуется пароль"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr ""
 "Только суперпользователи могут подключаться к серверу, не требующему пароль."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid ""
 "Target server's authentication method must be changed, or set "
@@ -22567,30 +23395,30 @@ msgstr ""
 "Необходимо сменить метод аутентификации на целевом сервере или задать "
 "password_required=false в параметрах подписки."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "не удалось очистить путь поиска: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308
+#: replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "ошибочный синтаксис строки подключения: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr ""
 "Пользователи, не являющиеся суперпользователями, должны задавать пароль в "
 "строке соединения."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "не удалось разобрать строку подключения: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid ""
 "could not receive database system identifier and timeline ID from the "
@@ -22599,13 +23427,13 @@ msgstr ""
 "не удалось получить идентификатор СУБД и код линии времени с главного "
 "сервера: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455
+#: replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "неверный ответ главного сервера"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid ""
 "Could not identify system: got %d rows and %d fields, expected %d rows and "
@@ -22614,91 +23442,91 @@ msgstr ""
 "Не удалось идентифицировать систему, получено строк: %d, полей: %d "
 "(ожидалось: %d и %d (или более))."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597
+#: replication/libpqwalreceiver/libpqwalreceiver.c:604
+#: replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "не удалось начать трансляцию WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "не удалось отправить главному серверу сообщение о конце передачи: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "неожиданный набор данных после конца передачи"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "ошибка при остановке потоковой операции COPY: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "ошибка при чтении результата команды передачи: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721
+#: replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "неожиданный результат после CommandComplete: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "не удалось получить файл истории линии времени с главного сервера: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "Ожидался 1 кортеж с 2 полями, однако получено кортежей: %d, полей: %d."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818
+#: replication/libpqwalreceiver/libpqwalreceiver.c:873
+#: replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "не удалось получить данные из потока WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "не удалось отправить данные в поток WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "не удалось создать слот репликации \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "не удалось изменить свойства слота репликации \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "неверный ответ на запрос"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "Ожидалось полей: %d, получено: %d."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "для интерфейса запросов требуется подключение к БД"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "пустой запрос"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "неожиданный режим канала"
 
@@ -22716,30 +23544,30 @@ msgstr ""
 msgid "lost connection to the logical replication apply worker"
 msgstr "потеряна связь с применяющим процессом логической репликации"
 
-#: replication/logical/applyparallelworker.c:1024
-#: replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031
+#: replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "параллельный применяющий процесс логической репликации"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr ""
 "параллельный применяющий процесс логической репликации завершён из-за ошибки"
 
-#: replication/logical/applyparallelworker.c:1127
-#: replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134
+#: replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr ""
 "потеряна связь с параллельным применяющим процессом логическим репликации"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "не удалось передать данные в очередь в разделяемой памяти"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid ""
 "logical replication apply worker will serialize the remaining changes of "
@@ -22748,7 +23576,145 @@ msgstr ""
 "применяющий процесс логической репликации будет сериализовывать остальное "
 "содержимое удалённой транзакции %u в файл"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/conflict.c:126
+#, c-format
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "конфликт выявлен в отношении \"%s.%s\": конфликт=%s"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified locally in transaction "
+"%u at %s."
+msgstr ""
+"Ключ уже существует в уникальном индексе \"%s\", изменён локально в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified by origin \"%s\" in "
+"transaction %u at %s."
+msgstr ""
+"Ключ уже существует в уникальном индексе \"%s\", изменён источником \"%s\" в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid ""
+"Key already exists in unique index \"%s\", modified by a non-existent origin "
+"in transaction %u at %s."
+msgstr ""
+"Ключ уже существует в уникальном индексе \"%s\", изменён несуществующим "
+"источником в транзакции %u в %s."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr ""
+"Ключ уже существует в уникальном индексе \"%s\", изменён в транзакции %u."
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr ""
+"Изменяется строка, которая была изменена локально в транзакции %u в %s."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid ""
+"Updating the row that was modified by a different origin \"%s\" in "
+"transaction %u at %s."
+msgstr ""
+"Изменяется строка, которая была изменена другим источником \"%s\" в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid ""
+"Updating the row that was modified by a non-existent origin in transaction "
+"%u at %s."
+msgstr ""
+"Изменяется строка, которая была изменена несуществующим источником в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:265
+msgid "Could not find the row to be updated."
+msgstr "Не удалось найти строку для изменения."
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "Удаляется строка, которая была изменена локально в транзакции %u в %s."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid ""
+"Deleting the row that was modified by a different origin \"%s\" in "
+"transaction %u at %s."
+msgstr ""
+"Удаляется строка, которая была изменена другим источником \"%s\" в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid ""
+"Deleting the row that was modified by a non-existent origin in transaction "
+"%u at %s."
+msgstr ""
+"Удаляется строка, которая была изменена несуществующим источником в "
+"транзакции %u в %s."
+
+#: replication/logical/conflict.c:284
+msgid "Could not find the row to be deleted."
+msgstr "Не удалось найти строку для удаления."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "Ключ %s"
+
+#: replication/logical/conflict.c:364
+#, c-format
+msgid "existing local row %s"
+msgstr "существующая локальная строка %s"
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "Существующая локальная строка %s"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "строка на удалённой стороне %s"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "Строка на удалённой стороне %s"
+
+#: replication/logical/conflict.c:434
+#, c-format
+msgid "replica identity %s"
+msgstr "идентификатор реплики %s"
+
+#: replication/logical/conflict.c:435
+#, c-format
+msgid "replica identity full %s"
+msgstr "полный идентификатор реплики %s"
+
+#: replication/logical/conflict.c:440
+#, c-format
+msgid "Replica identity %s"
+msgstr "Идентификатор реплики %s"
+
+#: replication/logical/conflict.c:441
+#, c-format
+msgid "Replica identity full %s"
+msgstr "Полный идентификатор реплики %s"
+
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid ""
 "logical decoding on standby requires \"wal_level\" >= \"logical\" on the "
@@ -22757,39 +23723,43 @@ msgstr ""
 "для логического декодирования на ведомом сервере требуется \"wal_level\" >= "
 "\"logical\" на ведущем"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
+msgid ""
+"cannot start logical replication workers when "
+"\"max_active_replication_origins\" is 0"
 msgstr ""
 "нельзя запустить процессы-обработчики логической репликации при "
-"max_replication_slots = 0"
+"\"max_active_replication_origins\" = 0"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "недостаточно слотов для процессов логической репликации"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:985 storage/lmgr/lock.c:1023
-#: storage/lmgr/lock.c:2836 storage/lmgr/lock.c:4221 storage/lmgr/lock.c:4286
-#: storage/lmgr/lock.c:4636 storage/lmgr/predicate.c:2469
-#: storage/lmgr/predicate.c:2484 storage/lmgr/predicate.c:3881
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "Возможно, следует увеличить параметр \"%s\"."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "недостаточно слотов для фоновых рабочих процессов"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr ""
 "слот обработчика логической репликации %d пуст, подключиться к нему нельзя"
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid ""
 "logical replication worker slot %d is already used by another worker, cannot "
@@ -22798,28 +23768,28 @@ msgstr ""
 "слот обработчика логической репликации %d уже занят другим процессом, "
 "подключиться к нему нельзя"
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "для логического декодирования требуется \"wal_level\" >= \"logical\""
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "для логического декодирования требуется подключение к БД"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr ""
 "физический слот репликации нельзя использовать для логического декодирования"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "слот репликации \"%s\" создан не в этой базе данных"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid ""
 "cannot create logical replication slot in transaction that has performed "
@@ -22827,78 +23797,59 @@ msgid ""
 msgstr ""
 "нельзя создать слот логической репликации в транзакции, осуществляющей запись"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr ""
 "слот репликации \"%s\" нельзя использовать для логического декодирования"
 
-#: replication/logical/logical.c:542 replication/slot.c:798
-#: replication/slot.c:829
+#: replication/logical/logical.c:546 replication/slot.c:858
+#: replication/slot.c:903
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "Этот слот репликации синхронизируется с ведущего сервера."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "Укажите другой слот репликации."
 
-#: replication/logical/logical.c:554 replication/logical/logical.c:561
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "из слота репликации \"%s\" больше нельзя получать изменения"
-
-#: replication/logical/logical.c:556
-#, c-format
-msgid ""
-"This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr ""
-"Этот слот был аннулирован из-за превышения максимального зарезервированного "
-"размера."
-
-#: replication/logical/logical.c:563
-#, c-format
-msgid ""
-"This slot has been invalidated because it was conflicting with recovery."
-msgstr "Этот слот был аннулирован из-за конфликта с восстановлением."
-
-#: replication/logical/logical.c:628
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "начинается логическое декодирование для слота \"%s\""
 
-#: replication/logical/logical.c:630
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr "Передача транзакций, фиксируемых после %X/%X, чтение WAL с %X/%X."
 
-#: replication/logical/logical.c:778
+#: replication/logical/logical.c:763
 #, 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:784
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "слот \"%s\", модуль вывода \"%s\", в обработчике %s"
 
-#: replication/logical/logical.c:955 replication/logical/logical.c:1000
-#: replication/logical/logical.c:1045 replication/logical/logical.c:1091
+#: replication/logical/logical.c:940 replication/logical/logical.c:985
+#: replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "для логической репликации во время подготовки требуется обработчик %s"
 
-#: replication/logical/logical.c:1323 replication/logical/logical.c:1372
-#: replication/logical/logical.c:1413 replication/logical/logical.c:1499
-#: replication/logical/logical.c:1548
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357
+#: replication/logical/logical.c:1398 replication/logical/logical.c:1484
+#: replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "для логической потоковой репликации требуется обработчик %s"
 
-#: replication/logical/logical.c:1458
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr ""
@@ -22925,7 +23876,7 @@ msgstr "массив должен быть одномерным"
 msgid "array must not contain nulls"
 msgstr "массив не должен содержать элементы null"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1420
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -22940,74 +23891,85 @@ msgstr ""
 "модуль вывода логического декодирования \"%s\" выдаёт двоичные данные, но "
 "функция \"%s\" ожидает текстовые"
 
-#: replication/logical/origin.c:190
+#: replication/logical/origin.c:195
 #, c-format
 msgid ""
-"cannot query or manipulate replication origin when \"max_replication_slots\" "
-"is 0"
+"cannot query or manipulate replication origin when "
+"\"max_active_replication_origins\" is 0"
 msgstr ""
 "запрашивать или модифицировать источники репликации при "
-"\"max_replication_slots\" = 0 нельзя"
+"\"max_active_replication_origins\" = 0 нельзя"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "модифицировать источники репликации во время восстановления нельзя"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "источник репликации \"%s\" не существует"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "имя источника репликации слишком длинное"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "Имена источников репликации не могут быть длиннее %d байт."
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "найти свободный ID для источника репликации не удалось"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr ""
 "удалить источник репликации с ID %d нельзя, он используется процессом с PID "
 "%d"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "источник репликации с ID %d не существует"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr ""
 "контрольная точка репликации имеет неправильную сигнатуру (%u вместо %u)"
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
 msgid ""
-"could not find free replication state, increase \"max_replication_slots\""
+"could not find free replication state, increase "
+"\"max_active_replication_origins\""
 msgstr ""
 "не удалось найти свободную ячейку для состояния репликации, увеличьте "
-"\"max_replication_slots\""
+"\"max_active_replication_origins\""
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "состояние репликации узла %d восстановлено до %X/%X"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr ""
 "неверная контрольная сумма файла контрольной точки для слота репликации (%u "
 "вместо %u)"
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "источник репликации с ID %d уже занят процессом с PID %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid ""
 "could not find free replication state slot for replication origin with ID %d"
@@ -23015,29 +23977,29 @@ msgstr ""
 "не удалось найти свободный слот состояния репликации для источника "
 "репликации с ID %d"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
-msgid "Increase \"max_replication_slots\" and try again."
-msgstr "Увеличьте параметр \"max_replication_slots\" и повторите попытку."
+msgid "Increase \"max_active_replication_origins\" and try again."
+msgstr ""
+"Увеличьте параметр \"max_active_replication_origins\" и повторите попытку."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "нельзя настроить источник репликации, когда он уже настроен"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "ни один источник репликации не настроен"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "имя источника репликации \"%s\" зарезервировано"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid ""
 "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
@@ -23045,17 +24007,16 @@ msgstr ""
 "Имена источников \"%s\", \"%s\", а также имена, начинающиеся с \"pg_\", "
 "зарезервированы."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", \"%s\""
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" is missing replicated column: "
@@ -23073,7 +24034,25 @@ msgstr[2] ""
 "в целевом отношении логической репликации (\"%s.%s\") отсутствуют "
 "реплицируемые столбцы: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, c-format
+msgid ""
+"logical replication target relation \"%s.%s\" has incompatible generated "
+"column: %s"
+msgid_plural ""
+"logical replication target relation \"%s.%s\" has incompatible generated "
+"columns: %s"
+msgstr[0] ""
+"в целевом отношении логической репликации \"%s.%s\" имеется генерируемый "
+"столбец: %s"
+msgstr[1] ""
+"в целевом отношении логической репликации \"%s.%s\" имеются генерируемые "
+"столбцы: %s"
+msgstr[2] ""
+"в целевом отношении логической репликации \"%s.%s\" имеются генерируемые "
+"столбцы: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" uses system columns in REPLICA "
@@ -23082,24 +24061,24 @@ msgstr ""
 "в целевом отношении логической репликации (\"%s.%s\") в индексе REPLICA "
 "IDENTITY используются системные столбцы"
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "целевое отношение логической репликации \"%s.%s\" не существует"
 
-#: replication/logical/reorderbuffer.c:3999
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "не удалось записать в файл данных для XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:4345
-#: replication/logical/reorderbuffer.c:4370
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "не удалось прочитать файл подкачки буфера пересортировки: %m"
 
-#: replication/logical/reorderbuffer.c:4349
-#: replication/logical/reorderbuffer.c:4374
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid ""
 "could not read from reorderbuffer spill file: read %d instead of %u bytes"
@@ -23107,59 +24086,52 @@ msgstr ""
 "не удалось прочитать файл подкачки буфера пересортировки (прочитано байт: "
 "%d, требовалось: %u)"
 
-#: replication/logical/reorderbuffer.c:4624
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
-msgstr ""
-"ошибка при удалении файла \"%s\" в процессе удаления pg_replslot/%s/xid*: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
+msgstr "ошибка при удалении файла \"%s\" в процессе удаления %s/%s/xid*: %m"
 
-#: replication/logical/reorderbuffer.c:5120
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d, требовалось: %d)"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:596
 #, c-format
-msgid ""
-"could not synchronize replication slot \"%s\" because remote slot precedes "
-"local slot"
-msgstr ""
-"синхронизировать слот репликации \"%s\" не удалось, так как состояние "
-"удалённого слота предшествует локальному"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "не удалось синхронизировать слот репликации \"%s\""
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:216
 #, c-format
 msgid ""
-"The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has "
-"LSN %X/%X and catalog xmin %u."
+"Synchronization could lead to data loss, because the remote slot needs WAL "
+"at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog "
+"xmin %u."
 msgstr ""
-"Для удалённого слота текущий LSN %X/%X и xmin каталога %u, тогда как для "
-"локального — LSN %X/%X и xmin каталога %u."
+"Синхронизация могла привести к потере данных, так как удалённый слот требует "
+"WAL в позиции LSN %X/%X и xmin каталога %u, но на резервном сервере текущий "
+"LSN %X/%X и xmin каталога %u."
 
-#: replication/logical/slotsync.c:459
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "слот репликации \"%s\" базы данных с OID %u удалён"
 
-#: replication/logical/slotsync.c:579
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "не удалось синхронизировать слот репликации \"%s\""
-
-#: replication/logical/slotsync.c:580
+#: replication/logical/slotsync.c:597
 #, c-format
 msgid ""
-"Logical decoding could not find consistent point from local slot's LSN %X/%X."
+"Synchronization could lead to data loss, because the standby could not build "
+"a consistent snapshot to decode WALs at LSN %X/%X."
 msgstr ""
-"При логическом декодировании не удалось найти точку согласованности от LSN "
-"локального слота %X/%X."
+"Синхронизация могла привести к потере данных, так как резервный сервер не "
+"смог получить согласованный снимок для декодирования WAL в позиции LSN %X/%X."
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:606
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "созданный слот репликации \"%s\" сейчас готов к синхронизации"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:645
 #, c-format
 msgid ""
 "skipping slot synchronization because the received slot sync LSN %X/%X for "
@@ -23168,7 +24140,7 @@ msgstr ""
 "синхронизация слота пропускается, потому что полученная позиция LSN %X/%X "
 "для слота \"%s\" предшествует позиции %X/%X на резервном сервере"
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:667
 #, c-format
 msgid ""
 "exiting from slot synchronization because same name slot \"%s\" already "
@@ -23177,32 +24149,32 @@ msgstr ""
 "синхронизация слота отменяется, потому что слот с таким же именем \"%s\" уже "
 "существует на резервном сервере"
 
-#: replication/logical/slotsync.c:819
+#: replication/logical/slotsync.c:838
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr ""
 "не удалось получить информацию о переносимых логических слотах с главного "
 "сервера: %s"
 
-#: replication/logical/slotsync.c:965
+#: replication/logical/slotsync.c:987
 #, c-format
 msgid ""
-"could not fetch primary_slot_name \"%s\" info from the primary server: %s"
+"could not fetch primary slot name \"%s\" info from the primary server: %s"
 msgstr "не удалось получить информацию о слоте \"%s\" с главного сервера: %s"
 
 # skip-rule: nastroy1
-#: replication/logical/slotsync.c:967
+#: replication/logical/slotsync.c:989
 #, c-format
-msgid "Check if primary_slot_name is configured correctly."
-msgstr "Проверьте правильность настройки primary_slot_name."
+msgid "Check if \"primary_slot_name\" is configured correctly."
+msgstr "Проверьте правильность настройки \"primary_slot_name\"."
 
-#: replication/logical/slotsync.c:987
+#: replication/logical/slotsync.c:1009
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "синхронизировать слоты репликации с резервного сервера нельзя"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:996
+#: replication/logical/slotsync.c:1018
 #, c-format
 msgid ""
 "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
@@ -23212,32 +24184,32 @@ msgstr ""
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1029
+#: replication/logical/slotsync.c:1051
 #, c-format
 msgid ""
 "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "для синхронизации слотов репликации требуется указание \"%s\" в \"%s\""
 
-#: replication/logical/slotsync.c:1050
+#: replication/logical/slotsync.c:1070
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr ""
 "для синхронизации слотов репликации требуется \"wal_level\" >= \"logical\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
+#: replication/logical/slotsync.c:1085 replication/logical/slotsync.c:1113
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "для синхронизации слотов репликации требуется установить \"%s\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1077
+#: replication/logical/slotsync.c:1099
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "для синхронизации слотов репликации требуется включить \"%s\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1151
 #, c-format
 msgid ""
 "replication slot synchronization worker will shut down because \"%s\" is "
@@ -23246,7 +24218,7 @@ msgstr ""
 "процесс синхронизации слотов репликации будет остановлен, так как \"%s\" "
 "отключён"
 
-#: replication/logical/slotsync.c:1138
+#: replication/logical/slotsync.c:1160
 #, c-format
 msgid ""
 "replication slot synchronization worker will restart because of a parameter "
@@ -23255,44 +24227,47 @@ msgstr ""
 "процесс синхронизации слотов репликации будет перезапущен вследствие "
 "изменения параметров"
 
-#: replication/logical/slotsync.c:1162
+#: replication/logical/slotsync.c:1184
 #, c-format
 msgid ""
-"replication slot synchronization worker is shutting down on receiving SIGINT"
+"replication slot synchronization worker is shutting down because promotion "
+"is triggered"
 msgstr ""
-"процесс синхронизации слотов репликации останавливается, получив сигнал "
-"SIGINT"
+"процесс синхронизации слотов репликации останавливается, так как вызвана "
+"процедура повышения сервера"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1309
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr ""
 "синхронизировать слоты репликации, когда выполняется повышение резервного "
 "сервера, нельзя"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1317
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "многопоточная синхронизация слотов репликации не поддерживается"
 
-#: replication/logical/slotsync.c:1403
+#: replication/logical/slotsync.c:1425
 #, c-format
 msgid "slot sync worker started"
 msgstr "рабочий процесс синхронизации слотов запущен"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
+#: replication/logical/slotsync.c:1487 replication/slotfuncs.c:928
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "не удалось подключиться к главному серверу: %s"
+msgid ""
+"synchronization worker \"%s\" could not connect to the primary server: %s"
+msgstr ""
+"рабочий процесс синхронизации \"%s\" не смог подключиться к главному "
+"серверу: %s"
 
-#: replication/logical/snapbuild.c:653
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "изначальный снимок слота слишком большой"
 
 # skip-rule: capital-letter-first
-#: replication/logical/snapbuild.c:707
+#: replication/logical/snapbuild.c:568
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural ""
@@ -23304,68 +24279,68 @@ msgstr[1] ""
 msgstr[2] ""
 "экспортирован снимок логического декодирования: \"%s\" (ид. транзакций: %u)"
 
-#: replication/logical/snapbuild.c:1404 replication/logical/snapbuild.c:1501
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "процесс логического декодирования достиг точки согласованности в %X/%X"
 
-#: replication/logical/snapbuild.c:1406
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "Больше активных транзакций нет."
 
-#: replication/logical/snapbuild.c:1453
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr ""
 "процесс логического декодирования нашёл начальную стартовую точку в %X/%X"
 
-#: replication/logical/snapbuild.c:1455 replication/logical/snapbuild.c:1479
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "Ожидание транзакций (примерно %d), старее %u до конца."
 
-#: replication/logical/snapbuild.c:1477
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr ""
 "при логическом декодировании найдена начальная точка согласованности в %X/%X"
 
-#: replication/logical/snapbuild.c:1503
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "Больше старых транзакций нет."
 
-#: replication/logical/snapbuild.c:1904
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr ""
 "файл состояния snapbuild \"%s\" имеет неправильную сигнатуру (%u вместо %u)"
 
-#: replication/logical/snapbuild.c:1910
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr ""
 "файл состояния snapbuild \"%s\" имеет неправильную версию (%u вместо %u)"
 
-#: replication/logical/snapbuild.c:1951
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr ""
 "в файле состояния snapbuild \"%s\" неверная контрольная сумма (%u вместо %u)"
 
-#: replication/logical/snapbuild.c:2019
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Логическое декодирование начнётся с сохранённого снимка."
 
-#: replication/logical/snapbuild.c:2126
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "не удалось разобрать имя файла \"%s\""
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid ""
 "logical replication table synchronization worker for subscription \"%s\", "
@@ -23374,7 +24349,7 @@ msgstr ""
 "процесс синхронизации таблицы при логической репликации для подписки \"%s\", "
 "таблицы \"%s\" закончил обработку"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid ""
 "logical replication apply worker for subscription \"%s\" will restart so "
@@ -23383,25 +24358,25 @@ msgstr ""
 "применяющий процесс логической репликации для подписки \"%s\" будет "
 "перезапущен, чтобы можно было включить режим two_phase"
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr ""
 "не удалось получить информацию о таблице \"%s.%s\" с сервера публикации: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "таблица \"%s.%s\" не найдена на сервере публикации"
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr ""
 "не удалось получить информацию о списке столбцов таблицы \"%s.%s\" с сервера "
 "публикации: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid ""
 "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: "
@@ -23410,25 +24385,29 @@ msgstr ""
 "не удалось получить информацию о предложении WHERE таблицы \"%s.%s\" с "
 "сервера публикации: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr ""
 "не удалось начать копирование начального содержимого таблицы \"%s.%s\": %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
+#, c-format
+msgid ""
+"table synchronization worker for subscription \"%s\" could not connect to "
+"the publisher: %s"
+msgstr ""
+"процесс синхронизации таблицы для подписки \"%s\" не смог подключиться к "
+"серверу публикации: %s"
+
+#: replication/logical/tablesync.c:1480
 #, c-format
 msgid "table copy could not start transaction on publisher: %s"
 msgstr ""
 "при копировании таблицы не удалось начать транзакцию на сервере публикации: "
 "%s"
 
-#: replication/logical/tablesync.c:1472
-#, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "источник репликации \"%s\" уже существует"
-
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid ""
 "user \"%s\" cannot replicate into relation with row-level security enabled: "
@@ -23437,14 +24416,14 @@ msgstr ""
 "пользователь \"%s\" не может реплицировать данные в отношение с включённой "
 "защитой на уровне строк: \"%s\""
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr ""
 "при копировании таблицы не удалось завершить транзакцию на сервере "
 "публикации: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop"
@@ -23452,7 +24431,7 @@ msgstr ""
 "параллельный применяющий процесс логической репликации для подписки \"%s\" "
 "будет остановлен"
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid ""
 "Cannot handle streamed replication transactions using parallel apply workers "
@@ -23462,13 +24441,13 @@ msgstr ""
 "транзакций репликации, передаваемых в потоке, пока все таблицы не "
 "синхронизированы."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr ""
 "неправильный формат двоичных данных для столбца логической репликации %d"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid ""
 "publisher did not send replica identity column expected by the logical "
@@ -23477,7 +24456,7 @@ msgstr ""
 "сервер публикации не передал столбец идентификации реплики, ожидаемый для "
 "целевого отношения логической репликации \"%s.%s\""
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid ""
 "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY "
@@ -23488,22 +24467,22 @@ msgstr ""
 "IDENTITY, ни ключа PRIMARY KEY, и публикуемое отношение не имеет "
 "характеристики REPLICA IDENTITY FULL"
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "неверный тип сообщения логической репликации \"??? (%d)\""
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "поток данных с сервера публикации закончился"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "завершение обработчика логической репликации из-за тайм-аута"
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will stop because the "
@@ -23512,7 +24491,7 @@ msgstr ""
 "процесс логической репликации для подписки \"%s\" будет остановлен, так как "
 "подписка была удалена"
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will stop because the "
@@ -23521,7 +24500,7 @@ msgstr ""
 "процесс логической репликации для подписки \"%s\" будет остановлен, так как "
 "подписка была отключена"
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop "
@@ -23530,7 +24509,7 @@ msgstr ""
 "параллельный применяющий процесс логической репликации для подписки \"%s\" "
 "будет остановлен вследствие изменения параметров"
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will restart because of a "
@@ -23539,7 +24518,7 @@ msgstr ""
 "процесс логической репликации для подписки \"%s\" будет перезапущен "
 "вследствие изменения параметров"
 
-#: replication/logical/worker.c:3954
+#: replication/logical/worker.c:4053
 #, c-format
 msgid ""
 "logical replication parallel apply worker for subscription \"%s\" will stop "
@@ -23549,7 +24528,7 @@ msgstr ""
 "подписки \"%s\" будет остановлен, потому что владелец подписки был лишён "
 "прав суперпользователя"
 
-#: replication/logical/worker.c:3958
+#: replication/logical/worker.c:4057
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will restart because the "
@@ -23558,12 +24537,20 @@ msgstr ""
 "процесс логической репликации для подписки \"%s\" будет перезапущен, потому "
 "что владелец подписки был лишён прав суперпользователя"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "для подписки не задан слот репликации"
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, c-format
+msgid ""
+"apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr ""
+"процесс применения изменений для подписки \"%s\" не смог подключиться к "
+"серверу публикации: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid ""
 "logical replication worker for subscription %u will not start because the "
@@ -23572,7 +24559,7 @@ msgstr ""
 "процесс логической репликации для подписки %u не будет запущен, так как "
 "подписка была удалена при старте"
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid ""
 "logical replication worker for subscription \"%s\" will not start because "
@@ -23581,7 +24568,7 @@ msgstr ""
 "процесс логической репликации для подписки \"%s\" не будет запущен, так как "
 "подписка была отключена при старте"
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid ""
 "logical replication table synchronization worker for subscription \"%s\", "
@@ -23590,35 +24577,35 @@ msgstr ""
 "процесс синхронизации таблицы при логической репликации для подписки \"%s\", "
 "таблицы \"%s\" запущен"
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr ""
 "запускается применяющий процесс логической репликации для подписки \"%s\""
 
-#: replication/logical/worker.c:4758
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "подписка \"%s\" была отключена из-за ошибки"
 
-#: replication/logical/worker.c:4806
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr ""
 "обработчик логической репликации начинает пропускать транзакцию с LSN %X/%X"
 
-#: replication/logical/worker.c:4820
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr ""
 "обработчик логической репликации завершил пропуск транзакции с LSN %X/%X"
 
-#: replication/logical/worker.c:4902
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "значение skip-LSN для подписки \"%s\" очищено"
 
-#: replication/logical/worker.c:4903
+#: replication/logical/worker.c:5026
 #, c-format
 msgid ""
 "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN "
@@ -23627,7 +24614,7 @@ msgstr ""
 "Позиция завершения удалённой транзакции в WAL (LSN) %X/%X не совпала со "
 "значением skip-LSN %X/%X."
 
-#: replication/logical/worker.c:4940
+#: replication/logical/worker.c:5054
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23636,7 +24623,7 @@ msgstr ""
 "обработка внешних данных для источника репликации \"%s\" в контексте "
 "сообщения типа \"%s\""
 
-#: replication/logical/worker.c:4944
+#: replication/logical/worker.c:5058
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23645,7 +24632,7 @@ msgstr ""
 "обработка внешних данных из источника репликации \"%s\" в контексте "
 "сообщения типа \"%s\" в транзакции %u"
 
-#: replication/logical/worker.c:4949
+#: replication/logical/worker.c:5063
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23654,7 +24641,7 @@ msgstr ""
 "обработка внешних данных для источника репликации \"%s\" в контексте "
 "сообщения типа \"%s\" в транзакции %u, конечная позиция %X/%X"
 
-#: replication/logical/worker.c:4960
+#: replication/logical/worker.c:5074
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23664,7 +24651,7 @@ msgstr ""
 "сообщения типа \"%s\" для целевого отношения репликации \"%s.%s\" в "
 "транзакции %u"
 
-#: replication/logical/worker.c:4967
+#: replication/logical/worker.c:5081
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23675,7 +24662,7 @@ msgstr ""
 "сообщения типа \"%s\" для целевого отношения репликации \"%s.%s\" в "
 "транзакции %u, конечная позиция %X/%X"
 
-#: replication/logical/worker.c:4978
+#: replication/logical/worker.c:5092
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23686,7 +24673,7 @@ msgstr ""
 "сообщения типа \"%s\" для целевого отношения репликации \"%s.%s\", столбца "
 "\"%s\", в транзакции %u"
 
-#: replication/logical/worker.c:4986
+#: replication/logical/worker.c:5100
 #, c-format
 msgid ""
 "processing remote data for replication origin \"%s\" during message type "
@@ -23697,27 +24684,27 @@ msgstr ""
 "сообщения типа \"%s\" для целевого отношения репликации \"%s.%s\", столбца "
 "\"%s\", в транзакции %u, конечная позиция %X/%X"
 
-#: replication/pgoutput/pgoutput.c:322
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "неверное значение proto_version"
 
-#: replication/pgoutput/pgoutput.c:327
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "значение proto_verson \"%s\" вне диапазона"
 
-#: replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "неверный синтаксис publication_names"
 
-#: replication/pgoutput/pgoutput.c:414 replication/pgoutput/pgoutput.c:418
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "параметр \"%s\" отсутствует"
 
-#: replication/pgoutput/pgoutput.c:478
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid ""
 "client sent proto_version=%d but server only supports protocol %d or lower"
@@ -23725,7 +24712,7 @@ msgstr ""
 "клиент передал proto_version=%d, но сервер поддерживает только протокол %d и "
 "ниже"
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid ""
 "client sent proto_version=%d but server only supports protocol %d or higher"
@@ -23733,7 +24720,7 @@ msgstr ""
 "клиент передал proto_version=%d, но сервер поддерживает только протокол %d и "
 "выше"
 
-#: replication/pgoutput/pgoutput.c:499
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid ""
 "requested proto_version=%d does not support streaming, need %d or higher"
@@ -23741,7 +24728,7 @@ msgstr ""
 "запрошенная версия proto_version=%d не поддерживает потоковую передачу, "
 "требуется версия %d или выше"
 
-#: replication/pgoutput/pgoutput.c:505
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid ""
 "requested proto_version=%d does not support parallel streaming, need %d or "
@@ -23750,12 +24737,12 @@ msgstr ""
 "запрошенная версия proto_version=%d не поддерживает параллельную потоковую "
 "передачу, требуется версия %d или выше"
 
-#: replication/pgoutput/pgoutput.c:510
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "запрошена потоковая передача, но она не поддерживается модулем вывода"
 
-#: replication/pgoutput/pgoutput.c:524
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid ""
 "requested proto_version=%d does not support two-phase commit, need %d or "
@@ -23764,28 +24751,51 @@ msgstr ""
 "запрошенная версия proto_version=%d не поддерживает двухфазную фиксацию, "
 "требуется версия %d или выше"
 
-#: replication/pgoutput/pgoutput.c:529
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "запрошена двухфазная фиксация, но она не поддерживается модулем вывода"
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1112
+#, c-format
+msgid ""
+"cannot use different values of publish_generated_columns for table \"%s.%s\" "
+"in different publications"
+msgstr ""
+"использовать различные значения publish_generated_columns для таблицы \"%s."
+"%s\" в разных публикациях нельзя"
+
+#: replication/pgoutput/pgoutput.c:1815
+#, c-format
+msgid "skipped loading publication \"%s\""
+msgstr "пропускается загрузка публикации \"%s\""
+
+#: replication/pgoutput/pgoutput.c:1816
+#, c-format
+msgid "The publication does not exist at this point in the WAL."
+msgstr "Публикация не существует в WAL на данный момент."
+
+#: replication/pgoutput/pgoutput.c:1817
+#, c-format
+msgid "Create the publication if it does not exist."
+msgstr "Создайте публикацию, если она ещё не создана."
+
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "имя слота репликации \"%s\" слишком короткое"
 
-#: replication/slot.c:269
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "имя слота репликации \"%s\" слишком длинное"
 
-#: replication/slot.c:282
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "имя слота репликации \"%s\" содержит недопустимый символ"
 
-#: replication/slot.c:284
-#, c-format
+#: replication/slot.c:334
 msgid ""
 "Replication slot names may only contain lower case letters, numbers, and the "
 "underscore character."
@@ -23793,125 +24803,136 @@ msgstr ""
 "Имя слота репликации может содержать только буквы в нижнем регистре, цифры и "
 "знак подчёркивания."
 
-#: replication/slot.c:333
+#: replication/slot.c:377
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr ""
 "слот репликации, созданный на ведомом сервере, не может быть переносимым"
 
-#: replication/slot.c:345 replication/slot.c:849
+#: replication/slot.c:389 replication/slot.c:925
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "временный слот репликации не может быть переносимым"
 
-#: replication/slot.c:370
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "слот репликации \"%s\" уже существует"
 
-#: replication/slot.c:380
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "используются все слоты репликации"
 
-#: replication/slot.c:381
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "Освободите ненужный или увеличьте параметр \"max_replication_slots\"."
 
-#: replication/slot.c:560 replication/slot.c:2450 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:609 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "слот репликации \"%s\" не существует"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "слот репликации \"%s\" занят процессом с PID %d"
 
-#: replication/slot.c:638
+#: replication/slot.c:681
+#, c-format
+msgid "can no longer access replication slot \"%s\""
+msgstr "слот репликации \"%s\" стал недоступным"
+
+#: replication/slot.c:683
+#, c-format
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "Исходный слот репликации был аннулирован по причине \"%s\"."
+
+#: replication/slot.c:702
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "получен слот логической репликации \"%s\""
 
-#: replication/slot.c:640
+#: replication/slot.c:704
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "получен слот физической репликации \"%s\""
 
-#: replication/slot.c:729
+#: replication/slot.c:789
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "освобождён слот логической репликации \"%s\""
 
-#: replication/slot.c:731
+#: replication/slot.c:791
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "освобождён слот физической репликации \"%s\""
 
-#: replication/slot.c:797
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "удалить слот репликации \"%s\" нельзя"
 
-#: replication/slot.c:816
+#: replication/slot.c:890
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "выполнить %s со слотом физической репликации нельзя"
 
-#: replication/slot.c:828
+#: replication/slot.c:902
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "изменить слот репликации \"%s\" нельзя"
 
-#: replication/slot.c:838
+#: replication/slot.c:912
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "сделать переносимым слот репликации на ведомом сервере нельзя"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "ошибка при удалении каталога \"%s\""
 
-#: replication/slot.c:1372
+#: replication/slot.c:1534
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr ""
 "слоты репликации можно использовать, только если \"max_replication_slots\" > "
 "0"
 
-#: replication/slot.c:1377
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr ""
 "слоты репликации можно использовать, только если \"wal_level\" >= \"replica\""
 
-#: replication/slot.c:1389
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "нет прав для использования слотов репликации"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "Использовать слоты репликации могут только роли с атрибутом %s."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1664
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
-msgstr[0] "Позиция restart_lsn %X/%X слота превысила предел на %llu Б."
-msgstr[1] "Позиция restart_lsn %X/%X слота превысила предел на %llu Б."
-msgstr[2] "Позиция restart_lsn %X/%X слота превысила предел на %llu Б."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural ""
+"The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
+msgstr[0] "Позиция restart_lsn %X/%X слота превысила предел на %<PRIu64> Б."
+msgstr[1] "Позиция restart_lsn %X/%X слота превысила предел на %<PRIu64> Б."
+msgstr[2] "Позиция restart_lsn %X/%X слота превысила предел на %<PRIu64> Б."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "Слот конфликтует с горизонтом xid %u."
 
-#: replication/slot.c:1511
+#: replication/slot.c:1680
 msgid ""
 "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the "
 "primary server."
@@ -23919,77 +24940,100 @@ msgstr ""
 "Для логического декодирования на ведомом сервере требуется \"wal_level\" >= "
 "\"logical\" на ведущем."
 
-#: replication/slot.c:1519
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1686
+#, c-format
+msgid ""
+"The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr ""
+"Время простоя слота %ld сек. превышает настроенную в \"%s\" длительность %d "
+"сек."
+
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "завершение процесса %d для освобождения слота репликации \"%s\""
 
-#: replication/slot.c:1521
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "аннулирование устаревшего слота репликации \"%s\""
 
-#: replication/slot.c:2249
+#: replication/slot.c:2559
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr ""
 "файл слота репликации \"%s\" имеет неправильную сигнатуру (%u вместо %u)"
 
-#: replication/slot.c:2256
+#: replication/slot.c:2566
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "файл состояния snapbuild \"%s\" имеет неподдерживаемую версию %u"
 
-#: replication/slot.c:2263
+#: replication/slot.c:2573
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "у файла слота репликации \"%s\" неверная длина: %u"
 
-#: replication/slot.c:2299
+#: replication/slot.c:2609
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr ""
 "в файле слота репликации \"%s\" неверная контрольная сумма (%u вместо %u)"
 
-#: replication/slot.c:2333
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr ""
 "существует слот логической репликации \"%s\", но \"wal_level\" < \"logical\""
 
-#: replication/slot.c:2335
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "Смените \"wal_level\" на \"logical\" или более высокий уровень."
 
-#: replication/slot.c:2339
+#: replication/slot.c:2659
+#, c-format
+msgid ""
+"logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = "
+"\"off\""
+msgstr ""
+"на ведомом сервере существует слот логической репликации \"%s\", но "
+"\"hot_standby\" = \"off\""
+
+#: replication/slot.c:2661
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "Смените значение \"hot_standby\" на \"on\"."
+
+#: replication/slot.c:2666
 #, c-format
 msgid ""
 "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr ""
 "существует слот физической репликации \"%s\", но \"wal_level\" < \"replica\""
 
-#: replication/slot.c:2341
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "Смените \"wal_level\" на \"replica\" или более высокий уровень."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "перед завершением активно слишком много слотов репликации"
 
-#: replication/slot.c:2458
+#: replication/slot.c:2716
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "\"%s\" не является слотом физической репликации"
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "Увеличьте параметр \"max_replication_slots\" и повторите попытку."
 
-#: replication/slot.c:2635
+#: replication/slot.c:2953
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "слот репликации \"%s\", указанный в параметре \"%s\", не существует"
 
-#: replication/slot.c:2637 replication/slot.c:2671 replication/slot.c:2686
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
 #, c-format
 msgid ""
 "Logical replication is waiting on the standby associated with replication "
@@ -23998,30 +25042,30 @@ msgstr ""
 "Логическая репликация ожидает резервного сервера, связанного со слотом "
 "репликации \"%s\"."
 
-#: replication/slot.c:2639
+#: replication/slot.c:2957
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "Создайте слот репликации \"%s\" или опустите параметр \"%s\"."
 
-#: replication/slot.c:2649
+#: replication/slot.c:2967
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr ""
 "слот логической репликации \"%s\" не может быть указан в параметре \"%s\""
 
-#: replication/slot.c:2651
+#: replication/slot.c:2969
 #, c-format
 msgid ""
 "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "Логическая репликация ожидает исправления слота репликации \"%s\"."
 
-#: replication/slot.c:2653
+#: replication/slot.c:2971
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr ""
 "Удалите указание слота логической репликации \"%s\" из параметра \"%s\"."
 
-#: replication/slot.c:2669
+#: replication/slot.c:2987
 #, c-format
 msgid ""
 "physical replication slot \"%s\" specified in parameter \"%s\" has been "
@@ -24030,14 +25074,14 @@ msgstr ""
 "слот физической репликации \"%s\", указанный в параметре \"%s\", был "
 "аннулирован"
 
-#: replication/slot.c:2673
+#: replication/slot.c:2991
 #, c-format
 msgid ""
 "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr ""
 "Удалите и пересоздайте слот репликации \"%s\" или опустите параметр \"%s\"."
 
-#: replication/slot.c:2684
+#: replication/slot.c:3002
 #, c-format
 msgid ""
 "replication slot \"%s\" specified in parameter \"%s\" does not have "
@@ -24046,7 +25090,7 @@ msgstr ""
 "у слота репликации \"%s\", указанного в параметре \"%s\", нулевое значение "
 "active_pid"
 
-#: replication/slot.c:2688
+#: replication/slot.c:3006
 #, c-format
 msgid ""
 "Start the standby associated with the replication slot \"%s\", or amend "
@@ -24055,29 +25099,29 @@ msgstr ""
 "Запустите резервный сервер, связанный со слотом репликации \"%s\", или "
 "опустите параметр \"%s\"."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "неверный целевой LSN"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "слот репликации \"%s\" нельзя продвинуть вперёд"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid ""
 "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "Для этого слота ранее не резервировался WAL либо слот был аннулирован."
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr ""
 "продвинуть слот репликации к позиции %X/%X нельзя, минимальная позиция: %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid ""
 "cannot copy physical replication slot \"%s\" as a logical replication slot"
@@ -24085,7 +25129,7 @@ msgstr ""
 "слот физической репликации \"%s\" нельзя скопировать как слот логической "
 "репликации"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid ""
 "cannot copy logical replication slot \"%s\" as a physical replication slot"
@@ -24093,17 +25137,22 @@ msgstr ""
 "слот логической репликации \"%s\" нельзя скопировать как слот физической "
 "репликации"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "скопировать слот репликации, для которого не резервируется WAL, нельзя"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "скопировать аннулированный слот репликации \"%s\" нельзя"
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "не удалось скопировать слот репликации \"%s\""
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid ""
 "The source replication slot was modified incompatibly during the copy "
@@ -24112,26 +25161,36 @@ msgstr ""
 "Исходный слот репликации был модифицирован несовместимым образом во время "
 "копирования."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr ""
 "скопировать слот логической репликации \"%s\" в незавершённом состоянии "
 "нельзя"
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr ""
 "Повторите попытку, когда для исходного слота репликации будет определена "
 "позиция confirmed_flush_lsn."
 
-#: replication/slotfuncs.c:877
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "скопировать слот репликации \"%s\" нельзя"
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "Исходный слот репликации был аннулирован во время копирования."
+
+#: replication/slotfuncs.c:906
 #, c-format
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "слоты репликации могут синхронизироваться только с резервным сервером"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid ""
 "canceling the wait for synchronous replication and terminating connection "
@@ -24140,7 +25199,7 @@ msgstr ""
 "отмена ожидания синхронной репликации и закрытие соединения по команде "
 "администратора"
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, c-format
 msgid ""
 "The transaction has already committed locally, but might not have been "
@@ -24149,142 +25208,147 @@ msgstr ""
 "Транзакция уже была зафиксирована локально, но, возможно, не была "
 "реплицирована на резервный сервер."
 
-#: replication/syncrep.c:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "отмена ожидания синхронной репликации по запросу пользователя"
 
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "резервный сервер \"%s\" стал синхронным с приоритетом %d"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr ""
 "резервный сервер \"%s\" стал кандидатом для включения в кворум синхронных "
 "резервных"
 
-#: replication/syncrep.c:1013
+#. translator: %s is a GUC name
+#: replication/syncrep.c:1082
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr "ошибка при разборе \"synchronous_standby_names\""
+msgid "\"%s\" parser failed."
+msgstr "Разобрать \"%s\" не удалось."
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1089
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "число синхронных резервных серверов (%d) должно быть больше нуля"
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "завершение процесса считывания журнала по команде администратора"
+msgid ""
+"streaming replication receiver \"%s\" could not connect to the primary "
+"server: %s"
+msgstr ""
+"приёмник потоковой репликации \"%s\" не смог подключиться к главному "
+"серверу: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "идентификаторы СУБД на главном и резервном серверах различаются"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "Идентификатор на главном сервере: %s, на резервном: %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr ""
 "последняя линия времени %u на главном сервере отстаёт от восстанавливаемой "
 "линии времени %u"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr ""
 "начало передачи журнала с главного сервера, с позиции %X/%X на линии времени "
 "%u"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "перезапуск передачи журнала с позиции %X/%X на линии времени %u"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "продолжить передачу WAL нельзя, восстановление уже окончено"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "репликация прекращена главным сервером"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "На линии времени %u в %X/%X достигнут конец журнала."
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "завершение приёма журнала из-за тайм-аута"
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr ""
 "на главном сервере больше нет журналов для запрошенной линии времени %u"
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "не удалось закрыть сегмент WAL %s: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "загрузка файла истории для линии времени %u с главного сервера"
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "не удалось записать в сегмент WAL %s (смещение %d, длина %lu): %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "использовать %s со слотом логической репликации нельзя"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1735
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "не удалось перейти к концу файла \"%s\": %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "не удалось перейти к началу файла \"%s\": %m"
 
-#: replication/walsender.c:853
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr ""
 "слот логической репликации нельзя использовать для физической репликации"
 
-#: replication/walsender.c:919
+#: replication/walsender.c:909
 #, c-format
 msgid ""
 "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr ""
 "в истории сервера нет запрошенной начальной точки %X/%X на линии времени %u"
 
-#: replication/walsender.c:922
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "История этого сервера ответвилась от линии времени %u в %X/%X."
 
-#: replication/walsender.c:966
+#: replication/walsender.c:956
 #, c-format
 msgid ""
 "requested starting point %X/%X is ahead of the WAL flush position of this "
@@ -24293,75 +25357,69 @@ msgstr ""
 "запрошенная начальная точка %X/%X впереди позиции сброшенных данных журнала "
 "на этом сервере (%X/%X)"
 
-#: replication/walsender.c:1160
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr ""
-"нераспознанное значение для параметра CREATE_REPLICATION_SLOT \"%s\": \"%s\""
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s требуется выполнять не в транзакции"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s требуется выполнять внутри транзакции"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s требуется выполнять в транзакции уровня изоляции REPEATABLE READ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s требуется выполнять внутри транзакции только для чтения"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s требуется выполнять до каких-либо запросов"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s требуется вызывать не в подтранзакции"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "завершение процесса передачи журнала после повышения"
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr ""
 "нельзя выполнять новые команды, пока процесс передачи WAL находится в режиме "
 "остановки"
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr ""
 "нельзя выполнять команды SQL в процессе, передающем WAL для физической "
 "репликации"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "получена команда репликации: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1142
-#: tcop/postgres.c:1500 tcop/postgres.c:1752 tcop/postgres.c:2234
-#: tcop/postgres.c:2672 tcop/postgres.c:2749
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137
+#: tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251
+#: tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid ""
 "current transaction is aborted, commands ignored until end of transaction "
@@ -24369,22 +25427,22 @@ msgid ""
 msgstr ""
 "текущая транзакция прервана, команды до конца блока транзакции игнорируются"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "неожиданный обрыв соединения с резервным сервером"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "неверный тип сообщения резервного сервера: \"%c\""
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "неожиданный тип сообщения \"%c\""
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2789
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "завершение процесса передачи журнала из-за тайм-аута репликации"
@@ -24577,7 +25635,7 @@ msgstr "правило \"%s\" для отношения\"%s\" не сущест
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "переименовывать правило ON SELECT нельзя"
 
-#: rewrite/rewriteHandler.c:588
+#: rewrite/rewriteHandler.c:590
 #, c-format
 msgid ""
 "WITH query name \"%s\" appears in both a rule action and the query being "
@@ -24586,7 +25644,7 @@ msgstr ""
 "имя запроса WITH \"%s\" оказалось и в действии правила, и в переписываемом "
 "запросе"
 
-#: rewrite/rewriteHandler.c:615
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid ""
 "INSERT ... SELECT rule actions are not supported for queries having data-"
@@ -24595,123 +25653,123 @@ msgstr ""
 "правила INSERT ... SELECT не поддерживаются для запросов с операторами, "
 "изменяющими данные, в WITH"
 
-#: rewrite/rewriteHandler.c:668
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "RETURNING можно определить только для одного правила"
 
-#: rewrite/rewriteHandler.c:900 rewrite/rewriteHandler.c:939
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "в столбец \"%s\" можно вставить только значение по умолчанию"
 
-#: rewrite/rewriteHandler.c:902 rewrite/rewriteHandler.c:968
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr ""
 "Столбец \"%s\" является столбцом идентификации со свойством GENERATED ALWAYS."
 
-#: rewrite/rewriteHandler.c:904
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "Для переопределения укажите OVERRIDING SYSTEM VALUE."
 
-#: rewrite/rewriteHandler.c:966 rewrite/rewriteHandler.c:974
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "столбцу \"%s\" можно присвоить только значение DEFAULT"
 
-#: rewrite/rewriteHandler.c:1109 rewrite/rewriteHandler.c:1127
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "многочисленные присвоения одному столбцу \"%s\""
 
-#: rewrite/rewriteHandler.c:1682
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE не поддерживается для отношений с правилами."
 
-#: rewrite/rewriteHandler.c:1722 rewrite/rewriteHandler.c:3262
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr "доступ к несистемному представлению \"%s\" ограничен"
 
-#: rewrite/rewriteHandler.c:2122 rewrite/rewriteHandler.c:4254
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "обнаружена бесконечная рекурсия в правилах для отношения \"%s\""
 
-#: rewrite/rewriteHandler.c:2227
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "обнаружена бесконечная рекурсия в политике для отношения \"%s\""
 
-#: rewrite/rewriteHandler.c:2589
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "Утилизируемые столбцы представлений не обновляются."
 
-#: rewrite/rewriteHandler.c:2594
+#: rewrite/rewriteHandler.c:2606
 msgid ""
 "View columns that are not columns of their base relation are not updatable."
 msgstr ""
 "Столбцы представлений, не являющиеся столбцами базовых отношений, не "
 "обновляются."
 
-#: rewrite/rewriteHandler.c:2597
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that refer to system columns are not updatable."
 msgstr ""
 "Столбцы представлений, ссылающиеся на системные столбцы, не обновляются."
 
-#: rewrite/rewriteHandler.c:2600
+#: rewrite/rewriteHandler.c:2612
 msgid "View columns that return whole-row references are not updatable."
 msgstr ""
 "Столбцы представлений, возвращающие ссылки на всю строку, не обновляются."
 
-#: rewrite/rewriteHandler.c:2661
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Представления с DISTINCT не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2664
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Представления с GROUP BY не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2667
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Представления с HAVING не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2670
+#: rewrite/rewriteHandler.c:2682
 msgid ""
 "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr ""
 "Представления с UNION, INTERSECT или EXCEPT не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2673
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Представления с WITH не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2676
+#: rewrite/rewriteHandler.c:2688
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Представления с LIMIT или OFFSET не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2688
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr ""
 "Представления, возвращающие агрегатные функции, не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2691
+#: rewrite/rewriteHandler.c:2703
 msgid "Views that return window functions are not automatically updatable."
 msgstr ""
 "Представления, возвращающие оконные функции, не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2694
+#: rewrite/rewriteHandler.c:2706
 msgid ""
 "Views that return set-returning functions are not automatically updatable."
 msgstr ""
 "Представления, возвращающие функции с результатом-множеством, не обновляются "
 "автоматически."
 
-#: rewrite/rewriteHandler.c:2701 rewrite/rewriteHandler.c:2705
-#: rewrite/rewriteHandler.c:2713
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717
+#: rewrite/rewriteHandler.c:2725
 msgid ""
 "Views that do not select from a single table or view are not automatically "
 "updatable."
@@ -24719,22 +25777,22 @@ msgstr ""
 "Представления, выбирающие данные не из одной таблицы или представления, не "
 "обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2716
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Представления, содержащие TABLESAMPLE, не обновляются автоматически."
 
-#: rewrite/rewriteHandler.c:2740
+#: rewrite/rewriteHandler.c:2752
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr ""
 "Представления, не содержащие обновляемых столбцов, не обновляются "
 "автоматически."
 
-#: rewrite/rewriteHandler.c:3121 rewrite/rewriteHandler.c:3156
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "вставить данные в представление \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:3124
+#: rewrite/rewriteHandler.c:3136
 #, c-format
 msgid ""
 "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or "
@@ -24743,12 +25801,12 @@ msgstr ""
 "Чтобы представление допускало добавление данных, установите триггер INSTEAD "
 "OF INSERT или безусловное правило ON INSERT DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3129 rewrite/rewriteHandler.c:3165
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "изменить данные в представлении \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:3132
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid ""
 "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an "
@@ -24757,12 +25815,12 @@ msgstr ""
 "Чтобы представление допускало изменение данных, установите триггер INSTEAD "
 "OF UPDATE или безусловное правило ON UPDATE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3137 rewrite/rewriteHandler.c:3174
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "удалить данные из представления \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:3140
+#: rewrite/rewriteHandler.c:3152
 #, c-format
 msgid ""
 "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an "
@@ -24771,7 +25829,7 @@ msgstr ""
 "Чтобы представление допускало удаление данных, установите триггер INSTEAD OF "
 "DELETE или безусловное правило ON DELETE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3159
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid ""
 "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT "
@@ -24780,7 +25838,7 @@ msgstr ""
 "Чтобы представление допускало добавление данных посредством MERGE, создайте "
 "триггер INSTEAD OF INSERT."
 
-#: rewrite/rewriteHandler.c:3168
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid ""
 "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE "
@@ -24789,7 +25847,7 @@ msgstr ""
 "Чтобы представление допускало изменение данных посредством MERGE, создайте "
 "триггер INSTEAD OF UPDATE."
 
-#: rewrite/rewriteHandler.c:3177
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid ""
 "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE "
@@ -24798,27 +25856,27 @@ msgstr ""
 "Чтобы представление допускало удаление данных посредством MERGE, создайте "
 "триггер INSTEAD OF DELETE."
 
-#: rewrite/rewriteHandler.c:3352
+#: rewrite/rewriteHandler.c:3364
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "вставить данные в столбец \"%s\" представления \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:3360
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "изменить данные в столбце \"%s\" представления \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:3368
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "столбец \"%s\" представления \"%s\" не допускает объединение данных"
 
-#: rewrite/rewriteHandler.c:3396
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "представление \"%s\" не допускает объединение данных"
 
-#: rewrite/rewriteHandler.c:3398
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid ""
 "MERGE is not supported for views with INSTEAD OF triggers for some actions "
@@ -24827,7 +25885,7 @@ msgstr ""
 "MERGE не поддерживается для представлений, имеющих триггеры INSTEAD OF для "
 "некоторых, но не всех действий."
 
-#: rewrite/rewriteHandler.c:3399
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid ""
 "To enable merging into the view, either provide a full set of INSTEAD OF "
@@ -24836,7 +25894,7 @@ msgstr ""
 "Чтобы представление допускало объединение данных, или предоставьте полный "
 "набор триггеров INSTEAD OF, или удалите существующие триггеры INSTEAD OF."
 
-#: rewrite/rewriteHandler.c:3912
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid ""
 "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in "
@@ -24845,7 +25903,7 @@ msgstr ""
 "правила DO INSTEAD NOTIFY не поддерживаются в операторах, изменяющих данные, "
 "в WITH"
 
-#: rewrite/rewriteHandler.c:3923
+#: rewrite/rewriteHandler.c:3953
 #, c-format
 msgid ""
 "DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
@@ -24854,7 +25912,7 @@ msgstr ""
 "правила DO INSTEAD NOTHING не поддерживаются в операторах, изменяющих "
 "данные, в WITH"
 
-#: rewrite/rewriteHandler.c:3937
+#: rewrite/rewriteHandler.c:3967
 #, c-format
 msgid ""
 "conditional DO INSTEAD rules are not supported for data-modifying statements "
@@ -24863,13 +25921,13 @@ msgstr ""
 "условные правила DO INSTEAD не поддерживаются для операторов, изменяющих "
 "данные, в WITH"
 
-#: rewrite/rewriteHandler.c:3941
+#: rewrite/rewriteHandler.c:3971
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr ""
 "правила DO ALSO не поддерживаются для операторов, изменяющих данные, в WITH"
 
-#: rewrite/rewriteHandler.c:3946
+#: rewrite/rewriteHandler.c:3976
 #, c-format
 msgid ""
 "multi-statement DO INSTEAD rules are not supported for data-modifying "
@@ -24878,50 +25936,50 @@ msgstr ""
 "составные правила DO INSTEAD не поддерживаются для операторов, изменяющих "
 "данные, в WITH"
 
-#: rewrite/rewriteHandler.c:4206
+#: rewrite/rewriteHandler.c:4237
 msgid ""
 "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr ""
 "Представления в сочетании с правилами DO INSTEAD с условиями не обновляются "
 "автоматически."
 
-#: rewrite/rewriteHandler.c:4303
+#: rewrite/rewriteHandler.c:4335
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "выполнить INSERT RETURNING для отношения \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:4305
+#: rewrite/rewriteHandler.c:4337
 #, c-format
 msgid ""
 "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Необходимо безусловное правило ON INSERT DO INSTEAD с предложением RETURNING."
 
-#: rewrite/rewriteHandler.c:4310
+#: rewrite/rewriteHandler.c:4342
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "выполнить UPDATE RETURNING для отношения \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:4312
+#: rewrite/rewriteHandler.c:4344
 #, c-format
 msgid ""
 "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Необходимо безусловное правило ON UPDATE DO INSTEAD с предложением RETURNING."
 
-#: rewrite/rewriteHandler.c:4317
+#: rewrite/rewriteHandler.c:4349
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "выполнить DELETE RETURNING для отношения \"%s\" нельзя"
 
-#: rewrite/rewriteHandler.c:4319
+#: rewrite/rewriteHandler.c:4351
 #, c-format
 msgid ""
 "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Необходимо безусловное правило ON DELETE DO INSTEAD с предложением RETURNING."
 
-#: rewrite/rewriteHandler.c:4337
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid ""
 "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or "
@@ -24930,7 +25988,7 @@ msgstr ""
 "INSERT c предложением ON CONFLICT нельзя использовать с таблицей, для "
 "которой заданы правила INSERT или UPDATE"
 
-#: rewrite/rewriteHandler.c:4394
+#: rewrite/rewriteHandler.c:4426
 #, c-format
 msgid ""
 "WITH cannot be used in a query that is rewritten by rules into multiple "
@@ -24939,17 +25997,17 @@ msgstr ""
 "WITH нельзя использовать в запросе, преобразованном правилами в несколько "
 "запросов"
 
-#: rewrite/rewriteManip.c:1084
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "условные служебные операторы не реализованы"
 
-#: rewrite/rewriteManip.c:1431
+#: rewrite/rewriteManip.c:1520
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "условие WHERE CURRENT OF для представлений не реализовано"
 
-#: rewrite/rewriteManip.c:1767
+#: rewrite/rewriteManip.c:1923
 #, c-format
 msgid ""
 "NEW variables in ON UPDATE rules cannot reference columns that are part of a "
@@ -24967,33 +26025,90 @@ msgstr ""
 "с предложением SEARCH или CYCLE рекурсивная ссылка на запрос WITH \"%s\" "
 "должна находиться на верхнем уровне правого SELECT"
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr "стеммер Snowball для языка \"%s\" и кодировки \"%s\" не найден"
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "повторяющийся параметр StopWords"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "повторяющийся параметр Language"
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "нераспознанный параметр Snowball: \"%s\""
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "отсутствует параметр Language"
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937
+#: statistics/relation_stats.c:98
+#, c-format
+msgid "Statistics cannot be modified during recovery."
+msgstr "Статистика не может меняться в режиме восстановления."
+
+#: statistics/attribute_stats.c:205
+#, c-format
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "указать \"%s\"\" и \"%s\" одновременно нельзя"
+
+#: statistics/attribute_stats.c:231
+#, c-format
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "необходимо указать \"%s\" или \"%s\""
+
+#: statistics/attribute_stats.c:239
+#, c-format
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "изменить статистику для системного столбца \"%s\" нельзя"
+
+#: statistics/attribute_stats.c:303
+#, c-format
+msgid "could not determine element type of column \"%s\""
+msgstr "не удалось определить тип элемента для столбца \"%s\""
+
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321
+#: statistics/attribute_stats.c:336
+#, c-format
+msgid "Cannot set %s or %s."
+msgstr "Задать %s или %s нельзя."
+
+#: statistics/attribute_stats.c:320
+#, c-format
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "не удалось определить оператор «меньше» для столбца \"%s\""
+
+#: statistics/attribute_stats.c:335
+#, c-format
+msgid "column \"%s\" is not a range type"
+msgstr "столбец \"%s\" не диапазонного типа"
+
+#: statistics/attribute_stats.c:738
+#, c-format
+msgid "\"%s\" array must not contain null values"
+msgstr "массив \"%s\" не должен содержать значения NULL"
+
+#: statistics/attribute_stats.c:781
+#, c-format
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "превышен предел числа слотов статистики: %d"
+
+#: statistics/attribute_stats.c:949
+#, c-format
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "очистить статистику для системного столбца \"%s\" нельзя"
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid ""
 "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
@@ -25007,27 +26122,136 @@ msgid ""
 msgstr ""
 "функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:117
 #, c-format
-msgid "cannot access temporary tables of other sessions"
-msgstr "обращаться к временным таблицам других сеансов нельзя"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "аргумент \"%s\" не должен быть меньше -1.0"
+
+#: statistics/stat_utils.c:47
+#, c-format
+msgid "argument \"%s\" must not be null"
+msgstr "аргумент \"%s\" не должен быть NULL"
+
+#: statistics/stat_utils.c:74
+#, c-format
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "аргумент \"%s\" не должен быть многомерным массивом"
+
+#: statistics/stat_utils.c:83
+#, c-format
+msgid "argument \"%s\" array must not contain null values"
+msgstr "массив в аргументе \"%s\" не должен содержать значения NULL"
+
+#: statistics/stat_utils.c:114
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr ""
+"аргумент \"%s\" должен присутствовать, если присутствует аргумент \"%s\""
+
+#: statistics/stat_utils.c:177
+#, c-format
+msgid "index \"%s\" was concurrently dropped"
+msgstr "индекс \"%s\" был параллельно удалён другим процессом"
+
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "индекс \"%s\" был параллельно создан другим процессом"
 
-#: storage/buffer/bufmgr.c:1532
+#: statistics/stat_utils.c:212
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
-msgstr "неверная страница в блоке %u отношения %s; страница обнуляется"
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "изменить статистику для отношения \"%s\" нельзя"
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: statistics/stat_utils.c:220
+#, c-format
+msgid "cannot modify statistics for shared relation"
+msgstr "изменить статистику для разделяемой таблицы нельзя"
+
+#: statistics/stat_utils.c:260
+#, c-format
+msgid "unrecognized argument name: \"%s\""
+msgstr "нераспознанное имя аргумента: \"%s\""
+
+#: statistics/stat_utils.c:274
+#, c-format
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "аргумент \"%s\" имеет тип %s, ожидался тип %s"
+
+#: statistics/stat_utils.c:315
+#, c-format
+msgid "variadic arguments must be name/value pairs"
+msgstr "переменными аргументами должны быть пары ключ/значение"
+
+#: statistics/stat_utils.c:316
+#, c-format
+msgid ""
+"Provide an even number of variadic arguments that can be divided into pairs."
+msgstr ""
+"Передайте чётное количество переменных аргументов, чтобы их можно было "
+"разделить на пары."
+
+#: statistics/stat_utils.c:330
+#, c-format
+msgid "name at variadic position %d is null"
+msgstr "в позиции %d списка аргументов обнаружено имя null"
+
+#: statistics/stat_utils.c:334
+#, c-format
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "имя в позиции %d имеет тип %s, но ожидался тип %s"
+
+#: storage/aio/aio.c:1343
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "Допускается только значение -1 или большее 0."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
+msgstr ""
+"Проверьте, не отключена ли функциональность io_uring посредством /proc/sys/"
+"kernel/io_uring_disabled."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "Возможно, стоит увеличить параметр \"ulimit -n\" как минимум до %d."
+
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
+msgstr "Ядро не поддерживает io_uring."
+
+#: storage/aio/method_io_uring.c:388
+#, c-format
+msgid "could not setup io_uring queue: %m"
+msgstr "не удалось настроить очередь io_uring: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "завершение ввода/вывода за процесс %d"
+
+#: storage/aio/method_worker.c:382
+#, c-format
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "обработчик ввода/вывода, выполняющий ввод/вывод за процесс %d"
+
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
+#, c-format
+msgid "cannot access temporary tables of other sessions"
+msgstr "обращаться к временным таблицам других сеансов нельзя"
+
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "не удалось увеличить отношение \"%s\" до блока %u"
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "неожиданные данные после EOF в блоке %u отношения %s"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "неожиданные данные после EOF в блоке %u отношения \"%s\""
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid ""
 "This has been seen to occur with buggy kernels; consider updating your "
@@ -25036,32 +26260,113 @@ msgstr ""
 "Эта ситуация может возникать из-за ошибок в ядре; возможно, вам следует "
 "обновить ОС."
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "не удалось запись блок %u файла %s"
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Множественные сбои - возможно, постоянная ошибка записи."
 
-#: storage/buffer/bufmgr.c:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "запись блока %u отношения %s"
+msgid "writing block %u of relation \"%s\""
+msgstr "запись блока %u отношения \"%s\""
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/bufmgr.c:7317
+#, c-format
+msgid ""
+"zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u "
+"of relation \"%s\""
+msgstr ""
+"обнуление %u страниц без реакции на ошибки контрольных сумм (%u) в блоках "
+"%u..%u отношения \"%s\""
+
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
+#, c-format
+msgid "Block %u held the first zeroed page."
+msgstr "Первую обнулённую страницу содержал блок %u."
+
+#: storage/buffer/bufmgr.c:7322
+#, c-format
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] ""
+"Подробные сведения о ещё %d некорректном блоке можно найти в протоколе "
+"сервера."
+msgstr[1] ""
+"Подробные сведения о ещё %d некорректных блоках можно найти в протоколе "
+"сервера."
+msgstr[2] ""
+"Подробные сведения о ещё %d некорректных блоках найти в протоколе сервера."
+
+#: storage/buffer/bufmgr.c:7339
+#, c-format
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u некорректных страниц в блоках %u..%u отношения \"%s\""
+
+#: storage/buffer/bufmgr.c:7340
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr "Первую некорректную страницу содержал блок %u."
+
+#: storage/buffer/bufmgr.c:7341
+#, c-format
+msgid "See server log for the other %u invalid block(s)."
+msgstr ""
+"Сведения об остальных %u некорректных блоках можно найти в протоколе сервера."
+
+#: storage/buffer/bufmgr.c:7346
+#, c-format
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr "некорректная страница в блоке %u отношения \"%s\"; страница обнуляется"
+
+#: storage/buffer/bufmgr.c:7347
+#, c-format
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "обнуление %u некорректных страниц в блоках %u..%u отношения \"%s\""
+
+#: storage/buffer/bufmgr.c:7349
+#, c-format
+msgid "See server log for the other %u zeroed block(s)."
+msgstr ""
+"Сведения об остальных %u обнулённых блоках можно найти в протоколе сервера."
+
+#: storage/buffer/bufmgr.c:7354
+#, c-format
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "ошибка контрольной суммы в блоке %u отношения \"%s\" игнорируется"
+
+#: storage/buffer/bufmgr.c:7355
+#, c-format
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr ""
+"%u ошибок контрольных сумм в блоках %u..%u отношения \"%s\" игнорируются"
+
+#: storage/buffer/bufmgr.c:7356
+#, c-format
+msgid "Block %u held the first ignored page."
+msgstr "Первую игнорируемую некорректную страницу содержал блок %u."
+
+#: storage/buffer/bufmgr.c:7357
+#, c-format
+msgid "See server log for the other %u ignored block(s)."
+msgstr ""
+"Сведения об остальных %u игнорируемых блоках можно найти в протоколе сервера."
+
+#: storage/buffer/localbuf.c:272
 #, c-format
 msgid "no empty local buffer available"
 msgstr "нет пустого локального буфера"
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/localbuf.c:736
 #, c-format
 msgid "cannot access temporary tables during a parallel operation"
 msgstr "обращаться к временным таблицам во время параллельных операций нельзя"
 
-#: storage/buffer/localbuf.c:712
+#: storage/buffer/localbuf.c:876
 #, c-format
 msgid ""
 "\"temp_buffers\" cannot be changed after any temporary tables have been "
@@ -25087,7 +26392,7 @@ msgstr ""
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "не удалось прочитать временный файл (прочитано байт: %zu из %zu)"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid ""
 "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
@@ -25095,16 +26400,21 @@ msgstr ""
 "не удалось определить размер временного файла \"%s\", входящего в BufFile "
 "\"%s\": %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "ошибка удаления набора файлов \"%s\": %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1194
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "не удалось обрезать файл \"%s\": %m"
 
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, c-format
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "не удалось клонировать файл \"%s\" в \"%s\": %m"
+
 #: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
 #, c-format
 msgid "could not flush dirty data: %m"
@@ -25125,85 +26435,87 @@ msgstr "ошибка в munmap() при сбросе данных на диск:
 msgid "getrlimit failed: %m"
 msgstr "ошибка в getrlimit(): %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1074
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "недостаточно дескрипторов файлов для запуска серверного процесса"
 
-#: storage/file/fd.c:1074
+#: storage/file/fd.c:1075
 #, c-format
-msgid "System allows %d, server needs at least %d."
-msgstr "Система может выделить: %d, серверу требуется минимум: %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
+msgstr ""
+"Система может выделить: %d, серверу требуется минимум: %d, уже открыто "
+"файлов: %d."
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1164 storage/file/fd.c:2679 storage/file/fd.c:2788
+#: storage/file/fd.c:2942
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "нехватка дескрипторов файлов: %m; освободите их и повторите попытку"
 
-#: storage/file/fd.c:1536
+#: storage/file/fd.c:1540
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "временный файл: путь \"%s\", размер %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1679
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "не удалось создать временный каталог \"%s\": %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1686
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "не удалось создать временный подкаталог \"%s\": %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1883
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "не удалось создать временный файл \"%s\": %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1919
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "не удалось открыть временный файл \"%s\": %m"
 
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1960
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "ошибка удаления временного файла \"%s\": %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2050
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "ошибка удаления файла \"%s\": %m"
 
-#: storage/file/fd.c:2234
+#: storage/file/fd.c:2289
 #, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
-msgstr "размер временного файла превышает предел temp_file_limit (%d КБ)"
+msgid "temporary file size exceeds \"temp_file_limit\" (%dkB)"
+msgstr "размер временного файла превышает предел \"temp_file_limit\" (%d КБ)"
 
-#: storage/file/fd.c:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2655 storage/file/fd.c:2714
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "превышен предел maxAllocatedDescs (%d) при попытке открыть файл \"%s\""
 
-#: storage/file/fd.c:2698
+#: storage/file/fd.c:2759
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr ""
 "превышен предел maxAllocatedDescs (%d) при попытке выполнить команду \"%s\""
 
-#: storage/file/fd.c:2854
+#: storage/file/fd.c:2918
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr ""
 "превышен предел maxAllocatedDescs (%d) при попытке открыть каталог \"%s\""
 
-#: storage/file/fd.c:3384
+#: storage/file/fd.c:3449
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "в каталоге временных файлов обнаружен неуместный файл: \"%s\""
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3567
 #, c-format
 msgid ""
 "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
@@ -25211,7 +26523,7 @@ msgstr ""
 "синхронизация каталога данных (syncfs), прошло времени: %ld.%02d с, текущий "
 "путь: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3794
 #, c-format
 msgid ""
 "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: "
@@ -25220,7 +26532,7 @@ msgstr ""
 "синхронизация каталога данных (подготовка к fsync), прошло времени: %ld.%02d "
 "с, текущий путь: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3826
 #, c-format
 msgid ""
 "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
@@ -25228,36 +26540,31 @@ msgstr ""
 "синхронизация каталога данных (fsync), прошло времени: %ld.%02d с, текущий "
 "путь: %s"
 
-#: storage/file/fd.c:3950
+#: storage/file/fd.c:4015
 #, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr "Параметр \"debug_io_direct\" не поддерживается в этой ОС."
+msgid "\"%s\" is not supported on this platform."
+msgstr "\"%s\" не поддерживается на этой платформе."
 
-#: storage/file/fd.c:3964
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
 #, c-format
-msgid "Invalid list syntax in parameter \"%s\""
+msgid "Invalid list syntax in parameter \"%s\"."
 msgstr "Неверный формат списка в параметре \"%s\"."
 
-#: storage/file/fd.c:3984
+#: storage/file/fd.c:4050 tcop/backend_startup.c:1054
 #, c-format
-msgid "Invalid option \"%s\""
+msgid "Invalid option \"%s\"."
 msgstr "Неверный параметр \"%s\"."
 
-#: storage/file/fd.c:3997
+#: storage/file/fd.c:4063
 #, c-format
-msgid ""
-"\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
-msgstr ""
-"режим \"debug_io_direct\" не поддерживается для WAL из-за слишком маленького "
-"размера XLOG_BLCKSZ"
+msgid "\"%s\" is not supported for WAL because %s is too small."
+msgstr "\"%s\" не поддерживается для WAL из-за слишком маленького значения %s."
 
-#: storage/file/fd.c:4004
+#: storage/file/fd.c:4071
 #, c-format
-msgid ""
-"\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
+msgid "\"%s\" is not supported for data because %s is too small."
 msgstr ""
-"режим \"debug_io_direct\" не поддерживается для данных из-за слишком "
-"маленького размера BLCKSZ"
+"\"%s\" не поддерживается для данных из-за слишком маленького значения %s."
 
 #: storage/file/reinit.c:145
 #, c-format
@@ -25353,46 +26660,47 @@ msgstr "не удалось закрыть сегмент разделяемой
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "не удалось продублировать указатель для \"%s\": %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "имя DSM-сегмента не может быть пустым"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "имя DSM-сегмента слишком длинное"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "размер DSM-сегмента должен быть ненулевым"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr ""
 "запрошенный размер сегмента DSM не совпадает с размером существующего "
 "сегмента"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:357
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "извините, уже слишком много клиентов"
 
-#: storage/ipc/procarray.c:3857
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "база \"%s\" используется подготовленными транзакциями"
 
-#: storage/ipc/procarray.c:3893 storage/ipc/procarray.c:3901
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "нет прав для завершения процесса"
 
-#: storage/ipc/procarray.c:3894 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid ""
 "Only roles with the %s attribute may terminate processes of roles with the "
@@ -25401,7 +26709,7 @@ msgstr ""
 "Только роли с атрибутом %s могут завершать процессы, принадлежащие ролям с "
 "атрибутом %s."
 
-#: storage/ipc/procarray.c:3902 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid ""
 "Only roles with privileges of the role whose process is being terminated or "
@@ -25410,13 +26718,28 @@ msgstr ""
 "Только роли с правами роли, которой принадлежит процесс, или с правами роли "
 "\"%s\" могут завершить этот процесс."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr ""
 "продолжается ожидание получения сигнала ProcSignalBarrier обслуживающим "
 "процессом с PID %d"
 
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "неправильный запрос отмены с PID 0"
+
+#: storage/ipc/procsignal.c:788
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "неправильный ключ в запросе на отмену процесса %d"
+
+#: storage/ipc/procsignal.c:797
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "процесс с кодом %d, полученным в запросе на отмену, не найден"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -25428,12 +26751,12 @@ msgstr ""
 msgid "invalid message size %zu in shared memory queue"
 msgstr "неверный размер сообщения %zu в очереди в разделяемой памяти"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:984
-#: storage/lmgr/lock.c:1022 storage/lmgr/lock.c:2835 storage/lmgr/lock.c:4220
-#: storage/lmgr/lock.c:4285 storage/lmgr/lock.c:4635
-#: storage/lmgr/predicate.c:2468 storage/lmgr/predicate.c:2483
-#: storage/lmgr/predicate.c:3880 storage/lmgr/predicate.c:4927
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "нехватка разделяемой памяти"
@@ -25470,23 +26793,24 @@ msgstr ""
 msgid "requested shared memory size overflows size_t"
 msgstr "запрошенный размер разделяемой памяти не умещается в size_t"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d не относится к обслуживающему процессу PostgreSQL"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1453
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "отправить сигнал процессу %d не удалось: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "нет прав для отмены запроса"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid ""
 "Only roles with the %s attribute may cancel queries of roles with the %s "
@@ -25494,7 +26818,15 @@ msgid ""
 msgstr ""
 "Только роли с атрибутом %s могут отменять запросы ролей с атрибутом %s."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid ""
+"Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr ""
+"Отменять рабочие процессы автоочистки могут только роли с правами роли "
+"\"%s\"."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid ""
 "Only roles with privileges of the role whose query is being canceled or with "
@@ -25503,241 +26835,251 @@ msgstr ""
 "Только роли с правами роли, которая выполняет запрос, или с правами роли "
 "\"%s\" могут отменить этот запрос."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr ""
 "не удалось проверить существование обслуживающего процесса с PID %d: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "обслуживающий процесс с PID %d не завершился за %lld мс"
-msgstr[1] "обслуживающий процесс с PID %d не завершился за %lld мс"
-msgstr[2] "обслуживающий процесс с PID %d не завершился за %lld мс"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural ""
+"backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "обслуживающий процесс с PID %d не завершился за %<PRId64> мс"
+msgstr[1] "обслуживающий процесс с PID %d не завершился за %<PRId64> мс"
+msgstr[2] "обслуживающий процесс с PID %d не завершился за %<PRId64> мс"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "\"timeout\" не может быть отрицательным"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid ""
+"Only roles with privileges of the \"%s\" role may terminate autovacuum "
+"workers."
+msgstr ""
+"Завершать рабочие процессы автоочистки могут только роли с правами роли "
+"\"%s\"."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "прокрутка невозможна, так как протоколирование отключено"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "процесс восстановления продолжает ожидание после %ld.%03d мс: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "процесс восстановления завершил ожидание после %ld.%03d мс: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3196
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr ""
 "выполнение оператора отменено из-за конфликта с процессом восстановления"
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:2557
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr ""
 "Транзакция пользователя привела к взаимоблокировке с процессом "
 "восстановления."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "причина неизвестна"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "конфликт восстановления при закреплении буфера"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "конфликт восстановления при получении блокировки"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "конфликт восстановления при обращении к табличному пространству"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "конфликт восстановления при получении снимка"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "конфликт восстановления со слотом репликации"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "конфликт восстановления из-за взаимной блокировки буфера"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "конфликт восстановления при обращении к базе данных"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr ""
 "в записи pg_largeobject для OID %u, стр. %d неверный размер поля данных (%d)"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "неверные флаги для открытия большого объекта: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "нет доступа к большому объекту %u"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "неверное значение ориентира: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "неверный размер записи большого объекта: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr ""
 "Процесс %d ожидает в режиме %s блокировку \"%s\"; заблокирован процессом %d."
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "Процесс %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "обнаружена взаимоблокировка"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "Подробности запроса смотрите в протоколе сервера."
 
-#: storage/lmgr/lmgr.c:848
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "при изменении кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:851
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "при удалении кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:854
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "при блокировке кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:857
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "при блокировке изменённой версии (%u,%u) кортежа в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:860
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "при добавлении кортежа индекса (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:863
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "при проверке уникальности кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:866
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "при перепроверке изменённого кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:869
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr ""
 "при проверке ограничения-исключения для кортежа (%u,%u) в отношении \"%s\""
 
-#: storage/lmgr/lmgr.c:1239
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "отношение %u базы данных %u"
 
-#: storage/lmgr/lmgr.c:1245
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "расширение отношения %u базы данных %u"
 
-#: storage/lmgr/lmgr.c:1251
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid базы %u"
 
-#: storage/lmgr/lmgr.c:1256
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "страница %u отношения %u базы данных %u"
 
-#: storage/lmgr/lmgr.c:1263
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "кортеж (%u,%u) отношения %u базы данных %u"
 
-#: storage/lmgr/lmgr.c:1271
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "транзакция %u"
 
-#: storage/lmgr/lmgr.c:1276
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "виртуальная транзакция %d/%u"
 
-#: storage/lmgr/lmgr.c:1282
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "спекулятивный маркер %u транзакции %u"
 
-#: storage/lmgr/lmgr.c:1288
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "объект %u класса %u базы данных %u"
 
-#: storage/lmgr/lmgr.c:1296
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "пользовательская блокировка [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1303
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "рекомендательная блокировка [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1311
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "удалённая транзакция %u подписки %u в базе данных %u"
 
-#: storage/lmgr/lmgr.c:1318
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "нераспознанный тип блокировки %d"
 
-#: storage/lmgr/lock.c:812
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid ""
 "cannot acquire lock mode %s on database objects while recovery is in progress"
@@ -25745,7 +27087,7 @@ msgstr ""
 "пока выполняется восстановление, нельзя получить блокировку объектов базы "
 "данных в режиме %s"
 
-#: storage/lmgr/lock.c:814
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid ""
 "Only RowExclusiveLock or less can be acquired on database objects during "
@@ -25754,7 +27096,12 @@ msgstr ""
 "В процессе восстановления для объектов базы данных может быть получена "
 "только блокировка RowExclusiveLock или менее сильная."
 
-#: storage/lmgr/lock.c:3284 storage/lmgr/lock.c:3352 storage/lmgr/lock.c:3468
+#: storage/lmgr/lock.c:1185
+#, c-format
+msgid "process %d could not obtain %s on %s"
+msgstr "процесс %d не может получить %s для %s"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid ""
 "cannot PREPARE while holding both session-level and transaction-level locks "
@@ -25786,13 +27133,13 @@ msgstr ""
 "в пуле недостаточно элементов для записи о потенциальном конфликте чтения/"
 "записи"
 
-#: storage/lmgr/predicate.c:1686
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr ""
 "Параметр \"default_transaction_isolation\" имеет значение \"serializable\"."
 
-#: storage/lmgr/predicate.c:1687
+#: storage/lmgr/predicate.c:1697
 #, c-format
 msgid ""
 "You can use \"SET default_transaction_isolation = 'repeatable read'\" to "
@@ -25801,27 +27148,27 @@ msgstr ""
 "Чтобы изменить режим по умолчанию, выполните \"SET "
 "default_transaction_isolation = 'repeatable read'\"."
 
-#: storage/lmgr/predicate.c:1738
+#: storage/lmgr/predicate.c:1748
 #, c-format
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "транзакция, импортирующая снимок, не должна быть READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1817 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "не удалось импортировать запрошенный снимок"
 
-#: storage/lmgr/predicate.c:1818 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "Исходный процесс с PID %d уже не работает."
 
-#: storage/lmgr/predicate.c:3991 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4060 storage/lmgr/predicate.c:4068
-#: storage/lmgr/predicate.c:4107 storage/lmgr/predicate.c:4337
-#: storage/lmgr/predicate.c:4656 storage/lmgr/predicate.c:4668
-#: storage/lmgr/predicate.c:4715 storage/lmgr/predicate.c:4751
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, c-format
 msgid ""
 "could not serialize access due to read/write dependencies among transactions"
@@ -25829,16 +27176,16 @@ msgstr ""
 "не удалось сериализовать доступ из-за зависимостей чтения/записи между "
 "транзакциями"
 
-#: storage/lmgr/predicate.c:3993 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4062 storage/lmgr/predicate.c:4070
-#: storage/lmgr/predicate.c:4109 storage/lmgr/predicate.c:4339
-#: storage/lmgr/predicate.c:4658 storage/lmgr/predicate.c:4670
-#: storage/lmgr/predicate.c:4717 storage/lmgr/predicate.c:4753
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "Транзакция может завершиться успешно при следующей попытке."
 
-#: storage/lmgr/proc.c:353
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid ""
 "number of requested standby connections exceeds "
@@ -25847,7 +27194,7 @@ msgstr ""
 "число запрошенных подключений резервных серверов превышает "
 "\"max_wal_senders\" (сейчас: %d)"
 
-#: storage/lmgr/proc.c:1546
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid ""
 "process %d avoided deadlock for %s on %s by rearranging queue order after "
@@ -25856,7 +27203,7 @@ msgstr ""
 "процесс %d избежал взаимоблокировки, ожидая в режиме %s блокировку \"%s\", "
 "изменив порядок очереди через %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1561
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid ""
 "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
@@ -25864,103 +27211,108 @@ msgstr ""
 "процесс %d обнаружил взаимоблокировку, ожидая в режиме %s блокировку \"%s\" "
 "в течение %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1570
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr ""
 "процесс %d продолжает ожидать в режиме %s блокировку \"%s\" в течение %ld."
 "%03d мс"
 
-#: storage/lmgr/proc.c:1577
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "процесс %d получил в режиме %s блокировку \"%s\" через %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1594
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr ""
 "процесс %d не смог получить в режиме %s блокировку \"%s\" за %ld.%03d мс"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr ""
 "ошибка проверки страницы: получена контрольная сумма %u, а ожидалась - %u"
 
-#: storage/page/bufpage.c:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 "испорченные указатели страницы: нижний = %u, верхний = %u, спецобласть = %u"
 
-#: storage/page/bufpage.c:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "испорченный линейный указатель: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "испорченный размер элемента (общий размер: %u, доступно: %u)"
 
-#: storage/page/bufpage.c:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "испорченный линейный указатель: смещение = %u, размер = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "не удалось увеличить файл \"%s\" до блока %u"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "не удалось увеличить файл \"%s\": %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "не удалось увеличить файл \"%s\" (записано байт: %d из %d) в блоке %u"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "не удалось увеличить файл \"%s\" посредством FileFallocate(): %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "не удалось прочитать блоки %u..%u в файле \"%s\": %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr ""
 "не удалось прочитать блоки %u..%u в файле \"%s\" (прочитано байт: %zu из %zu)"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1034
+#, c-format
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "не удалось начать чтение блоков %u..%u в файле \"%s\": %m"
+
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "не удалось записать блоки %u..%u в файл \"%s\": %m"
 
-#: storage/smgr/md.c:1165
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr ""
 "не удалось обрезать файл \"%s\" (требуемая длина в блоках: %u, но сейчас он "
 "содержит %u)"
 
-#: storage/smgr/md.c:1220
+#: storage/smgr/md.c:1358
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "не удалось обрезать файл \"%s\" до нужного числа блоков (%u): %m"
 
-#: storage/smgr/md.c:1700
+#: storage/smgr/md.c:1846
 #, c-format
 msgid ""
 "could not open file \"%s\" (target block %u): previous segment is only %u "
@@ -25969,109 +27321,138 @@ msgstr ""
 "не удалось открыть файл file \"%s\" (целевой блок %u): недостаточно блоков в "
 "предыдущем сегменте (всего %u)"
 
-#: storage/smgr/md.c:1714
+#: storage/smgr/md.c:1860
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "не удалось открыть файл file \"%s\" (целевой блок %u): %m"
 
-#: tcop/backend_startup.c:85
+#: storage/smgr/smgr.c:1115
+#, c-format
+msgid "file \"%s\""
+msgstr "файл \"%s\""
+
+#: storage/smgr/smgr.c:1117
+#, c-format
+msgid "block %u in file \"%s\""
+msgstr "блок %u в файле \"%s\""
+
+#: storage/smgr/smgr.c:1121
+#, c-format
+msgid "blocks %u..%u in file \"%s\""
+msgstr "блоки %u..%u в файле \"%s\""
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "не удалось загрузить конфигурацию SSL в дочерний процесс"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "принято подключение: узел=%s порт=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "принято подключение: узел=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "система баз данных запускается"
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "система БД не принимает подключения"
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "Режим горячего резерва отключён."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "система БД ещё не принимает подключения"
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "Согласованное состояние восстановления ещё не достигнуто."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr "Снимок восстановления ещё не готов для запуска горячего резерва."
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "система БД не принимает подключения"
+msgid ""
+"To enable hot standby, close write transactions with more than %d "
+"subtransactions on the primary server."
+msgstr ""
+"Чтобы включить горячий резерв, закройте на главном сервере пишущие "
+"транзакции с более чем %d подтранзакциями."
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "Режим горячего резерва отключён."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "Согласованное состояние восстановления ещё не достигнуто."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "система баз данных останавливается"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "система баз данных в режиме восстановления"
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid ""
 "received direct SSL connection request without ALPN protocol negotiation "
 "extension"
 msgstr "получен запрос прямого SSL-соединения, но в нём нет расширения ALPN"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
 msgstr "запрос прямого SSL-соединения принят"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
 msgstr "запрос прямого SSL-соединения отвергнут"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "неполный стартовый пакет"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "неверная длина стартового пакета"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
 msgstr "SSLRequest принят"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
 msgstr "SSLRequest отвергнут"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "не удалось отправить ответ в процессе SSL-согласования: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "после запроса SSL получены незашифрованные данные"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid ""
 "This could be either a client-software bug or evidence of an attempted man-"
@@ -26080,138 +27461,156 @@ msgstr ""
 "Это может свидетельствовать об ошибке в клиентском ПО или о попытке атаки "
 "MITM."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
 msgstr "GSSENCRequest принят"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
 msgstr "GSSENCRequest отвергнут"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "не удалось отправить ответ в процессе согласования GSSAPI: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "после запроса шифрования GSSAPI получены незашифрованные данные"
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 "неподдерживаемый протокол клиентского приложения %u.%u; сервер поддерживает "
 "%u.0 - %u.%u"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Допустимые значения: \"false\", 0, \"true\", 1, \"database\"."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
 "неверная структура стартового пакета: последним байтом должен быть терминатор"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "в стартовом пакете не указано имя пользователя PostgreSQL"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, c-format
+msgid "invalid length of cancel request packet"
+msgstr "неверная длина пакета отмены запроса"
+
+#: tcop/backend_startup.c:892
+#, c-format
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "неверная длина ключа отмены в пакете отмены запроса"
+
+#: tcop/backend_startup.c:1022
+#, c-format
+msgid ""
+"Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr ""
+"Параметр log_connections \"%s\" нельзя задавать в списке с другими "
+"параметрами."
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "функция с OID %u не существует"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "вызвать функцию \"%s\" через интерфейс fastpath нельзя"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "вызов функции (через fastpath): \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1369 tcop/postgres.c:1605
-#: tcop/postgres.c:2071 tcop/postgres.c:2333
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599
+#: tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "продолжительность: %s мс"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr ""
 "продолжительность %s мс, вызов функции (через fastpath): \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:353
+#: tcop/fastpath.c:352
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr ""
 "сообщение вызова функции содержит неверное число аргументов (%d, а требуется "
 "%d)"
 
-#: tcop/fastpath.c:361
+#: tcop/fastpath.c:360
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr ""
 "сообщение вызова функции содержит неверное число форматов (%d, а аргументов "
 "%d)"
 
-#: tcop/fastpath.c:385
+#: tcop/fastpath.c:384
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "неверный размер аргумента (%d) в сообщении вызова функции"
 
-#: tcop/fastpath.c:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "неправильный формат двоичных данных в аргументе функции %d"
 
-#: tcop/postgres.c:467 tcop/postgres.c:5012
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "неправильный тип клиентского сообщения %d"
 
-#: tcop/postgres.c:1076
+#: tcop/postgres.c:1070
 #, c-format
 msgid "statement: %s"
 msgstr "оператор: %s"
 
-#: tcop/postgres.c:1374
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "продолжительность: %s мс, оператор: %s"
 
-#: tcop/postgres.c:1480
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "в подготовленный оператор нельзя вставить несколько команд"
 
-#: tcop/postgres.c:1610
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "продолжительность: %s мс, разбор %s: %s"
 
 # [SM]: TO REVIEW
-#: tcop/postgres.c:1677 tcop/postgres.c:2653
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "безымянный подготовленный оператор не существует"
 
-#: tcop/postgres.c:1729
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr ""
 "неверное число форматов параметров в сообщении Bind (%d, а параметров %d)"
 
-#: tcop/postgres.c:1735
+#: tcop/postgres.c:1729
 #, c-format
 msgid ""
 "bind message supplies %d parameters, but prepared statement \"%s\" requires "
@@ -26220,120 +27619,120 @@ msgstr ""
 "в сообщении Bind передано неверное число параметров (%d, а подготовленный "
 "оператор \"%s\" требует %d)"
 
-#: tcop/postgres.c:1949
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "неверный формат двоичных данных в параметре Bind %d"
 
-#: tcop/postgres.c:2076
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "продолжительность: %s мс, сообщение Bind %s%s%s: %s"
 
-#: tcop/postgres.c:2131 tcop/postgres.c:2735
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "портал \"%s\" не существует"
 
-#: tcop/postgres.c:2213
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2215 tcop/postgres.c:2341
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "выборка из"
 
-#: tcop/postgres.c:2216 tcop/postgres.c:2342
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "выполнение"
 
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "продолжительность: %s мс  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2486
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "подготовка: %s"
 
-#: tcop/postgres.c:2511
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "Параметры: %s"
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "Причина прерывания: конфликт при восстановлении"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "Пользователь удерживал фиксатор разделяемого буфера слишком долго."
 
-#: tcop/postgres.c:2545
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "Пользователь удерживал блокировку таблицы слишком долго."
 
-#: tcop/postgres.c:2548
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr ""
 "Пользователь использовал табличное пространство, которое должно быть удалено."
 
-#: tcop/postgres.c:2551
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr ""
 "Запросу пользователя нужно было видеть версии строк, которые должны быть "
 "удалены."
 
-#: tcop/postgres.c:2554
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr ""
 "Пользователь использовал слот логической репликации, который должен быть "
 "аннулирован."
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "Пользователь был подключён к базе данных, которая должна быть удалена."
 
-#: tcop/postgres.c:2599
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "портал \"%s\", параметр $%d = %s"
 
-#: tcop/postgres.c:2602
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "портал \"%s\", параметр $%d"
 
-#: tcop/postgres.c:2608
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "неименованный портал, параметр $%d = %s"
 
-#: tcop/postgres.c:2611
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "неименованный портал, параметр $%d"
 
-#: tcop/postgres.c:2955
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "закрытие подключения из-за неожиданного сигнала SIGQUIT"
 
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "закрытие подключения из-за краха другого серверного процесса"
 
-#: tcop/postgres.c:2962
+#: tcop/postgres.c:2989
 #, c-format
 msgid ""
 "The postmaster has commanded this server process to roll back the current "
@@ -26344,7 +27743,7 @@ msgstr ""
 "транзакцию и завершиться, так как другой серверный процесс завершился "
 "аварийно и, возможно, разрушил разделяемую память."
 
-#: tcop/postgres.c:2966 tcop/postgres.c:3219
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid ""
 "In a moment you should be able to reconnect to the database and repeat your "
@@ -26353,18 +27752,18 @@ msgstr ""
 "Вы сможете переподключиться к базе данных и повторить вашу команду сию "
 "минуту."
 
-#: tcop/postgres.c:2973
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr ""
 "закрытие подключения вследствие получения команды для немедленного отключения"
 
-#: tcop/postgres.c:3051
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "исключение в операции с плавающей точкой"
 
-#: tcop/postgres.c:3052
+#: tcop/postgres.c:3079
 #, c-format
 msgid ""
 "An invalid floating-point operation was signaled. This probably means an out-"
@@ -26374,114 +27773,90 @@ msgstr ""
 "оказался вне допустимых рамок или произошла ошибка вычисления, например, "
 "деление на ноль."
 
-#: tcop/postgres.c:3217
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "закрытие подключения из-за конфликта с процессом восстановления"
 
-#: tcop/postgres.c:3289
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "отмена проверки подлинности из-за тайм-аута"
 
-#: tcop/postgres.c:3293
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "прекращение процесса автоочистки по команде администратора"
 
-#: tcop/postgres.c:3297
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "завершение обработчика логической репликации по команде администратора"
 
-#: tcop/postgres.c:3317
+#: tcop/postgres.c:3339
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "завершение процесса считывания журнала по команде администратора"
+
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "закрытие подключения по команде администратора"
 
-#: tcop/postgres.c:3348
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "подключение к клиенту потеряно"
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "выполнение оператора отменено из-за тайм-аута блокировки"
 
-#: tcop/postgres.c:3407
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "выполнение оператора отменено из-за тайм-аута"
 
-#: tcop/postgres.c:3414
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "отмена задачи автоочистки"
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "выполнение оператора отменено по запросу пользователя"
 
-#: tcop/postgres.c:3448
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "закрытие подключения из-за тайм-аута простоя в транзакции"
 
-#: tcop/postgres.c:3461
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "закрытие подключения из-за тайм-аута транзакции"
 
-#: tcop/postgres.c:3474
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "закрытие подключения из-за тайм-аута простоя сеанса"
 
-#: tcop/postgres.c:3564
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "превышен предел глубины стека"
-
-#: tcop/postgres.c:3565
-#, c-format
-msgid ""
-"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
-"after ensuring the platform's stack depth limit is adequate."
-msgstr ""
-"Увеличьте параметр конфигурации \"max_stack_depth\" (текущее значение %d "
-"КБ), предварительно убедившись, что ОС предоставляет достаточный размер "
-"стека."
-
-#: tcop/postgres.c:3612
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "Значение \"max_stack_depth\" не должно превышать %ld КБ."
-
-#: tcop/postgres.c:3614
-#, c-format
-msgid ""
-"Increase the platform's stack depth limit via \"ulimit -s\" or local "
-"equivalent."
-msgstr ""
-"Увеличьте предел глубины стека в системе с помощью команды \"ulimit -s\" или "
-"эквивалента в вашей ОС."
-
-#: tcop/postgres.c:3637
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr ""
 "Значение \"client_connection_check_interval\" должно равняться 0 на этой "
 "платформе."
 
-#: tcop/postgres.c:3658
+#: tcop/postgres.c:3569
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr ""
 "Этот параметр нельзя включить, когда \"log_statement_stats\" равен true."
 
-#: tcop/postgres.c:3673
+#: tcop/postgres.c:3584
 #, c-format
 msgid ""
 "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
@@ -26491,49 +27866,62 @@ msgstr ""
 "\"log_parser_stats\", \"log_planner_stats\" или \"log_executor_stats\" равны "
 "true."
 
-#: tcop/postgres.c:4098
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "неверный аргумент командной строки для серверного процесса: %s"
 
-#: tcop/postgres.c:4099 tcop/postgres.c:4105
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: tcop/postgres.c:4103
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: неверный аргумент командной строки: %s"
 
-#: tcop/postgres.c:4156
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: не указаны ни база данных, ни пользователь"
 
-#: tcop/postgres.c:4909
+#: tcop/postgres.c:4275
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "не удалось сгенерировать случайный ключ отмены"
+
+#: tcop/postgres.c:4677
+#, c-format
+msgid ""
+"connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr ""
+"подключение готово: общее время подготовки=%.3f ms, создание процесса=%.3f "
+"ms, аутентификация=%.3f ms"
+
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "неверный подтип сообщения CLOSE: %d"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "неверный подтип сообщения DESCRIBE: %d"
 
-#: tcop/postgres.c:5033
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr ""
 "вызовы функций через fastpath не поддерживаются для реплицирующих соединений"
 
-#: tcop/postgres.c:5037
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr ""
 "протокол расширенных запросов не поддерживается для реплицирующих соединений"
 
-#: tcop/postgres.c:5217
+#: tcop/postgres.c:5189
 #, c-format
 msgid ""
 "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s "
@@ -26542,19 +27930,19 @@ msgstr ""
 "отключение: время сеанса: %d:%02d:%02d.%03d пользователь=%s база данных=%s "
 "компьютер=%s%s%s"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
 "число форматов результатов в сообщении Bind (%d) не равно числу столбцов в "
 "запросе (%d)"
 
-#: tcop/pquery.c:942 tcop/pquery.c:1696
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "курсор может сканировать только вперёд"
 
-#: tcop/pquery.c:943 tcop/pquery.c:1697
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Добавьте в его объявление SCROLL, чтобы он мог перемещаться назад."
@@ -26584,68 +27972,73 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "в рамках операции с ограничениями по безопасности нельзя выполнить %s"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "выполнять %s в фоновом процессе нельзя"
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "нет прав для выполнения команды %s"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "Выполнять эту команду могут только роли с правами роли \"%s\"."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS принимает только имена отношений в предложении FROM"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "повторяющийся параметр DictFile"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "повторяющийся параметр AffFile"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "нераспознанный параметр ispell: \"%s\""
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "отсутствует параметр AffFile"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "отсутствует параметр DictFile"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "повторяющийся параметр Accept"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "нераспознанный параметр словаря simple: \"%s\""
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "нераспознанный параметр функции синонимов: \"%s\""
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "отсутствует параметр Synonyms"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "не удалось открыть файл синонимов \"%s\": %m"
@@ -26724,55 +28117,55 @@ msgstr "нераспознанный параметр тезауруса: \"%s\"
 msgid "missing Dictionary parameter"
 msgstr "отсутствует параметр Dictionary"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:384 tsearch/spell.c:401 tsearch/spell.c:410
+#: tsearch/spell.c:1041
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "неверный флаг аффиксов \"%s\""
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:388 tsearch/spell.c:1045
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "флаг аффикса \"%s\" вне диапазона"
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:418
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "неверный символ во флаге аффикса \"%s\""
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:438
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "неверный флаг аффиксов \"%s\" со значением флага \"long\""
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:528
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "не удалось открыть файл словаря \"%s\": %m"
 
-#: tsearch/spell.c:749 utils/adt/regexp.c:223 jsonpath_gram.y:629
+#: tsearch/spell.c:752 utils/adt/regexp.c:223 jsonpath_gram.y:632
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "неверное регулярное выражение: %s"
 
-#: tsearch/spell.c:963 tsearch/spell.c:980 tsearch/spell.c:997
-#: tsearch/spell.c:1014 tsearch/spell.c:1079 gram.y:18735 gram.y:18752
+#: tsearch/spell.c:963 tsearch/spell.c:979 tsearch/spell.c:995
+#: tsearch/spell.c:1011 tsearch/spell.c:1076 gram.y:18905 gram.y:18922
 #, c-format
 msgid "syntax error"
 msgstr "ошибка синтаксиса"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1168 tsearch/spell.c:1180 tsearch/spell.c:1744
+#: tsearch/spell.c:1749 tsearch/spell.c:1754
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "неверное указание аффикса \"%s\""
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1221 tsearch/spell.c:1292 tsearch/spell.c:1441
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "не удалось открыть файл аффиксов \"%s\": %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1275
 #, c-format
 msgid ""
 "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag "
@@ -26781,36 +28174,31 @@ msgstr ""
 "словарь Ispell поддерживает для флага только значения \"default\", \"long\" "
 "и \"num\""
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1319
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "неверное количество векторов флагов"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1342
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "количество псевдонимов превышает заданное число %d"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1556
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "файл аффиксов содержит команды и в старом, и в новом стиле"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "строка слишком длинна для tsvector (%d Б, при максимуме %d)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:196
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "строка %d файла конфигурации \"%s\": \"%s\""
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "преобразовать wchar_t в кодировку сервера не удалось: %m"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -26823,12 +28211,12 @@ msgstr "слишком длинное слово для индексации"
 msgid "Words longer than %d characters are ignored."
 msgstr "Слова длиннее %d символов игнорируются."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "неверное имя файла конфигурации текстового поиска \"%s\""
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "не удалось открыть файл стоп-слов \"%s\": %m"
@@ -26838,63 +28226,133 @@ msgstr "не удалось открыть файл стоп-слов \"%s\": %m
 msgid "text search parser does not support headline creation"
 msgstr "анализатор текстового поиска не поддерживает создание выдержек"
 
-#: tsearch/wparser_def.c:2664
+#: tsearch/wparser_def.c:2665
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "нераспознанный параметр функции выдержки: \"%s\""
 
-#: tsearch/wparser_def.c:2674
+#: tsearch/wparser_def.c:2675
 #, c-format
 msgid "%s must be less than %s"
 msgstr "%s должно быть меньше %s"
 
-#: tsearch/wparser_def.c:2678
+#: tsearch/wparser_def.c:2679
 #, c-format
 msgid "%s must be positive"
 msgstr "%s должно быть больше нуля"
 
-#: tsearch/wparser_def.c:2682 tsearch/wparser_def.c:2686
+#: tsearch/wparser_def.c:2683 tsearch/wparser_def.c:2687
 #, c-format
 msgid "%s must be >= 0"
 msgstr "%s должно быть >= 0"
 
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "ошибка удаления постоянного файла статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1255
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "неверный вид статистики: \"%s\""
 
-#: utils/activity/pgstat.c:1335
+#: utils/activity/pgstat.c:1471
+#, c-format
+msgid "custom cumulative statistics name is invalid"
+msgstr ""
+"отсутствует подходящее имя для пользовательской накопительной статистики"
+
+#: utils/activity/pgstat.c:1472
+#, c-format
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "Задайте непустое имя для пользовательской накопительной статистики."
+
+#: utils/activity/pgstat.c:1475
+#, c-format
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr ""
+"идентификатор пользовательской накопительной статистики %u вне диапазона"
+
+#: utils/activity/pgstat.c:1476
+#, c-format
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr ""
+"Задайте идентификатор пользовательской накопительной статистики между %u и "
+"%u."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, c-format
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr ""
+"зарегистрировать пользовательскую накопительную статистику \"%s\" с ID %u не "
+"удалось"
+
+#: utils/activity/pgstat.c:1482
+#, c-format
+msgid ""
+"Custom cumulative statistics must be registered while initializing modules "
+"in \"shared_preload_libraries\"."
+msgstr ""
+"Пользовательская накопительная должна регистрироваться при инициализации "
+"модулей в \"shared_preload_libraries\"."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr "неверное свойство пользовательской накопительной статистики"
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid ""
+"Custom cumulative statistics require a shared memory size for fixed-numbered "
+"objects."
+msgstr ""
+"Для пользовательской накопительной статистики требуется определить размер "
+"обшей памяти для объектов с фиксированной нумерацией."
+
+#: utils/activity/pgstat.c:1509
+#, c-format
+msgid ""
+"Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr ""
+"Пользовательская накопительная статистика \"%s\" уже зарегистрирована с тем "
+"же идентификатором."
+
+#: utils/activity/pgstat.c:1522
+#, c-format
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr ""
+"Существующая накопительная статистика с идентификатором %u имеет то же имя."
+
+#: utils/activity/pgstat.c:1528
+#, c-format
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr ""
+"зарегистрирована пользовательская накопительная статистика \"%s\" с "
+"идентификатором %u"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "не удалось открыть временный файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1455
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "не удалось записать во временный файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1464
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "не удалось закрыть временный файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1472
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr ""
-"не удалось переименовать временный файл статистики из \"%s\" в \"%s\": %m"
-
-#: utils/activity/pgstat.c:1521
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "не удалось открыть файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1683
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "файл статистики \"%s\" испорчен"
@@ -26904,202 +28362,207 @@ msgstr "файл статистики \"%s\" испорчен"
 msgid "function call to dropped function"
 msgstr "вызвана функция, которая была удалена"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "Не удалось выделить память для объекта %u/%u/%<PRIu64>."
+
+#: utils/activity/pgstat_xact.c:366
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "сбрасывается существующая статистика вида %s, db=%u, oid=%u"
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "сбрасывается существующая статистика вида %s, db=%u, oid=%<PRIu64>"
 
-#: utils/activity/wait_event.c:207 utils/activity/wait_event.c:232
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
 msgid "wait event \"%s\" already exists in type \"%s\""
 msgstr "событие ожидания \"%s\" в типе \"%s\" уже существует"
 
-#: utils/activity/wait_event.c:246
+#: utils/activity/wait_event.c:245
 #, c-format
 msgid "too many custom wait events"
 msgstr "слишком много пользовательских событий ожидания"
 
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "слишком длинный идентификатор"
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "Идентификатор должен быть короче %d байт."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "нераспознанное ключевое слово: \"%s\""
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "Ключевым словом ACL должно быть \"group\" или \"user\"."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "отсутствует имя"
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "За ключевыми словами \"group\" или \"user\" должно следовать имя."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "отсутствует знак \"=\""
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "неверный символ режима: должен быть один из \"%s\""
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "за знаком \"/\" должно следовать имя"
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "назначившим права считается пользователь с ID %u"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "Массив ACL содержит неверный тип данных"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "Массивы ACL должны быть одномерными"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "Массивы ACL не должны содержать значения null"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "лишний мусор в конце спецификации ACL"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "привилегию назначения прав нельзя вернуть тому, кто назначил её вам"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert больше не поддерживается"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove больше не поддерживается"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "нераспознанный тип прав: \"%s\""
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "функция \"%s\" не существует"
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "нужны права для выполнения SET ROLE \"%s\""
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:118 utils/adt/array_userfuncs.c:565
+#: utils/adt/array_userfuncs.c:942 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, c-format
 msgid "could not determine input data type"
 msgstr "не удалось определить тип входных данных"
 
-#: utils/adt/array_userfuncs.c:107
+#: utils/adt/array_userfuncs.c:123
 #, c-format
 msgid "input data type is not an array"
 msgstr "тип входных данных не является массивом"
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
-#: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
-#: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
-#: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
-#: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
-#: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1917 utils/adt/numeric.c:4454
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:807 utils/adt/int.c:829
+#: utils/adt/int.c:843 utils/adt/int.c:857 utils/adt/int.c:888
+#: utils/adt/int.c:909 utils/adt/int.c:1026 utils/adt/int.c:1040
+#: utils/adt/int.c:1054 utils/adt/int.c:1087 utils/adt/int.c:1101
+#: utils/adt/int.c:1115 utils/adt/int.c:1146 utils/adt/int.c:1228
+#: utils/adt/int.c:1292 utils/adt/int.c:1360 utils/adt/int.c:1366
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1186
+#: utils/adt/varlena.c:3240 utils/adt/varlena.c:4174
 #, c-format
 msgid "integer out of range"
 msgstr "целое вне диапазона"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:174 utils/adt/array_userfuncs.c:259
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "аргумент должен быть одномерным массивом или пустым"
 
-#: utils/adt/array_userfuncs.c:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:410
+#: utils/adt/array_userfuncs.c:447 utils/adt/array_userfuncs.c:476
+#: utils/adt/array_userfuncs.c:504
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "соединять несовместимые массивы нельзя"
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:372
 #, c-format
 msgid ""
 "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Массивы с элементами типов %s и %s несовместимы для соединения."
 
-#: utils/adt/array_userfuncs.c:335
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Массивы с размерностями %d и %d несовместимы для соединения."
 
-#: utils/adt/array_userfuncs.c:372
+#: utils/adt/array_userfuncs.c:448
 #, c-format
 msgid ""
 "Arrays with differing element dimensions are not compatible for "
 "concatenation."
 msgstr "Массивы с разными размерностями элементов несовместимы для соединения."
 
-#: utils/adt/array_userfuncs.c:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:477 utils/adt/array_userfuncs.c:505
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Массивы с разными размерностями несовместимы для соединения."
 
-#: utils/adt/array_userfuncs.c:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5622
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059
+#: utils/adt/arrayfuncs.c:5634 utils/adt/arrayfuncs.c:5640
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "аккумулировать массивы различной размерности нельзя"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1348 utils/adt/array_userfuncs.c:1502
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "поиск элементов в многомерных массивах не поддерживается"
 
-#: utils/adt/array_userfuncs.c:1301
+#: utils/adt/array_userfuncs.c:1377
 #, c-format
 msgid "initial position must not be null"
 msgstr "начальная позиция не может быть NULL"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1750
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "размер выборки должен задаваться числом от 0 до %d"
@@ -27184,7 +28647,7 @@ msgstr "Неожиданный элемент массива."
 msgid "Specified array dimensions do not match array contents."
 msgstr "Указанные размерности массива не соответствуют его содержимому."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2598
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr ""
@@ -27197,14 +28660,14 @@ msgid "Incorrectly quoted array element."
 msgstr "Элемент массива заключён в кавычки некорректно."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "Неожиданный конец ввода."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3499
-#: utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6126
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "неверное число размерностей: %d"
@@ -27222,7 +28685,7 @@ msgstr ""
 "(%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3098
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "для типа %s нет функции ввода двоичных данных"
@@ -27233,7 +28696,7 @@ msgid "improper binary format in array element %d"
 msgstr "неподходящий двоичный формат в элементе массива %d"
 
 #: utils/adt/arrayfuncs.c:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3131
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "для типа %s нет функции вывода двоичных данных"
@@ -27245,11 +28708,11 @@ msgstr "разрезание массивов постоянной длины н
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6092
-#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6129
-#: utils/adt/json.c:1433 utils/adt/json.c:1505 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4710 utils/adt/jsonfuncs.c:4863
-#: utils/adt/jsonfuncs.c:4974 utils/adt/jsonfuncs.c:5022
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6112
+#: utils/adt/arrayfuncs.c:6138 utils/adt/arrayfuncs.c:6149
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "неверное число индексов массива"
@@ -27289,90 +28752,90 @@ msgstr ""
 msgid "source array too small"
 msgstr "исходный массив слишком мал"
 
-#: utils/adt/arrayfuncs.c:3657
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "элемент массива null недопустим в данном контексте"
 
-#: utils/adt/arrayfuncs.c:3828 utils/adt/arrayfuncs.c:3999
-#: utils/adt/arrayfuncs.c:4390
+#: utils/adt/arrayfuncs.c:3846 utils/adt/arrayfuncs.c:4017
+#: utils/adt/arrayfuncs.c:4408
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "нельзя сравнивать массивы с элементами разных типов"
 
-#: utils/adt/arrayfuncs.c:4177 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4195 utils/adt/multirangetypes.c:2806
+#: utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "не удалось найти функцию хеширования для типа %s"
 
-#: utils/adt/arrayfuncs.c:4305 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4323 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "не удалось найти функцию расширенного хеширования для типа %s"
 
-#: utils/adt/arrayfuncs.c:5506
+#: utils/adt/arrayfuncs.c:5524
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "тип данных %s не является типом массива"
 
-#: utils/adt/arrayfuncs.c:5561
+#: utils/adt/arrayfuncs.c:5579
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "аккумулировать NULL-массивы нельзя"
 
-#: utils/adt/arrayfuncs.c:5589
+#: utils/adt/arrayfuncs.c:5607
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "аккумулировать пустые массивы нельзя"
 
-#: utils/adt/arrayfuncs.c:5990 utils/adt/arrayfuncs.c:6030
+#: utils/adt/arrayfuncs.c:6010 utils/adt/arrayfuncs.c:6050
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "массив размерностей или массив нижних границ не может быть null"
 
-#: utils/adt/arrayfuncs.c:6093 utils/adt/arrayfuncs.c:6119
+#: utils/adt/arrayfuncs.c:6113 utils/adt/arrayfuncs.c:6139
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Массив размерностей должен быть одномерным."
 
-#: utils/adt/arrayfuncs.c:6098 utils/adt/arrayfuncs.c:6124
+#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "значения размерностей не могут быть null"
 
-#: utils/adt/arrayfuncs.c:6130
+#: utils/adt/arrayfuncs.c:6150
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "Массив нижних границ и массив размерностей имеют разные размеры."
 
-#: utils/adt/arrayfuncs.c:6411
+#: utils/adt/arrayfuncs.c:6431
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "удаление элементов из многомерных массивов не поддерживается"
 
-#: utils/adt/arrayfuncs.c:6688
+#: utils/adt/arrayfuncs.c:6708
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "границы должны задаваться одномерным массивом"
 
-#: utils/adt/arrayfuncs.c:6693
+#: utils/adt/arrayfuncs.c:6713
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "массив границ не должен содержать NULL"
 
-#: utils/adt/arrayfuncs.c:6926
+#: utils/adt/arrayfuncs.c:6946
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "число удаляемых элементов должно быть от 0 до %d"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "индекс элемента массива должен быть целочисленным"
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "индекс элемента массива в присваивании не может быть NULL"
@@ -27403,21 +28866,21 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "преобразование кодировки из %s в ASCII не поддерживается"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:354 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
-#: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
+#: utils/adt/geo_ops.c:4672 utils/adt/int.c:198 utils/adt/int.c:210
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:803 utils/adt/numeric.c:7221
-#: utils/adt/numeric.c:7424 utils/adt/numeric.c:8371 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:323
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "неверный синтаксис для типа %s: \"%s\""
@@ -27428,23 +28891,23 @@ msgstr "неверный синтаксис для типа %s: \"%s\""
 msgid "money out of range"
 msgstr "денежное значение вне диапазона"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:723 utils/adt/float.c:99
-#: utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039
-#: utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
+#: utils/adt/int.c:872 utils/adt/int.c:988 utils/adt/int.c:1068
+#: utils/adt/int.c:1130 utils/adt/int.c:1168 utils/adt/int.c:1196
 #: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
 #: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
-#: utils/adt/numeric.c:3191 utils/adt/numeric.c:3214 utils/adt/numeric.c:3299
-#: utils/adt/numeric.c:3317 utils/adt/numeric.c:3413 utils/adt/numeric.c:8920
-#: utils/adt/numeric.c:9233 utils/adt/numeric.c:9581 utils/adt/numeric.c:9697
-#: utils/adt/numeric.c:11208 utils/adt/timestamp.c:3713
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "деление на ноль"
 
 #: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
-#: utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/cash.c:367 utils/adt/int.c:204 utils/adt/numutils.c:350
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "значение \"%s\" вне диапазона для типа %s"
@@ -27459,187 +28922,188 @@ msgstr "значение \"char\" вне диапазона"
 msgid "could not compute %s hash: %s"
 msgstr "не удалось вычислить хеш %s: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "неверный модификатор типа"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "TIME(%d)%s: точность должна быть неотрицательной"
 
-#: utils/adt/date.c:82
+#: utils/adt/date.c:83
 #, c-format
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%s: точность уменьшена до дозволенного максимума: %d"
 
-#: utils/adt/date.c:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172
+#: utils/adt/formatting.c:4181 utils/adt/formatting.c:4286
+#: utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "дата вне диапазона: \"%s\""
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2553
 #, c-format
 msgid "date out of range"
 msgstr "дата вне диапазона"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "значение поля типа date вне диапазона: %d-%02d-%02d"
 
-#: utils/adt/date.c:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "дата вне диапазона: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "вычитать бесконечные даты нельзя"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "дата вне диапазона для типа timestamp"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "единица \"%s\" для типа %s не поддерживается"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "единица \"%s\" для типа %s не распознана"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2574
-#: utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4017 utils/adt/formatting.c:4053
+#: utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2575
+#: utils/adt/xml.c:2582 utils/adt/xml.c:2602 utils/adt/xml.c:2609
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp вне диапазона"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "время вне диапазона"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "значение поля типа time вне диапазона: %d:%02d:%02g"
 
-#: utils/adt/date.c:2020
+#: utils/adt/date.c:2085
 #, c-format
 msgid "cannot convert infinite interval to time"
 msgstr "бесконечный интервал нельзя привести к типу time"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
 #, c-format
 msgid "cannot add infinite interval to time"
 msgstr "бесконечный интервал нельзя добавить к значению time"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
 #, c-format
 msgid "cannot subtract infinite interval from time"
 msgstr "бесконечный интервал нельзя вычесть из значения time"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2595
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:664 utils/adt/int.c:711
+#: utils/adt/int.c:746 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "неверное смещение PRECEDING или FOLLOWING в оконной функции"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "смещение часового пояса вне диапазона"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
 msgstr "задающий часовой пояс интервал \"%s\" должен быть конечным"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr ""
 "интервал \"%s\", задающий часовой пояс, не должен содержать дней или месяцев"
 
-#: utils/adt/datetime.c:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "часовой пояс \"%s\" не распознан"
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "значение поля типа date/time вне диапазона: \"%s\""
 
-#: utils/adt/datetime.c:4110
+#: utils/adt/datetime.c:4232
 #, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Возможно, вам нужно изменить настройку \"datestyle\"."
+msgid "Perhaps you need a different \"DateStyle\" setting."
+msgstr "Возможно, вам нужно изменить настройку \"DateStyle\"."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "значение поля interval вне диапазона: \"%s\""
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "смещение часового пояса вне диапазона: \"%s\""
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid ""
 "This time zone name appears in the configuration file for time zone "
@@ -27653,17 +29117,22 @@ msgstr ""
 msgid "invalid Datum pointer"
 msgstr "неверный указатель Datum"
 
-#: utils/adt/dbsize.c:764 utils/adt/dbsize.c:840
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "табличное пространство с OID %u не существует"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "некорректная величина: \"%s\""
 
-#: utils/adt/dbsize.c:841
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "Неверная единица измерения величины: \"%s\"."
 
-#: utils/adt/dbsize.c:842
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid ""
 "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
@@ -27691,41 +29160,41 @@ msgstr "результат кодирования слишком объёмны
 msgid "result of decoding conversion is too large"
 msgstr "результат декодирования слишком объёмный"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "неверная шестнадцатеричная цифра: \"%.*s\""
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "неверные шестнадцатеричные данные: нечётное число цифр"
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "неожиданный знак \"=\" при декодировании base64"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "при декодировании base64 обнаружен неверный символ \"%.*s\""
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "неверная конечная последовательность base64"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr ""
 "Входные данные лишены выравнивания, обрезаны или повреждены иным образом."
 
-#: utils/adt/encode.c:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:659
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374 jsonpath_gram.y:266
-#: jsonpath_gram.y:598 jsonpath_scan.l:640 jsonpath_scan.l:651
-#: jsonpath_scan.l:661 jsonpath_scan.l:712
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:342 utils/adt/varlena.c:383 jsonpath_gram.y:268
+#: jsonpath_gram.y:600 jsonpath_scan.l:617 jsonpath_scan.l:628
+#: jsonpath_scan.l:638 jsonpath_scan.l:690
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "неверный синтаксис для типа %s"
@@ -27763,200 +29232,219 @@ msgstr "не удалось определить фактический тип 
 msgid "enum %s contains no values"
 msgstr "перечисление %s не содержит значений"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "значение вне диапазона: переполнение"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "значение вне диапазона: антипереполнение"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" вне диапазона для типа real"
 
-#: utils/adt/float.c:482
+#: utils/adt/float.c:489
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\" вне диапазона для типа double precision"
 
-#: utils/adt/float.c:1247 utils/adt/float.c:1321 utils/adt/int.c:355
-#: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
-#: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4593 utils/adt/numeric.c:4598
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:384
+#: utils/adt/int.c:922 utils/adt/int.c:944 utils/adt/int.c:958
+#: utils/adt/int.c:972 utils/adt/int.c:1004 utils/adt/int.c:1242
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4149
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint вне диапазона"
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3709 utils/adt/numeric.c:10112
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "извлечь квадратный корень отрицательного числа нельзя"
 
-#: utils/adt/float.c:1515 utils/adt/numeric.c:3997 utils/adt/numeric.c:4109
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "ноль в отрицательной степени даёт неопределённость"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:4001 utils/adt/numeric.c:11003
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "отрицательное число в дробной степени даёт комплексный результат"
 
-#: utils/adt/float.c:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3909
-#: utils/adt/numeric.c:10783
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "вычислить логарифм нуля нельзя"
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3847
-#: utils/adt/numeric.c:3904 utils/adt/numeric.c:10787
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "вычислить логарифм отрицательного числа нельзя"
 
-#: utils/adt/float.c:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "введённое значение вне диапазона"
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1857
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "счётчик должен быть больше нуля"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1868
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "операнд, нижняя и верхняя границы не могут быть NaN"
 
-#: utils/adt/float.c:4011 utils/adt/numeric.c:1873
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "нижняя и верхняя границы должны быть конечными"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1887
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "нижняя граница не может равняться верхней"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "неправильная спецификация формата для целого числа"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Интервалы не привязываются к определённым календарным датам."
 
-#: utils/adt/formatting.c:1161
+#: utils/adt/formatting.c:1197
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" может быть только последним шаблоном"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1205
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" должна стоять до \"PR\""
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1221
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" должен стоять до \"PR\""
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1248
 #, c-format
 msgid "multiple decimal points"
 msgstr "многочисленные десятичные точки"
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1252 utils/adt/formatting.c:1339
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "нельзя использовать \"V\" вместе с десятичной точкой"
 
-#: utils/adt/formatting.c:1228
+#: utils/adt/formatting.c:1264
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "нельзя использовать \"S\" дважды"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1268
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "нельзя использовать \"S\" вместе с \"PL\"/\"MI\"/\"SG\"/\"PR\""
 
-#: utils/adt/formatting.c:1252
+#: utils/adt/formatting.c:1288
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "нельзя использовать \"S\" вместе с \"MI\""
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1298
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "нельзя использовать \"S\" вместе с \"PL\""
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1308
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "нельзя использовать \"S\" вместе с \"SG\""
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1317
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "нельзя использовать \"PR\" вместе с \"S\"/\"PL\"/\"MI\"/\"SG\""
 
-#: utils/adt/formatting.c:1307
+#: utils/adt/formatting.c:1326
+#, c-format
+msgid "cannot use \"RN\" twice"
+msgstr "нельзя использовать \"RN\" дважды"
+
+#: utils/adt/formatting.c:1347
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "нельзя использовать \"EEEE\" дважды"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1353
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" несовместим с другими форматами"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1354
 #, c-format
 msgid ""
 "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr ""
 "\"EEEE\" может использоваться только с шаблонами цифр и десятичной точки."
 
-#: utils/adt/formatting.c:1398
+#: utils/adt/formatting.c:1363
+#, c-format
+msgid "\"RN\" is incompatible with other formats"
+msgstr "\"RN\" несовместим с другими форматами"
+
+#: utils/adt/formatting.c:1364
+#, c-format
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "\"RN\" может использоваться только вместе с \"FM\"."
+
+#: utils/adt/formatting.c:1445
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "неверный разделитель в формате datetime: \"%s\""
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1572
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" не является числом"
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "преобразовать регистр не удалось: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1653 utils/adt/formatting.c:1717
+#: utils/adt/formatting.c:1781 utils/adt/formatting.c:1845
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr ""
 "не удалось определить, какое правило сортировки использовать для функции %s"
 
-#: utils/adt/formatting.c:2410
+# well-spelled: категоризацию
+#: utils/adt/formatting.c:1853
+#, c-format
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr ""
+"сворачивание регистра Unicode можно выполнять, только если кодировка сервера "
+"— UTF8"
+
+#: utils/adt/formatting.c:2150
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "неверное сочетание стилей дат"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2151
 #, c-format
 msgid ""
 "Do not mix Gregorian and ISO week date conventions in a formatting template."
@@ -27964,27 +29452,27 @@ msgstr ""
 "Не смешивайте Григорианский стиль дат (недель) с ISO в одном шаблоне "
 "форматирования."
 
-#: utils/adt/formatting.c:2433
+#: utils/adt/formatting.c:2173
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "конфликтующие значения поля \"%s\" в строке форматирования"
 
-#: utils/adt/formatting.c:2435
+#: utils/adt/formatting.c:2175
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Это значение противоречит предыдущему значению поля того же типа."
 
-#: utils/adt/formatting.c:2502
+#: utils/adt/formatting.c:2242
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "входная строка короче, чем требует поле форматирования \"%s\""
 
-#: utils/adt/formatting.c:2504
+#: utils/adt/formatting.c:2244
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Требуется символов: %d, а осталось только %d."
 
-#: utils/adt/formatting.c:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2246 utils/adt/formatting.c:2260
 #, c-format
 msgid ""
 "If your source string is not fixed-width, try using the \"FM\" modifier."
@@ -27992,135 +29480,131 @@ msgstr ""
 "Если входная строка имеет переменную длину, попробуйте использовать "
 "модификатор \"FM\"."
 
-#: utils/adt/formatting.c:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269
+#: utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "неверное значение \"%s\" для \"%s\""
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2258
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Поле должно поглотить символов: %d, но удалось разобрать только %d."
 
-#: utils/adt/formatting.c:2531
+#: utils/adt/formatting.c:2271
 #, c-format
 msgid "Value must be an integer."
 msgstr "Значение должно быть целым числом."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "значение \"%s\" во входной строке вне диапазона"
 
-#: utils/adt/formatting.c:2538
+#: utils/adt/formatting.c:2278
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Значение должно быть в интервале %d..%d."
 
-#: utils/adt/formatting.c:2752
+#: utils/adt/formatting.c:2492
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr ""
 "Данное значение не соответствует ни одному из допустимых значений для этого "
 "поля."
 
-#: utils/adt/formatting.c:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2728
+#: utils/adt/formatting.c:2748 utils/adt/formatting.c:2768
+#: utils/adt/formatting.c:2787 utils/adt/formatting.c:2806
+#: utils/adt/formatting.c:2830 utils/adt/formatting.c:2848
+#: utils/adt/formatting.c:2866 utils/adt/formatting.c:2884
+#: utils/adt/formatting.c:2901 utils/adt/formatting.c:2918
 #, c-format
 msgid "localized string format value too long"
 msgstr "слишком длинное значение формата локализованной строки"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3198
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "нет соответствия для заданного в формате разделителя \"%c\""
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3259
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "нет соответствия для заданного в формате символа \"%s\""
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3392
 #, c-format
 msgid "Time zone abbreviation is not recognized."
 msgstr "Сокращённое название часового пояса не распознано."
 
-#: utils/adt/formatting.c:3853
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "ошибка синтаксиса в значении для шаблона \"Y,YYY\""
-
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "входная строка короче, чем требует формат datetime"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr ""
 "после разбора формата datetime во входной строке остались дополнительные "
 "символы"
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "во входной строке для типа timestamptz нет указания часового пояса"
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "значение timestamptz вне диапазона"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "в формате datetime указан часовой пояс, но отсутствует время"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "во входной строке для типа timetz нет указания часового пояса"
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "значение timetz вне диапазона"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "в формате datetime нет ни даты, ни времени"
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "час \"%d\" не соответствует 12-часовому формату времени"
 
-#: utils/adt/formatting.c:4788
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Используйте 24-часовой формат или передавайте часы от 1 до 12."
 
-#: utils/adt/formatting.c:4900
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "нельзя рассчитать день года без информации о годе"
 
-#: utils/adt/formatting.c:5852
+#: utils/adt/formatting.c:5836
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" не поддерживается при вводе"
 
-#: utils/adt/formatting.c:5864
+#: utils/adt/formatting.c:6113
 #, c-format
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\" не поддерживается при вводе"
+msgid "invalid Roman numeral"
+msgstr "неверное римское число"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -28132,9 +29616,9 @@ msgstr "абсолютный путь недопустим"
 msgid "path must be in or below the data directory"
 msgstr "путь должен указывать на каталог данных или вложенный в него"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:864
+#: utils/adt/oracle_compat.c:1167
 #, c-format
 msgid "requested length too large"
 msgstr "запрошенная длина слишком велика"
@@ -28149,11 +29633,6 @@ msgstr "не удалось переместиться в файле \"%s\": %m"
 msgid "file length too large"
 msgstr "длина файла слишком велика"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "табличное пространство с OID %u не существует"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -28200,13 +29679,18 @@ msgstr "круг с нулевым радиусом нельзя преобра
 msgid "must request at least 2 points"
 msgstr "точек должно быть минимум 2"
 
-#: utils/adt/int.c:264
+#: utils/adt/int.c:158
+#, c-format
+msgid "array is not a valid int2vector"
+msgstr "массив не подходит для типа int2vector"
+
+#: utils/adt/int.c:292
 #, c-format
 msgid "invalid int2vector data"
 msgstr "неверные данные int2vector"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1765
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1558 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "размер шага не может быть нулевым"
@@ -28220,9 +29704,9 @@ msgstr "размер шага не может быть нулевым"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4542
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4199
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint вне диапазона"
@@ -28232,50 +29716,50 @@ msgstr "bigint вне диапазона"
 msgid "OID out of range"
 msgstr "OID вне диапазона"
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr ""
 "значением ключа должен быть скаляр (не массив, композитный тип или json)"
 
-#: utils/adt/json.c:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "не удалось определить тип данных аргумента %d"
 
-#: utils/adt/json.c:1067 utils/adt/json.c:1266 utils/adt/json.c:1449
-#: utils/adt/json.c:1527 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "значение null не может быть ключом объекта"
 
-#: utils/adt/json.c:1117 utils/adt/json.c:1288
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "повторяющийся ключ в объекте JSON: %s"
 
-#: utils/adt/json.c:1226 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "в списке аргументов должно быть чётное число элементов"
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1228 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "Аргументы %s должны состоять из пар ключ-значение."
 
-#: utils/adt/json.c:1427 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "массив должен иметь два столбца"
 
-#: utils/adt/json.c:1516 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "неподходящие размерности массива"
 
-#: utils/adt/json.c:1702 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "повторяющиеся ключи в объекте JSON"
@@ -28342,23 +29826,23 @@ msgstr "привести объект jsonb к типу %s нельзя"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "привести массив или объект jsonb к типу %s нельзя"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "число пар объекта jsonb превышает предел (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "число элементов массива jsonb превышает предел (%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "общий размер элементов массива jsonb превышает предел (%d байт)"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "общий размер элементов объекта jsonb превышает предел (%d байт)"
@@ -28395,108 +29879,108 @@ msgstr "индекс элемента jsonb должен иметь тексто
 msgid "jsonb subscript in assignment must not be null"
 msgstr "индекс элемента jsonb в присваивании не может быть NULL"
 
-#: utils/adt/jsonfuncs.c:583 utils/adt/jsonfuncs.c:830
-#: utils/adt/jsonfuncs.c:2439 utils/adt/jsonfuncs.c:3015
-#: utils/adt/jsonfuncs.c:3948 utils/adt/jsonfuncs.c:4295
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "вызывать %s со скаляром нельзя"
 
-#: utils/adt/jsonfuncs.c:588 utils/adt/jsonfuncs.c:815
-#: utils/adt/jsonfuncs.c:3017 utils/adt/jsonfuncs.c:3935
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "вызывать %s с массивом нельзя"
 
-#: utils/adt/jsonfuncs.c:647 jsonpath_scan.l:607
+#: utils/adt/jsonfuncs.c:649 jsonpath_scan.l:584
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "неподдерживаемая спецпоследовательность Unicode"
 
-#: utils/adt/jsonfuncs.c:724
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "данные JSON, строка %d: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1883 utils/adt/jsonfuncs.c:1920
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "получить длину скаляра нельзя"
 
-#: utils/adt/jsonfuncs.c:1887 utils/adt/jsonfuncs.c:1906
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "получить длину массива для не массива нельзя"
 
-#: utils/adt/jsonfuncs.c:1986
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "вызывать %s с не объектом нельзя"
 
-#: utils/adt/jsonfuncs.c:2174
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "извлечь массив в виде объекта нельзя"
 
-#: utils/adt/jsonfuncs.c:2188
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "извлечь скаляр нельзя"
 
-#: utils/adt/jsonfuncs.c:2233
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "извлечь элементы из скаляра нельзя"
 
-#: utils/adt/jsonfuncs.c:2237
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "извлечь элементы из объекта нельзя"
 
-#: utils/adt/jsonfuncs.c:2424 utils/adt/jsonfuncs.c:4173
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "вызывать %s с не массивом нельзя"
 
-#: utils/adt/jsonfuncs.c:2515 utils/adt/jsonfuncs.c:2520
-#: utils/adt/jsonfuncs.c:2538 utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "ожидался массив JSON"
 
-#: utils/adt/jsonfuncs.c:2516
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "Проверьте значение ключа \"%s\"."
 
-#: utils/adt/jsonfuncs.c:2539
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "Проверьте элемент массива %s ключа \"%s\"."
 
-#: utils/adt/jsonfuncs.c:2545
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "Проверьте элемент массива %s."
 
-#: utils/adt/jsonfuncs.c:2597
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "неправильный массив JSON"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3647
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "первым аргументом %s должен быть кортеж"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3671
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "не удалось определить тип строки для результата %s"
 
-#: utils/adt/jsonfuncs.c:3673
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid ""
 "Provide a non-null record argument, or call the function in the FROM clause "
@@ -28505,38 +29989,38 @@ msgstr ""
 "Передайте отличный от NULL аргумент-запись или вызовите эту функцию в "
 "предложении FROM, используя список определений столбцов."
 
-#: utils/adt/jsonfuncs.c:4059 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "требуется режим материализации, но он недопустим в этом контексте"
 
-#: utils/adt/jsonfuncs.c:4190 utils/adt/jsonfuncs.c:4274
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "аргументом %s должен быть массив объектов"
 
-#: utils/adt/jsonfuncs.c:4223
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "вызывать %s с объектом нельзя"
 
-#: utils/adt/jsonfuncs.c:4656 utils/adt/jsonfuncs.c:4715
-#: utils/adt/jsonfuncs.c:4795
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "удаление из скаляра невозможно"
 
-#: utils/adt/jsonfuncs.c:4800
+#: utils/adt/jsonfuncs.c:4824
 #, c-format
 msgid "cannot delete from object using integer index"
 msgstr "удаление из объекта по числовому индексу невозможно"
 
-#: utils/adt/jsonfuncs.c:4868 utils/adt/jsonfuncs.c:5027
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "задать путь в скаляре нельзя"
 
-#: utils/adt/jsonfuncs.c:4909 utils/adt/jsonfuncs.c:4951
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid ""
 "null_value_treatment must be \"delete_key\", \"return_target\", "
@@ -28545,12 +30029,12 @@ msgstr ""
 "значением null_value_treatment должно быть \"delete_key\", "
 "\"return_target\", \"use_json_null\" или \"raise_exception\""
 
-#: utils/adt/jsonfuncs.c:4922
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "значение JSON не может быть NULL"
 
-#: utils/adt/jsonfuncs.c:4923
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid ""
 "Exception was raised because null_value_treatment is \"raise_exception\"."
@@ -28558,7 +30042,7 @@ msgstr ""
 "Выдано исключение, так как значением null_value_treatment является "
 "\"raise_exception\"."
 
-#: utils/adt/jsonfuncs.c:4924
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid ""
 "To avoid, either change the null_value_treatment argument or ensure that an "
@@ -28567,55 +30051,55 @@ msgstr ""
 "Чтобы исключения не было, либо измените аргумент null_value_treatment, либо "
 "не допускайте передачи SQL NULL."
 
-#: utils/adt/jsonfuncs.c:4979
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "удалить путь в скаляре нельзя"
 
-#: utils/adt/jsonfuncs.c:5193
+#: utils/adt/jsonfuncs.c:5217
 #, c-format
 msgid "path element at position %d is null"
 msgstr "элемент пути в позиции %d равен NULL"
 
-#: utils/adt/jsonfuncs.c:5212 utils/adt/jsonfuncs.c:5243
-#: utils/adt/jsonfuncs.c:5316
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "заменить существующий ключ нельзя"
 
-#: utils/adt/jsonfuncs.c:5213 utils/adt/jsonfuncs.c:5244
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr ""
 "Для заданного пути значение ключа должно быть составным объектом, но оно "
 "оказалось скаляром."
 
-#: utils/adt/jsonfuncs.c:5317
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "Попробуйте применить функцию jsonb_set для замены значения ключа."
 
-#: utils/adt/jsonfuncs.c:5421
+#: utils/adt/jsonfuncs.c:5445
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
 msgstr "элемент пути в позиции %d - не целочисленный: \"%s\""
 
-#: utils/adt/jsonfuncs.c:5438
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "элемент пути в позиции %d вне диапазона: %d"
 
-#: utils/adt/jsonfuncs.c:5590
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "неверный тип флага, допускаются только массивы и скаляры"
 
-#: utils/adt/jsonfuncs.c:5597
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "элемент массива флагов не является строкой"
 
-#: utils/adt/jsonfuncs.c:5598 utils/adt/jsonfuncs.c:5620
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid ""
 "Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and "
@@ -28623,7 +30107,7 @@ msgid ""
 msgstr ""
 "Допустимые значения: \"string\", \"numeric\", \"boolean\", \"key\" и \"all\"."
 
-#: utils/adt/jsonfuncs.c:5618
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "неверный флаг в массиве флагов: \"%s\""
@@ -28638,71 +30122,71 @@ msgstr "@ не допускается в корневых выражениях"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST принимается только в качестве индекса массива"
 
-#: utils/adt/jsonpath_exec.c:491
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "ожидался единственный булевский результат"
 
-#: utils/adt/jsonpath_exec.c:851
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr ""
 "выражение обращения по звёздочке в jsonpath может применяться только к "
 "массиву"
 
-#: utils/adt/jsonpath_exec.c:874
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr ""
 "выражение обращения по звёздочке в jsonpath может применяться только к "
 "объекту"
 
-#: utils/adt/jsonpath_exec.c:923
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "индекс массива в jsonpath вне диапазона"
 
-#: utils/adt/jsonpath_exec.c:980
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr ""
 "выражение обращения к массиву в jsonpath может применяться только к массиву"
 
-#: utils/adt/jsonpath_exec.c:1044
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "JSON-объект не содержит ключ \"%s\""
 
-#: utils/adt/jsonpath_exec.c:1056
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr ""
 "выражение обращения к члену в jsonpath может применяться только к объекту"
 
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:1114
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "метод .%s() в jsonpath может применяться только к массиву"
 
-#: utils/adt/jsonpath_exec.c:1167 utils/adt/jsonpath_exec.c:1193
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
 #, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type double "
-"precision"
-msgstr ""
-"аргумент \"%s\" метода элемента jsonpath .%s() некорректен для типа double "
-"precision"
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа %s"
 
-#: utils/adt/jsonpath_exec.c:1172 utils/adt/jsonpath_exec.c:1198
-#: utils/adt/jsonpath_exec.c:1414 utils/adt/jsonpath_exec.c:1446
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
+#: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
 msgstr "метод элемента jsonpath .%s() не принимает значения NaN и Infinity"
 
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:1211 utils/adt/jsonpath_exec.c:1313
-#: utils/adt/jsonpath_exec.c:1455 utils/adt/jsonpath_exec.c:1593
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a string or numeric value"
@@ -28710,22 +30194,8 @@ msgstr ""
 "метод .%s() в jsonpath может применяться только к строковому или числовому "
 "значению"
 
-#: utils/adt/jsonpath_exec.c:1281 utils/adt/jsonpath_exec.c:1305
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr ""
-"аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа bigint"
-
-#: utils/adt/jsonpath_exec.c:1357 utils/adt/jsonpath_exec.c:1377
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr ""
-"аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа boolean"
-
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:1386
+#: utils/adt/jsonpath_exec.c:1385
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a boolean, string, or "
@@ -28734,34 +30204,20 @@ msgstr ""
 "метод .%s() в jsonpath может применяться только к булевскому, строковому или "
 "числовому значению"
 
-#: utils/adt/jsonpath_exec.c:1439 utils/adt/jsonpath_exec.c:1528
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
-msgstr ""
-"аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа numeric"
-
-#: utils/adt/jsonpath_exec.c:1487
+#: utils/adt/jsonpath_exec.c:1486
 #, c-format
 msgid ""
 "precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "точность в аргументе метода jsonpath .%s() вне диапазона типа integer"
 
-#: utils/adt/jsonpath_exec.c:1501
+#: utils/adt/jsonpath_exec.c:1500
 #, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
 msgstr ""
 "масштаб в аргументе метода элемента jsonpath .%s() вне диапазона типа integer"
 
-#: utils/adt/jsonpath_exec.c:1561 utils/adt/jsonpath_exec.c:1585
-#, c-format
-msgid ""
-"argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr ""
-"аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа integer"
-
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:1648
+#: utils/adt/jsonpath_exec.c:1647
 #, c-format
 msgid ""
 "jsonpath item method .%s() can only be applied to a boolean, string, "
@@ -28770,84 +30226,84 @@ msgstr ""
 "метод .%s() в jsonpath может применяться только к булевскому, строковому, "
 "числовому значению или к дате/времени"
 
-#: utils/adt/jsonpath_exec.c:2137
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr ""
 "левый операнд оператора %s в jsonpath не является одним числовым значением"
 
-#: utils/adt/jsonpath_exec.c:2144
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr ""
 "правый операнд оператора %s в jsonpath не является одним числовым значением"
 
-#: utils/adt/jsonpath_exec.c:2212
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr ""
 "операнд унарного оператора %s в jsonpath не является числовым значением"
 
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:2311
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "метод .%s() в jsonpath может применяться только к числовому значению"
 
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:2357
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "метод .%s() в jsonpath может применяться только к строке"
 
-#: utils/adt/jsonpath_exec.c:2450
+#: utils/adt/jsonpath_exec.c:2449
 #, c-format
 msgid ""
 "time precision of jsonpath item method .%s() is out of range for type integer"
 msgstr ""
 "точность времени в аргументе метода jsonpath .%s() вне диапазона типа integer"
 
-#: utils/adt/jsonpath_exec.c:2484 utils/adt/jsonpath_exec.c:2490
-#: utils/adt/jsonpath_exec.c:2517 utils/adt/jsonpath_exec.c:2545
-#: utils/adt/jsonpath_exec.c:2598 utils/adt/jsonpath_exec.c:2649
-#: utils/adt/jsonpath_exec.c:2720
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
 #, c-format
 msgid "%s format is not recognized: \"%s\""
 msgstr "формат %s не распознан: \"%s\""
 
-#: utils/adt/jsonpath_exec.c:2486
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr ""
 "Воспользуйтесь аргументом datetime для указания формата входных данных."
 
-#: utils/adt/jsonpath_exec.c:2679 utils/adt/jsonpath_exec.c:2760
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
 #, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
 msgstr "точность времени в аргументе метода jsonpath .%s() некорректная"
 
 # skip-rule: space-before-period
-#: utils/adt/jsonpath_exec.c:2840
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "метод .%s() в jsonpath может применяться только к объекту"
 
-#: utils/adt/jsonpath_exec.c:3124
+#: utils/adt/jsonpath_exec.c:3123
 #, c-format
 msgid "could not convert value of type %s to jsonpath"
 msgstr "преобразовать значение типа %s в jsonpath не удалось"
 
-#: utils/adt/jsonpath_exec.c:3158
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "не удалось найти в jsonpath переменную \"%s\""
 
-#: utils/adt/jsonpath_exec.c:3211
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "аргумент \"vars\" не является объектом"
 
-#: utils/adt/jsonpath_exec.c:3212
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid ""
 "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
@@ -28855,27 +30311,27 @@ msgstr ""
 "Параметры jsonpath должны передаваться в виде пар ключ-значение в объекте "
 "\"vars\"."
 
-#: utils/adt/jsonpath_exec.c:3475
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "индекс элемента в jsonpath не является одним числовым значением"
 
-#: utils/adt/jsonpath_exec.c:3487
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "индекс массива в jsonpath вне целочисленного диапазона"
 
-#: utils/adt/jsonpath_exec.c:3671
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "значение %s нельзя преобразовать в %s без сведений о часовом поясе"
 
-#: utils/adt/jsonpath_exec.c:3673
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "Для передачи часового пояса используйте функцию *_tz()."
 
-#: utils/adt/jsonpath_exec.c:3981
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
 msgid ""
 "JSON path expression for column \"%s\" must return single item when no "
@@ -28884,14 +30340,14 @@ msgstr ""
 "выражение пути JSON для столбца \"%s\" в отсутствие обёртки должно "
 "возвращать одиночный элемент"
 
-#: utils/adt/jsonpath_exec.c:3983 utils/adt/jsonpath_exec.c:3988
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
 msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
 msgstr ""
 "Используйте предложение WITH WRAPPER, чтобы обернуть элементы SQL/JSON в "
 "массив."
 
-#: utils/adt/jsonpath_exec.c:3987
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
 msgid ""
 "JSON path expression in JSON_QUERY must return single item when no wrapper "
@@ -28900,61 +30356,62 @@ msgstr ""
 "выражение пути JSON в JSON_QUERY в отсутствие обёртки должно возвращать "
 "одиночный элемент"
 
-#: utils/adt/jsonpath_exec.c:4045 utils/adt/jsonpath_exec.c:4069
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
 msgid "JSON path expression for column \"%s\" must return single scalar item"
 msgstr ""
 "выражение пути JSON для столбца \"%s\" должно возвращать один скалярный "
 "элемент"
 
-#: utils/adt/jsonpath_exec.c:4050 utils/adt/jsonpath_exec.c:4074
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
 msgid "JSON path expression in JSON_VALUE must return single scalar item"
 msgstr ""
 "выражение пути JSON в JSON_VALUE должно возвращать один скалярный элемент"
 
 # well-spelled: симв
-#: utils/adt/levenshtein.c:132
+#: utils/adt/levenshtein.c:134
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "длина аргумента levenshtein() превышает максимум (%d симв.)"
 
-#: utils/adt/like.c:159
+#: utils/adt/like.c:162
 #, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "недетерминированные правила сортировки не поддерживаются для LIKE"
+msgid "could not determine which collation to use for LIKE"
+msgstr "не удалось определить, какой порядок сортировки использовать для LIKE"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "не удалось определить, какой порядок сортировки использовать для ILIKE"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "недетерминированные правила сортировки не поддерживаются для ILIKE"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "шаблон LIKE не должен заканчиваться защитным символом"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:804
 #, c-format
 msgid "invalid escape string"
 msgstr "неверный защитный символ"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:805
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "Защитный символ должен быть пустым или состоять из одного байта."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
 msgstr "регистронезависимое сравнение не поддерживается для типа bytea"
 
-#: utils/adt/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "сравнение с регулярными выражениями не поддерживается для типа bytea"
@@ -28979,7 +30436,7 @@ msgstr ""
 "Преобразование из macaddr8 в macaddr возможно только для адресов, содержащих "
 "FF и FE в 4-ом и 5-ом байтах слева, например xx:xx:xx:ff:fe:xx:xx:xx."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d не относится к серверному процессу PostgreSQL"
@@ -29076,12 +30533,12 @@ msgstr "Ожидалось начало диапазона."
 msgid "Expected comma or end of multirange."
 msgstr "Ожидалась запятая или конец мультидиапазона."
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "мультидиапазоны нельзя получить из массивов мультидиапазонов"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "мультидиапазоны не могут содержать элементы NULL"
@@ -29096,8 +30553,8 @@ msgstr "неверное значение cidr: \"%s\""
 msgid "Value has bits set to right of mask."
 msgstr "Значение содержит установленные биты правее маски."
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "не удалось отформатировать значение inet: %m"
@@ -29125,157 +30582,157 @@ msgstr "неверная длина во внешнем представлени
 msgid "invalid external \"cidr\" value"
 msgstr "неверное внешнее представление \"cidr\""
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "неверная длина маски: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "не удалось отформатировать значение cidr: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "объединять адреса разных семейств нельзя"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "нельзя использовать \"И\" (AND) для значений inet разного размера"
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "нельзя использовать \"ИЛИ\" (OR) для значений inet разного размера"
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "результат вне диапазона"
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "нельзя вычитать значения inet разного размера"
 
-#: utils/adt/numeric.c:793 utils/adt/numeric.c:3659 utils/adt/numeric.c:7216
-#: utils/adt/numeric.c:7419 utils/adt/numeric.c:7891 utils/adt/numeric.c:10586
-#: utils/adt/numeric.c:11061 utils/adt/numeric.c:11155
-#: utils/adt/numeric.c:11290
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "значение переполняет формат numeric"
 
-#: utils/adt/numeric.c:1106
+#: utils/adt/numeric.c:1108
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "неверный знак во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:1112
+#: utils/adt/numeric.c:1114
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "неверный порядок числа во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:1121
+#: utils/adt/numeric.c:1123
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "неверная цифра во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:1336 utils/adt/numeric.c:1350
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "точность NUMERIC %d должна быть между 1 и %d"
 
-#: utils/adt/numeric.c:1341
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "порядок NUMERIC %d должен быть между %d и %d"
 
-#: utils/adt/numeric.c:1359
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "неверный модификатор типа NUMERIC"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "начальное значение не может быть NaN"
 
-#: utils/adt/numeric.c:1729
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "начальное значение не может быть бесконечностью"
 
-#: utils/adt/numeric.c:1736
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "конечное значение не может быть NaN"
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "конечное значение не может быть бесконечностью"
 
-#: utils/adt/numeric.c:1753
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "размер шага не может быть NaN"
 
-#: utils/adt/numeric.c:1757
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "размер шага не может быть бесконечностью"
 
-#: utils/adt/numeric.c:3649
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "факториал отрицательного числа даёт неопределённость"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "нижняя граница не может быть NaN"
 
-#: utils/adt/numeric.c:4260
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "нижняя граница не может быть бесконечностью"
 
-#: utils/adt/numeric.c:4267
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "верхняя граница не может быть NaN"
 
-#: utils/adt/numeric.c:4271
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "верхняя граница не может быть бесконечностью"
 
-#: utils/adt/numeric.c:4432 utils/adt/numeric.c:4520 utils/adt/numeric.c:4580
-#: utils/adt/numeric.c:4776
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "нельзя преобразовать NaN в %s"
 
-#: utils/adt/numeric.c:4436 utils/adt/numeric.c:4524 utils/adt/numeric.c:4584
-#: utils/adt/numeric.c:4780
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "нельзя представить бесконечность в %s"
 
-#: utils/adt/numeric.c:4789
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn вне диапазона"
 
-#: utils/adt/numeric.c:7981 utils/adt/numeric.c:8032
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "переполнение поля numeric"
 
-#: utils/adt/numeric.c:7982
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid ""
 "A field with precision %d, scale %d must round to an absolute value less "
@@ -29284,44 +30741,49 @@ msgstr ""
 "Поле с точностью %d, порядком %d должно округляться до абсолютного значения "
 "меньше чем %s%d."
 
-#: utils/adt/numeric.c:8033
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr ""
 "Поле с точностью %d, порядком %d не может содержать значение бесконечности."
 
-#: utils/adt/numeric.c:11359 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
 msgstr "нижняя граница должна быть меньше или равна верхней"
 
-#: utils/adt/oid.c:217
+#: utils/adt/oid.c:131
+#, c-format
+msgid "array is not a valid oidvector"
+msgstr "массив не подходит для типа oidvector"
+
+#: utils/adt/oid.c:245
 #, c-format
 msgid "invalid oidvector data"
 msgstr "неверные данные oidvector"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:1001
 #, c-format
 msgid "requested character too large"
 msgstr "запрошенный символ больше допустимого"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1045
 #, c-format
 msgid "character number must be positive"
 msgstr "номер символа должен быть положительным"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1049
 #, c-format
 msgid "null character not permitted"
 msgstr "символ не может быть null"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1067 utils/adt/oracle_compat.c:1120
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "код запрошенного символа слишком велик для кодировки: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1108
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "запрошенный символ не подходит для кодировки: %u"
@@ -29332,55 +30794,22 @@ msgstr "запрошенный символ не подходит для код
 msgid "percentile value %g is not between 0 and 1"
 msgstr "значение перцентиля %g лежит не в диапазоне 0..1"
 
-#: utils/adt/pg_locale.c:326 utils/adt/pg_locale.c:358
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "имя локали \"%s\" содержит не-ASCII символы"
 
-#: utils/adt/pg_locale.c:1507
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr ""
-"не удалось открыть сортировщик для локали \"%s\" с правилами \"%s\": %s"
-
-#: utils/adt/pg_locale.c:1518 utils/adt/pg_locale.c:2992
-#: utils/adt/pg_locale.c:3065
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU не поддерживается в данной сборке"
-
-#: utils/adt/pg_locale.c:1546
-#, c-format
-msgid "could not create locale \"%s\": %m"
-msgstr "не удалось создать локаль \"%s\": %m"
-
-#: utils/adt/pg_locale.c:1549
-#, c-format
-msgid ""
-"The operating system could not find any locale data for the locale name "
-"\"%s\"."
-msgstr "Операционная система не может найти данные локали с именем \"%s\"."
-
-#: utils/adt/pg_locale.c:1670
-#, c-format
-msgid ""
-"collations with different collate and ctype values are not supported on this "
-"platform"
-msgstr ""
-"правила сортировки с разными значениями collate и ctype не поддерживаются на "
-"этой платформе"
-
-#: utils/adt/pg_locale.c:1717
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "для правила сортировки \"%s\", лишённого версии, была записана версия"
 
-#: utils/adt/pg_locale.c:1723
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "несовпадение версии для правила сортировки \"%s\""
 
-#: utils/adt/pg_locale.c:1725
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid ""
 "The collation in the database was created using version %s, but the "
@@ -29389,7 +30818,7 @@ msgstr ""
 "Правило сортировки в базе данных было создано с версией %s, но операционная "
 "система предоставляет версию %s."
 
-#: utils/adt/pg_locale.c:1728
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid ""
 "Rebuild all objects affected by this collation and run ALTER COLLATION %s "
@@ -29399,98 +30828,136 @@ msgstr ""
 "ALTER COLLATION %s REFRESH VERSION либо соберите PostgreSQL с правильной "
 "версией библиотеки."
 
-#: utils/adt/pg_locale.c:1772 utils/adt/pg_locale.c:2556
-#: utils/adt/pg_locale.c:2581
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "неверное имя локали \"%s\" для встроенного провайдера"
 
-#: utils/adt/pg_locale.c:1814
+#: utils/adt/pg_locale.c:1590
 #, c-format
-msgid "could not load locale \"%s\""
-msgstr "не удалось загрузить локаль \"%s\""
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "не удалось получить из названия локали \"%s\" метку языка: %s"
 
-#: utils/adt/pg_locale.c:1839
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU не поддерживается в данной сборке"
+
+#: utils/adt/pg_locale.c:1632
+#, c-format
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "не удалось определить язык для локали ICU \"%s\": %s"
+
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
+#, c-format
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
 msgstr ""
-"не удалось получить версию правила сортировки для локали \"%s\" (код ошибки: "
-"%lu)"
+"Чтобы отключить проверку локалей ICU, установите для параметра \"%s\" "
+"значение \"%s\"."
 
-#: utils/adt/pg_locale.c:1895 utils/adt/pg_locale.c:1908
+#: utils/adt/pg_locale.c:1662
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "не удалось преобразовать строку в UTF-16 (код ошибки: %lu)"
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "для локали ICU \"%s\" получен неизвестный язык \"%s\""
 
-#: utils/adt/pg_locale.c:1920
+#: utils/adt/pg_locale_icu.c:264
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "не удалось сравнить строки в Unicode: %m"
+msgid "could not get language from locale \"%s\": %s"
+msgstr "не удалось определить язык для локали \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
+#, c-format
+msgid "could not open collator for locale \"%s\": %s"
+msgstr "не удалось открыть сортировщик для локали \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2094
+#: utils/adt/pg_locale_icu.c:374
+#, c-format
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr ""
+"не удалось открыть сортировщик для локали \"%s\" с правилами \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
 msgid "collation failed: %s"
 msgstr "ошибка в библиотеке сортировки: %s"
 
-#: utils/adt/pg_locale.c:2313 utils/adt/pg_locale.c:2345
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "не удалось сгенерировать ключ сортировки: %s"
 
-#: utils/adt/pg_locale.c:2635
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653
+#: utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
-msgid "could not get language from locale \"%s\": %s"
-msgstr "не удалось определить язык для локали \"%s\": %s"
+msgid "%s failed: %s"
+msgstr "ошибка %s: %s"
 
-#: utils/adt/pg_locale.c:2656 utils/adt/pg_locale.c:2672
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
-msgid "could not open collator for locale \"%s\": %s"
-msgstr "не удалось открыть сортировщик для локали \"%s\": %s"
+msgid "case conversion failed: %s"
+msgstr "преобразовать регистр не удалось: %s"
 
-#: utils/adt/pg_locale.c:2697
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "ICU не поддерживает кодировку \"%s\""
 
-#: utils/adt/pg_locale.c:2704
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "не удалось открыть преобразователь ICU для кодировки \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2722 utils/adt/pg_locale.c:2741
-#: utils/adt/pg_locale.c:2797 utils/adt/pg_locale.c:2808
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "%s failed: %s"
-msgstr "ошибка %s: %s"
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
+msgstr ""
+"правила сортировки с разными значениями collate и ctype не поддерживаются на "
+"этой платформе"
 
-#: utils/adt/pg_locale.c:2983
+#: utils/adt/pg_locale_libc.c:683
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "не удалось получить из названия локали \"%s\" метку языка: %s"
+msgid "could not load locale \"%s\""
+msgstr "не удалось загрузить локаль \"%s\""
 
-#: utils/adt/pg_locale.c:3024
+#: utils/adt/pg_locale_libc.c:708
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "не удалось определить язык для локали ICU \"%s\": %s"
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr ""
+"не удалось получить версию правила сортировки для локали \"%s\" (код ошибки: "
+"%lu)"
 
-#: utils/adt/pg_locale.c:3026 utils/adt/pg_locale.c:3055
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr ""
-"Чтобы отключить проверку локалей ICU, установите для параметра \"%s\" "
-"значение \"%s\"."
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "не удалось преобразовать строку в UTF-16 (код ошибки: %lu)"
 
-#: utils/adt/pg_locale.c:3053
+#: utils/adt/pg_locale_libc.c:793
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "для локали ICU \"%s\" получен неизвестный язык \"%s\""
+msgid "could not compare Unicode strings: %m"
+msgstr "не удалось сравнить строки в Unicode: %m"
+
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "не удалось создать локаль \"%s\": %m"
+
+#: utils/adt/pg_locale_libc.c:828
+#, c-format
+msgid ""
+"The operating system could not find any locale data for the locale name "
+"\"%s\"."
+msgstr "Операционная система не может найти данные локали с именем \"%s\"."
 
-#: utils/adt/pg_locale.c:3204
+#: utils/adt/pg_locale_libc.c:1000
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "неверный многобайтный символ для локали"
 
-#: utils/adt/pg_locale.c:3205
+#: utils/adt/pg_locale_libc.c:1001
 #, c-format
 msgid ""
 "The server's LC_CTYPE locale is probably incompatible with the database "
@@ -29508,23 +30975,23 @@ msgstr "нельзя добавить NaN к pg_lsn"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "нельзя вычесть NaN из pg_lsn"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr ""
 "функцию можно вызывать только когда сервер в режиме двоичного обновления"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "неверное имя команды: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1921
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "запрошен сброс неизвестного счётчика: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1922
 #, c-format
 msgid ""
 "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", "
@@ -29533,7 +31000,7 @@ msgstr ""
 "Допустимые счётчики: \"archiver\", \"bgwriter\", \"io\", "
 "\"recovery_prefetch\", \"slru\" и \"wal\"."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2039
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "неверный OID подписки %u"
@@ -29558,82 +31025,82 @@ msgstr "значение типа shell нельзя ввести"
 msgid "cannot display a value of a shell type"
 msgstr "значение типа shell нельзя вывести"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "аргумент flags конструктора диапазона не может быть NULL"
 
-#: utils/adt/rangetypes.c:1021
+#: utils/adt/rangetypes.c:1023
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "результат вычитания диапазонов будет не непрерывным"
 
-#: utils/adt/rangetypes.c:1082
+#: utils/adt/rangetypes.c:1084
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "результат объединения диапазонов будет не непрерывным"
 
-#: utils/adt/rangetypes.c:1757
+#: utils/adt/rangetypes.c:1821
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "нижняя граница диапазона должна быть меньше или равна верхней"
 
-#: utils/adt/rangetypes.c:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "неверные флаги границ диапазона"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Допустимые значения: \"[]\", \"[)\", \"(]\" и \"()\"."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "ошибочный литерал диапазона: \"%s\""
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Мусор после ключевого слова \"empty\"."
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Отсутствует левая скобка (круглая или квадратная)."
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Отсутствует запятая после нижней границы."
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "Слишком много запятых."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Мусор после правой скобки."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2068 utils/adt/varlena.c:4531
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "ошибка в регулярном выражении: %s"
 
-#: utils/adt/regexp.c:445 utils/adt/regexp.c:680
+#: utils/adt/regexp.c:445 utils/adt/regexp.c:681
 #, c-format
 msgid "invalid regular expression option: \"%.*s\""
 msgstr "неверный параметр регулярного выражения: \"%.*s\""
 
-#: utils/adt/regexp.c:682
+#: utils/adt/regexp.c:683
 #, c-format
 msgid ""
 "If you meant to use regexp_replace() with a start parameter, cast the fourth "
@@ -29642,15 +31109,15 @@ msgstr ""
 "Если вы хотите вызвать regexp_replace() с параметром start, явно приведите "
 "четвёртый аргумент к целочисленному типу."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6820 utils/misc/guc.c:6854
+#: utils/adt/regexp.c:717 utils/adt/regexp.c:726 utils/adt/regexp.c:1154
+#: utils/adt/regexp.c:1218 utils/adt/regexp.c:1227 utils/adt/regexp.c:1236
+#: utils/adt/regexp.c:1245 utils/adt/regexp.c:1925 utils/adt/regexp.c:1934
+#: utils/adt/regexp.c:1943 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "неверное значение параметра \"%s\": %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:951
 #, c-format
 msgid ""
 "SQL regular expression may not contain more than two escape-double-quote "
@@ -29660,19 +31127,19 @@ msgstr ""
 "(экранированных кавычек)"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1165 utils/adt/regexp.c:1256 utils/adt/regexp.c:1343
+#: utils/adt/regexp.c:1382 utils/adt/regexp.c:1770 utils/adt/regexp.c:1825
+#: utils/adt/regexp.c:1954
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s не поддерживает режим \"global\""
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1384
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "Вместо неё используйте функцию regexp_matches."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1572
 #, c-format
 msgid "too many regular expression matches"
 msgstr "слишком много совпадений для регулярного выражения"
@@ -29687,19 +31154,19 @@ msgstr "имя \"%s\" имеют несколько функций"
 msgid "more than one operator named %s"
 msgstr "имя %s имеют несколько операторов"
 
-#: utils/adt/regproc.c:670 gram.y:8992
+#: utils/adt/regproc.c:670 gram.y:9100
 #, c-format
 msgid "missing argument"
 msgstr "отсутствует аргумент"
 
-#: utils/adt/regproc.c:671 gram.y:8993
+#: utils/adt/regproc.c:671 gram.y:9101
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr ""
 "Чтобы обозначить отсутствующий аргумент унарного оператора, укажите NONE."
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10509
-#: utils/adt/ruleutils.c:10722
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "слишком много аргументов"
@@ -29710,7 +31177,7 @@ msgid "Provide two argument types for operator."
 msgstr "Предоставьте для оператора два типа аргументов."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3537 utils/adt/varlena.c:3542
 #, c-format
 msgid "invalid name syntax"
 msgstr "ошибка синтаксиса в имени"
@@ -29735,39 +31202,39 @@ msgstr "ожидалось имя типа"
 msgid "improper type name"
 msgstr "ошибочное имя типа"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 "INSERT или UPDATE в таблице \"%s\" нарушает ограничение внешнего ключа \"%s\""
 
-#: utils/adt/ri_triggers.c:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, 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:2036
+#: utils/adt/ri_triggers.c:2192
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "функция \"%s\" должна запускаться для INSERT"
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2198
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "функция \"%s\" должна запускаться для UPDATE"
 
-#: utils/adt/ri_triggers.c:2048
+#: utils/adt/ri_triggers.c:2204
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "функция \"%s\" должна запускаться для DELETE"
 
-#: utils/adt/ri_triggers.c:2071
+#: utils/adt/ri_triggers.c:2227
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "для триггера \"%s\" таблицы \"%s\" нет записи pg_constraint"
 
-#: utils/adt/ri_triggers.c:2073
+#: utils/adt/ri_triggers.c:2229
 #, c-format
 msgid ""
 "Remove this referential integrity trigger and its mates, then do ALTER TABLE "
@@ -29776,12 +31243,12 @@ msgstr ""
 "Удалите этот триггер ссылочной целостности и связанные объекты, а затем "
 "выполните ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:2103 gram.y:4340
+#: utils/adt/ri_triggers.c:2259 gram.y:4454
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "выражение MATCH PARTIAL ещё не реализовано"
 
-#: utils/adt/ri_triggers.c:2426
+#: utils/adt/ri_triggers.c:2599
 #, c-format
 msgid ""
 "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
@@ -29790,33 +31257,52 @@ msgstr ""
 "неожиданный результат запроса ссылочной целостности к \"%s\" из ограничения "
 "\"%s\" таблицы \"%s\""
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Скорее всего это вызвано правилом, переписавшим запрос."
 
-#: utils/adt/ri_triggers.c:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 "при удалении секции \"%s\" нарушается ограничение внешнего ключа \"%s\""
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "На ключ (%s)=(%s) всё ещё есть ссылки в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Ключ (%s)=(%s) отсутствует в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "Ключ отсутствует в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, c-format
+msgid ""
+"update or delete on table \"%s\" violates RESTRICT setting of foreign key "
+"constraint \"%s\" on table \"%s\""
+msgstr ""
+"UPDATE или DELETE в таблице \"%s\" нарушает ограничение RESTRICT внешнего "
+"ключа \"%s\" таблицы \"%s\""
+
+#: utils/adt/ri_triggers.c:2792
+#, c-format
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "На ключ (%s)=(%s) есть ссылки в таблице \"%s\"."
+
+#: utils/adt/ri_triggers.c:2795
+#, c-format
+msgid "Key is referenced from table \"%s\"."
+msgstr "На ключ есть ссылки в таблице \"%s\"."
+
+#: utils/adt/ri_triggers.c:2801
 #, c-format
 msgid ""
 "update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
@@ -29825,7 +31311,7 @@ msgstr ""
 "UPDATE или DELETE в таблице \"%s\" нарушает ограничение внешнего ключа "
 "\"%s\" таблицы \"%s\""
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "На ключ всё ещё есть ссылки в таблице \"%s\"."
@@ -29879,148 +31365,177 @@ msgstr ""
 msgid "improper binary format in record column %d"
 msgstr "неподходящий двоичный формат в столбце записи %d"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "не удалось сравнить различные типы столбцов %s и %s, столбец записи %d"
 
 #: utils/adt/rowtypes.c:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "сравнивать типы записей с разным числом столбцов нельзя"
 
-#: utils/adt/ruleutils.c:2694
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "на вход поступил запрос, а не выражение"
 
-#: utils/adt/ruleutils.c:2706
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "выражение содержит переменные из нескольких отношений"
 
-#: utils/adt/ruleutils.c:2713
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "выражение содержит переменные"
 
-#: utils/adt/ruleutils.c:5246
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "правило \"%s\" имеет неподдерживаемый тип событий %d"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, c-format
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "для отношения \"%s.%s\" нельзя получить последний видимый tid"
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr "типом ctid является не TID"
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr "currtid не может работать с представлениями без CTID"
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr "у представления нет правил"
+
+#: utils/adt/tid.c:381
+#, c-format
+msgid "only one select rule is allowed in views"
+msgstr "в представлениях допускается только одно правило select"
+
+#: utils/adt/timestamp.c:130
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "TIMESTAMP(%d)%s: точность должна быть неотрицательна"
 
-#: utils/adt/timestamp.c:134
+#: utils/adt/timestamp.c:136
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIMESTAMP(%d)%s: точность уменьшена до дозволенного максимума: %d"
 
-#: utils/adt/timestamp.c:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp вне диапазона: \"%s\""
+
+#: utils/adt/timestamp.c:396
 #, 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:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr ""
 "Запись числового часового пояса должна начинаться с символа \"-\" или \"+\"."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "числовой часовой пояс \"%s\" вне диапазона"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, 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:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp не может быть NaN"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "timestamp вне диапазона: \"%g\""
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "interval вне диапазона"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "неверный модификатор типа INTERVAL"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d): точность должна быть неотрицательна"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d): точность уменьшена до максимально возможной: %d"
 
-#: utils/adt/timestamp.c:1506
+#: utils/adt/timestamp.c:1497
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "точность interval(%d) должна быть между %d и %d"
 
-#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "начало вне диапазона"
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
 #, c-format
 msgid "timestamps cannot be binned into infinite intervals"
 msgstr "значения timestamp нельзя подогнать под бесконечные интервалы"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr ""
 "значения timestamp нельзя подогнать под интервалы, содержащие месяцы или годы"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "шаг должен быть больше нуля"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "В месяцах обычно дробное количество недель."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "размер шага не может быть бесконечным"
@@ -30109,32 +31624,32 @@ msgstr ""
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "запрос ts_rewrite должен вернуть два столбца типа tsquery"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "массив весов должен быть одномерным"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "массив весов слишком мал"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "массив весов не может содержать null"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "вес вне диапазона"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "слово слишком длинное (%ld Б, при максимуме %ld)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "строка слишком длинна для tsvector (%ld Б, при максимуме %ld)"
@@ -30164,37 +31679,37 @@ msgstr "нераспознанный вес: \"%c\""
 msgid "ts_stat query must return one tsvector column"
 msgstr "запрос ts_stat должен вернуть один столбец tsvector"
 
-#: utils/adt/tsvector_op.c:2788
+#: utils/adt/tsvector_op.c:2792
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "столбец \"%s\" типа tsvector не существует"
 
-#: utils/adt/tsvector_op.c:2795
+#: utils/adt/tsvector_op.c:2799
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "столбец \"%s\" должен иметь тип tsvector"
 
-#: utils/adt/tsvector_op.c:2807
+#: utils/adt/tsvector_op.c:2811
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "столбец конфигурации \"%s\" не существует"
 
-#: utils/adt/tsvector_op.c:2813
+#: utils/adt/tsvector_op.c:2817
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "столбец \"%s\" должен иметь тип regconfig"
 
-#: utils/adt/tsvector_op.c:2820
+#: utils/adt/tsvector_op.c:2824
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "значение столбца конфигурации \"%s\" не должно быть null"
 
-#: utils/adt/tsvector_op.c:2833
+#: utils/adt/tsvector_op.c:2837
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "имя конфигурации текстового поиска \"%s\" должно указываться со схемой"
 
-#: utils/adt/tsvector_op.c:2858
+#: utils/adt/tsvector_op.c:2862
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "столбец \"%s\" имеет не символьный тип"
@@ -30205,17 +31720,17 @@ msgid "syntax error in tsvector: \"%s\""
 msgstr "ошибка синтаксиса в tsvector: \"%s\""
 
 # skip-rule: capital-letter-first
-#: utils/adt/tsvector_parser.c:221
+#: utils/adt/tsvector_parser.c:220
 #, c-format
 msgid "there is no escaped character: \"%s\""
 msgstr "нет спец. символа \"%s\""
 
-#: utils/adt/tsvector_parser.c:339
+#: utils/adt/tsvector_parser.c:334
 #, c-format
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "неверная информация о позиции в tsvector: \"%s\""
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "не удалось сгенерировать случайные значения"
@@ -30260,9 +31775,9 @@ msgstr "неверная длина во внешней строке битов"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "строка битов не умещается в тип bit varying(%d)"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:923
+#: utils/adt/varlena.c:987 utils/adt/varlena.c:1182 utils/adt/varlena.c:3158
+#: utils/adt/varlena.c:3236
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "подстрока должна иметь неотрицательную длину"
@@ -30288,7 +31803,7 @@ msgstr ""
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "индекс бита %d вне диапазона 0..%d"
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3440
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "значением бита должен быть 0 или 1"
@@ -30303,98 +31818,98 @@ msgstr "значение не умещается в тип character(%d)"
 msgid "value too long for type character varying(%d)"
 msgstr "значение не умещается в тип character varying(%d)"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1647
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr ""
 "не удалось определить, какое правило сортировки использовать для сравнения "
 "строк"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1920
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr ""
 "недетерминированные правила сортировки не поддерживаются для поиска подстрок"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3324 utils/adt/varlena.c:3391
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "индекс %d вне диапазона 0..%d"
 
-#: utils/adt/varlena.c:3252 utils/adt/varlena.c:3324
+#: utils/adt/varlena.c:3355 utils/adt/varlena.c:3427
 #, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "индекс %lld вне диапазона 0..%lld"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "индекс %<PRId64> вне диапазона 0..%<PRId64>"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4643
 #, c-format
 msgid "field position must not be zero"
 msgstr "позиция поля должна быть отлична от 0"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5891
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "незавершённый спецификатор типа format()"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5892 utils/adt/varlena.c:6026 utils/adt/varlena.c:6147
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "Для представления одного знака \"%%\" запишите \"%%%%\"."
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:6024 utils/adt/varlena.c:6145
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "нераспознанный спецификатор типа format(): \"%.*s\""
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:6037 utils/adt/varlena.c:6094
 #, c-format
 msgid "too few arguments for format()"
 msgstr "мало аргументов для format()"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6190 utils/adt/varlena.c:6372
 #, c-format
 msgid "number is out of range"
 msgstr "число вне диапазона"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6253 utils/adt/varlena.c:6281
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "формат ссылается на аргумент 0, но аргументы нумеруются с 1"
 
-#: utils/adt/varlena.c:6013
+#: utils/adt/varlena.c:6274
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "указание аргумента ширины должно оканчиваться \"$\""
 
-#: utils/adt/varlena.c:6058
+#: utils/adt/varlena.c:6319
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "значения null нельзя представить в виде SQL-идентификатора"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6527
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr ""
 "нормализацию Unicode можно выполнять, только если кодировка сервера — UTF8"
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6540
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "неверная форма нормализации: %s"
 
 # well-spelled: категоризацию
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6585
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr ""
 "категоризацию Unicode можно выполнять, только если кодировка сервера — UTF8"
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6802 utils/adt/varlena.c:6837 utils/adt/varlena.c:6872
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "неверный код символа Unicode: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6902
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr ""
@@ -30412,8 +31927,8 @@ msgstr "аргумент nth_value должен быть больше нуля"
 
 #: utils/adt/xid8funcs.c:120
 #, c-format
-msgid "transaction ID %llu is in the future"
-msgstr "ID транзакции %llu относится к будущему"
+msgid "transaction ID %<PRIu64> is in the future"
+msgstr "ID транзакции %<PRIu64> относится к будущему"
 
 #: utils/adt/xid8funcs.c:522
 #, c-format
@@ -30430,7 +31945,7 @@ msgstr "XML-функции не поддерживаются"
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "Для этой функциональности в сервере не хватает поддержки libxml."
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:636
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "неверное имя кодировки: \"%s\""
@@ -30445,32 +31960,32 @@ msgstr "ошибка в XML-комментарии"
 msgid "not an XML document"
 msgstr "не XML-документ"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "неправильная XML-инструкция обработки (PI)"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "назначением XML-инструкции обработки (PI) не может быть \"%s\"."
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML-инструкция обработки (PI) не может содержать \"?>\"."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "функция xmlvalidate не реализована"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "не удалось инициализировать библиотеку XML"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid ""
 "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
@@ -30478,12 +31993,12 @@ msgstr ""
 "В libxml2 оказался несовместимый тип char: sizeof(char)=%zu, "
 "sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "не удалось установить обработчик XML-ошибок"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, c-format
 msgid ""
 "This probably indicates that the version of libxml2 being used is not "
@@ -30492,120 +32007,128 @@ msgstr ""
 "Возможно, это означает, что используемая версия libxml2 несовместима с "
 "заголовочными файлами libxml2, с которыми был собран PostgreSQL."
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "Неверный символ."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "Требуется пробел."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "значениями атрибута standalone могут быть только 'yes' и 'no'."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "Ошибочное объявление: не указана версия."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "В объявлении не указана кодировка."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Ошибка при разборе XML-объявления: ожидается '?>'."
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Нераспознанный код ошибки libxml: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2554
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML не поддерживает бесконечность в датах."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2576 utils/adt/xml.c:2603
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML не поддерживает бесконечность в timestamp."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3019
 #, c-format
 msgid "invalid query"
 msgstr "неверный запрос"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3111
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "портал \"%s\" не возвращает кортежи"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4363
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "неправильный массив с сопоставлениями пространств имён XML"
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4364
 #, c-format
 msgid ""
 "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "Массив должен быть двухмерным и содержать 2 элемента по второй оси."
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4388
 #, c-format
 msgid "empty XPath expression"
 msgstr "пустое выражение XPath"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4440
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "ни префикс, ни URI пространства имён не может быть null"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4447
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr ""
 "не удалось зарегистрировать пространство имён XML с префиксом \"%s\" и URI "
 "\"%s\""
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4796
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "пространство имён DEFAULT не поддерживается"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4825
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "путь отбираемых строк не должен быть пустым"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4859
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "путь отбираемого столбца не должен быть пустым"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5006
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "выражение XPath, отбирающее столбец, возвратило более одного значения"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr ""
+"не удалось определить фактический тип аргумента для полиморфной функции "
+"\"%s\""
+
+#: utils/cache/lsyscache.c:1109
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "приведение типа %s к типу %s не существует"
 
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3027 utils/cache/lsyscache.c:3060
+#: utils/cache/lsyscache.c:3093 utils/cache/lsyscache.c:3126
 #, c-format
 msgid "type %s is only a shell"
 msgstr "тип %s является пустышкой"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3032
 #, c-format
 msgid "no input function available for type %s"
 msgstr "для типа %s нет функции ввода"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3065
 #, c-format
 msgid "no output function available for type %s"
 msgstr "для типа %s нет функции вывода"
@@ -30619,35 +32142,30 @@ msgstr ""
 "в классе операторов \"%s\" метода доступа %s нет опорной функции %d для типа "
 "%s"
 
-#: utils/cache/plancache.c:747
-#, c-format
-msgid "cached plan must not change result type"
-msgstr "в кешированном плане не должен изменяться тип результата"
-
-#: utils/cache/relcache.c:3801
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr ""
 "значение relfilenumber для кучи не задано в режиме двоичного обновления"
 
-#: utils/cache/relcache.c:3809
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr ""
 "неожиданный запрос нового значения relfilenumber в режиме двоичного "
 "обновления"
 
-#: utils/cache/relcache.c:6539
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "создать файл инициализации для кеша отношений \"%s\" не удалось: %m"
 
-#: utils/cache/relcache.c:6541
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Продолжаем всё равно, хотя что-то не так."
 
-#: utils/cache/relcache.c:6871
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "не удалось стереть файл кеша \"%s\": %m"
@@ -30668,7 +32186,7 @@ msgstr "файл сопоставления отношений \"%s\" содер
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "ошибка контрольной суммы в файле сопоставления отношений \"%s\""
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "тип записи не зарегистрирован"
@@ -30683,195 +32201,180 @@ msgstr "ЛОВУШКА: Исключительное условие: невер
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "ЛОВУШКА: нарушение Assert(\"%s\"), файл: \"%s\", строка: %d, PID: %d\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "произошла ошибка до готовности подсистемы обработки сообщений\n"
 
-#: utils/error/elog.c:2134
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "открыть файл \"%s\" как stderr не удалось: %m"
 
-#: utils/error/elog.c:2147
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "открыть файл \"%s\" как stdout не удалось: %m"
 
-#: utils/error/elog.c:2183
+#: utils/error/elog.c:2191
 #, c-format
-msgid "Invalid character"
-msgstr "Недопустимый символ"
+msgid "Invalid character."
+msgstr "Недопустимый символ."
 
-#: utils/error/elog.c:2889 utils/error/elog.c:2916 utils/error/elog.c:2932
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[н/д]"
 
-#: utils/error/elog.c:3202 utils/error/elog.c:3526 utils/error/elog.c:3633
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "отсутствует текст ошибки"
 
-#: utils/error/elog.c:3205 utils/error/elog.c:3208
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " (символ %d)"
 
-#: utils/error/elog.c:3218 utils/error/elog.c:3225
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "ПОДРОБНОСТИ:  "
 
-#: utils/error/elog.c:3232
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "ПОДСКАЗКА:  "
 
-#: utils/error/elog.c:3239
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "ЗАПРОС:  "
 
-#: utils/error/elog.c:3246
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "КОНТЕКСТ:  "
 
-#: utils/error/elog.c:3256
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "ПОЛОЖЕНИЕ: %s, %s:%d\n"
 
-#: utils/error/elog.c:3263
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "ПОЛОЖЕНИЕ: %s:%d\n"
 
-#: utils/error/elog.c:3270
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "СТЕК:  "
 
-#: utils/error/elog.c:3282
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "ОПЕРАТОР:  "
 
-#: utils/error/elog.c:3678
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "ОТЛАДКА"
 
-#: utils/error/elog.c:3682
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "СООБЩЕНИЕ"
 
-#: utils/error/elog.c:3685
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "ИНФОРМАЦИЯ"
 
-#: utils/error/elog.c:3688
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "ЗАМЕЧАНИЕ"
 
-#: utils/error/elog.c:3692
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
-#: utils/error/elog.c:3695
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: utils/error/elog.c:3698
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "ВАЖНО"
 
-#: utils/error/elog.c:3701
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "ПАНИКА"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "не удалось найти функцию \"%s\" в файле \"%s\""
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "загрузить библиотеку \"%s\" не удалось: %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "несовместимая библиотека \"%s\": нет отличительного блока"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "Внешние библиотеки должны использовать макрос PG_MODULE_MAGIC."
 
-#: utils/fmgr/dfmgr.c:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "несовместимая библиотека \"%s\": несовпадение версий"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "Версия сервера: %d, версия библиотеки: %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "несовместимая библиотека \"%s\": другой ABI"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "ABI сервера: \"%s\", библиотеки: \"%s\"."
 
-#: utils/fmgr/dfmgr.c:361
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "В сервере FUNC_MAX_ARGS = %d, в библиотеке: %d."
-
-#: utils/fmgr/dfmgr.c:370
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "В сервере INDEX_MAX_KEYS = %d, в библиотеке: %d."
-
-#: utils/fmgr/dfmgr.c:379
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "В сервере NAMEDATALEN = %d, в библиотеке: %d."
+msgid "Server has %s = %d, library has %d."
+msgstr "В сервере %s = %d, в библиотеке: %d."
 
-#: utils/fmgr/dfmgr.c:388
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
 #, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "В сервере FLOAT8PASSBYVAL = %s, в библиотеке: %s."
+msgid "Server has %s = %s, library has %s."
+msgstr "В сервере %s = %s, в библиотеке: %s."
 
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "Отличительный блок имеет неверную длину или дополнен по-другому."
 
-#: utils/fmgr/dfmgr.c:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "несовместимая библиотека \"%s\": несоответствие отличительного блока"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "доступ к библиотеке \"%s\" не разрешён"
 
-#: utils/fmgr/dfmgr.c:501
+#: utils/fmgr/dfmgr.c:554
 #, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "неправильный макрос в пути динамической библиотеки: %s"
+msgid "invalid macro name in path: %s"
+msgstr "неправильный макрос в пути: %s"
 
-#: utils/fmgr/dfmgr.c:541
+#: utils/fmgr/dfmgr.c:606
 #, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "параметр dynamic_library_path содержит компонент нулевой длины"
-
-#: utils/fmgr/dfmgr.c:560
-#, c-format
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr ""
-"параметр dynamic_library_path содержит компонент, не являющийся абсолютным "
-"путём"
+msgid "zero-length component in parameter \"%s\""
+msgstr "компонент нулевой длины в параметре \"%s\""
 
 #: utils/fmgr/fmgr.c:236
 #, c-format
@@ -30939,100 +32442,172 @@ msgstr "псевдоним столбца не указан"
 msgid "could not determine row description for function returning record"
 msgstr "не удалось определить описание строки для функции, возвращающей запись"
 
-#: utils/init/miscinit.c:353
+#: utils/init/miscinit.c:265
+msgid "unknown process type"
+msgstr "неизвестный тип процесса"
+
+#: utils/init/miscinit.c:270
+msgid "not initialized"
+msgstr "не инициализирован"
+
+#: utils/init/miscinit.c:273
+msgid "archiver"
+msgstr "процесс архивации"
+
+#: utils/init/miscinit.c:276
+msgid "autovacuum launcher"
+msgstr "процесс запуска автоочистки"
+
+#: utils/init/miscinit.c:279
+msgid "autovacuum worker"
+msgstr "рабочий процесс автоочистки"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "клиентский обслуживающий процесс"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr "зависший клиентский процесс"
+
+#: utils/init/miscinit.c:288
+msgid "background worker"
+msgstr "фоновый рабочий процесс"
+
+#: utils/init/miscinit.c:291
+msgid "background writer"
+msgstr "процесс фоновой записи"
+
+#: utils/init/miscinit.c:294
+msgid "checkpointer"
+msgstr "процесс контрольных точек"
+
+#: utils/init/miscinit.c:300
+msgid "logger"
+msgstr "процесс протоколирования"
+
+#: utils/init/miscinit.c:303
+msgid "slotsync worker"
+msgstr "рабочий процесс синхронизации слотов"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr "автономный обслуживающий процесс"
+
+#: utils/init/miscinit.c:309
+msgid "startup"
+msgstr "стартовый процесс"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr "приёмник WAL"
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr "передатчик WAL"
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr "процесс, обобщающий WAL"
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr "процесс, пишущий WAL"
+
+#: utils/init/miscinit.c:358
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "каталог данных \"%s\" не существует"
 
-#: utils/init/miscinit.c:358
+#: utils/init/miscinit.c:363
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не удалось прочитать права на каталог \"%s\": %m"
 
-#: utils/init/miscinit.c:366
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "указанный каталог данных \"%s\" не существует"
 
-#: utils/init/miscinit.c:382
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "владелец каталога данных \"%s\" определён неверно"
 
-#: utils/init/miscinit.c:384
+#: utils/init/miscinit.c:389
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr ""
 "Сервер должен запускать пользователь, являющийся владельцем каталога данных."
 
-#: utils/init/miscinit.c:402
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "для каталога данных \"%s\" установлены неправильные права доступа"
 
-#: utils/init/miscinit.c:404
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "Маска прав должна быть u=rwx (0700) или u=rwx,g=rx (0750)."
 
-#: utils/init/miscinit.c:462
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "не удалось перейти в каталог \"%s\": %m"
 
-#: utils/init/miscinit.c:720 utils/misc/guc.c:3650
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr ""
 "параметр \"%s\" нельзя задать в рамках операции с ограничениями по "
 "безопасности"
 
-#: utils/init/miscinit.c:807
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "роль с OID %u не существует"
 
-#: utils/init/miscinit.c:853
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "для роли \"%s\" вход запрещён"
 
-#: utils/init/miscinit.c:874
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "слишком много подключений для роли \"%s\""
 
-#: utils/init/miscinit.c:1045
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "неверный OID роли: %u"
 
-#: utils/init/miscinit.c:1192
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "система БД выключена"
 
-#: utils/init/miscinit.c:1279
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "не удалось создать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1293
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "не удалось открыть файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1300
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "не удалось прочитать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1309
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "файл блокировки \"%s\" пуст"
 
-#: utils/init/miscinit.c:1310
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid ""
 "Either another server is starting, or the lock file is the remnant of a "
@@ -31041,38 +32616,38 @@ msgstr ""
 "Либо сейчас запускается другой сервер, либо этот файл остался в результате "
 "сбоя при предыдущем запуске."
 
-#: utils/init/miscinit.c:1354
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "файл блокировки \"%s\" уже существует"
 
-#: utils/init/miscinit.c:1358
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "Другой экземпляр postgres (PID %d) работает с каталогом данных \"%s\"?"
 
-#: utils/init/miscinit.c:1360
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr ""
 "Другой экземпляр postmaster (PID %d) работает с каталогом данных \"%s\"?"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "Другой экземпляр postgres (PID %d) использует файл сокета \"%s\"?"
 
-#: utils/init/miscinit.c:1365
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "Другой экземпляр postmaster (PID %d) использует файл сокета \"%s\"?"
 
-#: utils/init/miscinit.c:1416
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "не удалось стереть старый файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1418
+#: utils/init/miscinit.c:1424
 #, c-format
 msgid ""
 "The file seems accidentally left over, but it could not be removed. Please "
@@ -31081,48 +32656,48 @@ msgstr ""
 "Кажется, файл сохранился по ошибке, но удалить его не получилось. "
 "Пожалуйста, удалите файл вручную и повторите попытку."
 
-#: utils/init/miscinit.c:1455 utils/init/miscinit.c:1469
-#: utils/init/miscinit.c:1480
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "не удалось записать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1591 utils/init/miscinit.c:1733 utils/misc/guc.c:5765
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
 
-#: utils/init/miscinit.c:1721
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "не удалось открыть файл \"%s\": %m; ошибка игнорируется"
 
-#: utils/init/miscinit.c:1746
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "файл блокировки \"%s\" содержит неверный PID: %ld вместо %ld"
 
-#: utils/init/miscinit.c:1785 utils/init/miscinit.c:1801
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" не является каталогом данных"
 
-#: utils/init/miscinit.c:1787
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Файл \"%s\" отсутствует."
 
-#: utils/init/miscinit.c:1803
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Файл \"%s\" содержит неприемлемые данные."
 
-#: utils/init/miscinit.c:1805
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "Возможно, вам нужно выполнить initdb."
 
-#: utils/init/miscinit.c:1813
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid ""
 "The data directory was initialized by PostgreSQL version %s, which is not "
@@ -31131,32 +32706,32 @@ msgstr ""
 "Каталог данных инициализирован сервером PostgreSQL версии %s, несовместимой "
 "с данной версией (%s)."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "подключение для репликации авторизовано: пользователь=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "подключение авторизовано: пользователь=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr " база=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " приложение=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr " SSL включён (протокол=%s, шифр=%s, битов=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid ""
 " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
@@ -31164,60 +32739,60 @@ msgstr ""
 " GSS (аутентификация=%s, шифрование=%s, делегированное_удостоверение=%s, "
 "принципал=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "нет"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "да"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr ""
 " GSS (аутентификация=%s, шифрование=%s, делегированное_удостоверение=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "база данных \"%s\" исчезла из pg_database"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "Похоже, базой данных с OID %u теперь владеет \"%s\"."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "база \"%s\" не принимает подключения в данный момент"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "доступ к базе \"%s\" запрещён"
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "Пользователь не имеет привилегии CONNECT."
 
-#: utils/init/postinit.c:389
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "слишком много подключений к БД \"%s\""
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "локаль БД несовместима с операционной системой"
 
-#: utils/init/postinit.c:414
+#: utils/init/postinit.c:423
 #, c-format
 msgid ""
 "The database was initialized with LC_COLLATE \"%s\",  which is not "
@@ -31226,7 +32801,7 @@ msgstr ""
 "База данных была инициализирована с параметром LC_COLLATE \"%s\", но сейчас "
 "setlocale() не воспринимает его."
 
-#: utils/init/postinit.c:416 utils/init/postinit.c:423
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid ""
 "Recreate the database with another locale or install the missing locale."
@@ -31234,7 +32809,7 @@ msgstr ""
 "Пересоздайте базу данных с другой локалью или установите поддержку нужной "
 "локали."
 
-#: utils/init/postinit.c:421
+#: utils/init/postinit.c:430
 #, c-format
 msgid ""
 "The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
@@ -31243,12 +32818,12 @@ msgstr ""
 "База данных была инициализирована с параметром LC_CTYPE \"%s\", но сейчас "
 "setlocale() не воспринимает его."
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "несовпадение версии для правила сортировки в базе данных \"%s\""
 
-#: utils/init/postinit.c:495
+#: utils/init/postinit.c:473
 #, c-format
 msgid ""
 "The database was created using collation version %s, but the operating "
@@ -31257,7 +32832,7 @@ msgstr ""
 "База данных была создана с версией правила сортировки %s, но операционная "
 "система предоставляет версию %s."
 
-#: utils/init/postinit.c:498
+#: utils/init/postinit.c:476
 #, c-format
 msgid ""
 "Rebuild all objects in this database that use the default collation and run "
@@ -31268,31 +32843,47 @@ msgstr ""
 "сортировки, и выполните ALTER DATABASE %s REFRESH COLLATION VERSION, либо "
 "соберите PostgreSQL с правильной версией библиотеки."
 
-#: utils/init/postinit.c:904
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr "настроено слишком много серверных процессов"
+
+#: utils/init/postinit.c:567
+#, c-format
+msgid ""
+"\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus "
+"\"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less "
+"than %d."
+msgstr ""
+"\"max_connections\" (%d) плюс \"autovacuum_worker_slots\" (%d) плюс "
+"\"max_worker_processes\" (%d) плюс \"max_wal_senders\" (%d) должно быть "
+"меньше %d."
+
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "в этой системе баз данных не создано ни одной роли"
 
-#: utils/init/postinit.c:905
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Вы должны немедленно выполнить CREATE USER \"%s\" CREATEUSER;."
 
-#: utils/init/postinit.c:942
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr ""
 "нужно быть суперпользователем, чтобы подключиться в режиме двоичного "
 "обновления"
 
-#: utils/init/postinit.c:962
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr ""
 "оставшиеся слоты подключений зарезервированы для подключений ролей с "
 "атрибутом %s"
 
-#: utils/init/postinit.c:968
+#: utils/init/postinit.c:950
 #, c-format
 msgid ""
 "remaining connection slots are reserved for roles with privileges of the "
@@ -31301,32 +32892,32 @@ msgstr ""
 "оставшиеся слоты подключений зарезервированы для подключений ролей с правами "
 "роли \"%s\""
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "нет прав для запуска процесса, передающего WAL"
 
-#: utils/init/postinit.c:981
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "Только роли с атрибутом %s могут запускать процессы, передающие WAL."
 
-#: utils/init/postinit.c:1099
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Похоже, она только что была удалена или переименована."
 
-#: utils/init/postinit.c:1103
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "база данных %u не существует"
 
-#: utils/init/postinit.c:1112
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "подключиться к некорректной базе \"%s\" нельзя"
 
-#: utils/init/postinit.c:1173
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "Подкаталог базы данных \"%s\" отсутствует."
@@ -31341,60 +32932,60 @@ msgstr "роль \"%s\" не может переключиться на \"%s\""
 msgid "invalid encoding number: %d"
 msgstr "неверный номер кодировки: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "неожиданный ID кодировки %d для наборов символов ISO 8859"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "неожиданный ID кодировки %d для наборов символов WIN"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:306 utils/mb/mbutils.c:909
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "преобразование %s <-> %s не поддерживается"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:411 utils/mb/mbutils.c:439 utils/mb/mbutils.c:824
+#: utils/mb/mbutils.c:851
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "Строка из %d байт слишком длинна для преобразования кодировки."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:577
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "неверное имя исходной кодировки: \"%s\""
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:582
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "неверное имя кодировки результата: \"%s\""
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:722
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "недопустимое байтовое значение для кодировки \"%s\": 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:886
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "неверный код Unicode"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1327
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "ошибка в bind_textdomain_codeset"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1851
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "неверная последовательность байт для кодировки \"%s\": %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1898
 #, c-format
 msgid ""
 "character with byte sequence %s in encoding \"%s\" has no equivalent in "
@@ -31413,14 +33004,14 @@ msgstr "пустое имя каталога конфигурации: \"%s\""
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "открыть каталог конфигурации \"%s\" не удалось: %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid ""
 "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr ""
 "Допустимые единицы измерения для этого параметра: \"B\", \"kB\", \"MB\", "
 "\"GB\" и \"TB\"."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid ""
 "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", "
 "and \"d\"."
@@ -31428,36 +33019,36 @@ msgstr ""
 "Допустимые единицы измерения для этого параметра: \"us\", \"ms\", \"s\", "
 "\"min\", \"h\" и \"d\"."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "нераспознанный параметр конфигурации \"%s\" в файле \"%s\", строке %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3504 utils/misc/guc.c:3748
-#: utils/misc/guc.c:3846 utils/misc/guc.c:3944 utils/misc/guc.c:4071
-#: utils/misc/guc.c:4212
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "параметр \"%s\" изменяется только при перезапуске сервера"
 
-#: utils/misc/guc.c:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr ""
 "параметр \"%s\" удалён из файла конфигурации, он принимает значение по "
 "умолчанию"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "параметр \"%s\" принял значение \"%s\""
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "файл конфигурации \"%s\" содержит ошибки"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid ""
 "configuration file \"%s\" contains errors; unaffected changes were applied"
@@ -31465,17 +33056,17 @@ msgstr ""
 "файл конфигурации \"%s\" содержит ошибки; были применены не зависимые "
 "изменения"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "файл конфигурации \"%s\" содержит ошибки; изменения не были применены"
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "неверное имя параметра конфигурации: \"%s\""
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid ""
 "Custom parameter names must be two or more simple identifiers separated by "
@@ -31484,22 +33075,22 @@ msgstr ""
 "Имена нестандартных параметров должны состоять из двух или более простых "
 "идентификаторов, разделённых точками."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "\"%s\" — зарезервированный префикс."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "нераспознанный параметр конфигурации: \"%s\""
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: ошибка при обращении к каталогу \"%s\": %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid ""
 "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
@@ -31507,7 +33098,7 @@ msgstr ""
 "Запустите initdb или pg_basebackup для инициализации каталога данных "
 "PostgreSQL.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -31518,12 +33109,12 @@ msgstr ""
 "Вы должны указать его расположение в параметре --config-file или -D, либо "
 "установить переменную окружения PGDATA.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s не может открыть файл конфигурации сервера \"%s\": %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -31534,7 +33125,7 @@ msgstr ""
 "Их расположение можно задать как значение \"data_directory\" в файле \"%s\", "
 "либо передать в параметре -D, либо установить переменную окружения PGDATA.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -31545,7 +33136,7 @@ msgstr ""
 "Его расположение можно задать как значение \"hba_file\" в файле \"%s\", либо "
 "передать в параметре -D, либо установить переменную окружения PGDATA.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -31556,129 +33147,129 @@ msgstr ""
 "Его расположение можно задать как значение \"ident_file\" в файле \"%s\", "
 "либо передать в параметре -D, либо установить переменную окружения PGDATA.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "Значение выходит за рамки целых чисел."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid ""
 "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
 msgstr ""
 "%d%s%s вне диапазона, допустимого для параметра \"%s\" (%d%s%s .. %d%s%s)"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid ""
 "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
 msgstr ""
 "%g%s%s вне диапазона, допустимого для параметра \"%s\" (%g%s%s .. %g%s%s)"
 
-#: utils/misc/guc.c:3465
+#: utils/misc/guc.c:3462
 #, c-format
 msgid "parameter \"%s\" cannot be set during a parallel operation"
 msgstr "параметр \"%s\" нельзя установить во время параллельной операции"
 
-#: utils/misc/guc.c:3481 utils/misc/guc.c:4696
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "параметр \"%s\" нельзя изменить"
 
-#: utils/misc/guc.c:3514
+#: utils/misc/guc.c:3511
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "параметр \"%s\" нельзя изменить сейчас"
 
-#: utils/misc/guc.c:3541 utils/misc/guc.c:3603 utils/misc/guc.c:4671
-#: utils/misc/guc.c:6756
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "нет прав для изменения параметра \"%s\""
 
-#: utils/misc/guc.c:3583
+#: utils/misc/guc.c:3580
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "параметр \"%s\" нельзя задать после установления соединения"
 
-#: utils/misc/guc.c:3642
+#: utils/misc/guc.c:3639
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr ""
 "параметр \"%s\" нельзя задать в функции с контекстом безопасности "
 "определившего"
 
-#: utils/misc/guc.c:3663
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "параметр \"%s\" нельзя сбросить"
 
-#: utils/misc/guc.c:3670
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "параметр \"%s\" нельзя задавать локально в функциях"
 
-#: utils/misc/guc.c:4370 utils/misc/guc.c:4418 utils/misc/guc.c:5450
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "нет прав для просмотра параметра \"%s\""
 
-#: utils/misc/guc.c:4371 utils/misc/guc.c:4419 utils/misc/guc.c:5451
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid ""
 "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "Просматривать этот параметр могут только роли с правами роли \"%s\"."
 
-#: utils/misc/guc.c:4629
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "команда ALTER SYSTEM запрещена в этом окружении"
 
-#: utils/misc/guc.c:4661
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "нет прав для выполнения ALTER SYSTEM RESET ALL"
 
-#: utils/misc/guc.c:4740
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr "значение параметра для ALTER SYSTEM не должно быть многострочным"
 
-#: utils/misc/guc.c:4785
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "не удалось разобрать содержимое файла \"%s\""
 
-#: utils/misc/guc.c:4967
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "попытка переопределить параметр \"%s\""
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "неверное имя параметра конфигурации: \"%s\", он удаляется"
 
-#: utils/misc/guc.c:5308
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "Теперь \"%s\" — зарезервированный префикс."
 
-#: utils/misc/guc.c:6179
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "при назначении параметру \"%s\" значения \"%s\""
 
-#: utils/misc/guc.c:6348
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "параметр \"%s\" нельзя установить"
 
-#: utils/misc/guc.c:6438
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "не удалось разобрать значение параметра \"%s\""
 
-#: utils/misc/guc.c:6888
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "неверное значение параметра \"%s\": %g"
@@ -31703,274 +33294,286 @@ msgstr "SET %s принимает только один аргумент"
 msgid "SET requires parameter name"
 msgstr "SET требует имя параметра"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "Разное"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "Расположения файлов"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Подключения и аутентификация / Параметры подключений"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "Подключения и аутентификация / Параметры TCP"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "Подключения и аутентификация / Аутентификация"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "Подключения и аутентификация / SSL"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "Использование ресурсов / Память"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "Использование ресурсов / Диск"
 
-#: utils/misc/guc_tables.c:684
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
 msgstr "Использование ресурсов / Ресурсы ядра"
 
-#: utils/misc/guc_tables.c:685
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Использование ресурсов / Задержка очистки по стоимости"
-
-#: utils/misc/guc_tables.c:686
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "Использование ресурсов / Фоновая запись"
 
-#: utils/misc/guc_tables.c:687
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Использование ресурсов / Асинхронное поведение"
+#: utils/misc/guc_tables.c:711
+msgid "Resource Usage / I/O"
+msgstr "Использование ресурсов / Ввод/вывод"
+
+#: utils/misc/guc_tables.c:712
+msgid "Resource Usage / Worker Processes"
+msgstr "Использование ресурсов / Рабочие процессы"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "Журнал WAL / Параметры"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Журнал WAL / Контрольные точки"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "Журнал WAL / Архивация"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "Журнал WAL / Восстановление"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Журнал WAL / Восстановление из архива"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Журнал WAL / Цель восстановления"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "Журнал WAL / Обобщение"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "Репликация / Передающие серверы"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "Репликация / Ведущий сервер"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "Репликация / Резервные серверы"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "Репликация / Подписчики"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Настройка запросов / Конфигурация методов планировщика"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Настройка запросов / Константы стоимости для планировщика"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Настройка запросов / Генетический оптимизатор запросов"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "Настройка запросов / Другие параметры планировщика"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "Отчёты и протоколы / Куда записывать"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "Отчёты и протоколы / Когда записывать"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "Отчёты и протоколы / Что записывать"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "Отчёты и протоколы / Заголовок процесса"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "Статистика / Мониторинг"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "Статистика / Накопительная статистика по запросам и индексам"
 
-#: utils/misc/guc_tables.c:709
-msgid "Autovacuum"
-msgstr "Автоочистка"
+#: utils/misc/guc_tables.c:734
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr "Очистка / Автоматическая очистка"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:735
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "Очистка / Задержка очистки по стоимости"
+
+#: utils/misc/guc_tables.c:736
+msgid "Vacuuming / Default Behavior"
+msgstr "Очистка / Поведение по умолчанию"
+
+#: utils/misc/guc_tables.c:737
+msgid "Vacuuming / Freezing"
+msgstr "Очистка / Заморозка"
+
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Параметры клиентских подключений по умолчанию / Поведение команд"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr ""
 "Параметры клиентских подключений по умолчанию / Языковая среда и форматы"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr ""
 "Параметры клиентских подключений по умолчанию / Предзагрузка разделяемых "
 "библиотек"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Параметры клиентских подключений по умолчанию / Другие параметры"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "Управление блокировками"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Версия и совместимость платформ / Предыдущие версии PostgreSQL"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Версия и совместимость платформ / Другие платформы и клиенты"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "Обработка ошибок"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "Предопределённые параметры"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "Внесистемные параметры"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "Параметры для разработчиков"
 
-#: utils/misc/guc_tables.c:775
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr ""
 "Разрешает планировщику использовать планы последовательного сканирования."
 
-#: utils/misc/guc_tables.c:785
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Разрешает планировщику использовать планы сканирования по индексу."
 
-#: utils/misc/guc_tables.c:795
+#: utils/misc/guc_tables.c:823
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Разрешает планировщику использовать планы сканирования только индекса."
 
-#: utils/misc/guc_tables.c:805
+#: utils/misc/guc_tables.c:833
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr ""
 "Разрешает планировщику использовать планы сканирования по битовой карте."
 
-#: utils/misc/guc_tables.c:815
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Разрешает планировщику использовать планы сканирования TID."
 
-#: utils/misc/guc_tables.c:825
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Разрешает планировщику использовать шаги с явной сортировкой."
 
-#: utils/misc/guc_tables.c:835
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr ""
 "Разрешает планировщику использовать шаги с инкрементальной сортировкой."
 
-#: utils/misc/guc_tables.c:845
+#: utils/misc/guc_tables.c:873
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Разрешает планировщику использовать планы агрегирования по хешу."
 
-#: utils/misc/guc_tables.c:855
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "Разрешает планировщику использовать материализацию."
 
 # well-spelled: мемоизацию
-#: utils/misc/guc_tables.c:865
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "Разрешает планировщику использовать мемоизацию."
 
-#: utils/misc/guc_tables.c:875
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr ""
 "Разрешает планировщику использовать планы соединения с вложенными циклами."
 
-#: utils/misc/guc_tables.c:885
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "Разрешает планировщику использовать планы соединения слиянием."
 
-#: utils/misc/guc_tables.c:895
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "Разрешает планировщику использовать планы соединения по хешу."
 
-#: utils/misc/guc_tables.c:905
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "Разрешает планировщику использовать планы сбора слиянием."
 
-#: utils/misc/guc_tables.c:915
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "Включает соединения с учётом секционирования."
 
-#: utils/misc/guc_tables.c:925
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "Включает агрегирование и группировку с учётом секционирования."
 
-#: utils/misc/guc_tables.c:935
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "Разрешает планировщику использовать планы параллельного добавления."
 
-#: utils/misc/guc_tables.c:945
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr ""
 "Разрешает планировщику использовать планы параллельного соединения по хешу."
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr ""
 "Включает устранение секций во время планирования и во время выполнения "
 "запросов."
 
-#: utils/misc/guc_tables.c:956
+#: utils/misc/guc_tables.c:984
 msgid ""
 "Allows the query planner and executor to compare partition bounds to "
 "conditions in the query to determine which partitions must be scanned."
@@ -31978,7 +33581,7 @@ msgstr ""
 "Разрешает планировщику и исполнителю запросов сопоставлять границы секций с "
 "условиями в запросе и выделять отдельные секции для сканирования."
 
-#: utils/misc/guc_tables.c:967
+#: utils/misc/guc_tables.c:995
 msgid ""
 "Enables the planner's ability to produce plans that provide presorted input "
 "for ORDER BY / DISTINCT aggregate functions."
@@ -31986,7 +33589,7 @@ msgstr ""
 "Включает в планировщике возможность формировать планы, подающие ранее "
 "сортированные данные на вход агрегирующим функциям с ORDER BY / DISTINCT."
 
-#: utils/misc/guc_tables.c:970
+#: utils/misc/guc_tables.c:998
 msgid ""
 "Allows the query planner to build plans that provide presorted input for "
 "aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, "
@@ -31997,31 +33600,39 @@ msgstr ""
 "данные. Когда этот параметр отключён, во время выполнения всегда неявно "
 "производится сортировка."
 
-#: utils/misc/guc_tables.c:982
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr "Разрешает планировщику использовать планы асинхронного добавления."
 
-#: utils/misc/guc_tables.c:992
+#: utils/misc/guc_tables.c:1020
+msgid "Enables removal of unique self-joins."
+msgstr "Включает удаление уникальных замкнутых соединений."
+
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
 msgstr "Включает переупорядочивание ключей GROUP BY."
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1040
+msgid "Enables reordering of DISTINCT keys."
+msgstr "Включает переупорядочивание ключей DISTINCT."
+
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "Включает генетическую оптимизацию запросов."
 
-#: utils/misc/guc_tables.c:1003
+#: utils/misc/guc_tables.c:1051
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "Этот алгоритм пытается построить план без полного перебора."
 
-#: utils/misc/guc_tables.c:1017
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "Показывает, является ли текущий пользователь суперпользователем."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "Разрешает выполнять команду ALTER SYSTEM."
 
-#: utils/misc/guc_tables.c:1033
+#: utils/misc/guc_tables.c:1081
 msgid ""
 "Can be set to off for environments where global configuration changes should "
 "be made using a different method."
@@ -32029,34 +33640,34 @@ msgstr ""
 "Может быть выключен в окружениях, где изменения глобальной конфигурации "
 "должны производиться другим методом."
 
-#: utils/misc/guc_tables.c:1043
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "Включает объявление сервера посредством Bonjour."
 
-#: utils/misc/guc_tables.c:1052
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "Записывает время фиксации транзакций."
 
-#: utils/misc/guc_tables.c:1061
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "Разрешает SSL-подключения."
 
-#: utils/misc/guc_tables.c:1070
+#: utils/misc/guc_tables.c:1118
 msgid ""
 "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr ""
 "Определяет, будет ли вызываться \"ssl_passphrase_command\" при перезагрузке "
 "сервера."
 
-#: utils/misc/guc_tables.c:1079
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
 msgstr "Назначает более приоритетным набор шифров сервера."
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "Принудительная запись изменений на диск."
 
-#: utils/misc/guc_tables.c:1089
+#: utils/misc/guc_tables.c:1137
 msgid ""
 "The server will use the fsync() system call in several places to make sure "
 "that updates are physically written to disk. This ensures that a database "
@@ -32067,11 +33678,11 @@ msgstr ""
 "обеспечивающую физическую запись данных на диск. Тем самым гарантируется, "
 "что кластер БД придёт в целостное состояние после отказа ОС или оборудования."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "Продолжает обработку при ошибке контрольной суммы."
 
-#: utils/misc/guc_tables.c:1101
+#: utils/misc/guc_tables.c:1149
 msgid ""
 "Detection of a checksum failure normally causes PostgreSQL to report an "
 "error, aborting the current transaction. Setting ignore_checksum_failure to "
@@ -32085,11 +33696,11 @@ msgstr ""
 "что может привести к сбоям или другим серьёзным проблемам. Это имеет место, "
 "только если включён контроль целостности страниц."
 
-#: utils/misc/guc_tables.c:1115
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "Продолжает обработку при повреждении заголовков страниц."
 
-#: utils/misc/guc_tables.c:1116
+#: utils/misc/guc_tables.c:1164
 msgid ""
 "Detection of a damaged page header normally causes PostgreSQL to report an "
 "error, aborting the current transaction. Setting \"zero_damaged_pages\" to "
@@ -32103,12 +33714,12 @@ msgstr ""
 "продолжит работу. Это приведёт к потере данных, а именно строк в "
 "повреждённой странице."
 
-#: utils/misc/guc_tables.c:1129
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr ""
 "Продолжает восстановление после ошибок, связанных с неправильными страницами."
 
-#: utils/misc/guc_tables.c:1130
+#: utils/misc/guc_tables.c:1178
 msgid ""
 "Detection of WAL records having references to invalid pages during recovery "
 "causes PostgreSQL to raise a PANIC-level error, aborting the recovery. "
@@ -32127,12 +33738,12 @@ msgstr ""
 "проблемам. Данный параметр действует только при восстановлении или в режиме "
 "резервного сервера."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1196
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr ""
 "Запись полных страниц в WAL при первом изменении после контрольной точки."
 
-#: utils/misc/guc_tables.c:1149
+#: utils/misc/guc_tables.c:1197
 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 "
@@ -32145,7 +33756,7 @@ msgstr ""
 "при первом изменении после контрольной точки, что позволяет полностью "
 "восстановить данные."
 
-#: utils/misc/guc_tables.c:1162
+#: utils/misc/guc_tables.c:1210
 msgid ""
 "Writes full pages to WAL when first modified after a checkpoint, even for a "
 "non-critical modification."
@@ -32153,98 +33764,119 @@ msgstr ""
 "Запись полных страниц в WAL при первом изменении после контрольной точки, "
 "даже при некритическом изменении."
 
-#: utils/misc/guc_tables.c:1172
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "Записывать нули в новые файлы WAL перед первым использованием."
 
-#: utils/misc/guc_tables.c:1182
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "Перерабатывать файлы WAL, производя переименование."
 
-#: utils/misc/guc_tables.c:1192
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "Протоколировать каждую контрольную точку."
 
-#: utils/misc/guc_tables.c:1201
-msgid "Logs each successful connection."
-msgstr "Протоколировать устанавливаемые соединения."
-
-#: utils/misc/guc_tables.c:1210
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
 msgstr ""
 "Протоколировать сообщения об установлении соединения до аутентификации."
 
-#: utils/misc/guc_tables.c:1220
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "Протоколировать конец сеанса, отмечая длительность."
 
-#: utils/misc/guc_tables.c:1229
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "Протоколировать каждую команду репликации."
 
-#: utils/misc/guc_tables.c:1238
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Показывает, включены ли проверки истинности на работающем сервере."
 
-#: utils/misc/guc_tables.c:1249
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "Завершать сеансы при любой ошибке."
 
-#: utils/misc/guc_tables.c:1258
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "Перезапускать систему БД при аварии серверного процесса."
 
-#: utils/misc/guc_tables.c:1267
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "Удалять временные файлы после аварии обслуживающего процесса."
 
-#: utils/misc/guc_tables.c:1277
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr ""
 "Посылать дочерним процессам SIGABRT, а не SIGQUIT при сбое серверного "
 "процесса."
 
-#: utils/misc/guc_tables.c:1287
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "Посылать SIGABRT, а не SIGKILL зависшим дочерним процессам."
 
-#: utils/misc/guc_tables.c:1298
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Протоколировать длительность каждого выполненного SQL-оператора."
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1347
+msgid ""
+"Set this to force all parse and plan trees to be passed through "
+"copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr ""
+"Включите, чтобы все деревья разборов и планов проходили через copyObject(), "
+"что помогает выявить ошибки и упущения в copyObject()."
+
+#: utils/misc/guc_tables.c:1364
+msgid ""
+"Set this to force all parse and plan trees to be passed through outfuncs.c/"
+"readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr ""
+"Включите, чтобы все деревья разборов и планов проходили через outfuncs.c/"
+"readfuncs.c, что помогает выявить ошибки и упущения в этих модулях."
+
+#: utils/misc/guc_tables.c:1381
+msgid ""
+"Set this to force all raw parse trees for DML statements to be scanned by "
+"raw_expression_tree_walker(), to facilitate catching errors and omissions in "
+"that function."
+msgstr ""
+"Включите, чтобы все деревья разборов DML-операторов сканировались функцией "
+"raw_expression_tree_walker(), что помогает выявить ошибки и упущения в ней."
+
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "Протоколировать дерево разбора для каждого запроса."
 
-#: utils/misc/guc_tables.c:1316
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "Протоколировать перезаписанное дерево разбора для каждого запроса."
 
-#: utils/misc/guc_tables.c:1325
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "Протоколировать план выполнения каждого запроса."
 
-#: utils/misc/guc_tables.c:1334
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr "Отступы при отображении деревьев разбора и плана запросов."
 
-#: utils/misc/guc_tables.c:1343
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "Запись статистики разбора запросов в протокол сервера."
 
-#: utils/misc/guc_tables.c:1352
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "Запись статистики планирования в протокол сервера."
 
-#: utils/misc/guc_tables.c:1361
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "Запись статистики выполнения запросов в протокол сервера."
 
-#: utils/misc/guc_tables.c:1370
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Запись общей статистики производительности в протокол сервера."
 
-#: utils/misc/guc_tables.c:1380
+#: utils/misc/guc_tables.c:1472
 msgid ""
 "Logs system resource usage statistics (memory and CPU) on various B-tree "
 "operations."
@@ -32252,11 +33884,11 @@ msgstr ""
 "Фиксировать статистику использования системных ресурсов (памяти и "
 "процессора) при различных операциях с b-деревом."
 
-#: utils/misc/guc_tables.c:1392
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "Собирает информацию о выполняющихся командах."
 
-#: utils/misc/guc_tables.c:1393
+#: utils/misc/guc_tables.c:1485
 msgid ""
 "Enables the collection of information on the currently executing command of "
 "each session, along with the time at which that command began execution."
@@ -32264,70 +33896,78 @@ msgstr ""
 "Включает сбор информации о командах, выполняющихся во всех сеансах, а также "
 "время запуска команды."
 
-#: utils/misc/guc_tables.c:1403
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "Собирает статистику активности в БД."
 
-#: utils/misc/guc_tables.c:1412
+#: utils/misc/guc_tables.c:1504
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "Собирает статистику, связанную с задержкой очистки по стоимости."
+
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Собирает статистику по времени активности ввода/вывода."
 
-#: utils/misc/guc_tables.c:1421
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "Собирает статистику по времени активности ввода/вывода WAL."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1532
 msgid "Updates the process title to show the active SQL command."
 msgstr "Выводит в заголовок процесса активную SQL-команду."
 
-#: utils/misc/guc_tables.c:1432
+#: utils/misc/guc_tables.c:1533
 msgid ""
 "Enables updating of the process title every time a new SQL command is "
 "received by the server."
 msgstr "Отражает в заголовке процесса каждую SQL-команду, поступающую серверу."
 
-#: utils/misc/guc_tables.c:1441
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "Запускает подпроцесс автоочистки."
 
-#: utils/misc/guc_tables.c:1451
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Генерирует отладочные сообщения для LISTEN и NOTIFY."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "Выдавать информацию о применяемых блокировках."
 
-#: utils/misc/guc_tables.c:1473
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "Выдавать информацию о применяемых пользовательских блокировках."
 
-#: utils/misc/guc_tables.c:1483
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "Выдавать информацию о применяемых лёгких блокировках."
 
-#: utils/misc/guc_tables.c:1493
+#: utils/misc/guc_tables.c:1594
 msgid ""
 "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr ""
 "Выводить информацию обо всех текущих блокировках в случае тайм-аута при "
 "взаимоблокировке."
 
-#: utils/misc/guc_tables.c:1505
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "Протоколировать длительные ожидания в блокировках."
 
-#: utils/misc/guc_tables.c:1514
+#: utils/misc/guc_tables.c:1615
+msgid "Logs lock failures."
+msgstr "Протоколировать ошибки блокировок."
+
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr ""
 "Протоколировать события ожидания разрешения конфликтов при восстановлении на "
 "ведомом."
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "Записывать имя узла в протоколы подключений."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1634
 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 "
@@ -32339,11 +33979,11 @@ msgstr ""
 "параметр, но учтите, что это может значительно повлиять на "
 "производительность."
 
-#: utils/misc/guc_tables.c:1535
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Обрабатывать \"expr=NULL\" как \"expr IS NULL\"."
 
-#: utils/misc/guc_tables.c:1536
+#: utils/misc/guc_tables.c:1646
 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 "
@@ -32355,21 +33995,21 @@ msgstr ""
 "совпадает с NULL, и false в противном случае. По правилам expr = NULL всегда "
 "должно возвращать null (неопределённость)."
 
-#: utils/misc/guc_tables.c:1548
+#: utils/misc/guc_tables.c:1658
 msgid "Sets the default read-only status of new transactions."
 msgstr ""
 "Устанавливает режим \"только чтение\" по умолчанию для новых транзакций."
 
-#: utils/misc/guc_tables.c:1558
+#: utils/misc/guc_tables.c:1668
 msgid "Sets the current transaction's read-only status."
 msgstr "Устанавливает режим \"только чтение\" для текущей транзакции."
 
-#: utils/misc/guc_tables.c:1568
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr ""
 "Устанавливает режим отложенного выполнения по умолчанию для новых транзакций."
 
-#: utils/misc/guc_tables.c:1577
+#: utils/misc/guc_tables.c:1687
 msgid ""
 "Whether to defer a read-only serializable transaction until it can be "
 "executed with no possible serialization failures."
@@ -32377,26 +34017,26 @@ msgstr ""
 "Определяет, откладывать ли сериализуемую транзакцию \"только чтение\" до "
 "момента, когда сбой сериализации будет исключён."
 
-#: utils/misc/guc_tables.c:1587
-msgid "Enable row security."
+#: utils/misc/guc_tables.c:1697
+msgid "Enables row security."
 msgstr "Включает защиту на уровне строк."
 
-#: utils/misc/guc_tables.c:1588
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr ""
 "Когда включена, защита на уровне строк распространяется на всех "
 "пользователей."
 
-#: utils/misc/guc_tables.c:1596
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr ""
 "Проверять тело подпрограмм в момент CREATE FUNCTION и CREATE PROCEDURE."
 
-#: utils/misc/guc_tables.c:1605
-msgid "Enable input of NULL elements in arrays."
-msgstr "Разрешать ввод элементов NULL в массивах."
+#: utils/misc/guc_tables.c:1715
+msgid "Enables input of NULL elements in arrays."
+msgstr "Разрешает ввод элементов NULL в массивы."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1716
 msgid ""
 "When turned on, unquoted NULL in an array input value means a null value; "
 "otherwise it is taken literally."
@@ -32404,83 +34044,83 @@ msgstr ""
 "Когда этот параметр включён, NULL без кавычек при вводе в массив "
 "воспринимается как значение NULL, иначе — как строка."
 
-#: utils/misc/guc_tables.c:1622
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr ""
 "WITH OIDS более не поддерживается; единственное допустимое значение — false."
 
-#: utils/misc/guc_tables.c:1632
+#: utils/misc/guc_tables.c:1742
 msgid ""
 "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr ""
 "Запускает подпроцесс для чтения stderr, csvlog и/или jsonlog и записи в "
 "файлы протоколов."
 
-#: utils/misc/guc_tables.c:1641
+#: utils/misc/guc_tables.c:1751
 msgid "Truncate existing log files of same name during log rotation."
 msgstr ""
 "Очищать уже существующий файл с тем же именем при прокручивании протокола."
 
-#: utils/misc/guc_tables.c:1652
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "Выдавать сведения об использовании ресурсов при сортировке."
 
-#: utils/misc/guc_tables.c:1666
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Выдавать отладочные сообщения для синхронного сканирования."
 
-#: utils/misc/guc_tables.c:1681
-msgid "Enable bounded sorting using heap sort."
+#: utils/misc/guc_tables.c:1789
+msgid "Enables bounded sorting using heap sort."
 msgstr ""
-"Разрешить ограниченную сортировку с применением пирамидальной сортировки."
+"Разрешает ограниченную сортировку с применением пирамидальной сортировки."
 
-#: utils/misc/guc_tables.c:1694
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "Выдавать отладочные сообщения, связанные с WAL."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "Показывает, является ли реализация даты/времени целочисленной."
 
-#: utils/misc/guc_tables.c:1717
+#: utils/misc/guc_tables.c:1825
 msgid ""
 "Sets whether Kerberos and GSSAPI user names should be treated as case-"
 "insensitive."
 msgstr ""
 "Включает регистронезависимую обработку имён пользователей Kerberos и GSSAPI."
 
-#: utils/misc/guc_tables.c:1727
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "Разрешает принимать от клиентов делегированные учётные данные GSSAPI."
 
-#: utils/misc/guc_tables.c:1737
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Предупреждения о спецсимволах '\\' в обычных строках."
 
-#: utils/misc/guc_tables.c:1747
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Включает буквальную обработку символов '\\' в строках '...'."
 
-#: utils/misc/guc_tables.c:1758
-msgid "Enable synchronized sequential scans."
-msgstr "Включить синхронизацию последовательного сканирования."
+#: utils/misc/guc_tables.c:1866
+msgid "Enables synchronized sequential scans."
+msgstr "Включает синхронизацию последовательного сканирования."
 
-#: utils/misc/guc_tables.c:1768
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "Определяет, включать ли транзакцию в целевую точку восстановления."
 
-#: utils/misc/guc_tables.c:1778
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr ""
 "Запускает процесс обобщения WAL, необходимый для инкрементального "
 "копирования."
 
-#: utils/misc/guc_tables.c:1788
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr ""
 "Разрешает принимать новые подключения и запросы в процессе восстановления."
 
-#: utils/misc/guc_tables.c:1798
+#: utils/misc/guc_tables.c:1906
 msgid ""
 "Allows feedback from a hot standby to the primary that will avoid query "
 "conflicts."
@@ -32488,19 +34128,19 @@ msgstr ""
 "Разрешает обратную связь сервера горячего резерва с основным для "
 "предотвращения конфликтов при длительных запросах."
 
-#: utils/misc/guc_tables.c:1808
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "Показывает, активен ли в настоящий момент режим горячего резерва."
 
-#: utils/misc/guc_tables.c:1819
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "Разрешает модифицировать структуру системных таблиц."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "Запрещает использование системных индексов."
 
-#: utils/misc/guc_tables.c:1831
+#: utils/misc/guc_tables.c:1939
 msgid ""
 "It does not prevent updating the indexes, so it is safe to use.  The worst "
 "consequence is slowness."
@@ -32508,20 +34148,20 @@ msgstr ""
 "При этом индексы продолжают обновляться, так что данное поведение безопасно. "
 "Худшее следствие - замедление."
 
-#: utils/misc/guc_tables.c:1842
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr ""
 "Позволяет размещать табличные пространства внутри pg_tblspc; предназначается "
 "для тестирования."
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1961
 msgid ""
 "Enables backward compatibility mode for privilege checks on large objects."
 msgstr ""
 "Включает режим обратной совместимости при проверке привилегий для больших "
 "объектов."
 
-#: utils/misc/guc_tables.c:1854
+#: utils/misc/guc_tables.c:1962
 msgid ""
 "Skips privilege checks when reading or modifying large objects, for "
 "compatibility with PostgreSQL releases prior to 9.0."
@@ -32529,66 +34169,66 @@ msgstr ""
 "Пропускает проверки привилегий при чтении или изменении больших объектов "
 "(для совместимости с версиями PostgreSQL до 9.0)."
 
-#: utils/misc/guc_tables.c:1864
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr ""
 "Генерируя SQL-фрагменты, заключать все идентификаторы в двойные кавычки."
 
-#: utils/misc/guc_tables.c:1874
+#: utils/misc/guc_tables.c:1982
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Показывает, включён ли в этом кластере контроль целостности данных."
 
-#: utils/misc/guc_tables.c:1885
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr ""
 "Добавлять последовательный номер в сообщения syslog во избежание подавления "
 "повторов."
 
-#: utils/misc/guc_tables.c:1895
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr ""
 "Разбивать сообщения, передаваемые в syslog, по строкам размером не больше "
 "1024 байт."
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr ""
 "Определяет, будут ли узлы сбора и сбора слиянием также выполнять подпланы."
 
-#: utils/misc/guc_tables.c:1906
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr ""
 "Должны ли узлы сбора также выполнять подпланы или только собирать кортежи?"
 
-#: utils/misc/guc_tables.c:1916
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "Включить JIT-компиляцию."
 
-#: utils/misc/guc_tables.c:1927
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "Регистрировать JIT-скомпилированные функции в отладчике."
 
-#: utils/misc/guc_tables.c:1944
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "Выводить битовый код LLVM для облегчения отладки JIT."
 
-#: utils/misc/guc_tables.c:1955
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "Включить JIT-компиляцию выражений."
 
-#: utils/misc/guc_tables.c:1966
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "Регистрировать JIT-компилируемые функции в профилировщике perf."
 
-#: utils/misc/guc_tables.c:1983
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "Разрешить JIT-компиляцию кода преобразования кортежей."
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "Продолжать работу после ошибки при сохранении файлов данных на диске."
 
-#: utils/misc/guc_tables.c:2003
+#: utils/misc/guc_tables.c:2111
 msgid ""
 "Sets whether a WAL receiver should create a temporary replication slot if no "
 "permanent slot is configured."
@@ -32596,17 +34236,17 @@ msgstr ""
 "Определяет, должен ли приёмник WAL создавать временный слот репликации, если "
 "не настроен постоянный слот."
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
 msgstr "Включает событийные триггеры."
 
-#: utils/misc/guc_tables.c:2013
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr ""
 "При включении событийные триггеры будут срабатывать для всех операторов, для "
 "которых применимы."
 
-#: utils/misc/guc_tables.c:2022
+#: utils/misc/guc_tables.c:2130
 msgid ""
 "Enables a physical standby to synchronize logical failover replication slots "
 "from the primary server."
@@ -32614,28 +34254,43 @@ msgstr ""
 "Позволяет физической реплике синхронизировать переносимые слоты логической "
 "репликации с ведущего сервера."
 
-#: utils/misc/guc_tables.c:2040
+#: utils/misc/guc_tables.c:2139
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr "Включает предупреждения об устаревших паролях в MD5."
+
+#: utils/misc/guc_tables.c:2148
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "Включает отсечение пустых страниц в конце таблицы при очистке."
+
+#: utils/misc/guc_tables.c:2166
 msgid ""
 "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr ""
 "Задаёт время задержки перед принудительным переключением на следующий файл "
 "WAL."
 
-#: utils/misc/guc_tables.c:2051
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322
+#: utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752
+#: utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774
+#: utils/misc/guc_tables.c:2785
+msgid "0 disables the timeout."
+msgstr "0 отключает тай-аут."
+
+#: utils/misc/guc_tables.c:2177
 msgid ""
 "Sets the amount of time to wait after authentication on connection startup."
 msgstr ""
 "Задаёт время ожидания после аутентификации при установлении соединения."
 
-#: utils/misc/guc_tables.c:2053 utils/misc/guc_tables.c:2780
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "Это позволяет подключить к процессу отладчик."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "Устанавливает ориентир статистики по умолчанию."
 
-#: utils/misc/guc_tables.c:2063
+#: utils/misc/guc_tables.c:2189
 msgid ""
 "This applies to table columns that have not had a column-specific target set "
 "via ALTER TABLE SET STATISTICS."
@@ -32643,13 +34298,13 @@ msgstr ""
 "Это значение распространяется на столбцы таблицы, для которых ориентир "
 "статистики не задан явно через ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc_tables.c:2072
+#: utils/misc/guc_tables.c:2198
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
 "Задаёт предел для списка FROM, при превышении которого подзапросы не "
 "сворачиваются."
 
-#: utils/misc/guc_tables.c:2074
+#: utils/misc/guc_tables.c:2200
 msgid ""
 "The planner will merge subqueries into upper queries if the resulting FROM "
 "list would have no more than this many items."
@@ -32657,13 +34312,13 @@ msgstr ""
 "Планировщик объединит вложенные запросы с внешними, если в полученном списке "
 "FROM будет не больше заданного числа элементов."
 
-#: utils/misc/guc_tables.c:2085
+#: utils/misc/guc_tables.c:2211
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
 "Задаёт предел для списка FROM, при превышении которого конструкции JOIN "
 "сохраняются."
 
-#: utils/misc/guc_tables.c:2087
+#: utils/misc/guc_tables.c:2213
 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."
@@ -32671,34 +34326,34 @@ msgstr ""
 "Планировщик будет сносить явные конструкции JOIN в списки FROM, пока в "
 "результирующем списке не больше заданного числа элементов."
 
-#: utils/misc/guc_tables.c:2098
+#: utils/misc/guc_tables.c:2224
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr ""
 "Задаёт предел для списка FROM, при превышении которого применяется GEQO."
 
-#: utils/misc/guc_tables.c:2108
+#: utils/misc/guc_tables.c:2234
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr ""
 "GEQO: оценка усилий для планирования, задающая значения по умолчанию для "
 "других параметров GEQO."
 
-#: utils/misc/guc_tables.c:2118
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: число особей в популяции."
 
-#: utils/misc/guc_tables.c:2119 utils/misc/guc_tables.c:2129
-msgid "Zero selects a suitable default value."
-msgstr "При нуле выбирается подходящее значение по умолчанию."
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
+msgid "0 means use a suitable default value."
+msgstr "С 0 выбирается подходящее значение по умолчанию."
 
-#: utils/misc/guc_tables.c:2128
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: число итераций алгоритма."
 
-#: utils/misc/guc_tables.c:2140
+#: utils/misc/guc_tables.c:2266
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Задаёт интервал ожидания в блокировке до проверки на взаимоблокировку."
 
-#: utils/misc/guc_tables.c:2151
+#: utils/misc/guc_tables.c:2277
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing archived WAL data."
@@ -32706,7 +34361,11 @@ msgstr ""
 "Задаёт максимальную задержку до отмены запроса, когда сервер горячего "
 "резерва обрабатывает данные WAL из архива."
 
-#: utils/misc/guc_tables.c:2162
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
+msgid "-1 means wait forever."
+msgstr "-1 означает бесконечное ожидание."
+
+#: utils/misc/guc_tables.c:2288
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing streamed WAL data."
@@ -32714,13 +34373,13 @@ msgstr ""
 "Задаёт максимальную задержку до отмены запроса, когда сервер горячего "
 "резерва обрабатывает данные WAL из потока."
 
-#: utils/misc/guc_tables.c:2173
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr ""
 "Задаёт минимальную задержку для применения изменений в процессе "
 "восстановления."
 
-#: utils/misc/guc_tables.c:2184
+#: utils/misc/guc_tables.c:2310
 msgid ""
 "Sets the maximum interval between WAL receiver status reports to the sending "
 "server."
@@ -32728,21 +34387,21 @@ msgstr ""
 "Задаёт максимальный интервал между отчётами о состоянии приёмника WAL, "
 "отправляемыми передающему серверу."
 
-#: utils/misc/guc_tables.c:2195
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr ""
 "Задаёт предельное время ожидания для получения данных от передающего сервера."
 
-#: utils/misc/guc_tables.c:2206
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Задаёт максимально возможное число подключений."
 
-#: utils/misc/guc_tables.c:2217
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr ""
 "Определяет, сколько слотов подключений забронировано для суперпользователей."
 
-#: utils/misc/guc_tables.c:2227
+#: utils/misc/guc_tables.c:2353
 msgid ""
 "Sets the number of connection slots reserved for roles with privileges of "
 "pg_use_reserved_connections."
@@ -32750,19 +34409,19 @@ msgstr ""
 "Определяет, сколько слотов подключений забронировано для ролей с правом "
 "pg_use_reserved_connections."
 
-#: utils/misc/guc_tables.c:2238
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "Объём динамической разделяемой памяти, резервируемый при запуске."
 
-#: utils/misc/guc_tables.c:2253
+#: utils/misc/guc_tables.c:2379
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Задаёт количество буферов в разделяемой памяти, используемых сервером."
 
-#: utils/misc/guc_tables.c:2264
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "Задаёт размер пула буферов для операций VACUUM, ANALYZE и автоочистки."
 
-#: utils/misc/guc_tables.c:2275
+#: utils/misc/guc_tables.c:2401
 msgid ""
 "Shows the size of the server's main shared memory area (rounded up to the "
 "nearest MB)."
@@ -32770,17 +34429,21 @@ msgstr ""
 "Показывает объём основной области общей памяти сервера (округляется до "
 "ближайшего значения в мегабайтах)."
 
-#: utils/misc/guc_tables.c:2286
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr ""
 "Показывает количество огромных страниц, необходимое для основной области "
 "общей памяти."
 
-#: utils/misc/guc_tables.c:2287
-msgid "-1 indicates that the value could not be determined."
-msgstr "Значение -1 показывает, что определить это количество не удалось."
+#: utils/misc/guc_tables.c:2413
+msgid "-1 means huge pages are not supported."
+msgstr "-1 означает, что огромные страницы не поддерживаются."
 
-#: utils/misc/guc_tables.c:2297
+#: utils/misc/guc_tables.c:2423
+msgid "Shows the number of semaphores required for the server."
+msgstr "Показывает, сколько семафоров требуется для сервера."
+
+#: utils/misc/guc_tables.c:2434
 msgid ""
 "Sets the size of the dedicated buffer pool used for the commit timestamp "
 "cache."
@@ -32788,13 +34451,12 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования времени "
 "фиксации транзакций."
 
-#: utils/misc/guc_tables.c:2298 utils/misc/guc_tables.c:2353
-#: utils/misc/guc_tables.c:2364
-msgid ""
-"Specify 0 to have this value determined as a fraction of shared_buffers."
-msgstr "При значении 0 это число определяется как процент от shared_buffers."
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490
+#: utils/misc/guc_tables.c:2501
+msgid "0 means use a fraction of \"shared_buffers\"."
+msgstr "0 означает — использовать процент от \"shared_buffers\"."
 
-#: utils/misc/guc_tables.c:2308
+#: utils/misc/guc_tables.c:2445
 msgid ""
 "Sets the size of the dedicated buffer pool used for the MultiXact member "
 "cache."
@@ -32802,7 +34464,7 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования "
 "членства в MultiXact."
 
-#: utils/misc/guc_tables.c:2319
+#: utils/misc/guc_tables.c:2456
 msgid ""
 "Sets the size of the dedicated buffer pool used for the MultiXact offset "
 "cache."
@@ -32810,7 +34472,7 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования "
 "смещений MultiXact."
 
-#: utils/misc/guc_tables.c:2330
+#: utils/misc/guc_tables.c:2467
 msgid ""
 "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY "
 "message cache."
@@ -32818,7 +34480,7 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования "
 "сообщений LISTEN/NOTIFY."
 
-#: utils/misc/guc_tables.c:2341
+#: utils/misc/guc_tables.c:2478
 msgid ""
 "Sets the size of the dedicated buffer pool used for the serializable "
 "transaction cache."
@@ -32826,14 +34488,14 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования "
 "сериализуемых транзакций."
 
-#: utils/misc/guc_tables.c:2352
+#: utils/misc/guc_tables.c:2489
 msgid ""
 "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования "
 "подтранзакций."
 
-#: utils/misc/guc_tables.c:2363
+#: utils/misc/guc_tables.c:2500
 msgid ""
 "Sets the size of the dedicated buffer pool used for the transaction status "
 "cache."
@@ -32841,19 +34503,19 @@ msgstr ""
 "Задаёт размер выделенного пула буферов, используемых для кеширования статуса "
 "транзакций."
 
-#: utils/misc/guc_tables.c:2374
+#: utils/misc/guc_tables.c:2511
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "Задаёт предельное число временных буферов на один сеанс."
 
-#: utils/misc/guc_tables.c:2385
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "Задаёт TCP-порт для работы сервера."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Задаёт права доступа для Unix-сокета."
 
-#: utils/misc/guc_tables.c:2396
+#: utils/misc/guc_tables.c:2533
 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 "
@@ -32865,11 +34527,11 @@ msgstr ""
 "воспринимаемом системными функциями chmod и umask. (Чтобы использовать "
 "привычный восьмеричный формат, добавьте в начало ноль (0).)"
 
-#: utils/misc/guc_tables.c:2410
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "Задаёт права доступа к файлам протоколов."
 
-#: utils/misc/guc_tables.c:2411
+#: utils/misc/guc_tables.c:2548
 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 "
@@ -32879,11 +34541,11 @@ msgstr ""
 "функциями chmod и umask. (Чтобы использовать привычный восьмеричный формат, "
 "добавьте в начало ноль (0).)"
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "Показывает режим каталога данных."
 
-#: utils/misc/guc_tables.c:2426
+#: utils/misc/guc_tables.c:2563
 msgid ""
 "The parameter value is a numeric mode specification in the form accepted by "
 "the chmod and umask system calls. (To use the customary octal format the "
@@ -32893,11 +34555,11 @@ msgstr ""
 "функциями chmod и umask. (Чтобы использовать привычный восьмеричный формат, "
 "добавьте в начало ноль (0).)"
 
-#: utils/misc/guc_tables.c:2439
+#: utils/misc/guc_tables.c:2576
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Задаёт предельный объём памяти для рабочих пространств запросов."
 
-#: utils/misc/guc_tables.c:2440
+#: utils/misc/guc_tables.c:2577
 msgid ""
 "This much memory can be used by each internal sort operation and hash table "
 "before switching to temporary disk files."
@@ -32905,19 +34567,19 @@ msgstr ""
 "Такой объём памяти может использоваться каждой внутренней операцией "
 "сортировки и таблицей хешей до переключения на временные файлы на диске."
 
-#: utils/misc/guc_tables.c:2457
+#: utils/misc/guc_tables.c:2594
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Задаёт предельный объём памяти для операций по обслуживанию."
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Подразумеваются в частности операции VACUUM и CREATE INDEX."
 
-#: utils/misc/guc_tables.c:2468
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "Задаёт предельный объём памяти для логического декодирования."
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2606
 msgid ""
 "This much memory can be used by each internal reorder buffer before spilling "
 "to disk."
@@ -32925,86 +34587,85 @@ msgstr ""
 "Такой объём памяти может использоваться каждым внутренним буфером "
 "пересортировки до вымещения данных на диск."
 
-#: utils/misc/guc_tables.c:2485
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Задаёт максимальную глубину стека (в КБ)."
 
-#: utils/misc/guc_tables.c:2496
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr ""
 "Ограничивает общий размер всех временных файлов, доступный для каждого "
 "процесса."
 
-#: utils/misc/guc_tables.c:2497
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1 отключает ограничение."
 
-#: utils/misc/guc_tables.c:2507
+#: utils/misc/guc_tables.c:2644
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Стоимость очистки для страницы, найденной в кеше."
 
-#: utils/misc/guc_tables.c:2517
+#: utils/misc/guc_tables.c:2654
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Стоимость очистки для страницы, не найденной в кеше."
 
-#: utils/misc/guc_tables.c:2527
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Стоимость очистки для страницы, которая не была \"грязной\"."
 
-#: utils/misc/guc_tables.c:2537
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr "Суммарная стоимость очистки, при которой нужна передышка."
 
-#: utils/misc/guc_tables.c:2547
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr ""
 "Суммарная стоимость очистки, при которой нужна передышка, для автоочистки."
 
-#: utils/misc/guc_tables.c:2557
+#: utils/misc/guc_tables.c:2685
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1 означает — использовать \"vacuum_cost_limit\"."
+
+#: utils/misc/guc_tables.c:2694
 msgid ""
-"Sets the maximum number of simultaneously open files for each server process."
+"Sets the maximum number of files each server process is allowed to open "
+"simultaneously."
 msgstr ""
-"Задаёт предельное число одновременно открытых файлов для каждого серверного "
-"процесса."
+"Задаёт предельное число файлов, которые могут быть открыты каждым серверным "
+"процессом одновременно."
 
-#: utils/misc/guc_tables.c:2570
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Задаёт предельное число одновременно подготовленных транзакций."
 
-#: utils/misc/guc_tables.c:2581
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Задаёт минимальный OID таблиц, для которых отслеживаются блокировки."
 
-#: utils/misc/guc_tables.c:2582
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "Применяется для игнорирования системных таблиц."
 
-#: utils/misc/guc_tables.c:2591
+#: utils/misc/guc_tables.c:2728
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Задаёт OID таблицы для безусловного отслеживания блокировок."
 
-#: utils/misc/guc_tables.c:2603
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Задаёт предельную длительность для любого оператора."
 
-#: utils/misc/guc_tables.c:2604 utils/misc/guc_tables.c:2615
-#: utils/misc/guc_tables.c:2626 utils/misc/guc_tables.c:2637
-#: utils/misc/guc_tables.c:2648
-msgid "A value of 0 turns off the timeout."
-msgstr "Нулевое значение отключает тайм-аут."
-
-#: utils/misc/guc_tables.c:2614
+#: utils/misc/guc_tables.c:2751
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Задаёт максимальную продолжительность ожидания блокировок."
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2762
 msgid ""
 "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr ""
 "Задаёт предельно допустимую длительность простоя между запросами в "
 "транзакции."
 
-#: utils/misc/guc_tables.c:2636
+#: utils/misc/guc_tables.c:2773
 msgid ""
 "Sets the maximum allowed duration of any transaction within a session (not a "
 "prepared transaction)."
@@ -33012,7 +34673,7 @@ msgstr ""
 "Задаёт предельно допустимую длительность для любых транзакций в сеансе "
 "(кроме подготовленных)."
 
-#: utils/misc/guc_tables.c:2647
+#: utils/misc/guc_tables.c:2784
 msgid ""
 "Sets the maximum allowed idle time between queries, when not in a "
 "transaction."
@@ -33020,37 +34681,37 @@ msgstr ""
 "Задаёт предельно допустимую длительность простоя между запросами вне "
 "транзакций."
 
-#: utils/misc/guc_tables.c:2658
+#: utils/misc/guc_tables.c:2795
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr ""
 "Минимальный возраст строк таблицы, при котором VACUUM может их заморозить."
 
-#: utils/misc/guc_tables.c:2668
+#: utils/misc/guc_tables.c:2805
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 "Возраст, при котором VACUUM должен сканировать всю таблицу с целью "
 "заморозить кортежи."
 
-#: utils/misc/guc_tables.c:2678
+#: utils/misc/guc_tables.c:2815
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr ""
 "Минимальный возраст, при котором VACUUM будет замораживать MultiXactId в "
 "строке таблицы."
 
-#: utils/misc/guc_tables.c:2688
+#: utils/misc/guc_tables.c:2825
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 "Возраст multixact, при котором VACUUM должен сканировать всю таблицу с целью "
 "заморозить кортежи."
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2835
 msgid ""
 "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr ""
 "Возраст, при котором VACUUM должен включить защиту от зацикливания во "
 "избежание отказа."
 
-#: utils/misc/guc_tables.c:2707
+#: utils/misc/guc_tables.c:2844
 msgid ""
 "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound "
 "outage."
@@ -33058,11 +34719,11 @@ msgstr ""
 "Возраст мультитранзакций, при котором VACUUM должен включить защиту от "
 "зацикливания во избежание отказа."
 
-#: utils/misc/guc_tables.c:2720
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Задаёт предельное число блокировок на транзакцию."
 
-#: utils/misc/guc_tables.c:2721
+#: utils/misc/guc_tables.c:2858
 msgid ""
 "The shared lock table is sized on the assumption that at most "
 "\"max_locks_per_transaction\" objects per server process or prepared "
@@ -33073,11 +34734,11 @@ msgstr ""
 "\"max_locks_per_transaction\" объектов для одного серверного процесса или "
 "подготовленной транзакции."
 
-#: utils/misc/guc_tables.c:2732
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Задаёт предельное число предикатных блокировок на транзакцию."
 
-#: utils/misc/guc_tables.c:2733
+#: utils/misc/guc_tables.c:2870
 msgid ""
 "The shared predicate lock table is sized on the assumption that at most "
 "\"max_pred_locks_per_transaction\" objects per server process or prepared "
@@ -33088,14 +34749,14 @@ msgstr ""
 "\"max_pred_locks_per_transaction\" объектов для одного серверного процесса "
 "или подготовленной транзакции."
 
-#: utils/misc/guc_tables.c:2744
+#: utils/misc/guc_tables.c:2881
 msgid ""
 "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr ""
 "Задаёт максимальное число страниц и кортежей, блокируемых предикатными "
 "блокировками в одном отношении."
 
-#: utils/misc/guc_tables.c:2745
+#: utils/misc/guc_tables.c:2882
 msgid ""
 "If more than this total of pages and tuples in the same relation are locked "
 "by a connection, those locks are replaced by a relation-level lock."
@@ -33103,13 +34764,13 @@ msgstr ""
 "Если одним соединением блокируется больше этого общего числа страниц и "
 "кортежей, эти блокировки заменяются блокировкой на уровне отношения."
 
-#: utils/misc/guc_tables.c:2755
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr ""
 "Задаёт максимальное число кортежей, блокируемых предикатными блокировками в "
 "одной странице."
 
-#: utils/misc/guc_tables.c:2756
+#: utils/misc/guc_tables.c:2893
 msgid ""
 "If more than this number of tuples on the same page are locked by a "
 "connection, those locks are replaced by a page-level lock."
@@ -33117,50 +34778,50 @@ msgstr ""
 "Если одним соединением блокируется больше этого числа кортежей на одной "
 "странице, эти блокировки заменяются блокировкой на уровне страницы."
 
-#: utils/misc/guc_tables.c:2766
+#: utils/misc/guc_tables.c:2903
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Ограничивает время, за которое клиент должен пройти аутентификацию."
 
-#: utils/misc/guc_tables.c:2778
+#: utils/misc/guc_tables.c:2915
 msgid ""
 "Sets the amount of time to wait before authentication on connection startup."
 msgstr "Задаёт время ожидания до аутентификации при установлении соединения."
 
-#: utils/misc/guc_tables.c:2790
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr ""
 "Задаёт максимальное число страниц, выделяемых для очереди NOTIFY / LISTEN."
 
-#: utils/misc/guc_tables.c:2800
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "Размер буфера для упреждающего чтения WAL во время восстановления."
 
-#: utils/misc/guc_tables.c:2801
+#: utils/misc/guc_tables.c:2938
 msgid ""
 "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr ""
 "Максимальный объём WAL, прочитываемый наперёд для осуществления предвыборки "
 "изменяемых блоков данных."
 
-#: utils/misc/guc_tables.c:2811
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr ""
 "Определяет предельный объём файлов WAL, сохраняемых для резервных серверов."
 
-#: utils/misc/guc_tables.c:2822
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Задаёт минимальный размер WAL при сжатии."
 
-#: utils/misc/guc_tables.c:2834
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Задаёт размер WAL, при котором инициируется контрольная точка."
 
-#: utils/misc/guc_tables.c:2846
+#: utils/misc/guc_tables.c:2983
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr ""
 "Задаёт максимальное время между автоматическими контрольными точками WAL."
 
-#: utils/misc/guc_tables.c:2857
+#: utils/misc/guc_tables.c:2994
 msgid ""
 "Sets the maximum time before warning if checkpoints triggered by WAL volume "
 "happen too frequently."
@@ -33168,77 +34829,90 @@ msgstr ""
 "Задаёт максимальный интервал, в котором выдаётся предупреждение о том, что "
 "контрольные точки, вызванные активностью WAL, происходят слишком часто."
 
-#: utils/misc/guc_tables.c:2859
+#: utils/misc/guc_tables.c:2996
 msgid ""
 "Write a message to the server log if checkpoints caused by the filling of "
-"WAL segment files happen more frequently than this amount of time. Zero "
-"turns off the warning."
+"WAL segment files happen more frequently than this amount of time. 0 "
+"disables the warning."
 msgstr ""
 "В журнал сервера будет записываться сообщение, когда интервал между "
 "контрольными точками, вызванными заполнением файлов сегментов WAL, меньше "
-"заданного значения. Нулевое значение отключает эти предупреждения."
+"заданного значения. 0 отключает эти предупреждения."
 
-#: utils/misc/guc_tables.c:2872 utils/misc/guc_tables.c:3090
-#: utils/misc/guc_tables.c:3144
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239
+#: utils/misc/guc_tables.c:3331
 msgid ""
 "Number of pages after which previously performed writes are flushed to disk."
 msgstr ""
 "Число страниц, по достижении которого ранее выполненные операции записи "
 "сбрасываются на диск."
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240
+#: utils/misc/guc_tables.c:3332
+msgid "0 disables forced writeback."
+msgstr "0 отключает принудительную запись."
+
+#: utils/misc/guc_tables.c:3020
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Задаёт число буферов дисковых страниц в разделяемой памяти для WAL."
 
-#: utils/misc/guc_tables.c:2884
-msgid ""
-"Specify -1 to have this value determined as a fraction of shared_buffers."
-msgstr "При значении -1 это число определяется как процент от shared_buffers."
+#: utils/misc/guc_tables.c:3021
+msgid "-1 means use a fraction of \"shared_buffers\"."
+msgstr "-1 означает — использовать процент от \"shared_buffers\"."
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "Задержка между сбросом WAL в процессе, записывающем WAL."
 
-#: utils/misc/guc_tables.c:2905
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr ""
 "Объём WAL, обработанный пишущим WAL процессом, при котором инициируется "
 "сброс журнала на диск."
 
-#: utils/misc/guc_tables.c:2916
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr ""
 "Размер нового файла, при достижении которого файл не пишется в WAL, а "
 "сбрасывается на диск."
 
-#: utils/misc/guc_tables.c:2927
+#: utils/misc/guc_tables.c:3064
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr ""
 "Задаёт предельное число одновременно работающих процессов передачи WAL."
 
-#: utils/misc/guc_tables.c:2938
+#: utils/misc/guc_tables.c:3075
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Задаёт предельное число одновременно существующих слотов репликации."
 
-#: utils/misc/guc_tables.c:2948
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr ""
 "Задаёт максимальный размер WAL, который могут резервировать слоты репликации."
 
-#: utils/misc/guc_tables.c:2949
+#: utils/misc/guc_tables.c:3086
 msgid ""
 "Replication slots will be marked as failed, and segments released for "
-"deletion or recycling, if this much space is occupied by WAL on disk."
+"deletion or recycling, if this much space is occupied by WAL on disk. -1 "
+"means no maximum."
 msgstr ""
 "Если объём WAL на диске достигнет этого значения, слоты репликации будут "
 "помечены как нерабочие, а сегменты будут освобождены для удаления или "
-"переработки."
+"переработки. -1 означает отсутствие такого предела."
 
-#: utils/misc/guc_tables.c:2961
+#: utils/misc/guc_tables.c:3098
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "Задаёт предельное время ожидания репликации WAL."
 
-#: utils/misc/guc_tables.c:2972
+#: utils/misc/guc_tables.c:3109
+msgid ""
+"Sets the duration a replication slot can remain idle before it is "
+"invalidated."
+msgstr ""
+"Задаёт время, в течение которого слот репликации может простаивать, прежде "
+"чем он аннулируется."
+
+#: utils/misc/guc_tables.c:3121
 msgid ""
 "Sets the delay in microseconds between transaction commit and flushing WAL "
 "to disk."
@@ -33246,7 +34920,7 @@ msgstr ""
 "Задаёт задержку в микросекундах между фиксированием транзакций и сбросом WAL "
 "на диск."
 
-#: utils/misc/guc_tables.c:2984
+#: utils/misc/guc_tables.c:3133
 msgid ""
 "Sets the minimum number of concurrent open transactions required before "
 "performing \"commit_delay\"."
@@ -33254,11 +34928,11 @@ msgstr ""
 "Задаёт минимальное число одновременно открытых транзакций, которое требуется "
 "для применения \"commit_delay\"."
 
-#: utils/misc/guc_tables.c:2995
+#: utils/misc/guc_tables.c:3144
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Задаёт число выводимых цифр для чисел с плавающей точкой."
 
-#: utils/misc/guc_tables.c:2996
+#: utils/misc/guc_tables.c:3145
 msgid ""
 "This affects real, double precision, and geometric data types. A zero or "
 "negative parameter value is added to the standard number of digits (FLT_DIG "
@@ -33270,31 +34944,34 @@ msgstr ""
 "(FLT_DIG или DBL_DIG соответственно). Положительное значение включает режим "
 "точного вывода."
 
-#: utils/misc/guc_tables.c:3008
+#: utils/misc/guc_tables.c:3157
 msgid ""
 "Sets the minimum execution time above which a sample of statements will be "
-"logged. Sampling is determined by log_statement_sample_rate."
+"logged. Sampling is determined by \"log_statement_sample_rate\"."
 msgstr ""
 "Задаёт предельное время выполнения оператора из выборки, при превышении "
 "которого он выводится в журнал. Выборка определяется параметром "
-"log_statement_sample_rate."
+"\"log_statement_sample_rate\"."
 
-#: utils/misc/guc_tables.c:3011
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "При 0 выводятся все запросы в выборке; -1 отключает эти сообщения."
+#: utils/misc/guc_tables.c:3160
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr "-1 отключает выборку. 0 означает — выбирать все операторы."
 
-#: utils/misc/guc_tables.c:3021
+#: utils/misc/guc_tables.c:3170
 msgid ""
 "Sets the minimum execution time above which all statements will be logged."
 msgstr ""
 "Задаёт предельное время выполнения любого оператора, при превышении которого "
 "он выводится в журнал."
 
-#: utils/misc/guc_tables.c:3023
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "При 0 выводятся все запросы; -1 отключает эти сообщения."
+#: utils/misc/guc_tables.c:3172
+msgid ""
+"-1 disables logging statement durations. 0 means log all statement durations."
+msgstr ""
+"-1 отключает вывод продолжительности операторов. С 0 выводится длительность "
+"всех операторов."
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3182
 msgid ""
 "Sets the minimum execution time above which autovacuum actions will be "
 "logged."
@@ -33302,12 +34979,14 @@ msgstr ""
 "Задаёт предельное время выполнения автоочистки, при превышении которого эта "
 "операция протоколируется в журнале."
 
-#: utils/misc/guc_tables.c:3035
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
+#: utils/misc/guc_tables.c:3184
+msgid ""
+"-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
 msgstr ""
-"При 0 протоколируются все операции автоочистки; -1 отключает эти сообщения."
+"-1 отключает запись действий автоочистки. С 0 записываются все действия "
+"процесса автоочистки."
 
-#: utils/misc/guc_tables.c:3045
+#: utils/misc/guc_tables.c:3194
 msgid ""
 "Sets the maximum length in bytes of data logged for bind parameter values "
 "when logging statements."
@@ -33315,11 +34994,11 @@ msgstr ""
 "Задаёт максимальный размер данных (в байтах), выводимых в значениях "
 "привязанных параметров при протоколировании операторов."
 
-#: utils/misc/guc_tables.c:3047 utils/misc/guc_tables.c:3059
-msgid "-1 to print values in full."
-msgstr "При -1 значения выводятся полностью."
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
+msgid "-1 means log values in full."
+msgstr "-1 означает — выводить значения полностью."
 
-#: utils/misc/guc_tables.c:3057
+#: utils/misc/guc_tables.c:3206
 msgid ""
 "Sets the maximum length in bytes of data logged for bind parameter values "
 "when logging statements, on error."
@@ -33327,17 +35006,21 @@ msgstr ""
 "Задаёт максимальный размер данных (в байтах), выводимых в значениях "
 "привязанных параметров при протоколировании операторов в случае ошибки."
 
-#: utils/misc/guc_tables.c:3069
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr "Время простоя в процессе фоновой записи между подходами."
 
-#: utils/misc/guc_tables.c:3080
+#: utils/misc/guc_tables.c:3229
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
 "Максимальное число LRU-страниц, сбрасываемых за один подход, в процессе "
 "фоновой записи."
 
-#: utils/misc/guc_tables.c:3103
+#: utils/misc/guc_tables.c:3230
+msgid "0 disables background writing."
+msgstr "0 отключает фоновую запись."
+
+#: utils/misc/guc_tables.c:3252
 msgid ""
 "Number of simultaneous requests that can be handled efficiently by the disk "
 "subsystem."
@@ -33345,125 +35028,174 @@ msgstr ""
 "Число одновременных запросов, которые могут быть эффективно обработаны "
 "дисковой подсистемой."
 
-#: utils/misc/guc_tables.c:3117
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
+msgid "0 disables simultaneous requests."
+msgstr "0 отключает одновременные запросы."
+
+#: utils/misc/guc_tables.c:3266
 msgid ""
 "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr ""
 "Вариация параметра \"effective_io_concurrency\", предназначенная для "
 "операций обслуживания БД."
 
-#: utils/misc/guc_tables.c:3132
+#: utils/misc/guc_tables.c:3281
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr "Глобальный предел сервера, ограничивающий io_combine_limit."
+
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
 msgstr "Предельный размер для операций чтения и записи данных."
 
-#: utils/misc/guc_tables.c:3157
+#: utils/misc/guc_tables.c:3309
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr ""
+"Максимальное число операций ввода/вывода, которые могут выполняться "
+"одновременно одним процессом."
+
+#: utils/misc/guc_tables.c:3321
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr "Число рабочих процессов ввода/вывода, для io_method=worker."
+
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "Задаёт максимально возможное число рабочих процессов."
 
-#: utils/misc/guc_tables.c:3169
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr ""
 "Задаёт максимально возможное число рабочих процессов логической репликации."
 
-#: utils/misc/guc_tables.c:3181
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr ""
 "Задаёт максимально возможное число процессов синхронизации таблиц для одной "
 "подписки."
 
-#: utils/misc/guc_tables.c:3193
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr ""
 "Задаёт максимально возможное число параллельных применяющих процессов для "
 "одной подписки."
 
-#: utils/misc/guc_tables.c:3203
+#: utils/misc/guc_tables.c:3392
+msgid "Sets the maximum number of active replication origins."
+msgstr "Задаёт предельное число активных источников репликации."
+
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr ""
 "Задаёт время задержки перед принудительным переключением на следующий файл "
 "журнала."
 
-#: utils/misc/guc_tables.c:3215
+#: utils/misc/guc_tables.c:3404
+msgid "0 disables time-based creation of new log files."
+msgstr "0 отключает создание новых файлов журнала по времени."
+
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr ""
 "Задаёт максимальный размер, которого может достичь файл журнала до "
 "переключения на другой файл."
 
-#: utils/misc/guc_tables.c:3227
+#: utils/misc/guc_tables.c:3416
+msgid "0 disables size-based creation of new log files."
+msgstr "0 отключает создание новых файлов журнала по размеру."
+
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "Показывает максимально возможное число аргументов функций."
 
-#: utils/misc/guc_tables.c:3238
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "Показывает максимально возможное число ключей в индексе."
 
-#: utils/misc/guc_tables.c:3249
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "Показывает максимально возможную длину идентификатора."
 
-#: utils/misc/guc_tables.c:3260
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "Показывает размер дискового блока."
 
-#: utils/misc/guc_tables.c:3271
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "Показывает число страниц в одном файле."
 
-#: utils/misc/guc_tables.c:3282
+#: utils/misc/guc_tables.c:3481
 msgid "Shows the block size in the write ahead log."
 msgstr "Показывает размер блока в журнале WAL."
 
-#: utils/misc/guc_tables.c:3293
+#: utils/misc/guc_tables.c:3492
 msgid ""
 "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr ""
 "Задаёт время задержки перед повторной попыткой обращения к WAL после неудачи."
 
-#: utils/misc/guc_tables.c:3305
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "Показывает размер сегментов журнала предзаписи."
 
-#: utils/misc/guc_tables.c:3318
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
 msgstr "Время, в течение которого должны сохраняться файлы обобщения WAL."
 
-#: utils/misc/guc_tables.c:3331
+#: utils/misc/guc_tables.c:3518
+msgid "0 disables automatic summary file deletion."
+msgstr "0 отключает автоматическое удаление файлов обобщения."
+
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "Время простоя между запусками автоочистки."
 
-#: utils/misc/guc_tables.c:3341
+#: utils/misc/guc_tables.c:3540
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "Минимальное число изменений или удалений кортежей, вызывающее очистку."
 
-#: utils/misc/guc_tables.c:3350
-msgid ""
-"Minimum number of tuple inserts prior to vacuum, or -1 to disable insert "
-"vacuums."
+#: utils/misc/guc_tables.c:3549
+msgid "Maximum number of tuple updates or deletes prior to vacuum."
 msgstr ""
-"Минимальное число добавлений кортежей, вызывающее очистку; при -1 такая "
-"очистка отключается."
+"Максимальное число изменений или удалений кортежей, вызывающее очистку."
+
+#: utils/misc/guc_tables.c:3550
+msgid "-1 disables the maximum threshold."
+msgstr "-1 отключает максимальное ограничение."
+
+#: utils/misc/guc_tables.c:3558
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "Минимальное число добавлений кортежей, вызывающее очистку."
+
+#: utils/misc/guc_tables.c:3559
+msgid "-1 disables insert vacuums."
+msgstr "-1 отключает очистку при добавлении."
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3567
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr ""
 "Минимальное число добавлений, изменений или удалений кортежей, вызывающее "
 "анализ."
 
-#: utils/misc/guc_tables.c:3369
+#: utils/misc/guc_tables.c:3577
 msgid ""
 "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
 "Возраст, при котором необходима автоочистка таблицы для предотвращения "
 "зацикливания ID транзакций."
 
-#: utils/misc/guc_tables.c:3381
+#: utils/misc/guc_tables.c:3589
 msgid ""
 "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr ""
 "Возраст multixact, при котором необходима автоочистка таблицы для "
 "предотвращения зацикливания multixact."
 
-#: utils/misc/guc_tables.c:3391
+#: utils/misc/guc_tables.c:3599
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr ""
+"Задаёт число слотов обслуживающих процессов, выделяемых для процессов "
+"автоочистки."
+
+#: utils/misc/guc_tables.c:3608
 msgid ""
 "Sets the maximum number of simultaneously running autovacuum worker "
 "processes."
@@ -33471,70 +35203,78 @@ msgstr ""
 "Задаёт предельное число одновременно выполняющихся рабочих процессов "
 "автоочистки."
 
-#: utils/misc/guc_tables.c:3401
+#: utils/misc/guc_tables.c:3618
 msgid ""
 "Sets the maximum number of parallel processes per maintenance operation."
 msgstr ""
 "Задаёт максимальное число параллельных процессов на одну операцию "
 "обслуживания."
 
-#: utils/misc/guc_tables.c:3411
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "Задаёт максимальное число параллельных процессов на узел исполнителя."
 
-#: utils/misc/guc_tables.c:3422
+#: utils/misc/guc_tables.c:3639
 msgid ""
 "Sets the maximum number of parallel workers that can be active at one time."
 msgstr ""
 "Задаёт максимальное число параллельных исполнителей, которые могут быть "
 "активны одновременно."
 
-#: utils/misc/guc_tables.c:3433
+#: utils/misc/guc_tables.c:3650
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr ""
 "Задаёт предельный объём памяти для каждого рабочего процесса автоочистки."
 
-#: utils/misc/guc_tables.c:3444
+#: utils/misc/guc_tables.c:3651
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "-1 означает — использовать \"maintenance_work_mem\"."
+
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "Интервал между TCP-пакетами пульса (keep-alive)."
 
-#: utils/misc/guc_tables.c:3445 utils/misc/guc_tables.c:3456
-#: utils/misc/guc_tables.c:3580
-msgid "A value of 0 uses the system default."
-msgstr "При нулевом значении действует системный параметр."
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673
+#: utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
+msgid "0 means use the system default."
+msgstr "0 означает — использовать системное значение по умолчанию."
 
-#: utils/misc/guc_tables.c:3455
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "Интервал между повторениями TCP-пакетов пульса (keep-alive)."
 
-#: utils/misc/guc_tables.c:3466
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr ""
 "Повторное согласование SSL более не поддерживается; единственное допустимое "
 "значение - 0."
 
-#: utils/misc/guc_tables.c:3477
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Максимальное число повторений TCP-пакетов пульса (keep-alive)."
 
-#: utils/misc/guc_tables.c:3478
+#: utils/misc/guc_tables.c:3695
 msgid ""
 "Number of consecutive keepalive retransmits that can be lost before a "
-"connection is considered dead. A value of 0 uses the system default."
+"connection is considered dead. 0 means use the system default."
 msgstr ""
 "Количество идущих подряд пакетов пульса, которое может быть потеряно, прежде "
-"чем соединение будет считаться пропавшим. При нулевом значении действует "
+"чем соединение будет считаться пропавшим. 0 означает — использовать "
 "системный параметр."
 
-#: utils/misc/guc_tables.c:3489
+#: utils/misc/guc_tables.c:3706
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "Ограничивает результат точного поиска с использованием GIN."
 
-#: utils/misc/guc_tables.c:3500
+#: utils/misc/guc_tables.c:3707
+msgid "0 means no limit."
+msgstr "При 0 ограничение не действует."
+
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "Подсказывает планировщику примерный общий размер кешей данных."
 
-#: utils/misc/guc_tables.c:3501
+#: utils/misc/guc_tables.c:3717
 msgid ""
 "That is, the total size of the caches (kernel cache and shared buffers) used "
 "for PostgreSQL data files. This is measured in disk pages, which are "
@@ -33544,12 +35284,12 @@ msgstr ""
 "попадают файлы данных PostgreSQL. Размер задаётся в дисковых страницах "
 "(обычно это 8 КБ)."
 
-#: utils/misc/guc_tables.c:3512
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr ""
 "Задаёт минимальный объём данных в таблице для параллельного сканирования."
 
-#: utils/misc/guc_tables.c:3513
+#: utils/misc/guc_tables.c:3729
 msgid ""
 "If the planner estimates that it will read a number of table pages too small "
 "to reach this limit, a parallel scan will not be considered."
@@ -33558,12 +35298,12 @@ msgstr ""
 "задано этим ограничением, он исключает параллельное сканирование из "
 "рассмотрения."
 
-#: utils/misc/guc_tables.c:3523
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr ""
 "Задаёт минимальный объём данных в индексе для параллельного сканирования."
 
-#: utils/misc/guc_tables.c:3524
+#: utils/misc/guc_tables.c:3740
 msgid ""
 "If the planner estimates that it will read a number of index pages too small "
 "to reach this limit, a parallel scan will not be considered."
@@ -33572,68 +35312,77 @@ msgstr ""
 "задано этим ограничением, он исключает параллельное сканирование из "
 "рассмотрения."
 
-#: utils/misc/guc_tables.c:3535
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "Показывает версию сервера в виде целого числа."
 
-#: utils/misc/guc_tables.c:3546
+#: utils/misc/guc_tables.c:3762
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr ""
 "Фиксирует в протоколе превышение временными файлами заданного размера (в КБ)."
 
-#: utils/misc/guc_tables.c:3547
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#: utils/misc/guc_tables.c:3763
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
 msgstr ""
-"При 0 отмечаются все файлы; при -1 эти сообщения отключаются (по умолчанию)."
+"-1 отключает контроль размера временных файлов. 0 означает — фиксировать все "
+"временные файлы."
 
-#: utils/misc/guc_tables.c:3557
+#: utils/misc/guc_tables.c:3773
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Задаёт размер, резервируемый для pg_stat_activity.query (в байтах)."
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Задаёт максимальный размер списка-очереди для GIN-индекса."
 
-#: utils/misc/guc_tables.c:3579
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "Пользовательский таймаут TCP."
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "Запрашиваемый размер огромных страниц."
 
-#: utils/misc/guc_tables.c:3601
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "Включает агрессивный сброс системных кешей для целей отладки."
 
-#: utils/misc/guc_tables.c:3624
+#: utils/misc/guc_tables.c:3818
+msgid "0 means use normal caching behavior."
+msgstr "0 означает — применять обычный режим кеширования."
+
+#: utils/misc/guc_tables.c:3840
 msgid ""
 "Sets the time interval between checks for disconnection while running "
 "queries."
 msgstr ""
 "Задаёт интервал между проверками подключения во время выполнения запросов."
 
-#: utils/misc/guc_tables.c:3635
+#: utils/misc/guc_tables.c:3841
+msgid "0 disables connection checks."
+msgstr "0 отключает проверки подключения."
+
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr ""
 "Интервал между обновлениями состояния длительных операций, выполняемых при "
 "запуске."
 
-#: utils/misc/guc_tables.c:3637
-msgid "0 turns this feature off."
-msgstr "При 0 эта функциональность отключается."
+#: utils/misc/guc_tables.c:3853
+msgid "0 disables progress updates."
+msgstr "0 отключает обновления состояния."
 
-#: utils/misc/guc_tables.c:3647
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "Задаёт количество итераций для формирования секрета SCRAM."
 
-#: utils/misc/guc_tables.c:3667
+#: utils/misc/guc_tables.c:3883
 msgid ""
 "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr ""
 "Задаёт для планировщика ориентир стоимости последовательного чтения страницы."
 
-#: utils/misc/guc_tables.c:3678
+#: utils/misc/guc_tables.c:3894
 msgid ""
 "Sets the planner's estimate of the cost of a nonsequentially fetched disk "
 "page."
@@ -33641,13 +35390,13 @@ msgstr ""
 "Задаёт для планировщика ориентир стоимости непоследовательного чтения "
 "страницы."
 
-#: utils/misc/guc_tables.c:3689
+#: utils/misc/guc_tables.c:3905
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr ""
 "Задаёт для планировщика ориентир стоимости обработки каждого кортежа "
 "(строки)."
 
-#: utils/misc/guc_tables.c:3700
+#: utils/misc/guc_tables.c:3916
 msgid ""
 "Sets the planner's estimate of the cost of processing each index entry "
 "during an index scan."
@@ -33655,7 +35404,7 @@ msgstr ""
 "Задаёт для планировщика ориентир стоимости обработки каждого элемента "
 "индекса в процессе сканирования индекса."
 
-#: utils/misc/guc_tables.c:3711
+#: utils/misc/guc_tables.c:3927
 msgid ""
 "Sets the planner's estimate of the cost of processing each operator or "
 "function call."
@@ -33663,7 +35412,7 @@ msgstr ""
 "Задаёт для планировщика ориентир стоимости обработки каждого оператора или "
 "вызова функции."
 
-#: utils/misc/guc_tables.c:3722
+#: utils/misc/guc_tables.c:3938
 msgid ""
 "Sets the planner's estimate of the cost of passing each tuple (row) from "
 "worker to leader backend."
@@ -33671,7 +35420,7 @@ msgstr ""
 "Задаёт для планировщика ориентир стоимости передачи каждого кортежа (строки) "
 "ведущему процессу от рабочего."
 
-#: utils/misc/guc_tables.c:3733
+#: utils/misc/guc_tables.c:3949
 msgid ""
 "Sets the planner's estimate of the cost of starting up worker processes for "
 "parallel query."
@@ -33679,40 +35428,40 @@ msgstr ""
 "Задаёт для планировщика ориентир стоимости запуска рабочих процессов для "
 "параллельного выполнения запроса."
 
-#: utils/misc/guc_tables.c:3745
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "Стоимость запроса, при превышении которой производится JIT-компиляция."
 
-#: utils/misc/guc_tables.c:3746
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 отключает JIT-компиляцию."
 
-#: utils/misc/guc_tables.c:3756
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr ""
 "Стоимость запроса, при превышении которой оптимизируются JIT-"
 "скомпилированные функции."
 
-#: utils/misc/guc_tables.c:3757
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1 отключает оптимизацию."
 
-#: utils/misc/guc_tables.c:3767
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "Стоимость запроса, при которой выполняется встраивание JIT."
 
-#: utils/misc/guc_tables.c:3768
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 отключает встраивание кода."
 
-#: utils/misc/guc_tables.c:3778
+#: utils/misc/guc_tables.c:3994
 msgid ""
 "Sets the planner's estimate of the fraction of a cursor's rows that will be "
 "retrieved."
 msgstr ""
 "Задаёт для планировщика ориентир доли требуемых строк курсора в общем числе."
 
-#: utils/misc/guc_tables.c:3790
+#: utils/misc/guc_tables.c:4006
 msgid ""
 "Sets the planner's estimate of the average size of a recursive query's "
 "working table."
@@ -33720,37 +35469,41 @@ msgstr ""
 "Задаёт для планировщика ориентир среднего размера рабочей таблицы в "
 "рекурсивном запросе."
 
-#: utils/misc/guc_tables.c:3802
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: селективное давление в популяции."
 
-#: utils/misc/guc_tables.c:3813
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: отправное значение для случайного выбора пути."
 
-#: utils/misc/guc_tables.c:3824
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "Множитель \"work_mem\", определяющий объём памяти для хеш-таблиц."
 
-#: utils/misc/guc_tables.c:3835
+#: utils/misc/guc_tables.c:4051
 msgid "Multiple of the average buffer usage to free per round."
 msgstr ""
 "Множитель для среднего числа использованных буферов, определяющий число "
 "буферов, освобождаемых за один подход."
 
-#: utils/misc/guc_tables.c:3845
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "Задаёт отправное значение для генератора случайных чисел."
 
-#: utils/misc/guc_tables.c:3856
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Задержка очистки (в миллисекундах)."
 
-#: utils/misc/guc_tables.c:3867
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Задержка очистки для автоочистки (в миллисекундах)."
 
-#: utils/misc/guc_tables.c:3878
+#: utils/misc/guc_tables.c:4084
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr "-1 означает — использовать \"vacuum_cost_delay\"."
+
+#: utils/misc/guc_tables.c:4094
 msgid ""
 "Number of tuple updates or deletes prior to vacuum as a fraction of "
 "reltuples."
@@ -33758,13 +35511,13 @@ msgstr ""
 "Отношение числа обновлений или удалений кортежей к reltuples, определяющее "
 "потребность в очистке."
 
-#: utils/misc/guc_tables.c:3888
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr ""
 "Отношение числа добавлений кортежей к reltuples, определяющее потребность в "
 "очистке."
 
-#: utils/misc/guc_tables.c:3898
+#: utils/misc/guc_tables.c:4114
 msgid ""
 "Number of tuple inserts, updates, or deletes prior to analyze as a fraction "
 "of reltuples."
@@ -33772,7 +35525,7 @@ msgstr ""
 "Отношение числа добавлений, обновлений или удалений кортежей к reltuples, "
 "определяющее потребность в анализе."
 
-#: utils/misc/guc_tables.c:3908
+#: utils/misc/guc_tables.c:4124
 msgid ""
 "Time spent flushing dirty buffers during checkpoint, as fraction of "
 "checkpoint interval."
@@ -33780,26 +35533,26 @@ msgstr ""
 "Отношение продолжительности сброса \"грязных\" буферов во время контрольной "
 "точки к интервалу контрольных точек."
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:4134
 msgid ""
 "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr ""
 "Доля записываемых в журнал операторов с длительностью, превышающей "
 "\"log_min_duration_sample\"."
 
-#: utils/misc/guc_tables.c:3919
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr ""
 "Может задаваться значением от 0.0 (не записывать никакие операторы) и 1.0 "
 "(записывать все)."
 
-#: utils/misc/guc_tables.c:3928
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr ""
 "Задаёт долю транзакций, все операторы которых будут записываться в журнал "
 "сервера."
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:4145
 msgid ""
 "Use a value between 0.0 (never log) and 1.0 (log all statements for all "
 "transactions)."
@@ -33807,48 +35560,67 @@ msgstr ""
 "Значение 0.0 означает — не записывать никакие транзакции, а значение 1.0 — "
 "записывать все операторы всех транзакций."
 
-#: utils/misc/guc_tables.c:3948
+#: utils/misc/guc_tables.c:4155
+msgid ""
+"Fraction of pages in a relation vacuum can scan and fail to freeze before "
+"disabling eager scanning."
+msgstr ""
+"Процент страниц в отношении, которые могут быть просканированы безуспешно "
+"(не заморожены), прежде чем он прекратит инициативное сканирование."
+
+#: utils/misc/guc_tables.c:4156
+msgid ""
+"A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan "
+"up to 100 percent of the all-visible pages in the relation. If vacuum "
+"successfully freezes these pages, the cap is lower than 100 percent, because "
+"the goal is to amortize page freezing across multiple vacuums."
+msgstr ""
+"Значение 0.0 отключает инициативное сканирования, а с 1.0 будут инициативно "
+"сканироваться до 100 процентов всех видимых страниц в отношении. Если "
+"процесс очистки успешно замораживает страницы, максимальный процент их "
+"оказывается ниже 100, так как целью является распределение замораживания "
+"страниц между несколько операциями очистки."
+
+#: utils/misc/guc_tables.c:4174
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "Задаёт команду оболочки, вызываемую для архивации файла WAL."
 
-#: utils/misc/guc_tables.c:3949
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "Это параметр используется, только если не задан \"archive_library\"."
+#: utils/misc/guc_tables.c:4175
+msgid "An empty string means use \"archive_library\"."
+msgstr "Пустая строка означает — использовать \"archive_library\"."
 
-#: utils/misc/guc_tables.c:3958
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "Задаёт библиотеку, вызываемую для архивации файла WAL."
 
-#: utils/misc/guc_tables.c:3959
-msgid "An empty string indicates that \"archive_command\" should be used."
-msgstr ""
-"Пустая строка указывает, что должен использоваться параметр "
-"\"archive_command\"."
+#: utils/misc/guc_tables.c:4185
+msgid "An empty string means use \"archive_command\"."
+msgstr "Пустая строка означает — использовать \"archive_command\"."
 
-#: utils/misc/guc_tables.c:3968
+#: utils/misc/guc_tables.c:4194
 msgid ""
 "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr ""
 "Задаёт команду оболочки, которая будет вызываться для извлечения из архива "
 "файла WAL."
 
-#: utils/misc/guc_tables.c:3978
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr ""
 "Задаёт команду оболочки, которая будет выполняться при каждой точке "
 "перезапуска."
 
-#: utils/misc/guc_tables.c:3988
+#: utils/misc/guc_tables.c:4214
 msgid ""
 "Sets the shell command that will be executed once at the end of recovery."
 msgstr ""
 "Задаёт команду оболочки, которая будет выполняться в конце восстановления."
 
-#: utils/misc/guc_tables.c:3998
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "Указывает линию времени для выполнения восстановления."
 
-#: utils/misc/guc_tables.c:4008
+#: utils/misc/guc_tables.c:4234
 msgid ""
 "Set to \"immediate\" to end recovery as soon as a consistent state is "
 "reached."
@@ -33856,24 +35628,24 @@ msgstr ""
 "Задайте значение \"immediate\", чтобы восстановление остановилось сразу "
 "после достижения согласованного состояния."
 
-#: utils/misc/guc_tables.c:4017
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr ""
 "Задаёт идентификатор транзакции, вплоть до которой будет производиться "
 "восстановление."
 
-#: utils/misc/guc_tables.c:4026
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr ""
 "Задаёт момент времени, вплоть до которого будет производиться восстановление."
 
-#: utils/misc/guc_tables.c:4035
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr ""
 "Задаёт именованную точку восстановления, до которой будет производиться "
 "восстановление."
 
-#: utils/misc/guc_tables.c:4044
+#: utils/misc/guc_tables.c:4270
 msgid ""
 "Sets the LSN of the write-ahead log location up to which recovery will "
 "proceed."
@@ -33881,61 +35653,63 @@ msgstr ""
 "Задаёт в виде LSN позицию в журнале предзаписи, до которой будет "
 "производиться восстановление."
 
-#: utils/misc/guc_tables.c:4054
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr ""
 "Задаёт строку соединения, которая будет использоваться для подключения к "
 "передающему серверу."
 
-#: utils/misc/guc_tables.c:4065
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr ""
 "Задаёт имя слота репликации, который будет использоваться на передающем "
 "сервере."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "Задаёт кодировку символов, используемую клиентом."
 
-#: utils/misc/guc_tables.c:4086
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "Определяет содержимое префикса каждой строки протокола."
 
-#: utils/misc/guc_tables.c:4087
-msgid "If blank, no prefix is used."
-msgstr "При пустом значении префикс также отсутствует."
+#: utils/misc/guc_tables.c:4313
+msgid "An empty string means no prefix."
+msgstr "Пустая строка означает отсутствие префикса."
 
-#: utils/misc/guc_tables.c:4096
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "Задаёт часовой пояс для вывода времени в сообщениях протокола."
 
-#: utils/misc/guc_tables.c:4106
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "Устанавливает формат вывода дат и времени."
 
-#: utils/misc/guc_tables.c:4107
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Также помогает разбирать неоднозначно заданные вводимые даты."
 
-#: utils/misc/guc_tables.c:4118
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "Задаёт табличный метод доступа по умолчанию для новых таблиц."
 
-#: utils/misc/guc_tables.c:4129
+#: utils/misc/guc_tables.c:4355
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr ""
 "Задаёт табличное пространство по умолчанию для новых таблиц и индексов."
 
-#: utils/misc/guc_tables.c:4130
-msgid "An empty string selects the database's default tablespace."
-msgstr "При пустом значении используется табличное пространство базы данных."
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
+msgid "An empty string means use the database's default tablespace."
+msgstr ""
+"Пустая строка означает — использовать табличное пространство базы по "
+"умолчанию."
 
-#: utils/misc/guc_tables.c:4140
+#: utils/misc/guc_tables.c:4366
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr ""
 "Задаёт табличное пространство(а) для временных таблиц и файлов сортировки."
 
-#: utils/misc/guc_tables.c:4151
+#: utils/misc/guc_tables.c:4377
 msgid ""
 "Sets whether a CREATEROLE user automatically grants the role to themselves, "
 "and with which options."
@@ -33943,11 +35717,16 @@ msgstr ""
 "Определяет, будет ли пользователь CREATEROLE автоматически включать себя в "
 "создаваемую роль и с какими параметрами."
 
-#: utils/misc/guc_tables.c:4163
+# well-spelled: самоназначение
+#: utils/misc/guc_tables.c:4379
+msgid "An empty string disables automatic self grants."
+msgstr "Пустая строка отключает автоматическое самоназначение роли."
+
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Задаёт путь для динамически загружаемых модулей."
 
-#: utils/misc/guc_tables.c:4164
+#: utils/misc/guc_tables.c:4390
 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 "
@@ -33957,71 +35736,92 @@ msgstr ""
 "указан путь (нет символа '/'), система будет искать этот файл в заданном "
 "пути."
 
-#: utils/misc/guc_tables.c:4177
+#: utils/misc/guc_tables.c:4403
+msgid "Sets the path for extension control files."
+msgstr "Задаёт путь к управляющим файлам расширений."
+
+#: utils/misc/guc_tables.c:4404
+msgid ""
+"The remaining extension script and secondary control files are then loaded "
+"from the same directory where the primary control file was found."
+msgstr ""
+"Скрипт расширения и вторичные управляющие файлы загружаются из того же "
+"каталога, где найден главный управляющий файл."
+
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Задаёт размещение файла с ключом Kerberos для данного сервера."
 
-#: utils/misc/guc_tables.c:4188
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Задаёт название службы Bonjour."
 
-#: utils/misc/guc_tables.c:4198
+#: utils/misc/guc_tables.c:4427
+msgid "An empty string means use the computer name."
+msgstr "Пустая строка означает — использовать имя компьютера."
+
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "Задаёт язык выводимых сообщений."
 
-#: utils/misc/guc_tables.c:4208
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
+msgid "An empty string means use the operating system setting."
+msgstr "Пустая строка означает — использовать настройку операционной системы."
+
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Задаёт локаль для форматирования денежных сумм."
 
-#: utils/misc/guc_tables.c:4218
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "Задаёт локаль для форматирования чисел."
 
-#: utils/misc/guc_tables.c:4228
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "Задаёт локаль для форматирования дат и времени."
 
-#: utils/misc/guc_tables.c:4238
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr ""
 "Список разделяемых библиотек, заранее загружаемых в каждый обслуживающий "
 "процесс."
 
-#: utils/misc/guc_tables.c:4249
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "Список разделяемых библиотек, заранее загружаемых в память сервера."
 
-#: utils/misc/guc_tables.c:4260
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr ""
 "Список непривилегированных разделяемых библиотек, заранее загружаемых в "
 "каждый обслуживающий процесс."
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4509
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Задаёт порядок просмотра схемы при поиске неполных имён."
 
-#: utils/misc/guc_tables.c:4283
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "Показывает кодировку символов сервера (базы данных)."
 
-#: utils/misc/guc_tables.c:4295
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "Показывает версию сервера."
 
-#: utils/misc/guc_tables.c:4307
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "Задаёт текущую роль."
 
-#: utils/misc/guc_tables.c:4319
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "Задаёт имя пользователя в сеансе."
 
-#: utils/misc/guc_tables.c:4330
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "Определяет, куда будет выводиться протокол сервера."
 
-#: utils/misc/guc_tables.c:4331
+#: utils/misc/guc_tables.c:4569
 msgid ""
 "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", "
 "\"jsonlog\", and \"eventlog\", depending on the platform."
@@ -34029,24 +35829,24 @@ msgstr ""
 "Значение может включать сочетание слов \"stderr\", \"syslog\", \"csvlog\", "
 "\"jsonlog\" и \"eventlog\", в зависимости от платформы."
 
-#: utils/misc/guc_tables.c:4342
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "Задаёт целевой каталог для файлов протоколов."
 
-#: utils/misc/guc_tables.c:4343
+#: utils/misc/guc_tables.c:4581
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr ""
 "Путь может быть абсолютным или указываться относительно каталога данных."
 
-#: utils/misc/guc_tables.c:4353
+#: utils/misc/guc_tables.c:4591
 msgid "Sets the file name pattern for log files."
 msgstr "Задаёт шаблон имени для файлов протоколов."
 
-#: utils/misc/guc_tables.c:4364
+#: utils/misc/guc_tables.c:4602
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Задаёт имя программы для идентификации сообщений PostgreSQL в syslog."
 
-#: utils/misc/guc_tables.c:4375
+#: utils/misc/guc_tables.c:4613
 msgid ""
 "Sets the application name used to identify PostgreSQL messages in the event "
 "log."
@@ -34054,121 +35854,149 @@ msgstr ""
 "Задаёт имя приложения для идентификации сообщений PostgreSQL в журнале "
 "событий."
 
-#: utils/misc/guc_tables.c:4386
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr ""
 "Задаёт часовой пояс для вывода и разбора строкового представления времени."
 
-#: utils/misc/guc_tables.c:4396
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "Выбирает файл с сокращёнными названиями часовых поясов."
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Задаёт группу-владельца Unix-сокета."
 
-#: utils/misc/guc_tables.c:4407
+#: utils/misc/guc_tables.c:4645
 msgid ""
-"The owning user of the socket is always the user that starts the server."
+"The owning user of the socket is always the user that starts the server. An "
+"empty string means use the user's default group."
 msgstr ""
-"Собственно владельцем сокета всегда будет пользователь, запускающий сервер."
+"Собственно владельцем сокета всегда будет пользователь, запускающий сервер. "
+"Пустая строка означает — использовать группу пользователя по умолчанию."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4655
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Задаёт каталоги, где будут создаваться Unix-сокеты."
 
-#: utils/misc/guc_tables.c:4428
+#: utils/misc/guc_tables.c:4666
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Задаёт имя узла или IP-адрес(а) для привязки."
 
-#: utils/misc/guc_tables.c:4443
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "Определяет каталог данных сервера."
 
-#: utils/misc/guc_tables.c:4454
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "Определяет основной файл конфигурации сервера."
 
-#: utils/misc/guc_tables.c:4465
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Задаёт путь к файлу конфигурации \"hba\"."
 
-#: utils/misc/guc_tables.c:4476
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Задаёт путь к файлу конфигурации \"ident\"."
 
-#: utils/misc/guc_tables.c:4487
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Файл, в который будет записан код процесса postmaster."
 
-#: utils/misc/guc_tables.c:4498
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "Показывает имя библиотеки SSL."
 
-#: utils/misc/guc_tables.c:4513
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "Размещение файла сертификата сервера для SSL."
 
-#: utils/misc/guc_tables.c:4523
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "Размещение файла с закрытым ключом сервера для SSL."
 
-#: utils/misc/guc_tables.c:4533
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "Размещение файла центра сертификации для SSL."
 
-#: utils/misc/guc_tables.c:4543
+#: utils/misc/guc_tables.c:4781
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Размещение файла со списком отзыва сертификатов для SSL."
 
-#: utils/misc/guc_tables.c:4553
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "Размещение каталога со списками отзыва сертификатов для SSL."
 
-#: utils/misc/guc_tables.c:4563
+#: utils/misc/guc_tables.c:4801
 msgid ""
 "Number of synchronous standbys and list of names of potential synchronous "
 "ones."
 msgstr ""
 "Количество потенциально синхронных резервных серверов и список их имён."
 
-#: utils/misc/guc_tables.c:4574
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "Задаёт конфигурацию текстового поиска по умолчанию."
 
-#: utils/misc/guc_tables.c:4584
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Задаёт список допустимых алгоритмов шифрования для SSL."
+#: utils/misc/guc_tables.c:4822
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "Задаёт список допустимых комплектов шифрования для TLSv1.3."
+
+#: utils/misc/guc_tables.c:4823
+msgid "An empty string means use the default cipher suites."
+msgstr "Пустая строка означает — использовать комплекты шифров по умолчанию."
 
-#: utils/misc/guc_tables.c:4599
-msgid "Sets the curve to use for ECDH."
-msgstr "Задаёт кривую для ECDH."
+#: utils/misc/guc_tables.c:4833
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
+msgstr "Задаёт список допустимых шифров для TLSv1.2 (и ниже)."
 
-#: utils/misc/guc_tables.c:4614
+# well-spelled: Диффи
+# well-spelled: Хеллмана
+#: utils/misc/guc_tables.c:4848
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr ""
+"Задаёт группу или группы, используемые для обмена ключами Диффи-Хеллмана."
+
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr "Несколько групп можно указать в списке через двоеточие."
+
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "Размещение файла с параметрами SSL DH."
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4864
+msgid "An empty string means use compiled-in default parameters."
+msgstr ""
+"Пустая строка означает — использовать параметры по умолчанию, выбранные при "
+"компиляции."
+
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "Команда, позволяющая получить пароль для SSL."
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4875
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr ""
+"Пустая строка означает — использовать встроенный механизм запроса пароля."
+
+#: utils/misc/guc_tables.c:4885
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr ""
 "Задаёт имя приложения, которое будет выводиться в статистике и протоколах."
 
-#: utils/misc/guc_tables.c:4647
+#: utils/misc/guc_tables.c:4896
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "Задаёт имя кластера, которое будет добавляться в название процесса."
 
-#: utils/misc/guc_tables.c:4658
+#: utils/misc/guc_tables.c:4907
 msgid ""
 "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr ""
 "Задаёт перечень менеджеров ресурсов WAL, для которых выполняются проверки "
 "целостности WAL."
 
-#: utils/misc/guc_tables.c:4659
+#: utils/misc/guc_tables.c:4908
 msgid ""
 "Full-page images will be logged for all data blocks and cross-checked "
 "against the results of WAL replay."
@@ -34176,19 +36004,23 @@ msgstr ""
 "При этом в журнал будут записываться образы полных страниц для всех блоков "
 "данных для сверки с результатами воспроизведения WAL."
 
-#: utils/misc/guc_tables.c:4669
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "Используемый провайдер JIT."
 
-#: utils/misc/guc_tables.c:4680
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "Записывать в журнал стек в случае ошибок в перечисленных функциях."
 
-#: utils/misc/guc_tables.c:4691
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "Использовать прямой ввод/вывод для работы с файлами."
 
-#: utils/misc/guc_tables.c:4702
+#: utils/misc/guc_tables.c:4941
+msgid "An empty string disables direct I/O."
+msgstr "Пустая строка отключает прямой ввод/вывод."
+
+#: utils/misc/guc_tables.c:4951
 msgid ""
 "Lists streaming replication standby server replication slot names that "
 "logical WAL sender processes will wait for."
@@ -34196,7 +36028,7 @@ msgstr ""
 "Определяет список имён слотов потовой репликации, готовности которых будут "
 "ждать процессы передачи логических изменений."
 
-#: utils/misc/guc_tables.c:4704
+#: utils/misc/guc_tables.c:4953
 msgid ""
 "Logical WAL sender processes will send decoded changes to output plugins "
 "only after the specified replication slots have confirmed receiving WAL."
@@ -34205,24 +36037,34 @@ msgstr ""
 "декодированные изменения модулям вывода только после того, как указанные "
 "слоты репликации подтвердят получение WAL."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4965
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr "Запрещает доступ к несистемным отношениям указанных видов."
 
-#: utils/misc/guc_tables.c:4736
+#: utils/misc/guc_tables.c:4976
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr ""
+"Определяет список библиотек, которые могут вызываться для проверки токенов "
+"предъявителя в OAuth v2."
+
+#: utils/misc/guc_tables.c:4987
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr "Выводит выбранные сведения об установлении и подготовке соединения."
+
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Определяет, можно ли использовать \"\\'\" в текстовых строках."
 
-#: utils/misc/guc_tables.c:4746
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "Задаёт формат вывода данных типа bytea."
 
-#: utils/misc/guc_tables.c:4756
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "Ограничивает уровень сообщений, передаваемых клиенту."
 
-#: utils/misc/guc_tables.c:4757 utils/misc/guc_tables.c:4853
-#: utils/misc/guc_tables.c:4864
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125
+#: utils/misc/guc_tables.c:5136
 msgid ""
 "Each level includes all the levels that follow it. The later the level, the "
 "fewer messages are sent."
@@ -34230,16 +36072,16 @@ msgstr ""
 "Каждый уровень включает все последующие. Чем выше уровень, тем меньше "
 "сообщений."
 
-#: utils/misc/guc_tables.c:4767
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "Включает внутреннее вычисление идентификаторов запросов."
 
-#: utils/misc/guc_tables.c:4777
+#: utils/misc/guc_tables.c:5049
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr ""
 "Разрешает планировщику оптимизировать запросы, полагаясь на ограничения."
 
-#: utils/misc/guc_tables.c:4778
+#: utils/misc/guc_tables.c:5050
 msgid ""
 "Table scans will be skipped if their constraints guarantee that no rows "
 "match the query."
@@ -34247,88 +36089,88 @@ msgstr ""
 "Сканирование таблицы не будет выполняться, если её ограничения гарантируют, "
 "что запросу не удовлетворяют никакие строки."
 
-#: utils/misc/guc_tables.c:4789
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "Задаёт выбираемый по умолчанию метод сжатия для сжимаемых значений."
 
-#: utils/misc/guc_tables.c:4800
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Задаёт уровень изоляции транзакций для новых транзакций."
 
-#: utils/misc/guc_tables.c:4810
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "Задаёт текущий уровень изоляции транзакций."
 
-#: utils/misc/guc_tables.c:4821
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "Задаёт формат отображения для внутренних значений."
 
-#: utils/misc/guc_tables.c:4832
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "Уровень протоколирования сообщений о некорректных строках локалей ICU."
 
-#: utils/misc/guc_tables.c:4842
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "Задаёт детализацию протоколируемых сообщений."
 
-#: utils/misc/guc_tables.c:4852
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "Ограничивает уровни протоколируемых сообщений."
 
-#: utils/misc/guc_tables.c:4863
+#: utils/misc/guc_tables.c:5135
 msgid ""
 "Causes all statements generating error at or above this level to be logged."
 msgstr ""
 "Включает протоколирование для SQL-операторов, выполненных с ошибкой этого "
 "или большего уровня."
 
-#: utils/misc/guc_tables.c:4874
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "Задаёт тип протоколируемых операторов."
 
-#: utils/misc/guc_tables.c:4884
+#: utils/misc/guc_tables.c:5156
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "Задаёт получателя сообщений, отправляемых в syslog."
 
-#: utils/misc/guc_tables.c:4895
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr ""
 "Задаёт режим срабатывания триггеров и правил перезаписи для текущего сеанса."
 
-#: utils/misc/guc_tables.c:4905
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "Задаёт уровень синхронизации текущей транзакции."
 
-#: utils/misc/guc_tables.c:4915
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "Разрешает архивацию файлов WAL с использованием \"archive_command\"."
 
-#: utils/misc/guc_tables.c:4925
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr ""
 "Задаёт действие, которое будет выполняться по достижении цели восстановления."
 
-#: utils/misc/guc_tables.c:4935
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "Включает сбор статистики активности в БД на уровне функций."
 
-#: utils/misc/guc_tables.c:4946
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "Задаёт режим согласования доступа к данным статистики."
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "Сжимать данные записываемых в WAL полных страниц заданным методом."
 
-#: utils/misc/guc_tables.c:4966
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "Задаёт уровень информации, записываемой в WAL."
 
-#: utils/misc/guc_tables.c:4976
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Выбирает используемую реализацию динамической разделяемой памяти."
 
-#: utils/misc/guc_tables.c:4986
+#: utils/misc/guc_tables.c:5258
 msgid ""
 "Selects the shared memory implementation used for the main shared memory "
 "region."
@@ -34336,15 +36178,23 @@ msgstr ""
 "Выбирает реализацию разделяемой памяти для управления основным блоком "
 "разделяемой памяти."
 
-#: utils/misc/guc_tables.c:4996
+#: utils/misc/guc_tables.c:5268
+msgid "Selects the file copy method."
+msgstr "Выбирает метод копирования файлов."
+
+#: utils/misc/guc_tables.c:5278
+msgid "Selects the method used for extending data files."
+msgstr "Выбирает метод для расширения файлов данных."
+
+#: utils/misc/guc_tables.c:5288
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "Выбирает метод принудительной записи изменений в WAL на диск."
 
-#: utils/misc/guc_tables.c:5006
+#: utils/misc/guc_tables.c:5298
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "Определяет, как должны кодироваться двоичные значения в XML."
 
-#: utils/misc/guc_tables.c:5016
+#: utils/misc/guc_tables.c:5308
 msgid ""
 "Sets whether XML data in implicit parsing and serialization operations is to "
 "be considered as documents or content fragments."
@@ -34352,27 +36202,27 @@ msgstr ""
 "Определяет, следует ли рассматривать XML-данные в неявных операциях разбора "
 "и сериализации как документы или как фрагменты содержания."
 
-#: utils/misc/guc_tables.c:5027
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Включает использование огромных страниц в Linux и в Windows."
 
-#: utils/misc/guc_tables.c:5037
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
 msgstr "Показывает состояние использования огромных страниц."
 
-#: utils/misc/guc_tables.c:5048
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "Осуществлять предвыборку изменяемых блоков в процессе восстановления."
 
-#: utils/misc/guc_tables.c:5049
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "Прочитывать WAL наперёд для вычисления ещё не кешированных блоков."
 
-#: utils/misc/guc_tables.c:5058
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "Принудительно включает в планировщике узлы параллельного выполнения."
 
-#: utils/misc/guc_tables.c:5059
+#: utils/misc/guc_tables.c:5351
 msgid ""
 "This can be useful for testing the parallel query infrastructure by forcing "
 "the planner to generate plans that contain nodes that perform tuple "
@@ -34382,15 +36232,15 @@ msgstr ""
 "выполнения, так как планировщик будет строить планы с передачей кортежей "
 "между параллельными исполнителями и основным процессом."
 
-#: utils/misc/guc_tables.c:5071
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "Выбирает алгоритм шифрования паролей."
 
-#: utils/misc/guc_tables.c:5081
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "Управляет выбором специализированных или общих планов планировщиком."
 
-#: utils/misc/guc_tables.c:5082
+#: utils/misc/guc_tables.c:5374
 msgid ""
 "Prepared statements can have custom and generic plans, and the planner will "
 "attempt to choose which is better.  This can be set to override the default "
@@ -34400,30 +36250,30 @@ msgstr ""
 "планы, и планировщик пытается выбрать лучший вариант. Этот параметр "
 "позволяет переопределить поведение по умолчанию."
 
-#: utils/misc/guc_tables.c:5094
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr ""
 "Задаёт минимальную версию протокола SSL/TLS, которая может использоваться."
 
-#: utils/misc/guc_tables.c:5106
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr ""
 "Задаёт максимальную версию протокола SSL/TLS, которая может использоваться."
 
-#: utils/misc/guc_tables.c:5118
+#: utils/misc/guc_tables.c:5410
 msgid ""
 "Sets the method for synchronizing the data directory before crash recovery."
 msgstr ""
 "Задаёт метод синхронизации каталога данных перед восстановления после сбоя."
 
-#: utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5419
 msgid ""
 "Forces immediate streaming or serialization of changes in large transactions."
 msgstr ""
 "Включает непосредственную передачу или сериализацию изменений в больших "
 "транзакциях."
 
-#: utils/misc/guc_tables.c:5128
+#: utils/misc/guc_tables.c:5420
 msgid ""
 "On the publisher, it allows streaming or serializing each change in logical "
 "decoding. On the subscriber, it allows serialization of all changes to files "
@@ -34436,6 +36286,10 @@ msgstr ""
 "файлы и уведомления применяющих процессов о необходимости прочитать и "
 "применить изменения в конце транзакции."
 
+#: utils/misc/guc_tables.c:5432
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "Выбирает метод для выполнения асинхронного ввода/вывода."
+
 #: utils/misc/help_config.c:129
 #, c-format
 msgid "internal error: unrecognized run-time parameter type\n"
@@ -34471,6 +36325,35 @@ msgstr ""
 "Чтобы отключить политику для владельца таблицы, воспользуйтесь командой "
 "ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
+#: utils/misc/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "превышен предел глубины стека"
+
+#: utils/misc/stack_depth.c:102
+#, c-format
+msgid ""
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
+msgstr ""
+"Увеличьте параметр конфигурации \"max_stack_depth\" (текущее значение %d "
+"КБ), предварительно убедившись, что ОС предоставляет достаточный размер "
+"стека."
+
+#: utils/misc/stack_depth.c:149
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "Значение \"max_stack_depth\" не должно превышать %zd КБ."
+
+#: utils/misc/stack_depth.c:151
+#, c-format
+msgid ""
+"Increase the platform's stack depth limit via \"ulimit -s\" or local "
+"equivalent."
+msgstr ""
+"Увеличьте предел глубины стека в системе с помощью команды \"ulimit -s\" или "
+"эквивалента в вашей ОС."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -34492,37 +36375,37 @@ msgstr ""
 "смещение часового пояса %d выходит за рамки (файл часовых поясов \"%s\", "
 "строка %d)"
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr ""
 "отсутствует краткое обозначение часового пояса (файл часовых поясов \"%s\", "
 "строка %d)"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr ""
 "отсутствует смещение часового пояса (файл часовых поясов \"%s\", строка %d)"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr ""
 "смещение часового пояса должно быть числом (файл часовых поясов \"%s\", "
 "строка %d)"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "ошибка синтаксиса в файле часовых поясов \"%s\", строке %d"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "краткое обозначение часового пояса \"%s\" определено неоднократно"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid ""
 "Entry in time zone file \"%s\", line %d, conflicts with entry in file "
@@ -34531,27 +36414,27 @@ msgstr ""
 "Запись в файле часовых поясов \"%s\", строке %d, противоречит записи в файле "
 "\"%s\", строке %d."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "неправильное имя файла часовых поясов: \"%s\""
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "предел вложенности файлов часовых поясов превышен в файле \"%s\""
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "прочитать файл часовых поясов \"%s\" не удалось: %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "слишком длинная строка в файле часовых поясов \"%s\" (строка %d)"
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr ""
@@ -34568,12 +36451,12 @@ msgstr "Ошибка при создании контекста памяти \"%
 msgid "could not attach to dynamic shared area"
 msgstr "не удалось подключиться к динамической разделяемой области"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "Ошибка при запросе блока размером %zu в контексте памяти \"%s\"."
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "вывод информации о памяти процесса с PID %d"
@@ -34619,76 +36502,76 @@ msgstr ""
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
 #, c-format
-msgid "could not seek to block %lld of temporary file"
-msgstr "не удалось переместиться к блоку %lld временного файла"
+msgid "could not seek to block %<PRId64> of temporary file"
+msgstr "не удалось переместиться к блоку %<PRId64> временного файла"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr "неожиданный фрагмент в файле общего временного хранилища кортежей"
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr ""
 "не удалось переместиться к блоку %u в файле общего временного хранилища "
 "кортежей"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "число потоков данных для внешней сортировки не может превышать %d"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "создать уникальный индекс \"%s\" не удалось"
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "Ключ %s дублируется."
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Данные содержат дублирующиеся ключи."
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1308 utils/sort/tuplestore.c:1373
+#: utils/sort/tuplestore.c:1382
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "не удалось переместиться во временном файле хранилища кортежей"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "Исходная транзакция уже не выполняется."
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "экспортировать снимок из вложенной транзакции нельзя"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "неверные данные снимка в файле \"%s\""
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "команда SET TRANSACTION SNAPSHOT должна выполняться до запросов"
 
-#: utils/time/snapmgr.c:1402
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid ""
 "a snapshot-importing transaction must have isolation level SERIALIZABLE or "
@@ -34697,17 +36580,17 @@ msgstr ""
 "транзакция, импортирующая снимок, должна иметь уровень изоляции SERIALIZABLE "
 "или REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "неверный идентификатор снимка: \"%s\""
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "снимок \"%s\" не существует"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid ""
 "a serializable transaction cannot import a snapshot from a non-serializable "
@@ -34715,7 +36598,7 @@ msgid ""
 msgstr ""
 "сериализуемая транзакция не может импортировать снимок из не сериализуемой"
 
-#: utils/time/snapmgr.c:1528
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid ""
 "a non-read-only serializable transaction cannot import a snapshot from a "
@@ -34724,23 +36607,23 @@ msgstr ""
 "сериализуемая транзакция в режиме \"чтение-запись\" не может импортировать "
 "снимок из транзакции в режиме \"только чтение\""
 
-#: utils/time/snapmgr.c:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "нельзя импортировать снимок из другой базы данных"
 
-#: gram.y:1231
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "вариант UNENCRYPTED PASSWORD более не поддерживается"
 
-#: gram.y:1232
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr ""
 "Удалите слово UNENCRYPTED, чтобы сохранить пароль в зашифрованном виде."
 
-#: gram.y:1559 gram.y:1575
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS не может включать элементы схемы"
@@ -34750,268 +36633,268 @@ msgstr "CREATE SCHEMA IF NOT EXISTS не может включать элеме
 msgid "current database cannot be changed"
 msgstr "сменить текущую базу данных нельзя"
 
-#: gram.y:1860
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr ""
 "интервал, задающий часовой пояс, должен иметь точность HOUR или HOUR TO "
 "MINUTE"
 
-#: gram.y:2487
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "номер столбца должен быть в диапазоне от 1 до %d"
 
-#: gram.y:3083
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "для ограничений нельзя задать свойство NOT VALID"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "параметр последовательности \"%s\" здесь не поддерживается"
 
-#: gram.y:3122
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "модуль для хеш-секции указан неоднократно"
 
-#: gram.y:3131
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "остаток для хеш-секции указан неоднократно"
 
-#: gram.y:3138
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "нераспознанное указание ограничения хеш-секции \"%s\""
 
-#: gram.y:3146
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "необходимо указать модуль для хеш-секции"
 
-#: gram.y:3150
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "необходимо указать остаток для хеш-секции"
 
-#: gram.y:3358 gram.y:3392
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "указания STDIN/STDOUT несовместимы с PROGRAM"
 
-#: gram.y:3364
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "предложение WHERE не допускается с COPY TO"
 
-#: gram.y:3712 gram.y:3719 gram.y:13023 gram.y:13031
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "указание GLOBAL при создании временных таблиц устарело"
 
-#: gram.y:3995
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "для генерируемого столбца должно указываться GENERATED ALWAYS"
 
-#: gram.y:4432
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "список столбцов с %s поддерживается только для действий ON DELETE"
 
-#: gram.y:5151
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM более не поддерживается"
 
-#: gram.y:5849
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "нераспознанный вариант политики безопасности строк \"%s\""
 
-#: gram.y:5850
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr ""
 "В настоящее время поддерживаются только политики PERMISSIVE и RESTRICTIVE."
 
-#: gram.y:5935
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER не поддерживается"
 
-#: gram.y:5972
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "события триггера повторяются"
 
-#: gram.y:6121
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
-msgstr "противоречащие характеристики ограничения"
+msgstr "противоречащие свойства ограничения"
 
-#: gram.y:6220
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "оператор CREATE ASSERTION ещё не реализован"
 
-#: gram.y:6537
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "удаление значения из перечисления не поддерживается"
 
-#: gram.y:6655
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK более не требуется"
-
-#: gram.y:6656
-#, c-format
-msgid "Update your data type."
-msgstr "Обновите тип данных."
-
-#: gram.y:8529
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "у агрегатных функций не может быть выходных аргументов"
 
-#: gram.y:11221 gram.y:11240
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr ""
 "предложение WITH CHECK OPTION не поддерживается для рекурсивных представлений"
 
-#: gram.y:13162
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "синтаксис LIMIT #,# не поддерживается"
 
-#: gram.y:13163
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Используйте отдельные предложения LIMIT и OFFSET."
 
-#: gram.y:14038
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "допускается только одно значение DEFAULT"
 
-#: gram.y:14047
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "для столбца допускается только одно значение PATH"
 
-#: gram.y:14056
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr ""
 "конфликтующие или избыточные объявления NULL/NOT NULL для столбца \"%s\""
 
-#: gram.y:14065
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "нераспознанный параметр столбца \"%s\""
 
-#: gram.y:14147
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "имя параметра \"%s\" не может использоваться в XMLTABLE"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "в указании пути JSON_TABLE поддерживаются только строковые константы"
 
-#: gram.y:14469
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "тип float должен иметь точность минимум 1 бит"
 
-#: gram.y:14478
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "тип float должен иметь точность меньше 54 бит"
 
-#: gram.y:14995
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "неверное число параметров в левой части выражения OVERLAPS"
 
-#: gram.y:15000
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "неверное число параметров в правой части выражения OVERLAPS"
 
-#: gram.y:15177
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "предикат UNIQUE ещё не реализован"
 
-#: gram.y:15591
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "ORDER BY с WITHIN GROUP можно указать только один раз"
 
-#: gram.y:15596
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT нельзя использовать с WITHIN GROUP"
 
-#: gram.y:15601
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC нельзя использовать с WITHIN GROUP"
 
-#: gram.y:16328 gram.y:16352
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "началом рамки не может быть UNBOUNDED FOLLOWING"
 
-#: gram.y:16333
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr ""
 "рамка, начинающаяся со следующей строки, не может заканчиваться текущей"
 
-#: gram.y:16357
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "концом рамки не может быть UNBOUNDED PRECEDING"
 
-#: gram.y:16363
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr ""
 "рамка, начинающаяся с текущей строки, не может иметь предшествующих строк"
 
-#: gram.y:16370
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr ""
 "рамка, начинающаяся со следующей строки, не может иметь предшествующих строк"
 
-#: gram.y:16919
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "нераспознанная кодировка JSON: %s"
 
-#: gram.y:17243
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "параметр функции-модификатора типа должен быть безымянным"
 
-#: gram.y:17249
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "модификатор типа не может включать ORDER BY"
 
-#: gram.y:17317 gram.y:17324 gram.y:17331
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s нельзя использовать здесь как имя роли"
 
-#: gram.y:17421 gram.y:18906
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES нельзя задать без предложения ORDER BY"
 
-#: gram.y:18597 gram.y:18772
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "недопустимое использование \"*\""
 
-#: gram.y:18836
+#: gram.y:19006
 #, c-format
 msgid ""
 "an ordered-set aggregate with a VARIADIC direct argument must have one "
@@ -35020,70 +36903,77 @@ msgstr ""
 "сортирующая агрегатная функция с непосредственным аргументом VARIADIC должна "
 "иметь один агрегатный аргумент VARIADIC того же типа данных"
 
-#: gram.y:18873
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "ORDER BY можно указать только один раз"
 
-#: gram.y:18884
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "OFFSET можно указать только один раз"
 
-#: gram.y:18893
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "LIMIT можно указать только один раз"
 
-#: gram.y:18902
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "параметры LIMIT можно указать только один раз"
-
-#: gram.y:18929
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "WITH можно указать только один раз"
 
-#: gram.y:19122
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "в табличных функциях не может быть аргументов OUT и INOUT"
 
-#: gram.y:19255
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "COLLATE можно указать только один раз"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19293 gram.y:19306
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
-msgstr "ограничения %s не могут иметь характеристики DEFERRABLE"
+msgstr "ограничения %s не могут иметь свойства DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19319
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
-msgstr "ограничения %s не могут иметь характеристики NOT VALID"
+msgstr "ограничения %s не могут иметь свойства NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19332
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
-msgstr "ограничения %s не могут иметь характеристики NO INHERIT"
+msgstr "ограничения %s не могут иметь свойства NO INHERIT"
 
-#: gram.y:19354
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, c-format
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "ограничения %s не могут иметь свойства NOT ENFORCED"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, c-format
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "ограничения %s не могут иметь свойства ENFORCED"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "нераспознанная стратегия секционирования \"%s\""
 
-#: gram.y:19378
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "неверный список объектов публикации"
 
-#: gram.y:19379
+#: gram.y:19590
 #, c-format
 msgid ""
 "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table "
@@ -35092,64 +36982,64 @@ msgstr ""
 "Перед именем отдельной таблицы или схемы нужно указать TABLE либо TABLES IN "
 "SCHEMA."
 
-#: gram.y:19395
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "неверное имя таблицы"
 
-#: gram.y:19416
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "предложение WHERE не допускается для схемы"
 
-#: gram.y:19423
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "указание столбца не допускается для схемы"
 
-#: gram.y:19437
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "неверное имя схемы"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "пустое имя файла конфигурации: \"%s\""
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid ""
 "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr ""
 "открыть файл конфигурации \"%s\" не удалось: превышен предел вложенности"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "рекурсивная вложенность файла конфигурации в \"%s\""
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "открыть файл конфигурации \"%s\" не удалось: %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "отсутствующий файл конфигурации \"%s\" пропускается"
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
 msgstr "ошибка синтаксиса в файле \"%s\", в конце строки %u"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "ошибка синтаксиса в файле \"%s\", в строке %u, рядом с \"%s\""
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr ""
@@ -35157,17 +37047,17 @@ msgstr ""
 "прекращается"
 
 # skip-rule: space-after-comma, space-before-period
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
 msgstr "Аргументами .decimal() могут быть только точность[,масштаб]."
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "Нераспознанный символ флага \"%.*s\" в предикате LIKE_REGEX."
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:680
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr ""
@@ -35185,75 +37075,75 @@ msgstr "неверная последовательность шестнадца
 msgid "unexpected end after backslash"
 msgstr "неожиданный конец строки после обратной косой черты"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:756
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "незавершённая строка в кавычках"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "неожиданный конец комментария"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "неверная числовая строка"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1064
-#: scan.l:1068 scan.l:1072 scan.l:1076
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "мусорное содержимое после числовой константы"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s в конце аргумента jsonpath"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s в строке jsonpath (примерное положение: \"%s\")"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "некорректные входные данные"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "неверная шестнадцатеричная цифра"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "не удалось преобразовать символ Unicode в серверную кодировку"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "неверная линия времени %u"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "неверная позиция начала потока"
 
-#: scan.l:497
+#: scan.l:483
 msgid "unterminated /* comment"
 msgstr "незавершённый комментарий /*"
 
-#: scan.l:517
+#: scan.l:503
 msgid "unterminated bit string literal"
 msgstr "оборванная битовая строка"
 
-#: scan.l:531
+#: scan.l:517
 msgid "unterminated hexadecimal string literal"
 msgstr "оборванная шестнадцатеричная строка"
 
-#: scan.l:581
+#: scan.l:567
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "небезопасное использование строковой константы со спецкодами Unicode"
 
-#: scan.l:582
+#: scan.l:568
 #, c-format
 msgid ""
 "String constants with Unicode escapes cannot be used when "
@@ -35262,22 +37152,22 @@ msgstr ""
 "Строки со спецкодами Unicode нельзя использовать, когда параметр "
 "\"standard_conforming_strings\" выключен."
 
-#: scan.l:643
+#: scan.l:629
 msgid "unhandled previous state in xqs"
 msgstr ""
 "необрабатываемое предыдущее состояние при обнаружении закрывающего апострофа"
 
-#: scan.l:717
+#: scan.l:703
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Спецкоды Unicode должны иметь вид \\uXXXX или \\UXXXXXXXX."
 
-#: scan.l:728
+#: scan.l:714
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "небезопасное использование символа \\' в строке"
 
-#: scan.l:729
+#: scan.l:715
 #, c-format
 msgid ""
 "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
@@ -35285,56 +37175,60 @@ msgstr ""
 "Записывайте апостроф в строке в виде ''. Запись \\' небезопасна для "
 "исключительно клиентских кодировок."
 
-#: scan.l:801
+#: scan.l:787
 msgid "unterminated dollar-quoted string"
 msgstr "незавершённая строка с $"
 
-#: scan.l:818 scan.l:828
+#: scan.l:804 scan.l:814
 msgid "zero-length delimited identifier"
 msgstr "пустой идентификатор в кавычках"
 
-#: scan.l:839 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "незавершённый идентификатор в кавычках"
 
-#: scan.l:1002
+#: scan.l:988
 msgid "operator too long"
 msgstr "слишком длинный оператор"
 
-#: scan.l:1015
+#: scan.l:1001
+msgid "parameter number too large"
+msgstr "номер параметра слишком большой"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "мусорное содержимое после параметра"
 
-#: scan.l:1036
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "неверное шестнадцатеричное целое"
 
-#: scan.l:1040
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "неверное восьмеричное целое"
 
-#: scan.l:1044
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "неверное двоичное целое"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1239
+#: scan.l:1231
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в конце"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1247
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
 
-#: scan.l:1439
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "нестандартное применение \\' в строке"
 
-#: scan.l:1440
+#: scan.l:1432
 #, c-format
 msgid ""
 "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
@@ -35342,27 +37236,458 @@ msgstr ""
 "Записывайте апостроф в строках в виде '' или используйте синтаксис спецстрок "
 "(E'...')."
 
-#: scan.l:1449
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "нестандартное применение \\\\ в строке"
 
-#: scan.l:1450
+#: scan.l:1442
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr ""
 "Используйте для записи обратных слэшей синтаксис спецстрок, например E'\\\\'."
 
-#: scan.l:1464
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "нестандартное использование спецсимвола в строке"
 
-#: scan.l:1465
+#: scan.l:1457
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "Используйте для записи спецсимволов синтаксис спецстрок E'\\r\\n'."
 
+#, c-format
+#~ msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON LARGE OBJECTS"
+#~ msgstr ""
+#~ "предложение IN SCHEMA нельзя использовать в GRANT/REVOKE ON LARGE OBJECTS"
+
+#, c-format
+#~ msgid "unrecognized CLUSTER option \"%s\""
+#~ msgstr "нераспознанный параметр CLUSTER: \"%s\""
+
+#, c-format
+#~ msgid "unrecognized DROP DATABASE option \"%s\""
+#~ msgstr "нераспознанный параметр DROP DATABASE: \"%s\""
+
+#, c-format
+#~ msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+#~ msgstr "нераспознанное значение параметра EXPLAIN \"%s\": \"%s\""
+
+#, c-format
+#~ msgid "unrecognized EXPLAIN option \"%s\""
+#~ msgstr "нераспознанный параметр EXPLAIN: \"%s\""
+
+#, c-format
+#~ msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
+#~ msgstr ""
+#~ "параметры ANALYZE и GENERIC_PLAN оператора EXPLAIN нельзя использовать "
+#~ "одновременно"
+
+#, c-format
+#~ msgid "unrecognized REINDEX option \"%s\""
+#~ msgstr "нераспознанный параметр REINDEX: \"%s\""
+
+#, c-format
+#~ msgid "unrecognized ANALYZE option \"%s\""
+#~ msgstr "нераспознанный параметр ANALYZE: \"%s\""
+
+#, c-format
+#~ msgid "unrecognized VACUUM option \"%s\""
+#~ msgstr "нераспознанный параметр VACUUM: \"%s\""
+
+#, c-format
+#~ msgid ""
+#~ "replication slot synchronization worker is shutting down on receiving "
+#~ "SIGINT"
+#~ msgstr ""
+#~ "процесс синхронизации слотов репликации останавливается, получив сигнал "
+#~ "SIGINT"
+
+#, c-format
+#~ msgid "replication origin \"%s\" already exists"
+#~ msgstr "источник репликации \"%s\" уже существует"
+
+#, c-format
+#~ msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
+#~ msgstr ""
+#~ "нераспознанное значение для параметра CREATE_REPLICATION_SLOT \"%s\": "
+#~ "\"%s\""
+
+#, c-format
+#~ msgid "Replication slot \"%s\" does not exist."
+#~ msgstr "Слот репликации \"%s\" не существует."
+
+#, c-format
+#~ msgid "\"%s\" is not a physical replication slot."
+#~ msgstr "\"%s\" не является слотом физической репликации."
+
+#, c-format
+#~ msgid "cannot create statistics on the specified relation"
+#~ msgstr "создать статистику для указанного отношения нельзя"
+
+#, c-format
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "найти локального пользователя по идентификатору (%d) не удалось: %s"
+
+#, c-format
+#~ msgid "%s cannot be executed within a pipeline"
+#~ msgstr "%s нельзя выполнять в конвейере"
+
+#, c-format
+#~ msgid "\"%s\" must be set to -1 during binary upgrade mode."
+#~ msgstr "Параметр \"%s\" должен быть равен -1 в режиме двоичного обновления."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
+#~ "server was compiled with CATALOG_VERSION_NO %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с CATALOG_VERSION_NO %d, но сервер "
+#~ "скомпилирован с CATALOG_VERSION_NO %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with MAXALIGN %d, but the server was "
+#~ "compiled with MAXALIGN %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с MAXALIGN %d, но сервер "
+#~ "скомпилирован с MAXALIGN %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with RELSEG_SIZE %d, but the server "
+#~ "was compiled with RELSEG_SIZE %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с RELSEG_SIZE %d, но сервер "
+#~ "скомпилирован с RELSEG_SIZE %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with XLOG_BLCKSZ %d, but the server "
+#~ "was compiled with XLOG_BLCKSZ %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с XLOG_BLCKSZ %d, но сервер "
+#~ "скомпилирован с XLOG_BLCKSZ %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with NAMEDATALEN %d, but the server "
+#~ "was compiled with NAMEDATALEN %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с NAMEDATALEN %d, но сервер "
+#~ "скомпилирован с NAMEDATALEN %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with INDEX_MAX_KEYS %d, but the "
+#~ "server was compiled with INDEX_MAX_KEYS %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с INDEX_MAX_KEYS %d, но сервер "
+#~ "скомпилирован с INDEX_MAX_KEYS %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but "
+#~ "the server was compiled with TOAST_MAX_CHUNK_SIZE %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с TOAST_MAX_CHUNK_SIZE %d, но "
+#~ "сервер скомпилирован с TOAST_MAX_CHUNK_SIZE %d."
+
+#, c-format
+#~ msgid ""
+#~ "The database cluster was initialized with LOBLKSIZE %d, but the server "
+#~ "was compiled with LOBLKSIZE %d."
+#~ msgstr ""
+#~ "Кластер баз данных был инициализирован с LOBLKSIZE %d, но сервер "
+#~ "скомпилирован с LOBLKSIZE %d."
+
+#, c-format
+#~ msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
+#~ msgstr ""
+#~ "\"min_wal_size\" должен быть минимум вдвое больше \"wal_segment_size\""
+
+#, c-format
+#~ msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
+#~ msgstr ""
+#~ "\"max_wal_size\" должен быть минимум вдвое больше \"wal_segment_size\""
+
+#, c-format
+#~ msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
+#~ msgstr ""
+#~ "Установите wal_level \"replica\" или \"logical\" при запуске сервера."
+
+#, c-format
+#~ msgid "%s with OID %u does not exist"
+#~ msgstr "%s с OID %u не существует"
+
+#, c-format
+#~ msgid "end-of-copy marker corrupt"
+#~ msgstr "маркер \"конец копии\" испорчен"
+
+#, c-format
+#~ msgid "EXPLAIN option TIMING requires ANALYZE"
+#~ msgstr "параметр TIMING оператора EXPLAIN требует указания ANALYZE"
+
+#, c-format
+#~ msgid "EXPLAIN option SERIALIZE requires ANALYZE"
+#~ msgstr "параметр SERIALIZE оператора EXPLAIN требует указания ANALYZE"
+
+#, c-format
+#~ msgid "Could not open extension control file \"%s\": %m."
+#~ msgstr "Не удалось открыть управляющий файл расширения \"%s\": %m."
+
+#, c-format
+#~ msgid "cannot match partition key to an index using access method \"%s\""
+#~ msgstr ""
+#~ "сопоставить ключ секционирования с индексом, использующим метод доступа "
+#~ "\"%s\", нельзя"
+
+#, c-format
+#~ msgid ""
+#~ "cannot remove constraint from only the partitioned table when partitions "
+#~ "exist"
+#~ msgstr ""
+#~ "удалить ограничение только из секционированной таблицы, когда существуют "
+#~ "секции, нельзя"
+
+#, c-format
+#~ msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
+#~ msgstr ""
+#~ "столбец \"%s\" отношения \"%s\" не является сохранённым генерируемым "
+#~ "столбцом"
+
+#, c-format
+#~ msgid ""
+#~ "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing "
+#~ "relation \"%s\""
+#~ msgstr ""
+#~ "нельзя добавить с характеристикой NOT VALID сторонний ключ в "
+#~ "секционированной таблице \"%s\", ссылающийся на отношение \"%s\""
+
+#, c-format
+#~ msgid "This feature is not yet supported on partitioned tables."
+#~ msgstr ""
+#~ "Эта функциональность с секционированными таблицами пока не поддерживается."
+
+#, c-format
+#~ msgid ""
+#~ "constraint \"%s\" of relation \"%s\" is not a foreign key or check "
+#~ "constraint"
+#~ msgstr ""
+#~ "ограничение \"%s\" в таблице \"%s\" не является внешним ключом или "
+#~ "ограничением-проверкой"
+
+#, c-format
+#~ msgid ""
+#~ "\"effective_io_concurrency\" must be set to 0 on platforms that lack "
+#~ "posix_fadvise()."
+#~ msgstr ""
+#~ "Значение \"effective_io_concurrency\" должно равняться 0 на платформах, "
+#~ "где отсутствует posix_fadvise()."
+
+#, c-format
+#~ msgid ""
+#~ "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack "
+#~ "posix_fadvise()."
+#~ msgstr ""
+#~ "Значение \"maintenance_io_concurrency\" должно равняться 0 на платформах, "
+#~ "где отсутствует posix_fadvise()."
+
+#, c-format
+#~ msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
+#~ msgstr "клиент передал чрезмерно большой пакет GSSAPI (%zu > %d)"
+
+#, c-format
+#~ msgid "ECDH: unrecognized curve name: %s"
+#~ msgstr "ECDH: нераспознанное имя кривой: %s"
+
+#, c-format
+#~ msgid "ECDH: could not create key"
+#~ msgstr "ECDH: не удалось создать ключ"
+
+#, c-format
+#~ msgid ""
+#~ "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, "
+#~ "ldapsearchfilter, or ldapurl together with ldapprefix"
+#~ msgstr ""
+#~ "нельзя использовать ldapbasedn, ldapbinddn, ldapbindpasswd, "
+#~ "ldapsearchattribute, ldapsearchfilter или ldapurl вместе с ldapprefix"
+
+#, c-format
+#~ msgid "LIKE is not supported for creating foreign tables"
+#~ msgstr "LIKE при создании сторонних таблиц не поддерживается"
+
+#~ msgid "server process"
+#~ msgstr "процесс сервера"
+
+#, c-format
+#~ msgid ""
+#~ "This slot has been invalidated because it exceeded the maximum reserved "
+#~ "size."
+#~ msgstr ""
+#~ "Этот слот был аннулирован из-за превышения максимального "
+#~ "зарезервированного размера."
+
+#, c-format
+#~ msgid ""
+#~ "This slot has been invalidated because it was conflicting with recovery."
+#~ msgstr "Этот слот был аннулирован из-за конфликта с восстановлением."
+
+#, c-format
+#~ msgid ", \"%s\""
+#~ msgstr ", \"%s\""
+
+#, c-format
+#~ msgid ""
+#~ "could not synchronize replication slot \"%s\" because remote slot "
+#~ "precedes local slot"
+#~ msgstr ""
+#~ "синхронизировать слот репликации \"%s\" не удалось, так как состояние "
+#~ "удалённого слота предшествует локальному"
+
+#, c-format
+#~ msgid ""
+#~ "Logical decoding could not find consistent point from local slot's LSN %X/"
+#~ "%X."
+#~ msgstr ""
+#~ "При логическом декодировании не удалось найти точку согласованности от "
+#~ "LSN локального слота %X/%X."
+
+#, c-format
+#~ msgid "\"synchronous_standby_names\" parser failed"
+#~ msgstr "ошибка при разборе \"synchronous_standby_names\""
+
+#, c-format
+#~ msgid "\"debug_io_direct\" is not supported on this platform."
+#~ msgstr "Параметр \"debug_io_direct\" не поддерживается в этой ОС."
+
+#, c-format
+#~ msgid "conversion from wchar_t to server encoding failed: %m"
+#~ msgstr "преобразовать wchar_t в кодировку сервера не удалось: %m"
+
+#, c-format
+#~ msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+#~ msgstr ""
+#~ "не удалось переименовать временный файл статистики из \"%s\" в \"%s\": %m"
+
+#, c-format
+#~ msgid "invalid input string for \"Y,YYY\""
+#~ msgstr "ошибка синтаксиса в значении для шаблона \"Y,YYY\""
+
+#, c-format
+#~ msgid "\"RN\" not supported for input"
+#~ msgstr "\"RN\" не поддерживается при вводе"
+
+#, c-format
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type double "
+#~ "precision"
+#~ msgstr ""
+#~ "аргумент \"%s\" метода элемента jsonpath .%s() некорректен для типа "
+#~ "double precision"
+
+#, c-format
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
+#~ msgstr ""
+#~ "аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа "
+#~ "boolean"
+
+#, c-format
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
+#~ msgstr ""
+#~ "аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа "
+#~ "numeric"
+
+#, c-format
+#~ msgid ""
+#~ "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
+#~ msgstr ""
+#~ "аргумент \"%s\" метода элемента jsonpath .%s() не подходит для типа "
+#~ "integer"
+
+#, c-format
+#~ msgid "nondeterministic collations are not supported for LIKE"
+#~ msgstr "недетерминированные правила сортировки не поддерживаются для LIKE"
+
+#, c-format
+#~ msgid "index %lld out of valid range, 0..%lld"
+#~ msgstr "индекс %lld вне диапазона 0..%lld"
+
+#, c-format
+#~ msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+#~ msgstr "В сервере FUNC_MAX_ARGS = %d, в библиотеке: %d."
+
+#, c-format
+#~ msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+#~ msgstr "В сервере INDEX_MAX_KEYS = %d, в библиотеке: %d."
+
+#, c-format
+#~ msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+#~ msgstr "В сервере FLOAT8PASSBYVAL = %s, в библиотеке: %s."
+
+#~ msgid "Resource Usage / Asynchronous Behavior"
+#~ msgstr "Использование ресурсов / Асинхронное поведение"
+
+#~ msgid "Logs each successful connection."
+#~ msgstr "Протоколировать устанавливаемые соединения."
+
+#~ msgid "-1 indicates that the value could not be determined."
+#~ msgstr "Значение -1 показывает, что определить это количество не удалось."
+
+#~ msgid "A value of 0 turns off the timeout."
+#~ msgstr "Нулевое значение отключает тайм-аут."
+
+#~ msgid "Zero logs a sample of all queries. -1 turns this feature off."
+#~ msgstr "При 0 выводятся все запросы в выборке; -1 отключает эти сообщения."
+
+#~ msgid "Zero prints all queries. -1 turns this feature off."
+#~ msgstr "При 0 выводятся все запросы; -1 отключает эти сообщения."
+
+#~ msgid "Zero prints all actions. -1 turns autovacuum logging off."
+#~ msgstr ""
+#~ "При 0 протоколируются все операции автоочистки; -1 отключает эти "
+#~ "сообщения."
+
+#~ msgid ""
+#~ "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert "
+#~ "vacuums."
+#~ msgstr ""
+#~ "Минимальное число добавлений кортежей, вызывающее очистку; при -1 такая "
+#~ "очистка отключается."
+
+#~ msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#~ msgstr ""
+#~ "При 0 отмечаются все файлы; при -1 эти сообщения отключаются (по "
+#~ "умолчанию)."
+
+#~ msgid "0 turns this feature off."
+#~ msgstr "При 0 эта функциональность отключается."
+
+#~ msgid "This is used only if \"archive_library\" is not set."
+#~ msgstr ""
+#~ "Это параметр используется, только если не задан \"archive_library\"."
+
+#~ msgid "If blank, no prefix is used."
+#~ msgstr "При пустом значении префикс также отсутствует."
+
+#~ msgid "Sets the curve to use for ECDH."
+#~ msgstr "Задаёт кривую для ECDH."
+
+#, c-format
+#~ msgid "RECHECK is no longer required"
+#~ msgstr "RECHECK более не требуется"
+
+#, c-format
+#~ msgid "Update your data type."
+#~ msgstr "Обновите тип данных."
+
+#, c-format
+#~ msgid "multiple limit options not allowed"
+#~ msgstr "параметры LIMIT можно указать только один раз"
+
 #, c-format
 #~ msgid "cannot use RETURNING type %s in %s"
 #~ msgstr "использовать в RETURNING тип %s в %s нельзя"
@@ -35659,10 +37984,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgstr ""
 #~ "Включает протоколирование отладочной информации, связанной с репликацией."
 
-#, c-format
-#~ msgid "out of memory while trying to decode a record of length %u"
-#~ msgstr "не удалось выделить память для декодирования записи длины %u"
-
 #, c-format
 #~ msgid "record length %u at %X/%X too long"
 #~ msgstr "длина записи %u в позиции %X/%X слишком велика"
@@ -35737,10 +38058,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "invalid checkpoint link in backup_label file"
 #~ msgstr "неверная ссылка на контрольную точку в файле backup_label"
 
-#, c-format
-#~ msgid "invalid primary checkpoint record"
-#~ msgstr "неверная запись первичной контрольной точки"
-
 #, c-format
 #~ msgid "invalid resource manager ID in primary checkpoint record"
 #~ msgstr "неверный ID менеджера ресурсов в записи первичной контрольной точки"
@@ -36000,10 +38317,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ "  -n                 не переинициализировать разделяемую память после\n"
 #~ "                     аварийного выхода\n"
 
-#, c-format
-#~ msgid "generated columns are not supported on partitions"
-#~ msgstr "генерируемые столбцы не поддерживаются с секциями"
-
 #, c-format
 #~ msgid "could not load pg_hba.conf"
 #~ msgstr "не удалось загрузить pg_hba.conf"
@@ -36120,10 +38433,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ "не удалось преобразовать таблицу \"%s\" в представление, так как к ней "
 #~ "применены политики защиты строк"
 
-#, c-format
-#~ msgid "could not link file \"%s\" to \"%s\": %m"
-#~ msgstr "для файла \"%s\" не удалось создать ссылку \"%s\": %m"
-
 #, c-format
 #~ msgid "must be a superuser to terminate superuser process"
 #~ msgstr "прерывать процесс суперпользователя может только суперпользователь"
@@ -36299,9 +38608,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ "Таблица \"%s\" в схеме \"%s\" уже является частью публикации, добавление "
 #~ "той же схемы не поддерживается."
 
-#~ msgid "cannot add relation \"%s.%s\" to publication"
-#~ msgstr "добавить отношение \"%s.%s\" в публикацию нельзя"
-
 #~ msgid ""
 #~ "Table's schema \"%s\" is already part of the publication or part of the "
 #~ "specified schema list."
@@ -36495,17 +38801,9 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "utility statements cannot be prepared"
 #~ msgstr "служебные SQL-операторы нельзя подготовить"
 
-#~ msgid "unlogged sequences are not supported"
-#~ msgstr "нежурналируемые последовательности не поддерживаются"
-
 #~ msgid "referenced relation \"%s\" is not a table or foreign table"
 #~ msgstr "указанный объект \"%s\" не является таблицей или сторонней таблицей"
 
-#~ msgid "relation \"%s\" is not a table, foreign table, or materialized view"
-#~ msgstr ""
-#~ "отношение \"%s\" - это не таблица, не сторонняя таблица и не "
-#~ "материализованное представление"
-
 #~ msgid ""
 #~ "\"%s\" is not a table, view, materialized view, composite type, index, or "
 #~ "foreign table"
@@ -36833,9 +39131,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "pclose failed: %m"
 #~ msgstr "ошибка pclose: %m"
 
-#~ msgid "password too long"
-#~ msgstr "слишком длинный пароль"
-
 #~ msgid "\"%s\": removed %.0f row versions in %u pages"
 #~ msgstr "\"%s\": удалено версий строк: %.0f, обработано страниц: %u"
 
@@ -36861,9 +39156,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ "Граница членов мультитранзакции сейчас: %u (при старейшей "
 #~ "мультитранзакции %u)"
 
-#~ msgid "removing file \"%s\""
-#~ msgstr "удаляется файл \"%s\""
-
 #~ msgid "transaction ID wrap limit is %u, limited by database with OID %u"
 #~ msgstr ""
 #~ "предел зацикливания ID транзакций равен %u, источник ограничения - база "
@@ -36906,9 +39198,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgstr ""
 #~ "создание точки перезапуска пропускается, она уже создана по смещению %X/%X"
 
-#~ msgid "backup time %s in file \"%s\""
-#~ msgstr "время резервного копирования %s в файле \"%s\""
-
 #~ msgid "backup label %s in file \"%s\""
 #~ msgstr "метка резервного копирования %s в файле \"%s\""
 
@@ -37170,9 +39459,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "deferrable snapshot was unsafe; trying a new one"
 #~ msgstr "откладываемый снимок был небезопасен; пробуем более новый"
 
-#~ msgid "Process %d waits for %s on %s."
-#~ msgstr "Процесс %d ожидает в режиме %s блокировку %s."
-
 #~ msgid "sending cancel to blocking autovacuum PID %d"
 #~ msgstr "снятие блокирующего процесса автоочистки (PID %d)"
 
@@ -37365,9 +39651,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ "индекс \"%s\" теперь содержит версий строк: %.0f, в страницах: %u (по "
 #~ "информации параллельного процесса очистки)"
 
-#~ msgid "insufficient columns in %s constraint definition"
-#~ msgstr "недостаточно столбцов в определении ограничения %s"
-
 #~ msgid "cannot reindex invalid index on TOAST table concurrently"
 #~ msgstr ""
 #~ "перестроить нерабочий индекс в таблице TOAST неблокирующим способом нельзя"
@@ -37483,9 +39766,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "changing return type of function %s from %s to %s"
 #~ msgstr "изменение типа возврата функции %s с %s на %s"
 
-#~ msgid "column \"%s\" contains null values"
-#~ msgstr "столбец \"%s\" содержит значения NULL"
-
 #~ msgid ""
 #~ "updated partition constraint for default partition would be violated by "
 #~ "some row"
@@ -37597,9 +39877,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "could not rmdir directory \"%s\": %m"
 #~ msgstr "ошибка удаления каталога \"%s\": %m"
 
-#~ msgid "Key (%s)=(%s) still referenced from table \"%s\"."
-#~ msgstr "Ссылки на ключ (%s)=(%s) остаются в таблице \"%s\"."
-
 #~ msgid "GSSAPI context error"
 #~ msgstr "ошибка контекста GSSAPI"
 
@@ -38124,9 +40401,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid " in schema %s"
 #~ msgstr " в схеме %s"
 
-#~ msgid "%s in publication %s"
-#~ msgstr "%s в публикации %s"
-
 #~ msgid "table \"%s\" has multiple constraints named \"%s\""
 #~ msgstr "таблица \"%s\" содержит несколько ограничений с именем \"%s\""
 
@@ -38148,9 +40422,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "cannot copy to foreign table \"%s\""
 #~ msgstr "копировать в стороннюю таблицу \"%s\" нельзя"
 
-#~ msgid "cannot route inserted tuples to a foreign table"
-#~ msgstr "направить вставляемые кортежи в стороннюю таблицу нельзя"
-
 #~ msgid "unrecognized function attribute \"%s\" ignored"
 #~ msgstr "нераспознанный атрибут функции \"%s\" --- игнорируется"
 
@@ -38263,10 +40534,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 #~ msgstr "RANGE FOLLOWING поддерживается только с UNBOUNDED"
 
-#~ msgid "invalid number of arguments: object must be matched key value pairs"
-#~ msgstr ""
-#~ "неверное число аргументов: объект должен составляться из пар ключ-значение"
-
 #~ msgid "invalid publish list"
 #~ msgstr "неверный список публикации"
 
@@ -39611,9 +41878,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "received fast promote request"
 #~ msgstr "получен запрос быстрого повышения статуса"
 
-#~ msgid "argument number is out of range"
-#~ msgstr "номер аргумента вне диапазона"
-
 #~ msgid "could not change directory to \"%s\""
 #~ msgstr "не удалось перейти в каталог \"%s\""
 
@@ -39897,9 +42161,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "Sets the list of known custom variable classes."
 #~ msgstr "Задаёт список известных классов дополнительных переменных."
 
-#~ msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
-#~ msgstr "ограничение внешнего ключа \"%s\" в таблице\"%s\" не существует"
-
 #~ msgid "removing built-in function \"%s\""
 #~ msgstr "удаление встроенной функции \"%s\""
 
@@ -39944,9 +42205,6 @@ msgstr "Используйте для записи спецсимволов си
 #~ msgid "missing or erroneous pg_hba.conf file"
 #~ msgstr "файл pg_hba.conf отсутствует или испорчен"
 
-#~ msgid "See server log for details."
-#~ msgstr "Смотрите подробности в протоколе сервера."
-
 #~ msgid "Make sure the root.crt file is present and readable."
 #~ msgstr "Убедитесь в наличии и доступности файла root.crt."
 
diff --git a/src/backend/po/sv.po b/src/backend/po/sv.po
index db87d04a3c2..4f5a5af0099 100644
--- a/src/backend/po/sv.po
+++ b/src/backend/po/sv.po
@@ -1,5 +1,6 @@
 # Swedish message translation file for postgresql
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017,
+#   2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025. 2026.
 #
 # Många av termerna är tekniska termer som refererar till begrepp i SQL-satser
 # och liknande. Om man översätter vissa av dessa så kommer det bli väldigt
@@ -23,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-12 13:46+0000\n"
-"PO-Revision-Date: 2025-02-12 20:52+0100\n"
+"POT-Creation-Date: 2026-02-06 23:15+0000\n"
+"PO-Revision-Date: 2026-02-07 09:26+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -96,34 +97,34 @@ msgid "not recorded"
 msgstr "ej sparad"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1739 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3831 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1353 access/transam/xlog.c:3477
-#: access/transam/xlog.c:4341 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5113
-#: replication/logical/snapbuild.c:2052 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1353 access/transam/xlog.c:3478
+#: access/transam/xlog.c:4369 access/transam/xlogrecovery.c:1257
+#: access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392
+#: access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3841 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2546
+#: replication/slot.c:2587 replication/walsender.c:643
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "kunde inte läsa fil \"%s\": %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3482 access/transam/xlog.c:4346
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2057 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3483 access/transam/xlog.c:4374
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2550
+#: replication/slot.c:2591 replication/walsender.c:648
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -134,17 +135,18 @@ msgstr "kunde inte läsa fil \"%s\": läste %d av %zu"
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
 #: access/transam/timeline.c:512 access/transam/twophase.c:1365
-#: access/transam/twophase.c:1784 access/transam/xlog.c:3323
-#: access/transam/xlog.c:3517 access/transam/xlog.c:3522
-#: access/transam/xlog.c:3658 access/transam/xlog.c:4311
-#: access/transam/xlog.c:5246 commands/copyfrom.c:1799 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5165
-#: replication/logical/snapbuild.c:1819 replication/logical/snapbuild.c:1943
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/twophase.c:1783 access/transam/xlog.c:3324
+#: access/transam/xlog.c:3518 access/transam/xlog.c:3523
+#: access/transam/xlog.c:3659 access/transam/xlog.c:4339
+#: access/transam/xlog.c:5311 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2432 replication/slot.c:2598 replication/walsender.c:658
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:828
+#: storage/file/fd.c:3818 storage/file/fd.c:3924 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -168,105 +170,107 @@ msgstr ""
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1309 access/transam/xlog.c:3230
-#: access/transam/xlog.c:3393 access/transam/xlog.c:3432
-#: access/transam/xlog.c:3625 access/transam/xlog.c:4331
-#: access/transam/xlogrecovery.c:4264 access/transam/xlogrecovery.c:4367
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3766
-#: replication/logical/reorderbuffer.c:4320
-#: replication/logical/reorderbuffer.c:5093
-#: replication/logical/snapbuild.c:1774 replication/logical/snapbuild.c:1884
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2124
-#: utils/init/miscinit.c:1580 utils/init/miscinit.c:1714
-#: utils/init/miscinit.c:1791 utils/misc/guc.c:4777 utils/misc/guc.c:4827
+#: access/transam/twophase.c:1309 access/transam/xlog.c:3214
+#: access/transam/xlog.c:3394 access/transam/xlog.c:3433
+#: access/transam/xlog.c:3626 access/transam/xlog.c:4359
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2518 replication/walsender.c:616
+#: replication/walsender.c:3094 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:803 storage/file/fd.c:3575
+#: storage/file/fd.c:3805 storage/file/fd.c:3895 storage/smgr/md.c:686
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1757 access/transam/twophase.c:1766
-#: access/transam/xlog.c:9280 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1756 access/transam/twophase.c:1765
+#: access/transam/xlog.c:9340 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4127
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4105
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1778
-#: access/transam/xlog.c:3316 access/transam/xlog.c:3511
-#: access/transam/xlog.c:4304 access/transam/xlog.c:8655
-#: access/transam/xlog.c:8700 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1812
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1331 storage/smgr/md.c:1376
-#: storage/sync/sync.c:446 utils/misc/guc.c:4530
+#: access/transam/timeline.c:506 access/transam/twophase.c:1777
+#: access/transam/xlog.c:3314 access/transam/xlog.c:3512
+#: access/transam/xlog.c:4332 access/transam/xlog.c:8726
+#: access/transam/xlog.c:8770 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2416 replication/slot.c:2528 storage/file/fd.c:820
+#: storage/file/fd.c:3916 storage/smgr/md.c:1469 storage/smgr/md.c:1529
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:852 ../common/psprintf.c:143
-#: ../common/scram-common.c:268 ../common/stringinfo.c:314 ../port/path.c:828
-#: ../port/path.c:865 ../port/path.c:882 access/transam/twophase.c:1418
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3560 postmaster/postmaster.c:4021
-#: postmaster/postmaster.c:4383 postmaster/walsummarizer.c:935
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:210 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1465
-#: storage/ipc/procarray.c:2219 storage/ipc/procarray.c:2226
-#: storage/ipc/procarray.c:2731 storage/ipc/procarray.c:3435
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:532
-#: utils/adt/pg_locale.c:696 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4508 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2410 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1418
+#: access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3575
+#: postmaster/walsummarizer.c:938
+#: replication/libpqwalreceiver/libpqwalreceiver.c:364
+#: replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:912 storage/file/fd.c:1447
+#: storage/file/fd.c:1608 storage/file/fd.c:2592 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517
+#: utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:402 utils/mb/mbutils.c:430
+#: utils/mb/mbutils.c:815 utils/mb/mbutils.c:842 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "lyckades"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "destinationsbuffer för liten"
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "OpenSSL-fel"
 
@@ -290,34 +294,34 @@ msgstr "kunde inte hitta en \"%s\" att köra"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "kunde inte konvertera sökvägen \"%s\" till en absolut sökväg: %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1723
-#: commands/copyto.c:654 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "kunde inte köra kommandot \"%s\": %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "kunde inte läsa från kommando \"%s\": %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ingen data returnerades från kommandot \"%s\""
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1589 storage/ipc/latch.c:1751
-#: storage/ipc/latch.c:1877
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783
+#: storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203
+#: storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:830 ../port/path.c:867
-#: ../port/path.c:884 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "slut på minne\n"
@@ -327,51 +331,51 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3581
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1321
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1321
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1749
-#: commands/copyto.c:700 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:2173
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 commands/copyfrom.c:1889 commands/copyto.c:979
+#: commands/extension.c:3820 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1972 storage/file/fd.c:2060 storage/file/fd.c:3629
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1470
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1496
+#: storage/file/fd.c:2997 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3009
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1831 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:1027
+#: replication/slot.c:2299 replication/slot.c:2448 storage/file/fd.c:838
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -380,122 +384,126 @@ msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
 msgid "internal error"
 msgstr "internt fel"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Recursive-descent-parser kan inte använda inkrementell lexer."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "Inkrementell parser kräver en inkrementell lexer."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON nästlad för djupt, maximal tillåtet djup är 6400."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Escape-sekvens \"\\%.*s\" är ogiltig."
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Tecken med värde 0x%02x måste escape:as."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Förväntade slut på indata, men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Färväntade array-element eller \"]\", men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Förväntade \",\" eller \"]\", men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Förväntade sig \":\" men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Förväntade JSON-värde, men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Indatasträngen avslutades oväntat."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Färväntade sträng eller \"}\", men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Förväntade sig \",\" eller \"}\" men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Förväntade sträng, men hittade \"%.*s\"."
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Token \"%.*s\" är ogiltig."
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kan inte konverteras till text."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" måste följas av fyra hexdecimala siffror."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Escape-värden för unicode kan inte användas för kodpunkter med värde över 007F när kodningen inte är UTF8."
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Escape-värde för unicode kan inte översättas till serverns kodning %s."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicodes övre surrogathalva får inte komma efter en övre surrogathalva."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicodes lägre surrogathalva måste följa en övre surrogathalva."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "slut på minne vid skapande av felbeskrivning"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -590,7 +598,7 @@ msgstr "kunde inte avkoda filnamn"
 msgid "file size is not an integer"
 msgstr "filstorlek är inte ett haltal"
 
-#: ../common/parse_manifest.c:699 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "okänd algoritm för kontrollsumma: \"%s\""
@@ -659,9 +667,9 @@ msgstr "kunde inte parsa backup-manifest: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4712 utils/misc/guc.c:6931
-#: utils/misc/guc.c:6972
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "ogiltigt värde för parameter \"%s\": \"%s\""
@@ -722,22 +730,22 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "kunde inte hämta statuskod för underprocess: felkod %lu"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1717 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4589
-#: replication/logical/snapbuild.c:1712 replication/logical/snapbuild.c:2146
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1716 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 backup/walsummary.c:254
+#: postmaster/postmaster.c:1069 postmaster/syslogger.c:1489
+#: replication/logical/origin.c:614 replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2502 storage/file/fd.c:878 storage/file/fd.c:3443
+#: storage/file/fd.c:3505 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "kunde inte ta bort fil \"%s\": %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3435
+#: storage/file/fd.c:3844
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "kunde inte ta bort katalog \"%s\": %m"
@@ -754,28 +762,33 @@ msgstr "kunde inte koda den lagrade nyckeln"
 msgid "could not encode server key"
 msgstr "kunde inte koda servernyckeln"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "sträng-buffer överskrider maximalt tillåten längd (%zu byte)"
+
+#: ../common/stringinfo.c:363
 #, c-format
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "Kan inte utöka strängbuffer som innehåller %d byte med ytterligare %d bytes."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
 msgid ""
-"out of memory\n"
+"string buffer exceeds maximum allowed length (%zu bytes)\n"
 "\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
 msgstr ""
-"slut på minne\n"
+"sträng-buffer överskrider maximalt tillåten längd (%zu byte)\n"
 "\n"
-"Kan inte utöka strängbuffer som innehåller %d byte med ytterligare %d bytes.\n"
+"Kan inte utöka sträng-buffer som innehålker %d byte med ytterligare %d byte\n"
 
 #: ../common/username.c:43
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
 msgstr "kunde inte slå upp effektivt användar-id %ld: %s"
 
-#: ../common/username.c:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "användaren finns inte"
 
@@ -814,12 +827,12 @@ msgstr "barnprocess terminerades av signal %d: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "barnprocess avslutade med okänd statuskod %d"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "kunde inte bestämma kodning för teckentabell \"%s\""
 
-#: ../port/chklocale.c:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr "kunde inte bestämma kodning för lokal \"%s\": teckentabellen är \"%s\""
@@ -844,30 +857,30 @@ msgstr "kunde inte hämta knutpunkt (junction) för \"%s\": %s"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "kunde inte hämta knutpunkt (junction) för \"%s\": %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "kunde inte öppna fil \"%s\": %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "lås-överträdelse"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "sharing-överträdelse"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "Fortsätter att försöka i 30 sekunder."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "Du kan ha antivirus, backup eller liknande mjukvara som stör databassystemet"
 
-#: ../port/path.c:852
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "kunde inte fastställa nuvarande arbetskatalog: %m\n"
@@ -877,16 +890,6 @@ msgstr "kunde inte fastställa nuvarande arbetskatalog: %m\n"
 msgid "operating system error %d"
 msgstr "operativsystemfel %d"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "kunde inte slå upp lokalt användar-id %d: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "lokal användare med ID %d existerar inte"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -902,48 +905,50 @@ msgstr "kunde inte hämta SID för PowerUser-grupp: felkod %lu\n"
 msgid "could not check access token membership: error code %lu\n"
 msgstr "kunde inte kontrollera access-token-medlemskap: felkod %lu\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "förfrågan efter BRIN-intervallsummering för index \"%s\" sida %u har inte spelats in"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:936
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "återställning pågår"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "BRIN-kontrollfunktioner kan inte köras under återställning."
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "blocknummer är utanför giltigt intervall: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "blocknummer är utanför giltigt intervall: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "\"%s\" är inte ett BRIN-index"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "kunde inte öppna föräldratabell för index \"%s\""
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2277
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "index \"%s\" är inte giltigt"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -954,7 +959,7 @@ msgstr "kan inte acceptera ett värde av type %s"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -970,90 +975,90 @@ msgstr "trasigt BRIN-index: inkonsistent intervall-map"
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "oväntad sidtyp 0x%04X i BRIN-index \"%s\" block %u"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with invalid support number %d"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller funktion %s med ogiltigt supportnummer %d"
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller funktion %s med felaktig signatur för supportnummer %d"
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller operator %s med ogiltigt strateginummer %d"
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid "operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller ogiltig ORDER BY-specifikatioon för operator %s"
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with wrong signature"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller operator %s med felaktig signatur"
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing operator(s) for types %s and %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s saknar operator(er) för typerna %s och %s"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function(s) for types %s and %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s  saknas supportfunktion(er) för typerna %s och %s"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "operatorklass \"%s\" för accessmetoden %s saknar operator(er)"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "operatorklass \"%s\" för accessmetod %s saknar supportfunktion %d"
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Returnerad typ %s matchar inte förväntad type %s i kolumn %d."
+msgid "Returned type %s does not match expected type %s in column \"%s\" (position %d)."
+msgstr "Returnerad typ %s matchar inte förväntad typ %s i kolumn \"%s\" (position %d)."
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "Antalet returnerade kolumner (%d) matchar inte förväntat antal kolumner (%d)."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "kunde inte konvertera radtypen"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, c-format
 msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
 msgstr "Attribut \"%s\" för typ %s matchar inte motsvarande attribut för typ %s."
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "Attribut \"%s\" i typ %s finns inte i typ %s."
 
-#: access/common/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "antalet kolumner (%d) överskrider gränsen (%d)"
@@ -1063,96 +1068,101 @@ msgstr "antalet kolumner (%d) överskrider gränsen (%d)"
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "antalet indexerade kolumner (%d) överskrider gränsen (%d)"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "indexrad kräver %zu byte, maximal storlek är %zu"
 
-#: access/common/printtup.c:292 commands/explain.c:5376 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1956
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "ej stödd formatkod: %d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "Giltiga värden är \"on\", \"off\" och \"auto\"."
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Giltiga värden är \"local\" och \"cascaded\"."
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "överskriden gräns för användardefinierade relationsparametertyper"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "RESET får inte ha med värden på parametrar"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "okänd parameternamnrymd \"%s\""
 
-#: access/common/reloptions.c:1300 commands/variable.c:1214
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "ogiltigt flaggnamn \"%s\": får inte innehålla \"=\""
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "tabeller deklarerade med WITH OIDS stöds inte"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "okänd parameter \"%s\""
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "parameter \"%s\" angiven mer än en gång"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "ogiltigt värde för booleansk flagga \"%s\": \"%s\""
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "ogiltigt värde för heltalsflagga \"%s\": \"%s\""
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "värdet %s är utanför sitt intervall för flaggan \"%s\""
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Giltiga värden är mellan \"%d\" och \"%d\"."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "ogiltigt värde för flyttalsflagga \"%s\": %s"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Giltiga värden är mellan \"%f\" och \"%f\"."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "ogiltigt värde för enum-flagga \"%s\": %s"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "kan inte ange lagringsparametrar för partitionerad tabell"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "Ange lagringsparametrar för dess löv-partition istället."
@@ -1197,52 +1207,53 @@ msgstr "kan inte flytta temporära index tillhörande andra sessioner"
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "misslyckades att återfinna tuple i index \"%s\""
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963
+#: utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726
+#: utils/adt/rowtypes.c:974 utils/sort/tuplesortvariants.c:646
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "kunde inte hitta någon jämförelsefunktion för typen %s"
+
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "gamla GIN-index stöder inte hela-index-scan eller sökningar efter null"
 
-#: access/gin/ginscan.c:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "För att fixa detta, kör REINDEX INDEX \"%s\"."
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2200
-#: utils/adt/arrayfuncs.c:4016 utils/adt/arrayfuncs.c:6712
-#: utils/adt/rowtypes.c:974
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "kunde inte hitta någon jämförelsefunktion för typen %s"
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid "operator family \"%s\" of access method %s contains support function %s with different left and right input types"
 msgstr "operatorfamilj \"%s\" för accessmetod %s innehåller supportfunktion %s med olika vänster- och höger-inputtyper"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d or %d"
 msgstr "operatorklass \"%s\" för accessmetod \"%s\" saknar supportfunktion %d eller %d"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "supportfunktionsnummer %d är ogiltig för accessmetod %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "index \"%s\" innehåller en inre tupel som är markerad ogiltig"
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "Detta orsakas av en inkomplett siduppdelning under krashåterställning körd innan uppdatering till PostgreSQL 9.1."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1250,7 +1261,7 @@ msgstr "Detta orsakas av en inkomplett siduppdelning under krashåterställning
 msgid "Please REINDEX it."
 msgstr "Var vänlig och kör REINDEX på det."
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "lagar ofärdig split i index \"%s\", block %u"
@@ -1265,41 +1276,42 @@ msgstr "picksplit-metod för kolumn %d i index \"%s\" misslyckades"
 msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
 msgstr "Indexet är inte optimalt. För att optimera det, kontakta en utvecklare eller försök använda kolumnen som det andra värdet i CREATE INDEX-kommandot."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "index \"%s\" innehåller en oväntad nollställd sida vid block %u"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "index \"%s\" har en trasig sida vid block %u"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid "operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s"
 msgstr "operatorfamiljen \"%s\" för accessmetod %s innehåller en ORDER BY som inte stöds för operator %s"
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid "operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s"
 msgstr "operatorfamiljen \"%s\" för accessmetod %s innehåller en inkorrekt ORDER BY \"opfamiily\"-specifikation för operator %s"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:333
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1065
+#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:332
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "kunde inte bestämma vilken jämförelse (collation) som skall användas för sträng-hashning"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:334 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:508
-#: commands/indexcmds.c:2021 commands/tablecmds.c:18178 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1066 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:688
+#: catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655
+#: utils/adt/formatting.c:1719 utils/adt/formatting.c:1783
+#: utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1603
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Använd en COLLATE-klausul för att sätta jämförelsen explicit."
@@ -1310,7 +1322,7 @@ msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "indexradstorlek %zu överstiger hash-maximum %zu"
 
 #: access/hash/hashinsert.c:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "Värden större än en buffert-sida kan inte indexeras."
@@ -1325,7 +1337,7 @@ msgstr "ogiltigt overflow-blocknummer %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "slut på överspillsidor i hash-index \"%s\""
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "hash-index stöder inte hela-index-scans"
@@ -1340,54 +1352,54 @@ msgstr "index \"%s\" är inte ett hashträd"
 msgid "index \"%s\" has wrong hash version"
 msgstr "index \"%s\" har fel hash-version"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid "operator family \"%s\" of access method %s lacks support function for operator %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s saknar supportfunktion för operator %s"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "operatorfamilj \"%s\" för accessmetod %s saknar mellan-typ-operator(er)"
 
-#: access/heap/heapam.c:2206
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "kan inte lägga till tupler i en parellell arbetare"
 
-#: access/heap/heapam.c:2725
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "kan inte radera tupler under en parallell operation"
 
-#: access/heap/heapam.c:2772
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "försökte ta bort en osynlig tuple"
 
-#: access/heap/heapam.c:3220 access/heap/heapam.c:6501 access/index/genam.c:818
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "kan inte uppdatera tupler under en parallell operation"
 
-#: access/heap/heapam.c:3397
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "försökte uppdatera en osynlig tuple"
 
-#: access/heap/heapam.c:4908 access/heap/heapam.c:4946
-#: access/heap/heapam.c:5211 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031
+#: access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "kunde inte låsa rad i relationen \"%s\""
 
-#: access/heap/heapam.c:6314 commands/trigger.c:3340
-#: executor/nodeModifyTable.c:2376 executor/nodeModifyTable.c:2467
+#: access/heap/heapam.c:6425 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "tupel som skall uppdateras hade redan ändrats av en operation som triggats av aktuellt kommando"
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update"
 msgstr "tupel som skall låsas har redan flyttats till en annan partition av en samtida uppdatering"
@@ -1404,14 +1416,14 @@ msgstr "kunde inte skriva till fil \"%s\", skrev %d av %d: %m."
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3255 access/transam/xlog.c:3446
-#: access/transam/xlog.c:4283 access/transam/xlog.c:9269
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:340 postmaster/postmaster.c:4114
-#: postmaster/walsummarizer.c:1212 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3239 access/transam/xlog.c:3447
+#: access/transam/xlog.c:4311 access/transam/xlog.c:9329
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4092
+#: postmaster/walsummarizer.c:1215 replication/logical/origin.c:626
+#: replication/slot.c:2360 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "kunde inte skapa fil \"%s\": %m"
@@ -1423,162 +1435,177 @@ msgstr "kunde inte trunkera fil \"%s\" till %u: %m"
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3305 access/transam/xlog.c:3502
-#: access/transam/xlog.c:4295 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:351 postmaster/launch_backend.c:363
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1788
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1655
-#: utils/init/miscinit.c:1666 utils/init/miscinit.c:1674 utils/misc/guc.c:4491
-#: utils/misc/guc.c:4522 utils/misc/guc.c:5675 utils/misc/guc.c:5693
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3300 access/transam/xlog.c:3503
+#: access/transam/xlog.c:4323 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2396 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "kunde inte skriva till fil \"%s\": %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "aggressiv vaccum av \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "kör vaccum på \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "avslutade vacuum av \"%s.%s.%s\": indexskanningar: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisk aggressiv vacuum för att förhindra \"wraparound\" av tabell \"%s.%s.%s\": indexskanningar: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisk vacuum för att förhindra \"wraparound\" av tabell \"%s.%s.%s\": indexskanningar: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisk vacuum av tabell \"%s.%s.%s\": indexskanningar: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "automatisk vacuum av tabell \"%s.%s.%s\": indexskanningar: %d\n"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
-msgstr "sidor: %u borttagna, %u kvar, %u skannade (%-2f%% av totala antalet)\n"
+msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
+msgstr "sidor: %u borttagna, %u kvar, %u skannade (%-2f%% av totala antalet), %u ivrigt skannade\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
-msgid "tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
-msgstr "tupler: %lld borttagna, %lld kvar, %lld är döda men ännu inte möjliga att ta bort\n"
+msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
+msgstr "tupler: %<PRId64> borttagna, %<PRId64> kvar, %<PRId64> är döda men ännu inte möjliga att ta bort\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
-msgid "tuples missed: %lld dead from %u pages not removed due to cleanup lock contention\n"
-msgstr "tupler missade: %lld döda från %u sidor som inte tagits bort på grund av låstvister vid städning\n"
+msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
+msgstr "tupler missade: %<PRId64> döda från %u sidor som inte tagits bort på grund av låstvister vid städning\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "gräns för borttagning: %u, som var %d XID:er gammal när operationen avslutades\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "ny relfrozenxid: %u, som är %d XID:er före tidigare värde\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "ny relminmxid: %u, som är %d MXID:er för tidigare värde\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
+#, c-format
+msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
+msgstr "frysta: %u sidor i tabellen (%.2f%% av totalt) hade %<PRId64> frysta tupler\n"
+
+#: access/heap/vacuumlazy.c:1062
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
-msgstr "frysta: %u sidor i tabellen (%.2f%% av totalt) hade %lld frysta tupler\n"
+msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
+msgstr "synlighetskarta: %u sidor satta till all-visible, %u sidor satta till all-frozen (%u var all-visible)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "index-scan behövdes inte: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "index-scan behövdes: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
-msgid "%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"
-msgstr "%u sidor i tabell (%.2f%% av totalt) hade %lld döda postidentifierare borttagna\n"
+msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
+msgstr "%u sidor i tabell (%.2f%% av totalt) hade %<PRId64> döda postidentifierare borttagna\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "index-scan överhoppad: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "index-scan överhoppad av felsäkerhetsfunktion: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
-msgstr "%u sidor från tabell (%.2f%% totalt) har %lld döda postidentifierare\n"
+msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
+msgstr "%u sidor från tabell (%.2f%% totalt) har %<PRId64> döda postidentifierare\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "index \"%s\": sidor: %u totalt, %u tidigare borttagna, %u nuvarande borttagna, %u återanvändbara\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "fördröjning: %.3f ms\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "I/O-timing: läs: %.3f ms, skriv: %.3f ms\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:797
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "snitt läshastighet: %.3f MB/s, snitt skrivhastighet: %.3f MB/s\n"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:799
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
-msgstr "bufferanvändning: %lld träffar, %lld missar, %lld nersmutsade\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
+msgstr "bufferanvändning: %<PRId64> träffar, %<PRId64> läsningar, %<PRId64> nersmutsade\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
-msgstr "WAL-användning: %lld poster, %lld hela sidor, %llu bytes\n"
+msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
+msgstr "WAL-användning: %<PRId64> poster, %<PRId64> hela sidor, %<PRIu64> byte, %<PRId64> fulla buffers\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:803
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "systemanvändning: %s"
 
-#: access/heap/vacuumlazy.c:2170
+#: access/heap/vacuumlazy.c:1432
+#, c-format
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
+msgstr "slår av tidig skanning efter frysning av %u tidigt skannade block för relationen \"%s.%s.%s\""
+
+#: access/heap/vacuumlazy.c:2821
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
-msgstr "tabell \"%s\": tog bort %lld döda postidentifierare i %u sidor"
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
+msgstr "tabell \"%s\": tog bort %<PRId64> döda postidentifierare i %u sidor"
 
-#: access/heap/vacuumlazy.c:2324
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "hoppar över ej nödvändigt underhåll av tabell \"%s.%s.%s\" som skyddsåtgärd efter %d index-scan"
 
-#: access/heap/vacuumlazy.c:2327
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "Tabellens relfrozenxid eller relminmxid är för långt bak i tiden."
 
-#: access/heap/vacuumlazy.c:2328
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid ""
 "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
@@ -1587,67 +1614,67 @@ msgstr ""
 "Överväg att öka konfigurationsparametern \"maintenance_work_mem\" eller \"autovacuum_work_mem\".\n"
 "Du kan också överväga andra metoder för att VACUUM skall hinna med allokeringen av transactions-ID."
 
-#: access/heap/vacuumlazy.c:2590
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": stoppar trunkering pga konfliktande låskrav"
 
-#: access/heap/vacuumlazy.c:2660
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "tabell \"%s\": trunkerade %u till %u sidor"
 
-#: access/heap/vacuumlazy.c:2722
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "tabell \"%s\": pausar trunkering pga konfliktande låskrav"
 
-#: access/heap/vacuumlazy.c:2841
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "stänger av parallell-flaggan för vacuumn på \"%s\" --- kan inte köra vacuum på temporära tabeller parallellt"
 
-#: access/heap/vacuumlazy.c:3108
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "vid skanning av block %u offset %u i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3111
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "vid skanning av block %u i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3115
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "vid skanning av relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3123
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "vid vacuum av block %u offset %u i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3126
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "vid vacuum av block %u i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3130
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "vid vacuum av relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3135 commands/vacuumparallel.c:1112
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "vid vaccum av index \"%s\" i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1118
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "vid uppstädning av index \"%s\" i relation \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3146
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "vid trunkering av relation \"%s.%s\" till %u block"
@@ -1662,24 +1689,24 @@ msgstr "accessmetod \"%s\" har inte typ %s"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "indexaccessmetod \"%s\" har ingen hanterare"
 
-#: access/index/genam.c:489
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "transaktionen avbruten under scan av systemkatalog"
 
-#: access/index/genam.c:657 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "kan inte använda index \"%s\" som håller på att indexeras om"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2851 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17873 commands/tablecmds.c:19762
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" är inte ett index"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "operatorklass %s har inga flaggor"
@@ -1700,7 +1727,7 @@ msgid "This may be because of a non-immutable index expression."
 msgstr "Det kan bero på ett icke-immutable indexuttryck."
 
 #: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2323
+#: parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "index \"%s\" är inte ett btree"
@@ -1720,17 +1747,17 @@ msgstr "index \"%s\" innehåller en halvdöd intern sida"
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "Detta kan ha orsakats av en avbruten VACUUM i version 9.3 eller äldre, innan uppdatering. Vänligen REINDEX:era det."
 
-#: access/nbtree/nbtutils.c:5108
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "indexradstorlek %zu överstiger btree version %u maximum %zu för index \"%s\""
 
-#: access/nbtree/nbtutils.c:5114
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "Indexrad refererar tupel (%u,%u) i relation \"%s\"."
 
-#: access/nbtree/nbtutils.c:5118
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -1740,58 +1767,58 @@ msgstr ""
 "Kanske kan du använda ett funktionsindex av ett MD5-hashvärde istället\n"
 "eller möjligen full-text-indexering."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s saknar supportfunktioner för typerna %s och %s"
 
 #: access/sequence/sequence.c:75 access/table/table.c:145
-#: optimizer/util/plancat.c:144
+#: optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "kan inte öppna relationen \"%s\""
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid "compress method must be defined when leaf type is different from input type"
 msgstr "komprimeringsmetod måste definieras när lövtypen skiljer sig från indatatypen"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "SP-GiST inre tuplestorlek %zu överstiger maximala %zu"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr "SP-GiST lövdatatyp %s matchar deklarerad typ %s"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "operatorfamilj \"%s\" för accessmetod %s saknar supportfunktion %d för typ %s"
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "tid (%u, %u) är inte giltigt för relation \"%s\""
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "\"%s\" får inte vara tom."
 
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4859
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "\"%s\" är för lång (maximalt %d tecken)."
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "tabellaccessmetod \"%s\" existerar inte"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "Tabellaccessmetod \"%s\" existerar inte."
@@ -1821,13 +1848,13 @@ msgstr "Se till att konfigurationsparametern \"%s\" är satt på primär-servern
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Se till att konfigurationsparametern \"%s\" är satt."
 
-#: access/transam/multixact.c:1091
+#: access/transam/multixact.c:1179
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "databasen tar inte emot kommandon som tilldelar nya MultiXactId:er för att förhinda dataförlust vid \"wraparound\" i databasen \"%s\""
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188
+#: access/transam/multixact.c:1212 access/transam/multixact.c:1221
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid ""
@@ -1837,65 +1864,70 @@ msgstr ""
 "Utför en databas-VACUUM i hela den databasen.\n"
 "Du kan också behöva commit:a eller rulla tillbaka gamla förberedda transaktioner eller slänga gamla replikeringsslottar."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1186
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "databasen tar inte emot kommandon som tilldelar nya MultiXactId:er för att förhinda dataförlust vid \"wraparound\" i databasen med OID %u"
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, 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] "databasen \"%s\" måste städas innan ytterligare %u MultiXactId används"
 msgstr[1] "databasen \"%s\" måste städas innan ytterligare %u MultiXactId:er används"
 
-#: access/transam/multixact.c:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, 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] "databas med OID %u måste städas (vacuum) innan %u till MultiXactId används"
 msgstr[1] "databas med OID %u måste städas (vacuum) innan %u till MultiXactId:er används"
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "multixact \"members\"-gräns överskriden"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1281
 #, 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] "Detta kommando skapar en multixact med %u medlemmar, men återstående utrymmer räcker bara till %u medlem."
 msgstr[1] "Detta kommando skapar en multixact med %u medlemmar, men återstående utrymmer räcker bara till %u medlemmar."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1286
 #, 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 "Kör en databas-VACUUM i hela databasen med OID %u med reducerade inställningar för \"vacuum_multixact_freeze_min_age\" och \"vacuum_multixact_freeze_table_age\"."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1317
 #, c-format
 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] "databas med OID %u måste städas innan %d mer multixact-medlem används"
 msgstr[1] "databas med OID %u måste städas innan %d fler multixact-medlemmar används"
 
-#: access/transam/multixact.c:1231
+#: access/transam/multixact.c:1322
 #, 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 "Kör en databas-VACUUM i hela den databasen med reducerade inställningar för \"vacuum_multixact_freeze_min_age\" och \"vacuum_multixact_freeze_table_age\"."
 
-#: access/transam/multixact.c:1371
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u finns inte längre -- troligen en wraparound"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u har inte skapats än -- troligen en wraparound"
 
-#: access/transam/multixact.c:2479 access/transam/multixact.c:2488
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "MultiXact %u har ett ogiltigt offset till nästa"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid ""
 "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
@@ -1904,61 +1936,66 @@ msgstr ""
 "För att undvika fel vid tilldelning av MultiXactId så utför en databas-VACCUM för hela den databasen.\n"
 "Du kan också behöva commit:a eller rulla tillbaka gamla förberedda transaktioner eller slänga gamla replikeringsslottar."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2845
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "MultiXact-medlems wraparound-skydd är avslagen eftersom äldsta checkpoint:ade MultiXact %u inte finns på disk"
 
-#: access/transam/multixact.c:2789
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "MultiXact-medlems wraparound-skydd är nu påslagen"
 
-#: access/transam/multixact.c:3180
+#: access/transam/multixact.c:3258
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "äldsta MultiXact %u hittas inte, tidigast MultiXact %u, skippar trunkering"
 
-#: access/transam/multixact.c:3198
+#: access/transam/multixact.c:3276
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "kan inte trunkera upp till %u eftersom den inte finns på disk, skippar trunkering"
 
-#: access/transam/multixact.c:3517
+#: access/transam/multixact.c:3293
+#, c-format
+msgid "cannot truncate up to MultiXact %u because it has invalid offset, skipping truncation"
+msgstr "kan inte trunkera upp till MultiXact %u eftersom den har ogitlig offset, skippar trunkering"
+
+#: access/transam/multixact.c:3638
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "ogiltig MultiXactId: %u"
 
-#: access/transam/parallel.c:748 access/transam/parallel.c:867
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "parallell arbetare misslyckades med initiering"
 
-#: access/transam/parallel.c:749 access/transam/parallel.c:868
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "Fler detaljer kan finnas i serverloggen."
 
-#: access/transam/parallel.c:929
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster avslutade under en parallell transaktion"
 
-#: access/transam/parallel.c:1116
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "tappad kopplingen till parallell arbetare"
 
-#: access/transam/parallel.c:1172 access/transam/parallel.c:1174
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "parallell arbetare"
 
-#: access/transam/parallel.c:1344 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "kunde inte skapa dynamiskt delat minnessegment: %m"
 
-#: access/transam/parallel.c:1349 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "ogiltigt magiskt nummer i dynamiskt delat minnessegment"
@@ -2021,63 +2058,63 @@ msgstr "registrerade egendefinerad resurshanterare \"%s\" med ID %d"
 
 #: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
-msgstr "\"%s\" måste vara en multiple av \"%d\""
+msgid "\"%s\" must be a multiple of %d."
+msgstr "\"%s\" måste vara en multiple av %d."
 
-#: access/transam/slru.c:830
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "filen \"%s\" existerar inte, läses som nollor"
 
-#: access/transam/slru.c:1059 access/transam/slru.c:1065
-#: access/transam/slru.c:1073 access/transam/slru.c:1078
-#: access/transam/slru.c:1085 access/transam/slru.c:1090
-#: access/transam/slru.c:1097 access/transam/slru.c:1104
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "kunde inte läsa status på transaktion %u"
 
-#: access/transam/slru.c:1060
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "Kunde inte öppna fil \"%s\": %m."
 
-#: access/transam/slru.c:1066
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "Kunde inte söka i fil \"%s\" till offset %d: %m."
 
-#: access/transam/slru.c:1074
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "Kunde inte läsa från fil \"%s\" på offset %d: %m."
 
-#: access/transam/slru.c:1079
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "Kunde inte läsa från fil \"%s\" på offset %d: läste för få bytes."
 
-#: access/transam/slru.c:1086
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "Kunde inte skriva till fil \"%s\" på offset %d: %m."
 
-#: access/transam/slru.c:1091
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "Kunde inte skriva till fil \"%s\" på offset %d: skrev för få bytes."
 
-#: access/transam/slru.c:1098
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "Kunde inte fsync:a fil \"%s\": %m."
 
-#: access/transam/slru.c:1105
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "Kunde inte stänga fil \"%s\": %m."
 
-#: access/transam/slru.c:1431
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "Kunde inte trunkera katalog \"%s\": trolig wraparound"
@@ -2142,12 +2179,12 @@ msgstr "Sätt \"max_prepared_transactions\" till ett värde som inte är noll."
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "transaktionsidentifierare \"%s\" används redan"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2531
+#: access/transam/twophase.c:404 access/transam/twophase.c:2530
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "maximalt antal förberedda transaktioner har uppnåtts"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2532
+#: access/transam/twophase.c:405 access/transam/twophase.c:2531
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr "Öka \"max_prepared_transactions\" (nu %d)."
@@ -2219,9 +2256,9 @@ msgstr "felaktig storlek lagrad i fil \"%s\""
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "beräknad CRC-checksumma matchar inte värdet som är lagrat i filen \"%s\""
 
-#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:936 replication/logical/logical.c:211
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572
+#: postmaster/walsummarizer.c:939 replication/logical/logical.c:213
+#: replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "Misslyckades vid allokering av en WAL-läs-processor."
@@ -2241,64 +2278,64 @@ msgstr "kunde inte läsa tvåfas-status från WAL vid %X/%X"
 msgid "expected two-phase state data is not present in WAL at %X/%X"
 msgstr "förväntad tvåfas-statusdata finns inte i WAL vid %X/%X"
 
-#: access/transam/twophase.c:1745
+#: access/transam/twophase.c:1744
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "kan inte återskapa fil \"%s\": %m"
 
-#: access/transam/twophase.c:1872
+#: access/transam/twophase.c:1871
 #, c-format
 msgid "%u two-phase state file was written for a long-running prepared transaction"
 msgid_plural "%u two-phase state files were written for long-running prepared transactions"
 msgstr[0] "%u tvåfas-statusfil skrevs för långkörande förberedd transkation"
 msgstr[1] "%u tvåfas-statusfiler skrevs för långkörande förberedda transaktioner"
 
-#: access/transam/twophase.c:2107
+#: access/transam/twophase.c:2106
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "återskapar förberedd transaktion %u från delat minne"
 
-#: access/transam/twophase.c:2200
+#: access/transam/twophase.c:2199
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "tar bort död tvåfas-statusfil för transaktioon %u"
 
-#: access/transam/twophase.c:2207
+#: access/transam/twophase.c:2206
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr "tar bort död tvåfas-statusfil från minne för transaktion %u"
 
-#: access/transam/twophase.c:2220
+#: access/transam/twophase.c:2219
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "tar bort framtida tvåfas-statusfil för transaktion %u"
 
-#: access/transam/twophase.c:2227
+#: access/transam/twophase.c:2226
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "tar bort framtida tvåfas-statusfil från minne för transaktion %u"
 
-#: access/transam/twophase.c:2252
+#: access/transam/twophase.c:2251
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "korrupt tvåfas-statusfil för transaktion %u"
 
-#: access/transam/twophase.c:2257
+#: access/transam/twophase.c:2256
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "korrupt tvåfas-status i minnet för transaktion %u"
 
-#: access/transam/twophase.c:2514
+#: access/transam/twophase.c:2513
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "kunde inte återställa tvåfas-statusfil för transaktion %u"
 
-#: access/transam/twophase.c:2516
+#: access/transam/twophase.c:2515
 #, c-format
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr "Statefil för tvåfas har hittats i WAL-post %X/%X men denna transaktion har redan återställts från disk."
 
-#: access/transam/twophase.c:2524 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2523 storage/file/fd.c:514 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "kunde inte komma åt filen \"%s\": %m"
@@ -2342,584 +2379,530 @@ msgstr ""
 "För att undvika fel vid tilldelning av XID så utför en databas-VACCUM för hela den databasen.\n"
 "Du kan också behöva commit:a eller rulla tillbaka gamla förberedda transaktioner eller slänga gamla replikeringsslottar."
 
-#: access/transam/xact.c:649
+#: access/transam/xact.c:652
 #, c-format
 msgid "cannot assign transaction IDs during a parallel operation"
 msgstr "can inte tilldela transaktions-ID under en parallell operation"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "kan inte modifiera data i en parellell arbetare"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "kan inte starta kommandon under en parallell operation"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "kan inte ha mer än 2^32-2 kommandon i en transaktion"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "maximalt antal commit:ade undertransaktioner (%d) överskridet"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr "kan inte göra PREPARE på en transaktion som har arbetat med temporära objekt"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "kan inte göra PREPARE på en transaktion som har exporterade snapshots"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3593
+#: access/transam/xact.c:3657
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s kan inte köras i ett transaktionsblock"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3603
+#: access/transam/xact.c:3667
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s kan inte köras i en undertransaktion"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s kan inte köras inuti en pipeline"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s kan inte köras från en funktion"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s kan bara användas i transaktionsblock"
 
-#: access/transam/xact.c:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "det är redan en transaktion igång"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "ingen transaktion pågår"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "kan inte commit:a under en parallell operation"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "can inte avbryta under en parallell operation"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "kan inte definiera sparpunkter under en parallell operation"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "kan inte frigöra en sparpunkt under en parallell operation"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "sparpunkt \"%s\" existerar inte"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr "sparpunkt \"%s\" finns inte inom aktuell sparpunktsnivå"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "kan inte rulla tillbaka till sparpunkt under en parallell operation"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, c-format
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "kan inte ha mer än 2^32-1 undertransaktioner i en transaktion"
 
-#: access/transam/xlog.c:1542
+#: access/transam/xlog.c:1544
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr "förfrågan att flush:a efter slutet av genererad WAL; efterfrågad %X/%X, aktuell position %X/%X"
 
-#: access/transam/xlog.c:1769
+#: access/transam/xlog.c:1771
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr "kan inte läsa efter slutet av genererad WAL; efterfrågad %X/%X, aktuell position %X/%X"
 
-#: access/transam/xlog.c:2210 access/transam/xlog.c:4501
+#: access/transam/xlog.c:2218 access/transam/xlog.c:4547
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL-segmentstorleken måste vara en tvåpotens mellan 1 MB och 1 GB."
 
-#: access/transam/xlog.c:2228
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "\"%s\" måsta vara satt till -1 i binärt uppgraderingsläge"
-
-#: access/transam/xlog.c:2477
+#: access/transam/xlog.c:2454
 #, c-format
 msgid "could not write to log file \"%s\" at offset %u, length %zu: %m"
 msgstr "kunde inte skriva till loggfil \"%s\" vid offset %u, längd %zu: %m"
 
-#: access/transam/xlog.c:3739 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3740 access/transam/xlogutils.c:820
+#: replication/walsender.c:3088
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "efterfrågat WAL-segment %s har redan tagits bort"
 
-#: access/transam/xlog.c:4061
+#: access/transam/xlog.c:4062
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "kunde inte byta namn på fil \"%s\": %m"
 
-#: access/transam/xlog.c:4104 access/transam/xlog.c:4115
-#: access/transam/xlog.c:4136
+#: access/transam/xlog.c:4105 access/transam/xlog.c:4116
+#: access/transam/xlog.c:4137
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "krävd WAL-katalog \"%s\" finns inte"
 
-#: access/transam/xlog.c:4121 access/transam/xlog.c:4142
+#: access/transam/xlog.c:4122 access/transam/xlog.c:4143
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "skapar saknad WAL-katalog \"%s\""
 
-#: access/transam/xlog.c:4125 access/transam/xlog.c:4145
-#: commands/dbcommands.c:3262
+#: access/transam/xlog.c:4126 access/transam/xlog.c:4146
+#: commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "kunde inte skapa saknad katalog \"%s\": %m"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4213
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "kunde inte generera hemligt auktorisationstoken"
 
-#: access/transam/xlog.c:4363 access/transam/xlog.c:4373
-#: access/transam/xlog.c:4399 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4415 access/transam/xlog.c:4421
-#: access/transam/xlog.c:4429 access/transam/xlog.c:4437
-#: access/transam/xlog.c:4445 access/transam/xlog.c:4453
-#: access/transam/xlog.c:4461 access/transam/xlog.c:4469
-#: access/transam/xlog.c:4479 access/transam/xlog.c:4487
-#: utils/init/miscinit.c:1812
+#: access/transam/xlog.c:4391 access/transam/xlog.c:4401
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4437
+#: access/transam/xlog.c:4447 access/transam/xlog.c:4453
+#: access/transam/xlog.c:4463 access/transam/xlog.c:4473
+#: access/transam/xlog.c:4483 access/transam/xlog.c:4493
+#: access/transam/xlog.c:4503 access/transam/xlog.c:4513
+#: access/transam/xlog.c:4525 access/transam/xlog.c:4533
+#: utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "databasfilerna är inkompatibla med servern"
 
-#: access/transam/xlog.c:4364
+#: access/transam/xlog.c:4392
 #, 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 "Databasklustret initierades med PG_CONTROL_VERSION %d (0x%08x), men servern kompilerades med PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4368
+#: access/transam/xlog.c:4396
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "Detta kan orsakas av en felaktig byte-ordning.  Du behöver troligen köra initdb."
 
-#: access/transam/xlog.c:4374
+#: access/transam/xlog.c:4402
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "Databasklustret initierades med PG_CONTROL_VERSION %d, men servern kompilerades med PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4377 access/transam/xlog.c:4403
-#: access/transam/xlog.c:4411 access/transam/xlog.c:4417
+#: access/transam/xlog.c:4405 access/transam/xlog.c:4433
+#: access/transam/xlog.c:4443 access/transam/xlog.c:4449
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Du behöver troligen köra initdb."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4417
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "ogiltig kontrollsumma kontrollfil"
 
-#: access/transam/xlog.c:4400
-#, c-format
-msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
-msgstr "Databasklustret initierades med CATALOG_VERSION_NO %d, men servern kompilerades med CATALOG_VERSION_NO %d."
-
-#: access/transam/xlog.c:4408
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4429 access/transam/xlog.c:4439
+#: access/transam/xlog.c:4455 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4475 access/transam/xlog.c:4485
+#: access/transam/xlog.c:4495 access/transam/xlog.c:4505
+#: access/transam/xlog.c:4515
 #, c-format
-msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
-msgstr "Databasklustret initierades med MAXALIGN %d, men servern kompilerades med MAXALIGN %d."
+msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
+msgstr "Databasklustret initierades med %s %d, men servern kompilerades med %s %d."
 
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4448
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "Databasklustret verkar använda en annan flyttalsrepresentation än vad serverprogrammet gör."
 
-#: access/transam/xlog.c:4422
-#, c-format
-msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
-msgstr "Databasklustret initierades med BLCKSZ %d, men servern kompilerades med BLCKSZ %d."
-
-#: access/transam/xlog.c:4425 access/transam/xlog.c:4433
-#: access/transam/xlog.c:4441 access/transam/xlog.c:4449
-#: access/transam/xlog.c:4457 access/transam/xlog.c:4465
-#: access/transam/xlog.c:4473 access/transam/xlog.c:4482
-#: access/transam/xlog.c:4490
+#: access/transam/xlog.c:4459 access/transam/xlog.c:4469
+#: access/transam/xlog.c:4479 access/transam/xlog.c:4489
+#: access/transam/xlog.c:4499 access/transam/xlog.c:4509
+#: access/transam/xlog.c:4519 access/transam/xlog.c:4528
+#: access/transam/xlog.c:4536
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Det verkar som om du måste kompilera om eller köra initdb."
 
-#: access/transam/xlog.c:4430
-#, c-format
-msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
-msgstr "Databasklustret initierades med RELSEG_SIZE %d, men servern kompilerades med RELSEG_SIZE %d."
-
-#: access/transam/xlog.c:4438
-#, c-format
-msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
-msgstr "Databasklustret initierades med XLOG_BLCKSZ %d, men servern kompilerades med XLOG_BLCKSZ %d."
-
-#: access/transam/xlog.c:4446
-#, c-format
-msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
-msgstr "Databasklustret initierades med NAMEDATALEN %d, men servern kompilerades med NAMEDATALEN %d."
-
-#: access/transam/xlog.c:4454
-#, c-format
-msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
-msgstr "Databasklustret initierades med INDEX_MAX_KEYS %d, men servern kompilerades med INDEX_MAX_KEYS %d."
-
-#: access/transam/xlog.c:4462
-#, 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 "Databasklustret initierades med TOAST_MAX_CHUNK_SIZE %d, men servern kompilerades med TOAST_MAX_CHUNK_SIZE %d."
-
-#: access/transam/xlog.c:4470
-#, c-format
-msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
-msgstr "Databasklustret initierades med LOBLKSIZE %d, men servern kompilerades med LOBLKSIZE %d."
-
-#: access/transam/xlog.c:4480
+#: access/transam/xlog.c:4526
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "Databasklustret initierades utan USE_FLOAT8_BYVAL, men servern kompilerades med USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4488
+#: access/transam/xlog.c:4534
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "Databasklustret initierades med USE_FLOAT8_BYVAL, men servern kompilerades utan USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4497
+#: access/transam/xlog.c:4543
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 msgstr[1] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 
-#: access/transam/xlog.c:4510
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"min_wal_size\" måste vara minst dubbla \"wal_segment_size\""
-
-#: access/transam/xlog.c:4514
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4557 access/transam/xlog.c:4563
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"max_wal_size\" måste vara minst dubbla \"wal_segment_size\""
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "\"%s\" måste vara minst dubbla \"%s\""
 
-#: access/transam/xlog.c:4662 catalog/namespace.c:4696
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 tcop/postgres.c:3715 utils/error/elog.c:2247
+#: access/transam/xlog.c:4725 catalog/namespace.c:4699
+#: commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72
+#: replication/slot.c:2768 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "List-syntaxen är ogiltig."
 
-#: access/transam/xlog.c:4708 commands/user.c:2545 commands/variable.c:173
-#: tcop/postgres.c:3731 utils/error/elog.c:2273
+#: access/transam/xlog.c:4771 commands/user.c:2547 commands/variable.c:173
+#: tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Okänt nyckelord: \"%s\""
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5194
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "kunde inte skriva bootstrap-write-ahead-loggfil: %m"
 
-#: access/transam/xlog.c:5137
+#: access/transam/xlog.c:5202
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "kunde inte fsync:a bootstrap-write-ahead-loggfil: %m"
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5208
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "kunde inte stänga bootstrap-write-ahead-loggfil: %m"
 
-#: access/transam/xlog.c:5368
+#: access/transam/xlog.c:5433
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "WAL genererades med \"wal_level=minimal\", kan inte fortsätta återställande"
 
-#: access/transam/xlog.c:5369
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "Detta händer om du temporärt sätter \"wal_level=minimal\" på servern."
 
-#: access/transam/xlog.c:5370
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "Använd en backup som är tagen efter att inställningen \"wal_level\" satts till ett högre värde än \"minimal\"."
 
-#: access/transam/xlog.c:5435
+#: access/transam/xlog.c:5500
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "kontrollfil innehåller ogiltig checkpoint-position"
 
-#: access/transam/xlog.c:5446
+#: access/transam/xlog.c:5511
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "databassystemet stängdes ner vid %s"
 
-#: access/transam/xlog.c:5452
+#: access/transam/xlog.c:5517
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "databassystemet stängdes ner under återställning vid %s"
 
-#: access/transam/xlog.c:5458
+#: access/transam/xlog.c:5523
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "nedstängning av databasen avbröts; senast kända upptidpunkt vid %s"
 
-#: access/transam/xlog.c:5464
+#: access/transam/xlog.c:5529
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "databassystemet avbröts under återställning vid %s"
 
-#: access/transam/xlog.c:5466
+#: access/transam/xlog.c:5531
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "Det betyder troligen att en del data är förstörd och du behöver återställa databasen från den senaste backup:en."
 
-#: access/transam/xlog.c:5472
+#: access/transam/xlog.c:5537
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "databassystemet avbröts under återställning vid loggtid %s"
 
-#: access/transam/xlog.c:5474
+#: access/transam/xlog.c:5539
 #, 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 "Om detta har hänt mer än en gång så kan data vara korrupt och du kanske måste återställa till ett tidigare återställningsmål."
 
-#: access/transam/xlog.c:5480
+#: access/transam/xlog.c:5545
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "databassystemet avbröts; senast kända upptidpunkt vid %s"
 
-#: access/transam/xlog.c:5487
+#: access/transam/xlog.c:5552
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "kontrollfil innehåller ogiltigt databasklustertillstånd"
 
-#: access/transam/xlog.c:5875
+#: access/transam/xlog.c:5940
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL slutar före sluttiden av online-backup:en"
 
-#: access/transam/xlog.c:5876
+#: access/transam/xlog.c:5941
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Alla genererade WAL under tiden online-backup:en togs måste vara tillgängliga vid återställning."
 
-#: access/transam/xlog.c:5880
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL avslutas innan konstistent återställningspunkt"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5991
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "valt nytt tidslinje-ID: %u"
 
-#: access/transam/xlog.c:5959
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "archive recovery complete"
 msgstr "arkivåterställning klar"
 
-#: access/transam/xlog.c:6612
+#: access/transam/xlog.c:6653
 #, c-format
 msgid "shutting down"
 msgstr "stänger ner"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6651
+#: access/transam/xlog.c:6692
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "restartpoint startar:%s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6663
+#: access/transam/xlog.c:6704
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "checkpoint startar:%s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6728
+#: access/transam/xlog.c:6769
 #, c-format
-msgid "restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "restartpoint klar: skrev %d buffers (%.1f%%); %d WAL-fil(er) tillagda, %d borttagna, %d recyclade; skriv=%ld.%03d s, synk=%ld.%03d s, totalt=%ld.%03d s; synk-filer=%d, längsta=%ld.%03d s, genomsnitt=%ld.%03d s; distans=%d kB, estimat=%d kB; lsn=%X/%X, redo-lsn=%X/%X"
+msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "restartpoint klar: skrev %d buffers (%.1f%%); skrev %d SLRU buffers; %d WAL-fil(er) tillagda, %d borttagna, %d recyclade; skriv=%ld.%03d s, synk=%ld.%03d s, totalt=%ld.%03d s; synk-filer=%d, längsta=%ld.%03d s, genomsnitt=%ld.%03d s; distans=%d kB, estimat=%d kB; lsn=%X/%X, redo-lsn=%X/%X"
 
-#: access/transam/xlog.c:6751
+#: access/transam/xlog.c:6793
 #, c-format
-msgid "checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "checkpoint klar: skrev %d buffers (%.1f%%); %d WAL-fil(er) tillagda, %d borttagna, %d recyclade; skriv=%ld.%03d s, synk=%ld.%03d s, totalt=%ld.%03d s; synk-filer=%d, längsta=%ld.%03d s, genomsnitt=%ld.%03d s; distans=%d kB, estimat=%d kB; lsn=%X/%X, redo-lsn=%X/%X"
+msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "checkpoint klar: skrev %d buffers (%.1f%%); skrev %d SLRU buffers; %d WAL-fil(er) tillagda, %d borttagna, %d recyclade; skriv=%ld.%03d s, synk=%ld.%03d s, totalt=%ld.%03d s; synk-filer=%d, längsta=%ld.%03d s, genomsnitt=%ld.%03d s; distans=%d kB, estimat=%d kB; lsn=%X/%X, redo-lsn=%X/%X"
 
-#: access/transam/xlog.c:7233
+#: access/transam/xlog.c:7279
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "samtidig write-ahead-logg-aktivitet när databassystemet stängs ner"
 
-#: access/transam/xlog.c:7818
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "återställningens omstartspunkt vid %X/%X"
 
-#: access/transam/xlog.c:7820
+#: access/transam/xlog.c:7873
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "Senaste kompletta transaktionen var vid loggtid %s"
 
-#: access/transam/xlog.c:8082
+#: access/transam/xlog.c:8137
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "återställningspunkt \"%s\" skapad vid %X/%X"
 
-#: access/transam/xlog.c:8289
+#: access/transam/xlog.c:8344
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "online-backup avbröts, återställning kan inte fortsätta"
 
-#: access/transam/xlog.c:8347
+#: access/transam/xlog.c:8402
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "oväntad tidslinje-ID %u (skall vara %u) i checkpoint-post för nedstängning"
 
-#: access/transam/xlog.c:8405
+#: access/transam/xlog.c:8468
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "oväntad tidslinje-ID %u (skall vara %u) i checkpoint-post för online"
 
-#: access/transam/xlog.c:8434
+#: access/transam/xlog.c:8505
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "oväntad tidslinje-ID %u (skall vara %u) i post för slutet av återställning"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:8775
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "kunde inte fsync:a skriv-igenom-loggfil \"%s\": %m"
 
-#: access/transam/xlog.c:8710
+#: access/transam/xlog.c:8780
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "kunde inte fdatasync:a fil \"%s\": %m"
 
-#: access/transam/xlog.c:8797 access/transam/xlog.c:9133
+#: access/transam/xlog.c:8857 access/transam/xlog.c:9193
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "WAL-nivå inte tillräcklig för att kunna skapa en online-backup"
 
-#: access/transam/xlog.c:8798 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9194
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "\"wal_level\" måste vara satt till \"replica\" eller \"logical\" vid serverstart."
 
-#: access/transam/xlog.c:8803
+#: access/transam/xlog.c:8863
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "backup-etikett för lång (max %d byte)"
 
-#: access/transam/xlog.c:8924
+#: access/transam/xlog.c:8984
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed since last restartpoint"
 msgstr "WAL skapad med \"full_page_writes=off\" har återspelats sedan senaste omstartpunkten"
 
-#: access/transam/xlog.c:8926 access/transam/xlog.c:9222
+#: access/transam/xlog.c:8986 access/transam/xlog.c:9282
 #, 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 primary, and then try an online backup again."
 msgstr "Det betyder att backup:en som tas på standby:en är trasig och inte skall användas. Slå på \"full_page_writes\" och kör CHECKPOINT på primären och försök sedan ta en ny online-backup igen."
 
-#: access/transam/xlog.c:9006 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9066 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "kan inte läsa symbolisk länk \"%s\": %m"
 
-#: access/transam/xlog.c:9013 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9073 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "mål för symbolisk länk \"%s\" är för lång"
 
-#: access/transam/xlog.c:9134
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr "wal_level måste vara satt till \"replica\" eller \"logical\" vid serverstart."
-
-#: access/transam/xlog.c:9172 backup/basebackup.c:1281
+#: access/transam/xlog.c:9232 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "standby:en befordrades under online-backup"
 
-#: access/transam/xlog.c:9173 backup/basebackup.c:1282
+#: access/transam/xlog.c:9233 backup/basebackup.c:1284
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Det betyder att backupen som tas är trasig och inte skall användas. Försök ta en ny online-backup."
 
-#: access/transam/xlog.c:9220
+#: access/transam/xlog.c:9280
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed during online backup"
 msgstr "WAL skapad med \"full_page_writes=off\" återspelades under online-backup"
 
-#: access/transam/xlog.c:9336
+#: access/transam/xlog.c:9396
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "base_backup klar, väntar på att de WAL-segment som krävs blir arkiverade"
 
-#: access/transam/xlog.c:9350
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "väntar fortfarande på att alla krävda WAL-segments skall bli arkiverade (%d sekunder har gått)"
 
-#: access/transam/xlog.c:9352
+#: access/transam/xlog.c:9412
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, but the database backup will not be usable without all the WAL segments."
 msgstr "Kontrollera att ditt \"archive_command\" kör som det skall.  Du kan avbryta denna backup på ett säkert sätt men databasbackup:en kommer inte vara användbar utan att alla WAL-segment finns."
 
-#: access/transam/xlog.c:9359
+#: access/transam/xlog.c:9419
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "alla krävda WAL-segments har arkiverats"
 
-#: access/transam/xlog.c:9363
+#: access/transam/xlog.c:9423
 #, 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-arkivering är inte påslagen; du måste se till att alla krävda WAL-segment har kopierats på annat sätt för att backup:en skall vara komplett"
 
-#: access/transam/xlog.c:9402
+#: access/transam/xlog.c:9462
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "avbryter backup på grund av att backend:en stoppades innan pg_backup_stop anropades"
@@ -2962,276 +2945,276 @@ msgstr "kunde inte skapa arkiveringsstatusfil \"%s\": %m"
 msgid "could not write archive status file \"%s\": %m"
 msgstr "kunde inte skriva arkiveringsstatusfil \"%s\": %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "en backup är redan på gång i denna session"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "ingen backup är på gång"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "Anropade du pg_backup_start()?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "WAL-kontrollfunktioner kan inte köras under återställning."
 
-#: access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "%s kan inte köras under återställning"
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
 msgstr "pg_log_standby_snapshot() kan bara användas om \"wal_level\" >= \"replica\""
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "WAL-nivån är inte tillräcklig för att skapa en återställningspunkt"
 
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "värdet för långt för en återställningspunkt (maximalt %d tecken)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "ogiltigt WAL-filnamn \"%s\""
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "återställning är inte i gång"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr "Återställningskontrollfunktioner kan bara köras under återställning."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "standby-befordran pågår"
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s kan inte köras efter att befordran startats."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "\"wait_seconds\" får inte vara negativ eller noll"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "misslyckades med att sända en signal till postmaster: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "avslutar anslutning på grund av att postmaster stängde oväntat ner"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
 msgstr "vid väntan på befordran"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
 msgstr[0] "servern befordrades inte inom %d sekund"
 msgstr[1] "servern befordrades inte inom %d sekunder"
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
-msgid "\"recovery_prefetch\" is not supported on platforms that lack posix_fadvise()."
-msgstr "\"recovery_prefetch\" stöds inte på plattformar som saknar posix_fadvise()."
+msgid "\"recovery_prefetch\" is not supported on platforms that lack support for issuing read-ahead advice."
+msgstr "\"recovery_prefetch\" stöds inte på plattformar som saknar stöd att ge råd om read-ahead."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postlängd vid %X/%X: förväntade minst %u, fick %u"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord är begärd vid %X/%X"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postlängd vid %X/%X: förväntade minst %u, fick %u"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "det finns ingen contrecord-flagga vid %X/%X"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "ogiltig contrecord-längd %u (förväntade %lld) vid %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ogiltigt resurshanterar-ID %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "post med inkorrekt prev-link %X/%X vid %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "felaktig resurshanterardatakontrollsumma i post vid %X/%X"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "felaktigt magiskt nummer %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ogiltiga infobitar %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %llu, pg_control databassystemidentifierare är %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %<PRIu64>, pg_control databassystemidentifierare är %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt segmentstorlek i sidhuvud"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt XLOG_BLCKSZ i sidhuvud"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "oväntad sidadress %X/%X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ej-i-sekvens för tidslinje-ID %u (efter %u) i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "\"ej i sekvens\"-block_id %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1773
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är satt men ingen data inkluderad vid %X/%X"
 
-#: access/transam/xlogreader.c:1780
+#: access/transam/xlogreader.c:1800
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är ej satt men datalängden är %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1816
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är satt men håloffset %u längd %u blockavbildlängd %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1832
+#: access/transam/xlogreader.c:1852
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är inte satt men håloffset %u längd %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED är satt men blockavbildlängd %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "varken BKPIMAGE_HAS_HOLE eller BKPIMAGE_COMPRESSED är satt men blockavbildlängd är %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL är satt men ingen tidigare rel vid %X/%X"
 
-#: access/transam/xlogreader.c:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ogiltig block_id %u vid %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "post med ogiltig längd vid %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "kunde inte hitta backup-block med ID %d i WAL-post"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt block %d angivet"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt state, block %d"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med %s stöds inte av bygget, block %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med okänd metod, block %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "kunde inte packa upp avbild vid %X/%X, block %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "startar backupåterställning med redo LSN %X/%X, checkpoint LSN %X/%X, på tidslinje ID %u"
 
-#: access/transam/xlogrecovery.c:649
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "kunde inte hitta redo-position %X/%X refererad av checkpoint-post vid %X/%X"
 
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid ""
 "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
@@ -3243,467 +3226,488 @@ msgstr ""
 "bort filen \"%s/backup_label\". Var försiktig: borttagning av \"%s/backup_label\"\n"
 "kommer resultera i ett trasigt kluster om du återställer från en backup."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "kunde inte hitta den checkpoint-post som krävs vid %X/%X"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "kan inte skapa symbolisk länk \"%s\": %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "hoppar över fil \"%s\" då ingen fil \"%s\" finns"
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Filen \"%s\" döptes om till \"%s\"."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "Kunde inte döpa om fil \"%s\" till \"%s\": %m"
 
-#: access/transam/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "startar om backupåterställning med redo LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "kunde inte hitta en giltig checkpoint-post vid %X/%X"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "kunde inte hitta redo-position %X/%08X refererad av checkpoint-post vid %X/%08X"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "går in i standby-läge"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "startar point-in-time-återställning till XID %u"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "startar point-in-time-återställning till %s"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "startar point-in-time-återställning till \"%s\""
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "startar point-in-time-återställning till WAL-position (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:842
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "startar point-in-time-återställning till tidigast konsistenta punkt"
 
-#: access/transam/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "Startar arkivåterställning"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:866
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "efterfrågad tidslinje %u är inte ett barn till denna servers historik"
 
-#: access/transam/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:869
 #, 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 "Senaste checkpoint är vid %X/%X på tidslinje %u, men i historiken för efterfrågad tidslinje så avvek servern från den tidslinjen vid %X/%X."
+msgid "Latest checkpoint in file \"%s\" 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 "Senaste checkpoint i fil \"%s\" är vid %X/%X på tidslinje %u, men i historiken för efterfrågad tidslinje så avvek servern från den tidslinjen vid %X/%X."
 
-#: access/transam/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:884
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "efterfågan tidslinje %u innehåller inte minimal återställningspunkt %X/%X på tidslinje %u"
 
-#: access/transam/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "nästa transaktions-ID ogiltig"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "ogiltig redo i checkpoint-post"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "ogiltig redo-post i nedstängnings-checkpoint"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:957
 #, c-format
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "databassystemet stängdes inte ned korrekt; automatisk återställning pågår"
 
-#: access/transam/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:961
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "krashåterställning startar i tidslinje %u och har måltidslinje %u"
 
-#: access/transam/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label innehåller data som inte stämmer med kontrollfil"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:1005
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Det betyder att backup:en är trasig och du behöver använda en annan backup för att återställa."
 
-#: access/transam/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "använda återställningskommandofil \"%s\" stöds inte"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1124
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr "standby-läge stöd inte av enanvändarservrar"
 
-#: access/transam/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "angav varken \"primary_conninfo\" eller \"restore_command\""
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr "Databasservern kommer med jämna mellanrum att poll:a pg_wal-underkatalogen för att se om filer placerats där."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "måste ange \"restore_command\" när standby-läge inte är påslaget"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "återställningsmåltidslinje %u finns inte"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278
+#: access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425
+#: access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "felaktig data i fil \"%s\""
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "Parsad tidslinje-ID är %u men förväntade sig %u."
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "detta är en inkrementell backup, inte en datakatalog"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "Använd pg_combinebackup för att återskapa en giltig datakatalog."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "oväntad typ på post hittad vid redo-punkt %X/%X"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo startar vid %X/%X"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "redo pågår, förbrukad tid: %ld.%02d s, nuvarande LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "efterfrågad återställningsstoppunkt är före en konsistent återställningspunkt"
 
-#: access/transam/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "redo gjord vid %X/%X systemanvändning: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "senaste kompletta transaktionen var vid loggtid %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "redo behövs inte"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "återställning avslutades innan det konfigurerade återställningsmålet nåddes"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "lyckades hoppa över saknad contrecord vid %X/%X, överskriven vid %s"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "Oväntat katalogpost \"%s\" hittades i %s"
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2184
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr "Alla katalogposter i pg_tblspc/ skall vara symboliska länkar"
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "Alla katalogposter i %s/ skall vara symboliska länkar"
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr "Ta bort dessa kataloger eller sätt \"allow_in_place_tablespaces\" temporärt till ON och låt återställningen gå klart."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "slutförde backupåterställning vid redo-LSN %X/%X och slut-LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "konsistent återställningstillstånd uppnått vid %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "WAL-redo vid %X/%X för %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2405
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "oväntad föregående tidslinje-ID %u (nuvarande tidslinje-ID %u) i checkpoint-post"
 
-#: access/transam/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "oväntad tidslinje-ID %u (efter %u) i checkpoint-post"
 
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2430
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "oväntad tidslinje-ID %u i checkpoint-post, innan vi nått minimal återställningspunkt %X/%X på tidslinje %u"
 
-#: access/transam/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "återställning stoppad efter att ha uppnått konsistens"
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "återställning stoppad före WAL-position (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "återställning stoppad före commit av transaktion %u, tid %s"
 
-#: access/transam/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "återställning stoppad före abort av transaktion %u, tid %s"
 
-#: access/transam/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "återställning stoppad vid återställningspunkt \"%s\", tid %s"
 
-#: access/transam/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "återställning stoppad efter WAL-position (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "återställning stoppad efter commit av transaktion %u, tid %s"
 
-#: access/transam/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "återställning stoppad efter abort av transaktion %u, tid %s"
 
-#: access/transam/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "pausar vid slutet av återställning"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "Kör pg_wal_replay_resume() för att befordra."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "återställning har pausats"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "Kör pg_wal_replay_resume() för att fortsätta."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "oväntad tidslinje-ID %u i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "kunde inte läsa från WAL-segment %s, LSN %X/%X, offset %u: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "kunde inte läsa från WAL-segment %s, LSN %X/%X, offset %u, läste %d av %zu"
 
-#: access/transam/xlogrecovery.c:4061
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "ogiltig checkpoint-position"
 
-#: access/transam/xlogrecovery.c:4071
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "ogiltig checkpoint-post"
 
-#: access/transam/xlogrecovery.c:4077
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "ogiltig resurshanterar-ID i checkpoint-post"
 
-#: access/transam/xlogrecovery.c:4085
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "ogiltig xl_info i checkpoint-post"
 
-#: access/transam/xlogrecovery.c:4091
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "ogiltig längd på checkpoint-post"
 
-#: access/transam/xlogrecovery.c:4145
+#: access/transam/xlogrecovery.c:4188
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "ny tidslinje %u är inte ett barn till databasens systemtidslinje %u"
 
-#: access/transam/xlogrecovery.c:4159
+#: access/transam/xlogrecovery.c:4202
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "ny tidslinje %u skapad från aktuella databasens systemtidslinje %u innan nuvarande återställningspunkt %X/%X"
 
-#: access/transam/xlogrecovery.c:4178
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "ny måltidslinje är %u"
 
-#: access/transam/xlogrecovery.c:4381
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "nedstängning av WAL-mottagarprocess efterfrågad"
 
-#: access/transam/xlogrecovery.c:4441
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "tog emot förfrågan om befordran"
 
-#: access/transam/xlogrecovery.c:4670
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "hot standby är inte möjligt på grund av otillräckliga parameterinställningar"
 
-#: access/transam/xlogrecovery.c:4671 access/transam/xlogrecovery.c:4698
-#: access/transam/xlogrecovery.c:4728
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739
+#: access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d har ett lägre värde än på primärservern där värdet var %d."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "Om återställning avpausas så kommer servern stänga ner."
 
-#: access/transam/xlogrecovery.c:4681
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "Du kan då återstarta servern efter att ha gjort de nödvändiga konfigurationsändringarna."
 
-#: access/transam/xlogrecovery.c:4692
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "befordran är inte möjligt på grund av otillräckliga parameterinställningar"
 
-#: access/transam/xlogrecovery.c:4702
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "Starta om servern efter att ha gjort de nödvändiga konfigurationsändringarna."
 
-#: access/transam/xlogrecovery.c:4726
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "återställning avbruten på grund av otillräckliga parametervärden"
 
-#: access/transam/xlogrecovery.c:4732
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "Du kan starta om servern efter att du gjort de nödvändiga konfigurationsändringarna."
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795
+#: catalog/dependency.c:1153 catalog/dependency.c:1160
+#: catalog/dependency.c:1171 commands/tablecmds.c:1519
+#: commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211
+#: executor/execExprInterp.c:5219 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1048 replication/slot.c:1705
+#: replication/slot.c:2783 replication/slot.c:2785 replication/syncrep.c:1079
+#: storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137
+#: storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207
+#: utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868
+#: utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "multipla återställningsmål angivna"
 
-#: access/transam/xlogrecovery.c:4775
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "Som mest en av \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\" och \"recovery_target_xid\" kan sättas."
 
-#: access/transam/xlogrecovery.c:4786
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Det enda tillåtna värdet är \"immediate\"."
 
-#: access/transam/xlogrecovery.c:4938 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4991
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp utanför giltigt intervall: \"%s\""
+msgid "Timestamp out of range: \"%s\"."
+msgstr "Timestamp utanför giltigt intervall: \"%s\"."
 
-#: access/transam/xlogrecovery.c:4983
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "\"recovery_target_timeline\" är inte ett giltigt nummer."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "kunde inte läsa från WAL-segment %s, offset %d: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr "kunde inte läsa från WAL-segment %s, offset %d, läste %d av %d"
@@ -3724,7 +3728,7 @@ msgstr "Det misslyckade arkiveringskommandot var: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "arkiveringskommandot terminerades med avbrott 0x%X"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3095
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Se C-include-fil \"ntstatus.h\" för en beskrivning av det hexdecimala värdet."
@@ -3739,165 +3743,165 @@ msgstr "arkiveringskommandot terminerades av signal %d: %s"
 msgid "archive command exited with unrecognized status %d"
 msgstr "arkiveringskommandot avslutade med okänd statuskod %d"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "förväntade sluttidslinje %u men hittade tidslinje %u"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "förväntade starttidslinje %u men hittade tidslinje %u"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "starttidslinje %u hittades inte i historiken för tidslinje %u"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "kunde inte spola tillbaka temporär fil"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "kunde inte hitta några WAL-filer"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "kunde inte hitta WAL-fil \"%s\""
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "oväntad WAL-filstorlek \"%s\""
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
 msgstr[0] "totalt %lld verifieringsfel av checksumma"
 msgstr[1] "totalt %lld verifieringsfel av checksumma"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "misslyckad verifiering av checksumma under basbackup"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "duplicerad flagga \"%s\""
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "okänd checkpoint-typ: \"%s\""
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr "inkrementella backup:er kan inte tas om inte WAL-summering är påslagen"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d är utanför giltigt intervall för parameter \"%s\" (%d .. %d)"
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "okänd manifestflagga: \"%s\""
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "okänd komprimeringsalgoritm: \"%s\""
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "okänd basbackupflagga: \"%s\""
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "manifestchecksummor kräver ett backup-manifest"
 
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "målinställningar kan inte användas utan ett mål"
 
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "målet \"%s\" stöder inte målinställningar"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "komprimeringsinställning kan inte anges om komprimering inte är påslagen"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "ogiltig inställning för komprimering: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
 msgstr "måste UPLOAD_MANIFEST innan befordran av en inkrementell BASE_BACKUP"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "kunde inte ta status på fil eller katalog \"%s\": %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "hoppar över specialfil \"%s\""
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid "could not verify checksum in file \"%s\", block %u: read buffer size %d and page size %d differ"
 msgstr "kunde inte verifiera checksumma i fil \"%s\", block %u: läsbufferstorlek %d och sidstorlek %d skiljer sig åt"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
 msgstr[0] "filen \"%s\" har totalt %d kontrollerad felaktiga checksumma"
 msgstr[1] "filen \"%s\" har totalt %d kontrollerade felaktiga checksummor"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated %X but expected %X"
 msgstr "checksumkontroll misslyckades i fil \"%s\", block %u: beräknade %X men förväntade %X"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid "further checksum verification failures in file \"%s\" will not be reported"
 msgstr "ytterligare kontroller av checksummor i fil \"%s\" kommer inte rapporteras"
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "filnamnet är för långt för tar-format: \"%s\""
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
 msgstr "mål för symbolisk länk är för långt för tar-format: filnamn \"%s\", mål \"%s\""
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "kunde inte läsa fil \"%s\": läste %zd av %zu"
@@ -3912,65 +3916,65 @@ msgstr "gzip-komprimering stöds inte av detta bygge"
 msgid "could not initialize compression library"
 msgstr "kunde inte initierar komprimeringsbibliotek"
 
-#: backup/basebackup_incremental.c:294
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
 msgstr "manifestet innehåller inga WAL-intervall som krävs"
 
-#: backup/basebackup_incremental.c:349
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "tidslinje %u hittades i manifest men inte i denna servers historik"
 
-#: backup/basebackup_incremental.c:414
+#: backup/basebackup_incremental.c:412
 #, c-format
 msgid "manifest requires WAL from initial timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "manifestet kräver WAL från initiala tidslinjen %u vid start %X/%X men den tidslinjen börjar vid %X/%X"
 
-#: backup/basebackup_incremental.c:424
+#: backup/basebackup_incremental.c:422
 #, c-format
 msgid "manifest requires WAL from continuation timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "manifestet kräver WAL från tidslinje %u att fortsätta med som startar vid %X/%X men den tidslinjen börjar vid %X/%X"
 
-#: backup/basebackup_incremental.c:435
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid "manifest requires WAL from final timeline %u ending at %X/%X, but this backup starts at %X/%X"
 msgstr "manifestet kräver WAL från avslutande tidslinje %u som slutar vid %X/%X, men denna backup startar vid %X/%X"
 
-#: backup/basebackup_incremental.c:439
+#: backup/basebackup_incremental.c:437
 #, c-format
 msgid "This can happen for incremental backups on a standby if there was little activity since the previous backup."
 msgstr "Detta kan hända vid inkrementella backuper på en standby om det är lite aktivitet från föregående backup."
 
-#: backup/basebackup_incremental.c:446
+#: backup/basebackup_incremental.c:444
 #, c-format
 msgid "manifest requires WAL from non-final timeline %u ending at %X/%X, but this server switched timelines at %X/%X"
 msgstr "manifestet kräver WAL från en icke avslutande tidslinje %u som slutar vid %X/%X men denns server bytte tidslinje vid %X/%X"
 
-#: backup/basebackup_incremental.c:527
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no summaries for that timeline and LSN range exist"
 msgstr "WAL-summering krävs för tidslinje %u från %X/%X till %X/%X men inga summeringar för den tidslinjen och det LSN-intervallet finns"
 
-#: backup/basebackup_incremental.c:534
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the summaries for that timeline and LSN range are incomplete"
 msgstr "WAL-summering krävs för tidslinje %u från %X/%X till %X/%X men summeringar för den tidslinjen och det LSN-intervallet är inkompletta"
 
-#: backup/basebackup_incremental.c:538
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "Den första icke summerade LSN i detta intervall är %X/%X."
 
-#: backup/basebackup_incremental.c:938
+#: backup/basebackup_incremental.c:948
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "backupmanifest version 1 stöder inte inkrementell backup"
 
-#: backup/basebackup_incremental.c:956
+#: backup/basebackup_incremental.c:966
 #, c-format
-msgid "system identifier in backup manifest is %llu, but database system identifier is %llu"
-msgstr "manifestets systemidentifierare är %llu men databasens systemidentifierare är %llu"
+msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
+msgstr "backup-manifestets systemidentifierare är %<PRIu64> men databasens systemidentifierare är %<PRIu64>"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -3992,10 +3996,10 @@ msgstr "Bara roller med rättigheter från rollen \"%s\" får skapa backup som l
 msgid "relative path not allowed for backup stored on server"
 msgstr "relativ sökväg tillåts inte för backup som sparas på servern"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2287
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "kunde inte skapa katalog \"%s\": %m"
@@ -4005,15 +4009,15 @@ msgstr "kunde inte skapa katalog \"%s\": %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "katalogen \"%s\" existerar men är inte tom"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1178
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "kunde inte komma åt katalog \"%s\": %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:619 storage/smgr/md.c:641 storage/smgr/md.c:1134
 #, c-format
 msgid "Check free disk space."
 msgstr "Kontrollera ledigt diskutrymme."
@@ -4051,26 +4055,31 @@ msgstr "kunde inte aktivera långdistansläge: %s"
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "ogiltig tidslinje %lld"
+msgid "invalid timeline %<PRId64>"
+msgstr "ogiltig tidslinje %<PRId64>"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s måste vara första argumentet"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3946
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s kräver ett värde"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3951
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s kräver ett värde"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:763
+#: postmaster/postmaster.c:776
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: ogiltigt kommandoradsargument\n"
@@ -4125,12 +4134,12 @@ msgstr "inte alla rättigheter kunde tas tillbaka från \"%s\""
 msgid "grantor must be current user"
 msgstr "utfärdare måste vara den aktiva användaren"
 
-#: catalog/aclchk.c:480 catalog/aclchk.c:1055
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "ogiltig privilegietyp %s för relation"
 
-#: catalog/aclchk.c:484 catalog/aclchk.c:1059
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "ogiltig privilegietyp %s för sekvens"
@@ -4145,7 +4154,7 @@ msgstr "ogiltig privilegietyp %s för databas"
 msgid "invalid privilege type %s for domain"
 msgstr "ogiltig privilegietyp %s för domän"
 
-#: catalog/aclchk.c:496 catalog/aclchk.c:1063
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "ogiltig privilegietyp %s för funktion"
@@ -4155,22 +4164,22 @@ msgstr "ogiltig privilegietyp %s för funktion"
 msgid "invalid privilege type %s for language"
 msgstr "ogiltig privilegietyp %s för språk"
 
-#: catalog/aclchk.c:504
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "ogiltig privilegietyp %s för stort objekt"
 
-#: catalog/aclchk.c:508 catalog/aclchk.c:1079
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "ogiltig privilegietyp %s för schema"
 
-#: catalog/aclchk.c:512 catalog/aclchk.c:1067
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "ogiltig rättighetstyp %s för procedur"
 
-#: catalog/aclchk.c:516 catalog/aclchk.c:1071
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "ogiltig rättighetstyp %s för rutin"
@@ -4180,7 +4189,7 @@ msgstr "ogiltig rättighetstyp %s för rutin"
 msgid "invalid privilege type %s for tablespace"
 msgstr "ogiltig privilegietyp %s för tabellutrymme"
 
-#: catalog/aclchk.c:524 catalog/aclchk.c:1075
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "ogiltig privilegietyp %s för typ"
@@ -4205,534 +4214,525 @@ msgstr "ogiltig privilegietyp %s för parameter"
 msgid "column privileges are only valid for relations"
 msgstr "kolumnprivilegier är bara giltiga för relationer"
 
-#: catalog/aclchk.c:738 catalog/aclchk.c:3629 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "stort objekt %u existerar inte"
-
-#: catalog/aclchk.c:1112
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "standardrättigheter kan inte sättas för kolumner"
 
-#: catalog/aclchk.c:1148
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "rättighet saknas för att ändra standardrättigheter"
 
-#: catalog/aclchk.c:1266
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "kan inte använda IN SCHEMA-klausul samtidigt som GRANT/REVOKE ON SCHEMAS"
-
-#: catalog/aclchk.c:1617 catalog/catalog.c:659 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:951
-#: commands/sequence.c:1655 commands/tablecmds.c:7541 commands/tablecmds.c:7695
-#: commands/tablecmds.c:7745 commands/tablecmds.c:7819
-#: commands/tablecmds.c:7889 commands/tablecmds.c:8019
-#: commands/tablecmds.c:8148 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8343 commands/tablecmds.c:8470
-#: commands/tablecmds.c:8500 commands/tablecmds.c:8642
-#: commands/tablecmds.c:8735 commands/tablecmds.c:8869
-#: commands/tablecmds.c:8981 commands/tablecmds.c:12797
-#: commands/tablecmds.c:12989 commands/tablecmds.c:13150
-#: commands/tablecmds.c:14339 commands/tablecmds.c:16966 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3409
-#: parser/parse_utilcmd.c:3449 parser/parse_utilcmd.c:3491 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2812
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
+#, c-format
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "kan inte använda IN SCHEMA-klausul samtidigt som %s"
+
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621
+#: catalog/heap.c:2941 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039
+#: commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929
+#: commands/tablecmds.c:8130 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8413 commands/tablecmds.c:8507
+#: commands/tablecmds.c:8610 commands/tablecmds.c:8776
+#: commands/tablecmds.c:8806 commands/tablecmds.c:8961
+#: commands/tablecmds.c:9064 commands/tablecmds.c:9198
+#: commands/tablecmds.c:9311 commands/tablecmds.c:14397
+#: commands/tablecmds.c:14600 commands/tablecmds.c:14761
+#: commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948
+#: parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3662
+#: parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "kolumn \"%s\" i relation \"%s\" existerar inte"
 
-#: catalog/aclchk.c:1862
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" är ett index"
 
-#: catalog/aclchk.c:1869 commands/tablecmds.c:14496 commands/tablecmds.c:17882
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" är en composite-typ"
 
-#: catalog/aclchk.c:1877 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17846 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\" är inte en sekvens"
 
-#: catalog/aclchk.c:1915
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "sekvensen \"%s\" stöder bara USAGE-, SELECT- och UPDATE-rättigheter"
 
-#: catalog/aclchk.c:1932
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "ogiltig rättighetstyp %s för tabell"
 
-#: catalog/aclchk.c:2097
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "ogitligt rättighetstyp %s för kolumn"
 
-#: catalog/aclchk.c:2110
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "sekvensen \"%s\" stöder bara kolumnrättigheten SELECT"
 
-#: catalog/aclchk.c:2301
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "språket \"%s\" är inte betrott"
 
-#: catalog/aclchk.c:2303
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "GRANT och REVOKE är inte tillåtna på icke betrodda språk då bara en superuser kan använda icke betrodda språk."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "kan inte sätta privilegier för array-typer"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "Sätt rättigheter för elementtypen istället."
 
-#: catalog/aclchk.c:2459
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "kan inte sätta privilegier för multirange-typer"
 
-#: catalog/aclchk.c:2460
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "Sätt rättigheter för range-typen istället."
 
-#: catalog/aclchk.c:2467 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" är inte en domän"
-
-#: catalog/aclchk.c:2653
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "okänd privilegietyp \"%s\""
 
-#: catalog/aclchk.c:2720
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "rättighet saknas för aggregat %s"
 
-#: catalog/aclchk.c:2723
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "rättighet saknas för jämförelse %s"
 
-#: catalog/aclchk.c:2726
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "rättighet saknas för kolumn %s"
 
-#: catalog/aclchk.c:2729
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "rättighet saknas för konvertering %s"
 
-#: catalog/aclchk.c:2732
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "rättighet saknas för databas %s"
 
-#: catalog/aclchk.c:2735
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "rättighet saknas för domän %s"
 
-#: catalog/aclchk.c:2738
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "rättighet saknas för händelsetrigger %s"
 
-#: catalog/aclchk.c:2741
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "rättighet saknas för utökning %s"
 
-#: catalog/aclchk.c:2744
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "rättighet saknas för främmande data-omvandlare %s"
 
-#: catalog/aclchk.c:2747
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "rättighet saknas för främmande server %s"
 
-#: catalog/aclchk.c:2750
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "rättighet saknas för främmande tabell %s"
 
-#: catalog/aclchk.c:2753
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "rättighet saknas för funktion %s"
 
-#: catalog/aclchk.c:2756
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "rättighet saknas för index %s"
 
-#: catalog/aclchk.c:2759
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "rättighet saknas för språk %s"
 
-#: catalog/aclchk.c:2762
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "rättighet saknas för stort objekt %s"
 
-#: catalog/aclchk.c:2765
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "rättighet saknas för materialiserad vy %s"
 
-#: catalog/aclchk.c:2768
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "rättighet saknas för operatorklasss %s"
 
-#: catalog/aclchk.c:2771
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "rättighet saknas för operator %s"
 
-#: catalog/aclchk.c:2774
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "rättighet saknas för operatorfamilj %s"
 
-#: catalog/aclchk.c:2777
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "rättighet saknas för parametern %s"
 
-#: catalog/aclchk.c:2780
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "rättighet saknas för policy %s"
 
-#: catalog/aclchk.c:2783
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "rättighet saknas för procedur %s"
 
-#: catalog/aclchk.c:2786
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "rättighet saknas för publicering %s"
 
-#: catalog/aclchk.c:2789
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "rättighet saknas för rutin %s"
 
-#: catalog/aclchk.c:2792
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "rättighet saknas för schema %s"
 
-#: catalog/aclchk.c:2795 commands/sequence.c:654 commands/sequence.c:880
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880
 #: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
-#: commands/sequence.c:1799
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "rättighet saknas för sekvens %s"
 
-#: catalog/aclchk.c:2798
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "rättighet saknas för statistikobjekt %s"
 
-#: catalog/aclchk.c:2801
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "rättighet saknas för prenumeration %s"
 
-#: catalog/aclchk.c:2804
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "rättighet saknas för tabell %s"
 
-#: catalog/aclchk.c:2807
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "rättighet saknas för tabellutrymme %s"
 
-#: catalog/aclchk.c:2810
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "rättighet saknas för textsökkonfigurering %s"
 
-#: catalog/aclchk.c:2813
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "rättighet saknas för textsökordlista %s"
 
-#: catalog/aclchk.c:2816
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "rättighet saknas för typ %s"
 
-#: catalog/aclchk.c:2819
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "rättighet saknas för vy %s"
 
-#: catalog/aclchk.c:2855
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "måste vara ägaren till aggregatet %s"
 
-#: catalog/aclchk.c:2858
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "måste vara ägaren till jämförelsen %s"
 
-#: catalog/aclchk.c:2861
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "måste vara ägaren till konverteringen %s"
 
-#: catalog/aclchk.c:2864
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "måste vara ägaren till databasen %s"
 
-#: catalog/aclchk.c:2867
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "måste vara ägaren av domänen %s"
 
-#: catalog/aclchk.c:2870
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "måste vara ägaren till händelsetrigger %s"
 
-#: catalog/aclchk.c:2873
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "måste vara ägaren till utökningen %s"
 
-#: catalog/aclchk.c:2876
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "måste vara ägaren till främmande data-omvandlaren %s"
 
-#: catalog/aclchk.c:2879
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "måste vara ägaren till främmande servern %s"
 
-#: catalog/aclchk.c:2882
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "måste vara ägaren till främmande tabellen %s"
 
-#: catalog/aclchk.c:2885
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "måste vara ägaren till funktionen %s"
 
-#: catalog/aclchk.c:2888
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "måste vara ägaren till indexet %s"
 
-#: catalog/aclchk.c:2891
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "måste vara ägaren till språket %s"
 
-#: catalog/aclchk.c:2894
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "måste vara ägaren till stora objektet %s"
 
-#: catalog/aclchk.c:2897
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "måste vara ägaren till den materialiserade vyn %s"
 
-#: catalog/aclchk.c:2900
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "måste vara ägaren till operatorklassen %s"
 
-#: catalog/aclchk.c:2903
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "måste vara ägaren till operatorn %s"
 
-#: catalog/aclchk.c:2906
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "måste vara ägaren till operatorfamiljen %s"
 
-#: catalog/aclchk.c:2909
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "måste vara ägaren till proceduren %s"
 
-#: catalog/aclchk.c:2912
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "måste vara ägaren till publiceringen %s"
 
-#: catalog/aclchk.c:2915
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "måste vara ägaren till rutinen %s"
 
-#: catalog/aclchk.c:2918
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "måste vara ägaren till sekvensen %s"
 
-#: catalog/aclchk.c:2921
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "måste vara ägaren till prenumerationen %s"
 
-#: catalog/aclchk.c:2924
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "måste vara ägaren till tabellen %s"
 
-#: catalog/aclchk.c:2927
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "måste vara ägaren till typen %s"
 
-#: catalog/aclchk.c:2930
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "måste vara ägaren till vyn %s"
 
-#: catalog/aclchk.c:2933
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "måste vara ägaren till schemat %s"
 
-#: catalog/aclchk.c:2936
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "måste vara ägaren till statistikobjektet %s"
 
-#: catalog/aclchk.c:2939
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "måste vara ägaren till tabellutrymmet %s"
 
-#: catalog/aclchk.c:2942
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "måste vara ägaren till textsökkonfigurationen %s"
 
-#: catalog/aclchk.c:2945
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "måste vara ägaren till textsökordlistan %s"
 
-#: catalog/aclchk.c:2959
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "måste vara ägaren till relationen %s"
 
-#: catalog/aclchk.c:3005
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "rättighet saknas för kolumn \"%s\" i relation \"%s\""
 
-#: catalog/aclchk.c:3162 catalog/aclchk.c:4170 catalog/aclchk.c:4201
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s med OID %u existerar inte"
-
-#: catalog/aclchk.c:3245 catalog/aclchk.c:3264
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "attribut %d i relation med OID %u existerar inte"
 
-#: catalog/aclchk.c:3302 catalog/aclchk.c:3365 catalog/aclchk.c:4004
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "relation med OID %u existerar inte"
 
-#: catalog/aclchk.c:3550
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "parameter ACL med OID %u existerar inte"
 
-#: catalog/aclchk.c:3723 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "stort objekt %u existerar inte"
+
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1851
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "schema med OID %u existerar inte"
 
-#: catalog/aclchk.c:3797 catalog/aclchk.c:3824 catalog/aclchk.c:3853
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "typ med OID %u existerar inte"
 
-#: catalog/catalog.c:477
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "letar fortfarande efter en oanvänd OID i relationen \"%s\""
 
-#: catalog/catalog.c:479
+#: catalog/catalog.c:506
 #, c-format
-msgid "OID candidates have been checked %llu time, but no unused OID has been found yet."
-msgid_plural "OID candidates have been checked %llu times, but no unused OID has been found yet."
-msgstr[0] "OID-kandidater har kontrollerats %llu gång men inga oanvända OID:er har hittats än."
-msgstr[1] "OID-kandidater har kontrollerats %llu gånger men inga oanvända OID:er har hittats än."
+msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
+msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
+msgstr[0] "OID-kandidater har kontrollerats %<PRIu64> gång men inga oanvända OID:er har hittats än."
+msgstr[1] "OID-kandidater har kontrollerats %<PRIu64> gånger men inga oanvända OID:er har hittats än."
 
-#: catalog/catalog.c:504
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "ny OID har tilldelats i relation \"%s\" after %llu försök"
-msgstr[1] "ny OID har tilldelats i relation \"%s\" after %llu försök"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "ny OID har tilldelats i relation \"%s\" after %<PRIu64> försök"
+msgstr[1] "ny OID har tilldelats i relation \"%s\" after %<PRIu64> försök"
 
-#: catalog/catalog.c:637 catalog/catalog.c:704
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "måste vara en superuser för att anropa %s()"
 
-#: catalog/catalog.c:646
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() kan bara användas på systemkataloger"
 
-#: catalog/catalog.c:651 parser/parse_utilcmd.c:2270
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "index \"%s\" tillhör inte tabell \"%s\""
 
-#: catalog/catalog.c:668
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "kolumnen \"%s\" är inte av typen oid"
 
-#: catalog/catalog.c:675
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "index \"%s\" är inte indexet för kolumnen \"%s\""
@@ -4782,20 +4782,6 @@ msgstr[1] ""
 msgid "cannot drop %s because other objects depend on it"
 msgstr "kan inte ta bort %s eftersom andra objekt beror på den"
 
-#: catalog/dependency.c:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1459
-#: commands/tablecmds.c:15088 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 executor/execExprInterp.c:4655
-#: executor/execExprInterp.c:4663 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1432 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6825
-#: utils/misc/guc.c:6859 utils/misc/guc.c:6893 utils/misc/guc.c:6936
-#: utils/misc/guc.c:6978
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4818,303 +4804,370 @@ msgstr[1] "drop svämmar över (cascades) till %d andra objekt"
 msgid "constant of the type %s cannot be used here"
 msgstr "konstant av typen %s kan inte användas här"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "övergångstabell \"%s\" kan inte refereras från ett permanent objekt"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:224
+#: statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "kolumn %d i relation \"%s\" finns inte"
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "rättighet saknas för att skapa \"%s.%s\""
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Systemkatalogändringar är för tillfället inte tillåtna."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2495 commands/tablecmds.c:2917
-#: commands/tablecmds.c:7163
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014
+#: commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "tabeller kan ha som mest %d kolumner"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7432
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "kolumnnamn \"%s\" står i konflikt med ett systemkolumnnamn"
 
-#: catalog/heap.c:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "kolumnnamn \"%s\" angiven mer än en gång"
 
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:579
+#: catalog/heap.c:575
 #, c-format
 msgid "partition key column %s has pseudo-type %s"
 msgstr "partitionsnyckelkolumn \"%s\" har pseudo-typ %s"
 
-#: catalog/heap.c:584
+#: catalog/heap.c:580
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "kolumn \"%s\" har pseudo-typ %s"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:595
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "genererad virtuell kolumn \"%s\" kan inte vara en domän-typ"
+
+#: catalog/heap.c:622
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "composite-typ %s kan inte vara en del av sig själv"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "genererad virtuell kolumn \"%s\" kan inte vara en användardefinierad typ"
+
+#: catalog/heap.c:674 catalog/heap.c:3295
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "Genererade virtuella kolumner som använder användardefinierade typer stöds inte än."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:686
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr "ingen jämförelse kunde härledas för partitionsnyckelkolumn %s med jämförelsetyp %s"
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:505
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr "ingen jämförelse kunde härledas för kolumn \"%s\" med jämförelsetyp %s"
 
-#: catalog/heap.c:1161 catalog/index.c:899 commands/createas.c:401
-#: commands/tablecmds.c:4171
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "relationen \"%s\" finns redan"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "typen \"%s\" existerar redan"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1196
 #, 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 "En relation har en associerad typ med samma namn så du måste använda ett namn som inte krockar med någon existerande typ."
 
-#: catalog/heap.c:1218
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "relfile-nummervärde för toast är inte satt i binärt uppgraderingsläge"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "pg_class heap OID-värde är inte satt i binärt uppgraderingsläge"
 
-#: catalog/heap.c:1239
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "relfile-nummervärde är inte satt i binärt uppgraderingsläge"
 
-#: catalog/heap.c:2130
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "kan inte lägga till NO INHERIT-villkor till partitionerad tabell \"%s\""
 
-#: catalog/heap.c:2402
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "check-villkor \"%s\" finns redan"
 
-#: catalog/heap.c:2574 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9356
+#: catalog/heap.c:2626 catalog/heap.c:2947
+#, c-format
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "kan inte lägga till icke-null-villkor på systemkolumn \"%s\""
+
+#: catalog/heap.c:2654 catalog/heap.c:2780 catalog/heap.c:3031
+#: catalog/index.c:915 catalog/pg_constraint.c:1025 commands/tablecmds.c:9821
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "integritetsvillkor \"%s\" för relation \"%s\" finns redan"
 
-#: catalog/heap.c:2581
+#: catalog/heap.c:2787
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "villkor \"%s\" står i konflikt med icke-ärvt villkor på relation \"%s\""
 
-#: catalog/heap.c:2592
+#: catalog/heap.c:2798
 #, c-format
 msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr "villkor \"%s\" står i konflikt med ärvt villkor på relation \"%s\""
 
-#: catalog/heap.c:2602
+#: catalog/heap.c:2808
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
 msgstr "villkor \"%s\" står i konflikt med NOT VALID-villkor på relation \"%s\""
 
-#: catalog/heap.c:2607
+#: catalog/heap.c:2820
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
+msgstr "villkor \"%s\" står i konflikt med NOT ENFORCED-villkor på relation \"%s\""
+
+#: catalog/heap.c:2825
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "slår samman villkor \"%s\" med ärvd definition"
 
-#: catalog/heap.c:2633 catalog/pg_constraint.c:853 commands/tablecmds.c:3074
-#: commands/tablecmds.c:3377 commands/tablecmds.c:7089
-#: commands/tablecmds.c:15907 commands/tablecmds.c:16038
+#: catalog/heap.c:2849 catalog/pg_constraint.c:803 catalog/pg_constraint.c:1154
+#: commands/tablecmds.c:3179 commands/tablecmds.c:3499
+#: commands/tablecmds.c:7286 commands/tablecmds.c:7967
+#: commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "för många föräldrar i arv"
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:2966 parser/parse_utilcmd.c:2655
+#, c-format
+msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr "motstridig NO INHERIT för icke-null-villkor på kolumnen \"%s\""
+
+#: catalog/heap.c:2980
+#, c-format
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "de motstridiga icke-null-villkorens namn är \"%s\" och \"%s\""
+
+#: catalog/heap.c:3010
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "kan inte ange villkoret icke-null med NO INHERIT på kolumnen \"%s\""
+
+#: catalog/heap.c:3012
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "kolumnen har ett ärvt vilkor för icke-null"
+
+#: catalog/heap.c:3202
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "kan inte använda genererad kolumn \"%s\" i kolumngenereringsuttryck"
 
-#: catalog/heap.c:2719
+#: catalog/heap.c:3204
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "En genererad kolumn kan inte referera till en annan genererad kolumn."
 
-#: catalog/heap.c:2725
+#: catalog/heap.c:3210
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr "kan inte använda hela-raden-variabel i kolumngenereringsuttryck"
 
-#: catalog/heap.c:2726
+#: catalog/heap.c:3211
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "Detta skulle leda till att den genererade kolumnen beror på sitt eget värde."
 
-#: catalog/heap.c:2781
+#: catalog/heap.c:3278
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "genereringsuttryck använder användardefinierad funktion"
+
+#: catalog/heap.c:3279
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr "Genererade virtuella kolumner som använder användardefinierade funktioner stöds inte än."
+
+#: catalog/heap.c:3294
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "genereringsuttryck avänder användardefinierad typ"
+
+#: catalog/heap.c:3346
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "genereringsuttryck är inte immutable"
 
-#: catalog/heap.c:2809 rewrite/rewriteHandler.c:1276
+#: catalog/heap.c:3378 rewrite/rewriteHandler.c:1288
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "kolumn \"%s\" har typ %s men default-uttryck har typen %s"
 
-#: catalog/heap.c:2814 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1281
+#: catalog/heap.c:3383 commands/prepare.c:334 parser/analyze.c:2906
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Du måste skriva om eller typomvandla uttrycket."
 
-#: catalog/heap.c:2861
+#: catalog/heap.c:3430
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "bara tabell \"%s\" kan refereras i check-villkoret"
 
-#: catalog/heap.c:3167
+#: catalog/heap.c:3736
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "inget stöd för kombinationen ON COMMIT och främmande nyckel"
 
-#: catalog/heap.c:3168
+#: catalog/heap.c:3737
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "Tabell \"%s\" refererar till \"%s\", men de har inte samma ON COMMIT-inställning."
 
-#: catalog/heap.c:3173
+#: catalog/heap.c:3742
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "kan inte trunkera en tabell som refererars till i ett främmande nyckelvillkor"
 
-#: catalog/heap.c:3174
+#: catalog/heap.c:3743
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Tabell \"%s\" refererar till \"%s\"."
 
-#: catalog/heap.c:3176
+#: catalog/heap.c:3745
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Trunkera tabellen \"%s\" samtidigt, eller använd TRUNCATE ... CASCADE."
 
-#: catalog/index.c:219 parser/parse_utilcmd.c:2176
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "multipla primärnycklar för tabell \"%s\" tillåts inte"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "primärnycklar kan inte använda NULLS NOT DISTINCT-index"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "primärnycklar kan inte vara uttryck"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "primärnyckelkolumn \"%s\" är inte markerad NOT NULL"
 
-#: catalog/index.c:798 catalog/index.c:1915
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "användardefinierade index på systemkatalogen är inte möjligt"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr "ickedeterministiska jämförelser (collation) stöds inte för operatorklass \"%s\""
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "samtida indexskapande på systemkatalogtabeller stöds inte"
 
-#: catalog/index.c:862 catalog/index.c:1331
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr "samtida indexskapande för uteslutningsvillkor stöds inte"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr "delade index kan inte skapas efter initdb"
 
-#: catalog/index.c:891 commands/createas.c:416 commands/sequence.c:159
-#: parser/parse_utilcmd.c:209
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "relationen \"%s\" finns redan, hoppar över"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "pg_class index OID-värde är inte satt i binärt uppgraderingsläge"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3791
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "relfile-nummervärde för index är inte satt i binärt uppgraderingsläge"
 
-#: catalog/index.c:2214
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY måste vara första operationen i transaktion"
 
-#: catalog/index.c:3668
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "kan inte omindexera temporära tabeller som tillhör andra sessioner"
 
-#: catalog/index.c:3679 commands/indexcmds.c:3626
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "kan inte omindexera angivet index i TOAST-tabell"
 
-#: catalog/index.c:3695 commands/indexcmds.c:3504 commands/indexcmds.c:3650
-#: commands/tablecmds.c:3581
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815
+#: commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "kan inte flytta systemrelation \"%s\""
 
-#: catalog/index.c:3832
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "index \"%s\" omindexerades"
 
-#: catalog/index.c:3998
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "kan inte omindexera ogiltigt index \"%s.%s\" på TOAST-tabell, hoppar över"
 
 #: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
-#: commands/trigger.c:5729
+#: commands/trigger.c:5838
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "referenser till andra databaser är inte implementerat: \"%s.%s.%s\""
@@ -5134,19 +5187,19 @@ msgstr "kunde inte ta lås på relationen \"%s.%s\""
 msgid "could not obtain lock on relation \"%s\""
 msgstr "kunde inte ta lås på relationen \"%s\""
 
-#: catalog/namespace.c:633 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "relationen \"%s.%s\" existerar inte"
 
-#: catalog/namespace.c:638 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "relationen \"%s\" existerar inte"
 
-#: catalog/namespace.c:704 catalog/namespace.c:3522 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1804
+#: commands/extension.c:1810
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "inget schema har valts för att skapa i"
@@ -5171,321 +5224,327 @@ msgstr "bara temporära relationer får skapas i temporära scheman"
 msgid "statistics object \"%s\" does not exist"
 msgstr "statistikobjektet \"%s\" existerar inte"
 
-#: catalog/namespace.c:2761
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "textsökparser \"%s\" finns inte"
 
-#: catalog/namespace.c:2906 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "textsökkatalog \"%s\" finns inte"
 
-#: catalog/namespace.c:3052
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "textsökmall \"%s\" finns inte"
 
-#: catalog/namespace.c:3197 commands/tsearchcmds.c:1168
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168
 #: utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "textsökkonfiguration \"%s\" finns inte"
 
-#: catalog/namespace.c:3329 parser/parse_expr.c:868 parser/parse_target.c:1259
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "referenser till andra databaser är inte implementerat: %s"
 
-#: catalog/namespace.c:3335 gram.y:19181 gram.y:19221 parser/parse_expr.c:875
-#: parser/parse_target.c:1266
+#: catalog/namespace.c:3338 gram.y:19355 gram.y:19395 parser/parse_expr.c:874
+#: parser/parse_target.c:1269
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "ej korrekt kvalificerat namn (för många namn med punkt): %s"
 
-#: catalog/namespace.c:3465
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "kan inte flytta objekt in eller ut från temporära scheman"
 
-#: catalog/namespace.c:3471
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "kan inte flytta objekt in eller ut från TOAST-schema"
 
-#: catalog/namespace.c:3544 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1404 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344
+#: commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "schema \"%s\" existerar inte"
 
-#: catalog/namespace.c:3575
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "ej korrekt relationsnamn (för många namn med punkt): %s"
 
-#: catalog/namespace.c:4016 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "jämförelse \"%s\" för kodning \"%s\" finns inte"
 
-#: catalog/namespace.c:4071
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "konvertering \"%s\" finns inte"
 
-#: catalog/namespace.c:4412
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "rättighet saknas för att skapa temporära tabeller i databasen \"%s\""
 
-#: catalog/namespace.c:4428
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "kan inte skapa temptabeller under återställning"
 
-#: catalog/namespace.c:4434
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "kan inte skapa temporära tabeller under en parallell operation"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2327
-#: commands/tablecmds.c:12925
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387
+#: commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" är inte en tabell"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17851 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" är inte en vy"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:199 commands/tablecmds.c:275
-#: commands/tablecmds.c:17856
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" är inte en materialiserad vy"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17861
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" är inte en främmande tabell"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "måste ange relation och objektnamn"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "kolumnnamn måste vara kvalificerat"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "standardvärde för kolumn \"%s\" i relation \"%s\" existerar inte"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "typen \"%s\" existerar inte"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" är inte en domän"
+
+#: catalog/objectaddress.c:1742
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "operator %d (%s, %s) för %s finns inte"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "funktion %d (%s, %s) för %s finns inte"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "användarmappning för användare \"%s\" på server \"%s\" finns inte"
 
-#: catalog/objectaddress.c:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1004 commands/foreigncmds.c:1367
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "server \"%s\" finns inte"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "publiceringsrelation \"%s\" i publicering \"%s\" finns inte"
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "publiceringsschema \"%s\" i publicering \"%s\" finns inte"
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "okänd standard-ACL-objekttyp \"%c\""
 
-#: catalog/objectaddress.c:2007
+#: catalog/objectaddress.c:2015
 #, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
-msgstr "Giltiga objekttyper är \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgstr "Giltiga objekttyper är \"%c\", \"%c\", \"%c\", \"%c\", \"%c\" och \"%c\"."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "standard ACL för användare \"%s\" i schema \"%s\" på %s finns inte"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "standard ACL för användare \"%s\" på %s finns inte"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "namn eller argumentlistor får inte innehålla null"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "ej stöd för objekttyp \"%s\""
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "namnlistlängen måste vara exakt %d"
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "stort objekt-OID får inte vara null"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "namnlistlängden måste vara minst %d"
 
-#: catalog/objectaddress.c:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "argumentlistans längd måste vara exakt %d"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "måste vara ägaren till stort objekt %u"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "måste vara ägaren till typ %s eller typ %s"
 
-#: catalog/objectaddress.c:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "rättighet saknas"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "Aktuella användaren måste ha attributet %s."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "Aktuella användaren måste ha flaggan %s på rollen \"%s\"."
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "måste vara en superuser"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "okänd objekttyp \"%s\""
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2928
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr "kolumn %s av %s"
 
-#: catalog/objectaddress.c:2943
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "funktion %s"
 
-#: catalog/objectaddress.c:2956
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "typ %s"
 
-#: catalog/objectaddress.c:2993
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "typomvandling från %s till %s"
 
-#: catalog/objectaddress.c:3026
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "jämförelse %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3057
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "villkor %s på %s"
 
-#: catalog/objectaddress.c:3063
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "villkor %s"
 
-#: catalog/objectaddress.c:3095
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "konvertering %s"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3117
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "default-värde för %s"
 
-#: catalog/objectaddress.c:3128
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "språk %s"
 
-#: catalog/objectaddress.c:3136
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "stort objekt %u"
 
-#: catalog/objectaddress.c:3149
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "operator %s"
 
-#: catalog/objectaddress.c:3186
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "operatorklass %s för accessmetod %s"
 
-#: catalog/objectaddress.c:3214
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "accessmetod %s"
@@ -5494,7 +5553,7 @@ msgstr "accessmetod %s"
 #. 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:3269
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "operator %d (%s, %s) för %s: %s"
@@ -5503,236 +5562,241 @@ msgstr "operator %d (%s, %s) för %s: %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3334
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "funktion %d (%s, %s) för %s: %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3388
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "regel %s på %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3434
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "trigger %s på %s"
 
-#: catalog/objectaddress.c:3454
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "schema %s"
 
-#: catalog/objectaddress.c:3482
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "statistikobjekt %s"
 
-#: catalog/objectaddress.c:3513
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "textsökparser %s"
 
-#: catalog/objectaddress.c:3544
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "textsökordlista %s"
 
-#: catalog/objectaddress.c:3575
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "textsökmall %s"
 
-#: catalog/objectaddress.c:3606
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "textsökkonfiguration %s"
 
-#: catalog/objectaddress.c:3619
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "roll %s"
 
-#: catalog/objectaddress.c:3656 catalog/objectaddress.c:5505
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "medlemskap av rollen %s i rollen %s"
 
-#: catalog/objectaddress.c:3677
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "databas %s"
 
-#: catalog/objectaddress.c:3693
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "tabellutrymme %s"
 
-#: catalog/objectaddress.c:3704
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "främmande data-omvandlare %s"
 
-#: catalog/objectaddress.c:3714
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "server %s"
 
-#: catalog/objectaddress.c:3747
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "användarmappning för %s på server %s"
 
-#: catalog/objectaddress.c:3799
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr "standardrättigheter för nya relationer som tillhör rollen %s i schema %s"
 
-#: catalog/objectaddress.c:3803
+#: catalog/objectaddress.c:3812
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "standardrättigheter för nya relationer som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3809
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr "standardrättigheter för nya sekvenser som tillhör rollen %s i schema %s"
 
-#: catalog/objectaddress.c:3813
+#: catalog/objectaddress.c:3822
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "standardrättigheter för nya sekvenser som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3819
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "standardrättigheter för nya funktioner som tillhör rollen %s i schema %s"
 
-#: catalog/objectaddress.c:3823
+#: catalog/objectaddress.c:3832
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "standardrättigheter för nya funktioner som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3829
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr "standardrättigheter för nya typer som tillhör rollen %s i schema %s"
 
-#: catalog/objectaddress.c:3833
+#: catalog/objectaddress.c:3842
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "standardrättigheter för nya typer som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3839
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "<standardrättigheter för nya scheman som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3846
+#: catalog/objectaddress.c:3854
+#, c-format
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "standardrättigheter för nya stora objekt som tillhör rollen %s"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr "standardrättigheter som tillhör rollen %s i schema %s"
 
-#: catalog/objectaddress.c:3850
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "standardrättigheter som tillhör rollen %s"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "utökning %s"
 
-#: catalog/objectaddress.c:3889
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "händelseutösare %s"
 
-#: catalog/objectaddress.c:3913
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "parameter %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3956
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "policy %s på %s"
 
-#: catalog/objectaddress.c:3970
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "publicering %s"
 
-#: catalog/objectaddress.c:3983
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "publicering av schema %s i publikation %s"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:4014
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "publicering av %s i publikation %s"
 
-#: catalog/objectaddress.c:4027
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "prenumeration %s"
 
-#: catalog/objectaddress.c:4048
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "transform för %s språk %s"
 
-#: catalog/objectaddress.c:4117
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "tabell %s"
 
-#: catalog/objectaddress.c:4122
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "index %s"
 
-#: catalog/objectaddress.c:4126
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "sekvens %s"
 
-#: catalog/objectaddress.c:4130
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "toast-tabell %s"
 
-#: catalog/objectaddress.c:4134
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "vy %s"
 
-#: catalog/objectaddress.c:4138
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "materialiserad vy %s"
 
-#: catalog/objectaddress.c:4142
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "composite-typ %s"
 
-#: catalog/objectaddress.c:4146
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "främmande tabell %s"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "relation %s"
 
-#: catalog/objectaddress.c:4192
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "operatorfamilj %s för accessmetod %s"
@@ -5774,7 +5838,7 @@ msgstr "får inte utelämna startvärdet när övergångsfunktionen är strikt o
 msgid "return type of inverse transition function %s is not %s"
 msgstr "returtyp för inversa övergångsfunktionen %s är inte %s"
 
-#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:2991
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3057
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "strikthet för aggregatets positiva och inversa övergångsfunktionerna måste matcha"
@@ -5789,7 +5853,7 @@ msgstr "slutfunktion med extra argument får inte deklareras STRICT"
 msgid "return type of combine function %s is not %s"
 msgstr "returtyp från sammansätt-funktion %s är inte %s"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr "kombineringsfunktion med övergångstyp %s får inte deklareras STRICT"
@@ -5804,12 +5868,12 @@ msgstr "returtyp från serialiseringsfunktion %s är inte %s"
 msgid "return type of deserialization function %s is not %s"
 msgstr "returtyp från deserialiseringsfunktion %s är inte %s"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "kan inte lista ut resultatdatatypen"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "osäker använding av pseudo-typ \"internal\""
@@ -5824,53 +5888,53 @@ msgstr "moving-aggregat-implementationen returnerar typ %s, men vanliga implemen
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "sorteringsoperator kan bara anges för aggregatfunktioner med ett argument"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "kan inte ändra rutin-kind"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "\"%s\" är en vanlig aggregatfunktion."
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "\"%s\" är en sorterad-mängd-aggregat."
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "\"%s\" är ett hypotetiskt mängdaggregait."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "kan inte ändra antalet direkta argument på en aggregatfunktion"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "funktionen %s finns inte"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "funktionen %s returnerar en mängd"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr "funktion %s måste acceptera VARIADIC ANY för att användas i detta aggregat"
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "funktionen %s kräver en typomvandling under körning"
@@ -5950,21 +6014,62 @@ msgstr "jämförelse \"%s\" finns redan"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "jämförelse \"%s\" för kodning \"%s\" finns redan"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:764 commands/tablecmds.c:7952
+#, c-format
+msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
+msgstr "kan inte ändra NO INHERIT-status för NOT NULL-villkor \"%s\" på relationen \"%s\""
+
+#: catalog/pg_constraint.c:766 commands/tablecmds.c:9584
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "Du kan behöva gör det existerande villkoret ärvbart med %s."
+
+#: catalog/pg_constraint.c:776 commands/tablecmds.c:8301
+#, c-format
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr "inkompatibelt NOT VALID-villkor \"%s\" på relationen \"%s\""
+
+#: catalog/pg_constraint.c:778 commands/tablecmds.c:8303
+#: commands/tablecmds.c:9596
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "Du kan behöva validera det med %s."
+
+#: catalog/pg_constraint.c:792
+#, c-format
+msgid "cannot create not-null constraint \"%s\" on column \"%s\" of table \"%s\""
+msgstr "kan inte skapa icke-null-villkor \"%s\" på kolumn \"%s\" i tabellen \"%s\""
+
+#: catalog/pg_constraint.c:794
+#, c-format
+msgid "A not-null constraint named \"%s\" already exists for this column."
+msgstr "Ett icke-null-villkor med namn \"%s\" finns redan för denna kolumnen."
+
+#: catalog/pg_constraint.c:1033
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "villkor \"%s\" för domän %s finns redan"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1234 catalog/pg_constraint.c:1327
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "integritetsvillkor \"%s\" för tabell \"%s\" existerar inte"
 
-#: catalog/pg_constraint.c:1125
+#: catalog/pg_constraint.c:1427
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "villkor \"%s\" för domänen %s finns inte"
 
+#: catalog/pg_constraint.c:1681
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "ogiltig type för PERIOD-delen av främmande nyckel"
+
+#: catalog/pg_constraint.c:1682
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "Bara range och multirange stöds."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -5975,27 +6080,27 @@ msgstr "konvertering \"%s\" finns redan"
 msgid "default conversion for %s to %s already exists"
 msgstr "standardkonvertering från %s till %s finns redan"
 
-#: catalog/pg_depend.c:224 commands/extension.c:3397
+#: catalog/pg_depend.c:223 commands/extension.c:3689
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s är redan en medlem i utökningen \"%s\""
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3729
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s är inte en medlem av utökning \"%s\""
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:233
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "En utökning får inte ersätta ett objekt som den inte äger."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:284
 #, c-format
 msgid "An extension may only use CREATE ... IF NOT EXISTS to skip object creation if the conflicting object is one that it already owns."
 msgstr "En utökning får bara användas CREATE ... IF NOT EXISTS för att hoppa över skapande av objekt om den äger det konfliktande objektet."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:647
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "kan inte ta bort beroende på %s eftersom det är ett systemobjekt"
@@ -6045,8 +6150,8 @@ msgstr "kan inte koppla loss partition \"%s\""
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "Partitionen kopplas loss parallellt eller har en bortkoppling som inte är slutförd."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4800
-#: commands/tablecmds.c:16153
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916
+#: commands/tablecmds.c:17891
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "Använd ALTER TABLE ... DETACH PARTITION ... FINALIZE för att slutföra den pågående bortkopplingsoperationen."
@@ -6151,44 +6256,44 @@ msgstr "negationsoperator %s är redan negator för operatorn %u"
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "parameter ACL \"%s\" finns inte"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "funktioner kan inte ha mer än %d argument"
 msgstr[1] "funktioner kan inte ha mer än %d argument"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "funktionen \"%s\" finns redan med samma argumenttyper"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "\"%s\" är en aggregatfunktion."
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "\"%s\" är en funktion."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "\"%s\" är en procedur."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "\"%s\" är en fönsterfunktion."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "kan inte ändra hurvida en procedur har utdataparametrar"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "kan inte ändra returtyp på en existerande funktion"
@@ -6197,109 +6302,109 @@ msgstr "kan inte ändra returtyp på en existerande funktion"
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "Använd %s %s först."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "Radtypen definerad av OUT-parametrar är annorlunda."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "kan inte byta namn på inputparameter \"%s\""
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr "kan inte ta bort parameter-default för existerande funktion"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr "kan inte ändra datatyp på existerande parameter-default-värde"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "det finns ingen inbyggd typ med namn \"%s\""
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL-funktioner kan inte returnera typ %s"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-funktioner kan inte ha argument av typ %s"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1468
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "SQL-funktion \"%s\""
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "kan inte lägga till relation \"%s\" till publicering"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "Denna operation stöds inte på systemtabeller."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "Denna operation stöds inte på temporära tabeller."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "Denna operation stöds inte på ologgade tabeller."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "kan inte lägga till schema \"%s\" till publicering"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "Denna operation stöds inte på systemscheman."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "Temporära scheman kan inte replikeras."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "relationen \"%s\" är redan en medlem av publiceringen \"%s\""
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr "kan inte använda systemkolumn \"%s\" i kolumnlista för publicering"
 
-#: catalog/pg_publication.c:540
+#: catalog/pg_publication.c:582
 #, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
-msgstr "kan inte använda genererad kolumn \"%s\" i kolumnlista för publicering"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
+msgstr "kan inte använda genererad virtuell kolumn \"%s\" i kolumnlista för publicering"
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "duplicerad kolumn \"%s\" i kolumnlista för publicering"
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "schemat \"%s\" är redan en medlem av publiceringen \"%s\""
@@ -6377,12 +6482,12 @@ msgstr "kan inte ta bort objekt ägda av %s eftersom de krävs av databassysteme
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "kan inte byta ägare på objekt som ägs av %s då dessa krävas av databassystemet"
 
-#: catalog/pg_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "kunde inte slänga relationsmappning för prenumeration \"%s\""
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "Tabellsynkronisering för relation \"%s\" pågår och är i läget \"%c\"."
@@ -6390,7 +6495,7 @@ msgstr "Tabellsynkronisering för relation \"%s\" pågår och är i läget \"%c\
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "Använd %s för att slå på prenumerationen om den inte redan är på eller använd %s för att slänga prenumerationen."
@@ -6421,7 +6526,7 @@ msgstr "intern storlek %d är ogiltig för skicka-värde-typ"
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "justering (alignment) \"%c\" är ogiltig för variabel-längd-typ"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "typer med fast storlek måste lagras som PLAIN"
@@ -6436,10 +6541,10 @@ msgstr "Misslyckades vid skapande av multirange-typ för typen \"%s\"."
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "Du kan manuellt ange en multirange-typ med hjälp av attributet \"multirange_type_name\"."
 
-#: catalog/storage.c:533 storage/buffer/bufmgr.c:1540
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "ogiltig sida i block %u i relation %s"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "ogiltig sida i block %u i relation \"%s\""
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -6521,7 +6626,7 @@ msgstr "serialiseringsfunktioner får bara anges när aggregatets övergångsdat
 msgid "must specify both or neither of serialization and deserialization functions"
 msgstr "måste ange båda eller ingen av funktionerna serialization och deserialization"
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr "parameter \"parallel\" måste vara SAFE, RESTRICTED eller UNSAFE"
@@ -6531,17 +6636,17 @@ msgstr "parameter \"parallel\" måste vara SAFE, RESTRICTED eller UNSAFE"
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "parameter \"%s\" måste vara READ_ONLY, SHAREABLE eller READ_WRITE"
 
-#: commands/alter.c:83 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "händelsetrigger \"%s\" finns redan"
 
-#: commands/alter.c:86 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "främmande data-omvandlare \"%s\" finns redan"
 
-#: commands/alter.c:89 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "servern \"%s\" finns redan"
@@ -6551,12 +6656,12 @@ msgstr "servern \"%s\" finns redan"
 msgid "language \"%s\" already exists"
 msgstr "språk \"%s\" finns redan"
 
-#: commands/alter.c:95 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:870
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "publicering \"%s\" finns redan"
 
-#: commands/alter.c:98 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "prenumeration \"%s\" finns redan"
@@ -6596,21 +6701,21 @@ msgstr "textsökkonfiguration \"%s\" finns redan i schema \"%s\""
 msgid "must be superuser to rename %s"
 msgstr "måste vara en superuser för att döpa om %s"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false är enbart för superanvändare"
 
-#: commands/alter.c:257 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "Prenumerationer med password_required-flaggan satt till \"false\" får bara skapas eller ändras av superanvändare."
 
-#: commands/alter.c:735
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "måste vara en superuser för att sätta schema för %s"
@@ -6630,7 +6735,7 @@ msgstr "Måste vara en superuser för att skapa accessmetod."
 msgid "access method \"%s\" already exists"
 msgstr "accessmetod \"%s\" finns redan"
 
-#: commands/amcmds.c:154 commands/indexcmds.c:224 commands/indexcmds.c:850
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
 #: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
@@ -6641,79 +6746,84 @@ msgstr "accessmetod \"%s\" existerar inte"
 msgid "handler function is not specified"
 msgstr "hanterarfunktion ej angiven"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:204
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "funktion %s måste returnera typ %s"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "hoppar över \"%s\" --- kan inte analysera denna främmande tabell"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr "hoppar över \"%s\" --- kan inte analysera icke-tabeller eller speciella systemtabeller"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analyserar \"%s.%s\" arvsträd"
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analyserar \"%s.%s\""
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "kolumn \"%s\" i relation \"%s\" dyker upp mer än en gång"
 
-#: commands/analyze.c:785
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "automatisk analys av tabell \"%s.%s.%s\"\n"
 
-#: commands/analyze.c:1300
+#: commands/analyze.c:805
+#, c-format
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "avslutade analysering av tabell \"%s.%s.%s\"\n"
+
+#: commands/analyze.c:1346
 #, 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\": skannade %d av %u sidor, innehåller %.0f levande rader och %.0f döda rader; %d rader samplade, %.0f uppskattat antal rader"
 
-#: commands/analyze.c:1384
+#: commands/analyze.c:1430
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "hoppar över analys av arvsträd \"%s.%s\" --- detta arvsträd innehåller inga barntabeller"
 
-#: commands/analyze.c:1482
+#: commands/analyze.c:1528
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "hoppar över analys av arvsträd \"%s.%s\" --- detta arvsträd innehåller inga analyserbara barntabeller"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "kanalnamn får inte vara tomt"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "kanalnamn för långt"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "innehållssträng är för lång"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "kan inte göra PREPARE på transaktion som kört LISTEN, UNLISTEN eller NOTIFY"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "för många notifieringar i NOTIFY-kön"
@@ -6733,82 +6843,84 @@ msgstr "Serverprocessen med PID %d är bland dem med den äldsta transaktionen."
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "NOTIFY-kön kan inte tömmas innan den processen avslutar sin nuvarande transaktion."
 
-#: commands/cluster.c:128
+#: commands/cluster.c:127 commands/dbcommands.c:2356
+#: commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234
+#: commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "okänd CLUSTER-flagga \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "okänd %s-flagga \"%s\""
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "kan inte klustra temporära tabeller för andra sessioner"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "det finns inget tidigare klustrat index för tabell \"%s\""
 
-#: commands/cluster.c:191 commands/tablecmds.c:14797 commands/tablecmds.c:16729
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "index \"%s\" för tabell \"%s\" finns inte"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "kan inte klustra en delad katalog"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "kan inte städa temporära tabeller för andra sessioner"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16739
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" är inte ett index för tabell \"%s\""
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, c-format
 msgid "cannot cluster on index \"%s\" because access method does not support clustering"
 msgstr "kan inte klustra på index \"%s\" eftersom accessmetoden inte stöder klustring"
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "kan inte klustra på partiellt index \"%s\""
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "kan inte klustra på ogiltigt index \"%s\""
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "kan inte flagga ett index som klustrat för en partitionerad tabell"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "klusterar \"%s.%s\" med hjälp av index-skanning på \"%s\""
 
-#: commands/cluster.c:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "klustrar \"%s.%s\" med hjälp av serkvensiell scan och sortering"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "kör vaccum på \"%s.%s\""
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
 msgstr "\"%s.%s\": hittade %.0f borttagbara, %.0f ej borttagbara radversioner i %u sidor"
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -6817,7 +6929,7 @@ msgstr ""
 "%.0f döda radversioner kan inte tas bort än.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "rättighet nekad till kluster \"%s\", hoppar över det"
@@ -6828,13 +6940,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "jämförelsesattribut \"%s\" känns inte igen"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8129
-#: replication/pgoutput/pgoutput.c:314 replication/pgoutput/pgoutput.c:337
-#: replication/pgoutput/pgoutput.c:351 replication/pgoutput/pgoutput.c:361
-#: replication/pgoutput/pgoutput.c:371 replication/pgoutput/pgoutput.c:381
-#: replication/pgoutput/pgoutput.c:393 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8394
+#: replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:362 replication/pgoutput/pgoutput.c:372
+#: replication/pgoutput/pgoutput.c:382 replication/pgoutput/pgoutput.c:392
+#: replication/pgoutput/pgoutput.c:404 replication/walsender.c:1137
+#: replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420
+#: replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "motstridiga eller redundanta inställningar"
@@ -6865,7 +6978,7 @@ msgstr "okänd jämförelseleverantör: %s"
 msgid "parameter \"%s\" must be specified"
 msgstr "parameter \"%s\" måste anges"
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "använder standardformen \"%s\" för ICU-lokal \"%s\""
@@ -6875,7 +6988,7 @@ msgstr "använder standardformen \"%s\" för ICU-lokal \"%s\""
 msgid "nondeterministic collations not supported with this provider"
 msgstr "ickedeterministiska jämförelser (collation) stöds inte med denna leverantör"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "ICU-regler kan inte anges om lokalleverantören inte är ICU"
@@ -6885,68 +6998,69 @@ msgstr "ICU-regler kan inte anges om lokalleverantören inte är ICU"
 msgid "current database's encoding is not supported with this provider"
 msgstr "teckenkodning för aktuell databas stöds inte med denna leverantör"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr "jämförelse \"%s\" för kodning \"%s\" finns redan i schema \"%s\""
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "jämförelse \"%s\" finns redan i schema \"%s\""
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "kan inte refresha versionen på standardjämförelse"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7905 commands/tablecmds.c:7915
-#: commands/tablecmds.c:7917 commands/tablecmds.c:14499
-#: commands/tablecmds.c:17884 commands/tablecmds.c:17905
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8146 commands/tablecmds.c:8156
+#: commands/tablecmds.c:8158 commands/tablecmds.c:16149
+#: commands/tablecmds.c:19677 commands/tablecmds.c:19698
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "Använd %s istället."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2566
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "byter version från %s till %s"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2579
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "versionen har inte ändrats"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2749
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "databas med OID %u finns inte"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "jämförelse med OID %u existerar inte"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr "måste vara en superuser för att importera systemjämförelser"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "inga användbara systemlokaler hittades"
 
-#: commands/comment.c:61 commands/dbcommands.c:1665 commands/dbcommands.c:1883
-#: commands/dbcommands.c:1995 commands/dbcommands.c:2193
-#: commands/dbcommands.c:2433 commands/dbcommands.c:2526
-#: commands/dbcommands.c:2650 commands/dbcommands.c:3161
-#: utils/init/postinit.c:1034 utils/init/postinit.c:1098
-#: utils/init/postinit.c:1171
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2473 commands/dbcommands.c:2566
+#: commands/dbcommands.c:2690 commands/dbcommands.c:3201
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "databasen \"%s\" existerar inte"
@@ -6956,12 +7070,12 @@ msgstr "databasen \"%s\" existerar inte"
 msgid "cannot set comment on relation \"%s\""
 msgstr "kan inte sätta kommentar på relationen \"%s\""
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "funktionen \"%s\" anropades inte av triggerhanteraren"
 
-#: commands/constraint.c:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "funktionen \"%s\" måste köras för AFTER ROW"
@@ -7031,268 +7145,309 @@ msgstr "rättighet saknas för att göra COPY till en fil"
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får göra COPY till en fil."
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "genererade kolumner tillåts inte i COPY FROM WHERE-villkor"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824
+#: commands/tablecmds.c:19906 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "Kolumnen \"%s\" är en genererad kolumn."
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM stöds inte med radnivåsäkerhet"
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Använd INSERT-satser istället."
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "kan inte ange \"%s\" med HEADER i COPY TO"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "%s kräver ett booleskt värde eller \"match\""
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:782 commands/copy.c:798
-#: commands/copy.c:815 commands/copy.c:841 commands/copy.c:851
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873
+#: commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s kan inte användas med %s"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:441
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "COPY %s \"%s\" känns inte igen"
 
-#: commands/copy.c:502
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s kräver ett numeriskt värde"
+
+#: commands/copy.c:485
+#, c-format
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "REJECT_LIMIT (%<PRId64>) måste vara större än noll"
+
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "COPY-format \"%s\" känns inte igen"
 
-#: commands/copy.c:560 commands/copy.c:575 commands/copy.c:590
-#: commands/copy.c:609
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663
+#: commands/copy.c:682
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "argumentet till flaggan \"%s\" måste vara en lista med kolumnnamn"
 
-#: commands/copy.c:621
+#: commands/copy.c:694
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "argumentet till flaggan \"%s\" måste vara ett giltigt kodningsnamn"
 
-#: commands/copy.c:642 commands/dbcommands.c:866 commands/dbcommands.c:2381
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "flaggan \"%s\" känns inte igen"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:655 commands/copy.c:660 commands/copy.c:665
-#: commands/copy.c:740
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745
+#: commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "kan inte ange %s i läget BINARY"
 
-#: commands/copy.c:670
-#, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr "bara ON_ERROR STOP tillåts i läget BINARY"
-
-#: commands/copy.c:692
+#: commands/copy.c:767
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "COPY-separatorn måste vara ett ensamt en-byte-tecken"
 
-#: commands/copy.c:699
+#: commands/copy.c:774
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPY-separatorn kan inte vara nyradstecken eller vagnretur"
 
-#: commands/copy.c:705
+#: commands/copy.c:780
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "null-representationen för COPY kan inte använda tecknen för nyrad eller vagnretur"
 
-#: commands/copy.c:715
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "standard-representationen för COPY kan inte använda tecknen för nyrad eller vagnretur"
 
-#: commands/copy.c:733
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "COPY-separatorn kan inte vara \"%s\""
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:747 commands/copy.c:764 commands/copy.c:776
-#: commands/copy.c:791 commands/copy.c:807
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851
+#: commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "COPY %s kräver CSV-läge"
 
-#: commands/copy.c:752
+#: commands/copy.c:827
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "COPY-quote måste vara ett ensamt en-byte-tecken"
 
-#: commands/copy.c:757
+#: commands/copy.c:832
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "COPY-separator och quote måste vara olika"
 
-#: commands/copy.c:769
+#: commands/copy.c:844
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "COPY-escape måste vara ett ensamt en-byte-tecken"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:823 commands/copy.c:859
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "Tecknet för COPY-separatorn får inte förekomma i %s-specifikationen"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:832 commands/copy.c:868
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "CSV-citattecken får inte förekomma i %s-specifikationen"
 
-#: commands/copy.c:877
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "NULL-specifikation and DEFAULT-specifikation får inte vara samma"
 
-#: commands/copy.c:939
+#: commands/copy.c:958
+#, c-format
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "bara ON_ERROR STOP tillåts i läget BINARY"
+
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:965
+#, c-format
+msgid "COPY %s requires %s to be set to %s"
+msgstr "COPY %s kräver att %s är satt till %s"
+
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "kolumnen \"%s\" är en genererad kolumn"
 
-#: commands/copy.c:941
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "Genererade kolumner kan inte användas i COPY."
 
-#: commands/copy.c:956 commands/indexcmds.c:1890 commands/statscmds.c:239
-#: commands/tablecmds.c:2526 commands/tablecmds.c:2997
-#: commands/tablecmds.c:3808 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260
+#: commands/tablecmds.c:2593 commands/tablecmds.c:3101
+#: commands/tablecmds.c:3930 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
 #: utils/adt/tsvector_op.c:2853
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "kolumnen \"%s\" existerar inte"
 
-#: commands/copy.c:963 commands/tablecmds.c:2552 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "kolumn \"%s\" angiven mer än en gång"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, rad %llu, kolumn %s"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, rad %<PRIu64>, kolumn %s"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, rad %llu"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, rad %<PRIu64>"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, rad %llu, kolumn %s: \"%s\""
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, rad %<PRIu64>, kolumn %s: \"%s\""
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, rad %llu, kolumn %s: null-indata"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, rad %<PRIu64>, kolumn %s: null-indata"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, rad %llu: \"%s\""
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, rad %<PRIu64>: \"%s\""
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "kan inte kopiera till vyn \"%s\""
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr "För att tillåta kopiering till en vy, testa med en INSTEAD OF INSERT-trigger."
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "kan inte kopiera till materialiserad vy \"%s\""
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "kan inte kopiera till sekvens \"%s\""
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "kan inte kopiera till icke-tabellrelation \"%s\""
 
-#: commands/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "kan inte utföra COPY FREEZE på en partitionerad tabell"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, c-format
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "kan inte utföra COPY FREEZE på en främmande tabell"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr "kan inte utföra COPY FREEZE på grund av tidigare transaktionsaktivitet"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid "cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "kan inte utföra COPY FREEZE då tabellen inte skapades eller trunkerades i den nuvarande undertransaktionen"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
+#, c-format
+msgid "skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type incompatibility"
+msgstr "hoppade över mer än REJECT_LIMIT (%<PRId64>) rader på grund av inkompatibla datatyper"
+
+#: commands/copyfrom.c:1474
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] "%llu rad hoppades över på grund av inkompatibla datatyper"
-msgstr[1] "%llu rader hoppades över på grund av inkompatibla datatyper"
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "%<PRIu64> rad hoppades över på grund av inkompatibla datatyper"
+msgstr[1] "%<PRIu64> rader hoppades över på grund av inkompatibla datatyper"
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1448 commands/copyfrom.c:1491 commands/copyto.c:601
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "%s-kolumnen \"%s\" refereras inte till av COPY"
 
-#: commands/copyfrom.c:1544 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:386
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "standardkonverteringsfunktion för kodning \"%s\" till \"%s\" finns inte"
 
-#: commands/copyfrom.c:1742
+#: commands/copyfrom.c:1882
 #, c-format
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY FROM säger åt PostgreSQLs serverprocess att läsa en fil. Du kanske söker efter en klient-finess så som psql:s \\copy."
 
-#: commands/copyfrom.c:1755 commands/copyto.c:706
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" är en katalog"
 
-#: commands/copyfrom.c:1823 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "kunde inte stänga rör till externt komamndo: %m"
 
-#: commands/copyfrom.c:1838 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "program \"%s\" misslyckades"
@@ -7333,676 +7488,677 @@ msgid "could not read from COPY file: %m"
 msgstr "kunde inte läsa från COPY-fil: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:381
+#: replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "oväntat EOF från klientanslutning med öppen transaktion"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "oväntad meddelandetyp 0x%02X under COPY från stdin"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "COPY från stdin misslyckades: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "fel antal fält i rubrikraden: fick %d, förväntade %d"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid "column name mismatch in header line field %d: got null value (\"%s\"), expected \"%s\""
 msgstr "kolumnnamn matchar inte i rubrikfält %d: fick null-värde (\"%s\"), förväntade \"%s\""
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
 msgstr "kolumnnamn matchar inte i rubrikfält %d: fick \"%s\", förväntade \"%s\""
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "extra data efter den förväntat sista kolumnen"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "saknar data för kolumn \"%s\""
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": \"%s\""
-msgstr "hoppar över rad på grund av inkompatibla datatyper på rad %llu kolumn \"%s\": \"%s\""
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": \"%s\""
+msgstr "hoppar över rad på grund av inkompatibla datatyper på rad %<PRIu64> kolumn \"%s\": \"%s\""
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": null input"
-msgstr "hoppar över rad på grund av inkompatibla datatyper på rad %llu kolumn \"%s\": null indata"
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": null input"
+msgstr "hoppar över rad på grund av inkompatibla datatyper på rad %<PRIu64> kolumn \"%s\": null indata"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "tog emot copy-data efter EOF-markering"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "fälträknaren är %d, förväntades vara %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "hittade asciitecknet vagnretur i data"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "ej citerad vagnretur (carriage return) hittad i data"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Använd \"\\r\" för att representera vagnretur (carriage return)."
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Använd citerat CSV-fält för att representera vagnretur (carriage return)."
 
-#: commands/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "hittade asciitecknet nyrad i data"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "ej citerat nyradstecken hittad i data"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Använd \"\\n\" för att representera en ny rad."
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Använd citerat CSV-fält för att representera en ny rad."
 
-#: commands/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "slut-på-copy-markeringen matchar inte tidigare nyradsmetod"
 
-#: commands/copyfromparse.c:1428 commands/copyfromparse.c:1444
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
 #, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "slut-på-copy-markeringen felaktig"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "slut-på-copy-markeringen är inte ensam på sin rad"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "oväntad default-markering i COPY-data"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "Kolumnen \"%s\" har inget default-värde"
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "icketerminerat citerat CSV-fält"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "oväntad EOF i COPY-data"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "ogiltig fältstorlek"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "felaktigt binärt dataformat"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "kunde inte skriva till COPY-program: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "kunde inte skriva till COPY-fil: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "kan inte kopiera från vy \"%s\""
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Försök med varianten COPY (SELECT ...) TO."
 
-#: commands/copyto.c:385
+#: commands/copyto.c:660
+#, c-format
+msgid "cannot copy from unpopulated materialized view \"%s\""
+msgstr "kan inte kopiera från en opopulerad materialiserad vy \"%s\""
+
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
-msgid "cannot copy from materialized view \"%s\""
-msgstr "kan inte kopiera från materialiserad vy \"%s\""
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "Använd kommandot REFRESH MATERIALIZED VIEW."
 
-#: commands/copyto.c:391
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "kan inte kopiera från främmande tabell \"%s\""
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "kan inte kopiera från sekvens \"%s\""
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "kan inte kopiera från partitionerad tabell \"%s\""
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "kan inte kopiera från icke-tabell-relation \"%s\""
 
-#: commands/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "DO INSTEAD NOTHING-regler stöds inte med COPY"
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "villkorliga DO INSTEAD-regler stöds inte med COPY"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
 msgid "DO ALSO rules are not supported for COPY"
 msgstr "DO ALSO-regler stöds inte med COPY"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "multi-satsers DO INSTEAD-regler stöds inte med COPY"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) stöds inte"
 
-#: commands/copyto.c:499
+#: commands/copyto.c:778
 #, c-format
 msgid "COPY query must not be a utility command"
 msgstr "COPY-frågan får inte vara ett verktygskommando"
 
-#: commands/copyto.c:515
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "COPY-fråga måste ha en RETURNING-klausul"
 
-#: commands/copyto.c:544
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "relationen refererad till av COPY-sats har ändrats"
 
-#: commands/copyto.c:671
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "relativa sökväg tillåts inte för COPY till fil"
 
-#: commands/copyto.c:690
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "kunde inte öppna fil \"%s\" för skrivning: %m"
 
-#: commands/copyto.c:693
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY TO säger åt PostgreSQLs serverprocess att skriva till en fil. Du kanske söker efter en klient-finess så som psql:s \\copy."
 
-#: commands/createas.c:210 commands/createas.c:516
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "för många kolumnnamn angivna"
 
-#: commands/createas.c:539
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "policys är ännu inte implementerat för detta kommando"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION stöds inte längre"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "Du kanske kan använda tabellutrymmen (tablespaces) istället."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "OIDer mindre än %u är reserverade för systemobjekt"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "\"%d\" är inte en giltigt kodningskod"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "\"%s\" är inte ett giltigt kodningsnamn"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "okänd lokalleverantör: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2414 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "ogiltig anslutningsgräns: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "rättighet saknas för att skapa databas"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "malldatabasen \"%s\" existerar inte"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "kan inte använda ogiltig databas \"%s\" som mall"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2444
-#: utils/init/postinit.c:1113
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "Använd DROP TABLE för att ta bort ogiltiga databaser."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "rättighet saknas för att kopiera databas \"%s\""
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "ogiltig strategi \"%s\" för att skapa databas"
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "Giltiga strategier är \"wal_log\" och \"file_copy\"."
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "ogiltigt server-kodning %d"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "ogiltigt LC_COLLATE-lokalnamn: \"%s\""
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, c-format
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "Om lokalnamnet är specifikt för inbyggd leverantör, använd BUILTIN_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "Om lokalnamnet är specifikt för ICU, använd ICU_LOCALE."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "Om lokalnamnet är specifikt för leverantören ICU, använd ICU_LOCALE."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "ogiltigt LC_CTYPE-lokalnamn: \"%s\""
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALE kan inte anges om lokalleverantören inte är inbyggd"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICU-lokal kan inte anges om lokalleverantören inte är ICU"
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "LOCALE eller BUILTIN_LOCALE måste anges"
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "teckenkodning \"%s\" stöds inte av ICU-leverantör"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "LOCALE eller ICU_LOCALE måste anges"
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "ny kodning (%s) är inkompatibel med kodningen i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "Använd samma kodning som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "ny jämförelse (%s) är inkompatibel med jämförelsen i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "Använd samma jämförelse som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "ny LC_CTYPE (%s) är inkompatibel med LC_CTYPE i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "Använd samma LC_CTYPE som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "nya lokalleverantören (%s) är inkompatibel med lokalleverantören i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "Använd samma lokalleverantör som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "ny ICU-lokal (%s) är inkompatibel ICU-lokalen i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "Använd samma ICU-lokal som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "ny ICU-jämförelseregler (%s) är inkompatibel med ICU-jämförelseregler i malldatabasen (%s)"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "Använd samma ICU-jämförelsregler som i malldatabasen eller använd template0 som mall."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "malldatabasen \"%s\" har en jämförelseversion (collation) men ingen exakt version kunde härledas"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "malldatabasen \"%s\" har en jämförelseversion (collation) som inte matchar"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "Malldatabasen skapades med jämförelseversion (collation) %s men operativsystemet har version %s."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Bygg om alla objekt i malldatabasen som använder default jämförelse (collation) och kör ALTER DATABASE %s REFRESH COLLATION VERSION eller bygg PostgreSQL med rätt bibliotekversion."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2041
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global kan inte användas som standard-tablespace"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "kan inte sätta ny standard-tablespace \"%s\""
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr "Det finns en konflikt eftersom databasen \"%s\" redan har några tabeller i detta tabellutrymme."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1912
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "databas \"%s\" finns redan"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "källdatabasen \"%s\" används av andra användare"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "databas-OID %u används redan av databasen \"%s\""
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "datakatalog med angiven OID %u finns redan"
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2588
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "kodning \"%s\" matchar inte lokal \"%s\""
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "Den valda LC_CTYPE-inställningen kräver kodning \"%s\"."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "Den valda LC_COLLATE-inställningen kräver kodning \"%s\"."
 
-#: commands/dbcommands.c:1672
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "databasen \"%s\" existerar inte, hoppar över"
 
-#: commands/dbcommands.c:1696
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "kan inte ta bort en malldatabas"
 
-#: commands/dbcommands.c:1702
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "kan inte ta bort den databas som används just nu"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "databasen \"%s\" används av en aktiv logisk replikeringsslot"
 
-#: commands/dbcommands.c:1717
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
 msgstr[0] "Det är %d aktiv slot."
 msgstr[1] "Det är %d aktiva slottar."
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "databasen \"%s\" används av logisk replikeringsprenumeration"
 
-#: commands/dbcommands.c:1733
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
 msgstr[0] "Det finns %d prenumeration."
 msgstr[1] "Det finns %d prenumerationer."
 
-#: commands/dbcommands.c:1754 commands/dbcommands.c:1934
-#: commands/dbcommands.c:2063
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "databasen \"%s\" används av andra användare"
 
-#: commands/dbcommands.c:1894
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "rättighet saknas för att döpa om databas"
 
-#: commands/dbcommands.c:1923
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "den använda databasen får inte döpas om"
 
-#: commands/dbcommands.c:2019
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "kan inte ändra tablespace på den databas som används just nu"
 
-#: commands/dbcommands.c:2125
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "vissa relationer i databasen \"%s\" finns redan i tablespace \"%s\""
 
-#: commands/dbcommands.c:2127
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "Du måste flytta tillbaka dem till tabellens standard-tablespace innan du använder detta kommando."
 
-#: commands/dbcommands.c:2256 commands/dbcommands.c:2999
-#: commands/dbcommands.c:3299 commands/dbcommands.c:3412
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039
+#: commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "några värdelösa filer kan lämnas kvar i gammal databaskatalog \"%s\""
 
-#: commands/dbcommands.c:2317
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "okänd DROP DATABASE-flagga \"%s\""
-
-#: commands/dbcommands.c:2395
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "flaggan \"%s\" kan inte anges tillsammans med andra flaggor"
 
-#: commands/dbcommands.c:2443
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "kan inte ändra på ogiltig database \"%s\""
 
-#: commands/dbcommands.c:2460
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "kan inte förbjuda anslutningar till nuvarande databas"
 
-#: commands/dbcommands.c:2690
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "rättighet saknas för att byta ägare på databasen"
 
-#: commands/dbcommands.c:3105
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "Det finns %d andra session(er) och %d förberedda transaktion(er) som använder databasen."
 
-#: commands/dbcommands.c:3108
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
 msgstr[0] "Det finns %d annan session som använder databasen."
 msgstr[1] "Det finns %d andra sessioner som använder databasen."
 
-#: commands/dbcommands.c:3113 storage/ipc/procarray.c:3859
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
 msgstr[0] "Det finns %d förberedd transaktion som använder databasen"
 msgstr[1] "Det finns %d förberedda transaktioner som använder databasen"
 
-#: commands/dbcommands.c:3255
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "saknar katalog \"%s\""
 
-#: commands/dbcommands.c:3313 commands/tablespace.c:184
+#: commands/dbcommands.c:3353 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "kunde inte göra stat() på katalog \"%s\": %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s kräver en parameter"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s kräver ett numeriskt värde"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "%s kräver ett booleskt värde"
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s kräver ett heltalsvärde"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "argumentet till %s måste vara ett namn"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "argumentet till %s måste vara ett typnamn"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "ogiltigt argument till \"%s\": \"%s\""
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2910
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "\"%s\" är en aggregatfunktion"
@@ -8012,19 +8168,19 @@ msgstr "\"%s\" är en aggregatfunktion"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Använd DROP AGGREGATE för att ta bort aggregatfunktioner."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3892
-#: commands/tablecmds.c:4050 commands/tablecmds.c:4102
-#: commands/tablecmds.c:17161 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014
+#: commands/tablecmds.c:4175 commands/tablecmds.c:4227
+#: commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "relation \"%s\" finns inte, hoppar över"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1409
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "schema \"%s\" finns inte, hoppar över"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "typ \"%s\" finns inte, hoppar över"
@@ -8044,7 +8200,7 @@ msgstr "jämförelse \"%s\" finns inte, hoppar över"
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "konvertering \"%s\" finns inte, hoppar över"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "statistikobjekt \"%s\" finns inte, hoppar över"
@@ -8139,7 +8295,7 @@ msgstr "regel \"%s\" för relation \"%s\" finns inte, hoppar över"
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "främmande data-omvandlare \"%s\" finns inte, hoppar över"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "servern \"%s\" finns inte, hoppar över"
@@ -8159,502 +8315,504 @@ msgstr "operatorfamilj \"%s\" finns inte för accessmetod \"%s\", hoppar över"
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "publicering \"%s\" finns inte, hoppar över"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "rättighet saknas för att skapa händelsetrigger \"%s\""
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "Måste vara superuser för att skapa en händelsetrigger."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "okänt händelsenamn: \"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "okänd filtervariabel \"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "tagg-filtrering stöds inte för inloggningars händelsetrigger"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "filtervärde \"%s\" känns inte igen för filtervariabel \"%s\""
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "händelsutösare stöds inte för %s"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "filtervariabel \"%s\" angiven mer än en gång"
 
-#: commands/event_trigger.c:438 commands/event_trigger.c:490
-#: commands/event_trigger.c:584
+#: commands/event_trigger.c:442 commands/event_trigger.c:494
+#: commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "händelsetrigger \"%s\" finns inte"
 
-#: commands/event_trigger.c:522
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "händelsetrigger med OID %u existerar inte"
 
-#: commands/event_trigger.c:552
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "rättighet saknas för att byta ägare på händelsetrigger \"%s\""
 
-#: commands/event_trigger.c:554
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "Ägaren för en händelsetrigger måste vara en superuser."
 
-#: commands/event_trigger.c:1409
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s kan bara anropas i en sql_drop-händelsetriggerfunktion"
 
-#: commands/event_trigger.c:1502 commands/event_trigger.c:1523
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%s kan bara anropas i en tabell_rewrite-händelsetriggerfunktion"
 
-#: commands/event_trigger.c:1936
+#: commands/event_trigger.c:2063
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s kan bara anropas i en händelsetriggerfunktion"
 
-#: commands/explain.c:241 commands/explain.c:266
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "okänt värde för EXPLAIN-flagga \"%s\": \"%s\""
-
-#: commands/explain.c:273
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "okänd EXPLAIN-flagga \"%s\""
-
-#: commands/explain.c:282
-#, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
-msgstr "EXPLAIN-flagga WAL kräver ANALYZE"
-
-#: commands/explain.c:291
+#: commands/explain_state.c:133 commands/explain_state.c:158
+#: replication/walsender.c:1151
 #, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "EXPLAIN-flagga TIMING kräver ANALYZE"
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "okänt värde för %s-flaggan \"%s\": \"%s\""
 
-#: commands/explain.c:297
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
 #, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "EXPLAIN-flagga SERIALIZE kräver ANALYZE"
+msgid "EXPLAIN option %s requires ANALYZE"
+msgstr "EXPLAIN-flagga %s kräver ANALYZE"
 
-#: commands/explain.c:303
+#: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "EXPLAIN-flaggorna ANALYZE och GENERIC_PLAN kan inte användas ihop"
+msgid "%s options %s and %s cannot be used together"
+msgstr "%s-flaggorna %s och %s kan inte användas tillsammans"
 
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:177 commands/extension.c:3323
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "utökning \"%s\" finns inte"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:242 commands/extension.c:251 commands/extension.c:263
+#: commands/extension.c:273
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "ogiltigt utökningsnamn: \"%s\""
 
-#: commands/extension.c:278
+#: commands/extension.c:243
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "Utökningsnamn får inte vara tomt."
 
-#: commands/extension.c:287
+#: commands/extension.c:252
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "Utökningsnamn får inte innehålla \"--\"."
 
-#: commands/extension.c:299
+#: commands/extension.c:264
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Utökningsnamn får inte börja på eller sluta på \"-\"."
 
-#: commands/extension.c:309
+#: commands/extension.c:274
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "Utökningar får inte innehålla katalogseparatortecken."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:289 commands/extension.c:298 commands/extension.c:307
+#: commands/extension.c:317
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "ogiltigt utökningsversionsnamn: \"%s\""
 
-#: commands/extension.c:325
+#: commands/extension.c:290
 #, c-format
 msgid "Version names must not be empty."
 msgstr "Versionsnamn får inte vara tomma."
 
-#: commands/extension.c:334
+#: commands/extension.c:299
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "Versionsnamn får inte innehålla \"--\"."
 
-#: commands/extension.c:343
+#: commands/extension.c:308
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "Versionsnamn från inte börja på eller sluta på \"-\"."
 
-#: commands/extension.c:353
+#: commands/extension.c:318
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "Versionsnamn får inte innehålla katalogseparatortecken."
 
-#: commands/extension.c:507
+#: commands/extension.c:543
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "utökningen \"%s\" finns inte tillgänglig"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "Kunde inte öppna utökningskontrollfil \"%s\": %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:544
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "Utökningen måste först installeras i systemet där PostgreSQL kör."
 
-#: commands/extension.c:514
+#: commands/extension.c:566
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "kunde inte öppna utökningskontrollfil \"%s\": %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:589 commands/extension.c:599
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "parameter \"%s\" kan inte sättas i sekundär utökningskontrollfil"
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:621 commands/extension.c:629 commands/extension.c:637
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "parameter \"%s\" kräver ett boolskt värde"
 
-#: commands/extension.c:594
+#: commands/extension.c:646
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" är inte ett giltigt kodningsnamn"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:660 commands/extension.c:675
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "parameter \"%s\" måste vara en lista av utökningsnamn"
 
-#: commands/extension.c:630
+#: commands/extension.c:682
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "okänd parameter \"%s\" i fil \"%s\""
 
-#: commands/extension.c:639
+#: commands/extension.c:691
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "parameter \"schema\" kan inte anges när \"relocatable\" är true"
 
-#: commands/extension.c:817
+#: commands/extension.c:867
+#, c-format
+msgid "SQL statement \"%.*s\""
+msgstr "SQL-sats: \"%.*s\""
+
+#: commands/extension.c:896
+#, c-format
+msgid "extension script file \"%s\", near line %d"
+msgstr "utökningsskriptsfil \"%s\", nära rad %d"
+
+#: commands/extension.c:900
+#, c-format
+msgid "extension script file \"%s\""
+msgstr "utökningsskriptsfil \"%s\""
+
+#: commands/extension.c:1012
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "transaktionskontrollsatser tillåts inte i ett utökningsskript"
 
-#: commands/extension.c:897
+#: commands/extension.c:1094
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "rättighet saknas för att skapa utökning \"%s\""
 
-#: commands/extension.c:900
+#: commands/extension.c:1097
 #, c-format
 msgid "Must have CREATE privilege on current database to create this extension."
 msgstr "Måste ha CREATE-rättighet på den aktuella databasen för att skapa denna utökning."
 
-#: commands/extension.c:901
+#: commands/extension.c:1098
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Måste vara superuser för att skapa denna utökning."
 
-#: commands/extension.c:905
+#: commands/extension.c:1102
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "rättighet saknas för att uppdatera utökning \"%s\""
 
-#: commands/extension.c:908
+#: commands/extension.c:1105
 #, c-format
 msgid "Must have CREATE privilege on current database to update this extension."
 msgstr "Måste ha CREATE-rättighet på den aktuella databasen för att uppdatera denna utökning."
 
-#: commands/extension.c:909
+#: commands/extension.c:1106
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Måste vara superuser för att uppdatera denna utökning."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1239
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "ogiltigt tecken i utökningsägare: får inte innehålla någon av \"%s\""
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1263 commands/extension.c:1290
 #, c-format
 msgid "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr "ogiltigt tecken i schema för utökning \"%s\": får inte innehålla någon av \"%s\""
 
-#: commands/extension.c:1288
+#: commands/extension.c:1485
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "utökningen \"%s\" saknar uppdateringsmöjlighet från version \"%s\" till version \"%s\""
 
-#: commands/extension.c:1496 commands/extension.c:3089
+#: commands/extension.c:1693 commands/extension.c:3381
 #, c-format
 msgid "version to install must be specified"
 msgstr "installationversion måste anges"
 
-#: commands/extension.c:1533
+#: commands/extension.c:1730
 #, c-format
 msgid "extension \"%s\" has no installation script nor update path for version \"%s\""
 msgstr "utökning \"%s\" saknar installationsskript samt uppdateringsmöjlighet till version \"%s\""
 
-#: commands/extension.c:1567
+#: commands/extension.c:1764
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "utökning \"%s\" måste vara installerat i schema \"%s\""
 
-#: commands/extension.c:1727
+#: commands/extension.c:1924
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "cirkulärt beroende upptäckt mellan utökningar \"%s\" och \"%s\""
 
-#: commands/extension.c:1732
+#: commands/extension.c:1929
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "installerar krävd utökning \"%s\""
 
-#: commands/extension.c:1755
+#: commands/extension.c:1952
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "krävd utökning \"%s\" är inte installerad"
 
-#: commands/extension.c:1758
+#: commands/extension.c:1955
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr "Använd CREATE EXTENSION ... CASCADE för att installera alla krävda utökningar också."
 
-#: commands/extension.c:1793
+#: commands/extension.c:1990
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "utökning \"%s\" finns redan, hoppar över"
 
-#: commands/extension.c:1800
+#: commands/extension.c:1997
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "utökning \"%s\" finns redan"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2008
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "nästlade CREATE EXTENSION stöds inte"
 
-#: commands/extension.c:1975
+#: commands/extension.c:2172
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "kan inte ta bort utökning \"%s\" eftersom det håller på att modifieras"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2689
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s kan bara anropas från ett SQL-skript som körs av CREATE EXTENSION"
 
-#: commands/extension.c:2462
+#: commands/extension.c:2701
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u refererar inte till en tabell"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2706
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "tabell \"%s\" är inte en del av utökningen som skapas"
 
-#: commands/extension.c:2813
+#: commands/extension.c:3105
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "kan inte flytta utökning \"%s\" till schema \"%s\" eftersom utökningen innehåller schemat"
 
-#: commands/extension.c:2854 commands/extension.c:2948
+#: commands/extension.c:3146 commands/extension.c:3240
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "utökning \"%s\" stöder inte SET SCHEMA"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3203
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "kan inte göra SET SCHEMA på utökning \"%s\" då andra utökningar förhindrar det"
 
-#: commands/extension.c:2913
+#: commands/extension.c:3205
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "Utökningen \"%s\" begär ingen omlokalisering av utökningen \"%s\""
 
-#: commands/extension.c:2950
+#: commands/extension.c:3242
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s är inte utökningens schema \"%s\""
 
-#: commands/extension.c:3011
+#: commands/extension.c:3303
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "nästlade ALTER EXTENSION stöds inte"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3392
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "version \"%s\" av utökning \"%s\" är redan installerad"
 
-#: commands/extension.c:3311
+#: commands/extension.c:3603
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "kan inte lägga till ett objekt av denna typ till en utökning"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3701
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "kan inte lägga till schema \"%s\" till utökningen \"%s\" eftersom schemat innehåller utökningen"
 
-#: commands/extension.c:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3783 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "kunde inte hitta multirange-typ för datatyp %s"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3825
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "filen \"%s\" är för stor"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:3918 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "komponent i parametern \"%s\" är inte är en absolut sökväg "
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "flaggan \"%s\" hittades inte"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "flaggan \"%s\" angiven mer än en gång"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "rättighet saknas för att byta ägare på främmande data-omvandlare \"%s\""
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "Måste vara superuser för att byta ägare på en främmande data-omvandlare."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Ägaren av en främmande data-omvandlare måste vara en superuser."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "främmande data-omvandlare \"%s\" finns inte"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "främmande data-omvandlare med OID %u finns inte"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "främmande server med OID %u finns inte"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "rättighet saknas för att skapa främmande data-omvandlare \"%s\""
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Måste vara superuser för att skapa främmande data-omvandlare."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "rättighet saknas för att ändra främmande data-omvandlare \"%s\""
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Måste vara superuser för att ändra främmande data-omvandlare."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "att ändra främmande data-omvandlares hanterare kan byta beteende på existerande främmande tabeller"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr "att ändra främmande data-omvandlares validator kan göra att flaggor för beroende objekt invalideras"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "server \"%s\" finns redan, hoppar över"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "användarmappning för \"%s\" finns redan för server \"%s\", hoppar över"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "användarmappning för \"%s\" finns redan för server \"%s\""
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "användarmappning för \"%s\" finns inte för servern \"%s\""
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "användarmappning för \"%s\" finns inte för servern \"%s\", hoppar över"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "främmande data-omvandlare \"%s\" har ingen hanterare"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "främmande data-omvandlare \"%s\" stöder inte IMPORT FOREIGN SCHEMA"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "importerar främmande tabell \"%s\""
@@ -8689,641 +8847,681 @@ msgstr "Skapar en shell-typsdefinition."
 msgid "SQL function cannot accept shell type %s"
 msgstr "SQL-funktioner kan inte hantera shell-typ %s"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "aggregat kan inte hantera shell-typ %s"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "argumenttyp %s är bara en shell-typ"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "typen %s existerar inte"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "aggregat kan inte hantera mängder som argument"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "procedurer kan inte ta emot mängder som argument"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "funktioner kan inte hantera mängder som argument"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "VARIADIC-parameter måste vara den sista indataparametern"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "VARIADIC-parameter måste vara den sista parametern"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "VARIADIC-parameter måste vara en array"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "parameternamn \"%s\" använt mer än en gång"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "bara inputparametrar kan ha default-värden"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "kan inte använda tabellreferenser i parameters default-värde"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr "indataparametrar efter en med default-värde måste också ha default-värden"
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr "procedurers OUT-parametrar kan inte komma efter en parameter med default-värde"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "ogiltigt attribut i procedurdefinition"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "supportfunktion %s måste returnera typ %s"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "måste vara en superuser för att ange en supportfunktion"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "COST måste vara positiv"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "ROWS måste vara positiv"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "ingen funktionskropp angiven"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "dubbel funktionskropp angiven"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "inline SQL-funktionskropp stöds bara för språket SQL"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid "SQL function with unquoted function body cannot have polymorphic arguments"
 msgstr "SQL-funktion med ej citerad funktionskropp kan inte ha polymorfa argument"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr "%s stöds inte än i en ej citerad SQL-funktionskropp"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "bara en AS-sträng krävs för språk \"%s\""
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "inget språk angivet"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2117
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "språk \"%s\" existerar inte"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2119
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr "Använd CREATE EXTENSION för att ladda in språket i databasen."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr "bara en superuser kan definiera en leakproof-funktion"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "funktionens resultattyp måste vara %s på grund av OUT-parametrar"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "funktionens resultattyp måste anges"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS är inte applicerbar när funktionen inte returnerar en mängd"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "källdatatyp %s är en pseudo-typ"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "måldatatyp %s är en pseudo-typ"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "typomvandling kommer hoppas över då källdatatypen är en domän"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "typomvandling kommer hoppas över då måldatatypen är en domän"
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "typomvandlingsfunktioner måste ha mellan ett och tre argument"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid "argument of cast function must match or be binary-coercible from source data type"
 msgstr "argumentet till typomvandlingsfunktion måsta matcha eller vara binärkonverterbar från källdatatypen"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "andra argumentet till en typomvandlingsfunktion måste vara av typ %s"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "tredje argumentet till en typomvandlingsfunktion måste vara av typ %s"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid "return data type of cast function must match or be binary-coercible to target data type"
 msgstr "returvärdet från typomvandlingsfunktion måste matcha eller vara binärkonverterbar till måldatatypen"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "typomvandlingsfunktioner får inte vara volatile"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "typomvandlingsgfunktionen måste vara en vanlig funktion"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "typomvandlingsfunktionen får inte returnera en mängd"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "måste vara superuser för att skapa en typomvandling WITHOUT FUNCTION"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "käll- och måldatatypen är inte kompatibla rent tekniskt"
 
-#: commands/functioncmds.c:1709
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "composite-datatyper är inte binärkompatibla"
 
-#: commands/functioncmds.c:1715
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "array-datatyper är inte binärkompatibla"
 
-#: commands/functioncmds.c:1723
+#: commands/functioncmds.c:1741
 #, c-format
 msgid "range data types are not binary-compatible"
 msgstr "range-datatyper är inte binärkompatibla"
 
-#: commands/functioncmds.c:1729
+#: commands/functioncmds.c:1747
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "enum-datatyper är inte binärkompatibla"
 
-#: commands/functioncmds.c:1746
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "domändatatyper får inte markeras binärkompatibla"
 
-#: commands/functioncmds.c:1756
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "kalldatatypen och måldatatypen är samma"
 
-#: commands/functioncmds.c:1789
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "transformfunktion får inte vara volatile"
 
-#: commands/functioncmds.c:1793
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "transformfunktion måste vara en normal funktion"
 
-#: commands/functioncmds.c:1797
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "transformfunktion får inte returnera en mängd"
 
-#: commands/functioncmds.c:1801
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "transformfunktion måster ta ett argument"
 
-#: commands/functioncmds.c:1805
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "första argumentet till en transformfunktion måste vara av typen %s"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "datatypen %s är en pseudo-typ"
 
-#: commands/functioncmds.c:1850
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "datatypen %s är en domän"
 
-#: commands/functioncmds.c:1890
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "returdatatyp för FROM SQL-funktion måste vara %s"
 
-#: commands/functioncmds.c:1916
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "returdatatyp för TO SQL-funktion måste vara transformdatatypen"
 
-#: commands/functioncmds.c:1943
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "transform för typ %s språk \"%s\" finns redan"
 
-#: commands/functioncmds.c:2029
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "transform för typ %s språk \"%s\" finns inte"
 
-#: commands/functioncmds.c:2053
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "funktionen %s finns redan i schema \"%s\""
 
-#: commands/functioncmds.c:2104
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "ingen inline-kod angiven"
 
-#: commands/functioncmds.c:2150
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "språk \"%s\" stöder inte inline-kodexekvering"
 
-#: commands/functioncmds.c:2245
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
 msgstr[0] "kan inte överföra mer än %d argument till en procedur"
 msgstr[1] "kan inte överföra mer än %d argument till en procedur"
 
-#: commands/indexcmds.c:656
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "måste ange minst en kolumn"
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "kan inte ha mer än %d kolumner i ett index"
 
-#: commands/indexcmds.c:703
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "kan inte skapa index för relationen \"%s\""
 
-#: commands/indexcmds.c:729
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr "kan inte parallellt skapa index för partitionerad tabell \"%s\""
 
-#: commands/indexcmds.c:739
+#: commands/indexcmds.c:748
 #, c-format
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "kan inte skapa index till temporära tabeller som tillhör andra sessioner"
 
-#: commands/indexcmds.c:777 commands/tablecmds.c:818 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "kan inte sätta standard-tablespace för partitionerade relationer"
 
-#: commands/indexcmds.c:809 commands/tablecmds.c:849 commands/tablecmds.c:3588
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "bara delade relationer kan placeras i tablespace:et pg_global"
 
-#: commands/indexcmds.c:842
+#: commands/indexcmds.c:851
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "ersätter den föråldrade åtkomstmetoden \"rtree\" med den nya \"gist\""
 
-#: commands/indexcmds.c:863
+#: commands/indexcmds.c:872
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "accessmetod \"%s\" stöder inte unika index"
 
-#: commands/indexcmds.c:868
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "accessmetod \"%s\" stöder inte inkluderade kolumner"
 
-#: commands/indexcmds.c:873
+#: commands/indexcmds.c:882
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "accessmetod \"%s\" stöder inte flerkolumnindex"
 
-#: commands/indexcmds.c:878
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "accessmetod \"%s\" stöder inte uteslutningsvillkor"
 
-#: commands/indexcmds.c:1007
+#: commands/indexcmds.c:892
 #, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr "kan inte matcha partitionsnyckel till ett index med hjälp av accessmetod \"%s\""
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "accessmetod \"%s\" stöder inte WITHOUT OVERLAPS-villkor"
 
-#: commands/indexcmds.c:1017
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr "ej stöd för %s-villkor till partitionsnyckeldefinition"
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "%s-villkor kan inte användas när partitionsnyckel innehåller uttryck"
 
-#: commands/indexcmds.c:1069
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469
+#: commands/indexcmds.c:2488 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553
+#: utils/adt/arrayfuncs.c:3864 utils/adt/arrayfuncs.c:4419
+#: utils/adt/arrayfuncs.c:6440 utils/adt/rowtypes.c:1220
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "kunde inte hitta en likhetsoperator för typ %s"
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2491
+#, c-format
+msgid "There is no suitable operator in operator family \"%s\" for access method \"%s\"."
+msgstr "Det finns ingen lämplig operator i operatorfamilj \"%s\" för accessmetod \"%s\"."
+
+#: commands/indexcmds.c:1077
 #, c-format
 msgid "cannot match partition key to index on column \"%s\" using non-equal operator \"%s\""
 msgstr "kan inte matcha partitionsnyckel till ett index på kolumn \"%s\" med hjälp av operator för ej lika med \"%s\""
 
-#: commands/indexcmds.c:1085
+#: commands/indexcmds.c:1093
 #, c-format
 msgid "unique constraint on partitioned table must include all partitioning columns"
 msgstr "unikvillkor på partitionerad tabell måste inkludera alla partitioneringskolumner"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1094
 #, c-format
 msgid "%s constraint on table \"%s\" lacks column \"%s\" which is part of the partition key."
 msgstr "villkoret %s på tabell \"%s\" saknar kolumn \"%s\" som är en del av partioneringsnyckeln."
 
-#: commands/indexcmds.c:1105 commands/indexcmds.c:1124
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1147
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "skapa index för systemkolumner stöds inte"
 
-#: commands/indexcmds.c:1354 tcop/utility.c:1515
+#: commands/indexcmds.c:1123
+#, c-format
+msgid "primary keys on virtual generated columns are not supported"
+msgstr "primärnycklar på genererade virtuella kolumner stöds inte"
+
+#: commands/indexcmds.c:1125 commands/indexcmds.c:1164
+#, c-format
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr "unikvillkor på genererade virtuella kolumner stöds inte"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1165
+#, c-format
+msgid "indexes on virtual generated columns are not supported"
+msgstr "index på genererade virtuella kolumner stöds inte"
+
+#: commands/indexcmds.c:1397 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "kan inte skapa unikt index för partitionerad tabell \"%s\""
 
-#: commands/indexcmds.c:1356 tcop/utility.c:1517
+#: commands/indexcmds.c:1399 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "Tabell \"%s\" innehåller partitioner som är främmande tabeller."
 
-#: commands/indexcmds.c:1806
+#: commands/indexcmds.c:1857
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "funktioner i indexpredikat måste vara markerade IMMUTABLE"
 
-#: commands/indexcmds.c:1885 parser/parse_utilcmd.c:2519
-#: parser/parse_utilcmd.c:2654
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735
+#: parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "kolumn \"%s\" angiven i en nyckel existerar inte"
 
-#: commands/indexcmds.c:1909 parser/parse_utilcmd.c:1807
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "uttryck stöds inte i inkluderade kolumner"
 
-#: commands/indexcmds.c:1950
+#: commands/indexcmds.c:2019
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "funktioner i indexuttryck måste vara markerade IMMUTABLE"
 
-#: commands/indexcmds.c:1965
+#: commands/indexcmds.c:2034
 #, c-format
 msgid "including column does not support a collation"
 msgstr "inkluderad kolumn stöder inte jämförelse (collation)"
 
-#: commands/indexcmds.c:1969
+#: commands/indexcmds.c:2038
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "inkluderad kolumn stöder inte en operatorklass"
 
-#: commands/indexcmds.c:1973
+#: commands/indexcmds.c:2042
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "inkluderad kolumn stöder inte ASC/DESC-flaggor"
 
-#: commands/indexcmds.c:1977
+#: commands/indexcmds.c:2046
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "inkluderad kolumn stöder inte NULLS FIRST/LAST-flaggor"
 
-#: commands/indexcmds.c:2020
+#: commands/indexcmds.c:2089
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "kunde inte bestämma vilken jämförelse (collation) som skulle användas för indexuttryck"
 
-#: commands/indexcmds.c:2028 commands/tablecmds.c:18185 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3771
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812
+#: parser/parse_expr.c:2815 parser/parse_type.c:568 parser/parse_utilcmd.c:4064
 #: utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "jämförelser (collation) stöds inte av typ %s"
 
-#: commands/indexcmds.c:2095
+#: commands/indexcmds.c:2164
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "operatorn %s är inte kommutativ"
 
-#: commands/indexcmds.c:2097
+#: commands/indexcmds.c:2166
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr "Bara kommutativa operatorer kan användas i uteslutningsvillkor"
 
-#: commands/indexcmds.c:2123
+#: commands/indexcmds.c:2176
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "operatorn \"%s\" är inte en medlem i operatorfamiljen \"%s\""
 
-#: commands/indexcmds.c:2126
+#: commands/indexcmds.c:2179
 #, c-format
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr "Uteslutningsoperatorn måste vara relaterad till indexoperatorklassen för villkoret."
 
-#: commands/indexcmds.c:2161
+#: commands/indexcmds.c:2228
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "accessmetod \"%s\" stöder inte ASC/DESC-flaggor"
 
-#: commands/indexcmds.c:2166
+#: commands/indexcmds.c:2233
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "accessmetod \"%s\" stöder inte NULLS FIRST/LAST-flaggor"
 
-#: commands/indexcmds.c:2210 commands/tablecmds.c:18210
-#: commands/tablecmds.c:18216 commands/typecmds.c:2311
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019
+#: commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "datatyp %s har ingen standardoperatorklass för accessmetod \"%s\""
 
-#: commands/indexcmds.c:2212
+#: commands/indexcmds.c:2279
 #, c-format
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr "Du måste ange en operatorklass för indexet eller definiera en standardoperatorklass för datatypen."
 
-#: commands/indexcmds.c:2241 commands/indexcmds.c:2249
+#: commands/indexcmds.c:2308 commands/indexcmds.c:2316
 #: commands/opclasscmds.c:205
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "operatorklass \"%s\" existerar inte för accessmetod \"%s\""
 
-#: commands/indexcmds.c:2263 commands/typecmds.c:2299
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "operatorklass \"%s\" accepterar inte datatypen %s"
 
-#: commands/indexcmds.c:2353
+#: commands/indexcmds.c:2420
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr "det finns flera standardoperatorklasser för datatypen %s"
 
-#: commands/indexcmds.c:2681
+#: commands/indexcmds.c:2470 commands/indexcmds.c:2489
+#, c-format
+msgid "could not identify an overlaps operator for type %s"
+msgstr "kunde inte hitta en överlappningsoperator för typ %s"
+
+#: commands/indexcmds.c:2471 commands/indexcmds.c:2490
+#, c-format
+msgid "could not identify a contained-by operator for type %s"
+msgstr "kunde inte hitta en contained-by-operator för typ %s"
+
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
 #, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "okänd REINDEX-flagga \"%s\""
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "Kunde inte översätta jämförelsetyp %d för operatorfamilj \"%s\" till accessmetod \"%s\"."
 
-#: commands/indexcmds.c:2913
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "tabell \"%s\" har inga index som kan reindexeras parallellt"
 
-#: commands/indexcmds.c:2927
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "tabell \"%s\" har inga index som kan omindexeras"
 
-#: commands/indexcmds.c:2974 commands/indexcmds.c:3485
-#: commands/indexcmds.c:3615
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650
+#: commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "kan inte omindexera systemkataloger parallellt"
 
-#: commands/indexcmds.c:2998
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "kan bara omindexera den aktiva databasen"
 
-#: commands/indexcmds.c:3090
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "kan inte omindexera systemkataloger parallellt, hoppar över alla"
 
-#: commands/indexcmds.c:3123
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "kan inte flytta systemrelationer, hoppar över alla"
 
-#: commands/indexcmds.c:3169
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "vid omindexering av partitionerad tabell \"%s.%s\""
 
-#: commands/indexcmds.c:3172
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "vid omindexering av partitionerat index \"%s.%s\""
 
-#: commands/indexcmds.c:3365 commands/indexcmds.c:4241
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "tabell \"%s.%s\" omindexerades"
 
-#: commands/indexcmds.c:3517 commands/indexcmds.c:3570
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "hoppar över omindexering av ogiltigt index \"%s.%s\""
 
-#: commands/indexcmds.c:3520 commands/indexcmds.c:3573
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "Använd DROP INDEX eller REINDEX INDEX."
 
-#: commands/indexcmds.c:3524
+#: commands/indexcmds.c:3689
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "kan inte parallellt omindexera uteslutningsvillkorsindex \"%s.%s\", hoppar över"
 
-#: commands/indexcmds.c:3680
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "kan inte parallellt omindexera denna sorts relation"
 
-#: commands/indexcmds.c:3698
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "kan inte flytta ickedelad relation till tabellutryumme \"%s\""
 
-#: commands/indexcmds.c:4222 commands/indexcmds.c:4234
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "index \"%s.%s\" omindexerades"
 
-#: commands/indexcmds.c:4224 commands/indexcmds.c:4243
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -9333,36 +9531,41 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "kan inte låsa relationen \"%s\""
 
-#: commands/matview.c:206
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "CONCURRENTLY kan inte användas när den materialiserade vyn inte är populerad"
 
-#: commands/matview.c:212 gram.y:18918
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "flaggorna %s och %s kan inte användas ihop"
 
-#: commands/matview.c:269
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "kan inte refresha materialiserad vy \"%s\" \"concurrently\""
 
-#: commands/matview.c:272
+#: commands/matview.c:276
 #, c-format
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr "Skapa ett unikt index utan WHERE-klausul för en eller flera kolumner i den materialiserade vyn."
 
-#: commands/matview.c:666
+#: commands/matview.c:682
 #, c-format
 msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
 msgstr "ny data för materialiserad vy \"%s\" innehåller duplicerade rader utan några null-kolumner"
 
-#: commands/matview.c:668
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "Rad: %s"
 
+#: commands/matview.c:838
+#, c-format
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "kunde inte hitta lämpligt unikt index på materialiserad vy \"%s\""
+
 #: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
@@ -9448,7 +9651,7 @@ msgstr "index-operatorer måste vara binära"
 #: commands/opclasscmds.c:1173
 #, c-format
 msgid "access method \"%s\" does not support ordering operators"
-msgstr "accessmetod \"%s\" stöder inte sorteringsoperatorer"
+msgstr "accessmetod \"%s\" stöder inte ordningsoperatorer"
 
 #: commands/opclasscmds.c:1184
 #, c-format
@@ -9477,110 +9680,125 @@ msgstr "Giltig signatud för flaggparsningsfunktion i operatorklass är %s."
 
 #: commands/opclasscmds.c:1259
 #, c-format
-msgid "btree comparison functions must have two arguments"
-msgstr "btree-jämförelsefunktioner måste ha två argument"
+msgid "ordering comparison functions must have two arguments"
+msgstr "ordningsjämförelsefunktioner måste ha två argument"
 
 #: commands/opclasscmds.c:1263
 #, c-format
-msgid "btree comparison functions must return integer"
-msgstr "btree-jämförelsefunktioner måste returnera heltal"
+msgid "ordering comparison functions must return integer"
+msgstr "ordningsjämförelsefunktioner måste returnera heltal"
 
 #: commands/opclasscmds.c:1280
 #, c-format
-msgid "btree sort support functions must accept type \"internal\""
-msgstr "btree-sorteringshjälpfunktioner måste ta typen \"internal\""
+msgid "ordering sort support functions must accept type \"internal\""
+msgstr "supportfunktioner för sorteringsordning måste hantera typen \"internal\""
 
 #: commands/opclasscmds.c:1284
 #, c-format
-msgid "btree sort support functions must return void"
-msgstr "btree-sorteringshjälpfunktioner måste returnera void"
+msgid "ordering sort support functions must return void"
+msgstr "supportfunktioner för sorteringsordning måste returnera void"
 
 #: commands/opclasscmds.c:1295
 #, c-format
-msgid "btree in_range functions must have five arguments"
-msgstr "btree-in_range-funktioner måste ha fem argument"
+msgid "ordering in_range functions must have five arguments"
+msgstr "in_range-funktioner för ordning måste ha fem argument"
 
 #: commands/opclasscmds.c:1299
 #, c-format
-msgid "btree in_range functions must return boolean"
-msgstr "btree-in_range-funktioner måste returnera en boolean"
+msgid "ordering in_range functions must return boolean"
+msgstr "in_range-funktioner för ordning måste returnera en boolean"
 
 #: commands/opclasscmds.c:1315
 #, c-format
-msgid "btree equal image functions must have one argument"
-msgstr "btree-equal-image-funktioner måste ha ett argument"
+msgid "ordering equal image functions must have one argument"
+msgstr "equal-image-funktioner för ordning måste ha ett argument"
 
 #: commands/opclasscmds.c:1319
 #, c-format
-msgid "btree equal image functions must return boolean"
-msgstr "btree-equal-image-funktioner måste returnera en boolean"
+msgid "ordering equal image functions must return boolean"
+msgstr "equal-image-funktioner för ordning måste returnera en boolean"
 
 #: commands/opclasscmds.c:1332
 #, c-format
-msgid "btree equal image functions must not be cross-type"
-msgstr "btree-equal-image-funktioner får inte fungera mellan typer"
+msgid "ordering equal image functions must not be cross-type"
+msgstr "equal-image-funktioner för ordning får inte fungera mellan olika typer"
 
-#: commands/opclasscmds.c:1342
+#: commands/opclasscmds.c:1340
 #, c-format
-msgid "hash function 1 must have one argument"
-msgstr "hash-funktion 1 måste a ett argument"
+msgid "btree skip support functions must accept type \"internal\""
+msgstr "supportfunktioner för btree-skip måste hantera typen \"internal\""
 
-#: commands/opclasscmds.c:1346
+#: commands/opclasscmds.c:1344
 #, c-format
-msgid "hash function 1 must return integer"
+msgid "btree skip support functions must return void"
+msgstr "supportfunktioner för btree-skip måste returnera void"
+
+#: commands/opclasscmds.c:1357
+#, c-format
+msgid "btree skip support functions must not be cross-type"
+msgstr "supportfunktioner för btree-skip får inte fungera mellan olika typer"
+
+#: commands/opclasscmds.c:1367
+#, c-format
+msgid "hash function 1 must have one argument"
+msgstr "hash-funktion 1 måste a ett argument"
+
+#: commands/opclasscmds.c:1371
+#, c-format
+msgid "hash function 1 must return integer"
 msgstr "hash-funktion 1 måste returnera integer"
 
-#: commands/opclasscmds.c:1353
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "hash-funktion 2 måste ha två argument"
 
-#: commands/opclasscmds.c:1357
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "hash-funktion 2 måste returnera bigint"
 
-#: commands/opclasscmds.c:1382
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "associerade datatyper måste anges för ett index hjälpfunktion"
 
-#: commands/opclasscmds.c:1407
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "funktionsnummer %d för (%s,%s) finns med fler än en gång"
 
-#: commands/opclasscmds.c:1414
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "operator nummer %d för (%s,%s) finns med fler än en gång"
 
-#: commands/opclasscmds.c:1460
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "operator %d(%s,%s) finns redan i operatorfamilj \"%s\""
 
-#: commands/opclasscmds.c:1589
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "funktionen %d(%s,%s) finns redan i operatorfamilj \"%s\""
 
-#: commands/opclasscmds.c:1744
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "operator %d(%s,%s) finns inte i operatorfamilj \"%s\""
 
-#: commands/opclasscmds.c:1784
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "funktionen %d(%s,%s) finns inte i operatorfamilj \"%s\""
 
-#: commands/opclasscmds.c:1815
+#: commands/opclasscmds.c:1840
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "operatorklass \"%s\" för accessmetod \"%s\" finns redan i schema \"%s\""
 
-#: commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1863
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "operatorfamilj \"%s\" för accessmetod \"%s\" finns redan i schema \"%s\""
@@ -9652,12 +9870,12 @@ msgstr "operatorattribut \"%s\" kan inte ändras"
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "operatorattribut \"%s\" kan inte ändras när det redan har satts"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1740 commands/tablecmds.c:2340
-#: commands/tablecmds.c:3702 commands/tablecmds.c:6605
-#: commands/tablecmds.c:9637 commands/tablecmds.c:17772
-#: commands/tablecmds.c:17807 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152
+#: commands/tablecmds.c:1800 commands/tablecmds.c:2400
+#: commands/tablecmds.c:3824 commands/tablecmds.c:6793
+#: commands/tablecmds.c:10114 commands/tablecmds.c:19565
+#: commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -9698,53 +9916,53 @@ msgstr "policy \"%s\" för tabell \"%s\" finns inte"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "bara USING-uttryck tillåts för SELECT, DELETE"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "ogiltigt markörnamn: får inte vara tomt"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "kan inte skapa en WITH HOLD-markör i en säkerhetsbegränsad operation"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2938 utils/adt/xml.c:3108
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "markör \"%s\" existerar inte"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "ogiltigt sats-namn: får inte vara tomt"
 
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "preparerad sats är inte en SELECT"
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "fel antal parametrar för en förberedd sats \"%s\""
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "Förväntade mig %d parameterar men fick %d."
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "parameter $%d med typ %s kan inte omvandlas till den förväntade typen %s"
 
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "preparerad sats \"%s\" finns redan"
 
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "preparerad sats \"%s\" finns inte"
@@ -9754,203 +9972,214 @@ msgstr "preparerad sats \"%s\" finns inte"
 msgid "must be superuser to create custom procedural language"
 msgstr "måste vara en superuser för att skapa ett eget procedurspråk"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1865
+#: commands/publicationcmds.c:135 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1130 postmaster/postmaster.c:1232
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "ogiltigt listsyntax för parameter \"%s\""
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:154
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "okänt värde för publicerings-flagga \"%s\": \"%s\""
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:175
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "okänd publiceringsparameter: \"%s\""
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:216
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "inget schema har valts som CURRENT_SCHEMA"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:597
 msgid "System columns are not allowed."
 msgstr "Systemkolumner tillåts inte."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:604 commands/publicationcmds.c:609
+#: commands/publicationcmds.c:626
 msgid "User-defined operators are not allowed."
 msgstr "Användardefinierade operatorer tillåts inte."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:650
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "Only kolumner, konstanter, inbyggda operatorer, inbyggda datatyper, inbyggda jämförelser och inbyggda immuterbara funktioner tillåts."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:662
 msgid "User-defined types are not allowed."
 msgstr "Användadefinierade typer tillåts inte."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:665
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "Användardefinierade eller inbyggda muterbara funktioner tillåts inte."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:668
 msgid "User-defined collations are not allowed."
-msgstr "Egendefinierade jämförelser (collation) tillåts inte."
+msgstr "Användardefinierade jämförelser (collation) tillåts inte."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:678
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "ogiltigt WHERE-uttryck för publicering"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:731
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "kan inte använda publicerings WHERE-klausul för relation \"%s\""
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:733
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "WHERE-klausul kan inte användas för en partitionerad tabell när %s är falsk."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:806 commands/publicationcmds.c:820
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "kan inte använda kolumnlista för relationen \"%s.%s\" i publiceringen \"%s\""
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:809
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "Kolumnlistor kan inte anges i publiceringar som innehåller FOR TABLES IN SCHEMA."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:823
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "Kolumnlista kan inte anges för partitionerade tabeller när %s är falsk."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:860
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "måste vara en superuser för att skapa en FOR ALL TABLES-publicering"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:935
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "måste vara superuser för att skapa en FOR TABLES IN SCHEMA-publicering"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:971
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "\"wal_level\" är otillräcklig för att publicera logiska ändringar"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:972
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "Sätt \"wal_level\" till \"logical\" innan prenumerationer skapas."
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1072 commands/publicationcmds.c:1080
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "kan inte sätta parameter \"%s\" till falsk för publicering \"%s\""
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1075
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Publiceringen innehåller en WHERE-klausul för partitionerade tabellen \"%s\" som inte tillåts när \"%s\" ör falsk."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1083
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Publiceringen innehåller en kolumnlista för den partitionerade tabellern \"%s\" som inte är tillåtet när \"%s\" är falsk."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1404
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "kan inte lägga till schema till publiceringen \"%s\""
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1406
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "Scheman kan inte läggas till om tabeller med kolumnlistor redan är en del av publiceringen."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1454
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "måste vara superuser för att lägga till ett sätta scheman"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1463 commands/publicationcmds.c:1471
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "publicering \"%s\" är definierad som FOR ALL TABLES"
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1465
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "Scheman kan inte läggas till eller tas bort från FOR ALL TABLES-publiceringar."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1473
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "Tabeller kan inte läggas till eller tas bort från FOR ALL TABLES-publiceringar."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1497 commands/publicationcmds.c:1536
+#: commands/publicationcmds.c:2073 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "publiceringen \"%s\" finns inte"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1699 commands/publicationcmds.c:1762
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "motstridiga eller redundanta WHERE-klausuler för tabellen \"%s\""
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1706 commands/publicationcmds.c:1774
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "motstridiga eller redundanta kolumnlistor för tabellen \"%s\""
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1908
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "kolumnlista får inte anges i ALTER PUBLICATION ... DROP"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1920
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "relation \"%s\" är inte en del av publiceringen"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1927
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "kan inte använda en WHERE-sats när man tar bort en tabell från en publicering"
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1987
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "tabeller från schema \"%s\" är inte en del av publiceringen"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2030 commands/publicationcmds.c:2037
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "rättighet saknas för att byta ägare på publicering \"%s\""
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2032
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "Ägaren av en FOR ALL TABLES-publicering måste vara en superuser."
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2039
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "Ägaren av en FOR TABLES IN SCHEMA-publicering måste vara en superuser."
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2105
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "publicering med OID %u existerar inte"
 
+#: commands/publicationcmds.c:2138
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "ogiltigt värde för publiceringsparameter \"%s\": \"%s\""
+
+#: commands/publicationcmds.c:2139
+#, c-format
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "Giltiga värden är \"%s\" och \"%s\"."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -9993,13 +10222,13 @@ msgstr "kan inte sätta säkerhetsetikett på relationen \"%s\""
 
 #: commands/sequence.c:748
 #, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
-msgstr "nextval: har nått det maximala värdet för sekvensen \"%s\" (%lld)"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: har nått det maximala värdet för sekvensen \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:767
 #, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
-msgstr "nextval: har nått det minimala värder för sekvensen \"%s\" (%lld)"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: har nått det minimala värdet för sekvensen \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:886
 #, c-format
@@ -10013,8 +10242,8 @@ msgstr "lastval är inte definierad ännu i denna session"
 
 #: commands/sequence.c:991
 #, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
-msgstr "setval: värdet %lld är utanför giltigt intervall för sekvensen \"%s\" (%lld..%lld)"
+msgid "setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>..%<PRId64>)"
+msgstr "setval: värdet %<PRId64> är utanför giltigt intervall för sekvensen \"%s\" (%<PRId64>..%<PRId64>)"
 
 #: commands/sequence.c:1357
 #, c-format
@@ -10038,43 +10267,43 @@ msgstr "INCREMENT får inte vara noll"
 
 #: commands/sequence.c:1466
 #, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) är utanför giltigt intervall för sekvensdatatyp %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MAXVALUE (%<PRId64>) är utanför giltigt intervall för sekvensdatatyp %s"
 
 #: commands/sequence.c:1498
 #, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MINVALUE (%lld) är utanför giltigt intervall för sekvensdatatyp %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MINVALUE (%<PRId64>) är utanför giltigt intervall för sekvensdatatyp %s"
 
 #: commands/sequence.c:1506
 #, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
-msgstr "MINVALUE (%lld) måste vara mindre än MAXVALUE (%lld)"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
+msgstr "MINVALUE (%<PRId64>) måste vara mindre än MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1527
 #, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "START-värde (%lld) kan inte vara mindre än MINVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "START-värde (%<PRId64>) kan inte vara mindre än MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1533
 #, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "START-värde (%lld) kan inte vara större än MAXVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "START-värde (%<PRId64>) kan inte vara större än MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1557
 #, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "RESTART-värde (%lld) kan inte vara mindre än MINVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "RESTART-värde (%<PRId64>) kan inte vara mindre än MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1563
 #, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "RESTART-värde (%lld) kan inte vara större än MAXVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "RESTART-värde (%<PRId64>) kan inte vara större än MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1574
 #, c-format
-msgid "CACHE (%lld) must be greater than zero"
-msgstr "CACHE (%lld) måste vara större än noll"
+msgid "CACHE (%<PRId64>) must be greater than zero"
+msgstr "CACHE (%<PRId64>) måste vara större än noll"
 
 #: commands/sequence.c:1610
 #, c-format
@@ -10106,13 +10335,13 @@ msgstr "tabellen måste vara i samma schema som tabellen den är länkad till"
 msgid "cannot change ownership of identity sequence"
 msgstr "kan inte byta ägare på identitetssekvens"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:14486
-#: commands/tablecmds.c:17181
+#: commands/sequence.c:1671 commands/tablecmds.c:16136
+#: commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Sekvens \"%s\" är länkad till tabell \"%s\""
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "bara en enda relation tillåts i CREATE STATISTICS"
@@ -10122,1801 +10351,1962 @@ msgstr "bara en enda relation tillåts i CREATE STATISTICS"
 msgid "cannot define statistics for relation \"%s\""
 msgstr "kan inte definiera statistik för relationen \"%s\""
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "statistikobjekt \"%s\" finns redan, hoppar över"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "statistikobjekt \"%s\" finns redan"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "kan inte ha mer än %d kolumner i statistiken"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "skapa statistik för systemkolumner stöds inte"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
+#, c-format
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr "skapa statistik för genererade virtuella kolumner stöds inte"
+
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "kolumnen \"%s\" kan inte användas i statistiken då dess typ %s inte har någon standard btree-operatorklass"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr "uttryck kan inte användas i multivariat statistik då dess type %s inte har någon default btree operatorklass"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "vid skapande av statistik för ett ensamt uttryck så kan inte statistiktyp anges"
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "okänd statistiktyp \"%s\""
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "utökad statistik kräver minst två kolumner"
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "duplicerade kolumnnamn i statistikdefinition"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "duplicerade uttryck i statistikdefinition"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8620
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "statistikmålet %d är för lågt"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8628
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "minskar statistikmålet till %d"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "statistikobjekt \"%s.%s\" finns inte, hoppar över"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "okänd prenumerationsparameter: \"%s\""
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:404
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:415
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "okänt källvärde: \"%s\""
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "ogiltig WAL-position (LSN): %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "okänd prenumerationsparameter: \"%s\""
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "%s och %s är ömsesidigt uteslutna flaggor"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "prenumeration med %s måste också sätta %s"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "kunde inte ta emot lista med publiceringar från publiceraren: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
 msgstr[0] "publiceringen %s finns inte hos publiceraren"
 msgstr[1] "publiceringarna %s finns inte hos publiceraren"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "rättighet saknas för att skapa prenumeration"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får skapa prenumerationer"
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
 #, c-format
-msgid "could not connect to the publisher: %s"
-msgstr "kunde inte ansluta till publicerare: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
+msgstr "prenumeration \"%s\" kunde inte ansluta till publicerare: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "skapade replikerings-slot \"%s\" på publicerare"
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "prenumeration har skapats men är ej ansluten"
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid "To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the subscription."
 msgstr "För att initiera en replikering så måste du manuellt skapa replikeringsslot:en, aktivera prenumerationen samt refresh:a prenumerationen."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, c-format
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "kan inte sätta flaggan %s för påslagen prenumeration"
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr "kan inte sätta flagga \"%s\" för prenumeration som inte har ett slot-namn"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "prenumerationen \"%s\" finns inte"
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "kan inte sätta %s för påslagen prenumeration"
 
-#: commands/subscriptioncmds.c:1233
+#: commands/subscriptioncmds.c:1270
 #, c-format
-msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
-msgstr "kan inte sätta flagga \"%s\" för prenumeration som inte har ett slot-namn"
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "\"slot_name\" och \"two_phase\" kan inte ändras på samma gång"
+
+#: commands/subscriptioncmds.c:1286
+#, c-format
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "kan inte ändra \"two_phase\" när arbetsprocess för logisk replikering kör"
+
+#: commands/subscriptioncmds.c:1287
+#, c-format
+msgid "Try again after some time."
+msgstr "Försök igen efter en stund."
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1300
+#, c-format
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "kan inte stänga av \"two_phase\" när förberedda transationer existerar"
+
+#: commands/subscriptioncmds.c:1301
+#, c-format
+msgid "Resolve these transactions and try again."
+msgstr "Hantera dessa transaktioner och försök igen."
+
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "kan inte aktivera prenumeration som inte har ett slot-namn"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION med refresh stöds inte för avstängda prenumerationer"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr "Använd ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION med refresh och copy_data stöds inte när two_phase är påslaget"
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Använd ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false eller med copy_data = false eller använd DROP/CREATE SUBSCRIPTION."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Använd %s with refresh = false eller med copy_data = false eller använd DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION ... REFRESH tillåts inte för avstängda prenumerationer"
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION ... REFRESH med copy_data stöds inte när two_phase är påslaget"
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Använd ALTER SUBSCRIPTION ... REFRESH med copy_data = false eller använd DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "skip-WAL-position (LSN %X/%X) måste vara större än käll-LSN %X/%X"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "prenumeration \"%s\" finns inte, hoppar över"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "slängde replikerings-slot \"%s\" på publicerare"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "kunde inte slänga replikeringsslotten \"%s\" på publicerare: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "prenumeration med OID %u existerar inte"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "kunde inte ta emot lista med replikerade tabeller från publiceraren: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr "prenumeration \"%s\" begärde copy_data med origin = NONE men kan kopiera data från en annan källa"
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
 msgstr[0] "Prenumerationen som skapas läser från publlicering (%s) som innehåller tabell som skrivs till från andra prenumerationer."
 msgstr[1] "Prenumerationen som skapas läser från publliceringar (%s) som innehåller tabell som skrivs till från andra prenumerationer."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr "Kontrollera att den initiala datan som kopieras från publicerade tabeller inte kom från andra källor."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1143
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1189
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr "kunde inte ha olika kolumnlistor för tabellen \"%s.%s\" i olika publiceringar"
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "kunde inte ansluta till publicerare vid försök att slänga replikeringsslot \"%s\": %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "Använd %s för att stänga av prenumerationen och sedan %s för att dissociera den från slotten."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "publiceringsnamn \"%s\" använt mer än en gång"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "publicering \"%s\" finns redan i prenumerationen \"%s\""
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "publicering \"%s\" finns inte i prenumerationen \"%s\""
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "kan inte slänga alla publiceringar från en prenumeration"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s kräver ett booleskt värde eller \"parallel\""
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "tabell \"%s\" finns inte"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "tabell \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "Använd DROP TABLE för att ta bort en tabell."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "sekvens \"%s\" finns inte"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "sekvens \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Använd DROP SEQUENCE för att ta bort en sekvens."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "vy \"%s\" finns inte"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "vy \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "Använd DROP VIEW för att ta bort en vy."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "materialiserad vy \"%s\" finns inte"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "materialiserad vy \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Använd DROP MATERIALIZED VIEW för att ta bort en materialiserad vy."
 
-#: commands/tablecmds.c:279 commands/tablecmds.c:303 commands/tablecmds.c:19805
-#: parser/parse_utilcmd.c:2251
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651
+#: parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "index \"%s\" finns inte"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "index \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "Använd DROP INDEX för att ta bort ett index."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\" är inte en typ"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "Använd DROP TYPE för att ta bort en typ."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14325
-#: commands/tablecmds.c:16886
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975
+#: commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "främmande tabell \"%s\" finns inte"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "främmande tabell \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Använd DROP FOREIGN TABLE för att ta bort en främmande tabell."
 
-#: commands/tablecmds.c:734
+#: commands/tablecmds.c:802
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT kan bara användas på temporära tabeller"
 
-#: commands/tablecmds.c:765
+#: commands/tablecmds.c:819
+#, c-format
+msgid "partitioned tables cannot be unlogged"
+msgstr "partitionerade tabeller kan inte vara ologgade"
+
+#: commands/tablecmds.c:839
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "kan inte skapa temporär tabell i en säkerhetsbegränsad operation"
 
-#: commands/tablecmds.c:801 commands/tablecmds.c:15745
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "relationen \"%s\" skulle ärvas mer än en gång"
 
-#: commands/tablecmds.c:1067
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "\"%s\" är inte partitionerad"
 
-#: commands/tablecmds.c:1161
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "kan inte partitionera med fler än %d kolumner"
 
-#: commands/tablecmds.c:1217
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "kan inte skapa främmande partition för partitionerad tabell \"%s\""
 
-#: commands/tablecmds.c:1219
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "Tabell \"%s\" innehåller index som är unika."
 
-#: commands/tablecmds.c:1338 commands/tablecmds.c:13341
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "för många array-dimensioner"
 
-#: commands/tablecmds.c:1343 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "kolumn \"%s\" kan inte deklareras som SETOF"
 
-#: commands/tablecmds.c:1489
+#: commands/tablecmds.c:1549
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY stöder inte att slänga flera objekt"
 
-#: commands/tablecmds.c:1493
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY stöder inte CASCADE"
 
-#: commands/tablecmds.c:1597
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "kan inte parallellt ta bort partitionerat index \"%s\""
 
-#: commands/tablecmds.c:1885
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "kan inte trunkera enbart en partitionerad tabell"
 
-#: commands/tablecmds.c:1886
+#: commands/tablecmds.c:1946
 #, c-format
 msgid "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly."
 msgstr "Ange inte nyckelordet ONLY eller använd TRUNCATE ONLY direkt på partitionerna."
 
-#: commands/tablecmds.c:1959
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "truncate svämmar över (cascades) till \"%s\""
 
-#: commands/tablecmds.c:2320
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "kan inte trunkera främmande tabell \"%s\""
 
-#: commands/tablecmds.c:2377
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "kan inte trunkera temporära tabeller tillhörande andra sessioner"
 
-#: commands/tablecmds.c:2606 commands/tablecmds.c:15642
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "kan inte ärva från partitionerad tabell \"%s\""
 
-#: commands/tablecmds.c:2611
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "kan inte ärva från partition \"%s\""
 
-#: commands/tablecmds.c:2619 parser/parse_utilcmd.c:2481
-#: parser/parse_utilcmd.c:2623
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "ärvd relation \"%s\" är inte en tabell eller främmande tabell"
 
-#: commands/tablecmds.c:2631
+#: commands/tablecmds.c:2700
 #, c-format
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "kan inte skapa en temporär relation som partition till en permanent relation \"%s\""
 
-#: commands/tablecmds.c:2640 commands/tablecmds.c:15621
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "kan inte ärva från en temporär relation \"%s\""
 
-#: commands/tablecmds.c:2650 commands/tablecmds.c:15629
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "kan inte ärva från en temporär relation i en annan session"
 
-#: commands/tablecmds.c:2791 commands/tablecmds.c:2845
-#: commands/tablecmds.c:13024 parser/parse_utilcmd.c:1265
-#: parser/parse_utilcmd.c:1308 parser/parse_utilcmd.c:1735
-#: parser/parse_utilcmd.c:1843
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928
+#: commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "kan inte konvertera hela-raden-tabellreferens"
 
-#: commands/tablecmds.c:2792 parser/parse_utilcmd.c:1266
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Genereringsuttryck för kolumn \"%s\" innehåller en hela-raden-referens på tabellen \"%s\"."
 
-#: commands/tablecmds.c:2846 parser/parse_utilcmd.c:1309
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Villkor \"%s\" innehåller en hela-raden-referens på tabellen \"%s\"."
 
-#: commands/tablecmds.c:2956 commands/tablecmds.c:3227
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "kolumnen \"%s\" ärver från genererad kolumn men har \"default\""
 
-#: commands/tablecmds.c:2961 commands/tablecmds.c:3232
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr "kolumnen \"%s\" ärver från genererad kolumn men har \"identity\""
 
-#: commands/tablecmds.c:2969 commands/tablecmds.c:3240
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "barnkolumn \"%s\" använder genereringsuttryck"
 
-#: commands/tablecmds.c:2971 commands/tablecmds.c:3242
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "En barntabellkolumn kan inte vara genererad om inte dess förälderkolumn är det."
 
-#: commands/tablecmds.c:3017
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366
+#: commands/tablecmds.c:17562
+#, c-format
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "kolumnen \"%s\" ärver från genererad kolumn av annan typ"
+
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
+#: commands/tablecmds.c:17563
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "Föräldrakolumn är %s, barnkolumn är %s."
+
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "kolumnen \"%s\" ärver motstridiga genereringsuttryck"
 
-#: commands/tablecmds.c:3019
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "För att lösa konflikten, ange ett explicit genereringsuttryck."
 
-#: commands/tablecmds.c:3023
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "kolumnen \"%s\" ärver motstridiga default-värden"
 
-#: commands/tablecmds.c:3025
+#: commands/tablecmds.c:3129
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "För att lösa konflikten, ange ett explicit default-värde."
 
-#: commands/tablecmds.c:3080
+#: commands/tablecmds.c:3196
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr "check-villkor \"%s\" finns med flera gånger men med olika uttryck"
 
-#: commands/tablecmds.c:3131
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "slår samman kolumn \"%s\" med ärvd definition"
 
-#: commands/tablecmds.c:3135
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "flyttar och slår samman kolumn \"%s\" med ärvd definition"
 
-#: commands/tablecmds.c:3136
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "Användarangiven kolumn flyttad till den ärvda kolumnens position."
 
-#: commands/tablecmds.c:3148
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "kolumnen \"%s\" har en typkonflikt"
 
-#: commands/tablecmds.c:3150 commands/tablecmds.c:3184
-#: commands/tablecmds.c:3200 commands/tablecmds.c:3307
-#: commands/tablecmds.c:3340 commands/tablecmds.c:3356
-#: parser/parse_coerce.c:2192 parser/parse_coerce.c:2212
-#: parser/parse_coerce.c:2232 parser/parse_coerce.c:2253
-#: parser/parse_coerce.c:2308 parser/parse_coerce.c:2342
-#: parser/parse_coerce.c:2418 parser/parse_coerce.c:2449
-#: parser/parse_coerce.c:2488 parser/parse_coerce.c:2555
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302
+#: commands/tablecmds.c:3318 commands/tablecmds.c:3434
+#: commands/tablecmds.c:3462 commands/tablecmds.c:3478
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s kontra %s"
 
-#: commands/tablecmds.c:3162
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "kolumn \"%s\" har en jämförelsekonflikt"
 
-#: commands/tablecmds.c:3164 commands/tablecmds.c:3326
-#: commands/tablecmds.c:7080
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448
+#: commands/tablecmds.c:7277 parser/parse_expr.c:4792
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\" kontra \"%s\""
 
-#: commands/tablecmds.c:3182
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "kolumnen \"%s\" har en lagringsparameterkonflikt"
 
-#: commands/tablecmds.c:3198 commands/tablecmds.c:3354
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "kolumn \"%s\" har en konflikt i komprimeringsmetoden"
 
-#: commands/tablecmds.c:3293
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "slår samman multipla ärvda definitioner av kolumn \"%s\""
 
-#: commands/tablecmds.c:3305
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "ärvd kolumn \"%s\" har en typkonflikt"
 
-#: commands/tablecmds.c:3324
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "ärvd kolumn \"%s\" har en jämförelsekonflikt"
 
-#: commands/tablecmds.c:3338
+#: commands/tablecmds.c:3460
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "ärvd kolumn \"%s\" har en lagringsparameterkonflikt"
 
-#: commands/tablecmds.c:3366
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "ärvd kolumn \"%s\" har en genereringskonflikt"
 
-#: commands/tablecmds.c:3597
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "kan inte flytta temporära tabeller tillhörande andra sessioner"
 
-#: commands/tablecmds.c:3670
+#: commands/tablecmds.c:3792
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "kan inte byta namn på kolumn i typad tabell"
 
-#: commands/tablecmds.c:3689
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "kan inte byta namn på kolumner i relation \"%s\""
 
-#: commands/tablecmds.c:3784
+#: commands/tablecmds.c:3906
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "ärvd kolumn \"%s\" måste döpas om i barntabellerna också"
 
-#: commands/tablecmds.c:3816
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "kan inte ändra döpa om systemkolumn \"%s\""
 
-#: commands/tablecmds.c:3831
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "kan inte döpa om ärvd kolumn \"%s\""
 
-#: commands/tablecmds.c:3983
+#: commands/tablecmds.c:4108
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "ärvt villkor \"%s\" måste döpas om i barntabellerna också"
 
-#: commands/tablecmds.c:3990
+#: commands/tablecmds.c:4115
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "kan inte döpa om ärvt villkor \"%s\""
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4290
+#: commands/tablecmds.c:4415
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "kan inte %s \"%s\" då den används av aktiva frågor i denna session"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4299
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "kan inte %s \"%s\" då den har triggerhändelser som väntar"
 
-#: commands/tablecmds.c:4325
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "kan inte ändra temporära tabeller för andra sessioner"
 
-#: commands/tablecmds.c:4798
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "kan inte ändra partition \"%s\" som har en ofullständing bortkoppling"
 
-#: commands/tablecmds.c:5002 commands/tablecmds.c:5017
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "kan inte ändra persistensinställning två gånger"
 
-#: commands/tablecmds.c:5038
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "kan inte ha flera underkommandon SET ACCESS METHOD"
 
-#: commands/tablecmds.c:5768
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "kan inte skriva om systemkolumn \"%s\""
 
-#: commands/tablecmds.c:5774
+#: commands/tablecmds.c:5900
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "kan inte skriva om tabell \"%s\" som används som katalogtabell"
 
-#: commands/tablecmds.c:5786
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "kan inte skriva om temporära tabeller som tillhör andra sessioner"
 
-#: commands/tablecmds.c:6281
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "kolumn \"%s\" i relation \"%s\" innehåller null-värden"
 
-#: commands/tablecmds.c:6298
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "check-villkor \"%s\" i relation \"%s\" bryts av någon rad"
 
-#: commands/tablecmds.c:6317 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid "updated partition constraint for default partition \"%s\" would be violated by some row"
 msgstr "uppdaterat partitionsintegritetsvillkor för standardpartition \"%s\" skulle brytas mot av någon rad"
 
-#: commands/tablecmds.c:6323
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "partitionsvillkor i relation \"%s\" bryts mot av någon rad"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6588
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "ALTER action %s kan inte utföras på relationen \"%s\""
 
-#: commands/tablecmds.c:6843 commands/tablecmds.c:6850
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "kan inte ändra typen \"%s\" eftersom kolumn \"%s.%s\" använder den"
 
-#: commands/tablecmds.c:6857
+#: commands/tablecmds.c:7045
 #, c-format
 msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "kan inte ändra främmande tabell \"%s\" eftersom kolumn \"%s.%s\" använder dess radtyp"
 
-#: commands/tablecmds.c:6864
+#: commands/tablecmds.c:7052
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "kan inte ändra tabell \"%s\" eftersom kolumn \"%s.%s\" använder dess radtyp"
 
-#: commands/tablecmds.c:6920
+#: commands/tablecmds.c:7108
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "kan inte ändra typ \"%s\" eftersom det är typen för en typad tabell"
 
-#: commands/tablecmds.c:6922
+#: commands/tablecmds.c:7110
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Använd ALTER ... CASCADE för att ändra på de typade tabellerna också."
 
-#: commands/tablecmds.c:6968
+#: commands/tablecmds.c:7156
+#, c-format
+msgid "type %s is the row type of another table"
+msgstr "typ %s  är radtyp för en annan tabell"
+
+#: commands/tablecmds.c:7158
+#, c-format
+msgid "A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr "En typad tabell måste använda en fristående composite-typ som skapats med CREATE TYPE."
+
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "typen %s är inte en composite-typ"
 
-#: commands/tablecmds.c:6995
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "kan inte lägga till kolumn till typad tabell"
 
-#: commands/tablecmds.c:7043
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "kan inte lägga till kolumn till partition"
 
-#: commands/tablecmds.c:7072 commands/tablecmds.c:15860
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "barntabell \"%s\" har annan typ på kolumn \"%s\""
 
-#: commands/tablecmds.c:7078 commands/tablecmds.c:15866
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "barntabell \"%s\" har annan jämförelse (collation) på kolumn \"%s\""
 
-#: commands/tablecmds.c:7096
+#: commands/tablecmds.c:7293
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "slår samman definitionen av kolumn \"%s\" för barn \"%s\""
 
-#: commands/tablecmds.c:7149
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "kan inte rekursivt lägga till identitetskolumn till tabell som har barntabeller"
 
-#: commands/tablecmds.c:7362
+#: commands/tablecmds.c:7593
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "kolumnen måste läggas till i barntabellerna också"
 
-#: commands/tablecmds.c:7440
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "kolumn \"%s\" i relation \"%s\" finns redan, hoppar över"
 
-#: commands/tablecmds.c:7447
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "kolumn \"%s\" i relation \"%s\" finns redan"
 
-#: commands/tablecmds.c:7513 commands/tablecmds.c:12652
-#, c-format
-msgid "cannot remove constraint from only the partitioned table when partitions exist"
-msgstr "kan inte ta bort villkor från bara den partitionerade tabellen när partitioner finns"
-
-#: commands/tablecmds.c:7514 commands/tablecmds.c:7828
-#: commands/tablecmds.c:8006 commands/tablecmds.c:8113
-#: commands/tablecmds.c:8230 commands/tablecmds.c:9049
-#: commands/tablecmds.c:12653
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "Ange inte nyckelordet ONLY."
-
-#: commands/tablecmds.c:7550 commands/tablecmds.c:7754
-#: commands/tablecmds.c:7896 commands/tablecmds.c:8028
-#: commands/tablecmds.c:8157 commands/tablecmds.c:8251
-#: commands/tablecmds.c:8352 commands/tablecmds.c:8509
-#: commands/tablecmds.c:8662 commands/tablecmds.c:8743
-#: commands/tablecmds.c:8877 commands/tablecmds.c:12806
-#: commands/tablecmds.c:14348 commands/tablecmds.c:16975
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936
+#: commands/tablecmds.c:8137 commands/tablecmds.c:8268
+#: commands/tablecmds.c:8422 commands/tablecmds.c:8516
+#: commands/tablecmds.c:8619 commands/tablecmds.c:8815
+#: commands/tablecmds.c:8981 commands/tablecmds.c:9072
+#: commands/tablecmds.c:9206 commands/tablecmds.c:14407
+#: commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "kan inte ändra systemkolumn \"%s\""
 
-#: commands/tablecmds.c:7556 commands/tablecmds.c:7902
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143
+#: commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "kolumn \"%s\" i relation \"%s\" är en identitetskolumn"
 
-#: commands/tablecmds.c:7597
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "kolumn \"%s\" är del av en primärnyckel"
-
-#: commands/tablecmds.c:7602
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "kolumnen \"%s\" finns i ett index som används som replikaidentitet"
-
-#: commands/tablecmds.c:7625
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "kolumn \"%s\" är markerad NOT NULL i föräldratabellen"
 
-#: commands/tablecmds.c:7825 commands/tablecmds.c:9533
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "villkoret måste läggas till i barntabellerna också"
 
-#: commands/tablecmds.c:7826
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246
+#: commands/tablecmds.c:8378 commands/tablecmds.c:8495
+#: commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "Kolumn \"%s\" i relation \"%s\" är inte redan NOT NULL."
+msgid "Do not specify the ONLY keyword."
+msgstr "Ange inte nyckelordet ONLY."
 
-#: commands/tablecmds.c:7911
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "kolumn \"%s\" i relation \"%s\" är en genererad kolumn"
 
-#: commands/tablecmds.c:8005
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr "kan inte lägga till identitet för kolumn i bara den partitionerade tabellen"
 
-#: commands/tablecmds.c:8011
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "kan inte lägga till identitet för kolumn i en partition"
 
-#: commands/tablecmds.c:8039
+#: commands/tablecmds.c:8279
 #, c-format
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "kolumn \"%s\" i relation \"%s\" måste deklareras NOT NULL innan identitet kan läggas till"
 
-#: commands/tablecmds.c:8045
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "kolumn \"%s\" i relation \"%s\" är redan en identitetskolumn"
 
-#: commands/tablecmds.c:8051
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "kolumn \"%s\" i relation \"%s\" har redan ett standardvärde"
 
-#: commands/tablecmds.c:8112
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "kan inte ändra identitetskolumn för bara den partitionerade tabellen"
 
-#: commands/tablecmds.c:8118
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "kan inte ändra identitetskolumn för en partition"
 
-#: commands/tablecmds.c:8163 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "kolumn \"%s\" i relation \"%s\" är inte en identitetkolumn"
 
-#: commands/tablecmds.c:8229
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "kan inte slänga identitetskolumn från bara den partitionerade tabellen"
 
-#: commands/tablecmds.c:8235
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "kan inte slänga identitetskolumn för en partition"
 
-#: commands/tablecmds.c:8264
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "kolumn \"%s\" i relation \"%s\" är inte en identitetkolumn, hoppar över"
 
-#: commands/tablecmds.c:8358
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "kolumn \"%s\" i relation \"%s\" är inte en genererad kolumn"
 
-#: commands/tablecmds.c:8456
+#: commands/tablecmds.c:8637
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
+msgstr "ALTER TABLE / SET EXPRESSION stöds inte för genererade virtuella kolumner i tabeller med check-villkort"
+
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656
+#: commands/tablecmds.c:8828
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr "Kolumn \"%s\" i relation \"%s\" är en genererad virtuell kolumn"
+
+#: commands/tablecmds.c:8655
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
+msgstr "ALTER TABLE / SET EXPRESSION stöds inte på genererade virtuella kolumner i tabeller som är del av en publicering"
+
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION måste appliceras på barntabellerna också"
 
-#: commands/tablecmds.c:8478
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "kan inte slänga genererat uttryck på ärvd kolumn"
 
-#: commands/tablecmds.c:8517
+#: commands/tablecmds.c:8827
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
-msgstr "kolumn \"%s\" i relation \"%s\" är inte en lagrad genererad kolumn"
+msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
+msgstr "ALTER TABLE / DROP EXPRESSION stöds inte för genererade virtuella kolumner"
 
-#: commands/tablecmds.c:8522
+#: commands/tablecmds.c:8841
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
-msgstr "kolumn \"%s\" i relation \"%s\" är inte en lagrad genererad kolumn, hoppar över"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
+msgstr "kolumn \"%s\" i relation \"%s\" är inte en genererad kolumn, hoppar över"
 
-#: commands/tablecmds.c:8600
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "kan inte referera per nummer till en icke-index-kolumn "
 
-#: commands/tablecmds.c:8652
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "kolumnnummer %d i relation \"%s\" finns inte"
 
-#: commands/tablecmds.c:8671
+#: commands/tablecmds.c:8991
+#, c-format
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "kan inte ändra statistik på genererad virtuell kolumn \"%s\""
+
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "kan inte ändra statistik på inkluderad kolumn \"%s\" i index \"%s\""
 
-#: commands/tablecmds.c:8676
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr "kan inte ändra statistik på icke-villkorskolumn \"%s\" i index \"%s\""
 
-#: commands/tablecmds.c:8678
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "Ändra statistik på tabellkolumn istället."
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "kan inte ta bort kolumn från typad tabell"
 
-#: commands/tablecmds.c:8987
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "kolumn \"%s\" i relation \"%s\" finns inte, hoppar över"
 
-#: commands/tablecmds.c:9000
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "kan inte ta bort systemkolumn \"%s\""
 
-#: commands/tablecmds.c:9010
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "kan inte ta bort ärvd kolumn \"%s\""
 
-#: commands/tablecmds.c:9023
+#: commands/tablecmds.c:9353
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "kan inte slänga kolumnen \"%s\" då den är del av partitionsnyckeln för relationen \"%s\""
 
-#: commands/tablecmds.c:9048
+#: commands/tablecmds.c:9378
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr "kan inte slänga kolumn från bara den partitionerade tabellen när partitioner finns"
 
-#: commands/tablecmds.c:9253
+#: commands/tablecmds.c:9543
+#, c-format
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "kolumn \"%s\" i tabell \"%s\" är inte markerad NOT NULL"
+
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
+#, c-format
+msgid "cannot create primary key on column \"%s\""
+msgstr "kan inte skapa primärnyckel på kolumn \"%s\""
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
+#, c-format
+msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
+msgstr "Villkoret \"%s\" på kolumn \"%s\" i tabell \"%s\", markerad %s, är inkompatibel med en primärnyckel."
+
+#: commands/tablecmds.c:9717
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX stöds inte på partionerade tabeller"
 
-#: commands/tablecmds.c:9278
+#: commands/tablecmds.c:9742
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX kommer byta namn på index \"%s\" till \"%s\""
 
-#: commands/tablecmds.c:9615
+#: commands/tablecmds.c:10100
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr "kan inte använda ONLY på främmande nyckel för partitionerad tabell \"%s\" som refererar till relationen \"%s\""
 
-#: commands/tablecmds.c:9621
-#, c-format
-msgid "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing relation \"%s\""
-msgstr "kan inte lägga till NOT VALID främmande nyckel till partitionerad tabell \"%s\" som refererar till relationen \"%s\""
-
-#: commands/tablecmds.c:9624
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr "Denna finess stöds inte än på partitionerade tabeller."
-
-#: commands/tablecmds.c:9631 commands/tablecmds.c:10092
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "refererad relation \"%s\" är inte en tabell"
 
-#: commands/tablecmds.c:9654
+#: commands/tablecmds.c:10131
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "villkor på permanenta tabeller får bara referera till permanenta tabeller"
 
-#: commands/tablecmds.c:9661
+#: commands/tablecmds.c:10138
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "villkor på ologgade tabeller får bara referera till permanenta eller ologgade tabeller"
 
-#: commands/tablecmds.c:9667
+#: commands/tablecmds.c:10144
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "villkor på temporära tabeller får bara referera till temporära tabeller"
 
-#: commands/tablecmds.c:9671
+#: commands/tablecmds.c:10148
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "villkor på temporära tabeller får bara ta med temporära tabeller från denna session"
 
-#: commands/tablecmds.c:9735 commands/tablecmds.c:9741
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
+#, c-format
+msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr "främmande nyckek använder PERIOD på den refererade tabellen men inte på den refererande tabellen"
+
+#: commands/tablecmds.c:10203
+#, c-format
+msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr "främmande nyckel använder PERIOD på den refererande tabellen men inte på den refererade tabellen"
+
+#: commands/tablecmds.c:10217
+#, c-format
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
+msgstr "främmande nyckel måste använda PERIOD när den refererar en primärnyckel som använder WITHOUT OVERLAPS"
+
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "ogiltig %s-aktion för främmande nyckelvillkor som innehåller genererad kolumn"
 
-#: commands/tablecmds.c:9757
+#: commands/tablecmds.c:10262
+#, c-format
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr "främmande nyckel-villkor på genererade virtuella kolumner stöds inte"
+
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
+#, c-format
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr "inget stöd för %s-aktion för främmande nyckelvillkor som använder PERIOD"
+
+#: commands/tablecmds.c:10300
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "antalet refererande och refererade kolumner för främmande nyckel stämmer ej överens"
 
-#: commands/tablecmds.c:9864
+#: commands/tablecmds.c:10356
+#, c-format
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "kunde inte hitta en överlappningsoperator för främmande nyckel"
+
+#: commands/tablecmds.c:10357
+#, c-format
+msgid "could not identify an equality operator for foreign key"
+msgstr "kunde inte hitta en likhetsoperator för främmande nyckel"
+
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "främmande nyckelvillkor \"%s\" kan inte implementeras"
 
-#: commands/tablecmds.c:9866
+#: commands/tablecmds.c:10424
+#, c-format
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
+msgstr "Nyckelkolumner \"%s\" i den refererande tabellen och \"%s\" i den refererade tabellen har inkompatibla typer: %s och %s."
+
+#: commands/tablecmds.c:10457
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "Nyckelkolumner \"%s\" och \"%s\" har inkompatibla typer %s och %s."
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
+msgstr "Nyckelkolumner \"%s\" i den refererande tabellen och \"%s\" i den refererade tabellen har inkompatibla jämförelser (collation): \"%s\" samt \"%s\".  Om någon av jämförelsena är ickedeterministisk så måste båda jämförelsena vara samma."
 
-#: commands/tablecmds.c:10035
+#: commands/tablecmds.c:10663
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr "kolumn \"%s\" refererad i ON DELETE SET-aktion måste vara en del av en främmande nyckel"
 
-#: commands/tablecmds.c:10392 commands/tablecmds.c:10832
-#: parser/parse_utilcmd.c:822 parser/parse_utilcmd.c:945
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "främmande nyckel-villkor stöds inte för främmande tabeller"
 
-#: commands/tablecmds.c:10815
+#: commands/tablecmds.c:11463
 #, c-format
 msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
 msgstr "kan inte ansluta tabell \"%s\" som en partition då den refereras av främmande nyckel \"%s\""
 
-#: commands/tablecmds.c:11416 commands/tablecmds.c:11697
-#: commands/tablecmds.c:12609 commands/tablecmds.c:12683
+#: commands/tablecmds.c:11744
+#, c-format
+msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
+msgstr "framtvingandestatus för villkor \"%s\" står i konflikt villkoret \"%s\" i relationen \"%s\""
+
+#: commands/tablecmds.c:12206
+#, c-format
+msgid "constraint must be altered in child tables too"
+msgstr "villkoret måste ändras för barntabellerna också"
+
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932
+#: commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "villkor \"%s\" i relation \"%s\" finns inte"
 
-#: commands/tablecmds.c:11423
+#: commands/tablecmds.c:12242
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "villkor \"%s\" i relation \"%s\" är inte ett främmande nyckelvillkor"
 
-#: commands/tablecmds.c:11461
+#: commands/tablecmds.c:12247
+#, c-format
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr "kan inte ändra framtvingande för villkoret \"%s\" i relation \"%s\""
+
+#: commands/tablecmds.c:12253
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "villkor \"%s\" i relation \"%s\" är inte ett icke-null-villkor"
+
+#: commands/tablecmds.c:12261
+#, c-format
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "kan inte ändra ärvt villkor \"%s\" i relation \"%s\""
+
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
 msgstr "kan inte ändra villkoret \"%s\" i relation \"%s\""
 
-#: commands/tablecmds.c:11464
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "Villkoret \"%s\" är härlett från villkoret \"%s\" i relation \"%s\""
 
-#: commands/tablecmds.c:11466
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "Du kan istället ändra på villkoret det är härlett från."
 
-#: commands/tablecmds.c:11705
+#: commands/tablecmds.c:12941
+#, c-format
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "kan inte validera villkoret \"%s\" i relation \"%s\""
+
+#: commands/tablecmds.c:12943
+#, c-format
+msgid "This operation is not supported for this type of constraint."
+msgstr "Denna operation stöds inte för denna sorts villkor."
+
+#: commands/tablecmds.c:12948
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
-msgstr "villkor \"%s\" i relation \"%s\" är inte en främmande nyckel eller ett check-villkor"
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "kan inte validera NOT ENFORCED-villkor"
 
-#: commands/tablecmds.c:11782
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "villkoret måste valideras för barntabellerna också"
 
-#: commands/tablecmds.c:11869
+#: commands/tablecmds.c:13334
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "kolumn \"%s\" som refereras till i främmande nyckelvillkor finns inte"
 
-#: commands/tablecmds.c:11875
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "systemkolumner kan inte användas i främmande nycklar"
 
-#: commands/tablecmds.c:11879
+#: commands/tablecmds.c:13344
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "kan inte ha mer än %d nycklar i en främmande nyckel"
 
-#: commands/tablecmds.c:11944
+#: commands/tablecmds.c:13412
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "kan inte använda en \"deferrable\" primärnyckel för refererad tabell \"%s\""
 
-#: commands/tablecmds.c:11961
+#: commands/tablecmds.c:13429
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "det finns ingen primärnyckel för refererad tabell \"%s\""
 
-#: commands/tablecmds.c:12029
+#: commands/tablecmds.c:13502
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "främmande nyckel-refererade kolumnlistor får inte innehålla duplikat"
 
-#: commands/tablecmds.c:12121
+#: commands/tablecmds.c:13605
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "kan inte använda ett \"deferrable\" unikt integritetsvillkor för refererad tabell \"%s\""
 
-#: commands/tablecmds.c:12126
+#: commands/tablecmds.c:13610
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr "finns inget unique-villkor som matchar de givna nycklarna i den refererade tabellen \"%s\""
 
-#: commands/tablecmds.c:12565
+#: commands/tablecmds.c:14051
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "villkor \"%s\" i relation \"%s\" finns inte, hoppar över"
+
+#: commands/tablecmds.c:14096
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "kan inte ta bort ärvt villkor \"%s\" i relation \"%s\""
 
-#: commands/tablecmds.c:12615
+#: commands/tablecmds.c:14148
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "villkor \"%s\" i relation \"%s\" finns inte, hoppar över"
+msgid "column \"%s\" is in a primary key"
+msgstr "kolumn \"%s\" är del av en primärnyckel"
+
+#: commands/tablecmds.c:14156
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "kolumnen \"%s\" finns i ett index som används som replikaidentitet"
 
-#: commands/tablecmds.c:12790
+#: commands/tablecmds.c:14389
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "kan inte ändra kolumntyp på typad tabell"
 
-#: commands/tablecmds.c:12816
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "kan inte ange USING när man ändrar typ på en genererad kolumn"
 
-#: commands/tablecmds.c:12817 commands/tablecmds.c:18028
-#: commands/tablecmds.c:18118 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:941 rewrite/rewriteHandler.c:976
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "Kolumnen \"%s\" är en genererad kolumn."
-
-#: commands/tablecmds.c:12827
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "kan inte ändra ärvd kolumn \"%s\""
 
-#: commands/tablecmds.c:12836
+#: commands/tablecmds.c:14438
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "kan inte ändra kolumnen \"%s\" då den är del av partitionsnyckeln för relationen \"%s\""
 
-#: commands/tablecmds.c:12886
+#: commands/tablecmds.c:14493
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "resultatet av USING-klausul för kolumn \"%s\" kan inte automatiskt typomvandlas till typen %s"
 
-#: commands/tablecmds.c:12889
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Du kan behöva lägga till en explicit typomvandling."
 
-#: commands/tablecmds.c:12893
+#: commands/tablecmds.c:14500
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "kolumn \"%s\" kan inte automatiskt typomvandlas till typ %s"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:12897
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Du kan behöva ange \"USING %s::%s\"."
 
-#: commands/tablecmds.c:12996
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "kan inte ändra ärvd kolumn \"%s\" i relation \"%s\""
 
-#: commands/tablecmds.c:13025
+#: commands/tablecmds.c:14636
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr "USING-uttryck innehåller en hela-raden-tabellreferens."
 
-#: commands/tablecmds.c:13036
+#: commands/tablecmds.c:14647
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "typen av den ärvda kolumnen \"%s\" måste ändras i barntabellerna också"
 
-#: commands/tablecmds.c:13161
+#: commands/tablecmds.c:14772
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "kan inte ändra typen på kolumn \"%s\" två gånger"
 
-#: commands/tablecmds.c:13199
+#: commands/tablecmds.c:14810
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr "genereringsuttryck för kolumn \"%s\" kan inte automatiskt typomvandlas till typ %s"
 
-#: commands/tablecmds.c:13204
+#: commands/tablecmds.c:14815
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "\"default\" för kolumn \"%s\" kan inte automatiskt typomvandlas till typ \"%s\""
 
-#: commands/tablecmds.c:13508
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "kan inte ändra typ på en kolumn som används av en funktion eller procedur"
 
-#: commands/tablecmds.c:13509 commands/tablecmds.c:13524
-#: commands/tablecmds.c:13544 commands/tablecmds.c:13563
-#: commands/tablecmds.c:13622
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135
+#: commands/tablecmds.c:15155 commands/tablecmds.c:15174
+#: commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s beror på kolumn \"%s\""
 
-#: commands/tablecmds.c:13523
+#: commands/tablecmds.c:15134
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "kan inte ändra typ på en kolumn som används av en vy eller en regel"
 
-#: commands/tablecmds.c:13543
+#: commands/tablecmds.c:15154
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "kan inte ändra typ på en kolumn som används i en triggerdefinition"
 
-#: commands/tablecmds.c:13562
+#: commands/tablecmds.c:15173
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "kan inte ändra typ på en kolumn som används av i en policydefinition"
 
-#: commands/tablecmds.c:13593
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "kan inte ändra typ på en kolumn som används av en genererad kolumn"
 
-#: commands/tablecmds.c:13594
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "Kolumn \"%s\" används av genererad kolumn \"%s\"."
 
-#: commands/tablecmds.c:13621
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "kan inte ändra typ på en kolumn som används av en publicerings WHERE-klausul"
 
-#: commands/tablecmds.c:14456 commands/tablecmds.c:14468
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "kan inte byta ägare på index \"%s\""
 
-#: commands/tablecmds.c:14458 commands/tablecmds.c:14470
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "Byt ägare på indexets tabell istället."
 
-#: commands/tablecmds.c:14484
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "kan inte byta ägare på sekvens \"%s\""
 
-#: commands/tablecmds.c:14509
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "kan inte byta ägare på relationen \"%s\""
 
-#: commands/tablecmds.c:14976
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "kan inte ha flera underkommandon SET TABLESPACE"
 
-#: commands/tablecmds.c:15053
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "kan inte sätta inställningar på relationen \"%s\""
 
-#: commands/tablecmds.c:15087 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION stöds bara på automatiskt uppdateringsbara vyer"
 
-#: commands/tablecmds.c:15338
+#: commands/tablecmds.c:16992
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "bara tabeller, index och materialiserade vyer finns i tablespace:er"
 
-#: commands/tablecmds.c:15350
+#: commands/tablecmds.c:17004
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "kan inte flytta relationer in eller ut från tablespace pg_global"
 
-#: commands/tablecmds.c:15442
+#: commands/tablecmds.c:17096
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "avbryter då lås på relation \"%s.%s\" inte är tillgängligt"
 
-#: commands/tablecmds.c:15458
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "inga matchande relationer i tablespace \"%s\" hittades"
 
-#: commands/tablecmds.c:15580
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "kan inte ändra arv på en typad tabell"
 
-#: commands/tablecmds.c:15585 commands/tablecmds.c:16085
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "kan inte ändra arv på en partition"
 
-#: commands/tablecmds.c:15590
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "kan inte ändra arv på en partitionerad tabell"
 
-#: commands/tablecmds.c:15636
+#: commands/tablecmds.c:17291
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "kan inte ärva av en temporär tabell för en annan session"
 
-#: commands/tablecmds.c:15649
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "kan inte ärva från en partition"
 
-#: commands/tablecmds.c:15671 commands/tablecmds.c:18529
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "cirkulärt arv är inte tillåtet"
 
-#: commands/tablecmds.c:15672 commands/tablecmds.c:18530
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" är redan ett barn till \"%s\""
 
-#: commands/tablecmds.c:15685
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "trigger \"%s\" förhindrar tabell \"%s\" från att bli ett arvsbarn"
 
-#: commands/tablecmds.c:15687
+#: commands/tablecmds.c:17342
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "ROW-triggrar med övergångstabeller stöds inte i arvshierarkier."
 
-#: commands/tablecmds.c:15876
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "kolumn \"%s\" i barntabell måste vara markerad NOT NULL"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr "kolumn \"%s\" i barntabell \"%s\" måste vara markerad NOT NULL"
 
-#: commands/tablecmds.c:15885
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "kolumn \"%s\" i barntabell måste vara en genererad kolumn"
 
-#: commands/tablecmds.c:15889
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "kolumn \"%s\" i barntabell kan inte vara en genererad kolumn"
 
-#: commands/tablecmds.c:15927
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "barntabell saknar kolumn \"%s\""
 
-#: commands/tablecmds.c:16008
+#: commands/tablecmds.c:17720
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "barntabell \"%s\" har annan definition av check-villkor \"%s\""
 
-#: commands/tablecmds.c:16015
+#: commands/tablecmds.c:17729
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "villkor \"%s\" står i konflikt med icke-ärvt villkor på barntabell \"%s\""
 
-#: commands/tablecmds.c:16025
+#: commands/tablecmds.c:17740
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
 msgstr "villkor \"%s\" står i konflikt med NOT VALID-villkor på barntabell \"%s\""
 
-#: commands/tablecmds.c:16063
+#: commands/tablecmds.c:17751
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
+msgstr "villkor \"%s\" står i konflikt med NOT ENFORCED-villkor på barntabell \"%s\""
+
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "barntabell saknar riktighetsvillkor \"%s\""
 
-#: commands/tablecmds.c:16149
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "partition \"%s\" har redan en pågående bortkoppling i partitionerad tabell \"%s.%s\""
 
-#: commands/tablecmds.c:16178 commands/tablecmds.c:16224
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "relationen \"%s\" är inte partition av relationen \"%s\""
 
-#: commands/tablecmds.c:16230
+#: commands/tablecmds.c:17970
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "relationen \"%s\" är inte en förälder till relationen \"%s\""
 
-#: commands/tablecmds.c:16457
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "typade tabeller kan inte ärva"
 
-#: commands/tablecmds.c:16487
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "tabell saknar kolumn \"%s\""
 
-#: commands/tablecmds.c:16498
+#: commands/tablecmds.c:18282
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "tabell har kolumn \"%s\" där typen kräver \"%s\""
 
-#: commands/tablecmds.c:16507
+#: commands/tablecmds.c:18291
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "tabell \"%s\" har annan typ på kolumn \"%s\""
 
-#: commands/tablecmds.c:16521
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "tabell har extra kolumn \"%s\""
 
-#: commands/tablecmds.c:16573
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" är inte en typad tabell"
 
-#: commands/tablecmds.c:16747
+#: commands/tablecmds.c:18537
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "kan inte använda icke-unikt index \"%s\" som replikaidentitet"
 
-#: commands/tablecmds.c:16753
+#: commands/tablecmds.c:18543
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "kan inte använda icke-immediate-index \"%s\" som replikaidentitiet"
 
-#: commands/tablecmds.c:16759
+#: commands/tablecmds.c:18549
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "kan inte använda uttrycksindex \"%s\" som replikaidentitiet"
 
-#: commands/tablecmds.c:16765
+#: commands/tablecmds.c:18555
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "kan inte använda partiellt index \"%s\" som replikaidentitiet"
 
-#: commands/tablecmds.c:16782
+#: commands/tablecmds.c:18572
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
 msgstr "index \"%s\" kan inte användas som replikaidentitet då kolumn %d är en systemkolumn"
 
-#: commands/tablecmds.c:16789
+#: commands/tablecmds.c:18579
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "index \"%s\" kan inte användas som replikaidentitet då kolumn \"%s\" kan vare null"
 
-#: commands/tablecmds.c:17041
+#: commands/tablecmds.c:18828
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "kan inte ändra loggningsstatus för tabell \"%s\" då den är temporär"
 
-#: commands/tablecmds.c:17065
+#: commands/tablecmds.c:18852
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "kan inte ändra tabell \"%s\" till ologgad då den är del av en publicering"
 
-#: commands/tablecmds.c:17067
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "Ologgade relatrioner kan inte replikeras."
 
-#: commands/tablecmds.c:17112
+#: commands/tablecmds.c:18899
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr "kunde inte ändra tabell \"%s\" till loggad då den refererar till ologgad tabell \"%s\""
 
-#: commands/tablecmds.c:17122
+#: commands/tablecmds.c:18909
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr "kunde inte ändra tabell \"%s\" till ologgad då den refererar till loggad tabell \"%s\""
 
-#: commands/tablecmds.c:17180
+#: commands/tablecmds.c:18973
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "kan inte flytta en ägd sekvens till ett annan schema."
 
-#: commands/tablecmds.c:17288
+#: commands/tablecmds.c:19081
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "relationen \"%s\" finns redan i schema \"%s\""
 
-#: commands/tablecmds.c:17713
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" är inte en tabell eller materialiserad vy"
 
-#: commands/tablecmds.c:17866
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" är inte en composite-typ"
 
-#: commands/tablecmds.c:17896
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "kan inte byta schema på indexet \"%s\""
 
-#: commands/tablecmds.c:17898 commands/tablecmds.c:17912
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "Byt ägare på tabellen istället."
 
-#: commands/tablecmds.c:17902
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "kan inte byta schema på composite-typen \"%s\"."
 
-#: commands/tablecmds.c:17910
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "kan inte byta schema på TOAST-tabellen \"%s\""
 
-#: commands/tablecmds.c:17942
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "kan inte använda list-partioneringsstrategi med mer än en kolumn"
 
-#: commands/tablecmds.c:18008
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "kolumn \"%s\" angiven i partitioneringsnyckel existerar inte"
 
-#: commands/tablecmds.c:18016
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "kan inte använda systemkolumn \"%s\" i partitioneringsnyckel"
 
-#: commands/tablecmds.c:18027 commands/tablecmds.c:18117
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "kan inte använda genererad kolumn i partitioneringsnyckel"
 
-#: commands/tablecmds.c:18100
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "partitioneringsnyckeluttryck kan inte innehålla systemkolumnreferenser"
 
-#: commands/tablecmds.c:18147
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "funktioner i partitioneringsuttryck måste vara markerade IMMUTABLE"
 
-#: commands/tablecmds.c:18156
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "kan inte använda konstant uttryck som partitioneringsnyckel"
 
-#: commands/tablecmds.c:18177
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "kunde inte lista vilken jämförelse (collation) som skulle användas för partitionsuttryck"
 
-#: commands/tablecmds.c:18212
+#: commands/tablecmds.c:20021
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr "Du måste ange en hash-operatorklass eller definiera en default hash-operatorklass för datatypen."
 
-#: commands/tablecmds.c:18218
+#: commands/tablecmds.c:20027
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr "Du måste ange en btree-operatorklass eller definiera en default btree-operatorklass för datatypen."
 
-#: commands/tablecmds.c:18469
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\" är redan en partition"
 
-#: commands/tablecmds.c:18475
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "kan inte ansluta en typad tabell som partition"
 
-#: commands/tablecmds.c:18491
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "kan inte ansluta ett arvsbarn som partition"
 
-#: commands/tablecmds.c:18505
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "kan inte ansluta en arvsförälder som partition"
 
-#: commands/tablecmds.c:18539
+#: commands/tablecmds.c:20357
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "kan inte ansluta en temporär relation som partition till en permanent relation \"%s\""
 
-#: commands/tablecmds.c:18547
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "kan inte ansluta en permanent relation som partition till en temporär relation \"%s\""
 
-#: commands/tablecmds.c:18555
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "kan inte ansluta en partition från en temporär relation som tillhör en annan session"
 
-#: commands/tablecmds.c:18562
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "kan inte ansluta en temporär relation tillhörande en annan session som partition"
 
-#: commands/tablecmds.c:18582
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "tabell \"%s\" som ansluts innehåller en identitetskolumn \"%s\""
 
-#: commands/tablecmds.c:18584
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "Den nya partitionen får inte innehålla en identitetskolumn."
 
-#: commands/tablecmds.c:18592
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "tabell \"%s\" innehåller kolumn \"%s\" som inte finns i föräldern \"%s\""
 
-#: commands/tablecmds.c:18595
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "Den nya partitionen får bara innehålla kolumner som finns i föräldern."
 
-#: commands/tablecmds.c:18607
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "trigger \"%s\" förhindrar att tabell \"%s\" blir en partition"
 
-#: commands/tablecmds.c:18609
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "ROW-triggrar med övergångstabeller stöds inte för partitioner."
 
-#: commands/tablecmds.c:18785
+#: commands/tablecmds.c:20609
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "kan inte ansluta främmande tabell \"%s\" som en partition till partitionerad tabell \"%s\""
 
-#: commands/tablecmds.c:18788
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "Partitionerad tabell \"%s\" innehåller unika index."
 
-#: commands/tablecmds.c:19110
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "kan inte parallellt koppla bort en partitionerad tabell när en default-partition finns"
 
-#: commands/tablecmds.c:19219
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "partitionerad tabell \"%s\" togs bort parallellt"
 
-#: commands/tablecmds.c:19225
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "partition \"%s\" togs bort parallellt"
 
-#: commands/tablecmds.c:19839 commands/tablecmds.c:19859
-#: commands/tablecmds.c:19880 commands/tablecmds.c:19899
-#: commands/tablecmds.c:19941
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705
+#: commands/tablecmds.c:21726 commands/tablecmds.c:21745
+#: commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "kan inte ansluta index \"%s\" som en partition till index \"%s\""
 
-#: commands/tablecmds.c:19842
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "Index \"%s\" är redan ansluten till ett annat index."
 
-#: commands/tablecmds.c:19862
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "Index \"%s\" är inte ett index för någon partition av tabell \"%s\"."
 
-#: commands/tablecmds.c:19883
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "Indexdefinitionerna matchar inte."
 
-#: commands/tablecmds.c:19902
+#: commands/tablecmds.c:21748
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr "Indexet \"%s\" tillhör ett villkor på tabell \"%s\" men det finns inga villkor för indexet \"%s\"."
 
-#: commands/tablecmds.c:19944
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "Ett annat index är redan anslutet för partition \"%s\"."
 
-#: commands/tablecmds.c:20180
+#: commands/tablecmds.c:21920
+#, c-format
+msgid "invalid primary key definition"
+msgstr "ogiltig definition av primärnyckel"
+
+#: commands/tablecmds.c:21921
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "Kolumn \"%s\" i relation \"%s\" är inte markerad NOT NULL."
+
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "kolumndatatypen %s stöder inte komprimering"
 
-#: commands/tablecmds.c:20187
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "ogiltig komprimeringsmetod \"%s\""
 
-#: commands/tablecmds.c:20213
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "ogiltig lagringstyp \"%s\""
 
-#: commands/tablecmds.c:20223
+#: commands/tablecmds.c:22099
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "kolumndatatyp %s kan bara ha lagringsmetod PLAIN"
@@ -12043,281 +12433,286 @@ msgstr "kataloger för %u kan inte tas bort"
 msgid "You can remove the directories manually if necessary."
 msgstr "Du kan ta bort dessa kataloger på egen hand om nödvändigt."
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\" är en tabell"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "Tabeller kan inte ha INSTEAD OF-triggrar."
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\" är en partitionerad tabell"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "ROW-triggrar med övergångstabeller stöds inte för partitionerade tabeller."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\" är en vy"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "Vyer kan inte ha BEFORE- eller AFTER-triggrar på radnivå."
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "Vyer kan inte ha TRUNCATE-triggrar."
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\" är en främmande tabell"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "Främmande tabeller kan inte ha INSTEAD OF-triggrar."
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "Främmande tabeller kan inte ha villkorstriggrar."
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "relationen \"%s\" kan inte ha triggrar"
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW-triggrar stöds inte"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF-trigger måste vara FOR EACH ROW"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF-trigger kan inte ha WHEN-villkor"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF-trigger kan inte ha en kolumnlista"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "ROW-variabel namngiven i REFERENCING-klausul stöds inte"
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "Använd OLD TABLE eller NEW TABLE för att namnge övergångstabeller."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "Triggrar på främmande tabeller kan inte ha övergångstabeller."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "Triggrar på vyer kan inte ha övergångstabeller."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "ROW-triggrar med övergångstabeller stöds inte för partitioner"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "ROW-triggrar med övergångstabeller stöds inte på arvsbarn"
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "övergångstabellnamn kan bara anges för en AFTER-trigger"
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "TRUNCATE-triggrar med övergångstabeller stöds inte"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "övergångstabeller kan inte anges för triggrar med mer än ett event"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "övergångstabeller kan inte anges för triggrar med kolumnlistor"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE kan bara anges för en INSERT- eller UPDATE-trigger"
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE kan inte anges flera gånger"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE kan bara anges för en DELETE- eller UPDATE-trigger"
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE får inte anges flera gånger"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "OLD TABLE-namn och NEW TABLE-namn får inte vara samma"
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "satstriggrars WHEN-villkor kan inte referera till kolumnvärden"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "INSERT-triggrars WHEN-villkor kan inte referera till OLD-värden"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "DELETE-triggrars WHEN-villkor kan inte referera till NEW-värden"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "BEFORE-triggrars WHEN-villkor kan inte referera till NEW-systemkolumner"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "BEFORE-triggrars WHEN-villkor kan inte referera till genererade NEW-kolumner"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr "En hela-raden-referens används och tabellen innehåller genererade kolumner."
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "trigger \"%s\" för relation \"%s\" existerar redan"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "trigger \"%s\" för relation \"%s\" är en intern eller barntrigger"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "trigger \"%s\" för relation \"%s\" är en villkorstrigger"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "trigger \"%s\" för tabell \"%s\" finns inte"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "kan inte byta namn på triggern \"%s\" på tabell \"%s\""
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "Byt istället namn på triggern i den partitionerade tabellen \"%s\"."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "bytte namn på triggern \"%s\" i relationen \"%s\""
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "rättighet saknas: \"%s\" är en systemtrigger"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "triggerfunktionen %u returnerade null-värde"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "BEFORE STATEMENT-trigger kan inte returnera ett värde"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "flytta en rad från en annan partition under en BEFORE FOR EACH ROW-trigger stöds inte"
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "Innan exekvering av triggern \"%s\" så var raden i partition \"%s.%s\"."
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1541
-#: executor/nodeModifyTable.c:1615 executor/nodeModifyTable.c:2377
-#: executor/nodeModifyTable.c:2468 executor/nodeModifyTable.c:3132
-#: executor/nodeModifyTable.c:3302
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
+#, c-format
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "kan inte samla in övergångstupler från främmande barntabeller"
+
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3322
+#: executor/nodeModifyTable.c:3514
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Överväg att använda en AFTER-trigger istället för en BEFORE-trigger för att propagera ändringar till andra rader."
 
-#: commands/trigger.c:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:314
-#: executor/nodeModifyTable.c:1557 executor/nodeModifyTable.c:2394
-#: executor/nodeModifyTable.c:2618
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "kunde inte serialisera åtkomst på grund av samtidig uppdatering"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1647
-#: executor/nodeModifyTable.c:2485 executor/nodeModifyTable.c:2642
-#: executor/nodeModifyTable.c:3150
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2826
+#: executor/nodeModifyTable.c:3340
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "kunde inte serialisera åtkomst på grund av samtidig borttagning"
 
-#: commands/trigger.c:4599
+#: commands/trigger.c:4671
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "kan inte trigga uppskjuten trigger i en säkerhetsbegränsad operation"
 
-#: commands/trigger.c:5780
+#: commands/trigger.c:5889
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "integritetsvillkor \"%s\" är inte \"deferrable\""
 
-#: commands/trigger.c:5803
+#: commands/trigger.c:5912
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "integritetsvillkor \"%s\" existerar inte"
@@ -12427,7 +12822,7 @@ msgstr "måste vara en superuser för att skapa en bastyp"
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr "Skapa typen som en shell-typ, skapa sedan dess I/O-funktioner och gör sedan en fullständig CREATE TYPE."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "typattribut \"%s\" känns inte igen"
@@ -12447,7 +12842,7 @@ msgstr "elementtypen i array:en får inte vara %s"
 msgid "alignment \"%s\" not recognized"
 msgstr "känner inte igen justering (alignment) \"%s\""
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "lagring \"%s\" känns inte igen"
@@ -12477,288 +12872,308 @@ msgstr "elementtyp kan inte anges utan en subscript-funktion"
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "\"%s\" är inte en giltigt bastyp för en domän"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "multipla default-uttryck"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "motstridiga NULL/NOT NULL-villkor"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "redundant definition av NOT NULL-villkor"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "icke-null-villkor för domäner kan inte markeras NO INHERIT"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "check-villkor för domäner kan inte markeras NO INHERIT"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "unik-villkor går inte att ha på domäner"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "primärnyckelvillkor går inte att ha på domäner"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "uteslutningsvillkor går inte att ha på domäner"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "främmande nyckel-villkor går inte att ha på domäner"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "att ange deferrable för integritetsvillkor stöds inte för domäner"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
+#, c-format
+msgid "specifying GENERATED not supported for domains"
+msgstr "ange GENERATED stöds inte för domäner"
+
+#: commands/typecmds.c:1043
+#, c-format
+msgid "specifying constraint enforceability not supported for domains"
+msgstr "ange framtvingande av villkor stöds inte för domäner"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s är inte en enum"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "typattribut \"subtype\" krävs"
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "intervall-subtyp kan inte vara %s"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr "intervalljämförelse angiven men subtypen stöder inte jämförelse (collation)"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "kan inte ange en kanonisk funktion utan en förskapad shell-typ"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr "Skapa typen som en shell-typ, skapa sedan dess kanoniseringsfunktion och gör sedan en fullständig CREATE TYPE."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "typens indata-funktion %s har multipla träffar"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "typens indata-funktion %s måste returnera typen %s"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "typens indatafunktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "typenns utdatafunktion %s måste returnera typen %s"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "typens utdatafunktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "typens receive-funktion %s har multipla träffar"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "typens receive-funktion %s måste returnera typen %s"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "typens receive-funktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "typens send-funktion %s måste returnera typen %s"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "typens send-funktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "typmod_in-funktion %s måste retunera typ %s"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "typmodifierar-indatafunktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "typmod_out-funktion %s måste returnera typ %s"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "typmodifierar-utdatafunktion %s skall inte vara volatile"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "en typs analyze-funktion %s måste returnera typ %s"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "typens subscript-funktion %s måste returnera typen %s"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "användardefinierade typer kan inte använda subscript-funktion %s"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr "Du måste ange en operatorklass för intervalltypen eller definiera en standardoperatorklass för subtypen."
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "intervallets kanoniska funktion %s måste returnera en intervalltyp"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "intervallets kanoniska funktion %s måste vara immutable"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "diffunktion %s för range-subtyp måste returnera typ %s"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "diffunktion %s för range-subtyp måste vara immutable"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "pg_type array-OID-värde ej satt i binärt uppgraderingsläge"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "pg_type multirange-OID-värde ej satt i binärt uppgraderingsläge"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "pg_type array-multirange-OID-värde ej satt i binärt uppgraderingsläge"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "integritetsvillkor \"%s\" för domän \"%s\" existerar inte"
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "integritetsvillkor \"%s\" för domän \"%s\" existerar inte, hoppar över"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "integritetsvillkor \"%s\" för domän \"%s\" är inte ett check-villkor"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "kolumn \"%s\" i tabell \"%s\" innehåller null-värden"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "kolumnen \"%s\" i tabell \"%s\" innehåller värden som bryter mot det nya villkortet"
 
-#: commands/typecmds.c:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s är inte en domän"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "integritetsvillkor \"%s\" för domän \"%s\" existerar redan"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "kan inte använda tabellreferenser i domänens check-villkor"
 
-#: commands/typecmds.c:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s är en tabells radtyp"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "kan inte ändra arraytyp %s"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Du kan ändra typen %s vilket också kommer ändra array-typen."
 
-#: commands/typecmds.c:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "kan inte ändra multirange-typ %s"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "Du kan ändra typen %s vilket också kommer ändra multirange-typen."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "typen \"%s\" finns redan i schema \"%s\""
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "kan inte ändra typens lagring till PLAIN"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "typattribut \"%s\" kan inte ändras"
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "måste vara en superuser för att ändra en typ"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "%s är inte en bastyp"
@@ -12785,8 +13200,8 @@ msgstr "Bara roller med attributet %s får skapa roller."
 msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "Bara roller med attributet %s får skapa roller med attributet %s."
 
-#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17310
-#: gram.y:17356 utils/adt/acl.c:5574 utils/adt/acl.c:5580
+#: commands/user.c:354 commands/user.c:1386 commands/user.c:1393 gram.y:17473
+#: gram.y:17519 utils/adt/acl.c:5707 utils/adt/acl.c:5713
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "rollnamnet \"%s\" är reserverat"
@@ -12879,11 +13294,11 @@ msgstr "Bara roller med attributet %s och flaggan %s på målrollen får slänga
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "kan inte används speciell rollangivelse i DROP ROLE"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:851
-#: commands/variable.c:854 commands/variable.c:971 commands/variable.c:974
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:799
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "rollen \"%s\" finns inte"
@@ -12948,7 +13363,7 @@ msgstr "Bara roller med attributet %s och med flaggan %s på rollen \"%s\" får
 msgid "MD5 password cleared because of role rename"
 msgstr "MD5-lösenord nollställt på grund av omdöpning av roll"
 
-#: commands/user.c:1518 gram.y:1294
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "okänd rollflagga \"%s\""
@@ -12988,207 +13403,202 @@ msgstr "Bara roller med rättigheter från rollen \"%s\" får byta ägare på ob
 msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får byta ägare på objekt till den."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "roll \"%s\" kan inte vara medlem i någon roll"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "roll \"%s\" är en medlem i rollen \"%s\""
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "flaggan %s kan inte ges tillbaka till den som givit det till dig"
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "rollen \"%s\" har redan fått medlemskap i rollen \"%s\" av rollen \"%s\""
 
-#: commands/user.c:2024
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "rollen \"%s\" har inte fått medlemskap i rollen \"%s\" av rollen \"%s\""
 
-#: commands/user.c:2124
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "rollen \"%s\" kan inte ha explicita medlemmar"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "rättighet saknas för att dela ut rollen \"%s\""
 
-#: commands/user.c:2137
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "Bara roller med attributet %s får dela ut rättigheter med roller som har attributet %s."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "rättighet saknas för att ta tillbaka rollen \"%s\""
 
-#: commands/user.c:2144
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "Bara roller med attributet %s får ta tillbaka rättigheter med roller som har attributet %s."
 
-#: commands/user.c:2160
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "Bara roller med flaggan %s på rollen \"%s\" för dela ut denna roll."
 
-#: commands/user.c:2167
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "Bara roller med flaggan %s på rollen \"%s\" kan dra tillbaka denna roll."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "rättighet saknas att dela ut rättigheter som rollen \"%s\""
 
-#: commands/user.c:2249
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får dela ut rättigheter för den rollen."
 
-#: commands/user.c:2258
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "Utfärdaren måste ha flaggan %s på roll \"%s\""
 
-#: commands/user.c:2266
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "rättighet saknas att ta bort rättighet som utfärdats av roll \"%s\""
 
-#: commands/user.c:2268
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får ta bort rättigheter som delats ut av den rollen."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "det finns beroende privilegier"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "Använd CASCADE för att återkalla dem med."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:148
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
-msgstr "\"vacuum_buffer_usage_limit\" måste vara 0 eller mellan %d kB och %d kB"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
+msgstr "\"%s\" måste vara 0 eller mellan %d kB och %d kB"
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "flaggan BUFFER_USAGE_LIMIT måste vara 0 eller mellan %d kB och %d kB"
 
-#: commands/vacuum.c:219
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "okänd ANALYZE-flagga \"%s\""
-
-#: commands/vacuum.c:259
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "parallell-flaggan kräver ett värde mellan 0 och %d"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "parallella arbetare för vacuum måste vara mellan 0 och %d"
 
-#: commands/vacuum.c:292
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "okänd VACUUM-flagga \"%s\""
-
-#: commands/vacuum.c:318
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "'VACUUM FULL kan inte köras parallellt"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "BUFFER_USAGE_LIMIT kan inte anges för VACUUM FULL"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "ANALYZE-flaggan måste anges när en kolumnlista används"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "VACUUM-flagga DISABLE_PAGE_SKIPPING kan inte anges med FULL"
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "PROCESS_TOAST krävs med VACUUM FULL"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS kan inte anges med en lista av tabeller"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATS kan inte anges tillsammans med andra VACUUM-flaggor"
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s kan inte köras från VACUUM eller ANALYZE"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "rättighet saknas för att städa \"%s\", hoppar över det"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "rättighet saknas för att analysera \"%s\", hoppar över det"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "hoppar över vacuum av \"%s\" --- lås ej tillgängligt"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "hoppar över vacuum av \"%s\" --- relationen finns inte längre"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "hoppar över analys av \"%s\" --- lås ej tillgängligt"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "hoppar över analys av \"%s\" --- relationen finns inte längre"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:992
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "VACUUM ONLY för partitionerad tabell \"%s\" har ingen effekt"
+
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "gräns för borttagning och frysande av tupler är i dåtid"
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid ""
 "Close open transactions soon to avoid wraparound problems.\n"
@@ -13197,37 +13607,37 @@ msgstr ""
 "Stäng öppna transaktioner för att undvika problem med wraparound.\n"
 "Du kan också behöva commit:a eller rulla tillbaka gamla förberedda transaktiooner alternativt slänga stillastående replikeringsslottar."
 
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "gräns för frysning av multixact är från dåtid"
 
-#: commands/vacuum.c:1900
+#: commands/vacuum.c:1950
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "några databaser har inte städats (vacuum) på över 2 miljarder transaktioner"
 
-#: commands/vacuum.c:1901
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Du kan redan ha fått dataförlust på grund av transaktions-wraparound."
 
-#: commands/vacuum.c:2080
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "hoppar över \"%s\" --- kan inte köra vacuum på icke-tabeller eller speciella systemtabeller"
 
-#: commands/vacuum.c:2512
+#: commands/vacuum.c:2659
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr "genomsökte index \"%s\" för att ta bort %lld radversioner"
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "genomsökte index \"%s\" för att ta bort %<PRId64> radversioner"
 
-#: commands/vacuum.c:2531
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "index \"%s\" innehåller nu %.0f radversioner i %u sidor"
 
-#: commands/vacuum.c:2535
+#: commands/vacuum.c:2682
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -13238,14 +13648,14 @@ msgstr ""
 "%u indexsidor har nyligen raderats.\n"
 "%u är nu borttagna varav %u är återanvändningsbara."
 
-#: commands/vacuumparallel.c:707
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index vacuuming (planned: %d)"
 msgstr[0] "startade %d parallell städarbetare för index-vacuum (planerat: %d)"
 msgstr[1] "startade %d parallella städarbetare för index-vacuum (planerat: %d)"
 
-#: commands/vacuumparallel.c:713
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index cleanup (planned: %d)"
@@ -13254,8 +13664,8 @@ msgstr[1] "startade %d parallella städarbetare för indexupprensning (planerat:
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "Motstridiga \"datestyle\"-angivelser."
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "Motstridiga \"DateStyle\"-angivelser."
 
 #: commands/variable.c:307
 #, c-format
@@ -13267,12 +13677,12 @@ msgstr "Får inte ange månader i tidszonsintervall"
 msgid "Cannot specify days in time zone interval."
 msgstr "Får inte ange dagar i tidszonsintervall"
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "tidszonen \"%s\" verkar använda skottsekunder"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL stöder inte skottsekunder."
@@ -13282,107 +13692,97 @@ msgstr "PostgreSQL stöder inte skottsekunder."
 msgid "UTC timezone offset is out of range."
 msgstr "UTC-tidszon utanför giltigt intervall."
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "kan inte sätta transaktionens läge till läs-skriv i en read-only-transaktion"
 
-#: commands/variable.c:559
+#: commands/variable.c:561
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr "transaktions läs-skriv-läge måste sättas innan någon fråga körs"
 
-#: commands/variable.c:566
+#: commands/variable.c:568
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr "kan inte sätta transaktionens läs-skriv-läge vid återställning"
 
-#: commands/variable.c:592
+#: commands/variable.c:596
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "SET TRANSACTION ISOLATION LEVEL måste anropas innan någon fråga"
 
-#: commands/variable.c:599
+#: commands/variable.c:603
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr "SET TRANSACTION ISOLATION LEVEL får inte anropas i en undertransaktion"
 
-#: commands/variable.c:606 storage/lmgr/predicate.c:1685
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "kan inte använda serializable-läge i hot standby"
 
-#: commands/variable.c:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Du kan använda REPEATABLE READ istället."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE får inte anropas i en undertransaktion"
 
-#: commands/variable.c:631
+#: commands/variable.c:639
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE måste anropas innan någon fråga"
 
-#: commands/variable.c:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr "Kan inte ändra \"client_encoding\" under en parallell operation"
+
+#: commands/variable.c:743
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "Konvertering mellan %s och %s stöds inte."
 
-#: commands/variable.c:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "Kan inte ändra \"client_encoding\" nu."
 
-#: commands/variable.c:781
-#, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr "kan inte ändra \"client_encoding\" under en parallell operation"
-
-#: commands/variable.c:876
+#: commands/variable.c:889
 #, c-format
 msgid "permission will be denied to set session authorization \"%s\""
 msgstr "rättighet saknas för att sätta sessionsauktorisation \"%s\""
 
-#: commands/variable.c:881
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "rättighet saknas för att sätta sessionsauktorisation \"%s\""
 
-#: commands/variable.c:991
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
 msgstr "rättighet kommer nekas för att sätta roll \"%s\""
 
-#: commands/variable.c:996
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "nekad tillåtelse att sätta roll \"%s\""
 
-#: commands/variable.c:1200
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour stöds inte av detta bygge"
 
-#: commands/variable.c:1228
-#, c-format
-msgid "\"effective_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "\"effective_io_concurrency\" måste sättas till 0 på plattformar som saknar posix_fadvise()."
-
-#: commands/variable.c:1241
-#, c-format
-msgid "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr "\"maintenance_io_concurrency\" måste sättas till 0 på plattformar som saknar posix_fadvise()."
-
 #: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL stöds inte av detta bygge"
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr "kunde inte bestämma vilken jämförelse att använda för vykolumn \"%s\""
@@ -13468,57 +13868,57 @@ msgstr "markör \"%s\" är inte positionerad på en rad"
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "markör \"%s\" är inte en enkel uppdaterbar skanning av tabell \"%s\""
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3093
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "typen av parameter %d (%s) matchar inte det som var vid preparerande av plan (%s)"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2567
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3105
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "hittade inget värde för parameter %d"
 
-#: executor/execExpr.c:642 executor/execExpr.c:649 executor/execExpr.c:655
-#: executor/execExprInterp.c:4852 executor/execExprInterp.c:4869
-#: executor/execExprInterp.c:4968 executor/nodeModifyTable.c:203
-#: executor/nodeModifyTable.c:214 executor/nodeModifyTable.c:231
-#: executor/nodeModifyTable.c:239
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5439 executor/execExprInterp.c:5456
+#: executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "tabellens radtyp och frågans radtyp matchar inte"
 
-#: executor/execExpr.c:643 executor/nodeModifyTable.c:204
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "Fråga har för många kolumner."
 
-#: executor/execExpr.c:650 executor/nodeModifyTable.c:232
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "Fråga levererar ett värde för en borttagen kolumn vid position %d."
 
-#: executor/execExpr.c:656 executor/execExprInterp.c:4870
-#: executor/nodeModifyTable.c:215
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "Tabellen har typ %s vid position %d, men frågan förväntar sig %s."
 
-#: executor/execExpr.c:1104 parser/parse_agg.c:838
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "fönsterfunktionanrop kan inte nästlas"
 
-#: executor/execExpr.c:1649
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "måltypen är inte en array"
 
-#: executor/execExpr.c:1989
+#: executor/execExpr.c:2033
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "ROW()-kolumn har typ %s istället för typ %s"
 
-#: executor/execExpr.c:2653 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
@@ -13526,379 +13926,382 @@ msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "kan inte överföra mer än %d argument till en funktion"
 msgstr[1] "kan inte överföra mer än %d argument till en funktion"
 
-#: executor/execExpr.c:2680 executor/execSRF.c:738 executor/functions.c:1068
-#: utils/adt/jsonfuncs.c:4054 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "en funktion som returnerar en mängd anropades i kontext som inte godtar en mängd"
 
-#: executor/execExpr.c:3086 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3264 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr "kan inte använda array-index på typ %s då den inte stöder array-index"
 
-#: executor/execExpr.c:3214 executor/execExpr.c:3236
+#: executor/execExpr.c:3392 executor/execExpr.c:3414
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "typen %s stöder inte tilldelning med array-index"
 
-#: executor/execExprInterp.c:2019
+#: executor/execExprInterp.c:2415
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "attribut %d för typ %s har tagits bort"
 
-#: executor/execExprInterp.c:2025
+#: executor/execExprInterp.c:2421
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "attribut %d för typ %s har fel typ"
 
-#: executor/execExprInterp.c:2027 executor/execExprInterp.c:3226
-#: executor/execExprInterp.c:3272
+#: executor/execExprInterp.c:2423 executor/execExprInterp.c:3782
+#: executor/execExprInterp.c:3828
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "Tabell har typ %s men fråga förväntar sig %s."
 
-#: executor/execExprInterp.c:2107 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2503 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "typen %s är inte composite"
 
-#: executor/execExprInterp.c:2710
+#: executor/execExprInterp.c:3266
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF stöds inte för denna tabelltyp"
 
-#: executor/execExprInterp.c:2923
+#: executor/execExprInterp.c:3479
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "kan inte göra merge på inkompatibla arrayer"
 
-#: executor/execExprInterp.c:2924
+#: executor/execExprInterp.c:3480
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "Array med elementtyp %s kan inte inkluderas i ARRAY-konstruktion med elementtyp %s."
 
-#: executor/execExprInterp.c:2945 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3503 utils/adt/arrayfuncs.c:5593
-#: utils/adt/arrayfuncs.c:6110 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5605
+#: utils/adt/arrayfuncs.c:6124 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "antalet array-dimensioner (%d) överskrider det maximalt tillåtna (%d)"
 
-#: executor/execExprInterp.c:2965 executor/execExprInterp.c:3000
+#: executor/execExprInterp.c:3521 executor/execExprInterp.c:3556
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "flerdimensionella vektorer måste ha array-uttryck av passande dimensioner"
 
-#: executor/execExprInterp.c:2977 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
 #: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
 #: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
-#: utils/adt/arrayfuncs.c:3533 utils/adt/arrayfuncs.c:5365
-#: utils/adt/arrayfuncs.c:6202 utils/adt/arrayfuncs.c:6546
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5377
+#: utils/adt/arrayfuncs.c:6216 utils/adt/arrayfuncs.c:6560
 #: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
 #: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "array-storlek överskrider maximalt tillåtna (%d)"
 
-#: executor/execExprInterp.c:3225 executor/execExprInterp.c:3271
+#: executor/execExprInterp.c:3781 executor/execExprInterp.c:3827
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "attribut %d har fel typ"
 
-#: executor/execExprInterp.c:3857 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4413 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "domäm %s tillåter inte null-värden"
 
-#: executor/execExprInterp.c:3872 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4428 utils/adt/domains.c:196
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "värde för domän %s bryter mot check-villkoret \"%s\""
 
-#: executor/execExprInterp.c:4447
+#: executor/execExprInterp.c:5003
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
 msgstr "ingen SQL/JSON-post hittades i angiven sökväg för kolumn \"%s\""
 
-#: executor/execExprInterp.c:4452
+#: executor/execExprInterp.c:5008
 #, c-format
 msgid "no SQL/JSON item found for specified path"
 msgstr "ingen SQL/JSON-post hittades i angiven sökväg"
 
 #. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
-#: executor/execExprInterp.c:4652 executor/execExprInterp.c:4660
+#: executor/execExprInterp.c:5208 executor/execExprInterp.c:5216
 #, c-format
 msgid "could not coerce %s expression (%s) to the RETURNING type"
 msgstr "kunde inte omvandla %s-uttryck (%s) till typen för RETURNING"
 
-#: executor/execExprInterp.c:4853
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "Tabellrad har %d attribut, men frågan förväntar sig %d."
 msgstr[1] "Tabellrad har %d attribut, men frågan förväntar sig %d."
 
-#: executor/execExprInterp.c:4969 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "Fysisk lagrings matchar inte för borttaget attribut på position %d."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:608
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT stöder inte \"deferrable\" unika integritetsvillkor eller uteslutningsvillkor som särskiljare"
 
-#: executor/execIndexing.c:870
+#: executor/execIndexing.c:911
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "kunde inte skapa uteslutningsvillkor \"%s\""
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:914
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Nyckel %s står i konflikt med nyckel %s."
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:916
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Nyckelkonflikt finns."
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:922
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "konfliktande nyckelvärde bryter mot uteslutningsvillkor \"%s\""
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:925
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Nyckel %s står i konflilkt med existerande nyckel %s."
 
-#: executor/execIndexing.c:886
+#: executor/execIndexing.c:927
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Nyckel står i konflikt med existerande nyckel."
 
-#: executor/execMain.c:1039
+#: executor/execIndexing.c:1172
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr "tomt WITHOUT OVERLAPS-värde hittat i kolumn \"%s\" i relationen \"%s\""
+
+#: executor/execMain.c:1089
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "kan inte ändra sekvens \"%s\""
 
-#: executor/execMain.c:1045
+#: executor/execMain.c:1095
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "kan inte ändra TOAST-relation \"%s\""
 
-#: executor/execMain.c:1064
+#: executor/execMain.c:1114
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "kan inte ändra materialiserad vy \"%s\""
 
-#: executor/execMain.c:1076
+#: executor/execMain.c:1126
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "kan inte sätta in i främmande tabell \"%s\""
 
-#: executor/execMain.c:1082
+#: executor/execMain.c:1132
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "främmande tabell \"%s\" tillåter inte insättningar"
 
-#: executor/execMain.c:1089
+#: executor/execMain.c:1139
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "kan inte uppdatera främmande tabell \"%s\""
 
-#: executor/execMain.c:1095
+#: executor/execMain.c:1145
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "främmande tabell \"%s\" tillåter inte uppdateringar"
 
-#: executor/execMain.c:1102
+#: executor/execMain.c:1152
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "kan inte radera från främmande tabell \"%s\""
 
-#: executor/execMain.c:1108
+#: executor/execMain.c:1158
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "främmande tabell \"%s\" tillåter inte radering"
 
-#: executor/execMain.c:1119
+#: executor/execMain.c:1169
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "kan inte ändra relation \"%s\""
 
-#: executor/execMain.c:1146
+#: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "kan inte låsa rader i sekvens \"%s\""
 
-#: executor/execMain.c:1153
+#: executor/execMain.c:1203
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "kan inte låsa rader i TOAST-relation \"%s\""
 
-#: executor/execMain.c:1160
+#: executor/execMain.c:1210
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "kan inte låsa rader i vy \"%s\""
 
-#: executor/execMain.c:1168
+#: executor/execMain.c:1218
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "kan inte låsa rader i materialiserad vy \"%s\""
 
-#: executor/execMain.c:1177 executor/execMain.c:2687
+#: executor/execMain.c:1227 executor/execMain.c:2869
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "kan inte låsa rader i främmande tabell \"%s\""
 
-#: executor/execMain.c:1183
+#: executor/execMain.c:1233
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "kan inte låsa rader i relation \"%s\""
 
-#: executor/execMain.c:1901
+#: executor/execMain.c:1966
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "ny rad för relation \"%s\" bryter mot partitionesvillkoret"
 
-#: executor/execMain.c:1903 executor/execMain.c:1987 executor/execMain.c:2038
-#: executor/execMain.c:2148
+#: executor/execMain.c:1968 executor/execMain.c:2080 executor/execMain.c:2218
+#: executor/execMain.c:2326
 #, c-format
 msgid "Failing row contains %s."
 msgstr "Misslyckande rad innehåller %s."
 
-#: executor/execMain.c:1984
-#, c-format
-msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
-msgstr "null-värde i kolumn \"%s\" i relation \"%s\" bryter mot not-null-villkoret"
-
-#: executor/execMain.c:2036
+#: executor/execMain.c:2078
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "ny rad för relation \"%s\" bryter mot check-villkor \"%s\""
 
-#: executor/execMain.c:2146
+#: executor/execMain.c:2215
+#, c-format
+msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
+msgstr "null-värde i kolumn \"%s\" i relation \"%s\" bryter mot not-null-villkoret"
+
+#: executor/execMain.c:2324
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "ny rad bryter mot check-villkor för vy \"%s\""
 
-#: executor/execMain.c:2156
+#: executor/execMain.c:2334
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr "ny rad bryter mot radsäkerhetspolicy \"%s\" i tabell \"%s\""
 
-#: executor/execMain.c:2161
+#: executor/execMain.c:2339
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr "ny rad bryter mot radsäkerhetspolicy i tabell \"%s\""
 
-#: executor/execMain.c:2169
+#: executor/execMain.c:2347
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "målraden bryter mot radsäkerhetspolicyen \"%s\" (USING-uttryck) i tabellen \"%s\""
 
-#: executor/execMain.c:2174
+#: executor/execMain.c:2352
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "målraden bryter mot radsäkerhetspolicyn (USING-uttryck) i tabellen \"%s\""
 
-#: executor/execMain.c:2181
+#: executor/execMain.c:2359
 #, c-format
 msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "ny rad bryter mot radsäkerhetspolicy \"%s\" (USING-uttryck) i tabell \"%s\""
 
-#: executor/execMain.c:2186
+#: executor/execMain.c:2364
 #, c-format
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "ny rad bryter mot radsäkerhetspolicy (USING-uttryck) i tabell \"%s\""
 
-#: executor/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "ingen partition av relation \"%s\" kunde hittas för raden"
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "Partitioneringsnyckel för den trasiga raden innehåller %s."
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update, retrying"
 msgstr "tupel som skall låsas har redan flyttats till en annan partition av en samtidig uppdatering, försöker igen"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "samtidig uppdatering, försöker igen"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "samtidig borttagning, försöker igen"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3852
-#: utils/adt/arrayfuncs.c:4407 utils/adt/arrayfuncs.c:6426
-#: utils/adt/rowtypes.c:1220
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "kunde inte hitta en likhetsoperator för typ %s"
-
-#: executor/execReplication.c:687 executor/execReplication.c:693
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "kan inte uppdatera tabell \"%s\""
 
-#: executor/execReplication.c:689 executor/execReplication.c:701
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid "Column used in the publication WHERE expression is not part of the replica identity."
 msgstr "Kolumn som används i publicerings WHERE-uttryck är inte en del av replikans identitet."
 
-#: executor/execReplication.c:695 executor/execReplication.c:707
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid "Column list used by the publication does not cover the replica identity."
 msgstr "Kolumnlistan som används i publiceringen inkluderar inte hela replikans identitet."
 
-#: executor/execReplication.c:699 executor/execReplication.c:705
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr "Replikaidentitet får inte innehålla genererade kolumner som ej är publicerade."
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "kan inte radera från tabell \"%s\""
 
-#: executor/execReplication.c:725
+#: executor/execReplication.c:859
 #, c-format
 msgid "cannot update table \"%s\" because it does not have a replica identity and publishes updates"
 msgstr "kan inte uppdatera tabell \"%s\" då den inte har en replikaidentitet och den publicerar uppdateringar"
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "För att slå på uppdatering av tabellen, sätt REPLICA IDENTITY med ALTER TABLE."
 
-#: executor/execReplication.c:731
+#: executor/execReplication.c:865
 #, c-format
 msgid "cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes"
 msgstr "kan inte radera från tabell \"%s\" då den inte har en replikaidentitet och den publicerar uppdateringar"
 
-#: executor/execReplication.c:733
+#: executor/execReplication.c:867
 #, c-format
 msgid "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "För att slå på borttagning från tabellen, ange REPLICA IDENTITY med ALTER TABLE."
 
-#: executor/execReplication.c:749
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr "kan inte använda relation \"%s.%s\" som logisk replikeringsmål"
@@ -13945,117 +14348,118 @@ msgstr[1] "Returnerad rad har %d attribut, men frågan förväntar sig %d."
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "Returnerade typ %s vid position %d, men frågan förväntade sig %s."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "kan inte hämta systemkolumn i detta kontext"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
 msgstr "har ingen transaktionsinformation för denna typ av tupel"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
+#: executor/execTuples.c:391 executor/execTuples.c:796
 #, c-format
 msgid "don't have a storage tuple in this context"
 msgstr "har ingen lagringstupel i detta kontext"
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "materialiserad vy \"%s\" har inte populerats"
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "Använd kommandot REFRESH MATERIALIZED VIEW."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "kunde inte bestämma den verkliga typen för argument deklarerat som %s"
 
-#: executor/functions.c:513
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "kan inte göra COPY till/från klient i en SQL-funktion"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:519
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "%s är inte tillåtet i en SQL-funktion"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:527 executor/spi.c:1744 executor/spi.c:2657
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s tillåts inte i en icke-volatile-funktion"
 
-#: executor/functions.c:1452
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL-funktion \"%s\" sats %d"
+msgid "return type mismatch in function declared to return %s"
+msgstr "returtypen stämmer inte i funktion deklarerad att returnera %s"
 
-#: executor/functions.c:1478
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "SQL-funktion \"%s\" under uppstart"
+msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgstr "Funktionen sista sats måste vara en SELECT eller INSERT/UPDATE/DELETE/MERGE RETURNING."
 
-#: executor/functions.c:1563
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
-msgid "calling procedures with output arguments is not supported in SQL functions"
-msgstr "anropa procedurer med output-argument stöds inte i SQL-funktioner"
+msgid "cached plan must not change result type"
+msgstr "cache:ad plan får inte ändra resultattyp"
 
-#: executor/functions.c:1698 executor/functions.c:1736
-#: executor/functions.c:1750 executor/functions.c:1845
-#: executor/functions.c:1878 executor/functions.c:1892
+#: executor/functions.c:1922 executor/functions.c:1953
 #, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "returtypen stämmer inte i funktion deklarerad att returnera %s"
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL-funktion \"%s\" under uppstart"
 
-#: executor/functions.c:1700
+#: executor/functions.c:1950
 #, c-format
-msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
-msgstr "Funktionen sista sats måste vara en SELECT eller INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL-funktion \"%s\" sats %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid "calling procedures with output arguments is not supported in SQL functions"
+msgstr "anropa procedurer med output-argument stöds inte i SQL-funktioner"
 
-#: executor/functions.c:1738
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "Sista satsen måste returnera exakt en kolumn."
 
-#: executor/functions.c:1752
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Verklig returtyp är %s."
 
-#: executor/functions.c:1847
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "Sista satsen returnerar för många kolumner."
 
-#: executor/functions.c:1880
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "Sista satsen returnerar %s istället för %s vid column %d."
 
-#: executor/functions.c:1894
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "Sista satsen returnerar för få kolumner."
 
-#: executor/functions.c:1922
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "returtyp %s stöds inte för SQL-funktioner"
 
-#: executor/nodeAgg.c:3936 executor/nodeWindowAgg.c:2975
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3041
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "aggregat %u måste ha kompatibel indatatyp och övergångstyp"
 
-#: executor/nodeAgg.c:3966 parser/parse_agg.c:680 parser/parse_agg.c:708
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "aggregatfunktionsanrop kan inte nästlas"
@@ -14065,12 +14469,12 @@ msgstr "aggregatfunktionsanrop kan inte nästlas"
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "egen skanning \"%s\" stöder inte MarkPos"
 
-#: executor/nodeHashjoin.c:1131 executor/nodeHashjoin.c:1161
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "kunde inte spola tillbaka hash-join-temporärfil"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr "distansfunktioner som är \"lossy\" stöds inte vid skanning av enbart index"
@@ -14085,74 +14489,79 @@ msgstr "OFFSET kan inte vara negativ"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT kan inte vara negativ"
 
-#: executor/nodeMergejoin.c:1579
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN stöds bara med merge-joinbara join-villor"
 
-#: executor/nodeMergejoin.c:1597
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN stöds bara med merge-joinbara join-villkor"
 
-#: executor/nodeModifyTable.c:240
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "Fråga levererar ett värde för en genererad kolumn vid position %d."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "Frågan har för få kolumner"
 
-#: executor/nodeModifyTable.c:1540 executor/nodeModifyTable.c:1614
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr "tupel som skall tas bort hade redan ändrats av en operation som triggats av aktuellt kommando"
 
-#: executor/nodeModifyTable.c:1769
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "ogiltig ON UPDATE-angivelse"
 
-#: executor/nodeModifyTable.c:1770
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr "Resultattupeln kommer dyka upp i en annan partition än originaltupeln."
 
-#: executor/nodeModifyTable.c:2226
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr "kan inte flytta en tupel mellan partitioner när en icke-root-förälder av källpartitionen direkt refereras av en främmande nyckel"
 
-#: executor/nodeModifyTable.c:2227
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr "En främmande nyckel pekar på förfadern \"%s\" men inte på root-förfadern \"%s\"."
 
-#: executor/nodeModifyTable.c:2230
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "Överväg att skapa den främmande nyckeln på tabellen \"%s\"."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2596 executor/nodeModifyTable.c:3138
-#: executor/nodeModifyTable.c:3308
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3328
+#: executor/nodeModifyTable.c:3520
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "%s-kommandot kan inte påverka raden en andra gång"
 
-#: executor/nodeModifyTable.c:2598
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "Säkerställ att inga rader föreslagna för \"insert\" inom samma kommando har upprepade villkorsvärden."
 
-#: executor/nodeModifyTable.c:3131 executor/nodeModifyTable.c:3301
+#: executor/nodeModifyTable.c:3321 executor/nodeModifyTable.c:3513
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "tupel som skall uppdateras eller raderas hade redan ändrats av en operation som triggats av aktuellt kommando"
 
-#: executor/nodeModifyTable.c:3140 executor/nodeModifyTable.c:3310
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "Säkerställ att inte mer än en källrad matchar någon målrad."
 
-#: executor/nodeModifyTable.c:3209
+#: executor/nodeModifyTable.c:3399
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
 msgstr "tupel som skall slås samman har redan flyttats till en annan partition på grund av samtidig update"
@@ -14167,8 +14576,8 @@ msgstr "parametern TABLESAMPLE kan inte vara null"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "parametern TABLESAMPLE REPEATABLE kan inte vara null"
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "mer än en rad returnerades från underfråga som används som uttryck"
@@ -14203,27 +14612,27 @@ msgstr "null tillåts inte i kolumn \"%s\""
 msgid "moving-aggregate transition function must not return null"
 msgstr "moving-aggregate-övergångsfunktion får inte returnera null"
 
-#: executor/nodeWindowAgg.c:2083
+#: executor/nodeWindowAgg.c:2106
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "fönsterram-startoffset kan inte vara null"
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2120
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "fönsterram-startoffset kan inte vara negativ"
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2133
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "fönsterram-slutoffset kan inte vara null"
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2147
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "fönsterram-slutoffset kan inte vara negativ"
 
-#: executor/nodeWindowAgg.c:2891
+#: executor/nodeWindowAgg.c:2957
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr "aggregatfunktion %s kan inte användas som fönsterfunktion"
@@ -14274,7 +14683,7 @@ msgstr "kan inte öppna %s-fråga som markör"
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE stöds inte"
 
-#: executor/spi.c:1719 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Scrollbara markörer måste vara READ ONLY."
@@ -14292,8 +14701,8 @@ msgstr "%s-fråga returnerar inga tupler"
 
 #: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "SQL-uttryck \"%s\""
+msgid "PL/pgSQL expression \"%s\""
+msgstr "PL/pgSQL-uttryck \"%s\""
 
 #: executor/spi.c:2992
 #, c-format
@@ -14310,43 +14719,43 @@ msgstr "SQL-sats: \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "kunde inte skicka tupel till kö i delat minne: %m"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "användarmappning hittades inte för användare \"%s\", server \"%s\""
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7153
-#: optimizer/util/plancat.c:540
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299
+#: optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
 msgstr "access till icke-system främmande tabell är begränsad"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "ogiltig flagga \"%s\""
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "Kanske menade du flaggan \"%s\"."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "Det finns inga giltiga flaggor i detta kontext."
 
-#: gram.y:1231
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD stöds inte längre"
 
-#: gram.y:1232
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "Ta bort UNENCRYPTED för att lagra lösenord i krypterad form istället."
 
-#: gram.y:1559 gram.y:1575
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS kan inte innehålla schemaelement"
@@ -14356,442 +14765,449 @@ msgstr "CREATE SCHEMA IF NOT EXISTS kan inte innehålla schemaelement"
 msgid "current database cannot be changed"
 msgstr "nuvarande databas kan inte ändras"
 
-#: gram.y:1860
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "tidszoneintervall måste vara HOUR eller HOUR TO MINUTE"
 
-#: gram.y:2487
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "kolumnnummer måste vara i intervallet 1 till %d."
 
-#: gram.y:3083
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "villkor kan inte ändras till NOT VALID"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "sekvensflagga \"%s\" stöds inte här"
 
-#: gram.y:3122
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "modulo för hash-partition angiven mer än en gång"
 
-#: gram.y:3131
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "rest för hash-partition angiven mer än en gång"
 
-#: gram.y:3138
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "okänd gränsangivelse \"%s\" för hash-partition"
 
-#: gram.y:3146
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "modulo för hashpartition måste anges"
 
-#: gram.y:3150
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "rest för hash-partition måste anges"
 
-#: gram.y:3358 gram.y:3392
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT tillåts inte med PROGRAM"
 
-#: gram.y:3364
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "WHERE-klausul tillåts inte med COPY TO"
 
-#: gram.y:3712 gram.y:3719 gram.y:13023 gram.y:13031
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL när man skapar temporära tabeller är på utgående och kommer tas bort"
 
-#: gram.y:3995
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "för en genererad kolumn så måste GENERATED ALWAYS anges"
 
-#: gram.y:4340 utils/adt/ri_triggers.c:2103
+#: gram.y:4454 utils/adt/ri_triggers.c:2259
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL är inte implementerat ännu"
 
-#: gram.y:4432
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "en kolumnlista med %s stöds bara vi ON DELETE-aktioner"
 
-#: gram.y:5151
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION .. FROM stöds inte längre"
 
-#: gram.y:5849
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "okänd radsäkerhetsflagga \"%s\""
 
-#: gram.y:5850
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "Bara policys PERMISSIVE och RESTRICTIVE stöds för tillfället."
 
-#: gram.y:5935
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER stöds inte"
 
-#: gram.y:5972
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "multipla triggerhändelser angivna"
 
-#: gram.y:6114 parser/parse_utilcmd.c:3692 parser/parse_utilcmd.c:3718
+#: gram.y:6229 parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "villkor deklarerat INITIALLY DEFERRED måste vara DEFERRABLE"
 
-#: gram.y:6121
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "motstridiga vilkorsegenskaper"
 
-#: gram.y:6220
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION är inte implementerat ännu"
 
-#: gram.y:6537
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "slänga ett enum-värde är inte implementerat"
 
-#: gram.y:6655
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK krävs inte längre"
-
-#: gram.y:6656
-#, c-format
-msgid "Update your data type."
-msgstr "Uppdatera din datatyp"
-
-#: gram.y:8529
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "aggregat kan inte ha utdataargument"
 
-#: gram.y:8992 utils/adt/regproc.c:670
+#: gram.y:9100 utils/adt/regproc.c:670
 #, c-format
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: gram.y:8993 utils/adt/regproc.c:671
+#: gram.y:9101 utils/adt/regproc.c:671
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Använd NONE för att markera det saknade argumentet för en unär operator."
 
-#: gram.y:11221 gram.y:11240
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION stöds inte för rekursiva vyer"
 
-#: gram.y:13162
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "LIMIT #,#-syntax stöds inte"
 
-#: gram.y:13163
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Använd separata klausuler LIMIT och OFFSET."
 
-#: gram.y:14038
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "bara ett DEFAULT-värde tillåts"
 
-#: gram.y:14047
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "bara ett PATH-värde per kolumn tillåts"
 
-#: gram.y:14056
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "motstridiga eller överflödiga NULL / NOT NULL-deklarationer för kolumnen \"%s\""
 
-#: gram.y:14065
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "okänd kolumnflagga \"%s\""
 
-#: gram.y:14147
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "flaggnamn \"%s\" kan inte användas i XMLTABLE"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
 msgstr "enbart strängkonstanter stöds i angiven sökväg för JSON_TABLE"
 
-#: gram.y:14469
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "precisionen för typen float måste vara minst 1 bit"
 
-#: gram.y:14478
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "precisionen för typen float måste vara mindre än 54 bits"
 
-#: gram.y:14995
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "fel antal parametrar på vänster sida om OVERLAPS-uttryck"
 
-#: gram.y:15000
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "fel antal parametrar på höger sida om OVERLAPS-uttryck"
 
-#: gram.y:15177
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE-predikat är inte implementerat ännu"
 
-#: gram.y:15591
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "kan inte ha multipla ORDER BY-klausuler med WITHIN GROUP"
 
-#: gram.y:15596
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "kan inte använda DISTINCT med WITHIN GROUP"
 
-#: gram.y:15601
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "kan inte använda VARIADIC med WITHIN GROUP"
 
-#: gram.y:16328 gram.y:16352
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "fönsterramstart kan inte vara UNBOUNDED FOLLOWING"
 
-#: gram.y:16333
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "fönsterram som startar på efterföljande rad kan inte sluta på nuvarande rad"
 
-#: gram.y:16357
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "fönsterramslut kan inte vara UNBOUNDED PRECEDING"
 
-#: gram.y:16363
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "fönsterram som startar på aktuell rad kan inte ha föregående rader"
 
-#: gram.y:16370
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "fönsterram som startar på efterföljande rad kan inte ha föregående rader"
 
-#: gram.y:16919
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "okänd JSON-kodning: %s"
 
-#: gram.y:17243
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "typmodifierare kan inte ha paremeternamn"
 
-#: gram.y:17249
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "typmodifierare kan inte ha ORDER BY"
 
-#: gram.y:17317 gram.y:17324 gram.y:17331
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s kan inte användas som ett rollnamn här"
 
-#: gram.y:17421 gram.y:18906
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES kan inte anges utan en ORDER BY-klausul"
 
-#: gram.y:18597 gram.y:18772
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "felaktig användning av \"*\""
 
-#: gram.y:18735 gram.y:18752 tsearch/spell.c:963 tsearch/spell.c:980
-#: tsearch/spell.c:997 tsearch/spell.c:1014 tsearch/spell.c:1079
+#: gram.y:18905 gram.y:18922 tsearch/spell.c:965 tsearch/spell.c:982
+#: tsearch/spell.c:999 tsearch/spell.c:1016 tsearch/spell.c:1082
 #, c-format
 msgid "syntax error"
 msgstr "syntaxfel"
 
-#: gram.y:18836
+#: gram.y:19006
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "ett sorterad-mängd-aggregat med ett direkt VARIADIC-argument måste ha ett aggregerat VARIADIC-argument av samma datatype"
 
-#: gram.y:18873
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "multipla ORDER BY-klausuler tillåts inte"
 
-#: gram.y:18884
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "multipla OFFSET-klausuler tillåts inte"
 
-#: gram.y:18893
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "multipla LIMIT-klausuler tillåts inte"
 
-#: gram.y:18902
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "multipla limit-alternativ tillåts inte"
-
-#: gram.y:18929
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "multipla WITH-klausuler tillåts inte"
 
-#: gram.y:19122
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "OUT och INOUT-argument tillåts inte i TABLE-funktioner"
 
-#: gram.y:19255
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "multipla COLLATE-klausuler tillåts inte"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19293 gram.y:19306
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "%s-villkor kan inte markeras DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19319
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "%s-villkor kan inte markeras NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19332
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s-villkor kan inte markeras NO INHERIT"
 
-#: gram.y:19354
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, c-format
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "%s-villkor kan inte markeras NOT ENFORCED"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, c-format
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "%s-villkor kan inte markeras ENFORCED"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "okänd partitioneringsstrategi \"%s\""
 
-#: gram.y:19378
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "ogiltig objektlista för publicering"
 
-#: gram.y:19379
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr "En av TABLE eller ALL TABLES IN SCHEMA måste anges innan en enskild tabell eller ett schemanamn."
 
-#: gram.y:19395
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "ogiltigt tabellnamn"
 
-#: gram.y:19416
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "WHERE-klausul tillåts inte för schema"
 
-#: gram.y:19423
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "kolumnspecifikation tillåts inte för schema"
 
-#: gram.y:19437
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "ogiltigt schemanamn"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "tomt konfigurationsfilnamn \"%s\""
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr "kunde inte öppna konfigureringsfil \"%s\": maximalt nästlingsdjup överskridet"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "rekursiv konfigurationsfil i \"%s\""
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "kunde inte öppna konfigureringsfil \"%s\": %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "hoppar över saknad konfigureringsfil \"%s\""
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
 msgstr "syntaxfel i fil \"%s\" rad %u, nära slutet på raden"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "syntaxfel i fil \"%s\" rad %u, nära token \"%s\""
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr "hittade för många syntaxfel, överger filen \"%s\""
 
-#: jsonpath_gram.y:266 jsonpath_gram.y:598 jsonpath_scan.l:640
-#: jsonpath_scan.l:651 jsonpath_scan.l:661 jsonpath_scan.l:712
-#: utils/adt/encode.c:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:659
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374
+#: jsonpath_gram.y:268 jsonpath_gram.y:600 jsonpath_scan.l:617
+#: jsonpath_scan.l:628 jsonpath_scan.l:638 jsonpath_scan.l:690
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:341 utils/adt/varlena.c:382
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "ogiltig indatassyntax för typen %s"
 
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
 msgstr "A list of the problematic subscriptions is in the file:"
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "okänt flaggtecken \"%.*s\" i LIKE_REGEX-predikat."
 
-#: jsonpath_gram.y:629 tsearch/spell.c:749 utils/adt/regexp.c:223
+#: jsonpath_gram.y:631 tsearch/spell.c:751 utils/adt/regexp.c:223
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "ogiltigt reguljärt uttryck: %s"
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:679
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "XQuery \"x\"-flagga (expanderat reguljärt uttryck) är inte implementerat"
@@ -14808,49 +15224,49 @@ msgstr "ogiltig hexdecimal teckensekvens"
 msgid "unexpected end after backslash"
 msgstr "oväntat slut efter bakstreck"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:756
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "icketerminerad citerad sträng"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "oväntat slut på kommentar"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "ogiltig numerisk literal"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1064
-#: scan.l:1068 scan.l:1072 scan.l:1076
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "efterföljande skräp efter numerisk literal"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s vid slutet av jsonpath-indata"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s vid eller nära \"%s\" i jsonpath-indata"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "ogiltig indata"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "ogiltigt hexdecimal siffra"
 
-#: jsonpath_scan.l:607 utils/adt/jsonfuncs.c:647
+#: jsonpath_scan.l:584 utils/adt/jsonfuncs.c:649
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "Unicode escape-sekvens som inte stöds"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "kunde inte konvertera Unicode till serverns teckenkodning"
@@ -14861,712 +15277,896 @@ msgstr "kunde inte konvertera Unicode till serverns teckenkodning"
 msgid "Failed on DSA request of size %zu."
 msgstr "Misslyckades med DSA-förfrågan av storlek %zu."
 
-#: libpq/auth-sasl.c:97
-#, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "förväntade SASL-svar, fick meddelandetyp %d"
-
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
 msgid "client selected an invalid SASL authentication mechanism"
 msgstr "klient valde en ogiltig SASL-autentiseringsmekanism"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
+#, c-format
+msgid "malformed OAUTHBEARER message"
+msgstr "trasigt OAUTHBEARER-meddelande"
+
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
+#, c-format
+msgid "The message is empty."
+msgstr "Meddelandet är tomt."
+
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
+#, c-format
+msgid "Message length does not match input length."
+msgstr "Meddelandelängden matchar inte indatalängden."
+
+#: libpq/auth-oauth.c:193
+#, c-format
+msgid "Client did not send a kvsep response."
+msgstr "Klienten skickade inte kvsep-respons."
+
+#: libpq/auth-oauth.c:221
+#, c-format
+msgid "The server does not support channel binding for OAuth, but the client message includes channel binding data."
+msgstr "Servern stöder inte kanalbindning för OAuth men klientens meddelande innehåller data för kanalbindning."
+
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
+#, c-format
+msgid "Comma expected, but found character \"%s\"."
+msgstr "Komma förväntades men hittade tecken \"%s\"."
+
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
+#, c-format
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "Oväntad kanalbindningsflagga \"%s\"."
+
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
+#, c-format
+msgid "client uses authorization identity, but it is not supported"
+msgstr "klient använder auktorisationsidentitet, men det stöds inte"
+
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
+#, c-format
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "Oväntat attribut \"%s\" i klient-först-meddelande."
+
+#: libpq/auth-oauth.c:264
+#, c-format
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr "Nyckel-värde-separator förväntades men hitta tecknet \"%s\"."
+
+#: libpq/auth-oauth.c:273
+#, c-format
+msgid "Message does not contain an auth value."
+msgstr "Meddelandet innehåller inte ett auth-värde."
+
+#: libpq/auth-oauth.c:280
+#, c-format
+msgid "Message contains additional data after the final terminator."
+msgstr "Meddelandet innehåller mer data efter den avslutande terminatorn."
+
+#: libpq/auth-oauth.c:343
+#, c-format
+msgid "Message contains an empty key name."
+msgstr "Meddelande innehåller ett tomt nyckelnamn."
+
+#: libpq/auth-oauth.c:350
+#, c-format
+msgid "Message contains an invalid key name."
+msgstr "Meddelandet innehåller ett ogilitgt nyckelnamn."
+
+#: libpq/auth-oauth.c:376
+#, c-format
+msgid "Message contains an invalid value."
+msgstr "Meddelande innehåller ett ogiltigt värde."
+
+#: libpq/auth-oauth.c:421
+#, c-format
+msgid "Message contains an unterminated key/value pair."
+msgstr "Meddelandet innehåller ett icketerminerat nyckel/värde-par."
+
+#: libpq/auth-oauth.c:439
+#, c-format
+msgid "Message contains a key without a value."
+msgstr "Meddelandet innehåller en nyckel utan värde."
+
+#: libpq/auth-oauth.c:453
+#, c-format
+msgid "Message contains multiple auth values."
+msgstr "Meddelande innehåller multipla auth-värden."
+
+#: libpq/auth-oauth.c:473
+#, c-format
+msgid "Message did not contain a final terminator."
+msgstr "Meddelandet innehöll ingen avslutande terminator."
+
+#: libpq/auth-oauth.c:499
+#, c-format
+msgid "OAuth is not properly configured for this user"
+msgstr "OAuth är inte korrekt konfigurerat för denna användare"
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr "Parametrarna issuer och scope måste sättas i pg_hba.conf."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, c-format
+msgid "malformed OAuth bearer token"
+msgstr "felaktigt bärande OAuth-token"
+
+#: libpq/auth-oauth.c:586
+#, c-format
+msgid "Client response indicated a non-Bearer authentication scheme."
+msgstr "Klientrespons indikerade ett icke-bärande autentisersschema"
+
+#: libpq/auth-oauth.c:603
+#, c-format
+msgid "Bearer token is empty."
+msgstr "Bärande token är tom."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "Bärande token är inte i korrekt format."
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "Validering av OAuth-token begärd utan att en validator laddats"
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "internt fel i modulen för OAuth-validering"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, c-format
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr "OAuth-bärande autentisering misslyckades för användare \"%s\""
+
+#: libpq/auth-oauth.c:681
+#, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "Validatorn misslyckades att auktoriserad bifogad token."
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "Validatorn gav ingen identitet."
+
+#: libpq/auth-oauth.c:760
+#, c-format
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "%s-modul \"%s\" måste definiera symbolen %s"
+
+#: libpq/auth-oauth.c:773
+#, c-format
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "%s modul \"%s\": magiskt block matchar inte"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "Server har magiskt nummer 0x%08X, modulen har 0x%08X."
+
+#: libpq/auth-oauth.c:784
+#, c-format
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "%s-modul \"%s\" måste ge en %s-callback"
+
+#: libpq/auth-oauth.c:833
+#, c-format
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr "oauth_validator_libraries måste sättas för autentiseringsmetod %s"
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:196
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "rad %d i konfigurationsfil \"%s\""
+
+#: libpq/auth-oauth.c:867
+#, c-format
+msgid "authentication method \"oauth\" requires argument \"validator\" to be set when oauth_validator_libraries contains multiple options"
+msgstr "autentiseringsmetoden \"oauth\" kräver att argumentet \"validator\" är satt när oauth_validator_libraries innehåller multipla flaggor"
+
+#: libpq/auth-oauth.c:882
+#, c-format
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "validator \"%s\" tillåts inte av %s"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "förväntade SASL-svar, fick meddelandetyp %d"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
 #, c-format
 msgid "invalid SCRAM secret for user \"%s\""
 msgstr "ogiltig SCRAM-hemlighet för användare \"%s\""
 
-#: libpq/auth-scram.c:298
+#: libpq/auth-scram.c:302
 #, c-format
 msgid "User \"%s\" does not have a valid SCRAM secret."
 msgstr "Användare \"%s\" har inte en giltig SCRAM-hemlighet."
 
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
 #, c-format
 msgid "malformed SCRAM message"
 msgstr "trasigt SCRAM-meddelande"
 
-#: libpq/auth-scram.c:379
-#, c-format
-msgid "The message is empty."
-msgstr "Meddelandet är tomt."
-
-#: libpq/auth-scram.c:384
-#, c-format
-msgid "Message length does not match input length."
-msgstr "Meddelandelängden matchar inte indatalängden."
-
-#: libpq/auth-scram.c:416
+#: libpq/auth-scram.c:420
 #, c-format
 msgid "invalid SCRAM response"
 msgstr "ogiltigt SCRAM-svar"
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-scram.c:421
 #, c-format
 msgid "Nonce does not match."
 msgstr "Engångsnummer matchar inte."
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-scram.c:504
 #, c-format
 msgid "could not generate random salt"
 msgstr "kunde inte generera slumpat salt"
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-scram.c:752
 #, c-format
 msgid "Expected attribute \"%c\" but found \"%s\"."
 msgstr "Förväntade attribut \"%c\" men hittade \"%s\"."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
 #, c-format
 msgid "Expected character \"=\" for attribute \"%c\"."
 msgstr "Förväntade tecken \"=\" för attribut \"%c\"."
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-scram.c:865
 #, c-format
 msgid "Attribute expected, but found end of string."
 msgstr "Attribut förväntades men hittade slut på sträng."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-scram.c:878
 #, c-format
 msgid "Attribute expected, but found invalid character \"%s\"."
 msgstr "Attribut förväntades men hittade ogiltigt tecken \"%s\"."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
 #, c-format
 msgid "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not include channel binding data."
 msgstr "Klienten valde SCRAM-SHA-256-PLUS men SCRAM-meddelandet innehåller ingen kanalbindningsdata."
 
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
-#, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "Komma förväntades men hittade tecken \"%s\"."
-
-#: libpq/auth-scram.c:1010
+#: libpq/auth-scram.c:1024
 #, c-format
 msgid "SCRAM channel binding negotiation error"
 msgstr "fel vid förhandling om SCRAM-kanalbindning"
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-scram.c:1025
 #, c-format
 msgid "The client supports SCRAM channel binding but thinks the server does not.  However, this server does support channel binding."
 msgstr "Klienten stöder SCRAM-kanalbindning men tror att servern inte gör det.  Detta trots att servern stöder kanalbindning."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-scram.c:1047
 #, c-format
 msgid "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM message includes channel binding data."
 msgstr "Klienten valde SCRAM-SHA-256 utan kanalbindning men SCRAM-meddelandet innehåller kanalbindningsdata."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-scram.c:1058
 #, c-format
 msgid "unsupported SCRAM channel-binding type \"%s\""
 msgstr "saknar stöd för SCRAM-kanalbindningstyp \"%s\""
 
-#: libpq/auth-scram.c:1051
-#, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "Oväntad kanalbindningsflagga \"%s\"."
-
-#: libpq/auth-scram.c:1061
-#, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr "klient använder auktorisationsidentitet, men det stöds inte"
-
-#: libpq/auth-scram.c:1066
-#, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "Oväntat attribut \"%s\" i klient-först-meddelande."
-
-#: libpq/auth-scram.c:1082
+#: libpq/auth-scram.c:1096
 #, c-format
 msgid "client requires an unsupported SCRAM extension"
 msgstr "klient kräven en icke stödd SCRAM-utökning"
 
-#: libpq/auth-scram.c:1096
+#: libpq/auth-scram.c:1110
 #, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "icke-skrivbara tecken i SCRAM-engångsnummer"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "kunde inte slumpa fram engångsnummer"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "kunde inte koda slumpat engångsnummer"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
 msgstr "SCRAM-kanalbindningskonroll misslyckades"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr "oväntat SCRAM kanalbindningsattribut i klient-slut-meddelande"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "Trasigt bevis i klient-slut-meddelande."
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "Hittade skräp i slutet av klient-slut-meddelande."
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "autentisering misslyckades för användare \"%s\": host blockerad"
 
-#: libpq/auth.c:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "\"trust\"-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "Ident-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "Peer-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "Lösenordsautentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "GSSAPI-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "SSPI-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "PAM-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "BSD-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "LDAP-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "certifikat-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "RADOUS-autentisering misslyckades för användare \"%s\""
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "autentisering misslyckades för användare \"%s\": okänd autentiseringsmetod"
 
-#: libpq/auth.c:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "Anslutning matchade filen \"%s\", rad %d: \"%s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "identifierare för autentisering satt mer än en gång"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "föregående identifierare: \"%s\"; ny identifierare: \"%s\""
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "anslutning autentiserad: identitet=\"%s\" metod=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "klientcertifikat kan bara kontrolleras om lagrade root-certifikat finns tillgängligt"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "Anslutning kräver ett giltigt klientcertifikat"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "GSS-kryptering"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "ingen kryptering"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf avvisar replikeringsanslutning för värd \"%s\", användare \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf avvisar anslutning för värd \"%s\", användare \"%s\", databas \"%s\", %s"
 
-#: libpq/auth.c:506
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "Klient-IP-adress uppslagen till \"%s\", skickat uppslag matchar."
 
-#: libpq/auth.c:509
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "Klient-IP-adress uppslagen till \"%s\", skickat uppslag är inte kontrollerat."
 
-#: libpq/auth.c:512
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "Klient-IP-adress uppslagen till \"%s\", skickat uppslag matchar inte."
 
-#: libpq/auth.c:515
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "Kunde inte översätta klientvärdnamn \"%s\" till IP-adress: %s"
 
-#: libpq/auth.c:520
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Kunde inte slå upp klient-IP-adress och få värdnamn: %s."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr "ingen rad i pg_hba.conf för replikeringsanslutning från värd \"%s\", användare \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "ingen rad i pg_hba.conf för värd \"%s\", användare \"%s\", databas \"%s\", %s"
 
-#: libpq/auth.c:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "anslutning autentiserad: användare=\"%s\" metod=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "förväntade lösenordssvar, fick meddelandetyp %d"
 
-#: libpq/auth.c:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "felaktig storlek på lösenordspaket"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "tomt lösenord returnerat av klient"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "kunde inte generera slumpmässigt MD5-salt"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "kunde inte sätta omgivningsvariabel: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "förväntade GSS-svar, fick meddelandetyp %d"
 
-#: libpq/auth.c:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "accepterande av GSS-säkerhetskontext misslyckades"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "mottagande av GSS-användarnamn misslyckades"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "kunde inte hämta SSPI-referenser"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "förväntade SSPI-svar, fick meddelandetyp %d"
 
-#: libpq/auth.c:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "kunde inte acceptera SSPI-säkerhetskontext"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "kunde inte hämta token från SSPI-säkerhetskontext"
 
-#: libpq/auth.c:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "kunde inte översätta namn"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "realm-namn för långt"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "översatt kontonamn för långt"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "kunde inte skapa uttag (socket) för Ident-anslutning: %m"
 
-#: libpq/auth.c:1756
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "kunde inte binda till lokal adress \"%s\": %m"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "kunde inte ansluta till Ident-server på adress \"%s\", port %s: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "kunde inte skicka fråga till Ident-server på adress \"%s\", port %s: %m"
 
-#: libpq/auth.c:1807
+#: libpq/auth.c:1808
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "kunde inte ta emot svar från Ident-server på adress \"%s\", port %s: %m"
 
-#: libpq/auth.c:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "ogiltigt formatterat svar från Ident-server: \"%s\""
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "peer-autentisering stöds inte på denna plattform"
 
-#: libpq/auth.c:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "kunde inte hämta peer-referenser: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "kunde inte slå upp lokalt användar-id %ld: %m"
+
+#: libpq/auth.c:1894
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "kunde inte slå upp lokalt användar-id %ld: %s"
+msgid "local user with ID %ld does not exist"
+msgstr "lokal användare med ID %ld existerar inte"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "fel från underliggande PAM-lager: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "ej stödd PAM-konversation: %d/\"%s\""
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "kunde inte skapa PAM-autentiserare: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) misslyckades: %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "pam_set_item(PAM_RHOST) misslyckades: %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) misslyckades: %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate misslyckades: %s"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt misslyckades: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "kunde inte fria PAM-autentiserare: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "kunde inte initiera LDAP: felkod %d"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "kunde inte extrahera domännamn från ldapbasedn"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "LDAP-autentisering kunde inte hitta DNS SRV-poster för \"%s\""
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "Ange LDAP-servernamnet explicit."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "kunde inte initiera LDAP: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "ldaps stöds inte med detta LDAP-bibliotek"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "kunde inte initiera LDAP: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "kunde inte sätta LDAP-protokollversion: %s"
 
-#: libpq/auth.c:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "kunde inte starta LDAP TLS-session: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "LDAP-server inte angiven och ingen ldapbasedn"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-server inte angiven"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "ogiltigt tecken i användarnamn för LDAP-autentisering"
 
-#: libpq/auth.c:2534
+#: libpq/auth.c:2540
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "kunde inte utföra initial LDAP-bindning med ldapbinddn \"%s\" på server \"%s\": %s"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "kunde inte söka i LDAP med filter \"%s\" på server \"%s\": %s"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "LDAP-användare \"%s\" finns inte"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "LDAP-sökning med filter \"%s\" på server \"%s\" returnerade inga poster."
 
-#: libpq/auth.c:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "LDAP-användare \"%s\" är inte unik"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, 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-sökning med filter \"%s\" på server \"%s\" returnerade %d post."
 msgstr[1] "LDAP-sökning med filter \"%s\" på server \"%s\" returnerade %d poster."
 
-#: libpq/auth.c:2606
+#: libpq/auth.c:2612
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "kunde inte hämta dn för första posten som matchar \"%s\" på värd \"%s\": %s"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "LDAP-inloggning misslyckades för användare \"%s\" på värd \"%s\": %s"
 
-#: libpq/auth.c:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "LDAP-diagnostik: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "certifikatautentisering misslyckades för användare \"%s\": klientcertifikatet innehåller inget användarnamn"
 
-#: libpq/auth.c:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "certifikat-autentisering misslyckades för användare \"%s\": kan inte hämta subject DN"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "certifikat-validering (clientcert=verify-full) misslyckades för användare \"%s\": DN matchade inte"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "certifikat-validering (clientcert=verify-full) misslyckades för användare \"%s\": CN matchade inte"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-server inte angiven"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS-hemlighet inte angiven"
 
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "RADIUS-autentisering stöder inte längre lösenord än %d tecken"
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "kunde inte översätta RADIUS-värdnamn \"%s\" till adress: %s"
 
-#: libpq/auth.c:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "kunde inte generera slumpad kodningsvektor"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "kunde inte utföra MD5-kryptering av lösenord: %s"
 
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "kunde inte skapa RADIUS-uttag (socket): %m"
 
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "kunde inte binda lokalt RADIUS-uttag (socket): %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "kan inte skicka RADIUS-paketet: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "timeout vid väntande på RADIUS-svar från %s"
 
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "kunde inte kontrollera status på RADIUS-uttag (socket): %m"
 
-#: libpq/auth.c:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "kunde inte läsa RADIUS-svar: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "RADIUS-svar från %s skickades från fel port: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "RADIUS-svar från %s är för kort: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "RADIUS-svar från %s har felaktig längd: %d (riktig längd %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "RADIUS-svar från %s tillhör en annan förfrågan: %d (skall vara %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "kunde inte utföra MD5-kryptering på mottaget paket: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "RADIUS-svar från %s har inkorrekt MD5-signatur"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "RADIUS-svar från %s har ogiltig kod (%d) för användare \"%s\""
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "ogiltig stort objekt-deskriptor: %d"
@@ -15576,7 +16176,7 @@ msgstr "ogiltig stort objekt-deskriptor: %d"
 msgid "large object descriptor %d was not opened for reading"
 msgstr "stort objekt-deskriptor %d öppnades inte för läsning"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "stort objekt-deskriptor %d öppnades inte för skrivning"
@@ -15591,32 +16191,32 @@ msgstr "lo_lseek-resultat utanför giltigt intervall för stort object-deskripto
 msgid "lo_tell result out of range for large-object descriptor %d"
 msgstr "lo_tell-resultat utanför giltigt intervall för stort object-deskriptor %d"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "kunde inte öppna serverfil \"%s\": %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "kunde inte läsa serverfil \"%s\": %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "kan inte skapa serverfil \"%s\": %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "kunde inte skriva serverfil \"%s\": %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "läsförfrågan för stort objekt är för stort"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "efterfrågad längd kan inte vara negativ"
@@ -15651,819 +16251,837 @@ msgstr "privat nyckelfil \"%s\" har grupp eller världsaccess"
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "Filen måste ha rättigheterna u=rw (0600) eller mindre om den ägs av databasanvändaren eller rättigheterna u=rw,g=r (0640) eller mindre om den ägs av root."
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI-fel vid inpackning"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "utående GSSAPI-meddelande skulle inte använda sekretess"
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "servern försöke skicka för stort GSSAPI-paket (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "för stort GSSAPI-paket skickat av klienten (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-fel vid uppackning"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "inkommande GSSAPI-meddelande använde inte sekretess"
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "för stort GSSAPI-paket skickat av klienten (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "kunde inte acceptera GSSSPI-säkerhetskontext"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-fel vid kontroll av storlek"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "kunde inte skapa SSL-kontext: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "kunde inte ladda serverns certifikatfil \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid "private key file \"%s\" cannot be reloaded because it requires a passphrase"
 msgstr "privat nyckelfil \"%s\" kan inte laddas om eftersom den kräver en lösenordsfras"
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "kunde inte läsa in privata nyckelfilen \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "kontroll av privat nyckel misslyckades: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "\"%s\"-inställning \"%s\" stöds inte av detta bygge"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "kunde inte sätta minimal SSL-protokollversion"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "kunde inte sätta maximal SSL-protokollversion"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "kunde inte sätta SSL-protokollversionsintervall"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "\"%s\" får inte vara högre än \"%s\""
 
-#: libpq/be-secure-openssl.c:307
+#: libpq/be-secure-openssl.c:295
+#, c-format
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr "kunde inte sätta kryptolistan för TLSv1.2 (inga giltiga krypton är tillgängliga)"
+
+#: libpq/be-secure-openssl.c:310
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "kunde inte sätta kryptolistan (inga giltiga krypton är tillgängliga)"
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr "kunde inte sätta kryptolistan för TLSv1.3 (inga giltiga krypton är tillgängliga)"
 
-#: libpq/be-secure-openssl.c:327
+#: libpq/be-secure-openssl.c:331
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "kunde inte ladda root-certifikatfilen \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:376
+#: libpq/be-secure-openssl.c:380
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "kunde inte ladda fil \"%s\" med certifikatåterkallningslista för SSL: %s"
 
-#: libpq/be-secure-openssl.c:384
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr "kunde inte ladda katalog \"%s\" för certifikatåterkallning: %s"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\" or directory \"%s\": %s"
 msgstr "kunde inte ladda fil \"%s\" eller katalog \"%s\" med certifikatåterkallning för SSL: %s"
 
-#: libpq/be-secure-openssl.c:450
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr "kunde inte initiera SSL-uppkoppling: SSL-kontex ej uppsatt"
 
-#: libpq/be-secure-openssl.c:464
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "kunde inte initiera SSL-uppkoppling: %s"
 
-#: libpq/be-secure-openssl.c:472
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "kunde inte sätta SSL-uttag (socket): %s"
 
-#: libpq/be-secure-openssl.c:528
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "kunde inte acceptera SSL-uppkoppling: %m"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "kunde inte starta SSL-anslutning: hittade EOF"
 
-#: libpq/be-secure-openssl.c:573
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "kunde inte acceptera SSL-uppkoppling: %s"
 
-#: libpq/be-secure-openssl.c:577
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid "This may indicate that the client does not support any SSL protocol version between %s and %s."
 msgstr "Detta kan tyda på att servern inte stöder någon SSL-protokolversion mellan %s och %s."
 
-#: libpq/be-secure-openssl.c:594 libpq/be-secure-openssl.c:809
-#: libpq/be-secure-openssl.c:879
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "okänd SSL-felkod: %d"
 
-#: libpq/be-secure-openssl.c:622
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
 msgstr "tog emot anslutningsförfrågan för SSL med oväntat ALPN-protokoll"
 
-#: libpq/be-secure-openssl.c:666
+#: libpq/be-secure-openssl.c:670
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "SSL-certifikatets \"comman name\" innehåller null-värden"
 
-#: libpq/be-secure-openssl.c:712
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "SSL-certifikatets utskiljande namn innehåller null-värden"
 
-#: libpq/be-secure-openssl.c:798 libpq/be-secure-openssl.c:863
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-fel: %s"
 
-#: libpq/be-secure-openssl.c:1038
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "kunde inte öppna DH-parameterfil \"%s\": %m"
 
-#: libpq/be-secure-openssl.c:1050
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "kunde inte ladda DH-parameterfil: %s"
 
-#: libpq/be-secure-openssl.c:1060
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "ogiltiga DH-parametrar: %s"
 
-#: libpq/be-secure-openssl.c:1069
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "ogiltiga DH-parametrar: p är inte ett primtal"
 
-#: libpq/be-secure-openssl.c:1078
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr "ogiltiga DH-parametrar: varken lämplig generator eller säkert primtal"
 
-#: libpq/be-secure-openssl.c:1214
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "Klientcertifikat-autentisering misslyckades vid djupet %d: %s."
 
-#: libpq/be-secure-openssl.c:1251
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid "Failed certificate data (unverified): subject \"%s\", serial number %s, issuer \"%s\"."
 msgstr "Felaktig certifikatdata (ej verifierad): ämne \"%s\", serienummer %s, utställare \"%s\"."
 
-#: libpq/be-secure-openssl.c:1252
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "okänd"
 
-#: libpq/be-secure-openssl.c:1389
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: kunde inte ladda DH-parametrar"
 
-#: libpq/be-secure-openssl.c:1397
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: kunde inte sätta DH-parametrar: %s"
 
-#: libpq/be-secure-openssl.c:1424
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: okänt kurvnamn: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "kunde inte sätta gruppnamn angivna i ssl_groups: %s"
+
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "Inga giltiga grupper hittades"
 
-#: libpq/be-secure-openssl.c:1433
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: kunde inte skapa nyckel"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "Säkerställ att varje gruppnamn är rättstavat och stöds av den installerade versionen av OpenSSL."
 
-#: libpq/be-secure-openssl.c:1461
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "inget SSL-fel rapporterat"
 
-#: libpq/be-secure-openssl.c:1479
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-felkod %lu"
 
-#: libpq/be-secure-openssl.c:1636
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "kunde inte skapa BIO"
 
-#: libpq/be-secure-openssl.c:1646
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "kunde inte hämta NID för ASN1_OBJECT-objekt"
 
-#: libpq/be-secure-openssl.c:1654
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "kunde inte konvertera NID %d till en ASN1_OBJECT-struktur"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "Rollen \"%s\" finns inte."
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "Användaren \"%s\" har inget lösenord satt."
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "Användaren \"%s\" har ett utgånget lösenord."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, c-format
+msgid "encrypted password is too long"
+msgstr "krypterat lösenord är för långt"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "Krypterade lösenord får inte vara längre än %d byte."
+
+#: libpq/crypt.c:183
+#, c-format
+msgid "setting an MD5-encrypted password"
+msgstr "sätter ett MD5-kypterat lösenord"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid "MD5 password support is deprecated and will be removed in a future release of PostgreSQL."
+msgstr "Support för MD5-lösenord är föråldrat och kommer tas bort i en framtida release av PostgreSQL."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid "Refer to the PostgreSQL documentation for details about migrating to another password type."
+msgstr "Se PostgreSQLs dokumentation för detaljer om hur man migrerar till en annan sorts lösenord."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr "Användaren \"%s\" har ett lösenord som inte kan användas med MD5-autentisering."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "Lösenordet matchar inte för användare \"%s\"."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "Lösenordet för användare \"%s\" är på ett okänt format."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "ogiltigt reguljärt uttryck \"%s\": %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "rad %d i konfigurationsfil \"%s\""
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "hoppar över saknad autentiseringsfil \"%s\""
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "kunde inte öppna filen \"%s\": maximalt nästlingsdjup överskridet"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "fel vid uppräkning av nätverksinterface: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "autentiseringsflagga \"%s\" är bara giltig för autentiseringsmetoder %s"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "autentiseringsmetod \"%s\" kräver att argumentet \"%s\" är satt"
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "saknar post vid slutet av raden"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "multipla värden i ident-fält"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "multipla värden angivna för anslutningstyp"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "Ange exakt en anslutningstyp per rad."
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "hostssl-post kan inte matcha då SSL är avslaget"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
 msgstr "Sätt \"ssl = on\" i postgresql.conf."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr "hostssl-post kan inte matcha då SSL inte stöds i detta bygge"
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid "hostgssenc record cannot match because GSSAPI is not supported by this build"
 msgstr "hostgssenc-post kan inte matcha då GSSAPI inte stöds i detta bygge"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "ogiltig anslutningstyp \"%s\""
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "slut-på-rad innan databasspecifikation"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "slut-på-rad innan rollspecifikation"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "slut-på-rad före IP-adressangivelse"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "multipla värden angivna för värdnamn"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "Ange ett adressintervall per rad."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "ogiltig IP-adress \"%s\": %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
 msgstr "får inte ange både värdnamn och CIDR-mask: \"%s\""
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "ogiltig CIDR-mask i adress \"%s\""
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "slut-på-fil innan nätmask-angivelse"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr "Ange adressintervall på CIDR-format eller ange en separat nätmask."
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "multipla värden angivna för nätmask"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "ogiltig IP-mask \"%s\": %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "IP-adress och mask matchar inte varandra"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "slut-på-rad innan autentiseringsmetod"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "multipla värden angivna för autentiseringstyp"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "Ange exakt en autentiseringstyp per rad."
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "ogiltig autentiseringsmetod \"%s\""
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr "ogiltig autentiseringsmetod \"%s\": stöds inte av detta bygge"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "gssapi-autentisering stöds ej på lokala uttag (socket)"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "peer-autentisering stöds bara på logala uttag (socket)"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "cert-autentisering stöds bara för hostssl-anslutningar"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "autentiseringsflagga et på formatet namn=värde: %s"
 
-#: libpq/hba.c:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"
-msgstr "kan inte använda ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter eller ldapurl tillsammans med ldapprefix"
+msgid "cannot mix options for simple bind and search+bind modes"
+msgstr "kan inte blanda flaggor för lägen \"simple bind\" och \"search+bind\""
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, c-format
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
 msgstr "autentiseringsmetoden \"ldap\" kräver att argumenten \"ldapbasedn\", \"ldapprefix\" eller \"ldapsuffix\" är satta"
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "kan inte använda ldapsearchattribute tillsammans med ldapsearchfilter"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "listan med RADIUS-servrar kan inte vara tom"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "listan med RADIUS-hemligheter kan inte vara tom"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid "the number of RADIUS secrets (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "antalet RADIUS-hemligheter (%d) måste vara 1 eller samma som antalet RADIUS-servrar (%d)"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid "the number of RADIUS ports (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "antalet RADIUS-portar (%d) måste vara 1 eller samma som antalet RADIUS-servrar (%d)"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid "the number of RADIUS identifiers (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "antalet RADIUS-identifierare (%d) måste vara 1 eller samma som antalet RADIUS-servrar (%d)"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi och cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s kan inte användas ihop med %s"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert och oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert kan bara konfigureras för \"hostssl\"-rader"
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
 msgstr "clientcert tillåter bara \"verify-full\" när man använder \"cert\"-autentisering"
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "ogiltigt värde för clientcert: \"%s\""
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname kan bara konfigureras för \"hostssl\"-rader"
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "ogiltigt värde för clientname: \"%s\""
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "kunde inte parsa LDAP-URL \"%s\": %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "ej stöd för LDAP-URL-schema: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "LDAP-URL:er stöds inte på denna platform"
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "ogiltigt ldap-schema-värde: \"%s\""
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "ogiltigt LDAP-portnummer \"%s\""
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi och sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "kunde inte parsa RADIUS-serverlista \"%s\""
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "kunde inte parsa RADIUS-portlista \"%s\""
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "ogiltigt RADIUS-portnummer: \"%s\""
 
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "kunde inte parsa RADIUS-hemlighetlista: \"%s\""
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "kunde inte parsa RADIUS-identifierarlista: \"%s\""
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "okänd autentiseringsflaggnamn: \"%s\""
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "konfigurationsfil \"%s\" innehåller inga poster"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "matchning av reguljärt uttryck för \"%s\" misslyckades: %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
 msgstr "reguljärt uttryck \"%s\" har inga deluttryck som krävs för bakåtreferens i \"%s\""
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "givet användarnamn (%s) och autentiserat användarnamn (%s) matchar inte"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr "ingen träff i användarmappning \"%s\" för användare \"%s\" autentiserad som \"%s\""
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "%s(%s) misslyckades: %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "kunde inte sätta uttag (socket) till ickeblockerande läge: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Sökväg till unixdomänuttag \"%s\" är för lång (maximalt %d byte)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "kunde inte översätta värdnamn \"%s\", service \"%s\" till adress: %s"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "kunde inte översätta service \"%s\" till adress: %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "kunde inte binda till alla efterfrågade adresser: MAXLISTEN (%d) överskriden"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "ej igenkänd adressfamilj %d"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "kunde inte skapa %s-uttag för adress \"%s\": %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "%s(%s) misslyckades för %s-adress \"%s\": %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "kunde inte binda %s-adress \"%s\": %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "Kör en annan postmaster redan på port %d?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr "Kör en annan postmaster redan på port %d? Om inte, vänta några sekunder och försök igen."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "kunde inte lyssna på %s-adress \"%s\": %m"
 
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "lyssnar på Unix-uttag (socket) \"%s\""
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "lyssnar på %s-adress \"%s\", port %d"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "gruppen \"%s\" existerar inte"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "kunde inte sätta gruppen på filen \"%s\": %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "kunde inte sätta rättigheter på filen \"%s\": %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "kunde inte acceptera ny uppkoppling: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "det finns ingen klientanslutning"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "kunde inte ta emot data från klient: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4533
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "stänger anslutning då protokollsynkroniseringen tappades"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "oväntat EOF inom meddelandelängdord"
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "ogiltig meddelandelängd"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "inkomplett meddelande från klient"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "kunde inte skicka data till klient: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) misslyckades: felkod %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "sätta idle-tid på keepalive stöds inte"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) stöds inte"
@@ -16474,7 +17092,7 @@ msgid "no data left in message"
 msgstr "ingen data kvar i meddelandet"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:873 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -16490,12 +17108,12 @@ msgstr "ogiltig sträng i meddelande"
 msgid "invalid message format"
 msgstr "ogiltigt meddelandeformat"
 
-#: main/main.c:236
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup misslyckades: %d\n"
 
-#: main/main.c:324
+#: main/main.c:386
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -16504,7 +17122,7 @@ msgstr ""
 "%s är PostgreSQL-servern.\n"
 "\n"
 
-#: main/main.c:325
+#: main/main.c:387
 #, c-format
 msgid ""
 "Usage:\n"
@@ -16515,107 +17133,107 @@ msgstr ""
 "  %s [FLAGGA]...\n"
 "\n"
 
-#: main/main.c:326
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: main/main.c:327
+#: main/main.c:389
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        antalet delade buffertar\n"
 
-#: main/main.c:328
+#: main/main.c:390
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NAMN=VÄRDE      sätt körparameter\n"
 
-#: main/main.c:329
+#: main/main.c:391
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NAMN            skriv ut värde av runtime-parameter, avsluta sen\n"
 
-#: main/main.c:330
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             debug-nivå\n"
 
-#: main/main.c:331
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR         databaskatalog\n"
 
-#: main/main.c:332
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 använd europeiskt datumformat för indata (DMY)\n"
 
-#: main/main.c:333
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 slå av fsync\n"
 
-#: main/main.c:334
+#: main/main.c:396
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h VÄRDNAMN        värdnamn eller IP-adress att lyssna på\n"
 
-#: main/main.c:335
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr "  -i                 tillåt TCP/IP-uppkopplingar (obsolet)\n"
 
-#: main/main.c:336
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k KATALOG         plats för unix-domän-uttag (socket)\n"
 
-#: main/main.c:338
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 tillåt SSL-anslutningar\n"
 
-#: main/main.c:340
+#: main/main.c:402
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-ANSLUT      maximalt antal tillåtna anslutningar\n"
 
-#: main/main.c:341
+#: main/main.c:403
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            portnummer att lyssna på\n"
 
-#: main/main.c:342
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 visa statistik efter varje fråga\n"
 
-#: main/main.c:343
+#: main/main.c:405
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S WORK-MEM        ställ in mängden minne för sorteringar (i kB)\n"
 
-#: main/main.c:344
+#: main/main.c:406
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      visa versionsinformation, avsluta sedan\n"
 
-#: main/main.c:345
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NAMN=VÄRDE       sätt parameter (som används under körning)\n"
 
-#: main/main.c:346
+#: main/main.c:408
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  beskriv konfigurationsparametrar, avsluta sedan\n"
 
-#: main/main.c:347
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         visa denna hjälp, avsluta sedan\n"
 
-#: main/main.c:349
+#: main/main.c:411
 #, c-format
 msgid ""
 "\n"
@@ -16624,37 +17242,37 @@ msgstr ""
 "\n"
 "Utvecklarflaggor:\n"
 
-#: main/main.c:350
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h förbjud användning av vissa plan-typer\n"
 
-#: main/main.c:351
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 tillåt strukturändring av systemtabeller\n"
 
-#: main/main.c:352
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 stäng av systemindex\n"
 
-#: main/main.c:353
+#: main/main.c:415
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        visa tidtagning efter varje fråga\n"
 
-#: main/main.c:354
+#: main/main.c:416
 #, c-format
 msgid "  -T                 send SIGABRT to all backend processes if one dies\n"
 msgstr "  -T                 skicka SIGABRT till alla serverprocesser om en dör\n"
 
-#: main/main.c:355
+#: main/main.c:417
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr "  -W NUM             vänta NUM sekunder för att tillåta att en debugger kopplas in\n"
 
-#: main/main.c:357
+#: main/main.c:419
 #, c-format
 msgid ""
 "\n"
@@ -16663,37 +17281,37 @@ msgstr ""
 "\n"
 "Flaggor för enanvändarläge:\n"
 
-#: main/main.c:358
+#: main/main.c:420
 #, c-format
 msgid "  --single           selects single-user mode (must be first argument)\n"
 msgstr "  --single           väljer enanvändarläge (måste vara första argumentet)\n"
 
-#: main/main.c:359
+#: main/main.c:421
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  DBNAMN             databasnamn (standard är användarnamnet)\n"
 
-#: main/main.c:360
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             överskugga debug-nivå\n"
 
-#: main/main.c:361
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 skriv ut sats före körning\n"
 
-#: main/main.c:362
+#: main/main.c:424
 #, c-format
 msgid "  -j                 do not use newline as interactive query delimiter\n"
 msgstr "  -j                 använd inte nyrad som en interaktiv frågeavskiljare\n"
 
-#: main/main.c:363 main/main.c:369
+#: main/main.c:425 main/main.c:431
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r FILNAMN         skicka stdout och stderr till angiven fil\n"
 
-#: main/main.c:365
+#: main/main.c:427
 #, c-format
 msgid ""
 "\n"
@@ -16702,22 +17320,22 @@ msgstr ""
 "\n"
 "Flaggor för bootstrap-läge:\n"
 
-#: main/main.c:366
+#: main/main.c:428
 #, c-format
 msgid "  --boot             selects bootstrapping mode (must be first argument)\n"
 msgstr "  --boot             väljer bootstrap-läge (måste vara första argumentet)\n"
 
-#: main/main.c:367
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr "  --check            väljer kontrolläge (måste vara första argumentet)\n"
 
-#: main/main.c:368
+#: main/main.c:430
 #, c-format
 msgid "  DBNAME             database name (mandatory argument in bootstrapping mode)\n"
 msgstr "  DBNAMN             databasnamn (krävs i bootstrap-läge)\n"
 
-#: main/main.c:371
+#: main/main.c:433
 #, c-format
 msgid ""
 "\n"
@@ -16733,12 +17351,12 @@ msgstr ""
 "\n"
 "Rapportera buggar till <%s>.\n"
 
-#: main/main.c:375
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: main/main.c:386
+#: main/main.c:448
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -16751,12 +17369,12 @@ msgstr ""
 "ev. säkehetsproblem. Se dokumentationen för mer information om hur man\n"
 "startar servern på rätt sätt.\n"
 
-#: main/main.c:403
+#: main/main.c:465
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: riktig och effektiv användar-ID måste matcha varandra\n"
 
-#: main/main.c:410
+#: main/main.c:472
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -16781,15 +17399,15 @@ msgstr "utökningsbar nodtyp \"%s\" finns redan"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "ExtensibleNodeMethods \"%s\" har inte registerats"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "relationen \"%s\" har ingen composite-typ"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2604
-#: parser/parse_coerce.c:2742 parser/parse_coerce.c:2789
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2130 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "kunde inte hitta array-typ för datatyp %s"
@@ -16804,769 +17422,800 @@ msgstr "portal \"%s\" med parametrar: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "ej namngiven portal med parametrar: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN stöds bara med villkor som är merge-joinbara eller hash-joinbara"
 
-#: optimizer/plan/createplan.c:7175 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1680
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "kan inte utföra MERGE på relation \"%s\""
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "%s kan inte appliceras på den nullbara sidan av en outer join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1380 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074
+#: parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s tillåts inte med UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:2121 optimizer/plan/planner.c:4108
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "kunde inte implementera GROUP BY"
 
-#: optimizer/plan/planner.c:2122 optimizer/plan/planner.c:4109
-#: optimizer/plan/planner.c:4790 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145
+#: optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid "Some of the datatypes only support hashing, while others only support sorting."
 msgstr "Några av datatyperna stöder bara hash:ning medan andra bara stöder sortering."
 
-#: optimizer/plan/planner.c:4789
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "kunde inte implementera DISTINCT"
 
-#: optimizer/plan/planner.c:6134
+#: optimizer/plan/planner.c:6322
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "kunde inte implementera fönster-PARTITION BY"
 
-#: optimizer/plan/planner.c:6135
+#: optimizer/plan/planner.c:6323
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Fönsterpartitioneringskolumner måsta ha en sorterbar datatyp."
 
-#: optimizer/plan/planner.c:6139
+#: optimizer/plan/planner.c:6327
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "kunde inte implementera fönster-ORDER BY"
 
-#: optimizer/plan/planner.c:6140
+#: optimizer/plan/planner.c:6328
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Fönsterordningskolumner måste ha en sorterbar datatyp."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "kunde inte implementera rekursiv UNION"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "Alla kolumndatatyper måsta vara hash-bara."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "kunde inte implementera %s"
 
-#: optimizer/util/clauses.c:4963
+#: optimizer/util/appendinfo.c:165
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "attribut \"%s\" i relation \"%s\" matchar inte förälderns typ"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr "attribut \"%s\" i relation \"%s\" matchar inte föräldens jämförelser (collation)"
+
+#: optimizer/util/clauses.c:4965
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "SQL-funktion \"%s\" vid inline:ing"
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "kan inte accessa temporära eller ologgade relationer under återställning"
 
-#: optimizer/util/plancat.c:768
+#: optimizer/util/plancat.c:776
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr "inferens av unikt index för hel rad stöds inte"
 
-#: optimizer/util/plancat.c:785
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "villkor för ON CONFLICT-klausul har inget associerat index"
 
-#: optimizer/util/plancat.c:835
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE stöds inte med uteslutningsvillkor"
 
-#: optimizer/util/plancat.c:945
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "finns inget unik eller uteslutningsvillkor som matchar ON CONFLICT-specifikationen"
 
-#: parser/analyze.c:824 parser/analyze.c:1550
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VÄRDE-listor måste alla ha samma längd"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT har fler uttryck än målkolumner"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT har fler målkolumner än uttryck"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1093
 #, c-format
 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 "Imatningskällan är ett raduttryck som innehåller samma antal kolumner som INSERT:en förväntade sig. Glömde du använda extra parenteser?"
 
-#: parser/analyze.c:1357 parser/analyze.c:1744
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO tillåts inte här"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s kan inte appliceras på VÄRDEN"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "ogiltig UNION/INTERSECT/EXCEPT ORDER BY-klausul"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr "Bara kolumnnamn i resultatet kan användas, inte uttryck eller funktioner."
 
-#: parser/analyze.c:1913
+#: parser/analyze.c:1957
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Lägg till uttrycket/funktionen till varje SELECT eller flytta UNION:en in i en FROM-klausul."
 
-#: parser/analyze.c:2019
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO tillåts bara i den första SELECT i UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:2091
+#: parser/analyze.c:2136
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "UNION/INTERSECT/EXCEPT-medlemssats kan inte referera till andra relationer på samma frågenivå"
 
-#: parser/analyze.c:2178
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "varje %s-fråga måste ha samma antal kolumner"
 
-#: parser/analyze.c:2535
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "målkolumner för SET kan inte kvalifiiceras med ett relationsnamn."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2668 parser/analyze.c:2678
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s kan inte anges flera gånger"
+
+#: parser/analyze.c:2690 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "tabellnamn \"%s\" angivet mer än en gång"
+
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING måste ha minst en kolumn"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
 msgstr[0] "tilldelningskälla returnerade %d kolumn"
 msgstr[1] "tilldelningskälla returnerade %d kolumner"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "variabeln \"%s\" har typ %s men uttrycket har typ %s"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "kan inte ange både %s och %s"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3055
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr "DECLARE CURSOR får inte innehålla datamodifierande satser i WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2914
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s stöds inte"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3066
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Hållbara markörer måste vara READ ONLY."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2925
+#: parser/analyze.c:3074
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s stöds inte"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2936
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s är inte giltig"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Okänsliga markörer måste vara READ ONLY."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3182
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "materialiserade vyer får inte innehålla datamodifierande satser i WITH"
 
-#: parser/analyze.c:3043
+#: parser/analyze.c:3192
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "materialiserade vyer får inte använda temporära tabeller eller vyer"
 
-#: parser/analyze.c:3053
+#: parser/analyze.c:3202
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "materialiserade vyer kan inte defineras med bundna parametrar"
 
-#: parser/analyze.c:3065
+#: parser/analyze.c:3214
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "materialiserad vyer kan inte vara ologgade"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3254
+#: parser/analyze.c:3403
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s tillåts inte med DISTINCT-klausul"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3261
+#: parser/analyze.c:3410
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s tillåts inte med GROUP BY-klausul"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3268
+#: parser/analyze.c:3417
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s tillåts inte med HAVING-klausul"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3275
+#: parser/analyze.c:3424
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s tillåts inte med aggregatfunktioner"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3282
+#: parser/analyze.c:3431
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s tillåts inte med fönsterfunktioner"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3289
+#: parser/analyze.c:3438
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr "%s tillåts inte med mängdreturnerande funktioner i mållistan"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3388
+#: parser/analyze.c:3537
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s: måste ange okvalificerade relationsnamn"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3452
+#: parser/analyze.c:3601
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s kan inte appliceras på en join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3461
+#: parser/analyze.c:3610
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s kan inte appliceras på en funktion"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3470
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s kan inte appliceras på tabellfunktion"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3637
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s kan inte appliceras på en WITH-fråga"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3497
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s kan inte appliceras på en namngiven tupellagring"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3666
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "relationen \"%s\" i %s-klausul hittades inte i FROM-klausul"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
-msgstr "kunde inte identifiera en jämförelseoperator för typ %s"
+msgstr "kunde inte hitta en ordningsoperator för typ %s"
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Aggregat med DISTINCT måste kunna sortera sina indata."
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING måste ha färre än 32 argument"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "aggregatfunktioner tillåts inte i JOIN-villkor"
 
-#: parser/parse_agg.c:375
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "gruppoperationer tillåts inte i JOIN-villkor"
 
-#: parser/parse_agg.c:385
+#: parser/parse_agg.c:394
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "aggregatfunktioner tillåts inte i FROM-klausul på sin egen frågenivå"
 
-#: parser/parse_agg.c:387
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "gruppoperationer tillåts inte i FROM-klausul på sin egen frågenivå"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "aggregatfunktioner tillåts inte i funktioner i FROM"
 
-#: parser/parse_agg.c:394
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "gruppoperationer tillåts inte i funktioner i FROM"
 
-#: parser/parse_agg.c:402
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "aggregatfunktioner tillåts inte i policyuttryck"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "gruppoperationer tillåts inte i policyuttryck"
 
-#: parser/parse_agg.c:421
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "aggregatfunktioner tillåts inte i fönster-RANGE"
 
-#: parser/parse_agg.c:423
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "grupperingsoperationer tillåts inte i fönster-RANGE"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "aggregatfunktioner tillåts inte i fönster-RADER"
 
-#: parser/parse_agg.c:430
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "grupperingsfunktioner tillåts inte i fönster-RADER"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "aggregatfunktioner tillåts inte i fönster-GROUPS"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "grupperingsfunktioner tillåts inte i fönster-GROUPS"
 
-#: parser/parse_agg.c:450
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "aggregatfunktioner tillåts inte i MERGE WHEN-villkor"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "gruppoperationer tillåts inte i MERGE WHEN-villkor"
 
-#: parser/parse_agg.c:479
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "aggregatfunktioner tillåts inte i check-villkor"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "gruppoperationer tillåts inte i check-villkor"
 
-#: parser/parse_agg.c:488
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "aggregatfunktioner tillåts inte i DEFAULT-uttryck"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "grupperingsoperationer tillåts inte i DEFAULT-uttryck"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "aggregatfunktioner tillåts inte i indexuttryck"
 
-#: parser/parse_agg.c:497
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "gruppoperationer tillåts inte i indexuttryck"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "aggregatfunktionsanrop tillåts inte i indexpredikat"
 
-#: parser/parse_agg.c:504
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "gruppoperationer tillåts inte i indexpredikat"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "aggregatfunktioner tillåts inte i statistikuttryck"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "gruppoperationer tillåts inte i statistikuttryck"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "aggregatfunktioner tillåts inte i transform-uttryck"
 
-#: parser/parse_agg.c:518
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "gruppoperationer tillåts inte i transforme-uttryck"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "aggregatfunktioner tillåts inte i EXECUTE-parametrar"
 
-#: parser/parse_agg.c:525
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "gruppoperationer tillåts inte i EXECUTE-parametrar"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "aggregatfunktioner tillåts inte i WHEN-villkor"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "gruppoperationer tillåts inte i WHEN-villkor"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "aggregatfunktioner tillåts inte i partitionsgräns"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "gruppoperationer tillåts inte i partitionsgräns"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "aggregatfunktioner tillåts inte i partitionsnyckeluttryck"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "gruppoperationer tillåts inte i partitionsnyckeluttryck"
 
-#: parser/parse_agg.c:552
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "aggregatfunktioner tillåts inte i kolumngenereringsuttryck"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "gruppoperationer tillåts inte i kolumngenereringsuttryck"
 
-#: parser/parse_agg.c:560
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "aggregatfunktioner tillåts inte i CALL-argument"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "gruppoperationer tillåts inte i CALL-argument"
 
-#: parser/parse_agg.c:568
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "aggregatfunktioner tillåts inte i COPY FROM WHERE-villkor"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "gruppoperationer tillåts inte i COPY FROM WHERE-villkor"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:597 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "aggregatfunktioner tillåts inte i %s"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:600
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "gruppoperationer tillåts inte i %s"
 
-#: parser/parse_agg.c:701
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "aggregat på yttre nivå kan inte använda en nästlad CTE"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "CTE \"%s\" är under aggregatets semantiska nivå."
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr "yttre aggregat kan inte innehålla inre variabel i sitt direkta argument"
 
-#: parser/parse_agg.c:779
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "aggregatfunktionsanrop kan inte innehålla mängdreturnerande funktionsanrop"
 
-#: parser/parse_agg.c:780 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:814 parser/parse_expr.c:1772 parser/parse_expr.c:2265
 #: parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr "Du kanske kan flytta den mängdreturnerande funktionen in i en LATERAL FROM-konstruktion."
 
-#: parser/parse_agg.c:785
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "aggregatfunktionsanrop kan inte innehålla fönsterfunktionanrop"
 
-#: parser/parse_agg.c:864
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "fönsterfunktioner tillåts inte i JOIN-villkor"
 
-#: parser/parse_agg.c:871
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "fönsterfunktioner tillåts inte i funktioner i FROM"
 
-#: parser/parse_agg.c:877
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "fönsterfunktioner tillåts inte i policy-uttryck"
 
-#: parser/parse_agg.c:890
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "fönsterfunktioner tillåts inte i fönsterdefinitioner"
 
-#: parser/parse_agg.c:901
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "fönsterfunktioner tillåts inte i MERGE WHEN-villkor"
 
-#: parser/parse_agg.c:926
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "fönsterfunktioner tillåts inte i check-villkor"
 
-#: parser/parse_agg.c:930
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "fönsterfunktioner tillåts inte i DEFAULT-uttryck"
 
-#: parser/parse_agg.c:933
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "fönsterfunktioner tillåts inte i indexuttryck"
 
-#: parser/parse_agg.c:936
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "fönsterfunktioner tillåts inte i statistikuttryck"
 
-#: parser/parse_agg.c:939
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "fönsterfunktioner tillåts inte i indexpredikat"
 
-#: parser/parse_agg.c:942
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "fönsterfunktioner tillåts inte i transform-uttrycket"
 
-#: parser/parse_agg.c:945
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "fönsterfunktioner tillåts inte i EXECUTE-parametrar"
 
-#: parser/parse_agg.c:948
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "fönsterfunktioner tillåts inte i WHEN-villkor"
 
-#: parser/parse_agg.c:951
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "fönsterfunktioner tillåts inte i partitiongräns"
 
-#: parser/parse_agg.c:954
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "fönsterfunktioner tillåts inte i partitionsnyckeluttryck"
 
-#: parser/parse_agg.c:957
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "fönsterfunktioner tillåts inte i CALL-argument"
 
-#: parser/parse_agg.c:960
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "fönsterfunktioner tillåts inte i COPY FROM WHERE-villkor"
 
-#: parser/parse_agg.c:963
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "fönsterfunktioner tillåts inte i kolumngenereringsuttryck"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:986 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "fönsterfunktioner tillåts inte i %s"
 
-#: parser/parse_agg.c:1020 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "fönster \"%s\" finns inte"
 
-#: parser/parse_agg.c:1108
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "för många grupperingsmängder (maximalt 4096)"
 
-#: parser/parse_agg.c:1248
+#: parser/parse_agg.c:1329
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "aggregatfunktioner tillåts inte i en rekursiv frågas rekursiva term"
 
-#: parser/parse_agg.c:1441
+#: parser/parse_agg.c:1552
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr "kolumn \"%s.%s\" måste stå med i GROUP BY-klausulen eller användas i en aggregatfunktion"
 
-#: parser/parse_agg.c:1444
+#: parser/parse_agg.c:1555
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "Direkta argument till en sorterad-mängd-aggregat får bara använda grupperade kolumner."
 
-#: parser/parse_agg.c:1449
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "underfråga använder ogrupperad kolumn \"%s.%s\" från yttre fråga"
 
-#: parser/parse_agg.c:1613
+#: parser/parse_agg.c:1725
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr "argument till GROUPING måste vare grupputtryck på den tillhörande frågenivån"
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "relationen \"%s\" kan inte vara målet för en modifierande sats"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr "mängdreturnerande funktioner måste vara på toppnivå i FROM"
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr "multipla kolumndefinitionslistor tillåts inte i samma funktion"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid "ROWS FROM() with multiple functions cannot have a column definition list"
 msgstr "ROWS FROM() med multipla funktioner kan inte ha en kolumndefinitionslista"
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid "Put a separate column definition list for each function inside ROWS FROM()."
 msgstr "Lägg till en separat kolumndefinitionslista för varje funktion inne i ROWS FROM()."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr "UNNEST() med multipla argument kan inte ha en kolumndefinitionslista"
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid "Use separate UNNEST() calls inside ROWS FROM(), and attach a column definition list to each one."
 msgstr "Använd separata UNNEST()-anrop inne i ROWS FROM() och koppla en kolumndefinitionslista till varje."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr "WITH ORDINALITY kan inte användas tillsammans med en kolumndefinitionslista"
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "Placera kolumndefinitionslistan inne i ROWS FROM()."
 
-#: parser/parse_clause.c:762 parser/parse_jsontable.c:295
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "bara en FOR ORDINALITY-kolumn tillåts"
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "kolumnnamn \"%s\" är inte unikt"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "namespace-namn \"%s\" är inte unikt"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "bara ett standard-namespace tillåts"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "tabellsamplingsmetod \"%s\" existerar inte"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
 msgstr[0] "tabellsamplingsmetod %s kräver %d argument, inte %d"
 msgstr[1] "tabellsamplingsmetod %s kräver %d argument, inte %d"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "tabellsamplingsmetod %s stöder inte REPEATABLE"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr "TABLESAMPLE-klausul kan bara appliceras på tabeller och materialiserade vyer"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "kolumnnamn \"%s\" angivet mer än en gång i USING-klausul"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "gemensamt kolumnnamn \"%s\" finns mer än en gång i vänstra tabellen"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr "kolumn \"%s\" angiven i USING-klausul finns inte i den vänstra tabellen"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "gemensamt kolumnnamn \"%s\" finns mer än en gång i högra tabellen"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr "kolumn \"%s\" angiven i USING-klausul finns inte i den högra tabellen"
@@ -17698,191 +18347,191 @@ msgstr "ON CONFLICT stöds inte på tabell \"%s\" som används som katalogtabell
 #: parser/parse_clause.c:3462
 #, c-format
 msgid "operator %s is not a valid ordering operator"
-msgstr "operator %s är inte en giltig sorteringsoperator"
+msgstr "operator %s är inte en giltig ordningsoperator"
 
 #: parser/parse_clause.c:3464
 #, c-format
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
-msgstr "Sorteringsoperationer måste vara \"<\"- eller \">\"-medlemmar i btree-operatorfamiljer."
+msgstr "Ordningspperationer måste vara \"<\"- eller \">\"-medlemmar i btree-operatorfamiljer."
 
-#: parser/parse_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
 msgstr "RANGE med offset PRECEDING/FOLLOWING stöds inte för kolumntyp %s"
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s and offset type %s"
 msgstr "RANGE med offset PRECEDING/FOLLOWING stöd inte av kolumntyp %s och offset-typ %s"
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "Typomvandla offset-värdet till lämplig typ."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for column type %s and offset type %s"
 msgstr "RANGE med offset PRECEDING/FOLLOWING har multipla tolkingar för kolumntyp %s och offset-typ %s"
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "Typomvandla offset-värdet till exakt den önskade typen."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3405
-#: parser/parse_expr.c:3634 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2164 parser/parse_expr.c:2784 parser/parse_expr.c:3435
+#: parser/parse_expr.c:3664 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "kan inte omvandla typ %s till %s"
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "Indata har för få kolumner"
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Kan inte typomvandla typ %s till %s i kolumn %d."
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1122
 #, c-format
 msgid "Input has too many columns."
 msgstr "Indata har för många kolumner"
 
 #. translator: first %s is name of a SQL construct, eg WHERE
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "argumentet till %s måste vara av typ %s, inte av typ %s"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "argumentet till %s får inte returnera en mängd"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1420
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "%s typer %s och %s matchar inte"
 
-#: parser/parse_coerce.c:1536
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "argumenttyperna %s och %s matchar inte"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1588
+#: parser/parse_coerce.c:1586
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s kan inte konvertera typ %s till %s"
 
-#: parser/parse_coerce.c:2191 parser/parse_coerce.c:2211
-#: parser/parse_coerce.c:2231 parser/parse_coerce.c:2252
-#: parser/parse_coerce.c:2307 parser/parse_coerce.c:2341
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "argument deklarerade \"%s\" är inte alla likadana"
 
-#: parser/parse_coerce.c:2286 parser/parse_coerce.c:2399
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "argumentet deklarerad %s är inte en array utan typ %s"
 
-#: parser/parse_coerce.c:2319 parser/parse_coerce.c:2469
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "argumentet deklarerad %s är inte en intervalltyp utan typ %s"
 
-#: parser/parse_coerce.c:2353 parser/parse_coerce.c:2433
-#: parser/parse_coerce.c:2566 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "argumentet deklarerad %s är inte en multirange-typ utan typ %s"
 
-#: parser/parse_coerce.c:2390
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "kan inte bestämma elementtypen av \"anyarray\"-argument"
 
-#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
-#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2552
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr "argument deklarerad %s är inte konsistent med argument deklarerad %s"
 
-#: parser/parse_coerce.c:2511
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr "kunde inte bestämma en polymorf typ då indata har typ %s"
 
-#: parser/parse_coerce.c:2525
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "typen som matchar anynonarray är en array-typ: %s"
 
-#: parser/parse_coerce.c:2535
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "typen som matchar anyenum är inte en enum-typ: %s"
 
-#: parser/parse_coerce.c:2596
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr "argument till en anycompatible-familj kan inte typomvandlas till en vanlig typ"
 
-#: parser/parse_coerce.c:2614 parser/parse_coerce.c:2635
-#: parser/parse_coerce.c:2685 parser/parse_coerce.c:2690
-#: parser/parse_coerce.c:2754 parser/parse_coerce.c:2766
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr "kunde inte bestämma en polymorf typ %s då indata har typ %s"
 
-#: parser/parse_coerce.c:2624
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr "anycompatiblerange-typ %s matchar inte anycompatiblerange-typ %s"
 
-#: parser/parse_coerce.c:2645
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr "anycompatiblemultirange-typ %s matchar inte anycompatible-typ %s"
 
-#: parser/parse_coerce.c:2659
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr "typen som matchar anycompatiblenonarray är en array-typ: %s"
 
-#: parser/parse_coerce.c:2894
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid "A result of type %s requires at least one input of type anyrange or anymultirange."
 msgstr "Ett resultat av typen %s kräver minst en indata med typen anyrange eller anymultirange."
 
-#: parser/parse_coerce.c:2911
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatiblerange or anycompatiblemultirange."
 msgstr "Ett resultat av typ %s kräver minst en indata av typen anycompatiblerange eller anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2923
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid "A result of type %s requires at least one input of type anyelement, anyarray, anynonarray, anyenum, anyrange, or anymultirange."
 msgstr "Ett resultat av typ %s kräver minst en indata av typen anyelement, anyarray, anynonarray, anyenum, anyrange eller anymultirange."
 
-#: parser/parse_coerce.c:2935
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange, or anycompatiblemultirange."
 msgstr "Ett resultat av typ %s kräver minst en indata av typ anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange eller anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2965
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr "Ett resultat av typ internal kräver minst en indata av typ internal."
 
@@ -17928,479 +18577,479 @@ msgstr "rekursiv referens till fråga \"%s\" får inte finnas i en INTERSECT"
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "rekursiv referens till fråga \"%s\" får inte finnas i en EXCEPT"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "WITH-frågenamn \"%s\" angivet mer än en gång"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "kunde inte hitta en olikhetsoperator för typ %s"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid "WITH clause containing a data-modifying statement must be at the top level"
 msgstr "WITH-klausul som innehåller en datamodifierande sats måste vara på toppnivå"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, c-format
 msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
 msgstr "rekursiv fråga \"%s\" kolumn %d har typ %s i den ickerekursiva termen med typ %s totalt sett"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Typomvandla utdatan för den ickerekursiva termen till korrekt typ."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, c-format
 msgid "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term but collation \"%s\" overall"
 msgstr "rekursiv fråga \"%s\" kolumn %d har jämförelse (collation) \"%s\" i en icke-rekursiv term men jämförelse \"%s\" totalt sett"
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr "Använd en COLLATE-klausul för att sätta jämförelse för den icke-rekursiva termen."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "WITH-fråga är inte rekursiv"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr "med en SEARCH- eller CYCLE-klausul så måste vänstersidan av en UNION vara en SELECT"
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr "med en SEARCH- eller CYCLE-klausul så måste högersidan av en UNION vara en SELECT"
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "sökkolumn \"%s\" finns inte med i kolumnlistan för WITH-fråga"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "sökkolumn \"%s\" angiven mer än en gång"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid "search sequence column name \"%s\" already used in WITH query column list"
 msgstr "namn på söksekvensenskolumn \"%s\" används redan i kolumnlistan till WITH-fråga"
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "cycle-kolumn \"%s\" finns inte i kolumnlistan i WITH-fråga"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "cycle-kolumn \"%s\" angiven mer än en gång"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr "mark-kolumnnamn \"%s\" för cycle används redan i kolumnlistan i WITH-fråga"
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr "path-kolumnnamn \"%s\" för cycle används redan i kolumnlistan i WITH-fråga"
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "mark-kolumnnamn och path-kolumnnamn i cycle är båda samma"
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr "namn på söksekvenskolumn och namn på mark-kolumn i cycle är båda samma"
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr "namn på söksekvenskolumn och namn på path-kolumn i cycle är båda samma"
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr "WITH-fråga \"%s\" har %d kolumner tillgängliga men %d kolumner angivna"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "ömsesidig rekursion mellan WITH-poster är inte implementerat"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr "rekursiv fråga \"%s\" får inte innehålla datamodifierande satser"
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, c-format
 msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
 msgstr "rekursiv fråga \"%s\" är inte på formen icke-rekursiv-term UNION [ALL] rekursiv-term"
 
-#: parser/parse_cte.c:911
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY i en rekursiv fråga är inte implementerat"
 
-#: parser/parse_cte.c:917
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET i en rekursiv fråga är inte implementerat"
 
-#: parser/parse_cte.c:923
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT i en rekursiv fråga är inte implementerat"
 
-#: parser/parse_cte.c:929
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE i en rekursiv fråga är inte implementerat"
 
-#: parser/parse_cte.c:1008
+#: parser/parse_cte.c:1074
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "rekursiv referens till fråga \"%s\" får inte finnas med mer än en gång"
 
-#: parser/parse_expr.c:313
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "DEFAULT tillåts inte i detta kontext"
 
-#: parser/parse_expr.c:406 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "kolumnen %s.%s finns inte"
 
-#: parser/parse_expr.c:418
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "kolumn \"%s\" fanns inte i datatypen %s"
 
-#: parser/parse_expr.c:424
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "kunde inte hitta kolumnen \"%s\" i record-datatyp"
 
-#: parser/parse_expr.c:430
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "kolumnotation .%s använd på typ %s som inte är en sammanslagen typ"
 
-#: parser/parse_expr.c:461 parser/parse_target.c:732
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "radexpansion via \"*\" stöds inte här"
 
-#: parser/parse_expr.c:584
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "kan inte använda kolumnreferenser i DEFAULT-uttryck"
 
-#: parser/parse_expr.c:587
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "kan inte använda kolumnreferenser i partitionsgränsuttryck"
 
-#: parser/parse_expr.c:846 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:845 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "kolumnreferens \"%s\" är tvetydig"
 
-#: parser/parse_expr.c:902 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "det finns ingen parameter $%d"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1103 parser/parse_expr.c:3065
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3095
 #, c-format
 msgid "%s requires = operator to yield boolean"
 msgstr "%s kräver att operatorn = returnerar boolean"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3072
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3102
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s får inte returnera en mängd"
 
-#: parser/parse_expr.c:1395
+#: parser/parse_expr.c:1405
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
 msgstr "MERGE_ACTION() kan bara användas i RETURNING-listan för ett MERGE-kommando"
 
-#: parser/parse_expr.c:1519 parser/parse_expr.c:1551
+#: parser/parse_expr.c:1529 parser/parse_expr.c:1561
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "antalet kolumner matchar inte antalet värden"
 
-#: parser/parse_expr.c:1565
+#: parser/parse_expr.c:1575
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr "källa till en multiple-kolumn-UPDATE-post måste vara en sub-SELECT eller ROW()-uttryck"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1770 parser/parse_expr.c:2263 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "mängdreturnerande funktioner tillåts inte i %s"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1834
 msgid "cannot use subquery in check constraint"
 msgstr "kan inte använda subfråga i check-villkor"
 
-#: parser/parse_expr.c:1828
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "kan inte använda underfråga i DEFAULT-uttryck"
 
-#: parser/parse_expr.c:1831
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in index expression"
 msgstr "kan inte använda subfråga i indexuttryck"
 
-#: parser/parse_expr.c:1834
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in index predicate"
 msgstr "kan inte använda subfråga i indexpredikat"
 
-#: parser/parse_expr.c:1837
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in statistics expression"
 msgstr "kan inte använda underfråga i statistikuttryck"
 
-#: parser/parse_expr.c:1840
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in transform expression"
 msgstr "kan inte använda underfråga i transformeringsuttrycket"
 
-#: parser/parse_expr.c:1843
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "kan inte använda subfråga i EXECUTE-parameter"
 
-#: parser/parse_expr.c:1846
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "kan inte använda subfråga i triggerns WHEN-villkor"
 
-#: parser/parse_expr.c:1849
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in partition bound"
 msgstr "kan inte använda underfråga i partitionsgräns"
 
-#: parser/parse_expr.c:1852
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in partition key expression"
 msgstr "kan inte använda underfråga i partitionsnyckeluttryck"
 
-#: parser/parse_expr.c:1855
+#: parser/parse_expr.c:1865
 msgid "cannot use subquery in CALL argument"
 msgstr "kan inte använda subfråga i CALL-argument"
 
-#: parser/parse_expr.c:1858
+#: parser/parse_expr.c:1868
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "kan inte använda subfråga i COPY FROM WHERE-villkor"
 
-#: parser/parse_expr.c:1861
+#: parser/parse_expr.c:1871
 msgid "cannot use subquery in column generation expression"
 msgstr "kan inte använda subfråga i kolumngenereringsuttryck"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3764
+#: parser/parse_expr.c:1924 parser/parse_expr.c:3794
 #, c-format
 msgid "subquery must return only one column"
 msgstr "underfråga kan bara returnera en kolumn"
 
-#: parser/parse_expr.c:1985
+#: parser/parse_expr.c:1995
 #, c-format
 msgid "subquery has too many columns"
 msgstr "underfråga har för många kolumner"
 
-#: parser/parse_expr.c:1990
+#: parser/parse_expr.c:2000
 #, c-format
 msgid "subquery has too few columns"
 msgstr "underfråga har för få kolumner"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2104
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "kan inte bestämma typen av en tom array"
 
-#: parser/parse_expr.c:2087
+#: parser/parse_expr.c:2105
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "Typomvandla explicit till den önskade typen, till exempel ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:2101
+#: parser/parse_expr.c:2119
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "kunde inte hitta elementtyp för datatyp %s"
 
-#: parser/parse_expr.c:2184
+#: parser/parse_expr.c:2204
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW-uttryck kan ha som mest %d poster"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2409
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "onamnat XML-attributvärde måste vara en kolumnreferens"
 
-#: parser/parse_expr.c:2390
+#: parser/parse_expr.c:2410
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "onamnat XML-elementvärde måste vara en kolumnreferens"
 
-#: parser/parse_expr.c:2405
+#: parser/parse_expr.c:2425
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "XML-attributnamn \"%s\" finns med mer än en gång"
 
-#: parser/parse_expr.c:2513
+#: parser/parse_expr.c:2533
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "kan inte typomvandla XMLSERIALIZE-resultat till %s"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2857 parser/parse_expr.c:3053
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "olika antal element i raduttryck"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2867
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "kan inte jämföra rader med längden noll"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2892
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "operator för radjämförelse måste resultera i typen boolean, inte %s"
 
-#: parser/parse_expr.c:2869
+#: parser/parse_expr.c:2899
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "radjämförelseoperator får inte returnera en mängd"
 
-#: parser/parse_expr.c:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2958 parser/parse_expr.c:2999
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "kunde inte lista ut tolkning av radjämförelseoperator %s"
 
-#: parser/parse_expr.c:2930
+#: parser/parse_expr.c:2960
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "Radjämförelseoperatorer måste vara associerade med btreee-operatorfamiljer."
 
-#: parser/parse_expr.c:2971
+#: parser/parse_expr.c:3001
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Det finns flera lika sannolika kandidater."
 
-#: parser/parse_expr.c:3306
+#: parser/parse_expr.c:3336
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "JSON ENCODING tillåts bara för input-typen bytea"
 
-#: parser/parse_expr.c:3370
+#: parser/parse_expr.c:3400
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr "kan inte använda icke-strängtyper med implicit FORMAT JSON-klausul"
 
-#: parser/parse_expr.c:3371
+#: parser/parse_expr.c:3401
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr "kan inte använda icke-strängtyper med explicit FORMAT JSON-klausul"
 
-#: parser/parse_expr.c:3460
+#: parser/parse_expr.c:3490
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "kan inte använda JSON-formatet för utddata som inte är strängar"
 
-#: parser/parse_expr.c:3473
+#: parser/parse_expr.c:3503
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "kan inte sätta JSON-kodning för utdata-typer som inte är bytea"
 
-#: parser/parse_expr.c:3478
+#: parser/parse_expr.c:3508
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "ej stödd JSON-kodning"
 
-#: parser/parse_expr.c:3479
+#: parser/parse_expr.c:3509
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "Enbart JSON-kodningen UTF8 stöds."
 
-#: parser/parse_expr.c:3516
+#: parser/parse_expr.c:3546
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "returtyp SETOF stöds inte för SQL/JSON-funktioner"
 
-#: parser/parse_expr.c:3521
+#: parser/parse_expr.c:3551
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
 msgstr "pseudo-typer stöds inte som resultat för SQL/JSON-funktioner"
 
-#: parser/parse_expr.c:3849 parser/parse_func.c:866
+#: parser/parse_expr.c:3879 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "aggregat-ORDER BY är inte implementerat för fönsterfunktioner"
 
-#: parser/parse_expr.c:4072
+#: parser/parse_expr.c:4102
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr "kan inte använda JSON FORMAT ENCODING för indatatyper som inte är bytea"
 
-#: parser/parse_expr.c:4092
+#: parser/parse_expr.c:4122
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "kan inte använda typen %s i ett IS JSON-predikat"
 
-#: parser/parse_expr.c:4118 parser/parse_expr.c:4239
+#: parser/parse_expr.c:4148 parser/parse_expr.c:4269
 #, c-format
 msgid "cannot use type %s in RETURNING clause of %s"
 msgstr "kan inte använda typen %s i RETURNING-klausul för %s"
 
-#: parser/parse_expr.c:4120
+#: parser/parse_expr.c:4150
 #, c-format
 msgid "Try returning json or jsonb."
 msgstr "Försök returnera json eller jsonb."
 
-#: parser/parse_expr.c:4168
+#: parser/parse_expr.c:4198
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr "kan inte använda icke-strängtyper med WITH UNIQUE KEYS-klausul"
 
-#: parser/parse_expr.c:4242
+#: parser/parse_expr.c:4272
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "Försök returnera en strängtyp eller bytea."
 
-#: parser/parse_expr.c:4307
+#: parser/parse_expr.c:4340
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
 msgstr "kan inte ange FORMAT JSON i RETURNING-klausul för %s()"
 
-#: parser/parse_expr.c:4320
+#: parser/parse_expr.c:4353
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
 msgstr "SQL/JSON QUOTES får inte anges tillsammans med WITH WRAPPER"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4334 parser/parse_expr.c:4363 parser/parse_expr.c:4394
-#: parser/parse_expr.c:4420 parser/parse_expr.c:4446
-#: parser/parse_jsontable.c:94
+#: parser/parse_expr.c:4367 parser/parse_expr.c:4396 parser/parse_expr.c:4427
+#: parser/parse_expr.c:4453 parser/parse_expr.c:4479
+#: parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
 msgstr "ogiltig %s-angivelse"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4337 parser/parse_expr.c:4366
+#: parser/parse_expr.c:4370 parser/parse_expr.c:4399
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
 msgstr "Bara uttrycken ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT eller DEFAULT tillåts i %s för %s."
@@ -18408,68 +19057,73 @@ msgstr "Bara uttrycken ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT eller DEFAULT till
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4344 parser/parse_expr.c:4373 parser/parse_expr.c:4402
-#: parser/parse_expr.c:4430 parser/parse_expr.c:4456
+#: parser/parse_expr.c:4377 parser/parse_expr.c:4406 parser/parse_expr.c:4435
+#: parser/parse_expr.c:4463 parser/parse_expr.c:4489
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
 msgstr "ogiltig %s-angivelse för kolumn \"%s\""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4347 parser/parse_expr.c:4376
+#: parser/parse_expr.c:4380 parser/parse_expr.c:4409
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
 msgstr "Bara uttrycken ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT eller DEFAULT tillåts i %s för formatterade kolumner."
 
-#: parser/parse_expr.c:4395
+#: parser/parse_expr.c:4428
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
 msgstr "Bara ERROR, TRUE, FALSE eller UNKNOWN tillåts i %s för %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4405
+#: parser/parse_expr.c:4438
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
 msgstr "Bara ERROR, TRUE, FALSE eller UNKNOWN tillåts i %s för EXISTS-kolumner."
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4423 parser/parse_expr.c:4449
+#: parser/parse_expr.c:4456 parser/parse_expr.c:4482
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
 msgstr "Bara uttrycken ERROR, NULL eller DEFAULT tillåts i %s för %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4433 parser/parse_expr.c:4459
+#: parser/parse_expr.c:4466 parser/parse_expr.c:4492
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
 msgstr "Bara uttrycken ERROR, NULL eller DEFAULT tillåts i %s för skalära kolumner."
 
-#: parser/parse_expr.c:4489
+#: parser/parse_expr.c:4526
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
 msgstr "Uttryck för JSON-sökväg måste vara av typ %s, inte av typ %s"
 
-#: parser/parse_expr.c:4707
+#: parser/parse_expr.c:4766
 #, c-format
 msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
 msgstr "kan bara ange en konstant, en icke-aggregat-funktion eller ett operatoruttryck för DEFAULT"
 
-#: parser/parse_expr.c:4712
+#: parser/parse_expr.c:4771
 #, c-format
 msgid "DEFAULT expression must not contain column references"
 msgstr "DEFAULT-uttryck får inte innehålla kolumnreferenser"
 
-#: parser/parse_expr.c:4717
+#: parser/parse_expr.c:4776
 #, c-format
 msgid "DEFAULT expression must not return a set"
 msgstr "DEFAULT-uttryck får inte returnera en mängd"
 
-#: parser/parse_expr.c:4793 parser/parse_expr.c:4802
+#: parser/parse_expr.c:4791
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr "sorteringsordning för DEFAULT-uttryck krockar med RETURNING-klausul"
+
+#: parser/parse_expr.c:4870 parser/parse_expr.c:4879
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
 msgstr "kan inte omvandla uttryck av typ %s till %s"
 
-#: parser/parse_expr.c:4796
+#: parser/parse_expr.c:4873
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
 msgstr "Du måste explicit omvandla uttrycket till typen %s."
@@ -18808,12 +19462,12 @@ msgstr "mängdreturnerande funktioner tillåts inte i COPY FROM WHERE-villkor"
 msgid "set-returning functions are not allowed in column generation expressions"
 msgstr "mängdreturnerande funktioner tillåts inte i kolumngenereringsuttryck"
 
-#: parser/parse_jsontable.c:95
+#: parser/parse_jsontable.c:93
 #, c-format
 msgid "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
 msgstr "Enbart EMPTY [ ARRAY ] eller ERROR tillåts på toppnivå i ON ERROR-klausul."
 
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
 msgstr "duplicerad JSON_TABLE-kolumn eller sökvägsnamn: %s"
@@ -18893,229 +19547,224 @@ msgstr "op ANY/ALL (array) kräver att operatorn returnerar en boolean"
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (array) kräver att operatorn inte returnerar en mängd"
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "inkonsistenta typer härledda för parameter $%d"
 
-#: parser/parse_param.c:309 tcop/postgres.c:744
+#: parser/parse_param.c:310 tcop/postgres.c:734
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "kunde inte lista ut datatypen för parameter $%d"
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "tabellreferens \"%s\" är tvetydig"
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "tabellreferens %u är tvetydig"
 
-#: parser/parse_relation.c:465
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "tabellnamn \"%s\" angivet mer än en gång"
-
-#: parser/parse_relation.c:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "ogiltig referens till FROM-klausulpost för tabell \"%s\""
 
-#: parser/parse_relation.c:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Det finns en post för tabell \"%s\" men den kan inte refereras till från denna del av frågan."
 
-#: parser/parse_relation.c:500
+#: parser/parse_relation.c:508
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "JOIN-typen måste vara INNER eller LEFT för att fungera med LATERAL."
 
-#: parser/parse_relation.c:703
+#: parser/parse_relation.c:711
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "systemkolumn \"%s\" som refereras till i check-villkor är ogiltigt"
 
-#: parser/parse_relation.c:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr "kan inte använda systemkolumn \"%s\" i kolumngenereringsuttryck"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "kan inte använda systemkolumn \"%s\" i MERGE WHEN-villkor"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "tabell \"%s\" har %d kolumner tillgängliga men %d kolumner angivna"
 
-#: parser/parse_relation.c:1445
+#: parser/parse_relation.c:1462
 #, c-format
 msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Det finns en WITH-post med namn \"%s\" men den kan inte refereras till från denna del av frågan."
 
-#: parser/parse_relation.c:1447
+#: parser/parse_relation.c:1464
 #, c-format
 msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr "Använd WITH RECURSIVE eller ändra ordning på WITH-posterna för att ta bort framåt-referenser."
 
-#: parser/parse_relation.c:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid "a column definition list is redundant for a function with OUT parameters"
 msgstr "en kolumndefinitionslista är redundant för en funktion med OUT-parametrar"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid "a column definition list is redundant for a function returning a named composite type"
 msgstr "en kolumndefinitionslista är redundant för en funktion som returnerar en namngiven composite-typ"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, c-format
 msgid "a column definition list is only allowed for functions returning \"record\""
 msgstr "en kolumndefinitionslista tillåts bara för funktioner som returnerar \"record\""
 
-#: parser/parse_relation.c:1857
+#: parser/parse_relation.c:1874
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "en kolumndefinitionslista krävs för funktioner som returnerar \"record\""
 
-#: parser/parse_relation.c:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "kolumndefinitionslistor kan ha som mest %d poster"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr "funktion \"%s\" i FROM har en icke stödd returtyp %s"
 
-#: parser/parse_relation.c:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "funktioner i FROM kan returnera som mest %d kolumner"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "funktionen %s har %d kolumner tillgängliga men %d kolumner angivna"
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr "VALUES-lista \"%s\" har %d kolumner tillgängliga men %d kolumner angivna"
 
-#: parser/parse_relation.c:2242
+#: parser/parse_relation.c:2259
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "joins kan ha som mest %d kolumner"
 
-#: parser/parse_relation.c:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr "join-uttryck \"%s\" har %d kolumner tillgängliga men %d kolumner angivna"
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "WITH-fråga \"%s\" har ingen RETURNING-klausul"
 
-#: parser/parse_relation.c:3635
+#: parser/parse_relation.c:3741
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Kanske tänkte du referera till tabellaliaset \"%s\"."
 
-#: parser/parse_relation.c:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr "För att referera till den tabellen så måste denna subfråga markeras som LATERAL."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "saknar FROM-klausulpost för tabell \"%s\""
 
-#: parser/parse_relation.c:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid "There are columns named \"%s\", but they are in tables that cannot be referenced from this part of the query."
 msgstr "Det finns kolumner med namn \"%s\", men de är i tabeller som inte kan refereras till från denna del av frågan."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "Försök med ett tabell-prefixat namn."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Det finns en kolumn med namn \"%s\" i tabell \"%s\" men den kan inte refereras till från denna del av frågan."
 
-#: parser/parse_relation.c:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr "För att referera till den kolumnen så måste denna subfråga markeras som LATERAL."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr "För att referera till den kolumnen så måste du använda ett tabell-prefixat namn."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Kanske tänkte du referera till kolumnen \"%s.%s\"."
 
-#: parser/parse_relation.c:3742
+#: parser/parse_relation.c:3848
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
 msgstr "Kanske tänkte du referera till kolumnen \"%s.%s\" eller kolumnen \"%s.%s\"."
 
-#: parser/parse_target.c:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "kan inte skriva till systemkolumn \"%s\""
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "kan inte sätta ett array-element till DEFAULT"
 
-#: parser/parse_target.c:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "kan inte sätta ett underfält till DEFAULT"
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "kolumn \"%s\" har typ %s men uttrycket är av typ %s"
 
-#: parser/parse_target.c:779
+#: parser/parse_target.c:782
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
 msgstr "kan inte tilldela till fält \"%s\" i kolumn \"%s\" då dess typ %s inte är en composit-typ"
 
-#: parser/parse_target.c:788
+#: parser/parse_target.c:791
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
 msgstr "kan inte tilldela till fält \"%s\" i kolumn \"%s\" då det inte finns någon sådan kolumn i datatypen %s"
 
-#: parser/parse_target.c:877
+#: parser/parse_target.c:880
 #, c-format
 msgid "subscripted assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "tilldelning med array-index till \"%s\" kräver typ %s men uttrycket har typ %s"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "underfält \"%s\" har typ %s men uttrycket har typ %s"
 
-#: parser/parse_target.c:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * utan tabeller angivna är inte giltigt"
@@ -19135,8 +19784,8 @@ msgstr "dålig %%TYPE-referens (för många punktade namn): %s"
 msgid "type reference %s converted to %s"
 msgstr "typreferens %s konverterad till %s"
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "typ \"%s\" är bara ett skal"
@@ -19156,325 +19805,355 @@ msgstr "typmodifierare måste vare enkla konstanter eller identifierare"
 msgid "invalid type name \"%s\""
 msgstr "ogiltigt typnamn \"%s\""
 
-#: parser/parse_utilcmd.c:263
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "kan inte skapa partitionerad tabell som barnarv"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:504
 #, c-format
 msgid "cannot set logged status of a temporary sequence"
 msgstr "kan inte sätta loggningsstatus för en temporär sekvens"
 
-#: parser/parse_utilcmd.c:611
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "array med serial är inte implementerat"
 
-#: parser/parse_utilcmd.c:690 parser/parse_utilcmd.c:702
-#: parser/parse_utilcmd.c:761
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "motstridiga NULL/NOT NULL-villkor för kolumnen \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:714
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr "icke-null-villkor för partitionerade tabeller kan inte vara NO INHERIT"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid "conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr "motstridiga NO INHERIT-deklarationer för icke-null-villkor på kolumnen \"%s\""
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "multipla default-värden angivna för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:731
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr "identitetskolumner stöds inte på typade tabeller"
 
-#: parser/parse_utilcmd.c:735
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "identitetskolumner stöds inte för partitioner"
 
-#: parser/parse_utilcmd.c:744
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr "multipla identitetspecifikationer för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:774
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr "genererade kolumner stöds inte på typade tabeller"
 
-#: parser/parse_utilcmd.c:778
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr "multipla genereringsklausuler angivna för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:796 parser/parse_utilcmd.c:911
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "primärnyckelvillkor stöds inte på främmande tabeller"
 
-#: parser/parse_utilcmd.c:805 parser/parse_utilcmd.c:921
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "unika villkor stöds inte på främmande tabeller"
 
-#: parser/parse_utilcmd.c:850
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr "både default och identity angiven för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:858
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid "both default and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "både default och genereringsuttryck angiven för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:866
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid "both identity and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "både identity och genereringsuttryck angiven för kolumn \"%s\" i tabell \"%s\""
 
-#: parser/parse_utilcmd.c:931
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "uteslutningsvillkor stöds inte på främmande tabeller"
 
-#: parser/parse_utilcmd.c:996
-#, c-format
-msgid "LIKE is not supported for creating foreign tables"
-msgstr "LIKE stöds inte för att skapa främmande tabeller"
-
-#: parser/parse_utilcmd.c:1009
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "relationen \"%s\" är ogiltig i LIKE-klausul"
 
-#: parser/parse_utilcmd.c:1736 parser/parse_utilcmd.c:1844
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "Index \"%s\" innehåller en hela-raden-referens."
 
-#: parser/parse_utilcmd.c:2242
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "kan inte använda ett existerande index i CREATE TABLE"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "index \"%s\" är redan associerad med ett villkor"
 
-#: parser/parse_utilcmd.c:2283
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" är inte ett unikt index"
 
-#: parser/parse_utilcmd.c:2284 parser/parse_utilcmd.c:2291
-#: parser/parse_utilcmd.c:2298 parser/parse_utilcmd.c:2375
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473
+#: parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "Kan inte skapa en primärnyckel eller ett unikt villkor med hjälp av ett sådant index."
 
-#: parser/parse_utilcmd.c:2290
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "index \"%s\" innehåller uttryck"
 
-#: parser/parse_utilcmd.c:2297
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" är ett partiellt index"
 
-#: parser/parse_utilcmd.c:2309
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" är ett \"deferrable\" index"
 
-#: parser/parse_utilcmd.c:2310
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr "Kan inte skapa ett icke-\"deferrable\" integritetsvillkor från ett \"deferrable\" index."
 
-#: parser/parse_utilcmd.c:2374
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "index \"%s\" kolumn nummer %d har ingen standard för sorteringsbeteende"
 
-#: parser/parse_utilcmd.c:2531
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "kolumn \"%s\" finns med två gånger i primära nyckel-villkoret"
 
-#: parser/parse_utilcmd.c:2537
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "kolumn \"%s\" finns med två gånger i unique-villkoret"
 
-#: parser/parse_utilcmd.c:2871
+#: parser/parse_utilcmd.c:2798
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr "kolumn \"%s\" i WITHOUT OVERLAPS är inte av typen range eller multirange"
+
+#: parser/parse_utilcmd.c:2826
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr "villkor som använder WITHOUT OVERLAPS kräver minst två kolumner"
+
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr "indexuttryck och predikat kan bara referera till tabellen som indexeras"
 
-#: parser/parse_utilcmd.c:2943
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "statistikuttryck kan bara referera till tabellen som är refererad"
 
-#: parser/parse_utilcmd.c:2986
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "regler på materialiserade vyer stöds inte"
 
-#: parser/parse_utilcmd.c:3046
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "WHERE-villkor i regel kan inte innehålla referenser till andra relationer"
 
-#: parser/parse_utilcmd.c:3118
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "regler med WHERE-villkor kan bara innehålla SELECT-, INSERT-, UPDATE- eller DELETE-handlingar"
 
-#: parser/parse_utilcmd.c:3136 parser/parse_utilcmd.c:3237
-#: rewrite/rewriteHandler.c:544 rewrite/rewriteManip.c:1096
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489
+#: rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "UNION-/INTERSECT-/EXCEPT-satser med villkor är inte implementerat"
 
-#: parser/parse_utilcmd.c:3154
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON SELECT-regel kan inte använda OLD"
 
-#: parser/parse_utilcmd.c:3158
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON SELECT-regel kan inte använda NEW"
 
-#: parser/parse_utilcmd.c:3167
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON INSERT-regel kan inte använda OLD"
 
-#: parser/parse_utilcmd.c:3173
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON DELETE-regel kan inte använda NEW"
 
-#: parser/parse_utilcmd.c:3201
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "kan inte referera till OLD i WITH-fråga"
 
-#: parser/parse_utilcmd.c:3208
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "kan inte referera till NEW i WITH-fråga"
 
-#: parser/parse_utilcmd.c:3664
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "felplacerad DEFERRABLE-klausul"
 
-#: parser/parse_utilcmd.c:3669 parser/parse_utilcmd.c:3684
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "multipla DEFERRABLE/NOT DEFERRABLE-klausuler tillåts inte"
 
-#: parser/parse_utilcmd.c:3679
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "felplacerad NOT DEFERRABLE-klausul"
 
-#: parser/parse_utilcmd.c:3700
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "felplacerad INITIALLY DEFERRED-klausul"
 
-#: parser/parse_utilcmd.c:3705 parser/parse_utilcmd.c:3731
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "multipla INITIALLY IMMEDIATE/DEFERRED-klausuler tillåts inte"
 
-#: parser/parse_utilcmd.c:3726
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "felplacerad klausul INITIALLY IMMEDIATE"
 
-#: parser/parse_utilcmd.c:3919
+#: parser/parse_utilcmd.c:3997
 #, c-format
-msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
-msgstr "CREATE anger ett schema (%s) som skiljer sig från det som skapas (%s)"
+msgid "misplaced ENFORCED clause"
+msgstr "felplacerad ENFORCED-klausul"
 
-#: parser/parse_utilcmd.c:3954
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
 #, c-format
-msgid "\"%s\" is not a partitioned table"
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "multipla ENFORCED/NOT ENFORCED-klausuler tillåts inte"
+
+#: parser/parse_utilcmd.c:4014
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "felplacerad NOT ENFORCED-klausul"
+
+#: parser/parse_utilcmd.c:4212
+#, c-format
+msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
+msgstr "CREATE anger ett schema (%s) som skiljer sig från det som skapas (%s)"
+
+#: parser/parse_utilcmd.c:4247
+#, c-format
+msgid "\"%s\" is not a partitioned table"
 msgstr "\"%s\" är inte en partitionerad tabell"
 
-#: parser/parse_utilcmd.c:3961
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "tabell \"%s\" är inte partitionerad"
 
-#: parser/parse_utilcmd.c:3968
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "index \"%s\" är inte partitionerad"
 
-#: parser/parse_utilcmd.c:4008
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "en hash-partitionerad tabell får inte ha en standardpartition"
 
-#: parser/parse_utilcmd.c:4025
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "ogiltig gränsangivelse för hash-partition"
 
-#: parser/parse_utilcmd.c:4031 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
 msgstr "modulo för hash-partition vara ett heltalsvärde större än noll"
 
-#: parser/parse_utilcmd.c:4038 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "rest för hash-partition måste vara lägre än modulo"
 
-#: parser/parse_utilcmd.c:4051
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "ogiltig gränsangivelse för listpartition"
 
-#: parser/parse_utilcmd.c:4104
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "ogiltig gränsangivelse för range-partition"
 
-#: parser/parse_utilcmd.c:4110
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "FROM måste ge exakt ett värde per partitionerande kolumn"
 
-#: parser/parse_utilcmd.c:4114
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "TO måste ge exakt ett värde per partitionerande kolumn"
 
-#: parser/parse_utilcmd.c:4228
+#: parser/parse_utilcmd.c:4523
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "kan inte ange NULL i range-gräns"
 
-#: parser/parse_utilcmd.c:4277
+#: parser/parse_utilcmd.c:4571
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "varje gräns efter MAXVALUE måste också vara MAXVALUE"
 
-#: parser/parse_utilcmd.c:4284
+#: parser/parse_utilcmd.c:4578
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "varje gräns efter MINVALUE måste också vara MINVALUE"
 
-#: parser/parse_utilcmd.c:4327
+#: parser/parse_utilcmd.c:4621
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "angivet värde kan inte typomvandlas till typ %s för kolumn \"%s\""
@@ -19487,12 +20166,12 @@ msgstr "UESCAPE måste följas av en enkel stränglitteral"
 msgid "invalid Unicode escape character"
 msgstr "ogiltigt Unicode-escapetecken"
 
-#: parser/parser.c:347 scan.l:1393
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "ogiltigt Unicode-escapevärde"
 
-#: parser/parser.c:494 scan.l:716 utils/adt/varlena.c:6640
+#: parser/parser.c:494 scan.l:702 utils/adt/varlena.c:6853
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "ogiltig Unicode-escapesekvens"
@@ -19502,8 +20181,8 @@ msgstr "ogiltig Unicode-escapesekvens"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Unicode-escapesekvenser måste vara \\XXXX eller \\+XXXXXX."
 
-#: parser/parser.c:523 scan.l:677 scan.l:693 scan.l:709
-#: utils/adt/varlena.c:6665
+#: parser/parser.c:523 scan.l:663 scan.l:679 scan.l:695
+#: utils/adt/varlena.c:6878
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "ogiltigt Unicode-surrogatpar"
@@ -19580,7 +20259,7 @@ msgid "column %d of the partition key has type \"%s\", but supplied value is of
 msgstr "kolumn %d i partitioneringsnyckeln har typ \"%s\" men använt värde har typ \"%s\""
 
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:329 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "kunde inte göra stat() på datakatalog \"%s\": %m"
@@ -19647,34 +20326,34 @@ msgstr "stora sidor stöds inte på denna plattform"
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
 msgstr "stora sidor stöds inte vid nuvarande inställning av \"shared_memory_type\""
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1401
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "redan existerande delat minnesblock (nyckel %lu, ID %lu) används fortfarande"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1403
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr "Stäng ner gamla serverprocesser som hör ihop med datakatalogen \"%s\"."
 
-#: port/sysv_sema.c:126
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "kan inte skapa semafor: %m"
 
-#: port/sysv_sema.c:127
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "Misslyckade systemanropet var semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:131
+#: port/sysv_sema.c:140
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
 "The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
 msgstr "Detta fel betyder *inte* att disken blivit full. Detta fel kommer när systemgränsen för maximalt antal semaforvektorer (SEMMNI) överskridits eller när systemets globala maximum för semaforer (SEMMNS) överskridits. Du behöver öka respektive kernel-parameter. Alternativt kan du minska PostgreSQL:s användning av semaforer genom att dra ner på parametern \"max_connections\". PostgreSQL:s dokumentation innehåller mer information om hur du konfigurerar systemet för PostgreSQL."
 
-#: port/sysv_sema.c:161
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Du kan behöva öka kärnans SEMVMX-värde till minst %d.  Se PostgreSQL:s dokumentation för mer information."
@@ -19799,382 +20478,402 @@ msgstr "Misslyckat systemanrop var DuplicateHandle."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Misslyckat systemanrop var MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "autovacuum-arbetaren tog för lång tid på sig att starta; avbruten"
 
-#: postmaster/autovacuum.c:2203
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "autovacuum: slänger övergiven temptabell \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2439
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "automatisk vacuum av tabell \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2442
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "automatisk analys av tabell \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2636
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "processar arbetspost för relation \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:3254
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum har inte startats på grund av en felkonfigurering"
 
-#: postmaster/autovacuum.c:3255
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Slå på flaggan \"track_counts\"."
 
+#: postmaster/autovacuum.c:3471
+#, c-format
+msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
+msgstr "\"autovacuum_max_workers\" (%d) skall vara mindre än eller lika med \"autovacuum_worker_slots\" (%d)"
+
+#: postmaster/autovacuum.c:3473
+#, c-format
+msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
+msgstr "Servern kommer bara start upp till \"autovacuum_worker_slots\" (%d) autovacuum-arbetare i taget."
+
 #: postmaster/bgworker.c:260
 #, c-format
-msgid "inconsistent background worker state (max_worker_processes=%d, total_slots=%d)"
-msgstr "inkonsistent tillstånd i bakgrundsarbetare (max_worker_processes=%d, total_slots=%d)"
+msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
+msgstr "inkonsistent tillstånd i bakgrundsarbetare (\"max_worker_processes\"=%d, total_slots=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr "bakgrundsarbetare \"%s\": bakgrundsarbetare utan access till delat minne stöds inte"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "bakgrundsarbetare \"%s\" kan inte få databasaccess om den startar när postmaster startar"
 
-#: postmaster/bgworker.c:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "bakgrundsarbetare \"%s\": ogiltigt omstartsintervall"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "bakgrundsarbetare \"%s\": parallella arbetare kan inte konfigureras för omstart"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3312
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "terminerar bakgrundsarbetare \"%s\" pga administratörskommando"
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, c-format
+msgid "database connection requirement not indicated during registration"
+msgstr "krav på databasanslutning fanns inte med vid registering"
+
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "ogiltigt processläge i bakgrundsarbetare"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
 msgstr "bakgrundsarbetare \"%s\": måste vara registrerad i \"shared_preload_libraries\""
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "bakgrundsarbetare \"%s\": bara dynamiska bakgrundsarbetare kan be om notifiering"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "för många bakgrundsarbetare"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, 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] "Upp till %d bakgrundsarbetare kan registreras med nuvarande inställning."
 msgstr[1] "Upp till %d bakgrundsarbetare kan registreras med nuvarande inställning."
 
-#: postmaster/bgworker.c:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
 msgstr "Överväg att öka konfigurationsparametern \"%s\"."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr[0] "checkpoint:s sker för ofta (%d sekund emellan)"
 msgstr[1] "checkpoint:s sker för ofta (%d sekunder emellan)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "checkpoint-behgäran misslyckades"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "Se senaste meddelanden i serverloggen för mer information."
 
-#: postmaster/launch_backend.c:381
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "kunde inte köra serverprocess \"%s\": %m"
 
-#: postmaster/launch_backend.c:434
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr "kunde inte skapa fil-mapping för backend-parametrar: felkod %lu"
 
-#: postmaster/launch_backend.c:442
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr "kunde inte mappa minne för backend-parametrar: felkod %lu"
 
-#: postmaster/launch_backend.c:459
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "subprocessens kommando är för långt"
 
-#: postmaster/launch_backend.c:477
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "Anrop till CreateProcess() misslyckades: %m (felkod %lu)"
 
-#: postmaster/launch_backend.c:504
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr "kunde inte avmappa vy för backend:ens parameterfil: felkod %lu"
 
-#: postmaster/launch_backend.c:508
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr "kunde inte stänga \"handle\" till backend:ens parameterfil: felkod %lu"
 
-#: postmaster/launch_backend.c:530
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr "ger upp efter för många försök att reservera delat minne"
 
-#: postmaster/launch_backend.c:531
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "Detta kan orsakas av ASLR eller antivirusprogram."
 
-#: postmaster/launch_backend.c:834
+#: postmaster/launch_backend.c:854
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr "kunde inte duplicera uttag (socket) %d för att använda i backend: felkod %d"
 
-#: postmaster/launch_backend.c:866
+#: postmaster/launch_backend.c:886
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "kunde inte skapa ärvt uttag (socket): felkod %d\n"
 
-#: postmaster/launch_backend.c:895
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
 msgstr "kunde inte öppna bakändans variabelfil \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:901
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
 msgstr "kunde inte läsa från bakändans variabelfil \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:912
+#: postmaster/launch_backend.c:932
 #, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
 msgstr "kunde inte uppstartsdata från bakändans variabelfil \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:924
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
 msgstr "kunde inte ta bort fil \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:940
+#: postmaster/launch_backend.c:960
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "kunde inte mappa in vy för bakgrundsvariabler: felkod %lu\n"
 
-#: postmaster/launch_backend.c:959
+#: postmaster/launch_backend.c:979
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "kunde inte avmappa vy för bakgrundsvariabler: felkod %lu\n"
 
-#: postmaster/launch_backend.c:966
+#: postmaster/launch_backend.c:986
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "kunde inte stänga \"handle\" till backend:ens parametervariabler: felkod %lu\n"
 
-#: postmaster/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
 msgstr "\"archive_mode\" är påslagen, men ändå är arkivering inte konfigurerad"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "tog bort övergiven arkivstatusfil \"%s\": %m"
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid "removal of orphan archive status file \"%s\" failed too many times, will try again later"
 msgstr "borttagning av övergiven arkivstatusfil \"%s\" misslyckades för många gånger, kommer försöka igen senare"
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr "arkivering av write-ahead-logg-fil \"%s\" misslyckades för många gånger, kommer försöka igen senare"
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
 msgstr "både \"archive_command\" och \"archive_library\" är satt"
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
 msgstr "Bara en av \"archive_command\" och \"archive_library\" får sättas."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr "startar om arkiveringsprocess då värdet på \"archive_library\" har ändrats"
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "arkiveringsmoduler måste definiera symbolen %s"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "arkiveringsmoduler måste registrera en arkiverings-callback"
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:678
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: ogiltigt argument till flagga -f: \"%s\"\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:751
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: ogiltigt argument till flagga -t: \"%s\"\n"
 
-#: postmaster/postmaster.c:757
+#: postmaster/postmaster.c:774
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: ogiltigt argument: \"%s\"\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:842
 #, c-format
 msgid "%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" (%d) must be less than \"max_connections\" (%d)\n"
 msgstr "%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" (%d) måste vara mindre än \"max_connections\" (%d)\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:850
 #, c-format
 msgid "WAL archival cannot be enabled when \"wal_level\" is \"minimal\""
 msgstr "WAL-arkivering kan inte slås på när \"wal_level\" är \"minimal\""
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:853
 #, c-format
 msgid "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be \"replica\" or \"logical\""
 msgstr "WAL-strömning (\"max_wal_senders\" > 0) kräver att \"wal_level\" är \"replica\" eller \"logical\""
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "WAL kan inte summeras när \"wal_level\" är \"minimal\""
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:864
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ogiltiga datumtokentabeller, det behöver lagas\n"
 
-#: postmaster/postmaster.c:1004
+#: postmaster/postmaster.c:1025
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "kunde inte skapa \"I/O completion port\" för barnkö"
 
-#: postmaster/postmaster.c:1069
+#: postmaster/postmaster.c:1091
 #, c-format
 msgid "ending log output to stderr"
 msgstr "avslutar loggutmatning till stderr"
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1092
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "Framtida loggutmatning kommer gå till logg-destination \"%s\"."
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1103
 #, c-format
 msgid "starting %s"
 msgstr "startar %s"
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1165
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "kunde inte skapa lyssnande uttag (socket) för \"%s\""
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1171
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "kunde inte skapa TCP/IP-uttag (socket)"
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1203
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "DNSServiceRegister() misslyckades: felkod %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "kunde inte skapa unix-domän-uttag (socket) i katalog \"%s\""
 
-#: postmaster/postmaster.c:1240
+#: postmaster/postmaster.c:1262
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "kunde inte skapa något Unix-domän-uttag (socket)"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1273
 #, c-format
 msgid "no socket created for listening"
 msgstr "inget uttag (socket) skapat för lyssnande"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1304
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: kunde inte ändra rättigheter på extern PID-fil \"%s\": %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1308
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: kunde inte skriva extern PID-fil \"%s\": %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1336 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "kunde inte ladda \"%s\""
 
-#: postmaster/postmaster.c:1342
+#: postmaster/postmaster.c:1364
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "postmaster blev flertrådad under uppstart"
 
-#: postmaster/postmaster.c:1343 postmaster/postmaster.c:3684
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Sätt omgivningsvariabeln LC_ALL till en giltig lokal."
 
-#: postmaster/postmaster.c:1442
+#: postmaster/postmaster.c:1468
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: kunde inte hitta min egna körbara fils sökväg"
 
-#: postmaster/postmaster.c:1449
+#: postmaster/postmaster.c:1475
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: kunde inte hitta matchande postgres-binär"
 
-#: postmaster/postmaster.c:1472 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1498 utils/misc/tzparser.c:342
 #, c-format
 msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
 msgstr "Detta tyder på en inkomplett PostgreSQL-installation alternativt att filen \"%s\" har flyttats bort från sin korrekta plats."
 
-#: postmaster/postmaster.c:1499
+#: postmaster/postmaster.c:1525
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -20186,334 +20885,321 @@ msgstr ""
 "men kunde inte öppna filen \"%s\": %m\n"
 
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1789
+#: postmaster/postmaster.c:1762
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "skickar %s till motsträviga barn"
 
-#: postmaster/postmaster.c:1811
+#: postmaster/postmaster.c:1784
 #, c-format
 msgid "performing immediate shutdown because data directory lock file is invalid"
 msgstr "stänger ner omedelbart då datakatalogens låsfil är ogiltig"
 
-#: postmaster/postmaster.c:1874
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "fel nyckel i avbrytbegäran för process %d"
-
-#: postmaster/postmaster.c:1886
-#, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "PID %d i avbrytbegäran matchade inte någon process"
-
-#: postmaster/postmaster.c:2106
+#: postmaster/postmaster.c:2004
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "mottog SIGHUP, läser om konfigurationsfiler"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2134 postmaster/postmaster.c:2138
+#: postmaster/postmaster.c:2012 postmaster/postmaster.c:2016
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s laddades inte om"
 
-#: postmaster/postmaster.c:2148
+#: postmaster/postmaster.c:2026
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "SSL-konfiguration laddades inte om"
 
-#: postmaster/postmaster.c:2234
+#: postmaster/postmaster.c:2112
 #, c-format
 msgid "received smart shutdown request"
 msgstr "tog emot förfrågan om att stänga ner smart"
 
-#: postmaster/postmaster.c:2275
+#: postmaster/postmaster.c:2153
 #, c-format
 msgid "received fast shutdown request"
 msgstr "tog emot förfrågan om att stänga ner snabbt"
 
-#: postmaster/postmaster.c:2293
+#: postmaster/postmaster.c:2171
 #, c-format
 msgid "aborting any active transactions"
 msgstr "avbryter aktiva transaktioner"
 
-#: postmaster/postmaster.c:2317
+#: postmaster/postmaster.c:2195
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "mottog begäran för omedelbar nedstängning"
 
-#: postmaster/postmaster.c:2389
+#: postmaster/postmaster.c:2270
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "nedstängs vid återställningsmål"
 
-#: postmaster/postmaster.c:2407 postmaster/postmaster.c:2443
+#: postmaster/postmaster.c:2288 postmaster/postmaster.c:2324
 msgid "startup process"
 msgstr "uppstartprocess"
 
-#: postmaster/postmaster.c:2410
+#: postmaster/postmaster.c:2291
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "avbryter uppstart på grund av fel i startprocessen"
 
-#: postmaster/postmaster.c:2485
+#: postmaster/postmaster.c:2347
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "databassystemet är redo att ta emot anslutningar"
 
-#: postmaster/postmaster.c:2506
+#: postmaster/postmaster.c:2369
 msgid "background writer process"
 msgstr "bakgrundsskrivarprocess"
 
-#: postmaster/postmaster.c:2553
+#: postmaster/postmaster.c:2402
 msgid "checkpointer process"
 msgstr "checkpoint-process"
 
-#: postmaster/postmaster.c:2569
+#: postmaster/postmaster.c:2419
 msgid "WAL writer process"
 msgstr "WAL-skrivarprocess"
 
-#: postmaster/postmaster.c:2584
+#: postmaster/postmaster.c:2435
 msgid "WAL receiver process"
 msgstr "WAL-mottagarprocess"
 
-#: postmaster/postmaster.c:2598
+#: postmaster/postmaster.c:2450
 msgid "WAL summarizer process"
 msgstr "WAL-summeringsprocess"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2466
 msgid "autovacuum launcher process"
 msgstr "autovacuum-startprocess"
 
-#: postmaster/postmaster.c:2631
+#: postmaster/postmaster.c:2482
 msgid "archiver process"
 msgstr "arkiveringsprocess"
 
-#: postmaster/postmaster.c:2644
+#: postmaster/postmaster.c:2497
 msgid "system logger process"
 msgstr "system-logg-process"
 
-#: postmaster/postmaster.c:2661
+#: postmaster/postmaster.c:2515
 msgid "slot sync worker process"
 msgstr "arbetarprocess för slotsynkronisering"
 
-#: postmaster/postmaster.c:2717
+#: postmaster/postmaster.c:2523 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "io-arbetare"
+
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2547
+msgid "untracked child process"
+msgstr "ospårad barnprocess"
+
+#: postmaster/postmaster.c:2580
 #, c-format
 msgid "background worker \"%s\""
 msgstr "bakgrundsarbetare \"%s\""
 
-#: postmaster/postmaster.c:2796 postmaster/postmaster.c:2816
-#: postmaster/postmaster.c:2823 postmaster/postmaster.c:2841
-msgid "server process"
-msgstr "serverprocess"
-
-#: postmaster/postmaster.c:2895
+#: postmaster/postmaster.c:2804
 #, c-format
 msgid "terminating any other active server processes"
 msgstr "avslutar andra aktiva serverprocesser"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3082
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) avslutade med felkod %d"
 
-#: postmaster/postmaster.c:3084 postmaster/postmaster.c:3096
-#: postmaster/postmaster.c:3106 postmaster/postmaster.c:3117
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Misslyckad process körde: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3093
+#: postmaster/postmaster.c:2848
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) terminerades av avbrott 0x%X"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3103
+#: postmaster/postmaster.c:2858
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) terminerades av signal %d: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3115
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) avslutade med okänd status %d"
 
-#: postmaster/postmaster.c:3331
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "ej normal databasnedstängning"
 
-#: postmaster/postmaster.c:3357
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "stänger ner på grund av fel i startprocessen"
 
-#: postmaster/postmaster.c:3363
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "stänger ner då \"restart_after_crash\" är av"
 
-#: postmaster/postmaster.c:3375
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "alla serverprocesser är avslutade; initierar på nytt"
 
-#: postmaster/postmaster.c:3574 postmaster/postmaster.c:3985
-#: postmaster/postmaster.c:4374
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "kunde inte skapa slumpad avbrytningsnyckel"
-
-#: postmaster/postmaster.c:3607
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "kunde inte fork():a ny process for uppkoppling: %m"
 
-#: postmaster/postmaster.c:3649
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "kunde inte fork():a ny process for uppkoppling: "
 
-#: postmaster/postmaster.c:3683
+#: postmaster/postmaster.c:3667
 #, c-format
 msgid "postmaster became multithreaded"
 msgstr "postmaster blev flertrådad"
 
-#: postmaster/postmaster.c:3752
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "databassystemet är redo att ta emot read-only-anslutningar"
 
-#: postmaster/postmaster.c:3935
+#: postmaster/postmaster.c:3846
 #, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "kunde inte fork:a \"%s\"-process: %m"
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL ständes ner oväntat"
 
-#: postmaster/postmaster.c:4173 postmaster/postmaster.c:4207
+#: postmaster/postmaster.c:3971
 #, c-format
-msgid "database connection requirement not indicated during registration"
-msgstr "krav på databasanslutning fanns inte med vid registering"
-
-#: postmaster/postmaster.c:4183 postmaster/postmaster.c:4217
-#, c-format
-msgid "invalid processing mode in background worker"
-msgstr "ogiltigt processläge i bakgrundsarbetare"
+msgid "no slot available for new autovacuum worker process"
+msgstr "ingen slot tillgänglig till ny process för autovaccum"
 
-#: postmaster/postmaster.c:4277
+#: postmaster/postmaster.c:3986
 #, c-format
-msgid "could not fork background worker process: %m"
-msgstr "kunde inte fork:a process för bakgrundsarbete: %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "kunde inte fork:a \"%s\"-process: %m"
 
-#: postmaster/postmaster.c:4360
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "ingen slot tillgänglig till ny process för bakgrundsarbete"
 
-#: postmaster/postmaster.c:4623
+#: postmaster/postmaster.c:4163
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "kunde inte fork:a process för bakgrundsarbete: %m"
+
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "kunde inte läsa avslutningskod för process\n"
 
-#: postmaster/postmaster.c:4665
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "kunde inte skicka barnets avslutningsstatus\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "kunde inte läsa från loggrör (pipe): %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "kunde inte skapa rör (pipe) för syslog: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "kunde inte fork:a systemloggaren: %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "omdirigerar loggutmatning till logginsamlingsprocess"
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "Framtida loggutmatning kommer dyka upp i katalog \"%s\"."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "kunde inte omdirigera stdout: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "kunde inte omdirigera stderr: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "kunde inte skriva till loggfil: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "kunde inte öppna loggfil \"%s\": %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "stänger av automatisk rotation (använd SIGHUP för att slå på igen)"
 
-#: postmaster/walsummarizer.c:740
+#: postmaster/walsummarizer.c:743
 #, c-format
 msgid "WAL summarization is not progressing"
 msgstr "WAL-summering avancerar inte"
 
-#: postmaster/walsummarizer.c:741
+#: postmaster/walsummarizer.c:744
 #, c-format
 msgid "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/%X in memory."
 msgstr "Summering krävs till %X/%X men har fastnat vid %X/%X på disk och vid %X/%X i minnet."
 
-#: postmaster/walsummarizer.c:755
+#: postmaster/walsummarizer.c:758
 #, c-format
 msgid "still waiting for WAL summarization through %X/%X after %ld second"
 msgid_plural "still waiting for WAL summarization through %X/%X after %ld seconds"
 msgstr[0] "väntar fortfarande på WAL-summering till %X/%X efter %ld sekund"
 msgstr[1] "väntar fortfarande på WAL-summering till %X/%X efter %ld sekunder"
 
-#: postmaster/walsummarizer.c:760
+#: postmaster/walsummarizer.c:763
 #, c-format
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "Summering har nått %X/%X på disk och %X/%X i minnet."
 
-#: postmaster/walsummarizer.c:1000
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "kunde inte hitta en giltig post efter %X/%X"
 
-#: postmaster/walsummarizer.c:1045
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "kunde inte läsa WAL från tidslinje %u vid %X/%X: %s"
 
-#: postmaster/walsummarizer.c:1051
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "kunde inte läsa WAL från tidslinje %u vid %X/%X"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "kunde inte bestämma vilken jämförelse (collation) som skall användas för reguljära uttryck"
@@ -20523,153 +21209,153 @@ msgstr "kunde inte bestämma vilken jämförelse (collation) som skall användas
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "ickedeterministiska jämförelser (collation) stöds inte för reguljära uttryck"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "ogiltig tidslinje %u"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "ogiltig startposition för strömning"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:243
+#: replication/libpqwalreceiver/libpqwalreceiver.c:335
 #, c-format
 msgid "password is required"
 msgstr "lösenord krävs"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:244
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "Icke superanvändare kan inte ansluta till servern om den inte kräver lösenord."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:245
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr "Målserverns autentiseringsmetod måste ändras eller så måste man sätta password_required=false i prenumerationens parametrar."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:262
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "kunde inte nollställa sökväg: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:308
+#: replication/libpqwalreceiver/libpqwalreceiver.c:508
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "ogiltig anslutningssträngsyntax %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:336
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "Icke superanvändare måste ange ett lösenord i anslutningssträngen."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:363
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "kunde inte parsa anslutningssträng: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:438
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr "kunde inte hämta databassystemidentifierare och tidslinje-ID från primära servern: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:455
+#: replication/libpqwalreceiver/libpqwalreceiver.c:762
 #, c-format
 msgid "invalid response from primary server"
 msgstr "ogiltigt svar från primär server"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:456
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr "Kunde inte identifiera system: fick %d rader och %d fält, förväntade %d rader och %d eller fler fält."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:597
+#: replication/libpqwalreceiver/libpqwalreceiver.c:604
+#: replication/libpqwalreceiver/libpqwalreceiver.c:636
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "kunde inte starta WAL-strömning: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:660
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "kunde inte skicka meddelandet end-of-streaming till primären: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:684
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "oväntad resultatmängd efter end-of-streaming"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:700
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "fel vid nestängning av strömmande COPY: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:711
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "fel vid läsning av resultat från strömningskommando: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:721
+#: replication/libpqwalreceiver/libpqwalreceiver.c:857
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "oväntat resultat efter CommandComplete: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:750
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "kan inte ta emot fil med tidslinjehistorik från primära servern: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:763
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "Förväntade 1 tupel med 2 fält, fick %d tupler med %d fält."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:818
+#: replication/libpqwalreceiver/libpqwalreceiver.c:873
+#: replication/libpqwalreceiver/libpqwalreceiver.c:880
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "kunde inte ta emot data från WAL-ström: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:900
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "kunde inte skicka data till WAL-ström: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1003
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "kunde inte skapa replikeringsslot \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1055
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "kunde inte ändra replikeringsslot \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1089
 #, c-format
 msgid "invalid query response"
 msgstr "ogiltigt frågerespons"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1090
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "Förväntade %d fält, fick %d fält."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1160
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "frågeinterface:et kräver en databasanslutning"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1194
 msgid "empty query"
 msgstr "tom fråga"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1200
 msgid "unexpected pipeline mode"
 msgstr "oväntat pipeline-läge"
 
@@ -20683,161 +21369,256 @@ msgstr "logisk replikerings parallella ändringsapplicerare för prenumeration \
 msgid "lost connection to the logical replication apply worker"
 msgstr "tappade anslutning till den logiska replikeringens ändringsapplicerare"
 
-#: replication/logical/applyparallelworker.c:1024
-#: replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031
+#: replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "logisk replikerings ändringsapplicerare"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr "logiska replikeringens ändringsappliceraren avslutade på grund av ett fel"
 
-#: replication/logical/applyparallelworker.c:1127
-#: replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134
+#: replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "tappade anslutning till den logiska replikeringens parallella ändringsapplicerare"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "kunde inte skicka data till kö i delat minne"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr "logiska replikeringens ändringsapplicerare kommer spara ner återstående ändringarna av fjärrtransaktion %u til en fil"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/conflict.c:126
+#, c-format
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "konflikt upptäcktes i relationen \"%s.%s\": konflikt=%s"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified locally in transaction %u at %s."
+msgstr "Nyckel finns redan i unikindex \"%s\", lokalt modifierat i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by origin \"%s\" in transaction %u at %s."
+msgstr "Nyckel finns redan i unikindex \"%s\", modifierat av origin \"%s\" i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by a non-existent origin in transaction %u at %s."
+msgstr "Nyckel finns redan i unikindex \"%s\", modifierat av icke-existerande origin i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr "Nyckel finns redan i unikindex \"%s\", lokalt modifierat i transaktion %u."
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr "Uppdaterar raden som var lokalt modifierad i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid "Updating the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Uppdaterar raden som var modifierad av en annan origin \"%s\" i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid "Updating the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Uppdaterar raden som var modifierad av en icke-existerande origin i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:265
+msgid "Could not find the row to be updated."
+msgstr "Kunde inte hitta raden som skulle uppdateras."
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "Raderar raden som var lokalt modifierad i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid "Deleting the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Raderar raden som var modifierad av en annan origin \"%s\" i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid "Deleting the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Raderar raden som var modifierad av en icke-existerande origin i transaktion %u vid %s."
+
+#: replication/logical/conflict.c:284
+msgid "Could not find the row to be deleted."
+msgstr "Kunde inte hitta raden som skulle tas bort."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "Nyckel %s"
+
+#: replication/logical/conflict.c:364
+#, c-format
+msgid "existing local row %s"
+msgstr "existerande lokal rad \"%s\""
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "Existerande lokal rad %s"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "fjärrad %s"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "Fjärrad %s"
+
+#: replication/logical/conflict.c:434
+#, c-format
+msgid "replica identity %s"
+msgstr "replikaidentitet %s"
+
+#: replication/logical/conflict.c:435
+#, c-format
+msgid "replica identity full %s"
+msgstr "full replikaidentitet %s"
+
+#: replication/logical/conflict.c:440
+#, c-format
+msgid "Replica identity %s"
+msgstr "Replikaidentitet %s"
+
+#: replication/logical/conflict.c:441
+#, c-format
+msgid "Replica identity full %s"
+msgstr "Full replikaidentitet %s"
+
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "logisk avkodning på standby kräver \"wal_level\" >= \"logical\" på primären"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
-msgstr "kan inte starta logisk replikeringsarbetare när max_replication_slots = 0"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "kan inte starta logisk replikeringsarbetare när \"max_active_replication_origins\" är 0"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "slut på logiska replikeringsarbetarslots"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:985 storage/lmgr/lock.c:1023
-#: storage/lmgr/lock.c:2836 storage/lmgr/lock.c:4221 storage/lmgr/lock.c:4286
-#: storage/lmgr/lock.c:4636 storage/lmgr/predicate.c:2469
-#: storage/lmgr/predicate.c:2484 storage/lmgr/predicate.c:3881
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1670 replication/slot.c:1690 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "Du kan behöva öka \"%s\"."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "slut på bakgrundsarbetarslots"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "logisk replikeringsarbetarslot %d är tom, kan inte ansluta"
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr "logiisk replikeringsarbetarslot %d används redan av en annan arbetare, kan inte ansluta"
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "logisk avkodning kräver \"wal_level\" >= \"logical\""
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "logisk avkodning kräver en databasanslutning"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "kan inte använda fysisk replikeringsslot för logisk avkodning"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "replikeringsslot \"%s\" har inte skapats i denna databasen"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "kan inte skapa logisk replikeringsslot i transaktion som redan har utfört skrivningar"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "kan inte använda replikeringsslot \"%s\" för logisk avkodning"
 
-#: replication/logical/logical.c:542 replication/slot.c:798
-#: replication/slot.c:829
+#: replication/logical/logical.c:546 replication/slot.c:858
+#: replication/slot.c:903
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "Denna replikeringsslot synkroniseras från primära servern."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "Ange en annan replikeringsslot."
 
-#: replication/logical/logical.c:554 replication/logical/logical.c:561
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "kan inte längre få ändringar från replikeringsslot \"%s\""
-
-#: replication/logical/logical.c:556
-#, c-format
-msgid "This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr "Denna slot har invaliderats då den överskred maximal reserverad storlek."
-
-#: replication/logical/logical.c:563
-#, c-format
-msgid "This slot has been invalidated because it was conflicting with recovery."
-msgstr "Denna slot har invaliderats den var i konflikt med återställningen."
-
-#: replication/logical/logical.c:628
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "startar logisk avkodning för slot \"%s\""
 
-#: replication/logical/logical.c:630
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr "Strömmar transaktioner commit:ade efter %X/%X, läser WAL från %X/%X"
 
-#: replication/logical/logical.c:778
+#: replication/logical/logical.c:763
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr "slot \"%s\", utdata-plugin \"%s\", i callback:en %s, associerad LSN %X/%X"
 
-#: replication/logical/logical.c:784
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "slot \"%s\", utdata-plugin \"%s\", i callback:en %s"
 
-#: replication/logical/logical.c:955 replication/logical/logical.c:1000
-#: replication/logical/logical.c:1045 replication/logical/logical.c:1091
+#: replication/logical/logical.c:940 replication/logical/logical.c:985
+#: replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "logisk replikering vid prepare-tillfället kräver en %s-callback"
 
-#: replication/logical/logical.c:1323 replication/logical/logical.c:1372
-#: replication/logical/logical.c:1413 replication/logical/logical.c:1499
-#: replication/logical/logical.c:1548
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357
+#: replication/logical/logical.c:1398 replication/logical/logical.c:1484
+#: replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "logisk strömning kräven en %s-callback"
 
-#: replication/logical/logical.c:1458
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "logisk strömning vid prepare-tillfället kräver en %s-callback"
@@ -20862,7 +21643,7 @@ msgstr "array:en måste vara endimensionell"
 msgid "array must not contain nulls"
 msgstr "array:en får inte innehålla null"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1420
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -20873,209 +21654,219 @@ msgstr "array:en måste ha ett jämnt antal element"
 msgid "logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data"
 msgstr "utdata-plugin \"%s\" för logisk avkodning producerar binär utdata men funktionen \"%s\" förväntar sig textdata"
 
-#: replication/logical/origin.c:190
+#: replication/logical/origin.c:195
 #, c-format
-msgid "cannot query or manipulate replication origin when \"max_replication_slots\" is 0"
-msgstr "kan inte se eller ändra replikeringskällor när \"max_replication_slots\" är 0"
+msgid "cannot query or manipulate replication origin when \"max_active_replication_origins\" is 0"
+msgstr "kan inte se eller ändra replikeringskälla när \"max_active_replication_origin\" är 0"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "kan inte ändra replikeringskällor under tiden återställning sker"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "replikeringskälla \"%s\" finns inte"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "replikeringskällans namn är för långt"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "Replikeringskällnamns namn får inte vara längre än %d byte"
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "kunde inte hitta ledig replikering-origin-ID"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "kunde inte slänga replikeringskälla med ID %d som används av PID %d"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "replikeringskälla med ID %d finns inte"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "replikeringscheckpoint har fel magiskt tal %u istället för %u"
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
-msgid "could not find free replication state, increase \"max_replication_slots\""
-msgstr "kunde inte hitta ledig replikeringsplats, öka \"max_replication_slots\""
+msgid "could not find free replication state, increase \"max_active_replication_origins\""
+msgstr "kunde inte hitta något ledig replikeringsplats, öka \"max_active_replication_origins\""
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "återställde replikeringstillstånd för nod %d till %X/%X"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "replikeringsslot-checkpoint har felaktig kontrollsumma %u, förväntade %u"
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "replikeringskälla med ID %d är redan aktiv för PID %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr "kunde inte hitta ledig replikerings-state-slot för replikerings-origin med ID %d"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
-msgid "Increase \"max_replication_slots\" and try again."
-msgstr "Öka \"max_replication_slots\" och försök igen."
+msgid "Increase \"max_active_replication_origins\" and try again."
+msgstr "Öka \"max_active_replication_origins\" och försök igen."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "kan inte ställa in replikeringskälla när en redan är inställd"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "ingen replikeringskälla är konfigurerad"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "replikeringskällnamn \"%s\" är reserverat"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "Källnamn \"%s\", \"%s\" och namn som startar med \"pg_\" är reserverade."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", \"%s\""
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid "logical replication target relation \"%s.%s\" is missing replicated column: %s"
 msgid_plural "logical replication target relation \"%s.%s\" is missing replicated columns: %s"
 msgstr[0] "destinationsrelation \"%s.%s\" för logisk replikering saknar en replikerad kolumn: %s"
 msgstr[1] "destinationsrelation \"%s.%s\" för logisk replikering saknar några replikerade kolumner: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, c-format
+msgid "logical replication target relation \"%s.%s\" has incompatible generated column: %s"
+msgid_plural "logical replication target relation \"%s.%s\" has incompatible generated columns: %s"
+msgstr[0] "målrelation \"%s.%s\" för logisk replikering har inkompatibel genererad kolumn: %s"
+msgstr[1] "målrelation \"%s.%s\" för logisk replikering har inkompatibla genererade kolumner: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid "logical replication target relation \"%s.%s\" uses system columns in REPLICA IDENTITY index"
 msgstr "destinationsrelation \"%s.%s\" för logisk replikering använder systemkolumner i REPLICA IDENTITY-index"
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "destinationsrelation \"%s.%s\" för logisk replikering finns inte"
 
-#: replication/logical/reorderbuffer.c:3999
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "kunde inte skriva till datafil för XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:4345
-#: replication/logical/reorderbuffer.c:4370
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "kunde inte läsa från reorderbuffer spill-fil: %m"
 
-#: replication/logical/reorderbuffer.c:4349
-#: replication/logical/reorderbuffer.c:4374
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "kunde inte läsa från reorderbuffer spill-fil: läste %d istället för %u byte"
 
-#: replication/logical/reorderbuffer.c:4624
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
-msgstr "kunde inte radera fil \"%s\" vid borttagning av pg_replslot/%s/xid*: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
+msgstr "kunde inte radera fil \"%s\" vid borttagning av %s/%s/xid*: %m"
 
-#: replication/logical/reorderbuffer.c:5120
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "kunde inte läsa från fil \"%s\": läste %d istället för %d byte"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:596
 #, c-format
-msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
-msgstr "kunde inte synkronisera replikeringsslot \"%s\" då fjärrslotten ligger tidigare än den lokala slotten"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "kunde inte synkronisera replikeringsslot \"%s\""
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:216
 #, c-format
-msgid "The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u."
-msgstr "Fjärrslotten har LSN %X/%X och katalog-xmin %u men lokala slotten har LSN %X/%X och katalog-xmin %u."
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
+msgstr "Synkronisering kan leda till dataförlust eftersom fjärrslotten kräver WAL vid LSN %X/%X och katalog-xmin %u men standby har LSN %X/%X och katalog-xmin %u."
 
-#: replication/logical/slotsync.c:459
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "slängde replikerings-slot \"%s\" för databas med OID %u"
 
-#: replication/logical/slotsync.c:579
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "kunde inte synkronisera replikeringsslot \"%s\""
-
-#: replication/logical/slotsync.c:580
+#: replication/logical/slotsync.c:597
 #, c-format
-msgid "Logical decoding could not find consistent point from local slot's LSN %X/%X."
-msgstr "Logisk avkodning kunde inte hitta en konsistent punkt från lokala slottens LSN %X/%X"
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr "Synkronisering kan leda till dataförlust eftersom standby:en inte kunde skapa en konsistent snapshot för att avkoda WAL vid LSN %X/%X."
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:606
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "nyskapad replikeringsslot \"%s\" är redo för synk nu"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:645
 #, c-format
 msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
 msgstr "hoppar över slotsynkronisering då den mottagna slottens synk-LSN %X/%X för slot \"%s\" är längre fram än standby-positionen %X/%X"
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:667
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
 msgstr "avslutar slotsynkronisering då samma slotnamn \"%s\" redan finns på standby:en"
 
-#: replication/logical/slotsync.c:819
+#: replication/logical/slotsync.c:838
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "kan inte hämta logisk slot för failover från primära servern: %s"
 
-#: replication/logical/slotsync.c:965
+#: replication/logical/slotsync.c:987
 #, c-format
-msgid "could not fetch primary_slot_name \"%s\" info from the primary server: %s"
-msgstr "kan inte hämta info för primary_slot_name \"%s\" från primära servern: %s"
+msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
+msgstr "kan inte hämta info för primära slotnamnet \"%s\" från primära servern: %s"
 
-#: replication/logical/slotsync.c:967
+#: replication/logical/slotsync.c:989
 #, c-format
-msgid "Check if primary_slot_name is configured correctly."
-msgstr "Kontrollera att primary_slot_name är korrekt konfigurerad."
+msgid "Check if \"primary_slot_name\" is configured correctly."
+msgstr "Kontrollera att \"primary_slot_name\" är korrekt konfigurerad."
 
-#: replication/logical/slotsync.c:987
+#: replication/logical/slotsync.c:1009
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "kan inte synkronisera replikeringsslottar från en standby-server"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:996
+#: replication/logical/slotsync.c:1018
 #, c-format
 msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
 msgstr "replikeringsslot \"%s\" angiven av %s finns inte på den primära servern."
@@ -21083,929 +21874,988 @@ msgstr "replikeringsslot \"%s\" angiven av %s finns inte på den primära server
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1029
+#: replication/logical/slotsync.c:1051
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "synkronisering av replikeringsslot kräver att \"%s\" anges i %s"
 
-#: replication/logical/slotsync.c:1050
+#: replication/logical/slotsync.c:1070
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "synkronisering av replikeringsslot kräver at \"wal_level\" >= \"logical\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
+#: replication/logical/slotsync.c:1085 replication/logical/slotsync.c:1113
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "synkronisering av replikeringsslot kräver att \"%s\" också anges"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1077
+#: replication/logical/slotsync.c:1099
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "synkronisering av replikeringsslot kräver att \"%s\" också slås på"
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1151
 #, c-format
 msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
 msgstr "arbetare för synkronisering av replikeringsslot kommer stängas ner då \"%s\" är avslagen"
 
-#: replication/logical/slotsync.c:1138
+#: replication/logical/slotsync.c:1160
 #, c-format
 msgid "replication slot synchronization worker will restart because of a parameter change"
 msgstr "arbetare för synkronisering av replikeringsslot kommer startas om då parametrar ändrats"
 
-#: replication/logical/slotsync.c:1162
+#: replication/logical/slotsync.c:1184
 #, c-format
-msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr "arbetare för synkronisering av replikeringsslot stänger ner efter mottagning av SIGINT"
+msgid "replication slot synchronization worker is shutting down because promotion is triggered"
+msgstr "arbetare för synkronisering av replikeringsslot stängs ner eftersom befordran av standby har triggats"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1309
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "kan inte synkronisera replikeringsslot när befordran av standby pågår"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1317
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "kan inte synkronisera replikeringsslottar parallellt"
 
-#: replication/logical/slotsync.c:1403
+#: replication/logical/slotsync.c:1425
 #, c-format
 msgid "slot sync worker started"
 msgstr "arbetare för slot-synk startad"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
+#: replication/logical/slotsync.c:1487 replication/slotfuncs.c:928
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "kunde inte ansluta till primärserver: %s"
+msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
+msgstr "synchroniseringsarbetare \"%s\" kunde inte ansluta till den primära servern: %s"
 
-#: replication/logical/snapbuild.c:653
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "initialt slot-snapshot är för stort"
 
-#: replication/logical/snapbuild.c:707
+#: replication/logical/snapbuild.c:568
 #, 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] "exporterade logisk avkodnings-snapshot: \"%s\" med %u transaktions-ID"
 msgstr[1] "exporterade logisk avkodnings-snapshot: \"%s\" med %u transaktions-ID"
 
-#: replication/logical/snapbuild.c:1404 replication/logical/snapbuild.c:1501
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "logisk avkodning hittade konsistent punkt vid %X/%X"
 
-#: replication/logical/snapbuild.c:1406
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "Det finns inga körande transaktioner."
 
-#: replication/logical/snapbuild.c:1453
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "logisk avkodning hittade initial startpunkt vid %X/%X"
 
-#: replication/logical/snapbuild.c:1455 replication/logical/snapbuild.c:1479
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "Väntar på att transaktioner (cirka %d) äldre än %u skall gå klart."
 
-#: replication/logical/snapbuild.c:1477
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr "logisk avkodning hittade initial konsistent punkt vid %X/%X"
 
-#: replication/logical/snapbuild.c:1503
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "Det finns inte längre några gamla transaktioner."
 
-#: replication/logical/snapbuild.c:1904
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "snapbuild-state-fil \"%s\" har fel magiskt tal: %u istället för %u"
 
-#: replication/logical/snapbuild.c:1910
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr "snapbuild-state-fil \"%s\" har en ej stödd version: %u istället för %u"
 
-#: replication/logical/snapbuild.c:1951
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr "checksumma stämmer inte för snapbuild-state-fil \"%s\": är %u, skall vara %u"
 
-#: replication/logical/snapbuild.c:2019
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Logisk avkodning kommer starta med sparat snapshot."
 
-#: replication/logical/snapbuild.c:2126
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "kunde inte parsa filnamn \"%s\""
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr "logisk replikerings tabellsynkroniseringsarbetare för prenumeration \"%s\", tabell \"%s\" är klar"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr "arbetarprocess för uppspelning av logisk replikering av prenumeration \"%s\" kommer starta om så att two_phase kan slås på"
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "kunde inte hämta tabellinfo för tabell \"%s.%s\" från publicerare: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "tabell \"%s.%s\" hittades inte hos publicerare"
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "kunde inte hämta kolumlista för tabell \"%s.%s\" från publicerare: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr "kunde inte hämta tabells WHERE-klausul för tabell \"%s.%s\" från publicerare: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "kunde inte starta initial innehållskopiering för tabell \"%s.%s\": %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
 #, c-format
-msgid "table copy could not start transaction on publisher: %s"
-msgstr "tabellkopiering kunde inte starta transaktion på publiceraren: %s"
+msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "tabellers synkroniseringsarbetare för prenumeration \"%s\" kunde inte ansluta till publiceraren: %s"
 
-#: replication/logical/tablesync.c:1472
+#: replication/logical/tablesync.c:1480
 #, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "replikeringsurspring \"%s\" finns redan"
+msgid "table copy could not start transaction on publisher: %s"
+msgstr "tabellkopiering kunde inte starta transaktion på publiceraren: %s"
 
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr "användaren \"%s\" kan inte replikera in i en relation med radsäkerhet påslagen: \"%s\""
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "tabellkopiering kunde inte slutföra transaktion på publiceraren: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "logiska replikeringens parallella ändringsapplicerare för prenumeration \"%s\" kommer stoppa"
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr "Kan inte hantera strömmade replikerade transaktioner med parallell ändringsapplicerare innan alla tabeller har synkroniserats."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "inkorrekt binärt dataformat i logisk replikeringskolumn %d"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr "publicerare skickade inte identitetskolumn för replika som förväntades av den logiska replikeringens målrelation \"%s.%s\""
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr "logisk replikeringsmålrelation \"%s.%s\" har varken REPLICA IDENTITY-index eller PRIMARY KEY och den publicerade relationen har inte REPLICA IDENTITY FULL"
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "ogiltig logisk replikeringsmeddelandetyp \"??? (%d)\""
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "dataströmmen från publiceraren har avslutats"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "avslutar logisk replikeringsarbetare på grund av timeout"
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr "logiska replikerings ändringsapplicerare för prenumeration \"%s\" kommer att stoppa då prenumerationen har tagits bort"
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr "logiska replikerings ändringsapplicerare för prenumeration \"%s\" kommer att stoppa då prenumerationen har stängts av"
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr "logiska replikeringens ändringsapplicerare för prenumeration \"%s\" kommer att stoppa på grund av ändrade parametrar"
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr "logiska replikeringens ändringsapplicerare för prenumeration \"%s\" kommer att startas om på grund av ändrade parametrar"
 
-#: replication/logical/worker.c:3954
+#: replication/logical/worker.c:4053
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
 msgstr "logiska replikerings parallella ändringsapplicerare för prenumeration \"%s\" kommer att stoppa då prenumerationens ägare har blivit av med superuser-rättigheten"
 
-#: replication/logical/worker.c:3958
+#: replication/logical/worker.c:4057
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
 msgstr "logiska replikerings ändringsapplicerare för prenumeration \"%s\" kommer att startas om då prenumerationens ägare har blivit av med superuser-rättigheten"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "prenumeration har ingen replikeringsslot angiven"
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, c-format
+msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "arbetare för ändringsapplicering tillhörande prenumeration \"%s\" kunde inte ansluta till publicerare: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr "logiska replikeringens ändringsapplicerare för prenumeration %u kommer inte att startas då prenumerationen togs bort i uppstarten"
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr "logiska replikeringens ändringsapplicerare för prenumeration \"%s\" kommer inte att startas då prenumerationen stängdes av i uppstarten"
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr "logisk replikerings tabellsynkroniseringsarbetare för prenumeration \"%s\", tabell \"%s\" har startat"
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "logiska replikeringens ändringsapplicerare för prenumeration \"%s\" har startat"
 
-#: replication/logical/worker.c:4758
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "prenumeration \"%s\" har avaktiverats på grund av ett fel"
 
-#: replication/logical/worker.c:4806
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "logisk replikering börjar hoppa över transaktion vid LSN %X/%X"
 
-#: replication/logical/worker.c:4820
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "logisk replikering har slutfört överhoppande av transaktionen vid LSN %X/%X"
 
-#: replication/logical/worker.c:4902
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "överhoppnings-LSN för logiska prenumerationen \"%s\" har nollställts"
 
-#: replication/logical/worker.c:4903
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr "Fjärrtransaktionens slut-WAL-position (LSN) %X/%X matchade inte överhoppnings-LSN %X/%X."
 
-#: replication/logical/worker.c:4940
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr "processar fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\""
 
-#: replication/logical/worker.c:4944
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr "processar fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" i transaktion %u"
 
-#: replication/logical/worker.c:4949
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr "processande av fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" i transaktion %u blev klar vid %X/%X"
 
-#: replication/logical/worker.c:4960
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr "processande av fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" för replikeringsmålrelation \"%s.%s\" i transaktion %u"
 
-#: replication/logical/worker.c:4967
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr "processande av fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" för replikeringsmålrelation \"%s.%s\" i transaktion %u blev klart vid %X/%X"
 
-#: replication/logical/worker.c:4978
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr "processande av fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" för replikeringsmålrelation \"%s.%s\" kolumn \"%s\" i transaktion %u"
 
-#: replication/logical/worker.c:4986
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr "processande av fjärrdata för replikeringskälla \"%s\" vid meddelandetyp \"%s\" för replikeringsmålrelation \"%s.%s\" kolumn \"%s\" i transaktion %u blev klart vid %X/%X"
 
-#: replication/pgoutput/pgoutput.c:322
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "ogiltig proto_version"
 
-#: replication/pgoutput/pgoutput.c:327
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "proto_version \"%s\" är utanför giltigt intervall"
 
-#: replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:355
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "ogiltig publication_names-syntax"
 
-#: replication/pgoutput/pgoutput.c:414 replication/pgoutput/pgoutput.c:418
+#: replication/pgoutput/pgoutput.c:425 replication/pgoutput/pgoutput.c:429
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "flaggan \"%s\" saknas."
 
-#: replication/pgoutput/pgoutput.c:478
+#: replication/pgoutput/pgoutput.c:496
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "klienten skickade proto_version=%d men servern stöder bara protokoll %d eller lägre"
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:502
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "klienten skickade proto_version=%d men servern stöder bara protokoll %d eller högre"
 
-#: replication/pgoutput/pgoutput.c:499
+#: replication/pgoutput/pgoutput.c:517
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr "efterfrågade proto_version=%d stöder inte strömning, kräver %d eller högre"
 
-#: replication/pgoutput/pgoutput.c:505
+#: replication/pgoutput/pgoutput.c:523
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr "efterfrågade proto_version=%d stöder inte parallell strömning, kräver %d eller högre"
 
-#: replication/pgoutput/pgoutput.c:510
+#: replication/pgoutput/pgoutput.c:528
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "ströming begärdes men det stöds inte av utdata-plugin:en"
 
-#: replication/pgoutput/pgoutput.c:524
+#: replication/pgoutput/pgoutput.c:542
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr "efterfrågade proto_version=%d stöder inte tvåfas-commit, kräver %d eller högre"
 
-#: replication/pgoutput/pgoutput.c:529
+#: replication/pgoutput/pgoutput.c:547
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "tvåfas-commit begärdes men det stöds inte av utdata-plugin:en"
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1112
+#, c-format
+msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
+msgstr "kan inte ha olika värden på publish_generated_columns för tabellen \"%s.%s\" i olika publiceringar"
+
+#: replication/pgoutput/pgoutput.c:1815
+#, c-format
+msgid "skipped loading publication \"%s\""
+msgstr "hoppade över inläsning av publicering \"%s\""
+
+#: replication/pgoutput/pgoutput.c:1816
+#, c-format
+msgid "The publication does not exist at this point in the WAL."
+msgstr "Publiceringen finns inte vid denna tidpunkt i WAL."
+
+#: replication/pgoutput/pgoutput.c:1817
+#, c-format
+msgid "Create the publication if it does not exist."
+msgstr "Skapa publiceringen om den inte redan finns."
+
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "replikeringsslotnamn \"%s\" är för kort"
 
-#: replication/slot.c:269
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "replikeringsslotnamn \"%s\" är för långt"
 
-#: replication/slot.c:282
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "replikeringsslotnamn \"%s\" innehåller ogiltiga tecken"
 
-#: replication/slot.c:284
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr "Replikeringsslotnamn får bara innehålla små bokstäver, nummer och understreck."
 
-#: replication/slot.c:333
+#: replication/slot.c:377
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr "kan inte aktivera failover för en replikeringsslot som skapats på standby:en"
 
-#: replication/slot.c:345 replication/slot.c:849
+#: replication/slot.c:389 replication/slot.c:925
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "kan inte aktivera failover för en temporär repllikeringsslot"
 
-#: replication/slot.c:370
+#: replication/slot.c:414
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "replikeringsslot \"%s\" finns redan"
 
-#: replication/slot.c:380
+#: replication/slot.c:424
 #, c-format
 msgid "all replication slots are in use"
 msgstr "alla replikeringsslots används"
 
-#: replication/slot.c:381
+#: replication/slot.c:425
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "Frigör en eller öka \"max_replication_slots\"."
 
-#: replication/slot.c:560 replication/slot.c:2450 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:609 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "replikeringsslot \"%s\" existerar inte"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:664 replication/slot.c:1499
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "replikeringsslot \"%s\" är aktiv för PID %d"
 
-#: replication/slot.c:638
+#: replication/slot.c:681
+#, c-format
+msgid "can no longer access replication slot \"%s\""
+msgstr "kan inte längre accessa replikeringsslot \"%s\""
+
+#: replication/slot.c:683
+#, c-format
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "Replikeringsslotten har invaliderats på grund av \"%s\"."
+
+#: replication/slot.c:702
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "tog logisk replikeringsslot \"%s\""
 
-#: replication/slot.c:640
+#: replication/slot.c:704
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "tog fysisk replikeringsslot \"%s\""
 
-#: replication/slot.c:729
+#: replication/slot.c:789
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "släppte logisk replikeringsslot \"%s\""
 
-#: replication/slot.c:731
+#: replication/slot.c:791
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "släppte fysisk replikeringsslot \"%s\""
 
-#: replication/slot.c:797
+#: replication/slot.c:857
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "kan inte slänga replikeringsslot \"%s\""
 
-#: replication/slot.c:816
+#: replication/slot.c:890
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "kan inte använda %s med en fysisk replikeringsslot"
 
-#: replication/slot.c:828
+#: replication/slot.c:902
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "kan inte ändra replikeringsslot \"%s\""
 
-#: replication/slot.c:838
+#: replication/slot.c:912
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "kan inte aktivera failover för en replikeringsslot på standby:en"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1060 replication/slot.c:2228 replication/slot.c:2621
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "kunde inte ta bort katalog \"%s\""
 
-#: replication/slot.c:1372
+#: replication/slot.c:1534
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr "replikeringsslots kan bara användas om \"max_replication_slots\" > 0"
 
-#: replication/slot.c:1377
+#: replication/slot.c:1539
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "replikeringsslots kan bara användas om \"wal_level\" >= \"replica\""
 
-#: replication/slot.c:1389
+#: replication/slot.c:1551
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "rättighet saknas för att använda replikeringsslottar"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1552
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "Bara roller med attributet %s får använda replikeringsslottar."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1664
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
-msgstr[0] "Slottens restart_lsn %X/%X överskrider gränsen på %llu byte."
-msgstr[1] "Slottens restart_lsn %X/%X överskrider gränsen på %llu bytes."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
+msgstr[0] "Slottens restart_lsn %X/%X överskrider gränsen med %<PRIu64> byte."
+msgstr[1] "Slottens restart_lsn %X/%X överskrider gränsen med %<PRIu64> byte."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1675
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "Slotten är i konflikt med xid-horisont %u."
 
-#: replication/slot.c:1511
+#: replication/slot.c:1680
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "logisk avkodning på standby kräver \"wal_level\" >= \"logical\" på primären"
 
-#: replication/slot.c:1519
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1686
+#, c-format
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr "Slottens idle-tid på %lds är mer än den konfigurerade \"%s\"-längden på %ds."
+
+#: replication/slot.c:1700
 #, c-format
 msgid "terminating process %d to release replication slot \"%s\""
 msgstr "avslutar process %d för att frigöra replikeringsslot \"%s\""
 
-#: replication/slot.c:1521
+#: replication/slot.c:1702
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "invaliderar obsolet replikeringssslot \"%s\""
 
-#: replication/slot.c:2249
+#: replication/slot.c:2559
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "replikeringsslotfil \"%s\" har fel magiskt nummer: %u istället för %u"
 
-#: replication/slot.c:2256
+#: replication/slot.c:2566
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "replikeringsslotfil \"%s\" har en icke stödd version %u"
 
-#: replication/slot.c:2263
+#: replication/slot.c:2573
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "replikeringsslotfil \"%s\" har felaktig längd %u"
 
-#: replication/slot.c:2299
+#: replication/slot.c:2609
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "kontrollsummefel för replikeringsslot-fil \"%s\": är %u, skall vara %u"
 
-#: replication/slot.c:2333
+#: replication/slot.c:2645
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "logisk replikeringsslot \"%s\" finns men \"wal_level\" < \"replica\""
 
-#: replication/slot.c:2335
+#: replication/slot.c:2647
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "Ändra \"wal_level\" till \"logical\" eller högre."
 
-#: replication/slot.c:2339
+#: replication/slot.c:2659
+#, c-format
+msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
+msgstr "logisk replikeringsslot \"%s\" finns på standby men \"hot_standby\" = \"off\""
+
+#: replication/slot.c:2661
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "Ändra \"hot_standby\" till \"on\"."
+
+#: replication/slot.c:2666
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "fysisk replikeringsslot \"%s\" finns men \"wal_level\" < \"replica\""
 
-#: replication/slot.c:2341
+#: replication/slot.c:2668
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "Ändra \"wal_level\" till \"replica\" eller högre."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2715
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "för många aktiva replikeringsslottar innan nerstängning"
 
-#: replication/slot.c:2458
+#: replication/slot.c:2716
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "\"%s\" är inte en fysisk replikeringsslot"
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "Öka \"max_replication_slots\" och försök igen."
 
-#: replication/slot.c:2635
+#: replication/slot.c:2953
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "replikeringsslot \"%s\" som angivits i parametern \"%s\" existerar inte"
 
-#: replication/slot.c:2637 replication/slot.c:2671 replication/slot.c:2686
+#: replication/slot.c:2955 replication/slot.c:2989 replication/slot.c:3004
 #, c-format
 msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
 msgstr "Logisk replikering väntar på standby associerad med replikeringsslot \"%s\"."
 
-#: replication/slot.c:2639
+#: replication/slot.c:2957
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "Skapa replikeringsslotten \"%s\" eller ändra parametern \"%s\""
 
-#: replication/slot.c:2649
+#: replication/slot.c:2967
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "kan inte ange logisk replikeringsslot \"%s\" i parametern \"%s\""
 
-#: replication/slot.c:2651
+#: replication/slot.c:2969
 #, c-format
 msgid "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "Logiska replikering väntar på rättning av replikeringsslot \"%s\""
 
-#: replication/slot.c:2653
+#: replication/slot.c:2971
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "Ta bort logisk replikeringsslot \"%s\" från parametern \"%s\""
 
-#: replication/slot.c:2669
+#: replication/slot.c:2987
 #, c-format
 msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
 msgstr "fysisk replikeringsslot \"%s\" angiven i parametern \"%s\" har invaliderats"
 
-#: replication/slot.c:2673
+#: replication/slot.c:2991
 #, c-format
 msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "Släng och återskapa replikeringsslotten \"%s\" eller ändra parametern %s."
 
-#: replication/slot.c:2684
+#: replication/slot.c:3002
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
 msgstr "replikeringsslot \"%s\" angiven i parametern \"%s\" har inte active_pid"
 
-#: replication/slot.c:2688
+#: replication/slot.c:3006
 #, c-format
 msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
 msgstr "Starta standby associerad med replikeringsslot \"%s\" eller ändra parametern \"%s\"."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "ogiltig mål-LSN för WAL"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "replikeringsslot \"%s\" kan inte avanceras"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "Denna slot har aldrig tidigare reserverat WAL eller så har den invaliderats."
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr "kan inte flytta fram replikeringsslot till %X/%X, minimum är %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid "cannot copy physical replication slot \"%s\" as a logical replication slot"
 msgstr "kan inte kopiera fysisk replikeringsslot \"%s\" som en logisk replikeringsslot"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid "cannot copy logical replication slot \"%s\" as a physical replication slot"
 msgstr "kan inte kopiera logisk replikeringsslot \"%s\" som en fysisk replikeringsslot"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "kan inte kopiera en replikeringsslot som inte tidigare har reserverat WAL"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "kan inte kopiera replikeringsslot \"%s\" som blivit ogiltig"
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "kunde inte kopiera replikeringsslot \"%s\""
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid "The source replication slot was modified incompatibly during the copy operation."
 msgstr "Källreplikeringsslotten ändrades på ett inkompatibelt sätt under copy-operationen."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr "kan inte kopiera ej slutförd replikeringsslot \"%s\""
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr "Försök igen när källreplikeringsslottens confirmed_flush_lsn är giltig."
 
-#: replication/slotfuncs.c:877
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "kan inte kopiera replikeringsslot \"%s\""
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "Källreplikeringsslotten gjordes ogiltig under copy-operationen."
+
+#: replication/slotfuncs.c:906
 #, c-format
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "replikerings-slot kan bara synkroniseras till en standby-server"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "avbryter väntan på synkron replikering samt avslutar anslutning på grund av ett administratörskommando"
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, c-format
 msgid "The transaction has already committed locally, but might not have been replicated to the standby."
 msgstr "Transaktionen har redan commit:ats lokalt men har kanske inte replikerats till standby:en."
 
-#: replication/syncrep.c:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "avbryter väntan på synkron replikering efter användarens önskemål"
 
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "standby \"%s\" är nu en synkron standby med prioritet %d"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "standby \"%s\" är nu en kvorumkandidat för synkron standby"
 
-#: replication/syncrep.c:1013
+#: replication/syncrep.c:1081
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr "\"synchronous_standby_names\"-parser misslyckades"
+msgid "\"%s\" parser failed."
+msgstr "parser \"%s\" misslyckades"
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1088
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "antal synkrona standbys (%d) måste vara fler än noll"
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "avslutar wal-mottagarprocessen på grund av ett administratörskommando"
+msgid "streaming replication receiver \"%s\" could not connect to the primary server: %s"
+msgstr "strömmande replikeringsmottagare \"%s\" kunde inte ansluta till primärserver: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "databassystemets identifierare skiljer sig åt mellan primären och standby:en"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "Primärens identifierare är %s, standby:ens identifierare är %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr "högsta tidslinjen %u i primären är efter återställningstidslinjen %u"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr "startade strömning av WAL från primären vid %X/%X på tidslinje %u"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "återstartade WAL-strömning vid %X/%X på tidslinje %u"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "kan inte fortsätta WAL-strömning, återställning har redan avslutats"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "replikering avslutad av primär server"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "Slut på WAL nådd på tidslinje %u vid %X/%X."
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "avslutar wal-mottagare på grund av timeout"
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr "primär server har ingen mer WAL på efterfrågad tidslinje %u"
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "kunde inte stänga WAL-segment %s: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "hämtar tidslinjehistorikfil för tidslinje %u från primära servern"
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "kunde inte skriva till WAL-segment %s på offset %d, längd %lu: %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "kan inte använda %s med logisk replikeringsslot"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1735
+#: replication/walsender.c:623 storage/smgr/md.c:1881
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "kunde inte söka (seek) till slutet av filen \"%s\": %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "kunde inte söka till början av filen \"%s\": %m"
 
-#: replication/walsender.c:853
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "kan inte använda logisk replikeringsslot för fysisk replikering"
 
-#: replication/walsender.c:919
+#: replication/walsender.c:909
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "efterfrågad startpunkt %X/%X på tidslinje %u finns inte i denna servers historik"
 
-#: replication/walsender.c:922
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "Denna servers historik delade sig från tidslinje %u vid %X/%X."
 
-#: replication/walsender.c:966
+#: replication/walsender.c:956
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "efterfrågad startpunkt %X/%X är längre fram än denna servers flush:ade WAL-skrivposition %X/%X"
 
-#: replication/walsender.c:1160
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "okänt värde för CREATE_REPLICATION_SLOT-flagga \"%s\": \"%s\""
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s får inte anropas i en transaktion"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s måste anropas i en transaktion"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s måste anropas i transaktions REPEATABLE READ-isolationsläge"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s måste anropas i en read-only-transaktion"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s måste anropas innan någon fråga"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s får inte anropas i en undertransaktion"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "stänger ner walsender-process efter befordran"
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "kan inte utföra nya kommandon när WAL-sändare är i stopp-läge"
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "kan inte köra SQL-kommandon i WAL-sändare för fysisk replikering"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "tog emot replikeringskommando: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1142
-#: tcop/postgres.c:1500 tcop/postgres.c:1752 tcop/postgres.c:2234
-#: tcop/postgres.c:2672 tcop/postgres.c:2749
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137
+#: tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251
+#: tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr "aktuella transaktionen har avbrutits, alla kommandon ignoreras tills slutet på transaktionen"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "oväntat EOF från standby-anslutning"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "ogiltigt standby-meddelandetyp \"%c\""
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "oväntad meddelandetyp \"%c\""
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2789
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "avslutar walsender-process på grund av replikerings-timeout"
@@ -22186,286 +23036,286 @@ msgstr "regel \"%s\" för relation \"%s\" existerar inte"
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "byta namn på en ON SELECT-regel tillåts inte"
 
-#: rewrite/rewriteHandler.c:588
+#: rewrite/rewriteHandler.c:590
 #, c-format
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr "WITH-frågenamn \"%s\" finns både i en regelhändelse och i frågan som skrivs om"
 
-#: rewrite/rewriteHandler.c:615
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "INSERT ... SELECT-regler stöds inte för frågor som har datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:668
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "kan inte ha RETURNING-listor i multipla regler"
 
-#: rewrite/rewriteHandler.c:900 rewrite/rewriteHandler.c:939
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "kan inte sätta in ett icke-DEFAULT-värde i kolumn \"%s\""
 
-#: rewrite/rewriteHandler.c:902 rewrite/rewriteHandler.c:968
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "Kolumn \"%s\" är en identitetskolumn definierad som GENERATED ALWAYS."
 
-#: rewrite/rewriteHandler.c:904
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "Använd OVERRIDING SYSTEM VALUE för att överskugga."
 
-#: rewrite/rewriteHandler.c:966 rewrite/rewriteHandler.c:974
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "kolumn \"%s\" kan bara uppdateras till DEFAULT"
 
-#: rewrite/rewriteHandler.c:1109 rewrite/rewriteHandler.c:1127
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "flera tilldelningar till samma kolumn \"%s\""
 
-#: rewrite/rewriteHandler.c:1682
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE stöds inte för relationer med regler."
 
-#: rewrite/rewriteHandler.c:1722 rewrite/rewriteHandler.c:3262
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
 msgstr "access till icke-system vy \"%s\" är begränsad"
 
-#: rewrite/rewriteHandler.c:2122 rewrite/rewriteHandler.c:4254
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "oändlig rekursion detekterad i reglerna för relation \"%s\""
 
-#: rewrite/rewriteHandler.c:2227
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "oändlig rekursion detekterad i policy för relation \"%s\""
 
-#: rewrite/rewriteHandler.c:2589
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "Skräpkolumner i vy är inte uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2594
+#: rewrite/rewriteHandler.c:2606
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Vykolumner som inte är kolumner i dess basrelation är inte uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2597
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Vykolumner som refererar till systemkolumner är inte uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2600
+#: rewrite/rewriteHandler.c:2612
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Vykolumner som returnerar hel-rad-referenser är inte uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2661
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Vyer som innehåller DISTINCT är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2664
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Vyer som innehåller GROUP BY är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2667
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Vyer som innehåller HAVING är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2670
+#: rewrite/rewriteHandler.c:2682
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Vyer som innehåller UNION, INTERSECT eller EXCEPT är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2673
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Vyer som innehåller WITH är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2676
+#: rewrite/rewriteHandler.c:2688
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Vyer som innehåller LIMIT eller OFFSET är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2688
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Vyer som returnerar aggregatfunktioner är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2691
+#: rewrite/rewriteHandler.c:2703
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Vyer som returnerar fönsterfunktioner uppdateras inte automatiskt."
 
-#: rewrite/rewriteHandler.c:2694
+#: rewrite/rewriteHandler.c:2706
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Vyer som returnerar mängd-returnerande funktioner är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2701 rewrite/rewriteHandler.c:2705
-#: rewrite/rewriteHandler.c:2713
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717
+#: rewrite/rewriteHandler.c:2725
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Vyer som inte läser från en ensam tabell eller vy är inte automatiskt uppdateringsbar."
 
-#: rewrite/rewriteHandler.c:2716
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Vyer som innehåller TABLESAMPLE är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:2740
+#: rewrite/rewriteHandler.c:2752
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Vyer som inte har några uppdateringsbara kolumner är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:3121 rewrite/rewriteHandler.c:3156
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "kan inte sätta in i vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3124
+#: rewrite/rewriteHandler.c:3136
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "För att tillåta insättning i en vy så skapa en INSTEAD OF INSERT-trigger eller en villkorslös ON INSERT DO INSTEAD-regel."
 
-#: rewrite/rewriteHandler.c:3129 rewrite/rewriteHandler.c:3165
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "kan inte uppdatera vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3132
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "För att tillåta uppdatering av en vy så skapa en INSTEAD OF UPDATE-trigger eller en villkorslös ON UPDATE DO INSTEAD-regel."
 
-#: rewrite/rewriteHandler.c:3137 rewrite/rewriteHandler.c:3174
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "kan inte radera från vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3140
+#: rewrite/rewriteHandler.c:3152
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "För att tillåta bortagning i en vy så skapa en INSTEAD OF DELETE-trigger eller en villkorslös ON DELETE DO INSTEAD-regel."
 
-#: rewrite/rewriteHandler.c:3159
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
 msgstr "För att tillåta insert till en vy med MERGE så krävs en INSTEAD OF INSERT-trigger."
 
-#: rewrite/rewriteHandler.c:3168
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
 msgstr "För att tillåta uppdatering av en vy så krävs en INSTEAD OF UPDATE-trigger."
 
-#: rewrite/rewriteHandler.c:3177
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
 msgstr "För att tillåta borttagning från en vy så krävs en INSTEAD OF DELETE-trigger."
 
-#: rewrite/rewriteHandler.c:3352
+#: rewrite/rewriteHandler.c:3364
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "kan inte insert:a i kolumn \"%s\" i vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3360
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "kan inte uppdatera kolumn \"%s\" i view \"%s\""
 
-#: rewrite/rewriteHandler.c:3368
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
 msgstr "kan inte merge:a till kolumn \"%s\" i vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3396
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
 msgstr "kan inte merge:a till vy \"%s\""
 
-#: rewrite/rewriteHandler.c:3398
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
 msgstr "MERGE stöds inte för vyer med INSTEAD OF-trigger för vissa actions men inte för andra."
 
-#: rewrite/rewriteHandler.c:3399
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
 msgstr "För att tillåta merge till en vy så antingen skapa en full uppsättning INSTEAD OF-triggers eller släng de befintliga INSERT OF-triggers."
 
-#: rewrite/rewriteHandler.c:3912
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr "DO INSTEAD NOTIFY-regler stöds inte för datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:3923
+#: rewrite/rewriteHandler.c:3953
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr "DO INSTEAD NOTHING-regler stöds inte för datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:3937
+#: rewrite/rewriteHandler.c:3967
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "villkorliga DO INSTEAD-regler stöds inte för datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:3941
+#: rewrite/rewriteHandler.c:3971
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "DO ALSO-regler stöds inte för datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:3946
+#: rewrite/rewriteHandler.c:3976
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "fler-satsiga DO INSTEAD-regler stöds inte för datamodifierande satser i WITH"
 
-#: rewrite/rewriteHandler.c:4206
+#: rewrite/rewriteHandler.c:4237
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr "Vyer med villkorliga DO INSTEAD-regler är inte automatiskt uppdateringsbara."
 
-#: rewrite/rewriteHandler.c:4303
+#: rewrite/rewriteHandler.c:4335
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "kan inte utföra INSERT RETURNING på relation \"%s\""
 
-#: rewrite/rewriteHandler.c:4305
+#: rewrite/rewriteHandler.c:4337
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr "Du behöver en villkorslös ON INSERT DO INSTEAD-regel med en RETURNING-klausul."
 
-#: rewrite/rewriteHandler.c:4310
+#: rewrite/rewriteHandler.c:4342
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "kan inte utföra UPDATE RETURNING på relation \"%s\""
 
-#: rewrite/rewriteHandler.c:4312
+#: rewrite/rewriteHandler.c:4344
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "Du behöver en villkorslös ON UPDATE DO INSTEAD-regel med en RETURNING-klausul."
 
-#: rewrite/rewriteHandler.c:4317
+#: rewrite/rewriteHandler.c:4349
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "kan inte utföra DELETE RETURNING på relation \"%s\""
 
-#: rewrite/rewriteHandler.c:4319
+#: rewrite/rewriteHandler.c:4351
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr "Du behöver en villkorslös ON DELETE DO INSTEAD-regel med en RETURNING-klausul."
 
-#: rewrite/rewriteHandler.c:4337
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT med ON CONFLICT-klausul kan inte användas med tabell som har INSERT- eller UPDATE-regler"
 
-#: rewrite/rewriteHandler.c:4394
+#: rewrite/rewriteHandler.c:4426
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "WITH kan inte användas i en fråga där regler skrivit om den till flera olika frågor"
 
-#: rewrite/rewriteManip.c:1084
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "villkorliga hjälpsatser är inte implementerat"
 
-#: rewrite/rewriteManip.c:1431
+#: rewrite/rewriteManip.c:1520
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "WHERE CURRENT OF för en vy är inte implementerat"
 
-#: rewrite/rewriteManip.c:1767
+#: rewrite/rewriteManip.c:1923
 #, 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 "NEW-variabler i ON UPDATE-regler kan inte referera till kolumner som är del av en multiple uppdatering i subjektets UPDATE-kommando"
@@ -22475,148 +23325,209 @@ msgstr "NEW-variabler i ON UPDATE-regler kan inte referera till kolumner som är
 msgid "with a SEARCH or CYCLE clause, the recursive reference to WITH query \"%s\" must be at the top level of its right-hand SELECT"
 msgstr "med en SEARCH- eller CYCLE-klausul så måste rekursiva referensen till WITH-fråga \"%s\" vara på toppnivå eller i dess högra SELECT"
 
-#: scan.l:497
+#: scan.l:483
 msgid "unterminated /* comment"
 msgstr "ej avslutad /*-kommentar"
 
-#: scan.l:517
+#: scan.l:503
 msgid "unterminated bit string literal"
 msgstr "ej avslutad bitsträngslitteral"
 
-#: scan.l:531
+#: scan.l:517
 msgid "unterminated hexadecimal string literal"
 msgstr "ej avslutad hexadecimal stränglitteral"
 
-#: scan.l:581
+#: scan.l:567
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "osäker användning av strängkonstand med Unicode-escape:r"
 
-#: scan.l:582
+#: scan.l:568
 #, c-format
 msgid "String constants with Unicode escapes cannot be used when \"standard_conforming_strings\" is off."
 msgstr "Strängkonstanter som innehåller Unicode-escapesekvenser kan inte användas när \"standard_conforming_strings\" är av."
 
-#: scan.l:643
+#: scan.l:629
 msgid "unhandled previous state in xqs"
 msgstr "tidigare state i xqs som ej kan hanteras"
 
-#: scan.l:717
+#: scan.l:703
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Unicode-escapesekvenser måste vara \\uXXXX eller \\UXXXXXXXX."
 
-#: scan.l:728
+#: scan.l:714
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "osäker användning av \\' i stränglitteral"
 
-#: scan.l:729
+#: scan.l:715
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr "Använd '' för att inkludera ett enkelcitattecken i en sträng. \\' är inte säkert i klient-teckenkodning."
 
-#: scan.l:801
+#: scan.l:787
 msgid "unterminated dollar-quoted string"
 msgstr "icke terminerad dollarciterad sträng"
 
-#: scan.l:818 scan.l:828
+#: scan.l:804 scan.l:814
 msgid "zero-length delimited identifier"
 msgstr "noll-längds avdelad identifierare"
 
-#: scan.l:839 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "icke terminerad citerad identifierare"
 
-#: scan.l:1002
+#: scan.l:988
 msgid "operator too long"
 msgstr "operatorn är för lång"
 
-#: scan.l:1015
+#: scan.l:1001
+msgid "parameter number too large"
+msgstr "parameternummer är för stort"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "skräptecken kommer efter parameter"
 
-#: scan.l:1036
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "ogiltigt hexdecimalt heltal"
 
-#: scan.l:1040
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "ogiltigt oktalt heltal"
 
-#: scan.l:1044
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "ogiltigt binärt heltal"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1239
+#: scan.l:1231
 #, c-format
 msgid "%s at end of input"
 msgstr "%s vid slutet av indatan"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1247
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s vid eller nära \"%s\""
 
-#: scan.l:1439
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "ickestandard användning av \\' i stränglitteral"
 
-#: scan.l:1440
+#: scan.l:1432
 #, c-format
 msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr "Använd '' för att skriva citattecken i strängar eller använd escape-strängsyntac (E'...')."
 
-#: scan.l:1449
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "ickestandard användning av \\\\ i strängslitteral"
 
-#: scan.l:1450
+#: scan.l:1442
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "Använd escape-strängsyntax för bakstreck, dvs. E'\\\\'."
 
-#: scan.l:1464
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "ickestandard användning av escape i stränglitteral"
 
-#: scan.l:1465
+#: scan.l:1457
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "Använd escape-strängsyntax, dvs E'\\r\\n'."
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr "det finns ingen Snowball-stemmer för språk \"%s\" och kodning \"%s\""
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "multipla StoppOrd-parametrar"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "multipla parametrar \"Language\""
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "okänd Snowball-parameter: \"%s\""
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "saknar parameter \"Language\""
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937
+#: statistics/relation_stats.c:98
+#, c-format
+msgid "Statistics cannot be modified during recovery."
+msgstr "Statistik kan inte ändras under återställning."
+
+#: statistics/attribute_stats.c:205
+#, c-format
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "kan inte ange både \"%s\" och \"%s\""
+
+#: statistics/attribute_stats.c:231
+#, c-format
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "måste ange antingen \"%s\" eller \"%s\""
+
+#: statistics/attribute_stats.c:239
+#, c-format
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "kan inte ändra statistik på systemkolumn \"%s\""
+
+#: statistics/attribute_stats.c:303
+#, c-format
+msgid "could not determine element type of column \"%s\""
+msgstr "kan inte bestämma elementtypen på kolumn \"%s\""
+
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321
+#: statistics/attribute_stats.c:336
+#, c-format
+msgid "Cannot set %s or %s."
+msgstr "Kan inte sätta %s eller %s."
+
+#: statistics/attribute_stats.c:320
+#, c-format
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "kunde inte härleda mindre-än-operator för kolumnen \"%s\""
+
+#: statistics/attribute_stats.c:335
+#, c-format
+msgid "column \"%s\" is not a range type"
+msgstr "kolumnen \"%s\" är inte en range-typ"
+
+#: statistics/attribute_stats.c:738
+#, c-format
+msgid "\"%s\" array must not contain null values"
+msgstr "\"%s\"-array:er får inte innehålla null-värden"
+
+#: statistics/attribute_stats.c:781
+#, c-format
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "maximalt antal statistikslottar överskridet: %d"
+
+#: statistics/attribute_stats.c:949
+#, c-format
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "kan inte nollställa statistik på systemkolumn \"%s\""
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
 msgstr "statistikobjekt \"%s.%s\" kunde inte beräknas för relation \"%s.%s\""
@@ -22626,57 +23537,227 @@ msgstr "statistikobjekt \"%s.%s\" kunde inte beräknas för relation \"%s.%s\""
 msgid "function returning record called in context that cannot accept type record"
 msgstr "en funktion med post som värde anropades i sammanhang där poster inte kan godtagas."
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:117
+#, c-format
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "argument \"%s\" får inte vara mindre än -1.0"
+
+#: statistics/stat_utils.c:47
+#, c-format
+msgid "argument \"%s\" must not be null"
+msgstr "argument \"%s\" får inte vara null"
+
+#: statistics/stat_utils.c:74
+#, c-format
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "argument \"%s\" får inte vara en multidimensionell array"
+
+#: statistics/stat_utils.c:83
+#, c-format
+msgid "argument \"%s\" array must not contain null values"
+msgstr "argument \"%s\"-array:er får inte innehålla null-värden"
+
+#: statistics/stat_utils.c:114
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "argument \"%s\" måste ges när argumentet \"%s\" används"
+
+#: statistics/stat_utils.c:177
+#, c-format
+msgid "index \"%s\" was concurrently dropped"
+msgstr "index \"%s\" togs bort parallellt"
+
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "index \"%s\" skapades parallellt"
+
+#: statistics/stat_utils.c:212
+#, c-format
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "kan inte ändra statistik för relationen \"%s\""
+
+#: statistics/stat_utils.c:220
+#, c-format
+msgid "cannot modify statistics for shared relation"
+msgstr "kan inte ändra statistik för delad relation"
+
+#: statistics/stat_utils.c:260
+#, c-format
+msgid "unrecognized argument name: \"%s\""
+msgstr "okänt argumentnamn: \"%s\""
+
+#: statistics/stat_utils.c:274
+#, c-format
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "argumentet till \"%s\" har typen %s, förväntade typen %s"
+
+#: statistics/stat_utils.c:315
+#, c-format
+msgid "variadic arguments must be name/value pairs"
+msgstr "variadic-argument måste vara namn/värde-par"
+
+#: statistics/stat_utils.c:316
+#, c-format
+msgid "Provide an even number of variadic arguments that can be divided into pairs."
+msgstr "Provide an even number of variadic arguments that can be divided into pairs."
+
+#: statistics/stat_utils.c:330
+#, c-format
+msgid "name at variadic position %d is null"
+msgstr "namnet vid variadic position %d är null"
+
+#: statistics/stat_utils.c:334
+#, c-format
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "namn vid variadic position %d har typ %s, förväntade typ %s"
+
+#: storage/aio/aio.c:1343
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "Bara -1 eller värden större än 0 är giltiga."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
+msgstr "Kolla om io_uring är avstängd i /proc/sys/kernel/io_uring_disabled."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "Överväg att öka \"ulimit -n\" till minst %d."
+
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
+msgstr "Kärnan stöder inte io_uring."
+
+#: storage/aio/method_io_uring.c:388
+#, c-format
+msgid "could not setup io_uring queue: %m"
+msgstr "kunde inte sätta io_uring-kö: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "gör klart I/O åt process %d"
+
+#: storage/aio/method_worker.c:382
+#, c-format
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "I/O-arbetare utför I/O åt process %d"
+
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
 #, c-format
 msgid "cannot access temporary tables of other sessions"
 msgstr "får inte röra temporära tabeller som tillhör andra sessioner"
 
-#: storage/buffer/bufmgr.c:1532
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
+#, c-format
+msgid "cannot extend relation %s beyond %u blocks"
+msgstr "kan inte utöka relation %s utöver %u block"
+
+#: storage/buffer/bufmgr.c:2774
+#, c-format
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "oväntad data efter EOF i block %u för relation \"%s\""
+
+#: storage/buffer/bufmgr.c:2777
+#, c-format
+msgid "This has been seen to occur with buggy kernels; consider updating your system."
+msgstr "Detta beteende har observerats med buggiga kärnor; fundera på att uppdatera ditt system."
+
+#: storage/buffer/bufmgr.c:6178
+#, c-format
+msgid "could not write block %u of %s"
+msgstr "kunde inte skriva block %u av %s"
+
+#: storage/buffer/bufmgr.c:6182
+#, c-format
+msgid "Multiple failures --- write error might be permanent."
+msgstr "Multipla fel --- skrivfelet kan vara permanent."
+
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
+#, c-format
+msgid "writing block %u of relation \"%s\""
+msgstr "skriver block %u i relation \"%s\""
+
+#: storage/buffer/bufmgr.c:7317
+#, c-format
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr "nollställer %u sidor och ignorerar %u kontrollsummefel bland blocken %u..%u i relationen \"%s\""
+
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
+#, c-format
+msgid "Block %u held the first zeroed page."
+msgstr "Block %u hade den första nollade sidan."
+
+#: storage/buffer/bufmgr.c:7322
+#, c-format
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "Se server-logg för detaljer om det andra %d ogiltiga blocket."
+msgstr[1] "Se server-logg för detaljer om de andra %d ogiltiga blocken."
+
+#: storage/buffer/bufmgr.c:7339
+#, c-format
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u ogiltiga sidor bland blocken %u..%u i relationen \"%s\""
+
+#: storage/buffer/bufmgr.c:7340
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr "Block %u hade den första ogiltiga sidan."
+
+#: storage/buffer/bufmgr.c:7341
+#, c-format
+msgid "See server log for the other %u invalid block(s)."
+msgstr "Se server-logg för de andra %u ogiltiga blocken."
+
+#: storage/buffer/bufmgr.c:7346
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
-msgstr "felaktig sida i block %u för relation %s; nollställer sidan"
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr "felaktig sida i block %u för relation \"%s\"; nollställer sidan"
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: storage/buffer/bufmgr.c:7347
 #, c-format
-msgid "cannot extend relation %s beyond %u blocks"
-msgstr "kan inte utöka relation %s utöver %u block"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "nollar ut %u ogiltiga sidor bland blocken %u..%u i relationen \"%s\""
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:7349
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "oväntad data efter EOF i block %u för relation %s"
+msgid "See server log for the other %u zeroed block(s)."
+msgstr "Se server-logg för de andra %u nollade sidorna."
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:7354
 #, c-format
-msgid "This has been seen to occur with buggy kernels; consider updating your system."
-msgstr "Detta beteende har observerats med buggiga kärnor; fundera på att uppdatera ditt system."
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "ignorerar kontrollsummefel för block %u i relationen \"%s\""
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:7355
 #, c-format
-msgid "could not write block %u of %s"
-msgstr "kunde inte skriva block %u av %s"
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "ignorerar %u kontrollsummefel bland blocken %u..%u i relationen \"%s\""
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:7356
 #, c-format
-msgid "Multiple failures --- write error might be permanent."
-msgstr "Multipla fel --- skrivfelet kan vara permanent."
+msgid "Block %u held the first ignored page."
+msgstr "Block %u hade den första ignorerade sidan."
 
-#: storage/buffer/bufmgr.c:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:7357
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "skriver block %u i relation %s"
+msgid "See server log for the other %u ignored block(s)."
+msgstr "Se server-logg för de andra %u ignorerade sidorna."
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/localbuf.c:272
 #, c-format
 msgid "no empty local buffer available"
 msgstr "ingen tom lokal buffer tillgänglig"
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/localbuf.c:736
 #, c-format
 msgid "cannot access temporary tables during a parallel operation"
 msgstr "kan inte komma åt temporära tabeller under en parallell operation"
 
-#: storage/buffer/localbuf.c:712
+#: storage/buffer/localbuf.c:876
 #, c-format
 msgid "\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session."
 msgstr "\"temp_buffers\" kan inte ändras efter att man använt temporära tabeller i sessionen."
@@ -22696,21 +23777,26 @@ msgstr "kunde inte läsa från filmängd \"%s\": läste bara %zu av %zu byte"
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "kunde inte läsa från temporärfil: läste bara %zu av %zu byte"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "kunde inte bestämma storlek på temporär fil \"%s\" från BufFile \"%s\": %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "kunde inte radera filmängd \"%s\": %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1194
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1332
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "kunde inte trunkera fil \"%s\": %m"
 
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, c-format
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "kunde inte klona fil \"%s\" till \"%s\": %m"
+
 #: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
 #, c-format
 msgid "could not flush dirty data: %m"
@@ -22731,122 +23817,122 @@ msgstr "kunde inte göra munmap() vid flush:ning av data: %m"
 msgid "getrlimit failed: %m"
 msgstr "getrlimit misslyckades: %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1074
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "otillräckligt antal fildeskriptorer tillgängligt för att starta serverprocessen"
 
-#: storage/file/fd.c:1074
+#: storage/file/fd.c:1075
 #, c-format
-msgid "System allows %d, server needs at least %d."
-msgstr "Systemet tillåter %d, servern behöver minst %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
+msgstr "Systemet tillåter %d, servern behöver minst %d, %d filer är redan öppnade."
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1164 storage/file/fd.c:2679 storage/file/fd.c:2788
+#: storage/file/fd.c:2942
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "slut på fildeskriptorer: %m; frigör och försök igen"
 
-#: storage/file/fd.c:1536
+#: storage/file/fd.c:1540
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "temporär fil: sökväg \"%s\", storlek %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1679
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "kunde inte skapa temporär katalog \"%s\": %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1686
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "kunde inte skapa temporär underkatalog \"%s\": %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1883
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "kan inte skapa temporär fil \"%s\": %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1919
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "kunde inte öppna temporär fil \"%s\": %m"
 
 # unlink refererar till unix-funktionen unlink() så den översätter vi inte
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1960
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "kunde inte unlink:a temporär fil \"%s\": %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2050
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "kunde inte radera fil \"%s\": %m"
 
-#: storage/file/fd.c:2234
+#: storage/file/fd.c:2289
 #, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
-msgstr "storlek på temporär fil överskrider temp_file_limit (%dkB)"
+msgid "temporary file size exceeds \"temp_file_limit\" (%dkB)"
+msgstr "storlek på temporär fil överskrider \"temp_file_limit\" (%dkB)"
 
-#: storage/file/fd.c:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2655 storage/file/fd.c:2714
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "överskred maxAllocatedDescs (%d) vid försök att öppna fil \"%s\""
 
-#: storage/file/fd.c:2698
+#: storage/file/fd.c:2759
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "överskred maxAllocatedDescs (%d) vid försök att köra kommando \"%s\""
 
-#: storage/file/fd.c:2854
+#: storage/file/fd.c:2918
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "överskred maxAllocatedDescs (%d) vid försök att öppna katalog \"%s\""
 
-#: storage/file/fd.c:3384
+#: storage/file/fd.c:3449
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "oväntad fil hittades i katalogen för temporära filer: \"%s\""
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3567
 #, c-format
 msgid "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synkroniserar datakatalog (syncfs), förbrukad tid: %ld.%02d s, aktuell sökväg: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3794
 #, c-format
 msgid "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synkroniserar datakatalog (pre-fsync), förbrukad tid: %ld.%02d s, aktuell sökväg: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3826
 #, c-format
 msgid "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "synkroniserar datakatalog (fsync), förbrukad tid: %ld.%02d s, aktuell sökväg: %s"
 
-#: storage/file/fd.c:3950
+#: storage/file/fd.c:4015
 #, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr "\"debug_io_direct\" stöds inte på denna plattform."
+msgid "\"%s\" is not supported on this platform."
+msgstr "\"%s\" stöds inte på denna platform"
 
-#: storage/file/fd.c:3964
+#: storage/file/fd.c:4030 tcop/backend_startup.c:1080
 #, c-format
-msgid "Invalid list syntax in parameter \"%s\""
-msgstr "Ogiltigt listsyntax för parameter \"%s\""
+msgid "Invalid list syntax in parameter \"%s\"."
+msgstr "Ogiltigt listsyntax för parameter \"%s\"."
 
-#: storage/file/fd.c:3984
+#: storage/file/fd.c:4050 tcop/backend_startup.c:1054
 #, c-format
-msgid "Invalid option \"%s\""
-msgstr "Ogiltig flagga \"%s\""
+msgid "Invalid option \"%s\"."
+msgstr "Ogiltig flagga \"%s\"."
 
-#: storage/file/fd.c:3997
+#: storage/file/fd.c:4063
 #, c-format
-msgid "\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
-msgstr "\"debug_io_direct\" stöds inte för WAL då XLOG_BLCKSZ är för liten"
+msgid "\"%s\" is not supported for WAL because %s is too small."
+msgstr "\"%s\" stöds inte för WAL då %s är för liten."
 
-#: storage/file/fd.c:4004
+#: storage/file/fd.c:4071
 #, c-format
-msgid "\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
-msgstr "\"debug_io_direct\" stöds inte för data då BLCKSZ är för liten"
+msgid "\"%s\" is not supported for data because %s is too small."
+msgstr "\"%s\" stöds inte för data då %s är för liten."
 
 #: storage/file/reinit.c:145
 #, c-format
@@ -22933,58 +24019,74 @@ msgstr "kunde inte stänga delat minnessegment \"%s\": %m"
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "kunde inte duplicera handle för \"%s\": %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "Namn på DSM-segment får inte vara tomt"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "Namn på DSM-segment är för långt"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "Storlek på DSM-segment får inte vara noll"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr "efterfrågad storlek på DSM-segment matchar inte storleken på nuvarande segment"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:357
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "ledsen, för många klienter"
 
-#: storage/ipc/procarray.c:3857
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "databasen \"%s\" används av förberedda transationer"
 
-#: storage/ipc/procarray.c:3893 storage/ipc/procarray.c:3901
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "rättighet saknas för att avsluta process"
 
-#: storage/ipc/procarray.c:3894 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid "Only roles with the %s attribute may terminate processes of roles with the %s attribute."
 msgstr "Bara roller med attributet %s får terminera processer för roller som har attributet %s."
 
-#: storage/ipc/procarray.c:3902 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr "Bara roller med rättigheter från rollen vars process kommer termineras eller med rättigheter från rollen \"%s\" får terminera denna process."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr "väntare fortfarande på att backend:en med PID %d skall acceptera ProcSignalBarrier"
 
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "ogiltig cancel-förfrågan med PID 0"
+
+#: storage/ipc/procsignal.c:788
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "fel nyckel i avbrytbegäran för process %d"
+
+#: storage/ipc/procsignal.c:797
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "PID %d i avbrytbegäran matchade inte någon process"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -22995,12 +24097,12 @@ msgstr "kan inte skicka ett meddelande med storlek %zu via kö i delat minne"
 msgid "invalid message size %zu in shared memory queue"
 msgstr "ogiltig meddelandestorlek %zu i kö i delat minne"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:984
-#: storage/lmgr/lock.c:1022 storage/lmgr/lock.c:2835 storage/lmgr/lock.c:4220
-#: storage/lmgr/lock.c:4285 storage/lmgr/lock.c:4635
-#: storage/lmgr/predicate.c:2468 storage/lmgr/predicate.c:2483
-#: storage/lmgr/predicate.c:3880 storage/lmgr/predicate.c:4927
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "slut på delat minne"
@@ -23030,269 +24132,285 @@ msgstr "otillräckligt delat minne för datastruktur \"%s\" (efterfrågade %zu b
 msgid "requested shared memory size overflows size_t"
 msgstr "efterfrågad delat minnesstorlek överskrider size_t"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d är inte en PostgreSQL backend-process"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1453
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "kunde inte skicka signal till process %d: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "rättighet saknas för att avbryta fråga"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid "Only roles with the %s attribute may cancel queries of roles with the %s attribute."
 msgstr "Bara roller med attributet %s får avbryta frågor åt roller med attributet %s."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr "Bara roller med rättigheter från rollen \"%s\" får avbryta autovacuum-arbetare."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid "Only roles with privileges of the role whose query is being canceled or with privileges of the \"%s\" role may cancel this query."
 msgstr "Bara roller med rättigheter från rollen vars fråga kommer avbrytas eller med rättigheter från rollen \"%s\" får avbryta denna fråga."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr "kunde inte kontrollera existensen av en backend med PID %d: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "backend med PID %d terminerade inte inom %lld millisekund"
-msgstr[1] "backend med PID %d terminerade inte inom %lld millisekunder"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural "backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "backend med PID %d terminerade inte inom %<PRId64> millisekund"
+msgstr[1] "backend med PID %d terminerade inte inom %<PRId64> millisekunder"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "\"timeout\" kan inte vara negativ"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may terminate autovacuum workers."
+msgstr "Bara roller med rättigheter från rollen \"%s\" får avsluta autovacuum-arbetare."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "rotering är inte möjligt då logginsamling inte är aktiverad"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "återställning väntar fortfarande efter %ld.%03d ms: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "återställning slutade vänta efter efter %ld.%03d ms: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3196
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "avbryter sats på grund av konflikt med återställning"
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:2557
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "Användartransaktion orsakade deadlock för buffer vid återställning."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "okänt skäl"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "återställningskonflikt vid bufferfastlåsning"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "återställningskonflikt vid lås"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "återställningskonflikt vid tabellutrymme"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "återställningskonflikt vid snapshot"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "återställningskonflikt vid replikeringsslot"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "återställningskonflikt vid bufferdeadlock"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "återställningskonflikt vid databas"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr "pg_largeobject-post för OID %u, sida %d har ogiltig datafältstorlek %d"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "ogiltiga flaggor för att öppna stort objekt: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "rättighet saknas för stort objekt %u"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "ogiltig whence-inställning: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "ogiltig storlek för stort objects skrivningbegäran: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr "Process %d väntar på %s för %s; blockerad av process %d."
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "Process %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "deadlock upptäckt"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "Se server-logg för frågedetaljer."
 
-#: storage/lmgr/lmgr.c:848
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "vid uppdatering av tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:851
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "vid borttagning av tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:854
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "vid låsning av tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:857
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "vid låsning av uppdaterad version (%u,%u) av tupel i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:860
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "vid insättning av indextupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:863
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "vid kontroll av unikhet av tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:866
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "vid återkontroll av uppdaterad tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:869
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr "vid kontroll av uteslutningsvillkor av tupel (%u,%u) i relation \"%s\""
 
-#: storage/lmgr/lmgr.c:1239
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "relation %u i databasen %u"
 
-#: storage/lmgr/lmgr.c:1245
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "utökning av relation %u i databas %u"
 
-#: storage/lmgr/lmgr.c:1251
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid för databas %u"
 
-#: storage/lmgr/lmgr.c:1256
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "sida %u i relation %u i databas %u"
 
-#: storage/lmgr/lmgr.c:1263
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "tuple (%u,%u) i relation %u i databas %u"
 
-#: storage/lmgr/lmgr.c:1271
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "transaktion %u"
 
-#: storage/lmgr/lmgr.c:1276
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "vituell transaktion %d/%u"
 
-#: storage/lmgr/lmgr.c:1282
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "spekulativ token %u för transaktion %u"
 
-#: storage/lmgr/lmgr.c:1288
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "objekt %u av klass %u i databas %u"
 
-#: storage/lmgr/lmgr.c:1296
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "användarlås [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1303
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "rådgivande lås [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1311
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "fjärrtransaktion %u för prenumeration %u i databas %u"
 
-#: storage/lmgr/lmgr.c:1318
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "okänd låsetikettyp %d"
 
-#: storage/lmgr/lock.c:812
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "kan inte ta låsläge %s på databasobjekt när återställning pågår"
 
-#: storage/lmgr/lock.c:814
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "Bara RowExclusiveLock eller lägre kan tas på databasobjekt under återställning."
 
-#: storage/lmgr/lock.c:3284 storage/lmgr/lock.c:3352 storage/lmgr/lock.c:3468
+#: storage/lmgr/lock.c:1185
+#, c-format
+msgid "process %d could not obtain %s on %s"
+msgstr "process %d kunde inte ta %s på %s"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "kan inte göra PREPARE samtidigt som vi håller lås på sessionsnivå och transaktionsnivå för samma objekt"
@@ -23312,678 +24430,718 @@ msgstr "Du kan behöva köra färre samtidiga transaktioner eller öka \"max_con
 msgid "not enough elements in RWConflictPool to record a potential read/write conflict"
 msgstr "ej tillräckligt med element i RWConflictPool för att spara ner en potentiell läs/skriv-konflikt"
 
-#: storage/lmgr/predicate.c:1686
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr "\"default_transaction_isolation\" är satt till \"serializable\"."
 
-#: storage/lmgr/predicate.c:1687
+#: storage/lmgr/predicate.c:1697
 #, c-format
 msgid "You can use \"SET default_transaction_isolation = 'repeatable read'\" to change the default."
 msgstr "Du kan använda \"SET default_transaction_isolation = 'repeatable read'\" för att ändra standardvärdet."
 
-#: storage/lmgr/predicate.c:1738
+#: storage/lmgr/predicate.c:1748
 #, c-format
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "en snapshot-importerande transaktion får inte vara READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1817 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "kunde inte importera efterfrågat snapshot"
 
-#: storage/lmgr/predicate.c:1818 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "Källprocessen med PID %d kör inte längre."
 
-#: storage/lmgr/predicate.c:3991 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4060 storage/lmgr/predicate.c:4068
-#: storage/lmgr/predicate.c:4107 storage/lmgr/predicate.c:4337
-#: storage/lmgr/predicate.c:4656 storage/lmgr/predicate.c:4668
-#: storage/lmgr/predicate.c:4715 storage/lmgr/predicate.c:4751
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, c-format
 msgid "could not serialize access due to read/write dependencies among transactions"
 msgstr "kunde inte serialisera åtkomst på grund av läs/skriv-beroenden bland transaktionerna"
 
-#: storage/lmgr/predicate.c:3993 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4062 storage/lmgr/predicate.c:4070
-#: storage/lmgr/predicate.c:4109 storage/lmgr/predicate.c:4339
-#: storage/lmgr/predicate.c:4658 storage/lmgr/predicate.c:4670
-#: storage/lmgr/predicate.c:4717 storage/lmgr/predicate.c:4753
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "Transaktionen kan lyckas om den körs igen."
 
-#: storage/lmgr/proc.c:353
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid "number of requested standby connections exceeds \"max_wal_senders\" (currently %d)"
 msgstr "antalet efterfrågade standby-anslutningar överskrider \"max_wal_senders\" (nu %d)"
 
-#: storage/lmgr/proc.c:1546
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "process %d undvek deadlock på %s för %s genom att kasta om köordningen efter %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1561
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "process %d upptäckte deadlock medan den väntade på %s för %s efter %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1570
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "process %d väntar fortfarande på %s för %s efter %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1577
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "process %d fick %s på %s efter %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1594
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "process %d misslyckades att ta %s på %s efter %ld.%03d ms"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "sidverifiering misslyckades, beräknade kontrollsumma %u men förväntade %u"
 
-#: storage/page/bufpage.c:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "korrupta sidpekare: lägre = %u, övre = %u, special = %u"
 
-#: storage/page/bufpage.c:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "korrupt radpekare: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "trasiga postlängder: totalt %u, tillgänglig plats %u"
 
-#: storage/page/bufpage.c:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "korrupt radpekare: offset = %u, storlek = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "kan inte utöka fil \"%s\" utöver %u block"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:639
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "kunde inte utöka fil \"%s\": %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "kunde inte utöka fil \"%s\": skrev bara %d av %d byte vid block %u"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:617
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "kunde inte utöka fil \"%s\" med FileFallocate(): %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:910 storage/smgr/md.c:2061
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "kunde inte läsa block %u..%u i fil \"%s\": %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:957 storage/smgr/md.c:2074
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "kunde inte läsa block %u..%u i fil \"%s\": läste bara %zu av %zu byte"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1034
+#, c-format
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "kunde inte börja läsa block %u..%u i fil \"%s\": %m"
+
+#: storage/smgr/md.c:1130
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "kunde inte skriva block %u..%u i fil \"%s\": %m"
 
-#: storage/smgr/md.c:1165
+#: storage/smgr/md.c:1303
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "kunde inte trunkera fil \"%s\" till %u block: den är bara %u block nu"
 
-#: storage/smgr/md.c:1220
+#: storage/smgr/md.c:1358
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "kunde inte trunkera fil \"%s\" till %u block: %m"
 
-#: storage/smgr/md.c:1700
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr "kunde inte öppna fil \"%s\" (målblock %u): föregående segment är bara %u block"
 
-#: storage/smgr/md.c:1714
+#: storage/smgr/md.c:1860
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "kunde inte öppna fil \"%s\" (målblock %u): %m"
 
-#: tcop/backend_startup.c:85
+#: storage/smgr/smgr.c:1115
+#, c-format
+msgid "file \"%s\""
+msgstr "fil \"%s\""
+
+#: storage/smgr/smgr.c:1117
+#, c-format
+msgid "block %u in file \"%s\""
+msgstr "block %u i fil \"%s\""
+
+#: storage/smgr/smgr.c:1121
+#, c-format
+msgid "blocks %u..%u in file \"%s\""
+msgstr "block %u..%u i fil \"%s\""
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "SSL-konfigurering kunde inte laddas i barnprocess"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "ansluting mottagen: värd=%s port=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "ansluting mottagen: värd=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "databassystemet startar upp"
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "databassystemet tar inte emot anslutningar"
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "Hot standby-läge är avstängt."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "databassystemet tar ännu inte emot anslutningar"
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "Konsistent återställningstillstånd har ännu inte uppnåtts."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr "Återställnings-snapshot är inte klart än på hot standby."
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "databassystemet tar inte emot anslutningar"
+msgid "To enable hot standby, close write transactions with more than %d subtransactions on the primary server."
+msgstr "För att aktivera hot standby, stäng skrivtransaktioner med mer än %d undertransaktioner på primära servern."
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "Hot standby-läge är avstängt."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "Konsistent återställningstillstånd har ännu inte uppnåtts."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "databassystemet stänger ner"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "databassystemet är återställningsläge"
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid "received direct SSL connection request without ALPN protocol negotiation extension"
 msgstr "förfrågan för direkt SSL-anslutning har mottagits utan utökning för ALPN-protokollförhandling"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
 msgstr "direkt SSL-anslutning accepterad"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
 msgstr "direkt SSL-anslutning avvisad"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "ofullständigt startuppaket"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "ogiltig längd på startuppaket"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
 msgstr "SSLRequest accepterad"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
 msgstr "SSLRequest nekad"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "misslyckades att skicka SSL-förhandlingssvar: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "tog emot okrypterad data efter SSL-förfrågan"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid "This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."
 msgstr "Detta kan antingen vara en bug i klientens mjukvara eller bevis på ett försök att utföra en attack av typen man-in-the-middle."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
 msgstr "GSSENCRequest accepterad"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
 msgstr "GSSENCRequest nekad"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "misslyckades att skicka GSSAPI-förhandlingssvar: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "tog emot okrypterad data efter GSSAPI-krypteringsförfrågan"
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr "inget stöd för framändans protokoll %u.%u: servern stöder %u.0 till %u.%u"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Giltiga värden är: \"false\", 0, \"true\", 1, \"database\"."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "ogiltig startpaketlayout: förväntade en terminator som sista byte"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "inget PostgreSQL-användarnamn angivet i startuppaketet"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, c-format
+msgid "invalid length of cancel request packet"
+msgstr "ogiltig längd på paket för cancel-begäran"
+
+#: tcop/backend_startup.c:892
+#, c-format
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "ogiltig längd på cancel-nyckel i paket för cancel-begäran"
+
+#: tcop/backend_startup.c:1022
+#, c-format
+msgid "Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr "Kan inte ange flaggan \"%s\" för log_connections i en lista med andra flaggor."
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "funktionen med OID %u existerar inte"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "kan inte anropa funktionen \"%s\" via fastpath-interface"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "fastpath funktionsanrop: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1369 tcop/postgres.c:1605
-#: tcop/postgres.c:2071 tcop/postgres.c:2333
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599
+#: tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "varaktighet %s ms"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "varaktighet: %s ms  fastpath funktionsanrop: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:353
+#: tcop/fastpath.c:352
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr "meddelande för funktionsanrop innehåller %d argument men funktionen kräver %d"
 
-#: tcop/fastpath.c:361
+#: tcop/fastpath.c:360
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr "meddelande för funktioonsanrop innehåller %d argumentformat men %d argument"
 
-#: tcop/fastpath.c:385
+#: tcop/fastpath.c:384
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "ogiltig argumentstorlek %d i funktionsaropsmeddelande"
 
-#: tcop/fastpath.c:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "inkorrekt binärt dataformat i funktionsargument %d"
 
-#: tcop/postgres.c:467 tcop/postgres.c:5012
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "ogiltig frontend-meddelandetyp %d"
 
-#: tcop/postgres.c:1076
+#: tcop/postgres.c:1070
 #, c-format
 msgid "statement: %s"
 msgstr "sats: %s"
 
-#: tcop/postgres.c:1374
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "varaktighet: %s ms  sats: %s"
 
-#: tcop/postgres.c:1480
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "kan inte stoppa in multipla kommandon i en förberedd sats"
 
-#: tcop/postgres.c:1610
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "varaktighet: %s ms  parse %s: %s"
 
-#: tcop/postgres.c:1677 tcop/postgres.c:2653
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "förberedd sats utan namn existerar inte"
 
-#: tcop/postgres.c:1729
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "bind-meddelande har %d parameterformat men %d parametrar"
 
-#: tcop/postgres.c:1735
+#: tcop/postgres.c:1729
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr "bind-meddelande ger %d parametrar men förberedd sats \"%s\" kräver %d"
 
-#: tcop/postgres.c:1949
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "inkorrekt binärdataformat i bind-parameter %d"
 
-#: tcop/postgres.c:2076
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "varaktighet: %s ms  bind %s%s%s: %s"
 
-#: tcop/postgres.c:2131 tcop/postgres.c:2735
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "portal \"%s\" existerar inte"
 
-#: tcop/postgres.c:2213
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2215 tcop/postgres.c:2341
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "kör hämtning från"
 
-#: tcop/postgres.c:2216 tcop/postgres.c:2342
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "kör"
 
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "varaktighet: %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2486
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "prepare: %s"
 
-#: tcop/postgres.c:2511
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "Parametrar: %s"
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "Abortskäl: återställningskonflikt"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "Användaren höll delad bufferfastlåsning för länge."
 
-#: tcop/postgres.c:2545
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "Användare höll ett relationslås för länge."
 
-#: tcop/postgres.c:2548
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "Användaren använde eller har använt ett tablespace som tagits bort."
 
-#: tcop/postgres.c:2551
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "Användarfrågan kan ha behövt se radversioner som har tagits bort."
 
-#: tcop/postgres.c:2554
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "Användaren använde en logisk replikeringsslot som måste invalideras."
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "Användare var ansluten till databas som måste slängas."
 
-#: tcop/postgres.c:2599
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "portal \"%s\" parameter $%d = %s"
 
-#: tcop/postgres.c:2602
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "portal \"%s\" parameter $%d"
 
-#: tcop/postgres.c:2608
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "ej namngiven portalparameter $%d = %s"
 
-#: tcop/postgres.c:2611
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "ej namngiven portalparameter $%d"
 
-#: tcop/postgres.c:2955
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "stänger anslutning på grund av oväntad SIGQUIT-signal"
 
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "avbryter anslutning på grund av en krash i en annan serverprocess"
 
-#: tcop/postgres.c:2962
+#: tcop/postgres.c:2989
 #, 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 "Postmastern har sagt åt denna serverprocess att rulla tillbaka den aktuella transaktionen och avsluta då en annan process har avslutats onormalt och har eventuellt trasat sönder delat minne."
 
-#: tcop/postgres.c:2966 tcop/postgres.c:3219
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr "Du kan strax återansluta till databasen och upprepa kommandot."
 
-#: tcop/postgres.c:2973
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "stänger anslutning på grund av kommando för omedelbar nedstängning"
 
-#: tcop/postgres.c:3051
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "flyttalsavbrott"
 
-#: tcop/postgres.c:3052
+#: tcop/postgres.c:3079
 #, 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 "En ogiltig flyttalsoperation har signalerats. Detta beror troligen på ett resultat som är utanför giltigt intervall eller en ogiltig operation så som division med noll."
 
-#: tcop/postgres.c:3217
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "avslutar anslutning på grund av konflikt med återställning"
 
-#: tcop/postgres.c:3289
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "avbryter autentisering på grund av timeout"
 
-#: tcop/postgres.c:3293
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "avslutar autovacuum-process på grund av ett administratörskommando"
 
-#: tcop/postgres.c:3297
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "avslutar logisk replikeringsarbetare på grund av ett administratörskommando"
 
-#: tcop/postgres.c:3317
+#: tcop/postgres.c:3339
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "avslutar wal-mottagarprocessen på grund av ett administratörskommando"
+
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "avslutar anslutning på grund av ett administratörskommando"
 
-#: tcop/postgres.c:3348
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "anslutning till klient har brutits"
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "avbryter sats på grund av lås-timeout"
 
-#: tcop/postgres.c:3407
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "avbryter sats på grund av sats-timeout"
 
-#: tcop/postgres.c:3414
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "avbryter autovacuum-uppgift"
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "avbryter sats på användares begäran"
 
-#: tcop/postgres.c:3448
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "terminerar anslutning på grund av idle-in-transaction-timeout"
 
-#: tcop/postgres.c:3461
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "terminerar anslutning på grund av transaktionstimeout"
 
-#: tcop/postgres.c:3474
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "stänger anslutning på grund av idle-session-timeout"
 
-#: tcop/postgres.c:3564
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "maximalt stackdjup överskridet"
-
-#: tcop/postgres.c:3565
-#, c-format
-msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
-msgstr "Öka konfigurationsparametern \"max_stack_depth\" (nu %dkB) efter att ha undersökt att plattformens gräns för stackdjup är tillräcklig."
-
-#: tcop/postgres.c:3612
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "\"max_stack_depth\" får ej överskrida %ldkB."
-
-#: tcop/postgres.c:3614
-#, c-format
-msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
-msgstr "Öka plattformens stackdjupbegränsning via \"ulimit -s\" eller motsvarande."
-
-#: tcop/postgres.c:3637
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
 msgstr "\"client_connection_check_interval\" måste sättas till 0 på denna plattform."
 
-#: tcop/postgres.c:3658
+#: tcop/postgres.c:3569
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "Kan inte slå på parameter när \"log_statement_stats\" är satt."
 
-#: tcop/postgres.c:3673
+#: tcop/postgres.c:3584
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "Kan inte slå på \"log_statement_stats\" när \"log_parser_stats\", \"log_planner_stats\" eller \"log_executor_stats\" är satta."
 
-#: tcop/postgres.c:4098
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "ogiltigt kommandoradsargument för serverprocess: %s"
 
-#: tcop/postgres.c:4099 tcop/postgres.c:4105
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: tcop/postgres.c:4103
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: ogiltigt kommandoradsargument: %s"
 
-#: tcop/postgres.c:4156
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: ingen databas eller användarnamn angivet"
 
-#: tcop/postgres.c:4909
+#: tcop/postgres.c:4275
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "kunde inte skapa slumpad avbrytningsnyckel"
+
+#: tcop/postgres.c:4677
+#, c-format
+msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr "anslutning redo: uppsättning totalt=%.3f ms, fork=%.3f ms, authentisering=%.3f ms"
+
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "ogiltig subtyp %d för CLOSE-meddelande"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "ogiltig subtyp %d för DESCRIBE-meddelande"
 
-#: tcop/postgres.c:5033
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "fastpath-funktionsanrop stöds inte i en replikeringsanslutning"
 
-#: tcop/postgres.c:5037
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "utökat frågeprotokoll stöds inte i en replikeringsanslutning"
 
-#: tcop/postgres.c:5217
+#: tcop/postgres.c:5189
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "nedkoppling: sessionstid: %d:%02d:%02d.%03d användare=%s databas=%s värd=%s%s%s"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "bind-meddelande har %d resultatformat men frågan har %d kolumner"
 
-#: tcop/pquery.c:942 tcop/pquery.c:1696
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "markör kan bara hoppa framåt"
 
-#: tcop/pquery.c:943 tcop/pquery.c:1697
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Deklarera den med flaggan SCROLL för att kunna traversera bakåt."
@@ -24013,68 +25171,73 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "kan inte köra %s inom säkerhetsbegränsad operation"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "kan inte köra %s i en bakgrundsprocess"
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "rättighet saknas för köra kommandot %s"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får köra detta kommando."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS stöder bara relationsnamn i FROM-klausulen"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "multipla DictFile-parametrar"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "multipla AffFile-parametrar"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "okänd Ispell-parameter: \"%s\""
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "saknar AffFile-parameter"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "saknar DictFile-parameter"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "multipla Accept-parametrar"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "okänd parameter för \"simple dictionary\": \"%s\""
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "okänd synonymparameter: \"%s\""
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "saknar Synonym-prameter"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "kunde inte öppna synonymfil \"%s\": %m"
@@ -24149,78 +25312,73 @@ msgstr "okänd synonymordboksparameter: \"%s\""
 msgid "missing Dictionary parameter"
 msgstr "saknar ordlistparameter"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:383 tsearch/spell.c:400 tsearch/spell.c:409
+#: tsearch/spell.c:1046
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "ogiltig affix-flagga \"%s\""
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:387 tsearch/spell.c:1050
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "affix-flaggan \"%s\" är utanför giltigt intervall"
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:417
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "ogiltigt tecken i affix-flagga \"%s\""
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:437
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "ogiltig affix-flagga \"%s\" med flaggvärdet \"long\""
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:527
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "kunde inte öppna ordboksfil \"%s\": %m"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1174 tsearch/spell.c:1186 tsearch/spell.c:1751
+#: tsearch/spell.c:1756 tsearch/spell.c:1761
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "ogiltigt affix-alias \"%s\""
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1227 tsearch/spell.c:1298 tsearch/spell.c:1447
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "kunde inte öppna affix-fil \"%s\": %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1281
 #, c-format
 msgid "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag values"
 msgstr "Ispell-ordbok stöder bara flaggorna \"default\", \"long\" och \"num\""
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1325
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "ogiltigt antal alias i flaggvektor"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1348
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "antalet alias överskriver angivet antal %d"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1563
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "affix-fil innehåller kommandon på gammalt och nytt format"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "strängen är för lång för tsvector (%d byte, max %d byte)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:191
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "rad %d i konfigureringsfil \"%s\": \"%s\""
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "konvertering från wchar_t till serverkodning misslyckades: %m"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -24233,12 +25391,12 @@ msgstr "ordet är för långt för att indexeras"
 msgid "Words longer than %d characters are ignored."
 msgstr "Ord längre än %d tecken hoppas över."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "ogiltigt filnamn \"%s\" till textsökkonfiguration"
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "kunde inte öppna stoppordsfil \"%s\": %m"
@@ -24268,42 +25426,93 @@ msgstr "%s måste vara positiv"
 msgid "%s must be >= 0"
 msgstr "%s måste vara >= 0"
 
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "kunde inte radera permanent statistikfil \"%s\": %m"
 
-#: utils/activity/pgstat.c:1255
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "ogiltig statistiktyp \"%s\""
 
-#: utils/activity/pgstat.c:1335
+#: utils/activity/pgstat.c:1471
+#, c-format
+msgid "custom cumulative statistics name is invalid"
+msgstr "namn på egendefinierad kumulativ statistik är ogiltigt"
+
+#: utils/activity/pgstat.c:1472
+#, c-format
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "Ange ett icke-tomt namn för den egendefinierade kumulativa statistiken."
+
+#: utils/activity/pgstat.c:1475
+#, c-format
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr "ID %u på egendefinierad kumulative statistik är utanför giltigt intervall"
+
+#: utils/activity/pgstat.c:1476
+#, c-format
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr "Ange ett egendefinierat kumulativt statistik-ID mellan %u och %u."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, c-format
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr "misslyckades med att registera en egendefinierad kumulativ statistikk \"%s\" med ID %u"
+
+#: utils/activity/pgstat.c:1482
+#, c-format
+msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
+msgstr "Egendefinierad kumulativ statistik måste vara registerad när man initierar moduler i \"shared_preload_libraries\"."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr "egendefinierad kumulativ statistikvärde är ogiltig"
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
+msgstr "Egendefinierad kumulativ statisik kräver plats i delat minnesutrymme för objekt som definierats med ett fast antal."
+
+#: utils/activity/pgstat.c:1509
+#, c-format
+msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr "Egendefinierad kumulativ statistik \"%s\" är redan registerad med samma ID."
+
+#: utils/activity/pgstat.c:1522
+#, c-format
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr "Existerande kumulativ statistik med ID %u har samma namn."
+
+#: utils/activity/pgstat.c:1528
+#, c-format
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr "registrerade egendefinerad kumulativ statistik \"%s\" med ID %u"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "kunde inte öppna temporär statistikfil \"%s\": %m"
 
-#: utils/activity/pgstat.c:1455
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "kunde inte skriva temporär statistikfil \"%s\": %m"
 
-#: utils/activity/pgstat.c:1464
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "kunde inte stänga temporär statistikfil \"%s\": %m"
 
-#: utils/activity/pgstat.c:1472
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "kunde inte döpa om temporär statistikfil \"%s\" till \"%s\": %m"
-
-#: utils/activity/pgstat.c:1521
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "kunde inte öppna statistikfil \"%s\": %m"
 
-#: utils/activity/pgstat.c:1683
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "korrupt statistikfil \"%s\""
@@ -24313,199 +25522,204 @@ msgstr "korrupt statistikfil \"%s\""
 msgid "function call to dropped function"
 msgstr "funktionsanrop till borttagen funktion"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
+#, c-format
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "Misslyckades vid allokering av post %u/%u/%<PRIu64>."
+
+#: utils/activity/pgstat_xact.c:366
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "återställer existerande statistik för typ %s, db=%u, oid=%u"
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "återställer existerande statistik för typ %s, db=%u, oid=%<PRIu64>"
 
-#: utils/activity/wait_event.c:207 utils/activity/wait_event.c:232
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
 msgid "wait event \"%s\" already exists in type \"%s\""
 msgstr "wait event \"%s\" finns redan i type \"%s\""
 
-#: utils/activity/wait_event.c:246
+#: utils/activity/wait_event.c:245
 #, c-format
 msgid "too many custom wait events"
 msgstr "för många egendefinierade wait event"
 
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "identifieraren för lång"
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "Identifierare måste vara mindre än %d tecken."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "okänt nyckelord: \"%s\""
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "ACL-nyckelord måste vara \"group\" eller \"user\"."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "namn saknas"
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "Ett namn måste följa efter nyckelorden \"group\" resp. \"user\"."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "saknar \"=\"-tecken"
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "ogiltigt lägestecken: måste vara en av \"%s\""
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "ett namn måste följa på tecknet \"/\""
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "sätter fullmaktsgivaranvändar-ID till standardvärdet %u"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "ACL-array innehåller fel datatyp"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "ACL-array:er måste vara endimensionella"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "ACL-array:er får inte innehålla null-värden"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "skräp vid slutet av ACL-angivelse"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "fullmaksgivarflaggor kan inte ges tillbaka till den som givit det till dig"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert stöds inte länge"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove stöds inte längre"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "okänd privilegietyp: \"%s\""
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "funktionen \"%s\" finns inte"
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "måste kunna utföra SET ROLE \"%s\""
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:118 utils/adt/array_userfuncs.c:565
+#: utils/adt/array_userfuncs.c:942 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, c-format
 msgid "could not determine input data type"
 msgstr "kan inte bestämma indatatyp"
 
-#: utils/adt/array_userfuncs.c:107
+#: utils/adt/array_userfuncs.c:123
 #, c-format
 msgid "input data type is not an array"
 msgstr "indatatyp är inte en array"
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800
 #: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
 #: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
 #: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
 #: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
 #: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1917 utils/adt/numeric.c:4454
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143
+#: utils/adt/varlena.c:3195 utils/adt/varlena.c:4129
 #, c-format
 msgid "integer out of range"
 msgstr "heltal utanför giltigt intervall"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:174 utils/adt/array_userfuncs.c:259
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "argumentet måste vara tomt eller en endimensionell array"
 
-#: utils/adt/array_userfuncs.c:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:410
+#: utils/adt/array_userfuncs.c:447 utils/adt/array_userfuncs.c:476
+#: utils/adt/array_userfuncs.c:504
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "kan inte konkatenera inkompatibla arrayer"
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:372
 #, c-format
 msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Array:er med elementtyper %s och %s är inte kompatibla för sammaslagning."
 
-#: utils/adt/array_userfuncs.c:335
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Array:er med dimensioner %d och %d är inte kompatibla för sammaslagning."
 
-#: utils/adt/array_userfuncs.c:372
+#: utils/adt/array_userfuncs.c:448
 #, c-format
 msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr "Array:er med olika elementdimensioner är inte kompatibla för sammaslagning."
 
-#: utils/adt/array_userfuncs.c:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:477 utils/adt/array_userfuncs.c:505
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Array:er med olika dimensioner fungerar inte vid konkatenering."
 
-#: utils/adt/array_userfuncs.c:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5622
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059
+#: utils/adt/arrayfuncs.c:5628 utils/adt/arrayfuncs.c:5634
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "kan inte ackumulera arrayer med olika dimensioner"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1348 utils/adt/array_userfuncs.c:1502
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "sökning efter element i en multidimensionell array stöds inte"
 
-#: utils/adt/array_userfuncs.c:1301
+#: utils/adt/array_userfuncs.c:1377
 #, c-format
 msgid "initial position must not be null"
 msgstr "initiala positionen får ej vara null"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1750
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "samplingsstorleken måste vara mellan 0 och %d"
@@ -24590,7 +25804,7 @@ msgstr "Oväntat array-element."
 msgid "Specified array dimensions do not match array contents."
 msgstr "Angivna array-dimensioner matchar inte array-innehållet."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2598
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "Flerdimensionella array:er måste ha underarray:er med matchande dimensioner."
@@ -24601,14 +25815,14 @@ msgid "Incorrectly quoted array element."
 msgstr "Felaktigt quote:at array-element."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "oväntat slut på indata."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3499
-#: utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6120
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "felaktigt antal dimensioner: %d"
@@ -24624,7 +25838,7 @@ msgid "binary data has array element type %u (%s) instead of expected %u (%s)"
 msgstr "binär data har array-elementtyp typ %u (%s) istället för förväntade %u (%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3098
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "ingen binär indatafunktion finns för typen %s"
@@ -24635,7 +25849,7 @@ msgid "improper binary format in array element %d"
 msgstr "felaktigt binärt format i array-element %d"
 
 #: utils/adt/arrayfuncs.c:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3131
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "det saknas en binär output-funktion för typen %s"
@@ -24647,11 +25861,11 @@ msgstr "slice av fixlängd-array är inte implementerat"
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6092
-#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6129
-#: utils/adt/json.c:1433 utils/adt/json.c:1505 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4710 utils/adt/jsonfuncs.c:4863
-#: utils/adt/jsonfuncs.c:4974 utils/adt/jsonfuncs.c:5022
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:6132 utils/adt/arrayfuncs.c:6143
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "fel antal array-indexeringar"
@@ -24687,90 +25901,90 @@ msgstr "Vid tilldelning till en slice av en tom array så måste slice-gränsern
 msgid "source array too small"
 msgstr "käll-array för liten"
 
-#: utils/adt/arrayfuncs.c:3657
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "null-element i arrayer stöds inte i detta kontext"
 
-#: utils/adt/arrayfuncs.c:3828 utils/adt/arrayfuncs.c:3999
-#: utils/adt/arrayfuncs.c:4390
+#: utils/adt/arrayfuncs.c:3840 utils/adt/arrayfuncs.c:4011
+#: utils/adt/arrayfuncs.c:4402
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "kan inte jämföra arrayer med olika elementtyper"
 
-#: utils/adt/arrayfuncs.c:4177 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2806
+#: utils/adt/multirangetypes.c:2878 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "kunde inte hitta en hash-funktion för typ %s"
 
-#: utils/adt/arrayfuncs.c:4305 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4317 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "kunde inte hitta en utökad hash-funktion för typ %s"
 
-#: utils/adt/arrayfuncs.c:5506
+#: utils/adt/arrayfuncs.c:5518
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "datatypen %s är inte en arraytyp"
 
-#: utils/adt/arrayfuncs.c:5561
+#: utils/adt/arrayfuncs.c:5573
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "kan inte ackumulera null-array:er"
 
-#: utils/adt/arrayfuncs.c:5589
+#: utils/adt/arrayfuncs.c:5601
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "kan inte ackumulera tomma array:er"
 
-#: utils/adt/arrayfuncs.c:5990 utils/adt/arrayfuncs.c:6030
+#: utils/adt/arrayfuncs.c:6004 utils/adt/arrayfuncs.c:6044
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "dimensionsarray eller undre gränsarray kan inte vara null"
 
-#: utils/adt/arrayfuncs.c:6093 utils/adt/arrayfuncs.c:6119
+#: utils/adt/arrayfuncs.c:6107 utils/adt/arrayfuncs.c:6133
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Dimensionsarray måste vara endimensionell."
 
-#: utils/adt/arrayfuncs.c:6098 utils/adt/arrayfuncs.c:6124
+#: utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "dimensionsvärden kan inte vara null"
 
-#: utils/adt/arrayfuncs.c:6130
+#: utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "Undre arraygräns har annan storlek än dimensionsarray."
 
-#: utils/adt/arrayfuncs.c:6411
+#: utils/adt/arrayfuncs.c:6425
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "borttagning av element från en multidimensionell array stöds inte"
 
-#: utils/adt/arrayfuncs.c:6688
+#: utils/adt/arrayfuncs.c:6702
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "gränsvärden måste vara en endimensionell array"
 
-#: utils/adt/arrayfuncs.c:6693
+#: utils/adt/arrayfuncs.c:6707
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "gränsvärdesarray får inte innehålla NULLL-värden"
 
-#: utils/adt/arrayfuncs.c:6926
+#: utils/adt/arrayfuncs.c:6940
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "antal element att trimma måste vara mellan 0 och %d"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "array-index måste ha typen integer"
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "array-index i tilldelning kan inte vara null"
@@ -24801,21 +26015,21 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "kodningskonvertering från %s till ASCII stöds inte"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:354 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
 #: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:803 utils/adt/numeric.c:7221
-#: utils/adt/numeric.c:7424 utils/adt/numeric.c:8371 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:323
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "ogiltig indatasyntax för type %s: \"%s\""
@@ -24826,23 +26040,23 @@ msgstr "ogiltig indatasyntax för type %s: \"%s\""
 msgid "money out of range"
 msgstr "money utanför giltigt intervall"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:723 utils/adt/float.c:99
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
 #: utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039
 #: utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167
 #: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
 #: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
-#: utils/adt/numeric.c:3191 utils/adt/numeric.c:3214 utils/adt/numeric.c:3299
-#: utils/adt/numeric.c:3317 utils/adt/numeric.c:3413 utils/adt/numeric.c:8920
-#: utils/adt/numeric.c:9233 utils/adt/numeric.c:9581 utils/adt/numeric.c:9697
-#: utils/adt/numeric.c:11208 utils/adt/timestamp.c:3713
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "division med noll"
 
 #: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
 #: utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "värdet \"%s\" är utanför giltigt intervall för typen %s"
@@ -24857,186 +26071,187 @@ msgstr "\"char\" utanför sitt intervall"
 msgid "could not compute %s hash: %s"
 msgstr "kunde inte beräkna %s-hash: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "ogiltig typmodifierare"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "TIME(%d)%s-precisionen får inte vara negativ"
 
-#: utils/adt/date.c:82
+#: utils/adt/date.c:83
 #, c-format
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%s-precisionen reducerad till maximalt tillåtna, %d"
 
-#: utils/adt/date.c:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172
+#: utils/adt/formatting.c:4181 utils/adt/formatting.c:4286
+#: utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "datum utanför giltigt intervall \"%s\""
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2554
 #, c-format
 msgid "date out of range"
 msgstr "datum utanför giltigt intervall"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "datumfältvärde utanför giltigt område: %d-%02d-%02d"
 
-#: utils/adt/date.c:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "datum utanför giltigt område: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "kan inte subtrahera oändliga datum"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "datum utanför filtigt område för timestamp"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "enheten \"%s\" stöds inte för typen %s"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "enheten \"%s\" känns inte igen för typen %s"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2574
-#: utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4017 utils/adt/formatting.c:4053
+#: utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2576
+#: utils/adt/xml.c:2583 utils/adt/xml.c:2603 utils/adt/xml.c:2610
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp utanför giltigt intervall"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "time utanför giltigt intervall"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "time-värde utanför giltigt område: %d:%02d:%02g"
 
-#: utils/adt/date.c:2020
+#: utils/adt/date.c:2085
 #, c-format
 msgid "cannot convert infinite interval to time"
 msgstr "kan inte konvertera oändligt intervall till time"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
 #, c-format
 msgid "cannot add infinite interval to time"
 msgstr "kan inte addera oändligt intervall till time"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
 #, c-format
 msgid "cannot subtract infinite interval from time"
 msgstr "kan inte subtrahera oändligt intervall från time"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2595
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682
+#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "ogiltig föregående eller efterföljande storlek i fönsterfunktion"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "tidszonförskjutning utanför giltigt intervall"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
 msgstr "intervalltidszonen \"%s\" måste vara ändlig"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "intervalltidszonen \"%s\" kan inte inkludera månader eller år"
 
-#: utils/adt/datetime.c:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "tidszon \"%s\" känns inte igen"
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "datum/tid-värde utanför giltigt område: \"%s\""
 
-#: utils/adt/datetime.c:4110
+#: utils/adt/datetime.c:4232
 #, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Du kanske behöver en annan inställning av variabeln \"datestyle\"."
+msgid "Perhaps you need a different \"DateStyle\" setting."
+msgstr "Du kanske behöver en annan inställning av variabeln \"DateStyle\"."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "intervall-värde utanför giltigt område: \"%s\""
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "tidszonförskjutning itanför sitt intervall: \"%s\""
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "Detta tidszonsnamn finns i konfigurationsfilen för tidszonsförkortning \"%s\"."
@@ -25046,17 +26261,22 @@ msgstr "Detta tidszonsnamn finns i konfigurationsfilen för tidszonsförkortning
 msgid "invalid Datum pointer"
 msgstr "ogiltigt Datum-pekare"
 
-#: utils/adt/dbsize.c:764 utils/adt/dbsize.c:840
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "tabellutrymme med OID %u finns inte"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "ogiltig storlek: \"%s\""
 
-#: utils/adt/dbsize.c:841
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "Ogiltig storleksenhet: \"%s\"."
 
-#: utils/adt/dbsize.c:842
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
 msgstr "Giltiga enheter är \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\" och \"PB\"."
@@ -25081,32 +26301,32 @@ msgstr "resultat från kodningskonvertering är för stort"
 msgid "result of decoding conversion is too large"
 msgstr "resultatet av avkodningskonverteringen är för stort"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "ogiltigt hexdecimal siffra: \"%.*s\""
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "ogiltig hexadecimal data: udda antal siffror"
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "oväntat \"=\" vid avkodning av base64-sekvens"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "ogiltig symbol \"%.*s\" hittades vid avkodning av base64-sekvens"
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "ogiltig base64-slutsekvens"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr "Indata saknar paddning, är trunkerad eller är trasig på annat sätt."
@@ -25143,351 +26363,363 @@ msgstr "kunde inte bestämma den verkliga enum-typen"
 msgid "enum %s contains no values"
 msgstr "enum %s innehåller inga värden"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "värde utanför giltigt intervall: overflow"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "värde utanför giltigt intervall: underflow"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" är utanför giltigt intervall för typen real"
 
-#: utils/adt/float.c:482
+#: utils/adt/float.c:489
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\" är utanför giltigt intervall för typen double precision"
 
-#: utils/adt/float.c:1247 utils/adt/float.c:1321 utils/adt/int.c:355
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355
 #: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
 #: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4593 utils/adt/numeric.c:4598
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4104
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint utanför sitt intervall"
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3709 utils/adt/numeric.c:10112
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "kan inte ta kvadratroten av ett negativt tal"
 
-#: utils/adt/float.c:1515 utils/adt/numeric.c:3997 utils/adt/numeric.c:4109
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "noll upphöjt med ett negativt tal är odefinierat"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:4001 utils/adt/numeric.c:11003
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "ett negativt tal upphöjt i en icke-negativ potens ger ett komplext resultat"
 
-#: utils/adt/float.c:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3909
-#: utils/adt/numeric.c:10783
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "kan inte ta logartimen av noll"
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3847
-#: utils/adt/numeric.c:3904 utils/adt/numeric.c:10787
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "kan inte ta logaritmen av ett negativt tal"
 
-#: utils/adt/float.c:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "indata är utanför giltigt intervall"
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1857
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "antal måste vara större än noll"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1868
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "operand, undre gräns och övre gräns kan inte vara NaN"
 
-#: utils/adt/float.c:4011 utils/adt/numeric.c:1873
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "undre och övre gräns måste vara ändliga"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1887
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "undre gräns kan inte vara samma som övre gräns"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "ogiltig formatspecifikation för ett intervallvärdei"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Intervaller är inte kopplade till specifika kalenderdatum."
 
-#: utils/adt/formatting.c:1161
+#: utils/adt/formatting.c:1197
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" måste vara det sista mönstret som används"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1205
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" måste vara före \"PR\""
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1221
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" måste vara före \"PR\""
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1248
 #, c-format
 msgid "multiple decimal points"
 msgstr "multipla decimalpunkter"
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1252 utils/adt/formatting.c:1339
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "kan inte använda \"V\" ach decimalpunkt tillsammans"
 
-#: utils/adt/formatting.c:1228
+#: utils/adt/formatting.c:1264
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "kan inte använda \"S\" två gånger"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1268
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "kan inte använda \"S\" och \"PL\"/\"MI\"/\"SG\"/\"PR\" tillsammans"
 
-#: utils/adt/formatting.c:1252
+#: utils/adt/formatting.c:1288
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "kan inte använda \"S\" och \"MI\" tillsammans."
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1298
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "kan inte använda \"S\" och \"PL\" tillsammans."
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1308
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "kan inte använda \"S\" och \"SG\" tillsammans."
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1317
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "kan inte använda \"PR\" och \"S\"/\"PL\"/\"MI\"/\"SG\" tillsammans."
 
-#: utils/adt/formatting.c:1307
+#: utils/adt/formatting.c:1326
+#, c-format
+msgid "cannot use \"RN\" twice"
+msgstr "kan inte använda \"RN\" två gånger"
+
+#: utils/adt/formatting.c:1347
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "kan inte använda \"EEEE\" två gånger"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1353
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" är inkompatibel med andra format"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1354
 #, c-format
 msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr "\"EEEE\" får bara användas tillsammans med siffror- och decimalpunkts-mönster."
 
-#: utils/adt/formatting.c:1398
+#: utils/adt/formatting.c:1363
+#, c-format
+msgid "\"RN\" is incompatible with other formats"
+msgstr "\"RN\" är inkompatibel med andra format"
+
+#: utils/adt/formatting.c:1364
+#, c-format
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "\"RN\" får bara användas tillsammans med \"FM\"."
+
+#: utils/adt/formatting.c:1445
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "ogiltigt formatseparator för datetime: \"%s\""
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1572
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" är inte ett nummer"
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "case-konvertering misslyckades: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1653 utils/adt/formatting.c:1717
+#: utils/adt/formatting.c:1781 utils/adt/formatting.c:1845
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr "kunde inte bestämma jämförelse (collation) för funktionen %s"
 
-#: utils/adt/formatting.c:2410
+#: utils/adt/formatting.c:1853
+#, c-format
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr "Unicode-skiftlägesnormalisering kan bara utföras om server-kodningen är UTF8"
+
+#: utils/adt/formatting.c:2150
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "ogiltig kombination av datumkonventioner"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2151
 #, c-format
 msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr "Blanda inte datumkonventionerna Gregoriansk och ISO-veckor i formatteringsmall."
 
-#: utils/adt/formatting.c:2433
+#: utils/adt/formatting.c:2173
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "värden för \"%s\" i formatsträng står i konflikt med varandra"
 
-#: utils/adt/formatting.c:2435
+#: utils/adt/formatting.c:2175
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Detta värde motsäger en tidigare inställning för samma fälttyp."
 
-#: utils/adt/formatting.c:2502
+#: utils/adt/formatting.c:2242
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "källsträngen är för kort för formatfält \"%s\""
 
-#: utils/adt/formatting.c:2504
+#: utils/adt/formatting.c:2244
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Fältet kräver %d tecken men bara %d återstår."
 
-#: utils/adt/formatting.c:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2246 utils/adt/formatting.c:2260
 #, c-format
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr "Om din källsträng inte är av fast längd så testa med modifieraren \"FM\"."
 
-#: utils/adt/formatting.c:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269
+#: utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "ogiltigt värde \"%s\" för \"%s\""
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2258
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Fältet kräver %d tecken men bara %d kunde parsas."
 
-#: utils/adt/formatting.c:2531
+#: utils/adt/formatting.c:2271
 #, c-format
 msgid "Value must be an integer."
 msgstr "Värdet måste vara ett heltal."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "värdet för \"%s\" i källsträng är utanför giltigt intervall"
 
-#: utils/adt/formatting.c:2538
+#: utils/adt/formatting.c:2278
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Värdet måste vara i intervallet %d till %d."
 
-#: utils/adt/formatting.c:2752
+#: utils/adt/formatting.c:2492
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "Det givna värdet matchar inget av de tillåtna värdena för detta fält."
 
-#: utils/adt/formatting.c:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2728
+#: utils/adt/formatting.c:2748 utils/adt/formatting.c:2768
+#: utils/adt/formatting.c:2787 utils/adt/formatting.c:2806
+#: utils/adt/formatting.c:2830 utils/adt/formatting.c:2848
+#: utils/adt/formatting.c:2866 utils/adt/formatting.c:2884
+#: utils/adt/formatting.c:2901 utils/adt/formatting.c:2918
 #, c-format
 msgid "localized string format value too long"
 msgstr "lokaliserat strängformatvärde är för långt"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3198
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "ej matchande formatteringsseparator \"%c\""
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3259
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "ej matchande formatteringstecken \"%s\""
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3392
 #, c-format
 msgid "Time zone abbreviation is not recognized."
 msgstr "Känner inte igen förkortning för tidszon."
 
-#: utils/adt/formatting.c:3853
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "ogiltig indatasträng för \"Y,YYY\""
-
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "indatasträngen är för kort för datetime-formatet"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "efterföljande tecken finns kvar i indatasträngen efter datetime-formattering"
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "saknar tidszon i indatasträngen för typen timestamptz"
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz utanför giltigt intervall"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "datetime-format har zon men inte tid"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "saknar tidszon i indatasträng för typ timetz"
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz utanför giltigt intervall"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "datetime-format har inte datum och inte tid"
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "timmen \"%d\" är ogiltigt för en 12-timmars-klocka"
 
-#: utils/adt/formatting.c:4788
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Använd en 24-timmars-klocka eller ange en timme mellan 1 och 12."
 
-#: utils/adt/formatting.c:4900
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "kan inte beräkna dag på året utan årsinformation"
 
-#: utils/adt/formatting.c:5852
+#: utils/adt/formatting.c:5834
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" stöds inte för indata"
 
-#: utils/adt/formatting.c:5864
+#: utils/adt/formatting.c:6111
 #, c-format
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\" stöds inte för indata"
+msgid "invalid Roman numeral"
+msgstr "ogiltigt romerskt tal"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -25499,9 +26731,9 @@ msgstr "absolut sökväg tillåts inte"
 msgid "path must be in or below the data directory"
 msgstr "sökväg måste vara i eller under datakatalogen"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:855
+#: utils/adt/oracle_compat.c:1158
 #, c-format
 msgid "requested length too large"
 msgstr "efterfrågad längd är för lång"
@@ -25516,11 +26748,6 @@ msgstr "kunde inte söka (seek) i fil \"%s\": %m"
 msgid "file length too large"
 msgstr "fillängd är för stor"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "tabellutrymme med OID %u finns inte"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -25572,8 +26799,8 @@ msgstr "måste efterfråga minst 2 punkter"
 msgid "invalid int2vector data"
 msgstr "ogiltig int2vector-data"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1765
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "stegstorleken kan inte vara noll"
@@ -25587,9 +26814,9 @@ msgstr "stegstorleken kan inte vara noll"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4542
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4154
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint utanför sitt intervall"
@@ -25599,49 +26826,49 @@ msgstr "bigint utanför sitt intervall"
 msgid "OID out of range"
 msgstr "OID utanför sitt intervall"
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "nyckelvärde måste vara skalär, inte array, composite eller json"
 
-#: utils/adt/json.c:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "kunde inte lista ut datatypen för argument %d"
 
-#: utils/adt/json.c:1067 utils/adt/json.c:1266 utils/adt/json.c:1449
-#: utils/adt/json.c:1527 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "null-värde tillåts inte som objektnyckel"
 
-#: utils/adt/json.c:1117 utils/adt/json.c:1288
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "duplicerat nyckelvärde i JSON objekt: %s"
 
-#: utils/adt/json.c:1226 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "argumentlistan måste ha ett jämt antal element"
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1228 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "Argumenten till %s måste bestå av varannan nyckel och varannat värde."
 
-#: utils/adt/json.c:1427 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "array:en måste ha två kolumner"
 
-#: utils/adt/json.c:1516 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "array-dimensionerna stämmer inte"
 
-#: utils/adt/json.c:1702 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "duplicerat nyckelvärde i JSON objekt"
@@ -25706,23 +26933,23 @@ msgstr "kan inte typomvandla jsonb-objekt till typ %s"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "kan inte typomvandla jsonb-array eller objekt till typ %s"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "antalet jsonb-objektpar överskrider det maximalt tillåtna (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "antalet jsonb-array-element överskrider det maximalt tillåtna (%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "total storleken på element i jsonb-array överskrider maximala %d byte"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "total storleken på element i jsonb-objekt överskrider maximala %d byte"
@@ -25757,210 +26984,210 @@ msgstr "array-index för jsonb måste ha typen text"
 msgid "jsonb subscript in assignment must not be null"
 msgstr "array-index för jsonb i tilldelning kan inte vara null"
 
-#: utils/adt/jsonfuncs.c:583 utils/adt/jsonfuncs.c:830
-#: utils/adt/jsonfuncs.c:2439 utils/adt/jsonfuncs.c:3015
-#: utils/adt/jsonfuncs.c:3948 utils/adt/jsonfuncs.c:4295
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "kan inte anropa %s på en skalär"
 
-#: utils/adt/jsonfuncs.c:588 utils/adt/jsonfuncs.c:815
-#: utils/adt/jsonfuncs.c:3017 utils/adt/jsonfuncs.c:3935
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "kan inte anropa %s på en array"
 
-#: utils/adt/jsonfuncs.c:724
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "JSON-data, rad %d: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1883 utils/adt/jsonfuncs.c:1920
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "kan inte hämta array-längd på skalär"
 
-#: utils/adt/jsonfuncs.c:1887 utils/adt/jsonfuncs.c:1906
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "kan inte hämta array-längd på icke-array"
 
-#: utils/adt/jsonfuncs.c:1986
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "kan inte anropa %s på ett icke-objekt"
 
-#: utils/adt/jsonfuncs.c:2174
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "kan inte dekonstruera en array som ett objekt"
 
-#: utils/adt/jsonfuncs.c:2188
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "kan inte dekonstruera en skalär"
 
-#: utils/adt/jsonfuncs.c:2233
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "kan inte extrahera element från en skalär"
 
-#: utils/adt/jsonfuncs.c:2237
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "kan inte extrahera element från ett objekt"
 
-#: utils/adt/jsonfuncs.c:2424 utils/adt/jsonfuncs.c:4173
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "kan inte anropa %s på icke-array"
 
-#: utils/adt/jsonfuncs.c:2515 utils/adt/jsonfuncs.c:2520
-#: utils/adt/jsonfuncs.c:2538 utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "förväntade JSON-array"
 
-#: utils/adt/jsonfuncs.c:2516
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "Se värdetypen för nyckel \"%s\""
 
-#: utils/adt/jsonfuncs.c:2539
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "Se array-element %s för nyckel \"%s\"."
 
-#: utils/adt/jsonfuncs.c:2545
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "Se array-element %s."
 
-#: utils/adt/jsonfuncs.c:2597
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "felaktig JSON-array"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3647
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "första argumentet till %s måste vara en radtyp"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3671
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "kunde inte lista ut radtyp för resultat av %s"
 
-#: utils/adt/jsonfuncs.c:3673
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid "Provide a non-null record argument, or call the function in the FROM clause using a column definition list."
 msgstr "Ange en icke-null record som argument eller anropa funktionen i FROM-klausulen med en kolumndefinitionslista."
 
-#: utils/adt/jsonfuncs.c:4059 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "materialiserat läge krävs, men stöds inte i detta kontext"
 
-#: utils/adt/jsonfuncs.c:4190 utils/adt/jsonfuncs.c:4274
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "argumentet till %s måste vara en array med objekt"
 
-#: utils/adt/jsonfuncs.c:4223
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "kan inte anropa %s på ett objekt"
 
-#: utils/adt/jsonfuncs.c:4656 utils/adt/jsonfuncs.c:4715
-#: utils/adt/jsonfuncs.c:4795
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "kan inte radera från en skalär"
 
-#: utils/adt/jsonfuncs.c:4800
+#: utils/adt/jsonfuncs.c:4824
 #, c-format
 msgid "cannot delete from object using integer index"
 msgstr "kan inte radera från objekt genom att använda heltalsindex"
 
-#: utils/adt/jsonfuncs.c:4868 utils/adt/jsonfuncs.c:5027
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "kan inte sätta sökväg i skalär"
 
-#: utils/adt/jsonfuncs.c:4909 utils/adt/jsonfuncs.c:4951
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid "null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\""
 msgstr "null_value_treatment måste vara \"delete_key\", \"return_target\", \"use_json_null\" eller \"raise_exception\""
 
-#: utils/adt/jsonfuncs.c:4922
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "JSON-värde får inte vara null"
 
-#: utils/adt/jsonfuncs.c:4923
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid "Exception was raised because null_value_treatment is \"raise_exception\"."
 msgstr "Avbrott utlöstes då null_value_treatment är \"raise_exception\"."
 
-#: utils/adt/jsonfuncs.c:4924
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid "To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed."
 msgstr "För att undvika detta så ändra null_value_treatment-argumentet eller se till att ett SQL-NULL inte skickas."
 
-#: utils/adt/jsonfuncs.c:4979
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "kan inte radera sökväg i skalär"
 
-#: utils/adt/jsonfuncs.c:5193
+#: utils/adt/jsonfuncs.c:5217
 #, c-format
 msgid "path element at position %d is null"
 msgstr "sökvägselement vid position %d är null"
 
-#: utils/adt/jsonfuncs.c:5212 utils/adt/jsonfuncs.c:5243
-#: utils/adt/jsonfuncs.c:5316
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "kan inte ersätta befintlig nyckel"
 
-#: utils/adt/jsonfuncs.c:5213 utils/adt/jsonfuncs.c:5244
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr "Sökvägen förväntar sig att nyckeln är ett sammansatt objekt men det är ett skalärt värde."
 
-#: utils/adt/jsonfuncs.c:5317
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "Försök använda funktionen jsonb_set för att ersätta nyckelvärde."
 
-#: utils/adt/jsonfuncs.c:5421
+#: utils/adt/jsonfuncs.c:5445
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
 msgstr "sökvägselement vid position %d är inte ett heltal: \"%s\""
 
-#: utils/adt/jsonfuncs.c:5438
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "sökvägselement vid position %d är utanför giltigt intervall: %d\""
 
-#: utils/adt/jsonfuncs.c:5590
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "fel flaggtyp, bara array:er och skalärer tillåts"
 
-#: utils/adt/jsonfuncs.c:5597
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "flaggelement i arrayen är inte en sträng"
 
-#: utils/adt/jsonfuncs.c:5598 utils/adt/jsonfuncs.c:5620
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid "Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"."
 msgstr "Möjliga värden är: \"string\", \"numeric\", \"boolean\", \"key\" samt \"all\"."
 
-#: utils/adt/jsonfuncs.c:5618
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "fel flagga i flagg-array: \"%s\""
@@ -25975,217 +27202,201 @@ msgstr "@ är inte tillåten i rotuttryck"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST tillåts bara i array-indexeringar"
 
-#: utils/adt/jsonpath_exec.c:491
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "förväntade ett booleanskt resultat"
 
-#: utils/adt/jsonpath_exec.c:851
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr "jsonpaths arrayväljare med wildcard kan bara applcieras på en array"
 
-#: utils/adt/jsonpath_exec.c:874
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr "jsonpaths medlemsväljare med wildcard kan bara appliceras på ett objekt"
 
-#: utils/adt/jsonpath_exec.c:923
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "array-index för jsonpath är utanför giltigt område"
 
-#: utils/adt/jsonpath_exec.c:980
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr "jsonpaths arrayväljare kan bara appliceras på en array"
 
-#: utils/adt/jsonpath_exec.c:1044
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "JSON-objekt innehåller inte nyckeln \"%s\""
 
-#: utils/adt/jsonpath_exec.c:1056
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr "jsonpaths medlemsväljare kan bara appliceras på ett objekt"
 
-#: utils/adt/jsonpath_exec.c:1114
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "jsonpaths elementmetod .%s() kan bara applicerars på en array"
 
-#: utils/adt/jsonpath_exec.c:1167 utils/adt/jsonpath_exec.c:1193
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
 #, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type double precision"
-msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen double precision"
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen %s"
 
-#: utils/adt/jsonpath_exec.c:1172 utils/adt/jsonpath_exec.c:1198
-#: utils/adt/jsonpath_exec.c:1414 utils/adt/jsonpath_exec.c:1446
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
+#: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
 msgstr "NaN eller Infinity tillåts inte för jsonpaths elementmetod .%s()"
 
-#: utils/adt/jsonpath_exec.c:1211 utils/adt/jsonpath_exec.c:1313
-#: utils/adt/jsonpath_exec.c:1455 utils/adt/jsonpath_exec.c:1593
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
 msgstr "jsonpaths elementmetod .%s() kan bara applicerars på en sträng eller ett numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:1281 utils/adt/jsonpath_exec.c:1305
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen bigint"
-
-#: utils/adt/jsonpath_exec.c:1357 utils/adt/jsonpath_exec.c:1377
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen boolean"
-
-#: utils/adt/jsonpath_exec.c:1386
+#: utils/adt/jsonpath_exec.c:1385
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, or numeric value"
 msgstr "jsonpaths elementmetod .%s() kan bara appliceras på en boolean, sträng eller ett numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:1439 utils/adt/jsonpath_exec.c:1528
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
-msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen numeric"
-
-#: utils/adt/jsonpath_exec.c:1487
+#: utils/adt/jsonpath_exec.c:1486
 #, c-format
 msgid "precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "precisionen för jsonpaths elementmetod .%s() är utanför giltigt intervall för typen integer"
 
-#: utils/adt/jsonpath_exec.c:1501
+#: utils/adt/jsonpath_exec.c:1500
 #, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
 msgstr "skalan för jsonpaths elementmetod .%s() är utanför giltigt intervall för typen integer"
 
-#: utils/adt/jsonpath_exec.c:1561 utils/adt/jsonpath_exec.c:1585
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr "argumentet \"%s\" till jsonpaths elementmetod .%s() är ogiltig för typen integer"
-
-#: utils/adt/jsonpath_exec.c:1648
+#: utils/adt/jsonpath_exec.c:1647
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, numeric, or datetime value"
 msgstr "jsonpaths elementmetod .%s() kan bara applicerars på en boolean, sträng eller ett datetime-värde"
 
-#: utils/adt/jsonpath_exec.c:2137
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr "vänster operand på jsonpath-operator %s är inte ett ensamt numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:2144
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr "höger operand på jsonpath-operator %s är inte ett ensamt numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:2212
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr "operand till unär jsonpath-operator %s är inte ett numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:2311
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "jsonpaths elementmetod .%s() kan bara appliceras på ett numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:2357
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "jsonpaths elementmetod .%s() kan bara appliceras på en sträng"
 
-#: utils/adt/jsonpath_exec.c:2450
+#: utils/adt/jsonpath_exec.c:2449
 #, c-format
 msgid "time precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "tidsprecisionen till jsonpaths elementmetod .%s() är utanför giltigt intervall för typen integer"
 
-#: utils/adt/jsonpath_exec.c:2484 utils/adt/jsonpath_exec.c:2490
-#: utils/adt/jsonpath_exec.c:2517 utils/adt/jsonpath_exec.c:2545
-#: utils/adt/jsonpath_exec.c:2598 utils/adt/jsonpath_exec.c:2649
-#: utils/adt/jsonpath_exec.c:2720
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
 #, c-format
 msgid "%s format is not recognized: \"%s\""
 msgstr "%s-format känns inte igen: \"%s\""
 
-#: utils/adt/jsonpath_exec.c:2486
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr "Använd ett datetime-mallargument för att ange indataformatet."
 
-#: utils/adt/jsonpath_exec.c:2679 utils/adt/jsonpath_exec.c:2760
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
 #, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
 msgstr "tidsprecisionen till jsonpaths elementmetod .%s() är ogiltigt"
 
-#: utils/adt/jsonpath_exec.c:2840
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "elementmetod .%s() för jsonpath kan bara appliceras på ett objekt"
 
-#: utils/adt/jsonpath_exec.c:3124
+#: utils/adt/jsonpath_exec.c:3123
 #, c-format
 msgid "could not convert value of type %s to jsonpath"
 msgstr "kunde inte konvertera värde av typ %s till jsonpath"
 
-#: utils/adt/jsonpath_exec.c:3158
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "kunde inte hitta jsonpath-variabel \"%s\""
 
-#: utils/adt/jsonpath_exec.c:3211
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "\"variabel\"-argumentet är inte ett objekt"
 
-#: utils/adt/jsonpath_exec.c:3212
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
 msgstr "Jsonpath-parametrar skall kodas som nyckel-värde-par av \"variabel\"-objekt."
 
-#: utils/adt/jsonpath_exec.c:3475
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "array-index för jsonpath är inte ett ensamt numeriskt värde"
 
-#: utils/adt/jsonpath_exec.c:3487
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "array-index för jsonpath är utanför giltigt interval för integer"
 
-#: utils/adt/jsonpath_exec.c:3671
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "kan inte konvertera värde från %s till %s utan att använda tidszon"
 
-#: utils/adt/jsonpath_exec.c:3673
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "ANvända *_tz()-funktioner som stöder tidszon."
 
-#: utils/adt/jsonpath_exec.c:3981
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
 msgid "JSON path expression for column \"%s\" must return single item when no wrapper is requested"
 msgstr "Uttryck för JSON-sökväg för kolumn \"%s\" skall returnera exakt ett värde när wrapper inte efterfrågas"
 
-#: utils/adt/jsonpath_exec.c:3983 utils/adt/jsonpath_exec.c:3988
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
 msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
 msgstr "Använd klausulen WITH WRAPPER för att packa SQL/JSON-poster in i en array."
 
-#: utils/adt/jsonpath_exec.c:3987
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
 msgid "JSON path expression in JSON_QUERY must return single item when no wrapper is requested"
 msgstr "Uttryck för JSON-sökväg i JSON_QUERY skall returnera exakt ett värde när wrapper inte efterfrågas"
 
-#: utils/adt/jsonpath_exec.c:4045 utils/adt/jsonpath_exec.c:4069
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
 msgid "JSON path expression for column \"%s\" must return single scalar item"
 msgstr "Uttryck för JSON-sökväg för kolumn \"%s\" skall returnera exakt ett skalärt värde"
 
-#: utils/adt/jsonpath_exec.c:4050 utils/adt/jsonpath_exec.c:4074
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
 msgid "JSON path expression in JSON_VALUE must return single scalar item"
 msgstr "Uttryck för JSON-sökväg i JSON_VALUE skall returnera exakt ett skalärt värde"
@@ -26195,42 +27406,43 @@ msgstr "Uttryck för JSON-sökväg i JSON_VALUE skall returnera exakt ett skalä
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "levenshtein-argument överskrider maximala längden på %d tecken"
 
-#: utils/adt/like.c:159
+#: utils/adt/like.c:162
 #, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "ickedeterministiska jämförelser (collation) stöds inte för LIKE"
+msgid "could not determine which collation to use for LIKE"
+msgstr "kunde inte härleda vilken sortering (collation) som skall användas för LIKE"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "kunde inte bestämma vilken jämförelse (collation) som skall användas för ILIKE"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "ickedeterministiska jämförelser (collation) stöds inte för ILIKE"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "LIKE-mönster för inte sluta med ett escape-tecken"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:801
 #, c-format
 msgid "invalid escape string"
 msgstr "ogiltig escape-sträng"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:802
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "Escape-sträng måste vara tom eller ett tecken."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
 msgstr "matchning utan skiftlägeskänslighet stöds inte för typen bytea"
 
-#: utils/adt/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "matching med reguljär-uttryck stöds inte för typen bytea"
@@ -26250,7 +27462,7 @@ msgstr "macaddr8-data utanför giltigt intervall för att konverteras till macad
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr "Bara adresser som har FF och FE som värden i 4:e och 5:e byten från vänster, till exempel xx:xx:xx:ff:fe:xx:xx:xx, är möjliga att konvertera från macaddr8 till macaddr."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d är inte en PostgreSQL serverprocess"
@@ -26347,12 +27559,12 @@ msgstr "Förväntade range-start"
 msgid "Expected comma or end of multirange."
 msgstr "Oväntat komma eller slut på multirange."
 
-#: utils/adt/multirangetypes.c:981
+#: utils/adt/multirangetypes.c:982
 #, c-format
 msgid "multiranges cannot be constructed from multidimensional arrays"
 msgstr "multiranges kan inte skapas från en multidimensionell array"
 
-#: utils/adt/multirangetypes.c:1007
+#: utils/adt/multirangetypes.c:1008
 #, c-format
 msgid "multirange values cannot contain null members"
 msgstr "multirange-värden kan inte innehålla null-medlemmar"
@@ -26367,8 +27579,8 @@ msgstr "ogiltigt cidr-värde: \"%s\""
 msgid "Value has bits set to right of mask."
 msgstr "Värdet har bitar till höger om masken."
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "kunde inte formattera inet-värde: %m"
@@ -26396,167 +27608,167 @@ msgstr "ogiltig längd i extern \"%s\"-värde"
 msgid "invalid external \"cidr\" value"
 msgstr "ogiltigt externt \"cidr\"-värde"
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "ogiltig masklängd: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "kunde inte formattera \"cidr\"-värde: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "kan inte slå samman adresser från olika familjer"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "kan inte AND:a inet-värden av olika storlek"
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "kan inte OR:a inet-värden av olika storlek"
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "resultatet är utanför giltigt intervall"
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "kan inte subtrahera inet-värden av olika storlek"
 
-#: utils/adt/numeric.c:793 utils/adt/numeric.c:3659 utils/adt/numeric.c:7216
-#: utils/adt/numeric.c:7419 utils/adt/numeric.c:7891 utils/adt/numeric.c:10586
-#: utils/adt/numeric.c:11061 utils/adt/numeric.c:11155
-#: utils/adt/numeric.c:11290
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "overflow på värde i formatet numeric"
 
-#: utils/adt/numeric.c:1106
+#: utils/adt/numeric.c:1108
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "ogiltigt tecken i externt \"numric\"-värde"
 
-#: utils/adt/numeric.c:1112
+#: utils/adt/numeric.c:1114
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "ogiltig skala i externt \"numeric\"-värde"
 
-#: utils/adt/numeric.c:1121
+#: utils/adt/numeric.c:1123
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "felaktig siffra i externt numeriskt (\"numeric\") värde "
 
-#: utils/adt/numeric.c:1336 utils/adt/numeric.c:1350
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "Precisionen %d för NUMERIC måste vara mellan 1 och %d"
 
-#: utils/adt/numeric.c:1341
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "Skalan %d för NUMERIC måste vara mellan %d och %d"
 
-#: utils/adt/numeric.c:1359
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "ogiltig typmodifierare för NUMERIC"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "startvärde får inte vara NaN"
 
-#: utils/adt/numeric.c:1729
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "startvärde får inte vara oändligt"
 
-#: utils/adt/numeric.c:1736
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "stoppvärde får inte vara NaN"
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "stoppvärde får inte vara oändligt"
 
-#: utils/adt/numeric.c:1753
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "stegstorlek får inte vara NaN"
 
-#: utils/adt/numeric.c:1757
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "stegstorlek får inte vara oändligt"
 
-#: utils/adt/numeric.c:3649
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "fakultet av ett negativt tal är odefinierat"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
 msgstr "undre gräns kan inte vara NaN"
 
-#: utils/adt/numeric.c:4260
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
 msgstr "undre gräns kan inte vara oändlig"
 
-#: utils/adt/numeric.c:4267
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
 msgstr "övre gräns kan inte vara NaN"
 
-#: utils/adt/numeric.c:4271
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
 msgstr "övre gräns kan inte vara oändlig"
 
-#: utils/adt/numeric.c:4432 utils/adt/numeric.c:4520 utils/adt/numeric.c:4580
-#: utils/adt/numeric.c:4776
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "kan inte konvertera NaN till %s"
 
-#: utils/adt/numeric.c:4436 utils/adt/numeric.c:4524 utils/adt/numeric.c:4584
-#: utils/adt/numeric.c:4780
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "kan inte konvertera oändlighet till %s"
 
-#: utils/adt/numeric.c:4789
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn är utanför giltigt intervall"
 
-#: utils/adt/numeric.c:7981 utils/adt/numeric.c:8032
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "overflow i numeric-fält"
 
-#: utils/adt/numeric.c:7982
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr "Ett fält med precision %d, skala %d måste avrundas till ett absolut värde mindre än %s%d."
 
-#: utils/adt/numeric.c:8033
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "Ett fält med precision %d, skala %d kan inte innehålla ett oändligt värde."
 
-#: utils/adt/numeric.c:11359 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
@@ -26567,27 +27779,27 @@ msgstr "undre gräns måste vara mindre eller lika med övre gräns"
 msgid "invalid oidvector data"
 msgstr "ogiltig oidvector-data"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:992
 #, c-format
 msgid "requested character too large"
 msgstr "efterfrågat tecken är för stort"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1036
 #, c-format
 msgid "character number must be positive"
 msgstr "teckennummmer måste vara positivt"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1040
 #, c-format
 msgid "null character not permitted"
 msgstr "nolltecken tillåts inte"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1058 utils/adt/oracle_compat.c:1111
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "efterfrågat tecken är för stort för kodning: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1099
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "efterfrågat tecken är inte giltigt för kodning: %u"
@@ -26598,145 +27810,150 @@ msgstr "efterfrågat tecken är inte giltigt för kodning: %u"
 msgid "percentile value %g is not between 0 and 1"
 msgstr "percentil-värde %g är inte mellan 0 och  1"
 
-#: utils/adt/pg_locale.c:326 utils/adt/pg_locale.c:358
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "lokalnamn \"%s\" innehåller tecken som ej är ASCII"
 
-#: utils/adt/pg_locale.c:1507
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr "kunde inte öppna jämförelse för lokal \"%s\" med regler \"%s\": %s"
-
-#: utils/adt/pg_locale.c:1518 utils/adt/pg_locale.c:2992
-#: utils/adt/pg_locale.c:3065
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU stöds inte av detta bygge"
-
-#: utils/adt/pg_locale.c:1546
-#, c-format
-msgid "could not create locale \"%s\": %m"
-msgstr "kunde inte skapa locale \"%s\": %m"
-
-#: utils/adt/pg_locale.c:1549
-#, c-format
-msgid "The operating system could not find any locale data for the locale name \"%s\"."
-msgstr "Operativsystemet kunde inte hitta någon lokaldata för lokalnamnet \"%s\"."
-
-#: utils/adt/pg_locale.c:1670
-#, c-format
-msgid "collations with different collate and ctype values are not supported on this platform"
-msgstr "jämförelser (collations) med olika collate- och ctype-värden stöds inte på denna plattform"
-
-#: utils/adt/pg_locale.c:1717
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "jämförelse (collation) \"%s\" har ingen version men en version har lagrats"
 
-#: utils/adt/pg_locale.c:1723
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "jämförelse (collation) \"%s\" har en version som inte matchar"
 
-#: utils/adt/pg_locale.c:1725
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr "Jämförelsen (collation) i databasen har skapats med version %s men operativsystemet har version %s."
 
-#: utils/adt/pg_locale.c:1728
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr "Bygg om alla objekt som påverkas av denna jämförelse (collation) och kör ALTER COLLATION %s REFRESH VERSION eller bygg PostgreSQL med rätt bibliotekversion."
 
-#: utils/adt/pg_locale.c:1772 utils/adt/pg_locale.c:2556
-#: utils/adt/pg_locale.c:2581
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "ogiltigt lokalnamn \"%s\" för inbyggd leverantör"
 
-#: utils/adt/pg_locale.c:1814
+#: utils/adt/pg_locale.c:1590
 #, c-format
-msgid "could not load locale \"%s\""
-msgstr "kunde inte skapa locale \"%s\""
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "kunde inte konvertera lokalnamn \"%s\" till språktagg: %s"
 
-#: utils/adt/pg_locale.c:1839
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
-msgstr "kunde inte hitta jämförelseversion (collation) för lokal \"%s\": felkod %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU stöds inte av detta bygge"
 
-#: utils/adt/pg_locale.c:1895 utils/adt/pg_locale.c:1908
+#: utils/adt/pg_locale.c:1632
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "kunde inte konvertera sträng till UTF-16: felkod %lu"
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "kunde inte härleda språk från ICU-lokalen \"%s\": %s"
 
-#: utils/adt/pg_locale.c:1920
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "kunde inte jämföra Unicode-strängar: %m"
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
+msgstr "För att stänga av validering av ICU-lokal, sätt parameter \"%s\" till \"%s\""
+
+#: utils/adt/pg_locale.c:1662
+#, c-format
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "ICU-lokalen \"%s\" har ett okänt språk \"%s\""
+
+#: utils/adt/pg_locale_icu.c:264
+#, c-format
+msgid "could not get language from locale \"%s\": %s"
+msgstr "kunde inte härleda språk från lokalen \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
+#, c-format
+msgid "could not open collator for locale \"%s\": %s"
+msgstr "kunde inte öppna jämförelse för lokal \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:374
+#, c-format
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr "kunde inte öppna jämförelse för lokal \"%s\" med regler \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2094
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
 msgid "collation failed: %s"
 msgstr "jämförelse misslyckades: %s"
 
-#: utils/adt/pg_locale.c:2313 utils/adt/pg_locale.c:2345
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "generering av sorteringsnyckel misslyckades: %s"
 
-#: utils/adt/pg_locale.c:2635
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653
+#: utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
-msgid "could not get language from locale \"%s\": %s"
-msgstr "kunde inte härleda språk från lokalen \"%s\": %s"
+msgid "%s failed: %s"
+msgstr "%s misslyckades: %s"
 
-#: utils/adt/pg_locale.c:2656 utils/adt/pg_locale.c:2672
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
-msgid "could not open collator for locale \"%s\": %s"
-msgstr "kunde inte öppna jämförelse för lokal \"%s\": %s"
+msgid "case conversion failed: %s"
+msgstr "case-konvertering misslyckades: %s"
 
-#: utils/adt/pg_locale.c:2697
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "kodning \"%s\" stöds inte av ICU"
 
-#: utils/adt/pg_locale.c:2704
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "kunde inte öppna ICU-konverterare för kodning \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2722 utils/adt/pg_locale.c:2741
-#: utils/adt/pg_locale.c:2797 utils/adt/pg_locale.c:2808
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "%s failed: %s"
-msgstr "%s misslyckades: %s"
+msgid "collations with different collate and ctype values are not supported on this platform"
+msgstr "jämförelser (collations) med olika collate- och ctype-värden stöds inte på denna plattform"
 
-#: utils/adt/pg_locale.c:2983
+#: utils/adt/pg_locale_libc.c:683
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "kunde inte konvertera lokalnamn \"%s\" till språktagg: %s"
+msgid "could not load locale \"%s\""
+msgstr "kunde inte skapa locale \"%s\""
 
-#: utils/adt/pg_locale.c:3024
+#: utils/adt/pg_locale_libc.c:708
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "kunde inte härleda språk från ICU-lokalen \"%s\": %s"
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr "kunde inte hitta jämförelseversion (collation) för lokal \"%s\": felkod %lu"
 
-#: utils/adt/pg_locale.c:3026 utils/adt/pg_locale.c:3055
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr "För att stänga av validering av ICU-lokal, sätt parameter \"%s\" till \"%s\""
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "kunde inte konvertera sträng till UTF-16: felkod %lu"
 
-#: utils/adt/pg_locale.c:3053
+#: utils/adt/pg_locale_libc.c:793
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "ICU-lokalen \"%s\" har ett okänt språk \"%s\""
+msgid "could not compare Unicode strings: %m"
+msgstr "kunde inte jämföra Unicode-strängar: %m"
+
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "kunde inte skapa locale \"%s\": %m"
+
+#: utils/adt/pg_locale_libc.c:828
+#, c-format
+msgid "The operating system could not find any locale data for the locale name \"%s\"."
+msgstr "Operativsystemet kunde inte hitta någon lokaldata för lokalnamnet \"%s\"."
 
-#: utils/adt/pg_locale.c:3204
+#: utils/adt/pg_locale_libc.c:1000
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "ogiltigt multibyte-tecken för lokalen"
 
-#: utils/adt/pg_locale.c:3205
+#: utils/adt/pg_locale_libc.c:1001
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr "Serverns LC_CTYPE-lokal är troligen inkompatibel med databasens teckenkodning."
@@ -26751,27 +27968,27 @@ msgstr "kan inte addera NaN till pg_lsn"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "kan inte subtrahera Nan från pg_lsn"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr "funktionen kan bara anropas när servern är i binärt uppgraderingsläge"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "ogiltigt kommandonamn: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1909
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "okänt återställningsmål \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1910
 #, c-format
 msgid "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\", or \"wal\"."
 msgstr "Målet måste vara \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\" eller \"wal\"."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2027
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "ogiltigt prenumerations-OID: %u"
@@ -26796,72 +28013,72 @@ msgstr "kan inte acceptera ett värde av typen shell"
 msgid "cannot display a value of a shell type"
 msgstr "kan inte visa ett värde av typen shell"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "konstruktorflaggargument till range får inte vara null"
 
-#: utils/adt/rangetypes.c:1021
+#: utils/adt/rangetypes.c:1023
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "resultatet av range-skillnad skulle inte vara angränsande"
 
-#: utils/adt/rangetypes.c:1082
+#: utils/adt/rangetypes.c:1084
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "resultatet av range-union skulle inte vara angränsande"
 
-#: utils/adt/rangetypes.c:1757
+#: utils/adt/rangetypes.c:1821
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "undre gräns för range måste vara lägre eller lika med övre gräns för range"
 
-#: utils/adt/rangetypes.c:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "ogiltig gränsflagga för range"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Giltiga värden är \"[]\", \"[)\", \"(]\" och \"()\"."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "trasig range-litteral: \"%s\""
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Skräp efter nyckelordet \"empty\"."
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Saknar vänster parentes eller hakparentes."
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Saknar komma efter undre gräns."
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "För många komman."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Skräp efter höger parentes eller hakparentes."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2065 utils/adt/varlena.c:4486
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "reguljärt uttryck misslyckades: %s"
@@ -26876,33 +28093,33 @@ msgstr "ogiltigt flagga till reguljärt uttryck: \"%.*s\""
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr "Om du menade att använda regexp_replace() med en startstartparameter så cast:a fjärde argumentet uttryckligen till integer."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6820 utils/misc/guc.c:6854
+#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1151
+#: utils/adt/regexp.c:1215 utils/adt/regexp.c:1224 utils/adt/regexp.c:1233
+#: utils/adt/regexp.c:1242 utils/adt/regexp.c:1922 utils/adt/regexp.c:1931
+#: utils/adt/regexp.c:1940 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "ogiltigt värde för parameter \"%s\": %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:948
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr "Regulart uttryck  i SQL får inte innehålla mer än två dubbelcitat-escape-separatorer"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1162 utils/adt/regexp.c:1253 utils/adt/regexp.c:1340
+#: utils/adt/regexp.c:1379 utils/adt/regexp.c:1767 utils/adt/regexp.c:1822
+#: utils/adt/regexp.c:1951
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s stöder inte \"global\"-flaggan"
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1381
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "Använd regexp_matches-funktionen istället."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1569
 #, c-format
 msgid "too many regular expression matches"
 msgstr "för många reguljära uttryck matchar"
@@ -26917,8 +28134,8 @@ msgstr "mer än en funktion med namn %s"
 msgid "more than one operator named %s"
 msgstr "mer än en operator med namn %s"
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10509
-#: utils/adt/ruleutils.c:10722
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
@@ -26929,7 +28146,7 @@ msgid "Provide two argument types for operator."
 msgstr "Ange två argumenttyper för operatorn."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3492 utils/adt/varlena.c:3497
 #, c-format
 msgid "invalid name syntax"
 msgstr "ogiltig namnsyntax"
@@ -26954,78 +28171,93 @@ msgstr "förväntade ett typnamn"
 msgid "improper type name"
 msgstr "olämpligt typnamn"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr "insert eller update på tabell \"%s\" bryter mot främmande nyckel-villkoret \"%s\""
 
-#: utils/adt/ri_triggers.c:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, c-format
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL tillåter inte att man blandar null och icke-null-värden."
 
-#: utils/adt/ri_triggers.c:2036
+#: utils/adt/ri_triggers.c:2192
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "funktionen \"%s\" måste köras för INSERT"
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2198
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "funktionen \"%s\" måste köras för UPDATE"
 
-#: utils/adt/ri_triggers.c:2048
+#: utils/adt/ri_triggers.c:2204
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "funktionen \"%s\" måste köras för DELETE"
 
-#: utils/adt/ri_triggers.c:2071
+#: utils/adt/ri_triggers.c:2227
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "ingen pg_constraint-post för trigger \"%s\" på tabell \"%s\""
 
-#: utils/adt/ri_triggers.c:2073
+#: utils/adt/ri_triggers.c:2229
 #, c-format
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr "Ta bort denna trigger för referensiell integritet och dess kollegor, gör sen ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:2426
+#: utils/adt/ri_triggers.c:2599
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr "referentiell integritetsfråga på \"%s\" från villkor \"%s\" på \"%s\" gav oväntat resultat"
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Detta beror troligen på att en regel har skrivit om frågan."
 
-#: utils/adt/ri_triggers.c:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr "borttagning av partition \"%s\" bryter mot främmande nyckel-villkoret \"%s\""
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "Nyckeln (%s)=(%s) refereras fortfarande till från tabell \"%s\"."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Nyckel (%s)=(%s) finns inte i tabellen \"%s\"."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "Nyckeln finns inte i tabellen \"%s\"."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, c-format
+msgid "update or delete on table \"%s\" violates RESTRICT setting of foreign key constraint \"%s\" on table \"%s\""
+msgstr "update eller delete på tabell \"%s\" bryter mot RESTRICT-inställningen för främmande nyckel-villkoret \"%s\" på tabell \"%s\""
+
+#: utils/adt/ri_triggers.c:2792
+#, c-format
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "Nyckeln (%s)=(%s) refereras från tabell \"%s\"."
+
+#: utils/adt/ri_triggers.c:2795
+#, c-format
+msgid "Key is referenced from table \"%s\"."
+msgstr "Nyckel refereras från tabell \"%s\"."
+
+#: utils/adt/ri_triggers.c:2801
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
 msgstr "update eller delete på tabell \"%s\" bryter mot främmande nyckel-villkoret \"%s\" för tabell \"%s\""
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "Nyckel refereras fortfarande till från tabell \"%s\"."
@@ -27076,146 +28308,175 @@ msgstr "binär data har typ %u (%s) istället för förväntad %u (%s) i postkol
 msgid "improper binary format in record column %d"
 msgstr "felaktigt binärt format i postkolumn %d"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "kan inte jämföra olika kolumntyper %s och %s vid postkolumn %d"
 
 #: utils/adt/rowtypes.c:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "kan inte jämföra record-typer med olika antal kolumner"
 
-#: utils/adt/ruleutils.c:2694
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "indata är en fråga, inte ett uttryck"
 
-#: utils/adt/ruleutils.c:2706
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "uttryck innehåller variabler till mer än en relation"
 
-#: utils/adt/ruleutils.c:2713
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "uttryck innehåller variabler"
 
-#: utils/adt/ruleutils.c:5246
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "regel \"%s\" har en icke stödd händelsetyp %d"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, c-format
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "kan inte titta på senaste synliga tid för relationen \"%s.%s\""
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr "ctid är inte av typ TID"
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr "currtid kan inte hantera vyer utan CTID"
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr "vyn har inga regler"
+
+#: utils/adt/tid.c:381
+#, c-format
+msgid "only one select rule is allowed in views"
+msgstr "bara en select-regel tillåts på vyer"
+
+#: utils/adt/timestamp.c:130
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "prceision för TIMESTAMP(%d)%s kan inte vara negativ"
 
-#: utils/adt/timestamp.c:134
+#: utils/adt/timestamp.c:136
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "precision för TIMESTAMP(%d)%s reducerad till högsta tillåtna, %d"
 
-#: utils/adt/timestamp.c:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp utanför giltigt intervall: \"%s\""
+
+#: utils/adt/timestamp.c:396
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "timestamp(%d)-precision måste vara mellan %d och %d"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "Numeriska tidszoner måste ha \"-\" eller \"+\" som sitt första tecken."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "numerisk tidszon \"%s\" utanför giltigt intervall"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp utanför giltigt intervall: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp kan inte vara NaN"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "timestamp utanför giltigt intervall: \"%g\""
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "interval utanför giltigt intervall"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "ogitligt modifierare för typen INTERVAL"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d)-precision kan inte vara negativ"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d)-precision reducerad till maximalt tillåtna, %d"
 
-#: utils/adt/timestamp.c:1506
+#: utils/adt/timestamp.c:1497
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "interval(%d)-precision måste vara mellan %d och %d"
 
-#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "origin utanför giltigt intervall"
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
 #, c-format
 msgid "timestamps cannot be binned into infinite intervals"
 msgstr "timestamps kan inte injusteras in i oändliga intervall"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr "timestamps kan inte injusteras in i intervall som innehåller månader eller år"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "\"stride\" måste vara större än noll"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "Månader har vanligtvis veckor som decimaltal."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "stegstorlek får inte vara oändlig"
@@ -27290,32 +28551,32 @@ msgstr "textsökfråga innehåller bara stoppord eller innehåller inga lexem, h
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "ts_rewrite-fråga måste returnera två tsquery-kolumner"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "array med vikter måste vara endimensionell"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "array med vikter är för kort"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "array med vikter får inte innehålla null-värden"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "vikten är utanför giltigt intervall"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "ordet är för långt (%ld byte, max %ld byte)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "strängen är för lång för tsvector (%ld byte, max %ld byte)"
@@ -27395,7 +28656,7 @@ msgstr "det finns inget escape-tecken: \"%s\""
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "fel positionsinfo i tsvector: \"%s\""
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "kunde inte generera slumpmässiga värden"
@@ -27440,9 +28701,9 @@ msgstr "ogiltig längd på extern bitsträng"
 msgid "bit string too long for type bit varying(%d)"
 msgstr "bitsträngen för lång för typen bit varying(%d)"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919
+#: utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3113
+#: utils/adt/varlena.c:3191
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "negativ substräng-läng tillåts inte"
@@ -27467,7 +28728,7 @@ msgstr "kan inte XOR:a bitsträngar av olika storlek"
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "bitindex %d utanför giltigt intervall (0..%d)"
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3395
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "nya biten måste vara 0 eller 1"
@@ -27482,92 +28743,92 @@ msgstr "värdet för långt för typen character (%d)"
 msgid "value too long for type character varying(%d)"
 msgstr "värdet för långt för typen character varying(%d)"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1602
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "kunde inte bestämma vilken jämförelse (collation) som skall användas för strängjämförelse"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1875
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "ickedeterministiska jämförelser (collation) stöds inte för substrängsökningar"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3279 utils/adt/varlena.c:3346
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "index %d utanför giltigt intervall, 0..%d"
 
-#: utils/adt/varlena.c:3252 utils/adt/varlena.c:3324
+#: utils/adt/varlena.c:3310 utils/adt/varlena.c:3382
 #, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "index %lld utanför giltigt intervall, 0..%lld"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "index %<PRId64> utanför giltigt intervall, 0..%<PRId64>"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4598
 #, c-format
 msgid "field position must not be zero"
 msgstr "fältpositionen får inte vara noll"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5843
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "icketerminerad typangivelse för format()"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5844 utils/adt/varlena.c:5978 utils/adt/varlena.c:6099
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "För ett ensamt \"%%\" använd \"%%%%\"."
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:5976 utils/adt/varlena.c:6097
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "okänd typspecifierare \"%.*s\" för format()"
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:5989 utils/adt/varlena.c:6046
 #, c-format
 msgid "too few arguments for format()"
 msgstr "för få argument till format()"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6142 utils/adt/varlena.c:6324
 #, c-format
 msgid "number is out of range"
 msgstr "numret är utanför giltigt intervall"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6205 utils/adt/varlena.c:6233
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "formatet anger argument 0 men argumenten är numrerade från 1"
 
-#: utils/adt/varlena.c:6013
+#: utils/adt/varlena.c:6226
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "argumentposition för bredd måste avslutas med \"$\""
 
-#: utils/adt/varlena.c:6058
+#: utils/adt/varlena.c:6271
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "null-värden kan inte formatteras som SQL-identifierare"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6479
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr "Unicode-normalisering kan bara utföras om server-kodningen är UTF8"
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6492
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "ogiltigt normaliseringsform: %s"
 
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6537
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr "Unicode-kategorisering kan bara utföras om server-kodningen är UTF8"
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6754 utils/adt/varlena.c:6789 utils/adt/varlena.c:6824
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "ogiltig Unicode-kodpunkt: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6854
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr "Unicode-escapesekvenser måste vara \\XXXX, \\+XXXXXX, \\UXXXX eller \\UXXXXXXXX."
@@ -27584,8 +28845,8 @@ msgstr "argumentet till nth_value måste vara större än noll"
 
 #: utils/adt/xid8funcs.c:120
 #, c-format
-msgid "transaction ID %llu is in the future"
-msgstr "transaktions-ID %llu är från framtiden"
+msgid "transaction ID %<PRIu64> is in the future"
+msgstr "transaktions-ID %<PRIu64> är från framtiden"
 
 #: utils/adt/xid8funcs.c:522
 #, c-format
@@ -27602,7 +28863,7 @@ msgstr "ej stödd XML-finess"
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "Denna funktionalitet kräver att servern byggts med libxml-support."
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:628
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "ogiltigt kodningsnamn \"%s\""
@@ -27617,157 +28878,162 @@ msgstr "ogiltigt XML-kommentar"
 msgid "not an XML document"
 msgstr "inget XML-dokument"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "ogiltig XML-processinstruktion"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "XML-processinstruktions målnamn kan inte vara \"%s\"."
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML-processinstruktion kan inte innehålla \"?>\"."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate är inte implementerat"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "kunde inte initiera XML-bibliotek"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2 har inkompatibel char-typ: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "kunde inte ställa in XML-felhanterare"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, 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 "Detta tyder på att libxml2-versionen som används inte är kompatibel med libxml2-header-filerna som PostgreSQL byggts med."
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "Ogiltigt teckenvärde."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "Mellanslag krävs."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone tillåter bara 'yes' eller 'no'."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "Felaktig deklaration: saknar version."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "Saknar kodning i textdeklaration."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Parsar XML-deklaration: förväntade sig '?>'"
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Okänd libxml-felkod: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2555
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML stöder inte oändliga datumvärden."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2577 utils/adt/xml.c:2604
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML stöder inte oändliga timestamp-värden."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3020
 #, c-format
 msgid "invalid query"
 msgstr "ogiltig fråga"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3112
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "portalen \"%s\" returnerar inga tupler"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4364
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "ogiltig array till XML-namnrymdmappning"
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4365
 #, c-format
 msgid "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "Arrayen måste vara tvådimensionell där längden på andra axeln är 2."
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4389
 #, c-format
 msgid "empty XPath expression"
 msgstr "tomt XPath-uttryck"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4441
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "varken namnrymdnamn eller URI får vara null"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4448
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "kunde inte registrera XML-namnrymd med namn \"%s\" och URL \"%s\""
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4797
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "namnrymden DEFAULT stöds inte"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4826
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "sökvägsfilter för rad får inte vara tomma strängen"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4860
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "sokvägsfilter för kolumn får inte vara tomma strängen"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5007
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "mer än ett värde returnerades från kolumns XPath-uttryck"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, c-format
+msgid "could not determine actual argument type for polymorphic function \"%s\""
+msgstr "kunde inte bestämma argumenttyp för polymorfisk funktion function \"%s\""
+
+#: utils/cache/lsyscache.c:1109
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "typomvandling från typ %s till typ %s finns inte"
 
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3027 utils/cache/lsyscache.c:3060
+#: utils/cache/lsyscache.c:3093 utils/cache/lsyscache.c:3126
 #, c-format
 msgid "type %s is only a shell"
 msgstr "typ %s är bara en shell-typ"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3032
 #, c-format
 msgid "no input function available for type %s"
 msgstr "ingen inläsningsfunktion finns för typ %s"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3065
 #, c-format
 msgid "no output function available for type %s"
 msgstr "ingen utmatningsfunktion finns för typ %s"
@@ -27777,32 +29043,27 @@ msgstr "ingen utmatningsfunktion finns för typ %s"
 msgid "operator class \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "operatorklass \"%s\" för accessmetod %s saknar supportfunktion %d för typ %s"
 
-#: utils/cache/plancache.c:747
-#, c-format
-msgid "cached plan must not change result type"
-msgstr "cache:ad plan får inte ändra resultattyp"
-
-#: utils/cache/relcache.c:3801
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "relfile-nummer för heap är inte satt i binärt uppgraderingsläge"
 
-#: utils/cache/relcache.c:3809
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "oväntad begäran av nytt relfile-nummer i binärt uppgraderingsläge"
 
-#: utils/cache/relcache.c:6539
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "kunde inte skapa initieringsfil \"%s\" för relations-cache: %m"
 
-#: utils/cache/relcache.c:6541
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Fortsätter ändå, trots att något är fel."
 
-#: utils/cache/relcache.c:6871
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "kunde inte ta bort cache-fil \"%s\": %m"
@@ -27822,7 +29083,7 @@ msgstr "relationsmappningsfilen \"%s\" innehåller ogiltig data"
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "relationsmappningsfilen \"%s\" innehåller en felaktig checksumma"
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "posttypen har inte registrerats"
@@ -27837,193 +29098,180 @@ msgstr "TRAP: ExceptionalCondition: fel argument i PID %d\n"
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "TRAP: misslyckad Assert(\"%s\"), Fil: \"%s\", Rad: %d, PID: %d)\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "fel uppstod innan processning av felmeddelande är tillgängligt\n"
 
-#: utils/error/elog.c:2134
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "kunde inte återöppna filen \"%s\" som stderr: %m"
 
-#: utils/error/elog.c:2147
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "kunde inte återöppna filen \"%s\" som stdout: %m"
 
-#: utils/error/elog.c:2183
+#: utils/error/elog.c:2191
 #, c-format
-msgid "Invalid character"
-msgstr "Ogiltigt tecken"
+msgid "Invalid character."
+msgstr "Ogiltigt tecken."
 
-#: utils/error/elog.c:2889 utils/error/elog.c:2916 utils/error/elog.c:2932
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[okänd]"
 
-#: utils/error/elog.c:3202 utils/error/elog.c:3526 utils/error/elog.c:3633
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "saknar feltext"
 
-#: utils/error/elog.c:3205 utils/error/elog.c:3208
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " vid tecken %d"
 
-#: utils/error/elog.c:3218 utils/error/elog.c:3225
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "DETALJ:  "
 
-#: utils/error/elog.c:3232
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "TIPS:  "
 
-#: utils/error/elog.c:3239
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "FRÅGA:  "
 
-#: utils/error/elog.c:3246
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "KONTEXT:  "
 
-#: utils/error/elog.c:3256
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "PLATS:  %s, %s:%d\n"
 
-#: utils/error/elog.c:3263
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "PLATS:  %s:%d\n"
 
-#: utils/error/elog.c:3270
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "BACKTRACE:  "
 
-#: utils/error/elog.c:3282
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "SATS:  "
 
-#: utils/error/elog.c:3678
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3682
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "LOGG"
 
-#: utils/error/elog.c:3685
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3688
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "NOTIS"
 
-#: utils/error/elog.c:3692
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "VARNING"
 
-#: utils/error/elog.c:3695
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "FEL"
 
-#: utils/error/elog.c:3698
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "FATALT"
 
-#: utils/error/elog.c:3701
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "PANIK"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "kunde inte hitta funktionen \"%s\" i filen \"%s\""
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "kunde inte ladda länkbibliotek \"%s\": %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "inkompatibelt bibliotek \"%s\": saknar magiskt block"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "Utökningsbibliotek krävs för att använda macro:t PG_MODULE_MAGIC."
 
-#: utils/fmgr/dfmgr.c:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "inkompatibelt bibliotek \"%s\": versionen stämmer inte"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "Servern är version %d, biblioteket är version %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "inkompatibelt bibliotek \"%s\": ABI matchar inte"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "Servern har ABI \"%s\", biblioteket har \"%s\"."
 
-#: utils/fmgr/dfmgr.c:361
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "Servern har FUNC_MAX_ARGS = %d, biblioteket har %d."
-
-#: utils/fmgr/dfmgr.c:370
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "Servern har INDEX_MAX_KEYS = %d, biblioteket har %d."
+msgid "Server has %s = %d, library has %d."
+msgstr "Servern har %s = %d, biblioteket har %d."
 
-#: utils/fmgr/dfmgr.c:379
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
 #, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "Servern har NAMEDATALEN = %d, biblioteket har %d."
+msgid "Server has %s = %s, library has %s."
+msgstr "Servern har %s = %s, biblioteket har %s."
 
-#: utils/fmgr/dfmgr.c:388
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "Servern har FLOAT8PASSBYVAL = %s, biblioteket har %s."
-
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "Magiskt block har oväntad längd eller annan paddning."
 
-#: utils/fmgr/dfmgr.c:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "inkompatibelt bibliotek \"%s\": magiskt block matchar inte"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "åtkomst till biblioteket \"%s\" tillåts inte"
 
-#: utils/fmgr/dfmgr.c:501
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "ogiltigt macro-namn i dynamisk biblioteksökväg: %s"
-
-#: utils/fmgr/dfmgr.c:541
+#: utils/fmgr/dfmgr.c:554
 #, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "komponent med längden noll i parameter \"dynamic_library_path\""
+msgid "invalid macro name in path: %s"
+msgstr "ogiltigt macro-namn i sökväg: %s"
 
-#: utils/fmgr/dfmgr.c:560
+#: utils/fmgr/dfmgr.c:606
 #, c-format
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "komponent som inte är en absolut sökväg i parameter \"dynamic_library_path\""
+msgid "zero-length component in parameter \"%s\""
+msgstr "komponent med längden noll i parameter \"%s\""
 
 #: utils/fmgr/fmgr.c:236
 #, c-format
@@ -28080,345 +29328,427 @@ msgstr "inget kolumnalias angivet"
 msgid "could not determine row description for function returning record"
 msgstr "kunde inte få radbeskrivning för funktion som returnerar en record"
 
-#: utils/init/miscinit.c:353
+#: utils/init/miscinit.c:265
+msgid "unknown process type"
+msgstr "okänd processtyp"
+
+#: utils/init/miscinit.c:270
+msgid "not initialized"
+msgstr "inte initierad"
+
+#: utils/init/miscinit.c:273
+msgid "archiver"
+msgstr "arkiverare"
+
+#: utils/init/miscinit.c:276
+msgid "autovacuum launcher"
+msgstr "autovacuum-startare"
+
+#: utils/init/miscinit.c:279
+msgid "autovacuum worker"
+msgstr "autovacuum-arbetare"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "klient-backend"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr "dead-end klient-backend"
+
+#: utils/init/miscinit.c:288
+msgid "background worker"
+msgstr "bakgrundsarbetare"
+
+#: utils/init/miscinit.c:291
+msgid "background writer"
+msgstr "bakgrundsskrivare"
+
+#: utils/init/miscinit.c:294
+msgid "checkpointer"
+msgstr "checkpoint:are"
+
+#: utils/init/miscinit.c:300
+msgid "logger"
+msgstr "loggare"
+
+#: utils/init/miscinit.c:303
+msgid "slotsync worker"
+msgstr "arbetare för slotsynkronisering"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr "standalone-backend"
+
+#: utils/init/miscinit.c:309
+msgid "startup"
+msgstr "uppstart"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr "wal-mottagare"
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr "wal-sändare"
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr "wal-summerare"
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr "wal-skrivare"
+
+#: utils/init/miscinit.c:358
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "databaskatalogen \"%s\" existerar inte"
 
-#: utils/init/miscinit.c:358
+#: utils/init/miscinit.c:363
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "kunde inte läsa rättigheter på katalog \"%s\": %m"
 
-#: utils/init/miscinit.c:366
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "angiven datakatalog \"%s\" är inte en katalog"
 
-#: utils/init/miscinit.c:382
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "datakatalogen \"%s\" har fel ägare"
 
-#: utils/init/miscinit.c:384
+#: utils/init/miscinit.c:389
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr "Servern måste startas av den användare som äger datakatalogen."
 
-#: utils/init/miscinit.c:402
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "datakatalogen \"%s\" har felaktiga rättigheter"
 
-#: utils/init/miscinit.c:404
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "Rättigheterna skall vara u=rwx (0700) eller u=rwx,g=rx (0750)."
 
-#: utils/init/miscinit.c:462
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "kunde inte byta katalog till \"%s\": %m"
 
-#: utils/init/miscinit.c:720 utils/misc/guc.c:3650
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "kan inte sätta parameter \"%s\" från en säkerhetsbegränsad operation"
 
-#: utils/init/miscinit.c:807
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "roll med OID %u existerar inte"
 
-#: utils/init/miscinit.c:853
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "roll \"%s\" tillåts inte logga in"
 
-#: utils/init/miscinit.c:874
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "för många uppkopplingar för roll \"%s\""
 
-#: utils/init/miscinit.c:1045
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "ogiltigt roll-OID: %u"
 
-#: utils/init/miscinit.c:1192
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "databassystemet är nedstängt"
 
-#: utils/init/miscinit.c:1279
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "kan inte skapa låsfil \"%s\": %m"
 
-#: utils/init/miscinit.c:1293
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "kunde inte öppna låsfil \"%s\": %m"
 
-#: utils/init/miscinit.c:1300
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "kunde inte läsa låsfil \"%s\": %m"
 
-#: utils/init/miscinit.c:1309
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "låsfilen \"%s\" är tom"
 
-#: utils/init/miscinit.c:1310
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Antingen startar en annan server eller så är låsfilen kvar från en tidigare serverkrash vid uppstart."
 
-#: utils/init/miscinit.c:1354
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "låsfil med namn \"%s\" finns redan"
 
-#: utils/init/miscinit.c:1358
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "Kör en annan postgres (PID %d) i datakatalogen \"%s\"?"
 
-#: utils/init/miscinit.c:1360
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "Kör en annan postmaster (PID %d) i datakatalogen \"%s\"?"
 
-#: utils/init/miscinit.c:1363
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "Använder en annan postgres (PID %d) uttagesfilen (socket) \"%s\"?"
 
-#: utils/init/miscinit.c:1365
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "Använder en annan postmaster (PID %d) uttagesfilen (socket) \"%s\"?"
 
-#: utils/init/miscinit.c:1416
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "kunde inte ta bort gammal låsfil \"%s\": %m"
 
-#: utils/init/miscinit.c:1418
+#: utils/init/miscinit.c:1424
 #, 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 "Filen verkar ha lämnats kvar av misstag, men kan inte tas bort. Ta bort den för hand och försök igen.>"
 
-#: utils/init/miscinit.c:1455 utils/init/miscinit.c:1469
-#: utils/init/miscinit.c:1480
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "kunde inte skriva låsfil \"%s\": %m"
 
-#: utils/init/miscinit.c:1591 utils/init/miscinit.c:1733 utils/misc/guc.c:5765
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "kunde inte läsa från fil \"%s\": %m"
 
-#: utils/init/miscinit.c:1721
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "kunde inte öppna fil \"%s\": %m: fortsätter ändå"
 
-#: utils/init/miscinit.c:1746
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "låsfil \"%s\" innehåller fel PID: %ld istället för %ld"
 
-#: utils/init/miscinit.c:1785 utils/init/miscinit.c:1801
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" är inte en giltigt datakatalog"
 
-#: utils/init/miscinit.c:1787
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Filen \"%s\" saknas."
 
-#: utils/init/miscinit.c:1803
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Filen \"%s\" innehåller inte giltig data."
 
-#: utils/init/miscinit.c:1805
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "Du kan behöva köra initdb."
 
-#: utils/init/miscinit.c:1813
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "Datakatalogen har skapats av PostgreSQL version %s, som inte är kompatibel med version %s."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "replikeringsanslutning auktoriserad: användare=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "anslutning auktoriserad: användare=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr "databas=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " applikationsnamn=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr "SSL påslagen (protokoll=%s, krypto=%s, bitar=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 msgstr " GSS (autentiserad=%s, krypterad=%s, delegerade_referenser=%s, principal=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "nej"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "ja"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr " GSS (autentiserad=%s, krypterad=%s, delegerade_referenser=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "databasen \"%s\" har försvunnit från pg_database"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "Databasen med OID %u verkar nu höra till \"%s\"."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "databasen \"%s\" tar för närvarande inte emot uppkopplingar"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "rättighet saknas för databas \"%s\""
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "Användaren har inte rättigheten CONNECT."
 
-#: utils/init/postinit.c:389
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "för många uppkopplingar till databasen \"%s\""
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "databaslokalen är inkompatibel med operativsystemet"
 
-#: utils/init/postinit.c:414
+#: utils/init/postinit.c:423
 #, c-format
 msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
 msgstr "Databasen initierades med LC_COLLATE \"%s\" vilket inte känns igen av setlocale()."
 
-#: utils/init/postinit.c:416 utils/init/postinit.c:423
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid "Recreate the database with another locale or install the missing locale."
 msgstr "Återskapa databasen med en annan lokal eller installera den saknade lokalen."
 
-#: utils/init/postinit.c:421
+#: utils/init/postinit.c:430
 #, c-format
 msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
 msgstr "Databasen initierades med LC_CTYPE \"%s\", vilket inte känns igen av setlocale()."
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "databasen \"%s\" har en jämförelse (collation) vars version som inte matchar"
 
-#: utils/init/postinit.c:495
+#: utils/init/postinit.c:473
 #, c-format
 msgid "The database was created using collation version %s, but the operating system provides version %s."
 msgstr "Databasen skapades med jämförelseversion %s men operativsystemet tillhandahåller version %s."
 
-#: utils/init/postinit.c:498
+#: utils/init/postinit.c:476
 #, c-format
 msgid "Rebuild all objects in this database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Bygg om alla objekt i denna databas som använder standardjämförelse (collation) och kör ALTER DATABASE %s REFRESH COLLATION VERSION eller bygg PostgreSQL med rätt bibliotekversion."
 
-#: utils/init/postinit.c:904
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr "för många serverprocesser har konfigurerats"
+
+#: utils/init/postinit.c:567
+#, c-format
+msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
+msgstr "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) måste vara mindre än %d."
+
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "inga roller är definierade i detta databassystem"
 
-#: utils/init/postinit.c:905
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Du borde direkt köra CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:942
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "måste vara superuser för att ansluta i binärt uppgraderingsläge"
 
-#: utils/init/postinit.c:962
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "resterande anslutningsslottar är reserverade för roller med attributet %s"
 
-#: utils/init/postinit.c:968
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "resterande anslutningsslottar är reserverade för roller med rättigheter från rollen \"%s\""
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "rättighet saknas för att starta WAL-skickare"
 
-#: utils/init/postinit.c:981
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "Bara roller med attributet %s får starta en process för WAL-skickande."
 
-#: utils/init/postinit.c:1099
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Det verkar precis ha tagits bort eller döpts om."
 
-#: utils/init/postinit.c:1103
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "databasen %u existerar inte"
 
-#: utils/init/postinit.c:1112
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "kan inte ansluta till ogiltig databas \"%s\""
 
-#: utils/init/postinit.c:1173
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "Databasens underbibliotek \"%s\" saknas."
@@ -28433,60 +29763,60 @@ msgstr "rollen \"%s\" kan inte göra SET ROLE till \"%s\""
 msgid "invalid encoding number: %d"
 msgstr "ogiltigt kodningsnummer: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "oväntat kodnings-ID %d för ISO 8859-teckenuppsättningarna"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "oväntat kodnings-ID %d för WIN-teckenuppsättningarna"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:298 utils/mb/mbutils.c:901
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "konvertering mellan %s och %s stöds inte"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:403 utils/mb/mbutils.c:431 utils/mb/mbutils.c:816
+#: utils/mb/mbutils.c:843
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "Sträng på %d byte är för lång för kodningskonvertering."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:569
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "ogiltigt källkodningsnamn \"%s\""
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:574
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "ogiltigt målkodningsnamn \"%s\""
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:714
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "ogiltigt byte-sekvens för kodning \"%s\": 0x%02x\""
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:878
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "ogiltig Unicode-kodpunkt"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1202
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "bind_textdomain_codeset misslyckades"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1719
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "ogiltigt byte-sekvens för kodning \"%s\": %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1760
 #, c-format
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr "tecken med byte-sekvens %s i kodning \"%s\" har inget motsvarande i kodning \"%s\""
@@ -28501,82 +29831,82 @@ msgstr "konfigurationskatalogens namn är tomt: \"%s\""
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "kunde inte öppna konfigureringskatalog \"%s\": %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Giltiga enheter för denna parameter är \"B\", \"kB\", \"MB\", \"GB\" och \"TB\"."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr "Giltiga enheter för denna parameter är \"us\", \"ms\", \"s\", \"min\", \"h\" och \"d\"."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "okänd konfigurationsparameter \"%s\" i fil \"%s\" rad %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3504 utils/misc/guc.c:3748
-#: utils/misc/guc.c:3846 utils/misc/guc.c:3944 utils/misc/guc.c:4071
-#: utils/misc/guc.c:4212
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "parameter \"%s\" kan inte ändras utan att starta om servern"
 
-#: utils/misc/guc.c:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr "parameter \"%s\" borttagen från konfigurationsfil, återställs till standard"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "parameter \"%s\" ändrad till \"%s\""
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "konfigurationsfil \"%s\" innehåller fel"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid "configuration file \"%s\" contains errors; unaffected changes were applied"
 msgstr "konfigurationsfil \"%s\" innehåller fel; opåverkade ändringar har utförts"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "konfigurationsfil \"%s\" innehåller fel; inga ändringar har utförts"
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "ogiltig konfigurationsparameter \"%s\""
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid "Custom parameter names must be two or more simple identifiers separated by dots."
 msgstr "Egenskapade parameternamn måste vara två eller fler enkla identifierare separerade med punkter."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "\"%s\" är ett reserverat prefix."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "okänd konfigurationsparameter \"%s\""
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: kunde inte komma åt katalogen \"%s\": %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
 msgstr "Kör initdb eller pg_basebackup för att initiera en PostgreSQL-datakatalog.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -28585,12 +29915,12 @@ msgstr ""
 "%s vet inte var servens konfigurationsfil är.\n"
 "Du måste ange flaggan --config-file eller -D alternativt sätta omgivningsvariabeln PGDATA.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s: ingen åtkomst till serverns konfigureringsfil \"%s\": %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -28599,7 +29929,7 @@ msgstr ""
 "%s vet inte var databasens systemdata är.\n"
 "Det kan anges med \"data_directory\" i \"%s\" eller med flaggan -D alternativt genom att sätta omgivningsvariabeln PGDATA.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -28608,7 +29938,7 @@ msgstr ""
 "%s vet inte var \"hba\"-konfigurationsfilen är.\n"
 "Detta kan anges som \"hba_file\" i \"%s\" eller med flaggan -D alternativt genom att sätta omgivningsvariabeln PGDATA.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -28617,122 +29947,122 @@ msgstr ""
 "%s vet inte var \"ident\"-konfigurationsfilen är.\n"
 "Detta kan anges som \"ident_file\" i \"%s\" eller med flaggan -D alternativt genom att sätta omgivningsvariabeln PGDATA.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "Värde överskriver heltalsintervall."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
 msgstr "%d%s%s är utanför giltigt intervall för parameter \"%s\" (%d%s%s .. %d%s%s)"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
 msgstr "%g%s%s är utanför giltigt intervall för parameter \"%s\" (%g%s%s .. %g%s%s)"
 
-#: utils/misc/guc.c:3465
+#: utils/misc/guc.c:3462
 #, c-format
 msgid "parameter \"%s\" cannot be set during a parallel operation"
 msgstr "parameter \"%s\" can inte sättas under en parallell operation"
 
-#: utils/misc/guc.c:3481 utils/misc/guc.c:4696
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "parameter \"%s\" kan inte ändras"
 
-#: utils/misc/guc.c:3514
+#: utils/misc/guc.c:3511
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "parameter \"%s\" kan inte ändras nu"
 
-#: utils/misc/guc.c:3541 utils/misc/guc.c:3603 utils/misc/guc.c:4671
-#: utils/misc/guc.c:6756
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "rättighet saknas för att sätta parameter \"%s\""
 
-#: utils/misc/guc.c:3583
+#: utils/misc/guc.c:3580
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "parameter \"%s\" kan inte ändras efter uppkopplingen startats"
 
-#: utils/misc/guc.c:3642
+#: utils/misc/guc.c:3639
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "kan inte sätta parameter \"%s\" inom en security-definer-funktion"
 
-#: utils/misc/guc.c:3663
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "parametern \"%s\" kunde inte återställas"
 
-#: utils/misc/guc.c:3670
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "parametern \"%s\" kan inte ändras lokalt i funktioner"
 
-#: utils/misc/guc.c:4370 utils/misc/guc.c:4418 utils/misc/guc.c:5450
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "rättighet saknas för att se \"%s\""
 
-#: utils/misc/guc.c:4371 utils/misc/guc.c:4419 utils/misc/guc.c:5451
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "Bara roller med rättigheter från rollen \"%s\" får se denna parameter."
 
-#: utils/misc/guc.c:4629
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "ALTER SYSTEM tillåts inte i denna miljö"
 
-#: utils/misc/guc.c:4661
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "rättighet saknas för att utföra ALTER SYSTEM RESET ALL"
 
-#: utils/misc/guc.c:4740
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr "parametervärde till ALTER SYSTEM kan inte innehålla nyradstecken"
 
-#: utils/misc/guc.c:4785
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "kunde inte parsa innehållet i fil \"%s\""
 
-#: utils/misc/guc.c:4967
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "försök att omdefiniera parameter \"%s\""
 
-#: utils/misc/guc.c:5306
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "ogiltigt konfigurationsparameternamn \"%s\", tas bort"
 
-#: utils/misc/guc.c:5308
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "\"%s\" är nu ett reserverat prefix."
 
-#: utils/misc/guc.c:6179
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "vid sättande av parameter \"%s\" till \"%s\""
 
-#: utils/misc/guc.c:6348
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "parameter \"%s\" kunde inte sättas"
 
-#: utils/misc/guc.c:6438
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "kunde inte tolka inställningen för parameter \"%s\""
 
-#: utils/misc/guc.c:6888
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "ogiltigt värde för parameter \"%s\": %g"
@@ -28757,2064 +30087,2275 @@ msgstr "SET %s tar bara ett argument"
 msgid "SET requires parameter name"
 msgstr "SET kräver ett parameternamn"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:701
 msgid "Ungrouped"
 msgstr "Ej grupperad"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:702
 msgid "File Locations"
 msgstr "Filplatser"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:703
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Uppkopplingar och Autentisering / Uppkopplingsinställningar"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:704
 msgid "Connections and Authentication / TCP Settings"
 msgstr "Uppkopplingar och Autentisering / TCP-inställningar"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:705
 msgid "Connections and Authentication / Authentication"
 msgstr "Uppkopplingar och Autentisering / Autentisering"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:706
 msgid "Connections and Authentication / SSL"
 msgstr "Uppkopplingar och Autentisering / SSL"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:707
 msgid "Resource Usage / Memory"
 msgstr "Resursanvändning / Minne"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:708
 msgid "Resource Usage / Disk"
 msgstr "Resursanvändning / Disk"
 
-#: utils/misc/guc_tables.c:684
+#: utils/misc/guc_tables.c:709
 msgid "Resource Usage / Kernel Resources"
-msgstr "Resursanvändning / Kärnresurser"
-
-#: utils/misc/guc_tables.c:685
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Resursanvändning / Kostnadsbaserad Vacuum-fördröjning"
+msgstr "Resursanvändning / Kernel-resurser"
 
-#: utils/misc/guc_tables.c:686
+#: utils/misc/guc_tables.c:710
 msgid "Resource Usage / Background Writer"
 msgstr "Resursanvändning / Bakgrundskrivare"
 
-#: utils/misc/guc_tables.c:687
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Resursanvändning / Asynkront beteende"
+#: utils/misc/guc_tables.c:711
+msgid "Resource Usage / I/O"
+msgstr "Resursanvändning / I/O"
+
+#: utils/misc/guc_tables.c:712
+msgid "Resource Usage / Worker Processes"
+msgstr "Resursanvändning / Arbetsprocesser"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:713
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead Log / Inställningar"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:714
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead Log / Checkpoint:er"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:715
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead Log / Arkivering"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:716
 msgid "Write-Ahead Log / Recovery"
 msgstr "Write-Ahead Log / Återställning"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:717
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Write-Ahead Log / Återställning från arkiv"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:718
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Write-Ahead Log / Återställningsmål"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:719
 msgid "Write-Ahead Log / Summarization"
 msgstr "Write-Ahead Log / Summering"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:720
 msgid "Replication / Sending Servers"
 msgstr "Replilering / Skickande servrar"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:721
 msgid "Replication / Primary Server"
 msgstr "Replikering / Primärserver"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:722
 msgid "Replication / Standby Servers"
 msgstr "Replikering / Standby-servrar"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:723
 msgid "Replication / Subscribers"
 msgstr "Replikering / Prenumeranter"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:724
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Frågeoptimering / Planeringsmetodinställningar"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:725
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Frågeoptimering / Plannerarens kostnadskonstanter"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:726
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Frågeoptimering / Genetisk frågeoptimerare"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:727
 msgid "Query Tuning / Other Planner Options"
 msgstr "Frågeoptimering / Andra planeringsinställningar"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:728
 msgid "Reporting and Logging / Where to Log"
 msgstr "Rapportering och loggning / Logga var?"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:729
 msgid "Reporting and Logging / When to Log"
 msgstr "Rapportering och loggning / Logga när?"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:730
 msgid "Reporting and Logging / What to Log"
 msgstr "Rapportering och loggning / Logga vad?"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:731
 msgid "Reporting and Logging / Process Title"
 msgstr "Rapportering och loggning / Processtitel"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:732
 msgid "Statistics / Monitoring"
 msgstr "Statistik / Övervakning"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:733
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "Statistik / Ihopsamlad fråge- och index-statistik"
 
-#: utils/misc/guc_tables.c:709
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/misc/guc_tables.c:734
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr "Vacuum / Automatisk Vacuum"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:735
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "Vacuum / Kostbaserad Vacuum-fördröjning"
+
+#: utils/misc/guc_tables.c:736
+msgid "Vacuuming / Default Behavior"
+msgstr "Vacuum / Standardbeteende"
+
+#: utils/misc/guc_tables.c:737
+msgid "Vacuuming / Freezing"
+msgstr "Vacuum / Fryser"
+
+#: utils/misc/guc_tables.c:738
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Standard för klientanslutning / Satsbeteende"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:739
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Standard för klientanslutning / Lokal och formattering"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:740
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Standard för klientanslutning / Förladdning av delat bibliotek"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:741
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Standard för klientanslutning / Övriga standardvärden"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:742
 msgid "Lock Management"
 msgstr "Låshantering"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:743
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Version och plattformskompabilitet / Tidigare PostrgreSQL-versioner"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:744
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Version och plattformskompabilitet / Andra plattformar och klienter"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:745
 msgid "Error Handling"
 msgstr "Felhantering"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:746
 msgid "Preset Options"
 msgstr "Förinställningsflaggor"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:747
 msgid "Customized Options"
 msgstr "Ändrade flaggor"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:748
 msgid "Developer Options"
 msgstr "Utvecklarflaggor"
 
-#: utils/misc/guc_tables.c:775
+#: utils/misc/guc_tables.c:803
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Aktiverar planerarens användning av planer med sekvensiell skanning."
 
-#: utils/misc/guc_tables.c:785
+#: utils/misc/guc_tables.c:813
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Aktiverar planerarens användning av planer med indexskanning."
 
-#: utils/misc/guc_tables.c:795
+#: utils/misc/guc_tables.c:823
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Aktiverar planerarens användning av planer med skanning av enbart index."
 
-#: utils/misc/guc_tables.c:805
+#: utils/misc/guc_tables.c:833
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "Aktiverar planerarens användning av planer med bitmapskanning."
 
-#: utils/misc/guc_tables.c:815
+#: utils/misc/guc_tables.c:843
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Aktiverar planerarens användning av planer med TID-skanning."
 
-#: utils/misc/guc_tables.c:825
+#: utils/misc/guc_tables.c:853
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Slår på planerarens användning av explicita sorteringssteg."
 
-#: utils/misc/guc_tables.c:835
+#: utils/misc/guc_tables.c:863
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "Aktiverar planerarens användning av inkrementella sorteringssteg."
 
-#: utils/misc/guc_tables.c:845
+#: utils/misc/guc_tables.c:873
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Aktiverar planerarens användning av planer med hash-aggregering"
 
-#: utils/misc/guc_tables.c:855
+#: utils/misc/guc_tables.c:883
 msgid "Enables the planner's use of materialization."
 msgstr "Aktiverar planerarens användning av materialisering."
 
-#: utils/misc/guc_tables.c:865
+#: utils/misc/guc_tables.c:893
 msgid "Enables the planner's use of memoization."
 msgstr "Aktiverar planerarens användning av memoization."
 
-#: utils/misc/guc_tables.c:875
+#: utils/misc/guc_tables.c:903
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Aktiverar planerarens användning av planer med nästlad loop-join,"
 
-#: utils/misc/guc_tables.c:885
+#: utils/misc/guc_tables.c:913
 msgid "Enables the planner's use of merge join plans."
 msgstr "Aktiverar planerarens användning av merge-join-planer."
 
-#: utils/misc/guc_tables.c:895
+#: utils/misc/guc_tables.c:923
 msgid "Enables the planner's use of hash join plans."
 msgstr "Aktiverar planerarens användning av hash-join-planer."
 
-#: utils/misc/guc_tables.c:905
+#: utils/misc/guc_tables.c:933
 msgid "Enables the planner's use of gather merge plans."
 msgstr "Aktiverar planerarens användning av planer med gather-merge."
 
-#: utils/misc/guc_tables.c:915
+#: utils/misc/guc_tables.c:943
 msgid "Enables partitionwise join."
 msgstr "Aktiverar join per partition."
 
-#: utils/misc/guc_tables.c:925
+#: utils/misc/guc_tables.c:953
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "Aktiverar aggregering och gruppering per partition."
 
-#: utils/misc/guc_tables.c:935
+#: utils/misc/guc_tables.c:963
 msgid "Enables the planner's use of parallel append plans."
 msgstr "Aktiverar planerarens användning av planer med parallell append."
 
-#: utils/misc/guc_tables.c:945
+#: utils/misc/guc_tables.c:973
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "Aktiverar planerarens användning av planer med parallell hash."
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:983
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "Aktiverar rensning av partitioner vid planering och vid körning."
 
-#: utils/misc/guc_tables.c:956
+#: utils/misc/guc_tables.c:984
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr "Tillåter att frågeplaneraren och exekveraren jämför partitionsgränser med villkor i frågan för att bestämma vilka partitioner som skall skannas."
 
-#: utils/misc/guc_tables.c:967
+#: utils/misc/guc_tables.c:995
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr "Slår på planerarens möjlighet att skapa planer som tillhandahåller försorterad indata till aggregatfunktioner med ORDER BY / DISTINCT."
 
-#: utils/misc/guc_tables.c:970
+#: utils/misc/guc_tables.c:998
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr "Tillåter att planeraren kan skapa planer som tillhandahåller försorterad indata till aggregatfunktioner med en ORDER BY / DISTINCT-klausul. Om avstängd så kommer implicita sorteringar alltid utföras vid exekvering."
 
-#: utils/misc/guc_tables.c:982
+#: utils/misc/guc_tables.c:1010
 msgid "Enables the planner's use of async append plans."
 msgstr "Aktiverar planerarens användning av planer med async append."
 
-#: utils/misc/guc_tables.c:992
+#: utils/misc/guc_tables.c:1020
+msgid "Enables removal of unique self-joins."
+msgstr "Aktiverar borttagning av unika join med sig själv."
+
+#: utils/misc/guc_tables.c:1030
 msgid "Enables reordering of GROUP BY keys."
 msgstr "Aktiverar omkastning av nycklar i GROUP BY."
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1040
+msgid "Enables reordering of DISTINCT keys."
+msgstr "Aktiverar omkastning av nycklar i DISTINCT."
+
+#: utils/misc/guc_tables.c:1050
 msgid "Enables genetic query optimization."
 msgstr "Aktiverar genetisk frågeoptimering."
 
-#: utils/misc/guc_tables.c:1003
+#: utils/misc/guc_tables.c:1051
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "Denna algoritm försöker utföra planering utan fullständig sökning."
 
-#: utils/misc/guc_tables.c:1017
+#: utils/misc/guc_tables.c:1065
 msgid "Shows whether the current user is a superuser."
 msgstr "Visar om den aktuella användaren är en superuser."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1080
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "Tillåter att kommandot ALTER SYSTEM körs."
 
-#: utils/misc/guc_tables.c:1033
+#: utils/misc/guc_tables.c:1081
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
 msgstr "Kan sättas till av för miljöer där global konfiguration skall hanteras på annat sätt."
 
-#: utils/misc/guc_tables.c:1043
+#: utils/misc/guc_tables.c:1091
 msgid "Enables advertising the server via Bonjour."
 msgstr "Aktiverar annonsering av servern via Bonjour."
 
-#: utils/misc/guc_tables.c:1052
+#: utils/misc/guc_tables.c:1100
 msgid "Collects transaction commit time."
 msgstr "Samlar in tid för transaktions-commit."
 
-#: utils/misc/guc_tables.c:1061
+#: utils/misc/guc_tables.c:1109
 msgid "Enables SSL connections."
 msgstr "Tillåter SSL-anslutningar."
 
-#: utils/misc/guc_tables.c:1070
+#: utils/misc/guc_tables.c:1118
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
 msgstr "Styr hurvida \"ssl_passphrase_command\" anropas vid omladdning av server."
 
-#: utils/misc/guc_tables.c:1079
+#: utils/misc/guc_tables.c:1127
 msgid "Give priority to server ciphersuite order."
 msgstr "Ge prioritet till serverns ordning av kryptometoder."
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1136
 msgid "Forces synchronization of updates to disk."
 msgstr "Tvingar synkronisering av uppdateringar till disk."
 
-#: utils/misc/guc_tables.c:1089
+#: utils/misc/guc_tables.c:1137
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures that a database cluster will recover to a consistent state after an operating system or hardware crash."
 msgstr "Servern kommer använda systemanropet fsync() på ett antal platser för att se till att uppdateringar fysiskt skrivs till disk. Detta för att säkerställa att databasklustret kan starta i ett konsistent tillstånd efter en operativsystemkrash eller hårdvarukrash."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1148
 msgid "Continues processing after a checksum failure."
 msgstr "Fortsätter processande efter checksummefel."
 
-#: utils/misc/guc_tables.c:1101
+#: utils/misc/guc_tables.c:1149
 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 "Normalt vid detektion av checksummefel så rapporterar PostgreSQL felet och avbryter den aktuella transaktionen. Sätts ignore_checksum_failure till true så kommer systemet hoppa över felet (men fortfarande rapportera en varning). Detta beteende kan orsaka krasher eller andra allvarliga problem. Detta påverkas bara om checksummor är påslaget."
 
-#: utils/misc/guc_tables.c:1115
+#: utils/misc/guc_tables.c:1163
 msgid "Continues processing past damaged page headers."
 msgstr "Fortsätter processande efter trasiga sidhuvuden."
 
-#: utils/misc/guc_tables.c:1116
+#: utils/misc/guc_tables.c:1164
 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 "Normalt vid detektion av trasiga sidhuvuden så rapporterar PostgreSQL felet och avbryter den aktuella transaktionen. Sätts \"zero_damaged_pages\" till true så kommer systemet istället rapportera en varning, nollställa den trasiga sidan samt fortsätta processa. Detta kommer förstöra data (alla rader i den trasiga sidan)."
 
-#: utils/misc/guc_tables.c:1129
+#: utils/misc/guc_tables.c:1177
 msgid "Continues recovery after an invalid pages failure."
 msgstr "Fortsätter återställande efter fel på grund av ogiltiga sidor."
 
-#: utils/misc/guc_tables.c:1130
+#: utils/misc/guc_tables.c:1178
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
 msgstr "Normalt vid detektion av WAL-poster som refererar till ogiltiga sidor under återställning så kommer PostgreSQL att signalera ett fel på PANIC-nivå och avbryta återställningen. Sätts \"ignore_invalid_pages\" till true så kommer systemet hoppa över ogiltiga sidreferenser i WAL-poster (men fortfarande rapportera en varning) och fortsätta återställningen. Detta beteende kan orsaka krasher, dataförluster, sprida eller dölja korruption eller ge andra allvarliga problem. Detta påverkar bara under återställning eller i standby-läge."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1196
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "Skriver fulla sidor till WAL första gången de ändras efter en checkpoint."
 
-#: utils/misc/guc_tables.c:1149
+#: utils/misc/guc_tables.c:1197
 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 "En sidskrivning som sker vid en operativsystemkrash kan bli delvis utskriven till disk. Under återställning så kommer radändringar i WAL:en inte vara tillräckligt för att återställa datan. Denna flagga skriver ut sidor först efter att en WAL-checkpoint gjorts vilket gör att full återställning kan ske."
 
-#: utils/misc/guc_tables.c:1162
+#: utils/misc/guc_tables.c:1210
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
 msgstr "Skriver fulla sidor till WAL första gången de ändras efter en checkpoint, även för ickekritisk ändring."
 
-#: utils/misc/guc_tables.c:1172
+#: utils/misc/guc_tables.c:1220
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "Skriv nollor till nya WAL-filer innan första användning."
 
-#: utils/misc/guc_tables.c:1182
+#: utils/misc/guc_tables.c:1230
 msgid "Recycles WAL files by renaming them."
 msgstr "Återanvänder WAL-filer genom att byta namn på dem."
 
-#: utils/misc/guc_tables.c:1192
+#: utils/misc/guc_tables.c:1240
 msgid "Logs each checkpoint."
 msgstr "Logga varje checkpoint."
 
-#: utils/misc/guc_tables.c:1201
-msgid "Logs each successful connection."
-msgstr "Logga varje lyckad anslutning."
-
-#: utils/misc/guc_tables.c:1210
+#: utils/misc/guc_tables.c:1249
 msgid "Logs details of pre-authentication connection handshake."
 msgstr "Logga detaljer om anslutningshandskakning före autentisering."
 
-#: utils/misc/guc_tables.c:1220
+#: utils/misc/guc_tables.c:1259
 msgid "Logs end of a session, including duration."
 msgstr "Loggar slut på session, inklusive längden."
 
-#: utils/misc/guc_tables.c:1229
+#: utils/misc/guc_tables.c:1268
 msgid "Logs each replication command."
 msgstr "Loggar alla replikeringskommanon."
 
-#: utils/misc/guc_tables.c:1238
+#: utils/misc/guc_tables.c:1277
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Visar om den körande servern har assert-kontroller påslagna."
 
-#: utils/misc/guc_tables.c:1249
+#: utils/misc/guc_tables.c:1288
 msgid "Terminate session on any error."
 msgstr "Avbryt sessionen vid fel."
 
-#: utils/misc/guc_tables.c:1258
+#: utils/misc/guc_tables.c:1297
 msgid "Reinitialize server after backend crash."
 msgstr "Återinitiera servern efter en backend-krash."
 
-#: utils/misc/guc_tables.c:1267
+#: utils/misc/guc_tables.c:1306
 msgid "Remove temporary files after backend crash."
 msgstr "Ta bort temporära filer efter en backend-krash."
 
-#: utils/misc/guc_tables.c:1277
+#: utils/misc/guc_tables.c:1316
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "Skicka SIGABRT och inte SIGQUIT till barnprocesser efter att backend:en krashat."
 
-#: utils/misc/guc_tables.c:1287
+#: utils/misc/guc_tables.c:1326
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "Skicka SIGABRT och inte SIGKILL till barnprocesser som fastnat."
 
-#: utils/misc/guc_tables.c:1298
+#: utils/misc/guc_tables.c:1337
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Loggar tiden för varje avslutad SQL-sats."
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1347
+msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr "Sätt denna för att tvinga alla parse- och plan-träd att skickas via copyObject(), för att underlätta att fel fångas och hitta saker som saknas i copyObject()."
+
+#: utils/misc/guc_tables.c:1364
+msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr "Sätt denna för att tvinga alla parse- och plan-träd att skickas via outfuncs.c/readfuncs.c, för att underlätta att fel fångas och hitta saker som saknas i dessa moduler."
+
+#: utils/misc/guc_tables.c:1381
+msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
+msgstr "Sätt denna för att tvinga alla råa parse-träd för DML-satser att skannas av raw_expression_tree_walker(), för att underlätta att fel fångas och hitta saker som saknas i denna funktion."
+
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's parse tree."
 msgstr "Loggar alla frågors parse-träd."
 
-#: utils/misc/guc_tables.c:1316
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's rewritten parse tree."
 msgstr "Logga alla frågors omskrivet parse-träd."
 
-#: utils/misc/guc_tables.c:1325
+#: utils/misc/guc_tables.c:1417
 msgid "Logs each query's execution plan."
 msgstr "Logga alla frågors körningsplan."
 
-#: utils/misc/guc_tables.c:1334
+#: utils/misc/guc_tables.c:1426
 msgid "Indents parse and plan tree displays."
 msgstr "Indentera parse och planeringsträdutskrifter"
 
-#: utils/misc/guc_tables.c:1343
+#: utils/misc/guc_tables.c:1435
 msgid "Writes parser performance statistics to the server log."
 msgstr "Skriver parserns prestandastatistik till serverloggen."
 
-#: utils/misc/guc_tables.c:1352
+#: utils/misc/guc_tables.c:1444
 msgid "Writes planner performance statistics to the server log."
 msgstr "Skriver planerarens prestandastatistik till serverloggen."
 
-#: utils/misc/guc_tables.c:1361
+#: utils/misc/guc_tables.c:1453
 msgid "Writes executor performance statistics to the server log."
 msgstr "Skrivere exekverarens prestandastatistik till serverloggen."
 
-#: utils/misc/guc_tables.c:1370
+#: utils/misc/guc_tables.c:1462
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Skriver ackumulerad prestandastatistik till serverloggen."
 
-#: utils/misc/guc_tables.c:1380
+#: utils/misc/guc_tables.c:1472
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "Loggar statisik för användning av systemresurser (minne och CPU) för olika B-tree-operationer."
 
-#: utils/misc/guc_tables.c:1392
+#: utils/misc/guc_tables.c:1484
 msgid "Collects information about executing commands."
 msgstr "Samla information om körda kommanon."
 
-#: utils/misc/guc_tables.c:1393
+#: utils/misc/guc_tables.c:1485
 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 "Slår på insamling av information om det nu körande kommandot för varje session, tillsammans med klockslaget när det kommandot började köra."
 
-#: utils/misc/guc_tables.c:1403
+#: utils/misc/guc_tables.c:1495
 msgid "Collects statistics on database activity."
 msgstr "Samla in statistik om databasaktivitet."
 
-#: utils/misc/guc_tables.c:1412
+#: utils/misc/guc_tables.c:1504
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "Samla in timingstatistik för kostnadsbaserad vacuum-fördröjning."
+
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Samla in timingstatistik om databasens I/O-aktivitet."
 
-#: utils/misc/guc_tables.c:1421
+#: utils/misc/guc_tables.c:1522
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "Samla in timingstatistik om I/O-aktivitet för WAL."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1532
 msgid "Updates the process title to show the active SQL command."
 msgstr "Uppdaterar processtitel till att visa aktivt SQL-kommando."
 
-#: utils/misc/guc_tables.c:1432
+#: utils/misc/guc_tables.c:1533
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr "Slår på uppdatering av processtiteln varje gång ett nytt SQL-kommando tas emot av servern."
 
-#: utils/misc/guc_tables.c:1441
+#: utils/misc/guc_tables.c:1542
 msgid "Starts the autovacuum subprocess."
 msgstr "Starta autovacuum-barnprocess."
 
-#: utils/misc/guc_tables.c:1451
+#: utils/misc/guc_tables.c:1552
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Skapar debug-output för LISTEN och NOTIFY."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1564
 msgid "Emits information about lock usage."
 msgstr "Visar information om låsanvändning."
 
-#: utils/misc/guc_tables.c:1473
+#: utils/misc/guc_tables.c:1574
 msgid "Emits information about user lock usage."
 msgstr "Visar information om användares låsanvändning."
 
-#: utils/misc/guc_tables.c:1483
+#: utils/misc/guc_tables.c:1584
 msgid "Emits information about lightweight lock usage."
 msgstr "Visar information om lättviktig låsanvändning."
 
-#: utils/misc/guc_tables.c:1493
+#: utils/misc/guc_tables.c:1594
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "Dumpar information om alla aktuella lås när en deadlock-timeout sker."
 
-#: utils/misc/guc_tables.c:1505
+#: utils/misc/guc_tables.c:1606
 msgid "Logs long lock waits."
 msgstr "Loggar långa väntetider på lås."
 
-#: utils/misc/guc_tables.c:1514
+#: utils/misc/guc_tables.c:1615
+msgid "Logs lock failures."
+msgstr "Loggar låsfel."
+
+#: utils/misc/guc_tables.c:1624
 msgid "Logs standby recovery conflict waits."
 msgstr "Loggar väntande på återställningskonflikter i standby"
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1633
 msgid "Logs the host name in the connection logs."
 msgstr "Loggar hostnamnet i anslutningsloggen."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1634
 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 "Som standard visar anslutningsloggen bara IP-adressen för den anslutande värden. Om du vill att värdnamnet skall visas så kan du slå på detta men beroende på hur uppsättningen av namnuppslag är gjored så kan detta ha en markant prestandapåverkan."
 
-#: utils/misc/guc_tables.c:1535
+#: utils/misc/guc_tables.c:1645
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Tolkar \"uttryck=NULL\" som \"uttryck IS NULL\"."
 
-#: utils/misc/guc_tables.c:1536
+#: utils/misc/guc_tables.c:1646
 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 "Om påslagen så kommer uttryck på formen uttryck = NULL (eller NULL = uttryck) att behandlas som uttryck IS NULL, det vill säga returnera true om uttryck evalueras till värdet null eller evalueras till false annars. Det korrekta beteendet för uttryck = NULL är att alltid returnera null (okänt)."
 
-#: utils/misc/guc_tables.c:1548
+#: utils/misc/guc_tables.c:1658
 msgid "Sets the default read-only status of new transactions."
 msgstr "Ställer in standard read-only-status för nya transaktioner."
 
-#: utils/misc/guc_tables.c:1558
+#: utils/misc/guc_tables.c:1668
 msgid "Sets the current transaction's read-only status."
 msgstr "Ställer in nuvarande transaktions read-only-status."
 
-#: utils/misc/guc_tables.c:1568
+#: utils/misc/guc_tables.c:1678
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Ställer in standard deferrable-status för nya transaktioner."
 
-#: utils/misc/guc_tables.c:1577
+#: utils/misc/guc_tables.c:1687
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "Bestämmer om en serialiserbar transaktion för läsning kommer fördröjas tills den kan köras utan serialiseringsfel."
 
-#: utils/misc/guc_tables.c:1587
-msgid "Enable row security."
+#: utils/misc/guc_tables.c:1697
+msgid "Enables row security."
 msgstr "Aktiverar radsäkerhet."
 
-#: utils/misc/guc_tables.c:1588
+#: utils/misc/guc_tables.c:1698
 msgid "When enabled, row security will be applied to all users."
 msgstr "Om aktiv så kommer radsäkerhet användas för alla användare."
 
-#: utils/misc/guc_tables.c:1596
+#: utils/misc/guc_tables.c:1706
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "Kontrollera funktionskroppen vid CREATE FUNCTION och CREATE PROCEDURE."
 
-#: utils/misc/guc_tables.c:1605
-msgid "Enable input of NULL elements in arrays."
+#: utils/misc/guc_tables.c:1715
+msgid "Enables input of NULL elements in arrays."
 msgstr "Aktiverar inmatning av NULL-element i arrayer."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1716
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr "Om påslagen så kommer ej citerade NULL i indatavärden för en array betyda värdet null, annars tolkas det bokstavligt."
 
-#: utils/misc/guc_tables.c:1622
+#: utils/misc/guc_tables.c:1732
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS stöds inte längre; denna kan bara vara false."
 
-#: utils/misc/guc_tables.c:1632
+#: utils/misc/guc_tables.c:1742
 msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
 msgstr "Starta en subprocess för att fånga stderr, csvlog och/eller jsonlog till loggfiler."
 
-#: utils/misc/guc_tables.c:1641
+#: utils/misc/guc_tables.c:1751
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "Trunkera existerande loggfiler med samma namn under loggrotering."
 
-#: utils/misc/guc_tables.c:1652
+#: utils/misc/guc_tables.c:1761
 msgid "Emit information about resource usage in sorting."
 msgstr "Skicka ut information om resursanvändning vid sortering."
 
-#: utils/misc/guc_tables.c:1666
+#: utils/misc/guc_tables.c:1774
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Generera debug-output för synkroniserad skanning."
 
-#: utils/misc/guc_tables.c:1681
-msgid "Enable bounded sorting using heap sort."
+#: utils/misc/guc_tables.c:1789
+msgid "Enables bounded sorting using heap sort."
 msgstr "Slår på begränsad sortering med heap-sort."
 
-#: utils/misc/guc_tables.c:1694
+#: utils/misc/guc_tables.c:1802
 msgid "Emit WAL-related debugging output."
 msgstr "Skicka ut WAL-relaterad debug-data."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1814
 msgid "Shows whether datetimes are integer based."
 msgstr "Visa hurvida datetime är heltalsbaserad"
 
-#: utils/misc/guc_tables.c:1717
+#: utils/misc/guc_tables.c:1825
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "Anger hurvida Kerberos- och GSSAPI-användarnamn skall tolkas skiftlägesokänsligt."
 
-#: utils/misc/guc_tables.c:1727
+#: utils/misc/guc_tables.c:1835
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "Anger hurvida GSSAPI-delegering skall accpeteras från klienten."
 
-#: utils/misc/guc_tables.c:1737
+#: utils/misc/guc_tables.c:1845
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Varna om backåtstreck-escape i vanliga stränglitteraler."
 
-#: utils/misc/guc_tables.c:1747
+#: utils/misc/guc_tables.c:1855
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Gör att '...'-stängar tolkar bakåtstreck bokstavligt."
 
-#: utils/misc/guc_tables.c:1758
-msgid "Enable synchronized sequential scans."
-msgstr "Slå på synkroniserad sekvensiell skanning."
+#: utils/misc/guc_tables.c:1866
+msgid "Enables synchronized sequential scans."
+msgstr "Slår på synkroniserad sekvensiell skanning."
 
-#: utils/misc/guc_tables.c:1768
+#: utils/misc/guc_tables.c:1876
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "Anger hurvida man skall inkludera eller exkludera transaktion för återställningmål."
 
-#: utils/misc/guc_tables.c:1778
+#: utils/misc/guc_tables.c:1886
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "Startar process för WAL-summering för att tillåta inkrementella backuper."
 
-#: utils/misc/guc_tables.c:1788
+#: utils/misc/guc_tables.c:1896
 msgid "Allows connections and queries during recovery."
 msgstr "Tillåt anslutningar och frågor under återställning."
 
-#: utils/misc/guc_tables.c:1798
+#: utils/misc/guc_tables.c:1906
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "Tillåter feedback från en hot standby till primären för att undvika frågekonflikter."
 
-#: utils/misc/guc_tables.c:1808
+#: utils/misc/guc_tables.c:1916
 msgid "Shows whether hot standby is currently active."
 msgstr "Visar hurvida hot standby är aktiv för närvarande."
 
-#: utils/misc/guc_tables.c:1819
+#: utils/misc/guc_tables.c:1927
 msgid "Allows modifications of the structure of system tables."
 msgstr "Tillåter strukturförändringar av systemtabeller."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1938
 msgid "Disables reading from system indexes."
 msgstr "Stänger av läsning från systemindex."
 
-#: utils/misc/guc_tables.c:1831
+#: utils/misc/guc_tables.c:1939
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "Det förhindrar inte uppdatering av index så det är helt säkert att använda. Det värsta som kan hända är att det är långsamt."
 
-#: utils/misc/guc_tables.c:1842
+#: utils/misc/guc_tables.c:1950
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "Tillåter tabellutrymmen direkt inuti pg_tblspc, för testning"
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1961
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "Slår på bakåtkompabilitetsläge för rättighetskontroller på stora objekt."
 
-#: utils/misc/guc_tables.c:1854
+#: utils/misc/guc_tables.c:1962
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "Hoppar över rättighetskontroller vid läsning eller modifiering av stora objekt, för kompabilitet med PostgreSQL-releaser innan 9.0."
 
-#: utils/misc/guc_tables.c:1864
+#: utils/misc/guc_tables.c:1972
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "När SQL-fragment genereras så citera alla identifierare."
 
-#: utils/misc/guc_tables.c:1874
+#: utils/misc/guc_tables.c:1982
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Visar om datachecksummor är påslagna för detta kluster."
 
-#: utils/misc/guc_tables.c:1885
+#: utils/misc/guc_tables.c:1993
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "Lägg till sekvensnummer till syslog-meddelanden för att undvika att duplikat tas bort."
 
-#: utils/misc/guc_tables.c:1895
+#: utils/misc/guc_tables.c:2003
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "Dela meddelanden som skickas till syslog till egna rader och begränsa till 1024 byte."
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2013
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Bestämmer om \"Gather\" och \"Gather Merge\" också exekverar subplaner."
 
-#: utils/misc/guc_tables.c:1906
+#: utils/misc/guc_tables.c:2014
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "Skall gather-noder också exekvera subplaner eller bara samla in tupler?"
 
-#: utils/misc/guc_tables.c:1916
+#: utils/misc/guc_tables.c:2024
 msgid "Allow JIT compilation."
 msgstr "Tillåt JIT-kompilering."
 
-#: utils/misc/guc_tables.c:1927
+#: utils/misc/guc_tables.c:2035
 msgid "Register JIT-compiled functions with debugger."
 msgstr "Registrera JIT-kompilerade funktioner hos debuggern."
 
-#: utils/misc/guc_tables.c:1944
+#: utils/misc/guc_tables.c:2052
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "Skriv ut LLVM-bitkod för att möjliggöra JIT-debuggning."
 
-#: utils/misc/guc_tables.c:1955
+#: utils/misc/guc_tables.c:2063
 msgid "Allow JIT compilation of expressions."
 msgstr "Tillåt JIT-kompilering av uttryck."
 
-#: utils/misc/guc_tables.c:1966
+#: utils/misc/guc_tables.c:2074
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "Registrera JIT-kompilerade funktioner med perf-profilerare."
 
-#: utils/misc/guc_tables.c:1983
+#: utils/misc/guc_tables.c:2091
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "Tillåt JIT-kompilering av tupeluppdelning."
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2102
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "Hurvida vi skall fortsätta efter ett fel att synka datafiler."
 
-#: utils/misc/guc_tables.c:2003
+#: utils/misc/guc_tables.c:2111
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr "Anger hurvida en WAL-mottagare skall skapa en temporär replikeringsslot om ingen permanent slot är konfigurerad."
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2120
 msgid "Enables event triggers."
 msgstr "Aktiverar händelsetriggrar."
 
-#: utils/misc/guc_tables.c:2013
+#: utils/misc/guc_tables.c:2121
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr "Om aktiverad så kommer händelsetriggrar anropas för alla satser där det går."
 
-#: utils/misc/guc_tables.c:2022
+#: utils/misc/guc_tables.c:2130
 msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
 msgstr "Tillåter att en fysisk standby synkroniserar logiska replikeringsslottar för failover från primära servern."
 
-#: utils/misc/guc_tables.c:2040
+#: utils/misc/guc_tables.c:2139
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr "Aktiverar obsolet-varningar för MD5-lösenord."
+
+#: utils/misc/guc_tables.c:2148
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "Aktiverar så att vacuum trunkerar tomma sidor i slutet på tabellen."
+
+#: utils/misc/guc_tables.c:2166
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "Sätter tiden vi väntar innan vi tvingar ett byte till nästa WAL-fil."
 
-#: utils/misc/guc_tables.c:2051
+#: utils/misc/guc_tables.c:2168 utils/misc/guc_tables.c:2322
+#: utils/misc/guc_tables.c:2741 utils/misc/guc_tables.c:2752
+#: utils/misc/guc_tables.c:2763 utils/misc/guc_tables.c:2774
+#: utils/misc/guc_tables.c:2785
+msgid "0 disables the timeout."
+msgstr "0 stänger av timeout:en."
+
+#: utils/misc/guc_tables.c:2177
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr "Sätter tiden att vänta efter authentiserng vid uppstart av anslutningen."
 
-#: utils/misc/guc_tables.c:2053 utils/misc/guc_tables.c:2780
+#: utils/misc/guc_tables.c:2179 utils/misc/guc_tables.c:2917
 msgid "This allows attaching a debugger to the process."
 msgstr "Detta tillåter att man ansluter en debugger till processen."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2188
 msgid "Sets the default statistics target."
 msgstr "Sätter standardstatistikmålet."
 
-#: utils/misc/guc_tables.c:2063
+#: utils/misc/guc_tables.c:2189
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr "Detta gäller tabellkolumner som inte har ett kolumnspecifikt mål satt med ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc_tables.c:2072
+#: utils/misc/guc_tables.c:2198
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr "Sätter en övre gräns på FROM-listans storlek där subfrågor slås isär."
 
-#: utils/misc/guc_tables.c:2074
+#: utils/misc/guc_tables.c:2200
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr "Planeraren kommer slå samman subfrågor med yttre frågor om den resulterande FROM-listan inte har fler än så här många poster."
 
-#: utils/misc/guc_tables.c:2085
+#: utils/misc/guc_tables.c:2211
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr "Sätter en övre gräns på FROM-listans storlek där JOIN-konstruktioner plattas till."
 
-#: utils/misc/guc_tables.c:2087
+#: utils/misc/guc_tables.c:2213
 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 "Planeraren kommer platta till explicita JOIN-konstruktioner till listor av FROM-poster när resultatet blir en lista med max så här många poster."
 
-#: utils/misc/guc_tables.c:2098
+#: utils/misc/guc_tables.c:2224
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr "Sätter en undre gräns på antal FROM-poster när GEQO används."
 
-#: utils/misc/guc_tables.c:2108
+#: utils/misc/guc_tables.c:2234
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: effort används som standard för andra GEQO-parametrar."
 
-#: utils/misc/guc_tables.c:2118
+#: utils/misc/guc_tables.c:2244
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: antal individer i populationen."
 
-#: utils/misc/guc_tables.c:2119 utils/misc/guc_tables.c:2129
-msgid "Zero selects a suitable default value."
-msgstr "Noll väljer ett lämpligt standardvärde."
+#: utils/misc/guc_tables.c:2245 utils/misc/guc_tables.c:2255
+msgid "0 means use a suitable default value."
+msgstr "0 betyder att ett lämpligt standardvärde används."
 
-#: utils/misc/guc_tables.c:2128
+#: utils/misc/guc_tables.c:2254
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: antal iterationer för algoritmen."
 
-#: utils/misc/guc_tables.c:2140
+#: utils/misc/guc_tables.c:2266
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Sätter tiden som väntas på ett lås innan kontroll av deadlock sker."
 
-#: utils/misc/guc_tables.c:2151
+#: utils/misc/guc_tables.c:2277
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr "Sätter maximal fördröjning innan frågor avbryts när en \"hot standby\"-server processar arkiverad WAL-data."
 
-#: utils/misc/guc_tables.c:2162
+#: utils/misc/guc_tables.c:2278 utils/misc/guc_tables.c:2289
+msgid "-1 means wait forever."
+msgstr "-1 betyder för alltid."
+
+#: utils/misc/guc_tables.c:2288
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr "Sätter maximal fördröjning innan frågor avbryts när en \"hot stanby\"-server processar strömmad WAL-data."
 
-#: utils/misc/guc_tables.c:2173
+#: utils/misc/guc_tables.c:2299
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "Ställer in minsta fördröjning för att applicera ändringar under återställning."
 
-#: utils/misc/guc_tables.c:2184
+#: utils/misc/guc_tables.c:2310
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr "Sätter maximalt intervall mellan statusrapporter till skickande server från WAL-mottagaren."
 
-#: utils/misc/guc_tables.c:2195
+#: utils/misc/guc_tables.c:2321
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr "Sätter maximal väntetid för att ta emot data från skickande server."
 
-#: utils/misc/guc_tables.c:2206
+#: utils/misc/guc_tables.c:2332
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Sätter maximalt antal samtidiga anslutningar."
 
-#: utils/misc/guc_tables.c:2217
+#: utils/misc/guc_tables.c:2343
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Sätter antalet anslutningsslottar som reserverats för superusers."
 
-#: utils/misc/guc_tables.c:2227
+#: utils/misc/guc_tables.c:2353
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr "Sätter antalet anslutningsslottar som reserverats för roller med rättigheter från pg_use_reserved_connections."
 
-#: utils/misc/guc_tables.c:2238
+#: utils/misc/guc_tables.c:2364
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "Mängd dynamiskt delat minne som reserveras vid uppstart"
 
-#: utils/misc/guc_tables.c:2253
+#: utils/misc/guc_tables.c:2379
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Sätter antalet delade minnesbuffrar som används av servern."
 
-#: utils/misc/guc_tables.c:2264
+#: utils/misc/guc_tables.c:2390
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "Sätter buffer-poolens storlek för VACUUM, ANALYZE och autovacuum."
 
-#: utils/misc/guc_tables.c:2275
+#: utils/misc/guc_tables.c:2401
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr "Visa storlek på serverns huvudsakliga delade minnesarea (avrundat upp till närmaste MB)."
 
-#: utils/misc/guc_tables.c:2286
+#: utils/misc/guc_tables.c:2412
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "Visa antal stora sidor som krävs för den huvudsakliga delade minnesarean."
 
-#: utils/misc/guc_tables.c:2287
-msgid "-1 indicates that the value could not be determined."
-msgstr "-1 betyder att värdet inte kunde bestämmas."
+#: utils/misc/guc_tables.c:2413
+msgid "-1 means huge pages are not supported."
+msgstr "-1 betyder att stora sidor inte stöds."
 
-#: utils/misc/guc_tables.c:2297
+#: utils/misc/guc_tables.c:2423
+msgid "Shows the number of semaphores required for the server."
+msgstr "Visar antal semaforer som krävs av servern."
+
+#: utils/misc/guc_tables.c:2434
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av commit-tidsstämplar."
 
-#: utils/misc/guc_tables.c:2298 utils/misc/guc_tables.c:2353
-#: utils/misc/guc_tables.c:2364
-msgid "Specify 0 to have this value determined as a fraction of shared_buffers."
-msgstr "Ange 0 för att sätta detta värde till en bråkdel av shared_buffers."
+#: utils/misc/guc_tables.c:2435 utils/misc/guc_tables.c:2490
+#: utils/misc/guc_tables.c:2501
+msgid "0 means use a fraction of \"shared_buffers\"."
+msgstr "0 betyder att en bråkdel av \"shared_buffers\" används."
 
-#: utils/misc/guc_tables.c:2308
+#: utils/misc/guc_tables.c:2445
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av MultiXact-medlemmar."
 
-#: utils/misc/guc_tables.c:2319
+#: utils/misc/guc_tables.c:2456
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av MultiXact-offset."
 
-#: utils/misc/guc_tables.c:2330
+#: utils/misc/guc_tables.c:2467
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av LISTEN/NOTIFY-meddelande."
 
-#: utils/misc/guc_tables.c:2341
+#: utils/misc/guc_tables.c:2478
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av serialiserbara transaktioner."
 
-#: utils/misc/guc_tables.c:2352
+#: utils/misc/guc_tables.c:2489
 msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används som cache för undertransaktioner."
 
-#: utils/misc/guc_tables.c:2363
+#: utils/misc/guc_tables.c:2500
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
 msgstr "Sätter storlek på den dedikerade bufferpoolen som används till cache av transaktionsstatus."
 
-#: utils/misc/guc_tables.c:2374
+#: utils/misc/guc_tables.c:2511
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "Sätter maximalt antal temporära buffertar som används per session."
 
-#: utils/misc/guc_tables.c:2385
+#: utils/misc/guc_tables.c:2522
 msgid "Sets the TCP port the server listens on."
 msgstr "Sätter TCP-porten som servern lyssnar på."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2532
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Sätter accessrättigheter för Unix-domainuttag (socket)."
 
-#: utils/misc/guc_tables.c:2396
+#: utils/misc/guc_tables.c:2533
 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 "Unixdomänuttag (socket) använder unix vanliga filsystemsrättigheter. Parametervärdet förväntas vara en numerisk rättighetsangivelse så som accepteras av systemanropen chmod och umask. (För att använda det vanliga oktala formatet så måste numret börja med 0 (noll).)"
 
-#: utils/misc/guc_tables.c:2410
+#: utils/misc/guc_tables.c:2547
 msgid "Sets the file permissions for log files."
 msgstr "Sätter filrättigheter för loggfiler."
 
-#: utils/misc/guc_tables.c:2411
+#: utils/misc/guc_tables.c:2548
 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 "Parametervärdet förväntas vara en numerisk rättighetsangivelse så som accepteras av systemanropen chmod och umask. (För att använda det vanliga oktala formatet så måste numret börja med 0 (noll).)"
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2562
 msgid "Shows the mode of the data directory."
 msgstr "Visar rättigheter för datakatalog"
 
-#: utils/misc/guc_tables.c:2426
+#: utils/misc/guc_tables.c:2563
 msgid "The parameter value is 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 "Parametervärdet är en numerisk rättighetsangivelse så som accepteras av systemanropen chmod och umask. (För att använda det vanliga oktala formatet så måste numret börja med 0 (noll).)"
 
-#: utils/misc/guc_tables.c:2439
+#: utils/misc/guc_tables.c:2576
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Sätter maximalt minne som används för frågors arbetsyta."
 
-#: utils/misc/guc_tables.c:2440
+#: utils/misc/guc_tables.c:2577
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr "Så här mycket minne kan användas av varje intern sorteringsoperation resp. hash-tabell innan temporära filer på disk börjar användas."
 
-#: utils/misc/guc_tables.c:2457
+#: utils/misc/guc_tables.c:2594
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Sätter det maximala minnet som får användas för underhållsoperationer."
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2595
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Detta inkluderar operationer som VACUUM och CREATE INDEX."
 
-#: utils/misc/guc_tables.c:2468
+#: utils/misc/guc_tables.c:2605
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "Sätter det maximala minnet som får användas för logisk avkodning."
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2606
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr "Så här mycket minne kan användas av varje intern omsorteringsbuffer innan data spills till disk."
 
-#: utils/misc/guc_tables.c:2485
+#: utils/misc/guc_tables.c:2622
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Sätter det maximala stackdjupet, i kilobyte."
 
-#: utils/misc/guc_tables.c:2496
+#: utils/misc/guc_tables.c:2633
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "Begränsar den totala storleken för alla temporära filer som används i en process."
 
-#: utils/misc/guc_tables.c:2497
+#: utils/misc/guc_tables.c:2634
 msgid "-1 means no limit."
 msgstr "-1 betyder ingen gräns."
 
-#: utils/misc/guc_tables.c:2507
+#: utils/misc/guc_tables.c:2644
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Vacuum-kostnad för en sida som hittas i buffer-cache:n."
 
-#: utils/misc/guc_tables.c:2517
+#: utils/misc/guc_tables.c:2654
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Vacuum-kostnad för en sida som inte hittas i buffer-cache:n."
 
-#: utils/misc/guc_tables.c:2527
+#: utils/misc/guc_tables.c:2664
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Vacuum-kostnad för sidor som smutsats ner vid vacuum."
 
-#: utils/misc/guc_tables.c:2537
+#: utils/misc/guc_tables.c:2674
 msgid "Vacuum cost amount available before napping."
 msgstr "Vacuum-kostnad kvar innan pausande."
 
-#: utils/misc/guc_tables.c:2547
+#: utils/misc/guc_tables.c:2684
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Vacuum-kostnad kvar innan pausande, för autovacuum."
 
-#: utils/misc/guc_tables.c:2557
-msgid "Sets the maximum number of simultaneously open files for each server process."
-msgstr "Sätter det maximala antalet filer som en serverprocess kan ha öppna på en gång."
+#: utils/misc/guc_tables.c:2685
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1 betyder att \"vacuum_cost_limit\" används."
 
-#: utils/misc/guc_tables.c:2570
+#: utils/misc/guc_tables.c:2694
+msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
+msgstr "Sätter det maximala antalet filer som en serverprocess tillåts ha öppna på en gång."
+
+#: utils/misc/guc_tables.c:2707
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Sätter det maximala antalet förberedda transaktioner man får ha på en gång."
 
-#: utils/misc/guc_tables.c:2581
+#: utils/misc/guc_tables.c:2718
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Sätter minsta tabell-OID för spårning av lås."
 
-#: utils/misc/guc_tables.c:2582
+#: utils/misc/guc_tables.c:2719
 msgid "Is used to avoid output on system tables."
 msgstr "Används för att undvika utdata för systemtabeller."
 
-#: utils/misc/guc_tables.c:2591
+#: utils/misc/guc_tables.c:2728
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Sätter OID för tabellen med ovillkorlig låsspårning."
 
-#: utils/misc/guc_tables.c:2603
+#: utils/misc/guc_tables.c:2740
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Sätter den maximala tiden som en sats får köra."
 
-#: utils/misc/guc_tables.c:2604 utils/misc/guc_tables.c:2615
-#: utils/misc/guc_tables.c:2626 utils/misc/guc_tables.c:2637
-#: utils/misc/guc_tables.c:2648
-msgid "A value of 0 turns off the timeout."
-msgstr "Värdet 0 stänger av timeout:en."
-
-#: utils/misc/guc_tables.c:2614
+#: utils/misc/guc_tables.c:2751
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Sätter den maximala tiden som man får vänta på ett lås."
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2762
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "Sätter den maximalt tillåtna inaktiva tiden mellan frågor i en transaktion."
 
-#: utils/misc/guc_tables.c:2636
+#: utils/misc/guc_tables.c:2773
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
 msgstr "Sätter den maximala tillåtana tiden för en transaktion i en session (ej en preparerad transaktion)."
 
-#: utils/misc/guc_tables.c:2647
+#: utils/misc/guc_tables.c:2784
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "Sätter den maximalt tillåtna inaktiva tiden mellan frågor utanför en transaktion."
 
-#: utils/misc/guc_tables.c:2658
+#: utils/misc/guc_tables.c:2795
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "Minimal ålder där VACUUM skall frysa en tabellrad."
 
-#: utils/misc/guc_tables.c:2668
+#: utils/misc/guc_tables.c:2805
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Ålder där VACUUM skall skanna hela tabellen för att frysa tupler."
 
-#: utils/misc/guc_tables.c:2678
+#: utils/misc/guc_tables.c:2815
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "Minsta ålder där VACUUM skall frysa en MultiXactId i en tabellrad."
 
-#: utils/misc/guc_tables.c:2688
+#: utils/misc/guc_tables.c:2825
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Multixact-ålder där VACUUM skall skanna hela tabellen för att frysa tupler."
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2835
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Ålder där VACUUM skall startas som skyddsåtgärd för att undvika wraparound-stopp."
 
-#: utils/misc/guc_tables.c:2707
+#: utils/misc/guc_tables.c:2844
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Multixact-ålder där VACUUM skall startas som skyddsåtgärd för att undvika wraparound-stopp."
 
-#: utils/misc/guc_tables.c:2720
+#: utils/misc/guc_tables.c:2857
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Sätter det maximala antalet lås per transaktion."
 
-#: utils/misc/guc_tables.c:2721
+#: utils/misc/guc_tables.c:2858
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "Den delade låstabellen har storlek efter antagandet att maximalt \"max_locks_per_transaction\" objekt per serverprocess eller per förberedd transaktion kommer behöva låsas vid varje enskild tidpunkt."
 
-#: utils/misc/guc_tables.c:2732
+#: utils/misc/guc_tables.c:2869
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Sätter det maximala antalet predikatlås per transaktion."
 
-#: utils/misc/guc_tables.c:2733
+#: utils/misc/guc_tables.c:2870
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
 msgstr "Den delade predikatlåstabellen har storlek efter antagandet att maximalt \"max_pred_locks_per_transaction\" objekt per serverprocess eller per förberedd transaktion kommer behöva låsas vid varje enskild tidpunkt."
 
-#: utils/misc/guc_tables.c:2744
+#: utils/misc/guc_tables.c:2881
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "Sätter det maximala antalet predikatlåsta sidor och tupler per relation."
 
-#: utils/misc/guc_tables.c:2745
+#: utils/misc/guc_tables.c:2882
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr "Om fler än detta totala antal sidor och tupler för samma relation är låsta av en anslutning så ersätts dessa lås med ett lås på relationen."
 
-#: utils/misc/guc_tables.c:2755
+#: utils/misc/guc_tables.c:2892
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "Sätter det maximala antalet predikatlåsta tupler per sida."
 
-#: utils/misc/guc_tables.c:2756
+#: utils/misc/guc_tables.c:2893
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr "Om fler än detta antal tupler på samma sida är låsta av en anslutning så ersätts dessa lås med ett lås på sidan."
 
-#: utils/misc/guc_tables.c:2766
+#: utils/misc/guc_tables.c:2903
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Sätter maximalt tillåten tid att slutföra klientautentisering."
 
-#: utils/misc/guc_tables.c:2778
+#: utils/misc/guc_tables.c:2915
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr "Sätter tiden att vänta före authentiserng vid uppstart av anslutningen.."
 
-#: utils/misc/guc_tables.c:2790
+#: utils/misc/guc_tables.c:2927
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "Sätter det maximala antalet allokerade sidor till kö för NOTIFY / LISTEN."
 
-#: utils/misc/guc_tables.c:2800
+#: utils/misc/guc_tables.c:2937
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "Bufferstorlek för read-ahead av WAL vid återställning."
 
-#: utils/misc/guc_tables.c:2801
+#: utils/misc/guc_tables.c:2938
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr "Maximal längd att läsa i förväg av WAL för att prefetch:a refererade datablock."
 
-#: utils/misc/guc_tables.c:2811
+#: utils/misc/guc_tables.c:2948
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "Sätter storlek på WAL-filer som sparas för standby-servrar."
 
-#: utils/misc/guc_tables.c:2822
+#: utils/misc/guc_tables.c:2959
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Sätter maximal storlek som WAL kan krympas till."
 
-#: utils/misc/guc_tables.c:2834
+#: utils/misc/guc_tables.c:2971
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Sätter WAL-storlek som triggar en checkpoint."
 
-#: utils/misc/guc_tables.c:2846
+#: utils/misc/guc_tables.c:2983
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "Sätter maximal tid mellan två automatiska WAL-checkpoint:er."
 
-#: utils/misc/guc_tables.c:2857
+#: utils/misc/guc_tables.c:2994
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr "Sätter maximal tid innan en varning ges för att stor WAL-volymn gör att checkpoint triggas för ofta."
 
-#: utils/misc/guc_tables.c:2859
-msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. Zero turns off the warning."
-msgstr "Skriv ett meddelande i serverloggen om checkpoint:er som orsakas av fulla WAL-segmentfiler händer oftare än denna tid. Noll stänger av varningen."
+#: utils/misc/guc_tables.c:2996
+msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
+msgstr "Skriv ett meddelande i serverloggen om checkpoint:er som orsakas av fulla WAL-segmentfiler händer oftare än denna tid. 0 stänger av varningen."
 
-#: utils/misc/guc_tables.c:2872 utils/misc/guc_tables.c:3090
-#: utils/misc/guc_tables.c:3144
+#: utils/misc/guc_tables.c:3009 utils/misc/guc_tables.c:3239
+#: utils/misc/guc_tables.c:3331
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr "Antal sidor varefter tidigare skrivningar flush:as till disk."
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:3010 utils/misc/guc_tables.c:3240
+#: utils/misc/guc_tables.c:3332
+msgid "0 disables forced writeback."
+msgstr "0 stänger av tvingad tillbakaskrivning."
+
+#: utils/misc/guc_tables.c:3020
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Sätter antal buffrar för disksidor i delat minne för WAL."
 
-#: utils/misc/guc_tables.c:2884
-msgid "Specify -1 to have this value determined as a fraction of shared_buffers."
-msgstr "Ange -1 för att sätta detta värde till en bråkdel av shared_buffers."
+#: utils/misc/guc_tables.c:3021
+msgid "-1 means use a fraction of \"shared_buffers\"."
+msgstr "-1 betyder att en bråkdel av \"shared_buffers\" används."
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:3031
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "Tid mellan WAL-flush:ar utförda i WAL-skrivaren."
 
-#: utils/misc/guc_tables.c:2905
+#: utils/misc/guc_tables.c:3042
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "Mängden WAL utskrivna av WAL-skrivaren som triggar en flush."
 
-#: utils/misc/guc_tables.c:2916
+#: utils/misc/guc_tables.c:3053
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "Minimal storlek på ny fil som skall fsync:as istället för att skriva till WAL."
 
-#: utils/misc/guc_tables.c:2927
+#: utils/misc/guc_tables.c:3064
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "Sätter maximalt antal samtidigt körande WAL-sändarprocesser."
 
-#: utils/misc/guc_tables.c:2938
+#: utils/misc/guc_tables.c:3075
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Sätter maximalt antal samtidigt definierade replikeringsslottar."
 
-#: utils/misc/guc_tables.c:2948
+#: utils/misc/guc_tables.c:3085
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "Sätter maximalt WAL-storlek som kan reserveras av replikeringsslottar."
 
-#: utils/misc/guc_tables.c:2949
-msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk."
-msgstr "Replikeringsslottar kommer markeras som misslyckade och segment kommer släppas till borttagning eller återanvändning när så här mycket plats används av WAL på disk."
+#: utils/misc/guc_tables.c:3086
+msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
+msgstr "Replikeringsslottar kommer markeras som misslyckade och segment kommer släppas till borttagning eller återanvändning när så här mycket plats används av WAL på disk. -1 betyder att inget maximum finns."
 
-#: utils/misc/guc_tables.c:2961
+#: utils/misc/guc_tables.c:3098
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "Sätter maximal tid att vänta på WAL-replikering."
 
-#: utils/misc/guc_tables.c:2972
+#: utils/misc/guc_tables.c:3109
+msgid "Sets the duration a replication slot can remain idle before it is invalidated."
+msgstr "Sätter tiden som en replikeringsslot kan vara oanvänd innan den invalideras."
+
+#: utils/misc/guc_tables.c:3121
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr "Sätter fördröjning i mikrosekunder mellan transaktions-commit ochj flush:ning av WAL till disk."
 
-#: utils/misc/guc_tables.c:2984
+#: utils/misc/guc_tables.c:3133
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
 msgstr "Sätter minsta antal samtida öppna transaktioner som krävs innan vi utför en \"commit_delay\"."
 
-#: utils/misc/guc_tables.c:2995
+#: utils/misc/guc_tables.c:3144
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Sätter antal siffror som visas för flyttalsvärden."
 
-#: utils/misc/guc_tables.c:2996
+#: utils/misc/guc_tables.c:3145
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr "Detta påverkar real, double precision och geometriska datatyper. Noll eller negativt parametervärde läggs till standard antal siffror (FLT_DIG eller DBL_DIG respektive). Ett värde större än noll väljer ett exakt utmatningsläge."
 
-#: utils/misc/guc_tables.c:3008
-msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by log_statement_sample_rate."
-msgstr "Sätter minimal körtid där ett urval av långsammare satser kommer loggas. Urvalet bestämms av log_statement_sample_rate."
+#: utils/misc/guc_tables.c:3157
+msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
+msgstr "Sätter minimal körtid där ett urval av långsammare satser kommer loggas. Urvalet bestämms av \"log_statement_sample_rate\"."
 
-#: utils/misc/guc_tables.c:3011
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "Noll loggar ett urval som inkluderar alla frågor. -1 stänger av denna funktion."
+#: utils/misc/guc_tables.c:3160
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr "-1 stänger av sampling. 0 betyder att sampla alla satser."
 
-#: utils/misc/guc_tables.c:3021
+#: utils/misc/guc_tables.c:3170
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr "Sätter minimal körtid där alla långsammare satser kommer loggas."
 
-#: utils/misc/guc_tables.c:3023
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Noll skriver ut alla frågor. -1 stänger av denna finess."
+#: utils/misc/guc_tables.c:3172
+msgid "-1 disables logging statement durations. 0 means log all statement durations."
+msgstr "-1 stänger av logging av tid för satser. 0 betyder att logga tid på alla satser."
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3182
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr "Sätter minimal körtid där långsammare autovacuum-operationer kommer loggas."
 
-#: utils/misc/guc_tables.c:3035
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "Noll skriver ut alla operationer. -1 stänger av autovacuum."
+#: utils/misc/guc_tables.c:3184
+msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
+msgstr "-1 stänger av loggning av autovaccum-åtgärder. 0 betyder att logga alla autovacuum-åtgärder."
 
-#: utils/misc/guc_tables.c:3045
+#: utils/misc/guc_tables.c:3194
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr "Sätter maximal längd i byte på data som loggas för bind-parametrar vid loggning av satser."
 
-#: utils/misc/guc_tables.c:3047 utils/misc/guc_tables.c:3059
-msgid "-1 to print values in full."
-msgstr "-1 för att skriva ut hela värden."
+#: utils/misc/guc_tables.c:3196 utils/misc/guc_tables.c:3208
+msgid "-1 means log values in full."
+msgstr "-1 betyder att logga fullständiga värden."
 
-#: utils/misc/guc_tables.c:3057
+#: utils/misc/guc_tables.c:3206
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr "Sätter maximal längs i byte på data som loggas för bind-parametrar vid loggning av satser i samband med fel."
 
-#: utils/misc/guc_tables.c:3069
+#: utils/misc/guc_tables.c:3218
 msgid "Background writer sleep time between rounds."
 msgstr "Bakgrundsskrivarens sleep-tid mellan körningar."
 
-#: utils/misc/guc_tables.c:3080
+#: utils/misc/guc_tables.c:3229
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "Bakgrundsskrivarens maximala antal LRU-sidor som flush:as per omgång."
 
-#: utils/misc/guc_tables.c:3103
+#: utils/misc/guc_tables.c:3230
+msgid "0 disables background writing."
+msgstr "0 stänger av bakgrundsskrivning."
+
+#: utils/misc/guc_tables.c:3252
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr "Antal samtidiga förfrågningar som kan effektivt kan hanteras av disksystemet."
 
-#: utils/misc/guc_tables.c:3117
+#: utils/misc/guc_tables.c:3253 utils/misc/guc_tables.c:3267
+msgid "0 disables simultaneous requests."
+msgstr "0 stänger av simultana förfrågningar."
+
+#: utils/misc/guc_tables.c:3266
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
 msgstr "En variant av \"effective_io_concurrency\" som används för underhållsarbete."
 
-#: utils/misc/guc_tables.c:3132
+#: utils/misc/guc_tables.c:3281
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr "Serversatt gräns som begränsar io_combine_limit."
+
+#: utils/misc/guc_tables.c:3295
 msgid "Limit on the size of data reads and writes."
 msgstr "Begränsa storlek på data för läsning och skrivning."
 
-#: utils/misc/guc_tables.c:3157
+#: utils/misc/guc_tables.c:3309
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr "Max antal IO som en process kan köra samtidigt."
+
+#: utils/misc/guc_tables.c:3321
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr "Antal IO-arbetsprocesser, för io_method=worker."
+
+#: utils/misc/guc_tables.c:3344
 msgid "Maximum number of concurrent worker processes."
 msgstr "Maximalt antal samtidiga arbetsprocesser."
 
-#: utils/misc/guc_tables.c:3169
+#: utils/misc/guc_tables.c:3356
 msgid "Maximum number of logical replication worker processes."
 msgstr "Maximalt antal arbetsprocesser för logisk replikering."
 
-#: utils/misc/guc_tables.c:3181
+#: utils/misc/guc_tables.c:3368
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "Maximalt antal arbetare som synkroniserar tabeller per prenumeration."
 
-#: utils/misc/guc_tables.c:3193
+#: utils/misc/guc_tables.c:3380
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "Maximalt antal parallella arbetare som applicerar ändring per prenumeration."
 
-#: utils/misc/guc_tables.c:3203
+#: utils/misc/guc_tables.c:3392
+msgid "Sets the maximum number of active replication origins."
+msgstr "Sätter maximalt antal aktiva replikerings-origin."
+
+#: utils/misc/guc_tables.c:3402
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "Sätter tiden vi väntar innan vi tvingar rotering av loggfil."
 
-#: utils/misc/guc_tables.c:3215
+#: utils/misc/guc_tables.c:3404
+msgid "0 disables time-based creation of new log files."
+msgstr "0 stänger av tidsbaserat skapande av nya loggfiler."
+
+#: utils/misc/guc_tables.c:3414
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "Sätter maximalt storlek en loggfil kan bli innan vi tvingar rotering."
 
-#: utils/misc/guc_tables.c:3227
+#: utils/misc/guc_tables.c:3416
+msgid "0 disables size-based creation of new log files."
+msgstr "0 stänger av storleksbaserat skapande av nya loggfiler."
+
+#: utils/misc/guc_tables.c:3426
 msgid "Shows the maximum number of function arguments."
 msgstr "Visar maximalt antal funktionsargument."
 
-#: utils/misc/guc_tables.c:3238
+#: utils/misc/guc_tables.c:3437
 msgid "Shows the maximum number of index keys."
 msgstr "Visar maximalt antal indexnycklar."
 
-#: utils/misc/guc_tables.c:3249
+#: utils/misc/guc_tables.c:3448
 msgid "Shows the maximum identifier length."
 msgstr "Visar den maximala identifierarlängden."
 
-#: utils/misc/guc_tables.c:3260
+#: utils/misc/guc_tables.c:3459
 msgid "Shows the size of a disk block."
 msgstr "Visar storleken på ett diskblock."
 
-#: utils/misc/guc_tables.c:3271
+#: utils/misc/guc_tables.c:3470
 msgid "Shows the number of pages per disk file."
 msgstr "Visar antal sidor per diskfil."
 
-#: utils/misc/guc_tables.c:3282
+#: utils/misc/guc_tables.c:3481
 msgid "Shows the block size in the write ahead log."
 msgstr "Visar blockstorleken i the write-ahead-loggen."
 
-#: utils/misc/guc_tables.c:3293
+#: utils/misc/guc_tables.c:3492
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr "Sätter väntetiden innan databasen försöker ta emot WAL efter ett misslyckat försök."
 
-#: utils/misc/guc_tables.c:3305
+#: utils/misc/guc_tables.c:3504
 msgid "Shows the size of write ahead log segments."
 msgstr "Visar storleken på write-ahead-log-segment."
 
-#: utils/misc/guc_tables.c:3318
+#: utils/misc/guc_tables.c:3517
 msgid "Time for which WAL summary files should be kept."
 msgstr "Tid som filer för WAL-summering skall behållas."
 
-#: utils/misc/guc_tables.c:3331
+#: utils/misc/guc_tables.c:3518
+msgid "0 disables automatic summary file deletion."
+msgstr "0 stänger av automatisk borttagning av summeringsfil."
+
+#: utils/misc/guc_tables.c:3530
 msgid "Time to sleep between autovacuum runs."
 msgstr "Tid att sova mellan körningar av autovacuum."
 
-#: utils/misc/guc_tables.c:3341
+#: utils/misc/guc_tables.c:3540
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "Minst antal tupel-uppdateringar eller raderingar innan vacuum."
+msgstr "Minsta antal tupel-uppdateringar eller raderingar innan vacuum."
+
+#: utils/misc/guc_tables.c:3549
+msgid "Maximum number of tuple updates or deletes prior to vacuum."
+msgstr "Maximalt antal tupel-uppdateringar eller raderingar innan vacuum."
+
+#: utils/misc/guc_tables.c:3550
+msgid "-1 disables the maximum threshold."
+msgstr "-1 stänger av maximalgräns."
+
+#: utils/misc/guc_tables.c:3558
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "Minsta antal tupel-insert innan vacuum."
 
-#: utils/misc/guc_tables.c:3350
-msgid "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert vacuums."
-msgstr "Minsta antal tupel-insert innnan vacuum eller -1 för att stänga av insert-vacuum."
+#: utils/misc/guc_tables.c:3559
+msgid "-1 disables insert vacuums."
+msgstr "-1 stänger av insert-vacuum"
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3567
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "Minsta antal tupel-insert, -update eller -delete innan analyze."
 
-#: utils/misc/guc_tables.c:3369
+#: utils/misc/guc_tables.c:3577
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "Ålder då autovacuum körs på en tabell för att förhindra wrapaound på transaktions-ID."
 
-#: utils/misc/guc_tables.c:3381
+#: utils/misc/guc_tables.c:3589
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "Ålder på multixact då autovacuum körs på en tabell för att förhindra wrapaound på multixact."
 
-#: utils/misc/guc_tables.c:3391
+#: utils/misc/guc_tables.c:3599
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr "Sätter antal backend-slots som allokerats till autovacuum-arbetare."
+
+#: utils/misc/guc_tables.c:3608
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "Sätter maximalt antal samtidigt körande arbetsprocesser för autovacuum."
 
-#: utils/misc/guc_tables.c:3401
+#: utils/misc/guc_tables.c:3618
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "Sätter maximalt antal parallella processer per underhållsoperation."
 
-#: utils/misc/guc_tables.c:3411
+#: utils/misc/guc_tables.c:3628
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "Sätter maximalt antal parallella processer per exekveringsnod."
 
-#: utils/misc/guc_tables.c:3422
+#: utils/misc/guc_tables.c:3639
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "Sätter maximalt antal parallella arbetare som kan vara aktiva på en gång."
 
-#: utils/misc/guc_tables.c:3433
+#: utils/misc/guc_tables.c:3650
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "Sätter maximalt minne som kan användas av varje arbetsprocess för autovacuum."
 
-#: utils/misc/guc_tables.c:3444
+#: utils/misc/guc_tables.c:3651
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "-1 betyder att \"maintenance_work_mem\" används."
+
+#: utils/misc/guc_tables.c:3661
 msgid "Time between issuing TCP keepalives."
 msgstr "Tid mellan skickande av TCP-keepalive."
 
-#: utils/misc/guc_tables.c:3445 utils/misc/guc_tables.c:3456
-#: utils/misc/guc_tables.c:3580
-msgid "A value of 0 uses the system default."
-msgstr "Värdet 0 anger systemets standardvärde."
+#: utils/misc/guc_tables.c:3662 utils/misc/guc_tables.c:3673
+#: utils/misc/guc_tables.c:3796 utils/misc/guc_tables.c:3807
+msgid "0 means use the system default."
+msgstr "0 betyder systemets standardvärde."
 
-#: utils/misc/guc_tables.c:3455
+#: utils/misc/guc_tables.c:3672
 msgid "Time between TCP keepalive retransmits."
 msgstr "Tid mellan omsändning av TCP-keepalive."
 
-#: utils/misc/guc_tables.c:3466
+#: utils/misc/guc_tables.c:3683
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "SSL-förhandling stöds inte längre; denna kan bara vara 0."
 
-#: utils/misc/guc_tables.c:3477
+#: utils/misc/guc_tables.c:3694
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Maximalt antal omsändningar av TCP-keepalive."
 
-#: utils/misc/guc_tables.c:3478
-msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
-msgstr "Atalet keepalive-omsändingar i rad som kan försvinna innan en anslutning anses vara död. Värdet 0 betyder systemstandardvärdet."
+#: utils/misc/guc_tables.c:3695
+msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
+msgstr "Antalet keepalive-omsändingar i rad som kan försvinna innan en anslutning anses vara död. 0 betyder systemets standardvärde."
 
-#: utils/misc/guc_tables.c:3489
+#: utils/misc/guc_tables.c:3706
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "Sätter maximalt tillåtna resultat för exakt sökning med GIN."
 
-#: utils/misc/guc_tables.c:3500
+#: utils/misc/guc_tables.c:3707
+msgid "0 means no limit."
+msgstr "0 betyder ingen gräns."
+
+#: utils/misc/guc_tables.c:3716
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "Sätter planerarens antagande om totala storleken på datacachen."
 
-#: utils/misc/guc_tables.c:3501
+#: utils/misc/guc_tables.c:3717
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr "Det är totala storleken på cachen (kernelcache och delade buffertar) som användas för PostgreSQLs datafiler. Det mäts i disksidor som normalt är 8 kb styck."
 
-#: utils/misc/guc_tables.c:3512
+#: utils/misc/guc_tables.c:3728
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "Sätter minsta mängd tabelldata för en parallell skanning."
 
-#: utils/misc/guc_tables.c:3513
+#: utils/misc/guc_tables.c:3729
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Om planeraren beräknar att den kommer läsa för få tabellsidor för att nå denna gräns så kommer den inte försöka med en parallell skanning."
 
-#: utils/misc/guc_tables.c:3523
+#: utils/misc/guc_tables.c:3739
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "Anger minimala mängden indexdata för en parallell scan."
 
-#: utils/misc/guc_tables.c:3524
+#: utils/misc/guc_tables.c:3740
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Om planeraren beräknar att den kommer läsa för få indexsidor för att nå denna gräns så kommer den inte försöka med en parallell skanning."
 
-#: utils/misc/guc_tables.c:3535
+#: utils/misc/guc_tables.c:3751
 msgid "Shows the server version as an integer."
 msgstr "Visar serverns version som ett heltal."
 
-#: utils/misc/guc_tables.c:3546
+#: utils/misc/guc_tables.c:3762
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "Logga användning av temporära filer som är större än detta antal kilobyte."
 
-#: utils/misc/guc_tables.c:3547
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr "Noll loggar alla filer. Standard är -1 (stänger av denna finess)."
+#: utils/misc/guc_tables.c:3763
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
+msgstr "-1 stänger av loggning av temporära filer. 0 betyder att alla temporära filer loggas."
 
-#: utils/misc/guc_tables.c:3557
+#: utils/misc/guc_tables.c:3773
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Ställer in storleken reserverad för pg_stat_activity.query, i byte."
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3784
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Sätter maximal storlek på väntelistan för GIN-index."
 
-#: utils/misc/guc_tables.c:3579
+#: utils/misc/guc_tables.c:3795
 msgid "TCP user timeout."
 msgstr "Användartimeout för TCP."
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3806
 msgid "The size of huge page that should be requested."
 msgstr "Storleken på stora sidor skall hämtas."
 
-#: utils/misc/guc_tables.c:3601
+#: utils/misc/guc_tables.c:3817
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "Flush:a systemcache aggressivt för att förenkla debugging."
 
-#: utils/misc/guc_tables.c:3624
+#: utils/misc/guc_tables.c:3818
+msgid "0 means use normal caching behavior."
+msgstr "0 betyder att normalt cache-beteende används."
+
+#: utils/misc/guc_tables.c:3840
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr "Sätter tidsintervall mellan test för nedkoppling när frågor körs."
 
-#: utils/misc/guc_tables.c:3635
+#: utils/misc/guc_tables.c:3841
+msgid "0 disables connection checks."
+msgstr "0 stänger av anslutningskontroller."
+
+#: utils/misc/guc_tables.c:3851
 msgid "Time between progress updates for long-running startup operations."
 msgstr "Tid mellan uppdatering av progress för startupoperationer som kör länge."
 
-#: utils/misc/guc_tables.c:3637
-msgid "0 turns this feature off."
-msgstr "0 stänger av denna finess."
+#: utils/misc/guc_tables.c:3853
+msgid "0 disables progress updates."
+msgstr "0 stänger av uppdatering av progress."
 
-#: utils/misc/guc_tables.c:3647
+#: utils/misc/guc_tables.c:3863
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "Sätter iterationsräknare för generering av SCRAM-hemlighet."
 
-#: utils/misc/guc_tables.c:3667
+#: utils/misc/guc_tables.c:3883
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr "Ställer in planerarens estimat av kostnaden för att hämta en disksida sekvensiellt."
 
-#: utils/misc/guc_tables.c:3678
+#: utils/misc/guc_tables.c:3894
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr "Ställer in planerarens estimat av kostnaden för att hämta en disksida icke-sekvensiellt."
 
-#: utils/misc/guc_tables.c:3689
+#: utils/misc/guc_tables.c:3905
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "Ställer in planerarens estimat av kostnaden för att processa varje tupel (rad)."
 
-#: utils/misc/guc_tables.c:3700
+#: utils/misc/guc_tables.c:3916
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr "Sätter planerarens kostnadsuppskattning för att processa varje indexpost under en indexskanning."
 
-#: utils/misc/guc_tables.c:3711
+#: utils/misc/guc_tables.c:3927
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr "Sätter planerarens kostnadsuppskattning för att processa varje operator- eller funktions-anrop."
 
-#: utils/misc/guc_tables.c:3722
+#: utils/misc/guc_tables.c:3938
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr "Sätter planerarens kostnadsuppskattning för att skicka varje tupel (rad) från en arbetare till ledar-backend:en. "
 
-#: utils/misc/guc_tables.c:3733
+#: utils/misc/guc_tables.c:3949
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr "Sätter planerarens kostnadsuppskattning för att starta upp en arbetsprocess för en parallell fråga."
 
-#: utils/misc/guc_tables.c:3745
+#: utils/misc/guc_tables.c:3961
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "Utför JIT-kompilering om frågan är dyrare."
 
-#: utils/misc/guc_tables.c:3746
+#: utils/misc/guc_tables.c:3962
 msgid "-1 disables JIT compilation."
 msgstr "-1 stänger av JIT-kompilering."
 
-#: utils/misc/guc_tables.c:3756
+#: utils/misc/guc_tables.c:3972
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "Optimera JIT-kompilerade funktioner om frågan är dyrare."
 
-#: utils/misc/guc_tables.c:3757
+#: utils/misc/guc_tables.c:3973
 msgid "-1 disables optimization."
 msgstr "-1 stänger av optimering."
 
-#: utils/misc/guc_tables.c:3767
+#: utils/misc/guc_tables.c:3983
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "Utför JIT-\"inlining\" om frågan är dyrare."
 
-#: utils/misc/guc_tables.c:3768
+#: utils/misc/guc_tables.c:3984
 msgid "-1 disables inlining."
 msgstr "-1 stänger av \"inlining\""
 
-#: utils/misc/guc_tables.c:3778
+#: utils/misc/guc_tables.c:3994
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr "Sätter planerarens uppskattning av hur stor del av markörens rader som kommer hämtas. "
 
-#: utils/misc/guc_tables.c:3790
+#: utils/misc/guc_tables.c:4006
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr "Sätter planerarens uppskattning av genomsnittliga storleken på en rekursiv frågas arbetstabell."
 
-#: utils/misc/guc_tables.c:3802
+#: utils/misc/guc_tables.c:4018
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: selektionstryck inom populationen."
 
-#: utils/misc/guc_tables.c:3813
+#: utils/misc/guc_tables.c:4029
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: slumptalsfrö för val av slumpad sökväg."
 
-#: utils/misc/guc_tables.c:3824
+#: utils/misc/guc_tables.c:4040
 msgid "Multiple of \"work_mem\" to use for hash tables."
 msgstr "Multipel av \"work_mem\" för att använda till hash-tabeller."
 
-#: utils/misc/guc_tables.c:3835
+#: utils/misc/guc_tables.c:4051
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "Multipel av genomsnittlig bufferanvändning som frias per runda."
 
-#: utils/misc/guc_tables.c:3845
+#: utils/misc/guc_tables.c:4061
 msgid "Sets the seed for random-number generation."
 msgstr "Sätter fröet för slumptalsgeneratorn."
 
-#: utils/misc/guc_tables.c:3856
+#: utils/misc/guc_tables.c:4072
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Städkostfördröjning i millisekunder."
 
-#: utils/misc/guc_tables.c:3867
+#: utils/misc/guc_tables.c:4083
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Städkostfördröjning i millisekunder, för autovacuum."
 
-#: utils/misc/guc_tables.c:3878
+#: utils/misc/guc_tables.c:4084
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr "-1 betyder att \"vacuum_cost_delay\" används."
+
+#: utils/misc/guc_tables.c:4094
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "Antalet tupeluppdateringar eller borttagningar innan vacuum relativt reltuples."
 
-#: utils/misc/guc_tables.c:3888
+#: utils/misc/guc_tables.c:4104
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "Antal tupelinsättningar innan vacuum relativt reltuples."
 
-#: utils/misc/guc_tables.c:3898
+#: utils/misc/guc_tables.c:4114
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "Antalet tupelinsättningar, uppdateringar eller borttagningar innan analyze relativt reltuples."
 
-#: utils/misc/guc_tables.c:3908
+#: utils/misc/guc_tables.c:4124
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr "Tid lagd på att flusha nedsmutsade buffrar vid checkpoint relativt checkpoint-intervallet."
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:4134
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
 msgstr "Bråkdel av satser som överskrider \"log_min_duration_sample\" som skall loggas."
 
-#: utils/misc/guc_tables.c:3919
+#: utils/misc/guc_tables.c:4135
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "Använd ett värde mellan 0.0 (logga aldrig) och 1.0 (logga alltid)."
 
-#: utils/misc/guc_tables.c:3928
+#: utils/misc/guc_tables.c:4144
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "Ställer in bråkdel av transaktionerna från vilka alla satser skall loggas."
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:4145
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr "Använd ett värde mellan 0.0 (logga aldrig) till 1.0 (logga all satser i alla transaktioner)."
 
-#: utils/misc/guc_tables.c:3948
+#: utils/misc/guc_tables.c:4155
+msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
+msgstr "Bråkdel av sidor i en relation som vacuum kan skanna och misslyckas att frysa innan ivrig skanning stängs av."
+
+#: utils/misc/guc_tables.c:4156
+msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
+msgstr "Värdet 0.0 stänger av ivrig skanning och värdet 1.0 för att ivrig skanning används på 100 procesnt av alla totalt synliga sidor i relationen. Om vacuum lyckas frysa dessa sidor så blir gränsen under 100% men målet är att nå detta resultat över multipla vacuum."
+
+#: utils/misc/guc_tables.c:4174
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "Sätter shell-kommandot som kommer anropas för att arkivera en WAL-fil."
 
-#: utils/misc/guc_tables.c:3949
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "Detta används enbart om \"archive_library\" inte är satt."
+#: utils/misc/guc_tables.c:4175
+msgid "An empty string means use \"archive_library\"."
+msgstr "En tom sträng betyder att \"archive_library\" används."
 
-#: utils/misc/guc_tables.c:3958
+#: utils/misc/guc_tables.c:4184
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "Sätter biblioteket som kommer anropas för att arkivera en WAL-fil."
 
-#: utils/misc/guc_tables.c:3959
-msgid "An empty string indicates that \"archive_command\" should be used."
+#: utils/misc/guc_tables.c:4185
+msgid "An empty string means use \"archive_command\"."
 msgstr "En tom sträng betyder att \"archive_command\" skall användas."
 
-#: utils/misc/guc_tables.c:3968
+#: utils/misc/guc_tables.c:4194
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "Sätter shell-kommandot som kommer anropas för att få en arkiverad WAL-fil."
 
-#: utils/misc/guc_tables.c:3978
+#: utils/misc/guc_tables.c:4204
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "Sätter shell-kommandot som kommer anropas vid varje omstartspunkt."
 
-#: utils/misc/guc_tables.c:3988
+#: utils/misc/guc_tables.c:4214
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr "Sätter shell-kommandot som kommer anropas en gång i slutet av en återställning."
 
-#: utils/misc/guc_tables.c:3998
+#: utils/misc/guc_tables.c:4224
 msgid "Specifies the timeline to recover into."
 msgstr "Anger tidslinjen att återställa till."
 
-#: utils/misc/guc_tables.c:4008
+#: utils/misc/guc_tables.c:4234
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr "Sätt till \"immediate\" för att avsluta återställning så snart ett konsistent tillstånd uppnås."
 
-#: utils/misc/guc_tables.c:4017
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "Sätter transaktions-ID som återställning kommer gå till."
 
-#: utils/misc/guc_tables.c:4026
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "Sätter tidsstämpel som återställning kommer gå till."
 
-#: utils/misc/guc_tables.c:4035
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "Sätter namngiven återställningspunkt som återställning kommer gå till."
 
-#: utils/misc/guc_tables.c:4044
+#: utils/misc/guc_tables.c:4270
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr "Sätter LSN för write-ahead-logg-position som återställning kommer få till."
 
-#: utils/misc/guc_tables.c:4054
+#: utils/misc/guc_tables.c:4280
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "Sätter anslutningssträng som anvönds för att ansluta till skickande server."
 
-#: utils/misc/guc_tables.c:4065
+#: utils/misc/guc_tables.c:4291
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "Sätter namnet på replikeringsslotten som skall användas av den skickande servern."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4301
 msgid "Sets the client's character set encoding."
 msgstr "Ställer in klientens teckenkodning."
 
-#: utils/misc/guc_tables.c:4086
+#: utils/misc/guc_tables.c:4312
 msgid "Controls information prefixed to each log line."
 msgstr "Styr information prefixat till varje loggrad."
 
-#: utils/misc/guc_tables.c:4087
-msgid "If blank, no prefix is used."
-msgstr "Om tom så används inget prefix."
+#: utils/misc/guc_tables.c:4313
+msgid "An empty string means no prefix."
+msgstr "En tom stäng betyder inget prefix."
 
-#: utils/misc/guc_tables.c:4096
+#: utils/misc/guc_tables.c:4322
 msgid "Sets the time zone to use in log messages."
 msgstr "Sätter tidszonen som används i loggmeddelanden."
 
-#: utils/misc/guc_tables.c:4106
+#: utils/misc/guc_tables.c:4332
 msgid "Sets the display format for date and time values."
 msgstr "Sätter displayformat för datum och tidvärden."
 
-#: utils/misc/guc_tables.c:4107
+#: utils/misc/guc_tables.c:4333
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Styr också tolkning av tvetydig datumindata."
 
-#: utils/misc/guc_tables.c:4118
+#: utils/misc/guc_tables.c:4344
 msgid "Sets the default table access method for new tables."
 msgstr "Ställer in standard tabellaccessmetod för nya tabeller."
 
-#: utils/misc/guc_tables.c:4129
+#: utils/misc/guc_tables.c:4355
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "Ställer in standard tabellutrymme där tabeller och index skapas."
 
-#: utils/misc/guc_tables.c:4130
-msgid "An empty string selects the database's default tablespace."
-msgstr "En tom sträng väljer databasens standardtabellutrymme."
+#: utils/misc/guc_tables.c:4356 utils/misc/guc_tables.c:4367
+msgid "An empty string means use the database's default tablespace."
+msgstr "En tom sträng betyder att databasens standardtabellutrymme används."
 
-#: utils/misc/guc_tables.c:4140
+#: utils/misc/guc_tables.c:4366
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "Ställer in tablespace för temporära tabeller och sorteringsfiler."
 
-#: utils/misc/guc_tables.c:4151
+#: utils/misc/guc_tables.c:4377
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr "Sätter hurvida en CREATEROLE-användare automatiskt får rollen själva, och med vilka flaggor."
 
-#: utils/misc/guc_tables.c:4163
+#: utils/misc/guc_tables.c:4379
+msgid "An empty string disables automatic self grants."
+msgstr "En tom stäng stänger av automatiska grant till sig själv."
+
+#: utils/misc/guc_tables.c:4389
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Sätter sökvägen till dynamiskt laddade moduler."
 
-#: utils/misc/guc_tables.c:4164
+#: utils/misc/guc_tables.c:4390
 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 "Om en dynamiskt laddad modul behöver öppnas och det angivna namnet inte har en katalogkomponent (dvs, namnet inte innehåller snedstreck) så kommer systemet använda denna sökväg för filen."
 
-#: utils/misc/guc_tables.c:4177
+#: utils/misc/guc_tables.c:4403
+msgid "Sets the path for extension control files."
+msgstr "Sätter sökvägen till utökningars kontrollfiler."
+
+#: utils/misc/guc_tables.c:4404
+msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
+msgstr "Resterande utökningsskript och sekundära kontrollfiler laddas från samma katalog som den primära kontrollfilen hittades i."
+
+#: utils/misc/guc_tables.c:4415
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Ställer in platsen för Kerberos servernyckelfil."
 
-#: utils/misc/guc_tables.c:4188
+#: utils/misc/guc_tables.c:4426
 msgid "Sets the Bonjour service name."
 msgstr "Sätter Bonjour-tjänstens namn."
 
-#: utils/misc/guc_tables.c:4198
+#: utils/misc/guc_tables.c:4427
+msgid "An empty string means use the computer name."
+msgstr "En tom sträng betyder att datorns namn används."
+
+#: utils/misc/guc_tables.c:4436
 msgid "Sets the language in which messages are displayed."
 msgstr "Sätter språket som meddelanden visas i."
 
-#: utils/misc/guc_tables.c:4208
+#: utils/misc/guc_tables.c:4437 utils/misc/guc_tables.c:4447
+#: utils/misc/guc_tables.c:4457 utils/misc/guc_tables.c:4467
+msgid "An empty string means use the operating system setting."
+msgstr "En tom sträng betyder att operativsystemets inställning används."
+
+#: utils/misc/guc_tables.c:4446
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Sätter lokalen för att formattera monetära belopp."
 
-#: utils/misc/guc_tables.c:4218
+#: utils/misc/guc_tables.c:4456
 msgid "Sets the locale for formatting numbers."
 msgstr "Ställer in lokalen för att formattera nummer."
 
-#: utils/misc/guc_tables.c:4228
+#: utils/misc/guc_tables.c:4466
 msgid "Sets the locale for formatting date and time values."
 msgstr "Sätter lokalen för att formattera datum och tider."
 
-#: utils/misc/guc_tables.c:4238
+#: utils/misc/guc_tables.c:4476
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Listar delade bibliotek som skall förladdas i varje backend."
 
-#: utils/misc/guc_tables.c:4249
+#: utils/misc/guc_tables.c:4487
 msgid "Lists shared libraries to preload into server."
 msgstr "Listar delade bibliotek som skall förladdas i servern."
 
-#: utils/misc/guc_tables.c:4260
+#: utils/misc/guc_tables.c:4498
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Listar ej priviligerade delade bibliotek som förladdas in i varje backend."
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4509
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Sätter schemats sökordning för namn som inte är schema-prefixade."
 
-#: utils/misc/guc_tables.c:4283
+#: utils/misc/guc_tables.c:4521
 msgid "Shows the server (database) character set encoding."
 msgstr "Visar serverns (databasens) teckenkodning."
 
-#: utils/misc/guc_tables.c:4295
+#: utils/misc/guc_tables.c:4533
 msgid "Shows the server version."
 msgstr "Visar serverversionen"
 
-#: utils/misc/guc_tables.c:4307
+#: utils/misc/guc_tables.c:4545
 msgid "Sets the current role."
 msgstr "Ställer in den aktiva rollen."
 
-#: utils/misc/guc_tables.c:4319
+#: utils/misc/guc_tables.c:4557
 msgid "Sets the session user name."
 msgstr "Sätter sessionens användarnamn."
 
-#: utils/misc/guc_tables.c:4330
+#: utils/misc/guc_tables.c:4568
 msgid "Sets the destination for server log output."
 msgstr "Sätter serverloggens destination."
 
-#: utils/misc/guc_tables.c:4331
+#: utils/misc/guc_tables.c:4569
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr "Giltiga värden är kombinationer av \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\" och \"eventlog\", beroende på plattform."
 
-#: utils/misc/guc_tables.c:4342
+#: utils/misc/guc_tables.c:4580
 msgid "Sets the destination directory for log files."
 msgstr "Sätter destinationskatalogen för loggfiler."
 
-#: utils/misc/guc_tables.c:4343
+#: utils/misc/guc_tables.c:4581
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "Kan anges relativt datakatalogen eller som en absolut sökväg."
 
-#: utils/misc/guc_tables.c:4353
+#: utils/misc/guc_tables.c:4591
 msgid "Sets the file name pattern for log files."
 msgstr "Sätter filnamnsmallen för loggfiler."
 
-#: utils/misc/guc_tables.c:4364
+#: utils/misc/guc_tables.c:4602
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Sätter programnamnet som används för att identifiera PostgreSQLs meddelanden i syslog."
 
-#: utils/misc/guc_tables.c:4375
+#: utils/misc/guc_tables.c:4613
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "Sätter applikationsnamnet som används för att identifiera PostgreSQLs meddelanden i händelseloggen."
 
-#: utils/misc/guc_tables.c:4386
+#: utils/misc/guc_tables.c:4624
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Ställer in tidszon för visande och tolkande av tidsstämplar."
 
-#: utils/misc/guc_tables.c:4396
+#: utils/misc/guc_tables.c:4634
 msgid "Selects a file of time zone abbreviations."
 msgstr "Väljer en fil för tidszonsförkortningar."
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4644
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Sätter ägande grupp för Unix-domainuttaget (socket)."
 
-#: utils/misc/guc_tables.c:4407
-msgid "The owning user of the socket is always the user that starts the server."
-msgstr "Ägaren av uttaget (socker) är alltid användaren som startar servern."
+#: utils/misc/guc_tables.c:4645
+msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
+msgstr "Ägaren av uttaget (socker) är alltid användaren som startar servern. En tom sträng betyder att användarens standardgrupp används."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4655
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Ställer in kataloger där Unix-domän-uttag (socket) kommer skapas."
 
-#: utils/misc/guc_tables.c:4428
+#: utils/misc/guc_tables.c:4666
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Sätter värdnamn eller IP-adress(er) att lyssna på."
 
-#: utils/misc/guc_tables.c:4443
+#: utils/misc/guc_tables.c:4681
 msgid "Sets the server's data directory."
 msgstr "Ställer in serverns datakatalog."
 
-#: utils/misc/guc_tables.c:4454
+#: utils/misc/guc_tables.c:4692
 msgid "Sets the server's main configuration file."
 msgstr "Sätter serverns huvudkonfigurationsfil."
 
-#: utils/misc/guc_tables.c:4465
+#: utils/misc/guc_tables.c:4703
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Sätter serverns \"hba\"-konfigurationsfil."
 
-#: utils/misc/guc_tables.c:4476
+#: utils/misc/guc_tables.c:4714
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Sätter serverns \"ident\"-konfigurationsfil."
 
-#: utils/misc/guc_tables.c:4487
+#: utils/misc/guc_tables.c:4725
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Skriver postmaster-PID till angiven fil."
 
-#: utils/misc/guc_tables.c:4498
+#: utils/misc/guc_tables.c:4736
 msgid "Shows the name of the SSL library."
 msgstr "Visar namnet på SSL-biblioteket."
 
-#: utils/misc/guc_tables.c:4513
+#: utils/misc/guc_tables.c:4751
 msgid "Location of the SSL server certificate file."
 msgstr "Plats för serverns SSL-certifikatfil."
 
-#: utils/misc/guc_tables.c:4523
+#: utils/misc/guc_tables.c:4761
 msgid "Location of the SSL server private key file."
 msgstr "Plats för serverns privata SSL-nyckelfil."
 
-#: utils/misc/guc_tables.c:4533
+#: utils/misc/guc_tables.c:4771
 msgid "Location of the SSL certificate authority file."
 msgstr "Plats för SSL-certifikats auktoritetsfil."
 
-#: utils/misc/guc_tables.c:4543
+#: utils/misc/guc_tables.c:4781
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Plats för SSL-certifikats återkallningsfil."
 
-#: utils/misc/guc_tables.c:4553
+#: utils/misc/guc_tables.c:4791
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "Plats av katalog för SSL-certifikats återkallningslistor."
 
-#: utils/misc/guc_tables.c:4563
+#: utils/misc/guc_tables.c:4801
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr "Antalet synkrona standby och en lista med namn på potentiellt synkrona sådana."
 
-#: utils/misc/guc_tables.c:4574
+#: utils/misc/guc_tables.c:4812
 msgid "Sets default text search configuration."
 msgstr "Ställer in standard textsökkonfiguration."
 
-#: utils/misc/guc_tables.c:4584
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Ställer in listan med tillåtna SSL-krypton."
+#: utils/misc/guc_tables.c:4822
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "Ställer in listan med tillåtna TLSv1.3-krypton."
 
-#: utils/misc/guc_tables.c:4599
-msgid "Sets the curve to use for ECDH."
-msgstr "Ställer in kurvan att använda för ECDH."
+#: utils/misc/guc_tables.c:4823
+msgid "An empty string means use the default cipher suites."
+msgstr "En tom sträng betyder att standardkryptot används."
 
-#: utils/misc/guc_tables.c:4614
+#: utils/misc/guc_tables.c:4833
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
+msgstr "Ställer in listan med tillåtna TLSv1.2-krypton (och lägre)."
+
+#: utils/misc/guc_tables.c:4848
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr "Sätter group(er) som används för Diffie-Hellmans nyckelutbyte."
+
+#: utils/misc/guc_tables.c:4849
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr "Multipla grupper kan anges med en kolonseparerad lista."
+
+#: utils/misc/guc_tables.c:4863
 msgid "Location of the SSL DH parameters file."
 msgstr "Plats för SSL DH-parameterfil."
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4864
+msgid "An empty string means use compiled-in default parameters."
+msgstr "En tom sträng betyder att inkompilerade defaultvärden används."
+
+#: utils/misc/guc_tables.c:4874
 msgid "Command to obtain passphrases for SSL."
 msgstr "Kommando för att hämta lösenfraser för SSL."
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4875
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr "En tom sträng betyder att inbyggd befordransmekanism används."
+
+#: utils/misc/guc_tables.c:4885
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "Sätter applikationsnamn som rapporteras i statistik och loggar."
 
-#: utils/misc/guc_tables.c:4647
+#: utils/misc/guc_tables.c:4896
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "Sätter namnet på klustret som inkluderas i processtiteln."
 
-#: utils/misc/guc_tables.c:4658
+#: utils/misc/guc_tables.c:4907
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "Sätter WAL-resurshanterare som WAL-konsistenskontoller görs med."
 
-#: utils/misc/guc_tables.c:4659
+#: utils/misc/guc_tables.c:4908
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr "Hela sidkopior kommer loggas för alla datablock och kontrolleras mot resultatet av en WAL-uppspelning."
 
-#: utils/misc/guc_tables.c:4669
+#: utils/misc/guc_tables.c:4918
 msgid "JIT provider to use."
 msgstr "JIT-leverantör som används."
 
-#: utils/misc/guc_tables.c:4680
+#: utils/misc/guc_tables.c:4929
 msgid "Log backtrace for errors in these functions."
 msgstr "Loggar backtrace vid fel i dessa funktioner."
 
-#: utils/misc/guc_tables.c:4691
+#: utils/misc/guc_tables.c:4940
 msgid "Use direct I/O for file access."
 msgstr "Använd direct-I/O för filaccess."
 
-#: utils/misc/guc_tables.c:4702
+#: utils/misc/guc_tables.c:4941
+msgid "An empty string disables direct I/O."
+msgstr "En tom sträng stänger av direkt I/O."
+
+#: utils/misc/guc_tables.c:4951
 msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
 msgstr "Listar replikeringsslotnamn på server för replikering-standby som processen för skickande av logisk WAL väntar på."
 
-#: utils/misc/guc_tables.c:4704
+#: utils/misc/guc_tables.c:4953
 msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
 msgstr "Processen för skickande av logisk WAL skickar avkodade ändringar till utdata-plugin:er enbart efter att de angivna replikeringsslottarna bekräftat att de tagit emot WAL."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4965
 msgid "Prohibits access to non-system relations of specified kinds."
 msgstr "Förhindrar access till icke-system-relationer av angivna sorter."
 
-#: utils/misc/guc_tables.c:4736
+#: utils/misc/guc_tables.c:4976
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr "Listar bibliotek som kan anropas för att validera OAuth v2 bärande token."
+
+#: utils/misc/guc_tables.c:4987
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr "Loggar angivna egenskaper om anslutningar och uppsättning."
+
+#: utils/misc/guc_tables.c:5008
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Anger hurvida \"\\'\" tillåts i sträng-literaler."
 
-#: utils/misc/guc_tables.c:4746
+#: utils/misc/guc_tables.c:5018
 msgid "Sets the output format for bytea."
 msgstr "Ställer in output-format för bytea."
 
-#: utils/misc/guc_tables.c:4756
+#: utils/misc/guc_tables.c:5028
 msgid "Sets the message levels that are sent to the client."
 msgstr "Ställer in meddelandenivåer som skickas till klienten."
 
-#: utils/misc/guc_tables.c:4757 utils/misc/guc_tables.c:4853
-#: utils/misc/guc_tables.c:4864
+#: utils/misc/guc_tables.c:5029 utils/misc/guc_tables.c:5125
+#: utils/misc/guc_tables.c:5136
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr "Varje nivå inkluderar de efterföljande nivåerna. Ju senare nivå destå färre meddlanden skickas."
 
-#: utils/misc/guc_tables.c:4767
+#: utils/misc/guc_tables.c:5039
 msgid "Enables in-core computation of query identifiers."
 msgstr "Slår på intern uträkning av identifierare för frågor."
 
-#: utils/misc/guc_tables.c:4777
+#: utils/misc/guc_tables.c:5049
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "Slår på planerarens användning av integritetsvillkor för att optimera frågor."
 
-#: utils/misc/guc_tables.c:4778
+#: utils/misc/guc_tables.c:5050
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "Tabellskanningar kommer hoppas över om dess integritetsvillkor garanterar att inga rader komma matchas av frågan."
 
-#: utils/misc/guc_tables.c:4789
+#: utils/misc/guc_tables.c:5061
 msgid "Sets the default compression method for compressible values."
 msgstr "Ställer in standard komprimeringsmetod för komprimeringsbara värden."
 
-#: utils/misc/guc_tables.c:4800
+#: utils/misc/guc_tables.c:5072
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Ställer in isolationsnivån för nya transaktioner."
 
-#: utils/misc/guc_tables.c:4810
+#: utils/misc/guc_tables.c:5082
 msgid "Sets the current transaction's isolation level."
 msgstr "Sätter den aktuella transaktionsisolationsnivån."
 
-#: utils/misc/guc_tables.c:4821
+#: utils/misc/guc_tables.c:5093
 msgid "Sets the display format for interval values."
 msgstr "Ställer in visningsformat för intervallvärden."
 
-#: utils/misc/guc_tables.c:4832
+#: utils/misc/guc_tables.c:5104
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "Loggnivå för rapportering av ogiltiga ICU-lokalsträngar."
 
-#: utils/misc/guc_tables.c:4842
+#: utils/misc/guc_tables.c:5114
 msgid "Sets the verbosity of logged messages."
 msgstr "Ställer in pratighet för loggade meddelanden."
 
-#: utils/misc/guc_tables.c:4852
+#: utils/misc/guc_tables.c:5124
 msgid "Sets the message levels that are logged."
 msgstr "Ställer in meddelandenivåer som loggas."
 
-#: utils/misc/guc_tables.c:4863
+#: utils/misc/guc_tables.c:5135
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "Gör att alla satser som genererar fel vid eller över denna nivå kommer loggas."
 
-#: utils/misc/guc_tables.c:4874
+#: utils/misc/guc_tables.c:5146
 msgid "Sets the type of statements logged."
 msgstr "Ställer in vilken sorts satser som loggas."
 
-#: utils/misc/guc_tables.c:4884
+#: utils/misc/guc_tables.c:5156
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "Ställer in syslog-\"facility\" som används när syslog är påslagen."
 
-#: utils/misc/guc_tables.c:4895
+#: utils/misc/guc_tables.c:5167
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Sätter sessionens beteende för triggrar och omskrivningsregler."
 
-#: utils/misc/guc_tables.c:4905
+#: utils/misc/guc_tables.c:5177
 msgid "Sets the current transaction's synchronization level."
 msgstr "Ställer in den nuvarande transaktionens synkroniseringsnivå."
 
-#: utils/misc/guc_tables.c:4915
+#: utils/misc/guc_tables.c:5187
 msgid "Allows archiving of WAL files using \"archive_command\"."
 msgstr "Tillåter arkivering av WAL-filer med hjälp av \"archive_command\"."
 
-#: utils/misc/guc_tables.c:4925
+#: utils/misc/guc_tables.c:5197
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "Sätter handling som skall utföras när återställningsmål nås."
 
-#: utils/misc/guc_tables.c:4935
+#: utils/misc/guc_tables.c:5207
 msgid "Collects function-level statistics on database activity."
 msgstr "Samlar in statistik på funktionsnivå över databasaktivitet."
 
-#: utils/misc/guc_tables.c:4946
+#: utils/misc/guc_tables.c:5218
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "Sätter konsistensinställning för accesser av statistikdata."
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:5228
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "Komprimerar skrivning av hela sidor i WAL-filen med angiven metod."
 
-#: utils/misc/guc_tables.c:4966
+#: utils/misc/guc_tables.c:5238
 msgid "Sets the level of information written to the WAL."
 msgstr "Ställer in mängden information som skrivs till WAL."
 
-#: utils/misc/guc_tables.c:4976
+#: utils/misc/guc_tables.c:5248
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Väljer implementation som används för dynamiskt delat minne."
 
-#: utils/misc/guc_tables.c:4986
+#: utils/misc/guc_tables.c:5258
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr "Väljer implementation för delat minne som används för det delade minnets huvudregionen."
 
-#: utils/misc/guc_tables.c:4996
+#: utils/misc/guc_tables.c:5268
+msgid "Selects the file copy method."
+msgstr "Väljer metod för att kopiera filer."
+
+#: utils/misc/guc_tables.c:5278
+msgid "Selects the method used for extending data files."
+msgstr "Väljer metod för att utöka datafiler."
+
+#: utils/misc/guc_tables.c:5288
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "Väljer metod för att tvinga WAL-uppdateringar till disk."
 
-#: utils/misc/guc_tables.c:5006
+#: utils/misc/guc_tables.c:5298
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "Ställer in hur binära värden kodas i XML."
 
-#: utils/misc/guc_tables.c:5016
+#: utils/misc/guc_tables.c:5308
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr "Anger hurvida XML-data vid implicit parsning och serialiseringsoperationer ses som dokument eller innehållsfragment."
 
-#: utils/misc/guc_tables.c:5027
+#: utils/misc/guc_tables.c:5319
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Använd stora sidor på Linux resp. Windows."
 
-#: utils/misc/guc_tables.c:5037
+#: utils/misc/guc_tables.c:5329
 msgid "Indicates the status of huge pages."
 msgstr "Visas status för stora sidor."
 
-#: utils/misc/guc_tables.c:5048
+#: utils/misc/guc_tables.c:5340
 msgid "Prefetch referenced blocks during recovery."
 msgstr "Prefetch:a refererade block vid återställning."
 
-#: utils/misc/guc_tables.c:5049
+#: utils/misc/guc_tables.c:5341
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "Sök framåt i WAL för att hitta referenser till icke cache:ad data."
 
-#: utils/misc/guc_tables.c:5058
+#: utils/misc/guc_tables.c:5350
 msgid "Forces the planner's use parallel query nodes."
 msgstr "Tvingar planeraren att använda parallella frågenoder."
 
-#: utils/misc/guc_tables.c:5059
+#: utils/misc/guc_tables.c:5351
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr "Detta är användbart för att testa infrastrukturen för parallella frågor genom att tvinga planeraren att generera planer som innehåller noder som skickar tupler mellan arbetare och huvudprocessen."
 
-#: utils/misc/guc_tables.c:5071
+#: utils/misc/guc_tables.c:5363
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "Väljer algoritm för att kryptera lösenord."
 
-#: utils/misc/guc_tables.c:5081
+#: utils/misc/guc_tables.c:5373
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "Styr planerarens användning av egendefinierad eller generell plan."
 
-#: utils/misc/guc_tables.c:5082
+#: utils/misc/guc_tables.c:5374
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr "Preparerade satser kan ha egendefinierade och generella planer och planeraren kommer försöka välja den som är bäst. Detta kan anges att övertrumfa standardbeteendet."
 
-#: utils/misc/guc_tables.c:5094
+#: utils/misc/guc_tables.c:5386
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "Sätter minsta SSL/TLS-protokollversion som skall användas."
 
-#: utils/misc/guc_tables.c:5106
+#: utils/misc/guc_tables.c:5398
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "Sätter högsta SSL/TLS-protokollversion som skall användas."
 
-#: utils/misc/guc_tables.c:5118
+#: utils/misc/guc_tables.c:5410
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr "Ställer in metoden för att synkronisera datakatalogen innan kraschåterställning."
 
-#: utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5419
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr "Tvingar omedelbar strömning eller serialisering av ändringar i stora transaktioner."
 
-#: utils/misc/guc_tables.c:5128
+#: utils/misc/guc_tables.c:5420
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr "På publiceringssidan så tillåter detta strömning eller serialisering av varje ändring i den logiska kodningen. På prenumerationsstidan så tillåter det serialisering av alla ändringar till filer samt notifiering till den parallella appliceraren att läsa in och applicera dem i slutet av transaktionen."
 
+#: utils/misc/guc_tables.c:5432
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "Väljer metod för att köra asynkron I/O."
+
 #: utils/misc/help_config.c:129
 #, c-format
 msgid "internal error: unrecognized run-time parameter type\n"
@@ -30841,6 +32382,26 @@ msgstr "frågan påverkas av radsäkerhetspolicyn för tabell \"%s\""
 msgid "To disable the policy for the table's owner, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 msgstr "För att slå av policyn för tabellens ägare, använd ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
+#: utils/misc/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "maximalt stackdjup överskridet"
+
+#: utils/misc/stack_depth.c:102
+#, c-format
+msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
+msgstr "Öka konfigurationsparametern \"max_stack_depth\" (nu %dkB) efter att ha undersökt att plattformens gräns för stackdjup är tillräcklig."
+
+#: utils/misc/stack_depth.c:149
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "\"max_stack_depth\" får ej överskrida %zdkB."
+
+#: utils/misc/stack_depth.c:151
+#, c-format
+msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
+msgstr "Öka plattformens stackdjupbegränsning via \"ulimit -s\" eller motsvarande."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -30856,57 +32417,57 @@ msgstr "tidszonförkortningen \"%s\" är för lång (max %d tecken) i tidszonfil
 msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr "tidszonoffset %d är otanför giltigt intervall i tidszonfilen \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr "tidszonförkortning saknas i tidszonfilen \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr "tidszonoffset saknas i tidszonfilen \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr "felaktigt nummer för tidszonsoffset i tidszonfilen \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "felaktig syntax i tidszonfilen \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "tidszonförkortningen \"%s\" är definierad flera gånger"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
 msgstr "Post i tidszonfilen \"%s\", rad %d, står i konflikt med post i filen \"%s\", rad %d."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "ogiltigt tidszonfilnamn: \"%s\""
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "tidszonfilens rekursiva maxtak överskridet i filen \"%s\""
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "kunde inte läsa tidszonfil \"%s\": %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "raden är för lång i tidszonfil \"%s\", rad %d"
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "@INCLUDE utan filnamn i tidszonfil \"%s\", rad %d"
@@ -30922,12 +32483,12 @@ msgstr "Misslyckades vid skapande av minneskontext \"%s\"."
 msgid "could not attach to dynamic shared area"
 msgstr "kunde inte ansluta till dynamisk delad area"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "Misslyckades med förfrågan av storlek %zu i minneskontext \"%s\"."
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "loggar minneskontext för PID %d"
@@ -30969,99 +32530,99 @@ msgstr "kan inte utföra transaktionskommandon i en markörloop som inte är rea
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
 #, c-format
-msgid "could not seek to block %lld of temporary file"
-msgstr "kunde inte söka (seek) till block %lld i temporärfil"
+msgid "could not seek to block %<PRId64> of temporary file"
+msgstr "kunde inte söka (seek) till block %<PRId64> i temporärfil"
 
-#: utils/sort/sharedtuplestore.c:466
+#: utils/sort/sharedtuplestore.c:467
 #, c-format
 msgid "unexpected chunk in shared tuplestore temporary file"
 msgstr "oväntad chunk i delad temporär lagringsfil för tupler"
 
-#: utils/sort/sharedtuplestore.c:548
+#: utils/sort/sharedtuplestore.c:549
 #, c-format
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "kunde inte söka (seek) till block %u i delad temporär lagringsfil för tupler"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "kan inte ha mer än %d körningar för en extern sortering"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1688
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "kunde inte skapa unikt index \"%s\""
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1690
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "Nyckeln %s är duplicerad."
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1691
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Duplicerade nycklar existerar."
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1308 utils/sort/tuplestore.c:1373
+#: utils/sort/tuplestore.c:1382
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "kunde inte söka i temporär lagringsfil för tupler"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "Källtransaktionen kör inte längre."
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "kan inte exportera ett snapshot från en undertransaktion"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "ogiltig snapshot-data i fil \"%s\""
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT måste anropas innan någon fråga"
 
-#: utils/time/snapmgr.c:1402
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "en snapshot-importerande transaktion måste ha isoleringsnivå SERIALIZABLE eller REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "ogiltig snapshot-identifierare: \"%s\""
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "snapshot \"%s\" existerar inte"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "en serialiserbar transaktion kan inte importera ett snapshot från en icke-serialiserbar transaktion"
 
-#: utils/time/snapmgr.c:1528
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "en serialiserbar transaktion som inte är read-only kan inte importera en snapshot från en read-only-transaktion."
 
-#: utils/time/snapmgr.c:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "kan inte importera en snapshot från en annan databas"
diff --git a/src/backend/po/uk.po b/src/backend/po/uk.po
index 6c4c0add9ee..c2209a365a0 100644
--- a/src/backend/po/uk.po
+++ b/src/backend/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-23 10:41+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:11+0000\n"
+"PO-Revision-Date: 2026-01-03 10:11\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/postgres.pot\n"
-"X-Crowdin-File-ID: 988\n"
+"X-Crowdin-File: /REL_18_STABLE/postgres.pot\n"
+"X-Crowdin-File-ID: 1051\n"
 
 #: ../common/binaryheap.c:121 ../common/binaryheap.c:159
 #, c-format
@@ -80,34 +80,34 @@ msgid "not recorded"
 msgstr "не записано"
 
 #: ../common/controldata_utils.c:93 ../common/controldata_utils.c:97
-#: commands/copyfrom.c:1739 commands/extension.c:3538 utils/adt/genfile.c:123
-#: utils/time/snapmgr.c:1430
+#: commands/copyfrom.c:1879 commands/extension.c:3831 utils/adt/genfile.c:123
+#: utils/time/snapmgr.c:1448
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
 #: ../common/controldata_utils.c:108 ../common/controldata_utils.c:110
 #: access/transam/timeline.c:143 access/transam/timeline.c:362
-#: access/transam/twophase.c:1369 access/transam/xlog.c:3476
-#: access/transam/xlog.c:4340 access/transam/xlogrecovery.c:1238
-#: access/transam/xlogrecovery.c:1336 access/transam/xlogrecovery.c:1373
-#: access/transam/xlogrecovery.c:1440 backup/basebackup.c:2123
-#: backup/walsummary.c:283 commands/extension.c:3548 libpq/hba.c:764
-#: replication/logical/origin.c:745 replication/logical/origin.c:781
-#: replication/logical/reorderbuffer.c:5108
-#: replication/logical/snapbuild.c:2052 replication/slot.c:2236
-#: replication/slot.c:2277 replication/walsender.c:655
-#: storage/file/buffile.c:470 storage/file/copydir.c:185
+#: access/transam/twophase.c:1353 access/transam/xlog.c:3479
+#: access/transam/xlog.c:4370 access/transam/xlogrecovery.c:1257
+#: access/transam/xlogrecovery.c:1355 access/transam/xlogrecovery.c:1392
+#: access/transam/xlogrecovery.c:1459 backup/basebackup.c:2128
+#: backup/walsummary.c:283 commands/extension.c:3841 libpq/hba.c:769
+#: replication/logical/origin.c:768 replication/logical/origin.c:804
+#: replication/logical/reorderbuffer.c:5366
+#: replication/logical/snapbuild.c:1951 replication/slot.c:2542
+#: replication/slot.c:2583 replication/walsender.c:643
+#: storage/file/buffile.c:470 storage/file/copydir.c:201
 #: utils/adt/genfile.c:197 utils/adt/misc.c:1028 utils/cache/relmapper.c:829
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не вдалося прочитати файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:116 ../common/controldata_utils.c:119
-#: access/transam/xlog.c:3481 access/transam/xlog.c:4345
-#: replication/logical/origin.c:750 replication/logical/origin.c:789
-#: replication/logical/snapbuild.c:2057 replication/slot.c:2240
-#: replication/slot.c:2281 replication/walsender.c:660
+#: access/transam/xlog.c:3484 access/transam/xlog.c:4375
+#: replication/logical/origin.c:773 replication/logical/origin.c:812
+#: replication/logical/snapbuild.c:1956 replication/slot.c:2546
+#: replication/slot.c:2587 replication/walsender.c:648
 #: utils/cache/relmapper.c:833
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
@@ -117,18 +117,19 @@ msgstr "не вдалося прочитати файл \"%s\": прочитан
 #: ../common/controldata_utils.c:277 ../common/controldata_utils.c:280
 #: access/heap/rewriteheap.c:1141 access/heap/rewriteheap.c:1246
 #: access/transam/timeline.c:392 access/transam/timeline.c:438
-#: access/transam/timeline.c:512 access/transam/twophase.c:1381
-#: access/transam/twophase.c:1793 access/transam/xlog.c:3322
-#: access/transam/xlog.c:3516 access/transam/xlog.c:3521
-#: access/transam/xlog.c:3657 access/transam/xlog.c:4310
-#: access/transam/xlog.c:5245 commands/copyfrom.c:1799 commands/copyto.c:325
-#: libpq/be-fsstubs.c:470 libpq/be-fsstubs.c:540
-#: replication/logical/origin.c:683 replication/logical/origin.c:822
-#: replication/logical/reorderbuffer.c:5160
-#: replication/logical/snapbuild.c:1819 replication/logical/snapbuild.c:1943
-#: replication/slot.c:2126 replication/slot.c:2288 replication/walsender.c:670
-#: storage/file/copydir.c:208 storage/file/copydir.c:213 storage/file/fd.c:828
-#: storage/file/fd.c:3753 storage/file/fd.c:3859 utils/cache/relmapper.c:841
+#: access/transam/timeline.c:512 access/transam/twophase.c:1365
+#: access/transam/twophase.c:1783 access/transam/xlog.c:3325
+#: access/transam/xlog.c:3519 access/transam/xlog.c:3524
+#: access/transam/xlog.c:3660 access/transam/xlog.c:4340
+#: access/transam/xlog.c:5312 commands/copyfrom.c:1929 commands/copyto.c:598
+#: libpq/be-fsstubs.c:475 libpq/be-fsstubs.c:545
+#: replication/logical/origin.c:706 replication/logical/origin.c:845
+#: replication/logical/reorderbuffer.c:5418
+#: replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1822
+#: replication/slot.c:2428 replication/slot.c:2594 replication/walsender.c:658
+#: storage/file/copydir.c:224 storage/file/copydir.c:229
+#: storage/file/copydir.c:284 storage/file/copydir.c:289 storage/file/fd.c:825
+#: storage/file/fd.c:3815 storage/file/fd.c:3921 utils/cache/relmapper.c:841
 #: utils/cache/relmapper.c:956
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -148,105 +149,107 @@ msgstr "можлива помилка у послідовності байтів
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
 #: ../common/controldata_utils.c:225 ../common/controldata_utils.c:230
-#: ../common/file_utils.c:70 ../common/file_utils.c:347
-#: ../common/file_utils.c:406 ../common/file_utils.c:480
+#: ../common/file_utils.c:69 ../common/file_utils.c:370
+#: ../common/file_utils.c:428 ../common/file_utils.c:502
 #: access/heap/rewriteheap.c:1229 access/transam/timeline.c:111
 #: access/transam/timeline.c:251 access/transam/timeline.c:348
-#: access/transam/twophase.c:1325 access/transam/xlog.c:3229
-#: access/transam/xlog.c:3392 access/transam/xlog.c:3431
-#: access/transam/xlog.c:3624 access/transam/xlog.c:4330
-#: access/transam/xlogrecovery.c:4263 access/transam/xlogrecovery.c:4366
-#: access/transam/xlogutils.c:836 backup/basebackup.c:547
-#: backup/basebackup.c:1598 backup/walsummary.c:220 libpq/hba.c:624
-#: postmaster/syslogger.c:1511 replication/logical/origin.c:735
-#: replication/logical/reorderbuffer.c:3761
-#: replication/logical/reorderbuffer.c:4315
-#: replication/logical/reorderbuffer.c:5088
-#: replication/logical/snapbuild.c:1774 replication/logical/snapbuild.c:1884
-#: replication/slot.c:2208 replication/walsender.c:628
-#: replication/walsender.c:3051 storage/file/copydir.c:151
-#: storage/file/fd.c:803 storage/file/fd.c:3510 storage/file/fd.c:3740
-#: storage/file/fd.c:3830 storage/smgr/md.c:661 utils/cache/relmapper.c:818
-#: utils/cache/relmapper.c:935 utils/error/elog.c:2124
-#: utils/init/miscinit.c:1526 utils/init/miscinit.c:1660
-#: utils/init/miscinit.c:1737 utils/misc/guc.c:4736 utils/misc/guc.c:4786
+#: access/transam/twophase.c:1309 access/transam/xlog.c:3215
+#: access/transam/xlog.c:3395 access/transam/xlog.c:3434
+#: access/transam/xlog.c:3627 access/transam/xlog.c:4360
+#: access/transam/xlogrecovery.c:4307 access/transam/xlogrecovery.c:4408
+#: access/transam/xlogutils.c:825 backup/basebackup.c:549
+#: backup/basebackup.c:1600 backup/walsummary.c:220 libpq/hba.c:626
+#: postmaster/syslogger.c:1512 replication/logical/origin.c:758
+#: replication/logical/reorderbuffer.c:4019
+#: replication/logical/reorderbuffer.c:4573
+#: replication/logical/reorderbuffer.c:5346
+#: replication/logical/snapbuild.c:1651 replication/logical/snapbuild.c:1763
+#: replication/slot.c:2514 replication/walsender.c:616
+#: replication/walsender.c:3094 storage/file/copydir.c:167
+#: storage/file/copydir.c:255 storage/file/fd.c:800 storage/file/fd.c:3572
+#: storage/file/fd.c:3802 storage/file/fd.c:3892 storage/smgr/md.c:675
+#: utils/cache/relmapper.c:818 utils/cache/relmapper.c:935
+#: utils/error/elog.c:2132 utils/init/miscinit.c:1586
+#: utils/init/miscinit.c:1720 utils/init/miscinit.c:1797 utils/misc/guc.c:4779
+#: utils/misc/guc.c:4829
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:246 ../common/controldata_utils.c:249
-#: access/transam/twophase.c:1766 access/transam/twophase.c:1775
-#: access/transam/xlog.c:9255 access/transam/xlogfuncs.c:698
+#: access/transam/twophase.c:1756 access/transam/twophase.c:1765
+#: access/transam/xlog.c:9338 access/transam/xlogfuncs.c:699
 #: backup/basebackup_server.c:173 backup/basebackup_server.c:266
-#: backup/walsummary.c:304 postmaster/postmaster.c:4125
-#: postmaster/syslogger.c:1522 postmaster/syslogger.c:1535
-#: postmaster/syslogger.c:1548 utils/cache/relmapper.c:947
+#: backup/walsummary.c:304 postmaster/postmaster.c:4105
+#: postmaster/syslogger.c:1523 postmaster/syslogger.c:1536
+#: postmaster/syslogger.c:1549 utils/cache/relmapper.c:947
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
 #: ../common/controldata_utils.c:263 ../common/controldata_utils.c:268
-#: ../common/file_utils.c:418 ../common/file_utils.c:488
+#: ../common/file_utils.c:440 ../common/file_utils.c:510
 #: access/heap/rewriteheap.c:925 access/heap/rewriteheap.c:1135
 #: access/heap/rewriteheap.c:1240 access/transam/timeline.c:432
-#: access/transam/timeline.c:506 access/transam/twophase.c:1787
-#: access/transam/xlog.c:3315 access/transam/xlog.c:3510
-#: access/transam/xlog.c:4303 access/transam/xlog.c:8630
-#: access/transam/xlog.c:8675 backup/basebackup_server.c:207
-#: commands/dbcommands.c:514 replication/logical/snapbuild.c:1812
-#: replication/slot.c:2112 replication/slot.c:2218 storage/file/fd.c:820
-#: storage/file/fd.c:3851 storage/smgr/md.c:1329 storage/smgr/md.c:1374
-#: storage/sync/sync.c:446 utils/misc/guc.c:4489
+#: access/transam/timeline.c:506 access/transam/twophase.c:1777
+#: access/transam/xlog.c:3315 access/transam/xlog.c:3513
+#: access/transam/xlog.c:4333 access/transam/xlog.c:8724
+#: access/transam/xlog.c:8768 backup/basebackup_server.c:207
+#: commands/dbcommands.c:515 replication/logical/snapbuild.c:1689
+#: replication/slot.c:2412 replication/slot.c:2524 storage/file/fd.c:817
+#: storage/file/fd.c:3913 storage/smgr/md.c:1455 storage/smgr/md.c:1515
+#: storage/sync/sync.c:446 utils/misc/guc.c:4527
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
 #: ../common/cryptohash.c:261 ../common/cryptohash_openssl.c:158
-#: ../common/cryptohash_openssl.c:356 ../common/exec.c:562 ../common/exec.c:607
-#: ../common/exec.c:699 ../common/hmac.c:309 ../common/hmac.c:325
-#: ../common/hmac_openssl.c:160 ../common/hmac_openssl.c:357
-#: ../common/md5_common.c:156 ../common/parse_manifest.c:157
-#: ../common/parse_manifest.c:853 ../common/psprintf.c:143
-#: ../common/scram-common.c:269 ../common/stringinfo.c:314 ../port/path.c:751
-#: ../port/path.c:788 ../port/path.c:805 access/transam/twophase.c:1434
-#: access/transam/xlogrecovery.c:564 lib/dshash.c:253 libpq/auth.c:1352
-#: libpq/auth.c:1396 libpq/auth.c:1953 libpq/be-secure-gssapi.c:524
-#: postmaster/bgworker.c:355 postmaster/bgworker.c:945
-#: postmaster/postmaster.c:3559 postmaster/postmaster.c:4019
-#: postmaster/postmaster.c:4381 postmaster/walsummarizer.c:935
-#: replication/libpqwalreceiver/libpqwalreceiver.c:387
-#: replication/logical/logical.c:210 replication/walsender.c:835
-#: storage/buffer/localbuf.c:606 storage/file/fd.c:912 storage/file/fd.c:1443
-#: storage/file/fd.c:1604 storage/file/fd.c:2531 storage/ipc/procarray.c:1465
-#: storage/ipc/procarray.c:2219 storage/ipc/procarray.c:2226
-#: storage/ipc/procarray.c:2731 storage/ipc/procarray.c:3435
-#: utils/adt/formatting.c:1725 utils/adt/formatting.c:1873
-#: utils/adt/formatting.c:2075 utils/adt/pg_locale.c:509
-#: utils/adt/pg_locale.c:673 utils/fmgr/dfmgr.c:229 utils/hash/dynahash.c:516
-#: utils/hash/dynahash.c:616 utils/hash/dynahash.c:1099 utils/mb/mbutils.c:401
-#: utils/mb/mbutils.c:429 utils/mb/mbutils.c:814 utils/mb/mbutils.c:841
-#: utils/misc/guc.c:649 utils/misc/guc.c:674 utils/misc/guc.c:1062
-#: utils/misc/guc.c:4467 utils/misc/tzparser.c:477 utils/mmgr/aset.c:451
-#: utils/mmgr/bump.c:183 utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729
-#: utils/mmgr/dsa.c:810 utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1154
-#: utils/mmgr/slab.c:370
+#: ../common/cryptohash_openssl.c:356 ../common/exec.c:543 ../common/exec.c:588
+#: ../common/exec.c:680 ../common/hmac.c:309 ../common/hmac.c:325
+#: ../common/hmac_openssl.c:151 ../common/hmac_openssl.c:339
+#: ../common/jsonapi.c:2410 ../common/md5_common.c:156
+#: ../common/parse_manifest.c:157 ../common/parse_manifest.c:852
+#: ../common/psprintf.c:140 ../common/scram-common.c:268 ../port/path.c:829
+#: ../port/path.c:866 ../port/path.c:883 access/transam/twophase.c:1418
+#: access/transam/xlogrecovery.c:571 lib/dshash.c:253 libpq/auth.c:1353
+#: libpq/auth.c:1397 libpq/auth.c:1959 libpq/be-secure-gssapi.c:537
+#: libpq/be-secure-gssapi.c:717 postmaster/bgworker.c:355
+#: postmaster/bgworker.c:1023 postmaster/postmaster.c:3575
+#: postmaster/walsummarizer.c:938
+#: replication/libpqwalreceiver/libpqwalreceiver.c:351
+#: replication/logical/logical.c:212 replication/walsender.c:825
+#: storage/buffer/localbuf.c:745 storage/file/fd.c:909 storage/file/fd.c:1444
+#: storage/file/fd.c:1605 storage/file/fd.c:2589 storage/ipc/procarray.c:1465
+#: storage/ipc/procarray.c:2217 storage/ipc/procarray.c:2224
+#: storage/ipc/procarray.c:2727 storage/ipc/procarray.c:3436
+#: utils/activity/pgstat_shmem.c:535 utils/adt/pg_locale.c:517
+#: utils/adt/pg_locale.c:591 utils/adt/pg_locale_icu.c:358
+#: utils/adt/pg_locale_libc.c:207 utils/adt/pg_locale_libc.c:302
+#: utils/adt/pg_locale_libc.c:390 utils/fmgr/dfmgr.c:234
+#: utils/hash/dynahash.c:517 utils/hash/dynahash.c:617
+#: utils/hash/dynahash.c:1100 utils/mb/mbutils.c:402 utils/mb/mbutils.c:430
+#: utils/mb/mbutils.c:815 utils/mb/mbutils.c:842 utils/misc/guc.c:647
+#: utils/misc/guc.c:672 utils/misc/guc.c:1060 utils/misc/guc.c:4505
+#: utils/misc/tzparser.c:479 utils/mmgr/aset.c:451 utils/mmgr/bump.c:183
+#: utils/mmgr/dsa.c:707 utils/mmgr/dsa.c:729 utils/mmgr/dsa.c:810
+#: utils/mmgr/generation.c:215 utils/mmgr/mcxt.c:1162 utils/mmgr/slab.c:370
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
 #: ../common/cryptohash.c:266 ../common/cryptohash.c:272
 #: ../common/cryptohash_openssl.c:368 ../common/cryptohash_openssl.c:376
-#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:369
-#: ../common/hmac_openssl.c:377
+#: ../common/hmac.c:321 ../common/hmac.c:329 ../common/hmac_openssl.c:351
+#: ../common/hmac_openssl.c:359
 msgid "success"
 msgstr "успіх"
 
 #: ../common/cryptohash.c:268 ../common/cryptohash_openssl.c:370
-#: ../common/hmac_openssl.c:371
+#: ../common/hmac_openssl.c:353
 msgid "destination buffer too small"
 msgstr "буфер призначення занадто малий"
 
-#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:373
+#: ../common/cryptohash_openssl.c:372 ../common/hmac_openssl.c:355
 msgid "OpenSSL failure"
 msgstr "Помилка OpenSSL"
 
@@ -270,34 +273,34 @@ msgstr "неможливо знайти \"%s\" для виконання"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не вдалося знайти абсолютний шлях \"%s\": %m"
 
-#: ../common/exec.c:382 commands/collationcmds.c:876 commands/copyfrom.c:1723
-#: commands/copyto.c:650 libpq/be-secure-common.c:59
+#: ../common/exec.c:363 commands/collationcmds.c:872 commands/copyfrom.c:1863
+#: commands/copyto.c:933 libpq/be-secure-common.c:59
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не вдалося виконати команду \"%s\": %m"
 
-#: ../common/exec.c:394 libpq/be-secure-common.c:71
+#: ../common/exec.c:375 libpq/be-secure-common.c:71
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не вдалося прочитати висновок команди \"%s\": %m"
 
-#: ../common/exec.c:397
+#: ../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не повернула жодних даних"
 
-#: ../common/exec.c:424 libpq/pqcomm.c:192 storage/ipc/latch.c:1169
-#: storage/ipc/latch.c:1349 storage/ipc/latch.c:1582 storage/ipc/latch.c:1744
-#: storage/ipc/latch.c:1870
+#: ../common/exec.c:405 libpq/pqcomm.c:193 storage/ipc/waiteventset.c:783
+#: storage/ipc/waiteventset.c:963 storage/ipc/waiteventset.c:1203
+#: storage/ipc/waiteventset.c:1365 storage/ipc/waiteventset.c:1491
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
 #: ../common/fe_memutils.c:98 ../common/fe_memutils.c:161
-#: ../common/psprintf.c:145 ../port/path.c:753 ../port/path.c:790
-#: ../port/path.c:807 utils/misc/ps_status.c:193 utils/misc/ps_status.c:201
-#: utils/misc/ps_status.c:228 utils/misc/ps_status.c:236
+#: ../common/psprintf.c:142 ../port/path.c:831 ../port/path.c:868
+#: ../port/path.c:885 utils/misc/ps_status.c:195 utils/misc/ps_status.c:203
+#: utils/misc/ps_status.c:230 utils/misc/ps_status.c:238
 #, c-format
 msgid "out of memory\n"
 msgstr "недостатньо пам'яті\n"
@@ -307,51 +310,51 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../common/file_utils.c:76 storage/file/fd.c:3516
+#: ../common/file_utils.c:75 storage/file/fd.c:3578
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../common/file_utils.c:120 ../common/file_utils.c:566
-#: ../common/file_utils.c:570 access/transam/twophase.c:1337
+#: ../common/file_utils.c:123 ../common/file_utils.c:588
+#: ../common/file_utils.c:592 access/transam/twophase.c:1321
 #: access/transam/xlogarchive.c:111 access/transam/xlogarchive.c:235
-#: backup/basebackup.c:355 backup/basebackup.c:553 backup/basebackup.c:624
-#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1749
-#: commands/copyto.c:696 commands/extension.c:3527 commands/tablespace.c:804
-#: commands/tablespace.c:893 postmaster/pgarch.c:680
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:2173
-#: storage/file/fd.c:1968 storage/file/fd.c:2054 storage/file/fd.c:3564
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:257 utils/adt/dbsize.c:337
+#: backup/basebackup.c:357 backup/basebackup.c:555 backup/basebackup.c:626
+#: backup/walsummary.c:247 backup/walsummary.c:254 commands/copyfrom.c:1889
+#: commands/copyto.c:979 commands/extension.c:3820 commands/tablespace.c:804
+#: commands/tablespace.c:893 postmaster/pgarch.c:682
+#: replication/logical/snapbuild.c:1546 replication/logical/snapbuild.c:2073
+#: storage/file/fd.c:1969 storage/file/fd.c:2057 storage/file/fd.c:3626
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:266 utils/adt/dbsize.c:355
 #: utils/adt/genfile.c:437 utils/adt/genfile.c:612 utils/adt/misc.c:340
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../common/file_utils.c:130 ../common/file_utils.c:227
+#: ../common/file_utils.c:133 ../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../common/file_utils.c:151 ../common/file_utils.c:281
+#: ../common/file_utils.c:156 ../common/file_utils.c:304
 #: ../common/pgfnames.c:48 ../common/rmtree.c:63 commands/tablespace.c:728
-#: commands/tablespace.c:738 postmaster/postmaster.c:1468
-#: storage/file/fd.c:2933 storage/file/reinit.c:126 utils/adt/misc.c:256
-#: utils/misc/tzparser.c:339
+#: commands/tablespace.c:738 postmaster/postmaster.c:1496
+#: storage/file/fd.c:2994 storage/file/reinit.c:126 utils/adt/misc.c:256
+#: utils/misc/tzparser.c:340
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../common/file_utils.c:169 ../common/file_utils.c:315
-#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:2945
+#: ../common/file_utils.c:174 ../common/file_utils.c:338
+#: ../common/pgfnames.c:69 ../common/rmtree.c:106 storage/file/fd.c:3006
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../common/file_utils.c:498 access/transam/xlogarchive.c:389
-#: postmaster/pgarch.c:834 postmaster/syslogger.c:1559
-#: replication/logical/snapbuild.c:1831 replication/slot.c:936
-#: replication/slot.c:1998 replication/slot.c:2140 storage/file/fd.c:838
-#: utils/time/snapmgr.c:1255
+#: ../common/file_utils.c:520 access/transam/xlogarchive.c:389
+#: postmaster/pgarch.c:836 postmaster/syslogger.c:1560
+#: replication/logical/snapbuild.c:1708 replication/slot.c:1023
+#: replication/slot.c:2295 replication/slot.c:2444 storage/file/fd.c:835
+#: utils/time/snapmgr.c:1273
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -360,288 +363,292 @@ msgstr "не вдалося перейменувати файл \"%s\" на \"%s
 msgid "internal error"
 msgstr "внутрішня помилка"
 
-#: ../common/jsonapi.c:2121
+#: ../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Рекурсивний спуск не може використовувати інкрементний лексичний аналізатор."
 
-#: ../common/jsonapi.c:2123
+#: ../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "Інкрементний аналізатор потребує Інкрементний лексичний аналізатор."
 
-#: ../common/jsonapi.c:2125
+#: ../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON вкладений занадто глибокий, максимально дозволена глибина - 6400."
 
-#: ../common/jsonapi.c:2127
+#: ../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Неприпустима спеціальна послідовність \"\\%.*s\"."
 
-#: ../common/jsonapi.c:2131
+#: ../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ зі значенням 0x%02x повинен бути пропущений."
 
-#: ../common/jsonapi.c:2135
+#: ../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Очікувався кінець введення, але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2138
+#: ../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Очікувався елемент масиву або \"]\", але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2141
+#: ../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Очікувалось \",\" або \"]\", але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2144
+#: ../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Очікувалось \":\", але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2147
+#: ../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Очікувалось значення JSON, але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2150
+#: ../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Несподіваний кінець вхідного рядка."
 
-#: ../common/jsonapi.c:2152
+#: ../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Очікувався рядок або \"}\", але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2155
+#: ../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Очікувалось \",\" або \"}\", але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2158
+#: ../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Очікувався рядок, але знайдено \"%.*s\"."
 
-#: ../common/jsonapi.c:2161
+#: ../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Неприпустимий маркер \"%.*s\"."
 
-#: ../common/jsonapi.c:2164 jsonpath_scan.l:608
+#: ../common/jsonapi.c:2481 jsonpath_scan.l:585
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 не можна перетворити в текст."
 
-#: ../common/jsonapi.c:2166
+#: ../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" повинні прямувати чотири шістнадцяткових числа."
 
-#: ../common/jsonapi.c:2169
+#: ../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Значення виходу Unicode не можна використовувати для значень кодових точок більше 007F, якщо кодування не UTF8."
 
-#: ../common/jsonapi.c:2178
+#: ../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Значення символу Unicode не вдалося перекласти в кодування сервера %s."
 
-#: ../common/jsonapi.c:2185 jsonpath_scan.l:641
+#: ../common/jsonapi.c:2502 jsonpath_scan.l:618
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Старший сурогат Unicode не повинен прямувати за іншим старшим сурогатом."
 
-#: ../common/jsonapi.c:2187 jsonpath_scan.l:652 jsonpath_scan.l:662
-#: jsonpath_scan.l:713
+#: ../common/jsonapi.c:2504 jsonpath_scan.l:629 jsonpath_scan.l:639
+#: jsonpath_scan.l:691
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Молодший сурогат Unicode не повинен прямувати за іншим молодшим сурогатом."
 
-#: ../common/logging.c:276
+#: ../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "недостатньо пам'яті під час створення опису помилки"
+
+#: ../common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../common/logging.c:283
+#: ../common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../common/logging.c:294
+#: ../common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../common/logging.c:301
+#: ../common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
 
-#: ../common/parse_manifest.c:159 ../common/parse_manifest.c:855
+#: ../common/parse_manifest.c:159 ../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
 msgstr "не вдалося ініціалізувати контрольну суму маніфесту"
 
-#: ../common/parse_manifest.c:204 ../common/parse_manifest.c:261
+#: ../common/parse_manifest.c:203 ../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "маніфест закінчився несподівано"
 
-#: ../common/parse_manifest.c:210 ../common/parse_manifest.c:862
+#: ../common/parse_manifest.c:209 ../common/parse_manifest.c:861
 #, c-format
 msgid "could not update checksum of manifest"
 msgstr "не вдалося оновити контрольну суму маніфесту"
 
-#: ../common/parse_manifest.c:302
+#: ../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "неочікуваний початок об'єкта"
 
-#: ../common/parse_manifest.c:337
+#: ../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "неочікуваний кінець об'єкта"
 
-#: ../common/parse_manifest.c:366
+#: ../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "неочікуваний початок масиву"
 
-#: ../common/parse_manifest.c:391
+#: ../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "неочікуваний кінець масиву"
 
-#: ../common/parse_manifest.c:418
+#: ../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "індикатор очікуваної версії"
 
-#: ../common/parse_manifest.c:454
+#: ../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "нерозпізнане поле верхнього рівня"
 
-#: ../common/parse_manifest.c:473
+#: ../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "неочікуване поле файлу"
 
-#: ../common/parse_manifest.c:487
+#: ../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "неочікуване поле діапазону WAL"
 
-#: ../common/parse_manifest.c:493
+#: ../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "неочікуване поле об'єкта"
 
-#: ../common/parse_manifest.c:583
+#: ../common/parse_manifest.c:582
 msgid "unexpected scalar"
 msgstr "неочікуваний скаляр"
 
-#: ../common/parse_manifest.c:609
+#: ../common/parse_manifest.c:608
 msgid "manifest version not an integer"
 msgstr "версія маніфесту не ціле число"
 
-#: ../common/parse_manifest.c:613
+#: ../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "неочікувана версія маніфесту"
 
-#: ../common/parse_manifest.c:637
+#: ../common/parse_manifest.c:636
 msgid "system identifier in manifest not an integer"
 msgstr "системний ідентифікатор в маніфесті не ціле число"
 
-#: ../common/parse_manifest.c:662
+#: ../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "пропущено шлях"
 
-#: ../common/parse_manifest.c:665
+#: ../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "і ім'я шляху, і закодований шлях"
 
-#: ../common/parse_manifest.c:667
+#: ../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "відсутній розмір"
 
-#: ../common/parse_manifest.c:670
+#: ../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "контрольна сума без алгоритму"
 
-#: ../common/parse_manifest.c:684
+#: ../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "не вдалося декодувати ім'я файлу"
 
-#: ../common/parse_manifest.c:694
+#: ../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "розмір файлу не є цілим числом"
 
-#: ../common/parse_manifest.c:700 backup/basebackup.c:870
+#: ../common/parse_manifest.c:699 backup/basebackup.c:872
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм контрольної суми: \"%s\""
 
-#: ../common/parse_manifest.c:719
+#: ../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "неприпустима контрольна сума для файлу \"%s\": \"%s\""
 
-#: ../common/parse_manifest.c:762
+#: ../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "відсутня часова шкала"
 
-#: ../common/parse_manifest.c:764
+#: ../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "відсутній LSN початку"
 
-#: ../common/parse_manifest.c:766
+#: ../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "відсутній LSN кінця"
 
-#: ../common/parse_manifest.c:772
+#: ../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "часова лінія не є цілим числом"
 
-#: ../common/parse_manifest.c:775
+#: ../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "не вдалося проаналізувати початковий LSN"
 
-#: ../common/parse_manifest.c:778
+#: ../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "не вдалося проаналізувати кінцевий LSN"
 
-#: ../common/parse_manifest.c:843
+#: ../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "очікувалося принаймні 2 рядки"
 
-#: ../common/parse_manifest.c:846
+#: ../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "останній рядок не завершений новим рядком"
 
-#: ../common/parse_manifest.c:865
+#: ../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "не вдалося остаточно завершити контрольну суму маніфесту"
 
-#: ../common/parse_manifest.c:869
+#: ../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "у маніфесті немає контрольної суми"
 
-#: ../common/parse_manifest.c:873
+#: ../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "неприпустима контрольна сума маніфесту: \"%s\""
 
-#: ../common/parse_manifest.c:877
+#: ../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "невідповідність контрольної суми маніфесту"
 
-#: ../common/parse_manifest.c:892
+#: ../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "не вдалося проаналізувати маніфест резервної копії: %s"
 
 #: ../common/percentrepl.c:79 ../common/percentrepl.c:85
 #: ../common/percentrepl.c:118 ../common/percentrepl.c:124
-#: tcop/backend_startup.c:741 utils/misc/guc.c:3167 utils/misc/guc.c:3208
-#: utils/misc/guc.c:3283 utils/misc/guc.c:4671 utils/misc/guc.c:6896
-#: utils/misc/guc.c:6937
+#: tcop/backend_startup.c:769 utils/misc/guc.c:3164 utils/misc/guc.c:3205
+#: utils/misc/guc.c:3280 utils/misc/guc.c:4709 utils/misc/guc.c:6940
+#: utils/misc/guc.c:6981
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "неприпустиме значення параметру \"%s\": \"%s\""
@@ -702,56 +709,61 @@ msgid "could not get exit code from subprocess: error code %lu"
 msgstr "не вдалося отримати код завершення підпроцесу: код помилки %lu"
 
 #: ../common/rmtree.c:97 access/heap/rewriteheap.c:1214
-#: access/transam/twophase.c:1726 access/transam/xlogarchive.c:119
-#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1048
-#: postmaster/syslogger.c:1488 replication/logical/origin.c:591
-#: replication/logical/reorderbuffer.c:4584
-#: replication/logical/snapbuild.c:1712 replication/logical/snapbuild.c:2146
-#: replication/slot.c:2192 storage/file/fd.c:878 storage/file/fd.c:3378
-#: storage/file/fd.c:3440 storage/file/reinit.c:261 storage/ipc/dsm.c:343
-#: storage/smgr/md.c:381 storage/smgr/md.c:440 storage/sync/sync.c:243
-#: utils/time/snapmgr.c:1591
+#: access/transam/twophase.c:1716 access/transam/xlogarchive.c:119
+#: access/transam/xlogarchive.c:399 postmaster/postmaster.c:1069
+#: postmaster/syslogger.c:1489 replication/logical/origin.c:614
+#: replication/logical/reorderbuffer.c:4841
+#: replication/logical/snapbuild.c:1589 replication/logical/snapbuild.c:2045
+#: replication/slot.c:2498 storage/file/fd.c:875 storage/file/fd.c:3440
+#: storage/file/fd.c:3502 storage/file/reinit.c:261 storage/ipc/dsm.c:343
+#: storage/smgr/md.c:401 storage/smgr/md.c:460 storage/sync/sync.c:243
+#: utils/time/snapmgr.c:1609
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "не можливо видалити файл \"%s\": %m"
 
 #: ../common/rmtree.c:124 commands/tablespace.c:767 commands/tablespace.c:780
-#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3370
-#: storage/file/fd.c:3779
+#: commands/tablespace.c:815 commands/tablespace.c:905 storage/file/fd.c:3432
+#: storage/file/fd.c:3841
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "не вдалося видалити каталог \"%s\": %m"
 
-#: ../common/scram-common.c:282
+#: ../common/scram-common.c:281
 msgid "could not encode salt"
 msgstr "не вдалося закодувати сіль"
 
-#: ../common/scram-common.c:298
+#: ../common/scram-common.c:297
 msgid "could not encode stored key"
 msgstr "на вдалося закодувати збережений ключ"
 
-#: ../common/scram-common.c:315
+#: ../common/scram-common.c:314
 msgid "could not encode server key"
 msgstr "не вдалося закодувати серверний ключ"
 
-#: ../common/stringinfo.c:315
+#: ../common/stringinfo.c:362
+#, c-format
+msgid "string buffer exceeds maximum allowed length (%zu bytes)"
+msgstr "рядковий буфер перевищує максимально дозволену довжину (%zu байт)"
+
+#: ../common/stringinfo.c:363
 #, c-format
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "Не вдалося збільшити рядковий буфер (містить: %d байтів, потребувалось: %d байтів)."
 
-#: ../common/stringinfo.c:319
+#: ../common/stringinfo.c:367
 #, c-format
-msgid "out of memory\n\n"
+msgid "string buffer exceeds maximum allowed length (%zu bytes)\n\n"
 "Cannot enlarge string buffer containing %d bytes by %d more bytes.\n"
-msgstr "недостатньо пам'яті\n\n"
-"Неможливо збільшити рядковий буфер (містить: %d байт, потребувалось: %d байт).\n"
+msgstr "рядковий буфер перевищує максимально дозволену довжину (%zu байт)\n\n"
+"Не вдалося збільшити рядковий буфер (містить %d байт) на %d байт.\n"
 
 #: ../common/username.c:43
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
 msgstr "не можу знайти користувача з ефективним ID %ld: %s"
 
-#: ../common/username.c:45 libpq/auth.c:1888
+#: ../common/username.c:45
 msgid "user does not exist"
 msgstr "користувача не існує"
 
@@ -790,12 +802,12 @@ msgstr "дочірній процес перервано через сигнал
 msgid "child process exited with unrecognized status %d"
 msgstr "дочірній процес завершився з невизнаним статусом %d"
 
-#: ../port/chklocale.c:283
+#: ../port/chklocale.c:280
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "не вдалося визначити кодування для набору символів \"%s\""
 
-#: ../port/chklocale.c:404 ../port/chklocale.c:410
+#: ../port/chklocale.c:370 ../port/chklocale.c:376
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr "не вдалося визначити кодування для докалі \"%s\": набір символів \"%s\""
@@ -820,30 +832,30 @@ msgstr "не вдалося встановити сполучення для \"%
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не вдалося встановити сполучення для \"%s\": %s\n"
 
-#: ../port/open.c:115
+#: ../port/open.c:125
 #, c-format
 msgid "could not open file \"%s\": %s"
 msgstr "не вдалося відкрити файл \"%s\": %s"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "lock violation"
 msgstr "порушення блокування"
 
-#: ../port/open.c:116
+#: ../port/open.c:126
 msgid "sharing violation"
 msgstr "порушення спільного доступу"
 
-#: ../port/open.c:117
+#: ../port/open.c:127
 #, c-format
 msgid "Continuing to retry for 30 seconds."
 msgstr "Продовжую спроби протягом 30 секунд."
 
-#: ../port/open.c:118
+#: ../port/open.c:128
 #, c-format
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "Ви можливо маєте антивірус, резервне копіювання або аналогічне програмне забезпечення, що втручається у роботу системи бази даних."
 
-#: ../port/path.c:775
+#: ../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "не вдалося отримати поточний робочий каталог: %m\n"
@@ -853,16 +865,6 @@ msgstr "не вдалося отримати поточний робочий к
 msgid "operating system error %d"
 msgstr "помилка операційної системи %d"
 
-#: ../port/user.c:43 ../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "не вдалося знайти локального користувача з ідентифікатором %d: %s"
-
-#: ../port/user.c:48 ../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локального користувача з ідентифікатором %d не існує"
-
 #: ../port/win32security.c:62
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
@@ -878,48 +880,50 @@ msgstr "не вдалося отримати SID для групи PowerUsers: 
 msgid "could not check access token membership: error code %lu\n"
 msgstr "не вдається перевірити членство токену доступу: код помилки %lu\n"
 
-#: access/brin/brin.c:405
+#: access/brin/brin.c:414
 #, c-format
 msgid "request for BRIN range summarization for index \"%s\" page %u was not recorded"
 msgstr "запит на підсумок діапазону BRIN для індексу «%s» сторінки %u не вдалося записати"
 
-#: access/brin/brin.c:1385 access/brin/brin.c:1493 access/gin/ginfast.c:1040
-#: access/transam/xlogfuncs.c:183 access/transam/xlogfuncs.c:208
-#: access/transam/xlogfuncs.c:241 access/transam/xlogfuncs.c:280
-#: access/transam/xlogfuncs.c:301 access/transam/xlogfuncs.c:322
-#: access/transam/xlogfuncs.c:388 access/transam/xlogfuncs.c:446
+#: access/brin/brin.c:1397 access/brin/brin.c:1504 access/gin/ginfast.c:1040
+#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:209
+#: access/transam/xlogfuncs.c:242 access/transam/xlogfuncs.c:281
+#: access/transam/xlogfuncs.c:302 access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:389 access/transam/xlogfuncs.c:447
+#: statistics/attribute_stats.c:191 statistics/attribute_stats.c:936
+#: statistics/relation_stats.c:97
 #, c-format
 msgid "recovery is in progress"
 msgstr "відновлення у процесі"
 
-#: access/brin/brin.c:1386 access/brin/brin.c:1494
+#: access/brin/brin.c:1398 access/brin/brin.c:1505
 #, c-format
 msgid "BRIN control functions cannot be executed during recovery."
 msgstr "Контрольна функція BRIN не може бути виконана під час відновлення."
 
-#: access/brin/brin.c:1391 access/brin/brin.c:1499
+#: access/brin/brin.c:1403 access/brin/brin.c:1510
 #, c-format
-msgid "block number out of range: %lld"
-msgstr "номер блоку поза діапазоном: %lld"
+msgid "block number out of range: %<PRId64>"
+msgstr "номер блоку поза межами: %<PRId64>"
 
-#: access/brin/brin.c:1436 access/brin/brin.c:1525
+#: access/brin/brin.c:1447 access/brin/brin.c:1536
 #, c-format
 msgid "\"%s\" is not a BRIN index"
 msgstr "\"%s\" не є індексом BRIN"
 
-#: access/brin/brin.c:1452 access/brin/brin.c:1541
+#: access/brin/brin.c:1463 access/brin/brin.c:1552
 #, c-format
 msgid "could not open parent table of index \"%s\""
 msgstr "не вдалося відкрити батьківську таблицю індексу \"%s\""
 
-#: access/brin/brin.c:1461 access/brin/brin.c:1557 access/gin/ginfast.c:1085
-#: parser/parse_utilcmd.c:2277
+#: access/brin/brin.c:1472 access/brin/brin.c:1568 access/gin/ginfast.c:1085
+#: parser/parse_utilcmd.c:2454
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "індекс \"%s\" не є припустимим"
 
-#: access/brin/brin_bloom.c:783 access/brin/brin_bloom.c:825
-#: access/brin/brin_minmax_multi.c:2993 access/brin/brin_minmax_multi.c:3130
+#: access/brin/brin_bloom.c:784 access/brin/brin_bloom.c:826
+#: access/brin/brin_minmax_multi.c:2984 access/brin/brin_minmax_multi.c:3121
 #: statistics/dependencies.c:661 statistics/dependencies.c:714
 #: statistics/mcv.c:1480 statistics/mcv.c:1511 statistics/mvdistinct.c:343
 #: statistics/mvdistinct.c:396 utils/adt/pseudotypes.c:40
@@ -930,7 +934,7 @@ msgstr "не можна прийняти значення типу %s"
 
 #: access/brin/brin_pageops.c:75 access/brin/brin_pageops.c:361
 #: access/brin/brin_pageops.c:851 access/gin/ginentrypage.c:109
-#: access/gist/gist.c:1463 access/spgist/spgdoinsert.c:2001
+#: access/gist/gist.c:1475 access/spgist/spgdoinsert.c:2001
 #: access/spgist/spgdoinsert.c:2278
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
@@ -946,90 +950,90 @@ msgstr "пошкоджений BRIN індекс: несумісна карта
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "неочікуваний тип сторінки 0x%04X в BRIN індексі \"%s\" блокує %u"
 
-#: access/brin/brin_validate.c:118 access/gin/ginvalidate.c:149
-#: access/gist/gistvalidate.c:152 access/hash/hashvalidate.c:139
-#: access/nbtree/nbtvalidate.c:120 access/spgist/spgvalidate.c:189
+#: access/brin/brin_validate.c:111 access/gin/ginvalidate.c:142
+#: access/gist/gistvalidate.c:150 access/hash/hashvalidate.c:112
+#: access/nbtree/nbtvalidate.c:116 access/spgist/spgvalidate.c:181
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with invalid support number %d"
 msgstr "сімейство операторів \"%s\" методу доступу %s містить функцію %s з недопустимим номером підтримки %d"
 
-#: access/brin/brin_validate.c:134 access/gin/ginvalidate.c:161
-#: access/gist/gistvalidate.c:164 access/hash/hashvalidate.c:118
-#: access/nbtree/nbtvalidate.c:132 access/spgist/spgvalidate.c:201
+#: access/brin/brin_validate.c:127 access/gin/ginvalidate.c:154
+#: access/gist/gistvalidate.c:162 access/hash/hashvalidate.c:124
+#: access/nbtree/nbtvalidate.c:128 access/spgist/spgvalidate.c:193
 #, c-format
 msgid "operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d"
 msgstr "сімейство операторів \"%s\" з доступом %s містить функцію %s з неправильним підписом для номеру підтримки %d"
 
-#: access/brin/brin_validate.c:156 access/gin/ginvalidate.c:180
-#: access/gist/gistvalidate.c:184 access/hash/hashvalidate.c:160
-#: access/nbtree/nbtvalidate.c:152 access/spgist/spgvalidate.c:221
+#: access/brin/brin_validate.c:149 access/gin/ginvalidate.c:173
+#: access/gist/gistvalidate.c:182 access/hash/hashvalidate.c:150
+#: access/nbtree/nbtvalidate.c:148 access/spgist/spgvalidate.c:213
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d"
 msgstr "сімейство операторів \"%s\" з доступом %s містить оператор %s з недопустимим стратегічним номером %d"
 
-#: access/brin/brin_validate.c:185 access/gin/ginvalidate.c:193
-#: access/hash/hashvalidate.c:173 access/nbtree/nbtvalidate.c:165
-#: access/spgist/spgvalidate.c:237
+#: access/brin/brin_validate.c:178 access/gin/ginvalidate.c:186
+#: access/hash/hashvalidate.c:163 access/nbtree/nbtvalidate.c:161
+#: access/spgist/spgvalidate.c:229
 #, c-format
 msgid "operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s"
 msgstr "сімейство операторів \"%s\" з доступом %s містить некоректну специфікацію ORDER BY для оператора %s"
 
-#: access/brin/brin_validate.c:198 access/gin/ginvalidate.c:206
-#: access/gist/gistvalidate.c:232 access/hash/hashvalidate.c:186
-#: access/nbtree/nbtvalidate.c:178 access/spgist/spgvalidate.c:253
+#: access/brin/brin_validate.c:191 access/gin/ginvalidate.c:199
+#: access/gist/gistvalidate.c:230 access/hash/hashvalidate.c:176
+#: access/nbtree/nbtvalidate.c:174 access/spgist/spgvalidate.c:245
 #, c-format
 msgid "operator family \"%s\" of access method %s contains operator %s with wrong signature"
 msgstr "сімейство операторів \"%s\" з доступом %s містить оператор %s з неправильним підписом"
 
-#: access/brin/brin_validate.c:236 access/hash/hashvalidate.c:226
-#: access/nbtree/nbtvalidate.c:236 access/spgist/spgvalidate.c:280
+#: access/brin/brin_validate.c:229 access/hash/hashvalidate.c:216
+#: access/nbtree/nbtvalidate.c:232 access/spgist/spgvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing operator(s) for types %s and %s"
 msgstr "сімейство операторів \"%s\" методу доступу %s не містить операторів для типів %s і %s"
 
-#: access/brin/brin_validate.c:246
+#: access/brin/brin_validate.c:239
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function(s) for types %s and %s"
 msgstr "сімейство операторів \"%s\" з методом доступа %s не містить функцію підтримки для типів %s і %s"
 
-#: access/brin/brin_validate.c:259 access/hash/hashvalidate.c:240
-#: access/nbtree/nbtvalidate.c:260 access/spgist/spgvalidate.c:315
+#: access/brin/brin_validate.c:252 access/hash/hashvalidate.c:230
+#: access/nbtree/nbtvalidate.c:256 access/spgist/spgvalidate.c:307
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing operator(s)"
 msgstr "клас операторів \"%s\" з методом доступа %s не має операторів"
 
-#: access/brin/brin_validate.c:270 access/gin/ginvalidate.c:248
-#: access/gist/gistvalidate.c:273
+#: access/brin/brin_validate.c:263 access/gin/ginvalidate.c:241
+#: access/gist/gistvalidate.c:272
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d"
 msgstr "клас операторів \"%s\" з доступом %s немає функції підтримки %d"
 
-#: access/common/attmap.c:121
+#: access/common/attmap.c:118
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Повернений тип %s не відповідає очікуваному типу %s в стовпці %d."
+msgid "Returned type %s does not match expected type %s in column \"%s\" (position %d)."
+msgstr "Повернений тип %s не відповідає очікуваному типу %s у стовпці \"%s\" (позиція %d)."
 
-#: access/common/attmap.c:149
+#: access/common/attmap.c:147
 #, c-format
 msgid "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "Кількість повернених стовпців (%d) не відповідає очікуваній кількості стовпців (%d)."
 
-#: access/common/attmap.c:233 access/common/attmap.c:245
+#: access/common/attmap.c:231 access/common/attmap.c:243
 #, c-format
 msgid "could not convert row type"
 msgstr "неможливо конвертувати тип рядка"
 
-#: access/common/attmap.c:234
+#: access/common/attmap.c:232
 #, c-format
 msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
 msgstr "Атрибут \"%s\" типу %s не збігається з відповідним атрибутом типу %s."
 
-#: access/common/attmap.c:246
+#: access/common/attmap.c:244
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "Атрибут \"%s\" типу %s не існує в типі %s."
 
-#: access/common/heaptuple.c:1132 access/common/heaptuple.c:1467
+#: access/common/heaptuple.c:1133 access/common/heaptuple.c:1472
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "кількість стовпців (%d) перевищує обмеження (%d)"
@@ -1039,96 +1043,101 @@ msgstr "кількість стовпців (%d) перевищує обмеже
 msgid "number of index columns (%d) exceeds limit (%d)"
 msgstr "кількість індексних стовпців (%d) перевищує обмеження (%d)"
 
-#: access/common/indextuple.c:209 access/spgist/spgutils.c:970
+#: access/common/indextuple.c:209 access/spgist/spgutils.c:978
 #, c-format
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "індексний рядок вимагає %zu байтів, максимальний розмір %zu"
 
-#: access/common/printtup.c:292 commands/explain.c:5376 tcop/fastpath.c:107
-#: tcop/fastpath.c:454 tcop/postgres.c:1956
+#: access/common/printtup.c:292 commands/explain_dr.c:94 tcop/fastpath.c:106
+#: tcop/fastpath.c:453 tcop/postgres.c:1950
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "цей формат коду не підтримується:%d"
 
-#: access/common/reloptions.c:519 access/common/reloptions.c:530
+#: access/common/reloptions.c:530 access/common/reloptions.c:541
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
 msgstr "Дійсні значення \"увімкнено\", \"вимкнено\" та \"автоматично\"."
 
-#: access/common/reloptions.c:541
+#: access/common/reloptions.c:552
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Припустимі значення лише \"local\" і \"cascaded\"."
 
-#: access/common/reloptions.c:689
+#: access/common/reloptions.c:700
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "перевищено встановлене користувачем обмеження типу параметрів відношення"
 
-#: access/common/reloptions.c:1231
+#: access/common/reloptions.c:1242
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "RESET не має містити значення для параметрів"
 
-#: access/common/reloptions.c:1263
+#: access/common/reloptions.c:1275
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "нерозпізнаний параметр простору імен \"%s\""
 
-#: access/common/reloptions.c:1300 commands/variable.c:1191
+#: access/common/reloptions.c:1305 commands/foreigncmds.c:86
+#, c-format
+msgid "invalid option name \"%s\": must not contain \"=\""
+msgstr "неприпустиме ім'я параметра \"%s\": не може містити \"=\""
+
+#: access/common/reloptions.c:1320 commands/variable.c:1240
 #, c-format
 msgid "tables declared WITH OIDS are not supported"
 msgstr "таблиці, позначені WITH OIDS, не підтримуються"
 
-#: access/common/reloptions.c:1468
+#: access/common/reloptions.c:1488
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "нерозпізнаний параметр \"%s\""
 
-#: access/common/reloptions.c:1580
+#: access/common/reloptions.c:1600
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "параметр «%s» вказано кілька разів"
 
-#: access/common/reloptions.c:1596
+#: access/common/reloptions.c:1616
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "неприпустиме значення для булевого параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1608
+#: access/common/reloptions.c:1628
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "неприпустиме значення для цілого параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1614 access/common/reloptions.c:1634
+#: access/common/reloptions.c:1634 access/common/reloptions.c:1654
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "значення %s поза допустимими межами для параметра \"%s\""
 
-#: access/common/reloptions.c:1616
+#: access/common/reloptions.c:1636
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Припустимі значення знаходяться між \"%d\" і \"%d\"."
 
-#: access/common/reloptions.c:1628
+#: access/common/reloptions.c:1648
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "неприпустиме значення для числа з плавучою точкою параметра \"%s\": %s"
 
-#: access/common/reloptions.c:1636
+#: access/common/reloptions.c:1656
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Припустимі значення знаходяться між \"%f\" і \"%f\"."
 
-#: access/common/reloptions.c:1658
+#: access/common/reloptions.c:1678
 #, c-format
 msgid "invalid value for enum option \"%s\": %s"
 msgstr "недійсне значення для параметра перерахування \"%s\": %s"
 
-#: access/common/reloptions.c:1989
+#: access/common/reloptions.c:2025
 #, c-format
 msgid "cannot specify storage parameters for a partitioned table"
 msgstr "неможливо вказати параметри сховища для секціонованої таблиці"
 
-#: access/common/reloptions.c:1990
+#: access/common/reloptions.c:2026
 #, c-format
 msgid "Specify storage parameters for its leaf partitions instead."
 msgstr "Вкажіть параметри сховища для табличних розділів."
@@ -1173,52 +1182,53 @@ msgstr "доступ до тимчасових індексів з інших с
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "не вдалося повторно знайти кортеж в межах індексу \"%s\""
 
-#: access/gin/ginscan.c:431
+#: access/gin/gininsert.c:1310 access/gin/ginutil.c:152
+#: executor/execExpr.c:2244 utils/adt/array_userfuncs.c:1963
+#: utils/adt/arrayfuncs.c:4028 utils/adt/arrayfuncs.c:6726
+#: utils/adt/rowtypes.c:974
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "не вдалося визначити порівняльну функцію для типу %s"
+
+#: access/gin/ginscan.c:480
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "старі індекси GIN не підтримують сканування цілого індексу й пошуки значення null"
 
-#: access/gin/ginscan.c:432
+#: access/gin/ginscan.c:481
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Щоб виправити це, зробіть REINDEX INDEX \"%s\"."
 
-#: access/gin/ginutil.c:147 executor/execExpr.c:2192
-#: utils/adt/arrayfuncs.c:4016 utils/adt/arrayfuncs.c:6712
-#: utils/adt/rowtypes.c:974
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "не вдалося визначити порівняльну функцію для типу %s"
-
-#: access/gin/ginvalidate.c:90 access/gist/gistvalidate.c:92
-#: access/hash/hashvalidate.c:102 access/spgist/spgvalidate.c:102
+#: access/gin/ginvalidate.c:83 access/gist/gistvalidate.c:84
+#: access/hash/hashvalidate.c:89 access/spgist/spgvalidate.c:94
 #, c-format
 msgid "operator family \"%s\" of access method %s contains support function %s with different left and right input types"
 msgstr "сімейство операторів \"%s\" з методом доступу %s містить функцію підтримки %s з різними типами вводу зліва і справа"
 
-#: access/gin/ginvalidate.c:258
+#: access/gin/ginvalidate.c:251
 #, c-format
 msgid "operator class \"%s\" of access method %s is missing support function %d or %d"
 msgstr "клас операторів \"%s\" з методом доступу %s не має функції підтримки %d або %d"
 
-#: access/gin/ginvalidate.c:331 access/gist/gistvalidate.c:349
-#: access/spgist/spgvalidate.c:387
+#: access/gin/ginvalidate.c:323 access/gist/gistvalidate.c:348
+#: access/spgist/spgvalidate.c:378
 #, c-format
 msgid "support function number %d is invalid for access method %s"
 msgstr "номер функції підтримки %d неприпустимий для методу доступу %s"
 
-#: access/gist/gist.c:760 access/gist/gistvacuum.c:426
+#: access/gist/gist.c:765 access/gist/gistvacuum.c:463
 #, c-format
 msgid "index \"%s\" contains an inner tuple marked as invalid"
 msgstr "індекс \"%s\" містить внутрішній кортеж, позначений як неправильний"
 
-#: access/gist/gist.c:762 access/gist/gistvacuum.c:428
+#: access/gist/gist.c:767 access/gist/gistvacuum.c:465
 #, c-format
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "Це викликано неповним поділом сторінки під час відновлення перед покращенням до версії PostgreSQL 9.1."
 
-#: access/gist/gist.c:763 access/gist/gistutil.c:800 access/gist/gistutil.c:811
-#: access/gist/gistvacuum.c:429 access/hash/hashutil.c:226
+#: access/gist/gist.c:768 access/gist/gistutil.c:801 access/gist/gistutil.c:812
+#: access/gist/gistvacuum.c:466 access/hash/hashutil.c:226
 #: access/hash/hashutil.c:237 access/hash/hashutil.c:249
 #: access/hash/hashutil.c:270 access/nbtree/nbtpage.c:813
 #: access/nbtree/nbtpage.c:824
@@ -1226,7 +1236,7 @@ msgstr "Це викликано неповним поділом сторінки
 msgid "Please REINDEX it."
 msgstr "Будь ласка, виконайте REINDEX."
 
-#: access/gist/gist.c:1196
+#: access/gist/gist.c:1208
 #, c-format
 msgid "fixing incomplete split in index \"%s\", block %u"
 msgstr "виправлення неповного розділу в індексі \"%s\", блок %u"
@@ -1241,41 +1251,42 @@ msgstr "помилка методу picksplit для стовпця %d інде
 msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
 msgstr "Індекс не є оптимальним. Щоб оптимізувати його, зв'яжіться з розробником або спробуйте використати стовпець як другий індекс у команді CREATE INDEX."
 
-#: access/gist/gistutil.c:797 access/hash/hashutil.c:223
+#: access/gist/gistutil.c:798 access/hash/hashutil.c:223
 #: access/nbtree/nbtpage.c:810
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
 msgstr "індекс \"%s\" містить неочікувану нульову сторінку в блоці %u"
 
-#: access/gist/gistutil.c:808 access/hash/hashutil.c:234
+#: access/gist/gistutil.c:809 access/hash/hashutil.c:234
 #: access/hash/hashutil.c:246 access/nbtree/nbtpage.c:821
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "індекс \"%s\" містить пошкоджену сторінку в блоці %u"
 
-#: access/gist/gistvalidate.c:202
+#: access/gist/gistvalidate.c:200
 #, c-format
 msgid "operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s"
 msgstr "сімейство операторів \"%s\" з методом доступу %s містить непідтримувану для оператора специфікацію ORDER BY  %s"
 
-#: access/gist/gistvalidate.c:213
+#: access/gist/gistvalidate.c:211
 #, c-format
 msgid "operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s"
 msgstr "сімейство операторів \"%s\" з методом доступу %s містить некоректну для оператора специфікацію ORDER BY opfamily  %s"
 
-#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:333
-#: utils/adt/varchar.c:1008 utils/adt/varchar.c:1065
+#: access/hash/hashfunc.c:277 access/hash/hashfunc.c:332
+#: utils/adt/varchar.c:1000 utils/adt/varchar.c:1056
 #, c-format
 msgid "could not determine which collation to use for string hashing"
 msgstr "не вдалося визначити, який параметр сортування використати для обчислення хешу рядків"
 
-#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:334 catalog/heap.c:672
-#: catalog/heap.c:678 commands/createas.c:201 commands/createas.c:508
-#: commands/indexcmds.c:2048 commands/tablecmds.c:18068 commands/view.c:81
-#: regex/regc_pg_locale.c:245 utils/adt/formatting.c:1653
-#: utils/adt/formatting.c:1801 utils/adt/formatting.c:1991 utils/adt/like.c:189
-#: utils/adt/like_support.c:1024 utils/adt/varchar.c:738
-#: utils/adt/varchar.c:1009 utils/adt/varchar.c:1066 utils/adt/varlena.c:1521
+#: access/hash/hashfunc.c:278 access/hash/hashfunc.c:333 catalog/heap.c:688
+#: catalog/heap.c:694 commands/createas.c:203 commands/createas.c:515
+#: commands/indexcmds.c:2090 commands/tablecmds.c:19987 commands/view.c:80
+#: regex/regc_pg_locale.c:242 utils/adt/formatting.c:1655
+#: utils/adt/formatting.c:1719 utils/adt/formatting.c:1783
+#: utils/adt/formatting.c:1847 utils/adt/like.c:163 utils/adt/like.c:194
+#: utils/adt/like_support.c:1020 utils/adt/varchar.c:738
+#: utils/adt/varchar.c:1001 utils/adt/varchar.c:1057 utils/adt/varlena.c:1603
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Використайте опцію COLLATE для задання параметрів сортування."
@@ -1286,7 +1297,7 @@ msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "індексний рядок розміру %zu перевищує максимальний хеш %zu"
 
 #: access/hash/hashinsert.c:86 access/spgist/spgdoinsert.c:2005
-#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1031
+#: access/spgist/spgdoinsert.c:2282 access/spgist/spgutils.c:1039
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
 msgstr "Значення, що перевищують буфер сторінки, не можна індексувати."
@@ -1301,7 +1312,7 @@ msgstr "недійсний номер блока переповнення %u"
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "закінчились переповнені сторінки в хеш-індексі \"%s\""
 
-#: access/hash/hashsearch.c:311
+#: access/hash/hashsearch.c:313
 #, c-format
 msgid "hash indexes do not support whole-index scans"
 msgstr "хеш-індекси не підтримують сканування цілого індексу"
@@ -1316,48 +1327,54 @@ msgstr "індекс \"%s\" не є хеш-індексом"
 msgid "index \"%s\" has wrong hash version"
 msgstr "індекс \"%s\" має неправильну версію хешу"
 
-#: access/hash/hashvalidate.c:198
+#: access/hash/hashvalidate.c:188
 #, c-format
 msgid "operator family \"%s\" of access method %s lacks support function for operator %s"
 msgstr "сімейство операторів \"%s\" з методом доступу %s не містить функції підтримки для оператора %s"
 
-#: access/hash/hashvalidate.c:256 access/nbtree/nbtvalidate.c:276
+#: access/hash/hashvalidate.c:246 access/nbtree/nbtvalidate.c:272
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing cross-type operator(s)"
 msgstr "сімейство операторів \"%s\" з методом доступу %s не містить міжтипового оператора (ів)"
 
-#: access/heap/heapam.c:2195
+#: access/heap/heapam.c:2283
 #, c-format
 msgid "cannot insert tuples in a parallel worker"
 msgstr "не вдалося вставити кортежі в паралельного працівника"
 
-#: access/heap/heapam.c:2714
+#: access/heap/heapam.c:2806
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "не вдалося видалити кортежі під час паралельної операції"
 
-#: access/heap/heapam.c:2761
+#: access/heap/heapam.c:2853
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "спроба видалити невидимий кортеж"
 
-#: access/heap/heapam.c:3209 access/heap/heapam.c:6082
+#: access/heap/heapam.c:3303 access/index/genam.c:829
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "неможливо оновити кортежі під час паралельної операції"
 
-#: access/heap/heapam.c:3337
+#: access/heap/heapam.c:3480
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "спроба оновити невидимий кортеж"
 
-#: access/heap/heapam.c:4726 access/heap/heapam.c:4764
-#: access/heap/heapam.c:5029 access/heap/heapam_handler.c:468
+#: access/heap/heapam.c:4993 access/heap/heapam.c:5031
+#: access/heap/heapam.c:5298 access/heap/heapam_handler.c:470
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "не вдалося отримати блокування у рядку стосовно \"%s\""
 
-#: access/heap/heapam_handler.c:413
+#: access/heap/heapam.c:6425 commands/trigger.c:3401
+#: executor/nodeModifyTable.c:2568 executor/nodeModifyTable.c:2658
+#, c-format
+msgid "tuple to be updated was already modified by an operation triggered by the current command"
+msgstr "кортеж, який повинен бути оновленим, вже змінений в операції, яка викликана поточною командою"
+
+#: access/heap/heapam_handler.c:415
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update"
 msgstr "кортеж, який підлягає блокуванню, вже був переміщений до іншої секції в результаті паралельного оновлення"
@@ -1374,14 +1391,14 @@ msgstr "не вдалося записати до файлу \"%s\", запис
 
 #: access/heap/rewriteheap.c:977 access/heap/rewriteheap.c:1094
 #: access/transam/timeline.c:329 access/transam/timeline.c:481
-#: access/transam/xlog.c:3254 access/transam/xlog.c:3445
-#: access/transam/xlog.c:4282 access/transam/xlog.c:9244
-#: access/transam/xlogfuncs.c:692 backup/basebackup_server.c:149
-#: backup/basebackup_server.c:242 commands/dbcommands.c:494
-#: postmaster/launch_backend.c:340 postmaster/postmaster.c:4112
-#: postmaster/walsummarizer.c:1212 replication/logical/origin.c:603
-#: replication/slot.c:2059 storage/file/copydir.c:157 storage/smgr/md.c:230
-#: utils/time/snapmgr.c:1234
+#: access/transam/xlog.c:3240 access/transam/xlog.c:3448
+#: access/transam/xlog.c:4312 access/transam/xlog.c:9327
+#: access/transam/xlogfuncs.c:693 backup/basebackup_server.c:149
+#: backup/basebackup_server.c:242 commands/dbcommands.c:495
+#: postmaster/launch_backend.c:354 postmaster/postmaster.c:4092
+#: postmaster/walsummarizer.c:1215 replication/logical/origin.c:626
+#: replication/slot.c:2356 storage/file/copydir.c:173
+#: storage/file/copydir.c:261 storage/smgr/md.c:252 utils/time/snapmgr.c:1252
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "неможливо створити файл \"%s\": %m"
@@ -1393,229 +1410,244 @@ msgstr "не вдалося скоротити файл \"%s\" до потріб
 
 #: access/heap/rewriteheap.c:1122 access/transam/timeline.c:384
 #: access/transam/timeline.c:424 access/transam/timeline.c:498
-#: access/transam/xlog.c:3304 access/transam/xlog.c:3501
-#: access/transam/xlog.c:4294 commands/dbcommands.c:506
-#: postmaster/launch_backend.c:351 postmaster/launch_backend.c:363
-#: replication/logical/origin.c:615 replication/logical/origin.c:657
-#: replication/logical/origin.c:676 replication/logical/snapbuild.c:1788
-#: replication/slot.c:2094 storage/file/buffile.c:545
-#: storage/file/copydir.c:197 utils/init/miscinit.c:1601
-#: utils/init/miscinit.c:1612 utils/init/miscinit.c:1620 utils/misc/guc.c:4450
-#: utils/misc/guc.c:4481 utils/misc/guc.c:5634 utils/misc/guc.c:5652
-#: utils/time/snapmgr.c:1239 utils/time/snapmgr.c:1246
+#: access/transam/xlog.c:3301 access/transam/xlog.c:3504
+#: access/transam/xlog.c:4324 commands/dbcommands.c:507
+#: postmaster/launch_backend.c:365 postmaster/launch_backend.c:377
+#: replication/logical/origin.c:638 replication/logical/origin.c:680
+#: replication/logical/origin.c:699 replication/logical/snapbuild.c:1665
+#: replication/slot.c:2392 storage/file/buffile.c:545
+#: storage/file/copydir.c:213 utils/init/miscinit.c:1661
+#: utils/init/miscinit.c:1672 utils/init/miscinit.c:1680 utils/misc/guc.c:4488
+#: utils/misc/guc.c:4519 utils/misc/guc.c:5678 utils/misc/guc.c:5696
+#: utils/time/snapmgr.c:1257 utils/time/snapmgr.c:1264
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "неможливо записати до файлу \"%s\": %m"
 
-#: access/heap/vacuumlazy.c:473
+#: access/heap/vacuumlazy.c:815
 #, c-format
 msgid "aggressively vacuuming \"%s.%s.%s\""
 msgstr "агресивне очищення \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:478
+#: access/heap/vacuumlazy.c:820
 #, c-format
 msgid "vacuuming \"%s.%s.%s\""
 msgstr "очищення \"%s.%s.%s\""
 
-#: access/heap/vacuumlazy.c:626
+#: access/heap/vacuumlazy.c:988
 #, c-format
 msgid "finished vacuuming \"%s.%s.%s\": index scans: %d\n"
 msgstr "очищення закінчено \"%s.%s.%s\": сканувань індексу: %d\n"
 
-#: access/heap/vacuumlazy.c:637
+#: access/heap/vacuumlazy.c:999
 #, c-format
 msgid "automatic aggressive vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "автоматичний агресивний вакуум для запобігання зацикленню таблиці \"%s.%s.%s\": сканування індексу: %d\n"
 
-#: access/heap/vacuumlazy.c:639
+#: access/heap/vacuumlazy.c:1001
 #, c-format
 msgid "automatic vacuum to prevent wraparound of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "автоматичне очищення для запобігання зацикленню таблиці  \"%s.%s.%s\": сканування індексу: %d\n"
 
-#: access/heap/vacuumlazy.c:644
+#: access/heap/vacuumlazy.c:1006
 #, c-format
 msgid "automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "автоматична агресивне очищення таблиці \"%s.%s.%s\": сканувань індексу: %d\n"
 
-#: access/heap/vacuumlazy.c:646
+#: access/heap/vacuumlazy.c:1008
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "автоматичне очищення таблиці \"%s.%s.%s\": сканувань індексу: %d\n"
 
-#: access/heap/vacuumlazy.c:653
+#: access/heap/vacuumlazy.c:1015
 #, c-format
-msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total)\n"
-msgstr "сторінок: %u видалено, %u залишилось, %u відскановано (%.2f%% від загальної кількості)\n"
+msgid "pages: %u removed, %u remain, %u scanned (%.2f%% of total), %u eagerly scanned\n"
+msgstr "сторінки: %u вилучено, %u залишилось, %u скановано (%.2f%% від загальної), %u скановано активно\n"
 
-#: access/heap/vacuumlazy.c:660
+#: access/heap/vacuumlazy.c:1024
 #, c-format
-msgid "tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"
-msgstr "кортежів: %lld видалено, %lld залишилось, %lld мертвих, але все ще не можуть бути видаленні\n"
+msgid "tuples: %<PRId64> removed, %<PRId64> remain, %<PRId64> are dead but not yet removable\n"
+msgstr "кортежі: %<PRId64> вилучено, %<PRId64> залишилось, %<PRId64> мертві, але ще не можуть бути вилучені\n"
 
-#: access/heap/vacuumlazy.c:666
+#: access/heap/vacuumlazy.c:1030
 #, c-format
-msgid "tuples missed: %lld dead from %u pages not removed due to cleanup lock contention\n"
-msgstr "пропущено кортежів: %lld померлих з %u сторінок не видалено через очищення блокування\n"
+msgid "tuples missed: %<PRId64> dead from %u pages not removed due to cleanup lock contention\n"
+msgstr "пропущено кортежів: %<PRId64> мертвих з %u сторінок не вилучено через конкуренцію за блокування очищення\n"
 
-#: access/heap/vacuumlazy.c:672
+#: access/heap/vacuumlazy.c:1036
 #, c-format
 msgid "removable cutoff: %u, which was %d XIDs old when operation ended\n"
 msgstr "Видалення вирізу: %u, це було %d XIDs старий при завершенні операції\n"
 
-#: access/heap/vacuumlazy.c:679
+#: access/heap/vacuumlazy.c:1043
 #, c-format
 msgid "new relfrozenxid: %u, which is %d XIDs ahead of previous value\n"
 msgstr "новий relfrozenxid: %u, що є %d XIDs попереду попереднього значення\n"
 
-#: access/heap/vacuumlazy.c:687
+#: access/heap/vacuumlazy.c:1051
 #, c-format
 msgid "new relminmxid: %u, which is %d MXIDs ahead of previous value\n"
 msgstr "новий relminmxid: %u, що становить %d MXIDs попереду попереднього значення\n"
 
-#: access/heap/vacuumlazy.c:690
+#: access/heap/vacuumlazy.c:1054
+#, c-format
+msgid "frozen: %u pages from table (%.2f%% of total) had %<PRId64> tuples frozen\n"
+msgstr "заморожування: на %u сторінках таблиці (%.2f%% від загальної) було заморожено %<PRId64> кортежів\n"
+
+#: access/heap/vacuumlazy.c:1062
 #, c-format
-msgid "frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"
-msgstr "заморожено: %u сторінок з таблиці (%.2f%% з усього) має %lld заморожені рядків\n"
+msgid "visibility map: %u pages set all-visible, %u pages set all-frozen (%u were all-visible)\n"
+msgstr "карта видимості: %u сторінок позначено як повністю видимі, %u сторінок позначено як повністю заморожені (%u були повністю видимі)\n"
 
-#: access/heap/vacuumlazy.c:698
+#: access/heap/vacuumlazy.c:1070
 msgid "index scan not needed: "
 msgstr "сканування індексу не потрібне: "
 
-#: access/heap/vacuumlazy.c:700
+#: access/heap/vacuumlazy.c:1072
 msgid "index scan needed: "
 msgstr "сканування індексу потрібне: "
 
-#: access/heap/vacuumlazy.c:702
+#: access/heap/vacuumlazy.c:1074
 #, c-format
-msgid "%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"
-msgstr "у %u сторінок з таблиці (%.2f%% від загальної кількості) було видалено %lld мертвих ідентифікаторів елементів\n"
+msgid "%u pages from table (%.2f%% of total) had %<PRId64> dead item identifiers removed\n"
+msgstr "з %u сторінок таблиці (%.2f%% від загальної) було вилучено %<PRId64> мертвих ідентифікаторів елементів\n"
 
-#: access/heap/vacuumlazy.c:707
+#: access/heap/vacuumlazy.c:1079
 msgid "index scan bypassed: "
 msgstr "сканування індексу пропущено: "
 
-#: access/heap/vacuumlazy.c:709
+#: access/heap/vacuumlazy.c:1081
 msgid "index scan bypassed by failsafe: "
 msgstr "сканування індексу безпечно пропущено: "
 
-#: access/heap/vacuumlazy.c:711
+#: access/heap/vacuumlazy.c:1083
 #, c-format
-msgid "%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"
-msgstr "%u сторінок з таблиці (%.2f%% від загальної кількості) мають %lld мертвих ідентифікаторів елементів\n"
+msgid "%u pages from table (%.2f%% of total) have %<PRId64> dead item identifiers\n"
+msgstr "%u сторінок таблиці (%.2f%% від загальної) містять %<PRId64> мертвих ідентифікаторів елементів\n"
 
-#: access/heap/vacuumlazy.c:726
+#: access/heap/vacuumlazy.c:1098
 #, c-format
 msgid "index \"%s\": pages: %u in total, %u newly deleted, %u currently deleted, %u reusable\n"
 msgstr "індекс \"%s\": сторінок: %u загалом, %u нещодавно видалено, %u наразі видалено, %u для повторного використання\n"
 
-#: access/heap/vacuumlazy.c:738 commands/analyze.c:794
+#: access/heap/vacuumlazy.c:1113 commands/analyze.c:817
+#, c-format
+msgid "delay time: %.3f ms\n"
+msgstr "час затримки: %.3f мс\n"
+
+#: access/heap/vacuumlazy.c:1121 commands/analyze.c:825
 #, c-format
 msgid "I/O timings: read: %.3f ms, write: %.3f ms\n"
 msgstr "час вводу-виведення: читання %.3f мс, запис: %.3f мс\n"
 
-#: access/heap/vacuumlazy.c:748 commands/analyze.c:797
+#: access/heap/vacuumlazy.c:1131 commands/analyze.c:828
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "середня швидкість читання: %.3f МБ/с, середня швидкість запису: %.3f МБ/с\n"
 
-#: access/heap/vacuumlazy.c:751 commands/analyze.c:799
+#: access/heap/vacuumlazy.c:1134 commands/analyze.c:830
 #, c-format
-msgid "buffer usage: %lld hits, %lld misses, %lld dirtied\n"
-msgstr "використання буфера: %lld звернень, %lld промахів, %lld, брудних записів\n"
+msgid "buffer usage: %<PRId64> hits, %<PRId64> reads, %<PRId64> dirtied\n"
+msgstr "використання буферів: %<PRId64> попадань, %<PRId64> читань, %<PRId64> забруднень\n"
 
-#: access/heap/vacuumlazy.c:756
+#: access/heap/vacuumlazy.c:1139 commands/analyze.c:835
 #, c-format
-msgid "WAL usage: %lld records, %lld full page images, %llu bytes\n"
-msgstr "Використання WAL: %lld записів, %lld зображень на повну сторінку, %llu байтів\n"
+msgid "WAL usage: %<PRId64> records, %<PRId64> full page images, %<PRIu64> bytes, %<PRId64> buffers full\n"
+msgstr "використання WAL: %<PRId64> записів, %<PRId64> повних образів сторінок, %<PRIu64> байт, %<PRId64> повних буферів\n"
 
-#: access/heap/vacuumlazy.c:760 commands/analyze.c:803
+#: access/heap/vacuumlazy.c:1144 commands/analyze.c:840
 #, c-format
 msgid "system usage: %s"
 msgstr "використання системи: %s"
 
-#: access/heap/vacuumlazy.c:2172
+#: access/heap/vacuumlazy.c:1432
+#, c-format
+msgid "disabling eager scanning after freezing %u eagerly scanned blocks of relation \"%s.%s.%s\""
+msgstr "вимикання активного сканування після заморожування %u активно сканованих блоків відношення \"%s.%s.%s\""
+
+#: access/heap/vacuumlazy.c:2821
 #, c-format
-msgid "table \"%s\": removed %lld dead item identifiers in %u pages"
-msgstr "таблиця \"%s\": видалено %lld мертвих ідентифікаторів елементів в %u сторінках"
+msgid "table \"%s\": removed %<PRId64> dead item identifiers in %u pages"
+msgstr "таблиця \"%s\": вилучено %<PRId64> мертвих ідентифікаторів елементів на %u сторінках"
 
-#: access/heap/vacuumlazy.c:2326
+#: access/heap/vacuumlazy.c:2982
 #, c-format
 msgid "bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans"
 msgstr "безпечне пропущення неістотного обслуговування таблиці \"%s.%s.%s\" після %d сканів індексу"
 
-#: access/heap/vacuumlazy.c:2329
+#: access/heap/vacuumlazy.c:2985
 #, c-format
 msgid "The table's relfrozenxid or relminmxid is too far in the past."
 msgstr "relfrozenxid або relminmxid таблиці занадто далеко в минулому."
 
-#: access/heap/vacuumlazy.c:2330
+#: access/heap/vacuumlazy.c:2986
 #, c-format
 msgid "Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
 "You might also need to consider other ways for VACUUM to keep up with the allocation of transaction IDs."
 msgstr "Можливо, слід збільшити параметр конфігурації \"maintenance_work_mem\" або \"autovacuum_work_mem\".\n"
 "Можливо, вам також доведеться розглянути інші способи, щоб VACUUM не відставав від розподілу ідентифікаторів транзакцій."
 
-#: access/heap/vacuumlazy.c:2592
+#: access/heap/vacuumlazy.c:3248
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": зупинка скорочення через конфліктний запит блокування"
 
-#: access/heap/vacuumlazy.c:2662
+#: access/heap/vacuumlazy.c:3318
 #, c-format
 msgid "table \"%s\": truncated %u to %u pages"
 msgstr "таблиця \"%s: скорочена від %u до %u сторінок"
 
-#: access/heap/vacuumlazy.c:2724
+#: access/heap/vacuumlazy.c:3380
 #, c-format
 msgid "table \"%s\": suspending truncate due to conflicting lock request"
 msgstr "таблиця \"%s: припинення скорочення через конфліктуючий запит блокування"
 
-#: access/heap/vacuumlazy.c:2843
+#: access/heap/vacuumlazy.c:3499
 #, c-format
 msgid "disabling parallel option of vacuum on \"%s\" --- cannot vacuum temporary tables in parallel"
 msgstr "вимкнення паралельної опції очищення на \"%s\" --- неможливо паралельно очистити тимчасові таблиці"
 
-#: access/heap/vacuumlazy.c:3113
+#: access/heap/vacuumlazy.c:3768
 #, c-format
 msgid "while scanning block %u offset %u of relation \"%s.%s\""
 msgstr "під час сканування блоку %u зсувом %u відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3116
+#: access/heap/vacuumlazy.c:3771
 #, c-format
 msgid "while scanning block %u of relation \"%s.%s\""
 msgstr "у процесі сканування блоку %u відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3120
+#: access/heap/vacuumlazy.c:3775
 #, c-format
 msgid "while scanning relation \"%s.%s\""
 msgstr "у процесі сканування відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3128
+#: access/heap/vacuumlazy.c:3783
 #, c-format
 msgid "while vacuuming block %u offset %u of relation \"%s.%s\""
 msgstr "під час очищення блоку %u зсувом %u відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3131
+#: access/heap/vacuumlazy.c:3786
 #, c-format
 msgid "while vacuuming block %u of relation \"%s.%s\""
 msgstr "у процесі очищення блоку %u відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3135
+#: access/heap/vacuumlazy.c:3790
 #, c-format
 msgid "while vacuuming relation \"%s.%s\""
 msgstr "у процесі очищення відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3140 commands/vacuumparallel.c:1113
+#: access/heap/vacuumlazy.c:3795 commands/vacuumparallel.c:1126
 #, c-format
 msgid "while vacuuming index \"%s\" of relation \"%s.%s\""
 msgstr "у процесі очищення індексу \"%s\" відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3145 commands/vacuumparallel.c:1119
+#: access/heap/vacuumlazy.c:3800 commands/vacuumparallel.c:1132
 #, c-format
 msgid "while cleaning up index \"%s\" of relation \"%s.%s\""
 msgstr "у процесі очищення індексу \"%s\" відношення \"%s.%s\""
 
-#: access/heap/vacuumlazy.c:3151
+#: access/heap/vacuumlazy.c:3806
 #, c-format
 msgid "while truncating relation \"%s.%s\" to %u blocks"
 msgstr "у процесі скорочення відношення \"%s.%s\" до %u блоків"
@@ -1630,24 +1662,24 @@ msgstr "метод доступу \"%s\" не є типу %s"
 msgid "index access method \"%s\" does not have a handler"
 msgstr "для методу доступу індекса \"%s\" не заданий обробник"
 
-#: access/index/genam.c:487
+#: access/index/genam.c:498
 #, c-format
 msgid "transaction aborted during system catalog scan"
 msgstr "транзакцію перервано під час сканування системного каталогу"
 
-#: access/index/genam.c:655 access/index/indexam.c:82
+#: access/index/genam.c:663 access/index/indexam.c:82
 #, c-format
 msgid "cannot access index \"%s\" while it is being reindexed"
 msgstr "неможливо отримати доступ до індекса \"%s\" в процесі реіндексації"
 
-#: access/index/indexam.c:203 catalog/objectaddress.c:1356
-#: commands/indexcmds.c:2878 commands/tablecmds.c:281 commands/tablecmds.c:305
-#: commands/tablecmds.c:17763 commands/tablecmds.c:19574
+#: access/index/indexam.c:203 catalog/objectaddress.c:1361
+#: commands/indexcmds.c:3016 commands/tablecmds.c:284 commands/tablecmds.c:308
+#: commands/tablecmds.c:19666 commands/tablecmds.c:21608
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" не є індексом"
 
-#: access/index/indexam.c:1028
+#: access/index/indexam.c:1075
 #, c-format
 msgid "operator class %s has no options"
 msgstr "клас операторів %s без параметрів"
@@ -1668,7 +1700,7 @@ msgid "This may be because of a non-immutable index expression."
 msgstr "Можливо, це викликано змінною природою індексного вираження."
 
 #: access/nbtree/nbtpage.c:157 access/nbtree/nbtpage.c:611
-#: parser/parse_utilcmd.c:2323
+#: parser/parse_utilcmd.c:2504
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "індекс \"%s\" не є b-деревом"
@@ -1688,75 +1720,75 @@ msgstr "індекс \"%s\" містить наполовину мертву в
 msgid "This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."
 msgstr "Це могло статися через переривання VACUUM у версії 9.3 або старше перед оновленням. Будь ласка, виконайте REINDEX."
 
-#: access/nbtree/nbtutils.c:5102
+#: access/nbtree/nbtutils.c:4233
 #, c-format
 msgid "index row size %zu exceeds btree version %u maximum %zu for index \"%s\""
 msgstr "розмір рядка індексу %zu перевищує максимальний розмір для версії %u btree %zu для індексу \"%s\""
 
-#: access/nbtree/nbtutils.c:5108
+#: access/nbtree/nbtutils.c:4238
 #, c-format
 msgid "Index row references tuple (%u,%u) in relation \"%s\"."
 msgstr "Рядок індексу посилається на кортеж (%u,,%u) у відношенні \"%s\"."
 
-#: access/nbtree/nbtutils.c:5112
+#: access/nbtree/nbtutils.c:4242
 #, c-format
 msgid "Values larger than 1/3 of a buffer page cannot be indexed.\n"
 "Consider a function index of an MD5 hash of the value, or use full text indexing."
 msgstr "Значення, що займають більше, ніж 1/3 сторінки буферу, не можуть бути індексовані.\n"
 "Радимо застосувати індекс MD5-хеш значення або використати повнотекстове індексування."
 
-#: access/nbtree/nbtvalidate.c:246
+#: access/nbtree/nbtvalidate.c:242
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function for types %s and %s"
 msgstr "сімейство операторів \"%s\" методу доступу %s не має опорної функції для типів %s та %s"
 
 #: access/sequence/sequence.c:75 access/table/table.c:145
-#: optimizer/util/plancat.c:144
+#: optimizer/util/plancat.c:145
 #, c-format
 msgid "cannot open relation \"%s\""
 msgstr "неможливо відкрити відношення \"%s\""
 
-#: access/spgist/spgutils.c:245
+#: access/spgist/spgutils.c:251
 #, c-format
 msgid "compress method must be defined when leaf type is different from input type"
 msgstr "метод стиснення повинен бути визначений, коли тип листів відрізняється від вхідного типу"
 
-#: access/spgist/spgutils.c:1028
+#: access/spgist/spgutils.c:1036
 #, c-format
 msgid "SP-GiST inner tuple size %zu exceeds maximum %zu"
 msgstr "Внутрішній розмір кортежу SP-GiST %zu перевищує максимальний %zu"
 
-#: access/spgist/spgvalidate.c:136
+#: access/spgist/spgvalidate.c:128
 #, c-format
 msgid "SP-GiST leaf data type %s does not match declared type %s"
 msgstr "тип даних кінцевого вузла SP-GiST %s не відповідає оголошеному типу %s"
 
-#: access/spgist/spgvalidate.c:302
+#: access/spgist/spgvalidate.c:294
 #, c-format
 msgid "operator family \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "сімейство операторів \"%s\" методу доступу %s не має опорної функції для типів %d для типу %s"
 
-#: access/table/tableam.c:255
+#: access/table/tableam.c:256
 #, c-format
 msgid "tid (%u, %u) is not valid for relation \"%s\""
 msgstr "невірний tid (%u, %u) для відношення \"%s\""
 
-#: access/table/tableamapi.c:109
+#: access/table/tableamapi.c:106
 #, c-format
 msgid "\"%s\" cannot be empty."
 msgstr "\"%s\" не може бути пустим."
 
-#: access/table/tableamapi.c:116 access/transam/xlogrecovery.c:4858
+#: access/table/tableamapi.c:113 access/transam/xlogrecovery.c:4912
 #, c-format
 msgid "\"%s\" is too long (maximum %d characters)."
 msgstr "\"%s\" занадто довгий (максимум %d символів)."
 
-#: access/table/tableamapi.c:139
+#: access/table/tableamapi.c:136
 #, c-format
 msgid "table access method \"%s\" does not exist"
 msgstr "табличного методу доступу \"%s\" не існує"
 
-#: access/table/tableamapi.c:144
+#: access/table/tableamapi.c:141
 #, c-format
 msgid "Table access method \"%s\" does not exist."
 msgstr "Табличного методу доступу \"%s\" не існує."
@@ -1786,13 +1818,13 @@ msgstr "Переконайтесь, що в конфігурації основ
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Переконайтесь, що в конфігурації встановлений параметр \"%s\"."
 
-#: access/transam/multixact.c:1091
+#: access/transam/multixact.c:1179
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "база даних не приймає команди, які призначають нові MultiXactId, щоб уникнути втрати даних через зациклення у базі даних \"%s\""
 
-#: access/transam/multixact.c:1093 access/transam/multixact.c:1100
-#: access/transam/multixact.c:1124 access/transam/multixact.c:1133
+#: access/transam/multixact.c:1181 access/transam/multixact.c:1188
+#: access/transam/multixact.c:1212 access/transam/multixact.c:1221
 #: access/transam/varsup.c:158 access/transam/varsup.c:165
 #, c-format
 msgid "Execute a database-wide VACUUM in that database.\n"
@@ -1800,12 +1832,12 @@ msgid "Execute a database-wide VACUUM in that database.\n"
 msgstr "Виконати очистку (VACUUM) по всій базі даних.\n"
 "Можливо, вам доведеться зафіксувати, відкотити назад старі підготовані транзакції або видалити застарілі слоти реплікації."
 
-#: access/transam/multixact.c:1098
+#: access/transam/multixact.c:1186
 #, c-format
 msgid "database is not accepting commands that assign new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "база даних не приймає команди, які призначають нові MultiXactId, щоб уникнути втрати даних через зациклення у базі даних з OID %u"
 
-#: access/transam/multixact.c:1119 access/transam/multixact.c:2474
+#: access/transam/multixact.c:1207 access/transam/multixact.c:2552
 #, 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"
@@ -1814,7 +1846,7 @@ msgstr[1] "бази даних \"%s\" повинні бути очищені (va
 msgstr[2] "баз даних \"%s\" повинні бути очищені (vacuumed) перед тим, як більшість MultiXactIds буде використано (%u)"
 msgstr[3] "баз даних \"%s\" повинні бути очищені (vacuumed) перед тим, як більшість MultiXactId буде використано (%u)"
 
-#: access/transam/multixact.c:1128 access/transam/multixact.c:2483
+#: access/transam/multixact.c:1216 access/transam/multixact.c:2561
 #, 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"
@@ -1823,12 +1855,12 @@ msgstr[1] "бази даних з OID %u повинні бути очищені
 msgstr[2] "баз даних з OID %u повинні бути очищені (vacuumed), перед тим як більшість MultiXactIds буде використано (%u)"
 msgstr[3] "баз даних з OID %u повинні бути очищені (vacuumed), перед тим як більшість MultiXactId буде використано (%u)"
 
-#: access/transam/multixact.c:1189
+#: access/transam/multixact.c:1280
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "перевищено ліміт членів мультитранзакції"
 
-#: access/transam/multixact.c:1190
+#: access/transam/multixact.c:1281
 #, 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."
@@ -1837,12 +1869,12 @@ msgstr[1] "Мультитранзакція створена цією коман
 msgstr[2] "Мультитранзакція створена цією командою з %u членів, але місця вистачає лише для %u членів."
 msgstr[3] "Мультитранзакція створена цією командою з %u членів, але місця вистачає лише для %u членів."
 
-#: access/transam/multixact.c:1195
+#: access/transam/multixact.c:1286
 #, 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 "Виконати очистку (VACUUM) по всій базі даних з OID %u зі зменшенням значення \"vacuum_multixact_freeze_min_age\" та \"vacuum_multixact_freeze_table_age settings\"."
 
-#: access/transam/multixact.c:1226
+#: access/transam/multixact.c:1317
 #, c-format
 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"
@@ -1851,83 +1883,88 @@ msgstr[1] "база даних з OID %u повинна бути очищена
 msgstr[2] "база даних з OID %u повинна бути очищена перед використанням додаткових членів мультитранзакції (%d)"
 msgstr[3] "база даних з OID %u повинна бути очищена перед використанням додаткових членів мультитранзакції (%d)"
 
-#: access/transam/multixact.c:1231
+#: access/transam/multixact.c:1322
 #, 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 "Виконати очищення (VACUUM) по всій цій базі даних зі зменшенням значення \"vacuum_multixact_freeze_min_age\" та \"vacuum_multixact_freeze_table_age\" settings."
 
-#: access/transam/multixact.c:1371
+#: access/transam/multixact.c:1461
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u припинив існування -- очевидно відбулося зациклення"
 
-#: access/transam/multixact.c:1377
+#: access/transam/multixact.c:1467
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u ще не був створений -- очевидно відбулося зациклення"
 
-#: access/transam/multixact.c:2479 access/transam/multixact.c:2488
+#: access/transam/multixact.c:1560
+#, c-format
+msgid "MultiXact %u has invalid next offset"
+msgstr "У MultiXact %u є недійсне наступне зміщення"
+
+#: access/transam/multixact.c:2557 access/transam/multixact.c:2566
 #, c-format
 msgid "To avoid MultiXactId assignment failures, execute a database-wide VACUUM in that database.\n"
 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
 msgstr "Щоб уникнути збоїв у призначенні MultiXactId, виконайте VACUUM для всієї бази даних у цій базі даних.\n"
 "Вам також може знадобитися зафіксувати або відкотити старі підготовлені транзакції, або видалити застарілі слоти реплікації."
 
-#: access/transam/multixact.c:2767
+#: access/transam/multixact.c:2845
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "Захист від зациклення члену MultiXact вимкнена, оскільки найстаріша контрольна точка MultiXact %u не існує на диску"
 
-#: access/transam/multixact.c:2789
+#: access/transam/multixact.c:2867
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "Захист від зациклення члену MultiXact наразі ввімкнена"
 
-#: access/transam/multixact.c:3180
+#: access/transam/multixact.c:3258
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "найстарішу MultiXact %u не знайдено, найновіша MultiXact %u, скорочення пропускається"
 
-#: access/transam/multixact.c:3198
+#: access/transam/multixact.c:3276
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "неможливо виконати скорочення до MultiXact %u, оскільки її не існує на диску, скорочення пропускається"
 
-#: access/transam/multixact.c:3517
+#: access/transam/multixact.c:3621
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "неприпустимий MultiXactId: %u"
 
-#: access/transam/parallel.c:731 access/transam/parallel.c:850
+#: access/transam/parallel.c:759 access/transam/parallel.c:878
 #, c-format
 msgid "parallel worker failed to initialize"
 msgstr "не вдалося виконати ініціалізацію паралельного виконавця"
 
-#: access/transam/parallel.c:732 access/transam/parallel.c:851
+#: access/transam/parallel.c:760 access/transam/parallel.c:879
 #, c-format
 msgid "More details may be available in the server log."
 msgstr "Більше деталей можуть бути доступні в журналі серверу."
 
-#: access/transam/parallel.c:912
+#: access/transam/parallel.c:940
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster завершився під час паралельної транзакції"
 
-#: access/transam/parallel.c:1099
+#: access/transam/parallel.c:1127
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "втрачено зв'язок з паралельним виконавцем"
 
-#: access/transam/parallel.c:1155 access/transam/parallel.c:1157
+#: access/transam/parallel.c:1183 access/transam/parallel.c:1185
 msgid "parallel worker"
 msgstr "паралельний виконавець"
 
-#: access/transam/parallel.c:1327 replication/logical/applyparallelworker.c:890
+#: access/transam/parallel.c:1355 replication/logical/applyparallelworker.c:897
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "не вдалося відобразити динамічний сегмент спільної пам'яті"
 
-#: access/transam/parallel.c:1332 replication/logical/applyparallelworker.c:896
+#: access/transam/parallel.c:1360 replication/logical/applyparallelworker.c:903
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "неприпустиме магічне число в динамічному сегменті спільної пам'яті"
@@ -1990,63 +2027,63 @@ msgstr "зареєстрований користувацький менедже
 
 #: access/transam/slru.c:361
 #, c-format
-msgid "\"%s\" must be a multiple of %d"
-msgstr "\"%s\" має бути кратним %d"
+msgid "\"%s\" must be a multiple of %d."
+msgstr "\"%s\" має бути кратним %d."
 
-#: access/transam/slru.c:830
+#: access/transam/slru.c:833
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "файл \"%s\" не існує, вважається нульовим"
 
-#: access/transam/slru.c:1059 access/transam/slru.c:1065
-#: access/transam/slru.c:1073 access/transam/slru.c:1078
-#: access/transam/slru.c:1085 access/transam/slru.c:1090
-#: access/transam/slru.c:1097 access/transam/slru.c:1104
+#: access/transam/slru.c:1062 access/transam/slru.c:1068
+#: access/transam/slru.c:1076 access/transam/slru.c:1081
+#: access/transam/slru.c:1088 access/transam/slru.c:1093
+#: access/transam/slru.c:1100 access/transam/slru.c:1107
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "не можливо отримати статус транзакції %u"
 
-#: access/transam/slru.c:1060
+#: access/transam/slru.c:1063
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "Не можливо відкрити файл \"%s\": %m."
 
-#: access/transam/slru.c:1066
+#: access/transam/slru.c:1069
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %d: %m."
 msgstr "Не вдалося знайти у файлі \"%s\" до зсуву %d: %m."
 
-#: access/transam/slru.c:1074
+#: access/transam/slru.c:1077
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: %m."
 msgstr "Не вдалося прочитати з файлу \"%s\" по зсуву %d: %m."
 
-#: access/transam/slru.c:1079
+#: access/transam/slru.c:1082
 #, c-format
 msgid "Could not read from file \"%s\" at offset %d: read too few bytes."
 msgstr "Не вдалося прочитати з файлу \"%s\" по зсуву %d: прочитано занадто мало байтів."
 
-#: access/transam/slru.c:1086
+#: access/transam/slru.c:1089
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: %m."
 msgstr "Не вдалося записати до файлу \"%s\" зсув %d: %m."
 
-#: access/transam/slru.c:1091
+#: access/transam/slru.c:1094
 #, c-format
 msgid "Could not write to file \"%s\" at offset %d: wrote too few bytes."
 msgstr "Не вдалося записати до файлу \"%s\" зсув %d: записано занадто мало байтів."
 
-#: access/transam/slru.c:1098
+#: access/transam/slru.c:1101
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "Не вдалося синхронізувати файл \"%s\": %m."
 
-#: access/transam/slru.c:1105
+#: access/transam/slru.c:1108
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "Не можливо закрити файл \"%s\": %m."
 
-#: access/transam/slru.c:1431
+#: access/transam/slru.c:1434
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "не вдалося спустошити каталог \"%s\": очевидно сталося зациклення"
@@ -2111,12 +2148,12 @@ msgstr "Встановіть ненульове значення парамет
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "ідентифікатор транзакції \"%s\" вже використовується"
 
-#: access/transam/twophase.c:404 access/transam/twophase.c:2540
+#: access/transam/twophase.c:404 access/transam/twophase.c:2530
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "досягнуто максимального числа підготованих транзакцій"
 
-#: access/transam/twophase.c:405 access/transam/twophase.c:2541
+#: access/transam/twophase.c:405 access/transam/twophase.c:2531
 #, c-format
 msgid "Increase \"max_prepared_transactions\" (currently %d)."
 msgstr "Збільшіть \"max_prepared_transactions\" (наразі %d)."
@@ -2151,12 +2188,12 @@ msgstr "З'єднайтесь з базою даних, де була підго
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "підготовленої транзакції з ідентифікатором \"%s\" не існує"
 
-#: access/transam/twophase.c:1190
+#: access/transam/twophase.c:1174
 #, c-format
 msgid "two-phase state file maximum length exceeded"
 msgstr "перевищено граничний розмір файла у 2-фазовому стані"
 
-#: access/transam/twophase.c:1345
+#: access/transam/twophase.c:1329
 #, c-format
 msgid "incorrect size of file \"%s\": %lld byte"
 msgid_plural "incorrect size of file \"%s\": %lld bytes"
@@ -2165,59 +2202,59 @@ msgstr[1] "неправильний розмір файлу \"%s\": %lld бай
 msgstr[2] "неправильний розмір файлу \"%s\": %lld байтів"
 msgstr[3] "неправильний розмір файлу \"%s\": %lld байтів"
 
-#: access/transam/twophase.c:1354
+#: access/transam/twophase.c:1338
 #, c-format
 msgid "incorrect alignment of CRC offset for file \"%s\""
 msgstr "неправильне вирівнювання зсуву CRC для файлу \"%s\""
 
-#: access/transam/twophase.c:1372
+#: access/transam/twophase.c:1356
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %lld"
 
-#: access/transam/twophase.c:1387
+#: access/transam/twophase.c:1371
 #, c-format
 msgid "invalid magic number stored in file \"%s\""
 msgstr "неприпустиме магічне число, збережене у файлі\"%s\""
 
-#: access/transam/twophase.c:1393
+#: access/transam/twophase.c:1377
 #, c-format
 msgid "invalid size stored in file \"%s\""
 msgstr "неприпустимий розмір, збережений у файлі \"%s\""
 
-#: access/transam/twophase.c:1405
+#: access/transam/twophase.c:1389
 #, c-format
 msgid "calculated CRC checksum does not match value stored in file \"%s\""
 msgstr "обчислена контрольна сума CRC не відповідає значенню, збереженому у файлі \"%s\""
 
-#: access/transam/twophase.c:1435 access/transam/xlogrecovery.c:565
-#: postmaster/walsummarizer.c:936 replication/logical/logical.c:211
-#: replication/walsender.c:836
+#: access/transam/twophase.c:1419 access/transam/xlogrecovery.c:572
+#: postmaster/walsummarizer.c:939 replication/logical/logical.c:213
+#: replication/walsender.c:826
 #, c-format
 msgid "Failed while allocating a WAL reading processor."
 msgstr "Не вдалося розмістити обробник журналу транзакцій."
 
-#: access/transam/twophase.c:1445
+#: access/transam/twophase.c:1429
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X: %s"
 msgstr "не вдалося прочитати 2-фазовий стан з WAL при %X/%X: %s"
 
-#: access/transam/twophase.c:1450
+#: access/transam/twophase.c:1434
 #, c-format
 msgid "could not read two-phase state from WAL at %X/%X"
 msgstr "не вдалося прочитати 2-фазовий стан з WAL при %X/%X"
 
-#: access/transam/twophase.c:1458
+#: access/transam/twophase.c:1442
 #, c-format
 msgid "expected two-phase state data is not present in WAL at %X/%X"
 msgstr "очікувані дані 2-фазного стану відсутні в WAL при %X/%X"
 
-#: access/transam/twophase.c:1754
+#: access/transam/twophase.c:1744
 #, c-format
 msgid "could not recreate file \"%s\": %m"
 msgstr "не вдалося відтворити файл \"%s\": %m"
 
-#: access/transam/twophase.c:1881
+#: access/transam/twophase.c:1871
 #, c-format
 msgid "%u two-phase state file was written for a long-running prepared transaction"
 msgid_plural "%u two-phase state files were written for long-running prepared transactions"
@@ -2226,52 +2263,52 @@ msgstr[1] "%u 2-фазовий стан файлів був записаний 
 msgstr[2] "%u 2-фазовий стан файлів був записаний завдяки довготривалим підготовленим транзакціям"
 msgstr[3] "%u 2-фазовий стан файлів був записаний завдяки довготривалим підготовленим транзакціям"
 
-#: access/transam/twophase.c:2116
+#: access/transam/twophase.c:2106
 #, c-format
 msgid "recovering prepared transaction %u from shared memory"
 msgstr "відновлення підготовленої транзакції %u із спільної пам'яті"
 
-#: access/transam/twophase.c:2209
+#: access/transam/twophase.c:2199
 #, c-format
 msgid "removing stale two-phase state file for transaction %u"
 msgstr "видалення застарілого файла 2-фазового стану для транзакції %u"
 
-#: access/transam/twophase.c:2216
+#: access/transam/twophase.c:2206
 #, c-format
 msgid "removing stale two-phase state from memory for transaction %u"
 msgstr "видалення з пам'яті застарілого 2-фазового стану для транзакції %u"
 
-#: access/transam/twophase.c:2229
+#: access/transam/twophase.c:2219
 #, c-format
 msgid "removing future two-phase state file for transaction %u"
 msgstr "видалення файлу майбутнього 2-фазового стану для транзакції %u"
 
-#: access/transam/twophase.c:2236
+#: access/transam/twophase.c:2226
 #, c-format
 msgid "removing future two-phase state from memory for transaction %u"
 msgstr "видалення з пам'яті майбутнього 2-фазового стану для транзакції %u"
 
-#: access/transam/twophase.c:2261
+#: access/transam/twophase.c:2251
 #, c-format
 msgid "corrupted two-phase state file for transaction %u"
 msgstr "пошкоджений файл двофазного стану для транзакції %u"
 
-#: access/transam/twophase.c:2266
+#: access/transam/twophase.c:2256
 #, c-format
 msgid "corrupted two-phase state in memory for transaction %u"
 msgstr "пошкоджена пам'ять двофазного стану для транзакції %u"
 
-#: access/transam/twophase.c:2523
+#: access/transam/twophase.c:2513
 #, c-format
 msgid "could not recover two-phase state file for transaction %u"
 msgstr "не вдалося відновити файл 2-фазового стану для транзакції %u"
 
-#: access/transam/twophase.c:2525
+#: access/transam/twophase.c:2515
 #, c-format
 msgid "Two-phase state file has been found in WAL record %X/%X, but this transaction has already been restored from disk."
 msgstr "Файл 2-фазового стану був знайдений в запису WAL %X/%X, але ця транзакція вже відновлена з диску."
 
-#: access/transam/twophase.c:2533 storage/file/fd.c:514 utils/fmgr/dfmgr.c:209
+#: access/transam/twophase.c:2523 storage/file/fd.c:511 utils/fmgr/dfmgr.c:214
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "немає доступу до файлу \"%s\": %m"
@@ -2311,292 +2348,246 @@ msgid "To avoid XID assignment failures, execute a database-wide VACUUM in that
 msgstr "Щоб уникнути збоїв у призначенні XID, виконайте VACUUM для всієї бази даних у цій базі даних.\n"
 "Вам також може знадобитися зафіксувати або відкотити старі підготовлені транзакції, або видалити застарілі слоти реплікації."
 
-#: access/transam/xact.c:649
+#: access/transam/xact.c:652
 #, c-format
 msgid "cannot assign transaction IDs during a parallel operation"
 msgstr "не можна призначити ідентифікатори транзакцій під час паралельних операцій"
 
-#: access/transam/xact.c:840
+#: access/transam/xact.c:843
 #, c-format
 msgid "cannot modify data in a parallel worker"
 msgstr "неможливо змінити дані паралельного виконавця"
 
-#: access/transam/xact.c:1115
+#: access/transam/xact.c:1118
 #, c-format
 msgid "cannot start commands during a parallel operation"
 msgstr "неможливо запустити команди під час паралельних операцій"
 
-#: access/transam/xact.c:1123
+#: access/transam/xact.c:1126
 #, c-format
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "в одній транзакції не може бути більше 2^32-2 команд"
 
-#: access/transam/xact.c:1664
+#: access/transam/xact.c:1695
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "перевищено межу числа зафіксованих підтранзакцій (%d)"
 
-#: access/transam/xact.c:2561
+#: access/transam/xact.c:2616
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary objects"
 msgstr "неможливо виконати PREPARE для транзакції, що здійснювалася на тимчасових об'єктах"
 
-#: access/transam/xact.c:2571
+#: access/transam/xact.c:2626
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "не можна виконати PREPARE для транзакції, яка має експортовані знімки"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3593
+#: access/transam/xact.c:3657
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s неможливо запустити всередині блоку транзакції"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3603
+#: access/transam/xact.c:3667
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s неможливо запустити всередині підтранзакції"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3613
-#, c-format
-msgid "%s cannot be executed within a pipeline"
-msgstr "%s не можна використовувати в межах конвеєра"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3623
+#: access/transam/xact.c:3677
 #, c-format
 msgid "%s cannot be executed from a function"
 msgstr "%s неможливо виконати з функції"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3694 access/transam/xact.c:4019
-#: access/transam/xact.c:4098 access/transam/xact.c:4221
-#: access/transam/xact.c:4372 access/transam/xact.c:4441
-#: access/transam/xact.c:4552
+#: access/transam/xact.c:3748 access/transam/xact.c:4070
+#: access/transam/xact.c:4149 access/transam/xact.c:4272
+#: access/transam/xact.c:4423 access/transam/xact.c:4492
+#: access/transam/xact.c:4603
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s може використовуватися тільки в блоках транзакції"
 
-#: access/transam/xact.c:3905
+#: access/transam/xact.c:3956
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "транзакція вже виконується"
 
-#: access/transam/xact.c:4024 access/transam/xact.c:4103
-#: access/transam/xact.c:4226
+#: access/transam/xact.c:4075 access/transam/xact.c:4154
+#: access/transam/xact.c:4277
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "немає незавершеної транзакції"
 
-#: access/transam/xact.c:4114
+#: access/transam/xact.c:4165
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "не можна фіксувати транзакції під час паралельних операцій"
 
-#: access/transam/xact.c:4237
+#: access/transam/xact.c:4288
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "не можна перервати під час паралельних операцій"
 
-#: access/transam/xact.c:4336
+#: access/transam/xact.c:4387
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "не можна визначати точки збереження під час паралельних операцій"
 
-#: access/transam/xact.c:4423
+#: access/transam/xact.c:4474
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "не можна вивільняти точки збереження під час паралельних транзакцій"
 
-#: access/transam/xact.c:4433 access/transam/xact.c:4484
-#: access/transam/xact.c:4544 access/transam/xact.c:4593
+#: access/transam/xact.c:4484 access/transam/xact.c:4535
+#: access/transam/xact.c:4595 access/transam/xact.c:4644
 #, c-format
 msgid "savepoint \"%s\" does not exist"
 msgstr "точка збереження \"%s\" не існує"
 
-#: access/transam/xact.c:4490 access/transam/xact.c:4599
+#: access/transam/xact.c:4541 access/transam/xact.c:4650
 #, c-format
 msgid "savepoint \"%s\" does not exist within current savepoint level"
 msgstr "точка збереження \"%s\" не існує на поточному рівні збереження точок"
 
-#: access/transam/xact.c:4532
+#: access/transam/xact.c:4583
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "не можна відкотити назад до точки збереження під час паралельних операцій"
 
-#: access/transam/xact.c:5376
+#: access/transam/xact.c:5438
 #, c-format
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "в одній транзакції не може бути більше 2^32-1 підтранзакцій"
 
-#: access/transam/xlog.c:1541
+#: access/transam/xlog.c:1545
 #, c-format
 msgid "request to flush past end of generated WAL; request %X/%X, current position %X/%X"
 msgstr "запит на очищення минулого кінця згенерованого WAL; запит %X/%X, поточна позиція %X/%X"
 
-#: access/transam/xlog.c:1768
+#: access/transam/xlog.c:1772
 #, c-format
 msgid "cannot read past end of generated WAL: requested %X/%X, current position %X/%X"
 msgstr "не вдалося прочитати останній кінець згенерованого WAL: запит %X/%X, поточна позиція %X/%X"
 
-#: access/transam/xlog.c:2209 access/transam/xlog.c:4500
+#: access/transam/xlog.c:2219 access/transam/xlog.c:4548
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Розмір сегмента WAL повинен бути степенем двійки від 1 МБ до 1 ГБ."
 
-#: access/transam/xlog.c:2227
-#, c-format
-msgid "\"%s\" must be set to -1 during binary upgrade mode."
-msgstr "\"%s\" має бути встановлено на -1 під час двійкового режиму оновлення."
-
-#: access/transam/xlog.c:2476
+#: access/transam/xlog.c:2455
 #, 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:3738 access/transam/xlogutils.c:831
-#: replication/walsender.c:3045
+#: access/transam/xlog.c:3741 access/transam/xlogutils.c:820
+#: replication/walsender.c:3088
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "запитуваний сегмент WAL %s вже видалений"
 
-#: access/transam/xlog.c:4060
+#: access/transam/xlog.c:4063
 #, c-format
 msgid "could not rename file \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\": %m"
 
-#: access/transam/xlog.c:4103 access/transam/xlog.c:4114
-#: access/transam/xlog.c:4135
+#: access/transam/xlog.c:4106 access/transam/xlog.c:4117
+#: access/transam/xlog.c:4138
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "необхідний каталог WAL \"%s\" не існує"
 
-#: access/transam/xlog.c:4120 access/transam/xlog.c:4141
+#: access/transam/xlog.c:4123 access/transam/xlog.c:4144
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "створюється відсутній каталог WAL \"%s\""
 
-#: access/transam/xlog.c:4124 access/transam/xlog.c:4144
-#: commands/dbcommands.c:3259
+#: access/transam/xlog.c:4127 access/transam/xlog.c:4147
+#: commands/dbcommands.c:3302
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "не вдалося створити відстуній каталог \"%s\": %m"
 
-#: access/transam/xlog.c:4211
+#: access/transam/xlog.c:4214
 #, c-format
 msgid "could not generate secret authorization token"
 msgstr "не вдалося згенерувати секретний токен для авторизації"
 
-#: access/transam/xlog.c:4362 access/transam/xlog.c:4372
-#: access/transam/xlog.c:4398 access/transam/xlog.c:4406
-#: access/transam/xlog.c:4414 access/transam/xlog.c:4420
-#: access/transam/xlog.c:4428 access/transam/xlog.c:4436
-#: access/transam/xlog.c:4444 access/transam/xlog.c:4452
-#: access/transam/xlog.c:4460 access/transam/xlog.c:4468
-#: access/transam/xlog.c:4478 access/transam/xlog.c:4486
-#: utils/init/miscinit.c:1758
+#: access/transam/xlog.c:4392 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4428 access/transam/xlog.c:4438
+#: access/transam/xlog.c:4448 access/transam/xlog.c:4454
+#: access/transam/xlog.c:4464 access/transam/xlog.c:4474
+#: access/transam/xlog.c:4484 access/transam/xlog.c:4494
+#: access/transam/xlog.c:4504 access/transam/xlog.c:4514
+#: access/transam/xlog.c:4526 access/transam/xlog.c:4534
+#: utils/init/miscinit.c:1818
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "файли бази даних є несумісними з даним сервером"
 
-#: access/transam/xlog.c:4363
+#: access/transam/xlog.c:4393
 #, 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 "Кластер бази даних було ініціалізовано з PG_CONTROL_VERSION %d (0x%08x), але сервер було скомпільовано з PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4367
+#: access/transam/xlog.c:4397
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "Можливо, проблема викликана різним порядком байту. Здається, вам потрібно виконати команду \"initdb\"."
 
-#: access/transam/xlog.c:4373
+#: access/transam/xlog.c:4403
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "Кластер баз даних був ініціалізований з PG_CONTROL_VERSION %d, але сервер скомпільований з PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4376 access/transam/xlog.c:4402
-#: access/transam/xlog.c:4410 access/transam/xlog.c:4416
+#: access/transam/xlog.c:4406 access/transam/xlog.c:4434
+#: access/transam/xlog.c:4444 access/transam/xlog.c:4450
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Здається, Вам треба виконати initdb."
 
-#: access/transam/xlog.c:4388
+#: access/transam/xlog.c:4418
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "помилка контрольної суми у файлі pg_control"
 
-#: access/transam/xlog.c:4399
-#, c-format
-msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
-msgstr "Кластер бази даних було ініціалізовано з CATALOG_VERSION_NO %d, але сервер було скомпільовано з CATALOG_VERSION_NO %d."
-
-#: access/transam/xlog.c:4407
+#. translator: %s is a variable name and %d is its value
+#: access/transam/xlog.c:4430 access/transam/xlog.c:4440
+#: access/transam/xlog.c:4456 access/transam/xlog.c:4466
+#: access/transam/xlog.c:4476 access/transam/xlog.c:4486
+#: access/transam/xlog.c:4496 access/transam/xlog.c:4506
+#: access/transam/xlog.c:4516
 #, c-format
-msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
-msgstr "Кластер бази даних було ініціалізовано з MAXALIGN %d, але сервер було скомпільовано з MAXALIGN %d."
+msgid "The database cluster was initialized with %s %d, but the server was compiled with %s %d."
+msgstr "Кластер баз даних було ініціалізовано з %s %d, а сервер було зібрано з %s %d."
 
-#: access/transam/xlog.c:4415
+#: access/transam/xlog.c:4449
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "Здається, в кластері баз даних і в програмі сервера використовуються різні формати чисел з плаваючою точкою."
 
-#: access/transam/xlog.c:4421
-#, c-format
-msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
-msgstr "Кластер бази даних було ініціалізовано з BLCKSZ %d,  але сервер було скомпільовано з BLCKSZ %d."
-
-#: access/transam/xlog.c:4424 access/transam/xlog.c:4432
-#: access/transam/xlog.c:4440 access/transam/xlog.c:4448
-#: access/transam/xlog.c:4456 access/transam/xlog.c:4464
-#: access/transam/xlog.c:4472 access/transam/xlog.c:4481
-#: access/transam/xlog.c:4489
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4480 access/transam/xlog.c:4490
+#: access/transam/xlog.c:4500 access/transam/xlog.c:4510
+#: access/transam/xlog.c:4520 access/transam/xlog.c:4529
+#: access/transam/xlog.c:4537
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Здається, вам потрібно перекомпілювати сервер або виконати initdb."
 
-#: access/transam/xlog.c:4429
-#, c-format
-msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
-msgstr "Кластер бази даних було ініціалізовано з ELSEG_SIZE %d, але сервер було скомпільовано з ELSEG_SIZE %d."
-
-#: access/transam/xlog.c:4437
-#, c-format
-msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
-msgstr "Кластер бази даних було ініціалізовано з XLOG_BLCKSZ %d, але сервер було скомпільовано з XLOG_BLCKSZ %d."
-
-#: access/transam/xlog.c:4445
-#, c-format
-msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
-msgstr "Кластер бази даних було ініціалізовано з NAMEDATALEN %d, але сервер було скомпільовано з NAMEDATALEN %d."
-
-#: access/transam/xlog.c:4453
-#, c-format
-msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
-msgstr "Кластер бази даних було ініціалізовано з INDEX_MAX_KEYS %d, але сервер було скомпільовано з INDEX_MAX_KEYS %d."
-
-#: access/transam/xlog.c:4461
-#, c-format
-msgid "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr "Кластер бази даних було ініціалізовано з TOAST_MAX_CHUNK_SIZE %d, але сервер було скомпільовано з TOAST_MAX_CHUNK_SIZE %d."
-
-#: access/transam/xlog.c:4469
-#, c-format
-msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
-msgstr "Кластер бази даних було ініціалізовано з LOBLKSIZE %d, але сервер було скомпільовано з LOBLKSIZE %d."
-
-#: access/transam/xlog.c:4479
+#: access/transam/xlog.c:4527
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "Кластер бази даних було ініціалізовано без USE_FLOAT8_BYVAL, але сервер було скомпільовано з USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4487
+#: access/transam/xlog.c:4535
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "Кластер бази даних було ініціалізовано з USE_FLOAT8_BYVAL, але сервер було скомпільовано без USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4496
+#: access/transam/xlog.c:4544
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -2605,292 +2596,284 @@ msgstr[1] "невірний розмір сегмента WAL у файлі ке
 msgstr[2] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 msgstr[3] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 
-#: access/transam/xlog.c:4509
-#, c-format
-msgid "\"min_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"min_wal_size\" має бути мінімум у 2 рази більше, ніж \"wal_segment_size\""
-
-#: access/transam/xlog.c:4513
+#. translator: both %s are GUC names
+#: access/transam/xlog.c:4558 access/transam/xlog.c:4564
 #, c-format
-msgid "\"max_wal_size\" must be at least twice \"wal_segment_size\""
-msgstr "\"max_wal_size\" має бути мінімум у 2 рази більше, ніж \"wal_segment_size\""
+msgid "\"%s\" must be at least twice \"%s\""
+msgstr "\"%s\" має бути щонайменше в двічі більше ніж \"%s\""
 
-#: access/transam/xlog.c:4661 catalog/namespace.c:4681
-#: commands/tablespace.c:1210 commands/user.c:2529 commands/variable.c:72
-#: replication/slot.c:2429 tcop/postgres.c:3715 utils/error/elog.c:2247
+#: access/transam/xlog.c:4726 catalog/namespace.c:4699
+#: commands/tablespace.c:1210 commands/user.c:2531 commands/variable.c:72
+#: replication/slot.c:2764 tcop/postgres.c:3626 utils/error/elog.c:2257
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Помилка синтаксису у списку."
 
-#: access/transam/xlog.c:4707 commands/user.c:2545 commands/variable.c:173
-#: tcop/postgres.c:3731 utils/error/elog.c:2273
+#: access/transam/xlog.c:4772 commands/user.c:2547 commands/variable.c:173
+#: tcop/postgres.c:3642 utils/error/elog.c:2283
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Нерозпізнане ключове слово: \"%s\"."
 
-#: access/transam/xlog.c:5128
+#: access/transam/xlog.c:5195
 #, c-format
 msgid "could not write bootstrap write-ahead log file: %m"
 msgstr "не вдалося записати початкове завантаження випереджувального журналювання: %m"
 
-#: access/transam/xlog.c:5136
+#: access/transam/xlog.c:5203
 #, c-format
 msgid "could not fsync bootstrap write-ahead log file: %m"
 msgstr "не вдалося скинути на диск початкове завантаження випереджувального журналювання: %m"
 
-#: access/transam/xlog.c:5142
+#: access/transam/xlog.c:5209
 #, c-format
 msgid "could not close bootstrap write-ahead log file: %m"
 msgstr "не вдалося закрити початкове завантаження випереджувального журналювання: %m"
 
-#: access/transam/xlog.c:5367
+#: access/transam/xlog.c:5434
 #, c-format
 msgid "WAL was generated with \"wal_level=minimal\", cannot continue recovering"
 msgstr "WAL був створений з \"wal_level=minimal\", неможливо продовжити відновлення"
 
-#: access/transam/xlog.c:5368
+#: access/transam/xlog.c:5435
 #, c-format
 msgid "This happens if you temporarily set \"wal_level=minimal\" on the server."
 msgstr "Це трапляється, якщо ви тимчасово встановили \"wal_level=minimal\" на сервері."
 
-#: access/transam/xlog.c:5369
+#: access/transam/xlog.c:5436
 #, c-format
 msgid "Use a backup taken after setting \"wal_level\" to higher than \"minimal\"."
 msgstr "Використовуйте резервну копію, зроблену після встановлення значення wal_level, що перевищує мінимальний рівень."
 
-#: access/transam/xlog.c:5434
+#: access/transam/xlog.c:5501
 #, c-format
 msgid "control file contains invalid checkpoint location"
 msgstr "контрольний файл містить недійсне розташування контрольної точки"
 
-#: access/transam/xlog.c:5445
+#: access/transam/xlog.c:5512
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "система бази даних була вимкнена %s"
 
-#: access/transam/xlog.c:5451
+#: access/transam/xlog.c:5518
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "система бази даних завершила роботу у процесі відновлення %s"
 
-#: access/transam/xlog.c:5457
+#: access/transam/xlog.c:5524
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "завершення роботи бази даних було перервано; останній момент роботи %s"
 
-#: access/transam/xlog.c:5463
+#: access/transam/xlog.c:5530
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "система бази даних була перервана в процесі відновлення %s"
 
-#: access/transam/xlog.c:5465
+#: access/transam/xlog.c:5532
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "Це, ймовірно, означає, що деякі дані були пошкоджені, і вам доведеться відновити базу даних з останнього збереження."
 
-#: access/transam/xlog.c:5471
+#: access/transam/xlog.c:5538
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "робота системи бази даних була перервана в процесі відновлення, час в журналі %s"
 
-#: access/transam/xlog.c:5473
+#: access/transam/xlog.c:5540
 #, 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 "Якщо це відбувається більше, ніж один раз, можливо, якісь дані були зіпсовані, і для відновлення треба вибрати більш ранню точку."
 
-#: access/transam/xlog.c:5479
+#: access/transam/xlog.c:5546
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "робота системи бази даних була перервана; останній момент роботи %s"
 
-#: access/transam/xlog.c:5486
+#: access/transam/xlog.c:5553
 #, c-format
 msgid "control file contains invalid database cluster state"
 msgstr "контрольний файл містить недійсний стан кластеру бази даних"
 
-#: access/transam/xlog.c:5874
+#: access/transam/xlog.c:5941
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL завершився до завершення онлайн резервного копіювання"
 
-#: access/transam/xlog.c:5875
+#: access/transam/xlog.c:5942
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Всі журнали WAL, створені під час резервного копіювання \"на ходу\", повинні бути в наявності для відновлення."
 
-#: access/transam/xlog.c:5879
+#: access/transam/xlog.c:5946
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL завершився до узгодженої точки відновлення"
 
-#: access/transam/xlog.c:5925
+#: access/transam/xlog.c:5992
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "вибрано новий ID часової лінії: %u"
 
-#: access/transam/xlog.c:5958
+#: access/transam/xlog.c:6025
 #, c-format
 msgid "archive recovery complete"
 msgstr "відновлення архіву завершено"
 
-#: access/transam/xlog.c:6587
+#: access/transam/xlog.c:6654
 #, c-format
 msgid "shutting down"
 msgstr "завершення роботи"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6626
+#: access/transam/xlog.c:6693
 #, c-format
 msgid "restartpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "початок точки перезапуску: %s%s%s%s%s%s%s%s"
 
 #. translator: the placeholders show checkpoint options
-#: access/transam/xlog.c:6638
+#: access/transam/xlog.c:6705
 #, c-format
 msgid "checkpoint starting:%s%s%s%s%s%s%s%s"
 msgstr "початок контрольної точки: %s%s%s%s%s%s%s%s"
 
-#: access/transam/xlog.c:6703
+#: access/transam/xlog.c:6770
 #, c-format
-msgid "restartpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "точка перезапуску завершена: записано %d буферів (%.1f%%); %d WAL файлів додано, %d видалено, %d перероблених; запис=%ld.%03d сек, синхронізація=%ld.%03d сек, усього=%ld.%03d сек; файли синхронізації=%d, найдовший=%ld.%03d сек, середній=%ld.%03d сек; дистанція=%d кб, приблизно=%d кб; lsn=%X/%X, lsn повтору=%X/%X"
+msgid "restartpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "точка перезапуску завершена: записано %d буферів (%.1f%%), записано %d SLRU буферів; %d WAL файл(ів) додано, %d вилучено, %d перевикористано; запис=%ld.%03d с, синхр.=%ld.%03d с, загалом=%ld.%03d с; синхр. файлів=%d, найдовший=%ld.%03d с, середній=%ld.%03d с; відстань=%d кБ, оцінка=%d кБ; lsn=%X/%X, redo lsn=%X/%X"
 
-#: access/transam/xlog.c:6726
+#: access/transam/xlog.c:6794
 #, c-format
-msgid "checkpoint complete: wrote %d buffers (%.1f%%); %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
-msgstr "контрольна точка завершена: записано %d буферів (%.1f%%); %d WAL файлів додано, %d видалено, %d перероблених; запис=%ld.%03d сек, синхронізація=%ld.%03d сек, усього=%ld.%03d сек; файли синхронізації=%d, найдовший=%ld.%03d сек, середній=%ld.%03d сек; дистанція=%d кб, приблизно=%d кб; lsn=%X/%X, lsn повтору=%X/%X"
+msgid "checkpoint complete: wrote %d buffers (%.1f%%), wrote %d SLRU buffers; %d WAL file(s) added, %d removed, %d recycled; write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; distance=%d kB, estimate=%d kB; lsn=%X/%X, redo lsn=%X/%X"
+msgstr "контрольна точка завершена: записано %d буферів (%.1f%%), записано %d SLRU буферів; %d WAL файл(ів) додано, %d вилучено, %d перевикористано; запис=%ld.%03d с, синхр.=%ld.%03d с, загалом=%ld.%03d с; синхр. файлів=%d, найдовший=%ld.%03d с, середній=%ld.%03d с; відстань=%d кБ, оцінка=%d кБ; lsn=%X/%X, redo lsn=%X/%X"
 
-#: access/transam/xlog.c:7208
+#: access/transam/xlog.c:7280
 #, c-format
 msgid "concurrent write-ahead log activity while database system is shutting down"
 msgstr "під час того вимкнення БД помічено конкурентну активність у випереджувальному журналюванні"
 
-#: access/transam/xlog.c:7793
+#: access/transam/xlog.c:7869
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "відновлення збереженої точки %X/%X"
 
-#: access/transam/xlog.c:7795
+#: access/transam/xlog.c:7871
 #, c-format
 msgid "Last completed transaction was at log time %s."
 msgstr "Остання завершена транзакція була в %s."
 
-#: access/transam/xlog.c:8057
+#: access/transam/xlog.c:8135
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "точка відновлення \"%s\" створена в %X/%X"
 
-#: access/transam/xlog.c:8264
+#: access/transam/xlog.c:8342
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "онлайн резервне копіювання скасовано, неможливо продовжити відновлення"
 
-#: access/transam/xlog.c:8322
+#: access/transam/xlog.c:8400
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in shutdown checkpoint record"
 msgstr "неочікуваний ID лінії часу %u (повинен бути %u) у записі контрольної точки вимкнення"
 
-#: access/transam/xlog.c:8380
+#: access/transam/xlog.c:8466
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in online checkpoint record"
 msgstr "неочікуваний ID лінії часу %u (повинен бути %u) у записі контрольної точки онлайн"
 
-#: access/transam/xlog.c:8409
+#: access/transam/xlog.c:8503
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in end-of-recovery record"
 msgstr "неочікуваний ID лінії часу %u (повинен бути %u) у записі кінця відновлення"
 
-#: access/transam/xlog.c:8680
+#: access/transam/xlog.c:8773
 #, c-format
 msgid "could not fsync write-through file \"%s\": %m"
 msgstr "не вдалосьясинхронізувати файл наскрізного запису %s: %m"
 
-#: access/transam/xlog.c:8685
+#: access/transam/xlog.c:8778
 #, c-format
 msgid "could not fdatasync file \"%s\": %m"
 msgstr "не вдалося fdatasync файл \"%s\": %m"
 
-#: access/transam/xlog.c:8772 access/transam/xlog.c:9108
+#: access/transam/xlog.c:8855 access/transam/xlog.c:9191
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "Обраний рівень WAL недостатній для резервного копіювання \"на ходу\""
 
-#: access/transam/xlog.c:8773 access/transam/xlogfuncs.c:248
+#: access/transam/xlog.c:8856 access/transam/xlog.c:9192
+#: access/transam/xlogfuncs.c:249
 #, c-format
 msgid "\"wal_level\" must be set to \"replica\" or \"logical\" at server start."
 msgstr "\"wal_level\" потрібно задати \"replica\" або \"logical\" при запуску сервера."
 
-#: access/transam/xlog.c:8778
+#: access/transam/xlog.c:8861
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "мітка резервного копіювання задовга (максимум %d байт)"
 
-#: access/transam/xlog.c:8899
+#: access/transam/xlog.c:8982
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed since last restartpoint"
 msgstr "Після останньої точки відновлення був відтворений WAL, створений в режимі \"full_page_writes=off\""
 
-#: access/transam/xlog.c:8901 access/transam/xlog.c:9197
+#: access/transam/xlog.c:8984 access/transam/xlog.c:9280
 #, 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 primary, and then try an online backup again."
 msgstr "Це означає, що резервна копія, зроблена на резервному сервері пошкоджена і не повинна використовуватись. Активуйте \"full_page_writes\" і запустіть CHECKPOINT на основному сервері, а потім спробуйте ще раз створити резервну копію."
 
-#: access/transam/xlog.c:8981 backup/basebackup.c:1417 utils/adt/misc.c:354
+#: access/transam/xlog.c:9064 backup/basebackup.c:1419 utils/adt/misc.c:354
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "не можливо прочитати символічне послання \"%s\": %m"
 
-#: access/transam/xlog.c:8988 backup/basebackup.c:1422 utils/adt/misc.c:359
+#: access/transam/xlog.c:9071 backup/basebackup.c:1424 utils/adt/misc.c:359
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "таргет символічного посилання \"%s\" задовгий"
 
-#: access/transam/xlog.c:9109
-#, c-format
-msgid "wal_level must be set to \"replica\" or \"logical\" at server start."
-msgstr "встановіть wal_level \"replica\" або \"logical\" при запуску серверу."
-
-#: access/transam/xlog.c:9147 backup/basebackup.c:1281
+#: access/transam/xlog.c:9230 backup/basebackup.c:1283
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "режим очікування було підвищено у процесі резервного копіювання \"на ходу\""
 
-#: access/transam/xlog.c:9148 backup/basebackup.c:1282
+#: access/transam/xlog.c:9231 backup/basebackup.c:1284
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Це означає, що вибрана резервна копія є пошкодженою і її не слід використовувати. Спробуйте використати іншу онлайн резервну копію."
 
-#: access/transam/xlog.c:9195
+#: access/transam/xlog.c:9278
 #, c-format
 msgid "WAL generated with \"full_page_writes=off\" was replayed during online backup"
 msgstr "WAL створений з \"full_page_writes=off\" було відтворено під час резервного копіювання"
 
-#: access/transam/xlog.c:9311
+#: access/transam/xlog.c:9394
 #, c-format
 msgid "base backup done, waiting for required WAL segments to be archived"
 msgstr "резервне копіювання виконане, очікуються необхідні сегменти WAL для архівації"
 
-#: access/transam/xlog.c:9325
+#: access/transam/xlog.c:9408
 #, c-format
 msgid "still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "все ще чекає на необхідні сегменти WAL для архівації (%d секунд пройшло)"
 
-#: access/transam/xlog.c:9327
+#: access/transam/xlog.c:9410
 #, c-format
 msgid "Check that your \"archive_command\" is executing properly.  You can safely cancel this backup, but the database backup will not be usable without all the WAL segments."
 msgstr "Перевірте, що ваша \"archive_command\" виконується належним чином. Ви можете безпечно скасувати резервну копію, але резервне копіювання бази даних буде непридатним без всіх сегментів WAL."
 
-#: access/transam/xlog.c:9334
+#: access/transam/xlog.c:9417
 #, c-format
 msgid "all required WAL segments have been archived"
 msgstr "усі необхідні сегменти WAL архівовані"
 
-#: access/transam/xlog.c:9338
+#: access/transam/xlog.c:9421
 #, 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 не налаштована; ви повинні забезпечити копіювання всіх необхідних сегментів WAL іншими засобами для отримання резервної копії"
 
-#: access/transam/xlog.c:9377
+#: access/transam/xlog.c:9460
 #, c-format
 msgid "aborting backup due to backend exiting before pg_backup_stop was called"
 msgstr "припинення резервного копіювання через завершення обслуговуючого процесу до виклику pg_backup_stop"
@@ -2933,99 +2916,99 @@ msgstr "неможливо створити файл статусу архіву
 msgid "could not write archive status file \"%s\": %m"
 msgstr "неможливо записати файл архівного статусу \"%s\": %m"
 
-#: access/transam/xlogfuncs.c:69 backup/basebackup.c:997
+#: access/transam/xlogfuncs.c:70 backup/basebackup.c:999
 #, c-format
 msgid "a backup is already in progress in this session"
 msgstr "резервне копіювання наразі триває в цьому сеансі"
 
-#: access/transam/xlogfuncs.c:140
+#: access/transam/xlogfuncs.c:141
 #, c-format
 msgid "backup is not in progress"
 msgstr "резервне копіювання не виконується"
 
-#: access/transam/xlogfuncs.c:141
+#: access/transam/xlogfuncs.c:142
 #, c-format
 msgid "Did you call pg_backup_start()?"
 msgstr "Ви викликали pg_backup_start()?"
 
-#: access/transam/xlogfuncs.c:184 access/transam/xlogfuncs.c:242
-#: access/transam/xlogfuncs.c:281 access/transam/xlogfuncs.c:302
-#: access/transam/xlogfuncs.c:323
+#: access/transam/xlogfuncs.c:185 access/transam/xlogfuncs.c:243
+#: access/transam/xlogfuncs.c:282 access/transam/xlogfuncs.c:303
+#: access/transam/xlogfuncs.c:324
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "Функції управління WAL не можна використовувати під час відновлення."
 
-#: access/transam/xlogfuncs.c:209 access/transam/xlogfuncs.c:389
-#: access/transam/xlogfuncs.c:447
+#: access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:390
+#: access/transam/xlogfuncs.c:448
 #, c-format
 msgid "%s cannot be executed during recovery."
 msgstr "%s не можна використовувати під час відновлення."
 
-#: access/transam/xlogfuncs.c:215
+#: access/transam/xlogfuncs.c:216
 #, c-format
 msgid "pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\""
 msgstr "pg_log_standby_snapshot() можна використовувати лише якщо \"wal_level\" >= \"replica\""
 
-#: access/transam/xlogfuncs.c:247
+#: access/transam/xlogfuncs.c:248
 #, c-format
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "Обраний рівень WAL не достатній для створення точки відновлення"
 
-#: access/transam/xlogfuncs.c:255
+#: access/transam/xlogfuncs.c:256
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "значення для точки відновлення перевищує межу (%d симв.)"
 
-#: access/transam/xlogfuncs.c:486
+#: access/transam/xlogfuncs.c:487
 #, c-format
 msgid "invalid WAL file name \"%s\""
 msgstr "неприпустиме ім'я файлу WAL \"%s\""
 
-#: access/transam/xlogfuncs.c:522 access/transam/xlogfuncs.c:552
-#: access/transam/xlogfuncs.c:576 access/transam/xlogfuncs.c:599
-#: access/transam/xlogfuncs.c:679
+#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
+#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
+#: access/transam/xlogfuncs.c:680
 #, c-format
 msgid "recovery is not in progress"
 msgstr "відновлення не виконується"
 
-#: access/transam/xlogfuncs.c:523 access/transam/xlogfuncs.c:553
-#: access/transam/xlogfuncs.c:577 access/transam/xlogfuncs.c:600
-#: access/transam/xlogfuncs.c:680
+#: access/transam/xlogfuncs.c:524 access/transam/xlogfuncs.c:554
+#: access/transam/xlogfuncs.c:578 access/transam/xlogfuncs.c:601
+#: access/transam/xlogfuncs.c:681
 #, c-format
 msgid "Recovery control functions can only be executed during recovery."
 msgstr "Функції управління відновленням можна використовувати тільки під час відновлення."
 
-#: access/transam/xlogfuncs.c:528 access/transam/xlogfuncs.c:558
+#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
 #, c-format
 msgid "standby promotion is ongoing"
 msgstr "просування в режимі очікування триває"
 
-#: access/transam/xlogfuncs.c:529 access/transam/xlogfuncs.c:559
+#: access/transam/xlogfuncs.c:530 access/transam/xlogfuncs.c:560
 #, c-format
 msgid "%s cannot be executed after promotion is triggered."
 msgstr "%s не може бути виконаний після того як підвищення запущено."
 
-#: access/transam/xlogfuncs.c:685
+#: access/transam/xlogfuncs.c:686
 #, c-format
 msgid "\"wait_seconds\" must not be negative or zero"
 msgstr "\"wait_seconds\" не має бути від'ємним чи нулем"
 
-#: access/transam/xlogfuncs.c:707 storage/ipc/signalfuncs.c:265
+#: access/transam/xlogfuncs.c:708 storage/ipc/signalfuncs.c:293
 #, c-format
 msgid "failed to send signal to postmaster: %m"
 msgstr "надіслати сигнал процесу postmaster не вдалося: %m"
 
-#: access/transam/xlogfuncs.c:739 libpq/be-secure.c:237 libpq/be-secure.c:346
+#: access/transam/xlogfuncs.c:740 libpq/be-secure.c:241 libpq/be-secure.c:350
 #, c-format
 msgid "terminating connection due to unexpected postmaster exit"
 msgstr "завершення підключення через неочікуване закриття головного процесу"
 
-#: access/transam/xlogfuncs.c:740
+#: access/transam/xlogfuncs.c:741
 #, c-format
 msgid "while waiting on promotion"
 msgstr "в очікуванні на підвищення"
 
-#: access/transam/xlogfuncs.c:744
+#: access/transam/xlogfuncs.c:745
 #, c-format
 msgid "server did not promote within %d second"
 msgid_plural "server did not promote within %d seconds"
@@ -3034,177 +3017,177 @@ msgstr[1] "сервер не підвищувався протягом %d сек
 msgstr[2] "сервер не підвищувався протягом %d секунд"
 msgstr[3] "сервер не підвищувався протягом %d секунд"
 
-#: access/transam/xlogprefetcher.c:1088
+#: access/transam/xlogprefetcher.c:1086
 #, c-format
-msgid "\"recovery_prefetch\" is not supported on platforms that lack posix_fadvise()."
-msgstr "\"recovery_prefetch\" не підтримується на платформах, у яких відсутня posix_fadvise()."
+msgid "\"recovery_prefetch\" is not supported on platforms that lack support for issuing read-ahead advice."
+msgstr "\"recovery_prefetch\" не підтримується на платформах, які не мають підтримки для попереднього читання."
 
-#: access/transam/xlogreader.c:619
+#: access/transam/xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "неприпустиме зміщення запису в %X/%X: очікувалось хоча б %u, отримано %u"
 
-#: access/transam/xlogreader.c:628
+#: access/transam/xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "по зсуву %X/%X запитано продовження запису"
 
-#: access/transam/xlogreader.c:669 access/transam/xlogreader.c:1134
+#: access/transam/xlogreader.c:670 access/transam/xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "неприпустима довжина запису %X/%X: очікувалась мінімум %u, отримано %u"
 
-#: access/transam/xlogreader.c:758
+#: access/transam/xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
-msgstr "немає прапорця contrecord в позиції %X/%X"
+msgstr "немає прапора contrecord на %X/%X"
 
-#: access/transam/xlogreader.c:771
+#: access/transam/xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неприпустима довжина contrecord %u (очікувалось %lld) на %X/%X"
 
-#: access/transam/xlogreader.c:1142
+#: access/transam/xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "невірний ID менеджера ресурсів %u в %X/%X"
 
-#: access/transam/xlogreader.c:1155 access/transam/xlogreader.c:1171
+#: access/transam/xlogreader.c:1166 access/transam/xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запис з неправильним попереднім посиланням %X/%X на %X/%X"
 
-#: access/transam/xlogreader.c:1209
+#: access/transam/xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "некоректна контрольна сума даних менеджера ресурсів у запису по зсуву %X/%X"
 
-#: access/transam/xlogreader.c:1243
+#: access/transam/xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірне магічне число %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: access/transam/xlogreader.c:1258 access/transam/xlogreader.c:1300
+#: access/transam/xlogreader.c:1269 access/transam/xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірні інформаційні біти %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: access/transam/xlogreader.c:1274
+#: access/transam/xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %llu, а ідентифікатор системи баз даних pg_control - %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %<PRIu64>, а ідентифікатор системи баз даних pg_control - %<PRIu64>"
 
-#: access/transam/xlogreader.c:1282
+#: access/transam/xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний розмір сегменту в заголовку сторінки"
 
-#: access/transam/xlogreader.c:1288
+#: access/transam/xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний XLOG_BLCKSZ в заголовку сторінки"
 
-#: access/transam/xlogreader.c:1320
+#: access/transam/xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неочікуваний pageaddr %X/%X у сегменті WAL %s, LSN %X/%X, зміщення %u"
 
-#: access/transam/xlogreader.c:1346
+#: access/transam/xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "порушення послідовності ID лінії часу %u (після %u) у сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: access/transam/xlogreader.c:1749
+#: access/transam/xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "ідентифікатор блока %u out-of-order в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1773
+#: access/transam/xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA встановлений, але немає даних в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1780
+#: access/transam/xlogreader.c:1800
 #, 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:1816
+#: access/transam/xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE встановлений, але для пропуску задані: зсув %u, довжина %u, при довжині образу блока %u в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1832
+#: access/transam/xlogreader.c:1852
 #, 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:1846
+#: access/transam/xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED встановлений, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1861
+#: access/transam/xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ні BKPIMAGE_HAS_HOLE, ні BKPIMAGE_COMPRESSED не встановлені, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1877
+#: access/transam/xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL встановлений, але попереднє значення не задано в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1889
+#: access/transam/xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "невірний ідентифікатор блоку %u в позиції %X/%X"
 
-#: access/transam/xlogreader.c:1956
+#: access/transam/xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запис з невірною довжиною на %X/%X"
 
-#: access/transam/xlogreader.c:1982
+#: access/transam/xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не вдалося знайти блок резервної копії з ID %d у записі WAL"
 
-#: access/transam/xlogreader.c:2066
+#: access/transam/xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "не вдалося відновити зображення %X/%X з недійсним вказаним блоком %d"
 
-#: access/transam/xlogreader.c:2073
+#: access/transam/xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "не вдалося відновити зображення %X/%X з недійсним станом, блок %d"
 
-#: access/transam/xlogreader.c:2100 access/transam/xlogreader.c:2117
+#: access/transam/xlogreader.c:2120 access/transam/xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "не вдалося відновити зображення в %X/%X, стиснуте %s, не підтримується збіркою, блок %d"
 
-#: access/transam/xlogreader.c:2126
+#: access/transam/xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "не вдалося відновити зображення %X/%X стиснуте з невідомим методом, блок %d"
 
-#: access/transam/xlogreader.c:2134
+#: access/transam/xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не вдалося розпакувати зображення на %X/%X, блок %d"
 
-#: access/transam/xlogrecovery.c:617
+#: access/transam/xlogrecovery.c:624
 #, c-format
 msgid "starting backup recovery with redo LSN %X/%X, checkpoint LSN %X/%X, on timeline ID %u"
 msgstr "стартуємо відновлення резервної копії з LSN повторення %X/%X, LSN контрольної точки %X/%X, на часовій шкалі з ID %u"
 
-#: access/transam/xlogrecovery.c:649
+#: access/transam/xlogrecovery.c:656
 #, c-format
 msgid "could not find redo location %X/%X referenced by checkpoint record at %X/%X"
 msgstr "не вдалося знайти положення REDO %X/%X, вказане записом контрольної точки в %X/%X"
 
-#: access/transam/xlogrecovery.c:651 access/transam/xlogrecovery.c:662
+#: access/transam/xlogrecovery.c:658 access/transam/xlogrecovery.c:669
 #, c-format
 msgid "If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
 "If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"
@@ -3213,467 +3196,488 @@ msgstr "Якщо ви відновлюєтеся з резервної копі
 "Якщо ви відновлюєте не з резервної копії, спробуйте видалити файл \"%s/backup_label\".\n"
 "Будьте обережні: видалення \"%s/backup_label\" призведе до пошкодження кластера при відновленні з резервної копії."
 
-#: access/transam/xlogrecovery.c:660
+#: access/transam/xlogrecovery.c:667
 #, c-format
 msgid "could not locate required checkpoint record at %X/%X"
 msgstr "не вдалося знайти запис необхідної контрольної точки в %X/%X"
 
-#: access/transam/xlogrecovery.c:690 commands/tablespace.c:664
+#: access/transam/xlogrecovery.c:697 commands/tablespace.c:664
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не вдалося створити символічне послання \"%s\": %m"
 
-#: access/transam/xlogrecovery.c:723 access/transam/xlogrecovery.c:729
+#: access/transam/xlogrecovery.c:730 access/transam/xlogrecovery.c:736
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "файл \"%s\" ігнорується, тому що файлу \"%s\" не існує"
 
-#: access/transam/xlogrecovery.c:725
+#: access/transam/xlogrecovery.c:732
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Файл \"%s\" був перейменований на \"%s\"."
 
-#: access/transam/xlogrecovery.c:731
+#: access/transam/xlogrecovery.c:738
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "Неможливо перейменувати файл \"%s\" на \"%s\": %m."
 
-#: access/transam/xlogrecovery.c:770
+#: access/transam/xlogrecovery.c:777
 #, c-format
 msgid "restarting backup recovery with redo LSN %X/%X"
 msgstr "перезапуск відновлення резервної копії на LSN %X/%X"
 
-#: access/transam/xlogrecovery.c:795
+#: access/transam/xlogrecovery.c:802
 #, c-format
 msgid "could not locate a valid checkpoint record at %X/%X"
 msgstr "не вдалося знайти запис допустимої контрольної точки в %X/%X"
 
-#: access/transam/xlogrecovery.c:806
+#: access/transam/xlogrecovery.c:814
+#, c-format
+msgid "could not find redo location %X/%08X referenced by checkpoint record at %X/%08X"
+msgstr "не вдалося знайти місце перезапису %X/%08X, на який посилається запис контрольної точки в %X/%08X"
+
+#: access/transam/xlogrecovery.c:823
 #, c-format
 msgid "entering standby mode"
 msgstr "перехід у режим очікування"
 
-#: access/transam/xlogrecovery.c:809
+#: access/transam/xlogrecovery.c:826
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "починається відновлення точки в часі до XID %u"
 
-#: access/transam/xlogrecovery.c:813
+#: access/transam/xlogrecovery.c:830
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "починається відновлення точки в часі до %s"
 
-#: access/transam/xlogrecovery.c:817
+#: access/transam/xlogrecovery.c:834
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "починається відновлення точки в часі до \"%s\""
 
-#: access/transam/xlogrecovery.c:821
+#: access/transam/xlogrecovery.c:838
 #, c-format
 msgid "starting point-in-time recovery to WAL location (LSN) \"%X/%X\""
 msgstr "починається відновлення точки в часі до локації WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:825
+#: access/transam/xlogrecovery.c:842
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "починається відновлення даних до першої точки домовленості"
 
-#: access/transam/xlogrecovery.c:828
+#: access/transam/xlogrecovery.c:845
 #, c-format
 msgid "starting archive recovery"
 msgstr "початок відновлення архіву"
 
-#: access/transam/xlogrecovery.c:849
+#: access/transam/xlogrecovery.c:866
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "запитувана лінія часу %u не є відгалуженням історії цього серверу"
 
-#: access/transam/xlogrecovery.c:851
+#. translator: %s is a backup_label file or a pg_control file
+#: access/transam/xlogrecovery.c:869
 #, 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 "Остання контрольна точка %X/%X на лінії часу %u, але в історії запитуваної лінії часу сервер відгалузився з цієї лінії в %X/%X."
+msgid "Latest checkpoint in file \"%s\" 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 "Остання контрольна точка у файлі \"%s\" знаходиться в %X/%X на лінії часу %u, але в історії запитуваної лінії часу сервер відгалузився від тієї лінії часу в %X/%X."
 
-#: access/transam/xlogrecovery.c:865
+#: access/transam/xlogrecovery.c:884
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "запитувана лінія часу %u не містить мінімальну точку відновлення %X/%X на лінії часу %u"
 
-#: access/transam/xlogrecovery.c:893
+#: access/transam/xlogrecovery.c:912
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "невірний ID наступної транзакції"
 
-#: access/transam/xlogrecovery.c:898
+#: access/transam/xlogrecovery.c:917
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "невірний запис REDO в контрольній точці"
 
-#: access/transam/xlogrecovery.c:909
+#: access/transam/xlogrecovery.c:928
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "невірний запис REDO в контрольній точці вимкнення"
 
-#: access/transam/xlogrecovery.c:938
+#: access/transam/xlogrecovery.c:957
 #, c-format
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "робота системи бази даних не була завершена належним чином; відбувається автоматичне відновлення"
 
-#: access/transam/xlogrecovery.c:942
+#: access/transam/xlogrecovery.c:961
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "відновлення після збою починається на лінії часу %u і має цільову лінію часу: %u"
 
-#: access/transam/xlogrecovery.c:985
+#: access/transam/xlogrecovery.c:1004
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label містить дані, які не узгоджені з файлом pg_control"
 
-#: access/transam/xlogrecovery.c:986
+#: access/transam/xlogrecovery.c:1005
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Це означає, що резервна копія була пошкоджена і вам доведеться використати іншу резервну копію для відновлення."
 
-#: access/transam/xlogrecovery.c:1040
+#: access/transam/xlogrecovery.c:1059
 #, c-format
 msgid "using recovery command file \"%s\" is not supported"
 msgstr "використання файлу команд відновлення \"%s\" не підтримується"
 
-#: access/transam/xlogrecovery.c:1105
+#: access/transam/xlogrecovery.c:1124
 #, c-format
 msgid "standby mode is not supported by single-user servers"
 msgstr "режим очікування не підтримується однокористувацьким сервером"
 
-#: access/transam/xlogrecovery.c:1122
+#: access/transam/xlogrecovery.c:1141
 #, c-format
 msgid "specified neither \"primary_conninfo\" nor \"restore_command\""
 msgstr "не вказано ні \"primary_conninfo\", ані \"restore_command\""
 
-#: access/transam/xlogrecovery.c:1123
+#: access/transam/xlogrecovery.c:1142
 #, c-format
 msgid "The database server will regularly poll the pg_wal subdirectory to check for files placed there."
 msgstr "Сервер бази даних буде регулярно опитувати підкатолог pg_wal і перевіряти файли, що містяться у ньому."
 
-#: access/transam/xlogrecovery.c:1131
+#: access/transam/xlogrecovery.c:1150
 #, c-format
 msgid "must specify \"restore_command\" when standby mode is not enabled"
 msgstr "необхідно вказати \"restore_command\", якщо не ввімкнено режиму очікування"
 
-#: access/transam/xlogrecovery.c:1169
+#: access/transam/xlogrecovery.c:1188
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "цільова лінія часу відновлення %u не існує"
 
-#: access/transam/xlogrecovery.c:1252 access/transam/xlogrecovery.c:1259
-#: access/transam/xlogrecovery.c:1318 access/transam/xlogrecovery.c:1406
-#: access/transam/xlogrecovery.c:1415 access/transam/xlogrecovery.c:1435
+#: access/transam/xlogrecovery.c:1271 access/transam/xlogrecovery.c:1278
+#: access/transam/xlogrecovery.c:1337 access/transam/xlogrecovery.c:1425
+#: access/transam/xlogrecovery.c:1434 access/transam/xlogrecovery.c:1454
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "невірні дані у файлі \"%s\""
 
-#: access/transam/xlogrecovery.c:1319
+#: access/transam/xlogrecovery.c:1338
 #, c-format
 msgid "Timeline ID parsed is %u, but expected %u."
 msgstr "Проаналізовано ID часової лінії %u, очіувалося %u."
 
-#: access/transam/xlogrecovery.c:1330
+#: access/transam/xlogrecovery.c:1349
 #, c-format
 msgid "this is an incremental backup, not a data directory"
 msgstr "це інкрементна резервна копія, а не каталог даних"
 
-#: access/transam/xlogrecovery.c:1331
+#: access/transam/xlogrecovery.c:1350
 #, c-format
 msgid "Use pg_combinebackup to reconstruct a valid data directory."
 msgstr "Використовуйте pg_combinebackup для відновлення правильного каталогу даних."
 
-#: access/transam/xlogrecovery.c:1717
+#: access/transam/xlogrecovery.c:1736
 #, c-format
 msgid "unexpected record type found at redo point %X/%X"
 msgstr "знайдено неочікуваний тип запису в точці повторення %X/%X"
 
-#: access/transam/xlogrecovery.c:1740
+#: access/transam/xlogrecovery.c:1759
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "запис REDO починається з %X/%X"
 
-#: access/transam/xlogrecovery.c:1753
+#: access/transam/xlogrecovery.c:1772
 #, c-format
 msgid "redo in progress, elapsed time: %ld.%02d s, current LSN: %X/%X"
 msgstr "запис REDO триває, минуло часу: %ld.%02d s, поточний LSN: %X/%X"
 
-#: access/transam/xlogrecovery.c:1843
+#: access/transam/xlogrecovery.c:1862
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "запитувана точка відновлення передує узгодженій точці відновлення"
 
-#: access/transam/xlogrecovery.c:1875
+#: access/transam/xlogrecovery.c:1894
 #, c-format
 msgid "redo done at %X/%X system usage: %s"
 msgstr "повторно виконано через %X/%X системне використання: %s"
 
-#: access/transam/xlogrecovery.c:1881
+#: access/transam/xlogrecovery.c:1900
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "остання завершена транзакція була в %s"
 
-#: access/transam/xlogrecovery.c:1890
+#: access/transam/xlogrecovery.c:1909
 #, c-format
 msgid "redo is not required"
 msgstr "дані REDO не потрібні"
 
-#: access/transam/xlogrecovery.c:1901
+#: access/transam/xlogrecovery.c:1921
 #, c-format
 msgid "recovery ended before configured recovery target was reached"
 msgstr "відновлення завершилось до досягення налаштованої цілі відновлення"
 
-#: access/transam/xlogrecovery.c:2095
+#: access/transam/xlogrecovery.c:2115
 #, c-format
 msgid "successfully skipped missing contrecord at %X/%X, overwritten at %s"
 msgstr "успішно пропущений відсутній contrecord при %X/%X, перезаписано на %s"
 
-#: access/transam/xlogrecovery.c:2162
+#: access/transam/xlogrecovery.c:2182
 #, c-format
 msgid "unexpected directory entry \"%s\" found in %s"
 msgstr "знайдено неочікуваний запис каталогу \"%s\" в %s"
 
-#: access/transam/xlogrecovery.c:2164
+#: access/transam/xlogrecovery.c:2184
 #, c-format
-msgid "All directory entries in pg_tblspc/ should be symbolic links."
-msgstr "Всі записи каталогу в pg_tblspc/ повинні бути символічними посиланнями."
+msgid "All directory entries in %s/ should be symbolic links."
+msgstr "Всі записи каталогу в %s/ мають бути символічними посиланнями."
 
-#: access/transam/xlogrecovery.c:2165
+#: access/transam/xlogrecovery.c:2186
 #, c-format
 msgid "Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete."
 msgstr "Видаліть ті каталоги, або тимчасово встановіть для параметра \"allow_in_place_tablespaces\" значення ON, щоб завершити відновлення."
 
-#: access/transam/xlogrecovery.c:2217
+#: access/transam/xlogrecovery.c:2238
 #, c-format
 msgid "completed backup recovery with redo LSN %X/%X and end LSN %X/%X"
 msgstr "завершено відновлення резервної копії з LSN повторення %X/%X і LSN закінчення %X/%X"
 
-#: access/transam/xlogrecovery.c:2247
+#: access/transam/xlogrecovery.c:2269
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "узгоджений стан відновлення досягнутий %X/%X"
 
 #. translator: %s is a WAL record description
-#: access/transam/xlogrecovery.c:2285
+#: access/transam/xlogrecovery.c:2307
 #, c-format
 msgid "WAL redo at %X/%X for %s"
 msgstr "запис REDO в WAL в позиції %X/%X для %s"
 
-#: access/transam/xlogrecovery.c:2383
+#: access/transam/xlogrecovery.c:2405
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "несподіваний ID попередньої лінії часу %u (ID теперішньої лінії часу %u) в записі контрольної точки"
 
-#: access/transam/xlogrecovery.c:2392
+#: access/transam/xlogrecovery.c:2414
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "неочікуваний ID лінії часу %u (після %u) в записі контрольної точки"
 
-#: access/transam/xlogrecovery.c:2408
+#: access/transam/xlogrecovery.c:2430
 #, 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"
 
-#: access/transam/xlogrecovery.c:2592 access/transam/xlogrecovery.c:2868
+#: access/transam/xlogrecovery.c:2614 access/transam/xlogrecovery.c:2890
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "відновлення зупиняється після досягнення узгодженості"
 
-#: access/transam/xlogrecovery.c:2613
+#: access/transam/xlogrecovery.c:2635
 #, c-format
 msgid "recovery stopping before WAL location (LSN) \"%X/%X\""
 msgstr "відновлення зупиняється перед позицією WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2703
+#: access/transam/xlogrecovery.c:2725
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "відновлення припиняється до підтвердження транзакції %u, час %s"
 
-#: access/transam/xlogrecovery.c:2710
+#: access/transam/xlogrecovery.c:2732
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "відновлення припиняється до скасування транзакції %u, час %s"
 
-#: access/transam/xlogrecovery.c:2763
+#: access/transam/xlogrecovery.c:2785
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "відновлення припиняється в точці відновлення\"%s\", час %s"
 
-#: access/transam/xlogrecovery.c:2781
+#: access/transam/xlogrecovery.c:2803
 #, c-format
 msgid "recovery stopping after WAL location (LSN) \"%X/%X\""
 msgstr "відновлення припиняється пісня локації WAL (LSN) \"%X/%X\""
 
-#: access/transam/xlogrecovery.c:2848
+#: access/transam/xlogrecovery.c:2870
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "відновлення припиняється після підтвердження транзакції %u, час %s"
 
-#: access/transam/xlogrecovery.c:2856
+#: access/transam/xlogrecovery.c:2878
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "відновлення припиняється після скасування транзакції %u, час %s"
 
-#: access/transam/xlogrecovery.c:2937
+#: access/transam/xlogrecovery.c:2959
 #, c-format
 msgid "pausing at the end of recovery"
 msgstr "пауза в кінці відновлення"
 
-#: access/transam/xlogrecovery.c:2938
+#: access/transam/xlogrecovery.c:2960
 #, c-format
 msgid "Execute pg_wal_replay_resume() to promote."
 msgstr "Виконайте pg_wal_replay_resume() для підвищення рівня."
 
-#: access/transam/xlogrecovery.c:2941 access/transam/xlogrecovery.c:4678
+#: access/transam/xlogrecovery.c:2963 access/transam/xlogrecovery.c:4720
 #, c-format
 msgid "recovery has paused"
 msgstr "відновлення зупинено"
 
-#: access/transam/xlogrecovery.c:2942
+#: access/transam/xlogrecovery.c:2964
 #, c-format
 msgid "Execute pg_wal_replay_resume() to continue."
 msgstr "Виконайте pg_wal_replay_resume(), щоб продовжити."
 
-#: access/transam/xlogrecovery.c:3205
+#: access/transam/xlogrecovery.c:3227
 #, c-format
 msgid "unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неочікуваний ID лінії часу %u в сегменті WAL %s, LSN %X/%X, offset %u"
 
-#: access/transam/xlogrecovery.c:3413
+#: access/transam/xlogrecovery.c:3443
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: %m"
 msgstr "не вдалося прочитати сегмент журналу %s, LSN %X/%X, зсув %u: %m"
 
-#: access/transam/xlogrecovery.c:3420
+#: access/transam/xlogrecovery.c:3450
 #, c-format
 msgid "could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu"
 msgstr "не вдалося прочитати сегмент WAL %s, LSN %X/%X, зсув %u: прочитано %d з %zu"
 
-#: access/transam/xlogrecovery.c:4060
+#: access/transam/xlogrecovery.c:4104
 #, c-format
 msgid "invalid checkpoint location"
 msgstr "невірне розташування контрольної точки"
 
-#: access/transam/xlogrecovery.c:4070
+#: access/transam/xlogrecovery.c:4114
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "невірний запис контрольної точки"
 
-#: access/transam/xlogrecovery.c:4076
+#: access/transam/xlogrecovery.c:4120
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "невірний ID менеджера ресурсів в записі контрольної точки"
 
-#: access/transam/xlogrecovery.c:4084
+#: access/transam/xlogrecovery.c:4128
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "невірний xl_info у записі контрольної точки"
 
-#: access/transam/xlogrecovery.c:4090
+#: access/transam/xlogrecovery.c:4134
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "невірна довжина запису контрольної точки"
 
-#: access/transam/xlogrecovery.c:4144
+#: access/transam/xlogrecovery.c:4188
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "нова лінія часу %u не є дочірньою для лінії часу системи бази даних %u"
 
-#: access/transam/xlogrecovery.c:4158
+#: access/transam/xlogrecovery.c:4202
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "нова лінія часу %u відгалузилась від поточної лінії часу бази даних %u до поточної точки відновлення %X/%X"
 
-#: access/transam/xlogrecovery.c:4177
+#: access/transam/xlogrecovery.c:4221
 #, c-format
 msgid "new target timeline is %u"
 msgstr "нова цільова лінія часу %u"
 
-#: access/transam/xlogrecovery.c:4380
+#: access/transam/xlogrecovery.c:4422
 #, c-format
 msgid "WAL receiver process shutdown requested"
 msgstr "Запит на вимкнення процесу приймача WAL"
 
-#: access/transam/xlogrecovery.c:4440
+#: access/transam/xlogrecovery.c:4482
 #, c-format
 msgid "received promote request"
 msgstr "отримано запит підвищення статусу"
 
-#: access/transam/xlogrecovery.c:4669
+#: access/transam/xlogrecovery.c:4711
 #, c-format
 msgid "hot standby is not possible because of insufficient parameter settings"
 msgstr "hot standby неможливий через недостатнє налаштування параметрів"
 
-#: access/transam/xlogrecovery.c:4670 access/transam/xlogrecovery.c:4697
-#: access/transam/xlogrecovery.c:4727
+#: access/transam/xlogrecovery.c:4712 access/transam/xlogrecovery.c:4739
+#: access/transam/xlogrecovery.c:4769
 #, c-format
 msgid "%s = %d is a lower setting than on the primary server, where its value was %d."
 msgstr "%s = %d є нижчим параметром, ніж на основному сервері, де його значення було %d."
 
-#: access/transam/xlogrecovery.c:4679
+#: access/transam/xlogrecovery.c:4721
 #, c-format
 msgid "If recovery is unpaused, the server will shut down."
 msgstr "Якщо відновлення не буде зупинено, сервер завершить роботу."
 
-#: access/transam/xlogrecovery.c:4680
+#: access/transam/xlogrecovery.c:4722
 #, c-format
 msgid "You can then restart the server after making the necessary configuration changes."
 msgstr "Після здійснення необхідних змін у конфігурації, ви можете перезапустити сервер."
 
-#: access/transam/xlogrecovery.c:4691
+#: access/transam/xlogrecovery.c:4733
 #, c-format
 msgid "promotion is not possible because of insufficient parameter settings"
 msgstr "підвищення неможливе через недостатнє налаштування параметрів"
 
-#: access/transam/xlogrecovery.c:4701
+#: access/transam/xlogrecovery.c:4743
 #, c-format
 msgid "Restart the server after making the necessary configuration changes."
 msgstr "Перезапустити сервер після здійснення необхідних змін у конфігурації."
 
-#: access/transam/xlogrecovery.c:4725
+#: access/transam/xlogrecovery.c:4767
 #, c-format
 msgid "recovery aborted because of insufficient parameter settings"
 msgstr "відновлення перервано через недостатнє налаштування параметрів"
 
-#: access/transam/xlogrecovery.c:4731
+#: access/transam/xlogrecovery.c:4773
 #, c-format
 msgid "You can restart the server after making the necessary configuration changes."
 msgstr "Ви можете перезапустити сервер, після здійснення необхідних змін у конфігурації."
 
-#: access/transam/xlogrecovery.c:4773
+#: access/transam/xlogrecovery.c:4793 access/transam/xlogrecovery.c:4795
+#: catalog/dependency.c:1153 catalog/dependency.c:1160
+#: catalog/dependency.c:1171 commands/tablecmds.c:1519
+#: commands/tablecmds.c:16740 commands/tablespace.c:460 commands/user.c:1302
+#: commands/vacuum.c:226 commands/view.c:441 executor/execExprInterp.c:5211
+#: executor/execExprInterp.c:5219 libpq/auth.c:320
+#: replication/logical/applyparallelworker.c:1048 replication/slot.c:1701
+#: replication/slot.c:2779 replication/slot.c:2781 replication/syncrep.c:1079
+#: storage/aio/method_io_uring.c:389 storage/lmgr/deadlock.c:1137
+#: storage/lmgr/proc.c:1525 utils/misc/guc.c:3166 utils/misc/guc.c:3207
+#: utils/misc/guc.c:3282 utils/misc/guc.c:6834 utils/misc/guc.c:6868
+#: utils/misc/guc.c:6902 utils/misc/guc.c:6945 utils/misc/guc.c:6987
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: access/transam/xlogrecovery.c:4825
 #, c-format
 msgid "multiple recovery targets specified"
 msgstr "вказано декілька цілей відновлення"
 
-#: access/transam/xlogrecovery.c:4774
+#: access/transam/xlogrecovery.c:4826
 #, c-format
 msgid "At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set."
 msgstr "Максимум один із \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" може бути встановлений."
 
-#: access/transam/xlogrecovery.c:4785
+#: access/transam/xlogrecovery.c:4837
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Єдиним дозволеним значенням є \"immediate\"."
 
-#: access/transam/xlogrecovery.c:4937 utils/adt/timestamp.c:202
-#: utils/adt/timestamp.c:455
+#: access/transam/xlogrecovery.c:4991
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "позначка часу поза діапазоном: \"%s\""
+msgid "Timestamp out of range: \"%s\"."
+msgstr "Мітка часу поза межами: \"%s\"."
 
-#: access/transam/xlogrecovery.c:4982
+#: access/transam/xlogrecovery.c:5036
 #, c-format
 msgid "\"recovery_target_timeline\" is not a valid number."
 msgstr "\"recovery_target_timeline\" не є допустимим числом."
 
-#: access/transam/xlogutils.c:1032
+#: access/transam/xlogutils.c:1023
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: %m"
 msgstr "не вдалося прочитати сегмент WAL %s, зсув %d: %m"
 
-#: access/transam/xlogutils.c:1039
+#: access/transam/xlogutils.c:1030
 #, c-format
 msgid "could not read from WAL segment %s, offset %d: read %d of %d"
 msgstr "не вдалося прочитати сегмент WAL %s, зсув %d: прочитано %d з %d"
@@ -3694,7 +3698,7 @@ msgstr "Команда архівації з помилкою: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "команда архівації була перервана винятком 0x%X"
 
-#: archive/shell_archive.c:109 postmaster/postmaster.c:3094
+#: archive/shell_archive.c:109 postmaster/postmaster.c:2850
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Опис цього Шістнадцяткового значення дивіться у включаємому C-файлі \"ntstatus.h\"."
@@ -3709,42 +3713,42 @@ msgstr "команда архівації була перервана сигна
 msgid "archive command exited with unrecognized status %d"
 msgstr "команда архівації завершена з нерозпізнаним статусом %d"
 
-#: backup/backup_manifest.c:254
+#: backup/backup_manifest.c:255
 #, c-format
 msgid "expected end timeline %u but found timeline %u"
 msgstr "очікувався кінець часової шкали %u але знайдено часову шкалу %u"
 
-#: backup/backup_manifest.c:278
+#: backup/backup_manifest.c:279
 #, c-format
 msgid "expected start timeline %u but found timeline %u"
 msgstr "очікувався початок часової шкали %u але знайдено часову шкалу %u"
 
-#: backup/backup_manifest.c:305
+#: backup/backup_manifest.c:306
 #, c-format
 msgid "start timeline %u not found in history of timeline %u"
 msgstr "початок часової шкали %u не знайдено в історії часової шкали %u"
 
-#: backup/backup_manifest.c:356
+#: backup/backup_manifest.c:357
 #, c-format
 msgid "could not rewind temporary file"
 msgstr "не вдалося перемотати назад тимчасовий файл"
 
-#: backup/basebackup.c:479
+#: backup/basebackup.c:481
 #, c-format
 msgid "could not find any WAL files"
 msgstr "не вдалося знайти ні одного файла WAL"
 
-#: backup/basebackup.c:494 backup/basebackup.c:509 backup/basebackup.c:518
+#: backup/basebackup.c:496 backup/basebackup.c:511 backup/basebackup.c:520
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "не вдалося знайти файл WAL \"%s\""
 
-#: backup/basebackup.c:560 backup/basebackup.c:585
+#: backup/basebackup.c:562 backup/basebackup.c:587
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "неочікуаний розмір файлу WAL \"%s\""
 
-#: backup/basebackup.c:656
+#: backup/basebackup.c:658
 #, c-format
 msgid "%lld total checksum verification failure"
 msgid_plural "%lld total checksum verification failures"
@@ -3753,96 +3757,96 @@ msgstr[1] "всього помилок перевірки контрольних
 msgstr[2] "всього помилок перевірки контрольних сум: %lld"
 msgstr[3] "всього помилок перевірки контрольних сум: %lld"
 
-#: backup/basebackup.c:663
+#: backup/basebackup.c:665
 #, c-format
 msgid "checksum verification failure during base backup"
 msgstr "під час базового резервного копіювання виявлено неполадки контрольних сум"
 
-#: backup/basebackup.c:733 backup/basebackup.c:742 backup/basebackup.c:753
-#: backup/basebackup.c:770 backup/basebackup.c:779 backup/basebackup.c:788
-#: backup/basebackup.c:803 backup/basebackup.c:820 backup/basebackup.c:829
-#: backup/basebackup.c:841 backup/basebackup.c:865 backup/basebackup.c:879
-#: backup/basebackup.c:890 backup/basebackup.c:901 backup/basebackup.c:914
+#: backup/basebackup.c:735 backup/basebackup.c:744 backup/basebackup.c:755
+#: backup/basebackup.c:772 backup/basebackup.c:781 backup/basebackup.c:790
+#: backup/basebackup.c:805 backup/basebackup.c:822 backup/basebackup.c:831
+#: backup/basebackup.c:843 backup/basebackup.c:867 backup/basebackup.c:881
+#: backup/basebackup.c:892 backup/basebackup.c:903 backup/basebackup.c:916
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "повторюваний параметр \"%s\""
 
-#: backup/basebackup.c:761
+#: backup/basebackup.c:763
 #, c-format
 msgid "unrecognized checkpoint type: \"%s\""
 msgstr "нерозпізнаний тип контрольної точки: \"%s\""
 
-#: backup/basebackup.c:793
+#: backup/basebackup.c:795
 #, c-format
 msgid "incremental backups cannot be taken unless WAL summarization is enabled"
 msgstr "інкрементні резервні копії не можна створювати, якщо не ввімкнено підсумовування WAL"
 
-#: backup/basebackup.c:809
+#: backup/basebackup.c:811
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d за припустимим діапазномо для параметру \"%s\" (%d .. %d)"
 
-#: backup/basebackup.c:854
+#: backup/basebackup.c:856
 #, c-format
 msgid "unrecognized manifest option: \"%s\""
 msgstr "нерозпізнаний параметр маніфесту: \"%s\""
 
-#: backup/basebackup.c:905
+#: backup/basebackup.c:907
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм стискання: \"%s\""
 
-#: backup/basebackup.c:921
+#: backup/basebackup.c:923
 #, c-format
 msgid "unrecognized base backup option: \"%s\""
 msgstr "нерозпізнаний параметр базової резервної копії: \"%s\""
 
-#: backup/basebackup.c:932
+#: backup/basebackup.c:934
 #, c-format
 msgid "manifest checksums require a backup manifest"
 msgstr "контрольні суми маніфесту потребують резервного копіювання маніфесту"
 
-#: backup/basebackup.c:941
+#: backup/basebackup.c:943
 #, c-format
 msgid "target detail cannot be used without target"
 msgstr "елемент цілі не можна використовувати без цілі"
 
-#: backup/basebackup.c:950 backup/basebackup_target.c:218
+#: backup/basebackup.c:952 backup/basebackup_target.c:218
 #, c-format
 msgid "target \"%s\" does not accept a target detail"
 msgstr "ціль \"%s\" не приймає елемент цілі"
 
-#: backup/basebackup.c:961
+#: backup/basebackup.c:963
 #, c-format
 msgid "compression detail cannot be specified unless compression is enabled"
 msgstr "деталі стиснення не можуть бути вказані, якщо не увімкнено стиснення"
 
-#: backup/basebackup.c:974
+#: backup/basebackup.c:976
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неприпустима специфікація стискання: %s"
 
-#: backup/basebackup.c:1024
+#: backup/basebackup.c:1026
 #, c-format
 msgid "must UPLOAD_MANIFEST before performing an incremental BASE_BACKUP"
 msgstr "повинен UPLOAD_MANIFEST перед виконанням інкрементного BASE_BACKUP"
 
-#: backup/basebackup.c:1157 backup/basebackup.c:1358
+#: backup/basebackup.c:1159 backup/basebackup.c:1360
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "не вдалося отримати інформацію про файл або каталог \"%s\": %m"
 
-#: backup/basebackup.c:1544
+#: backup/basebackup.c:1546
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "спеціальний файл \"%s\" пропускається"
 
-#: backup/basebackup.c:1751
+#: backup/basebackup.c:1753
 #, c-format
 msgid "could not verify checksum in file \"%s\", block %u: read buffer size %d and page size %d differ"
 msgstr "не вдалося перевірити контрольну суму у файлі \"%s\", блок %u: розмір прочитаного буфера %d і розмір прочитаної сторінки %d відрізняються"
 
-#: backup/basebackup.c:1813
+#: backup/basebackup.c:1815
 #, c-format
 msgid "file \"%s\" has a total of %d checksum verification failure"
 msgid_plural "file \"%s\" has a total of %d checksum verification failures"
@@ -3851,27 +3855,27 @@ msgstr[1] "файл \"%s\" має загальну кількість помил
 msgstr[2] "файл \"%s\" має загальну кількість помилок перевірки контрольної суми: %d"
 msgstr[3] "файл \"%s\" має загальну кількість помилок перевірки контрольної суми: %d"
 
-#: backup/basebackup.c:1917
+#: backup/basebackup.c:1920
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated %X but expected %X"
 msgstr "помилка перевірки контрольної суми у файлі \"%s\", блок %u: обчислено %X, але очікувалось %X"
 
-#: backup/basebackup.c:1924
+#: backup/basebackup.c:1927
 #, c-format
 msgid "further checksum verification failures in file \"%s\" will not be reported"
 msgstr "про подальші помилки під час перевірки контрольної суми в файлі \"%s\" повідомлятись не буде"
 
-#: backup/basebackup.c:2048
+#: backup/basebackup.c:2052
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "ім'я файлу занадто довге для tar формату: \"%s\""
 
-#: backup/basebackup.c:2053
+#: backup/basebackup.c:2058
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
 msgstr "мета символьного посилання занадто довга для формату tar: ім'я файлу \"%s\", мета \"%s\""
 
-#: backup/basebackup.c:2127
+#: backup/basebackup.c:2132
 #, c-format
 msgid "could not read file \"%s\": read %zd of %zu"
 msgstr "не вдалося прочитати файл \"%s\": читання %zd з %zu"
@@ -3886,65 +3890,65 @@ msgstr "стискання gzip не підтримується цією збі
 msgid "could not initialize compression library"
 msgstr "не вдалося ініціалізувати бібліотеку стискання"
 
-#: backup/basebackup_incremental.c:294
+#: backup/basebackup_incremental.c:292
 #, c-format
 msgid "manifest contains no required WAL ranges"
 msgstr "маніфест не містить необхідних діапазонів WAL"
 
-#: backup/basebackup_incremental.c:349
+#: backup/basebackup_incremental.c:347
 #, c-format
 msgid "timeline %u found in manifest, but not in this server's history"
 msgstr "часову шкалу %u знайдено в маніфесті, але не в історії цього сервера"
 
-#: backup/basebackup_incremental.c:414
+#: backup/basebackup_incremental.c:412
 #, c-format
 msgid "manifest requires WAL from initial timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "маніфест вимагає WAL з початкової шкали %u, починаючи з %X/%X, але ця шкала починається з %X/%X"
 
-#: backup/basebackup_incremental.c:424
+#: backup/basebackup_incremental.c:422
 #, c-format
 msgid "manifest requires WAL from continuation timeline %u starting at %X/%X, but that timeline begins at %X/%X"
 msgstr "маніфест вимагає WAL зі шкали продовження %u, починаючи з %X/%X, але ця шкала починається з %X/%X"
 
-#: backup/basebackup_incremental.c:435
+#: backup/basebackup_incremental.c:433
 #, c-format
 msgid "manifest requires WAL from final timeline %u ending at %X/%X, but this backup starts at %X/%X"
 msgstr "маніфест вимагає WAL з кінцевої шкали часу %u, що закінчується на %X/%X, але ця резервна копія починається з %X/%X"
 
-#: backup/basebackup_incremental.c:439
+#: backup/basebackup_incremental.c:437
 #, c-format
 msgid "This can happen for incremental backups on a standby if there was little activity since the previous backup."
 msgstr "Це може статися з інкрементними резервними копіями на резервному сервері, якщо було замало активності з минулої резервної копії."
 
-#: backup/basebackup_incremental.c:446
+#: backup/basebackup_incremental.c:444
 #, c-format
 msgid "manifest requires WAL from non-final timeline %u ending at %X/%X, but this server switched timelines at %X/%X"
 msgstr "маніфест вимагає WAL з не фінальної лінійки %u, що закінчується на %X/%X, але цей сервер перемкнув лінійки на %X/%X"
 
-#: backup/basebackup_incremental.c:527
+#: backup/basebackup_incremental.c:525
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but no summaries for that timeline and LSN range exist"
 msgstr "Зведення WAL потрібні на часовій шкалі %u від %X/%X до %X/%X, але зведень для цієї шкали та діапазону LSN не існує"
 
-#: backup/basebackup_incremental.c:534
+#: backup/basebackup_incremental.c:532
 #, c-format
 msgid "WAL summaries are required on timeline %u from %X/%X to %X/%X, but the summaries for that timeline and LSN range are incomplete"
 msgstr "Зведення WAL потрібні на часовій шкалі %u від %X/%X до %X/%X, але зведення для цієї часової шкали та діапазону LSN є неповними"
 
-#: backup/basebackup_incremental.c:538
+#: backup/basebackup_incremental.c:536
 #, c-format
 msgid "The first unsummarized LSN in this range is %X/%X."
 msgstr "Перший не підсумований LSN у цьому діапазоні - %X/%X."
 
-#: backup/basebackup_incremental.c:938
+#: backup/basebackup_incremental.c:934
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "маніфест резервного копіювання версії 1 не підтримує інкреметного резервного копіювання"
 
-#: backup/basebackup_incremental.c:956
+#: backup/basebackup_incremental.c:952
 #, c-format
-msgid "system identifier in backup manifest is %llu, but database system identifier is %llu"
-msgstr "системний ідентифікатор в маніфесті резервного копіювання %llu, але ідентифікатор системи бази даних є %llu"
+msgid "system identifier in backup manifest is %<PRIu64>, but database system identifier is %<PRIu64>"
+msgstr "системний ідентифікатор у маніфесті резервної копії - %<PRIu64>, а системний ідентифікатор бази даних - %<PRIu64>"
 
 #: backup/basebackup_lz4.c:67
 #, c-format
@@ -3966,10 +3970,10 @@ msgstr "Тільки ролі з привілеями ролі \"%s\" можут
 msgid "relative path not allowed for backup stored on server"
 msgstr "відносний шлях не дозволений для резервного копіювання збереженого на сервері"
 
-#: backup/basebackup_server.c:102 commands/dbcommands.c:477
+#: backup/basebackup_server.c:102 commands/dbcommands.c:478
 #: commands/tablespace.c:157 commands/tablespace.c:173
-#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:1986
-#: storage/file/copydir.c:47
+#: commands/tablespace.c:593 commands/tablespace.c:638 replication/slot.c:2283
+#: storage/file/copydir.c:58
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не вдалося створити каталог \"%s\": %m"
@@ -3979,15 +3983,15 @@ msgstr "не вдалося створити каталог \"%s\": %m"
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" існує, але він не порожній"
 
-#: backup/basebackup_server.c:123 utils/init/postinit.c:1177
+#: backup/basebackup_server.c:123 utils/init/postinit.c:1160
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "немає доступу до каталогу \"%s\": %m"
 
 #: backup/basebackup_server.c:175 backup/basebackup_server.c:182
 #: backup/basebackup_server.c:268 backup/basebackup_server.c:275
-#: backup/walsummary.c:312 storage/smgr/md.c:502 storage/smgr/md.c:509
-#: storage/smgr/md.c:591 storage/smgr/md.c:613 storage/smgr/md.c:999
+#: backup/walsummary.c:312 storage/smgr/md.c:519 storage/smgr/md.c:526
+#: storage/smgr/md.c:608 storage/smgr/md.c:630 storage/smgr/md.c:1123
 #, c-format
 msgid "Check free disk space."
 msgstr "Перевірьте вільний дисковий простір."
@@ -4025,692 +4029,688 @@ msgstr "не вдалося включити режим довгої відст
 
 #: backup/walsummaryfuncs.c:95
 #, c-format
-msgid "invalid timeline %lld"
-msgstr "неприпустима часова шкала %lld"
+msgid "invalid timeline %<PRId64>"
+msgstr "недійсна лінія часу %<PRId64>"
+
+#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:626 tcop/postgres.c:3858
+#, c-format
+msgid "--%s must be first argument"
+msgstr "--%s має бути першим аргументом"
 
-#: bootstrap/bootstrap.c:239 postmaster/postmaster.c:623 tcop/postgres.c:3946
+#: bootstrap/bootstrap.c:253 postmaster/postmaster.c:640 tcop/postgres.c:3872
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s необхідне значення"
 
-#: bootstrap/bootstrap.c:244 postmaster/postmaster.c:628 tcop/postgres.c:3951
+#: bootstrap/bootstrap.c:258 postmaster/postmaster.c:645 tcop/postgres.c:3877
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s необхідне значення"
 
-#: bootstrap/bootstrap.c:282 postmaster/postmaster.c:746
-#: postmaster/postmaster.c:759
+#: bootstrap/bootstrap.c:296 postmaster/postmaster.c:763
+#: postmaster/postmaster.c:776
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
 
-#: bootstrap/bootstrap.c:291
+#: bootstrap/bootstrap.c:305
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: невірні аргументи командного рядка\n"
 
-#: catalog/aclchk.c:210
+#: catalog/aclchk.c:211
 #, c-format
 msgid "grant options can only be granted to roles"
 msgstr "право надання прав можна надавати тільки ролям"
 
-#: catalog/aclchk.c:332
+#: catalog/aclchk.c:333
 #, c-format
 msgid "no privileges were granted for column \"%s\" of relation \"%s\""
 msgstr "для стовпця \"%s\" відношення \"%s\" не призначено ніяких прав"
 
-#: catalog/aclchk.c:337
+#: catalog/aclchk.c:338
 #, c-format
 msgid "no privileges were granted for \"%s\""
 msgstr "для \"%s\" не призначено ніяких прав"
 
-#: catalog/aclchk.c:345
+#: catalog/aclchk.c:346
 #, c-format
 msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
 msgstr "для стовпця \"%s\" відношення \"%s\" призначено не всі права"
 
-#: catalog/aclchk.c:350
+#: catalog/aclchk.c:351
 #, c-format
 msgid "not all privileges were granted for \"%s\""
 msgstr "для \"%s\" призначено не всі права"
 
-#: catalog/aclchk.c:361
+#: catalog/aclchk.c:362
 #, c-format
 msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr "для стовпця \"%s\" відношення \"%s\" жодні права не можуть бути відкликані"
 
-#: catalog/aclchk.c:366
+#: catalog/aclchk.c:367
 #, c-format
 msgid "no privileges could be revoked for \"%s\""
 msgstr "для \"%s\" жодні права не можуть бути відкликані"
 
-#: catalog/aclchk.c:374
+#: catalog/aclchk.c:375
 #, c-format
 msgid "not all privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr "для стовпця \"%s\" відношення \"%s\" не всі права можуть бути відкликані"
 
-#: catalog/aclchk.c:379
+#: catalog/aclchk.c:380
 #, c-format
 msgid "not all privileges could be revoked for \"%s\""
 msgstr "для \"%s\" не всі права можуть бути відкликані"
 
-#: catalog/aclchk.c:411
+#: catalog/aclchk.c:412
 #, c-format
 msgid "grantor must be current user"
 msgstr "грантодавець повинен бути поточним користувачем"
 
-#: catalog/aclchk.c:479 catalog/aclchk.c:1054
+#: catalog/aclchk.c:480 catalog/aclchk.c:996
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "недійсний тип права %s для відношення"
 
-#: catalog/aclchk.c:483 catalog/aclchk.c:1058
+#: catalog/aclchk.c:484 catalog/aclchk.c:1000
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "невірний тип права %s для послідовності"
 
-#: catalog/aclchk.c:487
+#: catalog/aclchk.c:488
 #, c-format
 msgid "invalid privilege type %s for database"
 msgstr "недійсний тип права %s для бази даних"
 
-#: catalog/aclchk.c:491
+#: catalog/aclchk.c:492
 #, c-format
 msgid "invalid privilege type %s for domain"
 msgstr "недійсний тип права %s для домену"
 
-#: catalog/aclchk.c:495 catalog/aclchk.c:1062
+#: catalog/aclchk.c:496 catalog/aclchk.c:1004
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "недійсний тип права %s для функції"
 
-#: catalog/aclchk.c:499
+#: catalog/aclchk.c:500
 #, c-format
 msgid "invalid privilege type %s for language"
 msgstr "недійсний тип права %s для мови"
 
-#: catalog/aclchk.c:503
+#: catalog/aclchk.c:504 catalog/aclchk.c:1024
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "недійсний тип права %s для великого об'єкту"
 
-#: catalog/aclchk.c:507 catalog/aclchk.c:1078
+#: catalog/aclchk.c:508 catalog/aclchk.c:1020
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "недійсний тип привілеїв %s для схеми"
 
-#: catalog/aclchk.c:511 catalog/aclchk.c:1066
+#: catalog/aclchk.c:512 catalog/aclchk.c:1008
 #, c-format
 msgid "invalid privilege type %s for procedure"
 msgstr "недійсний тип привілеїв %s для процедури"
 
-#: catalog/aclchk.c:515 catalog/aclchk.c:1070
+#: catalog/aclchk.c:516 catalog/aclchk.c:1012
 #, c-format
 msgid "invalid privilege type %s for routine"
 msgstr "недійсний тип привілею %s для підпрограми"
 
-#: catalog/aclchk.c:519
+#: catalog/aclchk.c:520
 #, c-format
 msgid "invalid privilege type %s for tablespace"
 msgstr "недійсний тип привілеїв %s для табличного простору"
 
-#: catalog/aclchk.c:523 catalog/aclchk.c:1074
+#: catalog/aclchk.c:524 catalog/aclchk.c:1016
 #, c-format
 msgid "invalid privilege type %s for type"
 msgstr "недійсний тип привілею %s для типу"
 
-#: catalog/aclchk.c:527
+#: catalog/aclchk.c:528
 #, c-format
 msgid "invalid privilege type %s for foreign-data wrapper"
 msgstr "недійсний тип привілею %s для джерела сторонніх даних"
 
-#: catalog/aclchk.c:531
+#: catalog/aclchk.c:532
 #, c-format
 msgid "invalid privilege type %s for foreign server"
 msgstr "недійсний тип привілею %s для стороннього серверу"
 
-#: catalog/aclchk.c:535
+#: catalog/aclchk.c:536
 #, c-format
 msgid "invalid privilege type %s for parameter"
 msgstr "неприпустимий тип привілею %s для параметру"
 
-#: catalog/aclchk.c:574
+#: catalog/aclchk.c:575
 #, c-format
 msgid "column privileges are only valid for relations"
 msgstr "привілеї стовпця дійсні лише для зв'язків"
 
-#: catalog/aclchk.c:737 catalog/aclchk.c:3624 catalog/objectaddress.c:1054
-#: catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:285
-#, c-format
-msgid "large object %u does not exist"
-msgstr "великого об'єкту %u не існує"
-
-#: catalog/aclchk.c:1111
+#: catalog/aclchk.c:1057
 #, c-format
 msgid "default privileges cannot be set for columns"
 msgstr "права за замовчуванням не можна встановити для стовпців"
 
-#: catalog/aclchk.c:1147
+#: catalog/aclchk.c:1093
 #, c-format
 msgid "permission denied to change default privileges"
 msgstr "немає дозволу для зміни прав за замовчуванням"
 
-#: catalog/aclchk.c:1265
-#, c-format
-msgid "cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS"
-msgstr "речення IN SCHEMA не можна використати в GRANT/REVOKE ON SCHEMAS"
-
-#: catalog/aclchk.c:1616 catalog/catalog.c:650 catalog/objectaddress.c:1523
-#: catalog/pg_publication.c:528 commands/analyze.c:380 commands/copy.c:947
-#: commands/sequence.c:1655 commands/tablecmds.c:7518 commands/tablecmds.c:7672
-#: commands/tablecmds.c:7722 commands/tablecmds.c:7796
-#: commands/tablecmds.c:7866 commands/tablecmds.c:7996
-#: commands/tablecmds.c:8125 commands/tablecmds.c:8219
-#: commands/tablecmds.c:8320 commands/tablecmds.c:8447
-#: commands/tablecmds.c:8477 commands/tablecmds.c:8619
-#: commands/tablecmds.c:8712 commands/tablecmds.c:8846
-#: commands/tablecmds.c:8958 commands/tablecmds.c:12695
-#: commands/tablecmds.c:12887 commands/tablecmds.c:13048
-#: commands/tablecmds.c:14237 commands/tablecmds.c:16863 commands/trigger.c:942
-#: parser/analyze.c:2530 parser/parse_relation.c:737 parser/parse_target.c:1067
-#: parser/parse_type.c:144 parser/parse_utilcmd.c:3409
-#: parser/parse_utilcmd.c:3449 parser/parse_utilcmd.c:3491 utils/adt/acl.c:2923
-#: utils/adt/ruleutils.c:2807
+#: catalog/aclchk.c:1211 catalog/aclchk.c:1222
+#, c-format
+msgid "cannot use IN SCHEMA clause when using %s"
+msgstr "не можна використовувати речення IN SCHEMA при використанні %s"
+
+#: catalog/aclchk.c:1577 catalog/catalog.c:684 catalog/heap.c:2621
+#: catalog/heap.c:2940 catalog/objectaddress.c:1528
+#: catalog/pg_publication.c:570 commands/analyze.c:388 commands/copy.c:1039
+#: commands/sequence.c:1655 commands/tablecmds.c:7751 commands/tablecmds.c:7929
+#: commands/tablecmds.c:8130 commands/tablecmds.c:8259
+#: commands/tablecmds.c:8413 commands/tablecmds.c:8507
+#: commands/tablecmds.c:8610 commands/tablecmds.c:8776
+#: commands/tablecmds.c:8806 commands/tablecmds.c:8961
+#: commands/tablecmds.c:9064 commands/tablecmds.c:9198
+#: commands/tablecmds.c:9311 commands/tablecmds.c:14397
+#: commands/tablecmds.c:14600 commands/tablecmds.c:14761
+#: commands/tablecmds.c:15989 commands/tablecmds.c:18756 commands/trigger.c:948
+#: parser/analyze.c:2575 parser/parse_relation.c:749 parser/parse_target.c:1070
+#: parser/parse_type.c:144 parser/parse_utilcmd.c:3662
+#: parser/parse_utilcmd.c:3702 parser/parse_utilcmd.c:3744
+#: statistics/attribute_stats.c:212 statistics/attribute_stats.c:955
+#: utils/adt/acl.c:2938 utils/adt/ruleutils.c:2858
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "стовпець \"%s\" зв'язку \"%s\" не існує"
 
-#: catalog/aclchk.c:1861
+#: catalog/aclchk.c:1822
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" є індексом"
 
-#: catalog/aclchk.c:1868 commands/tablecmds.c:14394 commands/tablecmds.c:17772
+#: catalog/aclchk.c:1829 commands/tablecmds.c:16146 commands/tablecmds.c:19675
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" це складений тип"
 
-#: catalog/aclchk.c:1876 catalog/objectaddress.c:1363 commands/tablecmds.c:263
-#: commands/tablecmds.c:17736 utils/adt/acl.c:2107 utils/adt/acl.c:2137
-#: utils/adt/acl.c:2170 utils/adt/acl.c:2206 utils/adt/acl.c:2237
-#: utils/adt/acl.c:2268
+#: catalog/aclchk.c:1837 catalog/objectaddress.c:1368 commands/tablecmds.c:266
+#: commands/tablecmds.c:19639 utils/adt/acl.c:2122 utils/adt/acl.c:2152
+#: utils/adt/acl.c:2185 utils/adt/acl.c:2221 utils/adt/acl.c:2252
+#: utils/adt/acl.c:2283
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "\"%s\" не є послідовністю"
 
-#: catalog/aclchk.c:1914
+#: catalog/aclchk.c:1875
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "послідовність \"%s\" підтримує лише привілеї USAGE, SELECT та UPDATE"
 
-#: catalog/aclchk.c:1931
+#: catalog/aclchk.c:1892
 #, c-format
 msgid "invalid privilege type %s for table"
 msgstr "недійсний тип привілею %s для таблиці"
 
-#: catalog/aclchk.c:2093
+#: catalog/aclchk.c:2057
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "недійсний тип привілею %s для стовпця"
 
-#: catalog/aclchk.c:2106
+#: catalog/aclchk.c:2070
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "послідовність \"%s\" підтримує тільки привілей стовпця SELECT"
 
-#: catalog/aclchk.c:2296
+#: catalog/aclchk.c:2261
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "мова \"%s\" не є довіреною"
 
-#: catalog/aclchk.c:2298
+#: catalog/aclchk.c:2263
 #, c-format
 msgid "GRANT and REVOKE are not allowed on untrusted languages, because only superusers can use untrusted languages."
 msgstr "GRANT і REVOKE не є допустимими для недовірених мов, тому що тільки суперкористувачі можуть використовувати недовірені мови."
 
-#: catalog/aclchk.c:2449
+#: catalog/aclchk.c:2414
 #, c-format
 msgid "cannot set privileges of array types"
 msgstr "не можна встановити права для типів масивів"
 
-#: catalog/aclchk.c:2450
+#: catalog/aclchk.c:2415
 #, c-format
 msgid "Set the privileges of the element type instead."
 msgstr "Замість цього встановіть права для типу елементу."
 
-#: catalog/aclchk.c:2454
+#: catalog/aclchk.c:2419
 #, c-format
 msgid "cannot set privileges of multirange types"
 msgstr "не можна встановити права для типів множинного діапазону"
 
-#: catalog/aclchk.c:2455
+#: catalog/aclchk.c:2420
 #, c-format
 msgid "Set the privileges of the range type instead."
 msgstr "Замість цього встановіть права типу діапазону."
 
-#: catalog/aclchk.c:2462 catalog/objectaddress.c:1629
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" не є доменом"
-
-#: catalog/aclchk.c:2648
+#: catalog/aclchk.c:2603
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "нерозпізнаний привілей \"%s\""
 
-#: catalog/aclchk.c:2715
+#: catalog/aclchk.c:2670
 #, c-format
 msgid "permission denied for aggregate %s"
 msgstr "немає дозволу для агрегату %s"
 
-#: catalog/aclchk.c:2718
+#: catalog/aclchk.c:2673
 #, c-format
 msgid "permission denied for collation %s"
 msgstr "немає дозволу для сортування %s"
 
-#: catalog/aclchk.c:2721
+#: catalog/aclchk.c:2676
 #, c-format
 msgid "permission denied for column %s"
 msgstr "немає дозволу для стовпця %s"
 
-#: catalog/aclchk.c:2724
+#: catalog/aclchk.c:2679
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "немає дозволу для перетворення %s"
 
-#: catalog/aclchk.c:2727
+#: catalog/aclchk.c:2682
 #, c-format
 msgid "permission denied for database %s"
 msgstr "немає доступу для бази даних %s"
 
-#: catalog/aclchk.c:2730
+#: catalog/aclchk.c:2685
 #, c-format
 msgid "permission denied for domain %s"
 msgstr "немає дозволу для домену %s"
 
-#: catalog/aclchk.c:2733
+#: catalog/aclchk.c:2688
 #, c-format
 msgid "permission denied for event trigger %s"
 msgstr "немає дозволу для тригера подій %s"
 
-#: catalog/aclchk.c:2736
+#: catalog/aclchk.c:2691
 #, c-format
 msgid "permission denied for extension %s"
 msgstr "немає дозволу для розширення %s"
 
-#: catalog/aclchk.c:2739
+#: catalog/aclchk.c:2694
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "немає дозволу для джерела сторонніх даних %s"
 
-#: catalog/aclchk.c:2742
+#: catalog/aclchk.c:2697
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "немає дозволу для стороннього серверу %s"
 
-#: catalog/aclchk.c:2745
+#: catalog/aclchk.c:2700
 #, c-format
 msgid "permission denied for foreign table %s"
 msgstr "немає дозволу для сторонньої таблиці %s"
 
-#: catalog/aclchk.c:2748
+#: catalog/aclchk.c:2703
 #, c-format
 msgid "permission denied for function %s"
 msgstr "немає дозволу для функції %s"
 
-#: catalog/aclchk.c:2751
+#: catalog/aclchk.c:2706
 #, c-format
 msgid "permission denied for index %s"
 msgstr "немає дозволу для індексу %s"
 
-#: catalog/aclchk.c:2754
+#: catalog/aclchk.c:2709
 #, c-format
 msgid "permission denied for language %s"
 msgstr "немає дозволу для мови %s"
 
-#: catalog/aclchk.c:2757
+#: catalog/aclchk.c:2712
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "немає дозволу для великого об'єкту %s"
 
-#: catalog/aclchk.c:2760
+#: catalog/aclchk.c:2715
 #, c-format
 msgid "permission denied for materialized view %s"
 msgstr "немає дозволу для матеріалізованого подання %s"
 
-#: catalog/aclchk.c:2763
+#: catalog/aclchk.c:2718
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "немає дозволу для класу операторів %s"
 
-#: catalog/aclchk.c:2766
+#: catalog/aclchk.c:2721
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "немає дозволу для оператора %s"
 
-#: catalog/aclchk.c:2769
+#: catalog/aclchk.c:2724
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "немає дозволу для сімейства операторів %s"
 
-#: catalog/aclchk.c:2772
+#: catalog/aclchk.c:2727
 #, c-format
 msgid "permission denied for parameter %s"
 msgstr "дозвіл відхилено для параметру %s"
 
-#: catalog/aclchk.c:2775
+#: catalog/aclchk.c:2730
 #, c-format
 msgid "permission denied for policy %s"
 msgstr "немає дозволу для політики %s"
 
-#: catalog/aclchk.c:2778
+#: catalog/aclchk.c:2733
 #, c-format
 msgid "permission denied for procedure %s"
 msgstr "немає дозволу для процедури %s"
 
-#: catalog/aclchk.c:2781
+#: catalog/aclchk.c:2736
 #, c-format
 msgid "permission denied for publication %s"
 msgstr "немає дозволу для публікації %s"
 
-#: catalog/aclchk.c:2784
+#: catalog/aclchk.c:2739
 #, c-format
 msgid "permission denied for routine %s"
 msgstr "немає дозволу для підпрограми %s"
 
-#: catalog/aclchk.c:2787
+#: catalog/aclchk.c:2742
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "немає дозволу для схеми %s"
 
-#: catalog/aclchk.c:2790 commands/sequence.c:654 commands/sequence.c:880
+#: catalog/aclchk.c:2745 commands/sequence.c:654 commands/sequence.c:880
 #: commands/sequence.c:922 commands/sequence.c:963 commands/sequence.c:1753
-#: commands/sequence.c:1799
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "немає дозволу для послідовності %s"
 
-#: catalog/aclchk.c:2793
+#: catalog/aclchk.c:2748
 #, c-format
 msgid "permission denied for statistics object %s"
 msgstr "немає дозволу для об'єкту статистики %s"
 
-#: catalog/aclchk.c:2796
+#: catalog/aclchk.c:2751
 #, c-format
 msgid "permission denied for subscription %s"
 msgstr "немає дозволу для підписки %s"
 
-#: catalog/aclchk.c:2799
+#: catalog/aclchk.c:2754
 #, c-format
 msgid "permission denied for table %s"
 msgstr "немає дозволу для таблиці %s"
 
-#: catalog/aclchk.c:2802
+#: catalog/aclchk.c:2757
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "немає дозволу для табличного простору %s"
 
-#: catalog/aclchk.c:2805
+#: catalog/aclchk.c:2760
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "немає дозволу для конфігурації текстового пошуку %s"
 
-#: catalog/aclchk.c:2808
+#: catalog/aclchk.c:2763
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "немає дозволу для словника текстового пошуку %s"
 
-#: catalog/aclchk.c:2811
+#: catalog/aclchk.c:2766
 #, c-format
 msgid "permission denied for type %s"
 msgstr "немає дозволу для типу %s"
 
-#: catalog/aclchk.c:2814
+#: catalog/aclchk.c:2769
 #, c-format
 msgid "permission denied for view %s"
 msgstr "немає дозволу для подання %s"
 
-#: catalog/aclchk.c:2850
+#: catalog/aclchk.c:2805
 #, c-format
 msgid "must be owner of aggregate %s"
 msgstr "треба бути власником агрегату %s"
 
-#: catalog/aclchk.c:2853
+#: catalog/aclchk.c:2808
 #, c-format
 msgid "must be owner of collation %s"
 msgstr "треба бути власником правил сортування %s"
 
-#: catalog/aclchk.c:2856
+#: catalog/aclchk.c:2811
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "треба бути власником перетворення %s"
 
-#: catalog/aclchk.c:2859
+#: catalog/aclchk.c:2814
 #, c-format
 msgid "must be owner of database %s"
 msgstr "треба бути власником бази даних %s"
 
-#: catalog/aclchk.c:2862
+#: catalog/aclchk.c:2817
 #, c-format
 msgid "must be owner of domain %s"
 msgstr "треба бути власником домену %s"
 
-#: catalog/aclchk.c:2865
+#: catalog/aclchk.c:2820
 #, c-format
 msgid "must be owner of event trigger %s"
 msgstr "треба бути власником тригеру подій %s"
 
-#: catalog/aclchk.c:2868
+#: catalog/aclchk.c:2823
 #, c-format
 msgid "must be owner of extension %s"
 msgstr "треба бути власником розширення %s"
 
-#: catalog/aclchk.c:2871
+#: catalog/aclchk.c:2826
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "треба бути власником джерела сторонніх даних %s"
 
-#: catalog/aclchk.c:2874
+#: catalog/aclchk.c:2829
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "треба бути власником стороннього серверу %s"
 
-#: catalog/aclchk.c:2877
+#: catalog/aclchk.c:2832
 #, c-format
 msgid "must be owner of foreign table %s"
 msgstr "треба бути власником сторонньої таблиці %s"
 
-#: catalog/aclchk.c:2880
+#: catalog/aclchk.c:2835
 #, c-format
 msgid "must be owner of function %s"
 msgstr "треба бути власником функції %s"
 
-#: catalog/aclchk.c:2883
+#: catalog/aclchk.c:2838
 #, c-format
 msgid "must be owner of index %s"
 msgstr "треба бути власником індексу %s"
 
-#: catalog/aclchk.c:2886
+#: catalog/aclchk.c:2841
 #, c-format
 msgid "must be owner of language %s"
 msgstr "треба бути власником мови %s"
 
-#: catalog/aclchk.c:2889
+#: catalog/aclchk.c:2844
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "треба бути власником великого об'єкту %s"
 
-#: catalog/aclchk.c:2892
+#: catalog/aclchk.c:2847
 #, c-format
 msgid "must be owner of materialized view %s"
 msgstr "треба бути власником матеріалізованого подання %s"
 
-#: catalog/aclchk.c:2895
+#: catalog/aclchk.c:2850
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "треба бути власником класу операторів %s"
 
-#: catalog/aclchk.c:2898
+#: catalog/aclchk.c:2853
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "треба бути власником оператора %s"
 
-#: catalog/aclchk.c:2901
+#: catalog/aclchk.c:2856
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "треба бути власником сімейства операторів %s"
 
-#: catalog/aclchk.c:2904
+#: catalog/aclchk.c:2859
 #, c-format
 msgid "must be owner of procedure %s"
 msgstr "треба бути власником процедури %s"
 
-#: catalog/aclchk.c:2907
+#: catalog/aclchk.c:2862
 #, c-format
 msgid "must be owner of publication %s"
 msgstr "треба бути власником публікації %s"
 
-#: catalog/aclchk.c:2910
+#: catalog/aclchk.c:2865
 #, c-format
 msgid "must be owner of routine %s"
 msgstr "треба бути власником підпрограми %s"
 
-#: catalog/aclchk.c:2913
+#: catalog/aclchk.c:2868
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "треба бути власником послідовності %s"
 
-#: catalog/aclchk.c:2916
+#: catalog/aclchk.c:2871
 #, c-format
 msgid "must be owner of subscription %s"
 msgstr "треба бути власником підписки %s"
 
-#: catalog/aclchk.c:2919
+#: catalog/aclchk.c:2874
 #, c-format
 msgid "must be owner of table %s"
 msgstr "треба бути власником таблиці %s"
 
-#: catalog/aclchk.c:2922
+#: catalog/aclchk.c:2877
 #, c-format
 msgid "must be owner of type %s"
 msgstr "треба бути власником типу %s"
 
-#: catalog/aclchk.c:2925
+#: catalog/aclchk.c:2880
 #, c-format
 msgid "must be owner of view %s"
 msgstr "треба бути власником подання %s"
 
-#: catalog/aclchk.c:2928
+#: catalog/aclchk.c:2883
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "треба бути власником схеми %s"
 
-#: catalog/aclchk.c:2931
+#: catalog/aclchk.c:2886
 #, c-format
 msgid "must be owner of statistics object %s"
 msgstr "треба бути власником об'єкту статистики %s"
 
-#: catalog/aclchk.c:2934
+#: catalog/aclchk.c:2889
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "треба бути власником табличного простору %s"
 
-#: catalog/aclchk.c:2937
+#: catalog/aclchk.c:2892
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "треба бути власником конфігурації текстового пошуку %s"
 
-#: catalog/aclchk.c:2940
+#: catalog/aclchk.c:2895
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "треба бути власником словника текстового пошуку %s"
 
-#: catalog/aclchk.c:2954
+#: catalog/aclchk.c:2909
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "треба бути власником відношення %s"
 
-#: catalog/aclchk.c:3000
+#: catalog/aclchk.c:2955
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "немає дозволу для стовпця \"%s\" відношення \"%s\""
 
-#: catalog/aclchk.c:3157 catalog/aclchk.c:4165 catalog/aclchk.c:4196
-#, c-format
-msgid "%s with OID %u does not exist"
-msgstr "%s з OID %u не існує"
-
-#: catalog/aclchk.c:3240 catalog/aclchk.c:3259
+#: catalog/aclchk.c:3189 catalog/aclchk.c:3208
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "атрибут %d відношення з OID %u не існує"
 
-#: catalog/aclchk.c:3297 catalog/aclchk.c:3360 catalog/aclchk.c:3999
+#: catalog/aclchk.c:3246 catalog/aclchk.c:3309 catalog/aclchk.c:3948
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "відношення з OID %u не існує"
 
-#: catalog/aclchk.c:3545
+#: catalog/aclchk.c:3494
 #, c-format
 msgid "parameter ACL with OID %u does not exist"
 msgstr "параметр ACL з OID %u не існує"
 
-#: catalog/aclchk.c:3718 commands/collationcmds.c:853
-#: commands/publicationcmds.c:1739
+#: catalog/aclchk.c:3573 catalog/objectaddress.c:1055
+#: catalog/pg_largeobject.c:125 libpq/be-fsstubs.c:323
+#: storage/large_object/inv_api.c:247
+#, c-format
+msgid "large object %u does not exist"
+msgstr "великого об'єкту %u не існує"
+
+#: catalog/aclchk.c:3667 commands/collationcmds.c:849
+#: commands/publicationcmds.c:1846
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "схема з OID %u не існує"
 
-#: catalog/aclchk.c:3792 catalog/aclchk.c:3819 catalog/aclchk.c:3848
-#: utils/cache/typcache.c:392 utils/cache/typcache.c:447
+#: catalog/aclchk.c:3741 catalog/aclchk.c:3768 catalog/aclchk.c:3797
+#: utils/cache/typcache.c:473 utils/cache/typcache.c:528
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "тип з OID %u не існує"
 
-#: catalog/catalog.c:468
+#: catalog/catalog.c:504
 #, c-format
 msgid "still searching for an unused OID in relation \"%s\""
 msgstr "все ще шукаю невикористаний OID у відношенні \"%s\""
 
-#: catalog/catalog.c:470
+#: catalog/catalog.c:506
 #, c-format
-msgid "OID candidates have been checked %llu time, but no unused OID has been found yet."
-msgid_plural "OID candidates have been checked %llu times, but no unused OID has been found yet."
-msgstr[0] "OID кандидати буле перевірені %llu раз, але невикористаного OID все ще не знайдено."
-msgstr[1] "OID кандидати буле перевірені %llu рази, але невикористаного OID все ще не знайдено."
-msgstr[2] "OID кандидати буле перевірені %llu разів, але невикористаного OID все ще не знайдено."
-msgstr[3] "OID кандидати буле перевірені %llu разів, але невикористаного OID все ще не знайдено."
+msgid "OID candidates have been checked %<PRIu64> time, but no unused OID has been found yet."
+msgid_plural "OID candidates have been checked %<PRIu64> times, but no unused OID has been found yet."
+msgstr[0] "OID кандидати буле перевірені %<PRIu64> раз, але невикористаного OID все ще не знайдено."
+msgstr[1] "OID кандидати буле перевірені %<PRIu64> рази, але невикористаного OID все ще не знайдено."
+msgstr[2] "OID кандидати буле перевірені %<PRIu64> разів, але невикористаного OID все ще не знайдено."
+msgstr[3] "OID кандидати буле перевірені %<PRIu64> разів, але невикористаного OID все ще не знайдено."
 
-#: catalog/catalog.c:495
+#: catalog/catalog.c:531
 #, c-format
-msgid "new OID has been assigned in relation \"%s\" after %llu retry"
-msgid_plural "new OID has been assigned in relation \"%s\" after %llu retries"
-msgstr[0] "новий OID було призначено у відношенні \"%s\" після %llu повторної спроби"
-msgstr[1] "новий OID було призначено у відношенні \"%s\" після %llu повторних спроб"
-msgstr[2] "новий OID було призначено у відношенні \"%s\" після %llu повторних спроб"
-msgstr[3] "новий OID було призначено у відношенні \"%s\" після %llu повторних спроб"
+msgid "new OID has been assigned in relation \"%s\" after %<PRIu64> retry"
+msgid_plural "new OID has been assigned in relation \"%s\" after %<PRIu64> retries"
+msgstr[0] "новий OID було призначено у відношенні \"%s\" після %<PRIu64> повторної спроби"
+msgstr[1] "новий OID було призначено у відношенні \"%s\" після %<PRIu64> повторних спроб"
+msgstr[2] "новий OID було призначено у відношенні \"%s\" після %<PRIu64> повторних спроб"
+msgstr[3] "новий OID було призначено у відношенні \"%s\" після %<PRIu64> повторних спроб"
 
-#: catalog/catalog.c:628 catalog/catalog.c:695
+#: catalog/catalog.c:662 catalog/catalog.c:729
 #, c-format
 msgid "must be superuser to call %s()"
 msgstr "для виклику %s() потрібно бути суперкористувачем"
 
-#: catalog/catalog.c:637
+#: catalog/catalog.c:671
 #, c-format
 msgid "pg_nextoid() can only be used on system catalogs"
 msgstr "pg_nextoid() можна використовувати лише для системних каталогів"
 
-#: catalog/catalog.c:642 parser/parse_utilcmd.c:2270
+#: catalog/catalog.c:676 parser/parse_utilcmd.c:2447
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "індекс \"%s\" не належить таблиці \"%s\""
 
-#: catalog/catalog.c:659
+#: catalog/catalog.c:693
 #, c-format
 msgid "column \"%s\" is not of type oid"
 msgstr "стовпець \"%s\" повинен мати тип oid"
 
-#: catalog/catalog.c:666
+#: catalog/catalog.c:700
 #, c-format
 msgid "index \"%s\" is not the index for column \"%s\""
 msgstr "індекс \"%s\" не є індексом для стовпця \"%s\""
@@ -4760,20 +4760,6 @@ msgstr[3] "\n"
 msgid "cannot drop %s because other objects depend on it"
 msgstr "неможливо видалити %s, тому що від нього залежать інші об'єкти"
 
-#: catalog/dependency.c:1153 catalog/dependency.c:1160
-#: catalog/dependency.c:1171 commands/tablecmds.c:1442
-#: commands/tablecmds.c:14986 commands/tablespace.c:460 commands/user.c:1302
-#: commands/vacuum.c:211 commands/view.c:441 executor/execExprInterp.c:4643
-#: executor/execExprInterp.c:4651 libpq/auth.c:324
-#: replication/logical/applyparallelworker.c:1041 replication/syncrep.c:1011
-#: storage/lmgr/deadlock.c:1134 storage/lmgr/proc.c:1427 utils/misc/guc.c:3169
-#: utils/misc/guc.c:3210 utils/misc/guc.c:3285 utils/misc/guc.c:6790
-#: utils/misc/guc.c:6824 utils/misc/guc.c:6858 utils/misc/guc.c:6901
-#: utils/misc/guc.c:6943
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: catalog/dependency.c:1154 catalog/dependency.c:1161
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
@@ -4798,674 +4784,747 @@ msgstr[3] "видалення поширюється (cascades) на ще %d і
 msgid "constant of the type %s cannot be used here"
 msgstr "константа типу %s не може бути використана тут"
 
-#: catalog/dependency.c:2375 parser/parse_relation.c:3407
-#: parser/parse_relation.c:3417
+#: catalog/dependency.c:2205
+#, c-format
+msgid "transition table \"%s\" cannot be referenced in a persistent object"
+msgstr "таблиця переходу \"%s\" не може бути посиланням у постійному об'єкті"
+
+#: catalog/dependency.c:2390 parser/parse_relation.c:3513
+#: parser/parse_relation.c:3523 statistics/attribute_stats.c:224
+#: statistics/attribute_stats.c:596 statistics/attribute_stats.c:604
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "стовпець %d відношення \"%s\" не існує"
 
-#: catalog/heap.c:325
+#: catalog/heap.c:321
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "немає дозволу для створення \"%s.%s\""
 
-#: catalog/heap.c:327
+#: catalog/heap.c:323
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Змінення системного каталогу наразі заборонено."
 
-#: catalog/heap.c:467 commands/tablecmds.c:2478 commands/tablecmds.c:2900
-#: commands/tablecmds.c:7140
+#: catalog/heap.c:463 commands/tablecmds.c:2562 commands/tablecmds.c:3014
+#: commands/tablecmds.c:7361
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "таблиці можуть містити максимум %d стовпців"
 
-#: catalog/heap.c:485 commands/tablecmds.c:7409
+#: catalog/heap.c:481 commands/tablecmds.c:7663
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "ім'я стовпця \"%s\" конфліктує з системним іменем стовпця"
 
-#: catalog/heap.c:501
+#: catalog/heap.c:497
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "ім'я стовпця \"%s\" вказано кілька разів"
 
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:579
+#: catalog/heap.c:575
 #, c-format
 msgid "partition key column %s has pseudo-type %s"
 msgstr "стовпець ключа секціонування %s має псевдотип %s"
 
-#: catalog/heap.c:584
+#: catalog/heap.c:580
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "стовпець \"%s\" має псевдо-тип %s"
 
-#: catalog/heap.c:615
+#: catalog/heap.c:595
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a domain type"
+msgstr "віртуальний генерований стовпець \"%s\" не може мати доменний тип"
+
+#: catalog/heap.c:622
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "складений тип %s не може містити сам себе"
 
+#: catalog/heap.c:673
+#, c-format
+msgid "virtual generated column \"%s\" cannot have a user-defined type"
+msgstr "віртуальний генерований стовпець \"%s\" не може мати користувацький тип"
+
+#: catalog/heap.c:674 catalog/heap.c:3294
+#, c-format
+msgid "Virtual generated columns that make use of user-defined types are not yet supported."
+msgstr "Віртуальні генеровані стовпці, що використовують користувацькі типи, ще не підтримуються."
+
 #. translator: first %s is an integer not a name
-#: catalog/heap.c:670
+#: catalog/heap.c:686
 #, c-format
 msgid "no collation was derived for partition key column %s with collatable type %s"
 msgstr "для стовпця ключа секціонування \"%s\" з сортируючим типом %s не вдалося отримати параметри сортування"
 
-#: catalog/heap.c:676 commands/createas.c:198 commands/createas.c:505
+#: catalog/heap.c:692 commands/createas.c:200 commands/createas.c:512
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr "для стовпця \"%s\" із сортувальним типом %s не вдалося отримати параметри сортування"
 
-#: catalog/heap.c:1161 catalog/index.c:899 commands/createas.c:401
-#: commands/tablecmds.c:4149
+#: catalog/heap.c:1179 catalog/index.c:901 commands/createas.c:408
+#: commands/tablecmds.c:4296
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "відношення \"%s\" вже існує"
 
-#: catalog/heap.c:1177 catalog/pg_type.c:434 catalog/pg_type.c:805
+#: catalog/heap.c:1195 catalog/pg_type.c:434 catalog/pg_type.c:805
 #: catalog/pg_type.c:977 commands/typecmds.c:253 commands/typecmds.c:265
-#: commands/typecmds.c:758 commands/typecmds.c:1179 commands/typecmds.c:1405
-#: commands/typecmds.c:1585 commands/typecmds.c:2556
+#: commands/typecmds.c:758 commands/typecmds.c:1213 commands/typecmds.c:1439
+#: commands/typecmds.c:1619 commands/typecmds.c:2594
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "тип \"%s\" вже існує"
 
-#: catalog/heap.c:1178
+#: catalog/heap.c:1196
 #, 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 "З відношенням вже пов'язаний тип з таким самим іменем, тому виберіть ім'я, яке не буде конфліктувати з типами, що існують."
 
-#: catalog/heap.c:1218
+#: catalog/heap.c:1236
 #, c-format
 msgid "toast relfilenumber value not set when in binary upgrade mode"
 msgstr "значення toast relfilenumber не встановлено в режимі двійкового оновлення"
 
-#: catalog/heap.c:1229
+#: catalog/heap.c:1247
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "значення OID в pg_class не задано в режимі двійкового оновлення"
 
-#: catalog/heap.c:1239
+#: catalog/heap.c:1257
 #, c-format
 msgid "relfilenumber value not set when in binary upgrade mode"
 msgstr "значення relfilenumber не встановлено в режимі двійкового оновлення"
 
-#: catalog/heap.c:2128
+#: catalog/heap.c:2202
 #, c-format
 msgid "cannot add NO INHERIT constraint to partitioned table \"%s\""
 msgstr "не можна додати обмеження NO INHERIT до секціонованої таблиці \"%s\""
 
-#: catalog/heap.c:2400
+#: catalog/heap.c:2525
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "обмеження перевірки \"%s\" вже інсує"
 
-#: catalog/heap.c:2572 catalog/index.c:913 catalog/pg_constraint.c:724
-#: commands/tablecmds.c:9333
+#: catalog/heap.c:2626 catalog/heap.c:2946
+#, c-format
+msgid "cannot add not-null constraint on system column \"%s\""
+msgstr "не можна додати обмеження not-null для системного стовпця \"%s\""
+
+#: catalog/heap.c:2653 catalog/heap.c:2779 catalog/heap.c:3030
+#: catalog/index.c:915 catalog/pg_constraint.c:1008 commands/tablecmds.c:9821
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "обмеження \"%s\" відношення \"%s\" вже існує"
 
-#: catalog/heap.c:2579
+#: catalog/heap.c:2786
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "обмеження \"%s\" конфліктує з неуспадкованим обмеженням відношення \"%s\""
 
-#: catalog/heap.c:2590
+#: catalog/heap.c:2797
 #, c-format
 msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
 msgstr "обмеження \"%s\" конфліктує з успадкованим обмеженням відношення \"%s\""
 
-#: catalog/heap.c:2600
+#: catalog/heap.c:2807
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
 msgstr "обмеження \"%s\" конфліктує з обмеженням NOT VALID в відношенні \"%s\""
 
-#: catalog/heap.c:2605
+#: catalog/heap.c:2819
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on relation \"%s\""
+msgstr "обмеження \"%s\" конфліктує з обмеженням NOT ENFORCED в відношенні \"%s\""
+
+#: catalog/heap.c:2824
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "злиття обмеження \"%s\" з успадкованим визначенням"
 
-#: catalog/heap.c:2631 catalog/pg_constraint.c:853 commands/tablecmds.c:3057
-#: commands/tablecmds.c:3360 commands/tablecmds.c:7066
-#: commands/tablecmds.c:15804 commands/tablecmds.c:15935
+#: catalog/heap.c:2848 catalog/pg_constraint.c:786 catalog/pg_constraint.c:1137
+#: commands/tablecmds.c:3179 commands/tablecmds.c:3499
+#: commands/tablecmds.c:7286 commands/tablecmds.c:7967
+#: commands/tablecmds.c:17583 commands/tablecmds.c:17765
 #, c-format
 msgid "too many inheritance parents"
 msgstr "занадто багато батьків наслідування"
 
-#: catalog/heap.c:2715
+#: catalog/heap.c:2965 parser/parse_utilcmd.c:2655
+#, c-format
+msgid "conflicting NO INHERIT declaration for not-null constraint on column \"%s\""
+msgstr "конфліктуюча декларація NO INHERIT для обмеження not-null стовпця \"%s\""
+
+#: catalog/heap.c:2979
+#, c-format
+msgid "conflicting not-null constraint names \"%s\" and \"%s\""
+msgstr "конфліктуючі назви обмежень not-null \"%s\" і \"%s\""
+
+#: catalog/heap.c:3009
+#, c-format
+msgid "cannot define not-null constraint with NO INHERIT on column \"%s\""
+msgstr "не можна визначити обмеження not-null з NO INHERIT для стовпця \"%s\""
+
+#: catalog/heap.c:3011
+#, c-format
+msgid "The column has an inherited not-null constraint."
+msgstr "Стовпець має успадковане обмеження not-null."
+
+#: catalog/heap.c:3201
 #, c-format
 msgid "cannot use generated column \"%s\" in column generation expression"
 msgstr "в виразі створення стовпця не можна використовувати згенерований стовпець \"%s\""
 
-#: catalog/heap.c:2717
+#: catalog/heap.c:3203
 #, c-format
 msgid "A generated column cannot reference another generated column."
 msgstr "Згенерований стовпець не може посилатися на інший згенерований стовпець."
 
-#: catalog/heap.c:2723
+#: catalog/heap.c:3209
 #, c-format
 msgid "cannot use whole-row variable in column generation expression"
 msgstr "у виразі створення стовпців не можна використовувати змінну усього рядка"
 
-#: catalog/heap.c:2724
+#: catalog/heap.c:3210
 #, c-format
 msgid "This would cause the generated column to depend on its own value."
 msgstr "Це призведе до того, що згенерований стовпець буде залежати від власного значення."
 
-#: catalog/heap.c:2779
+#: catalog/heap.c:3277
+#, c-format
+msgid "generation expression uses user-defined function"
+msgstr "вираз генерації використовує користувацьку функцію"
+
+#: catalog/heap.c:3278
+#, c-format
+msgid "Virtual generated columns that make use of user-defined functions are not yet supported."
+msgstr "Віртуальні генеровані стовпці, що використовують користувацькі функції, ще не підтримуються."
+
+#: catalog/heap.c:3293
+#, c-format
+msgid "generation expression uses user-defined type"
+msgstr "вираз генерації використовує користувацький тип"
+
+#: catalog/heap.c:3345
 #, c-format
 msgid "generation expression is not immutable"
 msgstr "вираз генерації не є незмінним"
 
-#: catalog/heap.c:2807 rewrite/rewriteHandler.c:1282
+#: catalog/heap.c:3377 rewrite/rewriteHandler.c:1288
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "стовпець \"%s\" має тип %s, але тип виразу за замовчуванням %s"
 
-#: catalog/heap.c:2812 commands/prepare.c:331 parser/analyze.c:2758
-#: parser/parse_target.c:592 parser/parse_target.c:882
-#: parser/parse_target.c:892 rewrite/rewriteHandler.c:1287
+#: catalog/heap.c:3382 commands/prepare.c:334 parser/analyze.c:2906
+#: parser/parse_target.c:595 parser/parse_target.c:885
+#: parser/parse_target.c:895 rewrite/rewriteHandler.c:1293
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Потрібно буде переписати або привести вираз."
 
-#: catalog/heap.c:2859
+#: catalog/heap.c:3429
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "в обмеженні-перевірці можна посилатися лише на таблицю \"%s\""
 
-#: catalog/heap.c:3165
+#: catalog/heap.c:3735
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "непідтримуване поєднання зовнішнього ключа з ON COMMIT"
 
-#: catalog/heap.c:3166
+#: catalog/heap.c:3736
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "Таблиця \"%s\" посилається на \"%s\", але вони не мають той же параметр ON COMMIT."
 
-#: catalog/heap.c:3171
+#: catalog/heap.c:3741
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "скоротити таблицю, на яку посилається зовнішній ключ, не можливо"
 
-#: catalog/heap.c:3172
+#: catalog/heap.c:3742
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Таблиця \"%s\" посилається на \"%s\"."
 
-#: catalog/heap.c:3174
+#: catalog/heap.c:3744
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Скоротіть таблицю \"%s\" паралельно або використайте TRUNCATE ... CASCADE."
 
-#: catalog/index.c:219 parser/parse_utilcmd.c:2176
+#: catalog/index.c:220 parser/parse_utilcmd.c:2352
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "таблиця \"%s\" не може містити кілька первинних ключів"
 
-#: catalog/index.c:233
+#: catalog/index.c:234
 #, c-format
 msgid "primary keys cannot use NULLS NOT DISTINCT indexes"
 msgstr "первинні ключі не можуть використовувати NULLS NOT DISTINCT індекси"
 
-#: catalog/index.c:250
+#: catalog/index.c:251
 #, c-format
 msgid "primary keys cannot be expressions"
 msgstr "первинні ключі не можуть бути виразами"
 
-#: catalog/index.c:267
+#: catalog/index.c:268
 #, c-format
 msgid "primary key column \"%s\" is not marked NOT NULL"
 msgstr "стовпець первинного ключа \"%s\" не позначений як NOT NULL"
 
-#: catalog/index.c:798 catalog/index.c:1915
+#: catalog/index.c:800 catalog/index.c:1921
 #, c-format
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "користувацькі індекси в таблицях системного каталогу не підтримуються"
 
-#: catalog/index.c:838
+#: catalog/index.c:840
 #, c-format
 msgid "nondeterministic collations are not supported for operator class \"%s\""
 msgstr "недетерміновані правила сортування не підтримуються для класу операторів \"%s\""
 
-#: catalog/index.c:853
+#: catalog/index.c:855
 #, c-format
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "паралельне створення індексу в таблицях системного каталогу не підтримується"
 
-#: catalog/index.c:862 catalog/index.c:1331
+#: catalog/index.c:864 catalog/index.c:1333
 #, c-format
 msgid "concurrent index creation for exclusion constraints is not supported"
 msgstr "парарельне створення індексу для обмежень-виключень не підтримується"
 
-#: catalog/index.c:871
+#: catalog/index.c:873
 #, c-format
 msgid "shared indexes cannot be created after initdb"
 msgstr "не можливо створити спільні індекси після initdb"
 
-#: catalog/index.c:891 commands/createas.c:416 commands/sequence.c:159
-#: parser/parse_utilcmd.c:209
+#: catalog/index.c:893 commands/createas.c:423 commands/sequence.c:159
+#: parser/parse_utilcmd.c:210
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "ввідношення \"%s\" вже існує, пропускаємо"
 
-#: catalog/index.c:941
+#: catalog/index.c:943
 #, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
 msgstr "значення OID індекса в pg_class не встановлено в режимі двійкового оновлення"
 
-#: catalog/index.c:951 utils/cache/relcache.c:3790
+#: catalog/index.c:953 utils/cache/relcache.c:3795
 #, c-format
 msgid "index relfilenumber value not set when in binary upgrade mode"
 msgstr "значення індексу relfilenumber не встановлено в режимі двійкового оновлення"
 
-#: catalog/index.c:2214
+#: catalog/index.c:2222
 #, c-format
 msgid "DROP INDEX CONCURRENTLY must be first action in transaction"
 msgstr "DROP INDEX CONCURRENTLY повинен бути першою дією в транзакції"
 
-#: catalog/index.c:3670
+#: catalog/index.c:3729
 #, c-format
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "повторно індексувати тимчасові таблиці інших сеансів не можна"
 
-#: catalog/index.c:3681 commands/indexcmds.c:3653
+#: catalog/index.c:3740 commands/indexcmds.c:3791
 #, c-format
 msgid "cannot reindex invalid index on TOAST table"
 msgstr "переіндексувати неприпустимий індекс в таблиці TOAST не можна"
 
-#: catalog/index.c:3697 commands/indexcmds.c:3531 commands/indexcmds.c:3677
-#: commands/tablecmds.c:3564
+#: catalog/index.c:3756 commands/indexcmds.c:3669 commands/indexcmds.c:3815
+#: commands/tablecmds.c:3703
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "перемістити системне відношення \"%s\" не можна"
 
-#: catalog/index.c:3834
+#: catalog/index.c:3893
 #, c-format
 msgid "index \"%s\" was reindexed"
 msgstr "індекс \"%s\" був перебудований"
 
-#: catalog/index.c:4000
+#: catalog/index.c:4059
 #, c-format
 msgid "cannot reindex invalid index \"%s.%s\" on TOAST table, skipping"
 msgstr "переіндексувати неприпустимий індекс \"%s.%s\" в таблиці TOAST не можна, пропускається"
 
-#: catalog/namespace.c:447 catalog/namespace.c:651 catalog/namespace.c:743
-#: commands/trigger.c:5731
+#: catalog/namespace.c:462 catalog/namespace.c:666 catalog/namespace.c:758
+#: commands/trigger.c:5817
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "cross-database посилання не реалізовані: \"%s.%s.%s\""
 
-#: catalog/namespace.c:504
+#: catalog/namespace.c:519
 #, c-format
 msgid "temporary tables cannot specify a schema name"
 msgstr "для тимчасових таблиць ім'я схеми не вказується"
 
-#: catalog/namespace.c:585
+#: catalog/namespace.c:600
 #, c-format
 msgid "could not obtain lock on relation \"%s.%s\""
 msgstr "не вдалося отримати блокування зв'язку \"%s.%s\""
 
-#: catalog/namespace.c:590 commands/lockcmds.c:143 commands/lockcmds.c:223
+#: catalog/namespace.c:605 commands/lockcmds.c:143 commands/lockcmds.c:223
 #, c-format
 msgid "could not obtain lock on relation \"%s\""
 msgstr "не вдалося отримати блокування зв'язку \"%s\""
 
-#: catalog/namespace.c:618 parser/parse_relation.c:1430
+#: catalog/namespace.c:633 parser/parse_relation.c:1447
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "відношення \"%s.%s\" не існує"
 
-#: catalog/namespace.c:623 parser/parse_relation.c:1443
-#: parser/parse_relation.c:1451 utils/adt/regproc.c:913
+#: catalog/namespace.c:638 parser/parse_relation.c:1460
+#: parser/parse_relation.c:1468 utils/adt/regproc.c:913
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "відношення \"%s\" не існує"
 
-#: catalog/namespace.c:689 catalog/namespace.c:3507 commands/extension.c:1607
-#: commands/extension.c:1613
+#: catalog/namespace.c:704 catalog/namespace.c:3525 commands/extension.c:1804
+#: commands/extension.c:1810
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "не вибрано схему для створення об'єктів"
 
-#: catalog/namespace.c:841 catalog/namespace.c:854
+#: catalog/namespace.c:856 catalog/namespace.c:869
 #, c-format
 msgid "cannot create relations in temporary schemas of other sessions"
 msgstr "неможливо створити відношення в тимчасових схемах з інших сеансів"
 
-#: catalog/namespace.c:845
+#: catalog/namespace.c:860
 #, c-format
 msgid "cannot create temporary relation in non-temporary schema"
 msgstr "неможливо створити тимчасове відношення в не тимчасовій схемі"
 
-#: catalog/namespace.c:860
+#: catalog/namespace.c:875
 #, c-format
 msgid "only temporary relations may be created in temporary schemas"
 msgstr "в тимчасових схемах можуть бути створені тільки тимчасові відношення"
 
-#: catalog/namespace.c:2604
+#: catalog/namespace.c:2619
 #, c-format
 msgid "statistics object \"%s\" does not exist"
 msgstr "об'єкт статистики \"%s\" не існує"
 
-#: catalog/namespace.c:2746
+#: catalog/namespace.c:2764
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "парсер текстового пошуку \"%s\" не існує"
 
-#: catalog/namespace.c:2891 utils/adt/regproc.c:1459
+#: catalog/namespace.c:2909 utils/adt/regproc.c:1459
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "словник текстового пошуку \"%s\" не існує"
 
-#: catalog/namespace.c:3037
+#: catalog/namespace.c:3055
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "шаблон текстового пошуку \"%s\" не існує"
 
-#: catalog/namespace.c:3182 commands/tsearchcmds.c:1168
+#: catalog/namespace.c:3200 commands/tsearchcmds.c:1168
 #: utils/adt/regproc.c:1349 utils/cache/ts_cache.c:635
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "конфігурація текстового пошуку \"%s\" не існує"
 
-#: catalog/namespace.c:3314 parser/parse_expr.c:868 parser/parse_target.c:1259
+#: catalog/namespace.c:3332 parser/parse_expr.c:867 parser/parse_target.c:1262
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "міжбазові посилання не реалізовані: %s"
 
-#: catalog/namespace.c:3320 parser/parse_expr.c:875 parser/parse_target.c:1266
-#: gram.y:19181 gram.y:19221
+#: catalog/namespace.c:3338 parser/parse_expr.c:874 parser/parse_target.c:1269
+#: gram.y:19355 gram.y:19395
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неправильне повне ім'я (забагато компонентів): %s"
 
-#: catalog/namespace.c:3450
+#: catalog/namespace.c:3468
 #, c-format
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "не можна переміщати об'єкти в або з тимчасових схем"
 
-#: catalog/namespace.c:3456
+#: catalog/namespace.c:3474
 #, c-format
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "не можна переміщати об'єкти в або з схем TOAST"
 
-#: catalog/namespace.c:3529 commands/schemacmds.c:264 commands/schemacmds.c:344
-#: commands/tablecmds.c:1387 utils/adt/regproc.c:1688
+#: catalog/namespace.c:3547 commands/schemacmds.c:264 commands/schemacmds.c:344
+#: commands/tablecmds.c:1464 utils/adt/regproc.c:1688
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "схема \"%s\" не існує"
 
-#: catalog/namespace.c:3560
+#: catalog/namespace.c:3578
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "неправильне ім'я зв'язку (забагато компонентів): %s"
 
-#: catalog/namespace.c:4001 utils/adt/regproc.c:1056
+#: catalog/namespace.c:4019 utils/adt/regproc.c:1056
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "правило сортування \"%s\" для кодування \"%s\" не існує"
 
-#: catalog/namespace.c:4056
+#: catalog/namespace.c:4074
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "перетворення\"%s\" не існує"
 
-#: catalog/namespace.c:4397
+#: catalog/namespace.c:4415
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr "немає дозволу для створення тимчасових таблиць в базі даних \"%s\""
 
-#: catalog/namespace.c:4413
+#: catalog/namespace.c:4431
 #, c-format
 msgid "cannot create temporary tables during recovery"
 msgstr "не можна створити тимчасові таблиці під час відновлення"
 
-#: catalog/namespace.c:4419
+#: catalog/namespace.c:4437
 #, c-format
 msgid "cannot create temporary tables during a parallel operation"
 msgstr "не можна створити тимчасові таблиці під час паралельної операції"
 
-#: catalog/objectaddress.c:1371 commands/policy.c:93 commands/policy.c:373
-#: commands/tablecmds.c:257 commands/tablecmds.c:299 commands/tablecmds.c:2310
-#: commands/tablecmds.c:12823
+#: catalog/objectaddress.c:1376 commands/policy.c:93 commands/policy.c:373
+#: commands/tablecmds.c:260 commands/tablecmds.c:302 commands/tablecmds.c:2387
+#: commands/tablecmds.c:14535
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" не є таблицею"
 
-#: catalog/objectaddress.c:1378 commands/tablecmds.c:269
-#: commands/tablecmds.c:17741 commands/view.c:114
+#: catalog/objectaddress.c:1383 commands/tablecmds.c:272
+#: commands/tablecmds.c:19644 commands/view.c:113
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" не є поданням"
 
-#: catalog/objectaddress.c:1385 commands/matview.c:199 commands/tablecmds.c:275
-#: commands/tablecmds.c:17746
+#: catalog/objectaddress.c:1390 commands/matview.c:201 commands/tablecmds.c:278
+#: commands/tablecmds.c:19649
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" не є матеріалізованим поданням"
 
-#: catalog/objectaddress.c:1392 commands/tablecmds.c:293
-#: commands/tablecmds.c:17751
+#: catalog/objectaddress.c:1397 commands/tablecmds.c:296
+#: commands/tablecmds.c:19654
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" не є сторонньою таблицею"
 
-#: catalog/objectaddress.c:1433
+#: catalog/objectaddress.c:1438
 #, c-format
 msgid "must specify relation and object name"
 msgstr "треба вказати відношення й ім'я об'єкта"
 
-#: catalog/objectaddress.c:1509 catalog/objectaddress.c:1562
+#: catalog/objectaddress.c:1514 catalog/objectaddress.c:1567
 #, c-format
 msgid "column name must be qualified"
 msgstr "слід вказати ім'я стовпця"
 
-#: catalog/objectaddress.c:1581
+#: catalog/objectaddress.c:1586
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "значення за замовчуванням для стовпця \"%s\" відношення \"%s\" не існує"
 
-#: catalog/objectaddress.c:1618 commands/functioncmds.c:132
-#: commands/tablecmds.c:285 commands/typecmds.c:278 commands/typecmds.c:3843
+#: catalog/objectaddress.c:1623 commands/functioncmds.c:132
+#: commands/tablecmds.c:288 commands/typecmds.c:278 commands/typecmds.c:3842
 #: parser/parse_type.c:243 parser/parse_type.c:272 parser/parse_type.c:801
-#: utils/adt/acl.c:4560
+#: utils/adt/acl.c:4575
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "тип \"%s\" не існує"
 
-#: catalog/objectaddress.c:1737
+#: catalog/objectaddress.c:1634
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" не є доменом"
+
+#: catalog/objectaddress.c:1742
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "оператор %d (%s, %s) з %s не існує"
 
-#: catalog/objectaddress.c:1768
+#: catalog/objectaddress.c:1773
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "функція %d (%s, %s) з %s не існує"
 
-#: catalog/objectaddress.c:1819 catalog/objectaddress.c:1845
+#: catalog/objectaddress.c:1824 catalog/objectaddress.c:1850
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "відображення користувача для користувача \"%s\" на сервері \"%s\"не існує"
 
-#: catalog/objectaddress.c:1834 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:993 commands/foreigncmds.c:1356 foreign/foreign.c:713
+#: catalog/objectaddress.c:1839 commands/foreigncmds.c:441
+#: commands/foreigncmds.c:1004 commands/foreigncmds.c:1367
+#: foreign/foreign.c:714
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "сервер \"%s\" не існує"
 
-#: catalog/objectaddress.c:1901
+#: catalog/objectaddress.c:1906
 #, c-format
 msgid "publication relation \"%s\" in publication \"%s\" does not exist"
 msgstr "відношення публікації \"%s\" в публікації \"%s\" не існує"
 
-#: catalog/objectaddress.c:1948
+#: catalog/objectaddress.c:1953
 #, c-format
 msgid "publication schema \"%s\" in publication \"%s\" does not exist"
 msgstr "схема публікації \"%s\" в публікації \"%s\" не існує"
 
-#: catalog/objectaddress.c:2006
+#: catalog/objectaddress.c:2014
 #, c-format
 msgid "unrecognized default ACL object type \"%c\""
 msgstr "нерозпізнаний тип об'єкта ACL за замовчуванням \"%c\""
 
-#: catalog/objectaddress.c:2007
+#: catalog/objectaddress.c:2015
 #, c-format
-msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
-msgstr "Припустимі типи об'єктів: \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgid "Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
+msgstr "Доступні типи об'єктів: \"%c\", \"%c\", \"%c\", \"%c\", \"%c\", \"%c\"."
 
-#: catalog/objectaddress.c:2058
+#: catalog/objectaddress.c:2067
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "ACL за замовчуванням для користувача \"%s\" в схемі \"%s\" для об'єкту %s не існує"
 
-#: catalog/objectaddress.c:2063
+#: catalog/objectaddress.c:2072
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "ACL за замовчуванням для користувача \"%s\" і для об'єкту %s не існує"
 
-#: catalog/objectaddress.c:2089 catalog/objectaddress.c:2146
-#: catalog/objectaddress.c:2201
+#: catalog/objectaddress.c:2098 catalog/objectaddress.c:2155
+#: catalog/objectaddress.c:2210
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "списки імен та аргументів не повинні містити Null"
 
-#: catalog/objectaddress.c:2123
+#: catalog/objectaddress.c:2132
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "непідтримуваний тип об'єкта \"%s\""
 
-#: catalog/objectaddress.c:2142 catalog/objectaddress.c:2159
-#: catalog/objectaddress.c:2224 catalog/objectaddress.c:2308
+#: catalog/objectaddress.c:2151 catalog/objectaddress.c:2168
+#: catalog/objectaddress.c:2233 catalog/objectaddress.c:2317
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "довжина списку імен повинна бути точно %d"
 
-#: catalog/objectaddress.c:2163
+#: catalog/objectaddress.c:2172
 #, c-format
 msgid "large object OID may not be null"
 msgstr "OID великого об'єкта не повинно бути нулем"
 
-#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2242
-#: catalog/objectaddress.c:2249
+#: catalog/objectaddress.c:2181 catalog/objectaddress.c:2251
+#: catalog/objectaddress.c:2258
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "довжина списку імен повинна бути щонайменше %d"
 
-#: catalog/objectaddress.c:2235 catalog/objectaddress.c:2256
+#: catalog/objectaddress.c:2244 catalog/objectaddress.c:2265
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "довжина списку аргументів повинна бути точно %d"
 
-#: catalog/objectaddress.c:2470 libpq/be-fsstubs.c:329
+#: catalog/objectaddress.c:2479 libpq/be-fsstubs.c:334
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "треба бути власником великого об'єкта %u"
 
-#: catalog/objectaddress.c:2485 commands/functioncmds.c:1560
+#: catalog/objectaddress.c:2494 commands/functioncmds.c:1578
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "треба бути власником типу %s або типу %s"
 
-#: catalog/objectaddress.c:2512 catalog/objectaddress.c:2521
-#: catalog/objectaddress.c:2527
+#: catalog/objectaddress.c:2521 catalog/objectaddress.c:2530
+#: catalog/objectaddress.c:2536
 #, c-format
 msgid "permission denied"
 msgstr "немає доступу"
 
-#: catalog/objectaddress.c:2513 catalog/objectaddress.c:2522
+#: catalog/objectaddress.c:2522 catalog/objectaddress.c:2531
 #, c-format
 msgid "The current user must have the %s attribute."
 msgstr "Поточний користувач повинен мати атрибут %s."
 
-#: catalog/objectaddress.c:2528
+#: catalog/objectaddress.c:2537
 #, c-format
 msgid "The current user must have the %s option on role \"%s\"."
 msgstr "Поточний користувач повинен мати параметр %s для ролі \"%s\"."
 
-#: catalog/objectaddress.c:2542
+#: catalog/objectaddress.c:2551
 #, c-format
 msgid "must be superuser"
 msgstr "треба бути суперкористувачем"
 
-#: catalog/objectaddress.c:2611
+#: catalog/objectaddress.c:2620
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "нерозпізнаний тип об'єкту \"%s\""
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:2903
+#: catalog/objectaddress.c:2937
 #, c-format
 msgid "column %s of %s"
 msgstr "стовпець %s з %s"
 
-#: catalog/objectaddress.c:2918
+#: catalog/objectaddress.c:2952
 #, c-format
 msgid "function %s"
 msgstr "функція %s"
 
-#: catalog/objectaddress.c:2931
+#: catalog/objectaddress.c:2965
 #, c-format
 msgid "type %s"
 msgstr "тип %s"
 
-#: catalog/objectaddress.c:2968
+#: catalog/objectaddress.c:3002
 #, c-format
 msgid "cast from %s to %s"
 msgstr "приведення від %s до %s"
 
-#: catalog/objectaddress.c:3001
+#: catalog/objectaddress.c:3035
 #, c-format
 msgid "collation %s"
 msgstr "сортування %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3032
+#: catalog/objectaddress.c:3066
 #, c-format
 msgid "constraint %s on %s"
 msgstr "обмеження %s на %s"
 
-#: catalog/objectaddress.c:3038
+#: catalog/objectaddress.c:3072
 #, c-format
 msgid "constraint %s"
 msgstr "обмеження %s"
 
-#: catalog/objectaddress.c:3070
+#: catalog/objectaddress.c:3104
 #, c-format
 msgid "conversion %s"
 msgstr "перетворення %s"
 
 #. translator: %s is typically "column %s of table %s"
-#: catalog/objectaddress.c:3092
+#: catalog/objectaddress.c:3126
 #, c-format
 msgid "default value for %s"
 msgstr "значення за замовчуванням для %s"
 
-#: catalog/objectaddress.c:3103
+#: catalog/objectaddress.c:3137
 #, c-format
 msgid "language %s"
 msgstr "мова %s"
 
-#: catalog/objectaddress.c:3111
+#: catalog/objectaddress.c:3145
 #, c-format
 msgid "large object %u"
 msgstr "великий об'єкт %u"
 
-#: catalog/objectaddress.c:3124
+#: catalog/objectaddress.c:3158
 #, c-format
 msgid "operator %s"
 msgstr "оператор %s"
 
-#: catalog/objectaddress.c:3161
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "клас операторів %s для методу доступу %s"
 
-#: catalog/objectaddress.c:3189
+#: catalog/objectaddress.c:3223
 #, c-format
 msgid "access method %s"
 msgstr "метод доступу %s"
@@ -5474,7 +5533,7 @@ msgstr "метод доступу %s"
 #. 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:3238
+#: catalog/objectaddress.c:3278
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "оператор %d (%s, %s) з %s: %s"
@@ -5483,236 +5542,241 @@ msgstr "оператор %d (%s, %s) з %s: %s"
 #. are data type names, the third %s is the description of the
 #. operator family, and the last %s is the textual form of the
 #. function with arguments.
-#: catalog/objectaddress.c:3295
+#: catalog/objectaddress.c:3343
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "функція %d (%s, %s) з %s: %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3347
+#: catalog/objectaddress.c:3397
 #, c-format
 msgid "rule %s on %s"
 msgstr "правило %s на %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3393
+#: catalog/objectaddress.c:3443
 #, c-format
 msgid "trigger %s on %s"
 msgstr "тригер %s на %s"
 
-#: catalog/objectaddress.c:3413
+#: catalog/objectaddress.c:3463
 #, c-format
 msgid "schema %s"
 msgstr "схема %s"
 
-#: catalog/objectaddress.c:3441
+#: catalog/objectaddress.c:3491
 #, c-format
 msgid "statistics object %s"
 msgstr "об'єкт статистики %s"
 
-#: catalog/objectaddress.c:3472
+#: catalog/objectaddress.c:3522
 #, c-format
 msgid "text search parser %s"
 msgstr "парсер текстового пошуку %s"
 
-#: catalog/objectaddress.c:3503
+#: catalog/objectaddress.c:3553
 #, c-format
 msgid "text search dictionary %s"
 msgstr "словник текстового пошуку %s"
 
-#: catalog/objectaddress.c:3534
+#: catalog/objectaddress.c:3584
 #, c-format
 msgid "text search template %s"
 msgstr "шаблон текстового пошуку %s"
 
-#: catalog/objectaddress.c:3565
+#: catalog/objectaddress.c:3615
 #, c-format
 msgid "text search configuration %s"
 msgstr "конфігурація текстового пошуку %s"
 
-#: catalog/objectaddress.c:3578
+#: catalog/objectaddress.c:3628
 #, c-format
 msgid "role %s"
 msgstr "роль %s"
 
-#: catalog/objectaddress.c:3615 catalog/objectaddress.c:5464
+#: catalog/objectaddress.c:3665 catalog/objectaddress.c:5589
 #, c-format
 msgid "membership of role %s in role %s"
 msgstr "членство ролі %s в ролі %s"
 
-#: catalog/objectaddress.c:3636
+#: catalog/objectaddress.c:3686
 #, c-format
 msgid "database %s"
 msgstr "база даних %s"
 
-#: catalog/objectaddress.c:3652
+#: catalog/objectaddress.c:3702
 #, c-format
 msgid "tablespace %s"
 msgstr "табличний простір %s"
 
-#: catalog/objectaddress.c:3663
+#: catalog/objectaddress.c:3713
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "джерело сторонніх даних %s"
 
-#: catalog/objectaddress.c:3673
+#: catalog/objectaddress.c:3723
 #, c-format
 msgid "server %s"
 msgstr "сервер %s"
 
-#: catalog/objectaddress.c:3706
+#: catalog/objectaddress.c:3756
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "зіставлення користувача для %s на сервері %s"
 
-#: catalog/objectaddress.c:3758
+#: catalog/objectaddress.c:3808
 #, c-format
 msgid "default privileges on new relations belonging to role %s in schema %s"
 msgstr "права за замовчуванням для нових відношень, що належать ролі %s в схемі %s"
 
-#: catalog/objectaddress.c:3762
+#: catalog/objectaddress.c:3812
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "права за замовчуванням для нових відношень, що належать ролі %s"
 
-#: catalog/objectaddress.c:3768
+#: catalog/objectaddress.c:3818
 #, c-format
 msgid "default privileges on new sequences belonging to role %s in schema %s"
 msgstr "права за замовчуванням для нових послідовностей, що належать ролі %s в схемі %s"
 
-#: catalog/objectaddress.c:3772
+#: catalog/objectaddress.c:3822
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "права за замовчуванням для нових послідовностей, що належать ролі %s"
 
-#: catalog/objectaddress.c:3778
+#: catalog/objectaddress.c:3828
 #, c-format
 msgid "default privileges on new functions belonging to role %s in schema %s"
 msgstr "права за замовчуванням для нових функцій, що належать ролі %s в схемі %s"
 
-#: catalog/objectaddress.c:3782
+#: catalog/objectaddress.c:3832
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "права за замовчуванням для нових функцій, що належать ролі %s"
 
-#: catalog/objectaddress.c:3788
+#: catalog/objectaddress.c:3838
 #, c-format
 msgid "default privileges on new types belonging to role %s in schema %s"
 msgstr "права за замовчуванням для нових типів, що належать ролі %s в схемі %s"
 
-#: catalog/objectaddress.c:3792
+#: catalog/objectaddress.c:3842
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "права за замовчуванням для нових типів, що належать ролі %s"
 
-#: catalog/objectaddress.c:3798
+#: catalog/objectaddress.c:3848
 #, c-format
 msgid "default privileges on new schemas belonging to role %s"
 msgstr "права за замовчуванням для нових схем, що належать ролі %s"
 
-#: catalog/objectaddress.c:3805
+#: catalog/objectaddress.c:3854
+#, c-format
+msgid "default privileges on new large objects belonging to role %s"
+msgstr "права за замовчуванням на нові великі об'єкти, що належать ролі %s"
+
+#: catalog/objectaddress.c:3861
 #, c-format
 msgid "default privileges belonging to role %s in schema %s"
 msgstr "права за замовчуванням, що належать ролі %s в схемі %s"
 
-#: catalog/objectaddress.c:3809
+#: catalog/objectaddress.c:3865
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "права за замовчуванням належать ролі %s"
 
-#: catalog/objectaddress.c:3831
+#: catalog/objectaddress.c:3887
 #, c-format
 msgid "extension %s"
 msgstr "розширення %s"
 
-#: catalog/objectaddress.c:3848
+#: catalog/objectaddress.c:3904
 #, c-format
 msgid "event trigger %s"
 msgstr "тригер подій %s"
 
-#: catalog/objectaddress.c:3872
+#: catalog/objectaddress.c:3928
 #, c-format
 msgid "parameter %s"
 msgstr "параметр %s"
 
 #. translator: second %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3915
+#: catalog/objectaddress.c:3971
 #, c-format
 msgid "policy %s on %s"
 msgstr "політика %s на %s"
 
-#: catalog/objectaddress.c:3929
+#: catalog/objectaddress.c:3985
 #, c-format
 msgid "publication %s"
 msgstr "публікація %s"
 
-#: catalog/objectaddress.c:3942
+#: catalog/objectaddress.c:3998
 #, c-format
 msgid "publication of schema %s in publication %s"
 msgstr "публікація схеми %s в публікації %s"
 
 #. translator: first %s is, e.g., "table %s"
-#: catalog/objectaddress.c:3973
+#: catalog/objectaddress.c:4029
 #, c-format
 msgid "publication of %s in publication %s"
 msgstr "відношення публікації %s в публікації %s"
 
-#: catalog/objectaddress.c:3986
+#: catalog/objectaddress.c:4042
 #, c-format
 msgid "subscription %s"
 msgstr "підписка %s"
 
-#: catalog/objectaddress.c:4007
+#: catalog/objectaddress.c:4063
 #, c-format
 msgid "transform for %s language %s"
 msgstr "трансформація для %s мови %s"
 
-#: catalog/objectaddress.c:4076
+#: catalog/objectaddress.c:4132
 #, c-format
 msgid "table %s"
 msgstr "таблиця %s"
 
-#: catalog/objectaddress.c:4081
+#: catalog/objectaddress.c:4137
 #, c-format
 msgid "index %s"
 msgstr "індекс %s"
 
-#: catalog/objectaddress.c:4085
+#: catalog/objectaddress.c:4141
 #, c-format
 msgid "sequence %s"
 msgstr "послідовність %s"
 
-#: catalog/objectaddress.c:4089
+#: catalog/objectaddress.c:4145
 #, c-format
 msgid "toast table %s"
 msgstr "таблиця toast %s"
 
-#: catalog/objectaddress.c:4093
+#: catalog/objectaddress.c:4149
 #, c-format
 msgid "view %s"
 msgstr "подання %s"
 
-#: catalog/objectaddress.c:4097
+#: catalog/objectaddress.c:4153
 #, c-format
 msgid "materialized view %s"
 msgstr "матеріалізоване подання %s"
 
-#: catalog/objectaddress.c:4101
+#: catalog/objectaddress.c:4157
 #, c-format
 msgid "composite type %s"
 msgstr "складений тип %s"
 
-#: catalog/objectaddress.c:4105
+#: catalog/objectaddress.c:4161
 #, c-format
 msgid "foreign table %s"
 msgstr "зовнішня таблиця %s"
 
-#: catalog/objectaddress.c:4110
+#: catalog/objectaddress.c:4166
 #, c-format
 msgid "relation %s"
 msgstr "відношення %s"
 
-#: catalog/objectaddress.c:4151
+#: catalog/objectaddress.c:4207
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "сімейство операторів %s для методу доступу %s"
@@ -5756,7 +5820,7 @@ msgstr "не можна пропустити початкове значення
 msgid "return type of inverse transition function %s is not %s"
 msgstr "інвертована функція переходу %s повинна повертати тип %s"
 
-#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:2992
+#: catalog/pg_aggregate.c:352 executor/nodeWindowAgg.c:3057
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "пряма й інвертована функції переходу агрегату повинні мати однакову суворість"
@@ -5771,7 +5835,7 @@ msgstr "фінальна функція з додатковими аргумен
 msgid "return type of combine function %s is not %s"
 msgstr "комбінуюча функція %s повинна повертати тип %s"
 
-#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:3902
+#: catalog/pg_aggregate.c:439 executor/nodeAgg.c:4005
 #, c-format
 msgid "combine function with transition type %s must not be declared STRICT"
 msgstr "комбінуюча функція з перехідним типом %s не повинна оголошуватись як сувора (STRICT)"
@@ -5786,12 +5850,12 @@ msgstr "функція серіалізації %s повинна поверта
 msgid "return type of deserialization function %s is not %s"
 msgstr "функція десеріалізації %s повинна повертати тип %s"
 
-#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:189 catalog/pg_proc.c:223
+#: catalog/pg_aggregate.c:498 catalog/pg_proc.c:217 catalog/pg_proc.c:251
 #, c-format
 msgid "cannot determine result data type"
 msgstr "не вдалося визначити тип результату"
 
-#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:202 catalog/pg_proc.c:231
+#: catalog/pg_aggregate.c:513 catalog/pg_proc.c:230 catalog/pg_proc.c:259
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "небезпечне використання псевдотипу (pseudo-type) \"internal\""
@@ -5806,53 +5870,53 @@ msgstr "реалізація рухомого агрегату повертає
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "оператора сортування можна вказати лише для агрегатних функцій з одним аргументом"
 
-#: catalog/pg_aggregate.c:706 catalog/pg_proc.c:384
+#: catalog/pg_aggregate.c:707 catalog/pg_proc.c:412
 #, c-format
 msgid "cannot change routine kind"
 msgstr "неможливо змінити тип підпрограми"
 
-#: catalog/pg_aggregate.c:708
+#: catalog/pg_aggregate.c:709
 #, c-format
 msgid "\"%s\" is an ordinary aggregate function."
 msgstr "\"%s\" є звичайною агрегатною функцією."
 
-#: catalog/pg_aggregate.c:710
+#: catalog/pg_aggregate.c:711
 #, c-format
 msgid "\"%s\" is an ordered-set aggregate."
 msgstr "\"%s\" є сортувальним агрегатом."
 
-#: catalog/pg_aggregate.c:712
+#: catalog/pg_aggregate.c:713
 #, c-format
 msgid "\"%s\" is a hypothetical-set aggregate."
 msgstr "\"%s\" є агрегатом для гіпотетичних наборів."
 
-#: catalog/pg_aggregate.c:717
+#: catalog/pg_aggregate.c:718
 #, c-format
 msgid "cannot change number of direct arguments of an aggregate function"
 msgstr "змінити кількість прямих аргументів агрегатної функції не можна"
 
-#: catalog/pg_aggregate.c:858 commands/functioncmds.c:686
-#: commands/typecmds.c:1985 commands/typecmds.c:2031 commands/typecmds.c:2083
-#: commands/typecmds.c:2120 commands/typecmds.c:2154 commands/typecmds.c:2188
-#: commands/typecmds.c:2222 commands/typecmds.c:2251 commands/typecmds.c:2338
-#: commands/typecmds.c:2380 parser/parse_func.c:417 parser/parse_func.c:448
+#: catalog/pg_aggregate.c:859 commands/functioncmds.c:701
+#: commands/typecmds.c:2023 commands/typecmds.c:2069 commands/typecmds.c:2121
+#: commands/typecmds.c:2158 commands/typecmds.c:2192 commands/typecmds.c:2226
+#: commands/typecmds.c:2260 commands/typecmds.c:2289 commands/typecmds.c:2376
+#: commands/typecmds.c:2418 parser/parse_func.c:417 parser/parse_func.c:448
 #: parser/parse_func.c:475 parser/parse_func.c:489 parser/parse_func.c:611
 #: parser/parse_func.c:631 parser/parse_func.c:2172 parser/parse_func.c:2445
 #, c-format
 msgid "function %s does not exist"
 msgstr "функції %s не існує"
 
-#: catalog/pg_aggregate.c:864
+#: catalog/pg_aggregate.c:865
 #, c-format
 msgid "function %s returns a set"
 msgstr "функція %s повертає набір"
 
-#: catalog/pg_aggregate.c:879
+#: catalog/pg_aggregate.c:880
 #, c-format
 msgid "function %s must accept VARIADIC ANY to be used in this aggregate"
 msgstr "функція %s повинна прийняти VARIADIC ANY для використання в цій агрегатній функції"
 
-#: catalog/pg_aggregate.c:903
+#: catalog/pg_aggregate.c:904
 #, c-format
 msgid "function %s requires run-time type coercion"
 msgstr "функція %s потребує приведення типів під час виконання"
@@ -5932,21 +5996,52 @@ msgstr "правило сортування \"%s\" вже існує"
 msgid "collation \"%s\" for encoding \"%s\" already exists"
 msgstr "правило сортування \"%s \" для кодування \"%s\" вже існує"
 
-#: catalog/pg_constraint.c:732
+#: catalog/pg_constraint.c:763 commands/tablecmds.c:7952
+#, c-format
+msgid "cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\""
+msgstr "не можна змінити статус NO INHERIT обмеження NOT NULL \"%s\" для відношення \"%s\""
+
+#: catalog/pg_constraint.c:765 commands/tablecmds.c:9584
+#, c-format
+msgid "You might need to make the existing constraint inheritable using %s."
+msgstr "Вам можливо доведеться зробити існуюче обмеження успадковуваним, використовуючи %s."
+
+#: catalog/pg_constraint.c:775 commands/tablecmds.c:8301
+#, c-format
+msgid "incompatible NOT VALID constraint \"%s\" on relation \"%s\""
+msgstr "несумісне обмеження NOT VALID \"%s\" для відношення \"%s\""
+
+#: catalog/pg_constraint.c:777 commands/tablecmds.c:8303
+#: commands/tablecmds.c:9596
+#, c-format
+msgid "You might need to validate it using %s."
+msgstr "Вам можливо доведеться перевірити його за допомогою %s."
+
+#: catalog/pg_constraint.c:1016
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "обмеження \"%s\" для домену %s вже існує"
 
-#: catalog/pg_constraint.c:932 catalog/pg_constraint.c:1025
+#: catalog/pg_constraint.c:1217 catalog/pg_constraint.c:1310
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "індексу \"%s\" для таблиці \"%s\" не існує"
 
-#: catalog/pg_constraint.c:1125
+#: catalog/pg_constraint.c:1410
 #, c-format
 msgid "constraint \"%s\" for domain %s does not exist"
 msgstr "обмеження \"%s\" для домену \"%s\" не існує"
 
+#: catalog/pg_constraint.c:1664
+#, c-format
+msgid "invalid type for PERIOD part of foreign key"
+msgstr "недійсний тип для частини PERIOD зовнішнього ключа"
+
+#: catalog/pg_constraint.c:1665
+#, c-format
+msgid "Only range and multirange are supported."
+msgstr "Підтримуються лише діапазон і мультидіапазон."
+
 #: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion \"%s\" already exists"
@@ -5957,27 +6052,27 @@ msgstr "перетворення \"%s\" вже існує"
 msgid "default conversion for %s to %s already exists"
 msgstr "перетворення за замовчуванням від %s до %s вже існує"
 
-#: catalog/pg_depend.c:224 commands/extension.c:3397
+#: catalog/pg_depend.c:223 commands/extension.c:3689
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s вже є членом розширення \"%s\""
 
-#: catalog/pg_depend.c:231 catalog/pg_depend.c:282 commands/extension.c:3437
+#: catalog/pg_depend.c:230 catalog/pg_depend.c:281 commands/extension.c:3729
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s не є членом розширення \"%s\""
 
-#: catalog/pg_depend.c:234
+#: catalog/pg_depend.c:233
 #, c-format
 msgid "An extension is not allowed to replace an object that it does not own."
 msgstr "Розширенню не дозволяється замінювати об'єкт, який йому не належить."
 
-#: catalog/pg_depend.c:285
+#: catalog/pg_depend.c:284
 #, c-format
 msgid "An extension may only use CREATE ... IF NOT EXISTS to skip object creation if the conflicting object is one that it already owns."
 msgstr "Розширення може використовувати лише CREATE ... IF NOT EXISTS, щоб пропустити створення об'єкту, якщо конфліктуючий об'єкт уже належить йому."
 
-#: catalog/pg_depend.c:648
+#: catalog/pg_depend.c:647
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "неможливо видалити залежність від об'єкта %s, тому що це системний об'єкт"
@@ -6027,8 +6122,8 @@ msgstr "не можна відключити розділ \"%s\""
 msgid "The partition is being detached concurrently or has an unfinished detach."
 msgstr "Розділ відключається одночасно або має незакінчене відключення."
 
-#: catalog/pg_inherits.c:595 commands/tablecmds.c:4777
-#: commands/tablecmds.c:16050
+#: catalog/pg_inherits.c:595 commands/tablecmds.c:4916
+#: commands/tablecmds.c:17891
 #, c-format
 msgid "Use ALTER TABLE ... DETACH PARTITION ... FINALIZE to complete the pending detach operation."
 msgstr "Використайте ALTER TABLE ... DETACH PARTITION ... FINALIZE щоб завершити очікувану операцію відключення."
@@ -6133,7 +6228,7 @@ msgstr "заперечний оператор %s вже є запереченн
 msgid "parameter ACL \"%s\" does not exist"
 msgstr "параметр ACL \"%s\" не існує"
 
-#: catalog/pg_proc.c:130 parser/parse_func.c:2234
+#: catalog/pg_proc.c:158 parser/parse_func.c:2234
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
@@ -6142,37 +6237,37 @@ msgstr[1] "функції не можуть мати більше %d аргум
 msgstr[2] "функції не можуть мати більше %d аргументів"
 msgstr[3] "функції не можуть мати більше %d аргументів"
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:402
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "функція \"%s\" з аргументами таких типів вже існує"
 
-#: catalog/pg_proc.c:386
+#: catalog/pg_proc.c:414
 #, c-format
 msgid "\"%s\" is an aggregate function."
 msgstr "\"%s\" є функцією агрегату."
 
-#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:416
 #, c-format
 msgid "\"%s\" is a function."
 msgstr "\"%s\" є функцією."
 
-#: catalog/pg_proc.c:390
+#: catalog/pg_proc.c:418
 #, c-format
 msgid "\"%s\" is a procedure."
 msgstr "\"%s\" є процедурою."
 
-#: catalog/pg_proc.c:392
+#: catalog/pg_proc.c:420
 #, c-format
 msgid "\"%s\" is a window function."
 msgstr "\"%s\" є функцією вікна."
 
-#: catalog/pg_proc.c:412
+#: catalog/pg_proc.c:440
 #, c-format
 msgid "cannot change whether a procedure has output parameters"
 msgstr "неможливо визначити вихідні параметри для процедури"
 
-#: catalog/pg_proc.c:413 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:441 catalog/pg_proc.c:471
 #, c-format
 msgid "cannot change return type of existing function"
 msgstr "неможливо змінити тип повернення існуючої функції"
@@ -6181,109 +6276,109 @@ msgstr "неможливо змінити тип повернення існую
 #. AGGREGATE
 #.
 #. translator: first %s is DROP FUNCTION or DROP PROCEDURE
-#: catalog/pg_proc.c:419 catalog/pg_proc.c:446 catalog/pg_proc.c:491
-#: catalog/pg_proc.c:517 catalog/pg_proc.c:541
+#: catalog/pg_proc.c:447 catalog/pg_proc.c:474 catalog/pg_proc.c:519
+#: catalog/pg_proc.c:545 catalog/pg_proc.c:569
 #, c-format
 msgid "Use %s %s first."
 msgstr "Використайте %s %s спочатку."
 
-#: catalog/pg_proc.c:444
+#: catalog/pg_proc.c:472
 #, c-format
 msgid "Row type defined by OUT parameters is different."
 msgstr "Параметри OUT визначають другий тип рядку."
 
-#: catalog/pg_proc.c:488
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "неможливо змінити ім'я вхідного параметру \"%s\""
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:543
 #, c-format
 msgid "cannot remove parameter defaults from existing function"
 msgstr "неможливо прибрати параметр за замовчуванням з існуючої функції"
 
-#: catalog/pg_proc.c:539
+#: catalog/pg_proc.c:567
 #, c-format
 msgid "cannot change data type of existing parameter default value"
 msgstr "неможливо змінити тип даних для існуючого значення параметру за замовчуванням"
 
-#: catalog/pg_proc.c:750
+#: catalog/pg_proc.c:771
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "немає вбудованої функції \"%s\""
 
-#: catalog/pg_proc.c:843
+#: catalog/pg_proc.c:864
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "Функції SQL не можуть повернути тип %s"
 
-#: catalog/pg_proc.c:858
+#: catalog/pg_proc.c:879
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "функції SQL не можуть мати аргументи типу %s"
 
-#: catalog/pg_proc.c:986 executor/functions.c:1468
+#: catalog/pg_proc.c:1007
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "Функція SQL \"%s\""
 
-#: catalog/pg_publication.c:66 catalog/pg_publication.c:74
-#: catalog/pg_publication.c:82 catalog/pg_publication.c:88
+#: catalog/pg_publication.c:63 catalog/pg_publication.c:71
+#: catalog/pg_publication.c:79 catalog/pg_publication.c:85
 #, c-format
 msgid "cannot add relation \"%s\" to publication"
 msgstr "не можна додати відношення \"%s\" до публікації"
 
-#: catalog/pg_publication.c:76
+#: catalog/pg_publication.c:73
 #, c-format
 msgid "This operation is not supported for system tables."
 msgstr "Ця операція не підтримується для системних таблиць."
 
-#: catalog/pg_publication.c:84
+#: catalog/pg_publication.c:81
 #, c-format
 msgid "This operation is not supported for temporary tables."
 msgstr "Ця операція не підтримується для тимчасових таблиць."
 
-#: catalog/pg_publication.c:90
+#: catalog/pg_publication.c:87
 #, c-format
 msgid "This operation is not supported for unlogged tables."
 msgstr "Ця операція не підтримується для таблиць без журналювання."
 
-#: catalog/pg_publication.c:104 catalog/pg_publication.c:112
+#: catalog/pg_publication.c:101 catalog/pg_publication.c:109
 #, c-format
 msgid "cannot add schema \"%s\" to publication"
 msgstr "не можна додати схему \"%s\" до публікації"
 
-#: catalog/pg_publication.c:106
+#: catalog/pg_publication.c:103
 #, c-format
 msgid "This operation is not supported for system schemas."
 msgstr "Ця операція не підтримується для системних схем."
 
-#: catalog/pg_publication.c:114
+#: catalog/pg_publication.c:111
 #, c-format
 msgid "Temporary schemas cannot be replicated."
 msgstr "Тимчасові схеми не можуть бути репліковані."
 
-#: catalog/pg_publication.c:392
+#: catalog/pg_publication.c:462
 #, c-format
 msgid "relation \"%s\" is already member of publication \"%s\""
 msgstr "відношення \"%s\" вже є членом публікації \"%s\""
 
-#: catalog/pg_publication.c:534
+#: catalog/pg_publication.c:576
 #, c-format
 msgid "cannot use system column \"%s\" in publication column list"
 msgstr "не можна використати системний стовпець \"%s\" у списку стовпців публікації"
 
-#: catalog/pg_publication.c:540
+#: catalog/pg_publication.c:582
 #, c-format
-msgid "cannot use generated column \"%s\" in publication column list"
-msgstr "не можна використати згенерований стовпець \"%s\" у списку стовпців публікації"
+msgid "cannot use virtual generated column \"%s\" in publication column list"
+msgstr "не можна використовувати віртуальний генерований стовпець \"%s\" у списку стовпців публікації"
 
-#: catalog/pg_publication.c:546
+#: catalog/pg_publication.c:588
 #, c-format
 msgid "duplicate column \"%s\" in publication column list"
 msgstr "дуплікат стовпця \"%s\" в списку стовпців публікації"
 
-#: catalog/pg_publication.c:636
+#: catalog/pg_publication.c:700
 #, c-format
 msgid "schema \"%s\" is already member of publication \"%s\""
 msgstr "схема \"%s\" вже є членом публікації \"%s\""
@@ -6363,12 +6458,12 @@ msgstr "не вдалося видалити об'єкти, що належат
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "не вдалося змінити власника об'єктів, що належать ролі %s, тому що вони необхідні системі баз даних"
 
-#: catalog/pg_subscription.c:438
+#: catalog/pg_subscription.c:484
 #, c-format
 msgid "could not drop relation mapping for subscription \"%s\""
 msgstr "не вдалося видалити зіставлення відношень для підписки \"%s\""
 
-#: catalog/pg_subscription.c:440
+#: catalog/pg_subscription.c:486
 #, c-format
 msgid "Table synchronization for relation \"%s\" is in progress and is in state \"%c\"."
 msgstr "Синхронізація таблиць для відношення \"%s\" у процесі та знаходиться у стані \"%c\"."
@@ -6376,7 +6471,7 @@ msgstr "Синхронізація таблиць для відношення \"
 #. translator: first %s is a SQL ALTER command and second %s is a
 #. SQL DROP command
 #.
-#: catalog/pg_subscription.c:447
+#: catalog/pg_subscription.c:493
 #, c-format
 msgid "Use %s to enable subscription if not already enabled or use %s to drop the subscription."
 msgstr "Використайте %s, щоб активувати підписку, якщо вона ще не активована, або використайте %s, щоб видалити підписку."
@@ -6407,7 +6502,7 @@ msgstr "внутрішній розмір %d недійсний для типу,
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "вирівнювання \"%c\" недійсне для типу змінної довжини"
 
-#: catalog/pg_type.c:325 commands/typecmds.c:4363
+#: catalog/pg_type.c:325 commands/typecmds.c:4362
 #, c-format
 msgid "fixed-size types must have storage PLAIN"
 msgstr "для типів фіксованого розміру застосовується лише режим зберігання PLAIN"
@@ -6422,10 +6517,10 @@ msgstr "Помилка під час створення багатодіапаз
 msgid "You can manually specify a multirange type name using the \"multirange_type_name\" attribute."
 msgstr "Ви можете вручну вказати назву багатодіапазонного типу за допомогою атрибуту \"multirange_type_name\"."
 
-#: catalog/storage.c:508 storage/buffer/bufmgr.c:1540
+#: catalog/storage.c:549 storage/buffer/bufmgr.c:7338
 #, c-format
-msgid "invalid page in block %u of relation %s"
-msgstr "неприпустима сторінка в блоці %u відношення %s"
+msgid "invalid page in block %u of relation \"%s\""
+msgstr "недійсна сторінка в блоці %u відношення \"%s\""
 
 #: commands/aggregatecmds.c:167
 #, c-format
@@ -6507,7 +6602,7 @@ msgstr "функції серіалізації можуть визначати
 msgid "must specify both or neither of serialization and deserialization functions"
 msgstr "повинні визначатись обидві або жодна з серіалізуючих та десеріалізуючих функцій"
 
-#: commands/aggregatecmds.c:434 commands/functioncmds.c:634
+#: commands/aggregatecmds.c:434 commands/functioncmds.c:649
 #, c-format
 msgid "parameter \"parallel\" must be SAFE, RESTRICTED, or UNSAFE"
 msgstr "параметр \"parallel\" має мати значення SAFE, RESTRICTED, або UNSAFE"
@@ -6517,86 +6612,86 @@ msgstr "параметр \"parallel\" має мати значення SAFE, RES
 msgid "parameter \"%s\" must be READ_ONLY, SHAREABLE, or READ_WRITE"
 msgstr "параметр \"%s\" має мати значення READ_ONLY, SHAREABLE, або READ_WRITE"
 
-#: commands/alter.c:82 commands/event_trigger.c:191
+#: commands/alter.c:83 commands/event_trigger.c:195
 #, c-format
 msgid "event trigger \"%s\" already exists"
 msgstr "тригер подій \"%s\" вже існує"
 
-#: commands/alter.c:85 commands/foreigncmds.c:593
+#: commands/alter.c:86 commands/foreigncmds.c:604
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "джерело сторонніх даних \"%s\" вже існує"
 
-#: commands/alter.c:88 commands/foreigncmds.c:884
+#: commands/alter.c:89 commands/foreigncmds.c:895
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "сервер \"%s\" вже існує"
 
-#: commands/alter.c:91 commands/proclang.c:131
+#: commands/alter.c:92 commands/proclang.c:131
 #, c-format
 msgid "language \"%s\" already exists"
 msgstr "мова \"%s\" вже існує"
 
-#: commands/alter.c:94 commands/publicationcmds.c:764
+#: commands/alter.c:95 commands/publicationcmds.c:865
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "публікація \"%s\" вже існує"
 
-#: commands/alter.c:97 commands/subscriptioncmds.c:669
+#: commands/alter.c:98 commands/subscriptioncmds.c:629
 #, c-format
 msgid "subscription \"%s\" already exists"
 msgstr "підписка \"%s\" вже існує"
 
-#: commands/alter.c:120
+#: commands/alter.c:121
 #, c-format
 msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr "перетворення \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:124
+#: commands/alter.c:125
 #, c-format
 msgid "statistics object \"%s\" already exists in schema \"%s\""
 msgstr "об'єкт статистики \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:128
+#: commands/alter.c:129
 #, c-format
 msgid "text search parser \"%s\" already exists in schema \"%s\""
 msgstr "парсер текстового пошуку \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:132
+#: commands/alter.c:133
 #, c-format
 msgid "text search dictionary \"%s\" already exists in schema \"%s\""
 msgstr "словник текстового пошуку \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:136
+#: commands/alter.c:137
 #, c-format
 msgid "text search template \"%s\" already exists in schema \"%s\""
 msgstr "шаблон текстового пошуку \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:140
+#: commands/alter.c:141
 #, c-format
 msgid "text search configuration \"%s\" already exists in schema \"%s\""
 msgstr "конфігурація текстового пошуку \"%s\" вже існує в схемі \"%s\""
 
-#: commands/alter.c:213
+#: commands/alter.c:214
 #, c-format
 msgid "must be superuser to rename %s"
 msgstr "перейменувати %s може тільки суперкористувач"
 
-#: commands/alter.c:255 commands/subscriptioncmds.c:648
-#: commands/subscriptioncmds.c:1129 commands/subscriptioncmds.c:1212
-#: commands/subscriptioncmds.c:1918
+#: commands/alter.c:256 commands/subscriptioncmds.c:608
+#: commands/subscriptioncmds.c:1147 commands/subscriptioncmds.c:1231
+#: commands/subscriptioncmds.c:1991
 #, c-format
 msgid "password_required=false is superuser-only"
 msgstr "password_required=false тільки для суперкористувачів"
 
-#: commands/alter.c:256 commands/subscriptioncmds.c:649
-#: commands/subscriptioncmds.c:1130 commands/subscriptioncmds.c:1213
-#: commands/subscriptioncmds.c:1919
+#: commands/alter.c:257 commands/subscriptioncmds.c:609
+#: commands/subscriptioncmds.c:1148 commands/subscriptioncmds.c:1232
+#: commands/subscriptioncmds.c:1992
 #, c-format
 msgid "Subscriptions with the password_required option set to false may only be created or modified by the superuser."
 msgstr "Підписки з налаштуванням password_required=false можуть бути створені або змінені тільки суперкористувачем."
 
-#: commands/alter.c:734
+#: commands/alter.c:746
 #, c-format
 msgid "must be superuser to set schema of %s"
 msgstr "встановити схему об'єкту %s може тільки суперкористувач"
@@ -6616,8 +6711,8 @@ msgstr "Тільки суперкористувач може створити м
 msgid "access method \"%s\" already exists"
 msgstr "метод доступу \"%s\" вже існує"
 
-#: commands/amcmds.c:154 commands/indexcmds.c:222 commands/indexcmds.c:842
-#: commands/opclasscmds.c:374 commands/opclasscmds.c:832
+#: commands/amcmds.c:154 commands/indexcmds.c:226 commands/indexcmds.c:859
+#: commands/opclasscmds.c:375 commands/opclasscmds.c:833
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "методу доступу \"%s\" не існує"
@@ -6627,79 +6722,84 @@ msgstr "методу доступу \"%s\" не існує"
 msgid "handler function is not specified"
 msgstr "функція-обробник не вказана"
 
-#: commands/amcmds.c:264 commands/event_trigger.c:200
-#: commands/foreigncmds.c:489 commands/proclang.c:78 commands/trigger.c:702
-#: parser/parse_clause.c:943
+#: commands/amcmds.c:264 commands/event_trigger.c:204
+#: commands/foreigncmds.c:500 commands/proclang.c:78 commands/trigger.c:706
+#: parser/parse_clause.c:941
 #, c-format
 msgid "function %s must return type %s"
 msgstr "функція %s повинна повертати тип %s"
 
-#: commands/analyze.c:217
+#: commands/analyze.c:215
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
 msgstr "пропуск об'єкту \"%s\" --- неможливо аналізувати цю сторонню таблицю"
 
-#: commands/analyze.c:234
+#: commands/analyze.c:232
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr "пропуск об'єкту \"%s\" --- неможливо аналізувати не-таблиці або спеціальні системні таблиці"
 
-#: commands/analyze.c:314
+#: commands/analyze.c:317
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "аналізується дерево наслідування \"%s.%s\""
 
-#: commands/analyze.c:319
+#: commands/analyze.c:322
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "аналіз \"%s.%s\""
 
-#: commands/analyze.c:385
+#: commands/analyze.c:393
 #, c-format
 msgid "column \"%s\" of relation \"%s\" appears more than once"
 msgstr "стовпець \"%s\" відносно \"%s\" з'являється більше одного разу"
 
-#: commands/analyze.c:785
+#: commands/analyze.c:803
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\"\n"
 msgstr "автоматичний аналіз таблиці \"%s.%s.%s\"\n"
 
-#: commands/analyze.c:1300
+#: commands/analyze.c:805
+#, c-format
+msgid "finished analyzing table \"%s.%s.%s\"\n"
+msgstr "завершено аналіз таблиці \"%s.%s.%s\"\n"
+
+#: commands/analyze.c:1346
 #, 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 з %u сторінок, вони містять %.0f живих рядків і %.0f мертвих рядків; %d рядків вибрані; %.0f приблизне загальне число рядків"
 
-#: commands/analyze.c:1384
+#: commands/analyze.c:1430
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "пропускається аналіз дерева наслідування \"%s.%s\" --- це дерево наслідування не містить дочірніх таблиць"
 
-#: commands/analyze.c:1482
+#: commands/analyze.c:1528
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "пропускається аналіз дерева наслідування \"%s.%s\" --- це дерево наслідування не містить аналізуючих дочірніх таблиць"
 
-#: commands/async.c:612
+#: commands/async.c:611
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "ім'я каналу не може бути пустим"
 
-#: commands/async.c:618
+#: commands/async.c:617
 #, c-format
 msgid "channel name too long"
 msgstr "ім'я каналу задовге"
 
-#: commands/async.c:623
+#: commands/async.c:622
 #, c-format
 msgid "payload string too long"
 msgstr "рядок навантаження задовгий"
 
-#: commands/async.c:842
+#: commands/async.c:841
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "виконати PREPARE для транзакції, яка виконала LISTEN, UNLISTEN або NOTIFY неможливо"
 
-#: commands/async.c:946
+#: commands/async.c:945
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "занадто багато сповіщень у черзі NOTIFY"
@@ -6719,89 +6819,91 @@ msgstr "Серверний процес з PID %d серед процесів з
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "Черга NOTIFY не може бути спорожненою, поки цей процес не завершить поточну транзакцію."
 
-#: commands/cluster.c:128
+#: commands/cluster.c:127 commands/dbcommands.c:2356
+#: commands/explain_state.c:165 commands/indexcmds.c:2846 commands/vacuum.c:234
+#: commands/vacuum.c:308
 #, c-format
-msgid "unrecognized CLUSTER option \"%s\""
-msgstr "нерозпізнаний параметр CLUSTER \"%s\""
+msgid "unrecognized %s option \"%s\""
+msgstr "нерозпізнана %s опція \"%s\""
 
-#: commands/cluster.c:159 commands/cluster.c:433
+#: commands/cluster.c:158 commands/cluster.c:421
 #, c-format
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "не можна кластеризувати тимчасові таблиці з інших сеансів"
 
-#: commands/cluster.c:177
+#: commands/cluster.c:176
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "немає попереднього кластеризованого індексу для таблиці \"%s\""
 
-#: commands/cluster.c:191 commands/tablecmds.c:14695 commands/tablecmds.c:16626
+#: commands/cluster.c:190 commands/tablecmds.c:16447 commands/tablecmds.c:18513
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "індекс \"%s\" для таблці \"%s\" не існує"
 
-#: commands/cluster.c:422
+#: commands/cluster.c:410
 #, c-format
 msgid "cannot cluster a shared catalog"
 msgstr "не можна кластеризувати спільний каталог"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:425
 #, c-format
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "не можна очищати тимчасові таблиці з інших сеансів"
 
-#: commands/cluster.c:513 commands/tablecmds.c:16636
+#: commands/cluster.c:507 commands/tablecmds.c:18523
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" не є індексом для таблиці \"%s\""
 
-#: commands/cluster.c:521
+#: commands/cluster.c:515
 #, c-format
 msgid "cannot cluster on index \"%s\" because access method does not support clustering"
 msgstr "кластеризація за індексом \"%s\" неможлива, тому що метод доступу не підтримує кластеризацію"
 
-#: commands/cluster.c:533
+#: commands/cluster.c:527
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "неможливо кластеризувати за секційним індексом \"%s\""
 
-#: commands/cluster.c:547
+#: commands/cluster.c:541
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "неможливо кластеризувати за невірним індексом \"%s\""
 
-#: commands/cluster.c:571
+#: commands/cluster.c:565
 #, c-format
 msgid "cannot mark index clustered in partitioned table"
 msgstr "неможливо помітити індекс кластеризованим в секційній таблиці"
 
-#: commands/cluster.c:956
+#: commands/cluster.c:961
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "кластеризація \"%s.%s\" з використанням сканування індексу \"%s\""
 
-#: commands/cluster.c:962
+#: commands/cluster.c:967
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "кластеризація \"%s.%s\"з використанням послідовного сканування та сортування"
 
-#: commands/cluster.c:967
+#: commands/cluster.c:972
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "очищення \"%s.%s\""
 
-#: commands/cluster.c:994
+#: commands/cluster.c:999
 #, c-format
 msgid "\"%s.%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
 msgstr "\"%s.%s\": знайдено версій рядків, що можуть бути видалені %.0f, що не можуть бути видалені %.0f, переглянуто сторінок %u"
 
-#: commands/cluster.c:999
+#: commands/cluster.c:1004
 #, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
 "%s."
 msgstr "%.0f \"мертві\" версії рядків досі не можуть бути видалені.\n"
 "%s."
 
-#: commands/cluster.c:1744
+#: commands/cluster.c:1751
 #, c-format
 msgid "permission denied to cluster \"%s\", skipping it"
 msgstr "відмовлено в дозволі кластеру \"%s\", пропуск"
@@ -6812,13 +6914,14 @@ msgid "collation attribute \"%s\" not recognized"
 msgstr "атрибут collation \"%s\" не розпізнаний"
 
 #: commands/collationcmds.c:123 commands/collationcmds.c:129
-#: commands/define.c:388 commands/tablecmds.c:8106
-#: replication/pgoutput/pgoutput.c:307 replication/pgoutput/pgoutput.c:330
-#: replication/pgoutput/pgoutput.c:344 replication/pgoutput/pgoutput.c:354
-#: replication/pgoutput/pgoutput.c:364 replication/pgoutput/pgoutput.c:374
-#: replication/pgoutput/pgoutput.c:386 replication/walsender.c:1146
-#: replication/walsender.c:1168 replication/walsender.c:1178
-#: replication/walsender.c:1187 replication/walsender.c:1426
+#: commands/define.c:375 commands/tablecmds.c:8394
+#: replication/pgoutput/pgoutput.c:321 replication/pgoutput/pgoutput.c:344
+#: replication/pgoutput/pgoutput.c:358 replication/pgoutput/pgoutput.c:368
+#: replication/pgoutput/pgoutput.c:378 replication/pgoutput/pgoutput.c:388
+#: replication/pgoutput/pgoutput.c:400 replication/walsender.c:1137
+#: replication/walsender.c:1159 replication/walsender.c:1169
+#: replication/walsender.c:1178 replication/walsender.c:1420
+#: replication/walsender.c:1429
 #, c-format
 msgid "conflicting or redundant options"
 msgstr "конфліктуючі або надлишкові параметри"
@@ -6849,7 +6952,7 @@ msgstr "нерозпізнаний постачальник правил сор
 msgid "parameter \"%s\" must be specified"
 msgstr "необхідно вказати параметр \"%s\""
 
-#: commands/collationcmds.c:293 commands/dbcommands.c:1134
+#: commands/collationcmds.c:293 commands/dbcommands.c:1173
 #, c-format
 msgid "using standard form \"%s\" for ICU locale \"%s\""
 msgstr "використання стандартної форми \"%s\" для мови ICU \"%s\""
@@ -6859,7 +6962,7 @@ msgstr "використання стандартної форми \"%s\" для
 msgid "nondeterministic collations not supported with this provider"
 msgstr "недетерміновані правила сортування не підтримуються цим провайдером"
 
-#: commands/collationcmds.c:317 commands/dbcommands.c:1087
+#: commands/collationcmds.c:317 commands/dbcommands.c:1126
 #, c-format
 msgid "ICU rules cannot be specified unless locale provider is ICU"
 msgstr "Правила ICU не можна вказати, якщо постачальник локалі не ICU"
@@ -6869,68 +6972,69 @@ msgstr "Правила ICU не можна вказати, якщо постач
 msgid "current database's encoding is not supported with this provider"
 msgstr "кодування поточної бази даних не підтримується цим провайдером"
 
-#: commands/collationcmds.c:409
+#: commands/collationcmds.c:405
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
 msgstr "правило сортування \"%s\" для кодування \"%s\" вже існує в схемі \"%s\""
 
-#: commands/collationcmds.c:420
+#: commands/collationcmds.c:416
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
 msgstr "правило сортування \"%s\" вже існує в схемі \"%s\""
 
-#: commands/collationcmds.c:445
+#: commands/collationcmds.c:441
 #, c-format
 msgid "cannot refresh version of default collation"
 msgstr "оновити версію правила сортування за замовчуванням не можна"
 
 #. translator: %s is an SQL command
 #. translator: %s is an SQL ALTER command
-#: commands/collationcmds.c:447 commands/subscriptioncmds.c:1376
-#: commands/tablecmds.c:7882 commands/tablecmds.c:7892
-#: commands/tablecmds.c:7894 commands/tablecmds.c:14397
-#: commands/tablecmds.c:17774 commands/tablecmds.c:17795
-#: commands/typecmds.c:3787 commands/typecmds.c:3872 commands/typecmds.c:4226
+#: commands/collationcmds.c:443 commands/subscriptioncmds.c:1445
+#: commands/tablecmds.c:8146 commands/tablecmds.c:8156
+#: commands/tablecmds.c:8158 commands/tablecmds.c:16149
+#: commands/tablecmds.c:19677 commands/tablecmds.c:19698
+#: commands/typecmds.c:3786 commands/typecmds.c:3871 commands/typecmds.c:4225
 #, c-format
 msgid "Use %s instead."
 msgstr "Використайте %s замість цього."
 
-#: commands/collationcmds.c:480 commands/dbcommands.c:2567
+#: commands/collationcmds.c:476 commands/dbcommands.c:2606
 #, c-format
 msgid "changing version from %s to %s"
 msgstr "зміна версії з %s на %s"
 
-#: commands/collationcmds.c:495 commands/dbcommands.c:2580
+#: commands/collationcmds.c:491 commands/dbcommands.c:2619
 #, c-format
 msgid "version has not changed"
 msgstr "версію не змінено"
 
-#: commands/collationcmds.c:528 commands/dbcommands.c:2746
+#: commands/collationcmds.c:524 commands/dbcommands.c:2789
+#: utils/adt/dbsize.c:180
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "база даних з OID %u не існує"
 
-#: commands/collationcmds.c:554
+#: commands/collationcmds.c:550
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "порядку сортування %u з OID не існує"
 
-#: commands/collationcmds.c:848
+#: commands/collationcmds.c:844
 #, c-format
 msgid "must be superuser to import system collations"
 msgstr "імпортувати систмені правила сортування може тільки суперкористувач"
 
-#: commands/collationcmds.c:968 commands/collationcmds.c:1053
+#: commands/collationcmds.c:964 commands/collationcmds.c:1049
 #, c-format
 msgid "no usable system locales were found"
 msgstr "придатні системні локалі не знайдені"
 
-#: commands/comment.c:61 commands/dbcommands.c:1665 commands/dbcommands.c:1892
-#: commands/dbcommands.c:2002 commands/dbcommands.c:2200
-#: commands/dbcommands.c:2438 commands/dbcommands.c:2529
-#: commands/dbcommands.c:2650 commands/dbcommands.c:3158
-#: utils/init/postinit.c:1033 utils/init/postinit.c:1097
-#: utils/init/postinit.c:1170
+#: commands/comment.c:61 commands/dbcommands.c:1704 commands/dbcommands.c:1922
+#: commands/dbcommands.c:2034 commands/dbcommands.c:2232
+#: commands/dbcommands.c:2473 commands/dbcommands.c:2566
+#: commands/dbcommands.c:2690 commands/dbcommands.c:3201
+#: utils/init/postinit.c:1016 utils/init/postinit.c:1080
+#: utils/init/postinit.c:1153
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "бази даних \"%s\" не існує"
@@ -6940,12 +7044,12 @@ msgstr "бази даних \"%s\" не існує"
 msgid "cannot set comment on relation \"%s\""
 msgstr "встановити коментар для відношення \"%s\" не можна"
 
-#: commands/constraint.c:61 utils/adt/ri_triggers.c:2019
+#: commands/constraint.c:61 utils/adt/ri_triggers.c:2175
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "функція \"%s\" не була викликана менеджером тригерів"
 
-#: commands/constraint.c:68 utils/adt/ri_triggers.c:2028
+#: commands/constraint.c:68 utils/adt/ri_triggers.c:2184
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "функція \"%s\" повинна запускатися в AFTER ROW"
@@ -7015,270 +7119,311 @@ msgstr "немає дозволу для COPY в файл"
 msgid "Only roles with privileges of the \"%s\" role may COPY to a file."
 msgstr "Тільки ролі з правами \"%s\" можуть виконувати COPY в файл."
 
-#: commands/copy.c:193
+#: commands/copy.c:182
+#, c-format
+msgid "generated columns are not supported in COPY FROM WHERE conditions"
+msgstr "згенеровані стовпці не підтримуються в умовах COPY FROM WHERE"
+
+#: commands/copy.c:183 commands/tablecmds.c:14418 commands/tablecmds.c:19824
+#: commands/tablecmds.c:19906 commands/trigger.c:660
+#: rewrite/rewriteHandler.c:952 rewrite/rewriteHandler.c:987
+#, c-format
+msgid "Column \"%s\" is a generated column."
+msgstr "Стовпець \"%s\" є згенерованим стовпцем."
+
+#: commands/copy.c:232
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM не підтримується із захистом на рівні рядків"
 
-#: commands/copy.c:194
+#: commands/copy.c:233
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Використайте оператори INSERT замість цього."
 
-#: commands/copy.c:375
+#: commands/copy.c:414
 #, c-format
 msgid "cannot use \"%s\" with HEADER in COPY TO"
 msgstr "використовувати \"%s\" з HEADER в COPY TO не можна"
 
-#: commands/copy.c:384
+#: commands/copy.c:423
 #, c-format
 msgid "%s requires a Boolean value or \"match\""
 msgstr "%s потребує Boolean або \"відповідність\""
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR,
 #. second %s is a COPY with direction, e.g. COPY TO
-#: commands/copy.c:402 commands/copy.c:782 commands/copy.c:796
-#: commands/copy.c:811 commands/copy.c:837 commands/copy.c:847
+#: commands/copy.c:441 commands/copy.c:857 commands/copy.c:873
+#: commands/copy.c:890 commands/copy.c:916 commands/copy.c:926
 #, c-format
 msgid "COPY %s cannot be used with %s"
 msgstr "COPY %s не можна використовувати з %s"
 
 #. translator: first %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:416 commands/copy.c:441
+#: commands/copy.c:455 commands/copy.c:513
 #, c-format
 msgid "COPY %s \"%s\" not recognized"
 msgstr "COPY %s \"%s\" не розпізнано"
 
-#: commands/copy.c:502
+#: commands/copy.c:475 commands/define.c:73 commands/define.c:84
+#: commands/define.c:178 commands/define.c:196 commands/define.c:211
+#: commands/define.c:229
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s потребує числового значення"
+
+#: commands/copy.c:485
+#, c-format
+msgid "REJECT_LIMIT (%<PRId64>) must be greater than zero"
+msgstr "REJECT_LIMIT (%<PRId64>) повинен бути більшим за нуль"
+
+#: commands/copy.c:575
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "Формат \"%s\" для COPY не розпізнано"
 
-#: commands/copy.c:560 commands/copy.c:575 commands/copy.c:590
-#: commands/copy.c:609
+#: commands/copy.c:633 commands/copy.c:648 commands/copy.c:663
+#: commands/copy.c:682
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "аргументом функції \"%s\" повинен бути список імен стовпців"
 
-#: commands/copy.c:621
+#: commands/copy.c:694
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "аргументом функції \"%s\" повинне бути припустиме ім'я коду"
 
-#: commands/copy.c:642 commands/dbcommands.c:866 commands/dbcommands.c:2386
+#: commands/copy.c:722 commands/dbcommands.c:880 commands/dbcommands.c:2421
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "параметр \"%s\" не розпізнано"
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:655 commands/copy.c:660 commands/copy.c:665
-#: commands/copy.c:740
+#: commands/copy.c:735 commands/copy.c:740 commands/copy.c:745
+#: commands/copy.c:815
 #, c-format
 msgid "cannot specify %s in BINARY mode"
 msgstr "не можна вказати %s в режимі BINARY"
 
-#: commands/copy.c:670
-#, c-format
-msgid "only ON_ERROR STOP is allowed in BINARY mode"
-msgstr "в режимі BINARY допускається лише ON_ERROR STOP"
-
-#: commands/copy.c:692
+#: commands/copy.c:767
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "роздільник для COPY повинен бути однобайтовим символом"
 
-#: commands/copy.c:699
+#: commands/copy.c:774
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "Роздільник для COPY не може бути символом нового рядка або повернення каретки"
 
-#: commands/copy.c:705
+#: commands/copy.c:780
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "Подання NULL для COPY не може включати символ нового рядка або повернення каретки"
 
-#: commands/copy.c:715
+#: commands/copy.c:790
 #, c-format
 msgid "COPY default representation cannot use newline or carriage return"
 msgstr "Подання для COPY за замовчуванням не може включати символ нового рядка або повернення каретки"
 
-#: commands/copy.c:733
+#: commands/copy.c:808
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "роздільник COPY не може бути \"%s\""
 
 #. translator: %s is the name of a COPY option, e.g. ON_ERROR
-#: commands/copy.c:747 commands/copy.c:764 commands/copy.c:776
-#: commands/copy.c:790 commands/copy.c:804
+#: commands/copy.c:822 commands/copy.c:839 commands/copy.c:851
+#: commands/copy.c:866 commands/copy.c:882
 #, c-format
 msgid "COPY %s requires CSV mode"
 msgstr "Для COPY %s потрібен режим CSV"
 
-#: commands/copy.c:752
+#: commands/copy.c:827
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "лапки для COPY повинні бути однобайтовим символом"
 
-#: commands/copy.c:757
+#: commands/copy.c:832
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "роздільник і лапки для COPY повинні бути різними"
 
-#: commands/copy.c:769
+#: commands/copy.c:844
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "вихід для COPY повинен бути однобайтовим символом"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:819 commands/copy.c:855
+#: commands/copy.c:898 commands/copy.c:934
 #, c-format
 msgid "COPY delimiter character must not appear in the %s specification"
 msgstr "символ розділювача для COPY не повинен з'являтися в специфікації %s"
 
 #. translator: %s is the name of a COPY option, e.g. NULL
-#: commands/copy.c:828 commands/copy.c:864
+#: commands/copy.c:907 commands/copy.c:943
 #, c-format
 msgid "CSV quote character must not appear in the %s specification"
 msgstr "лапки CSV не повинні з'являтися у специфікації %s"
 
-#: commands/copy.c:873
+#: commands/copy.c:952
 #, c-format
 msgid "NULL specification and DEFAULT specification cannot be the same"
 msgstr "Специфікація NULL і специфікація DEFAULT не може співпадати"
 
-#: commands/copy.c:935
+#: commands/copy.c:958
+#, c-format
+msgid "only ON_ERROR STOP is allowed in BINARY mode"
+msgstr "в режимі BINARY допускається лише ON_ERROR STOP"
+
+#. translator: first and second %s are the names of COPY option, e.g.
+#. * ON_ERROR, third is the value of the COPY option, e.g. IGNORE
+#: commands/copy.c:965
+#, c-format
+msgid "COPY %s requires %s to be set to %s"
+msgstr "COPY %s потребує встановлення %s в значення %s"
+
+#: commands/copy.c:1027
 #, c-format
 msgid "column \"%s\" is a generated column"
 msgstr "стовпець \"%s\" є згенерованим стовпцем"
 
-#: commands/copy.c:937
+#: commands/copy.c:1029
 #, c-format
 msgid "Generated columns cannot be used in COPY."
 msgstr "Згенеровані стовпці не можна використовувати в COPY."
 
-#: commands/copy.c:952 commands/indexcmds.c:1917 commands/statscmds.c:239
-#: commands/tablecmds.c:2509 commands/tablecmds.c:2980
-#: commands/tablecmds.c:3788 parser/parse_relation.c:3692
-#: parser/parse_relation.c:3702 parser/parse_relation.c:3720
-#: parser/parse_relation.c:3727 parser/parse_relation.c:3741
+#: commands/copy.c:1044 commands/indexcmds.c:1959 commands/statscmds.c:260
+#: commands/tablecmds.c:2593 commands/tablecmds.c:3101
+#: commands/tablecmds.c:3930 parser/parse_relation.c:3798
+#: parser/parse_relation.c:3808 parser/parse_relation.c:3826
+#: parser/parse_relation.c:3833 parser/parse_relation.c:3847
 #: utils/adt/tsvector_op.c:2853
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "стовпця \"%s\" не існує"
 
-#: commands/copy.c:959 commands/tablecmds.c:2535 commands/trigger.c:951
-#: parser/parse_target.c:1083 parser/parse_target.c:1094
+#: commands/copy.c:1051 commands/tablecmds.c:2619 commands/trigger.c:957
+#: parser/parse_target.c:1086 parser/parse_target.c:1097
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "стовпець \"%s\" вказано більше чим один раз"
 
-#: commands/copyfrom.c:118
+#: commands/copyfrom.c:260
 #, c-format
 msgid "COPY %s"
 msgstr "COPY %s"
 
-#: commands/copyfrom.c:126
+#: commands/copyfrom.c:268
 #, c-format
-msgid "COPY %s, line %llu, column %s"
-msgstr "COPY %s, рядок %llu, стовпець %s"
+msgid "COPY %s, line %<PRIu64>, column %s"
+msgstr "COPY %s, рядок %<PRIu64>, стовпець %s"
 
-#: commands/copyfrom.c:131 commands/copyfrom.c:177
+#: commands/copyfrom.c:273 commands/copyfrom.c:319
 #, c-format
-msgid "COPY %s, line %llu"
-msgstr "COPY %s, рядок %llu"
+msgid "COPY %s, line %<PRIu64>"
+msgstr "COPY %s, рядок %<PRIu64>"
 
-#: commands/copyfrom.c:143
+#: commands/copyfrom.c:285
 #, c-format
-msgid "COPY %s, line %llu, column %s: \"%s\""
-msgstr "COPY %s, рядок %llu, стовпець %s: \"%s\""
+msgid "COPY %s, line %<PRIu64>, column %s: \"%s\""
+msgstr "COPY %s, рядок %<PRIu64>, стовпець %s: \"%s\""
 
-#: commands/copyfrom.c:153
+#: commands/copyfrom.c:295
 #, c-format
-msgid "COPY %s, line %llu, column %s: null input"
-msgstr "COPY %s, рядок %llu, стовпець %s: null введення"
+msgid "COPY %s, line %<PRIu64>, column %s: null input"
+msgstr "COPY %s, рядок %<PRIu64>, стовпець %s: порожній ввод"
 
-#: commands/copyfrom.c:170
+#: commands/copyfrom.c:312
 #, c-format
-msgid "COPY %s, line %llu: \"%s\""
-msgstr "COPY %s, рядок %llu: \"%s\""
+msgid "COPY %s, line %<PRIu64>: \"%s\""
+msgstr "COPY %s, рядок %<PRIu64>: \"%s\""
 
-#: commands/copyfrom.c:673
+#: commands/copyfrom.c:823
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "неможливо скопіювати до подання \"%s\""
 
-#: commands/copyfrom.c:675
+#: commands/copyfrom.c:825
 #, c-format
 msgid "To enable copying to a view, provide an INSTEAD OF INSERT trigger."
 msgstr "Щоб подання допускало копіювання даних у нього, встановіть тригер INSTEAD OF INSERT."
 
-#: commands/copyfrom.c:679
+#: commands/copyfrom.c:829
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "не можна копіювати матеріалізоване подання \"%s\""
 
-#: commands/copyfrom.c:684
+#: commands/copyfrom.c:834
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "неможливо скопіювати послідовність \"%s\""
 
-#: commands/copyfrom.c:689
+#: commands/copyfrom.c:839
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "неможливо копіювати у відношення \"%s\", яке не є таблицею"
 
-#: commands/copyfrom.c:729
+#: commands/copyfrom.c:879
 #, c-format
 msgid "cannot perform COPY FREEZE on a partitioned table"
 msgstr "виконати COPY FREEZE в секціонованій таблиці не можна"
 
-#: commands/copyfrom.c:744
+#: commands/copyfrom.c:886
+#, c-format
+msgid "cannot perform COPY FREEZE on a foreign table"
+msgstr "не можна виконати COPY FREEZE для зовнішньої таблиці"
+
+#: commands/copyfrom.c:900
 #, c-format
 msgid "cannot perform COPY FREEZE because of prior transaction activity"
 msgstr "виконати COPY FREEZE через попередню активність в транзакції не можна"
 
-#: commands/copyfrom.c:750
+#: commands/copyfrom.c:906
 #, c-format
 msgid "cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "не можна виконати COPY FREEZE, тому, що таблиця не була створена або скорочена в поточній підтранзакції"
 
-#: commands/copyfrom.c:1313
+#: commands/copyfrom.c:1171
 #, c-format
-msgid "%llu row was skipped due to data type incompatibility"
-msgid_plural "%llu rows were skipped due to data type incompatibility"
-msgstr[0] "Рядок %llu пропущено через несумісність типів даних"
-msgstr[1] "Рядки %llu пропущено через несумісність типів даних"
-msgstr[2] "Рядки %llu пропущено через несумісність типів даних"
-msgstr[3] "Рядки %llu пропущено через несумісність типів даних"
+msgid "skipped more than REJECT_LIMIT (%<PRId64>) rows due to data type incompatibility"
+msgstr "пропущено більше REJECT_LIMIT (%<PRId64>) рядків через несумісність типів даних"
+
+#: commands/copyfrom.c:1474
+#, c-format
+msgid "%<PRIu64> row was skipped due to data type incompatibility"
+msgid_plural "%<PRIu64> rows were skipped due to data type incompatibility"
+msgstr[0] "%<PRIu64> рядок пропущено через несумісність типів даних"
+msgstr[1] "%<PRIu64> рядки пропущено через несумісність типів даних"
+msgstr[2] "%<PRIu64> рядків пропущено через несумісність типів даних"
+msgstr[3] "%<PRIu64> рядків пропущено через несумісність типів даних"
 
 #. translator: first %s is the name of a COPY option, e.g. FORCE_NOT_NULL
 #. translator: %s is the name of a COPY option, e.g. FORCE_NOT_NULL
-#: commands/copyfrom.c:1448 commands/copyfrom.c:1491 commands/copyto.c:597
+#: commands/copyfrom.c:1611 commands/copyfrom.c:1654 commands/copyto.c:880
 #, c-format
 msgid "%s column \"%s\" not referenced by COPY"
 msgstr "%s стовпець \"%s\" не фігурує в COPY"
 
-#: commands/copyfrom.c:1544 utils/mb/mbutils.c:385
+#: commands/copyfrom.c:1707 utils/mb/mbutils.c:386
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr "функції за замовчуванням перетворення з кодування \"%s\" в \"%s\" не існує"
 
-#: commands/copyfrom.c:1742
+#: commands/copyfrom.c:1882
 #, c-format
 msgid "COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY FROM наказує серверному процесу PostgreSQL прочитати дані з файлу. Можливо, вам потрібна клієнтська команда, наприклад \\copy в psql."
 
-#: commands/copyfrom.c:1755 commands/copyto.c:702
+#: commands/copyfrom.c:1895 commands/copyto.c:985
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" - каталог"
 
-#: commands/copyfrom.c:1823 commands/copyto.c:299 libpq/be-secure-common.c:83
+#: commands/copyfrom.c:1953 commands/copyto.c:572 libpq/be-secure-common.c:83
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "не вдалося закрити канал за допомогою зовнішньої команди: %m"
 
-#: commands/copyfrom.c:1838 commands/copyto.c:304
+#: commands/copyfrom.c:1968 commands/copyto.c:577
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "збій програми \"%s\""
@@ -7319,522 +7464,539 @@ msgid "could not read from COPY file: %m"
 msgstr "не вдалося прочитати файл COPY: %m"
 
 #: commands/copyfromparse.c:278 commands/copyfromparse.c:303
-#: replication/walsender.c:756 replication/walsender.c:782 tcop/postgres.c:381
+#: replication/walsender.c:746 replication/walsender.c:772 tcop/postgres.c:369
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr "неочікуваний обрив з'єднання з клієнтом при відкритій транзакції"
 
-#: commands/copyfromparse.c:294 replication/walsender.c:772
+#: commands/copyfromparse.c:294 replication/walsender.c:762
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "неочікуваний тип повідомлення 0x%02X під час COPY з stdin"
 
-#: commands/copyfromparse.c:317 replication/walsender.c:803
+#: commands/copyfromparse.c:317 replication/walsender.c:793
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "помилка при stdin COPY: %s"
 
-#: commands/copyfromparse.c:785
+#: commands/copyfromparse.c:802
 #, c-format
 msgid "wrong number of fields in header line: got %d, expected %d"
 msgstr "неправильна кількість полів у рядку заголовку: отримано %d, очікувалось %d"
 
-#: commands/copyfromparse.c:801
+#: commands/copyfromparse.c:818
 #, c-format
 msgid "column name mismatch in header line field %d: got null value (\"%s\"), expected \"%s\""
 msgstr "невідповідність назви стовпця в полі заголовку %d: отримано null (\"%s\"), очікувалось \"%s\""
 
-#: commands/copyfromparse.c:808
+#: commands/copyfromparse.c:825
 #, c-format
 msgid "column name mismatch in header line field %d: got \"%s\", expected \"%s\""
 msgstr "невідповідність назви стовпця в полі заголовку %d: отримано \"%s\", очікувалось \"%s\""
 
-#: commands/copyfromparse.c:892 commands/copyfromparse.c:1554
-#: commands/copyfromparse.c:1810
+#: commands/copyfromparse.c:962 commands/copyfromparse.c:1581
+#: commands/copyfromparse.c:1837
 #, c-format
 msgid "extra data after last expected column"
 msgstr "зайві дані після вмісту останнього стовпця"
 
-#: commands/copyfromparse.c:906
+#: commands/copyfromparse.c:976
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "відсутні дані для стовпця \"%s\""
 
-#: commands/copyfromparse.c:990
+#: commands/copyfromparse.c:1056
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": \"%s\""
-msgstr "пропуск рядка через несумісність типів даних в рядку %llu для стовпця \"%s\": \"%s\""
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": \"%s\""
+msgstr "пропускаємо рядок через несумісність типів даних на рядку %<PRIu64> для стовпця \"%s\": \"%s\""
 
-#: commands/copyfromparse.c:998
+#: commands/copyfromparse.c:1064
 #, c-format
-msgid "skipping row due to data type incompatibility at line %llu for column \"%s\": null input"
-msgstr "пропуск рядка через несумісність типів даних в рядку %llu для стовпця \"%s\": значення null"
+msgid "skipping row due to data type incompatibility at line %<PRIu64> for column \"%s\": null input"
+msgstr "пропускаємо рядок через несумісність типів даних на рядку %<PRIu64> для стовпця \"%s\": порожній ввод"
 
-#: commands/copyfromparse.c:1044
+#: commands/copyfromparse.c:1122
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "після маркера кінця файлу продовжуються дані COPY"
 
-#: commands/copyfromparse.c:1051
+#: commands/copyfromparse.c:1129
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "кількість полів у рядку: %d, очікувалось: %d"
 
-#: commands/copyfromparse.c:1336 commands/copyfromparse.c:1353
+#: commands/copyfromparse.c:1394 commands/copyfromparse.c:1411
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "в даних виявлено явне повернення каретки"
 
-#: commands/copyfromparse.c:1337 commands/copyfromparse.c:1354
+#: commands/copyfromparse.c:1395 commands/copyfromparse.c:1412
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "в даних виявлено повернення каретки без лапок"
 
-#: commands/copyfromparse.c:1339 commands/copyfromparse.c:1356
+#: commands/copyfromparse.c:1397 commands/copyfromparse.c:1414
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Використайте \"\\r\", щоб позначити повернення каретки."
 
-#: commands/copyfromparse.c:1340 commands/copyfromparse.c:1357
+#: commands/copyfromparse.c:1398 commands/copyfromparse.c:1415
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Використайте CSV в лапках, щоб позначити повернення каретки."
 
-#: commands/copyfromparse.c:1369
+#: commands/copyfromparse.c:1427
 #, c-format
 msgid "literal newline found in data"
 msgstr "в даних знайдено явний новий рядок"
 
-#: commands/copyfromparse.c:1370
+#: commands/copyfromparse.c:1428
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "в даних знайдено новий рядок без лапок"
 
-#: commands/copyfromparse.c:1372
+#: commands/copyfromparse.c:1430
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Використайте \"\\n\", щоб представити новий рядок."
 
-#: commands/copyfromparse.c:1373
+#: commands/copyfromparse.c:1431
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Використайте CSV в лапках, щоб позначити новий рядок."
 
-#: commands/copyfromparse.c:1419 commands/copyfromparse.c:1455
+#: commands/copyfromparse.c:1469 commands/copyfromparse.c:1491
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "маркер \"кінець копії\" не відповідає попередньому стилю нового рядка"
 
-#: commands/copyfromparse.c:1428 commands/copyfromparse.c:1444
+#: commands/copyfromparse.c:1473 commands/copyfromparse.c:1484
+#: commands/copyfromparse.c:1500
 #, c-format
-msgid "end-of-copy marker corrupt"
-msgstr "маркер \"кінець копії\" зіпсований"
+msgid "end-of-copy marker is not alone on its line"
+msgstr "маркер кінця COPY не є єдиним на своєму рядку"
 
-#: commands/copyfromparse.c:1746 commands/copyfromparse.c:1961
+#: commands/copyfromparse.c:1773 commands/copyfromparse.c:1988
 #, c-format
 msgid "unexpected default marker in COPY data"
 msgstr "неочікуваний маркер за замовчуванням в даних COPY"
 
-#: commands/copyfromparse.c:1747 commands/copyfromparse.c:1962
+#: commands/copyfromparse.c:1774 commands/copyfromparse.c:1989
 #, c-format
 msgid "Column \"%s\" has no default value."
 msgstr "Колонка \"%s\" не має значення за замовчуванням."
 
-#: commands/copyfromparse.c:1894
+#: commands/copyfromparse.c:1921
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "незакінчене поле в лапках CSV"
 
-#: commands/copyfromparse.c:1996 commands/copyfromparse.c:2015
+#: commands/copyfromparse.c:2023 commands/copyfromparse.c:2042
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "неочікуваний кінец файлу в даних COPY"
 
-#: commands/copyfromparse.c:2005
+#: commands/copyfromparse.c:2032
 #, c-format
 msgid "invalid field size"
 msgstr "невірний розмір поля"
 
-#: commands/copyfromparse.c:2028
+#: commands/copyfromparse.c:2055
 #, c-format
 msgid "incorrect binary data format"
 msgstr "невірний двійковий формат даних"
 
-#: commands/copyto.c:229
+#: commands/copyto.c:477
 #, c-format
 msgid "could not write to COPY program: %m"
 msgstr "не вдалося записати в канал програми COPY: %m"
 
-#: commands/copyto.c:234
+#: commands/copyto.c:482
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "не можливо записати в файл COPY: %m"
 
-#: commands/copyto.c:379
+#: commands/copyto.c:652
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "неможливо скопіювати з подання \"%s\""
 
-#: commands/copyto.c:381 commands/copyto.c:387 commands/copyto.c:393
-#: commands/copyto.c:404
+#: commands/copyto.c:654 commands/copyto.c:669 commands/copyto.c:680
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Спробуйте варіацію COPY (SELECT ...) TO."
 
-#: commands/copyto.c:385
+#: commands/copyto.c:660
+#, c-format
+msgid "cannot copy from unpopulated materialized view \"%s\""
+msgstr "неможливо скопіювати з незаповненого матеріалізованого подання \"%s\""
+
+#: commands/copyto.c:662 executor/execUtils.c:760
 #, c-format
-msgid "cannot copy from materialized view \"%s\""
-msgstr "неможливо скопіювати з матеріалізованого подання \"%s\""
+msgid "Use the REFRESH MATERIALIZED VIEW command."
+msgstr "Використайте команду REFRESH MATERIALIZED VIEW."
 
-#: commands/copyto.c:391
+#: commands/copyto.c:667
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "неможливо скопіювати зі сторонньої таблиці \"%s\""
 
-#: commands/copyto.c:397
+#: commands/copyto.c:673
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "не вдалося скопіювати з послідовності \"%s\""
 
-#: commands/copyto.c:402
+#: commands/copyto.c:678
 #, c-format
 msgid "cannot copy from partitioned table \"%s\""
 msgstr "неможливо скопіювати з секційної таблиці \"%s\""
 
-#: commands/copyto.c:408
+#: commands/copyto.c:684
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "не можна копіювати з відношення \"%s\", котре не є таблицею"
 
-#: commands/copyto.c:460
+#: commands/copyto.c:739
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for COPY"
 msgstr "правила DO INSTEAD NOTHING не підтримуються для COPY"
 
-#: commands/copyto.c:474
+#: commands/copyto.c:753
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for COPY"
 msgstr "умовні правила DO INSTEAD не підтримуються для COPY"
 
-#: commands/copyto.c:478
+#: commands/copyto.c:757
 #, c-format
-msgid "DO ALSO rules are not supported for the COPY"
+msgid "DO ALSO rules are not supported for COPY"
 msgstr "правила DO ALSO не підтримуються для COPY"
 
-#: commands/copyto.c:483
+#: commands/copyto.c:762
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for COPY"
 msgstr "складові правила DO INSTEAD не підтримуються з COPY"
 
-#: commands/copyto.c:493
+#: commands/copyto.c:772
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) не підтримується"
 
-#: commands/copyto.c:511
+#: commands/copyto.c:778
+#, c-format
+msgid "COPY query must not be a utility command"
+msgstr "запит COPY не повинен бути командою утиліти"
+
+#: commands/copyto.c:794
 #, c-format
 msgid "COPY query must have a RETURNING clause"
 msgstr "В запиті COPY повинно бути речення RETURNING"
 
-#: commands/copyto.c:540
+#: commands/copyto.c:823
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "відношення, згадане в операторі COPY, змінилось"
 
-#: commands/copyto.c:667
+#: commands/copyto.c:950
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "при виконанні COPY в файл не можна вказувати відносний шлях"
 
-#: commands/copyto.c:686
+#: commands/copyto.c:969
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не вдалося відкрити файл \"%s\" для запису: %m"
 
-#: commands/copyto.c:689
+#: commands/copyto.c:972
 #, c-format
 msgid "COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psql's \\copy."
 msgstr "COPY TO наказує серверному процесу PostgreSQL записати дані до файлу. Можливо, вам потрібна клієнтська команда, наприклад \\copy в psql."
 
-#: commands/createas.c:210 commands/createas.c:516
+#: commands/createas.c:212 commands/createas.c:523
 #, c-format
 msgid "too many column names were specified"
 msgstr "вказано забагато імен стовпців"
 
-#: commands/createas.c:539
+#: commands/createas.c:546
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "політики для цієї команди все ще не реалізовані"
 
-#: commands/dbcommands.c:829
+#: commands/dbcommands.c:843
 #, c-format
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION більше не підтримується"
 
-#: commands/dbcommands.c:830
+#: commands/dbcommands.c:844
 #, c-format
 msgid "Consider using tablespaces instead."
 msgstr "Розгляньте можливість використання табличних просторів."
 
-#: commands/dbcommands.c:855
+#: commands/dbcommands.c:869
 #, c-format
 msgid "OIDs less than %u are reserved for system objects"
 msgstr "OID котрі менше ніж %u, зарезервовані для системних об'єктів"
 
-#: commands/dbcommands.c:886 utils/adt/ascii.c:146
+#: commands/dbcommands.c:900 utils/adt/ascii.c:146
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d не є вірним кодом кодування"
 
-#: commands/dbcommands.c:897 utils/adt/ascii.c:128
+#: commands/dbcommands.c:911 utils/adt/ascii.c:128
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s не є вірним ім'ям кодування"
 
-#: commands/dbcommands.c:931
+#: commands/dbcommands.c:945
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нерозпізнаний постачальник локалів: %s"
 
-#: commands/dbcommands.c:944 commands/dbcommands.c:2419 commands/user.c:299
+#: commands/dbcommands.c:958 commands/dbcommands.c:2454 commands/user.c:299
 #: commands/user.c:739
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "недійсний ліміт з'єднання: %d"
 
-#: commands/dbcommands.c:965
+#: commands/dbcommands.c:979
 #, c-format
 msgid "permission denied to create database"
 msgstr "немає дозволу для створення бази даних"
 
-#: commands/dbcommands.c:989
+#: commands/dbcommands.c:1003
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "шаблону бази даних \"%s\" не існує"
 
-#: commands/dbcommands.c:999
+#: commands/dbcommands.c:1013
 #, c-format
 msgid "cannot use invalid database \"%s\" as template"
 msgstr "не можна використовувати невірну базу даних \"%s\" в якості шаблону"
 
-#: commands/dbcommands.c:1000 commands/dbcommands.c:2448
-#: utils/init/postinit.c:1112
+#: commands/dbcommands.c:1014 commands/dbcommands.c:2484
+#: utils/init/postinit.c:1095
 #, c-format
 msgid "Use DROP DATABASE to drop invalid databases."
 msgstr "Використайте DROP DATABASE для видалення невірних баз даних."
 
-#: commands/dbcommands.c:1011
+#: commands/dbcommands.c:1025
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "немає дозволу для копіювання бази даних \"%s\""
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1042
 #, c-format
 msgid "invalid create database strategy \"%s\""
 msgstr "неприпустима стратегія створення бази даних \"%s\""
 
-#: commands/dbcommands.c:1029
+#: commands/dbcommands.c:1043
 #, c-format
 msgid "Valid strategies are \"wal_log\" and \"file_copy\"."
 msgstr "Припустимі стратегії - це \"wal_log\" і \"file_copy\"."
 
-#: commands/dbcommands.c:1050
+#: commands/dbcommands.c:1064
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "недійсний сервер кодування %d"
 
-#: commands/dbcommands.c:1056
+#: commands/dbcommands.c:1072 commands/dbcommands.c:1077
+#: commands/dbcommands.c:1082
 #, c-format
 msgid "invalid LC_COLLATE locale name: \"%s\""
 msgstr "неприпустиме ім'я локалі LC_COLLATE: \"%s\""
 
-#: commands/dbcommands.c:1057 commands/dbcommands.c:1063
+#: commands/dbcommands.c:1073 commands/dbcommands.c:1091
+#, c-format
+msgid "If the locale name is specific to the builtin provider, use BUILTIN_LOCALE."
+msgstr "Якщо назва локалі є специфічною для вбудованого постачальника, використовуйте BUILTIN_LOCALE."
+
+#: commands/dbcommands.c:1078 commands/dbcommands.c:1096
 #, c-format
-msgid "If the locale name is specific to ICU, use ICU_LOCALE."
-msgstr "Якщо ім'я локалі характерне для ICU, використовуйте ICU_LOCALE."
+msgid "If the locale name is specific to the ICU provider, use ICU_LOCALE."
+msgstr "Якщо назва локалі є специфічною для ICU постачальника, використовуйте ICU_LOCALE."
 
-#: commands/dbcommands.c:1062
+#: commands/dbcommands.c:1090 commands/dbcommands.c:1095
+#: commands/dbcommands.c:1100
 #, c-format
 msgid "invalid LC_CTYPE locale name: \"%s\""
 msgstr "неприпустиме ім'я локалі LC_CTYPE: \"%s\""
 
-#: commands/dbcommands.c:1074
+#: commands/dbcommands.c:1113
 #, c-format
 msgid "BUILTIN_LOCALE cannot be specified unless locale provider is builtin"
 msgstr "BUILTIN_LOCALE не може бути вказано, якщо постачальник локалі не вбудований"
 
-#: commands/dbcommands.c:1082
+#: commands/dbcommands.c:1121
 #, c-format
 msgid "ICU locale cannot be specified unless locale provider is ICU"
 msgstr "ICU локаль не може бути визначена, якщо постачальник локалі не ICU"
 
-#: commands/dbcommands.c:1100
+#: commands/dbcommands.c:1139
 #, c-format
 msgid "LOCALE or BUILTIN_LOCALE must be specified"
 msgstr "Необхідно вказати LOCALE або BUILTIN_LOCALE"
 
-#: commands/dbcommands.c:1109
+#: commands/dbcommands.c:1148
 #, c-format
 msgid "encoding \"%s\" is not supported with ICU provider"
 msgstr "кодування \"%s\" не підтримується провайдером ICU"
 
-#: commands/dbcommands.c:1119
+#: commands/dbcommands.c:1158
 #, c-format
 msgid "LOCALE or ICU_LOCALE must be specified"
 msgstr "Необхідно вказати LOCALE або ICU_LOCALE"
 
-#: commands/dbcommands.c:1163
+#: commands/dbcommands.c:1202
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr "нове кодування (%s) несумісне з кодуванням шаблона бази даних (%s)"
 
-#: commands/dbcommands.c:1166
+#: commands/dbcommands.c:1205
 #, c-format
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr "Використайте кодування шаблона бази даних або виберіть template0 в якості шаблона."
 
-#: commands/dbcommands.c:1171
+#: commands/dbcommands.c:1210
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr "нове правило сортування (%s) несумісне з правилом в шаблоні бази даних (%s)"
 
-#: commands/dbcommands.c:1173
+#: commands/dbcommands.c:1212
 #, c-format
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr "Використайте те ж саме правило сортування, що і в шаблоні бази даних, або виберіть template0 в якості шаблона."
 
-#: commands/dbcommands.c:1178
+#: commands/dbcommands.c:1217
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr "новий параметр LC_CTYPE (%s) несумісний з LC_CTYPE в шаблоні бази даних (%s)"
 
-#: commands/dbcommands.c:1180
+#: commands/dbcommands.c:1219
 #, c-format
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr "Використайте той самий  LC_CTYPE, що і в шаблоні бази даних, або виберіть template0 в якості шаблона."
 
-#: commands/dbcommands.c:1185
+#: commands/dbcommands.c:1224
 #, c-format
 msgid "new locale provider (%s) does not match locale provider of the template database (%s)"
 msgstr "новий постачальник локалі (%s) не відповідає постачальнику локалі шаблону бази даних (%s)"
 
-#: commands/dbcommands.c:1187
+#: commands/dbcommands.c:1226
 #, c-format
 msgid "Use the same locale provider as in the template database, or use template0 as template."
 msgstr "Використайте такого ж постачальника локалі, що й у шаблоні бази даних, або використайте template0 в якості шаблону."
 
-#: commands/dbcommands.c:1199
+#: commands/dbcommands.c:1238
 #, c-format
 msgid "new ICU locale (%s) is incompatible with the ICU locale of the template database (%s)"
 msgstr "нова ICU локаль (%s) несумісна з ICU локалью шаблону бази даних (%s)"
 
-#: commands/dbcommands.c:1201
+#: commands/dbcommands.c:1240
 #, c-format
 msgid "Use the same ICU locale as in the template database, or use template0 as template."
 msgstr "Використайте таку ж ICU локаль, що й у шаблоні бази даних, або використайте template0 в якості шаблону."
 
-#: commands/dbcommands.c:1212
+#: commands/dbcommands.c:1251
 #, c-format
 msgid "new ICU collation rules (%s) are incompatible with the ICU collation rules of the template database (%s)"
 msgstr "нові правила сортування ICU (%s) несумісні з правилами сортування ICU шаблону бази даних (%s)"
 
-#: commands/dbcommands.c:1214
+#: commands/dbcommands.c:1253
 #, c-format
 msgid "Use the same ICU collation rules as in the template database, or use template0 as template."
 msgstr "Використайте ті ж правила сортування ICU, що й в шаблоні бази даних, або виберіть template0 в якості шаблону."
 
-#: commands/dbcommands.c:1243
+#: commands/dbcommands.c:1282
 #, c-format
 msgid "template database \"%s\" has a collation version, but no actual collation version could be determined"
 msgstr "шаблон бази даних \"%s\" має версію правил сортування, але фактичну версію визначити не вдалося"
 
-#: commands/dbcommands.c:1248
+#: commands/dbcommands.c:1287
 #, c-format
 msgid "template database \"%s\" has a collation version mismatch"
 msgstr "шаблон бази даних \"%s\" має невідповідність версії параметрів сортування"
 
-#: commands/dbcommands.c:1250
+#: commands/dbcommands.c:1289
 #, c-format
 msgid "The template database was created using collation version %s, but the operating system provides version %s."
 msgstr "Шаблон бази даних було створено за допомогою параметрів сортування версії %s, але операційна система надає версію %s."
 
-#: commands/dbcommands.c:1253
+#: commands/dbcommands.c:1292
 #, c-format
 msgid "Rebuild all objects in the template database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
 msgstr "Перебудуйте всі об'єкти шаблону бази даних, які використовують стандартний параметр сортування або виконайте ALTER DATABASE %s REFRESH COLLATION VERSION, або побудуйте PostgreSQL з правильною версією бібліотеки."
 
-#: commands/dbcommands.c:1298 commands/dbcommands.c:2048
+#: commands/dbcommands.c:1337 commands/dbcommands.c:2080
 #, c-format
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global не можна використати в якості табличного простору за замовчуванням"
 
-#: commands/dbcommands.c:1324
+#: commands/dbcommands.c:1363
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "не вдалося призначити новий табличний простір за замовчуванням \"%s\""
 
-#: commands/dbcommands.c:1326
+#: commands/dbcommands.c:1365
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr "БД \"%s\" вже містить таблиці, що знаходяться в цьому табличному просторі."
 
-#: commands/dbcommands.c:1356 commands/dbcommands.c:1921
+#: commands/dbcommands.c:1395 commands/dbcommands.c:1951
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "база даних \"%s\" вже існує"
 
-#: commands/dbcommands.c:1370
+#: commands/dbcommands.c:1409
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "вихідна база даних \"%s\" зайнята іншими користувачами"
 
-#: commands/dbcommands.c:1392
+#: commands/dbcommands.c:1431
 #, c-format
 msgid "database OID %u is already in use by database \"%s\""
 msgstr "OID %u вже використовується базою даних \"%s\" вже використовує"
 
-#: commands/dbcommands.c:1398
+#: commands/dbcommands.c:1437
 #, c-format
 msgid "data directory with the specified OID %u already exists"
 msgstr "каталог даних з вказаним OID %u вже існує"
 
-#: commands/dbcommands.c:1571 commands/dbcommands.c:1586
-#: utils/adt/pg_locale.c:2565
+#: commands/dbcommands.c:1610 commands/dbcommands.c:1625
+#: utils/adt/pg_locale.c:1532
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
 msgstr "кодування \"%s\" не відповідає локалі \"%s\""
 
-#: commands/dbcommands.c:1574
+#: commands/dbcommands.c:1613
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
 msgstr "Обраний параметр LC_CTYPE потребує кодування \"%s\"."
 
-#: commands/dbcommands.c:1589
+#: commands/dbcommands.c:1628
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
 msgstr "Обраний параметр LC_COLLATE потребує кодування \"%s\"."
 
-#: commands/dbcommands.c:1672
+#: commands/dbcommands.c:1711
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "бази даних \"%s\" не існує, пропускаємо"
 
-#: commands/dbcommands.c:1696
+#: commands/dbcommands.c:1735
 #, c-format
 msgid "cannot drop a template database"
 msgstr "неможливо видалити шаблон бази даних"
 
-#: commands/dbcommands.c:1702
+#: commands/dbcommands.c:1741
 #, c-format
 msgid "cannot drop the currently open database"
 msgstr "неможливо видалити наразі відкриту базу даних"
 
-#: commands/dbcommands.c:1715
+#: commands/dbcommands.c:1754
 #, c-format
 msgid "database \"%s\" is used by an active logical replication slot"
 msgstr "база даних \"%s\" використовується активним слотом логічної реплікації"
 
-#: commands/dbcommands.c:1717
+#: commands/dbcommands.c:1756
 #, c-format
 msgid "There is %d active slot."
 msgid_plural "There are %d active slots."
@@ -7843,12 +8005,12 @@ msgstr[1] "Активні слоти %d."
 msgstr[2] "Активних слотів %d."
 msgstr[3] "Активних слотів %d."
 
-#: commands/dbcommands.c:1731
+#: commands/dbcommands.c:1770
 #, c-format
 msgid "database \"%s\" is being used by logical replication subscription"
 msgstr "база даних \"%s\" використовується в підписці логічної реплікації"
 
-#: commands/dbcommands.c:1733
+#: commands/dbcommands.c:1772
 #, c-format
 msgid "There is %d subscription."
 msgid_plural "There are %d subscriptions."
@@ -7857,74 +8019,69 @@ msgstr[1] "Знайдено підписки %d."
 msgstr[2] "Знайдено підписок %d."
 msgstr[3] "Знайдено підписок %d."
 
-#: commands/dbcommands.c:1754 commands/dbcommands.c:1943
-#: commands/dbcommands.c:2070
+#: commands/dbcommands.c:1793 commands/dbcommands.c:1973
+#: commands/dbcommands.c:2102
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "база даних \"%s\" зайнята іншими користувачами"
 
-#: commands/dbcommands.c:1903
+#: commands/dbcommands.c:1933
 #, c-format
 msgid "permission denied to rename database"
 msgstr "немає дозволу для перейменування бази даних"
 
-#: commands/dbcommands.c:1932
+#: commands/dbcommands.c:1962
 #, c-format
 msgid "current database cannot be renamed"
 msgstr "поточна база даних не може бути перейменована"
 
-#: commands/dbcommands.c:2026
+#: commands/dbcommands.c:2058
 #, c-format
 msgid "cannot change the tablespace of the currently open database"
 msgstr "неможливо змінити табличний простір наразі відкритої бази даних"
 
-#: commands/dbcommands.c:2132
+#: commands/dbcommands.c:2164
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
 msgstr "деякі відношення бази даних \"%s\" вже є в табличному просторі \"%s\""
 
-#: commands/dbcommands.c:2134
+#: commands/dbcommands.c:2166
 #, c-format
 msgid "You must move them back to the database's default tablespace before using this command."
 msgstr "Перед тим, як виконувати цю команду, вам треба повернути їх в табличний простір за замовчуванням для цієї бази даних."
 
-#: commands/dbcommands.c:2261 commands/dbcommands.c:2996
-#: commands/dbcommands.c:3296 commands/dbcommands.c:3409
+#: commands/dbcommands.c:2295 commands/dbcommands.c:3039
+#: commands/dbcommands.c:3339 commands/dbcommands.c:3453
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "у старому каталозі бази даних \"%s\" могли залишитися непотрібні файли"
 
-#: commands/dbcommands.c:2322
-#, c-format
-msgid "unrecognized DROP DATABASE option \"%s\""
-msgstr "нерозпізнаний параметр DROP DATABASE \"%s\""
-
-#: commands/dbcommands.c:2400
+#: commands/dbcommands.c:2435
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
 msgstr "параметр \"%s\" не може бути вказаним з іншими параметрами"
 
-#: commands/dbcommands.c:2447
+#: commands/dbcommands.c:2483
 #, c-format
 msgid "cannot alter invalid database \"%s\""
 msgstr "неможливо змінити невірну базу даних \"%s\""
 
-#: commands/dbcommands.c:2464
+#: commands/dbcommands.c:2500
 #, c-format
 msgid "cannot disallow connections for current database"
 msgstr "не можна заборонити з'єднання для поточної бази даних"
 
-#: commands/dbcommands.c:2690
+#: commands/dbcommands.c:2730
 #, c-format
 msgid "permission denied to change owner of database"
 msgstr "немає дозволу для зміни власника бази даних"
 
-#: commands/dbcommands.c:3102
+#: commands/dbcommands.c:3145
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "Знайдено %d інших сеансів і %d підготованих транзакцій з використанням цієї бази даних."
 
-#: commands/dbcommands.c:3105
+#: commands/dbcommands.c:3148
 #, c-format
 msgid "There is %d other session using the database."
 msgid_plural "There are %d other sessions using the database."
@@ -7933,7 +8090,7 @@ msgstr[1] "Є %d інші сеанси з використанням цієї б
 msgstr[2] "Є %d інших сеансів з використанням цієї бази даних."
 msgstr[3] "Є %d інших сеансів з використанням цієї бази даних."
 
-#: commands/dbcommands.c:3110 storage/ipc/procarray.c:3859
+#: commands/dbcommands.c:3153 storage/ipc/procarray.c:3860
 #, c-format
 msgid "There is %d prepared transaction using the database."
 msgid_plural "There are %d prepared transactions using the database."
@@ -7942,56 +8099,50 @@ msgstr[1] "З цією базою даних пов'язані %d підгото
 msgstr[2] "З цією базою даних пов'язані %d підготовлених транзакцій."
 msgstr[3] "З цією базою даних пов'язані %d підготовлених транзакцій."
 
-#: commands/dbcommands.c:3252
+#: commands/dbcommands.c:3295
 #, c-format
 msgid "missing directory \"%s\""
 msgstr "відсутній каталог \"%s\""
 
-#: commands/dbcommands.c:3310 commands/tablespace.c:184
+#: commands/dbcommands.c:3353 commands/tablespace.c:184
 #: commands/tablespace.c:633
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "не вдалося отримати інформацію про каталог \"%s\": %m"
 
-#: commands/define.c:53 commands/define.c:257 commands/define.c:289
-#: commands/define.c:317 commands/define.c:363
+#: commands/define.c:40 commands/define.c:244 commands/define.c:276
+#: commands/define.c:304 commands/define.c:350
 #, c-format
 msgid "%s requires a parameter"
 msgstr "%s потребує параметру"
 
-#: commands/define.c:86 commands/define.c:97 commands/define.c:191
-#: commands/define.c:209 commands/define.c:224 commands/define.c:242
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s потребує числового значення"
-
-#: commands/define.c:153
+#: commands/define.c:140
 #, c-format
 msgid "%s requires a Boolean value"
 msgstr "%s потребує логічного значення"
 
-#: commands/define.c:167 commands/define.c:176 commands/define.c:326
+#: commands/define.c:154 commands/define.c:163 commands/define.c:313
 #, c-format
 msgid "%s requires an integer value"
 msgstr "%s потребує ціле значення"
 
-#: commands/define.c:271
+#: commands/define.c:258
 #, c-format
 msgid "argument of %s must be a name"
 msgstr "аргументом %s повинно бути ім'я"
 
-#: commands/define.c:301
+#: commands/define.c:288
 #, c-format
 msgid "argument of %s must be a type name"
 msgstr "аргументом %s повинно бути ім'я типу"
 
-#: commands/define.c:347
+#: commands/define.c:334
 #, c-format
 msgid "invalid argument for %s: \"%s\""
 msgstr "невірний аргумент для %s: \"%s\""
 
-#: commands/dropcmds.c:96 commands/functioncmds.c:1382
-#: utils/adt/ruleutils.c:2905
+#: commands/dropcmds.c:96 commands/functioncmds.c:1400
+#: utils/adt/ruleutils.c:2956
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "\"%s\" є функцією агрегату"
@@ -8001,19 +8152,19 @@ msgstr "\"%s\" є функцією агрегату"
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Використайте DROP AGGREGATE, щоб видалити агрегатні функції."
 
-#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:3872
-#: commands/tablecmds.c:4030 commands/tablecmds.c:4082
-#: commands/tablecmds.c:17058 tcop/utility.c:1325
+#: commands/dropcmds.c:153 commands/sequence.c:462 commands/tablecmds.c:4014
+#: commands/tablecmds.c:4175 commands/tablecmds.c:4227
+#: commands/tablecmds.c:18954 tcop/utility.c:1328
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "відношення \"%s\" не існує, пропускаємо"
 
-#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1392
+#: commands/dropcmds.c:183 commands/dropcmds.c:282 commands/tablecmds.c:1469
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "схеми \"%s\" не існує, пропускаємо"
 
-#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:286
+#: commands/dropcmds.c:223 commands/dropcmds.c:262 commands/tablecmds.c:289
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "типу \"%s\" не існує, пропускаємо"
@@ -8033,7 +8184,7 @@ msgstr "правила сортування \"%s\" не існує, пропус
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "перетворення \"%s\" не існує, пропускаємо"
 
-#: commands/dropcmds.c:288 commands/statscmds.c:664
+#: commands/dropcmds.c:288 commands/statscmds.c:703
 #, c-format
 msgid "statistics object \"%s\" does not exist, skipping"
 msgstr "об'єкту статистики \"%s\" не існує, пропускаємо"
@@ -8128,7 +8279,7 @@ msgstr "правила \"%s\" для відношення \"%s\" не існує
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "джерела сторонніх даних \"%s\" не існує, пропускаємо"
 
-#: commands/dropcmds.c:448 commands/foreigncmds.c:1360
+#: commands/dropcmds.c:448 commands/foreigncmds.c:1371
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "серверу \"%s\" не існує, пропускаємо"
@@ -8148,502 +8299,504 @@ msgstr "сімейства операторів \"%s\" не існує для м
 msgid "publication \"%s\" does not exist, skipping"
 msgstr "публікації \"%s\" не існує, пропускаємо"
 
-#: commands/event_trigger.c:137
+#: commands/event_trigger.c:141
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
 msgstr "немає дозволу для створення тригера подій %s\""
 
-#: commands/event_trigger.c:139
+#: commands/event_trigger.c:143
 #, c-format
 msgid "Must be superuser to create an event trigger."
 msgstr "Тільки суперкористувач може створити тригер подій."
 
-#: commands/event_trigger.c:149
+#: commands/event_trigger.c:153
 #, c-format
 msgid "unrecognized event name \"%s\""
 msgstr "нерозпізнане ім'я подій \"%s\""
 
-#: commands/event_trigger.c:166
+#: commands/event_trigger.c:170
 #, c-format
 msgid "unrecognized filter variable \"%s\""
 msgstr "нерозпізнана змінна фільтру \"%s\""
 
-#: commands/event_trigger.c:181
+#: commands/event_trigger.c:185
 #, c-format
 msgid "tag filtering is not supported for login event triggers"
 msgstr "фільтрація тегів не підтримується для тригерів події входу"
 
-#: commands/event_trigger.c:224
+#: commands/event_trigger.c:228
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
 msgstr "значення фільтру \"%s\" не розпізнано для змінної фільтру \"%s\""
 
 #. translator: %s represents an SQL statement name
-#: commands/event_trigger.c:230 commands/event_trigger.c:252
+#: commands/event_trigger.c:234 commands/event_trigger.c:256
 #, c-format
 msgid "event triggers are not supported for %s"
 msgstr "для %s тригери подій не підтримуються"
 
-#: commands/event_trigger.c:265
+#: commands/event_trigger.c:269
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
 msgstr "змінну фільтра \"%s\" вказано кілька разів"
 
-#: commands/event_trigger.c:435 commands/event_trigger.c:487
-#: commands/event_trigger.c:581
+#: commands/event_trigger.c:442 commands/event_trigger.c:494
+#: commands/event_trigger.c:588
 #, c-format
 msgid "event trigger \"%s\" does not exist"
 msgstr "тригеру подій \"%s\" не існує"
 
-#: commands/event_trigger.c:519
+#: commands/event_trigger.c:526
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "тригер подій %u з OID не існує"
 
-#: commands/event_trigger.c:549
+#: commands/event_trigger.c:556
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
 msgstr "немає дозволу для зміни власника тригера подій \"%s\""
 
-#: commands/event_trigger.c:551
+#: commands/event_trigger.c:558
 #, c-format
 msgid "The owner of an event trigger must be a superuser."
 msgstr "Власником тригеру подій може бути тільки суперкористувач."
 
-#: commands/event_trigger.c:1411
+#: commands/event_trigger.c:1536
 #, c-format
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s можливо викликати лише в подієвій тригерній функції sql_drop"
 
-#: commands/event_trigger.c:1504 commands/event_trigger.c:1525
+#: commands/event_trigger.c:1629 commands/event_trigger.c:1650
 #, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
 msgstr "%s можливо викликати лише в подієвій тригерній функції table_rewrite"
 
-#: commands/event_trigger.c:1938
+#: commands/event_trigger.c:2063
 #, c-format
 msgid "%s can only be called in an event trigger function"
 msgstr "%s можливо викликати тільки в подієвій тригерній функції"
 
-#: commands/explain.c:241 commands/explain.c:266
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "нерозпізнане значення параметру EXPLAIN \"%s\": \"%s\""
-
-#: commands/explain.c:273
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "нерозпізнаний параметр EXPLAIN \"%s\""
-
-#: commands/explain.c:282
-#, c-format
-msgid "EXPLAIN option WAL requires ANALYZE"
-msgstr "Параметр WAL оператора EXPLAIN потребує вказівки ANALYZE"
-
-#: commands/explain.c:291
+#: commands/explain_state.c:133 commands/explain_state.c:158
+#: replication/walsender.c:1151
 #, c-format
-msgid "EXPLAIN option TIMING requires ANALYZE"
-msgstr "Параметр TIMING оператора EXPLAIN потребує вказівки ANALYZE"
+msgid "unrecognized value for %s option \"%s\": \"%s\""
+msgstr "нерозпізнане значення для %s опції \"%s\": \"%s\""
 
-#: commands/explain.c:297
+#: commands/explain_state.c:174 commands/explain_state.c:186
+#: commands/explain_state.c:192
 #, c-format
-msgid "EXPLAIN option SERIALIZE requires ANALYZE"
-msgstr "Параметр SERIALIZE оператора EXPLAIN потребує вказівки ANALYZE"
+msgid "EXPLAIN option %s requires ANALYZE"
+msgstr "опція EXPLAIN %s потребує ANALYZE"
 
-#: commands/explain.c:303
+#: commands/explain_state.c:198
 #, c-format
-msgid "EXPLAIN options ANALYZE and GENERIC_PLAN cannot be used together"
-msgstr "Параметри ANALYZE і GENERIC_PLAN не можуть використовуватись разом"
+msgid "%s options %s and %s cannot be used together"
+msgstr "%s опції %s і %s не можна використовувати разом"
 
-#: commands/extension.c:178 commands/extension.c:3031
+#: commands/extension.c:177 commands/extension.c:3323
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "розширення \"%s\" не існує"
 
-#: commands/extension.c:277 commands/extension.c:286 commands/extension.c:298
-#: commands/extension.c:308
+#: commands/extension.c:242 commands/extension.c:251 commands/extension.c:263
+#: commands/extension.c:273
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "невірне ім'я розширення: \"%s\""
 
-#: commands/extension.c:278
+#: commands/extension.c:243
 #, c-format
 msgid "Extension names must not be empty."
 msgstr "Імена розширення не повинні бути пустими."
 
-#: commands/extension.c:287
+#: commands/extension.c:252
 #, c-format
 msgid "Extension names must not contain \"--\"."
 msgstr "Імена розширення не повинні містити \"--\"."
 
-#: commands/extension.c:299
+#: commands/extension.c:264
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Імена розширення не повинні починатися або закінчуватися символом \"-\"."
 
-#: commands/extension.c:309
+#: commands/extension.c:274
 #, c-format
 msgid "Extension names must not contain directory separator characters."
 msgstr "Імена розширення не повинні містити роздільники шляху."
 
-#: commands/extension.c:324 commands/extension.c:333 commands/extension.c:342
-#: commands/extension.c:352
+#: commands/extension.c:289 commands/extension.c:298 commands/extension.c:307
+#: commands/extension.c:317
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "невірне ім'я версії розширення: \"%s\""
 
-#: commands/extension.c:325
+#: commands/extension.c:290
 #, c-format
 msgid "Version names must not be empty."
 msgstr "Імена версії не повинні бути пустими."
 
-#: commands/extension.c:334
+#: commands/extension.c:299
 #, c-format
 msgid "Version names must not contain \"--\"."
 msgstr "Імена версії не повинні містити \"--\"."
 
-#: commands/extension.c:343
+#: commands/extension.c:308
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
 msgstr "Імена версії не повинні починатись або закінчуватись символом \"-\"."
 
-#: commands/extension.c:353
+#: commands/extension.c:318
 #, c-format
 msgid "Version names must not contain directory separator characters."
 msgstr "Імена версії не повинні містити роздільники шляху."
 
-#: commands/extension.c:507
+#: commands/extension.c:543
 #, c-format
 msgid "extension \"%s\" is not available"
 msgstr "розширення \"%s\" недоступне"
 
-#: commands/extension.c:508
-#, c-format
-msgid "Could not open extension control file \"%s\": %m."
-msgstr "Не вдалося відкрити контрольний файл розширення \"%s\": %m."
-
-#: commands/extension.c:510
+#: commands/extension.c:544
 #, c-format
 msgid "The extension must first be installed on the system where PostgreSQL is running."
 msgstr "Розширення спочатку має бути встановлене в системі, де запущено PostgreSQL."
 
-#: commands/extension.c:514
+#: commands/extension.c:566
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "не вдалося відкрити керуючий файл розширення \"%s\": %m"
 
-#: commands/extension.c:537 commands/extension.c:547
+#: commands/extension.c:589 commands/extension.c:599
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
 msgstr "параметр \"%s\" не можна задавати в додатковому керуючому файлі розширення"
 
-#: commands/extension.c:569 commands/extension.c:577 commands/extension.c:585
-#: utils/misc/guc.c:3147
+#: commands/extension.c:621 commands/extension.c:629 commands/extension.c:637
+#: utils/misc/guc.c:3144
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "параметр \"%s\" потребує логічного значення"
 
-#: commands/extension.c:594
+#: commands/extension.c:646
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" не є невірним ім'ям кодування"
 
-#: commands/extension.c:608 commands/extension.c:623
+#: commands/extension.c:660 commands/extension.c:675
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
 msgstr "параметр \"%s\" повинен містити список імен розширень"
 
-#: commands/extension.c:630
+#: commands/extension.c:682
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "нерозпізнаний параметр \"%s\" в файлі \"%s\""
 
-#: commands/extension.c:639
+#: commands/extension.c:691
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "параметр \"schema\" не може бути вказаним, коли \"relocatable\" є дійсним"
 
-#: commands/extension.c:817
+#: commands/extension.c:867
+#, c-format
+msgid "SQL statement \"%.*s\""
+msgstr "SQL-оператор \"%.*s\""
+
+#: commands/extension.c:896
+#, c-format
+msgid "extension script file \"%s\", near line %d"
+msgstr "скрипт розширення \"%s\", на лінії %d"
+
+#: commands/extension.c:900
+#, c-format
+msgid "extension script file \"%s\""
+msgstr "скрипт розширення \"%s\""
+
+#: commands/extension.c:1012
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "в скрипті розширення не повинно бути операторів управління транзакціями"
 
-#: commands/extension.c:897
+#: commands/extension.c:1094
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "немає дозволу для створення розширення %s\""
 
-#: commands/extension.c:900
+#: commands/extension.c:1097
 #, c-format
 msgid "Must have CREATE privilege on current database to create this extension."
 msgstr "Необхідно мати право CREATE для поточної бази даних щоб створити це розширення."
 
-#: commands/extension.c:901
+#: commands/extension.c:1098
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Тільки суперкористувач може створити це розширення."
 
-#: commands/extension.c:905
+#: commands/extension.c:1102
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "немає дозволу для оновлення розширення %s\""
 
-#: commands/extension.c:908
+#: commands/extension.c:1105
 #, c-format
 msgid "Must have CREATE privilege on current database to update this extension."
 msgstr "Необхідно мати право CREATE для поточної бази даних щоб оновити це розширення."
 
-#: commands/extension.c:909
+#: commands/extension.c:1106
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Тільки суперкористувач може оновити це розширення."
 
-#: commands/extension.c:1042
+#: commands/extension.c:1239
 #, c-format
 msgid "invalid character in extension owner: must not contain any of \"%s\""
 msgstr "неприпустимий символ у власника розширення: не може містити жодного з \"%s\""
 
-#: commands/extension.c:1066 commands/extension.c:1093
+#: commands/extension.c:1263 commands/extension.c:1290
 #, c-format
 msgid "invalid character in extension \"%s\" schema: must not contain any of \"%s\""
 msgstr "неприпустимий символ у розширенні \"%s\" схеми: не повинно містити жодної з \"%s\""
 
-#: commands/extension.c:1288
+#: commands/extension.c:1485
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "розширення \"%s\" не має жодного шляху оновлення від версії \"%s\" до версії \"%s\""
 
-#: commands/extension.c:1496 commands/extension.c:3089
+#: commands/extension.c:1693 commands/extension.c:3381
 #, c-format
 msgid "version to install must be specified"
 msgstr "для інсталяції слід указати версію"
 
-#: commands/extension.c:1533
+#: commands/extension.c:1730
 #, c-format
 msgid "extension \"%s\" has no installation script nor update path for version \"%s\""
 msgstr "розширення \"%s\" не має ні скрипту для встановлення, ні шляху оновлення для версії \"%s\""
 
-#: commands/extension.c:1567
+#: commands/extension.c:1764
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "розширення \"%s\" треба встановлювати в схемі \"%s\""
 
-#: commands/extension.c:1727
+#: commands/extension.c:1924
 #, c-format
 msgid "cyclic dependency detected between extensions \"%s\" and \"%s\""
 msgstr "виявлено циклічну залежність між розширеннями \"%s\" і \"%s\""
 
-#: commands/extension.c:1732
+#: commands/extension.c:1929
 #, c-format
 msgid "installing required extension \"%s\""
 msgstr "встановлення необхідних розширень \"%s\""
 
-#: commands/extension.c:1755
+#: commands/extension.c:1952
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "необхідні розширення \"%s\" не встановлено"
 
-#: commands/extension.c:1758
+#: commands/extension.c:1955
 #, c-format
 msgid "Use CREATE EXTENSION ... CASCADE to install required extensions too."
 msgstr "Використайте CREATE EXTENSION ... CASCADE також для встановлення необхідних розширень."
 
-#: commands/extension.c:1793
+#: commands/extension.c:1990
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "розширення \"%s\" вже існує, пропускаємо"
 
-#: commands/extension.c:1800
+#: commands/extension.c:1997
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "розширення \"%s\" вже існує"
 
-#: commands/extension.c:1811
+#: commands/extension.c:2008
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "вкладенні оператори CREATE EXTENSION не підтримуються"
 
-#: commands/extension.c:1975
+#: commands/extension.c:2172
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "неможливо видалити розширення \"%s\", оскільки воно змінюється"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2689
 #, c-format
 msgid "%s can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "%s можна викликати лише з SQL-скрипта, виконаного CREATE EXTENSION"
 
-#: commands/extension.c:2462
+#: commands/extension.c:2701
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u не посилається на таблицю"
 
-#: commands/extension.c:2467
+#: commands/extension.c:2706
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "таблиця \"%s\" не є членом створеного розширення"
 
-#: commands/extension.c:2813
+#: commands/extension.c:3105
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "неможливо перемістити розширення \"%s\" в схему \"%s\", оскільки розширення містить схему"
 
-#: commands/extension.c:2854 commands/extension.c:2948
+#: commands/extension.c:3146 commands/extension.c:3240
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "розширення \"%s\" не підтримує SET SCHEMA"
 
-#: commands/extension.c:2911
+#: commands/extension.c:3203
 #, c-format
 msgid "cannot SET SCHEMA of extension \"%s\" because other extensions prevent it"
 msgstr "неможливо виконати SET SCHEMA для розширення \"%s\", оскільки інші розширення заважають цьому"
 
-#: commands/extension.c:2913
+#: commands/extension.c:3205
 #, c-format
 msgid "Extension \"%s\" requests no relocation of extension \"%s\"."
 msgstr "Розширення \"%s\" запитує не переносити розширення \"%s\"."
 
-#: commands/extension.c:2950
+#: commands/extension.c:3242
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s не є схемою розширення \"%s\""
 
-#: commands/extension.c:3011
+#: commands/extension.c:3303
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "вкладенні оператори ALTER EXTENSION не підтримуються"
 
-#: commands/extension.c:3100
+#: commands/extension.c:3392
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "версія \"%s\" розширення \"%s\" вже встановлена"
 
-#: commands/extension.c:3311
+#: commands/extension.c:3603
 #, c-format
 msgid "cannot add an object of this type to an extension"
 msgstr "додати об'єкт цього типу до розширення не можна"
 
-#: commands/extension.c:3409
+#: commands/extension.c:3701
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "неможливо додати схему \"%s\" до розширення \"%s\", оскільки схема містить розширення"
 
-#: commands/extension.c:3491 commands/typecmds.c:4042 utils/fmgr/funcapi.c:725
+#: commands/extension.c:3783 commands/typecmds.c:4041 utils/fmgr/funcapi.c:725
 #, c-format
 msgid "could not find multirange type for data type %s"
 msgstr "не вдалося знайти багатодіапазонний тип для типу даних %s"
 
-#: commands/extension.c:3532
+#: commands/extension.c:3825
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "файл \"%s\" занадто великий"
 
-#: commands/foreigncmds.c:148 commands/foreigncmds.c:157
+#: commands/extension.c:3918 utils/fmgr/dfmgr.c:625
+#, c-format
+msgid "component in parameter \"%s\" is not an absolute path"
+msgstr "компонент у параметрі \"%s\" не є абсолютним шляхом"
+
+#: commands/foreigncmds.c:159 commands/foreigncmds.c:168
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "параметр \"%s\" не знайдено"
 
-#: commands/foreigncmds.c:167
+#: commands/foreigncmds.c:178
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "параметр \"%s\" надано більше одного разу"
 
-#: commands/foreigncmds.c:221 commands/foreigncmds.c:229
+#: commands/foreigncmds.c:232 commands/foreigncmds.c:240
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "немає дозволу для зміни власника джерела сторонніх даних \"%s\""
 
-#: commands/foreigncmds.c:223
+#: commands/foreigncmds.c:234
 #, c-format
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "Треба бути суперкористувачем, щоб змінити власника джерела сторонніх даних."
 
-#: commands/foreigncmds.c:231
+#: commands/foreigncmds.c:242
 #, c-format
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Власником джерела сторонніх даних може бути тільки суперкористувач."
 
-#: commands/foreigncmds.c:291 commands/foreigncmds.c:707 foreign/foreign.c:691
+#: commands/foreigncmds.c:302 commands/foreigncmds.c:718 foreign/foreign.c:692
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "джерела сторонніх даних \"%s\" не існує"
 
-#: commands/foreigncmds.c:325
+#: commands/foreigncmds.c:336
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "джерело сторонніх даних з OID %u не існує"
 
-#: commands/foreigncmds.c:462
+#: commands/foreigncmds.c:473
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "стороннього серверу з OID %u не усніє"
 
-#: commands/foreigncmds.c:580
+#: commands/foreigncmds.c:591
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "немає дозволу для створення джерела сторонніх даних %s\""
 
-#: commands/foreigncmds.c:582
+#: commands/foreigncmds.c:593
 #, c-format
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Треба бути суперкористувачем, щоб створити джерело сторонніх даних."
 
-#: commands/foreigncmds.c:697
+#: commands/foreigncmds.c:708
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "немає дозволу на зміну джерела сторонніх даних \"%s\""
 
-#: commands/foreigncmds.c:699
+#: commands/foreigncmds.c:710
 #, c-format
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Треба бути суперкористувачем, щоб змінити джерело сторонніх даних."
 
-#: commands/foreigncmds.c:730
+#: commands/foreigncmds.c:741
 #, c-format
 msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
 msgstr "при зміні обробника в обгортці сторонніх даних може змінитися поведінка існуючих сторонніх таблиць"
 
-#: commands/foreigncmds.c:745
+#: commands/foreigncmds.c:756
 #, c-format
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr "при зміні функції перевірки в обгортці сторонніх даних параметри залежних об'єктів можуть стати невірними"
 
-#: commands/foreigncmds.c:876
+#: commands/foreigncmds.c:887
 #, c-format
 msgid "server \"%s\" already exists, skipping"
 msgstr "сервер \"%s\" вже існує, пропускаємо"
 
-#: commands/foreigncmds.c:1144
+#: commands/foreigncmds.c:1155
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\", skipping"
 msgstr "зіставлення користувача \"%s\" для сервера \"%s\" вже існує, пропускаємо"
 
-#: commands/foreigncmds.c:1154
+#: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping for \"%s\" already exists for server \"%s\""
 msgstr "зіставлення користувача \"%s\" для сервера \"%s\" вже існує\""
 
-#: commands/foreigncmds.c:1254 commands/foreigncmds.c:1374
+#: commands/foreigncmds.c:1265 commands/foreigncmds.c:1385
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\""
 msgstr "зіставлення користувача \"%s\" не існує для сервера \"%s\""
 
-#: commands/foreigncmds.c:1379
+#: commands/foreigncmds.c:1390
 #, c-format
 msgid "user mapping for \"%s\" does not exist for server \"%s\", skipping"
 msgstr "зіставлення користувача \"%s\" не існує для сервера \"%s\", пропускаємо"
 
-#: commands/foreigncmds.c:1507 foreign/foreign.c:404
+#: commands/foreigncmds.c:1518 foreign/foreign.c:405
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
 msgstr "джерело сторонніх даних \"%s\" не має обробника"
 
-#: commands/foreigncmds.c:1513
+#: commands/foreigncmds.c:1524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
 msgstr "джерело сторонніх даних \"%s\" не підтримує IMPORT FOREIGN SCHEMA"
 
-#: commands/foreigncmds.c:1615
+#: commands/foreigncmds.c:1626
 #, c-format
 msgid "importing foreign table \"%s\""
 msgstr "імпорт сторонньої таблиці \"%s\""
@@ -8678,338 +8831,338 @@ msgstr "Створення визначення типу оболонки."
 msgid "SQL function cannot accept shell type %s"
 msgstr "SQL-функція не може приймати значення типу оболонки %s"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:251
 #, c-format
 msgid "aggregate cannot accept shell type %s"
 msgstr "агрегатна функція не може приймати значення типу оболонки %s"
 
-#: commands/functioncmds.c:255
+#: commands/functioncmds.c:257
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "тип аргументу %s - лише оболонка"
 
-#: commands/functioncmds.c:265
+#: commands/functioncmds.c:268
 #, c-format
 msgid "type %s does not exist"
 msgstr "тип \"%s\" не існує"
 
-#: commands/functioncmds.c:279
+#: commands/functioncmds.c:283
 #, c-format
 msgid "aggregates cannot accept set arguments"
 msgstr "агрегатні функції не приймають в аргументах набору"
 
-#: commands/functioncmds.c:283
+#: commands/functioncmds.c:288
 #, c-format
 msgid "procedures cannot accept set arguments"
 msgstr "процедури не приймають в аргументах набору"
 
-#: commands/functioncmds.c:287
+#: commands/functioncmds.c:293
 #, c-format
 msgid "functions cannot accept set arguments"
 msgstr "функції не приймають в аргументах набору"
 
-#: commands/functioncmds.c:297
+#: commands/functioncmds.c:304
 #, c-format
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "Параметр VARIADIC повинен бути останнім в списку вхідних параметрів"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:325
 #, c-format
 msgid "VARIADIC parameter must be the last parameter"
 msgstr "Параметр VARIADIC повинен бути останнім параметром"
 
-#: commands/functioncmds.c:342
+#: commands/functioncmds.c:351
 #, c-format
 msgid "VARIADIC parameter must be an array"
 msgstr "Параметр VARIADIC повинен бути масивом"
 
-#: commands/functioncmds.c:387
+#: commands/functioncmds.c:397
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "ім'я параметру «%s» використано декілька разів"
 
-#: commands/functioncmds.c:405
+#: commands/functioncmds.c:416
 #, c-format
 msgid "only input parameters can have default values"
 msgstr "тільки ввідні параметри можуть мати значення за замовчуванням"
 
-#: commands/functioncmds.c:420
+#: commands/functioncmds.c:432
 #, c-format
 msgid "cannot use table references in parameter default value"
 msgstr "у значенні параметру за замовчуванням не можна посилатись на таблиці"
 
-#: commands/functioncmds.c:444
+#: commands/functioncmds.c:457
 #, c-format
 msgid "input parameters after one with a default value must also have defaults"
 msgstr "вхідні параметри, наступні за параметром зі значенням \"за замовчуванням\", також повинні мати значення \"за замовчуванням\""
 
-#: commands/functioncmds.c:454
+#: commands/functioncmds.c:468
 #, c-format
 msgid "procedure OUT parameters cannot appear after one with a default value"
 msgstr "параметри процедури OUT не можуть з'являтись після параметра зі значенням за замовчуванням"
 
-#: commands/functioncmds.c:596 commands/functioncmds.c:775
+#: commands/functioncmds.c:611 commands/functioncmds.c:790
 #, c-format
 msgid "invalid attribute in procedure definition"
 msgstr "некоректний атрибут у визначенні процедури"
 
-#: commands/functioncmds.c:692
+#: commands/functioncmds.c:707
 #, c-format
 msgid "support function %s must return type %s"
 msgstr "функція підтримки %s повинна повертати тип %s"
 
-#: commands/functioncmds.c:703
+#: commands/functioncmds.c:718
 #, c-format
 msgid "must be superuser to specify a support function"
 msgstr "для уточнення функції підтримки потрібно бути суперкористувачем"
 
-#: commands/functioncmds.c:824 commands/functioncmds.c:1427
+#: commands/functioncmds.c:839 commands/functioncmds.c:1445
 #, c-format
 msgid "COST must be positive"
 msgstr "COST має бути додатнім"
 
-#: commands/functioncmds.c:832 commands/functioncmds.c:1435
+#: commands/functioncmds.c:847 commands/functioncmds.c:1453
 #, c-format
 msgid "ROWS must be positive"
 msgstr "Значення ROWS повинно бути позитивним"
 
-#: commands/functioncmds.c:861
+#: commands/functioncmds.c:876
 #, c-format
 msgid "no function body specified"
 msgstr "не вказано тіло функції"
 
-#: commands/functioncmds.c:866
+#: commands/functioncmds.c:881
 #, c-format
 msgid "duplicate function body specified"
 msgstr "вказано тіло дубліката функції"
 
-#: commands/functioncmds.c:871
+#: commands/functioncmds.c:886
 #, c-format
 msgid "inline SQL function body only valid for language SQL"
 msgstr "вбудоване тіло функції SQL допустиме лише для мови SQL"
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:928
 #, c-format
 msgid "SQL function with unquoted function body cannot have polymorphic arguments"
 msgstr "SQL функція з тілом без лапок не може мати поліморфні аргументи"
 
-#: commands/functioncmds.c:939 commands/functioncmds.c:958
+#: commands/functioncmds.c:954 commands/functioncmds.c:973
 #, c-format
 msgid "%s is not yet supported in unquoted SQL function body"
 msgstr "%s ще не підтримується у тілі SQL функції без лапок"
 
-#: commands/functioncmds.c:986
+#: commands/functioncmds.c:1001
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "для мови \"%s\" потрібен лише один вираз AS"
 
-#: commands/functioncmds.c:1091
+#: commands/functioncmds.c:1107
 #, c-format
 msgid "no language specified"
 msgstr "не вказано жодної мови"
 
-#: commands/functioncmds.c:1099 commands/functioncmds.c:2117
+#: commands/functioncmds.c:1115 commands/functioncmds.c:2135
 #: commands/proclang.c:235
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "мови \"%s\" не існує"
 
-#: commands/functioncmds.c:1101 commands/functioncmds.c:2119
+#: commands/functioncmds.c:1117 commands/functioncmds.c:2137
 #, c-format
 msgid "Use CREATE EXTENSION to load the language into the database."
 msgstr "Використайте CREATE EXTENSION, щоб завантажити мову в базу даних."
 
-#: commands/functioncmds.c:1134 commands/functioncmds.c:1419
+#: commands/functioncmds.c:1150 commands/functioncmds.c:1437
 #, c-format
 msgid "only superuser can define a leakproof function"
 msgstr "лише суперкористувачі можуть визначити функцію з атрибутом leakproof"
 
-#: commands/functioncmds.c:1185
+#: commands/functioncmds.c:1202
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "результат функції повинен мати тип %s відповідно з параметрами OUT"
 
-#: commands/functioncmds.c:1198
+#: commands/functioncmds.c:1215
 #, c-format
 msgid "function result type must be specified"
 msgstr "необхідно вказати тип результату функції"
 
-#: commands/functioncmds.c:1251 commands/functioncmds.c:1439
+#: commands/functioncmds.c:1268 commands/functioncmds.c:1457
 #, c-format
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS не застосовується, коли функція не повертає набір"
 
-#: commands/functioncmds.c:1546
+#: commands/functioncmds.c:1564
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "вихідний тип даних %s є псевдотипом"
 
-#: commands/functioncmds.c:1552
+#: commands/functioncmds.c:1570
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "цільовий тип даних %s є псевдотипом"
 
-#: commands/functioncmds.c:1576
+#: commands/functioncmds.c:1594
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "приведення буде ігноруватися, оскільки вихідні дані мають тип домену"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1599
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "приведення буде ігноруватися, оскільки цільові дані мають тип домену"
 
-#: commands/functioncmds.c:1606
+#: commands/functioncmds.c:1624
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "функція приведення повинна приймати від одного до трьох аргументів"
 
-#: commands/functioncmds.c:1612
+#: commands/functioncmds.c:1630
 #, c-format
 msgid "argument of cast function must match or be binary-coercible from source data type"
 msgstr "аргумент функції приведення повинен співпадати або бути двійково-сумісним з вихідним типом даних"
 
-#: commands/functioncmds.c:1616
+#: commands/functioncmds.c:1634
 #, c-format
 msgid "second argument of cast function must be type %s"
 msgstr "другий аргумент функції приведення повинен мати тип %s"
 
-#: commands/functioncmds.c:1621
+#: commands/functioncmds.c:1639
 #, c-format
 msgid "third argument of cast function must be type %s"
 msgstr "третій аргумент функції приведення повинен мати тип %s"
 
-#: commands/functioncmds.c:1628
+#: commands/functioncmds.c:1646
 #, c-format
 msgid "return data type of cast function must match or be binary-coercible to target data type"
 msgstr "тип вертаючих даних функції приведення повинен співпадати або бути двійково-сумісним з цільовим типом даних"
 
-#: commands/functioncmds.c:1639
+#: commands/functioncmds.c:1657
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "функція приведення не може бути змінною (volatile)"
 
-#: commands/functioncmds.c:1644
+#: commands/functioncmds.c:1662
 #, c-format
 msgid "cast function must be a normal function"
 msgstr "функція приведення повинна бути звичайною функцією"
 
-#: commands/functioncmds.c:1648
+#: commands/functioncmds.c:1666
 #, c-format
 msgid "cast function must not return a set"
 msgstr "функція приведення не може вертати набір"
 
-#: commands/functioncmds.c:1674
+#: commands/functioncmds.c:1692
 #, c-format
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "тільки суперкористувач може створити приведення WITHOUT FUNCTION"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1707
 #, c-format
 msgid "source and target data types are not physically compatible"
 msgstr "вихідний та цільовий типи даних не сумісні фізично"
 
-#: commands/functioncmds.c:1709
+#: commands/functioncmds.c:1727
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "складені типи даних не сумісні на двійковому рівні"
 
-#: commands/functioncmds.c:1715
+#: commands/functioncmds.c:1733
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "типи масивів не сумісні на двійковому рівні"
 
-#: commands/functioncmds.c:1723
+#: commands/functioncmds.c:1741
 #, c-format
 msgid "range data types are not binary-compatible"
 msgstr "типи-діапазону не сумісні на двійковому рівні"
 
-#: commands/functioncmds.c:1729
+#: commands/functioncmds.c:1747
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "типи переліку не сумісні на двійковому рівні"
 
-#: commands/functioncmds.c:1746
+#: commands/functioncmds.c:1764
 #, c-format
 msgid "domain data types must not be marked binary-compatible"
 msgstr "типи доменів не можуть вважатись сумісними на двійковому рівні"
 
-#: commands/functioncmds.c:1756
+#: commands/functioncmds.c:1774
 #, c-format
 msgid "source data type and target data type are the same"
 msgstr "вихідний тип даних співпадає з цільовим типом"
 
-#: commands/functioncmds.c:1789
+#: commands/functioncmds.c:1807
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "функція перетворення не може бути мінливою"
 
-#: commands/functioncmds.c:1793
+#: commands/functioncmds.c:1811
 #, c-format
 msgid "transform function must be a normal function"
 msgstr "функція перетворення повинна бути нормальною функцією"
 
-#: commands/functioncmds.c:1797
+#: commands/functioncmds.c:1815
 #, c-format
 msgid "transform function must not return a set"
 msgstr "функція перетворення не повинна повертати набір"
 
-#: commands/functioncmds.c:1801
+#: commands/functioncmds.c:1819
 #, c-format
 msgid "transform function must take one argument"
 msgstr "функція перетворення повинна приймати один аргумент"
 
-#: commands/functioncmds.c:1805
+#: commands/functioncmds.c:1823
 #, c-format
 msgid "first argument of transform function must be type %s"
 msgstr "перший аргумент функції перетворення повинен бути типу %s"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1862
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "тип даних %s є псевдотипом"
 
-#: commands/functioncmds.c:1850
+#: commands/functioncmds.c:1868
 #, c-format
 msgid "data type %s is a domain"
 msgstr "тип даних %s є доменом"
 
-#: commands/functioncmds.c:1890
+#: commands/functioncmds.c:1908
 #, c-format
 msgid "return data type of FROM SQL function must be %s"
 msgstr "результат функції FROM SQL має бути типу %s"
 
-#: commands/functioncmds.c:1916
+#: commands/functioncmds.c:1934
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "результат функції TO SQL повинен мати тип даних перетворення"
 
-#: commands/functioncmds.c:1943
+#: commands/functioncmds.c:1961
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "перетворення для типу %s мови \"%s\" вже існує"
 
-#: commands/functioncmds.c:2029
+#: commands/functioncmds.c:2047
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "перетворення для типу %s мови \"%s\" не існує"
 
-#: commands/functioncmds.c:2053
+#: commands/functioncmds.c:2071
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "функція %s вже існує в схемі \"%s\""
 
-#: commands/functioncmds.c:2104
+#: commands/functioncmds.c:2122
 #, c-format
 msgid "no inline code specified"
 msgstr "не вказано жодного впровадженого коду"
 
-#: commands/functioncmds.c:2150
+#: commands/functioncmds.c:2168
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "мова \"%s\" не підтримує виконання впровадженого коду"
 
-#: commands/functioncmds.c:2245
+#: commands/functioncmds.c:2263
 #, c-format
 msgid "cannot pass more than %d argument to a procedure"
 msgid_plural "cannot pass more than %d arguments to a procedure"
@@ -9018,303 +9171,343 @@ msgstr[1] "процедурі неможливо передати більше %
 msgstr[2] "процедурі неможливо передати більше %d аргументів"
 msgstr[3] "процедурі неможливо передати більше %d аргументів"
 
-#: commands/indexcmds.c:648
+#: commands/indexcmds.c:659
 #, c-format
 msgid "must specify at least one column"
 msgstr "треба вказати хоча б один стовпець"
 
-#: commands/indexcmds.c:652
+#: commands/indexcmds.c:663
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "не можна використовувати більше ніж %d стовпців в індексі"
 
-#: commands/indexcmds.c:695
+#: commands/indexcmds.c:712
 #, c-format
 msgid "cannot create index on relation \"%s\""
 msgstr "створити індекс для відношення \"%s\" не можна"
 
-#: commands/indexcmds.c:721
+#: commands/indexcmds.c:738
 #, c-format
 msgid "cannot create index on partitioned table \"%s\" concurrently"
 msgstr "неможливо створити індекс в секційній таблиці \"%s\" паралельним способом"
 
-#: commands/indexcmds.c:731
+#: commands/indexcmds.c:748
 #, c-format
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "неможливо створити індекси в тимчасових таблицях в інших сеансах"
 
-#: commands/indexcmds.c:769 commands/tablecmds.c:801 commands/tablespace.c:1178
+#: commands/indexcmds.c:786 commands/tablecmds.c:892 commands/tablespace.c:1178
 #, c-format
 msgid "cannot specify default tablespace for partitioned relations"
 msgstr "для секціонованих відношень не можна вказати табличний простір за замовчуванням"
 
-#: commands/indexcmds.c:801 commands/tablecmds.c:832 commands/tablecmds.c:3571
+#: commands/indexcmds.c:818 commands/tablecmds.c:923 commands/tablecmds.c:3710
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "тільки спільні відношення можуть бути поміщені в табличний pg_global"
 
-#: commands/indexcmds.c:834
+#: commands/indexcmds.c:851
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "застарілий метод доступу \"rtree\" підміняється методом \"gist\""
 
-#: commands/indexcmds.c:855
+#: commands/indexcmds.c:872
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "методу доступу \"%s\" не підтримує унікальні індекси"
 
-#: commands/indexcmds.c:860
+#: commands/indexcmds.c:877
 #, c-format
 msgid "access method \"%s\" does not support included columns"
 msgstr "методу доступу \"%s\" не підтримує включені стовпці"
 
-#: commands/indexcmds.c:865
+#: commands/indexcmds.c:882
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "метод доступу \"%s\" не підтримує багатостовпцеві індекси"
 
-#: commands/indexcmds.c:870
+#: commands/indexcmds.c:887
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "метод доступу \"%s\" не підтримує обмеження-винятки"
 
-#: commands/indexcmds.c:999
+#: commands/indexcmds.c:892
 #, c-format
-msgid "cannot match partition key to an index using access method \"%s\""
-msgstr "не можна зіставити ключ розділу з індексом використовуючи метод доступу \"%s\""
+msgid "access method \"%s\" does not support WITHOUT OVERLAPS constraints"
+msgstr "метод доступу \"%s\" не підтримує обмеження WITHOUT OVERLAPS"
 
-#: commands/indexcmds.c:1009
+#: commands/indexcmds.c:1019
 #, c-format
 msgid "unsupported %s constraint with partition key definition"
 msgstr "непідтримуване обмеження \"%s\" з визначенням ключа секціонування"
 
-#: commands/indexcmds.c:1011
+#: commands/indexcmds.c:1021
 #, c-format
 msgid "%s constraints cannot be used when partition keys include expressions."
 msgstr "обмеження %s не можуть використовуватись, якщо ключі секціонування включають вирази."
 
-#: commands/indexcmds.c:1061
+#: commands/indexcmds.c:1056 commands/indexcmds.c:2469
+#: commands/indexcmds.c:2488 executor/execReplication.c:329
+#: parser/parse_cte.c:303 parser/parse_oper.c:221
+#: utils/adt/array_userfuncs.c:1410 utils/adt/array_userfuncs.c:1553
+#: utils/adt/arrayfuncs.c:3864 utils/adt/arrayfuncs.c:4419
+#: utils/adt/arrayfuncs.c:6440 utils/adt/rowtypes.c:1220
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "не вдалося визначити оператора рівності для типу %s"
+
+#: commands/indexcmds.c:1057 commands/indexcmds.c:2491
+#, c-format
+msgid "There is no suitable operator in operator family \"%s\" for access method \"%s\"."
+msgstr "Немає підходящого оператора у родині операторів \"%s\" для методу доступу \"%s\"."
+
+#: commands/indexcmds.c:1077
 #, c-format
 msgid "cannot match partition key to index on column \"%s\" using non-equal operator \"%s\""
 msgstr "не вдається зіставити ключ розділу з індексом у стовпці \"%s\" за допомогою оператора нерівності \"%s\""
 
-#: commands/indexcmds.c:1077
+#: commands/indexcmds.c:1093
 #, c-format
 msgid "unique constraint on partitioned table must include all partitioning columns"
 msgstr "обмеження унікальності в секціонованій таблиці повинно включати всі стовпці секціонування"
 
-#: commands/indexcmds.c:1078
+#: commands/indexcmds.c:1094
 #, c-format
 msgid "%s constraint on table \"%s\" lacks column \"%s\" which is part of the partition key."
 msgstr "в обмеженні %s таблиці\"%s\" не вистачає стовпця \"%s\", що є частиною ключа секціонування."
 
-#: commands/indexcmds.c:1097 commands/indexcmds.c:1116
+#: commands/indexcmds.c:1116 commands/indexcmds.c:1147
 #, c-format
 msgid "index creation on system columns is not supported"
 msgstr "створення індексу для системних стовпців не підтримується"
 
-#: commands/indexcmds.c:1346 tcop/utility.c:1515
+#: commands/indexcmds.c:1123
+#, c-format
+msgid "primary keys on virtual generated columns are not supported"
+msgstr "первинні ключі на віртуальних генерованих стовпцях не підтримуються"
+
+#: commands/indexcmds.c:1125 commands/indexcmds.c:1164
+#, c-format
+msgid "unique constraints on virtual generated columns are not supported"
+msgstr "унікальні обмеження для віртуальних генерованих стовпців не підтримуються"
+
+#: commands/indexcmds.c:1126 commands/indexcmds.c:1165
+#, c-format
+msgid "indexes on virtual generated columns are not supported"
+msgstr "індекси на віртуальних генерованих стовпцях не підтримуються"
+
+#: commands/indexcmds.c:1397 tcop/utility.c:1518
 #, c-format
 msgid "cannot create unique index on partitioned table \"%s\""
 msgstr "не можна створити унікальний індекс в секціонованій таблиці \"%s\""
 
-#: commands/indexcmds.c:1348 tcop/utility.c:1517
+#: commands/indexcmds.c:1399 tcop/utility.c:1520
 #, c-format
 msgid "Table \"%s\" contains partitions that are foreign tables."
 msgstr "Таблиця \"%s\" містить секції, які є зовнішніми таблицями."
 
-#: commands/indexcmds.c:1833
+#: commands/indexcmds.c:1857
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "функції в предикаті індексу повинні бути позначені як IMMUTABLE"
 
-#: commands/indexcmds.c:1912 parser/parse_utilcmd.c:2519
-#: parser/parse_utilcmd.c:2654
+#: commands/indexcmds.c:1954 parser/parse_utilcmd.c:2735
+#: parser/parse_utilcmd.c:2918
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "вказаний у ключі стовпець \"%s\" не існує"
 
-#: commands/indexcmds.c:1936 parser/parse_utilcmd.c:1807
+#: commands/indexcmds.c:1978 parser/parse_utilcmd.c:1988
 #, c-format
 msgid "expressions are not supported in included columns"
 msgstr "вирази не підтримуються у включених  стовпцях "
 
-#: commands/indexcmds.c:1977
+#: commands/indexcmds.c:2019
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "функції в індексному виразі повинні бути позначені як IMMUTABLE"
 
-#: commands/indexcmds.c:1992
+#: commands/indexcmds.c:2034
 #, c-format
 msgid "including column does not support a collation"
 msgstr "включені стовпці не підтримують правила сортування"
 
-#: commands/indexcmds.c:1996
+#: commands/indexcmds.c:2038
 #, c-format
 msgid "including column does not support an operator class"
 msgstr "включені стовпці не підтримують класи операторів"
 
-#: commands/indexcmds.c:2000
+#: commands/indexcmds.c:2042
 #, c-format
 msgid "including column does not support ASC/DESC options"
 msgstr "включені стовпці не підтримують параметри ASC/DESC"
 
-#: commands/indexcmds.c:2004
+#: commands/indexcmds.c:2046
 #, c-format
 msgid "including column does not support NULLS FIRST/LAST options"
 msgstr "включені стовпці не підтримують параметри NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:2047
+#: commands/indexcmds.c:2089
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "не вдалося визначити, яке правило сортування використати для індексного виразу"
 
-#: commands/indexcmds.c:2055 commands/tablecmds.c:18075 commands/typecmds.c:811
-#: parser/parse_expr.c:2785 parser/parse_type.c:568 parser/parse_utilcmd.c:3771
+#: commands/indexcmds.c:2097 commands/tablecmds.c:19994 commands/typecmds.c:812
+#: parser/parse_expr.c:2806 parser/parse_type.c:568 parser/parse_utilcmd.c:4064
 #: utils/adt/misc.c:630
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "тип %s не підтримує правила сортування"
 
-#: commands/indexcmds.c:2122
+#: commands/indexcmds.c:2164
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "оператор %s не комутативний"
 
-#: commands/indexcmds.c:2124
+#: commands/indexcmds.c:2166
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr "В обмеженнях-виключеннях можуть використовуватись лише комутативні оператори."
 
-#: commands/indexcmds.c:2150
+#: commands/indexcmds.c:2176
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "оператор %s не є членом сімейства операторів \"%s\""
 
-#: commands/indexcmds.c:2153
+#: commands/indexcmds.c:2179
 #, c-format
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr "Оператор винятку для обмеження повинен відноситись до класу операторів індексу."
 
-#: commands/indexcmds.c:2188
+#: commands/indexcmds.c:2228
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "метод доступу \"%s\" не підтримує параметри ASC/DESC"
 
-#: commands/indexcmds.c:2193
+#: commands/indexcmds.c:2233
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "метод доступу \"%s\" не підтримує параметри NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:2237 commands/tablecmds.c:18100
-#: commands/tablecmds.c:18106 commands/typecmds.c:2311
+#: commands/indexcmds.c:2277 commands/tablecmds.c:20019
+#: commands/tablecmds.c:20025 commands/typecmds.c:2349
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "тип даних %s не має класу операторів за замовчуванням для методу доступу \"%s\""
 
-#: commands/indexcmds.c:2239
+#: commands/indexcmds.c:2279
 #, c-format
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr "Ви повинні вказати клас операторів для індексу або визначити клас операторів за замовчуванням для цього типу даних."
 
-#: commands/indexcmds.c:2268 commands/indexcmds.c:2276
-#: commands/opclasscmds.c:204
+#: commands/indexcmds.c:2308 commands/indexcmds.c:2316
+#: commands/opclasscmds.c:205
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "клас операторів \"%s\" не існує для методу доступу \"%s\""
 
-#: commands/indexcmds.c:2290 commands/typecmds.c:2299
+#: commands/indexcmds.c:2330 commands/typecmds.c:2337
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "клас операторів \"%s\" не приймає тип даних %s"
 
-#: commands/indexcmds.c:2380
+#: commands/indexcmds.c:2420
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr "для типу даних %s є кілька класів операторів за замовчуванням"
 
-#: commands/indexcmds.c:2708
+#: commands/indexcmds.c:2470 commands/indexcmds.c:2489
+#, c-format
+msgid "could not identify an overlaps operator for type %s"
+msgstr "не вдалося ідентифікувати оператор перекриття для типу %s"
+
+#: commands/indexcmds.c:2471 commands/indexcmds.c:2490
 #, c-format
-msgid "unrecognized REINDEX option \"%s\""
-msgstr "нерозпізнаний параметр REINDEX \"%s\""
+msgid "could not identify a contained-by operator for type %s"
+msgstr "не вдалося ідентифікувати оператор \"міститься в\" для типу %s"
 
-#: commands/indexcmds.c:2940
+#: commands/indexcmds.c:2472 commands/tablecmds.c:10358
+#, c-format
+msgid "Could not translate compare type %d for operator family \"%s\" of access method \"%s\"."
+msgstr "Не вдалося перекласти тип порівняння %d для сімейства операторів \"%s\" методу доступу \"%s\"."
+
+#: commands/indexcmds.c:3078
 #, c-format
 msgid "table \"%s\" has no indexes that can be reindexed concurrently"
 msgstr "таблиця \"%s\" не має індексів, які можна переіндексувати паралельно"
 
-#: commands/indexcmds.c:2954
+#: commands/indexcmds.c:3092
 #, c-format
 msgid "table \"%s\" has no indexes to reindex"
 msgstr "таблиця \"%s\" не має індексів для переіндексування"
 
-#: commands/indexcmds.c:3001 commands/indexcmds.c:3512
-#: commands/indexcmds.c:3642
+#: commands/indexcmds.c:3139 commands/indexcmds.c:3650
+#: commands/indexcmds.c:3780
 #, c-format
 msgid "cannot reindex system catalogs concurrently"
 msgstr "не можна конкурентно переіндексувати системні каталоги"
 
-#: commands/indexcmds.c:3025
+#: commands/indexcmds.c:3163
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "переіндексувати можна тільки наразі відкриту базу даних"
 
-#: commands/indexcmds.c:3117
+#: commands/indexcmds.c:3255
 #, c-format
 msgid "cannot reindex system catalogs concurrently, skipping all"
 msgstr "не можна конкурентно переіндексувати системні каталоги, пропускаємо"
 
-#: commands/indexcmds.c:3150
+#: commands/indexcmds.c:3288
 #, c-format
 msgid "cannot move system relations, skipping all"
 msgstr "не можна перемістити системні відношення, пропускаються усі"
 
-#: commands/indexcmds.c:3196
+#: commands/indexcmds.c:3334
 #, c-format
 msgid "while reindexing partitioned table \"%s.%s\""
 msgstr "під час переіндексування секціонованої таблиці \"%s.%s\""
 
-#: commands/indexcmds.c:3199
+#: commands/indexcmds.c:3337
 #, c-format
 msgid "while reindexing partitioned index \"%s.%s\""
 msgstr "під час переіндексування секціонованого індексу \"%s.%s\""
 
-#: commands/indexcmds.c:3392 commands/indexcmds.c:4268
+#: commands/indexcmds.c:3530 commands/indexcmds.c:4422
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "таблиця \"%s.%s\" була переіндексована"
 
-#: commands/indexcmds.c:3544 commands/indexcmds.c:3597
+#: commands/indexcmds.c:3682 commands/indexcmds.c:3735
 #, c-format
 msgid "skipping reindex of invalid index \"%s.%s\""
 msgstr "пропуск пере індексації недійсного індексу \"%s.%s\""
 
-#: commands/indexcmds.c:3547 commands/indexcmds.c:3600
+#: commands/indexcmds.c:3685 commands/indexcmds.c:3738
 #, c-format
 msgid "Use DROP INDEX or REINDEX INDEX."
 msgstr "Використовуйте DROP INDEX або REINDEX INDEX."
 
-#: commands/indexcmds.c:3551
+#: commands/indexcmds.c:3689
 #, c-format
 msgid "cannot reindex exclusion constraint index \"%s.%s\" concurrently, skipping"
 msgstr "неможливо переіндексувати індекс обмеження-виключення \"%s.%s\" паралельно, пропускається"
 
-#: commands/indexcmds.c:3707
+#: commands/indexcmds.c:3845
 #, c-format
 msgid "cannot reindex this type of relation concurrently"
 msgstr "неможливо переіндексувати цей тип відношень паралельон"
 
-#: commands/indexcmds.c:3725
+#: commands/indexcmds.c:3863
 #, c-format
 msgid "cannot move non-shared relation to tablespace \"%s\""
 msgstr "не можна перемістити не спільне відношення до табличного простору \"%s\""
 
-#: commands/indexcmds.c:4249 commands/indexcmds.c:4261
+#: commands/indexcmds.c:4403 commands/indexcmds.c:4415
 #, c-format
 msgid "index \"%s.%s\" was reindexed"
 msgstr "індекс \"%s.%s\" був перебудований"
 
-#: commands/indexcmds.c:4251 commands/indexcmds.c:4270
+#: commands/indexcmds.c:4405 commands/indexcmds.c:4424
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -9324,254 +9517,274 @@ msgstr "%s."
 msgid "cannot lock relation \"%s\""
 msgstr "блокувати відношення \"%s\" не можна"
 
-#: commands/matview.c:206
+#: commands/matview.c:208
 #, c-format
 msgid "CONCURRENTLY cannot be used when the materialized view is not populated"
 msgstr "CONCURRENTLY не може використовуватись, коли матеріалізоване подання не наповнено"
 
-#: commands/matview.c:212 gram.y:18918
+#: commands/matview.c:214 gram.y:19087
 #, c-format
 msgid "%s and %s options cannot be used together"
 msgstr "параметри %s та %s не можуть бути використані разом"
 
-#: commands/matview.c:269
+#: commands/matview.c:273
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
 msgstr "оновити матеріалізоване подання \"%s\" паралельно не можна"
 
-#: commands/matview.c:272
+#: commands/matview.c:276
 #, c-format
 msgid "Create a unique index with no WHERE clause on one or more columns of the materialized view."
 msgstr "Створіть унікальний індекс без речення WHERE для одного або більше стовпців матеріалізованого подання."
 
-#: commands/matview.c:666
+#: commands/matview.c:682
 #, c-format
 msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
 msgstr "нові дані для матеріалізованого подання \"%s\" містять рядки, які дублюються (без урахування стовпців з null)"
 
-#: commands/matview.c:668
+#: commands/matview.c:684
 #, c-format
 msgid "Row: %s"
 msgstr "Рядок: %s"
 
-#: commands/opclasscmds.c:123
+#: commands/matview.c:838
+#, c-format
+msgid "could not find suitable unique index on materialized view \"%s\""
+msgstr "не вдалося знайти відповідний унікальний індекс на матеріалізованому поданні \"%s\""
+
+#: commands/opclasscmds.c:124
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
 msgstr "сімейство операторів \"%s\" не існує для методу доступу \"%s\""
 
-#: commands/opclasscmds.c:266
+#: commands/opclasscmds.c:267
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists"
 msgstr "сімейство операторів \"%s\" для методу доступу \"%s\" вже існує"
 
-#: commands/opclasscmds.c:415
+#: commands/opclasscmds.c:416
 #, c-format
 msgid "must be superuser to create an operator class"
 msgstr "тільки суперкористувач може створити клас операторів"
 
-#: commands/opclasscmds.c:492 commands/opclasscmds.c:909
-#: commands/opclasscmds.c:1055
+#: commands/opclasscmds.c:493 commands/opclasscmds.c:910
+#: commands/opclasscmds.c:1056
 #, c-format
 msgid "invalid operator number %d, must be between 1 and %d"
 msgstr "неприпустимий номер оператора %d, число має бути між 1 і %d"
 
-#: commands/opclasscmds.c:537 commands/opclasscmds.c:959
-#: commands/opclasscmds.c:1071
+#: commands/opclasscmds.c:538 commands/opclasscmds.c:960
+#: commands/opclasscmds.c:1072
 #, c-format
 msgid "invalid function number %d, must be between 1 and %d"
 msgstr "неприпустимий номер функції %d,  число має бути між 1 і %d"
 
-#: commands/opclasscmds.c:566
+#: commands/opclasscmds.c:567
 #, c-format
 msgid "storage type specified more than once"
 msgstr "тип сховища вказано більше одного разу"
 
-#: commands/opclasscmds.c:593
+#: commands/opclasscmds.c:594
 #, c-format
 msgid "storage type cannot be different from data type for access method \"%s\""
 msgstr "тип сховища не може відрізнятися від типу даних для методу доступу \"%s\""
 
-#: commands/opclasscmds.c:609
+#: commands/opclasscmds.c:610
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists"
 msgstr "клас операторів \"%s\" для методу доступу \"%s\" вже існує"
 
-#: commands/opclasscmds.c:637
+#: commands/opclasscmds.c:638
 #, c-format
 msgid "could not make operator class \"%s\" be default for type %s"
 msgstr "клас операторів \"%s\" не вдалося зробити класом за замовчуванням для типу %s"
 
-#: commands/opclasscmds.c:640
+#: commands/opclasscmds.c:641
 #, c-format
 msgid "Operator class \"%s\" already is the default."
 msgstr "Клас операторів \"%s\" вже є класом за замовчуванням."
 
-#: commands/opclasscmds.c:800
+#: commands/opclasscmds.c:801
 #, c-format
 msgid "must be superuser to create an operator family"
 msgstr "тільки суперкористувач може створити сімейство операторів"
 
-#: commands/opclasscmds.c:860
+#: commands/opclasscmds.c:861
 #, c-format
 msgid "must be superuser to alter an operator family"
 msgstr "тільки суперкористувач може змінити сімейство операторів"
 
-#: commands/opclasscmds.c:918
+#: commands/opclasscmds.c:919
 #, c-format
 msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
 msgstr "типи аргументу оператора повинні бути вказані в ALTER OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:993
+#: commands/opclasscmds.c:994
 #, c-format
 msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
 msgstr "STORAGE не може бути вказано в ALTER OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:1127
+#: commands/opclasscmds.c:1128
 #, c-format
 msgid "one or two argument types must be specified"
 msgstr "треба вказати один або два типи аргументу"
 
-#: commands/opclasscmds.c:1153
+#: commands/opclasscmds.c:1154
 #, c-format
 msgid "index operators must be binary"
 msgstr "індексні оператори повинні бути бінарними"
 
-#: commands/opclasscmds.c:1172
+#: commands/opclasscmds.c:1173
 #, c-format
 msgid "access method \"%s\" does not support ordering operators"
 msgstr "метод доступу \"%s\" не підтримує сортувальних операторів"
 
-#: commands/opclasscmds.c:1183
+#: commands/opclasscmds.c:1184
 #, c-format
 msgid "index search operators must return boolean"
 msgstr "оператори пошуку по індексу повинні повертати логічне значення"
 
-#: commands/opclasscmds.c:1223
+#: commands/opclasscmds.c:1224
 #, c-format
 msgid "associated data types for operator class options parsing functions must match opclass input type"
 msgstr "пов'язані типи даних для функцій обробки параметрів класів операторів повинні відповідати типу вхідних даних opclass"
 
-#: commands/opclasscmds.c:1230
+#: commands/opclasscmds.c:1231
 #, c-format
 msgid "left and right associated data types for operator class options parsing functions must match"
 msgstr "ліві та праві пов'язані типи даних для функцій розбору параметрів класів операторів повинні збігатись"
 
-#: commands/opclasscmds.c:1238
+#: commands/opclasscmds.c:1239
 #, c-format
 msgid "invalid operator class options parsing function"
 msgstr "неприпустима функція розбору параметрів класів операторів"
 
-#: commands/opclasscmds.c:1239
+#: commands/opclasscmds.c:1240
 #, c-format
 msgid "Valid signature of operator class options parsing function is %s."
 msgstr "Допустимий підпис для функції розбору параметрів класів операторів: %s."
 
-#: commands/opclasscmds.c:1258
+#: commands/opclasscmds.c:1259
+#, c-format
+msgid "ordering comparison functions must have two arguments"
+msgstr "функції порівняння для сортування повинні мати два аргументи"
+
+#: commands/opclasscmds.c:1263
+#, c-format
+msgid "ordering comparison functions must return integer"
+msgstr "функції порівняння для сортування повинні повертати ціле число"
+
+#: commands/opclasscmds.c:1280
+#, c-format
+msgid "ordering sort support functions must accept type \"internal\""
+msgstr "функції підтримки сортування для впорядкування повинні приймати тип \"internal\""
+
+#: commands/opclasscmds.c:1284
 #, c-format
-msgid "btree comparison functions must have two arguments"
-msgstr "функції порівняння btree повинні мати два аргумента"
+msgid "ordering sort support functions must return void"
+msgstr "функції підтримки сортування для впорядкування повинні повертати void"
 
-#: commands/opclasscmds.c:1262
+#: commands/opclasscmds.c:1295
 #, c-format
-msgid "btree comparison functions must return integer"
-msgstr "функції порівняння btree повинні повертати ціле число"
+msgid "ordering in_range functions must have five arguments"
+msgstr "функції in_range для впорядкування повинні мати п'ять аргументів"
 
-#: commands/opclasscmds.c:1279
+#: commands/opclasscmds.c:1299
 #, c-format
-msgid "btree sort support functions must accept type \"internal\""
-msgstr "опорні функції сортування btree повинні приймати тип \"internal\""
+msgid "ordering in_range functions must return boolean"
+msgstr "функції in_range для впорядкування повинні повертати boolean"
 
-#: commands/opclasscmds.c:1283
+#: commands/opclasscmds.c:1315
 #, c-format
-msgid "btree sort support functions must return void"
-msgstr "опорні функції сортування btree повинні повертати недійсне (void)"
+msgid "ordering equal image functions must have one argument"
+msgstr "функції рівного відображення для впорядкування повинні мати один аргумент"
 
-#: commands/opclasscmds.c:1294
+#: commands/opclasscmds.c:1319
 #, c-format
-msgid "btree in_range functions must have five arguments"
-msgstr "функції in_range для btree повинні приймати п'ять аргументів"
+msgid "ordering equal image functions must return boolean"
+msgstr "функції рівного відображення для впорядкування повинні повертати boolean"
 
-#: commands/opclasscmds.c:1298
+#: commands/opclasscmds.c:1332
 #, c-format
-msgid "btree in_range functions must return boolean"
-msgstr "функції in_range для btree повинні повертати логічне значення"
+msgid "ordering equal image functions must not be cross-type"
+msgstr "функції рівного відображення для впорядкування не повинні бути міжтипними"
 
-#: commands/opclasscmds.c:1314
+#: commands/opclasscmds.c:1340
 #, c-format
-msgid "btree equal image functions must have one argument"
-msgstr "функції equal image для btree повинні приймати один аргумент"
+msgid "btree skip support functions must accept type \"internal\""
+msgstr "функції підтримки пропуску btree повинні приймати тип \"internal\""
 
-#: commands/opclasscmds.c:1318
+#: commands/opclasscmds.c:1344
 #, c-format
-msgid "btree equal image functions must return boolean"
-msgstr "функції equal image для btree повинні повертати логічне значення"
+msgid "btree skip support functions must return void"
+msgstr "функції підтримки пропуску btree повинні повертати void"
 
-#: commands/opclasscmds.c:1331
+#: commands/opclasscmds.c:1357
 #, c-format
-msgid "btree equal image functions must not be cross-type"
-msgstr "функції equal image для btree не можуть бути хрестоподібного типу"
+msgid "btree skip support functions must not be cross-type"
+msgstr "функції підтримки пропуску btree не повинні бути міжтипними"
 
-#: commands/opclasscmds.c:1341
+#: commands/opclasscmds.c:1367
 #, c-format
 msgid "hash function 1 must have one argument"
 msgstr "геш-функція 1 повинна приймати один аргумент"
 
-#: commands/opclasscmds.c:1345
+#: commands/opclasscmds.c:1371
 #, c-format
 msgid "hash function 1 must return integer"
 msgstr "геш-функція 1 повинна повертати ціле число"
 
-#: commands/opclasscmds.c:1352
+#: commands/opclasscmds.c:1378
 #, c-format
 msgid "hash function 2 must have two arguments"
 msgstr "геш-функція 2 повинна приймати два аргументи"
 
-#: commands/opclasscmds.c:1356
+#: commands/opclasscmds.c:1382
 #, c-format
 msgid "hash function 2 must return bigint"
 msgstr "геш-функція 2 повинна повертати велике ціле (bigint)"
 
-#: commands/opclasscmds.c:1381
+#: commands/opclasscmds.c:1407
 #, c-format
 msgid "associated data types must be specified for index support function"
 msgstr "для опорної функції індексів повинні бути вказані пов'язані типи даних"
 
-#: commands/opclasscmds.c:1406
+#: commands/opclasscmds.c:1432
 #, c-format
 msgid "function number %d for (%s,%s) appears more than once"
 msgstr "номер функції %d для (%s,%s) з'являється більш ніж один раз"
 
-#: commands/opclasscmds.c:1413
+#: commands/opclasscmds.c:1439
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "номер оператора %d для (%s,%s) з'являється більш ніж один раз"
 
-#: commands/opclasscmds.c:1459
+#: commands/opclasscmds.c:1485
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "оператор %d(%s,%s) вже існує в сімействі операторів \"%s\""
 
-#: commands/opclasscmds.c:1565
+#: commands/opclasscmds.c:1614
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "функція %d(%s,%s) вже існує в сімействі операторів \"%s\""
 
-#: commands/opclasscmds.c:1646
+#: commands/opclasscmds.c:1769
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "оператора %d(%s,%s) не існує в сімействі операторів \"%s\""
 
-#: commands/opclasscmds.c:1686
+#: commands/opclasscmds.c:1809
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "функції %d(%s,%s) не існує в сімействі операторів \"%s\""
 
-#: commands/opclasscmds.c:1717
+#: commands/opclasscmds.c:1840
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "клас операторів \"%s\" для методу доступу \"%s\" вже існує в схемі \"%s\""
 
-#: commands/opclasscmds.c:1740
+#: commands/opclasscmds.c:1863
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "сімейство операторів \"%s\" для методу доступу \"%s\" вже існує в схемі \"%s\""
@@ -9643,12 +9856,12 @@ msgstr "атрибут оператора \"%s\" неможливо змінит
 msgid "operator attribute \"%s\" cannot be changed if it has already been set"
 msgstr "атрибут оператора \"%s\" не може бути змінений, якщо він вже встановлений"
 
-#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:146
-#: commands/tablecmds.c:1723 commands/tablecmds.c:2323
-#: commands/tablecmds.c:3682 commands/tablecmds.c:6582
-#: commands/tablecmds.c:9614 commands/tablecmds.c:17662
-#: commands/tablecmds.c:17697 commands/trigger.c:316 commands/trigger.c:1332
-#: commands/trigger.c:1442 rewrite/rewriteDefine.c:268
+#: commands/policy.c:86 commands/policy.c:379 commands/statscmds.c:152
+#: commands/tablecmds.c:1800 commands/tablecmds.c:2400
+#: commands/tablecmds.c:3824 commands/tablecmds.c:6793
+#: commands/tablecmds.c:10114 commands/tablecmds.c:19565
+#: commands/tablecmds.c:19600 commands/trigger.c:319 commands/trigger.c:1338
+#: commands/trigger.c:1448 rewrite/rewriteDefine.c:268
 #: rewrite/rewriteDefine.c:779 rewrite/rewriteRemove.c:74
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
@@ -9689,53 +9902,53 @@ msgstr "політика \"%s\" для таблиці \"%s\" не існує"
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "для SELECT, DELETE допускається лише вираз USING"
 
-#: commands/portalcmds.c:60 commands/portalcmds.c:181 commands/portalcmds.c:232
+#: commands/portalcmds.c:63 commands/portalcmds.c:191 commands/portalcmds.c:242
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "неприпустиме ім'я курсора: не повинне бути пустим"
 
-#: commands/portalcmds.c:72
+#: commands/portalcmds.c:75
 #, c-format
 msgid "cannot create a cursor WITH HOLD within security-restricted operation"
 msgstr "не можна створити курсос WITH HOLD в межах операції з обмеженням по безпеці"
 
-#: commands/portalcmds.c:189 commands/portalcmds.c:242
-#: executor/execCurrent.c:70 utils/adt/xml.c:2936 utils/adt/xml.c:3106
+#: commands/portalcmds.c:199 commands/portalcmds.c:252
+#: executor/execCurrent.c:70 utils/adt/xml.c:2938 utils/adt/xml.c:3108
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не існує"
 
-#: commands/prepare.c:72
+#: commands/prepare.c:75
 #, c-format
 msgid "invalid statement name: must not be empty"
 msgstr "неприпустиме ім'я оператора: не повинне бути пустим"
 
-#: commands/prepare.c:227 commands/prepare.c:232
+#: commands/prepare.c:230 commands/prepare.c:235
 #, c-format
 msgid "prepared statement is not a SELECT"
 msgstr "підготовлений оператор не SELECT"
 
-#: commands/prepare.c:292
+#: commands/prepare.c:295
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "невірне число параметрів для підготовленого оператора \"%s\""
 
-#: commands/prepare.c:294
+#: commands/prepare.c:297
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "Очікувалось %d параметрів, але отримано %d."
 
-#: commands/prepare.c:327
+#: commands/prepare.c:330
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr "параметр $%d типу %s не можна привести до очікуваного типу %s"
 
-#: commands/prepare.c:411
+#: commands/prepare.c:414
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "підготовлений оператор \"%s\" вже існує"
 
-#: commands/prepare.c:450
+#: commands/prepare.c:453
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "підготовлений оператор \"%s\" не існує"
@@ -9745,203 +9958,214 @@ msgstr "підготовлений оператор \"%s\" не існує"
 msgid "must be superuser to create custom procedural language"
 msgstr "для створення користувацької мови потрібно бути суперкористувачем"
 
-#: commands/publicationcmds.c:124 postmaster/postmaster.c:1108
-#: postmaster/postmaster.c:1210 utils/init/miscinit.c:1811
+#: commands/publicationcmds.c:130 libpq/auth-oauth.c:850
+#: postmaster/postmaster.c:1130 postmaster/postmaster.c:1232
+#: utils/init/miscinit.c:1871
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "неприпустимий синтаксис списку в параметрі \"%s\""
 
-#: commands/publicationcmds.c:143
+#: commands/publicationcmds.c:149
 #, c-format
 msgid "unrecognized value for publication option \"%s\": \"%s\""
 msgstr "нерозпізнане значення параметра публікації \"%s\": \"%s\""
 
-#: commands/publicationcmds.c:157
+#: commands/publicationcmds.c:170
 #, c-format
 msgid "unrecognized publication parameter: \"%s\""
 msgstr "нерозпізнаний параметр публікації: \"%s\""
 
-#: commands/publicationcmds.c:198
+#: commands/publicationcmds.c:211
 #, c-format
 msgid "no schema has been selected for CURRENT_SCHEMA"
 msgstr "жодної схеми не вибрано для CURRENT_SCHEMA"
 
-#: commands/publicationcmds.c:495
+#: commands/publicationcmds.c:592
 msgid "System columns are not allowed."
 msgstr "Системні стовпці не допускаються."
 
-#: commands/publicationcmds.c:502 commands/publicationcmds.c:507
-#: commands/publicationcmds.c:524
+#: commands/publicationcmds.c:599 commands/publicationcmds.c:604
+#: commands/publicationcmds.c:621
 msgid "User-defined operators are not allowed."
 msgstr "Користувацькі оператори не допускаються."
 
-#: commands/publicationcmds.c:548
+#: commands/publicationcmds.c:645
 msgid "Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed."
 msgstr "Дозволяються тільки стовпці, константи, вбудовані оператори, вбудовані типи даних, вбудовані параметри сортування та незмінні вбудовані функції."
 
-#: commands/publicationcmds.c:560
+#: commands/publicationcmds.c:657
 msgid "User-defined types are not allowed."
 msgstr "Користувацькі типи не допускаються."
 
-#: commands/publicationcmds.c:563
+#: commands/publicationcmds.c:660
 msgid "User-defined or built-in mutable functions are not allowed."
 msgstr "Користувацькі або вбудовані змінні функції не допускаються."
 
-#: commands/publicationcmds.c:566
+#: commands/publicationcmds.c:663
 msgid "User-defined collations are not allowed."
 msgstr "Користувацькі параметри сортування не допускаються."
 
-#: commands/publicationcmds.c:576
+#: commands/publicationcmds.c:673
 #, c-format
 msgid "invalid publication WHERE expression"
 msgstr "неприпустимий вираз публікації WHERE"
 
-#: commands/publicationcmds.c:629
+#: commands/publicationcmds.c:726
 #, c-format
 msgid "cannot use publication WHERE clause for relation \"%s\""
 msgstr "використовувати вираз публікації WHERE для відношення \"%s\" не можна"
 
-#: commands/publicationcmds.c:631
+#: commands/publicationcmds.c:728
 #, c-format
 msgid "WHERE clause cannot be used for a partitioned table when %s is false."
 msgstr "вираз WHERE для секціонованих таблиць не можна використовувати, коли %s є false."
 
-#: commands/publicationcmds.c:702 commands/publicationcmds.c:716
+#: commands/publicationcmds.c:801 commands/publicationcmds.c:815
 #, c-format
 msgid "cannot use column list for relation \"%s.%s\" in publication \"%s\""
 msgstr "не можна використовувати список стовпців для відношення \"%s.%s\" в публікації \"%s\""
 
-#: commands/publicationcmds.c:705
+#: commands/publicationcmds.c:804
 #, c-format
 msgid "Column lists cannot be specified in publications containing FOR TABLES IN SCHEMA elements."
 msgstr "Списки стовпців не можна вказувати в публікаціях, що містять елементи FOR TABLES IN SCHEMA."
 
-#: commands/publicationcmds.c:719
+#: commands/publicationcmds.c:818
 #, c-format
 msgid "Column lists cannot be specified for partitioned tables when %s is false."
 msgstr "Списки стовпців для секціонованих таблиць не можна використовувати, коли %s є false."
 
-#: commands/publicationcmds.c:754
+#: commands/publicationcmds.c:855
 #, c-format
 msgid "must be superuser to create FOR ALL TABLES publication"
 msgstr "для створення публікації УСІХ ТАБЛИЦЬ потрібно бути суперкористувачем"
 
-#: commands/publicationcmds.c:825
+#: commands/publicationcmds.c:930
 #, c-format
 msgid "must be superuser to create FOR TABLES IN SCHEMA publication"
 msgstr "щоб створити публікацію FOR TABLES IN SCHEMA потрібно бути суперкористувачем"
 
-#: commands/publicationcmds.c:861
+#: commands/publicationcmds.c:966
 #, c-format
 msgid "\"wal_level\" is insufficient to publish logical changes"
 msgstr "недостатній \"wal_level\" для публікації логічних змін"
 
-#: commands/publicationcmds.c:862
+#: commands/publicationcmds.c:967
 #, c-format
 msgid "Set \"wal_level\" to \"logical\" before creating subscriptions."
 msgstr "Встановіть \"wal_level\" на \"logical\" перед створенням підписок."
 
-#: commands/publicationcmds.c:958 commands/publicationcmds.c:966
+#: commands/publicationcmds.c:1067 commands/publicationcmds.c:1075
 #, c-format
 msgid "cannot set parameter \"%s\" to false for publication \"%s\""
 msgstr "встановити параметр \"%s\" на false для публікації \"%s\" не можна"
 
-#: commands/publicationcmds.c:961
+#: commands/publicationcmds.c:1070
 #, c-format
 msgid "The publication contains a WHERE clause for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Публікація містить вираз WHERE для секціонованої таблиці \"%s\", який не допускається коли \"%s\" є false."
 
-#: commands/publicationcmds.c:969
+#: commands/publicationcmds.c:1078
 #, c-format
 msgid "The publication contains a column list for partitioned table \"%s\", which is not allowed when \"%s\" is false."
 msgstr "Публікація містить список стовпців для секціонованої таблиці \"%s\", який не допускається коли \"%s\" є false."
 
-#: commands/publicationcmds.c:1292
+#: commands/publicationcmds.c:1399
 #, c-format
 msgid "cannot add schema to publication \"%s\""
 msgstr "не можна додати схему до публікації \"%s\""
 
-#: commands/publicationcmds.c:1294
+#: commands/publicationcmds.c:1401
 #, c-format
 msgid "Schemas cannot be added if any tables that specify a column list are already part of the publication."
 msgstr "Схеми не можна додавати, якщо будь-яка таблиця, що вказуює на список стовпців, вже є частиною публікації."
 
-#: commands/publicationcmds.c:1342
+#: commands/publicationcmds.c:1449
 #, c-format
 msgid "must be superuser to add or set schemas"
 msgstr "для додавання або встановлення схем потрібно бути суперкористувачем"
 
-#: commands/publicationcmds.c:1351 commands/publicationcmds.c:1359
+#: commands/publicationcmds.c:1458 commands/publicationcmds.c:1466
 #, c-format
 msgid "publication \"%s\" is defined as FOR ALL TABLES"
 msgstr "публікація \"%s\" визначена ДЛЯ ВСІХ ТАБЛИЦЬ"
 
-#: commands/publicationcmds.c:1353
+#: commands/publicationcmds.c:1460
 #, c-format
 msgid "Schemas cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "До публікації FOR ALL TABLES не можна додати або видалити схеми."
 
-#: commands/publicationcmds.c:1361
+#: commands/publicationcmds.c:1468
 #, c-format
 msgid "Tables cannot be added to or dropped from FOR ALL TABLES publications."
 msgstr "У публікації ВСІХ ТАБЛИЦЬ не можна додати або видалити таблиці."
 
-#: commands/publicationcmds.c:1385 commands/publicationcmds.c:1424
-#: commands/publicationcmds.c:1961 utils/cache/lsyscache.c:3634
+#: commands/publicationcmds.c:1492 commands/publicationcmds.c:1531
+#: commands/publicationcmds.c:2068 utils/cache/lsyscache.c:3774
 #, c-format
 msgid "publication \"%s\" does not exist"
 msgstr "публікація \"%s\" вже існує"
 
-#: commands/publicationcmds.c:1587 commands/publicationcmds.c:1650
+#: commands/publicationcmds.c:1694 commands/publicationcmds.c:1757
 #, c-format
 msgid "conflicting or redundant WHERE clauses for table \"%s\""
 msgstr "конфліктуючі або надлишкові вирази WHERE для таблиці \"%s\""
 
-#: commands/publicationcmds.c:1594 commands/publicationcmds.c:1662
+#: commands/publicationcmds.c:1701 commands/publicationcmds.c:1769
 #, c-format
 msgid "conflicting or redundant column lists for table \"%s\""
 msgstr "конфліктуючі або надлишкові списки стовпців для таблиці \"%s\""
 
-#: commands/publicationcmds.c:1796
+#: commands/publicationcmds.c:1903
 #, c-format
 msgid "column list must not be specified in ALTER PUBLICATION ... DROP"
 msgstr "список стовпців не можна вказувати в ALTER PUBLICATION ... DROP"
 
-#: commands/publicationcmds.c:1808
+#: commands/publicationcmds.c:1915
 #, c-format
 msgid "relation \"%s\" is not part of the publication"
 msgstr "відносини \"%s\" не є частиною публікації"
 
-#: commands/publicationcmds.c:1815
+#: commands/publicationcmds.c:1922
 #, c-format
 msgid "cannot use a WHERE clause when removing a table from a publication"
 msgstr "під час видалення таблиці з публікації використовувати вираз WHERE не можна"
 
-#: commands/publicationcmds.c:1875
+#: commands/publicationcmds.c:1982
 #, c-format
 msgid "tables from schema \"%s\" are not part of the publication"
 msgstr "таблиці зі схеми \"%s\" не є частиною публікації"
 
-#: commands/publicationcmds.c:1918 commands/publicationcmds.c:1925
+#: commands/publicationcmds.c:2025 commands/publicationcmds.c:2032
 #, c-format
 msgid "permission denied to change owner of publication \"%s\""
 msgstr "немає прав на зміну власника публікації \"%s\""
 
-#: commands/publicationcmds.c:1920
+#: commands/publicationcmds.c:2027
 #, c-format
 msgid "The owner of a FOR ALL TABLES publication must be a superuser."
 msgstr "Власником публікації УСІХ ТАБЛИЦЬ повинен бути суперкористувач."
 
-#: commands/publicationcmds.c:1927
+#: commands/publicationcmds.c:2034
 #, c-format
 msgid "The owner of a FOR TABLES IN SCHEMA publication must be a superuser."
 msgstr "Власник публікації публікації FOR TABLES IN SCHEMA повинен бути суперкористувачем."
 
-#: commands/publicationcmds.c:1993
+#: commands/publicationcmds.c:2100
 #, c-format
 msgid "publication with OID %u does not exist"
 msgstr "публікації %u з OID не існує"
 
+#: commands/publicationcmds.c:2133
+#, c-format
+msgid "invalid value for publication parameter \"%s\": \"%s\""
+msgstr "неприпустиме значення для параметра публікації \"%s\": \"%s\""
+
+#: commands/publicationcmds.c:2134
+#, c-format
+msgid "Valid values are \"%s\" and \"%s\"."
+msgstr "Припустимі значення: \"%s\" і \"%s\"."
+
 #: commands/schemacmds.c:109 commands/schemacmds.c:289
 #, c-format
 msgid "unacceptable schema name \"%s\""
@@ -9984,13 +10208,13 @@ msgstr "не можна встановити мітку безпеки для в
 
 #: commands/sequence.c:748
 #, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%lld)"
-msgstr "nextval: досягнено максимального значення послідовності \"%s\" (%lld)"
+msgid "nextval: reached maximum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: досягнуто максимальне значення послідовності \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:767
 #, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%lld)"
-msgstr "nextval: досягнено мінімального значення послідовності \"%s\" (%lld)"
+msgid "nextval: reached minimum value of sequence \"%s\" (%<PRId64>)"
+msgstr "nextval: досягнуто мінімальне значення послідовності \"%s\" (%<PRId64>)"
 
 #: commands/sequence.c:886
 #, c-format
@@ -10004,8 +10228,8 @@ msgstr "останнє значення ще не визначено в цьом
 
 #: commands/sequence.c:991
 #, c-format
-msgid "setval: value %lld is out of bounds for sequence \"%s\" (%lld..%lld)"
-msgstr "setval: значення %lld поза межами послідовності \"%s\" (%lld..%lld)"
+msgid "setval: value %<PRId64> is out of bounds for sequence \"%s\" (%<PRId64>..%<PRId64>)"
+msgstr "setval: значення %<PRId64> за межами діапазону для послідовності \"%s\" (%<PRId64>..%<PRId64>)"
 
 #: commands/sequence.c:1357
 #, c-format
@@ -10029,43 +10253,43 @@ msgstr "INCREMENT не повинен бути нулем"
 
 #: commands/sequence.c:1466
 #, c-format
-msgid "MAXVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MAXVALUE (%lld) виходить за межі діапазону типу даних послідовності %s"
+msgid "MAXVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MAXVALUE (%<PRId64>) поза межами діапазону для типу даних послідовності %s"
 
 #: commands/sequence.c:1498
 #, c-format
-msgid "MINVALUE (%lld) is out of range for sequence data type %s"
-msgstr "MINVALUE (%lld) виходить за межі діапазону для типу даних послідовності %s"
+msgid "MINVALUE (%<PRId64>) is out of range for sequence data type %s"
+msgstr "MINVALUE (%<PRId64>) поза межами діапазону для типу даних послідовності %s"
 
 #: commands/sequence.c:1506
 #, c-format
-msgid "MINVALUE (%lld) must be less than MAXVALUE (%lld)"
-msgstr "MINVALUE (%lld) повинно бути меншим за MAXVALUE (%lld)"
+msgid "MINVALUE (%<PRId64>) must be less than MAXVALUE (%<PRId64>)"
+msgstr "MINVALUE (%<PRId64>) повинен бути меншим ніж MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1527
 #, c-format
-msgid "START value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "Значення START (%lld) не може бути меншим за MINVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "Значення START (%<PRId64>) не може бути меншим ніж MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1533
 #, c-format
-msgid "START value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "Значення START (%lld) не може бути більшим за MAXVALUE (%lld)"
+msgid "START value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "Значення START (%<PRId64>) не може бути більшим ніж MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1557
 #, c-format
-msgid "RESTART value (%lld) cannot be less than MINVALUE (%lld)"
-msgstr "Значення RESTART (%lld) не може бути меншим за MINVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be less than MINVALUE (%<PRId64>)"
+msgstr "Значення RESTART (%<PRId64>) не може бути меншим ніж MINVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1563
 #, c-format
-msgid "RESTART value (%lld) cannot be greater than MAXVALUE (%lld)"
-msgstr "Значення RESTART (%lld) не може бути більшим за MAXVALUE (%lld)"
+msgid "RESTART value (%<PRId64>) cannot be greater than MAXVALUE (%<PRId64>)"
+msgstr "Значення RESTART (%<PRId64>) не може бути більшим ніж MAXVALUE (%<PRId64>)"
 
 #: commands/sequence.c:1574
 #, c-format
-msgid "CACHE (%lld) must be greater than zero"
-msgstr "CACHE (%lld) повинно бути більше нуля"
+msgid "CACHE (%<PRId64>) must be greater than zero"
+msgstr "CACHE (%<PRId64>) має бути більше нуля"
 
 #: commands/sequence.c:1610
 #, c-format
@@ -10097,13 +10321,13 @@ msgstr "послідовність повинна бути в тій самій
 msgid "cannot change ownership of identity sequence"
 msgstr "змінити власника послідовності ідентифікації не можна"
 
-#: commands/sequence.c:1671 commands/tablecmds.c:14384
-#: commands/tablecmds.c:17078
+#: commands/sequence.c:1671 commands/tablecmds.c:16136
+#: commands/tablecmds.c:18974
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Послідовність \"%s\" зв'язана з таблицею \"%s\"."
 
-#: commands/statscmds.c:106 commands/statscmds.c:115 tcop/utility.c:1883
+#: commands/statscmds.c:106 commands/statscmds.c:115
 #, c-format
 msgid "only a single relation is allowed in CREATE STATISTICS"
 msgstr "в CREATE STATISTICS можна вказати лише одне відношення"
@@ -10113,111 +10337,116 @@ msgstr "в CREATE STATISTICS можна вказати лише одне від
 msgid "cannot define statistics for relation \"%s\""
 msgstr "визначити статистику відношення \"%s\" не можна"
 
-#: commands/statscmds.c:187
+#: commands/statscmds.c:208
 #, c-format
 msgid "statistics object \"%s\" already exists, skipping"
 msgstr "об'єкт статистики \"%s\" вже існує, пропускається"
 
-#: commands/statscmds.c:195
+#: commands/statscmds.c:216
 #, c-format
 msgid "statistics object \"%s\" already exists"
 msgstr "об'єкт статистики \"%s\" вже існує"
 
-#: commands/statscmds.c:206
+#: commands/statscmds.c:227
 #, c-format
 msgid "cannot have more than %d columns in statistics"
 msgstr "в статистиці не може бути більше ніж %d стовпців"
 
-#: commands/statscmds.c:247 commands/statscmds.c:270 commands/statscmds.c:304
+#: commands/statscmds.c:268 commands/statscmds.c:297 commands/statscmds.c:337
 #, c-format
 msgid "statistics creation on system columns is not supported"
 msgstr "створення статистики для системних стовпців не підтримується"
 
-#: commands/statscmds.c:254 commands/statscmds.c:277
+#: commands/statscmds.c:274 commands/statscmds.c:303 commands/statscmds.c:343
+#, c-format
+msgid "statistics creation on virtual generated columns is not supported"
+msgstr "створення статистики для віртуальних генерованих стовпців не підтримується"
+
+#: commands/statscmds.c:281 commands/statscmds.c:310
 #, c-format
 msgid "column \"%s\" cannot be used in statistics because its type %s has no default btree operator class"
 msgstr "стовпець \"%s\" не можна використати в статистиці, тому що для його типу %s не визначений клас оператора (btree) за замовчуванням"
 
-#: commands/statscmds.c:321
+#: commands/statscmds.c:360
 #, c-format
 msgid "expression cannot be used in multivariate statistics because its type %s has no default btree operator class"
 msgstr "вираз не може використовуватись у багатоваріативній статистиці, тому що його тип %s немає визначеного класу оператора btree за замовчуванням"
 
-#: commands/statscmds.c:342
+#: commands/statscmds.c:381
 #, c-format
 msgid "when building statistics on a single expression, statistics kinds may not be specified"
 msgstr "при побудові статистики для одного виразу види статистики можуть не вказуватись"
 
-#: commands/statscmds.c:371
+#: commands/statscmds.c:410
 #, c-format
 msgid "unrecognized statistics kind \"%s\""
 msgstr "нерозпізнаний вид статистики \"%s\""
 
-#: commands/statscmds.c:400
+#: commands/statscmds.c:439
 #, c-format
 msgid "extended statistics require at least 2 columns"
 msgstr "для розширеної статистики потрібно мінімум 2 стовпці"
 
-#: commands/statscmds.c:418
+#: commands/statscmds.c:457
 #, c-format
 msgid "duplicate column name in statistics definition"
 msgstr "дублювання імені стовпця у визначенні статистики"
 
-#: commands/statscmds.c:453
+#: commands/statscmds.c:492
 #, c-format
 msgid "duplicate expression in statistics definition"
 msgstr "дублікат виразу у визначенні статистики"
 
-#: commands/statscmds.c:628 commands/tablecmds.c:8597
+#: commands/statscmds.c:667 commands/tablecmds.c:8939
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "мета статистики занадто мала %d"
 
-#: commands/statscmds.c:636 commands/tablecmds.c:8605
+#: commands/statscmds.c:675 commands/tablecmds.c:8947
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "мета статистики знижується до %d"
 
-#: commands/statscmds.c:660
+#: commands/statscmds.c:699
 #, c-format
 msgid "statistics object \"%s.%s\" does not exist, skipping"
 msgstr "об'єкт статистики \"%s.%s\" не існує, пропускається"
 
-#: commands/subscriptioncmds.c:275 commands/subscriptioncmds.c:372
-#, c-format
-msgid "unrecognized subscription parameter: \"%s\""
-msgstr "нерозпізнаний параметр підписки: \"%s\""
-
-#: commands/subscriptioncmds.c:340 replication/pgoutput/pgoutput.c:397
+#: commands/subscriptioncmds.c:331 replication/pgoutput/pgoutput.c:411
 #, c-format
 msgid "unrecognized origin value: \"%s\""
 msgstr "нерозпізнане значення походження: \"%s\""
 
-#: commands/subscriptioncmds.c:363
+#: commands/subscriptioncmds.c:354
 #, c-format
 msgid "invalid WAL location (LSN): %s"
 msgstr "неприпустиме розташування WAL (LSN): %s"
 
+#: commands/subscriptioncmds.c:363
+#, c-format
+msgid "unrecognized subscription parameter: \"%s\""
+msgstr "нерозпізнаний параметр підписки: \"%s\""
+
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:387 commands/subscriptioncmds.c:394
-#: commands/subscriptioncmds.c:401 commands/subscriptioncmds.c:423
-#: commands/subscriptioncmds.c:439
+#: commands/subscriptioncmds.c:378 commands/subscriptioncmds.c:385
+#: commands/subscriptioncmds.c:392 commands/subscriptioncmds.c:414
+#: commands/subscriptioncmds.c:430
 #, c-format
 msgid "%s and %s are mutually exclusive options"
 msgstr "%s та %s є взаємовиключними опціями"
 
 #. translator: both %s are strings of the form "option = value"
-#: commands/subscriptioncmds.c:429 commands/subscriptioncmds.c:445
+#: commands/subscriptioncmds.c:420 commands/subscriptioncmds.c:436
 #, c-format
 msgid "subscription with %s must also set %s"
 msgstr "підписка з %s повинна також встановити %s"
 
-#: commands/subscriptioncmds.c:506
+#: commands/subscriptioncmds.c:466
 #, c-format
 msgid "could not receive list of publications from the publisher: %s"
 msgstr "не вдалося отримати список публікацій з сервера публікації: %s"
 
-#: commands/subscriptioncmds.c:538
+#: commands/subscriptioncmds.c:498
 #, c-format
 msgid "publication %s does not exist on the publisher"
 msgid_plural "publications %s do not exist on the publisher"
@@ -10226,136 +10455,165 @@ msgstr[1] "публікацій %s не існує на сервері публ
 msgstr[2] "публікацій %s не існує на сервері публікації"
 msgstr[3] "публікацій %s не існує на сервері публікації"
 
-#: commands/subscriptioncmds.c:626
+#: commands/subscriptioncmds.c:586
 #, c-format
 msgid "permission denied to create subscription"
 msgstr "немає дозволу для створення підписки"
 
-#: commands/subscriptioncmds.c:627
+#: commands/subscriptioncmds.c:587
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may create subscriptions."
 msgstr "Тільки ролі з правами \"%s\" можуть створювати підписки."
 
-#: commands/subscriptioncmds.c:758 commands/subscriptioncmds.c:891
-#: commands/subscriptioncmds.c:1524 replication/logical/tablesync.c:1345
-#: replication/logical/worker.c:4503
+#: commands/subscriptioncmds.c:718 commands/subscriptioncmds.c:852
+#: commands/subscriptioncmds.c:1594
 #, c-format
-msgid "could not connect to the publisher: %s"
-msgstr "не вдалося підключитись до сервера публікації: %s"
+msgid "subscription \"%s\" could not connect to the publisher: %s"
+msgstr "підписка \"%s\" не змогла підключитися до видавця: %s"
 
-#: commands/subscriptioncmds.c:829
+#: commands/subscriptioncmds.c:790
 #, c-format
 msgid "created replication slot \"%s\" on publisher"
 msgstr "на сервері публікації створений слот реплікації \"%s\""
 
-#: commands/subscriptioncmds.c:841
+#: commands/subscriptioncmds.c:802
 #, c-format
 msgid "subscription was created, but is not connected"
 msgstr "підписка була створена, але не підключена"
 
-#: commands/subscriptioncmds.c:842
+#: commands/subscriptioncmds.c:803
 #, c-format
 msgid "To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the subscription."
 msgstr "Щоб ініціювати реплікацію, необхідно вручну створити слот реплікації, підключити підписку і оновити підписку."
 
-#: commands/subscriptioncmds.c:1109 commands/subscriptioncmds.c:1590
-#: commands/subscriptioncmds.c:1973 utils/cache/lsyscache.c:3684
+#: commands/subscriptioncmds.c:1070
+#, c-format
+msgid "cannot set option \"%s\" for enabled subscription"
+msgstr "не можна встановити опцію \"%s\" для увімкненої підписки"
+
+#: commands/subscriptioncmds.c:1084
+#, c-format
+msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
+msgstr "не може задати параметр \"%s\" для підписки, яка не має назви слоту"
+
+#: commands/subscriptioncmds.c:1127 commands/subscriptioncmds.c:1665
+#: commands/subscriptioncmds.c:2046 utils/cache/lsyscache.c:3824
 #, c-format
 msgid "subscription \"%s\" does not exist"
 msgstr "підписка \"%s\" не існує"
 
-#: commands/subscriptioncmds.c:1166 commands/subscriptioncmds.c:1245
+#: commands/subscriptioncmds.c:1185
 #, c-format
 msgid "cannot set %s for enabled subscription"
 msgstr "неможливо встановити %s для увімкненої підписки"
 
-#: commands/subscriptioncmds.c:1233
+#: commands/subscriptioncmds.c:1270
 #, c-format
-msgid "cannot set option \"%s\" for a subscription that does not have a slot name"
-msgstr "не може задати параметр \"%s\" для підписки, яка не має назви слоту"
+msgid "\"slot_name\" and \"two_phase\" cannot be altered at the same time"
+msgstr "\"slot_name\" та \"two_phase\" не можна змінити одночасно"
+
+#: commands/subscriptioncmds.c:1286
+#, c-format
+msgid "cannot alter \"two_phase\" when logical replication worker is still running"
+msgstr "не можна змінити \"two_phase\", коли працівник логічної реплікації ще виконується"
+
+#: commands/subscriptioncmds.c:1287
+#, c-format
+msgid "Try again after some time."
+msgstr "Спробуйте знову через деякий час."
+
+#: commands/subscriptioncmds.c:1300
+#, c-format
+msgid "cannot disable \"two_phase\" when prepared transactions exist"
+msgstr "не можна вимкнути \"two_phase\", коли існують підготовлені транзакції"
+
+#: commands/subscriptioncmds.c:1301
+#, c-format
+msgid "Resolve these transactions and try again."
+msgstr "Розв'яжіть ці транзакції та спробуйте знову."
 
-#: commands/subscriptioncmds.c:1279
+#: commands/subscriptioncmds.c:1348
 #, c-format
 msgid "cannot enable subscription that does not have a slot name"
 msgstr "увімкнути підписку, для якої не задано ім'я слота,  не можна"
 
-#: commands/subscriptioncmds.c:1323 commands/subscriptioncmds.c:1374
+#: commands/subscriptioncmds.c:1392 commands/subscriptioncmds.c:1443
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION з оновленням для відключених підписок не допускається"
 
-#: commands/subscriptioncmds.c:1324
+#: commands/subscriptioncmds.c:1393
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 msgstr "Використайте ALTER SUBSCRIPTION ... SET PUBLICATION ... WITH (refresh = false)."
 
-#: commands/subscriptioncmds.c:1333 commands/subscriptioncmds.c:1388
+#: commands/subscriptioncmds.c:1402 commands/subscriptioncmds.c:1457
 #, c-format
 msgid "ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION з параметрами refresh і copy_data не допускається, коли two_phase ввімкнено"
 
-#: commands/subscriptioncmds.c:1334
+#: commands/subscriptioncmds.c:1403
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... SET PUBLICATION with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Використайте ALTER SUBSCRIPTION ... SET PUBLICATION з параметрами refresh або copy_data, які дорівнюють false, або використайте DROP/CREATE SUBSCRIPTION."
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:1390
+#: commands/subscriptioncmds.c:1459
 #, c-format
 msgid "Use %s with refresh = false, or with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Використовуйте %s з refresh = false, або з copy_data = false, або використовуйте DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1412
+#: commands/subscriptioncmds.c:1481
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH is not allowed for disabled subscriptions"
 msgstr "ALTER SUBSCRIPTION ... REFRESH для відключених підписок не допускається"
 
-#: commands/subscriptioncmds.c:1437
+#: commands/subscriptioncmds.c:1506
 #, c-format
 msgid "ALTER SUBSCRIPTION ... REFRESH with copy_data is not allowed when two_phase is enabled"
 msgstr "ALTER SUBSCRIPTION ... REFRESH з параметром copy_data не допускається, коли two_phase ввімкнено"
 
-#: commands/subscriptioncmds.c:1438
+#: commands/subscriptioncmds.c:1507
 #, c-format
 msgid "Use ALTER SUBSCRIPTION ... REFRESH with copy_data = false, or use DROP/CREATE SUBSCRIPTION."
 msgstr "Використайте ALTER SUBSCRIPTION ... REFRESH з параметром copy_data, який дорівнює false, або використайте DROP/CREATE SUBSCRIPTION."
 
-#: commands/subscriptioncmds.c:1473
+#: commands/subscriptioncmds.c:1542
 #, c-format
 msgid "skip WAL location (LSN %X/%X) must be greater than origin LSN %X/%X"
 msgstr "пропустити розташування WAL (LSN %X/%X) повинно бути більше, ніж origin LSN %X/%X"
 
-#: commands/subscriptioncmds.c:1594
+#: commands/subscriptioncmds.c:1669
 #, c-format
 msgid "subscription \"%s\" does not exist, skipping"
 msgstr "підписка \"%s\" не існує, пропускається"
 
-#: commands/subscriptioncmds.c:1863
+#: commands/subscriptioncmds.c:1936
 #, c-format
 msgid "dropped replication slot \"%s\" on publisher"
 msgstr "видалено слот реплікації \"%s\" на сервері публікації"
 
-#: commands/subscriptioncmds.c:1872 commands/subscriptioncmds.c:1880
+#: commands/subscriptioncmds.c:1945 commands/subscriptioncmds.c:1953
 #, c-format
 msgid "could not drop replication slot \"%s\" on publisher: %s"
 msgstr "не вдалося видалити слот реплікації \"%s\" на сервері публікації: %s"
 
-#: commands/subscriptioncmds.c:2005
+#: commands/subscriptioncmds.c:2078
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "підписки %u з OID не існує"
 
-#: commands/subscriptioncmds.c:2076 commands/subscriptioncmds.c:2201
+#: commands/subscriptioncmds.c:2152 commands/subscriptioncmds.c:2276
 #, c-format
 msgid "could not receive list of replicated tables from the publisher: %s"
 msgstr "не вдалося отримати список реплікованих таблиць із сервера публікації: %s"
 
-#: commands/subscriptioncmds.c:2112
+#: commands/subscriptioncmds.c:2188
 #, c-format
 msgid "subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"
 msgstr "підписка \"%s\" запросив copy_data зі походженням = NONE, але може скопіювати дані, що мають інше походження"
 
-#: commands/subscriptioncmds.c:2114
+#: commands/subscriptioncmds.c:2190
 #, c-format
 msgid "The subscription being created subscribes to a publication (%s) that contains tables that are written to by other subscriptions."
 msgid_plural "The subscription being created subscribes to publications (%s) that contain tables that are written to by other subscriptions."
@@ -10364,1554 +10622,1681 @@ msgstr[1] "Створювана підписка підписується на 
 msgstr[2] "Створювана підписка підписується на публікації (%s), яка містить таблиці, до яких записуються інші підписки."
 msgstr[3] "Створювана підписка підписується на публікації (%s), яка містить таблиці, до яких записуються інші підписки."
 
-#: commands/subscriptioncmds.c:2117
+#: commands/subscriptioncmds.c:2193
 #, c-format
 msgid "Verify that initial data copied from the publisher tables did not come from other origins."
 msgstr "Переконайтеся, що вихідні дані, скопійовані з таблиць публікатора, не були отримані з інших джерел."
 
-#: commands/subscriptioncmds.c:2223 replication/logical/tablesync.c:906
-#: replication/pgoutput/pgoutput.c:1117
+#: commands/subscriptioncmds.c:2298 replication/logical/tablesync.c:933
+#: replication/pgoutput/pgoutput.c:1185
 #, c-format
 msgid "cannot use different column lists for table \"%s.%s\" in different publications"
 msgstr "використовувати різні списки стовпців для таблиці \"%s.%s\" в різних публікаціях не можна"
 
-#: commands/subscriptioncmds.c:2273
+#: commands/subscriptioncmds.c:2348
 #, c-format
 msgid "could not connect to publisher when attempting to drop replication slot \"%s\": %s"
 msgstr "не вдалося з'єднатись з сервером публікації під час спроби видалити слот реплікації \"%s\": %s"
 
 #. translator: %s is an SQL ALTER command
-#: commands/subscriptioncmds.c:2276
+#: commands/subscriptioncmds.c:2351
 #, c-format
 msgid "Use %s to disable the subscription, and then use %s to disassociate it from the slot."
 msgstr "Використовуйте %s, щоб вимкнути підписку, а потім використайте %s, щоб від'єднати її від слоту."
 
-#: commands/subscriptioncmds.c:2307
+#: commands/subscriptioncmds.c:2382
 #, c-format
 msgid "publication name \"%s\" used more than once"
 msgstr "ім'я публікації \"%s\" використовується більше ніж один раз"
 
-#: commands/subscriptioncmds.c:2351
+#: commands/subscriptioncmds.c:2426
 #, c-format
 msgid "publication \"%s\" is already in subscription \"%s\""
 msgstr "публікація \"%s\" вже в підписці \"%s\""
 
-#: commands/subscriptioncmds.c:2365
+#: commands/subscriptioncmds.c:2440
 #, c-format
 msgid "publication \"%s\" is not in subscription \"%s\""
 msgstr "публікація \"%s\" не знаходиться в підписці \"%s\""
 
-#: commands/subscriptioncmds.c:2376
+#: commands/subscriptioncmds.c:2451
 #, c-format
 msgid "cannot drop all the publications from a subscription"
 msgstr "не можна видалити всі публікації з підписки"
 
-#: commands/subscriptioncmds.c:2433
+#: commands/subscriptioncmds.c:2508
 #, c-format
 msgid "%s requires a Boolean value or \"parallel\""
 msgstr "%s потребує логічне значення або \"parallel\""
 
-#: commands/tablecmds.c:255 commands/tablecmds.c:297
+#: commands/tablecmds.c:258 commands/tablecmds.c:300
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "таблиця \"%s\" не існує"
 
-#: commands/tablecmds.c:256 commands/tablecmds.c:298
+#: commands/tablecmds.c:259 commands/tablecmds.c:301
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "таблиця \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:258 commands/tablecmds.c:300
+#: commands/tablecmds.c:261 commands/tablecmds.c:303
 msgid "Use DROP TABLE to remove a table."
 msgstr "Використайте DROP TABLE для видалення таблиці."
 
-#: commands/tablecmds.c:261
+#: commands/tablecmds.c:264
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "послідовність \"%s\" не існує"
 
-#: commands/tablecmds.c:262
+#: commands/tablecmds.c:265
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "послідовність \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:264
+#: commands/tablecmds.c:267
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Використайте DROP SEQUENCE, щоб видалити послідовність."
 
-#: commands/tablecmds.c:267
+#: commands/tablecmds.c:270
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "подання \"%s\" не існує"
 
-#: commands/tablecmds.c:268
+#: commands/tablecmds.c:271
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "подання \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:270
+#: commands/tablecmds.c:273
 msgid "Use DROP VIEW to remove a view."
 msgstr "Використайте DROP VIEW для видалення подання."
 
-#: commands/tablecmds.c:273
+#: commands/tablecmds.c:276
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "матеріалізоване подання \"%s\" не існує"
 
-#: commands/tablecmds.c:274
+#: commands/tablecmds.c:277
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "матеріалізоване подання \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:276
+#: commands/tablecmds.c:279
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Використайте DROP MATERIALIZED VIEW, щоб видалити матеріалізоване подання."
 
-#: commands/tablecmds.c:279 commands/tablecmds.c:303 commands/tablecmds.c:19617
-#: parser/parse_utilcmd.c:2251
+#: commands/tablecmds.c:282 commands/tablecmds.c:306 commands/tablecmds.c:21651
+#: parser/parse_utilcmd.c:2428
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "індекс \"%s\" не існує"
 
-#: commands/tablecmds.c:280 commands/tablecmds.c:304
+#: commands/tablecmds.c:283 commands/tablecmds.c:307
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "індекс \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:282 commands/tablecmds.c:306
+#: commands/tablecmds.c:285 commands/tablecmds.c:309
 msgid "Use DROP INDEX to remove an index."
 msgstr "Використайте DROP INDEX, щоб видалити індекс."
 
-#: commands/tablecmds.c:287
+#: commands/tablecmds.c:290
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\"  не є типом"
 
-#: commands/tablecmds.c:288
+#: commands/tablecmds.c:291
 msgid "Use DROP TYPE to remove a type."
 msgstr "Використайте DROP TYPE, щоб видалити тип."
 
-#: commands/tablecmds.c:291 commands/tablecmds.c:14223
-#: commands/tablecmds.c:16783
+#: commands/tablecmds.c:294 commands/tablecmds.c:15975
+#: commands/tablecmds.c:18676
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "зовнішня таблиця \"%s\" не існує"
 
-#: commands/tablecmds.c:292
+#: commands/tablecmds.c:295
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "зовнішня таблиця \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:294
+#: commands/tablecmds.c:297
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Використайте DROP FOREIGN TABLE щоб видалити сторонню таблицю."
 
-#: commands/tablecmds.c:717
+#: commands/tablecmds.c:802
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT можна використовувати лише для тимчасових таблиць"
 
-#: commands/tablecmds.c:748
+#: commands/tablecmds.c:819
+#, c-format
+msgid "partitioned tables cannot be unlogged"
+msgstr "секціоновані таблиці не можуть бути нежурнальованими"
+
+#: commands/tablecmds.c:839
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "неможливо створити тимчасову таблицю в межах операції з обмеженням безпеки"
 
-#: commands/tablecmds.c:784 commands/tablecmds.c:15642
+#: commands/tablecmds.c:875 commands/tablecmds.c:17400
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "відношення \"%s\" буде успадковуватись більш ніж один раз"
 
-#: commands/tablecmds.c:1050
+#: commands/tablecmds.c:1133
 #, c-format
 msgid "\"%s\" is not partitioned"
 msgstr "\"%s\" не секціоновано"
 
-#: commands/tablecmds.c:1144
+#: commands/tablecmds.c:1227
 #, c-format
 msgid "cannot partition using more than %d columns"
 msgstr "число стовпців в ключі секціонування не може перевищувати %d"
 
-#: commands/tablecmds.c:1200
+#: commands/tablecmds.c:1283
 #, c-format
 msgid "cannot create foreign partition of partitioned table \"%s\""
 msgstr "не можна створити зовнішню секцію в секціонованій таблиці \"%s\""
 
-#: commands/tablecmds.c:1202
+#: commands/tablecmds.c:1285
 #, c-format
 msgid "Table \"%s\" contains indexes that are unique."
 msgstr "Таблиця \"%s\" містить індекси, які унікальні."
 
-#: commands/tablecmds.c:1321 commands/tablecmds.c:13239
+#: commands/tablecmds.c:1415 commands/tablecmds.c:14952
 #, c-format
 msgid "too many array dimensions"
 msgstr "занадто багато вимірів масиву"
 
-#: commands/tablecmds.c:1326 parser/parse_clause.c:774
-#: parser/parse_relation.c:1912
+#: commands/tablecmds.c:1420 parser/parse_clause.c:772
+#: parser/parse_relation.c:1929
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "стовпець\"%s\" не може бути оголошений SETOF"
 
-#: commands/tablecmds.c:1472
+#: commands/tablecmds.c:1549
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY не підтримує видалення кількох об'єктів"
 
-#: commands/tablecmds.c:1476
+#: commands/tablecmds.c:1553
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY не підтримує режим CASCADE"
 
-#: commands/tablecmds.c:1580
+#: commands/tablecmds.c:1657
 #, c-format
 msgid "cannot drop partitioned index \"%s\" concurrently"
 msgstr "неможливо видалити секціонований індекс \"%s\" паралельно"
 
-#: commands/tablecmds.c:1868
+#: commands/tablecmds.c:1945
 #, c-format
 msgid "cannot truncate only a partitioned table"
 msgstr "скоротити тільки секціоновану таблицю не можна"
 
-#: commands/tablecmds.c:1869
+#: commands/tablecmds.c:1946
 #, c-format
 msgid "Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly."
 msgstr "Не вказуйте ключове слово ONLY  або використайте TRUNCATE ONLY безпосередньо для секцій."
 
-#: commands/tablecmds.c:1942
+#: commands/tablecmds.c:2019
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "скорочення поширюється на таблицю \"%s\""
 
-#: commands/tablecmds.c:2303
+#: commands/tablecmds.c:2380
 #, c-format
 msgid "cannot truncate foreign table \"%s\""
 msgstr "скоротити зовнішню таблицю \"%s\" не можна"
 
-#: commands/tablecmds.c:2360
+#: commands/tablecmds.c:2437
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "тимчасові таблиці інших сеансів не можна скоротити"
 
-#: commands/tablecmds.c:2589 commands/tablecmds.c:15539
+#: commands/tablecmds.c:2675 commands/tablecmds.c:17297
 #, c-format
 msgid "cannot inherit from partitioned table \"%s\""
 msgstr "успадкування від секціонованої таблиці \"%s\" не допускається"
 
-#: commands/tablecmds.c:2594
+#: commands/tablecmds.c:2680
 #, c-format
 msgid "cannot inherit from partition \"%s\""
 msgstr "успадкування від розділу \"%s\" не допускається"
 
-#: commands/tablecmds.c:2602 parser/parse_utilcmd.c:2481
-#: parser/parse_utilcmd.c:2623
+#: commands/tablecmds.c:2688 parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2887
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "успадковане відношення \"%s\" не є таблицею або сторонньою таблицею"
 
-#: commands/tablecmds.c:2614
+#: commands/tablecmds.c:2700
 #, c-format
 msgid "cannot create a temporary relation as partition of permanent relation \"%s\""
 msgstr "створити тимчасове відношення як секцію постійного відношення\"%s\" не можна"
 
-#: commands/tablecmds.c:2623 commands/tablecmds.c:15518
+#: commands/tablecmds.c:2709 commands/tablecmds.c:17276
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "тимчасове відношення \"%s\" не може успадковуватись"
 
-#: commands/tablecmds.c:2633 commands/tablecmds.c:15526
+#: commands/tablecmds.c:2719 commands/tablecmds.c:17284
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "успадкування від тимчасового відношення іншого сеансу неможливе"
 
-#: commands/tablecmds.c:2774 commands/tablecmds.c:2828
-#: commands/tablecmds.c:12922 parser/parse_utilcmd.c:1265
-#: parser/parse_utilcmd.c:1308 parser/parse_utilcmd.c:1735
-#: parser/parse_utilcmd.c:1843
+#: commands/tablecmds.c:2874 commands/tablecmds.c:2928
+#: commands/tablecmds.c:14635 parser/parse_utilcmd.c:1440
+#: parser/parse_utilcmd.c:1484 parser/parse_utilcmd.c:1916
+#: parser/parse_utilcmd.c:2024
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "перетворити посилання на тип усього рядка таблиці не можна"
 
-#: commands/tablecmds.c:2775 parser/parse_utilcmd.c:1266
+#: commands/tablecmds.c:2875 parser/parse_utilcmd.c:1441
 #, c-format
 msgid "Generation expression for column \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Вираз генерації для стовпця \"%s\" містить посилання на весь рядок на таблицю \"%s\"."
 
-#: commands/tablecmds.c:2829 parser/parse_utilcmd.c:1309
+#: commands/tablecmds.c:2929 parser/parse_utilcmd.c:1485
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Обмеження \"%s\" посилається на тип усього рядка в таблиці \"%s\"."
 
-#: commands/tablecmds.c:2939 commands/tablecmds.c:3210
+#: commands/tablecmds.c:3051 commands/tablecmds.c:3345
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies default"
 msgstr "стовпець \"%s\" успадковується із згенерованого стовпця, але вказує за замовчуванням"
 
-#: commands/tablecmds.c:2944 commands/tablecmds.c:3215
+#: commands/tablecmds.c:3056 commands/tablecmds.c:3350
 #, c-format
 msgid "column \"%s\" inherits from generated column but specifies identity"
 msgstr "стовпець \"%s\" успадковується із згенерованого стовпця, але вказує ідентичність"
 
-#: commands/tablecmds.c:2952 commands/tablecmds.c:3223
+#: commands/tablecmds.c:3064 commands/tablecmds.c:3358
 #, c-format
 msgid "child column \"%s\" specifies generation expression"
 msgstr "дочірній стовпець \"%s\" визначає вираз генерації"
 
-#: commands/tablecmds.c:2954 commands/tablecmds.c:3225
+#: commands/tablecmds.c:3066 commands/tablecmds.c:3360
 #, c-format
 msgid "A child table column cannot be generated unless its parent column is."
 msgstr "Стовпець дочірньої таблиці не може бути створений, якщо не створено стовпець батьківської таблиці."
 
-#: commands/tablecmds.c:3000
+#: commands/tablecmds.c:3072 commands/tablecmds.c:3366
+#: commands/tablecmds.c:17562
+#, c-format
+msgid "column \"%s\" inherits from generated column of different kind"
+msgstr "стовпець \"%s\" успадковує від генерованого стовпця іншого типу"
+
+#: commands/tablecmds.c:3074 commands/tablecmds.c:3368
+#: commands/tablecmds.c:17563
+#, c-format
+msgid "Parent column is %s, child column is %s."
+msgstr "Батьківський стовпець - %s, дочірній стовпець - %s."
+
+#: commands/tablecmds.c:3121
 #, c-format
 msgid "column \"%s\" inherits conflicting generation expressions"
 msgstr "стовпець \"%s\" успадковує конфліктуючи вирази генерації"
 
-#: commands/tablecmds.c:3002
+#: commands/tablecmds.c:3123
 #, c-format
 msgid "To resolve the conflict, specify a generation expression explicitly."
 msgstr "Щоб вирішити цей конфлікт, явно вкажіть вираз генерації."
 
-#: commands/tablecmds.c:3006
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "стовпець \"%s\" успадковує конфліктні значення за замовчуванням"
 
-#: commands/tablecmds.c:3008
+#: commands/tablecmds.c:3129
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Для усунення конфлікту вкажіть бажане значення за замовчуванням."
 
-#: commands/tablecmds.c:3063
+#: commands/tablecmds.c:3196
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr "ім'я перевірочного обмеження \"%s\" з'являється декілька разів, але з різними виразами"
 
-#: commands/tablecmds.c:3114
+#: commands/tablecmds.c:3249
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "злиття стовпця \"%s\" з успадкованим визначенням"
 
-#: commands/tablecmds.c:3118
+#: commands/tablecmds.c:3253
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "переміщення і злиття стовпця \"%s\" з успадкованим визначенням"
 
-#: commands/tablecmds.c:3119
+#: commands/tablecmds.c:3254
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "Визначений користувачем стовпець переміщений в позицію успадкованого стовпця."
 
-#: commands/tablecmds.c:3131
+#: commands/tablecmds.c:3266
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "конфлікт типів в стовпці \"%s\""
 
-#: commands/tablecmds.c:3133 commands/tablecmds.c:3167
-#: commands/tablecmds.c:3183 commands/tablecmds.c:3290
-#: commands/tablecmds.c:3323 commands/tablecmds.c:3339
-#: parser/parse_coerce.c:2155 parser/parse_coerce.c:2175
-#: parser/parse_coerce.c:2195 parser/parse_coerce.c:2216
-#: parser/parse_coerce.c:2271 parser/parse_coerce.c:2305
-#: parser/parse_coerce.c:2381 parser/parse_coerce.c:2412
-#: parser/parse_coerce.c:2451 parser/parse_coerce.c:2518
-#: parser/parse_param.c:223
+#: commands/tablecmds.c:3268 commands/tablecmds.c:3302
+#: commands/tablecmds.c:3318 commands/tablecmds.c:3434
+#: commands/tablecmds.c:3462 commands/tablecmds.c:3478
+#: parser/parse_coerce.c:2190 parser/parse_coerce.c:2210
+#: parser/parse_coerce.c:2230 parser/parse_coerce.c:2251
+#: parser/parse_coerce.c:2306 parser/parse_coerce.c:2340
+#: parser/parse_coerce.c:2416 parser/parse_coerce.c:2447
+#: parser/parse_coerce.c:2486 parser/parse_coerce.c:2553
+#: parser/parse_param.c:224
 #, c-format
 msgid "%s versus %s"
 msgstr "%s проти %s"
 
-#: commands/tablecmds.c:3145
+#: commands/tablecmds.c:3280
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "конфлікт правил сортування в стовпці \"%s\""
 
-#: commands/tablecmds.c:3147 commands/tablecmds.c:3309
-#: commands/tablecmds.c:7057
+#: commands/tablecmds.c:3282 commands/tablecmds.c:3448
+#: commands/tablecmds.c:7277 parser/parse_expr.c:4783
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\" проти \"%s\""
 
-#: commands/tablecmds.c:3165
+#: commands/tablecmds.c:3300
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "конфлікт параметрів зберігання в стовпці \"%s\""
 
-#: commands/tablecmds.c:3181 commands/tablecmds.c:3337
+#: commands/tablecmds.c:3316 commands/tablecmds.c:3476
 #, c-format
 msgid "column \"%s\" has a compression method conflict"
 msgstr "конфлікт методів стиснення в стовпці \"%s\""
 
-#: commands/tablecmds.c:3276
+#: commands/tablecmds.c:3420
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "злиття декількох успадкованих визначень стовпця \"%s\""
 
-#: commands/tablecmds.c:3288
+#: commands/tablecmds.c:3432
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "конфлікт типів в успадкованому стовпці \"%s\""
 
-#: commands/tablecmds.c:3307
+#: commands/tablecmds.c:3446
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "конфлікт правил сортування в успадкованому стовпці \"%s\""
 
-#: commands/tablecmds.c:3321
+#: commands/tablecmds.c:3460
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "конфлікт параметрів зберігання в успадкованому стовпці \"%s\""
 
-#: commands/tablecmds.c:3349
+#: commands/tablecmds.c:3488
 #, c-format
 msgid "inherited column \"%s\" has a generation conflict"
 msgstr "конфлікт генерування в успадкованому стовпці \"%s\""
 
-#: commands/tablecmds.c:3580
+#: commands/tablecmds.c:3719
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "переміщувати тимчасові таблиці інших сеансів не можна"
 
-#: commands/tablecmds.c:3650
+#: commands/tablecmds.c:3792
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "перейменувати стовпець типізованої таблиці не можна"
 
-#: commands/tablecmds.c:3669
+#: commands/tablecmds.c:3811
 #, c-format
 msgid "cannot rename columns of relation \"%s\""
 msgstr "перейменувати стовпці відношення %s не можна"
 
-#: commands/tablecmds.c:3764
+#: commands/tablecmds.c:3906
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "успадкований стовпець \"%s\" повинен бути перейменований в дочірніх таблицях також"
 
-#: commands/tablecmds.c:3796
+#: commands/tablecmds.c:3938
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "не можна перейменувати системний стовпець \"%s\""
 
-#: commands/tablecmds.c:3811
+#: commands/tablecmds.c:3953
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "не можна перейменувати успадкований стовпець \"%s\""
 
-#: commands/tablecmds.c:3963
+#: commands/tablecmds.c:4108
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "успадковане обмеження \"%s\" повинно бути перейменовано в дочірніх таблицях також"
 
-#: commands/tablecmds.c:3970
+#: commands/tablecmds.c:4115
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "не можна перейменувати успадковане обмеження \"%s\""
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4267
+#: commands/tablecmds.c:4415
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "не можна виконати %s \"%s\", тому що цей об'єкт використовується активними запитами в цьому сеансі"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:4276
+#: commands/tablecmds.c:4424
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "не можна виконати %s \"%s\",  тому що з цим об'єктом зв'язані очікуванні події тригерів"
 
-#: commands/tablecmds.c:4302
+#: commands/tablecmds.c:4450
 #, c-format
 msgid "cannot alter temporary tables of other sessions"
 msgstr "не можна змінювати тимчасові таблиці з інших сеансів"
 
-#: commands/tablecmds.c:4775
+#: commands/tablecmds.c:4914
 #, c-format
 msgid "cannot alter partition \"%s\" with an incomplete detach"
 msgstr "не можна змінити розділ \"%s\" з неповним відключенням"
 
-#: commands/tablecmds.c:4979 commands/tablecmds.c:4994
+#: commands/tablecmds.c:5143
 #, c-format
 msgid "cannot change persistence setting twice"
 msgstr "неможливо двічі змінити параметр стійкості"
 
-#: commands/tablecmds.c:5015
+#: commands/tablecmds.c:5160
 #, c-format
 msgid "cannot have multiple SET ACCESS METHOD subcommands"
 msgstr "неможливо мати декілька підкоманд SET ACCESS METHOD"
 
-#: commands/tablecmds.c:5745
+#: commands/tablecmds.c:5894
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "перезаписати системне відношення \"%s\" не можна"
 
-#: commands/tablecmds.c:5751
+#: commands/tablecmds.c:5900
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "перезаписати таблицю \"%s\", що використовується як таблиця каталогу, не можна"
 
-#: commands/tablecmds.c:5763
+#: commands/tablecmds.c:5912
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "неможливо перезаписати тимчасові таблиці інших сеансів"
 
-#: commands/tablecmds.c:6258
+#: commands/tablecmds.c:6448 commands/tablecmds.c:6468
 #, c-format
 msgid "column \"%s\" of relation \"%s\" contains null values"
 msgstr "стовпець \"%s\" відношення \"%s\" містить null значення"
 
-#: commands/tablecmds.c:6275
+#: commands/tablecmds.c:6485
 #, c-format
 msgid "check constraint \"%s\" of relation \"%s\" is violated by some row"
 msgstr "перевірка обмеження \"%s\" відношення \"%s\" порушується деяким рядком"
 
-#: commands/tablecmds.c:6294 partitioning/partbounds.c:3387
+#: commands/tablecmds.c:6505 partitioning/partbounds.c:3387
 #, c-format
 msgid "updated partition constraint for default partition \"%s\" would be violated by some row"
 msgstr "оновлене обмеження секції для секції за замовчуванням \"%s\" буде порушено деякими рядками"
 
-#: commands/tablecmds.c:6300
+#: commands/tablecmds.c:6511
 #, c-format
 msgid "partition constraint of relation \"%s\" is violated by some row"
 msgstr "обмеження секції відношення \"%s\" порушується деяким рядком"
 
 #. translator: %s is a group of some SQL keywords
-#: commands/tablecmds.c:6565
+#: commands/tablecmds.c:6776
 #, c-format
 msgid "ALTER action %s cannot be performed on relation \"%s\""
 msgstr "Дію ALTER %s не можна виконати на відношенні \"%s\""
 
-#: commands/tablecmds.c:6820 commands/tablecmds.c:6827
+#: commands/tablecmds.c:7031 commands/tablecmds.c:7038
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "неможливо змінити тип \"%s\", тому що стовпець \"%s.%s\" використовує його"
 
-#: commands/tablecmds.c:6834
+#: commands/tablecmds.c:7045
 #, c-format
 msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "неможливо змінити сторонню таблицю \"%s\", тому що стовпець \"%s.%s\" використовує тип її рядка"
 
-#: commands/tablecmds.c:6841
+#: commands/tablecmds.c:7052
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "неможливо змінити таблицю \"%s\", тому що стовпець \"%s.%s\" використовує тип її рядка"
 
-#: commands/tablecmds.c:6897
+#: commands/tablecmds.c:7108
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "неможливо змінити тип \"%s\", тому що це тип типізованої таблиці"
 
-#: commands/tablecmds.c:6899
+#: commands/tablecmds.c:7110
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Щоб змінити типізовані таблиці, використайте також ALTER ... CASCADE."
 
-#: commands/tablecmds.c:6945
+#: commands/tablecmds.c:7156
+#, c-format
+msgid "type %s is the row type of another table"
+msgstr "тип %s є типом рядка іншої таблиці"
+
+#: commands/tablecmds.c:7158
+#, c-format
+msgid "A typed table must use a stand-alone composite type created with CREATE TYPE."
+msgstr "Типізована таблиця повинна використовувати окремий складений тип, створений за допомогою CREATE TYPE."
+
+#: commands/tablecmds.c:7163
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "тип %s не є складеним"
 
-#: commands/tablecmds.c:6972
+#: commands/tablecmds.c:7190
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "неможливо додати стовпець до типізованої таблиці"
 
-#: commands/tablecmds.c:7020
+#: commands/tablecmds.c:7240
 #, c-format
 msgid "cannot add column to a partition"
 msgstr "неможливо додати стовпець до розділу"
 
-#: commands/tablecmds.c:7049 commands/tablecmds.c:15757
+#: commands/tablecmds.c:7269 commands/tablecmds.c:17518
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "дочірня таблиця \"%s\" має інший тип для стовпця \"%s\""
 
-#: commands/tablecmds.c:7055 commands/tablecmds.c:15763
+#: commands/tablecmds.c:7275 commands/tablecmds.c:17524
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "дочірня таблиця \"%s\" має інше правило сортування для стовпця \"%s\""
 
-#: commands/tablecmds.c:7073
+#: commands/tablecmds.c:7293
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "об'єднання визначення стовпця \"%s\" для нащадка \"%s\""
 
-#: commands/tablecmds.c:7126
+#: commands/tablecmds.c:7346
 #, c-format
 msgid "cannot recursively add identity column to table that has child tables"
 msgstr "неможливо додати стовпець ідентифікації в таблицю, яка має дочірні таблиці"
 
-#: commands/tablecmds.c:7339
+#: commands/tablecmds.c:7593
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "стовпець також повинен бути доданий до дочірніх таблиць"
 
-#: commands/tablecmds.c:7417
+#: commands/tablecmds.c:7671
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists, skipping"
 msgstr "стовпець \"%s\" відношення \"%s\" вже існує, пропускається"
 
-#: commands/tablecmds.c:7424
+#: commands/tablecmds.c:7678
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "стовпець \"%s\" відношення \"%s\" вже існує"
 
-#: commands/tablecmds.c:7490 commands/tablecmds.c:12550
-#, c-format
-msgid "cannot remove constraint from only the partitioned table when partitions exist"
-msgstr "неможливо видалити обмеження тільки з секціонованої таблиці, коли існують секції"
-
-#: commands/tablecmds.c:7491 commands/tablecmds.c:7805
-#: commands/tablecmds.c:7983 commands/tablecmds.c:8090
-#: commands/tablecmds.c:8207 commands/tablecmds.c:9026
-#: commands/tablecmds.c:12551
-#, c-format
-msgid "Do not specify the ONLY keyword."
-msgstr "Не вказуйте ключове слово ONLY."
-
-#: commands/tablecmds.c:7527 commands/tablecmds.c:7731
-#: commands/tablecmds.c:7873 commands/tablecmds.c:8005
-#: commands/tablecmds.c:8134 commands/tablecmds.c:8228
-#: commands/tablecmds.c:8329 commands/tablecmds.c:8486
-#: commands/tablecmds.c:8639 commands/tablecmds.c:8720
-#: commands/tablecmds.c:8854 commands/tablecmds.c:12704
-#: commands/tablecmds.c:14246 commands/tablecmds.c:16872
+#: commands/tablecmds.c:7769 commands/tablecmds.c:7936
+#: commands/tablecmds.c:8137 commands/tablecmds.c:8268
+#: commands/tablecmds.c:8422 commands/tablecmds.c:8516
+#: commands/tablecmds.c:8619 commands/tablecmds.c:8815
+#: commands/tablecmds.c:8981 commands/tablecmds.c:9072
+#: commands/tablecmds.c:9206 commands/tablecmds.c:14407
+#: commands/tablecmds.c:15998 commands/tablecmds.c:18765
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "не можна змінити системний стовпець \"%s\""
 
-#: commands/tablecmds.c:7533 commands/tablecmds.c:7879
+#: commands/tablecmds.c:7775 commands/tablecmds.c:8143
+#: commands/tablecmds.c:14168
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is an identity column"
 msgstr "стовпець \"%s\" відношення \"%s\" є стовпцем ідентифікації"
 
-#: commands/tablecmds.c:7574
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "стовпець \"%s\" входить до первинного ключа"
-
-#: commands/tablecmds.c:7579
-#, c-format
-msgid "column \"%s\" is in index used as replica identity"
-msgstr "стовпець \"%s\" в індексі, що використовується як ідентифікація репліки"
-
-#: commands/tablecmds.c:7602
+#: commands/tablecmds.c:7792
 #, c-format
 msgid "column \"%s\" is marked NOT NULL in parent table"
 msgstr "стовпець \"%s\" в батьківській таблиці позначений як NOT NULL"
 
-#: commands/tablecmds.c:7802 commands/tablecmds.c:9510
+#: commands/tablecmds.c:8014 commands/tablecmds.c:10013
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "обмеження повинно бути додано у дочірні таблиці також"
 
-#: commands/tablecmds.c:7803
+#: commands/tablecmds.c:8015 commands/tablecmds.c:8246
+#: commands/tablecmds.c:8378 commands/tablecmds.c:8495
+#: commands/tablecmds.c:9379 commands/tablecmds.c:12207
 #, c-format
-msgid "Column \"%s\" of relation \"%s\" is not already NOT NULL."
-msgstr "Стовпець \"%s\" відношення \"%s\" вже не NOT NULL."
+msgid "Do not specify the ONLY keyword."
+msgstr "Не вказуйте ключове слово ONLY."
 
-#: commands/tablecmds.c:7888
+#: commands/tablecmds.c:8152
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is a generated column"
 msgstr "стовпець \"%s\" відношення \"%s\" є згенерованим стовпцем"
 
-#: commands/tablecmds.c:7982
+#: commands/tablecmds.c:8245
 #, c-format
 msgid "cannot add identity to a column of only the partitioned table"
 msgstr "не може додати ідентифікатор до стовпця лише розділеної таблиці"
 
-#: commands/tablecmds.c:7988
+#: commands/tablecmds.c:8251
 #, c-format
 msgid "cannot add identity to a column of a partition"
 msgstr "не може додати ідентифікатор до стовпця розділу"
 
-#: commands/tablecmds.c:8016
+#: commands/tablecmds.c:8279
 #, c-format
 msgid "column \"%s\" of relation \"%s\" must be declared NOT NULL before identity can be added"
 msgstr "стовпець \"%s\" відношення \"%s\" повинен бути оголошений як NOT NULL, щоб додати ідентифікацію"
 
-#: commands/tablecmds.c:8022
+#: commands/tablecmds.c:8310
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is already an identity column"
 msgstr "стовпець \"%s\" відношення \"%s\" вже є стовпцем ідентифікації"
 
-#: commands/tablecmds.c:8028
+#: commands/tablecmds.c:8316
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already has a default value"
 msgstr "стовпець \"%s\" відношення \"%s\" вже має значення за замовчуванням"
 
-#: commands/tablecmds.c:8089
+#: commands/tablecmds.c:8377
 #, c-format
 msgid "cannot change identity column of only the partitioned table"
 msgstr "не можна змінювати стовпець ідентичності лише в розбитій на розділи таблиці"
 
-#: commands/tablecmds.c:8095
+#: commands/tablecmds.c:8383
 #, c-format
 msgid "cannot change identity column of a partition"
 msgstr "не можна змінити стовпець ідентичності розділу"
 
-#: commands/tablecmds.c:8140 commands/tablecmds.c:8236
+#: commands/tablecmds.c:8428 commands/tablecmds.c:8524
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column"
 msgstr "стовпець \"%s\" відношення \"%s\" не є стовпцем ідентифікації"
 
-#: commands/tablecmds.c:8206
+#: commands/tablecmds.c:8494
 #, c-format
 msgid "cannot drop identity from a column of only the partitioned table"
 msgstr "не можна вилучити ідентифікатор зі стовпця лише розбитої на розділи таблиці"
 
-#: commands/tablecmds.c:8212
+#: commands/tablecmds.c:8500
 #, c-format
 msgid "cannot drop identity from a column of a partition"
 msgstr "не можна вилучити ідентифікатор зі стовпця розділу"
 
-#: commands/tablecmds.c:8241
+#: commands/tablecmds.c:8529
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not an identity column, skipping"
 msgstr "стовпець \"%s\" відношення \"%s\" не є стовпцем ідентифікації, пропускається"
 
-#: commands/tablecmds.c:8335
+#: commands/tablecmds.c:8626 commands/tablecmds.c:8836
 #, c-format
 msgid "column \"%s\" of relation \"%s\" is not a generated column"
 msgstr "стовпець \"%s\" відношення \"%s\" не є згенерованим стовпцем"
 
-#: commands/tablecmds.c:8433
+#: commands/tablecmds.c:8637
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables with check constraints"
+msgstr "ALTER TABLE / SET EXPRESSION не підтримується для віртуальних генерованих стовпців у таблицях з обмеженнями перевірки"
+
+#: commands/tablecmds.c:8638 commands/tablecmds.c:8656
+#: commands/tablecmds.c:8828
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is a virtual generated column."
+msgstr "Стовпець \"%s\" відношення \"%s\" є віртуальним генерованим стовпцем."
+
+#: commands/tablecmds.c:8655
+#, c-format
+msgid "ALTER TABLE / SET EXPRESSION is not supported for virtual generated columns in tables that are part of a publication"
+msgstr "ALTER TABLE / SET EXPRESSION не підтримується для віртуальних генерованих стовпців у таблицях, що є частиною публікації"
+
+#: commands/tablecmds.c:8762
 #, c-format
 msgid "ALTER TABLE / DROP EXPRESSION must be applied to child tables too"
 msgstr "ALTER TABLE / DROP EXPRESSION повинен бути застосований і до дочірніх таблиць"
 
-#: commands/tablecmds.c:8455
+#: commands/tablecmds.c:8784
 #, c-format
 msgid "cannot drop generation expression from inherited column"
 msgstr "не можна видалити вираз генерації з успадкованого стовпця"
 
-#: commands/tablecmds.c:8494
+#: commands/tablecmds.c:8827
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column"
-msgstr "стовпець \"%s\" відношення \"%s\" не є збереженим згенерованим стовпцем"
+msgid "ALTER TABLE / DROP EXPRESSION is not supported for virtual generated columns"
+msgstr "ALTER TABLE / DROP EXPRESSION не підтримується для віртуальних генерованих стовпців"
 
-#: commands/tablecmds.c:8499
+#: commands/tablecmds.c:8841
 #, c-format
-msgid "column \"%s\" of relation \"%s\" is not a stored generated column, skipping"
-msgstr "стовпець \"%s\" відношення \"%s\" не є збереженим згенерованим стовпцем, пропускається"
+msgid "column \"%s\" of relation \"%s\" is not a generated column, skipping"
+msgstr "стовпець \"%s\" відношення \"%s\" не є генерованим стовпцем, пропускаємо"
 
-#: commands/tablecmds.c:8577
+#: commands/tablecmds.c:8919
 #, c-format
 msgid "cannot refer to non-index column by number"
 msgstr "не можна посилатись на неіндексований стовпець за номером"
 
-#: commands/tablecmds.c:8629
+#: commands/tablecmds.c:8971
 #, c-format
 msgid "column number %d of relation \"%s\" does not exist"
 msgstr "стовпець з номером %d відношення %s не існує"
 
-#: commands/tablecmds.c:8648
+#: commands/tablecmds.c:8991
+#, c-format
+msgid "cannot alter statistics on virtual generated column \"%s\""
+msgstr "не можна змінити статистику віртуального генерованого стовпця \"%s\""
+
+#: commands/tablecmds.c:9000
 #, c-format
 msgid "cannot alter statistics on included column \"%s\" of index \"%s\""
 msgstr "змінити статистику включеного стовпця \"%s\" індексу \"%s\" не можна"
 
-#: commands/tablecmds.c:8653
+#: commands/tablecmds.c:9005
 #, c-format
 msgid "cannot alter statistics on non-expression column \"%s\" of index \"%s\""
 msgstr "змінити статистику невираженого стовпця \"%s\" індексу \"%s\" не можна"
 
-#: commands/tablecmds.c:8655
+#: commands/tablecmds.c:9007
 #, c-format
 msgid "Alter statistics on table column instead."
 msgstr "Замість цього змініть статистику стовпця в таблиці."
 
-#: commands/tablecmds.c:8901
+#: commands/tablecmds.c:9253
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "не можна видалити стовпець з типізованої таблиці"
 
-#: commands/tablecmds.c:8964
+#: commands/tablecmds.c:9317
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "стовпець \"%s\" відношення \"%s\" не існує, пропускається"
 
-#: commands/tablecmds.c:8977
+#: commands/tablecmds.c:9330
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "не можна видалити системний стовпець \"%s\""
 
-#: commands/tablecmds.c:8987
+#: commands/tablecmds.c:9340
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "не можна видалити успадкований стовпець \"%s\""
 
-#: commands/tablecmds.c:9000
+#: commands/tablecmds.c:9353
 #, c-format
 msgid "cannot drop column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "не можна видалити стовпець \"%s\", тому що він є частиною ключа секції відношення \"%s\""
 
-#: commands/tablecmds.c:9025
+#: commands/tablecmds.c:9378
 #, c-format
 msgid "cannot drop column from only the partitioned table when partitions exist"
 msgstr "видалити стовпець тільки з секціонованої таблиці, коли існують секції, не можна"
 
-#: commands/tablecmds.c:9230
+#: commands/tablecmds.c:9543
+#, c-format
+msgid "column \"%s\" of table \"%s\" is not marked NOT NULL"
+msgstr "стовпець \"%s\" таблиці \"%s\" не позначений NOT NULL"
+
+#: commands/tablecmds.c:9579 commands/tablecmds.c:9591
+#, c-format
+msgid "cannot create primary key on column \"%s\""
+msgstr "не можна створити первинний ключ на стовпці \"%s\""
+
+#. translator: fourth %s is a constraint characteristic such as NOT VALID
+#: commands/tablecmds.c:9581 commands/tablecmds.c:9593
+#, c-format
+msgid "The constraint \"%s\" on column \"%s\" of table \"%s\", marked %s, is incompatible with a primary key."
+msgstr "Обмеження \"%s\" на стовпці \"%s\" таблиці \"%s\", позначене %s, несумісне з первинним ключем."
+
+#: commands/tablecmds.c:9717
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables"
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX не підтримується із секціонованими таблицями"
 
-#: commands/tablecmds.c:9255
+#: commands/tablecmds.c:9742
 #, 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:9592
+#: commands/tablecmds.c:10100
 #, c-format
 msgid "cannot use ONLY for foreign key on partitioned table \"%s\" referencing relation \"%s\""
 msgstr "не можна використати ONLY для стороннього ключа в секціонованій таблиці \"%s\", який посилається на відношення \"%s\""
 
-#: commands/tablecmds.c:9598
-#, c-format
-msgid "cannot add NOT VALID foreign key on partitioned table \"%s\" referencing relation \"%s\""
-msgstr "не можна додати сторонній ключ з характеристикою NOT VALID в секціоновану таблицю \"%s\", який посилається на відношення \"%s\""
-
-#: commands/tablecmds.c:9601
-#, c-format
-msgid "This feature is not yet supported on partitioned tables."
-msgstr "Ця функція ще не підтримується з секціонованими таблицями."
-
-#: commands/tablecmds.c:9608 commands/tablecmds.c:10064
+#: commands/tablecmds.c:10108 commands/tablecmds.c:10735
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "вказане відношення \"%s\" не є таблицею"
 
-#: commands/tablecmds.c:9631
+#: commands/tablecmds.c:10131
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "обмеження в постійних таблицях можуть посилатись лише на постійні таблиці"
 
-#: commands/tablecmds.c:9638
+#: commands/tablecmds.c:10138
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "обмеження в нежурнальованих таблицях можуть посилатись тільки на постійні або нежурналюємі таблиці"
 
-#: commands/tablecmds.c:9644
+#: commands/tablecmds.c:10144
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "обмеження в тимчасових таблицях можуть посилатись лише на тимчасові таблиці"
 
-#: commands/tablecmds.c:9648
+#: commands/tablecmds.c:10148
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "обмеження в тимчасових таблицях повинні посилатись лише на тичасові таблиці поточного сеансу"
 
-#: commands/tablecmds.c:9712 commands/tablecmds.c:9718
+#: commands/tablecmds.c:10163 commands/tablecmds.c:10191
+#, c-format
+msgid "foreign key uses PERIOD on the referenced table but not the referencing table"
+msgstr "зовнішній ключ використовує PERIOD на вказаній таблиці, але не на таблиці, що посилається"
+
+#: commands/tablecmds.c:10203
+#, c-format
+msgid "foreign key uses PERIOD on the referencing table but not the referenced table"
+msgstr "зовнішній ключ використовує PERIOD на таблиці, що посилається, але не на вказаній таблиці"
+
+#: commands/tablecmds.c:10217
+#, c-format
+msgid "foreign key must use PERIOD when referencing a primary key using WITHOUT OVERLAPS"
+msgstr "зовнішній ключ повинен використовувати PERIOD при посиланні на первинний ключ, що використовує WITHOUT OVERLAPS"
+
+#: commands/tablecmds.c:10241 commands/tablecmds.c:10247
 #, c-format
 msgid "invalid %s action for foreign key constraint containing generated column"
 msgstr "неприпустима дія %s для обмеження зовнішнього ключа, який містить згеренований стовпець"
 
-#: commands/tablecmds.c:9734
+#: commands/tablecmds.c:10262
+#, c-format
+msgid "foreign key constraints on virtual generated columns are not supported"
+msgstr "обмеження зовнішнього ключа на віртуальних генерованих стовпцях не підтримуються"
+
+#: commands/tablecmds.c:10276 commands/tablecmds.c:10285
+#, c-format
+msgid "unsupported %s action for foreign key constraint using PERIOD"
+msgstr "дія %s не підтримується для обмеження зовнішнього ключа з використанням PERIOD"
+
+#: commands/tablecmds.c:10300
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "число стовпців в джерелі і призначенні зовнішнього ключа не збігається"
 
-#: commands/tablecmds.c:9841
+#: commands/tablecmds.c:10356
+#, c-format
+msgid "could not identify an overlaps operator for foreign key"
+msgstr "не вдалося ідентифікувати оператор перекриття для зовнішнього ключа"
+
+#: commands/tablecmds.c:10357
+#, c-format
+msgid "could not identify an equality operator for foreign key"
+msgstr "не вдалося ідентифікувати оператор рівності для зовнішнього ключа"
+
+#: commands/tablecmds.c:10422 commands/tablecmds.c:10456
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "обмеження зовнішнього ключа \"%s\" не можна реалізувати"
 
-#: commands/tablecmds.c:9843
+#: commands/tablecmds.c:10424
+#, c-format
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table are of incompatible types: %s and %s."
+msgstr "Ключові стовпці \"%s\" таблиці, що посилається, і \"%s\" вказаної таблиці мають несумісні типи: %s і %s."
+
+#: commands/tablecmds.c:10457
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "Стовпці ключа \"%s\" і \"%s\" містять несумісні типи: %s і %s."
+msgid "Key columns \"%s\" of the referencing table and \"%s\" of the referenced table have incompatible collations: \"%s\" and \"%s\".  If either collation is nondeterministic, then both collations have to be the same."
+msgstr "Ключові стовпці \"%s\" таблиці, що посилається, і \"%s\" вказаної таблиці мають несумісні правила сортування: \"%s\" і \"%s\". Якщо будь-яке правило сортування є недетерміністичним, то обидва правила сортування повинні бути однаковими."
 
-#: commands/tablecmds.c:10000
+#: commands/tablecmds.c:10663
 #, c-format
 msgid "column \"%s\" referenced in ON DELETE SET action must be part of foreign key"
 msgstr "стовпець \"%s\" вказаний у дії ON DELETE SET повинен бути частиною зовнішнього ключа"
 
-#: commands/tablecmds.c:10274 commands/tablecmds.c:10761
-#: parser/parse_utilcmd.c:822 parser/parse_utilcmd.c:945
+#: commands/tablecmds.c:11047 commands/tablecmds.c:11480
+#: parser/parse_utilcmd.c:941 parser/parse_utilcmd.c:1086
 #, c-format
 msgid "foreign key constraints are not supported on foreign tables"
 msgstr "обмеження зовнішнього ключа для сторонніх таблиць не підтримуються"
 
-#: commands/tablecmds.c:10744
+#: commands/tablecmds.c:11463
 #, c-format
 msgid "cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\""
 msgstr "не можна підключити таблицю \"%s\" в якості секції, тому що на неї посилається сторонній ключ \"%s\""
 
-#: commands/tablecmds.c:11314 commands/tablecmds.c:11595
-#: commands/tablecmds.c:12507 commands/tablecmds.c:12581
+#: commands/tablecmds.c:11744
+#, c-format
+msgid "constraint \"%s\" enforceability conflicts with constraint \"%s\" on relation \"%s\""
+msgstr "примусовість обмеження \"%s\" конфліктує з обмеженням \"%s\" у відношенні \"%s\""
+
+#: commands/tablecmds.c:12206
+#, c-format
+msgid "constraint must be altered in child tables too"
+msgstr "обмеження також повинно бути змінено і в дочірніх таблицях"
+
+#: commands/tablecmds.c:12235 commands/tablecmds.c:12932
+#: commands/tablecmds.c:14047 commands/tablecmds.c:14276
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "обмеження \"%s\" відношення \"%s\" не існує"
 
-#: commands/tablecmds.c:11321
+#: commands/tablecmds.c:12242
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "обмеження \"%s\" відношення \"%s\" не є обмеженням зовнішнього ключа"
 
-#: commands/tablecmds.c:11359
+#: commands/tablecmds.c:12247
+#, c-format
+msgid "cannot alter enforceability of constraint \"%s\" of relation \"%s\""
+msgstr "не можна змінити примусовість обмеження \"%s\" відношення \"%s\""
+
+#: commands/tablecmds.c:12253
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" is not a not-null constraint"
+msgstr "обмеження \"%s\" відношення \"%s\" не є обмеженням не-null"
+
+#: commands/tablecmds.c:12261
+#, c-format
+msgid "cannot alter inherited constraint \"%s\" on relation \"%s\""
+msgstr "не можна змінити успадковане обмеження \"%s\" для відношення \"%s\""
+
+#: commands/tablecmds.c:12301
 #, c-format
 msgid "cannot alter constraint \"%s\" on relation \"%s\""
-msgstr "не можна змінити обмеження \"%s\" відношення \"%s\""
+msgstr "неможливо змінити обмеження \"%s\" відношення \"%s\""
 
-#: commands/tablecmds.c:11362
+#: commands/tablecmds.c:12304
 #, c-format
 msgid "Constraint \"%s\" is derived from constraint \"%s\" of relation \"%s\"."
 msgstr "Обмеження \"%s\" походить з обмеження \"%s\" відношення \"%s\"."
 
-#: commands/tablecmds.c:11364
+#: commands/tablecmds.c:12306
 #, c-format
 msgid "You may alter the constraint it derives from instead."
 msgstr "Натомість ви можете змінити початкове обмеження."
 
-#: commands/tablecmds.c:11603
+#: commands/tablecmds.c:12941
+#, c-format
+msgid "cannot validate constraint \"%s\" of relation \"%s\""
+msgstr "не можна перевірити обмеження \"%s\" відношення \"%s\""
+
+#: commands/tablecmds.c:12943
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
-msgstr "обмеження \"%s\" відношення \"%s\" не є зовнішнім ключем або перевіркою обмеженням "
+msgid "This operation is not supported for this type of constraint."
+msgstr "Ця операція не підтримується для цього типу обмеження."
 
-#: commands/tablecmds.c:11680
+#: commands/tablecmds.c:12948
+#, c-format
+msgid "cannot validate NOT ENFORCED constraint"
+msgstr "не можна перевірити обмеження NOT ENFORCED"
+
+#: commands/tablecmds.c:13157 commands/tablecmds.c:13257
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "обмеження повинно дотримуватися в дочірніх таблицях також"
 
-#: commands/tablecmds.c:11767
+#: commands/tablecmds.c:13334
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "стовпець \"%s\", вказаний в обмеженні зовнішнього ключа, не існує"
 
-#: commands/tablecmds.c:11773
+#: commands/tablecmds.c:13340
 #, c-format
 msgid "system columns cannot be used in foreign keys"
 msgstr "в зовнішніх ключах не можна використовувати системні стовпці"
 
-#: commands/tablecmds.c:11777
+#: commands/tablecmds.c:13344
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "у зовнішньому ключі не може бути більш ніж %d ключів"
 
-#: commands/tablecmds.c:11842
+#: commands/tablecmds.c:13412
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "використовувати затримуваний первинний ключ в цільовій зовнішній таблиці \"%s\" не можна"
 
-#: commands/tablecmds.c:11859
+#: commands/tablecmds.c:13429
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "у цільовій зовнішній таблиці \"%s\" немає первинного ключа"
 
-#: commands/tablecmds.c:11927
+#: commands/tablecmds.c:13502
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "у списку стовпців зовнішнього ключа не повинно бути повторень"
 
-#: commands/tablecmds.c:12019
+#: commands/tablecmds.c:13605
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "використовувати затримане обмеження унікальності в цільовій зовнішній таблиці \"%s\" не можна"
 
-#: commands/tablecmds.c:12024
+#: commands/tablecmds.c:13610
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr "у цільовій зовнішній таблиці \"%s\" немає обмеження унікальності, відповідного даним ключам"
 
-#: commands/tablecmds.c:12463
+#: commands/tablecmds.c:14051
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "обмеження \"%s\" відношення \"%s\" не існує, пропускається"
+
+#: commands/tablecmds.c:14096
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "видалити успадковане обмеження \"%s\" відношення \"%s\" не можна"
 
-#: commands/tablecmds.c:12513
+#: commands/tablecmds.c:14148
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "обмеження \"%s\" відношення \"%s\" не існує, пропускається"
+msgid "column \"%s\" is in a primary key"
+msgstr "стовпець \"%s\" входить до первинного ключа"
+
+#: commands/tablecmds.c:14156
+#, c-format
+msgid "column \"%s\" is in index used as replica identity"
+msgstr "стовпець \"%s\" в індексі, що використовується як ідентифікація репліки"
 
-#: commands/tablecmds.c:12688
+#: commands/tablecmds.c:14389
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "змінити тип стовпця в типізованій таблиці не можна"
 
-#: commands/tablecmds.c:12714
+#: commands/tablecmds.c:14417
 #, c-format
 msgid "cannot specify USING when altering type of generated column"
 msgstr "не можна вказати USING під час зміни типу згенерованого стовпця"
 
-#: commands/tablecmds.c:12715 commands/tablecmds.c:17918
-#: commands/tablecmds.c:18008 commands/trigger.c:656
-#: rewrite/rewriteHandler.c:935 rewrite/rewriteHandler.c:970
-#, c-format
-msgid "Column \"%s\" is a generated column."
-msgstr "Стовпець \"%s\" є згенерованим стовпцем."
-
-#: commands/tablecmds.c:12725
+#: commands/tablecmds.c:14429
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "змінити успадкований стовпець \"%s\" не можна"
 
-#: commands/tablecmds.c:12734
+#: commands/tablecmds.c:14438
 #, c-format
 msgid "cannot alter column \"%s\" because it is part of the partition key of relation \"%s\""
 msgstr "не можна змінити стовпець \"%s\", тому що він є частиною ключа секції відношення \"%s\""
 
-#: commands/tablecmds.c:12784
+#: commands/tablecmds.c:14493
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "результати речення USING для стовпця \"%s\" не можна автоматично наведено для типу %s"
 
-#: commands/tablecmds.c:12787
+#: commands/tablecmds.c:14496
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Можливо, необхідно додати явне приведення типу."
 
-#: commands/tablecmds.c:12791
+#: commands/tablecmds.c:14500
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "стовпець \"%s\" не можна автоматично привести до типу %s"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:12795
+#: commands/tablecmds.c:14504
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Можливо, необхідно вказати \"USING %s::%s\"."
 
-#: commands/tablecmds.c:12894
+#: commands/tablecmds.c:14607
 #, c-format
 msgid "cannot alter inherited column \"%s\" of relation \"%s\""
 msgstr "не можна змінити успадкований стовпець \"%s\" відношення \"%s\""
 
-#: commands/tablecmds.c:12923
+#: commands/tablecmds.c:14636
 #, c-format
 msgid "USING expression contains a whole-row table reference."
 msgstr "Вираз USING містить посилання на тип усього рядка таблиці."
 
-#: commands/tablecmds.c:12934
+#: commands/tablecmds.c:14647
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "тип успадкованого стовпця \"%s\" повинен бути змінений і в дочірніх таблицях"
 
-#: commands/tablecmds.c:13059
+#: commands/tablecmds.c:14772
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "не можна змінити тип стовпця \"%s\" двічі"
 
-#: commands/tablecmds.c:13097
+#: commands/tablecmds.c:14810
 #, c-format
 msgid "generation expression for column \"%s\" cannot be cast automatically to type %s"
 msgstr "вираз генерації для стовпця \"%s\" не можна автоматично привести до типу %s"
 
-#: commands/tablecmds.c:13102
+#: commands/tablecmds.c:14815
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "значення за замовчуванням для стовпця \"%s\" не можна автоматично привести до типу %s"
 
-#: commands/tablecmds.c:13406
+#: commands/tablecmds.c:15119
 #, c-format
 msgid "cannot alter type of a column used by a function or procedure"
 msgstr "неможливо змінити тип стовпця, який використовується функцією або процедурою"
 
-#: commands/tablecmds.c:13407 commands/tablecmds.c:13422
-#: commands/tablecmds.c:13442 commands/tablecmds.c:13461
-#: commands/tablecmds.c:13520
+#: commands/tablecmds.c:15120 commands/tablecmds.c:15135
+#: commands/tablecmds.c:15155 commands/tablecmds.c:15174
+#: commands/tablecmds.c:15233
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s залежить від стовпця \"%s\""
 
-#: commands/tablecmds.c:13421
+#: commands/tablecmds.c:15134
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "змінити тип стовпця, залученого в поданні або правилі, не можна"
 
-#: commands/tablecmds.c:13441
+#: commands/tablecmds.c:15154
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "неможливо змінити тип стовпця, що використовується у визначенні тригеру"
 
-#: commands/tablecmds.c:13460
+#: commands/tablecmds.c:15173
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "неможливо змінити тип стовпця, що використовується у визначенні політики"
 
-#: commands/tablecmds.c:13491
+#: commands/tablecmds.c:15204
 #, c-format
 msgid "cannot alter type of a column used by a generated column"
 msgstr "змінити тип стовпця, який використовується згенерованим стовпцем, не можна"
 
-#: commands/tablecmds.c:13492
+#: commands/tablecmds.c:15205
 #, c-format
 msgid "Column \"%s\" is used by generated column \"%s\"."
 msgstr "Стовпець \"%s\" використовується згенерованим стовпцем \"%s\"."
 
-#: commands/tablecmds.c:13519
+#: commands/tablecmds.c:15232
 #, c-format
 msgid "cannot alter type of a column used by a publication WHERE clause"
 msgstr "неможливо змінити тип стовпця, який використовується публікацією в реченні WHERE"
 
-#: commands/tablecmds.c:14354 commands/tablecmds.c:14366
+#: commands/tablecmds.c:16106 commands/tablecmds.c:16118
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "неможливо змінити власника індексу \"%s\""
 
-#: commands/tablecmds.c:14356 commands/tablecmds.c:14368
+#: commands/tablecmds.c:16108 commands/tablecmds.c:16120
 #, c-format
 msgid "Change the ownership of the index's table instead."
 msgstr "Замість цього змініть власника таблиці, що містить цей індекс."
 
-#: commands/tablecmds.c:14382
+#: commands/tablecmds.c:16134
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "неможливо змінити власника послідовності \"%s\""
 
-#: commands/tablecmds.c:14407
+#: commands/tablecmds.c:16159
 #, c-format
 msgid "cannot change owner of relation \"%s\""
 msgstr "неможливо змінити власника відношення \"%s\""
 
-#: commands/tablecmds.c:14874
+#: commands/tablecmds.c:16626
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "в одній інструкції не може бути декілька підкоманд SET TABLESPACE"
 
-#: commands/tablecmds.c:14951
+#: commands/tablecmds.c:16705
 #, c-format
 msgid "cannot set options for relation \"%s\""
 msgstr "неможливо встановити параметри відношення \"%s\""
 
-#: commands/tablecmds.c:14985 commands/view.c:440
+#: commands/tablecmds.c:16739 commands/view.c:440
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION підтримується лише з автооновлюваними поданнями"
 
-#: commands/tablecmds.c:15235
+#: commands/tablecmds.c:16992
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "у табличних просторах існують лише таблиці, індекси та матеріалізовані подання"
 
-#: commands/tablecmds.c:15247
+#: commands/tablecmds.c:17004
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "переміщувати відношення у або з табличного простору pg_global не можна"
 
-#: commands/tablecmds.c:15339
+#: commands/tablecmds.c:17096
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "переривання через блокування відношення \"%s.%s\" неможливе"
 
-#: commands/tablecmds.c:15355
+#: commands/tablecmds.c:17112
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr " табличному просторі \"%s\" не знайдені відповідні відносини"
 
-#: commands/tablecmds.c:15477
+#: commands/tablecmds.c:17234
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "змінити успадкування типізованої таблиці не можна"
 
-#: commands/tablecmds.c:15482 commands/tablecmds.c:15982
+#: commands/tablecmds.c:17239 commands/tablecmds.c:17823
 #, c-format
 msgid "cannot change inheritance of a partition"
 msgstr "змінити успадкування секції не можна"
 
-#: commands/tablecmds.c:15487
+#: commands/tablecmds.c:17244
 #, c-format
 msgid "cannot change inheritance of partitioned table"
 msgstr "змінити успадкування секціонованої таблиці не можна"
 
-#: commands/tablecmds.c:15533
+#: commands/tablecmds.c:17291
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "успадкування для тимчасового відношення іншого сеансу не можливе"
 
-#: commands/tablecmds.c:15546
+#: commands/tablecmds.c:17304
 #, c-format
 msgid "cannot inherit from a partition"
 msgstr "успадкування від секції неможливе"
 
-#: commands/tablecmds.c:15568 commands/tablecmds.c:18419
+#: commands/tablecmds.c:17326 commands/tablecmds.c:20347
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "циклічне успадкування неприпустиме"
 
-#: commands/tablecmds.c:15569 commands/tablecmds.c:18420
+#: commands/tablecmds.c:17327 commands/tablecmds.c:20348
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" вже є нащадком \"%s\"."
 
-#: commands/tablecmds.c:15582
+#: commands/tablecmds.c:17340
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming an inheritance child"
 msgstr "тригер \"%s\" не дозволяє таблиці \"%s\" стати нащадком успадкування"
 
-#: commands/tablecmds.c:15584
+#: commands/tablecmds.c:17342
 #, c-format
 msgid "ROW triggers with transition tables are not supported in inheritance hierarchies."
 msgstr "Тригери ROW з перехідними таблицями не підтримуються в ієрархіях успадкування."
 
-#: commands/tablecmds.c:15773
+#: commands/tablecmds.c:17543 commands/tablecmds.c:17792
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "стовпець \"%s\" в дочірній таблиці має бути позначений як NOT NULL"
+msgid "column \"%s\" in child table \"%s\" must be marked NOT NULL"
+msgstr "стовпець \"%s\" у дочірній таблиці \"%s\" має бути позначений як NOT NULL"
 
-#: commands/tablecmds.c:15782
+#: commands/tablecmds.c:17553
 #, c-format
 msgid "column \"%s\" in child table must be a generated column"
 msgstr "стовпець \"%s\" у дочірній таблиці повинен бути згенерованим стовпцем"
 
-#: commands/tablecmds.c:15786
+#: commands/tablecmds.c:17557
 #, c-format
 msgid "column \"%s\" in child table must not be a generated column"
 msgstr "стовпець \"%s\" у дочірній таблиці повинен бути не генерованим стовпцем"
 
-#: commands/tablecmds.c:15824
+#: commands/tablecmds.c:17603
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "у дочірній таблиці не вистачає стовпця \"%s\""
 
-#: commands/tablecmds.c:15905
+#: commands/tablecmds.c:17720
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "дочірня таблиця \"%s\" має інше визначення перевірочного обмеження \"%s\""
 
-#: commands/tablecmds.c:15912
+#: commands/tablecmds.c:17729
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "обмеження \"%s\" конфліктує з неуспадкованим обмеженням дочірньої таблиці \"%s\""
 
-#: commands/tablecmds.c:15922
+#: commands/tablecmds.c:17740
 #, c-format
 msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
 msgstr "обмеження \"%s\" конфліктує з NOT VALID обмеженням дочірньої таблиці \"%s\""
 
-#: commands/tablecmds.c:15960
+#: commands/tablecmds.c:17751
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT ENFORCED constraint on child table \"%s\""
+msgstr "обмеження \"%s\" конфліктує з обмеженням NOT ENFORCED дочірньої таблиці \"%s\""
+
+#: commands/tablecmds.c:17800
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "у дочірній таблиці не вистачає обмеження \"%s\""
 
-#: commands/tablecmds.c:16046
+#: commands/tablecmds.c:17887
 #, c-format
 msgid "partition \"%s\" already pending detach in partitioned table \"%s.%s\""
 msgstr "розділ \"%s\" вже очікує відключення в секціонованій таблиці \"%s.%s\""
 
-#: commands/tablecmds.c:16075 commands/tablecmds.c:16121
+#: commands/tablecmds.c:17916 commands/tablecmds.c:17964
 #, c-format
 msgid "relation \"%s\" is not a partition of relation \"%s\""
 msgstr "відношення \"%s\" не є секцією відношення \"%s\""
 
-#: commands/tablecmds.c:16127
+#: commands/tablecmds.c:17970
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "відношення \"%s\" не є предком відношення \"%s\""
 
-#: commands/tablecmds.c:16354
+#: commands/tablecmds.c:18241
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "типізовані таблиці не можуть успадковуватись"
 
-#: commands/tablecmds.c:16384
+#: commands/tablecmds.c:18271
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "у таблиці не вистачає стовпця \"%s\""
 
-#: commands/tablecmds.c:16395
+#: commands/tablecmds.c:18282
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "таблиця містить стовпець \"%s\", а тип потребує \"%s\""
 
-#: commands/tablecmds.c:16404
+#: commands/tablecmds.c:18291
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "таблиця \"%s\" містить стовпець \"%s\" іншого типу"
 
-#: commands/tablecmds.c:16418
+#: commands/tablecmds.c:18305
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "таблиця містить зайвий стовпець \"%s\""
 
-#: commands/tablecmds.c:16470
+#: commands/tablecmds.c:18357
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" - не типізована таблиця"
 
-#: commands/tablecmds.c:16644
+#: commands/tablecmds.c:18537
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "для ідентифікації репліки не можна використати неунікальний індекс \"%s\""
 
-#: commands/tablecmds.c:16650
+#: commands/tablecmds.c:18543
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "для ідентифікації репліки не можна використати небезпосередній індекс \"%s\""
 
-#: commands/tablecmds.c:16656
+#: commands/tablecmds.c:18549
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "для ідентифікації репліки не можна використати індекс з виразом \"%s\""
 
-#: commands/tablecmds.c:16662
+#: commands/tablecmds.c:18555
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "для ідентифікації репліки не можна використати частковий індекс \"%s\""
 
-#: commands/tablecmds.c:16679
+#: commands/tablecmds.c:18572
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
 msgstr "індекс \"%s\" не можна використати як ідентифікацію репліки, тому що стовпець %d - системний стовпець"
 
-#: commands/tablecmds.c:16686
+#: commands/tablecmds.c:18579
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "індекс \"%s\" не можна використати як ідентифікацію репліки, тому що стовпець \"%s\" допускає Null"
 
-#: commands/tablecmds.c:16938
+#: commands/tablecmds.c:18828
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "змінити стан журналювання таблиці \"%s\" не можна, тому що вона тимчасова"
 
-#: commands/tablecmds.c:16962
+#: commands/tablecmds.c:18852
 #, c-format
 msgid "cannot change table \"%s\" to unlogged because it is part of a publication"
 msgstr "таблицю \"%s\" не можна змінити на нежурнальовану, тому що вона є частиною публікації"
 
-#: commands/tablecmds.c:16964
+#: commands/tablecmds.c:18854
 #, c-format
 msgid "Unlogged relations cannot be replicated."
 msgstr "Нежурнальовані відношення не підтримують реплікацію."
 
-#: commands/tablecmds.c:17009
+#: commands/tablecmds.c:18899
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr "не вдалося змінити таблицю \"%s\" на журнальовану, тому що вона посилається на нежурнальовану таблицю \"%s\""
 
-#: commands/tablecmds.c:17019
+#: commands/tablecmds.c:18909
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr "не вдалося змінити таблицю \"%s\" на нежурнальовану, тому що вона посилається на журнальовану таблицю \"%s\""
 
-#: commands/tablecmds.c:17077
+#: commands/tablecmds.c:18973
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "перемістити послідовність з власником в іншу схему не можна"
 
-#: commands/tablecmds.c:17182
+#: commands/tablecmds.c:19081
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "відношення \"%s\" вже існує в схемі \"%s\""
 
-#: commands/tablecmds.c:17603
+#: commands/tablecmds.c:19506
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" не є таблицею або матеріалізованим поданням"
 
-#: commands/tablecmds.c:17756
+#: commands/tablecmds.c:19659
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" - не складений тип"
 
-#: commands/tablecmds.c:17786
+#: commands/tablecmds.c:19689
 #, c-format
 msgid "cannot change schema of index \"%s\""
 msgstr "змінити схему індексу \"%s\" не можна"
 
-#: commands/tablecmds.c:17788 commands/tablecmds.c:17802
+#: commands/tablecmds.c:19691 commands/tablecmds.c:19705
 #, c-format
 msgid "Change the schema of the table instead."
 msgstr "Замість цього змініть схему таблиці."
 
-#: commands/tablecmds.c:17792
+#: commands/tablecmds.c:19695
 #, c-format
 msgid "cannot change schema of composite type \"%s\""
 msgstr "змінити схему складеного типу \"%s\" не можна"
 
-#: commands/tablecmds.c:17800
+#: commands/tablecmds.c:19703
 #, c-format
 msgid "cannot change schema of TOAST table \"%s\""
 msgstr "змінити схему таблиці TOAST \"%s\" не можна"
 
-#: commands/tablecmds.c:17832
+#: commands/tablecmds.c:19735
 #, c-format
 msgid "cannot use \"list\" partition strategy with more than one column"
 msgstr "стратегія секціонування \"по списку\" не може використовувати декілька стовпців"
 
-#: commands/tablecmds.c:17898
+#: commands/tablecmds.c:19801
 #, c-format
 msgid "column \"%s\" named in partition key does not exist"
 msgstr "стовпець \"%s\", згаданий в ключі секціонування, не існує"
 
-#: commands/tablecmds.c:17906
+#: commands/tablecmds.c:19809
 #, c-format
 msgid "cannot use system column \"%s\" in partition key"
 msgstr "системний стовпець \"%s\" не можна використати в ключі секціонування"
 
-#: commands/tablecmds.c:17917 commands/tablecmds.c:18007
+#: commands/tablecmds.c:19823 commands/tablecmds.c:19905
 #, c-format
 msgid "cannot use generated column in partition key"
 msgstr "використати згенерований стовпець в ключі секції, не можна"
 
-#: commands/tablecmds.c:17990
+#: commands/tablecmds.c:19892
 #, c-format
 msgid "partition key expressions cannot contain system column references"
 msgstr "вирази ключа секціонування не можуть містити посилання на системний стовпець"
 
-#: commands/tablecmds.c:18037
+#: commands/tablecmds.c:19956
 #, c-format
 msgid "functions in partition key expression must be marked IMMUTABLE"
 msgstr "функції у виразі ключа секціонування повинні бути позначені як IMMUTABLE"
 
-#: commands/tablecmds.c:18046
+#: commands/tablecmds.c:19965
 #, c-format
 msgid "cannot use constant expression as partition key"
 msgstr "не можна використати константий вираз як ключ секціонування"
 
-#: commands/tablecmds.c:18067
+#: commands/tablecmds.c:19986
 #, c-format
 msgid "could not determine which collation to use for partition expression"
 msgstr "не вдалося визначити, яке правило сортування використати для виразу секціонування"
 
-#: commands/tablecmds.c:18102
+#: commands/tablecmds.c:20021
 #, c-format
 msgid "You must specify a hash operator class or define a default hash operator class for the data type."
 msgstr "Ви повинні вказати клас операторів гешування або визначити клас операторів гешування за замовчуванням для цього типу даних."
 
-#: commands/tablecmds.c:18108
+#: commands/tablecmds.c:20027
 #, c-format
 msgid "You must specify a btree operator class or define a default btree operator class for the data type."
 msgstr "Ви повинні вказати клас операторів (btree) або визначити клас операторів (btree) за замовчуванням для цього типу даних."
 
-#: commands/tablecmds.c:18359
+#: commands/tablecmds.c:20287
 #, c-format
 msgid "\"%s\" is already a partition"
 msgstr "\"%s\" вже є секцією"
 
-#: commands/tablecmds.c:18365
+#: commands/tablecmds.c:20293
 #, c-format
 msgid "cannot attach a typed table as partition"
 msgstr "неможливо підключити типізовану таблицю в якості секції"
 
-#: commands/tablecmds.c:18381
+#: commands/tablecmds.c:20309
 #, c-format
 msgid "cannot attach inheritance child as partition"
 msgstr "неможливо підключити нащадка успадкування в якості секції"
 
-#: commands/tablecmds.c:18395
+#: commands/tablecmds.c:20323
 #, c-format
 msgid "cannot attach inheritance parent as partition"
 msgstr "неможливо підключити предка успадкування в якості секції"
 
-#: commands/tablecmds.c:18429
+#: commands/tablecmds.c:20357
 #, c-format
 msgid "cannot attach a temporary relation as partition of permanent relation \"%s\""
 msgstr "неможливо підкючити тимчасове відношення в якості секції постійного відношення \"%s\""
 
-#: commands/tablecmds.c:18437
+#: commands/tablecmds.c:20365
 #, c-format
 msgid "cannot attach a permanent relation as partition of temporary relation \"%s\""
 msgstr "неможливо підключити постійне відношення в якості секції тимчасового відношення \"%s\""
 
-#: commands/tablecmds.c:18445
+#: commands/tablecmds.c:20373
 #, c-format
 msgid "cannot attach as partition of temporary relation of another session"
 msgstr "неможливо підключити секцію до тимчасового відношення в іншому сеансі"
 
-#: commands/tablecmds.c:18452
+#: commands/tablecmds.c:20380
 #, c-format
 msgid "cannot attach temporary relation of another session as partition"
 msgstr "неможливо підключити тимчасове відношення з іншого сеансу в якості секції"
 
-#: commands/tablecmds.c:18472
+#: commands/tablecmds.c:20400
 #, c-format
 msgid "table \"%s\" being attached contains an identity column \"%s\""
 msgstr "таблиця \"%s\", що додається, містить стовпець ідентичності \"%s\""
 
-#: commands/tablecmds.c:18474
+#: commands/tablecmds.c:20402
 #, c-format
 msgid "The new partition may not contain an identity column."
 msgstr "Новий розділ може не містити стовпця ідентичності."
 
-#: commands/tablecmds.c:18482
+#: commands/tablecmds.c:20410
 #, c-format
 msgid "table \"%s\" contains column \"%s\" not found in parent \"%s\""
 msgstr "таблиця \"%s\" містить стовпець \"%s\", відсутній в батьківській \"%s\""
 
-#: commands/tablecmds.c:18485
+#: commands/tablecmds.c:20413
 #, c-format
 msgid "The new partition may contain only the columns present in parent."
 msgstr "Нова секція може містити лише стовпці, що є у батьківській таблиці."
 
-#: commands/tablecmds.c:18497
+#: commands/tablecmds.c:20425
 #, c-format
 msgid "trigger \"%s\" prevents table \"%s\" from becoming a partition"
 msgstr "тригер \"%s\" не дозволяє зробити таблицю \"%s\" секцією"
 
-#: commands/tablecmds.c:18499
+#: commands/tablecmds.c:20427
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions."
 msgstr "Тригери ROW з перехідними таблицями не підтримуються для секцій."
 
-#: commands/tablecmds.c:18675
+#: commands/tablecmds.c:20609
 #, c-format
 msgid "cannot attach foreign table \"%s\" as partition of partitioned table \"%s\""
 msgstr "не можна підключити зовнішню таблицю \"%s\" в якості секції секціонованої таблиці \"%s\""
 
-#: commands/tablecmds.c:18678
+#: commands/tablecmds.c:20612
 #, c-format
 msgid "Partitioned table \"%s\" contains unique indexes."
 msgstr "Секціонована таблиця \"%s\" містить унікальні індекси."
 
-#: commands/tablecmds.c:19000
+#: commands/tablecmds.c:20936
 #, c-format
 msgid "cannot detach partitions concurrently when a default partition exists"
 msgstr "не можна одночасно відключити розділи, коли існує розділ за замовчуванням"
 
-#: commands/tablecmds.c:19109
+#: commands/tablecmds.c:21048
 #, c-format
 msgid "partitioned table \"%s\" was removed concurrently"
 msgstr "секціоновану таблицю \"%s\" було видалено одночасно"
 
-#: commands/tablecmds.c:19115
+#: commands/tablecmds.c:21054
 #, c-format
 msgid "partition \"%s\" was removed concurrently"
 msgstr "розділ \"%s\" було видалено паралельно"
 
-#: commands/tablecmds.c:19651 commands/tablecmds.c:19671
-#: commands/tablecmds.c:19692 commands/tablecmds.c:19711
-#: commands/tablecmds.c:19753
+#: commands/tablecmds.c:21685 commands/tablecmds.c:21705
+#: commands/tablecmds.c:21726 commands/tablecmds.c:21745
+#: commands/tablecmds.c:21794
 #, c-format
 msgid "cannot attach index \"%s\" as a partition of index \"%s\""
 msgstr "неможливо підключити індекс \"%s\" в якості секції індексу \"%s\""
 
-#: commands/tablecmds.c:19654
+#: commands/tablecmds.c:21688
 #, c-format
 msgid "Index \"%s\" is already attached to another index."
 msgstr "Індекс \"%s\" вже підключений до іншого індексу."
 
-#: commands/tablecmds.c:19674
+#: commands/tablecmds.c:21708
 #, c-format
 msgid "Index \"%s\" is not an index on any partition of table \"%s\"."
 msgstr "Індекс \"%s\" не є індексом жодної секції таблиці \"%s\"."
 
-#: commands/tablecmds.c:19695
+#: commands/tablecmds.c:21729
 #, c-format
 msgid "The index definitions do not match."
 msgstr "Визначення індексів не співпадають."
 
-#: commands/tablecmds.c:19714
+#: commands/tablecmds.c:21748
 #, c-format
 msgid "The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\"."
 msgstr "Індекс \"%s\" належить обмеженню в таблиці \"%s\", але обмеження для індексу \"%s\" не існує."
 
-#: commands/tablecmds.c:19756
+#: commands/tablecmds.c:21797
 #, c-format
 msgid "Another index is already attached for partition \"%s\"."
 msgstr "До секції \"%s\" вже підключений інший індекс."
 
-#: commands/tablecmds.c:19992
+#: commands/tablecmds.c:21920
+#, c-format
+msgid "invalid primary key definition"
+msgstr "недійсне визначення первинного ключа"
+
+#: commands/tablecmds.c:21921
+#, c-format
+msgid "Column \"%s\" of relation \"%s\" is not marked NOT NULL."
+msgstr "Стовпець \"%s\" відношення \"%s\" не позначений як NOT NULL."
+
+#: commands/tablecmds.c:22056
 #, c-format
 msgid "column data type %s does not support compression"
 msgstr "тип даних стовпця %s не підтримує стискання"
 
-#: commands/tablecmds.c:19999
+#: commands/tablecmds.c:22063
 #, c-format
 msgid "invalid compression method \"%s\""
 msgstr "неприпустимий метод стискання \"%s\""
 
-#: commands/tablecmds.c:20025
+#: commands/tablecmds.c:22089
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "неприпустимий тип сховища \"%s\""
 
-#: commands/tablecmds.c:20035
+#: commands/tablecmds.c:22099
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "тип даних стовпця %s може мати тільки сховище PLAIN"
@@ -12038,287 +12423,286 @@ msgstr "не вдалося видалити каталоги табличног
 msgid "You can remove the directories manually if necessary."
 msgstr "За потреби ви можете видалити каталоги вручну."
 
-#: commands/trigger.c:225 commands/trigger.c:236
+#: commands/trigger.c:228 commands/trigger.c:239
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "\"%s\" - таблиця"
 
-#: commands/trigger.c:227 commands/trigger.c:238
+#: commands/trigger.c:230 commands/trigger.c:241
 #, c-format
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "Таблиці не можуть мати тригери INSTEAD OF."
 
-#: commands/trigger.c:259
+#: commands/trigger.c:262
 #, c-format
 msgid "\"%s\" is a partitioned table"
 msgstr "\"%s\" є секційною таблицею"
 
-#: commands/trigger.c:261
+#: commands/trigger.c:264
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitioned tables."
 msgstr "Тригери ROW з перехідними таблицями не підтримуються для секційованих таблиць."
 
-#: commands/trigger.c:273 commands/trigger.c:280 commands/trigger.c:444
+#: commands/trigger.c:276 commands/trigger.c:283 commands/trigger.c:447
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "\"%s\" - подання"
 
-#: commands/trigger.c:275
+#: commands/trigger.c:278
 #, c-format
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
 msgstr "Подання не можуть мати рядкові тригери BEFORE або AFTER."
 
-#: commands/trigger.c:282
+#: commands/trigger.c:285
 #, c-format
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "Подання не можуть мати тригери TRUNCATE."
 
-#: commands/trigger.c:290 commands/trigger.c:302 commands/trigger.c:437
+#: commands/trigger.c:293 commands/trigger.c:305 commands/trigger.c:440
 #, c-format
 msgid "\"%s\" is a foreign table"
 msgstr "\"%s\" - зовнішня таблиця"
 
-#: commands/trigger.c:292
+#: commands/trigger.c:295
 #, c-format
 msgid "Foreign tables cannot have INSTEAD OF triggers."
 msgstr "Зовнішні таблиці не можуть мати тригери INSTEAD OF."
 
-#: commands/trigger.c:304
+#: commands/trigger.c:307
 #, c-format
 msgid "Foreign tables cannot have constraint triggers."
 msgstr "Зовнішні таблиці не можуть мати обмежувальні тригери."
 
-#: commands/trigger.c:309 commands/trigger.c:1325 commands/trigger.c:1432
+#: commands/trigger.c:312 commands/trigger.c:1331 commands/trigger.c:1438
 #, c-format
 msgid "relation \"%s\" cannot have triggers"
 msgstr "відношення \"%s\" не може мати тригери"
 
-#: commands/trigger.c:380
+#: commands/trigger.c:383
 #, c-format
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "Тригери TRUNCATE FOR EACH ROW не підтримуються"
 
-#: commands/trigger.c:388
+#: commands/trigger.c:391
 #, c-format
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "Тригери INSTEAD OF повинні мати тип FOR EACH ROW"
 
-#: commands/trigger.c:392
+#: commands/trigger.c:395
 #, c-format
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "Тригери INSTEAD OF не можуть мати умови WHEN"
 
-#: commands/trigger.c:396
+#: commands/trigger.c:399
 #, c-format
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "Тригери INSTEAD OF не можуть мати список стовпців"
 
-#: commands/trigger.c:425
+#: commands/trigger.c:428
 #, c-format
 msgid "ROW variable naming in the REFERENCING clause is not supported"
 msgstr "Змінна іменування ROW в реченні REFERENCING не підтримується"
 
-#: commands/trigger.c:426
+#: commands/trigger.c:429
 #, c-format
 msgid "Use OLD TABLE or NEW TABLE for naming transition tables."
 msgstr "Використайте OLD TABLE або NEW TABLE для іменування перехідних таблиць."
 
-#: commands/trigger.c:439
+#: commands/trigger.c:442
 #, c-format
 msgid "Triggers on foreign tables cannot have transition tables."
 msgstr "Тригери зовнішніх таблиць не можуть використовувати перехідні таблиці."
 
-#: commands/trigger.c:446
+#: commands/trigger.c:449
 #, c-format
 msgid "Triggers on views cannot have transition tables."
 msgstr "Тригери подань не можуть використовувати перехідні таблиці."
 
-#: commands/trigger.c:462
+#: commands/trigger.c:465
 #, c-format
 msgid "ROW triggers with transition tables are not supported on partitions"
 msgstr "Тригери ROW з перехідними таблицями для секцій не підтримуються"
 
-#: commands/trigger.c:466
+#: commands/trigger.c:469
 #, c-format
 msgid "ROW triggers with transition tables are not supported on inheritance children"
 msgstr "Тригери ROW з перехідними таблицями для нащадків успадкування не підтримуються"
 
-#: commands/trigger.c:472
+#: commands/trigger.c:475
 #, c-format
 msgid "transition table name can only be specified for an AFTER trigger"
 msgstr "ім'я перехідної таблиці можна задати лише для тригеру AFTER"
 
-#: commands/trigger.c:477
+#: commands/trigger.c:480
 #, c-format
 msgid "TRUNCATE triggers with transition tables are not supported"
 msgstr "Тригери TRUNCATE з перехідними таблицями не підтримуються"
 
-#: commands/trigger.c:494
+#: commands/trigger.c:497
 #, c-format
 msgid "transition tables cannot be specified for triggers with more than one event"
 msgstr "перехідні таблиці не можна задати для тригерів, призначених для кількох подій"
 
-#: commands/trigger.c:505
+#: commands/trigger.c:508
 #, c-format
 msgid "transition tables cannot be specified for triggers with column lists"
 msgstr "перехідні таблиці не можна задати для тригерів зі списками стовпців"
 
-#: commands/trigger.c:522
+#: commands/trigger.c:525
 #, c-format
 msgid "NEW TABLE can only be specified for an INSERT or UPDATE trigger"
 msgstr "NEW TABLE можна задати лише для тригерів INSERT або UPDATE"
 
-#: commands/trigger.c:527
+#: commands/trigger.c:530
 #, c-format
 msgid "NEW TABLE cannot be specified multiple times"
 msgstr "NEW TABLE не можна задавати декілька разів"
 
-#: commands/trigger.c:537
+#: commands/trigger.c:540
 #, c-format
 msgid "OLD TABLE can only be specified for a DELETE or UPDATE trigger"
 msgstr "OLD TABLE можна задати лише для тригерів DELETE або UPDATE"
 
-#: commands/trigger.c:542
+#: commands/trigger.c:545
 #, c-format
 msgid "OLD TABLE cannot be specified multiple times"
 msgstr "OLD TABLE не можна задавати декілька разів"
 
-#: commands/trigger.c:552
+#: commands/trigger.c:555
 #, c-format
 msgid "OLD TABLE name and NEW TABLE name cannot be the same"
 msgstr "Ім'я OLD TABLE та ім'я NEW TABLE не можуть бути однаковими"
 
-#: commands/trigger.c:616 commands/trigger.c:629
+#: commands/trigger.c:619 commands/trigger.c:632
 #, c-format
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr "в умові WHEN операторного тригера не можна посилатись на значення стовпця"
 
-#: commands/trigger.c:621
+#: commands/trigger.c:624
 #, c-format
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "В умові WHEN тригеру INSERT не можна посилатись на значення OLD"
 
-#: commands/trigger.c:634
+#: commands/trigger.c:637
 #, c-format
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "В умові WHEN тригера DELETE не можна посилатись на значення NEW"
 
-#: commands/trigger.c:639
+#: commands/trigger.c:642
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr "В умові WHEN тригера BEFORE не можна посилатись на системні стовпці NEW"
 
-#: commands/trigger.c:647 commands/trigger.c:655
+#: commands/trigger.c:651 commands/trigger.c:659
 #, c-format
 msgid "BEFORE trigger's WHEN condition cannot reference NEW generated columns"
 msgstr "В умові WHEN тригера BEFORE не можна посилатись на згенеровані стовпці NEW"
 
-#: commands/trigger.c:648
+#: commands/trigger.c:652
 #, c-format
 msgid "A whole-row reference is used and the table contains generated columns."
 msgstr "Використовується посилання на весь рядок і таблиця містить згенеровані стовпці."
 
-#: commands/trigger.c:763 commands/trigger.c:1607
+#: commands/trigger.c:767 commands/trigger.c:1614
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "тригер \"%s\" для відношення \"%s\" вже існує"
 
-#: commands/trigger.c:776
+#: commands/trigger.c:780
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is an internal or a child trigger"
 msgstr "тригер \"%s\" для відношення \"%s\" є зовнішнім або дочірнім тригером"
 
-#: commands/trigger.c:795
+#: commands/trigger.c:799
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" is a constraint trigger"
 msgstr "тригер \"%s\" для відношення \"%s\" є зовнішнім тригером"
 
-#: commands/trigger.c:1397 commands/trigger.c:1550 commands/trigger.c:1831
+#: commands/trigger.c:1403 commands/trigger.c:1557 commands/trigger.c:1838
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "тригер \"%s\" для таблиці \"%s\" не існує"
 
-#: commands/trigger.c:1522
+#: commands/trigger.c:1529
 #, c-format
 msgid "cannot rename trigger \"%s\" on table \"%s\""
 msgstr "перейменувати тригер \"%s\" для таблиці \"%s\" не можна"
 
-#: commands/trigger.c:1524
+#: commands/trigger.c:1531
 #, c-format
 msgid "Rename the trigger on the partitioned table \"%s\" instead."
 msgstr "Замість цього перейменуйте тригер для секціонованої таблиці \"%s\"."
 
-#: commands/trigger.c:1624
+#: commands/trigger.c:1631
 #, c-format
 msgid "renamed trigger \"%s\" on relation \"%s\""
 msgstr "перейменовано тригер \"%s\" для відношення \"%s\""
 
-#: commands/trigger.c:1770
+#: commands/trigger.c:1777
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "немає доступу: \"%s\" - системний тригер"
 
-#: commands/trigger.c:2379
+#: commands/trigger.c:2388
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "тригерна функція %u повернула значення null"
 
-#: commands/trigger.c:2439 commands/trigger.c:2657 commands/trigger.c:2910
-#: commands/trigger.c:3263
+#: commands/trigger.c:2448 commands/trigger.c:2677 commands/trigger.c:2949
+#: commands/trigger.c:3323
 #, c-format
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "Тригер BEFORE STATEMENT не може повертати значення"
 
-#: commands/trigger.c:2515
+#: commands/trigger.c:2526
 #, c-format
 msgid "moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported"
 msgstr "переміщення рядка до іншої секції під час тригеру BEFORE FOR EACH ROW не підтримується"
 
-#: commands/trigger.c:2516
+#: commands/trigger.c:2527
 #, c-format
 msgid "Before executing trigger \"%s\", the row was to be in partition \"%s.%s\"."
 msgstr "Перед виконанням тригера \"%s\", рядок повинен був бути в секції \"%s.%s\"."
 
-#: commands/trigger.c:3340 executor/nodeModifyTable.c:2373
-#: executor/nodeModifyTable.c:2456
+#: commands/trigger.c:2556 commands/trigger.c:2817 commands/trigger.c:3164
 #, c-format
-msgid "tuple to be updated was already modified by an operation triggered by the current command"
-msgstr "кортеж, який повинен бути оновленим, вже змінений в операції, яка викликана поточною командою"
+msgid "cannot collect transition tuples from child foreign tables"
+msgstr "неможливо зібрати перехідні кортежі з дочірніх сторонніх таблиць"
 
-#: commands/trigger.c:3341 executor/nodeModifyTable.c:1541
-#: executor/nodeModifyTable.c:1615 executor/nodeModifyTable.c:2374
-#: executor/nodeModifyTable.c:2457 executor/nodeModifyTable.c:3093
-#: executor/nodeModifyTable.c:3254
+#: commands/trigger.c:3402 executor/nodeModifyTable.c:1687
+#: executor/nodeModifyTable.c:1761 executor/nodeModifyTable.c:2569
+#: executor/nodeModifyTable.c:2659 executor/nodeModifyTable.c:3331
+#: executor/nodeModifyTable.c:3523
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Можливо, для поширення змін в інші рядки слід використати тригер AFTER замість тригера BEFORE."
 
-#: commands/trigger.c:3382 executor/nodeLockRows.c:228
-#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:314
-#: executor/nodeModifyTable.c:1557 executor/nodeModifyTable.c:2391
-#: executor/nodeModifyTable.c:2599
+#: commands/trigger.c:3444 executor/nodeLockRows.c:228
+#: executor/nodeLockRows.c:237 executor/nodeModifyTable.c:389
+#: executor/nodeModifyTable.c:1703 executor/nodeModifyTable.c:2585
+#: executor/nodeModifyTable.c:2810
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "не вдалося серіалізувати доступ через паралельне оновлення"
 
-#: commands/trigger.c:3390 executor/nodeModifyTable.c:1647
-#: executor/nodeModifyTable.c:2474 executor/nodeModifyTable.c:2623
-#: executor/nodeModifyTable.c:3111
+#: commands/trigger.c:3452 executor/nodeModifyTable.c:1793
+#: executor/nodeModifyTable.c:2676 executor/nodeModifyTable.c:2834
+#: executor/nodeModifyTable.c:3349
 #, c-format
 msgid "could not serialize access due to concurrent delete"
 msgstr "не вдалося серіалізувати доступ через паралельне видалення"
 
-#: commands/trigger.c:4601
+#: commands/trigger.c:4687
 #, c-format
 msgid "cannot fire deferred trigger within security-restricted operation"
 msgstr "не можна виконати відкладений тригер в межах операції з обмеженням по безпеці"
 
-#: commands/trigger.c:5782
+#: commands/trigger.c:5868
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "обмеження \"%s\" не є відкладеним"
 
-#: commands/trigger.c:5805
+#: commands/trigger.c:5891
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "обмеження \"%s\" не існує"
@@ -12428,7 +12812,7 @@ msgstr "для створення базового типу потрібно б
 msgid "Create the type as a shell type, then create its I/O functions, then do a full CREATE TYPE."
 msgstr "Створіть тип в якості оболонки, потім створіть його функції вводу-виводу, а потім виконайте повну CREATE TYPE."
 
-#: commands/typecmds.c:331 commands/typecmds.c:1460 commands/typecmds.c:4480
+#: commands/typecmds.c:331 commands/typecmds.c:1494 commands/typecmds.c:4479
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "атрибут типу \"%s\" не розпізнаний"
@@ -12448,7 +12832,7 @@ msgstr "типом елементу масиву не може бути %s"
 msgid "alignment \"%s\" not recognized"
 msgstr "тип вирівнювання \"%s\" не розпізнаний"
 
-#: commands/typecmds.c:454 commands/typecmds.c:4354
+#: commands/typecmds.c:454 commands/typecmds.c:4353
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "сховище \"%s\" не розпізнане"
@@ -12478,288 +12862,308 @@ msgstr "тип елементу не можна вказати без припу
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "\"%s\" - невідповідний базовий тип для домену"
 
-#: commands/typecmds.c:883
+#: commands/typecmds.c:885
 #, c-format
 msgid "multiple default expressions"
 msgstr "неодноразове визначення значення типу за замовчуванням"
 
-#: commands/typecmds.c:946 commands/typecmds.c:955
+#: commands/typecmds.c:947 commands/typecmds.c:968
 #, c-format
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "конфліктуючі обмеження NULL/NOT NULL"
 
-#: commands/typecmds.c:971
+#: commands/typecmds.c:952
+#, c-format
+msgid "redundant NOT NULL constraint definition"
+msgstr "зайве визначення обмеження NOT NULL"
+
+#: commands/typecmds.c:958
+#, c-format
+msgid "not-null constraints for domains cannot be marked NO INHERIT"
+msgstr "обмеження not-null для доменів не можуть позначатися NO INHERIT"
+
+#: commands/typecmds.c:985
 #, c-format
 msgid "check constraints for domains cannot be marked NO INHERIT"
 msgstr "перевірки обмеження для доменів не можуть позначатись як NO INHERIT"
 
-#: commands/typecmds.c:980 commands/typecmds.c:2940
+#: commands/typecmds.c:996
 #, c-format
 msgid "unique constraints not possible for domains"
 msgstr "обмеження унікальності неможливе для доменів"
 
-#: commands/typecmds.c:986 commands/typecmds.c:2946
+#: commands/typecmds.c:1003
 #, c-format
 msgid "primary key constraints not possible for domains"
 msgstr "обмеження первинного ключа неможливі для доменів"
 
-#: commands/typecmds.c:992 commands/typecmds.c:2952
+#: commands/typecmds.c:1010
 #, c-format
 msgid "exclusion constraints not possible for domains"
 msgstr "обмеження винятків неможливі для доменів"
 
-#: commands/typecmds.c:998 commands/typecmds.c:2958
+#: commands/typecmds.c:1017
 #, c-format
 msgid "foreign key constraints not possible for domains"
 msgstr "обмеження зовнішніх ключів неможливі для доменів"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:2967
+#: commands/typecmds.c:1027
 #, c-format
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "зазначення відкладення обмежень для доменів не підтримується"
 
-#: commands/typecmds.c:1327 utils/cache/typcache.c:2570
+#: commands/typecmds.c:1035
 #, c-format
-msgid "%s is not an enum"
-msgstr "%s не є переліком"
+msgid "specifying GENERATED not supported for domains"
+msgstr "зазначення GENERATED не підтримується для доменів"
 
-#: commands/typecmds.c:1468
+#: commands/typecmds.c:1043
+#, c-format
+msgid "specifying constraint enforceability not supported for domains"
+msgstr "зазначення примусовості виконання обмеження не підтримується для доменів"
+
+#: commands/typecmds.c:1361 utils/cache/typcache.c:2757
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s не є переліком"
+
+#: commands/typecmds.c:1502
 #, c-format
 msgid "type attribute \"subtype\" is required"
 msgstr "вимагається атрибут типу \"subtype\""
 
-#: commands/typecmds.c:1473
+#: commands/typecmds.c:1507
 #, c-format
 msgid "range subtype cannot be %s"
 msgstr "%s не може бути підтипом діапазону"
 
-#: commands/typecmds.c:1492
+#: commands/typecmds.c:1526
 #, c-format
 msgid "range collation specified but subtype does not support collation"
 msgstr "вказано правило сортування для діапазону, але підтип не підтримує сортування"
 
-#: commands/typecmds.c:1502
+#: commands/typecmds.c:1536
 #, c-format
 msgid "cannot specify a canonical function without a pre-created shell type"
 msgstr "неможливо вказати канонічну функцію без попередньо створеного типу оболонки"
 
-#: commands/typecmds.c:1503
+#: commands/typecmds.c:1537
 #, c-format
 msgid "Create the type as a shell type, then create its canonicalization function, then do a full CREATE TYPE."
 msgstr "Створіть тип в якості оболонки, потім створіть його функцію канонізації, а потім виконайте повну CREATE TYPE."
 
-#: commands/typecmds.c:1975
+#: commands/typecmds.c:2013
 #, c-format
 msgid "type input function %s has multiple matches"
 msgstr "функція введення типу %s має декілька збігів"
 
-#: commands/typecmds.c:1993
+#: commands/typecmds.c:2031
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "функція вводу типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2009
+#: commands/typecmds.c:2047
 #, c-format
 msgid "type input function %s should not be volatile"
 msgstr "функція введення типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2037
+#: commands/typecmds.c:2075
 #, c-format
 msgid "type output function %s must return type %s"
 msgstr "функція виводу типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2044
+#: commands/typecmds.c:2082
 #, c-format
 msgid "type output function %s should not be volatile"
 msgstr "функція виводу типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2073
+#: commands/typecmds.c:2111
 #, c-format
 msgid "type receive function %s has multiple matches"
 msgstr "функція отримання типу %s має декілька збігів"
 
-#: commands/typecmds.c:2091
+#: commands/typecmds.c:2129
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "функція отримання типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2098
+#: commands/typecmds.c:2136
 #, c-format
 msgid "type receive function %s should not be volatile"
 msgstr "функція отримання типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2126
+#: commands/typecmds.c:2164
 #, c-format
 msgid "type send function %s must return type %s"
 msgstr "функція відправлення типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2133
+#: commands/typecmds.c:2171
 #, c-format
 msgid "type send function %s should not be volatile"
 msgstr "функція відправлення типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2160
+#: commands/typecmds.c:2198
 #, c-format
 msgid "typmod_in function %s must return type %s"
 msgstr "функція typmod_in %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2167
+#: commands/typecmds.c:2205
 #, c-format
 msgid "type modifier input function %s should not be volatile"
 msgstr "функція вводу модифікатора типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2194
+#: commands/typecmds.c:2232
 #, c-format
 msgid "typmod_out function %s must return type %s"
 msgstr "функція typmod_out %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2201
+#: commands/typecmds.c:2239
 #, c-format
 msgid "type modifier output function %s should not be volatile"
 msgstr "функція виводу модифікатора типу %s не повинна бути змінною"
 
-#: commands/typecmds.c:2228
+#: commands/typecmds.c:2266
 #, c-format
 msgid "type analyze function %s must return type %s"
 msgstr "функція аналізу типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2257
+#: commands/typecmds.c:2295
 #, c-format
 msgid "type subscripting function %s must return type %s"
 msgstr "функція підписки типу %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2267
+#: commands/typecmds.c:2305
 #, c-format
 msgid "user-defined types cannot use subscripting function %s"
 msgstr "типи визначені користувачем не можуть використовувати функцію підписки %s"
 
-#: commands/typecmds.c:2313
+#: commands/typecmds.c:2351
 #, c-format
 msgid "You must specify an operator class for the range type or define a default operator class for the subtype."
 msgstr "Ви повинні вказати клас операторів для типу діапазону або визначити клас операторів за замовчуванням для цього підтипу."
 
-#: commands/typecmds.c:2344
+#: commands/typecmds.c:2382
 #, c-format
 msgid "range canonical function %s must return range type"
 msgstr "функція канонічного діапазону %s повинна вертати тип діапазону"
 
-#: commands/typecmds.c:2350
+#: commands/typecmds.c:2388
 #, c-format
 msgid "range canonical function %s must be immutable"
 msgstr "функція канонічного діапазону %s повинна бути незмінною"
 
-#: commands/typecmds.c:2386
+#: commands/typecmds.c:2424
 #, c-format
 msgid "range subtype diff function %s must return type %s"
 msgstr "функція розбіжностей для підтипу діапазону %s повинна повертати тип %s"
 
-#: commands/typecmds.c:2393
+#: commands/typecmds.c:2431
 #, c-format
 msgid "range subtype diff function %s must be immutable"
 msgstr "функція розбіжностей для підтипу діапазону %s повинна бути незмінною"
 
-#: commands/typecmds.c:2420
+#: commands/typecmds.c:2458
 #, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
 msgstr "значення OID масиву pg_type не встановлено в режимі двійкового оновлення"
 
-#: commands/typecmds.c:2453
+#: commands/typecmds.c:2491
 #, c-format
 msgid "pg_type multirange OID value not set when in binary upgrade mode"
 msgstr "значення OID в pg_type не задано під час режиму двійкового оновлення"
 
-#: commands/typecmds.c:2486
+#: commands/typecmds.c:2524
 #, c-format
 msgid "pg_type multirange array OID value not set when in binary upgrade mode"
 msgstr "значення OID масиву в pg_type не задано під час режиму двійкового оновлення"
 
-#: commands/typecmds.c:2868 commands/typecmds.c:3093
+#: commands/typecmds.c:2906 commands/typecmds.c:3088
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
 msgstr "обмеження \"%s\" для домену \"%s\" не існує"
 
-#: commands/typecmds.c:2872
+#: commands/typecmds.c:2910
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
 msgstr "обмеження \"%s\" для домену \"%s\" не існує, пропускається"
 
-#: commands/typecmds.c:3100
+#: commands/typecmds.c:3095
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
 msgstr "обмеження \"%s\" для домену \"%s\" не є перевірочним обмеженням"
 
-#: commands/typecmds.c:3180
+#: commands/typecmds.c:3175
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "стовпець \"%s\" таблиці \"%s\" містить значення NULL"
 
-#: commands/typecmds.c:3269
+#: commands/typecmds.c:3264
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "стовпець \"%s\" таблиці \"%s\" містить значення, які порушують нове обмеження"
 
-#: commands/typecmds.c:3498 commands/typecmds.c:3772 commands/typecmds.c:3857
-#: commands/typecmds.c:4073
+#: commands/typecmds.c:3493 commands/typecmds.c:3771 commands/typecmds.c:3856
+#: commands/typecmds.c:4072
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s - не домен"
 
-#: commands/typecmds.c:3532 commands/typecmds.c:3686
+#: commands/typecmds.c:3527 commands/typecmds.c:3683
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "обмеження \"%s\" для домену \"%s\" вже існує"
 
-#: commands/typecmds.c:3583
+#: commands/typecmds.c:3578
 #, c-format
 msgid "cannot use table references in domain check constraint"
 msgstr "у перевірочному обмеженні для домену не можна посилатись на таблиці"
 
-#: commands/typecmds.c:3784 commands/typecmds.c:3869 commands/typecmds.c:4223
+#: commands/typecmds.c:3783 commands/typecmds.c:3868 commands/typecmds.c:4222
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s - тип рядків таблиці"
 
-#: commands/typecmds.c:3794 commands/typecmds.c:3879 commands/typecmds.c:4121
+#: commands/typecmds.c:3793 commands/typecmds.c:3878 commands/typecmds.c:4120
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "змінити тип масиву \"%s\" не можна"
 
-#: commands/typecmds.c:3796 commands/typecmds.c:3881 commands/typecmds.c:4123
+#: commands/typecmds.c:3795 commands/typecmds.c:3880 commands/typecmds.c:4122
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Ви можете змінити тип %s, який спричинить зміну типу масиву."
 
-#: commands/typecmds.c:3892
+#: commands/typecmds.c:3891
 #, c-format
 msgid "cannot alter multirange type %s"
 msgstr "не можна змінювати багатодіапазонний тип %s"
 
-#: commands/typecmds.c:3895
+#: commands/typecmds.c:3894
 #, c-format
 msgid "You can alter type %s, which will alter the multirange type as well."
 msgstr "Ви можете змінити тип %s, що також змінить тип мультидіапазону."
 
-#: commands/typecmds.c:4202
+#: commands/typecmds.c:4201
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "тип \"%s\" вже існує в схемі \"%s\""
 
-#: commands/typecmds.c:4382
+#: commands/typecmds.c:4381
 #, c-format
 msgid "cannot change type's storage to PLAIN"
 msgstr "неможливо змінити сховище типу на PLAIN"
 
-#: commands/typecmds.c:4475
+#: commands/typecmds.c:4474
 #, c-format
 msgid "type attribute \"%s\" cannot be changed"
 msgstr "атрибут типу \"%s\" неможливо змінити"
 
-#: commands/typecmds.c:4493
+#: commands/typecmds.c:4492
 #, c-format
 msgid "must be superuser to alter a type"
 msgstr "для зміни типу потрібно бути суперкористувачем"
 
-#: commands/typecmds.c:4514 commands/typecmds.c:4523
+#: commands/typecmds.c:4513 commands/typecmds.c:4522
 #, c-format
 msgid "%s is not a base type"
 msgstr "%s - не є базовим типом"
@@ -12787,7 +13191,7 @@ msgid "Only roles with the %s attribute may create roles with the %s attribute."
 msgstr "Тільки ролі з атрибутом %s можуть створювати ролі з атрибутом %s."
 
 #: commands/user.c:354 commands/user.c:1386 commands/user.c:1393
-#: utils/adt/acl.c:5574 utils/adt/acl.c:5580 gram.y:17310 gram.y:17356
+#: utils/adt/acl.c:5707 utils/adt/acl.c:5713 gram.y:17473 gram.y:17519
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "ім'я ролі \"%s\" зарезервовано"
@@ -12847,8 +13251,8 @@ msgstr "Щоб змінити пароль іншої ролі, поточний
 
 #: commands/user.c:825
 #, c-format
-msgid "Only roles with the %s option on role \"%s\" may add members."
-msgstr "Тільки ролі з опцією %s на роль \"%s\" можуть додавати учасників."
+msgid "Only roles with the %s option on role \"%s\" may add or drop members."
+msgstr "Тільки ролі з опцією %s на роль \"%s\" можуть додавати чи видаляти учасників."
 
 #: commands/user.c:870
 #, c-format
@@ -12880,11 +13284,11 @@ msgstr "Тільки ролі з атрибутом %s та опцією %s на
 msgid "cannot use special role specifier in DROP ROLE"
 msgstr "використати спеціальну роль у DROP ROLE не можна"
 
-#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:838
-#: commands/variable.c:841 commands/variable.c:947 commands/variable.c:950
-#: utils/adt/acl.c:365 utils/adt/acl.c:385 utils/adt/acl.c:5429
-#: utils/adt/acl.c:5477 utils/adt/acl.c:5505 utils/adt/acl.c:5524
-#: utils/adt/regproc.c:1571 utils/init/miscinit.c:762
+#: commands/user.c:1135 commands/user.c:1357 commands/variable.c:864
+#: commands/variable.c:867 commands/variable.c:983 commands/variable.c:986
+#: utils/adt/acl.c:383 utils/adt/acl.c:403 utils/adt/acl.c:5562
+#: utils/adt/acl.c:5610 utils/adt/acl.c:5638 utils/adt/acl.c:5657
+#: utils/adt/regproc.c:1571 utils/init/miscinit.c:804
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "роль \"%s\" не існує"
@@ -12949,7 +13353,7 @@ msgstr "Тільки ролі з атрибутом %s та опцією %s на
 msgid "MD5 password cleared because of role rename"
 msgstr "У результаті перейменування ролі сума MD5 паролю очищена"
 
-#: commands/user.c:1518 gram.y:1294
+#: commands/user.c:1518 gram.y:1285
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "нерозпізнаний параметр ролі \"%s\""
@@ -12989,244 +13393,239 @@ msgstr "Тільки ролі з привілеями ролі \"%s\" можут
 msgid "Only roles with privileges of role \"%s\" may reassign objects to it."
 msgstr "Тільки ролі з привілеями ролі \"%s\" можуть перепризначати об'єкти."
 
-#: commands/user.c:1733
+#: commands/user.c:1734
 #, c-format
 msgid "role \"%s\" cannot be a member of any role"
 msgstr "роль \"%s\" не може бути членом якої-небудь ролі"
 
-#: commands/user.c:1746
+#: commands/user.c:1747
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
 msgstr "роль \"%s\" - учасник ролі \"%s\""
 
-#: commands/user.c:1786 commands/user.c:1812
+#: commands/user.c:1787 commands/user.c:1813
 #, c-format
 msgid "%s option cannot be granted back to your own grantor"
 msgstr "параметр %s не можна призначити тому, хто призначив їх вам"
 
-#: commands/user.c:1889
+#: commands/user.c:1890
 #, c-format
 msgid "role \"%s\" has already been granted membership in role \"%s\" by role \"%s\""
 msgstr "роль \"%s\" вже отримала членство в ролі \"%s\" від ролі \"%s\""
 
-#: commands/user.c:2024
+#: commands/user.c:2025
 #, c-format
 msgid "role \"%s\" has not been granted membership in role \"%s\" by role \"%s\""
 msgstr "роль \"%s\" не отримала членство в ролі \"%s\" від ролі \"%s\""
 
-#: commands/user.c:2124
+#: commands/user.c:2126
 #, c-format
 msgid "role \"%s\" cannot have explicit members"
 msgstr "роль \"%s\" не може мати явних членів"
 
-#: commands/user.c:2135 commands/user.c:2158
+#: commands/user.c:2137 commands/user.c:2160
 #, c-format
 msgid "permission denied to grant role \"%s\""
 msgstr "немає дозволу для надання ролі \"%s\""
 
-#: commands/user.c:2137
+#: commands/user.c:2139
 #, c-format
 msgid "Only roles with the %s attribute may grant roles with the %s attribute."
 msgstr "Тільки ролі з атрибутом %s можуть надавати членство ролі з атрибутом %s."
 
-#: commands/user.c:2142 commands/user.c:2165
+#: commands/user.c:2144 commands/user.c:2167
 #, c-format
 msgid "permission denied to revoke role \"%s\""
 msgstr "немає дозволу для відкликання ролі \"%s\""
 
-#: commands/user.c:2144
+#: commands/user.c:2146
 #, c-format
 msgid "Only roles with the %s attribute may revoke roles with the %s attribute."
 msgstr "Тільки ролі з атрибутом %s можуть відкликати членство ролі з атрибутом %s."
 
-#: commands/user.c:2160
+#: commands/user.c:2162
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may grant this role."
 msgstr "Тільки ролі з опцією %s на роль \"%s\" можуть надавати членство до цієї ролі."
 
-#: commands/user.c:2167
+#: commands/user.c:2169
 #, c-format
 msgid "Only roles with the %s option on role \"%s\" may revoke this role."
 msgstr "Тільки ролі з опцією %s на роль \"%s\" можуть відкликати членство в цій ролі."
 
-#: commands/user.c:2247 commands/user.c:2256
+#: commands/user.c:2249 commands/user.c:2258
 #, c-format
 msgid "permission denied to grant privileges as role \"%s\""
 msgstr "немає дозволу для надання привілеїв ролі \"%s\""
 
-#: commands/user.c:2249
+#: commands/user.c:2251
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may grant privileges as this role."
 msgstr "Тільки ролі з привілеями ролі \"%s\" можуть надавати привілеї цієї ролі."
 
-#: commands/user.c:2258
+#: commands/user.c:2260
 #, c-format
 msgid "The grantor must have the %s option on role \"%s\"."
 msgstr "Власник прав повинен мати опцію %s для ролі \"%s\"."
 
-#: commands/user.c:2266
+#: commands/user.c:2268
 #, c-format
 msgid "permission denied to revoke privileges granted by role \"%s\""
 msgstr "відмовлено у дозволі на відкликання привілеїв, наданих роллю \"%s\""
 
-#: commands/user.c:2268
+#: commands/user.c:2270
 #, c-format
 msgid "Only roles with privileges of role \"%s\" may revoke privileges granted by this role."
 msgstr "Тільки ролі з привілеями ролі \"%s\" можуть відкликати привілеї, надані цією роллю."
 
-#: commands/user.c:2491 utils/adt/acl.c:1324
+#: commands/user.c:2493 utils/adt/acl.c:1342
 #, c-format
 msgid "dependent privileges exist"
 msgstr "залежні права існують"
 
-#: commands/user.c:2492 utils/adt/acl.c:1325
+#: commands/user.c:2494 utils/adt/acl.c:1343
 #, c-format
 msgid "Use CASCADE to revoke them too."
 msgstr "Використайте CASCADE, щоб відкликати їх."
 
-#: commands/vacuum.c:134
+#: commands/vacuum.c:148
 #, c-format
-msgid "\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB"
-msgstr "\"vacuum_buffer_usage_limit\" має бути 0 або між %d та %d kB"
+msgid "\"%s\" must be 0 or between %d kB and %d kB."
+msgstr "\"%s\" повинен бути 0 або між %d кБ і %d кБ."
 
-#: commands/vacuum.c:209
+#: commands/vacuum.c:224
 #, c-format
 msgid "BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB"
 msgstr "Параметр BUFFER_USAGE_LIMIT повинен бути 0 або між %d та %d kB"
 
-#: commands/vacuum.c:219
-#, c-format
-msgid "unrecognized ANALYZE option \"%s\""
-msgstr "нерозпізнаний параметр ANALYZE \"%s\""
-
-#: commands/vacuum.c:259
+#: commands/vacuum.c:275
 #, c-format
 msgid "parallel option requires a value between 0 and %d"
 msgstr "паралельний параметр потребує значення між 0 і %d"
 
-#: commands/vacuum.c:271
+#: commands/vacuum.c:287
 #, c-format
 msgid "parallel workers for vacuum must be between 0 and %d"
 msgstr "одночасні процеси для очищення повинні бути між 0 і %d"
 
-#: commands/vacuum.c:292
-#, c-format
-msgid "unrecognized VACUUM option \"%s\""
-msgstr "нерозпізнаний параметр VACUUM \"%s\""
-
-#: commands/vacuum.c:318
+#: commands/vacuum.c:335
 #, c-format
 msgid "VACUUM FULL cannot be performed in parallel"
 msgstr "VACUUM FULL не можна виконати паралельно"
 
-#: commands/vacuum.c:329
+#: commands/vacuum.c:346
 #, c-format
 msgid "BUFFER_USAGE_LIMIT cannot be specified for VACUUM FULL"
 msgstr "BUFFER_USAGE_LIMIT не можна задати для VACUUM FULL"
 
-#: commands/vacuum.c:343
+#: commands/vacuum.c:360
 #, c-format
 msgid "ANALYZE option must be specified when a column list is provided"
 msgstr "Якщо задається список стовпців, необхідно вказати параметр ANALYZE"
 
-#: commands/vacuum.c:355
+#: commands/vacuum.c:372
 #, c-format
 msgid "VACUUM option DISABLE_PAGE_SKIPPING cannot be used with FULL"
 msgstr "Параметр VACUUM DISABLE_PAGE_SKIPPING не можна використовувати з FULL"
 
-#: commands/vacuum.c:362
+#: commands/vacuum.c:379
 #, c-format
 msgid "PROCESS_TOAST required with VACUUM FULL"
 msgstr "PROCESS_TOAST потребується з VACUUM FULL"
 
-#: commands/vacuum.c:371
+#: commands/vacuum.c:388
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with a list of tables"
 msgstr "ONLY_DATABASE_STATS не можна вказувати зі списком таблиць"
 
-#: commands/vacuum.c:380
+#: commands/vacuum.c:397
 #, c-format
 msgid "ONLY_DATABASE_STATS cannot be specified with other VACUUM options"
 msgstr "ONLY_DATABASE_STATS не можна вказувати з іншими опціями VACUUUM"
 
-#: commands/vacuum.c:515
+#: commands/vacuum.c:537
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
 msgstr "%s не можна виконати під час VACUUM або ANALYZE"
 
-#: commands/vacuum.c:730
+#: commands/vacuum.c:759
 #, c-format
 msgid "permission denied to vacuum \"%s\", skipping it"
 msgstr "немає дозволу для очистки\"%s\", пропускаємо його"
 
-#: commands/vacuum.c:743
+#: commands/vacuum.c:772
 #, c-format
 msgid "permission denied to analyze \"%s\", skipping it"
 msgstr "відмовлено в дозволі на аналіз \"%s\", пропуск"
 
-#: commands/vacuum.c:821 commands/vacuum.c:918
+#: commands/vacuum.c:850 commands/vacuum.c:951
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "очистка \"%s\" пропускається --- блокування недоступне"
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:855
 #, c-format
 msgid "skipping vacuum of \"%s\" --- relation no longer exists"
 msgstr "очистка \"%s\" пропускається --- це відношення більше не існує"
 
-#: commands/vacuum.c:842 commands/vacuum.c:923
+#: commands/vacuum.c:871 commands/vacuum.c:956
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "пропуск аналізу об'єкта \"%s\" --- блокування недоступне"
 
-#: commands/vacuum.c:847
+#: commands/vacuum.c:876
 #, c-format
 msgid "skipping analyze of \"%s\" --- relation no longer exists"
 msgstr "пропуск аналізу об'єкта\"%s\" --- відношення більше не існує"
 
-#: commands/vacuum.c:1139
+#: commands/vacuum.c:992
+#, c-format
+msgid "VACUUM ONLY of partitioned table \"%s\" has no effect"
+msgstr "VACUUM ONLY партиційної таблиці \"%s\" не має ефекту"
+
+#: commands/vacuum.c:1183
 #, c-format
 msgid "cutoff for removing and freezing tuples is far in the past"
 msgstr "відсікання для видалення та заморожування кортежів залишилося далеко в минулому"
 
-#: commands/vacuum.c:1140 commands/vacuum.c:1145
+#: commands/vacuum.c:1184 commands/vacuum.c:1189
 #, c-format
 msgid "Close open transactions soon to avoid wraparound problems.\n"
 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots."
 msgstr "Завершіть відкриті транзакції якнайшвидше, щоб уникнути проблеми зациклення.\n"
 "Можливо, вам також доведеться затвердити або відкотити старі підготовленні транзакції, або видалити застарілі слоти реплікації."
 
-#: commands/vacuum.c:1144
+#: commands/vacuum.c:1188
 #, c-format
 msgid "cutoff for freezing multixacts is far in the past"
 msgstr "відсікання для заморожування мультитранзакцій залишилося далеко в минулому"
 
-#: commands/vacuum.c:1890
+#: commands/vacuum.c:1950
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "деякі бази даних не очищалися протягом більш ніж 2 мільярдів транзакцій"
 
-#: commands/vacuum.c:1891
+#: commands/vacuum.c:1951
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Можливо, ви вже втратили дані в результаті зациклення транзакцій."
 
-#: commands/vacuum.c:2070
+#: commands/vacuum.c:2143
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "пропускається \"%s\" --- очищати не таблиці або спеціальні системні таблиці не можна"
 
-#: commands/vacuum.c:2502
+#: commands/vacuum.c:2659
 #, c-format
-msgid "scanned index \"%s\" to remove %lld row versions"
-msgstr ""
+msgid "scanned index \"%s\" to remove %<PRId64> row versions"
+msgstr "проскановано індекс \"%s\" для видалення %<PRId64> версій рядків"
 
-#: commands/vacuum.c:2521
+#: commands/vacuum.c:2678
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "індекс \"%s\" наразі містить %.0f версій рядків у %u сторінках"
 
-#: commands/vacuum.c:2525
+#: commands/vacuum.c:2682
 #, c-format
 msgid "%.0f index row versions were removed.\n"
 "%u index pages were newly deleted.\n"
@@ -13235,7 +13634,7 @@ msgstr "%.0f версій індексних рядків було видале
 "%u індексних сторінок щойно видалено.\n"
 "%u індексних сторінок наразі видалено, з яких %u наразі можна використовувати повторно."
 
-#: commands/vacuumparallel.c:708
+#: commands/vacuumparallel.c:709
 #, c-format
 msgid "launched %d parallel vacuum worker for index vacuuming (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index vacuuming (planned: %d)"
@@ -13244,19 +13643,19 @@ msgstr[1] "запущено %d паралельних виконавців оч
 msgstr[2] "запущено %d паралельних виконавців очистки для очищення індексу (заплановано: %d)"
 msgstr[3] "запущено %d паралельних виконавців очистки для очищення індексу (заплановано: %d)"
 
-#: commands/vacuumparallel.c:714
+#: commands/vacuumparallel.c:715
 #, c-format
 msgid "launched %d parallel vacuum worker for index cleanup (planned: %d)"
 msgid_plural "launched %d parallel vacuum workers for index cleanup (planned: %d)"
-msgstr[0] "запущений %d паралельний виконавець очистки для очищення індексу (заплановано: %d)"
+msgstr[0] "запущено %d паралельний виконавець очистки для очищення індексу (заплановано: %d)"
 msgstr[1] "запущено %d паралельних виконавців очистки для очищення індексу (заплановано: %d)"
 msgstr[2] "запущено %d паралельних виконавців очистки для очищення індексу (заплановано: %d)"
 msgstr[3] "запущено %d паралельних виконавців очистки для очищення індексу (заплановано: %d)"
 
 #: commands/variable.c:185
 #, c-format
-msgid "Conflicting \"datestyle\" specifications."
-msgstr "Суперечливі специфікації стилю дат."
+msgid "Conflicting \"DateStyle\" specifications."
+msgstr "Конфліктуючі специфікації \"DateStyle\"."
 
 #: commands/variable.c:307
 #, c-format
@@ -13268,12 +13667,12 @@ msgstr "В інтервалі, що задає часовий пояс, не м
 msgid "Cannot specify days in time zone interval."
 msgstr "В інтервалі, що задає часовий пояс, не можна вказувати дні."
 
-#: commands/variable.c:351 commands/variable.c:433
+#: commands/variable.c:351 commands/variable.c:435
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "часовий пояс \"%s\", мабуть, використовує високосні секунди"
 
-#: commands/variable.c:353 commands/variable.c:435
+#: commands/variable.c:353 commands/variable.c:437
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL не підтримує високосні секунди."
@@ -13283,107 +13682,97 @@ msgstr "PostgreSQL не підтримує високосні секунди."
 msgid "UTC timezone offset is out of range."
 msgstr "Зсув часового поясу UTC поза діапазоном."
 
-#: commands/variable.c:552
+#: commands/variable.c:554
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "не можна встановити режим транзакції \"читання-запис\" всередині транзакції \"лише читання\""
 
-#: commands/variable.c:559
+#: commands/variable.c:561
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr "режим транзакції \"читання-запис\" повинен бути встановлений до виконання запитів"
 
-#: commands/variable.c:566
+#: commands/variable.c:568
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr "не можна встановити режим транзакції \"читання-запис\" під час відновлення"
 
-#: commands/variable.c:592
+#: commands/variable.c:596
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "Команда SET TRANSACTION ISOLATION LEVEL повинна викликатися до будь-яких запитів"
 
-#: commands/variable.c:599
+#: commands/variable.c:603
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr "Команда SET TRANSACTION ISOLATION LEVEL не повинна викликатияь в підтранзакції"
 
-#: commands/variable.c:606 storage/lmgr/predicate.c:1680
+#: commands/variable.c:610 storage/lmgr/predicate.c:1695
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "використовувати серіалізований режим в hot standby не можна"
 
-#: commands/variable.c:607
+#: commands/variable.c:611
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Ви можете використати REPEATABLE READ замість цього."
 
-#: commands/variable.c:625
+#: commands/variable.c:633
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr "Команда SET TRANSACTION [NOT] DEFERRABLE не може викликатись в підтранзакції"
 
-#: commands/variable.c:631
+#: commands/variable.c:639
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr "Команда SET TRANSACTION [NOT] DEFERRABLE повинна викликатись до будь-яких запитів"
 
-#: commands/variable.c:713
+#: commands/variable.c:715
+#, c-format
+msgid "Cannot change \"client_encoding\" during a parallel operation."
+msgstr "Не можна змінити \"client_encoding\" під час паралельної операції."
+
+#: commands/variable.c:743
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "Перетворення між %s і %s не підтримується."
 
-#: commands/variable.c:720
+#: commands/variable.c:750
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "Змінити клієнтське кодування зараз неможливо."
 
-#: commands/variable.c:781
-#, c-format
-msgid "cannot change \"client_encoding\" during a parallel operation"
-msgstr ""
-
-#: commands/variable.c:863
+#: commands/variable.c:889
 #, c-format
 msgid "permission will be denied to set session authorization \"%s\""
 msgstr "буде відмовлено у встановленні авторизації сеансу \"%s\""
 
-#: commands/variable.c:868
+#: commands/variable.c:894
 #, c-format
 msgid "permission denied to set session authorization \"%s\""
 msgstr "відмовлено у встановленні авторизації сеансу \"%s\""
 
-#: commands/variable.c:972
+#: commands/variable.c:1003
 #, c-format
 msgid "permission will be denied to set role \"%s\""
-msgstr "немає прав для встановлення ролі \"%s\""
+msgstr "немає дозволу для встановлення ролі \"%s\""
 
-#: commands/variable.c:977
+#: commands/variable.c:1008
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "немає прав для встановлення ролі \"%s\""
 
-#: commands/variable.c:1177
+#: commands/variable.c:1226
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour не підтримується даною збіркою"
 
-#: commands/variable.c:1205
-#, c-format
-msgid "\"effective_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr ""
-
-#: commands/variable.c:1218
-#, c-format
-msgid "\"maintenance_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."
-msgstr ""
-
-#: commands/variable.c:1231
+#: commands/variable.c:1254
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL не підтримується даною збіркою"
 
-#: commands/view.c:79
+#: commands/view.c:78
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr "не вдалося визначити, яке правило сортування використати для стовпця подання \"%s\""
@@ -13469,57 +13858,57 @@ msgstr "курсор \"%s\" не розташовується у рядку"
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "курсор \"%s\" - не просте оновлюване сканування таблиці \"%s\""
 
-#: executor/execCurrent.c:280 executor/execExprInterp.c:2543
+#: executor/execCurrent.c:280 executor/execExprInterp.c:3093
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "тип параметру %d (%s) не відповідає тому, з котрим тривала підготовка плану (%s)"
 
-#: executor/execCurrent.c:292 executor/execExprInterp.c:2555
+#: executor/execCurrent.c:292 executor/execExprInterp.c:3105
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "не знайдено значення для параметру %d"
 
-#: executor/execExpr.c:642 executor/execExpr.c:649 executor/execExpr.c:655
-#: executor/execExprInterp.c:4840 executor/execExprInterp.c:4857
-#: executor/execExprInterp.c:4956 executor/nodeModifyTable.c:203
-#: executor/nodeModifyTable.c:214 executor/nodeModifyTable.c:231
-#: executor/nodeModifyTable.c:239
+#: executor/execExpr.c:667 executor/execExpr.c:674 executor/execExpr.c:680
+#: executor/execExprInterp.c:5439 executor/execExprInterp.c:5456
+#: executor/execExprInterp.c:5555 executor/nodeModifyTable.c:211
+#: executor/nodeModifyTable.c:230 executor/nodeModifyTable.c:247
+#: executor/nodeModifyTable.c:257 executor/nodeModifyTable.c:267
 #, c-format
 msgid "table row type and query-specified row type do not match"
 msgstr "тип рядка таблиці відрізняється від типу рядка-результату запиту"
 
-#: executor/execExpr.c:643 executor/nodeModifyTable.c:204
+#: executor/execExpr.c:668 executor/nodeModifyTable.c:212
 #, c-format
 msgid "Query has too many columns."
 msgstr "Запит повертає дуже багато стовпців."
 
-#: executor/execExpr.c:650 executor/nodeModifyTable.c:232
+#: executor/execExpr.c:675 executor/nodeModifyTable.c:231
 #, c-format
 msgid "Query provides a value for a dropped column at ordinal position %d."
 msgstr "Запит надає значення для видаленого стовпця з порядковим номером %d."
 
-#: executor/execExpr.c:656 executor/execExprInterp.c:4858
-#: executor/nodeModifyTable.c:215
+#: executor/execExpr.c:681 executor/execExprInterp.c:5457
+#: executor/nodeModifyTable.c:258
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "Таблиця має тип %s у порядковому розташуванні %d, але запит очікує %s."
 
-#: executor/execExpr.c:1104 parser/parse_agg.c:838
+#: executor/execExpr.c:1157 parser/parse_agg.c:896
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "виклики віконних функцій не можуть бути вкладеними"
 
-#: executor/execExpr.c:1641
+#: executor/execExpr.c:1689
 #, c-format
 msgid "target type is not an array"
 msgstr "цільовий тип не є масивом"
 
-#: executor/execExpr.c:1981
+#: executor/execExpr.c:2033
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "Стовпець ROW() має тип %s замість %s"
 
-#: executor/execExpr.c:2643 executor/execSRF.c:718 parser/parse_func.c:138
+#: executor/execExpr.c:2729 executor/execSRF.c:718 parser/parse_func.c:138
 #: parser/parse_func.c:655 parser/parse_func.c:1033
 #, c-format
 msgid "cannot pass more than %d argument to a function"
@@ -13529,121 +13918,121 @@ msgstr[1] "функції не можна передати більше ніж %
 msgstr[2] "функції не можна передати більше ніж %d аргументів"
 msgstr[3] "функції не можна передати більше ніж %d аргументів"
 
-#: executor/execExpr.c:2670 executor/execSRF.c:738 executor/functions.c:1068
-#: utils/adt/jsonfuncs.c:4054 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
+#: executor/execExpr.c:2756 executor/execSRF.c:738 executor/functions.c:1604
+#: utils/adt/jsonfuncs.c:4056 utils/fmgr/funcapi.c:89 utils/fmgr/funcapi.c:143
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "функція \"set-valued\" викликана в контексті, де йому немає місця"
 
-#: executor/execExpr.c:3076 parser/parse_node.c:272 parser/parse_node.c:322
+#: executor/execExpr.c:3262 parser/parse_node.c:272 parser/parse_node.c:322
 #, c-format
 msgid "cannot subscript type %s because it does not support subscripting"
 msgstr "не можна підписати вказати тип %s, тому що він не підтримує підписку"
 
-#: executor/execExpr.c:3204 executor/execExpr.c:3226
+#: executor/execExpr.c:3390 executor/execExpr.c:3412
 #, c-format
 msgid "type %s does not support subscripted assignment"
 msgstr "тип %s не підтримує вказані присвоєння за підпискою"
 
-#: executor/execExprInterp.c:2007
+#: executor/execExprInterp.c:2415
 #, c-format
 msgid "attribute %d of type %s has been dropped"
 msgstr "атрибут %d типу %s був видалений"
 
-#: executor/execExprInterp.c:2013
+#: executor/execExprInterp.c:2421
 #, c-format
 msgid "attribute %d of type %s has wrong type"
 msgstr "атрибут %d типу %s має неправильний тип"
 
-#: executor/execExprInterp.c:2015 executor/execExprInterp.c:3214
-#: executor/execExprInterp.c:3260
+#: executor/execExprInterp.c:2423 executor/execExprInterp.c:3782
+#: executor/execExprInterp.c:3828
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "Таблиця має тип %s, але запит очікував %s."
 
-#: executor/execExprInterp.c:2095 utils/adt/expandedrecord.c:99
-#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1752
-#: utils/cache/typcache.c:1911 utils/cache/typcache.c:2058
+#: executor/execExprInterp.c:2503 utils/adt/expandedrecord.c:99
+#: utils/adt/expandedrecord.c:231 utils/cache/typcache.c:1841
+#: utils/cache/typcache.c:2000 utils/cache/typcache.c:2147
 #: utils/fmgr/funcapi.c:569
 #, c-format
 msgid "type %s is not composite"
 msgstr "тип %s не є складеним"
 
-#: executor/execExprInterp.c:2698
+#: executor/execExprInterp.c:3266
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF для таблиць такого типу не підтримується"
 
-#: executor/execExprInterp.c:2911
+#: executor/execExprInterp.c:3479
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "не можна об'єднати несумісні масиви"
 
-#: executor/execExprInterp.c:2912
+#: executor/execExprInterp.c:3480
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "Масив з типом елементів %s не може бути включений в конструкцію ARRAY з типом елементів %s."
 
-#: executor/execExprInterp.c:2933 utils/adt/arrayfuncs.c:1305
-#: utils/adt/arrayfuncs.c:3503 utils/adt/arrayfuncs.c:5593
-#: utils/adt/arrayfuncs.c:6110 utils/adt/arraysubs.c:150
-#: utils/adt/arraysubs.c:488
+#: executor/execExprInterp.c:3501 utils/adt/arrayfuncs.c:1305
+#: utils/adt/arrayfuncs.c:3515 utils/adt/arrayfuncs.c:5605
+#: utils/adt/arrayfuncs.c:6124 utils/adt/arraysubs.c:151
+#: utils/adt/arraysubs.c:489
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "число вимірів масива (%d) перевищує ліміт (%d)"
 
-#: executor/execExprInterp.c:2953 executor/execExprInterp.c:2988
+#: executor/execExprInterp.c:3521 executor/execExprInterp.c:3556
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "для багатовимірних масивів повинні задаватись вирази з відповідними вимірами"
 
-#: executor/execExprInterp.c:2965 utils/adt/array_expanded.c:274
+#: executor/execExprInterp.c:3533 utils/adt/array_expanded.c:274
 #: utils/adt/arrayfuncs.c:335 utils/adt/arrayfuncs.c:494
 #: utils/adt/arrayfuncs.c:727 utils/adt/arrayfuncs.c:1533
 #: utils/adt/arrayfuncs.c:2341 utils/adt/arrayfuncs.c:2356
 #: utils/adt/arrayfuncs.c:2618 utils/adt/arrayfuncs.c:2634
 #: utils/adt/arrayfuncs.c:2895 utils/adt/arrayfuncs.c:2949
 #: utils/adt/arrayfuncs.c:2964 utils/adt/arrayfuncs.c:3305
-#: utils/adt/arrayfuncs.c:3533 utils/adt/arrayfuncs.c:5365
-#: utils/adt/arrayfuncs.c:6202 utils/adt/arrayfuncs.c:6546
+#: utils/adt/arrayfuncs.c:3545 utils/adt/arrayfuncs.c:5377
+#: utils/adt/arrayfuncs.c:6216 utils/adt/arrayfuncs.c:6560
 #: utils/adt/arrayutils.c:83 utils/adt/arrayutils.c:92
 #: utils/adt/arrayutils.c:99
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "розмір масиву перевищує максимальний допустимий розмір (%d)"
 
-#: executor/execExprInterp.c:3213 executor/execExprInterp.c:3259
+#: executor/execExprInterp.c:3781 executor/execExprInterp.c:3827
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "атрибут %d має неправильний тип"
 
-#: executor/execExprInterp.c:3845 utils/adt/domains.c:158
+#: executor/execExprInterp.c:4413 utils/adt/domains.c:158
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "домен %s не допускає значення null"
 
-#: executor/execExprInterp.c:3860 utils/adt/domains.c:196
+#: executor/execExprInterp.c:4428 utils/adt/domains.c:196
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "значення домену %s порушує перевірочнео бмеження \"%s\""
 
-#: executor/execExprInterp.c:4435
+#: executor/execExprInterp.c:5003
 #, c-format
 msgid "no SQL/JSON item found for specified path of column \"%s\""
-msgstr ""
+msgstr "не знайдено елемента SQL/JSON для вказаного шляху стовпця \"%s\""
 
-#: executor/execExprInterp.c:4440
+#: executor/execExprInterp.c:5008
 #, c-format
 msgid "no SQL/JSON item found for specified path"
-msgstr ""
+msgstr "не знайдено елемента SQL/JSON для вказаного шляху"
 
 #. translator: first %s is a SQL/JSON clause (e.g. ON ERROR)
-#: executor/execExprInterp.c:4640 executor/execExprInterp.c:4648
+#: executor/execExprInterp.c:5208 executor/execExprInterp.c:5216
 #, c-format
 msgid "could not coerce %s expression (%s) to the RETURNING type"
-msgstr ""
+msgstr "не вдалося привести %s вираз (%s) до типу RETURNING"
 
-#: executor/execExprInterp.c:4841
+#: executor/execExprInterp.c:5440
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
@@ -13652,258 +14041,261 @@ msgstr[1] "Рядок таблиці містить %d атрибути, але
 msgstr[2] "Рядок таблиці містить %d атрибутів, але запит очікував %d."
 msgstr[3] "Рядок таблиці містить %d атрибутів, але запит очікував %d."
 
-#: executor/execExprInterp.c:4957 executor/execSRF.c:977
+#: executor/execExprInterp.c:5556 executor/execSRF.c:977
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr "Невідповідність параметрів фізичного зберігання видаленого атрибуту %d."
 
-#: executor/execIndexing.c:593
+#: executor/execIndexing.c:608
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT не підтримує відкладені обмеження унікальності/обмеження-виключення в якості визначального індексу"
 
-#: executor/execIndexing.c:870
+#: executor/execIndexing.c:911
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "не вдалося створити обмеження-виключення \"%s\""
 
-#: executor/execIndexing.c:873
+#: executor/execIndexing.c:914
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Ключ %s конфліктує з ключем %s."
 
-#: executor/execIndexing.c:875
+#: executor/execIndexing.c:916
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Існують конфлікти ключей."
 
-#: executor/execIndexing.c:881
+#: executor/execIndexing.c:922
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "конфліктуюче значення ключа порушує обмеження-виключення \"%s\""
 
-#: executor/execIndexing.c:884
+#: executor/execIndexing.c:925
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Ключ %s конфліктує з існуючим ключем %s."
 
-#: executor/execIndexing.c:886
+#: executor/execIndexing.c:927
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Ключ конфліктує з існуючим ключем."
 
-#: executor/execMain.c:1043
+#: executor/execIndexing.c:1172
+#, c-format
+msgid "empty WITHOUT OVERLAPS value found in column \"%s\" in relation \"%s\""
+msgstr "знайдено порожнє значення WITHOUT OVERLAPS у стовпці \"%s\" у відношенні \"%s\""
+
+#: executor/execMain.c:1085
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "послідовність \"%s\" не можна змінити"
 
-#: executor/execMain.c:1049
+#: executor/execMain.c:1091
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "TOAST-відношення \"%s\" не можна змінити"
 
-#: executor/execMain.c:1068
+#: executor/execMain.c:1110
 #, c-format
 msgid "cannot change materialized view \"%s\""
 msgstr "змінити матеріалізоване подання \"%s\" не можна"
 
-#: executor/execMain.c:1080
+#: executor/execMain.c:1122
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
 msgstr "вставляти дані в зовнішню таблицю \"%s\" не можна"
 
-#: executor/execMain.c:1086
+#: executor/execMain.c:1128
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
 msgstr "зовнішня таблиця \"%s\" не допускає додавання даних"
 
-#: executor/execMain.c:1093
+#: executor/execMain.c:1135
 #, c-format
 msgid "cannot update foreign table \"%s\""
 msgstr "оновити зовнішню таблицю \"%s\" не можна"
 
-#: executor/execMain.c:1099
+#: executor/execMain.c:1141
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
 msgstr "зовнішня таблиця \"%s\" не дозволяє оновлення"
 
-#: executor/execMain.c:1106
+#: executor/execMain.c:1148
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
 msgstr "видаляти дані з зовнішньої таблиці \"%s\" не можна"
 
-#: executor/execMain.c:1112
+#: executor/execMain.c:1154
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
 msgstr "зовнішня таблиця \"%s\" не дозволяє видалення даних"
 
-#: executor/execMain.c:1123
+#: executor/execMain.c:1165
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "відношення \"%s\" не можна змінити"
 
-#: executor/execMain.c:1150
+#: executor/execMain.c:1192
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
 msgstr "блокувати рядки в послідовності \"%s\" не можна"
 
-#: executor/execMain.c:1157
+#: executor/execMain.c:1199
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
 msgstr "блокувати рядки в TOAST-відношенні \"%s\" не можна"
 
-#: executor/execMain.c:1164
+#: executor/execMain.c:1206
 #, c-format
 msgid "cannot lock rows in view \"%s\""
 msgstr "блокувати рядки в поданні \"%s\" не можна"
 
-#: executor/execMain.c:1172
+#: executor/execMain.c:1214
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "блокувати рядки в матеріалізованому поданні \"%s\" не можна"
 
-#: executor/execMain.c:1181 executor/execMain.c:2686
+#: executor/execMain.c:1223 executor/execMain.c:2865
 #: executor/nodeLockRows.c:135
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
 msgstr "блокувати рядки в зовнішній таблиці \"%s\" не можна"
 
-#: executor/execMain.c:1187
+#: executor/execMain.c:1229
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
 msgstr "блокувати рядки у відношенні \"%s\" не можна"
 
-#: executor/execMain.c:1900
+#: executor/execMain.c:1962
 #, c-format
 msgid "new row for relation \"%s\" violates partition constraint"
 msgstr "новий рядок для відношення \"%s\" порушує обмеження секції"
 
-#: executor/execMain.c:1902 executor/execMain.c:1986 executor/execMain.c:2037
-#: executor/execMain.c:2147
+#: executor/execMain.c:1964 executor/execMain.c:2076 executor/execMain.c:2214
+#: executor/execMain.c:2322
 #, c-format
 msgid "Failing row contains %s."
 msgstr "Помилковий рядок містить %s."
 
-#: executor/execMain.c:1983
-#, c-format
-msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
-msgstr "null значення в стовпці \"%s\" відношення \"%s\" порушує not-null обмеження"
-
-#: executor/execMain.c:2035
+#: executor/execMain.c:2074
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "новий рядок для відношення \"%s\" порушує перевірне обмеження перевірку \"%s\""
 
-#: executor/execMain.c:2145
+#: executor/execMain.c:2211
+#, c-format
+msgid "null value in column \"%s\" of relation \"%s\" violates not-null constraint"
+msgstr "null значення в стовпці \"%s\" відношення \"%s\" порушує not-null обмеження"
+
+#: executor/execMain.c:2320
 #, c-format
 msgid "new row violates check option for view \"%s\""
 msgstr "новий рядок порушує параметр перевірки для подання \"%s\""
 
-#: executor/execMain.c:2155
+#: executor/execMain.c:2330
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
 msgstr "новий рядок порушує політику захисту на рівні рядків \"%s\" для таблиці \"%s\""
 
-#: executor/execMain.c:2160
+#: executor/execMain.c:2335
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
 msgstr "новий рядок порушує політику захисту на рівні рядків для таблиці \"%s\""
 
-#: executor/execMain.c:2168
+#: executor/execMain.c:2343
 #, c-format
 msgid "target row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "цільовий рядок порушує політику захисту на рівні рядків \"%s\" (вираз USING) для таблиці \"%s\""
 
-#: executor/execMain.c:2173
+#: executor/execMain.c:2348
 #, c-format
 msgid "target row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "цільовий рядок порушує політику захисту на рівні рядків (вираз USING) для таблиці \"%s\""
 
-#: executor/execMain.c:2180
+#: executor/execMain.c:2355
 #, c-format
 msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
 msgstr "новий рядок порушує політику захисту на рівні рядків \"%s\" (вираз USING) для таблиці \"%s\""
 
-#: executor/execMain.c:2185
+#: executor/execMain.c:2360
 #, c-format
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "новий рядок порушує політику захисту на рівні рядків (вираз USING) для таблиці \"%s\""
 
-#: executor/execPartition.c:327
+#: executor/execPartition.c:330
 #, c-format
 msgid "no partition of relation \"%s\" found for row"
 msgstr "для рядка не знайдено секції у відношенні \"%s\""
 
-#: executor/execPartition.c:330
+#: executor/execPartition.c:333
 #, c-format
 msgid "Partition key of the failing row contains %s."
 msgstr "Ключ секціонування для невідповідного рядка містить %s."
 
-#: executor/execReplication.c:272 executor/execReplication.c:456
+#: executor/execReplication.c:147
 #, c-format
 msgid "tuple to be locked was already moved to another partition due to concurrent update, retrying"
 msgstr "кортеж, що підлягає блокуванню, вже переміщено в іншу секцію в результаті паралельного оновлення, триває повторна спроба"
 
-#: executor/execReplication.c:276 executor/execReplication.c:460
+#: executor/execReplication.c:151
 #, c-format
 msgid "concurrent update, retrying"
 msgstr "паралельне оновлення, триває повторна спроба"
 
-#: executor/execReplication.c:282 executor/execReplication.c:466
+#: executor/execReplication.c:158
 #, c-format
 msgid "concurrent delete, retrying"
 msgstr "паралельне видалення, триває повторна спроба"
 
-#: executor/execReplication.c:352 parser/parse_cte.c:302
-#: parser/parse_oper.c:221 utils/adt/array_userfuncs.c:1334
-#: utils/adt/array_userfuncs.c:1477 utils/adt/arrayfuncs.c:3852
-#: utils/adt/arrayfuncs.c:4407 utils/adt/arrayfuncs.c:6426
-#: utils/adt/rowtypes.c:1220
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "не вдалося визначити оператора рівності для типу %s"
-
-#: executor/execReplication.c:683 executor/execReplication.c:689
+#: executor/execReplication.c:809 executor/execReplication.c:815
+#: executor/execReplication.c:821
 #, c-format
 msgid "cannot update table \"%s\""
 msgstr "оновити таблицю \"%s\" не можна"
 
-#: executor/execReplication.c:685 executor/execReplication.c:697
+#: executor/execReplication.c:811 executor/execReplication.c:829
 #, c-format
 msgid "Column used in the publication WHERE expression is not part of the replica identity."
 msgstr "Стовпець, що використовується в виразі WHERE публікації не є частиною ідентифікації репліки."
 
-#: executor/execReplication.c:691 executor/execReplication.c:703
+#: executor/execReplication.c:817 executor/execReplication.c:835
 #, c-format
 msgid "Column list used by the publication does not cover the replica identity."
 msgstr "Список стовпців, який використовується публікацією, не охоплює ідентифікацію репліки."
 
-#: executor/execReplication.c:695 executor/execReplication.c:701
+#: executor/execReplication.c:823 executor/execReplication.c:841
+#, c-format
+msgid "Replica identity must not contain unpublished generated columns."
+msgstr "Ідентичність репліки не повинна містити неопубліковані генеровані стовпці."
+
+#: executor/execReplication.c:827 executor/execReplication.c:833
+#: executor/execReplication.c:839
 #, c-format
 msgid "cannot delete from table \"%s\""
 msgstr "видалити дані з таблиці \"%s\" не можна"
 
-#: executor/execReplication.c:721
+#: executor/execReplication.c:859
 #, c-format
 msgid "cannot update table \"%s\" because it does not have a replica identity and publishes updates"
 msgstr "оновлення в таблиці \"%s\" неможливе, тому що в ній відсутній ідентифікатор репліки, і вона публікує оновлення"
 
-#: executor/execReplication.c:723
+#: executor/execReplication.c:861
 #, c-format
 msgid "To enable updating the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "Щоб ця таблиця підтримувала оновлення, встановіть REPLICA IDENTITY, використавши ALTER TABLE."
 
-#: executor/execReplication.c:727
+#: executor/execReplication.c:865
 #, c-format
 msgid "cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes"
 msgstr "видалення з таблиці \"%s\" неможливе, тому що в ній відсутній ідентифікатор репліки, і вона публікує видалення"
 
-#: executor/execReplication.c:729
+#: executor/execReplication.c:867
 #, c-format
 msgid "To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE."
 msgstr "Щоб ця таблиця підтримувала видалення, встановіть REPLICA IDENTITY, використавши ALTER TABLE."
 
-#: executor/execReplication.c:745
+#: executor/execReplication.c:883
 #, c-format
 msgid "cannot use relation \"%s.%s\" as logical replication target"
 msgstr "використовувати відношення \"%s.%s\" як ціль логічної реплікації, не можна"
@@ -13952,117 +14344,118 @@ msgstr[3] "Повернений рядок містить %d атрибутів,
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "Повернений тип %s у порядковій позиції %d, але запит очікував %s."
 
-#: executor/execTuples.c:147 executor/execTuples.c:368
-#: executor/execTuples.c:563 executor/execTuples.c:772
+#: executor/execTuples.c:147 executor/execTuples.c:369
+#: executor/execTuples.c:564 executor/execTuples.c:774
 #, c-format
 msgid "cannot retrieve a system column in this context"
 msgstr "не можна отримати системний стовпець в цьому контексті"
 
-#: executor/execTuples.c:163 executor/execTuples.c:580
+#: executor/execTuples.c:163 executor/execTuples.c:581
 #, c-format
 msgid "don't have transaction information for this type of tuple"
-msgstr ""
+msgstr "немає інформації про транзакцію для цього типу кортежу"
 
-#: executor/execTuples.c:390 executor/execTuples.c:794
+#: executor/execTuples.c:391 executor/execTuples.c:796
 #, c-format
 msgid "don't have a storage tuple in this context"
-msgstr ""
+msgstr "в цьому контексті немає сховища кортежів"
 
-#: executor/execUtils.c:713
+#: executor/execUtils.c:758
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
 msgstr "матеріалізоване подання \"%s\" не було наповнене"
 
-#: executor/execUtils.c:715
-#, c-format
-msgid "Use the REFRESH MATERIALIZED VIEW command."
-msgstr "Використайте команду REFRESH MATERIALIZED VIEW."
-
-#: executor/functions.c:217
+#: executor/functions.c:292
 #, c-format
 msgid "could not determine actual type of argument declared %s"
 msgstr "не вдалося визначити фактичний тип аргументу, оголошеного як %s"
 
-#: executor/functions.c:513
+#: executor/functions.c:737
 #, c-format
 msgid "cannot COPY to/from client in an SQL function"
 msgstr "у функції SQL не можна виконати COPY до/з клієнта"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:519
+#: executor/functions.c:743
 #, c-format
 msgid "%s is not allowed in an SQL function"
 msgstr "функція SQL не дозволяє використання %s"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:527 executor/spi.c:1741 executor/spi.c:2651
+#: executor/functions.c:751 executor/spi.c:1744 executor/spi.c:2657
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "незмінна функція не дозволяє використання %s"
 
-#: executor/functions.c:1452
+#: executor/functions.c:1185 executor/functions.c:2224
+#: executor/functions.c:2262 executor/functions.c:2276
+#: executor/functions.c:2366 executor/functions.c:2399
+#: executor/functions.c:2413
 #, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL функція \"%s\" оператор %d"
+msgid "return type mismatch in function declared to return %s"
+msgstr "невідповідність типу повернення в функції, оголошеній як %s"
 
-#: executor/functions.c:1478
+#: executor/functions.c:1187 executor/functions.c:2226
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "SQL функція \"%s\" під час запуску"
+msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
+msgstr "Останнім оператором у функції повинен бути SELECT або INSERT/UPDATE/DELETE/MERGE RETURNING."
 
-#: executor/functions.c:1563
+#: executor/functions.c:1270 utils/cache/plancache.c:860
 #, c-format
-msgid "calling procedures with output arguments is not supported in SQL functions"
-msgstr "виклик процедур з вихідними аргументами в функціях SQL не підтримується"
+msgid "cached plan must not change result type"
+msgstr "в кешованому плані не повинен змінюватись тип результату"
 
-#: executor/functions.c:1698 executor/functions.c:1736
-#: executor/functions.c:1750 executor/functions.c:1845
-#: executor/functions.c:1878 executor/functions.c:1892
+#: executor/functions.c:1922 executor/functions.c:1953
 #, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "невідповідність типу повернення в функції, оголошеній як %s"
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL функція \"%s\" під час запуску"
 
-#: executor/functions.c:1700
+#: executor/functions.c:1950
 #, c-format
-msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE/MERGE RETURNING."
-msgstr ""
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL функція \"%s\" оператор %d"
+
+#: executor/functions.c:2075
+#, c-format
+msgid "calling procedures with output arguments is not supported in SQL functions"
+msgstr "виклик процедур з вихідними аргументами в функціях SQL не підтримується"
 
-#: executor/functions.c:1738
+#: executor/functions.c:2264
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "Останній оператор повинен вертати один стовпець."
 
-#: executor/functions.c:1752
+#: executor/functions.c:2278
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Фактичний тип повернення: %s."
 
-#: executor/functions.c:1847
+#: executor/functions.c:2368
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "Останній оператор вертає дуже багато стовпців."
 
-#: executor/functions.c:1880
+#: executor/functions.c:2401
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "Останній оператор поветрає %s замість %s для стовпця %d."
 
-#: executor/functions.c:1894
+#: executor/functions.c:2415
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "Останній оператор вертає дуже мало стовпців."
 
-#: executor/functions.c:1922
+#: executor/functions.c:2443
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "для SQL функцій тип повернення %s не підтримується"
 
-#: executor/nodeAgg.c:3936 executor/nodeWindowAgg.c:2976
+#: executor/nodeAgg.c:4039 executor/nodeWindowAgg.c:3041
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "агрегатна функція %u повинна мати сумісні тип введення і тип переходу"
 
-#: executor/nodeAgg.c:3966 parser/parse_agg.c:680 parser/parse_agg.c:708
+#: executor/nodeAgg.c:4062 parser/parse_agg.c:692 parser/parse_agg.c:735
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "виклики агрегатних функцій не можуть бути вкладеними"
@@ -14072,12 +14465,12 @@ msgstr "виклики агрегатних функцій не можуть б
 msgid "custom scan \"%s\" does not support MarkPos"
 msgstr "налаштовуване сканування \"%s\" не підтримує MarkPos"
 
-#: executor/nodeHashjoin.c:1131 executor/nodeHashjoin.c:1161
+#: executor/nodeHashjoin.c:1230 executor/nodeHashjoin.c:1260
 #, c-format
 msgid "could not rewind hash-join temporary file"
 msgstr "не вдалося перемотати назад тимчасовий файл хеш-з'єднання"
 
-#: executor/nodeIndexonlyscan.c:239
+#: executor/nodeIndexonlyscan.c:240
 #, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr "функції неточної (lossy) дистанції не підтримуються в скануваннях лише по індексу"
@@ -14092,77 +14485,82 @@ msgstr "OFFSET повинен бути не негативним"
 msgid "LIMIT must not be negative"
 msgstr "LIMIT повинен бути не негативним"
 
-#: executor/nodeMergejoin.c:1579
+#: executor/nodeMergejoin.c:1574
 #, c-format
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN підтримується лише з умовами, які допускають з'єднання злиттям"
 
-#: executor/nodeMergejoin.c:1597
+#: executor/nodeMergejoin.c:1592
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN підтримується лише з умовами, які допускають з'єднання злиттям"
 
-#: executor/nodeModifyTable.c:240
+#: executor/nodeModifyTable.c:248
+#, c-format
+msgid "Query provides a value for a generated column at ordinal position %d."
+msgstr "Запит надає значення для згенерованого стовпця з порядковим номером %d."
+
+#: executor/nodeModifyTable.c:268
 #, c-format
 msgid "Query has too few columns."
 msgstr "Запит повертає дуже мало стовпців."
 
-#: executor/nodeModifyTable.c:1540 executor/nodeModifyTable.c:1614
+#: executor/nodeModifyTable.c:1686 executor/nodeModifyTable.c:1760
 #, c-format
 msgid "tuple to be deleted was already modified by an operation triggered by the current command"
 msgstr "кортеж, який підлягає видаленню, вже змінений в операції, яка викликана поточною командою"
 
-#: executor/nodeModifyTable.c:1769
+#: executor/nodeModifyTable.c:1959
 #, c-format
 msgid "invalid ON UPDATE specification"
 msgstr "неприпустима специфікація ON UPDATE"
 
-#: executor/nodeModifyTable.c:1770
+#: executor/nodeModifyTable.c:1960
 #, c-format
 msgid "The result tuple would appear in a different partition than the original tuple."
 msgstr "Результуючий кортеж з'явиться в іншій секції в порівнянні з оригінальним кортежем."
 
-#: executor/nodeModifyTable.c:2226
+#: executor/nodeModifyTable.c:2417
 #, c-format
 msgid "cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"
 msgstr "не можна пересувати кортеж між різними партиціями, коли не кореневий предок секції джерела безпосередньо посилається на зовнішній ключ"
 
-#: executor/nodeModifyTable.c:2227
+#: executor/nodeModifyTable.c:2418
 #, c-format
 msgid "A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\"."
 msgstr "Зовнішній ключ вказує на предка \"%s\", але не на кореневого предка \"%s\"."
 
-#: executor/nodeModifyTable.c:2230
+#: executor/nodeModifyTable.c:2421
 #, c-format
 msgid "Consider defining the foreign key on table \"%s\"."
 msgstr "Розгляньте визначення зовнішнього ключа для таблиці \"%s\"."
 
 #. translator: %s is a SQL command name
-#: executor/nodeModifyTable.c:2577 executor/nodeModifyTable.c:3099
-#: executor/nodeModifyTable.c:3260
+#: executor/nodeModifyTable.c:2788 executor/nodeModifyTable.c:3337
+#: executor/nodeModifyTable.c:3529
 #, c-format
 msgid "%s command cannot affect row a second time"
 msgstr "команда %s не може вплинути на рядок вдруге"
 
-#: executor/nodeModifyTable.c:2579
+#: executor/nodeModifyTable.c:2790
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "Переконайтеся, що немає рядків для вставки з тією ж командою з дуплікованими обмежувальними значеннями."
 
-#: executor/nodeModifyTable.c:3092 executor/nodeModifyTable.c:3253
+#: executor/nodeModifyTable.c:3330 executor/nodeModifyTable.c:3522
 #, c-format
 msgid "tuple to be updated or deleted was already modified by an operation triggered by the current command"
 msgstr "кортеж, який підлягає оновленню або видаленню, вже змінено операцією, викликаною поточною командою"
 
-#: executor/nodeModifyTable.c:3101 executor/nodeModifyTable.c:3262
+#: executor/nodeModifyTable.c:3339 executor/nodeModifyTable.c:3531
 #, c-format
 msgid "Ensure that not more than one source row matches any one target row."
 msgstr "Переконайтесь, що не більше ніж один вихідний рядок відповідає будь-якому одному цільовому рядку."
 
-#: executor/nodeModifyTable.c:3170
+#: executor/nodeModifyTable.c:3408
 #, c-format
 msgid "tuple to be merged was already moved to another partition due to concurrent update"
-msgstr ""
+msgstr "кортеж, який підлягає об'єднанню, вже переміщено в іншу секцію в результаті паралельного оновлення"
 
 #: executor/nodeSamplescan.c:244
 #, c-format
@@ -14174,8 +14572,8 @@ msgstr "Параметр TABLESAMPLE не може бути null"
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
 msgstr "Параметр TABLESAMPLE REPEATABLE не може бути null"
 
-#: executor/nodeSubplan.c:325 executor/nodeSubplan.c:351
-#: executor/nodeSubplan.c:405 executor/nodeSubplan.c:1174
+#: executor/nodeSubplan.c:298 executor/nodeSubplan.c:324
+#: executor/nodeSubplan.c:378 executor/nodeSubplan.c:1166
 #, c-format
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "підзапит, використаний в якості вираження, повернув  більше ніж один рядок"
@@ -14210,27 +14608,27 @@ msgstr "у стовпці \"%s\" не допускається null"
 msgid "moving-aggregate transition function must not return null"
 msgstr "функція переходу рухомого агрегату не повинна вертати Null-значення"
 
-#: executor/nodeWindowAgg.c:2083
+#: executor/nodeWindowAgg.c:2106
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "зсув початку рамки не повинен бути null"
 
-#: executor/nodeWindowAgg.c:2096
+#: executor/nodeWindowAgg.c:2120
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "зсув початку рамки не повинен бути негативним"
 
-#: executor/nodeWindowAgg.c:2108
+#: executor/nodeWindowAgg.c:2133
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "зсув кінця рамки не повинен бути null"
 
-#: executor/nodeWindowAgg.c:2121
+#: executor/nodeWindowAgg.c:2147
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "зсув кінця рамки не повинен бути негативним"
 
-#: executor/nodeWindowAgg.c:2892
+#: executor/nodeWindowAgg.c:2957
 #, c-format
 msgid "aggregate function %s does not support use as a window function"
 msgstr "агрегатна функція %s не підтримує використання в якості віконної функції"
@@ -14265,49 +14663,49 @@ msgstr "Перевірте наявність виклику \"SPI_finish\"."
 msgid "subtransaction left non-empty SPI stack"
 msgstr "підтранзакція залишила непорожню групу SPI"
 
-#: executor/spi.c:1599
+#: executor/spi.c:1602
 #, c-format
 msgid "cannot open multi-query plan as cursor"
 msgstr "неможливо відкрити план декількох запитів як курсор"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1609
+#: executor/spi.c:1612
 #, c-format
 msgid "cannot open %s query as cursor"
 msgstr "неможливо відкрити запит %s як курсор"
 
-#: executor/spi.c:1715
+#: executor/spi.c:1718
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE не підтримується"
 
-#: executor/spi.c:1716 parser/analyze.c:2928
+#: executor/spi.c:1719 parser/analyze.c:3077
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Курсори з прокручуванням повинні бути READ ONLY."
 
-#: executor/spi.c:2490
+#: executor/spi.c:2496
 #, c-format
 msgid "empty query does not return tuples"
 msgstr "пустий запит не повертає кортежі"
 
 #. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:2564
+#: executor/spi.c:2570
 #, c-format
 msgid "%s query does not return tuples"
 msgstr "%s запит не повертає кортежі"
 
-#: executor/spi.c:2981
+#: executor/spi.c:2987
 #, c-format
-msgid "SQL expression \"%s\""
-msgstr "SQL вираз \"%s\""
+msgid "PL/pgSQL expression \"%s\""
+msgstr "вираз PL/pgSQL \"%s\""
 
-#: executor/spi.c:2986
+#: executor/spi.c:2992
 #, c-format
 msgid "PL/pgSQL assignment \"%s\""
 msgstr "PL/pgSQL присвоєння \"%s\""
 
-#: executor/spi.c:2989
+#: executor/spi.c:2995
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "SQL-оператор \"%s\""
@@ -14317,28 +14715,28 @@ msgstr "SQL-оператор \"%s\""
 msgid "could not send tuple to shared-memory queue"
 msgstr "не вдалося передати кортеж у чергу в спільну пам'ять"
 
-#: foreign/foreign.c:225
+#: foreign/foreign.c:226
 #, c-format
 msgid "user mapping not found for user \"%s\", server \"%s\""
 msgstr "зіставлення користувача не знайдено для користувача \"%s\", сервер \"%s\""
 
-#: foreign/foreign.c:336 optimizer/plan/createplan.c:7153
-#: optimizer/util/plancat.c:540
+#: foreign/foreign.c:337 optimizer/plan/createplan.c:7299
+#: optimizer/util/plancat.c:539
 #, c-format
 msgid "access to non-system foreign table is restricted"
-msgstr ""
+msgstr "доступ до не системної сторонньої таблиці обмежено"
 
-#: foreign/foreign.c:660
+#: foreign/foreign.c:661
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "недійсний параметр \"%s\""
 
-#: foreign/foreign.c:662
+#: foreign/foreign.c:663
 #, c-format
 msgid "Perhaps you meant the option \"%s\"."
 msgstr "Можливо, ви мали на увазі параметр \"%s\"."
 
-#: foreign/foreign.c:664
+#: foreign/foreign.c:665
 #, c-format
 msgid "There are no valid options in this context."
 msgstr "У цьому контексті немає припустимих варіантів."
@@ -14349,573 +14747,757 @@ msgstr "У цьому контексті немає припустимих ва
 msgid "Failed on DSA request of size %zu."
 msgstr "Не вдалося виконати запит DSA розміру %zu."
 
-#: libpq/auth-sasl.c:97
-#, c-format
-msgid "expected SASL response, got message type %d"
-msgstr "очікувалася відповідь SASL, але отримано тип повідомлення %d"
-
-#: libpq/auth-scram.c:263
+#: libpq/auth-oauth.c:109 libpq/auth-scram.c:267
 #, c-format
 msgid "client selected an invalid SASL authentication mechanism"
 msgstr "клієнт обрав неприпустимий механізм автентифікації SASL"
 
-#: libpq/auth-scram.c:287 libpq/auth-scram.c:536 libpq/auth-scram.c:547
+#: libpq/auth-oauth.c:169 libpq/auth-oauth.c:174 libpq/auth-oauth.c:192
+#: libpq/auth-oauth.c:220 libpq/auth-oauth.c:230 libpq/auth-oauth.c:239
+#: libpq/auth-oauth.c:254 libpq/auth-oauth.c:263 libpq/auth-oauth.c:272
+#: libpq/auth-oauth.c:279 libpq/auth-oauth.c:342 libpq/auth-oauth.c:349
+#: libpq/auth-oauth.c:375 libpq/auth-oauth.c:420 libpq/auth-oauth.c:438
+#: libpq/auth-oauth.c:452 libpq/auth-oauth.c:472
+#, c-format
+msgid "malformed OAUTHBEARER message"
+msgstr "неправильно сформоване повідомлення OAUTHBEARER"
+
+#: libpq/auth-oauth.c:170 libpq/auth-scram.c:383
+#, c-format
+msgid "The message is empty."
+msgstr "Повідомлення порожнє."
+
+#: libpq/auth-oauth.c:175 libpq/auth-scram.c:388
+#, c-format
+msgid "Message length does not match input length."
+msgstr "Довжина повідомлення не відповідає довжині вводу."
+
+#: libpq/auth-oauth.c:193
+#, c-format
+msgid "Client did not send a kvsep response."
+msgstr "Клієнт не надіслав відповідь kvsep."
+
+#: libpq/auth-oauth.c:221
+#, c-format
+msgid "The server does not support channel binding for OAuth, but the client message includes channel binding data."
+msgstr "Сервер не підтримує прив'язку каналів для OAuth, але повідомлення клієнта містить дані прив'язки каналу."
+
+#: libpq/auth-oauth.c:231 libpq/auth-scram.c:1003 libpq/auth-scram.c:1033
+#, c-format
+msgid "Comma expected, but found character \"%s\"."
+msgstr "Очікувалась кома, але знайдено символ \"%s\"."
+
+#: libpq/auth-oauth.c:240 libpq/auth-scram.c:1065
+#, c-format
+msgid "Unexpected channel-binding flag \"%s\"."
+msgstr "Неочікувана позначка зв'язування каналів \"%s\"."
+
+#: libpq/auth-oauth.c:250 libpq/auth-scram.c:1075
+#, c-format
+msgid "client uses authorization identity, but it is not supported"
+msgstr "клієнт використовує ідентифікатор для авторизації, але це не підтримується"
+
+#: libpq/auth-oauth.c:255 libpq/auth-scram.c:1080
+#, c-format
+msgid "Unexpected attribute \"%s\" in client-first-message."
+msgstr "Неочікуваний атрибут \"%s\" у першому повідомленні клієнта."
+
+#: libpq/auth-oauth.c:264
+#, c-format
+msgid "Key-value separator expected, but found character \"%s\"."
+msgstr "Очікувався роздільник ключ-значення, але знайдено символ \"%s\"."
+
+#: libpq/auth-oauth.c:273
+#, c-format
+msgid "Message does not contain an auth value."
+msgstr "Повідомлення не містить значення auth."
+
+#: libpq/auth-oauth.c:280
+#, c-format
+msgid "Message contains additional data after the final terminator."
+msgstr "Повідомлення містить додаткові дані після кінцевого термінатора."
+
+#: libpq/auth-oauth.c:343
+#, c-format
+msgid "Message contains an empty key name."
+msgstr "Повідомлення містить порожню назву ключа."
+
+#: libpq/auth-oauth.c:350
+#, c-format
+msgid "Message contains an invalid key name."
+msgstr "Повідомлення містить недійсну назву ключа."
+
+#: libpq/auth-oauth.c:376
+#, c-format
+msgid "Message contains an invalid value."
+msgstr "Повідомлення містить недійсне значення."
+
+#: libpq/auth-oauth.c:421
+#, c-format
+msgid "Message contains an unterminated key/value pair."
+msgstr "Повідомлення містить незавершену пару ключ/значення."
+
+#: libpq/auth-oauth.c:439
+#, c-format
+msgid "Message contains a key without a value."
+msgstr "Повідомлення містить ключ без значення."
+
+#: libpq/auth-oauth.c:453
+#, c-format
+msgid "Message contains multiple auth values."
+msgstr "Повідомлення містить кілька значень автентифікації."
+
+#: libpq/auth-oauth.c:473
+#, c-format
+msgid "Message did not contain a final terminator."
+msgstr "Повідомлення не містить кінцевого термінатора."
+
+#: libpq/auth-oauth.c:499
+#, c-format
+msgid "OAuth is not properly configured for this user"
+msgstr "OAuth не налаштований належним чином для цього користувача"
+
+#: libpq/auth-oauth.c:500
+#, c-format
+msgid "The issuer and scope parameters must be set in pg_hba.conf."
+msgstr "Параметри issuer та scope мають бути встановлені в pg_hba.conf."
+
+#: libpq/auth-oauth.c:585 libpq/auth-oauth.c:602 libpq/auth-oauth.c:624
+#, c-format
+msgid "malformed OAuth bearer token"
+msgstr "неправильно сформований токен носія OAuth"
+
+#: libpq/auth-oauth.c:586
+#, c-format
+msgid "Client response indicated a non-Bearer authentication scheme."
+msgstr "Відповідь клієнта вказує на схему автентифікації, яка не є Bearer."
+
+#: libpq/auth-oauth.c:603
+#, c-format
+msgid "Bearer token is empty."
+msgstr "Токен Bearer порожній."
+
+#: libpq/auth-oauth.c:625
+#, c-format
+msgid "Bearer token is not in the correct format."
+msgstr "Токен Bearer не у правильному форматі."
+
+#: libpq/auth-oauth.c:656
+#, c-format
+msgid "validation of OAuth token requested without a validator loaded"
+msgstr "запитано валідацію токена OAuth без завантаженого валідатора"
+
+#: libpq/auth-oauth.c:665
+#, c-format
+msgid "internal error in OAuth validator module"
+msgstr "внутрішня помилка в модулі валідатора OAuth"
+
+#: libpq/auth-oauth.c:679 libpq/auth-oauth.c:703 libpq/auth.c:302
+#, c-format
+msgid "OAuth bearer authentication failed for user \"%s\""
+msgstr "Аутентифікація OAuth bearer не вдалася для користувача \"%s\""
+
+#: libpq/auth-oauth.c:681
+#, c-format
+msgid "Validator failed to authorize the provided token."
+msgstr "Валідатор не зміг авторизувати наданий токен."
+
+#: libpq/auth-oauth.c:705
+#, c-format
+msgid "Validator provided no identity."
+msgstr "Валідатор не надав ідентифікації."
+
+#: libpq/auth-oauth.c:760
+#, c-format
+msgid "%s module \"%s\" must define the symbol %s"
+msgstr "модуль %s \"%s\" має визначати символ %s"
+
+#: libpq/auth-oauth.c:773
+#, c-format
+msgid "%s module \"%s\": magic number mismatch"
+msgstr "модуль %s \"%s\": невідповідність магічного номера"
+
+#: libpq/auth-oauth.c:775
+#, c-format
+msgid "Server has magic number 0x%08X, module has 0x%08X."
+msgstr "Сервер має магічний номер 0x%08X, модуль має 0x%08X."
+
+#: libpq/auth-oauth.c:784
+#, c-format
+msgid "%s module \"%s\" must provide a %s callback"
+msgstr "модуль %s \"%s\" має надати зворотний виклик %s"
+
+#: libpq/auth-oauth.c:833
+#, c-format
+msgid "oauth_validator_libraries must be set for authentication method %s"
+msgstr "oauth_validator_libraries має бути встановлено для методу автентифікації %s"
+
+#: libpq/auth-oauth.c:835 libpq/auth-oauth.c:868 libpq/auth-oauth.c:884
+#: libpq/hba.c:331 libpq/hba.c:666 libpq/hba.c:1251 libpq/hba.c:1271
+#: libpq/hba.c:1294 libpq/hba.c:1307 libpq/hba.c:1360 libpq/hba.c:1388
+#: libpq/hba.c:1396 libpq/hba.c:1408 libpq/hba.c:1429 libpq/hba.c:1442
+#: libpq/hba.c:1467 libpq/hba.c:1494 libpq/hba.c:1506 libpq/hba.c:1565
+#: libpq/hba.c:1585 libpq/hba.c:1599 libpq/hba.c:1619 libpq/hba.c:1630
+#: libpq/hba.c:1645 libpq/hba.c:1664 libpq/hba.c:1680 libpq/hba.c:1692
+#: libpq/hba.c:1760 libpq/hba.c:1773 libpq/hba.c:1795 libpq/hba.c:1807
+#: libpq/hba.c:1825 libpq/hba.c:1875 libpq/hba.c:1919 libpq/hba.c:1930
+#: libpq/hba.c:1946 libpq/hba.c:1963 libpq/hba.c:1974 libpq/hba.c:1993
+#: libpq/hba.c:2009 libpq/hba.c:2025 libpq/hba.c:2069 libpq/hba.c:2115
+#: libpq/hba.c:2132 libpq/hba.c:2145 libpq/hba.c:2157 libpq/hba.c:2176
+#: libpq/hba.c:2262 libpq/hba.c:2280 libpq/hba.c:2374 libpq/hba.c:2393
+#: libpq/hba.c:2422 libpq/hba.c:2435 libpq/hba.c:2458 libpq/hba.c:2480
+#: libpq/hba.c:2517 tsearch/ts_locale.c:196
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "рядок %d файла конфігурації \"%s\""
+
+#: libpq/auth-oauth.c:867
+#, c-format
+msgid "authentication method \"oauth\" requires argument \"validator\" to be set when oauth_validator_libraries contains multiple options"
+msgstr "метод автентифікації \"oauth\" вимагає встановлення аргументу \"validator\", коли oauth_validator_libraries містить кілька параметрів"
+
+#: libpq/auth-oauth.c:882
+#, c-format
+msgid "validator \"%s\" is not permitted by %s"
+msgstr "валідатор \"%s\" не дозволений %s"
+
+#: libpq/auth-sasl.c:89
+#, c-format
+msgid "expected SASL response, got message type %d"
+msgstr "очікувалася відповідь SASL, але отримано тип повідомлення %d"
+
+#: libpq/auth-scram.c:291 libpq/auth-scram.c:547 libpq/auth-scram.c:558
 #, c-format
 msgid "invalid SCRAM secret for user \"%s\""
 msgstr "неприпустимий секрет SCRAM для користувача \"%s\""
 
-#: libpq/auth-scram.c:298
+#: libpq/auth-scram.c:302
 #, c-format
 msgid "User \"%s\" does not have a valid SCRAM secret."
 msgstr "Користувач \"%s\" не має припустимого секрету SCRAM."
 
-#: libpq/auth-scram.c:378 libpq/auth-scram.c:383 libpq/auth-scram.c:737
-#: libpq/auth-scram.c:745 libpq/auth-scram.c:850 libpq/auth-scram.c:863
-#: libpq/auth-scram.c:873 libpq/auth-scram.c:981 libpq/auth-scram.c:988
-#: libpq/auth-scram.c:1003 libpq/auth-scram.c:1018 libpq/auth-scram.c:1032
-#: libpq/auth-scram.c:1050 libpq/auth-scram.c:1065 libpq/auth-scram.c:1379
-#: libpq/auth-scram.c:1387
+#: libpq/auth-scram.c:382 libpq/auth-scram.c:387 libpq/auth-scram.c:751
+#: libpq/auth-scram.c:759 libpq/auth-scram.c:864 libpq/auth-scram.c:877
+#: libpq/auth-scram.c:887 libpq/auth-scram.c:995 libpq/auth-scram.c:1002
+#: libpq/auth-scram.c:1017 libpq/auth-scram.c:1032 libpq/auth-scram.c:1046
+#: libpq/auth-scram.c:1064 libpq/auth-scram.c:1079 libpq/auth-scram.c:1392
+#: libpq/auth-scram.c:1400
 #, c-format
 msgid "malformed SCRAM message"
 msgstr "неправильне повідомлення SCRAM"
 
-#: libpq/auth-scram.c:379
-#, c-format
-msgid "The message is empty."
-msgstr "Повідомлення порожнє."
-
-#: libpq/auth-scram.c:384
-#, c-format
-msgid "Message length does not match input length."
-msgstr "Довжина повідомлення не відповідає довжині вводу."
-
-#: libpq/auth-scram.c:416
+#: libpq/auth-scram.c:420
 #, c-format
 msgid "invalid SCRAM response"
 msgstr "неприпустима відповідь SCRAM"
 
-#: libpq/auth-scram.c:417
+#: libpq/auth-scram.c:421
 #, c-format
 msgid "Nonce does not match."
 msgstr "Одноразовий ідентифікатор не збігається."
 
-#: libpq/auth-scram.c:493
+#: libpq/auth-scram.c:504
 #, c-format
 msgid "could not generate random salt"
 msgstr "не вдалося згенерувати випадкову сіль"
 
-#: libpq/auth-scram.c:738
+#: libpq/auth-scram.c:752
 #, c-format
 msgid "Expected attribute \"%c\" but found \"%s\"."
 msgstr "Очікувався атрибут \"%c\", але знайдено \"%s\"."
 
-#: libpq/auth-scram.c:746 libpq/auth-scram.c:874
+#: libpq/auth-scram.c:760 libpq/auth-scram.c:888
 #, c-format
 msgid "Expected character \"=\" for attribute \"%c\"."
 msgstr "Очікувався символ \"=\" для атрибуту \"%c\"."
 
-#: libpq/auth-scram.c:851
+#: libpq/auth-scram.c:865
 #, c-format
 msgid "Attribute expected, but found end of string."
 msgstr "Очікувався атрибут, але знайдено кінець рядка."
 
-#: libpq/auth-scram.c:864
+#: libpq/auth-scram.c:878
 #, c-format
 msgid "Attribute expected, but found invalid character \"%s\"."
 msgstr "Очікувався атрибут, але знайдено неприпустимий символ \"%s\"."
 
-#: libpq/auth-scram.c:982 libpq/auth-scram.c:1004
+#: libpq/auth-scram.c:996 libpq/auth-scram.c:1018
 #, c-format
 msgid "The client selected SCRAM-SHA-256-PLUS, but the SCRAM message does not include channel binding data."
 msgstr "Клієнт обрав алгоритм SCRAM-SHA-256-PLUS, але повідомлення SCRAM не містить даних зв’язування каналів."
 
-#: libpq/auth-scram.c:989 libpq/auth-scram.c:1019
-#, c-format
-msgid "Comma expected, but found character \"%s\"."
-msgstr "Очікувалась кома, але знайдено символ \"%s\"."
-
-#: libpq/auth-scram.c:1010
+#: libpq/auth-scram.c:1024
 #, c-format
 msgid "SCRAM channel binding negotiation error"
 msgstr "Помилка узгодження зв’язування каналів SCRAM"
 
-#: libpq/auth-scram.c:1011
+#: libpq/auth-scram.c:1025
 #, c-format
 msgid "The client supports SCRAM channel binding but thinks the server does not.  However, this server does support channel binding."
 msgstr "Клієнт підтримує зв’язування каналів SCRAM, але думає, що сервер не підтримує. Однак, сервер теж підтримує зв’язування каналів."
 
-#: libpq/auth-scram.c:1033
+#: libpq/auth-scram.c:1047
 #, c-format
 msgid "The client selected SCRAM-SHA-256 without channel binding, but the SCRAM message includes channel binding data."
 msgstr "Клієнт обрав алгоритм SCRAM-SHA-256 без зв’язування каналів, але повідомлення SCRAM містить дані зв’язування каналів."
 
-#: libpq/auth-scram.c:1044
+#: libpq/auth-scram.c:1058
 #, c-format
 msgid "unsupported SCRAM channel-binding type \"%s\""
 msgstr "непідтримуваний тип зв'язування каналів SCRAM \"%s\""
 
-#: libpq/auth-scram.c:1051
-#, c-format
-msgid "Unexpected channel-binding flag \"%s\"."
-msgstr "Неочікувана позначка зв'язування каналів \"%s\"."
-
-#: libpq/auth-scram.c:1061
-#, c-format
-msgid "client uses authorization identity, but it is not supported"
-msgstr "клієнт використовує ідентифікатор для авторизації, але це не підтримується"
-
-#: libpq/auth-scram.c:1066
-#, c-format
-msgid "Unexpected attribute \"%s\" in client-first-message."
-msgstr "Неочікуваний атрибут \"%s\" у першому повідомленні клієнта."
-
-#: libpq/auth-scram.c:1082
+#: libpq/auth-scram.c:1096
 #, c-format
 msgid "client requires an unsupported SCRAM extension"
 msgstr "клієнт потребує непідтримуване розширення SCRAM"
 
-#: libpq/auth-scram.c:1096
+#: libpq/auth-scram.c:1110
 #, c-format
 msgid "non-printable characters in SCRAM nonce"
 msgstr "недруковані символи в одноразовому ідентифікаторі SCRAM"
 
-#: libpq/auth-scram.c:1227
+#: libpq/auth-scram.c:1240
 #, c-format
 msgid "could not generate random nonce"
 msgstr "не вдалося згенерувати випадковий одноразовий ідентифікатор"
 
-#: libpq/auth-scram.c:1237
+#: libpq/auth-scram.c:1250
 #, c-format
 msgid "could not encode random nonce"
 msgstr "не вдалося кодувати випадковий одноразовий ідентифікатор"
 
-#: libpq/auth-scram.c:1343
+#: libpq/auth-scram.c:1356
 #, c-format
 msgid "SCRAM channel binding check failed"
 msgstr "Помилка перевірки зв'язування каналів SCRAM"
 
-#: libpq/auth-scram.c:1361
+#: libpq/auth-scram.c:1374
 #, c-format
 msgid "unexpected SCRAM channel-binding attribute in client-final-message"
 msgstr "неочікуваний атрибут зв'язування каналів SCRAM в останньому повідомленні клієнта"
 
-#: libpq/auth-scram.c:1380
+#: libpq/auth-scram.c:1393
 #, c-format
 msgid "Malformed proof in client-final-message."
 msgstr "Неправильне підтвердження в останньому повідомленні клієнта."
 
-#: libpq/auth-scram.c:1388
+#: libpq/auth-scram.c:1401
 #, c-format
 msgid "Garbage found at the end of client-final-message."
 msgstr "Сміття знайдено в кінці останнього повідомлення клієнта."
 
-#: libpq/auth.c:269
+#: libpq/auth.c:262
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "користувач \"%s\" не пройшов автентифікацію: відхилений хост"
 
-#: libpq/auth.c:272
+#: libpq/auth.c:265
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "користувач \"%s\" не пройшов автентифікацію \"trust\""
 
-#: libpq/auth.c:275
+#: libpq/auth.c:268
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію Ident"
 
-#: libpq/auth.c:278
+#: libpq/auth.c:271
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію Peer"
 
-#: libpq/auth.c:283
+#: libpq/auth.c:276
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "користувач \"%s\" не пройшов автентифікацію за допомогою пароля"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:281
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію GSSAPI"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:284
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію SSPI"
 
-#: libpq/auth.c:294
+#: libpq/auth.c:287
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію PAM"
 
-#: libpq/auth.c:297
+#: libpq/auth.c:290
 #, c-format
 msgid "BSD authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію BSD"
 
-#: libpq/auth.c:300
+#: libpq/auth.c:293
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію LDAP"
 
-#: libpq/auth.c:303
+#: libpq/auth.c:296
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "користувач \"%s\" не пройшов автентифікацію за сертифікатом"
 
-#: libpq/auth.c:306
+#: libpq/auth.c:299
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "Користувач \"%s\" не пройшов автентифікацію RADIUS"
 
-#: libpq/auth.c:309
+#: libpq/auth.c:305
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "користувач \"%s\" не пройшов автентифікацію: неприпустимий метод автентифікації"
 
-#: libpq/auth.c:313
+#: libpq/auth.c:309
 #, c-format
 msgid "Connection matched file \"%s\" line %d: \"%s\""
 msgstr "З'єднання відповідає файлу \"%s\" рядок %d: \"%s\""
 
-#: libpq/auth.c:357
+#: libpq/auth.c:354
 #, c-format
 msgid "authentication identifier set more than once"
 msgstr "ідентифікатор автентифікації встановлено більш ніж один раз"
 
-#: libpq/auth.c:358
+#: libpq/auth.c:355
 #, c-format
 msgid "previous identifier: \"%s\"; new identifier: \"%s\""
 msgstr "попередній ідентифікатор: \"%s\"; новий ідентифікатор: \"%s\""
 
-#: libpq/auth.c:368
+#: libpq/auth.c:365
 #, c-format
 msgid "connection authenticated: identity=\"%s\" method=%s (%s:%d)"
 msgstr "підключення автентифіковано: ідентифікатор=\"%s\" метод=%s (%s:%d)"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:405
 #, c-format
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr "сертифікати клієнтів можуть перевірятися, лише якщо доступне сховище кореневих сертифікатів"
 
-#: libpq/auth.c:419
+#: libpq/auth.c:416
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "підключення потребує припустимий сертифікат клієнта"
 
-#: libpq/auth.c:450 libpq/auth.c:496
+#: libpq/auth.c:447 libpq/auth.c:493
 msgid "GSS encryption"
 msgstr "Шифрування GSS"
 
-#: libpq/auth.c:453 libpq/auth.c:499
+#: libpq/auth.c:450 libpq/auth.c:496
 msgid "SSL encryption"
 msgstr "Шифрування SSL"
 
-#: libpq/auth.c:455 libpq/auth.c:501
+#: libpq/auth.c:452 libpq/auth.c:498
 msgid "no encryption"
 msgstr "без шифрування"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:461
+#: libpq/auth.c:458
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf відхиляє підключення реплікації для хосту \"%s\", користувача \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:468
+#: libpq/auth.c:465
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf відхиляє підключення для хосту \"%s\", користувача \"%s\", бази даних \"%s\", %s"
 
-#: libpq/auth.c:506
+#: libpq/auth.c:503
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "IP-адреса клієнта дозволяється в \"%s\", відповідає прямому перетворенню."
 
-#: libpq/auth.c:509
+#: libpq/auth.c:506
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "IP-адреса клієнта дозволяється в \"%s\", пряме перетворення не перевірялося."
 
-#: libpq/auth.c:512
+#: libpq/auth.c:509
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "IP-адреса клієнта дозволяється в \"%s\", не відповідає прямому перетворенню."
 
-#: libpq/auth.c:515
+#: libpq/auth.c:512
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "Перекласти ім'я клієнтського хосту \"%s\" в IP-адресу: %s, не вдалося."
 
-#: libpq/auth.c:520
+#: libpq/auth.c:517
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Отримати ім'я хосту з IP-адреси клієнта: %s, не вдалося."
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:528
+#: libpq/auth.c:525
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr "в pg_hba.conf немає запису, що дозволяє підключення для реплікації з хосту \"%s\", користувача \"%s\", %s"
 
 #. translator: last %s describes encryption state
-#: libpq/auth.c:536
+#: libpq/auth.c:533
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "в pg_hba.conf немає запису для хосту \"%s\", користувача \"%s\", бази даних \"%s\", %s"
 
-#: libpq/auth.c:656
+#: libpq/auth.c:657
 #, c-format
 msgid "connection authenticated: user=\"%s\" method=%s (%s:%d)"
 msgstr "підключення автентифіковано: user=\"%s\" method=%s (%s:%d)"
 
-#: libpq/auth.c:725
+#: libpq/auth.c:726
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "очікувалася відповід з паролем, але отримано тип повідомлення %d"
 
-#: libpq/auth.c:746
+#: libpq/auth.c:747
 #, c-format
 msgid "invalid password packet size"
 msgstr "неприпустимий розмір пакету з паролем"
 
-#: libpq/auth.c:764
+#: libpq/auth.c:765
 #, c-format
 msgid "empty password returned by client"
 msgstr "клієнт повернув пустий пароль"
 
-#: libpq/auth.c:892
+#: libpq/auth.c:893
 #, c-format
 msgid "could not generate random MD5 salt"
 msgstr "не вдалося створити випадкову сіль для MD5"
 
-#: libpq/auth.c:943 libpq/be-secure-gssapi.c:540
+#: libpq/auth.c:944 libpq/be-secure-gssapi.c:553
 #, c-format
 msgid "could not set environment: %m"
 msgstr "не вдалося встановити середовище: %m"
 
-#: libpq/auth.c:982
+#: libpq/auth.c:983
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "очікувалася відповідь GSS, але отримано тип повідомлення %d"
 
-#: libpq/auth.c:1048
+#: libpq/auth.c:1049
 msgid "accepting GSS security context failed"
 msgstr "прийняти контекст безпеки GSS не вдалось"
 
-#: libpq/auth.c:1089
+#: libpq/auth.c:1090
 msgid "retrieving GSS user name failed"
 msgstr "отримання ім'я користувача GSS не виконано"
 
-#: libpq/auth.c:1235
+#: libpq/auth.c:1236
 msgid "could not acquire SSPI credentials"
 msgstr "не вдалось отримати облікові дані SSPI"
 
-#: libpq/auth.c:1260
+#: libpq/auth.c:1261
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "очікувалась відповідь SSPI, але отримано тип повідомлення %d"
 
-#: libpq/auth.c:1338
+#: libpq/auth.c:1339
 msgid "could not accept SSPI security context"
 msgstr "прийняти контекст безпеки SSPI не вдалося"
 
-#: libpq/auth.c:1379
+#: libpq/auth.c:1380
 msgid "could not get token from SSPI security context"
 msgstr "не вдалося отримати маркер з контексту безпеки SSPI"
 
-#: libpq/auth.c:1515 libpq/auth.c:1534
+#: libpq/auth.c:1516 libpq/auth.c:1535
 #, c-format
 msgid "could not translate name"
 msgstr "не вдалося перекласти ім'я"
 
-#: libpq/auth.c:1547
+#: libpq/auth.c:1548
 #, c-format
 msgid "realm name too long"
 msgstr "ім'я області дуже довге"
 
-#: libpq/auth.c:1562
+#: libpq/auth.c:1563
 #, c-format
 msgid "translated account name too long"
 msgstr "ім'я перекладеного облікового запису дуже довге"
 
-#: libpq/auth.c:1741
+#: libpq/auth.c:1742
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "не вдалося створити сокет для підключення до серверу Ident: %m"
 
-#: libpq/auth.c:1756
+#: libpq/auth.c:1757
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "не вдалося прив'язатися до локальної адреси \"%s\": %m"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1769
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "не вдалося підключитися до Ident-серверу за адресою \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1791
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "не вдалося надіслати запит до Ident -серверу за адресою \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1807
+#: libpq/auth.c:1808
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "не вдалося отримати відповідь від Ident-серверу за адресою \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1817
+#: libpq/auth.c:1818
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "неприпустимо форматована відповідь від Ident-серверу: \"%s\""
 
-#: libpq/auth.c:1870
+#: libpq/auth.c:1874
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "автентифікація peer не підтримується на цій платформі"
 
-#: libpq/auth.c:1874
+#: libpq/auth.c:1878
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "не вдалося отримати облікові дані користувача через peer: %m"
 
-#: libpq/auth.c:1886
+#: libpq/auth.c:1888
 #, c-format
-msgid "could not look up local user ID %ld: %s"
-msgstr "не вдалося знайти локального користувача за ідентифікатором (%ld): %s"
+msgid "could not look up local user ID %ld: %m"
+msgstr "не вдалося знайти локальний ID користувача %ld: %m"
 
-#: libpq/auth.c:1988
+#: libpq/auth.c:1894
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "локальний користувач з ID %ld не існує"
+
+#: libpq/auth.c:1994
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "помилка у нижчому шарі PAM: %s"
 
-#: libpq/auth.c:1999
+#: libpq/auth.c:2005
 #, c-format
 msgid "unsupported PAM conversation %d/\"%s\""
 msgstr "непідтримувана розмова PAM %d/\"%s\""
 
-#: libpq/auth.c:2056
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "не вдалося створити автентифікатор PAM: %s"
 
-#: libpq/auth.c:2067
+#: libpq/auth.c:2073
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "помилка в pam_set_item(PAM_USER): %s"
 
-#: libpq/auth.c:2099
+#: libpq/auth.c:2105
 #, c-format
 msgid "pam_set_item(PAM_RHOST) failed: %s"
 msgstr "помилка в pam_set_item(PAM_RHOST): %s"
 
-#: libpq/auth.c:2111
+#: libpq/auth.c:2117
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "помилка в pam_set_item(PAM_CONV): %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:2130
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "помилка в pam_authenticate: %sв"
 
-#: libpq/auth.c:2137
+#: libpq/auth.c:2143
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "помилка в pam_acct_mgmt: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "не вдалося вивільнити автентифікатор PAM: %s"
 
-#: libpq/auth.c:2228
+#: libpq/auth.c:2234
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "не вдалося ініціалізувати протокол LDAP: код помилки %d"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2271
 #, c-format
 msgid "could not extract domain name from ldapbasedn"
 msgstr "не вдалося отримати назву домена з ldapbasedn"
 
-#: libpq/auth.c:2273
+#: libpq/auth.c:2279
 #, c-format
 msgid "LDAP authentication could not find DNS SRV records for \"%s\""
 msgstr "Автентифікація LDAP не змогла знайти записи DNS SRV для \"%s\""
 
-#: libpq/auth.c:2275
+#: libpq/auth.c:2281
 #, c-format
 msgid "Set an LDAP server name explicitly."
 msgstr "Встановіть назву сервера LDAP, явно."
 
-#: libpq/auth.c:2327
+#: libpq/auth.c:2333
 #, c-format
 msgid "could not initialize LDAP: %s"
 msgstr "не вдалося ініціалізувати протокол LDAP: %s"
 
-#: libpq/auth.c:2337
+#: libpq/auth.c:2343
 #, c-format
 msgid "ldaps not supported with this LDAP library"
 msgstr "протокол ldaps з поточною бібліотекою LDAP не підтримується"
 
-#: libpq/auth.c:2345
+#: libpq/auth.c:2351
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "не вдалося ініціалізувати протокол LDAP: %m"
 
-#: libpq/auth.c:2355
+#: libpq/auth.c:2361
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "не вдалося встановити версію протоколу LDAP: %s"
 
-#: libpq/auth.c:2371
+#: libpq/auth.c:2377
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "не вдалося почати сеанс протоколу LDAP TLS: %s"
 
-#: libpq/auth.c:2448
+#: libpq/auth.c:2454
 #, c-format
 msgid "LDAP server not specified, and no ldapbasedn"
 msgstr "Сервер LDAP не вказаний, і не ldapbasedn"
 
-#: libpq/auth.c:2455
+#: libpq/auth.c:2461
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-сервер не вказаний"
 
-#: libpq/auth.c:2517
+#: libpq/auth.c:2523
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "неприпустимий символ в імені користувача для автентифікації LDAP"
 
-#: libpq/auth.c:2534
+#: libpq/auth.c:2540
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "не вдалося виконати початкову прив'язку LDAP для ldapbinddn \"%s\" на сервері \"%s\": %s"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2570
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "не вдалося виконати LDAP-пошук за фільтром \"%s\" на сервері \"%s\": %s"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2586
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "LDAP-користувач \"%s\" не існує"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2587
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "LDAP-пошук за фільтром \"%s\" на сервері \"%s\" не повернув записів."
 
-#: libpq/auth.c:2585
+#: libpq/auth.c:2591
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "LDAP-користувач \"%s\" не унікальний"
 
-#: libpq/auth.c:2586
+#: libpq/auth.c:2592
 #, 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."
@@ -14924,139 +15506,139 @@ msgstr[1] "LDAP-пошук за фільтром \"%s\" на сервері \"%s
 msgstr[2] "LDAP-пошук за фільтром \"%s\" на сервері \"%s\" повернув %d записів."
 msgstr[3] "LDAP-пошук за фільтром \"%s\" на сервері \"%s\" повернув %d записів."
 
-#: libpq/auth.c:2606
+#: libpq/auth.c:2612
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "не вдалося отримати dn для першого результату, що відповідає \"%s\" на сервері \"%s\": %s"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2639
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "Помилка під час реєстрації в протоколі LDAP користувача \"%s\" на сервері \"%s\": %s"
 
-#: libpq/auth.c:2665
+#: libpq/auth.c:2671
 #, c-format
 msgid "LDAP diagnostics: %s"
 msgstr "Діагностика LDAP: %s"
 
-#: libpq/auth.c:2703
+#: libpq/auth.c:2709
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "помилка автентифікації сертифіката для користувача \"%s\": сертифікат клієнта не містить імені користувача"
 
-#: libpq/auth.c:2724
+#: libpq/auth.c:2730
 #, c-format
 msgid "certificate authentication failed for user \"%s\": unable to retrieve subject DN"
 msgstr "помилка автентифікації сертифікату для користувача \"%s\": не вдалося отримати DN суб'єкта"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2753
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": DN mismatch"
 msgstr "помилка перевірки сертифікату (clientcert=verify-full) для користувача \"%s\": DN невідповідність"
 
-#: libpq/auth.c:2752
+#: libpq/auth.c:2758
 #, c-format
 msgid "certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch"
 msgstr "помилка перевірки сертифікату (clientcert=verify-full) для користувача \"%s\": CN невідповідність"
 
-#: libpq/auth.c:2854
+#: libpq/auth.c:2860
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-сервер не вказаний"
 
-#: libpq/auth.c:2861
+#: libpq/auth.c:2867
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "Секрет RADIUS не вказаний"
 
-#: libpq/auth.c:2875
+#: libpq/auth.c:2881
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than %d characters"
 msgstr "Автентифікація RADIUS не підтримує паролі довші ніж %d символів"
 
-#: libpq/auth.c:2977 libpq/hba.c:2352
+#: libpq/auth.c:2983 libpq/hba.c:2391
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "не вдалося перетворити ім'я серверу RADIUS \"%s\" в адресу: %s"
 
-#: libpq/auth.c:2991
+#: libpq/auth.c:2997
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "не вдалося створити випадковий вектор шифрування"
 
-#: libpq/auth.c:3028
+#: libpq/auth.c:3034
 #, c-format
 msgid "could not perform MD5 encryption of password: %s"
 msgstr "не вдалося виконати MD5 шифрування паролю: %s"
 
-#: libpq/auth.c:3055
+#: libpq/auth.c:3061
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "не вдалося створити сокет RADIUS: %m"
 
-#: libpq/auth.c:3071
+#: libpq/auth.c:3077
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "не вдалося прив'язатися до локального сокету RADIUS: %m"
 
-#: libpq/auth.c:3081
+#: libpq/auth.c:3087
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "не вдалося відправити пакет RADIUS: %m"
 
-#: libpq/auth.c:3115 libpq/auth.c:3141
+#: libpq/auth.c:3121 libpq/auth.c:3147
 #, c-format
 msgid "timeout waiting for RADIUS response from %s"
 msgstr "перевищено час очікування відповіді RADIUS від %s"
 
-#: libpq/auth.c:3134
+#: libpq/auth.c:3140
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "не вдалося перевірити статус сокету RADIUS: %m"
 
-#: libpq/auth.c:3164
+#: libpq/auth.c:3170
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "не вдалося прочитати відповідь RADIUS: %m"
 
-#: libpq/auth.c:3172
+#: libpq/auth.c:3178
 #, c-format
 msgid "RADIUS response from %s was sent from incorrect port: %d"
 msgstr "Відповідь RADIUS від %s була відправлена з неправильного порту: %d"
 
-#: libpq/auth.c:3180
+#: libpq/auth.c:3186
 #, c-format
 msgid "RADIUS response from %s too short: %d"
 msgstr "Занадто коротка відповідь RADIUS від %s: %d"
 
-#: libpq/auth.c:3187
+#: libpq/auth.c:3193
 #, c-format
 msgid "RADIUS response from %s has corrupt length: %d (actual length %d)"
 msgstr "У відповіді RADIUS від %s покшоджена довжина: %d (фактична довжина %d)"
 
-#: libpq/auth.c:3195
+#: libpq/auth.c:3201
 #, c-format
 msgid "RADIUS response from %s is to a different request: %d (should be %d)"
 msgstr "Прийшла відповідь RADIUS від %s на інший запит: %d (очікувалася %d)"
 
-#: libpq/auth.c:3220
+#: libpq/auth.c:3228
 #, c-format
 msgid "could not perform MD5 encryption of received packet: %s"
 msgstr "не вдалося виконати MD5 шифрування отриманого пакету: %s"
 
-#: libpq/auth.c:3230
+#: libpq/auth.c:3238
 #, c-format
 msgid "RADIUS response from %s has incorrect MD5 signature"
 msgstr "Відповідь RADIUS від %s має неправильний підпис MD5"
 
-#: libpq/auth.c:3248
+#: libpq/auth.c:3256
 #, c-format
 msgid "RADIUS response from %s has invalid code (%d) for user \"%s\""
 msgstr "Відповідь RADIUS від %s має неприпустимий код (%d) для користувача \"%s\""
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:162 libpq/be-fsstubs.c:190
 #: libpq/be-fsstubs.c:216 libpq/be-fsstubs.c:241 libpq/be-fsstubs.c:283
-#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:560
+#: libpq/be-fsstubs.c:306 libpq/be-fsstubs.c:565
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "неприпустимий дескриптор великого об'єкту: %d"
@@ -15066,7 +15648,7 @@ msgstr "неприпустимий дескриптор великого об'є
 msgid "large object descriptor %d was not opened for reading"
 msgstr "дескриптор великого об'єкту %d не був відкритий для читання"
 
-#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:567
+#: libpq/be-fsstubs.c:197 libpq/be-fsstubs.c:572
 #, c-format
 msgid "large object descriptor %d was not opened for writing"
 msgstr "дескриптор великого об’єкту %d не був відкритий для запису"
@@ -15081,32 +15663,32 @@ msgstr "результат lo_lseek для дескриптора великог
 msgid "lo_tell result out of range for large-object descriptor %d"
 msgstr "результат lo_tell для дескриптору\\а великого об'єкту %d поза діапазоном"
 
-#: libpq/be-fsstubs.c:439
+#: libpq/be-fsstubs.c:444
 #, c-format
 msgid "could not open server file \"%s\": %m"
 msgstr "не вдалося відкрити файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:462
+#: libpq/be-fsstubs.c:467
 #, c-format
 msgid "could not read server file \"%s\": %m"
 msgstr "не вдалося прочитати файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:521
+#: libpq/be-fsstubs.c:526
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "не вдалося створити файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:533
+#: libpq/be-fsstubs.c:538
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "не вдалося написати файл сервера \"%s\": %m"
 
-#: libpq/be-fsstubs.c:774
+#: libpq/be-fsstubs.c:779
 #, c-format
 msgid "large object read request is too large"
 msgstr "запит на читання великого об'єкту має завеликий розмір"
 
-#: libpq/be-fsstubs.c:816 utils/adt/genfile.c:248 utils/adt/genfile.c:269
+#: libpq/be-fsstubs.c:821 utils/adt/genfile.c:248 utils/adt/genfile.c:269
 #, c-format
 msgid "requested length cannot be negative"
 msgstr "запитувана довжина не може бути негативною"
@@ -15141,819 +15723,837 @@ msgstr "до файлу закритого ключа \"%s\" мають дост
 msgid "File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root."
 msgstr "Файл повинен мати дозволи u=rw (0600) або менше, якщо він належить користувачу бази даних, або u=rw,g=r (0640) або менше, якщо він належить кореню."
 
-#: libpq/be-secure-gssapi.c:201
+#: libpq/be-secure-gssapi.c:209
 msgid "GSSAPI wrap error"
 msgstr "помилка при згортанні GSSAPI"
 
-#: libpq/be-secure-gssapi.c:208
+#: libpq/be-secure-gssapi.c:216
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "вихідне повідомлення GSSAPI не буде використовувати конфіденційність"
 
-#: libpq/be-secure-gssapi.c:215 libpq/be-secure-gssapi.c:634
+#: libpq/be-secure-gssapi.c:223 libpq/be-secure-gssapi.c:647
 #, c-format
 msgid "server tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "сервер намагався надіслати переповнений пакет GSSAPI (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:351
+#: libpq/be-secure-gssapi.c:359 libpq/be-secure-gssapi.c:588
 #, c-format
 msgid "oversize GSSAPI packet sent by the client (%zu > %zu)"
 msgstr "переповнений пакет GSSAPI, надісланий клієнтом (%zu > %zu)"
 
-#: libpq/be-secure-gssapi.c:389
+#: libpq/be-secure-gssapi.c:397
 msgid "GSSAPI unwrap error"
 msgstr "помилка при розгортанні GSSAPI"
 
-#: libpq/be-secure-gssapi.c:396
+#: libpq/be-secure-gssapi.c:404
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "вхідне повідомлення GSSAPI не використовувало конфіденційність"
 
-#: libpq/be-secure-gssapi.c:575
-#, c-format
-msgid "oversize GSSAPI packet sent by the client (%zu > %d)"
-msgstr "переповнений пакет GSSAPI, надісланий клієнтом (%zu > %d)"
-
-#: libpq/be-secure-gssapi.c:600
+#: libpq/be-secure-gssapi.c:613
 msgid "could not accept GSSAPI security context"
 msgstr "не вдалося прийняти контекст безпеки GSSAPI"
 
-#: libpq/be-secure-gssapi.c:701
+#: libpq/be-secure-gssapi.c:731
 msgid "GSSAPI size check error"
 msgstr "помилка перевірки розміру GSSAPI"
 
-#: libpq/be-secure-openssl.c:131
+#: libpq/be-secure-openssl.c:118
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "не вдалося створити контекст SSL: %s"
 
-#: libpq/be-secure-openssl.c:157
+#: libpq/be-secure-openssl.c:144
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "не вдалося завантажити сертифікат серверу \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:177
+#: libpq/be-secure-openssl.c:164
 #, c-format
 msgid "private key file \"%s\" cannot be reloaded because it requires a passphrase"
 msgstr "файл закритого ключа \"%s\" не можна перезавантажити, тому що це потребує парольну фразу"
 
-#: libpq/be-secure-openssl.c:182
+#: libpq/be-secure-openssl.c:169
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "не вдалось завантажити файл закритого ключа \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:191
+#: libpq/be-secure-openssl.c:178
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "помилка під час перевірки приватного ключа: %s"
 
 #. translator: first %s is a GUC option name, second %s is its value
-#: libpq/be-secure-openssl.c:204 libpq/be-secure-openssl.c:227
+#: libpq/be-secure-openssl.c:191 libpq/be-secure-openssl.c:214
 #, c-format
 msgid "\"%s\" setting \"%s\" not supported by this build"
 msgstr "\"%s\" налаштування \"%s\" не підтримується цією збіркою"
 
-#: libpq/be-secure-openssl.c:214
+#: libpq/be-secure-openssl.c:201
 #, c-format
 msgid "could not set minimum SSL protocol version"
 msgstr "не вдалося встановити мінімальну версію протоколу SSL"
 
-#: libpq/be-secure-openssl.c:237
+#: libpq/be-secure-openssl.c:224
 #, c-format
 msgid "could not set maximum SSL protocol version"
 msgstr "не вдалося встановити максимальну версію протоколу SSL"
 
-#: libpq/be-secure-openssl.c:253
+#: libpq/be-secure-openssl.c:241
 #, c-format
 msgid "could not set SSL protocol version range"
 msgstr "не вдалося встановити діапазон версій протоколу SSL"
 
-#: libpq/be-secure-openssl.c:254
+#: libpq/be-secure-openssl.c:242
 #, c-format
 msgid "\"%s\" cannot be higher than \"%s\""
 msgstr "\"%s\" не може бути більше, ніж \"%s\""
 
-#: libpq/be-secure-openssl.c:307
+#: libpq/be-secure-openssl.c:295
+#, c-format
+msgid "could not set the TLSv1.2 cipher list (no valid ciphers available)"
+msgstr "не вдалося встановити список шифрів TLSv1.2 (жодних дійсних шифрів немає)"
+
+#: libpq/be-secure-openssl.c:310
 #, c-format
-msgid "could not set the cipher list (no valid ciphers available)"
-msgstr "не вдалося встановити список шифрів (немає дійсних шифрів)"
+msgid "could not set the TLSv1.3 cipher suites (no valid ciphers available)"
+msgstr "не вдалося встановити набори шифрів TLSv1.3 (жодних дійсних шифрів немає)"
 
-#: libpq/be-secure-openssl.c:327
+#: libpq/be-secure-openssl.c:331
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "не вдалося завантажити файл кореневого сертифікату \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:376
+#: libpq/be-secure-openssl.c:380
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "не вдалося завантажити файл зі списком відкликаних сертифікатів SSL \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:384
+#: libpq/be-secure-openssl.c:388
 #, c-format
 msgid "could not load SSL certificate revocation list directory \"%s\": %s"
 msgstr "не вдалося завантажити каталог списку відкликаних сертифікатів SSL \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:396
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\" or directory \"%s\": %s"
 msgstr "не вдалося завантажити файл \"%s\" або каталог \"%s\" списку відкликаних сертифікатів SSL: %s"
 
-#: libpq/be-secure-openssl.c:450
+#: libpq/be-secure-openssl.c:454
 #, c-format
 msgid "could not initialize SSL connection: SSL context not set up"
 msgstr "не вдалося ініціалізувати SSL-підключення: контекст SSL не встановлений"
 
-#: libpq/be-secure-openssl.c:464
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "не вдалося ініціалізувати SSL-підключення: %s"
 
-#: libpq/be-secure-openssl.c:472
+#: libpq/be-secure-openssl.c:476
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "не вдалося встановити SSL-сокет: %s"
 
-#: libpq/be-secure-openssl.c:528
+#: libpq/be-secure-openssl.c:532
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "не вдалося прийняти SSL-підключення: %m"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:536 libpq/be-secure-openssl.c:593
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "не вдалося прийняти SSL-підключення: виявлений EOF"
 
-#: libpq/be-secure-openssl.c:573
+#: libpq/be-secure-openssl.c:577
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "не вдалося отримати підключення SSL: %s"
 
-#: libpq/be-secure-openssl.c:577
+#: libpq/be-secure-openssl.c:581
 #, c-format
 msgid "This may indicate that the client does not support any SSL protocol version between %s and %s."
 msgstr "Це може вказувати, що клієнт не підтримує жодної версії протоколу SSL між %s і %s."
 
-#: libpq/be-secure-openssl.c:594 libpq/be-secure-openssl.c:809
-#: libpq/be-secure-openssl.c:879
+#: libpq/be-secure-openssl.c:598 libpq/be-secure-openssl.c:813
+#: libpq/be-secure-openssl.c:883
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "нерозпізнаний код помилки SSL: %d"
 
-#: libpq/be-secure-openssl.c:622
+#: libpq/be-secure-openssl.c:626
 #, c-format
 msgid "received SSL connection request with unexpected ALPN protocol"
-msgstr ""
+msgstr "отримано запит на підключення SSL з несподіваним протоколом ALPN"
 
-#: libpq/be-secure-openssl.c:666
+#: libpq/be-secure-openssl.c:670
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Спільне ім'я SSL-сертифікату містить нульовий байт"
 
-#: libpq/be-secure-openssl.c:712
+#: libpq/be-secure-openssl.c:716
 #, c-format
 msgid "SSL certificate's distinguished name contains embedded null"
 msgstr "Унікальна назва сертифікату SSL містить вбудоване null-значення"
 
-#: libpq/be-secure-openssl.c:798 libpq/be-secure-openssl.c:863
+#: libpq/be-secure-openssl.c:802 libpq/be-secure-openssl.c:867
 #, c-format
 msgid "SSL error: %s"
 msgstr "Помилка SSL: %s"
 
-#: libpq/be-secure-openssl.c:1038
+#: libpq/be-secure-openssl.c:1050
 #, c-format
 msgid "could not open DH parameters file \"%s\": %m"
 msgstr "не вдалося відкрити файл параметрів DH \"%s\": %m"
 
-#: libpq/be-secure-openssl.c:1050
+#: libpq/be-secure-openssl.c:1062
 #, c-format
 msgid "could not load DH parameters file: %s"
 msgstr "не вдалося завантажити файл параметрів DH: %s"
 
-#: libpq/be-secure-openssl.c:1060
+#: libpq/be-secure-openssl.c:1072
 #, c-format
 msgid "invalid DH parameters: %s"
 msgstr "неприпустимі параметри DH: %s"
 
-#: libpq/be-secure-openssl.c:1069
+#: libpq/be-secure-openssl.c:1081
 #, c-format
 msgid "invalid DH parameters: p is not prime"
 msgstr "неприпустимі параметри DH: р - не штрих"
 
-#: libpq/be-secure-openssl.c:1078
+#: libpq/be-secure-openssl.c:1090
 #, c-format
 msgid "invalid DH parameters: neither suitable generator or safe prime"
 msgstr "неприпустимі параметри DH: немає придатного генератора або безпечного штриха"
 
-#: libpq/be-secure-openssl.c:1214
+#: libpq/be-secure-openssl.c:1226
 #, c-format
 msgid "Client certificate verification failed at depth %d: %s."
 msgstr "Не вдалося перевірити сертифікат клієнта на глибині %d: %s."
 
-#: libpq/be-secure-openssl.c:1251
+#: libpq/be-secure-openssl.c:1263
 #, c-format
 msgid "Failed certificate data (unverified): subject \"%s\", serial number %s, issuer \"%s\"."
 msgstr "Помилкові дані сертифіката (неперевірені): тема \"%s\", серійний номер %s, емітент \"%s\"."
 
-#: libpq/be-secure-openssl.c:1252
+#: libpq/be-secure-openssl.c:1264
 msgid "unknown"
 msgstr "невідомо"
 
-#: libpq/be-secure-openssl.c:1389
+#: libpq/be-secure-openssl.c:1401
 #, c-format
 msgid "DH: could not load DH parameters"
 msgstr "DH: не вдалося завантажити параметри DH"
 
-#: libpq/be-secure-openssl.c:1397
+#: libpq/be-secure-openssl.c:1409
 #, c-format
 msgid "DH: could not set DH parameters: %s"
 msgstr "DH: не вдалося встановити параметри DH: %s"
 
-#: libpq/be-secure-openssl.c:1424
+#: libpq/be-secure-openssl.c:1439
 #, c-format
-msgid "ECDH: unrecognized curve name: %s"
-msgstr "ECDH: нерозпізнане ім'я кривої: %s"
+msgid "could not set group names specified in ssl_groups: %s"
+msgstr "не вдалося встановити імена груп, вказаних у ssl_groups: %s"
+
+#: libpq/be-secure-openssl.c:1441
+msgid "No valid groups found"
+msgstr "Не знайдено дійсних груп"
 
-#: libpq/be-secure-openssl.c:1433
+#: libpq/be-secure-openssl.c:1442
 #, c-format
-msgid "ECDH: could not create key"
-msgstr "ECDH: не вдалося створити ключ"
+msgid "Ensure that each group name is spelled correctly and supported by the installed version of OpenSSL."
+msgstr "Переконайтеся, що кожна назва групи написана правильно та підтримується встановленою версією OpenSSL."
 
-#: libpq/be-secure-openssl.c:1461
+#: libpq/be-secure-openssl.c:1488
 msgid "no SSL error reported"
 msgstr "немає повідомлення про помилку SSL"
 
-#: libpq/be-secure-openssl.c:1479
+#: libpq/be-secure-openssl.c:1506
 #, c-format
 msgid "SSL error code %lu"
 msgstr "Код помилки SSL %lu"
 
-#: libpq/be-secure-openssl.c:1636
+#: libpq/be-secure-openssl.c:1663
 #, c-format
 msgid "could not create BIO"
 msgstr "неможливо створити BIO"
 
-#: libpq/be-secure-openssl.c:1646
+#: libpq/be-secure-openssl.c:1673
 #, c-format
 msgid "could not get NID for ASN1_OBJECT object"
 msgstr "не вдалося отримати NID для об'єкту ASN1_OBJECT"
 
-#: libpq/be-secure-openssl.c:1654
+#: libpq/be-secure-openssl.c:1681
 #, c-format
 msgid "could not convert NID %d to an ASN1_OBJECT structure"
 msgstr "не вдалося перетворити NID %d в структуру ASN1_OBJECT"
 
-#: libpq/crypt.c:48
+#: libpq/crypt.c:50
 #, c-format
 msgid "Role \"%s\" does not exist."
 msgstr "Роль \"%s\" не існує."
 
-#: libpq/crypt.c:58
+#: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
 msgstr "Користувач \"%s\" не має пароля."
 
-#: libpq/crypt.c:76
+#: libpq/crypt.c:78
 #, c-format
 msgid "User \"%s\" has an expired password."
 msgstr "Користувач \"%s\" має прострочений пароль."
 
-#: libpq/crypt.c:182
+#: libpq/crypt.c:174
+#, c-format
+msgid "encrypted password is too long"
+msgstr "зашифрований пароль занадто довгий"
+
+#: libpq/crypt.c:175
+#, c-format
+msgid "Encrypted passwords must be no longer than %d bytes."
+msgstr "Зашифровані паролі не можуть бути довшими за %d байтів."
+
+#: libpq/crypt.c:183
+#, c-format
+msgid "setting an MD5-encrypted password"
+msgstr "встановлення пароля, зашифрованого MD5"
+
+#: libpq/crypt.c:184
+#, c-format
+msgid "MD5 password support is deprecated and will be removed in a future release of PostgreSQL."
+msgstr "Підтримка паролів MD5 застаріла і буде видалена в майбутньому випуску PostgreSQL."
+
+#: libpq/crypt.c:185
+#, c-format
+msgid "Refer to the PostgreSQL documentation for details about migrating to another password type."
+msgstr "Зверніться до документації PostgreSQL для отримання деталей про міграцію на інший тип пароля."
+
+#: libpq/crypt.c:216
 #, c-format
 msgid "User \"%s\" has a password that cannot be used with MD5 authentication."
 msgstr "Користувач \"%s\" має пароль, який не можна використовувати з автентифікацією MD5."
 
-#: libpq/crypt.c:203 libpq/crypt.c:245 libpq/crypt.c:265
+#: libpq/crypt.c:237 libpq/crypt.c:279 libpq/crypt.c:299
 #, c-format
 msgid "Password does not match for user \"%s\"."
 msgstr "Пароль не підходить для користувача \"%s\"."
 
-#: libpq/crypt.c:284
+#: libpq/crypt.c:318
 #, c-format
 msgid "Password of user \"%s\" is in unrecognized format."
 msgstr "Пароль користувача \"%s\" представлений в нерозпізнаному форматі."
 
-#: libpq/hba.c:327
+#: libpq/hba.c:329
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "недійсний регулярний вираз \"%s\": %s"
 
-#: libpq/hba.c:329 libpq/hba.c:661 libpq/hba.c:1245 libpq/hba.c:1265
-#: libpq/hba.c:1288 libpq/hba.c:1301 libpq/hba.c:1354 libpq/hba.c:1382
-#: libpq/hba.c:1390 libpq/hba.c:1402 libpq/hba.c:1423 libpq/hba.c:1436
-#: libpq/hba.c:1461 libpq/hba.c:1488 libpq/hba.c:1500 libpq/hba.c:1559
-#: libpq/hba.c:1579 libpq/hba.c:1593 libpq/hba.c:1613 libpq/hba.c:1624
-#: libpq/hba.c:1639 libpq/hba.c:1658 libpq/hba.c:1674 libpq/hba.c:1686
-#: libpq/hba.c:1752 libpq/hba.c:1765 libpq/hba.c:1787 libpq/hba.c:1799
-#: libpq/hba.c:1817 libpq/hba.c:1867 libpq/hba.c:1911 libpq/hba.c:1922
-#: libpq/hba.c:1938 libpq/hba.c:1955 libpq/hba.c:1966 libpq/hba.c:1985
-#: libpq/hba.c:2001 libpq/hba.c:2017 libpq/hba.c:2076 libpq/hba.c:2093
-#: libpq/hba.c:2106 libpq/hba.c:2118 libpq/hba.c:2137 libpq/hba.c:2223
-#: libpq/hba.c:2241 libpq/hba.c:2335 libpq/hba.c:2354 libpq/hba.c:2383
-#: libpq/hba.c:2396 libpq/hba.c:2419 libpq/hba.c:2441 libpq/hba.c:2455
-#: tsearch/ts_locale.c:241
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "рядок %d файла конфігурації \"%s\""
-
-#: libpq/hba.c:457
+#: libpq/hba.c:459
 #, c-format
 msgid "skipping missing authentication file \"%s\""
 msgstr "пропускається відсутній файл автентифікації \"%s\""
 
-#: libpq/hba.c:609
+#: libpq/hba.c:611
 #, c-format
 msgid "could not open file \"%s\": maximum nesting depth exceeded"
 msgstr "не вдалося відкрити файл \"%s\": максимальну глибину вкладення перевищено"
 
-#: libpq/hba.c:1216
+#: libpq/hba.c:1222
 #, c-format
 msgid "error enumerating network interfaces: %m"
 msgstr "помилка перерахування мережевих інтерфейсів: %m"
 
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:1243
+#: libpq/hba.c:1249
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr "параметр автентифікації \"%s\" припустимий лише для способів автентифікації %s"
 
-#: libpq/hba.c:1263
+#: libpq/hba.c:1269
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "спосіб автентифікації \"%s\" потребує аргумент \"%s\" для встановлення"
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1293
 #, c-format
 msgid "missing entry at end of line"
 msgstr "відсутній запис в кінці рядка"
 
-#: libpq/hba.c:1300
+#: libpq/hba.c:1306
 #, c-format
 msgid "multiple values in ident field"
 msgstr "кілька значень в полі ident"
 
-#: libpq/hba.c:1352
+#: libpq/hba.c:1358
 #, c-format
 msgid "multiple values specified for connection type"
 msgstr "кілька значень вказано для типу підключення"
 
-#: libpq/hba.c:1353
+#: libpq/hba.c:1359
 #, c-format
 msgid "Specify exactly one connection type per line."
 msgstr "Вкажіть в рядку єдиний тип підключення."
 
-#: libpq/hba.c:1380
+#: libpq/hba.c:1386
 #, c-format
 msgid "hostssl record cannot match because SSL is disabled"
 msgstr "запис hostssl не збігається, тому що протокол SSL вимкнутий"
 
-#: libpq/hba.c:1381
+#: libpq/hba.c:1387
 #, c-format
 msgid "Set \"ssl = on\" in postgresql.conf."
-msgstr ""
+msgstr "Встановіть \"ssl = on\" в postgresql.conf."
 
-#: libpq/hba.c:1389
+#: libpq/hba.c:1395
 #, c-format
 msgid "hostssl record cannot match because SSL is not supported by this build"
 msgstr "запис hostssl не збігається, тому що SSL не підтримується цією збіркою"
 
-#: libpq/hba.c:1401
+#: libpq/hba.c:1407
 #, c-format
 msgid "hostgssenc record cannot match because GSSAPI is not supported by this build"
 msgstr "запис hostgssenc не може збігатись, оскільки GSSAPI не підтримується цією збіркою"
 
-#: libpq/hba.c:1421
+#: libpq/hba.c:1427
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "неприпустимий тип підключення \"%s\""
 
-#: libpq/hba.c:1435
+#: libpq/hba.c:1441
 #, c-format
 msgid "end-of-line before database specification"
 msgstr "кінець рядка перед визначенням бази даних"
 
-#: libpq/hba.c:1460
+#: libpq/hba.c:1466
 #, c-format
 msgid "end-of-line before role specification"
 msgstr "кінець рядка перед визначенням ролі"
 
-#: libpq/hba.c:1487
+#: libpq/hba.c:1493
 #, c-format
 msgid "end-of-line before IP address specification"
 msgstr "кінець рядка перед визначенням IP-адрес"
 
-#: libpq/hba.c:1498
+#: libpq/hba.c:1504
 #, c-format
 msgid "multiple values specified for host address"
 msgstr "для адреси хоста вказано кілька значень"
 
-#: libpq/hba.c:1499
+#: libpq/hba.c:1505
 #, c-format
 msgid "Specify one address range per line."
 msgstr "Вкажіть один діапазон адреси в рядку."
 
-#: libpq/hba.c:1557
+#: libpq/hba.c:1563
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "неприпустима IP адреса \"%s\": %s"
 
-#: libpq/hba.c:1577
+#: libpq/hba.c:1583
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
 msgstr "визначити одночасно ім’я хоста і маску CIDR не можна: \"%s\""
 
-#: libpq/hba.c:1591
+#: libpq/hba.c:1597
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "неприпустима маска CIDR в адресі \"%s\""
 
-#: libpq/hba.c:1611
+#: libpq/hba.c:1617
 #, c-format
 msgid "end-of-line before netmask specification"
 msgstr "кінець рядка перед визначенням маски мережі"
 
-#: libpq/hba.c:1612
+#: libpq/hba.c:1618
 #, c-format
 msgid "Specify an address range in CIDR notation, or provide a separate netmask."
 msgstr "Вкажіть діапазон адрес в нотації CIDR або надайте окрему маску мережі."
 
-#: libpq/hba.c:1623
+#: libpq/hba.c:1629
 #, c-format
 msgid "multiple values specified for netmask"
 msgstr "для маски мережі вказано декілька значень"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1643
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "неприпустима маска IP \"%s\": %s"
 
-#: libpq/hba.c:1657
+#: libpq/hba.c:1663
 #, c-format
 msgid "IP address and mask do not match"
 msgstr "IP-адреса і маска не збігаються"
 
-#: libpq/hba.c:1673
+#: libpq/hba.c:1679
 #, c-format
 msgid "end-of-line before authentication method"
 msgstr "кінець рядка перед способом автентифікації"
 
-#: libpq/hba.c:1684
+#: libpq/hba.c:1690
 #, c-format
 msgid "multiple values specified for authentication type"
 msgstr "для типу автентифікації вказано декілька значень"
 
-#: libpq/hba.c:1685
+#: libpq/hba.c:1691
 #, c-format
 msgid "Specify exactly one authentication type per line."
 msgstr "Вкажіть у рядку єдиний тип автентифікації."
 
-#: libpq/hba.c:1750
+#: libpq/hba.c:1758
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "неприпустимий спосіб автентифікації \"%s\""
 
-#: libpq/hba.c:1763
+#: libpq/hba.c:1771
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr "неприпустимий спосіб автентифікації \"%s\": не підтримується цією збіркою"
 
-#: libpq/hba.c:1786
+#: libpq/hba.c:1794
 #, c-format
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "автентифікація gssapi для локальних сокетів не підтримується"
 
-#: libpq/hba.c:1798
+#: libpq/hba.c:1806
 #, c-format
 msgid "peer authentication is only supported on local sockets"
 msgstr "автентифікація peer підтримується лише для локальних сокетів"
 
-#: libpq/hba.c:1816
+#: libpq/hba.c:1824
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "автентифікація cert підтримується лише для підключень hostssl"
 
-#: libpq/hba.c:1866
+#: libpq/hba.c:1874
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "параметр автентифікації вказаний не в форматі ім’я=значення: %s"
 
-#: libpq/hba.c:1910
+#: libpq/hba.c:1918
 #, c-format
-msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"
-msgstr "не можна використовувати ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter або ldapurl разом з ldapprefix"
+msgid "cannot mix options for simple bind and search+bind modes"
+msgstr "не можна поєднувати опції для простого прив'язування та режимів search+bind"
 
-#: libpq/hba.c:1921
+#: libpq/hba.c:1929
 #, c-format
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
 msgstr "спосіб автентифікації \"ldap\" потребує встановити аргумент \"ldapbasedn\", \"ldapprefix\" або \"ldapsuffix\""
 
-#: libpq/hba.c:1937
+#: libpq/hba.c:1945
 #, c-format
 msgid "cannot use ldapsearchattribute together with ldapsearchfilter"
 msgstr "не можна використовувати ldapsearchattribute разом з ldapsearchfilter"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1962
 #, c-format
 msgid "list of RADIUS servers cannot be empty"
 msgstr "список серверів RADIUS не може бути порожнім"
 
-#: libpq/hba.c:1965
+#: libpq/hba.c:1973
 #, c-format
 msgid "list of RADIUS secrets cannot be empty"
 msgstr "список секретів RADIUS не може бути порожнім"
 
-#: libpq/hba.c:1982
+#: libpq/hba.c:1990
 #, c-format
 msgid "the number of RADIUS secrets (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "кількість секретів RADIUS (%d) повинна бути 1 або дорівнювати кількості серверів RADIUS (%d)"
 
-#: libpq/hba.c:1998
+#: libpq/hba.c:2006
 #, c-format
 msgid "the number of RADIUS ports (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "кількість портів RADIUS (%d) повинна бути 1 або дорівнювати кількості серверів RADIUS (%d)"
 
-#: libpq/hba.c:2014
+#: libpq/hba.c:2022
 #, c-format
 msgid "the number of RADIUS identifiers (%d) must be 1 or the same as the number of RADIUS servers (%d)"
 msgstr "кількість ідентифікаторів RADIUS (%d) повинна бути 1 або дорівнювати кількості серверів RADIUS (%d)"
 
-#: libpq/hba.c:2066
-msgid "ident, peer, gssapi, sspi, and cert"
-msgstr "ident, peer, gssapi, sspi і cert"
+#. translator: strings are replaced with hba options
+#: libpq/hba.c:2067
+#, c-format
+msgid "%s cannot be used in combination with %s"
+msgstr "%s не може бути використано в комбінації з %s"
+
+#: libpq/hba.c:2105
+msgid "ident, peer, gssapi, sspi, cert, and oauth"
+msgstr "ident, peer, gssapi, sspi, cert та oauth"
 
-#: libpq/hba.c:2075
+#: libpq/hba.c:2114
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert може бути налаштовано лише для рядків \"hostssl\""
 
-#: libpq/hba.c:2092
+#: libpq/hba.c:2131
 #, c-format
 msgid "clientcert only accepts \"verify-full\" when using \"cert\" authentication"
 msgstr "clientcert приймає лише \"verify-full\" під час використання автентифікації \"cert\""
 
-#: libpq/hba.c:2105
+#: libpq/hba.c:2144
 #, c-format
 msgid "invalid value for clientcert: \"%s\""
 msgstr "неприпустиме значення для clientcert: \"%s\""
 
-#: libpq/hba.c:2117
+#: libpq/hba.c:2156
 #, c-format
 msgid "clientname can only be configured for \"hostssl\" rows"
 msgstr "clientname можна налаштувати лише для рядків \"hostssl\""
 
-#: libpq/hba.c:2136
+#: libpq/hba.c:2175
 #, c-format
 msgid "invalid value for clientname: \"%s\""
 msgstr "неприпустиме значення для clientname: \"%s\""
 
-#: libpq/hba.c:2169
+#: libpq/hba.c:2208
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
 msgstr "не вдалося аналізувати URL-адресу LDAP \"%s\": %s"
 
-#: libpq/hba.c:2180
+#: libpq/hba.c:2219
 #, c-format
 msgid "unsupported LDAP URL scheme: %s"
 msgstr "непідтримувана схема в URL-адресі LDAP: %s"
 
-#: libpq/hba.c:2204
+#: libpq/hba.c:2243
 #, c-format
 msgid "LDAP URLs not supported on this platform"
 msgstr "URL-адреса LDAP не підтримується на цій платформі"
 
-#: libpq/hba.c:2222
+#: libpq/hba.c:2261
 #, c-format
 msgid "invalid ldapscheme value: \"%s\""
 msgstr "недійсне значення ldapscheme: \"%s\""
 
-#: libpq/hba.c:2240
+#: libpq/hba.c:2279
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "недійсний номер порту LDAP: \"%s\""
 
-#: libpq/hba.c:2286 libpq/hba.c:2293
+#: libpq/hba.c:2325 libpq/hba.c:2332
 msgid "gssapi and sspi"
 msgstr "gssapi і sspi"
 
-#: libpq/hba.c:2302 libpq/hba.c:2311
+#: libpq/hba.c:2341 libpq/hba.c:2350
 msgid "sspi"
 msgstr "sspi"
 
-#: libpq/hba.c:2333
+#: libpq/hba.c:2372
 #, c-format
 msgid "could not parse RADIUS server list \"%s\""
 msgstr "не вдалося проаналізувати список серверів RADIUS \"%s\""
 
-#: libpq/hba.c:2381
+#: libpq/hba.c:2420
 #, c-format
 msgid "could not parse RADIUS port list \"%s\""
 msgstr "не вдалося проаналізувати список портів RADIUS \"%s\""
 
-#: libpq/hba.c:2395
+#: libpq/hba.c:2434
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "недійсний номер порту RADIUS: \"%s\""
 
-#: libpq/hba.c:2417
+#: libpq/hba.c:2456
 #, c-format
 msgid "could not parse RADIUS secret list \"%s\""
 msgstr "не вдалося проаналізувати список секретів RADIUS \"%s\""
 
-#: libpq/hba.c:2439
+#: libpq/hba.c:2478
 #, c-format
 msgid "could not parse RADIUS identifiers list \"%s\""
 msgstr "не вдалося проаналізувати список ідентифікаторів RADIUS \"%s\""
 
-#: libpq/hba.c:2453
+#: libpq/hba.c:2515
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "нерозпізнане ім’я параметра автентифікації: \"%s\""
 
-#: libpq/hba.c:2645
+#: libpq/hba.c:2707
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "файл конфігурації \"%s\" не містить елементів"
 
-#: libpq/hba.c:2798
+#: libpq/hba.c:2860
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "помилка при пошуку за регулярним виразом для \"%s\": %s"
 
-#: libpq/hba.c:2822
+#: libpq/hba.c:2884
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
 msgstr "регулярний вираз \"%s не містить підвиразів, необхідних для зворотного посилання в \"%s\""
 
-#: libpq/hba.c:2925
+#: libpq/hba.c:2987
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "вказане ім'я користувача (%s) і автентифіковане ім'я користувача (%s) не збігаються"
 
-#: libpq/hba.c:2945
+#: libpq/hba.c:3007
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr "немає відповідності у файлі зіставлень \"%s\" для користувача \"%s\" автентифікованого як \"%s\""
 
-#: libpq/pqcomm.c:211 libpq/pqcomm.c:219 libpq/pqcomm.c:250 libpq/pqcomm.c:259
-#: libpq/pqcomm.c:1648 libpq/pqcomm.c:1693 libpq/pqcomm.c:1733
-#: libpq/pqcomm.c:1777 libpq/pqcomm.c:1816 libpq/pqcomm.c:1855
-#: libpq/pqcomm.c:1891 libpq/pqcomm.c:1930
+#: libpq/pqcomm.c:212 libpq/pqcomm.c:220 libpq/pqcomm.c:251 libpq/pqcomm.c:260
+#: libpq/pqcomm.c:1652 libpq/pqcomm.c:1697 libpq/pqcomm.c:1737
+#: libpq/pqcomm.c:1781 libpq/pqcomm.c:1820 libpq/pqcomm.c:1859
+#: libpq/pqcomm.c:1895 libpq/pqcomm.c:1934
 #, c-format
 msgid "%s(%s) failed: %m"
 msgstr "%s(%s) помилка: %m"
 
-#: libpq/pqcomm.c:296
+#: libpq/pqcomm.c:297
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "не вдалося перевести сокет у неблокуючий режим: %m"
 
-#: libpq/pqcomm.c:456
+#: libpq/pqcomm.c:457
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Шлях Unix-сокету \"%s\" занадто довгий (максимум %d байтів)"
 
-#: libpq/pqcomm.c:476
+#: libpq/pqcomm.c:477
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "не вдалось перекласти ім'я хоста \"%s\", служби \"%s\" в адресу: %s"
 
-#: libpq/pqcomm.c:480
+#: libpq/pqcomm.c:481
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "не вдалось перекласти службу \"%s\" в адресу: %s"
 
-#: libpq/pqcomm.c:502
+#: libpq/pqcomm.c:503
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "не вдалось прив'язатись до всіх запитаних адрес: MAXLISTEN (%d) перевищено"
 
-#: libpq/pqcomm.c:511
+#: libpq/pqcomm.c:512
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:514
+#: libpq/pqcomm.c:515
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:517
+#: libpq/pqcomm.c:518
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:521
+#: libpq/pqcomm.c:522
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "нерозпізнане сімейство адресів %d"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:545
+#: libpq/pqcomm.c:546
 #, c-format
 msgid "could not create %s socket for address \"%s\": %m"
 msgstr "не вдалось створити сокет %s для адреси \"%s\": %m"
 
-#. translator: third %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:574 libpq/pqcomm.c:592
+#. translator: third %s is IPv4 or IPv6
+#. translator: third %s is IPv6
+#: libpq/pqcomm.c:575 libpq/pqcomm.c:593
 #, c-format
 msgid "%s(%s) failed for %s address \"%s\": %m"
 msgstr "%s(%s) помилка %s для адреси \"%s\": %m"
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:615
+#: libpq/pqcomm.c:616
 #, c-format
 msgid "could not bind %s address \"%s\": %m"
 msgstr "не вдалось прив'язатись до адреси %s \"%s\": %m"
 
-#: libpq/pqcomm.c:619
+#: libpq/pqcomm.c:620
 #, c-format
 msgid "Is another postmaster already running on port %d?"
 msgstr "Можливо інший процес postmaster вже виконується на порті %d?"
 
-#: libpq/pqcomm.c:621
+#: libpq/pqcomm.c:622
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr "Можливо порт %d вже зайнятий іншим процесом postmaster? Якщо ні, почекайте пару секунд і спробуйте знову."
 
 #. translator: first %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:650
+#: libpq/pqcomm.c:651
 #, c-format
 msgid "could not listen on %s address \"%s\": %m"
 msgstr "не вдалось прослухати на адресі %s \"%s\": %m"
 
-#: libpq/pqcomm.c:658
+#: libpq/pqcomm.c:659
 #, c-format
 msgid "listening on Unix socket \"%s\""
 msgstr "прослуховувати UNIX сокет \"%s\""
 
 #. translator: first %s is IPv4 or IPv6
-#: libpq/pqcomm.c:663
+#: libpq/pqcomm.c:664
 #, c-format
 msgid "listening on %s address \"%s\", port %d"
 msgstr "прослуховувати %s адресу \"%s\", порт %d"
 
-#: libpq/pqcomm.c:753
+#: libpq/pqcomm.c:754
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "група \"%s\" не існує"
 
-#: libpq/pqcomm.c:763
+#: libpq/pqcomm.c:764
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "не вдалось встановити групу для файла \"%s\": %m"
 
-#: libpq/pqcomm.c:774
+#: libpq/pqcomm.c:775
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "не вдалось встановити дозволи для файла \"%s\": %m"
 
-#: libpq/pqcomm.c:803
+#: libpq/pqcomm.c:804
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "не вдалось прийняти нове підключення: %m"
 
-#: libpq/pqcomm.c:885
+#: libpq/pqcomm.c:886
 #, c-format
 msgid "there is no client connection"
 msgstr "немає клієнтського підключення"
 
-#: libpq/pqcomm.c:941 libpq/pqcomm.c:1042
+#: libpq/pqcomm.c:942 libpq/pqcomm.c:1043
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "не вдалось отримати дані від клієнта: %m"
 
-#: libpq/pqcomm.c:1149 tcop/postgres.c:4533
+#: libpq/pqcomm.c:1151 tcop/postgres.c:4500
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "завершення підключення через втрату синхронізації протоколу"
 
-#: libpq/pqcomm.c:1215
+#: libpq/pqcomm.c:1217
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "неочікуваний EOF в слові довжини повідомлення"
 
-#: libpq/pqcomm.c:1225
+#: libpq/pqcomm.c:1227
 #, c-format
 msgid "invalid message length"
 msgstr "неприпустима довжина повідомлення"
 
-#: libpq/pqcomm.c:1247 libpq/pqcomm.c:1260
+#: libpq/pqcomm.c:1249 libpq/pqcomm.c:1262
 #, c-format
 msgid "incomplete message from client"
 msgstr "неповне повідомлення від клієнта"
 
-#: libpq/pqcomm.c:1401
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "не вдалось надіслати дані клієнту: %m"
 
-#: libpq/pqcomm.c:1616
+#: libpq/pqcomm.c:1620
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) помилка: код помилки %d"
 
-#: libpq/pqcomm.c:1705
+#: libpq/pqcomm.c:1709
 #, c-format
 msgid "setting the keepalive idle time is not supported"
 msgstr "встановлення часу простою keepalive не підтримується"
 
-#: libpq/pqcomm.c:1789 libpq/pqcomm.c:1864 libpq/pqcomm.c:1939
+#: libpq/pqcomm.c:1793 libpq/pqcomm.c:1868 libpq/pqcomm.c:1943
 #, c-format
 msgid "%s(%s) not supported"
 msgstr "%s(%s) не підтримується"
@@ -15964,7 +16564,7 @@ msgid "no data left in message"
 msgstr "у повідомлення не залишилось даних"
 
 #: libpq/pqformat.c:515 libpq/pqformat.c:533 libpq/pqformat.c:554
-#: utils/adt/array_userfuncs.c:797 utils/adt/arrayfuncs.c:1481
+#: utils/adt/array_userfuncs.c:873 utils/adt/arrayfuncs.c:1481
 #: utils/adt/rowtypes.c:613
 #, c-format
 msgid "insufficient data left in message"
@@ -15980,220 +16580,220 @@ msgstr "неприпустимий рядок в повідомленні"
 msgid "invalid message format"
 msgstr "неприпустимий формат повідомлення"
 
-#: main/main.c:234
+#: main/main.c:298
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: помилка WSAStartup: %d\n"
 
-#: main/main.c:322
+#: main/main.c:386
 #, c-format
 msgid "%s is the PostgreSQL server.\n\n"
 msgstr "%s - сервер PostgreSQL.\n\n"
 
-#: main/main.c:323
+#: main/main.c:387
 #, c-format
 msgid "Usage:\n"
 "  %s [OPTION]...\n\n"
 msgstr "Використання:\n"
 "  %s [OPTION]...\n\n"
 
-#: main/main.c:324
+#: main/main.c:388
 #, c-format
 msgid "Options:\n"
 msgstr "Параметри:\n"
 
-#: main/main.c:325
+#: main/main.c:389
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        число спільних буферів\n"
 
-#: main/main.c:326
+#: main/main.c:390
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NAME=VALUE      встановити параметр під час виконання\n"
 
-#: main/main.c:327
+#: main/main.c:391
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NAME            вивести значення параметру під час виконання і вийти\n"
 
-#: main/main.c:328
+#: main/main.c:392
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             рівень налагодження\n"
 
-#: main/main.c:329
+#: main/main.c:393
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR         каталог бази даних\n"
 
-#: main/main.c:330
+#: main/main.c:394
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 використати європейський формат дат (DMY)\n"
 
-#: main/main.c:331
+#: main/main.c:395
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 вимкнути fsync\n"
 
-#: main/main.c:332
+#: main/main.c:396
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h HOSTNAME        ім’я хоста або IP-адреса для прослуховування\n"
 
-#: main/main.c:333
+#: main/main.c:397
 #, c-format
 msgid "  -i                 enable TCP/IP connections (deprecated)\n"
 msgstr "  -i                активувати підключення TCP/IP (застаріле)\n"
 
-#: main/main.c:334
+#: main/main.c:398
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k DIRECTORY         розташування  Unix-сокетів\n"
 
-#: main/main.c:336
+#: main/main.c:400
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 активувати SSL-підключення\n"
 
-#: main/main.c:338
+#: main/main.c:402
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-CONNECT     максимальне число дозволених підключень\n"
 
-#: main/main.c:339
+#: main/main.c:403
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            номер порту для прослуховування\n"
 
-#: main/main.c:340
+#: main/main.c:404
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 відображувати статистику після кожного запиту\n"
 
-#: main/main.c:341
+#: main/main.c:405
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S WORK-MEM        вказати обсяг пам'яті для сортування (в КБ)\n"
 
-#: main/main.c:342
+#: main/main.c:406
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      вивести інформацію про версію і вийти\n"
 
-#: main/main.c:343
+#: main/main.c:407
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NAME=VALUE       встановити параметр під час виконання\n"
 
-#: main/main.c:344
+#: main/main.c:408
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  описати параметри конфігурації і вийти\n"
 
-#: main/main.c:345
+#: main/main.c:409
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         показати довідку і вийти\n"
 
-#: main/main.c:347
+#: main/main.c:411
 #, c-format
 msgid "\n"
 "Developer options:\n"
 msgstr "\n"
 "Параметри для розробників:\n"
 
-#: main/main.c:348
+#: main/main.c:412
 #, c-format
 msgid "  -f s|i|o|b|t|n|m|h forbid use of some plan types\n"
 msgstr "  -f s|i|o|b|t|n|m|h заборонити використовувати деякі типи плану\n"
 
-#: main/main.c:349
+#: main/main.c:413
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 дозволити змінювати структуру системних таблиць\n"
 
-#: main/main.c:350
+#: main/main.c:414
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 вимкнути системні індекси\n"
 
-#: main/main.c:351
+#: main/main.c:415
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        показувати час після кожного запиту\n"
 
-#: main/main.c:352
+#: main/main.c:416
 #, c-format
 msgid "  -T                 send SIGABRT to all backend processes if one dies\n"
 msgstr "  -T                 надіслати SIGABRT усім внутрішнім процесам, якщо один вимкнеться\n"
 
-#: main/main.c:353
+#: main/main.c:417
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr "  -W NUM             очікувати NUM секунд, щоб дозволити підключення від налагоджувача\n"
 
-#: main/main.c:355
+#: main/main.c:419
 #, c-format
 msgid "\n"
 "Options for single-user mode:\n"
 msgstr "\n"
 "Параметри для однокористувацького режиму:\n"
 
-#: main/main.c:356
+#: main/main.c:420
 #, c-format
 msgid "  --single           selects single-user mode (must be first argument)\n"
 msgstr "  --single           установка однокористувацького режиму (цей аргумент повинен бути першим)\n"
 
-#: main/main.c:357
+#: main/main.c:421
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  DBNAME             ім’я бази даних (за замовчуванням - ім'я користувача)\n"
 
-#: main/main.c:358
+#: main/main.c:422
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             змінити рівень налагодження\n"
 
-#: main/main.c:359
+#: main/main.c:423
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                інструкція відлуння перед виконанням\n"
 
-#: main/main.c:360
+#: main/main.c:424
 #, c-format
 msgid "  -j                 do not use newline as interactive query delimiter\n"
 msgstr "  -j                 не використовувати новий рядок як роздільник інтерактивних запитів\n"
 
-#: main/main.c:361 main/main.c:367
+#: main/main.c:425 main/main.c:431
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r FILENAME        надіслати stdout і stderr до вказаного файлу\n"
 
-#: main/main.c:363
+#: main/main.c:427
 #, c-format
 msgid "\n"
 "Options for bootstrapping mode:\n"
 msgstr "\n"
 "Параметри для режиму початкового завантаження:\n"
 
-#: main/main.c:364
+#: main/main.c:428
 #, c-format
 msgid "  --boot             selects bootstrapping mode (must be first argument)\n"
 msgstr "  --boot             установка режиму початкового завантаження (цей аргумент повинен бути першим)\n"
 
-#: main/main.c:365
+#: main/main.c:429
 #, c-format
 msgid "  --check            selects check mode (must be first argument)\n"
 msgstr "  --check            обирає режим перевірки (має бути першим аргументом)\n"
 
-#: main/main.c:366
+#: main/main.c:430
 #, c-format
 msgid "  DBNAME             database name (mandatory argument in bootstrapping mode)\n"
 msgstr "  DBNAME             ім'я бази даних (обов'язковий аргумент у режимі початкового завантаження)\n"
 
-#: main/main.c:369
+#: main/main.c:433
 #, c-format
 msgid "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -16204,12 +16804,12 @@ msgstr "\n"
 "Будь-ласка прочитайте інструкцію для повного списку параметрів конфігурації виконання і їх встановлення у командний рядок або в файл конфігурації.\n\n"
 "Про помилки повідомляйте <%s>.\n"
 
-#: main/main.c:373
+#: main/main.c:437
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: main/main.c:384
+#: main/main.c:448
 #, c-format
 msgid "\"root\" execution of the PostgreSQL server is not permitted.\n"
 "The server must be started under an unprivileged user ID to prevent\n"
@@ -16218,12 +16818,12 @@ msgid "\"root\" execution of the PostgreSQL server is not permitted.\n"
 msgstr "Запускати сервер PostgreSQL під іменем \"root\" не дозволено.\n"
 "Для запобігання компрометації системи безпеки сервер повинен запускати непривілейований користувач. Дивіться документацію,  щоб дізнатися більше про те, як правильно запустити сервер.\n"
 
-#: main/main.c:401
+#: main/main.c:465
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: дійсний і ефективний ID користувача повинні збігатися\n"
 
-#: main/main.c:408
+#: main/main.c:472
 #, c-format
 msgid "Execution of PostgreSQL by a user with administrative permissions is not\n"
 "permitted.\n"
@@ -16243,15 +16843,15 @@ msgstr "розширений тип вузла \"%s\" вже існує"
 msgid "ExtensibleNodeMethods \"%s\" was not registered"
 msgstr "Методи розширеного вузла \"%s\" не зареєстровані"
 
-#: nodes/makefuncs.c:152 statistics/extended_stats.c:2310
+#: nodes/makefuncs.c:154 nodes/makefuncs.c:180 statistics/extended_stats.c:2286
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "відношення \"%s\" не має складеного типу"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2567
-#: parser/parse_coerce.c:2705 parser/parse_coerce.c:2752
-#: parser/parse_expr.c:2112 parser/parse_func.c:710 parser/parse_oper.c:869
-#: utils/fmgr/funcapi.c:669
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:2602
+#: parser/parse_coerce.c:2740 parser/parse_coerce.c:2787
+#: parser/parse_expr.c:2121 parser/parse_func.c:710 parser/parse_oper.c:869
+#: utils/adt/array_userfuncs.c:1950 utils/fmgr/funcapi.c:669
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "не вдалося знайти тип масиву для типу даних %s"
@@ -16266,184 +16866,205 @@ msgstr "портал \"%s\" з параметрами: %s"
 msgid "unnamed portal with parameters: %s"
 msgstr "портал без імені з параметрами: %s"
 
-#: optimizer/path/joinrels.c:972
+#: optimizer/path/joinrels.c:964
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN підтримується лише з умовами, які допускають з'єднання злиттям або хеш-з'єднанням"
 
-#: optimizer/plan/createplan.c:7175 parser/parse_merge.c:203
-#: rewrite/rewriteHandler.c:1696
+#: optimizer/plan/createplan.c:7321 parser/parse_merge.c:203
+#: rewrite/rewriteHandler.c:1692
 #, c-format
 msgid "cannot execute MERGE on relation \"%s\""
 msgstr "не можна виконати MERGE для відношення \"%s\""
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1407
+#: optimizer/plan/initsplan.c:1755
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "%s не можна застосовувати до нульової сторони зовнішнього з’єднання"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1386 parser/analyze.c:1771 parser/analyze.c:2029
-#: parser/analyze.c:3247
+#: optimizer/plan/planner.c:1512 parser/analyze.c:1815 parser/analyze.c:2074
+#: parser/analyze.c:3396
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s несумісно з UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:2127 optimizer/plan/planner.c:4113
+#: optimizer/plan/planner.c:2258 optimizer/plan/planner.c:4144
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "не вдалося реалізувати GROUP BY"
 
-#: optimizer/plan/planner.c:2128 optimizer/plan/planner.c:4114
-#: optimizer/plan/planner.c:4795 optimizer/prep/prepunion.c:1320
+#: optimizer/plan/planner.c:2259 optimizer/plan/planner.c:4145
+#: optimizer/plan/planner.c:4826 optimizer/prep/prepunion.c:1073
 #, c-format
 msgid "Some of the datatypes only support hashing, while others only support sorting."
 msgstr "Деякі типи даних підтримують лише хешування, в той час як інші підтримують тільки сортування."
 
-#: optimizer/plan/planner.c:4794
+#: optimizer/plan/planner.c:4825
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "не вдалося реалізувати DISTINCT"
 
-#: optimizer/plan/planner.c:6139
+#: optimizer/plan/planner.c:6287
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "не вдалося реалізувати PARTITION BY для вікна"
 
-#: optimizer/plan/planner.c:6140
+#: optimizer/plan/planner.c:6288
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Стовпці, що розділяють вікна, повинні мати типи даних з можливістю сортування."
 
-#: optimizer/plan/planner.c:6144
+#: optimizer/plan/planner.c:6292
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "не вдалося реалізувати ORDER BY для вікна"
 
-#: optimizer/plan/planner.c:6145
+#: optimizer/plan/planner.c:6293
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Стовпці, що впорядковують вікна, повинні мати типи даних з можливістю сортування."
 
-#: optimizer/prep/prepunion.c:467
+#: optimizer/prep/prepunion.c:440
 #, c-format
 msgid "could not implement recursive UNION"
 msgstr "не вдалося реалізувати рекурсивний UNION"
 
-#: optimizer/prep/prepunion.c:468
+#: optimizer/prep/prepunion.c:441
 #, c-format
 msgid "All column datatypes must be hashable."
 msgstr "Усі стовпці повинні мати типи даних з можливістю хешування."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:1319
+#. translator: %s is INTERSECT or EXCEPT
+#: optimizer/prep/prepunion.c:1071
 #, c-format
 msgid "could not implement %s"
 msgstr "не вдалося реалізувати %s"
 
-#: optimizer/util/clauses.c:4951
+#: optimizer/util/appendinfo.c:165
 #, c-format
-msgid "SQL function \"%s\" during inlining"
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's type"
+msgstr "атрибут \"%s\" відношення \"%s\" не відповідає типу батьківського елемента"
+
+#: optimizer/util/appendinfo.c:170
+#, c-format
+msgid "attribute \"%s\" of relation \"%s\" does not match parent's collation"
+msgstr "атрибут \"%s\" відношення \"%s\" не відповідає параметрам сортування батьківського елемента"
+
+#: optimizer/util/clauses.c:4968
+#, c-format
+msgid "SQL function \"%s\" during inlining"
 msgstr "Впроваджена в код SQL-функція \"%s\""
 
-#: optimizer/util/plancat.c:153
+#: optimizer/util/plancat.c:154
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "отримати доступ до тимчасових або нежурнальованих відношень під час відновлення не можна"
 
-#: optimizer/util/plancat.c:768
+#: optimizer/util/plancat.c:776
 #, c-format
 msgid "whole row unique index inference specifications are not supported"
 msgstr "вказівки з посиланням на весь рядок для вибору унікального індексу не підтримуються"
 
-#: optimizer/util/plancat.c:785
+#: optimizer/util/plancat.c:793
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "з обмеженням в реченні ON CONFLICT не пов'язаний індекс"
 
-#: optimizer/util/plancat.c:835
+#: optimizer/util/plancat.c:843
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE не підтримується з обмеженнями-винятками"
 
-#: optimizer/util/plancat.c:945
+#: optimizer/util/plancat.c:960
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "немає унікального обмеження або обмеження-виключення відповідного специфікації ON CONFLICT"
 
-#: parser/analyze.c:824 parser/analyze.c:1550
+#: parser/analyze.c:869 parser/analyze.c:1594
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "Списки VALUES повинні мати однакову довжину"
 
-#: parser/analyze.c:1027
+#: parser/analyze.c:1071
 #, c-format
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT містить більше виразів, ніж цільових стовпців"
 
-#: parser/analyze.c:1045
+#: parser/analyze.c:1089
 #, c-format
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT містить більше цільових стовпців, ніж виразів"
 
-#: parser/analyze.c:1049
+#: parser/analyze.c:1093
 #, c-format
 msgid "The insertion source is a row expression containing the same number of columns expected by the INSERT. Did you accidentally use extra parentheses?"
 msgstr "Джерелом даних є вираз рядка, який містить стільки ж стовпців, скільки потребується для INSERT. Ви випадково використовували додаткові дужки?"
 
-#: parser/analyze.c:1357 parser/analyze.c:1744
+#: parser/analyze.c:1401 parser/analyze.c:1788
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO не дозволяється тут"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1673 parser/analyze.c:3479
+#: parser/analyze.c:1717 parser/analyze.c:3628
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s не можна застосовувати до VALUES"
 
-#: parser/analyze.c:1911
+#: parser/analyze.c:1955
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "неприпустиме речення UNION/INTERSECT/EXCEPT ORDER BY"
 
-#: parser/analyze.c:1912
+#: parser/analyze.c:1956
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr "Дозволено використання тільки імен стовпців, але не виразів або функцій."
 
-#: parser/analyze.c:1913
+#: parser/analyze.c:1957
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Додайте вираз/функція до кожного SELECT, або перемістіть UNION у речення FROM."
 
-#: parser/analyze.c:2019
+#: parser/analyze.c:2064
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO дозволяється додати лише до першого SELECT в UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:2091
+#: parser/analyze.c:2136
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "Учасник інструкції UNION/INTERSECT/EXCEPT не може посилатись на інші відносини на тому ж рівні"
 
-#: parser/analyze.c:2178
+#: parser/analyze.c:2223
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "кожен %s запит повинен мати однакову кількість стовпців"
 
-#: parser/analyze.c:2535
+#: parser/analyze.c:2580
 #, c-format
 msgid "SET target columns cannot be qualified with the relation name."
 msgstr "Цільові стовпці SET не можуть бути кваліфіковані за допомогою імені відношення."
 
-#: parser/analyze.c:2589
+#. translator: %s is OLD or NEW
+#: parser/analyze.c:2668 parser/analyze.c:2678
+#, c-format
+msgid "%s cannot be specified multiple times"
+msgstr "%s не може бути вказаний кілька разів"
+
+#: parser/analyze.c:2690 parser/parse_relation.c:473
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "ім'я таблиці \"%s\" вказано більше одного разу"
+
+#: parser/analyze.c:2738
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "В RETURNING повинен бути мінімум один стовпець"
 
-#: parser/analyze.c:2692
+#: parser/analyze.c:2840
 #, c-format
 msgid "assignment source returned %d column"
 msgid_plural "assignment source returned %d columns"
@@ -16452,548 +17073,558 @@ msgstr[1] "джерело призначення повернуло %d стов
 msgstr[2] "джерело призначення повернуло %d стовпців"
 msgstr[3] "джерело призначення повернуло %d стовпців"
 
-#: parser/analyze.c:2753
+#: parser/analyze.c:2901
 #, c-format
 msgid "variable \"%s\" is of type %s but expression is of type %s"
 msgstr "змінна \"%s\" має тип %s, але вираз має тип %s"
 
 #. translator: %s is a SQL keyword
-#: parser/analyze.c:2878 parser/analyze.c:2886
+#: parser/analyze.c:3027 parser/analyze.c:3035
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "не можна вказати як %s, так і %s"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:3055
 #, 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:2914
+#: parser/analyze.c:3063
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s не підтримується"
 
-#: parser/analyze.c:2917
+#: parser/analyze.c:3066
 #, 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:2925
+#: parser/analyze.c:3074
 #, 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:2936
+#: parser/analyze.c:3085
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not valid"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s не є припустимим"
 
-#: parser/analyze.c:2939
+#: parser/analyze.c:3088
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Нечутливі курсори повинні бути READ ONLY."
 
-#: parser/analyze.c:3033
+#: parser/analyze.c:3182
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "в матеріалізованих поданнях не повинні використовуватись оператори, які змінюють дані в WITH"
 
-#: parser/analyze.c:3043
+#: parser/analyze.c:3192
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "в матеріалізованих поданнях не повинні використовуватись тимчасові таблиці або подання"
 
-#: parser/analyze.c:3053
+#: parser/analyze.c:3202
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "визначати матеріалізовані подання з зв'язаними параметрами не можна"
 
-#: parser/analyze.c:3065
+#: parser/analyze.c:3214
 #, c-format
 msgid "materialized views cannot be unlogged"
 msgstr "матеріалізовані подання не можуть бути нежурнальованими"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3254
+#: parser/analyze.c:3403
 #, 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:3261
+#: parser/analyze.c:3410
 #, 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:3268
+#: parser/analyze.c:3417
 #, 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:3275
+#: parser/analyze.c:3424
 #, 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:3282
+#: parser/analyze.c:3431
 #, 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:3289
+#: parser/analyze.c:3438
 #, 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:3388
+#: parser/analyze.c:3537
 #, 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:3452
+#: parser/analyze.c:3601
 #, 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:3461
+#: parser/analyze.c:3610
 #, 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:3470
+#: parser/analyze.c:3619
 #, c-format
 msgid "%s cannot be applied to a table function"
 msgstr "%s не можна застосовувати до табличної функції"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3488
+#: parser/analyze.c:3637
 #, 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:3497
+#: parser/analyze.c:3646
 #, c-format
 msgid "%s cannot be applied to a named tuplestore"
 msgstr "%s не можна застосовувати до іменованого джерела кортежів"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:3517
+#: parser/analyze.c:3666
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "відношення \"%s\" в реченні %s не знайдено в реченні FROM"
 
-#: parser/parse_agg.c:210 parser/parse_oper.c:215
+#: parser/parse_agg.c:218 parser/parse_oper.c:215
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "для типу %s не вдалося визначити оператора сортування"
 
-#: parser/parse_agg.c:212
+#: parser/parse_agg.c:220
 #, c-format
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Агрегатним функціям з DISTINCT необхідно сортувати їх вхідні дані."
 
-#: parser/parse_agg.c:270
+#: parser/parse_agg.c:278
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
 msgstr "GROUPING повинно містити меньше, ніж 32 аргумента"
 
-#: parser/parse_agg.c:373
+#: parser/parse_agg.c:382
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "агрегатні функції не дозволяються в умовах JOIN"
 
-#: parser/parse_agg.c:375
+#: parser/parse_agg.c:384
 msgid "grouping operations are not allowed in JOIN conditions"
 msgstr "операції групування не дозволяються в умовах JOIN"
 
-#: parser/parse_agg.c:385
+#: parser/parse_agg.c:394
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "агрегатні функції не можна застосовувати в реченні FROM їх рівня запиту"
 
-#: parser/parse_agg.c:387
+#: parser/parse_agg.c:396
 msgid "grouping operations are not allowed in FROM clause of their own query level"
 msgstr "операції групування не можна застосовувати в реченні FROM їх рівня запиту"
 
-#: parser/parse_agg.c:392
+#: parser/parse_agg.c:401
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "агрегатні функції не можна застосовувати у функціях у FROM"
 
-#: parser/parse_agg.c:394
+#: parser/parse_agg.c:403
 msgid "grouping operations are not allowed in functions in FROM"
 msgstr "операції групування не можна застосовувати у функціях у FROM"
 
-#: parser/parse_agg.c:402
+#: parser/parse_agg.c:411
 msgid "aggregate functions are not allowed in policy expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах політики"
 
-#: parser/parse_agg.c:404
+#: parser/parse_agg.c:413
 msgid "grouping operations are not allowed in policy expressions"
 msgstr "операції групування не можна застосовувати у виразах політики"
 
-#: parser/parse_agg.c:421
+#: parser/parse_agg.c:430
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "агрегатні функції не можна застосовувати у вікні RANGE "
 
-#: parser/parse_agg.c:423
+#: parser/parse_agg.c:432
 msgid "grouping operations are not allowed in window RANGE"
 msgstr "операції групування не можна застосовувати у вікні RANGE"
 
-#: parser/parse_agg.c:428
+#: parser/parse_agg.c:437
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "агрегатні функції не можна застосовувати у вікні ROWS"
 
-#: parser/parse_agg.c:430
+#: parser/parse_agg.c:439
 msgid "grouping operations are not allowed in window ROWS"
 msgstr "операції групування не можна застосовувати у вікні  ROWS"
 
-#: parser/parse_agg.c:435
+#: parser/parse_agg.c:444
 msgid "aggregate functions are not allowed in window GROUPS"
 msgstr "агрегатні функції не можна застосовувати у вікні GROUPS"
 
-#: parser/parse_agg.c:437
+#: parser/parse_agg.c:446
 msgid "grouping operations are not allowed in window GROUPS"
 msgstr "операції групування не можна застосовувати у вікні  GROUPS"
 
-#: parser/parse_agg.c:450
+#: parser/parse_agg.c:459
 msgid "aggregate functions are not allowed in MERGE WHEN conditions"
 msgstr "агрегатні функції не можна застосовувати в умовах MERGE WHEN"
 
-#: parser/parse_agg.c:452
+#: parser/parse_agg.c:461
 msgid "grouping operations are not allowed in MERGE WHEN conditions"
 msgstr "операції групування не можна застосовувати в умовах MERGE WHEN"
 
-#: parser/parse_agg.c:479
+#: parser/parse_agg.c:488
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "агрегатні функції не можна застосовувати в перевірці обмежень"
 
-#: parser/parse_agg.c:481
+#: parser/parse_agg.c:490
 msgid "grouping operations are not allowed in check constraints"
 msgstr "операції групування не можна застосовувати в перевірці обмежень"
 
-#: parser/parse_agg.c:488
+#: parser/parse_agg.c:497
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах DEFAULT"
 
-#: parser/parse_agg.c:490
+#: parser/parse_agg.c:499
 msgid "grouping operations are not allowed in DEFAULT expressions"
 msgstr "операції групування не можна застосовувати у виразах DEFAULT"
 
-#: parser/parse_agg.c:495
+#: parser/parse_agg.c:504
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах індексів"
 
-#: parser/parse_agg.c:497
+#: parser/parse_agg.c:506
 msgid "grouping operations are not allowed in index expressions"
 msgstr "операції групування не можна застосовувати у виразах індексів"
 
-#: parser/parse_agg.c:502
+#: parser/parse_agg.c:511
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "агрегатні функції не можна застосовувати в предикатах індексів"
 
-#: parser/parse_agg.c:504
+#: parser/parse_agg.c:513
 msgid "grouping operations are not allowed in index predicates"
 msgstr "операції групування не можна застосовувати в предикатах індексів"
 
-#: parser/parse_agg.c:509
+#: parser/parse_agg.c:518
 msgid "aggregate functions are not allowed in statistics expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах статистики"
 
-#: parser/parse_agg.c:511
+#: parser/parse_agg.c:520
 msgid "grouping operations are not allowed in statistics expressions"
 msgstr "операції групування не можна застосовувати у виразах статистики"
 
-#: parser/parse_agg.c:516
+#: parser/parse_agg.c:525
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах перетворювання"
 
-#: parser/parse_agg.c:518
+#: parser/parse_agg.c:527
 msgid "grouping operations are not allowed in transform expressions"
 msgstr "операції групування не можна застосовувати у виразах перетворювання"
 
-#: parser/parse_agg.c:523
+#: parser/parse_agg.c:532
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "агрегатні функції не можна застосовувати в параметрах EXECUTE"
 
-#: parser/parse_agg.c:525
+#: parser/parse_agg.c:534
 msgid "grouping operations are not allowed in EXECUTE parameters"
 msgstr "операції групування не можна застосовувати в параметрах EXECUTE"
 
-#: parser/parse_agg.c:530
+#: parser/parse_agg.c:539
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "агрегатні функції не можна застосовувати в умовах  для тригерів WHEN"
 
-#: parser/parse_agg.c:532
+#: parser/parse_agg.c:541
 msgid "grouping operations are not allowed in trigger WHEN conditions"
 msgstr "операції групування не можна застосовувати в умовах для тригерів WHEN"
 
-#: parser/parse_agg.c:537
+#: parser/parse_agg.c:546
 msgid "aggregate functions are not allowed in partition bound"
 msgstr "агрегатні функції не можна застосовувати в границі секції"
 
-#: parser/parse_agg.c:539
+#: parser/parse_agg.c:548
 msgid "grouping operations are not allowed in partition bound"
 msgstr "операції групування не можна застосовувати в границі секції"
 
-#: parser/parse_agg.c:544
+#: parser/parse_agg.c:553
 msgid "aggregate functions are not allowed in partition key expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах ключа секціонування"
 
-#: parser/parse_agg.c:546
+#: parser/parse_agg.c:555
 msgid "grouping operations are not allowed in partition key expressions"
 msgstr "операції групування не можна застосовувати у виразах ключа секціонування"
 
-#: parser/parse_agg.c:552
+#: parser/parse_agg.c:561
 msgid "aggregate functions are not allowed in column generation expressions"
 msgstr "агрегатні функції не можна застосовувати у виразах генерації стовпців"
 
-#: parser/parse_agg.c:554
+#: parser/parse_agg.c:563
 msgid "grouping operations are not allowed in column generation expressions"
 msgstr "операції групування не можна застосовувати у виразах генерації стовпців"
 
-#: parser/parse_agg.c:560
+#: parser/parse_agg.c:569
 msgid "aggregate functions are not allowed in CALL arguments"
 msgstr "агрегатні функції не можна застосовувати в аргументах CALL"
 
-#: parser/parse_agg.c:562
+#: parser/parse_agg.c:571
 msgid "grouping operations are not allowed in CALL arguments"
 msgstr "операції групування не можна застосовувати в аргументах CALL"
 
-#: parser/parse_agg.c:568
+#: parser/parse_agg.c:577
 msgid "aggregate functions are not allowed in COPY FROM WHERE conditions"
 msgstr "агрегатні функції не можна застосовувати в умовах COPY FROM WHERE"
 
-#: parser/parse_agg.c:570
+#: parser/parse_agg.c:579
 msgid "grouping operations are not allowed in COPY FROM WHERE conditions"
 msgstr "операції групування не можна застосовувати в умовах COPY FROM WHERE"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:597 parser/parse_clause.c:1962
+#: parser/parse_agg.c:606 parser/parse_clause.c:1962
 #, c-format
 msgid "aggregate functions are not allowed in %s"
 msgstr "агрегатні функції не можна застосовувати в %s"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:600
+#: parser/parse_agg.c:609
 #, c-format
 msgid "grouping operations are not allowed in %s"
 msgstr "операції групування не можна застосовувати в %s"
 
-#: parser/parse_agg.c:701
+#: parser/parse_agg.c:705 parser/parse_agg.c:742
+#, c-format
+msgid "outer-level aggregate cannot use a nested CTE"
+msgstr "агрегатна функція зовнішнього рівня не може використовувати вкладений CTE"
+
+#: parser/parse_agg.c:706 parser/parse_agg.c:743
+#, c-format
+msgid "CTE \"%s\" is below the aggregate's semantic level."
+msgstr "CTE \"%s\" знаходиться нижче семантичного рівня агрегату."
+
+#: parser/parse_agg.c:728
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
 msgstr "агрегат зовнішнього рівня не може містити змінну нижчого рівня у своїх аргументах"
 
-#: parser/parse_agg.c:779
+#: parser/parse_agg.c:813
 #, c-format
 msgid "aggregate function calls cannot contain set-returning function calls"
 msgstr "виклики агрегатної функції не можуть містити викликів функції, що повертають множину"
 
-#: parser/parse_agg.c:780 parser/parse_expr.c:1762 parser/parse_expr.c:2245
+#: parser/parse_agg.c:814 parser/parse_expr.c:1763 parser/parse_expr.c:2256
 #: parser/parse_func.c:885
 #, c-format
 msgid "You might be able to move the set-returning function into a LATERAL FROM item."
 msgstr "Можливо перемістити функцію, що повертає множину, в елемент  LATERAL FROM."
 
-#: parser/parse_agg.c:785
+#: parser/parse_agg.c:819
 #, c-format
 msgid "aggregate function calls cannot contain window function calls"
 msgstr "виклики агрегатних функцій не можуть містити виклики віконних функцій"
 
-#: parser/parse_agg.c:864
+#: parser/parse_agg.c:922
 msgid "window functions are not allowed in JOIN conditions"
 msgstr "віконні функції не можна застосовувати в умовах JOIN"
 
-#: parser/parse_agg.c:871
+#: parser/parse_agg.c:929
 msgid "window functions are not allowed in functions in FROM"
 msgstr "віконні функції не можна застосовувати у функціях в FROM"
 
-#: parser/parse_agg.c:877
+#: parser/parse_agg.c:935
 msgid "window functions are not allowed in policy expressions"
 msgstr "віконні функції не можна застосовувати у виразах політики"
 
-#: parser/parse_agg.c:890
+#: parser/parse_agg.c:948
 msgid "window functions are not allowed in window definitions"
 msgstr "віконні функції не можна застосовувати у визначенні вікна"
 
-#: parser/parse_agg.c:901
+#: parser/parse_agg.c:959
 msgid "window functions are not allowed in MERGE WHEN conditions"
 msgstr "віконні функції не можна застосовувати в умовах MERGE WHEN"
 
-#: parser/parse_agg.c:926
+#: parser/parse_agg.c:984
 msgid "window functions are not allowed in check constraints"
 msgstr "віконні функції не можна застосовувати в перевірках обмежень"
 
-#: parser/parse_agg.c:930
+#: parser/parse_agg.c:988
 msgid "window functions are not allowed in DEFAULT expressions"
 msgstr "віконні функції не можна застосовувати у виразах DEFAULT"
 
-#: parser/parse_agg.c:933
+#: parser/parse_agg.c:991
 msgid "window functions are not allowed in index expressions"
 msgstr "віконні функції не можна застосовувати у виразах індексів"
 
-#: parser/parse_agg.c:936
+#: parser/parse_agg.c:994
 msgid "window functions are not allowed in statistics expressions"
 msgstr "віконні функції не можна застосовувати у виразах статистики"
 
-#: parser/parse_agg.c:939
+#: parser/parse_agg.c:997
 msgid "window functions are not allowed in index predicates"
 msgstr "віконні функції не можна застосовувати в предикатах індексів"
 
-#: parser/parse_agg.c:942
+#: parser/parse_agg.c:1000
 msgid "window functions are not allowed in transform expressions"
 msgstr "віконні функції не можна застосовувати у виразах перетворювання"
 
-#: parser/parse_agg.c:945
+#: parser/parse_agg.c:1003
 msgid "window functions are not allowed in EXECUTE parameters"
 msgstr "віконні функції не можна застосовувати в параметрах EXECUTE"
 
-#: parser/parse_agg.c:948
+#: parser/parse_agg.c:1006
 msgid "window functions are not allowed in trigger WHEN conditions"
 msgstr "віконні функції не можна застосовувати в умовах WHEN для тригерів"
 
-#: parser/parse_agg.c:951
+#: parser/parse_agg.c:1009
 msgid "window functions are not allowed in partition bound"
 msgstr "віконні функції не можна застосовувати в границі секції"
 
-#: parser/parse_agg.c:954
+#: parser/parse_agg.c:1012
 msgid "window functions are not allowed in partition key expressions"
 msgstr "віконні функції не можна застосовувати у виразах ключа секціонування"
 
-#: parser/parse_agg.c:957
+#: parser/parse_agg.c:1015
 msgid "window functions are not allowed in CALL arguments"
 msgstr "віконні функції не можна застосовувати в аргументах CALL"
 
-#: parser/parse_agg.c:960
+#: parser/parse_agg.c:1018
 msgid "window functions are not allowed in COPY FROM WHERE conditions"
 msgstr "віконні функції не можна застосовувати в умовах COPY FROM WHERE"
 
-#: parser/parse_agg.c:963
+#: parser/parse_agg.c:1021
 msgid "window functions are not allowed in column generation expressions"
 msgstr "віконні функції не можна застосовувати у виразах генерації стовпців"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_agg.c:986 parser/parse_clause.c:1971
+#: parser/parse_agg.c:1044 parser/parse_clause.c:1971
 #, c-format
 msgid "window functions are not allowed in %s"
 msgstr "віконні функції не можна застосовувати в %s"
 
-#: parser/parse_agg.c:1020 parser/parse_clause.c:2804
+#: parser/parse_agg.c:1078 parser/parse_clause.c:2804
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "вікно \"%s\" не існує"
 
-#: parser/parse_agg.c:1108
+#: parser/parse_agg.c:1168
 #, c-format
 msgid "too many grouping sets present (maximum 4096)"
 msgstr "забагато наборів групування (максимум 4096)"
 
-#: parser/parse_agg.c:1248
+#: parser/parse_agg.c:1329
 #, c-format
 msgid "aggregate functions are not allowed in a recursive query's recursive term"
 msgstr "агрегатні функції не дозволені у рекурсивному терміні рекурсивного запиту"
 
-#: parser/parse_agg.c:1441
+#: parser/parse_agg.c:1552
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr "стовпець \"%s.%s\" повинен з'являтися у реченні Група BY або використовуватися в агрегатній функції"
 
-#: parser/parse_agg.c:1444
+#: parser/parse_agg.c:1555
 #, c-format
 msgid "Direct arguments of an ordered-set aggregate must use only grouped columns."
 msgstr "Прямі аргументи сортувального агрегату можуть використовувати лише згруповані стовпці."
 
-#: parser/parse_agg.c:1449
+#: parser/parse_agg.c:1560
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr "вкладений запит використовує не згруповані стовпці \"%s.%s\" з зовнішнього запиту"
 
-#: parser/parse_agg.c:1613
+#: parser/parse_agg.c:1725
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
 msgstr "аргументами групування мають бути вирази групування пов'язаного рівня запиту"
 
-#: parser/parse_clause.c:193
+#: parser/parse_clause.c:191
 #, c-format
 msgid "relation \"%s\" cannot be the target of a modifying statement"
 msgstr "відношення \"%s\" не може бути метою модифікованої інструкції"
 
-#: parser/parse_clause.c:569 parser/parse_clause.c:597 parser/parse_func.c:2553
+#: parser/parse_clause.c:567 parser/parse_clause.c:595 parser/parse_func.c:2553
 #, c-format
 msgid "set-returning functions must appear at top level of FROM"
 msgstr "функції, що повертають множину, мають з'являтися на вищому рівні FROM"
 
-#: parser/parse_clause.c:609
+#: parser/parse_clause.c:607
 #, c-format
 msgid "multiple column definition lists are not allowed for the same function"
 msgstr "кілька списків з визначенням стовпців не дозволені для тої самої функції"
 
-#: parser/parse_clause.c:642
+#: parser/parse_clause.c:640
 #, c-format
 msgid "ROWS FROM() with multiple functions cannot have a column definition list"
 msgstr "ROWS FROM() з декількома функціями не можуть мати список з визначенням стовпців"
 
-#: parser/parse_clause.c:643
+#: parser/parse_clause.c:641
 #, c-format
 msgid "Put a separate column definition list for each function inside ROWS FROM()."
 msgstr "Укладіть окремі списки з визначенням стовпців для кожної з функцій всередині ROWS FROM()."
 
-#: parser/parse_clause.c:649
+#: parser/parse_clause.c:647
 #, c-format
 msgid "UNNEST() with multiple arguments cannot have a column definition list"
 msgstr "UNNEST() з кількома аргументами не можуть мати список з визначенням стовпців"
 
-#: parser/parse_clause.c:650
+#: parser/parse_clause.c:648
 #, c-format
 msgid "Use separate UNNEST() calls inside ROWS FROM(), and attach a column definition list to each one."
 msgstr "Використайте окремі виклики UNNEST() всередині ROWS FROM() і підключіть список з визначенням стовпців до кожного."
 
-#: parser/parse_clause.c:657
+#: parser/parse_clause.c:655
 #, c-format
 msgid "WITH ORDINALITY cannot be used with a column definition list"
 msgstr "WITH ORDINALITY не можна використовувати з списком з визначенням стовпців"
 
-#: parser/parse_clause.c:658
+#: parser/parse_clause.c:656
 #, c-format
 msgid "Put the column definition list inside ROWS FROM()."
 msgstr "Помістіть список з визначенням стовпців всередину ROWS FROM()."
 
-#: parser/parse_clause.c:762 parser/parse_jsontable.c:295
+#: parser/parse_clause.c:760 parser/parse_jsontable.c:293
 #, c-format
 msgid "only one FOR ORDINALITY column is allowed"
 msgstr "FOR ORDINALITY дозволяється лише для одного стовпця"
 
-#: parser/parse_clause.c:823
+#: parser/parse_clause.c:821
 #, c-format
 msgid "column name \"%s\" is not unique"
 msgstr "ім'я стовпця \"%s\" не є унікальним"
 
-#: parser/parse_clause.c:865
+#: parser/parse_clause.c:863
 #, c-format
 msgid "namespace name \"%s\" is not unique"
 msgstr "ім'я простору імен \"%s\" не є унікальним"
 
-#: parser/parse_clause.c:875
+#: parser/parse_clause.c:873
 #, c-format
 msgid "only one default namespace is allowed"
 msgstr "дозволено тільки один простір імен за замовчуванням"
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:933
 #, c-format
 msgid "tablesample method %s does not exist"
 msgstr "метод %s для отримання вибірки не існує"
 
-#: parser/parse_clause.c:957
+#: parser/parse_clause.c:955
 #, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
@@ -17002,37 +17633,37 @@ msgstr[1] "метод %s для отримання вибірки потребу
 msgstr[2] "метод %s для отримання вибірки потребує аргументів: %d, отримано: %d"
 msgstr[3] "метод %s для отримання вибірки потребує аргументів: %d, отримано: %d"
 
-#: parser/parse_clause.c:991
+#: parser/parse_clause.c:989
 #, c-format
 msgid "tablesample method %s does not support REPEATABLE"
 msgstr "метод %s для отримання вибірки не підтримує REPEATABLE"
 
-#: parser/parse_clause.c:1144
+#: parser/parse_clause.c:1142
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
 msgstr "Речення TABLESAMPLE можна застосовувати лише до таблиць або матеріалізованих подань"
 
-#: parser/parse_clause.c:1331
+#: parser/parse_clause.c:1329
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "ім’я стовпця \"%s\" з'являється у реченні USING неодноразово"
 
-#: parser/parse_clause.c:1346
+#: parser/parse_clause.c:1344
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr "ім’я спільного стовпця \"%s\" з'являється у таблиці зліва неодноразово"
 
-#: parser/parse_clause.c:1355
+#: parser/parse_clause.c:1353
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr "в таблиці зліва не існує стовпець \"%s\", вказаний в реченні USING"
 
-#: parser/parse_clause.c:1370
+#: parser/parse_clause.c:1368
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr "ім’я спільного стовпця \"%s\" з'являється в таблиці справа неодноразово"
 
-#: parser/parse_clause.c:1379
+#: parser/parse_clause.c:1377
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr "в таблиці справа не існує стовпець \"%s\", вказаний в реченні USING"
@@ -17171,184 +17802,184 @@ msgstr "оператор %s не є дійсним оператором сорт
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
 msgstr "Оператори сортування повинні бути учасниками \"<\" або \">\" сімейств операторів btree."
 
-#: parser/parse_clause.c:3775
+#: parser/parse_clause.c:3778
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s"
 msgstr "RANGE зі зсувом PRECEDING/FOLLOWING не підтримується для типу стовпця %s"
 
-#: parser/parse_clause.c:3781
+#: parser/parse_clause.c:3784
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s and offset type %s"
 msgstr "RANGE зі зсувом PRECEDING/FOLLOWING не підтримується для типу стовпця %s і типу зсуву %s"
 
-#: parser/parse_clause.c:3784
+#: parser/parse_clause.c:3787
 #, c-format
 msgid "Cast the offset value to an appropriate type."
 msgstr "Приведіть значення зсуву до потрібного типу."
 
-#: parser/parse_clause.c:3789
+#: parser/parse_clause.c:3792
 #, c-format
 msgid "RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for column type %s and offset type %s"
 msgstr "RANGE зі зсувом PRECEDING/FOLLOWING має декілька інтерпретацій для типу стовпця %s і типу зсуву %s"
 
-#: parser/parse_clause.c:3792
+#: parser/parse_clause.c:3795
 #, c-format
 msgid "Cast the offset value to the exact intended type."
 msgstr "Приведіть значення зсуву в точності до призначеного типу."
 
-#: parser/parse_coerce.c:1050 parser/parse_coerce.c:1088
-#: parser/parse_coerce.c:1106 parser/parse_coerce.c:1121
-#: parser/parse_expr.c:2146 parser/parse_expr.c:2754 parser/parse_expr.c:3405
-#: parser/parse_expr.c:3634 parser/parse_target.c:998
+#: parser/parse_coerce.c:1048 parser/parse_coerce.c:1086
+#: parser/parse_coerce.c:1104 parser/parse_coerce.c:1119
+#: parser/parse_expr.c:2155 parser/parse_expr.c:2775 parser/parse_expr.c:3426
+#: parser/parse_expr.c:3655 parser/parse_target.c:1001
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "неможливо транслювати тип %s в %s"
 
-#: parser/parse_coerce.c:1091
+#: parser/parse_coerce.c:1089
 #, c-format
 msgid "Input has too few columns."
 msgstr "У вхідних даних дуже мало стовпців."
 
-#: parser/parse_coerce.c:1109
+#: parser/parse_coerce.c:1107
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Неможливо транслювати тип %s в %s у стовпці %d."
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1122
 #, c-format
 msgid "Input has too many columns."
 msgstr "У вхідних даних дуже багато стовпців."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1179 parser/parse_coerce.c:1227
+#: parser/parse_coerce.c:1177 parser/parse_coerce.c:1225
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "аргумент конструкції %s повинен бути типу %s, не типу %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:1190 parser/parse_coerce.c:1239
+#: parser/parse_coerce.c:1188 parser/parse_coerce.c:1237
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "аргумент конструкції %s не повинен повертати набір"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1383
+#: parser/parse_coerce.c:1418
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "у конструкції %s типи %s і %s не можуть бути відповідними"
 
-#: parser/parse_coerce.c:1499
+#: parser/parse_coerce.c:1534
 #, c-format
 msgid "argument types %s and %s cannot be matched"
 msgstr "типи аргументів %s і %s не можуть збігатись"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1551
+#: parser/parse_coerce.c:1586
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "у конструкції %s не можна перетворити тип %s в %s"
 
-#: parser/parse_coerce.c:2154 parser/parse_coerce.c:2174
-#: parser/parse_coerce.c:2194 parser/parse_coerce.c:2215
-#: parser/parse_coerce.c:2270 parser/parse_coerce.c:2304
+#: parser/parse_coerce.c:2189 parser/parse_coerce.c:2209
+#: parser/parse_coerce.c:2229 parser/parse_coerce.c:2250
+#: parser/parse_coerce.c:2305 parser/parse_coerce.c:2339
 #, c-format
 msgid "arguments declared \"%s\" are not all alike"
 msgstr "оголошенні аргументи \"%s\", повинні бути схожими"
 
-#: parser/parse_coerce.c:2249 parser/parse_coerce.c:2362
+#: parser/parse_coerce.c:2284 parser/parse_coerce.c:2397
 #: utils/fmgr/funcapi.c:600
 #, c-format
 msgid "argument declared %s is not an array but type %s"
 msgstr "аргумент, оголошений як %s , є не масивом, а типом %s"
 
-#: parser/parse_coerce.c:2282 parser/parse_coerce.c:2432
+#: parser/parse_coerce.c:2317 parser/parse_coerce.c:2467
 #: utils/fmgr/funcapi.c:614
 #, c-format
 msgid "argument declared %s is not a range type but type %s"
 msgstr "аргумент, оголошений як %s, є не діапазонним типом, а типом %s"
 
-#: parser/parse_coerce.c:2316 parser/parse_coerce.c:2396
-#: parser/parse_coerce.c:2529 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
+#: parser/parse_coerce.c:2351 parser/parse_coerce.c:2431
+#: parser/parse_coerce.c:2564 utils/fmgr/funcapi.c:632 utils/fmgr/funcapi.c:697
 #, c-format
 msgid "argument declared %s is not a multirange type but type %s"
 msgstr "оголошений аргумент %s не є багатодіапазонним типом, а типом %s"
 
-#: parser/parse_coerce.c:2353
+#: parser/parse_coerce.c:2388
 #, c-format
 msgid "cannot determine element type of \"anyarray\" argument"
 msgstr "не можна визначити тип елемента аргументу \"anyarray\""
 
-#: parser/parse_coerce.c:2379 parser/parse_coerce.c:2410
-#: parser/parse_coerce.c:2449 parser/parse_coerce.c:2515
+#: parser/parse_coerce.c:2414 parser/parse_coerce.c:2445
+#: parser/parse_coerce.c:2484 parser/parse_coerce.c:2550
 #, c-format
 msgid "argument declared %s is not consistent with argument declared %s"
 msgstr "аргумент, оголошений як %s, не узгоджується з аргументом, оголошеним як %s"
 
-#: parser/parse_coerce.c:2474
+#: parser/parse_coerce.c:2509
 #, c-format
 msgid "could not determine polymorphic type because input has type %s"
 msgstr "не вдалося визначити поліморфний тип, тому що вхідні аргументи мають тип %s"
 
-#: parser/parse_coerce.c:2488
+#: parser/parse_coerce.c:2523
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "тип, відповідний \"anynonarray\",  є масивом: %s"
 
-#: parser/parse_coerce.c:2498
+#: parser/parse_coerce.c:2533
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "тип, відповідний \"anyenum\", не є переліком: %s"
 
-#: parser/parse_coerce.c:2559
+#: parser/parse_coerce.c:2594
 #, c-format
 msgid "arguments of anycompatible family cannot be cast to a common type"
 msgstr "аргументи сімейства anycompatible не можна привести до спільного типу"
 
-#: parser/parse_coerce.c:2577 parser/parse_coerce.c:2598
-#: parser/parse_coerce.c:2648 parser/parse_coerce.c:2653
-#: parser/parse_coerce.c:2717 parser/parse_coerce.c:2729
+#: parser/parse_coerce.c:2612 parser/parse_coerce.c:2633
+#: parser/parse_coerce.c:2683 parser/parse_coerce.c:2688
+#: parser/parse_coerce.c:2752 parser/parse_coerce.c:2764
 #, c-format
 msgid "could not determine polymorphic type %s because input has type %s"
 msgstr "не вдалося визначити поліморфний тип %s тому що вхідні дані мають тип %s"
 
-#: parser/parse_coerce.c:2587
+#: parser/parse_coerce.c:2622
 #, c-format
 msgid "anycompatiblerange type %s does not match anycompatible type %s"
 msgstr "тип anycompatiblerange %s не збігається з типом anycompatible %s"
 
-#: parser/parse_coerce.c:2608
+#: parser/parse_coerce.c:2643
 #, c-format
 msgid "anycompatiblemultirange type %s does not match anycompatible type %s"
 msgstr "тип anycompatiblemultirange %s не збігається з типом anycompatible %s"
 
-#: parser/parse_coerce.c:2622
+#: parser/parse_coerce.c:2657
 #, c-format
 msgid "type matched to anycompatiblenonarray is an array type: %s"
 msgstr "тип відповідний до anycompatiblenonarray є масивом: %s"
 
-#: parser/parse_coerce.c:2857
+#: parser/parse_coerce.c:2892
 #, c-format
 msgid "A result of type %s requires at least one input of type anyrange or anymultirange."
 msgstr "Результат типу %s потребує принаймні одного введення типу anyrange або anymultirange."
 
-#: parser/parse_coerce.c:2874
+#: parser/parse_coerce.c:2909
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatiblerange or anycompatiblemultirange."
 msgstr "Результат типу %s потребує принаймні одного введення типу anycompatiblerange або anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2886
+#: parser/parse_coerce.c:2921
 #, c-format
 msgid "A result of type %s requires at least one input of type anyelement, anyarray, anynonarray, anyenum, anyrange, or anymultirange."
 msgstr "Результат типу %s потребує принаймні одного введення типу anyelement, anyarray, anynonarray, anyenum, anyrange, або anymultirange."
 
-#: parser/parse_coerce.c:2898
+#: parser/parse_coerce.c:2933
 #, c-format
 msgid "A result of type %s requires at least one input of type anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange, or anycompatiblemultirange."
 msgstr "Результат типу %s потребує ввести як мінімум один тип anycompatible, anycompatiblearray, anycompatiblenonarray, anycompatiblerange або anycompatiblemultirange."
 
-#: parser/parse_coerce.c:2928
+#: parser/parse_coerce.c:2963
 msgid "A result of type internal requires at least one input of type internal."
 msgstr "Результат внутрішнього типу потребує ввести як мінімум один внутрішній тип."
 
@@ -17394,546 +18025,556 @@ msgstr "рекурсивне посилання на запит \"%s\" не по
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr "рекурсивне посилання на запит \"%s\" не повинне з'являтись в EXCEPT"
 
-#: parser/parse_cte.c:136
+#: parser/parse_cte.c:137
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "Ім’я запиту WITH \"%s\" вказано неодноразово"
 
-#: parser/parse_cte.c:308
+#: parser/parse_cte.c:309
 #, c-format
 msgid "could not identify an inequality operator for type %s"
 msgstr "не вдалося визначити оператора нерівності для типу %s"
 
-#: parser/parse_cte.c:335
+#: parser/parse_cte.c:336
 #, c-format
 msgid "WITH clause containing a data-modifying statement must be at the top level"
 msgstr "Речення WITH, яке містить оператор, що змінює дані, повинне бути на верхньому рівні"
 
-#: parser/parse_cte.c:384
+#: parser/parse_cte.c:385
 #, c-format
 msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
 msgstr "у рекурсивному запиті \"%s\" стовпець %d має тип %s у нерекурсивній частині, але загалом тип %s"
 
-#: parser/parse_cte.c:390
+#: parser/parse_cte.c:391
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Приведіть результат нерекурсивної частини до правильного типу."
 
-#: parser/parse_cte.c:395
+#: parser/parse_cte.c:396
 #, c-format
 msgid "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term but collation \"%s\" overall"
 msgstr "у рекурсивному запиті \"%s\" стовпець %d має параметри сортування \"%s\" у нерекурсивній частині, але загалом параметри сортування \"%s\""
 
-#: parser/parse_cte.c:399
+#: parser/parse_cte.c:400
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr "Використайте речення COLLATE, щоб встановити параметри сортування в нерекурсивній частині."
 
-#: parser/parse_cte.c:420
+#: parser/parse_cte.c:421
 #, c-format
 msgid "WITH query is not recursive"
 msgstr "Запит WITH не є рекурсивним"
 
-#: parser/parse_cte.c:451
+#: parser/parse_cte.c:452
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the left side of the UNION must be a SELECT"
 msgstr "з реченням з SEARCH або CYCLE, ліва сторона UNION повинна бути SELECT"
 
-#: parser/parse_cte.c:456
+#: parser/parse_cte.c:457
 #, c-format
 msgid "with a SEARCH or CYCLE clause, the right side of the UNION must be a SELECT"
 msgstr "з реченням з SEARCH або CYCLE, права сторона UNION повинна бути SELECT"
 
-#: parser/parse_cte.c:471
+#: parser/parse_cte.c:472
 #, c-format
 msgid "search column \"%s\" not in WITH query column list"
 msgstr "пошуковий стовпець \"%s\" відсутній в списку стовпців запиту WITH"
 
-#: parser/parse_cte.c:478
+#: parser/parse_cte.c:479
 #, c-format
 msgid "search column \"%s\" specified more than once"
 msgstr "пошуковий стовпець \"%s\" вказано більше одного разу"
 
-#: parser/parse_cte.c:487
+#: parser/parse_cte.c:488
 #, c-format
 msgid "search sequence column name \"%s\" already used in WITH query column list"
 msgstr "назва послідовності пошуку \"%s\" вже використовується у списку стовпців запиту WITH"
 
-#: parser/parse_cte.c:504
+#: parser/parse_cte.c:505
 #, c-format
 msgid "cycle column \"%s\" not in WITH query column list"
 msgstr "стовпець циклу \"%s\" відсутній в списку стовпців запиту WITH"
 
-#: parser/parse_cte.c:511
+#: parser/parse_cte.c:512
 #, c-format
 msgid "cycle column \"%s\" specified more than once"
 msgstr "стовпець циклу \"%s\" вказано більше одного разу"
 
-#: parser/parse_cte.c:520
+#: parser/parse_cte.c:521
 #, c-format
 msgid "cycle mark column name \"%s\" already used in WITH query column list"
 msgstr "назва стовпця позначки циклу \"%s\" вже використовується у списку стовпців запиту WITH"
 
-#: parser/parse_cte.c:527
+#: parser/parse_cte.c:528
 #, c-format
 msgid "cycle path column name \"%s\" already used in WITH query column list"
 msgstr "назва стовпця циклу шляху \"%s\" вже використовується у списку стовпців запиту WITH"
 
-#: parser/parse_cte.c:535
+#: parser/parse_cte.c:536
 #, c-format
 msgid "cycle mark column name and cycle path column name are the same"
 msgstr "назва стовпця позначки циклу і назва стовпця циклу шляху однакові"
 
-#: parser/parse_cte.c:545
+#: parser/parse_cte.c:546
 #, c-format
 msgid "search sequence column name and cycle mark column name are the same"
 msgstr "назва стовпця послідовності пошуку і назва стовпця позначки циклу однакові"
 
-#: parser/parse_cte.c:552
+#: parser/parse_cte.c:553
 #, c-format
 msgid "search sequence column name and cycle path column name are the same"
 msgstr "назва стовпця послідовності пошуку і назва стовпця циклу шляху однакові"
 
-#: parser/parse_cte.c:636
+#: parser/parse_cte.c:637
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr "Запит WITH \"%s\" має %d доступних стовпців, але %d стовпців вказано"
 
-#: parser/parse_cte.c:816
+#: parser/parse_cte.c:882
 #, c-format
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "взаємна рекурсія між елементами WITH не реалізована"
 
-#: parser/parse_cte.c:868
+#: parser/parse_cte.c:934
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
 msgstr "рекурсивний запит \"%s\" не повинен містити оператори, які змінюють дані"
 
-#: parser/parse_cte.c:876
+#: parser/parse_cte.c:942
 #, c-format
 msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
 msgstr "рекурсивний запит \"%s\" не має форми (нерекурсивна частина) UNION [ALL] (рекурсивна частина)"
 
-#: parser/parse_cte.c:911
+#: parser/parse_cte.c:977
 #, c-format
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY в рекурсивному запиті не реалізовано"
 
-#: parser/parse_cte.c:917
+#: parser/parse_cte.c:983
 #, c-format
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET у рекурсивному запиті не реалізовано"
 
-#: parser/parse_cte.c:923
+#: parser/parse_cte.c:989
 #, c-format
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT у рекурсивному запиті не реалізовано"
 
-#: parser/parse_cte.c:929
+#: parser/parse_cte.c:995
 #, c-format
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE в рекурсивному запиті не реалізовано"
 
-#: parser/parse_cte.c:1008
+#: parser/parse_cte.c:1074
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "рекурсивне посилання на запит \"%s\" не повинне з'являтись неодноразово"
 
-#: parser/parse_expr.c:313
+#: parser/parse_expr.c:312
 #, c-format
 msgid "DEFAULT is not allowed in this context"
 msgstr "DEFAULT не допускається в цьому контексті"
 
-#: parser/parse_expr.c:406 parser/parse_relation.c:3691
-#: parser/parse_relation.c:3701 parser/parse_relation.c:3719
-#: parser/parse_relation.c:3726 parser/parse_relation.c:3740
+#: parser/parse_expr.c:405 parser/parse_relation.c:3797
+#: parser/parse_relation.c:3807 parser/parse_relation.c:3825
+#: parser/parse_relation.c:3832 parser/parse_relation.c:3846
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "стовпець %s.%s не існує"
 
-#: parser/parse_expr.c:418
+#: parser/parse_expr.c:417
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "стовпець \"%s\" не знайдено в типі даних %s"
 
-#: parser/parse_expr.c:424
+#: parser/parse_expr.c:423
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "не вдалося ідентифікувати стовпець \"%s\" в типі запису"
 
-#: parser/parse_expr.c:430
+#: parser/parse_expr.c:429
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "запис імені стовпця .%s застосований до типу %s, котрий не є складеним типом"
 
-#: parser/parse_expr.c:461 parser/parse_target.c:732
+#: parser/parse_expr.c:460 parser/parse_target.c:735
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "розширення рядка через \"*\" тут не підтримується"
 
-#: parser/parse_expr.c:584
+#: parser/parse_expr.c:583
 msgid "cannot use column reference in DEFAULT expression"
 msgstr "у виразі DEFAULT не можна використовувати посилання на стовпець"
 
-#: parser/parse_expr.c:587
+#: parser/parse_expr.c:586
 msgid "cannot use column reference in partition bound expression"
 msgstr "у виразі границі секції не можна використовувати посилання на стовпці"
 
-#: parser/parse_expr.c:846 parser/parse_relation.c:833
-#: parser/parse_relation.c:915 parser/parse_target.c:1238
+#: parser/parse_expr.c:845 parser/parse_relation.c:848
+#: parser/parse_relation.c:930 parser/parse_target.c:1241
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "посилання на стовпець \"%s\" є неоднозначним"
 
-#: parser/parse_expr.c:902 parser/parse_param.c:110 parser/parse_param.c:142
-#: parser/parse_param.c:204 parser/parse_param.c:303
+#: parser/parse_expr.c:901 parser/parse_param.c:111 parser/parse_param.c:143
+#: parser/parse_param.c:205 parser/parse_param.c:304
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "параметр $%d не існує"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1103 parser/parse_expr.c:3065
+#: parser/parse_expr.c:1102 parser/parse_expr.c:3086
 #, c-format
 msgid "%s requires = operator to yield boolean"
-msgstr ""
+msgstr "%s потребує, щоб оператор = повертав логічне значення"
 
 #. translator: %s is name of a SQL construct, eg NULLIF
-#: parser/parse_expr.c:1109 parser/parse_expr.c:3072
+#: parser/parse_expr.c:1108 parser/parse_expr.c:3093
 #, c-format
 msgid "%s must not return a set"
 msgstr "%s не повинна повертати набір"
 
-#: parser/parse_expr.c:1395
+#: parser/parse_expr.c:1396
 #, c-format
 msgid "MERGE_ACTION() can only be used in the RETURNING list of a MERGE command"
-msgstr ""
+msgstr "MERGE_ACTION() можна використовувати лише в списку RETURNING для команди MERGE"
 
-#: parser/parse_expr.c:1519 parser/parse_expr.c:1551
+#: parser/parse_expr.c:1520 parser/parse_expr.c:1552
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "кількість стовпців не відповідає кількості значень"
 
-#: parser/parse_expr.c:1565
+#: parser/parse_expr.c:1566
 #, c-format
 msgid "source for a multiple-column UPDATE item must be a sub-SELECT or ROW() expression"
 msgstr "джерелом для елементу UPDATE з декількома стовпцями повинен бути вкладений SELECT або вираз ROW()"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
-#: parser/parse_expr.c:1760 parser/parse_expr.c:2243 parser/parse_func.c:2679
+#: parser/parse_expr.c:1761 parser/parse_expr.c:2254 parser/parse_func.c:2679
 #, c-format
 msgid "set-returning functions are not allowed in %s"
 msgstr "функції, повертаючі набори, не дозволяються в %s"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1825
 msgid "cannot use subquery in check constraint"
 msgstr "в обмеженні-перевірці не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1828
+#: parser/parse_expr.c:1829
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "у виразі DEFAULT не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1831
+#: parser/parse_expr.c:1832
 msgid "cannot use subquery in index expression"
 msgstr "в індексному виразі не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1834
+#: parser/parse_expr.c:1835
 msgid "cannot use subquery in index predicate"
 msgstr "в предикаті індексу не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1837
+#: parser/parse_expr.c:1838
 msgid "cannot use subquery in statistics expression"
 msgstr "у виразі статистики не можна використовувати підзапит"
 
-#: parser/parse_expr.c:1840
+#: parser/parse_expr.c:1841
 msgid "cannot use subquery in transform expression"
 msgstr "у виразі перетворення не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1843
+#: parser/parse_expr.c:1844
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "в параметрі EXECUTE не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1846
+#: parser/parse_expr.c:1847
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "в умові WHEN для тригеру не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1849
+#: parser/parse_expr.c:1850
 msgid "cannot use subquery in partition bound"
 msgstr "в границі секції не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1852
+#: parser/parse_expr.c:1853
 msgid "cannot use subquery in partition key expression"
 msgstr "у виразі ключа секціонування не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1855
+#: parser/parse_expr.c:1856
 msgid "cannot use subquery in CALL argument"
 msgstr "в аргументі CALL не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1858
+#: parser/parse_expr.c:1859
 msgid "cannot use subquery in COPY FROM WHERE condition"
 msgstr "не можна використовувати підзапити в умові COPY FROM WHERE"
 
-#: parser/parse_expr.c:1861
+#: parser/parse_expr.c:1862
 msgid "cannot use subquery in column generation expression"
 msgstr "у виразі генерації стовпців не можна використовувати підзапити"
 
-#: parser/parse_expr.c:1914 parser/parse_expr.c:3764
+#: parser/parse_expr.c:1915 parser/parse_expr.c:3785
 #, c-format
 msgid "subquery must return only one column"
 msgstr "підзапит повинен повертати лише один стовпець"
 
-#: parser/parse_expr.c:1985
+#: parser/parse_expr.c:1986
 #, c-format
 msgid "subquery has too many columns"
 msgstr "підзапит має занадто багато стовпців"
 
-#: parser/parse_expr.c:1990
+#: parser/parse_expr.c:1991
 #, c-format
 msgid "subquery has too few columns"
 msgstr "підзапит має занадто мало стовпців"
 
-#: parser/parse_expr.c:2086
+#: parser/parse_expr.c:2095
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "тип пустого масиву визначити не можна"
 
-#: parser/parse_expr.c:2087
+#: parser/parse_expr.c:2096
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "Приведіть його до бажаного типу явним чином, наприклад ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:2101
+#: parser/parse_expr.c:2110
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "не вдалося знайти тип елементу для типу даних %s"
 
-#: parser/parse_expr.c:2184
+#: parser/parse_expr.c:2195
 #, c-format
 msgid "ROW expressions can have at most %d entries"
 msgstr "ROW вирази можуть мати максимум %d елементів"
 
-#: parser/parse_expr.c:2389
+#: parser/parse_expr.c:2400
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "замість значення XML-атрибуту без імені повинен вказуватись стовпець"
 
-#: parser/parse_expr.c:2390
+#: parser/parse_expr.c:2401
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "замість значення XML-елементу без імені повинен вказуватись стовпець"
 
-#: parser/parse_expr.c:2405
+#: parser/parse_expr.c:2416
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "Ім'я XML-атрибуту \"%s\" з'являється неодноразово"
 
-#: parser/parse_expr.c:2513
+#: parser/parse_expr.c:2524
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "привести результат XMLSERIALIZE до %s не можна"
 
-#: parser/parse_expr.c:2827 parser/parse_expr.c:3023
+#: parser/parse_expr.c:2848 parser/parse_expr.c:3044
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "неоднакова кількість елементів у виразах рядка"
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2858
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "рядки нульової довжини порівнювати не можна"
 
-#: parser/parse_expr.c:2862
+#: parser/parse_expr.c:2883
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "оператор порівняння рядків повинен видавати логічний тип, а не %s"
 
-#: parser/parse_expr.c:2869
+#: parser/parse_expr.c:2890
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "оператор порівняння рядків повинен вертати набір"
 
-#: parser/parse_expr.c:2928 parser/parse_expr.c:2969
+#: parser/parse_expr.c:2949 parser/parse_expr.c:2990
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "не вдалося визначити інтерпретацію оператора порівняння рядків %s"
 
-#: parser/parse_expr.c:2930
+#: parser/parse_expr.c:2951
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "Оператори порівняння рядків повинні бути пов'язанні з сімейством операторів btree."
 
-#: parser/parse_expr.c:2971
+#: parser/parse_expr.c:2992
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Існує декілька рівноцінних кандидатів."
 
-#: parser/parse_expr.c:3306
+#: parser/parse_expr.c:3327
 #, c-format
 msgid "JSON ENCODING clause is only allowed for bytea input type"
 msgstr "Вираз JSON ENCODING дозволено лише для типу введення bytea"
 
-#: parser/parse_expr.c:3370
+#: parser/parse_expr.c:3391
 #, c-format
 msgid "cannot use non-string types with implicit FORMAT JSON clause"
 msgstr "використовувати типи, які не є string з неявним виразом FORMAT JSON не можна"
 
-#: parser/parse_expr.c:3371
+#: parser/parse_expr.c:3392
 #, c-format
 msgid "cannot use non-string types with explicit FORMAT JSON clause"
 msgstr "використовувати типи, які не є string з явним виразом FORMAT JSON не можна"
 
-#: parser/parse_expr.c:3460
+#: parser/parse_expr.c:3481
 #, c-format
 msgid "cannot use JSON format with non-string output types"
 msgstr "використовувати формат JSON з типами виводу, які не є string не можна"
 
-#: parser/parse_expr.c:3473
+#: parser/parse_expr.c:3494
 #, c-format
 msgid "cannot set JSON encoding for non-bytea output types"
 msgstr "встановити кодування JSON для типів виводу, які не є bytea не можна"
 
-#: parser/parse_expr.c:3478
+#: parser/parse_expr.c:3499
 #, c-format
 msgid "unsupported JSON encoding"
 msgstr "непідтримуване JSON кодування"
 
-#: parser/parse_expr.c:3479
+#: parser/parse_expr.c:3500
 #, c-format
 msgid "Only UTF8 JSON encoding is supported."
 msgstr "Підтримується лише кодування UTF8 формату JSON."
 
-#: parser/parse_expr.c:3516
+#: parser/parse_expr.c:3537
 #, c-format
 msgid "returning SETOF types is not supported in SQL/JSON functions"
 msgstr "повернення типів SETOF не підтримується у функціях SQL/JSON"
 
-#: parser/parse_expr.c:3521
+#: parser/parse_expr.c:3542
 #, c-format
 msgid "returning pseudo-types is not supported in SQL/JSON functions"
-msgstr ""
+msgstr "повернення псевдо-типів не підтримується у функціях SQL/JSON"
 
-#: parser/parse_expr.c:3849 parser/parse_func.c:866
+#: parser/parse_expr.c:3870 parser/parse_func.c:866
 #, c-format
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "агрегатне речення ORDER BY для віконних функцій не реалізовано"
 
-#: parser/parse_expr.c:4072
+#: parser/parse_expr.c:4093
 #, c-format
 msgid "cannot use JSON FORMAT ENCODING clause for non-bytea input types"
 msgstr "використовувати вираз JSON FORMAT ENCODING для типів введення, які не є bytea не можна"
 
-#: parser/parse_expr.c:4092
+#: parser/parse_expr.c:4113
 #, c-format
 msgid "cannot use type %s in IS JSON predicate"
 msgstr "використовувати тип %s в предикаті IS JSON не можна"
 
-#: parser/parse_expr.c:4118 parser/parse_expr.c:4238
+#: parser/parse_expr.c:4139 parser/parse_expr.c:4260
 #, c-format
-msgid "cannot use RETURNING type %s in %s"
-msgstr "не можна використовувати тип RETURNING %s в %s"
+msgid "cannot use type %s in RETURNING clause of %s"
+msgstr "неможливо використати тип %s в реченні RETURNING %s"
 
-#: parser/parse_expr.c:4167
+#: parser/parse_expr.c:4141
+#, c-format
+msgid "Try returning json or jsonb."
+msgstr "Спробуйте повернути json або jsonb."
+
+#: parser/parse_expr.c:4189
 #, c-format
 msgid "cannot use non-string types with WITH UNIQUE KEYS clause"
 msgstr "не можна використовувати не строкові типи з пунктом WITH UNIQUE KEYS"
 
-#: parser/parse_expr.c:4241
+#: parser/parse_expr.c:4263
 #, c-format
 msgid "Try returning a string type or bytea."
 msgstr "Спробуйте повернути тип string або bytea."
 
-#: parser/parse_expr.c:4306
+#: parser/parse_expr.c:4331
 #, c-format
 msgid "cannot specify FORMAT JSON in RETURNING clause of %s()"
-msgstr ""
+msgstr "не можна вказати FORMAT JSON в реченні RETURNING %s()"
 
-#: parser/parse_expr.c:4319
+#: parser/parse_expr.c:4344
 #, c-format
 msgid "SQL/JSON QUOTES behavior must not be specified when WITH WRAPPER is used"
-msgstr ""
+msgstr "Поведінка SQL/JSON QUOTES не повинна визначатися, коли використовується WITH WRAPPER"
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4333 parser/parse_expr.c:4362 parser/parse_expr.c:4393
-#: parser/parse_expr.c:4419 parser/parse_expr.c:4445
-#: parser/parse_jsontable.c:94
+#: parser/parse_expr.c:4358 parser/parse_expr.c:4387 parser/parse_expr.c:4418
+#: parser/parse_expr.c:4444 parser/parse_expr.c:4470
+#: parser/parse_jsontable.c:92
 #, c-format
 msgid "invalid %s behavior"
-msgstr ""
+msgstr "неприпустима поведінка %s"
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4336 parser/parse_expr.c:4365
+#: parser/parse_expr.c:4361 parser/parse_expr.c:4390
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for %s."
-msgstr ""
+msgstr "Тільки ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, або DEFAULT вираз дозволений в %s для %s."
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name a SQL/JSON clause (eg. ON EMPTY)
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4343 parser/parse_expr.c:4372 parser/parse_expr.c:4401
-#: parser/parse_expr.c:4429 parser/parse_expr.c:4455
+#: parser/parse_expr.c:4368 parser/parse_expr.c:4397 parser/parse_expr.c:4426
+#: parser/parse_expr.c:4454 parser/parse_expr.c:4480
 #, c-format
 msgid "invalid %s behavior for column \"%s\""
-msgstr ""
+msgstr "неприпустима поведінка %s для стовпця \"%s \""
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4346 parser/parse_expr.c:4375
+#: parser/parse_expr.c:4371 parser/parse_expr.c:4400
 #, c-format
 msgid "Only ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, or DEFAULT expression is allowed in %s for formatted columns."
-msgstr ""
+msgstr "Тільки ERROR, NULL, EMPTY ARRAY, EMPTY OBJECT, або DEFAULT вираз дозволений в %s для форматованих стовпців."
 
-#: parser/parse_expr.c:4394
+#: parser/parse_expr.c:4419
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for %s."
-msgstr ""
+msgstr "Тільки ERROR, TRUE, FALSE, або UNKNOWN дозволені в %s для %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4404
+#: parser/parse_expr.c:4429
 #, c-format
 msgid "Only ERROR, TRUE, FALSE, or UNKNOWN is allowed in %s for EXISTS columns."
-msgstr ""
+msgstr "Тільки ERROR, TRUE, FALSE або UNKNOWN дозволяється в %s для стовпців EXISTS."
 
 #. translator: first %s is name of a SQL/JSON clause (eg. ON EMPTY),
 #. second %s is a SQL/JSON function name (e.g. JSON_QUERY)
-#: parser/parse_expr.c:4422 parser/parse_expr.c:4448
+#: parser/parse_expr.c:4447 parser/parse_expr.c:4473
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for %s."
-msgstr ""
+msgstr "Тільки ERROR, NULL або DEFAULT вираз дозволений в %s для %s."
 
 #. translator: %s is name of a SQL/JSON clause (eg. ON EMPTY)
-#: parser/parse_expr.c:4432 parser/parse_expr.c:4458
+#: parser/parse_expr.c:4457 parser/parse_expr.c:4483
 #, c-format
 msgid "Only ERROR, NULL, or DEFAULT expression is allowed in %s for scalar columns."
-msgstr ""
+msgstr "Тільки ERROR, NULL або DEFAULT вираз дозволений в %s для скалярних стовпців."
 
-#: parser/parse_expr.c:4488
+#: parser/parse_expr.c:4517
 #, c-format
 msgid "JSON path expression must be of type %s, not of type %s"
-msgstr ""
+msgstr "вираз шляху JSON повинен бути типом %s, а не %s"
 
-#: parser/parse_expr.c:4706
+#: parser/parse_expr.c:4757
 #, c-format
 msgid "can only specify a constant, non-aggregate function, or operator expression for DEFAULT"
-msgstr ""
+msgstr "можна вказати лише константу, не агрегатну функцію або вираз операторів для DEFAULT"
 
-#: parser/parse_expr.c:4711
+#: parser/parse_expr.c:4762
 #, c-format
 msgid "DEFAULT expression must not contain column references"
-msgstr ""
+msgstr "вираз DEFAULT не повинен містити посилання на стовпець"
 
-#: parser/parse_expr.c:4716
+#: parser/parse_expr.c:4767
 #, c-format
 msgid "DEFAULT expression must not return a set"
-msgstr ""
+msgstr "вираз DEFAULT не повинен повертати набір"
 
-#: parser/parse_expr.c:4792 parser/parse_expr.c:4801
+#: parser/parse_expr.c:4782
+#, c-format
+msgid "collation of DEFAULT expression conflicts with RETURNING clause"
+msgstr "сортування виразу DEFAULT конфліктує з реченням RETURNING"
+
+#: parser/parse_expr.c:4861 parser/parse_expr.c:4870
 #, c-format
 msgid "cannot cast behavior expression of type %s to %s"
-msgstr ""
+msgstr "неможливо привести тип виразу %s до %s"
 
-#: parser/parse_expr.c:4795
+#: parser/parse_expr.c:4864
 #, c-format
 msgid "You will need to explicitly cast the expression to type %s."
-msgstr ""
+msgstr "Вам необхідно явно привести вираз до типу %s."
 
 #: parser/parse_func.c:194
 #, c-format
@@ -18275,15 +18916,15 @@ msgstr "функції, що повертають множину не можна
 msgid "set-returning functions are not allowed in column generation expressions"
 msgstr "функції, що повертають множину не можна застосовувати у виразах генерації стовпців"
 
-#: parser/parse_jsontable.c:95
+#: parser/parse_jsontable.c:93
 #, c-format
 msgid "Only EMPTY [ ARRAY ] or ERROR is allowed in the top-level ON ERROR clause."
-msgstr ""
+msgstr "Тільки EMPTY [ ARRAY ] або ERROR дозволяється в верхньому рівні речення ON ERROR."
 
-#: parser/parse_jsontable.c:189 parser/parse_jsontable.c:203
+#: parser/parse_jsontable.c:187 parser/parse_jsontable.c:201
 #, c-format
 msgid "duplicate JSON_TABLE column or path name: %s"
-msgstr ""
+msgstr "дублікат назви стовпця JSON_TABLE або шляху: %s"
 
 #: parser/parse_merge.c:129
 #, c-format
@@ -18360,229 +19001,224 @@ msgstr "op ANY/ALL (масив) вимагає оператора для вид
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (масив) вимагає оператора не для повернення множини"
 
-#: parser/parse_param.c:221
+#: parser/parse_param.c:222
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "для параметру $%d виведені неузгоджені типи"
 
-#: parser/parse_param.c:309 tcop/postgres.c:744
+#: parser/parse_param.c:310 tcop/postgres.c:734
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "не вдалося визначити тип даних параметра $%d"
 
-#: parser/parse_relation.c:221
+#: parser/parse_relation.c:226
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "посилання на таблицю \"%s\" неоднозначне"
 
-#: parser/parse_relation.c:265
+#: parser/parse_relation.c:273
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "посилання на таблицю %u неоднозначне"
 
-#: parser/parse_relation.c:465
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "ім'я таблиці \"%s\" вказано більше одного разу"
-
-#: parser/parse_relation.c:494 parser/parse_relation.c:3633
-#: parser/parse_relation.c:3642
+#: parser/parse_relation.c:502 parser/parse_relation.c:3739
+#: parser/parse_relation.c:3748
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "в елементі речення FROM неприпустиме посилання на таблицю \"%s\""
 
-#: parser/parse_relation.c:498 parser/parse_relation.c:3644
+#: parser/parse_relation.c:506 parser/parse_relation.c:3750
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Таблиця \"%s\" присутня в запиті, але посилатися на неї з цієї частини запиту не можна."
 
-#: parser/parse_relation.c:500
+#: parser/parse_relation.c:508
 #, 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:703
+#: parser/parse_relation.c:711
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "недопустиме посилання системи стовпців \"%s\" в обмеженні Check"
 
-#: parser/parse_relation.c:712
+#: parser/parse_relation.c:724
 #, c-format
 msgid "cannot use system column \"%s\" in column generation expression"
 msgstr "використовувати системний стовпець \"%s\" у виразах генерації стовпців, не можна"
 
-#: parser/parse_relation.c:723
+#: parser/parse_relation.c:735
 #, c-format
 msgid "cannot use system column \"%s\" in MERGE WHEN condition"
 msgstr "неможливо використати симтемний стовпець \"%s\" в умові MERGE WHEN"
 
-#: parser/parse_relation.c:1236 parser/parse_relation.c:1691
-#: parser/parse_relation.c:2384
+#: parser/parse_relation.c:1251 parser/parse_relation.c:1708
+#: parser/parse_relation.c:2402
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "таблиця \"%s\" має %d доступних стовпців, але вказано %d стовпців"
 
-#: parser/parse_relation.c:1445
+#: parser/parse_relation.c:1462
 #, c-format
 msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Існує WITH елемент \"%s\" але на нього не можна посилатися з цієї частини запиту."
 
-#: parser/parse_relation.c:1447
+#: parser/parse_relation.c:1464
 #, c-format
 msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr "Використовувати WITH RECURSIVE, або перевпорядкувати елементи WITH, щоб видалити попередні посилання."
 
-#: parser/parse_relation.c:1833
+#: parser/parse_relation.c:1850
 #, c-format
 msgid "a column definition list is redundant for a function with OUT parameters"
 msgstr "список з визначенням стовпців не потрібен для функції з параметрами OUT"
 
-#: parser/parse_relation.c:1839
+#: parser/parse_relation.c:1856
 #, c-format
 msgid "a column definition list is redundant for a function returning a named composite type"
 msgstr "список з визначенням стовпців не потрібен для функції, яка повертає іменований складений тип"
 
-#: parser/parse_relation.c:1846
+#: parser/parse_relation.c:1863
 #, c-format
 msgid "a column definition list is only allowed for functions returning \"record\""
 msgstr "список з визначенням стовпців дозволений лише для функцій, що повертають \"запис\""
 
-#: parser/parse_relation.c:1857
+#: parser/parse_relation.c:1874
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "список з визначенням стовпців вимагається для функцій, що повертають \"запис\""
 
-#: parser/parse_relation.c:1894
+#: parser/parse_relation.c:1911
 #, c-format
 msgid "column definition lists can have at most %d entries"
 msgstr "списки визначень стовпців можуть мати максимум %d елементів"
 
-#: parser/parse_relation.c:1954
+#: parser/parse_relation.c:1971
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr "функція \"%s\" у FROM повертає тип, що не підтримується %s"
 
-#: parser/parse_relation.c:1981 parser/parse_relation.c:2066
+#: parser/parse_relation.c:1998 parser/parse_relation.c:2083
 #, c-format
 msgid "functions in FROM can return at most %d columns"
 msgstr "функції з FROM можуть повертати не більше %d стовпців"
 
-#: parser/parse_relation.c:2096
+#: parser/parse_relation.c:2113
 #, c-format
 msgid "%s function has %d columns available but %d columns specified"
 msgstr "функція \"%s\" має %d доступних стовпців, але вказано %d стовпців"
 
-#: parser/parse_relation.c:2177
+#: parser/parse_relation.c:2194
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr "VALUES списки \"%s\" мають %d доступних стовпців, але %d стовпців вказано"
 
-#: parser/parse_relation.c:2242
+#: parser/parse_relation.c:2259
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "з'єднання можуть мати максимум %d стовпців"
 
-#: parser/parse_relation.c:2267
+#: parser/parse_relation.c:2284
 #, c-format
 msgid "join expression \"%s\" has %d columns available but %d columns specified"
 msgstr "вираз з'єднання \"%s\" має %d доступних стовпців, але %d стовпців вказано"
 
-#: parser/parse_relation.c:2357
+#: parser/parse_relation.c:2375
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "WITH запит \"%s\" не має речення RETURNING"
 
-#: parser/parse_relation.c:3635
+#: parser/parse_relation.c:3741
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Можливо, малося на увазі посилання на псевдонім таблиці \"%s\"."
 
-#: parser/parse_relation.c:3647
+#: parser/parse_relation.c:3753
 #, c-format
 msgid "To reference that table, you must mark this subquery with LATERAL."
 msgstr "Щоб використати цю таблицю, вам потрібно позначити цей підзапит як LATERAL."
 
-#: parser/parse_relation.c:3653
+#: parser/parse_relation.c:3759
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "таблиця \"%s\" відсутня в реченні FROM"
 
-#: parser/parse_relation.c:3693
+#: parser/parse_relation.c:3799
 #, c-format
 msgid "There are columns named \"%s\", but they are in tables that cannot be referenced from this part of the query."
 msgstr "Є стовпці з назвою \"%s\", але вони знаходяться в таблицях, на які не можна посилатися з цієї частини запиту."
 
-#: parser/parse_relation.c:3695
+#: parser/parse_relation.c:3801
 #, c-format
 msgid "Try using a table-qualified name."
 msgstr "Спробуй використати повне ім'я включно з таблицею."
 
-#: parser/parse_relation.c:3703
+#: parser/parse_relation.c:3809
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Є стовпець з іменем \"%s\" в таблиці \"%s\", але на нього не можна посилатись з цієї частини запиту."
 
-#: parser/parse_relation.c:3706
+#: parser/parse_relation.c:3812
 #, c-format
 msgid "To reference that column, you must mark this subquery with LATERAL."
 msgstr "Щоб використати цей стовпець, вам потрібно позначити цей підзапит як LATERAL."
 
-#: parser/parse_relation.c:3708
+#: parser/parse_relation.c:3814
 #, c-format
 msgid "To reference that column, you must use a table-qualified name."
 msgstr "Щоб посилатися на цей стовпець, ви повинні використовувати повне ім'я включно з таблицею."
 
-#: parser/parse_relation.c:3728
+#: parser/parse_relation.c:3834
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Можливо, передбачалось посилання на стовпець \"%s.%s\"."
 
-#: parser/parse_relation.c:3742
+#: parser/parse_relation.c:3848
 #, 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:480 parser/parse_target.c:795
+#: parser/parse_target.c:483 parser/parse_target.c:798
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "призначити значення системному стовпцю \"%s\" не можна"
 
-#: parser/parse_target.c:508
+#: parser/parse_target.c:511
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "елементу масива не можна встановити значення DEFAULT"
 
-#: parser/parse_target.c:513
+#: parser/parse_target.c:516
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "підполю не можна встановити значення DEFAULT"
 
-#: parser/parse_target.c:587
+#: parser/parse_target.c:590
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "стовпець \"%s\" має тип %s, а вираз %s"
 
-#: parser/parse_target.c:779
+#: parser/parse_target.c:782
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
 msgstr "призначити значення полю \"%s\" стовпця \"%s\" не можна, тому, що тип %s не є складеним типом"
 
-#: parser/parse_target.c:788
+#: parser/parse_target.c:791
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
 msgstr "призначити значення полю \"%s\" стовпця \"%s\" не можна, тому, що в типі даних %s немає такого стовпця"
 
-#: parser/parse_target.c:877
+#: parser/parse_target.c:880
 #, c-format
 msgid "subscripted assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "індексоване присвоєння \"%s\" вимагає тип %s, але вираз має тип %s"
 
-#: parser/parse_target.c:887
+#: parser/parse_target.c:890
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "підполе \"%s\" має тип %s, але вираз має тип %s"
 
-#: parser/parse_target.c:1327
+#: parser/parse_target.c:1330
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * повинен посилатись на таблиці"
@@ -18602,8 +19238,8 @@ msgstr "неправильне посилання %%TYPE (занадто баг
 msgid "type reference %s converted to %s"
 msgstr "посилання на тип %s перетворене на тип %s"
 
-#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:397
-#: utils/cache/typcache.c:452
+#: parser/parse_type.c:278 parser/parse_type.c:813 utils/cache/typcache.c:478
+#: utils/cache/typcache.c:533
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "тип \"%s\" є лише оболонкою"
@@ -18623,330 +19259,360 @@ msgstr "модифікатором типу повинна бути звичай
 msgid "invalid type name \"%s\""
 msgstr "невірне ім'я типу \"%s\""
 
-#: parser/parse_utilcmd.c:263
+#: parser/parse_utilcmd.c:265
 #, c-format
 msgid "cannot create partitioned table as inheritance child"
 msgstr "створити секціоновану таблицю в якості нащадка не можна"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:504
 #, c-format
 msgid "cannot set logged status of a temporary sequence"
-msgstr ""
+msgstr "неможливо встановити статус журналювання тимчасової послідовності"
 
-#: parser/parse_utilcmd.c:611
+#: parser/parse_utilcmd.c:642
 #, c-format
 msgid "array of serial is not implemented"
 msgstr "масиви послідовності не реалізовані"
 
-#: parser/parse_utilcmd.c:690 parser/parse_utilcmd.c:702
-#: parser/parse_utilcmd.c:761
+#: parser/parse_utilcmd.c:747 parser/parse_utilcmd.c:765
+#: parser/parse_utilcmd.c:873 parser/parse_utilcmd.c:906
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "несумісні оголошення NULL/NOT NULL для стовпця \"%s\" таблиці \"%s\""
 
-#: parser/parse_utilcmd.c:714
+#: parser/parse_utilcmd.c:759 parser/parse_utilcmd.c:1077
+#, c-format
+msgid "not-null constraints on partitioned tables cannot be NO INHERIT"
+msgstr "обмеження not-null на секціонованих таблицях не можуть бути NO INHERIT"
+
+#: parser/parse_utilcmd.c:773 parser/parse_utilcmd.c:808
+#, c-format
+msgid "conflicting NO INHERIT declarations for not-null constraints on column \"%s\""
+msgstr "конфліктуючі оголошення NO INHERIT для обмежень not-null на стовпці \"%s\""
+
+#: parser/parse_utilcmd.c:821
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" вказано декілька значень за замовчуванням"
 
-#: parser/parse_utilcmd.c:731
+#: parser/parse_utilcmd.c:838
 #, c-format
 msgid "identity columns are not supported on typed tables"
 msgstr "ідентифікаційні стовпці не підтримуються в типізованих таблицях"
 
-#: parser/parse_utilcmd.c:735
+#: parser/parse_utilcmd.c:842
 #, c-format
 msgid "identity columns are not supported on partitions"
 msgstr "ідентифікаційні стовпці не підтримуються з секціями"
 
-#: parser/parse_utilcmd.c:744
+#: parser/parse_utilcmd.c:851
 #, c-format
 msgid "multiple identity specifications for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" властивість identity вказана неодноразово"
 
-#: parser/parse_utilcmd.c:774
+#: parser/parse_utilcmd.c:884
 #, c-format
 msgid "generated columns are not supported on typed tables"
 msgstr "згенеровані стовпці не підтримуються в типізованих таблицях"
 
-#: parser/parse_utilcmd.c:778
+#: parser/parse_utilcmd.c:888
 #, c-format
 msgid "multiple generation clauses specified for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" вказано декілька речень генерації"
 
-#: parser/parse_utilcmd.c:796 parser/parse_utilcmd.c:911
+#: parser/parse_utilcmd.c:915 parser/parse_utilcmd.c:1043
 #, c-format
 msgid "primary key constraints are not supported on foreign tables"
 msgstr "обмеження первинного ключа для сторонніх таблиць не підтримуються"
 
-#: parser/parse_utilcmd.c:805 parser/parse_utilcmd.c:921
+#: parser/parse_utilcmd.c:924 parser/parse_utilcmd.c:1053
 #, c-format
 msgid "unique constraints are not supported on foreign tables"
 msgstr "обмеження унікальності для сторонніх таблиць не підтримуються"
 
-#: parser/parse_utilcmd.c:850
+#: parser/parse_utilcmd.c:971
 #, c-format
 msgid "both default and identity specified for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" вказано значення за замовчуванням і властивість identity"
 
-#: parser/parse_utilcmd.c:858
+#: parser/parse_utilcmd.c:979
 #, c-format
 msgid "both default and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" вказано вираз за замовчуванням і вираз генерації"
 
-#: parser/parse_utilcmd.c:866
+#: parser/parse_utilcmd.c:987
 #, c-format
 msgid "both identity and generation expression specified for column \"%s\" of table \"%s\""
 msgstr "для стовпця \"%s\" таблиці \"%s\" вказано вираз ідентичності і вираз генерації"
 
-#: parser/parse_utilcmd.c:931
+#: parser/parse_utilcmd.c:1063
 #, c-format
 msgid "exclusion constraints are not supported on foreign tables"
 msgstr "обмеження-виключення для сторонніх таблиць не підтримуються"
 
-#: parser/parse_utilcmd.c:996
-#, c-format
-msgid "LIKE is not supported for creating foreign tables"
-msgstr "LIKE не підтримується при створенні сторонніх таблиць"
-
-#: parser/parse_utilcmd.c:1009
+#: parser/parse_utilcmd.c:1149
 #, c-format
 msgid "relation \"%s\" is invalid in LIKE clause"
 msgstr "невірше відношення \"%s\" в реченні LIKE"
 
-#: parser/parse_utilcmd.c:1736 parser/parse_utilcmd.c:1844
+#: parser/parse_utilcmd.c:1917 parser/parse_utilcmd.c:2025
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "Індекс \"%s\" містить посилання на таблицю на весь рядок."
 
-#: parser/parse_utilcmd.c:2242
+#: parser/parse_utilcmd.c:2419
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "у CREATE TABLE не можна використовувати існуючий індекс"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2439
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "індекс \"%s\" вже пов'язаний з обмеженням"
 
-#: parser/parse_utilcmd.c:2283
+#: parser/parse_utilcmd.c:2465
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" не є унікальним індексом"
 
-#: parser/parse_utilcmd.c:2284 parser/parse_utilcmd.c:2291
-#: parser/parse_utilcmd.c:2298 parser/parse_utilcmd.c:2375
+#: parser/parse_utilcmd.c:2466 parser/parse_utilcmd.c:2473
+#: parser/parse_utilcmd.c:2480 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "Створити первинний ключ або обмеження унікальності, використовуючи такий індекс, не можна."
 
-#: parser/parse_utilcmd.c:2290
+#: parser/parse_utilcmd.c:2472
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "індекс \"%s\" містить вирази"
 
-#: parser/parse_utilcmd.c:2297
+#: parser/parse_utilcmd.c:2479
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" є частковим індексом"
 
-#: parser/parse_utilcmd.c:2309
+#: parser/parse_utilcmd.c:2491
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" є індексом, що відкладається"
 
-#: parser/parse_utilcmd.c:2310
+#: parser/parse_utilcmd.c:2492
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr "Створити обмеження, що не відкладається, використовуючи індекс, що відкладається, не можна."
 
-#: parser/parse_utilcmd.c:2374
+#: parser/parse_utilcmd.c:2555
 #, c-format
 msgid "index \"%s\" column number %d does not have default sorting behavior"
 msgstr "індекс \"%s\" номер стовпця %d не має поведінки сортування за замовчуванням"
 
-#: parser/parse_utilcmd.c:2531
+#: parser/parse_utilcmd.c:2747
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "стовпець \"%s\" з'являється двічі в обмеженні первинного ключа"
 
-#: parser/parse_utilcmd.c:2537
+#: parser/parse_utilcmd.c:2753
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "стовпець \"%s\" з'являється двічі в обмеженні унікальності"
 
-#: parser/parse_utilcmd.c:2871
+#: parser/parse_utilcmd.c:2798
+#, c-format
+msgid "column \"%s\" in WITHOUT OVERLAPS is not a range or multirange type"
+msgstr "стовпець \"%s\" у WITHOUT OVERLAPS не є типом range або multirange"
+
+#: parser/parse_utilcmd.c:2826
+#, c-format
+msgid "constraint using WITHOUT OVERLAPS needs at least two columns"
+msgstr "обмеження з використанням WITHOUT OVERLAPS потребує щонайменше двох стовпців"
+
+#: parser/parse_utilcmd.c:3123
 #, c-format
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr "індекс-вирази й предикати можуть посилатись лише на індексовану таблицю"
 
-#: parser/parse_utilcmd.c:2943
+#: parser/parse_utilcmd.c:3195
 #, c-format
 msgid "statistics expressions can refer only to the table being referenced"
 msgstr "вирази статистики можуть посилатися лише на таблицю, для якої збирається статистика"
 
-#: parser/parse_utilcmd.c:2986
+#: parser/parse_utilcmd.c:3238
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "правила для матеріалізованих подань не підтримуються"
 
-#: parser/parse_utilcmd.c:3046
+#: parser/parse_utilcmd.c:3298
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "в умовах WHERE правила не можуть містити посилання на інші зв'язки"
 
-#: parser/parse_utilcmd.c:3118
+#: parser/parse_utilcmd.c:3370
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "правила з умовами WHERE можуть мати лише дії SELECT, INSERT, UPDATE або DELETE"
 
-#: parser/parse_utilcmd.c:3136 parser/parse_utilcmd.c:3237
-#: rewrite/rewriteHandler.c:538 rewrite/rewriteManip.c:1095
+#: parser/parse_utilcmd.c:3388 parser/parse_utilcmd.c:3489
+#: rewrite/rewriteHandler.c:546 rewrite/rewriteManip.c:1187
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "умовні оператори UNION/INTERSECT/EXCEPT не реалізовані"
 
-#: parser/parse_utilcmd.c:3154
+#: parser/parse_utilcmd.c:3406
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "у правилі ON SELECT не можна використовувати OLD"
 
-#: parser/parse_utilcmd.c:3158
+#: parser/parse_utilcmd.c:3410
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "у правилі ON SELECT не можна використовувати NEW"
 
-#: parser/parse_utilcmd.c:3167
+#: parser/parse_utilcmd.c:3419
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "у правилі ON INSERT не можна використовувати OLD"
 
-#: parser/parse_utilcmd.c:3173
+#: parser/parse_utilcmd.c:3425
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "у правилі ON DELETE не можна використовувати NEW"
 
-#: parser/parse_utilcmd.c:3201
+#: parser/parse_utilcmd.c:3453
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "у запиті WITH не можна посилатися на OLD"
 
-#: parser/parse_utilcmd.c:3208
+#: parser/parse_utilcmd.c:3460
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "у запиті WITH не можна посилатися на NEW"
 
-#: parser/parse_utilcmd.c:3664
+#: parser/parse_utilcmd.c:3918
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "речення DEFERRABLE розташовано неправильно"
 
-#: parser/parse_utilcmd.c:3669 parser/parse_utilcmd.c:3684
+#: parser/parse_utilcmd.c:3923 parser/parse_utilcmd.c:3938
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "декілька речень DEFERRABLE/NOT DEFERRABLE не допускаються"
 
-#: parser/parse_utilcmd.c:3679
+#: parser/parse_utilcmd.c:3933
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "речення NOT DEFERRABLE розташовано неправильно"
 
-#: parser/parse_utilcmd.c:3692 parser/parse_utilcmd.c:3718 gram.y:6114
+#: parser/parse_utilcmd.c:3946 parser/parse_utilcmd.c:3972 gram.y:6229
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "обмеження, оголошене як INITIALLY DEFERRED, повинно бути оголошене як DEFERRABLE"
 
-#: parser/parse_utilcmd.c:3700
+#: parser/parse_utilcmd.c:3954
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "речення INITIALLY DEFERRED розташовано неправильно"
 
-#: parser/parse_utilcmd.c:3705 parser/parse_utilcmd.c:3731
+#: parser/parse_utilcmd.c:3959 parser/parse_utilcmd.c:3985
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "декілька речень INITIALLY IMMEDIATE/DEFERRED не допускаються"
 
-#: parser/parse_utilcmd.c:3726
+#: parser/parse_utilcmd.c:3980
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "речення INITIALLY IMMEDIATE розташовано неправильно"
 
-#: parser/parse_utilcmd.c:3919
+#: parser/parse_utilcmd.c:3997
+#, c-format
+msgid "misplaced ENFORCED clause"
+msgstr "невірно розміщене речення ENFORCED"
+
+#: parser/parse_utilcmd.c:4002 parser/parse_utilcmd.c:4019
+#, c-format
+msgid "multiple ENFORCED/NOT ENFORCED clauses not allowed"
+msgstr "кілька речень ENFORCED/NOT ENFORCED не дозволено"
+
+#: parser/parse_utilcmd.c:4014
+#, c-format
+msgid "misplaced NOT ENFORCED clause"
+msgstr "невірно розміщене речення NOT ENFORCED"
+
+#: parser/parse_utilcmd.c:4212
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "В CREATE вказана схема (%s), яка відрізняється від створюваної (%s)"
 
-#: parser/parse_utilcmd.c:3954
+#: parser/parse_utilcmd.c:4247
 #, c-format
 msgid "\"%s\" is not a partitioned table"
 msgstr "\"%s\" не є секціонованою таблицею"
 
-#: parser/parse_utilcmd.c:3961
+#: parser/parse_utilcmd.c:4254
 #, c-format
 msgid "table \"%s\" is not partitioned"
 msgstr "таблиця \"%s\" не є секційною"
 
-#: parser/parse_utilcmd.c:3968
+#: parser/parse_utilcmd.c:4261
 #, c-format
 msgid "index \"%s\" is not partitioned"
 msgstr "індекс \"%s\" не є секціонованим"
 
-#: parser/parse_utilcmd.c:4008
+#: parser/parse_utilcmd.c:4301
 #, c-format
 msgid "a hash-partitioned table may not have a default partition"
 msgstr "у геш-секціонованій таблиці не може бути розділу за замовчуванням"
 
-#: parser/parse_utilcmd.c:4025
+#: parser/parse_utilcmd.c:4318
 #, c-format
 msgid "invalid bound specification for a hash partition"
 msgstr "неприпустима вказівка границі для геш-секції"
 
-#: parser/parse_utilcmd.c:4031 partitioning/partbounds.c:4802
+#: parser/parse_utilcmd.c:4324 partitioning/partbounds.c:4802
 #, c-format
 msgid "modulus for hash partition must be an integer value greater than zero"
-msgstr "модуль для хеш-секції повинен бути цілим числом більшим за нуль"
+msgstr "модуль для хеш-секції повинен бути цілим числом більше за нуль"
 
-#: parser/parse_utilcmd.c:4038 partitioning/partbounds.c:4810
+#: parser/parse_utilcmd.c:4331 partitioning/partbounds.c:4810
 #, c-format
 msgid "remainder for hash partition must be less than modulus"
 msgstr "залишок для геш-секції повинен бути меньшим, ніж модуль"
 
-#: parser/parse_utilcmd.c:4051
+#: parser/parse_utilcmd.c:4344
 #, c-format
 msgid "invalid bound specification for a list partition"
 msgstr "нерипустима вказівка границі для секції по списку"
 
-#: parser/parse_utilcmd.c:4104
+#: parser/parse_utilcmd.c:4397
 #, c-format
 msgid "invalid bound specification for a range partition"
 msgstr "неприпустима вказівка границі для секції діапазону"
 
-#: parser/parse_utilcmd.c:4110
+#: parser/parse_utilcmd.c:4403
 #, c-format
 msgid "FROM must specify exactly one value per partitioning column"
 msgstr "В FROM повинно вказуватися лише одне значення для стовпця секціонування"
 
-#: parser/parse_utilcmd.c:4114
+#: parser/parse_utilcmd.c:4407
 #, c-format
 msgid "TO must specify exactly one value per partitioning column"
 msgstr "В TO повинно вказуватися лише одне значення для стовпця секціонування"
 
-#: parser/parse_utilcmd.c:4228
+#: parser/parse_utilcmd.c:4521
 #, c-format
 msgid "cannot specify NULL in range bound"
 msgstr "вказати NULL в діапазоні границі не можна"
 
-#: parser/parse_utilcmd.c:4277
+#: parser/parse_utilcmd.c:4570
 #, c-format
 msgid "every bound following MAXVALUE must also be MAXVALUE"
 msgstr "за кожною границею MAXVALUE повинні бути лише границі MAXVALUE"
 
-#: parser/parse_utilcmd.c:4284
+#: parser/parse_utilcmd.c:4577
 #, c-format
 msgid "every bound following MINVALUE must also be MINVALUE"
 msgstr "за кожною границею MINVALUE повинні бути лише границі MINVALUE"
 
-#: parser/parse_utilcmd.c:4327
+#: parser/parse_utilcmd.c:4620
 #, c-format
 msgid "specified value cannot be cast to type %s for column \"%s\""
 msgstr "вказане значення не можна привести до типу %s для стовпця \"%s\""
@@ -18959,12 +19625,12 @@ msgstr "UESCAPE повинен відстежуватись простим лі
 msgid "invalid Unicode escape character"
 msgstr "неприпустимий символ спеціального коду Unicode"
 
-#: parser/parser.c:347 scan.l:1393
+#: parser/parser.c:347 scan.l:1385
 #, c-format
 msgid "invalid Unicode escape value"
 msgstr "неприпустиме значення спеціального коду Unicode"
 
-#: parser/parser.c:494 utils/adt/varlena.c:6640 scan.l:716
+#: parser/parser.c:494 utils/adt/varlena.c:6853 scan.l:702
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "неприпустимий спеціальний код Unicode"
@@ -18974,8 +19640,8 @@ msgstr "неприпустимий спеціальний код Unicode"
 msgid "Unicode escapes must be \\XXXX or \\+XXXXXX."
 msgstr "Спеціальні символи Unicode повинні бути \\XXXX або \\+XXXXXX."
 
-#: parser/parser.c:523 utils/adt/varlena.c:6665 scan.l:677 scan.l:693
-#: scan.l:709
+#: parser/parser.c:523 utils/adt/varlena.c:6878 scan.l:663 scan.l:679
+#: scan.l:695
 #, c-format
 msgid "invalid Unicode surrogate pair"
 msgstr "неприпустима сурогатна пара Unicode"
@@ -19029,7 +19695,7 @@ msgstr "пропущено сканування зовнішньої табли
 #: partitioning/partbounds.c:4806
 #, c-format
 msgid "remainder for hash partition must be an integer value greater than or equal to zero"
-msgstr "залишок для хеш-секції повинен бути цілим числом більшим або рівним нулю"
+msgstr "залишок для хеш-секції повинен бути цілим числом більше або дорівнювати нулю"
 
 #: partitioning/partbounds.c:4830
 #, c-format
@@ -19052,7 +19718,7 @@ msgid "column %d of the partition key has type \"%s\", but supplied value is of
 msgstr "стовпець %d ключа секціонування має тип \"%s\", але для нього вказано значення типу \"%s\""
 
 #: port/pg_sema.c:209 port/pg_shmem.c:717 port/posix_sema.c:209
-#: port/sysv_sema.c:323 port/sysv_shmem.c:717
+#: port/sysv_sema.c:343 port/sysv_shmem.c:717
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "не вдалося встановити дані каталогу \"%s\": %m"
@@ -19091,7 +19757,7 @@ msgstr "Ця помилка НЕ означає, що на диску немає
 #: port/pg_shmem.c:584 port/sysv_shmem.c:584 port/win32_shmem.c:646
 #, c-format
 msgid "\"huge_page_size\" must be 0 on this platform."
-msgstr ""
+msgstr "\"huge_page_size\" повинен бути 0 на цій платформі."
 
 #: port/pg_shmem.c:655 port/sysv_shmem.c:655
 #, c-format
@@ -19101,7 +19767,7 @@ msgstr "не вдалося показати анонімну спільну п
 #: port/pg_shmem.c:657 port/sysv_shmem.c:657
 #, 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 ""
+msgstr "Ця помилка зазвичай означає, що запит PostgreSQL для сегменту спільної пам'яті перевищує об'єм доступної фізичної або віртуальної пам'яті або гігантських сторінок. Щоб зменшити розмір запиту (поточний: %zu байтів), зменшіть використання спільної пам'яті PostgreSQL, можливо зменшив \"shared_buffers\" або \"max_connections\"."
 
 #: port/pg_shmem.c:725 port/sysv_shmem.c:725
 #, c-format
@@ -19111,35 +19777,36 @@ msgstr "величезні сторінки на цій плтаформі не
 #: port/pg_shmem.c:732 port/sysv_shmem.c:732
 #, c-format
 msgid "huge pages not supported with the current \"shared_memory_type\" setting"
-msgstr ""
+msgstr "величезні сторінки не підтримуються з поточним параметром \"shared_memory_type\""
 
-#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1347
+#: port/pg_shmem.c:798 port/sysv_shmem.c:798 utils/init/miscinit.c:1407
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "раніше виділений блок спільної пам'яті (ключ %lu, ідентифікатор %lu) все ще використовується"
 
-#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1349
+#: port/pg_shmem.c:801 port/sysv_shmem.c:801 utils/init/miscinit.c:1409
 #, c-format
 msgid "Terminate any old server processes associated with data directory \"%s\"."
 msgstr "Припинити будь-які старі серверні процеси, пов'язані з каталогом даних \"%s\"."
 
-#: port/sysv_sema.c:120
+#: port/sysv_sema.c:135
 #, c-format
 msgid "could not create semaphores: %m"
 msgstr "не вдалося створити семафори: %m"
 
-#: port/sysv_sema.c:121
+#: port/sysv_sema.c:136
 #, c-format
 msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "Помилка системного виклику semget(%lu, %d, 0%o)."
 
-#: port/sysv_sema.c:125
+#: port/sysv_sema.c:140
 #, c-format
 msgid "This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its \"max_connections\" parameter.\n"
 "The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
-msgstr ""
+msgstr "Ця помилка НЕ означає, що на диску немає місця. Ймовірніше за все перевищено ліміт числа встановлених семафорів (SEMMNI), або загального числа семафорів (SEMMNS) в системі. Вам потрібно збільшити відповідний параметр ядра. Інший спосіб - зменшити споживання PostgreSQL в семафорах, зменшивши параметр \"max_connections\".\n"
+"Більше інформації про налаштування вашої системи для PostgreSQL міститься в інструкції PostgreSQL."
 
-#: port/sysv_sema.c:155
+#: port/sysv_sema.c:170
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Можливо, вам потрібно збілшити значення SEMVMX вашого ядра, мінімум до %d. Детальніше про це написано в інструкції PostgreSQL."
@@ -19264,87 +19931,107 @@ msgstr "Помилка в системному виклику DuplicateHandle."
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Помилка в системному виклику MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:686
+#: postmaster/autovacuum.c:693
 #, c-format
 msgid "autovacuum worker took too long to start; canceled"
 msgstr "старт процеса автовакуума зайняв забагато часу; скасовано"
 
-#: postmaster/autovacuum.c:2199
+#: postmaster/autovacuum.c:2232
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s.%s.%s\""
 msgstr "автоочистка: видалення застарілої тимчасової таблиці \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2435
+#: postmaster/autovacuum.c:2475
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "автоматична очистка таблиці \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2438
+#: postmaster/autovacuum.c:2478
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "автоматичний аналіз таблиці \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2632
+#: postmaster/autovacuum.c:2677
 #, c-format
 msgid "processing work entry for relation \"%s.%s.%s\""
 msgstr "обробка робочого введення для відношення \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:3250
+#: postmaster/autovacuum.c:3348
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "автоочистку не запущено через неправильну конфігурацію"
 
-#: postmaster/autovacuum.c:3251
+#: postmaster/autovacuum.c:3349
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Активувати параметр \"track_counts\"."
 
+#: postmaster/autovacuum.c:3471
+#, c-format
+msgid "\"autovacuum_max_workers\" (%d) should be less than or equal to \"autovacuum_worker_slots\" (%d)"
+msgstr "\"autovacuum_max_workers\" (%d) має бути меншим або рівним \"autovacuum_worker_slots\" (%d)"
+
+#: postmaster/autovacuum.c:3473
+#, c-format
+msgid "The server will only start up to \"autovacuum_worker_slots\" (%d) autovacuum workers at a given time."
+msgstr "Сервер запустить лише до \"autovacuum_worker_slots\" (%d) працівників автоочистки одночасно."
+
 #: postmaster/bgworker.c:260
 #, c-format
-msgid "inconsistent background worker state (max_worker_processes=%d, total_slots=%d)"
-msgstr "несумісний стан фонового процесу (max_worker_processes=%d, total_slots=%d)"
+msgid "inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)"
+msgstr "неузгоджений стан фонового виконавця (\"max_worker_processes\"=%d, загальних слотів=%d)"
 
-#: postmaster/bgworker.c:651
+#: postmaster/bgworker.c:646
 #, c-format
 msgid "background worker \"%s\": background workers without shared memory access are not supported"
 msgstr "фоновий виконавець \"%s\": фонові виконавці без доступу до спільної пам'яті не підтримуються"
 
-#: postmaster/bgworker.c:662
+#: postmaster/bgworker.c:657
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "фоновий виконавець \"%s\": не може запитувати доступ до бази даних, якщо його запущено при старті адміністратора поштового сервісу"
 
-#: postmaster/bgworker.c:676
+#: postmaster/bgworker.c:671
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "фоновий виконавець \"%s\": неприпустимий інтервал перезавантаження"
 
-#: postmaster/bgworker.c:691
+#: postmaster/bgworker.c:686
 #, c-format
 msgid "background worker \"%s\": parallel workers may not be configured for restart"
 msgstr "фоновий виконавець\"%s\": паралельні виконавці не можуть бути налаштовані для перезавантаження"
 
-#: postmaster/bgworker.c:715 tcop/postgres.c:3312
+#: postmaster/bgworker.c:710 tcop/postgres.c:3343
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "завершення фонового процесу \"%s\" по команді адміністратора"
 
-#: postmaster/bgworker.c:888
+#: postmaster/bgworker.c:869 postmaster/bgworker.c:903
+#, c-format
+msgid "database connection requirement not indicated during registration"
+msgstr "під час реєстрації не вказувалося, що вимагається підключення до бази даних"
+
+#: postmaster/bgworker.c:879 postmaster/bgworker.c:913
+#, c-format
+msgid "invalid processing mode in background worker"
+msgstr "неприпустимий режим обробки у фоновому записі"
+
+#: postmaster/bgworker.c:966
 #, c-format
 msgid "background worker \"%s\": must be registered in \"shared_preload_libraries\""
-msgstr ""
+msgstr "фоновий процес \"%s\": повинен бути зареєстрований в \"shared_preload_libraries\""
 
-#: postmaster/bgworker.c:911
+#: postmaster/bgworker.c:989
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "фоновий процес \"%s\": лише динамічні фонові процеси можуть запитувати сповіщення"
 
-#: postmaster/bgworker.c:926
+#: postmaster/bgworker.c:1004
 #, c-format
 msgid "too many background workers"
 msgstr "занадто багато фонових процесів"
 
-#: postmaster/bgworker.c:927
+#: postmaster/bgworker.c:1005
 #, 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."
@@ -19353,12 +20040,12 @@ msgstr[1] "Максимальне можливе число фонових пр
 msgstr[2] "Максимальне можливе число фонових процесів при поточних параметрах: %d."
 msgstr[3] "Максимальне можливе число фонових процесів при поточних параметрах: %d."
 
-#: postmaster/bgworker.c:931 postmaster/checkpointer.c:445
+#: postmaster/bgworker.c:1009 postmaster/checkpointer.c:462
 #, c-format
 msgid "Consider increasing the configuration parameter \"%s\"."
-msgstr ""
+msgstr "Можливо, слід збільшити параметр конфігурації \"%s\"."
 
-#: postmaster/checkpointer.c:441
+#: postmaster/checkpointer.c:458
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
@@ -19367,283 +20054,283 @@ msgstr[1] "контрольні точки відбуваються занадт
 msgstr[2] "контрольні точки відбуваються занадто часто (через %d сек.)"
 msgstr[3] "контрольні точки відбуваються занадто часто (через %d сек.)"
 
-#: postmaster/checkpointer.c:1067
+#: postmaster/checkpointer.c:1127
 #, c-format
 msgid "checkpoint request failed"
 msgstr "збій при запиті контрольної точки"
 
-#: postmaster/checkpointer.c:1068
+#: postmaster/checkpointer.c:1128
 #, c-format
 msgid "Consult recent messages in the server log for details."
 msgstr "Для деталей, зверніться до останніх повідомлень в протоколі серверу."
 
-#: postmaster/launch_backend.c:381
+#: postmaster/launch_backend.c:395
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "не вдалося виконати серверні процеси \"%s\":%m"
 
-#: postmaster/launch_backend.c:434
+#: postmaster/launch_backend.c:449
 #, c-format
 msgid "could not create backend parameter file mapping: error code %lu"
 msgstr "не вдалося створити відображення файлу параметру внутрішнього сервера: код помилки %lu"
 
-#: postmaster/launch_backend.c:442
+#: postmaster/launch_backend.c:457
 #, c-format
 msgid "could not map backend parameter memory: error code %lu"
 msgstr "не вдалося відобразити пам'ять параметру внутрішнього сервера: код помилки %lu"
 
-#: postmaster/launch_backend.c:459
+#: postmaster/launch_backend.c:474
 #, c-format
 msgid "subprocess command line too long"
 msgstr "командний рядок підпроцесу занадто довгий"
 
-#: postmaster/launch_backend.c:477
+#: postmaster/launch_backend.c:492
 #, c-format
 msgid "CreateProcess() call failed: %m (error code %lu)"
 msgstr "помилка виклику CreateProcess(): %m (код помилки %lu)"
 
-#: postmaster/launch_backend.c:504
+#: postmaster/launch_backend.c:521
 #, c-format
 msgid "could not unmap view of backend parameter file: error code %lu"
 msgstr "не вдалося вимкнути відображення файлу параметру внутрішнього сервера: код помилки %lu"
 
-#: postmaster/launch_backend.c:508
+#: postmaster/launch_backend.c:525
 #, c-format
 msgid "could not close handle to backend parameter file: error code %lu"
 msgstr "не вдалося закрити покажчик файлу параметру внутрішнього сервера: код помилки %lu"
 
-#: postmaster/launch_backend.c:530
+#: postmaster/launch_backend.c:547
 #, c-format
 msgid "giving up after too many tries to reserve shared memory"
 msgstr "кількість повторних спроб резервування спільної пам'яті досягло межі"
 
-#: postmaster/launch_backend.c:531
+#: postmaster/launch_backend.c:548
 #, c-format
 msgid "This might be caused by ASLR or antivirus software."
 msgstr "Це може бути викликано антивірусним програмним забезпеченням або ASLR."
 
-#: postmaster/launch_backend.c:834
+#: postmaster/launch_backend.c:854
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr "не вдалося продублювати сокет %d для використання: код помилки %d"
 
-#: postmaster/launch_backend.c:866
+#: postmaster/launch_backend.c:886
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "не вдалося створити успадкований сокет: код помилки %d\n"
 
-#: postmaster/launch_backend.c:895
+#: postmaster/launch_backend.c:915
 #, c-format
 msgid "could not open backend variables file \"%s\": %m\n"
-msgstr ""
+msgstr "не вдалося відкрити внутрішні змінні файли \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:901
+#: postmaster/launch_backend.c:921
 #, c-format
 msgid "could not read from backend variables file \"%s\": %m\n"
-msgstr ""
+msgstr "не вдалося прочитати внутрішні змінні файли \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:912
+#: postmaster/launch_backend.c:932
 #, c-format
 msgid "could not read startup data from backend variables file \"%s\": %m\n"
-msgstr ""
+msgstr "не вдалося прочитати стартові дані у файлах внутрішніх змінних \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:924
+#: postmaster/launch_backend.c:944
 #, c-format
 msgid "could not remove file \"%s\": %m\n"
-msgstr ""
+msgstr "не вдалося видалити файл \"%s\": %m\n"
 
-#: postmaster/launch_backend.c:940
+#: postmaster/launch_backend.c:960
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "не вдалося відобразити файл серверних змінних: код помилки %lu\n"
 
-#: postmaster/launch_backend.c:959
+#: postmaster/launch_backend.c:979
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "не вдалося вимкнути відображення файлу серверних змінних: код помилки %lu\n"
 
-#: postmaster/launch_backend.c:966
+#: postmaster/launch_backend.c:986
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "не вдалося закрити покажчик файлу серверних змінних: код помилки %lu\n"
 
-#: postmaster/pgarch.c:428
+#: postmaster/pgarch.c:429
 #, c-format
 msgid "\"archive_mode\" enabled, yet archiving is not configured"
-msgstr ""
+msgstr "\"archive_mode\" активовано, але архівування не налаштовано"
 
-#: postmaster/pgarch.c:452
+#: postmaster/pgarch.c:453
 #, c-format
 msgid "removed orphan archive status file \"%s\""
 msgstr "видалено залишковий файл статусу архіву \"%s\""
 
-#: postmaster/pgarch.c:462
+#: postmaster/pgarch.c:463
 #, c-format
 msgid "removal of orphan archive status file \"%s\" failed too many times, will try again later"
 msgstr "видалення залишкового файлу статусу архіву \"%s\" не вдалося занадто багато разів, пізніже спробуємо знову"
 
-#: postmaster/pgarch.c:498
+#: postmaster/pgarch.c:499
 #, c-format
 msgid "archiving write-ahead log file \"%s\" failed too many times, will try again later"
 msgstr "архівація файлу випереджувальног журналювання \"%s\" не виконана багато разів, наступна спроба буде пізніже"
 
-#: postmaster/pgarch.c:879 postmaster/pgarch.c:918
+#: postmaster/pgarch.c:881 postmaster/pgarch.c:920
 #, c-format
 msgid "both \"archive_command\" and \"archive_library\" set"
-msgstr ""
+msgstr "встановлено команду \"archive_command\" і \"archive_library\""
 
-#: postmaster/pgarch.c:880 postmaster/pgarch.c:919
+#: postmaster/pgarch.c:882 postmaster/pgarch.c:921
 #, c-format
 msgid "Only one of \"archive_command\", \"archive_library\" may be set."
-msgstr ""
+msgstr "Можливо встановити лише одну з \"archive_command\", \"archive_library\"."
 
-#: postmaster/pgarch.c:897
+#: postmaster/pgarch.c:899
 #, c-format
 msgid "restarting archiver process because value of \"archive_library\" was changed"
 msgstr "перезапуск процесу архіватора, оскільки значення \"archive_library\" було змінено"
 
-#: postmaster/pgarch.c:934
+#: postmaster/pgarch.c:936
 #, c-format
 msgid "archive modules have to define the symbol %s"
 msgstr "архівні модулі повинні визначити символ %s"
 
-#: postmaster/pgarch.c:940
+#: postmaster/pgarch.c:942
 #, c-format
 msgid "archive modules must register an archive callback"
 msgstr "модулі архіву повинні реєструвати зворотний виклик архіву"
 
-#: postmaster/postmaster.c:661
+#: postmaster/postmaster.c:678
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: неприпустимий аргумент для параметру -f: \"%s\"\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:751
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: неприпустимий аргумент для параметру -t: \"%s\"\n"
 
-#: postmaster/postmaster.c:757
+#: postmaster/postmaster.c:774
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: неприпустимий аргумент: \"%s\"\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:842
 #, c-format
 msgid "%s: \"superuser_reserved_connections\" (%d) plus \"reserved_connections\" (%d) must be less than \"max_connections\" (%d)\n"
-msgstr ""
+msgstr "%s: \"superuser_reserved_connections\" (%d) плюс \"reserved_connections\" (%d) має бути меншим за \"max_connections\" (%d)\n"
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:850
 #, c-format
 msgid "WAL archival cannot be enabled when \"wal_level\" is \"minimal\""
-msgstr ""
+msgstr "WAL архіватор не може бути активованим, коли \"wal_level\" встановлено в \"minimal\""
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:853
 #, c-format
 msgid "WAL streaming (\"max_wal_senders\" > 0) requires \"wal_level\" to be \"replica\" or \"logical\""
 msgstr "Потокове передавання WAL (\"max_wal_senders\" > 0) вимагає \"wal_level\" \"replica\" або \"logical\""
 
-#: postmaster/postmaster.c:839
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL cannot be summarized when \"wal_level\" is \"minimal\""
 msgstr "неможливо підсумувати WAL, якщо \"wal_level\" дорівнє \"minimal\""
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:864
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: неприпустимі таблиці маркерів часу, будь-ласка виправіть\n"
 
-#: postmaster/postmaster.c:1004
+#: postmaster/postmaster.c:1025
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "не вдалося створити завершений порт вводу-виводу для черги дітей"
 
-#: postmaster/postmaster.c:1069
+#: postmaster/postmaster.c:1091
 #, c-format
 msgid "ending log output to stderr"
 msgstr "завершення запису виводу Stderr"
 
-#: postmaster/postmaster.c:1070
+#: postmaster/postmaster.c:1092
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "В майбутньому запис виведення буде записуватися в призначення \"%s\"."
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1103
 #, c-format
 msgid "starting %s"
 msgstr "початок %s"
 
-#: postmaster/postmaster.c:1143
+#: postmaster/postmaster.c:1165
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "не вдалося створити сокет прослуховування для \"%s\""
 
-#: postmaster/postmaster.c:1149
+#: postmaster/postmaster.c:1171
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "не вдалося створити TCP/IP сокети"
 
-#: postmaster/postmaster.c:1181
+#: postmaster/postmaster.c:1203
 #, c-format
 msgid "DNSServiceRegister() failed: error code %ld"
 msgstr "Помилка DNSServiceRegister(): код помилки %ld"
 
-#: postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "не вдалося створити Unix-domain сокет в каталозі \"%s\""
 
-#: postmaster/postmaster.c:1240
+#: postmaster/postmaster.c:1262
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "не вдалося створити Unix-domain сокети"
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1273
 #, c-format
 msgid "no socket created for listening"
 msgstr "не створено жодного сокету для прослуховування"
 
-#: postmaster/postmaster.c:1282
+#: postmaster/postmaster.c:1304
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %m\n"
 msgstr "%s: не вдалося змінити дозволи зовнішнього PID файлу \"%s\": %m\n"
 
-#: postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1308
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %m\n"
 msgstr "%s: не вдалося записати зовнішній PID файл \"%s\": %m\n"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:1314 utils/init/postinit.c:221
+#: postmaster/postmaster.c:1336 utils/init/postinit.c:225
 #, c-format
 msgid "could not load %s"
 msgstr "не вдалося завантажити %s"
 
-#: postmaster/postmaster.c:1340
+#: postmaster/postmaster.c:1364
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "адміністратор поштового сервера став багатопотоковим під час запуску"
 
-#: postmaster/postmaster.c:1341
+#: postmaster/postmaster.c:1365 postmaster/postmaster.c:3668
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Встановити в змінній середовища LC_ALL дійісну локаль."
 
-#: postmaster/postmaster.c:1440
+#: postmaster/postmaster.c:1468
 #, c-format
 msgid "%s: could not locate my own executable path"
 msgstr "%s: не вдалося знайти свій власний шлях для виконання"
 
-#: postmaster/postmaster.c:1447
+#: postmaster/postmaster.c:1475
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: не вдалося знайти відповідний postgres файл, що виконується"
 
-#: postmaster/postmaster.c:1470 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1498 utils/misc/tzparser.c:342
 #, c-format
 msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
 msgstr "Це може означати неповне встановлення PostgreSQL, або те, що файл \"%s\" було переміщено з його правильного розташування."
 
-#: postmaster/postmaster.c:1497
+#: postmaster/postmaster.c:1525
 #, c-format
 msgid "%s: could not find the database system\n"
 "Expected to find it in the directory \"%s\",\n"
@@ -19653,307 +20340,294 @@ msgstr "%s: не вдалося знайти систему бази даних\
 "але не вдалося відкрити файл \"%s\": %m\n"
 
 #. translator: %s is SIGKILL or SIGABRT
-#: postmaster/postmaster.c:1787
+#: postmaster/postmaster.c:1762
 #, c-format
 msgid "issuing %s to recalcitrant children"
 msgstr "надсилання %s непокірливим дітям"
 
-#: postmaster/postmaster.c:1809
+#: postmaster/postmaster.c:1784
 #, c-format
 msgid "performing immediate shutdown because data directory lock file is invalid"
 msgstr "виконується негайне припинення роботи через неприпустимий файл блокування каталогу даних"
 
-#: postmaster/postmaster.c:1872
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "неправильний ключ в запиті скасування процесу %d"
-
-#: postmaster/postmaster.c:1884
-#, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "PID %d в запиті на скасування не відповідає жодному процесу"
-
-#: postmaster/postmaster.c:2105
+#: postmaster/postmaster.c:2004
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "отримано SIGHUP, поновлення файлів конфігурацій"
 
 #. translator: %s is a configuration file
-#: postmaster/postmaster.c:2133 postmaster/postmaster.c:2137
+#: postmaster/postmaster.c:2012 postmaster/postmaster.c:2016
 #, c-format
 msgid "%s was not reloaded"
 msgstr "%s не було перезавантажено"
 
-#: postmaster/postmaster.c:2147
+#: postmaster/postmaster.c:2026
 #, c-format
 msgid "SSL configuration was not reloaded"
 msgstr "Конфігурація протоколу SSL не була перезавантажена"
 
-#: postmaster/postmaster.c:2233
+#: postmaster/postmaster.c:2112
 #, c-format
 msgid "received smart shutdown request"
 msgstr "отримано smart запит на завершення роботи"
 
-#: postmaster/postmaster.c:2274
+#: postmaster/postmaster.c:2153
 #, c-format
 msgid "received fast shutdown request"
 msgstr "отримано швидкий запит на завершення роботи"
 
-#: postmaster/postmaster.c:2292
+#: postmaster/postmaster.c:2171
 #, c-format
 msgid "aborting any active transactions"
 msgstr "переривання будь-яких активних транзакцій"
 
-#: postmaster/postmaster.c:2316
+#: postmaster/postmaster.c:2195
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "отримано запит на негайне завершення роботи"
 
-#: postmaster/postmaster.c:2388
+#: postmaster/postmaster.c:2270
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "завершення роботи при відновленні мети"
 
-#: postmaster/postmaster.c:2406 postmaster/postmaster.c:2442
+#: postmaster/postmaster.c:2288 postmaster/postmaster.c:2324
 msgid "startup process"
 msgstr "стартовий процес"
 
-#: postmaster/postmaster.c:2409
+#: postmaster/postmaster.c:2291
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "переривання запуску через помилку в стартовому процесі"
 
-#: postmaster/postmaster.c:2484
+#: postmaster/postmaster.c:2347
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "система бази даних готова до отримання підключення"
 
-#: postmaster/postmaster.c:2505
+#: postmaster/postmaster.c:2369
 msgid "background writer process"
 msgstr "процес фонового запису"
 
-#: postmaster/postmaster.c:2552
+#: postmaster/postmaster.c:2402
 msgid "checkpointer process"
 msgstr "процес контрольних точок"
 
-#: postmaster/postmaster.c:2568
+#: postmaster/postmaster.c:2419
 msgid "WAL writer process"
 msgstr "Процес запису WAL"
 
-#: postmaster/postmaster.c:2583
+#: postmaster/postmaster.c:2435
 msgid "WAL receiver process"
 msgstr "Процес отримання WAL"
 
-#: postmaster/postmaster.c:2597
+#: postmaster/postmaster.c:2450
 msgid "WAL summarizer process"
 msgstr "Процес підсумовування WAL"
 
-#: postmaster/postmaster.c:2612
+#: postmaster/postmaster.c:2466
 msgid "autovacuum launcher process"
 msgstr "процес запуску автоочистки"
 
-#: postmaster/postmaster.c:2630
+#: postmaster/postmaster.c:2482
 msgid "archiver process"
 msgstr "процес архівації"
 
-#: postmaster/postmaster.c:2643
+#: postmaster/postmaster.c:2497
 msgid "system logger process"
 msgstr "процес системного журналювання"
 
-#: postmaster/postmaster.c:2660
+#: postmaster/postmaster.c:2515
 msgid "slot sync worker process"
 msgstr "робочий процес синхронізації слоту"
 
-#: postmaster/postmaster.c:2716
+#: postmaster/postmaster.c:2523 utils/init/miscinit.c:297
+msgid "io worker"
+msgstr "працівник вводу-виводу"
+
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2547
+msgid "untracked child process"
+msgstr "невідстежуваний дочірній процес"
+
+#: postmaster/postmaster.c:2580
 #, c-format
 msgid "background worker \"%s\""
 msgstr "фоновий виконавець \"%s\""
 
-#: postmaster/postmaster.c:2795 postmaster/postmaster.c:2815
-#: postmaster/postmaster.c:2822 postmaster/postmaster.c:2840
-msgid "server process"
-msgstr "процес сервера"
-
-#: postmaster/postmaster.c:2894
+#: postmaster/postmaster.c:2804
 #, 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:3081
+#: postmaster/postmaster.c:2837
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) завершився з кодом виходу %d"
 
-#: postmaster/postmaster.c:3083 postmaster/postmaster.c:3095
-#: postmaster/postmaster.c:3105 postmaster/postmaster.c:3116
+#: postmaster/postmaster.c:2839 postmaster/postmaster.c:2851
+#: postmaster/postmaster.c:2861 postmaster/postmaster.c:2872
 #, 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:3092
+#: postmaster/postmaster.c:2848
 #, 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:3102
+#: postmaster/postmaster.c:2858
 #, 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:3114
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) завершився з нерозпізнаним статусом %d"
 
-#: postmaster/postmaster.c:3330
+#: postmaster/postmaster.c:3161
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "ненормальне завершення роботи системи бази даних"
 
-#: postmaster/postmaster.c:3356
+#: postmaster/postmaster.c:3187
 #, c-format
 msgid "shutting down due to startup process failure"
 msgstr "завершення роботи через помилку в стартовому процесі"
 
-#: postmaster/postmaster.c:3362
+#: postmaster/postmaster.c:3193
 #, c-format
 msgid "shutting down because \"restart_after_crash\" is off"
 msgstr "завершення роботи, тому що \"restart_after_crash\" вимкнено"
 
-#: postmaster/postmaster.c:3374
+#: postmaster/postmaster.c:3205
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "усі серверні процеси перервано; повторна ініціалізація"
 
-#: postmaster/postmaster.c:3573 postmaster/postmaster.c:3983
-#: postmaster/postmaster.c:4372
-#, c-format
-msgid "could not generate random cancel key"
-msgstr "не вдалося згенерувати випадковий ключ скасування"
-
-#: postmaster/postmaster.c:3606
+#: postmaster/postmaster.c:3598
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "не вдалося породити нові процеси для з'єднання: %m"
 
-#: postmaster/postmaster.c:3648
+#: postmaster/postmaster.c:3633
 msgid "could not fork new process for connection: "
 msgstr "не вдалося породити нові процеси для з'єднання: "
 
-#: postmaster/postmaster.c:3682
+#: postmaster/postmaster.c:3667
 #, c-format
-msgid "Please report this to <%s>."
-msgstr "Будь-ласка повідомте про це <%s>."
+msgid "postmaster became multithreaded"
+msgstr "postmaster став багатопотоковим"
 
-#: postmaster/postmaster.c:3750
+#: postmaster/postmaster.c:3745
 #, c-format
 msgid "database system is ready to accept read-only connections"
 msgstr "система бази даних готова до отримання підключення лише для читання"
 
-#: postmaster/postmaster.c:3933
-#, c-format
-msgid "could not fork \"%s\" process: %m"
-msgstr "не вдалося породити процес \"%s\": %m"
-
-#: postmaster/postmaster.c:4171 postmaster/postmaster.c:4205
+#: postmaster/postmaster.c:3846
 #, c-format
-msgid "database connection requirement not indicated during registration"
-msgstr "під час реєстрації не вказувалося, що вимагається підключення до бази даних"
+msgid "WAL was shut down unexpectedly"
+msgstr "WAL було неочікувано вимкнено"
 
-#: postmaster/postmaster.c:4181 postmaster/postmaster.c:4215
+#: postmaster/postmaster.c:3971
 #, c-format
-msgid "invalid processing mode in background worker"
-msgstr "неприпустимий режим обробки у фоновому записі"
+msgid "no slot available for new autovacuum worker process"
+msgstr "немає доступного слоту для нового процесу автоочищення"
 
-#: postmaster/postmaster.c:4275
+#: postmaster/postmaster.c:3986
 #, c-format
-msgid "could not fork background worker process: %m"
-msgstr "не вдалося породити фоновий процес: %m"
+msgid "could not fork \"%s\" process: %m"
+msgstr "не вдалося породити процес \"%s\": %m"
 
-#: postmaster/postmaster.c:4358
+#: postmaster/postmaster.c:4145
 #, c-format
 msgid "no slot available for new background worker process"
 msgstr "немає доступного слоту для нового фонового робочого процесу"
 
-#: postmaster/postmaster.c:4621
+#: postmaster/postmaster.c:4163
+#, c-format
+msgid "could not fork background worker process: %m"
+msgstr "не вдалося породити фоновий процес: %m"
+
+#: postmaster/postmaster.c:4496
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "не вдалося прочитати код завершення процесу\n"
 
-#: postmaster/postmaster.c:4663
+#: postmaster/postmaster.c:4538
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "не вдалося надіслати статус завершення нащадка\n"
 
-#: postmaster/syslogger.c:529 postmaster/syslogger.c:1173
+#: postmaster/syslogger.c:527 postmaster/syslogger.c:1172
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "не вдалося прочитати з каналу журналювання: %m"
 
-#: postmaster/syslogger.c:629 postmaster/syslogger.c:643
+#: postmaster/syslogger.c:626 postmaster/syslogger.c:640
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "не вдалося створити канал для syslog: %m"
 
-#: postmaster/syslogger.c:712
+#: postmaster/syslogger.c:711
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "не вдалося породити процес системного журналювання: %m"
 
-#: postmaster/syslogger.c:731
+#: postmaster/syslogger.c:730
 #, c-format
 msgid "redirecting log output to logging collector process"
 msgstr "переспрямовування виводу в протокол прочесу збирача протоколів"
 
-#: postmaster/syslogger.c:732
+#: postmaster/syslogger.c:731
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
 msgstr "Наступні протоколи будуть виводитись в каталог \"%s\"."
 
-#: postmaster/syslogger.c:740
+#: postmaster/syslogger.c:739
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "не вдалося переспрямувати stdout: %m"
 
-#: postmaster/syslogger.c:745 postmaster/syslogger.c:762
+#: postmaster/syslogger.c:744 postmaster/syslogger.c:761
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "не вдалося переспрямувати stderr: %m"
 
-#: postmaster/syslogger.c:1128
+#: postmaster/syslogger.c:1127
 #, c-format
 msgid "could not write to log file: %m\n"
 msgstr "не вдалося записати до файлу протокола: %m\n"
 
-#: postmaster/syslogger.c:1246
+#: postmaster/syslogger.c:1247
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не вдалося відкрити файл журналу \"%s\": %m"
 
-#: postmaster/syslogger.c:1336
+#: postmaster/syslogger.c:1337
 #, c-format
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "вимкнення автоматичного обертання (щоб повторно ввімкнути, використайте SIGHUP)"
 
-#: postmaster/walsummarizer.c:740
+#: postmaster/walsummarizer.c:743
 #, c-format
 msgid "WAL summarization is not progressing"
 msgstr "Підбиття підсумків WAL не просувається"
 
-#: postmaster/walsummarizer.c:741
+#: postmaster/walsummarizer.c:744
 #, c-format
 msgid "Summarization is needed through %X/%X, but is stuck at %X/%X on disk and %X/%X in memory."
 msgstr "Підсумовування потрібне через %X/%X, але воно застрягло на %X/%X на диску та %X/%X у пам'яті."
 
-#: postmaster/walsummarizer.c:755
+#: postmaster/walsummarizer.c:758
 #, c-format
 msgid "still waiting for WAL summarization through %X/%X after %ld second"
 msgid_plural "still waiting for WAL summarization through %X/%X after %ld seconds"
@@ -19962,27 +20636,27 @@ msgstr[1] "все ще чекає на підбиття підсумків WAL 
 msgstr[2] "все ще чекає на підбиття підсумків WAL через %X/%X через %ld секунд"
 msgstr[3] "все ще чекає на підбиття підсумків WAL через %X/%X через %ld секунд"
 
-#: postmaster/walsummarizer.c:760
+#: postmaster/walsummarizer.c:763
 #, c-format
 msgid "Summarization has reached %X/%X on disk and %X/%X in memory."
 msgstr "Підсумок досягнув %X/%X на диску та %X/%X у пам'яті."
 
-#: postmaster/walsummarizer.c:1000
+#: postmaster/walsummarizer.c:1003
 #, c-format
 msgid "could not find a valid record after %X/%X"
 msgstr "не вдалося знайти припустимий запис після %X/%X"
 
-#: postmaster/walsummarizer.c:1045
+#: postmaster/walsummarizer.c:1048
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X: %s"
 msgstr "не вдалося прочитати WAL з часової шкали %u за адресою %X/%X: %s"
 
-#: postmaster/walsummarizer.c:1051
+#: postmaster/walsummarizer.c:1054
 #, c-format
 msgid "could not read WAL from timeline %u at %X/%X"
 msgstr "не вдалося прочитати WAL з часової шкали %u на %X/%X"
 
-#: regex/regc_pg_locale.c:244
+#: regex/regc_pg_locale.c:241
 #, c-format
 msgid "could not determine which collation to use for regular expression"
 msgstr "не вдалося визначити які параметри сортування використати для регулярного виразу"
@@ -19992,144 +20666,144 @@ msgstr "не вдалося визначити які параметри сор
 msgid "nondeterministic collations are not supported for regular expressions"
 msgstr "недетерміновані правила сортування не підтримуються для регулярних виразів"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:267
-#: replication/libpqwalreceiver/libpqwalreceiver.c:358
+#: replication/libpqwalreceiver/libpqwalreceiver.c:230
+#: replication/libpqwalreceiver/libpqwalreceiver.c:322
 #, c-format
 msgid "password is required"
 msgstr "пароль обов'язковий"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:268
+#: replication/libpqwalreceiver/libpqwalreceiver.c:231
 #, c-format
 msgid "Non-superuser cannot connect if the server does not request a password."
 msgstr "Несуперкористувач не може підключитися, якщо сервер не запитує пароль."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:269
+#: replication/libpqwalreceiver/libpqwalreceiver.c:232
 #, c-format
 msgid "Target server's authentication method must be changed, or set password_required=false in the subscription parameters."
 msgstr "Необхідно змінити метод автентифікації цільового сервера або встановити password_required=false у параметрах підписки."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:285
+#: replication/libpqwalreceiver/libpqwalreceiver.c:249
 #, c-format
 msgid "could not clear search path: %s"
 msgstr "не вдалося очистити шлях пошуку: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:331
-#: replication/libpqwalreceiver/libpqwalreceiver.c:517
+#: replication/libpqwalreceiver/libpqwalreceiver.c:295
+#: replication/libpqwalreceiver/libpqwalreceiver.c:483
 #, c-format
 msgid "invalid connection string syntax: %s"
 msgstr "неприпустимий синтаксис рядка підключення: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:359
+#: replication/libpqwalreceiver/libpqwalreceiver.c:323
 #, c-format
 msgid "Non-superusers must provide a password in the connection string."
 msgstr "Несуперкористувачі повинні вказати пароль для рядка підключення."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
+#: replication/libpqwalreceiver/libpqwalreceiver.c:350
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "не вдалося аналізувати рядок підключення: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:459
+#: replication/libpqwalreceiver/libpqwalreceiver.c:425
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr "не вдалося отримати ідентифікатор системи бази даних та ідентифікатор часової шкали з основного серверу: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:476
-#: replication/libpqwalreceiver/libpqwalreceiver.c:763
+#: replication/libpqwalreceiver/libpqwalreceiver.c:442
+#: replication/libpqwalreceiver/libpqwalreceiver.c:737
 #, c-format
 msgid "invalid response from primary server"
 msgstr "неприпустима відповідь з основного серверу"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:477
+#: replication/libpqwalreceiver/libpqwalreceiver.c:443
 #, c-format
 msgid "Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields."
 msgstr "Не вдалося ідентифікувати систему: отримано %d рядків і %d полів, очікувалось %d рядків і %d або більше полів."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:606
-#: replication/libpqwalreceiver/libpqwalreceiver.c:613
-#: replication/libpqwalreceiver/libpqwalreceiver.c:643
+#: replication/libpqwalreceiver/libpqwalreceiver.c:572
+#: replication/libpqwalreceiver/libpqwalreceiver.c:579
+#: replication/libpqwalreceiver/libpqwalreceiver.c:611
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "не вдалося почати потокове передавання WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:667
+#: replication/libpqwalreceiver/libpqwalreceiver.c:635
 #, c-format
 msgid "could not send end-of-streaming message to primary: %s"
 msgstr "не вдалося передати основному серверу повідомлення про кінець передвання: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:690
+#: replication/libpqwalreceiver/libpqwalreceiver.c:659
 #, c-format
 msgid "unexpected result set after end-of-streaming"
 msgstr "неочікуваний набір результатів після кінця передачі"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:705
+#: replication/libpqwalreceiver/libpqwalreceiver.c:675
 #, c-format
 msgid "error while shutting down streaming COPY: %s"
 msgstr "помилка при завершенні потокового передавання \"копіювати\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:715
+#: replication/libpqwalreceiver/libpqwalreceiver.c:686
 #, c-format
 msgid "error reading result of streaming command: %s"
 msgstr "помилка при читанні результату команди потокового передавання: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:724
-#: replication/libpqwalreceiver/libpqwalreceiver.c:957
+#: replication/libpqwalreceiver/libpqwalreceiver.c:696
+#: replication/libpqwalreceiver/libpqwalreceiver.c:832
 #, c-format
 msgid "unexpected result after CommandComplete: %s"
 msgstr "неочікуваний результат CommandComplete: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:751
+#: replication/libpqwalreceiver/libpqwalreceiver.c:725
 #, c-format
 msgid "could not receive timeline history file from the primary server: %s"
 msgstr "не вдалося отримати файл історії часової шкали з основного сервера: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:764
+#: replication/libpqwalreceiver/libpqwalreceiver.c:738
 #, c-format
 msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
 msgstr "Очікувалося 1 кортеж з 2 поле, отримано %d кортежів з %d полями."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:920
-#: replication/libpqwalreceiver/libpqwalreceiver.c:973
-#: replication/libpqwalreceiver/libpqwalreceiver.c:980
+#: replication/libpqwalreceiver/libpqwalreceiver.c:793
+#: replication/libpqwalreceiver/libpqwalreceiver.c:848
+#: replication/libpqwalreceiver/libpqwalreceiver.c:855
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "не вдалося отримати дані з WAL потоку: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1000
+#: replication/libpqwalreceiver/libpqwalreceiver.c:875
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "не вдалося передати дані потоку WAL: %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1101
+#: replication/libpqwalreceiver/libpqwalreceiver.c:978
 #, c-format
 msgid "could not create replication slot \"%s\": %s"
 msgstr "не вдалося створити слот реплікації \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1140
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1030
 #, c-format
 msgid "could not alter replication slot \"%s\": %s"
 msgstr "не може змінити слот реплікації \"%s\": %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1174
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1064
 #, c-format
 msgid "invalid query response"
 msgstr "неприпустима відповідь на запит"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1065
 #, c-format
 msgid "Expected %d fields, got %d fields."
 msgstr "Очікувалося %d полів, отримано %d полі."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1245
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1135
 #, c-format
 msgid "the query interface requires a database connection"
 msgstr "інтерфейс запитів вимагає підключення до бази даних"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1277
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1169
 msgid "empty query"
 msgstr "пустий запит"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:1283
+#: replication/libpqwalreceiver/libpqwalreceiver.c:1175
 msgid "unexpected pipeline mode"
 msgstr "неочікуваний режим конвеєра"
 
@@ -20143,161 +20817,256 @@ msgstr "завершено логічну реплікацію паралель
 msgid "lost connection to the logical replication apply worker"
 msgstr "втрачено зв'язок з робочим застосунком логічної реплікації"
 
-#: replication/logical/applyparallelworker.c:1024
-#: replication/logical/applyparallelworker.c:1026
+#: replication/logical/applyparallelworker.c:1031
+#: replication/logical/applyparallelworker.c:1033
 msgid "logical replication parallel apply worker"
 msgstr "застосовуючій робочий процес паралельної реплікації"
 
-#: replication/logical/applyparallelworker.c:1040
+#: replication/logical/applyparallelworker.c:1047
 #, c-format
 msgid "logical replication parallel apply worker exited due to error"
 msgstr "паралельний робочий додаток логічнаої реплікації завершив роботу через помилку"
 
-#: replication/logical/applyparallelworker.c:1127
-#: replication/logical/applyparallelworker.c:1300
+#: replication/logical/applyparallelworker.c:1134
+#: replication/logical/applyparallelworker.c:1307
 #, c-format
 msgid "lost connection to the logical replication parallel apply worker"
 msgstr "втрачено зв'язок з паралельним робочим застосунком логічної реплікації"
 
-#: replication/logical/applyparallelworker.c:1180
+#: replication/logical/applyparallelworker.c:1187
 #, c-format
 msgid "could not send data to shared-memory queue"
 msgstr "не вдалося передати дані в чергу в спільну пам'ять"
 
-#: replication/logical/applyparallelworker.c:1215
+#: replication/logical/applyparallelworker.c:1222
 #, c-format
 msgid "logical replication apply worker will serialize the remaining changes of remote transaction %u to a file"
 msgstr "застосовуючий процес логічної реплікації буде серіалізувати зміни, що залишилися віддаленою транзакцією %u до файлу"
 
-#: replication/logical/decode.c:177 replication/logical/logical.c:141
+#: replication/logical/conflict.c:126
+#, c-format
+msgid "conflict detected on relation \"%s.%s\": conflict=%s"
+msgstr "виявлено конфлікт у відношенні \"%s.%s\": конфлікт=%s"
+
+#: replication/logical/conflict.c:223
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified locally in transaction %u at %s."
+msgstr "Ключ вже існує в унікальному індексі \"%s\", змінено локально в транзакції %u в %s."
+
+#: replication/logical/conflict.c:227
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by origin \"%s\" in transaction %u at %s."
+msgstr "Ключ вже існує в унікальному індексі \"%s\", змінено джерелом \"%s\" в транзакції %u в %s."
+
+#: replication/logical/conflict.c:239
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified by a non-existent origin in transaction %u at %s."
+msgstr "Ключ вже існує в унікальному індексі \"%s\", змінено неіснуючим джерелом в транзакції %u в %s."
+
+#: replication/logical/conflict.c:244
+#, c-format
+msgid "Key already exists in unique index \"%s\", modified in transaction %u."
+msgstr "Ключ вже існує в унікальному індексі \"%s\", змінено в транзакції %u."
+
+#: replication/logical/conflict.c:251
+#, c-format
+msgid "Updating the row that was modified locally in transaction %u at %s."
+msgstr "Оновлення рядка, який було змінено локально в транзакції %u в %s."
+
+#: replication/logical/conflict.c:254
+#, c-format
+msgid "Updating the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Оновлення рядка, який був змінено іншим джерелом \"%s\" в транзакції %u в %s."
+
+#: replication/logical/conflict.c:259
+#, c-format
+msgid "Updating the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Оновлення рядка, який був змінено неіснуючим джерелом в транзакції %u в %s."
+
+#: replication/logical/conflict.c:265
+msgid "Could not find the row to be updated."
+msgstr "Не вдалося знайти рядок для оновлення."
+
+#: replication/logical/conflict.c:270
+#, c-format
+msgid "Deleting the row that was modified locally in transaction %u at %s."
+msgstr "Видалення рядка, який був змінено локально в транзакції %u в %s."
+
+#: replication/logical/conflict.c:273
+#, c-format
+msgid "Deleting the row that was modified by a different origin \"%s\" in transaction %u at %s."
+msgstr "Видалення рядка, який був змінено іншим джерелом \"%s\" в транзакції %u в %s."
+
+#: replication/logical/conflict.c:278
+#, c-format
+msgid "Deleting the row that was modified by a non-existent origin in transaction %u at %s."
+msgstr "Видалення рядка, який був змінено неіснуючим джерелом в транзакції %u в %s."
+
+#: replication/logical/conflict.c:284
+msgid "Could not find the row to be deleted."
+msgstr "Не вдалося знайти рядок для видалення."
+
+#: replication/logical/conflict.c:347
+#, c-format
+msgid "Key %s"
+msgstr "Ключ %s"
+
+#: replication/logical/conflict.c:364
+#, c-format
+msgid "existing local row %s"
+msgstr "існуючий локальний рядок %s"
+
+#: replication/logical/conflict.c:369
+#, c-format
+msgid "Existing local row %s"
+msgstr "Існуючий локальний рядок %s"
+
+#: replication/logical/conflict.c:396
+#, c-format
+msgid "remote row %s"
+msgstr "віддалений рядок %s"
+
+#: replication/logical/conflict.c:400
+#, c-format
+msgid "Remote row %s"
+msgstr "Віддалений рядок %s"
+
+#: replication/logical/conflict.c:434
+#, c-format
+msgid "replica identity %s"
+msgstr "ідентифікація репліки %s"
+
+#: replication/logical/conflict.c:435
+#, c-format
+msgid "replica identity full %s"
+msgstr "повна ідентифікація репліки %s"
+
+#: replication/logical/conflict.c:440
+#, c-format
+msgid "Replica identity %s"
+msgstr "Ідентифікація репліки %s"
+
+#: replication/logical/conflict.c:441
+#, c-format
+msgid "Replica identity full %s"
+msgstr "Повна ідентифікація репліки %s"
+
+#: replication/logical/decode.c:177 replication/logical/logical.c:143
 #, c-format
 msgid "logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary"
 msgstr "логічне декодування на standby вимагає \"wal_level\" >= \"logical\" на основному сервері"
 
-#: replication/logical/launcher.c:334
+#: replication/logical/launcher.c:344
 #, c-format
-msgid "cannot start logical replication workers when max_replication_slots = 0"
-msgstr "неможливо почати логічні записи реплікацій, коли max_replication_slots = 0"
+msgid "cannot start logical replication workers when \"max_active_replication_origins\" is 0"
+msgstr "не можна запустити працівників логічної реплікації, коли \"max_active_replication_origins\" дорівнює 0"
 
-#: replication/logical/launcher.c:427
+#: replication/logical/launcher.c:437
 #, c-format
 msgid "out of logical replication worker slots"
 msgstr "недостатньо слотів для процесів логічної реплікації"
 
-#: replication/logical/launcher.c:428 replication/logical/launcher.c:514
-#: replication/slot.c:1524 storage/lmgr/lock.c:985 storage/lmgr/lock.c:1023
-#: storage/lmgr/lock.c:2826 storage/lmgr/lock.c:4211 storage/lmgr/lock.c:4276
-#: storage/lmgr/lock.c:4626 storage/lmgr/predicate.c:2464
-#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:3876
+#. translator: %s is a GUC variable name
+#: replication/logical/launcher.c:438 replication/logical/launcher.c:524
+#: replication/slot.c:1666 replication/slot.c:1686 storage/lmgr/lock.c:1042
+#: storage/lmgr/lock.c:1080 storage/lmgr/lock.c:2969 storage/lmgr/lock.c:4374
+#: storage/lmgr/lock.c:4439 storage/lmgr/lock.c:4789
+#: storage/lmgr/predicate.c:2479 storage/lmgr/predicate.c:2494
+#: storage/lmgr/predicate.c:3891
 #, c-format
 msgid "You might need to increase \"%s\"."
 msgstr "Можливо, вам слід збільшити \"%s\"."
 
-#: replication/logical/launcher.c:513
+#: replication/logical/launcher.c:523
 #, c-format
 msgid "out of background worker slots"
 msgstr "недостатньо слотів для фонових робочих процесів"
 
-#: replication/logical/launcher.c:720
+#: replication/logical/launcher.c:730
 #, c-format
 msgid "logical replication worker slot %d is empty, cannot attach"
 msgstr "слот запису логічної реплікації %d пустий, неможливо підключитися"
 
-#: replication/logical/launcher.c:729
+#: replication/logical/launcher.c:739
 #, c-format
 msgid "logical replication worker slot %d is already used by another worker, cannot attach"
 msgstr "слот запису логічної реплікації %d вже використовується іншим виконавцем, неможливо підключитися"
 
-#: replication/logical/logical.c:121
+#: replication/logical/logical.c:123
 #, c-format
 msgid "logical decoding requires \"wal_level\" >= \"logical\""
 msgstr "логічне декодування вимагає \"wal_level\" >= logical\""
 
-#: replication/logical/logical.c:126
+#: replication/logical/logical.c:128
 #, c-format
 msgid "logical decoding requires a database connection"
 msgstr "логічне декодування вимагає підключення до бази даних"
 
-#: replication/logical/logical.c:365 replication/logical/logical.c:519
+#: replication/logical/logical.c:367 replication/logical/logical.c:523
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "неможливо використовувати слот невідповідної реплікації для логічного кодування"
 
-#: replication/logical/logical.c:370 replication/logical/logical.c:529
+#: replication/logical/logical.c:372 replication/logical/logical.c:533
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "слот реплікації \"%s\" був створений не в цій базі даних"
 
-#: replication/logical/logical.c:377
+#: replication/logical/logical.c:379
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "неможливо створити слот логічної реплікації у транзакції, що виконує записування"
 
-#: replication/logical/logical.c:540
+#: replication/logical/logical.c:544
 #, c-format
 msgid "cannot use replication slot \"%s\" for logical decoding"
 msgstr "не може використовувати слот реплікації \"%s\" для логічного декодування"
 
-#: replication/logical/logical.c:542 replication/slot.c:798
-#: replication/slot.c:829
+#: replication/logical/logical.c:546 replication/slot.c:864
+#: replication/slot.c:899
 #, c-format
 msgid "This replication slot is being synchronized from the primary server."
 msgstr "Цей слот реплікації синхронізується з основного сервера."
 
-#: replication/logical/logical.c:543
+#: replication/logical/logical.c:547
 #, c-format
 msgid "Specify another replication slot."
 msgstr "Вкажіть інший слот реплікації."
 
-#: replication/logical/logical.c:554 replication/logical/logical.c:561
-#, c-format
-msgid "can no longer get changes from replication slot \"%s\""
-msgstr "більше не можна отримувати зміни з слоту реплікації \"%s\""
-
-#: replication/logical/logical.c:556
-#, c-format
-msgid "This slot has been invalidated because it exceeded the maximum reserved size."
-msgstr "Цей слот визнано недійсним, тому що він перевищив максимально зарезервований розмір."
-
-#: replication/logical/logical.c:563
-#, c-format
-msgid "This slot has been invalidated because it was conflicting with recovery."
-msgstr "Цей слот було скасовано, оскільки він суперечив відновленню."
-
-#: replication/logical/logical.c:628
+#: replication/logical/logical.c:613
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "початок логічного декодування для слоту \"%s\""
 
-#: replication/logical/logical.c:630
+#: replication/logical/logical.c:615
 #, c-format
 msgid "Streaming transactions committing after %X/%X, reading WAL from %X/%X."
 msgstr "Потокове передавання транзакцій, що затверджені, після %X/%X, читання WAL з %X/%X."
 
-#: replication/logical/logical.c:778
+#: replication/logical/logical.c:763
 #, 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:784
+#: replication/logical/logical.c:769
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "слот \"%s\", плагін виходу \"%s\", у зворотньому виклику %s"
 
-#: replication/logical/logical.c:955 replication/logical/logical.c:1000
-#: replication/logical/logical.c:1045 replication/logical/logical.c:1091
+#: replication/logical/logical.c:940 replication/logical/logical.c:985
+#: replication/logical/logical.c:1030 replication/logical/logical.c:1076
 #, c-format
 msgid "logical replication at prepare time requires a %s callback"
 msgstr "логічна реплікація під час підготовки потребує %s зворотнього виклику"
 
-#: replication/logical/logical.c:1323 replication/logical/logical.c:1372
-#: replication/logical/logical.c:1413 replication/logical/logical.c:1499
-#: replication/logical/logical.c:1548
+#: replication/logical/logical.c:1308 replication/logical/logical.c:1357
+#: replication/logical/logical.c:1398 replication/logical/logical.c:1484
+#: replication/logical/logical.c:1533
 #, c-format
 msgid "logical streaming requires a %s callback"
 msgstr "логічне потокове передавання потребує %s зворотнього виклику"
 
-#: replication/logical/logical.c:1458
+#: replication/logical/logical.c:1443
 #, c-format
 msgid "logical streaming at prepare time requires a %s callback"
 msgstr "логічне потокове передавання під час підготовки потребує %s зворотнього виклику"
@@ -20322,7 +21091,7 @@ msgstr "масив має бути одновимірним"
 msgid "array must not contain nulls"
 msgstr "масив не має включати nulls"
 
-#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1420
+#: replication/logical/logicalfuncs.c:177 utils/adt/json.c:1428
 #: utils/adt/jsonb.c:1304
 #, c-format
 msgid "array must have even number of elements"
@@ -20333,104 +21102,112 @@ msgstr "масив повинен мати парну кількість еле
 msgid "logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data"
 msgstr "плагін виходу логічного декодування \"%s\" виробляє бінарний вихід, але функція \"%s\" очікує текстові дані"
 
-#: replication/logical/origin.c:190
+#: replication/logical/origin.c:195
 #, c-format
-msgid "cannot query or manipulate replication origin when \"max_replication_slots\" is 0"
-msgstr "неможливо надіслати запит або маніпулювати джерелами реплікації, коли \"max_replication_slots\" = 0"
+msgid "cannot query or manipulate replication origin when \"max_active_replication_origins\" is 0"
+msgstr "не можна запитувати або маніпулювати джерелом реплікації, коли \"max_active_replication_origins\" дорівнює 0"
 
-#: replication/logical/origin.c:195
+#: replication/logical/origin.c:200
 #, c-format
 msgid "cannot manipulate replication origins during recovery"
 msgstr "неможливо маніпулювати джерелами реплікації під час відновлення"
 
-#: replication/logical/origin.c:240
+#: replication/logical/origin.c:245
 #, c-format
 msgid "replication origin \"%s\" does not exist"
 msgstr "джерело реплікації \"%s\" не існує"
 
-#: replication/logical/origin.c:331
+#: replication/logical/origin.c:275
+#, c-format
+msgid "replication origin name is too long"
+msgstr "назва джерела реплікації занадто довга"
+
+#: replication/logical/origin.c:276
+#, c-format
+msgid "Replication origin names must be no longer than %d bytes."
+msgstr "Назви джерел реплікації мають бути не довшими ніж %d байт."
+
+#: replication/logical/origin.c:359
 #, c-format
 msgid "could not find free replication origin ID"
 msgstr "не вдалося знайти вільний ідентифікатор ID джерела реплікації"
 
-#: replication/logical/origin.c:365
+#: replication/logical/origin.c:393
 #, c-format
 msgid "could not drop replication origin with ID %d, in use by PID %d"
 msgstr "не вдалося розірвати джерело реплікації з ідентифікатором ID %d, використовується PID %d"
 
-#: replication/logical/origin.c:492
+#: replication/logical/origin.c:520
 #, c-format
 msgid "replication origin with ID %d does not exist"
 msgstr "джерело реплікації з ідентифікатором ID %d не існує"
 
-#: replication/logical/origin.c:757
+#: replication/logical/origin.c:780
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "контрольна точка реплікації має неправильну сигнатуру %u замість %u"
 
-#: replication/logical/origin.c:798
+#: replication/logical/origin.c:821
 #, c-format
-msgid "could not find free replication state, increase \"max_replication_slots\""
-msgstr "не вдалося знайти вільний слот для стану реплікації, збільшіть \"max_replication_slots\""
+msgid "could not find free replication state, increase \"max_active_replication_origins\""
+msgstr "не вдалося знайти вільний стан реплікації, збільште \"max_active_replication_origins\""
 
-#: replication/logical/origin.c:806
+#: replication/logical/origin.c:829
 #, c-format
 msgid "recovered replication state of node %d to %X/%X"
 msgstr "відновлений стан реплікації вузла %d в %X/%X"
 
-#: replication/logical/origin.c:816
+#: replication/logical/origin.c:839
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "неправильна контрольна сума файлу контрольної точки для слота реплікації %u, очікувалось %u"
 
-#: replication/logical/origin.c:944 replication/logical/origin.c:1143
+#: replication/logical/origin.c:967 replication/logical/origin.c:1166
 #, c-format
 msgid "replication origin with ID %d is already active for PID %d"
 msgstr "джерело реплікації з ID %d вже активний для PID %d"
 
-#: replication/logical/origin.c:955 replication/logical/origin.c:1156
+#: replication/logical/origin.c:978 replication/logical/origin.c:1179
 #, c-format
 msgid "could not find free replication state slot for replication origin with ID %d"
 msgstr "не вдалося знайти вільний слот стану реплікації для джерела реплікації з ID %d"
 
-#: replication/logical/origin.c:957 replication/logical/origin.c:1158
-#: replication/slot.c:2384
+#: replication/logical/origin.c:980 replication/logical/origin.c:1181
 #, c-format
-msgid "Increase \"max_replication_slots\" and try again."
-msgstr "Збільшіть \"max_replication_slots\" і спробуйте знову."
+msgid "Increase \"max_active_replication_origins\" and try again."
+msgstr "Збільшіть \"max_active_replication_origins\" та спробуйте знову."
 
-#: replication/logical/origin.c:1114
+#: replication/logical/origin.c:1137
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "не можна налаштувати джерело реплікації, коли один вже налаштований"
 
-#: replication/logical/origin.c:1199 replication/logical/origin.c:1415
-#: replication/logical/origin.c:1435
+#: replication/logical/origin.c:1222 replication/logical/origin.c:1438
+#: replication/logical/origin.c:1458
 #, c-format
 msgid "no replication origin is configured"
 msgstr "жодне джерело реплікації не налаштоване"
 
-#: replication/logical/origin.c:1285
+#: replication/logical/origin.c:1308
 #, c-format
 msgid "replication origin name \"%s\" is reserved"
 msgstr "назва джерела реплікації \"%s\" зарезервована"
 
-#: replication/logical/origin.c:1287
+#: replication/logical/origin.c:1310
 #, c-format
 msgid "Origin names \"%s\", \"%s\", and names starting with \"pg_\" are reserved."
 msgstr "Імена походженням \"%s\", \"%s\" та імена, що починаються з \"pg_\", є зарезервованими."
 
-#: replication/logical/relation.c:242
+#: replication/logical/relation.c:241
+msgid ", "
+msgstr ", "
+
+#: replication/logical/relation.c:243
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: replication/logical/relation.c:245
-#, c-format
-msgid ", \"%s\""
-msgstr ", \"%s\""
-
-#: replication/logical/relation.c:251
+#: replication/logical/relation.c:262
 #, c-format
 msgid "logical replication target relation \"%s.%s\" is missing replicated column: %s"
 msgid_plural "logical replication target relation \"%s.%s\" is missing replicated columns: %s"
@@ -20439,105 +21216,109 @@ msgstr[1] "в цільовому відношенні логічної репл
 msgstr[2] "в цільовому відношенні логічної реплікації \"%s.%s\" пропущено репліковані стовпці: %s"
 msgstr[3] "в цільовому відношенні логічної реплікації \"%s.%s\" пропущено репліковані стовпці: %s"
 
-#: replication/logical/relation.c:306
+#: replication/logical/relation.c:273
+#, c-format
+msgid "logical replication target relation \"%s.%s\" has incompatible generated column: %s"
+msgid_plural "logical replication target relation \"%s.%s\" has incompatible generated columns: %s"
+msgstr[0] "цільове відношення логічної реплікації \"%s.%s\" містить несумісний згенерований стовпець: %s"
+msgstr[1] "цільове відношення логічної реплікації \"%s.%s\" містить несумісні згенеровані стовпці: %s"
+msgstr[2] "цільове відношення логічної реплікації \"%s.%s\" містить несумісні згенеровані стовпці: %s"
+msgstr[3] "цільове відношення логічної реплікації \"%s.%s\" містить несумісні згенеровані стовпці: %s"
+
+#: replication/logical/relation.c:328
 #, c-format
 msgid "logical replication target relation \"%s.%s\" uses system columns in REPLICA IDENTITY index"
 msgstr "в цільовому відношенні логічної реплікації \"%s.%s\" в індексі REPLICA IDENTITY використовуються системні стовпці"
 
-#: replication/logical/relation.c:398
+#: replication/logical/relation.c:421
 #, c-format
 msgid "logical replication target relation \"%s.%s\" does not exist"
 msgstr "цільове відношення логічної реплікації \"%s.%s\" не існує"
 
-#: replication/logical/reorderbuffer.c:3994
+#: replication/logical/reorderbuffer.c:4252
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "не вдалося записати у файл даних для XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:4340
-#: replication/logical/reorderbuffer.c:4365
+#: replication/logical/reorderbuffer.c:4598
+#: replication/logical/reorderbuffer.c:4623
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "не вдалося прочитати з файлу розгортання буферу пересортування: %m"
 
-#: replication/logical/reorderbuffer.c:4344
-#: replication/logical/reorderbuffer.c:4369
+#: replication/logical/reorderbuffer.c:4602
+#: replication/logical/reorderbuffer.c:4627
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "не вдалося прочитати з файлу розгортання буферу пересортування: прочитано %d замість %u байт"
 
-#: replication/logical/reorderbuffer.c:4619
+#: replication/logical/reorderbuffer.c:4876
 #, c-format
-msgid "could not remove file \"%s\" during removal of pg_replslot/%s/xid*: %m"
-msgstr "не вдалося видалити файл \"%s\" під час видалення pg_replslot/%s/xid*: %m"
+msgid "could not remove file \"%s\" during removal of %s/%s/xid*: %m"
+msgstr "не вдалося видалити файл \"%s\" під час видалення %s/%s/xid*: %m"
 
-#: replication/logical/reorderbuffer.c:5115
+#: replication/logical/reorderbuffer.c:5373
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "не вдалося прочитати з файлу \"%s\": прочитано %d замість %d байт"
 
-#: replication/logical/slotsync.c:215
+#: replication/logical/slotsync.c:214 replication/logical/slotsync.c:595
 #, c-format
-msgid "could not synchronize replication slot \"%s\" because remote slot precedes local slot"
-msgstr "не вдалося синхронізувати слот реплікації \"%s\", оскільки віддалений слот передує локальному"
+msgid "could not synchronize replication slot \"%s\""
+msgstr "не вдалося синхронізувати слот реплікації \"%s\""
 
-#: replication/logical/slotsync.c:217
+#: replication/logical/slotsync.c:216
 #, c-format
-msgid "The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u."
-msgstr "Віддалений слот має LSN %X/%X і каталог xmin %u, а локальний слот має LSN %X/%X і каталог xmin %u."
+msgid "Synchronization could lead to data loss, because the remote slot needs WAL at LSN %X/%X and catalog xmin %u, but the standby has LSN %X/%X and catalog xmin %u."
+msgstr "Синхронізація може призвести до втрати даних, оскільки для віддаленого слоту потрібно мати WAL в LSN %X/%X та каталог xmin %u, але резервний сервер має LSN %X/%X і каталог xmin %u."
 
-#: replication/logical/slotsync.c:459
+#: replication/logical/slotsync.c:475
 #, c-format
 msgid "dropped replication slot \"%s\" of database with OID %u"
 msgstr "видалено слот реплікації \"%s\" бази даних з OID %u"
 
-#: replication/logical/slotsync.c:579
-#, c-format
-msgid "could not synchronize replication slot \"%s\""
-msgstr "не вдалося синхронізувати слот реплікації \"%s\""
-
-#: replication/logical/slotsync.c:580
+#: replication/logical/slotsync.c:596
 #, c-format
-msgid "Logical decoding could not find consistent point from local slot's LSN %X/%X."
-msgstr "Логічне декодування не може знайти стійку точку з локальних LSN %X/%X."
+msgid "Synchronization could lead to data loss, because the standby could not build a consistent snapshot to decode WALs at LSN %X/%X."
+msgstr "Синхронізація може призвести до втрати даних, так як резервний сервер не зміг створити узгоджений знімок для декодування LSN %X/%X."
 
-#: replication/logical/slotsync.c:589
+#: replication/logical/slotsync.c:605
 #, c-format
 msgid "newly created replication slot \"%s\" is sync-ready now"
 msgstr "новостворений слот реплікації \"%s\" готовий до синхронізації"
 
-#: replication/logical/slotsync.c:628
+#: replication/logical/slotsync.c:644
 #, c-format
 msgid "skipping slot synchronization because the received slot sync LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X"
 msgstr "пропуск синхронізації слотів, оскільки отримана синхронізація слотів LSN %X/%X для слота \"%s\" випереджає позицію очікування %X/%X"
 
-#: replication/logical/slotsync.c:650
+#: replication/logical/slotsync.c:666
 #, c-format
 msgid "exiting from slot synchronization because same name slot \"%s\" already exists on the standby"
 msgstr "вихід із синхронізації слотів, оскільки однойменний слот \"%s\" вже існує у режимі очікування"
 
-#: replication/logical/slotsync.c:819
+#: replication/logical/slotsync.c:837
 #, c-format
 msgid "could not fetch failover logical slots info from the primary server: %s"
 msgstr "не вдалося отримати інформацію про логічні слоти обходу відмови з основного сервера: %s"
 
-#: replication/logical/slotsync.c:965
+#: replication/logical/slotsync.c:986
 #, c-format
-msgid "could not fetch primary_slot_name \"%s\" info from the primary server: %s"
-msgstr "не вдалося отримати інформацію primary_slot_name \"%s\" з первинного сервера: %s"
+msgid "could not fetch primary slot name \"%s\" info from the primary server: %s"
+msgstr "не вдалося отримати інформацію про слот первинного сервера \"%s\" з первинного сервера: %s"
 
-#: replication/logical/slotsync.c:967
+#: replication/logical/slotsync.c:988
 #, c-format
-msgid "Check if primary_slot_name is configured correctly."
-msgstr "Перевірте, чи правильно налаштовано primary_slot_name."
+msgid "Check if \"primary_slot_name\" is configured correctly."
+msgstr "Перевірте, чи \"primary_slot_name\" налаштовано правильно."
 
-#: replication/logical/slotsync.c:987
+#: replication/logical/slotsync.c:1008
 #, c-format
 msgid "cannot synchronize replication slots from a standby server"
 msgstr "не вдається синхронізувати слоти реплікації з резервного сервера"
 
 #. translator: second %s is a GUC variable name
-#: replication/logical/slotsync.c:996
+#: replication/logical/slotsync.c:1017
 #, c-format
 msgid "replication slot \"%s\" specified by \"%s\" does not exist on primary server"
 msgstr "слот реплікації \"%s\", на який вказує \"%s\", не існує на основному сервері"
@@ -20545,71 +21326,70 @@ msgstr "слот реплікації \"%s\", на який вказує \"%s\",
 #. translator: first %s is a connection option; second %s is a GUC
 #. variable name
 #.
-#: replication/logical/slotsync.c:1029
+#: replication/logical/slotsync.c:1050
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be specified in \"%s\""
 msgstr "для синхронізації слотів реплікації потрібно, щоб \"%s\" було вказано у \"%s\""
 
-#: replication/logical/slotsync.c:1050
+#: replication/logical/slotsync.c:1069
 #, c-format
 msgid "replication slot synchronization requires \"wal_level\" >= \"logical\""
 msgstr "синхронізація слотів вимагає \"wal_level\" >= \"logical\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1063 replication/logical/slotsync.c:1091
+#: replication/logical/slotsync.c:1084 replication/logical/slotsync.c:1112
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be set"
 msgstr "для синхронізації слотів реплікації потрібно, щоб було вказано \"%s\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1077
+#: replication/logical/slotsync.c:1098
 #, c-format
 msgid "replication slot synchronization requires \"%s\" to be enabled"
 msgstr "синхронізація слотів реплікації потребує ввімкнення \"%s\""
 
 #. translator: %s is a GUC variable name
-#: replication/logical/slotsync.c:1129
+#: replication/logical/slotsync.c:1150
 #, c-format
 msgid "replication slot synchronization worker will shut down because \"%s\" is disabled"
 msgstr "процес синхронизації слотів реплікації буде вимкнутий, тому що \"%s\" відключено"
 
-#: replication/logical/slotsync.c:1138
+#: replication/logical/slotsync.c:1159
 #, c-format
 msgid "replication slot synchronization worker will restart because of a parameter change"
 msgstr "процес синхронізації слотів реплікації буде перезавантажений через зміну параметра"
 
-#: replication/logical/slotsync.c:1162
+#: replication/logical/slotsync.c:1183
 #, c-format
-msgid "replication slot synchronization worker is shutting down on receiving SIGINT"
-msgstr "процес синхронізації слотів реплікації буде вимкнуто через отримання повідомлення SIGINT"
+msgid "replication slot synchronization worker is shutting down because promotion is triggered"
+msgstr "процес синхронизації слотів реплікації буде вимкнутий, тому що запущено підвищення"
 
-#: replication/logical/slotsync.c:1287
+#: replication/logical/slotsync.c:1308
 #, c-format
 msgid "cannot synchronize replication slots when standby promotion is ongoing"
 msgstr "неможливо синхронізувати слоти реплікації під час підвищення резервного сервера"
 
-#: replication/logical/slotsync.c:1295
+#: replication/logical/slotsync.c:1316
 #, c-format
 msgid "cannot synchronize replication slots concurrently"
 msgstr "не може синхронізувати слоти реплікації одночасно"
 
-#: replication/logical/slotsync.c:1403
+#: replication/logical/slotsync.c:1424
 #, c-format
 msgid "slot sync worker started"
 msgstr "запущено працівника синхронізації слотів"
 
-#: replication/logical/slotsync.c:1466 replication/slotfuncs.c:900
-#: replication/walreceiver.c:307
+#: replication/logical/slotsync.c:1486 replication/slotfuncs.c:928
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "не вдалося підключитися до основного серверу: %s"
+msgid "synchronization worker \"%s\" could not connect to the primary server: %s"
+msgstr "працівник синхронізації \"%s\" не зміг підключитися до основного сервера: %s"
 
-#: replication/logical/snapbuild.c:653
+#: replication/logical/snapbuild.c:514
 #, c-format
 msgid "initial slot snapshot too large"
 msgstr "початковий знімок слота занадто великий"
 
-#: replication/logical/snapbuild.c:707
+#: replication/logical/snapbuild.c:568
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
@@ -20618,860 +21398,920 @@ msgstr[1] "експортовано знімок логічного декоду
 msgstr[2] "експортовано знімок логічного декодування \"%s\" з %u ID транзакціями"
 msgstr[3] "експортовано знімок логічного декодування \"%s\" з %u ID транзакціями"
 
-#: replication/logical/snapbuild.c:1404 replication/logical/snapbuild.c:1501
-#: replication/logical/snapbuild.c:2017
+#: replication/logical/snapbuild.c:1313 replication/logical/snapbuild.c:1410
+#: replication/logical/snapbuild.c:1916
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "узгодження процесу логічного кодування знайдено в точці %X/%X"
 
-#: replication/logical/snapbuild.c:1406
+#: replication/logical/snapbuild.c:1315
 #, c-format
 msgid "There are no running transactions."
 msgstr "Більше активних транзакцій немає."
 
-#: replication/logical/snapbuild.c:1453
+#: replication/logical/snapbuild.c:1362
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "початкова стартова точка процесу логічного декодування знайдена в точці %X/%X"
 
-#: replication/logical/snapbuild.c:1455 replication/logical/snapbuild.c:1479
+#: replication/logical/snapbuild.c:1364 replication/logical/snapbuild.c:1388
 #, c-format
 msgid "Waiting for transactions (approximately %d) older than %u to end."
 msgstr "Очікування транзакцій (приблизно %d) старіше, ніж %u до кінця."
 
-#: replication/logical/snapbuild.c:1477
+#: replication/logical/snapbuild.c:1386
 #, c-format
 msgid "logical decoding found initial consistent point at %X/%X"
 msgstr "початкова точка узгодження процесу логічного кодування знайдена в точці %X/%X"
 
-#: replication/logical/snapbuild.c:1503
+#: replication/logical/snapbuild.c:1412
 #, c-format
 msgid "There are no old transactions anymore."
 msgstr "Більше старих транзакцій немає."
 
-#: replication/logical/snapbuild.c:1904
+#: replication/logical/snapbuild.c:1783
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "файл стану snapbuild \"%s\" має неправильне магічне число: %u замість %u"
 
-#: replication/logical/snapbuild.c:1910
+#: replication/logical/snapbuild.c:1789
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr "файл стану snapbuild \"%s\" має непідтримуючу версію: %u замість %u"
 
-#: replication/logical/snapbuild.c:1951
+#: replication/logical/snapbuild.c:1830
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr "у файлі стану snapbuild \"%s\" невідповідність контрольної суми: %u, повинно бути %u"
 
-#: replication/logical/snapbuild.c:2019
+#: replication/logical/snapbuild.c:1918
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Логічне декодування почнеться зі збереженого знімку."
 
-#: replication/logical/snapbuild.c:2126
+#: replication/logical/snapbuild.c:2025
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "не вдалося аналізувати ім'я файлу \"%s\""
 
-#: replication/logical/tablesync.c:161
+#: replication/logical/tablesync.c:160
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has finished"
 msgstr "процес синхронізації таблиці при логічній реплікації для підписки \"%s\", таблиці \"%s\" закінчив обробку"
 
-#: replication/logical/tablesync.c:641
+#: replication/logical/tablesync.c:669
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" will restart so that two_phase can be enabled"
 msgstr "застосовуючий процес логічної реплікації для підписки \"%s\" буде перезавантажено, щоб можна було активувати two_phase"
 
-#: replication/logical/tablesync.c:827 replication/logical/tablesync.c:969
+#: replication/logical/tablesync.c:859 replication/logical/tablesync.c:1000
 #, c-format
 msgid "could not fetch table info for table \"%s.%s\" from publisher: %s"
 msgstr "не вдалося отримати інформацію про таблицю \"%s.%s\" з серверу публікації: %s"
 
-#: replication/logical/tablesync.c:834
+#: replication/logical/tablesync.c:866
 #, c-format
 msgid "table \"%s.%s\" not found on publisher"
 msgstr "таблиця \"%s.%s\" не знайдена на сервері публікації"
 
-#: replication/logical/tablesync.c:892
+#: replication/logical/tablesync.c:919
 #, c-format
 msgid "could not fetch column list info for table \"%s.%s\" from publisher: %s"
 msgstr "не вдалося отримати інформацію про список стовпців для таблиці \"%s.%s\" з серверу публікації: %s"
 
-#: replication/logical/tablesync.c:1071
+#: replication/logical/tablesync.c:1098
 #, c-format
 msgid "could not fetch table WHERE clause info for table \"%s.%s\" from publisher: %s"
 msgstr "не вдалося отримати інформацію про вираз WHERE для таблиці \"%s.%s\" з серверу публікації: %s"
 
-#: replication/logical/tablesync.c:1230
+#: replication/logical/tablesync.c:1265
 #, c-format
 msgid "could not start initial contents copy for table \"%s.%s\": %s"
 msgstr "не вдалося почати копіювання початкового змісту таблиці \"%s.%s\": %s"
 
-#: replication/logical/tablesync.c:1429
+#: replication/logical/tablesync.c:1380
 #, c-format
-msgid "table copy could not start transaction on publisher: %s"
-msgstr "копії таблиці не вдалося запустити транзакцію на сервері публікації: %s"
+msgid "table synchronization worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "працівник синхронізації таблиць для підписки \"%s\" не зміг підключитися до видавця: %s"
 
-#: replication/logical/tablesync.c:1472
+#: replication/logical/tablesync.c:1480
 #, c-format
-msgid "replication origin \"%s\" already exists"
-msgstr "джерело реплікації \"%s\" вже існує"
+msgid "table copy could not start transaction on publisher: %s"
+msgstr "копії таблиці не вдалося запустити транзакцію на сервері публікації: %s"
 
-#: replication/logical/tablesync.c:1505 replication/logical/worker.c:2361
+#: replication/logical/tablesync.c:1540 replication/logical/worker.c:2378
 #, c-format
 msgid "user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\""
 msgstr "користувач \"%s\" не може реплікувати у відношення з увімкненим захистом на рівні рядків: \"%s\""
 
-#: replication/logical/tablesync.c:1518
+#: replication/logical/tablesync.c:1553
 #, c-format
 msgid "table copy could not finish transaction on publisher: %s"
 msgstr "копії таблиці не вдалося завершити транзакцію на сервері публікації: %s"
 
-#: replication/logical/worker.c:481
+#: replication/logical/worker.c:474
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop"
 msgstr "застосовуючий процес логічної реплікації для підписки \"%s\" буде зупинено"
 
-#: replication/logical/worker.c:483
+#: replication/logical/worker.c:476
 #, c-format
 msgid "Cannot handle streamed replication transactions using parallel apply workers until all tables have been synchronized."
 msgstr "Неможливо обробляти транзакції потокової реплікації з використанням паралельних застосовуючих працівників, доки не буде синхронізовано всі таблиці."
 
-#: replication/logical/worker.c:852 replication/logical/worker.c:967
+#: replication/logical/worker.c:846 replication/logical/worker.c:961
 #, c-format
 msgid "incorrect binary data format in logical replication column %d"
 msgstr "невірний формат двійкових даних в стовпці логічної реплікації %d"
 
-#: replication/logical/worker.c:2500
+#: replication/logical/worker.c:2525
 #, c-format
 msgid "publisher did not send replica identity column expected by the logical replication target relation \"%s.%s\""
 msgstr "сервер публікації не передав стовпець ідентифікації репліки очікуваний для цільового зв'язку логічної реплікації \"%s.%s\""
 
-#: replication/logical/worker.c:2507
+#: replication/logical/worker.c:2532
 #, c-format
 msgid "logical replication target relation \"%s.%s\" has neither REPLICA IDENTITY index nor PRIMARY KEY and published relation does not have REPLICA IDENTITY FULL"
 msgstr "в цільовому зв'язку логічної реплікації \"%s.%s\" немає ні індексу REPLICA IDENTITY, ні ключа PRIMARY KEY і публіковаий зв'язок не має REPLICA IDENTITY FULL"
 
-#: replication/logical/worker.c:3371
+#: replication/logical/worker.c:3467
 #, c-format
 msgid "invalid logical replication message type \"??? (%d)\""
 msgstr "неприпустимий тип повідомлення логічної реплікації \"??? (%d)\""
 
-#: replication/logical/worker.c:3543
+#: replication/logical/worker.c:3639
 #, c-format
 msgid "data stream from publisher has ended"
 msgstr "потік даних з серверу публікації завершився"
 
-#: replication/logical/worker.c:3697
+#: replication/logical/worker.c:3793
 #, c-format
 msgid "terminating logical replication worker due to timeout"
 msgstr "завершення процесу логічної реплікації через тайм-аут"
 
-#: replication/logical/worker.c:3891
+#: replication/logical/worker.c:3990
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was removed"
 msgstr "процес логічної реплікації для підписки \"%s\" буде зупинено, тому, що підписка була видалена"
 
-#: replication/logical/worker.c:3905
+#: replication/logical/worker.c:4004
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will stop because the subscription was disabled"
 msgstr "процес логічної реплікації для підписки \"%s\" буде зупинено, тому, що підписка була вимкнута"
 
-#: replication/logical/worker.c:3936
+#: replication/logical/worker.c:4035
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because of a parameter change"
 msgstr "процес, що застосовує паралельну логічну реплікацію для підписки \"%s\", буде зупинено через зміну параметру"
 
-#: replication/logical/worker.c:3940
+#: replication/logical/worker.c:4039
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because of a parameter change"
 msgstr "процес логічної реплікації для підписки \"%s\", буде перезавантажено через зміну параметру"
 
-#: replication/logical/worker.c:3954
+#: replication/logical/worker.c:4053
 #, c-format
 msgid "logical replication parallel apply worker for subscription \"%s\" will stop because the subscription owner's superuser privileges have been revoked"
 msgstr "логічна реплікація паралельного аплікатора для підписки \"%s\" буде зупинена, оскільки права суперкористувача власника підписки було відкликано"
 
-#: replication/logical/worker.c:3958
+#: replication/logical/worker.c:4057
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will restart because the subscription owner's superuser privileges have been revoked"
 msgstr "працівник логічної реплікації для підписки \"%s\" буде перезапущено, оскільки права суперкористувача власника підписки було відкликано"
 
-#: replication/logical/worker.c:4478
+#: replication/logical/worker.c:4567
 #, c-format
 msgid "subscription has no replication slot set"
 msgstr "для підписки не встановлений слот реплікації"
 
-#: replication/logical/worker.c:4591
+#: replication/logical/worker.c:4592
+#, c-format
+msgid "apply worker for subscription \"%s\" could not connect to the publisher: %s"
+msgstr "працівник застосування для підписки \"%s\" не зміг підключитися до видавця: %s"
+
+#: replication/logical/worker.c:4696
 #, c-format
 msgid "logical replication worker for subscription %u will not start because the subscription was removed during startup"
 msgstr "процес логічної реплікації для підписки %u не буде почато, тому, що підписка була видалена під час запуску"
 
-#: replication/logical/worker.c:4607
+#: replication/logical/worker.c:4712
 #, c-format
 msgid "logical replication worker for subscription \"%s\" will not start because the subscription was disabled during startup"
 msgstr "процес логічної реплікації для підписки \"%s\" не буде почато, тому, що підписка була вимкнута під час запуску"
 
-#: replication/logical/worker.c:4631
+#: replication/logical/worker.c:4736
 #, c-format
 msgid "logical replication table synchronization worker for subscription \"%s\", table \"%s\" has started"
 msgstr "просец синхронізації таблиці під час логічної реплікації для підписки \"%s\", таблиці \"%s\" запущений"
 
-#: replication/logical/worker.c:4636
+#: replication/logical/worker.c:4741
 #, c-format
 msgid "logical replication apply worker for subscription \"%s\" has started"
 msgstr "застосовуючий процес логічної реплікації для підписки \"%s\" запущений"
 
-#: replication/logical/worker.c:4758
+#: replication/logical/worker.c:4875
 #, c-format
 msgid "subscription \"%s\" has been disabled because of an error"
 msgstr "підписка \"%s\" була відключена через помилку"
 
-#: replication/logical/worker.c:4806
+#: replication/logical/worker.c:4923
 #, c-format
 msgid "logical replication starts skipping transaction at LSN %X/%X"
 msgstr "логічна реплікація починає пропускати транзакцію в LSN %X/%X"
 
-#: replication/logical/worker.c:4820
+#: replication/logical/worker.c:4937
 #, c-format
 msgid "logical replication completed skipping transaction at LSN %X/%X"
 msgstr "логічна реплікація завершила пропускати транзакцію в LSN %X/%X"
 
-#: replication/logical/worker.c:4902
+#: replication/logical/worker.c:5025
 #, c-format
 msgid "skip-LSN of subscription \"%s\" cleared"
 msgstr "очищено LSN пропуску підписки \"%s\""
 
-#: replication/logical/worker.c:4903
+#: replication/logical/worker.c:5026
 #, c-format
 msgid "Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X."
 msgstr "Кінцеве розташування WAL віддаленої транзакції (LSN) %X/%X не відповідає skip-LSN %X/%X."
 
-#: replication/logical/worker.c:4940
+#: replication/logical/worker.c:5054
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\""
 msgstr "обробка віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\""
 
-#: replication/logical/worker.c:4944
+#: replication/logical/worker.c:5058
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u"
 msgstr "обробка віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" у транзакції %u"
 
-#: replication/logical/worker.c:4949
+#: replication/logical/worker.c:5063
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X"
 msgstr "обробку віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" у транзакції %u завершено о %X/%X"
 
-#: replication/logical/worker.c:4960
+#: replication/logical/worker.c:5074
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u"
 msgstr "обробка віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" для цільового відношення реплікації \"%s.%s\" в транзакції %u"
 
-#: replication/logical/worker.c:4967
+#: replication/logical/worker.c:5081
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X"
 msgstr "обробку віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" для цільового відношення реплікації \"%s.%s\" в транзакції %u завершено о %X/%X"
 
-#: replication/logical/worker.c:4978
+#: replication/logical/worker.c:5092
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u"
 msgstr "обробка віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" для цільового відношення реплікації \"%s.%s\" стовпчик \"%s\" у транзакції %u"
 
-#: replication/logical/worker.c:4986
+#: replication/logical/worker.c:5100
 #, c-format
 msgid "processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X"
 msgstr "обробку віддалених даних для джерела реплікації \"%s\" під час повідомлення типу \"%s\" для цільового відношення реплікації \"%s.%s\" стовпчик \"%s\" у транзакції %u завершено о %X/%X"
 
-#: replication/pgoutput/pgoutput.c:315
+#: replication/pgoutput/pgoutput.c:329
 #, c-format
 msgid "invalid proto_version"
 msgstr "неприпустиме значення proto_version"
 
-#: replication/pgoutput/pgoutput.c:320
+#: replication/pgoutput/pgoutput.c:334
 #, c-format
 msgid "proto_version \"%s\" out of range"
 msgstr "значення proto_version \"%s\" за межами діапазону"
 
-#: replication/pgoutput/pgoutput.c:337
+#: replication/pgoutput/pgoutput.c:351
 #, c-format
 msgid "invalid publication_names syntax"
 msgstr "неприпустимий синтаксис publication_names"
 
-#: replication/pgoutput/pgoutput.c:407 replication/pgoutput/pgoutput.c:411
+#: replication/pgoutput/pgoutput.c:421 replication/pgoutput/pgoutput.c:425
 #, c-format
 msgid "option \"%s\" missing"
 msgstr "параметр \"%s\" відсутній"
 
-#: replication/pgoutput/pgoutput.c:452
+#: replication/pgoutput/pgoutput.c:492
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or lower"
 msgstr "клієнт передав proto_version=%d, але сервер підтримує лише протокол %d або нижче"
 
-#: replication/pgoutput/pgoutput.c:458
+#: replication/pgoutput/pgoutput.c:498
 #, c-format
 msgid "client sent proto_version=%d but server only supports protocol %d or higher"
 msgstr "клієнт передав proto_version=%d, але сервер підтримує лише протокол %d або вище"
 
-#: replication/pgoutput/pgoutput.c:473
+#: replication/pgoutput/pgoutput.c:513
 #, c-format
 msgid "requested proto_version=%d does not support streaming, need %d or higher"
 msgstr "запитувана proto_version=%d не підтримує потокову передачу, потребується %d або вища"
 
-#: replication/pgoutput/pgoutput.c:479
+#: replication/pgoutput/pgoutput.c:519
 #, c-format
 msgid "requested proto_version=%d does not support parallel streaming, need %d or higher"
 msgstr "запитувана proto_version=%d не підтримує паралельний потік, потрібно %d або вище"
 
-#: replication/pgoutput/pgoutput.c:484
+#: replication/pgoutput/pgoutput.c:524
 #, c-format
 msgid "streaming requested, but not supported by output plugin"
 msgstr "запитане потокова передавача, але не підтримується плагіном виводу"
 
-#: replication/pgoutput/pgoutput.c:498
+#: replication/pgoutput/pgoutput.c:538
 #, c-format
 msgid "requested proto_version=%d does not support two-phase commit, need %d or higher"
 msgstr "запитувана proto_version=%d не підтримує двоетапне затвердження, потрібна %d або вища"
 
-#: replication/pgoutput/pgoutput.c:503
+#: replication/pgoutput/pgoutput.c:543
 #, c-format
 msgid "two-phase commit requested, but not supported by output plugin"
 msgstr "запитано двоетапне затвердження, але не підтримується плагіном виводу"
 
-#: replication/slot.c:260
+#: replication/pgoutput/pgoutput.c:1108
+#, c-format
+msgid "cannot use different values of publish_generated_columns for table \"%s.%s\" in different publications"
+msgstr "не можна використовувати різні значення publish_generated_columns для таблиці \"%s.%s\" в різних публікаціях"
+
+#: replication/pgoutput/pgoutput.c:1811
+#, c-format
+msgid "skipped loading publication \"%s\""
+msgstr "пропущено завантаження публікації \"%s\""
+
+#: replication/pgoutput/pgoutput.c:1812
+#, c-format
+msgid "The publication does not exist at this point in the WAL."
+msgstr "Публікація не існує в цій точці WAL."
+
+#: replication/pgoutput/pgoutput.c:1813
+#, c-format
+msgid "Create the publication if it does not exist."
+msgstr "Створіть публікацію, якщо вона не існує."
+
+#: replication/slot.c:313
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "ім'я слоту реплікації \"%s\" занадто коротке"
 
-#: replication/slot.c:269
+#: replication/slot.c:321
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "ім'я слоту реплікації \"%s\" занадто довге"
 
-#: replication/slot.c:282
+#: replication/slot.c:333
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "ім'я слоту реплікації \"%s\" містить неприпустимий символ"
 
-#: replication/slot.c:284
-#, c-format
+#: replication/slot.c:334
 msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
 msgstr "Імена слота реплікації можуть містити лише букви в нижньому кейсі, числа, і символ підкреслення."
 
-#: replication/slot.c:333
+#: replication/slot.c:383
 #, c-format
 msgid "cannot enable failover for a replication slot created on the standby"
 msgstr "не вдається увімкнути відмовостійкість для слота реплікації, створеного в режимі очікування"
 
-#: replication/slot.c:345 replication/slot.c:849
+#: replication/slot.c:395 replication/slot.c:921
 #, c-format
 msgid "cannot enable failover for a temporary replication slot"
 msgstr "не вдається увімкнути відмовостійкість для тимчасового слота реплікації"
 
-#: replication/slot.c:370
+#: replication/slot.c:420
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "слот реплікації \"%s\" вже існує"
 
-#: replication/slot.c:380
+#: replication/slot.c:430
 #, c-format
 msgid "all replication slots are in use"
 msgstr "використовуються всі слоти реплікації"
 
-#: replication/slot.c:381
+#: replication/slot.c:431
 #, c-format
 msgid "Free one or increase \"max_replication_slots\"."
 msgstr "Звільніть непотрібні або збільшіть \"max_replication_slots\"."
 
-#: replication/slot.c:560 replication/slot.c:2453 replication/slotfuncs.c:661
-#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:728
+#: replication/slot.c:615 replication/slotfuncs.c:664
+#: utils/activity/pgstat_replslot.c:56 utils/adt/genfile.c:739
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "слот реплікації \"%s\" не існує"
 
-#: replication/slot.c:606 replication/slot.c:1337
+#: replication/slot.c:670 replication/slot.c:1495
 #, c-format
 msgid "replication slot \"%s\" is active for PID %d"
 msgstr "слот реплікації \"%s\" активний для PID %d"
 
-#: replication/slot.c:638
+#: replication/slot.c:687
+#, c-format
+msgid "can no longer access replication slot \"%s\""
+msgstr "більше не можна отримати доступ до слоту реплікації \"%s\""
+
+#: replication/slot.c:689
+#, c-format
+msgid "This replication slot has been invalidated due to \"%s\"."
+msgstr "Цей слот реплікації був анульований через \"%s\"."
+
+#: replication/slot.c:708
 #, c-format
 msgid "acquired logical replication slot \"%s\""
 msgstr "придбано слот логічної реплікації \"%s\""
 
-#: replication/slot.c:640
+#: replication/slot.c:710
 #, c-format
 msgid "acquired physical replication slot \"%s\""
 msgstr "придбано фізичний слот реплікації \"%s\""
 
-#: replication/slot.c:729
+#: replication/slot.c:795
 #, c-format
 msgid "released logical replication slot \"%s\""
 msgstr "звільнено слот логічної реплікації \"%s\""
 
-#: replication/slot.c:731
+#: replication/slot.c:797
 #, c-format
 msgid "released physical replication slot \"%s\""
 msgstr "звільнено фізичний слот реплікації \"%s\""
 
-#: replication/slot.c:797
+#: replication/slot.c:863
 #, c-format
 msgid "cannot drop replication slot \"%s\""
 msgstr "не може скинути слот реплікації \"%s\""
 
-#: replication/slot.c:816
+#: replication/slot.c:886
 #, c-format
 msgid "cannot use %s with a physical replication slot"
 msgstr "не може використовувати %s з фізичним слотом реплікації"
 
-#: replication/slot.c:828
+#: replication/slot.c:898
 #, c-format
 msgid "cannot alter replication slot \"%s\""
 msgstr "не може змінювати слот реплікації \"%s\""
 
-#: replication/slot.c:838
+#: replication/slot.c:908
 #, c-format
 msgid "cannot enable failover for a replication slot on the standby"
 msgstr "не вдається увімкнути обхід відмови для слота реплікації в режимі очікування"
 
-#: replication/slot.c:969 replication/slot.c:1927 replication/slot.c:2311
+#: replication/slot.c:1056 replication/slot.c:2224 replication/slot.c:2617
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "не вдалося видалити каталог \"%s\""
 
-#: replication/slot.c:1372
+#: replication/slot.c:1530
 #, c-format
 msgid "replication slots can only be used if \"max_replication_slots\" > 0"
 msgstr "слоти реплікації можна використовувати лише якщо \"max_replication_slots\" > 0"
 
-#: replication/slot.c:1377
+#: replication/slot.c:1535
 #, c-format
 msgid "replication slots can only be used if \"wal_level\" >= \"replica\""
 msgstr "слоти реплікації можна використовувати лише якщо \"wal_level\" >= \"replica\""
 
-#: replication/slot.c:1389
+#: replication/slot.c:1547
 #, c-format
 msgid "permission denied to use replication slots"
 msgstr "немає дозволу для використання слотів реплікації"
 
-#: replication/slot.c:1390
+#: replication/slot.c:1548
 #, c-format
 msgid "Only roles with the %s attribute may use replication slots."
 msgstr "Тільки ролі з атрибутом %s можуть використовувати слоти реплікації."
 
-#: replication/slot.c:1498
+#: replication/slot.c:1660
 #, c-format
-msgid "The slot's restart_lsn %X/%X exceeds the limit by %llu byte."
-msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %llu bytes."
-msgstr[0] "Значення restart_lsn слота %X/%X перевищує ліміт на %llu байт."
-msgstr[1] "Значення restart_lsn слота %X/%X перевищує ліміт на %llu байта."
-msgstr[2] "Значення restart_lsn слота %X/%X перевищує ліміт на %llu байтів."
-msgstr[3] "Значення restart_lsn слота %X/%X перевищує ліміт на %llu байтів."
+msgid "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> byte."
+msgid_plural "The slot's restart_lsn %X/%X exceeds the limit by %<PRIu64> bytes."
+msgstr[0] "Значення restart_lsn слота %X/%X перевищує ліміт на %<PRIu64> байт."
+msgstr[1] "Значення restart_lsn слота %X/%X перевищує ліміт на %<PRIu64> байтів."
+msgstr[2] "Значення restart_lsn слота %X/%X перевищує ліміт на %<PRIu64> байтів."
+msgstr[3] "Значення restart_lsn слота %X/%X перевищує ліміт на %<PRIu64> байтів."
 
-#: replication/slot.c:1506
+#: replication/slot.c:1671
 #, c-format
 msgid "The slot conflicted with xid horizon %u."
 msgstr "Слот конфліктував з горизонтом xid %u."
 
-#: replication/slot.c:1511
+#: replication/slot.c:1676
 msgid "Logical decoding on standby requires \"wal_level\" >= \"logical\" on the primary server."
 msgstr "Логічне декодування на резервному сервері вимагає \"wal_level\" >= \"logical\" на основному сервері."
 
-#: replication/slot.c:1519
+#. translator: %s is a GUC variable name
+#: replication/slot.c:1682
 #, c-format
-msgid "terminating process %d to release replication slot \"%s\""
+msgid "The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."
+msgstr "Час простою слоту %ld с перевищує налаштовану тривалість \"%s\" %d с."
+
+#: replication/slot.c:1696
+#, c-format
+msgid "terminating process %d to release replication slot \"%s\""
 msgstr "завершення процесу %d для звільнення слоту реплікації \"%s\""
 
-#: replication/slot.c:1521
+#: replication/slot.c:1698
 #, c-format
 msgid "invalidating obsolete replication slot \"%s\""
 msgstr "анулювання застарілого слоту реплікації \"%s\""
 
-#: replication/slot.c:2249
+#: replication/slot.c:2555
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "файл слоту реплікації \"%s\" має неправильне магічне число: %u замість %u"
 
-#: replication/slot.c:2256
+#: replication/slot.c:2562
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "файл слоту реплікації \"%s\" має непідтримуючу версію %u"
 
-#: replication/slot.c:2263
+#: replication/slot.c:2569
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "файл слоту реплікації \"%s\" має пошкоджену довжину %u"
 
-#: replication/slot.c:2299
+#: replication/slot.c:2605
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "у файлі слоту реплікації \"%s\" невідповідність контрольної суми: %u, повинно бути %u"
 
-#: replication/slot.c:2333
+#: replication/slot.c:2641
 #, c-format
 msgid "logical replication slot \"%s\" exists, but \"wal_level\" < \"logical\""
 msgstr "слот логічної реплікації \"%s\" існує, але \"wal_level\" < \"logical\""
 
-#: replication/slot.c:2335
+#: replication/slot.c:2643
 #, c-format
 msgid "Change \"wal_level\" to be \"logical\" or higher."
 msgstr "Змініть \"wal_level\" на \"logical\" або вище."
 
-#: replication/slot.c:2339
+#: replication/slot.c:2655
+#, c-format
+msgid "logical replication slot \"%s\" exists on the standby, but \"hot_standby\" = \"off\""
+msgstr "слот логічної реплікації \"%s\" існує на резервному сервері, але hot_standby = off\""
+
+#: replication/slot.c:2657
+#, c-format
+msgid "Change \"hot_standby\" to be \"on\"."
+msgstr "Змінити \"hot_standby\" у значення \"on\"."
+
+#: replication/slot.c:2662
 #, c-format
 msgid "physical replication slot \"%s\" exists, but \"wal_level\" < \"replica\""
 msgstr "слот фізичної реплікації \"%s\" існує, але \"wal_level\" < \"replica\""
 
-#: replication/slot.c:2341
+#: replication/slot.c:2664
 #, c-format
 msgid "Change \"wal_level\" to be \"replica\" or higher."
 msgstr "Змініть \"wal_level\" на \"replica\" або вище."
 
-#: replication/slot.c:2383
+#: replication/slot.c:2711
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "перед завершенням роботи активно занадто багато слотів реплікації"
 
-#: replication/slot.c:2461
+#: replication/slot.c:2712
 #, c-format
-msgid "\"%s\" is not a physical replication slot"
-msgstr "\"%s\" не є фізичним слотом реплікації"
+msgid "Increase \"max_replication_slots\" and try again."
+msgstr "Збільшіть \"max_replication_slots\" і спробуйте знову."
 
-#: replication/slot.c:2638
+#: replication/slot.c:2949
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not exist"
 msgstr "слот реплікації \"%s\", вказаний в параметрі \"%s\", не існує"
 
-#: replication/slot.c:2640 replication/slot.c:2681 replication/slot.c:2696
+#: replication/slot.c:2951 replication/slot.c:2985 replication/slot.c:3000
 #, c-format
 msgid "Logical replication is waiting on the standby associated with replication slot \"%s\"."
 msgstr "Логічна реплікація чекає на слоті реплікації, що пов'язана з слотом реплікації \"%s\"."
 
-#: replication/slot.c:2642
+#: replication/slot.c:2953
 #, c-format
 msgid "Create the replication slot \"%s\" or amend parameter \"%s\"."
 msgstr "Створіть слот реплікації \"%s\" або змініть параметр \"%s\"."
 
-#: replication/slot.c:2659
+#: replication/slot.c:2963
 #, c-format
 msgid "cannot specify logical replication slot \"%s\" in parameter \"%s\""
 msgstr "неможливо вказати слот логічної реплікації \"%s\" в параметрі \"%s\""
 
-#: replication/slot.c:2661
+#: replication/slot.c:2965
 #, c-format
 msgid "Logical replication is waiting for correction on replication slot \"%s\"."
 msgstr "Логічна реплікація очікує на корекцію на слоті реплікації \"%s\"."
 
-#: replication/slot.c:2663
+#: replication/slot.c:2967
 #, c-format
 msgid "Remove the logical replication slot \"%s\" from parameter \"%s\"."
 msgstr "Приберіть слот логічної реплікації \"%s\" з параметру \"%s\"."
 
-#: replication/slot.c:2679
+#: replication/slot.c:2983
 #, c-format
 msgid "physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated"
-msgstr ""
+msgstr "слот фізичної реплікації \"%s\" вказаний у параметрі \"%s\" було анульовано"
 
-#: replication/slot.c:2683
+#: replication/slot.c:2987
 #, c-format
 msgid "Drop and recreate the replication slot \"%s\", or amend parameter \"%s\"."
-msgstr ""
+msgstr "Видаліть і повторно створіть слот реплікації \"%s\" або змініть параметр \"%s\"."
 
-#: replication/slot.c:2694
+#: replication/slot.c:2998
 #, c-format
 msgid "replication slot \"%s\" specified in parameter \"%s\" does not have active_pid"
-msgstr ""
+msgstr "слот реплікації \"%s\", вказаний в параметрі \"%s\", не має active_pid"
 
-#: replication/slot.c:2698
+#: replication/slot.c:3002
 #, c-format
 msgid "Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\"."
-msgstr ""
+msgstr "Запустіть резервний сервер асоційований зі слотом реплікації \"%s\" або змініть параметр \"%s\"."
 
-#: replication/slotfuncs.c:526
+#: replication/slotfuncs.c:529
 #, c-format
 msgid "invalid target WAL LSN"
 msgstr "неприпустима ціль WAL LSN"
 
-#: replication/slotfuncs.c:548
+#: replication/slotfuncs.c:551
 #, c-format
 msgid "replication slot \"%s\" cannot be advanced"
 msgstr "слот реплікації \"%s\" не може бути розширеним"
 
-#: replication/slotfuncs.c:550
+#: replication/slotfuncs.c:553
 #, c-format
 msgid "This slot has never previously reserved WAL, or it has been invalidated."
 msgstr "Цей слот ніколи раніше не резервував WAL, або він був недійсним."
 
-#: replication/slotfuncs.c:566
+#: replication/slotfuncs.c:569
 #, c-format
 msgid "cannot advance replication slot to %X/%X, minimum is %X/%X"
 msgstr "просунути слот реплікації до позиції %X/%X не можна, мінімальна позиція %X/%X"
 
-#: replication/slotfuncs.c:673
+#: replication/slotfuncs.c:676
 #, c-format
 msgid "cannot copy physical replication slot \"%s\" as a logical replication slot"
 msgstr "не можна скопіювати слот фізичної реплікації \"%s\" як слот логічної реплікації"
 
-#: replication/slotfuncs.c:675
+#: replication/slotfuncs.c:678
 #, c-format
 msgid "cannot copy logical replication slot \"%s\" as a physical replication slot"
 msgstr "не можна скопіювати слот логічної реплікації \"%s\" як слот фізичної реплікації"
 
-#: replication/slotfuncs.c:682
+#: replication/slotfuncs.c:685
 #, c-format
 msgid "cannot copy a replication slot that doesn't reserve WAL"
 msgstr "не можна скопіювати слот реплікації, який не резервує WAL"
 
-#: replication/slotfuncs.c:768
+#: replication/slotfuncs.c:691
+#, c-format
+msgid "cannot copy invalidated replication slot \"%s\""
+msgstr "неможливо скопіювати недопустимий слот логічної реплікації \"%s\""
+
+#: replication/slotfuncs.c:783
 #, c-format
 msgid "could not copy replication slot \"%s\""
 msgstr "не вдалося скопіювати слот реплікації \"%s\""
 
-#: replication/slotfuncs.c:770
+#: replication/slotfuncs.c:785
 #, c-format
 msgid "The source replication slot was modified incompatibly during the copy operation."
 msgstr "Слот реплікації джерела був змінений несумісно під час операції копіювання."
 
-#: replication/slotfuncs.c:776
+#: replication/slotfuncs.c:791
 #, c-format
 msgid "cannot copy unfinished logical replication slot \"%s\""
 msgstr "не можна скопіювати незавершений слот логічної реплікації \"%s\""
 
-#: replication/slotfuncs.c:778
+#: replication/slotfuncs.c:793
 #, c-format
 msgid "Retry when the source replication slot's confirmed_flush_lsn is valid."
 msgstr "Повторіть, коли confirmed_flush_lsn слоту джерела реплікації є дійсним."
 
-#: replication/slotfuncs.c:877
+#: replication/slotfuncs.c:805
+#, c-format
+msgid "cannot copy replication slot \"%s\""
+msgstr "неможливо скопіювати слоту реплікації \"%s\""
+
+#: replication/slotfuncs.c:807
+#, c-format
+msgid "The source replication slot was invalidated during the copy operation."
+msgstr "Слот реплікації джерела був анульований під час операції копії."
+
+#: replication/slotfuncs.c:906
 #, c-format
 msgid "replication slots can only be synchronized to a standby server"
 msgstr "слоти реплікації можна синхронізувати лише з резервним сервером"
 
-#: replication/syncrep.c:261
+#: replication/syncrep.c:304
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "скасування очікування синхронної реплікації і завершення з'єднання по команді адміністратора"
 
-#: replication/syncrep.c:262 replication/syncrep.c:279
+#: replication/syncrep.c:305 replication/syncrep.c:322
 #, c-format
 msgid "The transaction has already committed locally, but might not have been replicated to the standby."
 msgstr "Транзакція вже була затверджена локально, але можливо не була реплікована до режиму очікування."
 
-#: replication/syncrep.c:278
+#: replication/syncrep.c:321
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "скасування очікування синхронної реплікації по запиту користувача"
 
-#: replication/syncrep.c:485
+#: replication/syncrep.c:528
 #, c-format
 msgid "standby \"%s\" is now a synchronous standby with priority %d"
 msgstr "очікування \"%s\" тепер є синхронним очікуванням з пріоритетом %d"
 
-#: replication/syncrep.c:489
+#: replication/syncrep.c:532
 #, c-format
 msgid "standby \"%s\" is now a candidate for quorum synchronous standby"
 msgstr "режим очікування \"%s\" зараз є кандидатом для включення в кворум синхронних"
 
-#: replication/syncrep.c:1013
+#: replication/syncrep.c:1081
 #, c-format
-msgid "\"synchronous_standby_names\" parser failed"
-msgstr ""
+msgid "\"%s\" parser failed."
+msgstr "Аналізатор \"%s\" дав збій."
 
-#: replication/syncrep.c:1019
+#: replication/syncrep.c:1088
 #, c-format
 msgid "number of synchronous standbys (%d) must be greater than zero"
 msgstr "кількість синхронних режимів очікування (%d) повинно бути більше нуля"
 
-#: replication/walreceiver.c:176
+#: replication/walreceiver.c:276
 #, c-format
-msgid "terminating walreceiver process due to administrator command"
-msgstr "завершення процесу walreceiver по команді адміністратора"
+msgid "streaming replication receiver \"%s\" could not connect to the primary server: %s"
+msgstr "отримувач потокової реплікації \"%s\" не зміг підключитися до основного сервера: %s"
 
-#: replication/walreceiver.c:354
+#: replication/walreceiver.c:324
 #, c-format
 msgid "database system identifier differs between the primary and standby"
 msgstr "ідентифікатор системи бази даних на основному і резервному серверах відрізняються"
 
-#: replication/walreceiver.c:355
+#: replication/walreceiver.c:325
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr "Ідентифікатор на основному сервері %s, на резервному %s."
 
-#: replication/walreceiver.c:366
+#: replication/walreceiver.c:336
 #, c-format
 msgid "highest timeline %u of the primary is behind recovery timeline %u"
 msgstr "остання часова шкала %u на основному сервері відстає від відновлюючої часової шкали %u"
 
-#: replication/walreceiver.c:419
+#: replication/walreceiver.c:389
 #, c-format
 msgid "started streaming WAL from primary at %X/%X on timeline %u"
 msgstr "запущено потокове передавання WAL з основного серверу з позиції %X/%X на часовій шкалі %u"
 
-#: replication/walreceiver.c:423
+#: replication/walreceiver.c:393
 #, c-format
 msgid "restarted WAL streaming at %X/%X on timeline %u"
 msgstr "перезапуска потокового передавання WAL з позиції %X/%X на часовій шкалі %u"
 
-#: replication/walreceiver.c:458
+#: replication/walreceiver.c:428
 #, c-format
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "продовжити потокове передавання WAL не можна, відновлення вже завершено"
 
-#: replication/walreceiver.c:502
+#: replication/walreceiver.c:472
 #, c-format
 msgid "replication terminated by primary server"
 msgstr "реплікація завершена основним сервером"
 
-#: replication/walreceiver.c:503
+#: replication/walreceiver.c:473
 #, c-format
 msgid "End of WAL reached on timeline %u at %X/%X."
 msgstr "На часовій шкалі %u в позиції %X/%X WAL досяг кінця."
 
-#: replication/walreceiver.c:593
+#: replication/walreceiver.c:573
 #, c-format
 msgid "terminating walreceiver due to timeout"
 msgstr "завершення процесу walreceiver через тайм-аут"
 
-#: replication/walreceiver.c:625
+#: replication/walreceiver.c:605
 #, c-format
 msgid "primary server contains no more WAL on requested timeline %u"
 msgstr "основний сервер більше не містить WAL для запитаної часової шкали %u"
 
-#: replication/walreceiver.c:641 replication/walreceiver.c:1071
+#: replication/walreceiver.c:621 replication/walreceiver.c:1063
 #, c-format
 msgid "could not close WAL segment %s: %m"
 msgstr "не вдалося закрити сегмент WAL %s: %m"
 
-#: replication/walreceiver.c:760
+#: replication/walreceiver.c:740
 #, c-format
 msgid "fetching timeline history file for timeline %u from primary server"
 msgstr "отримання файлу історії часової шкали для часової шкали %u з основного серверу"
 
-#: replication/walreceiver.c:959
+#: replication/walreceiver.c:951
 #, c-format
 msgid "could not write to WAL segment %s at offset %d, length %lu: %m"
 msgstr "не вдалося записати у сегмент WAL %s зі зміщенням %d, довжиною %lu: %m"
 
-#: replication/walsender.c:531
+#: replication/walsender.c:519
 #, c-format
 msgid "cannot use %s with a logical replication slot"
 msgstr "використовувати %s зі слотом логічної реплікації не можна"
 
-#: replication/walsender.c:635 storage/smgr/md.c:1723
+#: replication/walsender.c:623 storage/smgr/md.c:1867
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "не вдалося досягти кінця файлу \"%s\": %m"
 
-#: replication/walsender.c:639
+#: replication/walsender.c:627
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "не вдалося знайти початок файлу \"%s\": %m"
 
-#: replication/walsender.c:853
+#: replication/walsender.c:843
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "використовувати логічний слот реплікації для фізичної реплікації, не можна"
 
-#: replication/walsender.c:919
+#: replication/walsender.c:909
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "в історії серверу немає запитаної початкової точки %X/%X на часовій шкалі %u"
 
-#: replication/walsender.c:922
+#: replication/walsender.c:912
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "Історія цього серверу відгалузилась від часової шкали %u в позиції %X/%X."
 
-#: replication/walsender.c:966
+#: replication/walsender.c:956
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "запитана початкова точка %X/%X попереду позиція очищених даних WAL на цьому сервері %X/%X"
 
-#: replication/walsender.c:1160
-#, c-format
-msgid "unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\""
-msgstr "нерозпізнане значення для параметру CREATE_REPLICATION_SLOT \"%s\": \"%s\""
-
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1266
+#: replication/walsender.c:1257
 #, c-format
 msgid "%s must not be called inside a transaction"
 msgstr "%s не має викликатися всередині транзакції"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1276
+#: replication/walsender.c:1267
 #, c-format
 msgid "%s must be called inside a transaction"
 msgstr "%s має викликатися всередині транзакції"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1282
+#: replication/walsender.c:1273
 #, c-format
 msgid "%s must be called in REPEATABLE READ isolation mode transaction"
 msgstr "%s повинен бути викликаний в режимі ізоляції REPEATABLE READ"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1287
+#: replication/walsender.c:1278
 #, c-format
 msgid "%s must be called in a read-only transaction"
 msgstr "%s має викликатися в транзакції \"лише для читання\""
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1293
+#: replication/walsender.c:1284
 #, c-format
 msgid "%s must be called before any query"
 msgstr "%s має викликатися до будь-якого запиту"
 
 #. translator: %s is a CREATE_REPLICATION_SLOT statement
-#: replication/walsender.c:1299
+#: replication/walsender.c:1290
 #, c-format
 msgid "%s must not be called in a subtransaction"
 msgstr "%s не має викликатися всередині підтранзакції"
 
-#: replication/walsender.c:1472
+#: replication/walsender.c:1467
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "завершення процесу walsender після підвищення"
 
-#: replication/walsender.c:2000
+#: replication/walsender.c:2010
 #, c-format
 msgid "cannot execute new commands while WAL sender is in stopping mode"
 msgstr "не можна виконувати нові команди, поки процес відправки WAL знаходиться в режимі зупинки"
 
-#: replication/walsender.c:2035
+#: replication/walsender.c:2064
 #, c-format
 msgid "cannot execute SQL commands in WAL sender for physical replication"
 msgstr "не можна виконувати команди SQL в процесі відправки WAL для фізичної реплікації"
 
-#: replication/walsender.c:2068
+#: replication/walsender.c:2095
 #, c-format
 msgid "received replication command: %s"
 msgstr "отримано команду реплікації: %s"
 
-#: replication/walsender.c:2076 tcop/fastpath.c:209 tcop/postgres.c:1142
-#: tcop/postgres.c:1500 tcop/postgres.c:1752 tcop/postgres.c:2234
-#: tcop/postgres.c:2672 tcop/postgres.c:2749
+#: replication/walsender.c:2103 tcop/fastpath.c:208 tcop/postgres.c:1137
+#: tcop/postgres.c:1494 tcop/postgres.c:1746 tcop/postgres.c:2251
+#: tcop/postgres.c:2688 tcop/postgres.c:2765
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr "поточна транзакція перервана, команди до кінця блока транзакції пропускаються"
 
-#: replication/walsender.c:2233 replication/walsender.c:2268
+#: replication/walsender.c:2263 replication/walsender.c:2298
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "неочікуваний обрив з'єднання з резервним сервером"
 
-#: replication/walsender.c:2256
+#: replication/walsender.c:2286
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "неприпустимий тип повідомлення резервного серверу \"%c\""
 
-#: replication/walsender.c:2345
+#: replication/walsender.c:2375
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "неочікуваний тип повідомлення \"%c\""
 
-#: replication/walsender.c:2759
+#: replication/walsender.c:2789
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "завершення процесу walsender через тайм-аут реплікації"
@@ -21652,286 +22492,286 @@ msgstr "правило \"%s\" для відношення \"%s\" не існує
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "не допускається перейменування правила ON SELECT"
 
-#: rewrite/rewriteHandler.c:582
+#: rewrite/rewriteHandler.c:590
 #, c-format
 msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
 msgstr "Ім'я запиту WITH \"%s\" з'являється і в дії правила, і в переписаному запиті"
 
-#: rewrite/rewriteHandler.c:609
+#: rewrite/rewriteHandler.c:620
 #, c-format
 msgid "INSERT ... SELECT rule actions are not supported for queries having data-modifying statements in WITH"
 msgstr "Дії правил INSERT ... SELECT не підтримуються для запитів, які змінюють дані в операторах WITH"
 
-#: rewrite/rewriteHandler.c:662
+#: rewrite/rewriteHandler.c:674
 #, c-format
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "списки RETURNING може мати лише одне правило"
 
-#: rewrite/rewriteHandler.c:894 rewrite/rewriteHandler.c:933
+#: rewrite/rewriteHandler.c:911 rewrite/rewriteHandler.c:950
 #, c-format
 msgid "cannot insert a non-DEFAULT value into column \"%s\""
 msgstr "вставити значення non-DEFAULT до стовпця \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:896 rewrite/rewriteHandler.c:962
+#: rewrite/rewriteHandler.c:913 rewrite/rewriteHandler.c:979
 #, c-format
 msgid "Column \"%s\" is an identity column defined as GENERATED ALWAYS."
 msgstr "Стовпець \"%s\" є ідентифікаційним стовпцем визначеним як GENERATED ALWAYS."
 
-#: rewrite/rewriteHandler.c:898
+#: rewrite/rewriteHandler.c:915
 #, c-format
 msgid "Use OVERRIDING SYSTEM VALUE to override."
 msgstr "Для зміни використайте OVERRIDING SYSTEM VALUE."
 
-#: rewrite/rewriteHandler.c:960 rewrite/rewriteHandler.c:968
+#: rewrite/rewriteHandler.c:977 rewrite/rewriteHandler.c:985
 #, c-format
 msgid "column \"%s\" can only be updated to DEFAULT"
 msgstr "стовпець \"%s\" може бути оновлено тільки до DEFAULT"
 
-#: rewrite/rewriteHandler.c:1115 rewrite/rewriteHandler.c:1133
+#: rewrite/rewriteHandler.c:1121 rewrite/rewriteHandler.c:1139
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "кілька завдань для одного стовпця \"%s\""
 
-#: rewrite/rewriteHandler.c:1698
+#: rewrite/rewriteHandler.c:1694
 #, c-format
 msgid "MERGE is not supported for relations with rules."
 msgstr "MERGE не підтримує відношення з правилами."
 
-#: rewrite/rewriteHandler.c:1738 rewrite/rewriteHandler.c:3229
+#: rewrite/rewriteHandler.c:1734 rewrite/rewriteHandler.c:3274
 #, c-format
 msgid "access to non-system view \"%s\" is restricted"
-msgstr ""
+msgstr "доступ до несистемного подання \"%s\" обмежено"
 
-#: rewrite/rewriteHandler.c:2119 rewrite/rewriteHandler.c:4221
+#: rewrite/rewriteHandler.c:2133 rewrite/rewriteHandler.c:4285
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "виявлена безкінечна рекурсія у правилах для відносин \"%s\""
 
-#: rewrite/rewriteHandler.c:2204
+#: rewrite/rewriteHandler.c:2238
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "виявлена безкінечна рекурсія в політиці для зв'язка \"%s\""
 
-#: rewrite/rewriteHandler.c:2556
+#: rewrite/rewriteHandler.c:2601
 msgid "Junk view columns are not updatable."
 msgstr "Утилізовані стовпці подань не оновлюються."
 
-#: rewrite/rewriteHandler.c:2561
+#: rewrite/rewriteHandler.c:2606
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Стовпці подання, які не є стовпцями базового зв'язку, не оновлюються."
 
-#: rewrite/rewriteHandler.c:2564
+#: rewrite/rewriteHandler.c:2609
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Стовпці подання, які посилаються на системні стовпці, не оновлюються."
 
-#: rewrite/rewriteHandler.c:2567
+#: rewrite/rewriteHandler.c:2612
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Стовпці подання, що повертають посилання на весь рядок, не оновлюються."
 
-#: rewrite/rewriteHandler.c:2628
+#: rewrite/rewriteHandler.c:2673
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Подання які містять DISTINCT не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2631
+#: rewrite/rewriteHandler.c:2676
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Подання які містять GROUP BY не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2634
+#: rewrite/rewriteHandler.c:2679
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Подання які містять HAVING не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2637
+#: rewrite/rewriteHandler.c:2682
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Подання які містять UNION, INTERSECT, або EXCEPT не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2640
+#: rewrite/rewriteHandler.c:2685
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Подання які містять WITH не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2643
+#: rewrite/rewriteHandler.c:2688
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Подання які містять LIMIT або OFFSET не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2655
+#: rewrite/rewriteHandler.c:2700
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Подання які повертають агрегатні функції не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2658
+#: rewrite/rewriteHandler.c:2703
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Подання які повертають віконні функції не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2661
+#: rewrite/rewriteHandler.c:2706
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Подання які повертають set-returning функції не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2668 rewrite/rewriteHandler.c:2672
-#: rewrite/rewriteHandler.c:2680
+#: rewrite/rewriteHandler.c:2713 rewrite/rewriteHandler.c:2717
+#: rewrite/rewriteHandler.c:2725
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Подання які обирають дані не з одної таблиці або подання не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2683
+#: rewrite/rewriteHandler.c:2728
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Подання які містять TABLESAMPLE не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:2707
+#: rewrite/rewriteHandler.c:2752
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Подання які не мають оновлюваних стовпців не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:3088 rewrite/rewriteHandler.c:3123
+#: rewrite/rewriteHandler.c:3133 rewrite/rewriteHandler.c:3168
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "вставити дані в подання \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:3091
+#: rewrite/rewriteHandler.c:3136
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "Щоб подання допускало додавання даних, встановіть тригер INSTEAD OF INSERT або безумовне правило ON INSERT DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3096 rewrite/rewriteHandler.c:3132
+#: rewrite/rewriteHandler.c:3141 rewrite/rewriteHandler.c:3177
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "оновити подання \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:3099
+#: rewrite/rewriteHandler.c:3144
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Щоб подання допускало оновлення, встановіть тригер INSTEAD OF UPDATE або безумовне правило ON UPDATE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3104 rewrite/rewriteHandler.c:3141
+#: rewrite/rewriteHandler.c:3149 rewrite/rewriteHandler.c:3186
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "видалити дані з подання \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:3107
+#: rewrite/rewriteHandler.c:3152
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "Щоб подання допускало видалення даних, встановіть тригер INSTEAD OF DELETE або безумновне правило ON DELETE DO INSTEAD."
 
-#: rewrite/rewriteHandler.c:3126
+#: rewrite/rewriteHandler.c:3171
 #, c-format
 msgid "To enable inserting into the view using MERGE, provide an INSTEAD OF INSERT trigger."
-msgstr ""
+msgstr "Щоб подання допускало вставку даних за допомогою MERGE, встановіть тригер INSTEAD OF INSERT."
 
-#: rewrite/rewriteHandler.c:3135
+#: rewrite/rewriteHandler.c:3180
 #, c-format
 msgid "To enable updating the view using MERGE, provide an INSTEAD OF UPDATE trigger."
-msgstr ""
+msgstr "Щоб подання допускало оновлення даних за допомогою MERGE, встановіть тригер INSTEAD OF UPDATE."
 
-#: rewrite/rewriteHandler.c:3144
+#: rewrite/rewriteHandler.c:3189
 #, c-format
 msgid "To enable deleting from the view using MERGE, provide an INSTEAD OF DELETE trigger."
-msgstr ""
+msgstr "Щоб подання допускало видалення даних за допомогою MERGE, встановіть тригер INSTEAD OF DELETE."
 
-#: rewrite/rewriteHandler.c:3319
+#: rewrite/rewriteHandler.c:3364
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "вставити дані в стовпець \"%s\" подання \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:3327
+#: rewrite/rewriteHandler.c:3372
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "оновити дані в стовпці \"%s\" подання \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:3335
+#: rewrite/rewriteHandler.c:3380
 #, c-format
 msgid "cannot merge into column \"%s\" of view \"%s\""
-msgstr ""
+msgstr "неможливо об'єднати дані в стовпець \"%s\" подання \"%s\""
 
-#: rewrite/rewriteHandler.c:3363
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 msgid "cannot merge into view \"%s\""
-msgstr ""
+msgstr "неможливо об'єднати дані в подання \"%s\""
 
-#: rewrite/rewriteHandler.c:3365
+#: rewrite/rewriteHandler.c:3410
 #, c-format
 msgid "MERGE is not supported for views with INSTEAD OF triggers for some actions but not all."
-msgstr ""
+msgstr "MERGE не підтримується для подань з тригерами INSTEAD OF для деяких дій, але не всіх."
 
-#: rewrite/rewriteHandler.c:3366
+#: rewrite/rewriteHandler.c:3411
 #, c-format
 msgid "To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers."
-msgstr ""
+msgstr "Щоб подання допускало об'єднання у нього, або встановіть повний набір тригерів INSTEAD OF або видаліть існуючі тригери INSTEAD OF."
 
-#: rewrite/rewriteHandler.c:3879
+#: rewrite/rewriteHandler.c:3942
 #, c-format
 msgid "DO INSTEAD NOTIFY rules are not supported for data-modifying statements in WITH"
 msgstr "Правила DO INSTEAD NOTIFY не підтримуються для операторів, які змінюють дані в WITH"
 
-#: rewrite/rewriteHandler.c:3890
+#: rewrite/rewriteHandler.c:3953
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr "Правила DO INSTEAD NOTHING не підтримуються для операторів, які змінюють дані в WITH"
 
-#: rewrite/rewriteHandler.c:3904
+#: rewrite/rewriteHandler.c:3967
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "умовні правила DO INSTEAD не підтримуються для операторів, які змінюють дані в WITH"
 
-#: rewrite/rewriteHandler.c:3908
+#: rewrite/rewriteHandler.c:3971
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "Правила DO ALSO не підтримуються для операторів, які змінюють дані в WITH"
 
-#: rewrite/rewriteHandler.c:3913
+#: rewrite/rewriteHandler.c:3976
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "складові правила DO INSTEAD не підтримуються операторами, які змінюють дані у WITH"
 
-#: rewrite/rewriteHandler.c:4173
+#: rewrite/rewriteHandler.c:4237
 msgid "Views with conditional DO INSTEAD rules are not automatically updatable."
 msgstr "Подання з умовними правилами DO INSTEAD не оновлюються автоматично."
 
-#: rewrite/rewriteHandler.c:4270
+#: rewrite/rewriteHandler.c:4335
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "виконати INSERT RETURNING для зв'язка \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:4272
+#: rewrite/rewriteHandler.c:4337
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr "Вам потрібне безумовне правило ON INSERT DO INSTEAD з реченням RETURNING."
 
-#: rewrite/rewriteHandler.c:4277
+#: rewrite/rewriteHandler.c:4342
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "виконати UPDATE RETURNING для зв'язка \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:4279
+#: rewrite/rewriteHandler.c:4344
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "Вам потрібне безумовне правило ON UPDATE DO INSTEAD з реченням RETURNING."
 
-#: rewrite/rewriteHandler.c:4284
+#: rewrite/rewriteHandler.c:4349
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "виконати DELETE RETURNING для зв'язка \"%s\" не можна"
 
-#: rewrite/rewriteHandler.c:4286
+#: rewrite/rewriteHandler.c:4351
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr "Вам потрібне безумовне правило ON DELETE DO INSTEAD з реченням RETURNING."
 
-#: rewrite/rewriteHandler.c:4304
+#: rewrite/rewriteHandler.c:4369
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT з реченням ON CONFLICT не можна використовувати з таблицею, яка має правила INSERT або UPDATE"
 
-#: rewrite/rewriteHandler.c:4361
+#: rewrite/rewriteHandler.c:4426
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "WITH не можна використовувати в запиті, який переписаний правилами в декілька запитів"
 
-#: rewrite/rewriteManip.c:1083
+#: rewrite/rewriteManip.c:1175
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "умовні службові оператори не реалізовані"
 
-#: rewrite/rewriteManip.c:1430
+#: rewrite/rewriteManip.c:1520
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "Умова WHERE CURRENT OF для подання не реалізована"
 
-#: rewrite/rewriteManip.c:1765
+#: rewrite/rewriteManip.c:1923
 #, 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 "Змінні NEW в правилах ON UPDATE не можуть посилатись на стовпці, які є частиною декілької призначень в команді UPDATE"
@@ -21941,33 +22781,90 @@ msgstr "Змінні NEW в правилах ON UPDATE не можуть пос
 msgid "with a SEARCH or CYCLE clause, the recursive reference to WITH query \"%s\" must be at the top level of its right-hand SELECT"
 msgstr "з операторами SEARCH або CYCLE, рекурсивне посилання на запит WITH \"%s\" повинне розташовуватися на верхньому рівні його правої частини SELECT"
 
-#: snowball/dict_snowball.c:215
+#: snowball/dict_snowball.c:220
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr "засіб визначення основи слова Snowball для мови \"%s\" і кодування \"%s\" не знайдено"
 
-#: snowball/dict_snowball.c:238 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:49
+#: snowball/dict_snowball.c:243 tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
 #, c-format
 msgid "multiple StopWords parameters"
 msgstr "повторюваний параметр StopWords"
 
-#: snowball/dict_snowball.c:247
+#: snowball/dict_snowball.c:252
 #, c-format
 msgid "multiple Language parameters"
 msgstr "повторюваний параметр Language"
 
-#: snowball/dict_snowball.c:254
+#: snowball/dict_snowball.c:259
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
 msgstr "нерозпізнаний параметр Snowball: \"%s\""
 
-#: snowball/dict_snowball.c:262
+#: snowball/dict_snowball.c:267
 #, c-format
 msgid "missing Language parameter"
 msgstr "пропущений параметр Language"
 
-#: statistics/extended_stats.c:176
+#: statistics/attribute_stats.c:192 statistics/attribute_stats.c:937
+#: statistics/relation_stats.c:98
+#, c-format
+msgid "Statistics cannot be modified during recovery."
+msgstr "Статистики не можна модифікувати під час відновлення."
+
+#: statistics/attribute_stats.c:205
+#, c-format
+msgid "cannot specify both \"%s\" and \"%s\""
+msgstr "не можна вказати одночасно \"%s\" і \"%s\""
+
+#: statistics/attribute_stats.c:231
+#, c-format
+msgid "must specify either \"%s\" or \"%s\""
+msgstr "слід вказати або \"%s\", або \"%s\""
+
+#: statistics/attribute_stats.c:239
+#, c-format
+msgid "cannot modify statistics on system column \"%s\""
+msgstr "не можна змінити статистику для системного стовпця \"%s\""
+
+#: statistics/attribute_stats.c:303
+#, c-format
+msgid "could not determine element type of column \"%s\""
+msgstr "не вдалося визначити тип елемента стовпця \"%s\""
+
+#: statistics/attribute_stats.c:304 statistics/attribute_stats.c:321
+#: statistics/attribute_stats.c:336
+#, c-format
+msgid "Cannot set %s or %s."
+msgstr "Не можна встановити %s або %s."
+
+#: statistics/attribute_stats.c:320
+#, c-format
+msgid "could not determine less-than operator for column \"%s\""
+msgstr "не вдалося визначити оператор \"менше ніж\" для стовпця \"%s\""
+
+#: statistics/attribute_stats.c:335
+#, c-format
+msgid "column \"%s\" is not a range type"
+msgstr "стовпець \"%s\" не є типом діапазону"
+
+#: statistics/attribute_stats.c:738
+#, c-format
+msgid "\"%s\" array must not contain null values"
+msgstr "масив \"%s\" не повинен містити null значення"
+
+#: statistics/attribute_stats.c:781
+#, c-format
+msgid "maximum number of statistics slots exceeded: %d"
+msgstr "перевищено максимальну кількість слотів статистики: %d"
+
+#: statistics/attribute_stats.c:949
+#, c-format
+msgid "cannot clear statistics on system column \"%s\""
+msgstr "не можна очистити статистику для системного стовпця \"%s\""
+
+#: statistics/extended_stats.c:175
 #, c-format
 msgid "statistics object \"%s.%s\" could not be computed for relation \"%s.%s\""
 msgstr "об'єкт статистики \"%s.%s\" не вдалося обчислити для відношення \"%s.%s\""
@@ -21977,57 +22874,229 @@ msgstr "об'єкт статистики \"%s.%s\" не вдалося обчи
 msgid "function returning record called in context that cannot accept type record"
 msgstr "функція, що повертає набір, викликана у контексті, що не приймає тип запис"
 
-#: storage/buffer/bufmgr.c:649 storage/buffer/bufmgr.c:805
+#: statistics/relation_stats.c:117
 #, c-format
-msgid "cannot access temporary tables of other sessions"
-msgstr "доступ до тимчасових таблиць з інших сесій заблоковано"
+msgid "argument \"%s\" must not be less than -1.0"
+msgstr "аргумент \"%s\" не повинен бути менше ніж -1.0"
 
-#: storage/buffer/bufmgr.c:1532
+#: statistics/stat_utils.c:47
 #, c-format
-msgid "invalid page in block %u of relation %s; zeroing out page"
-msgstr "неприпустима сторінка в блоці %u відношення %s; сторінка обнуляється"
+msgid "argument \"%s\" must not be null"
+msgstr "аргумент \"%s\" не повинен бути null"
 
-#: storage/buffer/bufmgr.c:2277 storage/buffer/localbuf.c:361
+#: statistics/stat_utils.c:74
+#, c-format
+msgid "argument \"%s\" must not be a multidimensional array"
+msgstr "аргумент \"%s\" не повинен бути багатовимірним масивом"
+
+#: statistics/stat_utils.c:83
+#, c-format
+msgid "argument \"%s\" array must not contain null values"
+msgstr "масив аргументу \"%s\" не повинен містити null значення"
+
+#: statistics/stat_utils.c:114
+#, c-format
+msgid "argument \"%s\" must be specified when argument \"%s\" is specified"
+msgstr "аргумент \"%s\" повинен бути вказаний, коли вказаний аргумент \"%s\""
+
+#: statistics/stat_utils.c:177
+#, c-format
+msgid "index \"%s\" was concurrently dropped"
+msgstr "індекс \"%s\" був паралельно видалений"
+
+#: statistics/stat_utils.c:192
+#, c-format
+msgid "index \"%s\" was concurrently created"
+msgstr "індекс \"%s\" був паралельно створений"
+
+#: statistics/stat_utils.c:212
+#, c-format
+msgid "cannot modify statistics for relation \"%s\""
+msgstr "не можна змінити статистику для відношення \"%s\""
+
+#: statistics/stat_utils.c:220
+#, c-format
+msgid "cannot modify statistics for shared relation"
+msgstr "не можна змінити статистику для спільного відношення"
+
+#: statistics/stat_utils.c:260
+#, c-format
+msgid "unrecognized argument name: \"%s\""
+msgstr "нерозпізнана назва аргументу: \"%s\""
+
+#: statistics/stat_utils.c:274
+#, c-format
+msgid "argument \"%s\" has type %s, expected type %s"
+msgstr "аргумент \"%s\" має тип %s, очікувався тип %s"
+
+#: statistics/stat_utils.c:315
+#, c-format
+msgid "variadic arguments must be name/value pairs"
+msgstr "варіативні аргументи повинні бути парами ім'я/значення"
+
+#: statistics/stat_utils.c:316
+#, c-format
+msgid "Provide an even number of variadic arguments that can be divided into pairs."
+msgstr "Надайте парну кількість варіативних аргументів, які можна розділити на пари."
+
+#: statistics/stat_utils.c:330
+#, c-format
+msgid "name at variadic position %d is null"
+msgstr "ім'я на варіативній позиції %d є null"
+
+#: statistics/stat_utils.c:334
+#, c-format
+msgid "name at variadic position %d has type %s, expected type %s"
+msgstr "ім'я на варіативній позиції %d має тип %s, очікувався тип %s"
+
+#: storage/aio/aio.c:1343
+#, c-format
+msgid "Only -1 or values bigger than 0 are valid."
+msgstr "Допустимі лише -1 або значення більше 0."
+
+#: storage/aio/method_io_uring.c:369
+msgid "Check if io_uring is disabled via /proc/sys/kernel/io_uring_disabled."
+msgstr "Перевірте, чи не вимкнено io_uring через /proc/sys/kernel/io_uring_disabled."
+
+#: storage/aio/method_io_uring.c:374
+#, c-format
+msgid "Consider increasing \"ulimit -n\" to at least %d."
+msgstr "Розгляньте можливість збільшення \"ulimit -n\" принаймні до %d."
+
+#: storage/aio/method_io_uring.c:380
+msgid "The kernel does not support io_uring."
+msgstr "Ядро не підтримує io_uring."
+
+#: storage/aio/method_io_uring.c:388
+#, c-format
+msgid "could not setup io_uring queue: %m"
+msgstr "не вдалося налаштувати чергу io_uring: %m"
+
+#: storage/aio/method_io_uring.c:522
+#, c-format
+msgid "completing I/O on behalf of process %d"
+msgstr "завершення I/O від імені процесу %d"
+
+#: storage/aio/method_worker.c:382
+#, c-format
+msgid "I/O worker executing I/O on behalf of process %d"
+msgstr "працівник I/O виконує I/O від імені процесу %d"
+
+#: storage/buffer/bufmgr.c:662 storage/buffer/bufmgr.c:818
+#, c-format
+msgid "cannot access temporary tables of other sessions"
+msgstr "доступ до тимчасових таблиць з інших сесій заблоковано"
+
+#: storage/buffer/bufmgr.c:2703 storage/buffer/localbuf.c:393
 #, c-format
 msgid "cannot extend relation %s beyond %u blocks"
 msgstr "не можна розширити відношення %s понад %u блоків"
 
-#: storage/buffer/bufmgr.c:2348
+#: storage/buffer/bufmgr.c:2774
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "неочікуванні дані після EOF в блоці %u відношення %s"
+msgid "unexpected data beyond EOF in block %u of relation \"%s\""
+msgstr "неочікувані дані після EOF в блоці %u відношення \"%s\""
 
-#: storage/buffer/bufmgr.c:2350
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr "Ця ситуація може виникати через помилки в ядрі; можливо, вам слід оновити вашу систему."
 
-#: storage/buffer/bufmgr.c:5653
+#: storage/buffer/bufmgr.c:6178
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "неможливо записати блок %u файлу %s"
 
-#: storage/buffer/bufmgr.c:5655
+#: storage/buffer/bufmgr.c:6182
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Кілька неполадок --- можливо, постійна помилка запису."
 
-#: storage/buffer/bufmgr.c:5677 storage/buffer/bufmgr.c:5697
+#: storage/buffer/bufmgr.c:6199 storage/buffer/bufmgr.c:6214
+#, c-format
+msgid "writing block %u of relation \"%s\""
+msgstr "запис блоку %u відношення \"%s\""
+
+#: storage/buffer/bufmgr.c:7317
+#, c-format
+msgid "zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\""
+msgstr "обнулення %u сторінки(сторінок) і ігнорування %u помилки(помилок) контрольної суми серед блоків %u..%u відношення \"%s\""
+
+#: storage/buffer/bufmgr.c:7320 storage/buffer/bufmgr.c:7348
+#, c-format
+msgid "Block %u held the first zeroed page."
+msgstr "Блок %u містив першу обнулену сторінку."
+
+#: storage/buffer/bufmgr.c:7322
+#, c-format
+msgid "See server log for details about the other %d invalid block."
+msgid_plural "See server log for details about the other %d invalid blocks."
+msgstr[0] "Дивіться журнал сервера для деталей про інший %d недійсний блок."
+msgstr[1] "Дивіться журнал сервера для деталей про інші %d недійсних блоки."
+msgstr[2] "Дивіться журнал сервера для деталей про інші %d недійсних блоків."
+msgstr[3] "Дивіться журнал сервера для деталей про інші %d недійсних блоків."
+
+#: storage/buffer/bufmgr.c:7339
+#, c-format
+msgid "%u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "%u недійсних сторінок серед блоків %u..%u відношення \"%s\""
+
+#: storage/buffer/bufmgr.c:7340
+#, c-format
+msgid "Block %u held the first invalid page."
+msgstr "Блок %u містив першу недійсну сторінку."
+
+#: storage/buffer/bufmgr.c:7341
+#, c-format
+msgid "See server log for the other %u invalid block(s)."
+msgstr "Дивіться журнал сервера для інших %u недійсних блоків."
+
+#: storage/buffer/bufmgr.c:7346
+#, c-format
+msgid "invalid page in block %u of relation \"%s\"; zeroing out page"
+msgstr "недійсна сторінка в блоці %u відношення \"%s\"; обнулення сторінки"
+
+#: storage/buffer/bufmgr.c:7347
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "записування блоку %u зв'язку %s"
+msgid "zeroing out %u invalid pages among blocks %u..%u of relation \"%s\""
+msgstr "обнулення %u недійсних сторінок серед блоків %u..%u відношення \"%s\""
 
-#: storage/buffer/localbuf.c:220
+#: storage/buffer/bufmgr.c:7349
+#, c-format
+msgid "See server log for the other %u zeroed block(s)."
+msgstr "Дивіться журнал сервера для інших %u обнулених блоків."
+
+#: storage/buffer/bufmgr.c:7354
+#, c-format
+msgid "ignoring checksum failure in block %u of relation \"%s\""
+msgstr "ігнорування помилки контрольної суми в блоці %u відношення \"%s\""
+
+#: storage/buffer/bufmgr.c:7355
+#, c-format
+msgid "ignoring %u checksum failures among blocks %u..%u of relation \"%s\""
+msgstr "ігнорування %u помилок контрольної суми серед блоків %u..%u відношення \"%s\""
+
+#: storage/buffer/bufmgr.c:7356
+#, c-format
+msgid "Block %u held the first ignored page."
+msgstr "Блок %u містив першу проігноровану сторінку."
+
+#: storage/buffer/bufmgr.c:7357
+#, c-format
+msgid "See server log for the other %u ignored block(s)."
+msgstr "Дивіться журнал сервера для інших %u проігнорованих блоків."
+
+#: storage/buffer/localbuf.c:272
 #, c-format
 msgid "no empty local buffer available"
 msgstr "немає жодного пустого локального буферу"
 
-#: storage/buffer/localbuf.c:597
+#: storage/buffer/localbuf.c:736
 #, c-format
 msgid "cannot access temporary tables during a parallel operation"
 msgstr "немає доступу до тимчасових таблиць під час паралельної операції"
 
-#: storage/buffer/localbuf.c:712
+#: storage/buffer/localbuf.c:876
 #, c-format
 msgid "\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session."
 msgstr "параметр \"temp_buffers\" не можна змінити після того, як тимчасові таблиці отримали доступ в сеансі."
@@ -22047,156 +23116,161 @@ msgstr "не вдалося прочитати файл \"%s\": прочитан
 msgid "could not read from temporary file: read only %zu of %zu bytes"
 msgstr "не вдалося прочитати тимчасовий файл: прочитано лише %zu з %zu байт"
 
-#: storage/file/buffile.c:774 storage/file/buffile.c:877
+#: storage/file/buffile.c:774 storage/file/buffile.c:875
 #, c-format
 msgid "could not determine size of temporary file \"%s\" from BufFile \"%s\": %m"
 msgstr "не вдалося визначити розмір тимчасового файлу \"%s\" з BufFile \"%s\": %m"
 
-#: storage/file/buffile.c:956
+#: storage/file/buffile.c:951
 #, c-format
 msgid "could not delete fileset \"%s\": %m"
 msgstr "не вдалося видалити набір файлів \"%s\": %m"
 
-#: storage/file/buffile.c:974 storage/smgr/md.c:336 storage/smgr/md.c:1192
+#: storage/file/buffile.c:969 storage/smgr/md.c:356 storage/smgr/md.c:1318
 #, c-format
 msgid "could not truncate file \"%s\": %m"
 msgstr "не вдалося скоротити файл \"%s\": %m"
 
-#: storage/file/fd.c:583 storage/file/fd.c:655 storage/file/fd.c:691
+#: storage/file/copydir.c:244 storage/file/copydir.c:275
+#, c-format
+msgid "could not clone file \"%s\" to \"%s\": %m"
+msgstr "не вдалося клонувати файл \"%s\" в \"%s\": %m"
+
+#: storage/file/fd.c:580 storage/file/fd.c:652 storage/file/fd.c:688
 #, c-format
 msgid "could not flush dirty data: %m"
 msgstr "не вдалося очистити \"брудні\" дані: %m"
 
-#: storage/file/fd.c:613
+#: storage/file/fd.c:610
 #, c-format
 msgid "could not determine dirty data size: %m"
 msgstr "не вдалося визначити розмір \"брудних\" даних: %m"
 
-#: storage/file/fd.c:665
+#: storage/file/fd.c:662
 #, c-format
 msgid "could not munmap() while flushing data: %m"
 msgstr "не вдалося munmap() під час очищення даних: %m"
 
-#: storage/file/fd.c:983
+#: storage/file/fd.c:980
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "помилка getrlimit: %m"
 
-#: storage/file/fd.c:1073
+#: storage/file/fd.c:1071
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "недостатньо доступних дескрипторів файлу для запуску серверного процесу"
 
-#: storage/file/fd.c:1074
+#: storage/file/fd.c:1072
 #, c-format
-msgid "System allows %d, server needs at least %d."
-msgstr "Система дозволяє %d, сервер потребує щонайменше %d."
+msgid "System allows %d, server needs at least %d, %d files are already open."
+msgstr "Система дозволяє %d, сервер потребує принаймні %d, %d файлів уже відкрито."
 
-#: storage/file/fd.c:1162 storage/file/fd.c:2618 storage/file/fd.c:2727
-#: storage/file/fd.c:2878
+#: storage/file/fd.c:1161 storage/file/fd.c:2676 storage/file/fd.c:2785
+#: storage/file/fd.c:2939
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "нестача дескрипторів файлу: %m; вивільніть і спробуйте знову"
 
-#: storage/file/fd.c:1536
+#: storage/file/fd.c:1537
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "тимчасовий файл: шлях \"%s\", розмір %lu"
 
-#: storage/file/fd.c:1675
+#: storage/file/fd.c:1676
 #, c-format
 msgid "cannot create temporary directory \"%s\": %m"
 msgstr "неможливо створити тимчасовий каталог \"%s\": %m"
 
-#: storage/file/fd.c:1682
+#: storage/file/fd.c:1683
 #, c-format
 msgid "cannot create temporary subdirectory \"%s\": %m"
 msgstr "неможливо створити тимчасовий підкаталог \"%s\": %m"
 
-#: storage/file/fd.c:1879
+#: storage/file/fd.c:1880
 #, c-format
 msgid "could not create temporary file \"%s\": %m"
 msgstr "неможливо створити тимчасовий файл \"%s\": %m"
 
-#: storage/file/fd.c:1915
+#: storage/file/fd.c:1916
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "неможливо відкрити тимчасовий файл \"%s\": %m"
 
-#: storage/file/fd.c:1956
+#: storage/file/fd.c:1957
 #, c-format
 msgid "could not unlink temporary file \"%s\": %m"
 msgstr "помилка видалення тимчасового файлу \"%s\": %m"
 
-#: storage/file/fd.c:2044
+#: storage/file/fd.c:2047
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "не вдалося видалити файл \"%s\": %m"
 
-#: storage/file/fd.c:2234
+#: storage/file/fd.c:2286
 #, c-format
-msgid "temporary file size exceeds temp_file_limit (%dkB)"
-msgstr "розмір тимчасового файлу перевищує temp_file_limit (%d Кб)"
+msgid "temporary file size exceeds \"temp_file_limit\" (%dkB)"
+msgstr "розмір тимчасового файлу перевищує \"temp_file_limit\" (%dkB)"
 
-#: storage/file/fd.c:2594 storage/file/fd.c:2653
+#: storage/file/fd.c:2652 storage/file/fd.c:2711
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "перевищено maxAllocatedDescs (%d) при спробі відкрити файл \"%s\""
 
-#: storage/file/fd.c:2698
+#: storage/file/fd.c:2756
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "перевищено maxAllocatedDescs (%d) при спробі виконати команду \"%s\""
 
-#: storage/file/fd.c:2854
+#: storage/file/fd.c:2915
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "перевищено maxAllocatedDescs (%d) при спробі відкрити каталог \"%s\""
 
-#: storage/file/fd.c:3384
+#: storage/file/fd.c:3446
 #, c-format
 msgid "unexpected file found in temporary-files directory: \"%s\""
 msgstr "знайдено неочікуваний файл в каталозі тимчасових файлів: \"%s\""
 
-#: storage/file/fd.c:3502
+#: storage/file/fd.c:3564
 #, c-format
 msgid "syncing data directory (syncfs), elapsed time: %ld.%02d s, current path: %s"
 msgstr "синхронізація каталогу даних (syncfs), витрачено часу: %ld.%02d с, поточний шлях: %s"
 
-#: storage/file/fd.c:3729
+#: storage/file/fd.c:3791
 #, c-format
 msgid "syncing data directory (pre-fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "Синхронізація каталогу даних (pre-fsync), витрачено часу: %ld.%02d с, поточний шлях: %s"
 
-#: storage/file/fd.c:3761
+#: storage/file/fd.c:3823
 #, c-format
 msgid "syncing data directory (fsync), elapsed time: %ld.%02d s, current path: %s"
 msgstr "синхронізація каталогу даних (fsync), витрачено часу: %ld.%02d с, поточний шлях: %s"
 
-#: storage/file/fd.c:3950
+#: storage/file/fd.c:4012
 #, c-format
-msgid "\"debug_io_direct\" is not supported on this platform."
-msgstr ""
+msgid "\"%s\" is not supported on this platform."
+msgstr "\"%s\" не підтримується на цій платформі."
 
-#: storage/file/fd.c:3964
+#: storage/file/fd.c:4027 tcop/backend_startup.c:1080
 #, c-format
-msgid "Invalid list syntax in parameter \"%s\""
-msgstr ""
+msgid "Invalid list syntax in parameter \"%s\"."
+msgstr "Неправильний синтаксис списку в параметрі \"%s\"."
 
-#: storage/file/fd.c:3984
+#: storage/file/fd.c:4047 tcop/backend_startup.c:1054
 #, c-format
-msgid "Invalid option \"%s\""
-msgstr "Недійсний параметр \"%s\""
+msgid "Invalid option \"%s\"."
+msgstr "Неправильний параметр \"%s\"."
 
-#: storage/file/fd.c:3997
+#: storage/file/fd.c:4060
 #, c-format
-msgid "\"debug_io_direct\" is not supported for WAL because XLOG_BLCKSZ is too small"
-msgstr ""
+msgid "\"%s\" is not supported for WAL because %s is too small."
+msgstr "\"%s\" не підтримується для WAL, тому що %s занадто малий."
 
-#: storage/file/fd.c:4004
+#: storage/file/fd.c:4068
 #, c-format
-msgid "\"debug_io_direct\" is not supported for data because BLCKSZ is too small"
-msgstr ""
+msgid "\"%s\" is not supported for data because %s is too small."
+msgstr "\"%s\" не підтримується для даних, тому що %s занадто малий."
 
 #: storage/file/reinit.c:145
 #, c-format
@@ -22283,58 +23357,74 @@ msgstr "не вдалося закрити сегмент спільної па
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "не вдалося продублювати маркер для \"%s\": %m"
 
-#: storage/ipc/dsm_registry.c:142
+#: storage/ipc/dsm_registry.c:144
 #, c-format
 msgid "DSM segment name cannot be empty"
 msgstr "Ім'я сегмента DSM не може бути порожнім"
 
-#: storage/ipc/dsm_registry.c:146
+#: storage/ipc/dsm_registry.c:148
 #, c-format
 msgid "DSM segment name too long"
 msgstr "Занадто довге ім'я сегменту DSM"
 
-#: storage/ipc/dsm_registry.c:150
+#: storage/ipc/dsm_registry.c:152
 #, c-format
 msgid "DSM segment size must be nonzero"
 msgstr "Розмір сегменту DSM повинен бути ненульовим"
 
-#: storage/ipc/dsm_registry.c:176
+#: storage/ipc/dsm_registry.c:168
 #, c-format
 msgid "requested DSM segment size does not match size of existing segment"
 msgstr "розмір запитуваного сегмента DSM не збігається з розміром наявного сегмента"
 
-#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:352
-#: tcop/backend_startup.c:304
+#: storage/ipc/procarray.c:488 storage/lmgr/proc.c:457
+#: tcop/backend_startup.c:343
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "вибачте, вже забагато клієнтів"
 
-#: storage/ipc/procarray.c:3857
+#: storage/ipc/procarray.c:3858
 #, c-format
 msgid "database \"%s\" is being used by prepared transactions"
 msgstr "база даних \"%s\" використовується підготовленими транзакціями"
 
-#: storage/ipc/procarray.c:3893 storage/ipc/procarray.c:3901
-#: storage/ipc/signalfuncs.c:235 storage/ipc/signalfuncs.c:242
+#: storage/ipc/procarray.c:3894 storage/ipc/procarray.c:3902
+#: storage/ipc/signalfuncs.c:256 storage/ipc/signalfuncs.c:263
+#: storage/ipc/signalfuncs.c:270
 #, c-format
 msgid "permission denied to terminate process"
 msgstr "немає дозволу для припинення процесу"
 
-#: storage/ipc/procarray.c:3894 storage/ipc/signalfuncs.c:236
+#: storage/ipc/procarray.c:3895 storage/ipc/signalfuncs.c:257
 #, c-format
 msgid "Only roles with the %s attribute may terminate processes of roles with the %s attribute."
 msgstr "Тільки ролі з атрибутом %s можуть припинити процеси ролей з атрибутом %s."
 
-#: storage/ipc/procarray.c:3902 storage/ipc/signalfuncs.c:243
+#: storage/ipc/procarray.c:3903 storage/ipc/signalfuncs.c:271
 #, c-format
 msgid "Only roles with privileges of the role whose process is being terminated or with privileges of the \"%s\" role may terminate this process."
 msgstr "Лише ролі з привілеями ролі, процес якої завершується, або з привілеями ролі \"%s\" можуть завершити цей процес."
 
-#: storage/ipc/procsignal.c:416
+#: storage/ipc/procsignal.c:451
 #, c-format
 msgid "still waiting for backend with PID %d to accept ProcSignalBarrier"
 msgstr "все ще чекаємо на прийняття ProcSignalBarrier від бекенд з PID %d"
 
+#: storage/ipc/procsignal.c:733
+#, c-format
+msgid "invalid cancel request with PID 0"
+msgstr "недійсний запит скасування з PID 0"
+
+#: storage/ipc/procsignal.c:788
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "неправильний ключ в запиті скасування процесу %d"
+
+#: storage/ipc/procsignal.c:797
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "PID %d в запиті на скасування не відповідає жодному процесу"
+
 #: storage/ipc/shm_mq.c:383
 #, c-format
 msgid "cannot send a message of size %zu via shared memory queue"
@@ -22345,12 +23435,12 @@ msgstr "не можна надсилати повідомлення розмір
 msgid "invalid message size %zu in shared memory queue"
 msgstr "неприпустимий розмір повідомлення %zu в черзі спільної пам'яті"
 
-#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:984
-#: storage/lmgr/lock.c:1022 storage/lmgr/lock.c:2825 storage/lmgr/lock.c:4210
-#: storage/lmgr/lock.c:4275 storage/lmgr/lock.c:4625
-#: storage/lmgr/predicate.c:2463 storage/lmgr/predicate.c:2478
-#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:4922
-#: utils/hash/dynahash.c:1095
+#: storage/ipc/shm_toc.c:118 storage/ipc/shm_toc.c:200 storage/lmgr/lock.c:1041
+#: storage/lmgr/lock.c:1079 storage/lmgr/lock.c:2968 storage/lmgr/lock.c:4373
+#: storage/lmgr/lock.c:4438 storage/lmgr/lock.c:4788
+#: storage/lmgr/predicate.c:2478 storage/lmgr/predicate.c:2493
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:4937
+#: utils/hash/dynahash.c:1096
 #, c-format
 msgid "out of shared memory"
 msgstr "нестача спільної пам'яті"
@@ -22380,271 +23470,287 @@ msgstr "недостатньо спільної пам'яті для струк
 msgid "requested shared memory size overflows size_t"
 msgstr "запитаний сегмент спільної пам'яті не вміщається в size_t"
 
-#: storage/ipc/signalfuncs.c:72
+#: storage/ipc/signalfuncs.c:74
 #, c-format
 msgid "PID %d is not a PostgreSQL backend process"
 msgstr "PID %d не є внутрішнім процесом PostgreSQL"
 
-#: storage/ipc/signalfuncs.c:109 storage/lmgr/proc.c:1448
-#: utils/adt/mcxtfuncs.c:182
+#: storage/ipc/signalfuncs.c:123 storage/lmgr/proc.c:1546
+#: utils/adt/mcxtfuncs.c:302
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "не вдалося надіслати сигнал процесу %d: %m"
 
-#: storage/ipc/signalfuncs.c:129 storage/ipc/signalfuncs.c:136
+#: storage/ipc/signalfuncs.c:143 storage/ipc/signalfuncs.c:150
+#: storage/ipc/signalfuncs.c:157
 #, c-format
 msgid "permission denied to cancel query"
 msgstr "немає дозволу для скасування запиту"
 
-#: storage/ipc/signalfuncs.c:130
+#: storage/ipc/signalfuncs.c:144
 #, c-format
 msgid "Only roles with the %s attribute may cancel queries of roles with the %s attribute."
 msgstr "Лише ролі з атрибутом %s можуть скасовувати запити ролей з атрибутом %s."
 
-#: storage/ipc/signalfuncs.c:137
+#: storage/ipc/signalfuncs.c:151
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may cancel autovacuum workers."
+msgstr "Тільки ролі з правами ролі \"%s\" можуть скасовувати процеси автовакууму."
+
+#: storage/ipc/signalfuncs.c:158
 #, c-format
 msgid "Only roles with privileges of the role whose query is being canceled or with privileges of the \"%s\" role may cancel this query."
 msgstr "Лише ролі з привілеями ролі, запит якої скасовується, або з привілеями ролі \"%s\" можуть скасувати цей запит."
 
-#: storage/ipc/signalfuncs.c:179
+#: storage/ipc/signalfuncs.c:200
 #, c-format
 msgid "could not check the existence of the backend with PID %d: %m"
 msgstr "не вдалося перевірити наявність процесу з PID %d: %m"
 
-#: storage/ipc/signalfuncs.c:197
+#: storage/ipc/signalfuncs.c:218
 #, c-format
-msgid "backend with PID %d did not terminate within %lld millisecond"
-msgid_plural "backend with PID %d did not terminate within %lld milliseconds"
-msgstr[0] "процес з PID %d не завершився протягом %lld мілісекунди"
-msgstr[1] "процес з PID %d не завершився протягом %lld мілісекунд"
-msgstr[2] "процес з PID %d не завершився протягом %lld мілісекунд"
-msgstr[3] "процес з PID %d не завершився протягом %lld мілісекунд"
+msgid "backend with PID %d did not terminate within %<PRId64> millisecond"
+msgid_plural "backend with PID %d did not terminate within %<PRId64> milliseconds"
+msgstr[0] "процес з PID %d не завершився протягом %<PRId64> мілісекунди"
+msgstr[1] "процес з PID %d не завершився протягом %<PRId64> мілісекунд"
+msgstr[2] "процес з PID %d не завершився протягом %<PRId64> мілісекунд"
+msgstr[3] "процес з PID %d не завершився протягом %<PRId64> мілісекунд"
 
-#: storage/ipc/signalfuncs.c:228
+#: storage/ipc/signalfuncs.c:249
 #, c-format
 msgid "\"timeout\" must not be negative"
 msgstr "\"timeout\" повинен не може бути негативним"
 
-#: storage/ipc/signalfuncs.c:285
+#: storage/ipc/signalfuncs.c:264
+#, c-format
+msgid "Only roles with privileges of the \"%s\" role may terminate autovacuum workers."
+msgstr "Тільки ролі з правами ролі \"%s\" можуть завершувати процеси автовакууму."
+
+#: storage/ipc/signalfuncs.c:313
 #, c-format
 msgid "rotation not possible because log collection not active"
 msgstr "обертання неможливе тому, що записування колекції не активоване"
 
-#: storage/ipc/standby.c:329
+#: storage/ipc/standby.c:330
 #, c-format
 msgid "recovery still waiting after %ld.%03d ms: %s"
 msgstr "відновлення все ще чекає, після %ld.%03d мс: %s"
 
-#: storage/ipc/standby.c:338
+#: storage/ipc/standby.c:339
 #, c-format
 msgid "recovery finished waiting after %ld.%03d ms: %s"
 msgstr "відновлення закінчило очікування після %ld.%03d мс: %s"
 
-#: storage/ipc/standby.c:920 tcop/postgres.c:3196
+#: storage/ipc/standby.c:921 tcop/postgres.c:3223
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "виконання оператора скасовано через конфлікт з процесом відновлення"
 
-#: storage/ipc/standby.c:921 tcop/postgres.c:2557
+#: storage/ipc/standby.c:922 tcop/postgres.c:2573
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "Транзакція користувача призвела до взаємного блокування з процесом відновлення."
 
-#: storage/ipc/standby.c:1486
+#: storage/ipc/standby.c:1494
 msgid "unknown reason"
 msgstr "невідома причина"
 
-#: storage/ipc/standby.c:1491
+#: storage/ipc/standby.c:1499
 msgid "recovery conflict on buffer pin"
 msgstr "конфлікт відновлення, закріпленого в буфері"
 
-#: storage/ipc/standby.c:1494
+#: storage/ipc/standby.c:1502
 msgid "recovery conflict on lock"
 msgstr "конфлікт відновлення при блокуванні"
 
-#: storage/ipc/standby.c:1497
+#: storage/ipc/standby.c:1505
 msgid "recovery conflict on tablespace"
 msgstr "конфлікт відновлення у табличному просторі"
 
-#: storage/ipc/standby.c:1500
+#: storage/ipc/standby.c:1508
 msgid "recovery conflict on snapshot"
 msgstr "конфлікт відновлення під час знімку"
 
-#: storage/ipc/standby.c:1503
+#: storage/ipc/standby.c:1511
 msgid "recovery conflict on replication slot"
 msgstr "конфлікт відновлення у слоті реплікації"
 
-#: storage/ipc/standby.c:1506
+#: storage/ipc/standby.c:1514
 msgid "recovery conflict on buffer deadlock"
 msgstr "конфлікт відновлення при взаємному блокуванні буфера"
 
-#: storage/ipc/standby.c:1509
+#: storage/ipc/standby.c:1517
 msgid "recovery conflict on database"
 msgstr "конфлікт відновлення у базі даних"
 
-#: storage/large_object/inv_api.c:190
+#: storage/large_object/inv_api.c:152
 #, c-format
 msgid "pg_largeobject entry for OID %u, page %d has invalid data field size %d"
 msgstr "у введенні pg_largeobject для OID %u, сторінка %d має неприпустимий розмір поля даних %d"
 
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:234
 #, c-format
 msgid "invalid flags for opening a large object: %d"
 msgstr "неприпустимі позначки для відкриття великого об'єкту: %d"
 
-#: storage/large_object/inv_api.c:297 storage/large_object/inv_api.c:309
-#: storage/large_object/inv_api.c:506 storage/large_object/inv_api.c:617
-#: storage/large_object/inv_api.c:807
+#: storage/large_object/inv_api.c:259 storage/large_object/inv_api.c:271
+#: storage/large_object/inv_api.c:468 storage/large_object/inv_api.c:579
+#: storage/large_object/inv_api.c:769
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "немає дозволу для великого об'єкта %u"
 
-#: storage/large_object/inv_api.c:455
+#: storage/large_object/inv_api.c:417
 #, c-format
 msgid "invalid whence setting: %d"
 msgstr "неприпустиме значення орієнтиру: %d"
 
-#: storage/large_object/inv_api.c:627
+#: storage/large_object/inv_api.c:589
 #, c-format
 msgid "invalid large object write request size: %d"
 msgstr "неприпустимий розмір запису великого об'єкту: %d"
 
-#: storage/lmgr/deadlock.c:1104
+#: storage/lmgr/deadlock.c:1107
 #, c-format
 msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr "Процес %d очікує в режимі %s блокування \"%s\"; заблокований процесом %d."
 
-#: storage/lmgr/deadlock.c:1123
+#: storage/lmgr/deadlock.c:1126
 #, c-format
 msgid "Process %d: %s"
 msgstr "Процес %d: %s"
 
-#: storage/lmgr/deadlock.c:1132
+#: storage/lmgr/deadlock.c:1135
 #, c-format
 msgid "deadlock detected"
 msgstr "виявлено взаємне блокування"
 
-#: storage/lmgr/deadlock.c:1135
+#: storage/lmgr/deadlock.c:1138
 #, c-format
 msgid "See server log for query details."
 msgstr "Подробиці запиту перегляньте в записі серверу."
 
-#: storage/lmgr/lmgr.c:848
+#: storage/lmgr/lmgr.c:862
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
 msgstr "при оновленні кортежу (%u,%u) в зв'язку \"%s\""
 
-#: storage/lmgr/lmgr.c:851
+#: storage/lmgr/lmgr.c:865
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
 msgstr "при видаленні кортежу (%u,%u) в зв'язку \"%s\""
 
-#: storage/lmgr/lmgr.c:854
+#: storage/lmgr/lmgr.c:868
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
 msgstr "при блокуванні кортежу (%u,%u) в зв'язку \"%s\""
 
-#: storage/lmgr/lmgr.c:857
+#: storage/lmgr/lmgr.c:871
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
 msgstr "при блокуванні оновленої версії (%u,%u) кортежу в зв'язку \"%s\""
 
-#: storage/lmgr/lmgr.c:860
+#: storage/lmgr/lmgr.c:874
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
 msgstr "при вставці кортежу індексу (%u,%u) в зв'язку \"%s\""
 
-#: storage/lmgr/lmgr.c:863
+#: storage/lmgr/lmgr.c:877
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
 msgstr "під час перевірки унікальності кортежа (%u,%u) у відношенні \"%s\""
 
-#: storage/lmgr/lmgr.c:866
+#: storage/lmgr/lmgr.c:880
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
 msgstr "під час повторної перевірки оновленого кортежа (%u,%u) у відношенні \"%s\""
 
-#: storage/lmgr/lmgr.c:869
+#: storage/lmgr/lmgr.c:883
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
 msgstr "під час перевірки обмеження-виключення для кортежа (%u,%u) у відношенні \"%s\""
 
-#: storage/lmgr/lmgr.c:1239
+#: storage/lmgr/lmgr.c:1255
 #, c-format
 msgid "relation %u of database %u"
 msgstr "відношення %u бази даних %u"
 
-#: storage/lmgr/lmgr.c:1245
+#: storage/lmgr/lmgr.c:1261
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "розширення відношення %u бази даних %u"
 
-#: storage/lmgr/lmgr.c:1251
+#: storage/lmgr/lmgr.c:1267
 #, c-format
 msgid "pg_database.datfrozenxid of database %u"
 msgstr "pg_database.datfrozenxid бази даних %u"
 
-#: storage/lmgr/lmgr.c:1256
+#: storage/lmgr/lmgr.c:1272
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "сторінка %u відношення %u бази даних %u"
 
-#: storage/lmgr/lmgr.c:1263
+#: storage/lmgr/lmgr.c:1279
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "кортеж (%u,%u) відношення %u бази даних %u"
 
-#: storage/lmgr/lmgr.c:1271
+#: storage/lmgr/lmgr.c:1287
 #, c-format
 msgid "transaction %u"
 msgstr "транзакція %u"
 
-#: storage/lmgr/lmgr.c:1276
+#: storage/lmgr/lmgr.c:1292
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "віртуальна транзакція %d/%u"
 
-#: storage/lmgr/lmgr.c:1282
+#: storage/lmgr/lmgr.c:1298
 #, c-format
 msgid "speculative token %u of transaction %u"
 msgstr "орієнтовний маркер %u транзакції %u"
 
-#: storage/lmgr/lmgr.c:1288
+#: storage/lmgr/lmgr.c:1304
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "об’єкт %u класу %u бази даних %u"
 
-#: storage/lmgr/lmgr.c:1296
+#: storage/lmgr/lmgr.c:1312
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "користувацьке блокування [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1303
+#: storage/lmgr/lmgr.c:1319
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "рекомендаційне блокування [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:1311
+#: storage/lmgr/lmgr.c:1327
 #, c-format
 msgid "remote transaction %u of subscription %u of database %u"
 msgstr "віддалена транзакція %u з підписки %u з бази даних %u"
 
-#: storage/lmgr/lmgr.c:1318
+#: storage/lmgr/lmgr.c:1334
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "нерозпізнаний тип блокування %d"
 
-#: storage/lmgr/lock.c:812
+#: storage/lmgr/lock.c:869
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr "поки виконується відновлення, не можна отримати блокування об'єктів бази даних в режимі %s"
 
-#: storage/lmgr/lock.c:814
+#: storage/lmgr/lock.c:871
 #, c-format
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "Під час процесу відновлення для об'єктів бази даних може бути отримане лише блокування RowExclusiveLock або менш сильна."
 
-#: storage/lmgr/lock.c:3274 storage/lmgr/lock.c:3342 storage/lmgr/lock.c:3458
+#: storage/lmgr/lock.c:1185
+#, c-format
+msgid "process %d could not obtain %s on %s"
+msgstr "процес %d не зміг отримати %s для %s"
+
+#: storage/lmgr/lock.c:3426 storage/lmgr/lock.c:3494 storage/lmgr/lock.c:3610
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "не можна виконати PREPARE, під час утримання блокування на рівні сеансу і на рівні транзакції для одного об'єкта"
@@ -22657,685 +23763,725 @@ msgstr "в RWConflictPool недостатньо елементів для за
 #: storage/lmgr/predicate.c:654 storage/lmgr/predicate.c:679
 #, c-format
 msgid "You might need to run fewer transactions at a time or increase \"max_connections\"."
-msgstr ""
+msgstr "Можливо, вам слід виконувати менше транзакцій в секунду або збільшити параметр \"max_connections\"."
 
 #: storage/lmgr/predicate.c:678
 #, c-format
 msgid "not enough elements in RWConflictPool to record a potential read/write conflict"
 msgstr "в RWConflictPool недостатньо елементів для запису про потенціальний конфлікт читання/запису"
 
-#: storage/lmgr/predicate.c:1681
+#: storage/lmgr/predicate.c:1696
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
 msgstr "параметр \"default_transaction_isolation\" має значення \"serializable\"."
 
-#: storage/lmgr/predicate.c:1682
+#: storage/lmgr/predicate.c:1697
 #, c-format
 msgid "You can use \"SET default_transaction_isolation = 'repeatable read'\" to change the default."
 msgstr "Ви можете використати \"SET default_transaction_isolation = 'repeatable read'\" щоб змінити режим за замовчуванням."
 
-#: storage/lmgr/predicate.c:1733
+#: storage/lmgr/predicate.c:1748
 #, c-format
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "транзакція, яка імпортує знімок не повинна бутив READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1812 utils/time/snapmgr.c:535
-#: utils/time/snapmgr.c:541
+#: storage/lmgr/predicate.c:1827 utils/time/snapmgr.c:567
+#: utils/time/snapmgr.c:573
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "не вдалося імпортувати запитаний знімок"
 
-#: storage/lmgr/predicate.c:1813 utils/time/snapmgr.c:542
+#: storage/lmgr/predicate.c:1828 utils/time/snapmgr.c:574
 #, c-format
 msgid "The source process with PID %d is not running anymore."
 msgstr "Вихідний процес з PID %d вже не виконується."
 
-#: storage/lmgr/predicate.c:3986 storage/lmgr/predicate.c:4022
-#: storage/lmgr/predicate.c:4055 storage/lmgr/predicate.c:4063
-#: storage/lmgr/predicate.c:4102 storage/lmgr/predicate.c:4332
-#: storage/lmgr/predicate.c:4651 storage/lmgr/predicate.c:4663
-#: storage/lmgr/predicate.c:4710 storage/lmgr/predicate.c:4746
+#: storage/lmgr/predicate.c:4001 storage/lmgr/predicate.c:4037
+#: storage/lmgr/predicate.c:4070 storage/lmgr/predicate.c:4078
+#: storage/lmgr/predicate.c:4117 storage/lmgr/predicate.c:4347
+#: storage/lmgr/predicate.c:4666 storage/lmgr/predicate.c:4678
+#: storage/lmgr/predicate.c:4725 storage/lmgr/predicate.c:4761
 #, c-format
 msgid "could not serialize access due to read/write dependencies among transactions"
 msgstr "не вдалося серіалізувати доступ через залежність читання/запису серед транзакцій"
 
-#: storage/lmgr/predicate.c:3988 storage/lmgr/predicate.c:4024
-#: storage/lmgr/predicate.c:4057 storage/lmgr/predicate.c:4065
-#: storage/lmgr/predicate.c:4104 storage/lmgr/predicate.c:4334
-#: storage/lmgr/predicate.c:4653 storage/lmgr/predicate.c:4665
-#: storage/lmgr/predicate.c:4712 storage/lmgr/predicate.c:4748
+#: storage/lmgr/predicate.c:4003 storage/lmgr/predicate.c:4039
+#: storage/lmgr/predicate.c:4072 storage/lmgr/predicate.c:4080
+#: storage/lmgr/predicate.c:4119 storage/lmgr/predicate.c:4349
+#: storage/lmgr/predicate.c:4668 storage/lmgr/predicate.c:4680
+#: storage/lmgr/predicate.c:4727 storage/lmgr/predicate.c:4763
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "Транзакція може завершитися успішно, якщо повторити спробу."
 
-#: storage/lmgr/proc.c:348
+#: storage/lmgr/proc.c:453
 #, c-format
 msgid "number of requested standby connections exceeds \"max_wal_senders\" (currently %d)"
-msgstr ""
+msgstr "кількість запитаних підключень резервного серверу перевищує \"max_wal_senders\" (поточна %d)"
 
-#: storage/lmgr/proc.c:1541
+#: storage/lmgr/proc.c:1591
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "процес %d уникнув взаємного блокування, чекаючи в режимі %s блокування %s змінивши порядок черги після %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1556
+#: storage/lmgr/proc.c:1606
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "процес %d виявив взаємне блокування, чекаючи в режимі %s блокування %s після %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1565
+#: storage/lmgr/proc.c:1615
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "процес %d все ще чекає в режимі %s блокування %s після %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1572
+#: storage/lmgr/proc.c:1622
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "процес %d отримав в режимі %s блокування %s після %ld.%03d мс"
 
-#: storage/lmgr/proc.c:1589
+#: storage/lmgr/proc.c:1639
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "процес %d не зміг отримати в режимі %s блокування %s після %ld.%03d мс"
 
-#: storage/page/bufpage.c:152
+#: storage/page/bufpage.c:154
 #, c-format
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "помилка перевірки сторінки, обчислена контрольна сума %u але очікувалось %u"
 
-#: storage/page/bufpage.c:217 storage/page/bufpage.c:730
-#: storage/page/bufpage.c:1073 storage/page/bufpage.c:1208
-#: storage/page/bufpage.c:1314 storage/page/bufpage.c:1426
+#: storage/page/bufpage.c:216 storage/page/bufpage.c:729
+#: storage/page/bufpage.c:1072 storage/page/bufpage.c:1207
+#: storage/page/bufpage.c:1313 storage/page/bufpage.c:1425
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "пошкоджені вказівники сторінки: нижній = %u, верхній = %u, спеціальний = %u"
 
-#: storage/page/bufpage.c:759
+#: storage/page/bufpage.c:758
 #, c-format
 msgid "corrupted line pointer: %u"
 msgstr "пошкоджений вказівник рядка: %u"
 
-#: storage/page/bufpage.c:789 storage/page/bufpage.c:1266
+#: storage/page/bufpage.c:788 storage/page/bufpage.c:1265
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "пошкоджена довжина елементу: загальний розмір %u, доступний розмір %u"
 
-#: storage/page/bufpage.c:1092 storage/page/bufpage.c:1233
-#: storage/page/bufpage.c:1330 storage/page/bufpage.c:1442
+#: storage/page/bufpage.c:1091 storage/page/bufpage.c:1232
+#: storage/page/bufpage.c:1329 storage/page/bufpage.c:1441
 #, c-format
 msgid "corrupted line pointer: offset = %u, size = %u"
 msgstr "пошкоджений вказівник рядка: зсув = %u, розмір = %u"
 
-#: storage/smgr/md.c:485 storage/smgr/md.c:547
+#: storage/smgr/md.c:502 storage/smgr/md.c:564
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
 msgstr "не можна розширити файл \"%s\" до блоку %u"
 
-#: storage/smgr/md.c:500 storage/smgr/md.c:611
+#: storage/smgr/md.c:517 storage/smgr/md.c:628
 #, c-format
 msgid "could not extend file \"%s\": %m"
 msgstr "не вдалося розширити файл \"%s\": %m"
 
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:523
 #, c-format
 msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr "не вдалося розширити файл \"%s\" записано лише %d з %d байт в блоку %u"
 
-#: storage/smgr/md.c:589
+#: storage/smgr/md.c:606
 #, c-format
 msgid "could not extend file \"%s\" with FileFallocate(): %m"
 msgstr "не вдалося розширити файл \"%s\" за допомогою FileFallocate(): %m"
 
-#: storage/smgr/md.c:869
+#: storage/smgr/md.c:899 storage/smgr/md.c:2047
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": %m"
 msgstr "не вдалося прочитати блоки %u..%u у файлі \"%s\": %m"
 
-#: storage/smgr/md.c:895
+#: storage/smgr/md.c:946 storage/smgr/md.c:2060
 #, c-format
 msgid "could not read blocks %u..%u in file \"%s\": read only %zu of %zu bytes"
 msgstr "не вдалося прочитати блоки %u..%u у файлі \"%s\": прочитано лише %zu з %zu байтів"
 
-#: storage/smgr/md.c:995
+#: storage/smgr/md.c:1023
+#, c-format
+msgid "could not start reading blocks %u..%u in file \"%s\": %m"
+msgstr "не вдалося розпочати читання блоків %u..%u у файлі \"%s\": %m"
+
+#: storage/smgr/md.c:1119
 #, c-format
 msgid "could not write blocks %u..%u in file \"%s\": %m"
 msgstr "не вдалося записати блоки %u..%u у файл \"%s\": %m"
 
-#: storage/smgr/md.c:1163
+#: storage/smgr/md.c:1289
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "не вдалося скоротити файл \"%s\" до %u блоків: лише %u блоків зараз"
 
-#: storage/smgr/md.c:1218
+#: storage/smgr/md.c:1344
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "не вдалося скоротити файл \"%s\" до %u блоків: %m"
 
-#: storage/smgr/md.c:1688
+#: storage/smgr/md.c:1832
 #, c-format
 msgid "could not open file \"%s\" (target block %u): previous segment is only %u blocks"
 msgstr "не вдалося відкрити файл \"%s\" (цільовий блок %u): попередній сегмент має лише %u блоків"
 
-#: storage/smgr/md.c:1702
+#: storage/smgr/md.c:1846
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "не вдалося відкрити файл \"%s\" (цільовий блок %u): %m"
 
-#: tcop/backend_startup.c:85
+#: storage/smgr/smgr.c:1106
+#, c-format
+msgid "file \"%s\""
+msgstr "файл \"%s\""
+
+#: storage/smgr/smgr.c:1108
+#, c-format
+msgid "block %u in file \"%s\""
+msgstr "блок %u у файлі \"%s\""
+
+#: storage/smgr/smgr.c:1112
+#, c-format
+msgid "blocks %u..%u in file \"%s\""
+msgstr "блоки %u..%u у файлі \"%s\""
+
+#: tcop/backend_startup.c:104
 #, c-format
 msgid "SSL configuration could not be loaded in child process"
 msgstr "Не вдалося завантажити конфігурацію SSL в дочірній процес"
 
-#: tcop/backend_startup.c:208
+#: tcop/backend_startup.c:226
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "з'єднання отримано: хост=%s порт=%s"
 
-#: tcop/backend_startup.c:213
+#: tcop/backend_startup.c:231
 #, c-format
 msgid "connection received: host=%s"
 msgstr "з'єднання отримано: хост=%s"
 
-#: tcop/backend_startup.c:277
+#: tcop/backend_startup.c:309
 #, c-format
 msgid "the database system is starting up"
 msgstr "система бази даних запускається"
 
-#: tcop/backend_startup.c:283
+#: tcop/backend_startup.c:315
+#, c-format
+msgid "the database system is not accepting connections"
+msgstr "система бази даних не приймає підключення"
+
+#: tcop/backend_startup.c:316
+#, c-format
+msgid "Hot standby mode is disabled."
+msgstr "Режим Hot standby вимкнений."
+
+#: tcop/backend_startup.c:320 tcop/backend_startup.c:327
 #, c-format
 msgid "the database system is not yet accepting connections"
 msgstr "система бази даних ще не приймає підключення"
 
-#: tcop/backend_startup.c:284
+#: tcop/backend_startup.c:321
 #, c-format
-msgid "Consistent recovery state has not been yet reached."
-msgstr "Узгодженого стану відновлення ще не досягнуто."
+msgid "Recovery snapshot is not yet ready for hot standby."
+msgstr "Знімок відновлення ще не готовий для гарячого резерву."
 
-#: tcop/backend_startup.c:288
+#: tcop/backend_startup.c:322
 #, c-format
-msgid "the database system is not accepting connections"
-msgstr "система бази даних не приймає підключення"
+msgid "To enable hot standby, close write transactions with more than %d subtransactions on the primary server."
+msgstr "Щоб увімкнути гарячий резерв, закрийте транзакції запису з більш ніж %d підтранзакцій на основному сервері."
 
-#: tcop/backend_startup.c:289
+#: tcop/backend_startup.c:328
 #, c-format
-msgid "Hot standby mode is disabled."
-msgstr "Режим Hot standby вимкнений."
+msgid "Consistent recovery state has not been yet reached."
+msgstr "Узгодженого стану відновлення ще не досягнуто."
 
-#: tcop/backend_startup.c:294
+#: tcop/backend_startup.c:333
 #, c-format
 msgid "the database system is shutting down"
 msgstr "система бази даних завершує роботу"
 
-#: tcop/backend_startup.c:299
+#: tcop/backend_startup.c:338
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "система бази даних у режимі відновлення"
 
-#: tcop/backend_startup.c:414
+#: tcop/backend_startup.c:453
 #, c-format
 msgid "received direct SSL connection request without ALPN protocol negotiation extension"
-msgstr ""
+msgstr "отримано запит на підключення до SSL без розширення протоколу ALPN"
 
-#: tcop/backend_startup.c:420
+#: tcop/backend_startup.c:459
 #, c-format
 msgid "direct SSL connection accepted"
-msgstr ""
+msgstr "прийнято пряме SSL-підключення"
 
-#: tcop/backend_startup.c:430
+#: tcop/backend_startup.c:469
 #, c-format
 msgid "direct SSL connection rejected"
-msgstr ""
+msgstr "пряме SSL підключення відхилено"
 
-#: tcop/backend_startup.c:489 tcop/backend_startup.c:517
+#: tcop/backend_startup.c:528 tcop/backend_startup.c:556
 #, c-format
 msgid "incomplete startup packet"
 msgstr "неповний стартовий пакет"
 
-#: tcop/backend_startup.c:501 tcop/backend_startup.c:538
+#: tcop/backend_startup.c:540
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "неприпустима довжина стартового пакету"
 
-#: tcop/backend_startup.c:573
+#: tcop/backend_startup.c:597
 #, c-format
 msgid "SSLRequest accepted"
-msgstr ""
+msgstr "SSLRequest прийнято"
 
-#: tcop/backend_startup.c:576
+#: tcop/backend_startup.c:600
 #, c-format
 msgid "SSLRequest rejected"
-msgstr ""
+msgstr "SSLRequest відхилено"
 
-#: tcop/backend_startup.c:585
+#: tcop/backend_startup.c:609
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "помилка надсилання протоколу SSL в процесі відповіді зв'язування: %m"
 
-#: tcop/backend_startup.c:603
+#: tcop/backend_startup.c:627
 #, c-format
 msgid "received unencrypted data after SSL request"
 msgstr "отримані незашифровані дані після запиту SSL"
 
-#: tcop/backend_startup.c:604 tcop/backend_startup.c:658
+#: tcop/backend_startup.c:628 tcop/backend_startup.c:682
 #, c-format
 msgid "This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."
 msgstr "Це може бути або помилкою клієнтського програмного забезпечення, або доказом спроби техносферної атаки."
 
-#: tcop/backend_startup.c:627
+#: tcop/backend_startup.c:651
 #, c-format
 msgid "GSSENCRequest accepted"
-msgstr ""
+msgstr "GSSENCRequest прийнятий"
 
-#: tcop/backend_startup.c:630
+#: tcop/backend_startup.c:654
 #, c-format
 msgid "GSSENCRequest rejected"
-msgstr ""
+msgstr "GSSENCRequest відхилений"
 
-#: tcop/backend_startup.c:639
+#: tcop/backend_startup.c:663
 #, c-format
 msgid "failed to send GSSAPI negotiation response: %m"
 msgstr "помилка надсилання GSSAPI в процесі відповіді зв'язування: %m"
 
-#: tcop/backend_startup.c:657
+#: tcop/backend_startup.c:681
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption request"
 msgstr "отримані незашифровані дані після запиту шифрування GSSAPI"
 
-#: tcop/backend_startup.c:681
+#: tcop/backend_startup.c:709
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr "протокол інтерфейсу, що не підтримується, %u.%u: сервер підтримує %u.0 до %u.%u"
 
-#: tcop/backend_startup.c:744
+#: tcop/backend_startup.c:772
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Дійсні значення: \"false\", 0, \"true\", 1, \"database\"."
 
-#: tcop/backend_startup.c:785
+#: tcop/backend_startup.c:813
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "неприпустима структура стартового пакету: останнім байтом очікувався термінатор"
 
-#: tcop/backend_startup.c:802
+#: tcop/backend_startup.c:830
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "не вказано жодного ім'я користувача PostgreSQL у стартовому пакеті"
 
-#: tcop/fastpath.c:142 utils/fmgr/fmgr.c:2161
+#: tcop/backend_startup.c:884
+#, c-format
+msgid "invalid length of cancel request packet"
+msgstr "неправильна довжина пакету запиту скасування"
+
+#: tcop/backend_startup.c:892
+#, c-format
+msgid "invalid length of cancel key in cancel request packet"
+msgstr "неправильна довжина ключа скасування в пакеті запиту скасування"
+
+#: tcop/backend_startup.c:1022
+#, c-format
+msgid "Cannot specify log_connections option \"%s\" in a list with other options."
+msgstr "Неможливо вказати параметр log_connections \"%s\" у списку з іншими параметрами."
+
+#: tcop/fastpath.c:141 utils/fmgr/fmgr.c:2161
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "функція з OID %u не існує"
 
-#: tcop/fastpath.c:149
+#: tcop/fastpath.c:148
 #, c-format
 msgid "cannot call function \"%s\" via fastpath interface"
 msgstr "неможливо викликати функцію \"%s\" через інтерфейс fastpath"
 
-#: tcop/fastpath.c:234
+#: tcop/fastpath.c:233
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "виклик функції fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:313 tcop/postgres.c:1369 tcop/postgres.c:1605
-#: tcop/postgres.c:2071 tcop/postgres.c:2333
+#: tcop/fastpath.c:312 tcop/postgres.c:1363 tcop/postgres.c:1599
+#: tcop/postgres.c:2077 tcop/postgres.c:2349
 #, c-format
 msgid "duration: %s ms"
 msgstr "тривалість: %s мс"
 
-#: tcop/fastpath.c:317
+#: tcop/fastpath.c:316
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "тривалість: %s мс, виклик функції fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:353
+#: tcop/fastpath.c:352
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr "повідомлення виклику функції містить %d аргументів, але функція потребує %d"
 
-#: tcop/fastpath.c:361
+#: tcop/fastpath.c:360
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr "повідомлення виклику функції містить %d форматів, але %d аргументів"
 
-#: tcop/fastpath.c:385
+#: tcop/fastpath.c:384
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "неприпустимий розмір аргументу %d в повідомленні виклику функції"
 
-#: tcop/fastpath.c:448
+#: tcop/fastpath.c:447
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "неправильний формат двійкових даних в аргументі функції %d"
 
-#: tcop/postgres.c:467 tcop/postgres.c:5012
+#: tcop/postgres.c:455 tcop/postgres.c:5018
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "неприпустимий тип клієнтського повідомлення %d"
 
-#: tcop/postgres.c:1076
+#: tcop/postgres.c:1070
 #, c-format
 msgid "statement: %s"
 msgstr "оператор: %s"
 
-#: tcop/postgres.c:1374
+#: tcop/postgres.c:1368
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "тривалість: %s мс, оператор: %s"
 
-#: tcop/postgres.c:1480
+#: tcop/postgres.c:1474
 #, c-format
 msgid "cannot insert multiple commands into a prepared statement"
 msgstr "до підтготовленого оператору не можна вставити декілька команд"
 
-#: tcop/postgres.c:1610
+#: tcop/postgres.c:1604
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "тривалість: %s мс, аналізування %s: %s"
 
-#: tcop/postgres.c:1677 tcop/postgres.c:2653
+#: tcop/postgres.c:1671 tcop/postgres.c:2669
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "підготовлений оператор без імені не існує"
 
-#: tcop/postgres.c:1729
+#: tcop/postgres.c:1723
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "повідомлення bind має %d форматів, але %d параметрів"
 
-#: tcop/postgres.c:1735
+#: tcop/postgres.c:1729
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr "в повідомленні bind передано %d параметрів, але підготовлений оператор \"%s\" потребує %d"
 
-#: tcop/postgres.c:1949
+#: tcop/postgres.c:1943
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "невірний формат двійкових даних в параметрі bind %d"
 
-#: tcop/postgres.c:2076
+#: tcop/postgres.c:2082
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "тривалість: %s мс, повідомлення bind %s%s%s: %s"
 
-#: tcop/postgres.c:2131 tcop/postgres.c:2735
+#: tcop/postgres.c:2137 tcop/postgres.c:2751
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "портал \"%s\" не існує"
 
-#: tcop/postgres.c:2213
+#: tcop/postgres.c:2230
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2215 tcop/postgres.c:2341
+#: tcop/postgres.c:2232 tcop/postgres.c:2357
 msgid "execute fetch from"
 msgstr "виконати витягнення з"
 
-#: tcop/postgres.c:2216 tcop/postgres.c:2342
+#: tcop/postgres.c:2233 tcop/postgres.c:2358
 msgid "execute"
 msgstr "виконувати"
 
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:2354
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "тривалість: %s мс %s %s%s%s: %s"
 
-#: tcop/postgres.c:2486
+#: tcop/postgres.c:2502
 #, c-format
 msgid "prepare: %s"
 msgstr "підготовка: %s"
 
-#: tcop/postgres.c:2511
+#: tcop/postgres.c:2527
 #, c-format
 msgid "Parameters: %s"
 msgstr "Параметри: %s"
 
-#: tcop/postgres.c:2526
+#: tcop/postgres.c:2542
 #, c-format
 msgid "Abort reason: recovery conflict"
 msgstr "Причина переривання: конфлікт відновлення"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2558
 #, c-format
 msgid "User was holding shared buffer pin for too long."
 msgstr "Користувач утримував позначку спільного буферу занадто довго."
 
-#: tcop/postgres.c:2545
+#: tcop/postgres.c:2561
 #, c-format
 msgid "User was holding a relation lock for too long."
 msgstr "Користувач утримував блокування відношення занадто довго."
 
-#: tcop/postgres.c:2548
+#: tcop/postgres.c:2564
 #, c-format
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "Користувач використовував табличний простір який повинен бути видаленим."
 
-#: tcop/postgres.c:2551
+#: tcop/postgres.c:2567
 #, c-format
 msgid "User query might have needed to see row versions that must be removed."
 msgstr "Запиту користувача потрібно було бачити версії рядків, які повинні бути видалені."
 
-#: tcop/postgres.c:2554
+#: tcop/postgres.c:2570
 #, c-format
 msgid "User was using a logical replication slot that must be invalidated."
 msgstr "Користувач використовував логічний слот реплікації, який повинен бути анульований."
 
-#: tcop/postgres.c:2560
+#: tcop/postgres.c:2576
 #, c-format
 msgid "User was connected to a database that must be dropped."
 msgstr "Користувач був підключен до бази даних, яка повинна бути видалена."
 
-#: tcop/postgres.c:2599
+#: tcop/postgres.c:2615
 #, c-format
 msgid "portal \"%s\" parameter $%d = %s"
 msgstr "параметр порталу \"%s\": $%d = %s"
 
-#: tcop/postgres.c:2602
+#: tcop/postgres.c:2618
 #, c-format
 msgid "portal \"%s\" parameter $%d"
 msgstr "параметр порталу \"%s\":  $%d"
 
-#: tcop/postgres.c:2608
+#: tcop/postgres.c:2624
 #, c-format
 msgid "unnamed portal parameter $%d = %s"
 msgstr "параметр порталу без назви $%d = %s"
 
-#: tcop/postgres.c:2611
+#: tcop/postgres.c:2627
 #, c-format
 msgid "unnamed portal parameter $%d"
 msgstr "параметр порталу без назви $%d"
 
-#: tcop/postgres.c:2955
+#: tcop/postgres.c:2982
 #, c-format
 msgid "terminating connection because of unexpected SIGQUIT signal"
 msgstr "завершення підключення через неочікуваний сигнал SIGQUIT"
 
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2988
 #, c-format
 msgid "terminating connection because of crash of another server process"
 msgstr "завершення підключення через аварійне завершення роботи іншого серверного процесу"
 
-#: tcop/postgres.c:2962
+#: tcop/postgres.c:2989
 #, 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 "Керуючий процес віддав команду цьому серверному процесу відкотити поточну транзакцію і завершитися, тому, що інший серверний процес завершився неправильно і можливо пошкодив спільну пам'ять."
 
-#: tcop/postgres.c:2966 tcop/postgres.c:3219
+#: tcop/postgres.c:2993 tcop/postgres.c:3246
 #, c-format
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr "В цей момент ви можете повторно підключитися до бази даних і повторити вашу команду."
 
-#: tcop/postgres.c:2973
+#: tcop/postgres.c:3000
 #, c-format
 msgid "terminating connection due to immediate shutdown command"
 msgstr "завершення підключення через команду негайного завершення роботи"
 
-#: tcop/postgres.c:3051
+#: tcop/postgres.c:3078
 #, c-format
 msgid "floating-point exception"
 msgstr "виняток в операції з рухомою комою"
 
-#: tcop/postgres.c:3052
+#: tcop/postgres.c:3079
 #, 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 "Надійшло повідомлення про неприпустиму операцію з рухомою комою. Можливо, це значить, що результат виявився за діапазоном або виникла неприпустима операція, така як ділення на нуль."
 
-#: tcop/postgres.c:3217
+#: tcop/postgres.c:3244
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "завершення підключення через конфлікт з процесом відновлення"
 
-#: tcop/postgres.c:3289
+#: tcop/postgres.c:3316
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "скасування автентифікації через тайм-аут"
 
-#: tcop/postgres.c:3293
+#: tcop/postgres.c:3320
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "завершення процесу автоочистки по команді адміністратора"
 
-#: tcop/postgres.c:3297
+#: tcop/postgres.c:3324
 #, c-format
 msgid "terminating logical replication worker due to administrator command"
 msgstr "завершення обробника логічної реплікації по команді адміністратора"
 
-#: tcop/postgres.c:3317
+#: tcop/postgres.c:3339
+#, c-format
+msgid "terminating walreceiver process due to administrator command"
+msgstr "завершення процесу walreceiver по команді адміністратора"
+
+#: tcop/postgres.c:3355
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "завершення підключення по команді адміністратора"
 
-#: tcop/postgres.c:3348
+#: tcop/postgres.c:3386
 #, c-format
 msgid "connection to client lost"
 msgstr "підключення до клієнта втрачено"
 
-#: tcop/postgres.c:3400
+#: tcop/postgres.c:3438
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "виконання оператора скасовано через тайм-аут блокування"
 
-#: tcop/postgres.c:3407
+#: tcop/postgres.c:3445
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "виконання оператора скасовано через тайм-аут"
 
-#: tcop/postgres.c:3414
+#: tcop/postgres.c:3452
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "скасування завдання автоочистки"
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3465
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "виконання оператора скасовано по запиту користувача"
 
-#: tcop/postgres.c:3448
+#: tcop/postgres.c:3486
 #, c-format
 msgid "terminating connection due to idle-in-transaction timeout"
 msgstr "завершення підключення через тайм-аут бездіяльності в транзакції"
 
-#: tcop/postgres.c:3461
+#: tcop/postgres.c:3499
 #, c-format
 msgid "terminating connection due to transaction timeout"
 msgstr "переривання з'єднання через тайм-аут транзакції"
 
-#: tcop/postgres.c:3474
+#: tcop/postgres.c:3512
 #, c-format
 msgid "terminating connection due to idle-session timeout"
 msgstr "завершення підключення через тайм-аут неактивного сеансу"
 
-#: tcop/postgres.c:3564
-#, c-format
-msgid "stack depth limit exceeded"
-msgstr "перевищено ліміт глибини стека"
-
-#: tcop/postgres.c:3565
-#, c-format
-msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
-msgstr "Збільште параметр конфігурації \"max_stack_depth\" (поточне значення %d КБ), попередньо переконавшись, що ОС надає достатній розмір стеку."
-
-#: tcop/postgres.c:3612
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "Значення \"max_stack_depth\" не повинно перевищувати %ld КБ."
-
-#: tcop/postgres.c:3614
-#, c-format
-msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
-msgstr "Збільшіть ліміт глибини стека в системі через команду \"ulimit -s\" або через локальний еквівалент."
-
-#: tcop/postgres.c:3637
+#: tcop/postgres.c:3548
 #, c-format
 msgid "\"client_connection_check_interval\" must be set to 0 on this platform."
-msgstr ""
+msgstr "\"client_connection_check_interval\" має бути встановлений в 0 на цій платформі."
 
-#: tcop/postgres.c:3658
+#: tcop/postgres.c:3569
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "Не можна ввімкнути параметр, коли \"log_statement_stats\" дорівнює true."
 
-#: tcop/postgres.c:3673
+#: tcop/postgres.c:3584
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "Не можна ввімкнути \"log_statement_stats\", коли \"log_parser_stats\", \"log_planner_stats\", або \"log_executor_stats\" дорівнюють true."
 
-#: tcop/postgres.c:4098
+#: tcop/postgres.c:4024
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "неприпустимий аргумент командного рядка для серверного процесу: %s"
 
-#: tcop/postgres.c:4099 tcop/postgres.c:4105
+#: tcop/postgres.c:4025 tcop/postgres.c:4031
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: tcop/postgres.c:4103
+#: tcop/postgres.c:4029
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: неприпустимий аргумент командного рядка: %s"
 
-#: tcop/postgres.c:4156
+#: tcop/postgres.c:4082
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: ні база даних, ні ім'я користувача не вказані"
 
-#: tcop/postgres.c:4909
+#: tcop/postgres.c:4275
+#, c-format
+msgid "could not generate random cancel key"
+msgstr "не вдалося згенерувати випадковий ключ скасування"
+
+#: tcop/postgres.c:4677
+#, c-format
+msgid "connection ready: setup total=%.3f ms, fork=%.3f ms, authentication=%.3f ms"
+msgstr "з'єднання готове: загальний час налаштування=%.3f мс, розгалуження=%.3f мс, аутентифікація=%.3f мс"
+
+#: tcop/postgres.c:4908
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "неприпустимий підтип повідомлення CLOSE %d"
 
-#: tcop/postgres.c:4946
+#: tcop/postgres.c:4945
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "неприпустимий підтип повідомлення DESCRIBE %d"
 
-#: tcop/postgres.c:5033
+#: tcop/postgres.c:5039
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "виклики функції fastpath не підтримуються в підключенні реплікації"
 
-#: tcop/postgres.c:5037
+#: tcop/postgres.c:5043
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "протокол розширених запитів не підтримується в підключенні реплікації"
 
-#: tcop/postgres.c:5217
+#: tcop/postgres.c:5189
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "відключення: час сеансу: %d:%02d:%02d.%03d користувач = %s база даних = %s хост = %s%s%s"
 
-#: tcop/pquery.c:641
+#: tcop/pquery.c:642
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "повідомлення bind має %d форматів, але запит має %d стовпців"
 
-#: tcop/pquery.c:944 tcop/pquery.c:1701
+#: tcop/pquery.c:940 tcop/pquery.c:1684
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "курсор може сканувати лише вперед"
 
-#: tcop/pquery.c:945 tcop/pquery.c:1702
+#: tcop/pquery.c:941 tcop/pquery.c:1685
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Оголосити з параметром SCROLL, щоб активувати зворотню розгортку."
@@ -23365,68 +24511,73 @@ msgid "cannot execute %s within security-restricted operation"
 msgstr "не можна виконати %s в межах операції з обмеженнями безпеки"
 
 #. translator: %s is name of a SQL command, eg LISTEN
-#: tcop/utility.c:821
+#: tcop/utility.c:824
 #, c-format
 msgid "cannot execute %s within a background process"
 msgstr "не можна виконати %s у фоновому процесі"
 
 #. translator: %s is name of a SQL command, eg CHECKPOINT
-#: tcop/utility.c:947
+#: tcop/utility.c:950
 #, c-format
 msgid "permission denied to execute %s command"
 msgstr "немає дозволу для виконання команди %s"
 
-#: tcop/utility.c:949
+#: tcop/utility.c:952
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may execute this command."
 msgstr "Цю команду можуть виконувати лише ролі з привілеями ролі \"%s\"."
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:616
+#: tcop/utility.c:1886
+#, c-format
+msgid "CREATE STATISTICS only supports relation names in the FROM clause"
+msgstr "CREATE STATISTICS підтримує тільки назви відношень в реченні FROM"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:616
 #, c-format
 msgid "multiple DictFile parameters"
 msgstr "повторюваний параметр DictFile"
 
-#: tsearch/dict_ispell.c:63
+#: tsearch/dict_ispell.c:64
 #, c-format
 msgid "multiple AffFile parameters"
 msgstr "повторюваний параметр AffFile"
 
-#: tsearch/dict_ispell.c:82
+#: tsearch/dict_ispell.c:83
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
 msgstr "нерозпізнаний параметр Ispell: \"%s\""
 
-#: tsearch/dict_ispell.c:96
+#: tsearch/dict_ispell.c:97
 #, c-format
 msgid "missing AffFile parameter"
 msgstr "пропущено параметр AffFile"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:640
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:640
 #, c-format
 msgid "missing DictFile parameter"
 msgstr "пропущено параметр DictFile"
 
-#: tsearch/dict_simple.c:58
+#: tsearch/dict_simple.c:59
 #, c-format
 msgid "multiple Accept parameters"
 msgstr "повторюваний параметр Accept"
 
-#: tsearch/dict_simple.c:66
+#: tsearch/dict_simple.c:67
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
 msgstr "нерозпізнаний параметр простого словника: \"%s\""
 
-#: tsearch/dict_synonym.c:118
+#: tsearch/dict_synonym.c:120
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
 msgstr "нерозпізнаний параметр функціїї синонімів: \"%s\""
 
-#: tsearch/dict_synonym.c:125
+#: tsearch/dict_synonym.c:127
 #, c-format
 msgid "missing Synonyms parameter"
 msgstr "пропущено параметр Synonyms"
 
-#: tsearch/dict_synonym.c:132
+#: tsearch/dict_synonym.c:134
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
 msgstr "не вдалося відкрити файл синонімів \"%s\": %m"
@@ -23501,89 +24652,84 @@ msgstr "нерозпізнаний параметр тезаурусу: \"%s\""
 msgid "missing Dictionary parameter"
 msgstr "пропущено параметр Dictionary"
 
-#: tsearch/spell.c:381 tsearch/spell.c:398 tsearch/spell.c:407
-#: tsearch/spell.c:1043
+#: tsearch/spell.c:383 tsearch/spell.c:400 tsearch/spell.c:409
+#: tsearch/spell.c:1046
 #, c-format
 msgid "invalid affix flag \"%s\""
 msgstr "неприпустимиа позначка affix \"%s\""
 
-#: tsearch/spell.c:385 tsearch/spell.c:1047
+#: tsearch/spell.c:387 tsearch/spell.c:1050
 #, c-format
 msgid "affix flag \"%s\" is out of range"
 msgstr "позначка affix \"%s\" поза діапазоном"
 
-#: tsearch/spell.c:415
+#: tsearch/spell.c:417
 #, c-format
 msgid "invalid character in affix flag \"%s\""
 msgstr "неприпустимий символ в позначці affix \"%s\""
 
-#: tsearch/spell.c:435
+#: tsearch/spell.c:437
 #, c-format
 msgid "invalid affix flag \"%s\" with \"long\" flag value"
 msgstr "неприпустима позначка affix \"%s\" зі значенням позначки \"long\""
 
-#: tsearch/spell.c:525
+#: tsearch/spell.c:527
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "не вдалося відкрити файл словника \"%s\": %m"
 
-#: tsearch/spell.c:749 utils/adt/regexp.c:223 jsonpath_gram.y:629
+#: tsearch/spell.c:751 utils/adt/regexp.c:223 jsonpath_gram.y:631
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "неприпустимий регулярний вираз: %s"
 
-#: tsearch/spell.c:963 tsearch/spell.c:980 tsearch/spell.c:997
-#: tsearch/spell.c:1014 tsearch/spell.c:1079 gram.y:18735 gram.y:18752
+#: tsearch/spell.c:965 tsearch/spell.c:982 tsearch/spell.c:999
+#: tsearch/spell.c:1016 tsearch/spell.c:1082 gram.y:18905 gram.y:18922
 #, c-format
 msgid "syntax error"
 msgstr "синтаксична помилка"
 
-#: tsearch/spell.c:1170 tsearch/spell.c:1182 tsearch/spell.c:1742
-#: tsearch/spell.c:1747 tsearch/spell.c:1752
+#: tsearch/spell.c:1174 tsearch/spell.c:1186 tsearch/spell.c:1751
+#: tsearch/spell.c:1756 tsearch/spell.c:1761
 #, c-format
 msgid "invalid affix alias \"%s\""
 msgstr "неприпустимий псевдонім affix \"%s\""
 
-#: tsearch/spell.c:1223 tsearch/spell.c:1294 tsearch/spell.c:1443
+#: tsearch/spell.c:1227 tsearch/spell.c:1298 tsearch/spell.c:1447
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "не вдалося відкрити файл affix \"%s\": %m"
 
-#: tsearch/spell.c:1277
+#: tsearch/spell.c:1281
 #, c-format
 msgid "Ispell dictionary supports only \"default\", \"long\", and \"num\" flag values"
 msgstr "Словник Ispell підтримує для позначки лише значення \"default\", \"long\", і\"num\""
 
-#: tsearch/spell.c:1321
+#: tsearch/spell.c:1325
 #, c-format
 msgid "invalid number of flag vector aliases"
 msgstr "неприпустима кількість векторів позначок"
 
-#: tsearch/spell.c:1344
+#: tsearch/spell.c:1348
 #, c-format
 msgid "number of aliases exceeds specified number %d"
 msgstr "кількість псевдонімів перевищує вказане число %d"
 
-#: tsearch/spell.c:1559
+#: tsearch/spell.c:1563
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "файл affix містить команди і в старому, і в новому стилі"
 
-#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:277 utils/adt/tsvector_op.c:1126
+#: tsearch/to_tsany.c:194 utils/adt/tsvector.c:274 utils/adt/tsvector_op.c:1126
 #, c-format
 msgid "string is too long for tsvector (%d bytes, max %d bytes)"
 msgstr "рядок занадто довгий для tsvector (%d байт, максимум %d байт)"
 
-#: tsearch/ts_locale.c:236
+#: tsearch/ts_locale.c:191
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
 msgstr "рядок %d файлу конфігурації \"%s\": \"%s\""
 
-#: tsearch/ts_locale.c:315
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "перетворити wchar_t в кодування серверу не вдалося: %mв"
-
 #: tsearch/ts_parse.c:387 tsearch/ts_parse.c:394 tsearch/ts_parse.c:573
 #: tsearch/ts_parse.c:580
 #, c-format
@@ -23596,12 +24742,12 @@ msgstr "слово занадто довге для індексування"
 msgid "Words longer than %d characters are ignored."
 msgstr "Слова довші за %d символів пропускаються."
 
-#: tsearch/ts_utils.c:51
+#: tsearch/ts_utils.c:52
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
 msgstr "неприпустиме ім'я файлу конфігурації текстового пошуку \"%s\""
 
-#: tsearch/ts_utils.c:83
+#: tsearch/ts_utils.c:84
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
 msgstr "не вдалося відкрити файл стоп-слова \"%s\": %m"
@@ -23618,60 +24764,106 @@ msgstr "нерозпізнаний параметр заголовку: \"%s\""
 
 #: tsearch/wparser_def.c:2674
 #, c-format
-msgid "MinWords should be less than MaxWords"
-msgstr "Значення MinWords повинно бути меньшим за MaxWords"
+msgid "%s must be less than %s"
+msgstr "%s має бути менше ніж %s"
 
 #: tsearch/wparser_def.c:2678
 #, c-format
-msgid "MinWords should be positive"
-msgstr "Значення MinWords повинно бути позитивним"
+msgid "%s must be positive"
+msgstr "%s має бути додатним"
 
-#: tsearch/wparser_def.c:2682
+#: tsearch/wparser_def.c:2682 tsearch/wparser_def.c:2686
 #, c-format
-msgid "ShortWord should be >= 0"
-msgstr "Значення ShortWord повинно бути >= 0"
+msgid "%s must be >= 0"
+msgstr "%s повинно бути >= 0"
 
-#: tsearch/wparser_def.c:2686
-#, c-format
-msgid "MaxFragments should be >= 0"
-msgstr "Значення MaxFragments повинно бути >= 0"
-
-#: utils/activity/pgstat.c:435
+#: utils/activity/pgstat.c:534
 #, c-format
 msgid "could not unlink permanent statistics file \"%s\": %m"
 msgstr "не вдалося від'єднати файл постійної статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1252
+#: utils/activity/pgstat.c:1426
 #, c-format
 msgid "invalid statistics kind: \"%s\""
 msgstr "неприпустимий тип статистики: \"%s\""
 
-#: utils/activity/pgstat.c:1332
+#: utils/activity/pgstat.c:1471
+#, c-format
+msgid "custom cumulative statistics name is invalid"
+msgstr "назва користувацької кумулятивної статистики недійсна"
+
+#: utils/activity/pgstat.c:1472
+#, c-format
+msgid "Provide a non-empty name for the custom cumulative statistics."
+msgstr "Надайте непорожнє ім'я для користувацької кумулятивної статистики."
+
+#: utils/activity/pgstat.c:1475
+#, c-format
+msgid "custom cumulative statistics ID %u is out of range"
+msgstr "ID користувацької кумулятивної статистики %u поза межами діапазону"
+
+#: utils/activity/pgstat.c:1476
+#, c-format
+msgid "Provide a custom cumulative statistics ID between %u and %u."
+msgstr "Надайте ID користувацької кумулятивної статистики від %u до %u."
+
+#: utils/activity/pgstat.c:1481 utils/activity/pgstat.c:1508
+#: utils/activity/pgstat.c:1521
+#, c-format
+msgid "failed to register custom cumulative statistics \"%s\" with ID %u"
+msgstr "не вдалося зареєструвати користувацьку кумулятивну статистику \"%s\" з ID %u"
+
+#: utils/activity/pgstat.c:1482
+#, c-format
+msgid "Custom cumulative statistics must be registered while initializing modules in \"shared_preload_libraries\"."
+msgstr "Користувацька кумулятивна статистика повинна бути зареєстрована під час ініціалізації модулів в \"shared_preload_libraries\"."
+
+#: utils/activity/pgstat.c:1491
+#, c-format
+msgid "custom cumulative statistics property is invalid"
+msgstr "властивість користувацької кумулятивної статистики недійсна"
+
+#: utils/activity/pgstat.c:1492
+#, c-format
+msgid "Custom cumulative statistics require a shared memory size for fixed-numbered objects."
+msgstr "Користувацька кумулятивна статистика потребує розмір спільної пам'яті для об'єктів з фіксованими номерами."
+
+#: utils/activity/pgstat.c:1509
+#, c-format
+msgid "Custom cumulative statistics \"%s\" already registered with the same ID."
+msgstr "Користувацька кумулятивна статистика \"%s\" вже зареєстрована з тим же ID."
+
+#: utils/activity/pgstat.c:1522
+#, c-format
+msgid "Existing cumulative statistics with ID %u has the same name."
+msgstr "Існуюча кумулятивна статистика з ID %u має те саме ім'я."
+
+#: utils/activity/pgstat.c:1528
+#, c-format
+msgid "registered custom cumulative statistics \"%s\" with ID %u"
+msgstr "зареєстровано користувацьку кумулятивну статистику \"%s\" з ID %u"
+
+#: utils/activity/pgstat.c:1597
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "не вдалося відкрити тимчасовий файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1444
+#: utils/activity/pgstat.c:1718
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "не вдалося записати в тимчасовий файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1453
+#: utils/activity/pgstat.c:1727
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "не вдалося закрити тимчасовий файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1461
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "не вдалося перейменувати тимчасовий файл статистики з \"%s\" в \"%s\": %m"
-
-#: utils/activity/pgstat.c:1510
+#: utils/activity/pgstat.c:1781
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "не вдалося відкрити файл статистики \"%s\": %m"
 
-#: utils/activity/pgstat.c:1672
+#: utils/activity/pgstat.c:2032
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "пошкоджений файл статистики \"%s\""
@@ -23681,199 +24873,204 @@ msgstr "пошкоджений файл статистики \"%s\""
 msgid "function call to dropped function"
 msgstr "виклик видаленої функції"
 
-#: utils/activity/pgstat_xact.c:362
+#: utils/activity/pgstat_shmem.c:536
 #, c-format
-msgid "resetting existing statistics for kind %s, db=%u, oid=%u"
-msgstr "скидання існуючої статистики для типу %s, db=%u, oid=%u"
+msgid "Failed while allocating entry %u/%u/%<PRIu64>."
+msgstr "Не вдалося виділити запис %u/%u/%<PRIu64>."
 
-#: utils/activity/wait_event.c:207 utils/activity/wait_event.c:232
+#: utils/activity/pgstat_xact.c:366
+#, c-format
+msgid "resetting existing statistics for kind %s, db=%u, oid=%<PRIu64>"
+msgstr "скидання існуючої статистики для типу %s, db=%u, oid=%<PRIu64>"
+
+#: utils/activity/wait_event.c:206 utils/activity/wait_event.c:231
 #, c-format
 msgid "wait event \"%s\" already exists in type \"%s\""
-msgstr ""
+msgstr "подія очікування \"%s\" вже існує в типі \"%s\""
 
-#: utils/activity/wait_event.c:246
+#: utils/activity/wait_event.c:245
 #, c-format
 msgid "too many custom wait events"
-msgstr ""
+msgstr "занадто багато користувацьких подій очікування"
 
-#: utils/adt/acl.c:183 utils/adt/name.c:93
+#: utils/adt/acl.c:204 utils/adt/name.c:93
 #, c-format
 msgid "identifier too long"
 msgstr "занадто довгий ідентифікатор"
 
-#: utils/adt/acl.c:184 utils/adt/name.c:94
+#: utils/adt/acl.c:205 utils/adt/name.c:94
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "Ідентифікатор повинен бути короче ніж %d символів."
 
-#: utils/adt/acl.c:272
+#: utils/adt/acl.c:293
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "нерозпізнане ключове слово: \"%s\""
 
-#: utils/adt/acl.c:273
+#: utils/adt/acl.c:294
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "Ключовим словом ACL повинно бути \"group\" або \"user\"."
 
-#: utils/adt/acl.c:281
+#: utils/adt/acl.c:302
 #, c-format
 msgid "missing name"
 msgstr "пропущено ім'я"
 
-#: utils/adt/acl.c:282
+#: utils/adt/acl.c:303
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "За ключовими словами \"group\" або \"user\" повинно йти ім'я."
 
-#: utils/adt/acl.c:288
+#: utils/adt/acl.c:309
 #, c-format
 msgid "missing \"=\" sign"
 msgstr "пропущено знак \"=\""
 
-#: utils/adt/acl.c:350
+#: utils/adt/acl.c:368
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "неприпустимий символ режиму: повинен бути один з \"%s\""
 
-#: utils/adt/acl.c:380
+#: utils/adt/acl.c:398
 #, c-format
 msgid "a name must follow the \"/\" sign"
 msgstr "за знаком \"/\" повинно прямувати ім'я"
 
-#: utils/adt/acl.c:392
+#: utils/adt/acl.c:410
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "призначив права користувач з ідентифікатором %u"
 
-#: utils/adt/acl.c:578
+#: utils/adt/acl.c:596
 #, c-format
 msgid "ACL array contains wrong data type"
 msgstr "Масив ACL містить неправильний тип даних"
 
-#: utils/adt/acl.c:582
+#: utils/adt/acl.c:600
 #, c-format
 msgid "ACL arrays must be one-dimensional"
 msgstr "Масиви ACL повинні бути одновимірними"
 
-#: utils/adt/acl.c:586
+#: utils/adt/acl.c:604
 #, c-format
 msgid "ACL arrays must not contain null values"
 msgstr "Масиви ACL не повинні містити значення null"
 
-#: utils/adt/acl.c:615
+#: utils/adt/acl.c:633
 #, c-format
 msgid "extra garbage at the end of the ACL specification"
 msgstr "зайве сміття в кінці специфікації ACL"
 
-#: utils/adt/acl.c:1263
+#: utils/adt/acl.c:1281
 #, c-format
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "параметри призначення прав не можна повернути тому, хто призначив їх вам"
 
-#: utils/adt/acl.c:1579
+#: utils/adt/acl.c:1597
 #, c-format
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert більше не підтримується"
 
-#: utils/adt/acl.c:1589
+#: utils/adt/acl.c:1607
 #, c-format
 msgid "aclremove is no longer supported"
 msgstr "aclremove більше не підтримується"
 
-#: utils/adt/acl.c:1709
+#: utils/adt/acl.c:1726
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "нерозпізнаний тип прав: \"%s\""
 
-#: utils/adt/acl.c:3550 utils/adt/regproc.c:100 utils/adt/regproc.c:265
+#: utils/adt/acl.c:3565 utils/adt/regproc.c:100 utils/adt/regproc.c:265
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "функція \"%s\" не існує"
 
-#: utils/adt/acl.c:5196
+#: utils/adt/acl.c:5347
 #, c-format
 msgid "must be able to SET ROLE \"%s\""
 msgstr "потрібно мати можливість SET ROLE \"%s\""
 
-#: utils/adt/array_userfuncs.c:102 utils/adt/array_userfuncs.c:489
-#: utils/adt/array_userfuncs.c:866 utils/adt/json.c:602 utils/adt/json.c:740
-#: utils/adt/json.c:790 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
+#: utils/adt/array_userfuncs.c:118 utils/adt/array_userfuncs.c:565
+#: utils/adt/array_userfuncs.c:942 utils/adt/json.c:611 utils/adt/json.c:749
+#: utils/adt/json.c:799 utils/adt/jsonb.c:1025 utils/adt/jsonb.c:1098
 #: utils/adt/jsonb.c:1530 utils/adt/jsonb.c:1718 utils/adt/jsonb.c:1728
 #, c-format
 msgid "could not determine input data type"
 msgstr "не вдалося визначити тип вхідних даних"
 
-#: utils/adt/array_userfuncs.c:107
+#: utils/adt/array_userfuncs.c:123
 #, c-format
 msgid "input data type is not an array"
 msgstr "тип вхідних даних не є масивом"
 
-#: utils/adt/array_userfuncs.c:151 utils/adt/array_userfuncs.c:203
-#: utils/adt/float.c:1222 utils/adt/float.c:1296 utils/adt/float.c:4022
-#: utils/adt/float.c:4060 utils/adt/int.c:778 utils/adt/int.c:800
+#: utils/adt/array_userfuncs.c:167 utils/adt/array_userfuncs.c:249
+#: utils/adt/float.c:1229 utils/adt/float.c:1303 utils/adt/float.c:4107
+#: utils/adt/float.c:4145 utils/adt/int.c:778 utils/adt/int.c:800
 #: utils/adt/int.c:814 utils/adt/int.c:828 utils/adt/int.c:859
 #: utils/adt/int.c:880 utils/adt/int.c:997 utils/adt/int.c:1011
 #: utils/adt/int.c:1025 utils/adt/int.c:1058 utils/adt/int.c:1072
 #: utils/adt/int.c:1086 utils/adt/int.c:1117 utils/adt/int.c:1199
 #: utils/adt/int.c:1263 utils/adt/int.c:1331 utils/adt/int.c:1337
-#: utils/adt/int8.c:1256 utils/adt/numeric.c:1917 utils/adt/numeric.c:4454
-#: utils/adt/rangetypes.c:1488 utils/adt/rangetypes.c:1501
-#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1135
-#: utils/adt/varlena.c:3137
+#: utils/adt/int8.c:1256 utils/adt/numeric.c:2040 utils/adt/numeric.c:4558
+#: utils/adt/rangetypes.c:1552 utils/adt/rangetypes.c:1565
+#: utils/adt/varbit.c:1195 utils/adt/varbit.c:1596 utils/adt/varlena.c:1143
+#: utils/adt/varlena.c:3195 utils/adt/varlena.c:4129
 #, c-format
 msgid "integer out of range"
 msgstr "ціле число поза діапазоном"
 
-#: utils/adt/array_userfuncs.c:158 utils/adt/array_userfuncs.c:213
+#: utils/adt/array_userfuncs.c:174 utils/adt/array_userfuncs.c:259
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "аргумент повинен бути пустим або одновимірним масивом"
 
-#: utils/adt/array_userfuncs.c:295 utils/adt/array_userfuncs.c:334
-#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:400
-#: utils/adt/array_userfuncs.c:428
+#: utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:410
+#: utils/adt/array_userfuncs.c:447 utils/adt/array_userfuncs.c:476
+#: utils/adt/array_userfuncs.c:504
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "об'єднувати несумісні масиви не можна"
 
-#: utils/adt/array_userfuncs.c:296
+#: utils/adt/array_userfuncs.c:372
 #, c-format
 msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Масиви з елементами типів %s і %s не є сумісними для об'єднання."
 
-#: utils/adt/array_userfuncs.c:335
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Масиви з вимірами %d і %d не є сумісними для об'єднання."
 
-#: utils/adt/array_userfuncs.c:372
+#: utils/adt/array_userfuncs.c:448
 #, c-format
 msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr "Масиви з різними вимірами елементів не є сумісними для об'єднання."
 
-#: utils/adt/array_userfuncs.c:401 utils/adt/array_userfuncs.c:429
+#: utils/adt/array_userfuncs.c:477 utils/adt/array_userfuncs.c:505
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Масиви з різними вимірами не є сумісними для об'єднання."
 
-#: utils/adt/array_userfuncs.c:975 utils/adt/array_userfuncs.c:983
-#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5622
+#: utils/adt/array_userfuncs.c:1051 utils/adt/array_userfuncs.c:1059
+#: utils/adt/arrayfuncs.c:5628 utils/adt/arrayfuncs.c:5634
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "накопичувати масиви різної розмірності не можна"
 
-#: utils/adt/array_userfuncs.c:1272 utils/adt/array_userfuncs.c:1426
+#: utils/adt/array_userfuncs.c:1348 utils/adt/array_userfuncs.c:1502
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "пошук елементів у багатовимірних масивах не підтримується"
 
-#: utils/adt/array_userfuncs.c:1301
+#: utils/adt/array_userfuncs.c:1377
 #, c-format
 msgid "initial position must not be null"
 msgstr "початкова позиція не повинна бути null"
 
-#: utils/adt/array_userfuncs.c:1674
+#: utils/adt/array_userfuncs.c:1750
 #, c-format
 msgid "sample size must be between 0 and %d"
 msgstr "розмір вибірки повинен бути між 0 і %d"
@@ -23958,7 +25155,7 @@ msgstr "Неочікуваний елемент масиву."
 msgid "Specified array dimensions do not match array contents."
 msgstr "Вказані виміри масиву не відповідають його вмісту."
 
-#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2598
+#: utils/adt/arrayfuncs.c:783 utils/adt/jsonfuncs.c:2600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "Багатовимірні масиви повинні мати вкладені масиви з відповідними вимірами."
@@ -23969,14 +25166,14 @@ msgid "Incorrectly quoted array element."
 msgstr "Неправильно процитовано елемент масиву."
 
 #: utils/adt/arrayfuncs.c:942 utils/adt/multirangetypes.c:165
-#: utils/adt/rangetypes.c:2464 utils/adt/rangetypes.c:2472
+#: utils/adt/rangetypes.c:2528 utils/adt/rangetypes.c:2536
 #: utils/adt/rowtypes.c:218 utils/adt/rowtypes.c:229
 #, c-format
 msgid "Unexpected end of input."
 msgstr "Неочікуваний кінец введення."
 
-#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3499
-#: utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:1301 utils/adt/arrayfuncs.c:3511
+#: utils/adt/arrayfuncs.c:6120
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "неприпустима кількість вимірів: %d"
@@ -23992,7 +25189,7 @@ msgid "binary data has array element type %u (%s) instead of expected %u (%s)"
 msgstr "двійкові дані мають тип елементу масиву %u (%s) замість очікуваного %u (%s)"
 
 #: utils/adt/arrayfuncs.c:1378 utils/adt/multirangetypes.c:450
-#: utils/adt/rangetypes.c:351 utils/cache/lsyscache.c:2958
+#: utils/adt/rangetypes.c:353 utils/cache/lsyscache.c:3098
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "для типу %s немає функції введення двійкових даних"
@@ -24003,7 +25200,7 @@ msgid "improper binary format in array element %d"
 msgstr "неправильний двійковий формат в елементі масиву %d"
 
 #: utils/adt/arrayfuncs.c:1588 utils/adt/multirangetypes.c:455
-#: utils/adt/rangetypes.c:356 utils/cache/lsyscache.c:2991
+#: utils/adt/rangetypes.c:358 utils/cache/lsyscache.c:3131
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "для типу %s немає функції виводу двійкових даних"
@@ -24015,11 +25212,11 @@ msgstr "розрізання масивів постійної довжини н
 
 #: utils/adt/arrayfuncs.c:2245 utils/adt/arrayfuncs.c:2267
 #: utils/adt/arrayfuncs.c:2316 utils/adt/arrayfuncs.c:2570
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6092
-#: utils/adt/arrayfuncs.c:6118 utils/adt/arrayfuncs.c:6129
-#: utils/adt/json.c:1433 utils/adt/json.c:1505 utils/adt/jsonb.c:1317
-#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4710 utils/adt/jsonfuncs.c:4863
-#: utils/adt/jsonfuncs.c:4974 utils/adt/jsonfuncs.c:5022
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:6106
+#: utils/adt/arrayfuncs.c:6132 utils/adt/arrayfuncs.c:6143
+#: utils/adt/json.c:1441 utils/adt/json.c:1509 utils/adt/jsonb.c:1317
+#: utils/adt/jsonb.c:1401 utils/adt/jsonfuncs.c:4734 utils/adt/jsonfuncs.c:4887
+#: utils/adt/jsonfuncs.c:4998 utils/adt/jsonfuncs.c:5046
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "невірне число верхніх індексів масива"
@@ -24055,90 +25252,90 @@ msgstr "Під час присвоєння значень зрізу в пуст
 msgid "source array too small"
 msgstr "вихідний масив занадто малий"
 
-#: utils/adt/arrayfuncs.c:3657
+#: utils/adt/arrayfuncs.c:3669
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "елемент масиву null не дозволений в цьому контексті"
 
-#: utils/adt/arrayfuncs.c:3828 utils/adt/arrayfuncs.c:3999
-#: utils/adt/arrayfuncs.c:4390
+#: utils/adt/arrayfuncs.c:3840 utils/adt/arrayfuncs.c:4011
+#: utils/adt/arrayfuncs.c:4402
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "не можна порівнювати масиви з елементами різних типів"
 
-#: utils/adt/arrayfuncs.c:4177 utils/adt/multirangetypes.c:2805
-#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1361
-#: utils/adt/rangetypes.c:1425 utils/adt/rowtypes.c:1875
+#: utils/adt/arrayfuncs.c:4189 utils/adt/multirangetypes.c:2805
+#: utils/adt/multirangetypes.c:2877 utils/adt/rangetypes.c:1425
+#: utils/adt/rangetypes.c:1489 utils/adt/rowtypes.c:1893
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "не вдалося визначити геш-функцію для типу %s"
 
-#: utils/adt/arrayfuncs.c:4305 utils/adt/rowtypes.c:1996
+#: utils/adt/arrayfuncs.c:4317 utils/adt/rowtypes.c:2014
 #, c-format
 msgid "could not identify an extended hash function for type %s"
 msgstr "не вдалося визначити розширену геш-функцію для типу %s"
 
-#: utils/adt/arrayfuncs.c:5506
+#: utils/adt/arrayfuncs.c:5518
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "тип даних %s не є типом масиву"
 
-#: utils/adt/arrayfuncs.c:5561
+#: utils/adt/arrayfuncs.c:5573
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "накопичувати null-масиви не можна"
 
-#: utils/adt/arrayfuncs.c:5589
+#: utils/adt/arrayfuncs.c:5601
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "накопичувати пусті масиви не можна"
 
-#: utils/adt/arrayfuncs.c:5990 utils/adt/arrayfuncs.c:6030
+#: utils/adt/arrayfuncs.c:6004 utils/adt/arrayfuncs.c:6044
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "масив розмірності або масив нижніх границь не може бути null"
 
-#: utils/adt/arrayfuncs.c:6093 utils/adt/arrayfuncs.c:6119
+#: utils/adt/arrayfuncs.c:6107 utils/adt/arrayfuncs.c:6133
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Масив розмірності повинен бути одновимірним."
 
-#: utils/adt/arrayfuncs.c:6098 utils/adt/arrayfuncs.c:6124
+#: utils/adt/arrayfuncs.c:6112 utils/adt/arrayfuncs.c:6138
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "значення розмірностей не можуть бути null"
 
-#: utils/adt/arrayfuncs.c:6130
+#: utils/adt/arrayfuncs.c:6144
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "Масив нижніх границь відрізняється за розміром від масиву розмірностей."
 
-#: utils/adt/arrayfuncs.c:6411
+#: utils/adt/arrayfuncs.c:6425
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "видалення елементів з багатовимірних масивів не підтримується"
 
-#: utils/adt/arrayfuncs.c:6688
+#: utils/adt/arrayfuncs.c:6702
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "граничне значення повинно вказуватись одновимірним масивом"
 
-#: utils/adt/arrayfuncs.c:6693
+#: utils/adt/arrayfuncs.c:6707
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "масив границь не повинен містити NULL"
 
-#: utils/adt/arrayfuncs.c:6926
+#: utils/adt/arrayfuncs.c:6940
 #, c-format
 msgid "number of elements to trim must be between 0 and %d"
 msgstr "кількість елементів для обрізки має бути між 0 і %d"
 
-#: utils/adt/arraysubs.c:93 utils/adt/arraysubs.c:130
+#: utils/adt/arraysubs.c:94 utils/adt/arraysubs.c:131
 #, c-format
 msgid "array subscript must have type integer"
 msgstr "індекс елементу масиву має бути цілим числом"
 
-#: utils/adt/arraysubs.c:198 utils/adt/arraysubs.c:217
+#: utils/adt/arraysubs.c:199 utils/adt/arraysubs.c:218
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "підрядковий символ масиву у призначенні не може бути NULL"
@@ -24169,21 +25366,21 @@ msgid "encoding conversion from %s to ASCII not supported"
 msgstr "перетворення кодування з %s в ASCII не підтримується"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/bool.c:149 utils/adt/cash.c:354 utils/adt/datetime.c:4142
-#: utils/adt/float.c:200 utils/adt/float.c:287 utils/adt/float.c:301
-#: utils/adt/float.c:406 utils/adt/float.c:489 utils/adt/float.c:503
+#: utils/adt/bool.c:150 utils/adt/cash.c:354 utils/adt/datetime.c:4264
+#: utils/adt/float.c:207 utils/adt/float.c:294 utils/adt/float.c:308
+#: utils/adt/float.c:413 utils/adt/float.c:496 utils/adt/float.c:510
 #: utils/adt/geo_ops.c:250 utils/adt/geo_ops.c:335 utils/adt/geo_ops.c:974
 #: utils/adt/geo_ops.c:1417 utils/adt/geo_ops.c:1454 utils/adt/geo_ops.c:1462
 #: utils/adt/geo_ops.c:3428 utils/adt/geo_ops.c:4650 utils/adt/geo_ops.c:4665
 #: utils/adt/geo_ops.c:4672 utils/adt/int.c:174 utils/adt/int.c:186
 #: utils/adt/jsonpath.c:185 utils/adt/mac.c:94 utils/adt/mac8.c:226
-#: utils/adt/network.c:99 utils/adt/numeric.c:803 utils/adt/numeric.c:7221
-#: utils/adt/numeric.c:7424 utils/adt/numeric.c:8371 utils/adt/numutils.c:356
-#: utils/adt/numutils.c:618 utils/adt/numutils.c:880 utils/adt/numutils.c:919
-#: utils/adt/numutils.c:941 utils/adt/numutils.c:1005 utils/adt/numutils.c:1027
+#: utils/adt/network.c:99 utils/adt/numeric.c:805 utils/adt/numeric.c:7325
+#: utils/adt/numeric.c:7528 utils/adt/numeric.c:8475 utils/adt/numutils.c:356
+#: utils/adt/numutils.c:617 utils/adt/numutils.c:878 utils/adt/numutils.c:917
+#: utils/adt/numutils.c:939 utils/adt/numutils.c:1003 utils/adt/numutils.c:1025
 #: utils/adt/pg_lsn.c:73 utils/adt/tid.c:72 utils/adt/tid.c:80
-#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:510
-#: utils/adt/uuid.c:140 utils/adt/xid8funcs.c:360
+#: utils/adt/tid.c:94 utils/adt/tid.c:103 utils/adt/timestamp.c:512
+#: utils/adt/uuid.c:176 utils/adt/xid8funcs.c:323
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "неприпустимий синтаксис для типу %s: \"%s\""
@@ -24192,25 +25389,25 @@ msgstr "неприпустимий синтаксис для типу %s: \"%s\"
 #: utils/adt/cash.c:137 utils/adt/cash.c:150
 #, c-format
 msgid "money out of range"
-msgstr ""
+msgstr "гроші поза діапазоном"
 
-#: utils/adt/cash.c:161 utils/adt/cash.c:723 utils/adt/float.c:99
+#: utils/adt/cash.c:161 utils/adt/cash.c:725 utils/adt/float.c:106
 #: utils/adt/int.c:843 utils/adt/int.c:959 utils/adt/int.c:1039
 #: utils/adt/int.c:1101 utils/adt/int.c:1139 utils/adt/int.c:1167
 #: utils/adt/int8.c:514 utils/adt/int8.c:572 utils/adt/int8.c:942
 #: utils/adt/int8.c:1022 utils/adt/int8.c:1084 utils/adt/int8.c:1164
-#: utils/adt/numeric.c:3191 utils/adt/numeric.c:3214 utils/adt/numeric.c:3299
-#: utils/adt/numeric.c:3317 utils/adt/numeric.c:3413 utils/adt/numeric.c:8920
-#: utils/adt/numeric.c:9233 utils/adt/numeric.c:9581 utils/adt/numeric.c:9697
-#: utils/adt/numeric.c:11208 utils/adt/timestamp.c:3713
+#: utils/adt/numeric.c:3295 utils/adt/numeric.c:3318 utils/adt/numeric.c:3403
+#: utils/adt/numeric.c:3421 utils/adt/numeric.c:3517 utils/adt/numeric.c:9400
+#: utils/adt/numeric.c:9924 utils/adt/numeric.c:10040 utils/adt/numeric.c:11551
+#: utils/adt/timestamp.c:3772
 #, c-format
 msgid "division by zero"
 msgstr "ділення на нуль"
 
 #: utils/adt/cash.c:292 utils/adt/cash.c:317 utils/adt/cash.c:327
 #: utils/adt/cash.c:367 utils/adt/int.c:180 utils/adt/numutils.c:350
-#: utils/adt/numutils.c:612 utils/adt/numutils.c:874 utils/adt/numutils.c:925
-#: utils/adt/numutils.c:964 utils/adt/numutils.c:1011
+#: utils/adt/numutils.c:611 utils/adt/numutils.c:872 utils/adt/numutils.c:923
+#: utils/adt/numutils.c:962 utils/adt/numutils.c:1009
 #, c-format
 msgid "value \"%s\" is out of range for type %s"
 msgstr "значення \"%s\" поза діапазоном для типу %s"
@@ -24225,186 +25422,187 @@ msgstr "значення \"char\" поза діапазоном"
 msgid "could not compute %s hash: %s"
 msgstr "не вдалося обчислити %s хеш: %s"
 
-#: utils/adt/date.c:64 utils/adt/timestamp.c:116 utils/adt/varbit.c:105
+#: utils/adt/date.c:65 utils/adt/timestamp.c:118 utils/adt/varbit.c:105
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "invalid type modifier"
 msgstr "неприпустимий тип модифікатора"
 
-#: utils/adt/date.c:76
+#: utils/adt/date.c:77
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "TIME(%d)%s точність не повинна бути від'ємною"
 
-#: utils/adt/date.c:82
+#: utils/adt/date.c:83
 #, c-format
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%s точність зменшена до дозволеного максимуму, %d"
 
-#: utils/adt/date.c:167 utils/adt/date.c:175 utils/adt/formatting.c:4424
-#: utils/adt/formatting.c:4433 utils/adt/formatting.c:4538
-#: utils/adt/formatting.c:4548
+#: utils/adt/date.c:168 utils/adt/date.c:176 utils/adt/formatting.c:4172
+#: utils/adt/formatting.c:4181 utils/adt/formatting.c:4286
+#: utils/adt/formatting.c:4296
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "дата поза діапазоном: \"%s\""
 
-#: utils/adt/date.c:222 utils/adt/date.c:520 utils/adt/date.c:544
-#: utils/adt/rangetypes.c:1584 utils/adt/rangetypes.c:1599 utils/adt/xml.c:2552
+#: utils/adt/date.c:223 utils/adt/date.c:585 utils/adt/date.c:609
+#: utils/adt/rangetypes.c:1648 utils/adt/rangetypes.c:1663 utils/adt/xml.c:2554
 #, c-format
 msgid "date out of range"
 msgstr "дата поза діапазоном"
 
-#: utils/adt/date.c:268 utils/adt/timestamp.c:598
+#: utils/adt/date.c:266 utils/adt/date.c:276 utils/adt/timestamp.c:600
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "значення поля типу date поза діапазоном: %d-%02d-%02d"
 
-#: utils/adt/date.c:275 utils/adt/date.c:284 utils/adt/timestamp.c:604
+#: utils/adt/date.c:283 utils/adt/date.c:292 utils/adt/timestamp.c:606
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "дата поза діапазоном: %d-%02d-%02d"
 
-#: utils/adt/date.c:495
+#: utils/adt/date.c:560
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "віднімати безкінечні дати не можна"
 
-#: utils/adt/date.c:593 utils/adt/date.c:656 utils/adt/date.c:692
-#: utils/adt/date.c:2906 utils/adt/date.c:2916
+#: utils/adt/date.c:658 utils/adt/date.c:721 utils/adt/date.c:757
+#: utils/adt/date.c:2971 utils/adt/date.c:2981
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "для позначки часу дата поза діапазоном"
 
-#: utils/adt/date.c:1122 utils/adt/date.c:1205 utils/adt/date.c:1221
-#: utils/adt/date.c:2215 utils/adt/date.c:3011 utils/adt/timestamp.c:4726
-#: utils/adt/timestamp.c:4941 utils/adt/timestamp.c:5089
-#: utils/adt/timestamp.c:5342 utils/adt/timestamp.c:5543
-#: utils/adt/timestamp.c:5590 utils/adt/timestamp.c:5814
-#: utils/adt/timestamp.c:5861 utils/adt/timestamp.c:5941
-#: utils/adt/timestamp.c:6070
+#: utils/adt/date.c:1187 utils/adt/date.c:1270 utils/adt/date.c:1286
+#: utils/adt/date.c:2280 utils/adt/date.c:3076 utils/adt/timestamp.c:4724
+#: utils/adt/timestamp.c:4815 utils/adt/timestamp.c:4963
+#: utils/adt/timestamp.c:5064 utils/adt/timestamp.c:5179
+#: utils/adt/timestamp.c:5231 utils/adt/timestamp.c:5488
+#: utils/adt/timestamp.c:5689 utils/adt/timestamp.c:5736
+#: utils/adt/timestamp.c:5960 utils/adt/timestamp.c:6007
+#: utils/adt/timestamp.c:6088 utils/adt/timestamp.c:6232
 #, c-format
 msgid "unit \"%s\" not supported for type %s"
 msgstr "одиниця \"%s\" не підтримується для типу %s"
 
-#: utils/adt/date.c:1230 utils/adt/date.c:2231 utils/adt/date.c:3031
-#: utils/adt/timestamp.c:4740 utils/adt/timestamp.c:4958
-#: utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5302
-#: utils/adt/timestamp.c:5599 utils/adt/timestamp.c:5870
-#: utils/adt/timestamp.c:5911 utils/adt/timestamp.c:6131
+#: utils/adt/date.c:1295 utils/adt/date.c:2296 utils/adt/date.c:3096
+#: utils/adt/timestamp.c:4829 utils/adt/timestamp.c:5081
+#: utils/adt/timestamp.c:5245 utils/adt/timestamp.c:5448
+#: utils/adt/timestamp.c:5745 utils/adt/timestamp.c:6016
+#: utils/adt/timestamp.c:6057 utils/adt/timestamp.c:6293
 #, c-format
 msgid "unit \"%s\" not recognized for type %s"
 msgstr "нерозпізнана одиниця \"%s\" для типу %s"
 
-#: utils/adt/date.c:1314 utils/adt/date.c:1360 utils/adt/date.c:1919
-#: utils/adt/date.c:1950 utils/adt/date.c:1979 utils/adt/date.c:2869
-#: utils/adt/date.c:3101 utils/adt/datetime.c:422 utils/adt/datetime.c:1807
-#: utils/adt/formatting.c:4269 utils/adt/formatting.c:4305
-#: utils/adt/formatting.c:4392 utils/adt/formatting.c:4514 utils/adt/json.c:366
-#: utils/adt/json.c:405 utils/adt/timestamp.c:248 utils/adt/timestamp.c:280
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:725
-#: utils/adt/timestamp.c:803 utils/adt/timestamp.c:836
-#: utils/adt/timestamp.c:3066 utils/adt/timestamp.c:3075
-#: utils/adt/timestamp.c:3092 utils/adt/timestamp.c:3097
-#: utils/adt/timestamp.c:3116 utils/adt/timestamp.c:3129
-#: utils/adt/timestamp.c:3140 utils/adt/timestamp.c:3146
-#: utils/adt/timestamp.c:3152 utils/adt/timestamp.c:3157
-#: utils/adt/timestamp.c:3210 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3240 utils/adt/timestamp.c:3245
-#: utils/adt/timestamp.c:3266 utils/adt/timestamp.c:3279
-#: utils/adt/timestamp.c:3293 utils/adt/timestamp.c:3301
-#: utils/adt/timestamp.c:3307 utils/adt/timestamp.c:3312
-#: utils/adt/timestamp.c:4380 utils/adt/timestamp.c:4532
-#: utils/adt/timestamp.c:4608 utils/adt/timestamp.c:4644
-#: utils/adt/timestamp.c:4734 utils/adt/timestamp.c:4813
-#: utils/adt/timestamp.c:4849 utils/adt/timestamp.c:4952
-#: utils/adt/timestamp.c:5407 utils/adt/timestamp.c:5681
-#: utils/adt/timestamp.c:6199 utils/adt/timestamp.c:6209
-#: utils/adt/timestamp.c:6214 utils/adt/timestamp.c:6220
-#: utils/adt/timestamp.c:6260 utils/adt/timestamp.c:6347
-#: utils/adt/timestamp.c:6388 utils/adt/timestamp.c:6392
-#: utils/adt/timestamp.c:6446 utils/adt/timestamp.c:6450
-#: utils/adt/timestamp.c:6456 utils/adt/timestamp.c:6497 utils/adt/xml.c:2574
-#: utils/adt/xml.c:2581 utils/adt/xml.c:2601 utils/adt/xml.c:2608
+#: utils/adt/date.c:1379 utils/adt/date.c:1425 utils/adt/date.c:1984
+#: utils/adt/date.c:2015 utils/adt/date.c:2044 utils/adt/date.c:2934
+#: utils/adt/date.c:3166 utils/adt/datetime.c:432 utils/adt/datetime.c:1826
+#: utils/adt/formatting.c:4017 utils/adt/formatting.c:4053
+#: utils/adt/formatting.c:4140 utils/adt/formatting.c:4262 utils/adt/json.c:375
+#: utils/adt/json.c:414 utils/adt/timestamp.c:250 utils/adt/timestamp.c:282
+#: utils/adt/timestamp.c:707 utils/adt/timestamp.c:716
+#: utils/adt/timestamp.c:794 utils/adt/timestamp.c:827
+#: utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3134
+#: utils/adt/timestamp.c:3151 utils/adt/timestamp.c:3156
+#: utils/adt/timestamp.c:3175 utils/adt/timestamp.c:3188
+#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3205
+#: utils/adt/timestamp.c:3211 utils/adt/timestamp.c:3216
+#: utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3278
+#: utils/adt/timestamp.c:3299 utils/adt/timestamp.c:3304
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3338
+#: utils/adt/timestamp.c:3352 utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3366 utils/adt/timestamp.c:3371
+#: utils/adt/timestamp.c:4439 utils/adt/timestamp.c:4591
+#: utils/adt/timestamp.c:4667 utils/adt/timestamp.c:4733
+#: utils/adt/timestamp.c:4823 utils/adt/timestamp.c:4902
+#: utils/adt/timestamp.c:4972 utils/adt/timestamp.c:5075
+#: utils/adt/timestamp.c:5553 utils/adt/timestamp.c:5827
+#: utils/adt/timestamp.c:6361 utils/adt/timestamp.c:6371
+#: utils/adt/timestamp.c:6376 utils/adt/timestamp.c:6382
+#: utils/adt/timestamp.c:6422 utils/adt/timestamp.c:6509
+#: utils/adt/timestamp.c:6550 utils/adt/timestamp.c:6554
+#: utils/adt/timestamp.c:6608 utils/adt/timestamp.c:6612
+#: utils/adt/timestamp.c:6618 utils/adt/timestamp.c:6659 utils/adt/xml.c:2576
+#: utils/adt/xml.c:2583 utils/adt/xml.c:2603 utils/adt/xml.c:2610
 #, c-format
 msgid "timestamp out of range"
 msgstr "позначка часу поза діапазоном"
 
-#: utils/adt/date.c:1536 utils/adt/date.c:2352 utils/adt/formatting.c:4597
+#: utils/adt/date.c:1601 utils/adt/date.c:2417 utils/adt/formatting.c:4345
 #, c-format
 msgid "time out of range"
 msgstr "час поза діапазоном"
 
-#: utils/adt/date.c:1588 utils/adt/timestamp.c:613
+#: utils/adt/date.c:1653 utils/adt/timestamp.c:615
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "значення поля типу time поза діапазоном: %d:%02d:%02g"
 
-#: utils/adt/date.c:2020
+#: utils/adt/date.c:2085
 #, c-format
 msgid "cannot convert infinite interval to time"
 msgstr "не можна перетворити нескінченний інтервал у час"
 
-#: utils/adt/date.c:2061 utils/adt/date.c:2605
+#: utils/adt/date.c:2126 utils/adt/date.c:2670
 #, c-format
 msgid "cannot add infinite interval to time"
 msgstr "не можна додати нескінченний інтервал до часу"
 
-#: utils/adt/date.c:2084 utils/adt/date.c:2632
+#: utils/adt/date.c:2149 utils/adt/date.c:2697
 #, c-format
 msgid "cannot subtract infinite interval from time"
 msgstr "не можна відняти від часу нескінченний інтервал"
 
-#: utils/adt/date.c:2115 utils/adt/date.c:2667 utils/adt/float.c:1036
-#: utils/adt/float.c:1112 utils/adt/int.c:635 utils/adt/int.c:682
-#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2595
-#: utils/adt/timestamp.c:3810 utils/adt/timestamp.c:3847
-#: utils/adt/timestamp.c:3888
+#: utils/adt/date.c:2180 utils/adt/date.c:2732 utils/adt/float.c:1043
+#: utils/adt/float.c:1119 utils/adt/int.c:635 utils/adt/int.c:682
+#: utils/adt/int.c:717 utils/adt/int8.c:413 utils/adt/numeric.c:2699
+#: utils/adt/timestamp.c:3869 utils/adt/timestamp.c:3906
+#: utils/adt/timestamp.c:3947
 #, c-format
 msgid "invalid preceding or following size in window function"
 msgstr "неприпустимий розмір preceding або following у віконній функції"
 
-#: utils/adt/date.c:2360
+#: utils/adt/date.c:2425
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "зсув часового поясу поза діапазоном"
 
-#: utils/adt/date.c:3132 utils/adt/timestamp.c:6242 utils/adt/timestamp.c:6479
+#: utils/adt/date.c:3197 utils/adt/timestamp.c:6404 utils/adt/timestamp.c:6641
 #, c-format
 msgid "interval time zone \"%s\" must be finite"
 msgstr "часовий пояс інтервалу \"%s\" має бути скінченним"
 
-#: utils/adt/date.c:3139 utils/adt/timestamp.c:6249 utils/adt/timestamp.c:6486
+#: utils/adt/date.c:3204 utils/adt/timestamp.c:6411 utils/adt/timestamp.c:6648
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "інтервал \"%s\", який задає часовий пояс, не повинен включати місяці або дні"
 
-#: utils/adt/datetime.c:3232 utils/adt/datetime.c:4127
-#: utils/adt/datetime.c:4133 utils/adt/timestamp.c:528
+#: utils/adt/datetime.c:3330 utils/adt/datetime.c:4249
+#: utils/adt/datetime.c:4255 utils/adt/timestamp.c:530
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "часовий пояс \"%s\" не розпізнаний"
 
-#: utils/adt/datetime.c:4101 utils/adt/datetime.c:4108
+#: utils/adt/datetime.c:4223 utils/adt/datetime.c:4230
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "значення поля типу дата/час поза діапазоном: \"%s\""
 
-#: utils/adt/datetime.c:4110
+#: utils/adt/datetime.c:4232
 #, c-format
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Можливо, вам потрібні інші налаштування \"datestyle\"."
+msgid "Perhaps you need a different \"DateStyle\" setting."
+msgstr "Можливо, вам потрібно інше налаштування \"DateStyle\"."
 
-#: utils/adt/datetime.c:4115
+#: utils/adt/datetime.c:4237
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "значення поля типу інтервал, поза діапазоном: \"%s\""
 
-#: utils/adt/datetime.c:4121
+#: utils/adt/datetime.c:4243
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "зміщення часового поясу, поза діапазоном: \"%s\""
 
-#: utils/adt/datetime.c:4135
+#: utils/adt/datetime.c:4257
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "Це ім'я часового поясу з'являється у файлі конфігурації часового поясу з кодом \"%s\"."
@@ -24414,17 +25612,22 @@ msgstr "Це ім'я часового поясу з'являється у фай
 msgid "invalid Datum pointer"
 msgstr "неприпустимий вказівник Datum"
 
-#: utils/adt/dbsize.c:764 utils/adt/dbsize.c:840
+#: utils/adt/dbsize.c:293 utils/adt/genfile.c:656
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "табличний простір з OID %u не існує"
+
+#: utils/adt/dbsize.c:782 utils/adt/dbsize.c:858
 #, c-format
 msgid "invalid size: \"%s\""
 msgstr "неприпустимий розмір: \"%s\""
 
-#: utils/adt/dbsize.c:841
+#: utils/adt/dbsize.c:859
 #, c-format
 msgid "Invalid size unit: \"%s\"."
 msgstr "Неприпустима одиниця вимірювання розміру: \"%s\"."
 
-#: utils/adt/dbsize.c:842
+#: utils/adt/dbsize.c:860
 #, c-format
 msgid "Valid units are \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", and \"PB\"."
 msgstr "Припустимі одиниці вимірювання: \"bytes\", \"B\", \"kB\", \"MB\", \"GB\", \"TB\", і \"PB\"."
@@ -24449,40 +25652,40 @@ msgstr "результат перетворення кодування зана
 msgid "result of decoding conversion is too large"
 msgstr "результат перетворення декодування занадто великий"
 
-#: utils/adt/encode.c:217 utils/adt/encode.c:227
+#: utils/adt/encode.c:238 utils/adt/encode.c:248
 #, c-format
 msgid "invalid hexadecimal digit: \"%.*s\""
 msgstr "неприпустиме шістнадцяткове число: \"%.*s\""
 
-#: utils/adt/encode.c:223
+#: utils/adt/encode.c:244
 #, c-format
 msgid "invalid hexadecimal data: odd number of digits"
 msgstr "неприпустимі шістнадцядкові дані: непарна кількість чисел"
 
-#: utils/adt/encode.c:344
+#: utils/adt/encode.c:365
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
 msgstr "неочікуваний символ \"=\" під час декодування послідовності base64"
 
-#: utils/adt/encode.c:356
+#: utils/adt/encode.c:377
 #, c-format
 msgid "invalid symbol \"%.*s\" found while decoding base64 sequence"
 msgstr "виявлено неприпустимий символ \"%.*s\" під час декодування послідовності base64"
 
-#: utils/adt/encode.c:377
+#: utils/adt/encode.c:398
 #, c-format
 msgid "invalid base64 end sequence"
 msgstr "неприпустима скінченна послідовність base64"
 
-#: utils/adt/encode.c:378
+#: utils/adt/encode.c:399
 #, c-format
 msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr "Вхідні дані позбавлені можливості заповнення, скорочені, або пошкоджені іншим чином."
 
-#: utils/adt/encode.c:492 utils/adt/encode.c:557 utils/adt/jsonfuncs.c:659
-#: utils/adt/varlena.c:333 utils/adt/varlena.c:374 jsonpath_gram.y:266
-#: jsonpath_gram.y:598 jsonpath_scan.l:640 jsonpath_scan.l:651
-#: jsonpath_scan.l:661 jsonpath_scan.l:712
+#: utils/adt/encode.c:513 utils/adt/encode.c:578 utils/adt/jsonfuncs.c:661
+#: utils/adt/varlena.c:341 utils/adt/varlena.c:382 jsonpath_gram.y:268
+#: jsonpath_gram.y:600 jsonpath_scan.l:617 jsonpath_scan.l:628
+#: jsonpath_scan.l:638 jsonpath_scan.l:690
 #, c-format
 msgid "invalid input syntax for type %s"
 msgstr "неприпустимий вхідний синтаксис для типу %s"
@@ -24519,351 +25722,363 @@ msgstr "не вдалося визначити фактичний тип пер
 msgid "enum %s contains no values"
 msgstr "перелік %s не містить значень"
 
-#: utils/adt/float.c:83
+#: utils/adt/float.c:90
 #, c-format
 msgid "value out of range: overflow"
 msgstr "значення поза діапазоном: надлишок"
 
-#: utils/adt/float.c:91
+#: utils/adt/float.c:98
 #, c-format
 msgid "value out of range: underflow"
 msgstr "значення поза діапазоном: недостача"
 
-#: utils/adt/float.c:280
+#: utils/adt/float.c:287
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" поза діапазоном для дійсного типу"
 
-#: utils/adt/float.c:482
+#: utils/adt/float.c:489
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\" поза діапазоном для типу double precision"
 
-#: utils/adt/float.c:1247 utils/adt/float.c:1321 utils/adt/int.c:355
+#: utils/adt/float.c:1254 utils/adt/float.c:1328 utils/adt/int.c:355
 #: utils/adt/int.c:893 utils/adt/int.c:915 utils/adt/int.c:929
 #: utils/adt/int.c:943 utils/adt/int.c:975 utils/adt/int.c:1213
-#: utils/adt/int8.c:1277 utils/adt/numeric.c:4593 utils/adt/numeric.c:4598
+#: utils/adt/int8.c:1277 utils/adt/numeric.c:4697 utils/adt/numeric.c:4702
+#: utils/adt/varlena.c:4104
 #, c-format
 msgid "smallint out of range"
 msgstr "двобайтове ціле поза діапазоном"
 
-#: utils/adt/float.c:1447 utils/adt/numeric.c:3709 utils/adt/numeric.c:10112
+#: utils/adt/float.c:1454 utils/adt/numeric.c:3813 utils/adt/numeric.c:10455
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "вилучити квадратний корінь від'ємного числа не можна"
 
-#: utils/adt/float.c:1515 utils/adt/numeric.c:3997 utils/adt/numeric.c:4109
+#: utils/adt/float.c:1522 utils/adt/numeric.c:4101 utils/adt/numeric.c:4213
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "нуль у від'ємному ступені дає невизначеність"
 
-#: utils/adt/float.c:1519 utils/adt/numeric.c:4001 utils/adt/numeric.c:11003
+#: utils/adt/float.c:1526 utils/adt/numeric.c:4105 utils/adt/numeric.c:11346
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "від'ємне число у не цілому ступені дає комплексний результат"
 
-#: utils/adt/float.c:1695 utils/adt/float.c:1728 utils/adt/numeric.c:3909
-#: utils/adt/numeric.c:10783
+#: utils/adt/float.c:1702 utils/adt/float.c:1735 utils/adt/numeric.c:4013
+#: utils/adt/numeric.c:11126
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "обчислити логарифм нуля не можна"
 
-#: utils/adt/float.c:1699 utils/adt/float.c:1732 utils/adt/numeric.c:3847
-#: utils/adt/numeric.c:3904 utils/adt/numeric.c:10787
+#: utils/adt/float.c:1706 utils/adt/float.c:1739 utils/adt/numeric.c:3951
+#: utils/adt/numeric.c:4008 utils/adt/numeric.c:11130
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "обчислити логарифм від'ємного числа не можна"
 
-#: utils/adt/float.c:1765 utils/adt/float.c:1796 utils/adt/float.c:1891
-#: utils/adt/float.c:1918 utils/adt/float.c:1946 utils/adt/float.c:1973
-#: utils/adt/float.c:2120 utils/adt/float.c:2157 utils/adt/float.c:2327
-#: utils/adt/float.c:2383 utils/adt/float.c:2448 utils/adt/float.c:2505
-#: utils/adt/float.c:2696 utils/adt/float.c:2720
+#: utils/adt/float.c:1772 utils/adt/float.c:1803 utils/adt/float.c:1898
+#: utils/adt/float.c:1925 utils/adt/float.c:1953 utils/adt/float.c:1980
+#: utils/adt/float.c:2127 utils/adt/float.c:2164 utils/adt/float.c:2334
+#: utils/adt/float.c:2390 utils/adt/float.c:2455 utils/adt/float.c:2512
+#: utils/adt/float.c:2703 utils/adt/float.c:2727
 #, c-format
 msgid "input is out of range"
 msgstr "введене значення поза діапазоном"
 
-#: utils/adt/float.c:4000 utils/adt/numeric.c:1857
+#: utils/adt/float.c:4085 utils/adt/numeric.c:1980
 #, c-format
 msgid "count must be greater than zero"
 msgstr "лічильник повинен бути більше нуля"
 
-#: utils/adt/float.c:4005 utils/adt/numeric.c:1868
+#: utils/adt/float.c:4090 utils/adt/numeric.c:1991
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "операнд, нижня границя і верхня границя не можуть бути NaN"
 
-#: utils/adt/float.c:4011 utils/adt/numeric.c:1873
+#: utils/adt/float.c:4096 utils/adt/numeric.c:1996
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "нижня і верхня границі повинні бути скінченними"
 
-#: utils/adt/float.c:4077 utils/adt/numeric.c:1887
+#: utils/adt/float.c:4162 utils/adt/numeric.c:2010
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "нижня границя не може дорівнювати верхній границі"
 
-#: utils/adt/formatting.c:530
+#: utils/adt/formatting.c:556
 #, c-format
 msgid "invalid format specification for an interval value"
 msgstr "неприпустима специфікація формату для цілого значення"
 
-#: utils/adt/formatting.c:531
+#: utils/adt/formatting.c:557
 #, c-format
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Інтервали не зв'язуються з певними календарними датами."
 
-#: utils/adt/formatting.c:1161
+#: utils/adt/formatting.c:1197
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" повинно бути останнім використаним шаблоном"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1205
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" повинна бути до \"PR\""
 
-#: utils/adt/formatting.c:1185
+#: utils/adt/formatting.c:1221
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" повинен бути до \"PR\""
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1248
 #, c-format
 msgid "multiple decimal points"
 msgstr "численні десяткові точки"
 
-#: utils/adt/formatting.c:1216 utils/adt/formatting.c:1299
+#: utils/adt/formatting.c:1252 utils/adt/formatting.c:1339
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "використовувати \"V\" і десяткову точку разом, не можна"
 
-#: utils/adt/formatting.c:1228
+#: utils/adt/formatting.c:1264
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "використовувати \"S\" двічі, не можна"
 
-#: utils/adt/formatting.c:1232
+#: utils/adt/formatting.c:1268
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "використовувати \"S\" і \"PL\"/\"MI\"/\"SG\"/\"PR\" разом, не можна"
 
-#: utils/adt/formatting.c:1252
+#: utils/adt/formatting.c:1288
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "використовувати \"S\" і \"MI\" разом, не можна"
 
-#: utils/adt/formatting.c:1262
+#: utils/adt/formatting.c:1298
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "не можна використовувати \"S\" і \"PL\" разом"
 
-#: utils/adt/formatting.c:1272
+#: utils/adt/formatting.c:1308
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "не можна використовувати \"S\" і \"SG\" разом"
 
-#: utils/adt/formatting.c:1281
+#: utils/adt/formatting.c:1317
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "не можна використовувати \"PR\" і \"S\"/\"PL\"/\"MI\"/\"SG\" разом"
 
-#: utils/adt/formatting.c:1307
+#: utils/adt/formatting.c:1326
+#, c-format
+msgid "cannot use \"RN\" twice"
+msgstr "не можна використовувати \"RN\" двічі"
+
+#: utils/adt/formatting.c:1347
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "не можна використовувати \"EEEE\" двічі"
 
-#: utils/adt/formatting.c:1313
+#: utils/adt/formatting.c:1353
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" є несумісним з іншими форматами"
 
-#: utils/adt/formatting.c:1314
+#: utils/adt/formatting.c:1354
 #, c-format
 msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr "\"EEEE\" може використовуватись лише разом з шаблонами цифр і десяткової точки."
 
-#: utils/adt/formatting.c:1398
+#: utils/adt/formatting.c:1363
+#, c-format
+msgid "\"RN\" is incompatible with other formats"
+msgstr "\"RN\" несумісний з іншими форматами"
+
+#: utils/adt/formatting.c:1364
+#, c-format
+msgid "\"RN\" may only be used together with \"FM\"."
+msgstr "\"RN\" може використовуватися тільки разом із \"FM\"."
+
+#: utils/adt/formatting.c:1445
 #, c-format
 msgid "invalid datetime format separator: \"%s\""
 msgstr "неприпустимий роздільник формату дати й часу: \"%s\""
 
-#: utils/adt/formatting.c:1525
+#: utils/adt/formatting.c:1572
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" не є числом"
 
-#: utils/adt/formatting.c:1603
-#, c-format
-msgid "case conversion failed: %s"
-msgstr "помилка при перетворенні регістру: %s"
-
-#: utils/adt/formatting.c:1651 utils/adt/formatting.c:1799
-#: utils/adt/formatting.c:1989
+#: utils/adt/formatting.c:1653 utils/adt/formatting.c:1717
+#: utils/adt/formatting.c:1781 utils/adt/formatting.c:1845
 #, c-format
 msgid "could not determine which collation to use for %s function"
 msgstr "не вдалося визначити який параметр сортування використати для функції %s"
 
-#: utils/adt/formatting.c:2410
+#: utils/adt/formatting.c:1853
+#, c-format
+msgid "Unicode case folding can only be performed if server encoding is UTF8"
+msgstr "Складання регістру Unicode може виконуватися лише якщо кодування сервера є UTF8"
+
+#: utils/adt/formatting.c:2150
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "неприпустиме поєднання стилів дат"
 
-#: utils/adt/formatting.c:2411
+#: utils/adt/formatting.c:2151
 #, c-format
 msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr "Не змішуйте Gregorian і ISO стилі дат (тижнів) в одному шаблоні форматування."
 
-#: utils/adt/formatting.c:2433
+#: utils/adt/formatting.c:2173
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "конфліктуючі значення для \"%s\" поля в рядку форматування"
 
-#: utils/adt/formatting.c:2435
+#: utils/adt/formatting.c:2175
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Це значення суперечить попередньому параметри для поля того ж типу."
 
-#: utils/adt/formatting.c:2502
+#: utils/adt/formatting.c:2242
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "вихідний рядок занадто короткий для \"%s\" поля форматування"
 
-#: utils/adt/formatting.c:2504
+#: utils/adt/formatting.c:2244
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Поле потребує %d символів, але залишилось лише %d."
 
-#: utils/adt/formatting.c:2506 utils/adt/formatting.c:2520
+#: utils/adt/formatting.c:2246 utils/adt/formatting.c:2260
 #, c-format
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr "Якщо ваш вихідний рядок не має постійної ширини, спробуйте використати \"FM\" модифікатор."
 
-#: utils/adt/formatting.c:2516 utils/adt/formatting.c:2529
-#: utils/adt/formatting.c:2750 utils/adt/formatting.c:3650
+#: utils/adt/formatting.c:2256 utils/adt/formatting.c:2269
+#: utils/adt/formatting.c:2490 utils/adt/formatting.c:3390
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "неприпустиме значення \"%s\" для \"%s\""
 
-#: utils/adt/formatting.c:2518
+#: utils/adt/formatting.c:2258
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Поле потребує %d символів, але вдалося аналізувати лише %d."
 
-#: utils/adt/formatting.c:2531
+#: utils/adt/formatting.c:2271
 #, c-format
 msgid "Value must be an integer."
 msgstr "Значення повинне бути цілим числом."
 
-#: utils/adt/formatting.c:2536
+#: utils/adt/formatting.c:2276 utils/adt/formatting.c:3601
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "значення для \"%s\" у вихідному рядку поза діапазоном"
 
-#: utils/adt/formatting.c:2538
+#: utils/adt/formatting.c:2278
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Значення повинне бути в діапазоні %d до %d."
 
-#: utils/adt/formatting.c:2752
+#: utils/adt/formatting.c:2492
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "Дане значення не відповідає жодному з доступних значень для цього поля."
 
-#: utils/adt/formatting.c:2968 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3008 utils/adt/formatting.c:3028
-#: utils/adt/formatting.c:3047 utils/adt/formatting.c:3066
-#: utils/adt/formatting.c:3090 utils/adt/formatting.c:3108
-#: utils/adt/formatting.c:3126 utils/adt/formatting.c:3144
-#: utils/adt/formatting.c:3161 utils/adt/formatting.c:3178
+#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2728
+#: utils/adt/formatting.c:2748 utils/adt/formatting.c:2768
+#: utils/adt/formatting.c:2787 utils/adt/formatting.c:2806
+#: utils/adt/formatting.c:2830 utils/adt/formatting.c:2848
+#: utils/adt/formatting.c:2866 utils/adt/formatting.c:2884
+#: utils/adt/formatting.c:2901 utils/adt/formatting.c:2918
 #, c-format
 msgid "localized string format value too long"
 msgstr "занадто довге значення формату локалізованого рядка"
 
-#: utils/adt/formatting.c:3458
+#: utils/adt/formatting.c:3198
 #, c-format
 msgid "unmatched format separator \"%c\""
 msgstr "невідповідний роздільник формату \"%c\""
 
-#: utils/adt/formatting.c:3519
+#: utils/adt/formatting.c:3259
 #, c-format
 msgid "unmatched format character \"%s\""
 msgstr "невідповідний формат символу \"%s\""
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3392
 #, c-format
 msgid "Time zone abbreviation is not recognized."
 msgstr "Абревіатуру часової зони не розпізнано."
 
-#: utils/adt/formatting.c:3853
-#, c-format
-msgid "invalid input string for \"Y,YYY\""
-msgstr "неприпустимий вхідний рядок для \"Y,YYY\""
-
-#: utils/adt/formatting.c:3942
+#: utils/adt/formatting.c:3690
 #, c-format
 msgid "input string is too short for datetime format"
 msgstr "вхідний рядок занадто короткий для формату дати й часу"
 
-#: utils/adt/formatting.c:3950
+#: utils/adt/formatting.c:3698
 #, c-format
 msgid "trailing characters remain in input string after datetime format"
 msgstr "символи наприкінці залишаються у вхідному рядку після формату дати й часу"
 
-#: utils/adt/formatting.c:4494
+#: utils/adt/formatting.c:4242
 #, c-format
 msgid "missing time zone in input string for type timestamptz"
 msgstr "пропущено часовий пояс у вхідному рядку для типу timestamptz"
 
-#: utils/adt/formatting.c:4500
+#: utils/adt/formatting.c:4248
 #, c-format
 msgid "timestamptz out of range"
 msgstr "timestamptz поза діапазоном"
 
-#: utils/adt/formatting.c:4528
+#: utils/adt/formatting.c:4276
 #, c-format
 msgid "datetime format is zoned but not timed"
 msgstr "формат дати й часу зоновано, але не приурочено"
 
-#: utils/adt/formatting.c:4577
+#: utils/adt/formatting.c:4325
 #, c-format
 msgid "missing time zone in input string for type timetz"
 msgstr "пропущено часовий пояс у вхідному рядку для типу timetz"
 
-#: utils/adt/formatting.c:4583
+#: utils/adt/formatting.c:4331
 #, c-format
 msgid "timetz out of range"
 msgstr "timetz поза діапазоном"
 
-#: utils/adt/formatting.c:4609
+#: utils/adt/formatting.c:4357
 #, c-format
 msgid "datetime format is not dated and not timed"
 msgstr "формат дати й часу не датований і не приурочений"
 
-#: utils/adt/formatting.c:4786
+#: utils/adt/formatting.c:4534
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "година \"%d\" неприпустима для 12-часового годинника"
 
-#: utils/adt/formatting.c:4788
+#: utils/adt/formatting.c:4536
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Використайте 24-часовий годинник, або передавайте години від 1 до 12."
 
-#: utils/adt/formatting.c:4900
+#: utils/adt/formatting.c:4713
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "не можна обчислити день року без інформації про рік"
 
-#: utils/adt/formatting.c:5852
+#: utils/adt/formatting.c:5834
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" не підтримується при введенні"
 
-#: utils/adt/formatting.c:5864
+#: utils/adt/formatting.c:6111
 #, c-format
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\" не підтримується при введенні"
+msgid "invalid Roman numeral"
+msgstr "недійсне римське число"
 
 #: utils/adt/genfile.c:84
 #, c-format
@@ -24875,9 +26090,9 @@ msgstr "абсолютний шлях не дозволений"
 msgid "path must be in or below the data directory"
 msgstr "шлях повинен вказувати каталог даних або вкладений каталог"
 
-#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:190
-#: utils/adt/oracle_compat.c:288 utils/adt/oracle_compat.c:839
-#: utils/adt/oracle_compat.c:1142
+#: utils/adt/genfile.c:114 utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:304 utils/adt/oracle_compat.c:855
+#: utils/adt/oracle_compat.c:1158
 #, c-format
 msgid "requested length too large"
 msgstr "запитана довжина занадто велика"
@@ -24892,11 +26107,6 @@ msgstr "не вдалося знайти в файлі \"%s\": %m"
 msgid "file length too large"
 msgstr "довжина файлу завелика"
 
-#: utils/adt/genfile.c:656
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "табличний простір з OID %u не існує"
-
 #: utils/adt/geo_ops.c:998 utils/adt/geo_ops.c:1052
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
@@ -24948,8 +26158,8 @@ msgstr "повинно бути запитано мінімум 2 точки"
 msgid "invalid int2vector data"
 msgstr "неприпустимі дані int2vector"
 
-#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1765
-#: utils/adt/timestamp.c:6546 utils/adt/timestamp.c:6632
+#: utils/adt/int.c:1529 utils/adt/int8.c:1403 utils/adt/numeric.c:1767
+#: utils/adt/timestamp.c:6708 utils/adt/timestamp.c:6794
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "розмір кроку не може дорівнювати нулю"
@@ -24963,9 +26173,9 @@ msgstr "розмір кроку не може дорівнювати нулю"
 #: utils/adt/int8.c:994 utils/adt/int8.c:1008 utils/adt/int8.c:1041
 #: utils/adt/int8.c:1055 utils/adt/int8.c:1069 utils/adt/int8.c:1100
 #: utils/adt/int8.c:1122 utils/adt/int8.c:1136 utils/adt/int8.c:1150
-#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4542
-#: utils/adt/rangetypes.c:1535 utils/adt/rangetypes.c:1548
-#: utils/adt/varbit.c:1676
+#: utils/adt/int8.c:1312 utils/adt/int8.c:1347 utils/adt/numeric.c:4646
+#: utils/adt/rangetypes.c:1599 utils/adt/rangetypes.c:1612
+#: utils/adt/varbit.c:1676 utils/adt/varlena.c:4154
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint поза діапазоном"
@@ -24975,49 +26185,49 @@ msgstr "bigint поза діапазоном"
 msgid "OID out of range"
 msgstr "OID поза діапазоном"
 
-#: utils/adt/json.c:202 utils/adt/jsonb.c:664
+#: utils/adt/json.c:204 utils/adt/jsonb.c:664
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "значенням ключа повинен бути скаляр, не масив, композитний тип, або json"
 
-#: utils/adt/json.c:1034 utils/adt/json.c:1044 utils/fmgr/funcapi.c:2090
+#: utils/adt/json.c:1043 utils/adt/json.c:1053 utils/fmgr/funcapi.c:2090
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "не вдалося визначити тип даних для аргументу %d"
 
-#: utils/adt/json.c:1067 utils/adt/json.c:1266 utils/adt/json.c:1449
-#: utils/adt/json.c:1527 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
+#: utils/adt/json.c:1076 utils/adt/json.c:1275 utils/adt/json.c:1457
+#: utils/adt/json.c:1531 utils/adt/jsonb.c:1333 utils/adt/jsonb.c:1423
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "значення null не дозволене для ключа об'єкту"
 
-#: utils/adt/json.c:1117 utils/adt/json.c:1288
+#: utils/adt/json.c:1126 utils/adt/json.c:1297
 #, c-format
 msgid "duplicate JSON object key value: %s"
 msgstr "дублікат ключа об'єкта JSON: %s"
 
-#: utils/adt/json.c:1226 utils/adt/jsonb.c:1134
+#: utils/adt/json.c:1235 utils/adt/jsonb.c:1134
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "список аргументів повинен мати парну кількість елементів"
 
 #. translator: %s is a SQL function name
-#: utils/adt/json.c:1228 utils/adt/jsonb.c:1136
+#: utils/adt/json.c:1237 utils/adt/jsonb.c:1136
 #, c-format
 msgid "The arguments of %s must consist of alternating keys and values."
 msgstr "Аргументи %s повинні складатись з альтернативних ключей і значень."
 
-#: utils/adt/json.c:1427 utils/adt/jsonb.c:1311
+#: utils/adt/json.c:1435 utils/adt/jsonb.c:1311
 #, c-format
 msgid "array must have two columns"
 msgstr "масив повинен мати два стовпця"
 
-#: utils/adt/json.c:1516 utils/adt/jsonb.c:1412
+#: utils/adt/json.c:1520 utils/adt/jsonb.c:1412
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "невідповідні виміри масиву"
 
-#: utils/adt/json.c:1702 utils/adt/jsonb_util.c:1956
+#: utils/adt/json.c:1850 utils/adt/jsonb_util.c:1969
 #, c-format
 msgid "duplicate JSON object key value"
 msgstr "дублікат значення ключа об'єкту JSON"
@@ -25082,23 +26292,23 @@ msgstr "привести об'єкт jsonb до типу %s не можна"
 msgid "cannot cast jsonb array or object to type %s"
 msgstr "привести масив або об'єкт jsonb до типу %s не можна"
 
-#: utils/adt/jsonb_util.c:756
+#: utils/adt/jsonb_util.c:760
 #, c-format
 msgid "number of jsonb object pairs exceeds the maximum allowed (%zu)"
 msgstr "кількість пар об'єкта jsonb перевищує максимально дозволену (%zu)"
 
-#: utils/adt/jsonb_util.c:797
+#: utils/adt/jsonb_util.c:801
 #, c-format
 msgid "number of jsonb array elements exceeds the maximum allowed (%zu)"
 msgstr "кількість елементів масиву jsonb перевищує максимально дозволену(%zu)"
 
-#: utils/adt/jsonb_util.c:1671 utils/adt/jsonb_util.c:1691
+#: utils/adt/jsonb_util.c:1684 utils/adt/jsonb_util.c:1704
 #, c-format
 msgid "total size of jsonb array elements exceeds the maximum of %d bytes"
 msgstr "загальний розмір елементів масиву jsonb перевищує максимум %d байт"
 
-#: utils/adt/jsonb_util.c:1752 utils/adt/jsonb_util.c:1787
-#: utils/adt/jsonb_util.c:1807
+#: utils/adt/jsonb_util.c:1765 utils/adt/jsonb_util.c:1800
+#: utils/adt/jsonb_util.c:1820
 #, c-format
 msgid "total size of jsonb object elements exceeds the maximum of %d bytes"
 msgstr "загальний розмір елементів об'єкту jsonb перевищує максимум %d байт"
@@ -25133,215 +26343,215 @@ msgstr "підрядковий символ jsonb повинен мати тип
 msgid "jsonb subscript in assignment must not be null"
 msgstr "підрядковий символ jsonb у присвоєнні не повинен бути null"
 
-#: utils/adt/jsonfuncs.c:583 utils/adt/jsonfuncs.c:830
-#: utils/adt/jsonfuncs.c:2439 utils/adt/jsonfuncs.c:3015
-#: utils/adt/jsonfuncs.c:3948 utils/adt/jsonfuncs.c:4295
+#: utils/adt/jsonfuncs.c:585 utils/adt/jsonfuncs.c:832
+#: utils/adt/jsonfuncs.c:2441 utils/adt/jsonfuncs.c:3017
+#: utils/adt/jsonfuncs.c:3950 utils/adt/jsonfuncs.c:4297
 #, c-format
 msgid "cannot call %s on a scalar"
 msgstr "викликати %s зі скаляром, не можна"
 
-#: utils/adt/jsonfuncs.c:588 utils/adt/jsonfuncs.c:815
-#: utils/adt/jsonfuncs.c:3017 utils/adt/jsonfuncs.c:3935
+#: utils/adt/jsonfuncs.c:590 utils/adt/jsonfuncs.c:817
+#: utils/adt/jsonfuncs.c:3019 utils/adt/jsonfuncs.c:3937
 #, c-format
 msgid "cannot call %s on an array"
 msgstr "викликати %s з масивом, не можна"
 
-#: utils/adt/jsonfuncs.c:647 jsonpath_scan.l:607
+#: utils/adt/jsonfuncs.c:649 jsonpath_scan.l:584
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "непідтримувана спеціальна послідовність Unicode"
 
-#: utils/adt/jsonfuncs.c:724
+#: utils/adt/jsonfuncs.c:726
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "Дані JSON, рядок %d: %s%s%s"
 
-#: utils/adt/jsonfuncs.c:1883 utils/adt/jsonfuncs.c:1920
+#: utils/adt/jsonfuncs.c:1885 utils/adt/jsonfuncs.c:1922
 #, c-format
 msgid "cannot get array length of a scalar"
 msgstr "отримати довжину скаляра масиву не можна"
 
-#: utils/adt/jsonfuncs.c:1887 utils/adt/jsonfuncs.c:1906
+#: utils/adt/jsonfuncs.c:1889 utils/adt/jsonfuncs.c:1908
 #, c-format
 msgid "cannot get array length of a non-array"
 msgstr "отримати довжину масива для не масиву не можна"
 
-#: utils/adt/jsonfuncs.c:1986
+#: utils/adt/jsonfuncs.c:1988
 #, c-format
 msgid "cannot call %s on a non-object"
 msgstr "викликати %s з не об'єктом, не можна"
 
-#: utils/adt/jsonfuncs.c:2174
+#: utils/adt/jsonfuncs.c:2176
 #, c-format
 msgid "cannot deconstruct an array as an object"
 msgstr "вилучити масив у вигляді об'єкту не можна"
 
-#: utils/adt/jsonfuncs.c:2188
+#: utils/adt/jsonfuncs.c:2190
 #, c-format
 msgid "cannot deconstruct a scalar"
 msgstr "вилучити скаляр не можна"
 
-#: utils/adt/jsonfuncs.c:2233
+#: utils/adt/jsonfuncs.c:2235
 #, c-format
 msgid "cannot extract elements from a scalar"
 msgstr "вилучити елементи зі скаляру не можна"
 
-#: utils/adt/jsonfuncs.c:2237
+#: utils/adt/jsonfuncs.c:2239
 #, c-format
 msgid "cannot extract elements from an object"
 msgstr "вилучити елементи з об'єкту не можна"
 
-#: utils/adt/jsonfuncs.c:2424 utils/adt/jsonfuncs.c:4173
+#: utils/adt/jsonfuncs.c:2426 utils/adt/jsonfuncs.c:4175
 #, c-format
 msgid "cannot call %s on a non-array"
 msgstr "викликати %s з не масивом не можна"
 
-#: utils/adt/jsonfuncs.c:2515 utils/adt/jsonfuncs.c:2520
-#: utils/adt/jsonfuncs.c:2538 utils/adt/jsonfuncs.c:2544
+#: utils/adt/jsonfuncs.c:2517 utils/adt/jsonfuncs.c:2522
+#: utils/adt/jsonfuncs.c:2540 utils/adt/jsonfuncs.c:2546
 #, c-format
 msgid "expected JSON array"
 msgstr "очікувався масив JSON"
 
-#: utils/adt/jsonfuncs.c:2516
+#: utils/adt/jsonfuncs.c:2518
 #, c-format
 msgid "See the value of key \"%s\"."
 msgstr "Перевірте значення ключа \"%s\"."
 
-#: utils/adt/jsonfuncs.c:2539
+#: utils/adt/jsonfuncs.c:2541
 #, c-format
 msgid "See the array element %s of key \"%s\"."
 msgstr "Перевірте елемент масиву %s ключа \"%s\"."
 
-#: utils/adt/jsonfuncs.c:2545
+#: utils/adt/jsonfuncs.c:2547
 #, c-format
 msgid "See the array element %s."
 msgstr "Перевірте елемент масиву %s."
 
-#: utils/adt/jsonfuncs.c:2597
+#: utils/adt/jsonfuncs.c:2599
 #, c-format
 msgid "malformed JSON array"
 msgstr "неправильний масив JSON"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3647
+#: utils/adt/jsonfuncs.c:3649
 #, c-format
 msgid "first argument of %s must be a row type"
 msgstr "першим аргументом %s повинен бути тип рядка"
 
 #. translator: %s is a function name, eg json_to_record
-#: utils/adt/jsonfuncs.c:3671
+#: utils/adt/jsonfuncs.c:3673
 #, c-format
 msgid "could not determine row type for result of %s"
 msgstr "не вдалося визначити тип рядка для результату %s"
 
-#: utils/adt/jsonfuncs.c:3673
+#: utils/adt/jsonfuncs.c:3675
 #, c-format
 msgid "Provide a non-null record argument, or call the function in the FROM clause using a column definition list."
 msgstr "Надайте аргумент ненульового запису, або викличте функцію в реченні FROM, використовуючи список визначення стовпців."
 
-#: utils/adt/jsonfuncs.c:4059 utils/fmgr/funcapi.c:94
+#: utils/adt/jsonfuncs.c:4061 utils/fmgr/funcapi.c:94
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "необхідний режим матеріалізації (materialize mode), але він неприпустимий у цьому контексті"
 
-#: utils/adt/jsonfuncs.c:4190 utils/adt/jsonfuncs.c:4274
+#: utils/adt/jsonfuncs.c:4192 utils/adt/jsonfuncs.c:4276
 #, c-format
 msgid "argument of %s must be an array of objects"
 msgstr "аргументом %s повинен бути масив об'єктів"
 
-#: utils/adt/jsonfuncs.c:4223
+#: utils/adt/jsonfuncs.c:4225
 #, c-format
 msgid "cannot call %s on an object"
 msgstr "викликати %s з об'єктом не можна"
 
-#: utils/adt/jsonfuncs.c:4656 utils/adt/jsonfuncs.c:4715
-#: utils/adt/jsonfuncs.c:4795
+#: utils/adt/jsonfuncs.c:4680 utils/adt/jsonfuncs.c:4739
+#: utils/adt/jsonfuncs.c:4819
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "видалити зі скаляру не можна"
 
-#: utils/adt/jsonfuncs.c:4800
+#: utils/adt/jsonfuncs.c:4824
 #, c-format
 msgid "cannot delete from object using integer index"
 msgstr "видалити з об'єкту по числовому індексу не можна"
 
-#: utils/adt/jsonfuncs.c:4868 utils/adt/jsonfuncs.c:5027
+#: utils/adt/jsonfuncs.c:4892 utils/adt/jsonfuncs.c:5051
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "встановити шлях в скалярі не можна"
 
-#: utils/adt/jsonfuncs.c:4909 utils/adt/jsonfuncs.c:4951
+#: utils/adt/jsonfuncs.c:4933 utils/adt/jsonfuncs.c:4975
 #, c-format
 msgid "null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\""
 msgstr "null_value_treatment має бути \"delete_key\", \"return_target\", \"use_json_null\", або \"raise_exception\""
 
-#: utils/adt/jsonfuncs.c:4922
+#: utils/adt/jsonfuncs.c:4946
 #, c-format
 msgid "JSON value must not be null"
 msgstr "Значення JSON не повинне бути null"
 
-#: utils/adt/jsonfuncs.c:4923
+#: utils/adt/jsonfuncs.c:4947
 #, c-format
 msgid "Exception was raised because null_value_treatment is \"raise_exception\"."
 msgstr "Виняток було запущено через те, що null_value_treatment дорівнює \"raise_exception\"."
 
-#: utils/adt/jsonfuncs.c:4924
+#: utils/adt/jsonfuncs.c:4948
 #, c-format
 msgid "To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed."
 msgstr "Щоб уникнути, або змініть аргумент null_value_treatment або переконайтесь що SQL NULL не передано."
 
-#: utils/adt/jsonfuncs.c:4979
+#: utils/adt/jsonfuncs.c:5003
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "видалити шлях в скалярі не можна"
 
-#: utils/adt/jsonfuncs.c:5193
+#: utils/adt/jsonfuncs.c:5217
 #, c-format
 msgid "path element at position %d is null"
 msgstr "елемент шляху в позиції %d є null"
 
-#: utils/adt/jsonfuncs.c:5212 utils/adt/jsonfuncs.c:5243
-#: utils/adt/jsonfuncs.c:5316
+#: utils/adt/jsonfuncs.c:5236 utils/adt/jsonfuncs.c:5267
+#: utils/adt/jsonfuncs.c:5340
 #, c-format
 msgid "cannot replace existing key"
 msgstr "замініти існуючий ключ не можна"
 
-#: utils/adt/jsonfuncs.c:5213 utils/adt/jsonfuncs.c:5244
+#: utils/adt/jsonfuncs.c:5237 utils/adt/jsonfuncs.c:5268
 #, c-format
 msgid "The path assumes key is a composite object, but it is a scalar value."
 msgstr "Шлях припускає, що ключ є складеним об'єктом, але це скалярне значення."
 
-#: utils/adt/jsonfuncs.c:5317
+#: utils/adt/jsonfuncs.c:5341
 #, c-format
 msgid "Try using the function jsonb_set to replace key value."
 msgstr "Спробуйте, використати функцію jsonb_set, щоб замінити значення ключа."
 
-#: utils/adt/jsonfuncs.c:5421
+#: utils/adt/jsonfuncs.c:5445
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
 msgstr "елмент шляху в позиції %d не є цілим числом: \"%s\""
 
-#: utils/adt/jsonfuncs.c:5438
+#: utils/adt/jsonfuncs.c:5462
 #, c-format
 msgid "path element at position %d is out of range: %d"
 msgstr "елемент шляху в позиції %d поза діапазоном: %d"
 
-#: utils/adt/jsonfuncs.c:5590
+#: utils/adt/jsonfuncs.c:5614
 #, c-format
 msgid "wrong flag type, only arrays and scalars are allowed"
 msgstr "неправильний тип позначки, дозволені лише масиви і скаляри"
 
-#: utils/adt/jsonfuncs.c:5597
+#: utils/adt/jsonfuncs.c:5621
 #, c-format
 msgid "flag array element is not a string"
 msgstr "елемент масиву позначок не є рядком"
 
-#: utils/adt/jsonfuncs.c:5598 utils/adt/jsonfuncs.c:5620
+#: utils/adt/jsonfuncs.c:5622 utils/adt/jsonfuncs.c:5644
 #, c-format
 msgid "Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"."
 msgstr "Можливі значення: \"string\", \"numeric\", \"boolean\", \"key\", і \"all\"."
 
-#: utils/adt/jsonfuncs.c:5618
+#: utils/adt/jsonfuncs.c:5642
 #, c-format
 msgid "wrong flag in flag array: \"%s\""
 msgstr "неправильна позначка в масиві позначок: \"%s\""
@@ -25356,262 +26566,247 @@ msgstr "@ не дозволяється в кореневих виразах"
 msgid "LAST is allowed only in array subscripts"
 msgstr "LAST дозволяється лише в підрядкових символах масиву"
 
-#: utils/adt/jsonpath_exec.c:491
+#: utils/adt/jsonpath_exec.c:489
 #, c-format
 msgid "single boolean result is expected"
 msgstr "очікується один логічний результат"
 
-#: utils/adt/jsonpath_exec.c:851
+#: utils/adt/jsonpath_exec.c:849
 #, c-format
 msgid "jsonpath wildcard array accessor can only be applied to an array"
 msgstr "доступ до підстановочного масиву jsonpath може бути застосований лише до масиву"
 
-#: utils/adt/jsonpath_exec.c:874
+#: utils/adt/jsonpath_exec.c:872
 #, c-format
 msgid "jsonpath wildcard member accessor can only be applied to an object"
 msgstr "доступ до підстановочного елемента jsonpath може бути застосований лише до об'єкта"
 
-#: utils/adt/jsonpath_exec.c:923
+#: utils/adt/jsonpath_exec.c:921
 #, c-format
 msgid "jsonpath array subscript is out of bounds"
 msgstr "підрядковий символ масиву jsonpath поза межами"
 
-#: utils/adt/jsonpath_exec.c:980
+#: utils/adt/jsonpath_exec.c:978
 #, c-format
 msgid "jsonpath array accessor can only be applied to an array"
 msgstr "доступ до масиву jsonpath може бути застосований лише до масиву"
 
-#: utils/adt/jsonpath_exec.c:1044
+#: utils/adt/jsonpath_exec.c:1042
 #, c-format
 msgid "JSON object does not contain key \"%s\""
 msgstr "Об'єкт JSON не містить ключа \"%s\""
 
-#: utils/adt/jsonpath_exec.c:1056
+#: utils/adt/jsonpath_exec.c:1054
 #, c-format
 msgid "jsonpath member accessor can only be applied to an object"
 msgstr "доступ для елемента jsonpath може бути застосований лише до об'єкта"
 
-#: utils/adt/jsonpath_exec.c:1114
+#: utils/adt/jsonpath_exec.c:1112
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an array"
 msgstr "метод елемента jsonpath .%s() може бути застосований лише до масиву"
 
-#: utils/adt/jsonpath_exec.c:1167 utils/adt/jsonpath_exec.c:1193
+#: utils/adt/jsonpath_exec.c:1165 utils/adt/jsonpath_exec.c:1191
+#: utils/adt/jsonpath_exec.c:1279 utils/adt/jsonpath_exec.c:1304
+#: utils/adt/jsonpath_exec.c:1356 utils/adt/jsonpath_exec.c:1376
+#: utils/adt/jsonpath_exec.c:1438 utils/adt/jsonpath_exec.c:1527
+#: utils/adt/jsonpath_exec.c:1560 utils/adt/jsonpath_exec.c:1584
 #, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type double precision"
-msgstr ""
+msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type %s"
+msgstr "аргумент \"%s\" методу jsonpath .%s() недійсний для типу %s"
 
-#: utils/adt/jsonpath_exec.c:1172 utils/adt/jsonpath_exec.c:1198
-#: utils/adt/jsonpath_exec.c:1414 utils/adt/jsonpath_exec.c:1446
+#: utils/adt/jsonpath_exec.c:1170 utils/adt/jsonpath_exec.c:1196
+#: utils/adt/jsonpath_exec.c:1413 utils/adt/jsonpath_exec.c:1445
 #, c-format
 msgid "NaN or Infinity is not allowed for jsonpath item method .%s()"
-msgstr ""
+msgstr "NaN та Infinity не дозволяються для методу елементу jsonpath .%s()"
 
-#: utils/adt/jsonpath_exec.c:1211 utils/adt/jsonpath_exec.c:1313
-#: utils/adt/jsonpath_exec.c:1455 utils/adt/jsonpath_exec.c:1593
+#: utils/adt/jsonpath_exec.c:1209 utils/adt/jsonpath_exec.c:1312
+#: utils/adt/jsonpath_exec.c:1454 utils/adt/jsonpath_exec.c:1592
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string or numeric value"
 msgstr "метод елемента jsonpath .%s() може бути застосований лише до рядка або числового значення"
 
-#: utils/adt/jsonpath_exec.c:1281 utils/adt/jsonpath_exec.c:1305
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type bigint"
-msgstr ""
-
-#: utils/adt/jsonpath_exec.c:1357 utils/adt/jsonpath_exec.c:1377
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type boolean"
-msgstr ""
-
-#: utils/adt/jsonpath_exec.c:1386
+#: utils/adt/jsonpath_exec.c:1385
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, or numeric value"
-msgstr ""
+msgstr "Метод jsonpath елемента .%s() може бути застосований лише до boolean, рядка або числового значення"
 
-#: utils/adt/jsonpath_exec.c:1439 utils/adt/jsonpath_exec.c:1528
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type numeric"
-msgstr ""
-
-#: utils/adt/jsonpath_exec.c:1487
+#: utils/adt/jsonpath_exec.c:1486
 #, c-format
 msgid "precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "точність методу елементу jsonpath .%s() знаходиться за межами діапазону для типу integer"
 
-#: utils/adt/jsonpath_exec.c:1501
+#: utils/adt/jsonpath_exec.c:1500
 #, c-format
 msgid "scale of jsonpath item method .%s() is out of range for type integer"
 msgstr "масштаб методу jsonpath елементу .%s() знаходиться за межами діапазону для типу integer"
 
-#: utils/adt/jsonpath_exec.c:1561 utils/adt/jsonpath_exec.c:1585
-#, c-format
-msgid "argument \"%s\" of jsonpath item method .%s() is invalid for type integer"
-msgstr ""
-
-#: utils/adt/jsonpath_exec.c:1648
+#: utils/adt/jsonpath_exec.c:1647
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a boolean, string, numeric, or datetime value"
-msgstr ""
+msgstr "Метод jsonpath елемента .%s() можна застосувати лише до значення типу boolean, рядка, числа або дати"
 
-#: utils/adt/jsonpath_exec.c:2137
+#: utils/adt/jsonpath_exec.c:2136
 #, c-format
 msgid "left operand of jsonpath operator %s is not a single numeric value"
 msgstr "лівий операнд оператора jsonpath %s не є єдиним числовим значенням"
 
-#: utils/adt/jsonpath_exec.c:2144
+#: utils/adt/jsonpath_exec.c:2143
 #, c-format
 msgid "right operand of jsonpath operator %s is not a single numeric value"
 msgstr "правий операнд оператора jsonpath %s не є єдиним числовим значенням"
 
-#: utils/adt/jsonpath_exec.c:2212
+#: utils/adt/jsonpath_exec.c:2211
 #, c-format
 msgid "operand of unary jsonpath operator %s is not a numeric value"
 msgstr "операнд унарного оператора jsonpath %s не є єдиним числовим значенням"
 
-#: utils/adt/jsonpath_exec.c:2311
+#: utils/adt/jsonpath_exec.c:2310
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a numeric value"
 msgstr "метод елемента jsonpath .%s() може бути застосований лише до числового значення"
 
-#: utils/adt/jsonpath_exec.c:2357
+#: utils/adt/jsonpath_exec.c:2356
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to a string"
 msgstr "метод елемента jsonpath .%s() може бути застосований лише до рядку"
 
-#: utils/adt/jsonpath_exec.c:2450
+#: utils/adt/jsonpath_exec.c:2449
 #, c-format
 msgid "time precision of jsonpath item method .%s() is out of range for type integer"
 msgstr "точність часу методу елементу jsonpath .%s() знаходиться за межами діапазону для типу integer"
 
-#: utils/adt/jsonpath_exec.c:2484 utils/adt/jsonpath_exec.c:2490
-#: utils/adt/jsonpath_exec.c:2517 utils/adt/jsonpath_exec.c:2545
-#: utils/adt/jsonpath_exec.c:2598 utils/adt/jsonpath_exec.c:2649
-#: utils/adt/jsonpath_exec.c:2720
+#: utils/adt/jsonpath_exec.c:2483 utils/adt/jsonpath_exec.c:2489
+#: utils/adt/jsonpath_exec.c:2516 utils/adt/jsonpath_exec.c:2544
+#: utils/adt/jsonpath_exec.c:2597 utils/adt/jsonpath_exec.c:2648
+#: utils/adt/jsonpath_exec.c:2719
 #, c-format
 msgid "%s format is not recognized: \"%s\""
 msgstr "Формат %s не розпізнано: \"%s\""
 
-#: utils/adt/jsonpath_exec.c:2486
+#: utils/adt/jsonpath_exec.c:2485
 #, c-format
 msgid "Use a datetime template argument to specify the input data format."
 msgstr "Використайте аргумент шаблону дати й часу щоб вказати формат вхідних даних."
 
-#: utils/adt/jsonpath_exec.c:2679 utils/adt/jsonpath_exec.c:2760
+#: utils/adt/jsonpath_exec.c:2678 utils/adt/jsonpath_exec.c:2759
 #, c-format
 msgid "time precision of jsonpath item method .%s() is invalid"
-msgstr ""
+msgstr "часова точність методу елементу jsonpath .%s() є неприпустимою"
 
-#: utils/adt/jsonpath_exec.c:2840
+#: utils/adt/jsonpath_exec.c:2839
 #, c-format
 msgid "jsonpath item method .%s() can only be applied to an object"
 msgstr "метод елемента jsonpath .%s() може бути застосований лише до об'єкта"
 
-#: utils/adt/jsonpath_exec.c:3124
+#: utils/adt/jsonpath_exec.c:3123
 #, c-format
 msgid "could not convert value of type %s to jsonpath"
-msgstr ""
+msgstr "не вдалося перетворити значення типу %s в jsonpath"
 
-#: utils/adt/jsonpath_exec.c:3158
+#: utils/adt/jsonpath_exec.c:3157
 #, c-format
 msgid "could not find jsonpath variable \"%s\""
 msgstr "не вдалося знайти змінну jsonpath \"%s\""
 
-#: utils/adt/jsonpath_exec.c:3211
+#: utils/adt/jsonpath_exec.c:3210
 #, c-format
 msgid "\"vars\" argument is not an object"
 msgstr "аргумент \"vars\" не є об'єктом"
 
-#: utils/adt/jsonpath_exec.c:3212
+#: utils/adt/jsonpath_exec.c:3211
 #, c-format
 msgid "Jsonpath parameters should be encoded as key-value pairs of \"vars\" object."
 msgstr "Параметри Jsonpath повинні бути закодовані в якості пар \"ключ-значення\" об'єкту \"vars\"."
 
-#: utils/adt/jsonpath_exec.c:3475
+#: utils/adt/jsonpath_exec.c:3474
 #, c-format
 msgid "jsonpath array subscript is not a single numeric value"
 msgstr "підрядковий символ масиву jsonpath не є єдиним числовим значенням"
 
-#: utils/adt/jsonpath_exec.c:3487
+#: utils/adt/jsonpath_exec.c:3486
 #, c-format
 msgid "jsonpath array subscript is out of integer range"
 msgstr "підрядковий символ масиву jsonpath поза цілим діапазоном"
 
-#: utils/adt/jsonpath_exec.c:3671
+#: utils/adt/jsonpath_exec.c:3670
 #, c-format
 msgid "cannot convert value from %s to %s without time zone usage"
 msgstr "не можна перетворити значення з %s в %s без використання часового поясу"
 
-#: utils/adt/jsonpath_exec.c:3673
+#: utils/adt/jsonpath_exec.c:3672
 #, c-format
 msgid "Use *_tz() function for time zone support."
 msgstr "Використовуйте функцію *_tz() для підтримки часового поясу."
 
-#: utils/adt/jsonpath_exec.c:3981
+#: utils/adt/jsonpath_exec.c:3980
 #, c-format
-msgid "JSON path expression for column \"%s\" should return single item without wrapper"
-msgstr ""
+msgid "JSON path expression for column \"%s\" must return single item when no wrapper is requested"
+msgstr "Вираз шляху в JSON для стовпця \"%s\" повинен повернути єдиний елемент, якщо не вказано жодної обгортки"
 
-#: utils/adt/jsonpath_exec.c:3983 utils/adt/jsonpath_exec.c:3988
+#: utils/adt/jsonpath_exec.c:3982 utils/adt/jsonpath_exec.c:3987
 #, c-format
 msgid "Use the WITH WRAPPER clause to wrap SQL/JSON items into an array."
-msgstr ""
+msgstr "Використайте вираз WITH WRAPPER, щоб обернути елементи SQL/JSON в масив."
 
-#: utils/adt/jsonpath_exec.c:3987
+#: utils/adt/jsonpath_exec.c:3986
 #, c-format
-msgid "JSON path expression in JSON_QUERY should return single item without wrapper"
-msgstr ""
+msgid "JSON path expression in JSON_QUERY must return single item when no wrapper is requested"
+msgstr "Вираз шляху JSON в JSON_QUERY повинен повернути єдиний елемент, якщо не вказано жодної обгортки"
 
-#: utils/adt/jsonpath_exec.c:4045 utils/adt/jsonpath_exec.c:4069
+#: utils/adt/jsonpath_exec.c:4044 utils/adt/jsonpath_exec.c:4068
 #, c-format
-msgid "JSON path expression for column \"%s\" should return single scalar item"
-msgstr ""
+msgid "JSON path expression for column \"%s\" must return single scalar item"
+msgstr "Вираз шляху JSON для стовпця \"%s\" повинен повертати одинарний скаляр"
 
-#: utils/adt/jsonpath_exec.c:4050 utils/adt/jsonpath_exec.c:4074
+#: utils/adt/jsonpath_exec.c:4049 utils/adt/jsonpath_exec.c:4073
 #, c-format
-msgid "JSON path expression in JSON_VALUE should return single scalar item"
-msgstr ""
+msgid "JSON path expression in JSON_VALUE must return single scalar item"
+msgstr "Вираз шляху JSON в JSON_VALUE повинен повертати одиничний скалярний елемент"
 
 #: utils/adt/levenshtein.c:132
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "довжина аргументу levenshtein перевищує максимальну довжину, %d символів"
 
-#: utils/adt/like.c:159
+#: utils/adt/like.c:162
 #, c-format
-msgid "nondeterministic collations are not supported for LIKE"
-msgstr "недетерміновані параметри сортування не підтримуються для LIKE"
+msgid "could not determine which collation to use for LIKE"
+msgstr "не вдалося визначити, яке правило сортування використати для LIKE"
 
-#: utils/adt/like.c:188 utils/adt/like_support.c:1023
+#: utils/adt/like.c:193 utils/adt/like_support.c:1019
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "не вдалося визначити який параметр сортування використати для ILIKE"
 
-#: utils/adt/like.c:200
+#: utils/adt/like.c:202
 #, c-format
 msgid "nondeterministic collations are not supported for ILIKE"
 msgstr "недетерміновані параметри сортування не підтримуються для ILIKE"
 
-#: utils/adt/like_match.c:108 utils/adt/like_match.c:168
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:169
+#: utils/adt/like_match.c:237
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "Шаблон LIKE не повинен закінчуватись символом виходу"
 
-#: utils/adt/like_match.c:293 utils/adt/regexp.c:800
+#: utils/adt/like_match.c:437 utils/adt/regexp.c:801
 #, c-format
 msgid "invalid escape string"
 msgstr "неприпустимий рядок виходу"
 
-#: utils/adt/like_match.c:294 utils/adt/regexp.c:801
+#: utils/adt/like_match.c:438 utils/adt/regexp.c:802
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "Рядок виходу повинен бути пустим або складатися з одного символу."
 
-#: utils/adt/like_support.c:1013
+#: utils/adt/like_support.c:1009
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
 msgstr "порівняння без урахування регістру не підтримується для типу bytea"
 
-#: utils/adt/like_support.c:1114
+#: utils/adt/like_support.c:1106
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "порівняння з регулярними виразами не підтримується для типу bytea"
@@ -25631,7 +26826,7 @@ msgstr "дані macaddr8 поза діапазоном, для перетвор
 msgid "Only addresses that have FF and FE as values in the 4th and 5th bytes from the left, for example xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted from macaddr8 to macaddr."
 msgstr "Лише адреси, які мають FF і FE в якості значень в четвертому і п'ятому байті зліва, наприклад xx:xx:xx:ff:fe:xx:xx:xx можуть бути перетворені з macaddr8 в macaddr."
 
-#: utils/adt/mcxtfuncs.c:173
+#: utils/adt/mcxtfuncs.c:293
 #, c-format
 msgid "PID %d is not a PostgreSQL server process"
 msgstr "PID %d не є серверним процесом PostgreSQL"
@@ -25748,8 +26943,8 @@ msgstr "неприпустиме значення cidr: \"%s\""
 msgid "Value has bits set to right of mask."
 msgstr "Значення має встановленні біти правіше маски."
 
-#: utils/adt/network.c:152 utils/adt/network.c:1184 utils/adt/network.c:1209
-#: utils/adt/network.c:1234
+#: utils/adt/network.c:152 utils/adt/network.c:1149 utils/adt/network.c:1174
+#: utils/adt/network.c:1199
 #, c-format
 msgid "could not format inet value: %m"
 msgstr "не вдалося форматувати значення inet: %m"
@@ -25777,198 +26972,198 @@ msgstr "неприпустима довжина в зовнішньому зна
 msgid "invalid external \"cidr\" value"
 msgstr "неприпустиме зовнішнє значення \"cidr\""
 
-#: utils/adt/network.c:336 utils/adt/network.c:359
+#: utils/adt/network.c:334 utils/adt/network.c:357
 #, c-format
 msgid "invalid mask length: %d"
 msgstr "неприпустима довжина маски: %d"
 
-#: utils/adt/network.c:1252
+#: utils/adt/network.c:1217
 #, c-format
 msgid "could not format cidr value: %m"
 msgstr "не вдалося форматувати значення cidr: %m"
 
-#: utils/adt/network.c:1485
+#: utils/adt/network.c:1450
 #, c-format
 msgid "cannot merge addresses from different families"
 msgstr "об'єднати адреси з різних сімейств не можна"
 
-#: utils/adt/network.c:1893
+#: utils/adt/network.c:1858
 #, c-format
 msgid "cannot AND inet values of different sizes"
 msgstr "не можна використовувати \"І\" (AND) для значень inet різного розміру"
 
-#: utils/adt/network.c:1925
+#: utils/adt/network.c:1890
 #, c-format
 msgid "cannot OR inet values of different sizes"
 msgstr "не можна використовувати \"АБО\" (OR) для значень inet різного розміру"
 
-#: utils/adt/network.c:1986 utils/adt/network.c:2062
+#: utils/adt/network.c:1951 utils/adt/network.c:2027
 #, c-format
 msgid "result is out of range"
 msgstr "результат поза діапазоном"
 
-#: utils/adt/network.c:2027
+#: utils/adt/network.c:1992
 #, c-format
 msgid "cannot subtract inet values of different sizes"
 msgstr "не можна віднімати значення inet різного розміру"
 
-#: utils/adt/numeric.c:793 utils/adt/numeric.c:3659 utils/adt/numeric.c:7216
-#: utils/adt/numeric.c:7419 utils/adt/numeric.c:7891 utils/adt/numeric.c:10586
-#: utils/adt/numeric.c:11061 utils/adt/numeric.c:11155
-#: utils/adt/numeric.c:11290
+#: utils/adt/numeric.c:795 utils/adt/numeric.c:3763 utils/adt/numeric.c:7320
+#: utils/adt/numeric.c:7523 utils/adt/numeric.c:7995 utils/adt/numeric.c:10929
+#: utils/adt/numeric.c:11404 utils/adt/numeric.c:11498
+#: utils/adt/numeric.c:11633
 #, c-format
 msgid "value overflows numeric format"
 msgstr "значення переповнюють формат numeric"
 
-#: utils/adt/numeric.c:1106
+#: utils/adt/numeric.c:1108
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "неприпустимий знак у зовнішньому значенні \"numeric\""
 
-#: utils/adt/numeric.c:1112
+#: utils/adt/numeric.c:1114
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "неприпустимий масштаб у зовнішньому значенні \"numeric\""
 
-#: utils/adt/numeric.c:1121
+#: utils/adt/numeric.c:1123
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "неприпустиме число у зовнішньому значенні \"numeric\""
 
-#: utils/adt/numeric.c:1336 utils/adt/numeric.c:1350
+#: utils/adt/numeric.c:1338 utils/adt/numeric.c:1352
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "Точність NUMERIC %d повинна бути між 1 і %d"
 
-#: utils/adt/numeric.c:1341
+#: utils/adt/numeric.c:1343
 #, c-format
 msgid "NUMERIC scale %d must be between %d and %d"
 msgstr "Масштаб NUMERIC %d повинен бути між %d і %d"
 
-#: utils/adt/numeric.c:1359
+#: utils/adt/numeric.c:1361
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "неприпустимий модифікатор типу NUMERIC"
 
-#: utils/adt/numeric.c:1725
+#: utils/adt/numeric.c:1727
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "початкове значення не може бути NaN"
 
-#: utils/adt/numeric.c:1729
+#: utils/adt/numeric.c:1731
 #, c-format
 msgid "start value cannot be infinity"
 msgstr "початкове значення не може бути нескінченністю"
 
-#: utils/adt/numeric.c:1736
+#: utils/adt/numeric.c:1738
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "кінцеве значення не може бути NaN"
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1742
 #, c-format
 msgid "stop value cannot be infinity"
 msgstr "кінцеве значення не може бути нескінченністю"
 
-#: utils/adt/numeric.c:1753
+#: utils/adt/numeric.c:1755
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "розмір кроку не може бути NaN"
 
-#: utils/adt/numeric.c:1757
+#: utils/adt/numeric.c:1759
 #, c-format
 msgid "step size cannot be infinity"
 msgstr "розмір кроку не може бути нескінченністю"
 
-#: utils/adt/numeric.c:3649
+#: utils/adt/numeric.c:3753
 #, c-format
 msgid "factorial of a negative number is undefined"
 msgstr "факторіал від'ємного числа не визначено"
 
-#: utils/adt/numeric.c:4256
+#: utils/adt/numeric.c:4360
 #, c-format
 msgid "lower bound cannot be NaN"
-msgstr ""
+msgstr "нижня границя не може бути NaN"
 
-#: utils/adt/numeric.c:4260
+#: utils/adt/numeric.c:4364
 #, c-format
 msgid "lower bound cannot be infinity"
-msgstr ""
+msgstr "нижня границя не може бути нескінченністю"
 
-#: utils/adt/numeric.c:4267
+#: utils/adt/numeric.c:4371
 #, c-format
 msgid "upper bound cannot be NaN"
-msgstr ""
+msgstr "верхня границя не може бути NaN"
 
-#: utils/adt/numeric.c:4271
+#: utils/adt/numeric.c:4375
 #, c-format
 msgid "upper bound cannot be infinity"
-msgstr ""
+msgstr "верхня границя не може бути нескінченністю"
 
-#: utils/adt/numeric.c:4432 utils/adt/numeric.c:4520 utils/adt/numeric.c:4580
-#: utils/adt/numeric.c:4776
+#: utils/adt/numeric.c:4536 utils/adt/numeric.c:4624 utils/adt/numeric.c:4684
+#: utils/adt/numeric.c:4880
 #, c-format
 msgid "cannot convert NaN to %s"
 msgstr "неможливо перетворити NaN на %s"
 
-#: utils/adt/numeric.c:4436 utils/adt/numeric.c:4524 utils/adt/numeric.c:4584
-#: utils/adt/numeric.c:4780
+#: utils/adt/numeric.c:4540 utils/adt/numeric.c:4628 utils/adt/numeric.c:4688
+#: utils/adt/numeric.c:4884
 #, c-format
 msgid "cannot convert infinity to %s"
 msgstr "неможливо перетворити нескінченність на %s"
 
-#: utils/adt/numeric.c:4789
+#: utils/adt/numeric.c:4893
 #, c-format
 msgid "pg_lsn out of range"
 msgstr "pg_lsn поза діапазоном"
 
-#: utils/adt/numeric.c:7981 utils/adt/numeric.c:8032
+#: utils/adt/numeric.c:8085 utils/adt/numeric.c:8136
 #, c-format
 msgid "numeric field overflow"
 msgstr "надлишок поля numeric"
 
-#: utils/adt/numeric.c:7982
+#: utils/adt/numeric.c:8086
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr "Поле з точністю %d, масштабом %d повинне округлятись до абсолютного значення меньше, ніж %s%d."
 
-#: utils/adt/numeric.c:8033
+#: utils/adt/numeric.c:8137
 #, c-format
 msgid "A field with precision %d, scale %d cannot hold an infinite value."
 msgstr "Поле з точністю %d, масштабом %d не може містити нескінченне значення."
 
-#: utils/adt/numeric.c:11359 utils/adt/pseudorandomfuncs.c:135
+#: utils/adt/numeric.c:11702 utils/adt/pseudorandomfuncs.c:135
 #: utils/adt/pseudorandomfuncs.c:159
 #, c-format
 msgid "lower bound must be less than or equal to upper bound"
-msgstr ""
+msgstr "нижня границя повинна бути менше або дорівнювати верхній границі"
 
 #: utils/adt/oid.c:217
 #, c-format
 msgid "invalid oidvector data"
 msgstr "неприпустимі дані oidvector"
 
-#: utils/adt/oracle_compat.c:976
+#: utils/adt/oracle_compat.c:992
 #, c-format
 msgid "requested character too large"
 msgstr "запитаний символ занадто великий"
 
-#: utils/adt/oracle_compat.c:1020
+#: utils/adt/oracle_compat.c:1036
 #, c-format
 msgid "character number must be positive"
 msgstr "номер символу має бути додатнім"
 
-#: utils/adt/oracle_compat.c:1024
+#: utils/adt/oracle_compat.c:1040
 #, c-format
 msgid "null character not permitted"
 msgstr "символ не може бути null"
 
-#: utils/adt/oracle_compat.c:1042 utils/adt/oracle_compat.c:1095
+#: utils/adt/oracle_compat.c:1058 utils/adt/oracle_compat.c:1111
 #, c-format
 msgid "requested character too large for encoding: %u"
 msgstr "запитаний символ занадто великий для кодування: %u"
 
-#: utils/adt/oracle_compat.c:1083
+#: utils/adt/oracle_compat.c:1099
 #, c-format
 msgid "requested character not valid for encoding: %u"
 msgstr "запитаний символ не припустимий для кодування: %u"
@@ -25979,140 +27174,150 @@ msgstr "запитаний символ не припустимий для ко
 msgid "percentile value %g is not between 0 and 1"
 msgstr "значення процентиля %g не є між 0 і 1"
 
-#: utils/adt/pg_locale.c:1484
-#, c-format
-msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
-msgstr "не вдалося відкрити сортувальник для локалізації\"%s\" з правилами \"%s\": %s"
-
-#: utils/adt/pg_locale.c:1495 utils/adt/pg_locale.c:2969
-#: utils/adt/pg_locale.c:3042
-#, c-format
-msgid "ICU is not supported in this build"
-msgstr "ICU не підтримується в цій збірці"
-
-#: utils/adt/pg_locale.c:1523
+#: utils/adt/pg_locale.c:311 utils/adt/pg_locale.c:343
 #, c-format
-msgid "could not create locale \"%s\": %m"
-msgstr "не вдалося створити локалізацію \"%s\": %m"
+msgid "locale name \"%s\" contains non-ASCII characters"
+msgstr "назва локалі \"%s\" містить не-ASCII символи"
 
-#: utils/adt/pg_locale.c:1526
-#, c-format
-msgid "The operating system could not find any locale data for the locale name \"%s\"."
-msgstr "Операційній системі не вдалося знайти дані локалізації з іменем \"%s\"."
-
-#: utils/adt/pg_locale.c:1647
-#, c-format
-msgid "collations with different collate and ctype values are not supported on this platform"
-msgstr "параметри сортування з різними значеннями collate і ctype не підтримуються на цій платформі"
-
-#: utils/adt/pg_locale.c:1694
+#: utils/adt/pg_locale.c:1127
 #, c-format
 msgid "collation \"%s\" has no actual version, but a version was recorded"
 msgstr "для параметру сортування \"%s\" який не має фактичної версії, була вказана версія"
 
-#: utils/adt/pg_locale.c:1700
+#: utils/adt/pg_locale.c:1133
 #, c-format
 msgid "collation \"%s\" has version mismatch"
 msgstr "невідповідність версій для параметру сортування \"%s\""
 
-#: utils/adt/pg_locale.c:1702
+#: utils/adt/pg_locale.c:1135
 #, c-format
 msgid "The collation in the database was created using version %s, but the operating system provides version %s."
 msgstr "Параметр сортування в базі даних був створений з версією %s, але операційна система надає версію %s."
 
-#: utils/adt/pg_locale.c:1705
+#: utils/adt/pg_locale.c:1138
 #, c-format
 msgid "Rebuild all objects affected by this collation and run ALTER COLLATION %s REFRESH VERSION, or build PostgreSQL with the right library version."
 msgstr "Перебудуйте всі об'єкти, які стосуються цього параметру сортування і виконайте ALTER COLLATION %s REFRESH VERSION, або побудуйте PostgreSQL з правильною версією бібліотеки."
 
-#: utils/adt/pg_locale.c:1749 utils/adt/pg_locale.c:2533
-#: utils/adt/pg_locale.c:2558
+#: utils/adt/pg_locale.c:1498 utils/adt/pg_locale.c:1525
+#: utils/adt/pg_locale_builtin.c:188
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "неприпустиме ім'я локалі \"%s\" для вбудованого провайдера"
 
-#: utils/adt/pg_locale.c:1791
+#: utils/adt/pg_locale.c:1590
 #, c-format
-msgid "could not load locale \"%s\""
-msgstr "не вдалося завантажити локаль \"%s\""
+msgid "could not convert locale name \"%s\" to language tag: %s"
+msgstr "не вдалося перетворити локальну назву \"%s\" на мітку мови: %s"
 
-#: utils/adt/pg_locale.c:1816
+#: utils/adt/pg_locale.c:1599 utils/adt/pg_locale.c:1674
+#: utils/adt/pg_locale_icu.c:215
 #, c-format
-msgid "could not get collation version for locale \"%s\": error code %lu"
-msgstr "не вдалося отримати версію параметрів сортування для локалізації \"%s\": код помилки %lu"
+msgid "ICU is not supported in this build"
+msgstr "ICU не підтримується в цій збірці"
 
-#: utils/adt/pg_locale.c:1872 utils/adt/pg_locale.c:1885
+#: utils/adt/pg_locale.c:1632
 #, c-format
-msgid "could not convert string to UTF-16: error code %lu"
-msgstr "не вдалося перетворити рядок в UTF-16: код помилки %lu"
+msgid "could not get language from ICU locale \"%s\": %s"
+msgstr "не вдалося отримати мову з локалі ICU \"%s\": %s"
 
-#: utils/adt/pg_locale.c:1897
+#: utils/adt/pg_locale.c:1634 utils/adt/pg_locale.c:1664
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "не вдалося порівняти рядки в Unicode: %m"
+msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
+msgstr "Щоб вимкнути перевірку мови ICU, встановіть параметр \"%s\" на \"%s\"."
+
+#: utils/adt/pg_locale.c:1662
+#, c-format
+msgid "ICU locale \"%s\" has unknown language \"%s\""
+msgstr "locale ICU \"%s\" має невідому мову \"%s\""
+
+#: utils/adt/pg_locale_icu.c:264
+#, c-format
+msgid "could not get language from locale \"%s\": %s"
+msgstr "не вдалося отримати мову з локалі \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:286 utils/adt/pg_locale_icu.c:303
+#, c-format
+msgid "could not open collator for locale \"%s\": %s"
+msgstr "не вдалося відкрити сортувальник для локалізації \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2071
+#: utils/adt/pg_locale_icu.c:374
+#, c-format
+msgid "could not open collator for locale \"%s\" with rules \"%s\": %s"
+msgstr "не вдалося відкрити сортувальник для локалізації\"%s\" з правилами \"%s\": %s"
+
+#: utils/adt/pg_locale_icu.c:488
 #, c-format
 msgid "collation failed: %s"
 msgstr "помилка в бібліотеці сортування: %s"
 
-#: utils/adt/pg_locale.c:2290 utils/adt/pg_locale.c:2322
+#: utils/adt/pg_locale_icu.c:567 utils/adt/pg_locale_icu.c:831
 #, c-format
 msgid "sort key generation failed: %s"
 msgstr "не вдалося згенерувати ключ сортування: %s"
 
-#: utils/adt/pg_locale.c:2612
+#: utils/adt/pg_locale_icu.c:641 utils/adt/pg_locale_icu.c:653
+#: utils/adt/pg_locale_icu.c:878 utils/adt/pg_locale_icu.c:899
 #, c-format
-msgid "could not get language from locale \"%s\": %s"
-msgstr "не вдалося отримати мову з локалі \"%s\": %s"
+msgid "%s failed: %s"
+msgstr "%s помилка: %s"
 
-#: utils/adt/pg_locale.c:2633 utils/adt/pg_locale.c:2649
+#: utils/adt/pg_locale_icu.c:682
 #, c-format
-msgid "could not open collator for locale \"%s\": %s"
-msgstr "не вдалося відкрити сортувальник для локалізації \"%s\": %s"
+msgid "case conversion failed: %s"
+msgstr "помилка при перетворенні регістру: %s"
 
-#: utils/adt/pg_locale.c:2674
+#: utils/adt/pg_locale_icu.c:851
 #, c-format
 msgid "encoding \"%s\" not supported by ICU"
 msgstr "ICU не підтримує кодування \"%s\""
 
-#: utils/adt/pg_locale.c:2681
+#: utils/adt/pg_locale_icu.c:858
 #, c-format
 msgid "could not open ICU converter for encoding \"%s\": %s"
 msgstr "не вдалося відкрити перетворювач ICU для кодування \"%s\": %s"
 
-#: utils/adt/pg_locale.c:2699 utils/adt/pg_locale.c:2718
-#: utils/adt/pg_locale.c:2774 utils/adt/pg_locale.c:2785
+#: utils/adt/pg_locale_libc.c:553
 #, c-format
-msgid "%s failed: %s"
-msgstr "%s помилка: %s"
+msgid "collations with different collate and ctype values are not supported on this platform"
+msgstr "параметри сортування з різними значеннями collate і ctype не підтримуються на цій платформі"
 
-#: utils/adt/pg_locale.c:2960
+#: utils/adt/pg_locale_libc.c:683
 #, c-format
-msgid "could not convert locale name \"%s\" to language tag: %s"
-msgstr "не вдалося перетворити локальну назву \"%s\" на мітку мови: %s"
+msgid "could not load locale \"%s\""
+msgstr "не вдалося завантажити локаль \"%s\""
 
-#: utils/adt/pg_locale.c:3001
+#: utils/adt/pg_locale_libc.c:708
 #, c-format
-msgid "could not get language from ICU locale \"%s\": %s"
-msgstr "не вдалося отримати мову з локалі ICU \"%s\": %s"
+msgid "could not get collation version for locale \"%s\": error code %lu"
+msgstr "не вдалося отримати версію параметрів сортування для локалізації \"%s\": код помилки %lu"
 
-#: utils/adt/pg_locale.c:3003 utils/adt/pg_locale.c:3032
+#: utils/adt/pg_locale_libc.c:771 utils/adt/pg_locale_libc.c:784
 #, c-format
-msgid "To disable ICU locale validation, set the parameter \"%s\" to \"%s\"."
-msgstr "Щоб вимкнути перевірку мови ICU, встановіть параметр \"%s\" на \"%s\"."
+msgid "could not convert string to UTF-16: error code %lu"
+msgstr "не вдалося перетворити рядок в UTF-16: код помилки %lu"
 
-#: utils/adt/pg_locale.c:3030
+#: utils/adt/pg_locale_libc.c:793
 #, c-format
-msgid "ICU locale \"%s\" has unknown language \"%s\""
-msgstr "locale ICU \"%s\" має невідому мову \"%s\""
+msgid "could not compare Unicode strings: %m"
+msgstr "не вдалося порівняти рядки в Unicode: %m"
+
+#: utils/adt/pg_locale_libc.c:825
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "не вдалося створити локалізацію \"%s\": %m"
 
-#: utils/adt/pg_locale.c:3181
+#: utils/adt/pg_locale_libc.c:828
+#, c-format
+msgid "The operating system could not find any locale data for the locale name \"%s\"."
+msgstr "Операційній системі не вдалося знайти дані локалізації з іменем \"%s\"."
+
+#: utils/adt/pg_locale_libc.c:1000
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "неприпустимий мультибайтний символ для локалізації"
 
-#: utils/adt/pg_locale.c:3182
+#: utils/adt/pg_locale_libc.c:1001
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr "Параметр локалізації серверу LC_CTYPE, можливо, несумісний з кодуванням бази даних."
@@ -26127,27 +27332,27 @@ msgstr "не можна додати NaN в pg_lsn"
 msgid "cannot subtract NaN from pg_lsn"
 msgstr "віднімати NaN з pg_lsn не можна"
 
-#: utils/adt/pg_upgrade_support.c:39
+#: utils/adt/pg_upgrade_support.c:38
 #, c-format
 msgid "function can only be called when server is in binary upgrade mode"
 msgstr "функцію можна викликати тільки коли сервер знаходиться в режимі двійкового оновлення"
 
-#: utils/adt/pgstatfuncs.c:252
+#: utils/adt/pgstatfuncs.c:280
 #, c-format
 msgid "invalid command name: \"%s\""
 msgstr "неприпустиме ім’я команди: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1739
+#: utils/adt/pgstatfuncs.c:1909
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "нерозпізнане відновлення мети: \"%s\""
 
-#: utils/adt/pgstatfuncs.c:1740
+#: utils/adt/pgstatfuncs.c:1910
 #, c-format
 msgid "Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\", or \"wal\"."
 msgstr "Ціллю має бути \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\" або \"wal\"."
 
-#: utils/adt/pgstatfuncs.c:1822
+#: utils/adt/pgstatfuncs.c:2027
 #, c-format
 msgid "invalid subscription OID %u"
 msgstr "некоректний OID підписки %u"
@@ -26172,72 +27377,72 @@ msgstr "не можна прийняти значення типу shell"
 msgid "cannot display a value of a shell type"
 msgstr "не можна відобразити значення типу shell"
 
-#: utils/adt/rangetypes.c:422
+#: utils/adt/rangetypes.c:424
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "аргумент позначок конструктору діапазону не може бути null"
 
-#: utils/adt/rangetypes.c:1021
+#: utils/adt/rangetypes.c:1023
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "результат різниці діапазонів не буде безперервним"
 
-#: utils/adt/rangetypes.c:1082
+#: utils/adt/rangetypes.c:1084
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "результат об'єднання діапазонів не буде безперервним"
 
-#: utils/adt/rangetypes.c:1757
+#: utils/adt/rangetypes.c:1821
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "нижня границя діапазону повинна бути менше або дорівнювати верхній границі діапазону"
 
-#: utils/adt/rangetypes.c:2256 utils/adt/rangetypes.c:2269
-#: utils/adt/rangetypes.c:2283
+#: utils/adt/rangetypes.c:2320 utils/adt/rangetypes.c:2333
+#: utils/adt/rangetypes.c:2347
 #, c-format
 msgid "invalid range bound flags"
 msgstr "неприпустимі позначки границь діапазону"
 
-#: utils/adt/rangetypes.c:2257 utils/adt/rangetypes.c:2270
-#: utils/adt/rangetypes.c:2284
+#: utils/adt/rangetypes.c:2321 utils/adt/rangetypes.c:2334
+#: utils/adt/rangetypes.c:2348
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Припустимі значення \"[]\", \"[)\", \"(]\", і \"()\"."
 
-#: utils/adt/rangetypes.c:2352 utils/adt/rangetypes.c:2369
-#: utils/adt/rangetypes.c:2384 utils/adt/rangetypes.c:2404
-#: utils/adt/rangetypes.c:2415 utils/adt/rangetypes.c:2462
-#: utils/adt/rangetypes.c:2470
+#: utils/adt/rangetypes.c:2416 utils/adt/rangetypes.c:2433
+#: utils/adt/rangetypes.c:2448 utils/adt/rangetypes.c:2468
+#: utils/adt/rangetypes.c:2479 utils/adt/rangetypes.c:2526
+#: utils/adt/rangetypes.c:2534
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "неправильний літерал діапазону: \"%s\""
 
-#: utils/adt/rangetypes.c:2354
+#: utils/adt/rangetypes.c:2418
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Сміття після ключового слова \"empty\"."
 
-#: utils/adt/rangetypes.c:2371
+#: utils/adt/rangetypes.c:2435
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Пропущено ліву дужку (круглу або квадратну)."
 
-#: utils/adt/rangetypes.c:2386
+#: utils/adt/rangetypes.c:2450
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Пропущено кому після нижньої границі."
 
-#: utils/adt/rangetypes.c:2406
+#: utils/adt/rangetypes.c:2470
 #, c-format
 msgid "Too many commas."
 msgstr "Занадто багато ком."
 
-#: utils/adt/rangetypes.c:2417
+#: utils/adt/rangetypes.c:2481
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Сміття після правої дужки."
 
-#: utils/adt/regexp.c:304 utils/adt/regexp.c:1996 utils/adt/varlena.c:4273
+#: utils/adt/regexp.c:304 utils/adt/regexp.c:2065 utils/adt/varlena.c:4486
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "помилка в регулярному виразі: %s"
@@ -26252,33 +27457,33 @@ msgstr "неприпустимий параметр регулярного ви
 msgid "If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly."
 msgstr "Якщо ви хочете використовувати regexp_replace() з початковим параметром, приведіть тип четвертого аргумента до цілого числа."
 
-#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1082
-#: utils/adt/regexp.c:1146 utils/adt/regexp.c:1155 utils/adt/regexp.c:1164
-#: utils/adt/regexp.c:1173 utils/adt/regexp.c:1853 utils/adt/regexp.c:1862
-#: utils/adt/regexp.c:1871 utils/misc/guc.c:6785 utils/misc/guc.c:6819
+#: utils/adt/regexp.c:716 utils/adt/regexp.c:725 utils/adt/regexp.c:1151
+#: utils/adt/regexp.c:1215 utils/adt/regexp.c:1224 utils/adt/regexp.c:1233
+#: utils/adt/regexp.c:1242 utils/adt/regexp.c:1922 utils/adt/regexp.c:1931
+#: utils/adt/regexp.c:1940 utils/misc/guc.c:6829 utils/misc/guc.c:6863
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "неприпустиме значення для параметра \"%s\": %d"
 
-#: utils/adt/regexp.c:936
+#: utils/adt/regexp.c:948
 #, c-format
 msgid "SQL regular expression may not contain more than two escape-double-quote separators"
 msgstr "Регулярний вираз SQL не може містити більше двох роздільників escape-double-quote"
 
 #. translator: %s is a SQL function name
-#: utils/adt/regexp.c:1093 utils/adt/regexp.c:1184 utils/adt/regexp.c:1271
-#: utils/adt/regexp.c:1310 utils/adt/regexp.c:1698 utils/adt/regexp.c:1753
-#: utils/adt/regexp.c:1882
+#: utils/adt/regexp.c:1162 utils/adt/regexp.c:1253 utils/adt/regexp.c:1340
+#: utils/adt/regexp.c:1379 utils/adt/regexp.c:1767 utils/adt/regexp.c:1822
+#: utils/adt/regexp.c:1951
 #, c-format
 msgid "%s does not support the \"global\" option"
 msgstr "%s не підтримує параметр \"global\""
 
-#: utils/adt/regexp.c:1312
+#: utils/adt/regexp.c:1381
 #, c-format
 msgid "Use the regexp_matches function instead."
 msgstr "Використайте функцію regexp_matches замість."
 
-#: utils/adt/regexp.c:1500
+#: utils/adt/regexp.c:1569
 #, c-format
 msgid "too many regular expression matches"
 msgstr "занадто багато відповідностей для регулярного виразу"
@@ -26293,18 +27498,18 @@ msgstr "ім'я \"%s\" мають декілька функцій"
 msgid "more than one operator named %s"
 msgstr "ім'я %s мають декілька операторів"
 
-#: utils/adt/regproc.c:670 gram.y:8992
+#: utils/adt/regproc.c:670 gram.y:9100
 #, c-format
 msgid "missing argument"
 msgstr "пропущено аргумент"
 
-#: utils/adt/regproc.c:671 gram.y:8993
+#: utils/adt/regproc.c:671 gram.y:9101
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Щоб позначити пропущений аргумент унарного оператору, використайте NONE."
 
-#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10498
-#: utils/adt/ruleutils.c:10711
+#: utils/adt/regproc.c:675 utils/adt/regproc.c:2029 utils/adt/ruleutils.c:10836
+#: utils/adt/ruleutils.c:11049
 #, c-format
 msgid "too many arguments"
 msgstr "занадто багато аргументів"
@@ -26315,7 +27520,7 @@ msgid "Provide two argument types for operator."
 msgstr "Надайте для оператора два типи аргументів."
 
 #: utils/adt/regproc.c:1564 utils/adt/regproc.c:1681 utils/adt/regproc.c:1810
-#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3413 utils/adt/varlena.c:3418
+#: utils/adt/regproc.c:1815 utils/adt/varlena.c:3492 utils/adt/varlena.c:3497
 #, c-format
 msgid "invalid name syntax"
 msgstr "неприпустимий синтаксис в імені"
@@ -26340,83 +27545,98 @@ msgstr "очікувалось ім'я типу"
 msgid "improper type name"
 msgstr "неправильне ім'я типу"
 
-#: utils/adt/ri_triggers.c:303 utils/adt/ri_triggers.c:1616
-#: utils/adt/ri_triggers.c:2601
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:1775
+#: utils/adt/ri_triggers.c:2774
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr "insert або update в таблиці \"%s\" порушує обмеження зовнішнього ключа \"%s\""
 
-#: utils/adt/ri_triggers.c:306 utils/adt/ri_triggers.c:1619
+#: utils/adt/ri_triggers.c:317 utils/adt/ri_triggers.c:1778
 #, c-format
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL не дозволяє змішувати в значенні ключа null і nonnull."
 
-#: utils/adt/ri_triggers.c:2036
+#: utils/adt/ri_triggers.c:2192
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "функція \"%s\" повинна запускатись для INSERT"
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2198
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "функція \"%s\" повинна запускатись для UPDATE"
 
-#: utils/adt/ri_triggers.c:2048
+#: utils/adt/ri_triggers.c:2204
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "функція \"%s\" повинна запускатись для DELETE"
 
-#: utils/adt/ri_triggers.c:2071
+#: utils/adt/ri_triggers.c:2227
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "для тригеру \"%s\" таблиці \"%s\" немає введення pg_constraint"
 
-#: utils/adt/ri_triggers.c:2073
+#: utils/adt/ri_triggers.c:2229
 #, c-format
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr "Видаліть цей тригер цілісності зв’язків і пов'язані об'єкти, а потім виконайте ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:2103 gram.y:4340
+#: utils/adt/ri_triggers.c:2259 gram.y:4454
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "Вираз MATCH PARTIAL все ще не реалізований"
 
-#: utils/adt/ri_triggers.c:2426
+#: utils/adt/ri_triggers.c:2599
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr "неочікуваний результат запиту цілісності зв’язків до \"%s\" з обмеження \"%s\" таблиці \"%s\""
 
-#: utils/adt/ri_triggers.c:2430
+#: utils/adt/ri_triggers.c:2603
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Скоріше за все, це викликано правилом, яке переписало запит."
 
-#: utils/adt/ri_triggers.c:2591
+#: utils/adt/ri_triggers.c:2764
 #, c-format
 msgid "removing partition \"%s\" violates foreign key constraint \"%s\""
 msgstr "видалення секції \"%s\" порушує обмеження зовнішнього ключа \"%s"
 
-#: utils/adt/ri_triggers.c:2594 utils/adt/ri_triggers.c:2619
+#: utils/adt/ri_triggers.c:2767 utils/adt/ri_triggers.c:2806
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "На ключ (%s)=(%s) все ще є посилання в таблиці \"%s\"."
 
-#: utils/adt/ri_triggers.c:2605
+#: utils/adt/ri_triggers.c:2778
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Ключ (%s)=(%s) не присутній в таблиці \"%s\"."
 
-#: utils/adt/ri_triggers.c:2608
+#: utils/adt/ri_triggers.c:2781
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "Ключ не присутній в таблиці \"%s\"."
 
-#: utils/adt/ri_triggers.c:2614
+#: utils/adt/ri_triggers.c:2787
+#, c-format
+msgid "update or delete on table \"%s\" violates RESTRICT setting of foreign key constraint \"%s\" on table \"%s\""
+msgstr "оновлення або видалення в таблиці \"%s\" порушує налаштування RESTRICT зовнішнього ключа \"%s\" в таблиці \"%s\""
+
+#: utils/adt/ri_triggers.c:2792
+#, c-format
+msgid "Key (%s)=(%s) is referenced from table \"%s\"."
+msgstr "Ключ (%s)=(%s) посилається з таблиці \"%s\"."
+
+#: utils/adt/ri_triggers.c:2795
+#, c-format
+msgid "Key is referenced from table \"%s\"."
+msgstr "Ключ посилається з таблиці \"%s\"."
+
+#: utils/adt/ri_triggers.c:2801
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
 msgstr "update або delete в таблиці \"%s\" порушує обмеження зовнішнього ключа \"%s\" таблиці \"%s\""
 
-#: utils/adt/ri_triggers.c:2622
+#: utils/adt/ri_triggers.c:2809
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "На ключ все ще є посилання в таблиці \"%s\"."
@@ -26467,146 +27687,175 @@ msgstr "двійкові дані мають тип %u (%s) замість оч
 msgid "improper binary format in record column %d"
 msgstr "неправильний двійковий формат у стовпці запису %d"
 
-#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1453
-#: utils/adt/rowtypes.c:1699
+#: utils/adt/rowtypes.c:949 utils/adt/rowtypes.c:1195 utils/adt/rowtypes.c:1471
+#: utils/adt/rowtypes.c:1717
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "не можна порівнювати неподібні типи стовпців %s і %s, стовпець запису %d"
 
 #: utils/adt/rowtypes.c:1040 utils/adt/rowtypes.c:1265
-#: utils/adt/rowtypes.c:1550 utils/adt/rowtypes.c:1735
+#: utils/adt/rowtypes.c:1568 utils/adt/rowtypes.c:1753
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "не можна порівнювати типи записів з різної кількістю стовпців"
 
-#: utils/adt/ruleutils.c:2689
+#: utils/adt/ruleutils.c:2740
 #, c-format
 msgid "input is a query, not an expression"
 msgstr "вхідне значення є запитом, а не виразом"
 
-#: utils/adt/ruleutils.c:2701
+#: utils/adt/ruleutils.c:2752
 #, c-format
 msgid "expression contains variables of more than one relation"
 msgstr "вираз містить змінні більше одного відношення"
 
-#: utils/adt/ruleutils.c:2708
+#: utils/adt/ruleutils.c:2759
 #, c-format
 msgid "expression contains variables"
 msgstr "вираз містить змінні"
 
-#: utils/adt/ruleutils.c:5241
+#: utils/adt/ruleutils.c:5433
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "правило \"%s\" має непідтримуваний тип подій %d"
 
-#: utils/adt/timestamp.c:128
+#: utils/adt/tid.c:317
+#, c-format
+msgid "cannot look at latest visible tid for relation \"%s.%s\""
+msgstr "не можна переглянути останній видимий tid для відношення \"%s.%s\""
+
+#: utils/adt/tid.c:356
+#, c-format
+msgid "ctid isn't of type TID"
+msgstr "ctid не є типом TID"
+
+#: utils/adt/tid.c:364
+#, c-format
+msgid "currtid cannot handle views with no CTID"
+msgstr "currtid не може обробляти подання без CTID"
+
+#: utils/adt/tid.c:369
+#, c-format
+msgid "the view has no rules"
+msgstr "подання не має правил"
+
+#: utils/adt/tid.c:381
+#, c-format
+msgid "only one select rule is allowed in views"
+msgstr "в поданнях дозволено тільки одне правило select"
+
+#: utils/adt/timestamp.c:130
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "TIMESTAMP(%d)%s точність не повинна бути від'ємною"
 
-#: utils/adt/timestamp.c:134
+#: utils/adt/timestamp.c:136
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIMESTAMP(%d)%s точність зменшена до дозволеного максимуму, %d"
 
-#: utils/adt/timestamp.c:394
+#: utils/adt/timestamp.c:204 utils/adt/timestamp.c:457
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "позначка часу поза діапазоном: \"%s\""
+
+#: utils/adt/timestamp.c:396
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "точність позначки часу (%d) повинна бути між %d і %d"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:514
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "Числові часові пояси повинні мати \"-\" або \"+\" в якості першого символу."
 
-#: utils/adt/timestamp.c:524
+#: utils/adt/timestamp.c:526
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "числовий часовий пояс \"%s\" поза діапазоном"
 
-#: utils/adt/timestamp.c:625 utils/adt/timestamp.c:635
-#: utils/adt/timestamp.c:643
+#: utils/adt/timestamp.c:626 utils/adt/timestamp.c:634
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "позначка часу поза діапазоном: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:744
+#: utils/adt/timestamp.c:735
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "позначка часу не може бути NaN"
 
-#: utils/adt/timestamp.c:762 utils/adt/timestamp.c:774
+#: utils/adt/timestamp.c:753 utils/adt/timestamp.c:765
 #, c-format
 msgid "timestamp out of range: \"%g\""
 msgstr "позначка часу поза діапазоном: \"%g\""
 
-#: utils/adt/timestamp.c:957 utils/adt/timestamp.c:1516
-#: utils/adt/timestamp.c:1526 utils/adt/timestamp.c:1587
-#: utils/adt/timestamp.c:2807 utils/adt/timestamp.c:2816
-#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:2905
-#: utils/adt/timestamp.c:2922 utils/adt/timestamp.c:2979
-#: utils/adt/timestamp.c:3022 utils/adt/timestamp.c:3400
-#: utils/adt/timestamp.c:3458 utils/adt/timestamp.c:3481
-#: utils/adt/timestamp.c:3490 utils/adt/timestamp.c:3514
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:3546
-#: utils/adt/timestamp.c:3681 utils/adt/timestamp.c:3782
-#: utils/adt/timestamp.c:4189 utils/adt/timestamp.c:4226
-#: utils/adt/timestamp.c:4274 utils/adt/timestamp.c:4283
-#: utils/adt/timestamp.c:4375 utils/adt/timestamp.c:4422
-#: utils/adt/timestamp.c:4431 utils/adt/timestamp.c:4527
-#: utils/adt/timestamp.c:4580 utils/adt/timestamp.c:4590
-#: utils/adt/timestamp.c:4785 utils/adt/timestamp.c:4795
-#: utils/adt/timestamp.c:5097
+#: utils/adt/timestamp.c:948 utils/adt/timestamp.c:1507
+#: utils/adt/timestamp.c:1517 utils/adt/timestamp.c:1578
+#: utils/adt/timestamp.c:2866 utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:2890 utils/adt/timestamp.c:2964
+#: utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038
+#: utils/adt/timestamp.c:3081 utils/adt/timestamp.c:3459
+#: utils/adt/timestamp.c:3517 utils/adt/timestamp.c:3540
+#: utils/adt/timestamp.c:3549 utils/adt/timestamp.c:3573
+#: utils/adt/timestamp.c:3596 utils/adt/timestamp.c:3605
+#: utils/adt/timestamp.c:3740 utils/adt/timestamp.c:3841
+#: utils/adt/timestamp.c:4248 utils/adt/timestamp.c:4285
+#: utils/adt/timestamp.c:4333 utils/adt/timestamp.c:4342
+#: utils/adt/timestamp.c:4434 utils/adt/timestamp.c:4481
+#: utils/adt/timestamp.c:4490 utils/adt/timestamp.c:4586
+#: utils/adt/timestamp.c:4639 utils/adt/timestamp.c:4649
+#: utils/adt/timestamp.c:4874 utils/adt/timestamp.c:4884
+#: utils/adt/timestamp.c:5239
 #, c-format
 msgid "interval out of range"
 msgstr "інтервал поза діапазоном"
 
-#: utils/adt/timestamp.c:1094 utils/adt/timestamp.c:1127
+#: utils/adt/timestamp.c:1085 utils/adt/timestamp.c:1118
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "неприпустимий модифікатор типу INTERVAL"
 
-#: utils/adt/timestamp.c:1110
+#: utils/adt/timestamp.c:1101
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d) точність не повинна бути від'ємною"
 
-#: utils/adt/timestamp.c:1116
+#: utils/adt/timestamp.c:1107
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d) точність зменшена до максимально можливої, %d"
 
-#: utils/adt/timestamp.c:1506
+#: utils/adt/timestamp.c:1497
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "interval(%d) точність повинна бути між %d і %d"
 
-#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4769
+#: utils/adt/timestamp.c:4623 utils/adt/timestamp.c:4858
 #, c-format
 msgid "origin out of range"
 msgstr "джерело поза діапазоном"
 
-#: utils/adt/timestamp.c:4569 utils/adt/timestamp.c:4774
+#: utils/adt/timestamp.c:4628 utils/adt/timestamp.c:4863
 #, c-format
 msgid "timestamps cannot be binned into infinite intervals"
 msgstr "мітки часу не можуть бути розбиті на нескінченні інтервали"
 
-#: utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4779
+#: utils/adt/timestamp.c:4633 utils/adt/timestamp.c:4868
 #, c-format
 msgid "timestamps cannot be binned into intervals containing months or years"
 msgstr "позначки часу не можна розділяти на інтервали, що містять місяці або роки"
 
-#: utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4790
+#: utils/adt/timestamp.c:4644 utils/adt/timestamp.c:4879
 #, c-format
 msgid "stride must be greater than zero"
 msgstr "крок повинен бути більше нуля"
 
-#: utils/adt/timestamp.c:5091
+#: utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5233
 #, c-format
 msgid "Months usually have fractional weeks."
 msgstr "У місяців зазвичай є дробові тижні."
 
-#: utils/adt/timestamp.c:6551 utils/adt/timestamp.c:6637
+#: utils/adt/timestamp.c:6713 utils/adt/timestamp.c:6799
 #, c-format
 msgid "step size cannot be infinite"
 msgstr "розмір кроку не може бути нескінченним"
@@ -26681,32 +27930,32 @@ msgstr "запит пошуку тексту ігнорується, тому, 
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "запит ts_rewrite повинен повернути два стовпця типу tsquery"
 
-#: utils/adt/tsrank.c:412
+#: utils/adt/tsrank.c:415
 #, c-format
 msgid "array of weight must be one-dimensional"
 msgstr "масив значимості повинен бути одновимірним"
 
-#: utils/adt/tsrank.c:417
+#: utils/adt/tsrank.c:420
 #, c-format
 msgid "array of weight is too short"
 msgstr "масив значимості занадто малий"
 
-#: utils/adt/tsrank.c:422
+#: utils/adt/tsrank.c:425
 #, c-format
 msgid "array of weight must not contain nulls"
 msgstr "масив значимості не повинен містити null"
 
-#: utils/adt/tsrank.c:431 utils/adt/tsrank.c:871
+#: utils/adt/tsrank.c:434 utils/adt/tsrank.c:876
 #, c-format
 msgid "weight out of range"
 msgstr "значимість поза діапазоном"
 
-#: utils/adt/tsvector.c:216
+#: utils/adt/tsvector.c:213
 #, c-format
 msgid "word is too long (%ld bytes, max %ld bytes)"
 msgstr "слово занадто довге (%ld байт, при максимумі %ld)"
 
-#: utils/adt/tsvector.c:223
+#: utils/adt/tsvector.c:220
 #, c-format
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "рядок занадто довгий для tsvector (%ld байт, при максимумі %ld)"
@@ -26786,7 +28035,7 @@ msgstr "немає пропущеного символу: \"%s\""
 msgid "wrong position info in tsvector: \"%s\""
 msgstr "неправильна інформація про позицію в tsvector: \"%s\""
 
-#: utils/adt/uuid.c:418
+#: utils/adt/uuid.c:535 utils/adt/uuid.c:632
 #, c-format
 msgid "could not generate random values"
 msgstr "не вдалося згенерувати випадкові значення"
@@ -26831,9 +28080,9 @@ msgstr "неприпустима довжина у зовнішньому ряд
 msgid "bit string too long for type bit varying(%d)"
 msgstr "рядок бітів занадто довгий для типу bit varying(%d)"
 
-#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:911
-#: utils/adt/varlena.c:974 utils/adt/varlena.c:1131 utils/adt/varlena.c:3055
-#: utils/adt/varlena.c:3133
+#: utils/adt/varbit.c:1081 utils/adt/varbit.c:1191 utils/adt/varlena.c:919
+#: utils/adt/varlena.c:982 utils/adt/varlena.c:1139 utils/adt/varlena.c:3113
+#: utils/adt/varlena.c:3191
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "від'ємна довжина підрядка не дозволена"
@@ -26858,7 +28107,7 @@ msgstr "не можна використовувати (XOR) для бітови
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "індекс біту %d поза припустимим діапазоном (0..%d)"
 
-#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3337
+#: utils/adt/varbit.c:1833 utils/adt/varlena.c:3395
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "новий біт повинен бути 0 або 1"
@@ -26873,92 +28122,92 @@ msgstr "значення занадто довге для типу character(%d)
 msgid "value too long for type character varying(%d)"
 msgstr "значення занадто довге для типу character varying(%d)"
 
-#: utils/adt/varchar.c:737 utils/adt/varlena.c:1520
+#: utils/adt/varchar.c:737 utils/adt/varlena.c:1602
 #, c-format
 msgid "could not determine which collation to use for string comparison"
 msgstr "не вдалося визначити, який параметр сортування використати для порівняння рядків"
 
-#: utils/adt/varlena.c:1230 utils/adt/varlena.c:1809
+#: utils/adt/varlena.c:1875
 #, c-format
 msgid "nondeterministic collations are not supported for substring searches"
 msgstr "недетерміновані параметри сортування не підтримуються для пошуку підрядків"
 
-#: utils/adt/varlena.c:3221 utils/adt/varlena.c:3288
+#: utils/adt/varlena.c:3279 utils/adt/varlena.c:3346
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "індекс %d поза припустимим діапазоном, 0..%d"
 
-#: utils/adt/varlena.c:3252 utils/adt/varlena.c:3324
+#: utils/adt/varlena.c:3310 utils/adt/varlena.c:3382
 #, c-format
-msgid "index %lld out of valid range, 0..%lld"
-msgstr "індекс %lld поза допустимим діапазоном, 0..%lld"
+msgid "index %<PRId64> out of valid range, 0..%<PRId64>"
+msgstr "індекс %<PRId64> поза допустимим діапазоном, 0..%<PRId64>"
 
-#: utils/adt/varlena.c:4385
+#: utils/adt/varlena.c:4598
 #, c-format
 msgid "field position must not be zero"
 msgstr "позиція поля не повинна бути нульовою"
 
-#: utils/adt/varlena.c:5630
+#: utils/adt/varlena.c:5843
 #, c-format
 msgid "unterminated format() type specifier"
 msgstr "незавершений специфікатор типу format()"
 
-#: utils/adt/varlena.c:5631 utils/adt/varlena.c:5765 utils/adt/varlena.c:5886
+#: utils/adt/varlena.c:5844 utils/adt/varlena.c:5978 utils/adt/varlena.c:6099
 #, c-format
 msgid "For a single \"%%\" use \"%%%%\"."
 msgstr "Для представлення одного знаку \"%%\", використайте \"%%%%\"."
 
-#: utils/adt/varlena.c:5763 utils/adt/varlena.c:5884
+#: utils/adt/varlena.c:5976 utils/adt/varlena.c:6097
 #, c-format
 msgid "unrecognized format() type specifier \"%.*s\""
 msgstr "нерозпізнаний специфікатор типу format() \"%.*s\""
 
-#: utils/adt/varlena.c:5776 utils/adt/varlena.c:5833
+#: utils/adt/varlena.c:5989 utils/adt/varlena.c:6046
 #, c-format
 msgid "too few arguments for format()"
 msgstr "занадто мало аргументів для format()"
 
-#: utils/adt/varlena.c:5929 utils/adt/varlena.c:6111
+#: utils/adt/varlena.c:6142 utils/adt/varlena.c:6324
 #, c-format
 msgid "number is out of range"
 msgstr "число поза діапазоном"
 
-#: utils/adt/varlena.c:5992 utils/adt/varlena.c:6020
+#: utils/adt/varlena.c:6205 utils/adt/varlena.c:6233
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "формат посилається на аргумент 0, але аргументи нумеруются з 1"
 
-#: utils/adt/varlena.c:6013
+#: utils/adt/varlena.c:6226
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "вказівка аргументу ширини повинно закінчуватися \"$\""
 
-#: utils/adt/varlena.c:6058
+#: utils/adt/varlena.c:6271
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "значення null не можна форматувати у вигляді SQL-ідентифікатору"
 
-#: utils/adt/varlena.c:6266
+#: utils/adt/varlena.c:6479
 #, c-format
 msgid "Unicode normalization can only be performed if server encoding is UTF8"
 msgstr "Нормалізація Unicode може виконуватись лише тоді, коли кодування серверу - UTF8"
 
-#: utils/adt/varlena.c:6279
+#: utils/adt/varlena.c:6492
 #, c-format
 msgid "invalid normalization form: %s"
 msgstr "неприпустима форма нормалізації: %s"
 
-#: utils/adt/varlena.c:6324
+#: utils/adt/varlena.c:6537
 #, c-format
 msgid "Unicode categorization can only be performed if server encoding is UTF8"
 msgstr "Категоризація в юні коді може бути виконана, тільки якщо кодування сервера - UTF8"
 
-#: utils/adt/varlena.c:6541 utils/adt/varlena.c:6576 utils/adt/varlena.c:6611
+#: utils/adt/varlena.c:6754 utils/adt/varlena.c:6789 utils/adt/varlena.c:6824
 #, c-format
 msgid "invalid Unicode code point: %04X"
 msgstr "неприпустима точка коду Unicode: %04X"
 
-#: utils/adt/varlena.c:6641
+#: utils/adt/varlena.c:6854
 #, c-format
 msgid "Unicode escapes must be \\XXXX, \\+XXXXXX, \\uXXXX, or \\UXXXXXXXX."
 msgstr "Спеціальні коди Unicode повинні бути \\XXXX, \\+XXXXXX, \\uXXXXXX, або \\UXXXXXX."
@@ -26973,12 +28222,12 @@ msgstr "аргумент ntile повинен бути більше нуля"
 msgid "argument of nth_value must be greater than zero"
 msgstr "аргумент nth_value повинен бути більше нуля"
 
-#: utils/adt/xid8funcs.c:124
+#: utils/adt/xid8funcs.c:120
 #, c-format
-msgid "transaction ID %llu is in the future"
-msgstr "ідентифікатор транзакції %llu знаходиться в майбутньому"
+msgid "transaction ID %<PRIu64> is in the future"
+msgstr "ID транзакції %<PRIu64> знаходиться в майбутньому"
 
-#: utils/adt/xid8funcs.c:553
+#: utils/adt/xid8funcs.c:522
 #, c-format
 msgid "invalid external pg_snapshot data"
 msgstr "неприпустимі зовнішні дані pg_snapshot"
@@ -26993,7 +28242,7 @@ msgstr "XML-функції не підтримуються"
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "Ця функціональність потребує, щоб сервер був побудований з підтримкою libxml."
 
-#: utils/adt/xml.c:258 utils/mb/mbutils.c:627
+#: utils/adt/xml.c:258 utils/mb/mbutils.c:628
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "неприпустиме ім’я кодування \"%s\""
@@ -27008,157 +28257,162 @@ msgstr "неприпустимий XML-коментар"
 msgid "not an XML document"
 msgstr "не XML-документ"
 
-#: utils/adt/xml.c:1008 utils/adt/xml.c:1031
+#: utils/adt/xml.c:1020 utils/adt/xml.c:1043
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "неприпустима XML-команда обробки"
 
-#: utils/adt/xml.c:1009
+#: utils/adt/xml.c:1021
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "Метою XML-команди обробки не може бути \"%s\"."
 
-#: utils/adt/xml.c:1032
+#: utils/adt/xml.c:1044
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML-команда обробки не може містити \"?>\"."
 
-#: utils/adt/xml.c:1111
+#: utils/adt/xml.c:1123
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "функція xmlvalidate не реалізована"
 
-#: utils/adt/xml.c:1167
+#: utils/adt/xml.c:1179
 #, c-format
 msgid "could not initialize XML library"
 msgstr "не вдалося ініціалізувати бібліотеку XML"
 
-#: utils/adt/xml.c:1168
+#: utils/adt/xml.c:1180
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 msgstr "libxml2 має несумісний тип char: sizeof(char)=%zu, sizeof(xmlChar)=%zu."
 
-#: utils/adt/xml.c:1254
+#: utils/adt/xml.c:1266
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "не вдалося встановити обробник XML-помилок"
 
-#: utils/adt/xml.c:1255
+#: utils/adt/xml.c:1267
 #, 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 "Можливо це означає, що використовувана версія libxml2 несумісна з файлами-заголовками libxml2, з котрими був зібраний PostgreSQL."
 
-#: utils/adt/xml.c:2281
+#: utils/adt/xml.c:2283
 msgid "Invalid character value."
 msgstr "Неприпустиме значення символу."
 
-#: utils/adt/xml.c:2284
+#: utils/adt/xml.c:2286
 msgid "Space required."
 msgstr "Потребується пробіл."
 
-#: utils/adt/xml.c:2287
+#: utils/adt/xml.c:2289
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "значеннями атрибуту standalone можуть бути лише 'yes' або 'no'."
 
-#: utils/adt/xml.c:2290
+#: utils/adt/xml.c:2292
 msgid "Malformed declaration: missing version."
 msgstr "Неправильне оголошення: пропущена версія."
 
-#: utils/adt/xml.c:2293
+#: utils/adt/xml.c:2295
 msgid "Missing encoding in text declaration."
 msgstr "В оголошенні пропущене кодування."
 
-#: utils/adt/xml.c:2296
+#: utils/adt/xml.c:2298
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Аналіз XML-оголошення: '?>' очікується."
 
-#: utils/adt/xml.c:2299
+#: utils/adt/xml.c:2301
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Нерозпізнаний код помилки libxml: %d."
 
-#: utils/adt/xml.c:2553
+#: utils/adt/xml.c:2555
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML не підтримує безкінечні значення в датах."
 
-#: utils/adt/xml.c:2575 utils/adt/xml.c:2602
+#: utils/adt/xml.c:2577 utils/adt/xml.c:2604
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML не підтримує безкінченні значення в позначках часу."
 
-#: utils/adt/xml.c:3018
+#: utils/adt/xml.c:3020
 #, c-format
 msgid "invalid query"
 msgstr "неприпустимий запит"
 
-#: utils/adt/xml.c:3110
+#: utils/adt/xml.c:3112
 #, c-format
 msgid "portal \"%s\" does not return tuples"
 msgstr "portal \"%s\" не повертає кортежі"
 
-#: utils/adt/xml.c:4362
+#: utils/adt/xml.c:4364
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "неприпустимий масив з зіставленням простіру імен XML"
 
-#: utils/adt/xml.c:4363
+#: utils/adt/xml.c:4365
 #, c-format
 msgid "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "Масив повинен бути двовимірним і містити 2 елемента по другій вісі."
 
-#: utils/adt/xml.c:4387
+#: utils/adt/xml.c:4389
 #, c-format
 msgid "empty XPath expression"
 msgstr "пустий вираз XPath"
 
-#: utils/adt/xml.c:4439
+#: utils/adt/xml.c:4441
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "ні ім'я простіру імен ні URI не можуть бути null"
 
-#: utils/adt/xml.c:4446
+#: utils/adt/xml.c:4448
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "не вдалося зареєструвати простір імен XML з ім'ям \"%s\" і URI \"%s\""
 
-#: utils/adt/xml.c:4795
+#: utils/adt/xml.c:4797
 #, c-format
 msgid "DEFAULT namespace is not supported"
 msgstr "Простір імен DEFAULT не підтримується"
 
-#: utils/adt/xml.c:4824
+#: utils/adt/xml.c:4826
 #, c-format
 msgid "row path filter must not be empty string"
 msgstr "шлях фільтруючих рядків не повинен бути пустим"
 
-#: utils/adt/xml.c:4858
+#: utils/adt/xml.c:4860
 #, c-format
 msgid "column path filter must not be empty string"
 msgstr "шлях фільтруючого стовпця не повинен бути пустим"
 
-#: utils/adt/xml.c:5005
+#: utils/adt/xml.c:5007
 #, c-format
 msgid "more than one value returned by column XPath expression"
 msgstr "вираз XPath, який відбирає стовпець, повернув більше одного значення"
 
-#: utils/cache/lsyscache.c:1017
+#: utils/cache/funccache.c:364
+#, c-format
+msgid "could not determine actual argument type for polymorphic function \"%s\""
+msgstr "не вдалося визначити фактичний тип аргумента поліморфної функції \"%s\""
+
+#: utils/cache/lsyscache.c:1109
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "приведення від типу %s до типу %s не існує"
 
-#: utils/cache/lsyscache.c:2887 utils/cache/lsyscache.c:2920
-#: utils/cache/lsyscache.c:2953 utils/cache/lsyscache.c:2986
+#: utils/cache/lsyscache.c:3027 utils/cache/lsyscache.c:3060
+#: utils/cache/lsyscache.c:3093 utils/cache/lsyscache.c:3126
 #, c-format
 msgid "type %s is only a shell"
 msgstr "тип %s лише оболонка"
 
-#: utils/cache/lsyscache.c:2892
+#: utils/cache/lsyscache.c:3032
 #, c-format
 msgid "no input function available for type %s"
 msgstr "для типу %s немає доступної функції введення"
 
-#: utils/cache/lsyscache.c:2925
+#: utils/cache/lsyscache.c:3065
 #, c-format
 msgid "no output function available for type %s"
 msgstr "для типу %s немає доступної функції виводу"
@@ -27168,32 +28422,27 @@ msgstr "для типу %s немає доступної функції виво
 msgid "operator class \"%s\" of access method %s is missing support function %d for type %s"
 msgstr "в класі операторів \"%s\" методу доступу %s пропущено опорну функцію %d для типу %s"
 
-#: utils/cache/plancache.c:747
-#, c-format
-msgid "cached plan must not change result type"
-msgstr "в кешованому плані не повинен змінюватись тип результату"
-
-#: utils/cache/relcache.c:3800
+#: utils/cache/relcache.c:3805
 #, c-format
 msgid "heap relfilenumber value not set when in binary upgrade mode"
 msgstr "значення relfilenumber не встановлене у режимі двійкового оновлення"
 
-#: utils/cache/relcache.c:3808
+#: utils/cache/relcache.c:3813
 #, c-format
 msgid "unexpected request for new relfilenumber in binary upgrade mode"
 msgstr "неочікуваний запит на новий relfilenumber в режимі двійкового оновлення"
 
-#: utils/cache/relcache.c:6536
+#: utils/cache/relcache.c:6633
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "не вдалося створити файл ініціалізації для кешу відношень \"%s\": %m"
 
-#: utils/cache/relcache.c:6538
+#: utils/cache/relcache.c:6635
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Продовжуємо усе одно, але щось не так."
 
-#: utils/cache/relcache.c:6868
+#: utils/cache/relcache.c:6965
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "не вдалося видалити файл кешу \"%s\": %m"
@@ -27213,7 +28462,7 @@ msgstr "файл зіставлень відношень \"%s\" містить 
 msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr "файл зіставлень відношень \"%s\" містить неправильну контрольну суму"
 
-#: utils/cache/typcache.c:1812 utils/fmgr/funcapi.c:574
+#: utils/cache/typcache.c:1901 utils/fmgr/funcapi.c:574
 #, c-format
 msgid "record type has not been registered"
 msgstr "тип запису не зареєстрований"
@@ -27228,193 +28477,180 @@ msgstr "TRAP: ExceptionalCondition: невірні аргументи в PID %d\
 msgid "TRAP: failed Assert(\"%s\"), File: \"%s\", Line: %d, PID: %d\n"
 msgstr "TRAP: помилка Assert(\"%s\"), файл: \"%s\", рядок: %d, PID: %d\n"
 
-#: utils/error/elog.c:415
+#: utils/error/elog.c:412
 #, c-format
 msgid "error occurred before error message processing is available\n"
 msgstr "сталася помилка перед тим, як обробка повідомлення про помилку була доступна\n"
 
-#: utils/error/elog.c:2134
+#: utils/error/elog.c:2142
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "не вдалося повторно відкрити файл \"%s\" як stderr: %m"
 
-#: utils/error/elog.c:2147
+#: utils/error/elog.c:2155
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "не вдалося повторно відкрити файл \"%s\" як stdout: %m"
 
-#: utils/error/elog.c:2183
+#: utils/error/elog.c:2191
 #, c-format
-msgid "Invalid character"
-msgstr "Неприпустимий символ"
+msgid "Invalid character."
+msgstr "Недійсний символ."
 
-#: utils/error/elog.c:2889 utils/error/elog.c:2916 utils/error/elog.c:2932
+#: utils/error/elog.c:2901 utils/error/elog.c:2928 utils/error/elog.c:2944
 msgid "[unknown]"
 msgstr "[unknown]"
 
-#: utils/error/elog.c:3202 utils/error/elog.c:3526 utils/error/elog.c:3633
+#: utils/error/elog.c:3246 utils/error/elog.c:3570 utils/error/elog.c:3677
 msgid "missing error text"
 msgstr "пропущено текст помилки"
 
-#: utils/error/elog.c:3205 utils/error/elog.c:3208
+#: utils/error/elog.c:3249 utils/error/elog.c:3252
 #, c-format
 msgid " at character %d"
 msgstr " символ %d"
 
-#: utils/error/elog.c:3218 utils/error/elog.c:3225
+#: utils/error/elog.c:3262 utils/error/elog.c:3269
 msgid "DETAIL:  "
 msgstr "ВІДОМОСТІ:  "
 
-#: utils/error/elog.c:3232
+#: utils/error/elog.c:3276
 msgid "HINT:  "
 msgstr "УКАЗІВКА:  "
 
-#: utils/error/elog.c:3239
+#: utils/error/elog.c:3283
 msgid "QUERY:  "
 msgstr "ЗАПИТ:  "
 
-#: utils/error/elog.c:3246
+#: utils/error/elog.c:3290
 msgid "CONTEXT:  "
 msgstr "КОНТЕКСТ:  "
 
-#: utils/error/elog.c:3256
+#: utils/error/elog.c:3300
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "РОЗТАШУВАННЯ:  %s, %s:%d\n"
 
-#: utils/error/elog.c:3263
+#: utils/error/elog.c:3307
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "РОЗТАШУВАННЯ:  %s:%d\n"
 
-#: utils/error/elog.c:3270
+#: utils/error/elog.c:3314
 msgid "BACKTRACE:  "
 msgstr "ВІДСТЕЖУВАТИ:  "
 
-#: utils/error/elog.c:3282
+#: utils/error/elog.c:3326
 msgid "STATEMENT:  "
 msgstr "ІНСТРУКЦІЯ:  "
 
-#: utils/error/elog.c:3678
+#: utils/error/elog.c:3722
 msgid "DEBUG"
 msgstr "НАЛАГОДЖЕННЯ"
 
-#: utils/error/elog.c:3682
+#: utils/error/elog.c:3726
 msgid "LOG"
 msgstr "ЗАПИСУВАННЯ"
 
-#: utils/error/elog.c:3685
+#: utils/error/elog.c:3729
 msgid "INFO"
 msgstr "ІНФОРМАЦІЯ"
 
-#: utils/error/elog.c:3688
+#: utils/error/elog.c:3732
 msgid "NOTICE"
 msgstr "ПОВІДОМЛЕННЯ"
 
-#: utils/error/elog.c:3692
+#: utils/error/elog.c:3736
 msgid "WARNING"
 msgstr "ПОПЕРЕДЖЕННЯ"
 
-#: utils/error/elog.c:3695
+#: utils/error/elog.c:3739
 msgid "ERROR"
 msgstr "ПОМИЛКА"
 
-#: utils/error/elog.c:3698
+#: utils/error/elog.c:3742
 msgid "FATAL"
 msgstr "ФАТАЛЬНО"
 
-#: utils/error/elog.c:3701
+#: utils/error/elog.c:3745
 msgid "PANIC"
 msgstr "ПАНІКА"
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:133
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "не вдалося знайти функцію \"%s\" у файлі \"%s\""
 
-#: utils/fmgr/dfmgr.c:247
+#: utils/fmgr/dfmgr.c:252
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "не вдалося завантажити бібліотеку \"%s\": %s"
 
-#: utils/fmgr/dfmgr.c:279
+#: utils/fmgr/dfmgr.c:289
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "несумісная бібліотека \"%s\": пропущено магічний блок"
 
-#: utils/fmgr/dfmgr.c:281
+#: utils/fmgr/dfmgr.c:291
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "Бібліотеки розширення потребують використання макросу PG_MODULE_MAGIC."
 
-#: utils/fmgr/dfmgr.c:327
+#: utils/fmgr/dfmgr.c:337
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "несумісна бібліотека \"%s\": невідповідність версій"
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:339
 #, c-format
 msgid "Server is version %d, library is version %s."
 msgstr "Версія серверу %d, версія бібліотеки %s."
 
-#: utils/fmgr/dfmgr.c:341
+#: utils/fmgr/dfmgr.c:351
 #, c-format
 msgid "incompatible library \"%s\": ABI mismatch"
 msgstr "несумісна бібліотека \"%s\": невідповідність ABI"
 
-#: utils/fmgr/dfmgr.c:343
+#: utils/fmgr/dfmgr.c:353
 #, c-format
 msgid "Server has ABI \"%s\", library has \"%s\"."
 msgstr "Сервер має ABI \"%s\", бібліотека має \"%s\"."
 
-#: utils/fmgr/dfmgr.c:361
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "Сервер має FUNC_MAX_ARGS = %d, бібліотека має %d."
-
-#: utils/fmgr/dfmgr.c:370
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "Сервер має INDEX_MAX_KEYS = %d, бібліотека має %d."
-
-#: utils/fmgr/dfmgr.c:379
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:372 utils/fmgr/dfmgr.c:382 utils/fmgr/dfmgr.c:392
 #, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "Сервер має NAMEDATALEN = %d, бібліотека має %d."
+msgid "Server has %s = %d, library has %d."
+msgstr "Сервер має %s = %d, бібліотека має %d."
 
-#: utils/fmgr/dfmgr.c:388
+#. translator: %s is a variable name and %d its values
+#: utils/fmgr/dfmgr.c:402
 #, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "Сервер має FLOAT8PASSBYVAL = %s, бібліотека має %s."
+msgid "Server has %s = %s, library has %s."
+msgstr "Сервер має %s = %s, бібліотека має %s."
 
-#: utils/fmgr/dfmgr.c:395
+#: utils/fmgr/dfmgr.c:409
 msgid "Magic block has unexpected length or padding difference."
 msgstr "Магічний блок має неочікувану довжину або інше заповнення."
 
-#: utils/fmgr/dfmgr.c:398
+#: utils/fmgr/dfmgr.c:412
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "несумісна бібліотка \"%s\": невідповідність магічного блоку"
 
-#: utils/fmgr/dfmgr.c:475
+#: utils/fmgr/dfmgr.c:527
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "доступ до бібліотеки \"%s\" не дозволений"
 
-#: utils/fmgr/dfmgr.c:501
+#: utils/fmgr/dfmgr.c:554
 #, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "неприпустиме ім'я макросу в шляху динамічної бібліотеки: %s"
+msgid "invalid macro name in path: %s"
+msgstr "недійсне ім'я макросу в шляху: %s"
 
-#: utils/fmgr/dfmgr.c:541
+#: utils/fmgr/dfmgr.c:606
 #, c-format
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "параметр \"dynamic_library_path\" містить компонент нульової довжини"
-
-#: utils/fmgr/dfmgr.c:560
-#, c-format
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "параметр \"dynamic_library_path\" містить компонент, який не є абсолютним шляхом"
+msgid "zero-length component in parameter \"%s\""
+msgstr "компонент нульової довжини в параметрі \"%s\""
 
 #: utils/fmgr/fmgr.c:236
 #, c-format
@@ -27471,345 +28707,427 @@ msgstr "жодного псевдоніму для стовпця не було
 msgid "could not determine row description for function returning record"
 msgstr "не вдалося визначити опис рядка для функції, що повертає запис"
 
-#: utils/init/miscinit.c:352
+#: utils/init/miscinit.c:265
+msgid "unknown process type"
+msgstr "невідомий тип процесу"
+
+#: utils/init/miscinit.c:270
+msgid "not initialized"
+msgstr "не ініціалізовано"
+
+#: utils/init/miscinit.c:273
+msgid "archiver"
+msgstr "архіватор"
+
+#: utils/init/miscinit.c:276
+msgid "autovacuum launcher"
+msgstr "запускач автоочищення"
+
+#: utils/init/miscinit.c:279
+msgid "autovacuum worker"
+msgstr "працівник автоочищення"
+
+#: utils/init/miscinit.c:282
+msgid "client backend"
+msgstr "клієнтський бекенд"
+
+#: utils/init/miscinit.c:285
+msgid "dead-end client backend"
+msgstr "тупиковий клієнтський бекенд"
+
+#: utils/init/miscinit.c:288
+msgid "background worker"
+msgstr "фоновий працівник"
+
+#: utils/init/miscinit.c:291
+msgid "background writer"
+msgstr "фоновий записувач"
+
+#: utils/init/miscinit.c:294
+msgid "checkpointer"
+msgstr "контрольник"
+
+#: utils/init/miscinit.c:300
+msgid "logger"
+msgstr "журналювання"
+
+#: utils/init/miscinit.c:303
+msgid "slotsync worker"
+msgstr "працівник синхронізації слотів"
+
+#: utils/init/miscinit.c:306
+msgid "standalone backend"
+msgstr "автономний бекенд"
+
+#: utils/init/miscinit.c:309
+msgid "startup"
+msgstr "запуск"
+
+#: utils/init/miscinit.c:312
+msgid "walreceiver"
+msgstr "WAL-отримувач"
+
+#: utils/init/miscinit.c:315
+msgid "walsender"
+msgstr "WAL-відправник"
+
+#: utils/init/miscinit.c:318
+msgid "walsummarizer"
+msgstr "WAL-підсумовувач"
+
+#: utils/init/miscinit.c:321
+msgid "walwriter"
+msgstr "WAL-записувач"
+
+#: utils/init/miscinit.c:358
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "каталог даних \"%s\" не існує"
 
-#: utils/init/miscinit.c:357
+#: utils/init/miscinit.c:363
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не вдалося прочитати дозволи на каталог \"%s\": %m"
 
-#: utils/init/miscinit.c:365
+#: utils/init/miscinit.c:371
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "вказаний каталог даних \"%s\" не є каталогом"
 
-#: utils/init/miscinit.c:381
+#: utils/init/miscinit.c:387
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "власник каталогу даних \"%s\" визначений неправильно"
 
-#: utils/init/miscinit.c:383
+#: utils/init/miscinit.c:389
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr "Сервер повинен запускати користувач, який володіє каталогом даних."
 
-#: utils/init/miscinit.c:401
+#: utils/init/miscinit.c:407
 #, c-format
 msgid "data directory \"%s\" has invalid permissions"
 msgstr "каталог даних \"%s\" має неприпустимі дозволи"
 
-#: utils/init/miscinit.c:403
+#: utils/init/miscinit.c:409
 #, c-format
 msgid "Permissions should be u=rwx (0700) or u=rwx,g=rx (0750)."
 msgstr "Дозволи повинні бути u=rwx (0700) або u=rwx,g=rx (0750)."
 
-#: utils/init/miscinit.c:461
+#: utils/init/miscinit.c:467
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "не вдалося змінити каталог на \"%s\": %m"
 
-#: utils/init/miscinit.c:697 utils/misc/guc.c:3650
+#: utils/init/miscinit.c:725 utils/misc/guc.c:3647
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "встановити параметр \"%s\" в межах операції з обмеженнями по безпеці, не можна"
 
-#: utils/init/miscinit.c:770
+#: utils/init/miscinit.c:812
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "роль з OID %u не існує"
 
-#: utils/init/miscinit.c:800
+#: utils/init/miscinit.c:858
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "для ролі \"%s\" вхід не дозволений"
 
-#: utils/init/miscinit.c:818
+#: utils/init/miscinit.c:879
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "занадто багато підключень для ролі \"%s\""
 
-#: utils/init/miscinit.c:991
+#: utils/init/miscinit.c:1050
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "неприпустимий OID ролі: %u"
 
-#: utils/init/miscinit.c:1138
+#: utils/init/miscinit.c:1198
 #, c-format
 msgid "database system is shut down"
 msgstr "система бази даних вимкнена"
 
-#: utils/init/miscinit.c:1225
+#: utils/init/miscinit.c:1285
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "не вдалося створити файл блокування \"%s\": %m"
 
-#: utils/init/miscinit.c:1239
+#: utils/init/miscinit.c:1299
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "не вдалося відкрити файл блокування \"%s\": %m"
 
-#: utils/init/miscinit.c:1246
+#: utils/init/miscinit.c:1306
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "не вдалося прочитати файл блокування \"%s\": %m"
 
-#: utils/init/miscinit.c:1255
+#: utils/init/miscinit.c:1315
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "файл блокування \"%s\" пустий"
 
-#: utils/init/miscinit.c:1256
+#: utils/init/miscinit.c:1316
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Або зараз запускається інший сервер, або цей файл блокування залишився в результаті збою під час попереднього запуску."
 
-#: utils/init/miscinit.c:1300
+#: utils/init/miscinit.c:1360
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "файл блокування \"%s\" вже існує"
 
-#: utils/init/miscinit.c:1304
+#: utils/init/miscinit.c:1364
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "Інший postgres (PID %d) працює з каталогом даних \"%s\"?"
 
-#: utils/init/miscinit.c:1306
+#: utils/init/miscinit.c:1366
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "Інший postmaster (PID %d) працює з каталогом даних \"%s\"?"
 
-#: utils/init/miscinit.c:1309
+#: utils/init/miscinit.c:1369
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "Інший postgres (PID %d) використовує файл сокету \"%s\"?"
 
-#: utils/init/miscinit.c:1311
+#: utils/init/miscinit.c:1371
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "Інший postmaster (PID %d) використовує файл сокету \"%s\"?"
 
-#: utils/init/miscinit.c:1362
+#: utils/init/miscinit.c:1422
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "не вдалося видалити старий файл блокування \"%s\": %m"
 
-#: utils/init/miscinit.c:1364
+#: utils/init/miscinit.c:1424
 #, 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 "Здається, файл залишився випадково, але видалити його не вийшло. Будь-ласка, видаліть файл вручну або спробуйте знову."
 
-#: utils/init/miscinit.c:1401 utils/init/miscinit.c:1415
-#: utils/init/miscinit.c:1426
+#: utils/init/miscinit.c:1461 utils/init/miscinit.c:1475
+#: utils/init/miscinit.c:1486
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "не вдалося записати файл блокування \"%s\": %m"
 
-#: utils/init/miscinit.c:1537 utils/init/miscinit.c:1679 utils/misc/guc.c:5724
+#: utils/init/miscinit.c:1597 utils/init/miscinit.c:1739 utils/misc/guc.c:5768
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "не вдалося прочитати з файлу \"%s\": %m"
 
-#: utils/init/miscinit.c:1667
+#: utils/init/miscinit.c:1727
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "не вдалося відкрити файл \"%s\": %m; все одно продовжується"
 
-#: utils/init/miscinit.c:1692
+#: utils/init/miscinit.c:1752
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "файл блокування \"%s\" містить неправильний PID: %ld замість %ld"
 
-#: utils/init/miscinit.c:1731 utils/init/miscinit.c:1747
+#: utils/init/miscinit.c:1791 utils/init/miscinit.c:1807
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" не є припустимим каталогом даних"
 
-#: utils/init/miscinit.c:1733
+#: utils/init/miscinit.c:1793
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Файл \"%s\" пропущено."
 
-#: utils/init/miscinit.c:1749
+#: utils/init/miscinit.c:1809
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Файл \"%s\" не містить припустимих даних."
 
-#: utils/init/miscinit.c:1751
+#: utils/init/miscinit.c:1811
 #, c-format
 msgid "You might need to initdb."
 msgstr "Можливо, вам слід виконати initdb."
 
-#: utils/init/miscinit.c:1759
+#: utils/init/miscinit.c:1819
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %s, which is not compatible with this version %s."
 msgstr "Каталог даних ініціалізований сервером PostgreSQL версії %s, не сумісною з цією версією %s."
 
-#: utils/init/postinit.c:259
+#: utils/init/postinit.c:269
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "підключення для реплікації авторизовано: користувач=%s"
 
-#: utils/init/postinit.c:262
+#: utils/init/postinit.c:272
 #, c-format
 msgid "connection authorized: user=%s"
 msgstr "підключення авторизовано: користувач=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:275
 #, c-format
 msgid " database=%s"
 msgstr " database=%s"
 
-#: utils/init/postinit.c:268
+#: utils/init/postinit.c:278
 #, c-format
 msgid " application_name=%s"
 msgstr " application_name=%s"
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:283
 #, c-format
 msgid " SSL enabled (protocol=%s, cipher=%s, bits=%d)"
 msgstr " SSL активовано (протокол=%s, шифр=%s, біти=%d)"
 
-#: utils/init/postinit.c:285
+#: utils/init/postinit.c:295
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 msgstr " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s, principal=%s)"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "no"
 msgstr "ні"
 
-#: utils/init/postinit.c:286 utils/init/postinit.c:287
-#: utils/init/postinit.c:288 utils/init/postinit.c:293
-#: utils/init/postinit.c:294 utils/init/postinit.c:295
+#: utils/init/postinit.c:296 utils/init/postinit.c:297
+#: utils/init/postinit.c:298 utils/init/postinit.c:303
+#: utils/init/postinit.c:304 utils/init/postinit.c:305
 msgid "yes"
 msgstr "так"
 
-#: utils/init/postinit.c:292
+#: utils/init/postinit.c:302
 #, c-format
 msgid " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 msgstr " GSS (authenticated=%s, encrypted=%s, delegated_credentials=%s)"
 
-#: utils/init/postinit.c:333
+#: utils/init/postinit.c:342
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "база даних \"%s\" зникла з pg_database"
 
-#: utils/init/postinit.c:335
+#: utils/init/postinit.c:344
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "Здається, база даних з OID %u тепер належить \"%s\"."
 
-#: utils/init/postinit.c:355
+#: utils/init/postinit.c:364
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "база даних \"%s\" не приймає підключення в даний момент"
 
-#: utils/init/postinit.c:368
+#: utils/init/postinit.c:377
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "доступ до бази даних \"%s\" відхилений"
 
-#: utils/init/postinit.c:369
+#: utils/init/postinit.c:378
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "Користувач не має права CONNECT."
 
-#: utils/init/postinit.c:386
+#: utils/init/postinit.c:398
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "занадто багато підключень до бази даних \"%s\""
 
-#: utils/init/postinit.c:410 utils/init/postinit.c:417
+#: utils/init/postinit.c:422 utils/init/postinit.c:429
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "локалізація бази даних несумісна з операційною системою"
 
-#: utils/init/postinit.c:411
+#: utils/init/postinit.c:423
 #, c-format
 msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
 msgstr "База даних була ініціалізована з параметром LC_COLLATE \"%s\", але зараз setlocale() не розпізнає його."
 
-#: utils/init/postinit.c:413 utils/init/postinit.c:420
+#: utils/init/postinit.c:425 utils/init/postinit.c:432
 #, c-format
 msgid "Recreate the database with another locale or install the missing locale."
 msgstr "Повторно створіть базу даних з іншою локалізацією або встановіть пропущену локалізацію."
 
-#: utils/init/postinit.c:418
+#: utils/init/postinit.c:430
 #, c-format
 msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
 msgstr "База даних була ініціалізована з параметром LC_CTYPE \"%s\", але зараз setlocale() не розпізнає його."
 
-#: utils/init/postinit.c:491
+#: utils/init/postinit.c:471
 #, c-format
 msgid "database \"%s\" has a collation version mismatch"
 msgstr "база даних \"%s\" має невідповідність версії параметрів сортування"
 
-#: utils/init/postinit.c:493
+#: utils/init/postinit.c:473
 #, c-format
 msgid "The database was created using collation version %s, but the operating system provides version %s."
 msgstr "Базу даних було створено за допомогою параметрів сортування версії %s, але операційна система надає версію %s."
 
-#: utils/init/postinit.c:496
+#: utils/init/postinit.c:476
+#, c-format
+msgid "Rebuild all objects in this database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
+msgstr "Перебудуйте всі об'єкти бази даних, які використовують стандартний параметр сортування або виконайте ALTER DATABASE %s REFRESH COLLATION VERSION, або побудуйте PostgreSQL з правильною версією бібліотеки."
+
+#: utils/init/postinit.c:566
+#, c-format
+msgid "too many server processes configured"
+msgstr "налаштовано занадто багато серверних процесів"
+
+#: utils/init/postinit.c:567
 #, c-format
-msgid "Rebuild all objects in this database that use the default collation and run ALTER DATABASE %s REFRESH COLLATION VERSION, or build PostgreSQL with the right library version."
-msgstr "Перебудуйте всі об'єкти бази даних, які використовують стандартний параметр сортування або виконайте ALTER DATABASE %s REFRESH COLLATION VERSION, або побудуйте PostgreSQL з правильною версією бібліотеки."
+msgid "\"max_connections\" (%d) plus \"autovacuum_worker_slots\" (%d) plus \"max_worker_processes\" (%d) plus \"max_wal_senders\" (%d) must be less than %d."
+msgstr "\"max_connections\" (%d) плюс \"autovacuum_worker_slots\" (%d) плюс \"max_worker_processes\" (%d) плюс \"max_wal_senders\" (%d) повинно бути менше ніж %d."
 
-#: utils/init/postinit.c:902
+#: utils/init/postinit.c:878
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "в цій системі баз даних не визначено жодної ролі"
 
-#: utils/init/postinit.c:903
+#: utils/init/postinit.c:879
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Ви повинні негайно виконати CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:940
+#: utils/init/postinit.c:924
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "потрібно бути суперкористувачем, щоб підключитись в режимі двійкового оновлення"
 
-#: utils/init/postinit.c:961
+#: utils/init/postinit.c:944
 #, c-format
 msgid "remaining connection slots are reserved for roles with the %s attribute"
 msgstr "слоти підключення, що залишилися, зарезервовані для ролей з атрибутом %s"
 
-#: utils/init/postinit.c:967
+#: utils/init/postinit.c:950
 #, c-format
 msgid "remaining connection slots are reserved for roles with privileges of the \"%s\" role"
 msgstr "слоти підключення, що залишилися, зарезервовані для ролей з привілеями ролі \"%s\""
 
-#: utils/init/postinit.c:979
+#: utils/init/postinit.c:962
 #, c-format
 msgid "permission denied to start WAL sender"
 msgstr "немає дозволу для запуску відправника WAL"
 
-#: utils/init/postinit.c:980
+#: utils/init/postinit.c:963
 #, c-format
 msgid "Only roles with the %s attribute may start a WAL sender process."
 msgstr "Тільки ролі з атрибутом %s можуть почати процес відправки WAL."
 
-#: utils/init/postinit.c:1098
+#: utils/init/postinit.c:1081
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Схоже, вона щойно була видалена або перейменована."
 
-#: utils/init/postinit.c:1102
+#: utils/init/postinit.c:1085
 #, c-format
 msgid "database %u does not exist"
 msgstr "база даних %u не існує"
 
-#: utils/init/postinit.c:1111
+#: utils/init/postinit.c:1094
 #, c-format
 msgid "cannot connect to invalid database \"%s\""
 msgstr "неможливо під'єднатися до невірної бази даних \"%s\""
 
-#: utils/init/postinit.c:1172
+#: utils/init/postinit.c:1155
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "Підкаталог бази даних \"%s\" пропущений."
@@ -27824,60 +29142,60 @@ msgstr "роль \"%s\" не може виконати SET ROLE для \"%s\""
 msgid "invalid encoding number: %d"
 msgstr "неприпустимий номер кодування: %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:129
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:165
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:132
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:168
 #, c-format
 msgid "unexpected encoding ID %d for ISO 8859 character sets"
 msgstr "неочікуваний ідентифікатор кодування %d для наборів символів ISO 8859"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:110
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:146
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:113
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:149
 #, c-format
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "неочікуваний ідентифікатор кодування %d для наборів символів WIN"
 
-#: utils/mb/mbutils.c:297 utils/mb/mbutils.c:900
+#: utils/mb/mbutils.c:298 utils/mb/mbutils.c:901
 #, c-format
 msgid "conversion between %s and %s is not supported"
 msgstr "перетворення між %s і %s не підтримується"
 
-#: utils/mb/mbutils.c:402 utils/mb/mbutils.c:430 utils/mb/mbutils.c:815
-#: utils/mb/mbutils.c:842
+#: utils/mb/mbutils.c:403 utils/mb/mbutils.c:431 utils/mb/mbutils.c:816
+#: utils/mb/mbutils.c:843
 #, c-format
 msgid "String of %d bytes is too long for encoding conversion."
 msgstr "Рядок з %d байт занадто довгий для перетворення кодування."
 
-#: utils/mb/mbutils.c:568
+#: utils/mb/mbutils.c:569
 #, c-format
 msgid "invalid source encoding name \"%s\""
 msgstr "неприпустиме ім’я вихідного кодування \"%s\""
 
-#: utils/mb/mbutils.c:573
+#: utils/mb/mbutils.c:574
 #, c-format
 msgid "invalid destination encoding name \"%s\""
 msgstr "неприпустиме ім’я кодування результату \"%s\""
 
-#: utils/mb/mbutils.c:713
+#: utils/mb/mbutils.c:714
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
 msgstr "неприпустиме значення байту для кодування \"%s\": 0x%02x"
 
-#: utils/mb/mbutils.c:877
+#: utils/mb/mbutils.c:878
 #, c-format
 msgid "invalid Unicode code point"
 msgstr "неприпустима кодова точка Unicode"
 
-#: utils/mb/mbutils.c:1201
+#: utils/mb/mbutils.c:1202
 #, c-format
 msgid "bind_textdomain_codeset failed"
 msgstr "помилка в bind_textdomain_codeset"
 
-#: utils/mb/mbutils.c:1718
+#: utils/mb/mbutils.c:1719
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
 msgstr "неприпустима послідовність байтів для кодування \"%s\": %s"
 
-#: utils/mb/mbutils.c:1751
+#: utils/mb/mbutils.c:1760
 #, c-format
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr "символ з послідовністю байтів %s в кодуванні \"%s\" не має еквіваленту в кодуванні \"%s\""
@@ -27892,230 +29210,230 @@ msgstr "пуста назва каталогу конфігурації: \"%s\""
 msgid "could not open configuration directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог конфігурації \"%s\": %m"
 
-#: utils/misc/guc.c:122
+#: utils/misc/guc.c:119
 msgid "Valid units for this parameter are \"B\", \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Припустимі одиниці для цього параметру: \"B\", \"kB\", \"MB\", \"GB\", і \"TB\"."
 
-#: utils/misc/guc.c:159
+#: utils/misc/guc.c:156
 msgid "Valid units for this parameter are \"us\", \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr "Припустимі одиниці для цього параметру: \"us\", \"ms\", \"s\", \"min\", \"h\", і \"d\"."
 
-#: utils/misc/guc.c:430
+#: utils/misc/guc.c:428
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %d"
 msgstr "нерозпізнаний параметр конфігурації \"%s\" у файлі \"%s\" рядок %d"
 
-#: utils/misc/guc.c:470 utils/misc/guc.c:3504 utils/misc/guc.c:3748
-#: utils/misc/guc.c:3846 utils/misc/guc.c:3944 utils/misc/guc.c:4068
-#: utils/misc/guc.c:4171
+#: utils/misc/guc.c:468 utils/misc/guc.c:3501 utils/misc/guc.c:3745
+#: utils/misc/guc.c:3843 utils/misc/guc.c:3941 utils/misc/guc.c:4068
+#: utils/misc/guc.c:4209
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "параметр \"%s\" не може бути змінений, без перезавантаження сервера"
 
-#: utils/misc/guc.c:506
+#: utils/misc/guc.c:504
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
 msgstr "параметр \"%s\" видалений з файла конфігурації, значення скинуто до \"за замовчуванням\""
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:569
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
 msgstr "параметр \"%s\" змінено на \"%s\""
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:611
 #, c-format
 msgid "configuration file \"%s\" contains errors"
 msgstr "файл конфігурації \"%s\" містить помилки"
 
-#: utils/misc/guc.c:618
+#: utils/misc/guc.c:616
 #, c-format
 msgid "configuration file \"%s\" contains errors; unaffected changes were applied"
 msgstr "файл конфігурації \"%s\" містить помилки; були застосовані не залежні зміни"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:621
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
 msgstr "файл конфігурації \"%s\" містить помилки; зміни не були застосовані"
 
-#: utils/misc/guc.c:1139 utils/misc/guc.c:1155
+#: utils/misc/guc.c:1137 utils/misc/guc.c:1153
 #, c-format
 msgid "invalid configuration parameter name \"%s\""
 msgstr "неприпустима назва параметра конфігурації \"%s\""
 
-#: utils/misc/guc.c:1141
+#: utils/misc/guc.c:1139
 #, c-format
 msgid "Custom parameter names must be two or more simple identifiers separated by dots."
 msgstr "Власні назви параметрів повинні містити два або більше простих ідентифікаторів, розділених крапками."
 
-#: utils/misc/guc.c:1157
+#: utils/misc/guc.c:1155
 #, c-format
 msgid "\"%s\" is a reserved prefix."
 msgstr "\"%s\" є зарезервованим префіксом."
 
-#: utils/misc/guc.c:1170 utils/misc/guc.c:1280
+#: utils/misc/guc.c:1168 utils/misc/guc.c:1278
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "нерозпізнаний параметр конфігурації \"%s\""
 
-#: utils/misc/guc.c:1802
+#: utils/misc/guc.c:1800
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: не вдалося отримати доступ до каталогу \"%s\": %m\n"
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1804
 #, c-format
 msgid "Run initdb or pg_basebackup to initialize a PostgreSQL data directory.\n"
 msgstr "Запустіть initdb або pg_basebackup для ініціалізації каталогу даних PostgreSQL.\n"
 
-#: utils/misc/guc.c:1830
+#: utils/misc/guc.c:1828
 #, c-format
 msgid "%s does not know where to find the server configuration file.\n"
 "You must specify the --config-file or -D invocation option or set the PGDATA environment variable.\n"
 msgstr "%s не знає де знайти файл конфігурації сервера.\n"
 "Ви повинні вказати його розташування в параметрі --config-file або -D, або встановити змінну середовища PGDATA.\n"
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "%s: could not access the server configuration file \"%s\": %m\n"
 msgstr "%s: не вдалося отримати доступ до файлу конфігурації сервера \"%s\": %m\n"
 
-#: utils/misc/guc.c:1881
+#: utils/misc/guc.c:1879
 #, c-format
 msgid "%s does not know where to find the database system data.\n"
 "This can be specified as \"data_directory\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr "%s не знає де знайти дані системи бази даних.\n"
 "Їх розташування може бути вказано як \"data_directory\" в \"%s\", або передано в параметрі -D, або встановлено змінну середовища PGDATA.\n"
 
-#: utils/misc/guc.c:1933
+#: utils/misc/guc.c:1931
 #, c-format
 msgid "%s does not know where to find the \"hba\" configuration file.\n"
 "This can be specified as \"hba_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr "%s не знає де знайти файл конфігурації \"hba\".\n"
 "Його розташування може бути вказано як \"hba_file\" в \"%s\", або передано в параметрі -D, або встановлено змінну середовища PGDATA.\n"
 
-#: utils/misc/guc.c:1964
+#: utils/misc/guc.c:1962
 #, c-format
 msgid "%s does not know where to find the \"ident\" configuration file.\n"
 "This can be specified as \"ident_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr "%s не знає де знайти файл конфігурації \"ident\".\n"
 "Його розташування може бути вказано як \"ident_file\" в \"%s\", або передано в параметрі -D, або встановлено змінну середовища PGDATA.\n"
 
-#: utils/misc/guc.c:2943
+#: utils/misc/guc.c:2941
 msgid "Value exceeds integer range."
 msgstr "Значення перевищує діапазон цілих чисел."
 
-#: utils/misc/guc.c:3185
+#: utils/misc/guc.c:3182
 #, c-format
 msgid "%d%s%s is outside the valid range for parameter \"%s\" (%d%s%s .. %d%s%s)"
 msgstr "%d%s%s поза припустимим діапазоном для параметру \"%s\" (%d%s%s .. %d%s%s)"
 
-#: utils/misc/guc.c:3226
+#: utils/misc/guc.c:3223
 #, c-format
 msgid "%g%s%s is outside the valid range for parameter \"%s\" (%g%s%s .. %g%s%s)"
 msgstr "%g%s%s поза припустимим діапазоном для параметру \"%s\" (%g%s%s .. %g%s%s)"
 
-#: utils/misc/guc.c:3465
+#: utils/misc/guc.c:3462
 #, c-format
 msgid "parameter \"%s\" cannot be set during a parallel operation"
 msgstr "параметр \"%s\" не можна встановити під час паралельних операцій"
 
-#: utils/misc/guc.c:3481 utils/misc/guc.c:4655
+#: utils/misc/guc.c:3478 utils/misc/guc.c:4693
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "параметр \"%s\" не може бути змінений"
 
-#: utils/misc/guc.c:3514
+#: utils/misc/guc.c:3511
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "параметр \"%s\" не може бути змінений зараз"
 
-#: utils/misc/guc.c:3541 utils/misc/guc.c:3603 utils/misc/guc.c:4630
-#: utils/misc/guc.c:6721
+#: utils/misc/guc.c:3538 utils/misc/guc.c:3600 utils/misc/guc.c:4668
+#: utils/misc/guc.c:6765
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "немає прав для встановлення параметру \"%s\""
 
-#: utils/misc/guc.c:3583
+#: utils/misc/guc.c:3580
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "параметр \"%s\" не можна встановити після встановлення підключення"
 
-#: utils/misc/guc.c:3642
+#: utils/misc/guc.c:3639
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "параметр \"%s\" не можна встановити в межах функції безпеки"
 
-#: utils/misc/guc.c:3663
+#: utils/misc/guc.c:3660
 #, c-format
 msgid "parameter \"%s\" cannot be reset"
 msgstr "параметр \"%s\" не можна скинути"
 
-#: utils/misc/guc.c:3670
+#: utils/misc/guc.c:3667
 #, c-format
 msgid "parameter \"%s\" cannot be set locally in functions"
 msgstr "параметр \"%s\" не може бути встановлений локально в функціях"
 
-#: utils/misc/guc.c:4329 utils/misc/guc.c:4377 utils/misc/guc.c:5409
+#: utils/misc/guc.c:4367 utils/misc/guc.c:4415 utils/misc/guc.c:5453
 #, c-format
 msgid "permission denied to examine \"%s\""
 msgstr "немає дозволу для вивчення \"%s\""
 
-#: utils/misc/guc.c:4330 utils/misc/guc.c:4378 utils/misc/guc.c:5410
+#: utils/misc/guc.c:4368 utils/misc/guc.c:4416 utils/misc/guc.c:5454
 #, c-format
 msgid "Only roles with privileges of the \"%s\" role may examine this parameter."
 msgstr "Тільки ролі з привілеями ролі \"%s\" можуть перевіряти цей параметр."
 
-#: utils/misc/guc.c:4588
+#: utils/misc/guc.c:4626
 #, c-format
 msgid "ALTER SYSTEM is not allowed in this environment"
 msgstr "ALTER SYSTEM не допускається в цьому середовищі"
 
-#: utils/misc/guc.c:4620
+#: utils/misc/guc.c:4658
 #, c-format
 msgid "permission denied to perform ALTER SYSTEM RESET ALL"
 msgstr "немає дозволу для виконання ALTER SYSTEM RESET ALL"
 
-#: utils/misc/guc.c:4699
+#: utils/misc/guc.c:4742
 #, c-format
 msgid "parameter value for ALTER SYSTEM must not contain a newline"
 msgstr "значення параметру для ALTER SYSTEM не повинне містити нового рядка"
 
-#: utils/misc/guc.c:4744
+#: utils/misc/guc.c:4787
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "не вдалося аналізувати зміст файла \"%s\""
 
-#: utils/misc/guc.c:4926
+#: utils/misc/guc.c:4970
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "спроба перевизначити параметр \"%s\""
 
-#: utils/misc/guc.c:5265
+#: utils/misc/guc.c:5309
 #, c-format
 msgid "invalid configuration parameter name \"%s\", removing it"
 msgstr "неприпустима назва параметра конфігурації \"%s\", видаляємо"
 
-#: utils/misc/guc.c:5267
+#: utils/misc/guc.c:5311
 #, c-format
 msgid "\"%s\" is now a reserved prefix."
 msgstr "\"%s\" тепер є зарезервованим префіксом."
 
-#: utils/misc/guc.c:6144
+#: utils/misc/guc.c:6182
 #, c-format
 msgid "while setting parameter \"%s\" to \"%s\""
 msgstr "під час налаштування параметру \"%s\" на \"%s\""
 
-#: utils/misc/guc.c:6313
+#: utils/misc/guc.c:6351
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "параметр \"%s\" не вдалося встановити"
 
-#: utils/misc/guc.c:6403
+#: utils/misc/guc.c:6441
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "не вдалося аналізувати налаштування параметру \"%s\""
 
-#: utils/misc/guc.c:6853
+#: utils/misc/guc.c:6897
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "неприпустиме значення для параметра \"%s\": %g"
@@ -28140,2064 +29458,2271 @@ msgstr "SET %s приймає лише один аргумент"
 msgid "SET requires parameter name"
 msgstr "SET потребує ім'я параметра"
 
-#: utils/misc/guc_tables.c:676
+#: utils/misc/guc_tables.c:692
 msgid "Ungrouped"
 msgstr "Розгруповано"
 
-#: utils/misc/guc_tables.c:677
+#: utils/misc/guc_tables.c:693
 msgid "File Locations"
 msgstr "Розташування файлів"
 
-#: utils/misc/guc_tables.c:678
+#: utils/misc/guc_tables.c:694
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Підключення і автентифікація / Параметри підключень"
 
-#: utils/misc/guc_tables.c:679
+#: utils/misc/guc_tables.c:695
 msgid "Connections and Authentication / TCP Settings"
 msgstr "Підключення і автентифікація / Налаштування TCP"
 
-#: utils/misc/guc_tables.c:680
+#: utils/misc/guc_tables.c:696
 msgid "Connections and Authentication / Authentication"
 msgstr "Підключення і автентифікація / Автентифікація"
 
-#: utils/misc/guc_tables.c:681
+#: utils/misc/guc_tables.c:697
 msgid "Connections and Authentication / SSL"
 msgstr "Підключення і автентифікація / SSL"
 
-#: utils/misc/guc_tables.c:682
+#: utils/misc/guc_tables.c:698
 msgid "Resource Usage / Memory"
 msgstr "Використання ресурсу / Пам'ять"
 
-#: utils/misc/guc_tables.c:683
+#: utils/misc/guc_tables.c:699
 msgid "Resource Usage / Disk"
 msgstr "Використання ресурсу / Диск"
 
-#: utils/misc/guc_tables.c:684
+#: utils/misc/guc_tables.c:700
 msgid "Resource Usage / Kernel Resources"
 msgstr "Використання ресурсу / Ресурси ядра"
 
-#: utils/misc/guc_tables.c:685
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Використання ресурсу / Затримка очистки по вартості"
-
-#: utils/misc/guc_tables.c:686
+#: utils/misc/guc_tables.c:701
 msgid "Resource Usage / Background Writer"
 msgstr "Використання ресурсу / Фоновий запис"
 
-#: utils/misc/guc_tables.c:687
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Використання ресурсу / Асинхронна поведінка"
+#: utils/misc/guc_tables.c:702
+msgid "Resource Usage / I/O"
+msgstr "Використання ресурсів / Ввід-вивід"
+
+#: utils/misc/guc_tables.c:703
+msgid "Resource Usage / Worker Processes"
+msgstr "Використання ресурсів / Робочі процеси"
 
-#: utils/misc/guc_tables.c:688
+#: utils/misc/guc_tables.c:704
 msgid "Write-Ahead Log / Settings"
 msgstr "Журнал WAL / Параметри"
 
-#: utils/misc/guc_tables.c:689
+#: utils/misc/guc_tables.c:705
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Журнал WAL / Контрольні точки"
 
-#: utils/misc/guc_tables.c:690
+#: utils/misc/guc_tables.c:706
 msgid "Write-Ahead Log / Archiving"
 msgstr "Журнал WAL / Архівація"
 
-#: utils/misc/guc_tables.c:691
+#: utils/misc/guc_tables.c:707
 msgid "Write-Ahead Log / Recovery"
 msgstr "Журнал WAL / Відновлення"
 
-#: utils/misc/guc_tables.c:692
+#: utils/misc/guc_tables.c:708
 msgid "Write-Ahead Log / Archive Recovery"
 msgstr "Журнал WAL / Відновлення архіву"
 
-#: utils/misc/guc_tables.c:693
+#: utils/misc/guc_tables.c:709
 msgid "Write-Ahead Log / Recovery Target"
 msgstr "Журнал WAL / Мета відновлення"
 
-#: utils/misc/guc_tables.c:694
+#: utils/misc/guc_tables.c:710
 msgid "Write-Ahead Log / Summarization"
 msgstr "Журнал попереднього запису / Підсумки"
 
-#: utils/misc/guc_tables.c:695
+#: utils/misc/guc_tables.c:711
 msgid "Replication / Sending Servers"
 msgstr "Реплікація / Надсилання серверів"
 
-#: utils/misc/guc_tables.c:696
+#: utils/misc/guc_tables.c:712
 msgid "Replication / Primary Server"
 msgstr "Реплікація / Основний сервер"
 
-#: utils/misc/guc_tables.c:697
+#: utils/misc/guc_tables.c:713
 msgid "Replication / Standby Servers"
 msgstr "Реплікація / Резервні сервера"
 
-#: utils/misc/guc_tables.c:698
+#: utils/misc/guc_tables.c:714
 msgid "Replication / Subscribers"
 msgstr "Реплікація / Підписники"
 
-#: utils/misc/guc_tables.c:699
+#: utils/misc/guc_tables.c:715
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Налаштування запитів / Конфігурація методів планувальника"
 
-#: utils/misc/guc_tables.c:700
+#: utils/misc/guc_tables.c:716
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Налаштування запитів / Константи вартості для планувальника"
 
-#: utils/misc/guc_tables.c:701
+#: utils/misc/guc_tables.c:717
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Налаштування запитів / Генетичний оптимізатор запитів"
 
-#: utils/misc/guc_tables.c:702
+#: utils/misc/guc_tables.c:718
 msgid "Query Tuning / Other Planner Options"
 msgstr "Налаштування запитів / Інші параметри планувальника"
 
-#: utils/misc/guc_tables.c:703
+#: utils/misc/guc_tables.c:719
 msgid "Reporting and Logging / Where to Log"
 msgstr "Звіти і журналювання / Куди записувати"
 
-#: utils/misc/guc_tables.c:704
+#: utils/misc/guc_tables.c:720
 msgid "Reporting and Logging / When to Log"
 msgstr "Звіти і журналювання / Коли записувати"
 
-#: utils/misc/guc_tables.c:705
+#: utils/misc/guc_tables.c:721
 msgid "Reporting and Logging / What to Log"
 msgstr "Звіти і журналювання / Що записувати"
 
-#: utils/misc/guc_tables.c:706
+#: utils/misc/guc_tables.c:722
 msgid "Reporting and Logging / Process Title"
 msgstr "Звітування і журналювання / Назва процесу"
 
-#: utils/misc/guc_tables.c:707
+#: utils/misc/guc_tables.c:723
 msgid "Statistics / Monitoring"
 msgstr "Статистика / Моніторинг"
 
-#: utils/misc/guc_tables.c:708
+#: utils/misc/guc_tables.c:724
 msgid "Statistics / Cumulative Query and Index Statistics"
 msgstr "Статистика / Кумулятивна статистика запитів та індексів"
 
-#: utils/misc/guc_tables.c:709
-msgid "Autovacuum"
-msgstr "Автоочистка"
+#: utils/misc/guc_tables.c:725
+msgid "Vacuuming / Automatic Vacuuming"
+msgstr "Вакуум / Автоматичний вакуум"
 
-#: utils/misc/guc_tables.c:710
+#: utils/misc/guc_tables.c:726
+msgid "Vacuuming / Cost-Based Vacuum Delay"
+msgstr "Вакуум / Затримка вакууму на основі вартості"
+
+#: utils/misc/guc_tables.c:727
+msgid "Vacuuming / Default Behavior"
+msgstr "Вакуум / Поведінка за замовчуванням"
+
+#: utils/misc/guc_tables.c:728
+msgid "Vacuuming / Freezing"
+msgstr "Вакуум / Заморожування"
+
+#: utils/misc/guc_tables.c:729
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Параметри клієнтських сеансів за замовчуванням / Поведінка декларацій"
 
-#: utils/misc/guc_tables.c:711
+#: utils/misc/guc_tables.c:730
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Параметри клієнтських сеансів за замовчуванням / Локалізація і форматування"
 
-#: utils/misc/guc_tables.c:712
+#: utils/misc/guc_tables.c:731
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Параметри клієнтських сеансів за замовчуванням / Попереднє завантаження спільних бібліотек"
 
-#: utils/misc/guc_tables.c:713
+#: utils/misc/guc_tables.c:732
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Параметри клієнтських сеансів за замовчуванням / Інші параметри за замовчуванням"
 
-#: utils/misc/guc_tables.c:714
+#: utils/misc/guc_tables.c:733
 msgid "Lock Management"
 msgstr "Керування блокуванням"
 
-#: utils/misc/guc_tables.c:715
+#: utils/misc/guc_tables.c:734
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Сумісність версій і платформ / Попередні версії PostgreSQL"
 
-#: utils/misc/guc_tables.c:716
+#: utils/misc/guc_tables.c:735
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Сумісність версій і платформ / Інші платформи і клієнти"
 
-#: utils/misc/guc_tables.c:717
+#: utils/misc/guc_tables.c:736
 msgid "Error Handling"
 msgstr "Обробка помилок"
 
-#: utils/misc/guc_tables.c:718
+#: utils/misc/guc_tables.c:737
 msgid "Preset Options"
 msgstr "Визначені параметри"
 
-#: utils/misc/guc_tables.c:719
+#: utils/misc/guc_tables.c:738
 msgid "Customized Options"
 msgstr "Настроєні параметри"
 
-#: utils/misc/guc_tables.c:720
+#: utils/misc/guc_tables.c:739
 msgid "Developer Options"
 msgstr "Параметри для розробників"
 
-#: utils/misc/guc_tables.c:775
+#: utils/misc/guc_tables.c:794
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Дає змогу планувальнику використати плани послідовного сканування."
 
-#: utils/misc/guc_tables.c:785
+#: utils/misc/guc_tables.c:804
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Дає змогу планувальнику використати плани сканування по індексу."
 
-#: utils/misc/guc_tables.c:795
+#: utils/misc/guc_tables.c:814
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Дає змогу планувальнику використати плани сканування лише індекса."
 
-#: utils/misc/guc_tables.c:805
+#: utils/misc/guc_tables.c:824
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "Дає змогу планувальнику використати плани сканування по точковому рисунку."
 
-#: utils/misc/guc_tables.c:815
+#: utils/misc/guc_tables.c:834
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Дає змогу планувальнику використати плани сканування TID."
 
-#: utils/misc/guc_tables.c:825
+#: utils/misc/guc_tables.c:844
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Дає змогу планувальнику використати кроки з явним сортуванням."
 
-#: utils/misc/guc_tables.c:835
+#: utils/misc/guc_tables.c:854
 msgid "Enables the planner's use of incremental sort steps."
 msgstr "Дає змогу планувальнику використати кроки інкрементного сортування."
 
-#: utils/misc/guc_tables.c:845
+#: utils/misc/guc_tables.c:864
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Дає змогу планувальнику використовувати плани агрегації по гешу."
 
-#: utils/misc/guc_tables.c:855
+#: utils/misc/guc_tables.c:874
 msgid "Enables the planner's use of materialization."
 msgstr "Дає змогу планувальнику використовувати матеріалізацію."
 
-#: utils/misc/guc_tables.c:865
+#: utils/misc/guc_tables.c:884
 msgid "Enables the planner's use of memoization."
 msgstr "Дає змогу планувальнику використовувати мемоїзацію."
 
-#: utils/misc/guc_tables.c:875
+#: utils/misc/guc_tables.c:894
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Дає змогу планувальнику використовувати плани з'єднання з вкладеними циклами."
 
-#: utils/misc/guc_tables.c:885
+#: utils/misc/guc_tables.c:904
 msgid "Enables the planner's use of merge join plans."
 msgstr "Дає змогу планувальнику використовувати плани з'єднання об'єднанням."
 
-#: utils/misc/guc_tables.c:895
+#: utils/misc/guc_tables.c:914
 msgid "Enables the planner's use of hash join plans."
 msgstr "Дає змогу планувальнику використовувати плани з'єднання по гешу."
 
-#: utils/misc/guc_tables.c:905
+#: utils/misc/guc_tables.c:924
 msgid "Enables the planner's use of gather merge plans."
 msgstr "Дає змогу планувальнику використовувати плани збору об'єднанням."
 
-#: utils/misc/guc_tables.c:915
+#: utils/misc/guc_tables.c:934
 msgid "Enables partitionwise join."
 msgstr "Вмикає з'єднання з урахуванням секціонування."
 
-#: utils/misc/guc_tables.c:925
+#: utils/misc/guc_tables.c:944
 msgid "Enables partitionwise aggregation and grouping."
 msgstr "Вмикає агрегацію і групування з урахуванням секціонування."
 
-#: utils/misc/guc_tables.c:935
+#: utils/misc/guc_tables.c:954
 msgid "Enables the planner's use of parallel append plans."
 msgstr "Дає змогу планувальнику використовувати плани паралельного додавання."
 
-#: utils/misc/guc_tables.c:945
+#: utils/misc/guc_tables.c:964
 msgid "Enables the planner's use of parallel hash plans."
 msgstr "Дає змогу планувальнику використовувати плани паралельного з'єднання по гешу."
 
-#: utils/misc/guc_tables.c:955
+#: utils/misc/guc_tables.c:974
 msgid "Enables plan-time and execution-time partition pruning."
 msgstr "Активує видалення розділу під час планування і виконання."
 
-#: utils/misc/guc_tables.c:956
+#: utils/misc/guc_tables.c:975
 msgid "Allows the query planner and executor to compare partition bounds to conditions in the query to determine which partitions must be scanned."
 msgstr "Дозволяє планувальнику і виконавцю запитів порівнювати границі секцій з умовами в запиті і визначати які секції повинні бути відскановані."
 
-#: utils/misc/guc_tables.c:967
+#: utils/misc/guc_tables.c:986
 msgid "Enables the planner's ability to produce plans that provide presorted input for ORDER BY / DISTINCT aggregate functions."
 msgstr "Дозволяє планувальнику створювати плани з попередньо відсортованими даними для агрегованих функцій ORDER BY / DISTINCT."
 
-#: utils/misc/guc_tables.c:970
+#: utils/misc/guc_tables.c:989
 msgid "Allows the query planner to build plans that provide presorted input for aggregate functions with an ORDER BY / DISTINCT clause.  When disabled, implicit sorts are always performed during execution."
 msgstr "Дозволяє планувальнику запитів створювати плани, які надають попередньо відсортовані дані для агрегованих функцій з реченням ORDER BY / DISTINCT.  Якщо цей параметр вимкнено, під час виконання запиту завжди виконується неявне сортування."
 
-#: utils/misc/guc_tables.c:982
+#: utils/misc/guc_tables.c:1001
 msgid "Enables the planner's use of async append plans."
 msgstr "Дає змогу планувальнику використовувати асинхронні плани додавання."
 
-#: utils/misc/guc_tables.c:992
+#: utils/misc/guc_tables.c:1011
+msgid "Enables removal of unique self-joins."
+msgstr "Вмикає видалення унікальних самоз'єднань."
+
+#: utils/misc/guc_tables.c:1021
 msgid "Enables reordering of GROUP BY keys."
 msgstr "Дозволяє перевпорядкувати ключі GROUP BY."
 
-#: utils/misc/guc_tables.c:1002
+#: utils/misc/guc_tables.c:1031
+msgid "Enables reordering of DISTINCT keys."
+msgstr "Вмикає переупорядкування ключів DISTINCT."
+
+#: utils/misc/guc_tables.c:1041
 msgid "Enables genetic query optimization."
 msgstr "Вмикає генетичну оптимізацію запитів."
 
-#: utils/misc/guc_tables.c:1003
+#: utils/misc/guc_tables.c:1042
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "Цей алгоритм намагається побудувати план без повного перебору."
 
-#: utils/misc/guc_tables.c:1017
+#: utils/misc/guc_tables.c:1056
 msgid "Shows whether the current user is a superuser."
 msgstr "Показує, чи є поточний користувач суперкористувачем."
 
-#: utils/misc/guc_tables.c:1032
+#: utils/misc/guc_tables.c:1071
 msgid "Allows running the ALTER SYSTEM command."
 msgstr "Дозволяє запускати команду ALTER SYSTEM."
 
-#: utils/misc/guc_tables.c:1033
+#: utils/misc/guc_tables.c:1072
 msgid "Can be set to off for environments where global configuration changes should be made using a different method."
-msgstr ""
+msgstr "Може бути вимкнене для середовищ, де слід вносити зміни глобальних налаштувань за допомогою іншого методу."
 
-#: utils/misc/guc_tables.c:1043
+#: utils/misc/guc_tables.c:1082
 msgid "Enables advertising the server via Bonjour."
 msgstr "Вмикає оголошення серверу через Bonjour."
 
-#: utils/misc/guc_tables.c:1052
+#: utils/misc/guc_tables.c:1091
 msgid "Collects transaction commit time."
 msgstr "Збирає час затвердження транзакцій."
 
-#: utils/misc/guc_tables.c:1061
+#: utils/misc/guc_tables.c:1100
 msgid "Enables SSL connections."
 msgstr "Вмикає SSL-підключення."
 
-#: utils/misc/guc_tables.c:1070
+#: utils/misc/guc_tables.c:1109
 msgid "Controls whether \"ssl_passphrase_command\" is called during server reload."
-msgstr ""
+msgstr "Визначає, чи викликається \"ssl_passphrase_command\" під час перезавантаження сервера."
 
-#: utils/misc/guc_tables.c:1079
+#: utils/misc/guc_tables.c:1118
 msgid "Give priority to server ciphersuite order."
 msgstr "Віддавати перевагу замовленню набору шрифтів сервера."
 
-#: utils/misc/guc_tables.c:1088
+#: utils/misc/guc_tables.c:1127
 msgid "Forces synchronization of updates to disk."
 msgstr "Примусова синхронізація оновлень на диск."
 
-#: utils/misc/guc_tables.c:1089
+#: utils/misc/guc_tables.c:1128
 msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This ensures that a database cluster will recover to a consistent state after an operating system or hardware crash."
 msgstr "Сервер буде використовувати системний виклик fsync() в декількох місцях, щоб переконатися, що оновлення фізично записані на диск. Це гарантує, що кластер баз даних відновиться до узгодженого стану після аварійного завершення роботи операційної системи чи апаратного збою."
 
-#: utils/misc/guc_tables.c:1100
+#: utils/misc/guc_tables.c:1139
 msgid "Continues processing after a checksum failure."
 msgstr "Продовжує обробку після помилки контрольної суми."
 
-#: utils/misc/guc_tables.c:1101
+#: utils/misc/guc_tables.c:1140
 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 "Виявляючи помилку контрольної суми, PostgreSQL звичайно повідомляє про помилку і перериває поточну транзакцію. Але якщо ignore_checksum_failure дорівнює true, система пропустить помилку (але видасть попередження) і продовжить обробку. Ця поведінка може бути причиною аварійних завершень роботи або інших серйозних проблем. Це має місце, лише якщо ввімкнен контроль цілосності сторінок."
 
-#: utils/misc/guc_tables.c:1115
+#: utils/misc/guc_tables.c:1154
 msgid "Continues processing past damaged page headers."
 msgstr "Продовжує обробку при пошкоджені заголовків сторінок."
 
-#: utils/misc/guc_tables.c:1116
+#: utils/misc/guc_tables.c:1155
 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 ""
+msgstr "Виявляючи пошкоджений заголовок сторінки, PostgreSQL звичайно повідомляє про помилку, перериваючи поточну транзакцію. Але якщо \"zero_damaged_pages\" дорівнює true система видасть попередження, обнулить пошкоджену сторінку, і продовжить обробку. Ця поведінка знищить дані, а саме рядків в пошкодженій сторінці."
 
-#: utils/misc/guc_tables.c:1129
+#: utils/misc/guc_tables.c:1168
 msgid "Continues recovery after an invalid pages failure."
 msgstr "Продовжує відновлення після помилки неприпустимих сторінок."
 
-#: utils/misc/guc_tables.c:1130
+#: utils/misc/guc_tables.c:1169
 msgid "Detection of WAL records having references to invalid pages during recovery causes PostgreSQL to raise a PANIC-level error, aborting the recovery. Setting \"ignore_invalid_pages\" to true causes the system to ignore invalid page references in WAL records (but still report a warning), and continue recovery. This behavior may cause crashes, data loss, propagate or hide corruption, or other serious problems. Only has an effect during recovery or in standby mode."
-msgstr ""
+msgstr "Виявлення WAL записів, які мають посилання на неприпустимі сторінки під час відновлення, змушує PostgreSQL підняти помилку на рівень PANIC, перериваючи відновлення. Встановлення параметру \"ignore_invalid_pages\" на true змусить систему ігнорувати неприпустимі посилання на сторінки в WAL записах (але все ще буде повідомляти про попередження), і продовжити відновлення. Ця поведінка може викликати збої, втрату даних, розповсюдження або приховання пошкоджень, або інші серйозні проблеми. Діє лише під час відновлення або в режимі очікування."
 
-#: utils/misc/guc_tables.c:1148
+#: utils/misc/guc_tables.c:1187
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "Запис повних сторінок до WAL при першій зміні після контрольної точки."
 
-#: utils/misc/guc_tables.c:1149
+#: utils/misc/guc_tables.c:1188
 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 "Сторінка, записувана під час аварійного завершення роботи операційної системи може бути записаною на диск частково. Під час відновлення, журналу змін рядків в WAL буде недостатньо для відновлення. Цей параметр записує повні сторінки після першої зміни після контрольної точки, тож відновлення можливе."
 
-#: utils/misc/guc_tables.c:1162
+#: utils/misc/guc_tables.c:1201
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modification."
-msgstr "Записує повні сторінки до WAL при першій зміні після контрольної точки, навіть при некритичних змінах."
+msgstr "Запис повних сторінок до WAL при першій зміні після контрольної точки, навіть при некритичних змінах."
 
-#: utils/misc/guc_tables.c:1172
+#: utils/misc/guc_tables.c:1211
 msgid "Writes zeroes to new WAL files before first use."
 msgstr "Перед першим використанням записує нулі до нових файлів WAL."
 
-#: utils/misc/guc_tables.c:1182
+#: utils/misc/guc_tables.c:1221
 msgid "Recycles WAL files by renaming them."
 msgstr "Перезаписує файли WAL, перейменувавши їх."
 
-#: utils/misc/guc_tables.c:1192
+#: utils/misc/guc_tables.c:1231
 msgid "Logs each checkpoint."
 msgstr "Журналювати кожну контрольну точку."
 
-#: utils/misc/guc_tables.c:1201
-msgid "Logs each successful connection."
-msgstr "Журналювати кожне успішне підключення."
-
-#: utils/misc/guc_tables.c:1210
+#: utils/misc/guc_tables.c:1240
 msgid "Logs details of pre-authentication connection handshake."
-msgstr ""
+msgstr "Журналювати деталі рукостискання перед автентифікацією."
 
-#: utils/misc/guc_tables.c:1220
+#: utils/misc/guc_tables.c:1250
 msgid "Logs end of a session, including duration."
 msgstr "Журналювати кінець сеансу, зокрема тривалість."
 
-#: utils/misc/guc_tables.c:1229
+#: utils/misc/guc_tables.c:1259
 msgid "Logs each replication command."
 msgstr "Журналювати кожну команду реплікації."
 
-#: utils/misc/guc_tables.c:1238
+#: utils/misc/guc_tables.c:1268
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Показує, чи активовані перевірки твердження на працюючому сервері."
 
-#: utils/misc/guc_tables.c:1249
+#: utils/misc/guc_tables.c:1279
 msgid "Terminate session on any error."
 msgstr "Припиняти сеанси при будь-якій помилці."
 
-#: utils/misc/guc_tables.c:1258
+#: utils/misc/guc_tables.c:1288
 msgid "Reinitialize server after backend crash."
 msgstr "Повторити ініціалізацію сервера, після внутрішнього аварійного завершення роботи."
 
-#: utils/misc/guc_tables.c:1267
+#: utils/misc/guc_tables.c:1297
 msgid "Remove temporary files after backend crash."
 msgstr "Видалити тимчасові файли після аварійного завершення роботи внутрішнього сервера."
 
-#: utils/misc/guc_tables.c:1277
+#: utils/misc/guc_tables.c:1307
 msgid "Send SIGABRT not SIGQUIT to child processes after backend crash."
 msgstr "Надсилати SIGABRT, а не SIGQUIT дочірнім процесам після аварійного завершення роботи бекенда."
 
-#: utils/misc/guc_tables.c:1287
+#: utils/misc/guc_tables.c:1317
 msgid "Send SIGABRT not SIGKILL to stuck child processes."
 msgstr "Надсилати SIGABRT, а не SIGKILL до дочірніх процесів, що застрягли."
 
-#: utils/misc/guc_tables.c:1298
+#: utils/misc/guc_tables.c:1328
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Журналювати тривалість кожного виконаного SQL-оператора."
 
-#: utils/misc/guc_tables.c:1307
+#: utils/misc/guc_tables.c:1338
+msgid "Set this to force all parse and plan trees to be passed through copyObject(), to facilitate catching errors and omissions in copyObject()."
+msgstr "Встановіть це, щоб примусити всі дерева парсингу та планування проходити через copyObject(), щоб полегшити виявлення помилок та упущень в copyObject()."
+
+#: utils/misc/guc_tables.c:1355
+msgid "Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules."
+msgstr "Встановіть це, щоб примусити всі дерева парсингу та планування проходити через outfuncs.c/readfuncs.c, щоб полегшити виявлення помилок та упущень в цих модулях."
+
+#: utils/misc/guc_tables.c:1372
+msgid "Set this to force all raw parse trees for DML statements to be scanned by raw_expression_tree_walker(), to facilitate catching errors and omissions in that function."
+msgstr "Встановіть це, щоб примусити всі необроблені дерева парсингу для DML операторів сканувати через raw_expression_tree_walker(), щоб полегшити виявлення помилок та упущень в цій функції."
+
+#: utils/misc/guc_tables.c:1390
 msgid "Logs each query's parse tree."
 msgstr "Журналювати дерево аналізу для кожного запиту."
 
-#: utils/misc/guc_tables.c:1316
+#: utils/misc/guc_tables.c:1399
 msgid "Logs each query's rewritten parse tree."
 msgstr "Журналювати переписане дерево аналізу для кожного запиту."
 
-#: utils/misc/guc_tables.c:1325
+#: utils/misc/guc_tables.c:1408
 msgid "Logs each query's execution plan."
 msgstr "Журналювати план виконання кожного запиту."
 
-#: utils/misc/guc_tables.c:1334
+#: utils/misc/guc_tables.c:1417
 msgid "Indents parse and plan tree displays."
 msgstr "Відступи при відображенні дерев аналізу і плану запитів."
 
-#: utils/misc/guc_tables.c:1343
+#: utils/misc/guc_tables.c:1426
 msgid "Writes parser performance statistics to the server log."
 msgstr "Запис статистики продуктивності аналізу до запису сервера."
 
-#: utils/misc/guc_tables.c:1352
+#: utils/misc/guc_tables.c:1435
 msgid "Writes planner performance statistics to the server log."
 msgstr "Запис статистики продуктивності планувальника до запису сервера."
 
-#: utils/misc/guc_tables.c:1361
+#: utils/misc/guc_tables.c:1444
 msgid "Writes executor performance statistics to the server log."
 msgstr "Запис статистики продуктивності виконувача до запису сервера."
 
-#: utils/misc/guc_tables.c:1370
+#: utils/misc/guc_tables.c:1453
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Запис сукупної статистики продуктивності до запису сервера."
 
-#: utils/misc/guc_tables.c:1380
+#: utils/misc/guc_tables.c:1463
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "Журналювати статистику використання системних ресурсів (пам'яті і ЦП) при різноманітних операціях з B-tree."
 
-#: utils/misc/guc_tables.c:1392
+#: utils/misc/guc_tables.c:1475
 msgid "Collects information about executing commands."
 msgstr "Збирати інформацію про команди які виконуються."
 
-#: utils/misc/guc_tables.c:1393
+#: utils/misc/guc_tables.c:1476
 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 "Активує збір інформації про поточні команди, які виконуються в кожному сеансі, разом з часом запуску команди."
 
-#: utils/misc/guc_tables.c:1403
+#: utils/misc/guc_tables.c:1486
 msgid "Collects statistics on database activity."
 msgstr "Збирати статистику про активність бази даних."
 
-#: utils/misc/guc_tables.c:1412
+#: utils/misc/guc_tables.c:1495
+msgid "Collects timing statistics for cost-based vacuum delay."
+msgstr "Збирає статистику часу для затримки очищення на основі вартості."
+
+#: utils/misc/guc_tables.c:1504
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Збирати статистику за часом активності введення/виведення для бази даних."
 
-#: utils/misc/guc_tables.c:1421
+#: utils/misc/guc_tables.c:1513
 msgid "Collects timing statistics for WAL I/O activity."
 msgstr "Збирає статистику часу для активності вводу/виводу WAL."
 
-#: utils/misc/guc_tables.c:1431
+#: utils/misc/guc_tables.c:1523
 msgid "Updates the process title to show the active SQL command."
 msgstr "Оновлення виводить в заголовок процесу активну SQL-команду."
 
-#: utils/misc/guc_tables.c:1432
+#: utils/misc/guc_tables.c:1524
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr "Відображає в заголовку процеса кожну SQL-команду, отриману сервером."
 
-#: utils/misc/guc_tables.c:1441
+#: utils/misc/guc_tables.c:1533
 msgid "Starts the autovacuum subprocess."
 msgstr "Запускає підпроцес автоочистки."
 
-#: utils/misc/guc_tables.c:1451
+#: utils/misc/guc_tables.c:1543
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Генерує налагодженні повідомлення для LISTEN і NOTIFY."
 
-#: utils/misc/guc_tables.c:1463
+#: utils/misc/guc_tables.c:1555
 msgid "Emits information about lock usage."
 msgstr "Видає інформацію про блокування, які використовуються."
 
-#: utils/misc/guc_tables.c:1473
+#: utils/misc/guc_tables.c:1565
 msgid "Emits information about user lock usage."
 msgstr "Видає інформацію про користувацькі блокування, які використовуються."
 
-#: utils/misc/guc_tables.c:1483
+#: utils/misc/guc_tables.c:1575
 msgid "Emits information about lightweight lock usage."
 msgstr "Видає інформацію про спрощені блокування, які використовуються."
 
-#: utils/misc/guc_tables.c:1493
+#: utils/misc/guc_tables.c:1585
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "Виводить інформацію про всі поточні блокування, при тайм-ауті взаємного блокування."
 
-#: utils/misc/guc_tables.c:1505
+#: utils/misc/guc_tables.c:1597
 msgid "Logs long lock waits."
 msgstr "Журналювати тривалі очікування в блокуваннях."
 
-#: utils/misc/guc_tables.c:1514
+#: utils/misc/guc_tables.c:1606
+msgid "Logs lock failures."
+msgstr "Журналює помилки блокування."
+
+#: utils/misc/guc_tables.c:1615
 msgid "Logs standby recovery conflict waits."
 msgstr "Журналює очікування конфлікту відновлення."
 
-#: utils/misc/guc_tables.c:1523
+#: utils/misc/guc_tables.c:1624
 msgid "Logs the host name in the connection logs."
 msgstr "Журналювати ім’я хоста до записів підключення."
 
-#: utils/misc/guc_tables.c:1524
+#: utils/misc/guc_tables.c:1625
 msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
 msgstr "За замовчуванням, записи підключень показують лише IP-адреси хостів, які підключилися. Якщо ви хочете бачити імена хостів ви можете ввімкнути цей параметр, але врахуйте, що це може значно вплинути на продуктивність."
 
-#: utils/misc/guc_tables.c:1535
+#: utils/misc/guc_tables.c:1636
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Вважати \"expr=NULL\" як \"expr IS NULL\"."
 
-#: utils/misc/guc_tables.c:1536
+#: utils/misc/guc_tables.c:1637
 msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)."
 msgstr "Коли цей параметр ввімкнений, вирази форми expr = NULL (або NULL = expr) вважаються як expr IS NULL, тобто, повертають true, якщо expr співпадає зі значенням null, і false в іншому разі. Правильна поведінка expr = NULL - завжди повертати null (невідомо)."
 
-#: utils/misc/guc_tables.c:1548
+#: utils/misc/guc_tables.c:1649
 msgid "Sets the default read-only status of new transactions."
 msgstr "Встановлює статус \"лише читання\" за замовчуванням для нових транзакцій."
 
-#: utils/misc/guc_tables.c:1558
+#: utils/misc/guc_tables.c:1659
 msgid "Sets the current transaction's read-only status."
 msgstr "Встановлює статус \"лише читання\" для поточної транзакції."
 
-#: utils/misc/guc_tables.c:1568
+#: utils/misc/guc_tables.c:1669
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Встановлює статус відкладеного виконання за замовчуванням для нових транзакцій."
 
-#: utils/misc/guc_tables.c:1577
+#: utils/misc/guc_tables.c:1678
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "Визначає, чи відкладати серіалізовану транзакцію \"лише читання\" до моменту, коли збій серіалізації буде виключений."
 
-#: utils/misc/guc_tables.c:1587
-msgid "Enable row security."
+#: utils/misc/guc_tables.c:1688
+msgid "Enables row security."
 msgstr "Вмикає захист на рівні рядків."
 
-#: utils/misc/guc_tables.c:1588
+#: utils/misc/guc_tables.c:1689
 msgid "When enabled, row security will be applied to all users."
 msgstr "Коли ввімкнено, захист на рівні рядків буде застосовано до всіх користувачів."
 
-#: utils/misc/guc_tables.c:1596
+#: utils/misc/guc_tables.c:1697
 msgid "Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."
 msgstr "Перевірте тіла підпрограм під час CREATE FUNCTION і CREATE PROCEDURE."
 
-#: utils/misc/guc_tables.c:1605
-msgid "Enable input of NULL elements in arrays."
-msgstr "Дозволяє введення NULL елементів у масивах."
+#: utils/misc/guc_tables.c:1706
+msgid "Enables input of NULL elements in arrays."
+msgstr "Дозволяє введення елементів NULL у масивах."
 
-#: utils/misc/guc_tables.c:1606
+#: utils/misc/guc_tables.c:1707
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr "Коли цей параметр ввімкнений, NULL без лапок при введенні до масиву сприймається як значення null; в іншому разі як рядок."
 
-#: utils/misc/guc_tables.c:1622
+#: utils/misc/guc_tables.c:1723
 msgid "WITH OIDS is no longer supported; this can only be false."
 msgstr "WITH OIDS більше не підтримується; це може бути помилковим."
 
-#: utils/misc/guc_tables.c:1632
-msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
-msgstr "Запускає підпроцес записування виводу stderr і/або csvlogs до файлів журналу."
+#: utils/misc/guc_tables.c:1733
+msgid "Start a subprocess to capture stderr, csvlog and/or jsonlog into log files."
+msgstr "Запускає підпроцес записування виводу stderr, csvlog і/або jsonlog до файлів журналу."
 
-#: utils/misc/guc_tables.c:1641
+#: utils/misc/guc_tables.c:1742
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "Скорочувати існуючі файли журналу з тим самим іменем під час обертання журналу."
 
-#: utils/misc/guc_tables.c:1652
+#: utils/misc/guc_tables.c:1752
 msgid "Emit information about resource usage in sorting."
 msgstr "Виводити інформацію про використання ресурсу при сортуванні."
 
-#: utils/misc/guc_tables.c:1666
+#: utils/misc/guc_tables.c:1765
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Створює налагодженні повідомлення для синхронного сканування."
 
-#: utils/misc/guc_tables.c:1681
-msgid "Enable bounded sorting using heap sort."
-msgstr "Вмикає обмежене сортування використовуючи динамічне сортування."
+#: utils/misc/guc_tables.c:1780
+msgid "Enables bounded sorting using heap sort."
+msgstr "Вмикає обмежене сортування з використанням сортування купою."
 
-#: utils/misc/guc_tables.c:1694
+#: utils/misc/guc_tables.c:1793
 msgid "Emit WAL-related debugging output."
 msgstr "Виводити налагодженні повідомлення пов'язані з WAL."
 
-#: utils/misc/guc_tables.c:1706
+#: utils/misc/guc_tables.c:1805
 msgid "Shows whether datetimes are integer based."
 msgstr "Показує, чи базуються дати на цілих числах."
 
-#: utils/misc/guc_tables.c:1717
+#: utils/misc/guc_tables.c:1816
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "Встановлює обробку без урахування регістру імен користувачів Kerberos і GSSAPI."
 
-#: utils/misc/guc_tables.c:1727
+#: utils/misc/guc_tables.c:1826
 msgid "Sets whether GSSAPI delegation should be accepted from the client."
 msgstr "Встановлює чи слід приймати делегацію GSSAPI від клієнта."
 
-#: utils/misc/guc_tables.c:1737
+#: utils/misc/guc_tables.c:1836
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Попередження про спецсимволи \"\\\" в звичайних рядках."
 
-#: utils/misc/guc_tables.c:1747
+#: utils/misc/guc_tables.c:1846
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Вмикає буквальну обробку символів \"\\\" в рядках '...'."
 
-#: utils/misc/guc_tables.c:1758
-msgid "Enable synchronized sequential scans."
-msgstr "Вмикає синхронізацію послідовного сканування."
+#: utils/misc/guc_tables.c:1857
+msgid "Enables synchronized sequential scans."
+msgstr "Вмикає синхронізовані послідовні сканування."
 
-#: utils/misc/guc_tables.c:1768
+#: utils/misc/guc_tables.c:1867
 msgid "Sets whether to include or exclude transaction with recovery target."
 msgstr "Встановлює, включати чи виключати транзакції з метою відновлення."
 
-#: utils/misc/guc_tables.c:1778
+#: utils/misc/guc_tables.c:1877
 msgid "Starts the WAL summarizer process to enable incremental backup."
 msgstr "Запускає процес підсумовування WAL, щоб увімкнути інкрементне резервне копіювання."
 
-#: utils/misc/guc_tables.c:1788
+#: utils/misc/guc_tables.c:1887
 msgid "Allows connections and queries during recovery."
 msgstr "Дозволяє підключення і запити під час відновлення."
 
-#: utils/misc/guc_tables.c:1798
+#: utils/misc/guc_tables.c:1897
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "Дозволяє зворотній зв'язок серверу hot standby з основним для уникнення конфліктів запитів."
 
-#: utils/misc/guc_tables.c:1808
+#: utils/misc/guc_tables.c:1907
 msgid "Shows whether hot standby is currently active."
 msgstr "Показує, чи hot standby наразі активний."
 
-#: utils/misc/guc_tables.c:1819
+#: utils/misc/guc_tables.c:1918
 msgid "Allows modifications of the structure of system tables."
 msgstr "Дозволяє модифікації структури системних таблиць."
 
-#: utils/misc/guc_tables.c:1830
+#: utils/misc/guc_tables.c:1929
 msgid "Disables reading from system indexes."
 msgstr "Вимикає читання з системних індексів."
 
-#: utils/misc/guc_tables.c:1831
+#: utils/misc/guc_tables.c:1930
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "Це не забороняє оновлення індексів, тож дана поведінка безпечна. Найгірший наслідок це сповільнення."
 
-#: utils/misc/guc_tables.c:1842
+#: utils/misc/guc_tables.c:1941
 msgid "Allows tablespaces directly inside pg_tblspc, for testing."
 msgstr "Дозволяє табличні простори безпосередньо всередині pg_tblspc, для тестування."
 
-#: utils/misc/guc_tables.c:1853
+#: utils/misc/guc_tables.c:1952
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "Вмикає режим зворотньої сумісності при перевірці прав для великих об'єктів."
 
-#: utils/misc/guc_tables.c:1854
+#: utils/misc/guc_tables.c:1953
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "Пропускає перевірки прав при читанні або зміненні великих об'єктів, для сумісності з версіями PostgreSQL до 9.0."
 
-#: utils/misc/guc_tables.c:1864
+#: utils/misc/guc_tables.c:1963
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "Генеруючи SQL-фрагменти, включати всі ідентифікатори в лапки."
 
-#: utils/misc/guc_tables.c:1874
+#: utils/misc/guc_tables.c:1973
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Показує, чи ввімкнена контрольна сума даних для цього кластеру."
 
-#: utils/misc/guc_tables.c:1885
+#: utils/misc/guc_tables.c:1984
 msgid "Add sequence number to syslog messages to avoid duplicate suppression."
 msgstr "Додає послідовне число до повідомлень syslog, щоб уникнути ігнорування дублікатів."
 
-#: utils/misc/guc_tables.c:1895
+#: utils/misc/guc_tables.c:1994
 msgid "Split messages sent to syslog by lines and to fit into 1024 bytes."
 msgstr "Розділяє повідомлення, які передаються в syslog, рядками розміром не більше 1024 байт."
 
-#: utils/misc/guc_tables.c:1905
+#: utils/misc/guc_tables.c:2004
 msgid "Controls whether Gather and Gather Merge also run subplans."
 msgstr "Визначає, чи вузли зібрання і зібрання об'єднанням також виконають підплани."
 
-#: utils/misc/guc_tables.c:1906
+#: utils/misc/guc_tables.c:2005
 msgid "Should gather nodes also run subplans or just gather tuples?"
 msgstr "Чи повинні вузли збірки також виконувати підплани або тільки збирати кортежі?"
 
-#: utils/misc/guc_tables.c:1916
+#: utils/misc/guc_tables.c:2015
 msgid "Allow JIT compilation."
 msgstr "Дозволити JIT-компіляцію."
 
-#: utils/misc/guc_tables.c:1927
+#: utils/misc/guc_tables.c:2026
 msgid "Register JIT-compiled functions with debugger."
 msgstr "Зареєструйте функції JIT-compiled за допомогою налагоджувача."
 
-#: utils/misc/guc_tables.c:1944
+#: utils/misc/guc_tables.c:2043
 msgid "Write out LLVM bitcode to facilitate JIT debugging."
 msgstr "Виводити бітовий код LLVM для полегшення налагодження JIT."
 
-#: utils/misc/guc_tables.c:1955
+#: utils/misc/guc_tables.c:2054
 msgid "Allow JIT compilation of expressions."
 msgstr "Дозволити JIT-компіляцію виразів."
 
-#: utils/misc/guc_tables.c:1966
+#: utils/misc/guc_tables.c:2065
 msgid "Register JIT-compiled functions with perf profiler."
 msgstr "Зареєструйте функції JIT-compiled за допомогою профілювальника perf."
 
-#: utils/misc/guc_tables.c:1983
+#: utils/misc/guc_tables.c:2082
 msgid "Allow JIT compilation of tuple deforming."
 msgstr "Дозволити JIT-компіляцію перетворення кортежів."
 
-#: utils/misc/guc_tables.c:1994
+#: utils/misc/guc_tables.c:2093
 msgid "Whether to continue running after a failure to sync data files."
 msgstr "Чи продовжувати виконання після помилки синхронізації файлів даних на диску."
 
-#: utils/misc/guc_tables.c:2003
+#: utils/misc/guc_tables.c:2102
 msgid "Sets whether a WAL receiver should create a temporary replication slot if no permanent slot is configured."
 msgstr "Встановлює чи повинен одержувач WAL створити тимчасовий слот реплікації, якщо постійний слот не налаштований."
 
-#: utils/misc/guc_tables.c:2012
+#: utils/misc/guc_tables.c:2111
 msgid "Enables event triggers."
 msgstr "Вмикає тригери подій."
 
-#: utils/misc/guc_tables.c:2013
+#: utils/misc/guc_tables.c:2112
 msgid "When enabled, event triggers will fire for all applicable statements."
 msgstr "Якщо увімкнено, тригери подій спрацьовуватимуть для всіх застосовних операторів."
 
-#: utils/misc/guc_tables.c:2022
+#: utils/misc/guc_tables.c:2121
 msgid "Enables a physical standby to synchronize logical failover replication slots from the primary server."
-msgstr ""
+msgstr "Вмикає фізичний резерв для синхронізації логічних слотів реплікації з основним сервером."
+
+#: utils/misc/guc_tables.c:2130
+msgid "Enables deprecation warnings for MD5 passwords."
+msgstr "Вмикає попередження про застарілість паролів MD5."
+
+#: utils/misc/guc_tables.c:2139
+msgid "Enables vacuum to truncate empty pages at the end of the table."
+msgstr "Дозволяє vacuum обрізати порожні сторінки в кінці таблиці."
 
-#: utils/misc/guc_tables.c:2040
+#: utils/misc/guc_tables.c:2157
 msgid "Sets the amount of time to wait before forcing a switch to the next WAL file."
 msgstr "Встановлює кількість часу очікування перед примусовим переходом на наступний файл WAL."
 
-#: utils/misc/guc_tables.c:2051
+#: utils/misc/guc_tables.c:2159 utils/misc/guc_tables.c:2313
+#: utils/misc/guc_tables.c:2732 utils/misc/guc_tables.c:2743
+#: utils/misc/guc_tables.c:2754 utils/misc/guc_tables.c:2765
+#: utils/misc/guc_tables.c:2776
+msgid "0 disables the timeout."
+msgstr "0 вимикає тайм-аут."
+
+#: utils/misc/guc_tables.c:2168
 msgid "Sets the amount of time to wait after authentication on connection startup."
 msgstr "Встановлює кількість часу для очікування після автенифікації під час запуску з'єднання."
 
-#: utils/misc/guc_tables.c:2053 utils/misc/guc_tables.c:2780
+#: utils/misc/guc_tables.c:2170 utils/misc/guc_tables.c:2908
 msgid "This allows attaching a debugger to the process."
 msgstr "Це дозволяє підключити налагоджувач до процесу."
 
-#: utils/misc/guc_tables.c:2062
+#: utils/misc/guc_tables.c:2179
 msgid "Sets the default statistics target."
 msgstr "Встановлює мету статистики за замовчуванням."
 
-#: utils/misc/guc_tables.c:2063
+#: utils/misc/guc_tables.c:2180
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr "Це застосовується до стовпців таблиці, для котрих мета статистики не встановлена явно через ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc_tables.c:2072
+#: utils/misc/guc_tables.c:2189
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr "Встановлює розмір для списку FROM, при перевищені котрого вкладені запити не згортаються."
 
-#: utils/misc/guc_tables.c:2074
+#: utils/misc/guc_tables.c:2191
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr "Планувальник об'єднає вкладені запити з зовнішніми, якщо в отриманому списку FROM буде не більше заданої кількості елементів."
 
-#: utils/misc/guc_tables.c:2085
+#: utils/misc/guc_tables.c:2202
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr "Встановлює розмір для списку FROM, при перевищенні котрого конструкції JOIN не подаються у вигляді рядка."
 
-#: utils/misc/guc_tables.c:2087
+#: utils/misc/guc_tables.c:2204
 msgid "The planner will flatten explicit JOIN constructs into lists of FROM items whenever a list of no more than this many items would result."
 msgstr "Планувальник буде подавати у вигляді рядка явні конструкції JOIN в списки FROM, допоки в отриманому списку не більше заданої кількості елементів."
 
-#: utils/misc/guc_tables.c:2098
+#: utils/misc/guc_tables.c:2215
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr "Встановлює граничне значення для елементів FROM, при перевищенні котрого використовується GEQO."
 
-#: utils/misc/guc_tables.c:2108
+#: utils/misc/guc_tables.c:2225
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: зусилля використовувались щоб встановити значення за замовчуванням для інших параметрів GEQO."
 
-#: utils/misc/guc_tables.c:2118
+#: utils/misc/guc_tables.c:2235
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: кількість користувачів у популяції."
 
-#: utils/misc/guc_tables.c:2119 utils/misc/guc_tables.c:2129
-msgid "Zero selects a suitable default value."
-msgstr "Нуль вибирає придатне значення за замовчуванням."
+#: utils/misc/guc_tables.c:2236 utils/misc/guc_tables.c:2246
+msgid "0 means use a suitable default value."
+msgstr "0 означає використання відповідного значення за замовчуванням."
 
-#: utils/misc/guc_tables.c:2128
+#: utils/misc/guc_tables.c:2245
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: кількість ітерацій в алгоритмі."
 
-#: utils/misc/guc_tables.c:2140
+#: utils/misc/guc_tables.c:2257
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Встановлює час очікування в блокуванні до перевірки на взаємне блокування."
 
-#: utils/misc/guc_tables.c:2151
+#: utils/misc/guc_tables.c:2268
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr "Встановлює максимальну затримку до скасування запитів, коли hot standby сервер обробляє архівні дані WAL."
 
-#: utils/misc/guc_tables.c:2162
+#: utils/misc/guc_tables.c:2269 utils/misc/guc_tables.c:2280
+msgid "-1 means wait forever."
+msgstr "-1 означає чекати нескінченно."
+
+#: utils/misc/guc_tables.c:2279
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr "Встановлює максимальну затримку до скасування запитів, коли hot standby сервер обробляє дані WAL з потоку."
 
-#: utils/misc/guc_tables.c:2173
+#: utils/misc/guc_tables.c:2290
 msgid "Sets the minimum delay for applying changes during recovery."
 msgstr "Встановлює мінімальну затримку для застосування змін під час відновлення."
 
-#: utils/misc/guc_tables.c:2184
+#: utils/misc/guc_tables.c:2301
 msgid "Sets the maximum interval between WAL receiver status reports to the sending server."
 msgstr "Встановлює максимальний інтервал між звітами про стан одержувачів WAL для серверу надсилання."
 
-#: utils/misc/guc_tables.c:2195
+#: utils/misc/guc_tables.c:2312
 msgid "Sets the maximum wait time to receive data from the sending server."
 msgstr "Встановлює максимальний час очікування для отримання даних з серверу надсилання."
 
-#: utils/misc/guc_tables.c:2206
+#: utils/misc/guc_tables.c:2323
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Встановлює максимальну кілкість паралельних підключень."
 
-#: utils/misc/guc_tables.c:2217
+#: utils/misc/guc_tables.c:2334
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Встановлює кількість зарезервованих слотів підключень для суперкористувачів."
 
-#: utils/misc/guc_tables.c:2227
+#: utils/misc/guc_tables.c:2344
 msgid "Sets the number of connection slots reserved for roles with privileges of pg_use_reserved_connections."
 msgstr "Встановлює кількість слотів підключення, зарезервованих для ролей з правами pg_use_reserved_connections."
 
-#: utils/misc/guc_tables.c:2238
+#: utils/misc/guc_tables.c:2355
 msgid "Amount of dynamic shared memory reserved at startup."
 msgstr "Кількість динамічної спільної пам'яті, зарезервованої під час запуску."
 
-#: utils/misc/guc_tables.c:2253
+#: utils/misc/guc_tables.c:2370
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Встановлює кількість буферів спільної пам'яті, використовуваних сервером."
 
-#: utils/misc/guc_tables.c:2264
+#: utils/misc/guc_tables.c:2381
 msgid "Sets the buffer pool size for VACUUM, ANALYZE, and autovacuum."
 msgstr "Встановлює розмір буферного пулу для VACUUM, ANALYZE та автоочистки."
 
-#: utils/misc/guc_tables.c:2275
+#: utils/misc/guc_tables.c:2392
 msgid "Shows the size of the server's main shared memory area (rounded up to the nearest MB)."
 msgstr "Показує розмір основної спільної пам'яті сервера (округлення до найближчого МБ)."
 
-#: utils/misc/guc_tables.c:2286
+#: utils/misc/guc_tables.c:2403
 msgid "Shows the number of huge pages needed for the main shared memory area."
 msgstr "Показує кількість величезних сторінок, потрібних для основної області спільної пам'яті."
 
-#: utils/misc/guc_tables.c:2287
-msgid "-1 indicates that the value could not be determined."
-msgstr "-1 вказує на те, що значення не може бути визначене."
+#: utils/misc/guc_tables.c:2404
+msgid "-1 means huge pages are not supported."
+msgstr "-1 означає, що величезні сторінки не підтримуються."
 
-#: utils/misc/guc_tables.c:2297
+#: utils/misc/guc_tables.c:2414
+msgid "Shows the number of semaphores required for the server."
+msgstr "Показує кількість семафорів, необхідних для сервера."
+
+#: utils/misc/guc_tables.c:2425
 msgid "Sets the size of the dedicated buffer pool used for the commit timestamp cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу часів комітів."
 
-#: utils/misc/guc_tables.c:2298 utils/misc/guc_tables.c:2353
-#: utils/misc/guc_tables.c:2364
-msgid "Specify 0 to have this value determined as a fraction of shared_buffers."
-msgstr ""
+#: utils/misc/guc_tables.c:2426 utils/misc/guc_tables.c:2481
+#: utils/misc/guc_tables.c:2492
+msgid "0 means use a fraction of \"shared_buffers\"."
+msgstr "0 означає використання частини від \"shared_buffers\"."
 
-#: utils/misc/guc_tables.c:2308
+#: utils/misc/guc_tables.c:2436
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact member cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу членів MultiXact."
 
-#: utils/misc/guc_tables.c:2319
+#: utils/misc/guc_tables.c:2447
 msgid "Sets the size of the dedicated buffer pool used for the MultiXact offset cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу зсувів MultiXact."
 
-#: utils/misc/guc_tables.c:2330
+#: utils/misc/guc_tables.c:2458
 msgid "Sets the size of the dedicated buffer pool used for the LISTEN/NOTIFY message cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу повідомлень LISTEN/NOTIFY."
 
-#: utils/misc/guc_tables.c:2341
+#: utils/misc/guc_tables.c:2469
 msgid "Sets the size of the dedicated buffer pool used for the serializable transaction cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу серіалізованих транзакцій."
 
-#: utils/misc/guc_tables.c:2352
+#: utils/misc/guc_tables.c:2480
 msgid "Sets the size of the dedicated buffer pool used for the subtransaction cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу субтранзакцій."
 
-#: utils/misc/guc_tables.c:2363
+#: utils/misc/guc_tables.c:2491
 msgid "Sets the size of the dedicated buffer pool used for the transaction status cache."
-msgstr ""
+msgstr "Встановлює розмір спеціального буфера, що використовується для кешу статусів транзакцій."
 
-#: utils/misc/guc_tables.c:2374
+#: utils/misc/guc_tables.c:2502
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "Встановлює максимальну кількість використовуваних тимчасових буферів, для кожного сеансу."
 
-#: utils/misc/guc_tables.c:2385
+#: utils/misc/guc_tables.c:2513
 msgid "Sets the TCP port the server listens on."
 msgstr "Встановлює TCP-порт для роботи серверу."
 
-#: utils/misc/guc_tables.c:2395
+#: utils/misc/guc_tables.c:2523
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Встановлює дозволи на доступ для Unix-сокету."
 
-#: utils/misc/guc_tables.c:2396
+#: utils/misc/guc_tables.c:2524
 msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
 msgstr "Для Unix-сокетів використовується звичний набір дозволів, як у файлових системах Unix. Очікується, що значення параметра вказується у формі, яка прийнята для системних викликів chmod і umask. (Щоб використати звичний вісімковий формат, додайте в початок 0 (нуль).)"
 
-#: utils/misc/guc_tables.c:2410
+#: utils/misc/guc_tables.c:2538
 msgid "Sets the file permissions for log files."
 msgstr "Встановлює права дозволу для файлів журналу."
 
-#: utils/misc/guc_tables.c:2411
+#: utils/misc/guc_tables.c:2539
 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 "Очікується, що значення параметру буде вказано в числовому форматі, який сприймається системними викликами chmod і umask. (Щоб використати звичний вісімковий формат, додайте в початок 0 (нуль).)"
 
-#: utils/misc/guc_tables.c:2425
+#: utils/misc/guc_tables.c:2553
 msgid "Shows the mode of the data directory."
 msgstr "Показує режим каталогу даних."
 
-#: utils/misc/guc_tables.c:2426
+#: utils/misc/guc_tables.c:2554
 msgid "The parameter value is 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 "Значення параметру вказується в числовому форматі, який сприймається системними викликами chmod і umask. (Щоб використати звичний вісімковий формат, додайте в початок 0 (нуль).)"
 
-#: utils/misc/guc_tables.c:2439
+#: utils/misc/guc_tables.c:2567
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Встановлює максимальний об'єм пам'яті для робочих просторів запитів."
 
-#: utils/misc/guc_tables.c:2440
+#: utils/misc/guc_tables.c:2568
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr "Такий об'єм пам'яті може використовуватись кожною внутрішньою операцією сортування і таблицею гешування до переключення на тимчасові файли на диску."
 
-#: utils/misc/guc_tables.c:2457
+#: utils/misc/guc_tables.c:2585
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Встановлює максимальний об'єм пам'яті для операцій по обслуговуванню."
 
-#: utils/misc/guc_tables.c:2458
+#: utils/misc/guc_tables.c:2586
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Це включає такі операції як VACUUM і CREATE INDEX."
 
-#: utils/misc/guc_tables.c:2468
+#: utils/misc/guc_tables.c:2596
 msgid "Sets the maximum memory to be used for logical decoding."
 msgstr "Встановлює максимальний об'єм пам'яті для логічного декодування."
 
-#: utils/misc/guc_tables.c:2469
+#: utils/misc/guc_tables.c:2597
 msgid "This much memory can be used by each internal reorder buffer before spilling to disk."
 msgstr "Ця велика кількість пам'яті може бути використана кожним внутрішнім перевпорядковуючим буфером перед записом на диск."
 
-#: utils/misc/guc_tables.c:2485
+#: utils/misc/guc_tables.c:2613
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Встановлює максимальну глибину стека, в КБ."
 
-#: utils/misc/guc_tables.c:2496
+#: utils/misc/guc_tables.c:2624
 msgid "Limits the total size of all temporary files used by each process."
 msgstr "Обмежує загальний розмір всіх тимчасових файлів, які використовуються кожним процесом."
 
-#: utils/misc/guc_tables.c:2497
+#: utils/misc/guc_tables.c:2625
 msgid "-1 means no limit."
 msgstr "-1 вимикає обмеження."
 
-#: utils/misc/guc_tables.c:2507
+#: utils/misc/guc_tables.c:2635
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Вартість очистки для сторінки, яка була знайдена в буферному кеші."
 
-#: utils/misc/guc_tables.c:2517
+#: utils/misc/guc_tables.c:2645
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Вартість очистки для сторінки, яка не була знайдена в буферному кеші."
 
-#: utils/misc/guc_tables.c:2527
+#: utils/misc/guc_tables.c:2655
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Вартість очистки для сторінки, яка не була \"брудною\"."
 
-#: utils/misc/guc_tables.c:2537
+#: utils/misc/guc_tables.c:2665
 msgid "Vacuum cost amount available before napping."
 msgstr "Кількість доступних витрат вакууму перед від'єднанням."
 
-#: utils/misc/guc_tables.c:2547
+#: utils/misc/guc_tables.c:2675
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Кількість доступних витрат вакууму перед від'єднанням, для автовакууму."
 
-#: utils/misc/guc_tables.c:2557
-msgid "Sets the maximum number of simultaneously open files for each server process."
-msgstr "Встановлює максимальну кількість одночасно відкритих файлів для кожного процесу."
+#: utils/misc/guc_tables.c:2676
+msgid "-1 means use \"vacuum_cost_limit\"."
+msgstr "-1 означає використання \"vacuum_cost_limit\"."
 
-#: utils/misc/guc_tables.c:2570
+#: utils/misc/guc_tables.c:2685
+msgid "Sets the maximum number of files each server process is allowed to open simultaneously."
+msgstr "Встановлює максимальну кількість файлів, які може відкрити одночасно кожен серверний процес."
+
+#: utils/misc/guc_tables.c:2698
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Встановлює максимальну кількість одночасно підготовлених транзакцій."
 
-#: utils/misc/guc_tables.c:2581
+#: utils/misc/guc_tables.c:2709
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Встановлює мінімальний OID таблиць, для яких відстежуються блокування."
 
-#: utils/misc/guc_tables.c:2582
+#: utils/misc/guc_tables.c:2710
 msgid "Is used to avoid output on system tables."
 msgstr "Використовується для уникнення системних таблиць."
 
-#: utils/misc/guc_tables.c:2591
+#: utils/misc/guc_tables.c:2719
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Встановлює OID таблиці для безумовного трасування блокувань."
 
-#: utils/misc/guc_tables.c:2603
+#: utils/misc/guc_tables.c:2731
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Встановлює максимальну тривалість для будь-якого оператору."
 
-#: utils/misc/guc_tables.c:2604 utils/misc/guc_tables.c:2615
-#: utils/misc/guc_tables.c:2626 utils/misc/guc_tables.c:2637
-#: utils/misc/guc_tables.c:2648
-msgid "A value of 0 turns off the timeout."
-msgstr "Значення 0 (нуль) вимикає тайм-аут."
-
-#: utils/misc/guc_tables.c:2614
+#: utils/misc/guc_tables.c:2742
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Встановлює максимально дозволену тривалість очікування блокувань."
 
-#: utils/misc/guc_tables.c:2625
+#: utils/misc/guc_tables.c:2753
 msgid "Sets the maximum allowed idle time between queries, when in a transaction."
 msgstr "Встановлює максимально дозволений час очікування між запитами під час транзакції."
 
-#: utils/misc/guc_tables.c:2636
+#: utils/misc/guc_tables.c:2764
 msgid "Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."
-msgstr ""
+msgstr "Встановлює максимально дозволений час будь-якої транзакції в межах сесії (не підготовленої транзакцієї)."
 
-#: utils/misc/guc_tables.c:2647
+#: utils/misc/guc_tables.c:2775
 msgid "Sets the maximum allowed idle time between queries, when not in a transaction."
 msgstr "Встановлює максимально дозволений час очікування між запитами поза транзакцією."
 
-#: utils/misc/guc_tables.c:2658
+#: utils/misc/guc_tables.c:2786
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "Мінімальний вік рядків таблиці, при котрому VACUUM зможе їх закріпити."
 
-#: utils/misc/guc_tables.c:2668
+#: utils/misc/guc_tables.c:2796
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Вік, при котрому VACUUM повинен сканувати всю таблицю, щоб закріпити кортежі."
 
-#: utils/misc/guc_tables.c:2678
+#: utils/misc/guc_tables.c:2806
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "Мінімальний вік, при котрому VACUUM повинен закріпити MultiXactId в рядку таблиці."
 
-#: utils/misc/guc_tables.c:2688
+#: utils/misc/guc_tables.c:2816
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Вік Multixact, при котрому VACUUM повинен сканувати всю таблицю, щоб закріпити кортежі."
 
-#: utils/misc/guc_tables.c:2698
+#: utils/misc/guc_tables.c:2826
 msgid "Age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Вік, у якому VACUUM повинен спрацювати безпечно, щоб уникнути зациклення."
 
-#: utils/misc/guc_tables.c:2707
+#: utils/misc/guc_tables.c:2835
 msgid "Multixact age at which VACUUM should trigger failsafe to avoid a wraparound outage."
 msgstr "Вік Multixact, у якому VACUUM повинен спрацювати безпечно, щоб уникнути зациклення."
 
-#: utils/misc/guc_tables.c:2720
+#: utils/misc/guc_tables.c:2848
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Встановлює максимальну кілкість блокувань на транзакцію."
 
-#: utils/misc/guc_tables.c:2721
+#: utils/misc/guc_tables.c:2849
 msgid "The shared lock table is sized on the assumption that at most \"max_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
-msgstr ""
+msgstr "Розмір спільної таблиці блокування визначається з припущення, що в будь-який момент часу потрібно заблокувати не більше \"max_locks_per_transaction\" об'єктів на один серверний процес або підготовлену транзакцію."
 
-#: utils/misc/guc_tables.c:2732
+#: utils/misc/guc_tables.c:2860
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Встановлює максимальну кількість предикатних блокувань на транзакцію."
 
-#: utils/misc/guc_tables.c:2733
+#: utils/misc/guc_tables.c:2861
 msgid "The shared predicate lock table is sized on the assumption that at most \"max_pred_locks_per_transaction\" objects per server process or prepared transaction will need to be locked at any one time."
-msgstr ""
+msgstr "Розмір спільної таблиці блокування предикатів визначається з припущення, що за один раз потрібно заблокувати не більше \"max_pred_locks_per_transaction\" об'єктів на один серверний процес або підготовлену транзакцію."
 
-#: utils/misc/guc_tables.c:2744
+#: utils/misc/guc_tables.c:2872
 msgid "Sets the maximum number of predicate-locked pages and tuples per relation."
 msgstr "Встановлює максимальну кількість сторінок і кортежів, блокованих предикатними блокуваннями в одному відношенні."
 
-#: utils/misc/guc_tables.c:2745
+#: utils/misc/guc_tables.c:2873
 msgid "If more than this total of pages and tuples in the same relation are locked by a connection, those locks are replaced by a relation-level lock."
 msgstr "Якщо одним підключенням блокується більше цієї загальної кількості сторінок і кортежів, ці блокування замінюються блокуванням на рівні відношення."
 
-#: utils/misc/guc_tables.c:2755
+#: utils/misc/guc_tables.c:2883
 msgid "Sets the maximum number of predicate-locked tuples per page."
 msgstr "Встановлює максимальну кількість кортежів, блокованих предикатними блокуваннями в одній сторінці."
 
-#: utils/misc/guc_tables.c:2756
+#: utils/misc/guc_tables.c:2884
 msgid "If more than this number of tuples on the same page are locked by a connection, those locks are replaced by a page-level lock."
 msgstr "Якщо одним підключенням блокується більше цієї кількості кортежів на одній і тій же сторінці, ці блокування замінюються блокуванням на рівні сторінки."
 
-#: utils/misc/guc_tables.c:2766
+#: utils/misc/guc_tables.c:2894
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Встановлює максимально допустимий час, за котрий клієнт повинен завершити автентифікацію."
 
-#: utils/misc/guc_tables.c:2778
+#: utils/misc/guc_tables.c:2906
 msgid "Sets the amount of time to wait before authentication on connection startup."
 msgstr "Встановлює кількість часу для очікування перед автенифікацією під час запуску з'єднання."
 
-#: utils/misc/guc_tables.c:2790
+#: utils/misc/guc_tables.c:2918
 msgid "Sets the maximum number of allocated pages for NOTIFY / LISTEN queue."
 msgstr "Встановлює максимальну кількість виділених сторінок для черги NOTIFY / LISTEN."
 
-#: utils/misc/guc_tables.c:2800
+#: utils/misc/guc_tables.c:2928
 msgid "Buffer size for reading ahead in the WAL during recovery."
 msgstr "Розмір буфера для читання в WAL під час відновлення."
 
-#: utils/misc/guc_tables.c:2801
+#: utils/misc/guc_tables.c:2929
 msgid "Maximum distance to read ahead in the WAL to prefetch referenced data blocks."
 msgstr "Максимальна відстань до читання WAL, для попереднього отримання блоків, на які посилаються."
 
-#: utils/misc/guc_tables.c:2811
+#: utils/misc/guc_tables.c:2939
 msgid "Sets the size of WAL files held for standby servers."
 msgstr "Встановлює розмір WAL файлів, які потрібно зберігати для резервних серверів."
 
-#: utils/misc/guc_tables.c:2822
+#: utils/misc/guc_tables.c:2950
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Встановлює мінімальний розмір WAL при стисканні."
 
-#: utils/misc/guc_tables.c:2834
+#: utils/misc/guc_tables.c:2962
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Встановлює розмір WAL, при котрому ініціюється контрольна точка."
 
-#: utils/misc/guc_tables.c:2846
+#: utils/misc/guc_tables.c:2974
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "Встановлює максимальний час між автоматичними контрольними точками WAL."
 
-#: utils/misc/guc_tables.c:2857
+#: utils/misc/guc_tables.c:2985
 msgid "Sets the maximum time before warning if checkpoints triggered by WAL volume happen too frequently."
 msgstr "Встановлює максимальний час перед попередженням, якщо контрольні точки WAL відбуваються занадто часто."
 
-#: utils/misc/guc_tables.c:2859
-msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. Zero turns off the warning."
-msgstr "Записує в журнал серверу повідомлення, якщо контрольні точки, викликані переповненням файлів сегментів контрольних точок, з'являються частіше ніж цей проміжок часу. Нуль вимикає попередження."
+#: utils/misc/guc_tables.c:2987
+msgid "Write a message to the server log if checkpoints caused by the filling of WAL segment files happen more frequently than this amount of time. 0 disables the warning."
+msgstr "Записує повідомлення в журнал сервера, якщо контрольні точки, спричинені заповненням сегментів WAL, відбуваються частіше, ніж ця кількість часу. 0 вимикає попередження."
 
-#: utils/misc/guc_tables.c:2872 utils/misc/guc_tables.c:3090
-#: utils/misc/guc_tables.c:3144
+#: utils/misc/guc_tables.c:3000 utils/misc/guc_tables.c:3230
+#: utils/misc/guc_tables.c:3322
 msgid "Number of pages after which previously performed writes are flushed to disk."
 msgstr "Число сторінок, після досягнення якого раніше виконані операції запису скидаються на диск."
 
-#: utils/misc/guc_tables.c:2883
+#: utils/misc/guc_tables.c:3001 utils/misc/guc_tables.c:3231
+#: utils/misc/guc_tables.c:3323
+msgid "0 disables forced writeback."
+msgstr "0 вимикає примусовий зворотний запис."
+
+#: utils/misc/guc_tables.c:3011
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Встановлює кількість буферів дискових сторінок в спільній пам'яті для WAL."
 
-#: utils/misc/guc_tables.c:2884
-msgid "Specify -1 to have this value determined as a fraction of shared_buffers."
-msgstr ""
+#: utils/misc/guc_tables.c:3012
+msgid "-1 means use a fraction of \"shared_buffers\"."
+msgstr "-1 означає використовувати частину \"shared_buffers\"."
 
-#: utils/misc/guc_tables.c:2894
+#: utils/misc/guc_tables.c:3022
 msgid "Time between WAL flushes performed in the WAL writer."
 msgstr "Час між скиданням WAL в процесі, записуючого WAL."
 
-#: utils/misc/guc_tables.c:2905
+#: utils/misc/guc_tables.c:3033
 msgid "Amount of WAL written out by WAL writer that triggers a flush."
 msgstr "Обсяг WAL, оброблений пишучим WAL процесом, при котрому ініціюється скидання журналу на диск."
 
-#: utils/misc/guc_tables.c:2916
+#: utils/misc/guc_tables.c:3044
 msgid "Minimum size of new file to fsync instead of writing WAL."
 msgstr "Мінімальний розмір нового файлу для fsync замість записування WAL."
 
-#: utils/misc/guc_tables.c:2927
+#: utils/misc/guc_tables.c:3055
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "Встановлює максимальну кількість одночасно працюючих процесів передачі WAL."
 
-#: utils/misc/guc_tables.c:2938
+#: utils/misc/guc_tables.c:3066
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Встановлює максимальну кількість одночасно визначених слотів реплікації."
 
-#: utils/misc/guc_tables.c:2948
+#: utils/misc/guc_tables.c:3076
 msgid "Sets the maximum WAL size that can be reserved by replication slots."
 msgstr "Встановлює максимальний розмір WAL, який може бути зарезервований слотами реплікації."
 
-#: utils/misc/guc_tables.c:2949
-msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk."
-msgstr "Слоти реплікації будуть позначені як невдалі, і розблоковані сегменти для видалення або переробки, якщо цю кількість місця на диску займає WAL."
+#: utils/misc/guc_tables.c:3077
+msgid "Replication slots will be marked as failed, and segments released for deletion or recycling, if this much space is occupied by WAL on disk. -1 means no maximum."
+msgstr "Слоти реплікації будуть позначені як невдалі, а сегменти звільнені для видалення чи переробки, якщо стільки місця зайнято WAL на диску. -1 означає відсутність максимуму."
 
-#: utils/misc/guc_tables.c:2961
+#: utils/misc/guc_tables.c:3089
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "Встановлює максимальний час очікування реплікації WAL."
 
-#: utils/misc/guc_tables.c:2972
+#: utils/misc/guc_tables.c:3100
+msgid "Sets the duration a replication slot can remain idle before it is invalidated."
+msgstr "Встановлює тривалість, протягом якої слот реплікації може залишатися неактивним перед визнанням недійсним."
+
+#: utils/misc/guc_tables.c:3112
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr "Встановлює затримку в мілісекундах між затвердженням транзакцій і скиданням WAL на диск."
 
-#: utils/misc/guc_tables.c:2984
+#: utils/misc/guc_tables.c:3124
 msgid "Sets the minimum number of concurrent open transactions required before performing \"commit_delay\"."
-msgstr ""
+msgstr "Встановлює мінімальну кількість одночасно відкритих транзакцій, необхідних до виконання \"commit_delay\"."
 
-#: utils/misc/guc_tables.c:2995
+#: utils/misc/guc_tables.c:3135
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Встановлює кількість виведених чисел для значень з плаваючою точкою."
 
-#: utils/misc/guc_tables.c:2996
+#: utils/misc/guc_tables.c:3136
 msgid "This affects real, double precision, and geometric data types. A zero or negative parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate). Any value greater than zero selects precise output mode."
 msgstr "Це впливає на типи реальних, подвійної точності та геометричних даних. Нульове або від'ємне значення параметру додається до стандартної кількості цифр (FLT_DIG або DBL_DIG у відповідних випадках). Будь-яке значення більше нуля, обирає точний режим виводу."
 
-#: utils/misc/guc_tables.c:3008
-msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by log_statement_sample_rate."
-msgstr "Встановлює мінімальний час виконання, понад якого вибірка тверджень буде записуватись. Вибірка визначається log_statement_sample_rate."
+#: utils/misc/guc_tables.c:3148
+msgid "Sets the minimum execution time above which a sample of statements will be logged. Sampling is determined by \"log_statement_sample_rate\"."
+msgstr "Встановлює мінімальний час виконання, понад яким зразок запитів буде записуватися в журнал. Відбір визначається \"log_statement_sample_rate\"."
 
-#: utils/misc/guc_tables.c:3011
-msgid "Zero logs a sample of all queries. -1 turns this feature off."
-msgstr "При 0 (нуль) фіксує зразок всіх запитів. -1 вимикає цю функцію."
+#: utils/misc/guc_tables.c:3151
+msgid "-1 disables sampling. 0 means sample all statements."
+msgstr "-1 вимикає відбір. 0 означає відбір всіх операторів."
 
-#: utils/misc/guc_tables.c:3021
+#: utils/misc/guc_tables.c:3161
 msgid "Sets the minimum execution time above which all statements will be logged."
 msgstr "Встановлює мінімальний час виконання, понад якого всі твердження будуть записуватись."
 
-#: utils/misc/guc_tables.c:3023
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "При 0 (нуль) протоколюються всі запити. -1 вимикає цю функцію."
+#: utils/misc/guc_tables.c:3163
+msgid "-1 disables logging statement durations. 0 means log all statement durations."
+msgstr "-1 вимикає журналювання тривалості операторів. 0 означає журналювання всієї тривалості операторів."
 
-#: utils/misc/guc_tables.c:3033
+#: utils/misc/guc_tables.c:3173
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr "Встановлює мінімальний час виконання автоочистки, при перевищенні котрого ця дія фіксується в протоколі."
 
-#: utils/misc/guc_tables.c:3035
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "При 0 (нуль) протоколюються всі дії автоочистки. -1 вимикає журналювання автоочистки."
+#: utils/misc/guc_tables.c:3175
+msgid "-1 disables logging autovacuum actions. 0 means log all autovacuum actions."
+msgstr "-1 вимикає журналювання дій автоочистки. 0 означає журналювання всіх дій автоочистки."
 
-#: utils/misc/guc_tables.c:3045
+#: utils/misc/guc_tables.c:3185
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements."
 msgstr "Встановлює максимальну довжину в байтах даних, що реєструються для значень параметрів під час журналювання операторів."
 
-#: utils/misc/guc_tables.c:3047 utils/misc/guc_tables.c:3059
-msgid "-1 to print values in full."
-msgstr "-1 для друку значень в повному вигляді."
+#: utils/misc/guc_tables.c:3187 utils/misc/guc_tables.c:3199
+msgid "-1 means log values in full."
+msgstr "-1 означає повне журналювання значень."
 
-#: utils/misc/guc_tables.c:3057
+#: utils/misc/guc_tables.c:3197
 msgid "Sets the maximum length in bytes of data logged for bind parameter values when logging statements, on error."
 msgstr "Встановлює максимальну довжину в байтах, даних, що реєструються для значень параметрів під час журналювання операторів, у разі помилки."
 
-#: utils/misc/guc_tables.c:3069
+#: utils/misc/guc_tables.c:3209
 msgid "Background writer sleep time between rounds."
 msgstr "Час призупинення в процесі фонового запису між підходами."
 
-#: utils/misc/guc_tables.c:3080
+#: utils/misc/guc_tables.c:3220
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "Максимальна кількість LRU-сторінок, які скидаються за один підхід, в процесі фонового запису."
 
-#: utils/misc/guc_tables.c:3103
+#: utils/misc/guc_tables.c:3221
+msgid "0 disables background writing."
+msgstr "0 вимикає фонове записування."
+
+#: utils/misc/guc_tables.c:3243
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr "Кількість одночасних запитів, які можуть бути ефективно оброблені дисковою підсистемою."
 
-#: utils/misc/guc_tables.c:3117
+#: utils/misc/guc_tables.c:3244 utils/misc/guc_tables.c:3258
+msgid "0 disables simultaneous requests."
+msgstr "0 вимикає одночасні запити."
+
+#: utils/misc/guc_tables.c:3257
 msgid "A variant of \"effective_io_concurrency\" that is used for maintenance work."
-msgstr ""
+msgstr "Варіант \"effective_io_concurrency\", що використовується для роботи з обслуговування."
+
+#: utils/misc/guc_tables.c:3272
+msgid "Server-wide limit that clamps io_combine_limit."
+msgstr "Загальносерверне обмеження, що затискає io_combine_limit."
 
-#: utils/misc/guc_tables.c:3132
+#: utils/misc/guc_tables.c:3286
 msgid "Limit on the size of data reads and writes."
-msgstr ""
+msgstr "Обмеження на розмір зчитування та записування."
+
+#: utils/misc/guc_tables.c:3300
+msgid "Max number of IOs that one process can execute simultaneously."
+msgstr "Максимальна кількість вводу/виводу, яку може виконати одночасно один процес."
 
-#: utils/misc/guc_tables.c:3157
+#: utils/misc/guc_tables.c:3312
+msgid "Number of IO worker processes, for io_method=worker."
+msgstr "Кількість робочих процесів вводу/виводу, для io_method=worker."
+
+#: utils/misc/guc_tables.c:3335
 msgid "Maximum number of concurrent worker processes."
 msgstr "Максимальна кількість одночасно працюючих процесів."
 
-#: utils/misc/guc_tables.c:3169
+#: utils/misc/guc_tables.c:3347
 msgid "Maximum number of logical replication worker processes."
 msgstr "Максимальна кількість працюючих процесів логічної реплікації."
 
-#: utils/misc/guc_tables.c:3181
+#: utils/misc/guc_tables.c:3359
 msgid "Maximum number of table synchronization workers per subscription."
 msgstr "Максимальна кількість процесів синхронізації таблиць для однієї підписки."
 
-#: utils/misc/guc_tables.c:3193
+#: utils/misc/guc_tables.c:3371
 msgid "Maximum number of parallel apply workers per subscription."
 msgstr "Максимальна кількість паралельних процесів при підписці на одну підписку."
 
-#: utils/misc/guc_tables.c:3203
+#: utils/misc/guc_tables.c:3383
+msgid "Sets the maximum number of active replication origins."
+msgstr "Встановлює максимальну кількість активних джерел реплікації."
+
+#: utils/misc/guc_tables.c:3393
 msgid "Sets the amount of time to wait before forcing log file rotation."
 msgstr "Встановлює кількість часу для оновлення файлу журналу."
 
-#: utils/misc/guc_tables.c:3215
+#: utils/misc/guc_tables.c:3395
+msgid "0 disables time-based creation of new log files."
+msgstr "0 вимикає створення нових файлів журналу на основі часу."
+
+#: utils/misc/guc_tables.c:3405
 msgid "Sets the maximum size a log file can reach before being rotated."
 msgstr "Встановлює максимальний розмір файлу журналу, якого він може досягнути, до ротації."
 
-#: utils/misc/guc_tables.c:3227
+#: utils/misc/guc_tables.c:3407
+msgid "0 disables size-based creation of new log files."
+msgstr "0 вимикає створення нових файлів журналу на основі розміру."
+
+#: utils/misc/guc_tables.c:3417
 msgid "Shows the maximum number of function arguments."
 msgstr "Показує максимальну кількість аргументів функції."
 
-#: utils/misc/guc_tables.c:3238
+#: utils/misc/guc_tables.c:3428
 msgid "Shows the maximum number of index keys."
 msgstr "Показує максимальну кількість ключів в індексі."
 
-#: utils/misc/guc_tables.c:3249
+#: utils/misc/guc_tables.c:3439
 msgid "Shows the maximum identifier length."
 msgstr "Показує максимальну довжину ідентифікатора."
 
-#: utils/misc/guc_tables.c:3260
+#: utils/misc/guc_tables.c:3450
 msgid "Shows the size of a disk block."
 msgstr "Показує розмір дискового блоку."
 
-#: utils/misc/guc_tables.c:3271
+#: utils/misc/guc_tables.c:3461
 msgid "Shows the number of pages per disk file."
 msgstr "Показує кількість сторінок в одному дисковому файлі."
 
-#: utils/misc/guc_tables.c:3282
+#: utils/misc/guc_tables.c:3472
 msgid "Shows the block size in the write ahead log."
 msgstr "Показує розмір блоку в журналі WAL."
 
-#: utils/misc/guc_tables.c:3293
+#: utils/misc/guc_tables.c:3483
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr "Встановлює час очікування перед повторною спробою звертання до WAL після невдачі."
 
-#: utils/misc/guc_tables.c:3305
+#: utils/misc/guc_tables.c:3495
 msgid "Shows the size of write ahead log segments."
 msgstr "Показує розмір сегментів WAL."
 
-#: utils/misc/guc_tables.c:3318
+#: utils/misc/guc_tables.c:3508
 msgid "Time for which WAL summary files should be kept."
 msgstr "Час, протягом якого слід зберігати зведені файли WAL."
 
-#: utils/misc/guc_tables.c:3331
+#: utils/misc/guc_tables.c:3509
+msgid "0 disables automatic summary file deletion."
+msgstr "0 вимикає автоматичне видалення файлів зведення."
+
+#: utils/misc/guc_tables.c:3521
 msgid "Time to sleep between autovacuum runs."
 msgstr "Час призупинення між запусками автоочистки."
 
-#: utils/misc/guc_tables.c:3341
+#: utils/misc/guc_tables.c:3531
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "Мінімальна кількість оновлень або видалень кортежів перед очисткою."
 
-#: utils/misc/guc_tables.c:3350
-msgid "Minimum number of tuple inserts prior to vacuum, or -1 to disable insert vacuums."
-msgstr "Мінімальна кількість вставлених кортежів перед очищенням, або -1 щоб вимкнути очищення після вставки."
+#: utils/misc/guc_tables.c:3540
+msgid "Maximum number of tuple updates or deletes prior to vacuum."
+msgstr "Максимальна кількість оновлень або видалень кортежів перед очисткою."
 
-#: utils/misc/guc_tables.c:3359
+#: utils/misc/guc_tables.c:3541
+msgid "-1 disables the maximum threshold."
+msgstr "-1 вимикає максимальний поріг."
+
+#: utils/misc/guc_tables.c:3549
+msgid "Minimum number of tuple inserts prior to vacuum."
+msgstr "Мінімальна кількість вставлень кортежів перед очисткою."
+
+#: utils/misc/guc_tables.c:3550
+msgid "-1 disables insert vacuums."
+msgstr "-1 вимикає очистку після вставлень."
+
+#: utils/misc/guc_tables.c:3558
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "Мінімальна кількість вставлень, оновлень або видалень кортежів перед аналізом."
 
-#: utils/misc/guc_tables.c:3369
+#: utils/misc/guc_tables.c:3568
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "Вік, при котрому необхідна автоочистка таблиці для запобігання зациклення ID транзакцій."
 
-#: utils/misc/guc_tables.c:3381
+#: utils/misc/guc_tables.c:3580
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "Вік Multixact, при котрому необхідна автоочистка таблиці для запобігання зациклення multixact."
 
-#: utils/misc/guc_tables.c:3391
+#: utils/misc/guc_tables.c:3590
+msgid "Sets the number of backend slots to allocate for autovacuum workers."
+msgstr "Встановлює кількість слотів сервера для виділення працівникам автоочистки."
+
+#: utils/misc/guc_tables.c:3599
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "Встановлює максимальну кількість одночасно працюючих робочих процесів автоочистки."
 
-#: utils/misc/guc_tables.c:3401
+#: utils/misc/guc_tables.c:3609
 msgid "Sets the maximum number of parallel processes per maintenance operation."
 msgstr "Встановлює максимальну кількість паралельних процесів на одну операцію обслуговування."
 
-#: utils/misc/guc_tables.c:3411
+#: utils/misc/guc_tables.c:3619
 msgid "Sets the maximum number of parallel processes per executor node."
 msgstr "Встановлює максимальну кількість паралельних процесів на вузол виконавця."
 
-#: utils/misc/guc_tables.c:3422
+#: utils/misc/guc_tables.c:3630
 msgid "Sets the maximum number of parallel workers that can be active at one time."
 msgstr "Встановлює максимальну кількість паралельних процесів, які можуть бути активні в один момент."
 
-#: utils/misc/guc_tables.c:3433
+#: utils/misc/guc_tables.c:3641
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "Встановлює максимальний об'єм пам'яті для кожного робочого процесу автоочистки."
 
-#: utils/misc/guc_tables.c:3444
+#: utils/misc/guc_tables.c:3642
+msgid "-1 means use \"maintenance_work_mem\"."
+msgstr "-1 означає використовувати \"maintenance_work_mem\"."
+
+#: utils/misc/guc_tables.c:3652
 msgid "Time between issuing TCP keepalives."
 msgstr "Час між видачею TCP keepalives."
 
-#: utils/misc/guc_tables.c:3445 utils/misc/guc_tables.c:3456
-#: utils/misc/guc_tables.c:3580
-msgid "A value of 0 uses the system default."
-msgstr "Значення 0 (нуль) використовує систему за замовчуванням."
+#: utils/misc/guc_tables.c:3653 utils/misc/guc_tables.c:3664
+#: utils/misc/guc_tables.c:3787 utils/misc/guc_tables.c:3798
+msgid "0 means use the system default."
+msgstr "0 означає використовувати системне значення за замовчуванням."
 
-#: utils/misc/guc_tables.c:3455
+#: utils/misc/guc_tables.c:3663
 msgid "Time between TCP keepalive retransmits."
 msgstr "Час між повтореннями TCP keepalive."
 
-#: utils/misc/guc_tables.c:3466
+#: utils/misc/guc_tables.c:3674
 msgid "SSL renegotiation is no longer supported; this can only be 0."
 msgstr "Повторне узгодження SSL більше не підтримується; єдине допустиме значення - 0 (нуль)."
 
-#: utils/misc/guc_tables.c:3477
+#: utils/misc/guc_tables.c:3685
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Максимальна кількість повторень TCP keepalive."
 
-#: utils/misc/guc_tables.c:3478
-msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
-msgstr "Кількість послідовних повторень keepalive може бути втрачена, перед тим як підключення буде вважатись \"мертвим\". Значення 0 (нуль) використовує систему за замовчуванням."
+#: utils/misc/guc_tables.c:3686
+msgid "Number of consecutive keepalive retransmits that can be lost before a connection is considered dead. 0 means use the system default."
+msgstr "Кількість послідовних повторних передач keepalive, які можуть бути втрачені до того, як з'єднання вважатиметься мертвим. 0 означає використання системного значення за замовчуванням."
 
-#: utils/misc/guc_tables.c:3489
+#: utils/misc/guc_tables.c:3697
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "Встановлює максимально допустимий результат для точного пошуку з використанням GIN."
 
-#: utils/misc/guc_tables.c:3500
+#: utils/misc/guc_tables.c:3698
+msgid "0 means no limit."
+msgstr "0 означає відсутність обмеження."
+
+#: utils/misc/guc_tables.c:3707
 msgid "Sets the planner's assumption about the total size of the data caches."
 msgstr "Встановлює планувальнику припустимий загальний розмір кешей даних."
 
-#: utils/misc/guc_tables.c:3501
+#: utils/misc/guc_tables.c:3708
 msgid "That is, the total size of the caches (kernel cache and shared buffers) used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr "Мається на увазі загальний розмір кешей (кеша ядра і спільних буферів), які використовуються для файлів даних PostgreSQL. Розмір задається в дискових сторінках, звичайно це 8 КБ."
 
-#: utils/misc/guc_tables.c:3512
+#: utils/misc/guc_tables.c:3719
 msgid "Sets the minimum amount of table data for a parallel scan."
 msgstr "Встановлює мінімальний обсяг даних в таблиці для паралельного сканування."
 
-#: utils/misc/guc_tables.c:3513
+#: utils/misc/guc_tables.c:3720
 msgid "If the planner estimates that it will read a number of table pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Якщо планувальник вважає, що він прочитає меньше сторінок таблиці, ніж задано цим обмеженням, паралельне сканування не буде розглядатись."
 
-#: utils/misc/guc_tables.c:3523
+#: utils/misc/guc_tables.c:3730
 msgid "Sets the minimum amount of index data for a parallel scan."
 msgstr "Встановлює мінімальний обсяг даних в індексі для паралельного сканування."
 
-#: utils/misc/guc_tables.c:3524
+#: utils/misc/guc_tables.c:3731
 msgid "If the planner estimates that it will read a number of index pages too small to reach this limit, a parallel scan will not be considered."
 msgstr "Якщо планувальник вважає, що він прочитає меньше сторінок індексу, ніж задано цим обмеженням, паралельне сканування не буде розглядатись."
 
-#: utils/misc/guc_tables.c:3535
+#: utils/misc/guc_tables.c:3742
 msgid "Shows the server version as an integer."
 msgstr "Показує версію сервера у вигляді цілого числа."
 
-#: utils/misc/guc_tables.c:3546
+#: utils/misc/guc_tables.c:3753
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "Записує до журналу перевищення тимчасовими файлами заданого розміру в КБ."
 
-#: utils/misc/guc_tables.c:3547
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr "0 (нуль) фіксує всі файли. -1 вимикає цю функцію (за замовчуванням)."
+#: utils/misc/guc_tables.c:3754
+msgid "-1 disables logging temporary files. 0 means log all temporary files."
+msgstr "-1 вимикає журналювання тимчасових файлів. 0 означає журналювання всіх тимчасових файлів."
 
-#: utils/misc/guc_tables.c:3557
+#: utils/misc/guc_tables.c:3764
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Встановлює розмір, зарезервований для pg_stat_activity.query, в байтах."
 
-#: utils/misc/guc_tables.c:3568
+#: utils/misc/guc_tables.c:3775
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Встановлює максимальний розмір списку-очікування для GIN-індексу."
 
-#: utils/misc/guc_tables.c:3579
+#: utils/misc/guc_tables.c:3786
 msgid "TCP user timeout."
 msgstr "Таймаут користувача TCP."
 
-#: utils/misc/guc_tables.c:3590
+#: utils/misc/guc_tables.c:3797
 msgid "The size of huge page that should be requested."
 msgstr "Розмір величезної сторінки, яку необхідно затребувати."
 
-#: utils/misc/guc_tables.c:3601
+#: utils/misc/guc_tables.c:3808
 msgid "Aggressively flush system caches for debugging purposes."
 msgstr "Агресивно скидати системні кеші для цілей налагодження."
 
-#: utils/misc/guc_tables.c:3624
+#: utils/misc/guc_tables.c:3809
+msgid "0 means use normal caching behavior."
+msgstr "0 означає використання звичайної поведінки кешування."
+
+#: utils/misc/guc_tables.c:3831
 msgid "Sets the time interval between checks for disconnection while running queries."
 msgstr "Встановлює інтервал часу між перевірками відключення під час виконання запитів."
 
-#: utils/misc/guc_tables.c:3635
+#: utils/misc/guc_tables.c:3832
+msgid "0 disables connection checks."
+msgstr "0 вимикає перевірки з'єднання."
+
+#: utils/misc/guc_tables.c:3842
 msgid "Time between progress updates for long-running startup operations."
 msgstr "Час між оновленнями прогресу для довготриваючих операцій запуску."
 
-#: utils/misc/guc_tables.c:3637
-msgid "0 turns this feature off."
-msgstr "0 вимикає цю функцію."
+#: utils/misc/guc_tables.c:3844
+msgid "0 disables progress updates."
+msgstr "0 вимикає оновлення прогресу."
 
-#: utils/misc/guc_tables.c:3647
+#: utils/misc/guc_tables.c:3854
 msgid "Sets the iteration count for SCRAM secret generation."
 msgstr "Встановлює кількість ітерацій для секретного генерування SCRAM."
 
-#: utils/misc/guc_tables.c:3667
+#: utils/misc/guc_tables.c:3874
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr "Встановлює для планувальника орієнтир вартості послідовного читання дискових сторінок."
 
-#: utils/misc/guc_tables.c:3678
+#: utils/misc/guc_tables.c:3885
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr "Встановлює для планувальника орієнтир вартості непослідовного читання дискових сторінок."
 
-#: utils/misc/guc_tables.c:3689
+#: utils/misc/guc_tables.c:3896
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "Встановлює для планувальника орієнтир вартості обробки кожного кортежу (рядка)."
 
-#: utils/misc/guc_tables.c:3700
+#: utils/misc/guc_tables.c:3907
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr "Встановлює для планувальника орієнтир вартості обробки кожного елементу індекса під час сканування індексу."
 
-#: utils/misc/guc_tables.c:3711
+#: utils/misc/guc_tables.c:3918
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr "Встановлює для планувальника орієнтир вартості обробки кожного оператора або виклику функції."
 
-#: utils/misc/guc_tables.c:3722
+#: utils/misc/guc_tables.c:3929
 msgid "Sets the planner's estimate of the cost of passing each tuple (row) from worker to leader backend."
 msgstr "Встановлює для планувальника приблизну вартість передавання кожного кортежу (рядка) від робочого процесу вихідному процесу."
 
-#: utils/misc/guc_tables.c:3733
+#: utils/misc/guc_tables.c:3940
 msgid "Sets the planner's estimate of the cost of starting up worker processes for parallel query."
 msgstr "Встановлює для планувальника орієнтир вартості запуску робочих процесів для паралельного запиту."
 
-#: utils/misc/guc_tables.c:3745
+#: utils/misc/guc_tables.c:3952
 msgid "Perform JIT compilation if query is more expensive."
 msgstr "Якщо запит дорожчий, виконується JIT-компіляція."
 
-#: utils/misc/guc_tables.c:3746
+#: utils/misc/guc_tables.c:3953
 msgid "-1 disables JIT compilation."
 msgstr "-1 вимикає JIT-компіляцію."
 
-#: utils/misc/guc_tables.c:3756
+#: utils/misc/guc_tables.c:3963
 msgid "Optimize JIT-compiled functions if query is more expensive."
 msgstr "Оптимізувати функції JIT-compiled, якщо запит дорожчий."
 
-#: utils/misc/guc_tables.c:3757
+#: utils/misc/guc_tables.c:3964
 msgid "-1 disables optimization."
 msgstr "-1 вимикає оптимізацію."
 
-#: utils/misc/guc_tables.c:3767
+#: utils/misc/guc_tables.c:3974
 msgid "Perform JIT inlining if query is more expensive."
 msgstr "Якщо запит дорожчий, виконується вбудовування JIT."
 
-#: utils/misc/guc_tables.c:3768
+#: utils/misc/guc_tables.c:3975
 msgid "-1 disables inlining."
 msgstr "-1 вимикає вбудовування."
 
-#: utils/misc/guc_tables.c:3778
+#: utils/misc/guc_tables.c:3985
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr "Встановлює для планувальника орієнтир частки необхідних рядків курсора в загальній кількості."
 
-#: utils/misc/guc_tables.c:3790
+#: utils/misc/guc_tables.c:3997
 msgid "Sets the planner's estimate of the average size of a recursive query's working table."
 msgstr "Встановлює для планувальника орієнтир середнього розміру робочої таблиці рекурсивного запиту."
 
-#: utils/misc/guc_tables.c:3802
+#: utils/misc/guc_tables.c:4009
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: вибірковий тиск в популяції."
 
-#: utils/misc/guc_tables.c:3813
+#: utils/misc/guc_tables.c:4020
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: відправна значення для випадкового вибору шляху."
 
-#: utils/misc/guc_tables.c:3824
+#: utils/misc/guc_tables.c:4031
 msgid "Multiple of \"work_mem\" to use for hash tables."
-msgstr ""
+msgstr "Декілька \"work_mem\" для використання хеш-таблиць."
 
-#: utils/misc/guc_tables.c:3835
+#: utils/misc/guc_tables.c:4042
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "Множник для середньої кількості використаних буферів, який визначає кількість буферів, які звільняються за один підхід."
 
-#: utils/misc/guc_tables.c:3845
+#: utils/misc/guc_tables.c:4052
 msgid "Sets the seed for random-number generation."
 msgstr "Встановлює відправне значення для генератора випадкових чисел."
 
-#: utils/misc/guc_tables.c:3856
+#: utils/misc/guc_tables.c:4063
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Затримка вартості очистки в мілісекундах."
 
-#: utils/misc/guc_tables.c:3867
+#: utils/misc/guc_tables.c:4074
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Затримка вартості очистки в мілісекундах, для автоочистки."
 
-#: utils/misc/guc_tables.c:3878
+#: utils/misc/guc_tables.c:4075
+msgid "-1 means use \"vacuum_cost_delay\"."
+msgstr "-1 означає використання \"vacuum_cost_delay\"."
+
+#: utils/misc/guc_tables.c:4085
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "Кількість оновлень або видалень кортежів до reltuples, яка визначає потребу в очистці."
 
-#: utils/misc/guc_tables.c:3888
+#: utils/misc/guc_tables.c:4095
 msgid "Number of tuple inserts prior to vacuum as a fraction of reltuples."
 msgstr "Кількість вставлень кортежів до reltuples, яка визначає потребу в очистці."
 
-#: utils/misc/guc_tables.c:3898
+#: utils/misc/guc_tables.c:4105
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "Кількість вставлень, оновлень або видалень кортежів до reltuples, яка визначає потребу в аналізі."
 
-#: utils/misc/guc_tables.c:3908
+#: utils/misc/guc_tables.c:4115
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr "Час тривалості очищення \"брудних\" буферів під час контрольної точки до інтервалу контрольних точок."
 
-#: utils/misc/guc_tables.c:3918
+#: utils/misc/guc_tables.c:4125
 msgid "Fraction of statements exceeding \"log_min_duration_sample\" to be logged."
-msgstr ""
+msgstr "Частка тверджень, перевищує \"log_min_duration_sample\", що підлягає запису."
 
-#: utils/misc/guc_tables.c:3919
+#: utils/misc/guc_tables.c:4126
 msgid "Use a value between 0.0 (never log) and 1.0 (always log)."
 msgstr "Використайте значення між 0.0 (ніколи не записувати) і 1.0 (завжди записувати)."
 
-#: utils/misc/guc_tables.c:3928
+#: utils/misc/guc_tables.c:4135
 msgid "Sets the fraction of transactions from which to log all statements."
 msgstr "Встановлює частину транзакцій, від яких необхідно журналювати всі команди."
 
-#: utils/misc/guc_tables.c:3929
+#: utils/misc/guc_tables.c:4136
 msgid "Use a value between 0.0 (never log) and 1.0 (log all statements for all transactions)."
 msgstr "Використайте значення між 0.0 (ніколи не записувати) і 1.0 (записувати всі команди для всіх транзакцій)."
 
-#: utils/misc/guc_tables.c:3948
+#: utils/misc/guc_tables.c:4146
+msgid "Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."
+msgstr "Частка сторінок у відношенні, які vacuum може сканувати та не заморозити перед відключенням активного сканування."
+
+#: utils/misc/guc_tables.c:4147
+msgid "A value of 0.0 disables eager scanning and a value of 1.0 will eagerly scan up to 100 percent of the all-visible pages in the relation. If vacuum successfully freezes these pages, the cap is lower than 100 percent, because the goal is to amortize page freezing across multiple vacuums."
+msgstr "Значення 0.0 відключає активне сканування, а значення 1.0 буде активно сканувати до 100 відсотків всіх видимих сторінок у відношенні. Якщо vacuum успішно заморожує ці сторінки, обмеження менше 100 відсотків, оскільки мета полягає в амортизації заморожування сторінок по кількох vacuum."
+
+#: utils/misc/guc_tables.c:4165
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "Встановлює команду оболонки, яка буде викликатись для архівації файлу WAL."
 
-#: utils/misc/guc_tables.c:3949
-msgid "This is used only if \"archive_library\" is not set."
-msgstr "Це використовується лише, якщо \"archive_library\" не встановлено."
+#: utils/misc/guc_tables.c:4166
+msgid "An empty string means use \"archive_library\"."
+msgstr "Порожній рядок означає використання \"archive_library\"."
 
-#: utils/misc/guc_tables.c:3958
+#: utils/misc/guc_tables.c:4175
 msgid "Sets the library that will be called to archive a WAL file."
 msgstr "Встановлює бібліотеку, яка буде викликана для архівування файлу WAL."
 
-#: utils/misc/guc_tables.c:3959
-msgid "An empty string indicates that \"archive_command\" should be used."
-msgstr "Порожній рядок вказує на те, що слід використовувати \"archive_command\"."
+#: utils/misc/guc_tables.c:4176
+msgid "An empty string means use \"archive_command\"."
+msgstr "Порожній рядок означає використання \"archive_command\"."
 
-#: utils/misc/guc_tables.c:3968
+#: utils/misc/guc_tables.c:4185
 msgid "Sets the shell command that will be called to retrieve an archived WAL file."
 msgstr "Встановлює команду оболонки, яка буде викликана для отримання архівованого файлу WAL."
 
-#: utils/misc/guc_tables.c:3978
+#: utils/misc/guc_tables.c:4195
 msgid "Sets the shell command that will be executed at every restart point."
 msgstr "Встановлює команду оболонки, яка буде виконуватися в кожній точці перезапуску."
 
-#: utils/misc/guc_tables.c:3988
+#: utils/misc/guc_tables.c:4205
 msgid "Sets the shell command that will be executed once at the end of recovery."
 msgstr "Встановлює команду оболонки, яка буде виконуватися один раз в кінці відновлення."
 
-#: utils/misc/guc_tables.c:3998
+#: utils/misc/guc_tables.c:4215
 msgid "Specifies the timeline to recover into."
 msgstr "Вказує лінію часу для відновлення."
 
-#: utils/misc/guc_tables.c:4008
+#: utils/misc/guc_tables.c:4225
 msgid "Set to \"immediate\" to end recovery as soon as a consistent state is reached."
 msgstr "Встановіть на \"негайно\" щоб закінчити відновлення як тільки буде досягнуто узгодженого стану."
 
-#: utils/misc/guc_tables.c:4017
+#: utils/misc/guc_tables.c:4234
 msgid "Sets the transaction ID up to which recovery will proceed."
 msgstr "Встановлює ідентифікатор транзакції, до якої буде продовжуватися відновлення."
 
-#: utils/misc/guc_tables.c:4026
+#: utils/misc/guc_tables.c:4243
 msgid "Sets the time stamp up to which recovery will proceed."
 msgstr "Встановлює позначку часу, до якої буде продовжуватися відновлення."
 
-#: utils/misc/guc_tables.c:4035
+#: utils/misc/guc_tables.c:4252
 msgid "Sets the named restore point up to which recovery will proceed."
 msgstr "Встановлює назву точки відновлення, до якої буде продовжуватися відновлення."
 
-#: utils/misc/guc_tables.c:4044
+#: utils/misc/guc_tables.c:4261
 msgid "Sets the LSN of the write-ahead log location up to which recovery will proceed."
 msgstr "Встановлює номер LSN розташування випереджувального журналювання, до якого буде продовжуватися відновлення."
 
-#: utils/misc/guc_tables.c:4054
+#: utils/misc/guc_tables.c:4271
 msgid "Sets the connection string to be used to connect to the sending server."
 msgstr "Встановлює рядок підключення який буде використовуватися для підключення до серверу надсилання."
 
-#: utils/misc/guc_tables.c:4065
+#: utils/misc/guc_tables.c:4282
 msgid "Sets the name of the replication slot to use on the sending server."
 msgstr "Встановлює назву слота реплікації, для використання на сервері надсилання."
 
-#: utils/misc/guc_tables.c:4075
+#: utils/misc/guc_tables.c:4292
 msgid "Sets the client's character set encoding."
 msgstr "Встановлює кодування символів, використовуване клієнтом."
 
-#: utils/misc/guc_tables.c:4086
+#: utils/misc/guc_tables.c:4303
 msgid "Controls information prefixed to each log line."
 msgstr "Визначає інформацію префікса кожного рядка протокола."
 
-#: utils/misc/guc_tables.c:4087
-msgid "If blank, no prefix is used."
-msgstr "При пустому значенні, префікс також відсутній."
+#: utils/misc/guc_tables.c:4304
+msgid "An empty string means no prefix."
+msgstr "Порожній рядок означає відсутність префіксу."
 
-#: utils/misc/guc_tables.c:4096
+#: utils/misc/guc_tables.c:4313
 msgid "Sets the time zone to use in log messages."
 msgstr "Встановлює часовий пояс для виведення часу в повідомленях протокола."
 
-#: utils/misc/guc_tables.c:4106
+#: utils/misc/guc_tables.c:4323
 msgid "Sets the display format for date and time values."
 msgstr "Встановлює формат виведення значень часу і дат."
 
-#: utils/misc/guc_tables.c:4107
+#: utils/misc/guc_tables.c:4324
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Також визначає багатозначні задані дати, які вводяться."
 
-#: utils/misc/guc_tables.c:4118
+#: utils/misc/guc_tables.c:4335
 msgid "Sets the default table access method for new tables."
 msgstr "Встановлює метод доступу до таблиці за замовчуванням для нових таблиць."
 
-#: utils/misc/guc_tables.c:4129
+#: utils/misc/guc_tables.c:4346
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "Встановлює табличний простір за замовчуванням, для створення таблиць і індексів."
 
-#: utils/misc/guc_tables.c:4130
-msgid "An empty string selects the database's default tablespace."
-msgstr "Пустий рядок вибирає табличний простір за замовчуванням бази даних."
+#: utils/misc/guc_tables.c:4347 utils/misc/guc_tables.c:4358
+msgid "An empty string means use the database's default tablespace."
+msgstr "Порожній рядок означає використання табличного простору бази даних за замовчуванням."
 
-#: utils/misc/guc_tables.c:4140
+#: utils/misc/guc_tables.c:4357
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "Встановлює табличний простір(простори) для використання в тимчасових таблицях і файлах сортування."
 
-#: utils/misc/guc_tables.c:4151
+#: utils/misc/guc_tables.c:4368
 msgid "Sets whether a CREATEROLE user automatically grants the role to themselves, and with which options."
 msgstr "Задає, чи буде користувач CREATEROLE автоматично призначати собі цю роль і з якими параметрами."
 
-#: utils/misc/guc_tables.c:4163
+#: utils/misc/guc_tables.c:4370
+msgid "An empty string disables automatic self grants."
+msgstr "Порожній рядок вимикає автоматичні самонадання прав."
+
+#: utils/misc/guc_tables.c:4380
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Встановлює шлях для динамічно завантажуваних модулів."
 
-#: utils/misc/guc_tables.c:4164
+#: utils/misc/guc_tables.c:4381
 msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
 msgstr "Якщо динамічно завантажений модуль потрібно відкрити і у вказаному імені немає компонента каталогу (наприклад, ім'я не містить символ \"/\"), система буде шукати цей шлях у вказаному файлі."
 
-#: utils/misc/guc_tables.c:4177
+#: utils/misc/guc_tables.c:4394
+msgid "Sets the path for extension control files."
+msgstr "Встановлює шлях до файлів керування розширеннями."
+
+#: utils/misc/guc_tables.c:4395
+msgid "The remaining extension script and secondary control files are then loaded from the same directory where the primary control file was found."
+msgstr "Решта скриптів розширень і вторинні файли керування завантажуються з того ж каталогу, де знайдений основний файл керування."
+
+#: utils/misc/guc_tables.c:4406
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Встановлює розташування файлу з ключем Kerberos для даного сервера."
 
-#: utils/misc/guc_tables.c:4188
+#: utils/misc/guc_tables.c:4417
 msgid "Sets the Bonjour service name."
 msgstr "Встановлює ім'я служби Bonjour."
 
-#: utils/misc/guc_tables.c:4198
+#: utils/misc/guc_tables.c:4418
+msgid "An empty string means use the computer name."
+msgstr "Порожній рядок означає використання імені комп'ютера."
+
+#: utils/misc/guc_tables.c:4427
 msgid "Sets the language in which messages are displayed."
 msgstr "Встановлює мову виведених повідомлень."
 
-#: utils/misc/guc_tables.c:4208
+#: utils/misc/guc_tables.c:4428 utils/misc/guc_tables.c:4438
+#: utils/misc/guc_tables.c:4448 utils/misc/guc_tables.c:4458
+msgid "An empty string means use the operating system setting."
+msgstr "Порожній рядок означає використання налаштування операційної системи."
+
+#: utils/misc/guc_tables.c:4437
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Встановлює локалізацію для форматування грошових сум."
 
-#: utils/misc/guc_tables.c:4218
+#: utils/misc/guc_tables.c:4447
 msgid "Sets the locale for formatting numbers."
 msgstr "Встановлює локалізацію для форматування чисел."
 
-#: utils/misc/guc_tables.c:4228
+#: utils/misc/guc_tables.c:4457
 msgid "Sets the locale for formatting date and time values."
 msgstr "Встановлює локалізацію для форматування значень дати і часу."
 
-#: utils/misc/guc_tables.c:4238
+#: utils/misc/guc_tables.c:4467
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Список спільних бібліотек, попередньо завантажених до кожного внутрішнього серверу."
 
-#: utils/misc/guc_tables.c:4249
+#: utils/misc/guc_tables.c:4478
 msgid "Lists shared libraries to preload into server."
 msgstr "Список спільних бібліотек, попередньо завантажених до серверу."
 
-#: utils/misc/guc_tables.c:4260
+#: utils/misc/guc_tables.c:4489
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Список непривілейованих спільних бібліотек, попередньо завантажених до кожного внутрішнього серверу."
 
-#: utils/misc/guc_tables.c:4271
+#: utils/misc/guc_tables.c:4500
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Встановлює порядок пошуку схеми для імен, які не є схемо-кваліфікованими."
 
-#: utils/misc/guc_tables.c:4283
+#: utils/misc/guc_tables.c:4512
 msgid "Shows the server (database) character set encoding."
 msgstr "Показує набір символів кодування сервера (бази даних)."
 
-#: utils/misc/guc_tables.c:4295
+#: utils/misc/guc_tables.c:4524
 msgid "Shows the server version."
 msgstr "Показує версію сервера."
 
-#: utils/misc/guc_tables.c:4307
+#: utils/misc/guc_tables.c:4536
 msgid "Sets the current role."
 msgstr "Встановлює чинну роль."
 
-#: utils/misc/guc_tables.c:4319
+#: utils/misc/guc_tables.c:4548
 msgid "Sets the session user name."
 msgstr "Встановлює ім'я користувача в сеансі."
 
-#: utils/misc/guc_tables.c:4330
+#: utils/misc/guc_tables.c:4559
 msgid "Sets the destination for server log output."
 msgstr "Встановлює, куди буде виводитися протокол серверу."
 
-#: utils/misc/guc_tables.c:4331
+#: utils/misc/guc_tables.c:4560
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", depending on the platform."
 msgstr "Дійсні значення - це комбінації \"stderr\", \"syslog\", \"csvlog\", \"jsonlog\", і \"eventlog\", в залежності від платформи."
 
-#: utils/misc/guc_tables.c:4342
+#: utils/misc/guc_tables.c:4571
 msgid "Sets the destination directory for log files."
 msgstr "Встановлює каталог призначення для файлів журналу."
 
-#: utils/misc/guc_tables.c:4343
+#: utils/misc/guc_tables.c:4572
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "Шлях може бути абсолютним або вказуватися відносно каталогу даних."
 
-#: utils/misc/guc_tables.c:4353
+#: utils/misc/guc_tables.c:4582
 msgid "Sets the file name pattern for log files."
 msgstr "Встановлює шаблон імені для файлів журналу."
 
-#: utils/misc/guc_tables.c:4364
+#: utils/misc/guc_tables.c:4593
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Встановлює ім'я програми для ідентифікації повідомлень PostgreSQL в syslog."
 
-#: utils/misc/guc_tables.c:4375
+#: utils/misc/guc_tables.c:4604
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "Встановлює ім'я програми для ідентифікації повідомлень PostgreSQL в журналі подій."
 
-#: utils/misc/guc_tables.c:4386
+#: utils/misc/guc_tables.c:4615
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Встановлює часовий пояс для відображення та інтерпретації позначок часу."
 
-#: utils/misc/guc_tables.c:4396
+#: utils/misc/guc_tables.c:4625
 msgid "Selects a file of time zone abbreviations."
 msgstr "Вибирає файл з скороченими іменами часових поясів."
 
-#: utils/misc/guc_tables.c:4406
+#: utils/misc/guc_tables.c:4635
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Встановлює відповідальну групу Unix-сокету."
 
-#: utils/misc/guc_tables.c:4407
-msgid "The owning user of the socket is always the user that starts the server."
-msgstr "Відповідальний користувач сокету це завжди той користувач який запустив сервер."
+#: utils/misc/guc_tables.c:4636
+msgid "The owning user of the socket is always the user that starts the server. An empty string means use the user's default group."
+msgstr "Власником сокету завжди є користувач, який запускає сервер. Порожній рядок означає використання групи користувача за замовчуванням."
 
-#: utils/misc/guc_tables.c:4417
+#: utils/misc/guc_tables.c:4646
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Встановлює каталоги, де будуть створюватись Unix-сокети."
 
-#: utils/misc/guc_tables.c:4428
+#: utils/misc/guc_tables.c:4657
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Встановлює ім'я хосту або IP-адресу для прив'язки."
 
-#: utils/misc/guc_tables.c:4443
+#: utils/misc/guc_tables.c:4672
 msgid "Sets the server's data directory."
 msgstr "Встановлює каталог даних серверу."
 
-#: utils/misc/guc_tables.c:4454
+#: utils/misc/guc_tables.c:4683
 msgid "Sets the server's main configuration file."
 msgstr "Встановлює основний файл конфігурації серверу."
 
-#: utils/misc/guc_tables.c:4465
+#: utils/misc/guc_tables.c:4694
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Встановлює \"hba\" файл конфігурації серверу."
 
-#: utils/misc/guc_tables.c:4476
+#: utils/misc/guc_tables.c:4705
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Встановлює \"ident\" файл конфігурації серверу."
 
-#: utils/misc/guc_tables.c:4487
+#: utils/misc/guc_tables.c:4716
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Записує ідентифікатор процесу (PID) postmaster у вказаний файл."
 
-#: utils/misc/guc_tables.c:4498
+#: utils/misc/guc_tables.c:4727
 msgid "Shows the name of the SSL library."
 msgstr "Показує назву бібліотеки SSL."
 
-#: utils/misc/guc_tables.c:4513
+#: utils/misc/guc_tables.c:4742
 msgid "Location of the SSL server certificate file."
 msgstr "Розташування файла сертифікату сервера для SSL."
 
-#: utils/misc/guc_tables.c:4523
+#: utils/misc/guc_tables.c:4752
 msgid "Location of the SSL server private key file."
 msgstr "Розташування файла з закритим ключем сервера для SSL."
 
-#: utils/misc/guc_tables.c:4533
+#: utils/misc/guc_tables.c:4762
 msgid "Location of the SSL certificate authority file."
 msgstr "Розташування файла центру сертифікації для SSL."
 
-#: utils/misc/guc_tables.c:4543
+#: utils/misc/guc_tables.c:4772
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Розташування файла зі списком відкликаних сертфікатів для SSL."
 
-#: utils/misc/guc_tables.c:4553
+#: utils/misc/guc_tables.c:4782
 msgid "Location of the SSL certificate revocation list directory."
 msgstr "Розташування каталогу списку відкликаних сертифікатів SSL."
 
-#: utils/misc/guc_tables.c:4563
+#: utils/misc/guc_tables.c:4792
 msgid "Number of synchronous standbys and list of names of potential synchronous ones."
 msgstr "Кількість потенційно синхронних режимів очікування і список їх імен."
 
-#: utils/misc/guc_tables.c:4574
+#: utils/misc/guc_tables.c:4803
 msgid "Sets default text search configuration."
 msgstr "Встановлює конфігурацію текстового пошуку за замовчуванням."
 
-#: utils/misc/guc_tables.c:4584
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Встановлює список дозволених шифрів для SSL."
+#: utils/misc/guc_tables.c:4813
+msgid "Sets the list of allowed TLSv1.3 cipher suites."
+msgstr "Встановлює список дозволених наборів шифрів TLSv1.3."
 
-#: utils/misc/guc_tables.c:4599
-msgid "Sets the curve to use for ECDH."
-msgstr "Встановлює криву для ECDH."
+#: utils/misc/guc_tables.c:4814
+msgid "An empty string means use the default cipher suites."
+msgstr "Порожній рядок означає використовувати набори шифрів за замовчуванням."
 
-#: utils/misc/guc_tables.c:4614
+#: utils/misc/guc_tables.c:4824
+msgid "Sets the list of allowed TLSv1.2 (and lower) ciphers."
+msgstr "Встановлює список дозволених шифрів TLSv1.2 (та нижчих версій)."
+
+#: utils/misc/guc_tables.c:4839
+msgid "Sets the group(s) to use for Diffie-Hellman key exchange."
+msgstr "Встановлює групу(и) для використання в обміні ключами Diffie-Hellman."
+
+#: utils/misc/guc_tables.c:4840
+msgid "Multiple groups can be specified using a colon-separated list."
+msgstr "Кілька груп можна вказати, використовуючи список, розділений двокрапками."
+
+#: utils/misc/guc_tables.c:4854
 msgid "Location of the SSL DH parameters file."
 msgstr "Розташування файла з параметрами SSL DH."
 
-#: utils/misc/guc_tables.c:4625
+#: utils/misc/guc_tables.c:4855
+msgid "An empty string means use compiled-in default parameters."
+msgstr "Порожній рядок означає використання вбудованих параметрів за замовчуванням."
+
+#: utils/misc/guc_tables.c:4865
 msgid "Command to obtain passphrases for SSL."
 msgstr "Команда, що дозволяє отримати парольну фразу для SSL."
 
-#: utils/misc/guc_tables.c:4636
+#: utils/misc/guc_tables.c:4866
+msgid "An empty string means use the built-in prompting mechanism."
+msgstr "Порожній рядок означає використання вбудованого механізму запитування."
+
+#: utils/misc/guc_tables.c:4876
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "Встановлює ім'я програми, яке буде повідомлятись у статистиці і протоколах."
 
-#: utils/misc/guc_tables.c:4647
+#: utils/misc/guc_tables.c:4887
 msgid "Sets the name of the cluster, which is included in the process title."
 msgstr "Встановлює ім'я кластеру, яке буде включене до заголовка процесу."
 
-#: utils/misc/guc_tables.c:4658
+#: utils/misc/guc_tables.c:4898
 msgid "Sets the WAL resource managers for which WAL consistency checks are done."
 msgstr "Встановлює менеджерів ресурсу WAL, для яких виконано перевірки узгодженості WAL."
 
-#: utils/misc/guc_tables.c:4659
+#: utils/misc/guc_tables.c:4899
 msgid "Full-page images will be logged for all data blocks and cross-checked against the results of WAL replay."
 msgstr "При цьому до журналу будуть записуватись зображення повнихс сторінок для всіх блоків даних для перевірки з результатами відтворення WAL."
 
-#: utils/misc/guc_tables.c:4669
+#: utils/misc/guc_tables.c:4909
 msgid "JIT provider to use."
 msgstr "Використовувати провайдер JIT."
 
-#: utils/misc/guc_tables.c:4680
+#: utils/misc/guc_tables.c:4920
 msgid "Log backtrace for errors in these functions."
 msgstr "Відстежувати записи помилок у ціх функціях."
 
-#: utils/misc/guc_tables.c:4691
+#: utils/misc/guc_tables.c:4931
 msgid "Use direct I/O for file access."
 msgstr "Використовувати прямий ввід для доступу до файлу."
 
-#: utils/misc/guc_tables.c:4702
+#: utils/misc/guc_tables.c:4932
+msgid "An empty string disables direct I/O."
+msgstr "Порожній рядок відключає прямий ввід/вивід."
+
+#: utils/misc/guc_tables.c:4942
 msgid "Lists streaming replication standby server replication slot names that logical WAL sender processes will wait for."
-msgstr ""
+msgstr "Відображає список імен слотів реплікації, які очікують процесу логічного відправника WAL."
 
-#: utils/misc/guc_tables.c:4704
+#: utils/misc/guc_tables.c:4944
 msgid "Logical WAL sender processes will send decoded changes to output plugins only after the specified replication slots have confirmed receiving WAL."
-msgstr ""
+msgstr "Логічні процеси відправки WAL будуть відправляти декодовані зміни до плагінів виводу лише після підтвердження отримування вказаних слотів реплікації (WAL)."
 
-#: utils/misc/guc_tables.c:4716
+#: utils/misc/guc_tables.c:4956
 msgid "Prohibits access to non-system relations of specified kinds."
-msgstr ""
+msgstr "Забороняє доступ до несистемних відносин вказаних типів."
+
+#: utils/misc/guc_tables.c:4967
+msgid "Lists libraries that may be called to validate OAuth v2 bearer tokens."
+msgstr "Перелічує бібліотеки, які можуть бути викликані для валідації токенів носія OAuth v2."
 
-#: utils/misc/guc_tables.c:4736
+#: utils/misc/guc_tables.c:4978
+msgid "Logs specified aspects of connection establishment and setup."
+msgstr "Журналює вказані аспекти встановлення та налаштування з'єднання."
+
+#: utils/misc/guc_tables.c:4999
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Встановлює, чи дозволене використання \"\\\" в текстових рядках."
 
-#: utils/misc/guc_tables.c:4746
+#: utils/misc/guc_tables.c:5009
 msgid "Sets the output format for bytea."
 msgstr "Встановлює формат виводу для типу bytea."
 
-#: utils/misc/guc_tables.c:4756
+#: utils/misc/guc_tables.c:5019
 msgid "Sets the message levels that are sent to the client."
 msgstr "Встановлює рівень повідомлень, переданих клієнту."
 
-#: utils/misc/guc_tables.c:4757 utils/misc/guc_tables.c:4853
-#: utils/misc/guc_tables.c:4864
+#: utils/misc/guc_tables.c:5020 utils/misc/guc_tables.c:5116
+#: utils/misc/guc_tables.c:5127
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr "Кожен рівень включає всі наступні рівні. Чим вище рівень, тим менше повідомлень надіслано."
 
-#: utils/misc/guc_tables.c:4767
+#: utils/misc/guc_tables.c:5030
 msgid "Enables in-core computation of query identifiers."
 msgstr "Вмикає внутрішнє обчислення ідентифікаторів запиту."
 
-#: utils/misc/guc_tables.c:4777
+#: utils/misc/guc_tables.c:5040
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "Дає змогу планувальнику оптимізувати запити, використовуючи обмеження."
 
-#: utils/misc/guc_tables.c:4778
+#: utils/misc/guc_tables.c:5041
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "Сканування таблиці буде пропущено, якщо її обмеження гарантують, що запиту не відповідають ніякі рядки."
 
-#: utils/misc/guc_tables.c:4789
+#: utils/misc/guc_tables.c:5052
 msgid "Sets the default compression method for compressible values."
 msgstr "Встановлює метод стискання за замовчуванням для стисливих значень."
 
-#: utils/misc/guc_tables.c:4800
+#: utils/misc/guc_tables.c:5063
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Встановлює рівень ізоляції транзакції для кожної нової транзакції."
 
-#: utils/misc/guc_tables.c:4810
+#: utils/misc/guc_tables.c:5073
 msgid "Sets the current transaction's isolation level."
 msgstr "Встановлює чинний рівень ізоляції транзакцій."
 
-#: utils/misc/guc_tables.c:4821
+#: utils/misc/guc_tables.c:5084
 msgid "Sets the display format for interval values."
 msgstr "Встановлює формат відображення внутрішніх значень."
 
-#: utils/misc/guc_tables.c:4832
+#: utils/misc/guc_tables.c:5095
 msgid "Log level for reporting invalid ICU locale strings."
 msgstr "Рівень протоколу для повідомлення про невірні рядки локалі ICU."
 
-#: utils/misc/guc_tables.c:4842
+#: utils/misc/guc_tables.c:5105
 msgid "Sets the verbosity of logged messages."
 msgstr "Встановлює детальність повідомлень, які протоколюються."
 
-#: utils/misc/guc_tables.c:4852
+#: utils/misc/guc_tables.c:5115
 msgid "Sets the message levels that are logged."
 msgstr "Встанолвює рівні повідомлень, які протоколюються."
 
-#: utils/misc/guc_tables.c:4863
+#: utils/misc/guc_tables.c:5126
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "Вмикає протоколювання для всіх операторів, виконаних з помилкою цього або вище рівня."
 
-#: utils/misc/guc_tables.c:4874
+#: utils/misc/guc_tables.c:5137
 msgid "Sets the type of statements logged."
 msgstr "Встановлює тип операторів, які протоколюються."
 
-#: utils/misc/guc_tables.c:4884
+#: utils/misc/guc_tables.c:5147
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "Встановлює отримувача повідомлень, які відправляються до syslog."
 
-#: utils/misc/guc_tables.c:4895
+#: utils/misc/guc_tables.c:5158
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Встановлює поведінку для тригерів і правил перезапису для сеансу."
 
-#: utils/misc/guc_tables.c:4905
+#: utils/misc/guc_tables.c:5168
 msgid "Sets the current transaction's synchronization level."
 msgstr "Встановлює рівень синхронізації поточної транзакції."
 
-#: utils/misc/guc_tables.c:4915
+#: utils/misc/guc_tables.c:5178
 msgid "Allows archiving of WAL files using \"archive_command\"."
-msgstr ""
+msgstr "Дозволяє архівацію файлів WAL, використовуючи \"archive_command\"."
 
-#: utils/misc/guc_tables.c:4925
+#: utils/misc/guc_tables.c:5188
 msgid "Sets the action to perform upon reaching the recovery target."
 msgstr "Встновлює дію яку потрібно виконати в разі досягнення мети відновлення."
 
-#: utils/misc/guc_tables.c:4935
+#: utils/misc/guc_tables.c:5198
 msgid "Collects function-level statistics on database activity."
 msgstr "Збирає статистику активності в базі даних на рівні функцій."
 
-#: utils/misc/guc_tables.c:4946
+#: utils/misc/guc_tables.c:5209
 msgid "Sets the consistency of accesses to statistics data."
 msgstr "Встановлює послідовність доступу до даних статистики."
 
-#: utils/misc/guc_tables.c:4956
+#: utils/misc/guc_tables.c:5219
 msgid "Compresses full-page writes written in WAL file with specified method."
 msgstr "Стискає повносторінкові записи, записані у файлі WAL за допомогою вказаного методу."
 
-#: utils/misc/guc_tables.c:4966
+#: utils/misc/guc_tables.c:5229
 msgid "Sets the level of information written to the WAL."
 msgstr "Встановлює рівень інформації, яка записується до WAL."
 
-#: utils/misc/guc_tables.c:4976
+#: utils/misc/guc_tables.c:5239
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Вибирає використовуване впровадження динамічної спільної пам'яті."
 
-#: utils/misc/guc_tables.c:4986
+#: utils/misc/guc_tables.c:5249
 msgid "Selects the shared memory implementation used for the main shared memory region."
 msgstr "Вибирає впровадження спільної пам'яті, що використовується для основної області спільної пам'яті."
 
-#: utils/misc/guc_tables.c:4996
+#: utils/misc/guc_tables.c:5259
+msgid "Selects the file copy method."
+msgstr "Вибирає метод копіювання файлів."
+
+#: utils/misc/guc_tables.c:5269
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "Вибирає метод примусового запису оновлень в WAL на диск."
 
-#: utils/misc/guc_tables.c:5006
+#: utils/misc/guc_tables.c:5279
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "Встановлює, як повинні кодуватись двійкові значення в XML."
 
-#: utils/misc/guc_tables.c:5016
+#: utils/misc/guc_tables.c:5289
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr "Встановлює, чи слід розглядати XML-дані в неявних операціях аналізу і серіалізації як документи або як фрагменти змісту."
 
-#: utils/misc/guc_tables.c:5027
+#: utils/misc/guc_tables.c:5300
 msgid "Use of huge pages on Linux or Windows."
 msgstr "Використовувати величезні сторінки в Linux або Windows."
 
-#: utils/misc/guc_tables.c:5037
+#: utils/misc/guc_tables.c:5310
 msgid "Indicates the status of huge pages."
 msgstr "Показує статус великих сторінок."
 
-#: utils/misc/guc_tables.c:5048
+#: utils/misc/guc_tables.c:5321
 msgid "Prefetch referenced blocks during recovery."
 msgstr "Попередньо вибирати пов'язані блоки під час відновлення."
 
-#: utils/misc/guc_tables.c:5049
+#: utils/misc/guc_tables.c:5322
 msgid "Look ahead in the WAL to find references to uncached data."
 msgstr "Шукати в WAL посилання на незакешовані дані."
 
-#: utils/misc/guc_tables.c:5058
+#: utils/misc/guc_tables.c:5331
 msgid "Forces the planner's use parallel query nodes."
 msgstr "Змушує планувальник використовувати паралельні вузли запитів."
 
-#: utils/misc/guc_tables.c:5059
+#: utils/misc/guc_tables.c:5332
 msgid "This can be useful for testing the parallel query infrastructure by forcing the planner to generate plans that contain nodes that perform tuple communication between workers and the main process."
 msgstr "Це може бути корисно для тестування інфраструктури паралельних запитів, змушуючи планувальник генерувати плани, які містять вузли, що виконують зв'язок кортежів між робітниками та основним процесом."
 
-#: utils/misc/guc_tables.c:5071
+#: utils/misc/guc_tables.c:5344
 msgid "Chooses the algorithm for encrypting passwords."
 msgstr "Виберіть алгоритм для шифрування паролів."
 
-#: utils/misc/guc_tables.c:5081
+#: utils/misc/guc_tables.c:5354
 msgid "Controls the planner's selection of custom or generic plan."
 msgstr "Контролює вибір планувальником спеціального або загального плану."
 
-#: utils/misc/guc_tables.c:5082
+#: utils/misc/guc_tables.c:5355
 msgid "Prepared statements can have custom and generic plans, and the planner will attempt to choose which is better.  This can be set to override the default behavior."
 msgstr "Підготовлені оператори можуть мати спеціальні або загальні плани, і планувальник спробує вибрати, який краще. Це може бути встановлено для зміни поведінки за замовчуванням."
 
-#: utils/misc/guc_tables.c:5094
+#: utils/misc/guc_tables.c:5367
 msgid "Sets the minimum SSL/TLS protocol version to use."
 msgstr "Встановлює мінімальну версію протоколу SSL/TLS для використання."
 
-#: utils/misc/guc_tables.c:5106
+#: utils/misc/guc_tables.c:5379
 msgid "Sets the maximum SSL/TLS protocol version to use."
 msgstr "Встановлює максимальну версію протоколу SSL/TLS для використання."
 
-#: utils/misc/guc_tables.c:5118
+#: utils/misc/guc_tables.c:5391
 msgid "Sets the method for synchronizing the data directory before crash recovery."
 msgstr "Встановлює метод для синхронізації каталогу даних перед аварійним відновленням."
 
-#: utils/misc/guc_tables.c:5127
+#: utils/misc/guc_tables.c:5400
 msgid "Forces immediate streaming or serialization of changes in large transactions."
 msgstr "Забезпечує негайну потокову передачу або серіалізацію змін у великих транзакціях."
 
-#: utils/misc/guc_tables.c:5128
+#: utils/misc/guc_tables.c:5401
 msgid "On the publisher, it allows streaming or serializing each change in logical decoding. On the subscriber, it allows serialization of all changes to files and notifies the parallel apply workers to read and apply them at the end of the transaction."
 msgstr "На стороні видавця це дозволяє передавати в потоковому режимі або серіалізувати кожну зміну в логічному декодуванні. На стороні абонента це дозволяє серіалізувати всі зміни у файлах і сповіщає працівників паралельних робочих процесів про необхідність прочитати і застосувати їх в кінці транзакції."
 
+#: utils/misc/guc_tables.c:5413
+msgid "Selects the method for executing asynchronous I/O."
+msgstr "Вибирає метод виконання асинхронного вводу/виводу."
+
 #: utils/misc/help_config.c:129
 #, c-format
 msgid "internal error: unrecognized run-time parameter type\n"
@@ -30224,6 +31749,26 @@ msgstr "запит буде обмежений політикою безпеки
 msgid "To disable the policy for the table's owner, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 msgstr "Щоб вимкнути політику для власника таблиці, використайте ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
+#: utils/misc/stack_depth.c:101
+#, c-format
+msgid "stack depth limit exceeded"
+msgstr "перевищено ліміт глибини стека"
+
+#: utils/misc/stack_depth.c:102
+#, c-format
+msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
+msgstr "Збільште параметр конфігурації \"max_stack_depth\" (поточне значення %d КБ), попередньо переконавшись, що ОС надає достатній розмір стеку."
+
+#: utils/misc/stack_depth.c:149
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %zdkB."
+msgstr "\"max_stack_depth\" не повинен перевищувати %zdkB."
+
+#: utils/misc/stack_depth.c:151
+#, c-format
+msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
+msgstr "Збільшіть ліміт глибини стека в системі через команду \"ulimit -s\" або через локальний еквівалент."
+
 #: utils/misc/timeout.c:520
 #, c-format
 msgid "cannot add more timeout reasons"
@@ -30239,57 +31784,57 @@ msgstr "скорочення часового поясу \"%s\" занадто 
 msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr "зсув часового поясу %d поза діапазоном у файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:112
+#: utils/misc/tzparser.c:113
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr "пропущено скорочення часового поясу в файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:121
+#: utils/misc/tzparser.c:122
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr "пропущено зсув часового поясу в файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:133
+#: utils/misc/tzparser.c:134
 #, c-format
 msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
 msgstr "неприпустиме число зсуву часового поясу в файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:169
+#: utils/misc/tzparser.c:170
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
 msgstr "неприпустимий синтаксис у файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:237
+#: utils/misc/tzparser.c:238
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
 msgstr "скорочення часового поясу \"%s\" визначено неодноразово"
 
-#: utils/misc/tzparser.c:239
+#: utils/misc/tzparser.c:240
 #, c-format
 msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
 msgstr "Запис у файлі часового поясу \"%s\", рядок %d, конфліктує з записом у файлі \"%s\", рядок %d."
 
-#: utils/misc/tzparser.c:301
+#: utils/misc/tzparser.c:302
 #, c-format
 msgid "invalid time zone file name \"%s\""
 msgstr "неприпустиме ім'я файла часового поясу \"%s\""
 
-#: utils/misc/tzparser.c:314
+#: utils/misc/tzparser.c:315
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr "ліміт рекурсії файла часового поясу перевищено у файлі \"%s\""
 
-#: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
+#: utils/misc/tzparser.c:354 utils/misc/tzparser.c:367
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
 msgstr "не вдалося прочитати файл часового поясу \"%s\": %m"
 
-#: utils/misc/tzparser.c:377
+#: utils/misc/tzparser.c:378
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
 msgstr "занадто довгий рядок у файлі часового поясу \"%s\", рядок %d"
 
-#: utils/misc/tzparser.c:401
+#: utils/misc/tzparser.c:403
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "в @INCLUDE не вказано ім'я файла у файлі часового поясу \"%s\", рядок %d"
@@ -30305,12 +31850,12 @@ msgstr "Помилка під час створення контексту па
 msgid "could not attach to dynamic shared area"
 msgstr "не вдалося підключитись до динамічно-спільної області"
 
-#: utils/mmgr/mcxt.c:1155
+#: utils/mmgr/mcxt.c:1163
 #, c-format
 msgid "Failed on request of size %zu in memory context \"%s\"."
 msgstr "Помилка в запиті розміру %zu в контексті пам'яті \"%s\"."
 
-#: utils/mmgr/mcxt.c:1299
+#: utils/mmgr/mcxt.c:1319
 #, c-format
 msgid "logging memory contexts of PID %d"
 msgstr "журналювання контекстів пам'яті PID %d"
@@ -30345,15 +31890,15 @@ msgstr "видалити активний портал \"%s\" не можна"
 msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
 msgstr "не можна виконати PREPARE для транзакції, яка створила курсор WITH HOLD"
 
-#: utils/mmgr/portalmem.c:1229
+#: utils/mmgr/portalmem.c:1232
 #, c-format
 msgid "cannot perform transaction commands inside a cursor loop that is not read-only"
 msgstr "виконати команди транзакції всередині циклу з курсором, який не є \"лише для читання\", не можна"
 
 #: utils/sort/logtape.c:266 utils/sort/logtape.c:287
 #, c-format
-msgid "could not seek to block %lld of temporary file"
-msgstr "не може намагатися заблокувати %lld тимчасового файлу"
+msgid "could not seek to block %<PRId64> of temporary file"
+msgstr "не вдалося знайти блок %<PRId64> тимчасового файлу"
 
 #: utils/sort/sharedtuplestore.c:466
 #, c-format
@@ -30365,101 +31910,101 @@ msgstr "неочікуваний блок у тимчасовому файлі 
 msgid "could not seek to block %u in shared tuplestore temporary file"
 msgstr "не вдалося знайти для блокування %u у тимчасовому файлі зі спільного сховища кортежів"
 
-#: utils/sort/tuplesort.c:2372
+#: utils/sort/tuplesort.c:2340
 #, c-format
 msgid "cannot have more than %d runs for an external sort"
 msgstr "кількість виконуючих процесів для зовнішнього сортування не може перевищувати %d"
 
-#: utils/sort/tuplesortvariants.c:1552
+#: utils/sort/tuplesortvariants.c:1671
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "не вдалося створити унікальний індекс \"%s\""
 
-#: utils/sort/tuplesortvariants.c:1554
+#: utils/sort/tuplesortvariants.c:1673
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "Ключ %s дублюється."
 
-#: utils/sort/tuplesortvariants.c:1555
+#: utils/sort/tuplesortvariants.c:1674
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Дублікати ключів існують."
 
-#: utils/sort/tuplestore.c:518 utils/sort/tuplestore.c:528
-#: utils/sort/tuplestore.c:869 utils/sort/tuplestore.c:973
-#: utils/sort/tuplestore.c:1037 utils/sort/tuplestore.c:1054
-#: utils/sort/tuplestore.c:1256 utils/sort/tuplestore.c:1321
-#: utils/sort/tuplestore.c:1330
+#: utils/sort/tuplestore.c:552 utils/sort/tuplestore.c:562
+#: utils/sort/tuplestore.c:921 utils/sort/tuplestore.c:1025
+#: utils/sort/tuplestore.c:1089 utils/sort/tuplestore.c:1106
+#: utils/sort/tuplestore.c:1308 utils/sort/tuplestore.c:1373
+#: utils/sort/tuplestore.c:1382
 #, c-format
 msgid "could not seek in tuplestore temporary file"
 msgstr "не вдалося знайти у тимчасовому файлі зі сховища кортежів"
 
-#: utils/time/snapmgr.c:536
+#: utils/time/snapmgr.c:568
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "Вихідна транзакція вже не виконується."
 
-#: utils/time/snapmgr.c:1136
+#: utils/time/snapmgr.c:1154
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "експортувати знімок з підтранзакції не можна"
 
-#: utils/time/snapmgr.c:1296 utils/time/snapmgr.c:1301
-#: utils/time/snapmgr.c:1306 utils/time/snapmgr.c:1321
-#: utils/time/snapmgr.c:1326 utils/time/snapmgr.c:1331
-#: utils/time/snapmgr.c:1346 utils/time/snapmgr.c:1351
-#: utils/time/snapmgr.c:1356 utils/time/snapmgr.c:1470
-#: utils/time/snapmgr.c:1486 utils/time/snapmgr.c:1511
+#: utils/time/snapmgr.c:1314 utils/time/snapmgr.c:1319
+#: utils/time/snapmgr.c:1324 utils/time/snapmgr.c:1339
+#: utils/time/snapmgr.c:1344 utils/time/snapmgr.c:1349
+#: utils/time/snapmgr.c:1364 utils/time/snapmgr.c:1369
+#: utils/time/snapmgr.c:1374 utils/time/snapmgr.c:1488
+#: utils/time/snapmgr.c:1504 utils/time/snapmgr.c:1529
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "неприпустимі дані знімку в файлі \"%s\""
 
-#: utils/time/snapmgr.c:1393
+#: utils/time/snapmgr.c:1411
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT повинна викликатись перед будь-яким запитом"
 
-#: utils/time/snapmgr.c:1402
+#: utils/time/snapmgr.c:1420
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "транзакція, яка імпортує знімок, повинна мати рівень ізоляції SERIALIZABLE або REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1411
+#: utils/time/snapmgr.c:1429
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "неприпустимий ідентифікатор знімка: \"%s\""
 
-#: utils/time/snapmgr.c:1426
+#: utils/time/snapmgr.c:1444
 #, c-format
 msgid "snapshot \"%s\" does not exist"
 msgstr "знімок \"%s\" не існує"
 
-#: utils/time/snapmgr.c:1524
+#: utils/time/snapmgr.c:1542
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "серіалізована транзакція не може імпортувати знімок з не серіалізованої транзакції"
 
-#: utils/time/snapmgr.c:1528
+#: utils/time/snapmgr.c:1546
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "серіалізована транзакція в режимі \"читання-запис\" не може імпортувати знімок з транзакції в режимі \"тільки читання\""
 
-#: utils/time/snapmgr.c:1543
+#: utils/time/snapmgr.c:1561
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "імпортувати знімок з іншої бази даних не можна"
 
-#: gram.y:1231
+#: gram.y:1222
 #, c-format
 msgid "UNENCRYPTED PASSWORD is no longer supported"
 msgstr "UNENCRYPTED PASSWORD більше не підтримується"
 
-#: gram.y:1232
+#: gram.y:1223
 #, c-format
 msgid "Remove UNENCRYPTED to store the password in encrypted form instead."
 msgstr "Видаліть UNENCRYPTED, щоб зберегти пароль у зашифрованій формі."
 
-#: gram.y:1559 gram.y:1575
+#: gram.y:1550 gram.y:1566
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS не може включати елементи схеми"
@@ -30469,403 +32014,410 @@ msgstr "CREATE SCHEMA IF NOT EXISTS не може включати елемен
 msgid "current database cannot be changed"
 msgstr "поточна база даних не може бути змінена"
 
-#: gram.y:1860
+#: gram.y:1868
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "інтервал, який задає часовий пояс, повинен бути HOUR або HOUR TO MINUTE"
 
-#: gram.y:2487
+#: gram.y:2500
 #, c-format
 msgid "column number must be in range from 1 to %d"
 msgstr "номер стовпця повинен бути в діапазоні від 1 до %d"
 
-#: gram.y:3083
+#: gram.y:2675
+#, c-format
+msgid "constraints cannot be altered to be NOT VALID"
+msgstr "обмеження не можуть бути змінені на NOT VALID"
+
+#: gram.y:3125
 #, c-format
 msgid "sequence option \"%s\" not supported here"
 msgstr "параметр послідовності \"%s\" тут не підтримується"
 
-#: gram.y:3122
+#: gram.y:3164
 #, c-format
 msgid "modulus for hash partition provided more than once"
 msgstr "модуль для геш-секції вказано неодноразово"
 
-#: gram.y:3131
+#: gram.y:3173
 #, c-format
 msgid "remainder for hash partition provided more than once"
 msgstr "решта для геш-секції вказана неодноразово"
 
-#: gram.y:3138
+#: gram.y:3180
 #, c-format
 msgid "unrecognized hash partition bound specification \"%s\""
 msgstr "нерозпізнана специфікація границі геш-секції \"%s\""
 
-#: gram.y:3146
+#: gram.y:3188
 #, c-format
 msgid "modulus for hash partition must be specified"
 msgstr "потрібно вказати модуль для геш-секції"
 
-#: gram.y:3150
+#: gram.y:3193
 #, c-format
 msgid "remainder for hash partition must be specified"
 msgstr "потрібно вказати решту для геш-секції"
 
-#: gram.y:3358 gram.y:3392
+#: gram.y:3402 gram.y:3436
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT не допускається з PROGRAM"
 
-#: gram.y:3364
+#: gram.y:3408
 #, c-format
 msgid "WHERE clause not allowed with COPY TO"
 msgstr "Речення WHERE не дозволяється використовувати з COPY TO"
 
-#: gram.y:3712 gram.y:3719 gram.y:13023 gram.y:13031
+#: gram.y:3756 gram.y:3763 gram.y:13168 gram.y:13176
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL при створенні тимчасових таблиць застаріло"
 
-#: gram.y:3995
+#: gram.y:4045
 #, c-format
 msgid "for a generated column, GENERATED ALWAYS must be specified"
 msgstr "для згенерованого стовпця, потрібно вказати GENERATED ALWAYS"
 
-#: gram.y:4432
+#: gram.y:4546
 #, c-format
 msgid "a column list with %s is only supported for ON DELETE actions"
 msgstr "список стовпців з %s підтримується лише для дій ON DELETE"
 
-#: gram.y:5151
+#: gram.y:5265
 #, c-format
 msgid "CREATE EXTENSION ... FROM is no longer supported"
 msgstr "CREATE EXTENSION ... FROM більше не підтримується"
 
-#: gram.y:5849
+#: gram.y:5963
 #, c-format
 msgid "unrecognized row security option \"%s\""
 msgstr "нерозпізнаний параметр безпеки рядка \"%s\""
 
-#: gram.y:5850
+#: gram.y:5964
 #, c-format
 msgid "Only PERMISSIVE or RESTRICTIVE policies are supported currently."
 msgstr "Наразі підтримуються лише політики PERMISSIVE або RESTRICTIVE."
 
-#: gram.y:5935
+#: gram.y:6049
 #, c-format
 msgid "CREATE OR REPLACE CONSTRAINT TRIGGER is not supported"
 msgstr "CREATE OR REPLACE CONSTRAINT TRIGGER не підтримується"
 
-#: gram.y:5972
+#: gram.y:6087
 msgid "duplicate trigger events specified"
 msgstr "вказані події тригера повторюються"
 
-#: gram.y:6121
+#: gram.y:6237
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "конфліктуючі властивості обмеження"
 
-#: gram.y:6220
+#: gram.y:6338
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION ще не реалізований"
 
-#: gram.y:6537
+#: gram.y:6656
 #, c-format
 msgid "dropping an enum value is not implemented"
 msgstr "відкидання значення переліку не реалізовано"
 
-#: gram.y:6655
-#, c-format
-msgid "RECHECK is no longer required"
-msgstr "RECHECK більше не потребується"
-
-#: gram.y:6656
-#, c-format
-msgid "Update your data type."
-msgstr "Поновіть ваш тип даних."
-
-#: gram.y:8529
+#: gram.y:8636
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "агрегатні функції не можуть мати вихідних аргументів"
 
-#: gram.y:11221 gram.y:11240
+#: gram.y:11329 gram.y:11348
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION не підтримується для рекурсивних подань"
 
-#: gram.y:13162
+#: gram.y:13315
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "Синтаксис LIMIT #,# не підтримується"
 
-#: gram.y:13163
+#: gram.y:13316
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Використайте окремі речення LIMIT і OFFSET."
 
-#: gram.y:14038
+#: gram.y:14203
 #, c-format
 msgid "only one DEFAULT value is allowed"
 msgstr "допускається лише одне значення DEFAULT"
 
-#: gram.y:14047
+#: gram.y:14212
 #, c-format
 msgid "only one PATH value per column is allowed"
 msgstr "для стовпця допускається лише одне значення PATH"
 
-#: gram.y:14056
+#: gram.y:14221
 #, c-format
 msgid "conflicting or redundant NULL / NOT NULL declarations for column \"%s\""
 msgstr "конфліктуючі або надлишкові оголошення NULL / NOT NULL для стовпця \"%s\""
 
-#: gram.y:14065
+#: gram.y:14230
 #, c-format
 msgid "unrecognized column option \"%s\""
 msgstr "нерозпізнаний параметр стовпця \"%s\""
 
-#: gram.y:14147
+#: gram.y:14263
+#, c-format
+msgid "option name \"%s\" cannot be used in XMLTABLE"
+msgstr "ім'я параметру \"%s\" не може використовуватись в XMLTABLE"
+
+#: gram.y:14319
 #, c-format
 msgid "only string constants are supported in JSON_TABLE path specification"
-msgstr ""
+msgstr "у специфікації шляху JSON_TABLE підтримуються лише рядкові константи"
 
-#: gram.y:14469
+#: gram.y:14641
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "точність для типу float повинна бути мінімум 1 біт"
 
-#: gram.y:14478
+#: gram.y:14650
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "точність для типу float повинна бути меньше 54 біт"
 
-#: gram.y:14995
+#: gram.y:15167
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "неправильна кількість параметрів у лівій частині виразу OVERLAPS"
 
-#: gram.y:15000
+#: gram.y:15172
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "неправильна кількість параметрів у правій частині виразу OVERLAPS"
 
-#: gram.y:15177
+#: gram.y:15350
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "Предикат UNIQUE ще не реалізований"
 
-#: gram.y:15591
+#: gram.y:15764
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "використовувати речення ORDER BY з WITHIN GROUP неодноразово, не можна"
 
-#: gram.y:15596
+#: gram.y:15769
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "використовувати DISTINCT з WITHIN GROUP не можна"
 
-#: gram.y:15601
+#: gram.y:15774
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "використовувати VARIADIC з WITHIN GROUP не можна"
 
-#: gram.y:16328 gram.y:16352
+#: gram.y:16501 gram.y:16525
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "початком рамки не може бути UNBOUNDED FOLLOWING"
 
-#: gram.y:16333
+#: gram.y:16506
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "рамка, яка починається з наступного рядка не можна закінчуватись поточним рядком"
 
-#: gram.y:16357
+#: gram.y:16530
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "кінцем рамки не може бути UNBOUNDED PRECEDING"
 
-#: gram.y:16363
+#: gram.y:16536
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "рамка, яка починається з поточного рядка не може мати попередніх рядків"
 
-#: gram.y:16370
+#: gram.y:16543
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "рамка, яка починається з наступного рядка не може мати попередніх рядків"
 
-#: gram.y:16919
+#: gram.y:17081
 #, c-format
 msgid "unrecognized JSON encoding: %s"
 msgstr "нерозпізнане кодування JSON: %s"
 
-#: gram.y:17243
+#: gram.y:17406
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "тип modifier не може мати ім'я параметра"
 
-#: gram.y:17249
+#: gram.y:17412
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "тип modifier не може мати ORDER BY"
 
-#: gram.y:17317 gram.y:17324 gram.y:17331
+#: gram.y:17480 gram.y:17487 gram.y:17494
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s не можна використовувати тут як ім'я ролі"
 
-#: gram.y:17421 gram.y:18906
+#: gram.y:17584 gram.y:19074
 #, c-format
 msgid "WITH TIES cannot be specified without ORDER BY clause"
 msgstr "WITH TIES не можна задати без оператора ORDER BY"
 
-#: gram.y:18597 gram.y:18772
+#: gram.y:18767 gram.y:18942
 msgid "improper use of \"*\""
 msgstr "неправильне використання \"*\""
 
-#: gram.y:18836
+#: gram.y:19006
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "сортувальна агрегатна функція з прямим аргументом VARIADIC повинна мати один агрегатний аргумент VARIADIC того ж типу даних"
 
-#: gram.y:18873
+#: gram.y:19043
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "кілька речень ORDER BY не допускається"
 
-#: gram.y:18884
+#: gram.y:19054
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "кілька речень OFFSET не допускається"
 
-#: gram.y:18893
+#: gram.y:19063
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "кілька речень LIMIT не допускається"
 
-#: gram.y:18902
-#, c-format
-msgid "multiple limit options not allowed"
-msgstr "використання декількох параметрів обмеження не дозволяється"
-
-#: gram.y:18929
+#: gram.y:19099
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "кілька речень WITH не допускається"
 
-#: gram.y:19122
+#: gram.y:19295
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "В табличних функціях аргументи OUT і INOUT не дозволяються"
 
-#: gram.y:19255
+#: gram.y:19429
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "кілька речень COLLATE не допускається"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19293 gram.y:19306
+#: gram.y:19469 gram.y:19482
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "обмеження %s не можуть бути позначені DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19319
+#: gram.y:19495
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "обмеження %s не можуть бути позначені NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:19332
+#: gram.y:19508
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "обмеження %s не можуть бути позначені NO INHERIT"
 
-#: gram.y:19354
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19521
+#, c-format
+msgid "%s constraints cannot be marked NOT ENFORCED"
+msgstr "обмеження %s не можуть бути позначені NOT ENFORCED"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:19543
+#, c-format
+msgid "%s constraints cannot be marked ENFORCED"
+msgstr "обмеження %s не можуть бути позначені як ENFORCED"
+
+#: gram.y:19565
 #, c-format
 msgid "unrecognized partitioning strategy \"%s\""
 msgstr "нерозпізнана стратегія секціонування \"%s\""
 
-#: gram.y:19378
+#: gram.y:19589
 #, c-format
 msgid "invalid publication object list"
 msgstr "неприпустимий список об'єктів публікації"
 
-#: gram.y:19379
+#: gram.y:19590
 #, c-format
 msgid "One of TABLE or TABLES IN SCHEMA must be specified before a standalone table or schema name."
 msgstr "Одну з TABLE або TABLES IN SCHEMA необхідно вказати перед назвою автономної таблиці або схеми."
 
-#: gram.y:19395
+#: gram.y:19606
 #, c-format
 msgid "invalid table name"
 msgstr "неприпустиме ім'я таблиці"
 
-#: gram.y:19416
+#: gram.y:19627
 #, c-format
 msgid "WHERE clause not allowed for schema"
 msgstr "Речення WHERE не допускається для схеми"
 
-#: gram.y:19423
+#: gram.y:19634
 #, c-format
 msgid "column specification not allowed for schema"
 msgstr "специфікація стовпця не дозволена для схеми"
 
-#: gram.y:19437
+#: gram.y:19648
 #, c-format
 msgid "invalid schema name"
 msgstr "неприпустиме ім'я схеми"
 
-#: guc-file.l:192
+#: guc-file.l:193
 #, c-format
 msgid "empty configuration file name: \"%s\""
 msgstr "пуста назва файлу конфігурації: \"%s\""
 
-#: guc-file.l:209
+#: guc-file.l:210
 #, c-format
 msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr "не вдалося відкрити файл конфігурації \"%s\": максимальну глибину вкладення перевищено"
 
-#: guc-file.l:229
+#: guc-file.l:230
 #, c-format
 msgid "configuration file recursion in \"%s\""
 msgstr "рекурсія файлу конфігурації в \"%s\""
 
-#: guc-file.l:245
+#: guc-file.l:246
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "не вдалося відкрити файл конфігурації \"%s\": %m"
 
-#: guc-file.l:256
+#: guc-file.l:257
 #, c-format
 msgid "skipping missing configuration file \"%s\""
 msgstr "відсутній файл конфігурації \"%s\" пропускається"
 
-#: guc-file.l:511
+#: guc-file.l:518
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
 msgstr "синтаксична помилка у файлі \"%s\" поблизу кінця рядка %u"
 
-#: guc-file.l:521
+#: guc-file.l:528
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr "синтаксична помилка у файлі \"%s\" рядок %u, поблизу маркера \"%s\""
 
-#: guc-file.l:541
+#: guc-file.l:548
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
 msgstr "знайдено занадто багато синтаксичних помилок, переривання файла \"%s\""
 
-#: jsonpath_gram.y:267
+#: jsonpath_gram.y:269
 #, c-format
 msgid ".decimal() can only have an optional precision[,scale]."
 msgstr ".decimal() може мати лише необов'язковий параметр precision[,scale]."
 
-#: jsonpath_gram.y:599
+#: jsonpath_gram.y:601
 #, c-format
 msgid "Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate."
 msgstr "Нерозпізнаний символ позначки \"%.*s\" в предикаті LIKE_REGEX."
 
-#: jsonpath_gram.y:677
+#: jsonpath_gram.y:679
 #, c-format
 msgid "XQuery \"x\" flag (expanded regular expressions) is not implemented"
 msgstr "XQuery \"x\" позначка (розширені регулярні вирази) не реалізовано"
@@ -30882,168 +32434,172 @@ msgstr "неприпустима шістнадцяткова послідовн
 msgid "unexpected end after backslash"
 msgstr "неочікуваний кінець після зворотного слеша"
 
-#: jsonpath_scan.l:201 repl_scanner.l:211 scan.l:756
+#: jsonpath_scan.l:201 repl_scanner.l:217 scan.l:742
 msgid "unterminated quoted string"
 msgstr "незавершений рядок в лапках"
 
-#: jsonpath_scan.l:228
+#: jsonpath_scan.l:227
 msgid "unexpected end of comment"
 msgstr "неочікуваний кінець коментаря"
 
-#: jsonpath_scan.l:319
+#: jsonpath_scan.l:317
 msgid "invalid numeric literal"
 msgstr "невірна числова константа"
 
-#: jsonpath_scan.l:325 jsonpath_scan.l:331 jsonpath_scan.l:337 scan.l:1064
-#: scan.l:1068 scan.l:1072 scan.l:1076
+#: jsonpath_scan.l:322 jsonpath_scan.l:327 jsonpath_scan.l:332 scan.l:1056
+#: scan.l:1060 scan.l:1064 scan.l:1068
 msgid "trailing junk after numeric literal"
 msgstr "сміття після числового літерала"
 
 #. translator: %s is typically "syntax error"
-#: jsonpath_scan.l:375
+#: jsonpath_scan.l:378
 #, c-format
 msgid "%s at end of jsonpath input"
 msgstr "%s в кінці введення jsonpath"
 
 #. translator: first %s is typically "syntax error"
-#: jsonpath_scan.l:382
+#: jsonpath_scan.l:385
 #, c-format
 msgid "%s at or near \"%s\" of jsonpath input"
 msgstr "%s в або біля \"%s\" введення jsonpath"
 
-#: jsonpath_scan.l:568
+#: jsonpath_scan.l:545
 msgid "invalid input"
 msgstr "неправильні вхідні дані"
 
-#: jsonpath_scan.l:594
+#: jsonpath_scan.l:571
 msgid "invalid hexadecimal digit"
 msgstr "неприпустима шістнадцяткова цифра"
 
-#: jsonpath_scan.l:625
+#: jsonpath_scan.l:602
 #, c-format
 msgid "could not convert Unicode to server encoding"
 msgstr "не вдалося перетворити Юнікод в серверне кодування"
 
-#: repl_gram.y:318 repl_gram.y:359
+#: repl_gram.y:322 repl_gram.y:363
 #, c-format
 msgid "invalid timeline %u"
 msgstr "неприпустима часова шкала %u"
 
-#: repl_scanner.l:154
+#: repl_scanner.l:160
 msgid "invalid streaming start location"
 msgstr "неприпустиме розташування початку потокового передавання"
 
-#: scan.l:497
+#: scan.l:483
 msgid "unterminated /* comment"
 msgstr "незавершений коментар /*"
 
-#: scan.l:517
+#: scan.l:503
 msgid "unterminated bit string literal"
 msgstr "незавершений бітовий рядок"
 
-#: scan.l:531
+#: scan.l:517
 msgid "unterminated hexadecimal string literal"
 msgstr "незавершений шістнадцятковий рядок"
 
-#: scan.l:581
+#: scan.l:567
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "небезпечне використання рядкової констани зі спеціальними кодами Unicode"
 
-#: scan.l:582
+#: scan.l:568
 #, c-format
 msgid "String constants with Unicode escapes cannot be used when \"standard_conforming_strings\" is off."
-msgstr ""
+msgstr "Константи рядка зі спеціальними кодами Unicode не можна використовувати, коли параметр \"standard_conforming_strings\" вимкнений."
 
-#: scan.l:643
+#: scan.l:629
 msgid "unhandled previous state in xqs"
 msgstr "необроблений попередній стан у xqs"
 
-#: scan.l:717
+#: scan.l:703
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Спеціальні коди Unicode повинні бути \\uXXXX або \\UXXXXXXXX."
 
-#: scan.l:728
+#: scan.l:714
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "небезпечне використання символу \\' в рядку"
 
-#: scan.l:729
+#: scan.l:715
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr "Використайте \" щоб записати лапки в рядку. Запис \\' небезпечний лише для клієнтських кодувань."
 
-#: scan.l:801
+#: scan.l:787
 msgid "unterminated dollar-quoted string"
 msgstr "незавершений рядок з $"
 
-#: scan.l:818 scan.l:828
+#: scan.l:804 scan.l:814
 msgid "zero-length delimited identifier"
 msgstr "пустий ідентифікатор із роздільниками"
 
-#: scan.l:839 syncrep_scanner.l:101
+#: scan.l:825 syncrep_scanner.l:114
 msgid "unterminated quoted identifier"
 msgstr "незавершений ідентифікатор в лапках"
 
-#: scan.l:1002
+#: scan.l:988
 msgid "operator too long"
 msgstr "занадто довгий оператор"
 
-#: scan.l:1015
+#: scan.l:1001
+msgid "parameter number too large"
+msgstr "номер параметра занадто великий"
+
+#: scan.l:1007
 msgid "trailing junk after parameter"
 msgstr "сміття після параметру"
 
-#: scan.l:1036
+#: scan.l:1028
 msgid "invalid hexadecimal integer"
 msgstr "неприпустиме шістнадцяткове число"
 
-#: scan.l:1040
+#: scan.l:1032
 msgid "invalid octal integer"
 msgstr "помилкове вісімкове число"
 
-#: scan.l:1044
+#: scan.l:1036
 msgid "invalid binary integer"
 msgstr "неприпустиме двійкове ціле число"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1239
+#: scan.l:1231
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в кінці введення"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1247
+#: scan.l:1239
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s в або поблизу \"%s\""
 
-#: scan.l:1439
+#: scan.l:1431
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "нестандартне використання \\' в рядку"
 
-#: scan.l:1440
+#: scan.l:1432
 #, c-format
 msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr "Щоб записати лапки у рядку використовуйте \" або синтаксис спеціальних рядків (E'...')."
 
-#: scan.l:1449
+#: scan.l:1441
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "нестандартне використання \\\\ в рядку"
 
-#: scan.l:1450
+#: scan.l:1442
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "Для запису зворотніх скісних рисок \"\\\" використовуйте синтаксис спеціальних рядків, наприклад E'\\\\'."
 
-#: scan.l:1464
+#: scan.l:1456
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "нестандартне використання спеціального символу в рядку"
 
-#: scan.l:1465
+#: scan.l:1457
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "Для запису спеціальних символів використовуйте синтаксис спеціальних рядків E'\\r\\n'."
diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index 423b2b4f9d6..6ac83ea1a82 100644
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -69,7 +69,7 @@ static int	nextSemaNumber;		/* next free sem num in last sema set */
 
 
 static IpcSemaphoreId InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey,
-												 int numSems);
+												 int numSems, bool retry_ok);
 static void IpcSemaphoreInitialize(IpcSemaphoreId semId, int semNum,
 								   int value);
 static void IpcSemaphoreKill(IpcSemaphoreId semId);
@@ -88,9 +88,13 @@ static void ReleaseSemaphores(int status, Datum arg);
  * If we fail with a failure code other than collision-with-existing-set,
  * print out an error and abort.  Other types of errors suggest nonrecoverable
  * problems.
+ *
+ * Unfortunately, it's sometimes hard to tell whether errors are
+ * nonrecoverable.  Our caller keeps track of whether continuing to retry
+ * is sane or not; if not, we abort on failure regardless of the errno.
  */
 static IpcSemaphoreId
-InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems)
+InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems, bool retry_ok)
 {
 	int			semId;
 
@@ -101,16 +105,27 @@ InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems)
 		int			saved_errno = errno;
 
 		/*
-		 * Fail quietly if error indicates a collision with existing set. One
-		 * would expect EEXIST, given that we said IPC_EXCL, but perhaps we
-		 * could get a permission violation instead?  Also, EIDRM might occur
-		 * if an old set is slated for destruction but not gone yet.
+		 * Fail quietly if error suggests a collision with an existing set and
+		 * our caller has not lost patience.
+		 *
+		 * One would expect EEXIST, given that we said IPC_EXCL, but perhaps
+		 * we could get a permission violation instead.  On some platforms
+		 * EINVAL will be reported if the existing set has too few semaphores.
+		 * Also, EIDRM might occur if an old set is slated for destruction but
+		 * not gone yet.
+		 *
+		 * EINVAL is the key reason why we need the caller-level loop limit,
+		 * as it can also mean that the platform's SEMMSL is less than
+		 * numSems, and that condition can't be fixed by trying another key.
 		 */
-		if (saved_errno == EEXIST || saved_errno == EACCES
+		if (retry_ok &&
+			(saved_errno == EEXIST
+			 || saved_errno == EACCES
+			 || saved_errno == EINVAL
 #ifdef EIDRM
-			|| saved_errno == EIDRM
+			 || saved_errno == EIDRM
 #endif
-			)
+			 ))
 			return -1;
 
 		/*
@@ -207,17 +222,22 @@ IpcSemaphoreGetLastPID(IpcSemaphoreId semId, int semNum)
 static IpcSemaphoreId
 IpcSemaphoreCreate(int numSems)
 {
+	int			num_tries = 0;
 	IpcSemaphoreId semId;
 	union semun semun;
 	PGSemaphoreData mysema;
 
 	/* Loop till we find a free IPC key */
-	for (nextSemaKey++;; nextSemaKey++)
+	for (nextSemaKey++;; nextSemaKey++, num_tries++)
 	{
 		pid_t		creatorPID;
 
-		/* Try to create new semaphore set */
-		semId = InternalIpcSemaphoreCreate(nextSemaKey, numSems + 1);
+		/*
+		 * Try to create new semaphore set.  Give up after trying 1000
+		 * distinct IPC keys.
+		 */
+		semId = InternalIpcSemaphoreCreate(nextSemaKey, numSems + 1,
+										   num_tries < 1000);
 		if (semId >= 0)
 			break;				/* successful create */
 
@@ -254,7 +274,7 @@ IpcSemaphoreCreate(int numSems)
 		/*
 		 * Now try again to create the sema set.
 		 */
-		semId = InternalIpcSemaphoreCreate(nextSemaKey, numSems + 1);
+		semId = InternalIpcSemaphoreCreate(nextSemaKey, numSems + 1, true);
 		if (semId >= 0)
 			break;				/* successful create */
 
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 451fb90a610..66620fb4755 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2542,7 +2542,10 @@ do_autovacuum(void)
 		workitem->avw_active = true;
 		LWLockRelease(AutovacuumLock);
 
+		PushActiveSnapshot(GetTransactionSnapshot());
 		perform_work_item(workitem);
+		if (ActiveSnapshotSet())	/* transaction could have aborted */
+			PopActiveSnapshot();
 
 		/*
 		 * Check for config changes before acquiring lock for further jobs.
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 116ddf7b835..1ad65c237c3 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -613,6 +613,7 @@ ResetBackgroundWorkerCrashTimes(void)
 			 * resetting.
 			 */
 			rw->rw_crashed_at = 0;
+			rw->rw_pid = 0;
 
 			/*
 			 * If there was anyone waiting for it, they're history.
diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c
index fda91ffd1ce..3914ac8da26 100644
--- a/src/backend/postmaster/checkpointer.c
+++ b/src/backend/postmaster/checkpointer.c
@@ -135,6 +135,9 @@ static CheckpointerShmemStruct *CheckpointerShmem;
 /* interval for calling AbsorbSyncRequests in CheckpointWriteDelay */
 #define WRITES_PER_ABSORB		1000
 
+/* Max number of requests the checkpointer request queue can hold */
+#define MAX_CHECKPOINT_REQUESTS 10000000
+
 /*
  * GUC parameters
  */
@@ -937,11 +940,14 @@ CheckpointerShmemSize(void)
 	Size		size;
 
 	/*
-	 * Currently, the size of the requests[] array is arbitrarily set equal to
-	 * NBuffers.  This may prove too large or small ...
+	 * The size of the requests[] array is arbitrarily set equal to NBuffers.
+	 * But there is a cap of MAX_CHECKPOINT_REQUESTS to prevent accumulating
+	 * too many checkpoint requests in the ring buffer.
 	 */
 	size = offsetof(CheckpointerShmemStruct, requests);
-	size = add_size(size, mul_size(NBuffers, sizeof(CheckpointerRequest)));
+	size = add_size(size, mul_size(Min(NBuffers,
+									   MAX_CHECKPOINT_REQUESTS),
+								   sizeof(CheckpointerRequest)));
 
 	return size;
 }
@@ -970,7 +976,7 @@ CheckpointerShmemInit(void)
 		 */
 		MemSet(CheckpointerShmem, 0, size);
 		SpinLockInit(&CheckpointerShmem->ckpt_lck);
-		CheckpointerShmem->max_requests = NBuffers;
+		CheckpointerShmem->max_requests = Min(NBuffers, MAX_CHECKPOINT_REQUESTS);
 		ConditionVariableInit(&CheckpointerShmem->start_cv);
 		ConditionVariableInit(&CheckpointerShmem->done_cv);
 	}
diff --git a/src/backend/postmaster/interrupt.c b/src/backend/postmaster/interrupt.c
index 0ae9bf906ec..ba63b84dfc5 100644
--- a/src/backend/postmaster/interrupt.c
+++ b/src/backend/postmaster/interrupt.c
@@ -94,9 +94,8 @@ SignalHandlerForCrashExit(SIGNAL_ARGS)
  * shut down and exit.
  *
  * Typically, this handler would be used for SIGTERM, but some processes use
- * other signals. In particular, the checkpointer exits on SIGUSR2, and the WAL
- * writer and the logical replication parallel apply worker exits on either
- * SIGINT or SIGTERM.
+ * other signals. In particular, the checkpointer and parallel apply worker
+ * exit on SIGUSR2, and the WAL writer exits on either SIGINT or SIGTERM.
  *
  * ShutdownRequestPending should be checked at a convenient place within the
  * main loop, or else the main loop should call ProcessMainLoopInterrupts.
diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c
index bf6b55ee830..ae94cc99d31 100644
--- a/src/backend/postmaster/launch_backend.c
+++ b/src/backend/postmaster/launch_backend.c
@@ -227,7 +227,7 @@ PostmasterChildName(BackendType child_type)
  */
 pid_t
 postmaster_child_launch(BackendType child_type, int child_slot,
-						const void *startup_data, size_t startup_data_len,
+						void *startup_data, size_t startup_data_len,
 						ClientSocket *client_sock)
 {
 	pid_t		pid;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index ecb42b89f3c..c2c7b34b03b 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -34,7 +34,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -313,12 +313,13 @@ static bool FatalError = false; /* T if recovering from backend crash */
  *
  * When the startup process is ready to start archive recovery, it signals the
  * postmaster, and we switch to PM_RECOVERY state. The background writer and
- * checkpointer are launched, while the startup process continues applying WAL.
- * If Hot Standby is enabled, then, after reaching a consistent point in WAL
- * redo, startup process signals us again, and we switch to PM_HOT_STANDBY
- * state and begin accepting connections to perform read-only queries.  When
- * archive recovery is finished, the startup process exits with exit code 0
- * and we switch to PM_RUN state.
+ * checkpointer are already running (as these are launched during PM_STARTUP),
+ * and the startup process continues applying WAL.  If Hot Standby is enabled,
+ * then, after reaching a consistent point in WAL redo, startup process
+ * signals us again, and we switch to PM_HOT_STANDBY state and begin accepting
+ * connections to perform read-only queries.  When archive recovery is
+ * finished, the startup process exits with exit code 0 and we switch to
+ * PM_RUN state.
  *
  * Normal child backends can only be launched when we are in PM_RUN or
  * PM_HOT_STANDBY state.  (connsAllowed can also restrict launching.)
@@ -2389,29 +2390,13 @@ process_pm_child_exit(void)
 			}
 
 			/*
-			 * Unexpected exit of startup process (including FATAL exit)
-			 * during PM_STARTUP is treated as catastrophic. There are no
-			 * other processes running yet, so we can just exit.
-			 */
-			if (pmState == PM_STARTUP &&
-				StartupStatus != STARTUP_SIGNALED &&
-				!EXIT_STATUS_0(exitstatus))
-			{
-				LogChildExit(LOG, _("startup process"),
-							 pid, exitstatus);
-				ereport(LOG,
-						(errmsg("aborting startup due to startup process failure")));
-				ExitPostmaster(1);
-			}
-
-			/*
-			 * After PM_STARTUP, any unexpected exit (including FATAL exit) of
-			 * the startup process is catastrophic, so kill other children,
-			 * and set StartupStatus so we don't try to reinitialize after
-			 * they're gone.  Exception: if StartupStatus is STARTUP_SIGNALED,
-			 * then we previously sent the startup process a SIGQUIT; so
-			 * that's probably the reason it died, and we do want to try to
-			 * restart in that case.
+			 * Any unexpected exit (including FATAL exit) of the startup
+			 * process is catastrophic, so kill other children, and set
+			 * StartupStatus so we don't try to reinitialize after they're
+			 * gone.  Exception: if StartupStatus is STARTUP_SIGNALED, then we
+			 * previously sent the startup process a SIGQUIT; so that's
+			 * probably the reason it died, and we do want to try to restart
+			 * in that case.
 			 *
 			 * This stanza also handles the case where we sent a SIGQUIT
 			 * during PM_STARTUP due to some dead-end child crashing: in that
@@ -2742,6 +2727,13 @@ CleanupBackend(PMChild *bp,
 	}
 	bp = NULL;
 
+	/*
+	 * In a crash case, exit immediately without resetting background worker
+	 * state. However, if restart_after_crash is enabled, the background
+	 * worker state (e.g., rw_pid) still needs be reset so the worker can
+	 * restart after crash recovery. This reset is handled in
+	 * ResetBackgroundWorkerCrashTimes(), not here.
+	 */
 	if (crashed)
 	{
 		HandleChildCrash(bp_pid, exitstatus, procname);
@@ -2839,12 +2831,9 @@ HandleFatalError(QuitSignalReason reason, bool consider_sigabrt)
 			/* shouldn't have any children */
 			Assert(false);
 			break;
-		case PM_STARTUP:
-			/* should have been handled in process_pm_child_exit */
-			Assert(false);
-			break;
 
 			/* wait for children to die */
+		case PM_STARTUP:
 		case PM_RECOVERY:
 		case PM_HOT_STANDBY:
 		case PM_RUN:
@@ -4449,15 +4438,15 @@ maybe_start_bgworkers(void)
 static bool
 maybe_reap_io_worker(int pid)
 {
-	for (int id = 0; id < MAX_IO_WORKERS; ++id)
+	for (int i = 0; i < MAX_IO_WORKERS; ++i)
 	{
-		if (io_worker_children[id] &&
-			io_worker_children[id]->pid == pid)
+		if (io_worker_children[i] &&
+			io_worker_children[i]->pid == pid)
 		{
-			ReleasePostmasterChildSlot(io_worker_children[id]);
+			ReleasePostmasterChildSlot(io_worker_children[i]);
 
 			--io_worker_count;
-			io_worker_children[id] = NULL;
+			io_worker_children[i] = NULL;
 			return true;
 		}
 	}
@@ -4501,22 +4490,22 @@ maybe_adjust_io_workers(void)
 	while (io_worker_count < io_workers)
 	{
 		PMChild    *child;
-		int			id;
+		int			i;
 
 		/* find unused entry in io_worker_children array */
-		for (id = 0; id < MAX_IO_WORKERS; ++id)
+		for (i = 0; i < MAX_IO_WORKERS; ++i)
 		{
-			if (io_worker_children[id] == NULL)
+			if (io_worker_children[i] == NULL)
 				break;
 		}
-		if (id == MAX_IO_WORKERS)
-			elog(ERROR, "could not find a free IO worker ID");
+		if (i == MAX_IO_WORKERS)
+			elog(ERROR, "could not find a free IO worker slot");
 
 		/* Try to launch one. */
 		child = StartChildProcess(B_IO_WORKER);
 		if (child != NULL)
 		{
-			io_worker_children[id] = child;
+			io_worker_children[i] = child;
 			++io_worker_count;
 		}
 		else
@@ -4527,11 +4516,11 @@ maybe_adjust_io_workers(void)
 	if (io_worker_count > io_workers)
 	{
 		/* ask the IO worker in the highest slot to exit */
-		for (int id = MAX_IO_WORKERS - 1; id >= 0; --id)
+		for (int i = MAX_IO_WORKERS - 1; i >= 0; --i)
 		{
-			if (io_worker_children[id] != NULL)
+			if (io_worker_children[i] != NULL)
 			{
-				kill(io_worker_children[id]->pid, SIGUSR2);
+				kill(io_worker_children[i]->pid, SIGUSR2);
 				break;
 			}
 		}
diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c
index 0fec4f1f871..e0ff745f2dd 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -23,6 +23,7 @@
 #include "postgres.h"
 
 #include "access/timeline.h"
+#include "access/visibilitymap.h"
 #include "access/xlog.h"
 #include "access/xlog_internal.h"
 #include "access/xlogrecovery.h"
@@ -644,7 +645,7 @@ WakeupWalSummarizer(void)
 	if (WalSummarizerCtl == NULL)
 		return;
 
-	LWLockAcquire(WALSummarizerLock, LW_EXCLUSIVE);
+	LWLockAcquire(WALSummarizerLock, LW_SHARED);
 	pgprocno = WalSummarizerCtl->summarizer_pgprocno;
 	LWLockRelease(WALSummarizerLock);
 
@@ -685,7 +686,7 @@ WaitForWalSummarization(XLogRecPtr lsn)
 		/*
 		 * If the LSN summarized on disk has reached the target value, stop.
 		 */
-		LWLockAcquire(WALSummarizerLock, LW_EXCLUSIVE);
+		LWLockAcquire(WALSummarizerLock, LW_SHARED);
 		summarized_lsn = WalSummarizerCtl->summarized_lsn;
 		pending_lsn = WalSummarizerCtl->pending_lsn;
 		LWLockRelease(WALSummarizerLock);
@@ -1356,7 +1357,8 @@ SummarizeSmgrRecord(XLogReaderState *xlogreader, BlockRefTable *brtab)
 									   MAIN_FORKNUM, xlrec->blkno);
 		if ((xlrec->flags & SMGR_TRUNCATE_VM) != 0)
 			BlockRefTableSetLimitBlock(brtab, &xlrec->rlocator,
-									   VISIBILITYMAP_FORKNUM, xlrec->blkno);
+									   VISIBILITYMAP_FORKNUM,
+									   visibilitymap_truncation_length(xlrec->blkno));
 	}
 }
 
diff --git a/src/backend/regex/regc_color.c b/src/backend/regex/regc_color.c
index 8ae788f5195..1587f452ea3 100644
--- a/src/backend/regex/regc_color.c
+++ b/src/backend/regex/regc_color.c
@@ -218,6 +218,7 @@ newcolor(struct colormap *cm)
 		n = cm->ncds * 2;
 		if (n > MAX_COLOR + 1)
 			n = MAX_COLOR + 1;
+		/* the MAX_COLOR+1 limit ensures these alloc sizes can't overflow: */
 		if (cm->cd == cm->cdspace)
 		{
 			newCd = (struct colordesc *) MALLOC(n * sizeof(struct colordesc));
@@ -434,9 +435,8 @@ newhicolorrow(struct colormap *cm,
 			CERR(REG_ESPACE);
 			return 0;
 		}
-		newarray = (color *) REALLOC(cm->hicolormap,
-									 cm->maxarrayrows * 2 *
-									 cm->hiarraycols * sizeof(color));
+		newarray = REALLOC_ARRAY(cm->hicolormap, color,
+								 cm->maxarrayrows * 2 * cm->hiarraycols);
 		if (newarray == NULL)
 		{
 			CERR(REG_ESPACE);
@@ -477,9 +477,8 @@ newhicolorcols(struct colormap *cm)
 		CERR(REG_ESPACE);
 		return;
 	}
-	newarray = (color *) REALLOC(cm->hicolormap,
-								 cm->maxarrayrows *
-								 cm->hiarraycols * 2 * sizeof(color));
+	newarray = REALLOC_ARRAY(cm->hicolormap, color,
+							 cm->maxarrayrows * cm->hiarraycols * 2);
 	if (newarray == NULL)
 	{
 		CERR(REG_ESPACE);
@@ -652,8 +651,7 @@ subcoloronechr(struct vars *v,
 	 * Potentially, we could need two more colormapranges than we have now, if
 	 * the given chr is in the middle of some existing range.
 	 */
-	newranges = (colormaprange *)
-		MALLOC((cm->numcmranges + 2) * sizeof(colormaprange));
+	newranges = MALLOC_ARRAY(colormaprange, cm->numcmranges + 2);
 	if (newranges == NULL)
 	{
 		CERR(REG_ESPACE);
@@ -766,8 +764,7 @@ subcoloronerange(struct vars *v,
 	 * Potentially, if we have N non-adjacent ranges, we could need as many as
 	 * 2N+1 result ranges (consider case where new range spans 'em all).
 	 */
-	newranges = (colormaprange *)
-		MALLOC((cm->numcmranges * 2 + 1) * sizeof(colormaprange));
+	newranges = MALLOC_ARRAY(colormaprange, cm->numcmranges * 2 + 1);
 	if (newranges == NULL)
 	{
 		CERR(REG_ESPACE);
diff --git a/src/backend/regex/regc_cvec.c b/src/backend/regex/regc_cvec.c
index 10306215596..8dbcf3c55e3 100644
--- a/src/backend/regex/regc_cvec.c
+++ b/src/backend/regex/regc_cvec.c
@@ -40,6 +40,9 @@
 
 /*
  * newcvec - allocate a new cvec
+ *
+ * Note: in current usage, nchrs and nranges are never so large that we risk
+ * integer overflow in these size calculations, even with 32-bit size_t.
  */
 static struct cvec *
 newcvec(int nchrs,				/* to hold this many chrs... */
diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c
index acd2286defd..92b11116194 100644
--- a/src/backend/regex/regc_nfa.c
+++ b/src/backend/regex/regc_nfa.c
@@ -3523,6 +3523,10 @@ compact(struct nfa *nfa,
 
 	assert(!NISERR());
 
+	/*
+	 * The REG_MAX_COMPILE_SPACE restriction ensures that integer overflow
+	 * can't occur in this loop nor in the allocation requests below.
+	 */
 	nstates = 0;
 	narcs = 0;
 	for (s = nfa->states; s != NULL; s = s->next)
@@ -3575,6 +3579,12 @@ compact(struct nfa *nfa,
 				case LACON:
 					assert(s->no != cnfa->pre);
 					assert(a->co >= 0);
+					/* make sure the modified color number will fit */
+					if (a->co > MAX_COLOR - cnfa->ncolors)
+					{
+						NERR(REG_ECOLORS);
+						return;
+					}
 					ca->co = (color) (cnfa->ncolors + a->co);
 					ca->to = a->to->no;
 					ca++;
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 15b264e50f1..4b8eed1b384 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -561,6 +561,7 @@ moresubs(struct vars *v,
 	assert(wanted > 0 && (size_t) wanted >= v->nsubs);
 	n = (size_t) wanted * 3 / 2 + 1;
 
+	/* n is bounded by the number of states, so no chance of overflow here */
 	if (v->subs == v->sub10)
 	{
 		p = (struct subre **) MALLOC(n * sizeof(struct subre *));
@@ -2405,8 +2406,8 @@ newlacon(struct vars *v,
 	else
 	{
 		n = v->nlacons;
-		newlacons = (struct subre *) REALLOC(v->lacons,
-											 (n + 1) * sizeof(struct subre));
+		/* better use REALLOC_ARRAY here, as struct subre is big */
+		newlacons = REALLOC_ARRAY(v->lacons, struct subre, n + 1);
 	}
 	if (newlacons == NULL)
 	{
diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c
index 1f8f2ab1441..5b57fed60a9 100644
--- a/src/backend/regex/rege_dfa.c
+++ b/src/backend/regex/rege_dfa.c
@@ -640,20 +640,29 @@ newdfa(struct vars *v,
 	}
 	else
 	{
+		/*
+		 * Restrict the ranges of nstates and ncolors enough that the arrays
+		 * we allocate here have no more than INT_MAX members.  This protects
+		 * not only the allocation calculations just below, but later indexing
+		 * into these arrays.
+		 */
+		if (wordsper >= INT_MAX / (nss + WORK) ||
+			cnfa->ncolors >= INT_MAX / nss)
+		{
+			ERR(REG_ETOOBIG);
+			return NULL;
+		}
 		d = (struct dfa *) MALLOC(sizeof(struct dfa));
 		if (d == NULL)
 		{
 			ERR(REG_ESPACE);
 			return NULL;
 		}
-		d->ssets = (struct sset *) MALLOC(nss * sizeof(struct sset));
-		d->statesarea = (unsigned *) MALLOC((nss + WORK) * wordsper *
-											sizeof(unsigned));
+		d->ssets = MALLOC_ARRAY(struct sset, nss);
+		d->statesarea = MALLOC_ARRAY(unsigned, (nss + WORK) * wordsper);
 		d->work = &d->statesarea[nss * wordsper];
-		d->outsarea = (struct sset **) MALLOC(nss * cnfa->ncolors *
-											  sizeof(struct sset *));
-		d->incarea = (struct arcp *) MALLOC(nss * cnfa->ncolors *
-											sizeof(struct arcp));
+		d->outsarea = MALLOC_ARRAY(struct sset *, nss * cnfa->ncolors);
+		d->incarea = MALLOC_ARRAY(struct arcp, nss * cnfa->ncolors);
 		d->ismalloced = true;
 		d->arraysmalloced = true;
 		/* now freedfa() will behave sanely */
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 2a1d5bebda3..665aa31bd03 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -231,7 +231,7 @@ pg_regexec(regex_t *re,
 		if (v->nmatch <= LOCALMAT)
 			v->pmatch = mat;
 		else
-			v->pmatch = (regmatch_t *) MALLOC(v->nmatch * sizeof(regmatch_t));
+			v->pmatch = MALLOC_ARRAY(regmatch_t, v->nmatch);
 		if (v->pmatch == NULL)
 			return REG_ESPACE;
 		zapallsubs(v->pmatch, v->nmatch);
@@ -265,6 +265,7 @@ pg_regexec(regex_t *re,
 		v->subdfas = subdfas;
 	else
 	{
+		/* ntree is surely less than the number of states, so this is safe: */
 		v->subdfas = (struct dfa **) MALLOC(n * sizeof(struct dfa *));
 		if (v->subdfas == NULL)
 		{
@@ -279,6 +280,7 @@ pg_regexec(regex_t *re,
 	n = (size_t) v->g->nlacons;
 	if (n > 0)
 	{
+		/* nlacons is surely less than the number of arcs, so this is safe: */
 		v->ladfas = (struct dfa **) MALLOC(n * sizeof(struct dfa *));
 		if (v->ladfas == NULL)
 		{
@@ -1163,7 +1165,7 @@ citerdissect(struct vars *v,
 		max_matches = t->max;
 	if (max_matches < min_matches)
 		max_matches = min_matches;
-	endpts = (chr **) MALLOC((max_matches + 1) * sizeof(chr *));
+	endpts = MALLOC_ARRAY(chr *, max_matches + 1);
 	if (endpts == NULL)
 		return REG_ESPACE;
 	endpts[0] = begin;
@@ -1370,7 +1372,7 @@ creviterdissect(struct vars *v,
 		max_matches = t->max;
 	if (max_matches < min_matches)
 		max_matches = min_matches;
-	endpts = (chr **) MALLOC((max_matches + 1) * sizeof(chr *));
+	endpts = MALLOC_ARRAY(chr *, max_matches + 1);
 	if (endpts == NULL)
 		return REG_ESPACE;
 	endpts[0] = begin;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 2ac13eb298f..8ccab27c765 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -65,6 +65,8 @@ static void libpqrcv_get_senderinfo(WalReceiverConn *conn,
 static char *libpqrcv_identify_system(WalReceiverConn *conn,
 									  TimeLineID *primary_tli);
 static char *libpqrcv_get_dbname_from_conninfo(const char *connInfo);
+static char *libpqrcv_get_option_from_conninfo(const char *connInfo,
+											   const char *keyword);
 static int	libpqrcv_server_version(WalReceiverConn *conn);
 static void libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn,
 											 TimeLineID tli, char **filename,
@@ -150,6 +152,7 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 	const char *keys[6];
 	const char *vals[6];
 	int			i = 0;
+	char	   *options_val = NULL;
 
 	/*
 	 * Re-validate connection string. The validation already happened at DDL
@@ -177,6 +180,8 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 
 		if (logical)
 		{
+			char	   *opt = NULL;
+
 			/* Tell the publisher to translate to our encoding */
 			keys[++i] = "client_encoding";
 			vals[i] = GetDatabaseEncodingName();
@@ -189,8 +194,13 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 			 * running in the subscriber, such as triggers.)  This should
 			 * match what pg_dump does.
 			 */
+			opt = libpqrcv_get_option_from_conninfo(conninfo, "options");
+			options_val = psprintf("%s -c datestyle=ISO -c intervalstyle=postgres -c extra_float_digits=3",
+								   (opt == NULL) ? "" : opt);
 			keys[++i] = "options";
-			vals[i] = "-c datestyle=ISO -c intervalstyle=postgres -c extra_float_digits=3";
+			vals[i] = options_val;
+			if (opt != NULL)
+				pfree(opt);
 		}
 		else
 		{
@@ -217,6 +227,9 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 								 /* expand_dbname = */ true,
 								WAIT_EVENT_LIBPQWALRECEIVER_CONNECT);
 
+	if (options_val != NULL)
+		pfree(options_val);
+
 	if (PQstatus(conn->streamConn) != CONNECTION_OK)
 		goto bad_connection_errmsg;
 
@@ -466,9 +479,21 @@ libpqrcv_server_version(WalReceiverConn *conn)
  */
 static char *
 libpqrcv_get_dbname_from_conninfo(const char *connInfo)
+{
+	return libpqrcv_get_option_from_conninfo(connInfo, "dbname");
+}
+
+/*
+ * Get the value of the option with the given keyword from the primary
+ * server's conninfo.
+ *
+ * If the option is not found in connInfo, return NULL value.
+ */
+static char *
+libpqrcv_get_option_from_conninfo(const char *connInfo, const char *keyword)
 {
 	PQconninfoOption *opts;
-	char	   *dbname = NULL;
+	char	   *option = NULL;
 	char	   *err = NULL;
 
 	opts = PQconninfoParse(connInfo, &err);
@@ -486,21 +511,21 @@ libpqrcv_get_dbname_from_conninfo(const char *connInfo)
 	for (PQconninfoOption *opt = opts; opt->keyword != NULL; ++opt)
 	{
 		/*
-		 * If multiple dbnames are specified, then the last one will be
-		 * returned
+		 * If the same option appears multiple times, then the last one will
+		 * be returned
 		 */
-		if (strcmp(opt->keyword, "dbname") == 0 && opt->val &&
+		if (strcmp(opt->keyword, keyword) == 0 && opt->val &&
 			*opt->val)
 		{
-			if (dbname)
-				pfree(dbname);
+			if (option)
+				pfree(option);
 
-			dbname = pstrdup(opt->val);
+			option = pstrdup(opt->val);
 		}
 	}
 
 	PQconninfoFree(opts);
-	return dbname;
+	return option;
 }
 
 /*
diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c
index d25085d3515..b70adf342a5 100644
--- a/src/backend/replication/logical/applyparallelworker.c
+++ b/src/backend/replication/logical/applyparallelworker.c
@@ -811,6 +811,15 @@ LogicalParallelApplyLoop(shm_mq_handle *mqh)
 
 				if (rc & WL_LATCH_SET)
 					ResetLatch(MyLatch);
+
+				/*
+				 * Force stats reporting to avoid long delays. There can be long
+				 * idle gaps before the leader assigns the next transaction, and
+				 * the only opportunity to report stats during such gaps is
+				 * here.
+				 */
+				if ((rc & WL_TIMEOUT) && !IsTransactionState())
+					pgstat_report_stat(true);
 			}
 		}
 		else
@@ -869,10 +878,17 @@ ParallelApplyWorkerMain(Datum main_arg)
 
 	InitializingApplyWorker = true;
 
-	/* Setup signal handling. */
+	/*
+	 * Setup signal handling.
+	 *
+	 * Note: We intentionally used SIGUSR2 to trigger a graceful shutdown
+	 * initiated by the leader apply worker. This helps to differentiate it
+	 * from the case where we abort the current transaction and exit on
+	 * receiving SIGTERM.
+	 */
 	pqsignal(SIGHUP, SignalHandlerForConfigReload);
-	pqsignal(SIGINT, SignalHandlerForShutdownRequest);
 	pqsignal(SIGTERM, die);
+	pqsignal(SIGUSR2, SignalHandlerForShutdownRequest);
 	BackgroundWorkerUnblockSignals();
 
 	/*
@@ -971,9 +987,9 @@ ParallelApplyWorkerMain(Datum main_arg)
 
 	/*
 	 * The parallel apply worker must not get here because the parallel apply
-	 * worker will only stop when it receives a SIGTERM or SIGINT from the
-	 * leader, or when there is an error. None of these cases will allow the
-	 * code to reach here.
+	 * worker will only stop when it receives a SIGTERM or SIGUSR2 from the
+	 * leader, or SIGINT from itself, or when there is an error. None of these
+	 * cases will allow the code to reach here.
 	 */
 	Assert(false);
 }
diff --git a/src/backend/replication/logical/conflict.c b/src/backend/replication/logical/conflict.c
index 97c4e26b586..6f760f9a135 100644
--- a/src/backend/replication/logical/conflict.c
+++ b/src/backend/replication/logical/conflict.c
@@ -54,7 +54,7 @@ static char *build_index_value_desc(EState *estate, Relation localrel,
 
 /*
  * Get the xmin and commit timestamp data (origin and timestamp) associated
- * with the provided local tuple.
+ * with the provided local row.
  *
  * Return true if the commit timestamp data was found, false otherwise.
  */
@@ -88,12 +88,12 @@ GetTupleTransactionInfo(TupleTableSlot *localslot, TransactionId *xmin,
  * This function is used to report a conflict while applying replication
  * changes.
  *
- * 'searchslot' should contain the tuple used to search the local tuple to be
+ * 'searchslot' should contain the tuple used to search the local row to be
  * updated or deleted.
  *
  * 'remoteslot' should contain the remote new tuple, if any.
  *
- * conflicttuples is a list of local tuples that caused the conflict and the
+ * conflicttuples is a list of local rows that caused the conflict and the
  * conflict related information. See ConflictTupleInfo.
  *
  * The caller must ensure that all the indexes passed in ConflictTupleInfo are
@@ -189,9 +189,9 @@ errcode_apply_conflict(ConflictType type)
  *
  * The DETAIL line comprises of two parts:
  * 1. Explanation of the conflict type, including the origin and commit
- *    timestamp of the existing local tuple.
- * 2. Display of conflicting key, existing local tuple, remote new tuple, and
- *    replica identity columns, if any. The remote old tuple is excluded as its
+ *    timestamp of the existing local row.
+ * 2. Display of conflicting key, existing local row, remote new row, and
+ *    replica identity columns, if any. The remote old row is excluded as its
  *    information is covered in the replica identity columns.
  */
 static void
@@ -291,7 +291,7 @@ errdetail_apply_conflict(EState *estate, ResultRelInfo *relinfo,
 										 localslot, remoteslot, indexoid);
 
 	/*
-	 * Next, append the key values, existing local tuple, remote tuple and
+	 * Next, append the key values, existing local row, remote row, and
 	 * replica identity columns after the message.
 	 */
 	if (val_desc)
@@ -309,7 +309,7 @@ errdetail_apply_conflict(EState *estate, ResultRelInfo *relinfo,
 
 /*
  * Helper function to build the additional details for conflicting key,
- * existing local tuple, remote tuple, and replica identity columns.
+ * existing local row, remote row, and replica identity columns.
  *
  * If the return value is NULL, it indicates that the current user lacks
  * permissions to view the columns involved.
@@ -351,7 +351,7 @@ build_tuple_value_details(EState *estate, ResultRelInfo *relinfo,
 	{
 		/*
 		 * The 'modifiedCols' only applies to the new tuple, hence we pass
-		 * NULL for the existing local tuple.
+		 * NULL for the existing local row.
 		 */
 		desc = ExecBuildSlotValueDescription(relid, localslot, tupdesc,
 											 NULL, 64);
@@ -361,12 +361,12 @@ build_tuple_value_details(EState *estate, ResultRelInfo *relinfo,
 			if (tuple_value.len > 0)
 			{
 				appendStringInfoString(&tuple_value, "; ");
-				appendStringInfo(&tuple_value, _("existing local tuple %s"),
+				appendStringInfo(&tuple_value, _("existing local row %s"),
 								 desc);
 			}
 			else
 			{
-				appendStringInfo(&tuple_value, _("Existing local tuple %s"),
+				appendStringInfo(&tuple_value, _("Existing local row %s"),
 								 desc);
 			}
 		}
@@ -393,11 +393,11 @@ build_tuple_value_details(EState *estate, ResultRelInfo *relinfo,
 			if (tuple_value.len > 0)
 			{
 				appendStringInfoString(&tuple_value, "; ");
-				appendStringInfo(&tuple_value, _("remote tuple %s"), desc);
+				appendStringInfo(&tuple_value, _("remote row %s"), desc);
 			}
 			else
 			{
-				appendStringInfo(&tuple_value, _("Remote tuple %s"), desc);
+				appendStringInfo(&tuple_value, _("Remote row %s"), desc);
 			}
 		}
 	}
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c78d8994434..172d3335983 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -521,18 +521,9 @@ heap_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 
 			/*
 			 * Inplace updates are only ever performed on catalog tuples and
-			 * can, per definition, not change tuple visibility.  Inplace
-			 * updates don't affect storage or interpretation of table rows,
-			 * so they don't affect logicalrep_write_tuple() outcomes.  Hence,
-			 * we don't process invalidations from the original operation.  If
-			 * inplace updates did affect those things, invalidations wouldn't
-			 * make it work, since there are no snapshot-specific versions of
-			 * inplace-updated values.  Since we also don't decode catalog
-			 * tuples, we're not interested in the record's contents.
-			 *
-			 * WAL contains likely-unnecessary commit-time invals from the
-			 * CacheInvalidateHeapTuple() call in
-			 * heap_inplace_update_and_unlock(). Excess invalidation is safe.
+			 * can, per definition, not change tuple visibility.  Since we
+			 * also don't decode catalog tuples, we're not interested in the
+			 * record's contents.
 			 */
 			break;
 
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 4aed0dfcebb..d70cfb7acf2 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -636,7 +636,7 @@ logicalrep_worker_stop(Oid subid, Oid relid)
 /*
  * Stop the given logical replication parallel apply worker.
  *
- * Node that the function sends SIGINT instead of SIGTERM to the parallel apply
+ * Node that the function sends SIGUSR2 instead of SIGTERM to the parallel apply
  * worker so that the worker exits cleanly.
  */
 void
@@ -674,7 +674,7 @@ logicalrep_pa_worker_stop(ParallelApplyWorkerInfo *winfo)
 	 * Only stop the worker if the generation matches and the worker is alive.
 	 */
 	if (worker->generation == generation && worker->proc)
-		logicalrep_worker_stop_internal(worker, SIGINT);
+		logicalrep_worker_stop_internal(worker, SIGUSR2);
 
 	LWLockRelease(LogicalRepWorkerLock);
 }
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index 5c1bbc495c0..18d003f2cc7 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -405,11 +405,11 @@ CreateInitDecodingContext(const char *plugin,
 	 * without further interlock its return value might immediately be out of
 	 * date.
 	 *
-	 * So we have to acquire the ProcArrayLock to prevent computation of new
-	 * xmin horizons by other backends, get the safe decoding xid, and inform
-	 * 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.
+	 * So we have to acquire both the ReplicationSlotControlLock and the
+	 * ProcArrayLock to prevent concurrent computation and update of new xmin
+	 * horizons by other backends, get the safe decoding xid, and inform the
+	 * slot machinery about the new limit. Once that's done both locks 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
@@ -422,6 +422,7 @@ CreateInitDecodingContext(const char *plugin,
 	 *
 	 * ----
 	 */
+	LWLockAcquire(ReplicationSlotControlLock, LW_EXCLUSIVE);
 	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
 
 	xmin_horizon = GetOldestSafeDecodingTransactionId(!need_full_snapshot);
@@ -436,6 +437,7 @@ CreateInitDecodingContext(const char *plugin,
 	ReplicationSlotsComputeRequiredXmin(true);
 
 	LWLockRelease(ProcArrayLock);
+	LWLockRelease(ReplicationSlotControlLock);
 
 	ReplicationSlotMarkDirty();
 	ReplicationSlotSave();
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index b529510c9b8..21b24f451a3 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -2599,7 +2599,7 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn,
 
 			if (++changes_count >= CHANGES_THRESHOLD)
 			{
-				rb->update_progress_txn(rb, txn, change->lsn);
+				rb->update_progress_txn(rb, txn, prev_lsn);
 				changes_count = 0;
 			}
 		}
diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/replication/logical/slotsync.c
index 3ec3abfa3da..3cbcd77d12f 100644
--- a/src/backend/replication/logical/slotsync.c
+++ b/src/backend/replication/logical/slotsync.c
@@ -72,16 +72,20 @@
 /*
  * Struct for sharing information to control slot synchronization.
  *
- * The slot sync worker's pid is needed by the startup process to shut it
- * down during promotion. The startup process shuts down the slot sync worker
- * and also sets stopSignaled=true to handle the race condition when the
- * postmaster has not noticed the promotion yet and thus may end up restarting
- * the slot sync worker. If stopSignaled is set, the worker will exit in such a
- * case. The SQL function pg_sync_replication_slots() will also error out if
- * this flag is set. Note that we don't need to reset this variable as after
- * promotion the slot sync worker won't be restarted because the pmState
- * changes to PM_RUN from PM_HOT_STANDBY and we don't support demoting
- * primary without restarting the server. See LaunchMissingBackgroundProcesses.
+ * The 'pid' is either the slot sync worker's pid or the backend's pid running
+ * the SQL function pg_sync_replication_slots(). On promotion, the startup
+ * process sets 'stopSignaled' and uses this 'pid' to signal the synchronizing
+ * process with PROCSIG_SLOTSYNC_MESSAGE and also to wake it up so that the
+ * process can immediately stop its synchronizing work.
+ * Setting 'stopSignaled' on the other hand is used to handle the race
+ * condition when the postmaster has not noticed the promotion yet and thus may
+ * end up restarting the slot sync worker. If 'stopSignaled' is set, the worker
+ * will exit in such a case. The SQL function pg_sync_replication_slots() will
+ * also error out if this flag is set. Note that we don't need to reset this
+ * variable as after promotion the slot sync worker won't be restarted because
+ * the pmState changes to PM_RUN from PM_HOT_STANDBY and we don't support
+ * demoting primary without restarting the server.
+ * See LaunchMissingBackgroundProcesses.
  *
  * The 'syncing' flag is needed to prevent concurrent slot syncs to avoid slot
  * overwrites.
@@ -126,6 +130,13 @@ static long sleep_ms = MIN_SLOTSYNC_WORKER_NAPTIME_MS;
  */
 static bool syncing_slots = false;
 
+/*
+ * Interrupt flag set when PROCSIG_SLOTSYNC_MESSAGE is received, asking the
+ * slotsync worker or pg_sync_replication_slots() to stop because
+ * standby promotion has been triggered.
+ */
+volatile sig_atomic_t SlotSyncShutdownPending = false;
+
 /*
  * Structure to hold information fetched from the primary server about a logical
  * replication slot.
@@ -264,9 +275,15 @@ update_local_synced_slot(RemoteSlot *remote_slot, Oid remote_dbid,
 
 			if (found_consistent_snapshot)
 				*found_consistent_snapshot = true;
+
+			updated_xmin_or_lsn = true;
 		}
 		else
 		{
+			XLogRecPtr	old_confirmed_lsn = slot->data.confirmed_flush;
+			XLogRecPtr	old_restart_lsn = slot->data.restart_lsn;
+			XLogRecPtr	old_catalog_xmin = slot->data.catalog_xmin;
+
 			LogicalSlotAdvanceAndCheckSnapState(remote_slot->confirmed_lsn,
 												found_consistent_snapshot);
 
@@ -278,9 +295,16 @@ update_local_synced_slot(RemoteSlot *remote_slot, Oid remote_dbid,
 						errdetail_internal("Remote slot has LSN %X/%X but local slot has LSN %X/%X.",
 										   LSN_FORMAT_ARGS(remote_slot->confirmed_lsn),
 										   LSN_FORMAT_ARGS(slot->data.confirmed_flush)));
-		}
 
-		updated_xmin_or_lsn = true;
+			/*
+			 * It is possible that the slot's xmin or LSNs are not updated,
+			 * when the synced slot has reached consistent snapshot state or
+			 * cannot build one at all.
+			 */
+			updated_xmin_or_lsn = (old_confirmed_lsn != slot->data.confirmed_flush ||
+								   old_restart_lsn != slot->data.restart_lsn ||
+								   old_catalog_xmin != slot->data.catalog_xmin);
+		}
 	}
 
 	if (remote_dbid != slot->data.database ||
@@ -483,70 +507,71 @@ drop_local_obsolete_slots(List *remote_slot_list)
  * Reserve WAL for the currently active local slot using the specified WAL
  * location (restart_lsn).
  *
- * If the given WAL location has been removed, reserve WAL using the oldest
- * existing WAL segment.
+ * If the given WAL location has been removed or is at risk of removal,
+ * reserve WAL using the oldest segment that is non-removable.
  */
 static void
 reserve_wal_for_local_slot(XLogRecPtr restart_lsn)
 {
-	XLogSegNo	oldest_segno;
+	XLogRecPtr	slot_min_lsn;
+	XLogRecPtr	min_safe_lsn;
 	XLogSegNo	segno;
 	ReplicationSlot *slot = MyReplicationSlot;
 
 	Assert(slot != NULL);
-	Assert(XLogRecPtrIsInvalid(slot->data.restart_lsn));
+	Assert(!XLogRecPtrIsValid(slot->data.restart_lsn));
 
-	while (true)
-	{
-		SpinLockAcquire(&slot->mutex);
-		slot->data.restart_lsn = restart_lsn;
-		SpinLockRelease(&slot->mutex);
-
-		/* Prevent WAL removal as fast as possible */
-		ReplicationSlotsComputeRequiredLSN();
-
-		XLByteToSeg(slot->data.restart_lsn, segno, wal_segment_size);
+	/*
+	 * Acquire an exclusive lock to prevent the checkpoint process from
+	 * concurrently calculating the minimum slot LSN (see
+	 * CheckPointReplicationSlots), ensuring that if WAL reservation occurs
+	 * first, the checkpoint must wait for the restart_lsn update before
+	 * calculating the minimum LSN.
+	 *
+	 * Note: Unlike ReplicationSlotReserveWal(), this lock does not protect a
+	 * newly synced slot from being invalidated if a concurrent checkpoint has
+	 * invoked CheckPointReplicationSlots() before the WAL reservation here.
+	 * This can happen because the initial restart_lsn received from the
+	 * remote server can precede the redo pointer. Therefore, when selecting
+	 * the initial restart_lsn, we consider using the redo pointer or the
+	 * minimum slot LSN (if those values are greater than the remote
+	 * restart_lsn) instead of relying solely on the remote value.
+	 */
+	LWLockAcquire(ReplicationSlotAllocationLock, LW_EXCLUSIVE);
 
-		/*
-		 * Find the oldest existing WAL segment file.
-		 *
-		 * Normally, we can determine it by using the last removed segment
-		 * number. However, if no WAL segment files have been removed by a
-		 * checkpoint since startup, we need to search for the oldest segment
-		 * file from the current timeline existing in XLOGDIR.
-		 *
-		 * XXX: Currently, we are searching for the oldest segment in the
-		 * current timeline as there is less chance of the slot's restart_lsn
-		 * from being some prior timeline, and even if it happens, in the
-		 * worst case, we will wait to sync till the slot's restart_lsn moved
-		 * to the current timeline.
-		 */
-		oldest_segno = XLogGetLastRemovedSegno() + 1;
+	/*
+	 * Determine the minimum non-removable LSN by comparing the redo pointer
+	 * with the minimum slot LSN.
+	 *
+	 * The minimum slot LSN is considered because the redo pointer advances at
+	 * every checkpoint, even when replication slots are present on the
+	 * standby. In such scenarios, the redo pointer can exceed the remote
+	 * restart_lsn, while WALs preceding the remote restart_lsn remain
+	 * protected by a local replication slot.
+	 */
+	min_safe_lsn = GetRedoRecPtr();
+	slot_min_lsn = XLogGetReplicationSlotMinimumLSN();
 
-		if (oldest_segno == 1)
-		{
-			TimeLineID	cur_timeline;
+	if (XLogRecPtrIsValid(slot_min_lsn) && min_safe_lsn > slot_min_lsn)
+		min_safe_lsn = slot_min_lsn;
 
-			GetWalRcvFlushRecPtr(NULL, &cur_timeline);
-			oldest_segno = XLogGetOldestSegno(cur_timeline);
-		}
+	/*
+	 * If the minimum safe LSN is greater than the given restart_lsn, use it
+	 * as the initial restart_lsn for the newly synced slot. Otherwise, use
+	 * the given remote restart_lsn.
+	 */
+	SpinLockAcquire(&slot->mutex);
+	slot->data.restart_lsn = Max(restart_lsn, min_safe_lsn);
+	SpinLockRelease(&slot->mutex);
 
-		elog(DEBUG1, "segno: " UINT64_FORMAT " of purposed restart_lsn for the synced slot, oldest_segno: " UINT64_FORMAT " available",
-			 segno, oldest_segno);
+	ReplicationSlotsComputeRequiredLSN();
 
-		/*
-		 * If all required WAL is still there, great, otherwise retry. The
-		 * slot should prevent further removal of WAL, unless there's a
-		 * concurrent ReplicationSlotsComputeRequiredLSN() after we've written
-		 * the new restart_lsn above, so normally we should never need to loop
-		 * more than twice.
-		 */
-		if (segno >= oldest_segno)
-			break;
+	XLByteToSeg(slot->data.restart_lsn, segno, wal_segment_size);
+	if (XLogGetLastRemovedSegno() >= segno)
+		elog(ERROR, "WAL required by replication slot %s has been removed concurrently",
+			 NameStr(slot->data.name));
 
-		/* Retry using the location of the oldest wal segment */
-		XLogSegNoOffsetToRecPtr(oldest_segno, 0, wal_segment_size, restart_lsn);
-	}
+	LWLockRelease(ReplicationSlotAllocationLock);
 }
 
 /*
@@ -776,6 +801,7 @@ synchronize_one_slot(RemoteSlot *remote_slot, Oid remote_dbid)
 
 		reserve_wal_for_local_slot(remote_slot->restart_lsn);
 
+		LWLockAcquire(ReplicationSlotControlLock, LW_EXCLUSIVE);
 		LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
 		xmin_horizon = GetOldestSafeDecodingTransactionId(true);
 		SpinLockAcquire(&slot->mutex);
@@ -784,6 +810,7 @@ synchronize_one_slot(RemoteSlot *remote_slot, Oid remote_dbid)
 		SpinLockRelease(&slot->mutex);
 		ReplicationSlotsComputeRequiredXmin(true);
 		LWLockRelease(ProcArrayLock);
+		LWLockRelease(ReplicationSlotControlLock);
 
 		update_and_persist_local_synced_slot(remote_slot, remote_dbid);
 
@@ -1059,14 +1086,14 @@ ValidateSlotSyncParams(int elevel)
 {
 	/*
 	 * Logical slot sync/creation requires wal_level >= logical.
-	 *
-	 * Since altering the wal_level requires a server restart, so error out in
-	 * this case regardless of elevel provided by caller.
 	 */
 	if (wal_level < WAL_LEVEL_LOGICAL)
-		ereport(ERROR,
+	{
+		ereport(elevel,
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("replication slot synchronization requires \"wal_level\" >= \"logical\""));
+		return false;
+	}
 
 	/*
 	 * A physical replication slot(primary_slot_name) is required on the
@@ -1116,10 +1143,10 @@ ValidateSlotSyncParams(int elevel)
 }
 
 /*
- * Re-read the config file.
+ * Re-read the config file for slot synchronization.
  *
- * Exit if any of the slot sync GUCs have changed. The postmaster will
- * restart it.
+ * Exit or throw error if relevant GUCs have changed depending on whether
+ * called from slot sync worker or from the SQL function pg_sync_replication_slots()
  */
 static void
 slotsync_reread_config(void)
@@ -1130,8 +1157,11 @@ slotsync_reread_config(void)
 	bool		old_hot_standby_feedback = hot_standby_feedback;
 	bool		conninfo_changed;
 	bool		primary_slotname_changed;
+	bool		is_slotsync_worker = AmLogicalSlotSyncWorkerProcess();
+	bool		parameter_changed = false;
 
-	Assert(sync_replication_slots);
+	if (is_slotsync_worker)
+		Assert(sync_replication_slots);
 
 	ConfigReloadPending = false;
 	ProcessConfigFile(PGC_SIGHUP);
@@ -1143,48 +1173,105 @@ slotsync_reread_config(void)
 
 	if (old_sync_replication_slots != sync_replication_slots)
 	{
-		ereport(LOG,
-		/* translator: %s is a GUC variable name */
-				errmsg("replication slot synchronization worker will shut down because \"%s\" is disabled", "sync_replication_slots"));
-		proc_exit(0);
-	}
+		if (is_slotsync_worker)
+		{
+			ereport(LOG,
+			/* translator: %s is a GUC variable name */
+					errmsg("replication slot synchronization worker will stop because \"%s\" is disabled",
+						   "sync_replication_slots"));
 
-	if (conninfo_changed ||
-		primary_slotname_changed ||
-		(old_hot_standby_feedback != hot_standby_feedback))
+			proc_exit(0);
+		}
+
+		parameter_changed = true;
+	}
+	else
 	{
-		ereport(LOG,
-				errmsg("replication slot synchronization worker will restart because of a parameter change"));
+		if (conninfo_changed ||
+			primary_slotname_changed ||
+			(old_hot_standby_feedback != hot_standby_feedback))
+		{
 
-		/*
-		 * Reset the last-start time for this worker so that the postmaster
-		 * can restart it without waiting for SLOTSYNC_RESTART_INTERVAL_SEC.
-		 */
-		SlotSyncCtx->last_start_time = 0;
+			if (is_slotsync_worker)
+			{
+				ereport(LOG,
+						errmsg("replication slot synchronization worker will restart because of a parameter change"));
 
-		proc_exit(0);
+				/*
+				 * Reset the last-start time for this worker so that the
+				 * postmaster can restart it without waiting for
+				 * SLOTSYNC_RESTART_INTERVAL_SEC.
+				 */
+				SlotSyncCtx->last_start_time = 0;
+
+				proc_exit(0);
+			}
+
+			parameter_changed = true;
+		}
+	}
+
+	/*
+	 * If we have reached here with a parameter change, we must be running in
+	 * SQL function, emit error in such a case.
+	 */
+	if (parameter_changed)
+	{
+		Assert(!is_slotsync_worker);
+		ereport(ERROR,
+				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				errmsg("replication slot synchronization will stop because of a parameter change"));
 	}
 
 }
 
 /*
- * Interrupt handler for main loop of slot sync worker.
+ * Handle receipt of an interrupt indicating a slotsync shutdown message.
+ *
+ * This is called within the SIGUSR1 handler.  All we do here is set a flag
+ * that will cause the next CHECK_FOR_INTERRUPTS() to invoke
+ * ProcessSlotSyncMessage().
  */
-static void
-ProcessSlotSyncInterrupts(WalReceiverConn *wrconn)
+void
+HandleSlotSyncMessageInterrupt(void)
 {
-	CHECK_FOR_INTERRUPTS();
+	InterruptPending = true;
+	SlotSyncShutdownPending = true;
+	/* latch will be set by procsignal_sigusr1_handler */
+}
 
-	if (ShutdownRequestPending)
+/*
+ * Handle a PROCSIG_SLOTSYNC_MESSAGE signal, called from ProcessInterrupts().
+ *
+ * If the current process is the slotsync background worker, log a message
+ * and exit cleanly.  If it is a backend executing pg_sync_replication_slots(),
+ * raise an error, unless the sync has already finished, in which case there
+ * is no need to interrupt the caller.
+ */
+void
+ProcessSlotSyncMessage(void)
+{
+	SlotSyncShutdownPending = false;
+
+	if (AmLogicalSlotSyncWorkerProcess())
 	{
 		ereport(LOG,
-				errmsg("replication slot synchronization worker is shutting down on receiving SIGINT"));
-
+				errmsg("replication slot synchronization worker will stop because promotion is triggered"));
 		proc_exit(0);
 	}
+	else
+	{
+		/*
+		 * If sync has already completed, there is no need to interrupt the
+		 * caller with an error.
+		 */
+		if (!IsSyncingReplicationSlots())
+			return;
 
-	if (ConfigReloadPending)
-		slotsync_reread_config();
+		ereport(ERROR,
+				errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				errmsg("replication slot synchronization will stop because promotion is triggered"));
+	}
 }
 
 /*
@@ -1283,27 +1370,40 @@ wait_for_slot_activity(bool some_slot_updated)
 }
 
 /*
- * Emit an error if a promotion or a concurrent sync call is in progress.
+ * Emit an error if a concurrent sync call is in progress.
  * Otherwise, advertise that a sync is in progress.
  */
 static void
-check_and_set_sync_info(pid_t worker_pid)
+check_and_set_sync_info(pid_t sync_process_pid)
 {
 	SpinLockAcquire(&SlotSyncCtx->mutex);
 
-	/* The worker pid must not be already assigned in SlotSyncCtx */
-	Assert(worker_pid == InvalidPid || SlotSyncCtx->pid == InvalidPid);
-
 	/*
-	 * Emit an error if startup process signaled the slot sync machinery to
-	 * stop. See comments atop SlotSyncCtxStruct.
+	 * Exit immediately if promotion has been triggered.  This guards against
+	 * a new worker (or a call to pg_sync_replication_slots()) that starts
+	 * after the old worker was stopped by ShutDownSlotSync().
 	 */
 	if (SlotSyncCtx->stopSignaled)
 	{
 		SpinLockRelease(&SlotSyncCtx->mutex);
-		ereport(ERROR,
-				errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				errmsg("cannot synchronize replication slots when standby promotion is ongoing"));
+
+		if (AmLogicalSlotSyncWorkerProcess())
+		{
+			ereport(DEBUG1,
+					errmsg("replication slot synchronization worker will not start because promotion was triggered"));
+
+			proc_exit(0);
+		}
+		else
+		{
+			/*
+			 * For the backend executing SQL function
+			 * pg_sync_replication_slots().
+			 */
+			ereport(ERROR,
+					errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					errmsg("replication slot synchronization will not start because promotion was triggered"));
+		}
 	}
 
 	if (SlotSyncCtx->syncing)
@@ -1314,13 +1414,16 @@ check_and_set_sync_info(pid_t worker_pid)
 				errmsg("cannot synchronize replication slots concurrently"));
 	}
 
+	/* The pid must not be already assigned in SlotSyncCtx */
+	Assert(SlotSyncCtx->pid == InvalidPid);
+
 	SlotSyncCtx->syncing = true;
 
 	/*
 	 * Advertise the required PID so that the startup process can kill the
-	 * slot sync worker on promotion.
+	 * slot sync process on promotion.
 	 */
-	SlotSyncCtx->pid = worker_pid;
+	SlotSyncCtx->pid = sync_process_pid;
 
 	SpinLockRelease(&SlotSyncCtx->mutex);
 
@@ -1335,10 +1438,11 @@ reset_syncing_flag()
 {
 	SpinLockAcquire(&SlotSyncCtx->mutex);
 	SlotSyncCtx->syncing = false;
+	SlotSyncCtx->pid = InvalidPid;
 	SpinLockRelease(&SlotSyncCtx->mutex);
 
 	syncing_slots = false;
-};
+}
 
 /*
  * The main loop of our worker process.
@@ -1409,7 +1513,7 @@ ReplSlotSyncWorkerMain(const void *startup_data, size_t startup_data_len)
 
 	/* Setup signal handling */
 	pqsignal(SIGHUP, SignalHandlerForConfigReload);
-	pqsignal(SIGINT, SignalHandlerForShutdownRequest);
+	pqsignal(SIGINT, StatementCancelHandler);
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGFPE, FloatExceptionHandler);
 	pqsignal(SIGUSR1, procsignal_sigusr1_handler);
@@ -1477,7 +1581,6 @@ ReplSlotSyncWorkerMain(const void *startup_data, size_t startup_data_len)
 	 */
 	wrconn = walrcv_connect(PrimaryConnInfo, false, false, false,
 							app_name.data, &err);
-	pfree(app_name.data);
 
 	if (!wrconn)
 		ereport(ERROR,
@@ -1485,6 +1588,8 @@ ReplSlotSyncWorkerMain(const void *startup_data, size_t startup_data_len)
 				errmsg("synchronization worker \"%s\" could not connect to the primary server: %s",
 					   app_name.data, err));
 
+	pfree(app_name.data);
+
 	/*
 	 * Register the disconnection callback.
 	 *
@@ -1506,7 +1611,10 @@ ReplSlotSyncWorkerMain(const void *startup_data, size_t startup_data_len)
 	{
 		bool		some_slot_updated = false;
 
-		ProcessSlotSyncInterrupts(wrconn);
+		CHECK_FOR_INTERRUPTS();
+
+		if (ConfigReloadPending)
+			slotsync_reread_config();
 
 		some_slot_updated = synchronize_slots(wrconn);
 
@@ -1515,7 +1623,8 @@ ReplSlotSyncWorkerMain(const void *startup_data, size_t startup_data_len)
 
 	/*
 	 * The slot sync worker can't get here because it will only stop when it
-	 * receives a SIGINT from the startup process, or when there is an error.
+	 * receives a stop request from the startup process, or when there is an
+	 * error.
 	 */
 	Assert(false);
 }
@@ -1541,7 +1650,7 @@ update_synced_slots_inactive_since(void)
 	if (!StandbyMode)
 		return;
 
-	/* The slot sync worker or SQL function mustn't be running by now */
+	/* The slot sync worker or the SQL function mustn't be running by now */
 	Assert((SlotSyncCtx->pid == InvalidPid) && !SlotSyncCtx->syncing);
 
 	LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
@@ -1570,16 +1679,18 @@ update_synced_slots_inactive_since(void)
 }
 
 /*
- * Shut down the slot sync worker.
+ * Shut down slot synchronization.
  *
- * This function sends signal to shutdown slot sync worker, if required. It
- * also waits till the slot sync worker has exited or
+ * This function sets stopSignaled=true and wakes up the slot sync process
+ * (either worker or backend running the SQL function pg_sync_replication_slots())
+ * so that worker can exit or the SQL function pg_sync_replication_slots() can
+ * finish. It also waits till the slot sync worker has exited or
  * pg_sync_replication_slots() has finished.
  */
 void
 ShutDownSlotSync(void)
 {
-	pid_t		worker_pid;
+	pid_t		sync_process_pid;
 
 	SpinLockAcquire(&SlotSyncCtx->mutex);
 
@@ -1596,12 +1707,16 @@ ShutDownSlotSync(void)
 		return;
 	}
 
-	worker_pid = SlotSyncCtx->pid;
+	sync_process_pid = SlotSyncCtx->pid;
 
 	SpinLockRelease(&SlotSyncCtx->mutex);
 
-	if (worker_pid != InvalidPid)
-		kill(worker_pid, SIGINT);
+	/*
+	 * Signal process doing slotsync, if any, asking it to stop.
+	 */
+	if (sync_process_pid != InvalidPid)
+		SendProcSignal(sync_process_pid, PROCSIG_SLOTSYNC_MESSAGE,
+					   INVALID_PROC_NUMBER);
 
 	/* Wait for slot sync to end */
 	for (;;)
@@ -1744,7 +1859,7 @@ SyncReplicationSlots(WalReceiverConn *wrconn)
 {
 	PG_ENSURE_ERROR_CLEANUP(slotsync_failure_callback, PointerGetDatum(wrconn));
 	{
-		check_and_set_sync_info(InvalidPid);
+		check_and_set_sync_info(MyProcPid);
 
 		validate_remote_info(wrconn);
 
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 1ef8f6d021c..3b6b2c4f5ba 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -316,7 +316,8 @@ process_syncing_tables_for_sync(XLogRecPtr current_lsn)
 		UpdateSubscriptionRelState(MyLogicalRepWorker->subid,
 								   MyLogicalRepWorker->relid,
 								   MyLogicalRepWorker->relstate,
-								   MyLogicalRepWorker->relstate_lsn);
+								   MyLogicalRepWorker->relstate_lsn,
+								   false);
 
 		/*
 		 * End streaming so that LogRepWorkerWalRcvConn can be used to drop
@@ -425,6 +426,7 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn)
 	ListCell   *lc;
 	bool		started_tx = false;
 	bool		should_exit = false;
+	Relation	rel = NULL;
 
 	Assert(!IsTransactionState());
 
@@ -492,7 +494,17 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn)
 				 * worker to remove the origin tracking as if there is any
 				 * error while dropping we won't restart it to drop the
 				 * origin. So passing missing_ok = true.
+				 *
+				 * Lock the subscription and origin in the same order as we
+				 * are doing during DDL commands to avoid deadlocks. See
+				 * AlterSubscription_refresh.
 				 */
+				LockSharedObject(SubscriptionRelationId, MyLogicalRepWorker->subid,
+								 0, AccessShareLock);
+
+				if (!rel)
+					rel = table_open(SubscriptionRelRelationId, RowExclusiveLock);
+
 				ReplicationOriginNameForLogicalRep(MyLogicalRepWorker->subid,
 												   rstate->relid,
 												   originname,
@@ -504,7 +516,7 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn)
 				 */
 				UpdateSubscriptionRelState(MyLogicalRepWorker->subid,
 										   rstate->relid, rstate->state,
-										   rstate->lsn);
+										   rstate->lsn, true);
 			}
 		}
 		else
@@ -555,7 +567,14 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn)
 						 * This is required to avoid any undetected deadlocks
 						 * due to any existing lock as deadlock detector won't
 						 * be able to detect the waits on the latch.
+						 *
+						 * Also close any tables prior to the commit.
 						 */
+						if (rel)
+						{
+							table_close(rel, NoLock);
+							rel = NULL;
+						}
 						CommitTransactionCommand();
 						pgstat_report_stat(false);
 					}
@@ -622,6 +641,11 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn)
 		}
 	}
 
+	/* Close table if opened */
+	if (rel)
+		table_close(rel, NoLock);
+
+
 	if (started_tx)
 	{
 		/*
@@ -1408,12 +1432,27 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 	MyLogicalRepWorker->relstate_lsn = InvalidXLogRecPtr;
 	SpinLockRelease(&MyLogicalRepWorker->relmutex);
 
-	/* Update the state and make it visible to others. */
+	/*
+	 * Update the state, create the replication origin, and make them visible
+	 * to others.
+	 */
 	StartTransactionCommand();
 	UpdateSubscriptionRelState(MyLogicalRepWorker->subid,
 							   MyLogicalRepWorker->relid,
 							   MyLogicalRepWorker->relstate,
-							   MyLogicalRepWorker->relstate_lsn);
+							   MyLogicalRepWorker->relstate_lsn,
+							   false);
+
+	/*
+	 * Create the replication origin in a separate transaction from the one
+	 * that sets up the origin in shared memory. This prevents the risk that
+	 * changes to the origin in shared memory cannot be rolled back if the
+	 * transaction aborts.
+	 */
+	originid = replorigin_by_name(originname, true);
+	if (!OidIsValid(originid))
+		originid = replorigin_create(originname);
+
 	CommitTransactionCommand();
 	pgstat_report_stat(true);
 
@@ -1453,37 +1492,21 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 					   CRS_USE_SNAPSHOT, origin_startpos);
 
 	/*
-	 * Setup replication origin tracking. The purpose of doing this before the
-	 * copy is to avoid doing the copy again due to any error in setting up
-	 * origin tracking.
+	 * Advance the origin to the LSN got from walrcv_create_slot and then set
+	 * up the origin. The advancement is WAL logged for the purpose of
+	 * recovery. Locks are to prevent the replication origin from vanishing
+	 * while advancing.
+	 *
+	 * The purpose of doing these before the copy is to avoid doing the copy
+	 * again due to any error in advancing or setting up origin tracking.
 	 */
-	originid = replorigin_by_name(originname, true);
-	if (!OidIsValid(originid))
-	{
-		/*
-		 * Origin tracking does not exist, so create it now.
-		 *
-		 * Then advance to the LSN got from walrcv_create_slot. This is WAL
-		 * logged for the purpose of recovery. Locks are to prevent the
-		 * replication origin from vanishing while advancing.
-		 */
-		originid = replorigin_create(originname);
-
-		LockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
-		replorigin_advance(originid, *origin_startpos, InvalidXLogRecPtr,
-						   true /* go backward */ , true /* WAL log */ );
-		UnlockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
+	LockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
+	replorigin_advance(originid, *origin_startpos, InvalidXLogRecPtr,
+					   true /* go backward */ , true /* WAL log */ );
+	UnlockRelationOid(ReplicationOriginRelationId, RowExclusiveLock);
 
-		replorigin_session_setup(originid, 0);
-		replorigin_session_origin = originid;
-	}
-	else
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_OBJECT),
-				 errmsg("replication origin \"%s\" already exists",
-						originname)));
-	}
+	replorigin_session_setup(originid, 0);
+	replorigin_session_origin = originid;
 
 	/*
 	 * Make sure that the copy command runs as the table owner, unless the
@@ -1546,7 +1569,8 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 	UpdateSubscriptionRelState(MyLogicalRepWorker->subid,
 							   MyLogicalRepWorker->relid,
 							   SUBREL_STATE_FINISHEDCOPY,
-							   MyLogicalRepWorker->relstate_lsn);
+							   MyLogicalRepWorker->relstate_lsn,
+							   false);
 
 	CommitTransactionCommand();
 
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 803faf32371..5f34183935d 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -4682,6 +4682,13 @@ InitializeLogRepWorker(void)
 	StartTransactionCommand();
 	oldctx = MemoryContextSwitchTo(ApplyContext);
 
+	/*
+	 * Lock the subscription to prevent it from being concurrently dropped,
+	 * then re-verify its existence. After the initialization, the worker will
+	 * be terminated gracefully if the subscription is dropped.
+	 */
+	LockSharedObject(SubscriptionRelationId, MyLogicalRepWorker->subid, 0,
+					 AccessShareLock);
 	MySubscription = GetSubscription(MyLogicalRepWorker->subid, true);
 	if (!MySubscription)
 	{
@@ -4735,6 +4742,23 @@ InitializeLogRepWorker(void)
 						MySubscription->name)));
 
 	CommitTransactionCommand();
+
+	/*
+	 * Register a callback to reset the origin state before aborting any
+	 * pending transaction during shutdown (see ShutdownPostgres()). This will
+	 * avoid origin advancement for an incomplete transaction which could
+	 * otherwise lead to its loss as such a transaction won't be sent by the
+	 * server again.
+	 *
+	 * Note that even a LOG or DEBUG statement placed after setting the origin
+	 * state may process a shutdown signal before committing the current apply
+	 * operation. So, it is important to register such a callback here.
+	 *
+	 * Register this callback here to ensure that all types of logical
+	 * replication workers that set up origins and apply remote transactions
+	 * are protected.
+	 */
+	before_shmem_exit(replorigin_reset, (Datum) 0);
 }
 
 /*
@@ -4776,19 +4800,6 @@ SetupApplyOrSyncWorker(int worker_slot)
 
 	InitializeLogRepWorker();
 
-	/*
-	 * Register a callback to reset the origin state before aborting any
-	 * pending transaction during shutdown (see ShutdownPostgres()). This will
-	 * avoid origin advancement for an in-complete transaction which could
-	 * otherwise lead to its loss as such a transaction won't be sent by the
-	 * server again.
-	 *
-	 * Note that even a LOG or DEBUG statement placed after setting the origin
-	 * state may process a shutdown signal before committing the current apply
-	 * operation. So, it is important to register such a callback here.
-	 */
-	before_shmem_exit(replorigin_reset, (Datum) 0);
-
 	/* Connect to the origin and start the replication. */
 	elog(DEBUG1, "connecting to publisher using connection string \"%s\"",
 		 MySubscription->conninfo);
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 64a21453f1d..51a5844cd45 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -235,6 +235,7 @@ static bool get_schema_sent_in_streamed_txn(RelationSyncEntry *entry,
 											TransactionId xid);
 static void init_tuple_slot(PGOutputData *data, Relation relation,
 							RelationSyncEntry *entry);
+static void pgoutput_memory_context_reset(void *arg);
 
 /* row filter routines */
 static EState *create_estate_for_relation(Relation rel);
@@ -343,7 +344,11 @@ parse_output_parameters(List *options, PGOutputData *data)
 						 errmsg("conflicting or redundant options")));
 			publication_names_given = true;
 
-			if (!SplitIdentifierString(strVal(defel->arg), ',',
+			/*
+			 * Pass a copy of the DefElem->arg since SplitIdentifierString
+			 * modifies its input.
+			 */
+			if (!SplitIdentifierString(pstrdup(strVal(defel->arg)), ',',
 									   &data->publication_names))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_NAME),
@@ -424,6 +429,19 @@ parse_output_parameters(List *options, PGOutputData *data)
 				errmsg("option \"%s\" missing", "publication_names"));
 }
 
+/*
+ * Memory context reset callback of PGOutputData->context.
+ */
+static void
+pgoutput_memory_context_reset(void *arg)
+{
+	if (RelationSyncCache)
+	{
+		hash_destroy(RelationSyncCache);
+		RelationSyncCache = NULL;
+	}
+}
+
 /*
  * Initialize this plugin
  */
@@ -433,6 +451,7 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
 {
 	PGOutputData *data = palloc0(sizeof(PGOutputData));
 	static bool publication_callback_registered = false;
+	MemoryContextCallback *mcallback;
 
 	/* Create our memory context for private allocations. */
 	data->context = AllocSetContextCreate(ctx->context,
@@ -447,6 +466,14 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
 										 "logical replication publication list context",
 										 ALLOCSET_SMALL_SIZES);
 
+	/*
+	 * Ensure to cleanup RelationSyncCache even when logical decoding invoked
+	 * via SQL interface ends up with an error.
+	 */
+	mcallback = palloc0(sizeof(MemoryContextCallback));
+	mcallback->func = pgoutput_memory_context_reset;
+	MemoryContextRegisterResetCallback(ctx->context, mcallback);
+
 	ctx->output_plugin_private = data;
 
 	/* This plugin uses binary protocol. */
@@ -1758,11 +1785,7 @@ pgoutput_origin_filter(LogicalDecodingContext *ctx,
 static void
 pgoutput_shutdown(LogicalDecodingContext *ctx)
 {
-	if (RelationSyncCache)
-	{
-		hash_destroy(RelationSyncCache);
-		RelationSyncCache = NULL;
-	}
+	pgoutput_memory_context_reset(NULL);
 }
 
 /*
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index f9fec50ae88..4246d0a51e1 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -154,7 +154,7 @@ int			max_replication_slots = 10; /* the maximum number of replication
  * Invalidate replication slots that have remained idle longer than this
  * duration; '0' disables it.
  */
-int			idle_replication_slot_timeout_mins = 0;
+int			idle_replication_slot_timeout_secs = 0;
 
 /*
  * This GUC lists streaming replication standby server slot names that
@@ -258,31 +258,68 @@ ReplicationSlotShmemExit(int code, Datum arg)
 /*
  * Check whether the passed slot name is valid and report errors at elevel.
  *
+ * See comments for ReplicationSlotValidateNameInternal().
+ */
+bool
+ReplicationSlotValidateName(const char *name, int elevel)
+{
+	int			err_code;
+	char	   *err_msg = NULL;
+	char	   *err_hint = NULL;
+
+	if (!ReplicationSlotValidateNameInternal(name, &err_code, &err_msg,
+											 &err_hint))
+	{
+		/*
+		 * Use errmsg_internal() and errhint_internal() instead of errmsg()
+		 * and errhint(), since the messages from
+		 * ReplicationSlotValidateNameInternal() are already translated. This
+		 * avoids double translation.
+		 */
+		ereport(elevel,
+				errcode(err_code),
+				errmsg_internal("%s", err_msg),
+				(err_hint != NULL) ? errhint_internal("%s", err_hint) : 0);
+
+		pfree(err_msg);
+		if (err_hint != NULL)
+			pfree(err_hint);
+		return false;
+	}
+
+	return true;
+}
+
+/*
+ * Check whether the passed slot name is valid.
+ *
  * Slot names may consist out of [a-z0-9_]{1,NAMEDATALEN-1} which should allow
  * the name to be used as a directory name on every supported OS.
  *
- * Returns whether the directory name is valid or not if elevel < ERROR.
+ * Returns true if the slot name is valid. Otherwise, returns false and stores
+ * the error code, error message, and optional hint in err_code, err_msg, and
+ * err_hint, respectively. The caller is responsible for freeing err_msg and
+ * err_hint, which are palloc'd.
  */
 bool
-ReplicationSlotValidateName(const char *name, int elevel)
+ReplicationSlotValidateNameInternal(const char *name, int *err_code,
+									char **err_msg, char **err_hint)
 {
 	const char *cp;
 
 	if (strlen(name) == 0)
 	{
-		ereport(elevel,
-				(errcode(ERRCODE_INVALID_NAME),
-				 errmsg("replication slot name \"%s\" is too short",
-						name)));
+		*err_code = ERRCODE_INVALID_NAME;
+		*err_msg = psprintf(_("replication slot name \"%s\" is too short"), name);
+		*err_hint = NULL;
 		return false;
 	}
 
 	if (strlen(name) >= NAMEDATALEN)
 	{
-		ereport(elevel,
-				(errcode(ERRCODE_NAME_TOO_LONG),
-				 errmsg("replication slot name \"%s\" is too long",
-						name)));
+		*err_code = ERRCODE_NAME_TOO_LONG;
+		*err_msg = psprintf(_("replication slot name \"%s\" is too long"), name);
+		*err_hint = NULL;
 		return false;
 	}
 
@@ -292,11 +329,9 @@ ReplicationSlotValidateName(const char *name, int elevel)
 			  || (*cp >= '0' && *cp <= '9')
 			  || (*cp == '_')))
 		{
-			ereport(elevel,
-					(errcode(ERRCODE_INVALID_NAME),
-					 errmsg("replication slot name \"%s\" contains invalid character",
-							name),
-					 errhint("Replication slot names may only contain lower case letters, numbers, and the underscore character.")));
+			*err_code = ERRCODE_INVALID_NAME;
+			*err_msg = psprintf(_("replication slot name \"%s\" contains invalid character"), name);
+			*err_hint = psprintf(_("Replication slot names may only contain lower case letters, numbers, and the underscore character."));
 			return false;
 		}
 	}
@@ -309,13 +344,7 @@ ReplicationSlotValidateName(const char *name, int elevel)
  * name: Name of the slot
  * db_specific: logical decoding is db specific; if the slot is going to
  *	   be used for that pass true, otherwise false.
- * two_phase: Allows decoding of prepared transactions. We allow this option
- *     to be enabled only at the slot creation time. If we allow this option
- *     to be changed during decoding then it is quite possible that we skip
- *     prepare first time because this option was not enabled. Now next time
- *     during getting changes, if the two_phase option is enabled it can skip
- *     prepare because by that time start decoding point has been moved. So the
- *     user will only get commit prepared.
+ * two_phase: If enabled, allows decoding of prepared transactions.
  * failover: If enabled, allows the slot to be synced to standbys so
  *     that logical replication can be resumed after failover.
  * synced: True if the slot is synchronized from the primary server.
@@ -609,7 +638,7 @@ ReplicationSlotAcquire(const char *name, bool nowait, bool error_if_invalid)
 	}
 	else
 	{
-		active_pid = MyProcPid;
+		s->active_pid = active_pid = MyProcPid;
 		ReplicationSlotSetInactiveSince(s, 0, true);
 	}
 	LWLockRelease(ReplicationSlotControlLock);
@@ -833,6 +862,16 @@ ReplicationSlotDrop(const char *name, bool nowait)
 
 /*
  * Change the definition of the slot identified by the specified name.
+ *
+ * Altering the two_phase property of a slot requires caution on the
+ * client-side. Enabling it at any random point during decoding has the
+ * risk that transactions prepared before this change may be skipped by
+ * the decoder, leading to missing prepare records on the client. So, we
+ * enable it for subscription related slots only once the initial tablesync
+ * is finished. See comments atop worker.c. Disabling it is safe only when
+ * there are no pending prepared transaction, otherwise, the changes of
+ * already prepared transactions can be replicated again along with their
+ * corresponding commit leading to duplicate data or errors.
  */
 void
 ReplicationSlotAlter(const char *name, const bool *failover,
@@ -1094,8 +1133,11 @@ ReplicationSlotPersist(void)
 /*
  * Compute the oldest xmin across all slots and store it in the ProcArray.
  *
- * If already_locked is true, ProcArrayLock has already been acquired
- * exclusively.
+ * If already_locked is true, both the ReplicationSlotControlLock and the
+ * ProcArrayLock have already been acquired exclusively. It is crucial that the
+ * caller first acquires the ReplicationSlotControlLock, followed by the
+ * ProcArrayLock, to prevent any undetectable deadlocks since this function
+ * acquires them in that order.
  */
 void
 ReplicationSlotsComputeRequiredXmin(bool already_locked)
@@ -1105,8 +1147,33 @@ ReplicationSlotsComputeRequiredXmin(bool already_locked)
 	TransactionId agg_catalog_xmin = InvalidTransactionId;
 
 	Assert(ReplicationSlotCtl != NULL);
+	Assert(!already_locked ||
+		   (LWLockHeldByMeInMode(ReplicationSlotControlLock, LW_EXCLUSIVE) &&
+			LWLockHeldByMeInMode(ProcArrayLock, LW_EXCLUSIVE)));
 
-	LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
+	/*
+	 * Hold the ReplicationSlotControlLock until after updating the slot xmin
+	 * values, so no backend updates the initial xmin for newly created slot
+	 * concurrently. A shared lock is used here to minimize lock contention,
+	 * especially when many slots exist and advancements occur frequently.
+	 * This is safe since an exclusive lock is taken during initial slot xmin
+	 * update in slot creation.
+	 *
+	 * One might think that we can hold the ProcArrayLock exclusively and
+	 * update the slot xmin values, but it could increase lock contention on
+	 * the ProcArrayLock, which is not great since this function can be called
+	 * at non-negligible frequency.
+	 *
+	 * Concurrent invocation of this function may cause the computed slot xmin
+	 * to regress. However, this is harmless because tuples prior to the most
+	 * recent xmin are no longer useful once advancement occurs (see
+	 * LogicalConfirmReceivedLocation where the slot's xmin value is flushed
+	 * before updating the effective_xmin). Thus, such regression merely
+	 * prevents VACUUM from prematurely removing tuples without causing the
+	 * early deletion of required data.
+	 */
+	if (!already_locked)
+		LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
 
 	for (i = 0; i < max_replication_slots; i++)
 	{
@@ -1141,9 +1208,10 @@ ReplicationSlotsComputeRequiredXmin(bool already_locked)
 			agg_catalog_xmin = effective_catalog_xmin;
 	}
 
-	LWLockRelease(ReplicationSlotControlLock);
-
 	ProcArraySetReplicationSlotXmin(agg_xmin, agg_catalog_xmin, already_locked);
+
+	if (!already_locked)
+		LWLockRelease(ReplicationSlotControlLock);
 }
 
 /*
@@ -1495,63 +1563,65 @@ void
 ReplicationSlotReserveWal(void)
 {
 	ReplicationSlot *slot = MyReplicationSlot;
+	XLogSegNo	segno;
+	XLogRecPtr	restart_lsn;
 
 	Assert(slot != NULL);
 	Assert(slot->data.restart_lsn == InvalidXLogRecPtr);
 	Assert(slot->last_saved_restart_lsn == InvalidXLogRecPtr);
 
 	/*
-	 * The replication slot mechanism is used to prevent removal of required
-	 * WAL. As there is no interlock between this routine and checkpoints, WAL
-	 * segments could concurrently be removed when a now stale return value of
-	 * ReplicationSlotsComputeRequiredLSN() is used. In the unlikely case that
-	 * this happens we'll just retry.
+	 * The replication slot mechanism is used to prevent the removal of
+	 * required WAL.
+	 *
+	 * Acquire an exclusive lock to prevent the checkpoint process from
+	 * concurrently computing the minimum slot LSN (see
+	 * CheckPointReplicationSlots). This ensures that the WAL reserved for
+	 * replication cannot be removed during a checkpoint.
+	 *
+	 * The mechanism is reliable because if WAL reservation occurs first, the
+	 * checkpoint must wait for the restart_lsn update before determining the
+	 * minimum non-removable LSN. On the other hand, if the checkpoint happens
+	 * first, subsequent WAL reservations will select positions at or beyond
+	 * the redo pointer of that checkpoint.
 	 */
-	while (true)
-	{
-		XLogSegNo	segno;
-		XLogRecPtr	restart_lsn;
+	LWLockAcquire(ReplicationSlotAllocationLock, LW_EXCLUSIVE);
 
-		/*
-		 * For logical slots log a standby snapshot and start logical decoding
-		 * at exactly that position. That allows the slot to start up more
-		 * quickly. But on a standby we cannot do WAL writes, so just use the
-		 * replay pointer; effectively, an attempt to create a logical slot on
-		 * standby will cause it to wait for an xl_running_xact record to be
-		 * logged independently on the primary, so that a snapshot can be
-		 * built using the record.
-		 *
-		 * None of this is needed (or indeed helpful) for physical slots as
-		 * they'll start replay at the last logged checkpoint anyway. Instead
-		 * return the location of the last redo LSN. While that slightly
-		 * increases the chance that we have to retry, it's where a base
-		 * backup has to start replay at.
-		 */
-		if (SlotIsPhysical(slot))
-			restart_lsn = GetRedoRecPtr();
-		else if (RecoveryInProgress())
-			restart_lsn = GetXLogReplayRecPtr(NULL);
-		else
-			restart_lsn = GetXLogInsertRecPtr();
+	/*
+	 * For logical slots log a standby snapshot and start logical decoding at
+	 * exactly that position. That allows the slot to start up more quickly.
+	 * But on a standby we cannot do WAL writes, so just use the replay
+	 * pointer; effectively, an attempt to create a logical slot on standby
+	 * will cause it to wait for an xl_running_xact record to be logged
+	 * independently on the primary, so that a snapshot can be built using the
+	 * record.
+	 *
+	 * None of this is needed (or indeed helpful) for physical slots as
+	 * they'll start replay at the last logged checkpoint anyway. Instead,
+	 * return the location of the last redo LSN, where a base backup has to
+	 * start replay at.
+	 */
+	if (SlotIsPhysical(slot))
+		restart_lsn = GetRedoRecPtr();
+	else if (RecoveryInProgress())
+		restart_lsn = GetXLogReplayRecPtr(NULL);
+	else
+		restart_lsn = GetXLogInsertRecPtr();
 
-		SpinLockAcquire(&slot->mutex);
-		slot->data.restart_lsn = restart_lsn;
-		SpinLockRelease(&slot->mutex);
+	SpinLockAcquire(&slot->mutex);
+	slot->data.restart_lsn = restart_lsn;
+	SpinLockRelease(&slot->mutex);
 
-		/* prevent WAL removal as fast as possible */
-		ReplicationSlotsComputeRequiredLSN();
+	/* prevent WAL removal as fast as possible */
+	ReplicationSlotsComputeRequiredLSN();
 
-		/*
-		 * If all required WAL is still there, great, otherwise retry. The
-		 * slot should prevent further removal of WAL, unless there's a
-		 * concurrent ReplicationSlotsComputeRequiredLSN() after we've written
-		 * the new restart_lsn above, so normally we should never need to loop
-		 * more than twice.
-		 */
-		XLByteToSeg(slot->data.restart_lsn, segno, wal_segment_size);
-		if (XLogGetLastRemovedSegno() < segno)
-			break;
-	}
+	/* Checkpoint shouldn't remove the required WAL. */
+	XLByteToSeg(slot->data.restart_lsn, segno, wal_segment_size);
+	if (XLogGetLastRemovedSegno() >= segno)
+		elog(ERROR, "WAL required by replication slot %s has been removed concurrently",
+			 NameStr(slot->data.name));
+
+	LWLockRelease(ReplicationSlotAllocationLock);
 
 	if (!RecoveryInProgress() && SlotIsLogical(slot))
 	{
@@ -1612,13 +1682,10 @@ ReportSlotInvalidation(ReplicationSlotInvalidationCause cause,
 
 		case RS_INVAL_IDLE_TIMEOUT:
 			{
-				int			minutes = slot_idle_seconds / SECS_PER_MINUTE;
-				int			secs = slot_idle_seconds % SECS_PER_MINUTE;
-
 				/* translator: %s is a GUC variable name */
-				appendStringInfo(&err_detail, _("The slot's idle time of %dmin %02ds exceeds the configured \"%s\" duration of %dmin."),
-								 minutes, secs, "idle_replication_slot_timeout",
-								 idle_replication_slot_timeout_mins);
+				appendStringInfo(&err_detail, _("The slot's idle time of %lds exceeds the configured \"%s\" duration of %ds."),
+								 slot_idle_seconds, "idle_replication_slot_timeout",
+								 idle_replication_slot_timeout_secs);
 				/* translator: %s is a GUC variable name */
 				appendStringInfo(&err_hint, _("You might need to increase \"%s\"."),
 								 "idle_replication_slot_timeout");
@@ -1656,7 +1723,7 @@ ReportSlotInvalidation(ReplicationSlotInvalidationCause cause,
 static inline bool
 CanInvalidateIdleSlot(ReplicationSlot *s)
 {
-	return (idle_replication_slot_timeout_mins != 0 &&
+	return (idle_replication_slot_timeout_secs != 0 &&
 			!XLogRecPtrIsInvalid(s->data.restart_lsn) &&
 			s->inactive_since > 0 &&
 			!(RecoveryInProgress() && s->data.synced));
@@ -1673,17 +1740,16 @@ static ReplicationSlotInvalidationCause
 DetermineSlotInvalidationCause(uint32 possible_causes, ReplicationSlot *s,
 							   XLogRecPtr oldestLSN, Oid dboid,
 							   TransactionId snapshotConflictHorizon,
-							   TransactionId initial_effective_xmin,
-							   TransactionId initial_catalog_effective_xmin,
-							   XLogRecPtr initial_restart_lsn,
 							   TimestampTz *inactive_since, TimestampTz now)
 {
 	Assert(possible_causes != RS_INVAL_NONE);
 
 	if (possible_causes & RS_INVAL_WAL_REMOVED)
 	{
-		if (initial_restart_lsn != InvalidXLogRecPtr &&
-			initial_restart_lsn < oldestLSN)
+		XLogRecPtr	restart_lsn = s->data.restart_lsn;
+
+		if (restart_lsn != InvalidXLogRecPtr &&
+			restart_lsn < oldestLSN)
 			return RS_INVAL_WAL_REMOVED;
 	}
 
@@ -1693,12 +1759,15 @@ DetermineSlotInvalidationCause(uint32 possible_causes, ReplicationSlot *s,
 		if (SlotIsLogical(s) &&
 			(dboid == InvalidOid || dboid == s->data.database))
 		{
-			if (TransactionIdIsValid(initial_effective_xmin) &&
-				TransactionIdPrecedesOrEquals(initial_effective_xmin,
+			TransactionId effective_xmin = s->effective_xmin;
+			TransactionId catalog_effective_xmin = s->effective_catalog_xmin;
+
+			if (TransactionIdIsValid(effective_xmin) &&
+				TransactionIdPrecedesOrEquals(effective_xmin,
 											  snapshotConflictHorizon))
 				return RS_INVAL_HORIZON;
-			else if (TransactionIdIsValid(initial_catalog_effective_xmin) &&
-					 TransactionIdPrecedesOrEquals(initial_catalog_effective_xmin,
+			else if (TransactionIdIsValid(catalog_effective_xmin) &&
+					 TransactionIdPrecedesOrEquals(catalog_effective_xmin,
 												   snapshotConflictHorizon))
 				return RS_INVAL_HORIZON;
 		}
@@ -1717,9 +1786,9 @@ DetermineSlotInvalidationCause(uint32 possible_causes, ReplicationSlot *s,
 		if (CanInvalidateIdleSlot(s))
 		{
 			/*
-			 * We simulate the invalidation due to idle_timeout as the minimum
-			 * time idle time is one minute which makes tests take a long
-			 * time.
+			 * Simulate the invalidation due to idle_timeout to test the
+			 * timeout behavior promptly, without waiting for it to trigger
+			 * naturally.
 			 */
 #ifdef USE_INJECTION_POINTS
 			if (IS_INJECTION_POINT_ATTACHED("slot-timeout-inval"))
@@ -1734,7 +1803,7 @@ DetermineSlotInvalidationCause(uint32 possible_causes, ReplicationSlot *s,
 			 * idle_replication_slot_timeout GUC.
 			 */
 			if (TimestampDifferenceExceedsSeconds(s->inactive_since, now,
-												  idle_replication_slot_timeout_mins * SECS_PER_MINUTE))
+												  idle_replication_slot_timeout_secs))
 			{
 				*inactive_since = s->inactive_since;
 				return RS_INVAL_IDLE_TIMEOUT;
@@ -1767,11 +1836,6 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 {
 	int			last_signaled_pid = 0;
 	bool		released_lock = false;
-	bool		terminated = false;
-	TransactionId initial_effective_xmin = InvalidTransactionId;
-	TransactionId initial_catalog_effective_xmin = InvalidTransactionId;
-	XLogRecPtr	initial_restart_lsn = InvalidXLogRecPtr;
-	ReplicationSlotInvalidationCause invalidation_cause_prev PG_USED_FOR_ASSERTS_ONLY = RS_INVAL_NONE;
 	TimestampTz inactive_since = 0;
 
 	for (;;)
@@ -1814,42 +1878,12 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 
 		/* we do nothing if the slot is already invalid */
 		if (s->data.invalidated == RS_INVAL_NONE)
-		{
-			/*
-			 * The slot's mutex will be released soon, and it is possible that
-			 * those values change since the process holding the slot has been
-			 * terminated (if any), so record them here to ensure that we
-			 * would report the correct invalidation cause.
-			 *
-			 * Unlike other slot attributes, slot's inactive_since can't be
-			 * changed until the acquired slot is released or the owning
-			 * process is terminated. So, the inactive slot can only be
-			 * invalidated immediately without being terminated.
-			 */
-			if (!terminated)
-			{
-				initial_restart_lsn = s->data.restart_lsn;
-				initial_effective_xmin = s->effective_xmin;
-				initial_catalog_effective_xmin = s->effective_catalog_xmin;
-			}
-
 			invalidation_cause = DetermineSlotInvalidationCause(possible_causes,
 																s, oldestLSN,
 																dboid,
 																snapshotConflictHorizon,
-																initial_effective_xmin,
-																initial_catalog_effective_xmin,
-																initial_restart_lsn,
 																&inactive_since,
 																now);
-		}
-
-		/*
-		 * The invalidation cause recorded previously should not change while
-		 * the process owning the slot (if any) has been terminated.
-		 */
-		Assert(!(invalidation_cause_prev != RS_INVAL_NONE && terminated &&
-				 invalidation_cause_prev != invalidation_cause));
 
 		/* if there's no invalidation, we're done */
 		if (invalidation_cause == RS_INVAL_NONE)
@@ -1867,6 +1901,11 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 		 * If the slot can be acquired, do so and mark it invalidated
 		 * immediately.  Otherwise we'll signal the owning process, below, and
 		 * retry.
+		 *
+		 * Note: Unlike other slot attributes, slot's inactive_since can't be
+		 * changed until the acquired slot is released or the owning process
+		 * is terminated. So, the inactive slot can only be invalidated
+		 * immediately without being terminated.
 		 */
 		if (active_pid == 0)
 		{
@@ -1890,15 +1929,6 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 
 		SpinLockRelease(&s->mutex);
 
-		/*
-		 * The logical replication slots shouldn't be invalidated as GUC
-		 * max_slot_wal_keep_size is set to -1 and
-		 * idle_replication_slot_timeout is set to 0 during the binary
-		 * upgrade. See check_old_cluster_for_valid_slots() where we ensure
-		 * that no invalidated before the upgrade.
-		 */
-		Assert(!(*invalidated && SlotIsLogical(s) && IsBinaryUpgrade));
-
 		/*
 		 * Calculate the idle time duration of the slot if slot is marked
 		 * invalidated with RS_INVAL_IDLE_TIMEOUT.
@@ -1950,8 +1980,6 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 					(void) kill(active_pid, SIGTERM);
 
 				last_signaled_pid = active_pid;
-				terminated = true;
-				invalidation_cause_prev = invalidation_cause;
 			}
 
 			/* Wait until the slot is released. */
@@ -1962,6 +1990,14 @@ InvalidatePossiblyObsoleteSlot(uint32 possible_causes,
 			 * Re-acquire lock and start over; we expect to invalidate the
 			 * slot next time (unless another process acquires the slot in the
 			 * meantime).
+			 *
+			 * Note: It is possible for a slot to advance its restart_lsn or
+			 * xmin values sufficiently between when we release the mutex and
+			 * when we recheck, moving from a conflicting state to a non
+			 * conflicting state.  This is intentional and safe: if the slot
+			 * has caught up while we're busy here, the resources we were
+			 * concerned about (WAL segments or tuples) have not yet been
+			 * removed, and there's no reason to invalidate the slot.
 			 */
 			LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
 			continue;
@@ -2045,6 +2081,10 @@ InvalidateObsoleteReplicationSlots(uint32 possible_causes,
 		if (!s->in_use)
 			continue;
 
+		/* Prevent invalidation of logical slots during binary upgrade */
+		if (SlotIsLogical(s) && IsBinaryUpgrade)
+			continue;
+
 		if (InvalidatePossiblyObsoleteSlot(possible_causes, s, oldestLSN, dboid,
 										   snapshotConflictHorizon,
 										   &invalidated))
@@ -2089,6 +2129,12 @@ CheckPointReplicationSlots(bool is_shutdown)
 	 * acquiring a slot we cannot take the control lock - but that's OK,
 	 * because holding ReplicationSlotAllocationLock is strictly stronger, and
 	 * enough to guarantee that nobody can change the in_use bits on us.
+	 *
+	 * Additionally, acquiring the Allocation lock is necessary to serialize
+	 * the slot flush process with concurrent slot WAL reservation. This
+	 * ensures that the WAL position being reserved is either flushed to disk
+	 * or is beyond or equal to the redo pointer of the current checkpoint
+	 * (See ReplicationSlotReserveWal for details).
 	 */
 	LWLockAcquire(ReplicationSlotAllocationLock, LW_SHARED);
 
@@ -2340,6 +2386,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 
 		pgstat_report_wait_end();
 		CloseTransientFile(fd);
+		unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
 
 		/* if write didn't set errno, assume problem is no disk space */
@@ -2360,7 +2407,9 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 
 		pgstat_report_wait_end();
 		CloseTransientFile(fd);
+		unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
+
 		errno = save_errno;
 		ereport(elevel,
 				(errcode_for_file_access(),
@@ -2374,7 +2423,9 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 	{
 		int			save_errno = errno;
 
+		unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
+
 		errno = save_errno;
 		ereport(elevel,
 				(errcode_for_file_access(),
@@ -2388,7 +2439,9 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 	{
 		int			save_errno = errno;
 
+		unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
+
 		errno = save_errno;
 		ereport(elevel,
 				(errcode_for_file_access(),
@@ -2709,53 +2762,32 @@ GetSlotInvalidationCauseName(ReplicationSlotInvalidationCause cause)
 static bool
 validate_sync_standby_slots(char *rawname, List **elemlist)
 {
-	bool		ok;
-
 	/* Verify syntax and parse string into a list of identifiers */
-	ok = SplitIdentifierString(rawname, ',', elemlist);
-
-	if (!ok)
+	if (!SplitIdentifierString(rawname, ',', elemlist))
 	{
 		GUC_check_errdetail("List syntax is invalid.");
+		return false;
 	}
-	else if (MyProc)
+
+	/* Iterate the list to validate each slot name */
+	foreach_ptr(char, name, *elemlist)
 	{
-		/*
-		 * Check that each specified slot exist and is physical.
-		 *
-		 * Because we need an LWLock, we cannot do this on processes without a
-		 * PGPROC, so we skip it there; but see comments in
-		 * StandbySlotsHaveCaughtup() as to why that's not a problem.
-		 */
-		LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
+		int			err_code;
+		char	   *err_msg = NULL;
+		char	   *err_hint = NULL;
 
-		foreach_ptr(char, name, *elemlist)
+		if (!ReplicationSlotValidateNameInternal(name, &err_code, &err_msg,
+												 &err_hint))
 		{
-			ReplicationSlot *slot;
-
-			slot = SearchNamedReplicationSlot(name, false);
-
-			if (!slot)
-			{
-				GUC_check_errdetail("Replication slot \"%s\" does not exist.",
-									name);
-				ok = false;
-				break;
-			}
-
-			if (!SlotIsPhysical(slot))
-			{
-				GUC_check_errdetail("\"%s\" is not a physical replication slot.",
-									name);
-				ok = false;
-				break;
-			}
+			GUC_check_errcode(err_code);
+			GUC_check_errdetail("%s", err_msg);
+			if (err_hint != NULL)
+				GUC_check_errhint("%s", err_hint);
+			return false;
 		}
-
-		LWLockRelease(ReplicationSlotControlLock);
 	}
 
-	return ok;
+	return true;
 }
 
 /*
@@ -2913,12 +2945,6 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
 		/*
 		 * If a slot name provided in synchronized_standby_slots does not
 		 * exist, report a message and exit the loop.
-		 *
-		 * Though validate_sync_standby_slots (the GUC check_hook) tries to
-		 * avoid this, it can nonetheless happen because the user can specify
-		 * a nonexistent slot name before server startup. That function cannot
-		 * validate such a slot during startup, as ReplicationSlotCtl is not
-		 * initialized by then.  Also, the user might have dropped one slot.
 		 */
 		if (!slot)
 		{
@@ -3057,22 +3083,3 @@ WaitForStandbyConfirmation(XLogRecPtr wait_for_lsn)
 
 	ConditionVariableCancelSleep();
 }
-
-/*
- * GUC check_hook for idle_replication_slot_timeout
- *
- * The value of idle_replication_slot_timeout must be set to 0 during
- * a binary upgrade. See start_postmaster() in pg_upgrade for more details.
- */
-bool
-check_idle_replication_slot_timeout(int *newval, void **extra, GucSource source)
-{
-	if (IsBinaryUpgrade && *newval != 0)
-	{
-		GUC_check_errdetail("\"%s\" must be set to 0 during binary upgrade mode.",
-							"idle_replication_slot_timeout");
-		return false;
-	}
-
-	return true;
-}
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 36cc2ed4e44..f5b1793c1c5 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -921,7 +921,6 @@ pg_sync_replication_slots(PG_FUNCTION_ARGS)
 	/* Connect to the primary server. */
 	wrconn = walrcv_connect(PrimaryConnInfo, false, false, false,
 							app_name.data, &err);
-	pfree(app_name.data);
 
 	if (!wrconn)
 		ereport(ERROR,
@@ -929,6 +928,8 @@ pg_sync_replication_slots(PG_FUNCTION_ARGS)
 				errmsg("synchronization worker \"%s\" could not connect to the primary server: %s",
 					   app_name.data, err));
 
+	pfree(app_name.data);
+
 	SyncReplicationSlots(wrconn);
 
 	walrcv_disconnect(wrconn);
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index ab0da58b7db..4ba1e6f96aa 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -1078,6 +1078,7 @@ check_synchronous_standby_names(char **newval, void **extra, GucSource source)
 			if (syncrep_parse_error_msg)
 				GUC_check_errdetail("%s", syncrep_parse_error_msg);
 			else
+				/* translator: %s is a GUC name */
 				GUC_check_errdetail("\"%s\" parser failed.",
 									"synchronous_standby_names");
 			return false;
diff --git a/src/backend/replication/syncrep_scanner.l b/src/backend/replication/syncrep_scanner.l
index 7dec1f869c7..02004d621e7 100644
--- a/src/backend/replication/syncrep_scanner.l
+++ b/src/backend/replication/syncrep_scanner.l
@@ -157,17 +157,16 @@ syncrep_yyerror(SyncRepConfigData **syncrep_parse_result_p, char **syncrep_parse
 {
 	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext
 															 * macro */
-	char *syncrep_parse_error_msg = *syncrep_parse_error_msg_p;
 
 	/* report only the first error in a parse operation */
-	if (syncrep_parse_error_msg)
+	if (*syncrep_parse_error_msg_p)
 		return;
 	if (yytext[0])
-		syncrep_parse_error_msg = psprintf("%s at or near \"%s\"",
-										   message, yytext);
+		*syncrep_parse_error_msg_p = psprintf("%s at or near \"%s\"",
+											  message, yytext);
 	else
-		syncrep_parse_error_msg = psprintf("%s at end of input",
-										   message);
+		*syncrep_parse_error_msg_p = psprintf("%s at end of input",
+											  message);
 }
 
 void
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index f2c33250e8b..70d90699cc6 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -230,6 +230,20 @@ typedef struct
 	int			write_head;
 	int			read_heads[NUM_SYNC_REP_WAIT_MODE];
 	WalTimeSample last_read[NUM_SYNC_REP_WAIT_MODE];
+
+	/*
+	 * Overflow entries for read heads that collide with the write head.
+	 *
+	 * When the cyclic buffer fills (write head is about to collide with a
+	 * read head), we save that read head's current sample here and mark it as
+	 * using overflow (read_heads[i] = -1). This allows the write head to
+	 * continue advancing while the overflowed mode continues lag computation
+	 * using the saved sample.
+	 *
+	 * Once the standby's reported LSN advances past the overflow entry's LSN,
+	 * we transition back to normal buffer-based tracking.
+	 */
+	WalTimeSample overflowed[NUM_SYNC_REP_WAIT_MODE];
 } LagTracker;
 
 static LagTracker *lag_tracker;
@@ -1134,8 +1148,8 @@ parseCreateReplSlotOptions(CreateReplicationSlotCmd *cmd,
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\"",
-								defel->defname, action)));
+						 errmsg("unrecognized value for %s option \"%s\": \"%s\"",
+								"CREATE_REPLICATION_SLOT", defel->defname, action)));
 		}
 		else if (strcmp(defel->defname, "reserve_wal") == 0)
 		{
@@ -1844,9 +1858,15 @@ WalSndWaitForWal(XLogRecPtr loc)
 		 * 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.
+		 *
+		 * Note that GetXLogInsertEndRecPtr() is used to obtain the WAL flush
+		 * request location instead of GetXLogInsertRecPtr(). Because if the
+		 * last WAL record ends at a page boundary, GetXLogInsertRecPtr() can
+		 * return an LSN pointing past the page header, which may cause
+		 * XLogFlush() to report an error.
 		 */
-		if (got_STOPPING)
-			XLogBackgroundFlush();
+		if (got_STOPPING && !RecoveryInProgress())
+			XLogFlush(GetXLogInsertEndRecPtr());
 
 		/*
 		 * To avoid the scenario where standbys need to catch up to a newer
@@ -2413,7 +2433,9 @@ ProcessStandbyReplyMessage(void)
 	TimestampTz now;
 	TimestampTz replyTime;
 
-	static bool fullyAppliedLastTime = false;
+	static XLogRecPtr prevWritePtr = InvalidXLogRecPtr;
+	static XLogRecPtr prevFlushPtr = InvalidXLogRecPtr;
+	static XLogRecPtr prevApplyPtr = InvalidXLogRecPtr;
 
 	/* the caller already consumed the msgtype byte */
 	writePtr = pq_getmsgint64(&reply_message);
@@ -2446,22 +2468,23 @@ ProcessStandbyReplyMessage(void)
 	applyLag = LagTrackerRead(SYNC_REP_WAIT_APPLY, applyPtr, now);
 
 	/*
-	 * If the standby reports that it has fully replayed the WAL in two
-	 * consecutive reply messages, then the second such message must result
-	 * from wal_receiver_status_interval expiring on the standby.  This is a
-	 * convenient time to forget the lag times measured when it last
-	 * wrote/flushed/applied a WAL record, to avoid displaying stale lag data
-	 * until more WAL traffic arrives.
+	 * If the standby reports that it has fully replayed the WAL, and the
+	 * write/flush/apply positions remain unchanged across two consecutive
+	 * reply messages, forget the lag times measured when it last
+	 * wrote/flushed/applied a WAL record.
+	 *
+	 * The second message with unchanged positions typically results from
+	 * wal_receiver_status_interval expiring on the standby, so lag values are
+	 * usually cleared after that interval when there is no activity. This
+	 * avoids displaying stale lag data until more WAL traffic arrives.
 	 */
-	clearLagTimes = false;
-	if (applyPtr == sentPtr)
-	{
-		if (fullyAppliedLastTime)
-			clearLagTimes = true;
-		fullyAppliedLastTime = true;
-	}
-	else
-		fullyAppliedLastTime = false;
+	clearLagTimes = (applyPtr == sentPtr && flushPtr == sentPtr &&
+					 writePtr == prevWritePtr && flushPtr == prevFlushPtr &&
+					 applyPtr == prevApplyPtr);
+
+	prevWritePtr = writePtr;
+	prevFlushPtr = flushPtr;
+	prevApplyPtr = applyPtr;
 
 	/* Send a reply if the standby requested one. */
 	if (replyRequested)
@@ -4131,7 +4154,6 @@ WalSndKeepaliveIfNecessary(void)
 static void
 LagTrackerWrite(XLogRecPtr lsn, TimestampTz local_flush_time)
 {
-	bool		buffer_full;
 	int			new_write_head;
 	int			i;
 
@@ -4153,25 +4175,19 @@ LagTrackerWrite(XLogRecPtr lsn, TimestampTz local_flush_time)
 	 * of space.
 	 */
 	new_write_head = (lag_tracker->write_head + 1) % LAG_TRACKER_BUFFER_SIZE;
-	buffer_full = false;
 	for (i = 0; i < NUM_SYNC_REP_WAIT_MODE; ++i)
 	{
+		/*
+		 * If the buffer is full, move the slowest reader to a separate
+		 * overflow entry and free its space in the buffer so the write head
+		 * can advance.
+		 */
 		if (new_write_head == lag_tracker->read_heads[i])
-			buffer_full = true;
-	}
-
-	/*
-	 * If the buffer is full, for now we just rewind by one slot and overwrite
-	 * the last sample, as a simple (if somewhat uneven) way to lower the
-	 * sampling rate.  There may be better adaptive compaction algorithms.
-	 */
-	if (buffer_full)
-	{
-		new_write_head = lag_tracker->write_head;
-		if (lag_tracker->write_head > 0)
-			lag_tracker->write_head--;
-		else
-			lag_tracker->write_head = LAG_TRACKER_BUFFER_SIZE - 1;
+		{
+			lag_tracker->overflowed[i] =
+				lag_tracker->buffer[lag_tracker->read_heads[i]];
+			lag_tracker->read_heads[i] = -1;
+		}
 	}
 
 	/* Store a sample at the current write head position. */
@@ -4198,6 +4214,28 @@ LagTrackerRead(int head, XLogRecPtr lsn, TimestampTz now)
 {
 	TimestampTz time = 0;
 
+	/*
+	 * If 'lsn' has not passed the WAL position stored in the overflow entry,
+	 * return the elapsed time (in microseconds) since the saved local flush
+	 * time. If the flush time is in the future (due to clock drift), return
+	 * -1 to treat as no valid sample.
+	 *
+	 * Otherwise, switch back to using the buffer to control the read head and
+	 * compute the elapsed time.  The read head is then reset to point to the
+	 * oldest entry in the buffer.
+	 */
+	if (lag_tracker->read_heads[head] == -1)
+	{
+		if (lag_tracker->overflowed[head].lsn > lsn)
+			return (now >= lag_tracker->overflowed[head].time) ?
+				now - lag_tracker->overflowed[head].time : -1;
+
+		time = lag_tracker->overflowed[head].time;
+		lag_tracker->last_read[head] = lag_tracker->overflowed[head];
+		lag_tracker->read_heads[head] =
+			(lag_tracker->write_head + 1) % LAG_TRACKER_BUFFER_SIZE;
+	}
+
 	/* Read all unread samples up to this LSN or end of buffer. */
 	while (lag_tracker->read_heads[head] != lag_tracker->write_head &&
 		   lag_tracker->buffer[lag_tracker->read_heads[head]].lsn <= lsn)
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 13ac2bcf9d7..11f11866485 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/rewrite/rewriteHandler.c
@@ -100,8 +100,7 @@ static List *matchLocks(CmdType event, Relation relation,
 						int varno, Query *parsetree, bool *hasUpdate);
 static Query *fireRIRrules(Query *parsetree, List *activeRIRs);
 static Bitmapset *adjust_view_column_set(Bitmapset *cols, List *targetlist);
-static Node *expand_generated_columns_internal(Node *node, Relation rel, int rt_index,
-											   RangeTblEntry *rte, int result_relation);
+static List *get_generated_columns(Relation rel, int rt_index, bool include_stored);
 
 
 /*
@@ -596,7 +595,10 @@ rewriteRuleAction(Query *parsetree,
 			}
 		}
 
-		/* OK, it's safe to combine the CTE lists */
+		/*
+		 * OK, it's safe to combine the CTE lists.  Beware that RewriteQuery
+		 * knows we concatenate the lists in this order.
+		 */
 		sub_action->cteList = list_concat(sub_action->cteList,
 										  copyObject(parsetree->cteList));
 		/* ... and don't forget about the associated flags */
@@ -641,12 +643,46 @@ rewriteRuleAction(Query *parsetree,
 	if ((event == CMD_INSERT || event == CMD_UPDATE) &&
 		sub_action->commandType != CMD_UTILITY)
 	{
+		RangeTblEntry *new_rte = rt_fetch(new_varno, sub_action->rtable);
+		Relation	new_rel;
+		List	   *gen_cols;
+
+		/*
+		 * The target list does not contain entries for generated columns
+		 * (they are removed by rewriteTargetListIU), so we must build entries
+		 * for them here, so that new.gen_col can be rewritten correctly.
+		 */
+		new_rel = relation_open(new_rte->relid, NoLock);
+		gen_cols = get_generated_columns(new_rel, new_varno, true);
+		relation_close(new_rel, NoLock);
+
+		/*
+		 * The generated column expressions refer to new.attribute, so they
+		 * must be rewritten before they can be used as replacements.
+		 */
+		gen_cols = (List *)
+			ReplaceVarsFromTargetList((Node *) gen_cols,
+									  new_varno,
+									  0,
+									  new_rte,
+									  parsetree->targetList,
+									  sub_action->resultRelation,
+									  (event == CMD_UPDATE) ?
+									  REPLACEVARS_CHANGE_VARNO :
+									  REPLACEVARS_SUBSTITUTE_NULL,
+									  current_varno,
+									  &sub_action->hasSubLinks);
+
+		/*
+		 * Now rewrite new.attribute in sub_action, using both the target list
+		 * and the rewritten generated column expressions.
+		 */
 		sub_action = (Query *)
 			ReplaceVarsFromTargetList((Node *) sub_action,
 									  new_varno,
 									  0,
-									  rt_fetch(new_varno, sub_action->rtable),
-									  parsetree->targetList,
+									  new_rte,
+									  list_concat(gen_cols, parsetree->targetList),
 									  sub_action->resultRelation,
 									  (event == CMD_UPDATE) ?
 									  REPLACEVARS_CHANGE_VARNO :
@@ -2423,18 +2459,50 @@ CopyAndAddInvertedQual(Query *parsetree,
 	ChangeVarNodes(new_qual, PRS2_OLD_VARNO, rt_index, 0);
 	/* Fix references to NEW */
 	if (event == CMD_INSERT || event == CMD_UPDATE)
+	{
+		RangeTblEntry *rte = rt_fetch(rt_index, parsetree->rtable);
+		Relation	rel;
+		List	   *gen_cols;
+
+		/*
+		 * As in rewriteRuleAction, build entries for generated columns so
+		 * that new.gen_col in the rule qualification can be rewritten
+		 * correctly.
+		 */
+		rel = relation_open(rte->relid, NoLock);
+		gen_cols = get_generated_columns(rel, PRS2_NEW_VARNO, true);
+		relation_close(rel, NoLock);
+
+		/*
+		 * The generated column expressions refer to new.attribute, so they
+		 * must be rewritten before they can be used as replacements.
+		 */
+		gen_cols = (List *)
+			ReplaceVarsFromTargetList((Node *) gen_cols,
+									  PRS2_NEW_VARNO,
+									  0,
+									  rte,
+									  parsetree->targetList,
+									  parsetree->resultRelation,
+									  (event == CMD_UPDATE) ?
+									  REPLACEVARS_CHANGE_VARNO :
+									  REPLACEVARS_SUBSTITUTE_NULL,
+									  rt_index,
+									  &parsetree->hasSubLinks);
+
 		new_qual = ReplaceVarsFromTargetList(new_qual,
 											 PRS2_NEW_VARNO,
 											 0,
-											 rt_fetch(rt_index,
-													  parsetree->rtable),
-											 parsetree->targetList,
+											 rte,
+											 list_concat(gen_cols,
+														 parsetree->targetList),
 											 parsetree->resultRelation,
 											 (event == CMD_UPDATE) ?
 											 REPLACEVARS_CHANGE_VARNO :
 											 REPLACEVARS_SUBSTITUTE_NULL,
 											 rt_index,
 											 &parsetree->hasSubLinks);
+	}
 	/* And attach the fixed qual */
 	AddInvertedQual(parsetree, new_qual);
 
@@ -3967,9 +4035,13 @@ rewriteTargetView(Query *parsetree, Relation view)
  * orig_rt_length is the length of the originating query's rtable, for product
  * queries created by fireRules(), and 0 otherwise.  This is used to skip any
  * already-processed VALUES RTEs from the original query.
+ *
+ * num_ctes_processed is the number of CTEs at the end of the query's cteList
+ * that have already been rewritten, and must not be rewritten again.
  */
 static List *
-RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length)
+RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length,
+			 int num_ctes_processed)
 {
 	CmdType		event = parsetree->commandType;
 	bool		instead = false;
@@ -3983,17 +4055,29 @@ RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length)
 	 * First, recursively process any insert/update/delete/merge statements in
 	 * WITH clauses.  (We have to do this first because the WITH clauses may
 	 * get copied into rule actions below.)
+	 *
+	 * Any new WITH clauses from rule actions are processed when we recurse
+	 * into product queries below.  However, when recursing, we must take care
+	 * to avoid rewriting a CTE query more than once (because expanding
+	 * generated columns in the targetlist more than once would fail).  Since
+	 * new CTEs from product queries are added to the start of the list (see
+	 * rewriteRuleAction), we just skip the last num_ctes_processed items.
 	 */
 	foreach(lc1, parsetree->cteList)
 	{
 		CommonTableExpr *cte = lfirst_node(CommonTableExpr, lc1);
 		Query	   *ctequery = castNode(Query, cte->ctequery);
+		int			i = foreach_current_index(lc1);
 		List	   *newstuff;
 
+		/* Skip already-processed CTEs at the end of the list */
+		if (i >= list_length(parsetree->cteList) - num_ctes_processed)
+			break;
+
 		if (ctequery->commandType == CMD_SELECT)
 			continue;
 
-		newstuff = RewriteQuery(ctequery, rewrite_events, 0);
+		newstuff = RewriteQuery(ctequery, rewrite_events, 0, 0);
 
 		/*
 		 * Currently we can only handle unconditional, single-statement DO
@@ -4053,6 +4137,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length)
 					 errmsg("multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH")));
 		}
 	}
+	num_ctes_processed = list_length(parsetree->cteList);
 
 	/*
 	 * If the statement is an insert, update, delete, or merge, adjust its
@@ -4384,7 +4469,8 @@ RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length)
 				newstuff = RewriteQuery(pt, rewrite_events,
 										pt == parsetree ?
 										orig_rt_length :
-										product_orig_rt_length);
+										product_orig_rt_length,
+										num_ctes_processed);
 				rewritten = list_concat(rewritten, newstuff);
 			}
 
@@ -4506,36 +4592,31 @@ RewriteQuery(Query *parsetree, List *rewrite_events, int orig_rt_length)
 
 
 /*
- * Expand virtual generated columns
+ * Get a table's generated columns
  *
- * If the table contains virtual generated columns, build a target list
- * containing the expanded expressions and use ReplaceVarsFromTargetList() to
- * do the replacements.
+ * If include_stored is true, both stored and virtual generated columns are
+ * returned.  Otherwise, only virtual generated columns are returned.
  *
- * Vars matching rt_index at the current query level are replaced by the
- * virtual generated column expressions from rel, if there are any.
- *
- * The caller must also provide rte, the RTE describing the target relation,
- * in order to handle any whole-row Vars referencing the target, and
- * result_relation, the index of the result relation, if this is part of an
- * INSERT/UPDATE/DELETE/MERGE query.
+ * Returns a list of TargetEntry, one for each generated column, containing
+ * the attribute numbers and generation expressions.
  */
-static Node *
-expand_generated_columns_internal(Node *node, Relation rel, int rt_index,
-								  RangeTblEntry *rte, int result_relation)
+static List *
+get_generated_columns(Relation rel, int rt_index, bool include_stored)
 {
+	List	   *gen_cols = NIL;
 	TupleDesc	tupdesc;
 
 	tupdesc = RelationGetDescr(rel);
-	if (tupdesc->constr && tupdesc->constr->has_generated_virtual)
+	if (tupdesc->constr &&
+		(tupdesc->constr->has_generated_virtual ||
+		 (include_stored && tupdesc->constr->has_generated_stored)))
 	{
-		List	   *tlist = NIL;
-
 		for (int i = 0; i < tupdesc->natts; i++)
 		{
 			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
-			if (attr->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
+			if (attr->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL ||
+				(include_stored && attr->attgenerated == ATTRIBUTE_GENERATED_STORED))
 			{
 				Node	   *defexpr;
 				TargetEntry *te;
@@ -4544,19 +4625,12 @@ expand_generated_columns_internal(Node *node, Relation rel, int rt_index,
 				ChangeVarNodes(defexpr, 1, rt_index, 0);
 
 				te = makeTargetEntry((Expr *) defexpr, i + 1, 0, false);
-				tlist = lappend(tlist, te);
+				gen_cols = lappend(gen_cols, te);
 			}
 		}
-
-		Assert(list_length(tlist) > 0);
-
-		node = ReplaceVarsFromTargetList(node, rt_index, 0, rte, tlist,
-										 result_relation,
-										 REPLACEVARS_CHANGE_VARNO, rt_index,
-										 NULL);
 	}
 
-	return node;
+	return gen_cols;
 }
 
 /*
@@ -4573,6 +4647,7 @@ expand_generated_columns_in_expr(Node *node, Relation rel, int rt_index)
 	if (tupdesc->constr && tupdesc->constr->has_generated_virtual)
 	{
 		RangeTblEntry *rte;
+		List	   *vcols;
 
 		rte = makeNode(RangeTblEntry);
 		/* eref needs to be set, but the actual name doesn't matter */
@@ -4580,14 +4655,26 @@ expand_generated_columns_in_expr(Node *node, Relation rel, int rt_index)
 		rte->rtekind = RTE_RELATION;
 		rte->relid = RelationGetRelid(rel);
 
-		node = expand_generated_columns_internal(node, rel, rt_index, rte, 0);
+		vcols = get_generated_columns(rel, rt_index, false);
+
+		if (vcols)
+		{
+			/*
+			 * Passing NULL for outer_hasSubLinks is safe because generation
+			 * expressions cannot contain SubLinks, so the replacement cannot
+			 * introduce any.
+			 */
+			node = ReplaceVarsFromTargetList(node, rt_index, 0, rte, vcols, 0,
+											 REPLACEVARS_CHANGE_VARNO, rt_index,
+											 NULL);
+		}
 	}
 
 	return node;
 }
 
 /*
- * Build the generation expression for the virtual generated column.
+ * Build the generation expression for a generated column.
  *
  * Error out if there is no generation expression found for the given column.
  */
@@ -4599,8 +4686,11 @@ build_generation_expression(Relation rel, int attrno)
 	Node	   *defexpr;
 	Oid			attcollid;
 
-	Assert(rd_att->constr && rd_att->constr->has_generated_virtual);
-	Assert(att_tup->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL);
+	Assert(rd_att->constr &&
+		   (rd_att->constr->has_generated_virtual ||
+			rd_att->constr->has_generated_stored));
+	Assert(att_tup->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL ||
+		   att_tup->attgenerated == ATTRIBUTE_GENERATED_STORED);
 
 	defexpr = build_column_default(rel, attrno);
 	if (defexpr == NULL)
@@ -4659,7 +4749,7 @@ QueryRewrite(Query *parsetree)
 	 *
 	 * Apply all non-SELECT rules possibly getting 0 or many queries
 	 */
-	querylist = RewriteQuery(parsetree, NIL, 0);
+	querylist = RewriteQuery(parsetree, NIL, 0, 0);
 
 	/*
 	 * Step 2
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index cd786aa4112..2e75f286b8b 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -542,8 +542,6 @@ offset_relid_set(Relids relids, int offset)
  * (identified by sublevels_up and rt_index), and change their varno fields
  * to 'new_index'.  The varnosyn fields are changed too.  Also, adjust other
  * nodes that contain rangetable indexes, such as RangeTblRef and JoinExpr.
- * Specifying 'change_RangeTblRef' to false allows skipping RangeTblRef.
- * See ChangeVarNodesExtended for details.
  *
  * NOTE: although this has the form of a walker, we cheat and modify the
  * nodes in-place.  The given expression tree should have been copied
@@ -664,17 +662,16 @@ ChangeVarNodes_walker(Node *node, ChangeVarNodes_context *context)
 }
 
 /*
- * ChangeVarNodesExtended - similar to ChangeVarNodes, but with an  additional
+ * ChangeVarNodesExtended - similar to ChangeVarNodes, but with an additional
  *							'callback' param
  *
- * ChangeVarNodes changes a given node and all of its underlying nodes.
- * This version of function additionally takes a callback, which has a
- * chance to process a node before ChangeVarNodes_walker.  A callback
- * returns a boolean value indicating if given node should be skipped from
- * further processing by ChangeVarNodes_walker.  The callback is called
- * only for expressions and other children nodes of a Query processed by
- * a walker.  Initial processing of the root Query doesn't involve the
- * callback.
+ * ChangeVarNodes changes a given node and all of its underlying nodes.  This
+ * version of function additionally takes a callback, which has a chance to
+ * process a node before ChangeVarNodes_walker.  A callback returns a boolean
+ * value indicating if the given node should be skipped from further processing
+ * by ChangeVarNodes_walker.  The callback is called only for expressions and
+ * other children nodes of a Query processed by a walker.  Initial processing
+ * of the root Query node doesn't invoke the callback.
  */
 void
 ChangeVarNodesExtended(Node *node, int rt_index, int new_index,
@@ -739,16 +736,27 @@ ChangeVarNodes(Node *node, int rt_index, int new_index, int sublevels_up)
 }
 
 /*
- * ChangeVarNodesWalkExpression - process expression within the custom
- *								  callback provided to the
- *								  ChangeVarNodesExtended.
+ * ChangeVarNodesWalkExpression - process subexpression within a callback
+ *								  function passed to ChangeVarNodesExtended.
+ *
+ * This is intended to be used by a callback that needs to recursively
+ * process subexpressions of some node being visited by an outer
+ * ChangeVarNodesExtended call, instead of relying on ChangeVarNodes_walker's
+ * default recursion.  We invoke ChangeVarNodes_walker directly rather than
+ * via expression_tree_walker, because expression_tree_walker only visits
+ * child nodes and would fail to process the passed node itself --
+ * for example, a bare Var node would not get its varno adjusted.
+ *
+ * Because this calls ChangeVarNodes_walker directly, if the passed node is
+ * a Query, it will be treated as a sub-Query: sublevels_up is incremented
+ * before recursing into it, and Query-level fields (resultRelation,
+ * mergeTargetRelation, rowMarks, etc.) will not be adjusted.  Do not apply
+ * this to a top-level Query node; use ChangeVarNodesExtended for that.
  */
 bool
 ChangeVarNodesWalkExpression(Node *node, ChangeVarNodes_context *context)
 {
-	return expression_tree_walker(node,
-								  ChangeVarNodes_walker,
-								  (void *) context);
+	return ChangeVarNodes_walker(node, context);
 }
 
 /*
@@ -1505,25 +1513,6 @@ replace_rte_variables_mutator(Node *node,
 		}
 		/* otherwise fall through to copy the var normally */
 	}
-	else if (IsA(node, CurrentOfExpr))
-	{
-		CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
-
-		if (cexpr->cvarno == context->target_varno &&
-			context->sublevels_up == 0)
-		{
-			/*
-			 * We get here if a WHERE CURRENT OF expression turns out to apply
-			 * to a view.  Someday we might be able to translate the
-			 * expression to apply to an underlying table of the view, but
-			 * right now it's not implemented.
-			 */
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("WHERE CURRENT OF on a view is not implemented")));
-		}
-		/* otherwise fall through to copy the expr normally */
-	}
 	else if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
diff --git a/src/backend/statistics/attribute_stats.c b/src/backend/statistics/attribute_stats.c
index ab198076401..5c1c5749ad4 100644
--- a/src/backend/statistics/attribute_stats.c
+++ b/src/backend/statistics/attribute_stats.c
@@ -19,8 +19,10 @@
 
 #include "access/heapam.h"
 #include "catalog/indexing.h"
+#include "catalog/namespace.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_operator.h"
+#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "statistics/statistics.h"
 #include "statistics/stat_utils.h"
@@ -143,6 +145,7 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 	char	   *attname;
 	AttrNumber	attnum;
 	bool		inherited;
+	Oid			locked_table = InvalidOid;
 
 	Relation	starel;
 	HeapTuple	statup;
@@ -182,8 +185,6 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 	nspname = TextDatumGetCString(PG_GETARG_DATUM(ATTRELSCHEMA_ARG));
 	relname = TextDatumGetCString(PG_GETARG_DATUM(ATTRELNAME_ARG));
 
-	reloid = stats_lookup_relid(nspname, relname);
-
 	if (RecoveryInProgress())
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -191,7 +192,9 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 				 errhint("Statistics cannot be modified during recovery.")));
 
 	/* lock before looking up attribute */
-	stats_lock_check_privileges(reloid);
+	reloid = RangeVarGetRelidExtended(makeRangeVar(nspname, relname, -1),
+									  ShareUpdateExclusiveLock, 0,
+									  RangeVarCallbackForStats, &locked_table);
 
 	/* user can specify either attname or attnum, but not both */
 	if (!PG_ARGISNULL(ATTNAME_ARG))
@@ -199,7 +202,7 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 		if (!PG_ARGISNULL(ATTNUM_ARG))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("cannot specify both attname and attnum")));
+					 errmsg("cannot specify both \"%s\" and \"%s\"", "attname", "attnum")));
 		attname = TextDatumGetCString(PG_GETARG_DATUM(ATTNAME_ARG));
 		attnum = get_attnum(reloid, attname);
 		/* note that this test covers attisdropped cases too: */
@@ -225,7 +228,7 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("must specify either attname or attnum")));
+				 errmsg("must specify either \"%s\" or \"%s\"", "attname", "attnum")));
 		attname = NULL;			/* keep compiler quiet */
 		attnum = 0;
 	}
@@ -297,8 +300,9 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 								&elemtypid, &elem_eq_opr))
 		{
 			ereport(WARNING,
-					(errmsg("unable to determine element type of attribute \"%s\"", attname),
-					 errdetail("Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.")));
+					(errmsg("could not determine element type of column \"%s\"", attname),
+					 errdetail("Cannot set %s or %s.",
+							   "STATISTIC_KIND_MCELEM", "STATISTIC_KIND_DECHIST")));
 			elemtypid = InvalidOid;
 			elem_eq_opr = InvalidOid;
 
@@ -313,8 +317,9 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("could not determine less-than operator for attribute \"%s\"", attname),
-				 errdetail("Cannot set STATISTIC_KIND_HISTOGRAM or STATISTIC_KIND_CORRELATION.")));
+				 errmsg("could not determine less-than operator for column \"%s\"", attname),
+				 errdetail("Cannot set %s or %s.",
+						   "STATISTIC_KIND_HISTOGRAM", "STATISTIC_KIND_CORRELATION")));
 
 		do_histogram = false;
 		do_correlation = false;
@@ -327,8 +332,9 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("attribute \"%s\" is not a range type", attname),
-				 errdetail("Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM.")));
+				 errmsg("column \"%s\" is not a range type", attname),
+				 errdetail("Cannot set %s or %s.",
+						   "STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM", "STATISTIC_KIND_BOUNDS_HISTOGRAM")));
 
 		do_bounds_histogram = false;
 		do_range_length_histogram = false;
@@ -378,10 +384,27 @@ attribute_statistics_update(FunctionCallInfo fcinfo)
 
 		if (converted)
 		{
-			set_stats_slot(values, nulls, replaces,
-						   STATISTIC_KIND_MCV,
-						   eq_opr, atttypcoll,
-						   stanumbers, false, stavalues, false);
+			ArrayType  *vals_arr = DatumGetArrayTypeP(stavalues);
+			ArrayType  *nums_arr = DatumGetArrayTypeP(stanumbers);
+			int			nvals = ARR_DIMS(vals_arr)[0];
+			int			nnums = ARR_DIMS(nums_arr)[0];
+
+			if (nvals != nnums)
+			{
+				ereport(WARNING,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("could not parse \"%s\": incorrect number of elements (same as \"%s\" required)",
+								"most_common_vals",
+								"most_common_freqs")));
+				result = false;
+			}
+			else
+			{
+				set_stats_slot(values, nulls, replaces,
+							   STATISTIC_KIND_MCV,
+							   eq_opr, atttypcoll,
+							   stanumbers, false, stavalues, false);
+			}
 		}
 		else
 			result = false;
@@ -587,7 +610,7 @@ get_attr_stat_type(Oid reloid, AttrNumber attnum,
 	if (!HeapTupleIsValid(atup))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("attribute %d of relation \"%s\" does not exist",
+				 errmsg("column %d of relation \"%s\" does not exist",
 						attnum, RelationGetRelationName(rel))));
 
 	attr = (Form_pg_attribute) GETSTRUCT(atup);
@@ -595,7 +618,7 @@ get_attr_stat_type(Oid reloid, AttrNumber attnum,
 	if (attr->attisdropped)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("attribute %d of relation \"%s\" does not exist",
+				 errmsg("column %d of relation \"%s\" does not exist",
 						attnum, RelationGetRelationName(rel))));
 
 	expr = get_attr_expr(rel, attr->attnum);
@@ -725,11 +748,20 @@ text_to_stavalues(const char *staname, FmgrInfo *array_in, Datum d, Oid typid,
 		return (Datum) 0;
 	}
 
+	if (ARR_NDIM(DatumGetArrayTypeP(result)) != 1)
+	{
+		ereport(WARNING,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("\"%s\" must be a one-dimensional array", staname)));
+		*ok = false;
+		return (Datum) 0;
+	}
+
 	if (array_contains_nulls(DatumGetArrayTypeP(result)))
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("\"%s\" array cannot contain NULL values", staname)));
+				 errmsg("\"%s\" array must not contain null values", staname)));
 		*ok = false;
 		return (Datum) 0;
 	}
@@ -914,6 +946,7 @@ pg_clear_attribute_stats(PG_FUNCTION_ARGS)
 	char	   *attname;
 	AttrNumber	attnum;
 	bool		inherited;
+	Oid			locked_table = InvalidOid;
 
 	stats_check_required_arg(fcinfo, cleararginfo, C_ATTRELSCHEMA_ARG);
 	stats_check_required_arg(fcinfo, cleararginfo, C_ATTRELNAME_ARG);
@@ -923,15 +956,15 @@ pg_clear_attribute_stats(PG_FUNCTION_ARGS)
 	nspname = TextDatumGetCString(PG_GETARG_DATUM(C_ATTRELSCHEMA_ARG));
 	relname = TextDatumGetCString(PG_GETARG_DATUM(C_ATTRELNAME_ARG));
 
-	reloid = stats_lookup_relid(nspname, relname);
-
 	if (RecoveryInProgress())
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("recovery is in progress"),
 				 errhint("Statistics cannot be modified during recovery.")));
 
-	stats_lock_check_privileges(reloid);
+	reloid = RangeVarGetRelidExtended(makeRangeVar(nspname, relname, -1),
+									  ShareUpdateExclusiveLock, 0,
+									  RangeVarCallbackForStats, &locked_table);
 
 	attname = TextDatumGetCString(PG_GETARG_DATUM(C_ATTNAME_ARG));
 	attnum = get_attnum(reloid, attname);
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index a8b63ec0884..03349baccfb 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -736,6 +736,16 @@ lookup_var_attr_stats(Bitmapset *attrs, List *exprs,
 
 		stats[i] = examine_attribute(expr);
 
+		/*
+		 * If the expression has been found as non-analyzable, give up.  We
+		 * will not be able to build extended stats with it.
+		 */
+		if (stats[i] == NULL)
+		{
+			pfree(stats);
+			return NULL;
+		}
+
 		/*
 		 * XXX We need tuple descriptor later, and we just grab it from
 		 * stats[0]->tupDesc (see e.g. statext_mcv_build). But as coded
@@ -1317,6 +1327,9 @@ choose_best_statistics(List *stats, char requiredkind, bool inh,
  *		so we can't cope with system columns.
  * *exprs: input/output parameter collecting primitive subclauses within
  *		the clause tree
+ * *leakproof: input/output parameter recording the leakproofness of the
+ *		clause tree.  This should be true initially, and will be set to false
+ *		if any operator function used in an OpExpr is not leakproof.
  *
  * Returns false if there is something we definitively can't handle.
  * On true return, we can proceed to match the *exprs against statistics.
@@ -1324,7 +1337,7 @@ choose_best_statistics(List *stats, char requiredkind, bool inh,
 static bool
 statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 									  Index relid, Bitmapset **attnums,
-									  List **exprs)
+									  List **exprs, bool *leakproof)
 {
 	/* Look inside any binary-compatible relabeling (as in examine_variable) */
 	if (IsA(clause, RelabelType))
@@ -1359,7 +1372,6 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 	/* (Var/Expr op Const) or (Const op Var/Expr) */
 	if (is_opclause(clause))
 	{
-		RangeTblEntry *rte = root->simple_rte_array[relid];
 		OpExpr	   *expr = (OpExpr *) clause;
 		Node	   *clause_expr;
 
@@ -1394,24 +1406,15 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 				return false;
 		}
 
-		/*
-		 * If there are any securityQuals on the RTE from security barrier
-		 * views or RLS policies, then the user may not have access to all the
-		 * table's data, and we must check that the operator is leakproof.
-		 *
-		 * If the operator is leaky, then we must ignore this clause for the
-		 * purposes of estimating with MCV lists, otherwise the operator might
-		 * reveal values from the MCV list that the user doesn't have
-		 * permission to see.
-		 */
-		if (rte->securityQuals != NIL &&
-			!get_func_leakproof(get_opcode(expr->opno)))
-			return false;
+		/* Check if the operator is leakproof */
+		if (*leakproof)
+			*leakproof = get_func_leakproof(get_opcode(expr->opno));
 
 		/* Check (Var op Const) or (Const op Var) clauses by recursing. */
 		if (IsA(clause_expr, Var))
 			return statext_is_compatible_clause_internal(root, clause_expr,
-														 relid, attnums, exprs);
+														 relid, attnums,
+														 exprs, leakproof);
 
 		/* Otherwise we have (Expr op Const) or (Const op Expr). */
 		*exprs = lappend(*exprs, clause_expr);
@@ -1421,7 +1424,6 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 	/* Var/Expr IN Array */
 	if (IsA(clause, ScalarArrayOpExpr))
 	{
-		RangeTblEntry *rte = root->simple_rte_array[relid];
 		ScalarArrayOpExpr *expr = (ScalarArrayOpExpr *) clause;
 		Node	   *clause_expr;
 		bool		expronleft;
@@ -1461,24 +1463,15 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 				return false;
 		}
 
-		/*
-		 * If there are any securityQuals on the RTE from security barrier
-		 * views or RLS policies, then the user may not have access to all the
-		 * table's data, and we must check that the operator is leakproof.
-		 *
-		 * If the operator is leaky, then we must ignore this clause for the
-		 * purposes of estimating with MCV lists, otherwise the operator might
-		 * reveal values from the MCV list that the user doesn't have
-		 * permission to see.
-		 */
-		if (rte->securityQuals != NIL &&
-			!get_func_leakproof(get_opcode(expr->opno)))
-			return false;
+		/* Check if the operator is leakproof */
+		if (*leakproof)
+			*leakproof = get_func_leakproof(get_opcode(expr->opno));
 
 		/* Check Var IN Array clauses by recursing. */
 		if (IsA(clause_expr, Var))
 			return statext_is_compatible_clause_internal(root, clause_expr,
-														 relid, attnums, exprs);
+														 relid, attnums,
+														 exprs, leakproof);
 
 		/* Otherwise we have Expr IN Array. */
 		*exprs = lappend(*exprs, clause_expr);
@@ -1515,7 +1508,8 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 			 */
 			if (!statext_is_compatible_clause_internal(root,
 													   (Node *) lfirst(lc),
-													   relid, attnums, exprs))
+													   relid, attnums, exprs,
+													   leakproof))
 				return false;
 		}
 
@@ -1529,8 +1523,10 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 
 		/* Check Var IS NULL clauses by recursing. */
 		if (IsA(nt->arg, Var))
-			return statext_is_compatible_clause_internal(root, (Node *) (nt->arg),
-														 relid, attnums, exprs);
+			return statext_is_compatible_clause_internal(root,
+														 (Node *) (nt->arg),
+														 relid, attnums,
+														 exprs, leakproof);
 
 		/* Otherwise we have Expr IS NULL. */
 		*exprs = lappend(*exprs, nt->arg);
@@ -1569,11 +1565,9 @@ static bool
 statext_is_compatible_clause(PlannerInfo *root, Node *clause, Index relid,
 							 Bitmapset **attnums, List **exprs)
 {
-	RangeTblEntry *rte = root->simple_rte_array[relid];
-	RelOptInfo *rel = root->simple_rel_array[relid];
 	RestrictInfo *rinfo;
 	int			clause_relid;
-	Oid			userid;
+	bool		leakproof;
 
 	/*
 	 * Special-case handling for bare BoolExpr AND clauses, because the
@@ -1613,18 +1607,31 @@ statext_is_compatible_clause(PlannerInfo *root, Node *clause, Index relid,
 		clause_relid != relid)
 		return false;
 
-	/* Check the clause and determine what attributes it references. */
+	/*
+	 * Check the clause, determine what attributes it references, and whether
+	 * it includes any non-leakproof operators.
+	 */
+	leakproof = true;
 	if (!statext_is_compatible_clause_internal(root, (Node *) rinfo->clause,
-											   relid, attnums, exprs))
+											   relid, attnums, exprs,
+											   &leakproof))
 		return false;
 
 	/*
-	 * Check that the user has permission to read all required attributes.
+	 * If the clause includes any non-leakproof operators, check that the user
+	 * has permission to read all required attributes, otherwise the operators
+	 * might reveal values from the MCV list that the user doesn't have
+	 * permission to see.  We require all rows to be selectable --- there must
+	 * be no securityQuals from security barrier views or RLS policies.  See
+	 * similar code in examine_variable(), examine_simple_variable(), and
+	 * statistic_proc_security_check().
+	 *
+	 * Note that for an inheritance child, the permission checks are performed
+	 * on the inheritance root parent, and whole-table select privilege on the
+	 * parent doesn't guarantee that the user could read all columns of the
+	 * child. Therefore we must check all referenced columns.
 	 */
-	userid = OidIsValid(rel->userid) ? rel->userid : GetUserId();
-
-	/* Table-level SELECT privilege is sufficient for all columns */
-	if (pg_class_aclcheck(rte->relid, userid, ACL_SELECT) != ACLCHECK_OK)
+	if (!leakproof)
 	{
 		Bitmapset  *clause_attnums = NULL;
 		int			attnum = -1;
@@ -1649,26 +1656,9 @@ statext_is_compatible_clause(PlannerInfo *root, Node *clause, Index relid,
 		if (*exprs != NIL)
 			pull_varattnos((Node *) *exprs, relid, &clause_attnums);
 
-		attnum = -1;
-		while ((attnum = bms_next_member(clause_attnums, attnum)) >= 0)
-		{
-			/* Undo the offset */
-			AttrNumber	attno = attnum + FirstLowInvalidHeapAttributeNumber;
-
-			if (attno == InvalidAttrNumber)
-			{
-				/* Whole-row reference, so must have access to all columns */
-				if (pg_attribute_aclcheck_all(rte->relid, userid, ACL_SELECT,
-											  ACLMASK_ALL) != ACLCHECK_OK)
-					return false;
-			}
-			else
-			{
-				if (pg_attribute_aclcheck(rte->relid, attno, userid,
-										  ACL_SELECT) != ACLCHECK_OK)
-					return false;
-			}
-		}
+		/* Must have permission to read all rows from these columns */
+		if (!all_rows_selectable(root, relid, clause_attnums))
+			return false;
 	}
 
 	/* If we reach here, the clause is OK */
@@ -2416,6 +2406,9 @@ serialize_expr_stats(AnlExprData *exprdata, int nexprs)
 /*
  * Loads pg_statistic record from expression statistics for expression
  * identified by the supplied index.
+ *
+ * Returns the pg_statistic record found, or NULL if there is no statistics
+ * data to use.
  */
 HeapTuple
 statext_expressions_load(Oid stxoid, bool inh, int idx)
@@ -2444,6 +2437,13 @@ statext_expressions_load(Oid stxoid, bool inh, int idx)
 
 	deconstruct_expanded_array(eah);
 
+	if (eah->dnulls && eah->dnulls[idx])
+	{
+		/* No data found for this expression, give up. */
+		ReleaseSysCache(htup);
+		return NULL;
+	}
+
 	td = DatumGetHeapTupleHeader(eah->dvalues[idx]);
 
 	/* Build a temporary HeapTuple control structure */
diff --git a/src/backend/statistics/relation_stats.c b/src/backend/statistics/relation_stats.c
index cd3a75b621a..174da7d93a5 100644
--- a/src/backend/statistics/relation_stats.c
+++ b/src/backend/statistics/relation_stats.c
@@ -20,6 +20,7 @@
 #include "access/heapam.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
+#include "nodes/makefuncs.h"
 #include "statistics/stat_utils.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
@@ -82,6 +83,7 @@ relation_statistics_update(FunctionCallInfo fcinfo)
 	Datum		values[4] = {0};
 	bool		nulls[4] = {0};
 	int			nreplaces = 0;
+	Oid			locked_table = InvalidOid;
 
 	stats_check_required_arg(fcinfo, relarginfo, RELSCHEMA_ARG);
 	stats_check_required_arg(fcinfo, relarginfo, RELNAME_ARG);
@@ -89,15 +91,15 @@ relation_statistics_update(FunctionCallInfo fcinfo)
 	nspname = TextDatumGetCString(PG_GETARG_DATUM(RELSCHEMA_ARG));
 	relname = TextDatumGetCString(PG_GETARG_DATUM(RELNAME_ARG));
 
-	reloid = stats_lookup_relid(nspname, relname);
-
 	if (RecoveryInProgress())
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("recovery is in progress"),
 				 errhint("Statistics cannot be modified during recovery.")));
 
-	stats_lock_check_privileges(reloid);
+	reloid = RangeVarGetRelidExtended(makeRangeVar(nspname, relname, -1),
+									  ShareUpdateExclusiveLock, 0,
+									  RangeVarCallbackForStats, &locked_table);
 
 	if (!PG_ARGISNULL(RELPAGES_ARG))
 	{
@@ -112,7 +114,7 @@ relation_statistics_update(FunctionCallInfo fcinfo)
 		{
 			ereport(WARNING,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("reltuples cannot be < -1.0")));
+					 errmsg("argument \"%s\" must not be less than -1.0", "reltuples")));
 			result = false;
 		}
 		else
diff --git a/src/backend/statistics/stat_utils.c b/src/backend/statistics/stat_utils.c
index a9a3224efe6..0c139bf43a7 100644
--- a/src/backend/statistics/stat_utils.c
+++ b/src/backend/statistics/stat_utils.c
@@ -16,9 +16,11 @@
 
 #include "postgres.h"
 
+#include "access/htup_details.h"
 #include "access/relation.h"
 #include "catalog/index.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_database.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -29,6 +31,7 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
+#include "utils/syscache.h"
 
 /*
  * Ensure that a given argument is not null.
@@ -41,7 +44,7 @@ stats_check_required_arg(FunctionCallInfo fcinfo,
 	if (PG_ARGISNULL(argnum))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("\"%s\" cannot be NULL",
+				 errmsg("argument \"%s\" must not be null",
 						arginfo[argnum].argname)));
 }
 
@@ -68,7 +71,7 @@ stats_check_arg_array(FunctionCallInfo fcinfo,
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("\"%s\" cannot be a multidimensional array",
+				 errmsg("argument \"%s\" must not be a multidimensional array",
 						arginfo[argnum].argname)));
 		return false;
 	}
@@ -77,7 +80,7 @@ stats_check_arg_array(FunctionCallInfo fcinfo,
 	{
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("\"%s\" array cannot contain NULL values",
+				 errmsg("argument \"%s\" array must not contain null values",
 						arginfo[argnum].argname)));
 		return false;
 	}
@@ -108,7 +111,7 @@ stats_check_arg_pair(FunctionCallInfo fcinfo,
 
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("\"%s\" must be specified when \"%s\" is specified",
+				 errmsg("argument \"%s\" must be specified when argument \"%s\" is specified",
 						arginfo[nullarg].argname,
 						arginfo[otherarg].argname)));
 
@@ -119,53 +122,84 @@ stats_check_arg_pair(FunctionCallInfo fcinfo,
 }
 
 /*
- * Lock relation in ShareUpdateExclusive mode, check privileges, and close the
- * relation (but retain the lock).
- *
  * A role has privileges to set statistics on the relation if any of the
  * following are true:
  *   - the role owns the current database and the relation is not shared
  *   - the role has the MAINTAIN privilege on the relation
  */
 void
-stats_lock_check_privileges(Oid reloid)
+RangeVarCallbackForStats(const RangeVar *relation,
+						 Oid relId, Oid oldRelId, void *arg)
 {
-	Relation	table;
-	Oid			table_oid = reloid;
-	Oid			index_oid = InvalidOid;
-	LOCKMODE	index_lockmode = NoLock;
+	Oid		   *locked_oid = (Oid *) arg;
+	Oid			table_oid = relId;
+	HeapTuple	tuple;
+	Form_pg_class form;
+	char		relkind;
 
 	/*
-	 * For indexes, we follow the locking behavior in do_analyze_rel() and
-	 * check_lock_if_inplace_updateable_rel(), which is to lock the table
-	 * first in ShareUpdateExclusive mode and then the index in AccessShare
-	 * mode.
-	 *
-	 * Partitioned indexes are treated differently than normal indexes in
-	 * check_lock_if_inplace_updateable_rel(), so we take a
-	 * ShareUpdateExclusive lock on both the partitioned table and the
-	 * partitioned index.
+	 * If we previously locked some other index's heap, and the name we're
+	 * looking up no longer refers to that relation, release the now-useless
+	 * lock.
 	 */
-	switch (get_rel_relkind(reloid))
+	if (relId != oldRelId && OidIsValid(*locked_oid))
 	{
-		case RELKIND_INDEX:
-			index_oid = reloid;
-			table_oid = IndexGetRelation(index_oid, false);
-			index_lockmode = AccessShareLock;
-			break;
-		case RELKIND_PARTITIONED_INDEX:
-			index_oid = reloid;
-			table_oid = IndexGetRelation(index_oid, false);
-			index_lockmode = ShareUpdateExclusiveLock;
-			break;
-		default:
-			break;
+		UnlockRelationOid(*locked_oid, ShareUpdateExclusiveLock);
+		*locked_oid = InvalidOid;
+	}
+
+	/* If the relation does not exist, there's nothing more to do. */
+	if (!OidIsValid(relId))
+		return;
+
+	/* If the relation does exist, check whether it's an index. */
+	relkind = get_rel_relkind(relId);
+	if (relkind == RELKIND_INDEX ||
+		relkind == RELKIND_PARTITIONED_INDEX)
+		table_oid = IndexGetRelation(relId, false);
+
+	/*
+	 * If retrying yields the same OID, there are a couple of extremely
+	 * unlikely scenarios we need to handle.
+	 */
+	if (relId == oldRelId)
+	{
+		/*
+		 * If a previous lookup found an index, but the current lookup did
+		 * not, the index was dropped and the OID was reused for something
+		 * else between lookups.  In theory, we could simply drop our lock on
+		 * the index's parent table and proceed, but in the interest of
+		 * avoiding complexity, we just error.
+		 */
+		if (table_oid == relId && OidIsValid(*locked_oid))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("index \"%s\" was concurrently dropped",
+							relation->relname)));
+
+		/*
+		 * If the current lookup found an index but a previous lookup either
+		 * did not find an index or found one with a different parent
+		 * relation, the relation was dropped and the OID was reused for an
+		 * index between lookups.  RangeVarGetRelidExtended() will have
+		 * already locked the index at this point, so we can't just lock the
+		 * newly discovered parent table OID without risking deadlock.  As
+		 * above, we just error in this case.
+		 */
+		if (table_oid != relId && table_oid != *locked_oid)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("index \"%s\" was concurrently created",
+							relation->relname)));
 	}
 
-	table = relation_open(table_oid, ShareUpdateExclusiveLock);
+	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(table_oid));
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for OID %u", table_oid);
+	form = (Form_pg_class) GETSTRUCT(tuple);
 
 	/* the relkinds that can be used with ANALYZE */
-	switch (table->rd_rel->relkind)
+	switch (form->relkind)
 	{
 		case RELKIND_RELATION:
 		case RELKIND_MATVIEW:
@@ -176,62 +210,36 @@ stats_lock_check_privileges(Oid reloid)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("cannot modify statistics for relation \"%s\"",
-							RelationGetRelationName(table)),
-					 errdetail_relkind_not_supported(table->rd_rel->relkind)));
+							NameStr(form->relname)),
+					 errdetail_relkind_not_supported(form->relkind)));
 	}
 
-	if (OidIsValid(index_oid))
-	{
-		Relation	index;
-
-		Assert(index_lockmode != NoLock);
-		index = relation_open(index_oid, index_lockmode);
-
-		Assert(index->rd_index && index->rd_index->indrelid == table_oid);
-
-		/* retain lock on index */
-		relation_close(index, NoLock);
-	}
-
-	if (table->rd_rel->relisshared)
+	if (form->relisshared)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("cannot modify statistics for shared relation")));
 
+	/* Check permissions */
 	if (!object_ownercheck(DatabaseRelationId, MyDatabaseId, GetUserId()))
 	{
-		AclResult	aclresult = pg_class_aclcheck(RelationGetRelid(table),
+		AclResult	aclresult = pg_class_aclcheck(table_oid,
 												  GetUserId(),
 												  ACL_MAINTAIN);
 
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult,
-						   get_relkind_objtype(table->rd_rel->relkind),
-						   NameStr(table->rd_rel->relname));
+						   get_relkind_objtype(form->relkind),
+						   NameStr(form->relname));
 	}
 
-	/* retain lock on table */
-	relation_close(table, NoLock);
-}
+	ReleaseSysCache(tuple);
 
-/*
- * Lookup relation oid from schema and relation name.
- */
-Oid
-stats_lookup_relid(const char *nspname, const char *relname)
-{
-	Oid			nspoid;
-	Oid			reloid;
-
-	nspoid = LookupExplicitNamespace(nspname, false);
-	reloid = get_relname_relid(relname, nspoid);
-	if (!OidIsValid(reloid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s.%s\" does not exist",
-						nspname, relname)));
-
-	return reloid;
+	/* Lock heap before index to avoid deadlock. */
+	if (relId != oldRelId && table_oid != relId)
+	{
+		LockRelationOid(table_oid, ShareUpdateExclusiveLock);
+		*locked_oid = table_oid;
+	}
 }
 
 
@@ -263,7 +271,7 @@ stats_check_arg_type(const char *argname, Oid argtype, Oid expectedtype)
 	if (argtype != expectedtype)
 	{
 		ereport(WARNING,
-				(errmsg("argument \"%s\" has type \"%s\", expected type \"%s\"",
+				(errmsg("argument \"%s\" has type %s, expected type %s",
 						argname, format_type_be(argtype),
 						format_type_be(expectedtype))));
 		return false;
@@ -319,11 +327,11 @@ stats_fill_fcinfo_from_arg_pairs(FunctionCallInfo pairs_fcinfo,
 
 		if (argnulls[i])
 			ereport(ERROR,
-					(errmsg("name at variadic position %d is NULL", i + 1)));
+					(errmsg("name at variadic position %d is null", i + 1)));
 
 		if (types[i] != TEXTOID)
 			ereport(ERROR,
-					(errmsg("name at variadic position %d has type \"%s\", expected type \"%s\"",
+					(errmsg("name at variadic position %d has type %s, expected type %s",
 							i + 1, format_type_be(types[i]),
 							format_type_be(TEXTOID))));
 
diff --git a/src/backend/storage/aio/README.md b/src/backend/storage/aio/README.md
index f10b5c7e31e..72ae3b3737d 100644
--- a/src/backend/storage/aio/README.md
+++ b/src/backend/storage/aio/README.md
@@ -94,7 +94,7 @@ pgaio_io_register_callbacks(ioh, PGAIO_HCB_SHARED_BUFFER_READV, 0);
  *
  * In this example we're reading only a single buffer, hence the 1.
  */
-pgaio_io_set_handle_data_32(ioh, (uint32 *) buffer, 1);
+pgaio_io_set_handle_data_32(ioh, (uint32 *) &buffer, 1);
 
 /*
  * Pass the AIO handle to lower-level function. When operating on the level of
@@ -119,8 +119,9 @@ pgaio_io_set_handle_data_32(ioh, (uint32 *) buffer, 1);
  * e.g. due to reaching a limit on the number of unsubmitted IOs, and even
  * complete before smgrstartreadv() returns.
  */
+void *page = BufferGetBlock(buffer);
 smgrstartreadv(ioh, operation->smgr, forknum, blkno,
-               BufferGetBlock(buffer), 1);
+               &page, 1);
 
 /*
  * To benefit from AIO, it is beneficial to perform other work, including
diff --git a/src/backend/storage/aio/aio.c b/src/backend/storage/aio/aio.c
index 3643f27ad6e..e64afe68b2b 100644
--- a/src/backend/storage/aio/aio.c
+++ b/src/backend/storage/aio/aio.c
@@ -53,7 +53,7 @@
 
 static inline void pgaio_io_update_state(PgAioHandle *ioh, PgAioHandleState new_state);
 static void pgaio_io_reclaim(PgAioHandle *ioh);
-static void pgaio_io_resowner_register(PgAioHandle *ioh);
+static void pgaio_io_resowner_register(PgAioHandle *ioh, struct ResourceOwnerData *resowner);
 static void pgaio_io_wait_for_free(void);
 static PgAioHandle *pgaio_io_from_wref(PgAioWaitRef *iow, uint64 *ref_generation);
 static const char *pgaio_io_state_get_name(PgAioHandleState s);
@@ -89,6 +89,9 @@ static const IoMethodOps *const pgaio_method_ops_table[] = {
 #endif
 };
 
+StaticAssertDecl(lengthof(io_method_options) == lengthof(pgaio_method_ops_table) + 1,
+				 "io_method_options out of sync with pgaio_method_ops_table");
+
 /* callbacks for the configured io_method, set by assign_io_method */
 const IoMethodOps *pgaio_method_ops;
 
@@ -214,7 +217,7 @@ pgaio_io_acquire_nb(struct ResourceOwnerData *resowner, PgAioReturn *ret)
 		pgaio_my_backend->handed_out_io = ioh;
 
 		if (resowner)
-			pgaio_io_resowner_register(ioh);
+			pgaio_io_resowner_register(ioh, resowner);
 
 		if (ret)
 		{
@@ -275,7 +278,7 @@ pgaio_io_release_resowner(dlist_node *ioh_node, bool on_error)
 	ResourceOwnerForgetAioHandle(ioh->resowner, &ioh->resowner_node);
 	ioh->resowner = NULL;
 
-	switch (ioh->state)
+	switch ((PgAioHandleState) ioh->state)
 	{
 		case PGAIO_HS_IDLE:
 			elog(ERROR, "unexpected");
@@ -403,13 +406,13 @@ pgaio_io_update_state(PgAioHandle *ioh, PgAioHandleState new_state)
 }
 
 static void
-pgaio_io_resowner_register(PgAioHandle *ioh)
+pgaio_io_resowner_register(PgAioHandle *ioh, struct ResourceOwnerData *resowner)
 {
 	Assert(!ioh->resowner);
-	Assert(CurrentResourceOwner);
+	Assert(resowner);
 
-	ResourceOwnerRememberAioHandle(CurrentResourceOwner, &ioh->resowner_node);
-	ioh->resowner = CurrentResourceOwner;
+	ResourceOwnerRememberAioHandle(resowner, &ioh->resowner_node);
+	ioh->resowner = resowner;
 }
 
 /*
@@ -600,7 +603,7 @@ pgaio_io_wait(PgAioHandle *ioh, uint64 ref_generation)
 		if (pgaio_io_was_recycled(ioh, ref_generation, &state))
 			return;
 
-		switch (state)
+		switch ((PgAioHandleState) state)
 		{
 			case PGAIO_HS_IDLE:
 			case PGAIO_HS_HANDED_OUT:
@@ -825,7 +828,7 @@ pgaio_io_wait_for_free(void)
 											   &pgaio_my_backend->in_flight_ios);
 		uint64		generation = ioh->generation;
 
-		switch (ioh->state)
+		switch ((PgAioHandleState) ioh->state)
 		{
 				/* should not be in in-flight list */
 			case PGAIO_HS_IDLE:
@@ -905,7 +908,7 @@ static const char *
 pgaio_io_state_get_name(PgAioHandleState s)
 {
 #define PGAIO_HS_TOSTR_CASE(sym) case PGAIO_HS_##sym: return #sym
-	switch (s)
+	switch ((PgAioHandleState) s)
 	{
 			PGAIO_HS_TOSTR_CASE(IDLE);
 			PGAIO_HS_TOSTR_CASE(HANDED_OUT);
@@ -930,7 +933,7 @@ pgaio_io_get_state_name(PgAioHandle *ioh)
 const char *
 pgaio_result_status_string(PgAioResultStatus rs)
 {
-	switch (rs)
+	switch ((PgAioResultStatus) rs)
 	{
 		case PGAIO_RS_UNKNOWN:
 			return "UNKNOWN";
@@ -1318,8 +1321,8 @@ pgaio_shutdown(int code, Datum arg)
 void
 assign_io_method(int newval, void *extra)
 {
+	Assert(newval < lengthof(pgaio_method_ops_table));
 	Assert(pgaio_method_ops_table[newval] != NULL);
-	Assert(newval < lengthof(io_method_options));
 
 	pgaio_method_ops = pgaio_method_ops_table[newval];
 }
diff --git a/src/backend/storage/aio/aio_funcs.c b/src/backend/storage/aio/aio_funcs.c
index 584e683371a..75349ab872e 100644
--- a/src/backend/storage/aio/aio_funcs.c
+++ b/src/backend/storage/aio/aio_funcs.c
@@ -56,7 +56,7 @@ pg_get_aios(PG_FUNCTION_ARGS)
 	for (uint64 i = 0; i < pgaio_ctl->io_handle_count; i++)
 	{
 		PgAioHandle *live_ioh = &pgaio_ctl->io_handles[i];
-		uint32		ioh_id = pgaio_io_get_id(live_ioh);
+		int			ioh_id = pgaio_io_get_id(live_ioh);
 		Datum		values[PG_GET_AIOS_COLS] = {0};
 		bool		nulls[PG_GET_AIOS_COLS] = {0};
 		ProcNumber	owner;
@@ -149,10 +149,10 @@ pg_get_aios(PG_FUNCTION_ARGS)
 		if (owner_pid != 0)
 			values[0] = Int32GetDatum(owner_pid);
 		else
-			nulls[0] = false;
+			nulls[0] = true;
 
 		/* column: IO's id */
-		values[1] = ioh_id;
+		values[1] = Int32GetDatum(ioh_id);
 
 		/* column: IO's generation */
 		values[2] = Int64GetDatum(start_generation);
@@ -175,7 +175,7 @@ pg_get_aios(PG_FUNCTION_ARGS)
 		values[4] = CStringGetTextDatum(pgaio_io_get_op_name(&ioh_copy));
 
 		/* columns: details about the IO's operation (offset, length) */
-		switch (ioh_copy.op)
+		switch ((PgAioOp) ioh_copy.op)
 		{
 			case PGAIO_OP_INVALID:
 				nulls[5] = true;
diff --git a/src/backend/storage/aio/aio_init.c b/src/backend/storage/aio/aio_init.c
index 885c3940c66..54ab84dd6f0 100644
--- a/src/backend/storage/aio/aio_init.c
+++ b/src/backend/storage/aio/aio_init.c
@@ -30,12 +30,8 @@
 static Size
 AioCtlShmemSize(void)
 {
-	Size		sz;
-
 	/* pgaio_ctl itself */
-	sz = offsetof(PgAioCtl, io_handles);
-
-	return sz;
+	return sizeof(PgAioCtl);
 }
 
 static uint32
diff --git a/src/backend/storage/aio/aio_io.c b/src/backend/storage/aio/aio_io.c
index 520b5077df2..7d11d40284a 100644
--- a/src/backend/storage/aio/aio_io.c
+++ b/src/backend/storage/aio/aio_io.c
@@ -121,7 +121,7 @@ pgaio_io_perform_synchronously(PgAioHandle *ioh)
 	START_CRIT_SECTION();
 
 	/* Perform IO. */
-	switch (ioh->op)
+	switch ((PgAioOp) ioh->op)
 	{
 		case PGAIO_OP_READV:
 			pgstat_report_wait_start(WAIT_EVENT_DATA_FILE_READ);
@@ -176,7 +176,7 @@ pgaio_io_get_op_name(PgAioHandle *ioh)
 {
 	Assert(ioh->op >= 0 && ioh->op < PGAIO_OP_COUNT);
 
-	switch (ioh->op)
+	switch ((PgAioOp) ioh->op)
 	{
 		case PGAIO_OP_INVALID:
 			return "invalid";
@@ -198,7 +198,7 @@ pgaio_io_uses_fd(PgAioHandle *ioh, int fd)
 {
 	Assert(ioh->state >= PGAIO_HS_DEFINED);
 
-	switch (ioh->op)
+	switch ((PgAioOp) ioh->op)
 	{
 		case PGAIO_OP_READV:
 			return ioh->op_data.read.fd == fd;
@@ -222,7 +222,7 @@ pgaio_io_get_iovec_length(PgAioHandle *ioh, struct iovec **iov)
 
 	*iov = &pgaio_ctl->iovecs[ioh->iovec_off];
 
-	switch (ioh->op)
+	switch ((PgAioOp) ioh->op)
 	{
 		case PGAIO_OP_READV:
 			return ioh->op_data.read.iov_length;
diff --git a/src/backend/storage/aio/method_io_uring.c b/src/backend/storage/aio/method_io_uring.c
index b78048328e1..c73954aee6d 100644
--- a/src/backend/storage/aio/method_io_uring.c
+++ b/src/backend/storage/aio/method_io_uring.c
@@ -29,6 +29,9 @@
 
 #ifdef IOMETHOD_IO_URING_ENABLED
 
+#include <sys/mman.h>
+#include <unistd.h>
+
 #include <liburing.h>
 
 #include "miscadmin.h"
@@ -94,12 +97,32 @@ PgAioUringContext
 	struct io_uring io_uring_ring;
 } PgAioUringContext;
 
+/*
+ * Information about the capabilities that io_uring has.
+ *
+ * Depending on liburing and kernel version different features are
+ * supported. At least for the kernel a kernel version check does not suffice
+ * as various vendors do backport features to older kernels :(.
+ */
+typedef struct PgAioUringCaps
+{
+	bool		checked;
+	/* -1 if io_uring_queue_init_mem() is unsupported */
+	int			mem_init_size;
+} PgAioUringCaps;
+
+
 /* PgAioUringContexts for all backends */
 static PgAioUringContext *pgaio_uring_contexts;
 
 /* the current backend's context */
 static PgAioUringContext *pgaio_my_uring_context;
 
+static PgAioUringCaps pgaio_uring_caps =
+{
+	.checked = false,
+	.mem_init_size = -1,
+};
 
 static uint32
 pgaio_uring_procs(void)
@@ -111,16 +134,145 @@ pgaio_uring_procs(void)
 	return MaxBackends + NUM_AUXILIARY_PROCS - MAX_IO_WORKERS;
 }
 
-static Size
+/*
+ * Initializes pgaio_uring_caps, unless that's already done.
+ */
+static void
+pgaio_uring_check_capabilities(void)
+{
+	if (pgaio_uring_caps.checked)
+		return;
+
+	/*
+	 * By default io_uring creates a shared memory mapping for each io_uring
+	 * instance, leading to a large number of memory mappings. Unfortunately a
+	 * large number of memory mappings slows things down, backend exit is
+	 * particularly affected.  To address that, newer kernels (6.5) support
+	 * using user-provided memory for the memory, by putting the relevant
+	 * memory into shared memory we don't need any additional mappings.
+	 *
+	 * To know whether this is supported, we unfortunately need to probe the
+	 * kernel by trying to create a ring with userspace-provided memory. This
+	 * also has a secondary benefit: We can determine precisely how much
+	 * memory we need for each io_uring instance.
+	 */
+#if defined(HAVE_IO_URING_QUEUE_INIT_MEM) && defined(IORING_SETUP_NO_MMAP)
+	{
+		struct io_uring test_ring;
+		size_t		ring_size;
+		void	   *ring_ptr;
+		struct io_uring_params p = {0};
+		int			ret;
+
+		/*
+		 * Liburing does not yet provide an API to query how much memory a
+		 * ring will need. So we over-estimate it here. As the memory is freed
+		 * just below that's small temporary waste of memory.
+		 *
+		 * 1MB is more than enough for rings within io_max_concurrency's
+		 * range.
+		 */
+		ring_size = 1024 * 1024;
+
+		/*
+		 * Hard to believe a system exists where 1MB would not be a multiple
+		 * of the page size. But it's cheap to ensure...
+		 */
+		ring_size -= ring_size % sysconf(_SC_PAGESIZE);
+
+		ring_ptr = mmap(NULL, ring_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+		if (ring_ptr == MAP_FAILED)
+			elog(ERROR,
+				 "mmap(%zu) to determine io_uring_queue_init_mem() support failed: %m",
+				 ring_size);
+
+		ret = io_uring_queue_init_mem(io_max_concurrency, &test_ring, &p, ring_ptr, ring_size);
+		if (ret > 0)
+		{
+			pgaio_uring_caps.mem_init_size = ret;
+
+			elog(DEBUG1,
+				 "can use combined memory mapping for io_uring, each ring needs %d bytes",
+				 ret);
+
+			/* clean up the created ring, it was just for a test */
+			io_uring_queue_exit(&test_ring);
+		}
+		else
+		{
+			/*
+			 * There are different reasons for ring creation to fail, but it's
+			 * ok to treat that just as io_uring_queue_init_mem() not being
+			 * supported. We'll report a more detailed error in
+			 * pgaio_uring_shmem_init().
+			 */
+			errno = -ret;
+			elog(DEBUG1,
+				 "cannot use combined memory mapping for io_uring, ring creation failed: %m");
+
+		}
+
+		if (munmap(ring_ptr, ring_size) != 0)
+			elog(ERROR, "munmap() failed: %m");
+	}
+#else
+	{
+		elog(DEBUG1,
+			 "can't use combined memory mapping for io_uring, kernel or liburing too old");
+	}
+#endif
+
+	pgaio_uring_caps.checked = true;
+}
+
+/*
+ * Memory for all PgAioUringContext instances
+ */
+static size_t
 pgaio_uring_context_shmem_size(void)
 {
 	return mul_size(pgaio_uring_procs(), sizeof(PgAioUringContext));
 }
 
+/*
+ * Memory for the combined memory used by io_uring instances. Returns 0 if
+ * that is not supported by kernel/liburing.
+ */
+static size_t
+pgaio_uring_ring_shmem_size(void)
+{
+	size_t		sz = 0;
+
+	if (pgaio_uring_caps.mem_init_size > 0)
+	{
+		/*
+		 * Memory for rings needs to be allocated to the page boundary,
+		 * reserve space. Luckily it does not need to be aligned to hugepage
+		 * boundaries, even if huge pages are used.
+		 */
+		sz = add_size(sz, sysconf(_SC_PAGESIZE));
+		sz = add_size(sz, mul_size(pgaio_uring_procs(),
+								   pgaio_uring_caps.mem_init_size));
+	}
+
+	return sz;
+}
+
 static size_t
 pgaio_uring_shmem_size(void)
 {
-	return pgaio_uring_context_shmem_size();
+	size_t		sz;
+
+	/*
+	 * Kernel and liburing support for various features influences how much
+	 * shmem we need, perform the necessary checks.
+	 */
+	pgaio_uring_check_capabilities();
+
+	sz = pgaio_uring_context_shmem_size();
+	sz = add_size(sz, pgaio_uring_ring_shmem_size());
+
+	return sz;
 }
 
 static void
@@ -128,13 +280,38 @@ pgaio_uring_shmem_init(bool first_time)
 {
 	int			TotalProcs = pgaio_uring_procs();
 	bool		found;
+	char	   *shmem;
+	size_t		ring_mem_remain = 0;
+	char	   *ring_mem_next = 0;
 
-	pgaio_uring_contexts = (PgAioUringContext *)
-		ShmemInitStruct("AioUring", pgaio_uring_shmem_size(), &found);
-
+	/*
+	 * We allocate memory for all PgAioUringContext instances and, if
+	 * supported, the memory required for each of the io_uring instances, in
+	 * one ShmemInitStruct().
+	 */
+	shmem = ShmemInitStruct("AioUringContext", pgaio_uring_shmem_size(), &found);
 	if (found)
 		return;
 
+	pgaio_uring_contexts = (PgAioUringContext *) shmem;
+	shmem += pgaio_uring_context_shmem_size();
+
+	/* if supported, handle memory alignment / sizing for io_uring memory */
+	if (pgaio_uring_caps.mem_init_size > 0)
+	{
+		ring_mem_remain = pgaio_uring_ring_shmem_size();
+		ring_mem_next = (char *) shmem;
+
+		/* align to page boundary, see also pgaio_uring_ring_shmem_size() */
+		ring_mem_next = (char *) TYPEALIGN(sysconf(_SC_PAGESIZE), ring_mem_next);
+
+		/* account for alignment */
+		ring_mem_remain -= ring_mem_next - shmem;
+		shmem += ring_mem_next - shmem;
+
+		shmem += ring_mem_remain;
+	}
+
 	for (int contextno = 0; contextno < TotalProcs; contextno++)
 	{
 		PgAioUringContext *context = &pgaio_uring_contexts[contextno];
@@ -158,7 +335,28 @@ pgaio_uring_shmem_init(bool first_time)
 		 * be worth using that - also need to evaluate if that causes
 		 * noticeable additional contention?
 		 */
-		ret = io_uring_queue_init(io_max_concurrency, &context->io_uring_ring, 0);
+
+		/*
+		 * If supported (c.f. pgaio_uring_check_capabilities()), create ring
+		 * with its data in shared memory. Otherwise fall back io_uring
+		 * creating a memory mapping for each ring.
+		 */
+#if defined(HAVE_IO_URING_QUEUE_INIT_MEM) && defined(IORING_SETUP_NO_MMAP)
+		if (pgaio_uring_caps.mem_init_size > 0)
+		{
+			struct io_uring_params p = {0};
+
+			ret = io_uring_queue_init_mem(io_max_concurrency, &context->io_uring_ring, &p, ring_mem_next, ring_mem_remain);
+
+			ring_mem_remain -= ret;
+			ring_mem_next += ret;
+		}
+		else
+#endif
+		{
+			ret = io_uring_queue_init(io_max_concurrency, &context->io_uring_ring, 0);
+		}
+
 		if (ret < 0)
 		{
 			char	   *hint = NULL;
@@ -179,7 +377,7 @@ pgaio_uring_shmem_init(bool first_time)
 			else if (-ret == ENOSYS)
 			{
 				err = ERRCODE_FEATURE_NOT_SUPPORTED;
-				hint = _("Kernel does not support io_uring.");
+				hint = _("The kernel does not support io_uring.");
 			}
 
 			/* update errno to allow %m to work */
@@ -361,13 +559,14 @@ pgaio_uring_drain_locked(PgAioUringContext *context)
 		for (int i = 0; i < ncqes; i++)
 		{
 			struct io_uring_cqe *cqe = cqes[i];
-			PgAioHandle *ioh;
+			PgAioHandle *ioh = io_uring_cqe_get_data(cqe);
+			int			result = cqe->res;
 
-			ioh = io_uring_cqe_get_data(cqe);
 			errcallback.arg = ioh;
+
 			io_uring_cqe_seen(&context->io_uring_ring, cqe);
 
-			pgaio_io_process_completion(ioh, cqe->res);
+			pgaio_io_process_completion(ioh, result);
 			errcallback.arg = NULL;
 		}
 
@@ -462,7 +661,7 @@ pgaio_uring_sq_from_io(PgAioHandle *ioh, struct io_uring_sqe *sqe)
 {
 	struct iovec *iov;
 
-	switch (ioh->op)
+	switch ((PgAioOp) ioh->op)
 	{
 		case PGAIO_OP_READV:
 			iov = &pgaio_ctl->iovecs[ioh->iovec_off];
diff --git a/src/backend/storage/aio/method_worker.c b/src/backend/storage/aio/method_worker.c
index 36be179678d..b5ac073a910 100644
--- a/src/backend/storage/aio/method_worker.c
+++ b/src/backend/storage/aio/method_worker.c
@@ -52,26 +52,26 @@
 #define IO_WORKER_WAKEUP_FANOUT 2
 
 
-typedef struct AioWorkerSubmissionQueue
+typedef struct PgAioWorkerSubmissionQueue
 {
 	uint32		size;
 	uint32		mask;
 	uint32		head;
 	uint32		tail;
-	uint32		ios[FLEXIBLE_ARRAY_MEMBER];
-} AioWorkerSubmissionQueue;
+	int			sqes[FLEXIBLE_ARRAY_MEMBER];
+} PgAioWorkerSubmissionQueue;
 
-typedef struct AioWorkerSlot
+typedef struct PgAioWorkerSlot
 {
 	Latch	   *latch;
 	bool		in_use;
-} AioWorkerSlot;
+} PgAioWorkerSlot;
 
-typedef struct AioWorkerControl
+typedef struct PgAioWorkerControl
 {
 	uint64		idle_worker_mask;
-	AioWorkerSlot workers[FLEXIBLE_ARRAY_MEMBER];
-} AioWorkerControl;
+	PgAioWorkerSlot workers[FLEXIBLE_ARRAY_MEMBER];
+} PgAioWorkerControl;
 
 
 static size_t pgaio_worker_shmem_size(void);
@@ -96,8 +96,8 @@ int			io_workers = 3;
 
 static int	io_worker_queue_size = 64;
 static int	MyIoWorkerId;
-static AioWorkerSubmissionQueue *io_worker_submission_queue;
-static AioWorkerControl *io_worker_control;
+static PgAioWorkerSubmissionQueue *io_worker_submission_queue;
+static PgAioWorkerControl *io_worker_control;
 
 
 static size_t
@@ -106,15 +106,15 @@ pgaio_worker_queue_shmem_size(int *queue_size)
 	/* Round size up to next power of two so we can make a mask. */
 	*queue_size = pg_nextpower2_32(io_worker_queue_size);
 
-	return offsetof(AioWorkerSubmissionQueue, ios) +
-		sizeof(uint32) * *queue_size;
+	return offsetof(PgAioWorkerSubmissionQueue, sqes) +
+		sizeof(int) * *queue_size;
 }
 
 static size_t
 pgaio_worker_control_shmem_size(void)
 {
-	return offsetof(AioWorkerControl, workers) +
-		sizeof(AioWorkerSlot) * MAX_IO_WORKERS;
+	return offsetof(PgAioWorkerControl, workers) +
+		sizeof(PgAioWorkerSlot) * MAX_IO_WORKERS;
 }
 
 static size_t
@@ -162,7 +162,7 @@ pgaio_worker_shmem_init(bool first_time)
 }
 
 static int
-pgaio_choose_idle_worker(void)
+pgaio_worker_choose_idle(void)
 {
 	int			worker;
 
@@ -172,6 +172,7 @@ pgaio_choose_idle_worker(void)
 	/* Find the lowest bit position, and clear it. */
 	worker = pg_rightmost_one_pos64(io_worker_control->idle_worker_mask);
 	io_worker_control->idle_worker_mask &= ~(UINT64_C(1) << worker);
+	Assert(io_worker_control->workers[worker].in_use);
 
 	return worker;
 }
@@ -179,7 +180,7 @@ pgaio_choose_idle_worker(void)
 static bool
 pgaio_worker_submission_queue_insert(PgAioHandle *ioh)
 {
-	AioWorkerSubmissionQueue *queue;
+	PgAioWorkerSubmissionQueue *queue;
 	uint32		new_head;
 
 	queue = io_worker_submission_queue;
@@ -191,23 +192,23 @@ pgaio_worker_submission_queue_insert(PgAioHandle *ioh)
 		return false;			/* full */
 	}
 
-	queue->ios[queue->head] = pgaio_io_get_id(ioh);
+	queue->sqes[queue->head] = pgaio_io_get_id(ioh);
 	queue->head = new_head;
 
 	return true;
 }
 
-static uint32
+static int
 pgaio_worker_submission_queue_consume(void)
 {
-	AioWorkerSubmissionQueue *queue;
-	uint32		result;
+	PgAioWorkerSubmissionQueue *queue;
+	int			result;
 
 	queue = io_worker_submission_queue;
 	if (queue->tail == queue->head)
-		return UINT32_MAX;		/* empty */
+		return -1;				/* empty */
 
-	result = queue->ios[queue->tail];
+	result = queue->sqes[queue->tail];
 	queue->tail = (queue->tail + 1) & (queue->size - 1);
 
 	return result;
@@ -240,37 +241,37 @@ pgaio_worker_needs_synchronous_execution(PgAioHandle *ioh)
 }
 
 static void
-pgaio_worker_submit_internal(int nios, PgAioHandle *ios[])
+pgaio_worker_submit_internal(int num_staged_ios, PgAioHandle **staged_ios)
 {
 	PgAioHandle *synchronous_ios[PGAIO_SUBMIT_BATCH_SIZE];
 	int			nsync = 0;
 	Latch	   *wakeup = NULL;
 	int			worker;
 
-	Assert(nios <= PGAIO_SUBMIT_BATCH_SIZE);
+	Assert(num_staged_ios <= PGAIO_SUBMIT_BATCH_SIZE);
 
 	LWLockAcquire(AioWorkerSubmissionQueueLock, LW_EXCLUSIVE);
-	for (int i = 0; i < nios; ++i)
+	for (int i = 0; i < num_staged_ios; ++i)
 	{
-		Assert(!pgaio_worker_needs_synchronous_execution(ios[i]));
-		if (!pgaio_worker_submission_queue_insert(ios[i]))
+		Assert(!pgaio_worker_needs_synchronous_execution(staged_ios[i]));
+		if (!pgaio_worker_submission_queue_insert(staged_ios[i]))
 		{
 			/*
 			 * We'll do it synchronously, but only after we've sent as many as
 			 * we can to workers, to maximize concurrency.
 			 */
-			synchronous_ios[nsync++] = ios[i];
+			synchronous_ios[nsync++] = staged_ios[i];
 			continue;
 		}
 
 		if (wakeup == NULL)
 		{
 			/* Choose an idle worker to wake up if we haven't already. */
-			worker = pgaio_choose_idle_worker();
+			worker = pgaio_worker_choose_idle();
 			if (worker >= 0)
 				wakeup = io_worker_control->workers[worker].latch;
 
-			pgaio_debug_io(DEBUG4, ios[i],
+			pgaio_debug_io(DEBUG4, staged_ios[i],
 						   "choosing worker %d",
 						   worker);
 		}
@@ -316,6 +317,7 @@ pgaio_worker_die(int code, Datum arg)
 	Assert(io_worker_control->workers[MyIoWorkerId].in_use);
 	Assert(io_worker_control->workers[MyIoWorkerId].latch == MyLatch);
 
+	io_worker_control->idle_worker_mask &= ~(UINT64_C(1) << MyIoWorkerId);
 	io_worker_control->workers[MyIoWorkerId].in_use = false;
 	io_worker_control->workers[MyIoWorkerId].latch = NULL;
 	LWLockRelease(AioWorkerSubmissionQueueLock);
@@ -468,7 +470,7 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
 		 * to ensure that we don't see an outdated data in the handle.
 		 */
 		LWLockAcquire(AioWorkerSubmissionQueueLock, LW_EXCLUSIVE);
-		if ((io_index = pgaio_worker_submission_queue_consume()) == UINT32_MAX)
+		if ((io_index = pgaio_worker_submission_queue_consume()) == -1)
 		{
 			/*
 			 * Nothing to do.  Mark self idle.
@@ -488,7 +490,7 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
 						   IO_WORKER_WAKEUP_FANOUT);
 			for (int i = 0; i < nwakeups; ++i)
 			{
-				if ((worker = pgaio_choose_idle_worker()) < 0)
+				if ((worker = pgaio_worker_choose_idle()) < 0)
 					break;
 				latches[nlatches++] = io_worker_control->workers[worker].latch;
 			}
@@ -498,7 +500,7 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
 		for (int i = 0; i < nlatches; ++i)
 			SetLatch(latches[i]);
 
-		if (io_index != UINT32_MAX)
+		if (io_index != -1)
 		{
 			PgAioHandle *ioh = NULL;
 
@@ -573,6 +575,12 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
 		}
 
 		CHECK_FOR_INTERRUPTS();
+
+		if (ConfigReloadPending)
+		{
+			ConfigReloadPending = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
 	}
 
 	error_context_stack = errcallback.previous;
diff --git a/src/backend/storage/aio/read_stream.c b/src/backend/storage/aio/read_stream.c
index 0e7f5557f5c..6ab2e5a53f4 100644
--- a/src/backend/storage/aio/read_stream.c
+++ b/src/backend/storage/aio/read_stream.c
@@ -247,12 +247,33 @@ read_stream_start_pending_read(ReadStream *stream)
 	Assert(stream->pinned_buffers + stream->pending_read_nblocks <=
 		   stream->max_pinned_buffers);
 
+#ifdef USE_ASSERT_CHECKING
 	/* We had better not be overwriting an existing pinned buffer. */
 	if (stream->pinned_buffers > 0)
 		Assert(stream->next_buffer_index != stream->oldest_buffer_index);
 	else
 		Assert(stream->next_buffer_index == stream->oldest_buffer_index);
 
+	/*
+	 * Pinned buffers forwarded by a preceding StartReadBuffers() call that
+	 * had to split the operation should match the leading blocks of this
+	 * following StartReadBuffers() call.
+	 */
+	Assert(stream->forwarded_buffers <= stream->pending_read_nblocks);
+	for (int i = 0; i < stream->forwarded_buffers; ++i)
+		Assert(BufferGetBlockNumber(stream->buffers[stream->next_buffer_index + i]) ==
+			   stream->pending_read_blocknum + i);
+
+	/*
+	 * Check that we've cleared the queue/overflow entries corresponding to
+	 * the rest of the blocks covered by this read, unless it's the first go
+	 * around and we haven't even initialized them yet.
+	 */
+	for (int i = stream->forwarded_buffers; i < stream->pending_read_nblocks; ++i)
+		Assert(stream->next_buffer_index + i >= stream->initialized_buffers ||
+			   stream->buffers[stream->next_buffer_index + i] == InvalidBuffer);
+#endif
+
 	/* Do we need to issue read-ahead advice? */
 	flags = stream->read_buffers_flags;
 	if (stream->advice_enabled)
@@ -535,10 +556,9 @@ read_stream_begin_impl(int flags,
 	Oid			tablespace_id;
 
 	/*
-	 * Decide how many I/Os we will allow to run at the same time.  That
-	 * currently means advice to the kernel to tell it that we will soon read.
-	 * This number also affects how far we look ahead for opportunities to
-	 * start more I/Os.
+	 * Decide how many I/Os we will allow to run at the same time.  This
+	 * number also affects how far we look ahead for opportunities to start
+	 * more I/Os.
 	 */
 	tablespace_id = smgr->smgr_rlocator.locator.spcOid;
 	if (!OidIsValid(MyDatabaseId) ||
@@ -979,6 +999,19 @@ read_stream_next_buffer(ReadStream *stream, void **per_buffer_data)
 		stream->pending_read_nblocks == 0 &&
 		stream->per_buffer_data_size == 0)
 	{
+		/*
+		 * The fast path spins on one buffer entry repeatedly instead of
+		 * rotating through the whole queue and clearing the entries behind
+		 * it.  If the buffer it starts with happened to be forwarded between
+		 * StartReadBuffers() calls and also wrapped around the circular queue
+		 * partway through, then a copy also exists in the overflow zone, and
+		 * it won't clear it out as the regular path would.  Do that now, so
+		 * it doesn't need code for that.
+		 */
+		if (stream->oldest_buffer_index < stream->io_combine_limit - 1)
+			stream->buffers[stream->queue_size + stream->oldest_buffer_index] =
+				InvalidBuffer;
+
 		stream->fast_path = true;
 	}
 #endif
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 0973eb24a9a..798e3b78b1f 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -1485,11 +1485,6 @@ StartReadBuffersImpl(ReadBuffersOperation *operation,
  * buffers must remain valid until WaitReadBuffers() is called, and any
  * forwarded buffers must also be preserved for a continuing call unless
  * they are explicitly released.
- *
- * Currently the I/O is only started with optional operating system advice if
- * requested by the caller with READ_BUFFERS_ISSUE_ADVICE, and the real I/O
- * happens synchronously in WaitReadBuffers().  In future work, true I/O could
- * be initiated here.
  */
 bool
 StartReadBuffers(ReadBuffersOperation *operation,
@@ -1771,10 +1766,10 @@ AsyncReadBuffers(ReadBuffersOperation *operation, int *nblocks_progress)
 {
 	Buffer	   *buffers = &operation->buffers[0];
 	int			flags = operation->flags;
-	BlockNumber blocknum = operation->blocknum;
 	ForkNumber	forknum = operation->forknum;
 	char		persistence = operation->persistence;
 	int16		nblocks_done = operation->nblocks_done;
+	BlockNumber blocknum = operation->blocknum + nblocks_done;
 	Buffer	   *io_buffers = &operation->buffers[nblocks_done];
 	int			io_buffers_len = 0;
 	PgAioHandle *ioh;
@@ -1886,7 +1881,7 @@ AsyncReadBuffers(ReadBuffersOperation *operation, int *nblocks_progress)
 		 * must have started out as a miss in PinBufferForBlock(). The other
 		 * backend will track this as a 'read'.
 		 */
-		TRACE_POSTGRESQL_BUFFER_READ_DONE(forknum, blocknum + operation->nblocks_done,
+		TRACE_POSTGRESQL_BUFFER_READ_DONE(forknum, blocknum,
 										  operation->smgr->smgr_rlocator.locator.spcOid,
 										  operation->smgr->smgr_rlocator.locator.dbOid,
 										  operation->smgr->smgr_rlocator.locator.relNumber,
@@ -1958,7 +1953,7 @@ AsyncReadBuffers(ReadBuffersOperation *operation, int *nblocks_progress)
 		 */
 		io_start = pgstat_prepare_io_time(track_io_timing);
 		smgrstartreadv(ioh, operation->smgr, forknum,
-					   blocknum + nblocks_done,
+					   blocknum,
 					   io_pages, io_buffers_len);
 		pgstat_count_io_op_time(io_object, io_context, IOOP_READ,
 								io_start, 1, io_buffers_len * BLCKSZ);
@@ -2777,7 +2772,7 @@ ExtendBufferedRelShared(BufferManagerRelation bmr,
 
 			if (valid && !PageIsNew((Page) buf_block))
 				ereport(ERROR,
-						(errmsg("unexpected data beyond EOF in block %u of relation %s",
+						(errmsg("unexpected data beyond EOF in block %u of relation \"%s\"",
 								existing_hdr->tag.blockNum,
 								relpath(bmr.smgr->smgr_rlocator, fork).str),
 						 errhint("This has been seen to occur with buggy kernels; consider updating your system.")));
@@ -6202,7 +6197,7 @@ shared_buffer_write_error_callback(void *arg)
 
 	/* Buffer is pinned, so we can read the tag without locking the spinlock */
 	if (bufHdr != NULL)
-		errcontext("writing block %u of relation %s",
+		errcontext("writing block %u of relation \"%s\"",
 				   bufHdr->tag.blockNum,
 				   relpathperm(BufTagGetRelFileLocator(&bufHdr->tag),
 							   BufTagGetForkNum(&bufHdr->tag)).str);
@@ -6217,7 +6212,7 @@ local_buffer_write_error_callback(void *arg)
 	BufferDesc *bufHdr = (BufferDesc *) arg;
 
 	if (bufHdr != NULL)
-		errcontext("writing block %u of relation %s",
+		errcontext("writing block %u of relation \"%s\"",
 				   bufHdr->tag.blockNum,
 				   relpathbackend(BufTagGetRelFileLocator(&bufHdr->tag),
 								  MyProcNumber,
@@ -6689,6 +6684,8 @@ EvictAllUnpinnedBuffers(int32 *buffers_evicted, int32 *buffers_flushed,
 		uint32		buf_state;
 		bool		buffer_flushed;
 
+		CHECK_FOR_INTERRUPTS();
+
 		buf_state = pg_atomic_read_u32(&desc->state);
 		if (!(buf_state & BM_VALID))
 			continue;
@@ -6739,6 +6736,8 @@ EvictRelUnpinnedBuffers(Relation rel, int32 *buffers_evicted,
 		uint32		buf_state = pg_atomic_read_u32(&(desc->state));
 		bool		buffer_flushed;
 
+		CHECK_FOR_INTERRUPTS();
+
 		/* An unlocked precheck should be safe and saves some cycles. */
 		if ((buf_state & BM_VALID) == 0 ||
 			!BufTagMatchesRelFileLocator(&desc->tag, &rel->rd_locator))
@@ -7316,13 +7315,15 @@ buffer_readv_report(PgAioResult result, const PgAioTargetData *td,
 
 		ereport(elevel,
 				errcode(ERRCODE_DATA_CORRUPTED),
-				errmsg("zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation %s",
+				errmsg("zeroing %u page(s) and ignoring %u checksum failure(s) among blocks %u..%u of relation \"%s\"",
 					   affected_count, checkfail_count, first, last, rpath.str),
 				affected_count > 1 ?
-				errdetail("Block %u held first zeroed page.",
+				errdetail("Block %u held the first zeroed page.",
 						  first + first_off) : 0,
-				errhint("See server log for details about the other %d invalid block(s).",
-						affected_count + checkfail_count - 1));
+				errhint_plural("See server log for details about the other %d invalid block.",
+							   "See server log for details about the other %d invalid blocks.",
+							   affected_count + checkfail_count - 1,
+							   affected_count + checkfail_count - 1));
 		return;
 	}
 
@@ -7335,25 +7336,25 @@ buffer_readv_report(PgAioResult result, const PgAioTargetData *td,
 	{
 		Assert(!zeroed_any);	/* can't have invalid pages when zeroing them */
 		affected_count = zeroed_or_error_count;
-		msg_one = _("invalid page in block %u of relation %s");
-		msg_mult = _("%u invalid pages among blocks %u..%u of relation %s");
-		det_mult = _("Block %u held first invalid page.");
+		msg_one = _("invalid page in block %u of relation \"%s\"");
+		msg_mult = _("%u invalid pages among blocks %u..%u of relation \"%s\"");
+		det_mult = _("Block %u held the first invalid page.");
 		hint_mult = _("See server log for the other %u invalid block(s).");
 	}
 	else if (zeroed_any && !ignored_any)
 	{
 		affected_count = zeroed_or_error_count;
-		msg_one = _("invalid page in block %u of relation %s; zeroing out page");
-		msg_mult = _("zeroing out %u invalid pages among blocks %u..%u of relation %s");
-		det_mult = _("Block %u held first zeroed page.");
+		msg_one = _("invalid page in block %u of relation \"%s\"; zeroing out page");
+		msg_mult = _("zeroing out %u invalid pages among blocks %u..%u of relation \"%s\"");
+		det_mult = _("Block %u held the first zeroed page.");
 		hint_mult = _("See server log for the other %u zeroed block(s).");
 	}
 	else if (!zeroed_any && ignored_any)
 	{
 		affected_count = checkfail_count;
-		msg_one = _("ignoring checksum failure in block %u of relation %s");
-		msg_mult = _("ignoring %u checksum failures among blocks %u..%u of relation %s");
-		det_mult = _("Block %u held first ignored page.");
+		msg_one = _("ignoring checksum failure in block %u of relation \"%s\"");
+		msg_mult = _("ignoring %u checksum failures among blocks %u..%u of relation \"%s\"");
+		det_mult = _("Block %u held the first ignored page.");
 		hint_mult = _("See server log for the other %u ignored block(s).");
 	}
 	else
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index 61373a309a9..a41e81cf296 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/storage/file/buffile.c
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 0e8299dd556..378c078c7c7 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -164,6 +164,9 @@ bool		data_sync_retry = false;
 /* How SyncDataDirectory() should do its job. */
 int			recovery_init_sync_method = DATA_DIR_SYNC_METHOD_FSYNC;
 
+/* How data files should be bulk-extended with zeros. */
+int			file_extend_method = DEFAULT_FILE_EXTEND_METHOD;
+
 /* Which kinds of files should be opened with PG_O_DIRECT. */
 int			io_direct_flags;
 
@@ -400,25 +403,22 @@ pg_fsync(int fd)
 	 * portable, even if it runs ok on the current system.
 	 *
 	 * We assert here that a descriptor for a file was opened with write
-	 * permissions (either O_RDWR or O_WRONLY) and for a directory without
-	 * write permissions (O_RDONLY).
+	 * permissions (i.e., not O_RDONLY) and for a directory without write
+	 * permissions (O_RDONLY).  Notice that the assertion check is made even
+	 * if fsync() is disabled.
 	 *
-	 * Ignore any fstat errors and let the follow-up fsync() do its work.
-	 * Doing this sanity check here counts for the case where fsync() is
-	 * disabled.
+	 * If fstat() fails, ignore it and let the follow-up fsync() complain.
 	 */
 	if (fstat(fd, &st) == 0)
 	{
 		int			desc_flags = fcntl(fd, F_GETFL);
 
-		/*
-		 * O_RDONLY is historically 0, so just make sure that for directories
-		 * no write flags are used.
-		 */
+		desc_flags &= O_ACCMODE;
+
 		if (S_ISDIR(st.st_mode))
-			Assert((desc_flags & (O_RDWR | O_WRONLY)) == 0);
+			Assert(desc_flags == O_RDONLY);
 		else
-			Assert((desc_flags & (O_RDWR | O_WRONLY)) != 0);
+			Assert(desc_flags != O_RDONLY);
 	}
 	errno = 0;
 #endif
@@ -562,7 +562,7 @@ pg_flush_data(int fd, off_t offset, off_t nbytes)
 		{
 			int			elevel;
 
-			if (rc == EINTR)
+			if (errno == EINTR)
 				goto retry;
 
 			/*
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index 4773a9cc65e..e5ec3829b18 100644
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -231,8 +231,18 @@ XLogRecordPageWithFreeSpace(RelFileLocator rlocator, BlockNumber heapBlk,
 	if (PageIsNew(page))
 		PageInit(page, BLCKSZ, 0);
 
+	/*
+	 * Changes to FSM are usually marked as changed using MarkBufferDirtyHint;
+	 * however, during recovery, it does nothing if checksums are enabled. It
+	 * is assumed that the page should not be dirtied during recovery while
+	 * modifying hints to prevent torn pages, since no new WAL data can be
+	 * generated at this point to store FPI. This is not relevant to the FSM
+	 * case, as its blocks are zeroed when a checksum mismatch occurs. So, we
+	 * need to use regular MarkBufferDirty here to mark the FSM block as
+	 * modified during recovery, otherwise changes to the FSM may be lost.
+	 */
 	if (fsm_set_avail(page, slot, new_cat))
-		MarkBufferDirtyHint(buf, false);
+		MarkBufferDirty(buf);
 	UnlockReleaseBuffer(buf);
 }
 
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 19959dff26e..8ff7dd2aa66 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -38,7 +38,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/dsm_registry.c b/src/backend/storage/ipc/dsm_registry.c
index 1d4fd31ffed..ec063dec460 100644
--- a/src/backend/storage/ipc/dsm_registry.c
+++ b/src/backend/storage/ipc/dsm_registry.c
@@ -101,9 +101,10 @@ init_dsm_registry(void)
 	{
 		/* Initialize dynamic shared hash table for registry. */
 		dsm_registry_dsa = dsa_create(LWTRANCHE_DSM_REGISTRY_DSA);
+		dsm_registry_table = dshash_create(dsm_registry_dsa, &dsh_params, NULL);
+
 		dsa_pin(dsm_registry_dsa);
 		dsa_pin_mapping(dsm_registry_dsa);
-		dsm_registry_table = dshash_create(dsm_registry_dsa, &dsh_params, NULL);
 
 		/* Store handles in shared memory for other backends to use. */
 		DSMRegistryCtx->dsah = dsa_get_handle(dsm_registry_dsa);
@@ -134,6 +135,7 @@ GetNamedDSMSegment(const char *name, size_t size,
 	DSMRegistryEntry *entry;
 	MemoryContext oldcontext;
 	void	   *ret;
+	dsm_segment *seg;
 
 	Assert(found);
 
@@ -158,29 +160,31 @@ GetNamedDSMSegment(const char *name, size_t size,
 	entry = dshash_find_or_insert(dsm_registry_table, name, found);
 	if (!(*found))
 	{
+		entry->handle = DSM_HANDLE_INVALID;
+		entry->size = size;
+	}
+	else if (entry->size != size)
+		ereport(ERROR,
+				(errmsg("requested DSM segment size does not match size of existing segment")));
+
+	if (entry->handle == DSM_HANDLE_INVALID)
+	{
+		*found = false;
+
 		/* Initialize the segment. */
-		dsm_segment *seg = dsm_create(size, 0);
+		seg = dsm_create(size, 0);
+
+		if (init_callback)
+			(*init_callback) (dsm_segment_address(seg));
 
 		dsm_pin_segment(seg);
 		dsm_pin_mapping(seg);
 		entry->handle = dsm_segment_handle(seg);
-		entry->size = size;
-		ret = dsm_segment_address(seg);
-
-		if (init_callback)
-			(*init_callback) (ret);
-	}
-	else if (entry->size != size)
-	{
-		ereport(ERROR,
-				(errmsg("requested DSM segment size does not match size of "
-						"existing segment")));
 	}
 	else
 	{
-		dsm_segment *seg = dsm_find_mapping(entry->handle);
-
 		/* If the existing segment is not already attached, attach it now. */
+		seg = dsm_find_mapping(entry->handle);
 		if (seg == NULL)
 		{
 			seg = dsm_attach(entry->handle);
@@ -189,10 +193,9 @@ GetNamedDSMSegment(const char *name, size_t size,
 
 			dsm_pin_mapping(seg);
 		}
-
-		ret = dsm_segment_address(seg);
 	}
 
+	ret = dsm_segment_address(seg);
 	dshash_release_lock(dsm_registry_table, entry);
 	MemoryContextSwitchTo(oldcontext);
 
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 567739b5be9..0684d343468 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -29,6 +29,7 @@
 #endif
 #include "storage/dsm.h"
 #include "storage/ipc.h"
+#include "storage/lwlock.h"
 #include "tcop/tcopprot.h"
 
 
@@ -229,13 +230,19 @@ shmem_exit(int code)
 {
 	shmem_exit_inprogress = true;
 
+	/*
+	 * Release any LWLocks we might be holding before callbacks run. This
+	 * prevents accessing locks in detached DSM segments and allows callbacks
+	 * to acquire new locks.
+	 */
+	LWLockReleaseAll();
+
 	/*
 	 * Call before_shmem_exit callbacks.
 	 *
 	 * These should be things that need most of the system to still be up and
 	 * working, such as cleanup of temp relations, which requires catalog
-	 * access; or things that need to be completed because later cleanup steps
-	 * depend on them, such as releasing lwlocks.
+	 * access.
 	 */
 	elog(DEBUG3, "shmem_exit(%d): %d before_shmem_exit callbacks to make",
 		 code, before_shmem_exit_index);
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 2fa045e6b0f..8d2b0f1193d 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -225,7 +225,9 @@ CreateSharedMemoryAndSemaphores(void)
 	InitShmemAccess(seghdr);
 
 	/*
-	 * Create semaphores
+	 * Create semaphores.  (This is done here for historical reasons.  We used
+	 * to support emulating spinlocks with semaphores, which required
+	 * initializing semaphores early.)
 	 */
 	PGReserveSemaphores(numSemas);
 
diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c
index c6aefd2f688..beadeb5e46a 100644
--- a/src/backend/storage/ipc/latch.c
+++ b/src/backend/storage/ipc/latch.c
@@ -187,9 +187,11 @@ WaitLatch(Latch *latch, int wakeEvents, long timeout,
 	if (!(wakeEvents & WL_LATCH_SET))
 		latch = NULL;
 	ModifyWaitEvent(LatchWaitSet, LatchWaitSetLatchPos, WL_LATCH_SET, latch);
-	ModifyWaitEvent(LatchWaitSet, LatchWaitSetPostmasterDeathPos,
-					(wakeEvents & (WL_EXIT_ON_PM_DEATH | WL_POSTMASTER_DEATH)),
-					NULL);
+
+	if (IsUnderPostmaster)
+		ModifyWaitEvent(LatchWaitSet, LatchWaitSetPostmasterDeathPos,
+						(wakeEvents & (WL_EXIT_ON_PM_DEATH | WL_POSTMASTER_DEATH)),
+						NULL);
 
 	if (WaitEventSetWait(LatchWaitSet,
 						 (wakeEvents & WL_TIMEOUT) ? timeout : -1,
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index dd7c72d32da..170523519e5 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -36,7 +36,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index a9bb540b55a..05d99b452c3 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -23,6 +23,7 @@
 #include "pgstat.h"
 #include "port/pg_bitutils.h"
 #include "replication/logicalworker.h"
+#include "replication/slotsync.h"
 #include "replication/walsender.h"
 #include "storage/condition_variable.h"
 #include "storage/ipc.h"
@@ -694,6 +695,9 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
 	if (CheckProcSignal(PROCSIG_PARALLEL_APPLY_MESSAGE))
 		HandleParallelApplyMessageInterrupt();
 
+	if (CheckProcSignal(PROCSIG_SLOTSYNC_MESSAGE))
+		HandleSlotSyncMessageInterrupt();
+
 	if (CheckProcSignal(PROCSIG_RECOVERY_CONFLICT_DATABASE))
 		HandleRecoveryConflictInterrupt(PROCSIG_RECOVERY_CONFLICT_DATABASE);
 
@@ -728,7 +732,11 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
 void
 SendCancelRequest(int backendPID, const uint8 *cancel_key, int cancel_key_len)
 {
-	Assert(backendPID != 0);
+	if (backendPID == 0)
+	{
+		ereport(LOG, (errmsg("invalid cancel request with PID 0")));
+		return;
+	}
 
 	/*
 	 * See if we have a matching backend. Reading the pss_pid and
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index c9ae3b45b76..df48d1f78e9 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -486,42 +486,6 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 }
 
 
-/*
- * Add two Size values, checking for overflow
- */
-Size
-add_size(Size s1, Size s2)
-{
-	Size		result;
-
-	result = s1 + s2;
-	/* We are assuming Size is an unsigned type here... */
-	if (result < s1 || result < s2)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("requested shared memory size overflows size_t")));
-	return result;
-}
-
-/*
- * Multiply two Size values, checking for overflow
- */
-Size
-mul_size(Size s1, Size s2)
-{
-	Size		result;
-
-	if (s1 == 0 || s2 == 0)
-		return 0;
-	result = s1 * s2;
-	/* We are assuming Size is an unsigned type here... */
-	if (result / s2 != s1)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("requested shared memory size overflows size_t")));
-	return result;
-}
-
 /* SQL SRF showing allocated shared memory */
 Datum
 pg_get_shmem_allocations(PG_FUNCTION_ARGS)
@@ -603,19 +567,16 @@ pg_get_shmem_allocations_numa(PG_FUNCTION_ARGS)
 	InitMaterializedSRF(fcinfo, 0);
 
 	max_nodes = pg_numa_get_max_node();
-	nodes = palloc(sizeof(Size) * (max_nodes + 1));
+	nodes = palloc(sizeof(Size) * (max_nodes + 2));
 
 	/*
-	 * Different database block sizes (4kB, 8kB, ..., 32kB) can be used, while
-	 * the OS may have different memory page sizes.
+	 * Shared memory allocations can vary in size and may not align with OS
+	 * memory page boundaries, while NUMA queries work on pages.
 	 *
-	 * To correctly map between them, we need to: 1. Determine the OS memory
-	 * page size 2. Calculate how many OS pages are used by all buffer blocks
-	 * 3. Calculate how many OS pages are contained within each database
-	 * block.
-	 *
-	 * This information is needed before calling move_pages() for NUMA memory
-	 * node inquiry.
+	 * To correctly map each allocation to NUMA nodes, we need to: 1.
+	 * Determine the OS memory page size. 2. Align each allocation's start/end
+	 * addresses to page boundaries. 3. Query NUMA node information for all
+	 * pages spanning the allocation.
 	 */
 	os_page_size = pg_get_shmem_pagesize();
 
@@ -642,7 +603,6 @@ pg_get_shmem_allocations_numa(PG_FUNCTION_ARGS)
 	hash_seq_init(&hstat, ShmemIndex);
 
 	/* output all allocated entries */
-	memset(nulls, 0, sizeof(nulls));
 	while ((ent = (ShmemIndexEnt *) hash_seq_search(&hstat)) != NULL)
 	{
 		int			i;
@@ -679,12 +639,10 @@ pg_get_shmem_allocations_numa(PG_FUNCTION_ARGS)
 		 */
 		for (i = 0; i < shm_ent_page_count; i++)
 		{
-			volatile uint64 touch pg_attribute_unused();
-
 			page_ptrs[i] = startptr + (i * os_page_size);
 
 			if (firstNumaTouch)
-				pg_numa_touch_mem_if_required(touch, page_ptrs[i]);
+				pg_numa_touch_mem_if_required(page_ptrs[i]);
 
 			CHECK_FOR_INTERRUPTS();
 		}
@@ -693,22 +651,33 @@ pg_get_shmem_allocations_numa(PG_FUNCTION_ARGS)
 			elog(ERROR, "failed NUMA pages inquiry status: %m");
 
 		/* Count number of NUMA nodes used for this shared memory entry */
-		memset(nodes, 0, sizeof(Size) * (max_nodes + 1));
+		memset(nodes, 0, sizeof(Size) * (max_nodes + 2));
 
 		for (i = 0; i < shm_ent_page_count; i++)
 		{
 			int			s = pages_status[i];
 
 			/* Ensure we are adding only valid index to the array */
-			if (s < 0 || s > max_nodes)
+			if (s >= 0 && s <= max_nodes)
+			{
+				/* valid NUMA node */
+				nodes[s]++;
+				continue;
+			}
+			else if (s == -2)
 			{
-				elog(ERROR, "invalid NUMA node id outside of allowed range "
-					 "[0, " UINT64_FORMAT "]: %d", max_nodes, s);
+				/* -2 means ENOENT (e.g. page was moved to swap) */
+				nodes[max_nodes + 1]++;
+				continue;
 			}
 
-			nodes[s]++;
+			elog(ERROR, "invalid NUMA node id outside of allowed range "
+				 "[0, " UINT64_FORMAT "]: %d", max_nodes, s);
 		}
 
+		/* no NULLs for regular nodes */
+		memset(nulls, 0, sizeof(nulls));
+
 		/*
 		 * Add one entry for each NUMA node, including those without allocated
 		 * memory for this segment.
@@ -722,6 +691,14 @@ pg_get_shmem_allocations_numa(PG_FUNCTION_ARGS)
 			tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc,
 								 values, nulls);
 		}
+
+		/* The last entry is used for pages without a NUMA node. */
+		nulls[1] = true;
+		values[0] = CStringGetTextDatum(ent->key);
+		values[2] = Int64GetDatum(nodes[max_nodes + 1] * os_page_size);
+
+		tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc,
+							 values, nulls);
 	}
 
 	LWLockRelease(ShmemIndexLock);
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index b5132e92ea3..e9e1c8edec5 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -9,7 +9,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/storage/ipc/standby.c
diff --git a/src/backend/storage/ipc/waiteventset.c b/src/backend/storage/ipc/waiteventset.c
index 7c0e66900f9..b0746521ae4 100644
--- a/src/backend/storage/ipc/waiteventset.c
+++ b/src/backend/storage/ipc/waiteventset.c
@@ -67,6 +67,7 @@
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "port/atomics.h"
 #include "portability/instr_time.h"
 #include "postmaster/postmaster.h"
 #include "storage/fd.h"
diff --git a/src/backend/storage/lmgr/generate-lwlocknames.pl b/src/backend/storage/lmgr/generate-lwlocknames.pl
index ee43b730302..63c06707296 100644
--- a/src/backend/storage/lmgr/generate-lwlocknames.pl
+++ b/src/backend/storage/lmgr/generate-lwlocknames.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate lwlocknames.h from lwlocklist.h
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2000-2025, PostgreSQL Global Development Group
 
 use strict;
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 94a7155f833..783c183337a 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index d12313e169c..3541d8546f4 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 1e469ec4a16..41e8fa1fe50 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -22,7 +22,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/storage/lmgr/lwlock.c
@@ -171,8 +171,8 @@ static const char *const BuiltinTrancheNames[] = {
 	[LWTRANCHE_DSM_REGISTRY_DSA] = "DSMRegistryDSA",
 	[LWTRANCHE_DSM_REGISTRY_HASH] = "DSMRegistryHash",
 	[LWTRANCHE_COMMITTS_SLRU] = "CommitTsSLRU",
-	[LWTRANCHE_MULTIXACTOFFSET_SLRU] = "MultixactOffsetSLRU",
-	[LWTRANCHE_MULTIXACTMEMBER_SLRU] = "MultixactMemberSLRU",
+	[LWTRANCHE_MULTIXACTOFFSET_SLRU] = "MultiXactOffsetSLRU",
+	[LWTRANCHE_MULTIXACTMEMBER_SLRU] = "MultiXactMemberSLRU",
 	[LWTRANCHE_NOTIFY_SLRU] = "NotifySLRU",
 	[LWTRANCHE_SERIAL_SLRU] = "SerialSLRU",
 	[LWTRANCHE_SUBTRANS_SLRU] = "SubtransSLRU",
@@ -1005,7 +1005,7 @@ LWLockWakeup(LWLock *lock)
 			else
 				desired_state &= ~LW_FLAG_RELEASE_OK;
 
-			if (proclist_is_empty(&wakeup))
+			if (proclist_is_empty(&lock->waiters))
 				desired_state &= ~LW_FLAG_HAS_WAITERS;
 
 			desired_state &= ~LW_FLAG_LOCKED;	/* release lock */
@@ -1947,6 +1947,10 @@ LWLockReleaseClearVar(LWLock *lock, pg_atomic_uint64 *valptr, uint64 val)
  * unchanged by this operation.  This is necessary since InterruptHoldoffCount
  * has been set to an appropriate level earlier in error recovery. We could
  * decrement it below zero if we allow it to drop for each released lock!
+ *
+ * Note that this function must be safe to call even before the LWLock
+ * subsystem has been initialized (e.g., during early startup failures).
+ * In that case, num_held_lwlocks will be 0 and we do nothing.
  */
 void
 LWLockReleaseAll(void)
@@ -1957,6 +1961,8 @@ LWLockReleaseAll(void)
 
 		LWLockRelease(held_lwlocks[num_held_lwlocks - 1].lock);
 	}
+
+	Assert(num_held_lwlocks == 0);
 }
 
 
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index e770437a367..4f9bc720ab3 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -142,7 +142,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 5e98d3d3ac1..0fcf6583736 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -310,7 +310,7 @@ InitProcGlobal(void)
 		 * dummy PGPROCs don't need these though - they're never associated
 		 * with a real process
 		 */
-		if (i < MaxBackends + NUM_AUXILIARY_PROCS)
+		if (i < FIRST_PREPARED_XACT_PROC_NUMBER)
 		{
 			proc->sem = PGSemaphoreCreate();
 			InitSharedLatch(&(proc->procLatch));
@@ -375,7 +375,7 @@ InitProcGlobal(void)
 	 * processes and prepared transactions.
 	 */
 	AuxiliaryProcs = &procs[MaxBackends];
-	PreparedXactProcs = &procs[MaxBackends + NUM_AUXILIARY_PROCS];
+	PreparedXactProcs = &procs[FIRST_PREPARED_XACT_PROC_NUMBER];
 
 	/* Create ProcStructLock spinlock, too */
 	ProcStructLock = (slock_t *) ShmemInitStruct("ProcStructLock spinlock",
@@ -1723,7 +1723,7 @@ ProcWakeup(PGPROC *proc, ProcWaitStatus waitStatus)
 	proc->waitLock = NULL;
 	proc->waitProcLock = NULL;
 	proc->waitStatus = waitStatus;
-	pg_atomic_write_u64(&MyProc->waitStart, 0);
+	pg_atomic_write_u64(&proc->waitStart, 0);
 
 	/* And awaken it */
 	SetLatch(&proc->procLatch);
diff --git a/src/backend/storage/page/meson.build b/src/backend/storage/page/meson.build
index c3e4a805862..112f00ff365 100644
--- a/src/backend/storage/page/meson.build
+++ b/src/backend/storage/page/meson.build
@@ -1,7 +1,15 @@
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
+checksum_backend_lib = static_library('checksum_backend_lib',
+  'checksum.c',
+  dependencies: backend_build_deps,
+  kwargs: internal_lib_args,
+  c_args: vectorize_cflags + unroll_loops_cflags,
+)
+
+backend_link_with += checksum_backend_lib
+
 backend_sources += files(
   'bufpage.c',
-  'checksum.c',
   'itemptr.c',
 )
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 55c7ecc8403..1083ee710ac 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -12,7 +12,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -593,13 +593,24 @@ mdzeroextend(SMgrRelation reln, ForkNumber forknum,
 		 * that decision should be made though? For now just use a cutoff of
 		 * 8, anything between 4 and 8 worked OK in some local testing.
 		 */
-		if (numblocks > 8)
+		if (numblocks > 8 &&
+			file_extend_method != FILE_EXTEND_METHOD_WRITE_ZEROS)
 		{
-			int			ret;
+			int			ret = 0;
 
-			ret = FileFallocate(v->mdfd_vfd,
-								seekpos, (off_t) BLCKSZ * numblocks,
-								WAIT_EVENT_DATA_FILE_EXTEND);
+#ifdef HAVE_POSIX_FALLOCATE
+			if (file_extend_method == FILE_EXTEND_METHOD_POSIX_FALLOCATE)
+			{
+				ret = FileFallocate(v->mdfd_vfd,
+									seekpos, (off_t) BLCKSZ * numblocks,
+									WAIT_EVENT_DATA_FILE_EXTEND);
+			}
+			else
+#endif
+			{
+				elog(ERROR, "unsupported file_extend_method: %d",
+					 file_extend_method);
+			}
 			if (ret != 0)
 			{
 				ereport(ERROR,
@@ -1273,6 +1284,9 @@ mdnblocks(SMgrRelation reln, ForkNumber forknum)
  * functions for this relation or handled interrupts in between.  This makes
  * sure we have opened all active segments, so that truncate loop will get
  * them all!
+ *
+ * If nblocks > curnblk, the request is ignored when we are InRecovery,
+ * otherwise, an error is raised.
  */
 void
 mdtruncate(SMgrRelation reln, ForkNumber forknum,
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index bce37a36d51..37b99fa3198 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -910,8 +910,17 @@ smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,
 		 * backends to invalidate their copies of smgr_cached_nblocks, and
 		 * these ones too at the next command boundary. But ensure they aren't
 		 * outright wrong until then.
+		 *
+		 * We can have nblocks > old_nblocks when a relation was truncated
+		 * multiple times, a replica applied all the truncations, and later
+		 * restarts from a restartpoint located before the truncations. The
+		 * relation on disk will be the size of the last truncate. When
+		 * replaying the first truncate, we will have nblocks > current size.
+		 * In such cases, smgr_truncate does nothing, so set the cached size
+		 * to the old size rather than the requested size.
 		 */
-		reln->smgr_cached_nblocks[forknum[i]] = nblocks[i];
+		reln->smgr_cached_nblocks[forknum[i]] =
+			nblocks[i] > old_nblocks[i] ? old_nblocks[i] : nblocks[i];
 	}
 }
 
diff --git a/src/backend/tcop/backend_startup.c b/src/backend/tcop/backend_startup.c
index 7639cf90dcb..c73153d54d7 100644
--- a/src/backend/tcop/backend_startup.c
+++ b/src/backend/tcop/backend_startup.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -548,6 +548,7 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 	ProtocolVersion proto;
 	MemoryContext oldcontext;
 
+retry:
 	pq_startmsgread();
 
 	/*
@@ -684,7 +685,16 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 		 * another SSL negotiation request, and a GSS request should only
 		 * follow if SSL was rejected (client may negotiate in either order)
 		 */
-		return ProcessStartupPacket(port, true, SSLok == 'S');
+		ssl_done = true;
+		if (SSLok == 'S')
+		{
+			/*
+			 * We are done with SSL and negotiated correctly, so consider the
+			 * same for GSS.
+			 */
+			gss_done = true;
+		}
+		goto retry;
 	}
 	else if (proto == NEGOTIATE_GSS_CODE && !gss_done)
 	{
@@ -738,7 +748,16 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 		 * another GSS negotiation request, and an SSL request should only
 		 * follow if GSS was rejected (client may negotiate in either order)
 		 */
-		return ProcessStartupPacket(port, GSSok == 'G', true);
+		gss_done = true;
+		if (GSSok == 'G')
+		{
+			/*
+			 * We are done with GSS and negotiated correctly, so consider the
+			 * same for SSL.
+			 */
+			ssl_done = true;
+		}
+		goto retry;
 	}
 
 	/* Could add additional special packet types here */
@@ -797,7 +816,7 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 
 			if (strcmp(nameptr, "database") == 0)
 			{
-				/* Oracle compatibility tranfor upper to lower */
+				/* Oracle compatibility: transform uppercase identifiers to lowercase. */
 				char *database_name = pstrdup(valptr);
 
 				if (ORA_PARSER == compatible_db && database_name != NULL)
@@ -850,7 +869,7 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 			}
 			else if (strcmp(nameptr, "user") == 0)
 			{
-				/* Oracle compatibility tranfor upper to lower */
+				/* Oracle compatibility: transform uppercase identifiers to lowercase. */
 				char *user_name = pstrdup(valptr);
 
 				if (ORA_PARSER == compatible_db && user_name != NULL)
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 49441e0671a..b274fdd3333 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index fe17119aa26..57a2c92ec4c 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -58,6 +58,7 @@
 #include "postmaster/postmaster.h"
 #include "replication/logicallauncher.h"
 #include "replication/logicalworker.h"
+#include "replication/slotsync.h"
 #include "replication/slot.h"
 #include "replication/walsender.h"
 #include "rewrite/rewriteHandler.h"
@@ -1135,6 +1136,7 @@ exec_simple_query(const char *query_string)
 				paramsinfo->params[i].value = (Datum) 0;
 				paramtypes[i] = 23;
 				paramsinfo->params[i].pmode = 'o';
+				paramsinfo->params[i].ptypmod = -1;
 			}
 
 			params = paramsinfo;
@@ -1159,6 +1161,12 @@ exec_simple_query(const char *query_string)
 		const char *cmdtagname;
 		size_t		cmdtaglen;
 
+		if (parsetree->stmt->type == T_CallStmt &&
+			((CallStmt *) parsetree->stmt)->callinto != NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("Simple query protocol does not support CALL INTO stmt")));
+
 		pgstat_report_query_id(0, true);
 		pgstat_report_plan_id(0, true);
 
@@ -1733,6 +1741,7 @@ exec_bind_message(StringInfo input_message)
 	ParamsErrorCbData params_data;
 	ErrorContextCallback params_errcxt;
 	List		*dostmt_modes = NIL;
+	List		*dostmt_plength = NIL;
 	ListCell   *lc;
 
 	/* Get the fixed part of the message */
@@ -1887,6 +1896,9 @@ exec_bind_message(StringInfo input_message)
 	{
 		DoStmt *dostmt = (DoStmt *)((RawStmt *)(psrc->raw_parse_tree)->stmt);
 		dostmt_modes = dostmt->paramsmode;
+
+		if (dostmt->paramslen)
+			dostmt_plength = dostmt->paramslen;
 	}
 
 	/*
@@ -1916,6 +1928,10 @@ exec_bind_message(StringInfo input_message)
 			elog(ERROR, "number of parameters modes isn't same as of params");
 		}
 
+		/* Validate parameter length list length matches parameter count */
+		if (dostmt_plength != NIL && list_length(dostmt_plength) != numParams)
+			elog(ERROR, "the specified parameter length list does not match the number of parameters");
+
 		for (int paramno = 0; paramno < numParams; paramno++)
 		{
 			Oid			ptype = psrc->param_types[paramno];
@@ -2128,6 +2144,29 @@ exec_bind_message(StringInfo input_message)
 			params->params[paramno].pflags = PARAM_FLAG_CONST;
 			params->params[paramno].ptype = ptype;
 			params->params[paramno].pmode = pmode;
+
+			if (dostmt_plength != NIL)
+			{
+				Integer *v= NULL;
+
+				v = (Integer *) list_nth(dostmt_plength, paramno);
+
+				switch(ptype)
+				{
+					case ORACHARCHAROID:
+					case ORACHARBYTEOID:
+					case ORAVARCHARCHAROID:
+					case ORAVARCHARBYTEOID:
+						/* Hard-code typmod for Oracle char/varchar types to avoid ArrayType construction */
+						params->params[paramno].ptypmod = intVal(v) + VARHDRSZ;
+						break;
+					default:
+						params->params[paramno].ptypmod = -1;
+						break;
+				}
+			}
+			else
+				params->params[paramno].ptypmod = -1;
 		}
 
 		/* Pop the per-parameter error callback */
@@ -3704,6 +3743,9 @@ ProcessInterrupts(void)
 
 	if (ParallelApplyMessagePending)
 		ProcessParallelApplyMessages();
+
+	if (SlotSyncShutdownPending)
+		ProcessSlotSyncMessage();
 }
 
 /*
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 24aadea11be..bad7857b3a3 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -1388,24 +1388,15 @@ PortalRunMulti(Portal portal,
 		PopActiveSnapshot();
 
 	/*
-	 * If a query completion data was supplied, use it.  Otherwise use the
-	 * portal's query completion data.
-	 *
-	 * Exception: Clients expect INSERT/UPDATE/DELETE tags to have counts, so
-	 * fake them with zeros.  This can happen with DO INSTEAD rules if there
-	 * is no replacement query of the same type as the original.  We print "0
-	 * 0" here because technically there is no query of the matching tag type,
-	 * and printing a non-zero count for a different query type seems wrong,
-	 * e.g.  an INSERT that does an UPDATE instead should not print "0 1" if
-	 * one row was updated.  See QueryRewrite(), step 3, for details.
+	 * If a command tag was requested and we did not fill in a run-time-
+	 * determined tag above, copy the parse-time tag from the Portal.  (There
+	 * might not be any tag there either, in edge cases such as empty prepared
+	 * statements.  That's OK.)
 	 */
-	if (qc && qc->commandTag == CMDTAG_UNKNOWN)
-	{
-		if (portal->qc.commandTag != CMDTAG_UNKNOWN)
-			CopyQueryCompletion(qc, &portal->qc);
-		/* If the caller supplied a qc, we should have set it by now. */
-		Assert(qc->commandTag != CMDTAG_UNKNOWN);
-	}
+	if (qc &&
+		qc->commandTag == CMDTAG_UNKNOWN &&
+		portal->qc.commandTag != CMDTAG_UNKNOWN)
+		CopyQueryCompletion(qc, &portal->qc);
 }
 
 /*
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 72ad81fb318..b6936c8bc6a 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -1893,7 +1893,7 @@ ProcessUtilitySlow(ParseState *pstate,
 					if (!IsA(rel, RangeVar))
 						ereport(ERROR,
 								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("only a single relation is allowed in CREATE STATISTICS")));
+								 errmsg("CREATE STATISTICS only supports relation names in the FROM clause")));
 
 					/*
 					 * CREATE STATISTICS will influence future execution plans
@@ -1911,7 +1911,7 @@ ProcessUtilitySlow(ParseState *pstate,
 					/* Run parse analysis ... */
 					stmt = transformStatsStmt(relid, stmt, queryString);
 
-					address = CreateStatistics(stmt);
+					address = CreateStatistics(stmt, true);
 				}
 				break;
 
diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c
index 0da5a9d6868..e44bf876f8b 100644
--- a/src/backend/tsearch/dict_synonym.c
+++ b/src/backend/tsearch/dict_synonym.c
@@ -50,7 +50,7 @@ findwrd(char *in, char **end, uint16 *flags)
 
 	/* Skip leading spaces */
 	while (*in && isspace((unsigned char) *in))
-		in += pg_mblen(in);
+		in += pg_mblen_cstr(in);
 
 	/* Return NULL on empty lines */
 	if (*in == '\0')
@@ -65,7 +65,7 @@ findwrd(char *in, char **end, uint16 *flags)
 	while (*in && !isspace((unsigned char) *in))
 	{
 		lastchar = in;
-		in += pg_mblen(in);
+		in += pg_mblen_cstr(in);
 	}
 
 	if (in - lastchar == 1 && t_iseq(lastchar, '*') && flags)
diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
index 1bebe36a691..33675428fd3 100644
--- a/src/backend/tsearch/dict_thesaurus.c
+++ b/src/backend/tsearch/dict_thesaurus.c
@@ -191,7 +191,7 @@ thesaurusRead(const char *filename, DictThesaurus *d)
 
 		/* is it a comment? */
 		while (*ptr && isspace((unsigned char) *ptr))
-			ptr += pg_mblen(ptr);
+			ptr += pg_mblen_cstr(ptr);
 
 		if (t_iseq(ptr, '#') || *ptr == '\0' ||
 			t_iseq(ptr, '\n') || t_iseq(ptr, '\r'))
@@ -237,13 +237,13 @@ thesaurusRead(const char *filename, DictThesaurus *d)
 				{
 					useasis = true;
 					state = TR_INSUBS;
-					beginwrd = ptr + pg_mblen(ptr);
+					beginwrd = ptr + pg_mblen_cstr(ptr);
 				}
 				else if (t_iseq(ptr, '\\'))
 				{
 					useasis = false;
 					state = TR_INSUBS;
-					beginwrd = ptr + pg_mblen(ptr);
+					beginwrd = ptr + pg_mblen_cstr(ptr);
 				}
 				else if (!isspace((unsigned char) *ptr))
 				{
@@ -267,7 +267,7 @@ thesaurusRead(const char *filename, DictThesaurus *d)
 			else
 				elog(ERROR, "unrecognized thesaurus state: %d", state);
 
-			ptr += pg_mblen(ptr);
+			ptr += pg_mblen_cstr(ptr);
 		}
 
 		if (state == TR_INSUBS)
diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c
index e59a8f09709..0b1e65bdcbe 100644
--- a/src/backend/tsearch/regis.c
+++ b/src/backend/tsearch/regis.c
@@ -37,7 +37,7 @@ RS_isRegis(const char *str)
 	{
 		if (state == RS_IN_WAIT)
 		{
-			if (t_isalpha(c))
+			if (t_isalpha_cstr(c))
 				 /* okay */ ;
 			else if (t_iseq(c, '['))
 				state = RS_IN_ONEOF;
@@ -48,14 +48,14 @@ RS_isRegis(const char *str)
 		{
 			if (t_iseq(c, '^'))
 				state = RS_IN_NONEOF;
-			else if (t_isalpha(c))
+			else if (t_isalpha_cstr(c))
 				state = RS_IN_ONEOF_IN;
 			else
 				return false;
 		}
 		else if (state == RS_IN_ONEOF_IN || state == RS_IN_NONEOF)
 		{
-			if (t_isalpha(c))
+			if (t_isalpha_cstr(c))
 				 /* okay */ ;
 			else if (t_iseq(c, ']'))
 				state = RS_IN_WAIT;
@@ -64,7 +64,7 @@ RS_isRegis(const char *str)
 		}
 		else
 			elog(ERROR, "internal error in RS_isRegis: state %d", state);
-		c += pg_mblen(c);
+		c += pg_mblen_cstr(c);
 	}
 
 	return (state == RS_IN_WAIT);
@@ -96,15 +96,14 @@ RS_compile(Regis *r, bool issuffix, const char *str)
 	{
 		if (state == RS_IN_WAIT)
 		{
-			if (t_isalpha(c))
+			if (t_isalpha_cstr(c))
 			{
 				if (ptr)
 					ptr = newRegisNode(ptr, len);
 				else
 					ptr = r->node = newRegisNode(NULL, len);
-				COPYCHAR(ptr->data, c);
 				ptr->type = RSF_ONEOF;
-				ptr->len = pg_mblen(c);
+				ptr->len = ts_copychar_cstr(ptr->data, c);
 			}
 			else if (t_iseq(c, '['))
 			{
@@ -125,10 +124,9 @@ RS_compile(Regis *r, bool issuffix, const char *str)
 				ptr->type = RSF_NONEOF;
 				state = RS_IN_NONEOF;
 			}
-			else if (t_isalpha(c))
+			else if (t_isalpha_cstr(c))
 			{
-				COPYCHAR(ptr->data, c);
-				ptr->len = pg_mblen(c);
+				ptr->len = ts_copychar_cstr(ptr->data, c);
 				state = RS_IN_ONEOF_IN;
 			}
 			else				/* shouldn't get here */
@@ -136,11 +134,8 @@ RS_compile(Regis *r, bool issuffix, const char *str)
 		}
 		else if (state == RS_IN_ONEOF_IN || state == RS_IN_NONEOF)
 		{
-			if (t_isalpha(c))
-			{
-				COPYCHAR(ptr->data + ptr->len, c);
-				ptr->len += pg_mblen(c);
-			}
+			if (t_isalpha_cstr(c))
+				ptr->len += ts_copychar_cstr(ptr->data + ptr->len, c);
 			else if (t_iseq(c, ']'))
 				state = RS_IN_WAIT;
 			else				/* shouldn't get here */
@@ -148,7 +143,7 @@ RS_compile(Regis *r, bool issuffix, const char *str)
 		}
 		else
 			elog(ERROR, "internal error in RS_compile: state %d", state);
-		c += pg_mblen(c);
+		c += pg_mblen_cstr(c);
 	}
 
 	if (state != RS_IN_WAIT)	/* shouldn't get here */
@@ -187,10 +182,10 @@ mb_strchr(char *str, char *c)
 	char	   *ptr = str;
 	bool		res = false;
 
-	clen = pg_mblen(c);
+	clen = pg_mblen_cstr(c);
 	while (*ptr && !res)
 	{
-		plen = pg_mblen(ptr);
+		plen = pg_mblen_cstr(ptr);
 		if (plen == clen)
 		{
 			i = plen;
@@ -219,7 +214,7 @@ RS_execute(Regis *r, char *str)
 	while (*c)
 	{
 		len++;
-		c += pg_mblen(c);
+		c += pg_mblen_cstr(c);
 	}
 
 	if (len < r->nchar)
@@ -230,7 +225,7 @@ RS_execute(Regis *r, char *str)
 	{
 		len -= r->nchar;
 		while (len-- > 0)
-			c += pg_mblen(c);
+			c += pg_mblen_cstr(c);
 	}
 
 
@@ -250,7 +245,7 @@ RS_execute(Regis *r, char *str)
 				elog(ERROR, "unrecognized regis node type: %d", ptr->type);
 		}
 		ptr = ptr->next;
-		c += pg_mblen(c);
+		c += pg_mblen_cstr(c);
 	}
 
 	return true;
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 146801885d7..7f8c677a438 100644
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -233,7 +233,7 @@ findchar(char *str, int c)
 	{
 		if (t_iseq(str, c))
 			return str;
-		str += pg_mblen(str);
+		str += pg_mblen_cstr(str);
 	}
 
 	return NULL;
@@ -246,7 +246,7 @@ findchar2(char *str, int c1, int c2)
 	{
 		if (t_iseq(str, c1) || t_iseq(str, c2))
 			return str;
-		str += pg_mblen(str);
+		str += pg_mblen_cstr(str);
 	}
 
 	return NULL;
@@ -353,6 +353,7 @@ getNextFlagFromString(IspellDict *Conf, const char **sflagset, char *sflag)
 	char	   *next;
 	const char *sbuf = *sflagset;
 	int			maxstep;
+	int			clen;
 	bool		stop = false;
 	bool		met_comma = false;
 
@@ -364,11 +365,11 @@ getNextFlagFromString(IspellDict *Conf, const char **sflagset, char *sflag)
 		{
 			case FM_LONG:
 			case FM_CHAR:
-				COPYCHAR(sflag, *sflagset);
-				sflag += pg_mblen(*sflagset);
+				clen = ts_copychar_cstr(sflag, *sflagset);
+				sflag += clen;
 
 				/* Go to start of the next flag */
-				*sflagset += pg_mblen(*sflagset);
+				*sflagset += clen;
 
 				/* Check if we get all characters of flag */
 				maxstep--;
@@ -418,7 +419,7 @@ getNextFlagFromString(IspellDict *Conf, const char **sflagset, char *sflag)
 										*sflagset)));
 					}
 
-					*sflagset += pg_mblen(*sflagset);
+					*sflagset += pg_mblen_cstr(*sflagset);
 				}
 				stop = true;
 				break;
@@ -544,7 +545,7 @@ NIImportDictionary(IspellDict *Conf, const char *filename)
 			while (*s)
 			{
 				/* we allow only single encoded flags for faster works */
-				if (pg_mblen(s) == 1 && isprint((unsigned char) *s) && !isspace((unsigned char) *s))
+				if (pg_mblen_cstr(s) == 1 && isprint((unsigned char) *s) && !isspace((unsigned char) *s))
 					s++;
 				else
 				{
@@ -565,7 +566,7 @@ NIImportDictionary(IspellDict *Conf, const char *filename)
 				*s = '\0';
 				break;
 			}
-			s += pg_mblen(s);
+			s += pg_mblen_cstr(s);
 		}
 		pstr = lowerstr_ctx(Conf, line);
 
@@ -797,17 +798,17 @@ get_nextfield(char **str, char *next)
 
 	while (**str)
 	{
+		int			clen = pg_mblen_cstr(*str);
+
 		if (state == PAE_WAIT_MASK)
 		{
 			if (t_iseq(*str, '#'))
 				return false;
 			else if (!isspace((unsigned char) **str))
 			{
-				int			clen = pg_mblen(*str);
-
 				if (clen < avail)
 				{
-					COPYCHAR(next, *str);
+					ts_copychar_with_len(next, *str, clen);
 					next += clen;
 					avail -= clen;
 				}
@@ -823,17 +824,15 @@ get_nextfield(char **str, char *next)
 			}
 			else
 			{
-				int			clen = pg_mblen(*str);
-
 				if (clen < avail)
 				{
-					COPYCHAR(next, *str);
+					ts_copychar_with_len(next, *str, clen);
 					next += clen;
 					avail -= clen;
 				}
 			}
 		}
-		*str += pg_mblen(*str);
+		*str += clen;
 	}
 
 	*next = '\0';
@@ -910,27 +909,35 @@ parse_ooaffentry(char *str, char *type, char *flag, char *find,
  *
  * An .affix file entry has the following format:
  * <mask>  >  [-<find>,]<replace>
+ *
+ * Output buffers mask, find, repl must be of length BUFSIZ;
+ * we truncate the input to fit.
  */
 static bool
-parse_affentry(char *str, char *mask, char *find, char *repl)
+parse_affentry(const char *str, char *mask, char *find, char *repl)
 {
 	int			state = PAE_WAIT_MASK;
 	char	   *pmask = mask,
 			   *pfind = find,
 			   *prepl = repl;
+	char	   *emask = mask + BUFSIZ;
+	char	   *efind = find + BUFSIZ;
+	char	   *erepl = repl + BUFSIZ;
 
 	*mask = *find = *repl = '\0';
 
 	while (*str)
 	{
+		int			clen = pg_mblen_cstr(str);
+
 		if (state == PAE_WAIT_MASK)
 		{
 			if (t_iseq(str, '#'))
 				return false;
 			else if (!isspace((unsigned char) *str))
 			{
-				COPYCHAR(pmask, str);
-				pmask += pg_mblen(str);
+				if (pmask < emask - clen)
+					pmask += ts_copychar_with_len(pmask, str, clen);
 				state = PAE_INMASK;
 			}
 		}
@@ -943,8 +950,8 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 			}
 			else if (!isspace((unsigned char) *str))
 			{
-				COPYCHAR(pmask, str);
-				pmask += pg_mblen(str);
+				if (pmask < emask - clen)
+					pmask += ts_copychar_with_len(pmask, str, clen);
 			}
 		}
 		else if (state == PAE_WAIT_FIND)
@@ -953,10 +960,10 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 			{
 				state = PAE_INFIND;
 			}
-			else if (t_isalpha(str) || t_iseq(str, '\'') /* english 's */ )
+			else if (t_isalpha_cstr(str) || t_iseq(str, '\'') /* english 's */ )
 			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
+				if (prepl < erepl - clen)
+					prepl += ts_copychar_with_len(prepl, str, clen);
 				state = PAE_INREPL;
 			}
 			else if (!isspace((unsigned char) *str))
@@ -971,10 +978,10 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 				*pfind = '\0';
 				state = PAE_WAIT_REPL;
 			}
-			else if (t_isalpha(str))
+			else if (t_isalpha_cstr(str))
 			{
-				COPYCHAR(pfind, str);
-				pfind += pg_mblen(str);
+				if (pfind < efind - clen)
+					pfind += ts_copychar_with_len(pfind, str, clen);
 			}
 			else if (!isspace((unsigned char) *str))
 				ereport(ERROR,
@@ -987,10 +994,10 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 			{
 				break;			/* void repl */
 			}
-			else if (t_isalpha(str))
+			else if (t_isalpha_cstr(str))
 			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
+				if (prepl < erepl - clen)
+					prepl += ts_copychar_with_len(prepl, str, clen);
 				state = PAE_INREPL;
 			}
 			else if (!isspace((unsigned char) *str))
@@ -1005,10 +1012,10 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 				*prepl = '\0';
 				break;
 			}
-			else if (t_isalpha(str))
+			else if (t_isalpha_cstr(str))
 			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
+				if (prepl < erepl - clen)
+					prepl += ts_copychar_with_len(prepl, str, clen);
 			}
 			else if (!isspace((unsigned char) *str))
 				ereport(ERROR,
@@ -1018,7 +1025,7 @@ parse_affentry(char *str, char *mask, char *find, char *repl)
 		else
 			elog(ERROR, "unrecognized state in parse_affentry: %d", state);
 
-		str += pg_mblen(str);
+		str += clen;
 	}
 
 	*pmask = *pfind = *prepl = '\0';
@@ -1066,15 +1073,14 @@ setCompoundAffixFlagValue(IspellDict *Conf, CompoundAffixFlag *entry,
  * val: affix parameter.
  */
 static void
-addCompoundAffixFlagValue(IspellDict *Conf, char *s, uint32 val)
+addCompoundAffixFlagValue(IspellDict *Conf, const char *s, uint32 val)
 {
 	CompoundAffixFlag *newValue;
 	char		sbuf[BUFSIZ];
 	char	   *sflag;
-	int			clen;
 
 	while (*s && isspace((unsigned char) *s))
-		s += pg_mblen(s);
+		s += pg_mblen_cstr(s);
 
 	if (!*s)
 		ereport(ERROR,
@@ -1085,9 +1091,11 @@ addCompoundAffixFlagValue(IspellDict *Conf, char *s, uint32 val)
 	sflag = sbuf;
 	while (*s && !isspace((unsigned char) *s) && *s != '\n')
 	{
-		clen = pg_mblen(s);
-		COPYCHAR(sflag, s);
-		sflag += clen;
+		int			clen = pg_mblen_cstr(s);
+
+		/* Truncate the input to fit in BUFSIZ */
+		if (sflag < sbuf + BUFSIZ - clen)
+			sflag += ts_copychar_with_len(sflag, s, clen);
 		s += clen;
 	}
 	*sflag = '\0';
@@ -1267,7 +1275,7 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 			char	   *s = recoded + strlen("FLAG");
 
 			while (*s && isspace((unsigned char) *s))
-				s += pg_mblen(s);
+				s += pg_mblen_cstr(s);
 
 			if (*s)
 			{
@@ -1466,11 +1474,11 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 			if (s)
 			{
 				while (*s && !isspace((unsigned char) *s))
-					s += pg_mblen(s);
+					s += pg_mblen_cstr(s);
 				while (*s && isspace((unsigned char) *s))
-					s += pg_mblen(s);
+					s += pg_mblen_cstr(s);
 
-				if (*s && pg_mblen(s) == 1)
+				if (*s && pg_mblen_cstr(s) == 1)
 				{
 					addCompoundAffixFlagValue(Conf, s, FF_COMPOUNDFLAG);
 					Conf->usecompound = true;
@@ -1499,7 +1507,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 			flagflags = 0;
 
 			while (*s && isspace((unsigned char) *s))
-				s += pg_mblen(s);
+				s += pg_mblen_cstr(s);
 
 			if (*s == '*')
 			{
@@ -1520,12 +1528,11 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 			 * be followed by EOL, whitespace, or ':'.  Otherwise this is a
 			 * new-format flag command.
 			 */
-			if (*s && pg_mblen(s) == 1)
+			if (*s && pg_mblen_cstr(s) == 1)
 			{
-				COPYCHAR(flag, s);
+				flag[0] = *s++;
 				flag[1] = '\0';
 
-				s++;
 				if (*s == '\0' || *s == '#' || *s == '\n' || *s == ':' ||
 					isspace((unsigned char) *s))
 				{
@@ -2072,9 +2079,32 @@ FindAffixes(AffixNode *node, const char *word, int wrdlen, int *level, int type)
 	return NULL;
 }
 
+/*
+ * Checks to see if affix applies to word, transforms word if so.
+ * The transformation consists of replacing Affix->replen leading or
+ * trailing bytes with the Affix->find string.
+ *
+ * word: input word
+ * len: length of input word
+ * Affix: affix to consider
+ * flagflags: context flags showing whether we are handling a compound word
+ * newword: output buffer (MUST be of length 2 * MAXNORMLEN)
+ * baselen: input/output argument
+ *
+ * If baselen isn't NULL, then *baselen is used to return the length of
+ * the non-changed part of the word when applying a suffix, and is used
+ * to detect whether the input contained only a prefix and suffix when
+ * later applying a prefix.
+ *
+ * Returns newword on success, or NULL if the affix can't be applied.
+ * On success, the modified word is stored into newword.
+ */
 static char *
 CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *newword, int *baselen)
 {
+	size_t		keeplen,
+				findlen;
+
 	/*
 	 * Check compound allow flags
 	 */
@@ -2107,15 +2137,27 @@ CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *neww
 				return NULL;
 	}
 
+	/*
+	 * Protect against output buffer overrun (len < Affix->replen would be
+	 * caller error, but check anyway)
+	 */
+	Assert(len == strlen(word));
+	if (len < Affix->replen)
+		return NULL;
+	keeplen = len - Affix->replen;	/* how much of word we will keep */
+	findlen = strlen(Affix->find);
+	if (keeplen + findlen >= 2 * MAXNORMLEN)
+		return NULL;
+
 	/*
 	 * make replace pattern of affix
 	 */
 	if (Affix->type == FF_SUFFIX)
 	{
-		strcpy(newword, word);
-		strcpy(newword + len - Affix->replen, Affix->find);
+		memcpy(newword, word, keeplen);
+		strcpy(newword + keeplen, Affix->find);
 		if (baselen)			/* store length of non-changed part of word */
-			*baselen = len - Affix->replen;
+			*baselen = keeplen;
 	}
 	else
 	{
@@ -2123,10 +2165,10 @@ CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *neww
 		 * if prefix is an all non-changed part's length then all word
 		 * contains only prefix and suffix, so out
 		 */
-		if (baselen && *baselen + strlen(Affix->find) <= Affix->replen)
+		if (baselen && *baselen + findlen <= Affix->replen)
 			return NULL;
-		strcpy(newword, Affix->find);
-		strcat(newword, word + Affix->replen);
+		memcpy(newword, Affix->find, findlen);
+		strcpy(newword + findlen, word + Affix->replen);
 	}
 
 	/*
@@ -2320,7 +2362,7 @@ CheckCompoundAffixes(CMPDAffix **ptr, const char *word, int len, bool CheckInPla
 	}
 	else
 	{
-		char	   *affbegin;
+		const char *affbegin;
 
 		while ((*ptr)->affix)
 		{
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
index b77d8c23d36..f5826a86f53 100644
--- a/src/backend/tsearch/ts_locale.c
+++ b/src/backend/tsearch/ts_locale.c
@@ -31,36 +31,41 @@ static void tsearch_readline_callback(void *arg);
  */
 #define WC_BUF_LEN  3
 
-int
-t_isalpha(const char *ptr)
-{
-	int			clen = pg_mblen(ptr);
-	wchar_t		character[WC_BUF_LEN];
-	pg_locale_t mylocale = 0;	/* TODO */
-
-	if (clen == 1 || database_ctype_is_c)
-		return isalpha(TOUCHAR(ptr));
-
-	char2wchar(character, WC_BUF_LEN, ptr, clen, mylocale);
-
-	return iswalpha((wint_t) character[0]);
-}
-
-int
-t_isalnum(const char *ptr)
-{
-	int			clen = pg_mblen(ptr);
-	wchar_t		character[WC_BUF_LEN];
-	pg_locale_t mylocale = 0;	/* TODO */
-
-	if (clen == 1 || database_ctype_is_c)
-		return isalnum(TOUCHAR(ptr));
-
-	char2wchar(character, WC_BUF_LEN, ptr, clen, mylocale);
-
-	return iswalnum((wint_t) character[0]);
+#define GENERATE_T_ISCLASS_DEF(character_class) \
+/* mblen shall be that of the first character */ \
+int \
+t_is##character_class##_with_len(const char *ptr, int mblen) \
+{ \
+	int			clen = pg_mblen_with_len(ptr, mblen); \
+	wchar_t		character[WC_BUF_LEN]; \
+	pg_locale_t mylocale = 0;	/* TODO */ \
+	if (clen == 1 || database_ctype_is_c) \
+		return is##character_class(TOUCHAR(ptr)); \
+	char2wchar(character, WC_BUF_LEN, ptr, clen, mylocale); \
+	return isw##character_class((wint_t) character[0]); \
+} \
+\
+/* ptr shall point to a NUL-terminated string */ \
+int \
+t_is##character_class##_cstr(const char *ptr) \
+{ \
+	return t_is##character_class##_with_len(ptr, pg_mblen_cstr(ptr)); \
+} \
+/* ptr shall point to a string with pre-validated encoding */ \
+int \
+t_is##character_class##_unbounded(const char *ptr) \
+{ \
+	return t_is##character_class##_with_len(ptr, pg_mblen_unbounded(ptr)); \
+} \
+/* historical name for _unbounded */ \
+int \
+t_is##character_class(const char *ptr) \
+{ \
+	return t_is##character_class##_unbounded(ptr); \
 }
 
+GENERATE_T_ISCLASS_DEF(alnum)
+GENERATE_T_ISCLASS_DEF(alpha)
 
 /*
  * Set up to read a file using tsearch_readline().  This facility is
diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c
index 0c1d2bc1109..e71b0d92273 100644
--- a/src/backend/tsearch/ts_selfuncs.c
+++ b/src/backend/tsearch/ts_selfuncs.c
@@ -108,12 +108,14 @@ tsmatchsel(PG_FUNCTION_ARGS)
 	 * OK, there's a Var and a Const we're dealing with here.  We need the
 	 * Const to be a TSQuery, else we can't do anything useful.  We have to
 	 * check this because the Var might be the TSQuery not the TSVector.
+	 *
+	 * Also check that the Var really is a TSVector, in case this estimator is
+	 * mistakenly attached to some other operator.
 	 */
-	if (((Const *) other)->consttype == TSQUERYOID)
+	if (((Const *) other)->consttype == TSQUERYOID &&
+		vardata.vartype == TSVECTOROID)
 	{
 		/* tsvector @@ tsquery or the other way around */
-		Assert(vardata.vartype == TSVECTOROID);
-
 		selec = tsquerysel(&vardata, ((Const *) other)->constvalue);
 	}
 	else
diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
index 0b4a5786644..2bd69fbffb1 100644
--- a/src/backend/tsearch/ts_utils.c
+++ b/src/backend/tsearch/ts_utils.c
@@ -90,7 +90,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *, size
 
 			/* Trim trailing space */
 			while (*pbuf && !isspace((unsigned char) *pbuf))
-				pbuf += pg_mblen(pbuf);
+				pbuf += pg_mblen_cstr(pbuf);
 			*pbuf = '\0';
 
 			/* Skip empty lines */
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index 79bcd32a063..471c452ec48 100644
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -1728,7 +1728,8 @@ TParserGet(TParser *prs)
 			prs->state->charlen = 0;
 		else
 			prs->state->charlen = (prs->charmaxlen == 1) ? prs->charmaxlen :
-				pg_mblen(prs->str + prs->state->posbyte);
+				pg_mblen_range(prs->str + prs->state->posbyte,
+							   prs->str + prs->lenstr);
 
 		Assert(prs->state->posbyte + prs->state->charlen <= prs->lenstr);
 		Assert(prs->state->state >= TPS_Base && prs->state->state < TPS_Null);
@@ -2627,6 +2628,9 @@ prsd_headline(PG_FUNCTION_ARGS)
 	int			max_fragments = 0;
 	bool		highlightall = false;
 	ListCell   *l;
+	size_t		startsellen;
+	size_t		stopsellen;
+	size_t		fragdelimlen;
 
 	/* Extract configuration option values */
 	prs->startsel = NULL;
@@ -2716,9 +2720,24 @@ prsd_headline(PG_FUNCTION_ARGS)
 		prs->fragdelim = pstrdup(" ... ");
 
 	/* Caller will need these lengths, too */
-	prs->startsellen = strlen(prs->startsel);
-	prs->stopsellen = strlen(prs->stopsel);
-	prs->fragdelimlen = strlen(prs->fragdelim);
+	startsellen = strlen(prs->startsel);
+	stopsellen = strlen(prs->stopsel);
+	fragdelimlen = strlen(prs->fragdelim);
+	if (startsellen > PG_INT16_MAX)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("value for \"%s\" is too long", "StartSel")));
+	if (stopsellen > PG_INT16_MAX)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("value for \"%s\" is too long", "StopSel")));
+	if (fragdelimlen > PG_INT16_MAX)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("value for \"%s\" is too long", "FragmentDelimiter")));
+	prs->startsellen = startsellen;
+	prs->stopsellen = stopsellen;
+	prs->fragdelimlen = fragdelimlen;
 
 	PG_RETURN_POINTER(prs);
 }
diff --git a/src/backend/utils/.gitignore b/src/backend/utils/.gitignore
index 06855569594..6891124a264 100644
--- a/src/backend/utils/.gitignore
+++ b/src/backend/utils/.gitignore
@@ -4,3 +4,6 @@
 /fmgr-stamp
 /probes.h
 /errcodes.h
+/pgstat_wait_event.c
+/wait_event_funcs_data.c
+/wait_event_types.h
diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl
index 652daf8060c..383725bab89 100644
--- a/src/backend/utils/Gen_fmgrtab.pl
+++ b/src/backend/utils/Gen_fmgrtab.pl
@@ -7,7 +7,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 #
 # IDENTIFICATION
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index 140fbba5c22..4eba6f66e74 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -43,7 +43,7 @@ generated-header-symlinks: $(top_builddir)/src/include/utils/header-stamp submak
 submake-adt-headers:
 	$(MAKE) -C adt jsonpath_gram.h
 
-$(SUBDIRS:%=%-recursive): fmgr-stamp errcodes.h
+$(SUBDIRS:%=%-recursive): fmgr-stamp errcodes.h pgstat_wait_event.c wait_event_funcs_data.c wait_event_types.h
 
 # fmgr-stamp records the last time we ran Gen_fmgrtab.pl.  We don't rely on
 # the timestamps of the individual output files, because the Perl script
@@ -55,6 +55,12 @@ fmgr-stamp: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/ca
 errcodes.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-errcodes.pl
 	$(PERL) $(srcdir)/generate-errcodes.pl --outfile $@ $<
 
+pgstat_wait_event.c: wait_event_types.h
+wait_event_funcs_data.c: wait_event_types.h
+
+wait_event_types.h: $(top_srcdir)/src/backend/utils/activity/wait_event_names.txt $(top_srcdir)/src/backend/utils/activity/generate-wait_event_types.pl
+	$(PERL) $(top_srcdir)/src/backend/utils/activity/generate-wait_event_types.pl --code $<
+
 ifeq ($(enable_dtrace), yes)
 probes.h: postprocess_dtrace.sed probes.h.tmp
 	sed -f $^ >$@
@@ -70,8 +76,8 @@ endif
 # These generated headers must be symlinked into src/include/.
 # We use header-stamp to record that we've done this because the symlinks
 # themselves may appear older than fmgr-stamp.
-$(top_builddir)/src/include/utils/header-stamp: fmgr-stamp errcodes.h probes.h
-	cd '$(dir $@)' && for file in fmgroids.h fmgrprotos.h errcodes.h probes.h; do \
+$(top_builddir)/src/include/utils/header-stamp: fmgr-stamp errcodes.h probes.h pgstat_wait_event.c wait_event_funcs_data.c wait_event_types.h
+	cd '$(dir $@)' && for file in fmgroids.h fmgrprotos.h errcodes.h probes.h pgstat_wait_event.c wait_event_funcs_data.c wait_event_types.h; do \
 	  rm -f $$file && $(LN_S) "../../../$(subdir)/$$file" . ; \
 	done
 	touch $@
@@ -90,3 +96,4 @@ uninstall-data:
 clean:
 	rm -f probes.h probes.h.tmp
 	rm -f fmgroids.h fmgrprotos.h fmgrtab.c fmgr-stamp errcodes.h
+	rm -f wait_event_types.h pgstat_wait_event.c wait_event_funcs_data.c
diff --git a/src/backend/utils/activity/.gitignore b/src/backend/utils/activity/.gitignore
deleted file mode 100644
index bd0c0c77729..00000000000
--- a/src/backend/utils/activity/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/pgstat_wait_event.c
-/wait_event_types.h
-/wait_event_funcs_data.c
diff --git a/src/backend/utils/activity/Makefile b/src/backend/utils/activity/Makefile
index 9c2443e1ecd..b90f47e52b4 100644
--- a/src/backend/utils/activity/Makefile
+++ b/src/backend/utils/activity/Makefile
@@ -36,17 +36,8 @@ OBJS = \
 	wait_event.o \
 	wait_event_funcs.o
 
-include $(top_srcdir)/src/backend/common.mk
-
-wait_event_funcs.o: wait_event_funcs_data.c
-wait_event_funcs_data.c: wait_event_types.h
-
-wait_event.o: pgstat_wait_event.c
-pgstat_wait_event.c: wait_event_types.h
-	touch $@
+# Force these dependencies to be known even without dependency info built:
+wait_event.o: wait_event.c $(top_builddir)/src/backend/utils/pgstat_wait_event.c
+wait_event_funcs.o: wait_event_funcs.c $(top_builddir)/src/backend/utils/wait_event_funcs_data.c
 
-wait_event_types.h: $(top_srcdir)/src/backend/utils/activity/wait_event_names.txt generate-wait_event_types.pl
-	$(PERL) $(srcdir)/generate-wait_event_types.pl --code $<
-
-clean:
-	rm -f wait_event_types.h pgstat_wait_event.c wait_event_funcs_data.c
+include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/utils/activity/generate-wait_event_types.pl b/src/backend/utils/activity/generate-wait_event_types.pl
index 424ad9f115d..0564e04a84c 100644
--- a/src/backend/utils/activity/generate-wait_event_types.pl
+++ b/src/backend/utils/activity/generate-wait_event_types.pl
@@ -334,12 +334,12 @@
 sub usage
 {
 	die <<EOM;
-Usage: perl  [--output <path>] [--code ] [ --sgml ] input_file
+Usage: perl  [--output <path>] [--code ] [ --docs ] input_file
 
 Options:
     --outdir         Output directory (default '.')
     --code           Generate C and header files.
-    --sgml           Generate wait_event_types.sgml.
+    --docs           Generate wait_event_types.sgml.
 
 generate-wait_event_types.pl generates the SGML documentation and code
 related to wait events.  This should use wait_event_names.txt in input, or
diff --git a/src/backend/utils/activity/meson.build b/src/backend/utils/activity/meson.build
index d8e56b49c24..04f27d11fbf 100644
--- a/src/backend/utils/activity/meson.build
+++ b/src/backend/utils/activity/meson.build
@@ -30,7 +30,6 @@ waitevent_sources = files(
 wait_event = static_library('wait_event_names',
   waitevent_sources,
   dependencies: [backend_code],
-  include_directories: include_directories('../../../include/utils'),
   kwargs: internal_lib_args,
 )
 
diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c
index aed9c8c4775..4f0e419bbf1 100644
--- a/src/backend/utils/activity/pgstat.c
+++ b/src/backend/utils/activity/pgstat.c
@@ -212,6 +212,11 @@ int			pgstat_fetch_consistency = PGSTAT_FETCH_CONSISTENCY_CACHE;
 
 PgStat_LocalState pgStatLocal;
 
+/*
+ * Track pending reports for fixed-numbered stats, used by
+ * pgstat_report_stat().
+ */
+bool		pgstat_report_fixed = false;
 
 /* ----------
  * Local data
@@ -370,7 +375,6 @@ static const PgStat_KindInfo pgstat_kind_builtin_infos[PGSTAT_KIND_BUILTIN_SIZE]
 		.shared_data_off = offsetof(PgStatShared_Backend, stats),
 		.shared_data_len = sizeof(((PgStatShared_Backend *) 0)->stats),
 
-		.have_static_pending_cb = pgstat_backend_have_pending_cb,
 		.flush_static_cb = pgstat_backend_flush_cb,
 		.reset_timestamp_cb = pgstat_backend_reset_timestamp_cb,
 	},
@@ -437,7 +441,6 @@ static const PgStat_KindInfo pgstat_kind_builtin_infos[PGSTAT_KIND_BUILTIN_SIZE]
 		.shared_data_len = sizeof(((PgStatShared_IO *) 0)->stats),
 
 		.flush_static_cb = pgstat_io_flush_cb,
-		.have_static_pending_cb = pgstat_io_have_pending_cb,
 		.init_shmem_cb = pgstat_io_init_shmem_cb,
 		.reset_all_cb = pgstat_io_reset_all_cb,
 		.snapshot_cb = pgstat_io_snapshot_cb,
@@ -455,7 +458,6 @@ static const PgStat_KindInfo pgstat_kind_builtin_infos[PGSTAT_KIND_BUILTIN_SIZE]
 		.shared_data_len = sizeof(((PgStatShared_SLRU *) 0)->stats),
 
 		.flush_static_cb = pgstat_slru_flush_cb,
-		.have_static_pending_cb = pgstat_slru_have_pending_cb,
 		.init_shmem_cb = pgstat_slru_init_shmem_cb,
 		.reset_all_cb = pgstat_slru_reset_all_cb,
 		.snapshot_cb = pgstat_slru_snapshot_cb,
@@ -474,7 +476,6 @@ static const PgStat_KindInfo pgstat_kind_builtin_infos[PGSTAT_KIND_BUILTIN_SIZE]
 
 		.init_backend_cb = pgstat_wal_init_backend_cb,
 		.flush_static_cb = pgstat_wal_flush_cb,
-		.have_static_pending_cb = pgstat_wal_have_pending_cb,
 		.init_shmem_cb = pgstat_wal_init_shmem_cb,
 		.reset_all_cb = pgstat_wal_reset_all_cb,
 		.snapshot_cb = pgstat_wal_snapshot_cb,
@@ -708,29 +709,10 @@ pgstat_report_stat(bool force)
 	}
 
 	/* Don't expend a clock check if nothing to do */
-	if (dlist_is_empty(&pgStatPending))
+	if (dlist_is_empty(&pgStatPending) &&
+		!pgstat_report_fixed)
 	{
-		bool		do_flush = false;
-
-		/* Check for pending stats */
-		for (PgStat_Kind kind = PGSTAT_KIND_MIN; kind <= PGSTAT_KIND_MAX; kind++)
-		{
-			const PgStat_KindInfo *kind_info = pgstat_get_kind_info(kind);
-
-			if (!kind_info)
-				continue;
-			if (!kind_info->have_static_pending_cb)
-				continue;
-
-			if (kind_info->have_static_pending_cb())
-			{
-				do_flush = true;
-				break;
-			}
-		}
-
-		if (!do_flush)
-			return 0;
+		return 0;
 	}
 
 	/*
@@ -784,16 +766,19 @@ pgstat_report_stat(bool force)
 	partial_flush |= pgstat_flush_pending_entries(nowait);
 
 	/* flush of other stats kinds */
-	for (PgStat_Kind kind = PGSTAT_KIND_MIN; kind <= PGSTAT_KIND_MAX; kind++)
+	if (pgstat_report_fixed)
 	{
-		const PgStat_KindInfo *kind_info = pgstat_get_kind_info(kind);
+		for (PgStat_Kind kind = PGSTAT_KIND_MIN; kind <= PGSTAT_KIND_MAX; kind++)
+		{
+			const PgStat_KindInfo *kind_info = pgstat_get_kind_info(kind);
 
-		if (!kind_info)
-			continue;
-		if (!kind_info->flush_static_cb)
-			continue;
+			if (!kind_info)
+				continue;
+			if (!kind_info->flush_static_cb)
+				continue;
 
-		partial_flush |= kind_info->flush_static_cb(nowait);
+			partial_flush |= kind_info->flush_static_cb(nowait);
+		}
 	}
 
 	last_flush = now;
@@ -815,6 +800,7 @@ pgstat_report_stat(bool force)
 	}
 
 	pending_since = 0;
+	pgstat_report_fixed = false;
 
 	return 0;
 }
@@ -1989,6 +1975,17 @@ pgstat_read_statsfile(void)
 
 					header = pgstat_init_entry(key.kind, p);
 					dshash_release_lock(pgStatLocal.shared_hash, p);
+					if (header == NULL)
+					{
+						/*
+						 * It would be tempting to switch this ERROR to a
+						 * WARNING, but it would mean that all the statistics
+						 * are discarded when the environment fails on OOM.
+						 */
+						elog(ERROR, "could not allocate entry %u/%u/%" PRIu64 " of type %c",
+							 key.kind, key.dboid,
+							 key.objid, t);
+					}
 
 					if (!read_chunk(fpin,
 									pgstat_get_entry_data(key.kind, header),
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 51256277e8d..3d6db0d478f 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -25,6 +25,7 @@
 #include "postgres.h"
 
 #include "access/xlog.h"
+#include "executor/instrument.h"
 #include "storage/bufmgr.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
@@ -41,9 +42,9 @@ static bool backend_has_iostats = false;
 
 /*
  * WAL usage counters saved from pgWalUsage at the previous call to
- * pgstat_report_wal().  This is used to calculate how much WAL usage
- * happens between pgstat_report_wal() calls, by subtracting the previous
- * counters from the current ones.
+ * pgstat_flush_backend().  This is used to calculate how much WAL usage
+ * happens between pgstat_flush_backend() calls, by subtracting the
+ * previous counters from the current ones.
  */
 static WalUsage prevBackendWalUsage;
 
@@ -66,6 +67,7 @@ pgstat_count_backend_io_op_time(IOObject io_object, IOContext io_context,
 				   io_time);
 
 	backend_has_iostats = true;
+	pgstat_report_fixed = true;
 }
 
 void
@@ -81,6 +83,7 @@ pgstat_count_backend_io_op(IOObject io_object, IOContext io_context,
 	PendingBackendStats.pending_io.bytes[io_object][io_context][io_op] += bytes;
 
 	backend_has_iostats = true;
+	pgstat_report_fixed = true;
 }
 
 /*
@@ -301,18 +304,6 @@ pgstat_flush_backend(bool nowait, bits32 flags)
 	return false;
 }
 
-/*
- * Check if there are any backend stats waiting for flush.
- */
-bool
-pgstat_backend_have_pending_cb(void)
-{
-	if (!pgstat_tracks_backend_bktype(MyBackendType))
-		return false;
-
-	return (backend_has_iostats || pgstat_backend_wal_have_pending());
-}
-
 /*
  * Callback to flush out locally pending backend statistics.
  *
@@ -334,7 +325,7 @@ pgstat_create_backend(ProcNumber procnum)
 	PgStatShared_Backend *shstatent;
 
 	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_BACKEND, InvalidOid,
-											MyProcNumber, false);
+											procnum, false);
 	shstatent = (PgStatShared_Backend *) entry_ref->shared_stats;
 
 	/*
diff --git a/src/backend/utils/activity/pgstat_database.c b/src/backend/utils/activity/pgstat_database.c
index b31f20d41bc..9f1a8633b4b 100644
--- a/src/backend/utils/activity/pgstat_database.c
+++ b/src/backend/utils/activity/pgstat_database.c
@@ -190,7 +190,7 @@ pgstat_report_checksum_failures_in_db(Oid dboid, int failurecount)
 	Assert(entry_ref);
 	if (!entry_ref)
 	{
-		elog(WARNING, "could not report %d conflicts for DB %u",
+		elog(WARNING, "could not report %d checksum failures for database %u",
 			 failurecount, dboid);
 		return;
 	}
@@ -233,7 +233,7 @@ pgstat_report_connect(Oid dboid)
 
 	pgLastSessionReportTime = MyStartTimestamp;
 
-	dbentry = pgstat_prep_database_pending(MyDatabaseId);
+	dbentry = pgstat_prep_database_pending(dboid);
 	dbentry->sessions++;
 }
 
@@ -248,7 +248,7 @@ pgstat_report_disconnect(Oid dboid)
 	if (!pgstat_should_report_connstat())
 		return;
 
-	dbentry = pgstat_prep_database_pending(MyDatabaseId);
+	dbentry = pgstat_prep_database_pending(dboid);
 
 	switch (pgStatSessionEndCause)
 	{
@@ -409,7 +409,7 @@ pgstat_reset_database_timestamp(Oid dboid, TimestampTz ts)
 	PgStat_EntryRef *dbref;
 	PgStatShared_Database *dbentry;
 
-	dbref = pgstat_get_entry_ref_locked(PGSTAT_KIND_DATABASE, MyDatabaseId, InvalidOid,
+	dbref = pgstat_get_entry_ref_locked(PGSTAT_KIND_DATABASE, dboid, InvalidOid,
 										false);
 
 	dbentry = (PgStatShared_Database *) dbref->shared_stats;
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index d8d26379a57..13ae57ed649 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -80,6 +80,7 @@ pgstat_count_io_op(IOObject io_object, IOContext io_context, IOOp io_op,
 	pgstat_count_backend_io_op(io_object, io_context, io_op, cnt, bytes);
 
 	have_iostats = true;
+	pgstat_report_fixed = true;
 }
 
 /*
@@ -167,15 +168,6 @@ pgstat_fetch_stat_io(void)
 	return &pgStatLocal.snapshot.io;
 }
 
-/*
- * Check if there any IO stats waiting for flush.
- */
-bool
-pgstat_io_have_pending_cb(void)
-{
-	return have_iostats;
-}
-
 /*
  * Simpler wrapper of pgstat_io_flush_cb()
  */
diff --git a/src/backend/utils/activity/pgstat_shmem.c b/src/backend/utils/activity/pgstat_shmem.c
index fadf4b2b6df..ef876ad0376 100644
--- a/src/backend/utils/activity/pgstat_shmem.c
+++ b/src/backend/utils/activity/pgstat_shmem.c
@@ -142,8 +142,7 @@ StatsShmemSize(void)
 			continue;
 
 		Assert(kind_info->shared_size != 0);
-
-		sz += MAXALIGN(kind_info->shared_size);
+		sz = add_size(sz, MAXALIGN(kind_info->shared_size));
 	}
 
 	return sz;
@@ -227,7 +226,8 @@ StatsShmemInit(void)
 				int			idx = kind - PGSTAT_KIND_CUSTOM_MIN;
 
 				Assert(kind_info->shared_size != 0);
-				ctl->custom_data[idx] = ShmemAlloc(kind_info->shared_size);
+				ctl->custom_data[idx] = p;
+				p += MAXALIGN(kind_info->shared_size);
 				ptr = ctl->custom_data[idx];
 			}
 
@@ -290,6 +290,13 @@ pgstat_detach_shmem(void)
  * ------------------------------------------------------------
  */
 
+/*
+ * Initialize entry newly-created.
+ *
+ * Returns NULL in the event of an allocation failure, so as callers can
+ * take cleanup actions as the entry initialized is already inserted in the
+ * shared hashtable.
+ */
 PgStatShared_Common *
 pgstat_init_entry(PgStat_Kind kind,
 				  PgStatShared_HashEntry *shhashent)
@@ -312,7 +319,12 @@ pgstat_init_entry(PgStat_Kind kind,
 	pg_atomic_init_u32(&shhashent->generation, 0);
 	shhashent->dropped = false;
 
-	chunk = dsa_allocate0(pgStatLocal.dsa, pgstat_get_kind_info(kind)->shared_size);
+	chunk = dsa_allocate_extended(pgStatLocal.dsa,
+								  pgstat_get_kind_info(kind)->shared_size,
+								  DSA_ALLOC_ZERO | DSA_ALLOC_NO_OOM);
+	if (chunk == InvalidDsaPointer)
+		return NULL;
+
 	shheader = dsa_get_address(pgStatLocal.dsa, chunk);
 	shheader->magic = 0xdeadbeef;
 
@@ -510,6 +522,20 @@ pgstat_get_entry_ref(PgStat_Kind kind, Oid dboid, uint64 objid, bool create,
 		if (!shfound)
 		{
 			shheader = pgstat_init_entry(kind, shhashent);
+			if (shheader == NULL)
+			{
+				/*
+				 * Failed the allocation of a new entry, so clean up the
+				 * shared hashtable before giving up.
+				 */
+				dshash_delete_entry(pgStatLocal.shared_hash, shhashent);
+
+				ereport(ERROR,
+						(errcode(ERRCODE_OUT_OF_MEMORY),
+						 errmsg("out of memory"),
+						 errdetail("Failed while allocating entry %u/%u/%" PRIu64 ".",
+								   key.kind, key.dboid, key.objid)));
+			}
 			pgstat_acquire_entry_ref(entry_ref, shhashent, shheader);
 
 			if (created_entry != NULL)
@@ -874,11 +900,12 @@ pgstat_drop_entry_internal(PgStatShared_HashEntry *shent,
 	 */
 	if (shent->dropped)
 		elog(ERROR,
-			 "trying to drop stats entry already dropped: kind=%s dboid=%u objid=%" PRIu64 " refcount=%u",
+			 "trying to drop stats entry already dropped: kind=%s dboid=%u objid=%" PRIu64 " refcount=%u generation=%u",
 			 pgstat_get_kind_info(shent->key.kind)->name,
 			 shent->key.dboid,
 			 shent->key.objid,
-			 pg_atomic_read_u32(&shent->refcount));
+			 pg_atomic_read_u32(&shent->refcount),
+			 pg_atomic_read_u32(&shent->generation));
 	shent->dropped = true;
 
 	/* release refcount marking entry as not dropped */
diff --git a/src/backend/utils/activity/pgstat_slru.c b/src/backend/utils/activity/pgstat_slru.c
index b9e940dde45..7bd8744accb 100644
--- a/src/backend/utils/activity/pgstat_slru.c
+++ b/src/backend/utils/activity/pgstat_slru.c
@@ -143,15 +143,6 @@ pgstat_get_slru_index(const char *name)
 	return (SLRU_NUM_ELEMENTS - 1);
 }
 
-/*
- * Check if there are any SLRU stats entries waiting for flush.
- */
-bool
-pgstat_slru_have_pending_cb(void)
-{
-	return have_slrustats;
-}
-
 /*
  * Flush out locally pending SLRU stats entries
  *
@@ -247,6 +238,7 @@ get_slru_entry(int slru_idx)
 	Assert((slru_idx >= 0) && (slru_idx < SLRU_NUM_ELEMENTS));
 
 	have_slrustats = true;
+	pgstat_report_fixed = true;
 
 	return &pending_SLRUStats[slru_idx];
 }
diff --git a/src/backend/utils/activity/pgstat_wal.c b/src/backend/utils/activity/pgstat_wal.c
index 16a1ecb4d90..0d04480d2f6 100644
--- a/src/backend/utils/activity/pgstat_wal.c
+++ b/src/backend/utils/activity/pgstat_wal.c
@@ -71,6 +71,15 @@ pgstat_fetch_stat_wal(void)
 	return &pgStatLocal.snapshot.wal;
 }
 
+/*
+ * To determine whether WAL usage happened.
+ */
+static inline bool
+pgstat_wal_have_pending(void)
+{
+	return pgWalUsage.wal_records != prevWalUsage.wal_records;
+}
+
 /*
  * Calculate how much WAL usage counters have increased by subtracting the
  * previous counters from the current ones.
@@ -92,7 +101,7 @@ pgstat_wal_flush_cb(bool nowait)
 	 * This function can be called even if nothing at all has happened. Avoid
 	 * taking lock for nothing in that case.
 	 */
-	if (!pgstat_wal_have_pending_cb())
+	if (!pgstat_wal_have_pending())
 		return false;
 
 	/*
@@ -136,15 +145,6 @@ pgstat_wal_init_backend_cb(void)
 	prevWalUsage = pgWalUsage;
 }
 
-/*
- * To determine whether WAL usage happened.
- */
-bool
-pgstat_wal_have_pending_cb(void)
-{
-	return pgWalUsage.wal_records != prevWalUsage.wal_records;
-}
-
 void
 pgstat_wal_init_shmem_cb(void *stats)
 {
diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c
index d9b8f34a355..115ea9259a6 100644
--- a/src/backend/utils/activity/wait_event.c
+++ b/src/backend/utils/activity/wait_event.c
@@ -503,4 +503,4 @@ pgstat_get_wait_event(uint32 wait_event_info)
 	return event_name;
 }
 
-#include "pgstat_wait_event.c"
+#include "utils/pgstat_wait_event.c"
diff --git a/src/backend/utils/activity/wait_event_funcs.c b/src/backend/utils/activity/wait_event_funcs.c
index ffbb57a8078..15486ce88dc 100644
--- a/src/backend/utils/activity/wait_event_funcs.c
+++ b/src/backend/utils/activity/wait_event_funcs.c
@@ -31,7 +31,7 @@ static const struct
 
 			waitEventData[] =
 {
-#include "wait_event_funcs_data.c"
+#include "utils/wait_event_funcs_data.c"
 	/* end of list */
 	{NULL, NULL, NULL}
 };
diff --git a/src/backend/utils/activity/wait_event_names.txt b/src/backend/utils/activity/wait_event_names.txt
index 4da68312b5f..b9c1e6900ec 100644
--- a/src/backend/utils/activity/wait_event_names.txt
+++ b/src/backend/utils/activity/wait_event_names.txt
@@ -14,13 +14,13 @@
 #
 # The files generated from this one are:
 #
-#   src/backend/utils/activity/wait_event_types.h
+#   wait_event_types.h
 #      typedef enum definitions for wait events.
 #
-#   src/backend/utils/activity/pgstat_wait_event.c
+#   pgstat_wait_event.c
 #      C functions to get the wait event name based on the enum.
 #
-#   src/backend/utils/activity/wait_event_types.sgml
+#   wait_event_types.sgml
 #      SGML tables of wait events for inclusion in the documentation.
 #
 # When adding a new wait event, make sure it is placed in the appropriate
@@ -156,7 +156,6 @@ REPLICATION_SLOT_DROP	"Waiting for a replication slot to become inactive so it c
 RESTORE_COMMAND	"Waiting for <xref linkend="guc-restore-command"/> to complete."
 SAFE_SNAPSHOT	"Waiting to obtain a valid snapshot for a <literal>READ ONLY DEFERRABLE</literal> transaction."
 SYNC_REP	"Waiting for confirmation from a remote server during synchronous replication."
-WAL_BUFFER_INIT	"Waiting on WAL buffer to be initialized."
 WAL_RECEIVER_EXIT	"Waiting for the WAL receiver to exit."
 WAL_RECEIVER_WAIT_START	"Waiting for startup process to send initial data for streaming replication."
 WAL_SUMMARY_READY	"Waiting for a new WAL summary to be generated."
@@ -316,6 +315,7 @@ XidGen	"Waiting to allocate a new transaction ID."
 ProcArray	"Waiting to access the shared per-process data structures (typically, to get a snapshot or report a session's transaction ID)."
 SInvalRead	"Waiting to retrieve messages from the shared catalog invalidation queue."
 SInvalWrite	"Waiting to add a message to the shared catalog invalidation queue."
+WALBufMapping	"Waiting to replace a page in WAL buffers."
 WALWrite	"Waiting for WAL buffers to be written to disk."
 ControlFile	"Waiting to read or update the <filename>pg_control</filename> file or create a new WAL file."
 MultiXactGen	"Waiting to read or update shared multixact state."
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d7c7118609b..0eacab8261e 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -135,6 +135,22 @@ static AclResult pg_role_aclcheck(Oid role_oid, Oid roleid, AclMode mode);
 static void RoleMembershipCacheCallback(Datum arg, int cacheid, uint32 hashvalue);
 
 
+/*
+ * Test whether an identifier char can be left unquoted in ACLs.
+ *
+ * Formerly, we used isalnum() even on non-ASCII characters, resulting in
+ * unportable behavior.  To ensure dump compatibility with old versions,
+ * we now treat high-bit-set characters as always requiring quoting during
+ * putid(), but getid() will always accept them without quotes.
+ */
+static inline bool
+is_safe_acl_char(unsigned char c, bool is_getid)
+{
+	if (IS_HIGHBIT_SET(c))
+		return is_getid;
+	return isalnum(c) || c == '_';
+}
+
 /*
  * getid
  *		Consumes the first alphanumeric string (identifier) found in string
@@ -160,21 +176,22 @@ getid(const char *s, char *n, Node *escontext)
 
 	while (isspace((unsigned char) *s))
 		s++;
-	/* This code had better match what putid() does, below */
 	for (;
 		 *s != '\0' &&
-		 (isalnum((unsigned char) *s) ||
-		  *s == '_' ||
-		  *s == '"' ||
-		  in_quotes);
+		 (in_quotes || *s == '"' || is_safe_acl_char(*s, true));
 		 s++)
 	{
 		if (*s == '"')
 		{
+			if (!in_quotes)
+			{
+				in_quotes = true;
+				continue;
+			}
 			/* safe to look at next char (could be '\0' though) */
 			if (*(s + 1) != '"')
 			{
-				in_quotes = !in_quotes;
+				in_quotes = false;
 				continue;
 			}
 			/* it's an escaped double quote; skip the escaping char */
@@ -208,10 +225,10 @@ putid(char *p, const char *s)
 	const char *src;
 	bool		safe = true;
 
+	/* Detect whether we need to use double quotes */
 	for (src = s; *src; src++)
 	{
-		/* This test had better match what getid() does, above */
-		if (!isalnum((unsigned char) *src) && *src != '_')
+		if (!is_safe_acl_char(*src, false))
 		{
 			safe = false;
 			break;
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c
index 8eb342e3382..f2d588fd4a3 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -24,6 +24,7 @@
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/tuplesort.h"
 #include "utils/typcache.h"
 
@@ -1033,10 +1034,11 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 	}
 
 	/* We only need to combine the two states if state2 has any items */
-	else if (state2->nitems > 0)
+	if (state2->nitems > 0)
 	{
 		MemoryContext oldContext;
-		int			reqsize = state1->nbytes + state2->nbytes;
+		int			reqsize;
+		int			newnitems;
 		int			i;
 
 		/*
@@ -1059,6 +1061,17 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 						 errmsg("cannot accumulate arrays of different dimensionality")));
 		}
 
+		/* Types should match already. */
+		Assert(state1->array_type == state2->array_type);
+		Assert(state1->element_type == state2->element_type);
+
+		/* Calculate new sizes, guarding against overflow. */
+		if (pg_add_s32_overflow(state1->nbytes, state2->nbytes, &reqsize) ||
+			pg_add_s32_overflow(state1->nitems, state2->nitems, &newnitems))
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("array size exceeds the maximum allowed (%zu)",
+							MaxArraySize)));
 
 		oldContext = MemoryContextSwitchTo(state1->mcontext);
 
@@ -1073,17 +1086,16 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 			state1->data = (char *) repalloc(state1->data, state1->abytes);
 		}
 
-		if (state2->nullbitmap)
+		/* Combine the null bitmaps, if present. */
+		if (state1->nullbitmap || state2->nullbitmap)
 		{
-			int			newnitems = state1->nitems + state2->nitems;
-
 			if (state1->nullbitmap == NULL)
 			{
 				/*
 				 * First input with nulls; we must retrospectively handle any
 				 * previous inputs by marking all their items non-null.
 				 */
-				state1->aitems = pg_nextpower2_32(Max(256, newnitems + 1));
+				state1->aitems = pg_nextpower2_32(Max(256, newnitems));
 				state1->nullbitmap = (bits8 *) palloc((state1->aitems + 7) / 8);
 				array_bitmap_copy(state1->nullbitmap, 0,
 								  NULL, 0,
@@ -1091,17 +1103,17 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 			}
 			else if (newnitems > state1->aitems)
 			{
-				int			newaitems = state1->aitems + state2->aitems;
-
-				state1->aitems = pg_nextpower2_32(newaitems);
+				state1->aitems = pg_nextpower2_32(newnitems);
 				state1->nullbitmap = (bits8 *)
 					repalloc(state1->nullbitmap, (state1->aitems + 7) / 8);
 			}
+			/* This will do the right thing if state2->nullbitmap is NULL: */
 			array_bitmap_copy(state1->nullbitmap, state1->nitems,
 							  state2->nullbitmap, 0,
 							  state2->nitems);
 		}
 
+		/* Finally, combine the data and adjust sizes. */
 		memcpy(state1->data + state1->nbytes, state2->data, state2->nbytes);
 		state1->nbytes += state2->nbytes;
 		state1->nitems += state2->nitems;
@@ -1109,9 +1121,6 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 		state1->dims[0] += state2->dims[0];
 		/* remaining dims already match, per test above */
 
-		Assert(state1->array_type == state2->array_type);
-		Assert(state1->element_type == state2->element_type);
-
 		MemoryContextSwitchTo(oldContext);
 	}
 
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 07857ca8070..760f2427d40 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -465,7 +465,7 @@ ReadArrayDimensions(char **srcptr, int *ndim_p, int *dim, int *lBound,
 			if (!ReadDimensionInt(&p, &ub, origStr, escontext))
 				return false;
 			if (p == q)			/* no digits? */
-				return(escontext, false, 
+				ereturn(escontext, false, 
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("malformed array literal: \"%s\"", origStr),
 						 errdetail("Missing array dimension value.")));
@@ -3748,6 +3748,12 @@ deconstruct_array_builtin(ArrayType *array,
 			elmalign = TYPALIGN_SHORT;
 			break;
 
+		case INT4OID:
+			elmlen = sizeof(int32);
+			elmbyval = true;
+			elmalign = TYPALIGN_INT;
+			break;
+
 		case OIDOID:
 			elmlen = sizeof(Oid);
 			elmbyval = true;
@@ -5581,6 +5587,7 @@ accumArrayResultArr(ArrayBuildStateArr *astate,
 				ndatabytes;
 	char	   *data;
 	int			i;
+	int			newnitems;
 
 	/*
 	 * We disallow accumulating null subarrays.  Another plausible definition
@@ -5610,6 +5617,14 @@ accumArrayResultArr(ArrayBuildStateArr *astate,
 	nitems = ArrayGetNItems(ndims, dims);
 	ndatabytes = ARR_SIZE(arg) - ARR_DATA_OFFSET(arg);
 
+	/* Check that the array doesn't grow too large */
+	newnitems = astate->nitems + nitems;
+	if (newnitems > MaxArraySize)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("array size exceeds the maximum allowed (%zu)",
+						MaxArraySize)));
+
 	if (astate->ndims == 0)
 	{
 		/* First input; check/save the dimensionality info */
@@ -5675,8 +5690,6 @@ accumArrayResultArr(ArrayBuildStateArr *astate,
 	/* Deal with null bitmap if needed */
 	if (astate->nullbitmap || ARR_HASNULL(arg))
 	{
-		int			newnitems = astate->nitems + nitems;
-
 		if (astate->nullbitmap == NULL)
 		{
 			/*
@@ -5700,7 +5713,7 @@ accumArrayResultArr(ArrayBuildStateArr *astate,
 						  nitems);
 	}
 
-	astate->nitems += nitems;
+	astate->nitems = newnitems;
 	astate->dims[0] += 1;
 
 	MemoryContextSwitchTo(oldcontext);
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 789ffe46b0c..c31ef53f30b 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index fcd5b1653dd..5aab1edb7bc 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -258,8 +258,13 @@ datumIsEqual(Datum value1, Datum value2, bool typByVal, int typLen)
 /*-------------------------------------------------------------------------
  * datum_image_eq
  *
- * Compares two datums for identical contents, based on byte images.  Return
- * true if the two datums are equal, false otherwise.
+ * Compares two datums for identical contents when coerced to a signed integer
+ * of typLen bytes.  Return true if the two datums are equal, false otherwise.
+ *
+ * The coercion is required as we're not always careful to use the correct
+ * PG_RETURN_* macro.  If we didn't do this, a Datum that's been formed and
+ * deformed into a tuple may not have the same signed representation as the
+ * other datum value.
  *-------------------------------------------------------------------------
  */
 bool
@@ -271,7 +276,21 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)
 
 	if (typByVal)
 	{
-		result = (value1 == value2);
+		switch (typLen)
+		{
+			case sizeof(char):
+				result = (DatumGetChar(value1) == DatumGetChar(value2));
+				break;
+			case sizeof(int16):
+				result = (DatumGetInt16(value1) == DatumGetInt16(value2));
+				break;
+			case sizeof(int32):
+				result = (DatumGetInt32(value1) == DatumGetInt32(value2));
+				break;
+			default:
+				result = (value1 == value2);
+				break;
+		}
 	}
 	else if (typLen > 0)
 	{
@@ -328,10 +347,11 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)
 /*-------------------------------------------------------------------------
  * datum_image_hash
  *
- * Generate a hash value based on the binary representation of 'value'.  Most
- * use cases will want to use the hash function specific to the Datum's type,
- * however, some corner cases require generating a hash value based on the
- * actual bits rather than the logical value.
+ * Generate a hash value based on the binary representation of 'value' when
+ * represented as a signed integer of typLen bytes.  Most use cases will want
+ * to use the hash function specific to the Datum's type, however, some corner
+ * cases require generating a hash value based on the actual bits rather than
+ * the logical value.
  *-------------------------------------------------------------------------
  */
 uint32
@@ -341,7 +361,23 @@ datum_image_hash(Datum value, bool typByVal, int typLen)
 	uint32		result;
 
 	if (typByVal)
+	{
+		switch (typLen)
+		{
+			case sizeof(char):
+				value = CharGetDatum(DatumGetChar(value));
+				break;
+			case sizeof(int16):
+				value = Int16GetDatum(DatumGetInt16(value));
+				break;
+			case sizeof(int32):
+				value = Int32GetDatum(DatumGetInt32(value));
+				break;
+				/* Nothing needs done for 64-bit types */
+		}
+
 		result = hash_bytes((unsigned char *) &value, sizeof(Datum));
+	}
 	else if (typLen > 0)
 		result = hash_bytes((unsigned char *) DatumGetPointer(value), typLen);
 	else if (typLen == -1)
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index 25865b660ef..3a059f4ace0 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -938,6 +938,9 @@ pg_relation_filenode(PG_FUNCTION_ARGS)
  *
  * We don't fail but return NULL if we cannot find a mapping.
  *
+ * Temporary relations are not detected, returning NULL (see
+ * RelidByRelfilenumber() for the reasons).
+ *
  * InvalidOid can be passed instead of the current database's default
  * tablespace.
  */
diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c
index 4ccaed815d1..c8dc56bc5cf 100644
--- a/src/backend/utils/adt/encode.c
+++ b/src/backend/utils/adt/encode.c
@@ -236,7 +236,7 @@ hex_decode_safe(const char *src, size_t len, char *dst, Node *escontext)
 			ereturn(escontext, 0,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("invalid hexadecimal digit: \"%.*s\"",
-							pg_mblen(s), s)));
+							pg_mblen_range(s, srcend), s)));
 		s++;
 		if (s >= srcend)
 			ereturn(escontext, 0,
@@ -246,7 +246,7 @@ hex_decode_safe(const char *src, size_t len, char *dst, Node *escontext)
 			ereturn(escontext, 0,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("invalid hexadecimal digit: \"%.*s\"",
-							pg_mblen(s), s)));
+							pg_mblen_range(s, srcend), s)));
 		s++;
 		*p++ = (v1 << 4) | v2;
 	}
@@ -375,7 +375,7 @@ pg_base64_decode(const char *src, size_t len, char *dst)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("invalid symbol \"%.*s\" found while decoding base64 sequence",
-								pg_mblen(s - 1), s - 1)));
+								pg_mblen_range(s - 1, srcend), s - 1)));
 		}
 		/* add it to buffer */
 		buf = (buf << 6) + b;
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 8346c2f54d5..2ccac74cd43 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/format_type.c
@@ -785,11 +785,15 @@ oidvectortypes(PG_FUNCTION_ARGS)
 {
 	oidvector  *oidArray = (oidvector *) PG_GETARG_POINTER(0);
 	char	   *result;
-	int			numargs = oidArray->dim1;
+	int			numargs;
 	int			num;
 	size_t		total;
 	size_t		left;
 
+	/* validate input before fetching dim1 */
+	check_valid_oidvector(oidArray);
+	numargs = oidArray->dim1;
+
 	total = 20 * numargs + 1;
 	result = palloc(total);
 	result[0] = '\0';
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 68086ba224f..19c9225b091 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -4,7 +4,7 @@
  * src/backend/utils/adt/formatting.c
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	 Portions Copyright (c) 1999-2025, PostgreSQL Global Development Group
  *
  *
@@ -1039,8 +1039,9 @@ typedef struct NUMProc
 	char	   *number,			/* string with number	*/
 			   *number_p,		/* pointer to current number position */
 			   *inout,			/* in / out buffer	*/
-			   *inout_p,		/* pointer to current inout position */
-			   *last_relevant,	/* last relevant number after decimal point */
+			   *inout_p;		/* pointer to current inout position */
+
+	const char *last_relevant,	/* last relevant number after decimal point */
 
 			   *L_negative_sign,	/* Locale */
 			   *L_positive_sign,
@@ -1116,6 +1117,7 @@ static void NUM_prepare_locale(NUMProc *Np);
 static char *get_last_relevant_decnum(char *num);
 static void NUM_numpart_from_char(NUMProc *Np, int id, int input_len);
 static void NUM_numpart_to_char(NUMProc *Np, int id);
+static void NUM_add_locale_symbol(NUMProc *Np, const char *pattern);
 static char *NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 						   char *number, int input_len, int to_char_out_pre_spaces,
 						   int sign, bool is_to_char, Oid collid);
@@ -1472,7 +1474,7 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
 							 errmsg("invalid datetime format separator: \"%s\"",
-									pnstrdup(str, pg_mblen(str)))));
+									pnstrdup(str, pg_mblen_cstr(str)))));
 
 				if (*str == ' ')
 					n->type = NODE_TYPE_SPACE;
@@ -1502,7 +1504,7 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 					/* backslash quotes the next character, if any */
 					if (*str == '\\' && *(str + 1))
 						str++;
-					chlen = pg_mblen(str);
+					chlen = pg_mblen_cstr(str);
 					n->type = NODE_TYPE_CHAR;
 					memcpy(n->character, str, chlen);
 					n->character[chlen] = '\0';
@@ -1520,7 +1522,7 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 				 */
 				if (*str == '\\' && *(str + 1) == '"')
 					str++;
-				chlen = pg_mblen(str);
+				chlen = pg_mblen_cstr(str);
 
 				if ((flags & DCH_FLAG) && is_separator_char(str))
 					n->type = NODE_TYPE_SEPARATOR;
@@ -2050,8 +2052,8 @@ asc_toupper_z(const char *buff)
 	do { \
 		if (S_THth(_suf)) \
 		{ \
-			if (*(ptr)) (ptr) += pg_mblen(ptr); \
-			if (*(ptr)) (ptr) += pg_mblen(ptr); \
+			if (*(ptr)) (ptr) += pg_mblen_cstr(ptr); \
+			if (*(ptr)) (ptr) += pg_mblen_cstr(ptr); \
 		} \
 	} while (0)
 
@@ -3432,7 +3434,7 @@ DCH_from_char(FormatNode *node, const char *in, TmFromChar *out,
 				 * insist that the consumed character match the format's
 				 * character.
 				 */
-				s += pg_mblen(s);
+				s += pg_mblen_cstr(s);
 			}
 			continue;
 		}
@@ -3454,11 +3456,11 @@ DCH_from_char(FormatNode *node, const char *in, TmFromChar *out,
 				if (extra_skip > 0)
 					extra_skip--;
 				else
-					s += pg_mblen(s);
+					s += pg_mblen_cstr(s);
 			}
 			else
 			{
-				int			chlen = pg_mblen(s);
+				int			chlen = pg_mblen_cstr(s);
 
 				/*
 				 * Standard mode requires strict match of format characters.
@@ -4577,7 +4579,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
 	/*
 	 * Allocate workspace for result as C string
 	 */
-	result = palloc((fmt_len * DCH_MAX_ITEM_SIZ) + 1);
+	result = palloc(mul_size(fmt_len, DCH_MAX_ITEM_SIZ) + 1);
 	*result = '\0';
 
 	if (fmt_len > DCH_CACHE_SIZE)
@@ -4588,7 +4590,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
 		 */
 		incache = false;
 
-		format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
+		format = palloc_array(FormatNode, fmt_len + 1);
 
 		parse_format(format, fmt_str, DCH_keywords,
 					 DCH_suff, DCH_index, DCH_FLAG, NULL);
@@ -5027,7 +5029,7 @@ datetime_format_has_tz(const char *fmt_str)
 		 */
 		incache = false;
 
-		format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
+		format = palloc_array(FormatNode, fmt_len + 1);
 
 		parse_format(format, fmt_str, DCH_keywords,
 					 DCH_suff, DCH_index, DCH_FLAG, NULL);
@@ -5115,7 +5117,7 @@ do_to_timestamp(text *date_txt, text *fmt, Oid collid, bool std,
 			 * Allocate new memory if format picture is bigger than static
 			 * cache and do not use cache (call parser always)
 			 */
-			format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
+			format = palloc_array(FormatNode, fmt_len + 1);
 
 			parse_format(format, fmt_str, DCH_keywords, DCH_suff, DCH_index,
 						 DCH_FLAG | (std ? STD_FLAG : 0), NULL);
@@ -6091,7 +6093,7 @@ NUM_cache(int len, NUMDesc *Num, text *pars_str, bool *shouldFree)
 		 * Allocate new memory if format picture is bigger than static cache
 		 * and do not use cache (call parser always)
 		 */
-		format = (FormatNode *) palloc((len + 1) * sizeof(FormatNode));
+		format = palloc_array(FormatNode, len + 1);
 
 		*shouldFree = true;
 
@@ -6712,11 +6714,9 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 		{
 			if (Np->Num->lsign == NUM_LSIGN_PRE)
 			{
-				if (Np->sign == '-')
-					strcpy(Np->inout_p, Np->L_negative_sign);
-				else
-					strcpy(Np->inout_p, Np->L_positive_sign);
-				Np->inout_p += strlen(Np->inout_p);
+				NUM_add_locale_symbol(Np, (Np->sign == '-') ?
+									  Np->L_negative_sign :
+									  Np->L_positive_sign);
 				Np->sign_wrote = true;
 			}
 		}
@@ -6781,8 +6781,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 			{
 				if (!Np->last_relevant || *Np->last_relevant != '.')
 				{
-					strcpy(Np->inout_p, Np->decimal);	/* Write DEC/D */
-					Np->inout_p += strlen(Np->inout_p);
+					NUM_add_locale_symbol(Np, Np->decimal); /* Write DEC/D */
 				}
 
 				/*
@@ -6791,8 +6790,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 				else if (IS_FILLMODE(Np->Num) &&
 						 Np->last_relevant && *Np->last_relevant == '.')
 				{
-					strcpy(Np->inout_p, Np->decimal);	/* Write DEC/D */
-					Np->inout_p += strlen(Np->inout_p);
+					NUM_add_locale_symbol(Np, Np->decimal); /* Write DEC/D */
 				}
 			}
 			else
@@ -6850,11 +6848,9 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 			}
 			else if (IS_LSIGN(Np->Num) && Np->Num->lsign == NUM_LSIGN_POST)
 			{
-				if (Np->sign == '-')
-					strcpy(Np->inout_p, Np->L_negative_sign);
-				else
-					strcpy(Np->inout_p, Np->L_positive_sign);
-				Np->inout_p += strlen(Np->inout_p);
+				NUM_add_locale_symbol(Np, (Np->sign == '-') ?
+									  Np->L_negative_sign :
+									  Np->L_positive_sign);
 			}
 		}
 	}
@@ -6862,19 +6858,38 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 	++Np->num_curr;
 }
 
+/*
+ * Append locale-specific symbol to Np->inout.
+ * Note we don't null-terminate the output
+ */
+static void
+NUM_add_locale_symbol(NUMProc *Np, const char *pattern)
+{
+	size_t		pattern_len = strlen(pattern);
+
+	/* Truncate symbol if it's potentially too long */
+	if (unlikely(pattern_len > NUM_MAX_ITEM_SIZ))
+		pattern_len = pg_mbcliplen(pattern, pattern_len,
+								   NUM_MAX_ITEM_SIZ);
+	memcpy(Np->inout_p, pattern, pattern_len);
+	Np->inout_p += pattern_len;
+}
+
 /*
  * Skip over "n" input characters, but only if they aren't numeric data
  */
 static void
 NUM_eat_non_data_chars(NUMProc *Np, int n, int input_len)
 {
+	const char *end = Np->inout + input_len;
+
 	while (n-- > 0)
 	{
 		if (OVERLOAD_TEST)
 			break;				/* end of input */
 		if (strchr("0123456789.,+-", *Np->inout_p) != NULL)
 			break;				/* it's a data character */
-		Np->inout_p += pg_mblen(Np->inout_p);
+		Np->inout_p += pg_mblen_range(Np->inout_p, end);
 	}
 }
 
@@ -7769,6 +7784,10 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 					pattern_len = strlen(pattern);
 					if (Np->is_to_char)
 					{
+						/* Truncate symbol if it's potentially too long */
+						if (unlikely(pattern_len > NUM_MAX_ITEM_SIZ))
+							pattern_len = pg_mbcliplen(pattern, pattern_len,
+													   NUM_MAX_ITEM_SIZ);
 						if (!Np->num_in)
 						{
 							if (IS_FILLMODE(Np->Num))
@@ -7776,19 +7795,21 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 							else
 							{
 								/* just in case there are MB chars */
-								pattern_len = pg_mbstrlen(pattern);
+								pattern_len = pg_mbstrlen_with_len(pattern,
+																   pattern_len);
 								memset(Np->inout_p, ' ', pattern_len);
 								Np->inout_p += pattern_len - 1;
 							}
 						}
 						else
 						{
-							strcpy(Np->inout_p, pattern);
+							memcpy(Np->inout_p, pattern, pattern_len);
 							Np->inout_p += pattern_len - 1;
 						}
 					}
 					else
 					{
+						/* Here we do not truncate the symbol ... */
 						if (!Np->num_in)
 						{
 							if (IS_FILLMODE(Np->Num))
@@ -7813,11 +7834,18 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 					pattern = Np->L_currency_symbol;
 					if (Np->is_to_char)
 					{
-						strcpy(Np->inout_p, pattern);
-						Np->inout_p += strlen(pattern) - 1;
+						/* Truncate symbol if it's potentially too long */
+						pattern_len = strlen(pattern);
+						if (unlikely(pattern_len > NUM_MAX_ITEM_SIZ))
+							pattern_len = pg_mbcliplen(pattern, pattern_len,
+													   NUM_MAX_ITEM_SIZ);
+
+						memcpy(Np->inout_p, pattern, pattern_len);
+						Np->inout_p += pattern_len - 1;
 					}
 					else
 					{
+						/* Here we do not truncate the symbol ... */
 						NUM_eat_non_data_chars(Np, pg_mbstrlen(pattern), input_len);
 						continue;
 					}
@@ -7973,7 +8001,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 			}
 			else
 			{
-				Np->inout_p += pg_mblen(Np->inout_p);
+				Np->inout_p += pg_mblen_range(Np->inout_p, Np->inout + input_len);
 			}
 			continue;
 		}
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index b5781989a64..0fcd43ba0f9 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -134,6 +134,30 @@ buildint2vector(const int16 *int2s, int n)
 	return result;
 }
 
+/*
+ * validate that an array object meets the restrictions of int2vector
+ *
+ * We need this because there are pathways by which a general int2[] array can
+ * be cast to int2vector, allowing the type's restrictions to be violated.
+ * All code that receives an int2vector as a SQL parameter should check this.
+ */
+static void
+check_valid_int2vector(const int2vector *int2Array)
+{
+	/*
+	 * We insist on ndim == 1 and dataoffset == 0 (that is, no nulls) because
+	 * otherwise the array's layout will not be what calling code expects.  We
+	 * needn't be picky about the index lower bound though.  Checking elemtype
+	 * is just paranoia.
+	 */
+	if (int2Array->ndim != 1 ||
+		int2Array->dataoffset != 0 ||
+		int2Array->elemtype != INT2OID)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("array is not a valid int2vector")));
+}
+
 /*
  *		int2vectorin			- converts "num num ..." to internal form
  */
@@ -208,10 +232,14 @@ int2vectorout(PG_FUNCTION_ARGS)
 {
 	int2vector *int2Array = (int2vector *) PG_GETARG_POINTER(0);
 	int			num,
-				nnums = int2Array->dim1;
+				nnums;
 	char	   *rp;
 	char	   *result;
 
+	/* validate input before fetching dim1 */
+	check_valid_int2vector(int2Array);
+	nnums = int2Array->dim1;
+
 	/* assumes sign, 5 digits, ' ' */
 	rp = result = (char *) palloc(nnums * 7 + 1);
 	for (num = 0; num < nnums; num++)
@@ -272,6 +300,7 @@ int2vectorrecv(PG_FUNCTION_ARGS)
 Datum
 int2vectorsend(PG_FUNCTION_ARGS)
 {
+	/* We don't do check_valid_int2vector, since array_send won't care */
 	return array_send(fcinfo);
 }
 
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index c8b6c15e059..136952861e1 100644
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -277,9 +277,6 @@ compareJsonbContainers(JsonbContainer *a, JsonbContainer *b)
 		else
 		{
 			/*
-			 * It's safe to assume that the types differed, and that the va
-			 * and vb values passed were set.
-			 *
 			 * If the two values were of the same container type, then there'd
 			 * have been a chance to observe the variation in the number of
 			 * elements/pairs (when processing WJB_BEGIN_OBJECT, say). They're
@@ -852,15 +849,20 @@ JsonbIteratorInit(JsonbContainer *container)
  * It is our job to expand the jbvBinary representation without bothering them
  * with it.  However, clients should not take it upon themselves to touch array
  * or Object element/pair buffers, since their element/pair pointers are
- * garbage.  Also, *val will not be set when returning WJB_END_ARRAY or
- * WJB_END_OBJECT, on the assumption that it's only useful to access values
- * when recursing in.
+ * garbage.
+ *
+ * *val is not meaningful when the result is WJB_DONE, WJB_END_ARRAY or
+ * WJB_END_OBJECT.  However, we set val->type = jbvNull in those cases,
+ * so that callers may assume that val->type is always well-defined.
  */
 JsonbIteratorToken
 JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested)
 {
 	if (*it == NULL)
+	{
+		val->type = jbvNull;
 		return WJB_DONE;
+	}
 
 	/*
 	 * When stepping into a nested container, we jump back here to start
@@ -898,6 +900,7 @@ JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested)
 				 * nesting).
 				 */
 				*it = freeAndGetParent(*it);
+				val->type = jbvNull;
 				return WJB_END_ARRAY;
 			}
 
@@ -951,6 +954,7 @@ JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested)
 				 * of nesting).
 				 */
 				*it = freeAndGetParent(*it);
+				val->type = jbvNull;
 				return WJB_END_OBJECT;
 			}
 			else
@@ -995,8 +999,10 @@ JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested)
 				return WJB_VALUE;
 	}
 
-	elog(ERROR, "invalid iterator state");
-	return -1;
+	elog(ERROR, "invalid jsonb iterator state");
+	/* satisfy compilers that don't know that elog(ERROR) doesn't return */
+	val->type = jbvNull;
+	return WJB_DONE;
 }
 
 /*
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 13d80660804..d28110fb60d 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -695,7 +695,7 @@ report_json_context(JsonLexContext *lex)
 	{
 		/* Advance to next multibyte character */
 		if (IS_HIGHBIT_SET(*context_start))
-			context_start += pg_mblen(context_start);
+			context_start += pg_mblen_range(context_start, context_end);
 		else
 			context_start++;
 	}
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index 9673d29b905..9bd3d119060 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -4419,7 +4419,7 @@ JsonTablePlanJoinNextRow(JsonTablePlanState *planstate)
 		 */
 		if (!JsonTablePlanNextRow(planstate->right))
 		{
-			/* Right sibling ran out of row, so there are more rows. */
+			/* Right sibling ran out of rows too, so there are no more rows. */
 			return false;
 		}
 	}
diff --git a/src/backend/utils/adt/jsonpath_gram.y b/src/backend/utils/adt/jsonpath_gram.y
index 499745a8fef..f7233c98a18 100644
--- a/src/backend/utils/adt/jsonpath_gram.y
+++ b/src/backend/utils/adt/jsonpath_gram.y
@@ -599,7 +599,8 @@ makeItemLikeRegex(JsonPathParseItem *expr, JsonPathString *pattern,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("invalid input syntax for type %s", "jsonpath"),
 						 errdetail("Unrecognized flag character \"%.*s\" in LIKE_REGEX predicate.",
-								   pg_mblen(flags->val + i), flags->val + i)));
+								   pg_mblen_range(flags->val + i, flags->val + flags->len),
+								   flags->val + i)));
 				break;
 		}
 	}
diff --git a/src/backend/utils/adt/levenshtein.c b/src/backend/utils/adt/levenshtein.c
index 15a90f6f50c..2cc6a13b245 100644
--- a/src/backend/utils/adt/levenshtein.c
+++ b/src/backend/utils/adt/levenshtein.c
@@ -83,6 +83,8 @@ varstr_levenshtein(const char *source, int slen,
 	int		   *s_char_len = NULL;
 	int			j;
 	const char *y;
+	const char *send = source + slen;
+	const char *tend = target + tlen;
 
 	/*
 	 * For varstr_levenshtein_less_equal, we have real variables called
@@ -183,10 +185,10 @@ varstr_levenshtein(const char *source, int slen,
 #endif
 
 	/*
-	 * In order to avoid calling pg_mblen() repeatedly on each character in s,
-	 * we cache all the lengths before starting the main loop -- but if all
-	 * the characters in both strings are single byte, then we skip this and
-	 * use a fast-path in the main loop.  If only one string contains
+	 * In order to avoid calling pg_mblen_range() repeatedly on each character
+	 * in s, we cache all the lengths before starting the main loop -- but if
+	 * all the characters in both strings are single byte, then we skip this
+	 * and use a fast-path in the main loop.  If only one string contains
 	 * multi-byte characters, we still build the array, so that the fast-path
 	 * needn't deal with the case where the array hasn't been initialized.
 	 */
@@ -198,7 +200,7 @@ varstr_levenshtein(const char *source, int slen,
 		s_char_len = (int *) palloc((m + 1) * sizeof(int));
 		for (i = 0; i < m; ++i)
 		{
-			s_char_len[i] = pg_mblen(cp);
+			s_char_len[i] = pg_mblen_range(cp, send);
 			cp += s_char_len[i];
 		}
 		s_char_len[i] = 0;
@@ -224,7 +226,7 @@ varstr_levenshtein(const char *source, int slen,
 	{
 		int		   *temp;
 		const char *x = source;
-		int			y_char_len = n != tlen + 1 ? pg_mblen(y) : 1;
+		int			y_char_len = n != tlen + 1 ? pg_mblen_range(y, tend) : 1;
 		int			i;
 
 #ifdef LEVENSHTEIN_LESS_EQUAL
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 7f4cf614585..e69ca19c5a7 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -55,20 +55,20 @@ static int	Generic_Text_IC_like(text *str, text *pat, Oid collation);
  *--------------------
  */
 static inline int
-wchareq(const char *p1, const char *p2)
+wchareq(const char *p1, int p1len, const char *p2, int p2len)
 {
-	int			p1_len;
+	int			p1clen;
 
 	/* Optimization:  quickly compare the first byte. */
 	if (*p1 != *p2)
 		return 0;
 
-	p1_len = pg_mblen(p1);
-	if (pg_mblen(p2) != p1_len)
+	p1clen = pg_mblen_with_len(p1, p1len);
+	if (pg_mblen_with_len(p2, p2len) != p1clen)
 		return 0;
 
 	/* They are the same length */
-	while (p1_len--)
+	while (p1clen--)
 	{
 		if (*p1++ != *p2++)
 			return 0;
@@ -105,11 +105,11 @@ SB_lower_char(unsigned char c, pg_locale_t locale)
 #define NextByte(p, plen)	((p)++, (plen)--)
 
 /* Set up to compile like_match.c for multibyte characters */
-#define CHAREQ(p1, p2) wchareq((p1), (p2))
+#define CHAREQ(p1, p1len, p2, p2len) wchareq((p1), (p1len), (p2), (p2len))
 #define NextChar(p, plen) \
-	do { int __l = pg_mblen(p); (p) +=__l; (plen) -=__l; } while (0)
+	do { int __l = pg_mblen_with_len((p), (plen)); (p) +=__l; (plen) -=__l; } while (0)
 #define CopyAdvChar(dst, src, srclen) \
-	do { int __l = pg_mblen(src); \
+	do { int __l = pg_mblen_with_len((src), (srclen)); \
 		 (srclen) -= __l; \
 		 while (__l-- > 0) \
 			 *(dst)++ = *(src)++; \
@@ -121,7 +121,7 @@ SB_lower_char(unsigned char c, pg_locale_t locale)
 #include "like_match.c"
 
 /* Set up to compile like_match.c for single-byte characters */
-#define CHAREQ(p1, p2) (*(p1) == *(p2))
+#define CHAREQ(p1, p1len, p2, p2len) (*(p1) == *(p2))
 #define NextChar(p, plen) NextByte((p), (plen))
 #define CopyAdvChar(dst, src, srclen) (*(dst)++ = *(src)++, (srclen)--)
 
diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c
index 892f8a745ea..bac6c182467 100644
--- a/src/backend/utils/adt/like_match.c
+++ b/src/backend/utils/adt/like_match.c
@@ -438,6 +438,7 @@ do_like_escape(text *pat, text *esc)
 					 errhint("Escape string must be empty or one character.")));
 
 		e = VARDATA_ANY(esc);
+		elen = VARSIZE_ANY_EXHDR(esc);
 
 		/*
 		 * If specified escape is '\', just copy the pattern as-is.
@@ -456,7 +457,7 @@ do_like_escape(text *pat, text *esc)
 		afterescape = false;
 		while (plen > 0)
 		{
-			if (CHAREQ(p, e) && !afterescape)
+			if (CHAREQ(p, plen, e, elen) && !afterescape)
 			{
 				*r++ = '\\';
 				NextChar(p, plen);
diff --git a/src/backend/utils/adt/meson.build b/src/backend/utils/adt/meson.build
index 244f48f4fd7..624ae318772 100644
--- a/src/backend/utils/adt/meson.build
+++ b/src/backend/utils/adt/meson.build
@@ -1,5 +1,15 @@
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
+# Some code in numeric.c benefits from auto-vectorization
+numeric_backend_lib = static_library('numeric_backend_lib',
+  'numeric.c',
+  dependencies: backend_build_deps,
+  kwargs: internal_lib_args,
+  c_args: vectorize_cflags,
+)
+
+backend_link_with += numeric_backend_lib
+
 backend_sources += files(
   'acl.c',
   'amutils.c',
@@ -59,7 +69,6 @@ backend_sources += files(
   'network_gist.c',
   'network_selfuncs.c',
   'network_spgist.c',
-  'numeric.c',
   'numutils.c',
   'oid.c',
   'oracle_compat.c',
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index aeaac84849e..70394c831a7 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
index cd84ced5b48..6aedf646c9b 100644
--- a/src/backend/utils/adt/multirangetypes.c
+++ b/src/backend/utils/adt/multirangetypes.c
@@ -340,7 +340,7 @@ multirange_recv(PG_FUNCTION_ARGS)
 	Oid			mltrngtypoid = PG_GETARG_OID(1);
 	int32		typmod = PG_GETARG_INT32(2);
 	MultirangeIOData *cache;
-	uint32		range_count;
+	int32		range_count;
 	RangeType **ranges;
 	MultirangeType *ret;
 	StringInfoData tmpbuf;
@@ -348,7 +348,8 @@ multirange_recv(PG_FUNCTION_ARGS)
 	cache = get_multirange_io_data(fcinfo, mltrngtypoid, IOFunc_receive);
 
 	range_count = pq_getmsgint(buf, 4);
-	ranges = palloc(range_count * sizeof(RangeType *));
+	/* palloc_array will enforce a more-or-less-sane range_count value */
+	ranges = palloc_array(RangeType *, range_count);
 
 	initStringInfo(&tmpbuf);
 	for (int i = 0; i < range_count; i++)
@@ -483,8 +484,9 @@ multirange_canonicalize(TypeCacheEntry *rangetyp, int32 input_range_count,
 	int32		output_range_count = 0;
 
 	/* Sort the ranges so we can find the ones that overlap/meet. */
-	qsort_arg(ranges, input_range_count, sizeof(RangeType *), range_compare,
-			  rangetyp);
+	if (ranges != NULL)
+		qsort_arg(ranges, input_range_count, sizeof(RangeType *),
+				  range_compare, rangetyp);
 
 	/* Now merge where possible: */
 	for (i = 0; i < input_range_count; i++)
@@ -834,7 +836,7 @@ multirange_deserialize(TypeCacheEntry *rangetyp,
 	{
 		int			i;
 
-		*ranges = palloc(*range_count * sizeof(RangeType *));
+		*ranges = palloc_array(RangeType *, *range_count);
 		for (i = 0; i < *range_count; i++)
 			(*ranges)[i] = multirange_get_range(rangetyp, multirange, i);
 	}
@@ -998,7 +1000,7 @@ multirange_constructor2(PG_FUNCTION_ARGS)
 		deconstruct_array(rangeArray, rngtypid, rangetyp->typlen, rangetyp->typbyval,
 						  rangetyp->typalign, &elements, &nulls, &range_count);
 
-		ranges = palloc0(range_count * sizeof(RangeType *));
+		ranges = palloc_array(RangeType *, range_count);
 		for (i = 0; i < range_count; i++)
 		{
 			if (nulls[i])
diff --git a/src/backend/utils/adt/network_selfuncs.c b/src/backend/utils/adt/network_selfuncs.c
index 940cdafa546..a76186967d4 100644
--- a/src/backend/utils/adt/network_selfuncs.c
+++ b/src/backend/utils/adt/network_selfuncs.c
@@ -43,9 +43,9 @@
 /* Maximum number of items to consider in join selectivity calculations */
 #define MAX_CONSIDERED_ELEMS 1024
 
-static Selectivity networkjoinsel_inner(Oid operator,
+static Selectivity networkjoinsel_inner(Oid operator, int opr_codenum,
 										VariableStatData *vardata1, VariableStatData *vardata2);
-static Selectivity networkjoinsel_semi(Oid operator,
+static Selectivity networkjoinsel_semi(Oid operator, int opr_codenum,
 									   VariableStatData *vardata1, VariableStatData *vardata2);
 static Selectivity mcv_population(float4 *mcv_numbers, int mcv_nvalues);
 static Selectivity inet_hist_value_sel(Datum *values, int nvalues,
@@ -82,6 +82,7 @@ networksel(PG_FUNCTION_ARGS)
 	Oid			operator = PG_GETARG_OID(1);
 	List	   *args = (List *) PG_GETARG_POINTER(2);
 	int			varRelid = PG_GETARG_INT32(3);
+	int			opr_codenum;
 	VariableStatData vardata;
 	Node	   *other;
 	bool		varonleft;
@@ -95,6 +96,14 @@ networksel(PG_FUNCTION_ARGS)
 				nullfrac;
 	FmgrInfo	proc;
 
+	/*
+	 * Before all else, verify that the operator is one of the ones supported
+	 * by this function, which in turn proves that the input datatypes are
+	 * what we expect.  Otherwise, attaching this selectivity function to some
+	 * unexpected operator could cause trouble.
+	 */
+	opr_codenum = inet_opr_codenum(operator);
+
 	/*
 	 * If expression is not (variable op something) or (something op
 	 * variable), then punt and return a default estimate.
@@ -150,13 +159,12 @@ networksel(PG_FUNCTION_ARGS)
 						 STATISTIC_KIND_HISTOGRAM, InvalidOid,
 						 ATTSTATSSLOT_VALUES))
 	{
-		int			opr_codenum = inet_opr_codenum(operator);
+		int			h_codenum;
 
 		/* Commute if needed, so we can consider histogram to be on the left */
-		if (!varonleft)
-			opr_codenum = -opr_codenum;
+		h_codenum = varonleft ? opr_codenum : -opr_codenum;
 		non_mcv_selec = inet_hist_value_sel(hslot.values, hslot.nvalues,
-											constvalue, opr_codenum);
+											constvalue, h_codenum);
 
 		free_attstatsslot(&hslot);
 	}
@@ -203,10 +211,19 @@ networkjoinsel(PG_FUNCTION_ARGS)
 #endif
 	SpecialJoinInfo *sjinfo = (SpecialJoinInfo *) PG_GETARG_POINTER(4);
 	double		selec;
+	int			opr_codenum;
 	VariableStatData vardata1;
 	VariableStatData vardata2;
 	bool		join_is_reversed;
 
+	/*
+	 * Before all else, verify that the operator is one of the ones supported
+	 * by this function, which in turn proves that the input datatypes are
+	 * what we expect.  Otherwise, attaching this selectivity function to some
+	 * unexpected operator could cause trouble.
+	 */
+	opr_codenum = inet_opr_codenum(operator);
+
 	get_join_variables(root, args, sjinfo,
 					   &vardata1, &vardata2, &join_is_reversed);
 
@@ -220,15 +237,18 @@ networkjoinsel(PG_FUNCTION_ARGS)
 			 * Selectivity for left/full join is not exactly the same as inner
 			 * join, but we neglect the difference, as eqjoinsel does.
 			 */
-			selec = networkjoinsel_inner(operator, &vardata1, &vardata2);
+			selec = networkjoinsel_inner(operator, opr_codenum,
+										 &vardata1, &vardata2);
 			break;
 		case JOIN_SEMI:
 		case JOIN_ANTI:
 			/* Here, it's important that we pass the outer var on the left. */
 			if (!join_is_reversed)
-				selec = networkjoinsel_semi(operator, &vardata1, &vardata2);
+				selec = networkjoinsel_semi(operator, opr_codenum,
+											&vardata1, &vardata2);
 			else
 				selec = networkjoinsel_semi(get_commutator(operator),
+											-opr_codenum,
 											&vardata2, &vardata1);
 			break;
 		default:
@@ -260,7 +280,7 @@ networkjoinsel(PG_FUNCTION_ARGS)
  * Also, MCV vs histogram selectivity is not neglected as in eqjoinsel_inner().
  */
 static Selectivity
-networkjoinsel_inner(Oid operator,
+networkjoinsel_inner(Oid operator, int opr_codenum,
 					 VariableStatData *vardata1, VariableStatData *vardata2)
 {
 	Form_pg_statistic stats;
@@ -273,7 +293,6 @@ networkjoinsel_inner(Oid operator,
 				mcv2_exists = false,
 				hist1_exists = false,
 				hist2_exists = false;
-	int			opr_codenum;
 	int			mcv1_length = 0,
 				mcv2_length = 0;
 	AttStatsSlot mcv1_slot;
@@ -325,8 +344,6 @@ networkjoinsel_inner(Oid operator,
 		memset(&hist2_slot, 0, sizeof(hist2_slot));
 	}
 
-	opr_codenum = inet_opr_codenum(operator);
-
 	/*
 	 * Calculate selectivity for MCV vs MCV matches.
 	 */
@@ -387,7 +404,7 @@ networkjoinsel_inner(Oid operator,
  * histogram selectivity for semi/anti join cases.
  */
 static Selectivity
-networkjoinsel_semi(Oid operator,
+networkjoinsel_semi(Oid operator, int opr_codenum,
 					VariableStatData *vardata1, VariableStatData *vardata2)
 {
 	Form_pg_statistic stats;
@@ -401,7 +418,6 @@ networkjoinsel_semi(Oid operator,
 				mcv2_exists = false,
 				hist1_exists = false,
 				hist2_exists = false;
-	int			opr_codenum;
 	FmgrInfo	proc;
 	int			i,
 				mcv1_length = 0,
@@ -455,7 +471,6 @@ networkjoinsel_semi(Oid operator,
 		memset(&hist2_slot, 0, sizeof(hist2_slot));
 	}
 
-	opr_codenum = inet_opr_codenum(operator);
 	fmgr_info(get_opcode(operator), &proc);
 
 	/* Estimate number of input rows represented by RHS histogram. */
@@ -827,6 +842,9 @@ inet_semi_join_sel(Datum lhs_value,
 /*
  * Assign useful code numbers for the subnet inclusion/overlap operators
  *
+ * This will throw an error if the operator is not one of the ones we
+ * support in networksel() and networkjoinsel().
+ *
  * Only inet_masklen_inclusion_cmp() and inet_hist_match_divider() depend
  * on the exact codes assigned here; but many other places in this file
  * know that they can negate a code to obtain the code for the commutator
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 81a3a503c18..b6eeb16d92e 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -11,7 +11,7 @@
  * Transactions on Mathematical Software, Vol. 24, No. 4, December 1998,
  * pages 359-367.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 1998-2025, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 4e880e76232..4ea0d3d8569 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -107,6 +107,30 @@ buildoidvector(const Oid *oids, int n)
 	return result;
 }
 
+/*
+ * validate that an array object meets the restrictions of oidvector
+ *
+ * We need this because there are pathways by which a general oid[] array can
+ * be cast to oidvector, allowing the type's restrictions to be violated.
+ * All code that receives an oidvector as a SQL parameter should check this.
+ */
+void
+check_valid_oidvector(const oidvector *oidArray)
+{
+	/*
+	 * We insist on ndim == 1 and dataoffset == 0 (that is, no nulls) because
+	 * otherwise the array's layout will not be what calling code expects.  We
+	 * needn't be picky about the index lower bound though.  Checking elemtype
+	 * is just paranoia.
+	 */
+	if (oidArray->ndim != 1 ||
+		oidArray->dataoffset != 0 ||
+		oidArray->elemtype != OIDOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("array is not a valid oidvector")));
+}
+
 /*
  *		oidvectorin			- converts "num num ..." to internal form
  */
@@ -159,10 +183,14 @@ oidvectorout(PG_FUNCTION_ARGS)
 {
 	oidvector  *oidArray = (oidvector *) PG_GETARG_POINTER(0);
 	int			num,
-				nnums = oidArray->dim1;
+				nnums;
 	char	   *rp;
 	char	   *result;
 
+	/* validate input before fetching dim1 */
+	check_valid_oidvector(oidArray);
+	nnums = oidArray->dim1;
+
 	/* assumes sign, 10 digits, ' ' */
 	rp = result = (char *) palloc(nnums * 12 + 1);
 	for (num = 0; num < nnums; num++)
@@ -225,6 +253,7 @@ oidvectorrecv(PG_FUNCTION_ARGS)
 Datum
 oidvectorsend(PG_FUNCTION_ARGS)
 {
+	/* We don't do check_valid_oidvector, since array_send won't care */
 	return array_send(fcinfo);
 }
 
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index a24a2d208fb..70f7531fb50 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -169,8 +169,8 @@ lpad(PG_FUNCTION_ARGS)
 	char	   *ptr1,
 			   *ptr2,
 			   *ptr2start,
-			   *ptr2end,
 			   *ptr_ret;
+	const char *ptr2end;
 	int			m,
 				s1len,
 				s2len;
@@ -215,7 +215,7 @@ lpad(PG_FUNCTION_ARGS)
 
 	while (m--)
 	{
-		int			mlen = pg_mblen(ptr2);
+		int			mlen = pg_mblen_range(ptr2, ptr2end);
 
 		memcpy(ptr_ret, ptr2, mlen);
 		ptr_ret += mlen;
@@ -228,7 +228,7 @@ lpad(PG_FUNCTION_ARGS)
 
 	while (s1len--)
 	{
-		int			mlen = pg_mblen(ptr1);
+		int			mlen = pg_mblen_unbounded(ptr1);
 
 		memcpy(ptr_ret, ptr1, mlen);
 		ptr_ret += mlen;
@@ -267,8 +267,8 @@ rpad(PG_FUNCTION_ARGS)
 	char	   *ptr1,
 			   *ptr2,
 			   *ptr2start,
-			   *ptr2end,
 			   *ptr_ret;
+	const char *ptr2end;
 	int			m,
 				s1len,
 				s2len;
@@ -308,11 +308,12 @@ rpad(PG_FUNCTION_ARGS)
 	m = len - s1len;
 
 	ptr1 = VARDATA_ANY(string1);
+
 	ptr_ret = VARDATA(ret);
 
 	while (s1len--)
 	{
-		int			mlen = pg_mblen(ptr1);
+		int			mlen = pg_mblen_unbounded(ptr1);
 
 		memcpy(ptr_ret, ptr1, mlen);
 		ptr_ret += mlen;
@@ -324,7 +325,7 @@ rpad(PG_FUNCTION_ARGS)
 
 	while (m--)
 	{
-		int			mlen = pg_mblen(ptr2);
+		int			mlen = pg_mblen_range(ptr2, ptr2end);
 
 		memcpy(ptr_ret, ptr2, mlen);
 		ptr_ret += mlen;
@@ -409,6 +410,7 @@ dotrim(const char *string, int stringlen,
 			 */
 			const char **stringchars;
 			const char **setchars;
+			const char *setend;
 			int		   *stringmblen;
 			int		   *setmblen;
 			int			stringnchars;
@@ -416,6 +418,7 @@ dotrim(const char *string, int stringlen,
 			int			resultndx;
 			int			resultnchars;
 			const char *p;
+			const char *pend;
 			int			len;
 			int			mblen;
 			const char *str_pos;
@@ -426,10 +429,11 @@ dotrim(const char *string, int stringlen,
 			stringnchars = 0;
 			p = string;
 			len = stringlen;
+			pend = p + len;
 			while (len > 0)
 			{
 				stringchars[stringnchars] = p;
-				stringmblen[stringnchars] = mblen = pg_mblen(p);
+				stringmblen[stringnchars] = mblen = pg_mblen_range(p, pend);
 				stringnchars++;
 				p += mblen;
 				len -= mblen;
@@ -440,10 +444,11 @@ dotrim(const char *string, int stringlen,
 			setnchars = 0;
 			p = set;
 			len = setlen;
+			setend = set + setlen;
 			while (len > 0)
 			{
 				setchars[setnchars] = p;
-				setmblen[setnchars] = mblen = pg_mblen(p);
+				setmblen[setnchars] = mblen = pg_mblen_range(p, setend);
 				setnchars++;
 				p += mblen;
 				len -= mblen;
@@ -821,6 +826,8 @@ translate(PG_FUNCTION_ARGS)
 			   *to_end;
 	char	   *source,
 			   *target;
+	const char *source_end;
+	const char *from_end;
 	int			m,
 				fromlen,
 				tolen,
@@ -835,9 +842,11 @@ translate(PG_FUNCTION_ARGS)
 	if (m <= 0)
 		PG_RETURN_TEXT_P(string);
 	source = VARDATA_ANY(string);
+	source_end = source + m;
 
 	fromlen = VARSIZE_ANY_EXHDR(from);
 	from_ptr = VARDATA_ANY(from);
+	from_end = from_ptr + fromlen;
 	tolen = VARSIZE_ANY_EXHDR(to);
 	to_ptr = VARDATA_ANY(to);
 	to_end = to_ptr + tolen;
@@ -861,12 +870,12 @@ translate(PG_FUNCTION_ARGS)
 
 	while (m > 0)
 	{
-		source_len = pg_mblen(source);
+		source_len = pg_mblen_range(source, source_end);
 		from_index = 0;
 
 		for (i = 0; i < fromlen; i += len)
 		{
-			len = pg_mblen(&from_ptr[i]);
+			len = pg_mblen_range(&from_ptr[i], from_end);
 			if (len == source_len &&
 				memcmp(source, &from_ptr[i], len) == 0)
 				break;
@@ -882,11 +891,11 @@ translate(PG_FUNCTION_ARGS)
 			{
 				if (p >= to_end)
 					break;
-				p += pg_mblen(p);
+				p += pg_mblen_range(p, to_end);
 			}
 			if (p < to_end)
 			{
-				len = pg_mblen(p);
+				len = pg_mblen_range(p, to_end);
 				memcpy(target, p, len);
 				target += len;
 				retlen += len;
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 7d88c020b19..477b67aa62a 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -134,6 +134,13 @@ static pg_locale_t default_locale = NULL;
 static bool CurrentLocaleConvValid = false;
 static bool CurrentLCTimeValid = false;
 
+static struct pg_locale_struct c_locale = {
+	.provider = COLLPROVIDER_LIBC,
+	.deterministic = true,
+	.collate_is_c = true,
+	.ctype_is_c = true,
+};
+
 /* Cache for collation-related knowledge */
 
 typedef struct
@@ -975,7 +982,7 @@ get_iso_localename(const char *winlocname)
 	wchar_t		wc_locale_name[LOCALE_NAME_MAX_LENGTH];
 	wchar_t		buffer[LOCALE_NAME_MAX_LENGTH];
 	static char iso_lc_messages[LOCALE_NAME_MAX_LENGTH];
-	char	   *period;
+	const char *period;
 	int			len;
 	int			ret_val;
 
@@ -1194,6 +1201,13 @@ pg_newlocale_from_collation(Oid collid)
 	if (collid == DEFAULT_COLLATION_OID)
 		return default_locale;
 
+	/*
+	 * Some callers expect C_COLLATION_OID to succeed even without catalog
+	 * access.
+	 */
+	if (collid == C_COLLATION_OID)
+		return &c_locale;
+
 	if (!OidIsValid(collid))
 		elog(ERROR, "cache lookup failed for collation %u", collid);
 
diff --git a/src/backend/utils/adt/pg_locale_builtin.c b/src/backend/utils/adt/pg_locale_builtin.c
index f51768830cd..df5612b5a2d 100644
--- a/src/backend/utils/adt/pg_locale_builtin.c
+++ b/src/backend/utils/adt/pg_locale_builtin.c
@@ -91,7 +91,7 @@ strtitle_builtin(char *dest, size_t destsize, const char *src, ssize_t srclen,
 {
 	struct WordBoundaryState wbstate = {
 		.str = src,
-		.len = srclen,
+		.len = (srclen < 0) ? strlen(src) : srclen,
 		.offset = 0,
 		.posix = !locale->info.builtin.casemap_full,
 		.init = false,
diff --git a/src/backend/utils/adt/pg_locale_icu.c b/src/backend/utils/adt/pg_locale_icu.c
index a32c32a0744..72c5fffa204 100644
--- a/src/backend/utils/adt/pg_locale_icu.c
+++ b/src/backend/utils/adt/pg_locale_icu.c
@@ -95,8 +95,8 @@ static size_t strnxfrm_prefix_icu_utf8(char *dest, size_t destsize,
 									   const char *src, ssize_t srclen,
 									   pg_locale_t locale);
 static void init_icu_converter(void);
-static size_t uchar_length(UConverter *converter,
-						   const char *str, int32_t len);
+static int32_t uchar_length(UConverter *converter,
+							const char *str, int32_t len);
 static int32_t uchar_convert(UConverter *converter,
 							 UChar *dest, int32_t destlen,
 							 const char *src, int32_t srclen);
@@ -349,7 +349,7 @@ make_icu_collator(const char *iculocstr, const char *icurules)
 		total = u_strlen(std_rules) + u_strlen(my_rules) + 1;
 
 		/* avoid leaking collator on OOM */
-		all_rules = palloc_extended(sizeof(UChar) * total, MCXT_ALLOC_NO_OOM);
+		all_rules = palloc_array_extended(UChar, total, MCXT_ALLOC_NO_OOM);
 		if (!all_rules)
 		{
 			ucol_close(collator_std_rules);
@@ -375,6 +375,8 @@ make_icu_collator(const char *iculocstr, const char *icurules)
 							iculocstr, icurules, u_errorName(status))));
 		}
 
+		pfree(my_rules);
+		pfree(all_rules);
 		return collator_all_rules;
 	}
 }
@@ -496,11 +498,9 @@ size_t
 strnxfrm_icu(char *dest, size_t destsize, const char *src, ssize_t srclen,
 			 pg_locale_t locale)
 {
-	char		sbuf[TEXTBUFLEN];
-	char	   *buf = sbuf;
-	UChar	   *uchar;
+	UChar		sbuf[TEXTBUFLEN / sizeof(UChar)];
+	UChar	   *uchar = sbuf;
 	int32_t		ulen;
-	size_t		uchar_bsize;
 	Size		result_bsize;
 
 	Assert(locale->provider == COLLPROVIDER_ICU);
@@ -509,12 +509,8 @@ strnxfrm_icu(char *dest, size_t destsize, const char *src, ssize_t srclen,
 
 	ulen = uchar_length(icu_converter, src, srclen);
 
-	uchar_bsize = (ulen + 1) * sizeof(UChar);
-
-	if (uchar_bsize > TEXTBUFLEN)
-		buf = palloc(uchar_bsize);
-
-	uchar = (UChar *) buf;
+	if (ulen >= lengthof(sbuf))
+		uchar = palloc_array(UChar, ulen + 1);
 
 	ulen = uchar_convert(icu_converter, uchar, ulen + 1, src, srclen);
 
@@ -529,8 +525,8 @@ strnxfrm_icu(char *dest, size_t destsize, const char *src, ssize_t srclen,
 	Assert(result_bsize > 0);
 	result_bsize--;
 
-	if (buf != sbuf)
-		pfree(buf);
+	if (uchar != sbuf)
+		pfree(uchar);
 
 	/* if dest is defined, it should be nul-terminated */
 	Assert(result_bsize >= destsize || dest[result_bsize] == '\0');
@@ -607,7 +603,7 @@ icu_to_uchar(UChar **buff_uchar, const char *buff, size_t nbytes)
 
 	len_uchar = uchar_length(icu_converter, buff, nbytes);
 
-	*buff_uchar = palloc((len_uchar + 1) * sizeof(**buff_uchar));
+	*buff_uchar = palloc_array(UChar, len_uchar + 1);
 	len_uchar = uchar_convert(icu_converter,
 							  *buff_uchar, len_uchar + 1, buff, nbytes);
 
@@ -664,7 +660,7 @@ icu_convert_case(ICU_Convert_Func func, pg_locale_t mylocale,
 	int32_t		len_dest;
 
 	len_dest = len_source;		/* try first with same length */
-	*buff_dest = palloc(len_dest * sizeof(**buff_dest));
+	*buff_dest = palloc_array(UChar, len_dest);
 	status = U_ZERO_ERROR;
 	len_dest = func(*buff_dest, len_dest, buff_source, len_source,
 					mylocale->info.icu.locale, &status);
@@ -672,7 +668,7 @@ icu_convert_case(ICU_Convert_Func func, pg_locale_t mylocale,
 	{
 		/* try again with adjusted length */
 		pfree(*buff_dest);
-		*buff_dest = palloc(len_dest * sizeof(**buff_dest));
+		*buff_dest = palloc_array(UChar, len_dest);
 		status = U_ZERO_ERROR;
 		len_dest = func(*buff_dest, len_dest, buff_source, len_source,
 						mylocale->info.icu.locale, &status);
@@ -700,7 +696,7 @@ u_strFoldCase_default(UChar *dest, int32_t destCapacity,
 					  UErrorCode *pErrorCode)
 {
 	uint32		options = U_FOLD_CASE_DEFAULT;
-	char		lang[3];
+	char		lang[ULOC_LANG_CAPACITY];
 	UErrorCode	status;
 
 	/*
@@ -710,8 +706,8 @@ u_strFoldCase_default(UChar *dest, int32_t destCapacity,
 	 * languages to enable the option.
 	 */
 	status = U_ZERO_ERROR;
-	uloc_getLanguage(locale, lang, 3, &status);
-	if (U_SUCCESS(status))
+	uloc_getLanguage(locale, lang, ULOC_LANG_CAPACITY, &status);
+	if (U_SUCCESS(status) && status != U_STRING_NOT_TERMINATED_WARNING)
 	{
 		/*
 		 * The option name is confusing, but it causes u_strFoldCase to use
@@ -739,12 +735,11 @@ static int
 strncoll_icu(const char *arg1, ssize_t len1,
 			 const char *arg2, ssize_t len2, pg_locale_t locale)
 {
-	char		sbuf[TEXTBUFLEN];
-	char	   *buf = sbuf;
+	UChar		sbuf[TEXTBUFLEN / sizeof(UChar)];
+	UChar	   *buf = sbuf;
 	int32_t		ulen1;
 	int32_t		ulen2;
-	size_t		bufsize1;
-	size_t		bufsize2;
+	size_t		bufsize;
 	UChar	   *uchar1,
 			   *uchar2;
 	int			result;
@@ -761,14 +756,13 @@ strncoll_icu(const char *arg1, ssize_t len1,
 	ulen1 = uchar_length(icu_converter, arg1, len1);
 	ulen2 = uchar_length(icu_converter, arg2, len2);
 
-	bufsize1 = (ulen1 + 1) * sizeof(UChar);
-	bufsize2 = (ulen2 + 1) * sizeof(UChar);
+	/* ulen1+1 or ulen2+1 doesn't risk overflow, but summing them might */
+	bufsize = add_size(ulen1 + 1, ulen2 + 1);
+	if (bufsize > lengthof(sbuf))
+		buf = palloc_array(UChar, bufsize);
 
-	if (bufsize1 + bufsize2 > TEXTBUFLEN)
-		buf = palloc(bufsize1 + bufsize2);
-
-	uchar1 = (UChar *) buf;
-	uchar2 = (UChar *) (buf + bufsize1);
+	uchar1 = buf;
+	uchar2 = buf + ulen1 + 1;
 
 	ulen1 = uchar_convert(icu_converter, uchar1, ulen1 + 1, arg1, len1);
 	ulen2 = uchar_convert(icu_converter, uchar2, ulen2 + 1, arg2, len2);
@@ -789,14 +783,12 @@ strnxfrm_prefix_icu(char *dest, size_t destsize,
 					const char *src, ssize_t srclen,
 					pg_locale_t locale)
 {
-	char		sbuf[TEXTBUFLEN];
-	char	   *buf = sbuf;
+	UChar		sbuf[TEXTBUFLEN / sizeof(UChar)];
+	UChar	   *uchar = sbuf;
 	UCharIterator iter;
 	uint32_t	state[2];
 	UErrorCode	status;
-	int32_t		ulen = -1;
-	UChar	   *uchar = NULL;
-	size_t		uchar_bsize;
+	int32_t		ulen;
 	Size		result_bsize;
 
 	Assert(locale->provider == COLLPROVIDER_ICU);
@@ -808,12 +800,8 @@ strnxfrm_prefix_icu(char *dest, size_t destsize,
 
 	ulen = uchar_length(icu_converter, src, srclen);
 
-	uchar_bsize = (ulen + 1) * sizeof(UChar);
-
-	if (uchar_bsize > TEXTBUFLEN)
-		buf = palloc(uchar_bsize);
-
-	uchar = (UChar *) buf;
+	if (ulen >= lengthof(sbuf))
+		uchar = palloc_array(UChar, ulen + 1);
 
 	ulen = uchar_convert(icu_converter, uchar, ulen + 1, src, srclen);
 
@@ -831,6 +819,9 @@ strnxfrm_prefix_icu(char *dest, size_t destsize,
 				(errmsg("sort key generation failed: %s",
 						u_errorName(status))));
 
+	if (uchar != sbuf)
+		pfree(uchar);
+
 	return result_bsize;
 }
 
@@ -865,8 +856,12 @@ init_icu_converter(void)
  * Find length, in UChars, of given string if converted to UChar string.
  *
  * A length of -1 indicates that the input string is NUL-terminated.
+ *
+ * Note: given the assumption that the input string fits in MaxAllocSize,
+ * the result cannot overflow int32_t.  But callers must be careful about
+ * multiplying the result by sizeof(UChar).
  */
-static size_t
+static int32_t
 uchar_length(UConverter *converter, const char *str, int32_t len)
 {
 	UErrorCode	status = U_ZERO_ERROR;
@@ -892,7 +887,6 @@ uchar_convert(UConverter *converter, UChar *dest, int32_t destlen,
 	UErrorCode	status = U_ZERO_ERROR;
 	int32_t		ulen;
 
-	status = U_ZERO_ERROR;
 	ulen = ucnv_toUChars(converter, dest, destlen, src, srclen, &status);
 	if (U_FAILURE(status))
 		ereport(ERROR,
diff --git a/src/backend/utils/adt/pg_locale_libc.c b/src/backend/utils/adt/pg_locale_libc.c
index 199857e22db..31274f069d2 100644
--- a/src/backend/utils/adt/pg_locale_libc.c
+++ b/src/backend/utils/adt/pg_locale_libc.c
@@ -222,11 +222,11 @@ strlower_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen,
 
 	result_size = wchar2char(result, workspace, max_size + 1, locale);
 
-	if (result_size + 1 > destsize)
-		return result_size;
-
-	memcpy(dest, result, result_size);
-	dest[result_size] = '\0';
+	if (destsize >= result_size + 1)
+	{
+		memcpy(dest, result, result_size);
+		dest[result_size] = '\0';
+	}
 
 	pfree(workspace);
 	pfree(result);
@@ -323,11 +323,11 @@ strtitle_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen,
 
 	result_size = wchar2char(result, workspace, max_size + 1, locale);
 
-	if (result_size + 1 > destsize)
-		return result_size;
-
-	memcpy(dest, result, result_size);
-	dest[result_size] = '\0';
+	if (destsize >= result_size + 1)
+	{
+		memcpy(dest, result, result_size);
+		dest[result_size] = '\0';
+	}
 
 	pfree(workspace);
 	pfree(result);
@@ -405,11 +405,11 @@ strupper_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen,
 
 	result_size = wchar2char(result, workspace, max_size + 1, locale);
 
-	if (result_size + 1 > destsize)
-		return result_size;
-
-	memcpy(dest, result, result_size);
-	dest[result_size] = '\0';
+	if (destsize >= result_size + 1)
+	{
+		memcpy(dest, result, result_size);
+		dest[result_size] = '\0';
+	}
 
 	pfree(workspace);
 	pfree(result);
@@ -737,8 +737,9 @@ strncoll_libc_win32_utf8(const char *arg1, ssize_t len1, const char *arg2,
 	char	   *buf = sbuf;
 	char	   *a1p,
 			   *a2p;
-	int			a1len;
-	int			a2len;
+	size_t		a1len,
+				a2len,
+				buflen;
 	int			r;
 	int			result;
 
@@ -750,11 +751,16 @@ strncoll_libc_win32_utf8(const char *arg1, ssize_t len1, const char *arg2,
 	if (len2 == -1)
 		len2 = strlen(arg2);
 
-	a1len = len1 * 2 + 2;
-	a2len = len2 * 2 + 2;
+	/*
+	 * In a 32-bit build, twice the input length can overflow size_t, so we
+	 * must be careful.
+	 */
+	a1len = add_size(add_size(len1, len1), 2);
+	a2len = add_size(add_size(len2, len2), 2);
+	buflen = add_size(a1len, a2len);
 
-	if (a1len + a2len > TEXTBUFLEN)
-		buf = palloc(a1len + a2len);
+	if (buflen > TEXTBUFLEN)
+		buf = palloc(buflen);
 
 	a1p = buf;
 	a2p = buf + a1len;
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 1c12ddbae49..9ac3b18cb16 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -785,7 +785,7 @@ pg_stat_get_backend_activity(PG_FUNCTION_ARGS)
 		activity = beentry->st_activity_raw;
 
 	clipped_activity = pgstat_clip_activity(activity);
-	ret = cstring_to_text(activity);
+	ret = cstring_to_text(clipped_activity);
 	pfree(clipped_activity);
 
 	PG_RETURN_TEXT_P(ret);
@@ -803,8 +803,14 @@ pg_stat_get_backend_wait_event_type(PG_FUNCTION_ARGS)
 		wait_event_type = "<backend information not available>";
 	else if (!HAS_PGSTAT_PERMISSIONS(beentry->st_userid))
 		wait_event_type = "<insufficient privilege>";
-	else if ((proc = BackendPidGetProc(beentry->st_procpid)) != NULL)
-		wait_event_type = pgstat_get_wait_event_type(proc->wait_event_info);
+	else
+	{
+		proc = BackendPidGetProc(beentry->st_procpid);
+		if (!proc)
+			proc = AuxiliaryPidGetProc(beentry->st_procpid);
+		if (proc)
+			wait_event_type = pgstat_get_wait_event_type(proc->wait_event_info);
+	}
 
 	if (!wait_event_type)
 		PG_RETURN_NULL();
@@ -824,8 +830,14 @@ pg_stat_get_backend_wait_event(PG_FUNCTION_ARGS)
 		wait_event = "<backend information not available>";
 	else if (!HAS_PGSTAT_PERMISSIONS(beentry->st_userid))
 		wait_event = "<insufficient privilege>";
-	else if ((proc = BackendPidGetProc(beentry->st_procpid)) != NULL)
-		wait_event = pgstat_get_wait_event(proc->wait_event_info);
+	else
+	{
+		proc = BackendPidGetProc(beentry->st_procpid);
+		if (!proc)
+			proc = AuxiliaryPidGetProc(beentry->st_procpid);
+		if (proc)
+			wait_event = pgstat_get_wait_event(proc->wait_event_info);
+	}
 
 	if (!wait_event)
 		PG_RETURN_NULL();
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 6ed29741229..5b95808a668 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -452,7 +452,7 @@ parse_re_flags(pg_re_flags *flags, text *opts)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 							 errmsg("invalid regular expression option: \"%.*s\"",
-									pg_mblen(opt_p + i), opt_p + i)));
+									pg_mblen_range(opt_p + i, opt_p + opt_len), opt_p + i)));
 					break;
 			}
 		}
@@ -687,12 +687,13 @@ textregexreplace(PG_FUNCTION_ARGS)
 	if (VARSIZE_ANY_EXHDR(opt) > 0)
 	{
 		char	   *opt_p = VARDATA_ANY(opt);
+		const char *end_p = opt_p + VARSIZE_ANY_EXHDR(opt);
 
 		if (*opt_p >= '0' && *opt_p <= '9')
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("invalid regular expression option: \"%.*s\"",
-							pg_mblen(opt_p), opt_p),
+							pg_mblen_range(opt_p, end_p), opt_p),
 					 errhint("If you meant to use regexp_replace() with a start parameter, cast the fourth argument to integer explicitly.")));
 	}
 
@@ -786,15 +787,15 @@ similar_escape_internal(text *pat_text, text *esc_text)
 			   *r;
 	int			plen,
 				elen;
+	const char *pend;
 	bool		afterescape = false;
 	int			nquotes = 0;
-	int			charclass_depth = 0;	/* Nesting level of character classes,
-										 * encompassed by square brackets */
-	int			charclass_start = 0;	/* State of the character class start,
-										 * for carets */
+	int			bracket_depth = 0;	/* square bracket nesting level */
+	int			charclass_pos = 0;	/* position inside a character class */
 
 	p = VARDATA_ANY(pat_text);
 	plen = VARSIZE_ANY_EXHDR(pat_text);
+	pend = p + plen;
 	if (esc_text == NULL)
 	{
 		/* No ESCAPE clause provided; default to backslash as escape */
@@ -850,6 +851,17 @@ similar_escape_internal(text *pat_text, text *esc_text)
 	 * the relevant part separators in the above expansion.  If the result
 	 * of this function is used in a plain regexp match (SIMILAR TO), the
 	 * escape-double-quotes have no effect on the match behavior.
+	 *
+	 * While we don't fully validate character classes (bracket expressions),
+	 * we do need to parse them well enough to know where they end.
+	 * "charclass_pos" tracks where we are in a character class.
+	 * Its value is uninteresting when bracket_depth is 0.
+	 * But when bracket_depth > 0, it will be
+	 *   1: right after the opening '[' (a following '^' will negate
+	 *      the class, while ']' is a literal character)
+	 *   2: right after a '^' after the opening '[' (']' is still a literal
+	 *      character)
+	 *   3 or more: further inside the character class (']' ends the class)
 	 *----------
 	 */
 
@@ -883,7 +895,7 @@ similar_escape_internal(text *pat_text, text *esc_text)
 
 		if (elen > 1)
 		{
-			int			mblen = pg_mblen(p);
+			int			mblen = pg_mblen_range(p, pend);
 
 			if (mblen > 1)
 			{
@@ -921,7 +933,7 @@ similar_escape_internal(text *pat_text, text *esc_text)
 		/* fast path */
 		if (afterescape)
 		{
-			if (pchar == '"' && charclass_depth < 1)	/* escape-double-quote? */
+			if (pchar == '"' && bracket_depth < 1)	/* escape-double-quote? */
 			{
 				/* emit appropriate part separator, per notes above */
 				if (nquotes == 0)
@@ -962,6 +974,12 @@ similar_escape_internal(text *pat_text, text *esc_text)
 				 */
 				*r++ = '\\';
 				*r++ = pchar;
+
+				/*
+				 * If we encounter an escaped character in a character class,
+				 * we are no longer at the beginning.
+				 */
+				charclass_pos = 3;
 			}
 			afterescape = false;
 		}
@@ -970,41 +988,69 @@ similar_escape_internal(text *pat_text, text *esc_text)
 			/* SQL escape character; do not send to output */
 			afterescape = true;
 		}
-		else if (charclass_depth > 0)
+		else if (bracket_depth > 0)
 		{
+			/* inside a character class */
 			if (pchar == '\\')
+			{
+				/*
+				 * If we're here, backslash is not the SQL escape character,
+				 * so treat it as a literal class element, which requires
+				 * doubling it.  (This matches our behavior for backslashes
+				 * outside character classes.)
+				 */
 				*r++ = '\\';
+			}
 			*r++ = pchar;
 
-			/*
-			 * Ignore a closing bracket at the start of a character class.
-			 * Such a bracket is taken literally rather than closing the
-			 * class.  "charclass_start" is 1 right at the beginning of a
-			 * class and 2 after an initial caret.
-			 */
-			if (pchar == ']' && charclass_start > 2)
-				charclass_depth--;
+			/* parse the character class well enough to identify ending ']' */
+			if (pchar == ']' && charclass_pos > 2)
+			{
+				/* found the real end of a bracket pair */
+				bracket_depth--;
+				/* don't reset charclass_pos, this may be an inner bracket */
+			}
 			else if (pchar == '[')
-				charclass_depth++;
+			{
+				/* start of a nested bracket pair */
+				bracket_depth++;
 
-			/*
-			 * If there is a caret right after the opening bracket, it negates
-			 * the character class, but a following closing bracket should
-			 * still be treated as a normal character.  That holds only for
-			 * the first caret, so only the values 1 and 2 mean that closing
-			 * brackets should be taken literally.
-			 */
-			if (pchar == '^')
-				charclass_start++;
+				/*
+				 * We are no longer at the beginning of a character class.
+				 * (The nested bracket pair is a collating element, not a
+				 * character class in its own right.)
+				 */
+				charclass_pos = 3;
+			}
+			else if (pchar == '^')
+			{
+				/*
+				 * A caret right after the opening bracket negates the
+				 * character class.  In that case, the following will
+				 * increment charclass_pos from 1 to 2, so that a following
+				 * ']' is still a literal character and does not end the
+				 * character class.  If we are further inside a character
+				 * class, charclass_pos might get incremented past 3, which is
+				 * fine.
+				 */
+				charclass_pos++;
+			}
 			else
-				charclass_start = 3;	/* definitely past the start */
+			{
+				/*
+				 * Anything else (including a backslash or leading ']') is an
+				 * element of the character class, so we are no longer at the
+				 * beginning of the class.
+				 */
+				charclass_pos = 3;
+			}
 		}
 		else if (pchar == '[')
 		{
 			/* start of a character class */
 			*r++ = pchar;
-			charclass_depth++;
-			charclass_start = 1;
+			bracket_depth = 1;
+			charclass_pos = 1;
 		}
 		else if (pchar == '%')
 		{
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index a40ffa33a84..7ce683ad089 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 9be307b4e9b..ec281271a2e 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -14,7 +14,7 @@
  *	plan --- consider improving this someday.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  *
  * src/backend/utils/adt/ri_triggers.c
diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c
index 422aba4ec5d..3fceb472e48 100644
--- a/src/backend/utils/adt/rowtypes.c
+++ b/src/backend/utils/adt/rowtypes.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -23,6 +23,7 @@
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
+#include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/guc.h"
@@ -2085,8 +2086,15 @@ hash_record_extended(PG_FUNCTION_ARGS)
 Datum
 get_parameter_description(PG_FUNCTION_ARGS)
 {
+	typedef struct
+	{
+		OraParamLink			*extral;
+		const char			*cmdtag;
+		char				*callintoexpr;
+	} outparam_fctx;
+
 	FuncCallContext *funcctx = NULL;
-	OraParamLink *link = NULL;
+	outparam_fctx	*user_fctx;
 	bool	dostmt = false;
 
 	if (SRF_IS_FIRSTCALL())
@@ -2099,7 +2107,7 @@ get_parameter_description(PG_FUNCTION_ARGS)
 		List		*parsetree = NULL;
 		char		**paramnames = NULL;
 		MemoryContext	oldcxt;
-		int		nparams;
+		int		nparams = 0;
 
 		funcctx = SRF_FIRSTCALL_INIT();
 		oldcxt = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
@@ -2122,57 +2130,112 @@ get_parameter_description(PG_FUNCTION_ARGS)
 		PG_END_TRY();
 
 		if (list_length(parsetree) != 1)
+		{
+			backward_oraparam_stack();
+			pop_oraparam_stack(oraparam_top_level - 1, oraparam_cur_level);
+			set_ParseDynSql(false);
 			elog(ERROR, "only one parse tree is supported");
+		}
+
+		user_fctx = (outparam_fctx *) palloc(sizeof(outparam_fctx));
+		user_fctx->extral = NULL;
+		user_fctx->cmdtag = NULL;
+		user_fctx->callintoexpr = NULL;
+
+		user_fctx->cmdtag = CreateCommandName(linitial(parsetree));
 
 		if (nodeTag(linitial(parsetree)) == T_RawStmt &&
 			nodeTag(((RawStmt *)linitial(parsetree))->stmt) == T_DoStmt)
 		{
-			dostmt = true;
-
-			PG_TRY();
+			DoStmt		*stmt = (DoStmt *)(((RawStmt *)linitial(parsetree))->stmt);
+			ListCell	*arg;
+			DefElem		*as_item = NULL;
+			DefElem		*language_item = NULL;
+			char		*language = NULL;
+			char		*source_text = NULL;
+
+			foreach(arg, stmt->args)
 			{
-				if (!plisql_internal_funcs.isload)
+				DefElem    *defel = (DefElem *) lfirst(arg);
+
+				if (strcmp(defel->defname, "as") == 0)
 				{
-					FmgrInfo	flinfo;
-					HeapTuple	languageTuple;
-					Form_pg_language languageStruct;
-					Oid 		laninline;
-
-					/* Look up the language */
-					languageTuple = SearchSysCache1(LANGOID, ObjectIdGetDatum(LANG_PLISQL_OID));
-					if (!HeapTupleIsValid(languageTuple))
-					{
-						ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_OBJECT),
-							 errmsg("language plisql does not exist"),
-							 (extension_file_exists("plisql") ?
-							  errhint("load the plisql by CREATE EXTENSION plisql.") : 0)));
-					}
+					as_item = defel;
+				}
+				else if (strcmp(defel->defname, "language") == 0)
+				{
+					language_item = defel;
+				}
+			}
+			if (language_item)
+				language = strVal(language_item->arg);
+			if (as_item)
+				source_text = strVal(as_item->arg);
 
-					languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
+			dostmt = true;
 
-					laninline = languageStruct->laninline;
-					if (!OidIsValid(laninline))
+			/*
+			 * Currently, only Oracle-compatible anonymous blocks support placeholders
+			 * for OUT parameters. For anonymous blocks in other PL languages, we only
+			 * return a {true, 0} tuple instead of reporting an error,Because interfaces
+			 * of libpq may implicitly call this function, if an error is reported, the
+			 * transaction block state of the display transaction will be destroyed.
+			 */
+			if (language &&
+				strcmp(language, "plisql") == 0 &&
+				stmt->paramsmode == NIL)
+			{
+				PG_TRY();
+				{
+					if (!plisql_internal_funcs.isload)
 					{
-						ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("plisql does not support inline code execution" )));
+						FmgrInfo	flinfo;
+						HeapTuple	languageTuple;
+						Form_pg_language languageStruct;
+						Oid 		laninline;
+
+						/* Look up the language and validate permissions */
+						languageTuple = SearchSysCache1(LANGOID, ObjectIdGetDatum(LANG_PLISQL_OID));
+						if (!HeapTupleIsValid(languageTuple))
+							ereport(ERROR,
+									(errcode(ERRCODE_UNDEFINED_OBJECT),
+									 errmsg("language plisql does not exist"),
+									 (extension_file_exists("plisql") ?
+									  errhint("Use CREATE EXTENSION to load the language into the database.") : 0)));
+
+						languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
+
+						/* get the handler function's OID */
+						laninline = languageStruct->laninline;
+						if (!OidIsValid(laninline))
+							ereport(ERROR,
+									(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+									 errmsg("language \"%s\" does not support inline code execution",
+											NameStr(languageStruct->lanname))));
+
+						ReleaseSysCache(languageTuple);
+						fmgr_info(laninline, &flinfo);
 					}
-
-					ReleaseSysCache(languageTuple);
-					fmgr_info(laninline, &flinfo);
+					//plisql_internal_funcs.compile_inline_internal(sql);
+					plisql_internal_funcs.compile_inline_internal(source_text);
+					nparams = calculate_oraparamname(&paramnames);
 				}
-				plisql_internal_funcs.compile_inline_internal(sql);
-				nparams = calculate_oraparamname(&paramnames);
-			}
-			PG_CATCH();
-			{
-				backward_oraparam_stack();
-				pop_oraparam_stack(oraparam_top_level - 1, oraparam_cur_level);
-				set_ParseDynSql(false);
-				PG_RE_THROW();
+				PG_CATCH();
+				{
+					backward_oraparam_stack();
+					pop_oraparam_stack(oraparam_top_level - 1, oraparam_cur_level);
+					set_ParseDynSql(false);
+					PG_RE_THROW();
+				}
+				PG_END_TRY();
 			}
-			PG_END_TRY();
+		}
+
+		else if (nodeTag(linitial(parsetree)) == T_RawStmt &&
+				nodeTag(((RawStmt *)linitial(parsetree))->stmt) == T_CallStmt)
+		{
+			CallStmt	*stmt = (CallStmt *)(((RawStmt *)linitial(parsetree))->stmt);
+			user_fctx->callintoexpr = stmt->callinto ? pstrdup(stmt->callinto) : NULL;
 		}
 
 		backward_oraparam_stack();
@@ -2187,52 +2250,55 @@ get_parameter_description(PG_FUNCTION_ARGS)
 		/*
 		 * build tupdesc for result tuples 
 		 */
-		tupdesc = CreateTemplateTupleDesc(2);
+		tupdesc = CreateTemplateTupleDesc(3);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "name",
 					   TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 2, "position",
 					   INT4OID, -1, 0);
+		TupleDescInitEntry(tupdesc, (AttrNumber) 3, "hint",
+					   TEXTOID, -1, 0);
 
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
-		link = (OraParamLink *) palloc(sizeof(OraParamLink));
-		link->paramnames = paramnames;
-		link->total_params = nparams;
-		link->next_params = 0;
+		user_fctx->extral = (OraParamLink*) palloc(sizeof(OraParamLink));
+		user_fctx->extral->next_params = 0;
+		user_fctx->extral->total_params = nparams;
+		user_fctx->extral->paramnames = paramnames;
 
 		MemoryContextSwitchTo(oldcxt);
-		funcctx->user_fctx  = (void *) link;
+		funcctx->user_fctx  = (void *) user_fctx;
 	}
 
 	funcctx = SRF_PERCALL_SETUP();
-	link = (OraParamLink *) funcctx->user_fctx;
+	user_fctx = (outparam_fctx *) funcctx->user_fctx;
 
-	if (link->next_params <= link->total_params)
+	if (user_fctx->extral->next_params <= user_fctx->extral->total_params)
 	{
-		bool		nulls[2];
 		HeapTuple	tuple;
 		Datum		result;
-		Datum		values[2];
+		Datum		values[3];
+		bool		nulls[3];
 
-		if (link->next_params == 0)
+		MemSet(nulls, 0, sizeof(nulls));
+
+		if (user_fctx->extral->next_params == 0)
 		{
-			if (dostmt)
-				values[0] = CStringGetTextDatum("true");
+			values[0] = CStringGetTextDatum(user_fctx->cmdtag);
+			values[1] = Int32GetDatum(user_fctx->extral->next_params);
+			if (user_fctx->callintoexpr)
+				values[2] = CStringGetTextDatum(user_fctx->callintoexpr);
 			else
-				values[0] = CStringGetTextDatum("false");
-
-			values[1] = Int32GetDatum(link->next_params);
+				nulls[2] = true;
 		}
 		else
 		{
-			values[0] = CStringGetTextDatum(link->paramnames[link->next_params]);
-			values[1] = Int32GetDatum(link->next_params);
+			values[0] = CStringGetTextDatum(user_fctx->extral->paramnames[user_fctx->extral->next_params]);
+			values[1] = Int32GetDatum(user_fctx->extral->next_params);
+			nulls[2] = true;
 		}
 
-		MemSet(nulls, 0, sizeof(nulls));
-
 		tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
 		result = HeapTupleGetDatum(tuple);
-		link->next_params++;
+		user_fctx->extral->next_params++;
 
 		SRF_RETURN_NEXT(funcctx, result);
 	}
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index e00892b2453..b73d6b48c3b 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -546,7 +546,7 @@ static text *string_to_text(char *str);
 static char *flatten_reloptions(Oid relid);
 static void get_reloptions(StringInfo buf, Datum reloptions);
 static const char *standard_quote_identifier(const char *ident);
-Datum pg_get_functiondef_internal(PG_FUNCTION_ARGS);
+Datum		pg_get_functiondef_internal(PG_FUNCTION_ARGS);
 static void get_json_path_spec(Node *path_spec, deparse_context *context,
 							   bool showimplicit);
 static void get_json_table_columns(TableFunc *tf, JsonTablePathScan *scan,
@@ -561,12 +561,12 @@ static void get_json_table_nested_columns(TableFunc *tf, JsonTablePlan *plan,
 
 #define NUM_RETURN_COLUMNS		9
 static void pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
-								TupleDesc tupdesc,
-								char *typename,
-								int position,
-								Oid funcOid,
-								Datum values[9],
-								bool nulls[9]);
+															   TupleDesc tupdesc,
+															   char *typename,
+															   int position,
+															   Oid funcOid,
+															   Datum values[9],
+															   bool nulls[9]);
 
 
 /* ----------
@@ -2975,8 +2975,8 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
  * function body.  To wit: the function body starts on a line that begins with
  * "AS ", "BEGIN ", or "RETURN ", and no preceding line will look like that.
  *
- * we rename pg_get_functiondef to pg_get_functiondef_internal for warp a
- * new pg_get_functiondef function.
+ * We rename pg_get_functiondef to pg_get_functiondef_internal to wrap
+ * a new pg_get_functiondef function.
  */
 Datum
 pg_get_functiondef_internal(PG_FUNCTION_ARGS)
@@ -3227,7 +3227,7 @@ pg_get_functiondef_internal(PG_FUNCTION_ARGS)
 /*
  * ivy_get_plisql_functiondef
  *		Returns the complete "CREATE OR REPLACE FUNCTION ..." statement for
- *		the specified plisql function.
+ *		the specified PL/iSQL function.
  *
  * Note: if you change the output format of this function, be careful not
  * to break psql's rules (in \ef and \sf) for identifying the start of the
@@ -3237,18 +3237,18 @@ pg_get_functiondef_internal(PG_FUNCTION_ARGS)
 Datum
 ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 {
-	Oid 		funcid = PG_GETARG_OID(0);
+	Oid			funcid = PG_GETARG_OID(0);
 	StringInfoData buf;
-	HeapTuple proctup;
+	HeapTuple	proctup;
 	Form_pg_proc proc;
 	bool		isfunction;
-	Datum 	tmp;
+	Datum		tmp;
 	bool		isnull;
 	const char *prosrc;
 	const char *name;
 	const char *nsp;
 	float4		procost;
-	int 		oldlen;
+	int			oldlen;
 
 	initStringInfo(&buf);
 
@@ -3261,7 +3261,8 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 	name = NameStr(proc->proname);
 
 	/*
-	 * sanity check, only functions created by plisql language is ok.
+	 * Sanity check: only functions created with the PL/iSQL language are
+	 * allowed.
 	 */
 	if (strcmp("plisql", get_language_name(proc->prolang, false)))
 		ereport(ERROR,
@@ -3286,7 +3287,7 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 	(void) print_function_arguments(&buf, proctup, false, true);
 	appendStringInfoString(&buf, ")\n");
 
-	/* Oracle uses the RETURN keyword on the return sytax of function */
+/* Oracle uses the RETURN keyword in function return syntax */
 	if (isfunction)
 	{
 		appendStringInfoString(&buf, " RETURN ");
@@ -3300,14 +3301,16 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 	 * need to be parsed later.
 	 */
 	if (proc->provolatile == PROVOLATILE_IMMUTABLE)
-		appendStringInfoString(&buf, " DETERMINISTIC"); /* IMMUTABLE => DETERMINISTIC */
+		appendStringInfoString(&buf, " DETERMINISTIC"); /* IMMUTABLE =>
+														 * DETERMINISTIC */
 
 	if (proc->proparallel == PROPARALLEL_SAFE)
-		appendStringInfoString(&buf, " PARALLEL_ENABLE"); /* PARALLEL SAFE => PARALLEL_ENABLE */
+		appendStringInfoString(&buf, " PARALLEL_ENABLE");	/* PARALLEL SAFE =>
+															 * PARALLEL_ENABLE */
 
 	/*
-	 * SECURITY DEFINER => AUTHID DEFINER
-	 * SECURITY INVOKER => AUTHID CURRENT_USER
+	 * SECURITY DEFINER => AUTHID DEFINER SECURITY INVOKER => AUTHID
+	 * CURRENT_USER
 	 */
 	if (proc->prosecdef)
 		appendStringInfoString(&buf, " AUTHID DEFINER");
@@ -3318,10 +3321,11 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 	print_function_trftypes(&buf, proctup);
 
 	/*
-	 * No need LANGUAGE clause for plisql, we will automatically determine the language
-	 * in ora_gram.y, this make the function definition looks more like Oracle.
+	 * No LANGUAGE clause is required for PL/iSQL; the language is determined
+	 * automatically in ora_gram.y. This makes the function definition look
+	 * more like Oracle.
 	 */
-	//appendStringInfo(&buf, " LANGUAGE %s\n", "plisql");
+	/* appendStringInfo(&buf, " LANGUAGE %s\n", "plisql"); */
 
 	/* Emit some miscellaneous options on one line */
 	oldlen = buf.len;
@@ -3372,7 +3376,7 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 
 	if (proc->prosupport)
 	{
-		Oid 		argtypes[1];
+		Oid			argtypes[1];
 
 		/*
 		 * We should qualify the support function's name if it wouldn't be
@@ -3393,7 +3397,7 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 	if (!isnull)
 	{
 		ArrayType  *a = DatumGetArrayTypeP(tmp);
-		int 		i;
+		int			i;
 
 		Assert(ARR_ELEMTYPE(a) == TEXTOID);
 		Assert(ARR_NDIM(a) == 1);
@@ -3401,18 +3405,18 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 
 		for (i = 1; i <= ARR_DIMS(a)[0]; i++)
 		{
-			Datum 	d;
+			Datum		d;
 
 			d = array_ref(a, 1, &i,
-							-1 /* varlenarray */ ,
-							-1 /* TEXT's typlen */ ,
-							false /* TEXT's typbyval */ ,
-							TYPALIGN_INT /* TEXT's typalign */ ,
-							&isnull);
+						  -1 /* varlenarray */ ,
+						  -1 /* TEXT's typlen */ ,
+						  false /* TEXT's typbyval */ ,
+						  TYPALIGN_INT /* TEXT's typalign */ ,
+						  &isnull);
 			if (!isnull)
 			{
-				char		 *configitem = TextDatumGetCString(d);
-				char		 *pos;
+				char	   *configitem = TextDatumGetCString(d);
+				char	   *pos;
 
 				pos = strchr(configitem, '=');
 				if (pos == NULL)
@@ -3440,8 +3444,8 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 				 */
 				if (GetConfigOptionFlags(configitem, true) & GUC_LIST_QUOTE)
 				{
-					List		 *namelist;
-					ListCell	 *lc;
+					List	   *namelist;
+					ListCell   *lc;
 
 					/* Parse string into list of identifiers */
 					if (!SplitGUCList(pos, ',', &namelist))
@@ -3451,7 +3455,7 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 					}
 					foreach(lc, namelist)
 					{
-						char		 *curname = (char *) lfirst(lc);
+						char	   *curname = (char *) lfirst(lc);
 
 						simple_quote_literal(&buf, curname);
 						if (lnext(namelist, lc))
@@ -3496,7 +3500,7 @@ ivy_get_plisql_functiondef(PG_FUNCTION_ARGS)
 Datum
 pg_get_package_head(PG_FUNCTION_ARGS)
 {
-	Oid 		pkgid = PG_GETARG_OID(0);
+	Oid			pkgid = PG_GETARG_OID(0);
 	StringInfoData buf;
 	HeapTuple	pkgtup;
 	Form_pg_package pkg_form;
@@ -3515,71 +3519,71 @@ pg_get_package_head(PG_FUNCTION_ARGS)
 	nsp = get_namespace_name(pkg_form->pkgnamespace);
 
 	appendStringInfo(&buf, "CREATE %s PACKAGE %s",
-					pkg_form->editable ? "EDITIONABLE" : "NONEDITIONABLE",
-					quote_qualified_identifier(nsp, name));
+					 pkg_form->editable ? "EDITIONABLE" : "NONEDITIONABLE",
+					 quote_qualified_identifier(nsp, name));
 
 	appendStringInfo(&buf, " AUTHID %s",
-					pkg_form->define_invok ? "DEFINER" : "CURRENT_USER");
+					 pkg_form->define_invok ? "DEFINER" : "CURRENT_USER");
 
 	if (pkg_form->use_collation)
 		appendStringInfo(&buf, " DEFAULT COLLATION %s",
-					"USING_NLS_COMP");
+						 "USING_NLS_COMP");
 
 	accesssource = SysCacheGetAttr(PKGOID, pkgtup,
-										 Anum_pg_package_accesssource,
-										 &isnull);
+								   Anum_pg_package_accesssource,
+								   &isnull);
 	if (!isnull)
 	{
-			char	   *str;
-			List	   *sourcelist;
-			ListCell	*lc;
-			char		*access_tag;
-
-			appendStringInfo(&buf, " ACCESSIBLE BY (");
+		char	   *str;
+		List	   *sourcelist;
+		ListCell   *lc;
+		char	   *access_tag;
 
-			str = TextDatumGetCString(accesssource);
-			sourcelist = (List *) stringToNode(str);
+		appendStringInfo(&buf, " ACCESSIBLE BY (");
 
-			foreach (lc, sourcelist)
-			{
-				AccessorItem *access = (AccessorItem *) lfirst(lc);
-				char *unitname;
+		str = TextDatumGetCString(accesssource);
+		sourcelist = (List *) stringToNode(str);
 
-				Assert(access->type == T_AccessorItem);
+		foreach(lc, sourcelist)
+		{
+			AccessorItem *access = (AccessorItem *) lfirst(lc);
+			char	   *unitname;
 
-				switch (access->unitkind)
-				{
-					case ACCESSOR_FUNCTION:
-						access_tag = "FUNCTION";
-						break;
-					case ACCESSOR_PROCEDURE:
-						access_tag = "PROCEDURE";
-						break;
-					case ACCESSOR_PACKAGE:
-						access_tag = "PACKAGE";
-						break;
-					case ACCESSOR_TRIGGER:
-						access_tag = "TRIGGER";
-						break;
-					case ACCESSOR_TYPE:
-						access_tag = "TYPE";
-						break;
-					case ACCESSOR_UNKNOW:
-						access_tag = " ";
-						break;
-					default:
-						elog(ERROR, "unknown proper type %u", access->unitkind);
-						break;
-				}
+			Assert(access->type == T_AccessorItem);
 
-				unitname = NameListToString(access->unitname);
-				appendStringInfo(&buf, "%s %s,",
-									access_tag,
-									unitname);
-				pfree(unitname);
+			switch (access->unitkind)
+			{
+				case ACCESSOR_FUNCTION:
+					access_tag = "FUNCTION";
+					break;
+				case ACCESSOR_PROCEDURE:
+					access_tag = "PROCEDURE";
+					break;
+				case ACCESSOR_PACKAGE:
+					access_tag = "PACKAGE";
+					break;
+				case ACCESSOR_TRIGGER:
+					access_tag = "TRIGGER";
+					break;
+				case ACCESSOR_TYPE:
+					access_tag = "TYPE";
+					break;
+				case ACCESSOR_UNKNOW:
+					access_tag = " ";
+					break;
+				default:
+					elog(ERROR, "unknown proper type %u", access->unitkind);
+					break;
 			}
-			/* replace last ',' to )' */
-			buf.data[buf.len] = ')';
+
+			unitname = NameListToString(access->unitname);
+			appendStringInfo(&buf, "%s %s,",
+							 access_tag,
+							 unitname);
+			pfree(unitname);
+		}
+		/* replace last ',' to )' */
+		buf.data[buf.len] = ')';
 	}
 
 	ReleaseSysCache(pkgtup);
@@ -3680,7 +3684,7 @@ print_function_rettype(StringInfo buf, HeapTuple proctup)
 	Form_pg_proc proc = (Form_pg_proc) GETSTRUCT(proctup);
 	int			ntabargs = 0;
 	StringInfoData rbuf;
-	char		*rettypename;
+	char	   *rettypename;
 
 	initStringInfo(&rbuf);
 
@@ -3702,13 +3706,14 @@ print_function_rettype(StringInfo buf, HeapTuple proctup)
 		/* Not a table function, so do the normal thing */
 		if (proc->proretset)
 			appendStringInfoString(&rbuf, "SETOF ");
+
 		/*
 		 * if type comes from a package, we use rettypename
 		 */
 		if (rettypename != NULL)
 		{
-			TypeName *t = (TypeName *) stringToNode(rettypename);
-			char	*tname = TypeNameToQuoteString(t);
+			TypeName   *t = (TypeName *) stringToNode(rettypename);
+			char	   *tname = TypeNameToQuoteString(t);
 
 			appendStringInfoString(&rbuf, tname);
 			pfree(tname);
@@ -3745,7 +3750,7 @@ print_function_arguments(StringInfo buf, HeapTuple proctup,
 	List	   *argdefaults = NIL;
 	ListCell   *nextargdefault = NULL;
 	int			i;
-	char		**argtypenames;
+	char	  **argtypenames;
 
 	numargs = get_func_arg_info(proctup,
 								&argtypes, &argnames, &argmodes);
@@ -3854,14 +3859,15 @@ print_function_arguments(StringInfo buf, HeapTuple proctup,
 		appendStringInfoString(buf, modename);
 		if (argname && argname[0])
 			appendStringInfo(buf, "%s ", quote_identifier(argname));
+
 		/*
-		 * construct argtypname, if it comes from a
-		 * package, we use argtypenames
+		 * construct argtypname, if it comes from a package, we use
+		 * argtypenames
 		 */
 		if (argtypenames != NULL && strcmp(argtypenames[i], "") != 0)
 		{
-			TypeName	*t = (TypeName *) stringToNode(argtypenames[i]);
-			char		*tname = TypeNameToQuoteString(t);
+			TypeName   *t = (TypeName *) stringToNode(argtypenames[i]);
+			char	   *tname = TypeNameToQuoteString(t);
 
 			appendStringInfoString(buf, tname);
 			pfree(t);
@@ -3879,7 +3885,7 @@ print_function_arguments(StringInfo buf, HeapTuple proctup,
 
 			if (!IsA(expr, NonDefValNode))
 				appendStringInfo(buf, " DEFAULT %s",
-					 deparse_expression(expr, NIL, false, false));
+								 deparse_expression(expr, NIL, false, false));
 		}
 		argsprinted++;
 
@@ -10553,11 +10559,11 @@ get_rule_expr(Node *node, deparse_context *context,
 						break;
 					case IS_DOCUMENT:
 						break;
-					/* Begin - ReqID:SRS-SQL-XML */
+						/* Begin - ReqID:SRS-SQL-XML */
 					case IS_UPDATEXML:
 						appendStringInfoString(buf, "UPDATEXML(");
 						break;
-					/* End - ReqID:SRS-SQL-XML */
+						/* End - ReqID:SRS-SQL-XML */
 				}
 				if (xexpr->op == IS_XMLPARSE || xexpr->op == IS_XMLSERIALIZE)
 				{
@@ -11317,14 +11323,14 @@ get_func_expr(FuncExpr *expr, deparse_context *context,
 
 	if (FUNC_EXPR_FROM_PG_PROC(expr->function_from))
 		appendStringInfo(buf, "%s(",
-					 generate_function_name(funcoid, nargs,
-											argnames, argtypes,
-											expr->funcvariadic,
-											&use_variadic,
-											context->inGroupBy));
+						 generate_function_name(funcoid, nargs,
+												argnames, argtypes,
+												expr->funcvariadic,
+												&use_variadic,
+												context->inGroupBy));
 	else
 		appendStringInfo(buf, "%s(",
-					 get_internal_function_name(expr));
+						 get_internal_function_name(expr));
 
 	nargs = 0;
 	foreach(l, expr->args)
@@ -11968,11 +11974,11 @@ get_const_expr(Const *constval, deparse_context *context, int showtype)
 					  &typoutput, &typIsVarlena);
 
 	/*
-	 * Compatible oracle , pass typmod to output function
+	 * Oracle compatibility: pass typmod to the output function
 	 */
 	if (ORA_PARSER == compatible_db &&
 		(constval->consttype == YMINTERVALOID ||
-		constval->consttype == DSINTERVALOID))
+		 constval->consttype == DSINTERVALOID))
 	{
 		extval = OidOutputFunctionCallWithTypmod(typoutput, constval->constvalue, constval->consttypmod);
 	}
@@ -13517,13 +13523,16 @@ printSubscripts(SubscriptingRef *sbsref, deparse_context *context)
 const char *
 quote_identifier(const char *ident)
 {
-	char		 *result;
+	char	   *result;
 
-	/* Slove the issue of using the same global variable in static lib and dynamic lib */
+	/*
+	 * Slove the issue of using the same global variable in static lib and
+	 * dynamic lib
+	 */
 	if (quote_identifier_hook && compatible_db != PG_PARSER)
-		result = (char *)(*quote_identifier_hook)(ident);
+		result = (char *) (*quote_identifier_hook) (ident);
 	else
-		result = (char *)standard_quote_identifier(ident);
+		result = (char *) standard_quote_identifier(ident);
 
 	return result;
 }
@@ -14191,7 +14200,7 @@ get_range_partbound_string(List *bound_datums)
 	foreach(cell, bound_datums)
 	{
 		PartitionRangeDatum *datum =
-		lfirst_node(PartitionRangeDatum, cell);
+			lfirst_node(PartitionRangeDatum, cell);
 
 		appendStringInfoString(buf, sep);
 		if (datum->kind == PARTITION_RANGE_DATUM_MINVALUE)
@@ -14225,9 +14234,9 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 	Tuplestorestate *tupstore;
 	MemoryContext per_query_ctx;
 	MemoryContext oldcontext;
-	Relation proc_rel;
+	Relation	proc_rel;
 	SysScanDesc proc_sd;
-	HeapTuple proc_tuple;
+	HeapTuple	proc_tuple;
 
 	/* check to see if caller accepts a tuplestore */
 	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
@@ -14268,29 +14277,30 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 					   TEXTOID, -1, 0);
 
 	/*
-	 * put all the tuples into a tuplestore by one scan of the hashtable.
-	 * this way we can avoid the possible issue of the hashtable changing between calls.
+	 * put all the tuples into a tuplestore by one scan of the hashtable. this
+	 * way we can avoid the possible issue of the hashtable changing between
+	 * calls.
 	 */
 	tupstore =
 		tuplestore_begin_heap(rsinfo->allowedModes & SFRM_Materialize_Random,
-						  false, work_mem);
+							  false, work_mem);
 
 	MemoryContextSwitchTo(oldcontext);
 
 	proc_rel = table_open(ProcedureRelationId, AccessShareLock);
 
 	proc_sd = systable_beginscan(proc_rel, InvalidOid, false,
-					NULL, 0, NULL);
+								 NULL, 0, NULL);
 
 	while ((proc_tuple = systable_getnext(proc_sd)) != NULL)
 	{
 		Form_pg_proc form_proc = (Form_pg_proc) GETSTRUCT(proc_tuple);
-		int	numargs = form_proc->pronargs;
-		char	**p_argtypeNames = NULL;
-		char 	*rettypename = NULL;
-		int	nth_arg;
-		Datum	values[NUM_RETURN_COLUMNS];
-		bool	nulls[NUM_RETURN_COLUMNS];
+		int			numargs = form_proc->pronargs;
+		char	  **p_argtypeNames = NULL;
+		char	   *rettypename = NULL;
+		int			nth_arg;
+		Datum		values[NUM_RETURN_COLUMNS];
+		bool		nulls[NUM_RETURN_COLUMNS];
 
 		get_func_typename_info(proc_tuple, &p_argtypeNames, &rettypename);
 
@@ -14301,10 +14311,10 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 
 		if (rettypename != NULL)
 			pg_get_function_arg_reference_typerowtype_internal(&tupstore, tupdesc,
-										rettypename, 0, 
-										form_proc->oid, values, nulls);
+															   rettypename, 0,
+															   form_proc->oid, values, nulls);
 
-		if (p_argtypeNames!= NULL)
+		if (p_argtypeNames != NULL)
 		{
 			for (nth_arg = 0; nth_arg < numargs; nth_arg++)
 			{
@@ -14312,8 +14322,8 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 
 				if (strcmp(p_argtypeNames[nth_arg], "") != 0)
 					pg_get_function_arg_reference_typerowtype_internal(&tupstore, tupdesc,
-												p_argtypeNames[nth_arg], nth_arg + 1, 
-												form_proc->oid, values, nulls);
+																	   p_argtypeNames[nth_arg], nth_arg + 1,
+																	   form_proc->oid, values, nulls);
 			}
 
 			pfree(p_argtypeNames);
@@ -14323,7 +14333,7 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 	systable_endscan(proc_sd);
 
 	/* clean up and return the generated tuplestore */
-	//tuplestore_donestoring(tupstore);
+	/* tuplestore_donestoring(tupstore); */
 	table_close(proc_rel, NoLock);
 
 	rsinfo->returnMode = SFRM_Materialize;
@@ -14335,29 +14345,29 @@ pg_get_function_arg_reference_typerowtype(PG_FUNCTION_ARGS)
 
 static void
 pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
-								TupleDesc tupdesc,
-								char *typename,
-								int position,
-								Oid funcOid,
-								Datum values[NUM_RETURN_COLUMNS],
-								bool nulls[NUM_RETURN_COLUMNS])
-{
-	TypeName 	*typeName;
-	char		*schema_name = NULL;
-	char		*relname = NULL;
+												   TupleDesc tupdesc,
+												   char *typename,
+												   int position,
+												   Oid funcOid,
+												   Datum values[NUM_RETURN_COLUMNS],
+												   bool nulls[NUM_RETURN_COLUMNS])
+{
+	TypeName   *typeName;
+	char	   *schema_name = NULL;
+	char	   *relname = NULL;
 	char		relkind;
-	char		*type_name = NULL;
-	char		*type_subname = NULL;
-	char		*type_object_name = NULL;
-	Oid 		relid = InvalidOid;
-	int 		data_length;
-	int 		data_precision;
-	int 		data_scale;
+	char	   *type_name = NULL;
+	char	   *type_subname = NULL;
+	char	   *type_object_name = NULL;
+	Oid			relid = InvalidOid;
+	int			data_length;
+	int			data_precision;
+	int			data_scale;
 	bool		is_rowtype = false;
 	bool		is_valid_type = false;
-	Oid 		fieldTypeId;
+	Oid			fieldTypeId;
 	int32		fieldTypMod;
-	Oid 		fieldCollation;
+	Oid			fieldCollation;
 
 	typeName = stringToNode(typename);
 	if (!typeName->pct_type && !typeName->row_type)
@@ -14377,7 +14387,7 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 	}
 	else if (typeName->pct_type)
 	{
-		PkgType 	*pkgtype;
+		PkgType    *pkgtype;
 
 		pkgtype = LookupPkgTypeByTypename(typeName->names, false);
 		if (pkgtype != NULL)
@@ -14398,9 +14408,8 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 		}
 		else
 		{
-			RangeVar   	*rel = makeRangeVar(NULL, NULL, typeName->location);
-			char	   	*field = NULL;
-			Oid 		relid;
+			RangeVar   *rel = makeRangeVar(NULL, NULL, typeName->location);
+			char	   *field = NULL;
 			AttrNumber	attnum;
 
 			/* deconstruct the name list */
@@ -14411,7 +14420,7 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 							(errcode(ERRCODE_SYNTAX_ERROR),
 							 errmsg("improper %%TYPE reference (too few dotted names): %s",
 									NameListToString(typeName->names)),
-							 		parser_errposition(NULL, typeName->location)));
+							 parser_errposition(NULL, typeName->location)));
 					break;
 				case 2:
 					rel->relname = strVal(linitial(typeName->names));
@@ -14433,7 +14442,7 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 							(errcode(ERRCODE_SYNTAX_ERROR),
 							 errmsg("improper %%TYPE reference (too many dotted names): %s",
 									NameListToString(typeName->names)),
-							 		parser_errposition(NULL, typeName->location)));
+							 parser_errposition(NULL, typeName->location)));
 					break;
 			}
 
@@ -14443,7 +14452,7 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 			if (attnum != InvalidAttrNumber)
 			{
 				get_atttypetypmodcoll(relid, attnum,
-							  &fieldTypeId, &fieldTypMod, &fieldCollation);
+									  &fieldTypeId, &fieldTypMod, &fieldCollation);
 
 				/* this construct should never have an array indicator */
 				Assert(typeName->arrayBounds == NIL);
@@ -14495,8 +14504,8 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 		values[4] = CStringGetTextDatum("_NULL_");
 
 		if (fieldTypeId == ORACHARCHAROID ||
-			fieldTypeId == ORACHARBYTEOID  ||
-			fieldTypeId == ORAVARCHARCHAROID  ||
+			fieldTypeId == ORACHARBYTEOID ||
+			fieldTypeId == ORAVARCHARCHAROID ||
 			fieldTypeId == ORAVARCHARBYTEOID ||
 			fieldTypeId == BPCHAROID ||
 			fieldTypeId == VARCHAROID)
@@ -14508,7 +14517,7 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 			values[8] = CStringGetTextDatum(DatumGetCString(DirectFunctionCall1(regtypeout, fieldTypeId)));
 		}
 		else if (fieldTypeId == NUMERICOID ||
-				fieldTypeId == NUMBEROID)
+				 fieldTypeId == NUMBEROID)
 		{
 			/* precision (ie, max number of digits) is in upper bits of typmod */
 			data_precision = Int32GetDatum(((fieldTypMod - VARHDRSZ) >> 16) & 0xffff);
@@ -14536,4 +14545,3 @@ pg_get_function_arg_reference_typerowtype_internal(Tuplestorestate **tupstore,
 
 	pfree(typeName);
 }
-
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index a96b1b9c0bc..c9ff71844e7 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -191,6 +191,9 @@ static char *convert_string_datum(Datum value, Oid typid, Oid collid,
 								  bool *failure);
 static double convert_timevalue_to_scalar(Datum value, Oid typid,
 										  bool *failure);
+static Node *strip_all_phvs_deep(PlannerInfo *root, Node *node);
+static bool contain_placeholder_walker(Node *node, void *context);
+static Node *strip_all_phvs_mutator(Node *node, void *context);
 static void examine_simple_variable(PlannerInfo *root, Var *var,
 									VariableStatData *vardata);
 static void examine_indexcol_variable(PlannerInfo *root, IndexOptInfo *index,
@@ -2169,6 +2172,18 @@ estimate_array_length(PlannerInfo *root, Node *arrayexpr)
 		AttStatsSlot sslot;
 		double		nelem = 0;
 
+		/*
+		 * Skip calling examine_variable for Var with varno 0, which has no
+		 * valid relation entry and would error in find_base_rel.  Such a Var
+		 * can appear when a nested set operation's output type doesn't match
+		 * the parent's expected type, because recurse_set_operations builds a
+		 * projection target list using generate_setop_tlist with varno 0, and
+		 * if the required type coercion involves an ArrayCoerceExpr, we can
+		 * be called on that Var.
+		 */
+		if (IsA(arrayexpr, Var) && ((Var *) arrayexpr)->varno == 0)
+			return 10;			/* default guess, should match scalararraysel */
+
 		examine_variable(root, arrayexpr, 0, &vardata);
 		if (HeapTupleIsValid(vardata.statsTuple))
 		{
@@ -5261,8 +5276,8 @@ ReleaseDummy(HeapTuple tuple)
  *	varRelid: see specs for restriction selectivity functions
  *
  * Outputs: *vardata is filled as follows:
- *	var: the input expression (with any binary relabeling stripped, if
- *		it is or contains a variable; but otherwise the type is preserved)
+ *	var: the input expression (with any phvs or binary relabeling stripped,
+ *		if it is or contains a variable; but otherwise unchanged)
  *	rel: RelOptInfo for relation containing variable; NULL if expression
  *		contains no Vars (NOTE this could point to a RelOptInfo of a
  *		subquery, not one in the current query).
@@ -5279,8 +5294,8 @@ ReleaseDummy(HeapTuple tuple)
  *		unique for 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
+ *	acl_ok: true if current user has permission to read all table rows from
+ *		the column(s) underlying the pg_statistic entry.  This is consulted by
  *		statistic_proc_security_check().
  *
  * Caller is responsible for doing ReleaseVariableStats() before exiting.
@@ -5300,22 +5315,31 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 	/* Save the exposed type of the expression */
 	vardata->vartype = exprType(node);
 
-	/* Look inside any binary-compatible relabeling */
+	/*
+	 * PlaceHolderVars are transparent for the purpose of statistics lookup;
+	 * they do not alter the value distribution of the underlying expression.
+	 * However, they can obscure the structure, preventing us from recognizing
+	 * matches to base columns, index expressions, or extended statistics.  So
+	 * strip them out first.
+	 */
+	basenode = strip_all_phvs_deep(root, node);
 
-	if (IsA(node, RelabelType))
-		basenode = (Node *) ((RelabelType *) node)->arg;
-	else
-		basenode = node;
+	/*
+	 * Look inside any binary-compatible relabeling.  We need to handle nested
+	 * RelabelType nodes here, because the prior stripping of PlaceHolderVars
+	 * may have brought separate RelabelTypes into adjacency.
+	 */
+	while (IsA(basenode, RelabelType))
+		basenode = (Node *) ((RelabelType *) basenode)->arg;
 
 	/* Fast path for a simple Var */
-
 	if (IsA(basenode, Var) &&
 		(varRelid == 0 || varRelid == ((Var *) basenode)->varno))
 	{
 		Var		   *var = (Var *) basenode;
 
 		/* Set up result fields other than the stats tuple */
-		vardata->var = basenode;	/* return Var without relabeling */
+		vardata->var = basenode;	/* return Var without phvs or relabeling */
 		vardata->rel = find_base_rel(root, var->varno);
 		vardata->atttype = var->vartype;
 		vardata->atttypmod = var->vartypmod;
@@ -5352,7 +5376,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 			{
 				onerel = find_base_rel(root, relid);
 				vardata->rel = onerel;
-				node = basenode;	/* strip any relabeling */
+				node = basenode;	/* strip any phvs or relabeling */
 			}
 			/* else treat it as a constant */
 		}
@@ -5363,13 +5387,13 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 			{
 				/* treat it as a variable of a join relation */
 				vardata->rel = find_join_rel(root, varnos);
-				node = basenode;	/* strip any relabeling */
+				node = basenode;	/* strip any phvs or relabeling */
 			}
 			else if (bms_is_member(varRelid, varnos))
 			{
 				/* ignore the vars belonging to other relations */
 				vardata->rel = find_base_rel(root, varRelid);
-				node = basenode;	/* strip any relabeling */
+				node = basenode;	/* strip any phvs or relabeling */
 				/* note: no point in expressional-index search here */
 			}
 			/* else treat it as a constant */
@@ -5399,7 +5423,6 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 		 */
 		ListCell   *ilist;
 		ListCell   *slist;
-		Oid			userid;
 
 		/*
 		 * The nullingrels bits within the expression could prevent us from
@@ -5409,17 +5432,6 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 		if (bms_overlap(varnos, root->outer_join_rels))
 			node = remove_nulling_relids(node, root->outer_join_rels, NULL);
 
-		/*
-		 * Determine the user ID to use for privilege checks: either
-		 * onerel->userid if it's set (e.g., in case we're accessing the table
-		 * via a view), or the current user otherwise.
-		 *
-		 * If we drill down to child relations, we keep using the same userid:
-		 * it's going to be the same anyway, due to how we set up the relation
-		 * tree (q.v. build_simple_rel).
-		 */
-		userid = OidIsValid(onerel->userid) ? onerel->userid : GetUserId();
-
 		foreach(ilist, onerel->indexlist)
 		{
 			IndexOptInfo *index = (IndexOptInfo *) lfirst(ilist);
@@ -5487,69 +5499,32 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 
 							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);
-
 								/*
+								 * Test if user has permission to access all
+								 * rows from the index's table.
+								 *
 								 * For simplicity, we insist on the whole
 								 * table being selectable, rather than trying
 								 * to identify which column(s) the index
-								 * depends on.  Also require all rows to be
-								 * selectable --- there must be no
-								 * securityQuals from security barrier views
-								 * or RLS policies.
+								 * depends on.
+								 *
+								 * Note that for an inheritance child,
+								 * permissions are checked on the inheritance
+								 * root parent, and whole-table select
+								 * privilege on the parent doesn't quite
+								 * guarantee that the user could read all
+								 * columns of the child.  But in practice it's
+								 * unlikely that any interesting security
+								 * violation could result from allowing access
+								 * to the expression index's stats, so we
+								 * allow it anyway.  See similar code in
+								 * examine_simple_variable() for additional
+								 * comments.
 								 */
 								vardata->acl_ok =
-									rte->securityQuals == NIL &&
-									(pg_class_aclcheck(rte->relid, userid,
-													   ACL_SELECT) == ACLCHECK_OK);
-
-								/*
-								 * If the user doesn't have permissions to
-								 * access an inheritance child relation, check
-								 * the permissions of the table actually
-								 * mentioned in the query, since most likely
-								 * the user does have that permission.  Note
-								 * that whole-table select privilege on the
-								 * parent doesn't quite guarantee that the
-								 * user could read all columns of the child.
-								 * But in practice it's unlikely that any
-								 * interesting security violation could result
-								 * from allowing access to the expression
-								 * index's stats, so we allow it anyway.  See
-								 * similar code in examine_simple_variable()
-								 * for additional comments.
-								 */
-								if (!vardata->acl_ok &&
-									root->append_rel_array != NULL)
-								{
-									AppendRelInfo *appinfo;
-									Index		varno = index->rel->relid;
-
-									appinfo = root->append_rel_array[varno];
-									while (appinfo &&
-										   planner_rt_fetch(appinfo->parent_relid,
-															root)->rtekind == RTE_RELATION)
-									{
-										varno = appinfo->parent_relid;
-										appinfo = root->append_rel_array[varno];
-									}
-									if (varno != index->rel->relid)
-									{
-										/* Repeat access check on this rel */
-										rte = planner_rt_fetch(varno, root);
-										Assert(rte->rtekind == RTE_RELATION);
-
-										vardata->acl_ok =
-											rte->securityQuals == NIL &&
-											(pg_class_aclcheck(rte->relid,
-															   userid,
-															   ACL_SELECT) == ACLCHECK_OK);
-									}
-								}
+									all_rows_selectable(root,
+														index->rel->relid,
+														NULL);
 							}
 							else
 							{
@@ -5616,61 +5591,33 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 					vardata->statsTuple =
 						statext_expressions_load(info->statOid, rte->inh, pos);
 
-					vardata->freefunc = ReleaseDummy;
+					/* Nothing to release if no data found */
+					if (vardata->statsTuple != NULL)
+					{
+						vardata->freefunc = ReleaseDummy;
+					}
 
 					/*
+					 * Test if user has permission to access all rows from the
+					 * table.
+					 *
 					 * For simplicity, we insist on the whole table being
 					 * selectable, rather than trying to identify which
-					 * column(s) the statistics object depends on.  Also
-					 * require all rows to be selectable --- there must be no
-					 * securityQuals from security barrier views or RLS
-					 * policies.
+					 * column(s) the statistics object depends on.
+					 *
+					 * Note that for an inheritance child, permissions are
+					 * checked on the inheritance root parent, and whole-table
+					 * select privilege on the parent doesn't quite guarantee
+					 * that the user could read all columns of the child.  But
+					 * in practice it's unlikely that any interesting security
+					 * violation could result from allowing access to the
+					 * expression stats, so we allow it anyway.  See similar
+					 * code in examine_simple_variable() for additional
+					 * comments.
 					 */
-					vardata->acl_ok =
-						rte->securityQuals == NIL &&
-						(pg_class_aclcheck(rte->relid, userid,
-										   ACL_SELECT) == ACLCHECK_OK);
-
-					/*
-					 * If the user doesn't have permissions to access an
-					 * inheritance child relation, check the permissions of
-					 * the table actually mentioned in the query, since most
-					 * likely the user does have that permission.  Note that
-					 * whole-table select privilege on the parent doesn't
-					 * quite guarantee that the user could read all columns of
-					 * the child. But in practice it's unlikely that any
-					 * interesting security violation could result from
-					 * allowing access to the expression stats, so we allow it
-					 * anyway.  See similar code in examine_simple_variable()
-					 * for additional comments.
-					 */
-					if (!vardata->acl_ok &&
-						root->append_rel_array != NULL)
-					{
-						AppendRelInfo *appinfo;
-						Index		varno = onerel->relid;
-
-						appinfo = root->append_rel_array[varno];
-						while (appinfo &&
-							   planner_rt_fetch(appinfo->parent_relid,
-												root)->rtekind == RTE_RELATION)
-						{
-							varno = appinfo->parent_relid;
-							appinfo = root->append_rel_array[varno];
-						}
-						if (varno != onerel->relid)
-						{
-							/* Repeat access check on this rel */
-							rte = planner_rt_fetch(varno, root);
-							Assert(rte->rtekind == RTE_RELATION);
-
-							vardata->acl_ok =
-								rte->securityQuals == NIL &&
-								(pg_class_aclcheck(rte->relid,
-												   userid,
-												   ACL_SELECT) == ACLCHECK_OK);
-						}
-					}
+					vardata->acl_ok = all_rows_selectable(root,
+														  onerel->relid,
+														  NULL);
 
 					break;
 				}
@@ -5683,6 +5630,63 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 	bms_free(varnos);
 }
 
+/*
+ * strip_all_phvs_deep
+ *		Deeply strip all PlaceHolderVars in an expression.
+
+ * As a performance optimization, we first use a lightweight walker to check
+ * for the presence of any PlaceHolderVars.  The expensive mutator is invoked
+ * only if a PlaceHolderVar is found, avoiding unnecessary memory allocation
+ * and tree copying in the common case where no PlaceHolderVars are present.
+ */
+static Node *
+strip_all_phvs_deep(PlannerInfo *root, Node *node)
+{
+	/* If there are no PHVs anywhere, we needn't work hard */
+	if (root->glob->lastPHId == 0)
+		return node;
+
+	if (!contain_placeholder_walker(node, NULL))
+		return node;
+	return strip_all_phvs_mutator(node, NULL);
+}
+
+/*
+ * contain_placeholder_walker
+ *		Lightweight walker to check if an expression contains any
+ *		PlaceHolderVars
+ */
+static bool
+contain_placeholder_walker(Node *node, void *context)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, PlaceHolderVar))
+		return true;
+
+	return expression_tree_walker(node, contain_placeholder_walker, context);
+}
+
+/*
+ * strip_all_phvs_mutator
+ *		Mutator to deeply strip all PlaceHolderVars
+ */
+static Node *
+strip_all_phvs_mutator(Node *node, void *context)
+{
+	if (node == NULL)
+		return NULL;
+	if (IsA(node, PlaceHolderVar))
+	{
+		/* Strip it and recurse into its contained expression */
+		PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+		return strip_all_phvs_mutator((Node *) phv->phexpr, context);
+	}
+
+	return expression_tree_mutator(node, strip_all_phvs_mutator, context);
+}
+
 /*
  * examine_simple_variable
  *		Handle a simple Var for examine_variable
@@ -5725,109 +5729,20 @@ examine_simple_variable(PlannerInfo *root, Var *var,
 
 		if (HeapTupleIsValid(vardata->statsTuple))
 		{
-			RelOptInfo *onerel = find_base_rel_noerr(root, var->varno);
-			Oid			userid;
-
 			/*
-			 * Check if user has permission to read this column.  We require
-			 * all rows to be accessible, so there must be no securityQuals
-			 * from security barrier views or RLS policies.
+			 * Test if user has permission to read all rows from this column.
 			 *
-			 * Normally the Var will have an associated RelOptInfo from which
-			 * we can find out which userid to do the check as; but it might
-			 * not if it's a RETURNING Var for an INSERT target relation.  In
-			 * that case use the RTEPermissionInfo associated with the RTE.
+			 * This requires that the user has the appropriate SELECT
+			 * privileges and that there are no securityQuals from security
+			 * barrier views or RLS policies.  If that's not the case, then we
+			 * only permit leakproof functions to be passed pg_statistic data
+			 * in vardata, otherwise the functions might reveal data that the
+			 * user doesn't have permission to see --- see
+			 * statistic_proc_security_check().
 			 */
-			if (onerel)
-				userid = onerel->userid;
-			else
-			{
-				RTEPermissionInfo *perminfo;
-
-				perminfo = getRTEPermissionInfo(root->parse->rteperminfos, rte);
-				userid = perminfo->checkAsUser;
-			}
-			if (!OidIsValid(userid))
-				userid = GetUserId();
-
 			vardata->acl_ok =
-				rte->securityQuals == NIL &&
-				((pg_class_aclcheck(rte->relid, userid,
-									ACL_SELECT) == ACLCHECK_OK) ||
-				 (pg_attribute_aclcheck(rte->relid, var->varattno, userid,
-										ACL_SELECT) == ACLCHECK_OK));
-
-			/*
-			 * If the user doesn't have permissions to access an inheritance
-			 * child relation or specifically this attribute, check the
-			 * permissions of the table/column actually mentioned in the
-			 * query, since most likely the user does have that permission
-			 * (else the query will fail at runtime), and if the user can read
-			 * the column there then he can get the values of the child table
-			 * too.  To do that, we must find out which of the root parent's
-			 * attributes the child relation's attribute corresponds to.
-			 */
-			if (!vardata->acl_ok && var->varattno > 0 &&
-				root->append_rel_array != NULL)
-			{
-				AppendRelInfo *appinfo;
-				Index		varno = var->varno;
-				int			varattno = var->varattno;
-				bool		found = false;
-
-				appinfo = root->append_rel_array[varno];
-
-				/*
-				 * Partitions are mapped to their immediate parent, not the
-				 * root parent, so must be ready to walk up multiple
-				 * AppendRelInfos.  But stop if we hit a parent that is not
-				 * RTE_RELATION --- that's a flattened UNION ALL subquery, not
-				 * an inheritance parent.
-				 */
-				while (appinfo &&
-					   planner_rt_fetch(appinfo->parent_relid,
-										root)->rtekind == RTE_RELATION)
-				{
-					int			parent_varattno;
-
-					found = false;
-					if (varattno <= 0 || varattno > appinfo->num_child_cols)
-						break;	/* safety check */
-					parent_varattno = appinfo->parent_colnos[varattno - 1];
-					if (parent_varattno == 0)
-						break;	/* Var is local to child */
-
-					varno = appinfo->parent_relid;
-					varattno = parent_varattno;
-					found = true;
-
-					/* If the parent is itself a child, continue up. */
-					appinfo = root->append_rel_array[varno];
-				}
-
-				/*
-				 * In rare cases, the Var may be local to the child table, in
-				 * which case, we've got to live with having no access to this
-				 * column's stats.
-				 */
-				if (!found)
-					return;
-
-				/* Repeat the access check on this parent rel & column */
-				rte = planner_rt_fetch(varno, root);
-				Assert(rte->rtekind == RTE_RELATION);
-
-				/*
-				 * Fine to use the same userid as it's the same in all
-				 * relations of a given inheritance tree.
-				 */
-				vardata->acl_ok =
-					rte->securityQuals == NIL &&
-					((pg_class_aclcheck(rte->relid, userid,
-										ACL_SELECT) == ACLCHECK_OK) ||
-					 (pg_attribute_aclcheck(rte->relid, varattno, userid,
-											ACL_SELECT) == ACLCHECK_OK));
-			}
+				all_rows_selectable(root, var->varno,
+									bms_make_singleton(var->varattno - FirstLowInvalidHeapAttributeNumber));
 		}
 		else
 		{
@@ -6024,6 +5939,214 @@ examine_simple_variable(PlannerInfo *root, Var *var,
 	}
 }
 
+/*
+ * all_rows_selectable
+ *		Test whether the user has permission to select all rows from a given
+ *		relation.
+ *
+ * Inputs:
+ *	root: the planner info
+ *	varno: the index of the relation (assumed to be an RTE_RELATION)
+ *	varattnos: the attributes for which permission is required, or NULL if
+ *		whole-table access is required
+ *
+ * Returns true if the user has the required select permissions, and there are
+ * no securityQuals from security barrier views or RLS policies.
+ *
+ * Note that if the relation is an inheritance child relation, securityQuals
+ * and access permissions are checked against the inheritance root parent (the
+ * relation actually mentioned in the query) --- see the comments in
+ * expand_single_inheritance_child() for an explanation of why it has to be
+ * done this way.
+ *
+ * If varattnos is non-NULL, its attribute numbers should be offset by
+ * FirstLowInvalidHeapAttributeNumber so that system attributes can be
+ * checked.  If varattnos is NULL, only table-level SELECT privileges are
+ * checked, not any column-level privileges.
+ *
+ * Note: if the relation is accessed via a view, this function actually tests
+ * whether the view owner has permission to select from the relation.  To
+ * ensure that the current user has permission, it is also necessary to check
+ * that the current user has permission to select from the view, which we do
+ * at planner-startup --- see subquery_planner().
+ *
+ * This is exported so that other estimation functions can use it.
+ */
+bool
+all_rows_selectable(PlannerInfo *root, Index varno, Bitmapset *varattnos)
+{
+	RelOptInfo *rel = find_base_rel_noerr(root, varno);
+	RangeTblEntry *rte = planner_rt_fetch(varno, root);
+	Oid			userid;
+	int			varattno;
+
+	Assert(rte->rtekind == RTE_RELATION);
+
+	/*
+	 * Determine the user ID to use for privilege checks (either the current
+	 * user or the view owner, if we're accessing the table via a view).
+	 *
+	 * Normally the relation will have an associated RelOptInfo from which we
+	 * can find the userid, but it might not if it's a RETURNING Var for an
+	 * INSERT target relation.  In that case use the RTEPermissionInfo
+	 * associated with the RTE.
+	 *
+	 * If we navigate up to a parent relation, we keep using the same userid,
+	 * since it's the same in all relations of a given inheritance tree.
+	 */
+	if (rel)
+		userid = rel->userid;
+	else
+	{
+		RTEPermissionInfo *perminfo;
+
+		perminfo = getRTEPermissionInfo(root->parse->rteperminfos, rte);
+		userid = perminfo->checkAsUser;
+	}
+	if (!OidIsValid(userid))
+		userid = GetUserId();
+
+	/*
+	 * Permissions and securityQuals must be checked on the table actually
+	 * mentioned in the query, so if this is an inheritance child, navigate up
+	 * to the inheritance root parent.  If the user can read the whole table
+	 * or the required columns there, then they can read from the child table
+	 * too.  For per-column checks, we must find out which of the root
+	 * parent's attributes the child relation's attributes correspond to.
+	 */
+	if (root->append_rel_array != NULL)
+	{
+		AppendRelInfo *appinfo;
+
+		appinfo = root->append_rel_array[varno];
+
+		/*
+		 * Partitions are mapped to their immediate parent, not the root
+		 * parent, so must be ready to walk up multiple AppendRelInfos.  But
+		 * stop if we hit a parent that is not RTE_RELATION --- that's a
+		 * flattened UNION ALL subquery, not an inheritance parent.
+		 */
+		while (appinfo &&
+			   planner_rt_fetch(appinfo->parent_relid,
+								root)->rtekind == RTE_RELATION)
+		{
+			Bitmapset  *parent_varattnos = NULL;
+
+			/*
+			 * For each child attribute, find the corresponding parent
+			 * attribute.  In rare cases, the attribute may be local to the
+			 * child table, in which case, we've got to live with having no
+			 * access to this column.
+			 */
+			varattno = -1;
+			while ((varattno = bms_next_member(varattnos, varattno)) >= 0)
+			{
+				AttrNumber	attno;
+				AttrNumber	parent_attno;
+
+				attno = varattno + FirstLowInvalidHeapAttributeNumber;
+
+				if (attno == InvalidAttrNumber)
+				{
+					/*
+					 * Whole-row reference, so must map each column of the
+					 * child to the parent table.
+					 */
+					for (attno = 1; attno <= appinfo->num_child_cols; attno++)
+					{
+						parent_attno = appinfo->parent_colnos[attno - 1];
+						if (parent_attno == 0)
+							return false;	/* attr is local to child */
+						parent_varattnos =
+							bms_add_member(parent_varattnos,
+										   parent_attno - FirstLowInvalidHeapAttributeNumber);
+					}
+				}
+				else
+				{
+					if (attno < 0)
+					{
+						/* System attnos are the same in all tables */
+						parent_attno = attno;
+					}
+					else
+					{
+						if (attno > appinfo->num_child_cols)
+							return false;	/* safety check */
+						parent_attno = appinfo->parent_colnos[attno - 1];
+						if (parent_attno == 0)
+							return false;	/* attr is local to child */
+					}
+					parent_varattnos =
+						bms_add_member(parent_varattnos,
+									   parent_attno - FirstLowInvalidHeapAttributeNumber);
+				}
+			}
+
+			/* If the parent is itself a child, continue up */
+			varno = appinfo->parent_relid;
+			varattnos = parent_varattnos;
+			appinfo = root->append_rel_array[varno];
+		}
+
+		/* Perform the access check on this parent rel */
+		rte = planner_rt_fetch(varno, root);
+		Assert(rte->rtekind == RTE_RELATION);
+	}
+
+	/*
+	 * For all rows to be accessible, there must be no securityQuals from
+	 * security barrier views or RLS policies.
+	 */
+	if (rte->securityQuals != NIL)
+		return false;
+
+	/*
+	 * Test for table-level SELECT privilege.
+	 *
+	 * If varattnos is non-NULL, this is sufficient to give access to all
+	 * requested attributes, even for a child table, since we have verified
+	 * that all required child columns have matching parent columns.
+	 *
+	 * If varattnos is NULL (whole-table access requested), this doesn't
+	 * necessarily guarantee that the user can read all columns of a child
+	 * table, but we allow it anyway (see comments in examine_variable()) and
+	 * don't bother checking any column privileges.
+	 */
+	if (pg_class_aclcheck(rte->relid, userid, ACL_SELECT) == ACLCHECK_OK)
+		return true;
+
+	if (varattnos == NULL)
+		return false;			/* whole-table access requested */
+
+	/*
+	 * Don't have table-level SELECT privilege, so check per-column
+	 * privileges.
+	 */
+	varattno = -1;
+	while ((varattno = bms_next_member(varattnos, varattno)) >= 0)
+	{
+		AttrNumber	attno = varattno + FirstLowInvalidHeapAttributeNumber;
+
+		if (attno == InvalidAttrNumber)
+		{
+			/* Whole-row reference, so must have access to all columns */
+			if (pg_attribute_aclcheck_all(rte->relid, userid, ACL_SELECT,
+										  ACLMASK_ALL) != ACLCHECK_OK)
+				return false;
+		}
+		else
+		{
+			if (pg_attribute_aclcheck(rte->relid, attno, userid,
+									  ACL_SELECT) != ACLCHECK_OK)
+				return false;
+		}
+	}
+
+	/* If we reach here, have all required column privileges */
+	return true;
+}
+
 /*
  * examine_indexcol_variable
  *		Try to look up statistical data about an index column/expression.
@@ -6112,15 +6235,17 @@ examine_indexcol_variable(PlannerInfo *root, IndexOptInfo *index,
 
 /*
  * 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 leakproof.
+ * pg_statistic data in vardata.  We allow this if either of the following
+ * conditions is met: (1) the user has SELECT privileges on the table or
+ * column underlying the pg_statistic data and there are no securityQuals from
+ * security barrier views or RLS policies, or (2) the function is marked
+ * leakproof.
  */
 bool
 statistic_proc_security_check(VariableStatData *vardata, Oid func_oid)
 {
 	if (vardata->acl_ok)
-		return true;
+		return true;			/* have SELECT privs and no securityQuals */
 
 	if (!OidIsValid(func_oid))
 		return false;
@@ -6514,6 +6639,13 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 		if (index->hypothetical)
 			continue;
 
+		/*
+		 * get_actual_variable_endpoint uses the index-only-scan machinery, so
+		 * ignore indexes that can't use it on their first column.
+		 */
+		if (!index->canreturn[0])
+			continue;
+
 		/*
 		 * The first index column must match the desired variable, sortop, and
 		 * collation --- but we can use a descending-order index.
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 347089b7626..6efc29c2040 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1691,15 +1691,19 @@ Datum
 timeofday(PG_FUNCTION_ARGS)
 {
 	struct timeval tp;
-	char		templ[128];
-	char		buf[128];
 	pg_time_t	tt;
+	struct pg_tm *tm;
+	char		part1[128];
+	char		part2[128];
+	char		buf[128 + 128 + 10];
 
 	gettimeofday(&tp, NULL);
 	tt = (pg_time_t) tp.tv_sec;
-	pg_strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%06d %Y %Z",
-				pg_localtime(&tt, session_timezone));
-	snprintf(buf, sizeof(buf), templ, tp.tv_usec);
+	tm = pg_localtime(&tt, session_timezone);
+
+	pg_strftime(part1, sizeof(part1), "%a %b %d %H:%M:%S", tm);
+	pg_strftime(part2, sizeof(part2), "%Y %Z", tm);
+	snprintf(buf, sizeof(buf), "%s.%06d %s", part1, (int) tp.tv_usec, part2);
 
 	PG_RETURN_TEXT_P(cstring_to_text(buf));
 }
@@ -4954,7 +4958,7 @@ timestamptz_trunc_internal(text *units, TimestampTz timestamp, pg_tz *tzp)
 				case DTK_SECOND:
 				case DTK_MILLISEC:
 				case DTK_MICROSEC:
-					PG_RETURN_TIMESTAMPTZ(timestamp);
+					return timestamp;
 					break;
 
 				default:
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 717de8073d5..de899a600ae 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -120,7 +120,7 @@ get_modifiers(char *buf, int16 *weight, bool *prefix)
 		return buf;
 
 	buf++;
-	while (*buf && pg_mblen(buf) == 1)
+	while (*buf && pg_mblen_cstr(buf) == 1)
 	{
 		switch (*buf)
 		{
@@ -259,12 +259,12 @@ parse_or_operator(TSQueryParserState pstate)
 		return false;
 
 	/* it shouldn't be a part of any word */
-	if (t_iseq(ptr, '-') || t_iseq(ptr, '_') || t_isalnum(ptr))
+	if (t_iseq(ptr, '-') || t_iseq(ptr, '_') || t_isalnum_cstr(ptr))
 		return false;
 
 	for (;;)
 	{
-		ptr += pg_mblen(ptr);
+		ptr += pg_mblen_cstr(ptr);
 
 		if (*ptr == '\0')		/* got end of string without operand */
 			return false;
@@ -390,7 +390,7 @@ gettoken_query_standard(TSQueryParserState state, int8 *operator,
 				break;
 		}
 
-		state->buf += pg_mblen(state->buf);
+		state->buf += pg_mblen_cstr(state->buf);
 	}
 }
 
@@ -502,7 +502,7 @@ gettoken_query_websearch(TSQueryParserState state, int8 *operator,
 				break;
 		}
 
-		state->buf += pg_mblen(state->buf);
+		state->buf += pg_mblen_cstr(state->buf);
 	}
 }
 
@@ -1014,9 +1014,8 @@ infix(INFIX *in, int parentPriority, bool rightPhraseOp)
 				*(in->cur) = '\\';
 				in->cur++;
 			}
-			COPYCHAR(in->cur, op);
 
-			clen = pg_mblen(op);
+			clen = ts_copychar_cstr(in->cur, op);
 			op += clen;
 			in->cur += clen;
 		}
diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
index 1fa2e3729bf..e7ac7725233 100644
--- a/src/backend/utils/adt/tsvector.c
+++ b/src/backend/utils/adt/tsvector.c
@@ -319,9 +319,9 @@ tsvectorout(PG_FUNCTION_ARGS)
 				lenbuf = 0,
 				pp;
 	WordEntry  *ptr = ARRPTR(out);
-	char	   *curbegin,
-			   *curin,
+	char	   *curin,
 			   *curout;
+	const char *curend;
 
 	lenbuf = out->size * 2 /* '' */ + out->size - 1 /* space */ + 2 /* \0 */ ;
 	for (i = 0; i < out->size; i++)
@@ -334,13 +334,14 @@ tsvectorout(PG_FUNCTION_ARGS)
 	curout = outbuf = (char *) palloc(lenbuf);
 	for (i = 0; i < out->size; i++)
 	{
-		curbegin = curin = STRPTR(out) + ptr->pos;
+		curin = STRPTR(out) + ptr->pos;
+		curend = curin + ptr->len;
 		if (i != 0)
 			*curout++ = ' ';
 		*curout++ = '\'';
-		while (curin - curbegin < ptr->len)
+		while (curin < curend)
 		{
-			int			len = pg_mblen(curin);
+			int			len = pg_mblen_range(curin, curend);
 
 			if (t_iseq(curin, '\''))
 				*curout++ = '\'';
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index dd9fad6d17a..8e8df1fa391 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -2604,11 +2604,15 @@ ts_stat_sql(MemoryContext persistentContext, text *txt, text *ws)
 	if (ws)
 	{
 		char	   *buf;
+		const char *end;
 
 		buf = VARDATA_ANY(ws);
-		while (buf - VARDATA_ANY(ws) < VARSIZE_ANY_EXHDR(ws))
+		end = buf + VARSIZE_ANY_EXHDR(ws);
+		while (buf < end)
 		{
-			if (pg_mblen(buf) == 1)
+			int			len = pg_mblen_range(buf, end);
+
+			if (len == 1)
 			{
 				switch (*buf)
 				{
@@ -2632,7 +2636,7 @@ ts_stat_sql(MemoryContext persistentContext, text *txt, text *ws)
 						stat->weight |= 0;
 				}
 			}
-			buf += pg_mblen(buf);
+			buf += len;
 		}
 	}
 
diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c
index e1620d3ed1f..f3900ee7735 100644
--- a/src/backend/utils/adt/tsvector_parser.c
+++ b/src/backend/utils/adt/tsvector_parser.c
@@ -208,8 +208,7 @@ gettoken_tsvector(TSVectorParseState state,
 				PRSSYNTAXERROR;
 			else if (!isspace((unsigned char) *state->prsbuf))
 			{
-				COPYCHAR(curpos, state->prsbuf);
-				curpos += pg_mblen(state->prsbuf);
+				curpos += ts_copychar_cstr(curpos, state->prsbuf);
 				statecode = WAITENDWORD;
 			}
 		}
@@ -223,8 +222,7 @@ gettoken_tsvector(TSVectorParseState state,
 			else
 			{
 				RESIZEPRSBUF;
-				COPYCHAR(curpos, state->prsbuf);
-				curpos += pg_mblen(state->prsbuf);
+				curpos += ts_copychar_cstr(curpos, state->prsbuf);
 				Assert(oldstate != 0);
 				statecode = oldstate;
 			}
@@ -259,8 +257,7 @@ gettoken_tsvector(TSVectorParseState state,
 			else
 			{
 				RESIZEPRSBUF;
-				COPYCHAR(curpos, state->prsbuf);
-				curpos += pg_mblen(state->prsbuf);
+				curpos += ts_copychar_cstr(curpos, state->prsbuf);
 			}
 		}
 		else if (statecode == WAITENDCMPLX)
@@ -279,8 +276,7 @@ gettoken_tsvector(TSVectorParseState state,
 			else
 			{
 				RESIZEPRSBUF;
-				COPYCHAR(curpos, state->prsbuf);
-				curpos += pg_mblen(state->prsbuf);
+				curpos += ts_copychar_cstr(curpos, state->prsbuf);
 			}
 		}
 		else if (statecode == WAITCHARCMPLX)
@@ -288,8 +284,7 @@ gettoken_tsvector(TSVectorParseState state,
 			if (!state->is_web && t_iseq(state->prsbuf, '\''))
 			{
 				RESIZEPRSBUF;
-				COPYCHAR(curpos, state->prsbuf);
-				curpos += pg_mblen(state->prsbuf);
+				curpos += ts_copychar_cstr(curpos, state->prsbuf);
 				statecode = WAITENDCMPLX;
 			}
 			else
@@ -300,7 +295,7 @@ gettoken_tsvector(TSVectorParseState state,
 					PRSSYNTAXERROR;
 				if (state->oprisdelim)
 				{
-					/* state->prsbuf+=pg_mblen(state->prsbuf); */
+					/* state->prsbuf+=pg_mblen_cstr(state->prsbuf); */
 					RETURN_TOKEN;
 				}
 				else
@@ -383,6 +378,6 @@ gettoken_tsvector(TSVectorParseState state,
 				 statecode);
 
 		/* get next char */
-		state->prsbuf += pg_mblen(state->prsbuf);
+		state->prsbuf += pg_mblen_cstr(state->prsbuf);
 	}
 }
diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index bce7309c183..a746388b073 100644
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -752,7 +752,7 @@ uuid_extract_timestamp(PG_FUNCTION_ARGS)
 			+ (((uint64) uuid->data[0]) << 40);
 
 		/* convert ms to us, then adjust */
-		ts = (TimestampTz) (tms * NS_PER_US) -
+		ts = (TimestampTz) (tms * US_PER_MS) -
 			(POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY * USECS_PER_SEC;
 
 		PG_RETURN_TIMESTAMPTZ(ts);
diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c
index 205a67dafc5..97424439006 100644
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -232,7 +232,7 @@ bit_in(PG_FUNCTION_ARGS)
 				ereturn(escontext, (Datum) 0,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("\"%.*s\" is not a valid binary digit",
-								pg_mblen(sp), sp)));
+								pg_mblen_cstr(sp), sp)));
 
 			x >>= 1;
 			if (x == 0)
@@ -257,7 +257,7 @@ bit_in(PG_FUNCTION_ARGS)
 				ereturn(escontext, (Datum) 0,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("\"%.*s\" is not a valid hexadecimal digit",
-								pg_mblen(sp), sp)));
+								pg_mblen_cstr(sp), sp)));
 
 			if (bc)
 			{
@@ -533,7 +533,7 @@ varbit_in(PG_FUNCTION_ARGS)
 				ereturn(escontext, (Datum) 0,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("\"%.*s\" is not a valid binary digit",
-								pg_mblen(sp), sp)));
+								pg_mblen_cstr(sp), sp)));
 
 			x >>= 1;
 			if (x == 0)
@@ -558,7 +558,7 @@ varbit_in(PG_FUNCTION_ARGS)
 				ereturn(escontext, (Datum) 0,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("\"%.*s\" is not a valid hexadecimal digit",
-								pg_mblen(sp), sp)));
+								pg_mblen_cstr(sp), sp)));
 
 			if (bc)
 			{
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 812448293f2..5ec38cb06fa 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -140,6 +140,7 @@ static text *text_substring(Datum str,
 							int32 start,
 							int32 length,
 							bool length_not_specified);
+static int	pg_mbcharcliplen_chars(const char *mbstr, int len, int limit);
 static text *text_overlay(text *t1, text *t2, int sp, int sl);
 static int	text_position(text *t1, text *t2, Oid collid);
 static void text_position_setup(text *t1, text *t2, Oid collid, TextPositionState *state);
@@ -829,8 +830,11 @@ text_catenate(text *t1, text *t2)
  * charlen_to_bytelen()
  *	Compute the number of bytes occupied by n characters starting at *p
  *
- * It is caller's responsibility that there actually are n characters;
- * the string need not be null-terminated.
+ * The caller shall ensure there are n complete characters.  Callers achieve
+ * this by deriving "n" from regmatch_t findings from searching a wchar array.
+ * pg_mb2wchar_with_len() skips any trailing incomplete character, so regex
+ * matches will end no later than the last complete character.  (The string
+ * need not be null-terminated.)
  *
  * remove static.
  */
@@ -847,7 +851,7 @@ charlen_to_bytelen(const char *p, int n)
 		const char *s;
 
 		for (s = p; n > 0; n--)
-			s += pg_mblen(s);
+			s += pg_mblen_unbounded(s); /* caller verified encoding */
 
 		return s - p;
 	}
@@ -920,7 +924,7 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 	int32		S = start;		/* start position */
 	int32		S1;				/* adjusted start position */
 	int32		L1;				/* adjusted substring length */
-	int32		E;				/* end position */
+	int32		E;				/* end position, exclusive */
 
 	/*
 	 * SQL99 says S can be zero or negative (which we don't document), but we
@@ -981,6 +985,7 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 		int32		slice_start;
 		int32		slice_size;
 		int32		slice_strlen;
+		int32		slice_len;
 		text	   *slice;
 		int32		E1;
 		int32		i;
@@ -997,14 +1002,14 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 
 		if (length_not_specified)	/* special case - get length to end of
 									 * string */
-			slice_size = L1 = -1;
+			E = slice_size = L1 = -1;
 		else if (length < 0)
 		{
 			/* SQL99 says to throw an error for E < S, i.e., negative length */
 			ereport(ERROR,
 					(errcode(ERRCODE_SUBSTRING_ERROR),
 					 errmsg("negative substring length not allowed")));
-			slice_size = L1 = -1;	/* silence stupider compilers */
+			E = slice_size = L1 = -1;	/* silence stupider compilers */
 		}
 		else if (pg_add_s32_overflow(S, length, &E))
 		{
@@ -1017,11 +1022,11 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 		else
 		{
 			/*
-			 * A zero or negative value for the end position can happen if the
-			 * start was negative or one. SQL99 says to return a zero-length
-			 * string.
+			 * Ending at position 1, exclusive, obviously yields an empty
+			 * string.  A zero or negative value can happen if the start was
+			 * negative or one. SQL99 says to return a zero-length string.
 			 */
-			if (E < 1)
+			if (E <= 1)
 				return cstring_to_text("");
 
 			/*
@@ -1031,11 +1036,11 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 			L1 = E - S1;
 
 			/*
-			 * Total slice size in bytes can't be any longer than the start
-			 * position plus substring length times the encoding max length.
-			 * If that overflows, we can just use -1.
+			 * Total slice size in bytes can't be any longer than the
+			 * inclusive end position times the encoding max length.  If that
+			 * overflows, we can just use -1.
 			 */
-			if (pg_mul_s32_overflow(E, eml, &slice_size))
+			if (pg_mul_s32_overflow(E - 1, eml, &slice_size))
 				slice_size = -1;
 		}
 
@@ -1050,16 +1055,25 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 			slice = (text *) DatumGetPointer(str);
 
 		/* see if we got back an empty string */
-		if (VARSIZE_ANY_EXHDR(slice) == 0)
+		slice_len = VARSIZE_ANY_EXHDR(slice);
+		if (slice_len == 0)
 		{
 			if (slice != (text *) DatumGetPointer(str))
 				pfree(slice);
 			return cstring_to_text("");
 		}
 
-		/* Now we can get the actual length of the slice in MB characters */
-		slice_strlen = pg_mbstrlen_with_len(VARDATA_ANY(slice),
-											VARSIZE_ANY_EXHDR(slice));
+		/*
+		 * Now we can get the actual length of the slice in MB characters,
+		 * stopping at the end of the substring.  Continuing beyond the
+		 * substring end could find an incomplete character attributable
+		 * solely to DatumGetTextPSlice() chopping in the middle of a
+		 * character, and it would be superfluous work at best.
+		 */
+		slice_strlen =
+			(slice_size == -1 ?
+			 pg_mbstrlen_with_len(VARDATA_ANY(slice), slice_len) :
+			 pg_mbcharcliplen_chars(VARDATA_ANY(slice), slice_len, E - 1));
 
 		/*
 		 * Check that the start position wasn't > slice_strlen. If so, SQL99
@@ -1086,7 +1100,7 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 		 */
 		p = VARDATA_ANY(slice);
 		for (i = 0; i < S1 - 1; i++)
-			p += pg_mblen(p);
+			p += pg_mblen_unbounded(p);
 
 		/* hang onto a pointer to our start position */
 		s = p;
@@ -1096,7 +1110,7 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 		 * length.
 		 */
 		for (i = S1; i < E1; i++)
-			p += pg_mblen(p);
+			p += pg_mblen_unbounded(p);
 
 		ret = (text *) palloc(VARHDRSZ + (p - s));
 		SET_VARSIZE(ret, VARHDRSZ + (p - s));
@@ -1114,6 +1128,35 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 	return NULL;
 }
 
+/*
+ * pg_mbcharcliplen_chars -
+ *	Mirror pg_mbcharcliplen(), except return value unit is chars, not bytes.
+ *
+ *	This mirrors all the dubious historical behavior, so it's static to
+ *	discourage proliferation.  The assertions are specific to the one caller.
+ */
+static int
+pg_mbcharcliplen_chars(const char *mbstr, int len, int limit)
+{
+	int			nch = 0;
+	int			l;
+
+	Assert(len > 0);
+	Assert(limit > 0);
+	Assert(pg_database_encoding_max_length() > 1);
+
+	while (len > 0 && *mbstr)
+	{
+		l = pg_mblen_with_len(mbstr, len);
+		nch++;
+		if (nch == limit)
+			break;
+		len -= l;
+		mbstr += l;
+	}
+	return nch;
+}
+
 /*
  * textoverlay
  *	Replace specified substring of first string with second
@@ -1401,6 +1444,8 @@ text_position_next(TextPositionState *state)
 	 */
 	if (state->is_multibyte_char_in_char && state->locale->deterministic)
 	{
+		const char *haystack_end = state->str1 + state->len1;
+
 		/* Walk one character at a time, until we reach the match. */
 
 		/* the search should never move backwards. */
@@ -1409,7 +1454,7 @@ text_position_next(TextPositionState *state)
 		while (state->refpoint < matchptr)
 		{
 			/* step to next character. */
-			state->refpoint += pg_mblen(state->refpoint);
+			state->refpoint += pg_mblen_range(state->refpoint, haystack_end);
 			state->refpos++;
 
 			/*
@@ -1448,6 +1493,7 @@ text_position_next_internal(char *start_ptr, TextPositionState *state)
 	const char *hptr;
 
 	Assert(start_ptr >= haystack && start_ptr <= haystack_end);
+	Assert(needle_len > 0);
 
 	state->last_match_len_tmp = needle_len;
 
@@ -1460,19 +1506,26 @@ text_position_next_internal(char *start_ptr, TextPositionState *state)
 		 * needle under the given collation.
 		 *
 		 * Note, the found substring could have a different length than the
-		 * needle, including being empty.  Callers that want to skip over the
-		 * found string need to read the length of the found substring from
-		 * last_match_len rather than just using the length of their needle.
+		 * needle.  Callers that want to skip over the found string need to
+		 * read the length of the found substring from last_match_len rather
+		 * than just using the length of their needle.
 		 *
 		 * Most callers will require "greedy" semantics, meaning that we need
 		 * to find the longest such substring, not the shortest.  For callers
 		 * that don't need greedy semantics, we can finish on the first match.
+		 *
+		 * This loop depends on the assumption that the needle is nonempty and
+		 * any matching substring must also be nonempty.  (Even if the
+		 * collation would accept an empty match, returning one would send
+		 * callers that search for successive matches into an infinite loop.)
 		 */
 		const char *result_hptr = NULL;
 
 		hptr = start_ptr;
 		while (hptr < haystack_end)
 		{
+			const char *test_end;
+
 			/*
 			 * First check the common case that there is a match in the
 			 * haystack of exactly the length of the needle.
@@ -1483,11 +1536,13 @@ text_position_next_internal(char *start_ptr, TextPositionState *state)
 				return (char *) hptr;
 
 			/*
-			 * Else check if any of the possible substrings starting at hptr
-			 * are equal to the needle.
+			 * Else check if any of the non-empty substrings starting at hptr
+			 * compare equal to the needle.
 			 */
-			for (const char *test_end = hptr; test_end < haystack_end; test_end += pg_mblen(test_end))
+			test_end = hptr;
+			do
 			{
+				test_end += pg_mblen_range(test_end, haystack_end);
 				if (pg_strncoll(hptr, (test_end - hptr), needle, needle_len, state->locale) == 0)
 				{
 					state->last_match_len_tmp = (test_end - hptr);
@@ -1495,11 +1550,12 @@ text_position_next_internal(char *start_ptr, TextPositionState *state)
 					if (!state->greedy)
 						break;
 				}
-			}
+			} while (test_end < haystack_end);
+
 			if (result_hptr)
 				break;
 
-			hptr += pg_mblen(hptr);
+			hptr += pg_mblen_range(hptr, haystack_end);
 		}
 
 		return (char *) result_hptr;
@@ -3994,7 +4050,8 @@ SplitGUCList(char *rawstring, char separator,
 			char	   *new_name;
 
 			new_name = identifier_case_transform(curname, strlen(curname));
-			strncpy(curname, new_name, strlen(new_name));
+			memcpy(curname, new_name, strlen(new_name));
+			curname[strlen(new_name)] = '\0';
 			pfree(new_name);
 		}
 
@@ -5265,6 +5322,8 @@ split_text(FunctionCallInfo fcinfo, SplitTextOutputData *tstate)
 	}
 	else
 	{
+		const char *end_ptr;
+
 		/*
 		 * When fldsep is NULL, each character in the input string becomes a
 		 * separate element in the result set.  The separator is effectively
@@ -5273,10 +5332,11 @@ split_text(FunctionCallInfo fcinfo, SplitTextOutputData *tstate)
 		inputstring_len = VARSIZE_ANY_EXHDR(inputstring);
 
 		start_ptr = VARDATA_ANY(inputstring);
+		end_ptr = start_ptr + inputstring_len;
 
 		while (inputstring_len > 0)
 		{
-			int			chunk_len = pg_mblen(start_ptr);
+			int			chunk_len = pg_mblen_range(start_ptr, end_ptr);
 
 			CHECK_FOR_INTERRUPTS();
 
@@ -6180,7 +6240,7 @@ text_reverse(PG_FUNCTION_ARGS)
 		{
 			int			sz;
 
-			sz = pg_mblen(p);
+			sz = pg_mblen_range(p, endp);
 			dst -= sz;
 			memcpy(dst, p, sz);
 			p += sz;
@@ -6341,7 +6401,7 @@ text_format(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("unrecognized format() type specifier \"%.*s\"",
-							pg_mblen(cp), cp),
+							pg_mblen_range(cp, end_ptr), cp),
 					 errhint("For a single \"%%\" use \"%%%%\".")));
 
 		/* If indirect width was specified, get its value */
@@ -6462,7 +6522,7 @@ text_format(PG_FUNCTION_ARGS)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("unrecognized format() type specifier \"%.*s\"",
-								pg_mblen(cp), cp),
+								pg_mblen_range(cp, end_ptr), cp),
 						 errhint("For a single \"%%\" use \"%%%%\".")));
 				break;
 		}
@@ -6926,18 +6986,18 @@ unicode_normalize_func(PG_FUNCTION_ARGS)
 	text	   *input = PG_GETARG_TEXT_PP(0);
 	char	   *formstr = text_to_cstring(PG_GETARG_TEXT_PP(1));
 	UnicodeNormalizationForm form;
-	int			size;
+	size_t		size;
 	pg_wchar   *input_chars;
 	pg_wchar   *output_chars;
 	unsigned char *p;
 	text	   *result;
-	int			i;
+	size_t		i;
 
 	form = unicode_norm_form_from_string(formstr);
 
 	/* convert to pg_wchar */
 	size = pg_mbstrlen_with_len(VARDATA_ANY(input), VARSIZE_ANY_EXHDR(input));
-	input_chars = palloc((size + 1) * sizeof(pg_wchar));
+	input_chars = palloc_array(pg_wchar, size + 1);
 	p = (unsigned char *) VARDATA_ANY(input);
 	for (i = 0; i < size; i++)
 	{
@@ -6992,20 +7052,20 @@ unicode_is_normalized(PG_FUNCTION_ARGS)
 	text	   *input = PG_GETARG_TEXT_PP(0);
 	char	   *formstr = text_to_cstring(PG_GETARG_TEXT_PP(1));
 	UnicodeNormalizationForm form;
-	int			size;
+	size_t		size;
 	pg_wchar   *input_chars;
 	pg_wchar   *output_chars;
 	unsigned char *p;
-	int			i;
+	size_t		i;
 	UnicodeNormalizationQC quickcheck;
-	int			output_size;
+	size_t		output_size;
 	bool		result;
 
 	form = unicode_norm_form_from_string(formstr);
 
 	/* convert to pg_wchar */
 	size = pg_mbstrlen_with_len(VARDATA_ANY(input), VARSIZE_ANY_EXHDR(input));
-	input_chars = palloc((size + 1) * sizeof(pg_wchar));
+	input_chars = palloc_array(pg_wchar, size + 1);
 	p = (unsigned char *) VARDATA_ANY(input);
 	for (i = 0; i < size; i++)
 	{
diff --git a/src/backend/utils/adt/xid8funcs.c b/src/backend/utils/adt/xid8funcs.c
index 7dd64f207da..89c8caa53a2 100644
--- a/src/backend/utils/adt/xid8funcs.c
+++ b/src/backend/utils/adt/xid8funcs.c
@@ -193,7 +193,7 @@ is_visible_fxid(FullTransactionId value, const pg_snapshot *snap)
 #ifdef USE_BSEARCH_IF_NXIP_GREATER
 	else if (snap->nxip > USE_BSEARCH_IF_NXIP_GREATER)
 	{
-		void	   *res;
+		const void *res;
 
 		res = bsearch(&value, snap->xip, snap->nxip, sizeof(FullTransactionId),
 					  cmp_fxid);
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 56fa67d1fb5..38bef9df5b5 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -663,7 +663,7 @@ xmltotext_with_options(xmltype *data, XmlOptionType xmloption_arg, bool indent)
 	volatile xmlBufferPtr buf = NULL;
 	volatile	xmlSaveCtxtPtr ctxt = NULL;
 	ErrorSaveContext escontext = {T_ErrorSaveContext};
-	PgXmlErrorContext *xmlerrcxt;
+	PgXmlErrorContext *volatile xmlerrcxt = NULL;
 #endif
 
 	if (xmloption_arg != XMLOPTION_DOCUMENT && !indent)
@@ -704,13 +704,18 @@ xmltotext_with_options(xmltype *data, XmlOptionType xmloption_arg, bool indent)
 		return (text *) data;
 	}
 
-	/* Otherwise, we gotta spin up some error handling. */
-	xmlerrcxt = pg_xml_init(PG_XML_STRICTNESS_ALL);
-
+	/*
+	 * Otherwise, we gotta spin up some error handling.  Unlike most other
+	 * routines in this module, we already have a libxml "doc" structure to
+	 * free, so we need to call pg_xml_init() inside the PG_TRY and be
+	 * prepared for it to fail (typically due to palloc OOM).
+	 */
 	PG_TRY();
 	{
 		size_t		decl_len = 0;
 
+		xmlerrcxt = pg_xml_init(PG_XML_STRICTNESS_ALL);
+
 		/* The serialized data will go into this buffer. */
 		buf = xmlBufferCreate();
 
@@ -838,10 +843,10 @@ xmltotext_with_options(xmltype *data, XmlOptionType xmloption_arg, bool indent)
 			xmlSaveClose(ctxt);
 		if (buf)
 			xmlBufferFree(buf);
-		if (doc)
-			xmlFreeDoc(doc);
+		xmlFreeDoc(doc);
 
-		pg_xml_done(xmlerrcxt, true);
+		if (xmlerrcxt)
+			pg_xml_done(xmlerrcxt, true);
 
 		PG_RE_THROW();
 	}
@@ -1725,7 +1730,7 @@ xml_doctype_in_content(const xmlChar *str)
  * xmloption_arg, but a DOCTYPE node in the input can force DOCUMENT mode).
  *
  * If parsed_nodes isn't NULL and we parse in CONTENT mode, the list
- * of parsed nodes from the xmlParseInNodeContext call will be returned
+ * of parsed nodes from the xmlParseBalancedChunkMemory call will be returned
  * to *parsed_nodes.  (It is caller's responsibility to free that.)
  *
  * Errors normally result in ereport(ERROR), but if escontext is an
@@ -1751,6 +1756,7 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 	PgXmlErrorContext *xmlerrcxt;
 	volatile xmlParserCtxtPtr ctxt = NULL;
 	volatile xmlDocPtr doc = NULL;
+	volatile int save_keep_blanks = -1;
 
 	/*
 	 * This step looks annoyingly redundant, but we must do it to have a
@@ -1778,7 +1784,6 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 	PG_TRY();
 	{
 		bool		parse_as_document = false;
-		int			options;
 		int			res_code;
 		size_t		count = 0;
 		xmlChar    *version = NULL;
@@ -1809,18 +1814,6 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 				parse_as_document = true;
 		}
 
-		/*
-		 * Select parse options.
-		 *
-		 * Note that here we try to apply DTD defaults (XML_PARSE_DTDATTR)
-		 * according to SQL/XML:2008 GR 10.16.7.d: 'Default values defined by
-		 * internal DTD are applied'.  As for external DTDs, we try to support
-		 * them too (see SQL/XML:2008 GR 10.16.7.e), but that doesn't really
-		 * happen because xmlPgEntityLoader prevents it.
-		 */
-		options = XML_PARSE_NOENT | XML_PARSE_DTDATTR
-			| (preserve_whitespace ? 0 : XML_PARSE_NOBLANKS);
-
 		/* initialize output parameters */
 		if (parsed_xmloptiontype != NULL)
 			*parsed_xmloptiontype = parse_as_document ? XMLOPTION_DOCUMENT :
@@ -1830,11 +1823,26 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 
 		if (parse_as_document)
 		{
+			int			options;
+
+			/* set up parser context used by xmlCtxtReadDoc */
 			ctxt = xmlNewParserCtxt();
 			if (ctxt == NULL || xmlerrcxt->err_occurred)
 				xml_ereport(xmlerrcxt, ERROR, ERRCODE_OUT_OF_MEMORY,
 							"could not allocate parser context");
 
+			/*
+			 * Select parse options.
+			 *
+			 * Note that here we try to apply DTD defaults (XML_PARSE_DTDATTR)
+			 * according to SQL/XML:2008 GR 10.16.7.d: 'Default values defined
+			 * by internal DTD are applied'.  As for external DTDs, we try to
+			 * support them too (see SQL/XML:2008 GR 10.16.7.e), but that
+			 * doesn't really happen because xmlPgEntityLoader prevents it.
+			 */
+			options = XML_PARSE_NOENT | XML_PARSE_DTDATTR
+				| (preserve_whitespace ? 0 : XML_PARSE_NOBLANKS);
+
 			doc = xmlCtxtReadDoc(ctxt, utf8string,
 								 NULL,	/* no URL */
 								 "UTF-8",
@@ -1856,10 +1864,7 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 		}
 		else
 		{
-			xmlNodePtr	root;
-			xmlNodePtr	oldroot PG_USED_FOR_ASSERTS_ONLY;
-
-			/* set up document with empty root node to be the context node */
+			/* set up document that xmlParseBalancedChunkMemory will add to */
 			doc = xmlNewDoc(version);
 			if (doc == NULL || xmlerrcxt->err_occurred)
 				xml_ereport(xmlerrcxt, ERROR, ERRCODE_OUT_OF_MEMORY,
@@ -1872,43 +1877,22 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 							"could not allocate XML document");
 			doc->standalone = standalone;
 
-			root = xmlNewNode(NULL, (const xmlChar *) "content-root");
-			if (root == NULL || xmlerrcxt->err_occurred)
-				xml_ereport(xmlerrcxt, ERROR, ERRCODE_OUT_OF_MEMORY,
-							"could not allocate xml node");
-
-			/*
-			 * This attaches root to doc, so we need not free it separately;
-			 * and there can't yet be any old root to free.
-			 */
-			oldroot = xmlDocSetRootElement(doc, root);
-			Assert(oldroot == NULL);
+			/* set parse options --- have to do this the ugly way */
+			save_keep_blanks = xmlKeepBlanksDefault(preserve_whitespace ? 1 : 0);
 
 			/* allow empty content */
 			if (*(utf8string + count))
 			{
-				xmlNodePtr	node_list = NULL;
-				xmlParserErrors res;
-
-				res = xmlParseInNodeContext(root,
-											(char *) utf8string + count,
-											strlen((char *) utf8string + count),
-											options,
-											&node_list);
-
-				if (res != XML_ERR_OK || xmlerrcxt->err_occurred)
+				res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
+													   utf8string + count,
+													   parsed_nodes);
+				if (res_code != 0 || xmlerrcxt->err_occurred)
 				{
-					xmlFreeNodeList(node_list);
 					xml_errsave(escontext, xmlerrcxt,
 								ERRCODE_INVALID_XML_CONTENT,
 								"invalid XML content");
 					goto fail;
 				}
-
-				if (parsed_nodes != NULL)
-					*parsed_nodes = node_list;
-				else
-					xmlFreeNodeList(node_list);
 			}
 		}
 
@@ -1917,6 +1901,8 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 	}
 	PG_CATCH();
 	{
+		if (save_keep_blanks != -1)
+			xmlKeepBlanksDefault(save_keep_blanks);
 		if (doc != NULL)
 			xmlFreeDoc(doc);
 		if (ctxt != NULL)
@@ -1928,6 +1914,9 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 	}
 	PG_END_TRY();
 
+	if (save_keep_blanks != -1)
+		xmlKeepBlanksDefault(save_keep_blanks);
+
 	if (ctxt != NULL)
 		xmlFreeParserCtxt(ctxt);
 
@@ -2349,8 +2338,7 @@ sqlchar_to_unicode(const char *s)
 	char	   *utf8string;
 	pg_wchar	ret[2];			/* need space for trailing zero */
 
-	/* note we're not assuming s is null-terminated */
-	utf8string = pg_server_to_any(s, pg_mblen(s), PG_UTF8);
+	utf8string = pg_server_to_any(s, pg_mblen_cstr(s), PG_UTF8);
 
 	pg_encoding_mb2wchar_with_len(PG_UTF8, utf8string, ret,
 								  pg_encoding_mblen(PG_UTF8, utf8string));
@@ -2403,7 +2391,7 @@ map_sql_identifier_to_xml_name(const char *ident, bool fully_escaped,
 
 	initStringInfo(&buf);
 
-	for (p = ident; *p; p += pg_mblen(p))
+	for (p = ident; *p; p += pg_mblen_cstr(p))
 	{
 		if (*p == ':' && (p == ident || fully_escaped))
 			appendStringInfoString(&buf, "_x003A_");
@@ -2428,7 +2416,7 @@ map_sql_identifier_to_xml_name(const char *ident, bool fully_escaped,
 				: !is_valid_xml_namechar(u))
 				appendStringInfo(&buf, "_x%04X_", (unsigned int) u);
 			else
-				appendBinaryStringInfo(&buf, p, pg_mblen(p));
+				appendBinaryStringInfo(&buf, p, pg_mblen_cstr(p));
 		}
 	}
 
@@ -2451,7 +2439,7 @@ map_xml_name_to_sql_identifier(const char *name)
 
 	initStringInfo(&buf);
 
-	for (p = name; *p; p += pg_mblen(p))
+	for (p = name; *p; p += pg_mblen_cstr(p))
 	{
 		if (*p == '_' && *(p + 1) == 'x'
 			&& isxdigit((unsigned char) *(p + 2))
@@ -2469,7 +2457,7 @@ map_xml_name_to_sql_identifier(const char *name)
 			p += 6;
 		}
 		else
-			appendBinaryStringInfo(&buf, p, pg_mblen(p));
+			appendBinaryStringInfo(&buf, p, pg_mblen_cstr(p));
 	}
 
 	return buf.data;
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 657648996c2..c1bca66a092 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -205,6 +205,10 @@ nameeqfast(Datum a, Datum b)
 	char	   *ca = NameStr(*DatumGetName(a));
 	char	   *cb = NameStr(*DatumGetName(b));
 
+	/*
+	 * Catalogs only use deterministic collations, so ignore column collation
+	 * and use fast path.
+	 */
 	return strncmp(ca, cb, NAMEDATALEN) == 0;
 }
 
@@ -213,6 +217,10 @@ namehashfast(Datum datum)
 {
 	char	   *key = NameStr(*DatumGetName(datum));
 
+	/*
+	 * Catalogs only use deterministic collations, so ignore column collation
+	 * and use fast path.
+	 */
 	return hash_any((unsigned char *) key, strlen(key));
 }
 
@@ -244,17 +252,20 @@ static bool
 texteqfast(Datum a, Datum b)
 {
 	/*
-	 * The use of DEFAULT_COLLATION_OID is fairly arbitrary here.  We just
-	 * want to take the fast "deterministic" path in texteq().
+	 * Catalogs only use deterministic collations, so ignore column collation
+	 * and use "C" locale for efficiency.
 	 */
-	return DatumGetBool(DirectFunctionCall2Coll(texteq, DEFAULT_COLLATION_OID, a, b));
+	return DatumGetBool(DirectFunctionCall2Coll(texteq, C_COLLATION_OID, a, b));
 }
 
 static uint32
 texthashfast(Datum datum)
 {
-	/* analogously here as in texteqfast() */
-	return DatumGetInt32(DirectFunctionCall1Coll(hashtext, DEFAULT_COLLATION_OID, datum));
+	/*
+	 * Catalogs only use deterministic collations, so ignore column collation
+	 * and use "C" locale for efficiency.
+	 */
+	return DatumGetInt32(DirectFunctionCall1Coll(hashtext, C_COLLATION_OID, datum));
 }
 
 static bool
@@ -1661,7 +1672,7 @@ ReleaseCatCacheWithOwner(HeapTuple tuple, ResourceOwner resowner)
 
 	ct->refcount--;
 	if (resowner)
-		ResourceOwnerForgetCatCacheRef(CurrentResourceOwner, &ct->tuple);
+		ResourceOwnerForgetCatCacheRef(resowner, &ct->tuple);
 
 	if (
 #ifndef CATCACHE_FORCE_RELEASE
@@ -2103,7 +2114,7 @@ ReleaseCatCacheListWithOwner(CatCList *list, ResourceOwner resowner)
 	Assert(list->refcount > 0);
 	list->refcount--;
 	if (resowner)
-		ResourceOwnerForgetCatCacheListRef(CurrentResourceOwner, list);
+		ResourceOwnerForgetCatCacheListRef(resowner, list);
 
 	if (
 #ifndef CATCACHE_FORCE_RELEASE
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 02505c88b8e..30048e153e5 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -1583,13 +1583,17 @@ CacheInvalidateHeapTuple(Relation relation,
  *		implied.
  *
  * Like CacheInvalidateHeapTuple(), but for inplace updates.
+ *
+ * Just before and just after the inplace update, the tuple's cache keys must
+ * match those in key_equivalent_tuple.  Cache keys consist of catcache lookup
+ * key columns and columns referencing pg_class.oid values,
+ * e.g. pg_constraint.conrelid, which would trigger relcache inval.
  */
 void
 CacheInvalidateHeapTupleInplace(Relation relation,
-								HeapTuple tuple,
-								HeapTuple newtuple)
+								HeapTuple key_equivalent_tuple)
 {
-	CacheInvalidateHeapTupleCommon(relation, tuple, newtuple,
+	CacheInvalidateHeapTupleCommon(relation, key_equivalent_tuple, NULL,
 								   PrepareInplaceInvalidationState);
 }
 
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 5c24eaa1be2..42081b6902b 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/cache/lsyscache.c
@@ -880,6 +880,44 @@ comparison_ops_are_compatible(Oid opno1, Oid opno2)
 	return result;
 }
 
+/*
+ * collations_agree_on_equality
+ *		Return true if the two collations have equivalent notions of equality,
+ *		so that a uniqueness or equality proof established under one side
+ *		carries over to a comparison performed under the other side.
+ *
+ * Note: this is equality compatibility only.  Do NOT use this to reason
+ * about ordering.
+ *
+ * An InvalidOid on either side denotes the absence of a collation -- that
+ * side's operation is not collation-sensitive (e.g. a non-collatable column
+ * type).  Absence of a collation cannot conflict with the other side's
+ * collation, so we treat such pairs as agreeing on equality.  This generalizes
+ * the asymmetric treatment in IndexCollMatchesExprColl().
+ *
+ * Otherwise the collations have equivalent equality if they match, or if both
+ * are deterministic: by definition a deterministic collation treats two
+ * strings as equal iff they are byte-wise equal (see CREATE COLLATION), so any
+ * two deterministic collations share the same equality relation.  A mismatch
+ * involving a nondeterministic collation, however, may mean the two equality
+ * relations disagree, and the proof is unsound.
+ */
+bool
+collations_agree_on_equality(Oid coll1, Oid coll2)
+{
+	if (!OidIsValid(coll1) || !OidIsValid(coll2))
+		return true;
+
+	if (coll1 == coll2)
+		return true;
+
+	if (!get_collation_isdeterministic(coll1) ||
+		!get_collation_isdeterministic(coll2))
+		return false;
+
+	return true;
+}
+
 
 /*				---------- AMPROC CACHES ----------						 */
 
diff --git a/src/backend/utils/cache/meson.build b/src/backend/utils/cache/meson.build
index 85a62232b9d..019b7c3a170 100644
--- a/src/backend/utils/cache/meson.build
+++ b/src/backend/utils/cache/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_sources += files(
diff --git a/src/backend/utils/cache/packagecache.c b/src/backend/utils/cache/packagecache.c
index 8f29febba1a..8052f631a14 100644
--- a/src/backend/utils/cache/packagecache.c
+++ b/src/backend/utils/cache/packagecache.c
@@ -21,7 +21,7 @@
  *
  * Authored by dwdai@highgo.com,20220929.
  *
- * Copyright (c) 2022-2025, IvorySQL Global Development Team
+ * Copyright (c) 2022-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/cache/packagecache.c
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index 0df01b5673a..3ce044c7036 100644
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -46,7 +46,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/cache/plancache.c
diff --git a/src/backend/utils/cache/relfilenumbermap.c b/src/backend/utils/cache/relfilenumbermap.c
index 8a2f6f8c693..0b6f9cf3fa1 100644
--- a/src/backend/utils/cache/relfilenumbermap.c
+++ b/src/backend/utils/cache/relfilenumbermap.c
@@ -130,6 +130,11 @@ InitializeRelfilenumberMap(void)
  * Map a relation's (tablespace, relfilenumber) to a relation's oid and cache
  * the result.
  *
+ * A temporary relation may share its relfilenumber with a permanent relation
+ * or temporary relations created in other backends.  Being able to uniquely
+ * identify a temporary relation would require a backend's proc number, which
+ * we do not know about.  Hence, this function ignores this case.
+ *
  * Returns InvalidOid if no relation matching the criteria could be found.
  */
 Oid
@@ -208,6 +213,9 @@ RelidByRelfilenumber(Oid reltablespace, RelFileNumber relfilenumber)
 		{
 			Form_pg_class classform = (Form_pg_class) GETSTRUCT(ntp);
 
+			if (classform->relpersistence == RELPERSISTENCE_TEMP)
+				continue;
+
 			if (found)
 				elog(ERROR,
 					 "unexpected duplicate for tablespace %u, relfilenumber %u",
diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c
index fdac3c048e3..c3159ed7d97 100644
--- a/src/backend/utils/error/csvlog.c
+++ b/src/backend/utils/error/csvlog.c
@@ -120,7 +120,7 @@ write_csvlog(ErrorData *edata)
 	appendStringInfoChar(&buf, ',');
 
 	/* session id */
-	appendStringInfo(&buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid);
+	appendStringInfo(&buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
 	appendStringInfoChar(&buf, ',');
 
 	/* Line number */
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 47af743990f..d78f3ab8a30 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2956,12 +2956,12 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
 				{
 					char		strfbuf[128];
 
-					snprintf(strfbuf, sizeof(strfbuf) - 1, INT64_HEX_FORMAT ".%x",
+					snprintf(strfbuf, sizeof(strfbuf) - 1, "%" PRIx64 ".%x",
 							 MyStartTime, MyProcPid);
 					appendStringInfo(buf, "%*s", padding, strfbuf);
 				}
 				else
-					appendStringInfo(buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid);
+					appendStringInfo(buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
 				break;
 			case 'p':
 				if (padding != 0)
@@ -3783,13 +3783,24 @@ write_stderr(const char *fmt,...)
 {
 	va_list		ap;
 
+	va_start(ap, fmt);
+	vwrite_stderr(fmt, ap);
+	va_end(ap);
+}
+
+
+/*
+ * Write errors to stderr (or by equal means when stderr is
+ * not available) - va_list version
+ */
+void
+vwrite_stderr(const char *fmt, va_list ap)
+{
 #ifdef WIN32
 	char		errbuf[2048];	/* Arbitrary size? */
 #endif
 
 	fmt = _(fmt);
-
-	va_start(ap, fmt);
 #ifndef WIN32
 	/* On Unix, we just fprintf to stderr */
 	vfprintf(stderr, fmt, ap);
@@ -3812,5 +3823,4 @@ write_stderr(const char *fmt,...)
 		fflush(stderr);
 	}
 #endif
-	va_end(ap);
 }
diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c
index 519eacf17f8..2619f499042 100644
--- a/src/backend/utils/error/jsonlog.c
+++ b/src/backend/utils/error/jsonlog.c
@@ -168,7 +168,7 @@ write_jsonlog(ErrorData *edata)
 	}
 
 	/* Session id */
-	appendJSONKeyValueFmt(&buf, "session_id", true, INT64_HEX_FORMAT ".%x",
+	appendJSONKeyValueFmt(&buf, "session_id", true, "%" PRIx64 ".%x",
 						  MyStartTime, MyProcPid);
 
 	/* Line number */
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 4bb84ff7087..1366521f471 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -100,12 +100,19 @@ load_external_function(const char *filename, const char *funcname,
 	void	   *retval;
 
 	/*
-	 * If the value starts with "$libdir/", strip that.  This is because many
-	 * extensions have hardcoded '$libdir/foo' as their library name, which
-	 * prevents using the path.
+	 * For extensions with hardcoded '$libdir/' library names, we strip the
+	 * prefix to allow the library search path to be used. This is done only
+	 * for simple names (e.g., "$libdir/foo"), not for nested paths (e.g.,
+	 * "$libdir/foo/bar").
+	 *
+	 * For nested paths, 'expand_dynamic_library_name' directly expands the
+	 * '$libdir' macro, so we leave them untouched.
 	 */
 	if (strncmp(filename, "$libdir/", 8) == 0)
-		filename += 8;
+	{
+		if (first_dir_separator(filename + 8) == NULL)
+			filename += 8;
+	}
 
 	/* Expand the possibly-abbreviated filename to an exact path name */
 	fullname = expand_dynamic_library_name(filename);
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 841c5c19ecd..65c4da9bfc8 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -133,8 +133,8 @@ fmgr_info(Oid functionId, FmgrInfo *finfo)
 }
 
 /*
- * like fmgr_info, we handle function not from pg_proc
- * but we force it to plisql_call_handle
+ * Similar to fmgr_info, but handles functions not present in pg_proc by
+ * resolving to the PL/iSQL call handler.
  */
 void
 fmgr_subproc_info_cxt(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt)
@@ -154,7 +154,7 @@ fmgr_subproc_info_cxt(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt)
 	finfo->fn_mcxt = mcxt;
 	finfo->fn_expr = NULL;		/* caller may set this later */
 
-	finfo->fn_strict = false; /* inline function is awalys not strict */
+	finfo->fn_strict = false;	/* inline functions are always not strict */
 
 
 	languageTuple = SearchSysCache1(LANGOID, language);
@@ -2248,7 +2248,7 @@ CheckFunctionValidatorAccess(Oid validatorOid, Oid functionOid)
 
 	/* first validate that we have permissions to use the language */
 	aclresult = object_aclcheck(LanguageRelationId, procStruct->prolang, GetUserId(),
-									 ACL_USAGE);
+								ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
 		aclcheck_error(aclresult, OBJECT_LANGUAGE,
 					   NameStr(langStruct->lanname));
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index f801c63557b..fd5fa458efa 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -4,7 +4,7 @@
  *	  Utility and convenience functions for fmgr functions that return
  *	  sets and/or composite types, or deal with VARIADIC inputs.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2002-2025, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
@@ -51,7 +51,7 @@ typedef struct polymorphic_actuals
 	Oid			anymultirange_type; /* anymultirange mapping, if known */
 } polymorphic_actuals;
 
-PLiSQL_funcs_call plisql_internal_funcs = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false};
+PLiSQL_funcs_call plisql_internal_funcs = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false};
 
 static void shutdown_MultiFuncCall(Datum arg);
 static TypeFuncClass internal_get_result_type(Oid funcid,
@@ -450,13 +450,13 @@ internal_get_result_type(Oid funcid,
 
 	if (call_expr != NULL && nodeTag(call_expr) == T_FuncExpr)
 	{
-		FuncExpr *funcexpr = (FuncExpr *) call_expr;
+		FuncExpr   *funcexpr = (FuncExpr *) call_expr;
 
 		if (!FUNC_EXPR_FROM_PG_PROC(funcexpr->function_from))
 			return get_internal_function_result_type(funcexpr,
-													rsinfo,
-													resultTypeId,
-													resultTupleDesc);
+													 rsinfo,
+													 resultTypeId,
+													 resultTupleDesc);
 	}
 
 	/* First fetch the function's pg_proc row to inspect its rettype */
@@ -501,7 +501,7 @@ internal_get_result_type(Oid funcid,
 
 		if (!type_is_rowtype(rettype) && SPI_get_connected() <= 0)
 		{
-			FuncExpr *func = (FuncExpr *) call_expr;
+			FuncExpr   *func = (FuncExpr *) call_expr;
 
 			func->funcresulttype = RECORDOID;
 			func->funccollid = 0;
@@ -1740,11 +1740,11 @@ build_function_result_tupdesc_t(HeapTuple procTuple)
 	Datum		proargnames;
 	bool		isnull;
 	Datum		proargtypenames;
-	Oid		rettype = get_func_real_rettype(procTuple);
+	Oid			rettype = get_func_real_rettype(procTuple);
 
 	/* Return NULL if the function isn't declared to return RECORD */
-	if (rettype != RECORDOID && 
-	    LANG_PLISQL_OID != procform->prolang) 
+	if (rettype != RECORDOID &&
+		LANG_PLISQL_OID != procform->prolang)
 		return NULL;
 
 	/* If there are no OUT parameters, return NULL */
@@ -1767,8 +1767,8 @@ build_function_result_tupdesc_t(HeapTuple procTuple)
 	if (ORA_PARSER == compatible_db)
 	{
 		proargtypenames = SysCacheGetAttr(PROCOID, procTuple,
-									Anum_pg_proc_protypenames,
-									&isnull);
+										  Anum_pg_proc_protypenames,
+										  &isnull);
 		if (isnull)
 			proargtypenames = PointerGetDatum(NULL);
 	}
@@ -1779,17 +1779,17 @@ build_function_result_tupdesc_t(HeapTuple procTuple)
 		LANG_PLISQL_OID == procform->prolang &&
 		procform->prokind == PROKIND_FUNCTION)
 		return build_plisql_function_result_tupdesc_d(procform->prokind,
-								   proallargtypes,
-								   proargmodes,
-								   proargnames,
-								   rettype,
-								   proargtypenames);
+													  proallargtypes,
+													  proargmodes,
+													  proargnames,
+													  rettype,
+													  proargtypenames);
 	else
 		return build_function_result_tupdesc_d(procform->prokind,
-							   proallargtypes,
-							   proargmodes,
-							   proargnames,
-							   proargtypenames);
+											   proallargtypes,
+											   proargmodes,
+											   proargnames,
+											   proargtypenames);
 }
 
 /*
@@ -1806,7 +1806,7 @@ build_internal_function_result_tupdesc_t(FuncExpr *fexpr)
 /*
  * get internal func name
  */
-char*
+char *
 get_internal_function_name(FuncExpr *fexpr)
 {
 	plisql_internel_funcs_init();
@@ -1814,8 +1814,8 @@ get_internal_function_name(FuncExpr *fexpr)
 	if (fexpr->function_from == FUNC_FROM_PACKAGE &&
 		fexpr->function_name != NULL)
 	{
-		char *function_name;
-		List *namelist = stringToNode(fexpr->function_name);
+		char	   *function_name;
+		List	   *namelist = stringToNode(fexpr->function_name);
 
 		function_name = NameListToQuotedString(namelist);
 
@@ -1835,9 +1835,9 @@ get_internal_function_name(FuncExpr *fexpr)
  */
 TypeFuncClass
 get_internal_function_result_type(FuncExpr *fexpr,
-						 ReturnSetInfo *rsinfo,
-						 Oid *resultTypeId,
-						 TupleDesc *resultTupleDesc)
+								  ReturnSetInfo *rsinfo,
+								  Oid *resultTypeId,
+								  TupleDesc *resultTupleDesc)
 {
 	plisql_internel_funcs_init();
 
@@ -1845,9 +1845,9 @@ get_internal_function_result_type(FuncExpr *fexpr,
 		set_pkginfo_from_funcexpr(fexpr);
 
 	return plisql_internal_funcs.get_internal_func_result_type(fexpr,
-												NULL,
-												resultTypeId,
-												resultTupleDesc);
+															   NULL,
+															   resultTypeId,
+															   resultTupleDesc);
 }
 
 /*
@@ -1872,7 +1872,7 @@ get_internal_function_outargs(FuncExpr *fexpr)
 }
 
 /*
- * get plisql internal function result name
+ * Get the result name of a PL/iSQL internal function.
  */
 char *
 get_internal_function_result_name(FuncExpr *fexpr)
@@ -1883,13 +1883,13 @@ get_internal_function_result_name(FuncExpr *fexpr)
 }
 
 /*
- * like get_func_typename_info
- * we get function args typename and return typename
+ * Similar to get_func_typename_info: return argument type names and
+ * return type name.
  */
 void
 get_func_typename_info(HeapTuple procTup,
-						char ***p_argtypeNames,
-						char **rettypeName)
+					   char ***p_argtypeNames,
+					   char **rettypeName)
 
 {
 	Datum		protypenames;
@@ -1903,15 +1903,15 @@ get_func_typename_info(HeapTuple procTup,
 	if (p_argtypeNames != NULL)
 	{
 		protypenames = SysCacheGetAttr(PROCOID, procTup,
-									Anum_pg_proc_protypenames,
-									&isNull);
+									   Anum_pg_proc_protypenames,
+									   &isNull);
 		if (isNull)
 			*p_argtypeNames = NULL;
 		else
 		{
 			deconstruct_array(DatumGetArrayTypeP(protypenames),
-							TEXTOID, -1, false, 'i',
-							&elems, NULL, &nelems);
+							  TEXTOID, -1, false, 'i',
+							  &elems, NULL, &nelems);
 			*p_argtypeNames = (char **) palloc(sizeof(char *) * nelems);
 			for (i = 0; i < nelems; i++)
 				(*p_argtypeNames)[i] = TextDatumGetCString(elems[i]);
@@ -1922,8 +1922,8 @@ get_func_typename_info(HeapTuple procTup,
 	if (rettypeName != NULL)
 	{
 		prorettypename = SysCacheGetAttr(PROCOID, procTup,
-									Anum_pg_proc_rettypename,
-									&isNull);
+										 Anum_pg_proc_rettypename,
+										 &isNull);
 		if (isNull)
 			*rettypeName = NULL;
 		else
@@ -1932,6 +1932,52 @@ get_func_typename_info(HeapTuple procTup,
 
 }
 
+/*
+ * get subproc prokind
+ */
+char
+get_subproc_kind(FuncExpr *fexpr)
+{
+	plisql_internel_funcs_init();
+
+	return plisql_internal_funcs.get_subproc_prokind(fexpr);
+}
+
+/*
+ * get subproc arginfo
+ */
+int
+get_subproc_arg_info(FuncExpr *fexpr,
+			Oid **p_argtypes,
+			char ***p_argnames,
+			char **p_argmodes)
+{
+	plisql_internel_funcs_init();
+
+	return plisql_internal_funcs.get_subproc_arg_info(fexpr,
+								p_argtypes,
+								p_argnames,
+								p_argmodes);
+}
+
+/*
+ * check if subproc should chanage its return type
+ */
+bool
+subproc_should_change_return_type(FuncExpr *fexpr,
+					Oid *rettype,
+					int32 *typmod,
+					Oid *collationoid)
+{
+	plisql_internel_funcs_init();
+
+	return plisql_internal_funcs.subproc_should_change_return_type(fexpr,
+								rettype,
+								typmod,
+								collationoid);
+}
+
+
 /*
  * build_function_result_tupdesc_d
  *
@@ -1961,7 +2007,7 @@ build_function_result_tupdesc_d(char prokind,
 	int			numoutargs;
 	int			nargnames;
 	int			i;
-	char		**argtypenames = NULL;
+	char	  **argtypenames = NULL;
 
 	/* Can't have output args if columns are null */
 	if (proallargtypes == PointerGetDatum(NULL) ||
@@ -2009,8 +2055,8 @@ build_function_result_tupdesc_d(char prokind,
 		int			nelems;
 
 		deconstruct_array(DatumGetArrayTypeP(proargtypenames),
-								TEXTOID, -1, false, 'i',
-								&elems, NULL, &nelems);
+						  TEXTOID, -1, false, 'i',
+						  &elems, NULL, &nelems);
 		argtypenames = (char **) palloc(sizeof(char *) * nelems);
 		for (i = 0; i < nelems; i++)
 			argtypenames[i] = TextDatumGetCString(elems[i]);
@@ -2038,8 +2084,8 @@ build_function_result_tupdesc_d(char prokind,
 		outargtypes[numoutargs] = argtypes[i];
 		if (argtypenames != NULL && strcmp(argtypenames[i], "") != 0)
 		{
-			TypeName	*tname;
-			PkgType *pkgtype;
+			TypeName   *tname;
+			PkgType    *pkgtype;
 
 			tname = (TypeName *) stringToNode(argtypenames[i]);
 
@@ -2071,7 +2117,14 @@ build_function_result_tupdesc_d(char prokind,
 			pfree(tname);
 		}
 
-		if (argnames)
+		/*
+		 * If the guc pararmeter out_parameter_column_position is set to true,
+		 * make out parameter column name to special,
+		 * so we can distinguish it from the return value
+		 */
+		if (out_parameter_column_position)
+			pname = psprintf("_column_%d", i + 1);
+		else if (argnames)
 			pname = TextDatumGetCString(argnames[i]);
 		else
 			pname = NULL;
@@ -2117,30 +2170,34 @@ build_function_result_tupdesc_d(char prokind,
  */
 TupleDesc
 build_plisql_function_result_tupdesc_d(char prokind,
-					Datum proallargtypes,
-					Datum proargmodes,
-					Datum proargnames,
-					Oid prorettype,
-					Datum proargtypenames)
+									   Datum proallargtypes,
+									   Datum proargmodes,
+									   Datum proargnames,
+									   Oid prorettype,
+									   Datum proargtypenames)
 {
-	int 		i = 0;
-	int 		j = 0;
+	int			i = 0;
+	int			j = 0;
 	TupleDesc	desc;
 	ArrayType  *arr = NULL;
-	int 	    numargs;
-	Oid 	   *argtypes = NULL;
+	int			numargs;
+	Oid		   *argtypes = NULL;
 	char	   *argmodes = NULL;
 	Datum	   *argnames = NULL;
-	Oid 	   *outargtypes = NULL;
+	Oid		   *outargtypes = NULL;
 	char	  **outargnames = NULL;
-	char		**argtypenames = NULL;
-	int 		numoutargs;
-	int 		nargnames;
+	char	  **argtypenames = NULL;
+	int			numoutargs;
+	int			nargnames;
 
-	/* Can't have output args if columns are null, plisql function call return null */
+	/*
+	 * Can't have output args if columns are null, plisql function call return
+	 * null
+	 */
 	if (proallargtypes == PointerGetDatum(NULL) ||
 		proargmodes == PointerGetDatum(NULL))
 		return NULL;
+
 	/*
 	 * We expect the arrays to be 1-D arrays of the right types; verify that.
 	 * For the OID and char arrays, we don't need to use deconstruct_array()
@@ -2178,14 +2235,14 @@ build_plisql_function_result_tupdesc_d(char prokind,
 	}
 
 	if (ORA_PARSER == compatible_db &&
-	    proargtypenames != PointerGetDatum(NULL))
+		proargtypenames != PointerGetDatum(NULL))
 	{
-		Datum	*elems;
-		int	nelems;
+		Datum	   *elems;
+		int			nelems;
 
 		deconstruct_array(DatumGetArrayTypeP(proargtypenames),
-							TEXTOID, -1, false, 'i',
-							&elems, NULL, &nelems);
+						  TEXTOID, -1, false, 'i',
+						  &elems, NULL, &nelems);
 
 		argtypenames = (char **) palloc(sizeof(char *) * nelems);
 
@@ -2217,8 +2274,8 @@ build_plisql_function_result_tupdesc_d(char prokind,
 
 		if (argtypenames != NULL && strcmp(argtypenames[i], "") != 0)
 		{
-			TypeName	*tname;
-			PkgType 	*pkgtype;
+			TypeName   *tname;
+			PkgType    *pkgtype;
 
 			tname = (TypeName *) stringToNode(argtypenames[i]);
 			pkgtype = LookupPkgTypeByTypename(tname->names, false);
@@ -2251,9 +2308,9 @@ build_plisql_function_result_tupdesc_d(char prokind,
 		}
 
 		/*
-		 * If the out_parameter_column_position is set to true,
-		 * give out parameter column a special name,
-		 * so that we can distinguish it in the return values
+		 * If the out_parameter_column_position is set to true, give out
+		 * parameter column a special name, so that we can distinguish it in
+		 * the return values
 		 */
 		if (out_parameter_column_position)
 			pname = psprintf("_column_%d", i + 1);
@@ -2301,19 +2358,19 @@ build_plisql_function_result_tupdesc_d(char prokind,
 	for (j = 0; j < numoutargs; j++)
 	{
 		TupleDescInitEntry(desc, ++i,
-					outargnames[j],
-					outargtypes[j],
-					-1,
-					0); 	
+						   outargnames[j],
+						   outargtypes[j],
+						   -1,
+						   0);
 	}
 
 	if (prorettype != VOIDOID)
 	{
 		TupleDescInitEntry(desc, ++i,
-					"_RETVAL_",
-					prorettype,
-					-1,
-					0);
+						   "_RETVAL_",
+						   prorettype,
+						   -1,
+						   0);
 	}
 
 	pfree(outargtypes);
@@ -2575,8 +2632,8 @@ extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start,
 /*
  * func_should_change_return_type
  *
- * a plisql function has out parameters and the return type is not a record, 
- * should change its return type if it is called from SQL, so that we can 
+ * a plisql function has out parameters and the return type is not a record,
+ * should change its return type if it is called from SQL, so that we can
  * return out parameters and the return value.
  *
  * we use function' informations to decide whether the return type should
@@ -2585,22 +2642,22 @@ extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start,
 bool
 func_should_change_return_type(Oid functionId, Oid *rettype, int32 *typmod, Oid *collationoid)
 {
-	bool	    result = false;
+	bool		result = false;
 	HeapTuple	procTuple;
 	Form_pg_proc procStruct;
 	Datum		proargmodes;
 	Datum		proargtypes;
 	bool		isnull;
-	ArrayType	*arr = NULL;
-	ArrayType	*typearr = NULL;
-	char	   	*argmodes = NULL;
-	Oid		*argtypes = NULL;
-	int		numargs = 0;
-	int		nargtypes = 0;
-	int		i = 0;
-	int		outnargs = 0;
-	int		outdno = -1;
-	Oid		rettypeoid;
+	ArrayType  *arr = NULL;
+	ArrayType  *typearr = NULL;
+	char	   *argmodes = NULL;
+	Oid		   *argtypes = NULL;
+	int			numargs = 0;
+	int			nargtypes = 0;
+	int			i = 0;
+	int			outnargs = 0;
+	int			outdno = -1;
+	Oid			rettypeoid;
 
 	/* fetch the pg_proc info of function */
 	procTuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(functionId));
@@ -2624,15 +2681,15 @@ func_should_change_return_type(Oid functionId, Oid *rettype, int32 *typmod, Oid
 	{
 		/* Get the data out of the tuple */
 		proargmodes = SysCacheGetAttr(PROCOID, procTuple,
-						  Anum_pg_proc_proargmodes,
-						  &isnull);
+									  Anum_pg_proc_proargmodes,
+									  &isnull);
 		Assert(!isnull);
 
 		/*
-		 * The arrays should be 1-D arrays of the right types.
-		 * For the char array, don't bother to call deconstruct_array()
+		 * The arrays should be 1-D arrays of the right types. For the char
+		 * array, don't bother to call deconstruct_array()
 		 */
-		arr = DatumGetArrayTypeP(proargmodes);	
+		arr = DatumGetArrayTypeP(proargmodes);
 		numargs = ARR_DIMS(arr)[0];
 
 		if (ARR_NDIM(arr) != 1 ||
@@ -2643,11 +2700,12 @@ func_should_change_return_type(Oid functionId, Oid *rettype, int32 *typmod, Oid
 
 		argmodes = (char *) ARR_DATA_PTR(arr);
 		proargtypes = SysCacheGetAttr(PROCOID, procTuple,
-						 Anum_pg_proc_proallargtypes,
-						 &isnull);
+									  Anum_pg_proc_proallargtypes,
+									  &isnull);
+
 		/*
-		 * The arrays should be 1-D arrays of the right types.
-		 * For the OID and char array, don't bother to call deconstruct_array()
+		 * The arrays should be 1-D arrays of the right types. For the OID and
+		 * char array, don't bother to call deconstruct_array()
 		 */
 		typearr = DatumGetArrayTypeP(proargtypes);
 		nargtypes = ARR_DIMS(typearr)[0];
@@ -2676,9 +2734,9 @@ func_should_change_return_type(Oid functionId, Oid *rettype, int32 *typmod, Oid
 		}
 	}
 
-	/* There are more than one out-parameters, 
-	 * or only one out-parameter but with return type, 
-	 * change the return type to be record 
+	/*
+	 * There are more than one out-parameters, or only one out-parameter but
+	 * with return type, change the return type to be record
 	 */
 	if (outnargs >= 2 || (outnargs == 1 && rettypeoid != VOIDOID))
 	{
@@ -2689,10 +2747,11 @@ func_should_change_return_type(Oid functionId, Oid *rettype, int32 *typmod, Oid
 	}
 	else if (outnargs == 1 && rettypeoid == VOIDOID)
 	{
-		/* one out-parameter without return type, 
-		 * change the return type to be out-parameter type 
+		/*
+		 * one out-parameter without return type, change the return type to be
+		 * out-parameter type
 		 */
-		Form_pg_type 	pt;
+		Form_pg_type pt;
 		HeapTuple	typeTuple;
 
 		typeTuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(argtypes[outdno]));
@@ -2727,7 +2786,7 @@ get_func_prostatus(HeapTuple procTup)
 
 	/* Get prostatus */
 	prostaus_datum = SysCacheGetAttr(PROCOID, procTup, Anum_pg_proc_prostatus,
-							&isNull);
+									 &isNull);
 
 	if (isNull)
 		result = PROSTATUS_NA;
@@ -2746,8 +2805,8 @@ change_func_prostatus(Oid funcOid, char prostatus)
 	bool		nulls[Natts_pg_proc];
 	Datum		values[Natts_pg_proc];
 	bool		replaces[Natts_pg_proc];
-	int 		i;
-	HeapTuple newtuple;
+	int			i;
+	HeapTuple	newtuple;
 	Relation	rel;
 	HeapTuple	oldprocTup;
 	char		ori_prostatus;
@@ -2782,4 +2841,3 @@ change_func_prostatus(Oid funcOid, char prostatus)
 	ReleaseSysCache(oldprocTup);
 	table_close(rel, RowExclusiveLock);
 }
-
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 1ad155d446e..5e68eab7e66 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -760,7 +760,7 @@ init_htab(HTAB *hashp, long nelem)
 	hctl->nelem_alloc = choose_nelem_alloc(hctl->entrysize);
 
 #ifdef HASH_DEBUG
-	fprintf(stderr, "init_htab:\n%s%p\n%s%ld\n%s%ld\n%s%d\n%s%ld\n%s%u\n%s%x\n%s%x\n%s%ld\n",
+	fprintf(stderr, "init_htab:\n%s%p\n%s%ld\n%s%ld\n%s%d\n%s%u\n%s%x\n%s%x\n%s%ld\n",
 			"TABLE POINTER   ", hashp,
 			"DIRECTORY SIZE  ", hctl->dsize,
 			"SEGMENT SIZE    ", hctl->ssize,
@@ -1158,6 +1158,8 @@ hash_update_hash_key(HTAB *hashp,
 	HashCompareFunc match;
 
 #ifdef HASH_STATISTICS
+	HASHHDR    *hctl = hashp->hctl;
+
 	hash_accesses++;
 	hctl->accesses++;
 #endif
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 43b4dbccc3d..df182577a19 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -1099,7 +1099,8 @@ EstimateClientConnectionInfoSpace(void)
  * Serialize MyClientConnectionInfo for use by parallel workers.
  */
 void
-SerializeClientConnectionInfo(Size maxsize, char *start_address)
+SerializeClientConnectionInfo(Size maxsize PG_USED_FOR_ASSERTS_ONLY,
+							  char *start_address)
 {
 	SerializedClientConnectionInfo serialized = {0};
 
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 886ecbad871..576419dbca0 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -38,6 +38,7 @@
 #include "catalog/namespace.h"
 #include "mb/pg_wchar.h"
 #include "utils/fmgrprotos.h"
+#include "utils/memdebug.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "varatt.h"
@@ -97,6 +98,13 @@ static char *perform_default_encoding_conversion(const char *src,
 												 int len, bool is_client_to_server);
 static int	cliplen(const char *str, int len, int limit);
 
+pg_noreturn
+static void report_invalid_encoding_int(int encoding, const char *mbstr,
+										int mblen, int len);
+
+pg_noreturn
+static void report_invalid_encoding_db(const char *mbstr, int mblen, int len);
+
 
 /*
  * Prepare for a future call to SetClientEncoding.  Success should mean
@@ -1019,11 +1027,128 @@ pg_encoding_wchar2mb_with_len(int encoding,
 	return pg_wchar_table[encoding].wchar2mb_with_len(from, (unsigned char *) to, len);
 }
 
-/* returns the byte length of a multibyte character */
+/*
+ * Returns the byte length of a multibyte character sequence in a
+ * null-terminated string.  Raises an illegal byte sequence error if the
+ * sequence would hit a null terminator.
+ *
+ * The caller is expected to have checked for a terminator at *mbstr == 0
+ * before calling, but some callers want 1 in that case, so this function
+ * continues that tradition.
+ *
+ * This must only be used for strings that have a null-terminator to enable
+ * bounds detection.
+ */
+int
+pg_mblen_cstr(const char *mbstr)
+{
+	int			length = pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
+
+	/*
+	 * The .mblen functions return 1 when given a pointer to a terminator.
+	 * Some callers depend on that, so we tolerate it for now.  Well-behaved
+	 * callers check the leading byte for a terminator *before* calling.
+	 */
+	for (int i = 1; i < length; ++i)
+		if (unlikely(mbstr[i] == 0))
+			report_invalid_encoding_db(mbstr, length, i);
+
+	/*
+	 * String should be NUL-terminated, but checking that would make typical
+	 * callers O(N^2), tripling Valgrind check-world time.  Unless
+	 * VALGRIND_EXPENSIVE, check 1 byte after each actual character.  (If we
+	 * found a character, not a terminator, the next byte must be a terminator
+	 * or the start of the next character.)  If the caller iterates the whole
+	 * string, the last call will diagnose a missing terminator.
+	 */
+	if (mbstr[0] != '\0')
+	{
+#ifdef VALGRIND_EXPENSIVE
+		VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, strlen(mbstr));
+#else
+		VALGRIND_CHECK_MEM_IS_DEFINED(mbstr + length, 1);
+#endif
+	}
+
+	return length;
+}
+
+/*
+ * Returns the byte length of a multibyte character sequence bounded by a range
+ * [mbstr, end) of at least one byte in size.  Raises an illegal byte sequence
+ * error if the sequence would exceed the range.
+ */
+int
+pg_mblen_range(const char *mbstr, const char *end)
+{
+	int			length = pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
+
+	Assert(end > mbstr);
+
+	if (unlikely(mbstr + length > end))
+		report_invalid_encoding_db(mbstr, length, end - mbstr);
+
+#ifdef VALGRIND_EXPENSIVE
+	VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, end - mbstr);
+#else
+	VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, length);
+#endif
+
+	return length;
+}
+
+/*
+ * Returns the byte length of a multibyte character sequence bounded by a range
+ * extending for 'limit' bytes, which must be at least one.  Raises an illegal
+ * byte sequence error if the sequence would exceed the range.
+ */
+int
+pg_mblen_with_len(const char *mbstr, int limit)
+{
+	int			length = pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
+
+	Assert(limit >= 1);
+
+	if (unlikely(length > limit))
+		report_invalid_encoding_db(mbstr, length, limit);
+
+#ifdef VALGRIND_EXPENSIVE
+	VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, limit);
+#else
+	VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, length);
+#endif
+
+	return length;
+}
+
+
+/*
+ * Returns the length of a multibyte character sequence, without any
+ * validation of bounds.
+ *
+ * PLEASE NOTE:  This function can only be used safely if the caller has
+ * already verified the input string, since otherwise there is a risk of
+ * overrunning the buffer if the string is invalid.  A prior call to a
+ * pg_mbstrlen* function suffices.
+ */
+int
+pg_mblen_unbounded(const char *mbstr)
+{
+	int			length = pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
+
+	VALGRIND_CHECK_MEM_IS_DEFINED(mbstr, length);
+
+	return length;
+}
+
+/*
+ * Historical name for pg_mblen_unbounded().  Should not be used and will be
+ * removed in a later version.
+ */
 int
 pg_mblen(const char *mbstr)
 {
-	return pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
+	return pg_mblen_unbounded(mbstr);
 }
 
 /* returns the display length of a multibyte character */
@@ -1045,14 +1170,14 @@ pg_mbstrlen(const char *mbstr)
 
 	while (*mbstr)
 	{
-		mbstr += pg_mblen(mbstr);
+		mbstr += pg_mblen_cstr(mbstr);
 		len++;
 	}
 	return len;
 }
 
 /* returns the length (counted in wchars) of a multibyte string
- * (not necessarily NULL terminated)
+ * (stops at the first of "limit" or a NUL)
  */
 int
 pg_mbstrlen_with_len(const char *mbstr, int limit)
@@ -1065,7 +1190,7 @@ pg_mbstrlen_with_len(const char *mbstr, int limit)
 
 	while (limit > 0 && *mbstr)
 	{
-		int			l = pg_mblen(mbstr);
+		int			l = pg_mblen_with_len(mbstr, limit);
 
 		limit -= l;
 		mbstr += l;
@@ -1135,7 +1260,7 @@ pg_mbcharcliplen(const char *mbstr, int len, int limit)
 
 	while (len > 0 && *mbstr)
 	{
-		l = pg_mblen(mbstr);
+		l = pg_mblen_with_len(mbstr, len);
 		nch++;
 		if (nch > limit)
 			break;
@@ -1699,12 +1824,19 @@ void
 report_invalid_encoding(int encoding, const char *mbstr, int len)
 {
 	int			l = pg_encoding_mblen_or_incomplete(encoding, mbstr, len);
+
+	report_invalid_encoding_int(encoding, mbstr, l, len);
+}
+
+static void
+report_invalid_encoding_int(int encoding, const char *mbstr, int mblen, int len)
+{
 	char		buf[8 * 5 + 1];
 	char	   *p = buf;
 	int			j,
 				jlimit;
 
-	jlimit = Min(l, len);
+	jlimit = Min(mblen, len);
 	jlimit = Min(jlimit, 8);	/* prevent buffer overrun */
 
 	for (j = 0; j < jlimit; j++)
@@ -1721,6 +1853,12 @@ report_invalid_encoding(int encoding, const char *mbstr, int len)
 					buf)));
 }
 
+static void
+report_invalid_encoding_db(const char *mbstr, int mblen, int len)
+{
+	report_invalid_encoding_int(GetDatabaseEncoding(), mbstr, mblen, len);
+}
+
 /*
  * report_untranslatable_char: complain about untranslatable character
  *
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ee114e43d9c..83118453854 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/misc/guc.c
@@ -4727,8 +4727,13 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
 			 * the config file cannot cause postmaster start to fail, so we
 			 * don't have to be too tense about possibly installing a bad
 			 * value.)
+			 *
+			 * As an exception, we skip this check if this is a RESET command
+			 * for an unknown custom GUC, else there'd be no way for users to
+			 * remove such settings with reserved prefixes.
 			 */
-			(void) assignable_custom_variable_name(name, false, ERROR);
+			if (value || !valid_custom_variable_name(name))
+				(void) assignable_custom_variable_name(name, false, ERROR);
 		}
 
 		/*
@@ -6716,6 +6721,7 @@ validate_option_array_item(const char *name, const char *value,
 
 {
 	struct config_generic *gconf;
+	bool		reset_custom;
 
 	/*
 	 * There are three cases to consider:
@@ -6734,16 +6740,21 @@ validate_option_array_item(const char *name, const char *value,
 	 * it's assumed to be fully validated.)
 	 *
 	 * name is not known and can't be created as a placeholder.  Throw error,
-	 * unless skipIfNoPermissions is true, in which case return false.
+	 * unless skipIfNoPermissions or reset_custom is true.  If reset_custom is
+	 * true, this is a RESET or RESET ALL operation for an unknown custom GUC
+	 * with a reserved prefix, in which case we want to fall through to the
+	 * placeholder case described in the preceding paragraph (else there'd be
+	 * no way for users to remove them).  Otherwise, return false.
 	 */
-	gconf = find_option(name, true, skipIfNoPermissions, ERROR);
-	if (!gconf)
+	reset_custom = (!value && valid_custom_variable_name(name));
+	gconf = find_option(name, true, skipIfNoPermissions || reset_custom, ERROR);
+	if (!gconf && !reset_custom)
 	{
 		/* not known, failed to make a placeholder */
 		return false;
 	}
 
-	if (gconf->flags & GUC_CUSTOM_PLACEHOLDER)
+	if (!gconf || gconf->flags & GUC_CUSTOM_PLACEHOLDER)
 	{
 		/*
 		 * We cannot do any meaningful check on the value, so only permissions
diff --git a/src/backend/utils/misc/guc_funcs.c b/src/backend/utils/misc/guc_funcs.c
index c8d5b40c348..cb2c0cd27e9 100644
--- a/src/backend/utils/misc/guc_funcs.c
+++ b/src/backend/utils/misc/guc_funcs.c
@@ -5,7 +5,7 @@
  * SQL commands and SQL-accessible functions related to GUC variables.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
index 5953bcaaada..268bcd65eaf 100644
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@ -12,7 +12,7 @@
  *
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/backend/utils/misc/guc_tables.c
@@ -83,6 +83,7 @@
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/copydir.h"
+#include "storage/fd.h"
 #include "storage/io_worker.h"
 #include "storage/large_object.h"
 #include "storage/pg_shmem.h"
@@ -507,6 +508,14 @@ static const struct config_enum_entry file_copy_method_options[] = {
 	{NULL, 0, false}
 };
 
+static const struct config_enum_entry file_extend_method_options[] = {
+#ifdef HAVE_POSIX_FALLOCATE
+	{"posix_fallocate", FILE_EXTEND_METHOD_POSIX_FALLOCATE, false},
+#endif
+	{"write_zeros", FILE_EXTEND_METHOD_WRITE_ZEROS, false},
+	{NULL, 0, false}
+};
+
 /*
  * Options for enum values stored in other modules
  */
@@ -576,7 +585,7 @@ char	   *external_pid_file;
 
 char	   *application_name;
 
-int	   nls_length_semantics = NLS_LENGTH_BYTE;
+int			nls_length_semantics = NLS_LENGTH_BYTE;
 char	   *nls_date_format = "YYYY-MM-DD";
 char	   *nls_timestamp_format = "YYYY-MM-DD HH24:MI:SS.FF6";
 char	   *nls_timestamp_tz_format = "YYYY-MM-DD HH24:MI:SS.FF6 TZH:TZM";
@@ -2151,9 +2160,9 @@ struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
-	#define IVY_GUC_BOOL_PARAMS
-	#include "ivy_guc.c"
-	#undef IVY_GUC_BOOL_PARAMS
+#define IVY_GUC_BOOL_PARAMS
+#include "ivy_guc.c"
+#undef IVY_GUC_BOOL_PARAMS
 	{
 		{"md5_password_warnings", PGC_USERSET, CONN_AUTH_AUTH,
 			gettext_noop("Enables deprecation warnings for MD5 passwords."),
@@ -3110,7 +3119,7 @@ struct config_int ConfigureNamesInt[] =
 		},
 		&max_slot_wal_keep_size_mb,
 		-1, -1, MAX_KILOBYTES,
-		check_max_slot_wal_keep_size, NULL, NULL
+		NULL, NULL, NULL
 	},
 
 	{
@@ -3129,11 +3138,11 @@ struct config_int ConfigureNamesInt[] =
 			gettext_noop("Sets the duration a replication slot can remain idle before "
 						 "it is invalidated."),
 			NULL,
-			GUC_UNIT_MIN
+			GUC_UNIT_S
 		},
-		&idle_replication_slot_timeout_mins,
-		0, 0, INT_MAX / SECS_PER_MINUTE,
-		check_idle_replication_slot_timeout, NULL, NULL
+		&idle_replication_slot_timeout_secs,
+		0, 0, INT_MAX,
+		NULL, NULL, NULL
 	},
 
 	{
@@ -3889,9 +3898,9 @@ struct config_int ConfigureNamesInt[] =
 		NULL, NULL, NULL
 	},
 
-	#define IVY_GUC_INT_PARAMS
-	#include "ivy_guc.c"
-	#undef IVY_GUC_INT_PARAMS
+#define IVY_GUC_INT_PARAMS
+#include "ivy_guc.c"
+#undef IVY_GUC_INT_PARAMS
 
 	/* End-of-list marker */
 	{
@@ -4174,9 +4183,9 @@ struct config_real ConfigureNamesReal[] =
 		NULL, NULL, NULL
 	},
 
-	#define IVY_GUC_REAL_PARAMS
-	#include "ivy_guc.c"
-	#undef IVY_GUC_REAL_PARAMS
+#define IVY_GUC_REAL_PARAMS
+#include "ivy_guc.c"
+#undef IVY_GUC_REAL_PARAMS
 	{
 		{"vacuum_max_eager_freeze_failure_rate", PGC_USERSET, VACUUM_FREEZING,
 			gettext_noop("Fraction of pages in a relation vacuum can scan and fail to freeze before disabling eager scanning."),
@@ -4987,9 +4996,9 @@ struct config_string ConfigureNamesString[] =
 		check_synchronized_standby_slots, assign_synchronized_standby_slots, NULL
 	},
 
-	#define IVY_GUC_STRING_PARAMS
-	#include "ivy_guc.c"
-	#undef IVY_GUC_STRING_PARAMS
+#define IVY_GUC_STRING_PARAMS
+#include "ivy_guc.c"
+#undef IVY_GUC_STRING_PARAMS
 	{
 		{"restrict_nonsystem_relation_kind", PGC_USERSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Prohibits access to non-system relations of specified kinds."),
@@ -5131,8 +5140,8 @@ struct config_enum ConfigureNamesEnum[] =
 
 	{
 		{"icu_validation_level", PGC_USERSET, CLIENT_CONN_LOCALE,
-		 gettext_noop("Log level for reporting invalid ICU locale strings."),
-		 NULL
+			gettext_noop("Log level for reporting invalid ICU locale strings."),
+			NULL
 		},
 		&icu_validation_level,
 		WARNING, icu_validation_level_options,
@@ -5303,6 +5312,16 @@ struct config_enum ConfigureNamesEnum[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"file_extend_method", PGC_SIGHUP, RESOURCES_DISK,
+			gettext_noop("Selects the method used for extending data files."),
+			NULL
+		},
+		&file_extend_method,
+		DEFAULT_FILE_EXTEND_METHOD, file_extend_method_options,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"wal_sync_method", PGC_SIGHUP, WAL_SETTINGS,
 			gettext_noop("Selects the method used for forcing WAL updates to disk."),
@@ -5447,9 +5466,9 @@ struct config_enum ConfigureNamesEnum[] =
 		NULL, NULL, NULL
 	},
 
-	#define IVY_GUC_ENUM_PARAMS
-	#include "ivy_guc.c"
-	#undef IVY_GUC_ENUM_PARAMS
+#define IVY_GUC_ENUM_PARAMS
+#include "ivy_guc.c"
+#undef IVY_GUC_ENUM_PARAMS
 	{
 		{"io_method", PGC_POSTMASTER, RESOURCES_IO,
 			gettext_noop("Selects the method for executing asynchronous I/O."),
diff --git a/src/backend/utils/misc/injection_point.c b/src/backend/utils/misc/injection_point.c
index f58ebc8ee52..64f11d4ba93 100644
--- a/src/backend/utils/misc/injection_point.c
+++ b/src/backend/utils/misc/injection_point.c
@@ -283,16 +283,16 @@ InjectionPointAttach(const char *name,
 	int			free_idx;
 
 	if (strlen(name) >= INJ_NAME_MAXLEN)
-		elog(ERROR, "injection point name %s too long (maximum of %u)",
-			 name, INJ_NAME_MAXLEN);
+		elog(ERROR, "injection point name %s too long (maximum of %u characters)",
+			 name, INJ_NAME_MAXLEN - 1);
 	if (strlen(library) >= INJ_LIB_MAXLEN)
-		elog(ERROR, "injection point library %s too long (maximum of %u)",
-			 library, INJ_LIB_MAXLEN);
+		elog(ERROR, "injection point library %s too long (maximum of %u characters)",
+			 library, INJ_LIB_MAXLEN - 1);
 	if (strlen(function) >= INJ_FUNC_MAXLEN)
-		elog(ERROR, "injection point function %s too long (maximum of %u)",
-			 function, INJ_FUNC_MAXLEN);
-	if (private_data_size >= INJ_PRIVATE_MAXLEN)
-		elog(ERROR, "injection point data too long (maximum of %u)",
+		elog(ERROR, "injection point function %s too long (maximum of %u characters)",
+			 function, INJ_FUNC_MAXLEN - 1);
+	if (private_data_size > INJ_PRIVATE_MAXLEN)
+		elog(ERROR, "injection point data too long (maximum of %u bytes)",
 			 INJ_PRIVATE_MAXLEN);
 
 	/*
@@ -336,6 +336,7 @@ InjectionPointAttach(const char *name,
 	entry->library[INJ_LIB_MAXLEN - 1] = '\0';
 	strlcpy(entry->function, function, sizeof(entry->function));
 	entry->function[INJ_FUNC_MAXLEN - 1] = '\0';
+	memset(entry->private_data, 0, INJ_PRIVATE_MAXLEN);
 	if (private_data != NULL)
 		memcpy(entry->private_data, private_data, private_data_size);
 
diff --git a/src/backend/utils/misc/ivorysql.conf.sample b/src/backend/utils/misc/ivorysql.conf.sample
index bf7592dc1bf..2a8e768ded3 100644
--- a/src/backend/utils/misc/ivorysql.conf.sample
+++ b/src/backend/utils/misc/ivorysql.conf.sample
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 #Oracle COMPATIBLE Mode GUC parameters
 #
-#Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+#Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #------------------------------------------------------------------------------
 
 #ivorysql.listen_addresses = 'localhost'		# what IP address(es) of Oracle mode to listen on;
diff --git a/src/backend/utils/misc/ivy_guc.c b/src/backend/utils/misc/ivy_guc.c
index 28b16177a82..02fc6ebd63b 100644
--- a/src/backend/utils/misc/ivy_guc.c
+++ b/src/backend/utils/misc/ivy_guc.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
  *
  * Authored by lanke@highgo.com, 20220819.
  *
- * Copyright (c) 2022-2025, IvorySQL Global Development Team
+ * Copyright (c) 2022-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *        src/backend/utils/misc/ivy_guc.c
@@ -30,32 +30,27 @@
 #ifdef IVY_GUC_VAR_DEFINE
 #define ISLOADIVORYSQL_ORA pg_transform_merge_stmt_hook
 
-int				identifier_case_switch = INTERCHANGE;
-bool  			identifier_case_from_pg_dump = false;
-bool			enable_case_switch = true;
+int			identifier_case_switch = INTERCHANGE;
+bool		identifier_case_from_pg_dump = false;
+bool		enable_case_switch = true;
 
-char	   *nls_territory = "AMERICA";
-char	   *nls_currency = "$";
-char	   *nls_iso_currency = "AMERICA";
-// int	   *nls_length_semantics = NULL;
-// char	   *nls_date_format = "";
-// char	   *nls_timestamp_format = "";
-// char	   *nls_timestamp_tz_format = "";
-// int 		datetime_ignore_nls_mask = 0;
+static char	   *nls_territory = "AMERICA";
+static char	   *nls_currency = "$";
+static char	   *nls_iso_currency = "AMERICA";
 
-bool			enable_emptystring_to_NULL = false;
+bool		enable_emptystring_to_NULL = false;
 
-int	database_mode = DB_PG;
-int	compatible_db = PG_PARSER;
+int			database_mode = DB_PG;
+int			compatible_db = PG_PARSER;
 
-bool	allow_out_parameter_const = false;
-bool	out_parameter_column_position = false;
+bool		allow_out_parameter_const = false;
+bool		out_parameter_column_position = false;
 
-bool	seq_scale_fixed = false;
-bool	internal_warning = false;
+bool		seq_scale_fixed = false;
+bool		internal_warning = false;
 
-bool   default_with_rowids = false;
-int    rowid_seq_cache = 20;
+bool		default_with_rowids = false;
+int			rowid_seq_cache = 20;
 
 #endif
 
@@ -105,7 +100,7 @@ static bool check_nls_length_semantics(int *newval, void **extra, GucSource sour
 
 static bool check_compatible_mode(int *newval, void **extra, GucSource source);
 static bool check_database_mode(int *newval, void **extra, GucSource source);
-void assign_compatible_mode(int newval, void *extra);
+void		assign_compatible_mode(int newval, void *extra);
 
 static void nls_case_conversion(char **param, char type);
 static bool nls_length_check(char **newval, void **extra, GucSource source);
@@ -121,7 +116,7 @@ static struct config_bool Ivy_ConfigureNamesBool[] =
 	{
 		/* Not for general use --- used by pg_dump */
 		{"ivorysql.identifier_case_from_pg_dump", PGC_USERSET, UNGROUPED,
-			gettext_noop("Shows whether the identifer with quote is from pg dump."),
+			gettext_noop("Shows whether the identifier with quotes is from pg dump."),
 			NULL,
 			GUC_REPORT | GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
 		},
@@ -151,8 +146,9 @@ static struct config_bool Ivy_ConfigureNamesBool[] =
 	},
 
 	/*
-	 * if ivorysql.allow_out_parameter_const is false, out parameter must be a var.
-	 * if ivorysql.allow_out_parameter_const is true, out parameter can be a constant value
+	 * if ivorysql.allow_out_parameter_const is false, out parameter must be a
+	 * var. if ivorysql.allow_out_parameter_const is true, out parameter can
+	 * be a constant value
 	 */
 	{
 		{"ivorysql.allow_out_parameter_const", PGC_USERSET, DEVELOPER_OPTIONS,
@@ -187,9 +183,19 @@ static struct config_bool Ivy_ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
+	/*
+ 	 * ivorysql.default_with_rowids
+	 *
+	 * When enabled, all newly created tables will automatically include
+	 * an Oracle-compatible ROWID pseudo-column. This provides compatibility
+	 * with Oracle applications that rely on ROWID for row identification.
+	 *
+	 * Default: off
+	 * Context: USERSET (can be changed by any user)
+ 	 */
 	{
 		{"ivorysql.default_with_rowids", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Auto add rowid column for create new table."),
+			gettext_noop("Automatically add rowid column when creating new tables."),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
@@ -241,7 +247,7 @@ static struct config_int Ivy_ConfigureNamesInt[] =
 		{"ivorysql.datetime_ignore_nls_mask", PGC_USERSET, COMPAT_ORACLE_OPTIONS,
 			gettext_noop("Sets the datetime type input is not controlled by the NLS parameter."),
 			NULL,
-            GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
 		&datetime_ignore_nls_mask,
 		0, 0, 15,
@@ -289,7 +295,7 @@ static struct config_string Ivy_ConfigureNamesString[] =
 		{"nls_date_format", PGC_USERSET, COMPAT_ORACLE_OPTIONS,
 			gettext_noop("Compatible Oracle NLS parameter for date type."),
 			NULL,
-            GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
 		&nls_date_format,
 		"YYYY-MM-DD",
@@ -300,7 +306,7 @@ static struct config_string Ivy_ConfigureNamesString[] =
 		{"nls_timestamp_format", PGC_USERSET, COMPAT_ORACLE_OPTIONS,
 			gettext_noop("Compatible Oracle NLS parameter for timestamp type."),
 			NULL,
-            GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
 		&nls_timestamp_format,
 		"YYYY-MM-DD HH24:MI:SS.FF6",
@@ -311,7 +317,7 @@ static struct config_string Ivy_ConfigureNamesString[] =
 		{"nls_timestamp_tz_format", PGC_USERSET, COMPAT_ORACLE_OPTIONS,
 			gettext_noop("Compatible Oracle NLS parameter for timestamp with time zone type."),
 			NULL,
-            GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
 		&nls_timestamp_tz_format,
 		"YYYY-MM-DD HH24:MI:SS.FF6 TZH:TZM",
@@ -408,8 +414,8 @@ static struct config_enum Ivy_ConfigureNamesEnum[] =
 			NULL
 		},
 		&identifier_case_switch,
-		INTERCHANGE,case_conversion_mode,
-		NULL,NULL,NULL
+		INTERCHANGE, case_conversion_mode,
+		NULL, NULL, NULL
 	},
 
 	{
@@ -450,28 +456,28 @@ check_nls_length_semantics(int *newval, void **extra, GucSource source)
 static bool
 check_compatible_mode(int *newval, void **extra, GucSource source)
 {
-	int		newmode = *newval;
+	int			newmode = *newval;
 
 	if (DB_PG == database_mode && newmode == ORA_PARSER)
-			ereport(ERROR,
+		ereport(ERROR,
 				(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
-				errmsg("parameter ivorysql.compatible_mode cannot be changed in native PG mode.")));
+				 errmsg("parameter ivorysql.compatible_mode cannot be changed in native PG mode.")));
 
-	if(DB_ORACLE == database_mode
-		&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
+	if (DB_ORACLE == database_mode
+		&& (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
 		if (newmode == ORA_PARSER)
 		{
 			if (ora_raw_parser == NULL)
 				ereport(ERROR,
-					(errcode(ERRCODE_SYSTEM_ERROR),
-					errmsg("liboracle_parser not found!"),
-					errhint("You must load liboracle_parser to use oracle parser.")));
+						(errcode(ERRCODE_SYSTEM_ERROR),
+						 errmsg("liboracle_parser not found!"),
+						 errhint("You must load liboracle_parser to use oracle parser.")));
 			if (!ISLOADIVORYSQL_ORA)
 				ereport(ERROR,
-					(errcode(ERRCODE_SYSTEM_ERROR),
-					errmsg("IVORYSQL_ORA library not found!"),
-					errhint("You must load IVORYSQL_ORA to use oracle parser..")));
+						(errcode(ERRCODE_SYSTEM_ERROR),
+						 errmsg("IVORYSQL_ORA library not found!"),
+						 errhint("You must load IVORYSQL_ORA to use oracle parser..")));
 		}
 	}
 	return true;
@@ -480,12 +486,12 @@ check_compatible_mode(int *newval, void **extra, GucSource source)
 static bool
 check_database_mode(int *newval, void **extra, GucSource source)
 {
-	int		newmode = *newval;
+	int			newmode = *newval;
 
 	if (DB_PG == database_mode && DB_ORACLE == newmode)
-			ereport(NOTICE,
+		ereport(NOTICE,
 				(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
-				errmsg("parameter ivorysql.database_mode cannot be changed")));
+				 errmsg("parameter ivorysql.database_mode cannot be changed")));
 
 	return true;
 }
@@ -493,8 +499,8 @@ check_database_mode(int *newval, void **extra, GucSource source)
 void
 assign_compatible_mode(int newval, void *extra)
 {
-	if(DB_ORACLE == database_mode
-		&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
+	if (DB_ORACLE == database_mode
+		&& (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
 		if (newval == ORA_PARSER)
 		{
@@ -522,7 +528,7 @@ assign_compatible_mode(int newval, void *extra)
 static void
 nls_case_conversion(char **param, char type)
 {
-	char   *p;
+	char	   *p;
 
 CASE_CONVERSION:
 	if (type == 'u')
@@ -541,8 +547,8 @@ nls_case_conversion(char **param, char type)
 	}
 	else if (type == 'b')
 	{
-		bool    has_upper = false,
-				has_lower = false;
+		bool		has_upper = false,
+					has_lower = false;
 
 		for (p = *param; p < *param + strlen(*param); ++p)
 		{
@@ -570,7 +576,7 @@ static bool
 nls_length_check(char **newval, void **extra, GucSource source)
 {
 	if (DB_ORACLE == database_mode
-			&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
+		&& (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
 		if (strlen(*newval) > 255)
 			ereport(ERROR, (errmsg("parameter value longer than 255 characters")));
@@ -578,7 +584,7 @@ nls_length_check(char **newval, void **extra, GucSource source)
 			ereport(ERROR, (errmsg("Cannot access NLS data files "
 								   "or invalid environment specified")));
 		else if (identifier_case_switch == INTERCHANGE)
-				nls_case_conversion(newval, 'b');
+			nls_case_conversion(newval, 'b');
 	}
 
 	return true;
@@ -588,7 +594,7 @@ static bool
 nls_territory_check(char **newval, void **extra, GucSource source)
 {
 	if (DB_ORACLE == database_mode
-			&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
+		&& (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
 		if (pg_strcasecmp(*newval, "CHINA") == 0)
 			memcpy(*newval, "CHINA", 5);
diff --git a/src/backend/utils/misc/meson.build b/src/backend/utils/misc/meson.build
index 8eb46cc20fd..b5bc8d900af 100644
--- a/src/backend/utils/misc/meson.build
+++ b/src/backend/utils/misc/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 backend_sources += files(
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index e55a614d0e4..2f1f264e96f 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -94,9 +94,9 @@
 # - Authentication -
 
 #authentication_timeout = 1min		# 1s-600s
-#password_encryption = scram-sha-256	# scram-sha-256 or md5
+#password_encryption = scram-sha-256	# scram-sha-256 or (deprecated) md5
 #scram_iterations = 4096
-#md5_password_warnings = on
+#md5_password_warnings = on		# display md5 deprecation warnings?
 #oauth_validator_libraries = ''	# comma-separated list of trusted validator modules
 
 # GSSAPI using Kerberos
@@ -179,6 +179,10 @@
 					# in kilobytes, or -1 for no limit
 
 #file_copy_method = copy		# copy, clone (if supported by OS)
+#file_extend_method = posix_fallocate   # the default is the first option supported
+					# by the operating system:
+					#   posix_fallocate (most Unix-like systems)
+					#   write_zeros
 
 #max_notify_queue_pages = 1048576	# limits the number of SLRU pages allocated
 					# for NOTIFY / LISTEN queue
@@ -256,7 +260,7 @@
 #wal_skip_threshold = 2MB
 
 #commit_delay = 0			# range 0-100000, in microseconds
-#commit_siblings = 5			# range 1-1000
+#commit_siblings = 5			# range 0-1000
 
 # - Checkpoints -
 
@@ -342,7 +346,7 @@
 				# (change requires restart)
 #wal_keep_size = 0		# in megabytes; 0 disables
 #max_slot_wal_keep_size = -1	# in megabytes; -1 disables
-#idle_replication_slot_timeout = 0	# in minutes; 0 disables
+#idle_replication_slot_timeout = 0	# in seconds; 0 disables
 #wal_sender_timeout = 60s	# in milliseconds; 0 disables
 #track_commit_timestamp = off	# collect timestamp of transaction commit
 				# (change requires restart)
@@ -680,7 +684,7 @@
 
 #autovacuum = on			# Enable autovacuum subprocess?  'on'
 					# requires track_counts to also be on.
-autovacuum_worker_slots = 16	# autovacuum worker slots to allocate
+#autovacuum_worker_slots = 16		# autovacuum worker slots to allocate
 					# (change requires restart)
 #autovacuum_max_workers = 3		# max number of autovacuum subprocesses
 #autovacuum_naptime = 1min		# time between autovacuum runs
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index e08b26e8c14..f40b16cb918 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -52,7 +52,7 @@ bool		update_process_title = DEFAULT_UPDATE_PROCESS_TITLE;
 #define PS_USE_SETPROCTITLE_FAST
 #elif defined(HAVE_SETPROCTITLE)
 #define PS_USE_SETPROCTITLE
-#elif defined(__linux__) || defined(__sun) || defined(__darwin__)
+#elif defined(__linux__) || defined(__sun) || defined(__darwin__) || defined(__GNU__)
 #define PS_USE_CLOBBER_ARGV
 #elif defined(WIN32)
 #define PS_USE_WIN32
@@ -62,7 +62,7 @@ bool		update_process_title = DEFAULT_UPDATE_PROCESS_TITLE;
 
 
 /* Different systems want the buffer padded differently */
-#if defined(__linux__) || defined(__darwin__)
+#if defined(__linux__) || defined(__darwin__) || defined(__GNU__)
 #define PS_PADDING '\0'
 #else
 #define PS_PADDING ' '
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 666ecd8f78d..a6742d8d738 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -1125,7 +1125,26 @@ AllocSetFree(void *pointer)
 		Assert(FreeListIdxIsValid(fidx));
 		link = GetFreeListLink(chunk);
 
+		/*
+		 * It might seem odd that we use elevel ERROR for double-pfree but
+		 * only WARNING for write-past-chunk-end.  But the two conditions are
+		 * not very comparable.  In the double-pfree case we can prevent
+		 * corruption before it happens; while if we let it go through, the
+		 * result would be a corrupted freelist that allows this chunk to get
+		 * re-allocated twice.  Thus the original bug could cascade into
+		 * hard-to-understand misbehavior that might manifest far away from
+		 * the actual source of the problem.  On the other hand, a write past
+		 * chunk end can be relatively benign if just a few bytes too many
+		 * were written: often, only padding or unused space gets affected.
+		 * Moreover, whatever damage was done is already done, and we're just
+		 * reporting after the fact with no ability to clean it up.  So just
+		 * warn, like AllocSetCheck would do if the chunk didn't get freed.
+		 */
 #ifdef MEMORY_CONTEXT_CHECKING
+		/* Test for previously-freed chunk */
+		if (unlikely(chunk->requested_size == InvalidAllocSize))
+			elog(ERROR, "detected double pfree in %s %p",
+				 set->header.name, chunk);
 		/* Test for someone scribbling on unused space in chunk */
 		if (chunk->requested_size < GetChunkSizeFromFreeListIdx(fidx))
 			if (!sentinel_ok(pointer, chunk->requested_size))
@@ -1316,6 +1335,11 @@ AllocSetRealloc(void *pointer, Size size, int flags)
 	oldchksize = GetChunkSizeFromFreeListIdx(fidx);
 
 #ifdef MEMORY_CONTEXT_CHECKING
+	/* See comments in AllocSetFree about uses of ERROR and WARNING here */
+	/* Test for previously-freed chunk */
+	if (unlikely(chunk->requested_size == InvalidAllocSize))
+		elog(ERROR, "detected realloc of freed chunk in %s %p",
+			 set->header.name, chunk);
 	/* Test for someone scribbling on unused space in chunk */
 	if (chunk->requested_size < oldchksize)
 		if (!sentinel_ok(pointer, chunk->requested_size))
@@ -1609,9 +1633,9 @@ AllocSetCheck(MemoryContext context)
 		 prevblock = block, block = block->next)
 	{
 		char	   *bpoz = ((char *) block) + ALLOC_BLOCKHDRSZ;
-		long		blk_used = block->freeptr - bpoz;
-		long		blk_data = 0;
-		long		nchunks = 0;
+		Size		blk_used = block->freeptr - bpoz;
+		Size		blk_data = 0;
+		Size		nchunks = 0;
 		bool		has_external_chunk = false;
 
 		if (IsKeeperBlock(set, block))
diff --git a/src/backend/utils/mmgr/dsa.c b/src/backend/utils/mmgr/dsa.c
index 361867d1060..0a55bff00da 100644
--- a/src/backend/utils/mmgr/dsa.c
+++ b/src/backend/utils/mmgr/dsa.c
@@ -2146,6 +2146,8 @@ make_new_segment(dsa_area *area, size_t requested_pages)
 	/* See if that is enough... */
 	if (requested_pages > usable_pages)
 	{
+		size_t		total_requested_pages PG_USED_FOR_ASSERTS_ONLY;
+
 		/*
 		 * We'll make an odd-sized segment, working forward from the requested
 		 * number of pages.
@@ -2156,10 +2158,37 @@ make_new_segment(dsa_area *area, size_t requested_pages)
 			MAXALIGN(sizeof(FreePageManager)) +
 			usable_pages * sizeof(dsa_pointer);
 
+		/*
+		 * We must also account for pagemap entries needed to cover the
+		 * metadata pages themselves.  The pagemap must track all pages in the
+		 * segment, including the pages occupied by metadata.
+		 *
+		 * This formula uses integer ceiling division to compute the exact
+		 * number of additional entries needed.  The divisor (FPM_PAGE_SIZE -
+		 * sizeof(dsa_pointer)) accounts for the fact that each metadata page
+		 * consumes one pagemap entry of sizeof(dsa_pointer) bytes, leaving
+		 * only (FPM_PAGE_SIZE - sizeof(dsa_pointer)) net bytes per metadata
+		 * page.
+		 */
+		metadata_bytes +=
+			((metadata_bytes + (FPM_PAGE_SIZE - sizeof(dsa_pointer)) - 1) /
+			 (FPM_PAGE_SIZE - sizeof(dsa_pointer))) *
+			sizeof(dsa_pointer);
+
 		/* Add padding up to next page boundary. */
 		if (metadata_bytes % FPM_PAGE_SIZE != 0)
 			metadata_bytes += FPM_PAGE_SIZE - (metadata_bytes % FPM_PAGE_SIZE);
 		total_size = metadata_bytes + usable_pages * FPM_PAGE_SIZE;
+		total_requested_pages = total_size / FPM_PAGE_SIZE;
+
+		/*
+		 * Verify that we allocated enough pagemap entries for metadata and
+		 * usable pages.  This reverse-engineers the new calculation of
+		 * "metadata_bytes" done based on the new "requested_pages" for an
+		 * odd-sized segment.
+		 */
+		Assert((metadata_bytes - MAXALIGN(sizeof(dsa_segment_header)) -
+				MAXALIGN(sizeof(FreePageManager))) / sizeof(dsa_pointer) >= total_requested_pages);
 
 		/* Is that too large for dsa_pointer's addressing scheme? */
 		if (total_size > DSA_MAX_SEGMENT_SIZE)
diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c
index a7b5eeb4e18..ac0c1a28dab 100644
--- a/src/backend/utils/mmgr/freepage.c
+++ b/src/backend/utils/mmgr/freepage.c
@@ -894,14 +894,14 @@ FreePageBtreeGetRecycled(FreePageManager *fpm)
 }
 
 /*
- * Insert an item into an internal page.
+ * Insert an item into an internal page (there must be room).
  */
 static void
 FreePageBtreeInsertInternal(char *base, FreePageBtree *btp, Size index,
 							Size first_page, FreePageBtree *child)
 {
 	Assert(btp->hdr.magic == FREE_PAGE_INTERNAL_MAGIC);
-	Assert(btp->hdr.nused <= FPM_ITEMS_PER_INTERNAL_PAGE);
+	Assert(btp->hdr.nused < FPM_ITEMS_PER_INTERNAL_PAGE);
 	Assert(index <= btp->hdr.nused);
 	memmove(&btp->u.internal_key[index + 1], &btp->u.internal_key[index],
 			sizeof(FreePageBtreeInternalKey) * (btp->hdr.nused - index));
@@ -911,14 +911,14 @@ FreePageBtreeInsertInternal(char *base, FreePageBtree *btp, Size index,
 }
 
 /*
- * Insert an item into a leaf page.
+ * Insert an item into a leaf page (there must be room).
  */
 static void
 FreePageBtreeInsertLeaf(FreePageBtree *btp, Size index, Size first_page,
 						Size npages)
 {
 	Assert(btp->hdr.magic == FREE_PAGE_LEAF_MAGIC);
-	Assert(btp->hdr.nused <= FPM_ITEMS_PER_LEAF_PAGE);
+	Assert(btp->hdr.nused < FPM_ITEMS_PER_LEAF_PAGE);
 	Assert(index <= btp->hdr.nused);
 	memmove(&btp->u.leaf_key[index + 1], &btp->u.leaf_key[index],
 			sizeof(FreePageBtreeLeafKey) * (btp->hdr.nused - index));
diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c
index 18679ad4f1e..e4573674491 100644
--- a/src/backend/utils/mmgr/generation.c
+++ b/src/backend/utils/mmgr/generation.c
@@ -733,6 +733,11 @@ GenerationFree(void *pointer)
 	}
 
 #ifdef MEMORY_CONTEXT_CHECKING
+	/* See comments in AllocSetFree about uses of ERROR and WARNING here */
+	/* Test for previously-freed chunk */
+	if (unlikely(chunk->requested_size == InvalidAllocSize))
+		elog(ERROR, "detected double pfree in %s %p",
+			 ((MemoryContext) block->context)->name, chunk);
 	/* Test for someone scribbling on unused space in chunk */
 	Assert(chunk->requested_size < chunksize);
 	if (!sentinel_ok(pointer, chunk->requested_size))
@@ -838,6 +843,11 @@ GenerationRealloc(void *pointer, Size size, int flags)
 	set = block->context;
 
 #ifdef MEMORY_CONTEXT_CHECKING
+	/* See comments in AllocSetFree about uses of ERROR and WARNING here */
+	/* Test for previously-freed chunk */
+	if (unlikely(chunk->requested_size == InvalidAllocSize))
+		elog(ERROR, "detected realloc of freed chunk in %s %p",
+			 ((MemoryContext) set)->name, chunk);
 	/* Test for someone scribbling on unused space in chunk */
 	Assert(chunk->requested_size < oldsize);
 	if (!sentinel_ok(pointer, chunk->requested_size))
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 42d5a2e6a38..ac662b9bc37 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -21,6 +21,7 @@
 
 #include "postgres.h"
 
+#include "common/int.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "utils/memdebug.h"
@@ -157,6 +158,9 @@ MemoryContext CurTransactionContext = NULL;
 /* This is a transient link to the active portal's memory context: */
 MemoryContext PortalContext = NULL;
 
+/* Is memory context logging currently in progress? */
+static bool LogMemoryContextInProgress = false;
+
 static void MemoryContextDeleteOnly(MemoryContext context);
 static void MemoryContextCallResetCallbacks(MemoryContext context);
 static void MemoryContextStatsInternal(MemoryContext context, int level,
@@ -166,6 +170,8 @@ static void MemoryContextStatsInternal(MemoryContext context, int level,
 static void MemoryContextStatsPrint(MemoryContext context, void *passthru,
 									const char *stats_string,
 									bool print_to_stderr);
+pg_noreturn static pg_noinline void add_size_error(Size s1, Size s2);
+pg_noreturn static pg_noinline void mul_size_error(Size s1, Size s2);
 
 /*
  * You should not do memory allocations within a critical section, because
@@ -1295,26 +1301,45 @@ ProcessLogMemoryContextInterrupt(void)
 	LogMemoryContextPending = false;
 
 	/*
-	 * Use LOG_SERVER_ONLY to prevent this message from being sent to the
-	 * connected client.
+	 * Exit immediately if memory context logging is already in progress. This
+	 * prevents recursive calls, which could occur if logging is requested
+	 * repeatedly and rapidly, potentially leading to infinite recursion and a
+	 * crash.
 	 */
-	ereport(LOG_SERVER_ONLY,
-			(errhidestmt(true),
-			 errhidecontext(true),
-			 errmsg("logging memory contexts of PID %d", MyProcPid)));
+	if (LogMemoryContextInProgress)
+		return;
+	LogMemoryContextInProgress = true;
 
-	/*
-	 * When a backend process is consuming huge memory, logging all its memory
-	 * contexts might overrun available disk space. To prevent this, we limit
-	 * the depth of the hierarchy, as well as the number of child contexts to
-	 * log per parent to 100.
-	 *
-	 * As with MemoryContextStats(), we suppose that practical cases where the
-	 * dump gets long will typically be huge numbers of siblings under the
-	 * same parent context; while the additional debugging value from seeing
-	 * details about individual siblings beyond 100 will not be large.
-	 */
-	MemoryContextStatsDetail(TopMemoryContext, 100, 100, false);
+	PG_TRY();
+	{
+		/*
+		 * Use LOG_SERVER_ONLY to prevent this message from being sent to the
+		 * connected client.
+		 */
+		ereport(LOG_SERVER_ONLY,
+				(errhidestmt(true),
+				 errhidecontext(true),
+				 errmsg("logging memory contexts of PID %d", MyProcPid)));
+
+		/*
+		 * When a backend process is consuming huge memory, logging all its
+		 * memory contexts might overrun available disk space. To prevent
+		 * this, we limit the depth of the hierarchy, as well as the number of
+		 * child contexts to log per parent to 100.
+		 *
+		 * As with MemoryContextStats(), we suppose that practical cases where
+		 * the dump gets long will typically be huge numbers of siblings under
+		 * the same parent context; while the additional debugging value from
+		 * seeing details about individual siblings beyond 100 will not be
+		 * large.
+		 */
+		MemoryContextStatsDetail(TopMemoryContext, 100, 100, false);
+	}
+	PG_FINALLY();
+	{
+		LogMemoryContextInProgress = false;
+	}
+	PG_END_TRY();
 }
 
 void *
@@ -1637,6 +1662,132 @@ repalloc0(void *pointer, Size oldsize, Size size)
 	return ret;
 }
 
+/*
+ * Support for safe calculation of memory request sizes
+ *
+ * These functions perform the requested calculation, but throw error if the
+ * result overflows.
+ *
+ * An important property of these functions is that if an argument was a
+ * negative signed int before promotion (implying overflow in calculating it)
+ * we will detect that as an error.  That happens because we reject results
+ * larger than SIZE_MAX / 2 later on, in the actual allocation step.
+ */
+Size
+add_size(Size s1, Size s2)
+{
+	Size		result;
+
+	if (unlikely(pg_add_size_overflow(s1, s2, &result)))
+		add_size_error(s1, s2);
+	return result;
+}
+
+pg_noreturn static pg_noinline void
+add_size_error(Size s1, Size s2)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+			 errmsg("invalid memory allocation request size %zu + %zu",
+					s1, s2)));
+}
+
+Size
+mul_size(Size s1, Size s2)
+{
+	Size		result;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &result)))
+		mul_size_error(s1, s2);
+	return result;
+}
+
+pg_noreturn static pg_noinline void
+mul_size_error(Size s1, Size s2)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+			 errmsg("invalid memory allocation request size %zu * %zu",
+					s1, s2)));
+}
+
+/*
+ * palloc_mul
+ *		Equivalent to palloc(mul_size(s1, s2)).
+ */
+void *
+palloc_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req)))
+		mul_size_error(s1, s2);
+	return palloc(req);
+}
+
+/*
+ * palloc0_mul
+ *		Equivalent to palloc0(mul_size(s1, s2)).
+ *
+ * This is comparable to standard calloc's behavior.
+ */
+void *
+palloc0_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req)))
+		mul_size_error(s1, s2);
+	return palloc0(req);
+}
+
+/*
+ * palloc_mul_extended
+ *		Equivalent to palloc_extended(mul_size(s1, s2), flags).
+ */
+void *
+palloc_mul_extended(Size s1, Size s2, int flags)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req)))
+		mul_size_error(s1, s2);
+	return palloc_extended(req, flags);
+}
+
+/*
+ * repalloc_mul
+ *		Equivalent to repalloc(p, mul_size(s1, s2)).
+ */
+void *
+repalloc_mul(void *p, Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req)))
+		mul_size_error(s1, s2);
+	return repalloc(p, req);
+}
+
+/*
+ * repalloc_mul_extended
+ *		Equivalent to repalloc_extended(p, mul_size(s1, s2), flags).
+ */
+void *
+repalloc_mul_extended(void *p, Size s1, Size s2, int flags)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req)))
+		mul_size_error(s1, s2);
+	return repalloc_extended(p, req, flags);
+}
+
 /*
  * MemoryContextAllocHuge
  *		Allocate (possibly-expansive) space within the specified context.
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index d32c0d318fb..2e4ed1c7837 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -514,6 +514,7 @@ SlabAllocSetupNewChunk(MemoryContext context, SlabBlock *block,
 	MemoryChunkSetHdrMask(chunk, block, MAXALIGN(slab->chunkSize), MCTX_SLAB_ID);
 
 #ifdef MEMORY_CONTEXT_CHECKING
+	chunk->requested_size = size;
 	/* slab mark to catch clobber of "unused" space */
 	Assert(slab->chunkSize < (slab->fullChunkSize - Slab_CHUNKHDRSZ));
 	set_sentinel(MemoryChunkGetPointer(chunk), size);
@@ -720,11 +721,18 @@ SlabFree(void *pointer)
 	slab = block->slab;
 
 #ifdef MEMORY_CONTEXT_CHECKING
+	/* See comments in AllocSetFree about uses of ERROR and WARNING here */
+	/* Test for previously-freed chunk */
+	if (unlikely(chunk->requested_size == InvalidAllocSize))
+		elog(ERROR, "detected double pfree in %s %p",
+			 slab->header.name, chunk);
 	/* Test for someone scribbling on unused space in chunk */
 	Assert(slab->chunkSize < (slab->fullChunkSize - Slab_CHUNKHDRSZ));
 	if (!sentinel_ok(pointer, slab->chunkSize))
 		elog(WARNING, "detected write past chunk end in %s %p",
 			 slab->header.name, chunk);
+	/* Reset requested_size to InvalidAllocSize in free chunks */
+	chunk->requested_size = InvalidAllocSize;
 #endif
 
 	/* push this chunk onto the head of the block's free list */
diff --git a/src/backend/utils/ora_errcodes.txt b/src/backend/utils/ora_errcodes.txt
index 4befa27c313..4880b9cd44e 100644
--- a/src/backend/utils/ora_errcodes.txt
+++ b/src/backend/utils/ora_errcodes.txt
@@ -3,7 +3,7 @@
 #      IvorySQL error codes (only for plisql in oracle compatibility mode now)
 #
 # Copyright (c) 2003-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have
diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c
index 2f031c32909..7a556986068 100644
--- a/src/backend/utils/sort/sharedtuplestore.c
+++ b/src/backend/utils/sort/sharedtuplestore.c
@@ -324,7 +324,8 @@ sts_puttuple(SharedTuplestoreAccessor *accessor, void *meta_data,
 
 	/* Do we have space? */
 	size = accessor->sts->meta_data_size + tuple->t_len;
-	if (accessor->write_pointer + size > accessor->write_end)
+	if (accessor->write_pointer == NULL ||
+		accessor->write_pointer + size > accessor->write_end)
 	{
 		if (accessor->write_chunk == NULL)
 		{
diff --git a/src/backend/utils/sort/tuplesortvariants.c b/src/backend/utils/sort/tuplesortvariants.c
index 5f70e8dddac..82a712dc84b 100644
--- a/src/backend/utils/sort/tuplesortvariants.c
+++ b/src/backend/utils/sort/tuplesortvariants.c
@@ -20,6 +20,7 @@
 #include "postgres.h"
 
 #include "access/brin_tuple.h"
+#include "access/gin.h"
 #include "access/gin_tuple.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
@@ -28,6 +29,7 @@
 #include "catalog/pg_collation.h"
 #include "executor/executor.h"
 #include "pg_trace.h"
+#include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
@@ -614,7 +616,7 @@ tuplesort_begin_index_gin(Relation heapRel,
 	{
 		SortSupport sortKey = base->sortKeys + i;
 		Form_pg_attribute att = TupleDescAttr(desc, i);
-		TypeCacheEntry *typentry;
+		Oid			cmpFunc;
 
 		sortKey->ssup_cxt = CurrentMemoryContext;
 		sortKey->ssup_collation = indexRel->rd_indcollation[i];
@@ -628,11 +630,26 @@ tuplesort_begin_index_gin(Relation heapRel,
 			sortKey->ssup_collation = DEFAULT_COLLATION_OID;
 
 		/*
-		 * Look for a ordering for the index key data type, and then the sort
-		 * support function.
+		 * If the compare proc isn't specified in the opclass definition, look
+		 * up the index key type's default btree comparator.
 		 */
-		typentry = lookup_type_cache(att->atttypid, TYPECACHE_LT_OPR);
-		PrepareSortSupportFromOrderingOp(typentry->lt_opr, sortKey);
+		cmpFunc = index_getprocid(indexRel, i + 1, GIN_COMPARE_PROC);
+		if (cmpFunc == InvalidOid)
+		{
+			TypeCacheEntry *typentry;
+
+			typentry = lookup_type_cache(att->atttypid,
+										 TYPECACHE_CMP_PROC_FINFO);
+			if (!OidIsValid(typentry->cmp_proc_finfo.fn_oid))
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("could not identify a comparison function for type %s",
+								format_type_be(att->atttypid))));
+
+			cmpFunc = typentry->cmp_proc_finfo.fn_oid;
+		}
+
+		PrepareSortSupportComparisonShim(cmpFunc, sortKey);
 	}
 
 	base->removeabbrev = removeabbrev_index_gin;
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index c9aecab8d66..5a6ef2e746b 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -707,10 +707,10 @@ grow_memtuples(Tuplestorestate *state)
 
 	/* OK, do it */
 	FREEMEM(state, GetMemoryChunkSpace(state->memtuples));
-	state->memtupsize = newmemtupsize;
 	state->memtuples = (void **)
 		repalloc_huge(state->memtuples,
-					  state->memtupsize * sizeof(void *));
+					  newmemtupsize * sizeof(void *));
+	state->memtupsize = newmemtupsize;
 	USEMEM(state, GetMemoryChunkSpace(state->memtuples));
 	if (LACKMEM(state))
 		elog(ERROR, "unexpected out-of-memory situation in tuplestore");
@@ -1273,7 +1273,19 @@ dumptuples(Tuplestorestate *state)
 		if (i >= state->memtupcount)
 			break;
 		WRITETUP(state, state->memtuples[i]);
+
+		/*
+		 * Increase memtupdeleted to track the fact that we just deleted that
+		 * tuple.  Think not to remove this on the grounds that we'll reset
+		 * memtupdeleted to zero below.  We might not reach that if some later
+		 * WRITETUP fails (e.g. due to overrunning temp_file_limit).  If so,
+		 * we'd error out leaving an effectively-corrupt tuplestore, which
+		 * would be quite bad if it's a persistent data structure such as a
+		 * Portal's holdStore.
+		 */
+		state->memtupdeleted++;
 	}
+	/* Now we can reset memtupdeleted along with memtupcount */
 	state->memtupdeleted = 0;
 	state->memtupcount = 0;
 }
@@ -1463,8 +1475,10 @@ tuplestore_trim(Tuplestorestate *state)
 		FREEMEM(state, GetMemoryChunkSpace(state->memtuples[i]));
 		pfree(state->memtuples[i]);
 		state->memtuples[i] = NULL;
+		/* As in dumptuples(), increment memtupdeleted synchronously */
+		state->memtupdeleted++;
 	}
-	state->memtupdeleted = nremove;
+	Assert(state->memtupdeleted == nremove);
 
 	/* mark tuplestore as truncated (used for Assert crosschecks only) */
 	state->truncated = true;
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 7c28937a78b..92004cece89 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -271,12 +271,23 @@ Snapshot
 GetTransactionSnapshot(void)
 {
 	/*
-	 * This should not be called while doing logical decoding.  Historic
-	 * snapshots are only usable for catalog access, not for general-purpose
-	 * queries.
+	 * Return historic snapshot if doing logical decoding.
+	 *
+	 * Historic snapshots are only usable for catalog access, not for
+	 * general-purpose queries.  The caller is responsible for ensuring that
+	 * the snapshot is used correctly! (PostgreSQL code never calls this
+	 * during logical decoding, but extensions can do it.)
 	 */
 	if (HistoricSnapshotActive())
-		elog(ERROR, "cannot take query snapshot during logical decoding");
+	{
+		/*
+		 * We'll never need a non-historic transaction snapshot in this
+		 * (sub-)transaction, so there's no need to be careful to set one up
+		 * for later calls to GetTransactionSnapshot().
+		 */
+		Assert(!FirstSnapshotSet);
+		return HistoricSnapshot;
+	}
 
 	/* First call in transaction? */
 	if (!FirstSnapshotSet)
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index ca8d43690c3..538656d23ec 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/initdb/Makefile
 #
@@ -21,7 +21,7 @@ include $(top_builddir)/src/Makefile.global
 # from libpq, else we have risks of version skew if we run with a libpq
 # shared library from a different PG version.  Define
 # USE_PRIVATE_ENCODING_FUNCS to ensure that that happens.
-override CPPFLAGS := -DUSE_PRIVATE_ENCODING_FUNCS -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(ICU_CFLAGS) $(CPPFLAGS)
+override CPPFLAGS := -DUSE_PRIVATE_ENCODING_FUNCS -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS) $(ICU_CFLAGS)
 
 # We need libpq only because fe_utils does.
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(ICU_LIBS)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index f3c3481c1d2..c326ab8bf96 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -40,7 +40,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/initdb/initdb.c
  *
@@ -2511,7 +2511,7 @@ icu_validate_locale(const char *loc_str)
 	/* validate that we can extract the language */
 	status = U_ZERO_ERROR;
 	uloc_getLanguage(loc_str, lang, ULOC_LANG_CAPACITY, &status);
-	if (U_FAILURE(status))
+	if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING)
 	{
 		pg_fatal("could not get language from locale \"%s\": %s",
 				 loc_str, u_errorName(status));
@@ -2531,7 +2531,7 @@ icu_validate_locale(const char *loc_str)
 
 		status = U_ZERO_ERROR;
 		uloc_getLanguage(otherloc, otherlang, ULOC_LANG_CAPACITY, &status);
-		if (U_FAILURE(status))
+		if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING)
 			continue;
 
 		if (strcmp(lang, otherlang) == 0)
@@ -2682,7 +2682,9 @@ usage(const char *progname)
 	printf(_("  -X, --waldir=WALDIR       location for the write-ahead log directory\n"));
 	printf(_("      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"));
 	printf(_("  -m, --dbmode=MODE 	    set database mode, default is oracle\n"));
-	printf(_("  -C, --case-conversion-mode=MODE   set case conversion mode, default is interchange\n"));
+	printf(_("  -C, --case-conversion-mode=MODE\n"
+		     "                            set case conversion mode, options can be\n" 
+		     "                            normal/interchange/lowercase, default is interchange\n"));
 	printf(_("\nLess commonly used options:\n"));
 	printf(_("  -c, --set NAME=VALUE      override default setting for server parameter\n"));
 	printf(_("  -d, --debug               generate lots of debugging output\n"));
@@ -3318,7 +3320,7 @@ initialize_data_directory(void)
 	make_template0(cmdfd);
 
 	make_postgres(cmdfd);
-	
+
 	make_ivorysql(cmdfd);
 
 	PG_CMD_CLOSE();
@@ -3474,7 +3476,9 @@ main(int argc, char *argv[])
 				}
 				else
 				{
-					printf(_("UnKnow case conversion mode, use the default interchange.\n"));
+					pg_log_error("Unknown case conversion mode： %s", switchmode);
+					pg_log_error_hint("Valid case conversion mode value is normal, interchange, lowercase.");
+					exit(1);
 				}
 				break;
 			case 'D':
@@ -3687,7 +3691,7 @@ main(int argc, char *argv[])
 	if (strncmp(username, "pg_", 3) == 0)
 		pg_fatal("superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"", username);
 
-	/* Oracle compatibility username transfor upper to lower */
+	/* Oracle compatibility: transform uppercase usernames to lowercase. */
 	if (database_mode == DB_ORACLE && username != NULL
 		&& is_all_upper(username, strlen(username)))
 	{
diff --git a/src/bin/initdb/po/es.po b/src/bin/initdb/po/es.po
index 1c12d9c6417..963ccbbc6f0 100644
--- a/src/bin/initdb/po/es.po
+++ b/src/bin/initdb/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:50+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:20+0000\n"
+"PO-Revision-Date: 2025-09-21 11:13+0200\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -60,28 +60,28 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../../common/exec.c:382 initdb.c:750
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:372 initdb.c:408
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
@@ -97,46 +97,46 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -265,291 +265,291 @@ msgstr "no se pudo definir un junction para «%s»: %s\n"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "no se pudo obtener junction para «%s»: %s\n"
 
-#: initdb.c:369
+#: initdb.c:372
 #, c-format
 msgid "_wsetlocale() failed"
 msgstr "_wsetlocale() falló"
 
-#: initdb.c:376
+#: initdb.c:379
 #, c-format
 msgid "setlocale() failed"
 msgstr "setlocale() falló"
 
-#: initdb.c:390
+#: initdb.c:393
 #, c-format
 msgid "failed to restore old locale"
 msgstr "no se pudo restaurar la configuración regional anterior"
 
-#: initdb.c:393
+#: initdb.c:396
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "no se pudo restaurar la configuración regional anterior «%s»"
 
-#: initdb.c:682 initdb.c:1674
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: initdb.c:726 initdb.c:1030 initdb.c:1050
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "no se pudo abrir el archivo «%s» para escritura: %m"
 
-#: initdb.c:730 initdb.c:1033 initdb.c:1052
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: initdb.c:734
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo «%s»: %m"
 
-#: initdb.c:768
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "eliminando el directorio de datos «%s»"
 
-#: initdb.c:770
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "no se pudo eliminar el directorio de datos"
 
-#: initdb.c:774
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "eliminando el contenido del directorio «%s»"
 
-#: initdb.c:777
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "no se pudo eliminar el contenido del directorio de datos"
 
-#: initdb.c:782
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "eliminando el directorio de WAL «%s»"
 
-#: initdb.c:784
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "no se pudo eliminar el directorio de WAL"
 
-#: initdb.c:788
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "eliminando el contenido del directorio de WAL «%s»"
 
-#: initdb.c:790
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "no se pudo eliminar el contenido del directorio de WAL"
 
-#: initdb.c:797
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "directorio de datos «%s» no eliminado a petición del usuario"
 
-#: initdb.c:801
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "directorio de WAL «%s» no eliminado a petición del usuario"
 
-#: initdb.c:819
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "no se puede ejecutar como «root»"
 
-#: initdb.c:820
+#: initdb.c:823
 #, c-format
 msgid "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own the server process."
 msgstr "Por favor conéctese (usando, por ejemplo, «su») con un usuario no privilegiado, quien ejecutará el proceso servidor."
 
-#: initdb.c:852
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "«%s» no es un nombre válido de codificación"
 
-#: initdb.c:996
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "el archivo «%s» no existe"
 
-#: initdb.c:997 initdb.c:1002 initdb.c:1009
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid "This might mean you have a corrupted installation or identified the wrong directory with the invocation option -L."
 msgstr "Esto puede significar que tiene una instalación corrupta o ha identificado el directorio equivocado con la opción -L."
 
-#: initdb.c:1001
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "no se pudo acceder al archivo «%s»: %m"
 
-#: initdb.c:1008
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "el archivo «%s» no es un archivo regular"
 
-#: initdb.c:1141
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "seleccionando implementación de memoria compartida dinámica ... "
 
-#: initdb.c:1150
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "seleccionando el valor para «max_connections» ... "
 
-#: initdb.c:1170
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "seleccionando el valor para «shared_buffers» ... "
 
-#: initdb.c:1193
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "seleccionando el huso horario por omisión ... "
 
-#: initdb.c:1272
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "creando archivos de configuración ... "
 
-#: initdb.c:1425 initdb.c:1439 initdb.c:1506 initdb.c:1517
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "no se pudo cambiar los permisos de «%s»: %m"
 
-#: initdb.c:1536
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "ejecutando script de inicio (bootstrap) ... "
 
-#: initdb.c:1548
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "el archivo de entrada «%s» no pertenece a PostgreSQL %s"
 
-#: initdb.c:1550
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Especifique la ruta correcta usando la opción -L."
 
-#: initdb.c:1652
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "Ingrese la nueva contraseña del superusuario: "
 
-#: initdb.c:1653
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: initdb.c:1656
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las contraseñas no coinciden.\n"
 
-#: initdb.c:1680
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "no se pudo leer la contraseña desde el archivo «%s»: %m"
 
-#: initdb.c:1683
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "el archivo de contraseña «%s» está vacío"
 
-#: initdb.c:2095
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "se ha capturado una señal\n"
 
-#: initdb.c:2101
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "no se pudo escribir al proceso hijo: %s\n"
 
-#: initdb.c:2109
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "hecho\n"
 
-#: initdb.c:2191 initdb.c:2237
+#: initdb.c:2209 initdb.c:2255
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "el nombre de configuración regional «%s» contiene caracteres no ASCII"
 
-#: initdb.c:2217
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "nombre de configuración regional «%s» no es válido"
 
-#: initdb.c:2218
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Si el nombre de configuración regional es específico a ICU, utilice --icu-locale."
 
-#: initdb.c:2231
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "configuración regional inválida; revise las variables de entorno LANG y LC_*"
 
-#: initdb.c:2262 initdb.c:2286
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "codificaciones no coinciden"
 
-#: initdb.c:2263
+#: initdb.c:2281
 #, c-format
 msgid "The encoding you selected (%s) and the encoding that the selected locale uses (%s) do not match. This would lead to misbehavior in various character string processing functions."
 msgstr "La codificación que seleccionó (%s) y la codificación de la configuración regional elegida (%s) no coinciden.  Esto llevaría a comportamientos erráticos en ciertas funciones de procesamiento de cadenas de caracteres."
 
-#: initdb.c:2268 initdb.c:2289
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid "Rerun %s and either do not specify an encoding explicitly, or choose a matching combination."
 msgstr ""
 "Vuelva a ejecutar %s sin escoger explícitamente una codificación, o bien\n"
 "escoja una combinación coincidente."
 
-#: initdb.c:2287
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "La codificación que seleccionó (%s) no está soportada con el proveedor ICU."
 
-#: initdb.c:2338
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "no se pudo convertir el nombre de configuración regional «%s» a etiqueta de lenguaje: %s"
 
-#: initdb.c:2344 initdb.c:2396 initdb.c:2488
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU no está soportado en este servidor"
 
-#: initdb.c:2367
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "no se pudo el lenguaje de la configuración regional «%s»: %s"
 
-#: initdb.c:2393
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "la configuración regional «%s» no idioma desconocido «%s»"
 
-#: initdb.c:2454
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "la configuración regional debe especificarse si el proveedor es %s"
 
-#: initdb.c:2465
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "nombre de configuración regional «%s» no válido para el proveedor builtin"
 
-#: initdb.c:2476
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Usando la etiqueta de idioma «%s» para la configuración regional ICU «%s».\n"
 
-#: initdb.c:2499
+#: initdb.c:2519
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -558,17 +558,17 @@ msgstr ""
 "%s inicializa un cluster de base de datos PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2500
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: initdb.c:2501
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCIÓN]... [DATADIR]\n"
 
-#: initdb.c:2502
+#: initdb.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -577,69 +577,69 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: initdb.c:2503
+#: initdb.c:2523
 #, 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:2504
+#: initdb.c:2524
 #, 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:2505
+#: initdb.c:2525
 #, 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:2506
+#: initdb.c:2526
 #, 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:2507
+#: initdb.c:2527
 #, 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:2508
+#: initdb.c:2528
 #, c-format
 msgid "  -g, --allow-group-access  allow group read/execute on data directory\n"
 msgstr ""
 "  -g, --allow-group-access  dar al grupo permisos de lectura/ejecución sobre\n"
 "                            el directorio de datos\n"
 
-#: initdb.c:2509
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr ""
 "      --icu-locale=LOCALE   definir el ID de configuración regional ICU para\n"
 "                            nuevas bases de datos\n"
 
-#: initdb.c:2510
+#: initdb.c:2530
 #, c-format
 msgid "      --icu-rules=RULES     set additional ICU collation rules for new databases\n"
 msgstr "      --icu-rules=REGLAS    reglas de ordenamiento ICU adicionales para nuevas bases de datos\n"
 
-#: initdb.c:2511
+#: initdb.c:2531
 #, 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:2512
+#: initdb.c:2532
 #, 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:2513
+#: initdb.c:2533
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -653,12 +653,12 @@ msgstr ""
 "                            en la categoría respectiva (el valor por omisión\n"
 "                            es tomado de variables de ambiente)\n"
 
-#: initdb.c:2517
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2518
+#: initdb.c:2538
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE\n"
@@ -668,7 +668,7 @@ msgstr ""
 "                            define el nombre de configuración regional builtin\n"
 "                            para nuevas bases de datos\n"
 
-#: initdb.c:2520
+#: initdb.c:2540
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -678,12 +678,17 @@ msgstr ""
 "                            define el proveedor de configuración regional\n"
 "                            para nuevas bases de datos\n"
 
-#: initdb.c:2522
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr "      --no-data-checksums   no usar sumas de verificación en páginas de datos\n"
+
+#: initdb.c:2543
 #, 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:2523
+#: initdb.c:2544
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -692,27 +697,27 @@ msgstr ""
 "  -T, --text-search-config=CONF\n"
 "                            configuración de búsqueda en texto por omisión\n"
 
-#: initdb.c:2525
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=USUARIO    nombre del superusuario del cluster\n"
 
-#: initdb.c:2526
+#: initdb.c:2547
 #, 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:2527
+#: initdb.c:2548
 #, c-format
 msgid "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=WALDIR       ubicación del directorio WAL\n"
 
-#: initdb.c:2528
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=TAMAÑO  tamaño de los segmentos de WAL, en megabytes\n"
 
-#: initdb.c:2529
+#: initdb.c:2550
 #, c-format
 msgid ""
 "\n"
@@ -721,57 +726,62 @@ msgstr ""
 "\n"
 "Opciones menos usadas:\n"
 
-#: initdb.c:2530
+#: initdb.c:2551
 #, c-format
 msgid "  -c, --set NAME=VALUE      override default setting for server parameter\n"
 msgstr "  -c, --set VAR=VALOR       sobreescribir el valor por omisión del parámetro\n"
 
-#: initdb.c:2531
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera mucha salida de depuración\n"
 
-#: initdb.c:2532
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches      establece debug_discard_caches=1\n"
 
-#: initdb.c:2533
+#: initdb.c:2554
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORIO             donde encontrar los archivos de entrada\n"
 
-#: initdb.c:2534
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean            no limpiar después de errores\n"
 
-#: initdb.c:2535
+#: initdb.c:2556
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync             no esperar que los cambios se sincronicen a disco\n"
 
-#: initdb.c:2536
+#: initdb.c:2557
+#, c-format
+msgid "      --no-sync-data-files  do not sync files within database directories\n"
+msgstr "      --no-sync-data-files  no sincronizar archivos en los directorios de datos\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr "      --no-instructions     no mostrar instrucciones para los siguientes pasos\n"
 
-#: initdb.c:2537
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                muestra variables internas y salir\n"
 
-#: initdb.c:2538
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=MÉTODO  definir método para sincronizar archivos a disco\n"
 
-#: initdb.c:2539
+#: initdb.c:2561
 #, c-format
 msgid "  -S, --sync-only           only sync database files to disk, then exit\n"
 msgstr "  -S, --sync-only           sólo sincronizar el directorio de datos y salir\n"
 
-#: initdb.c:2540
+#: initdb.c:2562
 #, c-format
 msgid ""
 "\n"
@@ -780,17 +790,17 @@ msgstr ""
 "\n"
 "Otras opciones:\n"
 
-#: initdb.c:2541
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: initdb.c:2542
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: initdb.c:2543
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -801,7 +811,7 @@ msgstr ""
 "Si el directorio de datos no es especificado, se usa la variable de\n"
 "ambiente PGDATA.\n"
 
-#: initdb.c:2545
+#: initdb.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -810,72 +820,72 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: initdb.c:2546
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: initdb.c:2570
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr "método de autentificación «%s» no válido para conexiones «%s»"
 
-#: initdb.c:2584
+#: initdb.c:2606
 #, c-format
 msgid "must specify a password for the superuser to enable password authentication"
 msgstr "debe especificar una contraseña al superusuario para activar autentificación mediante contraseña"
 
-#: initdb.c:2603
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "no se especificó un directorio de datos"
 
-#: initdb.c:2604
+#: initdb.c:2626
 #, c-format
 msgid "You must identify the directory where the data for this database system will reside.  Do this with either the invocation option -D or the environment variable PGDATA."
 msgstr "Debe especificar el directorio donde residirán los datos para este clúster.  Hágalo usando la opción -D o la variable de ambiente PGDATA."
 
-#: initdb.c:2621
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "no se pudo establecer el ambiente"
 
-#: initdb.c:2639
+#: initdb.c:2661
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "el programa «%s» es requerido por %s pero se encontró en el mismo directorio que «%s»"
 
-#: initdb.c:2642
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "El programa «%s» fue encontrado por «%s», pero no es de la misma versión que %s"
 
-#: initdb.c:2657
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "la ubicación de archivos de entrada debe ser una ruta absoluta"
 
-#: initdb.c:2674
+#: initdb.c:2696
 #, 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:2677
+#: initdb.c:2699
 #, c-format
 msgid "The database cluster will be initialized with this locale configuration:\n"
 msgstr "El cluster será inicializado con esta configuración regional:\n"
 
-#: initdb.c:2678
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  proveedor de configuración regional: %s\n"
 
-#: initdb.c:2680
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr "  ordenamiento por omisión: %s\n"
 
-#: initdb.c:2681
+#: initdb.c:2703
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -892,22 +902,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2711
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "no se pudo encontrar una codificación apropiada para la configuración regional «%s»"
 
-#: initdb.c:2713
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Ejecute %s nuevamente con la opción -E."
 
-#: initdb.c:2714 initdb.c:3257 initdb.c:3377 initdb.c:3397
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: initdb.c:2726
+#: initdb.c:2748
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -917,114 +927,114 @@ msgstr ""
 "no puede ser usada como codificación del lado del servidor.\n"
 "La codificación por omisión será «%s».\n"
 
-#: initdb.c:2731
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "la configuración regional «%s» requiere la codificación no soportada «%s»"
 
-#: initdb.c:2733
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "La codificación «%s» no puede ser usada como codificación del lado del servidor."
 
-#: initdb.c:2735
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Ejecute %s nuevamente con opciones de configuración regional diferente."
 
-#: initdb.c:2743
+#: initdb.c:2765
 #, 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:2757
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "la configuración regional «%s» del proveedor builtin requiere la codificación «%s»"
 
-#: initdb.c:2819
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr ""
 "no se pudo encontrar una configuración para búsqueda en texto apropiada\n"
 "para la configuración regional «%s»"
 
-#: initdb.c:2830
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr "la configuración de búsqueda en texto apropiada para la configuración regional «%s» es desconocida"
 
-#: initdb.c:2835
+#: initdb.c:2859
 #, c-format
 msgid "specified text search configuration \"%s\" might not match locale \"%s\""
 msgstr "la configuración de búsqueda en texto «%s» especificada podría no coincidir con la configuración regional «%s»"
 
-#: initdb.c:2840
+#: initdb.c:2864
 #, 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:2883 initdb.c:2954
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creando el directorio %s ... "
 
-#: initdb.c:2888 initdb.c:2959 initdb.c:3007 initdb.c:3064
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: initdb.c:2897 initdb.c:2969
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "corrigiendo permisos en el directorio existente %s ... "
 
-#: initdb.c:2902 initdb.c:2974
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "no se pudo cambiar los permisos del directorio «%s»: %m"
 
-#: initdb.c:2914 initdb.c:2986
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "el directorio «%s» existe pero no está vacío"
 
-#: initdb.c:2918
+#: initdb.c:2933
 #, c-format
 msgid "If you want to create a new database system, either remove or empty the directory \"%s\" or run %s with an argument other than \"%s\"."
 msgstr "Si quiere crear un nuevo cluster de bases de datos, elimine o vacíe el directorio «%s», o ejecute %s con un argumento distinto de «%s»."
 
-#: initdb.c:2926 initdb.c:2996 initdb.c:3422
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "no se pudo acceder al directorio «%s»: %m"
 
-#: initdb.c:2947
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "la ubicación del directorio de WAL debe ser una ruta absoluta"
 
-#: initdb.c:2990
+#: initdb.c:3005
 #, c-format
 msgid "If you want to store the WAL there, either remove or empty the directory \"%s\"."
 msgstr "Si quiere almacenar el WAL ahí, elimine o vacíe el directorio «%s»."
 
-#: initdb.c:3000
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "no se pudo crear el enlace simbólico «%s»: %m"
 
-#: initdb.c:3019
+#: initdb.c:3034
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point."
 msgstr "Contiene un archivo invisible o que empieza con un punto (.), quizás por ser un punto de montaje."
 
-#: initdb.c:3021
+#: initdb.c:3036
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Contiene un directorio lost+found, quizás por ser un punto de montaje."
 
-#: initdb.c:3023
+#: initdb.c:3038
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1033,67 +1043,67 @@ msgstr ""
 "Usar un punto de montaje directamente como directorio de datos no es recomendado.\n"
 "Cree un subdirectorio bajo el punto de montaje."
 
-#: initdb.c:3050
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creando subdirectorios ... "
 
-#: initdb.c:3093
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "realizando inicialización post-bootstrap ... "
 
-#: initdb.c:3256
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s requiere un valor"
 
-#: initdb.c:3281
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Ejecutando en modo de depuración.\n"
 
-#: initdb.c:3285
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Ejecutando en modo no-clean.  Los errores no serán limpiados.\n"
 
-#: initdb.c:3358
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "proveedor de ordenamiento no reconocido: %s"
 
-#: initdb.c:3395
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: initdb.c:3402 initdb.c:3406 initdb.c:3410
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s no puede especificarse a menos que el proveedor de locale «%s» sea escogido"
 
-#: initdb.c:3424 initdb.c:3487
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "sincronizando los datos a disco ... "
 
-#: initdb.c:3432
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr ""
 "la petición de contraseña y el archivo de contraseña no pueden\n"
 "ser especificados simultáneamente"
 
-#: initdb.c:3443
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "el argumento de %s debe ser una potencia de dos entre 1 y 1024"
 
-#: initdb.c:3456
+#: initdb.c:3479
 #, c-format
 msgid "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
 msgstr "nombre de superusuario «%s» no permitido; los nombres de rol no pueden comenzar con «pg_»"
 
-#: initdb.c:3458
+#: initdb.c:3481
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1104,17 +1114,17 @@ msgstr ""
 "Este usuario también debe ser quien ejecute el proceso servidor.\n"
 "\n"
 
-#: initdb.c:3474
+#: initdb.c:3497
 #, 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:3476
+#: initdb.c:3499
 #, 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:3493
+#: initdb.c:3516
 #, c-format
 msgid ""
 "\n"
@@ -1126,22 +1136,22 @@ msgstr ""
 "El directorio de datos podría corromperse si el sistema operativo sufre\n"
 "una caída.\n"
 
-#: initdb.c:3498
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "activando el método de autentificación «trust» para conexiones locales"
 
-#: initdb.c:3499
+#: initdb.c:3522
 #, c-format
 msgid "You can change this by editing pg_hba.conf or using the option -A, or --auth-local and --auth-host, the next time you run initdb."
 msgstr "Puede cambiar esto editando pg_hba.conf o usando el parámetro -A, o --auth-local y --auth-host la próxima vez que ejecute initdb."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3529
+#: initdb.c:3552
 msgid "logfile"
 msgstr "archivo_de_registro"
 
-#: initdb.c:3531
+#: initdb.c:3554
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po
index c8a155a62bb..2aa204631f9 100644
--- a/src/bin/initdb/po/fr.po
+++ b/src/bin/initdb/po/fr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-10-29 18:21+0000\n"
-"PO-Revision-Date: 2024-10-30 07:41+0100\n"
+"POT-Creation-Date: 2025-07-04 19:51+0000\n"
+"PO-Revision-Date: 2025-07-06 13:59+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
@@ -63,28 +63,28 @@ msgstr "n'a pas pu trouver un « %s » à exécuter"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "n'a pas pu résoudre le chemin « %s » en sa forme absolue : %m"
 
-#: ../../common/exec.c:382 initdb.c:750
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "n'a pas pu exécuter la commande « %s » : %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "n'a pas pu lire à partir de la commande « %s » : %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "aucune donnée n'a été renvoyée par la commande « %s »"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:372 initdb.c:408
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
@@ -100,46 +100,46 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -248,12 +248,12 @@ msgstr "%s doit être compris entre %d et %d"
 msgid "unrecognized sync method: %s"
 msgstr "méthode de synchronisation non reconnu : %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
@@ -268,289 +268,289 @@ msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
 
-#: initdb.c:369
+#: initdb.c:372
 #, c-format
 msgid "_wsetlocale() failed"
 msgstr "échec de _wsetlocale()"
 
-#: initdb.c:376
+#: initdb.c:379
 #, c-format
 msgid "setlocale() failed"
 msgstr "échec de setlocale()"
 
-#: initdb.c:390
+#: initdb.c:393
 #, c-format
 msgid "failed to restore old locale"
 msgstr "a échoué pour restaurer l'ancienne locale"
 
-#: initdb.c:393
+#: initdb.c:396
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "a échoué pour restaurer l'ancienne locale « %s »"
 
-#: initdb.c:682 initdb.c:1674
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: initdb.c:726 initdb.c:1030 initdb.c:1050
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » en écriture : %m"
 
-#: initdb.c:730 initdb.c:1033 initdb.c:1052
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: initdb.c:734
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier « %s » : %m"
 
-#: initdb.c:768
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "suppression du répertoire des données « %s »"
 
-#: initdb.c:770
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "échec de la suppression du répertoire des données"
 
-#: initdb.c:774
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "suppression du contenu du répertoire des données « %s »"
 
-#: initdb.c:777
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "échec de la suppression du contenu du répertoire des données"
 
-#: initdb.c:782
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "suppression du répertoire des journaux de transactions « %s »"
 
-#: initdb.c:784
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "échec de la suppression du répertoire des journaux de transactions"
 
-#: initdb.c:788
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "suppression du contenu du répertoire des journaux de transactions « %s »"
 
-#: initdb.c:790
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "échec de la suppression du contenu du répertoire des journaux de transactions"
 
-#: initdb.c:797
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "répertoire des données « %s » non supprimé à la demande de l'utilisateur"
 
-#: initdb.c:801
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "répertoire des journaux de transactions « %s » non supprimé à la demande de l'utilisateur"
 
-#: initdb.c:819
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "ne peut pas être exécuté en tant que root"
 
-#: initdb.c:820
+#: initdb.c:823
 #, c-format
 msgid "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own the server process."
 msgstr "Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non privilégié) qui sera propriétaire du processus serveur."
 
-#: initdb.c:852
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "« %s » n'est pas un nom d'encodage serveur valide"
 
-#: initdb.c:996
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "le rôle « %s » n'existe pas"
 
-#: initdb.c:997 initdb.c:1002 initdb.c:1009
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid "This might mean you have a corrupted installation or identified the wrong directory with the invocation option -L."
 msgstr "Cela peut signifier que votre installation est corrompue ou que vous avez identifié le mauvais répertoire avec l'option -L."
 
-#: initdb.c:1001
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "n'a pas pu accéder au fichier « %s » : %m"
 
-#: initdb.c:1008
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "le fichier « %s » n'est pas un fichier standard"
 
-#: initdb.c:1141
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "sélection de l'implémentation de la mémoire partagée dynamique..."
 
-#: initdb.c:1150
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "sélection de la valeur par défaut pour « max_connections »... "
 
-#: initdb.c:1170
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "sélection de la valeur par défaut pour « shared_buffers »... "
 
-#: initdb.c:1193
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "sélection du fuseau horaire par défaut... "
 
-#: initdb.c:1272
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "création des fichiers de configuration... "
 
-#: initdb.c:1425 initdb.c:1439 initdb.c:1506 initdb.c:1517
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "n'a pas pu modifier les droits de « %s » : %m"
 
-#: initdb.c:1536
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "lancement du script bootstrap..."
 
-#: initdb.c:1548
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "le fichier en entrée « %s » n'appartient pas à PostgreSQL %s"
 
-#: initdb.c:1550
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Indiquez le bon chemin avec l'option -L."
 
-#: initdb.c:1652
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "Saisir le nouveau mot de passe du super-utilisateur : "
 
-#: initdb.c:1653
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "Saisir le mot de passe à nouveau : "
 
-#: initdb.c:1656
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Les mots de passe ne sont pas identiques.\n"
 
-#: initdb.c:1680
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "n'a pas pu lire le mot de passe à partir du fichier « %s » : %m"
 
-#: initdb.c:1683
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "le fichier de mots de passe « %s » est vide"
 
-#: initdb.c:2095
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "signal reçu\n"
 
-#: initdb.c:2101
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "n'a pas pu écrire au processus fils : %s\n"
 
-#: initdb.c:2109
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2191 initdb.c:2237
+#: initdb.c:2209 initdb.c:2255
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "le nom de la locale « %s » contient des caractères non ASCII"
 
-#: initdb.c:2217
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "nom de locale « %s » invalide"
 
-#: initdb.c:2218
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Si le nom de la locale est spécifique à ICU, utilisez --icu-locale."
 
-#: initdb.c:2231
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "configuration invalide de la locale ; vérifiez les variables d'environnement LANG et LC_*"
 
-#: initdb.c:2262 initdb.c:2286
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "différence d'encodage"
 
-#: initdb.c:2263
+#: initdb.c:2281
 #, c-format
 msgid "The encoding you selected (%s) and the encoding that the selected locale uses (%s) do not match. This would lead to misbehavior in various character string processing functions."
 msgstr "L'encodage que vous avez sélectionné (%s) et celui que la locale sélectionnée utilise (%s) ne sont pas compatibles. Cela peut conduire à des erreurs dans les fonctions de manipulation de chaînes de caractères."
 
-#: initdb.c:2268 initdb.c:2289
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid "Rerun %s and either do not specify an encoding explicitly, or choose a matching combination."
 msgstr "Relancez %s et soit vous ne spécifiez pas explicitement d'encodage, soit vous choisissez une combinaison compatible."
 
-#: initdb.c:2287
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "L'encodage que vous avez sélectionné (%s) n'est pas supporté avec le fournisseur ICU."
 
-#: initdb.c:2338
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "n'a pas pu convertir le nom de locale « %s » en balise de langage : %s"
 
-#: initdb.c:2344 initdb.c:2396 initdb.c:2488
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU n'est pas supporté dans cette installation"
 
-#: initdb.c:2367
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "n'a pas pu obtenir la langue à partir de la locale « %s » : %s"
 
-#: initdb.c:2393
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "la locale « %s » a le langage inconnu « %s »"
 
-#: initdb.c:2454
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "la locale doit être spécifiée si le fournisseur est %s"
 
-#: initdb.c:2465
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "nom de locale « %s » invalide pour le fournisseur natif"
 
-#: initdb.c:2476
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Utilisation de la balise de langage « %s » pour la locale ICU « %s ».\n"
 
-#: initdb.c:2499
+#: initdb.c:2519
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -559,17 +559,17 @@ msgstr ""
 "%s initialise une instance PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2500
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: initdb.c:2501
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
 
-#: initdb.c:2502
+#: initdb.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -578,71 +578,71 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: initdb.c:2503
+#: initdb.c:2523
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=MÉTHODE           méthode d'authentification par défaut pour les\n"
 "                               connexions locales\n"
 
-#: initdb.c:2504
+#: initdb.c:2524
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "      --auth-host=MÉTHODE      méthode d'authentification par défaut pour les\n"
 "                               connexions locales TCP/IP\n"
 
-#: initdb.c:2505
+#: initdb.c:2525
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "      --auth-local=MÉTHODE     méthode d'authentification par défaut pour les\n"
 "                               connexions locales socket\n"
 
-#: initdb.c:2506
+#: initdb.c:2526
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]RÉP_DONNÉES    emplacement du répertoire principal des données\n"
 
-#: initdb.c:2507
+#: initdb.c:2527
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=ENCODAGE      initialise l'encodage par défaut des nouvelles\n"
 "                               bases de données\n"
 
-#: initdb.c:2508
+#: initdb.c:2528
 #, c-format
 msgid "  -g, --allow-group-access  allow group read/execute on data directory\n"
 msgstr ""
 "  -g, --allow-group-access     autorise la lecture/écriture pour le groupe sur\n"
 "                               le répertoire des données\n"
 
-#: initdb.c:2509
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=LOCALE      initialise l'identifiant de locale ICU pour les nouvelles bases de données\n"
 
-#: initdb.c:2510
+#: initdb.c:2530
 #, c-format
 msgid "      --icu-rules=RULES     set additional ICU collation rules for new databases\n"
 msgstr "      --icu-rules=REGLES       initialise les règles supplémentaires de la locale ICU pour les nouvelles bases de données\n"
 
-#: initdb.c:2511
+#: initdb.c:2531
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr ""
 "  -k, --data-checksums         active les sommes de contrôle pour les blocs des\n"
 "                               fichiers de données\n"
 
-#: initdb.c:2512
+#: initdb.c:2532
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr ""
 "      --locale=LOCALE          initialise la locale par défaut pour les\n"
 "                               nouvelles bases de données\n"
 
-#: initdb.c:2513
+#: initdb.c:2533
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -657,12 +657,12 @@ msgstr ""
 "                               (les valeurs par défaut sont prises dans\n"
 "                               l'environnement)\n"
 
-#: initdb.c:2517
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale              équivalent à --locale=C\n"
 
-#: initdb.c:2518
+#: initdb.c:2538
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE\n"
@@ -672,7 +672,7 @@ msgstr ""
 "                               initialise le fournisseur de locale natif pour\n"
 "                               les nouvelles bases de données\n"
 
-#: initdb.c:2520
+#: initdb.c:2540
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -682,14 +682,21 @@ msgstr ""
 "                               initialise le fournisseur de locale par défaut pour\n"
 "                               les nouvelles bases de données\n"
 
-#: initdb.c:2522
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr ""
+"  --no-data-checksums          ne pas utiliser les sommes de contrôle pour les\\n\n"
+"                               fichiers de données\n"
+
+#: initdb.c:2543
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=FICHIER         lit le mot de passe du nouveau super-utilisateur\n"
 "                               à partir de ce fichier\n"
 
-#: initdb.c:2523
+#: initdb.c:2544
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -698,31 +705,31 @@ msgstr ""
 "  -T, --text-search-config=CFG configuration par défaut de la recherche plein\n"
 "                               texte\n"
 
-#: initdb.c:2525
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NOM           nom du super-utilisateur de la base de données\n"
 
-#: initdb.c:2526
+#: initdb.c:2547
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr ""
 "  -W, --pwprompt               demande un mot de passe pour le nouveau\n"
 "                               super-utilisateur\n"
 
-#: initdb.c:2527
+#: initdb.c:2548
 #, c-format
 msgid "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr ""
 "  -X, --waldir=RÉP_WAL         emplacement du répertoire des journaux de\n"
 "                               transactions\n"
 
-#: initdb.c:2528
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=TAILLE     configure la taille des segments WAL, en Mo\n"
 
-#: initdb.c:2529
+#: initdb.c:2550
 #, c-format
 msgid ""
 "\n"
@@ -731,63 +738,70 @@ msgstr ""
 "\n"
 "Options moins utilisées :\n"
 
-#: initdb.c:2530
+#: initdb.c:2551
 #, c-format
 msgid "  -c, --set NAME=VALUE      override default setting for server parameter\n"
 msgstr "  -c NOM=VALEUR                surcharge la configuration par défaut d'un paramètre serveur\n"
 
-#: initdb.c:2531
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                  engendre un grand nombre de traces de débogage\n"
 
-#: initdb.c:2532
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches         initialise debug_discard_caches à 1\n"
 
-#: initdb.c:2533
+#: initdb.c:2554
 #, 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 de l'instance\n"
 
-#: initdb.c:2534
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --noclean                ne nettoie pas après des erreurs\n"
 
-#: initdb.c:2535
+#: initdb.c:2556
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync                 n'attend pas que les modifications soient\n"
 "                               proprement écrites sur disque\n"
 
-#: initdb.c:2536
+#: initdb.c:2557
+#, c-format
+msgid "      --no-sync-data-files  do not sync files within database directories\n"
+msgstr ""
+"  --no-sync-data-files         ne pas synchroniser les fichiers des répertoires\\n\n"
+"                               de l'instance\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr ""
 "  --no-instructions            n'affiche pas les instructions des prochaines\n"
 "                               étapes\n"
 
-#: initdb.c:2537
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                   affiche la configuration interne, puis quitte\n"
 
-#: initdb.c:2538
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHODE    configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: initdb.c:2539
+#: initdb.c:2561
 #, c-format
 msgid "  -S, --sync-only           only sync database files to disk, then exit\n"
 msgstr "  -S, --sync-only              synchronise uniquement le répertoire des données, puis quitte\n"
 
-#: initdb.c:2540
+#: initdb.c:2562
 #, c-format
 msgid ""
 "\n"
@@ -796,17 +810,17 @@ msgstr ""
 "\n"
 "Autres options :\n"
 
-#: initdb.c:2541
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version                affiche la version puis quitte\n"
 
-#: initdb.c:2542
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                   affiche cette aide puis quitte\n"
 
-#: initdb.c:2543
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -817,7 +831,7 @@ msgstr ""
 "Si le répertoire des données n'est pas indiqué, la variable d'environnement\n"
 "PGDATA est utilisée.\n"
 
-#: initdb.c:2545
+#: initdb.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -826,72 +840,72 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: initdb.c:2546
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: initdb.c:2570
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr "méthode d'authentification « %s » invalide pour « %s » connexions"
 
-#: initdb.c:2584
+#: initdb.c:2606
 #, c-format
 msgid "must specify a password for the superuser to enable password authentication"
 msgstr "doit indiquer un mot de passe pour le super-utilisateur afin d'activer l'authentification par mot de passe"
 
-#: initdb.c:2603
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "aucun répertoire de données indiqué"
 
-#: initdb.c:2604
+#: initdb.c:2626
 #, c-format
 msgid "You must identify the directory where the data for this database system will reside.  Do this with either the invocation option -D or the environment variable PGDATA."
 msgstr "Vous devez identifier le répertoire où résideront les données pour ce système de bases de données. Faites-le soit avec l'option -D soit avec la variable d'environnement PGDATA."
 
-#: initdb.c:2621
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "n'a pas pu configurer l'environnement"
 
-#: initdb.c:2639
+#: initdb.c:2661
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »"
 
-#: initdb.c:2642
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s"
 
-#: initdb.c:2657
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "l'emplacement du fichier d'entrée doit être indiqué avec un chemin absolu"
 
-#: initdb.c:2674
+#: initdb.c:2696
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "L'instance sera initialisée avec la locale « %s ».\n"
 
-#: initdb.c:2677
+#: initdb.c:2699
 #, c-format
 msgid "The database cluster will be initialized with this locale configuration:\n"
 msgstr "L'instance sera initialisée avec cette configuration de locale :\n"
 
-#: initdb.c:2678
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  fournisseur de locale :    %s\n"
 
-#: initdb.c:2680
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr "collation par défaut : %s\n"
 
-#: initdb.c:2681
+#: initdb.c:2703
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -908,22 +922,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2711
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "n'a pas pu trouver un encodage adéquat pour la locale « %s »"
 
-#: initdb.c:2713
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Relancez %s avec l'option -E."
 
-#: initdb.c:2714 initdb.c:3257 initdb.c:3377 initdb.c:3397
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: initdb.c:2726
+#: initdb.c:2748
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -932,114 +946,114 @@ msgstr ""
 "L'encodage « %s » a été déduit de la locale mais 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:2731
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "la locale « %s » nécessite l'encodage « %s » non supporté"
 
-#: initdb.c:2733
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "L'encodage « %s » n'est pas autorisé en tant qu'encodage serveur."
 
-#: initdb.c:2735
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Relancez %s avec une locale différente."
 
-#: initdb.c:2743
+#: initdb.c:2765
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "L'encodage par défaut des bases de données a été configuré en conséquence\n"
 "avec « %s ».\n"
 
-#: initdb.c:2757
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "la locale du fournisseur natif « %s » nécessite l'encodage « %s »"
 
-#: initdb.c:2819
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr "n'a pas pu trouver la configuration de la recherche plein texte en adéquation avec la locale « %s »"
 
-#: initdb.c:2830
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr "la configuration de la recherche plein texte convenable pour la locale « %s » est inconnue"
 
-#: initdb.c:2835
+#: initdb.c:2859
 #, c-format
 msgid "specified text search configuration \"%s\" might not match locale \"%s\""
 msgstr "la configuration indiquée pour la recherche plein texte, « %s », pourrait ne pas correspondre à la locale « %s »"
 
-#: initdb.c:2840
+#: initdb.c:2864
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "La configuration de la recherche plein texte a été initialisée à « %s ».\n"
 
-#: initdb.c:2883 initdb.c:2954
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "création du répertoire %s... "
 
-#: initdb.c:2888 initdb.c:2959 initdb.c:3007 initdb.c:3064
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
 
-#: initdb.c:2897 initdb.c:2969
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "correction des droits sur le répertoire existant %s... "
 
-#: initdb.c:2902 initdb.c:2974
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "n'a pas pu modifier les droits du répertoire « %s » : %m"
 
-#: initdb.c:2914 initdb.c:2986
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "le répertoire « %s » existe mais n'est pas vide"
 
-#: initdb.c:2918
+#: initdb.c:2933
 #, c-format
 msgid "If you want to create a new database system, either remove or empty the directory \"%s\" or run %s with an argument other than \"%s\"."
 msgstr "Si vous voulez créer un nouveau système de bases de données, supprimez ou videz le répertoire « %s ». Vous pouvez aussi exécuter %s avec un argument autre que « %s »."
 
-#: initdb.c:2926 initdb.c:2996 initdb.c:3422
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "n'a pas pu accéder au répertoire « %s » : %m"
 
-#: initdb.c:2947
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "l'emplacement du répertoire des journaux de transactions doit être indiqué avec un chemin absolu"
 
-#: initdb.c:2990
+#: initdb.c:3005
 #, c-format
 msgid "If you want to store the WAL there, either remove or empty the directory \"%s\"."
 msgstr "Si vous voulez enregistrer ici les WAL, supprimez ou videz le répertoire « %s »."
 
-#: initdb.c:3000
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique « %s » : %m"
 
-#: initdb.c:3019
+#: initdb.c:3034
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point."
 msgstr "Il contient un fichier invisible, peut-être parce qu'il s'agit d'un point de montage."
 
-#: initdb.c:3021
+#: initdb.c:3036
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Il contient un répertoire lost+found, peut-être parce qu'il s'agit d'un point de montage.\\"
 
-#: initdb.c:3023
+#: initdb.c:3038
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1048,67 +1062,67 @@ msgstr ""
 "Utiliser un point de montage comme répertoire des données n'est pas recommandé.\n"
 "Créez un sous-répertoire sous le point de montage."
 
-#: initdb.c:3050
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "création des sous-répertoires... "
 
-#: initdb.c:3093
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "exécution de l'initialisation après bootstrap... "
 
-#: initdb.c:3256
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s requiert une valeur"
 
-#: initdb.c:3281
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Lancé en mode débogage.\n"
 
-#: initdb.c:3285
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Lancé en mode « sans nettoyage ». Les erreurs ne seront pas nettoyées.\n"
 
-#: initdb.c:3358
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "fournisseur de locale non reconnu : %s"
 
-#: initdb.c:3395
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: initdb.c:3402 initdb.c:3406 initdb.c:3410
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s ne peut pas être spécifié sauf si le fournisseur de locale « %s » est choisi"
 
-#: initdb.c:3424 initdb.c:3487
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "synchronisation des données sur disque... "
 
-#: initdb.c:3432
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr ""
 "les options d'invite du mot de passe et de fichier de mots de passe ne\n"
 "peuvent pas être indiquées simultanément"
 
-#: initdb.c:3443
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "l'argument de %s doit être une puissance de 2 comprise entre 1 et 1024"
 
-#: initdb.c:3456
+#: initdb.c:3479
 #, c-format
 msgid "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
 msgstr "le nom de superutilisateur « %s » n'est pas autorisé ; les noms de rôle ne peuvent pas commencer par « pg_ »"
 
-#: initdb.c:3458
+#: initdb.c:3481
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1119,17 +1133,17 @@ msgstr ""
 "Le processus serveur doit également lui appartenir.\n"
 "\n"
 
-#: initdb.c:3474
+#: initdb.c:3497
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Les sommes de contrôle des pages de données sont activées.\n"
 
-#: initdb.c:3476
+#: initdb.c:3499
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Les sommes de contrôle des pages de données sont désactivées.\n"
 
-#: initdb.c:3493
+#: initdb.c:3516
 #, c-format
 msgid ""
 "\n"
@@ -1140,22 +1154,22 @@ msgstr ""
 "Synchronisation sur disque ignorée.\n"
 "Le répertoire des données pourrait être corrompu si le système d'exploitation s'arrêtait brutalement.\n"
 
-#: initdb.c:3498
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "activation de l'authentification « trust » pour les connexions locales"
 
-#: initdb.c:3499
+#: initdb.c:3522
 #, c-format
 msgid "You can change this by editing pg_hba.conf or using the option -A, or --auth-local and --auth-host, the next time you run initdb."
 msgstr "Vous pouvez changer cette configuration en éditant le fichier pg_hba.conf ou en utilisant l'option -A, ou --auth-local et --auth-host, à la prochaine exécution d'initdb."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3529
+#: initdb.c:3552
 msgid "logfile"
 msgstr "fichier_de_trace"
 
-#: initdb.c:3531
+#: initdb.c:3554
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/po/ko.po b/src/bin/initdb/po/ko.po
index cc204fa046d..6e1b69932a2 100644
--- a/src/bin/initdb/po/ko.po
+++ b/src/bin/initdb/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: initdb (PostgreSQL) 17\n"
+"Project-Id-Version: initdb (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:51+0000\n"
-"PO-Revision-Date: 2025-01-16 11:33+0900\n"
+"POT-Creation-Date: 2025-09-11 21:51+0000\n"
+"PO-Revision-Date: 2025-09-09 11:33+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -55,28 +55,28 @@ msgstr "\"%s\" 실행 파일을 찾을 수 없음"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "\"%s\" 경로를 절대 경로로 바꿀 수 없음: %m"
 
-#: ../../common/exec.c:382 initdb.c:750
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "\"%s\" 명령을 실행할 수 없음: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "\"%s\" 명령에서 읽을 수 없음: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "\"%s\" 명령이 아무 데이터도 반환하지 않음"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:372 initdb.c:408
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
@@ -92,46 +92,46 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일 fsync 실패: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일 fsync 실패: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -240,12 +240,12 @@ msgstr "%s 값은 %d..%d 범위여야 함"
 msgid "unrecognized sync method: %s"
 msgstr "알 수 없는 동기화 방법: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령의 인자에 줄바꿈 문자가 포함되어 있음: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
@@ -262,104 +262,104 @@ msgstr "\"%s\" 파일의 정션을 구할 수 없음: %s\n"
 
 # # search5 끝
 # # advance 부분
-#: initdb.c:369
+#: initdb.c:372
 #, c-format
 msgid "_wsetlocale() failed"
 msgstr "_wsetlocale() 실패"
 
 # # search5 끝
 # # advance 부분
-#: initdb.c:376
+#: initdb.c:379
 #, c-format
 msgid "setlocale() failed"
 msgstr "setlocale() 실패"
 
-#: initdb.c:390
+#: initdb.c:393
 #, c-format
 msgid "failed to restore old locale"
 msgstr "옛 로케일을 복원할 수 없음"
 
-#: initdb.c:393
+#: initdb.c:396
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "\"%s\" 옛 로케일을 복원할 수 없음"
 
-#: initdb.c:682 initdb.c:1674
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "\"%s\" 파일 일기 모드로 열기 실패: %m"
 
-#: initdb.c:726 initdb.c:1030 initdb.c:1050
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "\"%s\" 파일 열기 실패: %m"
 
-#: initdb.c:730 initdb.c:1033 initdb.c:1052
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: initdb.c:734
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "\"%s\" 파일을 닫을 수 없음: %m"
 
-#: initdb.c:768
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "\"%s\" 데이터 디렉터리를 지우는 중"
 
-#: initdb.c:770
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "데이터 디렉터리를 지우는데 실패"
 
-#: initdb.c:774
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "\"%s\" 데이터 디렉터리 안의 내용을 지우는 중"
 
-#: initdb.c:777
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "데이터 디렉터리 내용을 지우는데 실패"
 
-#: initdb.c:782
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "\"%s\" WAL 디렉터리를 지우는 중"
 
-#: initdb.c:784
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "WAL 디렉터리를 지우는데 실패"
 
-#: initdb.c:788
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "\"%s\" WAL 디렉터리 안의 내용을 지우는 중"
 
-#: initdb.c:790
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "WAL 디렉터리 내용을 지우는데 실패"
 
-#: initdb.c:797
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "\"%s\" 데이터 디렉터리가 사용자의 요청으로 삭제되지 않았음"
 
-#: initdb.c:801
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "\"%s\" WAL 디렉터리가 사용자의 요청으로 삭제되지 않았음"
 
-#: initdb.c:819
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "root 권한으로 실행할 수 없음"
 
-#: initdb.c:820
+#: initdb.c:823
 #, c-format
 msgid ""
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own "
@@ -368,17 +368,17 @@ msgstr ""
 "시스템관리자 권한이 없는, 서버프로세스의 소유주가 될 일반 사용자로 로그인 해"
 "서(\"su\" 같은 명령 이용) 실행하십시오."
 
-#: initdb.c:852
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "\"%s\" 인코딩은 서버 인코딩 이름을 사용할 수 없음"
 
-#: initdb.c:996
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "\"%s\" 파일 없음"
 
-#: initdb.c:997 initdb.c:1002 initdb.c:1009
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified the wrong "
@@ -387,124 +387,124 @@ msgstr ""
 "설치가 잘못되었거나 -L 호출 옵션으로 지정한 디렉터리가 잘못되었을 수 있습니"
 "다."
 
-#: initdb.c:1001
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "\"%s\" 파일에 액세스할 수 없음: %m"
 
-#: initdb.c:1008
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "\"%s\" 파일은 일반 파일이 아님"
 
-#: initdb.c:1141
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "사용할 동적 공유 메모리 관리방식을 선택하는 중 ... "
 
-#: initdb.c:1150
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "\"max_connections\" 초기값을 선택 중 ..."
 
-#: initdb.c:1170
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "\"shared_buffers\" 초기값을 선택 중... "
 
-#: initdb.c:1193
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "기본 지역 시간대를 선택 중 ... "
 
-#: initdb.c:1272
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "환경설정 파일을 만드는 중 ..."
 
-#: initdb.c:1425 initdb.c:1439 initdb.c:1506 initdb.c:1517
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "\"%s\" 접근 권한을 바꿀 수 없음: %m"
 
-#: initdb.c:1536
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "부트스트랩 스크립트 실행 중 ... "
 
-#: initdb.c:1548
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "\"%s\" 입력 파일이 PostgreSQL %s 용이 아님"
 
-#: initdb.c:1550
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "-L 옵션으로 바른 경로를 지정하십시오."
 
-#: initdb.c:1652
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "새 superuser 암호를 입력하십시오:"
 
-#: initdb.c:1653
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "암호 확인:"
 
-#: initdb.c:1656
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "암호가 서로 틀립니다.\n"
 
-#: initdb.c:1680
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "\"%s\" 파일에서 암호를 읽을 수 없음: %m"
 
-#: initdb.c:1683
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "\"%s\" 패스워드 파일이 비어있음"
 
-#: initdb.c:2095
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "시스템의 간섭 신호(signal) 받았음\n"
 
-#: initdb.c:2101
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "하위 프로세스에 쓸 수 없음: %s\n"
 
-#: initdb.c:2109
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "완료\n"
 
-#: initdb.c:2191 initdb.c:2237
+#: initdb.c:2209 initdb.c:2255
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "\"%s\" 로케일 이름에 ASCII 문자가 아닌 것이 있음"
 
-#: initdb.c:2217
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "\"%s\" 로케일 이름이 잘못됨"
 
-#: initdb.c:2218
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "ICU 로케일 이름을 사용하려면, --icu-locale 옵션을 사용하세요."
 
-#: initdb.c:2231
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "잘못된 로케일 설정; LANG 또는 LC_* OS 환경 변수를 확인하세요"
 
-#: initdb.c:2262 initdb.c:2286
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "인코딩 불일치"
 
-#: initdb.c:2263
+#: initdb.c:2281
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected locale "
@@ -514,7 +514,7 @@ msgstr ""
 "선택한 인코딩(%s)과 선택한 로케일에서 사용하는 인코딩(%s)이 일치하지 않습니"
 "다.  이로 인해 여러 문자열 처리 함수에 오작동이 발생할 수 있습니다."
 
-#: initdb.c:2268 initdb.c:2289
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid ""
 "Rerun %s and either do not specify an encoding explicitly, or choose a "
@@ -523,47 +523,47 @@ msgstr ""
 "암묵적으로 지정된 인코딩이 마음에 들지 않으면 지정할 수 있는 인코딩을 지정해"
 "서 %s 작업을 다시 하세요."
 
-#: initdb.c:2287
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "지정한 %s 인코딩을 ICU 제공자가 지원하지 않습니다."
 
-#: initdb.c:2338
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "\"%s\" 로케일 이름을 로케일 태그로 바꿀 수 없음: %s"
 
-#: initdb.c:2344 initdb.c:2396 initdb.c:2488
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU 지원 기능을 뺀 채로 서버가 만들어졌습니다."
 
-#: initdb.c:2367
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "\"%s\" 로케일에서 언어를 찾을 수 없음: %s"
 
-#: initdb.c:2393
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "\"%s\" 로케일은 \"%s\" 라는 알 수 없는 언어를 사용함"
 
-#: initdb.c:2454
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "제공자가 %s 인경우 로케일을 지정해야 함"
 
-#: initdb.c:2465
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "내장 제공자용 \"%s\" 로케일 이름이 잘못됨"
 
-#: initdb.c:2476
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "\"%s\" 로케일 태그를 사용함, 해당 ICU 로케일: \"%s\"\n"
 
-#: initdb.c:2499
+#: initdb.c:2519
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -572,17 +572,17 @@ msgstr ""
 "%s PostgreSQL 데이터베이스 클러스터를 초기화 하는 프로그램.\n"
 "\n"
 
-#: initdb.c:2500
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: initdb.c:2501
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [옵션]... [DATADIR]\n"
 
-#: initdb.c:2502
+#: initdb.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -591,50 +591,50 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: initdb.c:2503
+#: initdb.c:2523
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
 "connections\n"
 msgstr "  -A, --auth=METHOD         로컬 연결의 기본 인증 방법\n"
 
-#: initdb.c:2504
+#: initdb.c:2524
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
 "connections\n"
 msgstr "      --auth-host=METHOD    local TCP/IP 연결에 대한 기본 인증 방법\n"
 
-#: initdb.c:2505
+#: initdb.c:2525
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
 "connections\n"
 msgstr "      --auth-local=METHOD   local-socket 연결에 대한 기본 인증 방법\n"
 
-#: initdb.c:2506
+#: initdb.c:2526
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATADIR     새 데이터베이스 클러스터를 만들 디렉터리\n"
 
-#: initdb.c:2507
+#: initdb.c:2527
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   새 데이터베이스의 기본 인코딩\n"
 
-#: initdb.c:2508
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -g, --allow-group-access  allow group read/execute on data directory\n"
 msgstr ""
 "  -g, --allow-group-access  데이터 디렉터리를 그룹이 읽고 접근할 있게 함\n"
 
-#: initdb.c:2509
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=LOCALE   새 데이터베이스의 ICU 로케일 ID 지정\n"
 
-#: initdb.c:2510
+#: initdb.c:2530
 #, c-format
 msgid ""
 "      --icu-rules=RULES     set additional ICU collation rules for new "
@@ -643,17 +643,17 @@ msgstr ""
 "      --icu-rules=RULES     새 데이터베이스의 추가 ICU 문자열 정렬 규칙을 지"
 "정\n"
 
-#: initdb.c:2511
+#: initdb.c:2531
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      자료 페이지 체크섬 사용\n"
 
-#: initdb.c:2512
+#: initdb.c:2532
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOCALE       새 데이터베이스의 기본 로케일 설정\n"
 
-#: initdb.c:2513
+#: initdb.c:2533
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -667,12 +667,12 @@ msgstr ""
 "                            새 데이터베이스의 각 범주에 기본 로케일 설정\n"
 "                            (환경에서 가져온 기본 값)\n"
 
-#: initdb.c:2517
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           -locale=C와 같음\n"
 
-#: initdb.c:2518
+#: initdb.c:2538
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE\n"
@@ -681,7 +681,7 @@ msgstr ""
 "      --builtin-locale=LOCALE\n"
 "                            새 데이터베이스용 내장 로케일 이름 지정\n"
 
-#: initdb.c:2520
+#: initdb.c:2540
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -690,13 +690,18 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                            새 데이터베이스의 로케일 제공자 지정\n"
 
-#: initdb.c:2522
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr "      --no-data-checksums   자료 페이지 체크섬 사용 안함\n"
+
+#: initdb.c:2543
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FILE         파일에서 새 superuser의 암호 읽기\n"
 
-#: initdb.c:2523
+#: initdb.c:2544
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -705,29 +710,29 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                            기본 텍스트 검색 구성\n"
 
-#: initdb.c:2525
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       데이터베이스 superuser 이름\n"
 
-#: initdb.c:2526
+#: initdb.c:2547
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            새 superuser 암호를 입력 받음\n"
 
-#: initdb.c:2527
+#: initdb.c:2548
 #, c-format
 msgid ""
 "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=WALDIR       트랜잭션 로그 디렉터리 위치\n"
 
-#: initdb.c:2528
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=SIZE    WAL 조각 파일 크기, MB단위\n"
 
-#: initdb.c:2529
+#: initdb.c:2550
 #, c-format
 msgid ""
 "\n"
@@ -736,33 +741,33 @@ msgstr ""
 "\n"
 "덜 일반적으로 사용되는 옵션들:\n"
 
-#: initdb.c:2530
+#: initdb.c:2551
 #, c-format
 msgid ""
 "  -c, --set NAME=VALUE      override default setting for server parameter\n"
 msgstr "  -c, --set NAME=VALUE      서버 매개 변수 기본 설정을 바꿈\n"
 
-#: initdb.c:2531
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               디버깅에 필요한 정보들도 함께 출력함\n"
 
-#: initdb.c:2532
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches      debug_discard_caches=1 지정\n"
 
-#: initdb.c:2533
+#: initdb.c:2554
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              입력파일들이 있는 디렉터리\n"
 
-#: initdb.c:2534
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean            오류가 발생되었을 경우 그대로 둠\n"
 
-#: initdb.c:2535
+#: initdb.c:2556
 #, c-format
 msgid ""
 "  -N, --no-sync             do not wait for changes to be written safely to "
@@ -770,28 +775,35 @@ msgid ""
 msgstr ""
 "  -N, --no-sync             작업 완료 뒤 디스크 동기화 작업을 하지 않음\n"
 
-#: initdb.c:2536
+#: initdb.c:2557
+#, c-format
+msgid ""
+"      --no-sync-data-files  do not sync files within database directories\n"
+msgstr ""
+"      --no-sync-data-files  데이터베이스 디렉터리 안의 파일들은 sync 안함\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr "      --no-instructions     다음 작업을 위해 구성 정보를 출력 안함\n"
 
-#: initdb.c:2537
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                내부 설정값들을 보여주고 마침\n"
 
-#: initdb.c:2538
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD  파일을 디스크에 동기화 하는 방법 지정\n"
 
-#: initdb.c:2539
+#: initdb.c:2561
 #, c-format
 msgid ""
 "  -S, --sync-only           only sync database files to disk, then exit\n"
 msgstr "  -S, --sync-only           데이터 디렉터리만 동기화하고 마침\n"
 
-#: initdb.c:2540
+#: initdb.c:2562
 #, c-format
 msgid ""
 "\n"
@@ -800,17 +812,17 @@ msgstr ""
 "\n"
 "기타 옵션:\n"
 
-#: initdb.c:2541
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             버전 정보를 보여주고 마침\n"
 
-#: initdb.c:2542
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                이 도움말을 보여주고 마침\n"
 
-#: initdb.c:2543
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -820,7 +832,7 @@ msgstr ""
 "\n"
 "데이터 디렉터리를 지정하지 않으면, PGDATA 환경 변수값을 사용합니다.\n"
 
-#: initdb.c:2545
+#: initdb.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -829,28 +841,28 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: initdb.c:2546
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: initdb.c:2570
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr "\"%s\" 인증 방법은 \"%s\" 연결에서는 사용할 수 없음"
 
-#: initdb.c:2584
+#: initdb.c:2606
 #, c-format
 msgid ""
 "must specify a password for the superuser to enable password authentication"
 msgstr "비밀번호 인증방식을 사용하려면, 반드시 superuser의 암호를 지정해야함"
 
-#: initdb.c:2603
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "데이터 디렉터리를 지정하지 않았음"
 
-#: initdb.c:2604
+#: initdb.c:2626
 #, c-format
 msgid ""
 "You must identify the directory where the data for this database system will "
@@ -860,12 +872,12 @@ msgstr ""
 "이 작업을 진행하려면, 반드시 이 데이터 디렉터리를 지정해 주어야합니다. 지정하"
 "는 방법은 -D 옵션의 값이나, PGDATA 환경 변수값으로 지정해 주면 됩니 다."
 
-#: initdb.c:2621
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "환경 변수를 지정할 수 없음"
 
-#: initdb.c:2639
+#: initdb.c:2661
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
@@ -874,40 +886,40 @@ msgstr ""
 "\"%s\" 프로그램이 %s 작업에서 필요합니다. 그런데, 이 파일이 \"%s\" 파일이 있"
 "는 디렉터리안에 없습니다."
 
-#: initdb.c:2642
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "\"%s\" 프로그램을 \"%s\" 작업 때문에 찾았지만 이 파일은 %s 프로그램의 버전과 "
 "다릅니다."
 
-#: initdb.c:2657
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "입력 파일 위치는 반드시 절대경로여야함"
 
-#: initdb.c:2674
+#: initdb.c:2696
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "데이터베이스 클러스터는 \"%s\" 로케일으로 초기화될 것입니다.\n"
 
-#: initdb.c:2677
+#: initdb.c:2699
 #, c-format
 msgid ""
 "The database cluster will be initialized with this locale configuration:\n"
 msgstr "데이터베이스 클러스터는 아래 로케일 환경으로 초기화될 것입니다:\n"
 
-#: initdb.c:2678
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  로케일 제공자:    %s\n"
 
-#: initdb.c:2680
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr "  기본 문자정렬: %s\n"
 
-#: initdb.c:2681
+#: initdb.c:2703
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -924,22 +936,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2711
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "\"%s\" 로케일에 알맞은 인코딩을 찾을 수 없음"
 
-#: initdb.c:2713
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "-E 옵션 지정해서 %s 작업을 다시 하세요."
 
-#: initdb.c:2714 initdb.c:3257 initdb.c:3377 initdb.c:3397
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: initdb.c:2726
+#: initdb.c:2748
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -948,78 +960,78 @@ msgstr ""
 "\"%s\" 인코딩을 서버측 인코딩으로 사용할 수 없습니다.\n"
 "기본 데이터베이스는 \"%s\" 인코딩으로 지정됩니다.\n"
 
-#: initdb.c:2731
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "\"%s\" 로케일은 지원하지 않는 \"%s\" 인코딩을 필요로 함"
 
-#: initdb.c:2733
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "\"%s\" 인코딩을 서버측 인코딩으로 사용할 수 없습니다."
 
-#: initdb.c:2735
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "다른 로케일을 지정해서 %s 작업을 다시 하세요."
 
-#: initdb.c:2743
+#: initdb.c:2765
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "기본 데이터베이스 인코딩은 \"%s\" 인코딩으로 설정되었습니다.\n"
 
-#: initdb.c:2757
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "\"%s\" 내장 제공자 로케일은 \"%s\" 인코딩을 필요로 함"
 
-#: initdb.c:2819
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr "\"%s\" 로케일에 알맞은 전문검색 설정을 찾을 수 없음"
 
-#: initdb.c:2830
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr "\"%s\" 로케일에 알맞은 전문검색 설정을 알 수 없음"
 
-#: initdb.c:2835
+#: initdb.c:2859
 #, c-format
 msgid ""
 "specified text search configuration \"%s\" might not match locale \"%s\""
 msgstr "지정한 \"%s\" 전문검색 설정은 \"%s\" 로케일과 일치하지 않음"
 
-#: initdb.c:2840
+#: initdb.c:2864
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "기본 텍스트 검색 구성이 \"%s\"(으)로 설정됩니다.\n"
 
-#: initdb.c:2883 initdb.c:2954
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "%s 디렉터리 만드는 중 ..."
 
-#: initdb.c:2888 initdb.c:2959 initdb.c:3007 initdb.c:3064
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
 
-#: initdb.c:2897 initdb.c:2969
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "이미 있는 %s 디렉터리의 액세스 권한을 고치는 중 ..."
 
-#: initdb.c:2902 initdb.c:2974
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리의 액세스 권한을 바꿀 수 없습니다: %m"
 
-#: initdb.c:2914 initdb.c:2986
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "\"%s\" 디렉터리가 있지만 비어 있지 않음"
 
-#: initdb.c:2918
+#: initdb.c:2933
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty the "
@@ -1028,31 +1040,31 @@ msgstr ""
 "새로운 데이터베이스 시스템을 만들려면 \"%s\" 디렉터리를 제거하거나 비우십시"
 "오. 또는 %s 작업을 \"%s\" 디렉터리가 아닌 것으로 지정해서 하세요."
 
-#: initdb.c:2926 initdb.c:2996 initdb.c:3422
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 액세스할 수 없습니다: %m"
 
-#: initdb.c:2947
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "WAL 디렉터리 위치는 절대 경로여야 함"
 
-#: initdb.c:2990
+#: initdb.c:3005
 #, c-format
 msgid ""
-"If you want to store the WAL there, either remove or empty the directory "
-"\"%s\"."
+"If you want to store the WAL there, either remove or empty the directory \"%s"
+"\"."
 msgstr ""
 "트랜잭션 로그를 해당 위치에 저장하려면 \"%s\" 디렉터리를 제거하거나 비우십시"
 "오."
 
-#: initdb.c:3000
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "\"%s\" 심벌릭 링크를 만들 수 없음: %m"
 
-#: initdb.c:3019
+#: initdb.c:3034
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -1061,13 +1073,13 @@ msgstr ""
 "점(.)으로 시작하는 숨은 파일이 포함되어 있습니다. 마운트 최상위 디렉터리 같습"
 "니다."
 
-#: initdb.c:3021
+#: initdb.c:3036
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "lost-found 디렉터리가 있습니다. 마운트 최상위 디렉터리 같습니다."
 
-#: initdb.c:3023
+#: initdb.c:3038
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1076,61 +1088,61 @@ msgstr ""
 "마운트 최상위 디렉터리를 데이터 디렉터리로 사용하는 것은 권장하지 않습니다.\n"
 "하위 디렉터리를 만들어서 그것을 데이터 디렉터리로 사용하세요."
 
-#: initdb.c:3050
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "하위 디렉터리 만드는 중 ..."
 
-#: initdb.c:3093
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "부트스트랩 다음 초기화 작업 중 ... "
 
-#: initdb.c:3256
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s 설정은 값을 필요로 합니다."
 
-#: initdb.c:3281
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "디버그 모드로 실행 중.\n"
 
-#: initdb.c:3285
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr "지저분 모드로 실행 중.  오류가 발생되어도 뒷정리를 안합니다.\n"
 
-#: initdb.c:3358
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "알 수 없는 로케일 제공자 이름: %s"
 
-#: initdb.c:3395
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인자를 지정했습니다. (처음 \"%s\")"
 
-#: initdb.c:3402 initdb.c:3406 initdb.c:3410
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s 옵션은 \"%s\" 로케일 제공자를 사용할 때만 사용할 수 있습니다."
 
-#: initdb.c:3424 initdb.c:3487
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "자료를 디스크에 동기화 하는 중 ... "
 
-#: initdb.c:3432
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr ""
 "암호를 입력받는 옵션과 암호를 파일에서 가져오는 옵션은 동시에 사용될 수 없음"
 
-#: initdb.c:3443
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "%s 옵션값은 1에서 1024사이 2^n 값이여야 함"
 
-#: initdb.c:3456
+#: initdb.c:3479
 #, c-format
 msgid ""
 "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
@@ -1138,7 +1150,7 @@ msgstr ""
 "\"%s\" 사용자는 슈퍼유저 이름으로 쓸 수 없습니다. \"pg_\"로 시작하는롤 이름"
 "은 허용하지 않음"
 
-#: initdb.c:3458
+#: initdb.c:3481
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1149,17 +1161,17 @@ msgstr ""
 "지정될 것입니다. 또한 이 사용자는 서버 프로세스의 소유주가 됩니다.\n"
 "\n"
 
-#: initdb.c:3474
+#: initdb.c:3497
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "자료 페이지 체크섬 기능 사용함.\n"
 
-#: initdb.c:3476
+#: initdb.c:3499
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "자료 페이지 체크섬 기능 사용 하지 않음\n"
 
-#: initdb.c:3493
+#: initdb.c:3516
 #, c-format
 msgid ""
 "\n"
@@ -1171,12 +1183,12 @@ msgstr ""
 "이 상태에서 OS가 갑자기 중지 되면 데이터 디렉토리 안에 있는 자료가 깨질 수 있"
 "습니다.\n"
 
-#: initdb.c:3498
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "로컬 접속용 \"trust\" 인증을 설정 함"
 
-#: initdb.c:3499
+#: initdb.c:3522
 #, c-format
 msgid ""
 "You can change this by editing pg_hba.conf or using the option -A, or --auth-"
@@ -1187,11 +1199,11 @@ msgstr ""
 "요."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3529
+#: initdb.c:3552
 msgid "logfile"
 msgstr "로그파일"
 
-#: initdb.c:3531
+#: initdb.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -1206,22 +1218,17 @@ msgstr ""
 "    %s\n"
 "\n"
 
-#, c-format
 #~ msgid "  ICU locale:  %s\n"
 #~ msgstr "  ICU 로케일:  %s\n"
 
-#, c-format
-#~ msgid "argument of --wal-segsize must be a number"
-#~ msgstr "--wal-segsize 옵션 값은 숫자여야 함"
-
-#, c-format
 #~ msgid "Using default ICU locale \"%s\".\n"
 #~ msgstr "기본 ICU 로케일로 \"%s\" 사용함.\n"
 
-#, c-format
+#~ msgid "argument of --wal-segsize must be a number"
+#~ msgstr "--wal-segsize 옵션 값은 숫자여야 함"
+
 #~ msgid "could not determine default ICU locale"
 #~ msgstr "기본 ICU 로케일을 결정할 수 없음"
 
-#, c-format
 #~ msgid "could not open collator for default locale: %s"
 #~ msgstr "기본 로케일용 문자열 정렬 규칙을 열 수 없음: %s"
diff --git a/src/bin/initdb/po/ru.po b/src/bin/initdb/po/ru.po
index c1fab13b8c4..d97f5a0d232 100644
--- a/src/bin/initdb/po/ru.po
+++ b/src/bin/initdb/po/ru.po
@@ -6,13 +6,13 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-02 08:21+0300\n"
-"PO-Revision-Date: 2024-11-02 08:27+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 16:55+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -22,22 +22,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -62,28 +62,28 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../../common/exec.c:382 initdb.c:750
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:372 initdb.c:408
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
@@ -99,46 +99,46 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -247,14 +247,14 @@ msgstr "значение %s должно быть в диапазоне %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
@@ -270,102 +270,102 @@ msgstr "не удалось создать связь для каталога \"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удалось получить связь для каталога \"%s\": %s\n"
 
-#: initdb.c:369
+#: initdb.c:372
 #, c-format
 msgid "_wsetlocale() failed"
 msgstr "ошибка в _wsetlocale()"
 
-#: initdb.c:376
+#: initdb.c:379
 #, c-format
 msgid "setlocale() failed"
 msgstr "ошибка в setlocale()"
 
-#: initdb.c:390
+#: initdb.c:393
 #, c-format
 msgid "failed to restore old locale"
 msgstr "не удалось восстановить старую локаль"
 
-#: initdb.c:393
+#: initdb.c:396
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "не удалось восстановить старую локаль \"%s\""
 
-#: initdb.c:682 initdb.c:1674
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: initdb.c:726 initdb.c:1030 initdb.c:1050
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не удалось открыть файл \"%s\" для записи: %m"
 
-#: initdb.c:730 initdb.c:1033 initdb.c:1052
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: initdb.c:734
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "не удалось закрыть файл \"%s\": %m"
 
-#: initdb.c:768
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "удаление каталога данных \"%s\""
 
-#: initdb.c:770
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "ошибка при удалении каталога данных"
 
-#: initdb.c:774
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "удаление содержимого каталога данных \"%s\""
 
-#: initdb.c:777
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "ошибка при удалении содержимого каталога данных"
 
-#: initdb.c:782
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "удаление каталога WAL \"%s\""
 
-#: initdb.c:784
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "ошибка при удалении каталога WAL"
 
-#: initdb.c:788
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "удаление содержимого каталога WAL \"%s\""
 
-#: initdb.c:790
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "ошибка при удалении содержимого каталога WAL"
 
-#: initdb.c:797
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "каталог данных \"%s\" не был удалён по запросу пользователя"
 
-#: initdb.c:801
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "каталог WAL \"%s\" не был удалён по запросу пользователя"
 
-#: initdb.c:819
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "программу не должен запускать root"
 
-#: initdb.c:820
+#: initdb.c:823
 #, c-format
 msgid ""
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own "
@@ -374,17 +374,17 @@ msgstr ""
 "Пожалуйста, переключитесь на обычного пользователя (например, используя "
 "\"su\"), которому будет принадлежать серверный процесс."
 
-#: initdb.c:852
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "\"%s\" — некорректное имя серверной кодировки"
 
-#: initdb.c:996
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "файл \"%s\" не существует"
 
-#: initdb.c:997 initdb.c:1002 initdb.c:1009
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified the wrong "
@@ -393,124 +393,124 @@ msgstr ""
 "Это означает, что ваша установка PostgreSQL испорчена или в параметре -L "
 "задан неправильный каталог."
 
-#: initdb.c:1001
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "ошибка при обращении к файлу \"%s\": %m"
 
-#: initdb.c:1008
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "\"%s\" — не обычный файл"
 
-#: initdb.c:1141
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "выбирается реализация динамической разделяемой памяти... "
 
-#: initdb.c:1150
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "выбирается значение \"max_connections\" по умолчанию... "
 
-#: initdb.c:1170
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "выбирается значение \"shared_buffers\" по умолчанию... "
 
-#: initdb.c:1193
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "выбирается часовой пояс по умолчанию... "
 
-#: initdb.c:1272
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "создание конфигурационных файлов... "
 
-#: initdb.c:1425 initdb.c:1439 initdb.c:1506 initdb.c:1517
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "не удалось поменять права для \"%s\": %m"
 
-#: initdb.c:1536
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "выполняется подготовительный скрипт... "
 
-#: initdb.c:1548
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "входной файл \"%s\" не принадлежит PostgreSQL %s"
 
-#: initdb.c:1550
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Укажите корректный путь в параметре -L."
 
-#: initdb.c:1652
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "Введите новый пароль суперпользователя: "
 
-#: initdb.c:1653
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: initdb.c:1656
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не совпадают.\n"
 
-#: initdb.c:1680
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "не удалось прочитать пароль из файла \"%s\": %m"
 
-#: initdb.c:1683
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "файл пароля \"%s\" пуст"
 
-#: initdb.c:2095
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "получен сигнал\n"
 
-#: initdb.c:2101
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "не удалось записать в поток дочернего процесса: %s\n"
 
-#: initdb.c:2109
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "ок\n"
 
-#: initdb.c:2191 initdb.c:2237
+#: initdb.c:2209 initdb.c:2255
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "имя локали \"%s\" содержит не-ASCII символы"
 
-#: initdb.c:2217
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "ошибочное имя локали \"%s\""
 
-#: initdb.c:2218
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Если эта локаль свойственна ICU, укажите --icu-locale."
 
-#: initdb.c:2231
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "неверные установки локали; проверьте переменные окружения LANG и LC_*"
 
-#: initdb.c:2262 initdb.c:2286
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "несоответствие кодировки"
 
-#: initdb.c:2263
+#: initdb.c:2281
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected locale "
@@ -521,7 +521,7 @@ msgstr ""
 "может привести к неправильной работе различных функций обработки текстовых "
 "строк."
 
-#: initdb.c:2268 initdb.c:2289
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid ""
 "Rerun %s and either do not specify an encoding explicitly, or choose a "
@@ -530,47 +530,47 @@ msgstr ""
 "Для исправления перезапустите %s, не указывая кодировку явно, либо выберите "
 "подходящее сочетание параметров локализации."
 
-#: initdb.c:2287
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "Выбранная вами кодировка (%s) не поддерживается провайдером ICU."
 
-#: initdb.c:2338
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "не удалось получить из названия локали \"%s\" метку языка: %s"
 
-#: initdb.c:2344 initdb.c:2396 initdb.c:2488
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU не поддерживается в данной сборке"
 
-#: initdb.c:2367
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "не удалось определить язык для локали \"%s\": %s"
 
-#: initdb.c:2393
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "для локали \"%s\" получен неизвестный язык \"%s\""
 
-#: initdb.c:2454
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "если выбран провайдер %s, необходимо задать локаль"
 
-#: initdb.c:2465
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "неверное имя локали \"%s\" для встроенного провайдера"
 
-#: initdb.c:2476
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Для локали ICU \"%s\" используется метка языка \"%s\".\n"
 
-#: initdb.c:2499
+#: initdb.c:2519
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -579,17 +579,17 @@ msgstr ""
 "%s инициализирует кластер PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2500
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: initdb.c:2501
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [ПАРАМЕТР]... [КАТАЛОГ]\n"
 
-#: initdb.c:2502
+#: initdb.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -598,7 +598,7 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: initdb.c:2503
+#: initdb.c:2523
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -607,7 +607,7 @@ msgstr ""
 "  -A, --auth=МЕТОД          метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений\n"
 
-#: initdb.c:2504
+#: initdb.c:2524
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
@@ -616,7 +616,7 @@ msgstr ""
 "      --auth-host=МЕТОД     метод проверки подлинности по умолчанию\n"
 "                            для локальных TCP/IP-подключений\n"
 
-#: initdb.c:2505
+#: initdb.c:2525
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
@@ -625,17 +625,17 @@ msgstr ""
 "      --auth-local=МЕТОД    метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений через сокет\n"
 
-#: initdb.c:2506
+#: initdb.c:2526
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]КАТАЛОГ     расположение данных этого кластера БД\n"
 
-#: initdb.c:2507
+#: initdb.c:2527
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=КОДИРОВКА  кодировка по умолчанию для новых баз\n"
 
-#: initdb.c:2508
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -g, --allow-group-access  allow group read/execute on data directory\n"
@@ -644,12 +644,12 @@ msgstr ""
 "для\n"
 "                            группы\n"
 
-#: initdb.c:2509
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=ЛОКАЛЬ   идентификатор локали ICU для новых баз\n"
 
-#: initdb.c:2510
+#: initdb.c:2530
 #, c-format
 msgid ""
 "      --icu-rules=RULES     set additional ICU collation rules for new "
@@ -658,17 +658,17 @@ msgstr ""
 "      --icu-rules=ПРАВИЛА   дополнительные правила сортировки ICU для новых "
 "баз\n"
 
-#: initdb.c:2511
+#: initdb.c:2531
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      включить контроль целостности страниц\n"
 
-#: initdb.c:2512
+#: initdb.c:2532
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=ЛОКАЛЬ       локаль по умолчанию для новых баз\n"
 
-#: initdb.c:2513
+#: initdb.c:2533
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -682,12 +682,12 @@ msgstr ""
 "                            установить соответствующий параметр локали\n"
 "                            для новых баз (вместо значения из окружения)\n"
 
-#: initdb.c:2517
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           эквивалентно --locale=C\n"
 
-#: initdb.c:2518
+#: initdb.c:2538
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE\n"
@@ -696,7 +696,7 @@ msgstr ""
 "      --builtin-locale=ЛОКАЛЬ\n"
 "                            имя встроенной локали для новых баз\n"
 
-#: initdb.c:2520
+#: initdb.c:2540
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -705,14 +705,19 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                            провайдер основной локали для новых баз\n"
 
-#: initdb.c:2522
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr "      --no-data-checksums   отключить контроль целостности страниц\n"
+
+#: initdb.c:2543
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=ФАЙЛ         прочитать пароль суперпользователя из файла\n"
 
-#: initdb.c:2523
+#: initdb.c:2544
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -721,29 +726,29 @@ msgstr ""
 "  -T, --text-search-config=КОНФИГУРАЦИЯ\n"
 "                            конфигурация текстового поиска по умолчанию\n"
 
-#: initdb.c:2525
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=ИМЯ        имя суперпользователя БД\n"
 
-#: initdb.c:2526
+#: initdb.c:2547
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            запросить пароль суперпользователя\n"
 
-#: initdb.c:2527
+#: initdb.c:2548
 #, c-format
 msgid ""
 "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=КАТАЛОГ      расположение журнала предзаписи\n"
 
-#: initdb.c:2528
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=РАЗМЕР  размер сегментов WAL (в мегабайтах)\n"
 
-#: initdb.c:2529
+#: initdb.c:2550
 #, c-format
 msgid ""
 "\n"
@@ -752,7 +757,7 @@ msgstr ""
 "\n"
 "Редко используемые параметры:\n"
 
-#: initdb.c:2530
+#: initdb.c:2551
 #, c-format
 msgid ""
 "  -c, --set NAME=VALUE      override default setting for server parameter\n"
@@ -760,27 +765,27 @@ msgstr ""
 "  -c, --set ИМЯ=ЗНАЧЕНИЕ    переопределить значение серверного параметра по\n"
 "                            умолчанию\n"
 
-#: initdb.c:2531
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               выдавать много отладочных сообщений\n"
 
-#: initdb.c:2532
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches      установить debug_discard_caches=1\n"
 
-#: initdb.c:2533
+#: initdb.c:2554
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L КАТАЛОГ                расположение входных файлов\n"
 
-#: initdb.c:2534
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean            не очищать после ошибок\n"
 
-#: initdb.c:2535
+#: initdb.c:2556
 #, c-format
 msgid ""
 "  -N, --no-sync             do not wait for changes to be written safely to "
@@ -788,23 +793,29 @@ msgid ""
 msgstr ""
 "  -N, --no-sync             не ждать завершения сохранения данных на диске\n"
 
-#: initdb.c:2536
+#: initdb.c:2557
+#, c-format
+msgid ""
+"      --no-sync-data-files  do not sync files within database directories\n"
+msgstr "      --no-sync-data-files  не синхронизировать файлы в каталогах БД\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr ""
 "      --no-instructions     не выводить инструкции для дальнейших действий\n"
 
-#: initdb.c:2537
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                показать внутренние установки и выйти\n"
 
-#: initdb.c:2538
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=МЕТОД   метод синхронизации файлов с ФС\n"
 
-#: initdb.c:2539
+#: initdb.c:2561
 #, c-format
 msgid ""
 "  -S, --sync-only           only sync database files to disk, then exit\n"
@@ -812,7 +823,7 @@ msgstr ""
 "  -S, --sync-only           только синхронизировать с ФС файлы базы и "
 "завершиться\n"
 
-#: initdb.c:2540
+#: initdb.c:2562
 #, c-format
 msgid ""
 "\n"
@@ -821,17 +832,17 @@ msgstr ""
 "\n"
 "Другие параметры:\n"
 
-#: initdb.c:2541
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: initdb.c:2542
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: initdb.c:2543
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -841,7 +852,7 @@ msgstr ""
 "\n"
 "Если каталог данных не указан, используется переменная окружения PGDATA.\n"
 
-#: initdb.c:2545
+#: initdb.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -850,18 +861,18 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: initdb.c:2546
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: initdb.c:2570
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr ""
 "нераспознанный метод проверки подлинности \"%s\" для подключений \"%s\""
 
-#: initdb.c:2584
+#: initdb.c:2606
 #, c-format
 msgid ""
 "must specify a password for the superuser to enable password authentication"
@@ -869,12 +880,12 @@ msgstr ""
 "для включения аутентификации по паролю необходимо указать пароль "
 "суперпользователя"
 
-#: initdb.c:2603
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог данных не указан"
 
-#: initdb.c:2604
+#: initdb.c:2626
 #, c-format
 msgid ""
 "You must identify the directory where the data for this database system will "
@@ -884,55 +895,55 @@ msgstr ""
 "Вы должны указать каталог, в котором будут располагаться данные этой СУБД. "
 "Это можно сделать, добавив ключ -D или установив переменную окружения PGDATA."
 
-#: initdb.c:2621
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "не удалось задать переменную окружения"
 
-#: initdb.c:2639
+#: initdb.c:2661
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\""
 
-#: initdb.c:2642
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: initdb.c:2657
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "расположение входных файлов должно задаваться абсолютным путём"
 
-#: initdb.c:2674
+#: initdb.c:2696
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Кластер баз данных будет инициализирован с локалью \"%s\".\n"
 
-#: initdb.c:2677
+#: initdb.c:2699
 #, c-format
 msgid ""
 "The database cluster will be initialized with this locale configuration:\n"
 msgstr ""
 "Кластер баз данных будет инициализирован со следующими параметрами локали:\n"
 
-#: initdb.c:2678
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  провайдер локалей: %s\n"
 
-#: initdb.c:2680
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr ""
 "  правило сортировки\n"
 "       по умолчанию: %s\n"
 
-#: initdb.c:2681
+#: initdb.c:2703
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -949,22 +960,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2711
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "не удалось найти подходящую кодировку для локали \"%s\""
 
-#: initdb.c:2713
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Перезапустите %s с параметром -E."
 
-#: initdb.c:2714 initdb.c:3257 initdb.c:3377 initdb.c:3397
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: initdb.c:2726
+#: initdb.c:2748
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -973,45 +984,45 @@ msgstr ""
 "Кодировка \"%s\", подразумеваемая локалью, не годится для сервера.\n"
 "Вместо неё в качестве кодировки БД по умолчанию будет выбрана \"%s\".\n"
 
-#: initdb.c:2731
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "для локали \"%s\" требуется неподдерживаемая кодировка \"%s\""
 
-#: initdb.c:2733
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "Кодировка \"%s\" недопустима в качестве серверной кодировки."
 
-#: initdb.c:2735
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Перезапустите %s, выбрав другую локаль."
 
-#: initdb.c:2743
+#: initdb.c:2765
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "Кодировка БД по умолчанию, выбранная в соответствии с настройками: \"%s\".\n"
 
-#: initdb.c:2757
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "для локали \"%s\" встроенного провайдера требуется кодировка \"%s\""
 
-#: initdb.c:2819
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr ""
 "не удалось найти подходящую конфигурацию текстового поиска для локали \"%s\""
 
-#: initdb.c:2830
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr ""
 "внимание: для локали \"%s\" нет известной конфигурации текстового поиска"
 
-#: initdb.c:2835
+#: initdb.c:2859
 #, c-format
 msgid ""
 "specified text search configuration \"%s\" might not match locale \"%s\""
@@ -1019,37 +1030,37 @@ msgstr ""
 "указанная конфигурация текстового поиска \"%s\" может не соответствовать "
 "локали \"%s\""
 
-#: initdb.c:2840
+#: initdb.c:2864
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Выбрана конфигурация текстового поиска по умолчанию \"%s\".\n"
 
-#: initdb.c:2883 initdb.c:2954
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "создание каталога %s... "
 
-#: initdb.c:2888 initdb.c:2959 initdb.c:3007 initdb.c:3064
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
 
-#: initdb.c:2897 initdb.c:2969
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "исправление прав для существующего каталога %s... "
 
-#: initdb.c:2902 initdb.c:2974
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "не удалось поменять права для каталога \"%s\": %m"
 
-#: initdb.c:2914 initdb.c:2986
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" существует, но он не пуст"
 
-#: initdb.c:2918
+#: initdb.c:2933
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty the "
@@ -1058,29 +1069,29 @@ msgstr ""
 "Если вы хотите создать новую систему баз данных, удалите или очистите "
 "каталог \"%s\", либо при запуске %s в качестве пути укажите не \"%s\"."
 
-#: initdb.c:2926 initdb.c:2996 initdb.c:3422
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ошибка при обращении к каталогу \"%s\": %m"
 
-#: initdb.c:2947
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "расположение каталога WAL должно определяться абсолютным путём"
 
-#: initdb.c:2990
+#: initdb.c:3005
 #, c-format
 msgid ""
 "If you want to store the WAL there, either remove or empty the directory "
 "\"%s\"."
 msgstr "Если вы хотите хранить WAL здесь, удалите или очистите каталог \"%s\"."
 
-#: initdb.c:3000
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\": %m"
 
-#: initdb.c:3019
+#: initdb.c:3034
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -1088,13 +1099,13 @@ msgid ""
 msgstr ""
 "Он содержит файл с точкой (невидимый), возможно, это точка монтирования."
 
-#: initdb.c:3021
+#: initdb.c:3036
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Он содержит подкаталог lost+found, возможно, это точка монтирования."
 
-#: initdb.c:3023
+#: initdb.c:3038
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1104,62 +1115,62 @@ msgstr ""
 "рекомендуется.\n"
 "Создайте в монтируемом ресурсе подкаталог и используйте его."
 
-#: initdb.c:3050
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "создание подкаталогов... "
 
-#: initdb.c:3093
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "выполняется заключительная инициализация... "
 
-#: initdb.c:3256
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "для -c %s требуется значение"
 
-#: initdb.c:3281
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Программа запущена в режиме отладки.\n"
 
-#: initdb.c:3285
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr ""
 "Программа запущена в режиме 'no-clean' - очистки и исправления ошибок не "
 "будет.\n"
 
-#: initdb.c:3358
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нераспознанный провайдер локали: %s"
 
-#: initdb.c:3395
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: initdb.c:3402 initdb.c:3406 initdb.c:3410
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s можно указать, только если выбран провайдер локали \"%s\""
 
-#: initdb.c:3424 initdb.c:3487
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "сохранение данных на диске... "
 
-#: initdb.c:3432
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr "нельзя одновременно запросить пароль и прочитать пароль из файла"
 
-#: initdb.c:3443
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "аргументом %s должна быть степень двух от 1 до 1024"
 
-#: initdb.c:3456
+#: initdb.c:3479
 #, c-format
 msgid ""
 "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
@@ -1167,7 +1178,7 @@ msgstr ""
 "имя \"%s\" для суперпользователя не допускается; имена ролей не могут "
 "начинаться с \"pg_\""
 
-#: initdb.c:3458
+#: initdb.c:3481
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1178,17 +1189,17 @@ msgstr ""
 "От его имени также будет запускаться процесс сервера.\n"
 "\n"
 
-#: initdb.c:3474
+#: initdb.c:3497
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Контроль целостности страниц данных включён.\n"
 
-#: initdb.c:3476
+#: initdb.c:3499
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Контроль целостности страниц данных отключён.\n"
 
-#: initdb.c:3493
+#: initdb.c:3516
 #, c-format
 msgid ""
 "\n"
@@ -1199,12 +1210,12 @@ msgstr ""
 "Сохранение данных на диск пропускается.\n"
 "Каталог данных может повредиться при сбое операционной системы.\n"
 
-#: initdb.c:3498
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "включение метода аутентификации \"trust\" для локальных подключений"
 
-#: initdb.c:3499
+#: initdb.c:3522
 #, c-format
 msgid ""
 "You can change this by editing pg_hba.conf or using the option -A, or --auth-"
@@ -1214,11 +1225,11 @@ msgstr ""
 "initdb с ключом -A, --auth-local или --auth-host."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3529
+#: initdb.c:3552
 msgid "logfile"
 msgstr "файл_журнала"
 
-#: initdb.c:3531
+#: initdb.c:3554
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/po/sv.po b/src/bin/initdb/po/sv.po
index 58183c91295..ac9aea5cf97 100644
--- a/src/bin/initdb/po/sv.po
+++ b/src/bin/initdb/po/sv.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-12 13:51+0000\n"
-"PO-Revision-Date: 2025-02-12 20:46+0100\n"
+"POT-Creation-Date: 2025-05-11 00:51+0000\n"
+"PO-Revision-Date: 2025-05-11 14:26+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -60,28 +60,28 @@ msgstr "kunde inte hitta en \"%s\" att köra"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "kunde inte konvertera sökvägen \"%s\" till en absolut sökväg: %m"
 
-#: ../../common/exec.c:382 initdb.c:750
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "kunde inte köra kommandot \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "kunde inte läsa från kommando \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ingen data returnerades från kommandot \"%s\""
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:372 initdb.c:408
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
@@ -97,46 +97,46 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -245,12 +245,12 @@ msgstr "%s måste vara i intervallet %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "okänd synkmetod: %s"
 
-#: ../../fe_utils/string_utils.c:608
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:781
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
@@ -265,166 +265,166 @@ msgstr "kunde inte sätta en knutpunkt (junction) för \"%s\": %s\n"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "kunde inte få en knutpunkt (junction) för \"%s\": %s\n"
 
-#: initdb.c:369
+#: initdb.c:372
 #, c-format
 msgid "_wsetlocale() failed"
 msgstr "_wsetlocale() misslyckades"
 
-#: initdb.c:376
+#: initdb.c:379
 #, c-format
 msgid "setlocale() failed"
 msgstr "setlocale() misslyckades"
 
-#: initdb.c:390
+#: initdb.c:393
 #, c-format
 msgid "failed to restore old locale"
 msgstr "misslyckades med att återställa gamla lokalen"
 
-#: initdb.c:393
+#: initdb.c:396
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "misslyckades med att återställa gamla lokalen \"%s\""
 
-#: initdb.c:682 initdb.c:1674
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
-#: initdb.c:726 initdb.c:1030 initdb.c:1050
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "kunde inte öppna fil \"%s\" för skrivning: %m"
 
-#: initdb.c:730 initdb.c:1033 initdb.c:1052
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: initdb.c:734
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "kunde inte stänga fil \"%s\": %m"
 
-#: initdb.c:768
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "tar bort datakatalog \"%s\""
 
-#: initdb.c:770
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "misslyckades med att ta bort datakatalog"
 
-#: initdb.c:774
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "tar bort innehållet i datakatalog \"%s\""
 
-#: initdb.c:777
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "misslyckades med att ta bort innehållet i datakatalogen"
 
-#: initdb.c:782
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "tar bort WAL-katalog \"%s\""
 
-#: initdb.c:784
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "misslyckades med att ta bort WAL-katalog"
 
-#: initdb.c:788
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "tar bort innehållet i WAL-katalog \"%s\""
 
-#: initdb.c:790
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "misslyckades med att ta bort innehållet i WAL-katalogen"
 
-#: initdb.c:797
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "datakatalog \"%s\" är ej borttagen på användares begäran"
 
-#: initdb.c:801
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "WAL-katalog \"%s\" är ej borttagen på användares begäran"
 
-#: initdb.c:819
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "kan inte köras som root"
 
-#: initdb.c:820
+#: initdb.c:823
 #, c-format
 msgid "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own the server process."
 msgstr "Logga in (t.ex. med \"su\") som den (opriviligerade) användare som skall äga serverprocessen."
 
-#: initdb.c:852
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "\"%s\" är inte en giltig teckenkodning för servern"
 
-#: initdb.c:996
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "filen \"%s\" finns inte"
 
-#: initdb.c:997 initdb.c:1002 initdb.c:1009
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid "This might mean you have a corrupted installation or identified the wrong directory with the invocation option -L."
 msgstr "Detta kan betyda att du har en korrupt installation eller att du har angivit felaktig katalog till flaggan -L."
 
-#: initdb.c:1001
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "kunde inte komma åt filen \"%s\": %m"
 
-#: initdb.c:1008
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "filen \"%s\" är inte en normal fil"
 
-#: initdb.c:1141
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "väljer mekanism för dynamiskt, delat minne ... "
 
-#: initdb.c:1150
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "sätter förvalt värde för \"max_connections\" ... "
 
-#: initdb.c:1170
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "sätter förvalt värde för \"shared_buffers\" ... "
 
-#: initdb.c:1193
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "sätter förvalt värde för tidszon ... "
 
-#: initdb.c:1272
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "skapar konfigurationsfiler ... "
 
-#: initdb.c:1425 initdb.c:1439 initdb.c:1506 initdb.c:1517
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "kunde inte ändra rättigheter på \"%s\": %m"
 
-#: initdb.c:1536
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "kör uppsättningsskript..."
 
-#: initdb.c:1548
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "indatafil \"%s\" tillhör inte PostgreSQL %s"
@@ -433,125 +433,125 @@ msgstr "indatafil \"%s\" tillhör inte PostgreSQL %s"
 # with a standard directory "/usr/local/pgsql", is such that
 # the translated message string produces a reasonable output.
 #
-#: initdb.c:1550
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Ange korrekt sökväg med flaggan -L."
 
-#: initdb.c:1652
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "Mata in ett nytt lösenord för superuser: "
 
-#: initdb.c:1653
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "Mata in det igen: "
 
-#: initdb.c:1656
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Lösenorden stämde inte överens.\n"
 
-#: initdb.c:1680
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "kunde inte läsa lösenord i filen \"%s\": %m"
 
-#: initdb.c:1683
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "lösenordsfilen \"%s\" är tom"
 
-#: initdb.c:2095
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "mottog signal\n"
 
-#: initdb.c:2101
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "kunde inte skriva till barnprocess: %s\n"
 
-#: initdb.c:2109
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2191 initdb.c:2237
+#: initdb.c:2209 initdb.c:2255
 #, c-format
 msgid "locale name \"%s\" contains non-ASCII characters"
 msgstr "lokalnamn \"%s\" innehåller tecken som ej är ASCII"
 
-#: initdb.c:2217
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "ogiltigt lokalnamn \"%s\""
 
-#: initdb.c:2218
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Om lokalnamnet är specifikt för ICU, använd --icu-locale."
 
-#: initdb.c:2231
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "ogiltig lokalinställning. Kontrollera miljövariablerna LANG och LC_*"
 
-#: initdb.c:2262 initdb.c:2286
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "teckenkodning matchar inte"
 
-#: initdb.c:2263
+#: initdb.c:2281
 #, c-format
 msgid "The encoding you selected (%s) and the encoding that the selected locale uses (%s) do not match. This would lead to misbehavior in various character string processing functions."
 msgstr "Teckenkodningen du har valt (%s) och teckenkodningen som valda lokalen använder (%s) passar inte ihop. Detta kommer leda till problem för funktioner som arbetar med strängar."
 
-#: initdb.c:2268 initdb.c:2289
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid "Rerun %s and either do not specify an encoding explicitly, or choose a matching combination."
 msgstr "Kör %s igen och ange antingen ingen explicit kodning eller välj en matchande kombination."
 
-#: initdb.c:2287
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "Den valda teckenkodningen (%s) stöds inte av ICU."
 
-#: initdb.c:2338
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "kunde inte konvertera lokalnamn \"%s\" till språktagg: %s"
 
-#: initdb.c:2344 initdb.c:2396 initdb.c:2488
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU stöds inte av detta bygge"
 
-#: initdb.c:2367
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "kunde inte härleda språk från lokalen \"%s\": %s"
 
-#: initdb.c:2393
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "lokalen \"%s\" har ett okänt språk \"%s\""
 
-#: initdb.c:2454
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "lokal måste anges när leverantören är %s"
 
-#: initdb.c:2465
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "ogiltigt lokalnamn \"%s\" för inbyggd leverantör"
 
-#: initdb.c:2476
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Använder språktagg \"%s\" för ICU-lokal \"%s\".\n"
 
-#: initdb.c:2499
+#: initdb.c:2519
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -560,17 +560,17 @@ msgstr ""
 "%s initierar ett databaskluster för PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2500
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: initdb.c:2501
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [FLAGGA]... [DATAKATALOG]\n"
 
-#: initdb.c:2502
+#: initdb.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -579,57 +579,57 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: initdb.c:2503
+#: initdb.c:2523
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=METOD          förvald autentiseringsmetod för alla anslutningar\n"
 
-#: initdb.c:2504
+#: initdb.c:2524
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr "      --auth-host=METOD     autentiseringsmetod för TCP/IP-anslutningar\n"
 
-#: initdb.c:2505
+#: initdb.c:2525
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr "      --auth-local=METOD    autentiseringsmetod för anslutningar via unix-uttag\n"
 
-#: initdb.c:2506
+#: initdb.c:2526
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATAKATALOG läge för detta databaskluster\n"
 
-#: initdb.c:2507
+#: initdb.c:2527
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=KODNING    sätter teckenkodning för nya databaser\n"
 
-#: initdb.c:2508
+#: initdb.c:2528
 #, c-format
 msgid "  -g, --allow-group-access  allow group read/execute on data directory\n"
 msgstr "  -g, --allow-group-access  tillåt läs/kör för grupp på datakatalogen\n"
 
-#: initdb.c:2509
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=LOKAL    sätt ID för ICU-lokal för nya databaser\n"
 
-#: initdb.c:2510
+#: initdb.c:2530
 #, c-format
 msgid "      --icu-rules=RULES     set additional ICU collation rules for new databases\n"
 msgstr "      --icu-rules=REGLER    sätt ytterligare ICU-jämförelseregler för nya databaser\n"
 
-#: initdb.c:2511
+#: initdb.c:2531
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      använd checksummor på datablock\n"
 
-#: initdb.c:2512
+#: initdb.c:2532
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOKAL        sätt standardlokal för nya databaser\n"
 
-#: initdb.c:2513
+#: initdb.c:2533
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -642,12 +642,12 @@ msgstr ""
 "                            sätter standardlokal i utvald kategori för\n"
 "                            nya databaser (förval hämtas ur omgivningen)\n"
 
-#: initdb.c:2517
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           samma som --locale=C\n"
 
-#: initdb.c:2518
+#: initdb.c:2538
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE\n"
@@ -656,7 +656,7 @@ msgstr ""
 "      --builtin-locale=LOKAL\n"
 "                            sätt standard lokalnamn för nya databaser\n"
 
-#: initdb.c:2520
+#: initdb.c:2540
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -665,12 +665,17 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                            sätt standard lokalleverantör för nya databaser\n"
 
-#: initdb.c:2522
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr "      --no data-checksums   använd inte checksummor på datablock\n"
+
+#: initdb.c:2543
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FIL          läser lösenord för superuser från fil\n"
 
-#: initdb.c:2523
+#: initdb.c:2544
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -679,27 +684,27 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                            standardkonfiguration för textsökning\n"
 
-#: initdb.c:2525
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAMN       namn på databasens superuser\n"
 
-#: initdb.c:2526
+#: initdb.c:2547
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            efterfråga lösenord för superuser\n"
 
-#: initdb.c:2527
+#: initdb.c:2548
 #, c-format
 msgid "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=WALDIR       katalog för write-ahead-log (WAL)\n"
 
-#: initdb.c:2528
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=STORLEK storlek på WAL-segment i megabyte\n"
 
-#: initdb.c:2529
+#: initdb.c:2550
 #, c-format
 msgid ""
 "\n"
@@ -708,57 +713,62 @@ msgstr ""
 "\n"
 "Mindre vanliga flaggor:\n"
 
-#: initdb.c:2530
+#: initdb.c:2551
 #, c-format
 msgid "  -c, --set NAME=VALUE      override default setting for server parameter\n"
 msgstr "  -c, --set NAMN=VÄRDE      ersätt standardinställning för serverparameter\n"
 
-#: initdb.c:2531
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               generera massor med debug-utskrifter\n"
 
-#: initdb.c:2532
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches      sätt debug_discard_caches=1\n"
 
-#: initdb.c:2533
+#: initdb.c:2554
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L KATALOG                katalog där indatafiler skall sökas\n"
 
-#: initdb.c:2534
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean            städa inte upp efter fel\n"
 
-#: initdb.c:2535
+#: initdb.c:2556
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync             vänta inte på att ändingar säkert skrivits till disk\n"
 
-#: initdb.c:2536
+#: initdb.c:2557
+#, c-format
+msgid "      --no-sync-data-files  do not sync files within database directories\n"
+msgstr "      --no-sync-data-files  synka inte filer i databaskataloger\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr "      --no-instructions     skriv inte instruktioner för nästa steg\n"
 
-#: initdb.c:2537
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                visa interna inställningar, avsluta sedan\n"
 
-#: initdb.c:2538
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METOD   sätt synkmetod för att synka filer till disk\n"
 
-#: initdb.c:2539
+#: initdb.c:2561
 #, c-format
 msgid "  -S, --sync-only           only sync database files to disk, then exit\n"
 msgstr "  -S, --sync-only           synka bara databasfiler till disk, avsluta seden\n"
 
-#: initdb.c:2540
+#: initdb.c:2562
 #, c-format
 msgid ""
 "\n"
@@ -767,17 +777,17 @@ msgstr ""
 "\n"
 "Andra flaggor:\n"
 
-#: initdb.c:2541
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             visa versionsinformation, avsluta sedan\n"
 
-#: initdb.c:2542
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                visa denna hjälp, avsluta sedan\n"
 
-#: initdb.c:2543
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -787,7 +797,7 @@ msgstr ""
 "\n"
 "Om datakatalogen inte anges så tas den från omgivningsvariabeln PGDATA.\n"
 
-#: initdb.c:2545
+#: initdb.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -796,72 +806,72 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: initdb.c:2546
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: initdb.c:2570
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr "ogiltig autentiseringsmetod \"%s\" för anslutning av typen \"%s\""
 
-#: initdb.c:2584
+#: initdb.c:2606
 #, c-format
 msgid "must specify a password for the superuser to enable password authentication"
 msgstr "du måste ange ett lösenord för superuser för att kunna slå på lösenordsautentisering"
 
-#: initdb.c:2603
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "ingen datakatalog angiven"
 
-#: initdb.c:2604
+#: initdb.c:2626
 #, c-format
 msgid "You must identify the directory where the data for this database system will reside.  Do this with either the invocation option -D or the environment variable PGDATA."
 msgstr "Du måste uppge den katalog där data för detta databassystem skall lagras. Gör det antingen med flaggan -D eller genom att sätta omgivningsvariabeln PGDATA."
 
-#: initdb.c:2621
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "kunde inte sätta omgivningen"
 
-#: initdb.c:2639
+#: initdb.c:2661
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\""
 
-#: initdb.c:2642
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s"
 
-#: initdb.c:2657
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "plats för indatafiler måste vara en absolut sökväg"
 
-#: initdb.c:2674
+#: initdb.c:2696
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Databasklustret kommer att skapas med lokalnamn \"%s\".\n"
 
-#: initdb.c:2677
+#: initdb.c:2699
 #, c-format
 msgid "The database cluster will be initialized with this locale configuration:\n"
 msgstr "Databasklustret kommer att initieras med denna lokalkonfiguration:\n"
 
-#: initdb.c:2678
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  lokalleverantör:   %s\n"
 
-#: initdb.c:2680
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr "  standardjämförelse: %s\n"
 
-#: initdb.c:2681
+#: initdb.c:2703
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -878,22 +888,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2711
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "kunde inte välja en lämplig kodning för lokal \"%s\""
 
-#: initdb.c:2713
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Kör %s igen men med flaggan -E."
 
-#: initdb.c:2714 initdb.c:3257 initdb.c:3377 initdb.c:3397
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: initdb.c:2726
+#: initdb.c:2748
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -902,112 +912,112 @@ msgstr ""
 "Teckenkodning \"%s\", tagen ur lokalnamnet, är inte godtagbar för servern.\n"
 "I dess ställe sättes databasens förvalda teckenkodning till \"%s\".\n"
 
-#: initdb.c:2731
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "lokalen \"%s\" kräver ej supportad teckenkodning \"%s\""
 
-#: initdb.c:2733
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "Teckenkodning \"%s\" tillåts inte som serverteckenkodning."
 
-#: initdb.c:2735
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Kör %s igen men välj en annan lokal."
 
-#: initdb.c:2743
+#: initdb.c:2765
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "Förvald teckenkodning för databaser är satt till \"%s\".\n"
 
-#: initdb.c:2757
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "lokal \"%s\" för inbyggd leverantör kräver teckenkodning \"%s\""
 
-#: initdb.c:2819
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr "kunde inte hitta en lämplig textsökningskonfiguration för lokalnamn \"%s\""
 
-#: initdb.c:2830
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr "ingen lämplig textsökningskonfiguration för lokalnamn \"%s\""
 
-#: initdb.c:2835
+#: initdb.c:2859
 #, c-format
 msgid "specified text search configuration \"%s\" might not match locale \"%s\""
 msgstr "uppgiven textsökningskonfiguration \"%s\" passar kanske inte till lokalnamn \"%s\""
 
-#: initdb.c:2840
+#: initdb.c:2864
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Förvald textsökningskonfiguration för databaser är satt till \"%s\".\n"
 
-#: initdb.c:2883 initdb.c:2954
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "skapar katalog %s ... "
 
-#: initdb.c:2888 initdb.c:2959 initdb.c:3007 initdb.c:3064
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "kunde inte skapa katalog \"%s\": %m"
 
-#: initdb.c:2897 initdb.c:2969
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "sätter rättigheter på existerande katalog %s ... "
 
-#: initdb.c:2902 initdb.c:2974
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "kunde inte ändra rättigheter på katalogen \"%s\": %m"
 
-#: initdb.c:2914 initdb.c:2986
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "katalogen \"%s\" existerar men är inte tom"
 
-#: initdb.c:2918
+#: initdb.c:2933
 #, c-format
 msgid "If you want to create a new database system, either remove or empty the directory \"%s\" or run %s with an argument other than \"%s\"."
 msgstr "Om du vill skapa ett nytt databassystem, tag då antingen bort eller töm katalogen \"%s\" eller kör %s med annat argument än \"%s\"."
 
-#: initdb.c:2926 initdb.c:2996 initdb.c:3422
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "kunde inte komma åt katalog \"%s\": %m"
 
-#: initdb.c:2947
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "WAL-katalogen måste vara en absolut sökväg"
 
-#: initdb.c:2990
+#: initdb.c:3005
 #, c-format
 msgid "If you want to store the WAL there, either remove or empty the directory \"%s\"."
 msgstr "Om du vill spara WAL där, antingen radera eller töm katalogen \"%s\"."
 
-#: initdb.c:3000
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "kan inte skapa symbolisk länk \"%s\": %m"
 
-#: initdb.c:3019
+#: initdb.c:3034
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point."
 msgstr "Den innehåller en gömd fil, med inledande punkt i namnet; kanske är detta en monteringspunkt."
 
-#: initdb.c:3021
+#: initdb.c:3036
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Den innehåller \"lost+found\"; kanske är detta en monteringspunkt."
 
-#: initdb.c:3023
+#: initdb.c:3038
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1016,65 +1026,65 @@ msgstr ""
 "Att använda en monteringspunkt som datakatalog rekommenderas inte.\n"
 "Skapa först en underkatalog under monteringspunkten."
 
-#: initdb.c:3050
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "Skapar underkataloger ... "
 
-#: initdb.c:3093
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "utför initiering efter uppstättning..."
 
-#: initdb.c:3256
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s kräver ett värde"
 
-#: initdb.c:3281
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Kör i debug-läge.\n"
 
-#: initdb.c:3285
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Kör i no-clean-läge. Misstag kommer inte städas bort.\n"
 
-#: initdb.c:3358
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "okänd lokalleverantör: %s"
 
-#: initdb.c:3395
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: initdb.c:3402 initdb.c:3406 initdb.c:3410
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s kan inte anges om inte lokalleverantör \"%s\" valts"
 
-#: initdb.c:3424 initdb.c:3487
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "synkar data till disk ... "
 
-#: initdb.c:3432
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr "lösenordsfråga och lösenordsfil kan inte anges samtidigt"
 
-#: initdb.c:3443
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "argumentet till %s måste vara en tvåpotens mellan 1 och 1024"
 
-#: initdb.c:3456
+#: initdb.c:3479
 #, c-format
 msgid "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
 msgstr "superuser-namn \"%s\" tillåts inte; rollnamn får inte börja på \"pg_\""
 
-#: initdb.c:3458
+#: initdb.c:3481
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1085,17 +1095,17 @@ msgstr ""
 "Denna användare måste också vara ägare av server-processen.\n"
 "\n"
 
-#: initdb.c:3474
+#: initdb.c:3497
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Checksummor för datablock är aktiva.\n"
 
-#: initdb.c:3476
+#: initdb.c:3499
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Checksummor för datablock är avstängda.\n"
 
-#: initdb.c:3493
+#: initdb.c:3516
 #, c-format
 msgid ""
 "\n"
@@ -1106,22 +1116,22 @@ msgstr ""
 "Avstod från synkning mot lagringsmedium.\n"
 "Datakatalogen kan komma att fördärvas om operativsystemet störtar.\n"
 
-#: initdb.c:3498
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "slår på autentiseringsmetod \"trust\" för lokala anslutningar"
 
-#: initdb.c:3499
+#: initdb.c:3522
 #, c-format
 msgid "You can change this by editing pg_hba.conf or using the option -A, or --auth-local and --auth-host, the next time you run initdb."
 msgstr "Du kan ändra detta genom att redigera pg_hba.conf eller genom att sätta flaggor -A eller --auth-local och --auth-host nästa gång du kör initdb."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3529
+#: initdb.c:3552
 msgid "logfile"
 msgstr "loggfil"
 
-#: initdb.c:3531
+#: initdb.c:3554
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/po/uk.po b/src/bin/initdb/po/uk.po
index 699f6e96803..8bfaca39f33 100644
--- a/src/bin/initdb/po/uk.po
+++ b/src/bin/initdb/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:21+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:21+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/initdb.pot\n"
-"X-Crowdin-File-ID: 1034\n"
+"X-Crowdin-File: /REL_18_STABLE/initdb.pot\n"
+"X-Crowdin-File-ID: 1069\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -57,28 +57,28 @@ msgstr "неможливо знайти \"%s\" для виконання"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не вдалося знайти абсолютний шлях \"%s\": %m"
 
-#: ../../common/exec.c:382 initdb.c:695
+#: ../../common/exec.c:363 initdb.c:753
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не вдалося виконати команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не вдалося прочитати висновок команди \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не повернула жодних даних"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: initdb.c:353
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: initdb.c:375 initdb.c:411
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
@@ -94,46 +94,46 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: ../../common/pgfnames.c:48 ../../common/rmtree.c:63
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: ../../common/pgfnames.c:69 ../../common/rmtree.c:106
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -242,12 +242,12 @@ msgstr "%s має бути в діапазоні %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
@@ -262,347 +262,362 @@ msgstr "не вдалося встановити сполучення для \"%
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не вдалося встановити сполучення для \"%s\": %s\n"
 
-#: initdb.c:627 initdb.c:1619
+#: initdb.c:372
+#, c-format
+msgid "_wsetlocale() failed"
+msgstr "_wsetlocale() завершився невдало"
+
+#: initdb.c:379
+#, c-format
+msgid "setlocale() failed"
+msgstr "setlocale() завершився невдало"
+
+#: initdb.c:393
+#, c-format
+msgid "failed to restore old locale"
+msgstr "не вдалося відновити старі локалі"
+
+#: initdb.c:396
+#, c-format
+msgid "failed to restore old locale \"%s\""
+msgstr "не вдалося відновити стару локаль \"%s\""
+
+#: initdb.c:685 initdb.c:1692
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
-#: initdb.c:671 initdb.c:975 initdb.c:995
+#: initdb.c:729 initdb.c:1035 initdb.c:1055
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не вдалося відкрити файл \"%s\" для запису: %m"
 
-#: initdb.c:675 initdb.c:978 initdb.c:997
+#: initdb.c:733 initdb.c:1038 initdb.c:1057
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: initdb.c:679
+#: initdb.c:737
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "неможливо закрити файл \"%s\": %m"
 
-#: initdb.c:713
+#: initdb.c:771
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "видалення даних з директорії \"%s\""
 
-#: initdb.c:715
+#: initdb.c:773
 #, c-format
 msgid "failed to remove data directory"
 msgstr "не вдалося видалити дані директорії"
 
-#: initdb.c:719
+#: initdb.c:777
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "видалення даних з директорії \"%s\""
 
-#: initdb.c:722
+#: initdb.c:780
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "не вдалося видалити дані директорії"
 
-#: initdb.c:727
+#: initdb.c:785
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "видалення WAL директорії \"%s\""
 
-#: initdb.c:729
+#: initdb.c:787
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "не вдалося видалити директорію WAL"
 
-#: initdb.c:733
+#: initdb.c:791
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "видалення даних з директорії WAL \"%s\""
 
-#: initdb.c:735
+#: initdb.c:793
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "не вдалося видалити дані директорії WAL"
 
-#: initdb.c:742
+#: initdb.c:800
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "директорія даних \"%s\" не видалена за запитом користувача"
 
-#: initdb.c:746
+#: initdb.c:804
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "директорія WAL \"%s\" не видалена за запитом користувача"
 
-#: initdb.c:764
+#: initdb.c:822
 #, c-format
 msgid "cannot be run as root"
 msgstr "не може виконуватись як root"
 
-#: initdb.c:765
+#: initdb.c:823
 #, c-format
 msgid "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own the server process."
 msgstr "Будь ласка, увійдіть (за допомогою, наприклад, \"su\") як (непривілейований) користувач, від імені якого буде запущено серверний процес."
 
-#: initdb.c:797
+#: initdb.c:855
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "\"%s\" невірне ім'я серверного кодування"
 
-#: initdb.c:941
+#: initdb.c:1001
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "файл \"%s\" не існує"
 
-#: initdb.c:942 initdb.c:947 initdb.c:954
+#: initdb.c:1002 initdb.c:1007 initdb.c:1014
 #, c-format
 msgid "This might mean you have a corrupted installation or identified the wrong directory with the invocation option -L."
 msgstr "Це означає, що ваша інсталяція пошкоджена або в параметрі -L задана неправильна директорія."
 
-#: initdb.c:946
+#: initdb.c:1006
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "немає доступу до файлу \"%s\": %m"
 
-#: initdb.c:953
+#: initdb.c:1013
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "файл \"%s\" не є звичайним файлом"
 
-#: initdb.c:1086
+#: initdb.c:1157
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "обирається реалізація динамічної спільної пам'яті ... "
 
-#: initdb.c:1095
+#: initdb.c:1167
 #, c-format
 msgid "selecting default \"max_connections\" ... "
 msgstr "обирається значення \"max_connections\" за замовчуванням... \n"
 " "
 
-#: initdb.c:1115
+#: initdb.c:1188
 #, c-format
 msgid "selecting default \"shared_buffers\" ... "
 msgstr "обирається значення \"shared_buffers\" за замовчуванням... "
 
-#: initdb.c:1138
+#: initdb.c:1211
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "обирається часовий пояс за замовчуванням ... "
 
-#: initdb.c:1217
+#: initdb.c:1291
 msgid "creating configuration files ... "
 msgstr "створення конфігураційних файлів... "
 
-#: initdb.c:1370 initdb.c:1384 initdb.c:1451 initdb.c:1462
+#: initdb.c:1443 initdb.c:1457 initdb.c:1524 initdb.c:1535
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "неможливо змінити дозволи \"%s\": %m"
 
-#: initdb.c:1481
+#: initdb.c:1554
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "виконуємо сценарій ініціалізації ... "
 
-#: initdb.c:1493
+#: initdb.c:1566
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "вхідний файл \"%s\" не належить PostgreSQL %s"
 
-#: initdb.c:1495
+#: initdb.c:1568
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Вкажіть правильний шлях за допомогою параметру -L."
 
-#: initdb.c:1597
+#: initdb.c:1670
 msgid "Enter new superuser password: "
 msgstr "Введіть новий пароль для superuser: "
 
-#: initdb.c:1598
+#: initdb.c:1671
 msgid "Enter it again: "
 msgstr "Введіть знову: "
 
-#: initdb.c:1601
+#: initdb.c:1674
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Паролі не співпадають.\n"
 
-#: initdb.c:1625
+#: initdb.c:1698
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "не вдалося прочитати пароль з файлу \"%s\": %m"
 
-#: initdb.c:1628
+#: initdb.c:1701
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "файл з паролями \"%s\" є порожнім"
 
-#: initdb.c:2040
+#: initdb.c:2113
 #, c-format
 msgid "caught signal\n"
 msgstr "отримано сигнал\n"
 
-#: initdb.c:2046
+#: initdb.c:2119
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "не вдалося написати у дочірній процес: %s\n"
 
-#: initdb.c:2054
+#: initdb.c:2127
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2143
+#: initdb.c:2209 initdb.c:2255
 #, c-format
-msgid "setlocale() failed"
-msgstr "setlocale() завершився невдало"
-
-#: initdb.c:2161
-#, c-format
-msgid "failed to restore old locale \"%s\""
-msgstr "не вдалося відновити стару локаль \"%s\""
+msgid "locale name \"%s\" contains non-ASCII characters"
+msgstr "назва локалі \"%s\" містить не-ASCII символи"
 
-#: initdb.c:2169
+#: initdb.c:2235
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "не допустиме ім'я локалі \"%s\""
 
-#: initdb.c:2170
+#: initdb.c:2236
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Якщо ім'я локалі характерне для ICU, використовуйте --icu-locale."
 
-#: initdb.c:2183
+#: initdb.c:2249
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "неприпустимі параметри локалі; перевірте LANG та LC_* змінні середовища"
 
-#: initdb.c:2209 initdb.c:2233
+#: initdb.c:2280 initdb.c:2304
 #, c-format
 msgid "encoding mismatch"
 msgstr "невідповідність кодування"
 
-#: initdb.c:2210
+#: initdb.c:2281
 #, c-format
 msgid "The encoding you selected (%s) and the encoding that the selected locale uses (%s) do not match. This would lead to misbehavior in various character string processing functions."
 msgstr "Вибране вами кодування (%s) і кодування, яке використовує обрана локаль (%s) не збігаються. Це призведе до неправильної поведінки у різних функціях обробки символьних рядків."
 
-#: initdb.c:2215 initdb.c:2236
+#: initdb.c:2286 initdb.c:2307
 #, c-format
 msgid "Rerun %s and either do not specify an encoding explicitly, or choose a matching combination."
 msgstr "Перезапустіть %s і або не вказуйте кодування прямо або виберіть відповідну комбінацію."
 
-#: initdb.c:2234
+#: initdb.c:2305
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "Обране вами кодування (%s) не підтримується провайдером ICU."
 
-#: initdb.c:2285
+#: initdb.c:2356
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "не вдалося перетворити локальну назву \"%s\" на мітку мови: %s"
 
-#: initdb.c:2291 initdb.c:2343 initdb.c:2435
+#: initdb.c:2362 initdb.c:2414 initdb.c:2508
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU не підтримується в цій збірці"
 
-#: initdb.c:2314
+#: initdb.c:2385
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "не вдалося отримати мову з локалі \"%s\": %s"
 
-#: initdb.c:2340
+#: initdb.c:2411
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "locale \"%s\" має невідому мову \"%s\""
 
-#: initdb.c:2401
+#: initdb.c:2472
 #, c-format
 msgid "locale must be specified if provider is %s"
 msgstr "потрібно вказати локаль для провайдера %s"
 
-#: initdb.c:2412
+#: initdb.c:2485
 #, c-format
 msgid "invalid locale name \"%s\" for builtin provider"
 msgstr "неприпустиме ім'я локалі \"%s\" для вбудованого провайдера"
 
-#: initdb.c:2423
+#: initdb.c:2496
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Використання мітки мови \"%s\" для локалі ICU \"%s\".\n"
 
-#: initdb.c:2446
+#: initdb.c:2519
 #, c-format
 msgid "%s initializes a PostgreSQL database cluster.\n\n"
 msgstr "%s ініціалізує кластер баз даних PostgreSQL.\n\n"
 
-#: initdb.c:2447
+#: initdb.c:2520
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: initdb.c:2448
+#: initdb.c:2521
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [DATADIR]\n"
 
-#: initdb.c:2449
+#: initdb.c:2522
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: initdb.c:2450
+#: initdb.c:2523
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, -- auth=METHOD метод аутентифікації за замовчуванням для локальних підключень\n"
 
-#: initdb.c:2451
+#: initdb.c:2524
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr "      --auth-host=METHOD     метод аутентифікації за замовчуванням для локального TCP/IP підключення\n"
 
-#: initdb.c:2452
+#: initdb.c:2525
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr "      --auth-local=METHOD   метод аутентифікації за замовчуванням для локального під'єднання через сокет\n"
 
-#: initdb.c:2453
+#: initdb.c:2526
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D - pgdata =] DATADIR розташування кластеру цієї бази даних\n"
 
-#: initdb.c:2454
+#: initdb.c:2527
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING встановлення кодування за замовчуванням для нової бази даних\n"
 
-#: initdb.c:2455
+#: initdb.c:2528
 #, c-format
 msgid "  -g, --allow-group-access  allow group read/execute on data directory\n"
 msgstr "  -g, --allow-group-access дозволити читати/виконувати у каталозі даних для групи\n"
 
-#: initdb.c:2456
+#: initdb.c:2529
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=LOCALE встановлює ідентифікатор мови ICU для нових баз даних\n"
 
-#: initdb.c:2457
+#: initdb.c:2530
 #, c-format
 msgid "      --icu-rules=RULES     set additional ICU collation rules for new databases\n"
 msgstr "      --icu-rules=RULES встановити додаткові правила сортування в ICU для нових баз даних\n"
 
-#: initdb.c:2458
+#: initdb.c:2531
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      використовувати контрольні суми сторінок\n"
 
-#: initdb.c:2459
+#: initdb.c:2532
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOCALE       встановлює локаль за замовчуванням для нових баз даних\n"
 
-#: initdb.c:2460
+#: initdb.c:2533
 #, c-format
 msgid "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
 "      --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
@@ -613,132 +628,142 @@ msgstr "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
 "                            встановлення локалі за замовчуванням для відповідної категорії в\n"
 "                            нових базах даних (замість значення з середовища)\n"
 
-#: initdb.c:2464
+#: initdb.c:2537
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           еквівалентно --locale=C\n"
 
-#: initdb.c:2465
+#: initdb.c:2538
 #, c-format
 msgid "      --builtin-locale=LOCALE\n"
 "                            set builtin locale name for new databases\n"
 msgstr "      --builtin-locale=LOCALE\n"
 "                            встановити ім'я вбудованої локалі для нових баз даних\n"
 
-#: initdb.c:2467
+#: initdb.c:2540
 #, c-format
 msgid "      --locale-provider={builtin|libc|icu}\n"
 "                            set default locale provider for new databases\n"
 msgstr "      --locale-provider={builtin|libc|icu}\n"
 "                            встановлює провайдер локалі за замовченням для нових баз даних\n"
 
-#: initdb.c:2469
+#: initdb.c:2542
+#, c-format
+msgid "      --no-data-checksums   do not use data page checksums\n"
+msgstr "      --no-data-checksums   не використовувати контрольні суми сторінок\n"
+
+#: initdb.c:2543
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FILE         прочитати пароль для нового суперкористувача з файлу\n"
 
-#: initdb.c:2470
+#: initdb.c:2544
 #, c-format
 msgid "  -T, --text-search-config=CFG\n"
 "                            default text search configuration\n"
 msgstr "  -T, --text-search-config=CFG                             конфігурація текстового пошуку за замовчуванням\n"
 
-#: initdb.c:2472
+#: initdb.c:2546
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME         ім'я суперкористувача бази даних\n"
 
-#: initdb.c:2473
+#: initdb.c:2547
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt           запитувати пароль нового суперкористувача\n"
 
-#: initdb.c:2474
+#: initdb.c:2548
 #, c-format
 msgid "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=WALDIR       розташування журналу попереднього запису\n"
 
-#: initdb.c:2475
+#: initdb.c:2549
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=SIZE     розмір сегментів WAL у мегабайтах\n"
 
-#: initdb.c:2476
+#: initdb.c:2550
 #, c-format
 msgid "\n"
 "Less commonly used options:\n"
 msgstr "\n"
 "Рідковживані параметри:\n"
 
-#: initdb.c:2477
+#: initdb.c:2551
 #, c-format
 msgid "  -c, --set NAME=VALUE      override default setting for server parameter\n"
 msgstr "  -c, --set NAME=VALUE перевизначити параметр за замовчуванням для параметра сервера\n"
 
-#: initdb.c:2478
+#: initdb.c:2552
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug             генерувати багато налагоджувальних повідомлень\n"
 
-#: initdb.c:2479
+#: initdb.c:2553
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches встановити debug_discard_caches=1\n"
 
-#: initdb.c:2480
+#: initdb.c:2554
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              розташування вхідних файлів\n"
 
-#: initdb.c:2481
+#: initdb.c:2555
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean             не очищувати після помилок\n"
 " \n"
 
-#: initdb.c:2482
+#: initdb.c:2556
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync          не чекати на безпечний запис змін на диск\n"
 
-#: initdb.c:2483
+#: initdb.c:2557
+#, c-format
+msgid "      --no-sync-data-files  do not sync files within database directories\n"
+msgstr "      --no-sync-data-files  не синхронизувати файли в папках бази даних\n"
+
+#: initdb.c:2558
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr "      --no-instructions не друкувати інструкції для наступних кроків\n"
 
-#: initdb.c:2484
+#: initdb.c:2559
 #, c-format
 msgid "  -s, --show                show internal settings, then exit\n"
 msgstr "  -s, --show                показати внутрішні налаштування і вийти\n"
 
-#: initdb.c:2485
+#: initdb.c:2560
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD  встановити метод синхронізації файлів на диск\n"
 
-#: initdb.c:2486
+#: initdb.c:2561
 #, c-format
 msgid "  -S, --sync-only           only sync database files to disk, then exit\n"
 msgstr "  -S, --sync-only           лише синхронізувати файли бази даних на диск, потім вийти\n"
 
-#: initdb.c:2487
+#: initdb.c:2562
 #, c-format
 msgid "\n"
 "Other options:\n"
 msgstr "\n"
 "Інші параметри:\n"
 
-#: initdb.c:2488
+#: initdb.c:2563
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: initdb.c:2489
+#: initdb.c:2564
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: initdb.c:2490
+#: initdb.c:2565
 #, c-format
 msgid "\n"
 "If the data directory is not specified, the environment variable PGDATA\n"
@@ -746,79 +771,79 @@ msgid "\n"
 msgstr "\n"
 "Якщо каталог даних не вказано, використовується змінна середовища PGDATA.\n"
 
-#: initdb.c:2492
+#: initdb.c:2567
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: initdb.c:2493
+#: initdb.c:2568
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: initdb.c:2517
+#: initdb.c:2592
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr "неприпустимий спосіб автентифікації \"%s\" для \"%s\" підключення"
 
-#: initdb.c:2531
+#: initdb.c:2606
 #, c-format
 msgid "must specify a password for the superuser to enable password authentication"
 msgstr "необхідно вказати пароль суперкористувача для активації автентифікації за допомогою пароля"
 
-#: initdb.c:2550
+#: initdb.c:2625
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог даних не вказано"
 
-#: initdb.c:2551
+#: initdb.c:2626
 #, c-format
 msgid "You must identify the directory where the data for this database system will reside.  Do this with either the invocation option -D or the environment variable PGDATA."
 msgstr "Ви повинні зазначити каталог, де будуть зберігатися дані цієї системи баз даних. Зробіть це або параметром -D, або змінною середовища PGDATA."
 
-#: initdb.c:2568
+#: initdb.c:2643
 #, c-format
 msgid "could not set environment"
 msgstr "не вдалося встановити середовище"
 
-#: initdb.c:2586
+#: initdb.c:2661
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\""
 
-#: initdb.c:2589
+#: initdb.c:2664
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s"
 
-#: initdb.c:2604
+#: initdb.c:2679
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "розташування вхідного файлу має бути абсолютним шляхом"
 
-#: initdb.c:2621
+#: initdb.c:2696
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Кластер бази даних буде ініціалізовано з локалізацією \"%s\".\n"
 
-#: initdb.c:2624
+#: initdb.c:2699
 #, c-format
 msgid "The database cluster will be initialized with this locale configuration:\n"
 msgstr "Кластер бази даних буде ініціалізовано з локалізацією:\n"
 
-#: initdb.c:2625
+#: initdb.c:2700
 #, c-format
 msgid "  locale provider:   %s\n"
 msgstr "  провайдер локалі:   %s\n"
 
-#: initdb.c:2627
+#: initdb.c:2702
 #, c-format
 msgid "  default collation: %s\n"
 msgstr "  стандартне сортування: %s\n"
 
-#: initdb.c:2628
+#: initdb.c:2703
 #, c-format
 msgid "  LC_COLLATE:  %s\n"
 "  LC_CTYPE:    %s\n"
@@ -833,216 +858,216 @@ msgstr "  LC_COLLATE:  %s\n"
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2658
+#: initdb.c:2733
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "не вдалося знайти відповідне кодування для локалі \"%s\""
 
-#: initdb.c:2660
+#: initdb.c:2735
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Перезапустіть %s з параметром -E."
 
-#: initdb.c:2661 initdb.c:3204 initdb.c:3324 initdb.c:3344
+#: initdb.c:2736 initdb.c:3274 initdb.c:3400 initdb.c:3420
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: initdb.c:2673
+#: initdb.c:2748
 #, c-format
 msgid "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
 "The default database encoding will be set to \"%s\" instead.\n"
 msgstr "Кодування \"%s\", що очікується локалізацією, не дозволено у якості кодування сервера.\n"
 "Замість нього буде встановлене кодування \"%s\" за замовчуванням.\n"
 
-#: initdb.c:2678
+#: initdb.c:2753
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "локалізація \"%s\" потребує кодування \"%s\", що не підтримується"
 
-#: initdb.c:2680
+#: initdb.c:2755
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "Кодування \"%s\" не допускається як кодування сервера."
 
-#: initdb.c:2682
+#: initdb.c:2757
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Перезапустіть %s з іншим вибором локалі."
 
-#: initdb.c:2690
+#: initdb.c:2765
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "Кодування бази даних за замовчуванням встановлено: \"%s\".\n"
 
-#: initdb.c:2704
+#: initdb.c:2781
 #, c-format
 msgid "builtin provider locale \"%s\" requires encoding \"%s\""
 msgstr "локаль вбудованого провайдера \"%s\" вимагає кодування \"%s\""
 
-#: initdb.c:2766
+#: initdb.c:2843
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr "не вдалося знайти відповідну конфігурацію текстового пошуку для локалі\"%s\""
 
-#: initdb.c:2777
+#: initdb.c:2854
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr "відповідна конфігурація текстового пошуку для локалі \"%s\" невідома"
 
-#: initdb.c:2782
+#: initdb.c:2859
 #, c-format
 msgid "specified text search configuration \"%s\" might not match locale \"%s\""
 msgstr "вказана конфігурація текстового пошуку \"%s\" може не підходити локалі \"%s\""
 
-#: initdb.c:2787
+#: initdb.c:2864
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Конфігурація текстового пошуку за замовчуванням буде встановлена в \"%s\".\n"
 
-#: initdb.c:2830 initdb.c:2901
+#: initdb.c:2898 initdb.c:2969
 #, c-format
 msgid "creating directory %s ... "
 msgstr "створення каталогу %s... "
 
-#: initdb.c:2835 initdb.c:2906 initdb.c:2954 initdb.c:3011
+#: initdb.c:2903 initdb.c:2974 initdb.c:3022 initdb.c:3079
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не вдалося створити каталог \"%s\": %m"
 
-#: initdb.c:2844 initdb.c:2916
+#: initdb.c:2912 initdb.c:2984
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "виправляю дозволи для створеного каталогу %s... "
 
-#: initdb.c:2849 initdb.c:2921
+#: initdb.c:2917 initdb.c:2989
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "не вдалося змінити дозволи каталогу \"%s\": %m"
 
-#: initdb.c:2861 initdb.c:2933
+#: initdb.c:2929 initdb.c:3001
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" існує, але він не порожній"
 
-#: initdb.c:2865
+#: initdb.c:2933
 #, c-format
 msgid "If you want to create a new database system, either remove or empty the directory \"%s\" or run %s with an argument other than \"%s\"."
 msgstr "Якщо ви хочете створити нову систему бази даних, видаліть або очистіть каталог \"%s\", або запустіть %s з аргументом, відмінним від \"%s\"."
 
-#: initdb.c:2873 initdb.c:2943 initdb.c:3369
+#: initdb.c:2941 initdb.c:3011 initdb.c:3445
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "немає доступу до каталогу \"%s\": %m"
 
-#: initdb.c:2894
+#: initdb.c:2962
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "розташування WAL каталогу має бути абсолютним шляхом"
 
-#: initdb.c:2937
+#: initdb.c:3005
 #, c-format
 msgid "If you want to store the WAL there, either remove or empty the directory \"%s\"."
 msgstr "Якщо ви хочете зберігати дані з WAL там, потрібно видалити або очистити директорію \"%s\"."
 
-#: initdb.c:2947
+#: initdb.c:3015
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не вдалося створити символічне послання \"%s\": %m"
 
-#: initdb.c:2966
+#: initdb.c:3034
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point."
 msgstr "Він містить файл з крапкою або невидимий файл, можливо це точка під'єднання."
 
-#: initdb.c:2968
+#: initdb.c:3036
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Він містить каталог lost+found, можливо це точка під'єднання."
 
-#: initdb.c:2970
+#: initdb.c:3038
 #, c-format
 msgid "Using a mount point directly as the data directory is not recommended.\n"
 "Create a subdirectory under the mount point."
 msgstr "Не рекомендується використовувати точку під'єднання у якості каталогу даних.\n"
 "Створіть підкаталог і використайте його."
 
-#: initdb.c:2997
+#: initdb.c:3065
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "створення підкаталогів... "
 
-#: initdb.c:3040
+#: initdb.c:3108
 msgid "performing post-bootstrap initialization ... "
 msgstr "виконується кінцева фаза ініціалізації ... "
 
-#: initdb.c:3203
+#: initdb.c:3273
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s необхідне значення"
 
-#: initdb.c:3228
+#: initdb.c:3298
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Виконується у режимі налагодження.\n"
 
-#: initdb.c:3232
+#: initdb.c:3302
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Виконується у режимі 'no-clean'. Помилки не будуть виправлені.\n"
 
-#: initdb.c:3305
+#: initdb.c:3375
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нерозпізнаний постачальник локалів: %s"
 
-#: initdb.c:3342
+#: initdb.c:3418
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: initdb.c:3349 initdb.c:3353 initdb.c:3357
+#: initdb.c:3425 initdb.c:3429 initdb.c:3433
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s не може бути вказано, поки не буде обрано постачальник локалі \"%s\""
 
-#: initdb.c:3371 initdb.c:3434
+#: initdb.c:3447 initdb.c:3510
 msgid "syncing data to disk ... "
 msgstr "синхронізація даних з диском ... "
 
-#: initdb.c:3379
+#: initdb.c:3455
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr "неможливо вказати одночасно пароль і файл паролю"
 
-#: initdb.c:3390
+#: initdb.c:3466
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "аргумент %s має бути ступенем двійки в діапазоні від 1 до 1024"
 
-#: initdb.c:3403
+#: initdb.c:3479
 #, c-format
 msgid "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
 msgstr "неприпустиме ім'я суперкористувача \"%s\"; імена ролей не можуть починатися на \"pg_\""
 
-#: initdb.c:3405
+#: initdb.c:3481
 #, c-format
 msgid "The files belonging to this database system will be owned by user \"%s\".\n"
 "This user must also own the server process.\n\n"
 msgstr "Файли цієї бази даних будуть належати користувачеві \"%s\".\n"
 "Від імені цього користувача повинен запускатися процес сервера.\n\n"
 
-#: initdb.c:3421
+#: initdb.c:3497
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Контроль цілісності сторінок даних увімкнено.\n"
 
-#: initdb.c:3423
+#: initdb.c:3499
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Контроль цілісності сторінок даних вимкнено.\n"
 
-#: initdb.c:3440
+#: initdb.c:3516
 #, c-format
 msgid "\n"
 "Sync to disk skipped.\n"
@@ -1051,22 +1076,22 @@ msgstr "\n"
 "Синхронізація з диском пропущена.\n"
 "Каталог з даними може бути пошкоджено під час аварійного завершення роботи операційної системи.\n"
 
-#: initdb.c:3445
+#: initdb.c:3521
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "увімкнення автентифікації \"довіри\" для локальних підключень"
 
-#: initdb.c:3446
+#: initdb.c:3522
 #, c-format
 msgid "You can change this by editing pg_hba.conf or using the option -A, or --auth-local and --auth-host, the next time you run initdb."
 msgstr "Ви можете змінити це, змінивши pg_hba.conf або скориставшись опцією -A, або --auth-local і --auth-host, наступного разу, коли ви запускаєте initdb."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3476
+#: initdb.c:3552
 msgid "logfile"
 msgstr "logfile"
 
-#: initdb.c:3478
+#: initdb.c:3554
 #, c-format
 msgid "\n"
 "Success. You can now start the database server using:\n\n"
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index 678cb13a195..f01582ed338 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -620,7 +620,7 @@ msgid ""
 "      --builtin-locale=LOCALE\n"
 "                            set builtin locale name for new databases\n"
 msgstr ""
-"      —builtin-locale=LOCALE\n"
+"      --builtin-locale=LOCALE\n"
 "                            为新数据库设置内置区域环境名称\n"
 
 #: initdb.c:2467
@@ -629,7 +629,7 @@ msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                            set default locale provider for new databases\n"
 msgstr ""
-"      —locale-provider={builtin|libc|icu}\n"
+"      --locale-provider={builtin|libc|icu}\n"
 "                            为新数据库设置默认的区域环境支持程序\n"
 
 #: initdb.c:2469
@@ -776,11 +776,8 @@ msgstr "\"%s\" 是用于 \"%s\" 连接的无效认证方法"
 
 #: initdb.c:2521
 #, c-format
-msgid "	NOTICE: If you set this to gb18030,\n\
-		the database will initilized with gb18030_2000,but not gb18030_2022,\n\
-		if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
-msgstr "    注意: 如果设置了这个参数为gb18030,数据库会以gb18030_2000标准进行初始化,\n\
-        如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"
+msgid "NOTICE: If you set this to gb18030, the database will initilized with gb18030_2000,but not gb18030_2022, if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
+msgstr "注意: 如果设置了这个参数为gb18030, 数据库会以gb18030_2000标准进行初始化, 如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"
 
 #: initdb.c:2531
 #, c-format
diff --git a/src/bin/pg_amcheck/po/es.po b/src/bin/pg_amcheck/po/es.po
index 7dc5272b7b7..bfa13002f68 100644
--- a/src/bin/pg_amcheck/po/es.po
+++ b/src/bin/pg_amcheck/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_amcheck (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-16 05:22+0000\n"
+"POT-Creation-Date: 2026-02-06 23:21+0000\n"
 "PO-Revision-Date: 2024-11-16 14:23+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -50,44 +50,44 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -160,188 +160,188 @@ msgid "processing of database \"%s\" failed: %s"
 msgstr "falló el procesamiento de la base de datos «%s»: %s"
 
 #: ../../fe_utils/query_utils.c:33 ../../fe_utils/query_utils.c:58
-#: pg_amcheck.c:1693 pg_amcheck.c:2138
+#: pg_amcheck.c:1695 pg_amcheck.c:2155
 #, c-format
 msgid "query failed: %s"
 msgstr "la consulta falló: %s"
 
 #: ../../fe_utils/query_utils.c:34 ../../fe_utils/query_utils.c:59
-#: pg_amcheck.c:578 pg_amcheck.c:1147 pg_amcheck.c:1694 pg_amcheck.c:2139
+#: pg_amcheck.c:579 pg_amcheck.c:1149 pg_amcheck.c:1696 pg_amcheck.c:2156
 #, c-format
 msgid "Query was: %s"
 msgstr "La consulta era: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "el argumento de la orden de shell contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: pg_amcheck.c:403
+#: pg_amcheck.c:404
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "argumento no válido para la opción %s"
 
-#: pg_amcheck.c:409
+#: pg_amcheck.c:410
 #, c-format
 msgid "invalid start block"
 msgstr "bloque de inicio no válido"
 
-#: pg_amcheck.c:411
+#: pg_amcheck.c:412
 #, c-format
 msgid "start block out of bounds"
 msgstr "bloque de inicio fuera de rango"
 
-#: pg_amcheck.c:418
+#: pg_amcheck.c:419
 #, c-format
 msgid "invalid end block"
 msgstr "bloque final no válido"
 
-#: pg_amcheck.c:420
+#: pg_amcheck.c:421
 #, c-format
 msgid "end block out of bounds"
 msgstr "bloque final fuera de rango"
 
-#: pg_amcheck.c:446 pg_amcheck.c:468
+#: pg_amcheck.c:447 pg_amcheck.c:469
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_amcheck.c:452
+#: pg_amcheck.c:453
 #, c-format
 msgid "end block precedes start block"
 msgstr "bloque final precede al bloque de inicio"
 
-#: pg_amcheck.c:466
+#: pg_amcheck.c:467
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_amcheck.c:486
+#: pg_amcheck.c:487
 #, c-format
 msgid "cannot specify a database name with --all"
 msgstr "no se puede especificar un nombre de base de datos al usar --all"
 
-#: pg_amcheck.c:492
+#: pg_amcheck.c:493
 #, c-format
 msgid "cannot specify both a database name and database patterns"
 msgstr "no se puede especificar al mismo tiempo un nombre de base de datos junto con patrones de bases de datos"
 
-#: pg_amcheck.c:520
+#: pg_amcheck.c:521
 #, c-format
 msgid "no databases to check"
 msgstr "no hay bases de datos para revisar"
 
-#: pg_amcheck.c:576
+#: pg_amcheck.c:577
 #, c-format
 msgid "database \"%s\": %s"
 msgstr "base de datos «%s»: %s"
 
-#: pg_amcheck.c:587
+#: pg_amcheck.c:588
 #, c-format
 msgid "skipping database \"%s\": amcheck is not installed"
 msgstr "omitiendo la base de datos «%s»: amcheck no está instalado"
 
-#: pg_amcheck.c:595
+#: pg_amcheck.c:597
 #, c-format
 msgid "in database \"%s\": using amcheck version \"%s\" in schema \"%s\""
 msgstr "en base de datos «%s»: usando amcheck versión «%s» en esquema «%s»"
 
-#: pg_amcheck.c:624
+#: pg_amcheck.c:626
 #, c-format
 msgid "option %s is not supported by amcheck version %s"
 msgstr "la opción %s no está soportada por la versión %s de amcheck"
 
-#: pg_amcheck.c:650
+#: pg_amcheck.c:652
 #, c-format
 msgid "no heap tables to check matching \"%s\""
 msgstr "no hay tablas heap para revisar que coincidan con «%s»"
 
-#: pg_amcheck.c:653
+#: pg_amcheck.c:655
 #, c-format
 msgid "no btree indexes to check matching \"%s\""
 msgstr "no hay índices btree para revisar que coincidan con «%s»"
 
-#: pg_amcheck.c:656
+#: pg_amcheck.c:658
 #, c-format
 msgid "no relations to check in schemas matching \"%s\""
 msgstr "no hay relaciones para revisar en esquemas que coincidan con «%s»"
 
-#: pg_amcheck.c:659
+#: pg_amcheck.c:661
 #, c-format
 msgid "no relations to check matching \"%s\""
 msgstr "no hay relaciones para revisar que coincidan con «%s»"
 
-#: pg_amcheck.c:687
+#: pg_amcheck.c:689
 #, c-format
 msgid "no relations to check"
 msgstr "no hay relaciones para revisar"
 
-#: pg_amcheck.c:770
+#: pg_amcheck.c:772
 #, c-format
 msgid "checking heap table \"%s.%s.%s\""
 msgstr "revisando tabla heap «%s.%s.%s»"
 
-#: pg_amcheck.c:786
+#: pg_amcheck.c:788
 #, c-format
 msgid "checking btree index \"%s.%s.%s\""
 msgstr "revisando índice btree «%s.%s.%s»"
 
-#: pg_amcheck.c:937
+#: pg_amcheck.c:939
 #, c-format
 msgid "error sending command to database \"%s\": %s"
 msgstr "error al enviar orden a la base de datos «%s»: %s"
 
-#: pg_amcheck.c:940
+#: pg_amcheck.c:942
 #, c-format
 msgid "Command was: %s"
 msgstr "La orden era: % s"
 
-#: pg_amcheck.c:1060
+#: pg_amcheck.c:1062
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s, offset %s, attribute %s:\n"
 msgstr "tabla heap «%s.%s.%s», bloque %s, posición %s, atributo %s:\n"
 
-#: pg_amcheck.c:1067
+#: pg_amcheck.c:1069
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s, offset %s:\n"
 msgstr "tabla heap «%s.%s.%s», bloque %s, posición %s:\n"
 
-#: pg_amcheck.c:1073
+#: pg_amcheck.c:1075
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s:\n"
 msgstr "tabla heap «%s.%s.%s», bloque %s:\n"
 
-#: pg_amcheck.c:1078 pg_amcheck.c:1089
+#: pg_amcheck.c:1080 pg_amcheck.c:1091
 #, c-format
 msgid "heap table \"%s.%s.%s\":\n"
 msgstr "tabla heap «%s.%s.%s»:\n"
 
-#: pg_amcheck.c:1093 pg_amcheck.c:1162
+#: pg_amcheck.c:1095 pg_amcheck.c:1164
 #, c-format
 msgid "query was: %s\n"
 msgstr "la consulta era: %s\n"
 
-#: pg_amcheck.c:1144
+#: pg_amcheck.c:1146
 #, c-format
 msgid "btree index \"%s.%s.%s\": btree checking function returned unexpected number of rows: %d"
 msgstr "índice btree «%s.%s.%s»: la función de comprobación de btree devolvió un número inesperado de registros: %d"
 
-#: pg_amcheck.c:1148
+#: pg_amcheck.c:1150
 #, c-format
 msgid "Are %s's and amcheck's versions compatible?"
 msgstr "¿Son compatibles la versión de %s con la de amcheck?"
 
-#: pg_amcheck.c:1158
+#: pg_amcheck.c:1160
 #, c-format
 msgid "btree index \"%s.%s.%s\":\n"
 msgstr "índice btree «%s.%s.%s»:\n"
 
-#: pg_amcheck.c:1183
+#: pg_amcheck.c:1185
 #, c-format
 msgid ""
 "%s checks objects in a PostgreSQL database for corruption.\n"
@@ -350,17 +350,17 @@ msgstr ""
 "%s busca corrupción en objetos de una base de datos PostgreSQL.\n"
 "\n"
 
-#: pg_amcheck.c:1184
+#: pg_amcheck.c:1186
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_amcheck.c:1185
+#: pg_amcheck.c:1187
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [BASE-DE-DATOS]\n"
 
-#: pg_amcheck.c:1186
+#: pg_amcheck.c:1188
 #, c-format
 msgid ""
 "\n"
@@ -369,77 +369,77 @@ msgstr ""
 "\n"
 "Opciones de objetivo:\n"
 
-#: pg_amcheck.c:1187
+#: pg_amcheck.c:1189
 #, c-format
 msgid "  -a, --all                       check all databases\n"
 msgstr "  -a, --all                       revisar todas las bases de datos\n"
 
-#: pg_amcheck.c:1188
+#: pg_amcheck.c:1190
 #, c-format
 msgid "  -d, --database=PATTERN          check matching database(s)\n"
 msgstr "  -d, --database=PATRÓN           revisar la(s) base(s) de datos que coincida(n)\n"
 
-#: pg_amcheck.c:1189
+#: pg_amcheck.c:1191
 #, c-format
 msgid "  -D, --exclude-database=PATTERN  do NOT check matching database(s)\n"
 msgstr "  -D, --exclude-database=PATRÓN   NO revisar la(s) base(s) de datos que coincida(n)\n"
 
-#: pg_amcheck.c:1190
+#: pg_amcheck.c:1192
 #, c-format
 msgid "  -i, --index=PATTERN             check matching index(es)\n"
 msgstr "  -i, --index=PATRÓN              revisar el(los) índice(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1191
+#: pg_amcheck.c:1193
 #, c-format
 msgid "  -I, --exclude-index=PATTERN     do NOT check matching index(es)\n"
 msgstr "  -I, --exclude-index=PATRÓN      NO revisar el(los) índice(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1192
+#: pg_amcheck.c:1194
 #, c-format
 msgid "  -r, --relation=PATTERN          check matching relation(s)\n"
 msgstr "  -r, --relation=PATRÓN           revisar la(s) relación(es) que coincida(n)\n"
 
-#: pg_amcheck.c:1193
+#: pg_amcheck.c:1195
 #, c-format
 msgid "  -R, --exclude-relation=PATTERN  do NOT check matching relation(s)\n"
 msgstr "  -R, --exclude-relation=PATRÓN   NO revisar la(s) relación(es) que coincida(n)\n"
 
-#: pg_amcheck.c:1194
+#: pg_amcheck.c:1196
 #, c-format
 msgid "  -s, --schema=PATTERN            check matching schema(s)\n"
 msgstr "  -s, --schema=PATRÓN             revisar el(los) esquema(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1195
+#: pg_amcheck.c:1197
 #, c-format
 msgid "  -S, --exclude-schema=PATTERN    do NOT check matching schema(s)\n"
 msgstr "  -S, --exclude-schema=PATRÓN     NO revisar el(los) esquema(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1196
+#: pg_amcheck.c:1198
 #, c-format
 msgid "  -t, --table=PATTERN             check matching table(s)\n"
 msgstr "  -t, --table=PATRÓN              revisar la(s) tabla(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1197
+#: pg_amcheck.c:1199
 #, c-format
 msgid "  -T, --exclude-table=PATTERN     do NOT check matching table(s)\n"
 msgstr "  -T, --exclude-table=PATRÓN      NO revisar la(s) tabla(s) que coincida(n)\n"
 
-#: pg_amcheck.c:1198
+#: pg_amcheck.c:1200
 #, c-format
 msgid "      --no-dependent-indexes      do NOT expand list of relations to include indexes\n"
 msgstr "      --no-dependent-indexes      NO expandir la lista de relaciones para incluir índices\n"
 
-#: pg_amcheck.c:1199
+#: pg_amcheck.c:1201
 #, c-format
 msgid "      --no-dependent-toast        do NOT expand list of relations to include TOAST tables\n"
 msgstr "      --no-dependent-toast        NO expandir lista de relaciones para incluir tablas TOAST\n"
 
-#: pg_amcheck.c:1200
+#: pg_amcheck.c:1202
 #, c-format
 msgid "      --no-strict-names           do NOT require patterns to match objects\n"
 msgstr "      --no-strict-names           NO requerir que los patrones coincidan con los objetos\n"
 
-#: pg_amcheck.c:1201
+#: pg_amcheck.c:1203
 #, c-format
 msgid ""
 "\n"
@@ -448,32 +448,32 @@ msgstr ""
 "\n"
 "Opciones para revisión de tabla:\n"
 
-#: pg_amcheck.c:1202
+#: pg_amcheck.c:1204
 #, c-format
 msgid "      --exclude-toast-pointers    do NOT follow relation TOAST pointers\n"
 msgstr "      --exclude-toast-pointers    NO seguir punteros TOAST de la relación\n"
 
-#: pg_amcheck.c:1203
+#: pg_amcheck.c:1205
 #, c-format
 msgid "      --on-error-stop             stop checking at end of first corrupt page\n"
 msgstr "      --on-error-stop             detener la revisión al final de la primera página corrupta\n"
 
-#: pg_amcheck.c:1204
+#: pg_amcheck.c:1206
 #, c-format
 msgid "      --skip=OPTION               do NOT check \"all-frozen\" or \"all-visible\" blocks\n"
 msgstr "      --skip=OPTION               NO revisar bloques «all-frozen» u «all-visible»\n"
 
-#: pg_amcheck.c:1205
+#: pg_amcheck.c:1207
 #, c-format
 msgid "      --startblock=BLOCK          begin checking table(s) at the given block number\n"
 msgstr "      --startblock=BLOQUE         empezar la revisión de la(s) tabla(s) en el número de bloque especificado\n"
 
-#: pg_amcheck.c:1206
+#: pg_amcheck.c:1208
 #, c-format
 msgid "      --endblock=BLOCK            check table(s) only up to the given block number\n"
 msgstr "      --endblock=BLOQUE           solo revisar la(s) tabla(s) hasta el número de bloque especificado\n"
 
-#: pg_amcheck.c:1207
+#: pg_amcheck.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -482,27 +482,27 @@ msgstr ""
 "\n"
 "Opciones para revisión de índices B-tree:\n"
 
-#: pg_amcheck.c:1208
+#: pg_amcheck.c:1210
 #, c-format
 msgid "      --checkunique               check unique constraint if index is unique\n"
 msgstr "      --checkunique               verificar si restricción de unicidad se cumple en índice\n"
 
-#: pg_amcheck.c:1209
+#: pg_amcheck.c:1211
 #, c-format
 msgid "      --heapallindexed            check that all heap tuples are found within indexes\n"
 msgstr "      --heapallindexed            revisar que todas las tuplas heap se encuentren en los índices\n"
 
-#: pg_amcheck.c:1210
+#: pg_amcheck.c:1212
 #, c-format
 msgid "      --parent-check              check index parent/child relationships\n"
 msgstr "      --parent-check              revisar relaciones padre/hijo de índice\n"
 
-#: pg_amcheck.c:1211
+#: pg_amcheck.c:1213
 #, c-format
 msgid "      --rootdescend               search from root page to refind tuples\n"
 msgstr "      --rootdescend               buscar desde la página raíz para volver a encontrar tuplas\n"
 
-#: pg_amcheck.c:1212
+#: pg_amcheck.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -511,37 +511,37 @@ msgstr ""
 "\n"
 "Opciones de conexión:\n"
 
-#: pg_amcheck.c:1213
+#: pg_amcheck.c:1215
 #, 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"
 
-#: pg_amcheck.c:1214
+#: pg_amcheck.c:1216
 #, c-format
 msgid "  -p, --port=PORT                 database server port\n"
 msgstr "  -p, --port=PUERTO               puerto del servidor de base de datos\n"
 
-#: pg_amcheck.c:1215
+#: pg_amcheck.c:1217
 #, c-format
 msgid "  -U, --username=USERNAME         user name to connect as\n"
 msgstr "  -U, --username=USUARIO          nombre de usuario para la conexión\n"
 
-#: pg_amcheck.c:1216
+#: pg_amcheck.c:1218
 #, c-format
 msgid "  -w, --no-password               never prompt for password\n"
 msgstr "  -w, --no-password               nunca pedir contraseña\n"
 
-#: pg_amcheck.c:1217
+#: pg_amcheck.c:1219
 #, c-format
 msgid "  -W, --password                  force password prompt\n"
 msgstr "  -W, --password                  forzar la petición de contraseña\n"
 
-#: pg_amcheck.c:1218
+#: pg_amcheck.c:1220
 #, c-format
 msgid "      --maintenance-db=DBNAME     alternate maintenance database\n"
 msgstr "      --maintenance-db=BASE       base de datos de mantención alternativa\n"
 
-#: pg_amcheck.c:1219
+#: pg_amcheck.c:1221
 #, c-format
 msgid ""
 "\n"
@@ -550,42 +550,42 @@ msgstr ""
 "\n"
 "Otras opciones:\n"
 
-#: pg_amcheck.c:1220
+#: pg_amcheck.c:1222
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
 msgstr "  -e, --echo                      mostrar las órdenes enviadas al servidor\n"
 
-#: pg_amcheck.c:1221
+#: pg_amcheck.c:1223
 #, c-format
 msgid "  -j, --jobs=NUM                  use this many concurrent connections to the server\n"
 msgstr "  -j, --jobs=NUM                  usar esta cantidad de conexiones concurrentes hacia el servidor\n"
 
-#: pg_amcheck.c:1222
+#: pg_amcheck.c:1224
 #, c-format
 msgid "  -P, --progress                  show progress information\n"
 msgstr "  -P, --progress                  mostrar información de progreso\n"
 
-#: pg_amcheck.c:1223
+#: pg_amcheck.c:1225
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   desplegar varios mensajes informativos\n"
 
-#: pg_amcheck.c:1224
+#: pg_amcheck.c:1226
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   mostrar información de versión y salir\n"
 
-#: pg_amcheck.c:1225
+#: pg_amcheck.c:1227
 #, c-format
 msgid "      --install-missing           install missing extensions\n"
 msgstr "      --install-missing           instalar extensiones faltantes\n"
 
-#: pg_amcheck.c:1226
+#: pg_amcheck.c:1228
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      mostrar esta ayuda y salir\n"
 
-#: pg_amcheck.c:1228
+#: pg_amcheck.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -594,52 +594,52 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_amcheck.c:1229
+#: pg_amcheck.c:1231
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_amcheck.c:1282
+#: pg_amcheck.c:1284
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%) %*s"
 msgstr "%*s/%s relaciones (%d%%), %*s/%s páginas (%d%%) %*s"
 
-#: pg_amcheck.c:1293
+#: pg_amcheck.c:1295
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%) (%s%-*.*s)"
 msgstr "%*s/%s relaciones (%d%%), %*s/%s páginas (%d%%), (%s%-*.*s)"
 
-#: pg_amcheck.c:1308
+#: pg_amcheck.c:1310
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%)"
 msgstr "%*s/%s relaciones (%d%%), %*s/%s páginas (%d%%)"
 
-#: pg_amcheck.c:1367 pg_amcheck.c:1400
+#: pg_amcheck.c:1369 pg_amcheck.c:1402
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
 
-#: pg_amcheck.c:1445
+#: pg_amcheck.c:1447
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "el nombre de relación no es válido (demasiados puntos): %s"
 
-#: pg_amcheck.c:1598 pg_amcheck.c:1737
+#: pg_amcheck.c:1600 pg_amcheck.c:1739
 #, c-format
 msgid "including database \"%s\""
 msgstr "incluyendo base de datos «%s»"
 
-#: pg_amcheck.c:1719
+#: pg_amcheck.c:1721
 #, c-format
 msgid "internal error: received unexpected database pattern_id %d"
 msgstr "error interno: se recibió pattern_id de base de datos inesperado (%d)"
 
-#: pg_amcheck.c:1721
+#: pg_amcheck.c:1723
 #, c-format
 msgid "no connectable databases to check matching \"%s\""
 msgstr "no hay bases de datos a las que se pueda conectar que coincidan con «%s»"
 
-#: pg_amcheck.c:2179
+#: pg_amcheck.c:2196
 #, c-format
 msgid "internal error: received unexpected relation pattern_id %d"
 msgstr "error interno: se recibió pattern_id de relación inesperado (%d)"
diff --git a/src/bin/pg_amcheck/po/ko.po b/src/bin/pg_amcheck/po/ko.po
index d5e78e4f22c..99f297084fb 100644
--- a/src/bin/pg_amcheck/po/ko.po
+++ b/src/bin/pg_amcheck/po/ko.po
@@ -221,7 +221,7 @@ msgstr "너무 많은 명령행 인자를 지정했습니다. (처음 \"%s\")"
 #: pg_amcheck.c:486
 #, c-format
 msgid "cannot specify a database name with --all"
-msgstr "데이터베이스 이름을 —all 와 같이 지정할 수 없습니다"
+msgstr "데이터베이스 이름을 --all 와 같이 지정할 수 없습니다"
 
 #: pg_amcheck.c:492
 #, c-format
@@ -371,65 +371,65 @@ msgstr ""
 #: pg_amcheck.c:1187
 #, c-format
 msgid "  -a, --all                       check all databases\n"
-msgstr "  -a, -—all                       모든 데이터베이스를 검사\n"
+msgstr "  -a, --all                       모든 데이터베이스를 검사\n"
 
 #: pg_amcheck.c:1188
 #, c-format
 msgid "  -d, --database=PATTERN          check matching database(s)\n"
-msgstr "  -d, -—database=PATTERN          일치하는 모든 데이터베이스를 검사\n"
+msgstr "  -d, --database=PATTERN          일치하는 모든 데이터베이스를 검사\n"
 
 #: pg_amcheck.c:1189
 #, c-format
 msgid "  -D, --exclude-database=PATTERN  do NOT check matching database(s)\n"
 msgstr ""
-"  -D, -—exclude-database=PATTERN  일치하는 데이터베이스를 제외 하고 검사\n"
+"  -D, --exclude-database=PATTERN  일치하는 데이터베이스를 제외 하고 검사\n"
 
 #: pg_amcheck.c:1190
 #, c-format
 msgid "  -i, --index=PATTERN             check matching index(es)\n"
-msgstr "  -i, -—index=PATTERN             일치하는 인덱스를 검사\n"
+msgstr "  -i, --index=PATTERN             일치하는 인덱스를 검사\n"
 
 #: pg_amcheck.c:1191
 #, c-format
 msgid "  -I, --exclude-index=PATTERN     do NOT check matching index(es)\n"
-msgstr "  -I, -—exclude-index=PATTERN     일치하는 인덱스를 제외하고 검사\n"
+msgstr "  -I, --exclude-index=PATTERN     일치하는 인덱스를 제외하고 검사\n"
 
 #: pg_amcheck.c:1192
 #, c-format
 msgid "  -r, --relation=PATTERN          check matching relation(s)\n"
-msgstr "  -r, -—relation=PATTERN          일치하는 릴레이션을 검사\n"
+msgstr "  -r, --relation=PATTERN          일치하는 릴레이션을 검사\n"
 
 #: pg_amcheck.c:1193
 #, c-format
 msgid "  -R, --exclude-relation=PATTERN  do NOT check matching relation(s)\n"
-msgstr "  -R, -—exclude-relation=PATTERN  일치하는 릴레이션을 제외하고 검사\n"
+msgstr "  -R, --exclude-relation=PATTERN  일치하는 릴레이션을 제외하고 검사\n"
 
 #: pg_amcheck.c:1194
 #, c-format
 msgid "  -s, --schema=PATTERN            check matching schema(s)\n"
-msgstr "  -s, -—schema=PATTERN            일치하는 스키마를 검사\n"
+msgstr "  -s, --schema=PATTERN            일치하는 스키마를 검사\n"
 
 #: pg_amcheck.c:1195
 #, c-format
 msgid "  -S, --exclude-schema=PATTERN    do NOT check matching schema(s)\n"
-msgstr "  -S, -—exclude-schema=PATTERN    일치하는 스키마를 제외하고 검사\n"
+msgstr "  -S, --exclude-schema=PATTERN    일치하는 스키마를 제외하고 검사\n"
 
 #: pg_amcheck.c:1196
 #, c-format
 msgid "  -t, --table=PATTERN             check matching table(s)\n"
-msgstr "  -t, -—table=PATTERN             일치하는 테이블을 검사\n"
+msgstr "  -t, --table=PATTERN             일치하는 테이블을 검사\n"
 
 #: pg_amcheck.c:1197
 #, c-format
 msgid "  -T, --exclude-table=PATTERN     do NOT check matching table(s)\n"
-msgstr "  -T, -—exclude-table=PATTERN     일치하는 테이블을 제외하고 검사\n"
+msgstr "  -T, --exclude-table=PATTERN     일치하는 테이블을 제외하고 검사\n"
 
 #: pg_amcheck.c:1198
 #, c-format
 msgid ""
 "      --no-dependent-indexes      do NOT expand list of relations to include "
 "indexes\n"
-msgstr "      -—no-dependent-indexes      릴레이션에 인덱스를 포함하지 않음 \n"
+msgstr "      --no-dependent-indexes      릴레이션에 인덱스를 포함하지 않음 \n"
 
 #: pg_amcheck.c:1199
 #, c-format
@@ -437,14 +437,14 @@ msgid ""
 "      --no-dependent-toast        do NOT expand list of relations to include "
 "TOAST tables\n"
 msgstr ""
-"      -—no-dependent-toast        릴레이션에 TOAST 테이블을 포함하지 않음\n"
+"      --no-dependent-toast        릴레이션에 TOAST 테이블을 포함하지 않음\n"
 
 #: pg_amcheck.c:1200
 #, c-format
 msgid ""
 "      --no-strict-names           do NOT require patterns to match objects\n"
 msgstr ""
-"      -—no-strict-names           개체가 패턴과 일치하지 않아도 허용함\n"
+"      --no-strict-names           개체가 패턴과 일치하지 않아도 허용함\n"
 
 #: pg_amcheck.c:1201
 #, c-format
@@ -459,14 +459,14 @@ msgstr ""
 #, c-format
 msgid ""
 "      --exclude-toast-pointers    do NOT follow relation TOAST pointers\n"
-msgstr "      -—exclude-toast-pointers    TOAST 포인터를 확인하지 않음\n"
+msgstr "      --exclude-toast-pointers    TOAST 포인터를 확인하지 않음\n"
 
 #: pg_amcheck.c:1203
 #, c-format
 msgid ""
 "      --on-error-stop             stop checking at end of first corrupt "
 "page\n"
-msgstr "      -—on-error-stop             손상된 페이지 끝에서 검사를 멈춤\n"
+msgstr "      --on-error-stop             손상된 페이지 끝에서 검사를 멈춤\n"
 
 #: pg_amcheck.c:1204
 #, c-format
@@ -474,7 +474,7 @@ msgid ""
 "      --skip=OPTION               do NOT check \"all-frozen\" or \"all-"
 "visible\" blocks\n"
 msgstr ""
-"      -—skip=OPTION               \"all-frozen\" 또는 \"all-visible\" 블록을 "
+"      --skip=OPTION               \"all-frozen\" 또는 \"all-visible\" 블록을 "
 "검사하지 않음\n"
 
 #: pg_amcheck.c:1205
@@ -483,7 +483,7 @@ msgid ""
 "      --startblock=BLOCK          begin checking table(s) at the given block "
 "number\n"
 msgstr ""
-"      -—startblock=BLOCK          지정된 블록 번호부터 테이블 검사를 시작\n"
+"      --startblock=BLOCK          지정된 블록 번호부터 테이블 검사를 시작\n"
 
 #: pg_amcheck.c:1206
 #, c-format
@@ -491,7 +491,7 @@ msgid ""
 "      --endblock=BLOCK            check table(s) only up to the given block "
 "number\n"
 msgstr ""
-"      -—endblock=BLOCK            지정된 블록 번호까지 테이블 검사 마침\n"
+"      --endblock=BLOCK            지정된 블록 번호까지 테이블 검사 마침\n"
 
 #: pg_amcheck.c:1207
 #, c-format
@@ -516,19 +516,19 @@ msgid ""
 "      --heapallindexed            check that all heap tuples are found "
 "within indexes\n"
 msgstr ""
-"      -—heapallindexed            모든 heap 튜플이 인덱스 내에 있는지 검사\n"
+"      --heapallindexed            모든 heap 튜플이 인덱스 내에 있는지 검사\n"
 
 #: pg_amcheck.c:1210
 #, c-format
 msgid ""
 "      --parent-check              check index parent/child relationships\n"
-msgstr "      -—parent-check              인덱스의 부모/자식 관계를 검사\n"
+msgstr "      --parent-check              인덱스의 부모/자식 관계를 검사\n"
 
 #: pg_amcheck.c:1211
 #, c-format
 msgid ""
 "      --rootdescend               search from root page to refind tuples\n"
-msgstr "      —-rootdescend               루트 페이지 부터 튜플을 다시 찾음 \n"
+msgstr "      --rootdescend               루트 페이지 부터 튜플을 다시 찾음 \n"
 
 #: pg_amcheck.c:1212
 #, c-format
@@ -544,33 +544,33 @@ msgstr ""
 msgid ""
 "  -h, --host=HOSTNAME             database server host or socket directory\n"
 msgstr ""
-"  -h, -—host=HOSTNAME             데이터베이스 서버 호스트 또는 소켓의 디렉터"
+"  -h, --host=HOSTNAME             데이터베이스 서버 호스트 또는 소켓의 디렉터"
 "리\n"
 
 #: pg_amcheck.c:1214
 #, c-format
 msgid "  -p, --port=PORT                 database server port\n"
-msgstr "  -p, -—port=PORT                 데이터베이스 서버 포트\n"
+msgstr "  -p, --port=PORT                 데이터베이스 서버 포트\n"
 
 #: pg_amcheck.c:1215
 #, c-format
 msgid "  -U, --username=USERNAME         user name to connect as\n"
-msgstr "  -U, -—username=USERNAME         연결할 유저 이름\n"
+msgstr "  -U, --username=USERNAME         연결할 유저 이름\n"
 
 #: pg_amcheck.c:1216
 #, c-format
 msgid "  -w, --no-password               never prompt for password\n"
-msgstr "  -w, -—no-password               암호 입력 프롬프트가 나타나지 않음\n"
+msgstr "  -w, --no-password               암호 입력 프롬프트가 나타나지 않음\n"
 
 #: pg_amcheck.c:1217
 #, c-format
 msgid "  -W, --password                  force password prompt\n"
-msgstr "  -W, -—password                  암호 입력 프롬프트가 나타남\n"
+msgstr "  -W, --password                  암호 입력 프롬프트가 나타남\n"
 
 #: pg_amcheck.c:1218
 #, c-format
 msgid "      --maintenance-db=DBNAME     alternate maintenance database\n"
-msgstr "      -—maintenance-db=DBNAME     대체 연결 데이터베이스\n"
+msgstr "      --maintenance-db=DBNAME     대체 연결 데이터베이스\n"
 
 #: pg_amcheck.c:1219
 #, c-format
@@ -593,12 +593,12 @@ msgstr "  -e, --echo                      서버로 보내는 명령들을 보
 msgid ""
 "  -j, --jobs=NUM                  use this many concurrent connections to "
 "the server\n"
-msgstr "  -j, -—jobs=NUM                  서버에 동시 연결할 수를 지정\n"
+msgstr "  -j, --jobs=NUM                  서버에 동시 연결할 수를 지정\n"
 
 #: pg_amcheck.c:1222
 #, c-format
 msgid "  -P, --progress                  show progress information\n"
-msgstr "  -P, -—progress                  진행 사항 정보를 보여줌\n"
+msgstr "  -P, --progress                  진행 사항 정보를 보여줌\n"
 
 #: pg_amcheck.c:1223
 #, c-format
@@ -614,7 +614,7 @@ msgstr "  -V, --version                   버전 정보를 보여주고 마침\n
 #: pg_amcheck.c:1225
 #, c-format
 msgid "      --install-missing           install missing extensions\n"
-msgstr "      -—install-missing           누락된 익스텐션을 설치\n"
+msgstr "      --install-missing           누락된 익스텐션을 설치\n"
 
 #: pg_amcheck.c:1226
 #, c-format
diff --git a/src/bin/pg_amcheck/po/ru.po b/src/bin/pg_amcheck/po/ru.po
index 0889dfb2f8e..4d7da795e2a 100644
--- a/src/bin/pg_amcheck/po/ru.po
+++ b/src/bin/pg_amcheck/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_amcheck (PostgreSQL) 14\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2024-09-05 08:23+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -43,44 +43,44 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -153,177 +153,177 @@ msgid "processing of database \"%s\" failed: %s"
 msgstr "ошибка при обработке базы \"%s\": %s"
 
 #: ../../fe_utils/query_utils.c:33 ../../fe_utils/query_utils.c:58
-#: pg_amcheck.c:1693 pg_amcheck.c:2138
+#: pg_amcheck.c:1695 pg_amcheck.c:2155
 #, c-format
 msgid "query failed: %s"
 msgstr "ошибка при выполнении запроса: %s"
 
 #: ../../fe_utils/query_utils.c:34 ../../fe_utils/query_utils.c:59
-#: pg_amcheck.c:578 pg_amcheck.c:1147 pg_amcheck.c:1694 pg_amcheck.c:2139
+#: pg_amcheck.c:579 pg_amcheck.c:1149 pg_amcheck.c:1696 pg_amcheck.c:2156
 #, c-format
 msgid "Query was: %s"
 msgstr "Выполнялся запрос: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
 
-#: pg_amcheck.c:403
+#: pg_amcheck.c:404
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "недопустимый аргумент параметра %s"
 
-#: pg_amcheck.c:409
+#: pg_amcheck.c:410
 #, c-format
 msgid "invalid start block"
 msgstr "неверный начальный блок"
 
-#: pg_amcheck.c:411
+#: pg_amcheck.c:412
 #, c-format
 msgid "start block out of bounds"
 msgstr "начальный блок вне допустимых пределов"
 
-#: pg_amcheck.c:418
+#: pg_amcheck.c:419
 #, c-format
 msgid "invalid end block"
 msgstr "неверный конечный блок"
 
-#: pg_amcheck.c:420
+#: pg_amcheck.c:421
 #, c-format
 msgid "end block out of bounds"
 msgstr "конечный блок вне допустимых пределов"
 
-#: pg_amcheck.c:446 pg_amcheck.c:468
+#: pg_amcheck.c:447 pg_amcheck.c:469
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_amcheck.c:452
+#: pg_amcheck.c:453
 #, c-format
 msgid "end block precedes start block"
 msgstr "конечный блок предшествует начальному"
 
-#: pg_amcheck.c:466
+#: pg_amcheck.c:467
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_amcheck.c:486
+#: pg_amcheck.c:487
 #, c-format
 msgid "cannot specify a database name with --all"
 msgstr "имя базы данных нельзя задавать с --all"
 
-#: pg_amcheck.c:492
+#: pg_amcheck.c:493
 #, c-format
 msgid "cannot specify both a database name and database patterns"
 msgstr "нельзя задавать одновременно имя базы данных и шаблоны имён"
 
-#: pg_amcheck.c:520
+#: pg_amcheck.c:521
 #, c-format
 msgid "no databases to check"
 msgstr "не указаны базы для проверки"
 
-#: pg_amcheck.c:576
+#: pg_amcheck.c:577
 #, c-format
 msgid "database \"%s\": %s"
 msgstr "база данных \"%s\": %s"
 
-#: pg_amcheck.c:587
+#: pg_amcheck.c:588
 #, c-format
 msgid "skipping database \"%s\": amcheck is not installed"
 msgstr "база \"%s\" пропускается: расширение amcheck не установлено"
 
-#: pg_amcheck.c:595
+#: pg_amcheck.c:597
 #, c-format
 msgid "in database \"%s\": using amcheck version \"%s\" in schema \"%s\""
 msgstr "база \"%s\": используется amcheck версии \"%s\" в схеме \"%s\""
 
-#: pg_amcheck.c:624
+#: pg_amcheck.c:626
 #, c-format
 msgid "option %s is not supported by amcheck version %s"
 msgstr "параметр %s не поддерживается версией amcheck %s"
 
-#: pg_amcheck.c:650
+#: pg_amcheck.c:652
 #, c-format
 msgid "no heap tables to check matching \"%s\""
 msgstr "не найдены подлежащие проверке базовые таблицы, соответствующие \"%s\""
 
-#: pg_amcheck.c:653
+#: pg_amcheck.c:655
 #, c-format
 msgid "no btree indexes to check matching \"%s\""
 msgstr "не найдены подлежащие проверке индексы btree, соответствующие \"%s\""
 
-#: pg_amcheck.c:656
+#: pg_amcheck.c:658
 #, c-format
 msgid "no relations to check in schemas matching \"%s\""
 msgstr ""
 "не найдены подлежащие проверке отношения в схемах, соответствующих \"%s\""
 
-#: pg_amcheck.c:659
+#: pg_amcheck.c:661
 #, c-format
 msgid "no relations to check matching \"%s\""
 msgstr "не найдены подлежащие проверке отношения, соответствующие \"%s\""
 
-#: pg_amcheck.c:687
+#: pg_amcheck.c:689
 #, c-format
 msgid "no relations to check"
 msgstr "не найдены отношения для проверки"
 
-#: pg_amcheck.c:770
+#: pg_amcheck.c:772
 #, c-format
 msgid "checking heap table \"%s.%s.%s\""
 msgstr "проверка базовой таблицы \"%s.%s.%s\""
 
-#: pg_amcheck.c:786
+#: pg_amcheck.c:788
 #, c-format
 msgid "checking btree index \"%s.%s.%s\""
 msgstr "проверка индекса btree \"%s.%s.%s\""
 
-#: pg_amcheck.c:937
+#: pg_amcheck.c:939
 #, c-format
 msgid "error sending command to database \"%s\": %s"
 msgstr "ошибка передачи команды базе \"%s\": %s"
 
-#: pg_amcheck.c:940
+#: pg_amcheck.c:942
 #, c-format
 msgid "Command was: %s"
 msgstr "Выполнялась команда: %s"
 
-#: pg_amcheck.c:1060
+#: pg_amcheck.c:1062
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s, offset %s, attribute %s:\n"
 msgstr "базовая таблица \"%s.%s.%s\", блок %s, смещение %s, атрибут %s:\n"
 
-#: pg_amcheck.c:1067
+#: pg_amcheck.c:1069
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s, offset %s:\n"
 msgstr "базовая таблица \"%s.%s.%s\", блок %s, смещение %s:\n"
 
-#: pg_amcheck.c:1073
+#: pg_amcheck.c:1075
 #, c-format
 msgid "heap table \"%s.%s.%s\", block %s:\n"
 msgstr "базовая таблица \"%s.%s.%s\", блок %s:\n"
 
-#: pg_amcheck.c:1078 pg_amcheck.c:1089
+#: pg_amcheck.c:1080 pg_amcheck.c:1091
 #, c-format
 msgid "heap table \"%s.%s.%s\":\n"
 msgstr "базовая таблица \"%s.%s.%s\":\n"
 
-#: pg_amcheck.c:1093 pg_amcheck.c:1162
+#: pg_amcheck.c:1095 pg_amcheck.c:1164
 #, c-format
 msgid "query was: %s\n"
 msgstr "запрос: %s\n"
 
-#: pg_amcheck.c:1144
+#: pg_amcheck.c:1146
 #, c-format
 msgid ""
 "btree index \"%s.%s.%s\": btree checking function returned unexpected number "
@@ -332,17 +332,17 @@ msgstr ""
 "индекс btree \"%s.%s.%s\": функция проверки btree выдала неожиданное "
 "количество строк: %d"
 
-#: pg_amcheck.c:1148
+#: pg_amcheck.c:1150
 #, c-format
 msgid "Are %s's and amcheck's versions compatible?"
 msgstr "Совместимы ли версии %s и amcheck?"
 
-#: pg_amcheck.c:1158
+#: pg_amcheck.c:1160
 #, c-format
 msgid "btree index \"%s.%s.%s\":\n"
 msgstr "индекс btree \"%s.%s.%s\":\n"
 
-#: pg_amcheck.c:1183
+#: pg_amcheck.c:1185
 #, c-format
 msgid ""
 "%s checks objects in a PostgreSQL database for corruption.\n"
@@ -351,17 +351,17 @@ msgstr ""
 "%s проверяет объекты в базе данных PostgreSQL на предмет повреждений.\n"
 "\n"
 
-#: pg_amcheck.c:1184
+#: pg_amcheck.c:1186
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_amcheck.c:1185
+#: pg_amcheck.c:1187
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [ПАРАМЕТР]... [ИМЯ_БД]\n"
 
-#: pg_amcheck.c:1186
+#: pg_amcheck.c:1188
 #, c-format
 msgid ""
 "\n"
@@ -370,77 +370,77 @@ msgstr ""
 "\n"
 "Параметры выбора объектов:\n"
 
-#: pg_amcheck.c:1187
+#: pg_amcheck.c:1189
 #, c-format
 msgid "  -a, --all                       check all databases\n"
 msgstr "  -a, --all                       проверить все базы\n"
 
-#: pg_amcheck.c:1188
+#: pg_amcheck.c:1190
 #, c-format
 msgid "  -d, --database=PATTERN          check matching database(s)\n"
 msgstr ""
 "  -d, --database=ШАБЛОН           проверить соответствующие шаблону базы\n"
 
-#: pg_amcheck.c:1189
+#: pg_amcheck.c:1191
 #, c-format
 msgid "  -D, --exclude-database=PATTERN  do NOT check matching database(s)\n"
 msgstr ""
 "  -D, --exclude-database=ШАБЛОН   не проверять соответствующие шаблону базы\n"
 
-#: pg_amcheck.c:1190
+#: pg_amcheck.c:1192
 #, c-format
 msgid "  -i, --index=PATTERN             check matching index(es)\n"
 msgstr ""
 "  -i, --index=ШАБЛОН              проверить соответствующие шаблону индексы\n"
 
-#: pg_amcheck.c:1191
+#: pg_amcheck.c:1193
 #, c-format
 msgid "  -I, --exclude-index=PATTERN     do NOT check matching index(es)\n"
 msgstr ""
 "  -I, --exclude-index=ШАБЛОН      не проверять соответствующие шаблону "
 "индексы\n"
 
-#: pg_amcheck.c:1192
+#: pg_amcheck.c:1194
 #, c-format
 msgid "  -r, --relation=PATTERN          check matching relation(s)\n"
 msgstr ""
 "  -r, --relation=ШАБЛОН           проверить соответствующие шаблону "
 "отношения\n"
 
-#: pg_amcheck.c:1193
+#: pg_amcheck.c:1195
 #, c-format
 msgid "  -R, --exclude-relation=PATTERN  do NOT check matching relation(s)\n"
 msgstr ""
 "  -R, --exclude-relation=ШАБЛОН   не проверять соответствующие шаблону "
 "отношения\n"
 
-#: pg_amcheck.c:1194
+#: pg_amcheck.c:1196
 #, c-format
 msgid "  -s, --schema=PATTERN            check matching schema(s)\n"
 msgstr ""
 "  -s, --schema=ШАБЛОН             проверить соответствующие шаблону схемы\n"
 
-#: pg_amcheck.c:1195
+#: pg_amcheck.c:1197
 #, c-format
 msgid "  -S, --exclude-schema=PATTERN    do NOT check matching schema(s)\n"
 msgstr ""
 "  -S, --exclude-schema=ШАБЛОН     не проверять соответствующие шаблону "
 "схемы\n"
 
-#: pg_amcheck.c:1196
+#: pg_amcheck.c:1198
 #, c-format
 msgid "  -t, --table=PATTERN             check matching table(s)\n"
 msgstr ""
 "  -t, --table=ШАБЛОН              проверить соответствующие шаблону таблицы\n"
 
-#: pg_amcheck.c:1197
+#: pg_amcheck.c:1199
 #, c-format
 msgid "  -T, --exclude-table=PATTERN     do NOT check matching table(s)\n"
 msgstr ""
 "  -T, --exclude-table=ШАБЛОН      не проверять соответствующие шаблону "
 "таблицы\n"
 
-#: pg_amcheck.c:1198
+#: pg_amcheck.c:1200
 #, c-format
 msgid ""
 "      --no-dependent-indexes      do NOT expand list of relations to include "
@@ -449,7 +449,7 @@ msgstr ""
 "      --no-dependent-indexes      не включать в список проверяемых отношений "
 "индексы\n"
 
-#: pg_amcheck.c:1199
+#: pg_amcheck.c:1201
 #, c-format
 msgid ""
 "      --no-dependent-toast        do NOT expand list of relations to include "
@@ -458,7 +458,7 @@ msgstr ""
 "      --no-dependent-toast        не включать в список проверяемых отношений "
 "TOAST-таблицы\n"
 
-#: pg_amcheck.c:1200
+#: pg_amcheck.c:1202
 #, c-format
 msgid ""
 "      --no-strict-names           do NOT require patterns to match objects\n"
@@ -466,7 +466,7 @@ msgstr ""
 "      --no-strict-names           не требовать наличия объектов, "
 "соответствующих шаблонам\n"
 
-#: pg_amcheck.c:1201
+#: pg_amcheck.c:1203
 #, c-format
 msgid ""
 "\n"
@@ -475,14 +475,14 @@ msgstr ""
 "\n"
 "Параметры проверки таблиц:\n"
 
-#: pg_amcheck.c:1202
+#: pg_amcheck.c:1204
 #, c-format
 msgid ""
 "      --exclude-toast-pointers    do NOT follow relation TOAST pointers\n"
 msgstr ""
 "      --exclude-toast-pointers    не переходить по указателям в TOAST\n"
 
-#: pg_amcheck.c:1203
+#: pg_amcheck.c:1205
 #, c-format
 msgid ""
 "      --on-error-stop             stop checking at end of first corrupt "
@@ -491,7 +491,7 @@ msgstr ""
 "      --on-error-stop             прекратить проверку по достижении конца "
 "первой повреждённой страницы\n"
 
-#: pg_amcheck.c:1204
+#: pg_amcheck.c:1206
 #, c-format
 msgid ""
 "      --skip=OPTION               do NOT check \"all-frozen\" or \"all-"
@@ -500,7 +500,7 @@ msgstr ""
 "      --skip=ТИП_БЛОКА            не проверять блоки типа \"all-frozen\" или "
 "\"all-visible\"\n"
 
-#: pg_amcheck.c:1205
+#: pg_amcheck.c:1207
 #, c-format
 msgid ""
 "      --startblock=BLOCK          begin checking table(s) at the given block "
@@ -510,7 +510,7 @@ msgstr ""
 "заданным номером\n"
 
 # skip-rule: no-space-before-parentheses
-#: pg_amcheck.c:1206
+#: pg_amcheck.c:1208
 #, c-format
 msgid ""
 "      --endblock=BLOCK            check table(s) only up to the given block "
@@ -519,7 +519,7 @@ msgstr ""
 "      --endblock=БЛОК             проверить таблицы(у) до блока с заданным "
 "номером\n"
 
-#: pg_amcheck.c:1207
+#: pg_amcheck.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -528,7 +528,7 @@ msgstr ""
 "\n"
 "Параметры проверки индексов-B-деревьев:\n"
 
-#: pg_amcheck.c:1208
+#: pg_amcheck.c:1210
 #, c-format
 msgid ""
 "      --checkunique               check unique constraint if index is "
@@ -537,7 +537,7 @@ msgstr ""
 "      --checkunique               проверить ограничение уникальности для "
 "уникальных индексов\n"
 
-#: pg_amcheck.c:1209
+#: pg_amcheck.c:1211
 #, c-format
 msgid ""
 "      --heapallindexed            check that all heap tuples are found "
@@ -546,7 +546,7 @@ msgstr ""
 "      --heapallindexed            проверить, что всем кортежам кучи "
 "находится соответствие в индексах\n"
 
-#: pg_amcheck.c:1210
+#: pg_amcheck.c:1212
 #, c-format
 msgid ""
 "      --parent-check              check index parent/child relationships\n"
@@ -554,7 +554,7 @@ msgstr ""
 "      --parent-check              проверить связи родитель/потомок в "
 "индексах\n"
 
-#: pg_amcheck.c:1211
+#: pg_amcheck.c:1213
 #, c-format
 msgid ""
 "      --rootdescend               search from root page to refind tuples\n"
@@ -562,7 +562,7 @@ msgstr ""
 "      --rootdescend               перепроверять поиск кортежей от корневой "
 "страницы\n"
 
-#: pg_amcheck.c:1212
+#: pg_amcheck.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -571,7 +571,7 @@ msgstr ""
 "\n"
 "Параметры подключения:\n"
 
-#: pg_amcheck.c:1213
+#: pg_amcheck.c:1215
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME             database server host or socket directory\n"
@@ -579,34 +579,34 @@ msgstr ""
 "  -h, --host=ИМЯ                  компьютер с сервером баз данных или "
 "каталог сокетов\n"
 
-#: pg_amcheck.c:1214
+#: pg_amcheck.c:1216
 #, c-format
 msgid "  -p, --port=PORT                 database server port\n"
 msgstr "  -p, --port=ПОРТ                 порт сервера баз данных\n"
 
-#: pg_amcheck.c:1215
+#: pg_amcheck.c:1217
 #, c-format
 msgid "  -U, --username=USERNAME         user name to connect as\n"
 msgstr ""
 "  -U, --username=ИМЯ              имя пользователя для подключения к "
 "серверу\n"
 
-#: pg_amcheck.c:1216
+#: pg_amcheck.c:1218
 #, c-format
 msgid "  -w, --no-password               never prompt for password\n"
 msgstr "  -w, --no-password               не запрашивать пароль\n"
 
-#: pg_amcheck.c:1217
+#: pg_amcheck.c:1219
 #, c-format
 msgid "  -W, --password                  force password prompt\n"
 msgstr "  -W, --password                  запросить пароль\n"
 
-#: pg_amcheck.c:1218
+#: pg_amcheck.c:1220
 #, c-format
 msgid "      --maintenance-db=DBNAME     alternate maintenance database\n"
 msgstr "      --maintenance-db=ИМЯ_БД     другая опорная база данных\n"
 
-#: pg_amcheck.c:1219
+#: pg_amcheck.c:1221
 #, c-format
 msgid ""
 "\n"
@@ -615,7 +615,7 @@ msgstr ""
 "\n"
 "Другие параметры:\n"
 
-#: pg_amcheck.c:1220
+#: pg_amcheck.c:1222
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
@@ -623,7 +623,7 @@ msgid ""
 msgstr ""
 "  -e, --echo                      отображать команды, отправляемые серверу\n"
 
-#: pg_amcheck.c:1221
+#: pg_amcheck.c:1223
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                  use this many concurrent connections to "
@@ -632,33 +632,33 @@ msgstr ""
 "  -j, --jobs=ЧИСЛО                устанавливать заданное число подключений к "
 "серверу\n"
 
-#: pg_amcheck.c:1222
+#: pg_amcheck.c:1224
 #, c-format
 msgid "  -P, --progress                  show progress information\n"
 msgstr "  -P, --progress                  показывать прогресс операции\n"
 
-#: pg_amcheck.c:1223
+#: pg_amcheck.c:1225
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   выводить исчерпывающие сообщения\n"
 
-#: pg_amcheck.c:1224
+#: pg_amcheck.c:1226
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   показать версию и выйти\n"
 
-#: pg_amcheck.c:1225
+#: pg_amcheck.c:1227
 #, c-format
 msgid "      --install-missing           install missing extensions\n"
 msgstr "      --install-missing           установить недостающие расширения\n"
 
-#: pg_amcheck.c:1226
+#: pg_amcheck.c:1228
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показать эту справку и выйти\n"
 
-#: pg_amcheck.c:1228
+#: pg_amcheck.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -667,53 +667,53 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_amcheck.c:1229
+#: pg_amcheck.c:1231
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_amcheck.c:1282
+#: pg_amcheck.c:1284
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%) %*s"
 msgstr "отношений: %*s/%s (%d%%), страниц: %*s/%s (%d%%) %*s"
 
-#: pg_amcheck.c:1293
+#: pg_amcheck.c:1295
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%) (%s%-*.*s)"
 msgstr "отношений: %*s/%s (%d%%), страниц: %*s/%s (%d%%) (%s%-*.*s)"
 
-#: pg_amcheck.c:1308
+#: pg_amcheck.c:1310
 #, c-format
 msgid "%*s/%s relations (%d%%), %*s/%s pages (%d%%)"
 msgstr "отношений: %*s/%s (%d%%), страниц: %*s/%s (%d%%)"
 
-#: pg_amcheck.c:1367 pg_amcheck.c:1400
+#: pg_amcheck.c:1369 pg_amcheck.c:1402
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное имя (слишком много компонентов): %s"
 
-#: pg_amcheck.c:1445
+#: pg_amcheck.c:1447
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "неверное имя отношения (слишком много компонентов): %s"
 
-#: pg_amcheck.c:1598 pg_amcheck.c:1737
+#: pg_amcheck.c:1600 pg_amcheck.c:1739
 #, c-format
 msgid "including database \"%s\""
 msgstr "выбирается база \"%s\""
 
-#: pg_amcheck.c:1719
+#: pg_amcheck.c:1721
 #, c-format
 msgid "internal error: received unexpected database pattern_id %d"
 msgstr "внутренняя ошибка: получен неожиданный идентификатор шаблона базы %d"
 
-#: pg_amcheck.c:1721
+#: pg_amcheck.c:1723
 #, c-format
 msgid "no connectable databases to check matching \"%s\""
 msgstr ""
 "не найдены подлежащие проверке доступные базы, соответствующие шаблону \"%s\""
 
-#: pg_amcheck.c:2179
+#: pg_amcheck.c:2196
 #, c-format
 msgid "internal error: received unexpected relation pattern_id %d"
 msgstr ""
diff --git a/src/bin/pg_amcheck/po/sv.po b/src/bin/pg_amcheck/po/sv.po
index 6db26dc7376..338942bbc91 100644
--- a/src/bin/pg_amcheck/po/sv.po
+++ b/src/bin/pg_amcheck/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-08-27 15:52+0000\n"
-"PO-Revision-Date: 2024-08-27 18:29+0200\n"
+"PO-Revision-Date: 2025-07-29 19:45+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/bin/pg_amcheck/t/002_nonesuch.pl b/src/bin/pg_amcheck/t/002_nonesuch.pl
index f2b0ee97b28..e3130bcd0f4 100644
--- a/src/bin/pg_amcheck/t/002_nonesuch.pl
+++ b/src/bin/pg_amcheck/t/002_nonesuch.pl
@@ -1,5 +1,5 @@
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 use strict;
diff --git a/src/bin/pg_archivecleanup/po/es.po b/src/bin/pg_archivecleanup/po/es.po
index bac039fa053..e07e3b2ca98 100644
--- a/src/bin/pg_archivecleanup/po/es.po
+++ b/src/bin/pg_archivecleanup/po/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_archivecleanup (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:52+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:21+0000\n"
+"PO-Revision-Date: 2025-11-08 18:41+0100\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: BlackCAT 1.0\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -49,43 +49,43 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "ubicación de archivador «%s» no existe"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "no se pudo abrir la ubicación del archivador «%s»: %m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo «%s»: %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "no se pudo leer la ubicación del archivador «%s»: %m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "no se pudo cerrar la ubicación del archivador «%s»: %m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "el nombre de archivo usado como argumento no es válido"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid ""
 "%s removes older WAL files from PostgreSQL archives.\n"
@@ -94,17 +94,17 @@ msgstr ""
 "%s elimina archivos de WAL antiguos del archivador de PostgreSQL.\n"
 "\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
-msgstr "  %s [OPCIÓN].... UBICACIÓNARCHIVADOR WALMÁSANTIGUOAMANTENER\n"
+msgstr "  %s [OPCIÓN].... UBICACIÓN_ARCHIVADOR WAL_MÁS_ANTIGUO_A_MANTENER\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid ""
 "\n"
@@ -113,58 +113,58 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid "  -b, --clean-backup-history  clean up files including backup history files\n"
-msgstr "  -, --clean-backup-history   limpia archivos incluyendo archivos de historia de backup\n"
+msgstr "  -b, --clean-backup-history  limpia archivos incluyendo archivos de historia de backup\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
-msgstr "  -d, --debug    genera salida de depuración (modo verboso)\n"
+msgstr "  -d, --debug                 genera salida de depuración (modo verboso)\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid ""
 "  -n, --dry-run               dry run, show the names of the files that would be\n"
 "                              removed\n"
-msgstr "  -n, --dry-run  simulacro, muestra el nombre de los archivos que se eliminarían\n"
+msgstr "  -n, --dry-run               simulacro, muestra el nombre de los archivos que se eliminarían\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               mostrar la información de la versión, luego salir\n"
 
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid ""
 "  -x, --strip-extension=EXT   strip this extension before identifying files for\n"
 "                              clean up\n"
 msgstr ""
-"  -x, --strip-extension=EXT    quitar esta extensión antes de identificar archivos\n"
-"                               a limpiar\n"
+"  -x, --strip-extension=EXT   quitar esta extensión antes de identificar archivos\n"
+"                              a limpiar\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  muestra esta ayuda, luego salir\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid ""
 "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr ""
 "\n"
-"Para usar como archive_cleanup_command en postgresql.conf:\n"
-"  archive_cleanup_command = 'pg_archivecleanup [OPCIÓN]... UBICACIÓNARCHIVADOR %%r'\n"
+"Para usar como «archive_cleanup_command» en postgresql.conf:\n"
+"  archive_cleanup_command = 'pg_archivecleanup [OPCIÓN]... UBICACIÓN_ARCHIVADOR %%r'\n"
 "por ej.\n"
-"  archive_cleanup_command = 'pg_archivecleanup /mnt/servidor/directorioarchivador %%r'\n"
+"  archive_cleanup_command = 'pg_archivecleanup /mnt/servidor/dir_archivador %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid ""
 "\n"
@@ -177,7 +177,7 @@ msgstr ""
 "por ej.\n"
 "  pg_archivecleanup /mnt/servidor/directorioarchivador 000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid ""
 "\n"
@@ -186,22 +186,22 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "debe especificar la ubicación del archivador"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "debe especificar el fichero WAL más antiguo a mantener"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "demasiados argumentos de línea de órdenes"
diff --git a/src/bin/pg_archivecleanup/po/fr.po b/src/bin/pg_archivecleanup/po/fr.po
index 392e6e64d5f..aff04b1a27c 100644
--- a/src/bin/pg_archivecleanup/po/fr.po
+++ b/src/bin/pg_archivecleanup/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-20 21:23+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-07 18:53+0000\n"
+"PO-Revision-Date: 2025-07-07 21:39+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
@@ -52,43 +52,43 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "l'emplacement d'archivage « %s » n'existe pas"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "n'a pas pu ouvrir l'emplacement de l'archive « %s » : %m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "n'a pas pu supprimer le fichier « %s » : %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "n'a pas pu lire l'emplacement de l'archive « %s » : %m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "n'a pas pu fermer l'emplacement de l'archive « %s » : %m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "argument du nom de fichier invalide"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid ""
 "%s removes older WAL files from PostgreSQL archives.\n"
@@ -97,17 +97,17 @@ msgstr ""
 "%s supprime les anciens fichiers WAL des archives de PostgreSQL.\n"
 "\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
 msgstr "  %s [OPTION]... EMPLACEMENTARCHIVE PLUSANCIENFICHIERWALCONSERVÉ\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid ""
 "\n"
@@ -116,56 +116,56 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid "  -b, --clean-backup-history  clean up files including backup history files\n"
 msgstr "  -b, --clean-backup-history  nettoie les fichiers, y compris les historiques de sauvegarde\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
 msgstr "  -d, --debug                 affiche des informations de débogage (mode verbeux)\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid ""
 "  -n, --dry-run               dry run, show the names of the files that would be\n"
 "                              removed\n"
 msgstr "  -n, --dry-run               test, affiche le nom des fichiers qui seraient supprimés\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               affiche la version, puis quitte\n"
 
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid ""
 "  -x, --strip-extension=EXT   strip this extension before identifying files for\n"
 "                              clean up\n"
 msgstr "  -x, --strip-extension=EXT   supprime cette extension avant d'identifier les fichiers pour nettoyage\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  affiche cette aide, puis quitte\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid ""
 "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr ""
 "\n"
-"Pour utiliser comme archive_cleanup_command dans postgresql.conf :\n"
+"Pour utiliser comme « archive_cleanup_command » dans postgresql.conf :\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... EMPLACEMENTARCHIVE %%r'\n"
 "Par exemple :\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/serveur/reparchives %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid ""
 "\n"
@@ -178,7 +178,7 @@ msgstr ""
 "Par exemple :\n"
 "  pg_archivecleanup /mnt/serveur/reparchives 000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid ""
 "\n"
@@ -187,22 +187,22 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "doit spécifier l'emplacement de l'archive"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "doit spécifier le plus ancien journal de transactions conservé"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "trop d'arguments en ligne de commande"
diff --git a/src/bin/pg_archivecleanup/po/ko.po b/src/bin/pg_archivecleanup/po/ko.po
index 79fea6d7cf4..28a31abe5f0 100644
--- a/src/bin/pg_archivecleanup/po/ko.po
+++ b/src/bin/pg_archivecleanup/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_archivecleanup (PostgreSQL) 17\n"
+"Project-Id-Version: pg_archivecleanup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:52+0000\n"
-"PO-Revision-Date: 2025-01-16 13:10+0900\n"
+"POT-Creation-Date: 2025-09-11 21:52+0000\n"
+"PO-Revision-Date: 2025-09-09 12:51+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -48,43 +48,43 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "널 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "\"%s\" 이름의 아카이브 위치가 없음"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "\"%s\" 아카이브 위치를 열 수 없음: %m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "\"%s\" 파일을 삭제할 수 없음: %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "\"%s\" 아카이브 위치를 읽을 수 없음: %m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "\"%s\" 아카이브 위치를 닫을 수 없음: %m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "잘못된 파일 이름 매개변수"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid ""
 "%s removes older WAL files from PostgreSQL archives.\n"
@@ -94,17 +94,17 @@ msgstr ""
 "WAL 파일을 지웁니다.\n"
 "\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
 msgstr "  %s [옵션]... 아카이브위치 보관할제일오래된파일\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid ""
 "\n"
@@ -113,18 +113,18 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid ""
 "  -b, --clean-backup-history  clean up files including backup history files\n"
 msgstr "  -b, --clean-backup-history  백업 내역 파일을 포함해서 파일들 지움\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
 msgstr "  -d, --debug                 보다 자세한 작업 내용 출력\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid ""
 "  -n, --dry-run               dry run, show the names of the files that "
@@ -132,12 +132,12 @@ msgid ""
 "                              removed\n"
 msgstr "  -n, --dry-run               지울 대상만 확인하고 지우지는 않음\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               버전 정보를 보여주고 마침\n"
 
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid ""
 "  -x, --strip-extension=EXT   strip this extension before identifying files "
@@ -146,28 +146,28 @@ msgid ""
 msgstr ""
 "  -x, --strip-extension=EXT   지울 파일을 식별하기 전에 해당 확장 모듈 지움\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  이 도움말을 보여주고 마침\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid ""
 "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION "
 "%%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr ""
 "\n"
-"postgresql.conf 파일에서 archive_cleanup_command 설정 방법:\n"
+"postgresql.conf 파일에서 \"archive_cleanup_command\" 설정 방법:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [옵션]... 아카이브위치 %%r'\n"
 "사용예:\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid ""
 "\n"
@@ -182,7 +182,7 @@ msgstr ""
 "  pg_archivecleanup /mnt/server/archiverdir "
 "000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid ""
 "\n"
@@ -191,26 +191,25 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "아카이브 위치는 지정해야 함"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "남길 가장 오래된 WAL 파일은 지정해야 함"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "너무 많은 명령행 인자를 지정했음"
 
-#, c-format
 #~ msgid "  -x EXT         clean up files if they have this extension\n"
 #~ msgstr "  -x EXT         해당 확장자 파일들을 작업 대상으로 함\n"
diff --git a/src/bin/pg_archivecleanup/po/ru.po b/src/bin/pg_archivecleanup/po/ru.po
index e04456d67d3..ccefe2163c4 100644
--- a/src/bin/pg_archivecleanup/po/ru.po
+++ b/src/bin/pg_archivecleanup/po/ru.po
@@ -1,13 +1,13 @@
 # Russian message translation file for pg_archivecleanup
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <a.lakhin@postgrespro.ru>, 2017, 2019, 2020, 2022, 2024.
+# SPDX-FileCopyrightText: 2017, 2019, 2020, 2022, 2024, 2025 Alexander Lakhin <a.lakhin@postgrespro.ru>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_archivecleanup (PostgreSQL) 10\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
-"PO-Revision-Date: 2024-09-07 06:17+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 21:08+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,22 +17,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -48,43 +48,43 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "расположение архива \"%s\" не существует"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "не удалось открыть расположение архива \"%s\": %m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "не удалось стереть файл \"%s\": %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "не удалось прочитать расположение архива \"%s\": %m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "не удалось закрыть расположение архива \"%s\": %m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "неверный аргумент с именем файла"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid ""
 "%s removes older WAL files from PostgreSQL archives.\n"
@@ -93,18 +93,18 @@ msgstr ""
 "%s удаляет старые файлы WAL из архивов PostgreSQL.\n"
 "\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
 msgstr ""
 "  %s [ПАРАМЕТР]... РАСПОЛОЖЕНИЕ_АРХИВА СТАРЕЙШИЙ_СОХРАНЯЕМЫЙ_ФАЙЛ_WAL\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid ""
 "\n"
@@ -113,21 +113,21 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid ""
 "  -b, --clean-backup-history  clean up files including backup history files\n"
 msgstr ""
 "  -b, --clean-backup-history  удалить также файлы истории копирования\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
 msgstr ""
 "  -d, --debug                 генерировать подробные сообщения (режим "
 "отладки)\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid ""
 "  -n, --dry-run               dry run, show the names of the files that "
@@ -138,13 +138,13 @@ msgstr ""
 "файлов,\n"
 "                              которые будут удалены\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               показать версию и выйти\n"
 
 # well-spelled: РСШ
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid ""
 "  -x, --strip-extension=EXT   strip this extension before identifying files "
@@ -155,29 +155,29 @@ msgstr ""
 "файлы,\n"
 "                              подлежащие удалению\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  показать эту справку и выйти\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid ""
 "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION "
 "%%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr ""
 "\n"
-"Для использования в качестве archive_cleanup_command в postgresql.conf:\n"
-"  archive_cleanup_command = 'pg_archivecleanup [ПАРАМЕТР]... "
-"РАСПОЛОЖЕНИЕ_АРХИВА %%r'\n"
+"Для использования в качестве \"archive_cleanup_command\" в postgresql.conf:\n"
+"  archive_cleanup_command = 'pg_archivecleanup [ПАРАМЕТР]... ПУТЬ_К_АРХИВУ "
+"%%r'\n"
 "например:\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid ""
 "\n"
@@ -192,7 +192,7 @@ msgstr ""
 "  pg_archivecleanup /mnt/server/archiverdir "
 "000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid ""
 "\n"
@@ -201,22 +201,22 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "необходимо задать расположение архива"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "необходимо задать имя старейшего сохраняемого файла WAL"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "слишком много аргументов командной строки"
diff --git a/src/bin/pg_archivecleanup/po/sv.po b/src/bin/pg_archivecleanup/po/sv.po
index d91831a8ba7..8f1c9e548b8 100644
--- a/src/bin/pg_archivecleanup/po/sv.po
+++ b/src/bin/pg_archivecleanup/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_archivecleanup
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 13:23+0000\n"
-"PO-Revision-Date: 2024-07-12 15:46+0200\n"
+"POT-Creation-Date: 2025-05-11 15:53+0000\n"
+"PO-Revision-Date: 2025-05-12 21:10+0200\n"
 "Last-Translator: FDennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -48,43 +48,43 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "arkivplats \"%s\" finns inte"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "kunde inte öppna arkivplats \"%s\": %m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "kunde inte ta bort fil \"%s\": %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "kunde inte läsa arkivplats \"%s\": %m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "kunde inte stänga arkivplats \"%s\": %m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "ogiltigt filnamnsargument"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid ""
 "%s removes older WAL files from PostgreSQL archives.\n"
@@ -93,17 +93,17 @@ msgstr ""
 "%s tar bort gamla WAL-filer från PostgreSQLs arkiv.\n"
 "\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
 msgstr "  %s [FLAGGA]... ARKIVPLATS ÄLDSTASPARADEWALFIL\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid ""
 "\n"
@@ -112,17 +112,17 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid "  -b, --clean-backup-history  clean up files including backup history files\n"
 msgstr "  -b, --clean-backup-history  rensa upp filer, inklusive filer för backuphistorik\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
 msgstr "  -d, --debug                 generera debugutskrift (utförligt läge)\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid ""
 "  -n, --dry-run               dry run, show the names of the files that would be\n"
@@ -131,12 +131,12 @@ msgstr ""
 "  -n, --dry-run               gör inga ändringar, visa namn på de filer som skulle\n"
 "                              ha tagits bort\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               visa versionsinformation, avsluta sedan\n"
 
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid ""
 "  -x, --strip-extension=EXT   strip this extension before identifying files for\n"
@@ -145,27 +145,27 @@ msgstr ""
 "  -x, --strip-extension=EXT   ta bort denna ändelse innan vi identifierar filer\n"
 "                              som skall tas bort\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  visa denna hjälp, avsluta sedan\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid ""
 "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr ""
 "\n"
-"För att använda som archive_cleanup_command i postgresql.conf:\n"
+"För att använda som \"archive_cleanup_command\" i postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [FLAGGA]... ARKIVPLATS %%r'\n"
 "t.ex.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid ""
 "\n"
@@ -178,7 +178,7 @@ msgstr ""
 "t.ex.\n"
 "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid ""
 "\n"
@@ -187,22 +187,22 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "måste ange en arkivplats"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "måste ange äldsta sparade WAL-filen"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "för många kommandoradsargument"
diff --git a/src/bin/pg_archivecleanup/po/uk.po b/src/bin/pg_archivecleanup/po/uk.po
index 767f51cc73f..e2573c55f4f 100644
--- a/src/bin/pg_archivecleanup/po/uk.po
+++ b/src/bin/pg_archivecleanup/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:23+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:53+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_archivecleanup.pot\n"
-"X-Crowdin-File-ID: 1032\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_archivecleanup.pot\n"
+"X-Crowdin-File-ID: 1077\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -48,112 +48,112 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: pg_archivecleanup.c:68
+#: pg_archivecleanup.c:69
 #, c-format
 msgid "archive location \"%s\" does not exist"
 msgstr "архівного розташування \"%s\" не існує"
 
-#: pg_archivecleanup.c:100
+#: pg_archivecleanup.c:101
 #, c-format
 msgid "could not open archive location \"%s\": %m"
 msgstr "не вдалося відкрити архівне розташування \"%s\":%m"
 
-#: pg_archivecleanup.c:164
+#: pg_archivecleanup.c:165
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "не можливо видалити файл \"%s\": %m"
 
-#: pg_archivecleanup.c:169
+#: pg_archivecleanup.c:170
 #, c-format
 msgid "could not read archive location \"%s\": %m"
 msgstr "не вдалося прочитати архівне розташування \"%s\":%m"
 
-#: pg_archivecleanup.c:172
+#: pg_archivecleanup.c:173
 #, c-format
 msgid "could not close archive location \"%s\": %m"
 msgstr "не вдалося закрити архівне розташування \"%s\":%m"
 
-#: pg_archivecleanup.c:245
+#: pg_archivecleanup.c:246
 #, c-format
 msgid "invalid file name argument"
 msgstr "недійсна назва файла з аргументом"
 
-#: pg_archivecleanup.c:246 pg_archivecleanup.c:334 pg_archivecleanup.c:354
-#: pg_archivecleanup.c:366 pg_archivecleanup.c:373
+#: pg_archivecleanup.c:247 pg_archivecleanup.c:335 pg_archivecleanup.c:355
+#: pg_archivecleanup.c:367 pg_archivecleanup.c:374
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_archivecleanup.c:259
+#: pg_archivecleanup.c:260
 #, c-format
 msgid "%s removes older WAL files from PostgreSQL archives.\n\n"
 msgstr "%s видаляє старі WAL-файли з архівів PostgreSQL.\n\n"
 
-#: pg_archivecleanup.c:260
+#: pg_archivecleanup.c:261
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_archivecleanup.c:261
+#: pg_archivecleanup.c:262
 #, c-format
 msgid "  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"
 msgstr "  %s [OPTION]... РОЗТАШУВАННЯ_АРХІВА НАЙДАВНІШИЙ_ЗБЕРЕЖЕНИЙ_WAL_ФАЙЛ\n"
 
-#: pg_archivecleanup.c:262
+#: pg_archivecleanup.c:263
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_archivecleanup.c:263
+#: pg_archivecleanup.c:264
 #, c-format
 msgid "  -b, --clean-backup-history  clean up files including backup history files\n"
 msgstr "  -b, --clean-backup-history  очистити файли, включаючи файли історії резервного копіювання\n"
 
-#: pg_archivecleanup.c:264
+#: pg_archivecleanup.c:265
 #, c-format
 msgid "  -d, --debug                 generate debug output (verbose mode)\n"
 msgstr "  -d, --debug                 генерувати налагоджувальний вивід (розгорнутий режим)\n"
 
-#: pg_archivecleanup.c:265
+#: pg_archivecleanup.c:266
 #, c-format
 msgid "  -n, --dry-run               dry run, show the names of the files that would be\n"
 "                              removed\n"
 msgstr "  -n, --dry-run               сухий запуск, показати назви файлів, які будуть\n"
 "                              вилучені\n"
 
-#: pg_archivecleanup.c:267
+#: pg_archivecleanup.c:268
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version                вивести інформацію про версію, потім вийти\n"
 
-#: pg_archivecleanup.c:268
+#: pg_archivecleanup.c:269
 #, c-format
 msgid "  -x, --strip-extension=EXT   strip this extension before identifying files for\n"
 "                              clean up\n"
 msgstr "  -x, --strip-extension=EXT   вилучати це розширення перед ідентифікацією файлів для\n"
 "                              очищення\n"
 
-#: pg_archivecleanup.c:270
+#: pg_archivecleanup.c:271
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                   показати цю довідку, потім вийти\n"
 
-#: pg_archivecleanup.c:271
+#: pg_archivecleanup.c:272
 #, c-format
 msgid "\n"
-"For use as archive_cleanup_command in postgresql.conf:\n"
+"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 "e.g.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 msgstr "\n"
-"Для використання як archive_cleanup_command у postgresql.conf:\n"
+"Для використання як \"archive_cleanup_command\" у postgresql.conf:\n"
 "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 "напр.\n"
 "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"
 
-#: pg_archivecleanup.c:276
+#: pg_archivecleanup.c:277
 #, c-format
 msgid "\n"
 "Or for use as a standalone archive cleaner:\n"
@@ -164,29 +164,29 @@ msgstr "\n"
 "наприклад:\n"
 "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"
 
-#: pg_archivecleanup.c:280
+#: pg_archivecleanup.c:281
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_archivecleanup.c:281
+#: pg_archivecleanup.c:282
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: pg_archivecleanup.c:353
+#: pg_archivecleanup.c:354
 #, c-format
 msgid "must specify archive location"
 msgstr "необхідно вказати розташування архіва"
 
-#: pg_archivecleanup.c:365
+#: pg_archivecleanup.c:366
 #, c-format
 msgid "must specify oldest kept WAL file"
 msgstr "необхідно вказати найдавніший збережений WAL-файл"
 
-#: pg_archivecleanup.c:372
+#: pg_archivecleanup.c:373
 #, c-format
 msgid "too many command-line arguments"
 msgstr "занадто багато аргументів командного рядка"
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index 26d84e352e5..bcae1e8c3a0 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/pg_basebackup/Makefile
 #
diff --git a/src/bin/pg_basebackup/astreamer_inject.c b/src/bin/pg_basebackup/astreamer_inject.c
index 15334e458ad..3fb3d4ecfd5 100644
--- a/src/bin/pg_basebackup/astreamer_inject.c
+++ b/src/bin/pg_basebackup/astreamer_inject.c
@@ -224,8 +224,9 @@ astreamer_inject_file(astreamer *streamer, char *pathname, char *data,
 	strlcpy(member.pathname, pathname, MAXPGPATH);
 	member.size = len;
 	member.mode = pg_file_create_mode;
+	member.is_regular = true;
 	member.is_directory = false;
-	member.is_link = false;
+	member.is_symlink = false;
 	member.linktarget[0] = '\0';
 
 	/*
diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c
index fa6e766b111..48374a4ef12 100644
--- a/src/bin/pg_basebackup/pg_createsubscriber.c
+++ b/src/bin/pg_basebackup/pg_createsubscriber.c
@@ -679,13 +679,20 @@ modify_subscriber_sysid(const struct CreateSubscriberOptions *opt)
 	cf->system_identifier |= ((uint64) tv.tv_usec) << 12;
 	cf->system_identifier |= getpid() & 0xFFF;
 
-	if (!dry_run)
+	if (dry_run)
+		pg_log_info("dry-run: would set system identifier to %" PRIu64 " on subscriber",
+					cf->system_identifier);
+	else
+	{
 		update_controlfile(subscriber_dir, cf, true);
+		pg_log_info("system identifier is %" PRIu64 " on subscriber",
+					cf->system_identifier);
+	}
 
-	pg_log_info("system identifier is %" PRIu64 " on subscriber",
-				cf->system_identifier);
-
-	pg_log_info("running pg_resetwal on the subscriber");
+	if (dry_run)
+		pg_log_info("dry-run: would run pg_resetwal on the subscriber");
+	else
+		pg_log_info("running pg_resetwal on the subscriber");
 
 	cmd_str = psprintf("\"%s\" -D \"%s\" > \"%s\"", pg_resetwal_path,
 					   subscriber_dir, DEVNULL);
@@ -697,9 +704,9 @@ modify_subscriber_sysid(const struct CreateSubscriberOptions *opt)
 		int			rc = system(cmd_str);
 
 		if (rc == 0)
-			pg_log_info("subscriber successfully changed the system identifier");
+			pg_log_info("successfully reset WAL on the subscriber");
 		else
-			pg_fatal("could not change system identifier of subscriber: %s", wait_result_to_str(rc));
+			pg_fatal("could not reset WAL on subscriber: %s", wait_result_to_str(rc));
 	}
 
 	pg_free(cf);
@@ -977,9 +984,9 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
 	}
 
 	/*
-	 * Validate 'max_slot_wal_keep_size'. If this parameter is set to a
-	 * non-default value, it may cause replication failures due to required
-	 * WAL files being prematurely removed.
+	 * In dry-run mode, validate 'max_slot_wal_keep_size'. If this parameter
+	 * is set to a non-default value, it may cause replication failures due to
+	 * required WAL files being prematurely removed.
 	 */
 	if (dry_run && (strcmp(max_slot_wal_keep_size, "-1") != 0))
 	{
@@ -1111,24 +1118,32 @@ drop_existing_subscriptions(PGconn *conn, const char *subname, const char *dbnam
 {
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
+	char	   *subname_esc;
 
 	Assert(conn != NULL);
 
+	subname_esc = PQescapeIdentifier(conn, subname, strlen(subname));
+
 	/*
 	 * Construct a query string. These commands are allowed to be executed
 	 * within a transaction.
 	 */
 	appendPQExpBuffer(query, "ALTER SUBSCRIPTION %s DISABLE;",
-					  subname);
+					  subname_esc);
 	appendPQExpBuffer(query, " ALTER SUBSCRIPTION %s SET (slot_name = NONE);",
-					  subname);
-	appendPQExpBuffer(query, " DROP SUBSCRIPTION %s;", subname);
+					  subname_esc);
+	appendPQExpBuffer(query, " DROP SUBSCRIPTION %s;", subname_esc);
 
-	pg_log_info("dropping subscription \"%s\" in database \"%s\"",
-				subname, dbname);
+	PQfreemem(subname_esc);
 
-	if (!dry_run)
+	if (dry_run)
+		pg_log_info("dry-run: would drop subscription \"%s\" in database \"%s\"",
+					subname, dbname);
+	else
 	{
+		pg_log_info("dropping subscription \"%s\" in database \"%s\"",
+					subname, dbname);
+
 		res = PQexec(conn, query->data);
 
 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -1250,8 +1265,17 @@ setup_recovery(const struct LogicalRepInfo *dbinfo, const char *datadir, const c
 	appendPQExpBufferStr(recoveryconfcontents, "recovery_target = ''\n");
 	appendPQExpBufferStr(recoveryconfcontents,
 						 "recovery_target_timeline = 'latest'\n");
+
+	/*
+	 * Set recovery_target_inclusive = false to avoid reapplying the
+	 * transaction committed at 'lsn' after subscription is enabled. This is
+	 * because the provided 'lsn' is also used as the replication start point
+	 * for the subscription. So, the server can send the transaction committed
+	 * at that 'lsn' after replication is started which can lead to applying
+	 * the same transaction twice if we keep recovery_target_inclusive = true.
+	 */
 	appendPQExpBufferStr(recoveryconfcontents,
-						 "recovery_target_inclusive = true\n");
+						 "recovery_target_inclusive = false\n");
 	appendPQExpBufferStr(recoveryconfcontents,
 						 "recovery_target_action = promote\n");
 	appendPQExpBufferStr(recoveryconfcontents, "recovery_target_name = ''\n");
@@ -1260,7 +1284,7 @@ setup_recovery(const struct LogicalRepInfo *dbinfo, const char *datadir, const c
 
 	if (dry_run)
 	{
-		appendPQExpBufferStr(recoveryconfcontents, "# dry run mode");
+		appendPQExpBufferStr(recoveryconfcontents, "# dry run mode\n");
 		appendPQExpBuffer(recoveryconfcontents,
 						  "recovery_target_lsn = '%X/%X'\n",
 						  LSN_FORMAT_ARGS((XLogRecPtr) InvalidXLogRecPtr));
@@ -1366,8 +1390,12 @@ create_logical_replication_slot(PGconn *conn, struct LogicalRepInfo *dbinfo)
 
 	Assert(conn != NULL);
 
-	pg_log_info("creating the replication slot \"%s\" in database \"%s\"",
-				slot_name, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher",
+					slot_name, dbinfo->dbname);
+	else
+		pg_log_info("creating the replication slot \"%s\" in database \"%s\" on publisher",
+					slot_name, dbinfo->dbname);
 
 	slot_name_esc = PQescapeLiteral(conn, slot_name, strlen(slot_name));
 
@@ -1415,8 +1443,12 @@ drop_replication_slot(PGconn *conn, struct LogicalRepInfo *dbinfo,
 
 	Assert(conn != NULL);
 
-	pg_log_info("dropping the replication slot \"%s\" in database \"%s\"",
-				slot_name, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would drop the replication slot \"%s\" in database \"%s\"",
+					slot_name, dbinfo->dbname);
+	else
+		pg_log_info("dropping the replication slot \"%s\" in database \"%s\"",
+					slot_name, dbinfo->dbname);
 
 	slot_name_esc = PQescapeLiteral(conn, slot_name, strlen(slot_name));
 
@@ -1560,13 +1592,8 @@ wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions
 
 	for (;;)
 	{
-		bool		in_recovery = server_is_in_recovery(conn);
-
-		/*
-		 * Does the recovery process finish? In dry run mode, there is no
-		 * recovery mode. Bail out as the recovery process has ended.
-		 */
-		if (!in_recovery || dry_run)
+		/* Did the recovery process finish? We're done if so. */
+		if (dry_run || !server_is_in_recovery(conn))
 		{
 			status = POSTMASTER_READY;
 			recovery_ended = true;
@@ -1642,8 +1669,12 @@ create_publication(PGconn *conn, struct LogicalRepInfo *dbinfo)
 	PQclear(res);
 	resetPQExpBuffer(str);
 
-	pg_log_info("creating publication \"%s\" in database \"%s\"",
-				dbinfo->pubname, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would create publication \"%s\" in database \"%s\"",
+					dbinfo->pubname, dbinfo->dbname);
+	else
+		pg_log_info("creating publication \"%s\" in database \"%s\"",
+					dbinfo->pubname, dbinfo->dbname);
 
 	appendPQExpBuffer(str, "CREATE PUBLICATION %s FOR ALL TABLES",
 					  ipubname_esc);
@@ -1685,8 +1716,12 @@ drop_publication(PGconn *conn, const char *pubname, const char *dbname,
 
 	pubname_esc = PQescapeIdentifier(conn, pubname, strlen(pubname));
 
-	pg_log_info("dropping publication \"%s\" in database \"%s\"",
-				pubname, dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would drop publication \"%s\" in database \"%s\"",
+					pubname, dbname);
+	else
+		pg_log_info("dropping publication \"%s\" in database \"%s\"",
+					pubname, dbname);
 
 	appendPQExpBuffer(str, "DROP PUBLICATION %s", pubname_esc);
 
@@ -1794,8 +1829,12 @@ create_subscription(PGconn *conn, const struct LogicalRepInfo *dbinfo)
 	pubconninfo_esc = PQescapeLiteral(conn, dbinfo->pubconninfo, strlen(dbinfo->pubconninfo));
 	replslotname_esc = PQescapeLiteral(conn, dbinfo->replslotname, strlen(dbinfo->replslotname));
 
-	pg_log_info("creating subscription \"%s\" in database \"%s\"",
-				dbinfo->subname, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would create subscription \"%s\" in database \"%s\"",
+					dbinfo->subname, dbinfo->dbname);
+	else
+		pg_log_info("creating subscription \"%s\" in database \"%s\"",
+					dbinfo->subname, dbinfo->dbname);
 
 	appendPQExpBuffer(str,
 					  "CREATE SUBSCRIPTION %s CONNECTION %s PUBLICATION %s "
@@ -1892,8 +1931,12 @@ set_replication_progress(PGconn *conn, const struct LogicalRepInfo *dbinfo, cons
 	 */
 	originname = psprintf("pg_%u", suboid);
 
-	pg_log_info("setting the replication progress (node name \"%s\", LSN %s) in database \"%s\"",
-				originname, lsnstr, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\"",
+					originname, lsnstr, dbinfo->dbname);
+	else
+		pg_log_info("setting the replication progress (node name \"%s\", LSN %s) in database \"%s\"",
+					originname, lsnstr, dbinfo->dbname);
 
 	resetPQExpBuffer(str);
 	appendPQExpBuffer(str,
@@ -1938,8 +1981,12 @@ enable_subscription(PGconn *conn, const struct LogicalRepInfo *dbinfo)
 
 	subname = PQescapeIdentifier(conn, dbinfo->subname, strlen(dbinfo->subname));
 
-	pg_log_info("enabling subscription \"%s\" in database \"%s\"",
-				dbinfo->subname, dbinfo->dbname);
+	if (dry_run)
+		pg_log_info("dry-run: would enable subscription \"%s\" in database \"%s\"",
+					dbinfo->subname, dbinfo->dbname);
+	else
+		pg_log_info("enabling subscription \"%s\" in database \"%s\"",
+					dbinfo->subname, dbinfo->dbname);
 
 	appendPQExpBuffer(str, "ALTER SUBSCRIPTION %s ENABLE", subname);
 
@@ -2222,7 +2269,8 @@ main(int argc, char **argv)
 
 		if (bad_switch)
 		{
-			pg_log_error("options %s and -a/--all cannot be used together", bad_switch);
+			pg_log_error("options %s and %s cannot be used together",
+						 bad_switch, "-a/--all");
 			pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 			exit(1);
 		}
@@ -2348,7 +2396,8 @@ main(int argc, char **argv)
 			dbinfos.objecttypes_to_clean |= OBJECTTYPE_PUBLICATIONS;
 		else
 		{
-			pg_log_error("invalid object type \"%s\" specified for --clean", cell->val);
+			pg_log_error("invalid object type \"%s\" specified for %s",
+						 cell->val, "--clean");
 			pg_log_error_hint("The valid value is: \"%s\"", "publications");
 			exit(1);
 		}
diff --git a/src/bin/pg_basebackup/po/de.po b/src/bin/pg_basebackup/po/de.po
index 0afd145285c..0c10f397abc 100644
--- a/src/bin/pg_basebackup/po/de.po
+++ b/src/bin/pg_basebackup/po/de.po
@@ -1,5 +1,5 @@
 # German message translation file for pg_basebackup
-# Copyright (C) 2011 - 2025 PostgreSQL Global Development Group
+# Copyright (C) 2011 - 2026 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Use these quotes: »%s«
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-14 00:20+0000\n"
-"PO-Revision-Date: 2025-04-14 09:52+0200\n"
+"POT-Creation-Date: 2026-05-05 12:11+0000\n"
+"PO-Revision-Date: 2026-05-06 15:44+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -41,8 +41,8 @@ msgstr "Tipp: "
 #: ../../common/compression.c:132 ../../common/compression.c:141
 #: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
 #: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
-#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
-#: ../../fe_utils/astreamer_zstd.c:288
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:130
+#: ../../fe_utils/astreamer_zstd.c:285
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "diese Installation unterstützt keine Komprimierung mit %s"
@@ -108,7 +108,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "konnte Datei »%s« nicht lesen: %d von %zu gelesen"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:652
+#: ../../fe_utils/astreamer_file.c:141 ../../fe_utils/astreamer_file.c:270
+#: pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schließen: %m"
@@ -145,7 +146,7 @@ msgid "could not write file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schreiben: %m"
 
 #: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
-#: ../../common/file_utils.c:510 pg_recvlogical.c:205
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
@@ -167,7 +168,7 @@ msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "konnte Dateisystem für Datei »%s« nicht synchronisieren: %m"
 
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
-#: pg_receivewal.c:319 pg_recvlogical.c:353
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
@@ -225,7 +226,7 @@ msgstr "konnte Prozess nicht mit beschränktem Token neu starten: Fehlercode %lu
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu"
 
-#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:366
 #: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
@@ -237,28 +238,28 @@ msgstr "konnte Datei »%s« nicht erstellen: %m"
 msgid "could not write to file \"%s\": %m"
 msgstr "konnte nicht in Datei »%s« schreiben: %m"
 
-#: ../../fe_utils/astreamer_file.c:278
+#: ../../fe_utils/astreamer_file.c:280
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "unerwarteter Zustand beim Extrahieren des Archivs"
 
-#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: ../../fe_utils/astreamer_file.c:326 pg_basebackup.c:699 pg_basebackup.c:713
 #: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
 
-#: ../../fe_utils/astreamer_file.c:329
+#: ../../fe_utils/astreamer_file.c:331
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "konnte Zugriffsrechte für Verzeichnis »%s« nicht setzen: %m"
 
-#: ../../fe_utils/astreamer_file.c:348
+#: ../../fe_utils/astreamer_file.c:350
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "konnte symbolische Verknüpfung von »%s« nach »%s« nicht erzeugen: %m"
 
-#: ../../fe_utils/astreamer_file.c:368
+#: ../../fe_utils/astreamer_file.c:370
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Datei »%s« nicht setzen: %m"
@@ -299,7 +300,7 @@ msgid "could not initialize compression library"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren"
 
 #: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
-#: ../../fe_utils/astreamer_zstd.c:333
+#: ../../fe_utils/astreamer_zstd.c:330
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "konnte Daten nicht dekomprimieren: %s"
@@ -314,8 +315,8 @@ msgstr "konnte lz4-Komprimierungskontext nicht erzeugen: %s"
 msgid "could not write lz4 header: %s"
 msgstr "konnte lz4-Header nicht schreiben: %s"
 
-#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
-#: ../../fe_utils/astreamer_zstd.c:227
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:182
+#: ../../fe_utils/astreamer_zstd.c:224
 #, c-format
 msgid "could not compress data: %s"
 msgstr "konnte Daten nicht komprimieren: %s"
@@ -330,22 +331,27 @@ msgstr "konnte lz4-Komprimierung nicht beenden: %s"
 msgid "could not initialize compression library: %s"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s"
 
-#: ../../fe_utils/astreamer_tar.c:244
-#, c-format
-msgid "tar file trailer exceeds 2 blocks"
-msgstr "Tar-Datei-Trailer überschreitet 2 Blöcke"
-
-#: ../../fe_utils/astreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:254
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "unerwarteter Zustand beim Parsen des Tar-Archivs"
 
-#: ../../fe_utils/astreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:300
+#, c-format
+msgid "input file does not appear to be a valid tar archive"
+msgstr "Eingabedatei scheint kein gültiges Tar-Archiv zu sein"
+
+#: ../../fe_utils/astreamer_tar.c:307
 #, c-format
 msgid "tar member has empty name"
 msgstr "Tar-Mitglied hat leeren Namen"
 
-#: ../../fe_utils/astreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:328
+#, c-format
+msgid "pax extensions to tar format are not supported"
+msgstr "PAX-Erweiterungen des Tar-Formats werden nicht unterstützt"
+
+#: ../../fe_utils/astreamer_tar.c:357
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "COPY-Strom endete vor dem Ende der letzten Datei"
@@ -365,12 +371,12 @@ msgstr "konnte zstd-Komprimierungsniveau nicht auf %d setzen: %s"
 msgid "could not set compression worker count to %d: %s"
 msgstr "konnte Komprimierungs-Worker-Anzahl nicht auf %d setzen: %s"
 
-#: ../../fe_utils/astreamer_zstd.c:120
+#: ../../fe_utils/astreamer_zstd.c:119
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "konnte Long-Distance-Modus nicht einschalten: %s"
 
-#: ../../fe_utils/astreamer_zstd.c:279
+#: ../../fe_utils/astreamer_zstd.c:276
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "konnte zstd-Dekomprimierungskontext nicht erzeugen"
@@ -668,12 +674,12 @@ msgstr "  -P, --progress         Fortschrittsinformationen zeigen\n"
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=SLOTNAME    zu verwendender Replikations-Slot\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:109
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          »Verbose«-Modus\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:110
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          Versionsinformationen anzeigen, dann beenden\n"
@@ -730,12 +736,12 @@ msgstr ""
 "                         Methode zum Synchronisieren von Dateien auf Festplatte\n"
 "                         setzen\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:111
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:112
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -749,12 +755,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=VERBDG    Verbindungsparameter\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:114
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, 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:442 pg_receivewal.c:99 pg_recvlogical.c:115
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        Portnummer des Datenbankservers\n"
@@ -768,23 +774,23 @@ msgstr ""
 "  -s, --status-interval=INTERVALL\n"
 "                         Zeit zwischen an Server gesendeten Statuspaketen (in Sekunden)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:116
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME    Datenbankbenutzername\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:117
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      niemals nach Passwort fragen\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:118
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, 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:448 pg_createsubscriber.c:270 pg_receivewal.c:106
-#: pg_recvlogical.c:119
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -794,7 +800,7 @@ msgstr ""
 "Berichten Sie Fehler an <%s>.\n"
 
 #: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
-#: pg_recvlogical.c:120
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s Homepage: <%s>\n"
@@ -906,7 +912,7 @@ msgstr "Transferrate »%s« ist außerhalb des gültigen Bereichs"
 msgid "could not get COPY data stream: %s"
 msgstr "konnte COPY-Datenstrom nicht empfangen: %s"
 
-#: pg_basebackup.c:1040 pg_recvlogical.c:450 pg_recvlogical.c:626
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
 #: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
@@ -992,7 +998,7 @@ msgstr "Verwenden Sie -X none oder -X fetch, um Log-Streaming abzuschalten."
 msgid "server does not support incremental backup"
 msgstr "Server unterstützt kein inkrementelles Backup"
 
-#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:273
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
 #: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
 #: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
@@ -1185,21 +1191,21 @@ msgstr "ungültige Option »%s« für --wal-method, muss »fetch«, »stream« o
 #: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
 #: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
 #: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
-#: pg_basebackup.c:2804 pg_createsubscriber.c:2196 pg_createsubscriber.c:2218
-#: pg_createsubscriber.c:2228 pg_createsubscriber.c:2236
-#: pg_createsubscriber.c:2264 pg_createsubscriber.c:2307 pg_receivewal.c:748
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
 #: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
-#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:859
-#: pg_recvlogical.c:871 pg_recvlogical.c:881 pg_recvlogical.c:888
-#: pg_recvlogical.c:895 pg_recvlogical.c:902 pg_recvlogical.c:909
-#: pg_recvlogical.c:916 pg_recvlogical.c:923 pg_recvlogical.c:932
-#: pg_recvlogical.c:939
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: pg_basebackup.c:2585 pg_createsubscriber.c:2226 pg_receivewal.c:758
-#: pg_recvlogical.c:869
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "zu viele Kommandozeilenargumente (das erste ist »%s«)"
@@ -1316,7 +1322,7 @@ msgstr "Löschen Sie diese Publikation, bevor Sie erneut versuchen."
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "Replikations-Slot »%s« erzeugt in Datenbank »%s« auf dem Primärserver wurde zurückgelassen"
 
-#: pg_createsubscriber.c:231 pg_createsubscriber.c:1305
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "Löschen Sie diesen Replikations-Slot bald, um Zurückhalten von WAL-Datein zu vermeiden."
@@ -1343,8 +1349,11 @@ msgstr ""
 #, c-format
 msgid ""
 "  -a, --all                       create subscriptions for all databases except template\n"
-"                                  databases or databases that don't allow connections\n"
+"                                  databases and databases that don't allow connections\n"
 msgstr ""
+"  -a, --all                       Subskriptionen für alle Datenbanken erzeugen, außer\n"
+"                                  für Template-Datenbanken und Datenbanken, die keine\n"
+"                                  Verbindungen zulassen\n"
 
 #: pg_createsubscriber.c:251
 #, c-format
@@ -1373,36 +1382,39 @@ msgstr "  -P, --publisher-server=VERBDG   Verbindungsparameter des Publikationss
 
 #: pg_createsubscriber.c:256
 #, c-format
-msgid ""
-"  -R, --remove=OBJECTTYPE         remove all objects of the specified type from specified\n"
-"                                  databases on the subscriber; accepts: publications\n"
-msgstr ""
-
-#: pg_createsubscriber.c:258
-#, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=VERZ            Verzeichnis für Socket (Standard: aktuelles Verz.)\n"
 
-#: pg_createsubscriber.c:259
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SEK      Sekunden zu warten auf Ende der Wiederherstellung\n"
 
-#: pg_createsubscriber.c:260
+#: pg_createsubscriber.c:258
 #, c-format
 msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
 msgstr "  -T, --enable-two-phase          Zwei-Phasen-Commit für alle Subskriptionen einschalten\n"
 
-#: pg_createsubscriber.c:261
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NAME  Benutzername für Subskriptionsserver-Verbindung\n"
 
-#: pg_createsubscriber.c:262
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   »Verbose«-Modus\n"
 
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"      --clean=OBJEKTTYP           alle Objekte des angegebenen Typs aus den angegebenen\n"
+"                                  Datenbanken auf dem Subskriptionsserver löschen;\n"
+"                                  akzeptiert: »%s«\n"
+
 #: pg_createsubscriber.c:263
 #, c-format
 msgid ""
@@ -1507,7 +1519,7 @@ msgstr "hole Systemidentifikator vom Subskriptionsserver"
 msgid "control file appears to be corrupt"
 msgstr "Kontrolldatei scheint kaputt zu sein"
 
-#: pg_createsubscriber.c:645 pg_createsubscriber.c:685
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
 msgid "system identifier is %<PRIu64> on subscriber"
 msgstr "Systemidentifikator ist %<PRIu64> auf dem Subskriptionsserver"
@@ -1517,506 +1529,544 @@ msgstr "Systemidentifikator ist %<PRIu64> auf dem Subskriptionsserver"
 msgid "modifying system identifier of subscriber"
 msgstr "ändere Systemidentifikator auf dem Subskriptionsserver"
 
-#: pg_createsubscriber.c:688
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "Probelauf: Systemidentifikator würde auf dem Subskriptionsserver auf %<PRIu64> gesetzt werden"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "Probelauf: würde pg_resetwal auf dem Subskriptionsserver ausführen"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "führe pg_resetwal auf dem Subskriptionsserver aus"
 
-#: pg_createsubscriber.c:700
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "Subskriptionsserver hat Systemidentifikator erfolgreich geändert"
+msgid "successfully reset WAL on the subscriber"
+msgstr "WAL auf dem Subskriptionsserver erfolgreich zurückgesetzt"
 
-#: pg_createsubscriber.c:702
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "konnte Systemidentifikator des Subskriptionsservers nicht ändern: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "konnte WAL auf dem Subskriptionsserver nicht zurücksetzen: %s"
 
-#: pg_createsubscriber.c:726
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "konnte Datenbank-OID nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:733
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "konnte Datenbank-OID nicht ermitteln: %d Zeilen erhalten, %d Zeile erwartet"
 
-#: pg_createsubscriber.c:805
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "erzeuge Replikations-Slot »%s« auf dem Publikationsserver"
 
-#: pg_createsubscriber.c:825
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "konnte zusätzlichen WAL-Datensatz nicht schreiben: %s"
 
-#: pg_createsubscriber.c:851
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "konnte Recovery-Fortschritt nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:884
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "prüfe Einstellungen auf dem Publikationsserver"
 
-#: pg_createsubscriber.c:894
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "Primärserver kann nicht im Wiederherstellungsmodus sein"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "konnte Einstellungen des Publikationsservers nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:949
+#: pg_createsubscriber.c:956
 #, c-format
 msgid "publisher requires \"wal_level\" >= \"logical\""
 msgstr "Publikationsserver benötigt »wal_level« >= »logical«"
 
-#: pg_createsubscriber.c:955
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "Publikationsserver benötigt %d Replikations-Slots, aber nur %d verbleiben"
 
-#: pg_createsubscriber.c:957 pg_createsubscriber.c:966
-#: pg_createsubscriber.c:1076 pg_createsubscriber.c:1085
-#: pg_createsubscriber.c:1094
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Erhöhen Sie den Konfigurationsparameter »%s« auf mindestens %d."
 
-#: pg_createsubscriber.c:964
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "Publikationsserver benötigt %d WAL-Sender-Prozesse, aber nur %d verbleiben"
 
-#: pg_createsubscriber.c:973
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "Option »two_phase« wird für Replikations-Slots nicht aktiviert"
 
-#: pg_createsubscriber.c:974
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "Subskriptionen werden mit der Option »two_phase« ausgeschaltet erzeugt. Vorbereitete Transaktionen werden bei COMMIT PREPARED repliziert werden."
 
-#: pg_createsubscriber.c:976
+#: pg_createsubscriber.c:983
 #, c-format
-msgid "You can use --enable-two-phase switch to enable two_phase."
-msgstr ""
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "Sie können die Kommandozeilenoption --enable-two-phase verwenden, um two_phase einzuschalten."
 
-#: pg_createsubscriber.c:986
+#: pg_createsubscriber.c:993
 #, c-format
 msgid "required WAL could be removed from the publisher"
-msgstr ""
+msgstr "benötigtes WAL könnte vom Publikationsserver entfernt werden"
 
-#: pg_createsubscriber.c:987
-#, fuzzy, c-format
-#| msgid "Make sure the configuration parameter \"%s\" is set on the primary server."
+#: pg_createsubscriber.c:994
+#, c-format
 msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
-msgstr "Stellen Sie sicher, dass der Konfigurationsparameter »%s« auf dem Primärserver gesetzt ist."
+msgstr "Setzen Sie den Konfigurationsparameter »%s« auf -1, um sicherzustellen, dass die benötigten WAL-Dateien nicht vorzeitig entfernt werden."
 
-#: pg_createsubscriber.c:1019
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "prüfe Einstellungen auf Subskriptionsserver"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "Zielserver muss ein Standby sein"
 
-#: pg_createsubscriber.c:1050
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "konnte Einstellungen des Subskriptionsservers nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:1074
-#, fuzzy, c-format
-#| msgid "subscriber requires %d replication slots, but only %d remain"
+#: pg_createsubscriber.c:1081
+#, c-format
 msgid "subscriber requires %d active replication origins, but only %d remain"
-msgstr "Subskriptionsserver benötigt %d Replikations-Slots, aber nur %d verbleiben"
+msgstr "Subskriptionsserver benötigt %d Slots für aktive Replication-Origins, aber nur %d verbleiben"
 
-#: pg_createsubscriber.c:1083
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "Subskriptionsserver benötigt %d Arbeitsprozesse für logische Replikation, aber nur %d verbleiben"
 
-#: pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "Subskriptionsserver benötigt %d Arbeitsprozesse, aber nur %d verbleiben"
 
-#: pg_createsubscriber.c:1127
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Subskription »%s« in Datenbank »%s« löschen"
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "lösche Subskription »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1136
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "konnte Subskription »%s« nicht löschen: %s"
 
-#: pg_createsubscriber.c:1171
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "konnte bereits existierende Subskriptionen nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "konnte Replikations-Slot »%s« auf dem Primärserver nicht löschen"
 
-#: pg_createsubscriber.c:1337
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "konnte Failover-Replikations-Slot-Informationen nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:1339 pg_createsubscriber.c:1348
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "Löschen Sie die Failover-Replikations-Slots auf dem Subskriptionsserver bald, um Zurückhalten von WAL-Dateien zu vermeiden."
 
-#: pg_createsubscriber.c:1347
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "konnte Failover-Replikations-Slot nicht löschen"
 
-#: pg_createsubscriber.c:1369
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "Probelauf: würde Replikations-Slot »%s« in Datenbank »%s« auf dem Publikationsserver erzeugen"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "erzeuge Replikations-Slot »%s« in Datenbank »%s«"
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "erzeuge Replikations-Slot »%s« in Datenbank »%s« auf dem Publikationsserver"
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "konnte Replikations-Slot »%s« in Datenbank »%s« nicht erzeugen: %s"
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Replikations-Slot »%s« in Datenbank »%s« löschen"
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "lösche Replikations-Slot »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1434
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "konnte Replikations-Slot »%s« in Datenbank »%s« nicht löschen: %s"
 
-#: pg_createsubscriber.c:1455
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctl ist fehlgeschlagen mit Statuscode %d"
 
-#: pg_createsubscriber.c:1460
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl wurde durch Ausnahme 0x%X beendet"
 
-#: pg_createsubscriber.c:1462
+#: pg_createsubscriber.c:1489
 #, 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."
 
-#: pg_createsubscriber.c:1464
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl wurde durch Signal %d beendet: %s"
 
-#: pg_createsubscriber.c:1470
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl hat mit unbekanntem Status %d beendet"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "Der fehlgeschlagene Befehl war: %s"
 
-#: pg_createsubscriber.c:1523
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "Server wurde gestartet"
 
-#: pg_createsubscriber.c:1538
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "Server wurde angehalten"
 
-#: pg_createsubscriber.c:1557
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "warte, dass der Zielserver einen konsistenten Zustand erreicht"
 
-#: pg_createsubscriber.c:1580
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "Zeitüberschreitung bei der Wiederherstellung"
 
-#: pg_createsubscriber.c:1593
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "Server hat Recovery-Zustand nicht beendet"
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "Zielserver hat einen konsistenten Zustand erreicht"
 
-#: pg_createsubscriber.c:1596
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "Wenn pg_createsubscriber ab diesem Punkt fehlschlägt, dann müssen Sie die physikalische Replik neu erzeugen, bevor fortgesetzt werden kann."
 
-#: pg_createsubscriber.c:1623 pg_createsubscriber.c:1746
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "konnte Publikationsinformationen nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "Publikation »%s« existiert bereits"
 
-#: pg_createsubscriber.c:1638
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Nennen Sie diese Publikation eventuell um bevor Sie fortsetzen."
 
-#: pg_createsubscriber.c:1645
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Publikation »%s« in Datenbank »%s« erzeugen"
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "erzeuge Publikation »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1658
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "konnte Publikation »%s« in Datenbank »%s« nicht erzeugen: %s"
 
-#: pg_createsubscriber.c:1688
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Publikation »%s« in Datenbank »%s« löschen"
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "lösche Publikation »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1702
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "konnte Publikation »%s« in Datenbank »%s« nicht löschen: %s"
 
-#: pg_createsubscriber.c:1739
-#, fuzzy, c-format
-#| msgid "dropping publication \"%s\" in database \"%s\""
+#: pg_createsubscriber.c:1769
+#, c-format
 msgid "dropping all existing publications in database \"%s\""
-msgstr "lösche Publikation »%s« in Datenbank »%s«"
+msgstr "lösche alle bestehenden Publikationen in Datenbank »%s«"
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Subskription »%s« in Datenbank »%s« erzeugen"
 
-#: pg_createsubscriber.c:1797
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "erzeuge Subskription »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1819
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "konnte Subskription »%s« in Datenbank »%s« nicht erzeugen: %s"
 
-#: pg_createsubscriber.c:1864
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "konnte Subskriptions-OID nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:1871
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "konnte Subskriptions-OID nicht ermitteln: %d Zeilen erhalten, %d Zeile erwartet"
 
-#: pg_createsubscriber.c:1895
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "Problelauf: würde Replikationsfortschritt (Knotenname »%s«, LSN %s) in Datenbank »%s« setzen"
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "setze Replikationsfortschritt (Knotenname »%s«, LSN %s) in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1910
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "konnte Replikationsfortschritt für Subskription »%s« nicht setzen: %s"
 
-#: pg_createsubscriber.c:1941
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "Probelauf: würde Subskription »%s« in Datenbank »%s« aktivieren"
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "aktiviere Subskription »%s« in Datenbank »%s«"
 
-#: pg_createsubscriber.c:1953
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "konnte Subskription »%s« nicht aktivieren: %s"
 
-#: pg_createsubscriber.c:1999
-#, fuzzy, c-format
-#| msgid "could not obtain database OID: %s"
+#: pg_createsubscriber.c:2041
+#, c-format
 msgid "could not obtain a list of databases: %s"
-msgstr "konnte Datenbank-OID nicht ermitteln: %s"
+msgstr "konnte Liste der Datenbanken nicht ermitteln: %s"
 
-#: pg_createsubscriber.c:2103
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "kann nicht von »root« ausgeführt werden"
 
-#: pg_createsubscriber.c:2104
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Sie müssen %s als PostgreSQL-Superuser ausführen."
 
-#: pg_createsubscriber.c:2127
-#, fuzzy, c-format
-#| msgid "database \"%s\" specified more than once"
+#: pg_createsubscriber.c:2169
+#, c-format
 msgid "database \"%s\" specified more than once for -d/--database"
-msgstr "Datenbank »%s« mehrmals angegeben"
+msgstr "Datenbank »%s« mehrmals für -d/--database angegeben"
 
-#: pg_createsubscriber.c:2146
-#, fuzzy, c-format
-#| msgid "table name \"%s\" specified more than once"
-msgid "object type \"%s\" is specified more than once for -R/--remove"
-msgstr "Tabellenname »%s« mehrmals angegeben"
-
-#: pg_createsubscriber.c:2174
-#, fuzzy, c-format
-#| msgid "publication \"%s\" specified more than once"
+#: pg_createsubscriber.c:2210
+#, c-format
 msgid "publication \"%s\" specified more than once for --publication"
-msgstr "Publikation »%s« mehrmals angegeben"
+msgstr "Publikation »%s« mehrmals für --publication angegeben"
 
-#: pg_createsubscriber.c:2183
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" specified more than once"
+#: pg_createsubscriber.c:2219
+#, c-format
 msgid "replication slot \"%s\" specified more than once for --replication-slot"
-msgstr "Replikations-Slot »%s« mehrmals angegeben"
+msgstr "Replikations-Slot »%s« mehrmals für --replication-slot angegeben"
 
-#: pg_createsubscriber.c:2192
-#, fuzzy, c-format
-#| msgid "subscription \"%s\" specified more than once"
+#: pg_createsubscriber.c:2228
+#, c-format
 msgid "subscription \"%s\" specified more than once for --subscription"
-msgstr "Subskription »%s« mehrmals angegeben"
+msgstr "Subskription »%s« mehrmals für --subscription angegeben"
 
-#: pg_createsubscriber.c:2217
-#, fuzzy, c-format
-#| msgid "COPY %s cannot be used with %s"
-msgid "%s cannot be used with -a/--all"
-msgstr "COPY %s kann nicht mit %s verwendet werden"
+#: pg_createsubscriber.c:2234
+#, c-format
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "Objekttyp »%s« mehrmals für --clean angegeben"
+
+#: pg_createsubscriber.c:2259
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "Optionen %s und %s können nicht zusammen verwendet werden"
 
-#: pg_createsubscriber.c:2235
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "kein Datenverzeichnis für Subskriptionsserver angegeben"
 
-#: pg_createsubscriber.c:2246
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "konnte aktuelles Verzeichnis nicht ermitteln"
 
-#: pg_createsubscriber.c:2263
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "keine Verbindungsparameter für Publikationsserver angegeben"
 
-#: pg_createsubscriber.c:2267
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "validiere Verbindungsparameter für Publikationsserver"
 
-#: pg_createsubscriber.c:2273
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "validiere Verbindungsparameter für Subskriptionsserver"
 
-#: pg_createsubscriber.c:2290
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "keine Datenbank wurde angegeben"
 
-#: pg_createsubscriber.c:2301
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "Datenbankname »%s« wurde aus der Verbindungszeichenkette des Publikationsservers extrahiert"
 
-#: pg_createsubscriber.c:2306
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "kein Datenbankname angegeben"
 
-#: pg_createsubscriber.c:2316
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "falsche Anzahl Publikationsnamen angegeben"
 
-#: pg_createsubscriber.c:2317
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "Die Anzahl der angegebenen Publikationsnamen (%d) muss mit der Anzahl der angegebenen Datenbanknamen (%d) übereinstimmen."
 
-#: pg_createsubscriber.c:2323
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "falsche Anzahl Subskriptionsnamen angegeben"
 
-#: pg_createsubscriber.c:2324
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "Die Anzahl der angegebenen Subskriptionsnamen (%d) muss mit der Anzahl der angegebenen Datenbanknamen (%d) übereinstimmen."
 
-#: pg_createsubscriber.c:2330
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "falsche Anzahl Replikations-Slot-Namen angegeben"
 
-#: pg_createsubscriber.c:2331
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "Die Anzahl der angegebenen Replikations-Slot-Namen (%d) muss mit der Anzahl der angegebenen Datenbanknamen (%d) übereinstimmen."
 
-#: pg_createsubscriber.c:2343
-#, fuzzy, c-format
-#| msgid "invalid output format \"%s\" specified"
-msgid "invalid object type \"%s\" specified for -R/--remove"
-msgstr "ungültiges Ausgabeformat »%s« angegeben"
+#: pg_createsubscriber.c:2386
+#, c-format
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "ungültiger Objekttyp »%s« für %s angegeben"
 
-#: pg_createsubscriber.c:2344
-#, fuzzy, c-format
-#| msgid "reading publications"
-msgid "The valid option is: \"publications\""
-msgstr "lese Publikationen"
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "Der gültige Wert ist: »%s«"
 
-#: pg_createsubscriber.c:2375
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "Datenverzeichnis des Subskriptionsservers ist keine Kopie des Quelldatenbankclusters"
 
-#: pg_createsubscriber.c:2388
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "Standby-Server läuft"
 
-#: pg_createsubscriber.c:2389
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Halten Sie den Standby-Server an und versuchen Sie erneut."
 
-#: pg_createsubscriber.c:2398
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "starte den Standby-Server mit Kommandozeilenoptionen"
 
-#: pg_createsubscriber.c:2414 pg_createsubscriber.c:2449
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "stoppe den Subskriptionsserver"
 
-#: pg_createsubscriber.c:2428
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "starte den Subskriptionsserver"
 
-#: pg_createsubscriber.c:2457
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "Fertig!"
@@ -2035,7 +2085,7 @@ msgstr ""
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=VERZ   Write-Ahead-Log-Dateien in dieses Verzeichnis empfangen\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:92
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       nach Empfang der angegebenen LSN beenden\n"
@@ -2114,7 +2164,7 @@ msgstr "Log-Streaming gestoppt bei %X/%X (Zeitleiste %u)"
 msgid "switched to timeline %u at %X/%X"
 msgstr "auf Zeitleiste %u umgeschaltet bei %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1073
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "Interrupt-Signal erhalten, beende"
@@ -2184,7 +2234,7 @@ msgstr "kann Datei »%s« nicht prüfen: Komprimierung mit %s wird von dieser In
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "starte Log-Streaming bei %X/%X (Zeitleiste %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:807
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "konnte Endposition »%s« nicht parsen"
@@ -2214,23 +2264,23 @@ msgstr "Komprimierung mit %s wird noch nicht unterstützt"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "Replikationsverbindung, die Slot »%s« verwendet, ist unerwarteterweise datenbankspezifisch"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:991
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "lösche Replikations-Slot »%s«"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:1001
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "erzeuge Replikations-Slot »%s«"
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1026
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "Verbindung beendet"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1030
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "Verbindung beendet; erneuter Versuch in %d Sekunden"
@@ -2258,17 +2308,14 @@ msgstr ""
 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:93
-#, fuzzy, c-format
-#| msgid ""
-#| "  --includedir          show location of C header files of the client\n"
-#| "                        interfaces\n"
+#: pg_recvlogical.c:92
+#, c-format
 msgid ""
-"      --failover         enable replication slot synchronization to standby servers when\n"
-"                         creating a slot\n"
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
 msgstr ""
-"  --includedir          zeige Installationsverzeichnis der Headerdateien der\n"
-"                        Client-Schnittstellen\n"
+"      --enable-failover  Synchronisation von Replikations-Slots an Standby-Server\n"
+"                         einschalten, wenn ein Replikations-Slot erzeugt wird\n"
 
 #: pg_recvlogical.c:95
 #, c-format
@@ -2312,138 +2359,138 @@ msgstr "  -S, --slot=SLOTNAME    Name des logischen Replikations-Slots\n"
 
 #: pg_recvlogical.c:108
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
 msgstr ""
-"  -t, --two-phase        Dekodieren von vorbereiteten Transaktionen beim Erzeugen\n"
+"  -t, --enable-two-phase Dekodieren von vorbereiteten Transaktionen beim Erzeugen\n"
 "                         eines Slots einschalten\n"
 
-#: pg_recvlogical.c:113
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (gleich --enable-two-phase, veraltet)\n"
+
+#: pg_recvlogical.c:114
 #, 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:146
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "bestätige Schreiben bis %X/%X, Flush bis %X/%X (Slot %s)"
 
-#: pg_recvlogical.c:170 receivelog.c:359
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "konnte Rückmeldungspaket nicht senden: %s"
 
-#: pg_recvlogical.c:240
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "starte Log-Streaming bei %X/%X (Slot %s)"
 
-#: pg_recvlogical.c:282
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "Streaming eingeleitet"
 
-#: pg_recvlogical.c:347
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "konnte Logdatei »%s« nicht öffnen: %m"
 
-#: pg_recvlogical.c:376 receivelog.c:889
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "ungültiges Socket: %s"
 
-#: pg_recvlogical.c:429 receivelog.c:917
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() fehlgeschlagen: %m"
 
-#: pg_recvlogical.c:436 receivelog.c:966
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "konnte keine Daten vom WAL-Stream empfangen: %s"
 
-#: pg_recvlogical.c:478 pg_recvlogical.c:529 receivelog.c:1010
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
 #: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "Streaming-Header zu klein: %d"
 
-#: pg_recvlogical.c:513 receivelog.c:846
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "unbekannter Streaming-Header: »%c«"
 
-#: pg_recvlogical.c:567 pg_recvlogical.c:579
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "konnte %d Bytes nicht in Logdatei »%s« schreiben: %m"
 
-#: pg_recvlogical.c:637 receivelog.c:641 receivelog.c:678
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "unerwarteter Abbruch des Replikations-Streams: %s"
 
-#: pg_recvlogical.c:802
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "konnte Startposition »%s« nicht parsen"
 
-#: pg_recvlogical.c:880
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "kein Slot angegeben"
 
-#: pg_recvlogical.c:887
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "keine Zieldatei angegeben"
 
-#: pg_recvlogical.c:894
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "keine Datenbank angegeben"
 
-#: pg_recvlogical.c:901
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "mindestens eine Aktion muss angegeben werden"
 
-#: pg_recvlogical.c:908
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "--create-slot oder --start kann nicht zusammen mit --drop-slot verwendet werden"
 
-#: pg_recvlogical.c:915
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "--create-slot oder --drop-slot kann nicht zusammen mit --startpos verwendet werden"
 
-#: pg_recvlogical.c:922
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos kann nur zusammen mit --start angegeben werden"
 
-#: pg_recvlogical.c:931
-#, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase kann nur zusammen mit --create-slot angegeben werden"
-
-#: pg_recvlogical.c:938
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--failover may only be specified with --create-slot"
-msgstr "--failover kann nur zusammen mit --create-slot angegeben werden"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s kann nur zusammen mit --create-slot angegeben werden"
 
-#: pg_recvlogical.c:975
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "konnte keine datenbankspezifische Replikationsverbindung herstellen"
 
-#: pg_recvlogical.c:1076
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "Endposition %X/%X durch Keepalive erreicht"
 
-#: pg_recvlogical.c:1081
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "Endposition %X/%X erreicht durch WAL-Eintrag bei %X/%X"
diff --git a/src/bin/pg_basebackup/po/es.po b/src/bin/pg_basebackup/po/es.po
index b637026541f..1e5f278a092 100644
--- a/src/bin/pg_basebackup/po/es.po
+++ b/src/bin/pg_basebackup/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:49+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:18+0000\n"
+"PO-Revision-Date: 2026-02-07 09:55+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -21,30 +21,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
+#: ../../fe_utils/astreamer_zstd.c:288
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "esta instalación no soporta compresión con %s"
@@ -98,7 +99,7 @@ msgstr "el algoritmo de compresión «%s» no acepta modo de larga distancia"
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -110,7 +111,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo «%s»: %m"
@@ -133,10 +134,10 @@ msgstr ""
 "serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
 "directorio de datos."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
@@ -146,8 +147,8 @@ msgstr "no se pudo abrir el archivo «%s»: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
@@ -163,36 +164,36 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -227,191 +228,200 @@ msgstr "no se pudo re-ejecutar con el token restringido: código de error %lu"
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "no se pudo obtener el código de salida del subproceso: código de error %lu"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "el valor «%s» no es válido para la opción «%s»"
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "%s debe estar en el rango %d..%d"
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "método de sync no reconocido: «%s»"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:334
-#, c-format
-msgid "out of memory"
-msgstr "memoria agotada"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "no se pudo escribir a archivo «%s»: %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
 
-#: ../../fe_utils/string_utils.c:587
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
-msgstr "el argumento de la orden de shell contiene un salto de línea o retorno de carro: «%s»\n"
-
-#: ../../fe_utils/string_utils.c:760
-#, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:278
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "estado inesperado mientras se extraía el archivo"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:329
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "no se pudo definir los permisos del directorio «%s»: %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:348
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "no se pudo crear un enlace simbólico desde «%s» a «%s»: %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:368
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "no se pudo definir los permisos al archivo «%s»: %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "no se pudo crear el archivo comprimido «%s»: %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "no se pudo duplicar stdout: %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "no se pudo abrir el archivo de salida: %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "no se pudo definir el nivel de compresión %d: %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "no se pudo escribir al archivo comprimido «%s»: %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo comprimido «%s»: %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "no se pudo inicializar la biblioteca de compresión"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "no se pudo descomprimir datos: %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "formato de resultados inesperado mientras se inyectaban los parámetros de recuperación"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "no se pudo crear un contexto de compresión lz4: %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "no se pudo escribir la cabecera lz4: %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
 #, c-format
 msgid "could not compress data: %s"
 msgstr "no se pudo comprimir datos: %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "no se pudo terminar la compresión lz4: %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "no se pudo inicializar la biblioteca de compresión: %s"
 
-#: bbstreamer_tar.c:244
+#: ../../fe_utils/astreamer_tar.c:244
 #, c-format
 msgid "tar file trailer exceeds 2 blocks"
 msgstr "la terminación del archivo tar excede de 2 bloques"
 
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:249
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "se encontró un estado inesperado mientras se interpretaba el archivo tar"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:292
 #, c-format
 msgid "tar member has empty name"
 msgstr "miembro de tar tiene nombre vacío"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:326
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "el flujo COPY terminó antes que el último archivo estuviera completo"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "no se pudo restablecer el contexto de compresión zstd"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "no se pudo definir el nivel de compresión zstd a %d: %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
 msgstr "no se pudo definir la cantidad de procesos ayudantes de compresión a %d: %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:120
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "no se pudo habilitar el modo de larga distancia: %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:279
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "no se pudo crear el contexto de descompresión zstd"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "el valor «%s» no es válido para la opción «%s»"
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "%s debe estar en el rango %d..%d"
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "método de sync no reconocido: «%s»"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "memoria agotada"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "el argumento de la orden de shell contiene un salto de línea o retorno de carro: «%s»\n"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "formato de resultados inesperado mientras se inyectaban los parámetros de recuperación"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -502,14 +512,14 @@ msgstr ""
 "en ejecución.\n"
 "\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCIÓN]...\n"
@@ -660,12 +670,12 @@ msgstr "  -P, --progress         mostrar información de progreso\n"
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=NOMBRE      slot de replicación a usar\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          desplegar mensajes verbosos\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostrar información de versión, luego salir\n"
@@ -723,12 +733,12 @@ msgid ""
 "                         set method for syncing files to disk\n"
 msgstr "      --sync-method=MÉTODO  definir método para sincronizar archivos a disco\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostrar esta ayuda, luego salir\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -742,12 +752,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONSTR    cadena de conexión\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, 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:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        número de port del servidor\n"
@@ -761,25 +771,25 @@ msgstr ""
 "  -s, --status-interval=INTERVALO (segundos)\n"
 "                         tiempo entre envíos de paquetes de estado al servidor\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, 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:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      nunca pedir contraseña\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, 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:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -788,8 +798,8 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
@@ -799,8 +809,8 @@ msgstr "Sitio web de %s: <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "no se pudo leer desde la tubería: %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:521
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "no se pudo interpretar la ubicación del WAL «%s»"
@@ -815,512 +825,508 @@ msgstr "no se pudo completar la escritura de archivos WAL: %m"
 msgid "could not create pipe for background process: %m"
 msgstr "no se pudo crear la tubería para el proceso en segundo plano: %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "se creó slot temporal de replicación «%s»"
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "se creó el slot de replicación «%s»"
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "no se pudo lanzar el proceso en segundo plano: %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "no se pudo lanzar el hilo en segundo plano: %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "el directorio «%s» existe pero no está vacío"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "no se pudo acceder al directorio «%s»: %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, 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:870
+#: pg_basebackup.c:871
 #, 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:886
+#: pg_basebackup.c:887
 #, 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:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "tasa de transferencia «%s» no es un valor válido"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "tasa de transferencia «%s» no válida: %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "tasa de transferencia debe ser mayor que cero"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "unidad de --max-rato no válida: «%s»"
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "la tasa de transferencia «%s» excede el rango de enteros"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "la tasa de transferencia «%s» está fuera de rango"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "no se pudo obtener un flujo de datos COPY: %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "no fue posible leer datos COPY: %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "un proceso en segundo plano terminó inesperadamente"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "no se pueden inyectar un manifiesto en un archivo tar comprimido"
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid "Use client-side compression, send the output to a directory rather than standard output, or use %s."
 msgstr "Use compresión del lado del cliente, envíe la salida a un directorio en lugar de a salida estándar, o use %s."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "no se pudo interpretar el archivo «%s»"
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
 msgstr "Sólo los archivos tar pueden ser interpretados."
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr "El formato plano requiere que pg_basebackup interprete el archivo."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid "Using - as the output directory requires pg_basebackup to parse the archive."
 msgstr "Usar - como directorio de salida requiere que pg_basebackup interprete el archivo."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr "La opción -R requiere que pg_basebackup interprete el archivo."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "los archivos deben preceder al manifiesto"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "nombre de archivo no válido: «%s»"
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "datos inesperados"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "mensaje COPY vacío"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "mensaje COPY mal formado de tipo %d, largo %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "versión del servidor %s incompatible"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr "Use -X none o -X fetch para deshabilitar el flujo de log."
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "el servidor no soporta backup incremental"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:367 streamutil.c:441
-#: streamutil.c:493 streamutil.c:581 streamutil.c:733 streamutil.c:778
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "no se pudo ejecutar la orden de replicación «%s»: %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "no se pudo cargar el manifiesto: %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "no se pudo cargar el manifiesto: estado inesperado %s"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "no fue posible enviar datos COPY: %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "no se pudo enviar fin-de-COPY: %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "conjunto de resultados inesperado mientras se enviaba el manifiesto"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "los destinos de respaldo no están soportados por esta versión de servidor"
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr "la configuración de recuperación no puede ser escrita cuando se usa un destino de respaldo base"
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "el servidor no soporta compresión del lado del servidor"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr "iniciando el respaldo base, esperando que el checkpoint se complete"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "esperando al checkpoint"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "no se pudo iniciar el respaldo base: %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid "server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "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"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "el checkpoint se ha completado"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "punto de inicio del WAL: %s en el timeline %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "no se pudo obtener la cabecera de respaldo: %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "el servidor no retornó datos"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr "sólo se puede escribir un tablespace a stdout, la base de datos tiene %d"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "iniciando el receptor de WAL en segundo plano"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "el respaldo falló: %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "el servidor no retornó la posición final del WAL"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "posición final del WAL: %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "ocurrió un error de checksums"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "la recepción final falló: %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "esperando que el proceso en segundo plano complete el flujo..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "no se pudo enviar una orden a la tubería de segundo plano: %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "no se pudo esperar al proceso hijo: %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "el hijo %d murió, pero se esperaba al %d"
 
-#: pg_basebackup.c:2248 streamutil.c:92 streamutil.c:207 streamutil.c:319
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "no se pudo esperar el hilo hijo: %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "no se pudo obtener la cabecera de respaldo: %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "el hilo hijo terminó con error %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "sincronizando datos a disco ..."
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "renombrando backup_manifest.tmp a backup_manifest"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "el respaldo base se ha completado"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr "argumento de checkpoint «%s» no válido, debe ser «fast» o «spread»"
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "formato de salida «%s» no válido, debe ser «plain» o «tar»"
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
 msgstr "opción de wal-method «%s» no válida, debe ser «fetch», «stream» o «none»"
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2038 pg_createsubscriber.c:2048
-#: pg_createsubscriber.c:2056 pg_createsubscriber.c:2084
-#: pg_createsubscriber.c:2116 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2046 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "no se puede especificar un formato junto con un destino de respaldo"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "debe especificar un directorio de salida o destino de respaldo base"
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "no se puede especificar un directorio de salida junto con un destino de respaldo"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "algoritmo de compresión no reconocido: «%s»"
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "especificación de compresión no válida: %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid "client-side compression is not possible when a backup target is specified"
 msgstr "la compresión del lado del cliente no es posible cuando se especifica un destino del respaldo base"
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "sólo los respaldos de modo tar pueden ser comprimidos"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
 msgstr "no se puede enviar WAL cuando se especifica un destino del respaldo base"
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "no se puede enviar WALs en modo tar a stdout"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "los slots de replicación sólo pueden usarse con flujo de WAL"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "no se puede usar --no-slot junto con nombre de slot"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "la opcón %s necesita que se especifique un slot con --slot"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "%s y %s son opciones incompatibles"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "la ubicación del directorio de WAL no puede especificarse junto con un destino de respaldo"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "la ubicación del directorio de WAL sólo puede especificarse en modo «plain»"
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "la ubicación del directorio de WAL debe ser una ruta absoluta"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "no se pudo crear el enlace simbólico «%s»: %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "falló al final de la recuperación"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid "The target server cannot be used as a physical replica anymore.  You must recreate the physical replica before continuing."
 msgstr "El servidor de destino no puede ser usado más como réplica física.  Debe volver a crear la réplica física antes de continuar."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "la publicación «%s» en la base de datos «%s» en el primaro fue abandonada"
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "Borre esta publicación antes de volver a intentar."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "el slot de replicación «%s» en la base de datos «%s» en el primario fue abandonada"
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1261
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "Elimine este slot de replicación pronto para evitar la retención de archivos WAL."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid ""
 "%s creates a new logical replica from a standby server.\n"
@@ -1330,7 +1336,7 @@ msgstr ""
 "servidor standby.\n"
 "\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid ""
 "\n"
@@ -1339,52 +1345,75 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid ""
+"  -a, --all                       create subscriptions for all databases except template\n"
+"                                  databases and databases that don't allow connections\n"
+msgstr ""
+"  -a, --all                      crear suscripciones para todas las bases de datos excepto\n"
+"                                 las que no permiten conexiones y las marcadas como patrón\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid "  -d, --database=DBNAME           database in which to create a subscription\n"
 msgstr "  -d, --dbname=BASE-DATOS        base de datos en la cual crear una suscripción\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid "  -D, --pgdata=DATADIR            location for the subscriber data directory\n"
 msgstr "  -D, --pgdata=DATADIR           ubicación del directorio de datos del suscriptor\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr "  -n, --dry-run                  no actualiza, sólo muestra lo que se haría\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr "  -p, --subscriber-port=PUERTO   número de puerto del suscriptor (def. %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr "  -P, --publisher-server=CONSTR  cadena de conexión del publicador\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=DIR            directorio de sockets a usar (omisión: dir. actual)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SEGS    segundos a esperar a que la recuperación termine\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
+msgstr "  -T, --enable-two-phase         activar commit en dos fases a todas las suscripciones\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=USUARIO  nombre de usuario para conexión del suscriptor\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                  desplegar mensajes verbosos\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"      --clean=TIPO_OBJETO        eliminar todos los objetos del tipo especificado desde las\n"
+"                                 bases de datos en el suscriptor; acepta: «%s»\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid ""
 "      --config-file=FILENAME      use specified main server configuration\n"
@@ -1393,555 +1422,651 @@ msgstr ""
 "      --config-file=ARCHIVO      utilizar el archivo de configuración del servidor\n"
 "                                 principal especificado al ejecutar el clúster de destino\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=NOMBRE       nombre de publicación\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=NOMBRE  nombre de slot de replicación\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=NOMBRE      nombre de suscripción\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                  mostrar información de versión y salir\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                     mostrar esta ayuda y salir\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "no se pudo interpretar la cadena de conexión: %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "el programa «%s» es requerido por %s pero se encontró en el mismo directorio que «%s»"
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "El programa «%s» fue encontrado por «%s», pero no es de la misma versión que %s"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "verificando si el directorio «%s» es un directorio de datos de base de datos"
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "no existe el directorio de datos «%s»"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "el directorio «%s» no es un directorio de base de datos"
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "falló la conexión a la base de datos: %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "no se pudo limpiar search_path: %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "no se pudo limpiar «search_path»: %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "obteniendo el identificador de sistema del publicador"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "no se pudo obtener el identificador de sistema: %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr "no se pudo obtener el identificador de sistema: se obtuvieron %d filas, se esperaban %d filas"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "identificador de sistema es %llu en el publicador"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "identificador de sistema es %<PRIu64> en el publicador"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "obteniendo identificador de sistema del suscriptor"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "el archivo de control parece estar corrupto"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "el identificador de sistema es %llu en suscriptor"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "el identificador de sistema es %<PRIu64> en suscriptor"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "modificando el identificador de sistema del suscriptor"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "modo de prueba: el identificador de sistema sería %<PRIu64> en suscriptor"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "modo de prueba: ejecutaría pg_resetwal en el suscriptor"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "ejecutando pg_resetwal en el suscriptor"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "el suscriptor cambió exitosamente el identificador de sistema"
+msgid "successfully reset WAL on the subscriber"
+msgstr "se reinició WAL exitosamente en el suscriptor"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "no se pudo cambiar el identificador de sistema del suscriptor: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "no se pudo reiniciar WAL en el suscriptor: %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "no se pudo obtener el OID de base de datos: %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "no se pudo obtener el OID de base de datos: se obtuvieron %d filas, se esperaban %d filas"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "crear el slot de replicación «%s» en el publicador"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "no se pudo escribir un registro WAL adicional: %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "no se pudo obtener el progreso de la recuperación: %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "verificando configuración en el publicador"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "el servidor primario no puede estar en recuperación"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "no se pudo obtener configuraciones del publicador: %s"
 
 # FIXME see slot.c:779.  See also  postmaster.c:835
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:956
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "el publicador requiere wal_level >= «logical»"
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "el publicador requiere «wal_level» >= «logical»"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "el publicador requiere %d slots de replicación, pero solo quedan %d"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Aumente el parámetro de configuración «%s» a al menos %d."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "el publicador requiere %d procesos WAL sender, pero sólo quedan %d"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "la opción two_phase no será activada en los slots de replicación"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "Las suscripciones serán creadas con la opción two_phase desactivada.  Las transacciones preparadas serán replicadas durante COMMIT PREPARED."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:983
+#, c-format
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "Puede usar la opción de línea de órdenes --enable-two-phase para activar two_phase."
+
+#: pg_createsubscriber.c:993
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "el WAL requerido podría ser eliminado del publicador"
+
+#: pg_createsubscriber.c:994
+#, c-format
+msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
+msgstr "Defina el parámetro de configuración «%s» a -1 para asegurar que los archivos WAL requeridos no sean eliminados prematuramente."
+
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "verificando configuraciones en el suscriptor"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "el servidor de destino debe ser un standby"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "no se pudo obtener la configuración del suscriptor: %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1081
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "el suscriptor requiere %d slots de replicación, pero sólo quedan %d"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr "el suscriptor requiere %d slots de replicación activos, pero sólo quedan %d"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "el suscriptor requiere %d procesos de replicación lógica, pero sólo quedan %d"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "el suscriptor requiere %d procesos ayudantes, pero solo quedan %d"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "moo de prueba: se eliminaría la suscripción «%s» en base de datos «%s»"
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "eliminando suscripción «%s» en base de datos «%s»"
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "no se pudo eliminar la suscripción «%s»: %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "no se pudo obtener suscripciones pre-existentes: %s"
 
-#: pg_createsubscriber.c:1259
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "no se pudo eliminar el slot de replicación «%s» en el primario"
 
-#: pg_createsubscriber.c:1293
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "no se pudo obtener información de slots de replicación \"failover\": %s"
 
-#: pg_createsubscriber.c:1295 pg_createsubscriber.c:1304
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "Elimine los slots de replicación de failover en el suscriptor pronto para evitar retención de archivos WAL."
 
-#: pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "no se pudo eliminar el slot de replicación \"failover\""
 
-#: pg_createsubscriber.c:1325
+#: pg_createsubscriber.c:1389
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "creando el slot de replicación «%s» en base de datos «%s»"
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "modo de prueba: se crearía el slot de replicación «%s» en base de datos «%s» en el publicador"
 
-#: pg_createsubscriber.c:1343
+#: pg_createsubscriber.c:1392
+#, c-format
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "creando el slot de replicación «%s» en base de datos «%s» en el publicador"
+
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "no se pudo crear el slot de replicación «%s» en base de datos «%s»: %s"
 
-#: pg_createsubscriber.c:1373
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "modo de prueba: se eliminaría el slot de replicación «%s» en base de datos «%s»"
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "eliminando el slot de replicación «%s» en base de datos «%s»"
 
-#: pg_createsubscriber.c:1389
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "no se pudo eliminar el slot de replicación «%s» en base de datos «%s»: %s"
 
-#: pg_createsubscriber.c:1410
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctl falló con código de retorno %d"
 
-#: pg_createsubscriber.c:1415
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl fue terminado por una excepción 0x%X"
 
-#: pg_createsubscriber.c:1417
+#: pg_createsubscriber.c:1489
 #, 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."
 
-#: pg_createsubscriber.c:1419
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl fue terminado por una señal %d: %s"
 
-#: pg_createsubscriber.c:1425
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl terminó con código no reconocido %d"
 
-#: pg_createsubscriber.c:1428
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "La orden fallida era: %s"
 
-#: pg_createsubscriber.c:1474
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "el servidor fue iniciado"
 
-#: pg_createsubscriber.c:1489
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "el servidor fue detenido"
 
-#: pg_createsubscriber.c:1508
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "esperando que el servidor de destino alcance el estado consistente"
 
-#: pg_createsubscriber.c:1531
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "la recuperación tomó demasiado tiempo"
 
-#: pg_createsubscriber.c:1544
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "el servidor no terminó la recuperación"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "el servidor de destino alcanzó el estado consistente"
 
-#: pg_createsubscriber.c:1547
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "Si pg_createsubscriber falla a partir de este punto, deberá re-crear la réplica física antes de continuar."
 
-#: pg_createsubscriber.c:1574
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "no se pudo obtener la información de publicación: %s"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "la publicación «%s» ya existe"
 
-#: pg_createsubscriber.c:1589
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Considere cambiar el nombre de esta publicación antes de continuar."
 
-#: pg_createsubscriber.c:1596
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "modo de prueba: se crearía la publicación «%s» en la base de datos «%s»"
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "creando la publicación «%s» en la base de datos «%s»"
 
-#: pg_createsubscriber.c:1609
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "no se pudo crear la publicación «%s» en la base de datos «%s»: %s"
 
-#: pg_createsubscriber.c:1638
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "modo de prueba: se eliminaría la publicación «%s» en la base de datos «%s»"
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "eliminando la publicación «%s» en la base de datos «%s»"
 
-#: pg_createsubscriber.c:1652
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "no se pudo eliminar la publicación «%s» en la base de datos «%s»: %s"
 
-#: pg_createsubscriber.c:1698
+#: pg_createsubscriber.c:1769
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "eliminando todas las publicaciones existentes en la base de datos «%s»"
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "modo de prueba: se crearía la suscripción «%s» en la base de datos «%s»"
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "creando la suscripción «%s» en la base de datos «%s»"
 
-#: pg_createsubscriber.c:1719
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "no se pudo create la suscripción «%s» en la base de datos «%s»: %s"
 
-#: pg_createsubscriber.c:1764
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "no se pudo obtener el OID de suscripción: %s"
 
-#: pg_createsubscriber.c:1771
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "no se pudo obtener el OID de suscripción: se obtuvieron %d filas, se esperaban %d filas"
 
-#: pg_createsubscriber.c:1795
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "modo de prueba: se definiría el progreso de replicación (nombre de nodo «%s», LSN %s) en base de datos «%s»"
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "definiendo progreso de replicación (nombre de nodo «%s», LSN %s) en base de datos «%s»"
 
-#: pg_createsubscriber.c:1810
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "no se pudo establecer el progreso de replicación para la suscripción «%s»: %s"
 
-#: pg_createsubscriber.c:1841
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "modo de prueba: se activaría la suscripción «%s» en la base de datos «%s»"
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "activando la suscripción «%s» en la base de datos «%s»"
 
-#: pg_createsubscriber.c:1853
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "no se pudo habilitar la suscripción «%s»: %s"
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2041
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "no se pudo obtener una lista de bases de datos: %s"
+
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "no puede ser ejecutado con el usuario «root»"
 
-#: pg_createsubscriber.c:1946
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Debe ejecutar %s con el superusuario de PostgreSQL."
 
-#: pg_createsubscriber.c:1967
+#: pg_createsubscriber.c:2169
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "la base de datos «%s» fue especificada más de una vez para -d/--database"
+
+#: pg_createsubscriber.c:2210
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "la base de datos «%s» fue especificado más de una vez"
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "la publicación «%s» fue especificada más de una vez para --publication"
 
-#: pg_createsubscriber.c:2008
+#: pg_createsubscriber.c:2219
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "la publicación «%s» fue especificada más de una vez"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "el slot de replicación «%s» fue especificado más de una vez para --replication-slot"
 
-#: pg_createsubscriber.c:2020
+#: pg_createsubscriber.c:2228
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "el slot de replicación «%s» fue especificado más de una vez"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "la suscripción «%s» fue especificada más de una vez para --subscription"
 
-#: pg_createsubscriber.c:2032
+#: pg_createsubscriber.c:2234
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "la suscripción «%s» fue especificada más de una vez"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "el tipo de objeto «%s» fue especificado más de una vez para --clean"
 
-#: pg_createsubscriber.c:2055
+#: pg_createsubscriber.c:2259
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "las opciones %s y %s no pueden usarse juntas"
+
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "no se especificó un directorio de datos de suscripción"
 
-#: pg_createsubscriber.c:2066
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "no se pudo determinar el directorio actual"
 
-#: pg_createsubscriber.c:2083
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "no se especificó un string de conexión de publicador"
 
-#: pg_createsubscriber.c:2087
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "validando string de conexión del publicador"
 
-#: pg_createsubscriber.c:2093
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "validando string de conexión del suscriptor"
 
-#: pg_createsubscriber.c:2098
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "no se especificó una base de datos"
 
-#: pg_createsubscriber.c:2110
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "el nombr de base de datos «%s» fue extraído del string de conexión del publicador"
 
-#: pg_createsubscriber.c:2115
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "no se especificó un nombre de base de datos"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "una cantidad incorrecta de nombres de publicación fue especificada"
 
-#: pg_createsubscriber.c:2126
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "La cantidad de nombres de publicación especificados (%d) debe coincidir con el número de nombres de bases de datos (%d)."
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "una cantidad incorrecta de nombres de suscripción fue especificada"
 
-#: pg_createsubscriber.c:2133
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "La cantidad de nombres de suscripción especificados (%d) debe coincidir con el número de nombres de bases de datos (%d)."
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "una cantidad incorrecta de nombres de slots de replicación fue especificada"
 
-#: pg_createsubscriber.c:2140
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "La cantidad de nombres de slots de replicación especificados (%d) debe coincidir con el número de nombres de bases de datos (%d)."
 
-#: pg_createsubscriber.c:2169
+#: pg_createsubscriber.c:2386
+#, c-format
+#| msgid "invalid object type \"%s\" specified for --clean"
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "tipo de objeto «%s» no válido especificado para %s"
+
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "El valor válido es: «%s»"
+
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "el directorio de datos del suscriptor no es una copia del clúster de origen"
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "el servidor standby está en ejecución"
 
-#: pg_createsubscriber.c:2183
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Detenga el servidor standby y pruebe otra vez."
 
-#: pg_createsubscriber.c:2192
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "iniciando el standby con opciones de línea de órdenes"
 
-#: pg_createsubscriber.c:2208 pg_createsubscriber.c:2243
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "deteniendo el suscriptor"
 
-#: pg_createsubscriber.c:2222
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "iniciando el suscriptor"
 
-#: pg_createsubscriber.c:2251
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "¡Listo!"
@@ -1960,17 +2085,17 @@ msgstr ""
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=DIR    recibir los archivos de WAL en este directorio\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       salir luego de recibir el LSN especificado\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, 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_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, 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"
@@ -1980,7 +2105,7 @@ msgstr "  -n, --no-loop          no entrar en bucle al perder la conexión\n"
 msgid "      --no-sync          do not wait for changes to be written safely to disk\n"
 msgstr "      --no-sync          no esperar que los cambios se sincronicen a disco\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -2013,12 +2138,12 @@ msgstr ""
 "\n"
 "Acciones optativas:\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      crear un nuevo slot de replicación (para el nombre, vea --slot)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        eliminar un slot de replicación (para el nombre, vea --slot)\n"
@@ -2038,7 +2163,7 @@ msgstr "detenido el flujo de log en %X/%X (timeline %u)"
 msgid "switched to timeline %u at %X/%X"
 msgstr "cambiado al timeline %u en %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "se recibió una señal de interrupción, saliendo"
@@ -2108,7 +2233,7 @@ msgstr "no se puede verificar el archivo «%s»: la compresión con %s no está
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "iniciando el flujo de log en %X/%X (timeline %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "no se pudo interpretar la posición final «%s»"
@@ -2138,28 +2263,28 @@ msgstr "el método de compresión %s no está soportado aún"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "la conexión de replicación usando el slot «%s» es inesperadamente específica a una base de datos"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "eliminando el slot de replicación «%s»"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "creando el slot de replicación «%s»"
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "desconectado"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "desconectado; esperando %d segundos para intentar nuevamente"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -2168,7 +2293,7 @@ msgstr ""
 "%s controla flujos de decodificación lógica de PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid ""
 "\n"
@@ -2177,17 +2302,26 @@ msgstr ""
 "\n"
 "Acciones a ejecutar:\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            iniciar flujo en un slot de replicación (para el nombre, vea --slot)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid ""
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
+msgstr ""
+"      --enable-failover  activar sincronización de slots de replicación a servidores standby\n"
+"                         al crear un slot de replicación\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=ARCHIVO     recibir el log en este archivo, - para stdout\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -2196,12 +2330,12 @@ msgstr ""
 "  -F, --fsync-interval=SEGS\n"
 "                         tiempo entre fsyncs del archivo de salida (omisión: %d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, 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:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -2212,371 +2346,371 @@ msgstr ""
 "                         pasar opción NOMBRE con valor opcional VALOR al\n"
 "                         plugin de salida\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    usar plug-in de salida PLUGIN (omisión: %s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, 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:107
+#: pg_recvlogical.c:108
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase        activa decodificación de transacciones preparadas al crear un slot\n"
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr "  -t, --enable-two-phase activa decodificación de transacciones preparadas al crear un slot\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (lo mismo que --enable-two-phase; obsoleto)\n"
+
+#: pg_recvlogical.c:114
 #, 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:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "confirmando escritura hasta %X/%X, fsync hasta %X/%X (slot %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "no se pudo enviar el paquete de retroalimentación: %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "iniciando el flujo de log en %X/%X (slot %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "flujo iniciado"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de registro «%s»: %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "el socket no es válido: %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "no se pudo recibir datos desde el flujo de WAL: %s"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "cabecera de flujo demasiado pequeña: %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "cabecera de flujo no reconocida: «%c»"
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "no se pudo escribir %d bytes al archivo de registro «%s»: %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "término inesperado del flujo de replicación: %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "no se pudo interpretar la posición de inicio «%s»"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "no se especificó slot"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "no se especificó un archivo de destino"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "no se especificó una base de datos"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "debe especificarse al menos una operación"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "no puede usarse --create-slot o --start junto con --drop-slot"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "no puede usarse --create-slot o --drop-slot junto con --startpos"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos sólo se puede utilizar con --start"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase sólo se puede utilizar con --create-slot"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s sólo se puede utilizar con --create-slot"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "no se pudo establecer una conexión de replicación específica a una base de datos"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "ubicación de término %X/%X alcanzado por «keep-alive»"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "ubicación de término %X/%X alcanzado por registro WAL en %X/%X"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "no se pudo crear el archivo de estado «%s»: %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "no se pudo cerrar el archivo de estado «%s»: %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "no se pudo obtener el tamaño del archivo de WAL «%s»: %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "no se pudo abrir el archivo de WAL «%s»: %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr "no se pudo sincronizar (fsync) el archivo de WAL «%s»: %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
 msgstr[0] "el archivo de WAL «%s» mide %zd byte, debería ser 0 o %d"
 msgstr[1] "el archivo de WAL «%s» mide %zd bytes, debería ser 0 o %d"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "no se pudo abrir archivo de WAL «%s»: %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "no se cambiará el nombre a «%s», el segmento no está completo"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "no se pudo cerrar el archivo «%s»: %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "el servidor reportó un nombre inesperado para el archivo de historia de timeline %u: %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "no se pudo crear el archivo de historia de timeline «%s»: %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "no se pudo escribir al archivo de historia de timeline «%s»: %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions older than %s"
 msgstr "versión de servidor %s incompatible; el cliente no soporta flujos de servidores anteriores a la versión %s"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions newer than %s"
 msgstr "versión de servidor %s incompatible; el cliente no soporta flujos de servidores posteriores a %s"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid "system identifier does not match between base backup and streaming connection"
 msgstr "el identificador de sistema no coincide entre el respaldo base y la conexión de flujo"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "el timeline de inicio %u no está presente en el servidor"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "respuesta inesperada a la orden TIMELINE_HISTORY: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "el servidor reportó un timeline siguiente %u inesperado, a continuación del timeline %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
 msgstr "el servidor paró la transmisión del timeline %u en %X/%X, pero reportó que el siguiente timeline %u comienza en %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "el flujo de replicación terminó antes del punto de término"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid "unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "respuesta inesperada después del fin-de-timeline: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "no se pudo interpretar el punto de inicio del siguiente timeline «%s»"
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "se recibió un registro de WAL para el desplazamiento %u sin ningún archivo abierto"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "se obtuvo desplazamiento de datos WAL %08x, se esperaba %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "no se pudo escribir %d bytes al archivo WAL «%s»: %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "no se pudo enviar el paquete copy-end: %s"
 
-#: streamutil.c:165
+#: streamutil.c:162
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: streamutil.c:192
+#: streamutil.c:189
 #, c-format
 msgid "could not connect to server"
 msgstr "no se pudo conectar al servidor"
 
-#: streamutil.c:233
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "no se pudo limpiar «search_path»: %s"
-
-#: streamutil.c:249
+#: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
 msgstr "no se pudo determinar la opción «integer_datetimes» del servidor"
 
-#: streamutil.c:256
+#: streamutil.c:253
 #, c-format
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr "la opción de compilación «integer_datetimes» no coincide con el servidor"
 
-#: streamutil.c:375
+#: streamutil.c:304
 #, c-format
 msgid "could not fetch WAL segment size: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "no se pudo obtener el tamaño del segmento de WAL: se obtuvo %d filas y %d campos, se esperaban %d filas y %d o más campos"
 
-#: streamutil.c:385
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "el tamaño de segmento de WAL no pudo ser analizado"
 
-#: streamutil.c:403
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
 msgstr[0] "el servidor remoto reportó un tamaño de segmento de WAL no válido (%d byte)"
 msgstr[1] "el servidor remoto reportó un tamaño de segmento de WAL no válido (%d bytes)"
 
-#: streamutil.c:407
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "El tamaño de segmento de WAL debe ser una potencia de dos entre 1 MB y 1 GB."
 
-#: streamutil.c:449
+#: streamutil.c:378
 #, c-format
 msgid "could not fetch group access flag: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "no se pudo obtener el indicador de acceso de grupo: se obtuvo %d filas y %d campos, se esperaban %d filas y %d o más campos"
 
-#: streamutil.c:458
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "el indicador de acceso de grupo no pudo ser analizado: %s"
 
-#: streamutil.c:501 streamutil.c:538
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid "could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "no se pudo identificar al sistema: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d o más campos"
 
-#: streamutil.c:590
+#: streamutil.c:519
 #, c-format
 msgid "could not read replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "no se pudo leer el slot de replicación «%s»: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos"
 
-#: streamutil.c:602
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "no existe el slot de replicación «%s»"
 
-#: streamutil.c:613
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "se esperaba un slot de replicación físico, en cambio se obtuvo tipo «%s»"
 
-#: streamutil.c:627
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr "no se pudo interpretar restart_lsn de WAL «%s» para el slot de replicación «%s»"
 
-#: streamutil.c:744
+#: streamutil.c:678
 #, c-format
 msgid "could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "no se pudo create el slot de replicación «%s»: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos"
 
-#: streamutil.c:788
+#: streamutil.c:722
 #, c-format
 msgid "could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "no se pudo eliminar el slot de replicación «%s»: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos"
@@ -2608,3 +2742,7 @@ msgstr "unlink no soportado con compresión"
 #: walmethods.c:1293
 msgid "could not close compression stream"
 msgstr "no se pudo cerrar el flujo comprimido"
+
+#, c-format
+#~ msgid "options %s and -a/--all cannot be used together"
+#~ msgstr "las opciones %s y -a/--all no pueden usarse juntas"
diff --git a/src/bin/pg_basebackup/po/fr.po b/src/bin/pg_basebackup/po/fr.po
index ae370d26a6c..19dc59a3de7 100644
--- a/src/bin/pg_basebackup/po/fr.po
+++ b/src/bin/pg_basebackup/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-26 19:50+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2026-05-08 18:50+0000\n"
+"PO-Revision-Date: 2026-05-08 21:48+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,32 +19,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.9\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:130
+#: ../../fe_utils/astreamer_zstd.c:285
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "cette construction ne supporte pas la compression avec %s"
@@ -98,7 +99,7 @@ msgstr "l'algorithme de compression « %s » n'accepte pas un mode distance long
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -110,7 +111,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 ../../fe_utils/astreamer_file.c:270
+#: pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier « %s » : %m"
@@ -133,10 +135,10 @@ msgstr ""
 "résultats ci-dessous sont incorrects, et l'installation de PostgreSQL\n"
 "est incompatible avec ce répertoire des données."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
@@ -146,8 +148,8 @@ msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
@@ -163,36 +165,36 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -227,191 +229,205 @@ msgstr "n'a pas pu ré-exécuter le jeton restreint : code d'erreur %lu"
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "n'a pas pu récupérer le code de statut du sous-processus : code d'erreur %lu"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "valeur « %s » invalide pour l'option %s"
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "%s doit être compris entre %d et %d"
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "méthode de synchronisation non reconnu : %s"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:331
-#, c-format
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:366
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier « %s » : %m"
 
-#: ../../fe_utils/string_utils.c:434
-#, 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"
-
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:280
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "état inattendu lors de l'extraction de l'archive"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:326 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:331
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "n'a pas pu configurer les droits du répertoire « %s » : %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:350
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique de « %s » vers « %s » : %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:370
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "n'a pas pu initialiser les droits du fichier « %s » : %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier compressé « %s » : %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "n'a pas pu dupliquer la sortie (stdout) : %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde : %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "n'a pas pu configurer le niveau de compression %d : %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "n'a pas pu écrire dans le fichier compressé « %s » : %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier compressé « %s » : %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "n'a pas pu initialiser la bibliothèque de compression"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:330
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "n'a pas pu décompresser les données : %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "état inattendu lors de l'injection des paramètres de restauration"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "n'a pas pu créer le contexte de compression lz4 : %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "n'a pas pu écrire l'entête lz4 : %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:182
+#: ../../fe_utils/astreamer_zstd.c:224
 #, c-format
 msgid "could not compress data: %s"
 msgstr "n'a pas pu compresser les données : %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "n'a pas pu terminer la compression lz4 : %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "n'a pas pu initialiser la bibliothèque de compression : %s"
 
-#: bbstreamer_tar.c:244
-#, c-format
-msgid "tar file trailer exceeds 2 blocks"
-msgstr "la fin du fichier tar fait plus de 2 blocs"
-
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:254
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "état inattendu lors de l'analyse de l'archive tar"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:300
+#, c-format
+msgid "input file does not appear to be a valid tar archive"
+msgstr "le fichier en entrée ne semble pas être une archive tar valide"
+
+#: ../../fe_utils/astreamer_tar.c:307
 #, c-format
 msgid "tar member has empty name"
 msgstr "le membre de tar a un nom vide"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:328
+#, c-format
+msgid "pax extensions to tar format are not supported"
+msgstr "les extensions pax au format tar ne sont pas supportés"
+
+#: ../../fe_utils/astreamer_tar.c:357
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "le flux COPY s'est terminé avant que le dernier fichier soit terminé"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "n'a pas pu créer le contexte de compression zstd"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "n'a pas pu configurer le niveau de compression zstd à %d : %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
 msgstr "n'a pas pu configurer le nombre de workers de compression à %d : %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:119
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "n'a pas pu activer le mode distance longue : %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:276
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "n'a pas pu créer le contexte de décompression zstd"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "valeur « %s » invalide pour l'option %s"
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "%s doit être compris entre %d et %d"
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "méthode de synchronisation non reconnu : %s"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, 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"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "état inattendu lors de l'injection des paramètres de restauration"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -502,14 +518,14 @@ msgstr ""
 "d'exécution.\n"
 "\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
@@ -659,12 +675,12 @@ msgstr "  -P, --progress                 affiche la progression de la sauvegarde
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=NOMREP              slot de réplication à utiliser\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose                  affiche des messages verbeux\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version                  affiche la version puis quitte\n"
@@ -723,12 +739,12 @@ msgid ""
 "                         set method for syncing files to disk\n"
 msgstr "      --sync-method=METHODE      configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                     affiche cette aide puis quitte\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -742,14 +758,14 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CHAÎNE_CONNEX     chaîne de connexion\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HÔTE                hôte du serveur de bases de données ou\n"
 "                                 répertoire des sockets\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT                numéro de port du serveur de bases de données\n"
@@ -763,25 +779,25 @@ msgstr ""
 "  -s, --status-interval=INTERVAL durée entre l'envoi de paquets de statut au\n"
 "                                 serveur (en secondes)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=UTILISATEUR     se connecte avec cet utilisateur\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, 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:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password                 force la demande du mot de passe (devrait\n"
 "                                 survenir automatiquement)\n"
 
-#: pg_basebackup.c:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -790,8 +806,8 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
@@ -801,8 +817,8 @@ msgstr "Page d'accueil de %s : <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "n'a pas pu lire à partir du tube : %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:518
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "n'a pas pu analyser l'emplacement du journal des transactions « %s »"
@@ -817,512 +833,508 @@ msgstr "n'a pas pu finir l'écriture dans les fichiers de transactions : %m"
 msgid "could not create pipe for background process: %m"
 msgstr "n'a pas pu créer un tube pour le processus en tâche de fond : %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "a créé le slot de réplication temporaire « %s »"
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "a créé le slot de réplication « %s »"
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "n'a pas pu créer un processus en tâche de fond : %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "n'a pas pu créer un thread en tâche de fond : %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "le répertoire « %s » existe mais n'est pas vide"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "n'a pas pu accéder au répertoire « %s » : %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, 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:870
+#: pg_basebackup.c:871
 #, 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:886
+#: pg_basebackup.c:887
 #, 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:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "le taux de transfert « %s » ne correspond pas à une valeur valide"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "taux de transfert invalide (« %s ») : %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "le taux de transfert doit être supérieur à zéro"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "unité invalide pour --max-rate : « %s »"
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "le taux de transfert « %s » dépasse l'échelle des entiers"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "le taux de transfert « %s » est en dehors des limites"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "n'a pas pu obtenir le flux de données de COPY : %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "n'a pas pu lire les données du COPY : %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "un processus worker s'est arrêté de façon inattendue"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "ne peut pas injecter le manifeste dans un fichier tar compressé"
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid "Use client-side compression, send the output to a directory rather than standard output, or use %s."
 msgstr "Utilisez la compression côté client, envoyez la sortie dans un répertoire plutôt que sur la sortie standard, ou utilisez %s."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "n'a pas pu analyser l'archive « %s »"
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
-msgstr "Seules les archives tar peuvent être analysées"
+msgstr "Seules les archives tar peuvent être analysées."
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr "Le format plain requiert que pg_basebackup analyse l'archive."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid "Using - as the output directory requires pg_basebackup to parse the archive."
 msgstr "Utiliser - comme répertoire de sortie requiert que pg_basebackup analyse l'archive."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr "L'option -R requiert que pg_basebackup analyse l'archive."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "les archives doivent précéder le manifeste"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "nom d'archive invalide : « %s »"
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "donnée de charge inattendue"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "message COPY vide"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "message COPY malformé de type %d, longueur %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "version « %s » du serveur incompatible"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr "Utilisez -X none ou -X fetch pour désactiver la réplication en flux."
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "le serveur n'accepte pas les sauvegardes incrémentales"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:364 streamutil.c:438
-#: streamutil.c:490 streamutil.c:578 streamutil.c:730 streamutil.c:775
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "n'a pas pu envoyer la commande de réplication « %s » : %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "n'a pas pu charger le manifeste : %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "n'a pas pu charger le manifeste : statut %s inattendu"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "n'a pas pu envoyer les données COPY : %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "n'a pas pu envoyer end-of-COPY : %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "résultat supplémentaire inattendu lors de l'envoi du manifeste"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "les cibles de sauvegarde ne sont pas supportées par cette version du serveur"
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr "la configuration de la restauration ne peut pas être écrite quand une cible de restauration est utilisée"
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "le serveur ne supporte pas la compression côté serveur"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr "début de la sauvegarde de base, en attente de la fin du checkpoint"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "en attente du checkpoint"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "n'a pas pu initier la sauvegarde de base : %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid "server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "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"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "checkpoint terminé"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "point de départ du journal de transactions : %s sur la timeline %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "n'a pas pu obtenir l'en-tête du serveur : %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "aucune donnée renvoyée du serveur"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr "peut seulement écrire un tablespace sur la sortie standard, la base en a %d"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "lance le récepteur de journaux de transactions en tâche de fond"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "échec de la sauvegarde : %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "aucune position de fin du journal de transactions renvoyée par le serveur"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "point final du journal de transactions : %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "erreur de somme de contrôle"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "échec lors de la réception finale : %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "en attente que le processus en tâche de fond termine le flux..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "n'a pas pu envoyer la commande au tube du processus : %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "n'a pas pu attendre le processus fils : %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "le fils %d est mort, %d attendu"
 
-#: pg_basebackup.c:2248 streamutil.c:89 streamutil.c:204 streamutil.c:316
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "n'a pas pu attendre le thread : %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "n'a pas pu obtenir le code de sortie du thread : %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "le thread a quitté avec le code d'erreur %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "synchronisation des données sur disque..."
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "renommage de backup_manifest.tmp en backup_manifest"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "sauvegarde de base terminée"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr "argument « %s » invalide pour le CHECKPOINT, doit être soit « fast » soit « spread »"
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "format de sortie « %s » invalide, doit être soit « plain » soit « tar »"
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
 msgstr "option wal-method « %s » invalide, doit être soit « fetch » soit « stream » soit « none »"
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2037 pg_createsubscriber.c:2047
-#: pg_createsubscriber.c:2055 pg_createsubscriber.c:2083
-#: pg_createsubscriber.c:2115 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2045 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "ne peut pas spécifier à la fois le format et la cible de sauvegarde"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "doit spécifier un répertoire de sortie ou une cible de sauvegarde"
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "ne peut pas spécifier à la fois le répertoire en sortie et la cible de sauvegarde"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "algorithme de compression inconnu :  « %s »"
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "spécification de compression invalide : %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid "client-side compression is not possible when a backup target is specified"
-msgstr "la compression client n'est pas possible quand une cible de restauration est indiquée."
+msgstr "la compression client n'est pas possible quand une cible de restauration est indiquée"
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "seules les sauvegardes en mode tar peuvent être compressées"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
-msgstr "Les journaux de transactions ne peuvent pas être envoyés en flux quand une cible de sauvegarde est indiquée."
+msgstr "les journaux de transactions ne peuvent pas être envoyés en flux quand une cible de sauvegarde est indiquée"
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "ne peut pas envoyer les journaux de transactions vers stdout en mode tar"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "les slots de réplications peuvent seulement être utilisés avec la réplication en flux des WAL"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "--no-slot ne peut pas être utilisé avec un nom de slot"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "%s a besoin du slot avec l'option --slot"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "%s et %s sont des options incompatibles"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "l'emplacement du répertoire des journaux de transactions ne peut pas être indiqué avec une cible de sauvegarde"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "l'emplacement du répertoire des journaux de transactions doit être indiqué uniquement dans le mode plain"
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "l'emplacement du répertoire des journaux de transactions doit être indiqué avec un chemin absolu"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique « %s » : %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "échec après la fin de la restauration"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid "The target server cannot be used as a physical replica anymore.  You must recreate the physical replica before continuing."
 msgstr "Le serveur cible ne peut plus être utilisé comme un réplicat physique. Vous devez recréer le réplicat physique avant de continuer."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "la publication « %s » dans la base « %s » sur le primaire pourrait être laissé derrière"
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "Supprimez cette publication avant de tenter de nouveau."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "le slot de réplication « %s » dans la base « %s » sur le primaire pourrait être laissé derrière"
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1260
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "Supprimez rapidement ce slot de réplication pour éviter la rétention des fichiers WAL."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid ""
 "%s creates a new logical replica from a standby server.\n"
@@ -1331,7 +1343,7 @@ msgstr ""
 "%s crée un nouveau réplicat logique à partir d'un serveur secondaire.\n"
 "\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid ""
 "\n"
@@ -1340,54 +1352,77 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid ""
+"  -a, --all                       create subscriptions for all databases except template\n"
+"                                  databases and databases that don't allow connections\n"
+msgstr ""
+"  -a, --all                      crée les abonnements pour toutes les bases de données sauf les\n"
+"                                 bases modèles et les bases qui ne permettent pas les connexions\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid "  -d, --database=DBNAME           database in which to create a subscription\n"
 msgstr "  -d, --dbname=BASE                     base de données où créer la souscription\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid "  -D, --pgdata=DATADIR            location for the subscriber data directory\n"
 msgstr "  [-D, --pgdata=]RÉP_DONNEES            emplacement du répertoire de données de l'abonné\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr ""
 "  -n, --dry-run                         pas d'exécution, affiche\n"
 "                                        simplement ce qui sera fait\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr "  -p, --subscriber-port=PORT            numéro de port de l'abonné (par défaut %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr "  -P, --publisher-server=CHAÎNE_CONNEX  chaîne de connexion du publieur\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=RÉP                   répertoire de la socket à utiliser (par défaut, le répertoire courant)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SECS           durée en secondes à attendre pour la fin de la restauration\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
+msgstr "  -T, --enable-two-phase         active la validation en deux phases pour toutes les souscriptions\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NOM         nom d'utilisateur pour la connexion de l'abonné\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                         affiche des messages verbeux\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"      --clean=TYPEOBJET          supprime tous les objets du type indiqué à partir des bases\n"
+"                                 indiquées sur l'abonné ; accepte « %s »\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid ""
 "      --config-file=FILENAME      use specified main server configuration\n"
@@ -1397,556 +1432,651 @@ msgstr ""
 "                                        du serveur principal lors de l'exécution de\n"
 "                                        l'instance cible\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=NOM                 nom de la publication\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=NOM            nom du slot de réplication\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=NOM                nom de la souscription\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                         affiche la version puis quitte\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                            affiche cette aide puis quitte\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "n'a pas pu analyser la chaîne de connexion : %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »"
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "vérification si le répertoire « %s » est le répertoire d'une instance"
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "le répertoire des données « %s » n'existe pas"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "le répertoire « %s » n'est pas un répertoire d'instance"
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "échec de la connexion à la base de données : %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "n'a pas pu effacer search_path : %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "n'a pas pu effacer « search_path » : %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "recherche de l'identifieur système sur le publieur"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "n'a pas pu obtenir l'identifiant du système : %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr "n'a pas pu obtenir l'identifiant du système : lu %d octets, %d attendus"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "l'identifieur système est %llu sur le publieur"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "l'identifieur système est %<PRIu64> sur le publieur"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "recherche l'identifieur système sur l'abonné"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "le fichier de contrôle semble corrompu"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "l'identifieur système est %llu sur l'abonné"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "l'identifieur système est %<PRIu64> sur l'abonné"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "modification de l'identifieur système sur l'abonné"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "exécution simulée : aurait initialisé l'identifieur système à %<PRIu64> sur l'abonné"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "exécution simulée : aurait exécuté pg_resetwal sur l'abonné"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "exécution de pg_resetwal sur l'abonné"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "l'abonné a modifié avec succès l'identifieur système"
+msgid "successfully reset WAL on the subscriber"
+msgstr "a réinitialisé les WAL sur l'abonné avec succès"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "n'a pas pu modifier l'identifiant du système abonné : %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "n'a pas pu réinitialiser les WAL sur l'abonné : %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "n'a pas pu obtenir l'OID de la base : %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "n'a pas pu obtenir l'OID de la base de données : %d lignes attendues, %d ligne reçue"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "création du slot de réplication « %s » sur le publieur"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "n'a pas pu écrire un enregistrement WAL supplémentaire : %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "n'a pas pu obtenir la progression de la restauration : %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "vérification de la configuration du publieur"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "le serveur primaire ne peut pas être en restauration"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "n'a pas pu obtenir la configuration du publieur : %s"
 
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:956
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "le publieur requiert wal_level >= « logical »"
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "le publieur requiert « wal_level » >= « logical »"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "le publieur requiert %d slots de réplication, mais seuls %d restent"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Augmentez le paramètre de configuration « %s » à au moins %d."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "le publieur requiert %d processus wal sender, mais seuls %d restent"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "l'option two_phase ne sera pas activée pour les slots de réplication"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "Les souscriptions seront créées avec l'option two_phase désactivé. Les transactions préparées seront répliquées au COMMIT PREPARED."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:983
+#, c-format
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "Vous pouvez utiliser l'option en ligne de commande --enable-two-phase pour activer two_phase."
+
+#: pg_createsubscriber.c:993
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "les fichiers WAL requis ont put être supprimés du publieur"
+
+#: pg_createsubscriber.c:994
+#, c-format
+msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
+msgstr "Configure le paramètre de configuration « %s » à -1 pour s'assurer que les fichiers WAL requis ne soient pas prématurément supprimés."
+
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "vérification de la configuration sur l'abonné"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "le serveur cible doit être un secondaire"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "n'a pas pu obtenir la configuration de l'abonné : %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1081
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "l'abonné requiert %d slots de réplication, mais seuls %d restent"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr "l'abonné requiert %d origines de réplication actives, mais seules %d restent"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "l'abonné requiert %d processus worker de réplication logique, mais seuls %d restent"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "l'abonné requiert %d processus worker, mais seuls %d restent"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait supprimé la souscription « %s » dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "suppression de la souscription « %s » dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "n'a pas pu supprimer la souscription « %s » : %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "n'a pas pu obtenir les souscriptions pré-existantes : %s"
 
-#: pg_createsubscriber.c:1258
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "n'a pas pu supprimer le slot de réplication « %s » sur le primaire"
 
-#: pg_createsubscriber.c:1292
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "n'a pas pu obtenir l'information de slot de réplication failover : %s"
 
-#: pg_createsubscriber.c:1294 pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "Supprimez rapidement les slots de réplication failover sur l'abonnée pour éviter la rétention des fichiers WAL."
 
-#: pg_createsubscriber.c:1302
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "n'a pas pu supprimer le slot de réplication failover"
 
-#: pg_createsubscriber.c:1324
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "exécution simulée : aurait créé le slot de réplication « %s » dans la base « %s » sur le publieur"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "création du slot de réplication « %s » dans la base « %s »"
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "création du slot de réplication « %s » dans la base « %s » sur le publieur"
 
-#: pg_createsubscriber.c:1342
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "n'a pas pu créer le slot de réplication « %s » dans la base « %s » : %s"
 
-#: pg_createsubscriber.c:1372
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait supprimer le slot de réplication « %s » dans la base « %s »"
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "suppression du slot de réplication « %s » dans la base « %s »"
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "n'a pas pu supprimer le slot de réplication « %s » dans la base « %s » : %s"
 
-#: pg_createsubscriber.c:1409
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "échec de pg_ctl avec un code de retour %d"
 
-#: pg_createsubscriber.c:1414
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl a été terminé par l'exception 0x%X"
 
-#: pg_createsubscriber.c:1416
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
 "Voir le fichier d'en-tête C « ntstatus.h » pour une description de la valeur\n"
 "hexadécimale."
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl a été terminé par le signal %d : %s"
 
-#: pg_createsubscriber.c:1424
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl a quitté avec un statut %d non reconnu"
 
-#: pg_createsubscriber.c:1427
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "La commande échouée était : %s"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "le serveur a été démarré"
 
-#: pg_createsubscriber.c:1488
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "le serveur a été arrêté"
 
-#: pg_createsubscriber.c:1507
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "en attente de l'atteinte de l'état de cohérence sur le serveur cible"
 
-#: pg_createsubscriber.c:1530
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "délai de restauration atteint"
 
-#: pg_createsubscriber.c:1543
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "le serveur n'a pas terminé la restauration"
 
-#: pg_createsubscriber.c:1545
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "le serveur cible a atteint l'état de cohérence"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "Si pg_createsubscriber échoue après cela, vous devez recréer le réplicat physique avant de continuer."
 
-#: pg_createsubscriber.c:1573
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "n'a pas pu obtenir une information sur la publication : %s"
 
-#: pg_createsubscriber.c:1587
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "la publication « %s » existe déjà"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Pensez à renommer cette publication avant de continuer."
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait créer la publication « %s » dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "création de la publication « %s » dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1608
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "n'a pas pu créer la publication « %s » dans la base de données « %s » : %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait supprimer la publication « %s » dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "suppression de la publication « %s » dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1651
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "n'a pas pu supprimer la publication « %s » dans la base de données « %s » : %s"
 
-#: pg_createsubscriber.c:1697
+#: pg_createsubscriber.c:1769
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "suppression de toutes les publications existantes dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait créer la souscription « %s » dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "création de la souscription « %s » dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1718
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "n'a pas pu créer la souscription « %s » dans la base « %s » : %s"
 
-#: pg_createsubscriber.c:1763
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "n'a pas pu obtenir l'OID de la souscription : %s"
 
-#: pg_createsubscriber.c:1770
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "n'a pas pu obtenir l'OID de la souscription : attendait %d lignes, a reçu %d ligne"
 
-#: pg_createsubscriber.c:1794
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "exécution simulée : aurait mis en place la progression de la réplication (nom du noeud « %s » , LSN %s) dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "configuration de la progression de la réplication (nom du noeud « %s » , LSN %s) dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1809
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "n'a pas pu configurer la progression de la réplication pour la souscription « %s » : %s"
 
-#: pg_createsubscriber.c:1840
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "exécution simulée : aurait activer la souscription « %s » dans la base de données « %s »"
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "activation de la souscription « %s » dans la base de données « %s »"
 
-#: pg_createsubscriber.c:1852
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "n'a pas pu activer la souscription « %s » : %s"
 
-#: pg_createsubscriber.c:1944
+#: pg_createsubscriber.c:2041
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "n'a pas pu obtenir la liste des bases : %s"
+
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "ne peut pas être exécuté par « root »"
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL."
 
-#: pg_createsubscriber.c:1966
+#: pg_createsubscriber.c:2169
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "la base de données « %s » est spécifiée plus d'une fois pour -d/--database"
+
+#: pg_createsubscriber.c:2210
+#, c-format
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "la publication « %s » est spécifiée plus d'une fois pour --publication"
+
+#: pg_createsubscriber.c:2219
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "la base de données « %s » est spécifiée plus d'une fois"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "le slot de réplication « %s » est spécifié plus d'une fois pour --replication-slot"
 
-#: pg_createsubscriber.c:2007
+#: pg_createsubscriber.c:2228
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "la publication « %s » est spécifiée plus d'une fois"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "la souscription « %s » est spécifiée plus d'une fois pour --subscription"
 
-#: pg_createsubscriber.c:2019
+#: pg_createsubscriber.c:2234
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "le slot de réplication « %s » est spécifié plus d'une fois"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "le type d'objet « %s » est spécifié plus d'une fois pour --clean"
 
-#: pg_createsubscriber.c:2031
+#: pg_createsubscriber.c:2259
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "la souscription « %s » est spécifiée plus d'une fois"
+msgid "options %s and %s cannot be used together"
+msgstr "les options « %s » et « %s » ne peuvent pas être utilisées ensemble"
 
-#: pg_createsubscriber.c:2054
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "aucune chaîne de connexion de l'abonné indiquée"
 
-#: pg_createsubscriber.c:2065
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "n'a pas pu déterminer le répertoire courant"
 
-#: pg_createsubscriber.c:2082
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "aucune chaîne de connexion du publieur indiquée"
 
-#: pg_createsubscriber.c:2086
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "validation de la chaîne de connexion du publieur"
 
-#: pg_createsubscriber.c:2092
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "validation de la chaîne de connexion de l'abonné"
 
-#: pg_createsubscriber.c:2097
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "aucune base de données n'a été indiquée"
 
-#: pg_createsubscriber.c:2109
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "le nom de la base de données « %s » a été extrait de la chaîne de connexion du publieur"
 
-#: pg_createsubscriber.c:2114
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "aucun nom de base de données indiqué"
 
-#: pg_createsubscriber.c:2124
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "mauvais nombre de noms de publication indiqués"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "Le nombre de noms de publication indiqués (%d) doit correspondre au nombre de noms de bases de données indiqués (%d)"
 
-#: pg_createsubscriber.c:2131
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "mauvais nombre de noms de souscription indiqués"
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "Le nombre de noms de souscriptions indiqués (%d) doit correspondre au nombre de noms de bases de données indiqués (%d)"
 
-#: pg_createsubscriber.c:2138
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "mauvais nombre de noms de slots de réplication indiqués"
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "Le nombre de noms de slots de réplication indiqués (%d) doit correspondre au nombre de noms de bases de données indiqués (%d)"
 
-#: pg_createsubscriber.c:2168
+#: pg_createsubscriber.c:2386
+#, c-format
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "type d'objet « %s » invalide indiqué pour %s"
+
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "La valeur valide est « %s »"
+
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "le répertoire de données de l'abonné n'est pas une copie de l'instance source"
 
-#: pg_createsubscriber.c:2181
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "le serveur secondaire est en cours d'exécution"
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Arrêtez le secondaire et tentez de nouveau."
 
-#: pg_createsubscriber.c:2191
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "lancement du serveur secondaire avec les options en ligne de commande"
 
-#: pg_createsubscriber.c:2207 pg_createsubscriber.c:2242
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "arrêt de l'abonné"
 
-#: pg_createsubscriber.c:2221
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "lancement de l'abonné"
 
-#: pg_createsubscriber.c:2250
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "Terminé !"
@@ -1967,19 +2097,19 @@ msgstr ""
 "  -D, --directory=RÉPERTOIRE     reçoit les journaux de transactions dans ce\n"
 "                                 répertoire\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN               quitte après avoir reçu le LSN spécifié\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, 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"
 "                                 déjà lors de sa création\n"
 
-#: pg_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, 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"
@@ -1991,7 +2121,7 @@ msgstr ""
 "      --no-sync                  n'attend pas que les modifications soient\n"
 "                                 proprement écrites sur disque\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -2025,14 +2155,14 @@ msgstr ""
 "\n"
 "Actions optionnelles :\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr ""
 "      --create-slot              crée un nouveau slot de réplication\n"
 "                                 (pour le nom du slot, voir --slot)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr ""
@@ -2054,7 +2184,7 @@ msgstr "arrêt du flux streaming à %X/%X (timeline %u)"
 msgid "switched to timeline %u at %X/%X"
 msgstr "a basculé sur la timeline %u à %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "a reçu un signal d'interruption, quitte"
@@ -2124,7 +2254,7 @@ msgstr "ne peut pas vérifier le fichier « %s » : la compression avec %s n'a p
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "commence le flux des journaux à %X/%X (timeline %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "n'a pas pu analyser la position finale « %s »"
@@ -2154,28 +2284,28 @@ msgstr "la méthode de compression %s n'est pas encore supportée"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "la connexion de réplication utilisant le slot « %s » est spécifique à une base, ce qui est inattendu"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "suppression du slot de réplication « %s »"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "création du slot de réplication « %s »"
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "déconnecté"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "déconnecté, attente de %d secondes avant une nouvelle tentative"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -2184,7 +2314,7 @@ msgstr ""
 "%s contrôle le flux des modifications logiques de PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid ""
 "\n"
@@ -2193,21 +2323,30 @@ msgstr ""
 "\n"
 "Action à réaliser :\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, 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"
 "                                 le nom du slot, voir --slot)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid ""
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
+msgstr ""
+"      --enable-failover          active la synchronisation du slot de réplication vers les serveurs\n"
+"                                 standby lors de la création d'un slot de réplication\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr ""
 "  -f, --file=FICHIER             trace la réception dans ce fichier, - pour\n"
 "                                 stdout\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -2216,14 +2355,14 @@ msgstr ""
 "  -F  --fsync-interval=SECS      durée entre les fsyncs vers le fichier de sortie\n"
 "                                 (par défaut %d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, 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"
 "                                 existant\n"
 
-#: pg_recvlogical.c:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -2233,282 +2372,287 @@ msgstr ""
 "  -o, --option=NOM[=VALEUR]      passe l'option NOM avec la valeur optionnelle\n"
 "                                 VALEUR au plugin en sortie\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr ""
 "  -P, --plugin=PLUGIN            utilise le plugin PLUGIN en sortie (par défaut\n"
 "                                 %s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=SLOT                nom du slot de réplication logique\n"
 
-#: pg_recvlogical.c:107
+#: pg_recvlogical.c:108
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase                active le décodage des transactions préparées lors de la création d'un slot\n"
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr "  -t, --enable-two-phase         active le décodage des transactions préparées lors de la création d'un slot\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase                (identique à --enable-two-phase, obsolète)\n"
+
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=BASE              base de données de connexion\n"
 
-#: pg_recvlogical.c:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "confirmation d'écriture jusqu'à %X/%X et de synchronisation jusqu'à %X/%X (slot %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "n'a pas pu envoyer le paquet d'informations en retour : %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "commence le flux des journaux à %X/%X (slot %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "flux lancé"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le journal applicatif « %s » : %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "socket invalide : %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, 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"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "en-tête de flux trop petit : %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "entête non reconnu du flux : « %c »"
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "n'a pas pu écrire %d octets dans le journal de transactions « %s » : %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "fin inattendue du flux de réplication : %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "n'a pas pu analyser la position de départ « %s »"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "aucun slot de réplication indiqué"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "aucun fichier cible indiqué"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "aucune base de données indiquée"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "au moins une action doit être indiquée"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "ne peut pas utiliser --create-slot ou --start avec --drop-slot"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "ne peut pas utiliser --create-slot ou --drop-slot avec --startpos"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos peut seulement être spécifié avec --start"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase peut seulement être spécifié avec --create-slot"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s peut seulement être spécifié avec --create-slot"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "n'a pas pu établir une connexion de réplication spécifique à la base"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "position finale %X/%X atteinte par keepalive"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "position finale %X/%X atteinte à l'enregistrement WAL %X/%X"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "n'a pas pu créer le fichier de statut d'archivage « %s » : %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "n'a pas pu fermer le fichier de statut d'archivage « %s » : %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "n'a pas pu obtenir la taille du journal de transactions « %s » : %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "n'a pas pu ouvrir le journal des transactions « %s » existant : %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr "n'a pas pu synchroniser sur disque le journal de transactions « %s » existant : %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
 msgstr[0] "le journal de transactions « %s » comprend %zd octet, cela devrait être 0 ou %d"
 msgstr[1] "le journal de transactions « %s » comprend %zd octets, cela devrait être 0 ou %d"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "n'a pas pu ouvrir le journal de transactions « %s » : %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "pas de renommage de « %s », le segment n'est pas complet"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "n'a pas pu fermer le fichier « %s » : %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "le serveur a renvoyé un nom de fichier historique inattendu pour la timeline %u : %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "n'a pas pu créer le fichier historique de la timeline « %s » : %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "n'a pas pu écrire dans le fichier historique de la timeline « %s » : %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions older than %s"
 msgstr "version %s du serveur incompatible ; le client ne supporte pas le streaming de versions plus anciennes que %s"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions newer than %s"
 msgstr "version %s du serveur incompatible ; le client ne supporte pas le streaming de versions plus récentes que %s"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid "system identifier does not match between base backup and streaming connection"
 msgstr "l'identifiant système ne correspond pas entre la sauvegarde des fichiers et la connexion de réplication"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "la timeline %u de départ n'est pas dans le serveur"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "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"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "le serveur a renvoyé une timeline suivante %u inattendue, après la timeline %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
 msgstr "le serveur a arrêté l'envoi de la timeline %u à %X/%X, mais a indiqué que la timeline suivante, %u, commence à %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "le flux de réplication a été abandonné avant d'arriver au point d'arrêt"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid "unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "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"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "n'a pas pu analyser la position de départ de la prochaine timeline « %s »"
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "a reçu l'enregistrement du journal de transactions pour le décalage %u sans fichier ouvert"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "a obtenu le décalage %08x pour les données du journal, attendait %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "n'a pas pu écrire %d octets dans le journal de transactions « %s » : %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "n'a pas pu envoyer le paquet de fin de copie : %s"
@@ -2522,11 +2666,6 @@ msgstr "Mot de passe : "
 msgid "could not connect to server"
 msgstr "n'a pas pu se connecter au serveur"
 
-#: streamutil.c:230
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "n'a pas pu effacer « search_path » : %s"
-
 #: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
@@ -2537,69 +2676,69 @@ msgstr "n'a pas pu déterminer la configuration serveur de « integer_datetimes
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr "l'option de compilation « integer_datetimes » ne correspond pas au serveur"
 
-#: streamutil.c:372
+#: streamutil.c:304
 #, c-format
 msgid "could not fetch WAL segment size: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "n'a pas pu récupéré la taille d'un segment WAL : a obtenu %d lignes et %d champs, attendait %d lignes et %d champs (ou plus)"
 
-#: streamutil.c:382
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "la taille du segment WAL n'a pas pu être analysée"
 
-#: streamutil.c:400
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
 msgstr[0] "le serveur distant a rapporté une taille invalide du segment WAL (%d octet)"
 msgstr[1] "le serveur distant a rapporté une taille invalide du segment WAL (%d octets)"
 
-#: streamutil.c:404
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "La taille du segment WAL doit être une puissance de deux comprise entre 1 Mo et 1 Go."
 
-#: streamutil.c:446
+#: streamutil.c:378
 #, c-format
 msgid "could not fetch group access flag: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "n'a pas pu récupérer les options d'accès du groupe : a obtenu %d lignes et %d champs, attendait %d lignes et %d champs (ou plus)"
 
-#: streamutil.c:455
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "l'option d'accès du groupe n'a pas pu être analysé : %s"
 
-#: streamutil.c:498 streamutil.c:535
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid "could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields"
-msgstr "n'a pas pu identifier le système : a récupéré %d lignes et %d champs, attendait %d lignes et %d champs (ou plus)."
+msgstr "n'a pas pu identifier le système : a récupéré %d lignes et %d champs, attendait %d lignes et %d champs (ou plus)"
 
-#: streamutil.c:587
+#: streamutil.c:519
 #, c-format
 msgid "could not read replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "n'a pas pu lire le slot de réplication « %s » : a récupéré %d lignes et %d champs, attendait %d lignes et %d champs"
 
-#: streamutil.c:599
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "le slot de réplication « %s » n'existe pas"
 
-#: streamutil.c:610
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "attendait un slot de réplication physique, a obtenu le type « %s » à la place"
 
-#: streamutil.c:624
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr "n'a pas pu analyser le champ restart_lsn « %s » pour le slot de réplication « %s »"
 
-#: streamutil.c:741
+#: streamutil.c:678
 #, c-format
 msgid "could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "n'a pas pu créer le slot de réplication « %s » : a récupéré %d lignes et %d champs, attendait %d lignes et %d champs"
 
-#: streamutil.c:785
+#: streamutil.c:722
 #, c-format
 msgid "could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "n'a pas pu supprimer le slot de réplication « %s » : a récupéré %d lignes et %d champs, attendait %d lignes et %d champs"
@@ -2631,3 +2770,23 @@ msgstr "suppression non supportée avec la compression"
 #: walmethods.c:1293
 msgid "could not close compression stream"
 msgstr "n'a pas pu fermer le flux de compression"
+
+#, c-format
+#~ msgid "could not change system identifier of subscriber: %s"
+#~ msgstr "n'a pas pu modifier l'identifiant du système abonné : %s"
+
+#, c-format
+#~ msgid "could not clear search_path: %s"
+#~ msgstr "n'a pas pu effacer search_path : %s"
+
+#, c-format
+#~ msgid "options %s and -a/--all cannot be used together"
+#~ msgstr "les options « %s » et « -a/--all » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "subscriber successfully changed the system identifier"
+#~ msgstr "l'abonné a modifié avec succès l'identifieur système"
+
+#, c-format
+#~ msgid "tar file trailer exceeds 2 blocks"
+#~ msgstr "la fin du fichier tar fait plus de 2 blocs"
diff --git a/src/bin/pg_basebackup/po/ja.po b/src/bin/pg_basebackup/po/ja.po
index d85ecc42ae0..a78e8aae8c1 100644
--- a/src/bin/pg_basebackup/po/ja.po
+++ b/src/bin/pg_basebackup/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-07 09:45+0900\n"
-"PO-Revision-Date: 2025-04-07 15:32+0900\n"
+"POT-Creation-Date: 2025-12-09 09:38+0900\n"
+"PO-Revision-Date: 2025-12-09 10:16+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -112,7 +112,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "ファイル\"%1$s\"を読み込めませんでした: %3$zuバイトのうち%2$dバイトを読み込みました"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:652
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "ファイル\"%s\"をクローズできませんでした: %m"
@@ -148,7 +148,7 @@ msgid "could not write file \"%s\": %m"
 msgstr "ファイル\"%s\"を書き出せませんでした: %m"
 
 #: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
-#: ../../common/file_utils.c:510 pg_recvlogical.c:205
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "ファイル\"%s\"をfsyncできませんでした: %m"
@@ -170,7 +170,7 @@ msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "ファイル\"%s\"に対してファイルシステムを同期できませんでした: %m"
 
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
-#: pg_receivewal.c:319 pg_recvlogical.c:353
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "ファイル\"%s\"のstatに失敗しました: %m"
@@ -669,12 +669,12 @@ msgstr "  -P, --progress         進行状況の表示\n"
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=スロット名  使用するレプリケーションスロット\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:109
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          冗長メッセージの出力\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:110
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          バージョン情報を表示して終了\n"
@@ -730,12 +730,12 @@ msgstr ""
 "      --sync-method=METHOD\n"
 "                         ファイルをディスクに同期させる方法を指定\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:111
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             このヘルプを表示して終了\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:112
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -749,12 +749,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONNSTR   接続文字列\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:114
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME    データベースサーバーホストまたはソケットディレクトリ\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:115
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        データベースサーバーのポート番号\n"
@@ -768,23 +768,23 @@ msgstr ""
 "  -s, --status-interval=INTERVAL\n"
 "                         サーバーへ送出するステータスパケットの間隔(秒単位)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:116
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME    指定したデータベースユーザーで接続\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:117
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      パスワードの入力を要求しない\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:118
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password         パスワード入力要求を強制(自動的に行われるはず)\n"
 
 #: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
-#: pg_recvlogical.c:119
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -794,7 +794,7 @@ msgstr ""
 "バグは<%s>に報告してください。\n"
 
 #: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
-#: pg_recvlogical.c:120
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ホームページ: <%s>\n"
@@ -903,7 +903,7 @@ msgstr "転送速度\"%s\"が範囲外です"
 msgid "could not get COPY data stream: %s"
 msgstr "COPYデータストリームを取得できませんでした: %s"
 
-#: pg_basebackup.c:1040 pg_recvlogical.c:450 pg_recvlogical.c:626
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
 #: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
@@ -989,7 +989,7 @@ msgstr "-X none または -X fetch でログストリーミングを無効にで
 msgid "server does not support incremental backup"
 msgstr "サーバーは差分バックアップをサポートしていません"
 
-#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:273
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
 #: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
 #: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
@@ -1182,21 +1182,21 @@ msgstr "不正な wal-method オプション\"%s\"、\"fetch\"、\"stream\" ま
 #: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
 #: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
 #: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
-#: pg_basebackup.c:2804 pg_createsubscriber.c:2196 pg_createsubscriber.c:2218
-#: pg_createsubscriber.c:2228 pg_createsubscriber.c:2236
-#: pg_createsubscriber.c:2264 pg_createsubscriber.c:2307 pg_receivewal.c:748
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
 #: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
-#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:859
-#: pg_recvlogical.c:871 pg_recvlogical.c:881 pg_recvlogical.c:888
-#: pg_recvlogical.c:895 pg_recvlogical.c:902 pg_recvlogical.c:909
-#: pg_recvlogical.c:916 pg_recvlogical.c:923 pg_recvlogical.c:932
-#: pg_recvlogical.c:939
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "詳細は\"%s --help\"を実行してください。"
 
-#: pg_basebackup.c:2585 pg_createsubscriber.c:2226 pg_receivewal.c:758
-#: pg_recvlogical.c:869
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "コマンドライン引数が多過ぎます(先頭は\"%s\"です)"
@@ -1313,7 +1313,7 @@ msgstr "再試行の前にこのパブリケーションを削除してくださ
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "プライマリ上のデータベース\"%2$s\"で作成されたレプリケーションスロット\"%1$s\"が残されています"
 
-#: pg_createsubscriber.c:231 pg_createsubscriber.c:1305
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "WALファイルの増加を避けるためにこのレプリケーションスロットを直ちに削除してください。"
@@ -1340,11 +1340,11 @@ msgstr ""
 #, c-format
 msgid ""
 "  -a, --all                       create subscriptions for all databases except template\n"
-"                                  databases or databases that don't allow connections\n"
+"                                  databases and databases that don't allow connections\n"
 msgstr ""
-"  -a, --all                       テンプレートデータベースまたは接続を許可\n"
-"                                  しないデーバーベースを除くすべてのデータ\n"
-"                                  ベースでサブスクリプションを作成する\n"
+"  -a, --all                       テンプレートデータベースと接続を許可しない\n"
+"                                  データベースを除くすべてのデータベースに\n"
+"                                  サブスクリプションを作成する\n"
 
 #: pg_createsubscriber.c:251
 #, c-format
@@ -1373,43 +1373,43 @@ msgstr "  -P, --publisher-server=CONNSTR  パブリッシャの接続文字列\n
 
 #: pg_createsubscriber.c:256
 #, c-format
-msgid ""
-"  -R, --remove=OBJECTTYPE         remove all objects of the specified type from specified\n"
-"                                  databases on the subscriber; accepts: publications\n"
-msgstr ""
-"  -R, --remove=OBJECTTYPE         サブスクライバ側の指定したデータベースから、\n"
-"                                  指定された種類のオブジェクトをすべて削除する;\n"
-"                                  指定可能なオブジェクト種別: publications\n"
-
-#: pg_createsubscriber.c:258
-#, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr ""
 "  -s, --socketdir=DIR             使用するソケットディレクトリ(デフォルトは\n"
 "                                  カレントディレクトリ)\n"
 
-#: pg_createsubscriber.c:259
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SECS     リカバリ完了を待機する秒数\n"
 
-#: pg_createsubscriber.c:260
+#: pg_createsubscriber.c:258
 #, c-format
 msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
 msgstr ""
 "  -T, --enable-two-phase          2相コミットをすべてのサブスクリプションに\n"
 "                                  対して有効化\n"
 
-#: pg_createsubscriber.c:261
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NAME  サブスクライバ接続のユーザー名\n"
 
-#: pg_createsubscriber.c:262
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   冗長メッセージを出力\n"
 
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"      --clean=OBJECTTYPE          サブスクライバ側の指定したデータベースから、\n"
+"                                  指定された種類のオブジェクトをすべて削除する;\n"
+"                                  指定可能なオブジェクト種別: \"%s\"\n"
+
 #: pg_createsubscriber.c:263
 #, c-format
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "サブスクライバからシステム識別子を取得しています
 msgid "control file appears to be corrupt"
 msgstr "制御ファイルが破損しているようです"
 
-#: pg_createsubscriber.c:645 pg_createsubscriber.c:685
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
 msgid "system identifier is %<PRIu64> on subscriber"
 msgstr "サブスクライバのシステム識別子は%<PRIu64>です"
@@ -1524,494 +1524,544 @@ msgstr "サブスクライバのシステム識別子は%<PRIu64>です"
 msgid "modifying system identifier of subscriber"
 msgstr "サブスクライバのシステム識別子を変更しています"
 
-#: pg_createsubscriber.c:688
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "ドライラン: サブスクライバのシステム識別子は%<PRIu64>に設定されます"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "ドライラン: サブスクライバ上でpg_resetwalが実行されます"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "サブスクライバ上でpg_resetwalを実行します"
 
-#: pg_createsubscriber.c:700
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "サブスクライバはシステム識別子の変更に成功しました"
+msgid "successfully reset WAL on the subscriber"
+msgstr "サブスクライバのWALのリセットに成功しました"
 
-#: pg_createsubscriber.c:702
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "サブスクライバーのシステム識別子を変更できませんでした: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "サブスクライバのWALをリセットできませんでした: %s"
 
-#: pg_createsubscriber.c:726
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "データベースOIDを取得できませんでした: %s"
 
-#: pg_createsubscriber.c:733
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "データベースOIDを取得できませんでした: 受信したのは%d行、想定は%d行"
 
-#: pg_createsubscriber.c:805
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "パブリッシャでレプリケーションスロット\"%s\"を作成します"
 
-#: pg_createsubscriber.c:825
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "追加のWALレコードを書き込めませんでした: %s"
 
-#: pg_createsubscriber.c:851
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "リカバリ進捗を取得できませんでした: %s"
 
-#: pg_createsubscriber.c:884
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "パブリッシャ上の設定を確認しています"
 
-#: pg_createsubscriber.c:894
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "プライマリサーバーがリカバリ中であってはなりません"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "パブリッシャの設定が取得できませんでした: %s"
 
-#: pg_createsubscriber.c:949
+#: pg_createsubscriber.c:956
 #, c-format
 msgid "publisher requires \"wal_level\" >= \"logical\""
 msgstr "パブリッシャでは \"wal_level\" >= \"logical\" である必要があります"
 
-#: pg_createsubscriber.c:955
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "パブリッシャは%d個のレプリケーションスロットを必要としますが、%d個しか残っていません"
 
-#: pg_createsubscriber.c:957 pg_createsubscriber.c:966
-#: pg_createsubscriber.c:1076 pg_createsubscriber.c:1085
-#: pg_createsubscriber.c:1094
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "設定パラメータ\"%s\"を少なくとも%dに増やしてください。"
 
-#: pg_createsubscriber.c:964
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "パブリッシャは%d個のWAL senderプロセスを必要としますが、%d個しか残っていません"
 
-#: pg_createsubscriber.c:973
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "レプリケーションスロットに対してtwo_phaseオプションは有効化されません"
 
-#: pg_createsubscriber.c:974
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "サブスクリプションはtwo_phaseオプションが無効な状態で作成されます。準備済みトランザクションはCOMMIT PREPAREDでレプリケートされます。"
 
-#: pg_createsubscriber.c:976
+#: pg_createsubscriber.c:983
 #, c-format
-msgid "You can use --enable-two-phase switch to enable two_phase."
-msgstr "--enable-two-phase オプションで two_phase を有効にできます。"
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "コマンドラインオプション --enable-two-phase で two_phase を有効にできます。"
 
-#: pg_createsubscriber.c:986
+#: pg_createsubscriber.c:993
 #, c-format
 msgid "required WAL could be removed from the publisher"
 msgstr "必要なWALがパブリッシャから削除される可能性があります"
 
-#: pg_createsubscriber.c:987
+#: pg_createsubscriber.c:994
 #, c-format
 msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
 msgstr "設定パラメータ\"%s\"を -1 に設定して、必要となるWALファイルが使用される前に削除されないようにしてください。"
 
-#: pg_createsubscriber.c:1019
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "サブスクライバ上で設定を確認します"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "ターゲットサーバーはスタンバイである必要があります"
 
-#: pg_createsubscriber.c:1050
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "サブスクライバの設定を取得できませんでした: %s"
 
-#: pg_createsubscriber.c:1074
+#: pg_createsubscriber.c:1081
 #, c-format
 msgid "subscriber requires %d active replication origins, but only %d remain"
 msgstr "サブスクライバは%d個の有効なレプリケーション起源を必要としますが、%d個しか残ってません"
 
-#: pg_createsubscriber.c:1083
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "サブスクライバは%d個の論理レプリケーションワーカーを必要としますが、%d個しか残っていません"
 
-#: pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "サブスクライバは%d個のワーカープロセスを必要としますが、%d個しか残っていません"
 
-#: pg_createsubscriber.c:1127
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"のサブスクリプション\"%1$s\"が削除されます"
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "データベース\"%2$s\"のサブスクリプション\"%1$s\"の削除中"
 
-#: pg_createsubscriber.c:1136
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "サブスクリプション\"%s\"を削除できませんでした: %s"
 
-#: pg_createsubscriber.c:1171
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "既存のサブスクリプションを取得できませんでした: %s"
 
-#: pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "プライマリ上のレプリケーションスロット\"%s\"を削除できませんでした"
 
-#: pg_createsubscriber.c:1337
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "フェイルオーバーレプリケーションスロットの情報を取得できませんでした: %s"
 
-#: pg_createsubscriber.c:1339 pg_createsubscriber.c:1348
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "WALファイルの増加を避けるためにこのフェイルオーバーレプリケーションスロットを直ちに削除してください。"
 
-#: pg_createsubscriber.c:1347
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "フェイルオーバーレプリケーションスロットを削除できませんでした"
 
-#: pg_createsubscriber.c:1369
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "ドライラン: パブリッシャ上でデータベース\"%2$s\"にレプリケーションスロット\"%1$s\"が作成されます"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "データベース\"%2$s\"でレプリケーションスロット\"%1$s:を作成します"
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "パブリッシャ上でデータベース\"%2$s\"にレプリケーションスロット\"%1$s\"を作成します"
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "データベース\"%2$s\"でレプリケーションスロット\"%1$s\"を作成できませんでした: %3$s"
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"のレプリケーションスロット\"%1$s\"が削除されます"
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
-msgstr "データベース\"%2$s\"のレプリケーションスロット\"%1$s:を削除します"
+msgstr "データベース\"%2$s\"のレプリケーションスロット\"%1$s\"を削除します"
 
-#: pg_createsubscriber.c:1434
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "データベース\"%2$s\"のレプリケーションスロット\"%1$s\"を削除できませんでした: %3$s"
 
-#: pg_createsubscriber.c:1455
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctlが終了コード%dで失敗しました"
 
-#: pg_createsubscriber.c:1460
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctlが例外0x%Xによって終了させられました"
 
-#: pg_createsubscriber.c:1462
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "16進値の説明についてはC インクルードファイル\"ntstatus.h\"を参照してください。"
 
-#: pg_createsubscriber.c:1464
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctlがシグナル%dによって終了させられました %s"
 
-#: pg_createsubscriber.c:1470
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctlが認識できない状態%dで終了しました"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "失敗したコマンドは以下のとおりです: %s"
 
-#: pg_createsubscriber.c:1523
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "サーバー起動完了"
 
-#: pg_createsubscriber.c:1538
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "サーバーは停止しました"
 
-#: pg_createsubscriber.c:1557
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "対象サーバーが一貫性のある状態に到達するのを待っています"
 
-#: pg_createsubscriber.c:1580
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "リカバリーがタイムアウトしました"
 
-#: pg_createsubscriber.c:1593
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "サーバーはリカバリを完了しませんでした"
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "対象サーバーが一貫性のある状態に到達しました"
 
-#: pg_createsubscriber.c:1596
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "もしpg_createsubscriberが今時点より後で失敗した場合は、作業を継続する前に物理レプリカを再作成する必要があります。"
 
-#: pg_createsubscriber.c:1623 pg_createsubscriber.c:1746
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "パブリケーション情報を取得できませんでした: %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "パブリケーション\"%s\"はすでに存在します"
 
-#: pg_createsubscriber.c:1638
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "作業を継続する前にこのパブリケーションの名前を変更することを検討してください。"
 
-#: pg_createsubscriber.c:1645
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"にパブリケーション\"%1$s\"が作成されます"
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "データベース\"%2$s\"でパブリケーション\"%1$s\"を作成します"
 
-#: pg_createsubscriber.c:1658
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "データベース\"%2$s\"でパブリケーション\"%1$s\"を作成できませんでした: %3$s"
 
-#: pg_createsubscriber.c:1688
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"のパブリケーション\"%1$s\"が削除されます"
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "データベース\"%2$s\"のパブリケーション\"%1$s\"を削除します"
 
-#: pg_createsubscriber.c:1702
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "データベース\"%2$s\"のパブリケーション\"%1$s\"が削除できませんでした: %3$s"
 
-#: pg_createsubscriber.c:1739
+#: pg_createsubscriber.c:1769
 #, c-format
 msgid "dropping all existing publications in database \"%s\""
 msgstr "データベース\"%s\"のすべてのパブリケーションを削除します"
 
-#: pg_createsubscriber.c:1797
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"にサブスクリプション\"%1$s\"が作成されます"
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "データベース\"%2$s\"でサブスクリプション\"%1$s\"を作成します"
 
-#: pg_createsubscriber.c:1819
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "データベース\"%2$s\"でサブスクリプション\"%1$s\"を作成できませんでした: %3$s"
 
-#: pg_createsubscriber.c:1864
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "サブスクリプションOIDが取得できませんでした: %s"
 
-#: pg_createsubscriber.c:1871
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "サブスクリプションOIDが取得できませんでした: 受信したのは%d行、想定は%d行"
 
-#: pg_createsubscriber.c:1895
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "ドライラン: データベース\"%3$s\"のレプリケーション進捗が設定されます(ノード名\"%1$s\", LSN %2$s)"
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "データベース\"%3$s\"でのレプリケーションの進捗を設定しています(ノード名\"%1$s\", LSN %2$s)"
 
-#: pg_createsubscriber.c:1910
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "サブスクリプション\"%s\"にレプリケーション進捗を設定できませんでした: %s"
 
-#: pg_createsubscriber.c:1941
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "ドライラン: データベース\"%2$s\"のサブスクリプション\"%1$s\"が有効にされます"
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "データベース\"%2$s\"のサブスクリプション\"%1$s\"を有効にします"
 
-#: pg_createsubscriber.c:1953
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "サブスクリプション\"%s\"を有効化できませんでした: %s"
 
-#: pg_createsubscriber.c:1999
+#: pg_createsubscriber.c:2041
 #, c-format
 msgid "could not obtain a list of databases: %s"
 msgstr "データベースの一覧を取得できませんでした: %s"
 
-#: pg_createsubscriber.c:2103
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\"では実行できません"
 
-#: pg_createsubscriber.c:2104
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "PostgreSQLのスーパーユーザーで%sを実行しなければなりません"
 
-#: pg_createsubscriber.c:2127
+#: pg_createsubscriber.c:2169
 #, c-format
 msgid "database \"%s\" specified more than once for -d/--database"
 msgstr "-d/--database に対してデータベース\"%s\"が複数回指定されました"
 
-#: pg_createsubscriber.c:2146
-#, c-format
-msgid "object type \"%s\" is specified more than once for -R/--remove"
-msgstr "-R/--remove に対してオブジェクト種別%s\"が複数回指定されました"
-
-#: pg_createsubscriber.c:2174
+#: pg_createsubscriber.c:2210
 #, c-format
 msgid "publication \"%s\" specified more than once for --publication"
 msgstr "--publication に対してパブリケーション\"%s\"が複数回指定されました"
 
-#: pg_createsubscriber.c:2183
+#: pg_createsubscriber.c:2219
 #, c-format
 msgid "replication slot \"%s\" specified more than once for --replication-slot"
 msgstr "--replication-slot に対してレプリケーションスロット\"%s\"が複数回指定されました"
 
-#: pg_createsubscriber.c:2192
+#: pg_createsubscriber.c:2228
 #, c-format
 msgid "subscription \"%s\" specified more than once for --subscription"
 msgstr "--subscription に対してブスクリプション\"%s\"が複数回指定されました"
 
-#: pg_createsubscriber.c:2217
+#: pg_createsubscriber.c:2234
+#, c-format
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "--clean に対してオブジェクト種別\"%s\"が複数回指定されました"
+
+#: pg_createsubscriber.c:2259
 #, c-format
-msgid "%s cannot be used with -a/--all"
-msgstr "%s は -a/--all と同時には使えません"
+msgid "options %s and %s cannot be used together"
+msgstr "オプション %s と %s は同時には使用できません"
 
-#: pg_createsubscriber.c:2235
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "サブスクライバのデータディレクトリが指定されていません"
 
-#: pg_createsubscriber.c:2246
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "カレントディレクトリを特定できませんでした"
 
-#: pg_createsubscriber.c:2263
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "パブリッシャの接続文字列が指定されていません"
 
-#: pg_createsubscriber.c:2267
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "パブリッシャの接続文字列の検証中"
 
-#: pg_createsubscriber.c:2273
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "サブスクライバの接続文字列の検証中"
 
-#: pg_createsubscriber.c:2290
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "データベースが指定されていません"
 
-#: pg_createsubscriber.c:2301
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "データベース名\"%s\"がパブリッシャの接続文字列から抽出されました"
 
-#: pg_createsubscriber.c:2306
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "データベース名が指定されていません"
 
-#: pg_createsubscriber.c:2316
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "指定されたパブリケーション名の数が間違っています"
 
-#: pg_createsubscriber.c:2317
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "パブリケーション名の数(%d)はデータベース名の数(%d)と一致している必要があります。"
 
-#: pg_createsubscriber.c:2323
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "指定されたサブスクリプション名の数が間違っています"
 
-#: pg_createsubscriber.c:2324
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "サブスクリプション名の数(%d)はデータベース名の数(%d)と一致している必要があります。"
 
-#: pg_createsubscriber.c:2330
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "指定されたレプリケーションスロット名の数が間違っています"
 
-#: pg_createsubscriber.c:2331
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "レプリケーションスロット名の数(%d)はデータベース名の数(%d)と一致している必要があります。"
 
-#: pg_createsubscriber.c:2343
+#: pg_createsubscriber.c:2386
 #, c-format
-msgid "invalid object type \"%s\" specified for -R/--remove"
-msgstr "-R/--remove に対して指定された不正なオブジェクト種別\"%s\""
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "%2$s に対して指定された不正なオブジェクト種別\"%1$s\""
 
-#: pg_createsubscriber.c:2344
+#: pg_createsubscriber.c:2388
 #, c-format
-msgid "The valid option is: \"publications\""
-msgstr "有効なオプション: \"publications\""
+msgid "The valid value is: \"%s\""
+msgstr "指定可能な値は: \"%s\""
 
-#: pg_createsubscriber.c:2375
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "サブスクライバのデータディレクトリは元データベースクラスタのコピーではありません"
 
-#: pg_createsubscriber.c:2388
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "スタンバイサーバーが稼働中です"
 
-#: pg_createsubscriber.c:2389
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "このスタンバイサーバーを停止してから再試行してください。"
 
-#: pg_createsubscriber.c:2398
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "コマンドラインオプションを指定してスタンバイサーバーを起動しています"
 
-#: pg_createsubscriber.c:2414 pg_createsubscriber.c:2449
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "サブスクライバを起動しています"
 
-#: pg_createsubscriber.c:2428
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "サブスクライバを起動しています"
 
-#: pg_createsubscriber.c:2457
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "完了!"
@@ -2030,7 +2080,7 @@ msgstr ""
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=DIR    受信した先行書き込みログの格納ディレクトリ\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:92
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       指定したLSNの受信後に終了\n"
@@ -2112,7 +2162,7 @@ msgstr "%X/%X (タイムライン %u)でログのストリーミングを停止
 msgid "switched to timeline %u at %X/%X"
 msgstr "%3$X/%2$Xで タイムライン%1$uに切り替えました"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1073
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "割り込みシグナルを受信、終了します"
@@ -2182,7 +2232,7 @@ msgstr "ファイル\"%s\"の確認ができません: %sによる圧縮はこ
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "%X/%X (タイムライン %u)からログのストリーミングを開始"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:807
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "終了位置\"%s\"をパースできませんでした"
@@ -2212,23 +2262,23 @@ msgstr "%sによる圧縮`まだサポートされていません"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "スロット\"%s\"を使用するレプリケーション接続で、想定に反してデータベースが指定されています"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:991
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "レプリケーションスロット\"%s\"を削除しています"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:1001
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "レプリケーションスロット\"%s\"を作成しています"
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1026
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "切断しました"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1030
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "切断しました; %d秒待機して再試行します"
@@ -2258,14 +2308,14 @@ msgstr ""
 "     --start             レプリケーションスロットでストリーミングを開始する\n"
 "                         (スロット名については --slot を参照)\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:92
 #, c-format
 msgid ""
-"      --failover         enable replication slot synchronization to standby servers when\n"
-"                         creating a slot\n"
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
 msgstr ""
-"      --failover         スロット作成時にスタンバイサーバーへのスロット同期を\n"
-"                         有効にする\n"
+"      --enable-failover  レプリケーションスロット作成時にスタンバイサーバーへの\n"
+"                         レプリケーションスロット同期を有効にする\n"
 
 #: pg_recvlogical.c:95
 #, c-format
@@ -2309,136 +2359,138 @@ msgstr "  -S, --slot=SLOTNAME    論理レプリケーションスロットの
 
 #: pg_recvlogical.c:108
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase        スロット作成時にプリペアドトランザクションのデコードを有効にする\n"
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr ""
+"  -t, --enable-two-phase スロット作成時にプリペアドトランザクションの\n"
+"                         デコードを有効にする\n"
+
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (--enable-two-phase に同じ、非推奨)\n"
 
-#: pg_recvlogical.c:113
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=DBNAME    接続先データベース\n"
 
-#: pg_recvlogical.c:146
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "PrecPpg%X/%Xまでの書き込みと、%X/%X (スロット %s）までのフラッシュを確認しています"
 
-#: pg_recvlogical.c:170 receivelog.c:359
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "フィードバックパケットを送信できませんでした: %s"
 
-#: pg_recvlogical.c:240
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "%X/%X (スロット %s)からログのストリーミングを開始します"
 
-#: pg_recvlogical.c:282
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "ストリーミングを開始しました"
 
-#: pg_recvlogical.c:347
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "ロックファイル\"%s\"をオープンできませんでした: %m"
 
-#: pg_recvlogical.c:376 receivelog.c:889
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "無効なソケット: %s"
 
-#: pg_recvlogical.c:429 receivelog.c:917
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() が失敗しました: %m"
 
-#: pg_recvlogical.c:436 receivelog.c:966
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "WAL ストリームからデータを受信できませんでした: %s"
 
-#: pg_recvlogical.c:478 pg_recvlogical.c:529 receivelog.c:1010
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
 #: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "ストリーミングヘッダが小さ過ぎます: %d"
 
-#: pg_recvlogical.c:513 receivelog.c:846
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "ストリーミングヘッダを認識できませんでした: \"%c\""
 
-#: pg_recvlogical.c:567 pg_recvlogical.c:579
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "%dバイトをログファイル\"%s\"に書き込めませんでした: %m"
 
-#: pg_recvlogical.c:637 receivelog.c:641 receivelog.c:678
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "レプリケーションストリームが突然終了しました: %s"
 
-#: pg_recvlogical.c:802
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "開始位置\"%s\"をパースできませんでした"
 
-#: pg_recvlogical.c:880
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "スロットが指定されていません"
 
-#: pg_recvlogical.c:887
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "ターゲットファイルが指定されていません"
 
-#: pg_recvlogical.c:894
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "データベースが指定されていません"
 
-#: pg_recvlogical.c:901
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "少なくとも一つのアクションを指定する必要があります"
 
-#: pg_recvlogical.c:908
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "--create-slot や --start は --drop-slot と同時には指定できません"
 
-#: pg_recvlogical.c:915
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "--create-slot や --drop-slot は --startpos と同時には指定できません"
 
-#: pg_recvlogical.c:922
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos は --start が指定されているときにのみ指定可能です"
 
-#: pg_recvlogical.c:931
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phaseは--create-slotが指定されているときにのみ指定可能です"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s は--create-slotが指定されているときにのみ指定可能です"
 
-#: pg_recvlogical.c:938
-#, c-format
-msgid "--failover may only be specified with --create-slot"
-msgstr "--failover は --create-slot が指定されているときにのみ指定可能です"
-
-#: pg_recvlogical.c:975
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "データベース指定のレプリケーション接続が確立できませんでした"
 
-#: pg_recvlogical.c:1076
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "キープアライブで終了位置 %X/%X に到達しました "
 
-#: pg_recvlogical.c:1081
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "%X/%X のWALレコードで終了位置 %X/%X に到達しました"
@@ -2691,3 +2743,9 @@ msgstr "圧縮時のunlinkはサポートされていません"
 #: walmethods.c:1293
 msgid "could not close compression stream"
 msgstr "圧縮ストリームをクローズできませんでした"
+
+#~ msgid "could not change system identifier of subscriber: %s"
+#~ msgstr "サブスクライバーのシステム識別子を変更できませんでした: %s"
+
+#~ msgid "options %s and -a/--all cannot be used together"
+#~ msgstr "%s と -a/--all は同時には使用できません"
diff --git a/src/bin/pg_basebackup/po/ka.po b/src/bin/pg_basebackup/po/ka.po
index b42019dcab6..0d888ac5071 100644
--- a/src/bin/pg_basebackup/po/ka.po
+++ b/src/bin/pg_basebackup/po/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-05 02:20+0000\n"
-"PO-Revision-Date: 2025-04-05 05:14+0200\n"
+"POT-Creation-Date: 2025-12-11 05:50+0000\n"
+"PO-Revision-Date: 2025-12-13 13:16+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
 #: ../../../src/common/logging.c:279
 #, c-format
@@ -108,7 +108,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "\"%s\"-ის წაკითხვის შეცდომა: წაკითხულია %d %zu-დან"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:652
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "ფაილის (%s) დახურვის შეცდომა: %m"
@@ -143,7 +143,7 @@ msgid "could not write file \"%s\": %m"
 msgstr "ფაილში (%s) ჩაწერის შეცდომა: %m"
 
 #: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
-#: ../../common/file_utils.c:510 pg_recvlogical.c:205
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "ფაილის (%s) fsync-ის შეცდომა: %m"
@@ -165,7 +165,7 @@ msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "შეუძლებელია ფაილური სისტემის სინქრონიზაცია ფაილისთვის \"%s\": %m"
 
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
-#: pg_receivewal.c:319 pg_recvlogical.c:353
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "ფაილი \"%s\" არ არსებობს: %m"
@@ -663,12 +663,12 @@ msgstr "  -P, --progress                  მიმდინარეობი
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=SLOTNAME    გამოსაყენებელი სლოტი\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:109
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose                   დამატებითი ინფორმაციის გამოტანა\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:110
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
@@ -724,12 +724,12 @@ msgstr ""
 "      --sync-method=მეთოდი\n"
 "                       ფაილების დისკზე სინქრონიზაციის მეთოდის დაყენება\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:111
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                   ამ დახმარების ჩვენება და გასვლა\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:112
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -743,12 +743,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONNSTR   კავშირის სტრიქონი\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:114
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      მონაცემთა ბაზის სერვერის ჰოსტის ან სოკეტის საქაღალდე\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:115
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT          მონაცემთა ბაზის სერვერის პორტი\n"
@@ -762,23 +762,23 @@ msgstr ""
 "  -s, --status-interval=INTERVAL=INTERVAL\n"
 "                          სერვერზე გაგზავნილ სტატუსის პაკეტებს შორის დაყოვნება(წამებში)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:116
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=მომხმარებელი  ბაზის მომხმარებლის სახელი\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:117
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password        არასოდეს მკითხო პაროლი\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:118
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           პაროლის ყოველთვის კითხვა (ავტომატურად უნდა ხდებოდეს)\n"
 
 #: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
-#: pg_recvlogical.c:119
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -788,7 +788,7 @@ msgstr ""
 "შეცდომების შესახებ მიწერეთ: %s\n"
 
 #: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
-#: pg_recvlogical.c:120
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s-ის საწყისი გვერდია: <%s>\n"
@@ -900,7 +900,7 @@ msgstr "გადაცემის სიჩქარის მნიშვნ
 msgid "could not get COPY data stream: %s"
 msgstr "\"COPY\"-ის მონაცემების ნაკადის მიღების შეცდომა: %s"
 
-#: pg_basebackup.c:1040 pg_recvlogical.c:450 pg_recvlogical.c:626
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
 #: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
@@ -986,7 +986,7 @@ msgstr "ჟურნალის ნაკადის გასათიშა
 msgid "server does not support incremental backup"
 msgstr "სერვერს ინკრემენტული მარქაფის მხარდაჭერა არ გააჩნია"
 
-#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:273
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
 #: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
 #: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
@@ -1179,21 +1179,21 @@ msgstr "wal-method-ის არასწორი მნიშვნელო
 #: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
 #: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
 #: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
-#: pg_basebackup.c:2804 pg_createsubscriber.c:2196 pg_createsubscriber.c:2218
-#: pg_createsubscriber.c:2228 pg_createsubscriber.c:2236
-#: pg_createsubscriber.c:2264 pg_createsubscriber.c:2307 pg_receivewal.c:748
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
 #: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
-#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:859
-#: pg_recvlogical.c:871 pg_recvlogical.c:881 pg_recvlogical.c:888
-#: pg_recvlogical.c:895 pg_recvlogical.c:902 pg_recvlogical.c:909
-#: pg_recvlogical.c:916 pg_recvlogical.c:923 pg_recvlogical.c:932
-#: pg_recvlogical.c:939
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'."
 
-#: pg_basebackup.c:2585 pg_createsubscriber.c:2226 pg_receivewal.c:758
-#: pg_recvlogical.c:869
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "მეტისმეტად ბევრი ბრძანების-სტრიქონის არგუმენტი (პირველია \"%s\")"
@@ -1310,7 +1310,7 @@ msgstr "მოაცილეთ ეს გამოცემა, სანა
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "რეპლიკაციის სლოტი \"%s\" შეიქმნა მონაცემთა ბაზაში \"%s\" ძირითადზე, შეიძლება, გამოტოვებულია"
 
-#: pg_createsubscriber.c:231 pg_createsubscriber.c:1305
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "ამ რეპლიკაციის სლოტის მალე წაშლა WAL ფაილების მორჩენის თავიდან ასაცილებლად."
@@ -1337,7 +1337,7 @@ msgstr ""
 #, c-format
 msgid ""
 "  -a, --all                       create subscriptions for all databases except template\n"
-"                                  databases or databases that don't allow connections\n"
+"                                  databases and databases that don't allow connections\n"
 msgstr ""
 "  -a, --all                       გამოწერების შექმნა ყველა მონაცემთა ბაზისთვის გარდა შაბლონი\n"
 "                                  მონაცემთა ბაზების და მონაცემთა ბაზებისთვის, რომლებთანაც დაკავშირება აკრძალულია\n"
@@ -1369,38 +1369,38 @@ msgstr "  -P, --publisher-server=CONNSTR   გამომცემელთა
 
 #: pg_createsubscriber.c:256
 #, c-format
-msgid ""
-"  -R, --remove=OBJECTTYPE         remove all objects of the specified type from specified\n"
-"                                  databases on the subscriber; accepts: publications\n"
-msgstr ""
-"  -R, --remove=ობიექტისტიპი         წაშლის მითითებული ტიპის ყველა ობიექტს მითითებული\n"
-"                                  მონაცემთა ბაზებიდან გამომწერზე. იღებს: გამოცემებს\n"
-
-#: pg_createsubscriber.c:258
-#, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=DIR სოკეტის საქაღალდე (ნაგულისხმევია მიმდინარე.)\n"
 
-#: pg_createsubscriber.c:259
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=წამები     რამდენი წამი დაველოდო აღდგენის დასრულებას\n"
 
-#: pg_createsubscriber.c:260
+#: pg_createsubscriber.c:258
 #, c-format
 msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
 msgstr "  -T, --enable-two-phase          ორფაზიანი კომიტების ჩართვა ყველა გამოწერისთვის\n"
 
-#: pg_createsubscriber.c:261
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=სახელი      მომხმარებლის სახელი გამომწერის კავშირისთვის\n"
 
-#: pg_createsubscriber.c:262
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   დამატებითი ინფორმაციის გამოტანა\n"
 
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"    --clean=ობიექტისტიპი      წაშლის მითითებული ტიპის ყველა ობიექტს მითითებული\n"
+"                                  მონაცემთა ბაზებიდან გამომწერზე. იღებს: \"%s\"\n"
+
 #: pg_createsubscriber.c:263
 #, c-format
 msgid ""
@@ -1505,7 +1505,7 @@ msgstr "სისტემური იდენტიფიკატორი
 msgid "control file appears to be corrupt"
 msgstr "როგორც ჩანს, საკონტროლო ფაილი დაზიანებულია"
 
-#: pg_createsubscriber.c:645 pg_createsubscriber.c:685
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
 msgid "system identifier is %<PRIu64> on subscriber"
 msgstr "სისტემური იდენტიფიკატორი %<PRIu64> გამომწერზეა"
@@ -1515,494 +1515,544 @@ msgstr "სისტემური იდენტიფიკატორი %
 msgid "modifying system identifier of subscriber"
 msgstr "გამომწერის სისტემური იდენტიფიკატორის შეცვლა"
 
-#: pg_createsubscriber.c:688
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "მშრალი გაშვება: დააყენებს სისტემური იდენტიფიკატორს %<PRIu64> გამომწერზე"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "მშრალი გაშვება: pg_resetwal-ის გაშვება გამომწერზე"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "pg_resetwal-ის გაშვება გამომწერზე"
 
-#: pg_createsubscriber.c:700
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "გამომწერმა სისტემური იდენტიფიკატორი წარმატებით შეცვალა"
+msgid "successfully reset WAL on the subscriber"
+msgstr "WAL-ის ჩამოყრა წარმატებულია გამომწერზე"
 
-#: pg_createsubscriber.c:702
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "ვერ შევცვალე სისტემურ იდენტიფიკატორი გამომწერისთვის: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "WAL-ის ჩამოყრა შეუძლებელია გამომწერზე: %s"
 
-#: pg_createsubscriber.c:726
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "ვერ მივიღე მონაცემთა ბაზის OID: %s"
 
-#: pg_createsubscriber.c:733
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "ვერ მივიღე მონაცემთა ბაზის OID: მივიღე %d მწკრივი, მოველოდი %d მწკრივს"
 
-#: pg_createsubscriber.c:805
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "რეპლიკაციის სლოტის \"%s\" შექმნა გამომცემელზე"
 
-#: pg_createsubscriber.c:825
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "ვერ ჩავწერე დამატებითი WAL ჩანაწერი: %s"
 
-#: pg_createsubscriber.c:851
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "აღდგენის მიმდინარეობის მდგომარეობის მიღება შეუძლებელია: %s"
 
-#: pg_createsubscriber.c:884
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "პარამეტრების შექმნა გამომცემელზე"
 
-#: pg_createsubscriber.c:894
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "ძირითადი სერვერი აღდგენის რეჟიმში ვერ იქნება"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "გამომცემლის პარამეტრების მიღება შეუძლებელია: %s"
 
-#: pg_createsubscriber.c:949
+#: pg_createsubscriber.c:956
 #, c-format
 msgid "publisher requires \"wal_level\" >= \"logical\""
 msgstr "გამომცემელს \"wal_level\" >= \"logical\" ესაჭიროება"
 
-#: pg_createsubscriber.c:955
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "გამომცემელს %d რეპლიკაციის სლოტი სჭირდება, მაგრამ დარჩენილია, მხოლოდ, %d"
 
-#: pg_createsubscriber.c:957 pg_createsubscriber.c:966
-#: pg_createsubscriber.c:1076 pg_createsubscriber.c:1085
-#: pg_createsubscriber.c:1094
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "გაზარდეთ კონფიგურაციის პარამეტრი \"%s\" %d-მდე მაინც."
 
-#: pg_createsubscriber.c:964
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "გამომცემელს %d WAL-ის გამგზავნი პროცესი სჭირდება, მაგრამ დარჩენილია, მხოლოდ, %d"
 
-#: pg_createsubscriber.c:973
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "პარამეტრი two_phase რეპლიკაციის სლოტებისთვის არ ჩაირთვება"
 
-#: pg_createsubscriber.c:974
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "გამოწერები two_phase პარამეტრით გათიშული შეიქმნება.  მომზადებული ტრანზაქციების რეპლიკაცია მოხდება COMMIT PREPARED-თან."
 
-#: pg_createsubscriber.c:976
+#: pg_createsubscriber.c:983
 #, c-format
-msgid "You can use --enable-two-phase switch to enable two_phase."
-msgstr "'two_phase'-ის ჩასართავად, შეგიძლიათ, გამოიყენოთ პარამეტრი --enable-two-phase."
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "'two_phase'-ის ჩასართავად, შეგიძლიათ, გამოიყენოთ ბრძანების სტრიქონის პარამეტრი --enable-two-phase."
 
-#: pg_createsubscriber.c:986
+#: pg_createsubscriber.c:993
 #, c-format
 msgid "required WAL could be removed from the publisher"
 msgstr "აუცილებელი WAL-ის წაშლა შესაძლებელია გამომცემლიდან"
 
-#: pg_createsubscriber.c:987
+#: pg_createsubscriber.c:994
 #, c-format
 msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
 msgstr "დააყენეთ კონფიგურაციის პარამეტრი \"%s\" მნიშვნელობაზე -1, რომ დარწმუნდეთ, რომ WAL ფაილები საჭიროზე ადრე არ წაიშლება."
 
-#: pg_createsubscriber.c:1019
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "პარამეტრების შემოწმება გამომწერზე"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "სამიზნე სერვერი უქმე უნდა იყოს"
 
-#: pg_createsubscriber.c:1050
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "გამომწერის პარამეტრების მიღება შეუძლებელია: %s"
 
-#: pg_createsubscriber.c:1074
+#: pg_createsubscriber.c:1081
 #, c-format
 msgid "subscriber requires %d active replication origins, but only %d remain"
 msgstr "გამომწერს %d აქტიური რეპლიკაციის წყარო სჭირდება, მაგრამ დარჩენილია, მხოლოდ, %d"
 
-#: pg_createsubscriber.c:1083
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "გამომწერს %d ლოგიკური რეპლიკაციის დამხმარე პროცესი სჭირდება, მაგრამ დარჩენილია, მხოლოდ, %d"
 
-#: pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "გამომწერს %d დამხმარე პროცესი სჭირდება, მაგრამ დარჩენილია, მხოლოდ, %d"
 
-#: pg_createsubscriber.c:1127
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: მოხდება მოცილება გამოწერისა \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "მოხდება მოცილება გამოწერისა \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1136
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "ვერ მოვაცილე გამოწერა \"%s\": %s"
 
-#: pg_createsubscriber.c:1171
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "ვერ მივიღე უკვე არსებული გამოწერები: %s"
 
-#: pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "ვერ წავშალე რეპლიკაციის სლოტი \"%s\" ძირითადზე"
 
-#: pg_createsubscriber.c:1337
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "გადასართველი რეპლიკაციის სლოტის ინფორმაციის მიღება შეუძლებელია: %s"
 
-#: pg_createsubscriber.c:1339 pg_createsubscriber.c:1348
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "გამომწერზე გადასართველი რეპლიკაციის სლოტების მალე წაშლა WAL ფაილების მორჩენის თავიდან ასაცილებლად."
 
-#: pg_createsubscriber.c:1347
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "გადასართველი რეპლიკაციის სლოტი წაშლა შეუძლებელია"
 
-#: pg_createsubscriber.c:1369
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "მშრალი გაშვება: შექმნის რეპლიკაციის სლოტს \"%s\" მონაცემთა ბაზაში \"%s\" გამომცემელზე"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "იქმნება რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\""
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "იქმნება რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\" გამომცემელზე"
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "ვერ შევქმენი რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\": %s"
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: წაიშლება რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "იშლება რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1434
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "ვერ წავშალე რეპლიკაციის სლოტი \"%s\" მონაცემთა ბაზაში \"%s\": %s"
 
-#: pg_createsubscriber.c:1455
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctl ჩავარდა გამოსვლის კოდით %d"
 
-#: pg_createsubscriber.c:1460
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl შეწყდა გამონაკლისით 0x%X"
 
-#: pg_createsubscriber.c:1462
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "თექვსმეტობითი მნიშვნელობის აღწერისთვის იხილეთ C-ის ჩასასმელი ფაილი \"ntstatus.h\"."
 
-#: pg_createsubscriber.c:1464
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl შეწყვეტილია სიგნალით %d: %s"
 
-#: pg_createsubscriber.c:1470
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl დასრულდა უცნობი სტატუსით %d"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "ჩავარდნილი ბრძანება იყო: %s"
 
-#: pg_createsubscriber.c:1523
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "სერვერი გაეშვა"
 
-#: pg_createsubscriber.c:1538
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "სერვერი გამოირთო"
 
-#: pg_createsubscriber.c:1557
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "სამიზნე სერვერის მდგრად მდგომარეობაში გადასვლის მოლოდინი"
 
-#: pg_createsubscriber.c:1580
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "აღდგენის მოლოდინის ვადა ამოიწურა"
 
-#: pg_createsubscriber.c:1593
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "სერვერმა აღდგენა არ დაამთავრა"
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "სამიზნე სერვერმა მიაღწია მდგრად მდგომარეობას"
 
-#: pg_createsubscriber.c:1596
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "თუ ამ წერტილის შემდეგ pg_createsubscriber ჩავარდება, გაგრძელებამდე ფიზიკური რეპლიკა თავიდან უნდა შექმნათ."
 
-#: pg_createsubscriber.c:1623 pg_createsubscriber.c:1746
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "გამოცემის ინფორმაციის მიღება შეუძლებელია: %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "პუბლიკაცია \"%s\" უკვე არსებობს"
 
-#: pg_createsubscriber.c:1638
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "განიხილეთ ამ პუბლიკაციის სახელის გადარქმევა ხელახლა ცდამდე."
 
-#: pg_createsubscriber.c:1645
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: შექმნის გამოცემას \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "იქმნება გამოცემა \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1658
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "ვერ შევქმენი გამოცემა \"%s\" მონაცემთა ბაზაში \"%s\": %s"
 
-#: pg_createsubscriber.c:1688
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: წაშლის გამოცემას \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "ვშლი გამოცემას \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1702
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "ვერ წავშალე გამოცემა \"%s\" მონაცემთა ბაზაში \"%s\": %s"
 
-#: pg_createsubscriber.c:1739
+#: pg_createsubscriber.c:1769
 #, c-format
 msgid "dropping all existing publications in database \"%s\""
 msgstr "ვშლი ყველა არსებულ გამოცემას მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1797
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: შექმნის გამოწერას \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "იქმნება გამოწერა \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1819
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "ვერ შევქმენი გამოწერა \"%s\" მონაცემთა ბაზაში \"%s\": %s"
 
-#: pg_createsubscriber.c:1864
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "ვერ მივიღე გამოწერის OID: %s"
 
-#: pg_createsubscriber.c:1871
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "ვერ მივიღე გამოწერის OID: მივიღე %d მწკრივი, მოველოდი %d მწკრივს"
 
-#: pg_createsubscriber.c:1895
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "მშრალი გაშვება: დააყენებს რეპლიკაციის მიმდინარეობას (კვანძის სახელი \"%s\", LSN %s) მონაცემთა ბაზაზე \"%s\""
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "რეპლიკაციის მიმდინარეობის (კვანძის სახელი \"%s\", LSN %s) დაყენება მონაცემთა ბაზაზე \"%s\""
 
-#: pg_createsubscriber.c:1910
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "შეუძლებელია რეპლიკაციის მიმდინარეობის დაყენება გამოწერისთვის \"%s\": %s"
 
-#: pg_createsubscriber.c:1941
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "მშრალი გაშვება: ჩაირთვება გამოწერა \"%s\" მონაცემთა ბაზაში \"%s\""
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "ჩაირთვება გამოწერა \"%s\" მონაცემთა ბაზაში \"%s\""
 
-#: pg_createsubscriber.c:1953
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "ვერ ჩავრთე გამოწერა \"%s\": %s"
 
-#: pg_createsubscriber.c:1999
+#: pg_createsubscriber.c:2041
 #, c-format
 msgid "could not obtain a list of databases: %s"
 msgstr "ვერ მივიღე მონაცემთა ბაზების სია: %s"
 
-#: pg_createsubscriber.c:2103
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "root-ით ვერ გაეშვება"
 
-#: pg_createsubscriber.c:2104
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "%s PostgreSQL-ის ზემომხმარებლით უნდა გაუშვათ."
 
-#: pg_createsubscriber.c:2127
+#: pg_createsubscriber.c:2169
 #, c-format
 msgid "database \"%s\" specified more than once for -d/--database"
 msgstr "მონაცემთა ბაზა \"%s\" ერთზე მეტჯერაა მითითებული პარამეტრისთვის -d/--database"
 
-#: pg_createsubscriber.c:2146
-#, c-format
-msgid "object type \"%s\" is specified more than once for -R/--remove"
-msgstr "პარამეტრისთვის -R/--remove ობიექტის ტიპი \"%s\" ერთზე მეტჯერაა მითითებული"
-
-#: pg_createsubscriber.c:2174
+#: pg_createsubscriber.c:2210
 #, c-format
 msgid "publication \"%s\" specified more than once for --publication"
 msgstr "პუბლიკაცია \"%s\" მითითებულია ერთზე მეტჯერ პარამეტრისთვის --publication"
 
-#: pg_createsubscriber.c:2183
+#: pg_createsubscriber.c:2219
 #, c-format
 msgid "replication slot \"%s\" specified more than once for --replication-slot"
 msgstr "რეპლიკაციის სლოტი \"%s\" მითითებულია ერთზე მეტჯერ პარამეტრისთვის --repilication-slot"
 
-#: pg_createsubscriber.c:2192
+#: pg_createsubscriber.c:2228
 #, c-format
 msgid "subscription \"%s\" specified more than once for --subscription"
 msgstr "გამოწერა \"%s\" მითითებულია ერთზე მეტჯერ პარამეტრისთვის --subscription"
 
-#: pg_createsubscriber.c:2217
+#: pg_createsubscriber.c:2234
+#, c-format
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "პარამეტრისთვის --clean ობიექტის ტიპი \"%s\" ერთზე მეტჯერაა მითითებული"
+
+#: pg_createsubscriber.c:2259
 #, c-format
-msgid "%s cannot be used with -a/--all"
-msgstr "%s-ს ვერ გამოიყენებთ -a/--all -თან ერთად"
+msgid "options %s and %s cannot be used together"
+msgstr "პარამეტრებს %s და -%s ერთად ვერ გამოიყენებთ"
 
-#: pg_createsubscriber.c:2235
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "გამომწერის მონაცემების საქაღალდე მითითებული არაა"
 
-#: pg_createsubscriber.c:2246
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "მიმდინარე საქაღალდის იდენტიფიკაციის პრობლემა"
 
-#: pg_createsubscriber.c:2263
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "გამომცემლის მიერთების სტრიქონი მითითებული არაა"
 
-#: pg_createsubscriber.c:2267
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "გამომცემლის მიერთების სტრიქონის გადამოწმება"
 
-#: pg_createsubscriber.c:2273
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "მიმდინარეობს გამომწერის დაკავშირების სტრიქონის გადამოწმება"
 
-#: pg_createsubscriber.c:2290
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "ბაზა მითითებული არაა"
 
-#: pg_createsubscriber.c:2301
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "ბაზა \"%s\" გამოღებულია გამომცემლის მიერთების სტრიქონიდან"
 
-#: pg_createsubscriber.c:2306
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "ბაზის სახელი მითითებული არაა"
 
-#: pg_createsubscriber.c:2316
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "მითითებულია გამოცემის სახელების არასწორი რაოდენობა"
 
-#: pg_createsubscriber.c:2317
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "გამოცემის სახელების რაოდენობა (%d) ბაზის სახელების მითითებულ რაოდენობას (%d) უნდა ემთხვეოდეს."
 
-#: pg_createsubscriber.c:2323
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "მითითებულია გამოწერის სახელების არასწორი რაოდენობა"
 
-#: pg_createsubscriber.c:2324
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "მითითებული გამოწერის სახელების რაოდენობა (%d) მითითებული ბაზის სახელების რაოდენობას (%d) უნდა ემთხვეოდეს."
 
-#: pg_createsubscriber.c:2330
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "მითითებულია რეპლიკაციის სლოტის სახელების არასწორი რაოდენობა"
 
-#: pg_createsubscriber.c:2331
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "რეპლიკაციის სლოტების მითითებული სახელების რაოდენობა (%d) ბაზის სახელების მითითებულ რაოდენობას (%d) უნდა ემთხვეოდეს."
 
-#: pg_createsubscriber.c:2343
+#: pg_createsubscriber.c:2386
 #, c-format
-msgid "invalid object type \"%s\" specified for -R/--remove"
-msgstr "პარამეტრისთვის -R/--remove მითითებული ობიექტის ტიპი '%s' არასწორია"
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "%2$s-ისთვის მითითებულია არასწორი ობიექტის ტიპი \"%1$s\""
 
-#: pg_createsubscriber.c:2344
+#: pg_createsubscriber.c:2388
 #, c-format
-msgid "The valid option is: \"publications\""
-msgstr "სწორი პარამეტრია \"publications\""
+msgid "The valid value is: \"%s\""
+msgstr "სწორი მნიშვნელობაა: \"%s\""
 
-#: pg_createsubscriber.c:2375
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "გამომწერის მონაცემების საქაღალდე წყარო ბაზის კლასტერის ასლი არაა"
 
-#: pg_createsubscriber.c:2388
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "უქმე სერვერი გაშვებულია"
 
-#: pg_createsubscriber.c:2389
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "გააჩერეთ უქმე სერვერი და თავიდან სცადეთ."
 
-#: pg_createsubscriber.c:2398
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "მიმდინარეობს უქმე სერვერის გაშვება ბრძანების სტრიქონის პარამეტრებით"
 
-#: pg_createsubscriber.c:2414 pg_createsubscriber.c:2449
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "გამომწერის გაჩერება"
 
-#: pg_createsubscriber.c:2428
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "გამომწერის გაშვება"
 
-#: pg_createsubscriber.c:2457
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "შესრულებულია!"
@@ -2021,7 +2071,7 @@ msgstr ""
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=DIR    წინასწარ-ჩაწერადი ჟურნალის ფაილების მითითებულ საქაღალდეში ჩაწერა\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:92
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       გამოსვლა მითითებული LSN-ის მიღების შემდეგ\n"
@@ -2098,7 +2148,7 @@ msgstr "ჟურნალის ნაკადი შეჩერდა მი
 msgid "switched to timeline %u at %X/%X"
 msgstr "გადავერთე %u-ე დროის ხაზზე მისამართით %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1073
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "მიღებულია შეწყვეტის სიგნალი. გამოსვლა"
@@ -2168,7 +2218,7 @@ msgstr "ფაილის (%s) შემოწმება შეუძლე
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "ჟურნალის ნაკადი დაიწყო მისამართზე %X/%X (დროის ხაზი %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:807
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "ბოლო პოზიციის დამუშავების შეცდომა: %s"
@@ -2198,23 +2248,23 @@ msgstr "%s-სთან დაკავშირების მხარდა
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "რეპლიკაციის შეერთება სლოტით \"%s\" მოულოდნელად ბაზაზეა დამოკიდებული"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:991
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტის წაშლა: %s"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:1001
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "რეპლიკაციის სლოტის შექმნა \"%s\""
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1026
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "გათიშულია"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1030
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "გათიშულია; თავიდან ცდამდე დაყოვნება %d წამია"
@@ -2243,17 +2293,14 @@ msgstr ""
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            რეპლიკაციის სლოტში ნაკადის გაშვება (სლოტის სახელისთვის იხილეთ --slot)\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:92
 #, c-format
-#| msgid ""
-#| "  --includedir          show location of C header files of the client\n"
-#| "                        interfaces\n"
 msgid ""
-"      --failover         enable replication slot synchronization to standby servers when\n"
-"                         creating a slot\n"
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
 msgstr ""
-"      --failover         ჩართავს რეპლიკაციის სლოტის სინქრონიზაციას უქმე სერვერებთან\n"
-"                         სლოტის შექმნისას\n"
+"      --enable-failover         ჩართავს რეპლიკაციის სლოტის სინქრონიზაციას უქმე სერვერებთან\n"
+"                             რეპლიკაციის სლოტის შექმნისას\n"
 
 #: pg_recvlogical.c:95
 #, c-format
@@ -2297,137 +2344,136 @@ msgstr "  -S, --slot=SLOTNAME    ლოგიკური რეპლიკა
 
 #: pg_recvlogical.c:108
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase        სლოტის შექმნისას მომზადებული ტრანზაქციების დეკოდერის ჩართვა\n"
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr "  -t, --enable-two-phase მომზადებული ტრანზაქციების დეკოდირების ჩართვა სლოტის შექმნისას\n"
 
-#: pg_recvlogical.c:113
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (იგივე, რაც --enable-two-phase, მოძველებულია)\n"
+
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=DBNAME    მისაერთებელი ბაზის სახელი\n"
 
-#: pg_recvlogical.c:146
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "ჩაწერის დადასტურება %X/%X-მდე, %X/%X-მდე მოცილება (სლოტი %s)"
 
-#: pg_recvlogical.c:170 receivelog.c:359
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "უკუკავშირის პაკეტის გაგზავნის შეცდომა: %s"
 
-#: pg_recvlogical.c:240
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "ჟურნალის ნაკადის დაწყება მისამართზე %X/%X (სლოტი %s)"
 
-#: pg_recvlogical.c:282
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "ნაკადი ინიცირებულია"
 
-#: pg_recvlogical.c:347
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "ჟურნალის ფაილის გახსნის შეცდომა \"%s\": %m"
 
-#: pg_recvlogical.c:376 receivelog.c:889
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "არასწორი სოკეტი: %s"
 
-#: pg_recvlogical.c:429 receivelog.c:917
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s()-ის შეცდომა: %m"
 
-#: pg_recvlogical.c:436 receivelog.c:966
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "\"WAL\" ნაკადიდან მონაცემების მიღების შეცდომა: %s"
 
-#: pg_recvlogical.c:478 pg_recvlogical.c:529 receivelog.c:1010
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
 #: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "ნაკადის თავსართი ძალიან პატარაა: %d"
 
-#: pg_recvlogical.c:513 receivelog.c:846
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "ნაკადის უცნობი თავსართი: \"%c\""
 
-#: pg_recvlogical.c:567 pg_recvlogical.c:579
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "%d ბაიტის ჩაწერის შეცდომა ჟურნალის ფაილში \"%s\": %m"
 
-#: pg_recvlogical.c:637 receivelog.c:641 receivelog.c:678
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "რეპლიკაციის ნაკადის მოულოდნელი დასასრული: %s"
 
-#: pg_recvlogical.c:802
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "საწყისი მდებარეობის დამუშავების შეცდომა: %s"
 
-#: pg_recvlogical.c:880
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "სლოტი მითითებული არაა"
 
-#: pg_recvlogical.c:887
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "სამიზნე ფაილი მითითებული არაა"
 
-#: pg_recvlogical.c:894
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "ბაზა მითითებული არაა"
 
-#: pg_recvlogical.c:901
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "საჭიროა, სულ ცოტა, ერთი ქმედების მითითება"
 
-#: pg_recvlogical.c:908
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "--create-slot -ს და ---start-ს -drop-slot -თან ერთად ვერ გამოიყენებთ"
 
-#: pg_recvlogical.c:915
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "--create-slot -ს და --drop-slot-ს --startpos -თან ერთად ვერ გამოიყენებთ"
 
-#: pg_recvlogical.c:922
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos -ის მითითება მხოლოდ --start -თან ერთად შეიძლება"
 
-#: pg_recvlogical.c:931
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase -ის მითითება მხოლოდ --create-slot -თან ერთად შეიძლება"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s-ის მითითება, მხოლოდ, --create-slot -თან ერთად შეიძლება"
 
-#: pg_recvlogical.c:938
-#, c-format
-#| msgid "--two-phase may only be specified with --create-slot"
-msgid "--failover may only be specified with --create-slot"
-msgstr "--failover პარამეტრის მითითება, მხოლოდ, --create-slot პარამეტრთან ერთად შეგიძლიათ"
-
-#: pg_recvlogical.c:975
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "ბაზაზე-დამოკიდებული რეპლიკაციის შეერთების დამყარების შეცდომა"
 
-#: pg_recvlogical.c:1076
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "ბოლო მდებარეობა %X/%X keepalive-ის მიერ მიღწეული"
 
-#: pg_recvlogical.c:1081
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "ბოლო მდებარეობა %X/%X WAL ჩანაწერის მიერ მიღწეულია მისამართზე %X/%X"
@@ -2703,6 +2749,14 @@ msgstr "შეკუმშვის ნაკადის დახურვი
 #~ msgid " -V, --version                       output version information, then exit\n"
 #~ msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
 
+#, c-format
+#~ msgid "%s cannot be used with -a/--all"
+#~ msgstr "%s-ს ვერ გამოიყენებთ -a/--all -თან ერთად"
+
+#, c-format
+#~ msgid "--failover may only be specified with --create-slot"
+#~ msgstr "--failover პარამეტრის მითითება, მხოლოდ, --create-slot პარამეტრთან ერთად შეგიძლიათ"
+
 #, c-format
 #~ msgid "Consider increasing max_logical_replication_workers to at least %d."
 #~ msgstr "განიხილეთ max_logical_replication_workers-ის გაზრდა მინიმუმ %d-მდე."
@@ -2719,6 +2773,10 @@ msgstr "შეკუმშვის ნაკადის დახურვი
 #~ msgid "Consider increasing max_worker_processes to at least %d."
 #~ msgstr "განიხილეთ max_worker_processes-ის გაზრდა მინიმუმ %d-მდე."
 
+#, c-format
+#~ msgid "The valid option is: \"publications\""
+#~ msgstr "სწორი პარამეტრია \"publications\""
+
 #, c-format
 #~ msgid "This build does not support compression with %s."
 #~ msgstr "ამ აგებაში %s-ით შეკუმშვის მხარდაჭრა არ არსებობს."
@@ -2729,6 +2787,10 @@ msgstr "შეკუმშვის ნაკადის დახურვი
 #~ msgstr[0] "WAL-ის სეგმენტის ზომა ორის ხარისხი უნდა იყოს 1 მბ-სა და 1გბ-ს შორის, მაგრამ დაშორებულმა სერვერმა %d ბაიტიანი მნიშვნელობა დააბრუნა"
 #~ msgstr[1] "WAL-ის სეგმენტის ზომა ორის ხარისხი უნდა იყოს 1 მბ-სა და 1გბ-ს შორის, მაგრამ დაშორებულმა სერვერმა %d ბაიტიანი მნიშვნელობა დააბრუნა"
 
+#, c-format
+#~ msgid "could not change system identifier of subscriber: %s"
+#~ msgstr "ვერ შევცვალე სისტემურ იდენტიფიკატორი გამომწერისთვის: %s"
+
 #, c-format
 #~ msgid "could not check file \"%s\""
 #~ msgstr "ფაილის შემოწმება შეუძლებელია: %s"
@@ -2773,6 +2835,10 @@ msgstr "შეკუმშვის ნაკადის დახურვი
 #~ msgid "no value specified for --compress, switching to default"
 #~ msgstr "--compress -ის მნიშვნელობა მითითებული არაა. გამოიყენება ნაგულისხმები"
 
+#, c-format
+#~ msgid "options %s and -a/--all cannot be used together"
+#~ msgstr "პარამეტრებს %s და -a/--all ერთად ვერ გამოიყენებთ"
+
 #, c-format
 #~ msgid "primary has replication slot \"%s\""
 #~ msgstr "ძირითადს აქვს რეპლიკაციის სლოტი \"%s\""
@@ -2789,6 +2855,10 @@ msgstr "შეკუმშვის ნაკადის დახურვი
 #~ msgid "subscriber failed to change system identifier: exit code: %d"
 #~ msgstr "გამომწერის სისტემური იდენტიფიკატორის შეცვლა ჩავარდა: გამოსვლის კოდი: %d"
 
+#, c-format
+#~ msgid "subscriber successfully changed the system identifier"
+#~ msgstr "გამომწერმა სისტემური იდენტიფიკატორი წარმატებით შეცვალა"
+
 #, c-format
 #~ msgid "symlinks are not supported on this platform"
 #~ msgstr "სიმბმულები ამ პლატფორმაზე მხარდაჭერილი არაა"
diff --git a/src/bin/pg_basebackup/po/ko.po b/src/bin/pg_basebackup/po/ko.po
index 08861d1022c..2d928bbc864 100644
--- a/src/bin/pg_basebackup/po/ko.po
+++ b/src/bin/pg_basebackup/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_basebackup (PostgreSQL) 17\n"
+"Project-Id-Version: pg_basebackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:49+0000\n"
-"PO-Revision-Date: 2025-01-18 02:23+0900\n"
+"POT-Creation-Date: 2025-09-11 21:49+0000\n"
+"PO-Revision-Date: 2025-09-09 17:31+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -17,30 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
+#: ../../fe_utils/astreamer_zstd.c:288
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "이 버전은 %s 압축 기능을 포함 하지 않고 빌드 되었습니다."
@@ -97,7 +98,7 @@ msgstr "\"%s\" 압축 알고리즘은 원거리 모드를 지원하지 않습니
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "읽기 용 \"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -109,7 +110,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "\"%s\" 파일을 닫을 수 없음: %m"
@@ -133,10 +134,10 @@ msgstr ""
 "이럴 경우, 출력 결과가 바르지 않을 수 있고,\n"
 "설치된 PostgreSQL 프로그램과 데이터 디렉터리가 호환되지 않을 수 있습니다."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
@@ -146,8 +147,8 @@ msgstr "\"%s\" 파일을 열 수 없음: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일 fsync 실패: %m"
@@ -163,36 +164,36 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 복제할 수 없음(내부 오류)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위해 파일 시스템 동기화 실패: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -227,191 +228,200 @@ msgstr "제한된 토큰으로 다시 실행할 수 없음: 오류 코드 %lu"
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "하위 프로세스의 종료 코드를 구할 수 없음: 오류 코드 %lu"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "\"%s\" 값은 \"%s\" 옵션값으로 유효하지 않음"
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "%s 값은 %d부터 %d까지 지정할 수 있습니다."
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "알 수 없는 동기화 방법: %s"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:334
-#, c-format
-msgid "out of memory"
-msgstr "메모리 부족"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "\"%s\" 파일 쓰기 실패: %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "\"%s\" 파일을 만들 수 없음: %m"
 
-#: ../../fe_utils/string_utils.c:434
-#, c-format
-msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
-msgstr "쉘 명령 인자에 줄바꿈 문자가 있음: \"%s\"\n"
-
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:278
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "아카이브 추출 중 예상치 못한 상태값 발견"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:329
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 액세스 권한을 지정할 수 없음: %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:348
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 심볼릭 링크로 만들 수 없음: %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:368
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "파일 \"%s\" 의 접근권한을 지정할 수 없음: %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "\"%s\" 압축 파일 만들기 실패: %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "stdout을 중복할 수 없음: %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "출력파일을 열 수 없음: %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "잘못된 압축 수위 %d: %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "\"%s\" 압축 파일 쓰기 실패: %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "\"%s\" 압축 파일 닫기 실패: %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "압축 라이브러리를 초기화할 수 없음"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "압축 풀기 실패: %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "복구 관련 설정을 추가 하는 도중 예상치 못한 상태 발견"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "lz4 압축 컨텍스트 정보를 생성할 수 없습니다: %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "lz4 헤더를 쓸 수 없음: %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
 #, c-format
 msgid "could not compress data: %s"
 msgstr "자료를 압축할 수 없음: %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "lz4 압축을 끝낼 수 없음: %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "압축 라이브러리를 초기화 할 수 없음: %s"
 
-#: bbstreamer_tar.c:244
+#: ../../fe_utils/astreamer_tar.c:244
 #, c-format
 msgid "tar file trailer exceeds 2 blocks"
 msgstr "tar 파일 끝부분에서 2 블록이 초과됨"
 
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:249
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "tar 아카이브 분석 중 예상치 못한 상태 발견"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:292
 #, c-format
 msgid "tar member has empty name"
 msgstr "tar 맴버에 이름이 없음"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:326
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "마지막 파일을 끝내기 전에 COPY 스트림이 끝났음"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "zstd 압축 컨텍스트를 만들 수 없음"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "zstd 압축 수준을 %d 값으로 지정할 수 없음: %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
 msgstr "압축용 병렬 작업자 수를 %d 값으로 지정할 수 없음: %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:120
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "원거리 모드를 활성화 할 수 없음: %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:279
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "zstd 압축 컨텍스트를 만들 수 없음"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "\"%s\" 값은 \"%s\" 옵션값으로 유효하지 않음"
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "%s 값은 %d부터 %d까지 지정할 수 있습니다."
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "알 수 없는 동기화 방법: %s"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "메모리 부족"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "쉘 명령 인자에 줄바꿈 문자가 있음: \"%s\"\n"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "복구 관련 설정을 추가 하는 도중 예상치 못한 상태 발견"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -504,14 +514,14 @@ msgstr ""
 "다.\n"
 "\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [옵션]...\n"
@@ -664,12 +674,12 @@ msgstr "  -P, --progress         진행 과정 보여줌\n"
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=슬롯이름    지정한 복제 슬롯을 사용함\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          자세한 작업 메시지 보여줌\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          버전 정보 보여주고 마침\n"
@@ -726,12 +736,12 @@ msgstr ""
 "      --sync-method=METHOD\n"
 "                         파일을 디스크에 동기화 하는 방법 지정\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             이 도움말을 보여주고 마침\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -745,12 +755,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=접속문자열 서버 접속 문자열\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=호스트이름   접속할 데이터베이스 서버나 소켓 디렉터리\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=포트        데이터베이스 서버 포트 번호\n"
@@ -765,17 +775,17 @@ msgstr ""
 "  -s, --status-interval=초\n"
 "                         초 단위 매번 서버로 상태 패킷을 보냄\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=사용자  접속할 특정 데이터베이스 사용자\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      비밀번호 물어 보지 않음\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid ""
 "  -W, --password         force password prompt (should happen "
@@ -783,8 +793,8 @@ msgid ""
 msgstr ""
 "  -W, --password         항상 비밀번호 프롬프트 보임 (자동으로 판단 함)\n"
 
-#: pg_basebackup.c:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -793,8 +803,8 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
@@ -804,8 +814,8 @@ msgstr "%s 홈페이지: <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "준비된 파이프로부터 읽기 실패: %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:521
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "트랜잭션 로그 위치 \"%s\" 분석 실패"
@@ -820,106 +830,106 @@ msgstr "WAL 파일 쓰기 마무리 실패: %m"
 msgid "could not create pipe for background process: %m"
 msgstr "백그라운드 프로세스를 위한 파이프 만들기 실패: %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "\"%s\" 임시 복제 슬롯을 만듦"
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "\"%s\" 이름의 복제 슬롯을 만듦"
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "백그라운드 프로세스 만들기 실패: %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "백그라운드 스래드 만들기 실패: %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "\"%s\" 디렉터리가 있지만 비어 있지 않음"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 액세스할 수 없습니다: %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, 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 테이블스페이스 %*s"
 
-#: pg_basebackup.c:870
+#: pg_basebackup.c:871
 #, 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 테이블스페이스 (%s%-*.*s)"
 
-#: pg_basebackup.c:886
+#: pg_basebackup.c:887
 #, 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 테이블스페이스"
 
-#: pg_basebackup.c:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "\"%s\" 전송 속도는 잘못된 값임"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "잘못된 전송 속도 \"%s\": %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "전송 속도는 0보다 커야 함"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "잘못된 --max-rate 단위: \"%s\""
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "\"%s\" 전송 속도는 정수형 범위가 아님"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "\"%s\" 전송 속도는 범위 초과"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "COPY 데이터 스트림을 사용할 수 없음: %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "COPY 자료를 읽을 수 없음: %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "백그라운드 프로세스가 예상치 않게 종료됨"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "압축된 tar 파일에는 manifest를 넣을 수 없습니다."
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid ""
 "Use client-side compression, send the output to a directory rather than "
@@ -928,137 +938,137 @@ msgstr ""
 "결과물을 표준 출력으로 보내지 말고, 디렉터리로 보낸 뒤 클라이언트 측에서 압"
 "축 하거나, %s 옵션을 사용하세요."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "\"%s\" 아카이브를 구문분석할 수 없음"
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
 msgstr "tar 형식만 구문분석할 수 있음"
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr "아카이브를 분석하기 위해서는 일반 양식이어야 합니다."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid ""
 "Using - as the output directory requires pg_basebackup to parse the archive."
 msgstr "아카이브를 분석하기 위해 출력 디렉터리 이름으로 - 문자를 사용하세요."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr "아카이브를 분석하기 위해 -R 옵션을 사용하세요."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "아카이브 작업은 매니페스트보다 앞서야합니다"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "잘못된 아카이브 이름: \"%s\""
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "비정상 payload 자료"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "빈 COPY 메시지"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "타입 %d의 잘못된 COPY 메시지, 길이: %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "호환하지 않는 서버 버전 %s"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr ""
 "트랜잭션 로그 스트리밍을 사용하지 않으려면  -X none 또는 -X fetch 옵션을 사용"
 "하세요."
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "서버가 증분 백업을 지원하지 않음"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:367 streamutil.c:441
-#: streamutil.c:493 streamutil.c:581 streamutil.c:733 streamutil.c:778
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "\"%s\" 복제 명령을 보낼 수 없음: %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "매니페이스 파일을 업로드 할 수 없음: %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "매니페이스 파일을 업로드 할 수 없음: 예상치 않은 상태 %s"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "COPY 자료를 보낼 수 없음: %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "COPY 종료 정보를 보낼 수 없음: %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "매니페이스를 보내는 중 예상치 못한 부가 결과 발견"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "이 서버는 백업 타켓을 지원하지 않음."
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr "백업 타겟을 사용할 때는 원 환경 설정을 기록할 수 없습니다."
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "이 서버는 서버 측 압축을 지원하지 않습니다"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr "베이스 백업을 초기화 중, 체크포인트 완료를 기다리는 중"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "체크포인트가 끝나길 기다리는 중"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "베이스 백업을 초기화 할 수 없음: %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid ""
 "server returned unexpected response to BASE_BACKUP command; got %d rows and "
@@ -1067,129 +1077,124 @@ msgstr ""
 "서버가 BASE_BACKUP 명령에 대해서 잘못된 응답을 했습니다; 응답값: %d 로우, %d "
 "필드, (기대값: %d 로우, %d 필드)"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "체크포인트 완료"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "트랙잭션 로그 시작 위치: %s, 타임라인: %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "백업 헤더를 구할 수 없음: %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "서버가 아무런 자료도 주지 않았음"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr ""
 "표준 출력으로는 하나의 테이블스페이스만 쓸 수 있음, 데이터베이스는 %d 개의 테"
 "이블 스페이스가 있음"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "백그라운드 WAL 수신자 시작 중"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "백업 실패: %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "서버에서 트랜잭션 로그 마지막 위치가 수신 되지 않았음"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "트랜잭션 로그 마지막 위치: %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "체크섬 오류 발생"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "수신 작업 마무리 실패: %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "스트리밍을 끝내기 위해서 백그라운드 프로세스를 기다리는 중 ..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "백그라운드 파이프로 명령을 보낼 수 없음: %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "하위 프로세스를 기다릴 수 없음: %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "%d 개의 하위 프로세스가 종료됨, 기대값 %d"
 
-#: pg_basebackup.c:2248 streamutil.c:92 streamutil.c:207 streamutil.c:319
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "하위 스레드를 기다릴 수 없음: %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "하위 스레드 종료 상태가 정상적이지 않음: %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "하위 스레드가 비정상 종료됨: 오류 코드 %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "자료를 디스크에 동기화 하는 중 ... "
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "backup_manifest.tmp 파일을 backup_manifest로 바꾸는 중"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "베이스 백업 완료"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr "잘못된 체크포인트 옵션값 \"%s\", \"fast\" 또는 \"spread\"만 사용 가능"
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "\"%s\" 값은 잘못된 출력 형식, \"plain\" 또는 \"tar\" 만 사용 가능"
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid ""
 "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
@@ -1197,124 +1202,125 @@ msgstr ""
 "\"%s\" 값은 잘못된 wal-method 옵션값, \"fetch\", \"stream\" 또는 \"none\"만 "
 "사용 가능"
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2037 pg_createsubscriber.c:2047
-#: pg_createsubscriber.c:2055 pg_createsubscriber.c:2083
-#: pg_createsubscriber.c:2115 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2205 pg_createsubscriber.c:2227
+#: pg_createsubscriber.c:2237 pg_createsubscriber.c:2245
+#: pg_createsubscriber.c:2273 pg_createsubscriber.c:2316 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2045 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2235 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인자를 지정했습니다. (처음 \"%s\")"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "백업 양식과 백업 타겟을 함께 사용할 수 없음"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "출력 디렉터리를 지정하거나, 백업 타겟을 지정하세요."
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "출력 디렉터리와 백업 타겟은 함께 지정할 수 없음"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "알 수 없는 압축 알고리즘: \"%s\""
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "잘못된 압축 정보: %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid ""
 "client-side compression is not possible when a backup target is specified"
 msgstr "백업 타켓을 사용할 때는 클라이언트 측 압축을 사용할 수 없습니다."
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "tar 형식만 압축을 사용할 수 있음"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
 msgstr "백업 타겟을 지정할 때는 WAL 스트리밍을 사용할 수 없습니다."
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "tar 방식에서 stdout으로 트랜잭션 로그 스트리밍 불가"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "복제 슬롯은 WAL 스트리밍 방식에서만 사용할 수 있음"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "슬롯 이름을 지정한 경우 --no-slot 옵션을 사용할 수 없음"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "%s 옵션은 --slot 옵션을 함께 사용해야 함"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "%s 옵션과 %s 옵션은 함께 사용할 수 없음"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "트랜잭션 로그 디렉터리 위치는 백업 타켓과 함께 지정할 수 없음"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "트랜잭션 로그 디렉터리 위치는 plain 모드에서만 사용할 수 있음"
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "트랜잭션 로그 디렉터리 위치는 절대 경로여야 함"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "\"%s\" 심벌릭 링크를 만들 수 없음: %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "복구 뒤 실패"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid ""
 "The target server cannot be used as a physical replica anymore.  You must "
@@ -1323,30 +1329,30 @@ msgstr ""
 "대상 서버는 더 이상 물리 복제 대기 서버로 사용할 수 없습니다. 물리 복제 대기 "
 "서버가 필요하다면, 다시 만들어야 합니다."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid ""
 "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "다음 발행이 남아 있음: 발행 이름=\"%s\", 대상 데이터베이스=\"%s\""
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "재시도 전에 이 발행을 삭제하세요."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid ""
 "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr ""
 "다음 복제 슬롯이 남아 있음: 복제 슬롯 이름=\"%s\", 대상 데이터베이스=\"%s\""
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1260
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1314
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "WAL 파일이 늘어나는 것을 막기위해 해당 복제 슬롯을 삭제하세요."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid ""
 "%s creates a new logical replica from a standby server.\n"
@@ -1355,7 +1361,7 @@ msgstr ""
 "%s 프로그램은 물리 복제 대기 서버를 새로운 논리 복제 서버로 만듭니다.\n"
 "\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid ""
 "\n"
@@ -1364,39 +1370,51 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid ""
+"  -a, --all                       create subscriptions for all databases "
+"except template\n"
+"                                  databases and databases that don't allow "
+"connections\n"
+msgstr ""
+"  -a, --all                       템플릿 데이터베이스와 접속을 허용하지 않는"
+"데이터베이스를\n"
+"                                  제외한 모든 데이터베이스용 구독을 만듦\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid ""
 "  -d, --database=DBNAME           database in which to create a "
 "subscription\n"
 msgstr "  -d, --database=DBNAME           구독을 만들 데이터베이스 지정\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid ""
 "  -D, --pgdata=DATADIR            location for the subscriber data "
 "directory\n"
 msgstr "  -D, --pgdata=DATADIR            구독용 인스턴스 데이터 디렉터리\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid ""
 "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr ""
 "  -n, --dry-run                   실작업은 안하고, 뭘 할 것인지만 보여줌\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr ""
 "  -p, --subscriber-port=PORT      구독용 인스턴스 포트 번호 (초기값 %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr "  -P, --publisher-server=CONNSTR  구독용 인스턴스 연결 문자열\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid ""
 "  -s, --socketdir=DIR             socket directory to use (default current "
@@ -1405,22 +1423,42 @@ msgstr ""
 "  -s, --socketdir=DIR             사용할 소켓 디렉터리 (초기값 current "
 "dir.)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SECS     복구가 끝날 때까지 기다리는 초\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid ""
+"  -T, --enable-two-phase          enable two-phase commit for all "
+"subscriptions\n"
+msgstr ""
+"  -T, --enable-two-phase          모든 구독을 위해 two-phase commit 활성화\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NAME  구독용 인스턴스 연결을 위한 사용자\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   자세한 작업 메시지 보여줌\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type "
+"from specified\n"
+"                                  databases on the subscriber; accepts: \"%s"
+"\"\n"
+msgstr ""
+"      --clean=OBJECTTYPE          구독에서 지정 데이터베이스의 지정 타입의 모"
+"든 객체들을\n"
+"                                  삭제함; 사용 가능 타입: \"%s\"\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid ""
 "      --config-file=FILENAME      use specified main server configuration\n"
@@ -1429,197 +1467,197 @@ msgstr ""
 "      --config-file=FILENAME      대상 클러스터가 실행될 때 사용할\n"
 "                                  주 서버용 환경 설정 파일\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=NAME          발행 이름\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=NAME     복제 슬롯 이름\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=NAME         구독 이름\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   버전 정보 보여주고 마침\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      이 도움말을 보여주고 마침\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "연결 문자열 구문이 잘못됨: %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "\"%s\" 프로그램이 %s에서 필요하지만, \"%s\" 디렉터리 안에 없음"
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "\"%s\" 프로그램이 \"%s\" 프로그램에서 사용하는 %s 버전과 같지 않음"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "\"%s\" 디렉터리가 클러스터 데이터 디렉터리인지 확인해보세요."
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "\"%s\" 데이터 디렉터리가 없음"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "\"%s\" 디렉터리는 데이베이스 클러스터 디렉터리가 아님"
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "데이터베이스 연결 실패: %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "search_path를 지울 수 없음: %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "\"search_path\"를 지울 수 없음: %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "발행에서 system identifier 가져오는 중"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "system identifier 가져오기 실패: %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr "system identifier 가져오기 실패: 취득=%d개 로우, 예상=%d개 로우"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "발행 서버의 system identifier: %llu"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "발행 서버의 system identifier: %<PRIu64>"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "구독에서 system identifier 가져오는 중"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "컨트롤 파일 깨짐"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:685
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "구독 서버의 system identifier: %llu"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "구독 서버의 system identifier: %<PRIu64>"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "구독 서버의 system identifier 바꾸는 중"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:688
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "구독 서버에서 pg_resetwal 실행 중"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:700
 #, c-format
 msgid "subscriber successfully changed the system identifier"
 msgstr "구독 서버의 system identifier 바꾸기 끝"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:702
 #, c-format
 msgid "could not change system identifier of subscriber: %s"
 msgstr "구독 서버의 system identifier 바꾸기 실패: %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:726
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "베이스베이스 OID 확인 불가: %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "베이스베이스 OID 확인 불가: %d개 로우 발견, %d개 로우 예상"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:805
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "발행 서버에서 \"%s\" 이름의 복제 슬롯을 만듦"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:825
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "추가 WAL 레코드를 쓸 수 없음: %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:851
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "복구 작업 과정 확인 불가: %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:884
 #, c-format
 msgid "checking settings on publisher"
 msgstr "발행 서버 설정 검사 중"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:894
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "주 서버는 복구 작업을 할 수 없음"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:920
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "발행 서버 설정 확인 불가: %s"
 
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:949
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "발행 서버의 wal_level >= \"logical\" 설정 필요"
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "발행 서버의 \"wal_level\" >= \"logical\" 설정 필요"
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:955
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "발행서버는 %d개의 복제 슬롯이 필요하지만, %d개만 남았음"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:957 pg_createsubscriber.c:966
+#: pg_createsubscriber.c:1076 pg_createsubscriber.c:1085
+#: pg_createsubscriber.c:1094
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "\"%s\" 환경설정 매개변수 값을 %d 이상으로 늘려주세요."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:964
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "발행서버는 %d개의 WAL 발송 프로세스가 필요하지만, %d개만 남았음"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:973
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "two_phase 옵션은 복제 슬롯을 위해 비활성화 될 예정"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:974
 #, c-format
 msgid ""
 "Subscriptions will be created with the two_phase option disabled.  Prepared "
@@ -1628,62 +1666,84 @@ msgstr ""
 "구독은 two_phase 옵션이 비활성 되어 만들어집니다. 미리 준비된 트랜잭션은 "
 "COMMIT PREPARED 때 복제될 것입니다."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:976
+#, c-format
+msgid ""
+"You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr ""
+"two_phase 기능을 활성화 하려면 명령행 옵션으로 --enable-two-phase를 사용하세"
+"요."
+
+#: pg_createsubscriber.c:986
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "필요한 WAL 파일이 발행 서버에서 지워질 수 있음"
+
+#: pg_createsubscriber.c:987
+#, c-format
+msgid ""
+"Set the configuration parameter \"%s\" to -1 to ensure that required WAL "
+"files are not prematurely removed."
+msgstr ""
+"필요한 WAL 파일이 지워지지 않도록 하려면, \"%s\" 환경 설정 매개 변수 값을 -1"
+"로 지정하세요."
+
+#: pg_createsubscriber.c:1019
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "구독 서버 설정 검사 중"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "target server must be a standby"
 msgstr "대상 서버는 대기 서버여야 함"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1050
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "구독 서버 설정 확인 불가: %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1074
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "구독 서버는 %d개의 복제 슬롯이 필요하지만, %d개만 남았음"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr "구독 서버는 %d개의 활성 복제 오리진이 필요하지만, %d개만 남았음"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1083
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "구독 서버는 %d개의 논리 복제 작업자가 필요하지만, %d개만 남았음"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1092
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "구독 서버는 %d개의 작업자가 필요하지만, %d개만 남았음"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1127
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 구독을 \"%s\" 데이터베이스에서 삭제 중"
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1136
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "\"%s\" 구독 삭제 실패: %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1171
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "이미 있는 구독 정보를 알 수 없음: %s"
 
-#: pg_createsubscriber.c:1258
+#: pg_createsubscriber.c:1312
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "주 서버의 \"%s\" 복제 슬롯을 삭제 수 없음"
 
-#: pg_createsubscriber.c:1292
+#: pg_createsubscriber.c:1346
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "failover 복제 슬롯 정보를 찾을 수 없음: %s"
 
-#: pg_createsubscriber.c:1294 pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1348 pg_createsubscriber.c:1357
 #, c-format
 msgid ""
 "Drop the failover replication slots on subscriber soon to avoid retention of "
@@ -1692,93 +1752,93 @@ msgstr ""
 "WAL 파일이 비정상적으로 증가는 문제를 막기 위해, 구독 서버에서 failover 복제 "
 "슬롯을 바로 지우세요."
 
-#: pg_createsubscriber.c:1302
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "failover 복제 슬롯을 삭제할 수 없음"
 
-#: pg_createsubscriber.c:1324
+#: pg_createsubscriber.c:1378
 #, c-format
 msgid "creating the replication slot \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 복제 슬롯을 \"%s\" 데이터베이스에 만드는 중"
 
-#: pg_createsubscriber.c:1342
+#: pg_createsubscriber.c:1397
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "\"%s\" 이름의 복제 슬롯을 \"%s\" 데이터베이스에 만들기 실패: %s"
 
-#: pg_createsubscriber.c:1372
+#: pg_createsubscriber.c:1427
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 복제 슬롯을 \"%s\" 데이터베이스에서 삭제 중"
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1443
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "\"%s\" 이름의 복제 슬롯을 \"%s\" 데이터베이스에서 삭제 실패: %s"
 
-#: pg_createsubscriber.c:1409
+#: pg_createsubscriber.c:1464
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctl 작업 실패: 오류 코드 %d"
 
-#: pg_createsubscriber.c:1414
+#: pg_createsubscriber.c:1469
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl 종료됨: 예외 처리 0x%X"
 
-#: pg_createsubscriber.c:1416
+#: pg_createsubscriber.c:1471
 #, c-format
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "윗 16진수 값은 \"ntstatus.h\" 파일을 참조하세요."
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1473
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl 종료됨: 수신 시그널=%d: %s"
 
-#: pg_createsubscriber.c:1424
+#: pg_createsubscriber.c:1479
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl 종료됨: 알 수 없은 상태 %d"
 
-#: pg_createsubscriber.c:1427
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "The failed command was: %s"
 msgstr "실패한 명령: %s"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1532
 #, c-format
 msgid "server was started"
 msgstr "서버 시작됨"
 
-#: pg_createsubscriber.c:1488
+#: pg_createsubscriber.c:1547
 #, c-format
 msgid "server was stopped"
 msgstr "서버 멈춤"
 
-#: pg_createsubscriber.c:1507
+#: pg_createsubscriber.c:1566
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "일관성 맞추기 위해 대상 서버 기다리는 중"
 
-#: pg_createsubscriber.c:1530
+#: pg_createsubscriber.c:1589
 #, c-format
 msgid "recovery timed out"
 msgstr "복구 시간 초과"
 
-#: pg_createsubscriber.c:1543
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "server did not end recovery"
 msgstr "서버 복구 실패"
 
-#: pg_createsubscriber.c:1545
+#: pg_createsubscriber.c:1604
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "대상 서버 일관성 맞추기 완료"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1605
 #, c-format
 msgid ""
 "If pg_createsubscriber fails after this point, you must recreate the "
@@ -1787,183 +1847,203 @@ msgstr ""
 "이 시점에서 pg_createsubscriber 작업을 실패하면, 물리 복제 대기 서버는 다시 "
 "만들어야 합니다."
 
-#: pg_createsubscriber.c:1573
+#: pg_createsubscriber.c:1632 pg_createsubscriber.c:1755
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "발행 정보를 찾을 수 없음: %s"
 
-#: pg_createsubscriber.c:1587
+#: pg_createsubscriber.c:1646
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "\"%s\" 이름의 발행이 이미 있음"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1647
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "계속 진행을 위해서는 이 발행 이름을 바꿔보세요."
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1654
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 발행을 \"%s\" 데이터베이스에 만드는 중"
 
-#: pg_createsubscriber.c:1608
+#: pg_createsubscriber.c:1667
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "\"%s\" 이름의 발행을 \"%s\" 데이터베이스에 만들 수 없음: %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1697
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 발행을  \"%s\" 데이터베이스에서 삭제 중"
 
-#: pg_createsubscriber.c:1651
+#: pg_createsubscriber.c:1711
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "\"%s\" 이름의 발행을 \"%s\" 데이터베이스에 지울 수 없음: %s"
 
-#: pg_createsubscriber.c:1697
+#: pg_createsubscriber.c:1748
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "\"%s\" 데이터베이스에서 모든 발행을 삭제 중"
+
+#: pg_createsubscriber.c:1806
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "\"%s\" 이름의 구독을 \"%s\" 데이터베이스에 만드는 중"
 
-#: pg_createsubscriber.c:1718
+#: pg_createsubscriber.c:1828
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "\"%s\" 이름의 구독을 \"%s\" 데이터베이스에 만들 수 없음: %s"
 
-#: pg_createsubscriber.c:1763
+#: pg_createsubscriber.c:1873
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "구독 OID 찾지 못함: %s"
 
-#: pg_createsubscriber.c:1770
+#: pg_createsubscriber.c:1880
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "구독 OID 확인 불가: %d개 로우 발견, %d개 로우 예상"
 
-#: pg_createsubscriber.c:1794
+#: pg_createsubscriber.c:1904
 #, c-format
 msgid ""
-"setting the replication progress (node name \"%s\", LSN %s) in database "
-"\"%s\""
+"setting the replication progress (node name \"%s\", LSN %s) in database \"%s"
+"\""
 msgstr "복제 설정 중(노드이름 \"%s\", LSN %s, 데이터베이스 \"%s\")"
 
-#: pg_createsubscriber.c:1809
+#: pg_createsubscriber.c:1919
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "\"%s\" 구독을 위한 복제 설정 실패: %s"
 
-#: pg_createsubscriber.c:1840
+#: pg_createsubscriber.c:1950
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "\"%s\" 구독을 \"%s\" 데이터베이스에서 활성화 시도 중"
 
-#: pg_createsubscriber.c:1852
+#: pg_createsubscriber.c:1962
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "\"%s\" 구독을 활성화 할 수 없음: %s"
 
-#: pg_createsubscriber.c:1944
+#: pg_createsubscriber.c:2008
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "데이터베이스 목록을 구할 수 없음: %s"
+
+#: pg_createsubscriber.c:2112
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\" 권한으로 실행할 수 없음"
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2113
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "PostgreSQL 슈퍼유저 계정으로 %s 프로그램을 실행하세요."
 
-#: pg_createsubscriber.c:1966
+#: pg_createsubscriber.c:2136
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "\"%s\" 데이터베이스가  -d/--database 옵션으로 중복 지정 되었음"
+
+#: pg_createsubscriber.c:2177
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "\"%s\" 데이터베이스가 중복 지정 되었음"
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "\"%s\" 발행이 --publication 옵션으로 중복 지정 되었음"
 
-#: pg_createsubscriber.c:2007
+#: pg_createsubscriber.c:2186
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "\"%s\" 발행이 중복 지정 되었음"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "\"%s\" 복제 슬롯이 --replication-slot 옵션으로 중복 지정 되었음"
 
-#: pg_createsubscriber.c:2019
+#: pg_createsubscriber.c:2195
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "\"%s\" 복제 슬롯이 중복 지정 되었음"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "\"%s\" 구독이  --subscription 옵션으로 중복 지정 되었음"
 
-#: pg_createsubscriber.c:2031
+#: pg_createsubscriber.c:2201
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "\"%s\" 구독이 중복 지정 되었음"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "\"%s\" 객체 타입이 --clean 옵션으로 중복 지정 되었음"
 
-#: pg_createsubscriber.c:2054
+#: pg_createsubscriber.c:2226
+#, c-format
+msgid "options %s and -a/--all cannot be used together"
+msgstr "%s 옵션과 -a/--all 옵션은 함께 사용할 수 없음"
+
+#: pg_createsubscriber.c:2244
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "구독 서버용 데이터 디렉터리를 지정하지 않았음"
 
-#: pg_createsubscriber.c:2065
+#: pg_createsubscriber.c:2255
 #, c-format
 msgid "could not determine current directory"
 msgstr "현재 디렉터리를 확인할 수 없음"
 
-#: pg_createsubscriber.c:2082
+#: pg_createsubscriber.c:2272
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "발행 서버 연결 문자열을 지정하지 않았음"
 
-#: pg_createsubscriber.c:2086
+#: pg_createsubscriber.c:2276
 #, c-format
 msgid "validating publisher connection string"
 msgstr "발행 서버 연결 문자열 검사 중"
 
-#: pg_createsubscriber.c:2092
+#: pg_createsubscriber.c:2282
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "구독 서버 연결 문자열 검사 중"
 
-#: pg_createsubscriber.c:2097
+#: pg_createsubscriber.c:2299
 #, c-format
 msgid "no database was specified"
 msgstr "데이터베이스를 지정하지 않았음"
 
-#: pg_createsubscriber.c:2109
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "발행 서버 연결 문자열에서 데이터베이스 이름 확인: \"%s\""
 
-#: pg_createsubscriber.c:2114
+#: pg_createsubscriber.c:2315
 #, c-format
 msgid "no database name specified"
 msgstr "데이터베이스 이름을 지정하지 않았음"
 
-#: pg_createsubscriber.c:2124
+#: pg_createsubscriber.c:2325
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "발행 이름들의 개수가 잘못됨"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2326
 #, c-format
 msgid ""
 "The number of specified publication names (%d) must match the number of "
 "specified database names (%d)."
 msgstr "지정한 발행 이름의 수(%d)와 데이터베이스 이름의 수(%d)가 같지 않음"
 
-#: pg_createsubscriber.c:2131
+#: pg_createsubscriber.c:2332
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "구독 이름들의 개수가 잘못됨"
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid ""
 "The number of specified subscription names (%d) must match the number of "
 "specified database names (%d)."
 msgstr "지정한 구독 이름의 수(%d)와 데이터베이스 이름의 수(%d)가 같지 않음"
 
-#: pg_createsubscriber.c:2138
+#: pg_createsubscriber.c:2339
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "복제 슬롯 이름들의 개수가 잘못됨"
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2340
 #, c-format
 msgid ""
 "The number of specified replication slot names (%d) must match the number of "
@@ -1971,37 +2051,47 @@ msgid ""
 msgstr ""
 "지정한 복제 슬롯 이름의 수(%d)와 데이터베이스 이름의 수(%d)가 같지 않음"
 
-#: pg_createsubscriber.c:2168
+#: pg_createsubscriber.c:2352
+#, c-format
+msgid "invalid object type \"%s\" specified for --clean"
+msgstr "--clean 옵션에 지정한 \"%s\" 객체 타입이 잘못되었음"
+
+#: pg_createsubscriber.c:2353
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "잘못된 값: \"%s\""
+
+#: pg_createsubscriber.c:2384
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "구독 서버의 데이터 디렉터리는 원본 데이터베이스 클러스터의 것이 아님"
 
-#: pg_createsubscriber.c:2181
+#: pg_createsubscriber.c:2397
 #, c-format
 msgid "standby server is running"
 msgstr "대기 서버가 실행 중입니다."
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2398
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "대기 서버를 중지 하고, 다시 하세요."
 
-#: pg_createsubscriber.c:2191
+#: pg_createsubscriber.c:2407
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "명령행 옵션을 포함해서 대기 서버를 시작 중"
 
-#: pg_createsubscriber.c:2207 pg_createsubscriber.c:2242
+#: pg_createsubscriber.c:2423 pg_createsubscriber.c:2458
 #, c-format
 msgid "stopping the subscriber"
 msgstr "구독 서버 중지 중"
 
-#: pg_createsubscriber.c:2221
+#: pg_createsubscriber.c:2437
 #, c-format
 msgid "starting the subscriber"
 msgstr "구독 서버 실행 중"
 
-#: pg_createsubscriber.c:2250
+#: pg_createsubscriber.c:2466
 #, c-format
 msgid "Done!"
 msgstr "완료!"
@@ -2022,12 +2112,12 @@ msgid ""
 msgstr ""
 "  -D, --directory=DIR    지정한 디렉터리로 트랜잭션 로그 파일을 백업함\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       지정한 LSN까지 받고 종료함\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, c-format
 msgid ""
 "      --if-not-exists    do not error if slot already exists when creating a "
@@ -2035,7 +2125,7 @@ msgid ""
 msgstr ""
 "      --if-not-exists    슬롯을 새로 만들 때 이미 있어도 오류 내지 않음\n"
 
-#: pg_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          접속이 끊겼을 때 재연결 하지 않음\n"
@@ -2047,7 +2137,7 @@ msgid ""
 "disk\n"
 msgstr "      --no-sync          디스크 쓰기 뒤 sync 작업 생략\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -2082,7 +2172,7 @@ msgstr ""
 "\n"
 "추가 기능:\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid ""
 "      --create-slot      create a new replication slot (for the slot's name "
@@ -2091,7 +2181,7 @@ msgstr ""
 "      --create-slot      새 복제 슬롯을 만듬 (--slot 옵션에서 슬롯 이름 지"
 "정)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "      --drop-slot        drop the replication slot (for the slot's name see "
@@ -2114,7 +2204,7 @@ msgstr "로그 스트리밍 중지된 위치: %X/%X (타임라인 %u)"
 msgid "switched to timeline %u at %X/%X"
 msgstr "전환됨: 타임라인 %u, 위치 %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "인터럽터 시그널을 받음, 종료함"
@@ -2187,7 +2277,7 @@ msgstr "\"%s\" 파일 검사 실패: %s 압축을 지원 안하게 빌드되었
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "로그 스트리밍 시작 위치: %X/%X (타임라인 %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "시작 위치 구문이 잘못됨 \"%s\""
@@ -2218,28 +2308,28 @@ msgid ""
 "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "\"%s\" 슬롯을 이용한 복제 연결은 이 데이터베이스에서 사용할 수 없음"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "\"%s\" 이름의 복제 슬롯을 삭제 중"
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "\"%s\" 이름의 복제 슬롯을 만드는 중"
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "연결 끊김"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "연결 끊김; 다시 연결 하기 위해 %d 초를 기다리는 중"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -2248,7 +2338,7 @@ msgstr ""
 "%s 프로그램은 논리 디코딩 스트림을 제어하는 도구입니다.\n"
 "\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid ""
 "\n"
@@ -2257,7 +2347,7 @@ msgstr ""
 "\n"
 "성능에 관계된 기능들:\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, c-format
 msgid ""
 "      --start            start streaming in a replication slot (for the "
@@ -2266,12 +2356,22 @@ msgstr ""
 "      --start            복제 슬롯을 이용한 스트리밍 시작 (--slot 옵션에서 슬"
 "롯 이름 지정)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid ""
+"      --enable-failover  enable replication slot synchronization to standby "
+"servers when\n"
+"                         creating a replication slot\n"
+msgstr ""
+"      --enable-failover  복제 슬롯을 만들 때, 대기 서버에서도 슬롯 동기화 복"
+"제를 활성화\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=파일        작업 로그를 해당 파일에 기록, 표준 출력은 -\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -2282,14 +2382,14 @@ msgstr ""
 "                         지정한 초 간격으로 파일 fsync 작업을 함 (초기값: "
 "%d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, c-format
 msgid ""
 "  -I, --startpos=LSN     where in an existing slot should the streaming "
 "start\n"
 msgstr "  -I, --startpos=LSN     스트리밍을 시작할 기존 슬롯 위치\n"
 
-#: pg_recvlogical.c:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -2300,215 +2400,221 @@ msgstr ""
 "                         출력 플러그인에서 사용할 옵션들의 옵션 이름과 그 "
 "값\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    사용할 출력 플러그인 (초기값: %s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=슬롯이름    논리 복제 슬롯 이름\n"
 
-#: pg_recvlogical.c:107
+#: pg_recvlogical.c:108
 #, c-format
 msgid ""
-"  -t, --two-phase        enable decoding of prepared transactions when "
+"  -t, --enable-two-phase enable decoding of prepared transactions when "
 "creating a slot\n"
 msgstr ""
-"  -t, --two-phase        슬롯을 만들 때 미리 준비된 트랜잭션 디코딩 활성화\n"
+"  -t, --enable-two-phase 슬롯을 만들 때 미리 준비된 트랜잭션 디코딩을 활성화 "
+"함\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (--enable-two-phase 와 같음, 미지원예정)\n"
+
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=디비이름  접속할 데이터베이스\n"
 
-#: pg_recvlogical.c:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "쓰기 확인 위치: %X/%X, 플러시 위치 %X/%X (슬롯 %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "피드백 패킷을 보낼 수 없음: %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "로그 스트리밍 시작 함, 위치: %X/%X (슬롯 %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "스트리밍 초기화 됨"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "\"%s\" 잠금파일을 열 수 없음: %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "잘못된 소켓: %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "WAL 스트림에서 자료 받기 실패: %s"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "스트리밍 헤더 크기가 너무 작음: %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "알 수 없는 스트리밍 헤더: \"%c\""
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "%d 바이트 쓰기 실패, 대상 로그파일 \"%s\": %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "복제 스트림의 예상치 못한 종료: %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "시작 위치 구문이 잘못됨 \"%s\""
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "슬롯을 지정하지 않았음"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "대상 파일을 지정하지 않았음"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "데이터베이스 지정하지 않았음"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "적어도 하나 이상의 작업 방법을 지정해야 함"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr ""
 "--create-slot 옵션 또는 --start 옵션은 --drop-slot 옵션과 함께 사용할 수 없음"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr ""
 " --create-slot 옵션이나 --drop-slot 옵션은 --startpos 옵션과 함께 쓸 수 없음"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos 옵션은 --start 옵션과 함께 사용해야 함"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase 옵션은 --create-slot 옵션을 쓸 때만 사용 가능함"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s 옵션은 --create-slot 옵션을 쓸 때만 사용 가능함"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "데이터베이스 의존적인 복제 연결을 할 수 없음"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "keepalive에 의해서 %X/%X 마지막 위치에 도달했음"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "%X/%X 마지막 위치가 WAL 레코드 %X/%X 위치에서 도달했음"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "\"%s\" archive status 파일을 만들 수 없습니다: %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "\"%s\" archive status 파일을 닫을 수 없습니다: %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "\"%s\" WAL 파일 크기를 알 수 없음: %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "이미 있는 \"%s\" 트랜잭션 로그 파일을 열 수 없음: %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr "이미 있는 \"%s\" WAL 파일 fsync 실패: %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
 msgstr[0] ""
 "\"%s\" 트랜잭션 로그파일의 크기가 %zd 바이트임, 0 또는 %d 바이트여야 함"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "\"%s\" WAL 파일을 열 수 없음: %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "\"%s\" 이름 변경 실패, 세그먼트가 완료되지 않았음"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "\"%s\" 파일을 닫을 수 없음: %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "타임라인 %u 번을 위한 내역 파일 이름이 잘못 되었음: %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "\"%s\" 타임라인 내역 파일을 만들 수 없음: %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "\"%s\" 타임라인 내역 파일에 쓸 수 없음: %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid ""
 "incompatible server version %s; client does not support streaming from "
@@ -2517,7 +2623,7 @@ msgstr ""
 "%s 서버 버전은 호환되지 않음; 클라이언트는 %s 버전 보다 오래된 서버의 스트리"
 "밍은 지원하지 않음"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid ""
 "incompatible server version %s; client does not support streaming from "
@@ -2526,18 +2632,18 @@ msgstr ""
 "%s 서버 버전은 호환되지 않음; 클라이언트는 %s 버전 보다 새로운 서버의 스트리"
 "밍은 지원하지 않음"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid ""
 "system identifier does not match between base backup and streaming connection"
 msgstr "시스템 식별자가 베이스 백업과 스트리밍 연결에서 서로 다름"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "%u 타임라인으로 시작하는 것을 서버에서 제공 하지 않음"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid ""
 "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, "
@@ -2546,12 +2652,12 @@ msgstr ""
 "TIMELINE_HISTORY 명령 결과가 잘못됨: 받은 값: 로우수 %d, 필드수 %d, 예상값: "
 "로우수 %d, 필드수 %d"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "서버가 잘못된 다음 타임라인 번호 %u 보고함, 이전 타임라인 번호 %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid ""
 "server stopped streaming timeline %u at %X/%X, but reported next timeline %u "
@@ -2560,12 +2666,12 @@ msgstr ""
 "서버의 중지 위치: 타임라인 %u, 위치 %X/%X, 하지만 보고 받은 위치: 타임라인 "
 "%u 위치 %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "복제 스트림이 중지 위치 전에 종료 되었음"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid ""
 "unexpected result set after end-of-timeline: got %d rows and %d fields, "
@@ -2574,61 +2680,56 @@ msgstr ""
 "타임라인 끝에 잘못된 결과가 발견 됨: 로우수 %d, 필드수 %d / 예상값: 로우수 "
 "%d, 필드수 %d"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "다음 타임라인 시작 위치 분석 실패 \"%s\""
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "\"%s\" 파일 fsync 실패: %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "%u 위치의 수신된 트랜잭션 로그 레코드에 파일을 열 수 없음"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "잘못된 WAL 자료 위치 %08x, 기대값 %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "%d 바이트를 \"%s\" WAL 파일에 쓸 수 없음: %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "copy-end 패킷을 보낼 수 없음: %s"
 
-#: streamutil.c:165
+#: streamutil.c:162
 msgid "Password: "
 msgstr "암호: "
 
-#: streamutil.c:192
+#: streamutil.c:189
 #, c-format
 msgid "could not connect to server"
 msgstr "서버 접속 실패"
 
-#: streamutil.c:233
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "\"search_path\"를 지울 수 없음: %s"
-
-#: streamutil.c:249
+#: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
 msgstr "\"integer_datetimes\" 서버 설정을 알 수 없음"
 
-#: streamutil.c:256
+#: streamutil.c:253
 #, c-format
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr "\"integer_datetimes\" 컴파일 플래그가 서버와 일치하지 않음"
 
-#: streamutil.c:375
+#: streamutil.c:304
 #, c-format
 msgid ""
 "could not fetch WAL segment size: got %d rows and %d fields, expected %d "
@@ -2637,23 +2738,23 @@ msgstr ""
 "WAL 조각 크기 계산 실패: 로우수 %d, 필드수 %d, 예상값: 로우수 %d, 필드수 %d "
 "이상"
 
-#: streamutil.c:385
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "WAL 조각 크기 분석 못함"
 
-#: streamutil.c:403
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
 msgstr[0] "원격 서버가 잘못 WAL 조각 크기를 보고했음 (%d 바이트)"
 
-#: streamutil.c:407
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL 조각 파일 크기는 1MB에서 1GB사이 2의 제곱 크기여야 합니다."
 
-#: streamutil.c:449
+#: streamutil.c:378
 #, c-format
 msgid ""
 "could not fetch group access flag: got %d rows and %d fields, expected %d "
@@ -2662,12 +2763,12 @@ msgstr ""
 "그룹 접근 플래그를 가져올 수 없음: 로우수 %d, 필드수 %d, 예상값: 로우수 %d, "
 "필드수 %d 이상"
 
-#: streamutil.c:458
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "그룹 접근 플래그를 분석 못함: %s"
 
-#: streamutil.c:501 streamutil.c:538
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid ""
 "could not identify system: got %d rows and %d fields, expected %d rows and "
@@ -2676,7 +2777,7 @@ msgstr ""
 "시스템을 식별할 수 없음: 로우수 %d, 필드수 %d, 예상값: 로우수 %d, 필드수 %d "
 "이상"
 
-#: streamutil.c:590
+#: streamutil.c:519
 #, c-format
 msgid ""
 "could not read replication slot \"%s\": got %d rows and %d fields, expected "
@@ -2685,22 +2786,22 @@ msgstr ""
 "\"%s\" 복제 슬롯을 읽을 수 없음: 로우수 %d, 필드수 %d, 기대값 로우수 %d, 필드"
 "수 %d"
 
-#: streamutil.c:602
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "\"%s\" 이름의 복제 슬롯이 없습니다"
 
-#: streamutil.c:613
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "물리 복제 슬롯을 사용해야 함, \"%s\" 복제 슬롯임"
 
-#: streamutil.c:627
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr "\"%s\" restart_lsn 위치를 해석할 수 없음, 해당 슬롯: \"%s\""
 
-#: streamutil.c:744
+#: streamutil.c:678
 #, c-format
 msgid ""
 "could not create replication slot \"%s\": got %d rows and %d fields, "
@@ -2709,7 +2810,7 @@ msgstr ""
 "\"%s\" 복제 슬롯을 만들 수 없음: 로우수 %d, 필드수 %d, 기대값 로우수 %d, 필드"
 "수 %d"
 
-#: streamutil.c:788
+#: streamutil.c:722
 #, c-format
 msgid ""
 "could not drop replication slot \"%s\": got %d rows and %d fields, expected "
@@ -2745,3 +2846,6 @@ msgstr "압축 상태에서 파일 삭제는 지원하지 않음"
 #: walmethods.c:1293
 msgid "could not close compression stream"
 msgstr "압축 스트림을 닫을 수 없음"
+
+#~ msgid "could not clear search_path: %s"
+#~ msgstr "search_path를 지울 수 없음: %s"
diff --git a/src/bin/pg_basebackup/po/ru.po b/src/bin/pg_basebackup/po/ru.po
index 94912f27c90..cd458fb7f18 100644
--- a/src/bin/pg_basebackup/po/ru.po
+++ b/src/bin/pg_basebackup/po/ru.po
@@ -1,13 +1,13 @@
 # Russian message translation file for pg_basebackup
 # 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, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-09 07:47+0300\n"
-"PO-Revision-Date: 2024-09-07 11:12+0300\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 09:24+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,30 +17,31 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
+#: ../../fe_utils/astreamer_zstd.c:288
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "эта сборка программы не поддерживает сжатие %s"
@@ -98,7 +99,7 @@ msgstr "алгоритм сжатия \"%s\" не поддерживает ре
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -110,7 +111,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %zu)"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "не удалось закрыть файл \"%s\": %m"
@@ -133,10 +134,10 @@ msgstr ""
 "этой программой. В этом случае результаты будут неверными и\n"
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
@@ -146,8 +147,8 @@ msgstr "не удалось открыть файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
@@ -163,36 +164,36 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -227,194 +228,203 @@ msgstr "не удалось перезапуститься с ограничен
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "не удалось получить код выхода от подпроцесса (код ошибки: %lu)"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "неверное значение \"%s\" для параметра %s"
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "значение %s должно быть в диапазоне %d..%d"
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "нераспознанный метод синхронизации: %s"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:334
-#, c-format
-msgid "out of memory"
-msgstr "нехватка памяти"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "не удалось записать в файл \"%s\": %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "не удалось создать файл \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
-msgstr ""
-"аргумент команды оболочки содержит символ новой строки или перевода каретки: "
-"\"%s\"\n"
-
-#: ../../fe_utils/string_utils.c:607
-#, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr ""
-"имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "не удалось записать в файл \"%s\": %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:278
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "неожиданное состояние при извлечении архива"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:329
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "не удалось установить права для каталога \"%s\": %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:348
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\" в \"%s\": %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:368
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "не удалось установить права доступа для файла \"%s\": %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "не удалось создать сжатый файл \"%s\": %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "не удалось продублировать stdout: %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "не удалось открыть выходной файл: %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "не удалось установить уровень сжатия %d: %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "не удалось записать сжатый файл \"%s\": %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "не удалось закрыть сжатый файл \"%s\": %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "не удалось инициализировать библиотеку сжатия"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "не удалось распаковать данные: %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "неожиданное состояние при внедрении параметров восстановления"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "не удалось создать контекст сжатия lz4: %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "не удалось записать заголовок lz4: %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
 #, c-format
 msgid "could not compress data: %s"
 msgstr "не удалось сжать данные: %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "не удалось завершить сжатие lz4: %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "не удалось инициализировать библиотеку сжатия: %s"
 
-#: bbstreamer_tar.c:244
+#: ../../fe_utils/astreamer_tar.c:244
 #, c-format
 msgid "tar file trailer exceeds 2 blocks"
 msgstr "окончание файла tar занимает больше 2 блоков"
 
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:249
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "неожиданное состояние при разборе архива tar"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:292
 #, c-format
 msgid "tar member has empty name"
 msgstr "пустое имя у компонента tar"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:326
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "поток COPY закончился до завершения последнего файла"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "не удалось создать контекст сжатия zstd"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "не удалось установить для zstd уровень сжатия %d: %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
-msgstr "не удалось установить для zstd число потоков %d: %s"
+msgstr "не удалось установить число потоков сжатия %d: %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:120
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "не удалось включить режим большой дистанции: %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:279
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "не удалось создать контекст распаковки zstd"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "неверное значение \"%s\" для параметра %s"
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "значение %s должно быть в диапазоне %d..%d"
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "нераспознанный метод синхронизации: %s"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "нехватка памяти"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"аргумент команды оболочки содержит символ новой строки или перевода каретки: "
+"\"%s\"\n"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "неожиданное состояние при внедрении параметров восстановления"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -510,14 +520,14 @@ msgstr ""
 "%s делает базовую резервную копию работающего сервера PostgreSQL.\n"
 "\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [ПАРАМЕТР]...\n"
@@ -681,12 +691,12 @@ msgstr "  -P, --progress         показывать прогресс опер
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=ИМЯ_СЛОТА   использовать заданный слот репликации\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          выводить подробные сообщения\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          показать версию и выйти\n"
@@ -749,12 +759,12 @@ msgstr ""
 "      --sync-method=МЕТОД\n"
 "                         метод синхронизации файлов с ФС\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             показать эту справку и выйти\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -768,14 +778,14 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=СТРОКА    строка подключения\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ         компьютер с сервером баз данных или каталог "
 "сокетов\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=ПОРТ        номер порта сервера БД\n"
@@ -791,19 +801,19 @@ msgstr ""
 "                         интервал между передаваемыми серверу\n"
 "                         пакетами состояния (в секундах)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, 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:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      не запрашивать пароль\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid ""
 "  -W, --password         force password prompt (should happen "
@@ -811,8 +821,8 @@ msgid ""
 msgstr ""
 "  -W, --password         запрашивать пароль всегда (обычно не требуется)\n"
 
-#: pg_basebackup.c:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -821,8 +831,8 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
@@ -832,8 +842,8 @@ msgstr "Домашняя страница %s: <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "не удалось прочитать из готового канала: %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:521
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "не удалось разобрать положение в журнале предзаписи \"%s\""
@@ -848,37 +858,37 @@ msgstr "не удалось завершить запись файлов WAL: %m
 msgid "could not create pipe for background process: %m"
 msgstr "не удалось создать канал для фонового процесса: %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "создан временный слот репликации \"%s\""
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "создан слот репликации \"%s\""
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "не удалось создать фоновый процесс: %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "не удалось создать фоновый поток выполнения: %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" существует, но он не пуст"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ошибка при обращении к каталогу \"%s\": %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
@@ -886,7 +896,7 @@ msgstr[0] "%*s/%s КБ (100%%), табличное пространство %d/%
 msgstr[1] "%*s/%s КБ (100%%), табличное пространство %d/%d %*s"
 msgstr[2] "%*s/%s КБ (100%%), табличное пространство %d/%d %*s"
 
-#: pg_basebackup.c:870
+#: pg_basebackup.c:871
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
@@ -894,7 +904,7 @@ msgstr[0] "%*s/%s КБ (%d%%), табличное пространство %d/%d
 msgstr[1] "%*s/%s КБ (%d%%), табличное пространство %d/%d (%s%-*.*s)"
 msgstr[2] "%*s/%s КБ (%d%%), табличное пространство %d/%d (%s%-*.*s)"
 
-#: pg_basebackup.c:886
+#: pg_basebackup.c:887
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
@@ -902,58 +912,58 @@ msgstr[0] "%*s/%s КБ (%d%%), табличное пространство %d/%d
 msgstr[1] "%*s/%s КБ (%d%%), табличное пространство %d/%d"
 msgstr[2] "%*s/%s КБ (%d%%), табличное пространство %d/%d"
 
-#: pg_basebackup.c:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "неверное значение (\"%s\") для скорости передачи данных"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "неверная скорость передачи данных \"%s\": %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "скорость передачи должна быть больше 0"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "неверная единица измерения в --max-rate: \"%s\""
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "скорость передачи \"%s\" вне целочисленного диапазона"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "скорость передачи \"%s\" вне диапазона"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "не удалось получить поток данных COPY: %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "не удалось прочитать данные COPY: %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "фоновый процесс завершился неожиданно"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "манифест нельзя внедрить в сжатый архив tar"
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid ""
 "Use client-side compression, send the output to a directory rather than "
@@ -962,24 +972,24 @@ msgstr ""
 "Примените сжатие на стороне клиента, передайте вывод в каталог, а не в "
 "стандартный вывод, или используйте %s."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "обработать архив \"%s\" невозможно"
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
 msgstr "Возможна обработка только архивов tar."
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr ""
 "Когда используется простой формат, программа pg_basebackup должна обработать "
 "архив."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid ""
 "Using - as the output directory requires pg_basebackup to parse the archive."
@@ -987,119 +997,119 @@ msgstr ""
 "Когда в качестве выходного каталога используется \"-\", программа "
 "pg_basebackup должна обработать архив."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr ""
 "Когда используется ключ -R, программа pg_basebackup должна обработать архив."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "архивы должны предшествовать манифесту"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "неверное имя архива: \"%s\""
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "неожиданно получены данные"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "пустое сообщение COPY"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "неправильное сообщение COPY типа %d, длины %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "несовместимая версия сервера %s"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr "Укажите -X none или -X fetch для отключения трансляции журнала."
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "сервер не поддерживает инкрементальное копирование"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:367 streamutil.c:441
-#: streamutil.c:493 streamutil.c:581 streamutil.c:733 streamutil.c:778
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "не удалось передать команду репликации \"%s\": %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "не удалось загрузить манифест на сервер: %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "не удалось загрузить манифест на сервер: неожиданное состояние %s"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "не удалось отправить данные COPY: %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "не удалось отправить сообщение \"конец COPY\": %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "неожиданный лишний результат при передаче манифеста"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "получатели копий не поддерживаются данной версией сервера"
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr ""
 "при использовании получателя копии записать конфигурацию восстановления "
 "нельзя"
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "сервер не поддерживает сжатие на стороне сервера"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr ""
 "начинается базовое резервное копирование, ожидается завершение контрольной "
 "точки"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "ожидание контрольной точки"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "не удалось инициализировать базовое резервное копирование: %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid ""
 "server returned unexpected response to BASE_BACKUP command; got %d rows and "
@@ -1108,130 +1118,125 @@ msgstr ""
 "сервер вернул неожиданный ответ на команду BASE_BACKUP; получено строк: %d, "
 "полей: %d, а ожидалось строк: %d, полей: %d"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "контрольная точка завершена"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "стартовая точка в журнале предзаписи: %s на линии времени %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "не удалось получить заголовок резервной копии: %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "сервер не вернул данные"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr ""
 "в stdout можно вывести только одно табличное пространство, всего в СУБД их %d"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "запуск фонового процесса считывания WAL"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "ошибка при создании копии: %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "сервер не передал конечную позицию в журнале предзаписи"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "конечная точка в журнале предзаписи: %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "выявлена ошибка контрольной суммы"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "ошибка в конце передачи: %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "ожидание завершения потоковой передачи фоновым процессом..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "не удалось отправить команду в канал фонового процесса: %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "сбой при ожидании дочернего процесса: %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "завершился дочерний процесс %d вместо ожидаемого %d"
 
-#: pg_basebackup.c:2248 streamutil.c:92 streamutil.c:207 streamutil.c:319
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "сбой при ожидании дочернего потока: %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "не удалось получить состояние завершения дочернего потока: %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "дочерний поток завершился с ошибкой %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "сохранение данных на диске..."
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "переименование backup_manifest.tmp в backup_manifest"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "базовое резервное копирование завершено"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr ""
 "неверный аргумент режима контрольных точек \"%s\"; должен быть \"fast\" или "
 "\"spread\""
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "неверный формат вывода \"%s\", должен быть \"plain\" или \"tar\""
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid ""
 "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
@@ -1239,124 +1244,125 @@ msgstr ""
 "неверный аргумент для wal-method — \"%s\", допускается только \"fetch\", "
 "\"stream\" или \"none\""
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2037 pg_createsubscriber.c:2047
-#: pg_createsubscriber.c:2055 pg_createsubscriber.c:2083
-#: pg_createsubscriber.c:2115 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2045 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "указать и формат, и получателя копии одновременно нельзя"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "необходимо указать выходной каталог или получателя копии"
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "указать и выходной каталог, и получателя копии одновременно нельзя"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нераспознанный алгоритм сжатия: \"%s\""
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неправильное указание сжатия: %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid ""
 "client-side compression is not possible when a backup target is specified"
 msgstr "сжатие на стороне клиента невозможно при указании получателя копии"
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "сжиматься могут только резервные копии в архиве tar"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
 msgstr "потоковая передача WAL невозможна при указании получателя копии"
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "транслировать журналы предзаписи в режиме tar в поток stdout нельзя"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "слоты репликации можно использовать только при потоковой передаче WAL"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "--no-slot нельзя использовать с именем слота"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "для %s необходимо задать слот с помощью параметра --slot"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "параметры %s и %s несовместимы"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "расположение каталога WAL нельзя указать вместе с получателем копии"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "расположение каталога WAL можно указать только в режиме plain"
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "расположение каталога WAL должно определяться абсолютным путём"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\": %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "ошибка после окончания восстановления"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid ""
 "The target server cannot be used as a physical replica anymore.  You must "
@@ -1365,32 +1371,32 @@ msgstr ""
 "Целевой сервер больше не может использоваться как физическая реплика. Чтобы "
 "продолжить, физическую реплику необходимо пересоздать."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid ""
 "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "на главном сервере осталась публикация \"%s\", созданная в базе \"%s\""
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "Удалите эту публикацию и попробуйте повторить операцию."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid ""
 "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr ""
 "на главном сервере остался слот репликации \"%s\", созданный в базе \"%s\""
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1260
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr ""
 "Удалите этот слот репликации незамедлительно во избежание накопления файлов "
 "WAL."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid ""
 "%s creates a new logical replica from a standby server.\n"
@@ -1399,7 +1405,7 @@ msgstr ""
 "%s превращает резервный сервер в логическую реплику.\n"
 "\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid ""
 "\n"
@@ -1408,7 +1414,19 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid ""
+"  -a, --all                       create subscriptions for all databases "
+"except template\n"
+"                                  databases and databases that don't allow "
+"connections\n"
+msgstr ""
+"  -a, --all                       создать подписки для всех баз данных, "
+"кроме шаблонов\n"
+"                                  и баз данных, не допускающих подключения\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid ""
 "  -d, --database=DBNAME           database in which to create a "
@@ -1416,7 +1434,7 @@ msgid ""
 msgstr ""
 "  -d, --database=ИМЯ_БД           база, в которой будет создана подписка\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid ""
 "  -D, --pgdata=DATADIR            location for the subscriber data "
@@ -1424,27 +1442,27 @@ msgid ""
 msgstr ""
 "  -D, --pgdata=КАТ_ДАННЫХ         расположение каталога данных подписчика\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid ""
 "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr ""
-"  -n, --dry-run                   показать, какие действия будут выполнены,\n"
-"                                  но не выполнять их\n"
+"  -n, --dry-run                   холостой запуск — только показать, какие\n"
+"                                  действия будут выполнены\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr ""
 "  -p, --subscriber-port=ПОРТ      номер порта подписчика (по умолчанию: %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr ""
 "  -P, --publisher-server=СТРОКА   строка подключения к серверу публикации\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid ""
 "  -s, --socketdir=DIR             socket directory to use (default current "
@@ -1452,25 +1470,46 @@ msgid ""
 msgstr ""
 "  -s, --socketdir=КАТАЛОГ         каталог сокетов (по умолчанию текущий)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr ""
 "  -t, --recovery-timeout=СЕК      время ожидания окончания восстановления\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid ""
+"  -T, --enable-two-phase          enable two-phase commit for all "
+"subscriptions\n"
+msgstr ""
+"  -T, --enable-two-phase          включить двухфазную фиксацию для всех "
+"подписок\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr ""
 "  -U, --subscriber-username=ИМЯ   имя пользователя для подключения "
 "подписчика\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   выводить подробные сообщения\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type "
+"from specified\n"
+"                                  databases on the subscriber; accepts: "
+"\"%s\"\n"
+msgstr ""
+"      --clean=ТИП_ОБЪЕКТОВ        удалить все объекты указанного типа из "
+"указанных\n"
+"                                  баз на подписчике; принимает: \"%s\"\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid ""
 "      --config-file=FILENAME      use specified main server configuration\n"
@@ -1480,203 +1519,215 @@ msgstr ""
 "                                  конфигурации сервера при запуске целевого\n"
 "                                  кластера\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=ИМЯ           имя публикации\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=ИМЯ      имя слота репликации\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=ИМЯ          имя подписки\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   показать версию и выйти\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показать эту справку и выйти\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "не удалось разобрать строку подключения: %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\""
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "проверяется, является ли каталог \"%s\" каталогом данных кластера"
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "каталог данных \"%s\" не существует"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "каталог \"%s\" не является каталогом кластера баз данных"
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "не удалось подключиться к базе: %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "не удалось очистить search_path: %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "не удалось очистить \"search_path\": %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "получение идентификатора системы с сервера публикации"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "не удалось получить идентификатор системы: %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr ""
 "не удалось получить идентификатор системы; получено строк: %d, ожидалось: %d"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "идентификатор системы на стороне публикации: %llu"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "идентификатор системы на стороне публикации: %<PRIu64>"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "получение идентификатора системы с подписчика"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "управляющий файл, по-видимому, испорчен"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "идентификатор системы на подписчике: %llu"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "идентификатор системы на подписчике: %<PRIu64>"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "изменение идентификатора системы на подписчике"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr ""
+"холостой запуск: на подписчике будет установлен идентификатор системы "
+"%<PRIu64>"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "холостой запуск: будет выполнен сброс WAL (pg_resetwal) на подписчике"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "запуск pg_resetwal на подписчике"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "идентификатор системы на подписчике успешно изменён"
+msgid "successfully reset WAL on the subscriber"
+msgstr "WAL на подписчике сброшен успешно"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "изменить идентификатор системы на подписчике не удалось: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "не удалось сбросить WAL на подписчике: %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "получить OID базы данных не удалось: %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "получить OID базы данных не удалось; получено строк: %d, ожидалось: %d"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "создаётся слот репликации \"%s\" на подписчике"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "не удалось записать дополнительную запись WAL: %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "не удалось получить состояние восстановления: %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "проверка параметров на стороне публикации"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "главный сервер не должен быть в состоянии восстановления"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "не удалось получить параметры с сервера публикации: %s"
 
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:956
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "на стороне публикации требуется значение wal_level >= \"logical\""
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "на стороне публикации требуется значение \"wal_level\" >= \"logical\""
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr ""
 "на стороне публикации требуется слотов репликации: %d, но доступно всего %d"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Увеличьте значение параметра конфигурации \"%s\" как минимум до %d."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr ""
 "на стороне публикации требуется процессов-передатчиков WAL: %d, но доступно "
 "всего %d"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "параметр two_phase для слотов репликации не будет включён"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:981
 #, c-format
 msgid ""
 "Subscriptions will be created with the two_phase option disabled.  Prepared "
@@ -1685,64 +1736,92 @@ msgstr ""
 "Подписки будут созданы с отключённым параметром two_phase. Подготовленные "
 "транзакции будут реплицироваться в момент выполнения COMMIT PREPARED."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:983
+#, c-format
+msgid ""
+"You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr ""
+"Для включения режима two_phase можно использовать параметр командной строки "
+"--enable-two-phase."
+
+#: pg_createsubscriber.c:993
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "нужные файлы WAL могли быть удалены с сервера публикации"
+
+#: pg_createsubscriber.c:994
+#, c-format
+msgid ""
+"Set the configuration parameter \"%s\" to -1 to ensure that required WAL "
+"files are not prematurely removed."
+msgstr ""
+"Чтобы необходимые файлы WAL не были удалены преждевременно, присвойте "
+"параметру конфигурации \"%s\" -1."
+
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "проверка параметров на подписчике"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "целевой сервер должен быть резервным"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "получить параметры подписчика не удалось: %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1081
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "подписчику требуется слотов репликации: %d, но доступно всего %d"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr ""
+"подписчику требуется активных слотов репликации: %d, но доступно всего %d"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr ""
 "подписчику требуется процессов логической репликации: %d, но доступно всего "
 "%d"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "подписчику требуется рабочих процессов: %d, но доступно всего %d"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет удалена подписка \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "удаление подписки \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "удалить подписку \"%s\" не получилось: %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "получить уже существующие подписки не удалось: %s"
 
-#: pg_createsubscriber.c:1258
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "удалить слот репликации \"%s\" на главном сервере не получилось"
 
-#: pg_createsubscriber.c:1292
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "получить информацию о переносимом слоте репликации не удалось: %s"
 
-#: pg_createsubscriber.c:1294 pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid ""
 "Drop the failover replication slots on subscriber soon to avoid retention of "
@@ -1751,42 +1830,56 @@ msgstr ""
 "Удалите переносимые слоты репликации на подписчике незамедлительно во "
 "избежание накопления файлов WAL."
 
-#: pg_createsubscriber.c:1302
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "удалить переносимый слот репликации не получилось"
 
-#: pg_createsubscriber.c:1324
+#: pg_createsubscriber.c:1389
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "создание слота репликации \"%s\" в базе \"%s\""
+msgid ""
+"dry-run: would create the replication slot \"%s\" in database \"%s\" on "
+"publisher"
+msgstr ""
+"холостой запуск: будет создан слот репликации \"%s\" в базе \"%s\" на "
+"стороне публикации"
 
-#: pg_createsubscriber.c:1342
+#: pg_createsubscriber.c:1392
+#, c-format
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "создание слота репликации \"%s\" в базе \"%s\" на стороне публикации"
+
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "создать слот репликации \"%s\" в базе \"%s\" не удалось: %s"
 
-#: pg_createsubscriber.c:1372
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет удалён слот репликации \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "удаление слота репликации \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "удалить слот репликации \"%s\" в базе \"%s\" не получилось: %s"
 
-#: pg_createsubscriber.c:1409
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "команда pg_ctl завершилась с кодом ошибки %d"
 
-#: pg_createsubscriber.c:1414
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "команда pg_ctl была прервана исключением 0x%X"
 
-#: pg_createsubscriber.c:1416
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
@@ -1794,52 +1887,52 @@ msgstr ""
 "Описание этого шестнадцатеричного значения ищите во включаемом C-файле "
 "\"ntstatus.h\""
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "команда pg_ctl была завершена сигналом %d: %s"
 
-#: pg_createsubscriber.c:1424
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "команда pg_ctl завершилась с нераспознанным кодом состояния %d"
 
-#: pg_createsubscriber.c:1427
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "Ошибку вызвала команда: %s"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "сервер был запущен"
 
-#: pg_createsubscriber.c:1488
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "сервер был остановлен"
 
-#: pg_createsubscriber.c:1507
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "ожидание достижения целевым сервером согласованного состояния"
 
-#: pg_createsubscriber.c:1530
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "тайм-аут при восстановлении"
 
-#: pg_createsubscriber.c:1543
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "сервер не завершил восстановление"
 
-#: pg_createsubscriber.c:1545
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "целевой сервер достиг согласованного состояния"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid ""
 "If pg_createsubscriber fails after this point, you must recreate the "
@@ -1848,159 +1941,208 @@ msgstr ""
 "Если в работе pg_createsubscriber произойдёт сбой после этого момента, "
 "продолжение возможно только после пересоздания физической реплики."
 
-#: pg_createsubscriber.c:1573
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "получить информацию о публикации не удалось: %s"
 
-#: pg_createsubscriber.c:1587
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "публикация \"%s\" уже существует"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Чтобы продолжить, её можно переименовать."
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет создана публикация \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "создаётся публикация \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1608
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "создать публикацию \"%s\" в базе \"%s\" не удалось: %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет удалена публикация \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "удаляется публикация \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1651
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "удалить публикацию \"%s\" в базе \"%s\" не получилось: %s"
 
-#: pg_createsubscriber.c:1697
+#: pg_createsubscriber.c:1769
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "удаление всех существующих публикаций в базе \"%s\""
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет удалена подписка \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "создаётся подписка \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1718
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "создать подписку \"%s\" в базе \"%s\" не удалось: %s"
 
-#: pg_createsubscriber.c:1763
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "получить OID подписки не удалось: %s"
 
-#: pg_createsubscriber.c:1770
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "получить OID подписки не удалось; получено строк: %d, ожидалось: %d"
 
-#: pg_createsubscriber.c:1794
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid ""
+"dry-run: would set the replication progress (node name \"%s\", LSN %s) in "
+"database \"%s\""
+msgstr ""
+"холостой запуск: будет установлено состояние репликации (имя узла \"%s\", "
+"LSN %s) в базе \"%s\""
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid ""
 "setting the replication progress (node name \"%s\", LSN %s) in database "
 "\"%s\""
 msgstr "отражение состояния репликации (имя узла \"%s\", LSN %s) в базе \"%s\""
 
-#: pg_createsubscriber.c:1809
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "не удалось передать состояние репликации для подписки \"%s\": %s"
 
-#: pg_createsubscriber.c:1840
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "холостой запуск: будет включена подписка \"%s\" в базе \"%s\""
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "включение подписки \"%s\" в базе \"%s\""
 
-#: pg_createsubscriber.c:1852
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "включить подписку \"%s\" не удалось: %s"
 
-#: pg_createsubscriber.c:1944
+#: pg_createsubscriber.c:2041
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "не удалось получить список баз данных: %s"
+
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "программу не должен запускать root"
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Запускать %s нужно от имени суперпользователя PostgreSQL."
 
-#: pg_createsubscriber.c:1966
+#: pg_createsubscriber.c:2169
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "база \"%s\" указана в -d/--database неоднократно"
+
+#: pg_createsubscriber.c:2210
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "база \"%s\" указана неоднократно"
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "публикация \"%s\" указана в --publication неоднократно"
 
-#: pg_createsubscriber.c:2007
+#: pg_createsubscriber.c:2219
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "публикация \"%s\" указана неоднократно"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "слот репликации \"%s\" указан в --replication-slot неоднократно"
 
-#: pg_createsubscriber.c:2019
+#: pg_createsubscriber.c:2228
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "слот репликации \"%s\" указан неоднократно"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "подписка \"%s\" указана в --subscription неоднократно"
 
-#: pg_createsubscriber.c:2031
+#: pg_createsubscriber.c:2234
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "подписка \"%s\" указана неоднократно"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "тип объекта \"%s\" указан в --clean неоднократно"
 
-#: pg_createsubscriber.c:2054
+#: pg_createsubscriber.c:2259
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "параметры %s и %s исключают друг друга"
+
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "каталог данных подписчика не указан"
 
-#: pg_createsubscriber.c:2065
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "не удалось определить текущий каталог"
 
-#: pg_createsubscriber.c:2082
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "строка подключения к серверу публикации не указана"
 
-#: pg_createsubscriber.c:2086
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "проверяется строка подключения к серверу публикации"
 
-#: pg_createsubscriber.c:2092
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "проверяется строка подключения к подписчику"
 
-#: pg_createsubscriber.c:2097
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "база данных не указана"
 
-#: pg_createsubscriber.c:2109
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "имя базы \"%s\" извлечено из строки подключения к серверу публикации"
 
-#: pg_createsubscriber.c:2114
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "имя базы данных не указано"
 
-#: pg_createsubscriber.c:2124
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "указано неверное количество имён публикаций"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid ""
 "The number of specified publication names (%d) must match the number of "
@@ -2009,12 +2151,12 @@ msgstr ""
 "Количество указанных имён публикаций (%d) должно совпадать с количеством "
 "указанных имён баз (%d)."
 
-#: pg_createsubscriber.c:2131
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "указано неверное количество имён подписок"
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid ""
 "The number of specified subscription names (%d) must match the number of "
@@ -2023,12 +2165,12 @@ msgstr ""
 "Количество указанных имён подписок (%d) должно совпадать с количеством "
 "указанных имён баз (%d)."
 
-#: pg_createsubscriber.c:2138
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "указано неверное количество имён слотов репликации"
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid ""
 "The number of specified replication slot names (%d) must match the number of "
@@ -2037,38 +2179,48 @@ msgstr ""
 "Количество указанных имён слотов репликации (%d) должно совпадать с "
 "количеством указанных имён баз (%d)."
 
-#: pg_createsubscriber.c:2168
+#: pg_createsubscriber.c:2386
+#, c-format
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "неправильный тип объекта \"%s\" указан в %s"
+
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "Допустимое значение: \"%s\""
+
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr ""
 "каталог данных подписчика не является копией исходного кластера баз данных"
 
-#: pg_createsubscriber.c:2181
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "резервный сервер запущен"
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Остановите резервный сервер и повторите попытку."
 
-#: pg_createsubscriber.c:2191
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "резервный сервер запускается с параметрами командной строки"
 
-#: pg_createsubscriber.c:2207 pg_createsubscriber.c:2242
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "подписчик останавливается"
 
-#: pg_createsubscriber.c:2221
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "подписчик запускается"
 
-#: pg_createsubscriber.c:2250
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "Готово!"
@@ -2090,14 +2242,14 @@ msgstr ""
 "  -D, --directory=ПУТЬ   сохранять файлы журнала предзаписи в данный "
 "каталог\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr ""
 "  -E, --endpos=LSN       определяет позицию, после которой нужно "
 "остановиться\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, c-format
 msgid ""
 "      --if-not-exists    do not error if slot already exists when creating a "
@@ -2106,7 +2258,7 @@ msgstr ""
 "      --if-not-exists    не выдавать ошибку при попытке создать уже "
 "существующий слот\n"
 
-#: pg_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          прерывать работу при потере соединения\n"
@@ -2119,7 +2271,7 @@ msgid ""
 msgstr ""
 "      --no-sync          не ждать надёжного сохранения изменений на диске\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -2156,7 +2308,7 @@ msgstr ""
 "\n"
 "Дополнительные действия:\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid ""
 "      --create-slot      create a new replication slot (for the slot's name "
@@ -2165,7 +2317,7 @@ msgstr ""
 "      --create-slot      создать новый слот репликации (имя слота задаёт "
 "параметр --slot)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "      --drop-slot        drop the replication slot (for the slot's name see "
@@ -2189,7 +2341,7 @@ msgstr "завершена передача журнала с позиции %X/
 msgid "switched to timeline %u at %X/%X"
 msgstr "переключение на линию времени %u (позиция %X/%X)"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "получен сигнал прерывания, работа завершается"
@@ -2268,7 +2420,7 @@ msgstr ""
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "начало передачи журнала с позиции %X/%X (линия времени %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "не удалось разобрать конечную позицию \"%s\""
@@ -2301,28 +2453,28 @@ msgstr ""
 "подключение для репликации через слот \"%s\" оказалось привязано к базе "
 "данных"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "удаление слота репликации \"%s\""
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "создание слота репликации \"%s\""
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "отключение"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "отключение; через %d сек. последует повторное подключение"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -2331,7 +2483,7 @@ msgstr ""
 "%s управляет потоками логического декодирования PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid ""
 "\n"
@@ -2340,7 +2492,7 @@ msgstr ""
 "\n"
 "Действие, которое будет выполнено:\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, c-format
 msgid ""
 "      --start            start streaming in a replication slot (for the "
@@ -2349,13 +2501,24 @@ msgstr ""
 "      --start            начать передачу в слоте репликации (имя слота "
 "задаёт параметр --slot)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid ""
+"      --enable-failover  enable replication slot synchronization to standby "
+"servers when\n"
+"                         creating a replication slot\n"
+msgstr ""
+"      --enable-failover  включает синхронизацию слота репликации с ведомыми "
+"серверами при\n"
+"                         создании слота\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr ""
 "  -f, --file=ФАЙЛ        сохранять журнал в этот файл, - обозначает stdout\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -2366,7 +2529,7 @@ msgstr ""
 "                         периодичность сброса на диск выходного файла (по "
 "умолчанию: %d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, c-format
 msgid ""
 "  -I, --startpos=LSN     where in an existing slot should the streaming "
@@ -2375,7 +2538,7 @@ msgstr ""
 "  -I, --startpos=LSN     определяет, с какой позиции в существующем слоте "
 "начнётся передача\n"
 
-#: pg_recvlogical.c:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -2387,181 +2550,186 @@ msgstr ""
 "необязательным\n"
 "                         значением модулю вывода\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr ""
 "  -P, --plugin=МОДУЛЬ    использовать заданный модуль вывода (по умолчанию: "
 "%s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=ИМЯ_СЛОТА   имя слота логической репликации\n"
 
-#: pg_recvlogical.c:107
+#: pg_recvlogical.c:108
 #, c-format
 msgid ""
-"  -t, --two-phase        enable decoding of prepared transactions when "
+"  -t, --enable-two-phase enable decoding of prepared transactions when "
 "creating a slot\n"
 msgstr ""
-"  -t, --two-phase        включить декодирование подготовленных транзакций "
+"  -t, --enable-two-phase включает декодирование подготовленных транзакций "
 "при создании слота\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:109
+#, c-format
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (то же, что --enable-two-phase, устаревший)\n"
+
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=ИМЯ_БД    целевая база данных\n"
 
-#: pg_recvlogical.c:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "подтверждается запись до %X/%X, синхронизация с ФС до %X/%X (слот %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "не удалось отправить пакет ответа: %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "начало передачи журнала с позиции %X/%X (слот %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "передача запущена"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не удалось открыть файл протокола \"%s\": %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "неверный сокет: %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "не удалось получить данные из потока WAL: %s"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "заголовок потока слишком мал: %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "нераспознанный заголовок потока: \"%c\""
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "не удалось записать %d Б в файл журнала \"%s\": %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "неожиданный конец потока репликации: %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "не удалось разобрать начальную позицию \"%s\""
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "слот не указан"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "целевой файл не задан"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "база данных не задана"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "необходимо задать минимум одно действие"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "--create-slot или --start нельзя применять вместе с --drop-slot"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "--create-slot или --drop-slot нельзя применять вместе с --startpos"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos можно задать только вместе с --start"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase можно задать только вместе с --create-slot"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s можно задать только вместе с --create-slot"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr ""
 "не удалось установить подключение для репликации к определённой базе данных"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "конечная позиция %X/%X достигнута при обработке keepalive"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "конечная позиция %X/%X достигнута при обработке записи WAL %X/%X"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "не удалось создать файл статуса архива \"%s\": %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "не удалось закрыть файл статуса архива \"%s\": %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "не удалось получить размер файла журнала предзаписи \"%s\": %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "не удалось открыть существующий файл журнала предзаписи \"%s\": %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr ""
 "не удалось сбросить на диск существующий файл журнала предзаписи \"%s\": %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
@@ -2572,37 +2740,37 @@ msgstr[1] ""
 msgstr[2] ""
 "файл журнала предзаписи \"%s\" имеет размер %zd Б, а должен — 0 или %d"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "не удалось открыть файл журнала предзаписи \"%s\": %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "файл сегмента \"%s\" не переименовывается, так как он неполный"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "не удалось закрыть файл \"%s\": %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "сервер сообщил неожиданное имя файла истории для линии времени %u: %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "не удалось создать файл истории линии времени \"%s\": %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "не удалось записать файл истории линии времени \"%s\": %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid ""
 "incompatible server version %s; client does not support streaming from "
@@ -2611,7 +2779,7 @@ msgstr ""
 "несовместимая версия сервера %s; клиент не поддерживает репликацию с "
 "серверов версии ниже %s"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid ""
 "incompatible server version %s; client does not support streaming from "
@@ -2620,7 +2788,7 @@ msgstr ""
 "несовместимая версия сервера %s; клиент не поддерживает репликацию с "
 "серверов версии выше %s"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid ""
 "system identifier does not match between base backup and streaming connection"
@@ -2628,12 +2796,12 @@ msgstr ""
 "системный идентификатор базовой резервной копии отличается от идентификатора "
 "потоковой передачи"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "на сервере нет начальной линии времени %u"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid ""
 "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, "
@@ -2642,12 +2810,12 @@ msgstr ""
 "сервер вернул неожиданный ответ на команду TIMELINE_HISTORY; получено строк: "
 "%d, полей: %d, а ожидалось строк: %d, полей: %d"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "сервер неожиданно сообщил линию времени %u после линии времени %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid ""
 "server stopped streaming timeline %u at %X/%X, but reported next timeline %u "
@@ -2656,12 +2824,12 @@ msgstr ""
 "сервер прекратил передачу линии времени %u в %X/%X, но сообщил, что "
 "следующая линии времени %u начнётся в %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "поток репликации закончился до точки остановки"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid ""
 "unexpected result set after end-of-timeline: got %d rows and %d fields, "
@@ -2670,62 +2838,57 @@ msgstr ""
 "сервер вернул неожиданный набор данных после конца линии времени; получено "
 "строк: %d, полей: %d, а ожидалось строк: %d, полей: %d"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "не удалось разобрать начальную точку следующей линии времени \"%s\""
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "получена запись журнала предзаписи по смещению %u, но файл не открыт"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "получено смещение данных WAL %08x, но ожидалось %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "не удалось записать %d Б в файл WAL \"%s\": %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "не удалось отправить пакет \"конец COPY\": %s"
 
-#: streamutil.c:165
+#: streamutil.c:162
 msgid "Password: "
 msgstr "Пароль: "
 
-#: streamutil.c:192
+#: streamutil.c:189
 #, c-format
 msgid "could not connect to server"
 msgstr "не удалось подключиться к серверу"
 
-#: streamutil.c:233
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "не удалось очистить \"search_path\": %s"
-
-#: streamutil.c:249
+#: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
 msgstr "не удалось получить параметр сервера \"integer_datetimes\""
 
-#: streamutil.c:256
+#: streamutil.c:253
 #, c-format
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr ""
 "флаг компиляции \"integer_datetimes\" не соответствует настройке сервера"
 
-#: streamutil.c:375
+#: streamutil.c:304
 #, c-format
 msgid ""
 "could not fetch WAL segment size: got %d rows and %d fields, expected %d "
@@ -2734,12 +2897,12 @@ msgstr ""
 "не удалось извлечь размер сегмента WAL; получено строк: %d, полей: %d "
 "(ожидалось: %d и %d (или более))"
 
-#: streamutil.c:385
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "разобрать размер сегмента WAL не удалось"
 
-#: streamutil.c:403
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
@@ -2747,13 +2910,13 @@ msgstr[0] "удалённый сервер выдал неверный разм
 msgstr[1] "удалённый сервер выдал неверный размер сегмента WAL: %d Б"
 msgstr[2] "удалённый сервер выдал неверный размер сегмента WAL: %d Б"
 
-#: streamutil.c:407
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr ""
 "Размер сегмента WAL должен задаваться степенью 2 в интервале от 1 МБ до 1 ГБ."
 
-#: streamutil.c:449
+#: streamutil.c:378
 #, c-format
 msgid ""
 "could not fetch group access flag: got %d rows and %d fields, expected %d "
@@ -2762,12 +2925,12 @@ msgstr ""
 "не удалось извлечь флаг доступа группы; получено строк: %d, полей: %d "
 "(ожидалось: %d и %d (или более))"
 
-#: streamutil.c:458
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "не удалось разобрать флаг доступа группы: %s"
 
-#: streamutil.c:501 streamutil.c:538
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid ""
 "could not identify system: got %d rows and %d fields, expected %d rows and "
@@ -2776,7 +2939,7 @@ msgstr ""
 "не удалось идентифицировать систему; получено строк: %d, полей: %d "
 "(ожидалось: %d и %d (или более))"
 
-#: streamutil.c:590
+#: streamutil.c:519
 #, c-format
 msgid ""
 "could not read replication slot \"%s\": got %d rows and %d fields, expected "
@@ -2785,23 +2948,23 @@ msgstr ""
 "прочитать из слота репликации \"%s\" не удалось; получено строк: %d, полей: "
 "%d (ожидалось: %d и %d)"
 
-#: streamutil.c:602
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "слот репликации \"%s\" не существует"
 
-#: streamutil.c:613
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "ожидался слот физической репликации, вместо этого получен тип \"%s\""
 
-#: streamutil.c:627
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr ""
 "не удалось разобрать позицию restart_lsn \"%s\" для слота репликации \"%s\""
 
-#: streamutil.c:744
+#: streamutil.c:678
 #, c-format
 msgid ""
 "could not create replication slot \"%s\": got %d rows and %d fields, "
@@ -2810,7 +2973,7 @@ msgstr ""
 "создать слот репликации \"%s\" не удалось; получено строк: %d, полей: %d "
 "(ожидалось: %d и %d)"
 
-#: streamutil.c:788
+#: streamutil.c:722
 #, c-format
 msgid ""
 "could not drop replication slot \"%s\": got %d rows and %d fields, expected "
@@ -2848,6 +3011,18 @@ msgstr "со сжатием закрытие файла с удалением н
 msgid "could not close compression stream"
 msgstr "не удалось закрыть поток сжатых данных"
 
+#, c-format
+#~ msgid "subscriber successfully changed the system identifier"
+#~ msgstr "идентификатор системы на подписчике успешно изменён"
+
+#, c-format
+#~ msgid "could not change system identifier of subscriber: %s"
+#~ msgstr "изменить идентификатор системы на подписчике не удалось: %s"
+
+#, c-format
+#~ msgid "could not clear search_path: %s"
+#~ msgstr "не удалось очистить search_path: %s"
+
 #, c-format
 #~ msgid "this build does not support gzip compression"
 #~ msgstr "эта сборка программы не поддерживает сжатие gzip"
diff --git a/src/bin/pg_basebackup/po/sv.po b/src/bin/pg_basebackup/po/sv.po
index e93dab66b4c..ba3c4f71fc5 100644
--- a/src/bin/pg_basebackup/po/sv.po
+++ b/src/bin/pg_basebackup/po/sv.po
@@ -1,14 +1,14 @@
 # SWEDISH message translation file for pg_basebackup
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-26 18:20+0000\n"
-"PO-Revision-Date: 2024-08-26 20:56+0200\n"
+"POT-Creation-Date: 2026-02-03 02:49+0000\n"
+"PO-Revision-Date: 2026-02-04 07:12+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,30 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
+#: ../../fe_utils/astreamer_zstd.c:288
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "detta bygge stöder inte komprimering med %s"
@@ -94,7 +95,7 @@ msgstr "komprimeringsalgoritmen \"%s\" stöder inte långdistansläge"
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -106,7 +107,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "kunde inte läsa fil \"%s\": läste %d av %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "kunde inte stänga fil \"%s\": %m"
@@ -128,10 +129,10 @@ msgstr ""
 "inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
@@ -141,8 +142,8 @@ msgstr "kunde inte öppna fil \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
@@ -158,36 +159,36 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -222,191 +223,200 @@ msgstr "kunde inte köra igen med token för begränsad åtkomst: felkod %lu"
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "kunde inte hämta statuskod för underprocess: felkod %lu"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "ogiltigt värde \"%s\" för flaggan \"%s\""
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "%s måste vara i intervallet %d..%d"
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "okänd synkmetod: %s"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:331
-#, c-format
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "kunde inte skriva till fil \"%s\": %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "kunde inte skapa fil \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
-#, c-format
-msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
-msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
-
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "kunde inte skriva till fil \"%s\": %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:278
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "oväntat tillstånd vid uppackning av arkiv"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "kunde inte skapa katalog \"%s\": %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:329
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "kunde inte sätta rättigheter på katalogen \"%s\": %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:348
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "kunde inte skapa symbolisk länk från \"%s\" till \"%s\": %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:368
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "kunde inte sätta rättigheter på filen \"%s\": %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "kunde inte skapa komprimerad fil \"%s\": %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "kunde inte duplicera stdout: %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "kunde inte öppna utdatafilen: %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "kunde inte sätta komprimeringsnivå %d: %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "kunde inte skriva till komprimerad fil \"%s\": %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "kunde inte stänga komprimerad fil \"%s\": %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "kunde inte initierar komprimeringsbibliotek"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "kunde inte dekomprimera data: %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "oväntat tillstånd vid injicering av återställningsinställningar"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "kunde inte skapa kontext för lz4-komprimering: %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "kunde inte skriva lz4-header: %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
 #, c-format
 msgid "could not compress data: %s"
 msgstr "kunde inte komprimera data: %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "kunde inte avsluta lz4-komprimering: %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "kunde inte initiera komprimeringsbibliotek: %s"
 
-#: bbstreamer_tar.c:244
+#: ../../fe_utils/astreamer_tar.c:244
 #, c-format
 msgid "tar file trailer exceeds 2 blocks"
 msgstr "tarfilens slutdel överskred 2 block"
 
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:249
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "oväntat tillstånd vid parsning av tar-arkiv"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:292
 #, c-format
 msgid "tar member has empty name"
 msgstr "tar-medlem har tomt namn"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:326
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "COPY-ström avslutade innan sista filen var klar"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "kunde inte skapa kontext för zstd-komprimering"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "kunde inte sätta zstd-komprimeringsnivå till %d: %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
 msgstr "kunde inte sätta komprimeringsarbetarantalet till %d: %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:120
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "kunde inte aktivera långdistansläge: %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:279
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "kunde inte skapa kontext för zstd-dekomprimering"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "ogiltigt värde \"%s\" för flaggan \"%s\""
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "%s måste vara i intervallet %d..%d"
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "okänd synkmetod: %s"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "oväntat tillstånd vid injicering av återställningsinställningar"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -496,14 +506,14 @@ msgstr ""
 "%s tar en basbackup av en körande PostgreSQL-server.\n"
 "\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [FLAGGA]...\n"
@@ -653,12 +663,12 @@ msgstr "  -P, --progress         visa förloppsinformation\n"
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=SLOTNAMN    replikerings-slot att använda\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          mata ut utförliga meddelanden\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          visa versionsinformation, avsluta sedan\n"
@@ -714,12 +724,12 @@ msgstr ""
 "      --sync-method=METOD\n"
 "                         sätt synkmetod för att synka filer till disk\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             visa den här hjälpen, avsluta sedan\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid ""
 "\n"
@@ -733,12 +743,12 @@ msgstr ""
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONNSTR   anslutningssträng\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAMN    databasserverns värdnamn eller socket-katalog\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        databasserverns postnummer\n"
@@ -752,23 +762,23 @@ msgstr ""
 "  -s, --status-interval=INTERVAL\n"
 "                         tid mellan att statuspaket skickas till servern (i sekunder)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAMN    ansluta som angiven databasanvändare\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      fråga aldrig efter lösenord\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password         tvinga fram lösenordsfråga (skall ske automatiskt)\n"
 
-#: pg_basebackup.c:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid ""
 "\n"
@@ -777,8 +787,8 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
@@ -788,8 +798,8 @@ msgstr "hemsida för %s: <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "kunde inte läsa från rör (pipe) som har data: %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:518
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "kunde inte parsa write-ahead-logg-plats \"%s\""
@@ -804,519 +814,515 @@ msgstr "kunde inte slutföra skrivning av WAL-filer: %m"
 msgid "could not create pipe for background process: %m"
 msgstr "kunde inte skapa rör (pipe) för bakgrundsprocess: %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "skapade en temporär replikeringsslot \"%s\""
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "skapade en replikeringsslot \"%s\""
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "kunde inte skapa bakgrundsprocess: %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "kunde inte skapa bakgrundstråd: %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "katalogen \"%s\" existerar men är inte tom"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "kunde inte komma åt katalog \"%s\": %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, 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:870
+#: pg_basebackup.c:871
 #, 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:886
+#: pg_basebackup.c:887
 #, 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:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "överföringshastighet \"%s\" är inte ett giltigt värde"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "ogiltig överföringshastighet \"%s\": %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "överföringshastigheten måste vara större än noll"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "ogiltig enhet för --max-rate: \"%s\""
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "överföringshastighet \"%s\" överskrider heltalsintervall"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "överföringshastighet \"%s\" är utanför sitt intervall"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "kunde inte hämta COPY-data-ström: %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "kunde inte läsa COPY-data: %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "en bakgrundsprocess avslutade oväntat"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "kan inte injicera manifest in i en komprimerad tarfil"
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid "Use client-side compression, send the output to a directory rather than standard output, or use %s."
 msgstr "använd komprimering på klientsidan, skicka utdatan till en katalog istället för till standard ut eller använd %s."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "kunde inte parsa arkiv \"%s\""
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
 msgstr "Bara tar-arkiv kan parsas."
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr "Enkelt format kräver pg_basebackup för att parsa arkivet."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid "Using - as the output directory requires pg_basebackup to parse the archive."
 msgstr "Att använda - som utkatalog kräver att pg_basebackup parsar arkivet."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr "Flaggan -R kräver att pg_basebackup parsar arkivet."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "arkiv skall komma före manifest"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "ogiltigt arkivnamn: \"%s\""
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "oväntat datainnehåll"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "tomt COPY-meddelande"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "felaktigt COPY-meddelande av typ %d, längd %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "inkompatibel serverversion %s"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr "Använd -X none eller -X fetch för att stänga av logg-strömning"
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "servern stöder inte inkrementella backup:er"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:364 streamutil.c:438
-#: streamutil.c:490 streamutil.c:578 streamutil.c:730 streamutil.c:775
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "kunde inte skicka replikeringskommando \"%s\": %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "kunde inte ladda upp manifest: %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "kunde inte ladda upp manifest: oväntad status %s"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "kunde inte skicka COPY-data: %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "kunde inte skicka slut-på-COPY: %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "oväntat extra resultat vid skickande av manifest"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "backupmål stöds inte av denna serverversion"
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr "återställningskonfiguration kan inte skrivas när backupmål används"
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "servern stöder inte komprimering på serversidan"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr "initierar basbackup, väntar på att checkpoint skall gå klart"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "väntar på checkpoint"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "kunde inte initiera basbackup: %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid "server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "servern retunerade ett oväntat svar på BASE_BACKUP-kommandot; fick %d rader och %d fält, förväntade %d rader och %d fält"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "checkpoint klar"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "write-ahead-loggens startposition: %s på tidslinje %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "kunde inte hämta backup-header: %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "ingen data returnerades från servern"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr "kunde bara skriva en endaste tablespace till stdout, databasen har %d"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "startar bakgrunds-WAL-mottagare"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "backup misslyckades: %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "ingen write-ahead-logg-slutposition returnerad från servern"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "write-ahead-logg-slutposition: %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "felaktig kontrollsumma upptäcktes"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "sista mottagning misslyckades: %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "väntat på att bakgrundsprocess skall avsluta strömmande ..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "kunde inte skicka kommando till bakgrundsrör (pipe): %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "kunde inte vänta på barnprocess: %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "barn %d dog, förväntade %d"
 
-#: pg_basebackup.c:2248 streamutil.c:89 streamutil.c:204 streamutil.c:316
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "kunde inte vänta på barntråd: %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "kunde inte hämta barntrådens slutstatus: %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "barntråd avslutade med fel %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "synkar data till disk ..."
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "byter namn på backup_manifest.tmp till backup_manifest"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "basbackup klar"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr "ogiltigt checkpoint-argument \"%s\", måste vara \"fast\" eller \"spread\""
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "ogiltigt utdataformat \"%s\", måste vara \"plain\" eller \"tar\""
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
 msgstr "ogiltig wal-metod-flagga \"%s\", måste vara \"fetch\", \"stream\" eller \"none\""
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2037 pg_createsubscriber.c:2047
-#: pg_createsubscriber.c:2055 pg_createsubscriber.c:2083
-#: pg_createsubscriber.c:2115 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2045 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "kan inte ange både format och backupmål"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "måste ange utkatalog eller backupmål"
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "kan inte ange både utdatakatalog och backupmål"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "okänd komprimeringsalgoritm: \"%s\""
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "ogiltig komprimeringsangivelse: %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid "client-side compression is not possible when a backup target is specified"
 msgstr "komprimering på klientsidan är inte möjlig när backupmål angivits"
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "bara backupper i tar-läge kan komprimeras"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
 msgstr "WAL kan inte strömmas när ett backupmål angivits"
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "kan inte strömma write-ahead-logg i tar-läge till stdout"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "replikerings-slot kan bara användas med WAL-strömning"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "--no-slot kan inte användas tillsammans med slot-namn"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "%s kräver att en slot anges med --slot"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "%s och %s är inkompatibla flaggor"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "WAL-katalogplats kan inte anges tillsammans med backupmål"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "WAL-katalogplats kan bara anges i läget \"plain\""
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "WAL-katalogen måste vara en absolut sökväg"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "kan inte skapa symbolisk länk \"%s\": %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "misslyckades vid slutet av återställning"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid "The target server cannot be used as a physical replica anymore.  You must recreate the physical replica before continuing."
 msgstr "Målservern kan inte längre användas som en fysisk replika. Du måste återskapa den fysiska replikan innan det går att fortsätta."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "publiceringen \"%s\" som skapades i databasen \"%s\" på primären har lämnats kvar"
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "Släng denna publiceringen innan du försöker igen."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "replikeringsslotten \"%s\" som skapades i databasen \"%s\" på primären har lämnats kvar"
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1260
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "Släng denna replikeringsslot inom kort för att undvika att WAL-filer köas upp."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid ""
 "%s creates a new logical replica from a standby server.\n"
 "\n"
 msgstr "%s skapar en ny logisk replikering från en standby-server.\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid ""
 "\n"
@@ -1325,52 +1331,76 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid ""
+"  -a, --all                       create subscriptions for all databases except template\n"
+"                                  databases and databases that don't allow connections\n"
+msgstr ""
+"  -a, --all                       skapa prenumerationer för alla databaser förutom\n"
+"                                  template-databaser och databaser som inte tillåter\n"
+"                                  anslutningar\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid "  -d, --database=DBNAME           database in which to create a subscription\n"
 msgstr "  -d, --database=DBNAME           databas att skapa prenumeration i\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid "  -D, --pgdata=DATADIR            location for the subscriber data directory\n"
 msgstr "  -D, --pgdata=DATADIR            plats för prenumerantens datakatalog\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr "  -n, --dry-run                   ingen updatering, visa bara planerade åtgärder\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr "  -p, --subscriber-port=PORT      prenumerantens portnummer (standard %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr "  -P, --publisher-server=CONNSTR  publicerarens anslutningssträng\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=KAT             uttagskatalog (standard är aktuell katalog.)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SECS     antal sekunder att vänta på att återställning skall avslutas\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
+msgstr "  -T, --enable-two-phase          slå på tvåfas-commit för alla prenumerationer\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NAME  användarnamn för prenumerantens anslutning\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   visa utförliga meddelanden\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid ""
+"      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr ""
+"  -R, --remove=OBJEKTTYP          ta bort alla objekt av den angivna typen från angivna\n"
+"                                  databaser på prenumerantsidan; accepterar: \"%s\"\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid ""
 "      --config-file=FILENAME      use specified main server configuration\n"
@@ -1379,556 +1409,651 @@ msgstr ""
 "      --config-file=FILNAMN       använd angiven fil med serverkonfiguration\n"
 "                                  när målklustret körs\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=NAME          publiceringsnamn\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=NAME     namn på replikeringsslot\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=NAME         namn på prenumeration\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   visa versionsinformation, avsluta sedan\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      visa denna hjälp, avsluta sedan\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "kunde inte parsa anslutningssträng: %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\""
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "undersöker om katalogen \"%s\" är en klusterkatalog"
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "databaskatalogen \"%s\" existerar inte"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "katalogen \"%s\" innehåller inte ett databaskluster."
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "anslutning till databasen misslyckades: %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "kunde inte nollställa search_path: %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "kunde inte nollställa \"search_path\": %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "hämtar systemidentifierare från publicerare"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "kunde inte hämta systemidentifierare: %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr "kunde inte hämta systemidentifierare: fick %d rader, förväntade %d rad"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "systemidentifieraren är %llu på publiceraren"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "systemidentifieraren är %<PRIu64> på publiceraren"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "hämtar systemidentifierare från prenumeranten"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "kontrollfilen verkar vara trasig"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "systemidentifieraren är %llu hos prenumeranten"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "systemidentifieraren är %<PRIu64> hos prenumeranten"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "uppdaterar systemidentifieraren för prenumeranten"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "provkörning: skulle sätta systemidentifieraren till %<PRIu64> hos prenumeranten"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "provkörning: skulle köra pg_resetwal på prenumeranten"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "kör pg_resetwal på prenumeranten"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "prenumeranten lyckades ändra systemidentifieraren"
+msgid "successfully reset WAL on the subscriber"
+msgstr "lyckades resetta WAL hos prenumeranten"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "kunde inte ändra systemidentifierare för prenumerant: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "kunde inte resetta WAL hos prenumerant: %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "kunde inte hämta databas-OID: %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "kunde inte hämta databas-OID: fick %d rader, förväntade %d rad"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "skapa replikerings-slot \"%s\" på publicerare"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "kunde inte läsa ytterligare en WAL-post: %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "kunde inte hämta progress för återställning: %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "kontrollerar inställningar på publicerare"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "primära servern kan inte vara i återställningsläge"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "kunde inte hämta inställningar för publicerare: %s"
 
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:956
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "publiceraren kräver wal_level >= \"logical\""
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "publiceraren kräver \"wal_level\" >= \"logical\""
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "publicerare kräver %d replikeringssslottar men bara %d återstår"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Öka konfigurationsparametern \"%s\" till minst %d."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "publicerare kräver %d WAL-skickar-processer men bara %d återstår"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "flaggan two_phase kommer inte aktiveras för replikeringsslottar"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "Prenumerationer kommer skapas med flaggan two_phase avaktiverad.  Förberedda transaktioner kommer replikeras vid COMMIT PREPARED."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:983
+#, c-format
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "Du kan använda kommandoradsflaggan --enable-two-phase för att slå på two_phase."
+
+#: pg_createsubscriber.c:993
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "WAL som krävdes kan tas bort från publiceraren"
+
+#: pg_createsubscriber.c:994
+#, c-format
+msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
+msgstr "Sätt konfigurationsparametern \"%s\" till -1 för att säkertställa att WAL-filer som krävs inte tas bort för tidigt."
+
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "kontrollerar inställningar på prenumeranten"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "målserver måste vara en standby"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "kunde inte hämta inställningar för prenumerant: %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1081
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "prenumerant kräver %d replikeringsslottar men bara %d återstår"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr "prenumerant kräver %d aktiva replikerings-origin men bara %d återstår"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "prenumerant kräver %d logiska replikeringsprocesser men bara %d återstår"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "prenumerant kräver %d arbetsprocesser men bara %d återstår"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "provkörning: skulle slänga prenumeration \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "slänger prenumeration \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "kunde inte slänga prenumeration \"%s\": %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "kunde inte hämta redan existerande prenumerationer: %s"
 
-#: pg_createsubscriber.c:1258
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "kunde inte slänga replikeringsslotten \"%s\" på primären"
 
-#: pg_createsubscriber.c:1292
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "kunde inte hämta replikeringsslottens information för failover: %s"
 
-#: pg_createsubscriber.c:1294 pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "Släng replikeringsslottar för failover på prenumeranten inom kort för att undvika att köa upp WAL-filer."
 
-#: pg_createsubscriber.c:1302
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "kunde inte slänga replikeringsslot för failover"
 
-#: pg_createsubscriber.c:1324
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "provkörning: skulle skapa replikeringsslot \"%s\" i databasen \"%s\" på publiceraren"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "skapar replikeringsslot \"%s\" i databasen \"%s\""
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "skapar replikeringsslot \"%s\" i databasen \"%s\" på publiceraren"
 
-#: pg_createsubscriber.c:1342
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "kunde inte skapa replikeringsslot \"%s\" i databasen \"%s\": %s"
 
-#: pg_createsubscriber.c:1372
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "provkörning: skulle slänga replikeringsslot \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "slänger replikeringsslot \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "kunde inte slänga replikeringsslot \"%s\" i databasen \"%s\": %s"
 
-#: pg_createsubscriber.c:1409
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "pg_ctl avslutade med felkod %d"
 
-#: pg_createsubscriber.c:1414
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl avslutades med avbrott 0x%X"
 
-#: pg_createsubscriber.c:1416
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Se C-include-fil \"ntstatus.h\" för en beskrivning av det hexdecimala värdet."
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl terminerades av signal %d: %s"
 
-#: pg_createsubscriber.c:1424
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl avslutade med okänd statuskod %d"
 
-#: pg_createsubscriber.c:1427
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "Det misslyckade kommandot var: %s"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "servern startad"
 
-#: pg_createsubscriber.c:1488
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "servern är stoppad"
 
-#: pg_createsubscriber.c:1507
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "väntar på att målservern skall komma till ett konsistent läge"
 
-#: pg_createsubscriber.c:1530
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "timeout vid återställning"
 
-#: pg_createsubscriber.c:1543
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "servern avslutade inte återställning"
 
-#: pg_createsubscriber.c:1545
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "målservern har nått ett konsistent läge"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr ""
 "Om pg_createsubscriber misslyckas efter denna punkt så måste du\n"
 "återskapa den fysiska replikan innan du fortsätter."
 
-#: pg_createsubscriber.c:1573
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "kunde inte hämta publiceringsinformation: %s"
 
-#: pg_createsubscriber.c:1587
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "publicering \"%s\" finns redan"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Överväg att byta namn på denna publicering innan fortsättning."
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "provkörning: skulle skapa publicering \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "skapar puiblicering \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1608
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "kunde inte skapa publicering \"%s\" i databasen \"%s\": %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "provkörning: skulle slänga publiceringen \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "slänger publiceringen \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1651
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "kunde inte slänga publiceringen \"%s\" i databasen \"%s\": %s"
 
-#: pg_createsubscriber.c:1697
+#: pg_createsubscriber.c:1769
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "slänger alla existerande publiceringar i databasen \"%s\""
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "provkörning: skulle skapa prenumeration \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "skapar prenumeration \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1718
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "kunde inte skapa prenumeration \"%s\" i databasen \"%s\": %s"
 
-#: pg_createsubscriber.c:1763
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "kunde inte hämta prenumerations-OID: %s"
 
-#: pg_createsubscriber.c:1770
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "kunde inte hämta prenumerations-OID: fick %d rader, förväntade %d rad"
 
-#: pg_createsubscriber.c:1794
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "provkörning: skulle sätta progress för replikering (nod-namn \"%s\", LSN %s) i databasen \"%s\""
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "sätter progress för replikering (nod-namn \"%s\", LSN %s) i databasen \"%s\""
 
-#: pg_createsubscriber.c:1809
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "kunde inte sätta progress för replikering till prenumeration \"%s\": %s"
 
-#: pg_createsubscriber.c:1840
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "provkörning: skulle aktivera prenumeration \"%s\" i databasen \"%s\""
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "aktiverar prenumeration \"%s\" i databasen \"%s\""
 
-#: pg_createsubscriber.c:1852
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "kunde inte aktivera prenumerationen \"%s\": %s"
 
-#: pg_createsubscriber.c:1944
+#: pg_createsubscriber.c:2041
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "kunde inte hämta en lista med databaser: %s"
+
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "kan inte köras av \"root\""
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Du måste köra %s som PostgreSQL:s superuser."
 
-#: pg_createsubscriber.c:1966
+#: pg_createsubscriber.c:2169
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "databasen \"%s\" angiven mer än en gång för -d/--database"
+
+#: pg_createsubscriber.c:2210
+#, c-format
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "publicering \"%s\" angiven mer än en gång för --publication"
+
+#: pg_createsubscriber.c:2219
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "database \"%s\" angiven mer än en gång"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "replikeringsslott \"%s\" angiven mer än en gång för --replication-slot"
 
-#: pg_createsubscriber.c:2007
+#: pg_createsubscriber.c:2228
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "publicering \"%s\" angiven mer än en gång"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "prenumeration \"%s\" angiven mer än en gång för --subscription"
 
-#: pg_createsubscriber.c:2019
+#: pg_createsubscriber.c:2234
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "replikeringsslott \"%s\" angiven mer än en gång"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "objekttypen \"%s\" angiven mer än en gång för --clean"
 
-#: pg_createsubscriber.c:2031
+#: pg_createsubscriber.c:2259
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "prenumeration \"%s\" angiven mer än en gång"
+msgid "options %s and %s cannot be used together"
+msgstr "flaggorna %s och %s kan inte användas tillsammans"
 
-#: pg_createsubscriber.c:2054
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "ingen datakatalog för prenumeration angiven"
 
-#: pg_createsubscriber.c:2065
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "kunde inte bestämma aktuell katalog"
 
-#: pg_createsubscriber.c:2082
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "ingen anslutningssträng angiven för publicerare"
 
-#: pg_createsubscriber.c:2086
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "validerar publicerares anslutningssträng"
 
-#: pg_createsubscriber.c:2092
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "validerar prenumerants anslutningssträng"
 
-#: pg_createsubscriber.c:2097
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "ingen databas angavs"
 
-#: pg_createsubscriber.c:2109
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "databasnamn \"%s\" extraherades från publicistens anslutningssträng"
 
-#: pg_createsubscriber.c:2114
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "inget databasnamn angavs"
 
-#: pg_createsubscriber.c:2124
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "fel antal namn på publicister angavs"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "Antalet angivna namn på publicister (%d) måste matcha antalet angivna namn på databaser (%d)."
 
-#: pg_createsubscriber.c:2131
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "fel antal namn på prenumeranter angivna"
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "Antalet angivna namn på prenumeranter (%d) måste matcha antalet angivna namn på databaser (%d)."
 
-#: pg_createsubscriber.c:2138
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "fel antal namn på replikeringsslottar angivet"
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "Antalet angivna namn på replikeringsslottar (%d) måste matcha antalet angivna namn på databaser (%d)."
 
-#: pg_createsubscriber.c:2168
+#: pg_createsubscriber.c:2386
+#, c-format
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "ogiltigt objekttyp \"%s\" angivet för %s"
+
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "Giltigt värde är: \"%s\""
+
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "prenumerantens datakatalog är inte en kopia på källdatabasens kluster"
 
-#: pg_createsubscriber.c:2181
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "standby-servern kör"
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Stoppa standby-servern och försök igen."
 
-#: pg_createsubscriber.c:2191
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "startar standby-server med kommandoradsflaggor"
 
-#: pg_createsubscriber.c:2207 pg_createsubscriber.c:2242
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "stoppar prenumeranten"
 
-#: pg_createsubscriber.c:2221
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "startar prenumeranten"
 
-#: pg_createsubscriber.c:2250
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "Klar!"
@@ -1947,17 +2072,17 @@ msgstr ""
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=KAT    ta emot write-ahead-logg-filer till denna katalog\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       avsluta efter att ha taget emot den angivna LSN\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr "      --if-not-exists    inget fel om slot:en redan finns när vi skapar slot:en\n"
 
-#: pg_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          loopa inte om anslutning tappas\n"
@@ -1967,7 +2092,7 @@ msgstr "  -n, --no-loop          loopa inte om anslutning tappas\n"
 msgid "      --no-sync          do not wait for changes to be written safely to disk\n"
 msgstr "      --no-sync          vänta inte på att ändringar skall skrivas säkert till disk\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -1999,12 +2124,12 @@ msgstr ""
 "\n"
 "Valfria handlingar:\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      skapa en ny replikeringsslot (angående slot:ens namn, se --slot)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        släng replikeringsslot (angående slot:ens namn, se --slot)\n"
@@ -2024,7 +2149,7 @@ msgstr "stoppade logg-strömning vid %X/%X (tidslinje %u)"
 msgid "switched to timeline %u at %X/%X"
 msgstr "bytte till tidslinje %u vid %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "mottog avbrottsignal, avslutar"
@@ -2094,7 +2219,7 @@ msgstr "kan inte kontrollera filen \"%s\": komprimering med %s stöds inte av de
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "startar logg-strömning vid %X/%X (tidslinje %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "kunde inte parsa slutposition \"%s\""
@@ -2124,28 +2249,28 @@ msgstr "komprimering med %s stöds inte än"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "replikeringsanslutning som använder slot \"%s\" är oväntat databasspecifik"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "slänger replikeringsslot \"%s\""
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "skapar replikeringsslot \"%s\""
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "nerkopplad"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "nerkopplad; väntar %d sekunder för att försöka igen"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -2154,7 +2279,7 @@ msgstr ""
 "%s styr PostgreSQL:s logiskt avkodade strömmar.\n"
 "\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid ""
 "\n"
@@ -2163,17 +2288,26 @@ msgstr ""
 "\n"
 "Handling att utföra:\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            starta strömning i en replikeringsslot (angående slot:ens namn, se --slot)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid ""
+"      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
+msgstr ""
+"      --enable-failover  slå på synkronisering av replikeringsslot till standby-servrar\n"
+"                         när en replikeringsslot skapas\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=FIL         ta emot logg till denna fil, - för stdout\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -2182,12 +2316,12 @@ msgstr ""
 "  -F  --fsync-interval=SEK\n"
 "                         tid mellan fsync av utdatafil (standard: %d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN     var i en existerande slot skall strömningen starta\n"
 
-#: pg_recvlogical.c:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -2198,280 +2332,285 @@ msgstr ""
 "                         skicka vidare flaggan NAMN med ev. värde VÄRDE till\n"
 "                         utmatnings-plugin:en\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    använd utmatnings-plugin:en PLUGIN (standard: %s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=SLOTNAMN    namn på den logiska replikerings-slotten\n"
 
-#: pg_recvlogical.c:107
+#: pg_recvlogical.c:108
+#, c-format
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr "  -t, --enable-two-phase slå på avkodning av förberedda transaktioner när en slot skapas\n"
+
+#: pg_recvlogical.c:109
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase        slå på avkodning av förberedda transaktioner när en slot skapas\n"
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (samma som --enable-two-phase, obsolet)\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=DBNAMN    databas att ansluta till\n"
 
-#: pg_recvlogical.c:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "bekräftar skrivning fram till %X/%X, flush till %X/%X (slot %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "kunde inte skicka feedback-paket: %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "startar logg-strömning vid %X/%X (slot %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "strömning initierad"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "kunde inte öppna loggfil \"%s\": %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "ogiltigt uttag: %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "kunde inte ta emot data från WAL-ström: %s"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "strömningsheader för liten: %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "okänd strömningsheader: \"%c\""
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "kunde inte skriva %d byte till loggfil \"%s\": %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "oväntad terminering av replikeringsström: %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "kunde inte parsa startposition \"%s\""
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "ingen slot angiven"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "ingen målfil angiven"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "ingen databas angiven"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "minst en handling måste anges"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "kan inte använda --create-slot eller --start tillsammans med --drop-slot"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "kan inte använda --create-slot eller --drop-slot tillsammans med --startpos"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos får bara anges tillsammans med --start"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase får bara anges tillsammans med --create-slot"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s får bara anges tillsammans med --create-slot"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "kunde inte upprätta databasspecifik replikeringsanslutning"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "slutposition %X/%X nådd av keepalive"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "slutposition %X/%X nådd av WAL-post vid %X/%X"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "kunde inte skapa arkiveringsstatusfil \"%s\": %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "kunde inte stänga arkiveringsstatusfil \"%s\": %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "kunde inte hämta storleken på write-ahead-logg-fil \"%s\": %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "kunde inte öppna existerande write-ahead-logg-fil \"%s\": %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr "kunde inte fsync:a befintlig write-ahead-logg-fil \"%s\": %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
 msgstr[0] "write-ahead-logg-fil \"%s\" har %zd byte, skall vara 0 eller %d"
 msgstr[1] "write-ahead-logg-fil \"%s\" har %zd byte, skall vara 0 eller %d"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "kunde inte öppna write-ahead-logg-fil \"%s\": %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "byter inte namn på \"%s\", segmentet är inte komplett"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "kunde inte stänga fil \"%s\": %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "servern rapporterade oväntat historikfilnamn för tidslinje %u: %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "kunde inte skapa tidslinjehistorikfil \"%s\": %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "kunde inte skriva tidslinjehistorikfil \"%s\": %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions older than %s"
 msgstr "inkompatibel serverversion %s; klienten stöder inte stömning från serverversioner äldre än %s"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions newer than %s"
 msgstr "inkompatibel serverversion %s; klienten stöder inte stömning från serverversioner nyare än %s"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid "system identifier does not match between base backup and streaming connection"
 msgstr "systemidentifieraren matchar inte mellan basbackup och strömningsanslutning"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "starttidslinje %u finns inte tillgänglig i servern"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "oväntat svar på TIMELINE_HISTORY-kommando: fick %d rader och %d fält, förväntade %d rader och %d fält"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "servern rapporterade oväntad nästa tidslinje %u, följer på tidslinje %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
 msgstr "servern stoppade strömning av tidslinje %u vid %X/%X men rapporterade nästa tidslinje %u skulle börja vid %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "replikeringsström avslutades innan stoppunkt"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid "unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "oväntad resultatmängd efter slut-på-tidslinje: fick %d rader och %d fält, förväntade %d rader och %d fält"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "kunde inte parsa nästa tidslinjens startpunkt \"%s\""
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "kunde inte fsync:a fil \"%s\": %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "tog emot write-ahead-logg-post för offset %u utan att ha någon öppen fil"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "fick WAL-data-offset %08x, förväntade %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "kunde inte skriva %d byte till WAL-fil \"%s\": %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "kunde inte skicka \"copy-end\"-paket: %s"
@@ -2485,11 +2624,6 @@ msgstr "Lösenord: "
 msgid "could not connect to server"
 msgstr "kunde inte ansluta till server"
 
-#: streamutil.c:230
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "kunde inte nollställa \"search_path\": %s"
-
 #: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
@@ -2500,69 +2634,69 @@ msgstr "kunde inte lista ut serverns inställning för \"integer_datetimes\""
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr "kompileringsflaggan \"integer_datetimes\" matchar inte servern"
 
-#: streamutil.c:372
+#: streamutil.c:304
 #, c-format
 msgid "could not fetch WAL segment size: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "kunde inte hämta WAL-segmentstorlek: fick %d rader och %d fält, förväntade %d rader och %d eller fler fält"
 
-#: streamutil.c:382
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "WAL-segment-storlek kunde inte parsas"
 
-#: streamutil.c:400
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
 msgstr[0] "fjärrservern rapporterade ogiltig WAL-segmentstorlek (%d byte)"
 msgstr[1] "fjärrservern rapporterade ogiltig WAL-segmentstorlek (%d byte)"
 
-#: streamutil.c:404
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Storleken på WAL-segment måste vara en tvåpotens mellan 1 MB och 1 GB."
 
-#: streamutil.c:446
+#: streamutil.c:378
 #, c-format
 msgid "could not fetch group access flag: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "kunde inte hämta gruppaccessflagga: fick %d rader och %d fält, förväntade %d rader och %d eller fler fält"
 
-#: streamutil.c:455
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "gruppaccessflagga kunde inte parsas: %s"
 
-#: streamutil.c:498 streamutil.c:535
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid "could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "kunde inte identifiera system: fick %d rader och %d fält, förväntade %d rader och %d eller fler fält"
 
-#: streamutil.c:587
+#: streamutil.c:519
 #, c-format
 msgid "could not read replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "kunde inte läsa replikeringsslot \"%s\": fick %d rader och %d fält, förväntade %d rader och %d fält"
 
-#: streamutil.c:599
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "replikeringsslot \"%s\" existerar inte"
 
-#: streamutil.c:610
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "förväntade en fysisk replikeringsslot men fick av typen \"%s\" istället"
 
-#: streamutil.c:624
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr "kunde inte parsa restart_lsn \"%s\" för replikeringsslot \"%s\""
 
-#: streamutil.c:741
+#: streamutil.c:678
 #, c-format
 msgid "could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "kunde inte skapa replikeringsslot \"%s\": fick %d rader och %d fält, förväntade %d rader och %d fält"
 
-#: streamutil.c:785
+#: streamutil.c:722
 #, c-format
 msgid "could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "kunde inte slänga replikeringsslot \"%s\": fick %d rader och %d fält, förväntade %d rader och %d fält"
diff --git a/src/bin/pg_basebackup/po/uk.po b/src/bin/pg_basebackup/po/uk.po
index 09cd1a552dd..c48e6b496e6 100644
--- a/src/bin/pg_basebackup/po/uk.po
+++ b/src/bin/pg_basebackup/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:20+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:20+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,33 +14,34 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_basebackup.pot\n"
-"X-Crowdin-File-ID: 1006\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_basebackup.pot\n"
+"X-Crowdin-File-ID: 1063\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 bbstreamer_gzip.c:116 bbstreamer_gzip.c:249
-#: bbstreamer_lz4.c:100 bbstreamer_lz4.c:298 bbstreamer_zstd.c:129
-#: bbstreamer_zstd.c:284
+#: ../../common/compression.c:150 ../../fe_utils/astreamer_gzip.c:140
+#: ../../fe_utils/astreamer_gzip.c:273 ../../fe_utils/astreamer_lz4.c:102
+#: ../../fe_utils/astreamer_lz4.c:300 ../../fe_utils/astreamer_zstd.c:133
+#: ../../fe_utils/astreamer_zstd.c:288
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "ця збірка не підтримує стиснення з %s"
@@ -94,7 +95,7 @@ msgstr "алгоритм стиснення \"%s\" не підтримує ре
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
-#: ../../common/controldata_utils.c:110 pg_basebackup.c:1873
+#: ../../common/controldata_utils.c:110 pg_basebackup.c:1874
 #: pg_receivewal.c:402
 #, c-format
 msgid "could not read file \"%s\": %m"
@@ -106,7 +107,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: bbstreamer_file.c:138 pg_recvlogical.c:650
+#: ../../fe_utils/astreamer_file.c:141 pg_recvlogical.c:653
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "неможливо закрити файл \"%s\": %m"
@@ -124,10 +125,10 @@ msgid "possible byte ordering mismatch\n"
 msgstr "можлива помилка у послідовності байтів.\n"
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: pg_basebackup.c:1846 pg_receivewal.c:386
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: pg_basebackup.c:1847 pg_receivewal.c:386
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
@@ -137,8 +138,8 @@ msgstr "не можливо відкрити файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488 pg_recvlogical.c:204
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510 pg_recvlogical.c:206
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
@@ -154,36 +155,36 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_receivewal.c:319 pg_recvlogical.c:352
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_receivewal.c:319 pg_recvlogical.c:354
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_receivewal.c:242
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #: pg_receivewal.c:471
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498 pg_basebackup.c:2344 walmethods.c:462
+#: ../../common/file_utils.c:520 pg_basebackup.c:2345 walmethods.c:462
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -218,191 +219,200 @@ msgstr "не вдалося перезапустити з обмеженим т
 msgid "could not get exit code from subprocess: error code %lu"
 msgstr "не вдалося отримати код завершення підпроцесу: код помилки %lu"
 
-#: ../../fe_utils/option_utils.c:69
-#, c-format
-msgid "invalid value \"%s\" for option %s"
-msgstr "неприпустиме значення \"%s\" для параметра %s"
-
-#: ../../fe_utils/option_utils.c:76
-#, c-format
-msgid "%s must be in range %d..%d"
-msgstr "%s має бути в діапазоні %d..%d"
-
-#: ../../fe_utils/option_utils.c:106
-#, c-format
-msgid "unrecognized sync method: %s"
-msgstr "нерозпізнаний метод синхронізації: %s"
-
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168 pg_basebackup.c:1636 streamutil.c:331
-#, c-format
-msgid "out of memory"
-msgstr "недостатньо пам'яті"
-
-#: ../../fe_utils/recovery_gen.c:143 bbstreamer_file.c:121
-#: bbstreamer_file.c:258 pg_basebackup.c:1433 pg_basebackup.c:1727
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "неможливо записати до файлу \"%s\": %m"
-
-#: ../../fe_utils/recovery_gen.c:152 bbstreamer_file.c:93 bbstreamer_file.c:361
-#: pg_basebackup.c:1497 pg_basebackup.c:1706
+#: ../../fe_utils/astreamer_file.c:96 ../../fe_utils/astreamer_file.c:364
+#: ../../fe_utils/recovery_gen.c:153 pg_basebackup.c:1498 pg_basebackup.c:1707
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "неможливо створити файл \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
-#, c-format
-msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
-msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
-
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/astreamer_file.c:124 ../../fe_utils/astreamer_file.c:261
+#: ../../fe_utils/recovery_gen.c:144 pg_basebackup.c:1434 pg_basebackup.c:1728
 #, c-format
-msgid "database name contains a newline or carriage return: \"%s\"\n"
-msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
+msgid "could not write to file \"%s\": %m"
+msgstr "неможливо записати до файлу \"%s\": %m"
 
-#: bbstreamer_file.c:275
+#: ../../fe_utils/astreamer_file.c:278
 #, c-format
 msgid "unexpected state while extracting archive"
 msgstr "неочікуваний стан під час розпакування архіву"
 
-#: bbstreamer_file.c:321 pg_basebackup.c:698 pg_basebackup.c:712
-#: pg_basebackup.c:757
+#: ../../fe_utils/astreamer_file.c:324 pg_basebackup.c:699 pg_basebackup.c:713
+#: pg_basebackup.c:758
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не вдалося створити каталог \"%s\": %m"
 
-#: bbstreamer_file.c:326
+#: ../../fe_utils/astreamer_file.c:329
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "не вдалося встановити права для каталогу \"%s\": %m"
 
-#: bbstreamer_file.c:345
+#: ../../fe_utils/astreamer_file.c:348
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "не вдалося створити символічне послання з \"%s\" на \"%s\": %m"
 
-#: bbstreamer_file.c:365
+#: ../../fe_utils/astreamer_file.c:368
 #, c-format
 msgid "could not set permissions on file \"%s\": %m"
 msgstr "не вдалося встановити права на файл \"%s\": %m"
 
-#: bbstreamer_gzip.c:95
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
 msgid "could not create compressed file \"%s\": %m"
 msgstr "не вдалося створити стиснутий файл \"%s\": %m"
 
-#: bbstreamer_gzip.c:103
+#: ../../fe_utils/astreamer_gzip.c:127
 #, c-format
 msgid "could not duplicate stdout: %m"
 msgstr "не вдалося дублювати stdout: %m"
 
-#: bbstreamer_gzip.c:107
+#: ../../fe_utils/astreamer_gzip.c:131
 #, c-format
 msgid "could not open output file: %m"
 msgstr "не вдалося відкрити вихідний файл: %m"
 
-#: bbstreamer_gzip.c:111
+#: ../../fe_utils/astreamer_gzip.c:135
 #, c-format
 msgid "could not set compression level %d: %s"
 msgstr "не вдалося встановити рівень стискання %d: %s"
 
-#: bbstreamer_gzip.c:143
+#: ../../fe_utils/astreamer_gzip.c:167
 #, c-format
 msgid "could not write to compressed file \"%s\": %s"
 msgstr "не вдалося записати до стиснутого файлу \"%s\": %s"
 
-#: bbstreamer_gzip.c:167
+#: ../../fe_utils/astreamer_gzip.c:191
 #, c-format
 msgid "could not close compressed file \"%s\": %m"
 msgstr "не вдалося закрити стиснутий файл \"%s\": %m"
 
-#: bbstreamer_gzip.c:245 walmethods.c:880
+#: ../../fe_utils/astreamer_gzip.c:269 walmethods.c:880
 #, c-format
 msgid "could not initialize compression library"
 msgstr "не вдалося ініціалізувати бібліотеку стискання"
 
-#: bbstreamer_gzip.c:296 bbstreamer_lz4.c:354 bbstreamer_zstd.c:329
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "не вдалося розпакувати дані: %s"
 
-#: bbstreamer_inject.c:189
-#, c-format
-msgid "unexpected state while injecting recovery settings"
-msgstr "неочікуваний стан під час введення налаштувань відновлення"
-
-#: bbstreamer_lz4.c:95
+#: ../../fe_utils/astreamer_lz4.c:97
 #, c-format
 msgid "could not create lz4 compression context: %s"
 msgstr "не вдалося створити контекст стиснення lz4: %s"
 
-#: bbstreamer_lz4.c:140
+#: ../../fe_utils/astreamer_lz4.c:142
 #, c-format
 msgid "could not write lz4 header: %s"
 msgstr "не вдалося записати заголовок lz4: %s"
 
-#: bbstreamer_lz4.c:189 bbstreamer_zstd.c:181 bbstreamer_zstd.c:223
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
 #, c-format
 msgid "could not compress data: %s"
 msgstr "не вдалося стиснути дані: %s"
 
-#: bbstreamer_lz4.c:241
+#: ../../fe_utils/astreamer_lz4.c:243
 #, c-format
 msgid "could not end lz4 compression: %s"
 msgstr "не вдалося закінчити стискання lz4: %s"
 
-#: bbstreamer_lz4.c:293
+#: ../../fe_utils/astreamer_lz4.c:295
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "не вдалося ініціалізувати бібліотеку стиснення: %s"
 
-#: bbstreamer_tar.c:244
+#: ../../fe_utils/astreamer_tar.c:244
 #, c-format
 msgid "tar file trailer exceeds 2 blocks"
 msgstr "причіп файлу tar перевищує 2 блоки"
 
-#: bbstreamer_tar.c:249
+#: ../../fe_utils/astreamer_tar.c:249
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "неочікуваний стан під час розбору архіву tar"
 
-#: bbstreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:292
 #, c-format
 msgid "tar member has empty name"
 msgstr "частина tar містить порожню назву"
 
-#: bbstreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:326
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "потік COPY завершився до завершення останнього файлу"
 
-#: bbstreamer_zstd.c:85
+#: ../../fe_utils/astreamer_zstd.c:89
 #, c-format
 msgid "could not create zstd compression context"
 msgstr "не вдалося створити контекст стиснення zstd"
 
-#: bbstreamer_zstd.c:91
+#: ../../fe_utils/astreamer_zstd.c:95
 #, c-format
 msgid "could not set zstd compression level to %d: %s"
 msgstr "не вдалося встановити рівень стискання zstd на %d: %s"
 
-#: bbstreamer_zstd.c:105
+#: ../../fe_utils/astreamer_zstd.c:109
 #, c-format
 msgid "could not set compression worker count to %d: %s"
 msgstr "не вдалося встановити кількість процесів стискання на %d: %s"
 
-#: bbstreamer_zstd.c:116
+#: ../../fe_utils/astreamer_zstd.c:120
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "не вдалося включити режим довгої відстані: %s"
 
-#: bbstreamer_zstd.c:275
+#: ../../fe_utils/astreamer_zstd.c:279
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "не вдалося створити контекст zstd декомпресії"
 
+#: ../../fe_utils/option_utils.c:69
+#, c-format
+msgid "invalid value \"%s\" for option %s"
+msgstr "неприпустиме значення \"%s\" для параметра %s"
+
+#: ../../fe_utils/option_utils.c:76
+#, c-format
+msgid "%s must be in range %d..%d"
+msgstr "%s має бути в діапазоні %d..%d"
+
+#: ../../fe_utils/option_utils.c:106
+#, c-format
+msgid "unrecognized sync method: %s"
+msgstr "нерозпізнаний метод синхронізації: %s"
+
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
+#: pg_basebackup.c:1637
+#, c-format
+msgid "out of memory"
+msgstr "недостатньо пам'яті"
+
+#: ../../fe_utils/recovery_gen.c:215 pg_basebackup.c:2249 streamutil.c:89
+#: streamutil.c:204
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
+
+#: ../../fe_utils/string_utils.c:760
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
+
+#: astreamer_inject.c:189
+#, c-format
+msgid "unexpected state while injecting recovery settings"
+msgstr "неочікуваний стан під час введення налаштувань відновлення"
+
 #: pg_basebackup.c:245
 #, c-format
 msgid "removing data directory \"%s\""
@@ -488,14 +498,14 @@ msgstr "новий каталог не є абсолютним шляхом у 
 msgid "%s takes a base backup of a running PostgreSQL server.\n\n"
 msgstr "%s робить базову резервну копію працюючого сервера PostgreSQL.\n\n"
 
-#: pg_basebackup.c:394 pg_createsubscriber.c:221 pg_receivewal.c:79
-#: pg_recvlogical.c:86
+#: pg_basebackup.c:394 pg_createsubscriber.c:246 pg_receivewal.c:79
+#: pg_recvlogical.c:85
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_basebackup.c:395 pg_createsubscriber.c:222 pg_receivewal.c:80
-#: pg_recvlogical.c:87
+#: pg_basebackup.c:395 pg_createsubscriber.c:247 pg_receivewal.c:80
+#: pg_recvlogical.c:86
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s: [OPTION]...\n"
@@ -625,12 +635,12 @@ msgstr "  -P, --progress         відображати інформацію п
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
 msgstr "  -S, --slot=ИМ'Я_СЛОТА   використовувати вказаний слот реплікації\n"
 
-#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:108
+#: pg_basebackup.c:425 pg_receivewal.c:91 pg_recvlogical.c:110
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          виводити детальні повідомлення\n"
 
-#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:109
+#: pg_basebackup.c:426 pg_receivewal.c:92 pg_recvlogical.c:111
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
@@ -678,12 +688,12 @@ msgid "      --sync-method=METHOD\n"
 msgstr "      --sync-method=METHOD\n"
 "                         встановити метод синхронізації файлів на диск\n"
 
-#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:110
+#: pg_basebackup.c:438 pg_receivewal.c:95 pg_recvlogical.c:112
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help              показати цю довідку потім вийти\n"
 
-#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:111
+#: pg_basebackup.c:439 pg_receivewal.c:96 pg_recvlogical.c:113
 #, c-format
 msgid "\n"
 "Connection options:\n"
@@ -695,12 +705,12 @@ msgstr "\n"
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONNSTR    рядок з'єднання\n"
 
-#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:113
+#: pg_basebackup.c:441 pg_receivewal.c:98 pg_recvlogical.c:115
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME   хост сервера бази даних або каталог сокетів\n"
 
-#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:114
+#: pg_basebackup.c:442 pg_receivewal.c:99 pg_recvlogical.c:116
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT      порт сервера бази даних\n"
@@ -711,31 +721,31 @@ msgid "  -s, --status-interval=INTERVAL\n"
 "                         time between status packets sent to server (in seconds)\n"
 msgstr "  -s, --status-interval=INTERVAL        часу між пакетами статусу до сервера (у секундах)\n"
 
-#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:115
+#: pg_basebackup.c:445 pg_receivewal.c:100 pg_recvlogical.c:117
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME      підключатись як вказаний користувач бази даних\n"
 
-#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:116
+#: pg_basebackup.c:446 pg_receivewal.c:101 pg_recvlogical.c:118
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password    ніколи не питати пароль\n"
 
-#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:117
+#: pg_basebackup.c:447 pg_receivewal.c:102 pg_recvlogical.c:119
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password       обов'язково питати пароль (повинно відбуватися автоматично)\n"
 
-#: pg_basebackup.c:448 pg_createsubscriber.c:240 pg_receivewal.c:106
-#: pg_recvlogical.c:118
+#: pg_basebackup.c:448 pg_createsubscriber.c:270 pg_receivewal.c:106
+#: pg_recvlogical.c:120
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_basebackup.c:449 pg_createsubscriber.c:241 pg_receivewal.c:107
-#: pg_recvlogical.c:119
+#: pg_basebackup.c:449 pg_createsubscriber.c:271 pg_receivewal.c:107
+#: pg_recvlogical.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
@@ -745,8 +755,8 @@ msgstr "Домашня сторінка %s: <%s>\n"
 msgid "could not read from ready pipe: %m"
 msgstr "не можливо прочитати з готових каналів: %m"
 
-#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2258
-#: streamutil.c:518
+#: pg_basebackup.c:491 pg_basebackup.c:633 pg_basebackup.c:2259
+#: streamutil.c:450
 #, c-format
 msgid "could not parse write-ahead log location \"%s\""
 msgstr "не вдалося проаналізувати наперед журнал локації \"%s\""
@@ -761,37 +771,37 @@ msgstr "не можливо закінчити написання файлів W
 msgid "could not create pipe for background process: %m"
 msgstr "не можливо створити канал для фонового процесу: %m"
 
-#: pg_basebackup.c:676
+#: pg_basebackup.c:677
 #, c-format
 msgid "created temporary replication slot \"%s\""
 msgstr "створено слот тимчасових реплікацій \"%s\""
 
-#: pg_basebackup.c:679
+#: pg_basebackup.c:680
 #, c-format
 msgid "created replication slot \"%s\""
 msgstr "створено слот реплікацій \"%s\""
 
-#: pg_basebackup.c:728
+#: pg_basebackup.c:729
 #, c-format
 msgid "could not create background process: %m"
 msgstr "не можливо створити фоновий процес: %m"
 
-#: pg_basebackup.c:737
+#: pg_basebackup.c:738
 #, c-format
 msgid "could not create background thread: %m"
 msgstr "не можливо створити фоновий потік: %m"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:777
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" існує, але він не порожній"
 
-#: pg_basebackup.c:782 pg_createsubscriber.c:390
+#: pg_basebackup.c:783 pg_createsubscriber.c:420
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "немає доступу до каталогу \"%s\": %m"
 
-#: pg_basebackup.c:858
+#: pg_basebackup.c:859
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
@@ -800,7 +810,7 @@ msgstr[1] "%*s/%s kB (100%%), %d/%d табличних простори %*s"
 msgstr[2] "%*s/%s kB (100%%), %d/%d табличних просторів %*s"
 msgstr[3] "%*s/%s kB (100%%), %d/%d табличних просторів %*s"
 
-#: pg_basebackup.c:870
+#: pg_basebackup.c:871
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
@@ -809,7 +819,7 @@ msgstr[1] "%*s/%s kB (%d%%), %d/%d табличних простори (%s%-*.*s
 msgstr[2] "%*s/%s kB (%d%%), %d/%d табличних просторів (%s%-*.*s)"
 msgstr[3] "%*s/%s kB (%d%%), %d/%d табличних просторів (%s%-*.*s)"
 
-#: pg_basebackup.c:886
+#: pg_basebackup.c:887
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
@@ -818,1072 +828,1182 @@ msgstr[1] "%*s/%s kB (%d%%), %d/%d табличних простори"
 msgstr[2] "%*s/%s kB (%d%%), %d/%d табличних просторів"
 msgstr[3] "%*s/%s kB (%d%%), %d/%d табличних просторів"
 
-#: pg_basebackup.c:910
+#: pg_basebackup.c:911
 #, c-format
 msgid "transfer rate \"%s\" is not a valid value"
 msgstr "частота передач \"%s\" не є припустимим значенням"
 
-#: pg_basebackup.c:912
+#: pg_basebackup.c:913
 #, c-format
 msgid "invalid transfer rate \"%s\": %m"
 msgstr "неприпустима частота передач \"%s\": %m"
 
-#: pg_basebackup.c:919
+#: pg_basebackup.c:920
 #, c-format
 msgid "transfer rate must be greater than zero"
 msgstr "частота передач повинна бути більша за нуль"
 
-#: pg_basebackup.c:949
+#: pg_basebackup.c:950
 #, c-format
 msgid "invalid --max-rate unit: \"%s\""
 msgstr "неприпустима одиниця виміру в --max-rate: \"%s\""
 
-#: pg_basebackup.c:953
+#: pg_basebackup.c:954
 #, c-format
 msgid "transfer rate \"%s\" exceeds integer range"
 msgstr "швидкість передачі \"%s\" перевищує діапазон цілого числа"
 
-#: pg_basebackup.c:960
+#: pg_basebackup.c:961
 #, c-format
 msgid "transfer rate \"%s\" is out of range"
 msgstr "швидкість передавання \"%s\" поза діапазоном"
 
-#: pg_basebackup.c:1022
+#: pg_basebackup.c:1023
 #, c-format
 msgid "could not get COPY data stream: %s"
 msgstr "не вдалося отримати потік даних COPY: %s"
 
-#: pg_basebackup.c:1039 pg_recvlogical.c:449 pg_recvlogical.c:625
-#: receivelog.c:973
+#: pg_basebackup.c:1040 pg_recvlogical.c:451 pg_recvlogical.c:627
+#: receivelog.c:980
 #, c-format
 msgid "could not read COPY data: %s"
 msgstr "не вдалося прочитати дані COPY: %s"
 
-#: pg_basebackup.c:1043
+#: pg_basebackup.c:1044
 #, c-format
 msgid "background process terminated unexpectedly"
 msgstr "фоновий процес несподівано перервано"
 
-#: pg_basebackup.c:1114
+#: pg_basebackup.c:1115
 #, c-format
 msgid "cannot inject manifest into a compressed tar file"
 msgstr "неможливо підставити маніфест в стиснений tar-файл"
 
-#: pg_basebackup.c:1115
+#: pg_basebackup.c:1116
 #, c-format
 msgid "Use client-side compression, send the output to a directory rather than standard output, or use %s."
 msgstr "Використайте стиснення на клієнті та відправлення даних в каталог замість стандартного виводу, або використайте %s."
 
-#: pg_basebackup.c:1131
+#: pg_basebackup.c:1132
 #, c-format
 msgid "cannot parse archive \"%s\""
 msgstr "неможливо розібрати архів \"%s\""
 
-#: pg_basebackup.c:1132
+#: pg_basebackup.c:1133
 #, c-format
 msgid "Only tar archives can be parsed."
 msgstr "Тільки архів tar може бути проаналізований."
 
-#: pg_basebackup.c:1134
+#: pg_basebackup.c:1135
 #, c-format
 msgid "Plain format requires pg_basebackup to parse the archive."
 msgstr "Простий формат потребує обробки архіву в pg_basebackup для обробки."
 
-#: pg_basebackup.c:1136
+#: pg_basebackup.c:1137
 #, c-format
 msgid "Using - as the output directory requires pg_basebackup to parse the archive."
 msgstr "Використання - в якості вихідного каталогу потребує pg_basebackup для аналізу архіву."
 
-#: pg_basebackup.c:1138
+#: pg_basebackup.c:1139
 #, c-format
 msgid "The -R option requires pg_basebackup to parse the archive."
 msgstr "Параметр -R потребує використання pg_basebackup для аналізу архіву."
 
-#: pg_basebackup.c:1357
+#: pg_basebackup.c:1358
 #, c-format
 msgid "archives must precede manifest"
 msgstr "архіви повинні передувати маніфесту"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1373
 #, c-format
 msgid "invalid archive name: \"%s\""
 msgstr "неприпустиме ім'я архіву: \"%s\""
 
-#: pg_basebackup.c:1444
+#: pg_basebackup.c:1445
 #, c-format
 msgid "unexpected payload data"
 msgstr "неочікувані дані корисного навантаження"
 
-#: pg_basebackup.c:1587
+#: pg_basebackup.c:1588
 #, c-format
 msgid "empty COPY message"
 msgstr "порожнє повідомлення COPY"
 
-#: pg_basebackup.c:1589
+#: pg_basebackup.c:1590
 #, c-format
 msgid "malformed COPY message of type %d, length %zu"
 msgstr "неправильне повідомлення COPY з типом %d, довжина %zu"
 
-#: pg_basebackup.c:1789
+#: pg_basebackup.c:1790
 #, c-format
 msgid "incompatible server version %s"
 msgstr "несумісна версія серверу %s"
 
-#: pg_basebackup.c:1805
+#: pg_basebackup.c:1806
 #, c-format
 msgid "Use -X none or -X fetch to disable log streaming."
 msgstr "Використайте -X none або -X fetch, щоб вимкнути потокову передачу журналу."
 
-#: pg_basebackup.c:1841
+#: pg_basebackup.c:1842
 #, c-format
 msgid "server does not support incremental backup"
 msgstr "сервер не підтримує інкрементне резервне копіювання"
 
-#: pg_basebackup.c:1850 pg_basebackup.c:2008 pg_recvlogical.c:272
-#: receivelog.c:543 receivelog.c:582 streamutil.c:364 streamutil.c:438
-#: streamutil.c:490 streamutil.c:578 streamutil.c:730 streamutil.c:775
+#: pg_basebackup.c:1851 pg_basebackup.c:2009 pg_recvlogical.c:274
+#: receivelog.c:542 receivelog.c:581 streamutil.c:296 streamutil.c:370
+#: streamutil.c:422 streamutil.c:510 streamutil.c:667 streamutil.c:712
 #, c-format
 msgid "could not send replication command \"%s\": %s"
 msgstr "не вдалося відправити реплікаційну команду \"%s\": %s"
 
-#: pg_basebackup.c:1856 pg_basebackup.c:1883
+#: pg_basebackup.c:1857 pg_basebackup.c:1884
 #, c-format
 msgid "could not upload manifest: %s"
 msgstr "не вдалося завантажити маніфест: %s"
 
-#: pg_basebackup.c:1859 pg_basebackup.c:1886
+#: pg_basebackup.c:1860 pg_basebackup.c:1887
 #, c-format
 msgid "could not upload manifest: unexpected status %s"
 msgstr "не вдалося завантажити маніфест: неочікуваний статус %s"
 
-#: pg_basebackup.c:1867
+#: pg_basebackup.c:1868
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "не вдалося надіслати дані COPY: %s"
 
-#: pg_basebackup.c:1877
+#: pg_basebackup.c:1878
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "не вдалося надіслати сповіщення про закінчення копіювання: %s"
 
-#: pg_basebackup.c:1892
+#: pg_basebackup.c:1893
 #, c-format
 msgid "unexpected extra result while sending manifest"
 msgstr "несподіваний додатковий результат під час надсилання маніфесту"
 
-#: pg_basebackup.c:1950
+#: pg_basebackup.c:1951
 #, c-format
 msgid "backup targets are not supported by this server version"
 msgstr "цілі резервного копіювання не підтримуються цією версією сервера"
 
-#: pg_basebackup.c:1953
+#: pg_basebackup.c:1954
 #, c-format
 msgid "recovery configuration cannot be written when a backup target is used"
 msgstr "конфігурація відновлення не може бути записана під час використання цілі резервного копіювання"
 
-#: pg_basebackup.c:1980
+#: pg_basebackup.c:1981
 #, c-format
 msgid "server does not support server-side compression"
 msgstr "сервер не підтримує стиснення на сервері"
 
-#: pg_basebackup.c:1990
+#: pg_basebackup.c:1991
 #, c-format
 msgid "initiating base backup, waiting for checkpoint to complete"
 msgstr "початок базового резервного копіювання, очікується завершення контрольної точки"
 
-#: pg_basebackup.c:1994
+#: pg_basebackup.c:1995
 #, c-format
 msgid "waiting for checkpoint"
 msgstr "очікування контрольної точки"
 
-#: pg_basebackup.c:2016
+#: pg_basebackup.c:2017
 #, c-format
 msgid "could not initiate base backup: %s"
 msgstr "не вдалося почати базове резервне копіювання: %s"
 
-#: pg_basebackup.c:2019
+#: pg_basebackup.c:2020
 #, c-format
 msgid "server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "сервер повернув неочікувану відповідь на команду BASE_BACKUP; отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
 
-#: pg_basebackup.c:2025
+#: pg_basebackup.c:2026
 #, c-format
 msgid "checkpoint completed"
 msgstr "контрольна точка завершена"
 
-#: pg_basebackup.c:2039
+#: pg_basebackup.c:2040
 #, c-format
 msgid "write-ahead log start point: %s on timeline %u"
 msgstr "стартова точка у випереджувальному журналюванні: %s на часовій шкалі %u"
 
-#: pg_basebackup.c:2047
+#: pg_basebackup.c:2048
 #, c-format
 msgid "could not get backup header: %s"
 msgstr "не вдалося отримати заголовок резервної копії: %s"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2051
 #, c-format
 msgid "no data returned from server"
 msgstr "сервер не повернув дані"
 
-#: pg_basebackup.c:2093
+#: pg_basebackup.c:2094
 #, c-format
 msgid "can only write single tablespace to stdout, database has %d"
 msgstr "можна записати лише один табличний простір в stdout, всього їх в базі даних %d"
 
-#: pg_basebackup.c:2106
+#: pg_basebackup.c:2107
 #, c-format
 msgid "starting background WAL receiver"
 msgstr "запуск фонового процесу зчитування WAL"
 
-#: pg_basebackup.c:2189
+#: pg_basebackup.c:2190
 #, c-format
 msgid "backup failed: %s"
 msgstr "помилка резервного копіювання: %s"
 
-#: pg_basebackup.c:2192
+#: pg_basebackup.c:2193
 #, c-format
 msgid "no write-ahead log end position returned from server"
 msgstr "сервер не повернув кінцеву позицію у випереджувальному журналюванні"
 
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2196
 #, c-format
 msgid "write-ahead log end point: %s"
 msgstr "кінцева точка у випереджувальному журналюванні: %s"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2207
 #, c-format
 msgid "checksum error occurred"
 msgstr "сталася помилка контрольної суми"
 
-#: pg_basebackup.c:2211
+#: pg_basebackup.c:2212
 #, c-format
 msgid "final receive failed: %s"
 msgstr "помилка в кінці передачі: %s"
 
-#: pg_basebackup.c:2235
+#: pg_basebackup.c:2236
 #, c-format
 msgid "waiting for background process to finish streaming ..."
 msgstr "очікування завершення потокового передавання фоновим процесом ..."
 
-#: pg_basebackup.c:2239
+#: pg_basebackup.c:2240
 #, c-format
 msgid "could not send command to background pipe: %m"
 msgstr "не вдалося надіслати команду до канала фонового процесу: %m"
 
-#: pg_basebackup.c:2244
+#: pg_basebackup.c:2245
 #, c-format
 msgid "could not wait for child process: %m"
 msgstr "збій при очікуванні дочірнього процесу: %m"
 
-#: pg_basebackup.c:2246
+#: pg_basebackup.c:2247
 #, c-format
 msgid "child %d died, expected %d"
 msgstr "завершився дочірній процес %d, очікувалося %d"
 
-#: pg_basebackup.c:2248 streamutil.c:89 streamutil.c:204 streamutil.c:316
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_basebackup.c:2268
+#: pg_basebackup.c:2269
 #, c-format
 msgid "could not wait for child thread: %m"
 msgstr "неможливо дочекатися дочірнього потоку: %m"
 
-#: pg_basebackup.c:2273
+#: pg_basebackup.c:2274
 #, c-format
 msgid "could not get child thread exit status: %m"
 msgstr "не можливо отримати статус завершення дочірнього потоку: %m"
 
-#: pg_basebackup.c:2276
+#: pg_basebackup.c:2277
 #, c-format
 msgid "child thread exited with error %u"
 msgstr "дочірній потік завершився з помилкою %u"
 
-#: pg_basebackup.c:2305
+#: pg_basebackup.c:2306
 #, c-format
 msgid "syncing data to disk ..."
 msgstr "синхронізація даних з диском ..."
 
-#: pg_basebackup.c:2330
+#: pg_basebackup.c:2331
 #, c-format
 msgid "renaming backup_manifest.tmp to backup_manifest"
 msgstr "перейменування backup_manifest.tmp в backup_manifest"
 
-#: pg_basebackup.c:2350
+#: pg_basebackup.c:2351
 #, c-format
 msgid "base backup completed"
 msgstr "базове резервне копіювання завершено"
 
-#: pg_basebackup.c:2436
+#: pg_basebackup.c:2437
 #, c-format
 msgid "invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\""
 msgstr "неприпустимий аргумент контрольної точки \"%s\", повинен бути \"fast\" або \"spread\""
 
-#: pg_basebackup.c:2454
+#: pg_basebackup.c:2455
 #, c-format
 msgid "invalid output format \"%s\", must be \"plain\" or \"tar\""
 msgstr "неприпустимий формат виводу \"%s\", повинен бути \"plain\" або \"tar\""
 
-#: pg_basebackup.c:2535
+#: pg_basebackup.c:2536
 #, c-format
 msgid "invalid wal-method option \"%s\", must be \"fetch\", \"stream\", or \"none\""
 msgstr "неприпустимий параметр wal-method \"%s\", повинен бути \"fetch\", \"stream\" або \"none\""
 
-#: pg_basebackup.c:2574 pg_basebackup.c:2586 pg_basebackup.c:2608
-#: pg_basebackup.c:2620 pg_basebackup.c:2626 pg_basebackup.c:2678
-#: pg_basebackup.c:2689 pg_basebackup.c:2699 pg_basebackup.c:2705
-#: pg_basebackup.c:2712 pg_basebackup.c:2724 pg_basebackup.c:2736
-#: pg_basebackup.c:2744 pg_basebackup.c:2757 pg_basebackup.c:2763
-#: pg_basebackup.c:2772 pg_basebackup.c:2784 pg_basebackup.c:2795
-#: pg_basebackup.c:2803 pg_createsubscriber.c:2037 pg_createsubscriber.c:2047
-#: pg_createsubscriber.c:2055 pg_createsubscriber.c:2083
-#: pg_createsubscriber.c:2115 pg_receivewal.c:748 pg_receivewal.c:760
-#: pg_receivewal.c:767 pg_receivewal.c:776 pg_receivewal.c:783
-#: pg_receivewal.c:793 pg_recvlogical.c:853 pg_recvlogical.c:865
-#: pg_recvlogical.c:875 pg_recvlogical.c:882 pg_recvlogical.c:889
-#: pg_recvlogical.c:896 pg_recvlogical.c:903 pg_recvlogical.c:910
-#: pg_recvlogical.c:917 pg_recvlogical.c:924
+#: pg_basebackup.c:2575 pg_basebackup.c:2587 pg_basebackup.c:2609
+#: pg_basebackup.c:2621 pg_basebackup.c:2627 pg_basebackup.c:2679
+#: pg_basebackup.c:2690 pg_basebackup.c:2700 pg_basebackup.c:2706
+#: pg_basebackup.c:2713 pg_basebackup.c:2725 pg_basebackup.c:2737
+#: pg_basebackup.c:2745 pg_basebackup.c:2758 pg_basebackup.c:2764
+#: pg_basebackup.c:2773 pg_basebackup.c:2785 pg_basebackup.c:2796
+#: pg_basebackup.c:2804 pg_createsubscriber.c:2238 pg_createsubscriber.c:2261
+#: pg_createsubscriber.c:2271 pg_createsubscriber.c:2279
+#: pg_createsubscriber.c:2307 pg_createsubscriber.c:2350 pg_receivewal.c:748
+#: pg_receivewal.c:760 pg_receivewal.c:767 pg_receivewal.c:776
+#: pg_receivewal.c:783 pg_receivewal.c:793 pg_recvlogical.c:861
+#: pg_recvlogical.c:873 pg_recvlogical.c:883 pg_recvlogical.c:890
+#: pg_recvlogical.c:897 pg_recvlogical.c:904 pg_recvlogical.c:911
+#: pg_recvlogical.c:918 pg_recvlogical.c:925 pg_recvlogical.c:934
+#: pg_recvlogical.c:941
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_basebackup.c:2584 pg_createsubscriber.c:2045 pg_receivewal.c:758
-#: pg_recvlogical.c:863
+#: pg_basebackup.c:2585 pg_createsubscriber.c:2269 pg_receivewal.c:758
+#: pg_recvlogical.c:871
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_basebackup.c:2607
+#: pg_basebackup.c:2608
 #, c-format
 msgid "cannot specify both format and backup target"
 msgstr "неможливо одночасно вказати формат і ціль резервного копіювання"
 
-#: pg_basebackup.c:2619
+#: pg_basebackup.c:2620
 #, c-format
 msgid "must specify output directory or backup target"
 msgstr "потрібно вказати вихідний каталог або ціль резервного копіювання"
 
-#: pg_basebackup.c:2625
+#: pg_basebackup.c:2626
 #, c-format
 msgid "cannot specify both output directory and backup target"
 msgstr "неможливо одночасно вказати вихідну директорію і ціль резервного копіювання"
 
-#: pg_basebackup.c:2655 pg_receivewal.c:802
+#: pg_basebackup.c:2656 pg_receivewal.c:802
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм стискання: \"%s\""
 
-#: pg_basebackup.c:2661 pg_receivewal.c:809
+#: pg_basebackup.c:2662 pg_receivewal.c:809
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неприпустима специфікація стискання: %s"
 
-#: pg_basebackup.c:2677
+#: pg_basebackup.c:2678
 #, c-format
 msgid "client-side compression is not possible when a backup target is specified"
 msgstr "стиснення на стороні клієнта неможливе, коли вказана ціль резервного копіювання"
 
-#: pg_basebackup.c:2688
+#: pg_basebackup.c:2689
 #, c-format
 msgid "only tar mode backups can be compressed"
 msgstr "лише резервні копії в архіві tar можуть стискатись"
 
-#: pg_basebackup.c:2698
+#: pg_basebackup.c:2699
 #, c-format
 msgid "WAL cannot be streamed when a backup target is specified"
 msgstr "неможливо передавати WAL, коли вказана ціль резервного копіювання"
 
-#: pg_basebackup.c:2704
+#: pg_basebackup.c:2705
 #, c-format
 msgid "cannot stream write-ahead logs in tar mode to stdout"
 msgstr "транслювати випереджувальні журналювання в режимі tar в потік stdout не можна"
 
-#: pg_basebackup.c:2711
+#: pg_basebackup.c:2712
 #, c-format
 msgid "replication slots can only be used with WAL streaming"
 msgstr "слоти реплікації можуть використовуватись тільки з потоковим передаванням WAL"
 
-#: pg_basebackup.c:2723
+#: pg_basebackup.c:2724
 #, c-format
 msgid "--no-slot cannot be used with slot name"
 msgstr "--no-slot не можна використовувати з іменем слота"
 
 #. translator: second %s is an option name
-#: pg_basebackup.c:2734 pg_receivewal.c:774
+#: pg_basebackup.c:2735 pg_receivewal.c:774
 #, c-format
 msgid "%s needs a slot to be specified using --slot"
 msgstr "для %s потрібно вказати слот за допомогою --slot"
 
-#: pg_basebackup.c:2742 pg_basebackup.c:2782 pg_basebackup.c:2793
-#: pg_basebackup.c:2801
+#: pg_basebackup.c:2743 pg_basebackup.c:2783 pg_basebackup.c:2794
+#: pg_basebackup.c:2802
 #, c-format
 msgid "%s and %s are incompatible options"
 msgstr "параметри %s і %s несумісні"
 
-#: pg_basebackup.c:2756
+#: pg_basebackup.c:2757
 #, c-format
 msgid "WAL directory location cannot be specified along with a backup target"
 msgstr "Не можна вказати розташування директорії WAL разом з ціллю резервного копіювання"
 
-#: pg_basebackup.c:2762
+#: pg_basebackup.c:2763
 #, c-format
 msgid "WAL directory location can only be specified in plain mode"
 msgstr "розташування каталога WAL можна вказати лише в режимі plain"
 
-#: pg_basebackup.c:2771
+#: pg_basebackup.c:2772
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "розташування WAL каталогу має бути абсолютним шляхом"
 
-#: pg_basebackup.c:2871
+#: pg_basebackup.c:2872
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не вдалося створити символічне послання \"%s\": %m"
 
-#: pg_createsubscriber.c:169
+#: pg_createsubscriber.c:189
 #, c-format
 msgid "failed after the end of recovery"
 msgstr "помилка після закінчення відновлення"
 
-#: pg_createsubscriber.c:170
+#: pg_createsubscriber.c:190
 #, c-format
 msgid "The target server cannot be used as a physical replica anymore.  You must recreate the physical replica before continuing."
 msgstr "Цільовий сервер не можна більше використовувати як фізичну репліку. Перед продовженням вам слід відтворити фізичну репліку."
 
-#: pg_createsubscriber.c:198
+#: pg_createsubscriber.c:221
 #, c-format
 msgid "publication \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "публікація \"%s\" створена в базі даних \"%s\" на основному кластері залишилася позаду"
 
-#: pg_createsubscriber.c:200
+#: pg_createsubscriber.c:224
 #, c-format
 msgid "Drop this publication before trying again."
 msgstr "Видаліть цю публікацію перед тим, як спробувати знову."
 
-#: pg_createsubscriber.c:204
+#: pg_createsubscriber.c:228
 #, c-format
 msgid "replication slot \"%s\" created in database \"%s\" on primary was left behind"
 msgstr "слот реплікації \"%s\" створений в базі даних \"%s\" на основному кластері залишився позаду"
 
-#: pg_createsubscriber.c:206 pg_createsubscriber.c:1260
+#: pg_createsubscriber.c:231 pg_createsubscriber.c:1324
 #, c-format
 msgid "Drop this replication slot soon to avoid retention of WAL files."
 msgstr "Видаліть цей слот реплікації найближчим часом, щоб уникнути збереження файлів WAL."
 
-#: pg_createsubscriber.c:219
+#: pg_createsubscriber.c:244
 #, c-format
 msgid "%s creates a new logical replica from a standby server.\n\n"
 msgstr "%s створює нову логічну репліку з резервного сервера.\n\n"
 
-#: pg_createsubscriber.c:223 pg_receivewal.c:81 pg_recvlogical.c:92
+#: pg_createsubscriber.c:248 pg_receivewal.c:81 pg_recvlogical.c:91
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_createsubscriber.c:224
+#: pg_createsubscriber.c:249
+#, c-format
+msgid "  -a, --all                       create subscriptions for all databases except template\n"
+"                                  databases and databases that don't allow connections\n"
+msgstr "  -a, --all                       створити підписки для всіх баз даних окрім шаблонних\n"
+"                                  баз даних і баз, які не дозволяють підключення\n"
+
+#: pg_createsubscriber.c:251
 #, c-format
 msgid "  -d, --database=DBNAME           database in which to create a subscription\n"
 msgstr "  -d, --database=DBNAME           база даних для створення підписки\n"
 
-#: pg_createsubscriber.c:225
+#: pg_createsubscriber.c:252
 #, c-format
 msgid "  -D, --pgdata=DATADIR            location for the subscriber data directory\n"
 msgstr "  -D, --pgdata=DATADIR            розташування каталогу даних підписника\n"
 
-#: pg_createsubscriber.c:226
+#: pg_createsubscriber.c:253
 #, c-format
 msgid "  -n, --dry-run                   dry run, just show what would be done\n"
 msgstr "  -n, --dry-run                   сухий запуск, просто показати, що буде зроблено\n"
 
-#: pg_createsubscriber.c:227
+#: pg_createsubscriber.c:254
 #, c-format
 msgid "  -p, --subscriber-port=PORT      subscriber port number (default %s)\n"
 msgstr "  -p, --subscriber-port=PORT      номер порту підписника (за замовчуванням %s)\n"
 
-#: pg_createsubscriber.c:228
+#: pg_createsubscriber.c:255
 #, c-format
 msgid "  -P, --publisher-server=CONNSTR  publisher connection string\n"
 msgstr "  -P, --publisher-server=CONNSTR  рядок підключення видавця\n"
 
-#: pg_createsubscriber.c:229
+#: pg_createsubscriber.c:256
 #, c-format
 msgid "  -s, --socketdir=DIR             socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=DIR           директорія сокету для використання (за замовчування поточна директорія)\n"
 
-#: pg_createsubscriber.c:230
+#: pg_createsubscriber.c:257
 #, c-format
 msgid "  -t, --recovery-timeout=SECS     seconds to wait for recovery to end\n"
 msgstr "  -t, --recovery-timeout=SECS     секунд для очікування кінця відновлення\n"
 
-#: pg_createsubscriber.c:231
+#: pg_createsubscriber.c:258
+#, c-format
+msgid "  -T, --enable-two-phase          enable two-phase commit for all subscriptions\n"
+msgstr "  -T, --enable-two-phase          увімкнути двофазний коміт для всіх підписок\n"
+
+#: pg_createsubscriber.c:259
 #, c-format
 msgid "  -U, --subscriber-username=NAME  user name for subscriber connection\n"
 msgstr "  -U, --subscriber-username=NAME  користувач для під'єднання підписника\n"
 
-#: pg_createsubscriber.c:232
+#: pg_createsubscriber.c:260
 #, c-format
 msgid "  -v, --verbose                   output verbose messages\n"
 msgstr "  -v, --verbose                   виводити детальні повідомлення\n"
 
-#: pg_createsubscriber.c:233
+#: pg_createsubscriber.c:261
+#, c-format
+msgid "      --clean=OBJECTTYPE          drop all objects of the specified type from specified\n"
+"                                  databases on the subscriber; accepts: \"%s\"\n"
+msgstr "      --clean=OBJECTTYPE          видалити всі об'єкти вказаного типу зі вказаних\n"
+"                                  баз даних на підписнику; приймає: \"%s\"\n"
+
+#: pg_createsubscriber.c:263
 #, c-format
 msgid "      --config-file=FILENAME      use specified main server configuration\n"
 "                                  file when running target cluster\n"
 msgstr "      --config-file=FILENAME      використовувати заданий основний файл конфігурації сервера\n"
 "                                 при запуску цільового кластера\n"
 
-#: pg_createsubscriber.c:235
+#: pg_createsubscriber.c:265
 #, c-format
 msgid "      --publication=NAME          publication name\n"
 msgstr "      --publication=NAME          назва публікації\n"
 
-#: pg_createsubscriber.c:236
+#: pg_createsubscriber.c:266
 #, c-format
 msgid "      --replication-slot=NAME     replication slot name\n"
 msgstr "      --replication-slot=NAME     назва слота реплікації\n"
 
-#: pg_createsubscriber.c:237
+#: pg_createsubscriber.c:267
 #, c-format
 msgid "      --subscription=NAME         subscription name\n"
 msgstr "      --subscription=NAME         назва підписки\n"
 
-#: pg_createsubscriber.c:238
+#: pg_createsubscriber.c:268
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                  вивести інформацію про версію і вийти\n"
 
-#: pg_createsubscriber.c:239
+#: pg_createsubscriber.c:269
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показати цю справку, потім вийти\n"
 
-#: pg_createsubscriber.c:282
+#: pg_createsubscriber.c:312
 #, c-format
 msgid "could not parse connection string: %s"
 msgstr "не вдалося аналізувати рядок підключення: %s"
 
-#: pg_createsubscriber.c:359
+#: pg_createsubscriber.c:389
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\""
 
-#: pg_createsubscriber.c:362
+#: pg_createsubscriber.c:392
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s"
 
-#: pg_createsubscriber.c:382
+#: pg_createsubscriber.c:412
 #, c-format
 msgid "checking if directory \"%s\" is a cluster data directory"
 msgstr "перевірка чи каталог \"%s\" є каталогом даних кластера"
 
-#: pg_createsubscriber.c:388
+#: pg_createsubscriber.c:418
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "каталог даних \"%s\" не існує"
 
-#: pg_createsubscriber.c:396
+#: pg_createsubscriber.c:426
 #, c-format
 msgid "directory \"%s\" is not a database cluster directory"
 msgstr "каталог \"%s\" не є каталогом кластера бази даних"
 
-#: pg_createsubscriber.c:513
+#: pg_createsubscriber.c:544
 #, c-format
 msgid "connection to database failed: %s"
 msgstr "помилка підключення до бази даних: %s"
 
-#: pg_createsubscriber.c:526
+#: pg_createsubscriber.c:557 streamutil.c:230
 #, c-format
-msgid "could not clear search_path: %s"
-msgstr "не вдалося очистити search_path: %s"
+msgid "could not clear \"search_path\": %s"
+msgstr "не вдалося очистити \"search_path\": %s"
 
-#: pg_createsubscriber.c:566
+#: pg_createsubscriber.c:597
 #, c-format
 msgid "getting system identifier from publisher"
 msgstr "отримання системного ідентифікатора з публікації"
 
-#: pg_createsubscriber.c:573
+#: pg_createsubscriber.c:604
 #, c-format
 msgid "could not get system identifier: %s"
 msgstr "не вдалося отримати системний ідентифікатор: %s"
 
-#: pg_createsubscriber.c:579
+#: pg_createsubscriber.c:610
 #, c-format
 msgid "could not get system identifier: got %d rows, expected %d row"
 msgstr "не вдалося отримати системний ідентифікатор: отримано рядки %d, очікувалось %d рядок"
 
-#: pg_createsubscriber.c:586
+#: pg_createsubscriber.c:617
 #, c-format
-msgid "system identifier is %llu on publisher"
-msgstr "системний ідентифікатор %llu на сервері публікації"
+msgid "system identifier is %<PRIu64> on publisher"
+msgstr "системний ідентифікатор %<PRIu64> на видавці"
 
-#: pg_createsubscriber.c:607
+#: pg_createsubscriber.c:637
 #, c-format
 msgid "getting system identifier from subscriber"
 msgstr "отримання системного ідентифікатора від підписника"
 
-#: pg_createsubscriber.c:611 pg_createsubscriber.c:641
+#: pg_createsubscriber.c:641 pg_createsubscriber.c:670
 #, c-format
 msgid "control file appears to be corrupt"
 msgstr "контрольний файл здається пошкодженим"
 
-#: pg_createsubscriber.c:615 pg_createsubscriber.c:656
+#: pg_createsubscriber.c:645 pg_createsubscriber.c:688
 #, c-format
-msgid "system identifier is %llu on subscriber"
-msgstr "системний ідентифікатор %llu на підписнику"
+msgid "system identifier is %<PRIu64> on subscriber"
+msgstr "системний ідентифікатор %<PRIu64> на підписнику"
 
-#: pg_createsubscriber.c:637
+#: pg_createsubscriber.c:666
 #, c-format
 msgid "modifying system identifier of subscriber"
 msgstr "змінюю системний ідентифікатор підписника"
 
-#: pg_createsubscriber.c:659
+#: pg_createsubscriber.c:683
+#, c-format
+msgid "dry-run: would set system identifier to %<PRIu64> on subscriber"
+msgstr "пробний запуск: встановив би системний ідентифікатор %<PRIu64> на підписнику"
+
+#: pg_createsubscriber.c:693
+#, c-format
+msgid "dry-run: would run pg_resetwal on the subscriber"
+msgstr "пробний запуск: запустив би pg_resetwal на підписнику"
+
+#: pg_createsubscriber.c:695
 #, c-format
 msgid "running pg_resetwal on the subscriber"
 msgstr "запускаю pg_resetwal на підписнику"
 
-#: pg_createsubscriber.c:671
+#: pg_createsubscriber.c:707
 #, c-format
-msgid "subscriber successfully changed the system identifier"
-msgstr "підписник успішно змінив системний ідентифікатор"
+msgid "successfully reset WAL on the subscriber"
+msgstr "успішно скинуто WAL на підписнику"
 
-#: pg_createsubscriber.c:673
+#: pg_createsubscriber.c:709
 #, c-format
-msgid "could not change system identifier of subscriber: %s"
-msgstr "не вдалося змінити системний ідентифікатор підписника: %s"
+msgid "could not reset WAL on subscriber: %s"
+msgstr "не вдалося скинути WAL на підписнику: %s"
 
-#: pg_createsubscriber.c:697
+#: pg_createsubscriber.c:733
 #, c-format
 msgid "could not obtain database OID: %s"
 msgstr "не вдалося отримати OID бази даних: %s"
 
-#: pg_createsubscriber.c:704
+#: pg_createsubscriber.c:740
 #, c-format
 msgid "could not obtain database OID: got %d rows, expected %d row"
 msgstr "не вдалося отримати OID бази даних: отримано %d рядків, очікувалось %d рядок"
 
-#: pg_createsubscriber.c:776
+#: pg_createsubscriber.c:812
 #, c-format
 msgid "create replication slot \"%s\" on publisher"
 msgstr "створіть слот реплікації \"%s\" на сервері публікації"
 
-#: pg_createsubscriber.c:796
+#: pg_createsubscriber.c:832
 #, c-format
 msgid "could not write an additional WAL record: %s"
 msgstr "не вдалося написати додатковий запис WAL: %s"
 
-#: pg_createsubscriber.c:822
+#: pg_createsubscriber.c:858
 #, c-format
 msgid "could not obtain recovery progress: %s"
 msgstr "не вдалося отримати прогрес відновлення: %s"
 
-#: pg_createsubscriber.c:854
+#: pg_createsubscriber.c:891
 #, c-format
 msgid "checking settings on publisher"
 msgstr "перевірка налаштувань на сервері публікації"
 
-#: pg_createsubscriber.c:864
+#: pg_createsubscriber.c:901
 #, c-format
 msgid "primary server cannot be in recovery"
 msgstr "основний сервер не може бути у процесі відновлення"
 
-#: pg_createsubscriber.c:888
+#: pg_createsubscriber.c:927
 #, c-format
 msgid "could not obtain publisher settings: %s"
 msgstr "не вдалось отримати налаштування сервера публікацій: %s"
 
-#: pg_createsubscriber.c:914
+#: pg_createsubscriber.c:956
 #, c-format
-msgid "publisher requires wal_level >= \"logical\""
-msgstr "сервер публікації вимагає wal_level >= \"logical\""
+msgid "publisher requires \"wal_level\" >= \"logical\""
+msgstr "сервер публікацій вимагає \"wal_level\" >= \"logical\""
 
-#: pg_createsubscriber.c:920
+#: pg_createsubscriber.c:962
 #, c-format
 msgid "publisher requires %d replication slots, but only %d remain"
 msgstr "сервер публікацій вимагає %d слотів реплікації, але залишається тільки %d"
 
-#: pg_createsubscriber.c:922 pg_createsubscriber.c:931
-#: pg_createsubscriber.c:1028 pg_createsubscriber.c:1037
-#: pg_createsubscriber.c:1046
+#: pg_createsubscriber.c:964 pg_createsubscriber.c:973
+#: pg_createsubscriber.c:1083 pg_createsubscriber.c:1092
+#: pg_createsubscriber.c:1101
 #, c-format
 msgid "Increase the configuration parameter \"%s\" to at least %d."
 msgstr "Збільшіть параметр налаштування \"%s\" принаймні до %d."
 
-#: pg_createsubscriber.c:929
+#: pg_createsubscriber.c:971
 #, c-format
 msgid "publisher requires %d WAL sender processes, but only %d remain"
 msgstr "сервер публікацій вимагає %d процесів відправника WAL, але залишається тільки %d"
 
-#: pg_createsubscriber.c:938
+#: pg_createsubscriber.c:980
 #, c-format
 msgid "two_phase option will not be enabled for replication slots"
 msgstr "опція two_phase для слотів реплікації не буде увімкнена"
 
-#: pg_createsubscriber.c:939
+#: pg_createsubscriber.c:981
 #, c-format
 msgid "Subscriptions will be created with the two_phase option disabled.  Prepared transactions will be replicated at COMMIT PREPARED."
 msgstr "Підписки будуть створені з відключенем параметром two_phase. Підготовлені транзакції будуть скопійовані в COMMIT PREPARED."
 
-#: pg_createsubscriber.c:971
+#: pg_createsubscriber.c:983
+#, c-format
+msgid "You can use the command-line option --enable-two-phase to enable two_phase."
+msgstr "Ви можете використовувати параметр командного рядка --enable-two-phase для активації two_phase."
+
+#: pg_createsubscriber.c:993
+#, c-format
+msgid "required WAL could be removed from the publisher"
+msgstr "необхідні WAL можуть бути видалені з сервера публікацій"
+
+#: pg_createsubscriber.c:994
+#, c-format
+msgid "Set the configuration parameter \"%s\" to -1 to ensure that required WAL files are not prematurely removed."
+msgstr "Встановіть параметр конфігурації \"%s\" в -1, щоб забезпечити, що необхідні WAL-файли не будуть передчасно видалені."
+
+#: pg_createsubscriber.c:1026
 #, c-format
 msgid "checking settings on subscriber"
 msgstr "перевірка налаштувань підписника"
 
-#: pg_createsubscriber.c:978
+#: pg_createsubscriber.c:1033
 #, c-format
 msgid "target server must be a standby"
 msgstr "цільовий сервер повинен бути в режимі очікування"
 
-#: pg_createsubscriber.c:1002
+#: pg_createsubscriber.c:1057
 #, c-format
 msgid "could not obtain subscriber settings: %s"
 msgstr "не вдалося отримати налаштування підписника: %s"
 
-#: pg_createsubscriber.c:1026
+#: pg_createsubscriber.c:1081
 #, c-format
-msgid "subscriber requires %d replication slots, but only %d remain"
-msgstr "підписник вимагає %d слотів реплікації, але залишається тільки %d"
+msgid "subscriber requires %d active replication origins, but only %d remain"
+msgstr "підписник вимагає %d активних джерел реплікації, але залишається тільки %d"
 
-#: pg_createsubscriber.c:1035
+#: pg_createsubscriber.c:1090
 #, c-format
 msgid "subscriber requires %d logical replication workers, but only %d remain"
 msgstr "підписник вимагає %d процесів логічної реплікації, але залишається тільки %d"
 
-#: pg_createsubscriber.c:1044
+#: pg_createsubscriber.c:1099
 #, c-format
 msgid "subscriber requires %d worker processes, but only %d remain"
 msgstr "підписник вимагає %d робочих процесів, але залишається тільки %d"
 
-#: pg_createsubscriber.c:1079
+#: pg_createsubscriber.c:1135
+#, c-format
+msgid "dry-run: would drop subscription \"%s\" in database \"%s\""
+msgstr "пробний запуск: видалив би підписку \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1139
 #, c-format
 msgid "dropping subscription \"%s\" in database \"%s\""
 msgstr "видалення підписки \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1088
+#: pg_createsubscriber.c:1146
 #, c-format
 msgid "could not drop subscription \"%s\": %s"
 msgstr "не вдалося видалити підписку \"%s\": %s"
 
-#: pg_createsubscriber.c:1123
+#: pg_createsubscriber.c:1181
 #, c-format
 msgid "could not obtain pre-existing subscriptions: %s"
 msgstr "не вдалося отримати раніше наявні підписки: %s"
 
-#: pg_createsubscriber.c:1258
+#: pg_createsubscriber.c:1322
 #, c-format
 msgid "could not drop replication slot \"%s\" on primary"
 msgstr "не вдалося видалити слот реплікації \"%s\" на головному сервері"
 
-#: pg_createsubscriber.c:1292
+#: pg_createsubscriber.c:1356
 #, c-format
 msgid "could not obtain failover replication slot information: %s"
 msgstr "не вдалося отримати інформацію про запасний слот реплікації: %s"
 
-#: pg_createsubscriber.c:1294 pg_createsubscriber.c:1303
+#: pg_createsubscriber.c:1358 pg_createsubscriber.c:1367
 #, c-format
 msgid "Drop the failover replication slots on subscriber soon to avoid retention of WAL files."
 msgstr "Видаліть запасний слот реплікації найближчим часом, щоб уникнути збереження файлів WAL."
 
-#: pg_createsubscriber.c:1302
+#: pg_createsubscriber.c:1366
 #, c-format
 msgid "could not drop failover replication slot"
 msgstr "не вдалося видалити запасний слот реплікації"
 
-#: pg_createsubscriber.c:1324
+#: pg_createsubscriber.c:1389
+#, c-format
+msgid "dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "пробний запуск: створив би слот реплікації \"%s\" в базі даних \"%s\" на сервері публікацій"
+
+#: pg_createsubscriber.c:1392
 #, c-format
-msgid "creating the replication slot \"%s\" in database \"%s\""
-msgstr "створюю слот реплікації \"%s\" в базі даних \"%s\""
+msgid "creating the replication slot \"%s\" in database \"%s\" on publisher"
+msgstr "створення слоту реплікації \"%s\" в базі даних \"%s\" на сервері публікацій"
 
-#: pg_createsubscriber.c:1342
+#: pg_createsubscriber.c:1411
 #, c-format
 msgid "could not create replication slot \"%s\" in database \"%s\": %s"
 msgstr "не вдалося створити слот реплікації \"%s\" в базі даних \"%s\": %s"
 
-#: pg_createsubscriber.c:1372
+#: pg_createsubscriber.c:1442
+#, c-format
+msgid "dry-run: would drop the replication slot \"%s\" in database \"%s\""
+msgstr "пробний запуск: видалив би слот реплікації \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1445
 #, c-format
 msgid "dropping the replication slot \"%s\" in database \"%s\""
 msgstr "видалення слоту реплікації \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1388
+#: pg_createsubscriber.c:1461
 #, c-format
 msgid "could not drop replication slot \"%s\" in database \"%s\": %s"
 msgstr "не вдалося видалити слот реплікації \"%s\" в базі даних \"%s\": %s"
 
-#: pg_createsubscriber.c:1409
+#: pg_createsubscriber.c:1482
 #, c-format
 msgid "pg_ctl failed with exit code %d"
 msgstr "помилка pg_ctl з кодом %d"
 
-#: pg_createsubscriber.c:1414
+#: pg_createsubscriber.c:1487
 #, c-format
 msgid "pg_ctl was terminated by exception 0x%X"
 msgstr "pg_ctl був перерваний винятком 0x%X"
 
-#: pg_createsubscriber.c:1416
+#: pg_createsubscriber.c:1489
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Опис цього Шістнадцяткового значення дивіться у включаємому C-файлі \"ntstatus.h\"."
 
-#: pg_createsubscriber.c:1418
+#: pg_createsubscriber.c:1491
 #, c-format
 msgid "pg_ctl was terminated by signal %d: %s"
 msgstr "pg_ctl було припинено сигналом %d: %s"
 
-#: pg_createsubscriber.c:1424
+#: pg_createsubscriber.c:1497
 #, c-format
 msgid "pg_ctl exited with unrecognized status %d"
 msgstr "pg_ctl завершився з невідомим статусом %d"
 
-#: pg_createsubscriber.c:1427
+#: pg_createsubscriber.c:1500
 #, c-format
 msgid "The failed command was: %s"
 msgstr "Команда з помилкою: %s"
 
-#: pg_createsubscriber.c:1473
+#: pg_createsubscriber.c:1550
 #, c-format
 msgid "server was started"
 msgstr "сервер був запущений"
 
-#: pg_createsubscriber.c:1488
+#: pg_createsubscriber.c:1565
 #, c-format
 msgid "server was stopped"
 msgstr "сервер було зупинено"
 
-#: pg_createsubscriber.c:1507
+#: pg_createsubscriber.c:1584
 #, c-format
 msgid "waiting for the target server to reach the consistent state"
 msgstr "чекаю на досягнення узгодженого стану цільовим сервером"
 
-#: pg_createsubscriber.c:1530
+#: pg_createsubscriber.c:1602
 #, c-format
 msgid "recovery timed out"
 msgstr "час відновлення вичерпався"
 
-#: pg_createsubscriber.c:1543
+#: pg_createsubscriber.c:1615
 #, c-format
 msgid "server did not end recovery"
 msgstr "сервер не завершив відновлення"
 
-#: pg_createsubscriber.c:1545
+#: pg_createsubscriber.c:1617
 #, c-format
 msgid "target server reached the consistent state"
 msgstr "цільовий сервер досяг узгодженого стану"
 
-#: pg_createsubscriber.c:1546
+#: pg_createsubscriber.c:1618
 #, c-format
 msgid "If pg_createsubscriber fails after this point, you must recreate the physical replica before continuing."
 msgstr "Якщо pg_createsubscriber поверне помилку після цієї точки, вам потрібно буде перестворити фізичну репліку перед продовженням."
 
-#: pg_createsubscriber.c:1573
+#: pg_createsubscriber.c:1645 pg_createsubscriber.c:1776
 #, c-format
 msgid "could not obtain publication information: %s"
 msgstr "не вдалося отримати інформацію про публікацію: %s"
 
-#: pg_createsubscriber.c:1587
+#: pg_createsubscriber.c:1659
 #, c-format
 msgid "publication \"%s\" already exists"
 msgstr "публікація \"%s\" вже існує"
 
-#: pg_createsubscriber.c:1588
+#: pg_createsubscriber.c:1660
 #, c-format
 msgid "Consider renaming this publication before continuing."
 msgstr "Подумайте про перейменування цієї публікації, перш ніж продовжити."
 
-#: pg_createsubscriber.c:1595
+#: pg_createsubscriber.c:1668
+#, c-format
+msgid "dry-run: would create publication \"%s\" in database \"%s\""
+msgstr "пробний запуск: створив би публікацію \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1671
 #, c-format
 msgid "creating publication \"%s\" in database \"%s\""
 msgstr "створення публікації \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1608
+#: pg_createsubscriber.c:1684
 #, c-format
 msgid "could not create publication \"%s\" in database \"%s\": %s"
 msgstr "не вдалося створити публікацію \"%s\" в базі даних \"%s\": %s"
 
-#: pg_createsubscriber.c:1637
+#: pg_createsubscriber.c:1715
+#, c-format
+msgid "dry-run: would drop publication \"%s\" in database \"%s\""
+msgstr "пробний запуск: видалив би публікацію \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1718
 #, c-format
 msgid "dropping publication \"%s\" in database \"%s\""
 msgstr "видалення публікації \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1651
+#: pg_createsubscriber.c:1732
 #, c-format
 msgid "could not drop publication \"%s\" in database \"%s\": %s"
 msgstr "не вдалося видалити публікацію \"%s\" в базі даних \"%s\": %s"
 
-#: pg_createsubscriber.c:1697
+#: pg_createsubscriber.c:1769
+#, c-format
+msgid "dropping all existing publications in database \"%s\""
+msgstr "видалення всіх існуючих публікацій в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1828
+#, c-format
+msgid "dry-run: would create subscription \"%s\" in database \"%s\""
+msgstr "пробний запуск: створив би підписку \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1831
 #, c-format
 msgid "creating subscription \"%s\" in database \"%s\""
 msgstr "створення підписки \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1718
+#: pg_createsubscriber.c:1853
 #, c-format
 msgid "could not create subscription \"%s\" in database \"%s\": %s"
 msgstr "не вдалося створити підписку \"%s\" в базі даних \"%s\": %s"
 
-#: pg_createsubscriber.c:1763
+#: pg_createsubscriber.c:1898
 #, c-format
 msgid "could not obtain subscription OID: %s"
 msgstr "не вдалося отримати OID підписки: %s"
 
-#: pg_createsubscriber.c:1770
+#: pg_createsubscriber.c:1905
 #, c-format
 msgid "could not obtain subscription OID: got %d rows, expected %d row"
 msgstr "не вдалося отримати OID підписки: отримано %d рядків, очікувалось %d рядок"
 
-#: pg_createsubscriber.c:1794
+#: pg_createsubscriber.c:1930
+#, c-format
+msgid "dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\""
+msgstr "пробний запуск: встановив би прогрес реплікації (назва вузла \"%s\", LSN %s) в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1933
 #, c-format
 msgid "setting the replication progress (node name \"%s\", LSN %s) in database \"%s\""
 msgstr "налаштування прогресу реплікації (назва вузла \"%s, LSN %s) в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1809
+#: pg_createsubscriber.c:1948
 #, c-format
 msgid "could not set replication progress for subscription \"%s\": %s"
 msgstr "не вдалося виставити прогрес реплікації для підписки \"%s\": %s"
 
-#: pg_createsubscriber.c:1840
+#: pg_createsubscriber.c:1980
+#, c-format
+msgid "dry-run: would enable subscription \"%s\" in database \"%s\""
+msgstr "пробний запуск: активував би підписку \"%s\" в базі даних \"%s\""
+
+#: pg_createsubscriber.c:1983
 #, c-format
 msgid "enabling subscription \"%s\" in database \"%s\""
 msgstr "активація підписки \"%s\" в базі даних \"%s\""
 
-#: pg_createsubscriber.c:1852
+#: pg_createsubscriber.c:1995
 #, c-format
 msgid "could not enable subscription \"%s\": %s"
 msgstr "не вдалося активувати підписку \"%s\": %s"
 
-#: pg_createsubscriber.c:1944
+#: pg_createsubscriber.c:2041
+#, c-format
+msgid "could not obtain a list of databases: %s"
+msgstr "не вдалося отримати список баз даних: %s"
+
+#: pg_createsubscriber.c:2145
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\" не може це виконувати"
 
-#: pg_createsubscriber.c:1945
+#: pg_createsubscriber.c:2146
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Запускати %s треба від суперкористувача PostgreSQL."
 
-#: pg_createsubscriber.c:1966
+#: pg_createsubscriber.c:2169
+#, c-format
+msgid "database \"%s\" specified more than once for -d/--database"
+msgstr "база даних \"%s\" вказана більше одного разу для -d/--database"
+
+#: pg_createsubscriber.c:2210
 #, c-format
-msgid "database \"%s\" specified more than once"
-msgstr "база даних \"%s\" вказана неодноразово"
+msgid "publication \"%s\" specified more than once for --publication"
+msgstr "публікація \"%s\" вказана більше одного разу для --publication"
 
-#: pg_createsubscriber.c:2007
+#: pg_createsubscriber.c:2219
 #, c-format
-msgid "publication \"%s\" specified more than once"
-msgstr "публікація \"%s\" вказана неодноразово"
+msgid "replication slot \"%s\" specified more than once for --replication-slot"
+msgstr "слот реплікації \"%s\" вказаний більше одного разу для --replication-slot"
 
-#: pg_createsubscriber.c:2019
+#: pg_createsubscriber.c:2228
 #, c-format
-msgid "replication slot \"%s\" specified more than once"
-msgstr "слот реплікації \"%s\" вказаний неодноразово"
+msgid "subscription \"%s\" specified more than once for --subscription"
+msgstr "підписка \"%s\" вказана більше одного разу для --subscription"
 
-#: pg_createsubscriber.c:2031
+#: pg_createsubscriber.c:2234
 #, c-format
-msgid "subscription \"%s\" specified more than once"
-msgstr "підписка \"%s\" вказана неодноразово"
+msgid "object type \"%s\" specified more than once for --clean"
+msgstr "тип об'єкта \"%s\" вказаний більше одного разу для --clean"
 
-#: pg_createsubscriber.c:2054
+#: pg_createsubscriber.c:2259
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "параметри %s і %s не можна використовувати разом"
+
+#: pg_createsubscriber.c:2278
 #, c-format
 msgid "no subscriber data directory specified"
 msgstr "не вказано каталог з даними підписника"
 
-#: pg_createsubscriber.c:2065
+#: pg_createsubscriber.c:2289
 #, c-format
 msgid "could not determine current directory"
 msgstr "не вдалося визначити поточний каталог"
 
-#: pg_createsubscriber.c:2082
+#: pg_createsubscriber.c:2306
 #, c-format
 msgid "no publisher connection string specified"
 msgstr "немає рядка підключення до видавця"
 
-#: pg_createsubscriber.c:2086
+#: pg_createsubscriber.c:2310
 #, c-format
 msgid "validating publisher connection string"
 msgstr "перевірка рядка підключення видавця"
 
-#: pg_createsubscriber.c:2092
+#: pg_createsubscriber.c:2316
 #, c-format
 msgid "validating subscriber connection string"
 msgstr "перевірка рядка з'єднання з підписником"
 
-#: pg_createsubscriber.c:2097
+#: pg_createsubscriber.c:2333
 #, c-format
 msgid "no database was specified"
 msgstr "база даних не вказана"
 
-#: pg_createsubscriber.c:2109
+#: pg_createsubscriber.c:2344
 #, c-format
 msgid "database name \"%s\" was extracted from the publisher connection string"
 msgstr "ім'я бази даних \"%s\" було отримано з рядка підключення видавця"
 
-#: pg_createsubscriber.c:2114
+#: pg_createsubscriber.c:2349
 #, c-format
 msgid "no database name specified"
 msgstr "не вказано ім'я бази даних"
 
-#: pg_createsubscriber.c:2124
+#: pg_createsubscriber.c:2359
 #, c-format
 msgid "wrong number of publication names specified"
 msgstr "вказана невірна кількість імен публікації"
 
-#: pg_createsubscriber.c:2125
+#: pg_createsubscriber.c:2360
 #, c-format
 msgid "The number of specified publication names (%d) must match the number of specified database names (%d)."
 msgstr "Кількість вказаних назв публікації (%d) мусить співпадати з кількістю вказаних баз даних (%d)."
 
-#: pg_createsubscriber.c:2131
+#: pg_createsubscriber.c:2366
 #, c-format
 msgid "wrong number of subscription names specified"
 msgstr "вказано неправильну кількість імен підписки"
 
-#: pg_createsubscriber.c:2132
+#: pg_createsubscriber.c:2367
 #, c-format
 msgid "The number of specified subscription names (%d) must match the number of specified database names (%d)."
 msgstr "Кількість зазначених назв підписки (%d) повинна співпадати з кількістю зазначених назв бази даних (%d)."
 
-#: pg_createsubscriber.c:2138
+#: pg_createsubscriber.c:2373
 #, c-format
 msgid "wrong number of replication slot names specified"
 msgstr "вказано неправильну кількість назв слотів реплікації"
 
-#: pg_createsubscriber.c:2139
+#: pg_createsubscriber.c:2374
 #, c-format
 msgid "The number of specified replication slot names (%d) must match the number of specified database names (%d)."
 msgstr "Кількість вказаних назв слотів реплікації (%d) повинна збігатися з кількістю вказаних назв бази даних (%d)."
 
-#: pg_createsubscriber.c:2168
+#: pg_createsubscriber.c:2386
+#, c-format
+msgid "invalid object type \"%s\" specified for %s"
+msgstr "невірний тип об'єкта \"%s\" вказаний для %s"
+
+#: pg_createsubscriber.c:2388
+#, c-format
+msgid "The valid value is: \"%s\""
+msgstr "Коректне значення: \"%s\""
+
+#: pg_createsubscriber.c:2419
 #, c-format
 msgid "subscriber data directory is not a copy of the source database cluster"
 msgstr "каталог даних підписника не є копією кластера вихідної бази даних"
 
-#: pg_createsubscriber.c:2181
+#: pg_createsubscriber.c:2432
 #, c-format
 msgid "standby server is running"
 msgstr "резервний сервер працює"
 
-#: pg_createsubscriber.c:2182
+#: pg_createsubscriber.c:2433
 #, c-format
 msgid "Stop the standby server and try again."
 msgstr "Зупиніть резервний сервер та повторіть спробу."
 
-#: pg_createsubscriber.c:2191
+#: pg_createsubscriber.c:2442
 #, c-format
 msgid "starting the standby server with command-line options"
 msgstr "запуск резервного серверу з параметрами командного рядка"
 
-#: pg_createsubscriber.c:2207 pg_createsubscriber.c:2242
+#: pg_createsubscriber.c:2458 pg_createsubscriber.c:2493
 #, c-format
 msgid "stopping the subscriber"
 msgstr "зупинка підписника"
 
-#: pg_createsubscriber.c:2221
+#: pg_createsubscriber.c:2472
 #, c-format
 msgid "starting the subscriber"
 msgstr "запуск підписника"
 
-#: pg_createsubscriber.c:2250
+#: pg_createsubscriber.c:2501
 #, c-format
 msgid "Done!"
 msgstr "Готово!"
@@ -1898,17 +2018,17 @@ msgstr "%s отримує передачу випереджувальних жу
 msgid "  -D, --directory=DIR    receive write-ahead log files into this directory\n"
 msgstr "  -D, --directory=DIR    зберігати файли випереджувального журналювання до цього каталогу\n"
 
-#: pg_receivewal.c:83 pg_recvlogical.c:93
+#: pg_receivewal.c:83 pg_recvlogical.c:94
 #, c-format
 msgid "  -E, --endpos=LSN       exit after receiving the specified LSN\n"
 msgstr "  -E, --endpos=LSN       вийти після отримання вказаного LSN\n"
 
-#: pg_receivewal.c:84 pg_recvlogical.c:97
+#: pg_receivewal.c:84 pg_recvlogical.c:98
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr "      --if-not-exists    не видавати помилку, при створенні слота, якщо слот вже існує\n"
 
-#: pg_receivewal.c:85 pg_recvlogical.c:99
+#: pg_receivewal.c:85 pg_recvlogical.c:100
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          переривати роботу при втраті підключення\n"
@@ -1918,7 +2038,7 @@ msgstr "  -n, --no-loop          переривати роботу при втр
 msgid "      --no-sync          do not wait for changes to be written safely to disk\n"
 msgstr "      --no-sync          не чекати безпечного збереження змін на диск\n"
 
-#: pg_receivewal.c:87 pg_recvlogical.c:104
+#: pg_receivewal.c:87 pg_recvlogical.c:105
 #, c-format
 msgid "  -s, --status-interval=SECS\n"
 "                         time between status packets sent to server (default: %d)\n"
@@ -1944,12 +2064,12 @@ msgid "\n"
 msgstr "\n"
 "Додаткові дії:\n"
 
-#: pg_receivewal.c:104 pg_recvlogical.c:89
+#: pg_receivewal.c:104 pg_recvlogical.c:88
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      створити новий слот реплікації (ім'я слота задає параметр --slot)\n"
 
-#: pg_receivewal.c:105 pg_recvlogical.c:90
+#: pg_receivewal.c:105 pg_recvlogical.c:89
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        видалити слот реплікації (ім'я слота задає параметр --slot)\n"
@@ -1969,7 +2089,7 @@ msgstr "зупинено потокове передавання журналу
 msgid "switched to timeline %u at %X/%X"
 msgstr "переключено на часову шкалу %u в позиції %X/%X"
 
-#: pg_receivewal.c:224 pg_recvlogical.c:1053
+#: pg_receivewal.c:224 pg_recvlogical.c:1075
 #, c-format
 msgid "received interrupt signal, exiting"
 msgstr "отримано сигнал переривання, завершення роботи"
@@ -2039,7 +2159,7 @@ msgstr "неможливо перевірити файл \"%s\": стиснен
 msgid "starting log streaming at %X/%X (timeline %u)"
 msgstr "початок потокового передавання журналу в позиції %X/%X (часова шкала %u)"
 
-#: pg_receivewal.c:693 pg_recvlogical.c:801
+#: pg_receivewal.c:693 pg_recvlogical.c:809
 #, c-format
 msgid "could not parse end position \"%s\""
 msgstr "не вдалося проаналізувати кінцеву позицію \"%s\""
@@ -2069,62 +2189,69 @@ msgstr "стиснення з %s ще не підтримується"
 msgid "replication connection using slot \"%s\" is unexpectedly database specific"
 msgstr "підключення для реплікації з використанням слоту \"%s\" неочікувано виявилось прив'язаним до бази даних"
 
-#: pg_receivewal.c:878 pg_recvlogical.c:972
+#: pg_receivewal.c:878 pg_recvlogical.c:993
 #, c-format
 msgid "dropping replication slot \"%s\""
 msgstr "видалення слоту реплікації \"%s\""
 
-#: pg_receivewal.c:889 pg_recvlogical.c:982
+#: pg_receivewal.c:889 pg_recvlogical.c:1003
 #, c-format
 msgid "creating replication slot \"%s\""
 msgstr "створення слоту реплікації \"%s\""
 
-#: pg_receivewal.c:918 pg_recvlogical.c:1006
+#: pg_receivewal.c:918 pg_recvlogical.c:1028
 #, c-format
 msgid "disconnected"
 msgstr "роз’єднано"
 
 #. translator: check source for value for %d
-#: pg_receivewal.c:922 pg_recvlogical.c:1010
+#: pg_receivewal.c:922 pg_recvlogical.c:1032
 #, c-format
 msgid "disconnected; waiting %d seconds to try again"
 msgstr "роз’єднано; через %d секунд буде повторна спроба"
 
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:83
 #, c-format
 msgid "%s controls PostgreSQL logical decoding streams.\n\n"
 msgstr "%s керує потоковими передаваннями логічного декодування PostgreSQL.\n\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:87
 #, c-format
 msgid "\n"
 "Action to be performed:\n"
 msgstr "\n"
 "Дія до виконання:\n"
 
-#: pg_recvlogical.c:91
+#: pg_recvlogical.c:90
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            почати потокове передавання в слоті реплікації (ім'я слоту задає параметр --slot)\n"
 
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:92
+#, c-format
+msgid "      --enable-failover  enable replication slot synchronization to standby servers when\n"
+"                         creating a replication slot\n"
+msgstr "      --enable-failover  увімкнути синхронізацію слотів реплікації з резервними\n"
+"                         серверами при створенні слоту реплікації\n"
+
+#: pg_recvlogical.c:95
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=FILE        зберігати журнал до цього файлу, - позначає stdout\n"
 
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -F  --fsync-interval=SECS\n"
 "                         time between fsyncs to the output file (default: %d)\n"
 msgstr "  -F  --fsync-interval=SECS\n"
 "                         час між fsyncs до файлу виводу (за замовчуванням: %d)\n"
 
-#: pg_recvlogical.c:98
+#: pg_recvlogical.c:99
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN     де в існуючому слоті слід почати потокове передавання\n"
 
-#: pg_recvlogical.c:100
+#: pg_recvlogical.c:101
 #, c-format
 msgid "  -o, --option=NAME[=VALUE]\n"
 "                         pass option NAME with optional value VALUE to the\n"
@@ -2133,173 +2260,178 @@ msgstr "  -o, --option=NAME[=VALUE]\n"
 "                         передати параметр NAME з додатковим значенням VALUE до\n"
 "                         плагіну виводу\n"
 
-#: pg_recvlogical.c:103
+#: pg_recvlogical.c:104
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    використовувати плагін виводу PLUGIN (за замовчуванням: %s)\n"
 
-#: pg_recvlogical.c:106
+#: pg_recvlogical.c:107
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=SLOTNAME    ім'я слоту логічної реплікації\n"
 
-#: pg_recvlogical.c:107
+#: pg_recvlogical.c:108
+#, c-format
+msgid "  -t, --enable-two-phase enable decoding of prepared transactions when creating a slot\n"
+msgstr "  -t, --enable-two-phase увімкнути декодування підготовлених транзакцій при створенні слоту\n"
+
+#: pg_recvlogical.c:109
 #, c-format
-msgid "  -t, --two-phase        enable decoding of prepared transactions when creating a slot\n"
-msgstr "  -t, --two-phase        активувати декодування підготовлених транзакцій під час створення слоту\n"
+msgid "      --two-phase        (same as --enable-two-phase, deprecated)\n"
+msgstr "      --two-phase        (те саме, що і --enable-two-phase, застарілий)\n"
 
-#: pg_recvlogical.c:112
+#: pg_recvlogical.c:114
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=DBNAME    бази даних для підключення\n"
 
-#: pg_recvlogical.c:145
+#: pg_recvlogical.c:147
 #, c-format
 msgid "confirming write up to %X/%X, flush to %X/%X (slot %s)"
 msgstr "підтвердження запису до %X/%X, очищення до %X/%X (слот %s)"
 
-#: pg_recvlogical.c:169 receivelog.c:360
+#: pg_recvlogical.c:171 receivelog.c:359
 #, c-format
 msgid "could not send feedback packet: %s"
 msgstr "не вдалося відправити пакет зворотнього зв'язку: %s"
 
-#: pg_recvlogical.c:239
+#: pg_recvlogical.c:241
 #, c-format
 msgid "starting log streaming at %X/%X (slot %s)"
 msgstr "початок потокового передавання журналу в позиції %X/%X (слот %s)"
 
-#: pg_recvlogical.c:281
+#: pg_recvlogical.c:283
 #, c-format
 msgid "streaming initiated"
 msgstr "потокове передавання ініційовано"
 
-#: pg_recvlogical.c:346
+#: pg_recvlogical.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не вдалося відкрити файл журналу \"%s\": %m"
 
-#: pg_recvlogical.c:375 receivelog.c:882
+#: pg_recvlogical.c:377 receivelog.c:889
 #, c-format
 msgid "invalid socket: %s"
 msgstr "неприпустимий сокет: %s"
 
-#: pg_recvlogical.c:428 receivelog.c:910
+#: pg_recvlogical.c:430 receivelog.c:917
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
-#: pg_recvlogical.c:435 receivelog.c:959
+#: pg_recvlogical.c:437 receivelog.c:966
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "не вдалося отримати дані з WAL потоку: %s"
 
-#: pg_recvlogical.c:477 pg_recvlogical.c:528 receivelog.c:1003
-#: receivelog.c:1066
+#: pg_recvlogical.c:479 pg_recvlogical.c:530 receivelog.c:1010
+#: receivelog.c:1073
 #, c-format
 msgid "streaming header too small: %d"
 msgstr "заголовок потокового передавання занадто малий: %d"
 
-#: pg_recvlogical.c:512 receivelog.c:843
+#: pg_recvlogical.c:514 receivelog.c:846
 #, c-format
 msgid "unrecognized streaming header: \"%c\""
 msgstr "нерозпізнаний заголовок потокового передавання: \"%c\""
 
-#: pg_recvlogical.c:566 pg_recvlogical.c:578
+#: pg_recvlogical.c:568 pg_recvlogical.c:580
 #, c-format
 msgid "could not write %d bytes to log file \"%s\": %m"
 msgstr "не вдалося записати %d байт до файлу журналу \"%s\": %m"
 
-#: pg_recvlogical.c:636 receivelog.c:642 receivelog.c:679
+#: pg_recvlogical.c:638 receivelog.c:641 receivelog.c:678
 #, c-format
 msgid "unexpected termination of replication stream: %s"
 msgstr "неочікуване завершення роботи потоку реплікації: %s"
 
-#: pg_recvlogical.c:796
+#: pg_recvlogical.c:804
 #, c-format
 msgid "could not parse start position \"%s\""
 msgstr "не вдалося аналізувати початкову позицію \"%s\""
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:882
 #, c-format
 msgid "no slot specified"
 msgstr "слот не вказано"
 
-#: pg_recvlogical.c:881
+#: pg_recvlogical.c:889
 #, c-format
 msgid "no target file specified"
 msgstr "цільовий файл не вказано"
 
-#: pg_recvlogical.c:888
+#: pg_recvlogical.c:896
 #, c-format
 msgid "no database specified"
 msgstr "база даних не вказана"
 
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:903
 #, c-format
 msgid "at least one action needs to be specified"
 msgstr "необхідно вказати щонайменше одну дію"
 
-#: pg_recvlogical.c:902
+#: pg_recvlogical.c:910
 #, c-format
 msgid "cannot use --create-slot or --start together with --drop-slot"
 msgstr "використовувати --create-slot або --start разом з --drop-slot не можна"
 
-#: pg_recvlogical.c:909
+#: pg_recvlogical.c:917
 #, c-format
 msgid "cannot use --create-slot or --drop-slot together with --startpos"
 msgstr "використовувати --create-slot або --drop-slot разом з --startpos не можна"
 
-#: pg_recvlogical.c:916
+#: pg_recvlogical.c:924
 #, c-format
 msgid "--endpos may only be specified with --start"
 msgstr "--endpos можна вказати лише з --start"
 
-#: pg_recvlogical.c:923
+#: pg_recvlogical.c:933 pg_recvlogical.c:940
 #, c-format
-msgid "--two-phase may only be specified with --create-slot"
-msgstr "--two-phase може бути вказано тільки з --create-slot"
+msgid "%s may only be specified with --create-slot"
+msgstr "%s можна вказати лише з --create-slot"
 
-#: pg_recvlogical.c:956
+#: pg_recvlogical.c:977
 #, c-format
 msgid "could not establish database-specific replication connection"
 msgstr "не вдалося встановити підключення для реплікації до вказаної бази даних"
 
-#: pg_recvlogical.c:1056
+#: pg_recvlogical.c:1078
 #, c-format
 msgid "end position %X/%X reached by keepalive"
 msgstr "кінцева позиція %X/%X досягнута наживо"
 
-#: pg_recvlogical.c:1061
+#: pg_recvlogical.c:1083
 #, c-format
 msgid "end position %X/%X reached by WAL record at %X/%X"
 msgstr "кінцева позиція %X/%X досягнута WAL записом %X/%X"
 
-#: receivelog.c:66
+#: receivelog.c:65
 #, c-format
 msgid "could not create archive status file \"%s\": %s"
 msgstr "не вдалося створити файл статусу архіву \"%s\": %s"
 
-#: receivelog.c:73
+#: receivelog.c:72
 #, c-format
 msgid "could not close archive status file \"%s\": %s"
 msgstr "не вдалося закрити файл статусу архіву \"%s\": %s"
 
-#: receivelog.c:122
+#: receivelog.c:121
 #, c-format
 msgid "could not get size of write-ahead log file \"%s\": %s"
 msgstr "не вдалося отримати розмір файлу випереджувального журналювання \"%s\": %s"
 
-#: receivelog.c:133
+#: receivelog.c:132
 #, c-format
 msgid "could not open existing write-ahead log file \"%s\": %s"
 msgstr "не вдалося відкрити існуючий файл випереджувального журналювання \"%s\": %s"
 
-#: receivelog.c:142
+#: receivelog.c:141
 #, c-format
 msgid "could not fsync existing write-ahead log file \"%s\": %s"
 msgstr "не вдалося fsync існуючий файл випереджувального журналювання \"%s\": %s"
 
-#: receivelog.c:157
+#: receivelog.c:156
 #, c-format
 msgid "write-ahead log file \"%s\" has %zd byte, should be 0 or %d"
 msgid_plural "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d"
@@ -2308,107 +2440,107 @@ msgstr[1] "файл випереджувального журналювання
 msgstr[2] "файл випереджувального журналювання \"%s\" має %zd байтів, а повинен мати 0 або %d"
 msgstr[3] "файл випереджувального журналювання \"%s\" має %zd байтів, а повинен мати 0 або %d"
 
-#: receivelog.c:175
+#: receivelog.c:174
 #, c-format
 msgid "could not open write-ahead log file \"%s\": %s"
 msgstr "не вдалося відкрити файл випереджувального журналювання \"%s\": %s"
 
-#: receivelog.c:216
+#: receivelog.c:215
 #, c-format
 msgid "not renaming \"%s\", segment is not complete"
 msgstr "не перейменовується \"%s\", сегмент не завершений"
 
-#: receivelog.c:227 receivelog.c:317 receivelog.c:688
+#: receivelog.c:226 receivelog.c:316 receivelog.c:687
 #, c-format
 msgid "could not close file \"%s\": %s"
 msgstr "не вдалося закрити файл \"%s\": %s"
 
-#: receivelog.c:288
+#: receivelog.c:287
 #, c-format
 msgid "server reported unexpected history file name for timeline %u: %s"
 msgstr "сервер повідомив неочікуване ім'я файлу історії часової шкали %u: %s"
 
-#: receivelog.c:297
+#: receivelog.c:296
 #, c-format
 msgid "could not create timeline history file \"%s\": %s"
 msgstr "не вдалося створити файл історії часової шкали \"%s\": %s"
 
-#: receivelog.c:304
+#: receivelog.c:303
 #, c-format
 msgid "could not write timeline history file \"%s\": %s"
 msgstr "не вдалося записати файл історії часової шкали \"%s\": %s"
 
-#: receivelog.c:394
+#: receivelog.c:393
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions older than %s"
 msgstr "несумісна версія серверу %s; клієнт не підтримує потокове передавання з версій серверу старіших, ніж %s"
 
-#: receivelog.c:403
+#: receivelog.c:402
 #, c-format
 msgid "incompatible server version %s; client does not support streaming from server versions newer than %s"
 msgstr "несумісна версія серверу %s; клієнт не підтримує потокове передавання з версій серверу новіших, ніж %s"
 
-#: receivelog.c:508
+#: receivelog.c:507
 #, c-format
 msgid "system identifier does not match between base backup and streaming connection"
 msgstr "системний ідентифікатор базової резервної копії не відповідає ідентифікатору потокового передавання підключення"
 
-#: receivelog.c:516
+#: receivelog.c:515
 #, c-format
 msgid "starting timeline %u is not present in the server"
 msgstr "початкова часова шкала %u не існує на сервері"
 
-#: receivelog.c:555
+#: receivelog.c:554
 #, c-format
 msgid "unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "неочікувана відповідь на команду TIMELINE_HISTORY: отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
 
-#: receivelog.c:626
+#: receivelog.c:625
 #, c-format
 msgid "server reported unexpected next timeline %u, following timeline %u"
 msgstr "сервер неочікувано повідомив наступну часову шкалу %u після часової шкали %u"
 
-#: receivelog.c:632
+#: receivelog.c:631
 #, c-format
 msgid "server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X"
 msgstr "сервер зупинив потокове передавання часової шкали %u в позиції %X/%X, але повідомив, що наступна часова шкала %u почнеться в позиції %X/%X"
 
-#: receivelog.c:672
+#: receivelog.c:671
 #, c-format
 msgid "replication stream was terminated before stop point"
 msgstr "потік реплікації перервано до точки зупинки"
 
-#: receivelog.c:718
+#: receivelog.c:717
 #, c-format
 msgid "unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "неочікуваний набір результатів після кінця часової шкали: отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
 
-#: receivelog.c:727
+#: receivelog.c:726
 #, c-format
 msgid "could not parse next timeline's starting point \"%s\""
 msgstr "не вдалося аналізувати початкову точку наступної часової шкали \"%s\""
 
-#: receivelog.c:775 receivelog.c:1022 walmethods.c:1206
+#: receivelog.c:774 receivelog.c:1029 walmethods.c:1206
 #, c-format
 msgid "could not fsync file \"%s\": %s"
 msgstr "не вдалося fsync файл \"%s\": %s"
 
-#: receivelog.c:1083
+#: receivelog.c:1090
 #, c-format
 msgid "received write-ahead log record for offset %u with no file open"
 msgstr "отримано запис випереджувального журналювання для зсуву %u з закритим файлом"
 
-#: receivelog.c:1093
+#: receivelog.c:1100
 #, c-format
 msgid "got WAL data offset %08x, expected %08x"
 msgstr "отримано дані зсуву WAL %08x, очікувалось %08x"
 
-#: receivelog.c:1128
+#: receivelog.c:1135
 #, c-format
 msgid "could not write %d bytes to WAL file \"%s\": %s"
 msgstr "не вдалося записати %d байт до файлу WAL \"%s\": %s"
 
-#: receivelog.c:1153 receivelog.c:1193 receivelog.c:1222
+#: receivelog.c:1160 receivelog.c:1200 receivelog.c:1228
 #, c-format
 msgid "could not send copy-end packet: %s"
 msgstr "не вдалося відправити пакет кінця копіювання \"copy-end\": %s"
@@ -2422,11 +2554,6 @@ msgstr "Пароль: "
 msgid "could not connect to server"
 msgstr "не вдалося підключитись до серверу"
 
-#: streamutil.c:230
-#, c-format
-msgid "could not clear \"search_path\": %s"
-msgstr "не вдалося очистити \"search_path\": %s"
-
 #: streamutil.c:246
 #, c-format
 msgid "could not determine server setting for \"integer_datetimes\""
@@ -2437,17 +2564,17 @@ msgstr "не вдалося визначити налаштування серв
 msgid "\"integer_datetimes\" compile flag does not match server"
 msgstr "флаг компіляції \"integer_datetimes\" не відповідає серверу"
 
-#: streamutil.c:372
+#: streamutil.c:304
 #, c-format
 msgid "could not fetch WAL segment size: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "не вдалося отримати розмір сегменту WAL: отримано %d рядків і %d полів, очікувалось %d рядків і %d або більше полів"
 
-#: streamutil.c:382
+#: streamutil.c:314
 #, c-format
 msgid "WAL segment size could not be parsed"
 msgstr "не вдалося аналізувати розмір сегмента WAL"
 
-#: streamutil.c:400
+#: streamutil.c:332
 #, c-format
 msgid "remote server reported invalid WAL segment size (%d byte)"
 msgid_plural "remote server reported invalid WAL segment size (%d bytes)"
@@ -2456,52 +2583,52 @@ msgstr[1] "віддалений сервер повідомив про непр
 msgstr[2] "віддалений сервер повідомив про неправильний розмір сегмента WAL (%d байтів)"
 msgstr[3] "віддалений сервер повідомив про неправильний розмір сегмента WAL (%d байтів)"
 
-#: streamutil.c:404
+#: streamutil.c:336
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Розмір сегмента WAL повинен бути степенем двійки від 1 МБ до 1 ГБ."
 
-#: streamutil.c:446
+#: streamutil.c:378
 #, c-format
 msgid "could not fetch group access flag: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "не вдалося вилучити позначку доступа групи: отримано %d рядків і %d полів, очікувалось %d рядків і %d або більше полів"
 
-#: streamutil.c:455
+#: streamutil.c:387
 #, c-format
 msgid "group access flag could not be parsed: %s"
 msgstr "не вдалося аналізувати позначку доступа групи: %s"
 
-#: streamutil.c:498 streamutil.c:535
+#: streamutil.c:430 streamutil.c:467
 #, c-format
 msgid "could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields"
 msgstr "не вдалося ідентифікувати систему: отримано %d рядків і %d полів, очікувалось %d рядків і %d або більше полів"
 
-#: streamutil.c:587
+#: streamutil.c:519
 #, c-format
 msgid "could not read replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "не вдалося прочитати слот реплікації \"%s\": отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
 
-#: streamutil.c:599
+#: streamutil.c:531
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "слот реплікації \"%s\" не існує"
 
-#: streamutil.c:610
+#: streamutil.c:542
 #, c-format
 msgid "expected a physical replication slot, got type \"%s\" instead"
 msgstr "очікувався слот фізичної реплікації, а натомість знайдено \"%s\""
 
-#: streamutil.c:624
+#: streamutil.c:556
 #, c-format
 msgid "could not parse restart_lsn \"%s\" for replication slot \"%s\""
 msgstr "не вдалося аналізувати restart_lsn \"%s\" для слоту реплікації \"%s\""
 
-#: streamutil.c:741
+#: streamutil.c:678
 #, c-format
 msgid "could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "не вдалося створити слот реплікації \"%s\": отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
 
-#: streamutil.c:785
+#: streamutil.c:722
 #, c-format
 msgid "could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields"
 msgstr "не вдалося видалити слот реплікації \"%s\": отримано %d рядків і %d полів, очікувалось %d рядків і %d полів"
diff --git a/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl b/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
index ca39f6fbe02..9936c0d6bc5 100644
--- a/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
+++ b/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
@@ -341,8 +341,8 @@ sub generate_db
 
 $node_p->wait_for_replay_catchup($node_s);
 
-ok($node_s->safe_psql($db1, "SELECT COUNT(*) = 2 FROM pg_publication"),
-	'two pre-existing publications on subscriber');
+is($node_s->safe_psql($db1, "SELECT COUNT(*) FROM pg_publication"),
+	'2', 'two pre-existing publications on subscriber');
 
 $node_s->stop;
 
@@ -437,11 +437,11 @@ sub generate_db
 # Verify that the required logical replication objects are output.
 # The expected count 3 refers to postgres, $db1 and $db2 databases.
 # ivorysql expected count 4 refers to ivorysql, postgres, $db1 and $db2 databases.
-is(scalar(() = $stderr =~ /creating publication/g),
+is(scalar(() = $stderr =~ /would create publication/g),
 	4, "verify publications are created for all databases");
-is(scalar(() = $stderr =~ /creating the replication slot/g),
+is(scalar(() = $stderr =~ /would create the replication slot/g),
 	4, "verify replication slots are created for all databases");
-is(scalar(() = $stderr =~ /creating subscription/g),
+is(scalar(() = $stderr =~ /would create subscription/g),
 	4, "verify subscriptions are created for all databases");
 
 # Run pg_createsubscriber on node S.  --verbose is used twice
diff --git a/src/bin/pg_checksums/po/es.po b/src/bin/pg_checksums/po/es.po
index 4a45c85987b..4c83b1990db 100644
--- a/src/bin/pg_checksums/po/es.po
+++ b/src/bin/pg_checksums/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_checksums (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:53+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:23+0000\n"
+"PO-Revision-Date: 2025-09-21 11:25+0200\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: pgsql-es-ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -78,9 +78,9 @@ msgstr ""
 "serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
 "directorio de datos."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
@@ -90,8 +90,8 @@ msgstr "no se pudo abrir el archivo «%s»: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
@@ -107,35 +107,35 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -155,7 +155,7 @@ msgstr "%s debe estar en el rango %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "método sync no reconocido: %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid ""
 "%s enables, disables, or verifies data checksums in a PostgreSQL database cluster.\n"
@@ -165,17 +165,17 @@ msgstr ""
 "clúster PostgreSQL.\n"
 "\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCIÓN]... [DATADIR]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid ""
 "\n"
@@ -184,62 +184,62 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]DATADIR    directorio de datos\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr "  -c, --check              verificar checksums (por omisión)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable            desactivar checksums\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable             activar checksums\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
 msgstr "  -f, --filenode=FILENODE  verificar sólo la relación con el filenode dado\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid "  -N, --no-sync            do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync            no esperar que los cambios se sincronicen a disco\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           mostrar información de progreso\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=MÉTODO definir método para sincr. archivos a disco\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose            desplegar mensajes verbosos\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            mostrar información de versión y salir\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               mostrar esta ayuda y salir\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid ""
 "\n"
@@ -252,177 +252,177 @@ msgstr ""
 "la variable de entorno PGDATA.\n"
 "\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Reporte errores a <%s>.\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld MB (%d%%) calculado"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> MB (%d%%) calculado"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "no se pudo leer el bloque %u del archivo «%s»: %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "no se pudo leer bloque %u en archivo «%s»: leídos %d de %d"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated checksum %X but block contains %X"
 msgstr "verificación de checksums falló en archivo «%s», bloque %u: checksum calculado %X pero bloque contiene %X"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "posicionamiento (seek) falló para el bloque %u en archivo «%s»: %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "no se pudo escribir el bloque %u en el archivo «%s»: %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "no se pudo escribir el bloque %u en el archivo «%s»: se escribieron %d de %d"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "checksums verificados en archivo «%s»"
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "checksums activados en archivo «%s»"
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "número de segmento %d no válido en nombre de archivo «%s»"
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "no se especificó el directorio de datos"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "la opción -f/--filenode sólo puede usarse con --check"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "el valor de CRC de pg_control es incorrecto"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "el clúster no es compatible con esta versión de pg_checksums"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "el clúster de bases de datos no es compatible"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid "The database cluster was initialized with block size %u, but pg_checksums was compiled with block size %u."
 msgstr "El clúster fue inicializado con tamaño de bloque %u, pero pg_checksums fue compilado con tamaño de bloques %u."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "el clúster debe estar apagado"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "los checksums de datos no están activados en el clúster"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "los checksums de datos ya están desactivados en el clúster"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "los checksums de datos ya están activados en el clúster"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Operación de checksums completa\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "Archivos recorridos:   %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "Archivos recorridos:   %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "Bloques recorridos:    %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "Bloques recorridos:    %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "Checksums incorrectos: %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "Checksums incorrectos: %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Versión de checksums de datos: %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "Archivos escritos:   %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "Archivos escritos:   %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "Bloques escritos:    %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "Bloques escritos:    %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "sincronizando directorio de datos"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "actualizando archivo de control"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Checksums activos en el clúster\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Checksums inactivos en el clúster\n"
diff --git a/src/bin/pg_checksums/po/fr.po b/src/bin/pg_checksums/po/fr.po
index dcd82587d4f..caf79ae8ee9 100644
--- a/src/bin/pg_checksums/po/fr.po
+++ b/src/bin/pg_checksums/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-20 21:25+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-07 18:54+0000\n"
+"PO-Revision-Date: 2025-07-07 21:40+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
@@ -79,9 +79,9 @@ msgstr ""
 "résultats ci-dessous sont incorrects, et l'installation de PostgreSQL\n"
 "est incompatible avec ce répertoire des données."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
@@ -91,8 +91,8 @@ msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
@@ -108,35 +108,35 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -156,7 +156,7 @@ msgstr "%s doit être compris entre %d et %d"
 msgid "unrecognized sync method: %s"
 msgstr "méthode de synchronisation non reconnu : %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid ""
 "%s enables, disables, or verifies data checksums in a PostgreSQL database cluster.\n"
@@ -166,17 +166,17 @@ msgstr ""
 "une instance PostgreSQL.\n"
 "\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid ""
 "\n"
@@ -185,66 +185,66 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]REP_DONNEES  répertoire des données\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr "  -c, --check                vérifie les sommes de contrôle (par défaut)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable              désactive les sommes de contrôle\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable               active les sommes de contrôle\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
 msgstr ""
 "  -f, --filenode=FILENODE    vérifie seulement la relation dont l'identifiant\n"
 "                             relfilenode est indiqué\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid "  -N, --no-sync            do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --no-sync              n'attend pas que les modifications soient\n"
 "                             proprement écrites sur disque\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress             affiche la progression de l'opération\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=METHODE  configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose              affiche des messages verbeux\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid ""
 "\n"
@@ -257,177 +257,177 @@ msgstr ""
 "PGDATA est utilisée.\n"
 "\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapporter les bogues à <%s>.\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld Mo (%d%%) traités"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> Mo (%d%%) traités"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "n'a pas pu lire le bloc %u dans le fichier « %s » : %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "n'a pas pu lire le bloc %u dans le fichier « %s » : %d lus sur %d"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated checksum %X but block contains %X"
 msgstr "échec de la vérification de la somme de contrôle dans le fichier « %s », bloc %u : somme de contrôle calculée %X, alors que le bloc contient %X"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "n'a pas pu rechercher le bloc %u dans le fichier « %s » : %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "n'a pas pu écrire le bloc %u dans le fichier « %s » : %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "n'a pas pu écrire le bloc %u du fichier « %s » : a écrit %d octets sur %d"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "sommes de contrôle vérifiées dans le fichier « %s »"
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "sommes de contrôle activées dans le fichier « %s »"
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "numéro de segment %d invalide dans le nom de fichier « %s »"
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "aucun répertoire de données indiqué"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "l'option « -f/--filenode » peut seulement être utilisée avec --check"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "la valeur CRC de pg_control n'est pas correcte"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "l'instance n'est pas compatible avec cette version de pg_checksums"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "l'instance n'est pas compatible"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid "The database cluster was initialized with block size %u, but pg_checksums was compiled with block size %u."
 msgstr "L'instance a été initialisée avec une taille de bloc à %u alors que pg_checksums a été compilé avec une taille de bloc à %u."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "l'instance doit être arrêtée"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "les sommes de contrôle sur les données ne sont pas activées sur cette instance"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "les sommes de contrôle sur les données sont déjà désactivées sur cette instance"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "les sommes de contrôle sur les données sont déjà activées sur cette instance"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Opération sur les sommes de contrôle terminée\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "Fichiers parcourus : %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "Fichiers parcourus : %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "Blocs parcourus : %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "Blocs parcourus : %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "Mauvaises sommes de contrôle : %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "Mauvaises sommes de contrôle : %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Version des sommes de contrôle sur les données : %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "Fichiers écrits : %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "Fichiers écrits : %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "Blocs écrits : %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "Blocs écrits : %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "synchronisation du répertoire des données"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "mise à jour du fichier de contrôle"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Sommes de contrôle sur les données activées sur cette instance\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Sommes de contrôle sur les données désactivées sur cette instance\n"
diff --git a/src/bin/pg_checksums/po/ko.po b/src/bin/pg_checksums/po/ko.po
index f8c71ae2ead..39f99ebb80e 100644
--- a/src/bin/pg_checksums/po/ko.po
+++ b/src/bin/pg_checksums/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_checksums (PostgreSQL) 17\n"
+"Project-Id-Version: pg_checksums (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:54+0000\n"
-"PO-Revision-Date: 2025-01-16 15:23+0900\n"
+"POT-Creation-Date: 2025-09-11 21:54+0000\n"
+"PO-Revision-Date: 2025-09-09 16:48+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: PostgreSQL Korea <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -75,9 +75,9 @@ msgstr ""
 "이럴 경우, 출력 결과가 바르지 않을 수 있고,\n"
 "설치된 PostgreSQL 프로그램과 데이터 디렉터리가 호환되지 않을 수 있습니다."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
@@ -87,8 +87,8 @@ msgstr "\"%s\" 파일을 열 수 없음: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일을 쓸 수 없음: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
@@ -104,35 +104,35 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "널 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위해 파일 시스템 동기화를 할 수 없음: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -152,7 +152,7 @@ msgstr "%s 값은 %d부터 %d까지 지정할 수 있습니다."
 msgid "unrecognized sync method: %s"
 msgstr "알 수 없는 동기화 방법: %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid ""
 "%s enables, disables, or verifies data checksums in a PostgreSQL database "
@@ -163,17 +163,17 @@ msgstr ""
 "비활성화 또는 유효성 검사를 합니다.\n"
 "\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [옵션]... [DATADIR]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid ""
 "\n"
@@ -182,33 +182,33 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]DATADIR    데이터 디렉터리\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr "  -c, --check              실 작업 없이, 그냥 검사만 (기본값)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable            자료 페이지 체크섬 비활성화\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable             자료 페이지 체크섬 활성화\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid ""
 "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
 msgstr "  -f, --filenode=FILENODE  지정한 파일노드만 검사\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid ""
 "  -N, --no-sync            do not wait for changes to be written safely to "
@@ -216,32 +216,32 @@ msgid ""
 msgstr ""
 "  -N, --no-sync            작업 완료 뒤 디스크 동기화 작업을 하지 않음\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           진행 과정 보여줌\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD 파일을 디스크에 동기화 하는 방법 지정\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose            자세한 작업 메시지 보여줌\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            버전 정보를 보여주고 마침\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               이 도움말을 보여주고 마침\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid ""
 "\n"
@@ -255,32 +255,32 @@ msgstr ""
 "사용합니다.\n"
 "\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "문제점 보고 주소: <%s>\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld MB (%d%%) 계산됨"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> MB (%d%%) 계산됨"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "%u 블럭을 \"%s\" 파일에서 읽을 수 없음: %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "%u 블럭을 \"%s\" 파일에서 읽을 수 없음: %d / %d 바이트만 읽음"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid ""
 "checksum verification failed in file \"%s\", block %u: calculated checksum "
@@ -289,72 +289,72 @@ msgstr ""
 "\"%s\" 파일, %u 블럭의  체크섬 검사 실패: 계산된 체크섬은 %X 값이지만, 블럭에"
 "는 %X 값이 있음"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "%u 블럭을 \"%s\" 파일에서 찾을 수 없음: %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "%u 블럭을 \"%s\" 파일에 쓸 수 없음: %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "%u 블럭을 \"%s\" 파일에 쓸 수 없음: %d / %d 바이트만 씀"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "\"%s\" 파일 체크섬 검사 마침"
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "\"%s\" 파일 체크섬 활성화 함"
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "잘못된 조각 번호 %d, 해당 파일: \"%s\""
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "데이터 디렉터리를 지정하지 않았음"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인수를 지정했음 (처음 \"%s\")"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "-f/--filenode 옵션은 --check 옵션만 사용할 수 있음"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "pg_control CRC 값이 잘못되었음"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "해당 클러스터는 이 버전 pg_checksum과 호환되지 않음"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "데이터베이스 클러스터는 호환되지 않음"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid ""
 "The database cluster was initialized with block size %u, but pg_checksums "
@@ -363,77 +363,77 @@ msgstr ""
 "이 데이터베이스 클러스터는 %u 블록 크기로 초기화 되었지만, pg_checksum은 %u "
 "블록 크기로 컴파일 되어있습니다."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "먼저 서버가 중지되어야 함"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "이 클러스터는 자료 체크섬이 비활성화 상태임"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "이 클러스터는 이미 자료 체크섬이 비활성화 상태임"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "이 클러스터는 이미 자료 체크섬이 활성화 상태임"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "체크섬 작업 완료\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "조사한 파일수: %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "조사한 파일수:   %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "조사한 블럭수: %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "조사한 블럭수:   %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "잘못된 체크섬: %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "잘못된 체크섬:  %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "자료 체크섬 버전: %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "기록한 파일수: %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "기록한 파일수:  %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "기록한 블럭수: %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "기록한 블럭수:  %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "데이터 디렉터리 fsync 중"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "컨트롤 파일 바꾸는 중"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "이 클러스터는 자료 체크섬 옵션이 활성화 되었음\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "이 클러스터는 자료 체크섬 옵션이 비활성화 되었음\n"
diff --git a/src/bin/pg_checksums/po/ru.po b/src/bin/pg_checksums/po/ru.po
index 30f9791b046..a0cbfa15d6b 100644
--- a/src/bin/pg_checksums/po/ru.po
+++ b/src/bin/pg_checksums/po/ru.po
@@ -1,10 +1,10 @@
-# Alexander Lakhin <a.lakhin@postgrespro.ru>, 2019, 2020, 2021, 2022, 2024.
+# SPDX-FileCopyrightText: 2019, 2020, 2021, 2022, 2024, 2025 Alexander Lakhin <a.lakhin@postgrespro.ru>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_verify_checksums (PostgreSQL) 11\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
-"PO-Revision-Date: 2024-09-04 13:35+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-08-31 07:39+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -70,9 +70,9 @@ msgstr ""
 "этой программой. В этом случае результаты будут неверными и\n"
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
@@ -82,8 +82,8 @@ msgstr "не удалось открыть файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
@@ -99,35 +99,35 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -147,7 +147,7 @@ msgstr "значение %s должно быть в диапазоне %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid ""
 "%s enables, disables, or verifies data checksums in a PostgreSQL database "
@@ -158,17 +158,17 @@ msgstr ""
 "PostgreSQL.\n"
 "\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [ПАРАМЕТР]... [КАТАЛОГ]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid ""
 "\n"
@@ -177,29 +177,29 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]КАТ_ДАННЫХ каталог данных\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr ""
 "  -c, --check              проверить контрольные суммы данных (по "
 "умолчанию)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable            отключить контрольные суммы\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable             включить контрольные суммы\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid ""
 "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
@@ -207,7 +207,7 @@ msgstr ""
 "  -f, --filenode=ФАЙЛ_УЗЕЛ проверить только отношение с заданным файловым "
 "узлом\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid ""
 "  -N, --no-sync            do not wait for changes to be written safely to "
@@ -215,32 +215,32 @@ msgid ""
 msgstr ""
 "  -N, --no-sync            не ждать завершения сохранения данных на диске\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           показывать прогресс операции\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=МЕТОД  метод синхронизации файлов с ФС\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose            выводить подробные сообщения\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            показать версию и выйти\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               показать эту справку и выйти\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid ""
 "\n"
@@ -254,32 +254,32 @@ msgstr ""
 "переменной окружения PGDATA.\n"
 "\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld МБ (%d%%) обработано"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> МБ (%d%%) обработано"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "не удалось прочитать блок %u в файле \"%s\": %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "не удалось прочитать блок %u в файле \"%s\" (прочитано байт: %d из %d)"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid ""
 "checksum verification failed in file \"%s\", block %u: calculated checksum "
@@ -288,72 +288,72 @@ msgstr ""
 "ошибка контрольных сумм в файле \"%s\", блоке %u: вычислена контрольная "
 "сумма %X, но блок содержит %X"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "ошибка при переходе к блоку %u в файле \"%s\": %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "не удалось записать блок %u в файл \"%s\": %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "не удалось записать блок %u в файле \"%s\" (записано байт: %d из %d)"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "контрольные суммы в файле \"%s\" проверены"
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "контрольные суммы в файле \"%s\" включены"
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "неверный номер сегмента %d в имени файла \"%s\""
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог данных не указан"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "параметр -f/--filenode можно использовать только с --check"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "ошибка контрольного значения в pg_control"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "кластер несовместим с этой версией pg_checksums"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "несовместимый кластер баз данных"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid ""
 "The database cluster was initialized with block size %u, but pg_checksums "
@@ -362,77 +362,77 @@ msgstr ""
 "Кластер баз данных был инициализирован с размером блока %u, а утилита "
 "pg_checksums скомпилирована для размера блока %u."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "кластер должен быть отключён"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "контрольные суммы в кластере не включены"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "контрольные суммы в кластере уже отключены"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "контрольные суммы в кластере уже включены"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Обработка контрольных сумм завершена\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "Просканировано файлов: %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "Просканировано файлов: %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "Просканировано блоков: %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "Просканировано блоков: %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "Неверные контрольные суммы: %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "Неверные контрольные суммы: %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Версия контрольных сумм данных: %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "Записано файлов: %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "Записано файлов: %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "Записано блоков: %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "Записано блоков: %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "синхронизация каталога данных"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "модификация управляющего файла"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Контрольные суммы в кластере включены\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Контрольные суммы в кластере отключены\n"
diff --git a/src/bin/pg_checksums/po/sv.po b/src/bin/pg_checksums/po/sv.po
index 245aa1722ae..a04fe6ede0d 100644
--- a/src/bin/pg_checksums/po/sv.po
+++ b/src/bin/pg_checksums/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_checksums
 # Copyright (C) 2019 PostgreSQL Global Development Group
 # This file is distributed under the same license as the pg_checksums (PostgreSQL) package.
-# Dennis Björklund <db@zigo.dhs.org>, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 14:25+0000\n"
-"PO-Revision-Date: 2024-07-12 18:57+0200\n"
+"POT-Creation-Date: 2025-05-11 15:54+0000\n"
+"PO-Revision-Date: 2025-05-12 21:36+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -74,9 +74,9 @@ msgstr ""
 "inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
@@ -86,8 +86,8 @@ msgstr "kunde inte öppna fil \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
@@ -103,35 +103,35 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -151,7 +151,7 @@ msgstr "%s måste vara i intervallet %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "okänd synkmetod: %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid ""
 "%s enables, disables, or verifies data checksums in a PostgreSQL database cluster.\n"
@@ -160,17 +160,17 @@ msgstr ""
 "%s slår på, slår av eller verifierar datakontrollsummor i ett PostgreSQL databaskluster.\n"
 "\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [FLAGGA]... [DATAKATALOG]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid ""
 "\n"
@@ -179,62 +179,62 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]DATAKAT    datakatalog\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr "  -c, --check              kontrollera datakontrollsummor (standard)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable            slå av datakontrollsummor\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable             slå på datakontrollsummor\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
 msgstr "  -f, --filenode=FILNOD    kontrollera bara relation med angiven filnod\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid "  -N, --no-sync            do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync            vänta inte på att ändingar säkert skrivits till disk\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           visa förloppsinformation\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=METOD  sätt synkmetod för att synka filer till disk\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose            visa utförliga meddelanden\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            visa versionsinformation, avsluta sedan\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               visa denna hjälp, avsluta sedan\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid ""
 "\n"
@@ -247,177 +247,177 @@ msgstr ""
 "PGDATA för detta syfte.\n"
 "\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapportera fel till <%s>.\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld MB (%d%%) beräknad"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> MB (%d%%) beräknad"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "kunde inte läsa block %u i fil \"%s\": %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "kunde inte läsa block %u i fil \"%s\": läste %d av %d"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated checksum %X but block contains %X"
 msgstr "verifiering av kontrollsumma misslyckades i fil \"%s\", block %u: beräknad kontrollsumma är %X men blocket innehåller %X"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "seek misslyckades för block %u i fil \"%s\": %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "kunde inte skriva block %u i fil \"%s\": %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "kunde inte skriva block %u i fil \"%s\": skrev %d av %d"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "kontrollsummor verifierade i fil \"%s\""
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "kontrollsummor påslagen i fil \"%s\""
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "ogiltigt segmentnummer %d i filnamn \"%s\""
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "ingen datakatalog angiven"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "inställningen -f/--filenode tillåts bara med --check"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "pg_control CRC-värde är inkorrekt"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "klustret är inte kompatibelt med denna version av pg_checksums"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "databasklustret är inte kompatibelt"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid "The database cluster was initialized with block size %u, but pg_checksums was compiled with block size %u."
 msgstr "Databasklustret initierades med blockstorlek %u men pg_checksums kompilerades med blockstorlek %u."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "klustret måste stängas ner"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "datakontrollsummor är inte påslaget i klustret"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "datakontrollsummor är redan avslaget i klustret"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "datakontrollsummor är redan påslagna i klustret"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Kontrollsummeoperation avslutad\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "Skannade filer:           %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "Skannade filer:           %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "Skannade block:           %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "Skannade block:           %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "Felaktiga kontrollsummor: %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "Felaktiga kontrollsummor: %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Datakontrollsummeversion: %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "Skrivna filer:            %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "Skrivna filer:            %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "Skrivna block:            %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "Skrivna block:            %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "synkar datakatalogen"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "uppdaterar kontrollfil"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Kontrollsummor påslaget i klustret\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Kontrollsummor avslaget i klustret\n"
diff --git a/src/bin/pg_checksums/po/uk.po b/src/bin/pg_checksums/po/uk.po
index 747d6867562..af80fdaee5b 100644
--- a/src/bin/pg_checksums/po/uk.po
+++ b/src/bin/pg_checksums/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:25+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:55+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_checksums.pot\n"
-"X-Crowdin-File-ID: 1000\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_checksums.pot\n"
+"X-Crowdin-File-ID: 1081\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -70,9 +70,9 @@ msgid "possible byte ordering mismatch\n"
 msgstr "можлива помилка у послідовності байтів.\n"
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_checksums.c:192
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_checksums.c:191
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
@@ -82,8 +82,8 @@ msgstr "не можливо відкрити файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
@@ -99,35 +99,35 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: pg_checksums.c:338 pg_checksums.c:407
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: pg_checksums.c:337 pg_checksums.c:406
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_checksums.c:310
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_checksums.c:309
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -147,84 +147,84 @@ msgstr "%s має бути в діапазоні %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
-#: pg_checksums.c:70
+#: pg_checksums.c:69
 #, c-format
 msgid "%s enables, disables, or verifies data checksums in a PostgreSQL database cluster.\n\n"
 msgstr "%s активує, деактивує або перевіряє контрольні суми даних в кластері бази даних PostgreSQL.\n\n"
 
-#: pg_checksums.c:71
+#: pg_checksums.c:70
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_checksums.c:72
+#: pg_checksums.c:71
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [DATADIR]\n"
 
-#: pg_checksums.c:73
+#: pg_checksums.c:72
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_checksums.c:74
+#: pg_checksums.c:73
 #, c-format
 msgid " [-D, --pgdata=]DATADIR    data directory\n"
 msgstr " [-D, --pgdata=]DATADIR         каталог даних\n"
 
-#: pg_checksums.c:75
+#: pg_checksums.c:74
 #, c-format
 msgid "  -c, --check              check data checksums (default)\n"
 msgstr "  -c, --check              перевірити контрольні суми даних (за замовчуванням)\n"
 
-#: pg_checksums.c:76
+#: pg_checksums.c:75
 #, c-format
 msgid "  -d, --disable            disable data checksums\n"
 msgstr "  -d, --disable            вимкнути контрольні суми даних\n"
 
-#: pg_checksums.c:77
+#: pg_checksums.c:76
 #, c-format
 msgid "  -e, --enable             enable data checksums\n"
 msgstr "  -e, --enable             активувати контрольні суми даних\n"
 
-#: pg_checksums.c:78
+#: pg_checksums.c:77
 #, c-format
 msgid "  -f, --filenode=FILENODE  check only relation with specified filenode\n"
 msgstr "  -f, --filenode=FILENODE перевіряти відношення лише із вказаним файлом\n"
 
-#: pg_checksums.c:79
+#: pg_checksums.c:78
 #, c-format
 msgid "  -N, --no-sync            do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync          не чекати на безпечний запис змін на диск\n"
 
-#: pg_checksums.c:80
+#: pg_checksums.c:79
 #, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           показати інформацію про прогрес\n"
 
-#: pg_checksums.c:81
+#: pg_checksums.c:80
 #, c-format
 msgid "      --sync-method=METHOD set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD встановити метод синхронізації файлів на диск\n"
 
-#: pg_checksums.c:82
+#: pg_checksums.c:81
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose          виводити детальні повідомлення\n"
 
-#: pg_checksums.c:83
+#: pg_checksums.c:82
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію, потім вийти\n"
 
-#: pg_checksums.c:84
+#: pg_checksums.c:83
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: pg_checksums.c:85
+#: pg_checksums.c:84
 #, c-format
 msgid "\n"
 "If no data directory (DATADIR) is specified, the environment variable PGDATA\n"
@@ -232,177 +232,177 @@ msgid "\n"
 msgstr "\n"
 "Якщо каталог даних не вказано (DATADIR), використовується змінна середовища PGDATA.\n\n"
 
-#: pg_checksums.c:87
+#: pg_checksums.c:86
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Повідомляти про помилки на <%s>.\n"
 
-#: pg_checksums.c:88
+#: pg_checksums.c:87
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: pg_checksums.c:145
+#: pg_checksums.c:144
 #, c-format
-msgid "%lld/%lld MB (%d%%) computed"
-msgstr "%lld/%lld MB (%d%%) обчислено"
+msgid "%<PRId64>/%<PRId64> MB (%d%%) computed"
+msgstr "%<PRId64>/%<PRId64> МБ (%d%%) обчислено"
 
-#: pg_checksums.c:206
+#: pg_checksums.c:205
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
 msgstr "не вдалося прочитати блок %u в файлі \"%s\": %m"
 
-#: pg_checksums.c:209
+#: pg_checksums.c:208
 #, c-format
 msgid "could not read block %u in file \"%s\": read %d of %d"
 msgstr "не вдалося прочитати блок %u у файлі \"%s\": прочитано %d з %d"
 
-#: pg_checksums.c:232
+#: pg_checksums.c:231
 #, c-format
 msgid "checksum verification failed in file \"%s\", block %u: calculated checksum %X but block contains %X"
 msgstr "помилка перевірки контрольних сум у файлі \"%s\", блок %u: обчислена контрольна сума %X, але блок містить %X"
 
-#: pg_checksums.c:255
+#: pg_checksums.c:254
 #, c-format
 msgid "seek failed for block %u in file \"%s\": %m"
 msgstr "помилка пошуку для блоку %u у файлі \"%s\": %m"
 
-#: pg_checksums.c:262
+#: pg_checksums.c:261
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
 msgstr "не вдалося записати блок %u у файл \"%s\": %m"
 
-#: pg_checksums.c:265
+#: pg_checksums.c:264
 #, c-format
 msgid "could not write block %u in file \"%s\": wrote %d of %d"
 msgstr "не вдалося записати блок %u у файлі \"%s\": записано %d з %d"
 
-#: pg_checksums.c:277
+#: pg_checksums.c:276
 #, c-format
 msgid "checksums verified in file \"%s\""
 msgstr "контрольні суми у файлі \"%s\" перевірені"
 
-#: pg_checksums.c:279
+#: pg_checksums.c:278
 #, c-format
 msgid "checksums enabled in file \"%s\""
 msgstr "контрольні суми у файлі \"%s\" активовані"
 
-#: pg_checksums.c:362
+#: pg_checksums.c:361
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "неприпустимий номер сегменту %d в імені файлу \"%s\""
 
-#: pg_checksums.c:509 pg_checksums.c:525 pg_checksums.c:535 pg_checksums.c:543
+#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_checksums.c:524
+#: pg_checksums.c:523
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог даних не вказано"
 
-#: pg_checksums.c:533
+#: pg_checksums.c:532
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_checksums.c:542
+#: pg_checksums.c:541
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "параметр -f/--filenode може бути використаний тільки з --check"
 
-#: pg_checksums.c:550
+#: pg_checksums.c:549
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "значення CRC pg_control неправильне"
 
-#: pg_checksums.c:553
+#: pg_checksums.c:552
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "кластер не сумісний з цією версією pg_checksum"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:556
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "кластер бази даних не сумісний"
 
-#: pg_checksums.c:558
+#: pg_checksums.c:557
 #, c-format
 msgid "The database cluster was initialized with block size %u, but pg_checksums was compiled with block size %u."
 msgstr "Кластер бази даних було ініціалізовано з розміром блоку %u, але pg_checksums було скомпільовано з розміром блоку %u."
 
-#: pg_checksums.c:570
+#: pg_checksums.c:569
 #, c-format
 msgid "cluster must be shut down"
 msgstr "кластер повинен бути закритий"
 
-#: pg_checksums.c:574
+#: pg_checksums.c:573
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "контрольні суми в кластері неактивовані"
 
-#: pg_checksums.c:578
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "контрольні суми вже неактивовані в кластері"
 
-#: pg_checksums.c:582
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "контрольні суми вже активовані в кластері"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:605
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Операція контрольної суми завершена\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:606
 #, c-format
-msgid "Files scanned:   %lld\n"
-msgstr "Файлів проскановано:   %lld\n"
+msgid "Files scanned:   %<PRId64>\n"
+msgstr "Файлів проскановано:   %<PRId64>\n"
 
-#: pg_checksums.c:608
+#: pg_checksums.c:607
 #, c-format
-msgid "Blocks scanned:  %lld\n"
-msgstr "Блоків відскановано:  %lld\n"
+msgid "Blocks scanned:  %<PRId64>\n"
+msgstr "Блоків проскановано:  %<PRId64>\n"
 
-#: pg_checksums.c:611
+#: pg_checksums.c:610
 #, c-format
-msgid "Bad checksums:  %lld\n"
-msgstr "Помилкові контрольні суми:  %lld\n"
+msgid "Bad checksums:  %<PRId64>\n"
+msgstr "Поганих контрольних сум:  %<PRId64>\n"
 
-#: pg_checksums.c:612 pg_checksums.c:644
+#: pg_checksums.c:611 pg_checksums.c:643
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Версія контрольних сум даних: %u\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:618
 #, c-format
-msgid "Files written:  %lld\n"
-msgstr "Файлів записано:  %lld\n"
+msgid "Files written:  %<PRId64>\n"
+msgstr "Файлів записано:  %<PRId64>\n"
 
-#: pg_checksums.c:620
+#: pg_checksums.c:619
 #, c-format
-msgid "Blocks written: %lld\n"
-msgstr "Блоків записано: %lld\n"
+msgid "Blocks written: %<PRId64>\n"
+msgstr "Блоків записано: %<PRId64>\n"
 
-#: pg_checksums.c:636
+#: pg_checksums.c:635
 #, c-format
 msgid "syncing data directory"
 msgstr "синхронізація даних каталогу"
 
-#: pg_checksums.c:640
+#: pg_checksums.c:639
 #, c-format
 msgid "updating control file"
 msgstr "оновлення контрольного файлу"
 
-#: pg_checksums.c:646
+#: pg_checksums.c:645
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Контрольні суми активовані в кластері\n"
 
-#: pg_checksums.c:648
+#: pg_checksums.c:647
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Контрольні суми вимкнені у кластері\n"
diff --git a/src/bin/pg_combinebackup/copy_file.c b/src/bin/pg_combinebackup/copy_file.c
index db6c86223bb..9365f616baf 100644
--- a/src/bin/pg_combinebackup/copy_file.c
+++ b/src/bin/pg_combinebackup/copy_file.c
@@ -210,7 +210,7 @@ copy_file_blocks(const char *src, const char *dst,
 	}
 
 	if (rb < 0)
-		pg_fatal("could not read from file \"%s\": %m", dst);
+		pg_fatal("could not read from file \"%s\": %m", src);
 
 	pg_free(buffer);
 	close(src_fd);
diff --git a/src/bin/pg_combinebackup/meson.build b/src/bin/pg_combinebackup/meson.build
index e80a4756a7f..bbc4c5735ba 100644
--- a/src/bin/pg_combinebackup/meson.build
+++ b/src/bin/pg_combinebackup/meson.build
@@ -38,6 +38,7 @@ tests += {
       't/008_promote.pl',
       't/009_no_full_file.pl',
       't/010_hardlink.pl',
+      't/011_ib_truncation.pl',
     ],
   }
 }
diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c
index 28e58cd8ef4..f42c2a0078b 100644
--- a/src/bin/pg_combinebackup/pg_combinebackup.c
+++ b/src/bin/pg_combinebackup/pg_combinebackup.c
@@ -425,7 +425,7 @@ main(int argc, char *argv[])
 		else
 		{
 			pg_log_debug("recursively fsyncing \"%s\"", opt.output);
-			sync_pgdata(opt.output, version * 10000, opt.sync_method, true);
+			sync_pgdata(opt.output, version, opt.sync_method, true);
 		}
 	}
 
@@ -491,7 +491,7 @@ add_tablespace_mapping(cb_options *opt, char *arg)
 				 tsmap->old_dir);
 
 	if (!is_absolute_path(tsmap->new_dir))
-		pg_fatal("old directory is not an absolute path in tablespace mapping: %s",
+		pg_fatal("new directory is not an absolute path in tablespace mapping: %s",
 				 tsmap->new_dir);
 
 	/* Canonicalize paths to avoid spurious failures when comparing. */
diff --git a/src/bin/pg_combinebackup/po/de.po b/src/bin/pg_combinebackup/po/de.po
index 7b7966539b9..cf32b245542 100644
--- a/src/bin/pg_combinebackup/po/de.po
+++ b/src/bin/pg_combinebackup/po/de.po
@@ -1,13 +1,13 @@
 # German message translation file for pg_combinebackup
-# Copyright (C) 2025 PostgreSQL Global Development Group
+# Copyright (C) 2026 PostgreSQL Global Development Group
 # This file is distributed under the same license as the pg_combinebackup (PostgreSQL) package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_combinebackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-29 04:22+0000\n"
-"PO-Revision-Date: 2025-04-29 08:34+0200\n"
+"POT-Creation-Date: 2026-02-07 08:22+0000\n"
+"PO-Revision-Date: 2026-02-07 09:48+0100\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -41,7 +41,7 @@ msgid "could not open file \"%s\" for reading: %m"
 msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %m"
 
 #: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:540
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht lesen: %m"
@@ -53,7 +53,7 @@ msgstr "konnte Datei »%s« nicht lesen: %d von %zu gelesen"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
 #: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
-#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:740
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -82,13 +82,13 @@ msgstr ""
 #: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
 #: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
 #: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
-#: pg_combinebackup.c:1177 reconstruct.c:523 reconstruct.c:638
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht öffnen: %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
@@ -101,7 +101,7 @@ msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/jsonapi.c:2407 ../../common/parse_manifest.c:157
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
 #: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
@@ -139,7 +139,7 @@ msgstr "konnte Dateisystem für Datei »%s« nicht synchronisieren: %m"
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
 #: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
-#: reconstruct.c:421
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
@@ -166,103 +166,103 @@ msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
 
-#: ../../common/jsonapi.c:2432
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Parser mit rekursivem Abstieg kann inkrementellen Lexer nicht benutzen."
 
-#: ../../common/jsonapi.c:2434
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "Inkrementeller Parser benötigt inkrementellen Lexer."
 
-#: ../../common/jsonapi.c:2436
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON zu tief geschachtelt, maximale erlaubte Tiefe ist 6400."
 
-#: ../../common/jsonapi.c:2438
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Escape-Sequenz »\\%.*s« ist nicht gültig."
 
-#: ../../common/jsonapi.c:2442
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Zeichen mit Wert 0x%02x muss escapt werden."
 
-#: ../../common/jsonapi.c:2446
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Ende der Eingabe erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2449
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Array-Element oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2452
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "»,« oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2455
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "»:« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2458
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON-Wert erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2461
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Die Eingabezeichenkette endete unerwartet."
 
-#: ../../common/jsonapi.c:2463
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Zeichenkette oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2466
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "»,« oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2469
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Zeichenkette erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2472
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Token »%.*s« ist ungültig."
 
-#: ../../common/jsonapi.c:2478
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kann nicht in »text« umgewandelt werden."
 
-#: ../../common/jsonapi.c:2480
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "Nach »\\u« müssen vier Hexadezimalziffern folgen."
 
-#: ../../common/jsonapi.c:2483
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Unicode-Escape-Werte können nicht für Code-Punkt-Werte über 007F verwendet werden, wenn die Kodierung nicht UTF8 ist."
 
-#: ../../common/jsonapi.c:2492
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Unicode-Escape-Wert konnte nicht in die Serverkodierung %s umgewandelt werden."
 
-#: ../../common/jsonapi.c:2499
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicode-High-Surrogate darf nicht auf ein High-Surrogate folgen."
 
-#: ../../common/jsonapi.c:2501
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicode-Low-Surrogate muss auf ein High-Surrogate folgen."
 
-#: ../../common/jsonapi.c:2523
+#: ../../common/jsonapi.c:2526
 msgid "out of memory while constructing error description"
 msgstr "Speicher aufgebraucht beim Konstruieren der Fehlerbeschreibung"
 
@@ -468,13 +468,13 @@ msgstr "%s: konnte %s nicht finden"
 msgid "%s: %s requires %s"
 msgstr "%s: %s benötigt %s"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "konnte Datei »%s« nicht schreiben: %d von %d geschrieben"
 
-#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "konnte Prüfsumme der Datei »%s« nicht aktualisieren"
@@ -489,7 +489,7 @@ msgstr "konnte nicht in Datei »%s« schreiben: %m"
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "konnte nicht in Datei »%s«, Position %u schreiben: %d von %d geschrieben"
 
-#: copy_file.c:213 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "konnte nicht aus Datei »%s« lesen: %m"
@@ -514,12 +514,12 @@ msgstr "Fehler beim Klonen von Datei »%s« nach »%s«: %s"
 msgid "file cloning not supported on this platform"
 msgstr "Klonen von Dateien wird auf dieser Plattform nicht unterstützt"
 
-#: copy_file.c:292 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "Fehler beim Kopieren von Dateibereich von »%s« nach »%s«: %m"
 
-#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range wird auf dieser Plattform nicht unterstützt"
@@ -614,11 +614,16 @@ msgstr "mehrere »=«-Zeichen im Tablespace-Mapping"
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "ungültiges Tablespace-Mapping-Format »%s«, muss »ALTES_VERZ=NEUES_VERZ« sein"
 
-#: pg_combinebackup.c:490 pg_combinebackup.c:494
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "altes Verzeichnis im Tablespace-Mapping ist kein absoluter Pfad: %s"
 
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr "neues Verzeichnis im Tablespace-Mapping ist kein absoluter Pfad: %s"
+
 #: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
@@ -888,32 +893,32 @@ msgstr "konnte Datei »%s« nicht lesen: %zd von %lld gelesen"
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "volles Backup enthält unerwartete inkrementelle Datei »%s«"
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "Datei »%s« ist zu kurz: %llu erwartet, %llu gefunden"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "Datei »%s« hat falsche inkrementelle magische Zahl (0x%x, erwartet 0x%x)"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "Datei »%s« hat Blockzahl %u, was die Segmentgröße %u überschreitet"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "Datei »%s« hat Truncation-Blocklänge %u, was die Segmentgröße %u überschreitet"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "konnte Datei »%s« nicht lesen: %d von %u gelesen"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "konnte nicht aus Datei »%s«, Position %llu lesen: %d von %d gelesen"
diff --git a/src/bin/pg_combinebackup/po/es.po b/src/bin/pg_combinebackup/po/es.po
index 850ef3dde2a..7a4a809c91a 100644
--- a/src/bin/pg_combinebackup/po/es.po
+++ b/src/bin/pg_combinebackup/po/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_combinebackup (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-16 05:22+0000\n"
-"PO-Revision-Date: 2024-11-16 09:07+0100\n"
+"POT-Creation-Date: 2026-02-06 23:21+0000\n"
+"PO-Revision-Date: 2025-11-08 19:01+0100\n"
 "Last-Translator: Álvaro Herrera <alvherre@lvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -45,8 +45,8 @@ msgstr "consejo: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:540
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
@@ -57,8 +57,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -82,31 +82,32 @@ msgstr ""
 "serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
 "directorio de datos."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:523 reconstruct.c:638
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:853
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
@@ -135,290 +136,294 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:204
-#: reconstruct.c:421
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "El parser recursivo descendiente no puede usar el lexer incremental."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "El parser incremental requiere el lexer incremental."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON anidado demasiado profundamente, profundidad máxima es 6400."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "La secuencia de escape «\\%.*s» no es válida."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Los caracteres con valor 0x%02x deben ser escapados."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Se esperaba el fin de la entrada, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Se esperaba un elemento de array o «]», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Se esperaba «,» o «]», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Se esperaba «:», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Se esperaba un valor JSON, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "La cadena de entrada terminó inesperadamente."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Se esperaba una cadena o «}», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Se esperaba «,» o «}», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Se esperaba una cadena, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "El elemento «%.*s» no es válido."
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 no puede ser convertido a text."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "«\\u» debe ser seguido por cuatro dígitos hexadecimales."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Los valores de escape Unicode no se pueden utilizar para valores de código superiores a 007F cuando la codificación no es UTF8."
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "El valor de escape Unicode no pudo ser traducido a la codificación del servidor %s."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Un «high-surrogate» Unicode no puede venir después de un «high-surrogate»."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Un «low-surrogate» Unicode debe seguir a un «high-surrogate»."
 
-#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:855
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "memoria agotada mientras se construía una descripción de error"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
 msgstr "no se pudo inicializar la suma de verificación del manifiesto"
 
-#: ../../common/parse_manifest.c:204 ../../common/parse_manifest.c:261
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "el manifiesto terminó inesperadamente"
 
-#: ../../common/parse_manifest.c:210 ../../common/parse_manifest.c:862
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
 #, c-format
 msgid "could not update checksum of manifest"
 msgstr "no se pudo actualizar la suma de verificación del manifiesto"
 
-#: ../../common/parse_manifest.c:302
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "inicio de objeto inesperado"
 
-#: ../../common/parse_manifest.c:337
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "fin de objeto inesperado"
 
-#: ../../common/parse_manifest.c:366
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "inicio de array inesperado"
 
-#: ../../common/parse_manifest.c:391
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "fin de array inesperado"
 
-#: ../../common/parse_manifest.c:418
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "se esperaba indicador de versión"
 
-#: ../../common/parse_manifest.c:454
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "campo de nivel superior no reconocido"
 
-#: ../../common/parse_manifest.c:473
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "campo de archivo inesperado"
 
-#: ../../common/parse_manifest.c:487
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "campo de rango de WAL inesperado"
 
-#: ../../common/parse_manifest.c:493
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "campo de objeto inesperado"
 
-#: ../../common/parse_manifest.c:583
+#: ../../common/parse_manifest.c:582
 msgid "unexpected scalar"
 msgstr "escalar inesperado"
 
-#: ../../common/parse_manifest.c:609
+#: ../../common/parse_manifest.c:608
 msgid "manifest version not an integer"
 msgstr "la versión de manifiesto no es un número entero"
 
-#: ../../common/parse_manifest.c:613
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "versión de manifiesto inesperada"
 
-#: ../../common/parse_manifest.c:637
+#: ../../common/parse_manifest.c:636
 msgid "system identifier in manifest not an integer"
 msgstr "el identificador de sistema en el manifiesto no es un número entero"
 
-#: ../../common/parse_manifest.c:662
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "ruta de archivo faltante"
 
-#: ../../common/parse_manifest.c:665
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "hay ambos ruta de archivo (path name) y ruta codificada (encoded path name)"
 
-#: ../../common/parse_manifest.c:667
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "tamaño faltante"
 
-#: ../../common/parse_manifest.c:670
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "suma de comprobación sin algoritmo"
 
-#: ../../common/parse_manifest.c:684
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "no se pudo decodificar el nombre del archivo"
 
-#: ../../common/parse_manifest.c:694
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "el tamaño del archivo no es un número entero"
 
-#: ../../common/parse_manifest.c:700 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "algoritmo de suma de comprobación no reconocido: \"%s\""
 
-#: ../../common/parse_manifest.c:719
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "suma de comprobación no válida para el archivo \"%s\": \"%s\""
 
-#: ../../common/parse_manifest.c:762
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "falta el timeline"
 
-#: ../../common/parse_manifest.c:764
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "falta el LSN de inicio"
 
-#: ../../common/parse_manifest.c:766
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "falta el LSN de término"
 
-#: ../../common/parse_manifest.c:772
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "el timeline no es un número entero"
 
-#: ../../common/parse_manifest.c:775
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "no se pudo interpretar el LSN de inicio"
 
-#: ../../common/parse_manifest.c:778
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "no se pudo interpretar el LSN de término"
 
-#: ../../common/parse_manifest.c:843
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "esperado al menos 2 líneas"
 
-#: ../../common/parse_manifest.c:846
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "última línea no termina en nueva línea"
 
-#: ../../common/parse_manifest.c:865
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "no se pudo finalizar la suma de verificación del manifiesto"
 
-#: ../../common/parse_manifest.c:869
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "el manifiesto no tiene suma de comprobación"
 
-#: ../../common/parse_manifest.c:873
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "suma de comprobación de manifiesto no válida: \"%s\""
 
-#: ../../common/parse_manifest.c:877
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "discordancia en la suma de comprobación del manifiesto"
 
-#: ../../common/parse_manifest.c:892
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "no se pudo analizar el manifiesto de la copia de seguridad: %s"
@@ -468,67 +473,72 @@ msgstr "%s: no se pudo encontrar %s"
 msgid "%s: %s requires %s"
 msgstr "%s: %s requiere %s"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "no se pudo escribir al archivo «%s»: se escribió %d de %d"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "no se pudo actualizar la suma de verificación para el archivo «%s»"
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "no se pudo escribir al archivo «%s», posición %u: se escribió %d de %d"
 
-#: copy_file.c:199 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "error mientras se clonaba el archivo «%s» a «%s»: %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "error mientras se clonaba la relación «%s» a «%s»: %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "el clonado de archivos no está soportado en esta plataforma"
 
-#: copy_file.c:278 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "error mientras se copiaba un rango de archivo de «%s» a «%s»: %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range no está soportado en esta plataforma"
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "no se pudo copiar el archivo de «%s» a «%s»: %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "no se pudo crear un enlace desde «%s» a «%s»: %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -544,147 +554,157 @@ msgstr "no se pudo leer el archivo «%s»: leídos %d de %lld"
 msgid "could not read file \"%s\": read %lld of %lld"
 msgstr "no se pudo leer el archivo «%s»: leídos %lld de %lld"
 
-#: load_manifest.c:249
+#: load_manifest.c:248
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "el manifiesto de backup versión 1 no soporta backups incrementales"
 
-#: load_manifest.c:281
+#: load_manifest.c:280
 #, c-format
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "nombre de ruta duplicado en el manifiesto de la copia de seguridad: \"%s\""
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "no se especificó un directorio de entrada"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "no se especificó un directorio de salida"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: el identificador de sistema del manifiesto es %llu, pero el archivo de control tiene %llu"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: el identificador de sistema del manifiesto es %<PRIu64>, pero el archivo de control tiene %<PRIu64>"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid "cannot generate a manifest because no manifest is available for the final input backup"
 msgstr "no se puede generar un manifiesto porque no hay un manifiesto disponible para el backup final de entrada"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "no se pudo crear un enlace simbólico desde «%s» a «%s»: %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid "--link mode was used; any modifications to the output directory might destructively modify input directories"
+msgstr "el modo --link fue usado; cualquier modificación en el directorio de salida podría destructivamente modificar los directorios de entrada"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "nombre de directorio demasiado largo"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "múltiples signos «=» en mapeo de tablespace"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "formato de mapeo de tablespace «%s» no válido, debe ser «ANTIGUO=NUEVO»"
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "directorio antiguo no es una ruta absoluta en mapeo de tablespace: %s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr "directorio nuevo no es una ruta absoluta en mapeo de tablespace: %s"
+
+#: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
 msgstr "el backup en «%s» es un backup full, pero sólo el primer backup puede ser full"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid "backup at \"%s\" is an incremental backup, but the first backup should be a full backup"
 msgstr "el backup en «%s» es incremental, pero el primer backup debería ser full"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "el backup en «%s» empieza en el timeline %u, pero se esperaba %u"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "el backup en «%s» empieza en el LSN %X/%X, pero se esperaba %X/%X"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: el valor de CRC es incorrecto"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: versión de archivo de control inesperado"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s: se esperaba identificador de sistema %llu, pero se encontró %llu"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s: se esperaba identificador de sistema %<PRIu64>, pero se encontró %<PRIu64>"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "sólo algunos backups tienen checksums activados"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid "Disable, and optionally reenable, checksums on the output directory to avoid failures."
 msgstr "Desactive (y opcionalmente reactive) los checksums en el directorio de salida para evitar fallos."
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "eliminando el directorio de salida «%s»"
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "no se pudo eliminar el directorio de salida"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "eliminando el contenido del directorio de salida «%s»"
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "no se pudo eliminar el contenido del directorio de salida"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "el directorio «%s» existe pero no está vacío"
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "no se pudo acceder al directorio «%s»: %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -693,17 +713,17 @@ msgstr ""
 "%s reconstruye backups full desde incrementales.\n"
 "\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [OPCIÓN]... DIRECTOTIO...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -712,80 +732,85 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera mucha salida de depuración\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                enlazar (link) archivos en vez de copiarlos\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             no hacer realmente nada\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync             no esperar que los cambios se sincronicen a disco\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=DIR          directorio de salida\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                            relocate tablespace in OLDDIR to NEWDIR\n"
 msgstr ""
 "  -T, --tablespace-mapping=ANTIGUO=NUEVO\n"
-"                             reubicar el tablespace de ANTIGUO a NUEVO\n"
+"                            reubicar el tablespace de ANTIGUO a NUEVO\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr "      --clone               clonar (reflink) archivos en vez de copiarlos\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                copiar archivos (por omisión)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr "      --copy-file-range     copiar usando la llamada copy_file_range()\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            use algorithm for manifest checksums\n"
 msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
-"                             usar algoritmo para checksums del manifiesto\n"
+"                            usar algoritmo para checksums del manifiesto\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         suprimir generación del manifiesto\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=MÉTODO  definir método para sincronizar archivos a disco\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -794,72 +819,72 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "omitiendo el link simbólico «%s»"
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "omitiendo el archivo especial «%s»"
 
-#: pg_combinebackup.c:1073 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "el archivo de manifiesto «%s» no contiene una entrada para el archivo «%s»"
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: versión de servidor demasiado antigua"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: no se pudo interpretar el número de versión"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "no se pudo leer el enlace simbólico «%s»: %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "el destino del enlace simbólico «%s» es demasiado largo"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "el destino del enlace simbólico «%s» es relativo"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "el tablespace en «%s» no tiene mapeo de tablespace"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "los tablespaces con OIDs %u y %u ambos apuntan al directorio «%s»"
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "el archivo «%s» es demasiado grande"
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "no se pudo leer el archivo «%s»: leídos %zd de %lld"
@@ -869,32 +894,32 @@ msgstr "no se pudo leer el archivo «%s»: leídos %zd de %lld"
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "backup «full» contiene archivo incremental «%s» inesperado"
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "el archivo «%s» es demasiado corto: se esperaban %llu, se encontraron %llu"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "el archivo «%s» tiene número mágico incremental erróneo (0x%x, se esperaba 0x%x)"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "el archivo «%s» tiene una cantidad de bloques %u más allá del tamaño de bloque %u"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "el archivo «%s» tiene una longitud de truncado de bloque %u en exceso del tamaño de segmento %u"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "no se pudo leer el archivo «%s»: leídos %d de %u"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "no se pudo leer del archivo \"%s\", posición %llu: leídos %d de %d"
diff --git a/src/bin/pg_combinebackup/po/fr.po b/src/bin/pg_combinebackup/po/fr.po
index aa8b0f4ea61..ca07b55b06f 100644
--- a/src/bin/pg_combinebackup/po/fr.po
+++ b/src/bin/pg_combinebackup/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-11 01:52+0000\n"
-"PO-Revision-Date: 2024-11-11 09:55+0100\n"
+"POT-Creation-Date: 2026-02-18 04:52+0000\n"
+"PO-Revision-Date: 2025-07-07 21:43+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -16,24 +16,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
@@ -43,8 +43,8 @@ msgstr "astuce : "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:540
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier « %s » : %m"
@@ -55,8 +55,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -80,31 +80,32 @@ msgstr ""
 "résultats ci-dessous sont incorrects, et l'installation de PostgreSQL\n"
 "est incompatible avec ce répertoire des données."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:523 reconstruct.c:638
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:853
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
@@ -133,290 +134,294 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:204
-#: reconstruct.c:421
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "L'analyseur (parser) en descente récursive ne peut pas utiliser l'analyseur (lexer) incrémental."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "L'analyser (parser) incrémental nécessite l'analyseur (lexer) incrémental."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON trop profondément imbriqué, profondeur maximum permise est 6400."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "La séquence d'échappement « \\%.*s » est invalide."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Le caractère de valeur 0x%02x doit être échappé."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Fin de l'entrée attendue, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Élément de tableau ou « ] » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "« , » ou « ] » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "« : » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Valeur JSON attendue, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "La chaîne en entrée se ferme de manière inattendue."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Chaîne ou « } » attendu, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "« , » ou « } » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Chaîne attendue, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Le jeton « %.*s » n'est pas valide."
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 ne peut pas être converti en texte."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "« \\u » doit être suivi par quatre chiffres hexadécimaux."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Les valeurs d'échappement Unicode ne peuvent pas être utilisées pour des valeurs de point code au-dessus de 007F quand l'encodage n'est pas UTF8."
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "La valeur d'échappement unicode ne peut pas être traduite dans l'encodage du serveur %s."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Une substitution unicode haute ne doit pas suivre une substitution haute."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Une substitution unicode basse ne doit pas suivre une substitution haute."
 
-#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:855
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "manque mémoire lors de la construction de la description de l'erreur"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
 msgstr "n'a pas pu initialiser la somme de contrôle du manifeste"
 
-#: ../../common/parse_manifest.c:204 ../../common/parse_manifest.c:261
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "le manifeste se termine de façon inattendue"
 
-#: ../../common/parse_manifest.c:210 ../../common/parse_manifest.c:862
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
 #, c-format
 msgid "could not update checksum of manifest"
 msgstr "n'a pas pu mettre à jour la somme de contrôle du manifeste"
 
-#: ../../common/parse_manifest.c:302
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "début d'objet inattendu"
 
-#: ../../common/parse_manifest.c:337
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "fin d'objet inattendue"
 
-#: ../../common/parse_manifest.c:366
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "début de tableau inattendu"
 
-#: ../../common/parse_manifest.c:391
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "fin de tableau inattendue"
 
-#: ../../common/parse_manifest.c:418
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "indicateur de version inattendu"
 
-#: ../../common/parse_manifest.c:454
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "champ haut niveau inconnu"
 
-#: ../../common/parse_manifest.c:473
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "champ de fichier inattendu"
 
-#: ../../common/parse_manifest.c:487
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "champ d'intervalle de WAL inattendu"
 
-#: ../../common/parse_manifest.c:493
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "champ d'objet inattendu"
 
-#: ../../common/parse_manifest.c:583
+#: ../../common/parse_manifest.c:582
 msgid "unexpected scalar"
 msgstr "scalaire inattendu"
 
-#: ../../common/parse_manifest.c:609
+#: ../../common/parse_manifest.c:608
 msgid "manifest version not an integer"
 msgstr "la version du manifeste n'est pas un entier"
 
-#: ../../common/parse_manifest.c:613
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "version du manifeste inattendue"
 
-#: ../../common/parse_manifest.c:637
+#: ../../common/parse_manifest.c:636
 msgid "system identifier in manifest not an integer"
 msgstr "l'identifieur système dans le manifeste n'est pas un entier"
 
-#: ../../common/parse_manifest.c:662
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "nom de chemin manquant"
 
-#: ../../common/parse_manifest.c:665
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "le nom du chemin et le nom du chemin encodé"
 
-#: ../../common/parse_manifest.c:667
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "taille manquante"
 
-#: ../../common/parse_manifest.c:670
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "somme de contrôle sans algorithme"
 
-#: ../../common/parse_manifest.c:684
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "n'a pas pu décoder le nom du fichier"
 
-#: ../../common/parse_manifest.c:694
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "la taille du fichier n'est pas un entier"
 
-#: ../../common/parse_manifest.c:700 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "algorithme de somme de contrôle inconnu : « %s »"
 
-#: ../../common/parse_manifest.c:719
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "somme de contrôle invalide pour le fichier « %s » : « %s »"
 
-#: ../../common/parse_manifest.c:762
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "timeline manquante"
 
-#: ../../common/parse_manifest.c:764
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "LSN de début manquante"
 
-#: ../../common/parse_manifest.c:766
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "LSN de fin manquante"
 
-#: ../../common/parse_manifest.c:772
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "la timeline n'est pas un entier"
 
-#: ../../common/parse_manifest.c:775
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "n'a pas pu analyser le LSN de début"
 
-#: ../../common/parse_manifest.c:778
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "n'a pas pu analyser le LSN de fin"
 
-#: ../../common/parse_manifest.c:843
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "attendait au moins deux lignes"
 
-#: ../../common/parse_manifest.c:846
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "dernière ligne non terminée avec un caractère newline"
 
-#: ../../common/parse_manifest.c:865
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "n'a pas pu finaliser la somme de contrôle du manifeste"
 
-#: ../../common/parse_manifest.c:869
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "le manifeste n'a pas de somme de contrôle"
 
-#: ../../common/parse_manifest.c:873
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "somme de contrôle du manifeste invalide : « %s »"
 
-#: ../../common/parse_manifest.c:877
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "différence de somme de contrôle pour le manifeste"
 
-#: ../../common/parse_manifest.c:892
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "n'a pas pu analyser le manifeste de sauvegarde : %s"
@@ -466,67 +471,72 @@ msgstr "%s : n'a pas pu trouver %s"
 msgid "%s: %s requires %s"
 msgstr "%s : %s requiert %s"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "n'a pas pu écrire le fichier « %s » : a écrit %d sur %d"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "n'a pas pu mettre à jour la somme de contrôle du fichier « %s »"
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "n'a pas pu écrire dans le fichier « %s », à la position %u : a écrit %d sur %d"
 
-#: copy_file.c:199 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "n'a pas pu lire à partir du fichier « %s » : %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "erreur lors du clonage du fichier « %s » en «%s » : %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier « %s » : %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "erreur lors du clonage du fichier « %s » en «%s » : %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "clonage de fichiers non supporté sur cette plateforme"
 
-#: copy_file.c:278 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "erreur lors de l'opération copy_file_range de « %s » à « %s » : %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range non supporté sur cette plateforme"
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu copier le fichier « %s » en « %s » : %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "n'a pas pu créer le lien de « %s » vers « %s » : %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -542,147 +552,157 @@ msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %lld"
 msgid "could not read file \"%s\": read %lld of %lld"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %lld sur %lld"
 
-#: load_manifest.c:249
+#: load_manifest.c:248
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "la version du manifeste de sauvegarde ne permet pas les sauvegardes incrémentales"
 
-#: load_manifest.c:281
+#: load_manifest.c:280
 #, c-format
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "nom de chemin dupliqué dans le manifeste de sauvegarde : « %s »"
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "aucun répertoire en entrée indiqué"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "aucun répertoire cible indiqué"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: l'identifieur système du manifeste est %llu, mais le fichier de contrôle a %llu"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s : l'identifieur système du manifeste est %<PRIu64>, mais le fichier de contrôle a %<PRIu64>"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid "cannot generate a manifest because no manifest is available for the final input backup"
 msgstr "ne peut pas générer un manifeste parce qu'aucun manifeste n'est disponible pour la sauvegarde finale en entrée"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique de « %s » vers « %s » : %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid "--link mode was used; any modifications to the output directory might destructively modify input directories"
+msgstr "le mode --link a été utilisé : toute modification dans le répertoire de sortie pourrait modifier les répertoires en entrées"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "nom du répertoire trop long"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "multiple signes « = » dans la correspondance de tablespace"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "format de correspondance de tablespace « %s » invalide, doit être « ANCIENREPERTOIRE=NOUVEAUREPERTOIRE »"
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "l'ancien répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr "le nouveau répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s"
+
+#: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
 msgstr "la sauvegarde à « %s » est une sauvegarde complète, mais seule la première sauvegarde devrait être une sauvegarde complète"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid "backup at \"%s\" is an incremental backup, but the first backup should be a full backup"
 msgstr "la sauvegarde à « %s » est une sauvegarde incrémentale, mais la première sauvegarde devrait être une sauvegarde complète"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "la sauvegarde à « %s » commence à la timeline %u, mais attendait %u"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "la sauvegarde à « %s » commence au LSN %X/%X, mais s'attendait à %X/%X"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s : la valeur CRC n'est pas correcte"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s : version inattendue pour le fichier de contrôle"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s : identifieur système attendu %llu, mais %llu trouvé"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s : identifieur système attendu %<PRIu64>, mais %<PRIu64> trouvé"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "seules certaines sauvegardes ont les sommes de contrôle activées"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid "Disable, and optionally reenable, checksums on the output directory to avoid failures."
 msgstr "Désactivez, puis activez si vous le souhaitez, les sommes de contrôle sur le répertoire en sortie pour éviter les échecs"
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "suppression du répertoire en sortie « %s »"
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "échec lors de la suppression du répertoire en sortie"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "suppression du contenu du répertoire en sortie « %s »"
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "échec lors de la suppression du contenu du répertoire en sortie"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "le répertoire « %s » existe mais n'est pas vide"
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "n'a pas pu accéder au répertoire « %s » : %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -691,17 +711,17 @@ msgstr ""
 "%s reconstruit des sauvegardes complètes à partir de sauvegardes incrémentales.\n"
 "\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [OPTION]... RÉPERTOIRE...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -710,29 +730,34 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               engendre un grand nombre de traces de débogage\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                lie les fichiers au lieu de les copier\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             ne fait rien\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync              n'attend pas que les modifications soient\n"
 "                            proprement écrites sur disque\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=RÉPERTOIRE   répertoire en sortie\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -741,22 +766,22 @@ msgstr ""
 "  -T, --tablespace-mapping=ANCIENREP=NOUVEAUREP\n"
 "                            déplace le tablespace de ANCIENREP vers NOUVEAUREP\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr "      --clone               clone (reflink) les fichiers au lieu de les copier\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                copie les fichiers (par défaut)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr "      --copy-file-range     copie les fichiers en utilisant la fonction système copy_file_range()\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
@@ -765,27 +790,27 @@ msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            utilise l'algorithme pour les sommes de contrôle du manifeste\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         ne génère pas de manifeste de sauvegarde\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHODE configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             affiche la version puis quitte\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                affiche cette aide puis quitte\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -794,72 +819,72 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "ignore le lien symbolique « %s »"
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "ignore le fichier spécial « %s »"
 
-#: pg_combinebackup.c:1073 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "le fichier manifeste « %s » ne contient aucune entrée pour le fichier « %s »"
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s : version trop ancienne du serveur"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s :  n'a pas pu analyser le numéro de version"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "n'a pas pu lire le lien symbolique « %s » : %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "la cible « %s » du lien symbolique est trop longue"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "la cible « %s » du lien symbolique est relative"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "le tablespace sur \"%s\" n'a pas de correspondance de tablespace"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "les tablespaces d'OID %u et %u pointent tous les deux au répertoire « %s »"
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "n'a pas pu fermer le répertoire « %s » : %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "le fichier « %s » est trop gros"
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %zd sur %lld"
@@ -869,32 +894,32 @@ msgstr "n'a pas pu lire le fichier « %s » : a lu %zd sur %lld"
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "la sauvegarde complète contient un fichier incrémental inattendu « %s »"
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "le fichier « %s » est trop court : attendait %llu, a trouvé %llu"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "le fichier « %s » a un mauvaise numéro magique incrémental (0x%x et non pas 0x%x)"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "le fichier « %s » a %u blocs en plus de la taille de segment %u"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "le fichier « %s » a une longueur de bloc %u pour la troncation en excès de la taille de segment %u"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %u"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "n'a pas pu lire le fichier « %s » à la position %llu : a lu %d sur %d"
diff --git a/src/bin/pg_combinebackup/po/ja.po b/src/bin/pg_combinebackup/po/ja.po
index 627c4213b24..32382adbd13 100644
--- a/src/bin/pg_combinebackup/po/ja.po
+++ b/src/bin/pg_combinebackup/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_combinebackup (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-03-31 09:53+0900\n"
-"PO-Revision-Date: 2025-03-31 16:40+0900\n"
+"POT-Creation-Date: 2025-04-30 10:33+0900\n"
+"PO-Revision-Date: 2025-04-30 11:26+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja\n"
@@ -43,7 +43,7 @@ msgid "could not open file \"%s\" for reading: %m"
 msgstr "ファイル\"%s\"を読み込み用にオープンできませんでした: %m"
 
 #: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1409 reconstruct.c:540
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:540
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ファイル\"%s\"の読み込みに失敗しました: %m"
@@ -54,8 +54,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "ファイル\"%1$s\"を読み込めませんでした: %3$zuバイトのうち%2$dバイトを読み込みました"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:547
-#: pg_combinebackup.c:1184 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:740
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -82,8 +82,8 @@ msgstr ""
 #: ../../common/file_utils.c:370 ../../common/file_utils.c:428
 #: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
 #: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
-#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:532
-#: pg_combinebackup.c:1176 reconstruct.c:523 reconstruct.c:638
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:523 reconstruct.c:638
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
@@ -138,8 +138,8 @@ msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "ファイル\"%s\"に対してファイルシステムを同期できませんでした: %m"
 
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:684
-#: pg_combinebackup.c:1140 pg_combinebackup.c:1392 reconstruct.c:204
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
 #: reconstruct.c:421
 #, c-format
 msgid "could not stat file \"%s\": %m"
@@ -152,7 +152,7 @@ msgid "this build does not support sync method \"%s\""
 msgstr "このビルドでは同期方式\"%s\"をサポートしていません"
 
 #: ../../common/file_utils.c:156 ../../common/file_utils.c:304
-#: pg_combinebackup.c:942 pg_combinebackup.c:1265
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
@@ -357,7 +357,7 @@ msgstr "ファイル名をデコードできませんでした"
 msgid "file size is not an integer"
 msgstr "ファイルサイズが整数ではありません"
 
-#: ../../common/parse_manifest.c:699 pg_combinebackup.c:203
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "認識できないチェックサムアルゴリズム: \"%s\""
@@ -510,7 +510,7 @@ msgstr "ファイル\"%s\"を作成できませんでした: %m"
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "ファイル\"%s\"の\"%s\"へのクローニング中のエラー: %s"
 
-#: copy_file.c:259 pg_combinebackup.c:255
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "このプラットフォームではファイルのクローンはサポートされません"
@@ -520,7 +520,7 @@ msgstr "このプラットフォームではファイルのクローンはサポ
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "\"%s\"の\"%s\"へのファイル範囲のコピー中のエラー: %m"
 
-#: copy_file.c:299 pg_combinebackup.c:268 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:724
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "このプラットフォームではcopy_file_rangeはサポートされません"
@@ -532,8 +532,8 @@ msgstr "ファイル\"%s\"を\"%s\"にコピーできませんでした: %m"
 
 #: copy_file.c:333
 #, c-format
-msgid "error while linking file from \"%s\" to \"%s\": %m"
-msgstr "\"%s\"から\"%s\"へのリンク作成中にエラーが発生しました: %m"
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "\"%s\"から\"%s\"へのリンクを作成できませんでした: %m"
 
 #: load_manifest.c:125
 #, c-format
@@ -560,142 +560,142 @@ msgstr "バックアップ目録のバージョン1は差分バックアップ
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "バックアップ目録内の重複パス名: \"%s\""
 
-#: pg_combinebackup.c:224 pg_combinebackup.c:232
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "詳細は\"%s --help\"を実行してください。"
 
-#: pg_combinebackup.c:231
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "入力ディレクトリが指定されていません"
 
-#: pg_combinebackup.c:237
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "出力ディレクトリが指定されていません"
 
-#: pg_combinebackup.c:305
+#: pg_combinebackup.c:306
 #, c-format
 msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
 msgstr "%s: 目録のシステム識別子が%<PRIu64>ですが、制御ファイルでは%<PRIu64>です"
 
-#: pg_combinebackup.c:344
+#: pg_combinebackup.c:345
 #, c-format
 msgid "cannot generate a manifest because no manifest is available for the final input backup"
 msgstr "最後の入力バックアップに目録がないため目録を生成できません"
 
-#: pg_combinebackup.c:391
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "\"%s\"から\"%s\"へのシンボリックリンクを作成できませんでした: %m"
 
-#: pg_combinebackup.c:403 pg_combinebackup.c:738 pg_combinebackup.c:936
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を作成できませんでした: %m"
 
-#: pg_combinebackup.c:433
+#: pg_combinebackup.c:434
 #, c-format
-msgid "--link mode was used; any modifications to the output directory may destructively modify input directories"
+msgid "--link mode was used; any modifications to the output directory might destructively modify input directories"
 msgstr "--link モードが使用されています。出力ディレクトリに変更を加えると、入力ディレクトリが破壊的に変更される可能性があります。"
 
-#: pg_combinebackup.c:463
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "ディレクトリ名が長すぎます"
 
-#: pg_combinebackup.c:470
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "テーブル空間のマッピングに複数の\"=\"記号があります"
 
-#: pg_combinebackup.c:478
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "テーブル空間のマッピング形式\"%s\"が不正です。\"旧DIR=新DIR\"でなければなりません"
 
-#: pg_combinebackup.c:489 pg_combinebackup.c:493
+#: pg_combinebackup.c:490 pg_combinebackup.c:494
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "テーブル空間のマッピングにおいて、旧ディレクトリが絶対パスではありません: %s"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
 msgstr "\"%s\"のバックアップはフルバックアップですが、最初のバックアップのみがフルバックアップである必要があります"
 
-#: pg_combinebackup.c:565
+#: pg_combinebackup.c:566
 #, c-format
 msgid "backup at \"%s\" is an incremental backup, but the first backup should be a full backup"
 msgstr "\"%s\"のバックアップは差分バックアップですが、最初のバックアップはフルバックアップである必要があります"
 
-#: pg_combinebackup.c:568
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "\"%s\"のバックアップはタイムライン%uで始まっていますが、%uを期待していました"
 
-#: pg_combinebackup.c:571
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "\"%s\"のバックアップはLSN %X/%Xで始まっていますが、%X/%Xを期待していました"
 
-#: pg_combinebackup.c:623
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: CRCが正しくありません"
 
-#: pg_combinebackup.c:627
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: 予期しない制御ファイルバージョン"
 
-#: pg_combinebackup.c:634
+#: pg_combinebackup.c:635
 #, c-format
 msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
 msgstr "%s: システム識別子 %<PRIu64> を予期していましたが、%<PRIu64> でした"
 
-#: pg_combinebackup.c:665
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "一部のバックアップのみチェックサムが有効化されています"
 
-#: pg_combinebackup.c:666
+#: pg_combinebackup.c:667
 #, c-format
 msgid "Disable, and optionally reenable, checksums on the output directory to avoid failures."
 msgstr "失敗を防止するためには出力先ディレクトリでのチェックサムを無効にして、必要に応じて再度有効にしてください。"
 
-#: pg_combinebackup.c:701
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "出力ディレクトリ\"%s\"を削除しています"
 
-#: pg_combinebackup.c:703
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "出力ディレクトリの削除に失敗しました"
 
-#: pg_combinebackup.c:707
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "出力ディレクトリ\"%s\"の内容の削除中"
 
-#: pg_combinebackup.c:710
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "出力ディレクトリの内容の削除に失敗しました"
 
-#: pg_combinebackup.c:750
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "ディレクトリ\"%s\"は存在しますが、空ではありません"
 
-#: pg_combinebackup.c:753
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"にアクセスできませんでした: %m"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -704,17 +704,17 @@ msgstr ""
 "%s 差分からフルバックアップを再構築する。\n"
 "\n"
 
-#: pg_combinebackup.c:768
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [オプション]... ディレクトリ...\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -723,32 +723,32 @@ msgstr ""
 "\n"
 "オプション:\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               多くのデバッグ用の出力を生成\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:773
 #, c-format
 msgid "  -k, --link                link files instead of copying\n"
 msgstr "  -k, --link                コピーする代わりにリンクを作成する\n"
 
-#: pg_combinebackup.c:773
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             実際には何もしない\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:775
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync             変更の安全なディスクへの書き出しを待機しない\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=DIRECTORY    出力ディレクトリ\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -757,24 +757,24 @@ msgstr ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                            OLDDIRにあるテーブルスペースをNEWDIRへ移動\n"
 
-#: pg_combinebackup.c:778
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr ""
 "      --clone               ファイルをコピーする代わりにクローニング(reflink)\n"
 "                            を行う\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                ファイルをコピーする(デフォルト)\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr "      --copy-file-range     copy_file_range()システムコールでコピーする\n"
 
-#: pg_combinebackup.c:781
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
@@ -783,27 +783,27 @@ msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            目録チェックサムのアルゴリズムを指定\n"
 
-#: pg_combinebackup.c:783
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         バックアップマニフェストの生成を抑止\n"
 
-#: pg_combinebackup.c:784
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD  ファイルをディスクに同期させる方法を指定\n"
 
-#: pg_combinebackup.c:785
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             バージョン情報を表示して終了\n"
 
-#: pg_combinebackup.c:786
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                このヘルプを表示して終了\n"
 
-#: pg_combinebackup.c:788
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -812,72 +812,72 @@ msgstr ""
 "\n"
 "バグは<%s>に報告してください。\n"
 
-#: pg_combinebackup.c:789
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ホームページ: <%s>\n"
 
-#: pg_combinebackup.c:1004
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "シンボリックリンク\"%s\"をスキップします"
 
-#: pg_combinebackup.c:1006
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "スペシャルファイル\"%s\"をスキップしています"
 
-#: pg_combinebackup.c:1082 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "目録ファイル\"%s\" にはファイル\"%s\"のエントリがありません"
 
-#: pg_combinebackup.c:1198
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: サーバーバージョンが古すぎます"
 
-#: pg_combinebackup.c:1199
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: バージョン番号をパースできませんでした"
 
-#: pg_combinebackup.c:1318
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "シンボリックリンク\"%s\"を読めませんでした: %m"
 
-#: pg_combinebackup.c:1321
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "シンボリックリンク\"%s\"のターゲットが長すぎます"
 
-#: pg_combinebackup.c:1324
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "シンボリックリンク\"%s\"のターゲットが相対的です"
 
-#: pg_combinebackup.c:1346
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "\"%s\"にあるテーブルスペースに対応するテーブルスペースマッピングがありません"
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "OID %uと%uのテーブルスペースがどちらもディレクトリ\"%s\"を指しています"
 
-#: pg_combinebackup.c:1373
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をクローズできませんでした: %m"
 
-#: pg_combinebackup.c:1394
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "ファイル\"%s\"は大きすぎます"
 
-#: pg_combinebackup.c:1411
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "ファイル\"%1$s\"を読み込めませんでした: %3$lldバイトのうち%2$zdバイトを読み込みました"
@@ -916,3 +916,6 @@ msgstr "ファイル\"%1$s\"を読み込めませんでした: %3$uバイトの
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "ファイル \"%1$s\"、オフセット%2$lluから読み取れませんでした: %4$d中%3$d"
+
+#~ msgid "error while linking file from \"%s\" to \"%s\": %m"
+#~ msgstr "\"%s\"から\"%s\"へのリンク作成中にエラーが発生しました: %m"
diff --git a/src/bin/pg_combinebackup/po/ka.po b/src/bin/pg_combinebackup/po/ka.po
index 9aa8952078c..5140adf2837 100644
--- a/src/bin/pg_combinebackup/po/ka.po
+++ b/src/bin/pg_combinebackup/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_combinebackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-05-02 22:22+0000\n"
+"POT-Creation-Date: 2026-02-08 14:52+0000\n"
 "PO-Revision-Date: 2025-05-03 01:27+0200\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: \n"
@@ -43,7 +43,7 @@ msgid "could not open file \"%s\" for reading: %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
 #: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:540
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ფაილის (%s) წაკითხვის შეცდომა: %m"
@@ -55,7 +55,7 @@ msgstr "\"%s\"-ის წაკითხვის შეცდომა: წა
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
 #: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
-#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:740
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -82,13 +82,13 @@ msgstr ""
 #: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
 #: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
 #: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
-#: pg_combinebackup.c:1177 reconstruct.c:523 reconstruct.c:638
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
@@ -101,7 +101,7 @@ msgid "could not fsync file \"%s\": %m"
 msgstr "ფაილის (%s) fsync-ის შეცდომა: %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/jsonapi.c:2407 ../../common/parse_manifest.c:157
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
 #: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
@@ -139,7 +139,7 @@ msgstr "შეუძლებელია ფაილური სისტე
 #: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
 #: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
-#: reconstruct.c:421
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "ფაილი \"%s\" არ არსებობს: %m"
@@ -166,103 +166,103 @@ msgstr "საქაღალდის (%s) წაკითხვის შე
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "გადარქმევის შეცდომა %s - %s: %m"
 
-#: ../../common/jsonapi.c:2432
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "რეკურსიულ დაღმავალ დამმუშავებელს ინკრემენტული lexer-ის გამოყენება არ შეუძლია."
 
-#: ../../common/jsonapi.c:2434
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "ინკრემენტულ დამმუშავებელს ინკრემენტული lexer სჭირდება."
 
-#: ../../common/jsonapi.c:2436
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON მეტისმეტად ღრმადაა ერთმანეთში ჩალაგებული. მაქსიმალური დასაშვები სიღრმეა 6400."
 
-#: ../../common/jsonapi.c:2438
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "სპეციალური მიმდევრობა \"\\%.*s\" არასწორია."
 
-#: ../../common/jsonapi.c:2442
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "სიმბოლო კოდით 0x%02x აუცილებლად ეკრანირებული უნდა იყოს."
 
-#: ../../common/jsonapi.c:2446
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "მოველოდი შეყვანის დასასრულს, მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2449
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "მოველოდი მასივის ელემენტს ან \"]\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2452
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "მოველოდი \",\" ან \"]\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2455
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "მოველოდი \":\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2458
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "მოველოდი JSON მნიშვნელობას. მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2461
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "შეყვანის სტრიქონი მოულოდნელად დასრულდა."
 
-#: ../../common/jsonapi.c:2463
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "მოველოდი სტრიქონს ან \"}\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2466
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "მოველოდი \",\", ან \"}\", მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2469
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "მოველოდი სტრიქონს, მაგრამ მივიღე \"%.*s\"."
 
-#: ../../common/jsonapi.c:2472
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "კოდი \"%.*s\" არასწორია."
 
-#: ../../common/jsonapi.c:2478
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 ტექსტად ვერ გარდაიქმნება."
 
-#: ../../common/jsonapi.c:2480
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" ს თექვსმეტობითი ციფრები უნდა მოჰყვებოდეს."
 
-#: ../../common/jsonapi.c:2483
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "უნიკოდის სპეციალური კოდების გამოყენება კოდის წერტილის მნიშვნელობებად 007F-ის ზემოთ შეუძლებელია, თუ კოდირება UTF-8 არაა."
 
-#: ../../common/jsonapi.c:2492
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "უნიკოდის სპეციალური კოდების სერვერის კოდირებაში (%s) თარგმნა შეუძლებელია."
 
-#: ../../common/jsonapi.c:2499
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "უნიკოდის მაღალ სუროგატს მაღალი სუროგატი არ უნდა მოსდევდეს."
 
-#: ../../common/jsonapi.c:2501
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "უნიკოდის დაბალი სუროგატი მაღალ სუროგატს უნდა მისდევდეს."
 
-#: ../../common/jsonapi.c:2523
+#: ../../common/jsonapi.c:2526
 msgid "out of memory while constructing error description"
 msgstr "არასაკმარისი მეხსიერება შეცდომის აღწერის აგებისას"
 
@@ -468,13 +468,13 @@ msgstr "%s: %s ვერ ვიპოვე"
 msgid "%s: %s requires %s"
 msgstr "%s: %s-ს %s სჭირდება"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "ფაილში \"%s\" ჩაწერა შეუძლებელია. ჩაწერილია %d %d-დან"
 
-#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "ფაილის (\"%s\") საკონტროლო ჯამის განახლების შეცდომა"
@@ -489,7 +489,7 @@ msgstr "ფაილში (%s) ჩაწერის შეცდომა: %m"
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "ფაილში \"%s\" ჩაწერის შეცდომა. წანაცვლება %u: ჩავწერე %d ბაიტი %d-დან"
 
-#: copy_file.c:213 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "ფაილიდან (\"%s\") წაკითხვის შეცდომა: %m"
@@ -514,12 +514,12 @@ msgstr "შეცდომა ფაილის დაკლონვისა
 msgid "file cloning not supported on this platform"
 msgstr "ამ პლატფორმაზე კლონირება მხარდაჭერილი არაა"
 
-#: copy_file.c:292 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "შეცდომა ფაილბის შუალედის კოპირებისას \"%s\"-დან \"%s\"-მდე: %m"
 
-#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "ამ პლატფორმაზე copy_file_range მხარდაჭერილი არაა"
@@ -614,11 +614,16 @@ msgstr "ცხრილების სივრცის მიბმაში
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "ცხრილების მიბმის არასწორი ფორმატი \"%s\", უნდა იყოს \"OLDDIR=NEWDIR\""
 
-#: pg_combinebackup.c:490 pg_combinebackup.c:494
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "ძველი საქაღალდის ბილიკი ცხრილის სივრცის მიბმაში აბსოლუტური არაა: %s"
 
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr "ახალი საქაღალდის ბილიკი ცხრილის სივრცის მიბმაში აბსოლუტური არაა: %s"
+
 #: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
@@ -884,32 +889,32 @@ msgstr "ფაილის \"%s\" წაკითხვა შეუძლებ
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "სრული მარქაფი შეიცავს მოულოდნელ ინკრემენტულ ფაილს \"%s\""
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "ფაილი \"%s\" მეტისმეტად მოკლეა. მოველოდი %llu, მივიღე %llu"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "ფაილს \"%s\" არასწორი ინკრემენტული ჯადოსნური რიცხვი (0x%x not 0x%x) გააჩნია"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "ფაილს \"%s\" აქვს ბლოკების რაოდენობა %u, რომელიც სეგმენტის ზომას %u აჭარბებს"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "ფაილს \"%s\" აქვს წაკვეთის ბლოკის სიგრძე %u, რომელიც სეგმენტის ზომას %u აჭარბებს"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "ფაილის \"%s\" წაკითხვის შეცდომა: წაკითხულია %d %u-დან"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "ფაილიდან \"%s\" წაკითხვის შეცდომა. წანაცვლება %llu: წაკითხულია %d %d-დან"
diff --git a/src/bin/pg_combinebackup/po/ko.po b/src/bin/pg_combinebackup/po/ko.po
index e6d9629b170..4051074a66d 100644
--- a/src/bin/pg_combinebackup/po/ko.po
+++ b/src/bin/pg_combinebackup/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_combinebackup (PostgreSQL) 17\n"
+"Project-Id-Version: pg_combinebackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:52+0000\n"
-"PO-Revision-Date: 2025-01-18 00:54+0900\n"
+"POT-Creation-Date: 2025-09-11 21:52+0000\n"
+"PO-Revision-Date: 2025-09-09 16:53+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -41,8 +41,8 @@ msgstr "힌트: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "\"%s\" 파일 일기 모드로 열기 실패: %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:540
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:540
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
@@ -53,8 +53,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:740
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -79,12 +79,12 @@ msgstr ""
 "지 않으며\n"
 "현재 PostgreSQL 설치본과 이 데이터 디렉터리가 호환하지 않습니다."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:523 reconstruct.c:638
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:523 reconstruct.c:638
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
@@ -96,14 +96,15 @@ msgstr "\"%s\" 파일을 열 수 없음: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일 fsync 실패: %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:852
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
@@ -132,121 +133,121 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일 대상으로 파일 시스템 동기화를 할 수 없습니다: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:204
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
 #: reconstruct.c:421
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "재귀적 하향 구문분석기는 증분 토큰분석기을 사용할 수 없습니다."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "증분 구문분석기는 증분 토큰분석기를 필요로 합니다."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON 계층이 너무 깊음, 허용하는 최대 깊이는 6400입니다."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "\"\\%.*s\" 이스케이프 표기가 바르지 않습니다."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "0x%02x 값의 문자는 이스케이프 처리를 해야함."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "입력이 끝나야하는데, \"%.*s\" 발견했습니다."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "배열 요소나 \"]\" 문자를 기대했는데, \"%.*s\" 발견했습니다."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "\",\" 또는 \"]\" 문자를 기대했는데, \"%.*s\" 발견했습니다."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "\":\" 문자를 기대했는데, \"%.*s\" 발견했습니다."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "입력 문자열이 예상치 않게 끝났음."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "문자열이나, \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "\",\" 또는 \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "문자열 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "잘못된 토큰: \"%.*s\""
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 값은 text 형으로 변환할 수 없음."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" 표기법은 뒤에 4개의 16진수가 와야 합니다."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -254,20 +255,24 @@ msgstr ""
 "서버 인코딩이 UTF8이 아닌 경우 007F보다 큰 코드 지점 값에는 유니코드 이스케이"
 "프 값을 사용할 수 없음"
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "유니코드 이스케이프 값을 %s 서버 인코딩으로 변환할 수 없음."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드)는 상위 딸림 코드 뒤에 오면 안됨."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드) 뒤에는 하위 딸림 코드가 있어야 함."
 
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "오류 설명을 작성하는 중 메모리 부족"
+
 #: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
@@ -358,7 +363,7 @@ msgstr "파일 이름을 디코딩할 수 없음"
 msgid "file size is not an integer"
 msgstr "파일 크기가 정수가 아님"
 
-#: ../../common/parse_manifest.c:699 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "알 수 없는 체크섬 알고리즘: \"%s\""
@@ -475,62 +480,67 @@ msgstr "%s: %s은(는) %s을(를) 필요로 함"
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "\"%s\" 파일 쓰기 실패: %d/%d 만큼 씀"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:721
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:721
 #: reconstruct.c:767 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "\"%s\" 파일 체크섬을 갱신할 수 없음"
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "\"%s\"파일 쓰기 실패: 시작위치=%u, %d/%d 만큼 씀"
 
-#: copy_file.c:199 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:784
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 클론하는 동안 오류 발생: %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "\"%s\" 파일을 만들 수 없음: %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 클론하는 동안 오류 발생: %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "이 운영체제는 파일 클론 기능을 제공하지 않습니다."
 
-#: copy_file.c:278 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:704
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 copy_file_range 기능으로 복사 중 오류: %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:724
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "이 운영체제는 copy_file_range 기능을 지원하지 않습니다."
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 복사할 수 없음: %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "\"%s\" 파일을 \"%s\" 링크로 만들 수 없음: %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -556,110 +566,121 @@ msgstr "백업 매니페이스 파일 버전이 1인 경우는 증분 백업을
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "백업 메니페스트 안에 경로 이름이 중복됨: \"%s\""
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "입력 디렉터리를 지정하지 않았음"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "자료가 저장될 디렉터리를 지정하지 않았음"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: 매니페이스 시스템 식별번호는 %llu인데, 컨트롤 파일은 %llu임"
+msgid ""
+"%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr ""
+"%s: 매니페이스 시스템 식별번호는 %<PRIu64>인데, 컨트롤 파일은 %<PRIu64>임"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid ""
 "cannot generate a manifest because no manifest is available for the final "
 "input backup"
 msgstr "마지막 입력 백업용 매니페이스가 없어 매니페이스를 만들 수 없음"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 심볼릭 링크로 만들 수 없음: %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid ""
+"--link mode was used; any modifications to the output directory might "
+"destructively modify input directories"
+msgstr ""
+"--link 옵션을 사용했음; 출력 디렉터리 내 변경은 입력 디렉터리 내 예상치 못한 "
+"변경을 초래할 수 있음"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "디렉터리 이름이 너무 김"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "테이블스페이스 맵핑 하는 곳에서 \"=\" 문자가 중복 되어 있음"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr ""
 "\"%s\" 형식의 테이블스페이스 맵핑이 잘못 되었음, \"OLDDIR=NEWDIR\" 형식이어"
 "야 함"
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490 pg_combinebackup.c:494
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "테이블스페이스 맵핑용 옛 디렉터리가 절대 경로가 아님: %s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:563
 #, c-format
 msgid ""
 "backup at \"%s\" is a full backup, but only the first backup should be a "
 "full backup"
 msgstr "\"%s\"의 백업은 전체 백업이지만, 첫 백업 단 하나만 전체 백업이어야 함"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid ""
 "backup at \"%s\" is an incremental backup, but the first backup should be a "
 "full backup"
 msgstr "\"%s\"의 백업은 증분 백업이지만, 첫 백업은 전체 백업이어야 함"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "\"%s\"의 백업은 타임라인 %u번으로 시작하지만, 기대번호는 %u임"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "\"%s\"의 백업은 시작 LSN이 %X/%X이지만, 기대 LSN은 %X/%X임"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: CRC 잘못됨"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: 예상치 못한 컨트롤 파일 버전"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s: 예상 시스템 식별번호는 %llu이지만, %llu임"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s: 예상 시스템 식별번호는 %<PRIu64>이지만, %<PRIu64>임"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "일부 백업만 체크섬 기능이 활성화 되었음"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid ""
 "Disable, and optionally reenable, checksums on the output directory to avoid "
@@ -668,37 +689,37 @@ msgstr ""
 "실패를 피하기 위해 출력 디렉터리의 체크섬 기능을 비활성하고, 다 합치고 나서 "
 "활성화하는 방법이 있음."
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "\"%s\" 출력 디렉터리 삭제 중"
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "출력 디렉터리 삭제 실패"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "\"%s\" 출력 디렉터리 안 파일들을 삭제 중"
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "출력 디렉터리 안 파일 삭제 실패"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "\"%s\" 디렉터리가 비어있지 않습니다."
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 액세스할 수 없습니다: %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -707,17 +728,17 @@ msgstr ""
 "%s은 증분 백업들을 합쳐 전체 백업을 재생성 합니다.\n"
 "\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [옵션]... 디렉터리...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -726,17 +747,22 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               디버깅에 필요한 정보들도 함께 출력함\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                파일 copy 대신 link\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             실 작업은 진행하지 않음\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid ""
 "  -N, --no-sync             do not wait for changes to be written safely to "
@@ -744,12 +770,12 @@ msgid ""
 msgstr ""
 "  -N, --no-sync             작업 완료 뒤 디스크 동기화 작업을 하지 않음\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=DIRECTORY    출력 디렉터리\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -758,23 +784,23 @@ msgstr ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                            OLDDIR을 NEWDIR로 테이블스페이스 재조정\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr "      --clone               파일을 복사 대신에 클론 (reflink)\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                파일 복사 (기본값)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr ""
 "      --copy-file-range     복사 할 때 copy using copy_file_range() 사용\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
@@ -783,27 +809,27 @@ msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            매니페스트 체크섬 알고리즘 지정\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         백업 매니페이스 파일 만들지 않음\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD  파일을 디스크에 동기화 하는 방법 지정\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             버전 정보를 보여주고 마침\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                이 도움말을 보여주고 마침\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -812,72 +838,72 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "\"%s\" 심볼릭 링크 건너뜀"
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "\"%s\" 특수 파일을 건너뜀"
 
-#: pg_combinebackup.c:1073 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "\"%s\" 매니페스트 파일에 \"%s\" 파일에 대한 정보가 없음"
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: 서버 버전이 너무 낮음"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: 버전 번호를 해석할 수 없음"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "\"%s\" 심볼릭 링크 파일을 읽을 수 없음: %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "\"%s\" 심볼릭 링크의 대상이 너무 긺"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "\"%s\" 심볼릭 링크 대상이 상대 경로임"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "\"%s\"의 테이블스페이스는 테이블스페이스 맵핑 정보가 없음"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "OIDs %u, %u 두 테이블스페이스는 같은 \"%s\" 디렉터리를 사용함"
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "\"%s\" 파일이 너무 큽니다."
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "\"%s\" 파일을 읽을 수 없음: %zd/%lld 만 읽었음"
diff --git a/src/bin/pg_combinebackup/po/ru.po b/src/bin/pg_combinebackup/po/ru.po
index 5c2af7387c3..732fdaf4e13 100644
--- a/src/bin/pg_combinebackup/po/ru.po
+++ b/src/bin/pg_combinebackup/po/ru.po
@@ -1,10 +1,10 @@
-# Alexander Lakhin <exclusion@gmail.com>, 2024.
+# SPDX-FileCopyrightText: 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_combinebackup (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-11-09 08:04+0300\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 09:22+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -15,22 +15,22 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 21.12.3\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -40,8 +40,8 @@ msgstr "подсказка: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:540
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
@@ -52,8 +52,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %zu)"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -77,31 +77,32 @@ msgstr ""
 "этой программой. В этом случае результаты будут неверными и\n"
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:523 reconstruct.c:638
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:852
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
@@ -130,126 +131,126 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:204
-#: reconstruct.c:421
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr ""
 "Инкрементальный лексический анализатор не подходит для нисходящего "
 "рекурсивного разбора."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr ""
 "Для инкрементального разбора требуется инкрементальный лексический "
 "анализатор."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr ""
 "Слишком большая вложенность JSON, максимальная допустимая глубина: 6400."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Неверная спецпоследовательность: \"\\%.*s\"."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ с кодом 0x%02x необходимо экранировать."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Ожидался конец текста, но обнаружено продолжение \"%.*s\"."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Ожидался элемент массива или \"]\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Ожидалась \",\" или \"]\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Ожидалось \":\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Ожидалось значение JSON, но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Неожиданный конец входной строки."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Ожидалась строка или \"}\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Ожидалась \",\" или \"}\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Ожидалась строка, но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Ошибочный элемент \"%.*s\"."
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 нельзя преобразовать в текст."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" должны следовать четыре шестнадцатеричные цифры."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -257,21 +258,25 @@ msgstr ""
 "Спецкоды Unicode для значений выше 007F можно использовать только с "
 "кодировкой UTF8."
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Спецкод Unicode нельзя преобразовать в серверную кодировку %s."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr ""
 "Старшее слово суррогата Unicode не может следовать за другим старшим словом."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Младшее слово суррогата Unicode должно следовать за старшим словом."
 
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "нехватка памяти при составлении описания ошибки"
+
 #: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
@@ -362,7 +367,7 @@ msgstr "не удалось декодировать имя файла"
 msgid "file size is not an integer"
 msgstr "размер файла не является целочисленным"
 
-#: ../../common/parse_manifest.c:699 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нераспознанный алгоритм расчёта контрольных сумм: \"%s\""
@@ -474,68 +479,73 @@ msgstr "%s: не удалось найти %s"
 msgid "%s: %s requires %s"
 msgstr "%s: %s требует %s"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "не удалось записать файл \"%s\" (записано байт: %d из %d)"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "не удалось изменить контекст контрольной суммы файла \"%s\""
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "не удалось записать в файл \"%s\": %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr ""
 "не удалось записать в файл \"%s\" (смещение %u, записано байт: %d из %d)"
 
-#: copy_file.c:199 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "ошибка при клонировании файла \"%s\" в \"%s\": %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "не удалось создать файл \"%s\": %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "ошибка при клонировании файла \"%s\" в \"%s\": %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "клонирование файлов не поддерживается в этой ОС"
 
-#: copy_file.c:278 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "ошибка при копировании фрагмента файла \"%s\" в \"%s\": %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range не поддерживается в этой ОС"
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "не удалось скопировать файл \"%s\" в \"%s\": %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "не удалось создать ссылку \"%s\" в \"%s\": %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -562,27 +572,30 @@ msgstr ""
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "дублирующийся путь в манифесте копии: \"%s\""
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "входные каталоги не указаны"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "выходной каталог не указан"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: идентификатор системы в манифесте %llu, а в управляющем файле %llu"
+msgid ""
+"%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr ""
+"%s: идентификатор системы в манифесте %<PRIu64>, а в управляющем файле "
+"%<PRIu64>"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid ""
 "cannot generate a manifest because no manifest is available for the final "
@@ -591,41 +604,57 @@ msgstr ""
 "сгенерировать манифест нельзя по причине отсутствия манифеста в последней "
 "указанной копии"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\" в \"%s\": %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid ""
+"--link mode was used; any modifications to the output directory might "
+"destructively modify input directories"
+msgstr ""
+"был использован режим --link; любые изменения в выходном каталоге могут "
+"разрушительно повлиять на входные каталоги"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "слишком длинное имя каталога"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "несколько знаков \"=\" в сопоставлении табличного пространства"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr ""
 "сопоставление табл. пространства записано неверно: \"%s\"; должно быть "
 "\"СТАРЫЙ_КАТАЛОГ=НОВЫЙ_КАТАЛОГ\""
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr ""
 "старый каталог в сопоставлении табл. пространства задан не абсолютным путём: "
 "%s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr ""
+"новый каталог в сопоставлении табл. пространства задан не абсолютным путём: "
+"%s"
+
+#: pg_combinebackup.c:563
 #, c-format
 msgid ""
 "backup at \"%s\" is a full backup, but only the first backup should be a "
@@ -634,7 +663,7 @@ msgstr ""
 "копия в \"%s\" является полной копией, но полную копию можно передать только "
 "первой в списке"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid ""
 "backup at \"%s\" is an incremental backup, but the first backup should be a "
@@ -643,37 +672,37 @@ msgstr ""
 "копия в \"%s\" является инкрементальной, но первой в списке должна "
 "передаваться полная копия"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "копия в \"%s\" начинается с линии времени %u, а ожидалась %u"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "копия в \"%s\" начинается с LSN %X/%X, а ожидался %X/%X"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: ошибка CRC"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: неожиданная версия управляющего файла"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s: ожидался идентификатор системы %llu, но обнаружен %llu"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s: ожидался идентификатор системы %<PRIu64>, но обнаружен %<PRIu64>"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "контрольные суммы включены только в некоторых копиях"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid ""
 "Disable, and optionally reenable, checksums on the output directory to avoid "
@@ -682,37 +711,37 @@ msgstr ""
 "Отключите (и при необходимости вновь включите) контрольные суммы в выходном "
 "каталоге во избежание сбоев."
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "удаление выходного каталога \"%s\""
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "ошибка при удалении выходного каталога"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "удаление содержимого выходного каталога \"%s\""
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "ошибка при удалении содержимого выходного каталога"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" существует, но он не пуст"
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ошибка при обращении к каталогу \"%s\": %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -721,17 +750,17 @@ msgstr ""
 "%s реконструирует полные копии из инкрементальных.\n"
 "\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [ПАРАМЕТР]... КАТАЛОГ...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -740,18 +769,23 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               выдавать много отладочных сообщений\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                не копировать файлы, а создавать ссылки\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr ""
 "  -n, --dry-run             не выполнять никаких практических действий\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid ""
 "  -N, --no-sync             do not wait for changes to be written safely to "
@@ -759,12 +793,12 @@ msgid ""
 msgstr ""
 "  -N, --no-sync             не ждать завершения сохранения данных на диске\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=КАТАЛОГ      выходной каталог\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -775,7 +809,7 @@ msgstr ""
 "каталога\n"
 "                            в новый\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr ""
@@ -783,19 +817,19 @@ msgstr ""
 "копировать\n"
 "                            файлы\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                копировать файлы (по умолчанию)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr ""
 "      --copy-file-range     использовать для копирования системную функцию\n"
 "                            copy_file_range()\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
@@ -804,27 +838,27 @@ msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            алгоритм подсчёта контрольных сумм в манифесте\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         отключить создание манифеста копии\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=МЕТОД   метод синхронизации файлов с ФС\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -833,73 +867,73 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "символическая ссылка \"%s\" пропускается"
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "специальный файл \"%s\" пропускается"
 
-#: pg_combinebackup.c:1073 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "файл манифеста \"%s\" не содержит записи о файле \"%s\""
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: версия сервера слишком старая"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: не удалось разобрать номер версии"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "не удалось прочитать символическую ссылку \"%s\": %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "целевой путь символической ссылки \"%s\" слишком длинный"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "целевой путь символической ссылки \"%s\" является относительным"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "для табличного пространства в \"%s\" не задано сопоставление"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr ""
 "два табличных пространства с OIDs %u и %u указывают на один каталог \"%s\""
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не удалось закрыть каталог \"%s\": %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "файл \"%s\" слишком большой"
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %zd из %lld)"
@@ -909,35 +943,35 @@ msgstr "не удалось прочитать файл \"%s\" (прочитан
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "полная копия содержит неожиданный инкрементальный файл \"%s\""
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "файл \"%s\" слишком мал (ожидалось байт: %llu, фактически: %llu)"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr ""
 "в файла \"%s\" неверное контрольное число инкрементальной копии (0x%x, "
 "ожидалось: 0x%x)"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "в файле \"%s\" количество блоков %u превышает размер сегмента %u"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr ""
 "в файле \"%s\" длина отсечения в блоках (%u) превышает размер сегмента %u"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %u)"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr ""
diff --git a/src/bin/pg_combinebackup/po/sv.po b/src/bin/pg_combinebackup/po/sv.po
index 06327f49fe9..50928767913 100644
--- a/src/bin/pg_combinebackup/po/sv.po
+++ b/src/bin/pg_combinebackup/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_combinebackup
 # Copyright (C) 2024 PostgreSQL Global Development Group
 # This file is distributed under the same license as the pg_combinebackup (PostgreSQL) package.
-# Dennis Björklund <db@zigo.dhs.org>, 2024, 2025.
+# Dennis Björklund <db@zigo.dhs.org>, 2024, 2025, 2026.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-12 13:52+0000\n"
-"PO-Revision-Date: 2025-02-12 20:37+0100\n"
+"POT-Creation-Date: 2026-02-07 08:22+0000\n"
+"PO-Revision-Date: 2026-02-07 09:26+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -42,8 +42,8 @@ msgstr "tips: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:540
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "kunde inte läsa fil \"%s\": %m"
@@ -54,8 +54,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "kunde inte läsa fil \"%s\": läste %d av %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:369 reconstruct.c:740
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -78,31 +78,32 @@ msgstr ""
 "inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:523 reconstruct.c:638
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:759
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:852
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
@@ -131,137 +132,141 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:204
-#: reconstruct.c:421
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Recursive-descent-parser kan inte använda inkrementell lexer."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "Inkrementell parser kräver en inkrementell lexer."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON nästlad för djupt, maximal tillåtet djup är 6400."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Escape-sekvens \"\\%.*s\" är ogiltig."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Tecken med värde 0x%02x måste escape:as."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Förväntade slut på indata, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Färväntade array-element eller \"]\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Förväntade \",\" eller \"]\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Förväntade sig \":\" men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Förväntade JSON-värde, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Indatasträngen avslutades oväntat."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Färväntade sträng eller \"}\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Förväntade sig \",\" eller \"}\" men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Förväntade sträng, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Token \"%.*s\" är ogiltig."
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kan inte konverteras till text."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" måste följas av fyra hexdecimala siffror."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Escape-värden för unicode kan inte användas för kodpunkter med värde över 007F när kodningen inte är UTF8."
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Escape-värde för unicode kan inte översättas till serverns kodning %s."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicodes övre surrogathalva får inte komma efter en övre surrogathalva."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicodes lägre surrogathalva måste följa en övre surrogathalva."
 
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "slut på minne vid skapande av felbeskrivning"
+
 #: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
@@ -352,7 +357,7 @@ msgstr "kunde inte avkoda filnamn"
 msgid "file size is not an integer"
 msgstr "filstorlek är inte ett haltal"
 
-#: ../../common/parse_manifest.c:699 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "okänd algoritm för kontrollsumma: \"%s\""
@@ -464,67 +469,72 @@ msgstr "%s: kunde inte hitta %s"
 msgid "%s: %s requires %s"
 msgstr "%s: %s kräver %s"
 
-#: backup_label.c:162 reconstruct.c:761 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "kunde inte skriva fil \"%s\": skrev %d av %d"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:721
-#: reconstruct.c:767 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "kunde inte uppdatera kontrollsumma för filen \"%s\""
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "kunde inte skriva till fil \"%s\": %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "kunde inte skriva till fil \"%s\", offset %u: skrev %d av %d"
 
-#: copy_file.c:199 reconstruct.c:784
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "kunde inte läsa från fil \"%s\": %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "fel vid kloning av fil \"%s\" till \"%s\": %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "kunde inte skapa fil \"%s\": %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "fel vid kloning av fil \"%s\" till \"%s\": %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "filkloning stöds inte på denna plattform"
 
-#: copy_file.c:278 reconstruct.c:704
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "fel vid kopiering av filintervall från \"%s\" till \"%s\": %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:724
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range stöds inte på denna plattform"
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "kunde inte kopiera fil \"%s\" till \"%s\": %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "kunde inte skapa länk från \"%s\" till \"%s\": %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -550,137 +560,147 @@ msgstr "version 1 av backup-manifest stöder inte inkrementell backup"
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "duplicerad sökväg i backup-manifest: \"%s\""
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "inga indatakataloger har angivits"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "ingen utdatakatalog angiven"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: manifestets systemidentifierare är %llu men kontrollfilern har %llu"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: manifestets systemidentifierare är %<PRIu64> men kontrollfilern har %<PRIu64>"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid "cannot generate a manifest because no manifest is available for the final input backup"
 msgstr "kan inte skapa manifest då inget manifest är tillgängligt för den avslutande indatabackup:en"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "kunde inte skapa symbolisk länk från \"%s\" till \"%s\": %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "kunde inte skapa katalog \"%s\": %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid "--link mode was used; any modifications to the output directory might destructively modify input directories"
+msgstr "--link användes; ändringar i output-katalogen kan förstöra input-katalogen"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "katalognamn för långt"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "multipla \"=\"-tecken i tablespace-mappning"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "ogiltigt tablespace-mappningsformat \"%s\", måste vara \"OLDDIR=NEWDIR\""
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "gammal katalog är inte en absolut sökväg i tablespace-mappning: %s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:494
+#, c-format
+msgid "new directory is not an absolute path in tablespace mapping: %s"
+msgstr "ny katalog är inte en absolut sökväg i tablespace-mappning: %s"
+
+#: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
 msgstr "backup:en vid \"%s\" är en full backup men det är bara den första backup:en som skall vara en full backup"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid "backup at \"%s\" is an incremental backup, but the first backup should be a full backup"
 msgstr "backup:en vid \"%s\" är en inkrementell backup men den första backupen skall vara en full backup"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "backup:en vid \"%s\" startar på tidslinjen %u men det förväntades vara %u"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "backup:eb vid \"%s\" startar vid LSN %X/%X men förväntades vare %X/%X"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: CRC är inkorrekt"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: oväntad version på kontrollfil"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s: förväntade systemidentifierare %llu men hittade %llu"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s: förväntade systemidentifierare %<PRIu64> men hittade %<PRIu64>"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "bara några backup:er har checksummor aktiverade"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid "Disable, and optionally reenable, checksums on the output directory to avoid failures."
 msgstr "Avaktivera och möjligen återaktivera checksummor på utdatakatalogen för att undvika fel"
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "tar bort katalog för utdata \"%s\""
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "misslyckades att ta bort katalog för utdata"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "tar bort innehåll i katalog för utdata \"%s\""
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "misslyckades att ta bort innehåll i katalog för utdata"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "katalogen \"%s\" existerar men är inte tom"
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "kunde inte komma åt katalog \"%s\": %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid ""
 "%s reconstructs full backups from incrementals.\n"
@@ -689,17 +709,17 @@ msgstr ""
 "%s återskapar fulla backup:er från inkrementella.\n"
 "\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [FLAGGA]... KATALOG...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid ""
 "\n"
@@ -708,27 +728,32 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               generera massor med debug-utskrifter\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                länka filer istället för att kopiera\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             gör inga operationer\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync             vänta inte på att ändingar säkert skrivits till disk\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=KATALOG      katalog för utdata\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -737,22 +762,22 @@ msgstr ""
 "  -T, --tablespace-mapping=FRÅNKAT=NYKAT\n"
 "                            flytta tabellutrymme i FRÅNKAT till NYKAT\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr "      --clone               klona (reflink) filer istället för att kopiera\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                kopiera filer (standard)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr "      --copy-file-range     kopiera med systemaropet copy_file_range()\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
@@ -761,27 +786,27 @@ msgstr ""
 "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            algoritm att anvvända för checksummor i manifest\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         skapa inget backup-manifest\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METOD   sätt synkmetod för att synka filer till disk\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             visa versionsinformation, avsluta sedan\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                visa denna hjälp, avsluta sedan\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid ""
 "\n"
@@ -790,72 +815,72 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "hoppar över symbolisk länk \"%s\""
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "hoppar över specialfil \"%s\""
 
-#: pg_combinebackup.c:1073 reconstruct.c:305
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "manifestfil \"%s\" innehåller ingen post för fil \"%s\""
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: serverns version är för gammal"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: kunde inte parsa versionnummer"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "kan inte läsa symbolisk länk \"%s\": %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "destinationen för symbolisk länk \"%s\" är för lång"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "destination för symbolisk länk \"%s\" är relativ"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "tabellutrymme vid \"%s\" har ingen mapping"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "tabellutrymme med OID:er %u och %u pekar på samma katalog \"%s\""
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "kunde inte stänga katalog \"%s\": %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "filen \"%s\" är för stor"
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "kunde inte läsa fil \"%s\": läste %zd av %lld"
@@ -865,32 +890,32 @@ msgstr "kunde inte läsa fil \"%s\": läste %zd av %lld"
 msgid "full backup contains unexpected incremental file \"%s\""
 msgstr "full backup innehåller in oväntad inkrementell fil \"%s\""
 
-#: reconstruct.c:423
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "filen \"%s\" är för kort: förväntade %llu, hittade %llu"
 
-#: reconstruct.c:465
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "filen \"%s\" har ett felaktigt inkrementellt magiskt nummer (0x%x, förväntade 0x%x)"
 
-#: reconstruct.c:471
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "filen \"%s\" har ett blockantal %u som är större än segmentstorleken %u"
 
-#: reconstruct.c:478
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "filen \"%s\" trunkeringsblocklängd %u som är större än segmentstorleken %u"
 
-#: reconstruct.c:542
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "kunde inte läsa filen \"%s\": läste %d av %u"
 
-#: reconstruct.c:786
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "kunde inte läsa från filen \"%s\", offset %llu: läste %d av %d"
diff --git a/src/bin/pg_combinebackup/po/uk.po b/src/bin/pg_combinebackup/po/uk.po
index 51e19b62206..5d05fd6aab7 100644
--- a/src/bin/pg_combinebackup/po/uk.po
+++ b/src/bin/pg_combinebackup/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:22+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:22+0000\n"
+"PO-Revision-Date: 2026-01-02 15:48\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_combinebackup.pot\n"
-"X-Crowdin-File-ID: 1008\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_combinebackup.pot\n"
+"X-Crowdin-File-ID: 1071\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -42,8 +42,8 @@ msgstr "підказка: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
-#: ../../common/controldata_utils.c:110 copy_file.c:150 load_manifest.c:161
-#: load_manifest.c:199 pg_combinebackup.c:1400 reconstruct.c:527
+#: ../../common/controldata_utils.c:110 copy_file.c:164 load_manifest.c:161
+#: load_manifest.c:199 pg_combinebackup.c:1410 reconstruct.c:542
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не вдалося прочитати файл \"%s\": %m"
@@ -54,8 +54,8 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: backup_label.c:174 copy_file.c:68 pg_combinebackup.c:538
-#: pg_combinebackup.c:1175 reconstruct.c:356 reconstruct.c:727
+#: backup_label.c:174 copy_file.c:71 pg_combinebackup.c:548
+#: pg_combinebackup.c:1185 reconstruct.c:369 reconstruct.c:742
 #: write_manifest.c:187
 #, c-format
 msgid "could not close file \"%s\": %m"
@@ -74,31 +74,32 @@ msgid "possible byte ordering mismatch\n"
 msgstr "можлива помилка у послідовності байтів.\n"
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 backup_label.c:143 copy_file.c:66
-#: copy_file.c:139 copy_file.c:171 copy_file.c:175 copy_file.c:225
-#: copy_file.c:268 load_manifest.c:128 pg_combinebackup.c:523
-#: pg_combinebackup.c:1167 reconstruct.c:510 reconstruct.c:625
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 backup_label.c:143 copy_file.c:69
+#: copy_file.c:153 copy_file.c:185 copy_file.c:189 copy_file.c:239
+#: copy_file.c:282 load_manifest.c:128 pg_combinebackup.c:533
+#: pg_combinebackup.c:1177 reconstruct.c:525 reconstruct.c:640
 #: write_manifest.c:250
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:746
+#: ../../common/controldata_utils.c:249 backup_label.c:160 reconstruct.c:761
 #: write_manifest.c:260
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/parse_manifest.c:157 ../../common/parse_manifest.c:853
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
@@ -127,290 +128,294 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:676
-#: pg_combinebackup.c:1131 pg_combinebackup.c:1383 reconstruct.c:199
-#: reconstruct.c:408
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: backup_label.c:187 load_manifest.c:133 pg_combinebackup.c:685
+#: pg_combinebackup.c:1141 pg_combinebackup.c:1393 reconstruct.c:204
+#: reconstruct.c:422
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_combinebackup.c:933 pg_combinebackup.c:1256
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_combinebackup.c:943 pg_combinebackup.c:1266
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
 
-#: ../../common/jsonapi.c:2121
+#: ../../common/jsonapi.c:2435
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Рекурсивний спуск не може використовувати інкрементний лексичний аналізатор."
 
-#: ../../common/jsonapi.c:2123
+#: ../../common/jsonapi.c:2437
 msgid "Incremental parser requires incremental lexer."
 msgstr "Інкрементний аналізатор потребує Інкрементний лексичний аналізатор."
 
-#: ../../common/jsonapi.c:2125
+#: ../../common/jsonapi.c:2439
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON вкладений занадто глибокий, максимально дозволена глибина - 6400."
 
-#: ../../common/jsonapi.c:2127
+#: ../../common/jsonapi.c:2441
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Неприпустима спеціальна послідовність \"\\%.*s\"."
 
-#: ../../common/jsonapi.c:2131
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ зі значенням 0x%02x повинен бути пропущений."
 
-#: ../../common/jsonapi.c:2135
+#: ../../common/jsonapi.c:2449
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Очікувався кінець введення, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2138
+#: ../../common/jsonapi.c:2452
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Очікувався елемент масиву або \"]\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2141
+#: ../../common/jsonapi.c:2455
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "Очікувалось \",\" або \"]\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2144
+#: ../../common/jsonapi.c:2458
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "Очікувалось \":\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2147
+#: ../../common/jsonapi.c:2461
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "Очікувалось значення JSON, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2150
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Несподіваний кінець вхідного рядка."
 
-#: ../../common/jsonapi.c:2152
+#: ../../common/jsonapi.c:2466
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Очікувався рядок або \"}\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2155
+#: ../../common/jsonapi.c:2469
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "Очікувалось \",\" або \"}\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2158
+#: ../../common/jsonapi.c:2472
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Очікувався рядок, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:2161
+#: ../../common/jsonapi.c:2475
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Неприпустимий маркер \"%.*s\"."
 
-#: ../../common/jsonapi.c:2164
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 не можна перетворити в текст."
 
-#: ../../common/jsonapi.c:2166
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" повинні прямувати чотири шістнадцяткових числа."
 
-#: ../../common/jsonapi.c:2169
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Значення виходу Unicode не можна використовувати для значень кодових точок більше 007F, якщо кодування не UTF8."
 
-#: ../../common/jsonapi.c:2178
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Значення символу Unicode не вдалося перекласти в кодування сервера %s."
 
-#: ../../common/jsonapi.c:2185
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Старший сурогат Unicode не повинен прямувати за іншим старшим сурогатом."
 
-#: ../../common/jsonapi.c:2187
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Молодший сурогат Unicode не повинен прямувати за іншим молодшим сурогатом."
 
-#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:855
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "недостатньо пам'яті для опису помилок"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
 #, c-format
 msgid "could not initialize checksum of manifest"
 msgstr "не вдалося ініціалізувати контрольну суму маніфесту"
 
-#: ../../common/parse_manifest.c:204 ../../common/parse_manifest.c:261
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "маніфест закінчився несподівано"
 
-#: ../../common/parse_manifest.c:210 ../../common/parse_manifest.c:862
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
 #, c-format
 msgid "could not update checksum of manifest"
 msgstr "не вдалося оновити контрольну суму маніфесту"
 
-#: ../../common/parse_manifest.c:302
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "неочікуваний початок об'єкта"
 
-#: ../../common/parse_manifest.c:337
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "неочікуваний кінець об'єкта"
 
-#: ../../common/parse_manifest.c:366
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "неочікуваний початок масиву"
 
-#: ../../common/parse_manifest.c:391
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "неочікуваний кінець масиву"
 
-#: ../../common/parse_manifest.c:418
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "індикатор очікуваної версії"
 
-#: ../../common/parse_manifest.c:454
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "нерозпізнане поле верхнього рівня"
 
-#: ../../common/parse_manifest.c:473
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "неочікуване поле файлу"
 
-#: ../../common/parse_manifest.c:487
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "неочікуване поле діапазону WAL"
 
-#: ../../common/parse_manifest.c:493
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "неочікуване поле об'єкта"
 
-#: ../../common/parse_manifest.c:583
+#: ../../common/parse_manifest.c:582
 msgid "unexpected scalar"
 msgstr "неочікуваний скаляр"
 
-#: ../../common/parse_manifest.c:609
+#: ../../common/parse_manifest.c:608
 msgid "manifest version not an integer"
 msgstr "версія маніфесту не ціле число"
 
-#: ../../common/parse_manifest.c:613
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "неочікувана версія маніфесту"
 
-#: ../../common/parse_manifest.c:637
+#: ../../common/parse_manifest.c:636
 msgid "system identifier in manifest not an integer"
 msgstr "системний ідентифікатор в маніфесті не ціле число"
 
-#: ../../common/parse_manifest.c:662
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "пропущено шлях"
 
-#: ../../common/parse_manifest.c:665
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "і ім'я шляху, і закодований шлях"
 
-#: ../../common/parse_manifest.c:667
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "відсутній розмір"
 
-#: ../../common/parse_manifest.c:670
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "контрольна сума без алгоритму"
 
-#: ../../common/parse_manifest.c:684
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "не вдалося декодувати ім'я файлу"
 
-#: ../../common/parse_manifest.c:694
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "розмір файлу не є цілим числом"
 
-#: ../../common/parse_manifest.c:700 pg_combinebackup.c:199
+#: ../../common/parse_manifest.c:699 pg_combinebackup.c:204
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм контрольної суми: \"%s\""
 
-#: ../../common/parse_manifest.c:719
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "неприпустима контрольна сума для файлу \"%s\": \"%s\""
 
-#: ../../common/parse_manifest.c:762
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "відсутня часова шкала"
 
-#: ../../common/parse_manifest.c:764
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "відсутній LSN початку"
 
-#: ../../common/parse_manifest.c:766
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "відсутній LSN кінця"
 
-#: ../../common/parse_manifest.c:772
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "часова лінія не є цілим числом"
 
-#: ../../common/parse_manifest.c:775
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "не вдалося проаналізувати початковий LSN"
 
-#: ../../common/parse_manifest.c:778
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "не вдалося проаналізувати кінцевий LSN"
 
-#: ../../common/parse_manifest.c:843
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "очікувалося принаймні 2 рядки"
 
-#: ../../common/parse_manifest.c:846
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "останній рядок не завершений новим рядком"
 
-#: ../../common/parse_manifest.c:865
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "не вдалося остаточно завершити контрольну суму маніфесту"
 
-#: ../../common/parse_manifest.c:869
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "у маніфесті немає контрольної суми"
 
-#: ../../common/parse_manifest.c:873
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "неприпустима контрольна сума маніфесту: \"%s\""
 
-#: ../../common/parse_manifest.c:877
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "невідповідність контрольної суми маніфесту"
 
-#: ../../common/parse_manifest.c:892
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "не вдалося проаналізувати маніфест резервної копії: %s"
@@ -460,67 +465,72 @@ msgstr "%s: не вдалося знайти %s"
 msgid "%s: %s requires %s"
 msgstr "%s: %s вимагає %s"
 
-#: backup_label.c:162 reconstruct.c:748 write_manifest.c:262
+#: backup_label.c:162 reconstruct.c:763 write_manifest.c:262
 #, c-format
 msgid "could not write file \"%s\": wrote %d of %d"
 msgstr "не вдалося записати файл \"%s\": записано %d з %d"
 
-#: backup_label.c:166 copy_file.c:146 copy_file.c:193 reconstruct.c:708
-#: reconstruct.c:754 write_manifest.c:270
+#: backup_label.c:166 copy_file.c:160 copy_file.c:207 reconstruct.c:723
+#: reconstruct.c:769 write_manifest.c:270
 #, c-format
 msgid "could not update checksum of file \"%s\""
 msgstr "не вдалося оновити контрольну суму файлу \"%s\""
 
-#: copy_file.c:186
+#: copy_file.c:200
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "неможливо записати до файлу \"%s\": %m"
 
-#: copy_file.c:188
+#: copy_file.c:202
 #, c-format
 msgid "could not write to file \"%s\", offset %u: wrote %d of %d"
 msgstr "не вдалося записати до файлу \"%s\", зсув %u: записано %d з %d"
 
-#: copy_file.c:199 reconstruct.c:771
+#: copy_file.c:213 reconstruct.c:786
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "не вдалося прочитати з файлу \"%s\": %m"
 
-#: copy_file.c:218
+#: copy_file.c:232
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %m"
 msgstr "помилка при клонуванні файлу \"%s\" в \"%s\": %m"
 
-#: copy_file.c:229 copy_file.c:272
+#: copy_file.c:243 copy_file.c:286
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "неможливо створити файл \"%s\": %m"
 
-#: copy_file.c:237
+#: copy_file.c:251
 #, c-format
 msgid "error while cloning file \"%s\" to \"%s\": %s"
 msgstr "помилка при клонуванні файлу \"%s\" в \"%s\": %s"
 
-#: copy_file.c:245 pg_combinebackup.c:251
+#: copy_file.c:259 pg_combinebackup.c:256
 #, c-format
 msgid "file cloning not supported on this platform"
 msgstr "клонування файлів не підтримується на цій платформі"
 
-#: copy_file.c:278 reconstruct.c:691
+#: copy_file.c:292 reconstruct.c:706
 #, c-format
 msgid "error while copying file range from \"%s\" to \"%s\": %m"
 msgstr "помилка при копіюванні діапазону файлу від \"%s\" до \"%s\": %m"
 
-#: copy_file.c:285 pg_combinebackup.c:264 reconstruct.c:711
+#: copy_file.c:299 pg_combinebackup.c:269 reconstruct.c:726
 #, c-format
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range не підтримується на цій платформі"
 
-#: copy_file.c:300
+#: copy_file.c:314
 #, c-format
 msgid "could not copy file \"%s\" to \"%s\": %m"
 msgstr "не вдалося скопіювати файл \"%s\" в \"%s\": %m"
 
+#: copy_file.c:333
+#, c-format
+msgid "could not create link from \"%s\" to \"%s\": %m"
+msgstr "не вдалося створити посилання з \"%s\" на \"%s\": %m"
+
 #: load_manifest.c:125
 #, c-format
 msgid "file \"%s\" does not exist"
@@ -536,340 +546,355 @@ msgstr "не вдалося прочитати файл \"%s\": прочитан
 msgid "could not read file \"%s\": read %lld of %lld"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %lld з %lld"
 
-#: load_manifest.c:249
+#: load_manifest.c:248
 #, c-format
 msgid "backup manifest version 1 does not support incremental backup"
 msgstr "маніфест резервного копіювання версії 1 не підтримує інкреметного резервного копіювання"
 
-#: load_manifest.c:281
+#: load_manifest.c:280
 #, c-format
 msgid "duplicate path name in backup manifest: \"%s\""
 msgstr "дубльований шлях у маніфесті резервного копіювання: \"%s\""
 
-#: pg_combinebackup.c:220 pg_combinebackup.c:228
+#: pg_combinebackup.c:225 pg_combinebackup.c:233
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_combinebackup.c:227
+#: pg_combinebackup.c:232
 #, c-format
 msgid "no input directories specified"
 msgstr "вхідні каталоги не вказано"
 
-#: pg_combinebackup.c:233
+#: pg_combinebackup.c:238
 #, c-format
 msgid "no output directory specified"
 msgstr "вихідний каталог не вказано"
 
-#: pg_combinebackup.c:301
+#: pg_combinebackup.c:306
 #, c-format
-msgid "%s: manifest system identifier is %llu, but control file has %llu"
-msgstr "%s: маніфестовий ідентифікатор системи - %llu, але контрольний файл має %llu"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: маніфестовий ідентифікатор системи - %<PRIu64>, але контрольний файл має %<PRIu64>"
 
-#: pg_combinebackup.c:340
+#: pg_combinebackup.c:345
 #, c-format
 msgid "cannot generate a manifest because no manifest is available for the final input backup"
 msgstr "не вдається згенерувати маніфест, оскільки для остаточної резервної копії вхідних даних немає маніфесту"
 
-#: pg_combinebackup.c:387
+#: pg_combinebackup.c:392
 #, c-format
 msgid "could not create symbolic link from \"%s\" to \"%s\": %m"
 msgstr "не вдалося створити символічне послання з \"%s\" на \"%s\": %m"
 
-#: pg_combinebackup.c:399 pg_combinebackup.c:730 pg_combinebackup.c:927
+#: pg_combinebackup.c:404 pg_combinebackup.c:739 pg_combinebackup.c:937
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не вдалося створити каталог \"%s\": %m"
 
-#: pg_combinebackup.c:454
+#: pg_combinebackup.c:434
+#, c-format
+msgid "--link mode was used; any modifications to the output directory might destructively modify input directories"
+msgstr "використовувався режим --link; будь-які зміни в каталозі вихідних даних можуть деструктивно змінити вхідні каталоги"
+
+#: pg_combinebackup.c:464
 #, c-format
 msgid "directory name too long"
 msgstr "ім'я директорії задовге"
 
-#: pg_combinebackup.c:461
+#: pg_combinebackup.c:471
 #, c-format
 msgid "multiple \"=\" signs in tablespace mapping"
 msgstr "кілька знаків \"=\" зіставленні табличних просторів"
 
-#: pg_combinebackup.c:469
+#: pg_combinebackup.c:479
 #, c-format
 msgid "invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\""
 msgstr "неприпустимий табличний простір зіставлення формату \"%s\", має бути \"OLDDIR = NEWDIR\""
 
-#: pg_combinebackup.c:480 pg_combinebackup.c:484
+#: pg_combinebackup.c:490 pg_combinebackup.c:494
 #, c-format
 msgid "old directory is not an absolute path in tablespace mapping: %s"
 msgstr "старий каталог не є абсолютним шляхом у зіставлення табличного простору: %s"
 
-#: pg_combinebackup.c:553
+#: pg_combinebackup.c:563
 #, c-format
 msgid "backup at \"%s\" is a full backup, but only the first backup should be a full backup"
 msgstr "резервна копія за адресою \"%s\" є повною резервною копією, але тільки перша резервна копія має бути повною резервною копією"
 
-#: pg_combinebackup.c:556
+#: pg_combinebackup.c:566
 #, c-format
 msgid "backup at \"%s\" is an incremental backup, but the first backup should be a full backup"
 msgstr "резервна копія за адресою \"%s\" є інкрементною резервною копією, але перша резервна копія має бути повною"
 
-#: pg_combinebackup.c:559
+#: pg_combinebackup.c:569
 #, c-format
 msgid "backup at \"%s\" starts on timeline %u, but expected %u"
 msgstr "резервне копіювання на \"%s\" починається на лінії часу %u, але очікується %u"
 
-#: pg_combinebackup.c:562
+#: pg_combinebackup.c:572
 #, c-format
 msgid "backup at \"%s\" starts at LSN %X/%X, but expected %X/%X"
 msgstr "резервне копіювання на \"%s\" починається з LSN %X/%X, але очікується %X/%X"
 
-#: pg_combinebackup.c:614
+#: pg_combinebackup.c:624
 #, c-format
 msgid "%s: CRC is incorrect"
 msgstr "%s: CRC невірний"
 
-#: pg_combinebackup.c:618
+#: pg_combinebackup.c:628
 #, c-format
 msgid "%s: unexpected control file version"
 msgstr "%s: неочікувана версія контрольного файлу"
 
-#: pg_combinebackup.c:625
+#: pg_combinebackup.c:635
 #, c-format
-msgid "%s: expected system identifier %llu, but found %llu"
-msgstr "%s: очікуваний ідентифікатор системи %llu, але знайдено %llu"
+msgid "%s: expected system identifier %<PRIu64>, but found %<PRIu64>"
+msgstr "%s: очікувався системний ідентифікатор %<PRIu64>, але знайдено %<PRIu64>"
 
-#: pg_combinebackup.c:657
+#: pg_combinebackup.c:666
 #, c-format
 msgid "only some backups have checksums enabled"
 msgstr "лише деякі резервні копії мають включені контрольні суми"
 
-#: pg_combinebackup.c:658
+#: pg_combinebackup.c:667
 #, c-format
 msgid "Disable, and optionally reenable, checksums on the output directory to avoid failures."
 msgstr "Вимкніть, та за бажанням увімкніть, контрольні суми для вихідного каталога, щоб уникнути помилок."
 
-#: pg_combinebackup.c:693
+#: pg_combinebackup.c:702
 #, c-format
 msgid "removing output directory \"%s\""
 msgstr "видалення вихідного каталогу \"%s\""
 
-#: pg_combinebackup.c:695
+#: pg_combinebackup.c:704
 #, c-format
 msgid "failed to remove output directory"
 msgstr "не вдалося вилучити вихідний каталог"
 
-#: pg_combinebackup.c:699
+#: pg_combinebackup.c:708
 #, c-format
 msgid "removing contents of output directory \"%s\""
 msgstr "видалення вмісту вихідного каталогу \"%s\""
 
-#: pg_combinebackup.c:702
+#: pg_combinebackup.c:711
 #, c-format
 msgid "failed to remove contents of output directory"
 msgstr "не вдалося вилучити вміст з вихідного каталогу"
 
-#: pg_combinebackup.c:742
+#: pg_combinebackup.c:751
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" існує, але він не порожній"
 
-#: pg_combinebackup.c:745
+#: pg_combinebackup.c:754
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "немає доступу до каталогу \"%s\": %m"
 
-#: pg_combinebackup.c:759
+#: pg_combinebackup.c:768
 #, c-format
 msgid "%s reconstructs full backups from incrementals.\n\n"
 msgstr "%s відновлює повні резервні копії з інкрементів.\n\n"
 
-#: pg_combinebackup.c:760
+#: pg_combinebackup.c:769
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_combinebackup.c:761
+#: pg_combinebackup.c:770
 #, c-format
 msgid "  %s [OPTION]... DIRECTORY...\n"
 msgstr "  %s [ПАРАМЕТР]... КАТАЛОГ...\n"
 
-#: pg_combinebackup.c:762
+#: pg_combinebackup.c:771
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_combinebackup.c:763
+#: pg_combinebackup.c:772
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug             генерувати багато налагоджувальних повідомлень\n"
 
-#: pg_combinebackup.c:764
+#: pg_combinebackup.c:773
+#, c-format
+msgid "  -k, --link                link files instead of copying\n"
+msgstr "  -k, --link                створювати посилання на файли замість копіювання\n"
+
+#: pg_combinebackup.c:774
 #, c-format
 msgid "  -n, --dry-run             do not actually do anything\n"
 msgstr "  -n, --dry-run             насправді ніякої дії\n"
 
-#: pg_combinebackup.c:765
+#: pg_combinebackup.c:775
 #, c-format
 msgid "  -N, --no-sync             do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync          не чекати на безпечний запис змін на диск\n"
 
-#: pg_combinebackup.c:766
+#: pg_combinebackup.c:776
 #, c-format
 msgid "  -o, --output=DIRECTORY    output directory\n"
 msgstr "  -o, --output=DIRECTORY    вихідний каталог\n"
 
-#: pg_combinebackup.c:767
+#: pg_combinebackup.c:777
 #, c-format
 msgid "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                            relocate tablespace in OLDDIR to NEWDIR\n"
 msgstr "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                            перемістити табличний простір з OLDDIR в NEWDIR\n"
 
-#: pg_combinebackup.c:769
+#: pg_combinebackup.c:779
 #, c-format
 msgid "      --clone               clone (reflink) files instead of copying\n"
 msgstr "      --clone               клонувати (reflink) файли замість копіювання\n"
 
-#: pg_combinebackup.c:770
+#: pg_combinebackup.c:780
 #, c-format
 msgid "      --copy                copy files (default)\n"
 msgstr "      --copy                копіювати файли (за замовчуванням)\n"
 
-#: pg_combinebackup.c:771
+#: pg_combinebackup.c:781
 #, c-format
 msgid "      --copy-file-range     copy using copy_file_range() system call\n"
 msgstr "      --copy-file-range     копіювати за допомогою системного виклику copy_file_range()\n"
 
-#: pg_combinebackup.c:772
+#: pg_combinebackup.c:782
 #, c-format
 msgid "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            use algorithm for manifest checksums\n"
 msgstr "      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
 "                            алгоритм використання контрольних сум маніфесту\n"
 
-#: pg_combinebackup.c:774
+#: pg_combinebackup.c:784
 #, c-format
 msgid "      --no-manifest         suppress generation of backup manifest\n"
 msgstr "      --no-manifest         заборонити створення маніфесту резервної копії\n"
 
-#: pg_combinebackup.c:775
+#: pg_combinebackup.c:785
 #, c-format
 msgid "      --sync-method=METHOD  set method for syncing files to disk\n"
 msgstr "      --sync-method=METHOD  встановити метод синхронізації файлів на диск\n"
 
-#: pg_combinebackup.c:776
+#: pg_combinebackup.c:786
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: pg_combinebackup.c:777
+#: pg_combinebackup.c:787
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: pg_combinebackup.c:779
+#: pg_combinebackup.c:789
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_combinebackup.c:780
+#: pg_combinebackup.c:790
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: pg_combinebackup.c:995
+#: pg_combinebackup.c:1005
 #, c-format
 msgid "skipping symbolic link \"%s\""
 msgstr "пропускання символічного посилання \"%s\""
 
-#: pg_combinebackup.c:997
+#: pg_combinebackup.c:1007
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "спеціальний файл \"%s\" пропускається"
 
-#: pg_combinebackup.c:1073 reconstruct.c:300
+#: pg_combinebackup.c:1083 reconstruct.c:305
 #, c-format
 msgid "manifest file \"%s\" contains no entry for file \"%s\""
 msgstr "файл маніфеста \"%s\" не містить запису для файлу \"%s\""
 
-#: pg_combinebackup.c:1189
+#: pg_combinebackup.c:1199
 #, c-format
 msgid "%s: server version too old"
 msgstr "%s: версія серверу застаріла"
 
-#: pg_combinebackup.c:1190
+#: pg_combinebackup.c:1200
 #, c-format
 msgid "%s: could not parse version number"
 msgstr "%s: не вдалося розібрати номер версії"
 
-#: pg_combinebackup.c:1309
+#: pg_combinebackup.c:1319
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "не можливо прочитати символічне послання \"%s\": %m"
 
-#: pg_combinebackup.c:1312
+#: pg_combinebackup.c:1322
 #, c-format
 msgid "target of symbolic link \"%s\" is too long"
 msgstr "ціль символічного посилання \"%s\" занадто довга"
 
-#: pg_combinebackup.c:1315
+#: pg_combinebackup.c:1325
 #, c-format
 msgid "target of symbolic link \"%s\" is relative"
 msgstr "ціль символічного посилання \"%s\" є відносною"
 
-#: pg_combinebackup.c:1337
+#: pg_combinebackup.c:1347
 #, c-format
 msgid "tablespace at \"%s\" has no tablespace mapping"
 msgstr "табличний простір за адресою \"%s\" не має зіставлення табличного простору"
 
-#: pg_combinebackup.c:1355
+#: pg_combinebackup.c:1365
 #, c-format
 msgid "tablespaces with OIDs %u and %u both point at directory \"%s\""
 msgstr "табличні простори з OID %u та %u обидва вказують на каталог \"%s\""
 
-#: pg_combinebackup.c:1364
+#: pg_combinebackup.c:1374
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не вдалося закрити каталог \"%s\": %m"
 
-#: pg_combinebackup.c:1385
+#: pg_combinebackup.c:1395
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "файл \"%s\" занадто великий"
 
-#: pg_combinebackup.c:1402
+#: pg_combinebackup.c:1412
 #, c-format
 msgid "could not read file \"%s\": read %zd of %lld"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %zd з %lld"
 
-#: reconstruct.c:410
+#: reconstruct.c:339
+#, c-format
+msgid "full backup contains unexpected incremental file \"%s\""
+msgstr "повна резервна копія містить неочікуваний інкрементний файл \"%s\""
+
+#: reconstruct.c:424
 #, c-format
 msgid "file \"%s\" is too short: expected %llu, found %llu"
 msgstr "файл \"%s\" занадто короткий: очікується %llu, знайдено %llu"
 
-#: reconstruct.c:452
+#: reconstruct.c:466
 #, c-format
 msgid "file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)"
 msgstr "файл \"%s\" має неправильне інкрементне магічне число (0x%x, очікувалось 0x%x)"
 
-#: reconstruct.c:458
+#: reconstruct.c:472
 #, c-format
 msgid "file \"%s\" has block count %u in excess of segment size %u"
 msgstr "файл \"%s\" має кількість блоків %u, що перевищує розмір сегмента %u"
 
-#: reconstruct.c:465
+#: reconstruct.c:479
 #, c-format
 msgid "file \"%s\" has truncation block length %u in excess of segment size %u"
 msgstr "файл \"%s\" має довжину блоку усікання %u, що перевищує розмір сегмента %u"
 
-#: reconstruct.c:529
+#: reconstruct.c:544
 #, c-format
 msgid "could not read file \"%s\": read %d of %u"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %u"
 
-#: reconstruct.c:773
+#: reconstruct.c:788
 #, c-format
 msgid "could not read from file \"%s\", offset %llu: read %d of %d"
 msgstr "не вдалося прочитати з файлу \"%s\", зміщення %llu: прочитано %d з %d"
diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c
index 8acaa54ff38..38d8e8a2dc9 100644
--- a/src/bin/pg_combinebackup/reconstruct.c
+++ b/src/bin/pg_combinebackup/reconstruct.c
@@ -370,6 +370,7 @@ reconstruct_from_incremental_file(char *input_filename,
 		if (s->relative_block_numbers != NULL)
 			pfree(s->relative_block_numbers);
 		pg_free(s->filename);
+		pg_free(s);
 	}
 	pfree(sourcemap);
 	pfree(offsetmap);
@@ -517,6 +518,7 @@ make_rfile(char *filename, bool missing_ok)
 	{
 		if (missing_ok && errno == ENOENT)
 		{
+			pg_free(rf->filename);
 			pg_free(rf);
 			return NULL;
 		}
diff --git a/src/bin/pg_combinebackup/t/002_compare_backups.pl b/src/bin/pg_combinebackup/t/002_compare_backups.pl
index 2c7ca89b92f..9c7fe56cb7c 100644
--- a/src/bin/pg_combinebackup/t/002_compare_backups.pl
+++ b/src/bin/pg_combinebackup/t/002_compare_backups.pl
@@ -174,6 +174,7 @@
 $pitr1->command_ok(
 	[
 		'pg_dumpall',
+		'--restrict-key=test',
 		'--no-sync',
 		'--no-unlogged-table-data',
 		'--file' => $dump1,
@@ -183,6 +184,7 @@
 $pitr2->command_ok(
 	[
 		'pg_dumpall',
+		'--restrict-key=test',
 		'--no-sync',
 		'--no-unlogged-table-data',
 		'--file' => $dump2,
diff --git a/src/bin/pg_combinebackup/t/011_ib_truncation.pl b/src/bin/pg_combinebackup/t/011_ib_truncation.pl
new file mode 100644
index 00000000000..c5e0124c04d
--- /dev/null
+++ b/src/bin/pg_combinebackup/t/011_ib_truncation.pl
@@ -0,0 +1,119 @@
+# Copyright (c) 2025-2026, PostgreSQL Global Development Group
+#
+# This test aims to validate two things: (1) that the calculated truncation
+# block never exceeds the segment size and (2) that the correct limit block
+# length is calculated for the VM fork.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+
+# Initialize primary node
+my $primary = PostgreSQL::Test::Cluster->new('primary');
+$primary->init(has_archiving => 1, allows_streaming => 1);
+$primary->append_conf('postgresql.conf', 'summarize_wal = on');
+$primary->start;
+
+# Backup locations
+my $backup_path = $primary->backup_dir;
+my $full_backup = "$backup_path/full";
+
+# To avoid using up lots of disk space in the CI/buildfarm environment, this
+# test will only find the issue when run with a small RELSEG_SIZE. As of this
+# writing, one of the CI runs is configured using --with-segsize-blocks=6, and
+# we aim to have this test check for the issue only in that configuration.
+my $target_blocks = 6;
+my $block_size = $primary->safe_psql('postgres',
+	"SELECT current_setting('block_size')::int;");
+
+# We'll have two blocks more than the target number of blocks (one will
+# survive the subsequent truncation).
+my $target_rows = int($target_blocks + 2);
+my $rows_after_truncation = int($target_rows - 1);
+
+# Create a test table. STORAGE PLAIN prevents compression and TOASTing of
+# repetitive data, ensuring predictable row sizes.
+$primary->safe_psql(
+	'postgres', q{
+    CREATE TABLE t (
+        id int,
+        data text STORAGE PLAIN
+    ) WITH (autovacuum_enabled = false);
+});
+
+# The tuple size should be enough to prevent two tuples from being on the same
+# page. Since the template string has a length of 32 bytes, it's enough to
+# repeat it (block_size / (2*32)) times.
+$primary->safe_psql(
+	'postgres',
+	"INSERT INTO t
+        SELECT i,
+            repeat('0123456789ABCDEF0123456789ABCDEF', ($block_size / (2*32)))
+    FROM generate_series(1, $target_rows) i;"
+);
+
+# Make sure hint bits are set.
+$primary->safe_psql('postgres', 'VACUUM t;');
+
+# Verify that the relation is as large as was desired.
+my $t_blocks = $primary->safe_psql('postgres',
+	"SELECT pg_relation_size('t') / current_setting('block_size')::int;");
+cmp_ok($t_blocks, '>', $target_blocks, 'target block size exceeded');
+
+# Take a full base backup
+$primary->backup('full');
+
+# Delete rows at the logical end of the table, creating removable pages.
+$primary->safe_psql('postgres',
+	"DELETE FROM t WHERE id > ($rows_after_truncation);");
+
+# VACUUM the table. TRUNCATE is enabled by default, and is just mentioned here
+# for emphasis.
+$primary->safe_psql('postgres', 'VACUUM (TRUNCATE) t;');
+
+# Verify expected length after truncation.
+$t_blocks = $primary->safe_psql('postgres',
+	"SELECT pg_relation_size('t') / current_setting('block_size')::int;");
+is($t_blocks, $rows_after_truncation, 'post-truncation row count as expected');
+cmp_ok($t_blocks, '>', $target_blocks,
+	'post-truncation block count as expected');
+
+# Take an incremental backup based on the full backup manifest
+$primary->backup('incr',
+	backup_options => [ '--incremental', "$full_backup/backup_manifest" ]);
+
+# We used to have a bug where the wrong limit block was calculated for the
+# VM fork, so verify that the WAL summary records the correct VM fork
+# truncation limit. We can't just check whether the restored VM fork is
+# the right size on disk, because it's so small that the incremental backup
+# code will send the entire file.
+my $relfilenode = $primary->safe_psql('postgres',
+	"SELECT pg_relation_filenode('t');");
+my $vm_limits = $primary->safe_psql('postgres',
+	"SELECT string_agg(relblocknumber::text, ',')
+	   FROM pg_available_wal_summaries() s,
+	        pg_wal_summary_contents(s.tli, s.start_lsn, s.end_lsn) c
+	  WHERE c.relfilenode = $relfilenode
+	    AND c.relforknumber = 2
+	    AND c.is_limit_block;");
+is($vm_limits, '1',
+	'WAL summary has correct VM fork truncation limit');
+
+# Combine full and incremental backups.  Before the fix, this failed because
+# the INCREMENTAL file header contained an incorrect truncation_block value.
+my $restored = PostgreSQL::Test::Cluster->new('node2');
+$restored->init_from_backup($primary, 'incr', combine_with_prior => ['full']);
+$restored->start();
+
+# Check that the restored table contains the correct number of rows
+my $restored_count =
+  $restored->safe_psql('postgres', "SELECT count(*) FROM t;");
+is($restored_count, $rows_after_truncation,
+	'Restored backup has correct row count');
+
+$primary->stop;
+$restored->stop;
+
+done_testing();
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 551e950d749..2b35bd54ddc 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_config
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 1998-2025, PostgreSQL Global Development Group
 #
 # src/bin/pg_config/Makefile
diff --git a/src/bin/pg_config/po/es.po b/src/bin/pg_config/po/es.po
index 2ebb19f2a50..e0f97112d5e 100644
--- a/src/bin/pg_config/po/es.po
+++ b/src/bin/pg_config/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_config (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:48+0000\n"
+"POT-Creation-Date: 2026-02-06 23:18+0000\n"
 "PO-Revision-Date: 2024-11-16 14:23+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -47,27 +47,27 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "memoria agotada"
 
@@ -82,7 +82,7 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: pg_config.c:74
+#: pg_config.c:73
 #, c-format
 msgid ""
 "\n"
@@ -93,12 +93,12 @@ msgstr ""
 "%s provee información sobre la versión instalada de PostgreSQL.\n"
 "\n"
 
-#: pg_config.c:75
+#: pg_config.c:74
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_config.c:76
+#: pg_config.c:75
 #, c-format
 msgid ""
 "  %s [OPTION]...\n"
@@ -107,27 +107,27 @@ msgstr ""
 "  %s [OPCIÓN]...\n"
 "\n"
 
-#: pg_config.c:77
+#: pg_config.c:76
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: pg_config.c:78
+#: pg_config.c:77
 #, c-format
 msgid "  --bindir              show location of user executables\n"
 msgstr "  --bindir              muestra la ubicación de ejecutables de usuario\n"
 
-#: pg_config.c:79
+#: pg_config.c:78
 #, c-format
 msgid "  --docdir              show location of documentation files\n"
 msgstr "  --docdir              muestra la ubicación de archivos de documentación\n"
 
-#: pg_config.c:80
+#: pg_config.c:79
 #, c-format
 msgid "  --htmldir             show location of HTML documentation files\n"
 msgstr "  --htmldir             muestra la ubicación de archivos de documentación HTML\n"
 
-#: pg_config.c:81
+#: pg_config.c:80
 #, c-format
 msgid ""
 "  --includedir          show location of C header files of the client\n"
@@ -136,66 +136,66 @@ msgstr ""
 "  --includedir          muestra la ubicación de archivos de encabezados C\n"
 "                        de las interfaces cliente\n"
 
-#: pg_config.c:83
+#: pg_config.c:82
 #, c-format
 msgid "  --pkgincludedir       show location of other C header files\n"
 msgstr ""
 "  --pkgincludedir       muestra la ubicación de otros archivos de\n"
 "                        encabezados C\n"
 
-#: pg_config.c:84
+#: pg_config.c:83
 #, c-format
 msgid "  --includedir-server   show location of C header files for the server\n"
 msgstr ""
 "  --includedir-server   muestra la ubicación de archivos de encabezados C\n"
 "                        del servidor\n"
 
-#: pg_config.c:85
+#: pg_config.c:84
 #, c-format
 msgid "  --libdir              show location of object code libraries\n"
 msgstr ""
 "  --libdir              muestra la ubicación de bibliotecas\n"
 "                        de código objeto\n"
 
-#: pg_config.c:86
+#: pg_config.c:85
 #, c-format
 msgid "  --pkglibdir           show location of dynamically loadable modules\n"
 msgstr "  --pkglibdir           muestra la ubicación de módulos para carga dinámica\n"
 
-#: pg_config.c:87
+#: pg_config.c:86
 #, c-format
 msgid "  --localedir           show location of locale support files\n"
 msgstr ""
 "  --localedir           muestra la ubicación de archivos de soporte de\n"
 "                        configuraciones locales\n"
 
-#: pg_config.c:88
+#: pg_config.c:87
 #, c-format
 msgid "  --mandir              show location of manual pages\n"
 msgstr "  --mandir              muestra la ubicación de páginas de manual\n"
 
-#: pg_config.c:89
+#: pg_config.c:88
 #, c-format
 msgid "  --sharedir            show location of architecture-independent support files\n"
 msgstr ""
 "  --sharedir            muestra la ubicación de archivos de soporte\n"
 "                        independientes de arquitectura\n"
 
-#: pg_config.c:90
+#: pg_config.c:89
 #, c-format
 msgid "  --sysconfdir          show location of system-wide configuration files\n"
 msgstr ""
 "  --sysconfdir          muestra la ubicación de archivos de configuración\n"
 "                        global del sistema\n"
 
-#: pg_config.c:91
+#: pg_config.c:90
 #, c-format
 msgid "  --pgxs                show location of extension makefile\n"
 msgstr ""
 "  --pgxs                muestra la ubicación del archivo makefile\n"
 "                        para extensiones\n"
 
-#: pg_config.c:92
+#: pg_config.c:91
 #, c-format
 msgid ""
 "  --configure           show options given to \"configure\" script when\n"
@@ -204,71 +204,71 @@ msgstr ""
 "  --configure           muestra las opciones que se dieron a «configure»\n"
 "                        cuando PostgreSQL fue construido\n"
 
-#: pg_config.c:94
+#: pg_config.c:93
 #, c-format
 msgid "  --cc                  show CC value used when PostgreSQL was built\n"
 msgstr "  --cc                  muestra el valor de CC cuando PostgreSQL fue construido\n"
 
-#: pg_config.c:95
+#: pg_config.c:94
 #, c-format
 msgid "  --cppflags            show CPPFLAGS value used when PostgreSQL was built\n"
 msgstr ""
 "  --cppflags            muestra el valor de CPPFLAGS cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:96
+#: pg_config.c:95
 #, c-format
 msgid "  --cflags              show CFLAGS value used when PostgreSQL was built\n"
 msgstr ""
 "  --cflags              muestra el valor de CFLAGS cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:97
+#: pg_config.c:96
 #, c-format
 msgid "  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built\n"
 msgstr ""
 "  --cflags_sl           muestra el valor de CFLAGS_SL cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:98
+#: pg_config.c:97
 #, c-format
 msgid "  --ldflags             show LDFLAGS value used when PostgreSQL was built\n"
 msgstr ""
 "  --ldflags             muestra el valor de LDFLAGS cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:99
+#: pg_config.c:98
 #, c-format
 msgid "  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built\n"
 msgstr ""
 "  --ldflags_ex          muestra el valor de LDFLAGS_EX cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:100
+#: pg_config.c:99
 #, c-format
 msgid "  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built\n"
 msgstr ""
 "  --ldflags_sl          muestra el valor de LDFLAGS_SL cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:101
+#: pg_config.c:100
 #, c-format
 msgid "  --libs                show LIBS value used when PostgreSQL was built\n"
 msgstr ""
 "  --libs                muestra el valor de LIBS cuando PostgreSQL fue\n"
 "                        construido\n"
 
-#: pg_config.c:102
+#: pg_config.c:101
 #, c-format
 msgid "  --version             show the PostgreSQL version\n"
 msgstr "  --version             muestra la versión de PostgreSQL\n"
 
-#: pg_config.c:103
+#: pg_config.c:102
 #, c-format
 msgid "  -?, --help            show this help, then exit\n"
 msgstr "  -?, --help            muestra esta ayuda, luego sale\n"
 
-#: pg_config.c:104
+#: pg_config.c:103
 #, c-format
 msgid ""
 "\n"
@@ -279,27 +279,27 @@ msgstr ""
 "Si no se pasa ningún argumento, se muestra toda la información conocida\n"
 "\n"
 
-#: pg_config.c:105
+#: pg_config.c:104
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Reporte errores a <%s>.\n"
 
-#: pg_config.c:106
+#: pg_config.c:105
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_config.c:112
+#: pg_config.c:111
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para mayor información.\n"
 
-#: pg_config.c:154
+#: pg_config.c:153
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable propio\n"
 
-#: pg_config.c:181
+#: pg_config.c:180
 #, c-format
 msgid "%s: invalid argument: %s\n"
 msgstr "%s: el argumento no es válido: %s\n"
diff --git a/src/bin/pg_config/po/ru.po b/src/bin/pg_config/po/ru.po
index 0a86bbb455c..35580c39bcc 100644
--- a/src/bin/pg_config/po/ru.po
+++ b/src/bin/pg_config/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_config (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2024-09-04 13:45+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -48,27 +48,27 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "нехватка памяти"
 
@@ -83,7 +83,7 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: pg_config.c:74
+#: pg_config.c:73
 #, c-format
 msgid ""
 "\n"
@@ -94,12 +94,12 @@ msgstr ""
 "%s предоставляет информацию об установленной версии PostgreSQL.\n"
 "\n"
 
-#: pg_config.c:75
+#: pg_config.c:74
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_config.c:76
+#: pg_config.c:75
 #, c-format
 msgid ""
 "  %s [OPTION]...\n"
@@ -108,28 +108,28 @@ msgstr ""
 "  %s [ПАРАМЕТР]...\n"
 "\n"
 
-#: pg_config.c:77
+#: pg_config.c:76
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: pg_config.c:78
+#: pg_config.c:77
 #, c-format
 msgid "  --bindir              show location of user executables\n"
 msgstr "  --bindir              показать расположение исполняемых файлов\n"
 
-#: pg_config.c:79
+#: pg_config.c:78
 #, c-format
 msgid "  --docdir              show location of documentation files\n"
 msgstr "  --docdir              показать расположение файлов документации\n"
 
-#: pg_config.c:80
+#: pg_config.c:79
 #, c-format
 msgid "  --htmldir             show location of HTML documentation files\n"
 msgstr ""
 "  --htmldir             показать расположение HTML-файлов документации\n"
 
-#: pg_config.c:81
+#: pg_config.c:80
 #, c-format
 msgid ""
 "  --includedir          show location of C header files of the client\n"
@@ -138,13 +138,13 @@ msgstr ""
 "  --includedir          показать расположение файлов-заголовков (.h) для\n"
 "                        клиентских интерфейсов на языке C\n"
 
-#: pg_config.c:83
+#: pg_config.c:82
 #, c-format
 msgid "  --pkgincludedir       show location of other C header files\n"
 msgstr ""
 "  --pkgincludedir       показать расположение других файлов-заголовков (.h)\n"
 
-#: pg_config.c:84
+#: pg_config.c:83
 #, c-format
 msgid ""
 "  --includedir-server   show location of C header files for the server\n"
@@ -152,31 +152,31 @@ msgstr ""
 "  --includedir-server   показать расположение файлов-заголовков (.h) для "
 "сервера\n"
 
-#: pg_config.c:85
+#: pg_config.c:84
 #, c-format
 msgid "  --libdir              show location of object code libraries\n"
 msgstr ""
 "  --libdir              показать расположение библиотек объектного кода\n"
 
-#: pg_config.c:86
+#: pg_config.c:85
 #, c-format
 msgid "  --pkglibdir           show location of dynamically loadable modules\n"
 msgstr ""
 "  --pkglibdir           показать расположение динамически загружаемых "
 "модулей\n"
 
-#: pg_config.c:87
+#: pg_config.c:86
 #, c-format
 msgid "  --localedir           show location of locale support files\n"
 msgstr ""
 "  --localedir           показать расположение файлов описания локалей\n"
 
-#: pg_config.c:88
+#: pg_config.c:87
 #, c-format
 msgid "  --mandir              show location of manual pages\n"
 msgstr "  --mandir              показать расположение справочных страниц\n"
 
-#: pg_config.c:89
+#: pg_config.c:88
 #, c-format
 msgid ""
 "  --sharedir            show location of architecture-independent support "
@@ -185,7 +185,7 @@ msgstr ""
 "  --sharedir            показать расположение платформенно-независимых "
 "файлов\n"
 
-#: pg_config.c:90
+#: pg_config.c:89
 #, c-format
 msgid ""
 "  --sysconfdir          show location of system-wide configuration files\n"
@@ -193,13 +193,13 @@ msgstr ""
 "  --sysconfdir          показать расположение общесистемных файлов "
 "конфигурации\n"
 
-#: pg_config.c:91
+#: pg_config.c:90
 #, c-format
 msgid "  --pgxs                show location of extension makefile\n"
 msgstr ""
 "  --pgxs                показать расположение makefile для расширений\n"
 
-#: pg_config.c:92
+#: pg_config.c:91
 #, c-format
 msgid ""
 "  --configure           show options given to \"configure\" script when\n"
@@ -209,13 +209,13 @@ msgstr ""
 "которыми\n"
 "                        был собран PostgreSQL\n"
 
-#: pg_config.c:94
+#: pg_config.c:93
 #, c-format
 msgid "  --cc                  show CC value used when PostgreSQL was built\n"
 msgstr ""
 "  --cc                  показать, с каким значением CC собран PostgreSQL\n"
 
-#: pg_config.c:95
+#: pg_config.c:94
 #, c-format
 msgid ""
 "  --cppflags            show CPPFLAGS value used when PostgreSQL was built\n"
@@ -223,14 +223,14 @@ msgstr ""
 "  --cppflags            показать, с каким значением CPPFLAGS собран "
 "PostgreSQL\n"
 
-#: pg_config.c:96
+#: pg_config.c:95
 #, c-format
 msgid ""
 "  --cflags              show CFLAGS value used when PostgreSQL was built\n"
 msgstr ""
 "  --cflags              показать, с какими флагами C собран PostgreSQL\n"
 
-#: pg_config.c:97
+#: pg_config.c:96
 #, c-format
 msgid ""
 "  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built\n"
@@ -238,7 +238,7 @@ msgstr ""
 "  --cflags_sl           показать, с каким значением CFLAGS_SL собран "
 "PostgreSQL\n"
 
-#: pg_config.c:98
+#: pg_config.c:97
 #, c-format
 msgid ""
 "  --ldflags             show LDFLAGS value used when PostgreSQL was built\n"
@@ -246,7 +246,7 @@ msgstr ""
 "  --ldflags             показать, с каким значением LDFLAGS собран "
 "PostgreSQL\n"
 
-#: pg_config.c:99
+#: pg_config.c:98
 #, c-format
 msgid ""
 "  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was "
@@ -255,7 +255,7 @@ msgstr ""
 "  --ldflags_ex          показать, с каким значением LDFLAGS_EX собран "
 "PostgreSQL\n"
 
-#: pg_config.c:100
+#: pg_config.c:99
 #, c-format
 msgid ""
 "  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was "
@@ -264,24 +264,24 @@ msgstr ""
 "  --ldflags_sl          показать, с каким значением LDFLAGS_SL собран "
 "PostgreSQL\n"
 
-#: pg_config.c:101
+#: pg_config.c:100
 #, c-format
 msgid ""
 "  --libs                show LIBS value used when PostgreSQL was built\n"
 msgstr ""
 "  --libs                показать, с каким значением LIBS собран PostgreSQL\n"
 
-#: pg_config.c:102
+#: pg_config.c:101
 #, c-format
 msgid "  --version             show the PostgreSQL version\n"
 msgstr "  --version             показать версию PostgreSQL\n"
 
-#: pg_config.c:103
+#: pg_config.c:102
 #, c-format
 msgid "  -?, --help            show this help, then exit\n"
 msgstr "  -?, --help            показать эту справку и выйти\n"
 
-#: pg_config.c:104
+#: pg_config.c:103
 #, c-format
 msgid ""
 "\n"
@@ -292,27 +292,27 @@ msgstr ""
 "При запуске без аргументов выводятся все известные значения.\n"
 "\n"
 
-#: pg_config.c:105
+#: pg_config.c:104
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_config.c:106
+#: pg_config.c:105
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_config.c:112
+#: pg_config.c:111
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_config.c:154
+#: pg_config.c:153
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: не удалось найти свой исполняемый файл\n"
 
-#: pg_config.c:181
+#: pg_config.c:180
 #, c-format
 msgid "%s: invalid argument: %s\n"
 msgstr "%s: неверный аргумент: %s\n"
diff --git a/src/bin/pg_config/po/sv.po b/src/bin/pg_config/po/sv.po
index d729e305321..beff934a3b0 100644
--- a/src/bin/pg_config/po/sv.po
+++ b/src/bin/pg_config/po/sv.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 14:19+0000\n"
-"PO-Revision-Date: 2024-07-12 18:58+0200\n"
+"PO-Revision-Date: 2025-07-29 19:45+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index 698a1083027..ca5999c8078 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_controldata
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 1998-2025, PostgreSQL Global Development Group
 #
 # src/bin/pg_controldata/Makefile
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 63dfa151da3..60c5b638f91 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -5,7 +5,7 @@
  *
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * license: BSD
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/pg_controldata/pg_controldata.c
  */
diff --git a/src/bin/pg_controldata/po/de.po b/src/bin/pg_controldata/po/de.po
index d1ec166e892..6e07ae07288 100644
--- a/src/bin/pg_controldata/po/de.po
+++ b/src/bin/pg_controldata/po/de.po
@@ -1,14 +1,14 @@
 # German message translation file for pg_controldata
-# Peter Eisentraut <peter@eisentraut.org>, 2002 - 2024.
+# Peter Eisentraut <peter@eisentraut.org>, 2002 - 2025.
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-06-16 07:53+0000\n"
-"PO-Revision-Date: 2024-05-17 13:06+0200\n"
+"POT-Creation-Date: 2025-06-13 01:53+0000\n"
+"PO-Revision-Date: 2025-06-13 08:05+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -183,326 +183,340 @@ msgstr "nicht erkannter Statuscode"
 msgid "unrecognized \"wal_level\""
 msgstr "unbekanntes »wal_level«"
 
-#: pg_controldata.c:138 pg_controldata.c:156 pg_controldata.c:163
+#: pg_controldata.c:139 pg_controldata.c:157 pg_controldata.c:164
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "zu viele Kommandozeilenargumente (das erste ist »%s«)"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "no data directory specified"
 msgstr "kein Datenverzeichnis angegeben"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "calculated CRC checksum does not match value stored in control file"
 msgstr "berechnete CRC-Prüfsumme stimmt nicht mit dem Wert in der Kontrolldatei überein"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Either the control file is corrupt, or it has a different layout than this program is expecting.  The results below are untrustworthy."
 msgstr "Entweder ist die Kontrolldatei kaputt oder sie hat ein anderes Layout als von diesem Programm erwartet. Die Ergebnisse unten sind nicht verlässlich."
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "ungültige WAL-Segmentgröße in Kontrolldatei (%d Byte)"
 msgstr[1] "ungültige WAL-Segmentgröße in Kontrolldatei (%d Bytes)"
 
-#: pg_controldata.c:185
+#: pg_controldata.c:186
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Die WAL-Segmentgröße muss eine Zweierpotenz zwischen 1 MB und 1 GB sein."
 
-#: pg_controldata.c:186
+#: pg_controldata.c:187
 #, c-format
 msgid "The file is corrupt and the results below are untrustworthy."
 msgstr "Die Datei ist kaputt und die Ergebnisse unten sind nicht verlässlich."
 
-#: pg_controldata.c:221
+#: pg_controldata.c:205 pg_controldata.c:213 pg_controldata.c:232
+#, c-format
 msgid "???"
 msgstr "???"
 
-#: pg_controldata.c:227
+#: pg_controldata.c:238
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control-Versionsnummer:                   %u\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:240
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversionsnummer:                       %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Datenbanksystemidentifikation:               %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Datenbanksystemidentifikation:               %<PRIu64>\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:244
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Datenbank-Cluster-Status:                    %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:246
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control zuletzt geändert:                 %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:248
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Position des letzten Checkpoints:            %X/%X\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:250
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "REDO-Position des letzten Checkpoints:       %X/%X\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:252
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "REDO-WAL-Datei des letzten Checkpoints:      %s\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:254
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID des letzten Checkpoints:          %u\n"
 
-#: pg_controldata.c:245
+#: pg_controldata.c:256
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "PrevTimeLineID des letzten Checkpoints:      %u\n"
 
-#: pg_controldata.c:247
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes des letzten Checkpoints:    %s\n"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "off"
 msgstr "aus"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "on"
 msgstr "an"
 
-#: pg_controldata.c:249
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID des letzten Checkpoints:             %u:%u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:263
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID des letzten Checkpoints:             %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:265
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId des letzten Checkpoints:     %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:267
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset des letzten Checkpoints:     %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:269
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID des letzten Checkpoints:           %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:271
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB der oldestXID des letzten Checkpoints:    %u\n"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:273
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID des letzten Checkpoints:     %u\n"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:275
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid des letzten Checkpoints:      %u\n"
 
-#: pg_controldata.c:266
+#: pg_controldata.c:277
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB des oldestMulti des letzten Checkpoints:  %u\n"
 
-#: pg_controldata.c:268
+#: pg_controldata.c:279
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_controldata.c:270
+#: pg_controldata.c:281
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_controldata.c:272
+#: pg_controldata.c:283
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Zeit des letzten Checkpoints:                %s\n"
 
-#: pg_controldata.c:274
+#: pg_controldata.c:285
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
 msgstr "Fake-LSN-Zähler für ungeloggte Relationen:   %X/%X\n"
 
-#: pg_controldata.c:276
+#: pg_controldata.c:287
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Minimaler Wiederherstellungsendpunkt:        %X/%X\n"
 
-#: pg_controldata.c:278
+#: pg_controldata.c:289
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "Zeitleiste des minimalen Wiederherstellungsendpunkts: %u\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "Backup-Startpunkt:                           %X/%X\n"
 
-#: pg_controldata.c:282
+#: pg_controldata.c:293
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "Backup-Endpunkt:                             %X/%X\n"
 
-#: pg_controldata.c:284
+#: pg_controldata.c:295
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "End-of-Backup-Eintrag erforderlich:          %s\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "no"
 msgstr "nein"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "yes"
 msgstr "ja"
 
-#: pg_controldata.c:286
+#: pg_controldata.c:297
 #, c-format
 msgid "wal_level setting:                    %s\n"
 msgstr "wal_level-Einstellung:                       %s\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:299
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
 msgstr "wal_log_hints-Einstellung:                   %s\n"
 
-#: pg_controldata.c:290
+#: pg_controldata.c:301
 #, c-format
 msgid "max_connections setting:              %d\n"
 msgstr "max_connections-Einstellung:                 %d\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:303
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
 msgstr "max_worker_processes-Einstellung:            %d\n"
 
-#: pg_controldata.c:294
+#: pg_controldata.c:305
 #, c-format
 msgid "max_wal_senders setting:              %d\n"
 msgstr "max_wal_senders-Einstellung:                 %d\n"
 
-#: pg_controldata.c:296
+#: pg_controldata.c:307
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
 msgstr "max_prepared_xacts-Einstellung:              %d\n"
 
-#: pg_controldata.c:298
+#: pg_controldata.c:309
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
 msgstr "max_locks_per_xact-Einstellung:              %d\n"
 
-#: pg_controldata.c:300
+#: pg_controldata.c:311
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
 msgstr "track_commit_timestamp-Einstellung:          %s\n"
 
-#: pg_controldata.c:302
+#: pg_controldata.c:313
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Maximale Datenausrichtung (Alignment):       %u\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:316
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Datenbankblockgröße:                         %u\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:318
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blöcke pro Segment:                          %u\n"
 
-#: pg_controldata.c:309
+#: pg_controldata.c:320
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL-Blockgröße:                              %u\n"
 
-#: pg_controldata.c:311
+#: pg_controldata.c:322
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Bytes pro WAL-Segment:                       %u\n"
 
-#: pg_controldata.c:313
+#: pg_controldata.c:324
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximale Bezeichnerlänge:                    %u\n"
 
-#: pg_controldata.c:315
+#: pg_controldata.c:326
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Maximale Spalten in einem Index:             %u\n"
 
-#: pg_controldata.c:317
+#: pg_controldata.c:328
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Maximale Größe eines Stücks TOAST:           %u\n"
 
-#: pg_controldata.c:319
+#: pg_controldata.c:330
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Größe eines Large-Object-Chunks:             %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:333
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Speicherung von Datum/Zeit-Typen:            %s\n"
 
-#: pg_controldata.c:323
+#: pg_controldata.c:334
 msgid "64-bit integers"
 msgstr "64-Bit-Ganzzahlen"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:335
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Übergabe von Float8-Argumenten:              %s\n"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by reference"
 msgstr "Referenz"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by value"
 msgstr "Wert"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:337
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Datenseitenprüfsummenversion:                %u\n"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:339
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Standard für Vorzeichen von »char«-Daten:    %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "mit Vorzeichen"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "ohne Vorzeichen"
+
+#: pg_controldata.c:341
 #, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Mock-Authentifizierungs-Nonce:               %s\n"
diff --git a/src/bin/pg_controldata/po/es.po b/src/bin/pg_controldata/po/es.po
index 79a931a21b2..e405cd174e6 100644
--- a/src/bin/pg_controldata/po/es.po
+++ b/src/bin/pg_controldata/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_controldata (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:53+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:22+0000\n"
+"PO-Revision-Date: 2025-09-21 11:32+0200\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -247,8 +247,8 @@ msgstr "Número de versión del catálogo:             %u\n"
 
 #: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Identificador de sistema:                   %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Identificador de sistema:                   %<PRIu64>\n"
 
 #: pg_controldata.c:244
 #, c-format
@@ -510,5 +510,18 @@ msgstr "Versión de sumas de verificación de datos:  %u\n"
 
 #: pg_controldata.c:339
 #, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Presencia de signo en datos «char»:         %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "con signo"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "sin signo"
+
+#: pg_controldata.c:341
+#, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Nonce para autentificación simulada:        %s\n"
diff --git a/src/bin/pg_controldata/po/fr.po b/src/bin/pg_controldata/po/fr.po
index 1c94ff051b7..2f21528b177 100644
--- a/src/bin/pg_controldata/po/fr.po
+++ b/src/bin/pg_controldata/po/fr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-20 21:24+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-07 18:53+0000\n"
+"PO-Revision-Date: 2025-07-07 21:45+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
 #: ../../common/controldata_utils.c:97
 #, c-format
@@ -190,326 +190,340 @@ msgstr "code de statut inconnu"
 msgid "unrecognized \"wal_level\""
 msgstr "« wal_level » non reconnu"
 
-#: pg_controldata.c:138 pg_controldata.c:156 pg_controldata.c:163
+#: pg_controldata.c:139 pg_controldata.c:157 pg_controldata.c:164
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "no data directory specified"
 msgstr "aucun répertoire de données indiqué"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "calculated CRC checksum does not match value stored in control file"
 msgstr "la somme de contrôle CRC calculée ne correspond par à la valeur enregistrée dans le fichier de contrôle"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Either the control file is corrupt, or it has a different layout than this program is expecting.  The results below are untrustworthy."
 msgstr "Soit le fichier de contrôle est corrompu, soit son organisation diffère de celle attendue par le programme. Les résultats ci-dessous ne sont pas dignes de confiance."
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "taille invalide du segment WAL dans le fichier de contrôle (%d octet)"
 msgstr[1] "taille invalide du segment WAL dans le fichier de contrôle (%d octets)"
 
-#: pg_controldata.c:185
+#: pg_controldata.c:186
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "La taille du segment WAL doit être une puissance de deux comprise entre 1 Mo et 1 Go."
 
-#: pg_controldata.c:186
+#: pg_controldata.c:187
 #, c-format
 msgid "The file is corrupt and the results below are untrustworthy."
 msgstr "Le fichier est corrompu et il ne faut pas faire confiance aux résultats ci-dessous."
 
-#: pg_controldata.c:221
+#: pg_controldata.c:205 pg_controldata.c:213 pg_controldata.c:232
+#, c-format
 msgid "???"
 msgstr "???"
 
-#: pg_controldata.c:227
+#: pg_controldata.c:238
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Numéro de version de pg_control :                       %u\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:240
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Numéro de version du catalogue :                        %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Identifiant du système de base de données :             %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Identifiant du système de base de données :             %<PRIu64>\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:244
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "État du cluster de base de données :                    %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:246
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "Dernière modification de pg_control :                   %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:248
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Dernier point de contrôle :                             %X/%X\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:250
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Dernier REDO (reprise) du point de contrôle :           %X/%X\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:252
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "Dernier fichier WAL du rejeu du point de contrôle :     %s\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:254
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
 
-#: pg_controldata.c:245
+#: pg_controldata.c:256
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "Dernier PrevTimeLineID du point de contrôle :           %u\n"
 
-#: pg_controldata.c:247
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "off"
 msgstr "désactivé"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "on"
 msgstr "activé"
 
-#: pg_controldata.c:249
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "Dernier NextXID du point de contrôle :                  %u:%u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:263
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Dernier NextOID du point de contrôle :                  %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:265
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:267
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:269
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "Dernier oldestXID du point de contrôle :                %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:271
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:273
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:275
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "Dernier oldestMultiXid du point de contrôle :           %u\n"
 
-#: pg_controldata.c:266
+#: pg_controldata.c:277
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "Dernier oldestMulti du point de contrôle de la base :   %u\n"
 
-#: pg_controldata.c:268
+#: pg_controldata.c:279
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "Dernier oldestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_controldata.c:270
+#: pg_controldata.c:281
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "Dernier newestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_controldata.c:272
+#: pg_controldata.c:283
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Heure du dernier point de contrôle :                    %s\n"
 
-#: pg_controldata.c:274
+#: pg_controldata.c:285
 #, 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"
 
-#: pg_controldata.c:276
+#: pg_controldata.c:287
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Emplacement de fin de la récupération minimale :        %X/%X\n"
 
-#: pg_controldata.c:278
+#: pg_controldata.c:289
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "Timeline de l'emplacement de fin de restauration :      %u\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "Début de la sauvegarde :                                %X/%X\n"
 
-#: pg_controldata.c:282
+#: pg_controldata.c:293
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "Fin de la sauvegarde :                                  %X/%X\n"
 
-#: pg_controldata.c:284
+#: pg_controldata.c:295
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "Enregistrement de fin de sauvegarde requis :            %s\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "no"
 msgstr "non"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "yes"
 msgstr "oui"
 
-#: pg_controldata.c:286
+#: pg_controldata.c:297
 #, c-format
 msgid "wal_level setting:                    %s\n"
 msgstr "Paramétrage actuel de wal_level :                       %s\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:299
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
 msgstr "Paramétrage actuel de wal_log_hints :                   %s\n"
 
-#: pg_controldata.c:290
+#: pg_controldata.c:301
 #, c-format
 msgid "max_connections setting:              %d\n"
 msgstr "Paramétrage actuel de max_connections :                 %d\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:303
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
 msgstr "Paramétrage actuel de max_worker_processes :            %d\n"
 
-#: pg_controldata.c:294
+#: pg_controldata.c:305
 #, c-format
 msgid "max_wal_senders setting:              %d\n"
 msgstr "Paramétrage actuel de max_wal_senders :                 %d\n"
 
-#: pg_controldata.c:296
+#: pg_controldata.c:307
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
 msgstr "Paramétrage actuel de max_prepared_xacts :              %d\n"
 
-#: pg_controldata.c:298
+#: pg_controldata.c:309
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
 msgstr "Paramétrage actuel de max_locks_per_xact :              %d\n"
 
-#: pg_controldata.c:300
+#: pg_controldata.c:311
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
 msgstr "Paramétrage actuel de track_commit_timestamp :          %s\n"
 
-#: pg_controldata.c:302
+#: pg_controldata.c:313
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Alignement maximal des données :                        %u\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:316
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Taille du bloc de la base de données :                  %u\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:318
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocs par segment des relations volumineuses :          %u\n"
 
-#: pg_controldata.c:309
+#: pg_controldata.c:320
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Taille de bloc du journal de transaction :              %u\n"
 
-#: pg_controldata.c:311
+#: pg_controldata.c:322
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Octets par segment du journal de transaction :          %u\n"
 
-#: pg_controldata.c:313
+#: pg_controldata.c:324
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Longueur maximale des identifiants :                    %u\n"
 
-#: pg_controldata.c:315
+#: pg_controldata.c:326
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Nombre maximum de colonnes d'un index:                  %u\n"
 
-#: pg_controldata.c:317
+#: pg_controldata.c:328
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Longueur maximale d'un morceau TOAST :                  %u\n"
 
-#: pg_controldata.c:319
+#: pg_controldata.c:330
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Taille d'un morceau de Large Object :                   %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:333
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Stockage du type date/heure :                           %s\n"
 
-#: pg_controldata.c:323
+#: pg_controldata.c:334
 msgid "64-bit integers"
 msgstr "entiers 64-bits"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:335
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Passage d'argument float8 :                             %s\n"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by reference"
 msgstr "par référence"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by value"
 msgstr "par valeur"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:337
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Version des sommes de contrôle des pages de données :   %u\n"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:339
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Propriété « signedness » par défaut d'une donnée char : %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "signé"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "non signé"
+
+#: pg_controldata.c:341
 #, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Nonce pour simuler une identité:            %s\n"
diff --git a/src/bin/pg_controldata/po/ko.po b/src/bin/pg_controldata/po/ko.po
index b753d7e93c1..b4e1fdbcb5f 100644
--- a/src/bin/pg_controldata/po/ko.po
+++ b/src/bin/pg_controldata/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_controldata (PostgreSQL) 17\n"
+"Project-Id-Version: pg_controldata (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:53+0000\n"
-"PO-Revision-Date: 2025-01-16 15:43+0900\n"
+"POT-Creation-Date: 2025-09-11 21:53+0000\n"
+"PO-Revision-Date: 2025-09-09 16:55+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -183,27 +183,27 @@ msgstr "알수 없는 상태 코드"
 msgid "unrecognized \"wal_level\""
 msgstr "알 수 없는 \"wal_level\""
 
-#: pg_controldata.c:138 pg_controldata.c:156 pg_controldata.c:163
+#: pg_controldata.c:139 pg_controldata.c:157 pg_controldata.c:164
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인수를 지정했습니다. (처음 \"%s\")"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "no data directory specified"
 msgstr "데이터 디렉터리를 지정하지 않았습니다"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "calculated CRC checksum does not match value stored in control file"
 msgstr "계산된 CRC 체크섬 값과 컨트롤 파일에 저장된 값이 다름"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid ""
 "Either the control file is corrupt, or it has a different layout than this "
@@ -212,320 +212,314 @@ msgstr ""
 "이 경우는 컨트롤 파일이 손상되었거나, 이 프로그램과 컨트롤 파일의 버전이 틀"
 "린 경우입니다. 결과값들은 믿지 못할 값들이 출력될 수 있습니다."
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "컨트롤 파일의 WAL 조각 파일 크기가 올바르지 않음 (%d 바이트)"
 
-#: pg_controldata.c:185
+#: pg_controldata.c:186
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL 조각 파일 크기는 1MB에서 1GB사이 2의 제곱값이어야 합니다."
 
-#: pg_controldata.c:186
+#: pg_controldata.c:187
 #, c-format
 msgid "The file is corrupt and the results below are untrustworthy."
 msgstr "이 파일이 깨져서 신뢰할 수 없는 결과값이 출력됩니다."
 
-#: pg_controldata.c:221
+#: pg_controldata.c:205 pg_controldata.c:213 pg_controldata.c:232
+#, c-format
 msgid "???"
 msgstr "???"
 
-#: pg_controldata.c:227
+#: pg_controldata.c:238
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control 버전 번호:                 %u\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:240
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "카탈로그 버전 번호:                   %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "데이터베이스 시스템 식별자:           %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "데이터베이스 시스템 식별자:           %<PRIu64>\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:244
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "데이터베이스 클러스터 상태:           %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:246
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control 마지막 변경시간:           %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:248
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "마지막 체크포인트 위치:               %X/%X\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:250
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "마지막 체크포인트 REDO 위치:          %X/%X\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:252
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "마지막 체크포인트 REDO WAL 파일:      %s\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:254
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "마지막 체크포인트 TimeLineID:         %u\n"
 
-#: pg_controldata.c:245
+#: pg_controldata.c:256
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "마지막 체크포인트 PrevTimeLineID:     %u\n"
 
-#: pg_controldata.c:247
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "마지막 체크포인트 full_page_writes:   %s\n"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "off"
 msgstr "off"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "on"
 msgstr "on"
 
-#: pg_controldata.c:249
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "마지막 체크포인트 NextXID:            %u:%u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:263
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "마지막 체크포인트 NextOID:            %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:265
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "마지막 체크포인트 NextMultiXactId:    %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:267
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "마지막 체크포인트 NextMultiOffset:    %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:269
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "마지막 체크포인트 제일오래된XID:      %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:271
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "마지막 체크포인트 제일오래된XID의 DB: %u\n"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:273
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "마지막 체크포인트 제일오래된ActiveXID:%u\n"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:275
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "마지막 체크포인트 제일오래된MultiXid: %u\n"
 
-#: pg_controldata.c:266
+#: pg_controldata.c:277
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "마지막 체크포인트 제일오래된멀티Xid DB:%u\n"
 
-#: pg_controldata.c:268
+#: pg_controldata.c:279
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "마지막 체크포인트 제일오래된CommitTsXid:%u\n"
 
-#: pg_controldata.c:270
+#: pg_controldata.c:281
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "마지막 체크포인트 최신CommitTsXid:    %u\n"
 
-#: pg_controldata.c:272
+#: pg_controldata.c:283
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "마지막 체크포인트 시간:               %s\n"
 
-#: pg_controldata.c:274
+#: pg_controldata.c:285
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
 msgstr "언로그 릴레이션의 가짜 LSN 카운터:    %X/%X\n"
 
-#: pg_controldata.c:276
+#: pg_controldata.c:287
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "최소 복구 마지막 위치:                %X/%X\n"
 
-#: pg_controldata.c:278
+#: pg_controldata.c:289
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "최소 복구 종료 위치의 타임라인:       %u\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "백업 시작 위치:                       %X/%X\n"
 
-#: pg_controldata.c:282
+#: pg_controldata.c:293
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "백업 종료 위치:                       %X/%X\n"
 
-#: pg_controldata.c:284
+#: pg_controldata.c:295
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "백업 종료 레코드 필요 여부:           %s\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "no"
 msgstr "아니오"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "yes"
 msgstr "예"
 
-#: pg_controldata.c:286
+#: pg_controldata.c:297
 #, c-format
 msgid "wal_level setting:                    %s\n"
 msgstr "wal_level 설정값:                     %s\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:299
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
 msgstr "wal_log_hints 설정값:                 %s\n"
 
-#: pg_controldata.c:290
+#: pg_controldata.c:301
 #, c-format
 msgid "max_connections setting:              %d\n"
 msgstr "max_connections 설정값:               %d\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:303
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
 msgstr "max_worker_processes 설정값:          %d\n"
 
-#: pg_controldata.c:294
+#: pg_controldata.c:305
 #, c-format
 msgid "max_wal_senders setting:              %d\n"
 msgstr "max_wal_senders 설정값:               %d\n"
 
-#: pg_controldata.c:296
+#: pg_controldata.c:307
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
 msgstr "max_prepared_xacts 설정값:            %d\n"
 
-#: pg_controldata.c:298
+#: pg_controldata.c:309
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
 msgstr "max_locks_per_xact 설정값:            %d\n"
 
-#: pg_controldata.c:300
+#: pg_controldata.c:311
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
 msgstr "track_commit_timestamp 설정값:        %s\n"
 
-#: pg_controldata.c:302
+#: pg_controldata.c:313
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "최대 자료 정렬:                       %u\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:316
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "데이터베이스 블록 크기:               %u\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:318
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "대형 릴레이션의 세그먼트당 블럭 개수: %u\n"
 
-#: pg_controldata.c:309
+#: pg_controldata.c:320
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL 블록 크기:                        %u\n"
 
-#: pg_controldata.c:311
+#: pg_controldata.c:322
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "WAL 세그먼트의 크기(byte):            %u\n"
 
-#: pg_controldata.c:313
+#: pg_controldata.c:324
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "식별자 최대 길이:                     %u\n"
 
-#: pg_controldata.c:315
+#: pg_controldata.c:326
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "인덱스에서 사용하는 최대 열 수:       %u\n"
 
-#: pg_controldata.c:317
+#: pg_controldata.c:328
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "TOAST 청크 최대 크기:                 %u\n"
 
-#: pg_controldata.c:319
+#: pg_controldata.c:330
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "대형 객체 청크 크기:                  %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:333
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "날짜/시간형 자료의 저장방식:          %s\n"
 
-#: pg_controldata.c:323
+#: pg_controldata.c:334
 msgid "64-bit integers"
 msgstr "64-비트 정수"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:335
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Float8 인수 전달:                     %s\n"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by reference"
 msgstr "참조별"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by value"
 msgstr "값별"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:337
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "데이터 페이지 체크섬 버전:            %u\n"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:339
 #, c-format
-msgid "Mock authentication nonce:            %s\n"
-msgstr "임시 모의 인증:                       %s\n"
+msgid "Default char data signedness:         %s\n"
+msgstr "기본 문자 자료 부호:                  %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "부호있음"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "부호없음"
 
+#: pg_controldata.c:341
 #, c-format
-#~ msgid "WARNING: invalid WAL segment size\n"
-#~ msgstr "경고: 잘못된 WAL 조각 크기\n"
-
-#, c-format
-#~ msgid ""
-#~ "The WAL segment size stored in the file, %d byte, is not a power of two\n"
-#~ "between 1 MB and 1 GB.  The file is corrupt and the results below are\n"
-#~ "untrustworthy.\n"
-#~ "\n"
-#~ msgid_plural ""
-#~ "The WAL segment size stored in the file, %d bytes, is not a power of two\n"
-#~ "between 1 MB and 1 GB.  The file is corrupt and the results below are\n"
-#~ "untrustworthy.\n"
-#~ "\n"
-#~ msgstr[0] ""
-#~ "저장된 WAL 조각 파일의 크기는 %d 바이트입니다. 이 값은 1MB부터 1GB사이\n"
-#~ "2^n 값이 아닙니다.  파일이 손상되었으며, 결과 또한 믿을 수 없습니다.\n"
-#~ "\n"
+msgid "Mock authentication nonce:            %s\n"
+msgstr "임시 모의 인증:                       %s\n"
diff --git a/src/bin/pg_controldata/po/ru.po b/src/bin/pg_controldata/po/ru.po
index 5197e06cc71..ce97ded1eba 100644
--- a/src/bin/pg_controldata/po/ru.po
+++ b/src/bin/pg_controldata/po/ru.po
@@ -4,13 +4,13 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_controldata (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-04 17:08+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 16:58+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -254,8 +254,8 @@ msgstr "Номер версии каталога:                %u\n"
 
 #: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Идентификатор системы баз данных:     %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Идентификатор системы баз данных:     %<PRIu64>\n"
 
 #: pg_controldata.c:244
 #, c-format
@@ -536,9 +536,22 @@ msgstr "по значению"
 msgid "Data page checksum version:           %u\n"
 msgstr "Версия контрольных сумм страниц:      %u\n"
 
-# skip-rule: capital-letter-first
 #: pg_controldata.c:339
 #, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Знаковость char по умолчанию:         %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "знаковое"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "беззнаковое"
+
+# skip-rule: capital-letter-first
+#: pg_controldata.c:341
+#, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Случ. число для псевдоаутентификации: %s\n"
 
diff --git a/src/bin/pg_controldata/po/sv.po b/src/bin/pg_controldata/po/sv.po
index 07b46343b13..49d4e7b42d9 100644
--- a/src/bin/pg_controldata/po/sv.po
+++ b/src/bin/pg_controldata/po/sv.po
@@ -1,16 +1,16 @@
 # Swedish message translation file for pg_controldata
 # This file is put in the public domain.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 # Mats Erik Andersson <bsd@gisladisker.se>, 2014.
 #
 # Use these quotes: "%s"
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 14:24+0000\n"
-"PO-Revision-Date: 2024-07-12 19:01+0200\n"
+"POT-Creation-Date: 2025-05-16 16:23+0000\n"
+"PO-Revision-Date: 2025-05-16 20:12+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -184,49 +184,50 @@ msgstr "okänd statuskod"
 msgid "unrecognized \"wal_level\""
 msgstr "okänd \"wal_level\""
 
-#: pg_controldata.c:138 pg_controldata.c:156 pg_controldata.c:163
+#: pg_controldata.c:139 pg_controldata.c:157 pg_controldata.c:164
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "no data directory specified"
 msgstr "ingen datakatalog angiven"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "calculated CRC checksum does not match value stored in control file"
 msgstr "uträknad CRC-checksumma matchar inte värdet som är lagrat i kontrollfil"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Either the control file is corrupt, or it has a different layout than this program is expecting.  The results below are untrustworthy."
 msgstr "Antingen är filen trasig, eller så har den en annan uppbyggnad än vad detta program förväntade sig. Resultatet nedan är inte helt tillförlitligt."
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 msgstr[1] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 
-#: pg_controldata.c:185
+#: pg_controldata.c:186
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL-segmentstorleken måste vara en tvåpotens mellan 1 MB och 1 GB."
 
-#: pg_controldata.c:186
+#: pg_controldata.c:187
 #, c-format
 msgid "The file is corrupt and the results below are untrustworthy."
 msgstr "Filen är trasig och resultatet nedan är inte helt tillförlitligt."
 
-#: pg_controldata.c:221
+#: pg_controldata.c:205 pg_controldata.c:213 pg_controldata.c:232
+#, c-format
 msgid "???"
 msgstr "???"
 
@@ -236,280 +237,293 @@ msgstr "???"
 # used for English is insufficient for Swedish.  New indenting
 # is consistent for all reporting statements: six additional
 # space characters.
-#: pg_controldata.c:227
+#: pg_controldata.c:238
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Versionsnummer för pg_control:              %u\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:240
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversion:                             %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Databasens systemidentifierare:             %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Databasens systemidentifierare:             %<PRIu64>\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:244
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Databasklustrets tillstånd:                 %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:246
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control ändrades senast:                 %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:248
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Läge för senaste kontrollpunkt:             %X/%X\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:250
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "REDO-läge för senaste kontrollpunkt:        %X/%X\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:252
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "REDO-WAL-fil vid senaste kontrollpunkt:     %s\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:254
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID vid senaste kontrollpunkt:       %u\n"
 
-#: pg_controldata.c:245
+#: pg_controldata.c:256
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "PrevTimeLineID vid senaste kontrollpunkt:   %u\n"
 
-#: pg_controldata.c:247
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Senaste kontrollpunktens full_page_writes:  %s\n"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "off"
 msgstr "av"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "on"
 msgstr "på"
 
-#: pg_controldata.c:249
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID vid senaste kontrollpunkt:          %u:%u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:263
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID vid senaste kontrollpunkt:          %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:265
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId vid senaste kontrollpunkt:  %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:267
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset vid senaste kontrollpunkt:  %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:269
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID vid senaste kontrollpunkt:        %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:271
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB för oldestXID vid senaste kontrollpunkt: %u\n"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:273
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID vid senaste kontrollpunkt:  %u\n"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:275
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid vid senaste kontrollpunkt:   %u\n"
 
-#: pg_controldata.c:266
+#: pg_controldata.c:277
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB för oldestMulti vid senaste kontrollpkt: %u\n"
 
-#: pg_controldata.c:268
+#: pg_controldata.c:279
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid vid senaste kontrollpunkt:%u\n"
 
-#: pg_controldata.c:270
+#: pg_controldata.c:281
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid vid senaste kontrollpunkt:%u\n"
 
-#: pg_controldata.c:272
+#: pg_controldata.c:283
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Tidpunkt för senaste kontrollpunkt:         %s\n"
 
-#: pg_controldata.c:274
+#: pg_controldata.c:285
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
 msgstr "Beräknat LSN-tal av ologgade relationer:    %X/%X\n"
 
-#: pg_controldata.c:276
+#: pg_controldata.c:287
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Minsta slutposition vid återställning:      %X/%X\n"
 
-#: pg_controldata.c:278
+#: pg_controldata.c:289
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "Tidslinje för min slutpos vid återställning:%u\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "Startpunkt för backup:                      %X/%X\n"
 
-#: pg_controldata.c:282
+#: pg_controldata.c:293
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "Slutpunkt för backup:                       %X/%X\n"
 
-#: pg_controldata.c:284
+#: pg_controldata.c:295
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "Tvingande markering av backupslut:          %s\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "no"
 msgstr "nej"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "yes"
 msgstr "ja"
 
-#: pg_controldata.c:286
+#: pg_controldata.c:297
 #, c-format
 msgid "wal_level setting:                    %s\n"
 msgstr "Värde på wal_level:                         %s\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:299
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
 msgstr "Värde på wal_log_hints:                     %s\n"
 
-#: pg_controldata.c:290
+#: pg_controldata.c:301
 #, c-format
 msgid "max_connections setting:              %d\n"
 msgstr "Värde på max_connections:                   %d\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:303
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
 msgstr "Värde på max_worker_processes:              %d\n"
 
-#: pg_controldata.c:294
+#: pg_controldata.c:305
 #, c-format
 msgid "max_wal_senders setting:              %d\n"
 msgstr "Värde på max_wal_senders setting            %d\n"
 
-#: pg_controldata.c:296
+#: pg_controldata.c:307
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
 msgstr "Värde på max_prepared_xacts:                %d\n"
 
-#: pg_controldata.c:298
+#: pg_controldata.c:309
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
 msgstr "Nuvarande max_locks_per_xact:               %d\n"
 
-#: pg_controldata.c:300
+#: pg_controldata.c:311
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
 msgstr "Värde på track_commit_timestamp:            %s\n"
 
-#: pg_controldata.c:302
+#: pg_controldata.c:313
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Maximal jämkning av data (alignment):       %u\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:316
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Databasens blockstorlek:                    %u\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:318
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Block per segment i en stor relation:       %u\n"
 
-#: pg_controldata.c:309
+#: pg_controldata.c:320
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Blockstorlek i transaktionsloggen:          %u\n"
 
-#: pg_controldata.c:311
+#: pg_controldata.c:322
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Segmentstorlek i transaktionsloggen:        %u\n"
 
-#: pg_controldata.c:313
+#: pg_controldata.c:324
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximal längd för identifierare:            %u\n"
 
-#: pg_controldata.c:315
+#: pg_controldata.c:326
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Maximalt antal kolonner i ett index:        %u\n"
 
-#: pg_controldata.c:317
+#: pg_controldata.c:328
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Maximal storlek för en TOAST-enhet:         %u\n"
 
-#: pg_controldata.c:319
+#: pg_controldata.c:330
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Storlek för large-object-enheter:           %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:333
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Representation av dag och tid:              %s\n"
 
-#: pg_controldata.c:323
+#: pg_controldata.c:334
 msgid "64-bit integers"
 msgstr "64-bitars heltal"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:335
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Överföring av float8-argument:              %s\n"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by reference"
 msgstr "med referens"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by value"
 msgstr "med värde"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:337
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Checksummaversion för datasidor:            %u\n"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:339
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Standard signering för char-data:           %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "signerad"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "osignerad"
+
+#: pg_controldata.c:341
 #, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Fejkat authentiseringsvärde:                %s\n"
diff --git a/src/bin/pg_controldata/po/uk.po b/src/bin/pg_controldata/po/uk.po
index c2b2e3217f1..5bd472f87c2 100644
--- a/src/bin/pg_controldata/po/uk.po
+++ b/src/bin/pg_controldata/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:24+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:54+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_controldata.pot\n"
-"X-Crowdin-File-ID: 1018\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_controldata.pot\n"
+"X-Crowdin-File-ID: 1047\n"
 
 #: ../../common/controldata_utils.c:97
 #, c-format
@@ -167,32 +167,32 @@ msgstr "невизнаний код статусу"
 msgid "unrecognized \"wal_level\""
 msgstr "нерозпізнано \"wal_level\""
 
-#: pg_controldata.c:138 pg_controldata.c:156 pg_controldata.c:163
+#: pg_controldata.c:139 pg_controldata.c:157 pg_controldata.c:164
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог даних не вказано"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "calculated CRC checksum does not match value stored in control file"
 msgstr "обчислена контрольна сума CRC не збігається зі значенням, що зберігається в контрольному файлі"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Either the control file is corrupt, or it has a different layout than this program is expecting.  The results below are untrustworthy."
 msgstr "Або контрольний файл пошкоджено, або він має іншу структуру, ніж очікує ця програма. Наведені нижче результати не заслуговують на довіру."
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -201,294 +201,308 @@ msgstr[1] "невірний розмір сегмента WAL у файлі ке
 msgstr[2] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 msgstr[3] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 
-#: pg_controldata.c:185
+#: pg_controldata.c:186
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Розмір сегмента WAL повинен бути степенем двійки від 1 МБ до 1 ГБ."
 
-#: pg_controldata.c:186
+#: pg_controldata.c:187
 #, c-format
 msgid "The file is corrupt and the results below are untrustworthy."
 msgstr "Файл пошкоджено, і наведені нижче результати не заслуговують на довіру."
 
-#: pg_controldata.c:221
+#: pg_controldata.c:205 pg_controldata.c:213 pg_controldata.c:232
+#, c-format
 msgid "???"
 msgstr "???"
 
-#: pg_controldata.c:227
+#: pg_controldata.c:238
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control номер версії:            %u\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:240
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Номер версії каталогу:               %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:242
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Системний ідентифікатор бази даних:           %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Ідентифікатор системи бази даних:           %<PRIu64>\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:244
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Стан кластеру бази даних:              %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:246
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control був модифікований востаннє:         %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:248
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Останнє місце знаходження контрольної точки: %X/%X\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:250
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Розташування останньої контрольної точки: %X%X\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:252
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "Останній файл контрольної точки REDO WAL:  %s\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:254
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Останній TimeLineID контрольної точки: %u\n"
 
-#: pg_controldata.c:245
+#: pg_controldata.c:256
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "Останній PrevTimeLineID контрольної точки: %u\n"
 
-#: pg_controldata.c:247
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Останній full_page_writes контрольної точки: %s\n"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "off"
 msgstr "вимк"
 
-#: pg_controldata.c:248 pg_controldata.c:289 pg_controldata.c:301
+#: pg_controldata.c:259 pg_controldata.c:300 pg_controldata.c:312
 msgid "on"
 msgstr "увімк"
 
-#: pg_controldata.c:249
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "Останній NextXID контрольної точки: %u%u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:263
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Останній NextOID контрольної точки: %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:265
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "Останній NextMultiXactId контрольної точки: %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:267
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "Останній NextMultiOffset контрольної точки: %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:269
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "Останній oldestXID контрольної точки: %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:271
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "Остання DB останнього oldestXID контрольної точки: %u\n"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:273
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "Останній oldestActiveXID контрольної точки: %u\n"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:275
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "Останній oldestMultiXid контрольної точки: %u \n"
 
-#: pg_controldata.c:266
+#: pg_controldata.c:277
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "Остання DB останньої oldestMulti контрольної точки: %u\n"
 
-#: pg_controldata.c:268
+#: pg_controldata.c:279
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "Останній oldestCommitTsXid контрольної точки:%u\n"
 
-#: pg_controldata.c:270
+#: pg_controldata.c:281
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "Останній newestCommitTsXid контрольної точки: %u\n"
 
-#: pg_controldata.c:272
+#: pg_controldata.c:283
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Час останньої контрольної точки: %s\n"
 
-#: pg_controldata.c:274
+#: pg_controldata.c:285
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
 msgstr "Фіктивний LSN для таблиць без журналювання: %X/%X\n"
 
-#: pg_controldata.c:276
+#: pg_controldata.c:287
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Мінімальне розташування кінця відновлення: %X/%X\n"
 
-#: pg_controldata.c:278
+#: pg_controldata.c:289
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "Мінімальна позиція історії часу завершення відновлення: %u\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "Початкове розташування резервного копіювання: %X/%X\n"
 
-#: pg_controldata.c:282
+#: pg_controldata.c:293
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "Кінцеве розташування резервного копіювання: %X/%X\n"
 
-#: pg_controldata.c:284
+#: pg_controldata.c:295
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "Вимагається запис кінця резервного копіювання: %s\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "no"
 msgstr "ні"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:296
 msgid "yes"
 msgstr "так"
 
-#: pg_controldata.c:286
+#: pg_controldata.c:297
 #, c-format
 msgid "wal_level setting:                    %s\n"
 msgstr "налаштування wal_рівня: %s\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:299
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
 msgstr "налаштування wal_log_hints: %s\n"
 
-#: pg_controldata.c:290
+#: pg_controldata.c:301
 #, c-format
 msgid "max_connections setting:              %d\n"
 msgstr "налаштування max_connections: %d\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:303
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
 msgstr "налаштування max_worker_processes: %d\n"
 
-#: pg_controldata.c:294
+#: pg_controldata.c:305
 #, c-format
 msgid "max_wal_senders setting:              %d\n"
 msgstr "налаштування max_wal_senders: %d\n"
 
-#: pg_controldata.c:296
+#: pg_controldata.c:307
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
 msgstr "налаштування max_prepared_xacts: %d\n"
 
-#: pg_controldata.c:298
+#: pg_controldata.c:309
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
 msgstr "налаштування max_locks_per_xact: %d\n"
 
-#: pg_controldata.c:300
+#: pg_controldata.c:311
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
 msgstr "налаштування track_commit_timestamp: %s\n"
 
-#: pg_controldata.c:302
+#: pg_controldata.c:313
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Максимальне вирівнювання даних: %u\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:316
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Розмір блоку бази даних: %u\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:318
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Блоків на сегмент великого відношення: %u\n"
 
-#: pg_controldata.c:309
+#: pg_controldata.c:320
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Pозмір блоку WAL: %u\n"
 
-#: pg_controldata.c:311
+#: pg_controldata.c:322
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Байтів на сегмент WAL: %u\n"
 
-#: pg_controldata.c:313
+#: pg_controldata.c:324
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Максимальна довжина ідентифікаторів:  %u\n"
 
-#: pg_controldata.c:315
+#: pg_controldata.c:326
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Максимальна кількість стовпців в індексі: %u\n"
 
-#: pg_controldata.c:317
+#: pg_controldata.c:328
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Максимальний розмір сегменту TOAST: %u\n"
 
-#: pg_controldata.c:319
+#: pg_controldata.c:330
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Розмір сегменту великих обїєктів: %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:333
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Дата/час типу сховища: %s\n"
 
-#: pg_controldata.c:323
+#: pg_controldata.c:334
 msgid "64-bit integers"
 msgstr "64-бітні цілі"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:335
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Передача аргументу Float8:      %s\n"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by reference"
 msgstr "за посиланням"
 
-#: pg_controldata.c:325
+#: pg_controldata.c:336
 msgid "by value"
 msgstr "за значенням"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:337
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Версія контрольних сум сторінок даних:      %u\n"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:339
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Знаковість символьних даних за замовчуванням: %s\n"
+
+#: pg_controldata.c:340
+msgid "signed"
+msgstr "знаковий"
+
+#: pg_controldata.c:340
+msgid "unsigned"
+msgstr "беззнаковий"
+
+#: pg_controldata.c:341
 #, c-format
 msgid "Mock authentication nonce:            %s\n"
 msgstr "Імітувати нонс для аутентифікації: %s\n"
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 5181996c122..0c8d2d1c9f5 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/pg_ctl/Makefile
 #
diff --git a/src/bin/pg_ctl/po/es.po b/src/bin/pg_ctl/po/es.po
index f57f1217e95..6c74e3b8350 100644
--- a/src/bin/pg_ctl/po/es.po
+++ b/src/bin/pg_ctl/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_ctl (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:49+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:18+0000\n"
+"PO-Revision-Date: 2025-09-21 11:35+0200\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -45,33 +45,33 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "memoria agotada"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:830 ../../port/path.c:867 ../../port/path.c:884
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
@@ -111,125 +111,129 @@ msgstr "el proceso hijo fue terminado por una señal %d: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: ../../port/path.c:852
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "no se pudo obtener el directorio de trabajo actual: %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: el directorio «%s» no existe\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, 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:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s: no se pudo abrir el archivo de PID «%s»: %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, 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:295
+#: pg_ctl.c:296
 #, 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:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s: no se pudo iniciar el servidor: %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s: no se pudo iniciar el servidor debido a falla en setsid(): %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s: no se pudo abrir el archivo de log «%s»: %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, c-format
 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:781
+#: pg_ctl.c:789
 #, 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:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: no se pudo leer el archivo «%s»\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, 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:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s: falló la señal de detención (PID: %d): %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\"\n"
 msgstr "el programa «%s» es requerido por %s, pero no fue encontrado en el mismo directorio que «%s»\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr "El programa «%s» fue encontrado por «%s», pero no es de la misma versión que %s\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: falló la creación de la base de datos\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, 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:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "esperando que el servidor se inicie..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " listo\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "servidor iniciado\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " abandonando la espera\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s: el servidor no inició a tiempo\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "servidor apagado debido a parámetros de destino de recuperación\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -238,42 +242,42 @@ msgstr ""
 "%s: no se pudo iniciar el servidor.\n"
 "Examine el registro del servidor.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "servidor iniciándose\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: el archivo de PID «%s» no existe\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "¿Está el servidor en ejecución?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr "%s: no se puede detener el servidor; un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "servidor deteniéndose\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "esperando que el servidor se detenga..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " falló\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: el servidor no se detiene\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -281,237 +285,237 @@ msgstr ""
 "SUGERENCIA: La opción «-m fast» desconecta las sesiones inmediatamente\n"
 "en lugar de esperar que cada sesión finalice por sí misma.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "servidor detenido\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "intentando iniciae el servidor de todas maneras\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr "%s: no se puede reiniciar el servidor; un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 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:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s: el proceso servidor antiguo (PID: %d) parece no estar\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "iniciando el servidor de todas maneras\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr "%s: no se puede recargar el servidor; un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s: no se pudo enviar señal de recarga (PID: %d): %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "se ha enviado una señal al servidor\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr "%s: no se puede promover el servidor; un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, 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:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s: no se pudo crear el archivo de señal de promoción «%s»: %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s: no se pudo escribir al archivo de señal de promoción «%s»: %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s: no se pudo enviar la señal de promoción (PID: %d): %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s: no se pudo eliminar el archivo de señal de promoción «%s»: %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "esperando que el servidor se promueva..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "servidor promovido\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s: el servidor no se promovió a tiempo\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "servidor promoviendo\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr "%s: no se puede rotar el archivo de log; un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr "%s: no se pudo crear el archivo de señal de rotación de log «%s»: %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr "%s: no se pudo escribir al archivo de señal de rotación de log «%s»: %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s: no se pudo enviar la señal de rotación de log (PID: %d): %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr "%s: no se pudo eliminar el archivo de señal de rotación de log «%s»: %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "se ha enviado una señal de rotación de log al servidor\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s: un servidor en modo mono-usuario está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s: el servidor está en ejecución (PID: %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: no hay servidor en ejecución\n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s: no se pudo enviar la señal %d (PID: %d): %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable propio\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable postgres\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: no se pudo abrir el gestor de servicios\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: el servicio «%s» ya está registrado\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, 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:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: el servicio «%s» no ha sido registrado\n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, 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:1564
+#: pg_ctl.c:1576
 #, 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:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "Esperando que el servidor se inicie...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "Se agotó el tiempo de espera al inicio del servidor\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "Servidor iniciado y aceptando conexiones\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, 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:1786
+#: pg_ctl.c:1798
 #, 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:1800
+#: pg_ctl.c:1812
 #, 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:1826
+#: pg_ctl.c:1838
 #, 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:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s: no se pudo obtener LUIDs para privilegios: código de error %lu\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s: no se pudo obtener información de token: código de error %lu\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -521,17 +525,17 @@ msgstr ""
 "un servidor PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, 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:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid ""
 "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
@@ -540,12 +544,12 @@ msgstr ""
 "  %s start      [-D DATADIR] [-l ARCHIVO] [-W] [-t SEGS] [-s]\n"
 "                    [-o OPCIONES] [-p RUTA] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr "  %s stop       [-D DATADIR] [-m MODO-DETENCIÓN] [-W] [-t SEGS] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid ""
 "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
@@ -554,32 +558,32 @@ msgstr ""
 "  %s restart    [-D DATADIR] [-m MODO-DETENCIÓN] [-W] [-t SEGS] [-s]\n"
 "                    [-o OPCIONES]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D DATADIR]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote    [-D DATADIR] [-W] [-t SEGS] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       NOMBRE-SEÑAL ID-DE-PROCESO\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid ""
 "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
@@ -588,12 +592,12 @@ msgstr ""
 "  %s register   [-D DATADIR] [-N SERVICIO] [-U USUARIO] [-P PASSWORD]\n"
 "                    [-S TIPO-INICIO] [-e ORIGEN] [-W] [-t SEGS] [-o OPCIONES]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N SERVICIO]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -602,52 +606,52 @@ msgstr ""
 "\n"
 "Opciones comunes:\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, 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:1985
+#: pg_ctl.c:1997
 #, c-format
 msgid "  -e SOURCE              event source for logging when running as a service\n"
 msgstr "  -e ORIGEN              origen para el log de eventos cuando se ejecuta como servicio\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, 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:1988
+#: pg_ctl.c:2000
 #, 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:1989
+#: pg_ctl.c:2001
 #, 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:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait             esperar hasta que la operación se haya completado (por omisión)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait          no esperar hasta que la operación se haya completado\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostrar esta ayuda, luego salir\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, 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:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid ""
 "\n"
@@ -656,24 +660,24 @@ msgstr ""
 "\n"
 "Opciones para inicio y reinicio:\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, 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:1999
+#: pg_ctl.c:2011
 #, 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:2001
+#: pg_ctl.c:2013
 #, 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:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid ""
 "  -o, --options=OPTIONS  command line options to pass to postgres\n"
@@ -682,12 +686,12 @@ msgstr ""
 "  -o, --options=OPCIONES parámetros de línea de órdenes a pasar a postgres\n"
 "                         (ejecutable del servidor de PostgreSQL) o initdb\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p RUTA-A-POSTGRES     normalmente no es necesario\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid ""
 "\n"
@@ -696,12 +700,12 @@ msgstr ""
 "\n"
 "Opciones para detener o reiniciar:\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, 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:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid ""
 "\n"
@@ -710,24 +714,24 @@ msgstr ""
 "\n"
 "Modos de detención son:\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, 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:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr "  fast        salir directamente, con apagado apropiado (por omisión)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, 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:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -736,7 +740,7 @@ msgstr ""
 "\n"
 "Nombres de señales permitidos para kill:\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid ""
 "\n"
@@ -745,35 +749,35 @@ msgstr ""
 "\n"
 "Opciones para registrar y dar de baja:\n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, 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:2019
+#: pg_ctl.c:2031
 #, 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:2020
+#: pg_ctl.c:2032
 #, 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:2021
+#: pg_ctl.c:2033
 #, 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:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid ""
 "\n"
@@ -782,17 +786,17 @@ msgstr ""
 "\n"
 "Tipos de inicio del servicio son:\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, 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:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     iniciar el servicio en demanda\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -801,37 +805,37 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modo de apagado «%s» no reconocido\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nombre de señal «%s» no reconocido\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: tipo de inicio «%s» no reconocido\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, 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:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s: el archivo de control parece estar corrupto\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -842,32 +846,32 @@ msgstr ""
 "Por favor conéctese (usando, por ejemplo, «su») con un usuario no privilegiado,\n"
 "quien ejecutará el proceso servidor.\n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, 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:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: argumentos faltantes para envío de señal\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modo de operación «%s» no reconocido\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, 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:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: no se especificó operación\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, 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"
diff --git a/src/bin/pg_ctl/po/fr.po b/src/bin/pg_ctl/po/fr.po
index ea31cdbc395..ffcec5c1f0a 100644
--- a/src/bin/pg_ctl/po/fr.po
+++ b/src/bin/pg_ctl/po/fr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-22 10:19+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-08 05:19+0000\n"
+"PO-Revision-Date: 2025-07-08 10:42+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
 #: ../../common/controldata_utils.c:168
 msgid "byte ordering mismatch"
@@ -47,33 +47,33 @@ msgstr "n'a pas pu trouver un « %s » à exécuter"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "n'a pas pu résoudre le chemin « %s » en sa forme absolue : %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "n'a pas pu exécuter la commande « %s » : %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "n'a pas pu lire à partir de la commande « %s » : %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "aucune donnée n'a été renvoyée par la commande « %s »"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:753 ../../port/path.c:790 ../../port/path.c:807
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
@@ -113,127 +113,131 @@ msgstr "le processus fils a été terminé par le signal %d : %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
-#: ../../port/path.c:775
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "n'a pas pu obtenir le répertoire de travail : %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s : le répertoire « %s » n'existe pas\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s : n'a pas pu accéder au répertoire « %s » : %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, 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"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s : n'a pas pu ouvrir le fichier de PID « %s » : %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s : le fichier PID « %s » est vide\n"
 
-#: pg_ctl.c:295
+#: pg_ctl.c:296
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s : données invalides dans le fichier de PID « %s »\n"
 
-#: pg_ctl.c:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s : n'a pas pu démarrer le serveur : %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s : n'a pas pu démarrer le serveur à cause d'un échec de setsid() : %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s : n'a pas pu ouvrir le journal applicatif « %s » : %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, 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"
 
-#: pg_ctl.c:781
+#: pg_ctl.c:789
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s : n'a pas pu initialiser la taille des fichiers core, ceci est interdit\n"
 "par une limite dure\n"
 
-#: pg_ctl.c:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s : n'a pas pu lire le fichier « %s »\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s : le fichier d'options « %s » ne doit comporter qu'une seule ligne\n"
 
-#: pg_ctl.c:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s : n'a pas pu envoyer le signal d'arrêt (PID : %d) : %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\"\n"
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s : l'initialisation du système a échoué\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s : un autre serveur semble en cours d'exécution ; le démarrage du serveur\n"
 "va toutefois être tenté\n"
 
-#: pg_ctl.c:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "en attente du démarrage du serveur..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " effectué\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "serveur démarré\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " attente arrêtée\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s : le serveur ne s'est pas lancé à temps\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "le serveur s'est arrêté parce qu'il a atteint la cible de restauration configurée\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -242,44 +246,44 @@ msgstr ""
 "%s : n'a pas pu démarrer le serveur\n"
 "Examinez le journal applicatif.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "serveur en cours de démarrage\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s : le fichier de PID « %s » n'existe pas\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "Le serveur est-il en cours d'exécution ?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s : ne peut pas arrêter le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "serveur en cours d'arrêt\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "en attente de l'arrêt du serveur..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " a échoué\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s : le serveur ne s'est pas arrêté\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -287,243 +291,243 @@ msgstr ""
 "ASTUCE : l'option « -m fast » déconnecte immédiatement les sessions plutôt que\n"
 "d'attendre la déconnexion des sessions déjà présentes.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "serveur arrêté\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "tentative de lancement du serveur malgré tout\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s : ne peut pas relancer le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Merci d'arrêter le serveur mono-utilisateur et de réessayer.\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s : l'ancien processus serveur (PID : %d) semble être parti\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "lancement du serveur malgré tout\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s : ne peut pas recharger le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s : n'a pas pu envoyer le signal de rechargement (PID : %d) : %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "envoi d'un signal au serveur\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s : ne peut pas promouvoir le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s : ne peut pas promouvoir le serveur ; le serveur n'est pas en standby\n"
 
-#: pg_ctl.c:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu créer le fichier « %s » signalant la promotion : %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu écrire le fichier « %s » signalant la promotion : %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s : n'a pas pu envoyer le signal de promotion (PID : %d) : %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu supprimer le fichier « %s » signalant la promotion : %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "en attente du serveur à promouvoir..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "serveur promu\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s : le serveur ne s'est pas promu à temps\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "serveur en cours de promotion\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s : ne peut pas faire une rotation de fichier de traces ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu créer le fichier « %s » de demande de rotation des fichiers de trace : %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu écrire le fichier « %s » de demande de rotation des fichiers de trace : %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s : n'a pas pu envoyer le signal de rotation des fichiers de trace (PID : %d) : %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr "%s : n'a pas pu supprimer le fichier « %s » signalant la demande de rotation des fichiers de trace : %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "envoi d'un signal au serveur pour faire une rotation des traces\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s : le serveur mono-utilisateur est en cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s : le serveur est en cours d'exécution (PID : %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s : aucun serveur en cours d'exécution\n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s : n'a pas pu envoyer le signal %d (PID : %d) : %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s : n'a pas pu trouver l'exécutable du programme\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s : n'a pas pu trouver l'exécutable postgres\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s : n'a pas pu ouvrir le gestionnaire de services\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s : le service « %s » est déjà enregistré\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, 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"
 
-#: pg_ctl.c:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s : le service « %s » n'est pas enregistré\n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, 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"
 
-#: pg_ctl.c:1564
+#: pg_ctl.c:1576
 #, 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"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "En attente du démarrage du serveur...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "Dépassement du délai pour le démarrage du serveur\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "Serveur lancé et acceptant les connexions\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, 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"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1798
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s : n'a pas pu ouvrir le jeton du processus : code d'erreur %lu\n"
 
-#: pg_ctl.c:1800
+#: pg_ctl.c:1812
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1838
 #, 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"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s :  n'a pas pu obtenir les LUID pour les droits : code d'erreur %lu\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s : n'a pas pu obtenir l'information sur le jeton : code d'erreur %lu\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s : mémoire épuisée\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -533,17 +537,17 @@ msgstr ""
 "PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, c-format
 msgid "  %s init[db]   [-D DATADIR] [-s] [-o OPTIONS]\n"
 msgstr "  %s init[db]   [-D RÉP_DONNÉES] [-s] [-o OPTIONS]\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid ""
 "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
@@ -552,12 +556,12 @@ msgstr ""
 "  %s start      [-D RÉP_DONNÉES] [-l FICHIER] [-W] [-t SECS] [-s]\n"
 "                    [-o OPTIONS] [-p CHEMIN] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr "  %s stop       [-D RÉP_DONNÉES] [-m MODE_ARRÊT] [-W] [-t SECS] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid ""
 "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
@@ -566,32 +570,32 @@ msgstr ""
 "  %s restart    [-D RÉP_DONNÉES] [-m MODE_ARRÊT] [-W] [-t SECS] [-s]\n"
 "                    [-o OPTIONS] [-c]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D RÉP_DONNÉES] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D RÉP_DONNÉES]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote    [-D RÉP_DONNÉES] [-W] [-t SECS] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D RÉP_DONNÉES] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       NOM_SIGNAL PID\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid ""
 "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
@@ -600,12 +604,12 @@ msgstr ""
 "  %s register [-D RÉP_DONNÉES] [-N NOM_SERVICE] [-U NOM_UTILISATEUR] [-P MOT_DE_PASSE]\n"
 "                  [-S TYPE_DÉMARRAGE] [-e SOURCE] [-W] [-t SECS] [-s] [-o OPTIONS]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N NOM_SERVICE]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -614,58 +618,58 @@ msgstr ""
 "\n"
 "Options générales :\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata=RÉP_DONNÉES emplacement du répertoire des données de l'instance\n"
 
-#: pg_ctl.c:1985
+#: pg_ctl.c:1997
 #, 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"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent             affiche uniquement les erreurs, aucun message\n"
 "                           d'informations\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2000
 #, 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 l'utilisation\n"
 "                           de l'option -w\n"
 
-#: pg_ctl.c:1989
+#: pg_ctl.c:2001
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            affiche la version puis quitte\n"
 
-#: pg_ctl.c:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait               attend la fin de l'opération (par défaut)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait            n'attend pas la fin de l'opération\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help               affiche cette aide puis quitte\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Si l'option -D est omise, la variable d'environnement PGDATA est utilisée.\n"
 
-#: pg_ctl.c:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid ""
 "\n"
@@ -674,22 +678,22 @@ msgstr ""
 "\n"
 "Options pour le démarrage ou le redémarrage :\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files         autorise postgres à produire des fichiers core\n"
 
-#: pg_ctl.c:1999
+#: pg_ctl.c:2011
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files         non applicable à cette plateforme\n"
 
-#: pg_ctl.c:2001
+#: pg_ctl.c:2013
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log=FICHIER        écrit (ou ajoute) le journal du serveur dans FICHIER\n"
 
-#: pg_ctl.c:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid ""
 "  -o, --options=OPTIONS  command line options to pass to postgres\n"
@@ -699,12 +703,12 @@ msgstr ""
 "                           postgres (exécutable du serveur PostgreSQL)\n"
 "                           ou à initdb\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p CHEMIN_POSTGRES       normalement pas nécessaire\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid ""
 "\n"
@@ -713,14 +717,14 @@ msgstr ""
 "\n"
 "Options pour l'arrêt ou le redémarrage :\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, 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"
 
-#: pg_ctl.c:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid ""
 "\n"
@@ -729,24 +733,24 @@ msgstr ""
 "\n"
 "Les modes d'arrêt sont :\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart      quitte après déconnexion de tous les clients\n"
 
-#: pg_ctl.c:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr "  fast       quitte directement, et arrête correctement (par défaut)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, 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 restauration au démarrage\n"
 "             suivant\n"
 
-#: pg_ctl.c:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -755,7 +759,7 @@ msgstr ""
 "\n"
 "Signaux autorisés pour kill :\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid ""
 "\n"
@@ -764,35 +768,35 @@ msgstr ""
 "\n"
 "Options d'enregistrement ou de dés-enregistrement :\n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr ""
 "  -N NOM_SERVICE           nom du service utilisé pour l'enregistrement du\n"
 "                           serveur PostgreSQL\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2031
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P MOT_DE_PASSE          mot de passe du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2032
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U NOM_UTILISATEUR       nom de l'utilisateur du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
-#: pg_ctl.c:2021
+#: pg_ctl.c:2033
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr ""
 "  -S TYPE_DÉMARRAGE        type de démarrage du service pour enregistrer le\n"
 "                           serveur PostgreSQL\n"
 
-#: pg_ctl.c:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid ""
 "\n"
@@ -801,19 +805,19 @@ msgstr ""
 "\n"
 "Les types de démarrage sont :\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, c-format
 msgid "  auto       start service automatically during system startup (default)\n"
 msgstr ""
 "  auto       démarre le service automatiquement lors du démarrage du système\n"
 "             (par défaut)\n"
 
-#: pg_ctl.c:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     démarre le service à la demande\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -822,37 +826,37 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s : mode d'arrêt non reconnu « %s »\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s : signal non reconnu « %s »\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s : type de redémarrage « %s » non reconnu\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, 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"
 
-#: pg_ctl.c:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s : le fichier de contrôle semble corrompu\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -863,32 +867,32 @@ msgstr ""
 "Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non\n"
 " privilégié) qui sera propriétaire du processus serveur.\n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s : option -S non supportée sur cette plateforme\n"
 
-#: pg_ctl.c:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s : arguments manquant pour le mode kill\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s : mode d'opération « %s » non reconnu\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
-#: pg_ctl.c:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s : aucune opération indiquée\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr ""
diff --git a/src/bin/pg_ctl/po/ko.po b/src/bin/pg_ctl/po/ko.po
index e6f6e8ccb56..a82ef54bb66 100644
--- a/src/bin/pg_ctl/po/ko.po
+++ b/src/bin/pg_ctl/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_ctl (PostgreSQL) 17\n"
+"Project-Id-Version: pg_ctl (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:49+0000\n"
-"PO-Revision-Date: 2025-01-16 14:12+0900\n"
+"POT-Creation-Date: 2025-09-11 21:49+0000\n"
+"PO-Revision-Date: 2025-09-09 12:53+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -39,33 +39,33 @@ msgstr "실행할 \"%s\" 파일을 찾을 수 없음"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "\"%s\" 경로를 절대경로로 바꿀 수 없음: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "\"%s\" 명령을 실행할 수 없음: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "\"%s\" 명령에서 읽을 수 없음: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "\"%s\" 명령이 아무런 데이터도 반환하지 않음"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "메모리 부족"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:753 ../../port/path.c:790 ../../port/path.c:807
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "메모리 부족\n"
@@ -105,84 +105,84 @@ msgstr "하위 프로세스가 종료되었음, 시그널 %d: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "하위 프로세스가 종료되었음, 알수 없는 상태 %d"
 
-#: ../../port/path.c:775
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "현재 작업 디렉터리를 알 수 없음: %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: \"%s\" 디렉터리 없음\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: \"%s\" 디렉터리에 액세스할 수 없음: %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: 지정한 \"%s\" 디렉터리는 데이터베이스 클러스트 디렉터리가 아님\n"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s: \"%s\" PID 파일을 열 수 없음: %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: \"%s\" PID 파일에 내용이 없습니다\n"
 
-#: pg_ctl.c:295
+#: pg_ctl.c:296
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: \"%s\" PID 파일이 비었음\n"
 
-#: pg_ctl.c:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s: 서버를 시작 할 수 없음: %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s: setsid() 실패로 서버를 시작 할 수 없음: %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s: \"%s\" 로그 파일을 열 수 없음: %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
 msgstr "%s: 서버를 시작할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:781
+#: pg_ctl.c:789
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: 코어 파일 크기 한도를 설정할 수 없음, 하드 디스크 용량 초과로 허용되지 않"
 "음\n"
 
-#: pg_ctl.c:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: \"%s\" 파일을 읽을 수 없음\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: \"%s\" 환경설정파일은 반드시 한 줄을 가져야한다?\n"
 
-#: pg_ctl.c:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s: stop 시그널을 보낼 수 없음 (PID: %d): %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
@@ -191,45 +191,49 @@ msgstr ""
 "\"%s\" 프로그램이 %s 작업에서 필요합니다. 그런데, 이 파일이\n"
 "\"%s\" 파일이 있는 디렉터리안에 없습니다.\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr ""
 "\"%s\" 프로그램을 \"%s\" 작업 때문에 찾았지만 이 파일은\n"
 "%s 프로그램의 버전과 다릅니다.\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: 데이터베이스 초기화 실패\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr "%s: 다른 서버가 가동 중인 것 같음; 어째든 서버 가동을 시도함\n"
 
-#: pg_ctl.c:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "서버를 시작하기 위해 기다리는 중..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " 완료\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "서버 시작됨\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " 중지 기다리는 중\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s: 서버가 제 시간에 시작되지 못했음\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "타켓 설정을 복구하기 때문에 서버 셧다운\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -238,42 +242,42 @@ msgstr ""
 "%s: 서버를 시작 할 수 없음\n"
 "로그 출력을 살펴보십시오.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "서버를 시작합니다\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: \"%s\" PID 파일이 없습니다\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "서버가 실행 중입니까?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr "%s: 서버 중지 실패; 단일 사용자 서버가 실행 중 (PID: %d)\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "서버를 멈춥니다\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "서버를 멈추기 위해 기다리는 중..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " 실패\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: 서버를 멈추지 못했음\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -281,239 +285,239 @@ msgstr ""
 "힌트: \"-m fast\" 옵션을 사용하면 접속한 세션들을 즉시 정리합니다.\n"
 "이 옵션을 사용하지 않으면 접속한 세션들 스스로 끊을 때까지 기다립니다.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "서버 멈추었음\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "어째든 서버를 시작해 봅니다\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: 서버를 다시 시작 할 수 없음; 단일사용자 서버가 실행 중임 (PID: %d)\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "단일 사용자 서버를 멈추고 다시 시도하십시오.\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s: 이전 서버 프로세스(PID: %d)가 없어졌습니다\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "어째든 서버를 시작합니다\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: 서버 환경설정을 다시 불러올 수 없음; 단일 사용자 서버가 실행 중임 (PID: "
 "%d)\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s: reload 시그널을 보낼 수 없음 (PID: %d): %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "서버가 시스템 시그널을 받았음\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr "%s: 운영서버 전환 실패; 단일사용자 서버가 실행 중(PID: %d)\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: 운영서버 전환 실패; 서버가 대기 모드로 상태가 아님\n"
 
-#: pg_ctl.c:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s: 운영전환 시그널 파일인 \"%s\" 파일을 만들 수 없음: %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s: 운영전환 시그널 파일인 \"%s\" 파일에 쓰기 실패: %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s: 운영전환 시그널을 서버(PID: %d)로 보낼 수 없음: %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s: 운영전환 시그널 파일인 \"%s\" 파일을 지울 수 없음: %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "서버를 운영 모드로 전환하는 중 ..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "운영 모드 전환 완료\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s: 서버를 제 시간에 운영 모드로 전환하지 못했음\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "서버를 운영 모드로 전환합니다\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: 서버 로그 파일을 바꿀 수 없음; 단일 사용자 서버가 실행 중임 (PID: %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr "%s: 로그 전환 시그널 파일인 \"%s\" 파일을 만들 수 없음: %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr "%s: 로그 전환 시그널 파일인 \"%s\" 파일에 쓰기 실패: %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s: 로그 전환 시그널을 보낼 수 없음 (PID: %d): %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr "%s: 로그 전환 시그널 파일인 \"%s\" 파일을 지울 수 없음: %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "서버가 로그 전환 시그널을 받았음\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s: 단일사용자 서버가 실행 중임 (PID: %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s: 서버가 실행 중임 (PID: %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: 가동 중인 서버가 없음\n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s: %d 시그널을 보낼 수 없음 (PID: %d): %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: 실행 가능한 프로그램을 찾을 수 없습니다\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: 실행 가능한 postgres 프로그램을 찾을 수 없음\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: 서비스 관리자를 열 수 없음\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: \"%s\" 서비스가 이미 등록 되어 있음\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: \"%s\" 서비스를 등록할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: \"%s\" 서비스가 등록되어 있지 않음\n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: \"%s\" 서비스를 열 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1564
+#: pg_ctl.c:1576
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: \"%s\" 서비스를 서비스 목록에서 뺄 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "서버를 시작하기 위해 기다리는 중...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "서버 시작을 기다리는 동안 시간 초과됨\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "서버가 시작되었으며 연결을 허용함\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: \"%s\" 서비스를 시작할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1798
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: 프로세스 토큰을 열 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1800
+#: pg_ctl.c:1812
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: SID를 할당할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1838
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: restricted token을 만들 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s: 접근 권한용 LUID를 구할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s: 토큰 정보를 구할 수 없음: 오류 코드 %lu\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 메모리 부족\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "보다 자세한 사용법은 \"%s --help\"\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -522,17 +526,17 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 서버를 초기화, 시작, 중지, 제어하는 도구입니다.\n"
 "\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, c-format
 msgid "  %s init[db]   [-D DATADIR] [-s] [-o OPTIONS]\n"
 msgstr "  %s init[db]   [-D 데이터디렉터리] [-s] [-o 옵션]\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid ""
 "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
@@ -541,12 +545,12 @@ msgstr ""
 "  %s start      [-D 데이터디렉터리] [-l 파일이름] [-W] [-t 초] [-s]\n"
 "                    [-o 옵션] [-p 경로] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr "  %s stop       [-D 데이터디렉터리] [-m 중지방법] [-W] [-t 초] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid ""
 "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
@@ -555,32 +559,32 @@ msgstr ""
 "  %s restart    [-D 데이터디렉터리] [-m 중지방법] [-W] [-t 초] [-s]\n"
 "                    [-o 옵션] [-c]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D 데이터디렉터리] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D 데이터디렉터리]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote    [-D 데이터디렉터리] [-W] [-t 초] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D 데이터디렉터리] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       시그널이름 PID\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid ""
 "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
@@ -591,12 +595,12 @@ msgstr ""
 "호]\n"
 "                    [-S 시작형태] [-e SOURCE] [-w] [-t 초] [-o 옵션]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N 서비스이름]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -605,56 +609,56 @@ msgstr ""
 "\n"
 "일반 옵션들:\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr ""
 "  -D, --pgdata=데이터디렉터리  데이터베이스 자료가 저장되어있는 디렉터리\n"
 
-#: pg_ctl.c:1985
+#: pg_ctl.c:1997
 #, c-format
 msgid ""
 "  -e SOURCE              event source for logging when running as a service\n"
 msgstr ""
 "  -e SOURCE              서비스가 실행 중일때 쌓을 로그를 위한 이벤트 소스\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           일반적인 메시지는 보이지 않고, 오류만 보여줌\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2000
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr "  -t, --timeout=초      -w 옵션 사용 시 대기 시간(초)\n"
 
-#: pg_ctl.c:1989
+#: pg_ctl.c:2001
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          버전 정보를 보여주고 마침\n"
 
-#: pg_ctl.c:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait             작업이 끝날 때까지 기다림 (기본값)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait          작업이 끝날 때까지 기다리지 않음\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             이 도움말을 보여주고 마침\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "-D 옵션을 사용하지 않으면, PGDATA 환경변수값을 사용함.\n"
 
-#: pg_ctl.c:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid ""
 "\n"
@@ -663,22 +667,22 @@ msgstr ""
 "\n"
 "start, restart 때 사용할 수 있는 옵션들:\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       코어 덤프 파일을 만듬\n"
 
-#: pg_ctl.c:1999
+#: pg_ctl.c:2011
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       이 플랫폼에서는 사용할 수 없음\n"
 
-#: pg_ctl.c:2001
+#: pg_ctl.c:2013
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log=로그파일     서버 로그를 이 로그파일에 기록함\n"
 
-#: pg_ctl.c:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid ""
 "  -o, --options=OPTIONS  command line options to pass to postgres\n"
@@ -687,12 +691,12 @@ msgstr ""
 "  -o, --options=옵션들   PostgreSQL 서버프로그램인 postgres나 initdb\n"
 "                         명령에서 사용할 명령행 옵션들\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p PATH-TO-POSTGRES    보통은 필요치 않음\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid ""
 "\n"
@@ -701,14 +705,14 @@ msgstr ""
 "\n"
 "stop, restart 때 사용 할 수 있는 옵션들:\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, c-format
 msgid ""
 "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m, --mode=모드        모드는 \"smart\", \"fast\", \"immediate\" 중 하나\n"
 
-#: pg_ctl.c:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid ""
 "\n"
@@ -717,18 +721,18 @@ msgstr ""
 "\n"
 "중지방법 설명:\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       모든 클라이언트의 연결이 끊기게 되면 중지 됨\n"
 
-#: pg_ctl.c:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr ""
 "  fast        클라이언트의 연결을 강제로 끊고 정상적으로 중지 됨 (기본값)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -736,7 +740,7 @@ msgid ""
 msgstr ""
 "  immediate   그냥 무조건 중지함; 다시 시작할 때 복구 작업을 할 수도 있음\n"
 
-#: pg_ctl.c:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -745,7 +749,7 @@ msgstr ""
 "\n"
 "사용할 수 있는 중지용(for kill) 시그널 이름:\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid ""
 "\n"
@@ -754,28 +758,28 @@ msgstr ""
 "\n"
 "서비스 등록/제거용 옵션들:\n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N SERVICENAME  서비스 목록에 등록될 PostgreSQL 서비스 이름\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2031
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P PASSWORD     이 서비스를 실행할 사용자의 암호\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2032
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr "  -U USERNAME     이 서비스를 실행할 사용자 이름\n"
 
-#: pg_ctl.c:2021
+#: pg_ctl.c:2033
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S 시작형태     서비스로 등록된 PostgreSQL 서버 시작 방법\n"
 
-#: pg_ctl.c:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid ""
 "\n"
@@ -784,18 +788,18 @@ msgstr ""
 "\n"
 "시작형태 설명:\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, c-format
 msgid ""
 "  auto       start service automatically during system startup (default)\n"
 msgstr "  auto       시스템이 시작되면 자동으로 서비스가 시작됨 (초기값)\n"
 
-#: pg_ctl.c:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     수동 시작\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -804,37 +808,37 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: 잘못된 중지 방법 \"%s\"\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: 잘못된 시그널 이름 \"%s\"\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: 알 수 없는 시작형태 \"%s\"\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: \"%s\" 명령에서 사용할 데이터 디렉터리를 알 수 없음\n"
 
-#: pg_ctl.c:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s: 컨트롤 파일이 깨졌음\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -845,32 +849,32 @@ msgstr ""
 "시스템관리자 권한이 없는, 서버프로세스의 소유주가 될 일반 사용자로\n"
 "로그인 해서(\"su\", \"runas\" 같은 명령 이용) 실행하십시오.\n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: -S 옵션은 이 운영체제에서는 지원하지 않음\n"
 
-#: pg_ctl.c:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: kill 작업에 필요한 인수가 빠졌습니다\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: 알 수 없는 작업 모드 \"%s\"\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: 너무 많은 명령행 인수들 (시작 \"%s\")\n"
 
-#: pg_ctl.c:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: 수행할 작업을 지정하지 않았습니다\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
diff --git a/src/bin/pg_ctl/po/ru.po b/src/bin/pg_ctl/po/ru.po
index 8f9a0a24aef..77ce8b4a9f2 100644
--- a/src/bin/pg_ctl/po/ru.po
+++ b/src/bin/pg_ctl/po/ru.po
@@ -6,13 +6,13 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_ctl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-07 06:47+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 17:07+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -46,33 +46,33 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "нехватка памяти"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:830 ../../port/path.c:867 ../../port/path.c:884
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка памяти\n"
@@ -112,131 +112,135 @@ msgstr "дочерний процесс завершён по сигналу %d:
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний процесс завершился с нераспознанным кодом состояния %d"
 
-#: ../../port/path.c:852
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "не удалось определить текущий рабочий каталог: %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: каталог \"%s\" не существует\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: ошибка при обращении к каталогу \"%s\": %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: каталог \"%s\" не содержит структуры кластера баз данных\n"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s: не удалось открыть файл PID \"%s\": %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: файл PID \"%s\" пуст\n"
 
-#: pg_ctl.c:295
+#: pg_ctl.c:296
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: неверные данные в файле PID \"%s\"\n"
 
-#: pg_ctl.c:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s: не удалось запустить сервер: %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s: не удалось запустить сервер из-за ошибки в setsid(): %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s: не удалось открыть файл протокола \"%s\": %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
 msgstr "%s: не удалось запустить сервер (код ошибки: %lu)\n"
 
-#: pg_ctl.c:781
+#: pg_ctl.c:789
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: не удалось ограничить размер дампа памяти; запрещено жёстким "
 "ограничением\n"
 
-#: pg_ctl.c:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: не удалось прочитать файл \"%s\"\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: в файле параметров \"%s\" должна быть ровно одна строка\n"
 
-#: pg_ctl.c:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s: не удалось отправить сигнал остановки (PID: %d): %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\"\n"
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\"\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: сбой при инициализации системы баз данных\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: возможно, уже работает другой сервер; всё же пробуем запустить этот "
 "сервер\n"
 
-#: pg_ctl.c:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "ожидание запуска сервера..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " готово\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "сервер запущен\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " прекращение ожидания\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s: сервер не запустился за отведённое время\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "сервер остановлен согласно заданной цели восстановления\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -245,43 +249,43 @@ msgstr ""
 "%s: не удалось запустить сервер\n"
 "Изучите протокол выполнения.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "сервер запускается\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: файл PID \"%s\" не существует\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "Запущен ли сервер?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: остановить сервер с PID %d нельзя - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "сервер останавливается\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "ожидание завершения работы сервера..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " ошибка\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: сервер не останавливается\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -289,243 +293,243 @@ msgstr ""
 "ПОДСКАЗКА: Параметр \"-m fast\" может сбросить сеансы принудительно,\n"
 "не дожидаясь, пока они завершатся сами.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "сервер остановлен\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "производится попытка запуска сервера в любом случае\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: перезапустить сервер с PID %d нельзя - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Пожалуйста, остановите его и повторите попытку.\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s: похоже, что старый серверный процесс (PID: %d) исчез\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "сервер запускается, несмотря на это\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: перезагрузить сервер с PID %d нельзя - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s: не удалось отправить сигнал перезагрузки (PID: %d): %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "сигнал отправлен серверу\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: повысить сервер с PID %d нельзя - он выполняется в монопольном режиме\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: повысить сервер нельзя - он работает не в режиме резерва\n"
 
-#: pg_ctl.c:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s: не удалось создать файл \"%s\" с сигналом к повышению: %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s: не удалось записать файл \"%s\" с сигналом к повышению: %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s: не удалось отправить сигнал к повышению (PID: %d): %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s: ошибка при удалении файла \"%s\" с сигналом к повышению: %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "ожидание повышения сервера..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "сервер повышен\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s: повышение сервера не завершилось за отведённое время\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "сервер повышается\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr ""
 "%s: не удалось прокрутить файл журнала; сервер работает в монопольном режиме "
 "(PID: %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr ""
 "%s: не удалось создать файл \"%s\" с сигналом к прокрутке журнала: %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr ""
 "%s: не удалось записать файл \"%s\" с сигналом к прокрутке журнала: %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s: не удалось отправить сигнал к прокрутке журнала (PID: %d): %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr ""
 "%s: ошибка при удалении файла \"%s\" с сигналом к прокрутке журнала: %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "сигнал для прокрутки файла журнала отправлен серверу\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s: сервер работает в монопольном режиме (PID: %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s: сервер работает (PID: %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: сервер не работает\n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s: не удалось отправить сигнал %d (PID: %d): %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: не удалось найти свой исполняемый файл\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: не удалось найти исполняемый файл postgres\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: не удалось открыть менеджер служб\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: служба \"%s\" уже зарегистрирована\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: не удалось зарегистрировать службу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: служба \"%s\" не зарегистрирована\n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: не удалось открыть службу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1564
+#: pg_ctl.c:1576
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: ошибка при удалении службы \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "Ожидание запуска сервера...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "Превышено время ожидания запуска сервера\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "Сервер запущен и принимает подключения\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: не удалось запустить службу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1798
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: не удалось открыть маркер процесса (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1800
+#: pg_ctl.c:1812
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: не удалось подготовить структуры SID (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1838
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: не удалось создать ограниченный маркер (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s: не удалось получить LUID для привилегий (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s: не удалось получить информацию о маркере (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: нехватка памяти\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -535,17 +539,17 @@ msgstr ""
 "PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, c-format
 msgid "  %s init[db]   [-D DATADIR] [-s] [-o OPTIONS]\n"
 msgstr "  %s init[db]   [-D КАТАЛОГ-ДАННЫХ] [-s] [-o ПАРАМЕТРЫ]\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid ""
 "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
@@ -554,13 +558,13 @@ msgstr ""
 "  %s start      [-D КАТАЛОГ-ДАННЫХ] [-l ИМЯ-ФАЙЛА] [-W] [-t СЕК] [-s]\n"
 "                    [-o ПАРАМЕТРЫ] [-p ПУТЬ] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr ""
 "  %s stop       [-D КАТАЛОГ-ДАННЫХ] [-m РЕЖИМ-ОСТАНОВКИ] [-W] [-t СЕК] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid ""
 "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
@@ -569,32 +573,32 @@ msgstr ""
 "  %s restart    [-D КАТАЛОГ-ДАННЫХ] [-m РЕЖИМ-ОСТАНОВКИ] [-W] [-t СЕК] [-s]\n"
 "                    [-o ПАРАМЕТРЫ] [-c]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D КАТАЛОГ-ДАННЫХ] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D КАТАЛОГ-ДАННЫХ]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote    [-D КАТАЛОГ-ДАННЫХ] [-W] [-t СЕК] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D КАТАЛОГ-ДАННЫХ] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       СИГНАЛ PID\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid ""
 "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
@@ -606,12 +610,12 @@ msgstr ""
 "                    [-S ТИП-ЗАПУСКА] [-e ИСТОЧНИК] [-W] [-t СЕК] [-s] [-o "
 "ПАРАМЕТРЫ]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N ИМЯ-СЛУЖБЫ]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -620,12 +624,12 @@ msgstr ""
 "\n"
 "Общие параметры:\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata=КАТАЛОГ   расположение хранилища баз данных\n"
 
-#: pg_ctl.c:1985
+#: pg_ctl.c:1997
 #, c-format
 msgid ""
 "  -e SOURCE              event source for logging when running as a service\n"
@@ -634,45 +638,45 @@ msgstr ""
 "журнал,\n"
 "                         когда сервер работает в виде службы\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           выводить только ошибки, без информационных "
 "сообщений\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2000
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr ""
 "  -t, --timeout=СЕК      время ожидания при использовании параметра -w\n"
 
-#: pg_ctl.c:1989
+#: pg_ctl.c:2001
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          показать версию и выйти\n"
 
-#: pg_ctl.c:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait             ждать завершения операции (по умолчанию)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait          не ждать завершения операции\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             показать эту справку и выйти\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Если параметр -D опущен, используется переменная окружения PGDATA.\n"
 
-#: pg_ctl.c:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid ""
 "\n"
@@ -681,24 +685,24 @@ msgstr ""
 "\n"
 "Параметры запуска и перезапуска:\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       указать postgres создавать дампы памяти\n"
 
-#: pg_ctl.c:1999
+#: pg_ctl.c:2011
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       неприменимо на этой платформе\n"
 
-#: pg_ctl.c:2001
+#: pg_ctl.c:2013
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log=ФАЙЛ         записывать (или добавлять) протокол сервера в "
 "ФАЙЛ.\n"
 
-#: pg_ctl.c:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid ""
 "  -o, --options=OPTIONS  command line options to pass to postgres\n"
@@ -708,12 +712,12 @@ msgstr ""
 "PostgreSQL)\n"
 "                         или initdb параметры командной строки\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p ПУТЬ-К-POSTGRES     обычно не требуется\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid ""
 "\n"
@@ -722,14 +726,14 @@ msgstr ""
 "\n"
 "Параметры остановки и перезапуска:\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, c-format
 msgid ""
 "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m, --mode=РЕЖИМ       может быть \"smart\", \"fast\" или \"immediate\"\n"
 
-#: pg_ctl.c:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid ""
 "\n"
@@ -738,17 +742,17 @@ msgstr ""
 "\n"
 "Режимы остановки:\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       закончить работу после отключения всех клиентов\n"
 
-#: pg_ctl.c:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr "  fast        закончить сразу, в штатном режиме (по умолчанию)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -757,7 +761,7 @@ msgstr ""
 "  immediate   закончить немедленно, в экстренном режиме; влечёт за собой\n"
 "              восстановление при перезапуске\n"
 
-#: pg_ctl.c:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -766,7 +770,7 @@ msgstr ""
 "\n"
 "Разрешённые сигналы для команды kill:\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid ""
 "\n"
@@ -775,30 +779,30 @@ msgstr ""
 "\n"
 "Параметры для регистрации и удаления:\n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N ИМЯ-СЛУЖБЫ   имя службы для регистрации сервера PostgreSQL\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2031
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P ПАРОЛЬ       пароль учётной записи для регистрации сервера PostgreSQL\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2032
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U ПОЛЬЗОВАТЕЛЬ имя пользователя для регистрации сервера PostgreSQL\n"
 
-#: pg_ctl.c:2021
+#: pg_ctl.c:2033
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S ТИП-ЗАПУСКА  тип запуска службы сервера PostgreSQL\n"
 
-#: pg_ctl.c:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid ""
 "\n"
@@ -807,7 +811,7 @@ msgstr ""
 "\n"
 "Типы запуска:\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, c-format
 msgid ""
 "  auto       start service automatically during system startup (default)\n"
@@ -815,12 +819,12 @@ msgstr ""
 "  auto       запускать службу автоматически при старте системы (по "
 "умолчанию)\n"
 
-#: pg_ctl.c:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     запускать службу по требованию\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -829,37 +833,37 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: неизвестный режим остановки \"%s\"\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: нераспознанное имя сигнала \"%s\"\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: нераспознанный тип запуска \"%s\"\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: не удалось определить каталог данных с помощью команды \"%s\"\n"
 
-#: pg_ctl.c:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s: управляющий файл, по-видимому, испорчен\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -870,32 +874,32 @@ msgstr ""
 "Пожалуйста, переключитесь на обычного пользователя (например,\n"
 "используя \"su\"), который будет запускать серверный процесс.\n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: параметр -S не поддерживается в этой ОС\n"
 
-#: pg_ctl.c:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: отсутствуют аргументы для режима kill\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: нераспознанный режим работы \"%s\"\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
 
-#: pg_ctl.c:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: команда не указана\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
diff --git a/src/bin/pg_ctl/po/sv.po b/src/bin/pg_ctl/po/sv.po
index ff52b8cb209..abb94046395 100644
--- a/src/bin/pg_ctl/po/sv.po
+++ b/src/bin/pg_ctl/po/sv.po
@@ -1,5 +1,5 @@
 # Swedish message translation file for pg_ctl
-# Dennis Björklund <db@zigo.dhs.org>, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 # Magnus Hagander <magnus@hagander.net>, 2010.
 # Mats Erik Andersson <bsd@gisladisker.se>, 2013, 2014.
 #
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 14:20+0000\n"
-"PO-Revision-Date: 2024-07-12 19:04+0200\n"
+"POT-Creation-Date: 2025-05-16 16:19+0000\n"
+"PO-Revision-Date: 2025-05-16 20:14+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -43,33 +43,33 @@ msgstr "kunde inte hitta en \"%s\" att köra"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "kunde inte konvertera sökvägen \"%s\" till en absolut sökväg: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "kunde inte köra kommandot \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "kunde inte läsa från kommando \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ingen data returnerades från kommandot \"%s\""
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "slut på minne"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:753 ../../port/path.c:790 ../../port/path.c:807
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "slut på minne\n"
@@ -109,123 +109,127 @@ msgstr "barnprocess terminerades av signal %d: %s"
 msgid "child process exited with unrecognized status %d"
 msgstr "barnprocess avslutade med okänd statuskod %d"
 
-#: ../../port/path.c:775
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "kunde inte fastställa nuvarande arbetskatalog: %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: katalogen \"%s\" existerar inte\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: kunde inte komma åt katalogen \"%s\": %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: katalogen \"%s\" innehåller inte något databaskluster.\n"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s: kunde inte öppna PID-fil \"%s\": %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: PID-filen \"%s\" är tom\n"
 
-#: pg_ctl.c:295
+#: pg_ctl.c:296
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: ogiltig data i PID-fil \"%s\"\n"
 
-#: pg_ctl.c:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s: kunde inte starta servern: %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s: kunde inte starta servern då setsid() misslyckades: %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s: kunde inte öppna logg-fil \"%s\": %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
 msgstr "%s: kunde inte starta servern: felkod %lu\n"
 
-#: pg_ctl.c:781
+#: pg_ctl.c:789
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr "%s: kan inte sätta storleksgränsning på core-fil; tillåts inte av hård gräns\n"
 
-#: pg_ctl.c:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: kunde inte läsa filen \"%s\"\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: inställningsfilen \"%s\" måste bestå av en enda rad.\n"
 
-#: pg_ctl.c:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s: kunde inte skicka stopp-signal (PID: %d): %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\"\n"
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\"\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: skapande av databaskluster misslyckades\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr "%s: en annan server verkar köra; försöker starta servern ändå.\n"
 
-#: pg_ctl.c:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "väntar på att servern skall starta..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " klar\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "servern startad\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " avslutade väntan\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s: servern startade inte i tid\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "servern ständes ner på grund av inställning för återställningsmål\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -234,42 +238,42 @@ msgstr ""
 "%s: kunde inte starta servern\n"
 "Undersök logg-utskriften.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "servern startar\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: PID-filen \"%s\" finns inte\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "Kör servern?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr "%s: Kan inte stanna servern. En-användar-server i drift (PID: %d).\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "servern stänger ner\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "väntar på att servern skall stänga ner..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " misslyckades\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: servern stänger inte ner\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -277,235 +281,235 @@ msgstr ""
 "TIPS: Flaggan \"-m fast\" avslutar sessioner omedelbart, i stället för att\n"
 "vänta på deras självvalda avslut.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "servern är stoppad\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "försöker starta servern ändå\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr "%s: kan inte starta om servern. En-användar-server kör (PID: %d).\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Var vänlig att stanna en-användar-servern och försök sedan igen.\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s: gamla serverprocessen (PID: %d) verkar vara borta\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "startar servern ändå\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr "%s: kan inte ladda om servern; en-användar-server kör (PID: %d)\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s: kunde inte skicka signalen \"reload\" (PID: %d): %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "servern är signalerad\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr "%s: kan inte befordra servern; en-användar-server kör (PID: %d)\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: kan inte befordra servern; servern är inte i beredskapsläge.\n"
 
-#: pg_ctl.c:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s: kunde inte skapa befordringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s: kunde inte skriva befordringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s: kunde inte skicka befordringssignal (PID: %d): %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s: kunde inte ta bort befordringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "väntar på att servern skall befordras..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "servern befordrad\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s: servern befordrades inte i tid\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "servern befordras\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr "%s: kan inte rotera loggfil; en-användar-server kör (PID: %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr "%s: kunde inte skapa loggroteringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr "%s: kunde inte skriva loggroteringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s: kunde inte skicka signalen för loggrotering (PID: %d): %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr "%s: kunde inte ta bort loggroteringssignalfil \"%s\": %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "servern är signalerad att rotera loggfil\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s: en-användar-server kör. (PID: %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s: servern kör (PID: %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: ingen server kör\n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s: kunde inte skicka signal %d (PID: %d): %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: kunde inte hitta det egna programmets körbara fil\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: kunde inte hitta körbar postgres.\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: kunde inte öppna tjänstehanteraren\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: tjänsten \"%s\" är redan registrerad\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: kunde inte registrera tjänsten \"%s\": felkod %lu\n"
 
-#: pg_ctl.c:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: tjänsten \"%s\" är inte registrerad\n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: kunde inte öppna tjänsten \"%s\": felkod %lu\n"
 
-#: pg_ctl.c:1564
+#: pg_ctl.c:1576
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: kunde inte avregistrera tjänsten \"%s\": felkod %lu\n"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "Väntar på serverstart...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "Tidsfristen ute vid väntan på serverstart\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "Server startad och accepterar nu anslutningar\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: kunde inte starta tjänsten \"%s\": felkod %lu\n"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1798
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: kunde inte öppna process-token: felkod %lu\n"
 
-#: pg_ctl.c:1800
+#: pg_ctl.c:1812
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: kunde inte tilldela SID: felkod %lu\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1838
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: kunde inte skapa restriktivt styrmärke (token): felkod %lu\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s: kunde inte hämta LUID:er för rättigheter: felkod %lu\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s: kunde inte hämta token-information: felkod %lu\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: slut på minne\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -515,17 +519,17 @@ msgstr ""
 "PostgreSQL-tjänsten.\n"
 "\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, c-format
 msgid "  %s init[db]   [-D DATADIR] [-s] [-o OPTIONS]\n"
 msgstr "  %s init[db]   [-D DATAKAT] [-s] [-o FLAGGOR]\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid ""
 "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
@@ -534,12 +538,12 @@ msgstr ""
 "  %s start      [-D DATAKAT] [-l FILNAMN] [-W] [-t SEK] [-s]\n"
 "                    [-o FLAGGOR] [-p SOKVÄG] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr "  %s stop       [-D DATAKAT] [-m STÄNGNINGSMETOD] [-W] [-t SEK] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid ""
 "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
@@ -548,32 +552,32 @@ msgstr ""
 "  %s restart    [-D DATAKAT] [-m STÄNGNINGSMETOD] [-W] [-t SEK] [-s]\n"
 "                    [-o FLAGGOR] [-c]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D DATAKAT] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D DATAKAT]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote    [-D DATAKAT] [-W] [-t SEK] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D DATAKAT] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       SIGNALNAMN PID\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid ""
 "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
@@ -582,12 +586,12 @@ msgstr ""
 "  %s register   [-D DATAKAT] [-N TJÄNSTENAMN] [-U ANVÄNDARNAMN] [-P LÖSENORD]\n"
 "                    [-S STARTTYPE] [-e KÄLLA] [-W] [-t SEK] [-s] [-o FLAGGOR]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N TJÄNSTNAMN]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -596,52 +600,52 @@ msgstr ""
 "\n"
 "Gemensamma flaggor:\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata=DATAKAT   plats för databasens lagringsarea\n"
 
-#: pg_ctl.c:1985
+#: pg_ctl.c:1997
 #, c-format
 msgid "  -e SOURCE              event source for logging when running as a service\n"
 msgstr "  -e KÄLLA               händelsekälla för loggning när vi kör som en tjänst\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr "  -s, --silent           skriv bara ut fel, inga informationsmeddelanden\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2000
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr "  -t, --timeout=SEK      antal sekunder att vänta när växeln -w används\n"
 
-#: pg_ctl.c:1989
+#: pg_ctl.c:2001
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          visa versionsinformation, avsluta sedan\n"
 
-#: pg_ctl.c:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait             vänta på att operationen slutförs (standard)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait          vänta inte på att operationen slutförs\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             visa den här hjälpen, avsluta sedan\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Om flaggan -D inte har angivits så används omgivningsvariabeln PGDATA.\n"
 
-#: pg_ctl.c:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid ""
 "\n"
@@ -650,22 +654,22 @@ msgstr ""
 "\n"
 "Flaggor för start eller omstart:\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       tillåt postgres att skapa core-filer\n"
 
-#: pg_ctl.c:1999
+#: pg_ctl.c:2011
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       inte giltig för denna plattform\n"
 
-#: pg_ctl.c:2001
+#: pg_ctl.c:2013
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log=FILNAMN      skriv, eller tillfoga, server-loggen till FILNAMN\n"
 
-#: pg_ctl.c:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid ""
 "  -o, --options=OPTIONS  command line options to pass to postgres\n"
@@ -674,14 +678,14 @@ msgstr ""
 "  -o, --options=OPTIONS  kommandoradsflaggor som skickas vidare till postgres\n"
 "                         (PostgreSQL-serverns körbara fil) eller till initdb\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr ""
 "  -p SÖKVÄG-TILL-POSTGRES\n"
 "                         behövs normalt inte\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid ""
 "\n"
@@ -690,12 +694,12 @@ msgstr ""
 "\n"
 "Flaggor för stopp eller omstart:\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m, --mode=METOD       METOD kan vara \"smart\", \"fast\" eller \"immediate\"\n"
 
-#: pg_ctl.c:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid ""
 "\n"
@@ -704,22 +708,22 @@ msgstr ""
 "\n"
 "Stängningsmetoder är:\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       stäng när alla klienter har avslutat\n"
 
-#: pg_ctl.c:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr "  fast        stäng omedelbart, med en kontrollerad nedstängning (standard)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr "  immediate   stäng utan kontroller; kommer leda till återställning vid omstart\n"
 
-#: pg_ctl.c:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +732,7 @@ msgstr ""
 "\n"
 "Tillåtna signalnamn för kommando \"kill\":\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid ""
 "\n"
@@ -737,27 +741,27 @@ msgstr ""
 "\n"
 "Flaggor för registrering och avregistrering:\n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N TJÄNSTENAMN  tjänstenamn att registrera PostgreSQL-servern med\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2031
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P LÖSENORD     lösenord för konto vid registrering av PostgreSQL-servern\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2032
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr "  -U NAMN         användarnamn för konto vid registrering av PostgreSQL-servern\n"
 
-#: pg_ctl.c:2021
+#: pg_ctl.c:2033
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S STARTSÄTT    sätt att registrera PostgreSQL-servern vid tjänstestart\n"
 
-#: pg_ctl.c:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid ""
 "\n"
@@ -766,17 +770,17 @@ msgstr ""
 "\n"
 "Startmetoder är:\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, c-format
 msgid "  auto       start service automatically during system startup (default)\n"
 msgstr "  auto       starta tjänsten automatiskt vid systemstart (förval)\n"
 
-#: pg_ctl.c:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     starta tjänsten vid behov\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -785,37 +789,37 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: ogiltig stängningsmetod \"%s\"\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: ogiltigt signalnamn \"%s\"\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: ogiltigt startvillkor \"%s\"\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: kunde inte bestämma databaskatalogen från kommandot \"%s\"\n"
 
-#: pg_ctl.c:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s: kontrollfilen verkar vara trasig\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -826,32 +830,32 @@ msgstr ""
 "Logga in (t.ex. med \"su\") som den (opriviligerade) användare\n"
 "vilken skall äga serverprocessen.\n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: flaggan -S stöds inte på denna plattform.\n"
 
-#: pg_ctl.c:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: saknar argument för \"kill\"-kommando.\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: okänd operationsmetod \"%s\"\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: för många kommandoradsargument (första är \"%s\")\n"
 
-#: pg_ctl.c:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: ingen operation angiven\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: ingen databaskatalog angiven och omgivningsvariabeln PGDATA är inte satt\n"
diff --git a/src/bin/pg_ctl/po/uk.po b/src/bin/pg_ctl/po/uk.po
index b517535543a..c2a734fe85c 100644
--- a/src/bin/pg_ctl/po/uk.po
+++ b/src/bin/pg_ctl/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:20+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:50+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_ctl.pot\n"
-"X-Crowdin-File-ID: 994\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_ctl.pot\n"
+"X-Crowdin-File-ID: 1091\n"
 
 #: ../../common/controldata_utils.c:168
 msgid "byte ordering mismatch"
@@ -41,33 +41,33 @@ msgstr "неможливо знайти \"%s\" для виконання"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не вдалося знайти абсолютний шлях \"%s\": %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не вдалося виконати команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не вдалося прочитати висновок команди \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не повернула жодних даних"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
-#: ../../port/path.c:753 ../../port/path.c:790 ../../port/path.c:807
+#: ../../port/path.c:831 ../../port/path.c:868 ../../port/path.c:885
 #, c-format
 msgid "out of memory\n"
 msgstr "недостатньо пам'яті\n"
@@ -107,676 +107,680 @@ msgstr "дочірній процес перервано через сигнал
 msgid "child process exited with unrecognized status %d"
 msgstr "дочірній процес завершився з невизнаним статусом %d"
 
-#: ../../port/path.c:775
+#: ../../port/path.c:853
 #, c-format
 msgid "could not get current working directory: %m\n"
 msgstr "не вдалося отримати поточний робочий каталог: %m\n"
 
-#: pg_ctl.c:254
+#: pg_ctl.c:255
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: директорія \"%s\" не існує\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:258
 #, c-format
 msgid "%s: could not access directory \"%s\": %m\n"
 msgstr "%s: не вдалося отримати доступ до каталогу \"%s\": %m\n"
 
-#: pg_ctl.c:270
+#: pg_ctl.c:271
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: каталог \"%s\" не є каталогом кластера бази даних\n"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:284
 #, c-format
 msgid "%s: could not open PID file \"%s\": %m\n"
 msgstr "%s: не вдалося відкрити файл PID \"%s\": %m\n"
 
-#: pg_ctl.c:292
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: файл PID \"%s\" пустий\n"
 
-#: pg_ctl.c:295
+#: pg_ctl.c:296
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: невірні дані у файлі PID \"%s\"\n"
 
-#: pg_ctl.c:457 pg_ctl.c:499
+#: pg_ctl.c:458 pg_ctl.c:500
 #, c-format
 msgid "%s: could not start server: %m\n"
 msgstr "%s: не вдалося запустити сервер: %m\n"
 
-#: pg_ctl.c:477
+#: pg_ctl.c:478
 #, c-format
 msgid "%s: could not start server due to setsid() failure: %m\n"
 msgstr "%s: не вдалося запустити сервер через помилку setsid(): %m\n"
 
-#: pg_ctl.c:547
+#: pg_ctl.c:548
 #, c-format
 msgid "%s: could not open log file \"%s\": %m\n"
 msgstr "%s: не вдалося відкрити файл журналу \"%s\": %m\n"
 
-#: pg_ctl.c:564
+#: pg_ctl.c:565
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
 msgstr "%s: не вдалося запустити сервер: код помилки %lu\n"
 
-#: pg_ctl.c:781
+#: pg_ctl.c:789
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr "%s: не вдалося встановити обмеження на розмір файлу; заборонено жорстким лімітом\n"
 
-#: pg_ctl.c:807
+#: pg_ctl.c:815
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: не вдалося прочитати файл \"%s\"\n"
 
-#: pg_ctl.c:812
+#: pg_ctl.c:820
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: файл параметрів \"%s\" повинен містити рівно один рядок\n"
 
-#: pg_ctl.c:854 pg_ctl.c:1038 pg_ctl.c:1105
+#: pg_ctl.c:862 pg_ctl.c:1050 pg_ctl.c:1117
 #, c-format
 msgid "%s: could not send stop signal (PID: %d): %m\n"
 msgstr "%s: не вдалося надіслати стоп-сигнал (PID: %d): %m\n"
 
-#: pg_ctl.c:882
+#: pg_ctl.c:890
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\"\n"
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\"\n"
 
-#: pg_ctl.c:885
+#: pg_ctl.c:893
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s\n"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s\n"
 
-#: pg_ctl.c:917
+#: pg_ctl.c:925
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: не вдалося виконати ініціалізацію системи бази даних\n"
 
-#: pg_ctl.c:932
+#: pg_ctl.c:940
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr "%s: мабуть, інший сервер вже працює; у будь-якому разі спробуємо запустити сервер\n"
 
-#: pg_ctl.c:980
+#: pg_ctl.c:988
 msgid "waiting for server to start..."
 msgstr "очікується запуск серверу..."
 
-#: pg_ctl.c:985 pg_ctl.c:1061 pg_ctl.c:1123 pg_ctl.c:1235
+#: pg_ctl.c:993 pg_ctl.c:1003 pg_ctl.c:1073 pg_ctl.c:1135 pg_ctl.c:1247
 msgid " done\n"
 msgstr " готово\n"
 
-#: pg_ctl.c:986
+#: pg_ctl.c:994
 msgid "server started\n"
 msgstr "сервер запущено\n"
 
-#: pg_ctl.c:989 pg_ctl.c:995 pg_ctl.c:1240
+#: pg_ctl.c:997 pg_ctl.c:1007 pg_ctl.c:1252
 msgid " stopped waiting\n"
 msgstr " очікування припинено\n"
 
-#: pg_ctl.c:990
+#: pg_ctl.c:998
 #, c-format
 msgid "%s: server did not start in time\n"
 msgstr "%s: сервер не було запущено вчасно\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1004
+msgid "server shut down because of recovery target settings\n"
+msgstr "сервер зупинено через налаштування цілі відновлення\n"
+
+#: pg_ctl.c:1008
 #, c-format
 msgid "%s: could not start server\n"
 "Examine the log output.\n"
 msgstr "%s: неможливо запустити сервер\n"
 "Передивіться протокол виконання.\n"
 
-#: pg_ctl.c:1004
+#: pg_ctl.c:1016
 msgid "server starting\n"
 msgstr "запуск серверу\n"
 
-#: pg_ctl.c:1023 pg_ctl.c:1081 pg_ctl.c:1144 pg_ctl.c:1183 pg_ctl.c:1264
+#: pg_ctl.c:1035 pg_ctl.c:1093 pg_ctl.c:1156 pg_ctl.c:1195 pg_ctl.c:1276
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: файл PID \"%s\" не існує\n"
 
-#: pg_ctl.c:1024 pg_ctl.c:1083 pg_ctl.c:1145 pg_ctl.c:1184 pg_ctl.c:1265
+#: pg_ctl.c:1036 pg_ctl.c:1095 pg_ctl.c:1157 pg_ctl.c:1196 pg_ctl.c:1277
 msgid "Is server running?\n"
 msgstr "Сервер працює?\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1042
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %d)\n"
 msgstr "%s: не можливо зупинити сервер; сервер запущений в режимі single-user (PID: %d)\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1056
 msgid "server shutting down\n"
 msgstr "сервер зупиняється\n"
 
-#: pg_ctl.c:1049 pg_ctl.c:1109
+#: pg_ctl.c:1061 pg_ctl.c:1121
 msgid "waiting for server to shut down..."
 msgstr "очікується зупинка серверу..."
 
-#: pg_ctl.c:1053 pg_ctl.c:1114
+#: pg_ctl.c:1065 pg_ctl.c:1126
 msgid " failed\n"
 msgstr " помилка\n"
 
-#: pg_ctl.c:1055 pg_ctl.c:1116
+#: pg_ctl.c:1067 pg_ctl.c:1128
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: сервер не зупинено\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1118
+#: pg_ctl.c:1069 pg_ctl.c:1130
 msgid "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
 msgstr "ПІДКАЗКА: Режим \"-m fast\" закриває сесії відразу, не чекаючи на відключення ініційовані сесіями.\n"
 
-#: pg_ctl.c:1063 pg_ctl.c:1124
+#: pg_ctl.c:1075 pg_ctl.c:1136
 msgid "server stopped\n"
 msgstr "сервер зупинено\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1096
 msgid "trying to start server anyway\n"
 msgstr "спроба запуску серверу в будь-якому разі\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1105
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %d)\n"
 msgstr "%s: не можливо перезапустити сервер; сервер запущений в режимі single-user (PID: %d)\n"
 
-#: pg_ctl.c:1096 pg_ctl.c:1154
+#: pg_ctl.c:1108 pg_ctl.c:1166
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Будь ласка, припиніть однокористувацький сервер та спробуйте ще раз.\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1140
 #, c-format
 msgid "%s: old server process (PID: %d) seems to be gone\n"
 msgstr "%s: старий серверний процес (PID: %d), здається, зник\n"
 
-#: pg_ctl.c:1130
+#: pg_ctl.c:1142
 msgid "starting server anyway\n"
 msgstr "запуск серверу в будь-якому разі\n"
 
-#: pg_ctl.c:1151
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %d)\n"
 msgstr "%s: не можливо перезапустити сервер; сервер запущений в режимі single-user (PID: %d)\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1172
 #, c-format
 msgid "%s: could not send reload signal (PID: %d): %m\n"
 msgstr "%s: не можливо надіслати сигнал перезавантаження (PID: %d): %m\n"
 
-#: pg_ctl.c:1165
+#: pg_ctl.c:1177
 msgid "server signaled\n"
 msgstr "серверу надіслано сигнал\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1202
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %d)\n"
 msgstr "%s: неможливо підвищити сервер; сервер запущено в режимі single-user (PID: %d)\n"
 
-#: pg_ctl.c:1198
+#: pg_ctl.c:1210
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: неможливо підвищити сервер; сервер запущено не в режимі резерву\n"
 
-#: pg_ctl.c:1208
+#: pg_ctl.c:1220
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %m\n"
 msgstr "%s: неможливо створити файл \"%s\" із сигналом для підвищення: %m\n"
 
-#: pg_ctl.c:1214
+#: pg_ctl.c:1226
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %m\n"
 msgstr "%s: неможливо записати файл \"%s\" із сигналом для підвищення: %m\n"
 
-#: pg_ctl.c:1222
+#: pg_ctl.c:1234
 #, c-format
 msgid "%s: could not send promote signal (PID: %d): %m\n"
 msgstr "%s: неможливо надіслати сигнал підвищення (PID: %d): %m\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1237
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %m\n"
 msgstr "%s: неможливо видалити файл \"%s\" із сигналом для підвищення: %m\n"
 
-#: pg_ctl.c:1232
+#: pg_ctl.c:1244
 msgid "waiting for server to promote..."
 msgstr "очікується підвищення серверу..."
 
-#: pg_ctl.c:1236
+#: pg_ctl.c:1248
 msgid "server promoted\n"
 msgstr "сервер підвищено\n"
 
-#: pg_ctl.c:1241
+#: pg_ctl.c:1253
 #, c-format
 msgid "%s: server did not promote in time\n"
 msgstr "%s: сервер не було підвищено вчасно\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1259
 msgid "server promoting\n"
 msgstr "сервер підвищується\n"
 
-#: pg_ctl.c:1271
+#: pg_ctl.c:1283
 #, c-format
 msgid "%s: cannot rotate log file; single-user server is running (PID: %d)\n"
 msgstr "%s: не можливо розвернути файл журналу; сервер працює в режимі одного користувача (PID: %d)\n"
 
-#: pg_ctl.c:1281
+#: pg_ctl.c:1293
 #, c-format
 msgid "%s: could not create log rotation signal file \"%s\": %m\n"
 msgstr "%s: не вдалося створити файл сигналу розвороту журналу \"%s\": %m\n"
 
-#: pg_ctl.c:1287
+#: pg_ctl.c:1299
 #, c-format
 msgid "%s: could not write log rotation signal file \"%s\": %m\n"
 msgstr "%s: не вдалося записати у файл сигналу розвороту журналу \"%s\": %m\n"
 
-#: pg_ctl.c:1295
+#: pg_ctl.c:1307
 #, c-format
 msgid "%s: could not send log rotation signal (PID: %d): %m\n"
 msgstr "%s: не вдалося надіслати сигнал розвороту журналу (PID: %d): %m\n"
 
-#: pg_ctl.c:1298
+#: pg_ctl.c:1310
 #, c-format
 msgid "%s: could not remove log rotation signal file \"%s\": %m\n"
 msgstr "%s: не вдалося видалити файл сигналу розвороту журналу \"%s\": %m\n"
 
-#: pg_ctl.c:1303
+#: pg_ctl.c:1315
 msgid "server signaled to rotate log file\n"
 msgstr "серверу надіслано сигнал для розворот файлу журналу\n"
 
-#: pg_ctl.c:1350
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: single-user server is running (PID: %d)\n"
 msgstr "%s: однокористувацький сервер працює (PID: %d)\n"
 
-#: pg_ctl.c:1364
+#: pg_ctl.c:1376
 #, c-format
 msgid "%s: server is running (PID: %d)\n"
 msgstr "%s: сервер працює (PID: %d)\n"
 
-#: pg_ctl.c:1380
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: сервер не працює \n"
 
-#: pg_ctl.c:1397
+#: pg_ctl.c:1409
 #, c-format
 msgid "%s: could not send signal %d (PID: %d): %m\n"
 msgstr "%s: не вдалося надіслати сигнал %d (PID: %d): %m\n"
 
-#: pg_ctl.c:1428
+#: pg_ctl.c:1440
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: не вдалося знайти ехе файл власної програми\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1450
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: не вдалося знайти виконану програму postgres\n"
 
-#: pg_ctl.c:1508 pg_ctl.c:1542
+#: pg_ctl.c:1520 pg_ctl.c:1554
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: не вдалося відкрити менеджер служб\n"
 
-#: pg_ctl.c:1514
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: служба \"%s\" вже зареєстрована \n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1537
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: не вдалося зареєструвати службу \"%s\": код помилки %lu\n"
 
-#: pg_ctl.c:1548
+#: pg_ctl.c:1560
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: служба \"%s\" не зареєстрована \n"
 
-#: pg_ctl.c:1555
+#: pg_ctl.c:1567
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: не вдалося відкрити службу \"%s\": код помилки %lu\n"
 
-#: pg_ctl.c:1564
+#: pg_ctl.c:1576
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: не вдалося видалити службу \"%s\": код помилки %lu\n"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1663
 msgid "Waiting for server startup...\n"
 msgstr "Очікування запуску сервера...\n"
 
-#: pg_ctl.c:1654
+#: pg_ctl.c:1666
 msgid "Timed out waiting for server startup\n"
 msgstr "Перевищено час очікування запуску сервера\n"
 
-#: pg_ctl.c:1658
+#: pg_ctl.c:1670
 msgid "Server started and accepting connections\n"
 msgstr "Сервер запущений і приймає з'єднання\n"
 
-#: pg_ctl.c:1713
+#: pg_ctl.c:1725
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: не вдалося почати службу \"%s\": код помилки %lu\n"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1798
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: не вдалося відкрити токен процесу: код помилки %lu\n"
 
-#: pg_ctl.c:1800
+#: pg_ctl.c:1812
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: не вдалося виділити SID: код помилки %lu\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1838
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: не вдалося створити обмежений токен: код помилки %lu\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:1920
 #, c-format
 msgid "%s: could not get LUIDs for privileges: error code %lu\n"
 msgstr "%s: не вдалося отримати LUIDs для прав: код помилки %lu\n"
 
-#: pg_ctl.c:1916 pg_ctl.c:1931
+#: pg_ctl.c:1928 pg_ctl.c:1943
 #, c-format
 msgid "%s: could not get token information: error code %lu\n"
 msgstr "%s: не вдалося отримати інформацію токену: код помилки %lu\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:1937
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: бракує пам'яті\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:1967
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:1975
 #, c-format
 msgid "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n\n"
 msgstr "%s - це утиліта для ініціалізації, запуску, зупинки і контролю серверу PostgreSQL.\n\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:1976
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_ctl.c:1965
+#: pg_ctl.c:1977
 #, c-format
 msgid "  %s init[db]   [-D DATADIR] [-s] [-o OPTIONS]\n"
 msgstr "  %s init[db]   [-D КАТАЛОГ-ДАНИХ] [-s] [-o ПАРАМЕТРИ]\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:1978
 #, c-format
 msgid "  %s start      [-D DATADIR] [-l FILENAME] [-W] [-t SECS] [-s]\n"
 "                    [-o OPTIONS] [-p PATH] [-c]\n"
 msgstr "  %s start [-D КАТАЛОГ-ДАНИХ] [-l ІМ'Я-ФАЙЛ] [-W] [-t СЕК] [-s]\n"
 "                    [-o ПАРАМЕТРИ] [-p ШЛЯХ] [-c]\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:1980
 #, c-format
 msgid "  %s stop       [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 msgstr "  %s stop [-D КАТАЛОГ-ДАНИХ] [-m РЕЖИМ-ЗУПИНКИ] [-W] [-t СЕК] [-s]\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:1981
 #, c-format
 msgid "  %s restart    [-D DATADIR] [-m SHUTDOWN-MODE] [-W] [-t SECS] [-s]\n"
 "                    [-o OPTIONS] [-c]\n"
 msgstr "  %s restart [-D КАТАЛОГ-ДАНИХ] [-m РЕЖИМ-ЗУПИНКИ] [-W] [-t СЕК] [-s]\n"
 "                    [-o ПАРАМЕТРИ] [-c]\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:1983
 #, c-format
 msgid "  %s reload     [-D DATADIR] [-s]\n"
 msgstr "  %s reload [-D КАТАЛОГ-ДАНИХ] [-s]\n"
 
-#: pg_ctl.c:1972
+#: pg_ctl.c:1984
 #, c-format
 msgid "  %s status     [-D DATADIR]\n"
 msgstr "  %s status     [-D DATADIR]\n"
 
-#: pg_ctl.c:1973
+#: pg_ctl.c:1985
 #, c-format
 msgid "  %s promote    [-D DATADIR] [-W] [-t SECS] [-s]\n"
 msgstr "  %s promote [-D КАТАЛОГ-ДАНИХ] [-W] [-t СЕК] [-s]\n"
 
-#: pg_ctl.c:1974
+#: pg_ctl.c:1986
 #, c-format
 msgid "  %s logrotate  [-D DATADIR] [-s]\n"
 msgstr "  %s logrotate  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:1987
 #, c-format
 msgid "  %s kill       SIGNALNAME PID\n"
 msgstr "  %s kill       ІМ'Я-СИГНАЛУ PID\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:1989
 #, c-format
 msgid "  %s register   [-D DATADIR] [-N SERVICENAME] [-U USERNAME] [-P PASSWORD]\n"
 "                    [-S START-TYPE] [-e SOURCE] [-W] [-t SECS] [-s] [-o OPTIONS]\n"
 msgstr "  %s register [-D КАТАЛОГ-ДАНИХ] [-N ІМ'Я-СЛУЖБИ] [-U ІМ'Я-КОРИСТУВАЧА] [-P ПАРОЛЬ]\n"
 "                  [-S ТИП-ЗАПУСКУ] [-e ДЖЕРЕЛО] [-W] [-t СЕК] [-s] [-o ПАРАМЕТРИ]\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:1991
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N ІМ'Я-СЛУЖБИ]\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:1994
 #, c-format
 msgid "\n"
 "Common options:\n"
 msgstr "\n"
 "Загальні параметри:\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:1995
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata=КАТАЛОГ-ДАНИХ    розташування простору зберігання бази даних\n"
 
-#: pg_ctl.c:1985
+#: pg_ctl.c:1997
 #, c-format
 msgid "  -e SOURCE              event source for logging when running as a service\n"
 msgstr "  -e ДЖЕРЕЛО             джерело подій для протоколу при запуску в якості послуги\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:1999
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr "  -s, --silent         виводити лише помилки, без інформаційних повідомлень\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2000
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr "  -t, --timeout=СЕК   час очікування при використанні -w параметра\n"
 
-#: pg_ctl.c:1989
+#: pg_ctl.c:2001
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: pg_ctl.c:1990
+#: pg_ctl.c:2002
 #, c-format
 msgid "  -w, --wait             wait until operation completes (default)\n"
 msgstr "  -w, --wait         чекати завершення операції (за замовчуванням)\n"
 
-#: pg_ctl.c:1991
+#: pg_ctl.c:2003
 #, c-format
 msgid "  -W, --no-wait          do not wait until operation completes\n"
 msgstr "  -W, --no-wait     не чекати завершення операції\n"
 
-#: pg_ctl.c:1992
+#: pg_ctl.c:2004
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help              показати цю довідку потім вийти\n"
 
-#: pg_ctl.c:1993
+#: pg_ctl.c:2005
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Якщо -D параметр пропущено, використовувати змінну середовища PGDATA.\n"
 
-#: pg_ctl.c:1995
+#: pg_ctl.c:2007
 #, c-format
 msgid "\n"
 "Options for start or restart:\n"
 msgstr "\n"
 "Параметри запуску або перезапуску:\n"
 
-#: pg_ctl.c:1997
+#: pg_ctl.c:2009
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files   дозволяти postgres створювати дампи пам'яті\n"
 
-#: pg_ctl.c:1999
+#: pg_ctl.c:2011
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files      недопустимо цією платформою\n"
 
-#: pg_ctl.c:2001
+#: pg_ctl.c:2013
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log=ФАЙЛ     записувати (або додавати) протокол служби до ФАЙЛ\n"
 
-#: pg_ctl.c:2002
+#: pg_ctl.c:2014
 #, c-format
 msgid "  -o, --options=OPTIONS  command line options to pass to postgres\n"
 "                         (PostgreSQL server executable) or initdb\n"
 msgstr "  -o, --options=ПАРАМЕТРИ параметри командного рядку для PostgreSQL або initdb\n"
 
-#: pg_ctl.c:2004
+#: pg_ctl.c:2016
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p ШЛЯХ-ДО-СЕРВЕРУ   зазвичай зайвий\n"
 
-#: pg_ctl.c:2005
+#: pg_ctl.c:2017
 #, c-format
 msgid "\n"
 "Options for stop or restart:\n"
 msgstr "\n"
 "Параметри припинення або перезапуску:\n"
 
-#: pg_ctl.c:2006
+#: pg_ctl.c:2018
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m, --mode=РЕЖИМ    РЕЖИМ може бути \"smart\", \"fast\", або \"immediate\"\n"
 
-#: pg_ctl.c:2008
+#: pg_ctl.c:2020
 #, c-format
 msgid "\n"
 "Shutdown modes are:\n"
 msgstr "\n"
 "Режими зупинки:\n"
 
-#: pg_ctl.c:2009
+#: pg_ctl.c:2021
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       вийти після від'єднання усіх клієнтів\n"
 
-#: pg_ctl.c:2010
+#: pg_ctl.c:2022
 #, c-format
 msgid "  fast        quit directly, with proper shutdown (default)\n"
 msgstr "  fast        вийти негайно з коректним вимкненням (за замовченням)\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2023
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr "  immediate   вийти негайно без повної процедури. Приведе до відновлення під час перезапуску\n"
 
-#: pg_ctl.c:2013
+#: pg_ctl.c:2025
 #, c-format
 msgid "\n"
 "Allowed signal names for kill:\n"
 msgstr "\n"
 "Дозволенні сигнали для команди kill:\n"
 
-#: pg_ctl.c:2017
+#: pg_ctl.c:2029
 #, c-format
 msgid "\n"
 "Options for register and unregister:\n"
 msgstr "\n"
 "Параметри для реєстрації і видалення: \n"
 
-#: pg_ctl.c:2018
+#: pg_ctl.c:2030
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N ІМ'Я-СЛУЖБИ  ім'я служби під яким зареєструвати сервер PostgreSQL\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2031
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P ПАРОЛЬ     пароль облікового запису для реєстрації серверу PostgreSQL\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2032
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr "  -U КОРИСТУВАЧ     ім'я користувача під яким зареєструвати сервер PostgreSQL\n"
 
-#: pg_ctl.c:2021
+#: pg_ctl.c:2033
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S ТИП-ЗАПУСКУ   тип запуску служби для реєстрації серверу PostgreSQL\n"
 
-#: pg_ctl.c:2023
+#: pg_ctl.c:2035
 #, c-format
 msgid "\n"
 "Start types are:\n"
 msgstr "\n"
 "Типи запуску:\n"
 
-#: pg_ctl.c:2024
+#: pg_ctl.c:2036
 #, c-format
 msgid "  auto       start service automatically during system startup (default)\n"
 msgstr "  auto       запускати сервер автоматично під час запуску системи (за замовчуванням)\n"
 
-#: pg_ctl.c:2025
+#: pg_ctl.c:2037
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     запускати сервер за потреби\n"
 
-#: pg_ctl.c:2028
+#: pg_ctl.c:2040
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_ctl.c:2029
+#: pg_ctl.c:2041
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: pg_ctl.c:2054
+#: pg_ctl.c:2066
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: невідомий режим завершення \"%s\"\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2095
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: невідомий сигнал \"%s\"\n"
 
-#: pg_ctl.c:2100
+#: pg_ctl.c:2112
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: невідомий тип запуску \"%s\"\n"
 
-#: pg_ctl.c:2156
+#: pg_ctl.c:2168
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: неможливо визначити каталог даних за допомогою команди \"%s\"\n"
 
-#: pg_ctl.c:2179
+#: pg_ctl.c:2191
 #, c-format
 msgid "%s: control file appears to be corrupt\n"
 msgstr "%s: контрольний файл видається пошкодженим\n"
 
-#: pg_ctl.c:2247
+#: pg_ctl.c:2259
 #, c-format
 msgid "%s: cannot be run as root\n"
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
@@ -785,32 +789,32 @@ msgstr "%s: не може бути запущеним від ім'я супер-
 " Будь ласка увійдіть (використовуючи наприклад, \"su\") як (непривілейований) користувач який буде мати\n"
 "свій серверний процес. \n"
 
-#: pg_ctl.c:2319
+#: pg_ctl.c:2331
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: параметр -S не підтримується цією платформою\n"
 
-#: pg_ctl.c:2375
+#: pg_ctl.c:2387
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: відсутні аргументи для режиму kill\n"
 
-#: pg_ctl.c:2393
+#: pg_ctl.c:2405
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: невідомий режим роботи \"%s\"\n"
 
-#: pg_ctl.c:2402
+#: pg_ctl.c:2414
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: забагато аргументів у командному рядку (перший \"%s\")\n"
 
-#: pg_ctl.c:2409
+#: pg_ctl.c:2421
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: команда не вказана\n"
 
-#: pg_ctl.c:2430
+#: pg_ctl.c:2442
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: не вказано каталог даних і змінна середовища PGDATA не встановлена\n"
diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl
index f3665c8f386..12a2dc51c6e 100644
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -1,5 +1,5 @@
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 use strict;
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 01523ae6a55..c3e9103d2c9 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/pg_dump/Makefile
 #
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index c544f378c97..142c39a03e5 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -18,6 +18,7 @@
 
 #include <ctype.h>
 
+#include "catalog/pg_am_d.h"
 #include "catalog/pg_class_d.h"
 #include "catalog/pg_collation_d.h"
 #include "catalog/pg_extension_d.h"
@@ -953,6 +954,24 @@ findOprByOid(Oid oid)
 	return (OprInfo *) dobj;
 }
 
+/*
+ * findAccessMethodByOid
+ *	  finds the DumpableObject for the access method with the given oid
+ *	  returns NULL if not found
+ */
+AccessMethodInfo *
+findAccessMethodByOid(Oid oid)
+{
+	CatalogId	catId;
+	DumpableObject *dobj;
+
+	catId.tableoid = AccessMethodRelationId;
+	catId.oid = oid;
+	dobj = findObjectByCatalogId(catId);
+	Assert(dobj == NULL || dobj->objType == DO_ACCESS_METHOD);
+	return (AccessMethodInfo *) dobj;
+}
+
 /*
  * findCollationByOid
  *	  finds the DumpableObject for the collation with the given oid
diff --git a/src/bin/pg_dump/compress_gzip.c b/src/bin/pg_dump/compress_gzip.c
index 5a30ebf9bf5..be31209f811 100644
--- a/src/bin/pg_dump/compress_gzip.c
+++ b/src/bin/pg_dump/compress_gzip.c
@@ -20,6 +20,15 @@
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 
+/*
+ * We don't use the gzgetc() macro, because zlib's configuration logic is not
+ * robust enough to guarantee that the macro will have the same ideas about
+ * struct field layout as the library itself does; see for example
+ * https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=59711
+ * Instead, #undef the macro and fall back to the underlying function.
+ */
+#undef gzgetc
+
 /*----------------------
  * Compressor API
  *----------------------
@@ -251,34 +260,53 @@ InitCompressorGzip(CompressorState *cs,
  *----------------------
  */
 
-static bool
-Gzip_read(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH)
+static size_t
+Gzip_read(void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	gzFile		gzfp = (gzFile) CFH->private_data;
 	int			gzret;
 
+	/* Reading zero bytes must be a no-op */
+	if (size == 0)
+		return 0;
+
 	gzret = gzread(gzfp, ptr, size);
-	if (gzret <= 0 && !gzeof(gzfp))
+
+	/*
+	 * gzread returns zero on EOF as well as some error conditions, and less
+	 * than zero on other error conditions, so we need to inspect for EOF on
+	 * zero.
+	 */
+	if (gzret <= 0)
 	{
 		int			errnum;
-		const char *errmsg = gzerror(gzfp, &errnum);
+		const char *errmsg;
+
+		if (gzret == 0 && gzeof(gzfp))
+			return 0;
+
+		errmsg = gzerror(gzfp, &errnum);
 
 		pg_fatal("could not read from input file: %s",
 				 errnum == Z_ERRNO ? strerror(errno) : errmsg);
 	}
 
-	if (rsize)
-		*rsize = (size_t) gzret;
-
-	return true;
+	return (size_t) gzret;
 }
 
-static bool
+static void
 Gzip_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	gzFile		gzfp = (gzFile) CFH->private_data;
+	int			errnum;
+	const char *errmsg;
 
-	return gzwrite(gzfp, ptr, size) > 0;
+	if (gzwrite(gzfp, ptr, size) != size)
+	{
+		errmsg = gzerror(gzfp, &errnum);
+		pg_fatal("could not write to file: %s",
+				 errnum == Z_ERRNO ? strerror(errno) : errmsg);
+	}
 }
 
 static int
diff --git a/src/bin/pg_dump/compress_io.c b/src/bin/pg_dump/compress_io.c
index 946e9664dfd..9307b060684 100644
--- a/src/bin/pg_dump/compress_io.c
+++ b/src/bin/pg_dump/compress_io.c
@@ -269,6 +269,7 @@ InitDiscoverCompressFileHandle(const char *path, const char *mode)
 	}
 
 	CFH = InitCompressFileHandle(compression_spec);
+	errno = 0;
 	if (!CFH->open_func(fname, -1, mode, CFH))
 	{
 		free_keep_errno(CFH);
@@ -289,6 +290,7 @@ EndCompressFileHandle(CompressFileHandle *CFH)
 {
 	bool		ret = false;
 
+	errno = 0;
 	if (CFH->private_data)
 		ret = CFH->close_func(CFH);
 
diff --git a/src/bin/pg_dump/compress_io.h b/src/bin/pg_dump/compress_io.h
index db9b38744c8..25a7bf0904d 100644
--- a/src/bin/pg_dump/compress_io.h
+++ b/src/bin/pg_dump/compress_io.h
@@ -123,21 +123,22 @@ struct CompressFileHandle
 									CompressFileHandle *CFH);
 
 	/*
-	 * Read 'size' bytes of data from the file and store them into 'ptr'.
-	 * Optionally it will store the number of bytes read in 'rsize'.
+	 * Read up to 'size' bytes of data from the file and store them into
+	 * 'ptr'.
 	 *
-	 * Returns true on success and throws an internal error otherwise.
+	 * Returns number of bytes read (this might be less than 'size' if EOF was
+	 * reached).  Exits via pg_fatal for all error conditions.
 	 */
-	bool		(*read_func) (void *ptr, size_t size, size_t *rsize,
+	size_t		(*read_func) (void *ptr, size_t size,
 							  CompressFileHandle *CFH);
 
 	/*
 	 * Write 'size' bytes of data into the file from 'ptr'.
 	 *
-	 * Returns true on success and false on error.
+	 * Returns nothing, exits via pg_fatal for all error conditions.
 	 */
-	bool		(*write_func) (const void *ptr, size_t size,
-							   struct CompressFileHandle *CFH);
+	void		(*write_func) (const void *ptr, size_t size,
+							   CompressFileHandle *CFH);
 
 	/*
 	 * Read at most size - 1 characters from the compress file handle into
diff --git a/src/bin/pg_dump/compress_lz4.c b/src/bin/pg_dump/compress_lz4.c
index 17641dcb7aa..93233ff3eb2 100644
--- a/src/bin/pg_dump/compress_lz4.c
+++ b/src/bin/pg_dump/compress_lz4.c
@@ -12,6 +12,7 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres_fe.h"
+#include <unistd.h>
 
 #include "compress_lz4.h"
 #include "pg_backup_utils.h"
@@ -358,7 +359,6 @@ LZ4Stream_init(LZ4State *state, int size, bool compressing)
 		return true;
 
 	state->compressing = compressing;
-	state->inited = true;
 
 	/* When compressing, write LZ4 header to the output stream. */
 	if (state->compressing)
@@ -367,6 +367,7 @@ LZ4Stream_init(LZ4State *state, int size, bool compressing)
 		if (!LZ4State_compression_init(state))
 			return false;
 
+		errno = 0;
 		if (fwrite(state->buffer, 1, state->compressedlen, state->fp) != state->compressedlen)
 		{
 			errno = (errno) ? errno : ENOSPC;
@@ -390,6 +391,7 @@ LZ4Stream_init(LZ4State *state, int size, bool compressing)
 		state->overflowlen = 0;
 	}
 
+	state->inited = true;
 	return true;
 }
 
@@ -457,7 +459,11 @@ LZ4Stream_read_internal(LZ4State *state, void *ptr, int ptrsize, bool eol_flag)
 
 	/* Lazy init */
 	if (!LZ4Stream_init(state, size, false /* decompressing */ ))
+	{
+		pg_log_error("unable to initialize LZ4 library: %s",
+					 LZ4F_getErrorName(state->errcode));
 		return -1;
+	}
 
 	/* No work needs to be done for a zero-sized output buffer */
 	if (size <= 0)
@@ -484,7 +490,10 @@ LZ4Stream_read_internal(LZ4State *state, void *ptr, int ptrsize, bool eol_flag)
 
 		rsize = fread(readbuf, 1, size, state->fp);
 		if (rsize < size && !feof(state->fp))
+		{
+			pg_log_error("could not read from input file: %m");
 			return -1;
+		}
 
 		rp = (char *) readbuf;
 		rend = (char *) readbuf + rsize;
@@ -501,6 +510,8 @@ LZ4Stream_read_internal(LZ4State *state, void *ptr, int ptrsize, bool eol_flag)
 			if (LZ4F_isError(status))
 			{
 				state->errcode = status;
+				pg_log_error("could not read from input file: %s",
+							 LZ4F_getErrorName(state->errcode));
 				return -1;
 			}
 
@@ -558,7 +569,7 @@ LZ4Stream_read_internal(LZ4State *state, void *ptr, int ptrsize, bool eol_flag)
 /*
  * Compress size bytes from ptr and write them to the stream.
  */
-static bool
+static void
 LZ4Stream_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	LZ4State   *state = (LZ4State *) CFH->private_data;
@@ -567,7 +578,8 @@ LZ4Stream_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 
 	/* Lazy init */
 	if (!LZ4Stream_init(state, size, true))
-		return false;
+		pg_fatal("unable to initialize LZ4 library: %s",
+				 LZ4F_getErrorName(state->errcode));
 
 	while (remaining > 0)
 	{
@@ -578,28 +590,24 @@ LZ4Stream_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 		status = LZ4F_compressUpdate(state->ctx, state->buffer, state->buflen,
 									 ptr, chunk, NULL);
 		if (LZ4F_isError(status))
-		{
-			state->errcode = status;
-			return false;
-		}
+			pg_fatal("error during writing: %s", LZ4F_getErrorName(status));
 
+		errno = 0;
 		if (fwrite(state->buffer, 1, status, state->fp) != status)
 		{
 			errno = (errno) ? errno : ENOSPC;
-			return false;
+			pg_fatal("error during writing: %m");
 		}
 
 		ptr = ((const char *) ptr) + chunk;
 	}
-
-	return true;
 }
 
 /*
  * fread() equivalent implementation for LZ4 compressed files.
  */
-static bool
-LZ4Stream_read(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH)
+static size_t
+LZ4Stream_read(void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	LZ4State   *state = (LZ4State *) CFH->private_data;
 	int			ret;
@@ -607,10 +615,7 @@ LZ4Stream_read(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH)
 	if ((ret = LZ4Stream_read_internal(state, ptr, size, false)) < 0)
 		pg_fatal("could not read from input file: %s", LZ4Stream_get_error(CFH));
 
-	if (rsize)
-		*rsize = (size_t) ret;
-
-	return true;
+	return (size_t) ret;
 }
 
 /*
@@ -643,11 +648,13 @@ LZ4Stream_gets(char *ptr, int size, CompressFileHandle *CFH)
 	int			ret;
 
 	ret = LZ4Stream_read_internal(state, ptr, size - 1, true);
-	if (ret < 0 || (ret == 0 && !LZ4Stream_eof(CFH)))
-		pg_fatal("could not read from input file: %s", LZ4Stream_get_error(CFH));
 
-	/* Done reading */
-	if (ret == 0)
+	/*
+	 * LZ4Stream_read_internal returning 0 or -1 means that it was either an
+	 * EOF or an error, but gets_func is defined to return NULL in either case
+	 * so we can treat both the same here.
+	 */
+	if (ret <= 0)
 		return NULL;
 
 	/*
@@ -669,6 +676,8 @@ LZ4Stream_close(CompressFileHandle *CFH)
 	FILE	   *fp;
 	LZ4State   *state = (LZ4State *) CFH->private_data;
 	size_t		status;
+	int			ret;
+	bool		success = true;
 
 	fp = state->fp;
 	if (state->inited)
@@ -677,25 +686,39 @@ LZ4Stream_close(CompressFileHandle *CFH)
 		{
 			status = LZ4F_compressEnd(state->ctx, state->buffer, state->buflen, NULL);
 			if (LZ4F_isError(status))
-				pg_fatal("could not end compression: %s",
-						 LZ4F_getErrorName(status));
-			else if (fwrite(state->buffer, 1, status, state->fp) != status)
 			{
-				errno = (errno) ? errno : ENOSPC;
-				WRITE_ERROR_EXIT;
+				pg_log_error("could not end compression: %s",
+							 LZ4F_getErrorName(status));
+				success = false;
+			}
+			else
+			{
+				errno = 0;
+				if (fwrite(state->buffer, 1, status, state->fp) != status)
+				{
+					errno = (errno) ? errno : ENOSPC;
+					pg_log_error("could not write to output file: %m");
+					success = false;
+				}
 			}
 
 			status = LZ4F_freeCompressionContext(state->ctx);
 			if (LZ4F_isError(status))
-				pg_fatal("could not end compression: %s",
-						 LZ4F_getErrorName(status));
+			{
+				pg_log_error("could not end compression: %s",
+							 LZ4F_getErrorName(status));
+				success = false;
+			}
 		}
 		else
 		{
 			status = LZ4F_freeDecompressionContext(state->dtx);
 			if (LZ4F_isError(status))
-				pg_fatal("could not end decompression: %s",
-						 LZ4F_getErrorName(status));
+			{
+				pg_log_error("could not end decompression: %s",
+							 LZ4F_getErrorName(status));
+				success = false;
+			}
 			pg_free(state->overflowbuf);
 		}
 
@@ -703,29 +726,35 @@ LZ4Stream_close(CompressFileHandle *CFH)
 	}
 
 	pg_free(state);
+	CFH->private_data = NULL;
 
-	return fclose(fp) == 0;
+	errno = 0;
+	ret = fclose(fp);
+	if (ret != 0)
+	{
+		pg_log_error("could not close file: %m");
+		success = false;
+	}
+
+	return success;
 }
 
 static bool
 LZ4Stream_open(const char *path, int fd, const char *mode,
 			   CompressFileHandle *CFH)
 {
-	FILE	   *fp;
 	LZ4State   *state = (LZ4State *) CFH->private_data;
 
 	if (fd >= 0)
-		fp = fdopen(fd, mode);
+		state->fp = fdopen(dup(fd), mode);
 	else
-		fp = fopen(path, mode);
-	if (fp == NULL)
+		state->fp = fopen(path, mode);
+	if (state->fp == NULL)
 	{
 		state->errcode = errno;
 		return false;
 	}
 
-	state->fp = fp;
-
 	return true;
 }
 
diff --git a/src/bin/pg_dump/compress_none.c b/src/bin/pg_dump/compress_none.c
index 3fc89c99854..4abb2e95abc 100644
--- a/src/bin/pg_dump/compress_none.c
+++ b/src/bin/pg_dump/compress_none.c
@@ -83,35 +83,31 @@ InitCompressorNone(CompressorState *cs,
  * Private routines
  */
 
-static bool
-read_none(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH)
+static size_t
+read_none(void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	FILE	   *fp = (FILE *) CFH->private_data;
 	size_t		ret;
 
-	if (size == 0)
-		return true;
-
 	ret = fread(ptr, 1, size, fp);
-	if (ret != size && !feof(fp))
+	if (ferror(fp))
 		pg_fatal("could not read from input file: %m");
 
-	if (rsize)
-		*rsize = ret;
-
-	return true;
+	return ret;
 }
 
-static bool
+static void
 write_none(const void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	size_t		ret;
 
+	errno = 0;
 	ret = fwrite(ptr, 1, size, (FILE *) CFH->private_data);
 	if (ret != size)
-		return false;
-
-	return true;
+	{
+		errno = (errno) ? errno : ENOSPC;
+		pg_fatal("could not write to file: %m");
+	}
 }
 
 static const char *
@@ -153,7 +149,12 @@ close_none(CompressFileHandle *CFH)
 	CFH->private_data = NULL;
 
 	if (fp)
+	{
+		errno = 0;
 		ret = fclose(fp);
+		if (ret != 0)
+			pg_log_error("could not close file: %m");
+	}
 
 	return ret == 0;
 }
diff --git a/src/bin/pg_dump/compress_zstd.c b/src/bin/pg_dump/compress_zstd.c
index 33ab37de956..3c90ee127e7 100644
--- a/src/bin/pg_dump/compress_zstd.c
+++ b/src/bin/pg_dump/compress_zstd.c
@@ -13,6 +13,7 @@
  */
 
 #include "postgres_fe.h"
+#include <unistd.h>
 
 #include "compress_zstd.h"
 #include "pg_backup_utils.h"
@@ -258,8 +259,8 @@ InitCompressorZstd(CompressorState *cs,
  * Compressed stream API
  */
 
-static bool
-Zstd_read(void *ptr, size_t size, size_t *rdsize, CompressFileHandle *CFH)
+static size_t
+Zstd_read_internal(void *ptr, size_t size, CompressFileHandle *CFH, bool exit_on_error)
 {
 	ZstdCompressorState *zstdcs = (ZstdCompressorState *) CFH->private_data;
 	ZSTD_inBuffer *input = &zstdcs->input;
@@ -268,6 +269,22 @@ Zstd_read(void *ptr, size_t size, size_t *rdsize, CompressFileHandle *CFH)
 	size_t		res,
 				cnt;
 
+	/*
+	 * If this is the first call to the reading function, initialize the
+	 * required datastructures.
+	 */
+	if (zstdcs->dstream == NULL)
+	{
+		zstdcs->input.src = pg_malloc0(input_allocated_size);
+		zstdcs->dstream = ZSTD_createDStream();
+		if (zstdcs->dstream == NULL)
+		{
+			if (exit_on_error)
+				pg_fatal("could not initialize compression library");
+			return -1;
+		}
+	}
+
 	output->size = size;
 	output->dst = ptr;
 	output->pos = 0;
@@ -292,6 +309,13 @@ Zstd_read(void *ptr, size_t size, size_t *rdsize, CompressFileHandle *CFH)
 		if (input->pos == input->size)
 		{
 			cnt = fread(unconstify(void *, input->src), 1, input_allocated_size, zstdcs->fp);
+			if (ferror(zstdcs->fp))
+			{
+				if (exit_on_error)
+					pg_fatal("could not read from input file: %m");
+				return -1;
+			}
+
 			input->size = cnt;
 
 			Assert(cnt <= input_allocated_size);
@@ -307,7 +331,11 @@ Zstd_read(void *ptr, size_t size, size_t *rdsize, CompressFileHandle *CFH)
 			res = ZSTD_decompressStream(zstdcs->dstream, output, input);
 
 			if (ZSTD_isError(res))
-				pg_fatal("could not decompress data: %s", ZSTD_getErrorName(res));
+			{
+				if (exit_on_error)
+					pg_fatal("could not decompress data: %s", ZSTD_getErrorName(res));
+				return -1;
+			}
 
 			if (output->pos == output->size)
 				break;			/* No more room for output */
@@ -320,13 +348,10 @@ Zstd_read(void *ptr, size_t size, size_t *rdsize, CompressFileHandle *CFH)
 			break;				/* We read all the data that fits */
 	}
 
-	if (rdsize != NULL)
-		*rdsize = output->pos;
-
-	return true;
+	return output->pos;
 }
 
-static bool
+static void
 Zstd_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 {
 	ZstdCompressorState *zstdcs = (ZstdCompressorState *) CFH->private_data;
@@ -339,41 +364,40 @@ Zstd_write(const void *ptr, size_t size, CompressFileHandle *CFH)
 	input->size = size;
 	input->pos = 0;
 
+	if (zstdcs->cstream == NULL)
+	{
+		zstdcs->output.size = ZSTD_CStreamOutSize();
+		zstdcs->output.dst = pg_malloc0(zstdcs->output.size);
+		zstdcs->cstream = _ZstdCStreamParams(CFH->compression_spec);
+		if (zstdcs->cstream == NULL)
+			pg_fatal("could not initialize compression library");
+	}
+
 	/* Consume all input, to be flushed later */
 	while (input->pos != input->size)
 	{
 		output->pos = 0;
 		res = ZSTD_compressStream2(zstdcs->cstream, output, input, ZSTD_e_continue);
 		if (ZSTD_isError(res))
-		{
-			zstdcs->zstderror = ZSTD_getErrorName(res);
-			return false;
-		}
+			pg_fatal("could not write to file: %s", ZSTD_getErrorName(res));
 
+		errno = 0;
 		cnt = fwrite(output->dst, 1, output->pos, zstdcs->fp);
 		if (cnt != output->pos)
 		{
-			zstdcs->zstderror = strerror(errno);
-			return false;
+			errno = (errno) ? errno : ENOSPC;
+			pg_fatal("could not write to file: %m");
 		}
 	}
-
-	return size;
 }
 
 static int
 Zstd_getc(CompressFileHandle *CFH)
 {
-	ZstdCompressorState *zstdcs = (ZstdCompressorState *) CFH->private_data;
-	int			ret;
+	unsigned char ret;
 
-	if (CFH->read_func(&ret, 1, NULL, CFH) != 1)
-	{
-		if (feof(zstdcs->fp))
-			pg_fatal("could not read from input file: end of file");
-		else
-			pg_fatal("could not read from input file: %m");
-	}
+	if (CFH->read_func(&ret, 1, CFH) != 1)
+		pg_fatal("could not read from input file: end of file");
 	return ret;
 }
 
@@ -390,11 +414,7 @@ Zstd_gets(char *buf, int len, CompressFileHandle *CFH)
 	 */
 	for (i = 0; i < len - 1; ++i)
 	{
-		size_t		readsz;
-
-		if (!CFH->read_func(&buf[i], 1, &readsz, CFH))
-			break;
-		if (readsz != 1)
+		if (Zstd_read_internal(&buf[i], 1, CFH, false) != 1)
 			break;
 		if (buf[i] == '\n')
 		{
@@ -406,10 +426,17 @@ Zstd_gets(char *buf, int len, CompressFileHandle *CFH)
 	return i > 0 ? buf : NULL;
 }
 
+static size_t
+Zstd_read(void *ptr, size_t size, CompressFileHandle *CFH)
+{
+	return Zstd_read_internal(ptr, size, CFH, true);
+}
+
 static bool
 Zstd_close(CompressFileHandle *CFH)
 {
 	ZstdCompressorState *zstdcs = (ZstdCompressorState *) CFH->private_data;
+	bool		success = true;
 
 	if (zstdcs->cstream)
 	{
@@ -426,14 +453,18 @@ Zstd_close(CompressFileHandle *CFH)
 			if (ZSTD_isError(res))
 			{
 				zstdcs->zstderror = ZSTD_getErrorName(res);
-				return false;
+				success = false;
+				break;
 			}
 
+			errno = 0;
 			cnt = fwrite(output->dst, 1, output->pos, zstdcs->fp);
 			if (cnt != output->pos)
 			{
+				errno = (errno) ? errno : ENOSPC;
 				zstdcs->zstderror = strerror(errno);
-				return false;
+				success = false;
+				break;
 			}
 
 			if (res == 0)
@@ -450,11 +481,16 @@ Zstd_close(CompressFileHandle *CFH)
 		pg_free(unconstify(void *, zstdcs->input.src));
 	}
 
+	errno = 0;
 	if (fclose(zstdcs->fp) != 0)
-		return false;
+	{
+		zstdcs->zstderror = strerror(errno);
+		success = false;
+	}
 
 	pg_free(zstdcs);
-	return true;
+	CFH->private_data = NULL;
+	return success;
 }
 
 static bool
@@ -472,35 +508,33 @@ Zstd_open(const char *path, int fd, const char *mode,
 	FILE	   *fp;
 	ZstdCompressorState *zstdcs;
 
+	/*
+	 * Clear state storage to avoid having the fd point to non-NULL memory on
+	 * error return.
+	 */
+	CFH->private_data = NULL;
+
+	zstdcs = (ZstdCompressorState *) pg_malloc_extended(sizeof(*zstdcs),
+														MCXT_ALLOC_NO_OOM | MCXT_ALLOC_ZERO);
+	if (!zstdcs)
+	{
+		errno = ENOMEM;
+		return false;
+	}
+
 	if (fd >= 0)
-		fp = fdopen(fd, mode);
+		fp = fdopen(dup(fd), mode);
 	else
 		fp = fopen(path, mode);
 
 	if (fp == NULL)
+	{
+		pg_free(zstdcs);
 		return false;
+	}
 
-	zstdcs = (ZstdCompressorState *) pg_malloc0(sizeof(*zstdcs));
-	CFH->private_data = zstdcs;
 	zstdcs->fp = fp;
-
-	if (mode[0] == 'r')
-	{
-		zstdcs->input.src = pg_malloc0(ZSTD_DStreamInSize());
-		zstdcs->dstream = ZSTD_createDStream();
-		if (zstdcs->dstream == NULL)
-			pg_fatal("could not initialize compression library");
-	}
-	else if (mode[0] == 'w' || mode[0] == 'a')
-	{
-		zstdcs->output.size = ZSTD_CStreamOutSize();
-		zstdcs->output.dst = pg_malloc0(zstdcs->output.size);
-		zstdcs->cstream = _ZstdCStreamParams(CFH->compression_spec);
-		if (zstdcs->cstream == NULL)
-			pg_fatal("could not initialize compression library");
-	}
-	else
-		pg_fatal("unhandled mode \"%s\"", mode);
+	CFH->private_data = zstdcs;
 
 	return true;
 }
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index fd6e4dd79ad..db681dbf7c2 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/pg_dump/dumputils.c
  *
@@ -22,6 +22,7 @@
 #include "dumputils.h"
 #include "fe_utils/string_utils.h"
 
+static const char restrict_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
 static bool parseAclItem(const char *item, const char *type,
 						 const char *name, const char *subname, int remoteVersion,
@@ -32,6 +33,43 @@ static void AddAcl(PQExpBuffer aclbuf, const char *keyword,
 				   const char *subname);
 
 
+/*
+ * Sanitize a string to be included in an SQL comment or TOC listing, by
+ * replacing any newlines with spaces.  This ensures each logical output line
+ * is in fact one physical output line, to prevent corruption of the dump
+ * (which could, in the worst case, present an SQL injection vulnerability
+ * if someone were to incautiously load a dump containing objects with
+ * maliciously crafted names).
+ *
+ * The result is a freshly malloc'd string.  If the input string is NULL,
+ * return a malloc'ed empty string, unless want_hyphen, in which case return a
+ * malloc'ed hyphen.
+ *
+ * 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.
+ */
+char *
+sanitize_line(const char *str, bool want_hyphen)
+{
+	char	   *result;
+	char	   *s;
+
+	if (!str)
+		return pg_strdup(want_hyphen ? "-" : "");
+
+	result = pg_strdup(str);
+
+	for (s = result; *s != '\0'; s++)
+	{
+		if (*s == '\n' || *s == '\r')
+			*s = ' ';
+	}
+
+	return result;
+}
+
+
 /*
  * Build GRANT/REVOKE command(s) for an object.
  *
@@ -695,6 +733,7 @@ bool
 variable_is_guc_list_quote(const char *name)
 {
 	if (pg_strcasecmp(name, "local_preload_libraries") == 0 ||
+		pg_strcasecmp(name, "oauth_validator_libraries") == 0 ||
 		pg_strcasecmp(name, "search_path") == 0 ||
 		pg_strcasecmp(name, "session_preload_libraries") == 0 ||
 		pg_strcasecmp(name, "shared_preload_libraries") == 0 ||
@@ -923,3 +962,40 @@ create_or_open_dir(const char *dirname)
 			pg_fatal("directory \"%s\" is not empty", dirname);
 	}
 }
+
+/*
+ * Generates a valid restrict key (i.e., an alphanumeric string) for use with
+ * psql's \restrict and \unrestrict meta-commands.  For safety, the value is
+ * chosen at random.
+ */
+char *
+generate_restrict_key(void)
+{
+	uint8		buf[64];
+	char	   *ret = palloc(sizeof(buf));
+
+	if (!pg_strong_random(buf, sizeof(buf)))
+		return NULL;
+
+	for (int i = 0; i < sizeof(buf) - 1; i++)
+	{
+		uint8		idx = buf[i] % strlen(restrict_chars);
+
+		ret[i] = restrict_chars[idx];
+	}
+	ret[sizeof(buf) - 1] = '\0';
+
+	return ret;
+}
+
+/*
+ * Checks that a given restrict key (intended for use with psql's \restrict and
+ * \unrestrict meta-commands) contains only alphanumeric characters.
+ */
+bool
+valid_restrict_key(const char *restrict_key)
+{
+	return restrict_key != NULL &&
+		restrict_key[0] != '\0' &&
+		strspn(restrict_key, restrict_chars) == strlen(restrict_key);
+}
diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h
index 91c6e612e28..10f6e27c0a0 100644
--- a/src/bin/pg_dump/dumputils.h
+++ b/src/bin/pg_dump/dumputils.h
@@ -36,6 +36,7 @@
 #endif
 
 
+extern char *sanitize_line(const char *str, bool want_hyphen);
 extern bool buildACLCommands(const char *name, const char *subname, const char *nspname,
 							 const char *type, const char *acls, const char *baseacls,
 							 const char *owner, const char *prefix, int remoteVersion,
@@ -64,4 +65,7 @@ extern void makeAlterConfigCommand(PGconn *conn, const char *configitem,
 								   PQExpBuffer buf);
 extern void create_or_open_dir(const char *dirname);
 
+extern char *generate_restrict_key(void);
+extern bool valid_restrict_key(const char *restrict_key);
+
 #endif							/* DUMPUTILS_H */
diff --git a/src/bin/pg_dump/filter.c b/src/bin/pg_dump/filter.c
index 7214d514137..e3cdcf40975 100644
--- a/src/bin/pg_dump/filter.c
+++ b/src/bin/pg_dump/filter.c
@@ -171,9 +171,8 @@ pg_log_filter_error(FilterStateData *fstate, const char *fmt,...)
 /*
  * filter_get_keyword - read the next filter keyword from buffer
  *
- * Search for keywords (limited to ascii alphabetic characters) in
- * the passed in line buffer. Returns NULL when the buffer is empty or the first
- * char is not alpha. The char '_' is allowed, except as the first character.
+ * Search for keywords (strings of non-whitespace characters) in the passed
+ * in line buffer. Returns NULL when the buffer is empty or no keyword exists.
  * The length of the found keyword is returned in the size parameter.
  */
 static const char *
@@ -182,6 +181,9 @@ filter_get_keyword(const char **line, int *size)
 	const char *ptr = *line;
 	const char *result = NULL;
 
+	/* The passed buffer must not be NULL */
+	Assert(*line != NULL);
+
 	/* Set returned length preemptively in case no keyword is found */
 	*size = 0;
 
@@ -189,11 +191,12 @@ filter_get_keyword(const char **line, int *size)
 	while (isspace((unsigned char) *ptr))
 		ptr++;
 
-	if (isalpha((unsigned char) *ptr))
+	/* Grab one keyword that's the string of non-whitespace characters */
+	if (*ptr != '\0' && !isspace((unsigned char) *ptr))
 	{
 		result = ptr++;
 
-		while (isalpha((unsigned char) *ptr) || *ptr == '_')
+		while (*ptr != '\0' && !isspace((unsigned char) *ptr))
 			ptr++;
 
 		*size = ptr - result;
diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build
index d8e9e101254..25989e8f16b 100644
--- a/src/bin/pg_dump/meson.build
+++ b/src/bin/pg_dump/meson.build
@@ -102,7 +102,6 @@ tests += {
       't/003_pg_dump_with_server.pl',
       't/004_pg_dump_parallel.pl',
       't/005_pg_dump_filterfile.pl',
-      't/006_pg_dumpall.pl',
       't/010_dump_connstr.pl',
     ],
   },
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 5974d6706fd..086adcdc502 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -333,16 +333,6 @@ on_exit_close_archive(Archive *AHX)
 	on_exit_nicely(archive_close_connection, &shutdown_info);
 }
 
-/*
- * When pg_restore restores multiple databases, then update already added entry
- * into array for cleanup.
- */
-void
-replace_on_exit_close_archive(Archive *AHX)
-{
-	shutdown_info.AHX = AHX;
-}
-
 /*
  * on_exit_nicely handler for shutting down database connections and
  * worker processes cleanly.
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index af0007fb6d2..d9041dad720 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -163,6 +163,8 @@ typedef struct _restoreOptions
 	bool		dumpSchema;
 	bool		dumpData;
 	bool		dumpStatistics;
+
+	char	   *restrict_key;
 } RestoreOptions;
 
 typedef struct _dumpOptions
@@ -213,6 +215,8 @@ typedef struct _dumpOptions
 	bool		dumpSchema;
 	bool		dumpData;
 	bool		dumpStatistics;
+
+	char	   *restrict_key;
 } DumpOptions;
 
 /*
@@ -308,7 +312,7 @@ extern void SetArchiveOptions(Archive *AH, DumpOptions *dopt, RestoreOptions *ro
 
 extern void ProcessArchiveRestoreOptions(Archive *AHX);
 
-extern void RestoreArchive(Archive *AHX, bool append_data);
+extern void RestoreArchive(Archive *AHX);
 
 /* Open an existing archive */
 extern Archive *OpenArchive(const char *FileSpec, const ArchiveFormat fmt);
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index e2e19d91810..9ad9eeb6bad 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2000, Philip Warner
  *	Rights are granted to use this software in any way so long
  *	as this notice is not removed.
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *	The author is not responsible for loss or damages that may
  *	result from its use.
@@ -43,6 +43,7 @@
 #include "pg_backup_archiver.h"
 #include "pg_backup_db.h"
 #include "pg_backup_utils.h"
+#include "pgtar.h"
 
 #define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
 #define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
@@ -58,7 +59,6 @@ static ArchiveHandle *_allocAH(const char *FileSpec, const ArchiveFormat fmt,
 							   DataDirSyncMethod sync_method);
 static void _getObjectDescription(PQExpBuffer buf, const TocEntry *te);
 static void _printTocEntry(ArchiveHandle *AH, TocEntry *te, const char *pfx);
-static char *sanitize_line(const char *str, bool want_hyphen);
 static void _doSetFixedOutputState(ArchiveHandle *AH);
 static void _doSetSessionAuth(ArchiveHandle *AH, const char *user);
 static void _reconnectToDB(ArchiveHandle *AH, const char *dbname);
@@ -86,7 +86,7 @@ static int	RestoringToDB(ArchiveHandle *AH);
 static void dump_lo_buf(ArchiveHandle *AH);
 static void dumpTimestamp(ArchiveHandle *AH, const char *msg, time_t tim);
 static void SetOutput(ArchiveHandle *AH, const char *filename,
-					  const pg_compress_specification compression_spec, bool append_data);
+					  const pg_compress_specification compression_spec);
 static CompressFileHandle *SaveOutput(ArchiveHandle *AH);
 static void RestoreOutput(ArchiveHandle *AH, CompressFileHandle *savedOutput);
 
@@ -197,6 +197,7 @@ dumpOptionsFromRestoreOptions(RestoreOptions *ropt)
 	dopt->include_everything = ropt->include_everything;
 	dopt->enable_row_security = ropt->enable_row_security;
 	dopt->sequence_data = ropt->sequence_data;
+	dopt->restrict_key = ropt->restrict_key ? pg_strdup(ropt->restrict_key) : NULL;
 
 	return dopt;
 }
@@ -338,14 +339,9 @@ ProcessArchiveRestoreOptions(Archive *AHX)
 		StrictNamesCheck(ropt);
 }
 
-/*
- * RestoreArchive
- *
- * If append_data is set, then append data into file as we are restoring dump
- * of multiple databases which was taken by pg_dumpall.
- */
+/* Public */
 void
-RestoreArchive(Archive *AHX, bool append_data)
+RestoreArchive(Archive *AHX)
 {
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
 	RestoreOptions *ropt = AH->public.ropt;
@@ -461,10 +457,21 @@ RestoreArchive(Archive *AHX, bool append_data)
 	 */
 	sav = SaveOutput(AH);
 	if (ropt->filename || ropt->compression_spec.algorithm != PG_COMPRESSION_NONE)
-		SetOutput(AH, ropt->filename, ropt->compression_spec, append_data);
+		SetOutput(AH, ropt->filename, ropt->compression_spec);
 
 	ahprintf(AH, "--\n-- PostgreSQL database dump\n--\n\n");
 
+	/*
+	 * If generating plain-text output, enter restricted mode to block any
+	 * unexpected psql meta-commands.  A malicious source might try to inject
+	 * a variety of things via bogus responses to queries.  While we cannot
+	 * prevent such sources from affecting the destination at restore time, we
+	 * can block psql meta-commands so that the client machine that runs psql
+	 * with the dump output remains unaffected.
+	 */
+	if (ropt->restrict_key)
+		ahprintf(AH, "\\restrict %s\n\n", ropt->restrict_key);
+
 	if (AH->archiveRemoteVersion)
 		ahprintf(AH, "-- Dumped from database version %s\n",
 				 AH->archiveRemoteVersion);
@@ -805,6 +812,14 @@ RestoreArchive(Archive *AHX, bool append_data)
 
 	ahprintf(AH, "--\n-- PostgreSQL database dump complete\n--\n\n");
 
+	/*
+	 * If generating plain-text output, exit restricted mode at the very end
+	 * of the script. This is not pro forma; in particular, pg_dumpall
+	 * requires this when transitioning from one database to another.
+	 */
+	if (ropt->restrict_key)
+		ahprintf(AH, "\\unrestrict %s\n\n", ropt->restrict_key);
+
 	/*
 	 * Clean up & we're done.
 	 */
@@ -1300,7 +1315,7 @@ PrintTOCSummary(Archive *AHX)
 
 	sav = SaveOutput(AH);
 	if (ropt->filename)
-		SetOutput(AH, ropt->filename, out_compression_spec, false);
+		SetOutput(AH, ropt->filename, out_compression_spec);
 
 	if (strftime(stamp_str, sizeof(stamp_str), PGDUMP_STRFTIME_FMT,
 				 localtime(&AH->createDate)) == 0)
@@ -1679,8 +1694,7 @@ archprintf(Archive *AH, const char *fmt,...)
 
 static void
 SetOutput(ArchiveHandle *AH, const char *filename,
-		  const pg_compress_specification compression_spec,
-		  bool append_data)
+		  const pg_compress_specification compression_spec)
 {
 	CompressFileHandle *CFH;
 	const char *mode;
@@ -1700,7 +1714,7 @@ SetOutput(ArchiveHandle *AH, const char *filename,
 	else
 		fn = fileno(stdout);
 
-	if (append_data || AH->mode == archModeAppend)
+	if (AH->mode == archModeAppend)
 		mode = PG_BINARY_A;
 	else
 		mode = PG_BINARY_W;
@@ -1868,8 +1882,8 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
 	{
 		CompressFileHandle *CFH = (CompressFileHandle *) AH->OF;
 
-		if (CFH->write_func(ptr, size * nmemb, CFH))
-			bytes_written = size * nmemb;
+		CFH->write_func(ptr, size * nmemb, CFH);
+		bytes_written = size * nmemb;
 	}
 
 	if (bytes_written != size * nmemb)
@@ -2336,7 +2350,7 @@ _discoverArchiveFormat(ArchiveHandle *AH)
 		}
 
 		if (!isValidTarHeader(AH->lookahead))
-			pg_fatal("input file does not appear to be a valid archive");
+			pg_fatal("input file does not appear to be a valid tar archive");
 
 		AH->format = archTar;
 	}
@@ -3020,6 +3034,25 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 		 strcmp(te->desc, "ROW SECURITY") == 0))
 		return 0;
 
+	/*
+	 * If it's a comment on a policy, a publication, or a subscription, maybe
+	 * ignore it.
+	 */
+	if (strcmp(te->desc, "COMMENT") == 0)
+	{
+		if (ropt->no_policies &&
+			strncmp(te->tag, "POLICY", strlen("POLICY")) == 0)
+			return 0;
+
+		if (ropt->no_publications &&
+			strncmp(te->tag, "PUBLICATION", strlen("PUBLICATION")) == 0)
+			return 0;
+
+		if (ropt->no_subscriptions &&
+			strncmp(te->tag, "SUBSCRIPTION", strlen("SUBSCRIPTION")) == 0)
+			return 0;
+	}
+
 	/*
 	 * If it's a publication or a table part of a publication, maybe ignore
 	 * it.
@@ -3034,6 +3067,21 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 	if (ropt->no_security_labels && strcmp(te->desc, "SECURITY LABEL") == 0)
 		return 0;
 
+	/*
+	 * If it's a security label on a publication or a subscription, maybe
+	 * ignore it.
+	 */
+	if (strcmp(te->desc, "SECURITY LABEL") == 0)
+	{
+		if (ropt->no_publications &&
+			strncmp(te->tag, "PUBLICATION", strlen("PUBLICATION")) == 0)
+			return 0;
+
+		if (ropt->no_subscriptions &&
+			strncmp(te->tag, "SUBSCRIPTION", strlen("SUBSCRIPTION")) == 0)
+			return 0;
+	}
+
 	/* If it's a subscription, maybe ignore it */
 	if (ropt->no_subscriptions && strcmp(te->desc, "SUBSCRIPTION") == 0)
 		return 0;
@@ -3278,12 +3326,14 @@ _tocEntryRestorePass(TocEntry *te)
 		return RESTORE_PASS_POST_ACL;
 
 	/*
-	 * Comments need to be emitted in the same pass as their parent objects.
-	 * ACLs haven't got comments, and neither do matview data objects, but
-	 * event triggers do.  (Fortunately, event triggers haven't got ACLs, or
-	 * we'd need yet another weird special case.)
+	 * Comments and security labels need to be emitted in the same pass as
+	 * their parent objects. ACLs haven't got comments and security labels,
+	 * and neither do matview data objects, but event triggers do.
+	 * (Fortunately, event triggers haven't got ACLs, or we'd need yet another
+	 * weird special case.)
 	 */
-	if (strcmp(te->desc, "COMMENT") == 0 &&
+	if ((strcmp(te->desc, "COMMENT") == 0 ||
+		 strcmp(te->desc, "SECURITY LABEL") == 0) &&
 		strncmp(te->tag, "EVENT TRIGGER ", 14) == 0)
 		return RESTORE_PASS_POST_ACL;
 
@@ -3448,11 +3498,21 @@ _reconnectToDB(ArchiveHandle *AH, const char *dbname)
 	else
 	{
 		PQExpBufferData connectbuf;
+		RestoreOptions *ropt = AH->public.ropt;
+
+		/*
+		 * We must temporarily exit restricted mode for \connect, etc.
+		 * Anything added between this line and the following \restrict must
+		 * be careful to avoid any possible meta-command injection vectors.
+		 */
+		ahprintf(AH, "\\unrestrict %s\n", ropt->restrict_key);
 
 		initPQExpBuffer(&connectbuf);
 		appendPsqlMetaConnect(&connectbuf, dbname);
-		ahprintf(AH, "%s\n", connectbuf.data);
+		ahprintf(AH, "%s", connectbuf.data);
 		termPQExpBuffer(&connectbuf);
+
+		ahprintf(AH, "\\restrict %s\n\n", ropt->restrict_key);
 	}
 
 	/*
@@ -4045,42 +4105,6 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, const char *pfx)
 	}
 }
 
-/*
- * Sanitize a string to be included in an SQL comment or TOC listing, by
- * replacing any newlines with spaces.  This ensures each logical output line
- * is in fact one physical output line, to prevent corruption of the dump
- * (which could, in the worst case, present an SQL injection vulnerability
- * if someone were to incautiously load a dump containing objects with
- * maliciously crafted names).
- *
- * The result is a freshly malloc'd string.  If the input string is NULL,
- * return a malloc'ed empty string, unless want_hyphen, in which case return a
- * malloc'ed hyphen.
- *
- * 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.
- */
-static char *
-sanitize_line(const char *str, bool want_hyphen)
-{
-	char	   *result;
-	char	   *s;
-
-	if (!str)
-		return pg_strdup(want_hyphen ? "-" : "");
-
-	result = pg_strdup(str);
-
-	for (s = result; *s != '\0'; s++)
-	{
-		if (*s == '\n' || *s == '\r')
-			*s = ' ';
-	}
-
-	return result;
-}
-
 /*
  * Write the file header for a custom-format archive
  */
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 365073b3eae..c01d450697f 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -394,7 +394,6 @@ struct _tocEntry
 
 extern int	parallel_restore(ArchiveHandle *AH, TocEntry *te);
 extern void on_exit_close_archive(Archive *AHX);
-extern void replace_on_exit_close_archive(Archive *AHX);
 
 extern void warn_or_exit_horribly(ArchiveHandle *AH, const char *fmt,...) pg_attribute_printf(2, 3);
 
@@ -465,8 +464,6 @@ extern void InitArchiveFmt_Null(ArchiveHandle *AH);
 extern void InitArchiveFmt_Directory(ArchiveHandle *AH);
 extern void InitArchiveFmt_Tar(ArchiveHandle *AH);
 
-extern bool isValidTarHeader(char *header);
-
 extern void ReconnectToServer(ArchiveHandle *AH, const char *dbname);
 extern void IssueCommandPerBlob(ArchiveHandle *AH, TocEntry *te,
 								const char *cmdBegin, const char *cmdEnd);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index bc2a2fb4797..94d401d8a4e 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -316,15 +316,9 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
 	lclContext *ctx = (lclContext *) AH->formatData;
 	CompressFileHandle *CFH = ctx->dataFH;
 
-	errno = 0;
-	if (dLen > 0 && !CFH->write_func(data, dLen, CFH))
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		pg_fatal("could not write to output file: %s",
-				 CFH->get_error_func(CFH));
-	}
+	if (dLen <= 0)
+		return;
+	CFH->write_func(data, dLen, CFH);
 }
 
 /*
@@ -351,7 +345,7 @@ _EndData(ArchiveHandle *AH, TocEntry *te)
 static void
 _PrintFileData(ArchiveHandle *AH, char *filename)
 {
-	size_t		cnt = 0;
+	size_t		cnt;
 	char	   *buf;
 	size_t		buflen;
 	CompressFileHandle *CFH;
@@ -366,7 +360,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename)
 	buflen = DEFAULT_IO_BUFFER_SIZE;
 	buf = pg_malloc(buflen);
 
-	while (CFH->read_func(buf, buflen, &cnt, CFH) && cnt > 0)
+	while ((cnt = CFH->read_func(buf, buflen, CFH)) > 0)
 	{
 		ahwrite(buf, 1, cnt, AH);
 	}
@@ -470,16 +464,7 @@ _WriteByte(ArchiveHandle *AH, const int i)
 	lclContext *ctx = (lclContext *) AH->formatData;
 	CompressFileHandle *CFH = ctx->dataFH;
 
-	errno = 0;
-	if (!CFH->write_func(&c, 1, CFH))
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		pg_fatal("could not write to output file: %s",
-				 CFH->get_error_func(CFH));
-	}
-
+	CFH->write_func(&c, 1, CFH);
 	return 1;
 }
 
@@ -508,15 +493,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
 	lclContext *ctx = (lclContext *) AH->formatData;
 	CompressFileHandle *CFH = ctx->dataFH;
 
-	errno = 0;
-	if (!CFH->write_func(buf, len, CFH))
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		pg_fatal("could not write to output file: %s",
-				 CFH->get_error_func(CFH));
-	}
+	CFH->write_func(buf, len, CFH);
 }
 
 /*
@@ -531,10 +508,10 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
 	CompressFileHandle *CFH = ctx->dataFH;
 
 	/*
-	 * If there was an I/O error, we already exited in readF(), so here we
-	 * exit on short reads.
+	 * We do not expect a short read, so fail if we get one.  The read_func
+	 * already dealt with any outright I/O error.
 	 */
-	if (!CFH->read_func(buf, len, NULL, CFH))
+	if (CFH->read_func(buf, len, CFH) != len)
 		pg_fatal("could not read from input file: end of file");
 }
 
@@ -677,14 +654,7 @@ _EndLO(ArchiveHandle *AH, TocEntry *te, Oid oid)
 
 	/* register the LO in blobs_NNN.toc */
 	len = snprintf(buf, sizeof(buf), "%u blob_%u.dat\n", oid, oid);
-	if (!CFH->write_func(buf, len, CFH))
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		pg_fatal("could not write to LOs TOC file: %s",
-				 CFH->get_error_func(CFH));
-	}
+	CFH->write_func(buf, len, CFH);
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index d94d0de2a5d..ec42a2cb19d 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -826,7 +826,7 @@ _CloseArchive(ArchiveHandle *AH)
 		savVerbose = AH->public.verbose;
 		AH->public.verbose = 0;
 
-		RestoreArchive((Archive *) AH, false);
+		RestoreArchive((Archive *) AH);
 
 		SetArchiveOptions((Archive *) AH, savDopt, savRopt);
 
@@ -984,31 +984,6 @@ tarPrintf(TAR_MEMBER *th, const char *fmt,...)
 	return (int) cnt;
 }
 
-bool
-isValidTarHeader(char *header)
-{
-	int			sum;
-	int			chk = tarChecksum(header);
-
-	sum = read_tar_number(&header[TAR_OFFSET_CHECKSUM], 8);
-
-	if (sum != chk)
-		return false;
-
-	/* POSIX tar format */
-	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar\0", 6) == 0 &&
-		memcmp(&header[TAR_OFFSET_VERSION], "00", 2) == 0)
-		return true;
-	/* GNU tar format */
-	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar  \0", 8) == 0)
-		return true;
-	/* not-quite-POSIX format written by pre-9.3 pg_dump */
-	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar00\0", 8) == 0)
-		return true;
-
-	return false;
-}
-
 /* Given the member, write the TAR header & copy the file */
 static void
 _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d1f81e35273..b9c9785bc4c 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *	pg_dump will read the system catalogs in a database and dump out a
  *	script that reproduces the schema in terms of SQL that is understood
@@ -52,6 +52,7 @@
 #include "catalog/pg_authid_d.h"
 #include "catalog/pg_cast_d.h"
 #include "catalog/pg_class_d.h"
+#include "catalog/pg_constraint_d.h"
 #include "catalog/pg_default_acl_d.h"
 #include "catalog/pg_largeobject_d.h"
 #include "catalog/pg_proc_d.h"
@@ -117,6 +118,7 @@ typedef enum SeqType
 	SEQTYPE_SMALLINT,
 	SEQTYPE_INTEGER,
 	SEQTYPE_BIGINT,
+	SEQTYPE_CUSTINT,
 } SeqType;
 
 static const char *const SeqTypeNames[] =
@@ -124,9 +126,10 @@ static const char *const SeqTypeNames[] =
 	[SEQTYPE_SMALLINT] = "smallint",
 	[SEQTYPE_INTEGER] = "integer",
 	[SEQTYPE_BIGINT] = "bigint",
+	[SEQTYPE_CUSTINT] = "pg_catalog.int8",
 };
 
-StaticAssertDecl(lengthof(SeqTypeNames) == (SEQTYPE_BIGINT + 1),
+StaticAssertDecl(lengthof(SeqTypeNames) == (SEQTYPE_CUSTINT + 1),
 				 "array length mismatch");
 
 typedef struct
@@ -142,6 +145,7 @@ typedef struct
 	int16		flags;			/* ivorysql */
 	int64		last_value;		/* last value of sequence */
 	bool		is_called;		/* whether nextval advances before returning */
+	bool		null_seqtuple;	/* did pg_get_sequence_data return nulls? */
 } SequenceItem;
 
 typedef enum OidOptions
@@ -449,8 +453,6 @@ main(int argc, char **argv)
 	bool		data_only = false;
 	bool		schema_only = false;
 	bool		statistics_only = false;
-	bool		with_data = false;
-	bool		with_schema = false;
 	bool		with_statistics = false;
 	bool		no_data = false;
 	bool		no_schema = false;
@@ -514,6 +516,7 @@ main(int argc, char **argv)
 		{"section", required_argument, NULL, 5},
 		{"serializable-deferrable", no_argument, &dopt.serializable_deferrable, 1},
 		{"snapshot", required_argument, NULL, 6},
+		{"statistics", no_argument, NULL, 22},
 		{"statistics-only", no_argument, NULL, 18},
 		{"strict-names", no_argument, &strict_names, 1},
 		{"use-set-session-authorization", no_argument, &dopt.use_setsessauth, 1},
@@ -528,9 +531,6 @@ main(int argc, char **argv)
 		{"no-toast-compression", no_argument, &dopt.no_toast_compression, 1},
 		{"no-unlogged-table-data", no_argument, &dopt.no_unlogged_table_data, 1},
 		{"no-sync", no_argument, NULL, 7},
-		{"with-data", no_argument, NULL, 22},
-		{"with-schema", no_argument, NULL, 23},
-		{"with-statistics", no_argument, NULL, 24},
 		{"on-conflict-do-nothing", no_argument, &dopt.do_nothing, 1},
 		{"rows-per-insert", required_argument, NULL, 10},
 		{"include-foreign-data", required_argument, NULL, 11},
@@ -541,6 +541,7 @@ main(int argc, char **argv)
 		{"filter", required_argument, NULL, 16},
 		{"exclude-extension", required_argument, NULL, 17},
 		{"sequence-data", no_argument, &dopt.sequence_data, 1},
+		{"restrict-key", required_argument, NULL, 25},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -798,15 +799,11 @@ main(int argc, char **argv)
 				break;
 
 			case 22:
-				with_data = true;
+				with_statistics = true;
 				break;
 
-			case 23:
-				with_schema = true;
-				break;
-
-			case 24:
-				with_statistics = true;
+			case 25:
+				dopt.restrict_key = pg_strdup(optarg);
 				break;
 
 			default:
@@ -838,51 +835,64 @@ main(int argc, char **argv)
 
 	/* reject conflicting "-only" options */
 	if (data_only && schema_only)
-		pg_fatal("options -s/--schema-only and -a/--data-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "-a/--data-only");
 	if (schema_only && statistics_only)
-		pg_fatal("options -s/--schema-only and --statistics-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--statistics-only");
 	if (data_only && statistics_only)
-		pg_fatal("options -a/--data-only and --statistics-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--statistics-only");
 
 	/* reject conflicting "-only" and "no-" options */
 	if (data_only && no_data)
-		pg_fatal("options -a/--data-only and --no-data cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--no-data");
 	if (schema_only && no_schema)
-		pg_fatal("options -s/--schema-only and --no-schema cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--no-schema");
 	if (statistics_only && no_statistics)
-		pg_fatal("options --statistics-only and --no-statistics cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "--statistics-only", "--no-statistics");
 
-	/* reject conflicting "with-" and "no-" options */
-	if (with_data && no_data)
-		pg_fatal("options --with-data and --no-data cannot be used together");
-	if (with_schema && no_schema)
-		pg_fatal("options --with-schema and --no-schema cannot be used together");
+	/* reject conflicting "no-" options */
 	if (with_statistics && no_statistics)
-		pg_fatal("options --with-statistics and --no-statistics cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "--statistics", "--no-statistics");
+
+	/* reject conflicting "-only" options */
+	if (data_only && with_statistics)
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--statistics");
+	if (schema_only && with_statistics)
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--statistics");
 
 	if (schema_only && foreign_servers_include_patterns.head != NULL)
-		pg_fatal("options -s/--schema-only and --include-foreign-data cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--include-foreign-data");
 
 	if (numWorkers > 1 && foreign_servers_include_patterns.head != NULL)
-		pg_fatal("option --include-foreign-data is not supported with parallel backup");
+		pg_fatal("option %s is not supported with parallel backup",
+				 "--include-foreign-data");
 
 	if (data_only && dopt.outputClean)
-		pg_fatal("options -c/--clean and -a/--data-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-c/--clean", "-a/--data-only");
 
 	if (dopt.if_exists && !dopt.outputClean)
-		pg_fatal("option --if-exists requires option -c/--clean");
+		pg_fatal("option %s requires option %s",
+				 "--if-exists", "-c/--clean");
 
 	/*
-	 * Set derivative flags. An "-only" option may be overridden by an
-	 * explicit "with-" option; e.g. "--schema-only --with-statistics" will
-	 * include schema and statistics. Other ambiguous or nonsensical
-	 * combinations, e.g. "--schema-only --no-schema", will have already
-	 * caused an error in one of the checks above.
+	 * Set derivative flags. Ambiguous or nonsensical combinations, e.g.
+	 * "--schema-only --no-schema", will have already caused an error in one
+	 * of the checks above.
 	 */
 	dopt.dumpData = ((dopt.dumpData && !schema_only && !statistics_only) ||
-					 (data_only || with_data)) && !no_data;
+					 data_only) && !no_data;
 	dopt.dumpSchema = ((dopt.dumpSchema && !data_only && !statistics_only) ||
-					   (schema_only || with_schema)) && !no_schema;
+					   schema_only) && !no_schema;
 	dopt.dumpStatistics = ((dopt.dumpStatistics && !schema_only && !data_only) ||
 						   (statistics_only || with_statistics)) && !no_statistics;
 
@@ -892,15 +902,32 @@ main(int argc, char **argv)
 	 * --rows-per-insert were specified.
 	 */
 	if (dopt.do_nothing && dopt.dump_inserts == 0)
-		pg_fatal("option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts");
+		pg_fatal("option %s requires option %s, %s, or %s",
+				 "--on-conflict-do-nothing",
+				 "--inserts", "--rows-per-insert", "--column-inserts");
 
 	/* Identify archive format to emit */
 	archiveFormat = parseArchiveFormat(format, &archiveMode);
 
 	/* archiveFormat specific setup */
 	if (archiveFormat == archNull)
+	{
 		plainText = 1;
 
+		/*
+		 * If you don't provide a restrict key, one will be appointed for you.
+		 */
+		if (!dopt.restrict_key)
+			dopt.restrict_key = generate_restrict_key();
+		if (!dopt.restrict_key)
+			pg_fatal("could not generate restrict key");
+		if (!valid_restrict_key(dopt.restrict_key))
+			pg_fatal("invalid restrict key");
+	}
+	else if (dopt.restrict_key)
+		pg_fatal("option %s can only be used with %s",
+				 "--restrict-key", "--format=plain");
+
 	/*
 	 * Custom and directory formats are compressed by default with gzip when
 	 * available, not the others.  If gzip is not available, no compression is
@@ -1211,6 +1238,7 @@ main(int argc, char **argv)
 	ropt->enable_row_security = dopt.enable_row_security;
 	ropt->sequence_data = dopt.sequence_data;
 	ropt->binary_upgrade = dopt.binary_upgrade;
+	ropt->restrict_key = dopt.restrict_key ? pg_strdup(dopt.restrict_key) : NULL;
 
 	ropt->compression_spec = compression_spec;
 
@@ -1237,7 +1265,7 @@ main(int argc, char **argv)
 	 * right now.
 	 */
 	if (plainText)
-		RestoreArchive(fout, false);
+		RestoreArchive(fout);
 
 	CloseArchive(fout);
 
@@ -1322,11 +1350,13 @@ help(const char *progname)
 	printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
 	printf(_("  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"));
 	printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
+	printf(_("  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"));
 	printf(_("  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"));
 	printf(_("  --section=SECTION            dump named section (pre-data, data, or post-data)\n"));
 	printf(_("  --sequence-data              include sequence data in dump\n"));
 	printf(_("  --serializable-deferrable    wait until the dump can run without anomalies\n"));
 	printf(_("  --snapshot=SNAPSHOT          use given snapshot for the dump\n"));
+	printf(_("  --statistics                 dump the statistics\n"));
 	printf(_("  --statistics-only            dump only the statistics, not schema or data\n"));
 	printf(_("  --strict-names               require table and/or schema include patterns to\n"
 			 "                               match at least one entity each\n"));
@@ -1335,9 +1365,6 @@ help(const char *progname)
 	printf(_("  --use-set-session-authorization\n"
 			 "                               use SET SESSION AUTHORIZATION commands instead of\n"
 			 "                               ALTER OWNER commands to set ownership\n"));
-	printf(_("  --with-data                  dump the data\n"));
-	printf(_("  --with-schema                dump the schema\n"));
-	printf(_("  --with-statistics            dump the statistics\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -d, --dbname=DBNAME      database to dump\n"));
@@ -2180,6 +2207,13 @@ selectDumpableProcLang(ProcLangInfo *plang, Archive *fout)
 static void
 selectDumpableAccessMethod(AccessMethodInfo *method, Archive *fout)
 {
+	/* see getAccessMethods() comment about v9.6. */
+	if (fout->remoteVersion < 90600)
+	{
+		method->dobj.dump = DUMP_COMPONENT_NONE;
+		return;
+	}
+
 	if (checkExtensionMembership(&method->dobj, fout))
 		return;					/* extension membership overrides all else */
 
@@ -2818,11 +2852,14 @@ dumpTableData(Archive *fout, const TableDataInfo *tdinfo)
 		 forcePartitionRootLoad(tbinfo)))
 	{
 		TableInfo  *parentTbinfo;
+		char	   *sanitized;
 
 		parentTbinfo = getRootTableInfo(tbinfo);
 		copyFrom = fmtQualifiedDumpable(parentTbinfo);
+		sanitized = sanitize_line(copyFrom, true);
 		printfPQExpBuffer(copyBuf, "-- load via partition root %s",
-						  copyFrom);
+						  sanitized);
+		free(sanitized);
 		tdDefn = pg_strdup(copyBuf->data);
 	}
 	else
@@ -5210,7 +5247,9 @@ getSubscriptionTables(Archive *fout)
 		subrinfo[i].dobj.catId.tableoid = relid;
 		subrinfo[i].dobj.catId.oid = cur_srsubid;
 		AssignDumpId(&subrinfo[i].dobj);
-		subrinfo[i].dobj.name = pg_strdup(subinfo->dobj.name);
+		subrinfo[i].dobj.namespace = tblinfo->dobj.namespace;
+		subrinfo[i].dobj.name = tblinfo->dobj.name;
+		subrinfo[i].subinfo = subinfo;
 		subrinfo[i].tblinfo = tblinfo;
 		subrinfo[i].srsubstate = PQgetvalue(res, i, i_srsubstate)[0];
 		if (PQgetisnull(res, i, i_srsublsn))
@@ -5218,8 +5257,6 @@ getSubscriptionTables(Archive *fout)
 		else
 			subrinfo[i].srsublsn = pg_strdup(PQgetvalue(res, i, i_srsublsn));
 
-		subrinfo[i].subinfo = subinfo;
-
 		/* Decide whether we want to dump it */
 		selectDumpableObject(&(subrinfo[i].dobj), fout);
 	}
@@ -5247,7 +5284,7 @@ dumpSubscriptionTable(Archive *fout, const SubRelInfo *subrinfo)
 
 	Assert(fout->dopt->binary_upgrade && fout->remoteVersion >= 170000);
 
-	tag = psprintf("%s %s", subinfo->dobj.name, subrinfo->dobj.name);
+	tag = psprintf("%s %s", subinfo->dobj.name, subrinfo->tblinfo->dobj.name);
 
 	query = createPQExpBuffer();
 
@@ -5262,7 +5299,7 @@ dumpSubscriptionTable(Archive *fout, const SubRelInfo *subrinfo)
 							 "\n-- For binary upgrade, must preserve the subscriber table.\n");
 		appendPQExpBufferStr(query,
 							 "SELECT pg_catalog.binary_upgrade_add_sub_rel_state(");
-		appendStringLiteralAH(query, subrinfo->dobj.name, fout);
+		appendStringLiteralAH(query, subinfo->dobj.name, fout);
 		appendPQExpBuffer(query,
 						  ", %u, '%c'",
 						  subrinfo->tblinfo->dobj.catId.oid,
@@ -6133,6 +6170,7 @@ getTypes(Archive *fout)
 		 */
 		tyinfo[i].nDomChecks = 0;
 		tyinfo[i].domChecks = NULL;
+		tyinfo[i].notnull = NULL;
 		if ((tyinfo[i].dobj.dump & DUMP_COMPONENT_DEFINITION) &&
 			tyinfo[i].typtype == TYPTYPE_DOMAIN)
 			getDomainConstraints(fout, &(tyinfo[i]));
@@ -6192,6 +6230,8 @@ getOperators(Archive *fout)
 	int			i_oprnamespace;
 	int			i_oprowner;
 	int			i_oprkind;
+	int			i_oprleft;
+	int			i_oprright;
 	int			i_oprcode;
 
 	/*
@@ -6203,6 +6243,8 @@ getOperators(Archive *fout)
 						 "oprnamespace, "
 						 "oprowner, "
 						 "oprkind, "
+						 "oprleft, "
+						 "oprright, "
 						 "oprcode::oid AS oprcode "
 						 "FROM pg_operator");
 
@@ -6218,6 +6260,8 @@ getOperators(Archive *fout)
 	i_oprnamespace = PQfnumber(res, "oprnamespace");
 	i_oprowner = PQfnumber(res, "oprowner");
 	i_oprkind = PQfnumber(res, "oprkind");
+	i_oprleft = PQfnumber(res, "oprleft");
+	i_oprright = PQfnumber(res, "oprright");
 	i_oprcode = PQfnumber(res, "oprcode");
 
 	for (i = 0; i < ntups; i++)
@@ -6231,6 +6275,8 @@ getOperators(Archive *fout)
 			findNamespace(atooid(PQgetvalue(res, i, i_oprnamespace)));
 		oprinfo[i].rolname = getRoleName(PQgetvalue(res, i, i_oprowner));
 		oprinfo[i].oprkind = (PQgetvalue(res, i, i_oprkind))[0];
+		oprinfo[i].oprleft = atooid(PQgetvalue(res, i, i_oprleft));
+		oprinfo[i].oprright = atooid(PQgetvalue(res, i, i_oprright));
 		oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
 
 		/* Decide whether we want to dump it */
@@ -6259,6 +6305,7 @@ getCollations(Archive *fout)
 	int			i_collname;
 	int			i_collnamespace;
 	int			i_collowner;
+	int			i_collencoding;
 
 	query = createPQExpBuffer();
 
@@ -6269,7 +6316,8 @@ getCollations(Archive *fout)
 
 	appendPQExpBufferStr(query, "SELECT tableoid, oid, collname, "
 						 "collnamespace, "
-						 "collowner "
+						 "collowner, "
+						 "collencoding "
 						 "FROM pg_collation");
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -6283,6 +6331,7 @@ getCollations(Archive *fout)
 	i_collname = PQfnumber(res, "collname");
 	i_collnamespace = PQfnumber(res, "collnamespace");
 	i_collowner = PQfnumber(res, "collowner");
+	i_collencoding = PQfnumber(res, "collencoding");
 
 	for (i = 0; i < ntups; i++)
 	{
@@ -6294,6 +6343,7 @@ getCollations(Archive *fout)
 		collinfo[i].dobj.namespace =
 			findNamespace(atooid(PQgetvalue(res, i, i_collnamespace)));
 		collinfo[i].rolname = getRoleName(PQgetvalue(res, i, i_collowner));
+		collinfo[i].collencoding = atoi(PQgetvalue(res, i, i_collencoding));
 
 		/* Decide whether we want to dump it */
 		selectDumpableObject(&(collinfo[i].dobj), fout);
@@ -6384,16 +6434,28 @@ getAccessMethods(Archive *fout)
 	int			i_amhandler;
 	int			i_amtype;
 
-	/* Before 9.6, there are no user-defined access methods */
-	if (fout->remoteVersion < 90600)
-		return;
-
 	query = createPQExpBuffer();
 
-	/* Select all access methods from pg_am table */
-	appendPQExpBufferStr(query, "SELECT tableoid, oid, amname, amtype, "
-						 "amhandler::pg_catalog.regproc AS amhandler "
-						 "FROM pg_am");
+	/*
+	 * Select all access methods from pg_am table.  v9.6 introduced CREATE
+	 * ACCESS METHOD, so earlier versions usually have only built-in access
+	 * methods.  v9.6 also changed the access method API, replacing dozens of
+	 * pg_am columns with amhandler.  Even if a user created an access method
+	 * by "INSERT INTO pg_am", we have no way to translate pre-v9.6 pg_am
+	 * columns to a v9.6+ CREATE ACCESS METHOD.  Hence, before v9.6, read
+	 * pg_am just to facilitate findAccessMethodByOid() providing the
+	 * OID-to-name mapping.
+	 */
+	appendPQExpBufferStr(query, "SELECT tableoid, oid, amname, ");
+	if (fout->remoteVersion >= 90600)
+		appendPQExpBufferStr(query,
+							 "amtype, "
+							 "amhandler::pg_catalog.regproc AS amhandler ");
+	else
+		appendPQExpBufferStr(query,
+							 "'i'::pg_catalog.\"char\" AS amtype, "
+							 "'-'::pg_catalog.regproc AS amhandler ");
+	appendPQExpBufferStr(query, "FROM pg_am");
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
 
@@ -6442,6 +6504,7 @@ getOpclasses(Archive *fout)
 	OpclassInfo *opcinfo;
 	int			i_tableoid;
 	int			i_oid;
+	int			i_opcmethod;
 	int			i_opcname;
 	int			i_opcnamespace;
 	int			i_opcowner;
@@ -6451,7 +6514,7 @@ getOpclasses(Archive *fout)
 	 * system-defined opclasses at dump-out time.
 	 */
 
-	appendPQExpBufferStr(query, "SELECT tableoid, oid, opcname, "
+	appendPQExpBufferStr(query, "SELECT tableoid, oid, opcmethod, opcname, "
 						 "opcnamespace, "
 						 "opcowner "
 						 "FROM pg_opclass");
@@ -6464,6 +6527,7 @@ getOpclasses(Archive *fout)
 
 	i_tableoid = PQfnumber(res, "tableoid");
 	i_oid = PQfnumber(res, "oid");
+	i_opcmethod = PQfnumber(res, "opcmethod");
 	i_opcname = PQfnumber(res, "opcname");
 	i_opcnamespace = PQfnumber(res, "opcnamespace");
 	i_opcowner = PQfnumber(res, "opcowner");
@@ -6477,6 +6541,7 @@ getOpclasses(Archive *fout)
 		opcinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opcname));
 		opcinfo[i].dobj.namespace =
 			findNamespace(atooid(PQgetvalue(res, i, i_opcnamespace)));
+		opcinfo[i].opcmethod = atooid(PQgetvalue(res, i, i_opcmethod));
 		opcinfo[i].rolname = getRoleName(PQgetvalue(res, i, i_opcowner));
 
 		/* Decide whether we want to dump it */
@@ -6502,6 +6567,7 @@ getOpfamilies(Archive *fout)
 	OpfamilyInfo *opfinfo;
 	int			i_tableoid;
 	int			i_oid;
+	int			i_opfmethod;
 	int			i_opfname;
 	int			i_opfnamespace;
 	int			i_opfowner;
@@ -6513,7 +6579,7 @@ getOpfamilies(Archive *fout)
 	 * system-defined opfamilies at dump-out time.
 	 */
 
-	appendPQExpBufferStr(query, "SELECT tableoid, oid, opfname, "
+	appendPQExpBufferStr(query, "SELECT tableoid, oid, opfmethod, opfname, "
 						 "opfnamespace, "
 						 "opfowner "
 						 "FROM pg_opfamily");
@@ -6527,6 +6593,7 @@ getOpfamilies(Archive *fout)
 	i_tableoid = PQfnumber(res, "tableoid");
 	i_oid = PQfnumber(res, "oid");
 	i_opfname = PQfnumber(res, "opfname");
+	i_opfmethod = PQfnumber(res, "opfmethod");
 	i_opfnamespace = PQfnumber(res, "opfnamespace");
 	i_opfowner = PQfnumber(res, "opfowner");
 
@@ -6539,6 +6606,7 @@ getOpfamilies(Archive *fout)
 		opfinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opfname));
 		opfinfo[i].dobj.namespace =
 			findNamespace(atooid(PQgetvalue(res, i, i_opfnamespace)));
+		opfinfo[i].opfmethod = atooid(PQgetvalue(res, i, i_opfmethod));
 		opfinfo[i].rolname = getRoleName(PQgetvalue(res, i, i_opfowner));
 
 		/* Decide whether we want to dump it */
@@ -6905,6 +6973,28 @@ getPackages(Archive *fout, int *numPkgs)
 	int			i_rolname;
 	int			i_pkgacl;
 	int			i_acldefault;
+
+
+	/*
+	 * Check if pg_package table exists. This is needed for pg_upgrade from
+	 * PostgreSQL to IvorySQL, where the source database is PostgreSQL which
+	 * doesn't have pg_package table.
+	 */
+	res = ExecuteSqlQuery(fout,
+						  "SELECT 1 FROM pg_catalog.pg_class c "
+						  "JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid "
+						  "WHERE n.nspname = 'pg_catalog' AND c.relname = 'pg_package'",
+						  PGRES_TUPLES_OK);
+	if (PQntuples(res) == 0)
+	{
+		/* pg_package table doesn't exist, return empty result */
+		PQclear(res);
+		destroyPQExpBuffer(query);
+		*numPkgs = 0;
+		return (PkgInfo *) pg_malloc0(sizeof(PkgInfo));
+	}
+	PQclear(res);
+
 	appendPQExpBuffer(query,
 					"SELECT p.tableoid, p.pkgname, p.oid, p.pkgnamespace,"
 					"p.pkgowner,"
@@ -7142,12 +7232,31 @@ getTables(Archive *fout, int *numTables)
 						 "d.refobjsubid AS owning_col, "
 						 "tsp.spcname AS reltablespace, ");
 
-	if (fout->remoteVersion < 170000)
-		appendPQExpBufferStr(query,
-							 "false AS relhasrowid, ");
-	else
-		appendPQExpBufferStr(query,
-							 "c.relhasrowid, ");
+	/*
+	 * Check if relhasrowid column exists. This column is IvorySQL-specific
+	 * for Oracle ROWID compatibility, and doesn't exist in native PostgreSQL.
+	 * We need to check at runtime rather than relying on remoteVersion because
+	 * when upgrading from PostgreSQL to IvorySQL, the source database is
+	 * PostgreSQL which may have the same version number but lacks this column.
+	 */
+	{
+		PGresult   *res_rowid;
+		bool		relhasrowid_exists = false;
+
+		res_rowid = ExecuteSqlQuery(fout,
+							  "SELECT 1 FROM pg_catalog.pg_attribute "
+							  "WHERE attrelid = 'pg_class'::regclass "
+							  "AND attname = 'relhasrowid' "
+							  "AND attnum > 0 LIMIT 1",
+							  PGRES_TUPLES_OK);
+		relhasrowid_exists = (PQntuples(res_rowid) > 0);
+		PQclear(res_rowid);
+
+		if (relhasrowid_exists)
+			appendPQExpBufferStr(query, "c.relhasrowid, ");
+		else
+			appendPQExpBufferStr(query, "false AS relhasrowid, ");
+	}
 
 	if (fout->remoteVersion >= 120000)
 		appendPQExpBufferStr(query,
@@ -8345,27 +8454,33 @@ addConstrChildIdxDeps(DumpableObject *dobj, const IndxInfo *refidx)
 static void
 getDomainConstraints(Archive *fout, TypeInfo *tyinfo)
 {
-	int			i;
 	ConstraintInfo *constrinfo;
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	int			i_tableoid,
 				i_oid,
 				i_conname,
-				i_consrc;
+				i_consrc,
+				i_convalidated,
+				i_contype;
 	int			ntups;
 
 	if (!fout->is_prepared[PREPQUERY_GETDOMAINCONSTRAINTS])
 	{
-		/* Set up query for constraint-specific details */
-		appendPQExpBufferStr(query,
-							 "PREPARE getDomainConstraints(pg_catalog.oid) AS\n"
-							 "SELECT tableoid, oid, conname, "
-							 "pg_catalog.pg_get_constraintdef(oid) AS consrc, "
-							 "convalidated "
-							 "FROM pg_catalog.pg_constraint "
-							 "WHERE contypid = $1 AND contype = 'c' "
-							 "ORDER BY conname");
+		/*
+		 * Set up query for constraint-specific details.  For servers 17 and
+		 * up, domains have constraints of type 'n' as well as 'c', otherwise
+		 * just the latter.
+		 */
+		appendPQExpBuffer(query,
+						  "PREPARE getDomainConstraints(pg_catalog.oid) AS\n"
+						  "SELECT tableoid, oid, conname, "
+						  "pg_catalog.pg_get_constraintdef(oid) AS consrc, "
+						  "convalidated, contype "
+						  "FROM pg_catalog.pg_constraint "
+						  "WHERE contypid = $1 AND contype IN (%s) "
+						  "ORDER BY conname",
+						  fout->remoteVersion < 170000 ? "'c'" : "'c', 'n'");
 
 		ExecuteSqlStatement(fout, query->data);
 
@@ -8384,33 +8499,50 @@ getDomainConstraints(Archive *fout, TypeInfo *tyinfo)
 	i_oid = PQfnumber(res, "oid");
 	i_conname = PQfnumber(res, "conname");
 	i_consrc = PQfnumber(res, "consrc");
+	i_convalidated = PQfnumber(res, "convalidated");
+	i_contype = PQfnumber(res, "contype");
 
 	constrinfo = (ConstraintInfo *) pg_malloc(ntups * sizeof(ConstraintInfo));
-
-	tyinfo->nDomChecks = ntups;
 	tyinfo->domChecks = constrinfo;
 
-	for (i = 0; i < ntups; i++)
+	/* 'i' tracks result rows; 'j' counts CHECK constraints */
+	for (int i = 0, j = 0; i < ntups; i++)
 	{
-		bool		validated = PQgetvalue(res, i, 4)[0] == 't';
-
-		constrinfo[i].dobj.objType = DO_CONSTRAINT;
-		constrinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
-		constrinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
-		AssignDumpId(&constrinfo[i].dobj);
-		constrinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_conname));
-		constrinfo[i].dobj.namespace = tyinfo->dobj.namespace;
-		constrinfo[i].contable = NULL;
-		constrinfo[i].condomain = tyinfo;
-		constrinfo[i].contype = 'c';
-		constrinfo[i].condef = pg_strdup(PQgetvalue(res, i, i_consrc));
-		constrinfo[i].confrelid = InvalidOid;
-		constrinfo[i].conindex = 0;
-		constrinfo[i].condeferrable = false;
-		constrinfo[i].condeferred = false;
-		constrinfo[i].conislocal = true;
-
-		constrinfo[i].separate = !validated;
+		bool		validated = PQgetvalue(res, i, i_convalidated)[0] == 't';
+		char		contype = (PQgetvalue(res, i, i_contype))[0];
+		ConstraintInfo *constraint;
+
+		if (contype == CONSTRAINT_CHECK)
+		{
+			constraint = &constrinfo[j++];
+			tyinfo->nDomChecks++;
+		}
+		else
+		{
+			Assert(contype == CONSTRAINT_NOTNULL);
+			Assert(tyinfo->notnull == NULL);
+			/* use last item in array for the not-null constraint */
+			tyinfo->notnull = &(constrinfo[ntups - 1]);
+			constraint = tyinfo->notnull;
+		}
+
+		constraint->dobj.objType = DO_CONSTRAINT;
+		constraint->dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		constraint->dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&(constraint->dobj));
+		constraint->dobj.name = pg_strdup(PQgetvalue(res, i, i_conname));
+		constraint->dobj.namespace = tyinfo->dobj.namespace;
+		constraint->contable = NULL;
+		constraint->condomain = tyinfo;
+		constraint->contype = contype;
+		constraint->condef = pg_strdup(PQgetvalue(res, i, i_consrc));
+		constraint->confrelid = InvalidOid;
+		constraint->conindex = 0;
+		constraint->condeferrable = false;
+		constraint->condeferred = false;
+		constraint->conislocal = true;
+
+		constraint->separate = !validated;
 
 		/*
 		 * Make the domain depend on the constraint, ensuring it won't be
@@ -8419,8 +8551,7 @@ getDomainConstraints(Archive *fout, TypeInfo *tyinfo)
 		 * anyway, so this doesn't matter.
 		 */
 		if (validated)
-			addObjectDependency(&tyinfo->dobj,
-								constrinfo[i].dobj.dumpId);
+			addObjectDependency(&tyinfo->dobj, constraint->dobj.dumpId);
 	}
 
 	PQclear(res);
@@ -9205,8 +9336,7 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 	 *
 	 * We track in notnull_islocal whether the constraint was defined directly
 	 * in this table or via an ancestor, for binary upgrade.  flagInhAttrs
-	 * might modify this later; that routine is also in charge of determining
-	 * the correct inhcount.
+	 * might modify this later.
 	 */
 	if (fout->remoteVersion >= 180000)
 		appendPQExpBufferStr(q,
@@ -9223,7 +9353,10 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 							 "NULL AS notnull_comment,\n"
 							 "NULL AS notnull_invalidoid,\n"
 							 "false AS notnull_noinherit,\n"
-							 "a.attislocal AS notnull_islocal,\n");
+							 "CASE WHEN a.attislocal THEN true\n"
+							 "     WHEN a.attnotnull AND NOT a.attislocal THEN true\n"
+							 "     ELSE false\n"
+							 "END AS notnull_islocal,\n");
 
 	if (fout->remoteVersion >= 140000)
 		appendPQExpBufferStr(q,
@@ -9232,13 +9365,31 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 		appendPQExpBufferStr(q,
 							 "'' AS attcompression,\n");
 	
-	if (fout->remoteVersion >= 170000)
-		appendPQExpBuffer(q,
-						"a.attisinvisible,\n");
-	else
-		appendPQExpBuffer(q,
-							"'f' AS attisinvisible,\n");
+	/*
+	 * Check if attisinvisible column exists. This column is IvorySQL-specific
+	 * for Oracle compatibility, and doesn't exist in native PostgreSQL.
+	 * We need to check at runtime rather than relying on remoteVersion because
+	 * when upgrading from PostgreSQL to IvorySQL, the source database is
+	 * PostgreSQL which may have the same version number but lacks this column.
+	 */
+	{
+		PGresult   *res_invisible;
+		bool		attisinvisible_exists = false;
+
+		res_invisible = ExecuteSqlQuery(fout,
+							  "SELECT 1 FROM pg_catalog.pg_attribute "
+							  "WHERE attrelid = 'pg_attribute'::regclass "
+							  "AND attname = 'attisinvisible' "
+							  "AND attnum > 0 LIMIT 1",
+							  PGRES_TUPLES_OK);
+		attisinvisible_exists = (PQntuples(res_invisible) > 0);
+		PQclear(res_invisible);
 
+		if (attisinvisible_exists)
+			appendPQExpBufferStr(q, "a.attisinvisible,\n");
+		else
+			appendPQExpBufferStr(q, "'f' AS attisinvisible,\n");
+	}
 
 	if (fout->remoteVersion >= 100000)
 		appendPQExpBufferStr(q,
@@ -9936,7 +10087,7 @@ determineNotNullFlags(Archive *fout, PGresult *res, int r,
 			 */
 			if ((dopt->binary_upgrade &&
 				 !tbinfo->ispartition &&
-				 !tbinfo->notnull_islocal) ||
+				 !tbinfo->notnull_islocal[j]) ||
 				!PQgetisnull(res, r, i_notnull_comment))
 			{
 				tbinfo->notnull_constrs[j] =
@@ -12630,8 +12781,36 @@ dumpDomain(Archive *fout, const TypeInfo *tyinfo)
 			appendPQExpBuffer(q, " COLLATE %s", fmtQualifiedDumpable(coll));
 	}
 
+	/*
+	 * Print a not-null constraint if there's one.  In servers older than 17
+	 * these don't have names, so just print it unadorned; in newer ones they
+	 * do, but most of the time it's going to be the standard generated one,
+	 * so omit the name in that case also.
+	 */
 	if (typnotnull[0] == 't')
-		appendPQExpBufferStr(q, " NOT NULL");
+	{
+		if (fout->remoteVersion < 170000 || tyinfo->notnull == NULL)
+			appendPQExpBufferStr(q, " NOT NULL");
+		else
+		{
+			ConstraintInfo *notnull = tyinfo->notnull;
+
+			if (!notnull->separate)
+			{
+				char	   *default_name;
+
+				/* XXX should match ChooseConstraintName better */
+				default_name = psprintf("%s_not_null", tyinfo->dobj.name);
+
+				if (strcmp(default_name, notnull->dobj.name) == 0)
+					appendPQExpBufferStr(q, " NOT NULL");
+				else
+					appendPQExpBuffer(q, " CONSTRAINT %s %s",
+									  fmtId(notnull->dobj.name), notnull->condef);
+				free(default_name);
+			}
+		}
+	}
 
 	if (typdefault != NULL)
 	{
@@ -12651,7 +12830,7 @@ dumpDomain(Archive *fout, const TypeInfo *tyinfo)
 	{
 		ConstraintInfo *domcheck = &(tyinfo->domChecks[i]);
 
-		if (!domcheck->separate)
+		if (!domcheck->separate && domcheck->contype == 'c')
 			appendPQExpBuffer(q, "\n\tCONSTRAINT %s %s",
 							  fmtId(domcheck->dobj.name), domcheck->condef);
 	}
@@ -12696,8 +12875,13 @@ dumpDomain(Archive *fout, const TypeInfo *tyinfo)
 	for (i = 0; i < tyinfo->nDomChecks; i++)
 	{
 		ConstraintInfo *domcheck = &(tyinfo->domChecks[i]);
-		PQExpBuffer conprefix = createPQExpBuffer();
+		PQExpBuffer conprefix;
 
+		/* but only if the constraint itself was dumped here */
+		if (domcheck->separate)
+			continue;
+
+		conprefix = createPQExpBuffer();
 		appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
 						  fmtId(domcheck->dobj.name));
 
@@ -12710,6 +12894,25 @@ dumpDomain(Archive *fout, const TypeInfo *tyinfo)
 		destroyPQExpBuffer(conprefix);
 	}
 
+	/*
+	 * And a comment on the not-null constraint, if there's one -- but only if
+	 * the constraint itself was dumped here
+	 */
+	if (tyinfo->notnull != NULL && !tyinfo->notnull->separate)
+	{
+		PQExpBuffer conprefix = createPQExpBuffer();
+
+		appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
+						  fmtId(tyinfo->notnull->dobj.name));
+
+		if (tyinfo->notnull->dobj.dump & DUMP_COMPONENT_COMMENT)
+			dumpComment(fout, conprefix->data, qtypname,
+						tyinfo->dobj.namespace->dobj.name,
+						tyinfo->rolname,
+						tyinfo->notnull->dobj.catId, 0, tyinfo->dobj.dumpId);
+		destroyPQExpBuffer(conprefix);
+	}
+
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
 	destroyPQExpBuffer(query);
@@ -16711,7 +16914,7 @@ collectSecLabels(Archive *fout)
 
 	appendPQExpBufferStr(query,
 						 "SELECT label, provider, classoid, objoid, objsubid "
-						 "FROM pg_catalog.pg_seclabel "
+						 "FROM pg_catalog.pg_seclabels "
 						 "ORDER BY classoid, objoid, objsubid");
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -17336,6 +17539,9 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
 						appendPQExpBuffer(q, "CONSTRAINT %s NOT NULL %s",
 										  tbinfo->notnull_constrs[j],
 										  fmtId(tbinfo->attnames[j]));
+
+					if (tbinfo->notnull_noinh[j])
+						appendPQExpBufferStr(q, " NO INHERIT");
 				}
 			}
 
@@ -18707,14 +18913,23 @@ dumpConstraint(Archive *fout, const ConstraintInfo *coninfo)
 										  .dropStmt = delq->data));
 		}
 	}
-	else if (coninfo->contype == 'c' && tbinfo == NULL)
+	else if (tbinfo == NULL)
 	{
-		/* CHECK constraint on a domain */
+		/* CHECK, NOT NULL constraint on a domain */
 		TypeInfo   *tyinfo = coninfo->condomain;
 
+		Assert(coninfo->contype == 'c' || coninfo->contype == 'n');
+
 		/* Ignore if not to be dumped separately */
 		if (coninfo->separate)
 		{
+			const char *keyword;
+
+			if (coninfo->contype == 'c')
+				keyword = "CHECK CONSTRAINT";
+			else
+				keyword = "CONSTRAINT";
+
 			appendPQExpBuffer(q, "ALTER DOMAIN %s\n",
 							  fmtQualifiedDumpable(tyinfo));
 			appendPQExpBuffer(q, "    ADD CONSTRAINT %s %s;\n",
@@ -18733,10 +18948,26 @@ dumpConstraint(Archive *fout, const ConstraintInfo *coninfo)
 							 ARCHIVE_OPTS(.tag = tag,
 										  .namespace = tyinfo->dobj.namespace->dobj.name,
 										  .owner = tyinfo->rolname,
-										  .description = "CHECK CONSTRAINT",
+										  .description = keyword,
 										  .section = SECTION_POST_DATA,
 										  .createStmt = q->data,
 										  .dropStmt = delq->data));
+
+			if (coninfo->dobj.dump & DUMP_COMPONENT_COMMENT)
+			{
+				PQExpBuffer conprefix = createPQExpBuffer();
+				char	   *qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+
+				appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
+								  fmtId(coninfo->dobj.name));
+
+				dumpComment(fout, conprefix->data, qtypname,
+							tyinfo->dobj.namespace->dobj.name,
+							tyinfo->rolname,
+							coninfo->dobj.catId, 0, coninfo->dobj.dumpId);
+				destroyPQExpBuffer(conprefix);
+				free(qtypname);
+			}
 		}
 	}
 	else
@@ -18869,6 +19100,7 @@ collectSequences(Archive *fout)
 		sequences[i].flags = atoi(PQgetvalue(res, 0, 7));
 		sequences[i].last_value = strtoi64(PQgetvalue(res, i, 8), NULL, 10);
 		sequences[i].is_called = (strcmp(PQgetvalue(res, i, 9), "t") == 0);
+		sequences[i].null_seqtuple = (PQgetisnull(res, i, 8) || PQgetisnull(res, i, 9));
 	}
 
 	PQclear(res);
@@ -18970,7 +19202,7 @@ dumpSequence(Archive *fout, const TableInfo *tbinfo)
 		default_minv = is_ascending ? 1 : PG_INT64_MIN;
 		default_maxv = is_ascending ? PG_INT64_MAX : -1;
 	}
-	else if (db_mode == DB_PG)
+	else
 	{
 		pg_fatal("unrecognized sequence type: %d", seq->seqtype);
 		default_minv = default_maxv = 0;	/* keep compiler quiet */
@@ -19191,7 +19423,13 @@ dumpSequenceData(Archive *fout, const TableDataInfo *tdinfo)
 	TableInfo  *tbinfo = tdinfo->tdtable;
 	int64		last;
 	bool		called;
-	PQExpBuffer query = createPQExpBuffer();
+	PQExpBuffer query;
+
+	/* needn't bother if not dumping sequence data */
+	if (!fout->dopt->dumpData && !fout->dopt->sequence_data)
+		return;
+
+	query = createPQExpBuffer();
 
 	/*
 	 * For versions >= 18, the sequence information is gathered in the sorted
@@ -19234,6 +19472,12 @@ dumpSequenceData(Archive *fout, const TableDataInfo *tdinfo)
 		entry = bsearch(&key, sequences, nsequences,
 						sizeof(SequenceItem), SequenceItemCmp);
 
+		if (entry->null_seqtuple)
+			pg_fatal("failed to get data for sequence \"%s\"; user may lack "
+					 "SELECT privilege on the sequence or the sequence may "
+					 "have been concurrently dropped",
+					 tbinfo->dobj.name);
+
 		last = entry->last_value;
 		called = entry->is_called;
 	}
@@ -19464,6 +19708,11 @@ dumpEventTrigger(Archive *fout, const EventTriggerInfo *evtinfo)
 					NULL, evtinfo->evtowner,
 					evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
 
+	if (evtinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
+		dumpSecLabel(fout, "EVENT TRIGGER", qevtname,
+					 NULL, evtinfo->evtowner,
+					 evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
+
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(delqry);
 	free(qevtname);
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index 7ed527db58e..5d351c14370 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/pg_dump/pg_dump.h
  *
@@ -224,7 +224,9 @@ typedef struct _typeInfo
 	bool		isDefined;		/* true if typisdefined */
 	/* If needed, we'll create a "shell type" entry for it; link that here: */
 	struct _shellTypeInfo *shellType;	/* shell-type entry, or NULL */
-	/* If it's a domain, we store links to its constraints here: */
+	/* If it's a domain, its not-null constraint is here: */
+	struct _constraintInfo *notnull;
+	/* If it's a domain, we store links to its CHECK constraints here: */
 	int			nDomChecks;
 	struct _constraintInfo *domChecks;
 } TypeInfo;
@@ -271,6 +273,8 @@ typedef struct _oprInfo
 	DumpableObject dobj;
 	const char *rolname;
 	char		oprkind;
+	Oid			oprleft;
+	Oid			oprright;
 	Oid			oprcode;
 } OprInfo;
 
@@ -284,12 +288,14 @@ typedef struct _accessMethodInfo
 typedef struct _opclassInfo
 {
 	DumpableObject dobj;
+	Oid			opcmethod;
 	const char *rolname;
 } OpclassInfo;
 
 typedef struct _opfamilyInfo
 {
 	DumpableObject dobj;
+	Oid			opfmethod;
 	const char *rolname;
 } OpfamilyInfo;
 
@@ -297,6 +303,7 @@ typedef struct _collInfo
 {
 	DumpableObject dobj;
 	const char *rolname;
+	int			collencoding;
 } CollInfo;
 
 typedef struct _convInfo
@@ -772,6 +779,7 @@ extern TableInfo *findTableByOid(Oid oid);
 extern TypeInfo *findTypeByOid(Oid oid);
 extern FuncInfo *findFuncByOid(Oid oid);
 extern OprInfo *findOprByOid(Oid oid);
+extern AccessMethodInfo *findAccessMethodByOid(Oid oid);
 extern CollInfo *findCollationByOid(Oid oid);
 extern NamespaceInfo *findNamespaceByOid(Oid oid);
 extern ExtensionInfo *findExtensionByOid(Oid oid);
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 8f1134bfce8..1cdb7822bd7 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -78,10 +78,10 @@ enum dbObjectTypePriorities
 	PRIO_TABLE_ATTACH,
 	PRIO_DUMMY_TYPE,
 	PRIO_ATTRDEF,
-	PRIO_LARGE_OBJECT,
 	PRIO_PRE_DATA_BOUNDARY,		/* boundary! */
 	PRIO_TABLE_DATA,
 	PRIO_SEQUENCE_SET,
+	PRIO_LARGE_OBJECT,
 	PRIO_LARGE_OBJECT_DATA,
 	PRIO_STATISTICS_DATA_DATA,
 	PRIO_POST_DATA_BOUNDARY,	/* boundary! */
@@ -165,6 +165,8 @@ static DumpId postDataBoundId;
 
 
 static int	DOTypeNameCompare(const void *p1, const void *p2);
+static int	pgTypeNameCompare(Oid typid1, Oid typid2);
+static int	accessMethodNameCompare(Oid am1, Oid am2);
 static bool TopoSort(DumpableObject **objs,
 					 int numObjs,
 					 DumpableObject **ordering,
@@ -231,12 +233,39 @@ DOTypeNameCompare(const void *p1, const void *p2)
 	else if (obj2->namespace)
 		return 1;
 
-	/* Sort by name */
+	/*
+	 * Sort by name.  With a few exceptions, names here are single catalog
+	 * columns.  To get a fuller picture, grep pg_dump.c for "dobj.name = ".
+	 * Names here don't match "Name:" in plain format output, which is a
+	 * _tocEntry.tag.  For example, DumpableObject.name of a constraint is
+	 * pg_constraint.conname, but _tocEntry.tag of a constraint is relname and
+	 * conname joined with a space.
+	 */
 	cmpval = strcmp(obj1->name, obj2->name);
 	if (cmpval != 0)
 		return cmpval;
 
-	/* To have a stable sort order, break ties for some object types */
+	/*
+	 * Sort by type.  This helps types that share a type priority without
+	 * sharing a unique name constraint, e.g. opclass and opfamily.
+	 */
+	cmpval = obj1->objType - obj2->objType;
+	if (cmpval != 0)
+		return cmpval;
+
+	/*
+	 * To have a stable sort order, break ties for some object types.  Most
+	 * catalogs have a natural key, e.g. pg_proc_proname_args_nsp_index. Where
+	 * the above "namespace" and "name" comparisons don't cover all natural
+	 * key columns, compare the rest here.
+	 *
+	 * The natural key usually refers to other catalogs by surrogate keys.
+	 * Hence, this translates each of those references to the natural key of
+	 * the referenced catalog.  That may descend through multiple levels of
+	 * catalog references.  For example, to sort by pg_proc.proargtypes,
+	 * descend to each pg_type and then further to its pg_namespace, for an
+	 * overall sort by (nspname, typname).
+	 */
 	if (obj1->objType == DO_FUNC || obj1->objType == DO_AGG)
 	{
 		FuncInfo   *fobj1 = *(FuncInfo *const *) p1;
@@ -249,22 +278,10 @@ DOTypeNameCompare(const void *p1, const void *p2)
 			return cmpval;
 		for (i = 0; i < fobj1->nargs; i++)
 		{
-			TypeInfo   *argtype1 = findTypeByOid(fobj1->argtypes[i]);
-			TypeInfo   *argtype2 = findTypeByOid(fobj2->argtypes[i]);
-
-			if (argtype1 && argtype2)
-			{
-				if (argtype1->dobj.namespace && argtype2->dobj.namespace)
-				{
-					cmpval = strcmp(argtype1->dobj.namespace->dobj.name,
-									argtype2->dobj.namespace->dobj.name);
-					if (cmpval != 0)
-						return cmpval;
-				}
-				cmpval = strcmp(argtype1->dobj.name, argtype2->dobj.name);
-				if (cmpval != 0)
-					return cmpval;
-			}
+			cmpval = pgTypeNameCompare(fobj1->argtypes[i],
+									   fobj2->argtypes[i]);
+			if (cmpval != 0)
+				return cmpval;
 		}
 	}
 	else if (obj1->objType == DO_OPERATOR)
@@ -276,6 +293,57 @@ DOTypeNameCompare(const void *p1, const void *p2)
 		cmpval = (oobj2->oprkind - oobj1->oprkind);
 		if (cmpval != 0)
 			return cmpval;
+		/* Within an oprkind, sort by argument type names */
+		cmpval = pgTypeNameCompare(oobj1->oprleft, oobj2->oprleft);
+		if (cmpval != 0)
+			return cmpval;
+		cmpval = pgTypeNameCompare(oobj1->oprright, oobj2->oprright);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_OPCLASS)
+	{
+		OpclassInfo *opcobj1 = *(OpclassInfo *const *) p1;
+		OpclassInfo *opcobj2 = *(OpclassInfo *const *) p2;
+
+		/* Sort by access method name, per pg_opclass_am_name_nsp_index */
+		cmpval = accessMethodNameCompare(opcobj1->opcmethod,
+										 opcobj2->opcmethod);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_OPFAMILY)
+	{
+		OpfamilyInfo *opfobj1 = *(OpfamilyInfo *const *) p1;
+		OpfamilyInfo *opfobj2 = *(OpfamilyInfo *const *) p2;
+
+		/* Sort by access method name, per pg_opfamily_am_name_nsp_index */
+		cmpval = accessMethodNameCompare(opfobj1->opfmethod,
+										 opfobj2->opfmethod);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_COLLATION)
+	{
+		CollInfo   *cobj1 = *(CollInfo *const *) p1;
+		CollInfo   *cobj2 = *(CollInfo *const *) p2;
+
+		/*
+		 * Sort by encoding, per pg_collation_name_enc_nsp_index. Technically,
+		 * this is not necessary, because wherever this changes dump order,
+		 * restoring the dump fails anyway.  CREATE COLLATION can't create a
+		 * tie for this to break, because it imposes restrictions to make
+		 * (nspname, collname) uniquely identify a collation within a given
+		 * DatabaseEncoding.  While pg_import_system_collations() can create a
+		 * tie, pg_dump+restore fails after
+		 * pg_import_system_collations('my_schema') does so. However, there's
+		 * little to gain by ignoring one natural key column on the basis of
+		 * those limitations elsewhere, so respect the full natural key like
+		 * we do for other object types.
+		 */
+		cmpval = cobj1->collencoding - cobj2->collencoding;
+		if (cmpval != 0)
+			return cmpval;
 	}
 	else if (obj1->objType == DO_ATTRDEF)
 	{
@@ -320,11 +388,167 @@ DOTypeNameCompare(const void *p1, const void *p2)
 		if (cmpval != 0)
 			return cmpval;
 	}
+	else if (obj1->objType == DO_CONSTRAINT ||
+			 obj1->objType == DO_FK_CONSTRAINT)
+	{
+		ConstraintInfo *robj1 = *(ConstraintInfo *const *) p1;
+		ConstraintInfo *robj2 = *(ConstraintInfo *const *) p2;
+
+		/*
+		 * Sort domain constraints before table constraints, for consistency
+		 * with our decision to sort CREATE DOMAIN before CREATE TABLE.
+		 */
+		if (robj1->condomain)
+		{
+			if (robj2->condomain)
+			{
+				/* Sort by domain name (domain namespace was considered) */
+				cmpval = strcmp(robj1->condomain->dobj.name,
+								robj2->condomain->dobj.name);
+				if (cmpval != 0)
+					return cmpval;
+			}
+			else
+				return PRIO_TYPE - PRIO_TABLE;
+		}
+		else if (robj2->condomain)
+			return PRIO_TABLE - PRIO_TYPE;
+		else
+		{
+			/* Sort by table name (table namespace was considered already) */
+			cmpval = strcmp(robj1->contable->dobj.name,
+							robj2->contable->dobj.name);
+			if (cmpval != 0)
+				return cmpval;
+		}
+	}
+	else if (obj1->objType == DO_DEFAULT_ACL)
+	{
+		DefaultACLInfo *daclobj1 = *(DefaultACLInfo *const *) p1;
+		DefaultACLInfo *daclobj2 = *(DefaultACLInfo *const *) p2;
+
+		/*
+		 * Sort by defaclrole, per pg_default_acl_role_nsp_obj_index.  The
+		 * (namespace, name) match (defaclnamespace, defaclobjtype).
+		 */
+		cmpval = strcmp(daclobj1->defaclrole, daclobj2->defaclrole);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_PUBLICATION_REL)
+	{
+		PublicationRelInfo *probj1 = *(PublicationRelInfo *const *) p1;
+		PublicationRelInfo *probj2 = *(PublicationRelInfo *const *) p2;
 
-	/* Usually shouldn't get here, but if we do, sort by OID */
+		/* Sort by publication name, since (namespace, name) match the rel */
+		cmpval = strcmp(probj1->publication->dobj.name,
+						probj2->publication->dobj.name);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_PUBLICATION_TABLE_IN_SCHEMA)
+	{
+		PublicationSchemaInfo *psobj1 = *(PublicationSchemaInfo *const *) p1;
+		PublicationSchemaInfo *psobj2 = *(PublicationSchemaInfo *const *) p2;
+
+		/* Sort by publication name, since ->name is just nspname */
+		cmpval = strcmp(psobj1->publication->dobj.name,
+						psobj2->publication->dobj.name);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	else if (obj1->objType == DO_SUBSCRIPTION_REL)
+	{
+		SubRelInfo *srobj1 = *(SubRelInfo *const *) p1;
+		SubRelInfo *srobj2 = *(SubRelInfo *const *) p2;
+
+		/* Sort by subscription name, since (namespace, name) match the rel */
+		cmpval = strcmp(srobj1->subinfo->dobj.name,
+						srobj2->subinfo->dobj.name);
+		if (cmpval != 0)
+			return cmpval;
+	}
+
+	/*
+	 * Shouldn't get here except after catalog corruption, but if we do, sort
+	 * by OID.  This may make logically-identical databases differ in the
+	 * order of objects in dump output.  Users will get spurious schema diffs.
+	 * Expect flaky failures of 002_pg_upgrade.pl test 'dump outputs from
+	 * original and restored regression databases match' if the regression
+	 * database contains objects allowing that test to reach here.  That's a
+	 * consequence of the test using "pg_restore -j", which doesn't fully
+	 * constrain OID assignment order.
+	 */
 	return oidcmp(obj1->catId.oid, obj2->catId.oid);
 }
 
+/* Compare two OID-identified pg_type values by nspname, then by typname. */
+static int
+pgTypeNameCompare(Oid typid1, Oid typid2)
+{
+	TypeInfo   *typobj1;
+	TypeInfo   *typobj2;
+	int			cmpval;
+
+	if (typid1 == typid2)
+		return 0;
+
+	typobj1 = findTypeByOid(typid1);
+	typobj2 = findTypeByOid(typid2);
+
+	if (!typobj1 || !typobj2)
+	{
+		/*
+		 * getTypes() didn't find some OID.  Assume catalog corruption, e.g.
+		 * an oprright value without the corresponding OID in a pg_type row.
+		 * Report as "equal", so the caller uses the next available basis for
+		 * comparison, e.g. the next function argument.
+		 *
+		 * Unary operators have InvalidOid in oprleft (if oprkind='r') or in
+		 * oprright (if oprkind='l').  Caller already sorted by oprkind,
+		 * calling us only for like-kind operators.  Hence, "typid1 == typid2"
+		 * took care of InvalidOid.  (v14 removed postfix operator support.
+		 * Hence, when dumping from v14+, only oprleft can be InvalidOid.)
+		 */
+		Assert(false);
+		return 0;
+	}
+
+	if (!typobj1->dobj.namespace || !typobj2->dobj.namespace)
+		Assert(false);			/* catalog corruption */
+	else
+	{
+		cmpval = strcmp(typobj1->dobj.namespace->dobj.name,
+						typobj2->dobj.namespace->dobj.name);
+		if (cmpval != 0)
+			return cmpval;
+	}
+	return strcmp(typobj1->dobj.name, typobj2->dobj.name);
+}
+
+/* Compare two OID-identified pg_am values by amname. */
+static int
+accessMethodNameCompare(Oid am1, Oid am2)
+{
+	AccessMethodInfo *amobj1;
+	AccessMethodInfo *amobj2;
+
+	if (am1 == am2)
+		return 0;
+
+	amobj1 = findAccessMethodByOid(am1);
+	amobj2 = findAccessMethodByOid(am2);
+
+	if (!amobj1 || !amobj2)
+	{
+		/* catalog corruption: handle like pgTypeNameCompare() does */
+		Assert(false);
+		return 0;
+	}
+
+	return strcmp(amobj1->dobj.name, amobj2->dobj.name);
+}
+
 
 /*
  * Sort the given objects into a safe dump order using dependency
@@ -910,7 +1134,7 @@ repairTableAttrDefMultiLoop(DumpableObject *tableobj,
 }
 
 /*
- * CHECK constraints on domains work just like those on tables ...
+ * CHECK, NOT NULL constraints on domains work just like those on tables ...
  */
 static void
 repairDomainConstraintLoop(DumpableObject *domainobj,
@@ -1176,11 +1400,12 @@ repairDependencyLoop(DumpableObject **loop,
 		}
 	}
 
-	/* Domain and CHECK constraint */
+	/* Domain and CHECK or NOT NULL constraint */
 	if (nLoop == 2 &&
 		loop[0]->objType == DO_TYPE &&
 		loop[1]->objType == DO_CONSTRAINT &&
-		((ConstraintInfo *) loop[1])->contype == 'c' &&
+		(((ConstraintInfo *) loop[1])->contype == 'c' ||
+		 ((ConstraintInfo *) loop[1])->contype == 'n') &&
 		((ConstraintInfo *) loop[1])->condomain == (TypeInfo *) loop[0])
 	{
 		repairDomainConstraintLoop(loop[0], loop[1]);
@@ -1189,14 +1414,15 @@ repairDependencyLoop(DumpableObject **loop,
 	if (nLoop == 2 &&
 		loop[1]->objType == DO_TYPE &&
 		loop[0]->objType == DO_CONSTRAINT &&
-		((ConstraintInfo *) loop[0])->contype == 'c' &&
+		(((ConstraintInfo *) loop[0])->contype == 'c' ||
+		 ((ConstraintInfo *) loop[0])->contype == 'n') &&
 		((ConstraintInfo *) loop[0])->condomain == (TypeInfo *) loop[1])
 	{
 		repairDomainConstraintLoop(loop[1], loop[0]);
 		return;
 	}
 
-	/* Indirect loop involving domain and CHECK constraint */
+	/* Indirect loop involving domain and CHECK or NOT NULL constraint */
 	if (nLoop > 2)
 	{
 		for (i = 0; i < nLoop; i++)
@@ -1206,7 +1432,8 @@ repairDependencyLoop(DumpableObject **loop,
 				for (j = 0; j < nLoop; j++)
 				{
 					if (loop[j]->objType == DO_CONSTRAINT &&
-						((ConstraintInfo *) loop[j])->contype == 'c' &&
+						(((ConstraintInfo *) loop[j])->contype == 'c' ||
+						 ((ConstraintInfo *) loop[j])->contype == 'n') &&
 						((ConstraintInfo *) loop[j])->condomain == (TypeInfo *) loop[i])
 					{
 						repairDomainConstraintMultiLoop(loop[i], loop[j]);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 17586593352..a5d9a5426bc 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * pg_dumpall forces all pg_dump output to be text, since it also outputs
  * text into the same output stream.
@@ -67,10 +67,9 @@ static void dropTablespaces(PGconn *conn);
 static void dumpTablespaces(PGconn *conn);
 static void dropDBs(PGconn *conn);
 static void dumpUserConfig(PGconn *conn, const char *username);
-static void dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat);
+static void dumpDatabases(PGconn *conn);
 static void dumpTimestamp(const char *msg);
-static int	runPgDump(const char *dbname, const char *create_opts,
-					  char *dbfile, ArchiveFormat archDumpFormat);
+static int	runPgDump(const char *dbname, const char *create_opts);
 static void buildShSecLabels(PGconn *conn,
 							 const char *catalog_name, Oid objectId,
 							 const char *objtype, const char *objname,
@@ -79,7 +78,6 @@ static void executeCommand(PGconn *conn, const char *query);
 static void expand_dbname_patterns(PGconn *conn, SimpleStringList *patterns,
 								   SimpleStringList *names);
 static void read_dumpall_filters(const char *filename, SimpleStringList *pattern);
-static ArchiveFormat parseDumpFormat(const char *format);
 
 static char pg_dump_bin[MAXPGPATH];
 static PQExpBuffer pgdumpopts;
@@ -109,8 +107,6 @@ static int	no_subscriptions = 0;
 static int	no_toast_compression = 0;
 static int	no_unlogged_table_data = 0;
 static int	no_role_passwords = 0;
-static int	with_data = 0;
-static int	with_schema = 0;
 static int	with_statistics = 0;
 static int	server_version;
 static int	load_via_partition_root = 0;
@@ -128,6 +124,8 @@ static char *filename = NULL;
 static SimpleStringList database_exclude_patterns = {NULL, NULL};
 static SimpleStringList database_exclude_names = {NULL, NULL};
 
+static char *restrict_key;
+
 int
 main(int argc, char *argv[])
 {
@@ -152,7 +150,6 @@ main(int argc, char *argv[])
 		{"password", no_argument, NULL, 'W'},
 		{"no-privileges", no_argument, NULL, 'x'},
 		{"no-acl", no_argument, NULL, 'x'},
-		{"format", required_argument, NULL, 'F'},
 
 		/*
 		 * the following options don't have an equivalent short option letter
@@ -185,14 +182,13 @@ main(int argc, char *argv[])
 		{"no-sync", no_argument, NULL, 4},
 		{"no-toast-compression", no_argument, &no_toast_compression, 1},
 		{"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
-		{"with-data", no_argument, &with_data, 1},
-		{"with-schema", no_argument, &with_schema, 1},
-		{"with-statistics", no_argument, &with_statistics, 1},
 		{"on-conflict-do-nothing", no_argument, &on_conflict_do_nothing, 1},
 		{"rows-per-insert", required_argument, NULL, 7},
+		{"statistics", no_argument, &with_statistics, 1},
 		{"statistics-only", no_argument, &statistics_only, 1},
 		{"filter", required_argument, NULL, 8},
 		{"sequence-data", no_argument, &sequence_data, 1},
+		{"restrict-key", required_argument, NULL, 9},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -203,8 +199,6 @@ main(int argc, char *argv[])
 	char	   *pgdb = NULL;
 	char	   *use_role = NULL;
 	const char *dumpencoding = NULL;
-	ArchiveFormat archDumpFormat = archNull;
-	const char *formatName = "p";
 	trivalue	prompt_password = TRI_DEFAULT;
 	bool		data_only = false;
 	bool		globals_only = false;
@@ -254,7 +248,7 @@ main(int argc, char *argv[])
 
 	pgdumpopts = createPQExpBuffer();
 
-	while ((c = getopt_long(argc, argv, "acd:E:f:F:gh:l:Op:rsS:tU:vwWx", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "acd:E:f:gh:l:Op:rsS:tU:vwWx", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
@@ -282,9 +276,7 @@ main(int argc, char *argv[])
 				appendPQExpBufferStr(pgdumpopts, " -f ");
 				appendShellString(pgdumpopts, filename);
 				break;
-			case 'F':
-				formatName = pg_strdup(optarg);
-				break;
+
 			case 'g':
 				globals_only = true;
 				break;
@@ -384,6 +376,12 @@ main(int argc, char *argv[])
 				read_dumpall_filters(optarg, &database_exclude_patterns);
 				break;
 
+			case 9:
+				restrict_key = pg_strdup(optarg);
+				appendPQExpBufferStr(pgdumpopts, " --restrict-key ");
+				appendShellString(pgdumpopts, optarg);
+				break;
+
 			default:
 				/* getopt_long already emitted a complaint */
 				pg_log_error_hint("Try \"%s --help\" for more information.", progname);
@@ -403,7 +401,9 @@ main(int argc, char *argv[])
 	if (database_exclude_patterns.head != NULL &&
 		(globals_only || roles_only || tablespaces_only))
 	{
-		pg_log_error("option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only");
+		pg_log_error("option %s cannot be used together with %s, %s, or %s",
+					 "--exclude-database",
+					 "-g/--globals-only", "-r/--roles-only", "-t/--tablespaces-only");
 		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 		exit_nicely(1);
 	}
@@ -411,39 +411,28 @@ main(int argc, char *argv[])
 	/* Make sure the user hasn't specified a mix of globals-only options */
 	if (globals_only && roles_only)
 	{
-		pg_log_error("options -g/--globals-only and -r/--roles-only cannot be used together");
+		pg_log_error("options %s and %s cannot be used together",
+					 "-g/--globals-only", "-r/--roles-only");
 		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 		exit_nicely(1);
 	}
 
 	if (globals_only && tablespaces_only)
 	{
-		pg_log_error("options -g/--globals-only and -t/--tablespaces-only cannot be used together");
+		pg_log_error("options %s and %s cannot be used together",
+					 "-g/--globals-only", "-t/--tablespaces-only");
 		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 		exit_nicely(1);
 	}
 
 	if (if_exists && !output_clean)
-		pg_fatal("option --if-exists requires option -c/--clean");
+		pg_fatal("option %s requires option %s",
+				 "--if-exists", "-c/--clean");
 
 	if (roles_only && tablespaces_only)
 	{
-		pg_log_error("options -r/--roles-only and -t/--tablespaces-only cannot be used together");
-		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
-		exit_nicely(1);
-	}
-
-	/* Get format for dump. */
-	archDumpFormat = parseDumpFormat(formatName);
-
-	/*
-	 * If a non-plain format is specified, a file name is also required as the
-	 * path to the main directory.
-	 */
-	if (archDumpFormat != archNull &&
-		(!filename || strcmp(filename, "") == 0))
-	{
-		pg_log_error("option -F/--format=d|c|t requires option -f/--file");
+		pg_log_error("options %s and %s cannot be used together",
+					 "-r/--roles-only", "-t/--tablespaces-only");
 		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 		exit_nicely(1);
 	}
@@ -499,12 +488,8 @@ main(int argc, char *argv[])
 		appendPQExpBufferStr(pgdumpopts, " --no-toast-compression");
 	if (no_unlogged_table_data)
 		appendPQExpBufferStr(pgdumpopts, " --no-unlogged-table-data");
-	if (with_data)
-		appendPQExpBufferStr(pgdumpopts, " --with-data");
-	if (with_schema)
-		appendPQExpBufferStr(pgdumpopts, " --with-schema");
 	if (with_statistics)
-		appendPQExpBufferStr(pgdumpopts, " --with-statistics");
+		appendPQExpBufferStr(pgdumpopts, " --statistics");
 	if (on_conflict_do_nothing)
 		appendPQExpBufferStr(pgdumpopts, " --on-conflict-do-nothing");
 	if (statistics_only)
@@ -513,31 +498,14 @@ main(int argc, char *argv[])
 		appendPQExpBufferStr(pgdumpopts, " --sequence-data");
 
 	/*
-	 * Open the output file if required, otherwise use stdout.  If required,
-	 * then create new directory and global.dat file.
+	 * If you don't provide a restrict key, one will be appointed for you.
 	 */
-	if (archDumpFormat != archNull)
-	{
-		char		global_path[MAXPGPATH];
-
-		/* Create new directory or accept the empty existing directory. */
-		create_or_open_dir(filename);
-
-		snprintf(global_path, MAXPGPATH, "%s/global.dat", filename);
-
-		OPF = fopen(global_path, PG_BINARY_W);
-		if (!OPF)
-			pg_fatal("could not open file \"%s\": %m", global_path);
-	}
-	else if (filename)
-	{
-		OPF = fopen(filename, PG_BINARY_W);
-		if (!OPF)
-			pg_fatal("could not open output file \"%s\": %m",
-					 filename);
-	}
-	else
-		OPF = stdout;
+	if (!restrict_key)
+		restrict_key = generate_restrict_key();
+	if (!restrict_key)
+		pg_fatal("could not generate restrict key");
+	if (!valid_restrict_key(restrict_key))
+		pg_fatal("invalid restrict key");
 
 	/*
 	 * If there was a database specified on the command line, use that,
@@ -581,6 +549,19 @@ main(int argc, char *argv[])
 	expand_dbname_patterns(conn, &database_exclude_patterns,
 						   &database_exclude_names);
 
+	/*
+	 * Open the output file if required, otherwise use stdout
+	 */
+	if (filename)
+	{
+		OPF = fopen(filename, PG_BINARY_W);
+		if (!OPF)
+			pg_fatal("could not open output file \"%s\": %m",
+					 filename);
+	}
+	else
+		OPF = stdout;
+
 	/*
 	 * Set the client encoding if requested.
 	 */
@@ -619,6 +600,16 @@ main(int argc, char *argv[])
 	if (verbose)
 		dumpTimestamp("Started on");
 
+	/*
+	 * Enter restricted mode to block any unexpected psql meta-commands.  A
+	 * malicious source might try to inject a variety of things via bogus
+	 * responses to queries.  While we cannot prevent such sources from
+	 * affecting the destination at restore time, we can block psql
+	 * meta-commands so that the client machine that runs psql with the dump
+	 * output remains unaffected.
+	 */
+	fprintf(OPF, "\\restrict %s\n\n", restrict_key);
+
 	/*
 	 * We used to emit \connect postgres here, but that served no purpose
 	 * other than to break things for installations without a postgres
@@ -638,7 +629,7 @@ main(int argc, char *argv[])
 	fprintf(OPF, "SET ivorysql.identifier_case_switch = normal;\n");
 	fprintf(OPF, "\n");
 
-	if (!data_only)
+	if (!data_only && !statistics_only && !no_schema)
 	{
 		/*
 		 * If asked to --clean, do that first.  We can avoid detailed
@@ -680,8 +671,14 @@ main(int argc, char *argv[])
 			dumpTablespaces(conn);
 	}
 
+	/*
+	 * Exit restricted mode just before dumping the databases.  pg_dump will
+	 * handle entering restricted mode again as appropriate.
+	 */
+	fprintf(OPF, "\\unrestrict %s\n\n", restrict_key);
+
 	if (!globals_only && !roles_only && !tablespaces_only)
-		dumpDatabases(conn, archDumpFormat);
+		dumpDatabases(conn);
 
 	PQfinish(conn);
 
@@ -694,7 +691,7 @@ main(int argc, char *argv[])
 		fclose(OPF);
 
 		/* sync the resulting file, errors are not fatal */
-		if (dosync && (archDumpFormat == archNull))
+		if (dosync)
 			(void) fsync_fname(filename, false);
 	}
 
@@ -705,14 +702,12 @@ main(int argc, char *argv[])
 static void
 help(void)
 {
-	printf(_("%s exports a PostgreSQL database cluster as an SQL script or to other formats.\n\n"), progname);
+	printf(_("%s exports a PostgreSQL database cluster as an SQL script.\n\n"), progname);
 	printf(_("Usage:\n"));
 	printf(_("  %s [OPTION]...\n"), progname);
 
 	printf(_("\nGeneral options:\n"));
 	printf(_("  -f, --file=FILENAME          output file name\n"));
-	printf(_("  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
-			 "                               plain text (default))\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"));
@@ -754,15 +749,14 @@ help(void)
 	printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
 	printf(_("  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"));
 	printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
+	printf(_("  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"));
 	printf(_("  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"));
 	printf(_("  --sequence-data              include sequence data in dump\n"));
+	printf(_("  --statistics                 dump the statistics\n"));
 	printf(_("  --statistics-only            dump only the statistics, not schema or data\n"));
 	printf(_("  --use-set-session-authorization\n"
 			 "                               use SET SESSION AUTHORIZATION commands instead of\n"
 			 "                               ALTER OWNER commands to set ownership\n"));
-	printf(_("  --with-data                  dump the data\n"));
-	printf(_("  --with-schema                dump the schema\n"));
-	printf(_("  --with-statistics            dump the statistics\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -d, --dbname=CONNSTR     connect using connection string\n"));
@@ -1019,6 +1013,9 @@ dumpRoles(PGconn *conn)
 	 * We do it this way because config settings for roles could mention the
 	 * names of other roles.
 	 */
+	if (PQntuples(res) > 0)
+		fprintf(OPF, "\n--\n-- User Configurations\n--\n");
+
 	for (i = 0; i < PQntuples(res); i++)
 		dumpUserConfig(conn, PQgetvalue(res, i, i_rolname));
 
@@ -1068,7 +1065,7 @@ dumpRoleMembership(PGconn *conn)
 	 * that no longer exist.  If we find such cases, print a warning and skip
 	 * the entry.
 	 */
-	dump_grantors = (PQserverVersion(conn) >= 160000);
+	dump_grantors = (server_version >= 160000);
 
 	/*
 	 * Previous versions of PostgreSQL also did not have grant-level options.
@@ -1133,7 +1130,7 @@ dumpRoleMembership(PGconn *conn)
 		if (PQgetisnull(res, start, i_role))
 		{
 			/* translator: %s represents a numeric role OID */
-			pg_log_warning("found orphaned pg_auth_members entry for role %s",
+			pg_log_warning("ignoring role grant for missing role with OID %s",
 						   PQgetvalue(res, start, i_roleid));
 			break;
 		}
@@ -1150,6 +1147,11 @@ dumpRoleMembership(PGconn *conn)
 
 		remaining = end - start;
 		done = pg_malloc0(remaining * sizeof(bool));
+
+		/*
+		 * We use a hashtable to track the member names that have been granted
+		 * admin option.  Usually a hashtable is overkill, but sometimes not.
+		 */
 		ht = rolename_create(remaining, NULL);
 
 		/*
@@ -1177,50 +1179,56 @@ dumpRoleMembership(PGconn *conn)
 			for (i = start; i < end; ++i)
 			{
 				char	   *member;
-				char	   *admin_option;
 				char	   *grantorid;
-				char	   *grantor;
+				char	   *grantor = NULL;
+				bool		dump_this_grantor = dump_grantors;
 				char	   *set_option = "true";
+				char	   *admin_option;
 				bool		found;
 
 				/* If we already did this grant, don't do it again. */
 				if (done[i - start])
 					continue;
 
-				/* Complain about, then ignore, entries with orphaned OIDs. */
+				/* Complain about, then ignore, entries for unknown members. */
 				if (PQgetisnull(res, i, i_member))
 				{
 					/* translator: %s represents a numeric role OID */
-					pg_log_warning("found orphaned pg_auth_members entry for role %s",
+					pg_log_warning("ignoring role grant to missing role with OID %s",
 								   PQgetvalue(res, i, i_memberid));
 					done[i - start] = true;
 					--remaining;
 					continue;
 				}
-				if (PQgetisnull(res, i, i_grantor))
+				member = PQgetvalue(res, i, i_member);
+
+				/* If the grantor is unknown, complain and dump without it. */
+				grantorid = PQgetvalue(res, i, i_grantorid);
+				if (dump_this_grantor)
 				{
-					/* translator: %s represents a numeric role OID */
-					pg_log_warning("found orphaned pg_auth_members entry for role %s",
-								   PQgetvalue(res, i, i_grantorid));
-					done[i - start] = true;
-					--remaining;
-					continue;
+					if (PQgetisnull(res, i, i_grantor))
+					{
+						/* translator: %s represents a numeric role OID */
+						pg_log_warning("grant of role \"%s\" to \"%s\" has invalid grantor OID %s",
+									   role, member, grantorid);
+						pg_log_warning_detail("This grant will be dumped without GRANTED BY.");
+						dump_this_grantor = false;
+					}
+					else
+						grantor = PQgetvalue(res, i, i_grantor);
 				}
 
-				member = PQgetvalue(res, i, i_member);
-				grantor = PQgetvalue(res, i, i_grantor);
-				grantorid = PQgetvalue(res, i, i_grantorid);
 				admin_option = PQgetvalue(res, i, i_admin_option);
 				if (dump_grant_options)
 					set_option = PQgetvalue(res, i, i_set_option);
 
 				/*
-				 * If we're not dumping grantors or if the grantor is the
+				 * If we're not dumping the grantor or if the grantor is the
 				 * bootstrap superuser, it's fine to dump this now. Otherwise,
 				 * it's got to be someone who has already been granted ADMIN
 				 * OPTION.
 				 */
-				if (dump_grantors &&
+				if (dump_this_grantor &&
 					atooid(grantorid) != BOOTSTRAP_SUPERUSERID &&
 					rolename_lookup(ht, grantor) == NULL)
 					continue;
@@ -1261,7 +1269,7 @@ dumpRoleMembership(PGconn *conn)
 				}
 				if (optbuf->data[0] != '\0')
 					fprintf(OPF, " WITH %s", optbuf->data);
-				if (dump_grantors)
+				if (dump_this_grantor)
 					fprintf(OPF, " GRANTED BY %s", fmtId(grantor));
 				fprintf(OPF, ";\n");
 			}
@@ -1533,7 +1541,6 @@ dumpUserConfig(PGconn *conn, const char *username)
 {
 	PQExpBuffer buf = createPQExpBuffer();
 	PGresult   *res;
-	static bool header_done = false;
 
 	printfPQExpBuffer(buf, "SELECT unnest(setconfig) FROM pg_db_role_setting "
 					  "WHERE setdatabase = 0 AND setrole = "
@@ -1546,11 +1553,11 @@ dumpUserConfig(PGconn *conn, const char *username)
 
 	if (PQntuples(res) > 0)
 	{
-		if (!header_done)
-			fprintf(OPF, "\n--\n-- User Configurations\n--\n");
-		header_done = true;
+		char	   *sanitized;
 
-		fprintf(OPF, "\n--\n-- User Config \"%s\"\n--\n\n", username);
+		sanitized = sanitize_line(username, true);
+		fprintf(OPF, "\n--\n-- User Config \"%s\"\n--\n\n", sanitized);
+		free(sanitized);
 	}
 
 	for (int i = 0; i < PQntuples(res); i++)
@@ -1625,13 +1632,10 @@ expand_dbname_patterns(PGconn *conn,
  * Dump contents of databases.
  */
 static void
-dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
+dumpDatabases(PGconn *conn)
 {
 	PGresult   *res;
 	int			i;
-	char		db_subdir[MAXPGPATH];
-	char		dbfilepath[MAXPGPATH];
-	FILE	   *map_file = NULL;
 
 	/*
 	 * Skip databases marked not datallowconn, since we'd be unable to connect
@@ -1645,42 +1649,19 @@ dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
 	 * doesn't have some failure mode with --clean.
 	 */
 	res = executeQuery(conn,
-					   "SELECT datname, oid "
+					   "SELECT datname "
 					   "FROM pg_database d "
 					   "WHERE datallowconn AND datconnlimit != -2 "
 					   "ORDER BY (datname <> 'template1'), datname");
 
-	if (archDumpFormat == archNull && PQntuples(res) > 0)
+	if (PQntuples(res) > 0)
 		fprintf(OPF, "--\n-- Databases\n--\n\n");
 
-	/*
-	 * If directory/tar/custom format is specified, create a subdirectory
-	 * under the main directory and each database dump file or subdirectory
-	 * will be created in that subdirectory by pg_dump.
-	 */
-	if (archDumpFormat != archNull)
-	{
-		char		map_file_path[MAXPGPATH];
-
-		snprintf(db_subdir, MAXPGPATH, "%s/databases", filename);
-
-		/* Create a subdirectory with 'databases' name under main directory. */
-		if (mkdir(db_subdir, pg_dir_create_mode) != 0)
-			pg_fatal("could not create directory \"%s\": %m", db_subdir);
-
-		snprintf(map_file_path, MAXPGPATH, "%s/map.dat", filename);
-
-		/* Create a map file (to store dboid and dbname) */
-		map_file = fopen(map_file_path, PG_BINARY_W);
-		if (!map_file)
-			pg_fatal("could not open file \"%s\": %m", map_file_path);
-	}
-
 	for (i = 0; i < PQntuples(res); i++)
 	{
 		char	   *dbname = PQgetvalue(res, i, 0);
-		char	   *oid = PQgetvalue(res, i, 1);
-		const char *create_opts = "";
+		char	   *sanitized;
+		const char *create_opts;
 		int			ret;
 
 		/* Skip template0, even if it's not marked !datallowconn. */
@@ -1694,27 +1675,11 @@ dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
 			continue;
 		}
 
-		/*
-		 * If this is not a plain format dump, then append dboid and dbname to
-		 * the map.dat file.
-		 */
-		if (archDumpFormat != archNull)
-		{
-			if (archDumpFormat == archCustom)
-				snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".dmp", db_subdir, oid);
-			else if (archDumpFormat == archTar)
-				snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".tar", db_subdir, oid);
-			else
-				snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\"", db_subdir, oid);
-
-			/* Put one line entry for dboid and dbname in map file. */
-			fprintf(map_file, "%s %s\n", oid, dbname);
-		}
-
 		pg_log_info("dumping database \"%s\"", dbname);
 
-		if (archDumpFormat == archNull)
-			fprintf(OPF, "--\n-- Database \"%s\" dump\n--\n\n", dbname);
+		sanitized = sanitize_line(dbname, true);
+		fprintf(OPF, "--\n-- Database \"%s\" dump\n--\n\n", sanitized);
+		free(sanitized);
 
 		/*
 		 * We assume that "template1", "postgres", and "ivorysql" already exist in the
@@ -1730,9 +1695,12 @@ dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
 		{
 			if (output_clean)
 				create_opts = "--clean --create";
-			/* Since pg_dump won't emit a \connect command, we must */
-			else if (archDumpFormat == archNull)
+			else
+			{
+				create_opts = "";
+				/* Since pg_dump won't emit a \connect command, we must */
 				fprintf(OPF, "\\connect %s\n\n", dbname);
+			}
 		}
 		else
 			create_opts = "--create";
@@ -1740,30 +1708,19 @@ dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
 		if (filename)
 			fclose(OPF);
 
-		ret = runPgDump(dbname, create_opts, dbfilepath, archDumpFormat);
+		ret = runPgDump(dbname, create_opts);
 		if (ret != 0)
 			pg_fatal("pg_dump failed on database \"%s\", exiting", dbname);
 
 		if (filename)
 		{
-			char		global_path[MAXPGPATH];
-
-			if (archDumpFormat != archNull)
-				snprintf(global_path, MAXPGPATH, "%s/global.dat", filename);
-			else
-				snprintf(global_path, MAXPGPATH, "%s", filename);
-
-			OPF = fopen(global_path, PG_BINARY_A);
+			OPF = fopen(filename, PG_BINARY_A);
 			if (!OPF)
 				pg_fatal("could not re-open the output file \"%s\": %m",
-						 global_path);
+						 filename);
 		}
 	}
 
-	/* Close map file */
-	if (archDumpFormat != archNull)
-		fclose(map_file);
-
 	PQclear(res);
 }
 
@@ -1773,8 +1730,7 @@ dumpDatabases(PGconn *conn, ArchiveFormat archDumpFormat)
  * Run pg_dump on dbname, with specified options.
  */
 static int
-runPgDump(const char *dbname, const char *create_opts, char *dbfile,
-		  ArchiveFormat archDumpFormat)
+runPgDump(const char *dbname, const char *create_opts)
 {
 	PQExpBufferData connstrbuf;
 	PQExpBufferData cmd;
@@ -1783,36 +1739,17 @@ runPgDump(const char *dbname, const char *create_opts, char *dbfile,
 	initPQExpBuffer(&connstrbuf);
 	initPQExpBuffer(&cmd);
 
+	printfPQExpBuffer(&cmd, "\"%s\" %s %s", pg_dump_bin,
+					  pgdumpopts->data, create_opts);
+
 	/*
-	 * If this is not a plain format dump, then append file name and dump
-	 * format to the pg_dump command to get archive dump.
+	 * If we have a filename, use the undocumented plain-append pg_dump
+	 * format.
 	 */
-	if (archDumpFormat != archNull)
-	{
-		printfPQExpBuffer(&cmd, "\"%s\" -f %s %s", pg_dump_bin,
-						  dbfile, create_opts);
-
-		if (archDumpFormat == archDirectory)
-			appendPQExpBufferStr(&cmd, "  --format=directory ");
-		else if (archDumpFormat == archCustom)
-			appendPQExpBufferStr(&cmd, "  --format=custom ");
-		else if (archDumpFormat == archTar)
-			appendPQExpBufferStr(&cmd, "  --format=tar ");
-	}
+	if (filename)
+		appendPQExpBufferStr(&cmd, " -Fa ");
 	else
-	{
-		printfPQExpBuffer(&cmd, "\"%s\" %s %s", pg_dump_bin,
-						  pgdumpopts->data, create_opts);
-
-		/*
-		 * If we have a filename, use the undocumented plain-append pg_dump
-		 * format.
-		 */
-		if (filename)
-			appendPQExpBufferStr(&cmd, " -Fa ");
-		else
-			appendPQExpBufferStr(&cmd, " -Fp ");
-	}
+		appendPQExpBufferStr(&cmd, " -Fp ");
 
 	/*
 	 * Append the database name to the already-constructed stem of connection
@@ -1957,36 +1894,3 @@ read_dumpall_filters(const char *filename, SimpleStringList *pattern)
 
 	filter_free(&fstate);
 }
-
-/*
- * parseDumpFormat
- *
- * This will validate dump formats.
- */
-static ArchiveFormat
-parseDumpFormat(const char *format)
-{
-	ArchiveFormat archDumpFormat;
-
-	if (pg_strcasecmp(format, "c") == 0)
-		archDumpFormat = archCustom;
-	else if (pg_strcasecmp(format, "custom") == 0)
-		archDumpFormat = archCustom;
-	else if (pg_strcasecmp(format, "d") == 0)
-		archDumpFormat = archDirectory;
-	else if (pg_strcasecmp(format, "directory") == 0)
-		archDumpFormat = archDirectory;
-	else if (pg_strcasecmp(format, "p") == 0)
-		archDumpFormat = archNull;
-	else if (pg_strcasecmp(format, "plain") == 0)
-		archDumpFormat = archNull;
-	else if (pg_strcasecmp(format, "t") == 0)
-		archDumpFormat = archTar;
-	else if (pg_strcasecmp(format, "tar") == 0)
-		archDumpFormat = archTar;
-	else
-		pg_fatal("unrecognized output format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\"",
-				 format);
-
-	return archDumpFormat;
-}
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 6ef789cb06d..84b8d410c9e 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -2,7 +2,7 @@
  *
  * pg_restore.c
  *	pg_restore is an utility extracting postgres database definitions
- *	from a backup archive created by pg_dump/pg_dumpall using the archiver
+ *	from a backup archive created by pg_dump using the archiver
  *	interface.
  *
  *	pg_restore will read the backup archive and
@@ -41,15 +41,12 @@
 #include "postgres_fe.h"
 
 #include <ctype.h>
-#include <sys/stat.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
 
-#include "common/string.h"
-#include "connectdb.h"
+#include "dumputils.h"
 #include "fe_utils/option_utils.h"
-#include "fe_utils/string_utils.h"
 #include "filter.h"
 #include "getopt_long.h"
 #include "parallel.h"
@@ -57,43 +54,18 @@
 
 static void usage(const char *progname);
 static void read_restore_filters(const char *filename, RestoreOptions *opts);
-static bool file_exists_in_directory(const char *dir, const char *filename);
-static int	restore_one_database(const char *inputFileSpec, RestoreOptions *opts,
-								 int numWorkers, bool append_data, int num);
-static int	read_one_statement(StringInfo inBuf, FILE *pfile);
-static int	restore_all_databases(PGconn *conn, const char *dumpdirpath,
-								  SimpleStringList db_exclude_patterns, RestoreOptions *opts, int numWorkers);
-static int	process_global_sql_commands(PGconn *conn, const char *dumpdirpath,
-										const char *outfile);
-static void copy_or_print_global_file(const char *outfile, FILE *pfile);
-static int	get_dbnames_list_to_restore(PGconn *conn,
-										SimplePtrList *dbname_oid_list,
-										SimpleStringList db_exclude_patterns);
-static int	get_dbname_oid_list_from_mfile(const char *dumpdirpath,
-										   SimplePtrList *dbname_oid_list);
-
-/*
- * Stores a database OID and the corresponding name.
- */
-typedef struct DbOidName
-{
-	Oid			oid;
-	char		str[FLEXIBLE_ARRAY_MEMBER]; /* null-terminated string here */
-} DbOidName;
-
 
 int
 main(int argc, char **argv)
 {
 	RestoreOptions *opts;
 	int			c;
+	int			exit_code;
 	int			numWorkers = 1;
+	Archive    *AH;
 	char	   *inputFileSpec;
 	bool		data_only = false;
 	bool		schema_only = false;
-	int			n_errors = 0;
-	bool		globals_only = false;
-	SimpleStringList db_exclude_patterns = {NULL, NULL};
 	static int	disable_triggers = 0;
 	static int	enable_row_security = 0;
 	static int	if_exists = 0;
@@ -111,15 +83,12 @@ main(int argc, char **argv)
 	static int	no_subscriptions = 0;
 	static int	strict_names = 0;
 	static int	statistics_only = 0;
-	static int	with_data = 0;
-	static int	with_schema = 0;
 	static int	with_statistics = 0;
 
 	struct option cmdopts[] = {
 		{"clean", 0, NULL, 'c'},
 		{"create", 0, NULL, 'C'},
 		{"data-only", 0, NULL, 'a'},
-		{"globals-only", 0, NULL, 'g'},
 		{"dbname", 1, NULL, 'd'},
 		{"exit-on-error", 0, NULL, 'e'},
 		{"exclude-schema", 1, NULL, 'N'},
@@ -169,12 +138,10 @@ main(int argc, char **argv)
 		{"no-security-labels", no_argument, &no_security_labels, 1},
 		{"no-subscriptions", no_argument, &no_subscriptions, 1},
 		{"no-statistics", no_argument, &no_statistics, 1},
-		{"with-data", no_argument, &with_data, 1},
-		{"with-schema", no_argument, &with_schema, 1},
-		{"with-statistics", no_argument, &with_statistics, 1},
+		{"statistics", no_argument, &with_statistics, 1},
 		{"statistics-only", no_argument, &statistics_only, 1},
 		{"filter", required_argument, NULL, 4},
-		{"exclude-database", required_argument, NULL, 6},
+		{"restrict-key", required_argument, NULL, 6},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -203,7 +170,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "acCd:ef:F:gh:I:j:lL:n:N:Op:P:RsS:t:T:U:vwWx1",
+	while ((c = getopt_long(argc, argv, "acCd:ef:F:h:I:j:lL:n:N:Op:P:RsS:t:T:U:vwWx1",
 							cmdopts, NULL)) != -1)
 	{
 		switch (c)
@@ -230,14 +197,11 @@ main(int argc, char **argv)
 				if (strlen(optarg) != 0)
 					opts->formatName = pg_strdup(optarg);
 				break;
-			case 'g':
-				/* restore only global.dat file from directory */
-				globals_only = true;
-				break;
 			case 'h':
 				if (strlen(optarg) != 0)
 					opts->cparams.pghost = pg_strdup(optarg);
 				break;
+
 			case 'j':			/* number of restore jobs */
 				if (!option_parse_int(optarg, "-j/--jobs", 1,
 									  PG_MAX_JOBS,
@@ -352,8 +316,9 @@ main(int argc, char **argv)
 					exit(1);
 				opts->exit_on_error = true;
 				break;
-			case 6:				/* database patterns to skip */
-				simple_string_list_append(&db_exclude_patterns, optarg);
+
+			case 6:
+				opts->restrict_key = pg_strdup(optarg);
 				break;
 
 			default:
@@ -382,77 +347,100 @@ main(int argc, char **argv)
 	if (!opts->cparams.dbname && !opts->filename && !opts->tocSummary)
 		pg_fatal("one of -d/--dbname and -f/--file must be specified");
 
-	if (db_exclude_patterns.head != NULL && globals_only)
-	{
-		pg_log_error("option --exclude-database cannot be used together with -g/--globals-only");
-		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
-		exit_nicely(1);
-	}
-
 	/* Should get at most one of -d and -f, else user is confused */
 	if (opts->cparams.dbname)
 	{
 		if (opts->filename)
 		{
-			pg_log_error("options -d/--dbname and -f/--file cannot be used together");
+			pg_log_error("options %s and %s cannot be used together",
+						 "-d/--dbname", "-f/--file");
 			pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 			exit_nicely(1);
 		}
+
+		if (opts->restrict_key)
+			pg_fatal("options %s and %s cannot be used together",
+					 "-d/--dbname", "--restrict-key");
+
 		opts->useDB = 1;
 	}
+	else
+	{
+		/*
+		 * If you don't provide a restrict key, one will be appointed for you.
+		 */
+		if (!opts->restrict_key)
+			opts->restrict_key = generate_restrict_key();
+		if (!opts->restrict_key)
+			pg_fatal("could not generate restrict key");
+		if (!valid_restrict_key(opts->restrict_key))
+			pg_fatal("invalid restrict key");
+	}
 
 	/* reject conflicting "-only" options */
 	if (data_only && schema_only)
-		pg_fatal("options -s/--schema-only and -a/--data-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "-a/--data-only");
 	if (schema_only && statistics_only)
-		pg_fatal("options -s/--schema-only and --statistics-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--statistics-only");
 	if (data_only && statistics_only)
-		pg_fatal("options -a/--data-only and --statistics-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--statistics-only");
 
 	/* reject conflicting "-only" and "no-" options */
 	if (data_only && no_data)
-		pg_fatal("options -a/--data-only and --no-data cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--no-data");
 	if (schema_only && no_schema)
-		pg_fatal("options -s/--schema-only and --no-schema cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--no-schema");
 	if (statistics_only && no_statistics)
-		pg_fatal("options --statistics-only and --no-statistics cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "--statistics-only", "--no-statistics");
 
-	/* reject conflicting "with-" and "no-" options */
-	if (with_data && no_data)
-		pg_fatal("options --with-data and --no-data cannot be used together");
-	if (with_schema && no_schema)
-		pg_fatal("options --with-schema and --no-schema cannot be used together");
+	/* reject conflicting "no-" options */
 	if (with_statistics && no_statistics)
-		pg_fatal("options --with-statistics and --no-statistics cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "--statistics", "--no-statistics");
+
+	/* reject conflicting "only-" options */
+	if (data_only && with_statistics)
+		pg_fatal("options %s and %s cannot be used together",
+				 "-a/--data-only", "--statistics");
+	if (schema_only && with_statistics)
+		pg_fatal("options %s and %s cannot be used together",
+				 "-s/--schema-only", "--statistics");
 
 	if (data_only && opts->dropSchema)
-		pg_fatal("options -c/--clean and -a/--data-only cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-c/--clean", "-a/--data-only");
 
 	if (opts->single_txn && opts->txn_size > 0)
-		pg_fatal("options -1/--single-transaction and --transaction-size cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-1/--single-transaction", "--transaction-size");
 
 	/*
 	 * -C is not compatible with -1, because we can't create a database inside
 	 * a transaction block.
 	 */
 	if (opts->createDB && opts->single_txn)
-		pg_fatal("options -C/--create and -1/--single-transaction cannot be used together");
+		pg_fatal("options %s and %s cannot be used together",
+				 "-C/--create", "-1/--single-transaction");
 
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && numWorkers > 1)
 		pg_fatal("cannot specify both --single-transaction and multiple jobs");
 
 	/*
-	 * Set derivative flags. An "-only" option may be overridden by an
-	 * explicit "with-" option; e.g. "--schema-only --with-statistics" will
-	 * include schema and statistics. Other ambiguous or nonsensical
-	 * combinations, e.g. "--schema-only --no-schema", will have already
-	 * caused an error in one of the checks above.
+	 * Set derivative flags. Ambiguous or nonsensical combinations, e.g.
+	 * "--schema-only --no-schema", will have already caused an error in one
+	 * of the checks above.
 	 */
 	opts->dumpData = ((opts->dumpData && !schema_only && !statistics_only) ||
-					  (data_only || with_data)) && !no_data;
+					  data_only) && !no_data;
 	opts->dumpSchema = ((opts->dumpSchema && !data_only && !statistics_only) ||
-						(schema_only || with_schema)) && !no_schema;
+						schema_only) && !no_schema;
 	opts->dumpStatistics = ((opts->dumpStatistics && !schema_only && !data_only) ||
 							(statistics_only || with_statistics)) && !no_statistics;
 
@@ -469,7 +457,8 @@ main(int argc, char **argv)
 	opts->no_subscriptions = no_subscriptions;
 
 	if (if_exists && !opts->dropSchema)
-		pg_fatal("option --if-exists requires option -c/--clean");
+		pg_fatal("option %s requires option %s",
+				 "--if-exists", "-c/--clean");
 	opts->if_exists = if_exists;
 	opts->strict_names = strict_names;
 
@@ -496,114 +485,6 @@ main(int argc, char **argv)
 					 opts->formatName);
 	}
 
-	/*
-	 * If toc.dat file is not present in the current path, then check for
-	 * global.dat.  If global.dat file is present, then restore all the
-	 * databases from map.dat (if it exists), but skip restoring those
-	 * matching --exclude-database patterns.
-	 */
-	if (inputFileSpec != NULL && !file_exists_in_directory(inputFileSpec, "toc.dat") &&
-		file_exists_in_directory(inputFileSpec, "global.dat"))
-	{
-		PGconn	   *conn = NULL;	/* Connection to restore global sql
-									 * commands. */
-
-		/*
-		 * Can only use --list or --use-list options with a single database
-		 * dump.
-		 */
-		if (opts->tocSummary)
-			pg_fatal("option -l/--list cannot be used when restoring an archive created by pg_dumpall");
-		else if (opts->tocFile)
-			pg_fatal("option -L/--use-list cannot be used when restoring an archive created by pg_dumpall");
-
-		/*
-		 * To restore from a pg_dumpall archive, -C (create database) option
-		 * must be specified unless we are only restoring globals.
-		 */
-		if (!globals_only && opts->createDB != 1)
-		{
-			pg_log_error("option -C/--create must be specified when restoring an archive created by pg_dumpall");
-			pg_log_error_hint("Try \"%s --help\" for more information.", progname);
-			pg_log_error_hint("Individual databases can be restored using their specific archives.");
-			exit_nicely(1);
-		}
-
-		/*
-		 * Connect to the database to execute global sql commands from
-		 * global.dat file.
-		 */
-		if (opts->cparams.dbname)
-		{
-			conn = ConnectDatabase(opts->cparams.dbname, NULL, opts->cparams.pghost,
-								   opts->cparams.pgport, opts->cparams.username, TRI_DEFAULT,
-								   false, progname, NULL, NULL, NULL, NULL);
-
-
-			if (!conn)
-				pg_fatal("could not connect to database \"%s\"", opts->cparams.dbname);
-		}
-
-		/* If globals-only, then return from here. */
-		if (globals_only)
-		{
-			/*
-			 * Open global.dat file and execute/append all the global sql
-			 * commands.
-			 */
-			n_errors = process_global_sql_commands(conn, inputFileSpec,
-												   opts->filename);
-
-			if (conn)
-				PQfinish(conn);
-
-			pg_log_info("database restoring skipped because option -g/--globals-only was specified");
-		}
-		else
-		{
-			/* Now restore all the databases from map.dat */
-			n_errors = restore_all_databases(conn, inputFileSpec, db_exclude_patterns,
-											 opts, numWorkers);
-		}
-
-		/* Free db pattern list. */
-		simple_string_list_destroy(&db_exclude_patterns);
-	}
-	else						/* process if global.dat file does not exist. */
-	{
-		if (db_exclude_patterns.head != NULL)
-			pg_fatal("option --exclude-database can be used only when restoring an archive created by pg_dumpall");
-
-		if (globals_only)
-			pg_fatal("option -g/--globals-only can be used only when restoring an archive created by pg_dumpall");
-
-		n_errors = restore_one_database(inputFileSpec, opts, numWorkers, false, 0);
-	}
-
-	/* Done, print a summary of ignored errors during restore. */
-	if (n_errors)
-	{
-		pg_log_warning("errors ignored on restore: %d", n_errors);
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
- * restore_one_database
- *
- * This will restore one database using toc.dat file.
- *
- * returns the number of errors while doing restore.
- */
-static int
-restore_one_database(const char *inputFileSpec, RestoreOptions *opts,
-					 int numWorkers, bool append_data, int num)
-{
-	Archive    *AH;
-	int			n_errors;
-
 	AH = OpenArchive(inputFileSpec, opts->format);
 
 	SetArchiveOptions(AH, NULL, opts);
@@ -611,15 +492,9 @@ restore_one_database(const char *inputFileSpec, RestoreOptions *opts,
 	/*
 	 * We don't have a connection yet but that doesn't matter. The connection
 	 * is initialized to NULL and if we terminate through exit_nicely() while
-	 * it's still NULL, the cleanup function will just be a no-op. If we are
-	 * restoring multiple databases, then only update AX handle for cleanup as
-	 * the previous entry was already in the array and we had closed previous
-	 * connection, so we can use the same array slot.
+	 * it's still NULL, the cleanup function will just be a no-op.
 	 */
-	if (!append_data || num == 0)
-		on_exit_close_archive(AH);
-	else
-		replace_on_exit_close_archive(AH);
+	on_exit_close_archive(AH);
 
 	/* Let the archiver know how noisy to be */
 	AH->verbose = opts->verbose;
@@ -639,21 +514,25 @@ restore_one_database(const char *inputFileSpec, RestoreOptions *opts,
 	else
 	{
 		ProcessArchiveRestoreOptions(AH);
-		RestoreArchive(AH, append_data);
+		RestoreArchive(AH);
 	}
 
-	n_errors = AH->n_errors;
+	/* done, print a summary of ignored errors */
+	if (AH->n_errors)
+		pg_log_warning("errors ignored on restore: %d", AH->n_errors);
 
 	/* AH may be freed in CloseArchive? */
+	exit_code = AH->n_errors ? 1 : 0;
+
 	CloseArchive(AH);
 
-	return n_errors;
+	return exit_code;
 }
 
 static void
 usage(const char *progname)
 {
-	printf(_("%s restores PostgreSQL databases from archives created by pg_dump or pg_dumpall.\n\n"), progname);
+	printf(_("%s restores a PostgreSQL database from an archive created by pg_dump.\n\n"), progname);
 	printf(_("Usage:\n"));
 	printf(_("  %s [OPTION]... [FILE]\n"), progname);
 
@@ -671,7 +550,6 @@ usage(const char *progname)
 	printf(_("  -c, --clean                  clean (drop) database objects before recreating\n"));
 	printf(_("  -C, --create                 create the target database\n"));
 	printf(_("  -e, --exit-on-error          exit on error, default is to continue\n"));
-	printf(_("  -g, --globals-only           restore only global objects, no databases\n"));
 	printf(_("  -I, --index=NAME             restore named index\n"));
 	printf(_("  -j, --jobs=NUM               use this many parallel jobs to restore\n"));
 	printf(_("  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -688,7 +566,6 @@ usage(const char *progname)
 	printf(_("  -1, --single-transaction     restore as a single transaction\n"));
 	printf(_("  --disable-triggers           disable triggers during data-only restore\n"));
 	printf(_("  --enable-row-security        enable row security\n"));
-	printf(_("  --exclude-database=PATTERN   do not restore the specified database(s)\n"));
 	printf(_("  --filter=FILENAME            restore or skip objects based on expressions\n"
 			 "                               in FILENAME\n"));
 	printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
@@ -704,7 +581,9 @@ usage(const char *progname)
 	printf(_("  --no-subscriptions           do not restore subscriptions\n"));
 	printf(_("  --no-table-access-method     do not restore table access methods\n"));
 	printf(_("  --no-tablespaces             do not restore tablespace assignments\n"));
+	printf(_("  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"));
 	printf(_("  --section=SECTION            restore named section (pre-data, data, or post-data)\n"));
+	printf(_("  --statistics                 restore the statistics\n"));
 	printf(_("  --statistics-only            restore only the statistics, not schema or data\n"));
 	printf(_("  --strict-names               require table and/or schema include patterns to\n"
 			 "                               match at least one entity each\n"));
@@ -712,9 +591,6 @@ usage(const char *progname)
 	printf(_("  --use-set-session-authorization\n"
 			 "                               use SET SESSION AUTHORIZATION commands instead of\n"
 			 "                               ALTER OWNER commands to set ownership\n"));
-	printf(_("  --with-data                  restore the data\n"));
-	printf(_("  --with-schema                restore the schema\n"));
-	printf(_("  --with-statistics            restore the statistics\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -725,8 +601,8 @@ usage(const char *progname)
 	printf(_("  --role=ROLENAME          do SET ROLE before restore\n"));
 
 	printf(_("\n"
-			 "The options -I, -n, -N, -P, -t, -T, --section, and --exclude-database can be\n"
-			 "combined and specified multiple times to select multiple objects.\n"));
+			 "The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n"
+			 "multiple times to select multiple objects.\n"));
 	printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
 	printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 	printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
@@ -831,585 +707,3 @@ read_restore_filters(const char *filename, RestoreOptions *opts)
 
 	filter_free(&fstate);
 }
-
-/*
- * file_exists_in_directory
- *
- * Returns true if the file exists in the given directory.
- */
-static bool
-file_exists_in_directory(const char *dir, const char *filename)
-{
-	struct stat st;
-	char		buf[MAXPGPATH];
-
-	if (snprintf(buf, MAXPGPATH, "%s/%s", dir, filename) >= MAXPGPATH)
-		pg_fatal("directory name too long: \"%s\"", dir);
-
-	return (stat(buf, &st) == 0 && S_ISREG(st.st_mode));
-}
-
-/*
- * read_one_statement
- *
- * This will start reading from passed file pointer using fgetc and read till
- * semicolon(sql statement terminator for global.dat file)
- *
- * EOF is returned if end-of-file input is seen; time to shut down.
- */
-
-static int
-read_one_statement(StringInfo inBuf, FILE *pfile)
-{
-	int			c;				/* character read from getc() */
-	int			m;
-
-	StringInfoData q;
-
-	initStringInfo(&q);
-
-	resetStringInfo(inBuf);
-
-	/*
-	 * Read characters until EOF or the appropriate delimiter is seen.
-	 */
-	while ((c = fgetc(pfile)) != EOF)
-	{
-		if (c != '\'' && c != '"' && c != '\n' && c != ';')
-		{
-			appendStringInfoChar(inBuf, (char) c);
-			while ((c = fgetc(pfile)) != EOF)
-			{
-				if (c != '\'' && c != '"' && c != ';' && c != '\n')
-					appendStringInfoChar(inBuf, (char) c);
-				else
-					break;
-			}
-		}
-
-		if (c == '\'' || c == '"')
-		{
-			appendStringInfoChar(&q, (char) c);
-			m = c;
-
-			while ((c = fgetc(pfile)) != EOF)
-			{
-				appendStringInfoChar(&q, (char) c);
-
-				if (c == m)
-				{
-					appendStringInfoString(inBuf, q.data);
-					resetStringInfo(&q);
-					break;
-				}
-			}
-		}
-
-		if (c == ';')
-		{
-			appendStringInfoChar(inBuf, (char) ';');
-			break;
-		}
-
-		if (c == '\n')
-			appendStringInfoChar(inBuf, (char) '\n');
-	}
-
-	pg_free(q.data);
-
-	/* No input before EOF signal means time to quit. */
-	if (c == EOF && inBuf->len == 0)
-		return EOF;
-
-	/* return something that's not EOF */
-	return 'Q';
-}
-
-/*
- * get_dbnames_list_to_restore
- *
- * This will mark for skipping any entries from dbname_oid_list that pattern match an
- * entry in the db_exclude_patterns list.
- *
- * Returns the number of database to be restored.
- *
- */
-static int
-get_dbnames_list_to_restore(PGconn *conn,
-							SimplePtrList *dbname_oid_list,
-							SimpleStringList db_exclude_patterns)
-{
-	int			count_db = 0;
-	PQExpBuffer query;
-	PGresult   *res;
-
-	query = createPQExpBuffer();
-
-	if (!conn)
-		pg_log_info("considering PATTERN as NAME for --exclude-database option as no database connection while doing pg_restore");
-
-	/*
-	 * Process one by one all dbnames and if specified to skip restoring, then
-	 * remove dbname from list.
-	 */
-	for (SimplePtrListCell *db_cell = dbname_oid_list->head;
-		 db_cell; db_cell = db_cell->next)
-	{
-		DbOidName  *dbidname = (DbOidName *) db_cell->ptr;
-		bool		skip_db_restore = false;
-		PQExpBuffer db_lit = createPQExpBuffer();
-
-		appendStringLiteralConn(db_lit, dbidname->str, conn);
-
-		for (SimpleStringListCell *pat_cell = db_exclude_patterns.head; pat_cell; pat_cell = pat_cell->next)
-		{
-			/*
-			 * If there is an exact match then we don't need to try a pattern
-			 * match
-			 */
-			if (pg_strcasecmp(dbidname->str, pat_cell->val) == 0)
-				skip_db_restore = true;
-			/* Otherwise, try a pattern match if there is a connection */
-			else if (conn)
-			{
-				int			dotcnt;
-
-				appendPQExpBufferStr(query, "SELECT 1 ");
-				processSQLNamePattern(conn, query, pat_cell->val, false,
-									  false, NULL, db_lit->data,
-									  NULL, NULL, NULL, &dotcnt);
-
-				if (dotcnt > 0)
-				{
-					pg_log_error("improper qualified name (too many dotted names): %s",
-								 dbidname->str);
-					PQfinish(conn);
-					exit_nicely(1);
-				}
-
-				res = executeQuery(conn, query->data);
-
-				if ((PQresultStatus(res) == PGRES_TUPLES_OK) && PQntuples(res))
-				{
-					skip_db_restore = true;
-					pg_log_info("database name \"%s\" matches exclude pattern \"%s\"", dbidname->str, pat_cell->val);
-				}
-
-				PQclear(res);
-				resetPQExpBuffer(query);
-			}
-
-			if (skip_db_restore)
-				break;
-		}
-
-		destroyPQExpBuffer(db_lit);
-
-		/*
-		 * Mark db to be skipped or increment the counter of dbs to be
-		 * restored
-		 */
-		if (skip_db_restore)
-		{
-			pg_log_info("excluding database \"%s\"", dbidname->str);
-			dbidname->oid = InvalidOid;
-		}
-		else
-		{
-			count_db++;
-		}
-	}
-
-	destroyPQExpBuffer(query);
-
-	return count_db;
-}
-
-/*
- * get_dbname_oid_list_from_mfile
- *
- * Open map.dat file and read line by line and then prepare a list of database
- * names and corresponding db_oid.
- *
- * Returns, total number of database names in map.dat file.
- */
-static int
-get_dbname_oid_list_from_mfile(const char *dumpdirpath, SimplePtrList *dbname_oid_list)
-{
-	StringInfoData linebuf;
-	FILE	   *pfile;
-	char		map_file_path[MAXPGPATH];
-	int			count = 0;
-
-
-	/*
-	 * If there is only global.dat file in dump, then return from here as
-	 * there is no database to restore.
-	 */
-	if (!file_exists_in_directory(dumpdirpath, "map.dat"))
-	{
-		pg_log_info("database restoring is skipped because file \"%s\" does not exist in directory \"%s\"", "map.dat", dumpdirpath);
-		return 0;
-	}
-
-	snprintf(map_file_path, MAXPGPATH, "%s/map.dat", dumpdirpath);
-
-	/* Open map.dat file. */
-	pfile = fopen(map_file_path, PG_BINARY_R);
-
-	if (pfile == NULL)
-		pg_fatal("could not open file \"%s\": %m", map_file_path);
-
-	initStringInfo(&linebuf);
-
-	/* Append all the dbname/db_oid combinations to the list. */
-	while (pg_get_line_buf(pfile, &linebuf))
-	{
-		Oid			db_oid = InvalidOid;
-		char	   *dbname;
-		DbOidName  *dbidname;
-		int			namelen;
-		char	   *p = linebuf.data;
-
-		/* Extract dboid. */
-		while (isdigit((unsigned char) *p))
-			p++;
-		if (p > linebuf.data && *p == ' ')
-		{
-			sscanf(linebuf.data, "%u", &db_oid);
-			p++;
-		}
-
-		/* dbname is the rest of the line */
-		dbname = p;
-		namelen = strlen(dbname);
-
-		/* Report error and exit if the file has any corrupted data. */
-		if (!OidIsValid(db_oid) || namelen <= 1)
-			pg_fatal("invalid entry in file \"%s\" on line %d", map_file_path,
-					 count + 1);
-
-		pg_log_info("found database \"%s\" (OID: %u) in file \"%s\"",
-					dbname, db_oid, map_file_path);
-
-		dbidname = pg_malloc(offsetof(DbOidName, str) + namelen + 1);
-		dbidname->oid = db_oid;
-		strlcpy(dbidname->str, dbname, namelen);
-
-		simple_ptr_list_append(dbname_oid_list, dbidname);
-		count++;
-	}
-
-	/* Close map.dat file. */
-	fclose(pfile);
-
-	return count;
-}
-
-/*
- * restore_all_databases
- *
- * This will restore databases those dumps are present in
- * directory based on map.dat file mapping.
- *
- * This will skip restoring for databases that are specified with
- * exclude-database option.
- *
- * returns, number of errors while doing restore.
- */
-static int
-restore_all_databases(PGconn *conn, const char *dumpdirpath,
-					  SimpleStringList db_exclude_patterns, RestoreOptions *opts,
-					  int numWorkers)
-{
-	SimplePtrList dbname_oid_list = {NULL, NULL};
-	int			num_db_restore = 0;
-	int			num_total_db;
-	int			n_errors_total;
-	int			count = 0;
-	char	   *connected_db = NULL;
-	bool		dumpData = opts->dumpData;
-	bool		dumpSchema = opts->dumpSchema;
-	bool		dumpStatistics = opts->dumpSchema;
-
-	/* Save db name to reuse it for all the database. */
-	if (opts->cparams.dbname)
-		connected_db = opts->cparams.dbname;
-
-	num_total_db = get_dbname_oid_list_from_mfile(dumpdirpath, &dbname_oid_list);
-
-	/* If map.dat has no entries, return after processing global.dat */
-	if (dbname_oid_list.head == NULL)
-		return process_global_sql_commands(conn, dumpdirpath, opts->filename);
-
-	pg_log_info(ngettext("found %d database name in \"%s\"",
-						 "found %d database names in \"%s\"",
-						 num_total_db),
-				num_total_db, "map.dat");
-
-	if (!conn)
-	{
-		pg_log_info("trying to connect to database \"%s\"", "postgres");
-
-		conn = ConnectDatabase("postgres", NULL, opts->cparams.pghost,
-							   opts->cparams.pgport, opts->cparams.username, TRI_DEFAULT,
-							   false, progname, NULL, NULL, NULL, NULL);
-
-		/* Try with template1. */
-		if (!conn)
-		{
-			pg_log_info("trying to connect to database \"%s\"", "template1");
-
-			conn = ConnectDatabase("template1", NULL, opts->cparams.pghost,
-								   opts->cparams.pgport, opts->cparams.username, TRI_DEFAULT,
-								   false, progname, NULL, NULL, NULL, NULL);
-		}
-	}
-
-	/*
-	 * filter the db list according to the exclude patterns
-	 */
-	num_db_restore = get_dbnames_list_to_restore(conn, &dbname_oid_list,
-												 db_exclude_patterns);
-
-	/* Open global.dat file and execute/append all the global sql commands. */
-	n_errors_total = process_global_sql_commands(conn, dumpdirpath, opts->filename);
-
-	/* Close the db connection as we are done with globals and patterns. */
-	if (conn)
-		PQfinish(conn);
-
-	/* Exit if no db needs to be restored. */
-	if (dbname_oid_list.head == NULL || num_db_restore == 0)
-	{
-		pg_log_info(ngettext("no database needs restoring out of %d database",
-							 "no database needs restoring out of %d databases", num_total_db),
-					num_total_db);
-		return n_errors_total;
-	}
-
-	pg_log_info("need to restore %d databases out of %d databases", num_db_restore, num_total_db);
-
-	/*
-	 * We have a list of databases to restore after processing the
-	 * exclude-database switch(es).  Now we can restore them one by one.
-	 */
-	for (SimplePtrListCell *db_cell = dbname_oid_list.head;
-		 db_cell; db_cell = db_cell->next)
-	{
-		DbOidName  *dbidname = (DbOidName *) db_cell->ptr;
-		char		subdirpath[MAXPGPATH];
-		char		subdirdbpath[MAXPGPATH];
-		char		dbfilename[MAXPGPATH];
-		int			n_errors;
-
-		/* ignore dbs marked for skipping */
-		if (dbidname->oid == InvalidOid)
-			continue;
-
-		/*
-		 * We need to reset override_dbname so that objects can be restored
-		 * into an already created database. (used with -d/--dbname option)
-		 */
-		if (opts->cparams.override_dbname)
-		{
-			pfree(opts->cparams.override_dbname);
-			opts->cparams.override_dbname = NULL;
-		}
-
-		snprintf(subdirdbpath, MAXPGPATH, "%s/databases", dumpdirpath);
-
-		/*
-		 * Look for the database dump file/dir. If there is an {oid}.tar or
-		 * {oid}.dmp file, use it. Otherwise try to use a directory called
-		 * {oid}
-		 */
-		snprintf(dbfilename, MAXPGPATH, "%u.tar", dbidname->oid);
-		if (file_exists_in_directory(subdirdbpath, dbfilename))
-			snprintf(subdirpath, MAXPGPATH, "%s/databases/%u.tar", dumpdirpath, dbidname->oid);
-		else
-		{
-			snprintf(dbfilename, MAXPGPATH, "%u.dmp", dbidname->oid);
-
-			if (file_exists_in_directory(subdirdbpath, dbfilename))
-				snprintf(subdirpath, MAXPGPATH, "%s/databases/%u.dmp", dumpdirpath, dbidname->oid);
-			else
-				snprintf(subdirpath, MAXPGPATH, "%s/databases/%u", dumpdirpath, dbidname->oid);
-		}
-
-		pg_log_info("restoring database \"%s\"", dbidname->str);
-
-		/* If database is already created, then don't set createDB flag. */
-		if (opts->cparams.dbname)
-		{
-			PGconn	   *test_conn;
-
-			test_conn = ConnectDatabase(dbidname->str, NULL, opts->cparams.pghost,
-										opts->cparams.pgport, opts->cparams.username, TRI_DEFAULT,
-										false, progname, NULL, NULL, NULL, NULL);
-			if (test_conn)
-			{
-				PQfinish(test_conn);
-
-				/* Use already created database for connection. */
-				opts->createDB = 0;
-				opts->cparams.dbname = dbidname->str;
-			}
-			else
-			{
-				/* we'll have to create it */
-				opts->createDB = 1;
-				opts->cparams.dbname = connected_db;
-			}
-		}
-
-		/*
-		 * Reset flags - might have been reset in pg_backup_archiver.c by the
-		 * previous restore.
-		 */
-		opts->dumpData = dumpData;
-		opts->dumpSchema = dumpSchema;
-		opts->dumpStatistics = dumpStatistics;
-
-		/* Restore the single database. */
-		n_errors = restore_one_database(subdirpath, opts, numWorkers, true, count);
-
-		/* Print a summary of ignored errors during single database restore. */
-		if (n_errors)
-		{
-			n_errors_total += n_errors;
-			pg_log_warning("errors ignored on database \"%s\" restore: %d", dbidname->str, n_errors);
-		}
-
-		count++;
-	}
-
-	/* Log number of processed databases. */
-	pg_log_info("number of restored databases is %d", num_db_restore);
-
-	/* Free dbname and dboid list. */
-	simple_ptr_list_destroy(&dbname_oid_list);
-
-	return n_errors_total;
-}
-
-/*
- * process_global_sql_commands
- *
- * Open global.dat and execute or copy the sql commands one by one.
- *
- * If outfile is not NULL, copy all sql commands into outfile rather than
- * executing them.
- *
- * Returns the number of errors while processing global.dat
- */
-static int
-process_global_sql_commands(PGconn *conn, const char *dumpdirpath, const char *outfile)
-{
-	char		global_file_path[MAXPGPATH];
-	PGresult   *result;
-	StringInfoData sqlstatement,
-				user_create;
-	FILE	   *pfile;
-	int			n_errors = 0;
-
-	snprintf(global_file_path, MAXPGPATH, "%s/global.dat", dumpdirpath);
-
-	/* Open global.dat file. */
-	pfile = fopen(global_file_path, PG_BINARY_R);
-
-	if (pfile == NULL)
-		pg_fatal("could not open file \"%s\": %m", global_file_path);
-
-	/*
-	 * If outfile is given, then just copy all global.dat file data into
-	 * outfile.
-	 */
-	if (outfile)
-	{
-		copy_or_print_global_file(outfile, pfile);
-		return 0;
-	}
-
-	/* Init sqlstatement to append commands. */
-	initStringInfo(&sqlstatement);
-
-	/* creation statement for our current role */
-	initStringInfo(&user_create);
-	appendStringInfoString(&user_create, "CREATE ROLE ");
-	/* should use fmtId here, but we don't know the encoding */
-	appendStringInfoString(&user_create, PQuser(conn));
-	appendStringInfoChar(&user_create, ';');
-
-	/* Process file till EOF and execute sql statements. */
-	while (read_one_statement(&sqlstatement, pfile) != EOF)
-	{
-		/* don't try to create the role we are connected as */
-		if (strstr(sqlstatement.data, user_create.data))
-			continue;
-
-		pg_log_info("executing query: %s", sqlstatement.data);
-		result = PQexec(conn, sqlstatement.data);
-
-		switch (PQresultStatus(result))
-		{
-			case PGRES_COMMAND_OK:
-			case PGRES_TUPLES_OK:
-			case PGRES_EMPTY_QUERY:
-				break;
-			default:
-				n_errors++;
-				pg_log_error("could not execute query: %s", PQerrorMessage(conn));
-				pg_log_error_detail("Command was: %s", sqlstatement.data);
-		}
-		PQclear(result);
-	}
-
-	/* Print a summary of ignored errors during global.dat. */
-	if (n_errors)
-		pg_log_warning(ngettext("ignored %d error in file \"%s\"",
-								"ignored %d errors in file \"%s\"", n_errors),
-					   n_errors, global_file_path);
-	fclose(pfile);
-
-	return n_errors;
-}
-
-/*
- * copy_or_print_global_file
- *
- * Copy global.dat into the output file.  If "-" is used as outfile,
- * then print commands to stdout.
- */
-static void
-copy_or_print_global_file(const char *outfile, FILE *pfile)
-{
-	char		out_file_path[MAXPGPATH];
-	FILE	   *OPF;
-	int			c;
-
-	/* "-" is used for stdout. */
-	if (strcmp(outfile, "-") == 0)
-		OPF = stdout;
-	else
-	{
-		snprintf(out_file_path, MAXPGPATH, "%s", outfile);
-		OPF = fopen(out_file_path, PG_BINARY_W);
-
-		if (OPF == NULL)
-		{
-			fclose(pfile);
-			pg_fatal("could not open file: \"%s\"", outfile);
-		}
-	}
-
-	/* Append global.dat into output file or print to stdout. */
-	while ((c = fgetc(pfile)) != EOF)
-		fputc(c, OPF);
-
-	fclose(pfile);
-
-	/* Close output file. */
-	if (strcmp(outfile, "-") != 0)
-		fclose(OPF);
-}
diff --git a/src/bin/pg_dump/po/de.po b/src/bin/pg_dump/po/de.po
index ecf78101184..f7b8c7689ae 100644
--- a/src/bin/pg_dump/po/de.po
+++ b/src/bin/pg_dump/po/de.po
@@ -1,5 +1,5 @@
 # German message translation file for pg_dump and friends
-# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2025.
+# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2026.
 #
 # Use these quotes: »%s«
 #
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-04 11:22+0000\n"
-"PO-Revision-Date: 2025-04-04 15:49+0200\n"
+"POT-Creation-Date: 2026-05-05 12:13+0000\n"
+"PO-Revision-Date: 2026-05-06 16:12+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -38,9 +38,9 @@ msgid "hint: "
 msgstr "Tipp: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:108 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:809 compress_lz4.c:816 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "diese Installation unterstützt keine Komprimierung mit %s"
@@ -166,13 +166,12 @@ msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 msgid "this build does not support sync method \"%s\""
 msgstr "diese Installation unterstützt Sync-Methode »%s« nicht"
 
-#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
 
 #: ../../common/file_utils.c:174 ../../common/file_utils.c:338
-#: pg_backup_directory.c:182
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
@@ -242,329 +241,424 @@ msgstr "Argument des Shell-Befehls enthält Newline oder Carriage Return: »%s«
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "Datenbankname enthält Newline oder Carriage Return: »%s«\n"
 
-#: common.c:111
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "lese Erweiterungen"
 
-#: common.c:114
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "identifiziere Erweiterungselemente"
 
-#: common.c:117
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "lese Schemas"
 
-#: common.c:126
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "lese benutzerdefinierte Tabellen"
 
-#: common.c:131
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "lese benutzerdefinierte Funktionen"
 
-#: common.c:135
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "lese benutzerdefinierte Typen"
 
-#: common.c:139
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "lese prozedurale Sprachen"
 
-#: common.c:142
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "lese benutzerdefinierte Aggregatfunktionen"
 
-#: common.c:145
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "lese benutzerdefinierte Operatoren"
 
-#: common.c:148
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "lese benutzerdefinierte Zugriffsmethoden"
 
-#: common.c:151
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "lese benutzerdefinierte Operatorklassen"
 
-#: common.c:154
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "lese benutzerdefinierte Operatorfamilien"
 
-#: common.c:157
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "lese benutzerdefinierte Textsuche-Parser"
 
-#: common.c:160
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "lese benutzerdefinierte Textsuche-Templates"
 
-#: common.c:163
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "lese benutzerdefinierte Textsuchewörterbücher"
 
-#: common.c:166
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "lese benutzerdefinierte Textsuchekonfigurationen"
 
-#: common.c:169
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "lese benutzerdefinierte Fremddaten-Wrapper"
 
-#: common.c:172
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "lese benutzerdefinierte Fremdserver"
 
-#: common.c:175
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "lese Vorgabeprivilegien"
 
-#: common.c:178
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "lese benutzerdefinierte Sortierfolgen"
 
-#: common.c:181
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "lese benutzerdefinierte Konversionen"
 
-#: common.c:184
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "lese Typumwandlungen"
 
-#: common.c:187
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "lese Transformationen"
 
-#: common.c:190
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "lese Tabellenvererbungsinformationen"
 
-#: common.c:193
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "lese Ereignistrigger"
 
-#: common.c:197
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "finde Erweiterungstabellen"
 
-#: common.c:201
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "finde Vererbungsbeziehungen"
 
-#: common.c:204
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "lese Spalteninfo für interessante Tabellen"
 
-#: common.c:207
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "markiere vererbte Spalten in abgeleiteten Tabellen"
 
-#: common.c:210
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "lese Partitionierungsdaten"
 
-#: common.c:213
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "lese Indexe"
 
-#: common.c:216
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "markiere Indexe in partitionierten Tabellen"
 
-#: common.c:219
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "lese erweiterte Statistiken"
 
-#: common.c:222
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "lese Constraints"
 
-#: common.c:225
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "lese Trigger"
 
-#: common.c:228
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "lese Umschreiberegeln"
 
-#: common.c:231
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "lese Policys"
 
-#: common.c:234
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "lese Publikationen"
 
-#: common.c:237
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "lese Publikationsmitgliedschaft von Tabellen"
 
-#: common.c:240
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "lese Publikationsmitgliedschaft von Schemas"
 
-#: common.c:243
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "lese Subskriptionen"
 
-#: common.c:246
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "lese Subskriptionsmitgliedschaft von Tabellen"
 
-#: common.c:309
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "Sanity-Check fehlgeschlagen, Eltern-OID %u von Tabelle »%s« (OID %u) nicht gefunden"
 
-#: common.c:351
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "ungültige Anzahl Eltern %d für Tabelle »%s«"
 
-#: common.c:1087
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "konnte numerisches Array »%s« nicht parsen: zu viele Zahlen"
 
-#: common.c:1099
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "konnte numerisches Array »%s« nicht parsen: ungültiges Zeichen in Zahl"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "konnte Komprimierungsstrom nicht schließen: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "konnte Daten nicht komprimieren: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "konnte Daten nicht dekomprimieren: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "konnte Komprimierungsbibliothek nicht schließen: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "konnte nicht aus Eingabedatei lesen: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:374 pg_backup_custom.c:650
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "konnte nicht in Datei schreiben: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "konnte nicht aus Eingabedatei lesen: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:372 pg_backup_custom.c:648 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "konnte nicht aus Eingabedatei lesen: Dateiende"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "konnte LZ4-Dekomprimierungskontext nicht erzeugen: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "konnte nicht dekomprimieren: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "konnte LZ4-Dekomprimierungskontext nicht freigeben: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:690 compress_lz4.c:708
 #, c-format
 msgid "could not end compression: %s"
 msgstr "konnte Komprimierung nicht beenden: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "konnte LZ4-Komprimierung nicht initialisieren: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "konnte LZ4-Bibliothek nicht initialisieren: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "Fehler beim Schreiben: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "Fehler beim Schreiben: %m"
+
+#: compress_lz4.c:700
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "konnte nicht in Ausgabedatei schreiben: %m"
+
+#: compress_lz4.c:718
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "konnte Dekomprimierung nicht beenden: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:735 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "konnte Datei nicht schließen: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "konnte nicht in Datei schreiben: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "konnte Komprimierungsparameter »%s« nicht setzen: %s"
 
-#: compress_zstd.c:78 compress_zstd.c:232 compress_zstd.c:491
-#: compress_zstd.c:499
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren"
 
-#: compress_zstd.c:195 compress_zstd.c:309
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "konnte Daten nicht dekomprimieren: %s"
 
-#: compress_zstd.c:502
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Passwort: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:520
+#, c-format
+msgid "could not connect to database \"%s\""
+msgstr "konnte nicht mit der Datenbank »%s« verbinden"
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "konnte Version des Servers nicht ermitteln"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "konnte Versionszeichenkette »%s« nicht entziffern"
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "Abbruch wegen unpassender Serverversion"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "Version des Servers: %s; Version von %s: %s"
+
+#: connectdb.c:282 pg_dumpall.c:1801
+#, c-format
+msgid "executing %s"
+msgstr "führe %s aus"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1807
+#, c-format
+msgid "query failed: %s"
+msgstr "Anfrage fehlgeschlagen: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1808
+#, c-format
+msgid "Query was: %s"
+msgstr "Anfrage war: %s"
+
+#: dumputils.c:949
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
+
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "konnte Rechte des Verzeichnisses »%s« nicht ändern: %m"
+
+#: dumputils.c:959
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "unbehandelter Modus »%s«"
+msgid "directory \"%s\" is not empty"
+msgstr "Verzeichnis »%s« ist nicht leer"
 
 #: filter.c:48
 #, c-format
@@ -586,32 +680,32 @@ msgstr "ungültiges Format in Filter gelesen von Standardeingabe auf Zeile %d: %
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "ungültiges Format in Filter gelesen aus Datei »%s« auf Zeile %d: %s"
 
-#: filter.c:240 filter.c:467
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "konnte nicht aus Filterdatei »%s« lesen: %m"
 
-#: filter.c:243
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "unerwartetes Dateiende"
 
-#: filter.c:310
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "Objektnamenmuster fehlt"
 
-#: filter.c:421
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "kein Filterbefehl gefunden (»include« oder »exclude« erwartet)"
 
-#: filter.c:432
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "ungültiger Filterbefehl (»include« oder »exclude« erwartet)"
 
-#: filter.c:439
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "Filterobjekttyp fehlt"
 
-#: filter.c:446
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "nicht unterstützter Filterobjekttyp: »%.*s«"
@@ -695,7 +789,7 @@ msgstr "pgpipe: konnte Socket nicht verbinden: Fehlercode %d"
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: konnte Verbindung nicht annehmen: Fehlercode %d"
 
-#: pg_backup_archiver.c:270 pg_backup_archiver.c:1724
+#: pg_backup_archiver.c:270 pg_backup_archiver.c:1746
 #, c-format
 msgid "could not close output file: %m"
 msgstr "konnte Ausgabedatei nicht schließen: %m"
@@ -740,395 +834,412 @@ msgstr "direkte Datenbankverbindungen sind in Archiven vor Version 1.3 nicht unt
 msgid "implied no-schema restore"
 msgstr "implizit wird das Schema nicht wiederhergestellt"
 
-#: pg_backup_archiver.c:519
+#: pg_backup_archiver.c:530
 #, c-format
 msgid "dropping %s %s"
 msgstr "entferne %s %s"
 
-#: pg_backup_archiver.c:651
+#: pg_backup_archiver.c:662
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "konnte nicht bestimmen, wo IF EXISTS in die Anweisung »%s« eingefügt werden soll"
 
-#: pg_backup_archiver.c:837 pg_backup_archiver.c:839
+#: pg_backup_archiver.c:856 pg_backup_archiver.c:858
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "Warnung aus der ursprünglichen Ausgabedatei: %s"
 
-#: pg_backup_archiver.c:873
+#: pg_backup_archiver.c:892
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "erstelle %s »%s.%s«"
 
-#: pg_backup_archiver.c:876
+#: pg_backup_archiver.c:895
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "erstelle %s »%s«"
 
-#: pg_backup_archiver.c:926
+#: pg_backup_archiver.c:945
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "verbinde mit neuer Datenbank »%s«"
 
-#: pg_backup_archiver.c:953
+#: pg_backup_archiver.c:972
 #, c-format
 msgid "processing %s"
 msgstr "verarbeite %s"
 
-#: pg_backup_archiver.c:975
+#: pg_backup_archiver.c:994
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "verarbeite Daten für Tabelle »%s.%s«"
 
-#: pg_backup_archiver.c:1045
+#: pg_backup_archiver.c:1064
 #, c-format
 msgid "executing %s %s"
 msgstr "führe %s %s aus"
 
-#: pg_backup_archiver.c:1114
+#: pg_backup_archiver.c:1133
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "schalte Trigger für %s aus"
 
-#: pg_backup_archiver.c:1140
+#: pg_backup_archiver.c:1159
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "schalte Trigger für %s ein"
 
-#: pg_backup_archiver.c:1205
+#: pg_backup_archiver.c:1224
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "interner Fehler -- WriteData kann nicht außerhalb des Kontexts einer DataDumper-Routine aufgerufen werden"
 
-#: pg_backup_archiver.c:1397
+#: pg_backup_archiver.c:1419
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "Large-Object-Ausgabe im gewählten Format nicht unterstützt"
 
-#: pg_backup_archiver.c:1460
+#: pg_backup_archiver.c:1482
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "%d Large Object wiederhergestellt"
 msgstr[1] "%d Large Objects wiederhergestellt"
 
-#: pg_backup_archiver.c:1487 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1509 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "Wiederherstellung von Large Object mit OID %u"
 
-#: pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:1521
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "konnte Large Object %u nicht erstellen: %s"
 
-#: pg_backup_archiver.c:1504 pg_dump.c:4058
+#: pg_backup_archiver.c:1526 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "konnte Large Object %u nicht öffnen: %s"
 
-#: pg_backup_archiver.c:1560
+#: pg_backup_archiver.c:1582
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "konnte Inhaltsverzeichnisdatei »%s« nicht öffnen: %m"
 
-#: pg_backup_archiver.c:1588
+#: pg_backup_archiver.c:1610
 #, c-format
 msgid "line ignored: %s"
 msgstr "Zeile ignoriert: %s"
 
-#: pg_backup_archiver.c:1595 pg_backup_db.c:607
+#: pg_backup_archiver.c:1617 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "konnte Eintrag für ID %d nicht finden"
 
-#: pg_backup_archiver.c:1618 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1640 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "konnte Inhaltsverzeichnisdatei nicht schließen: %m"
 
-#: pg_backup_archiver.c:1705 pg_backup_custom.c:151 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:538
+#: pg_backup_archiver.c:1727 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "konnte Ausgabedatei »%s« nicht öffnen: %m"
 
-#: pg_backup_archiver.c:1707 pg_backup_custom.c:157
+#: pg_backup_archiver.c:1729 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "konnte Ausgabedatei nicht öffnen: %m"
 
-#: pg_backup_archiver.c:1790
+#: pg_backup_archiver.c:1812
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "%zu Byte Large-Object-Daten geschrieben (Ergebnis = %d)"
 msgstr[1] "%zu Bytes Large-Object-Daten geschrieben (Ergebnis = %d)"
 
-#: pg_backup_archiver.c:1796
+#: pg_backup_archiver.c:1818
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "konnte Large Object nicht schreiben: %s"
 
-#: pg_backup_archiver.c:1886
+#: pg_backup_archiver.c:1908
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "in Phase INITIALIZING:"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1913
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "in Phase PROCESSING TOC:"
 
-#: pg_backup_archiver.c:1896
+#: pg_backup_archiver.c:1918
 #, c-format
 msgid "while FINALIZING:"
 msgstr "in Phase FINALIZING:"
 
-#: pg_backup_archiver.c:1901
+#: pg_backup_archiver.c:1923
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "in Inhaltsverzeichniseintrag %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1977
+#: pg_backup_archiver.c:1999
 #, c-format
 msgid "bad dumpId"
 msgstr "ungültige DumpId"
 
-#: pg_backup_archiver.c:1998
+#: pg_backup_archiver.c:2020
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "ungültige Tabellen-DumpId für »TABLE DATA«-Eintrag"
 
-#: pg_backup_archiver.c:2090
+#: pg_backup_archiver.c:2112
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "unerwartete Datenoffsetmarkierung %d"
 
-#: pg_backup_archiver.c:2103
+#: pg_backup_archiver.c:2125
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "Dateioffset in Dumpdatei ist zu groß"
 
-#: pg_backup_archiver.c:2214
+#: pg_backup_archiver.c:2236
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "Verzeichnisname zu lang: »%s«"
 
-#: pg_backup_archiver.c:2264
+#: pg_backup_archiver.c:2286
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "Verzeichnis »%s« scheint kein gültiges Archiv zu sein (»toc.dat« existiert nicht)"
 
-#: pg_backup_archiver.c:2272 pg_backup_custom.c:168 pg_backup_custom.c:811
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2294 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "konnte Eingabedatei »%s« nicht öffnen: %m"
 
-#: pg_backup_archiver.c:2279 pg_backup_custom.c:174
+#: pg_backup_archiver.c:2301 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "konnte Eingabedatei nicht öffnen: %m"
 
-#: pg_backup_archiver.c:2285
+#: pg_backup_archiver.c:2307
 #, c-format
 msgid "could not read input file: %m"
 msgstr "konnte Eingabedatei nicht lesen: %m"
 
-#: pg_backup_archiver.c:2287
+#: pg_backup_archiver.c:2309
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "Eingabedatei ist zu kurz (gelesen: %lu, erwartet: 5)"
 
-#: pg_backup_archiver.c:2319
+#: pg_backup_archiver.c:2341
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "Eingabedatei ist anscheinend ein Dump im Textformat. Bitte verwenden Sie psql."
 
-#: pg_backup_archiver.c:2325
+#: pg_backup_archiver.c:2347
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "Eingabedatei scheint kein gültiges Archiv zu sein (zu kurz?)"
 
-#: pg_backup_archiver.c:2331
+#: pg_backup_archiver.c:2353
 #, c-format
-msgid "input file does not appear to be a valid archive"
-msgstr "Eingabedatei scheint kein gültiges Archiv zu sein"
+msgid "input file does not appear to be a valid tar archive"
+msgstr "Eingabedatei scheint kein gültiges Tar-Archiv zu sein"
 
-#: pg_backup_archiver.c:2340
+#: pg_backup_archiver.c:2362
 #, c-format
 msgid "could not close input file: %m"
 msgstr "konnte Eingabedatei nicht schließen: %m"
 
-#: pg_backup_archiver.c:2419
+#: pg_backup_archiver.c:2441
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "konnte Standardausgabe nicht zum Anhängen öffnen: %m"
 
-#: pg_backup_archiver.c:2464
+#: pg_backup_archiver.c:2486
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "nicht erkanntes Dateiformat »%d«"
 
-#: pg_backup_archiver.c:2545 pg_backup_archiver.c:4698
+#: pg_backup_archiver.c:2567 pg_backup_archiver.c:4798
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "Element %d %s %s abgeschlossen"
 
-#: pg_backup_archiver.c:2549 pg_backup_archiver.c:4711
+#: pg_backup_archiver.c:2571 pg_backup_archiver.c:4811
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "Arbeitsprozess fehlgeschlagen: Code %d"
 
-#: pg_backup_archiver.c:2671
+#: pg_backup_archiver.c:2669
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "unerwarteter TOC-Eintrag in WriteToc(): %d %s %s"
+
+#: pg_backup_archiver.c:2673 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1004
+#: pg_backup_tar.c:1009
+#, c-format
+msgid "error during file seek: %m"
+msgstr "Fehler beim Suchen in Datei: %m"
+
+#: pg_backup_archiver.c:2731
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "ID %d des Eintrags außerhalb des gültigen Bereichs -- vielleicht ein verfälschtes Inhaltsverzeichnis"
 
-#: pg_backup_archiver.c:2754
+#: pg_backup_archiver.c:2814
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "Wiederherstellung von Tabellen mit WITH OIDS wird nicht mehr unterstützt"
 
-#: pg_backup_archiver.c:2836
+#: pg_backup_archiver.c:2896
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "nicht erkannte Kodierung »%s«"
 
-#: pg_backup_archiver.c:2842
+#: pg_backup_archiver.c:2902
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "ungültiger ENCODING-Eintrag: %s"
 
-#: pg_backup_archiver.c:2860
+#: pg_backup_archiver.c:2920
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "ungültiger STDSTRINGS-Eintrag: %s"
 
-#: pg_backup_archiver.c:2885
+#: pg_backup_archiver.c:2945
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "Schema »%s« nicht gefunden"
 
-#: pg_backup_archiver.c:2892
+#: pg_backup_archiver.c:2952
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "Tabelle »%s« nicht gefunden"
 
-#: pg_backup_archiver.c:2899
+#: pg_backup_archiver.c:2959
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "Index »%s« nicht gefunden"
 
-#: pg_backup_archiver.c:2906
+#: pg_backup_archiver.c:2966
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "Funktion »%s« nicht gefunden"
 
-#: pg_backup_archiver.c:2913
+#: pg_backup_archiver.c:2973
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "Trigger »%s« nicht gefunden"
 
-#: pg_backup_archiver.c:3381
+#: pg_backup_archiver.c:3470
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "konnte Sitzungsbenutzer nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:3513
+#: pg_backup_archiver.c:3612
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "konnte »search_path« nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:3574
+#: pg_backup_archiver.c:3673
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "konnte »default_tablespace« nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:3623
+#: pg_backup_archiver.c:3722
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "konnte »default_table_access_method« nicht setzen: %s"
 
-#: pg_backup_archiver.c:3672
+#: pg_backup_archiver.c:3771
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "konnte Tabellenzugriffsmethode nicht ändern: %s"
 
-#: pg_backup_archiver.c:3773
+#: pg_backup_archiver.c:3872
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "kann Eigentümer für Objekttyp »%s« nicht setzen"
 
-#: pg_backup_archiver.c:4054
+#: pg_backup_archiver.c:4007
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "unerwarteter TOC-Eintrag in _printTocEntry(): %d %s %s"
+
+#: pg_backup_archiver.c:4155
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "magische Zeichenkette im Dateikopf nicht gefunden"
 
-#: pg_backup_archiver.c:4068
+#: pg_backup_archiver.c:4169
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "nicht unterstützte Version (%d.%d) im Dateikopf"
 
-#: pg_backup_archiver.c:4073
+#: pg_backup_archiver.c:4174
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "Prüfung der Integer-Größe (%lu) fehlgeschlagen"
 
-#: pg_backup_archiver.c:4077
+#: pg_backup_archiver.c:4178
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "Archiv wurde auf einer Maschine mit größeren Integers erstellt; einige Operationen könnten fehlschlagen"
 
-#: pg_backup_archiver.c:4087
+#: pg_backup_archiver.c:4188
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "erwartetes Format (%d) ist nicht das gleiche wie das in der Datei gefundene (%d)"
 
-#: pg_backup_archiver.c:4109
+#: pg_backup_archiver.c:4210
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "Archiv ist komprimiert, aber diese Installation unterstützt keine Komprimierung (%s) -- keine Daten verfügbar"
 
-#: pg_backup_archiver.c:4145
+#: pg_backup_archiver.c:4246
 #, c-format
 msgid "invalid creation date in header"
 msgstr "ungültiges Erstellungsdatum im Kopf"
 
-#: pg_backup_archiver.c:4279
+#: pg_backup_archiver.c:4380
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "verarbeite Element %d %s %s"
 
-#: pg_backup_archiver.c:4364
+#: pg_backup_archiver.c:4465
 #, c-format
 msgid "entering main parallel loop"
 msgstr "Eintritt in Hauptparallelschleife"
 
-#: pg_backup_archiver.c:4375
+#: pg_backup_archiver.c:4476
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "Element %d %s %s wird übersprungen"
 
-#: pg_backup_archiver.c:4384
+#: pg_backup_archiver.c:4485
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "starte Element %d %s %s"
 
-#: pg_backup_archiver.c:4438
+#: pg_backup_archiver.c:4539
 #, c-format
 msgid "finished main parallel loop"
 msgstr "Hauptparallelschleife beendet"
 
-#: pg_backup_archiver.c:4474
+#: pg_backup_archiver.c:4575
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "verarbeite verpasstes Element %d %s %s"
 
-#: pg_backup_archiver.c:5017
+#: pg_backup_archiver.c:5117
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "Tabelle »%s« konnte nicht erzeugt werden, ihre Daten werden nicht wiederhergestellt werden"
@@ -1138,12 +1249,6 @@ msgstr "Tabelle »%s« konnte nicht erzeugt werden, ihre Daten werden nicht wied
 msgid "invalid OID for large object"
 msgstr "ungültige OID für Large Object"
 
-#: pg_backup_custom.c:440 pg_backup_custom.c:506 pg_backup_custom.c:635
-#: pg_backup_custom.c:869 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "Fehler beim Suchen in Datei: %m"
-
 #: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
@@ -1174,203 +1279,142 @@ msgstr "unerwartete Block-ID (%d) beim Lesen der Daten gefunden -- erwartet wurd
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "unerkannter Datenblocktyp %d beim Wiederherstellen des Archivs gefunden"
 
-#: pg_backup_custom.c:750 pg_backup_custom.c:802 pg_backup_custom.c:944
-#: pg_backup_tar.c:1032
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
+#: pg_backup_tar.c:1007
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "konnte Positionszeiger in Archivdatei nicht ermitteln: %m"
 
-#: pg_backup_custom.c:766 pg_backup_custom.c:806
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "konnte Archivdatei nicht schließen: %m"
 
-#: pg_backup_custom.c:789
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "nur Eingabearchive können neu geöffnet werden"
 
-#: pg_backup_custom.c:796
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "parallele Wiederherstellung aus der Standardeingabe wird nicht unterstützt"
 
-#: pg_backup_custom.c:798
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr "parallele Wiederherstellung aus einer Datei, die kein Suchen ermöglicht, wird nicht unterstützt"
 
-#: pg_backup_custom.c:814
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "konnte Positionszeiger in Archivdatei nicht setzen: %m"
 
-#: pg_backup_custom.c:893
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "Kompressor ist aktiv"
 
-#: pg_backup_db.c:40
+#: pg_backup_db.c:41
 #, c-format
 msgid "could not get \"server_version\" from libpq"
 msgstr "konnte »server_version« nicht von libpq ermitteln"
 
-#: pg_backup_db.c:51 pg_dumpall.c:1919
-#, c-format
-msgid "aborting because of server version mismatch"
-msgstr "Abbruch wegen unpassender Serverversion"
-
-#: pg_backup_db.c:52 pg_dumpall.c:1920
-#, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "Version des Servers: %s; Version von %s: %s"
-
 #: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "bereits mit einer Datenbank verbunden"
 
-#: pg_backup_db.c:126 pg_backup_db.c:176 pg_dumpall.c:1766 pg_dumpall.c:1868
-msgid "Password: "
-msgstr "Passwort: "
-
-#: pg_backup_db.c:168
-#, c-format
-msgid "could not connect to database"
-msgstr "konnte nicht mit der Datenbank verbinden"
-
-#: pg_backup_db.c:185
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "Wiederverbindung fehlgeschlagen: %s"
-
-#: pg_backup_db.c:188 pg_backup_db.c:262 pg_dump.c:920 pg_dump_sort.c:1251
-#: pg_dump_sort.c:1271 pg_dumpall.c:1793 pg_dumpall.c:1877
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:269 pg_dumpall.c:1982 pg_dumpall.c:2005
-#, c-format
-msgid "query failed: %s"
-msgstr "Anfrage fehlgeschlagen: %s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1983 pg_dumpall.c:2006
-#, c-format
-msgid "Query was: %s"
-msgstr "Anfrage war: %s"
-
-#: pg_backup_db.c:313
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
 msgstr[0] "Anfrage ergab %d Zeile anstatt einer: %s"
 msgstr[1] "Anfrage ergab %d Zeilen anstatt einer: %s"
 
-#: pg_backup_db.c:349
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %sDie Anweisung war: %s"
 
-#: pg_backup_db.c:405 pg_backup_db.c:479 pg_backup_db.c:486
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "konnte Anfrage nicht ausführen"
 
-#: pg_backup_db.c:458
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "Fehler in PQputCopyData: %s"
 
-#: pg_backup_db.c:507
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "Fehler in PQputCopyEnd: %s"
 
-#: pg_backup_db.c:513
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY fehlgeschlagen für Tabelle »%s«: %s"
 
-#: pg_backup_db.c:519 pg_dump.c:2434
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "unerwartete zusätzliche Ergebnisse während COPY von Tabelle »%s«"
 
-#: pg_backup_db.c:531
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "konnte Datenbanktransaktion nicht starten"
 
-#: pg_backup_db.c:539
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "konnte Datenbanktransaktion nicht beenden"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "kein Ausgabeverzeichnis angegeben"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "konnte Verzeichnis »%s« nicht schließen: %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "konnte nicht in Ausgabedatei schreiben: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "konnte Datendatei nicht schließen: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "konnte Datendatei »%s« nicht schließen: %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "konnte Large-Object-Inhaltsverzeichnisdatei »%s« nicht zur Eingabe öffnen: %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "ungültige Zeile in Large-Object-Inhaltsverzeichnisdatei »%s«: %s"
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "Fehler beim Lesen von Large-Object-Inhaltsverzeichnisdatei »%s«"
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "konnte Large-Object-Inhaltsverzeichnisdatei »%s« nicht schließen: %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "konnte LO-Datendatei nicht schließen: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "konnte nicht in LOs-Inhaltsverzeichnisdatei schreiben: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "konnte LOs-Inhaltsverzeichnisdatei nicht schließen: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "Dateiname zu lang: »%s«"
@@ -1426,34 +1470,34 @@ msgstr "unerwartete Syntax der COPY-Anweisung: »%s«"
 msgid "invalid OID for large object (%u)"
 msgstr "Large Object hat ungültige OID (%u)"
 
-#: pg_backup_tar.c:1048
+#: pg_backup_tar.c:1023
 #, c-format
 msgid "could not close temporary file: %m"
 msgstr "konnte temporäre Datei nicht schließen: %m"
 
-#: pg_backup_tar.c:1051
+#: pg_backup_tar.c:1026
 #, c-format
 msgid "actual file length (%lld) does not match expected (%lld)"
 msgstr "tatsächliche Dateilänge (%lld) stimmt nicht mit erwarteter Länge (%lld) überein"
 
-#: pg_backup_tar.c:1097 pg_backup_tar.c:1128
+#: pg_backup_tar.c:1072 pg_backup_tar.c:1103
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive"
 msgstr "konnte Kopf für Datei »%s« im Tar-Archiv nicht finden"
 
-#: pg_backup_tar.c:1115
+#: pg_backup_tar.c:1090
 #, 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."
 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."
 
-#: pg_backup_tar.c:1162
+#: pg_backup_tar.c:1137
 #, c-format
 msgid "incomplete tar header found (%lu byte)"
 msgid_plural "incomplete tar header found (%lu bytes)"
 msgstr[0] "unvollständiger Tar-Dateikopf gefunden (%lu Byte)"
 msgstr[1] "unvollständiger Tar-Dateikopf gefunden (%lu Bytes)"
 
-#: pg_backup_tar.c:1201
+#: pg_backup_tar.c:1176
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "beschädigter Tar-Kopf in %s gefunden (%d erwartet, %d berechnet), Dateiposition %llu"
@@ -1463,10 +1507,10 @@ msgstr "beschädigter Tar-Kopf in %s gefunden (%d erwartet, %d berechnet), Datei
 msgid "unrecognized section name: \"%s\""
 msgstr "unbekannter Abschnittsname: »%s«"
 
-#: pg_backup_utils.c:57 pg_dump.c:798 pg_dump.c:815 pg_dumpall.c:386
-#: pg_dumpall.c:396 pg_dumpall.c:404 pg_dumpall.c:412 pg_dumpall.c:419
-#: pg_dumpall.c:429 pg_dumpall.c:520 pg_restore.c:324 pg_restore.c:340
-#: pg_restore.c:354
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
@@ -1476,141 +1520,112 @@ msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 msgid "out of on_exit_nicely slots"
 msgstr "on_exit_nicely-Slots aufgebraucht"
 
-#: pg_dump.c:813 pg_dumpall.c:394 pg_restore.c:338
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "zu viele Kommandozeilenargumente (das erste ist »%s«)"
 
-#: pg_dump.c:825 pg_restore.c:362
-#, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "Optionen -s/--schema-only und -a/--data-only können nicht zusammen verwendet werden"
-
-#: pg_dump.c:827 pg_restore.c:364
-#, c-format
-msgid "options -s/--schema-only and --statistics-only cannot be used together"
-msgstr "Optionen -s/--schema-only und --statistics-only können nicht zusammen verwendet werden"
-
-#: pg_dump.c:829 pg_restore.c:366
-#, c-format
-msgid "options -a/--data-only and --statistics-only cannot be used together"
-msgstr "Optionen -a/--data-only und --statistic-only können nicht zusammen verwendet werden"
-
-#: pg_dump.c:833 pg_restore.c:370
-#, c-format
-msgid "options -a/--data-only and --no-data cannot be used together"
-msgstr "Optionen -a/--data-only und --no-data können nicht zusammen verwendet werden"
-
-#: pg_dump.c:835 pg_restore.c:372
-#, c-format
-msgid "options -s/--schema-only and --no-schema cannot be used together"
-msgstr "Optionen -s/--schema-only und --no-schema können nicht zusammen verwendet werden"
-
-#: pg_dump.c:837 pg_restore.c:374
-#, c-format
-msgid "options --statistics-only and --no-statistics cannot be used together"
-msgstr "Optionen --statistics-only und --no-statistics können nicht zusammen verwendet werden"
-
-#: pg_dump.c:841 pg_restore.c:378
-#, c-format
-msgid "options --with-data and --no-data cannot be used together"
-msgstr "Optionen --with-data und --no-data können nicht zusammen verwendet werden"
-
-#: pg_dump.c:843 pg_restore.c:380
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
 #, c-format
-msgid "options --with-schema and --no-schema cannot be used together"
-msgstr "Optionen --with-schema und --no-schema können nicht zusammen verwendet werden"
+msgid "options %s and %s cannot be used together"
+msgstr "Optionen %s und %s können nicht zusammen verwendet werden"
 
-#: pg_dump.c:845 pg_restore.c:382
+#: pg_dump.c:865
 #, c-format
-msgid "options --with-statistics and --no-statistics cannot be used together"
-msgstr "Optionen --with-statistics und --no-statistics können nicht zusammen verwendet werden"
+msgid "option %s is not supported with parallel backup"
+msgstr "Option %s wird nicht mit paralleler Sicherung unterstützt"
 
-#: pg_dump.c:848
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "Optionen -s/--schema-only und --include-foreign-data können nicht zusammen verwendet werden"
+msgid "option %s requires option %s"
+msgstr "Option %s erfordert Option %s"
 
-#: pg_dump.c:851
+#: pg_dump.c:894
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "Option --include-foreign-data wird nicht mit paralleler Sicherung unterstützt"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "Option %s erfordert Option %s, %s oder %s"
 
-#: pg_dump.c:854 pg_restore.c:385
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "Optionen -c/--clean und -a/--data-only können nicht zusammen verwendet werden"
+msgid "could not generate restrict key"
+msgstr "konnte Restrict-Schlüssel nicht erzeugen"
 
-#: pg_dump.c:857 pg_dumpall.c:424 pg_restore.c:428
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "Option --if-exists benötigt Option -c/--clean"
+msgid "invalid restrict key"
+msgstr "ungültiger Restrict-Schlüssel"
 
-#: pg_dump.c:879
+#: pg_dump.c:917
 #, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "Option --on-conflict-do-nothing benötigt Option --inserts, --rows-per-insert oder --column-inserts"
+msgid "option %s can only be used with %s"
+msgstr "Option %s kann nur mit %s verwendet werden"
 
-#: pg_dump.c:908
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "unbekannter Komprimierungsalgorithmus: »%s«"
 
-#: pg_dump.c:915
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "ungültige Komprimierungsangabe: %s"
 
-#: pg_dump.c:928
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "Komprimierungsoption »%s« wird aktuell von pg_dump nicht unterstützt"
 
-#: pg_dump.c:940
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "parallele Sicherung wird nur vom Ausgabeformat »Verzeichnis« unterstützt"
 
-#: pg_dump.c:986
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "letzte eingebaute OID ist %u"
 
-#: pg_dump.c:995
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "keine passenden Schemas gefunden"
 
-#: pg_dump.c:1012
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "keine passenden Tabellen gefunden"
 
-#: pg_dump.c:1040
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "keine passenden Erweiterungen gefunden"
 
-#: pg_dump.c:1233
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s gibt eine Datenbank als Textdatei oder in anderen Formaten aus.\n"
+"%s exportiert eine PostgreSQL-Datenbank als SQL-Skript oder in anderen Formaten.\n"
 "\n"
 
-#: pg_dump.c:1234 pg_dumpall.c:668 pg_restore.c:503
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_dump.c:1235
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:1237 pg_dumpall.c:671 pg_restore.c:506
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1619,12 +1634,12 @@ msgstr ""
 "\n"
 "Allgemeine Optionen:\n"
 
-#: pg_dump.c:1238
+#: pg_dump.c:1271
 #, 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:1239
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1633,22 +1648,22 @@ msgstr ""
 "  -F, --format=c|d|t|p         Ausgabeformat (custom, d=Verzeichnis, tar,\n"
 "                               plain text)\n"
 
-#: pg_dump.c:1241
+#: pg_dump.c:1274
 #, 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:1242 pg_dumpall.c:673
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                »Verbose«-Modus\n"
 
-#: pg_dump.c:1243 pg_dumpall.c:674
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_dump.c:1244
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1657,31 +1672,31 @@ msgstr ""
 "  -Z, --compress=METHODE[:DETAIL]\n"
 "                               wie angegeben komprimieren\n"
 
-#: pg_dump.c:1246 pg_dumpall.c:675
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, 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:1247 pg_dumpall.c:707
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  --no-sync                    nicht warten, bis Änderungen sicher auf\n"
 "                               Festplatte geschrieben sind\n"
 
-#: pg_dump.c:1248
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr ""
 "  --sync-method=METHODE        Methode zum Synchronisieren von Dateien auf\n"
 "                               Festplatte setzen\n"
 
-#: pg_dump.c:1249 pg_dumpall.c:676
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_dump.c:1251 pg_dumpall.c:677
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1690,64 +1705,64 @@ msgstr ""
 "\n"
 "Optionen die den Inhalt der Ausgabe kontrollieren:\n"
 
-#: pg_dump.c:1252 pg_dumpall.c:678
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, c-format
 msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
 msgstr "  -a, --data-only              nur die Daten ausgeben, nicht das Schema oder Statistiken\n"
 
-#: pg_dump.c:1253
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          Large Objects mit ausgeben\n"
 
-#: pg_dump.c:1254
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (gleich --large-objects, veraltet)\n"
 
-#: pg_dump.c:1255
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       Large Objects nicht mit ausgeben\n"
 
-#: pg_dump.c:1256
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (gleich --no-large-objects, veraltet)\n"
 
-#: pg_dump.c:1257 pg_restore.c:517
+#: pg_dump.c:1290 pg_restore.c:550
 #, 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:1258
+#: pg_dump.c:1291
 #, 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:1259
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=MUSTER       nur die angegebene(n) Erweiterung(en) ausgeben\n"
 
-#: pg_dump.c:1260 pg_dumpall.c:680
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, 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:1261
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=MUSTER          nur das/die angegebene(n) Schema(s) ausgeben\n"
 
-#: pg_dump.c:1262
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=MUSTER  das/die angegebene(n) Schema(s) NICHT ausgeben\n"
 
-#: pg_dump.c:1263
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1756,58 +1771,58 @@ msgstr ""
 "  -O, --no-owner               Wiederherstellung der Objekteigentümerschaft im\n"
 "                               »plain text«-Format auslassen\n"
 
-#: pg_dump.c:1265 pg_dumpall.c:684
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, c-format
 msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
 msgstr "  -s, --schema-only            nur das Schema ausgeben, nicht Daten oder Statistiken\n"
 
-#: pg_dump.c:1266
+#: pg_dump.c:1299
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME         Superusername für »plain text«-Format\n"
 
-#: pg_dump.c:1267
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=MUSTER           nur die angegebene(n) Tabelle(n) ausgeben\n"
 
-#: pg_dump.c:1268
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=MUSTER   die angegebene(n) Tabelle(n) NICHT ausgeben\n"
 
-#: pg_dump.c:1269 pg_dumpall.c:687
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, 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:1270 pg_dumpall.c:688
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, 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:1271 pg_dumpall.c:689
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, 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:1272 pg_dumpall.c:690
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, 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:1273 pg_dumpall.c:691 pg_restore.c:534
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, 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:1274
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1816,12 +1831,12 @@ msgstr ""
 "  --enable-row-security        Sicherheit auf Zeilenebene einschalten (nur Daten\n"
 "                               ausgeben, auf die der Benutzer Zugriff hat)\n"
 
-#: pg_dump.c:1276
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=MUSTER   die angegebene(n) Erweiterung(en) NICHT ausgeben\n"
 
-#: pg_dump.c:1277
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1832,12 +1847,12 @@ msgstr ""
 "                               die angegebene(n) Tabelle(n) NICHT ausgeben,\n"
 "                               einschließlich abgeleiteter und Partitionstabellen\n"
 
-#: pg_dump.c:1280
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=MUSTER  Daten der angegebenen Tabelle(n) NICHT ausgeben\n"
 
-#: pg_dump.c:1281
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1848,12 +1863,12 @@ msgstr ""
 "                               Daten der angegebenen Tabelle(n) NICHT ausgeben,\n"
 "                               einschließlich abgeleiteter und Partitionstabellen\n"
 
-#: pg_dump.c:1284 pg_dumpall.c:693
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=ZAHL    Einstellung für extra_float_digits\n"
 
-#: pg_dump.c:1285
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
@@ -1862,12 +1877,12 @@ msgstr ""
 "  --filter=DATEINAME           Objekte und Daten basierend auf Ausdrücken in DATEINAME\n"
 "                               mit sichern oder überspringen\n"
 
-#: pg_dump.c:1287 pg_dumpall.c:695 pg_restore.c:538
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, 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:1288
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1878,121 +1893,133 @@ msgstr ""
 "                               Daten von Fremdtabellen auf Fremdservern, die\n"
 "                               mit MUSTER übereinstimmen, mit sichern\n"
 
-#: pg_dump.c:1291 pg_dumpall.c:696
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, 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:1292 pg_dumpall.c:697
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    Partitionen über die Wurzeltabelle laden\n"
 
-#: pg_dump.c:1293 pg_dumpall.c:698
+#: pg_dump.c:1326 pg_dumpall.c:730
 #, c-format
 msgid "  --no-comments                do not dump comment commands\n"
 msgstr "  --no-comments                Kommentar-Befehle nicht ausgeben\n"
 
-#: pg_dump.c:1294 pg_dumpall.c:699
+#: pg_dump.c:1327 pg_dumpall.c:731
 #, c-format
 msgid "  --no-data                    do not dump data\n"
 msgstr "  --no-data                    Daten nicht ausgeben\n"
 
-#: pg_dump.c:1295 pg_dumpall.c:700
+#: pg_dump.c:1328 pg_dumpall.c:732
 #, c-format
 msgid "  --no-policies                do not dump row security policies\n"
 msgstr "  --no-policies                Policys für Sicherheit auf Zeilenebene nicht ausgeben\n"
 
-#: pg_dump.c:1296 pg_dumpall.c:701
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            Publikationen nicht ausgeben\n"
 
-#: pg_dump.c:1297 pg_dumpall.c:703
+#: pg_dump.c:1330 pg_dumpall.c:735
 #, c-format
 msgid "  --no-schema                  do not dump schema\n"
 msgstr "  --no-schema                  Schema nicht ausgeben\n"
 
-#: pg_dump.c:1298 pg_dumpall.c:704
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, 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:1299 pg_dumpall.c:705
+#: pg_dump.c:1332 pg_dumpall.c:737
 #, c-format
 msgid "  --no-statistics              do not dump statistics\n"
 msgstr "  --no-statistics              Statistiken nicht ausgeben\n"
 
-#: pg_dump.c:1300 pg_dumpall.c:706
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           Subskriptionen nicht ausgeben\n"
 
-#: pg_dump.c:1301 pg_dumpall.c:708
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     Tabellenzugriffsmethoden nicht ausgeben\n"
 
-#: pg_dump.c:1302 pg_dumpall.c:709
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             Tablespace-Zuordnungen nicht ausgeben\n"
 
-#: pg_dump.c:1303 pg_dumpall.c:710
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       TOAST-Komprimierungsmethoden nicht ausgeben\n"
 
-#: pg_dump.c:1304 pg_dumpall.c:711
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, 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:1305 pg_dumpall.c:712
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     INSERT-Befehle mit ON CONFLICT DO NOTHING ausgeben\n"
 
-#: pg_dump.c:1306 pg_dumpall.c:713
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, 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:1307 pg_dumpall.c:714
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr ""
+"  --restrict-key=RESTRICT_KEY  angegebene Zeichenkette als Schlüssel für psql\n"
+"                               \\restrict verwenden\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=ANZAHL     Anzahl Zeilen pro INSERT; impliziert --inserts\n"
 
-#: pg_dump.c:1308
+#: pg_dump.c:1342
 #, 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:1309
+#: pg_dump.c:1343 pg_dumpall.c:748
 #, c-format
 msgid "  --sequence-data              include sequence data in dump\n"
 msgstr "  --sequence-data              Sequenzdaten in Ausgabe einfügen\n"
 
-#: pg_dump.c:1310
+#: pg_dump.c:1344
 #, 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:1311
+#: pg_dump.c:1345
 #, 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:1312 pg_dumpall.c:715
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 die Statistiken ausgeben\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
 #, c-format
 msgid "  --statistics-only            dump only the statistics, not schema or data\n"
 msgstr "  --statistics-only            nur die Statistiken ausgeben, nicht Schema oder Daten\n"
 
-#: pg_dump.c:1313 pg_restore.c:553
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -2001,7 +2028,7 @@ msgstr ""
 "  --strict-names               Tabellen- oder Schemamuster müssen auf mindestens\n"
 "                               je ein Objekt passen\n"
 
-#: pg_dump.c:1315
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -2010,7 +2037,7 @@ msgstr ""
 "  --table-and-children=MUSTER  nur die angegebene(n) Tabelle(n) ausgeben,\n"
 "                               einschließlich abgeleiteter und Partitionstabellen\n"
 
-#: pg_dump.c:1317 pg_dumpall.c:716 pg_restore.c:556
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -2022,22 +2049,7 @@ msgstr ""
 "                               OWNER Befehle verwenden, um Eigentümerschaft zu\n"
 "                               setzen\n"
 
-#: pg_dump.c:1320 pg_dumpall.c:719 pg_restore.c:559
-#, c-format
-msgid "  --with-data                  dump the data\n"
-msgstr "  --with-data                  die Daten ausgeben\n"
-
-#: pg_dump.c:1321 pg_dumpall.c:720 pg_restore.c:560
-#, c-format
-msgid "  --with-schema                dump the schema\n"
-msgstr "  --with-schema                das Schema ausgeben\n"
-
-#: pg_dump.c:1322 pg_dumpall.c:721 pg_restore.c:561
-#, c-format
-msgid "  --with-statistics            dump the statistics\n"
-msgstr "  --with-statistics            die Statistiken ausgeben\n"
-
-#: pg_dump.c:1324 pg_dumpall.c:723 pg_restore.c:563
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -2046,42 +2058,42 @@ msgstr ""
 "\n"
 "Verbindungsoptionen:\n"
 
-#: pg_dump.c:1325
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAME      auszugebende Datenbank\n"
 
-#: pg_dump.c:1326 pg_dumpall.c:725 pg_restore.c:564
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, 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:1327 pg_dumpall.c:727 pg_restore.c:565
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          Portnummer des Datenbankservers\n"
 
-#: pg_dump.c:1328 pg_dumpall.c:728 pg_restore.c:566
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      Datenbankbenutzername\n"
 
-#: pg_dump.c:1329 pg_dumpall.c:729 pg_restore.c:567
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        niemals nach Passwort fragen\n"
 
-#: pg_dump.c:1330 pg_dumpall.c:730 pg_restore.c:568
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, 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:1331 pg_dumpall.c:731
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, 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:1333
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2094,560 +2106,552 @@ msgstr ""
 "PGDATABASE verwendet.\n"
 "\n"
 
-#: pg_dump.c:1335 pg_dumpall.c:735 pg_restore.c:575
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Berichten Sie Fehler an <%s>.\n"
 
-#: pg_dump.c:1336 pg_dumpall.c:736 pg_restore.c:576
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s Homepage: <%s>\n"
 
-#: pg_dump.c:1355 pg_dumpall.c:550
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "ungültige Clientkodierung »%s« angegeben"
 
-#: pg_dump.c:1503
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "parallele Dumps von Standby-Servern werden von dieser Serverversion nicht unterstützt"
 
-#: pg_dump.c:1568
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "ungültiges Ausgabeformat »%s« angegeben"
 
-#: pg_dump.c:1609 pg_dump.c:1665 pg_dump.c:1718 pg_dumpall.c:1556
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1605
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "falscher qualifizierter Name (zu viele Namensteile): %s"
 
-#: pg_dump.c:1617
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "keine passenden Schemas für Muster »%s« gefunden"
 
-#: pg_dump.c:1670
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "keine passenden Erweiterungen für Muster »%s« gefunden"
 
-#: pg_dump.c:1723
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "keine passenden Fremdserver für Muster »%s« gefunden"
 
-#: pg_dump.c:1794
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "falscher Relationsname (zu viele Namensteile): %s"
 
-#: pg_dump.c:1816
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "keine passenden Tabellen für Muster »%s« gefunden"
 
-#: pg_dump.c:1843
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Sie sind gegenwärtig nicht mit einer Datenbank verbunden."
 
-#: pg_dump.c:1846
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: %s"
 
-#: pg_dump.c:2305
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "gebe Inhalt der Tabelle »%s.%s« aus"
 
-#: pg_dump.c:2415
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Ausgabe des Inhalts der Tabelle »%s« fehlgeschlagen: PQgetCopyData() fehlgeschlagen."
 
-#: pg_dump.c:2416 pg_dump.c:2426
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Fehlermeldung vom Server: %s"
 
-#: pg_dump.c:2417 pg_dump.c:2427
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "Die Anweisung war: %s"
 
-#: pg_dump.c:2425
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Ausgabe des Inhalts der Tabelle »%s« fehlgeschlagen: PQgetResult() fehlgeschlagen."
 
-#: pg_dump.c:2516
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "falsche Anzahl Felder von Tabelle »%s« erhalten"
 
-#: pg_dump.c:3231
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "sichere Datenbankdefinition"
 
-#: pg_dump.c:3346
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "unbekannter Locale-Provider: %s"
 
-#: pg_dump.c:3707
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "sichere Kodierung = %s"
 
-#: pg_dump.c:3732
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "sichere »standard_conforming_strings = %s«"
 
-#: pg_dump.c:3771
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "konnte Ergebnis von current_schemas() nicht interpretieren"
 
-#: pg_dump.c:3790
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "sichere »search_path = %s«"
 
-#: pg_dump.c:3826
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "lese Large Objects"
 
-#: pg_dump.c:4047
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "sichere Large Objects »%s«"
 
-#: pg_dump.c:4068
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "Fehler beim Lesen von Large Object %u: %s"
 
-#: pg_dump.c:4176
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "lese Policys für Sicherheit auf Zeilenebene"
 
-#: pg_dump.c:4317
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "unerwarteter Policy-Befehlstyp: %c"
 
-#: pg_dump.c:4759 pg_dump.c:5316 pg_dump.c:7912 pg_dump.c:12975 pg_dump.c:19072
-#: pg_dump.c:19074 pg_dump.c:19706
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19681
+#: pg_dump.c:19683 pg_dump.c:20315
 #, c-format
 msgid "could not parse %s array"
 msgstr "konnte %s-Array nicht interpretieren"
 
-#: pg_dump.c:4975
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "Subskriptionen werden nicht ausgegeben, weil der aktuelle Benutzer kein Superuser ist"
 
-#: pg_dump.c:5179
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "Subskription mit OID %u existiert nicht"
 
-#: pg_dump.c:5186
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "Sanity-Check fehlgeschlagen, Tabelle mit OID %u nicht gefunden"
 
-#: pg_dump.c:5772
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "konnte Erweiterung, zu der %s %s gehört, nicht finden"
 
-#: pg_dump.c:5910
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "Schema mit OID %u existiert nicht"
 
-#: pg_dump.c:6934
-#, fuzzy, c-format
-#| msgid "cannot define statistics for relation \"%s\""
-msgid "cannot dump statistics for relation kind '%c'"
-msgstr "für Relation »%s« können keine Statistiken definiert werden"
+#: pg_dump.c:7009
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "für Relationstyp »%c« können keine Statistiken ausgegeben werden"
 
-#: pg_dump.c:7446 pg_dump.c:18416
+#: pg_dump.c:7521 pg_dump.c:19008
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "Sanity-Check fehlgeschlagen, Elterntabelle mit OID %u von Sequenz mit OID %u nicht gefunden"
 
-#: pg_dump.c:7591
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "Sanity-Check fehlgeschlagen, Tabellen-OID %u, die in pg_partitioned_table erscheint, nicht gefunden"
 
-#: pg_dump.c:7856 pg_dump.c:8149 pg_dump.c:8590 pg_dump.c:9217 pg_dump.c:9344
-#: pg_dump.c:9492
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "unbekannte Tabellen-OID %u"
 
-#: pg_dump.c:7860
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "unerwartete Indexdaten für Tabelle »%s«"
 
-#: pg_dump.c:8377
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "Sanity-Check fehlgeschlagen, Elterntabelle mit OID %u von pg_rewrite-Eintrag mit OID %u nicht gefunden"
 
-#: pg_dump.c:9221
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "unerwartete Spaltendaten für Tabelle »%s«"
 
-#: pg_dump.c:9251
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "ungültige Spaltennummerierung in Tabelle »%s«"
 
-#: pg_dump.c:9306
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "finde Tabellenvorgabeausdrücke"
 
-#: pg_dump.c:9348
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "ungültiger adnum-Wert %d für Tabelle »%s«"
 
-#: pg_dump.c:9442
+#: pg_dump.c:9570
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "finde ungültige Not-Null-Constraints"
+
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "finde Tabellen-Check-Constraints"
 
-#: pg_dump.c:9496
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "%d Check-Constraint für Tabelle %s erwartet, aber %d gefunden"
 msgstr[1] "%d Check-Constraints für Tabelle %s erwartet, aber %d gefunden"
 
-#: pg_dump.c:9500
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Die Systemkataloge sind wahrscheinlich verfälscht."
 
-#: pg_dump.c:10253
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "Rolle mit OID %u existiert nicht"
 
-#: pg_dump.c:10365 pg_dump.c:10394
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "nicht unterstützter pg_init_privs-Eintrag: %u %u %d"
 
-#: pg_dump.c:10685
-#, fuzzy, c-format
-#| msgid "timestamp cannot be NaN"
-msgid "attname cannot be NULL"
-msgstr "timestamp kann nicht NaN sein"
+#: pg_dump.c:10968
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "Statistiken in falscher Reihenfolge ausgegeben (aktuell: %d %s %s, erwartet: %d %s %s)"
+
+#: pg_dump.c:11109
+#, c-format
+msgid "unexpected null attname"
+msgstr "unerwarteter atttname mit NULL-Wert"
 
-#: pg_dump.c:10714
-#, fuzzy, c-format
-#| msgid "could not find an aggregate named \"%s\""
+#: pg_dump.c:11138
+#, c-format
 msgid "could not find index attname \"%s\""
-msgstr "konnte keine Aggregatfunktion namens »%s« finden"
+msgstr "konnte Index-Attname »%s« nicht finden"
 
-#: pg_dump.c:11184
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "fehlende Metadaten für Large Objects »%s«"
 
-#: pg_dump.c:11470
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "typtype des Datentypen »%s« scheint ungültig zu sein"
 
-#: pg_dump.c:13046
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "ungültiger provolatile-Wert für Funktion »%s«"
 
-#: pg_dump.c:13096 pg_dump.c:14992
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "ungültiger proparallel-Wert für Funktion »%s«"
 
-#: pg_dump.c:13226 pg_dump.c:13332 pg_dump.c:13339
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "konnte Funktionsdefinition für Funktion mit OID %u nicht finden"
 
-#: pg_dump.c:13265
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "unsinniger Wert in Feld pg_cast.castfunc oder pg_cast.castmethod"
 
-#: pg_dump.c:13268
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "unsinniger Wert in Feld pg_cast.castmethod"
 
-#: pg_dump.c:13358
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "unsinnige Transformationsdefinition, mindestens eins von trffromsql und trftosql sollte nicht null sein"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "unsinniger Wert in Feld pg_transform.trffromsql"
 
-#: pg_dump.c:13396
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "unsinniger Wert in Feld pg_transform.trftosql"
 
-#: pg_dump.c:13541
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "Postfix-Operatoren werden nicht mehr unterstützt (Operator »%s«)"
 
-#: pg_dump.c:13711
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "konnte Operator mit OID %s nicht finden"
 
-#: pg_dump.c:13779
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "ungültiger Typ »%c« für Zugriffsmethode »%s«"
 
-#: pg_dump.c:14453 pg_dump.c:14521
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "unbekannter Sortierfolgen-Provider: %s"
 
-#: pg_dump.c:14462 pg_dump.c:14469 pg_dump.c:14480 pg_dump.c:14490
-#: pg_dump.c:14505
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "ungültige Sortierfolge »%s«"
 
-#: pg_dump.c:14911
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "unbekannter aggfinalmodify-Wert für Aggregat »%s«"
 
-#: pg_dump.c:14967
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "unbekannter aggmfinalmodify-Wert für Aggregat »%s«"
 
-#: pg_dump.c:15687
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "unbekannter Objekttyp in den Vorgabeprivilegien: %d"
 
-#: pg_dump.c:15703
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "konnte Vorgabe-ACL-Liste (%s) nicht interpretieren"
 
-#: pg_dump.c:15787
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "konnte initiale ACL-Liste (%s) oder Default (%s) für Objekt »%s« (%s) nicht interpretieren"
 
-#: pg_dump.c:15812
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "konnte ACL-Liste (%s) oder Default (%s) für Objekt »%s« (%s) nicht interpretieren"
 
-#: pg_dump.c:16355
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte keine Daten"
 
-#: pg_dump.c:16358
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte mehr als eine Definition"
 
-#: pg_dump.c:16365
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "Definition der Sicht »%s« scheint leer zu sein (Länge null)"
 
-#: pg_dump.c:16450
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS wird nicht mehr unterstützt (Tabelle »%s«)"
 
-#: pg_dump.c:17540
+#: pg_dump.c:18085
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "ungültige Spaltennummer %d in Tabelle »%s«"
 
-#: pg_dump.c:17618
+#: pg_dump.c:18163
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "konnte Indexstatistikspalten nicht interpretieren"
 
-#: pg_dump.c:17620
+#: pg_dump.c:18165
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "konnte Indexstatistikwerte nicht interpretieren"
 
-#: pg_dump.c:17622
+#: pg_dump.c:18167
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "Anzahl Spalten und Werte für Indexstatistiken stimmt nicht überein"
 
-#: pg_dump.c:17837
+#: pg_dump.c:18396
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "fehlender Index für Constraint »%s«"
 
-#: pg_dump.c:18074
+#: pg_dump.c:18665
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "unbekannter Constraint-Typ: %c"
 
-#: pg_dump.c:18127
+#: pg_dump.c:18718
 #, c-format
 msgid "unrecognized sequence type: %s"
 msgstr "unbekannter Sequenztyp: %s"
 
-#: pg_dump.c:18259 pg_dump.c:18491
+#: pg_dump.c:18851 pg_dump.c:19089
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "Anfrage nach Daten der Sequenz %s ergab %d Zeile (erwartete 1)"
 msgstr[1] "Anfrage nach Daten der Sequenz %s ergab %d Zeilen (erwartete 1)"
 
-#: pg_dump.c:18295
+#: pg_dump.c:18887
 #, c-format
 msgid "unrecognized sequence type: %d"
 msgstr "unbekannter Sequenztyp: %d"
 
-#: pg_dump.c:18824
+#: pg_dump.c:19112
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "konnte Daten für Sequenz »%s« nicht ermitteln; möglicherweise hat der Anwender nicht das SELECT-Privileg für die Sequenz oder die Sequenz würde möglicherweise gleichzeitig gelöscht"
+
+#: pg_dump.c:19433
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "Anfrage nach Regel »%s« der Tabelle »%s« fehlgeschlagen: falsche Anzahl Zeilen zurückgegeben"
 
-#: pg_dump.c:18977
+#: pg_dump.c:19586
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "konnte referenzierte Erweiterung %u nicht finden"
 
-#: pg_dump.c:19076
+#: pg_dump.c:19685
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "Anzahl Konfigurationen und Bedingungen für Erweiterung stimmt nicht überein"
 
-#: pg_dump.c:19208
+#: pg_dump.c:19817
 #, c-format
 msgid "reading dependency data"
 msgstr "lese Abhängigkeitsdaten"
 
-#: pg_dump.c:19294
+#: pg_dump.c:19903
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "kein referenzierendes Objekt %u %u"
 
-#: pg_dump.c:19305
+#: pg_dump.c:19914
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "kein referenziertes Objekt %u %u"
 
-#: pg_dump.c:19740 pg_dump.c:19778 pg_dumpall.c:2051 pg_restore.c:610
-#: pg_restore.c:656
+#: pg_dump.c:20349 pg_dump.c:20387 pg_dumpall.c:1853 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "%s-Filter für »%s« ist nicht erlaubt"
 
-#: pg_dump_sort.c:436
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "ungültige dumpId %d"
 
-#: pg_dump_sort.c:442
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "ungültige Abhängigkeit %d"
 
-#: pg_dump_sort.c:606
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "konnte Abhängigkeitsschleife nicht bestimmen"
 
-#: pg_dump_sort.c:1247
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "Es gibt zirkuläre Fremdschlüssel-Constraints für diese Tabelle:"
 msgstr[1] "Es gibt zirkuläre Fremdschlüssel-Constraints zwischen diesen Tabellen:"
 
-#: pg_dump_sort.c:1252
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "Möglicherweise kann der Dump nur wiederhergestellt werden, wenn --disable-triggers verwendet wird oder die Constraints vorübergehend entfernt werden."
 
-#: pg_dump_sort.c:1253
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "Führen Sie einen vollen Dump statt eines Dumps mit --data-only durch, um dieses Problem zu vermeiden."
 
-#: pg_dump_sort.c:1265
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "konnte Abhängigkeitsschleife zwischen diesen Elementen nicht auflösen:"
 
-#: pg_dumpall.c:247
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "Programm »%s« wird von %s benötigt, aber wurde nicht im selben Verzeichnis wie »%s« gefunden"
 
-#: pg_dumpall.c:250
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "Programm »%s« wurde von »%s« gefunden, aber es hatte nicht die gleiche Version wie %s"
 
-#: pg_dumpall.c:403
+#: pg_dumpall.c:402
 #, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "Option --exclude-database kann nicht zusammen mit -g/--globals-only, -r/--roles-only oder -t/--tablesspaces-only verwendet werden"
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "Option %s kann nicht zusammen mit %s, %s oder %s verwendet werden"
 
-#: pg_dumpall.c:411
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "Optionen -g/--globals-only und -r/--roles-only können nicht zusammen verwendet werden"
-
-#: pg_dumpall.c:418
-#, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "Optionen -g/--globals-only und -t/--tablespaces-only können nicht zusammen verwendet werden"
-
-#: pg_dumpall.c:428
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "Optionen -r/--roles-only und -t/--tablespaces-only können nicht zusammen verwendet werden"
-
-#: pg_dumpall.c:506 pg_dumpall.c:1860
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "konnte nicht mit der Datenbank »%s« verbinden"
-
-#: pg_dumpall.c:518
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2656,91 +2660,91 @@ msgstr ""
 "konnte nicht mit Datenbank »postgres« oder »template1« verbinden\n"
 "Bitte geben Sie eine alternative Datenbank an."
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s gibt einen PostgreSQL-Datenbankcluster in eine SQL-Skriptdatei aus.\n"
+"%s exportiert einen PostgreSQL-Datenbankcluster als SQL-Skript.\n"
 "\n"
 
-#: pg_dumpall.c:669
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:672
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=DATEINAME         Name der Ausgabedatei\n"
 
-#: pg_dumpall.c:679
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  Datenbanken vor der Wiedererstellung löschen\n"
 
-#: pg_dumpall.c:681
+#: pg_dumpall.c:713
 #, 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:682 pg_restore.c:526
+#: pg_dumpall.c:714 pg_restore.c:559
 #, 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:683
+#: pg_dumpall.c:715
 #, 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:685
+#: pg_dumpall.c:717
 #, 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:686
+#: pg_dumpall.c:718
 #, 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:692
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr ""
 "  --exclude-database=MUSTER    Datenbanken deren Name mit MUSTER übereinstimmt\n"
 "                               überspringen\n"
 
-#: pg_dumpall.c:694
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr ""
 "  --filter=DATEINAME           Datenbanken basierend auf Ausdrücken in DATEINAME\n"
 "                               überspringen\n"
 
-#: pg_dumpall.c:702
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          Rollenpasswörter nicht mit ausgeben\n"
 
-#: pg_dumpall.c:724
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=VERBDG      mit angegebenen Verbindungsparametern verbinden\n"
 
-#: pg_dumpall.c:726
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    alternative Standarddatenbank\n"
 
-#: pg_dumpall.c:733
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2753,167 +2757,153 @@ msgstr ""
 "Standardausgabe geschrieben.\n"
 "\n"
 
-#: pg_dumpall.c:878
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "mit »pg_« anfangender Rollenname übersprungen (%s)"
 
 #. translator: %s represents a numeric role OID
-#: pg_dumpall.c:1095 pg_dumpall.c:1153 pg_dumpall.c:1162
+#: pg_dumpall.c:1127
 #, c-format
-msgid "found orphaned pg_auth_members entry for role %s"
-msgstr "verwaister pg_auth_members-Eintrag für Rolle %s gefunden"
+msgid "ignoring role grant for missing role with OID %s"
+msgstr "Rollen-Grant für fehlende Rolle mit OID %s wird ignoriert"
 
-#: pg_dumpall.c:1128
+#: pg_dumpall.c:1165
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "konnte keine legale Dump-Reihenfolge für Mitgliedschaften in Rolle »%s« finden"
 
-#: pg_dumpall.c:1283
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1191
+#, c-format
+msgid "ignoring role grant to missing role with OID %s"
+msgstr "Rollen-Grant an fehlende Rolle mit OID %s wird ignoriert"
+
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1206
+#, c-format
+msgid "grant of role \"%s\" to \"%s\" has invalid grantor OID %s"
+msgstr "Grant von Rolle »%s« an »%s« hat ungültige Grantor-OID %s"
+
+#: pg_dumpall.c:1208
+#, c-format
+msgid "This grant will be dumped without GRANTED BY."
+msgstr "Dieser Grant wird ohne GRANTED BY ausgegeben werden."
+
+#: pg_dumpall.c:1326
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "konnte ACL-Zeichenkette (%s) für Parameter »%s« nicht interpretieren"
 
-#: pg_dumpall.c:1410
+#: pg_dumpall.c:1453
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "konnte ACL-Zeichenkette (%s) für Tablespace »%s« nicht interpretieren"
 
-#: pg_dumpall.c:1617
+#: pg_dumpall.c:1667
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "Datenbank »%s« übersprungen"
 
-#: pg_dumpall.c:1621
+#: pg_dumpall.c:1671
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "Ausgabe der Datenbank »%s«"
 
-#: pg_dumpall.c:1652
+#: pg_dumpall.c:1704
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "pg_dump für Datenbank »%s« fehlgeschlagen; beende"
 
-#: pg_dumpall.c:1658
+#: pg_dumpall.c:1710
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "konnte die Ausgabedatei »%s« nicht neu öffnen: %m"
 
-#: pg_dumpall.c:1702
+#: pg_dumpall.c:1754
 #, c-format
 msgid "running \"%s\""
 msgstr "führe »%s« aus"
 
-#: pg_dumpall.c:1903
-#, c-format
-msgid "could not get server version"
-msgstr "konnte Version des Servers nicht ermitteln"
-
-#: pg_dumpall.c:1906
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "konnte Versionszeichenkette »%s« nicht entziffern"
-
-#: pg_dumpall.c:1976 pg_dumpall.c:1999
-#, c-format
-msgid "executing %s"
-msgstr "führe %s aus"
-
-#: pg_dumpall.c:2071
+#: pg_dumpall.c:1873
 msgid "unsupported filter object"
 msgstr "nicht unterstütztes Filterobjekt"
 
-#: pg_restore.c:346
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "entweder -d/--dbname oder -f/--file muss angegeben werden"
 
-#: pg_restore.c:353
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "Optionen -d/--dbname und -f/--file können nicht zusammen verwendet werden"
-
-#: pg_restore.c:388
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "Optionen -1/--single-transaction und --transaction-size können nicht zusammen verwendet werden"
-
-#: pg_restore.c:395
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "Optionen -C/--create und -1/--single-transaction können nicht zusammen verwendet werden"
-
-#: pg_restore.c:399
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "--single-transaction und mehrere Jobs können nicht zusammen verwendet werden"
 
-#: pg_restore.c:447
+#: pg_restore.c:480
 #, c-format
 msgid "archive format \"%s\" is not supported; please use psql"
 msgstr "Archivformat »%s« wird nicht unterstützt; bitte psql verwenden"
 
-#: pg_restore.c:451
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "unbekanntes Archivformat »%s«; bitte »c«, »d« oder »t« angeben"
 
-#: pg_restore.c:489
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "bei Wiederherstellung ignorierte Fehler: %d"
 
-#: pg_restore.c:502
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
 msgstr ""
-"%s stellt eine PostgreSQL-Datenbank wieder her, die mit pg_dump\n"
-"gesichert wurde.\n"
+"%s stellt eine PostgreSQL-Datenbank wieder her, die mit pg_dump gesichert wurde.\n"
 "\n"
 
-#: pg_restore.c:504
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [DATEI]\n"
 
-#: pg_restore.c:507
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        mit angegebener Datenbank verbinden\n"
 
-#: pg_restore.c:508
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=DATEINAME     Name der Ausgabedatei (- für stdout)\n"
 
-#: pg_restore.c:509
+#: pg_restore.c:542
 #, 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:510
+#: pg_restore.c:543
 #, 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:511
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            »Verbose«-Modus\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_restore.c:513
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -2922,34 +2912,34 @@ msgstr ""
 "\n"
 "Optionen die die Wiederherstellung kontrollieren:\n"
 
-#: pg_restore.c:516
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              nur die Daten wiederherstellen, nicht das Schema\n"
 
-#: pg_restore.c:518
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 Zieldatenbank erzeugen\n"
 
-#: pg_restore.c:519
+#: pg_restore.c:552
 #, 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:520
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAME             benannten Index wiederherstellen\n"
 
-#: pg_restore.c:521
+#: pg_restore.c:554
 #, 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:522
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2958,59 +2948,59 @@ msgstr ""
 "  -L, --use-list=DATEINAME     Inhaltsverzeichnis aus dieser Datei zur Auswahl oder\n"
 "                               Sortierung der Ausgabe verwenden\n"
 
-#: pg_restore.c:524
+#: pg_restore.c:557
 #, 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:525
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, ---exclude-schema=NAME   Objekte in diesem Schema nicht wiederherstellen\n"
 
-#: pg_restore.c:527
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NAME(args)    benannte Funktion wiederherstellen\n"
 
-#: pg_restore.c:528
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            nur das Schema wiederherstellen, nicht die Daten\n"
 
-#: pg_restore.c:529
+#: pg_restore.c:562
 #, 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:530
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr ""
 "  -t, --table=NAME             benannte Relation (Tabelle, Sicht, usw.)\n"
 "                               wiederherstellen\n"
 
-#: pg_restore.c:531
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAME           benannten Trigger wiederherstellen\n"
 
-#: pg_restore.c:532
+#: pg_restore.c:565
 #, 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:533
+#: pg_restore.c:566
 #, 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:535
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        Sicherheit auf Zeilenebene einschalten\n"
 
-#: pg_restore.c:536
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -3019,17 +3009,17 @@ msgstr ""
 "  --filter=DATEINAME           Objekte basierend auf Ausdrücken in DATEINAME\n"
 "                               wiederherstellen oder überspringen\n"
 
-#: pg_restore.c:539
+#: pg_restore.c:572
 #, c-format
 msgid "  --no-comments                do not restore comment commands\n"
 msgstr "  --no-comments                Kommentar-Befehle nicht wiederherstellen\n"
 
-#: pg_restore.c:540
+#: pg_restore.c:573
 #, c-format
 msgid "  --no-data                    do not restore data\n"
 msgstr "  --no-data                    Daten nicht wiederherstellen\n"
 
-#: pg_restore.c:541
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -3038,71 +3028,76 @@ msgstr ""
 "  --no-data-for-failed-tables  Daten für Tabellen, die nicht erzeugt werden\n"
 "                               konnten, nicht wiederherstellen\n"
 
-#: pg_restore.c:543
+#: pg_restore.c:576
 #, c-format
 msgid "  --no-policies                do not restore row security policies\n"
 msgstr ""
 "  --no-policies                Policys für Sicherheit auf Zeilenebene nicht\n"
 "                               wiederherstellen\n"
 
-#: pg_restore.c:544
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            Publikationen nicht wiederherstellen\n"
 
-#: pg_restore.c:545
+#: pg_restore.c:578
 #, c-format
 msgid "  --no-schema                  do not restore schema\n"
 msgstr "  --no-schema                  Schema nicht wiederherstellen\n"
 
-#: pg_restore.c:546
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         Security-Labels nicht wiederherstellen\n"
 
-#: pg_restore.c:547
+#: pg_restore.c:580
 #, c-format
 msgid "  --no-statistics              do not restore statistics\n"
 msgstr "  --no-statistics              Statistiken nicht wiederherstellen\n"
 
-#: pg_restore.c:548
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           Subskriptionen nicht wiederherstellen\n"
 
-#: pg_restore.c:549
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     Tabellenzugriffsmethoden nicht wiederherstellen\n"
 
-#: pg_restore.c:550
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             Tablespace-Zuordnungen nicht wiederherstellen\n"
 
-#: pg_restore.c:551
+#: pg_restore.c:585
 #, 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:552
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 die Statistiken wiederherstellen\n"
+
+#: pg_restore.c:587
 #, c-format
 msgid "  --statistics-only            restore only the statistics, not schema or data\n"
 msgstr "  --statistics-only            nur die Statistiken wiederherstellen, nicht Schema oder Daten\n"
 
-#: pg_restore.c:555
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         jeweils nach N Objekten committen\n"
 
-#: pg_restore.c:569
+#: pg_restore.c:601
 #, 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:571
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
@@ -3110,10 +3105,10 @@ msgid ""
 "multiple times to select multiple objects.\n"
 msgstr ""
 "\n"
-"Die Optionen -I, -n, -N, -P, -t, -T und --section können kombiniert und mehrfach\n"
-"angegeben werden, um mehrere Objekte auszuwählen.\n"
+"Die Optionen -I, -n, -N, -P, -t, -T und --section können kombiniert\n"
+"und mehrfach angegeben werden, um mehrere Objekte auszuwählen.\n"
 
-#: pg_restore.c:574
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_dump/po/es.po b/src/bin/pg_dump/po/es.po
index b40afd89881..081b8bf76c4 100644
--- a/src/bin/pg_dump/po/es.po
+++ b/src/bin/pg_dump/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:51+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:20+0000\n"
+"PO-Revision-Date: 2026-02-07 09:58+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -22,30 +22,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "esta instalación no soporta compresión con %s"
@@ -114,27 +114,27 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "memoria agotada"
 
@@ -149,45 +149,44 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -247,406 +246,501 @@ msgstr "el argumento de la orden de shell contiene un salto de línea o retorno
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "leyendo las extensiones"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "identificando miembros de extensión"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "leyendo esquemas"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "leyendo las tablas definidas por el usuario"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "leyendo las funciones definidas por el usuario"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "leyendo los tipos definidos por el usuario"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "leyendo los lenguajes procedurales"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "leyendo las funciones de agregación definidas por el usuario"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "leyendo los operadores definidos por el usuario"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "leyendo los métodos de acceso definidos por el usuario"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "leyendo las clases de operadores definidos por el usuario"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "leyendo las familias de operadores definidas por el usuario"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "leyendo los procesadores (parsers) de búsqueda en texto definidos por el usuario"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "leyendo las plantillas de búsqueda en texto definidas por el usuario"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "leyendo los diccionarios de búsqueda en texto definidos por el usuario"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "leyendo las configuraciones de búsqueda en texto definidas por el usuario"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "leyendo los conectores de datos externos definidos por el usuario"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "leyendo los servidores foráneos definidas por el usuario"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "leyendo los privilegios por omisión"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "leyendo los ordenamientos definidos por el usuario"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "leyendo las conversiones definidas por el usuario"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "leyendo conversiones de tipo"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "leyendo las transformaciones"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "leyendo la información de herencia de las tablas"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "leyendo los disparadores por eventos"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "buscando tablas de extensión"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "buscando relaciones de herencia"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "leyendo la información de columnas para las tablas interesantes"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "marcando las columnas heredadas en las subtablas"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "leyendo datos de particionamiento"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "leyendo los índices"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "marcando índices en las tablas particionadas"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "leyendo estadísticas extendidas"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "leyendo las restricciones"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "leyendo los disparadores (triggers)"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "leyendo las reglas de reescritura"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "leyendo políticas"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "leyendo publicaciones"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "leyendo membresía de tablas en publicaciones"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "leyendo membresía de esquemas en publicaciones"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "leyendo las suscripciones"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "leyendo membresía de tablas en suscripciones"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "falló la revisión de integridad, el OID %u del padre de la tabla «%s» (OID %u) no se encontró"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "número de padres %d para la tabla «%s» no es válido"
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "no se pudo interpretar el arreglo numérico «%s»: demasiados números"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "no se pudo interpretar el arreglo numérico «%s»: carácter no válido en número"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "no se pudo inicializar la biblioteca de compresión: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "no se pudo cerrar el flujo comprimido: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "no se pudo comprimir datos: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "no se pudo descomprimir datos: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "no se pudo cerrar la biblioteca de compresión: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "no se pudo leer el archivo de entrada: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:374 pg_backup_custom.c:651
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "no se pudo escribir al archivo: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "no se pudo leer el archivo de entrada: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:372 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "no se pudo leer desde el archivo de entrada: fin de archivo"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "no se pudo crear un contexto de descompresión LZ4: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "no se pudo descomprimir: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "no se pudo liberar el contexto de descompresión LZ4: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "no se pudo terminar la compresión: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "no se pudo inicializar la compresión LZ4: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "no se pudo inicializar la biblioteca LZ4: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "error durante escritura: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "error durante escritura: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "no se pudo escribir al archivo de salida: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "no se pudo terminar la descompresión: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "no se pudo cerrar el archivo: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "no se pudo escribir al archivo: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "no se pudo definir el parámetro de compresión «%s»: %s"
 
-#: compress_zstd.c:78 compress_zstd.c:232 compress_zstd.c:491
-#: compress_zstd.c:499
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "no se pudo inicializar la biblioteca de compresión"
 
-#: compress_zstd.c:195 compress_zstd.c:309
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "no se pudo descomprimir datos: %s"
 
-#: compress_zstd.c:502
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:520
+#, c-format
+msgid "could not connect to database \"%s\""
+msgstr "no se pudo establecer la conexión a la base de datos «%s»"
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "no se pudo obtener la versión del servidor"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "no se pudo interpretar la versión del servidor «%s»"
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "abortando debido a que no coincide la versión del servidor"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "versión del servidor: %s; versión de %s: %s"
+
+#: connectdb.c:282 pg_dumpall.c:1790
+#, c-format
+msgid "executing %s"
+msgstr "ejecutando %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
+#, c-format
+msgid "query failed: %s"
+msgstr "la consulta falló: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
+#, c-format
+msgid "Query was: %s"
+msgstr "La consulta era: %s"
+
+#: dumputils.c:949
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "modo «%s» sin manejar"
+msgid "could not create directory \"%s\": %m"
+msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: filter.c:49
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "no se pudo cambiar los permisos del directorio «%s»: %m"
+
+#: dumputils.c:959
+#, c-format
+msgid "directory \"%s\" is not empty"
+msgstr "el directorio «%s» no está vacío"
+
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de filtro «%s»: %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo de filtro «%s»: %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr "formato inválido en filtro leído desde entrada estándar en línea %d: %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "sintaxis no válida en filtro leído desde archivo «%s», línea %d: %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "no se pudo leer el archivo de filtro «%s»: %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "fin de archivo inesperado"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "falta el parámetro de nombre de objeto"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "no se encontró orden de filtro (se esperaba «include» o «include»)"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "orden de filtro no válida (se esperaba «include» o «exclude»)"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "falta el parámetro de tipo de objeto"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "tipo de objeto de filtro «%.*s» no soportado"
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "%s() falló: código de error %d"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "no se pudo crear los canales de comunicación: %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "no se pudo crear el proceso hijo: %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "orden no reconocida recibida del servidor principal: «%s»"
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "mensaje no válido recibido del proceso hijo: «%s»"
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -655,727 +749,677 @@ msgstr ""
 "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."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "un proceso hijo murió inesperadamente"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "no se pudo escribir al canal de comunicación: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: no se pudo crear el socket: código de error %d"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: no se pudo enlazar: código de error %d"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: no se pudo escuchar: código de error %d"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s() falló: código de error %d"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: no se pudo crear el segundo socket: código de error %d"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: no se pudo conectar el socket: código de error %d"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: no se pudo aceptar la conexión: código de error %d"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "no se pudo cerrar el archivo de salida: %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:313 pg_backup_archiver.c:317
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "elementos del archivo no están en el orden correcto de secciones"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "unexpected section code %d"
 msgstr "código de sección %d inesperado"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "la restauración en paralelo no está soportada con este formato de archivo"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "la restauración en paralelo no está soportada con archivos construidos con pg_dump anterior a 8.0"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "no se puede restaurar del archivo comprimido (%s)"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "conectando a la base de datos para reestablecimiento"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "las conexiones directas a la base de datos no están soportadas en archivadores pre-1.3"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:450
 #, c-format
-msgid "implied data-only restore"
-msgstr "asumiendo reestablecimiento de sólo datos"
+msgid "implied no-schema restore"
+msgstr "asumiendo reestablecimiento sin “schema”"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "eliminando %s %s"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "no se pudo encontrar dónde insertar IF EXISTS en la sentencia «%s»"
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "precaución desde el archivo original: %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "creando %s «%s.%s»"
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "creando %s «%s»"
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "conectando a nueva base de datos «%s»"
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "procesando %s"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "procesando datos de la tabla «%s.%s»"
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "ejecutando %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "deshabilitando disparadores (triggers) para %s"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "habilitando disparadores (triggers) para %s"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "error interno -- WriteData no puede ser llamada fuera del contexto de una rutina DataDumper"
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "la extracción de objetos grandes no está soportada en el formato seleccionado"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "se reestableció %d objeto grande"
 msgstr[1] "se reestablecieron %d objetos grandes"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "reestableciendo objeto grande con OID %u"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "no se pudo crear el objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3889
+#: pg_backup_archiver.c:1525 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "no se pudo abrir el objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "no se pudo abrir el archivo TOC «%s»: %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "línea ignorada: %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "no se pudo encontrar una entrada para el ID %d"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "no se pudo cerrar el archivo TOC: %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de salida «%s»: %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "no se pudo abrir el archivo de salida: %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "se escribió %zu byte de los datos del objeto grande (resultado = %d)"
 msgstr[1] "se escribieron %zu bytes de los datos del objeto grande (resultado = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "no se pudo escribir en objeto grande: %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "durante INICIALIZACIÓN:"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
-msgstr "durante PROCESAMIENTO DE TABLA DE CONTENIDOS:"
+msgstr "durante PROCESAMIENTO DE LA TOC:"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "durante FINALIZACIÓN:"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
-msgstr "en entrada de la tabla de contenidos %d; %u %u %s %s %s"
+msgstr "en entrada de la TOC %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "dumpId incorrecto"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "dumpId de tabla incorrecto para elemento TABLE DATA"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "bandera de posición inesperada %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "el posición en el archivo es demasiado grande"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "nombre de directorio demasiado largo: «%s»"
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "el directorio «%s» no parece ser un archivador válido (no existe «toc.dat»)"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de entrada «%s»: %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "no se pudo abrir el archivo de entrada: %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "no se pudo leer el archivo de entrada: %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "el archivo de entrada es demasiado corto (leidos %lu, esperados 5)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "el archivo de entrada parece ser un volcado de texto. Por favor use psql."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "el archivo de entrada no parece ser un archivador válido (¿demasiado corto?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "el archivo de entrada no parece ser un archivador válido"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "no se pudo cerrar el archivo de entrada: %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "no se pudo abrir stdout para agregar datos: %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "formato de archivo no reconocido «%d»"
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4648
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "terminó el elemento %d %s %s"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4661
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "el proceso hijo falló: código de salida %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2668
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "entrada de TOC inesperada en WriteToc(): %d %s %s"
+
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
+#: pg_backup_tar.c:1034
+#, c-format
+msgid "error during file seek: %m"
+msgstr "error durante el posicionamiento (seek) en el archivo: %m"
+
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
-msgstr "la entrada con ID %d está fuera de rango -- tal vez la tabla de contenido está corrupta"
+msgstr "la entrada con ID %d está fuera de rango -- tal vez la TOC está corrupta"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "restaurar tablas WITH OIDS ya no está soportado"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "no se reconoce la codificación: «%s»"
 
-#: pg_backup_archiver.c:2824
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "elemento ENCODING no válido: %s"
 
-#: pg_backup_archiver.c:2842
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "elemento STDSTRINGS no válido: %s"
 
-#: pg_backup_archiver.c:2867
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "esquema «%s» no encontrado"
 
-#: pg_backup_archiver.c:2874
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "tabla «%s» no encontrada"
 
-#: pg_backup_archiver.c:2881
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "índice «%s» no encontrado"
 
-#: pg_backup_archiver.c:2888
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "función «%s» no encontrada"
 
-#: pg_backup_archiver.c:2895
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "disparador «%s» no encontrado"
 
-#: pg_backup_archiver.c:3326
+#: pg_backup_archiver.c:3469
 #, 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:3458
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "no se pudo definir «search_path» a «%s»: %s"
 
-#: pg_backup_archiver.c:3519
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "no se pudo definir «default_tablespace» a %s: %s"
 
-#: pg_backup_archiver.c:3568
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "no se pudo definir «default_table_access_method»: %s"
 
-#: pg_backup_archiver.c:3617
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "no se pudo alterar el método de acceso a tabla: %s"
 
-#: pg_backup_archiver.c:3718
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "no se sabe cómo establecer el dueño para el objeto de tipo «%s»"
 
-#: pg_backup_archiver.c:4005
+#: pg_backup_archiver.c:4006
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "entrada de TOC inesperada en _printTocEntry(): %d %s %s"
+
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "no se encontró la cadena mágica en el encabezado del archivo"
 
-#: pg_backup_archiver.c:4019
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "versión no soportada (%d.%d) en el encabezado del archivo"
 
-#: pg_backup_archiver.c:4024
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "revisión de integridad en el tamaño del entero (%lu) falló"
 
-#: pg_backup_archiver.c:4028
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "el archivador fue hecho en una máquina con enteros más grandes, algunas operaciones podrían fallar"
 
-#: pg_backup_archiver.c:4038
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "el formato esperado (%d) difiere del formato encontrado en el archivo (%d)"
 
-#: pg_backup_archiver.c:4060
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "el archivo está comprimido, pero esta instalación no soporta compresión (%s) -- los datos no estarán disponibles"
 
-#: pg_backup_archiver.c:4096
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "la fecha de creación en el encabezado no es válida"
 
-#: pg_backup_archiver.c:4230
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "procesando el elemento %d %s %s"
 
-#: pg_backup_archiver.c:4315
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "ingresando al bucle paralelo principal"
 
-#: pg_backup_archiver.c:4326
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "saltando el elemento %d %s %s"
 
-#: pg_backup_archiver.c:4335
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "lanzando el elemento %d %s %s"
 
-#: pg_backup_archiver.c:4389
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "terminó el bucle paralelo principal"
 
-#: pg_backup_archiver.c:4425
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "procesando el elemento saltado %d %s %s"
 
-#: pg_backup_archiver.c:4967
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "la tabla «%s» no pudo ser creada, no se recuperarán sus datos"
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "OID no válido para objeto grande"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "error durante el posicionamiento (seek) en el archivo: %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "el bloque de datos %d tiene una posición de búsqueda incorrecta"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "tipo de bloque de datos (%d) no conocido al buscar en el archivador"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file"
 msgstr "no se pudo encontrar el bloque con ID %d en archivo -- posiblemente debido a una petición de restauración fuera de orden, la que no puede ser completada debido a que en el archivo de entrada no es reposicionable (seekable)"
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr "no se pudo encontrar el bloque con ID %d en archivo -- posiblemente el archivo está corrupto"
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
 msgstr "se encontró un bloque no esperado ID (%d) mientras se leían los datos -- se esperaba %d"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "se encontró un bloque tipo %d no reconocido al restablecer el archivador"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
 #: pg_backup_tar.c:1032
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "no se pudo determinar la posición (seek) en el archivo del archivador: %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "no se pudo cerrar el archivo del archivador: %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "sólo se pueden reabrir archivos de entrada"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "la restauración en paralelo desde entrada estándar (stdin) no está soportada"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr "la restauración en paralelo desde un archivo no posicionable no está soportada"
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "no se pudo posicionar (seek) en el archivo del archivador: %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "compresor activo"
 
-#: pg_backup_db.c:42
-#, c-format
-msgid "could not get server_version from libpq"
-msgstr "no se pudo obtener server_version desde libpq"
-
-#: pg_backup_db.c:53 pg_dumpall.c:1831
+#: pg_backup_db.c:41
 #, c-format
-msgid "aborting because of server version mismatch"
-msgstr "abortando debido a que no coincide la versión del servidor"
+msgid "could not get \"server_version\" from libpq"
+msgstr "no se pudo obtener «server_version» desde libpq"
 
-#: pg_backup_db.c:54 pg_dumpall.c:1832
-#, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "versión del servidor: %s; versión de %s: %s"
-
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "ya está conectado a una base de datos"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1678 pg_dumpall.c:1780
-msgid "Password: "
-msgstr "Contraseña: "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "no se pudo hacer la conexión a la base de datos"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "falló la reconexión: %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1705 pg_dumpall.c:1789
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "query failed: %s"
-msgstr "la consulta falló: %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1895 pg_dumpall.c:1918
-#, c-format
-msgid "Query was: %s"
-msgstr "La consulta era: %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
 msgstr[0] "la consulta regresó %d fila en lugar de una: %s"
 msgstr[1] "la consulta regresó %d filas en lugar de una: %s"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %sLa orden era: %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "no se pudo ejecutar la consulta"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "PQputCopyData regresó un error: %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "PQputCopyEnd regresó un error: %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY falló para la tabla «%s»: %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2284
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "resultados extra inesperados durante el COPY de la tabla «%s»"
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "no se pudo iniciar la transacción en la base de datos"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "no se pudo terminar la transacción a la base de datos"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "no se especificó un directorio de salida"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "no se pudo abrir el directorio «%s»: %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "no se pudo crear el directorio «%s»: %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "no se pudo escribir al archivo de salida: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "no se pudo cerrar el archivo de datos: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo de datos «%s»: %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
-msgstr "no se pudo abrir el archivo de la tabla de contenidos de objetos grandes «%s» para su lectura: %m"
+msgstr "no se pudo abrir el archivo de la TOC de objetos grandes «%s» para su lectura: %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
-msgstr "línea no válida en el archivo de la tabla de contenido de objetos grandes «%s»: «%s»"
+msgstr "línea no válida en el archivo de la TOC de objetos grandes «%s»: «%s»"
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
-msgstr "error al leer el archivo de la tabla de contenidos de objetos grandes «%s»"
+msgstr "error al leer el archivo de la TOC de objetos grandes «%s»"
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
-msgstr "no se pudo cerrar el archivo de la tabla de contenido de los objetos grandes «%s»: %m"
+msgstr "no se pudo cerrar el archivo de la TOC de objetos grandes «%s»: %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "no se pudo cerrar el archivo de datos LO: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "no se pudo escribir archivo TOC de LOs: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
-msgstr "no se pudo cerrar el archivo TOC: %m"
+msgstr "no se pudo cerrar el archivo TOC de objetos grandes: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "nombre de archivo demasiado largo: «%s»"
@@ -1388,12 +1432,12 @@ msgstr "no se puede leer este formato"
 #: pg_backup_tar.c:168
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %m"
-msgstr "no se pudo abrir el archivo de tabla de contenido «%s» para escribir: %m"
+msgstr "no se pudo abrir el archivo de TOC «%s» para escribir: %m"
 
 #: pg_backup_tar.c:175
 #, c-format
 msgid "could not open TOC file for output: %m"
-msgstr "no se pudo abrir la tabla de contenido para escribir: %m"
+msgstr "no se pudo abrir la TOC para escribir: %m"
 
 #: pg_backup_tar.c:194 pg_backup_tar.c:330 pg_backup_tar.c:385
 #: pg_backup_tar.c:401 pg_backup_tar.c:906
@@ -1404,12 +1448,12 @@ msgstr "la compresión no está soportada por el formato de salida tar"
 #: pg_backup_tar.c:202
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %m"
-msgstr "no se pudo abrir el archivo de tabla de contenido «%s» para leer: %m"
+msgstr "no se pudo abrir el archivo de TOC «%s» para leer: %m"
 
 #: pg_backup_tar.c:209
 #, c-format
 msgid "could not open TOC file for input: %m"
-msgstr "no se pudo abrir la tabla de contenido para leer: %m"
+msgstr "no se pudo abrir la TOC para leer: %m"
 
 #: pg_backup_tar.c:318
 #, c-format
@@ -1463,119 +1507,134 @@ msgstr[1] "se encontró un encabezado incompleto (%lu bytes)"
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "se encontró un encabezado corrupto en %s (esperado %d, calculado %d) en la posición %llu"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "nombre de sección «%s» no reconocido"
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "elementos on_exit_nicely agotados"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_dump.c:728 pg_restore.c:344
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "las opciones %s y %s no pueden usarse juntas"
+
+#: pg_dump.c:865
 #, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "las opciones -s/--schema-only y -a/--data-only no pueden usarse juntas"
+#| msgid "option --include-foreign-data is not supported with parallel backup"
+msgid "option %s is not supported with parallel backup"
+msgstr "la opción %s no está soportado con respaldo en paralelo"
 
-#: pg_dump.c:731
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "las opciones -s/--schema-only y --include-foreign-data no pueden usarse juntas"
+#| msgid "option %s requires option %s to be specified"
+msgid "option %s requires option %s"
+msgstr "la opción %s requiere la opción %s"
 
-#: pg_dump.c:734
+#: pg_dump.c:894
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "la opción --include-foreign-data no está soportado con respaldo en paralelo"
+#| msgid "option %s requires option %s to be specified"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "la opción %s requiere la opción %s, %s o %s"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "las opciones -c/--clean y -a/--data-only no pueden usarse juntas"
+msgid "could not generate restrict key"
+msgstr "no se pudo generar la llave “restrict”"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "la opción --if-exists requiere la opción -c/--clean"
+msgid "invalid restrict key"
+msgstr "llave de “restrict” no válida"
 
-#: pg_dump.c:747
+#: pg_dump.c:917
 #, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "la opción --on-conflict-do-nothing requiere la opción --inserts, --rows-per-insert o --column-inserts"
+#| msgid "COPY %s cannot be used with %s"
+msgid "option %s can only be used with %s"
+msgstr "la opción %s sólo puede usarse con %s"
 
-#: pg_dump.c:776
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "algoritmo de compresión no reconocido: «%s»"
 
-#: pg_dump.c:783
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "especificación de compresión no válida: %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "la opción de compresión «%s» no está soportada por pg_dump actualmente"
 
-#: pg_dump.c:808
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "el volcado en paralelo sólo está soportado por el formato «directory»"
 
-#: pg_dump.c:854
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "el último OID interno es %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "no se encontraron esquemas coincidentes"
 
-#: pg_dump.c:880
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "no se encontraron tablas coincidentes"
 
-#: pg_dump.c:908
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "no se encontraron extensiones coincidentes"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s extrae una base de datos en formato de texto o en otros formatos.\n"
+"%s extrae una base de datos como un script SQL o a otros formatos.\n"
 "\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:636 pg_restore.c:452
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [NOMBREDB]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:639 pg_restore.c:455
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1584,65 +1643,65 @@ msgstr ""
 "\n"
 "Opciones generales:\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
-msgstr "  -f, --file=ARCHIVO       nombre del archivo o directorio de salida\n"
+msgstr "  -f, --file=ARCHIVO           nombre del archivo o directorio de salida\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1272
 #, 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     Formato del archivo de salida (c=personalizado, \n"
-"                           d=directorio, t=tar, p=texto (por omisión))\n"
+"  -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:1100
+#: pg_dump.c:1274
 #, 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"
+msgstr "  -j, --jobs=NUM               máximo de procesos paralelos para volcar\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:641
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
-msgstr "  -v, --verbose            modo verboso\n"
+msgstr "  -v, --verbose                modo verboso\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:642
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
-msgstr "  -V, --version            mostrar información de version y salir\n"
+msgstr "  -V, --version                mostrar información de version y salir\n"
 
-#: pg_dump.c:1103
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
 "                               compress as specified\n"
 msgstr ""
 "  -Z, --compress=MÉTODO[:DETALLE]\n"
-"                         comprimir como se indica\n"
+"                               comprimir como se indica\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:643
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, 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"
+msgstr "  --lock-wait-timeout=SEGS     espera a lo más SEGS segundos obtener un lock\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:671
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
-msgstr "  --no-sync                no esperar que los cambios se sincronicen a disco\n"
+msgstr "  --no-sync                    no esperar que los cambios se sincronicen a disco\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
-msgstr "  --sync-method=MÉTODO      definir método para sincr. archivos a disco\n"
+msgstr "  --sync-method=MÉTODO         definir método para sincr. archivos a disco\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:644
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
-msgstr "  -?, --help               mostrar esta ayuda y salir\n"
+msgstr "  -?, --help                   mostrar esta ayuda y salir\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:645
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1651,64 +1710,64 @@ msgstr ""
 "\n"
 "Opciones que controlan el contenido de la salida:\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:646
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, 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"
+msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
+msgstr "  -a, --data-only              extrae sólo datos, no esquemas ni estadísticas\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          incluir “large objects” en la extracción\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (igual que --large-objects, deprecado)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       excluir “large objects” en la extracción\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (igual que --no-large-objects, deprecado)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1290 pg_restore.c:550
 #, 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:1117
+#: pg_dump.c:1291
 #, 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:1118
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=PATRÓN       extrae sólo la o las extensiones nombradas\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:648
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, 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:1120
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=PATRÓN          extrae sólo el o los esquemas nombrados\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=PATRÓN  NO extrae el o los esquemas nombrados\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1717,58 +1776,58 @@ msgstr ""
 "  -O, --no-owner               en formato de sólo texto, no reestablece\n"
 "                               los dueños de los objetos\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:652
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, 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"
+msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr "  -s, --schema-only            extrae sólo esquema, no datos ni estadísticas\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1299
 #, 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:1126
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=PATRÓN           extrae sólo la o las tablas nombradas\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=PATRÓN   NO extrae la o las tablas nombradas\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:655
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, 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:1129 pg_dumpall.c:656
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, 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:1130 pg_dumpall.c:657
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, 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:1131 pg_dumpall.c:658
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, 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:1132 pg_dumpall.c:659 pg_restore.c:483
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, 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"
+"  --disable-triggers           deshabilita “triggers” durante la\n"
+"                               restauración de sólo datos\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1777,12 +1836,12 @@ msgstr ""
 "  --enable-row-security        activa seguridad de filas (volcar sólo el\n"
 "                               contenido al que el usuario tiene acceso)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
-msgstr "  --exclude-extension=PATRÓN  NO volcar la o las extensiones indicadas\n"
+msgstr "  --exclude-extension=PATRÓN   NO volcar la o las extensiones indicadas\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1793,12 +1852,12 @@ msgstr ""
 "                               NO extrae la o las tablas especificadas,\n"
 "                               incluyendo tablas hijas y particiones\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=PATRÓN  NO extrae los datos de la(s) tablas nombradas\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1809,26 +1868,26 @@ msgstr ""
 "                               NO extrae datos para la o las tablas\n"
 "                               especificadas, incluyendo hijas y particiones\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:661
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM     usa este valor para extra_float_digits\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
 "                               based on expressions in FILENAME\n"
 msgstr ""
-"  --filter=ARCHIVO              incluir o excluir objetos y datos basado en\n"
-"                                expresiones en ARCHIVO\n"
+"  --filter=ARCHIVO             incluir o excluir objetos y datos basado en\n"
+"                               expresiones en ARCHIVO\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:663 pg_restore.c:487
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, 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:1147
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1839,93 +1898,133 @@ msgstr ""
 "                               incluye datos de tablas foráneas en servidores\n"
 "                               que coinciden con PATRÓN\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:664
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, 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:1151 pg_dumpall.c:665
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    cargar particiones a través de tabla raíz\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:666
+#: pg_dump.c:1326 pg_dumpall.c:730
+#, c-format
+msgid "  --no-comments                do not dump comment commands\n"
+msgstr "  --no-comments                no volcar órdenes de comentarios\n"
+
+#: pg_dump.c:1327 pg_dumpall.c:731
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
-msgstr "  --no-comments                no volcar los comentarios\n"
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    no volcar datos\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:667
+#: pg_dump.c:1328 pg_dumpall.c:732
+#, c-format
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                no volcar políticas de seguridad por registros\n"
+
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            no volcar las publicaciones\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:669
+#: pg_dump.c:1330 pg_dumpall.c:735
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-schema                  no volcar el esquema\n"
+
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, 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:1155 pg_dumpall.c:670
+#: pg_dump.c:1332 pg_dumpall.c:737
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistiics             no volcar estadísticas\n"
+
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           no volcar las suscripciones\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:672
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     no volcar métodos de acceso de tablas\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:673
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             no volcar asignaciones de tablespace\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:674
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       no volcar métodos de compresión TOAST\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:675
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, 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:1160 pg_dumpall.c:676
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     agregar ON CONFLICT DO NOTHING a órdenes INSERT\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:677
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, 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:1162 pg_dumpall.c:678
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=LLAVE         use la llave provista para \\restrict en psql\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NUMFILAS   número de filas por INSERT; implica --inserts\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1342
 #, 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:1164
+#: pg_dump.c:1343 pg_dumpall.c:748
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              incluir datos de secuencias en la extracción\n"
+
+#: pg_dump.c:1344
 #, 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:1165
+#: pg_dump.c:1345
 #, 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:1166 pg_restore.c:497
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 extraer las estadísticas\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
+#, c-format
+msgid "  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr "  --statistics-only            extrae sólo estadísticas, no esquema ni datos\n"
+
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -1934,7 +2033,7 @@ msgstr ""
 "  --strict-names               requerir al menos una coincidencia para cada patrón\n"
 "                               de nombre de tablas y esquemas\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -1943,7 +2042,7 @@ msgstr ""
 "  --table-and-children=PATRÓN  volcar sólo la o las tablas especificadas,\n"
 "                               incluyendo tablas hijas y particiones\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:679 pg_restore.c:500
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1954,7 +2053,7 @@ msgstr ""
 "                               usa órdenes SESSION AUTHORIZATION en lugar de\n"
 "                               ALTER OWNER para cambiar los dueño de los objetos\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:683 pg_restore.c:504
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -1963,46 +2062,46 @@ msgstr ""
 "\n"
 "Opciones de conexión:\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1357
 #, 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:1176 pg_dumpall.c:685 pg_restore.c:505
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, 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:1177 pg_dumpall.c:687 pg_restore.c:506
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, 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:1178 pg_dumpall.c:688 pg_restore.c:507
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, 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:1179 pg_dumpall.c:689 pg_restore.c:508
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pedir una contraseña\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:690 pg_restore.c:509
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, 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:1181 pg_dumpall.c:691
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROL               ejecuta SET ROLE antes del volcado\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2015,537 +2114,553 @@ msgstr ""
 "de la variable de ambiente PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:695 pg_restore.c:516
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Reporte errores a <%s>.\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:696 pg_restore.c:517
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "la codificación de cliente especificada «%s» no es válida"
 
-#: pg_dump.c:1353
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "Los volcados en paralelo desde servidores standby no están soportados por esta versión de servidor."
 
-#: pg_dump.c:1418
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "el formato de salida especificado «%s» no es válido"
 
-#: pg_dump.c:1459 pg_dump.c:1515 pg_dump.c:1568 pg_dumpall.c:1468
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
 
-#: pg_dump.c:1467
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "no se encontraron esquemas coincidentes para el patrón «%s»"
 
-#: pg_dump.c:1520
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "no se encontraron extensiones coincidentes para el patrón «%s»"
 
-#: pg_dump.c:1573
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "no se encontraron servidores foráneos coincidentes para el patrón «%s»"
 
-#: pg_dump.c:1644
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "el nombre de relación no es válido (demasiados puntos): %s"
 
-#: pg_dump.c:1666
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "no se encontraron tablas coincidentes para el patrón «%s»"
 
-#: pg_dump.c:1693
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "No está conectado a una base de datos."
 
-#: pg_dump.c:1696
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "no están implementadas las referencias entre bases de datos: %s"
 
-#: pg_dump.c:2155
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "extrayendo el contenido de la tabla «%s.%s»"
 
-#: pg_dump.c:2265
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Falló la extracción del contenido de la tabla «%s»: PQgetCopyData() falló."
 
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Mensaje de error del servidor: %s"
 
-#: pg_dump.c:2267 pg_dump.c:2277
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "La orden era: % s"
 
-#: pg_dump.c:2275
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Falló la extracción del contenido de la tabla «%s»: PQgetResult() falló."
 
-#: pg_dump.c:2366
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "se obtuvo un número incorrecto de campos de la tabla «%s»"
 
-#: pg_dump.c:3068
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "salvando las definiciones de la base de datos"
 
-#: pg_dump.c:3177
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "proveedor de configuración regional no reconocido: %s"
 
-#: pg_dump.c:3538
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "salvando codificaciones = %s"
 
-#: pg_dump.c:3563
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "salvando «standard_conforming_strings = %s»"
 
-#: pg_dump.c:3602
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "no se pudo interpretar la salida de current_schemas()"
 
-#: pg_dump.c:3621
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "salvando «search_path = %s»"
 
-#: pg_dump.c:3657
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "leyendo objetos grandes"
 
-#: pg_dump.c:3878
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "salvando objetos grandes «%s»"
 
-#: pg_dump.c:3899
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "error al leer el objeto grande %u: %s"
 
-#: pg_dump.c:4002
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "leyendo políticas de seguridad a nivel de registros"
 
-#: pg_dump.c:4143
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "tipo de orden inesperada en política: %c"
 
-#: pg_dump.c:4593 pg_dump.c:5151 pg_dump.c:12365 pg_dump.c:18250
-#: pg_dump.c:18252 pg_dump.c:18874
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19678
+#: pg_dump.c:19680 pg_dump.c:20312
 #, c-format
 msgid "could not parse %s array"
 msgstr "no se pudo interpretar el arreglo %s"
 
-#: pg_dump.c:4807
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "no se volcaron las suscripciones porque el usuario actual no es un superusuario"
 
-#: pg_dump.c:5013
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "no existe la suscripción con OID %u"
 
-#: pg_dump.c:5020
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "falló la revisión de integridad, tabla con OID %u no se encontró"
 
-#: pg_dump.c:5583
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "no se pudo encontrar la extensión padre para %s %s"
 
-#: pg_dump.c:5728
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "no existe el esquema con OID %u"
 
-#: pg_dump.c:7210 pg_dump.c:17621
+#: pg_dump.c:7009
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "no se puede extraer estadísticas para el tipo de relación «%c»"
+
+#: pg_dump.c:7521 pg_dump.c:19005
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "falló la revisión de integridad, no se encontró la tabla padre con OID %u de la secuencia con OID %u"
 
-#: pg_dump.c:7355
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "falló la revisión de integridad, el OID %u que aparece en pg_partitioned_table no se encontró"
 
-#: pg_dump.c:7586 pg_dump.c:7860 pg_dump.c:8307 pg_dump.c:8921 pg_dump.c:9043
-#: pg_dump.c:9191
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "OID de tabla %u no reconocido"
 
-#: pg_dump.c:7590
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "datos de índice inesperados para la tabla «%s»"
 
-#: pg_dump.c:8092
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "falló la revisión de integridad, no se encontró la tabla padre con OID %u del elemento con OID %u de pg_rewrite"
 
-#: pg_dump.c:8925
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "información de columnas para la tabla «%s» inesperada"
 
-#: pg_dump.c:8954
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "numeración de columnas no válida en la tabla «%s»"
 
-#: pg_dump.c:9005
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "encontrando expresiones default de tablas"
 
-#: pg_dump.c:9047
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "el valor de adnum %d para la tabla «%s» no es válido"
 
-#: pg_dump.c:9141
+#: pg_dump.c:9570
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "encontrando restricciones not-null no válidas"
+
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "encontrando restricciones CHECK de tablas"
 
-#: pg_dump.c:9195
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "se esperaban %d restricciones CHECK en la tabla «%s» pero se encontraron %d"
 msgstr[1] "se esperaban %d restricciones CHECK en la tabla «%s» pero se encontraron %d"
 
-#: pg_dump.c:9199
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Los catálogos del sistema podrían estar corruptos."
 
-#: pg_dump.c:9889
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "no existe el rol con OID %u"
 
-#: pg_dump.c:10001 pg_dump.c:10030
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "entrada en pg_init_privs no soportada: %u %u %d"
 
-#: pg_dump.c:10577
+#: pg_dump.c:10968
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "estadísticas volcadas fuera de orden (actual: %d %s %s, esperada: %d %s %s)"
+
+#: pg_dump.c:11109
+#, c-format
+msgid "unexpected null attname"
+msgstr "se encontró attname inesperadamente nulo"
+
+#: pg_dump.c:11138
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "no se pudo encontrar el attname de índice «%s»"
+
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "metadata faltante para los objetos grandes «%s»"
 
-#: pg_dump.c:10860
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "el typtype del tipo «%s» parece no ser válido"
 
-#: pg_dump.c:12434
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "el valor del atributo «provolatile» para la función «%s» es desconocido"
 
-#: pg_dump.c:12484 pg_dump.c:14380
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "el valor del atributo «proparallel» para la función «%s» es desconocido"
 
-#: pg_dump.c:12614 pg_dump.c:12720 pg_dump.c:12727
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "no se encontró la definición de la función con OID %u"
 
-#: pg_dump.c:12653
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "valor no válido en los campos pg_cast.castfunc o pg_cast.castmethod"
 
-#: pg_dump.c:12656
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "valor no válido en el campo pg_cast.castmethod"
 
-#: pg_dump.c:12746
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "definición errónea de transformación; al menos uno de trffromsql y trftosql debe ser distinto de cero"
 
-#: pg_dump.c:12763
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "valor erróneo en el campo pg_transform.trffromsql"
 
-#: pg_dump.c:12784
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "valor erróneo en el campo pg_transform.trftosql"
 
-#: pg_dump.c:12929
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "los operadores postfix ya no están soportados (operador «%s»)"
 
-#: pg_dump.c:13099
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "no se pudo encontrar el operador con OID %s"
 
-#: pg_dump.c:13167
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "el tipo «%c» para el método de acceso «%s» no es válido"
 
-#: pg_dump.c:13841 pg_dump.c:13909
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "proveedor de ordenamiento no reconocido: %s"
 
-#: pg_dump.c:13850 pg_dump.c:13857 pg_dump.c:13868 pg_dump.c:13878
-#: pg_dump.c:13893
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "ordenamiento \"%s\" no válido"
 
-#: pg_dump.c:14299
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "valor de aggfinalmodify no reconocido para la agregación «%s»"
 
-#: pg_dump.c:14355
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "valor de aggmfinalmodify no reconocido para la agregación «%s»"
 
-#: pg_dump.c:15072
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "tipo de objeto desconocido en privilegios por omisión: %d"
 
-#: pg_dump.c:15088
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "no se pudo interpretar la lista de ACL (%s)"
 
-#: pg_dump.c:15172
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "no se pudo interpretar la lista ACL inicial (%s) o por defecto (%s) para el objeto «%s» (%s)"
 
-#: pg_dump.c:15197
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "no se pudo interpretar la lista de ACL (%s) o por defecto (%s) para el objeto «%s» (%s)"
 
-#: pg_dump.c:15740
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "la consulta para obtener la definición de la vista «%s» no regresó datos"
 
-#: pg_dump.c:15743
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "la consulta para obtener la definición de la vista «%s» regresó más de una definición"
 
-#: pg_dump.c:15750
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "la definición de la vista «%s» parece estar vacía (tamaño cero)"
 
-#: pg_dump.c:15835
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS ya no está soportado (tabla «%s»)"
 
-#: pg_dump.c:16822
+#: pg_dump.c:18082
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "el número de columna %d no es válido para la tabla «%s»"
 
-#: pg_dump.c:16900
+#: pg_dump.c:18160
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "no se pudieron interpretar columnas de estadísticas de índices"
 
-#: pg_dump.c:16902
+#: pg_dump.c:18162
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "no se pudieron interpretar valores de estadísticas de índices"
 
-#: pg_dump.c:16904
+#: pg_dump.c:18164
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "no coincide el número de columnas con el de valores para estadísticas de índices"
 
-#: pg_dump.c:17119
+#: pg_dump.c:18393
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "falta un índice para restricción «%s»"
 
-#: pg_dump.c:17354
+#: pg_dump.c:18662
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "tipo de restricción inesperado: %c"
 
-#: pg_dump.c:17455 pg_dump.c:17685
+#: pg_dump.c:18715
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "tipo no reconocido de secuencia: %s"
+
+#: pg_dump.c:18848 pg_dump.c:19086
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "la consulta para obtener los datos de la secuencia «%s» regresó %d entrada, pero se esperaba 1"
 msgstr[1] "la consulta para obtener los datos de la secuencia «%s» regresó %d entradas, pero se esperaba 1"
 
-#: pg_dump.c:17487
+#: pg_dump.c:18884
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "tipo no reconocido de secuencia: %s"
+msgid "unrecognized sequence type: %d"
+msgstr "tipo no reconocido de secuencia: %d"
+
+#: pg_dump.c:19109
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "fallo al obtener datos para la secuencia «%s»; el usuario puede no tener privilegios SELECT en la secuencia, o la secuencia puede haber sido eliminada concurrentemente"
 
-#: pg_dump.c:18002
+#: pg_dump.c:19430
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "la consulta para obtener la regla «%s» asociada con la tabla «%s» falló: retornó un número incorrecto de renglones"
 
-#: pg_dump.c:18155
+#: pg_dump.c:19583
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "no se pudo encontrar la extensión referenciada %u"
 
-#: pg_dump.c:18254
+#: pg_dump.c:19682
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "no coincide el número de configuraciones con el de condiciones para extensión"
 
-#: pg_dump.c:18386
+#: pg_dump.c:19814
 #, c-format
 msgid "reading dependency data"
 msgstr "obteniendo datos de dependencias"
 
-#: pg_dump.c:18472
+#: pg_dump.c:19900
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "no existe el objeto referenciante %u %u"
 
-#: pg_dump.c:18483
+#: pg_dump.c:19911
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "no existe el objeto referenciado %u %u"
 
-#: pg_dump.c:18908 pg_dump.c:18946 pg_dumpall.c:1963 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20346 pg_dump.c:20384 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "el filtro %s para «%s» no está permitido"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "dumpId %d no válido"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "dependencia %d no válida"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "no se pudo identificar bucle de dependencia"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "hay restricciones de llave foránea circulares en la siguiente tabla:"
 msgstr[1] "hay restricciones de llave foránea circulares entre las siguientes tablas:"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "Puede no ser capaz de restaurar el respaldo sin usar --disable-triggers o temporalmente eliminar las restricciones."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "Considere usar un volcado completo en lugar de --data-only para evitar este problema."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "no se pudo resolver el bucle de dependencias entre los siguientes elementos:"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "el programa «%s» es requerido por %s, pero no fue encontrado en el mismo directorio que «%s»"
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "el programa «%s» fue encontrado por «%s», pero no es de la misma versión que %s"
 
-#: pg_dumpall.c:387
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "la opción --exclude-database no puede ser usada junto con -g/--globals-only, -r/--roles-only o -t/--tablespaces-only"
-
-#: pg_dumpall.c:395
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "las opciones -g/--globals-only y -r/--roles-only no pueden usarse juntas"
-
 #: pg_dumpall.c:402
 #, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "las opciones -g/--globals-only y -t/--tablespaces-only no pueden usarse juntas"
-
-#: pg_dumpall.c:412
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "las opciones -r/--roles-only y -t/--tablespaces-only no pueden usarse juntas"
-
-#: pg_dumpall.c:474 pg_dumpall.c:1772
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "no se pudo establecer la conexión a la base de datos «%s»"
+#| msgid "options %s and %s cannot be used together"
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "la opción %s no pueden usarse junto con %s, %s o %s"
 
-#: pg_dumpall.c:486
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2554,88 +2669,87 @@ msgstr ""
 "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."
 
-#: pg_dumpall.c:635
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s extrae un cluster de bases de datos de PostgreSQL en un archivo\n"
-"guión (script) SQL.\n"
+"%s exporta un clúster de bases de datos de PostgreSQL en un guión (script) SQL.\n"
 "\n"
 
-#: pg_dumpall.c:637
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCIÓN]...\n"
 
-#: pg_dumpall.c:640
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
-msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
+msgstr "  -f, --file=ARCHIVO           nombre del archivo de salida\n"
 
-#: pg_dumpall.c:647
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
-msgstr "  -c, --clean              tira (drop) la base de datos antes de crearla\n"
+msgstr "  -c, --clean                  elimina la base de datos antes de crearla\n"
 
-#: pg_dumpall.c:649
+#: pg_dumpall.c:713
 #, 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"
+msgstr "  -g, --globals-only           extrae sólo los objetos globales, no bases de datos\n"
 
-#: pg_dumpall.c:650 pg_restore.c:475
+#: pg_dumpall.c:714 pg_restore.c:559
 #, 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"
+msgstr "  -O, --no-owner               no reestablece los dueños de los objetos\n"
 
-#: pg_dumpall.c:651
+#: pg_dumpall.c:715
 #, 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"
+"  -r, --roles-only             extrae sólo los roles, no bases de datos\n"
+"                               ni tablespaces\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:717
 #, 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"
+"  -S, --superuser=NAME         especifica el nombre del superusuario a usar en\n"
+"                               el volcado\n"
 
-#: pg_dumpall.c:654
+#: pg_dumpall.c:718
 #, 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"
+"  -t, --tablespaces-only       extrae sólo los tablespaces, no bases de datos\n"
+"                               ni roles\n"
 
-#: pg_dumpall.c:660
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
-msgstr "  --exclude-database=PATRÓN excluir bases de datos cuyos nombres coinciden con el patrón\n"
+msgstr "  --exclude-database=PATRÓN    excluir bases de datos cuyos nombres coinciden con el patrón\n"
 
-#: pg_dumpall.c:662
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
-msgstr "  --filter=ARCHIVO         excluir bases de datos basado en expresiones en ARCHIVO\n"
+msgstr "  --filter=ARCHIVO             excluir bases de datos basado en expresiones en ARCHIVO\n"
 
-#: pg_dumpall.c:668
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
-msgstr "  --no-role-passwords      no extraer contraseñas para roles\n"
+msgstr "  --no-role-passwords          no extraer contraseñas para roles\n"
 
-#: pg_dumpall.c:684
+#: pg_dumpall.c:756
 #, 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:686
+#: pg_dumpall.c:758
 #, 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:693
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2647,106 +2761,87 @@ msgstr ""
 "Si no se usa -f/--file, el volcado de SQL será escrito a la salida estándar.\n"
 "\n"
 
-#: pg_dumpall.c:838
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "omitido nombre de rol que empieza con «pg_» (%s)"
 
-#: pg_dumpall.c:1060
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
+#, c-format
+msgid "found orphaned pg_auth_members entry for role %s"
+msgstr "se encontró entrada huérfana de pg_auth_members para el rol %s"
+
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "no se pudo encontrar un orden legal para membresías del rol «%s»"
 
-#: pg_dumpall.c:1195
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "no se pudo interpretar la lista de control de acceso (%s) del parámetro «%s»"
 
-#: pg_dumpall.c:1322
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "no se pudo interpretar la lista de control de acceso (%s) del tablespace «%s»"
 
-#: pg_dumpall.c:1529
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "excluyendo base de datos «%s»"
 
-#: pg_dumpall.c:1533
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "extrayendo base de datos «%s»"
 
-#: pg_dumpall.c:1564
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "pg_dump falló en la base de datos «%s», saliendo"
 
-#: pg_dumpall.c:1570
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "no se pudo reabrir el archivo de salida «%s»: %m"
 
-#: pg_dumpall.c:1614
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "ejecutando «%s»"
 
-#: pg_dumpall.c:1815
-#, c-format
-msgid "could not get server version"
-msgstr "no se pudo obtener la versión del servidor"
-
-#: pg_dumpall.c:1818
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "no se pudo interpretar la versión del servidor «%s»"
-
-#: pg_dumpall.c:1888 pg_dumpall.c:1911
-#, c-format
-msgid "executing %s"
-msgstr "ejecutando %s"
-
-#: pg_dumpall.c:1983
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "objeto de filtro no soportado"
 
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "una de las opciones -d/--dbname y -f/--file debe especificarse"
 
-#: pg_restore.c:336
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "las opciones -d/--dbname y -f/--file no pueden usarse juntas"
-
-#: pg_restore.c:350
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "las opciones -1/--single-transaction y --transaction-size no pueden usarse juntas"
-
-#: pg_restore.c:357
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "las opciones -c/--clean y -1/--single-transaction no pueden usarse juntas"
-
-#: pg_restore.c:361
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "no se puede especificar --single-transaction junto con múltiples tareas"
 
-#: pg_restore.c:399
+#: pg_restore.c:480
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "el formato de archivador «%s» no está soportado; por favor use psql"
+
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "formato de archivo «%s» no reconocido; por favor especifique «c», «d» o «t»"
 
-#: pg_restore.c:438
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "errores ignorados durante la recuperación: %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2756,49 +2851,49 @@ msgstr ""
 "creado por pg_dump.\n"
 "\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPCIÓN]... [ARCHIVO]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:540
 #, 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:457
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida (- para stdout)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:542
 #, 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:459
+#: pg_restore.c:543
 #, 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:460
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            modo verboso\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:545
 #, 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:462
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               mostrar esta ayuda y salir\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -2807,34 +2902,34 @@ msgstr ""
 "\n"
 "Opciones que controlan la recuperación:\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:549
 #, 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:467
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 crea la base de datos de destino\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:552
 #, 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:469
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NOMBRE           reestablece el índice nombrado\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:554
 #, 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:471
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2843,59 +2938,59 @@ msgstr ""
 "  -L, --use-list=ARCHIVO       usa la tabla de contenido especificada para ordenar\n"
 "                               la salida de este archivo\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:557
 #, 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:474
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=NAME    no reestablecer los objetos en este esquema\n"
 
-#: pg_restore.c:476
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NOMBRE(args)  reestablece la función nombrada\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:561
 #, 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:478
+#: pg_restore.c:562
 #, 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:479
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NOMBRE           reestablece la relación (tabla, vista, etc.) nombrada\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NOMBRE         reestablece el disparador (trigger) nombrado\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:565
 #, 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:482
+#: pg_restore.c:566
 #, 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:484
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        activa seguridad de filas\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -2904,12 +2999,17 @@ msgstr ""
 "  --filter=ARCHIVO             restaurar o ignorar objetos basados en\n"
 "                               expresiones en ARCHIVO\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:572
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
-msgstr "  --no-comments                no restaurar comentarios\n"
+msgid "  --no-comments                do not restore comment commands\n"
+msgstr "  --no-comments                no restaurar órdenes de comentarios\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:573
+#, c-format
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    no restaurar datos\n"
+
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2918,49 +3018,74 @@ msgstr ""
 "  --no-data-for-failed-tables  no reestablece datos de tablas que no pudieron\n"
 "                               ser creadas\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:576
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr "  --no-policies                no restaurar políticas de seguridad por registros\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            no restaurar publicaciones\n"
 
-#: pg_restore.c:492
+#: pg_restore.c:578
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  no restaurar esquemas\n"
+
+#: pg_restore.c:579
 #, 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:493
+#: pg_restore.c:580
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              no restaurar estadísticas\n"
+
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           no restaurar suscripciones\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     no restaura métodos de acceso de tablas\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             no restaura asignaciones de tablespace\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:585
 #, 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:499
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 restaurar las estadísticas\n"
+
+#: pg_restore.c:587
+#, c-format
+msgid "  --statistics-only            restore only the statistics, not schema or data\n"
+msgstr "  --statistics-only            restaurar sólo las estadísticas, no esquemas ni datos\n"
+
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         comprometer transacción cada N objetos\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=ROLENAME              hace SET ROLE antes de restaurar\n"
+msgstr "  --role=ROLENAME          hacer SET ROLE antes de restaurar\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
@@ -2971,7 +3096,7 @@ msgstr ""
 "Las opciones -I, -n, -N, -P, -t, -T, y --section pueden ser combinadas y especificadas\n"
 "varias veces para seleccionar varios objetos.\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
@@ -2981,3 +3106,83 @@ msgstr ""
 "\n"
 "Si no se especifica un archivo de entrada, se usa la entrada estándar.\n"
 "\n"
+
+#, c-format
+#~ msgid "options -s/--schema-only and -a/--data-only cannot be used together"
+#~ msgstr "las opciones -s/--schema-only y -a/--data-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --statistics-only cannot be used together"
+#~ msgstr "las opciones -s/--schema-only y --statistics-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -a/--data-only and --statistics-only cannot be used together"
+#~ msgstr "las opciones -a/--data-only y /--statistics-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -a/--data-only and --no-data cannot be used together"
+#~ msgstr "las opciones -a/--data-only y --no-data no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --no-schema cannot be used together"
+#~ msgstr "las opciones -s/--schema-only y --no-data no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options --statistics-only and --no-statistics cannot be used together"
+#~ msgstr "las opciones --statistics-only y --no-statistics no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options --statistics and --no-statistics cannot be used together"
+#~ msgstr "las opciones --statistics y --no-statistics no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
+#~ msgstr "las opciones -s/--schema-only y --include-foreign-data no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -c/--clean and -a/--data-only cannot be used together"
+#~ msgstr "las opciones -c/--clean y -a/--data-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "option --if-exists requires option -c/--clean"
+#~ msgstr "la opción --if-exists requiere la opción -c/--clean"
+
+#, c-format
+#~ msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
+#~ msgstr "la opción --on-conflict-do-nothing requiere una de las opciones --inserts, --rows-per-insert o --column-inserts"
+
+#, c-format
+#~ msgid "option --restrict-key can only be used with --format=plain"
+#~ msgstr "la opción --restrict-key sólo puede usarse con --format=plain"
+
+#, c-format
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
+#~ msgstr "la opción --exclude-database no puede ser usada junto con -g/--globals-only, -r/--roles-only o -t/--tablespaces-only"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
+#~ msgstr "las opciones -g/--globals-only y -r/--roles-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "las opciones -g/--globals-only y -t/--tablespaces-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "las opciones -r/--roles-only y -t/--tablespaces-only no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -d/--dbname and -f/--file cannot be used together"
+#~ msgstr "las opciones -d/--dbname y -f/--file no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -d/--dbname and --restrict-key cannot be used together"
+#~ msgstr "las opciones -d/--dbname y --restrict-key no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -1/--single-transaction and --transaction-size cannot be used together"
+#~ msgstr "las opciones -1/--single-transaction y --transaction-size no pueden usarse juntas"
+
+#, c-format
+#~ msgid "options -C/--create and -1/--single-transaction cannot be used together"
+#~ msgstr "las opciones -c/--clean y -1/--single-transaction no pueden usarse juntas"
diff --git a/src/bin/pg_dump/po/fr.po b/src/bin/pg_dump/po/fr.po
index 7e965dff103..79f16a5faa6 100644
--- a/src/bin/pg_dump/po/fr.po
+++ b/src/bin/pg_dump/po/fr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-29 17:52+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2026-05-08 18:52+0000\n"
+"PO-Revision-Date: 2026-05-08 21:51+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,32 +21,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.9\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:809 compress_lz4.c:816 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "cette construction ne supporte pas la compression avec %s"
@@ -115,27 +115,27 @@ msgstr "n'a pas pu trouver un « %s » à exécuter"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "n'a pas pu résoudre le chemin « %s » en sa forme absolue : %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "n'a pas pu exécuter la commande « %s » : %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "n'a pas pu lire à partir de la commande « %s » : %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "aucune donnée n'a été renvoyée par la commande « %s »"
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
@@ -150,45 +150,44 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -238,416 +237,511 @@ msgstr "%s doit être compris entre %d et %d"
 msgid "unrecognized sync method: %s"
 msgstr "méthode de synchronisation non reconnu : %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "lecture des extensions"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "identification des membres d'extension"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "lecture des schémas"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "lecture des tables utilisateur"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "lecture des fonctions utilisateur"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "lecture des types utilisateur"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "lecture des langages procéduraux"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "lecture des fonctions d'agrégats utilisateur"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "lecture des opérateurs utilisateur"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "lecture des méthodes d'accès définis par les utilisateurs"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "lecture des classes d'opérateurs utilisateur"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "lecture des familles d'opérateurs utilisateur"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "lecture des analyseurs utilisateur pour la recherche plein texte"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "lecture des modèles utilisateur pour la recherche plein texte"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "lecture des dictionnaires utilisateur pour la recherche plein texte"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "lecture des configurations utilisateur pour la recherche plein texte"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "lecture des wrappers de données distantes utilisateur"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "lecture des serveurs distants utilisateur"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "lecture des droits par défaut"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "lecture des collationnements utilisateurs"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "lecture des conversions utilisateur"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "lecture des conversions de type"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "lecture des transformations"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "lecture des informations d'héritage des tables"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "lecture des triggers sur évènement"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "recherche des tables d'extension"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "recherche des relations d'héritage"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "lecture des informations de colonnes des tables intéressantes"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "marquage des colonnes héritées dans les sous-tables"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "lecture des données de partitionnement"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "lecture des index"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "décrit les index des tables partitionnées"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "lecture des statistiques étendues"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "lecture des contraintes"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "lecture des triggers"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "lecture des règles de réécriture"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "lecture des politiques"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "lecture des publications"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "lecture des appartenances aux publications des tables"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "lecture des appartenances aux publications des schémas"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "lecture des souscriptions"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "lecture des appartenances aux souscriptions des tables"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "vérification échouée, OID %u parent de la table « %s » (OID %u) introuvable"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "nombre de parents invalide (%d) pour la table « %s »"
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "n'a pas pu analyser le tableau numérique « %s » : trop de nombres"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "n'a pas pu analyser le tableau numérique « %s » : caractère invalide dans le nombre"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "n'a pas pu initialiser la bibliothèque de compression : %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "n'a pas pu fermer le flux de compression : %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "n'a pas pu compresser les données : %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "n'a pas pu décompresser les données : %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "n'a pas pu fermer la bibliothèque de compression : %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "n'a pas pu lire à partir du fichier en entrée : %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:373 pg_backup_custom.c:651
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "n'a pas pu écrire dans le fichier : %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "n'a pas pu lire à partir du fichier en entrée : %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:371 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "n'a pas pu lire à partir du fichier en entrée : fin du fichier"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "n'a pas pu créer le contexte de décompression LZ4 : %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "n'a pas pu décompresser : %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "n'a pas pu libérer le contexte de décompression LZ4 : %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:690 compress_lz4.c:708
 #, c-format
 msgid "could not end compression: %s"
 msgstr "n'a pas pu terminer la compression : %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "n'a pas pu initialiser la bibliothèque de compression LZ4 : %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "n'a pas pu initialiser la bibliothèque LZ4 : %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "erreur lors de l'écriture : %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "erreur lors de l'écriture : %m"
+
+#: compress_lz4.c:700
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "n'a pas pu écrire dans le fichier en sortie : %m"
+
+#: compress_lz4.c:718
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "n'a pas pu terminer la décompression : %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:735 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "n'a pas pu fermer le fichier : %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "n'a pas pu écrire dans le fichier : %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "n'a pas pu configurer le paramètre de compression « %s » : %s"
 
-#: compress_zstd.c:78 compress_zstd.c:231 compress_zstd.c:490
-#: compress_zstd.c:498
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "n'a pas pu initialiser la bibliothèque de compression"
 
-#: compress_zstd.c:194 compress_zstd.c:308
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "n'a pas pu décompresser les données : %s"
 
-#: compress_zstd.c:501
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Mot de passe : "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "mode « %s » non géré"
+msgid "%s"
+msgstr "%s"
 
-#: filter.c:49
+#: connectdb.c:157 pg_dumpall.c:520
+#, c-format
+msgid "could not connect to database \"%s\""
+msgstr "n'a pas pu se connecter à la base de données « %s »"
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "n'a pas pu obtenir la version du serveur"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "n'a pas pu analyser la version du serveur « %s »"
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "annulation à cause de la différence des versions"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "version du serveur : %s ; %s version : %s"
+
+#: connectdb.c:282 pg_dumpall.c:1801
+#, c-format
+msgid "executing %s"
+msgstr "exécution %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1807
+#, c-format
+msgid "query failed: %s"
+msgstr "échec de la requête : %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1808
+#, c-format
+msgid "Query was: %s"
+msgstr "La requête était : %s"
+
+#: dumputils.c:949
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "n'a pas pu créer le répertoire « %s » : %m"
+
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "n'a pas pu modifier les droits du répertoire « %s » : %m"
+
+#: dumputils.c:959
+#, c-format
+msgid "directory \"%s\" is not empty"
+msgstr "le répertoire « %s » n'est pas vide"
+
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier filtre « %s » : %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier filtre « %s » : %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr "format invalide dans la lecture du filtre à partir de l'entrée standard sur la ligne %d : %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "format invalide dans le filtre lu du fichier « %s » sur la ligne %d : %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "n'a pas pu lire à partir du fichier filtre « %s » : %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendu"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "motif de nom d'objet manquant"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "aucune commande de filtre (attendait « include » ou « exclude »)"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "commande de filtre invalide (attendait « include » ou « exclude »)"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "type d'objet filtre manquant"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "type d'objet filtre non supporté : « %.*s »"
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "échec de %s() : code d'erreur %d"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "n'a pas pu créer le canal de communication : %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "n'a pas pu créer le processus worker : %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "commande non reconnue reçue du leader : « %s »"
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "message invalide reçu du worker: « %s »"
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -656,511 +750,522 @@ msgstr ""
 "impossible d'obtenir un verrou sur la relation « %s »\n"
 "Cela signifie en général que quelqu'un a demandé un verrou ACCESS EXCLUSIVE sur la table après que pg_dump ait obtenu son verrou ACCESS SHARE initial sur la table."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "un processus worker a subi un arrêt brutal inattendu"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "n'a pas pu écrire dans le canal de communication: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: n'a pas pu créer le socket: code d'erreur %d"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: n'a pas pu se lier: code d'erreur %d"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe : n'a pas pu se mettre en écoute: code d'erreur %d"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: échec de %s() : code d'erreur %d"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: n'a pas pu créer un deuxième socket: code d'erreur %d"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: n'a pas pu se connecter au socket: code d'erreur %d"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: n'a pas pu accepter de connexion: code d'erreur %d"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:270 pg_backup_archiver.c:1746
 #, c-format
 msgid "could not close output file: %m"
 msgstr "n'a pas pu fermer le fichier en sortie : %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:314 pg_backup_archiver.c:318
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "les éléments de l'archive ne sont pas dans l'ordre correct de la section"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:324
 #, c-format
 msgid "unexpected section code %d"
 msgstr "code de section inattendu %d"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:361
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "la restauration parallélisée n'est pas supportée avec ce format de fichier d'archive"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:365
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "la restauration parallélisée n'est pas supportée avec les archives réalisées par un pg_dump antérieur à la 8.0"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:386
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "ne peut pas restaurer l'archive compressée (%s)"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:406
 #, c-format
 msgid "connecting to database for restore"
 msgstr "connexion à la base de données pour la restauration"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:408
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "les connexions directes à la base de données ne sont pas supportées dans les archives pre-1.3"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:451
 #, c-format
-msgid "implied data-only restore"
-msgstr "a impliqué une restauration des données uniquement"
+msgid "implied no-schema restore"
+msgstr "a impliqué une restauration sans la structure"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:530
 #, c-format
 msgid "dropping %s %s"
 msgstr "suppression de %s %s"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:662
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "n'a pas pu trouver où insérer IF EXISTS dans l'instruction « %s »"
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:856 pg_backup_archiver.c:858
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "message d'avertissement du fichier de sauvegarde original : %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:892
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "création de %s « %s.%s »"
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:895
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "création de %s « %s »"
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:945
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "connexion à la nouvelle base de données « %s »"
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:972
 #, c-format
 msgid "processing %s"
 msgstr "traitement de %s"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:994
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "traitement des données de la table « %s.%s »"
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1064
 #, c-format
 msgid "executing %s %s"
 msgstr "exécution de %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1133
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "désactivation des triggers pour %s"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1159
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "activation des triggers pour %s"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1224
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "erreur interne -- WriteData ne peut pas être appelé en dehors du contexte de la routine DataDumper"
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1419
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "la sauvegarde des « Large Objects » n'est pas supportée dans le format choisi"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1482
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "restauration de %d « Large Object »"
 msgstr[1] "restauration de %d « Large Objects »"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1509 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "restauration du « Large Object » d'OID %u"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1521
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "n'a pas pu créer le « Large Object » %u : %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3888
+#: pg_backup_archiver.c:1526 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "n'a pas pu ouvrir le « Large Object » %u : %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1582
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier TOC « %s » : %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1610
 #, c-format
 msgid "line ignored: %s"
 msgstr "ligne ignorée : %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1617 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "n'a pas pu trouver l'entrée pour l'ID %d"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1640 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "n'a pas pu fermer le fichier TOC : %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1727 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » : %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1729 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde : %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1812
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "a écrit %zu octet de données d'un « Large Object » (résultat = %d)"
 msgstr[1] "a écrit %zu octets de données d'un « Large Object » (résultat = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1818
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "n'a pas pu écrire dans le « Large Object » : %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1908
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "pendant l'initialisation (« INITIALIZING ») :"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1913
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "pendant le traitement de la TOC (« PROCESSING TOC ») :"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1918
 #, c-format
 msgid "while FINALIZING:"
 msgstr "pendant la finalisation (« FINALIZING ») :"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1923
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "de l'entrée TOC %d ; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1999
 #, c-format
 msgid "bad dumpId"
 msgstr "mauvais dumpId"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2020
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "mauvais dumpId de table pour l'élément TABLE DATA"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2112
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "drapeau de décalage de données inattendu %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2125
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "le décalage dans le fichier de sauvegarde est trop important"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2236
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "nom du répertoire trop long : « %s »"
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2286
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "le répertoire « %s » ne semble pas être une archive valide (« toc.dat » n'existe pas)"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2294 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier en entrée « %s » : %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2301 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "n'a pas pu ouvrir le fichier en entrée : %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2307
 #, c-format
 msgid "could not read input file: %m"
 msgstr "n'a pas pu lire le fichier en entrée : %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2309
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "le fichier en entrée est trop petit (%lu lus, 5 attendus)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2341
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
-msgstr "Le fichier en entrée semble être une sauvegarde au format texte. Merci d'utiliser psql."
+msgstr "le fichier en entrée semble être une sauvegarde au format texte. Merci d'utiliser psql."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2347
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "le fichier en entrée ne semble pas être une archive valide (trop petit ?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2353
 #, c-format
-msgid "input file does not appear to be a valid archive"
-msgstr "le fichier en entrée ne semble pas être une archive valide"
+msgid "input file does not appear to be a valid tar archive"
+msgstr "le fichier en entrée ne semble pas être une archive tar valide"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2362
 #, c-format
 msgid "could not close input file: %m"
 msgstr "n'a pas pu fermer le fichier en entrée : %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2441
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "n'a pas pu ouvrir stdout pour l'ajout : %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2486
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "format de fichier « %d » non reconnu"
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4647
+#: pg_backup_archiver.c:2567 pg_backup_archiver.c:4798
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "élément terminé %d %s %s"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4660
+#: pg_backup_archiver.c:2571 pg_backup_archiver.c:4811
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "échec du processus worker : code de sortie %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2669
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "entrée TOC inattendu dans WriteToc() : %d %s %s"
+
+#: pg_backup_archiver.c:2673 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1004
+#: pg_backup_tar.c:1009
+#, c-format
+msgid "error during file seek: %m"
+msgstr "erreur lors de la recherche dans le fichier : %m"
+
+#: pg_backup_archiver.c:2731
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
-msgstr "ID %d de l'entrée en dehors de la plage -- peut-être un TOC corrompu"
+msgstr "l'identifiant %d de l'entrée en dehors de la plage -- peut-être un TOC corrompu"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2814
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "la restauration des tables avec WITH OIDS n'est plus supportée"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2896
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "encodage « %s » non reconnu"
 
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2902
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "élément ENCODING invalide : %s"
 
-#: pg_backup_archiver.c:2841
+#: pg_backup_archiver.c:2920
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "élément STDSTRINGS invalide : %s"
 
-#: pg_backup_archiver.c:2866
+#: pg_backup_archiver.c:2945
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "schéma « %s » non trouvé"
 
-#: pg_backup_archiver.c:2873
+#: pg_backup_archiver.c:2952
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "table « %s » non trouvée"
 
-#: pg_backup_archiver.c:2880
+#: pg_backup_archiver.c:2959
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "index « %s » non trouvé"
 
-#: pg_backup_archiver.c:2887
+#: pg_backup_archiver.c:2966
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "fonction « %s » non trouvée"
 
-#: pg_backup_archiver.c:2894
+#: pg_backup_archiver.c:2973
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "trigger « %s » non trouvé"
 
-#: pg_backup_archiver.c:3325
+#: pg_backup_archiver.c:3470
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "n'a pas pu initialiser la session utilisateur à « %s »: %s"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3612
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "n'a pas pu configurer « search_path » à « %s » : %s"
 
-#: pg_backup_archiver.c:3518
+#: pg_backup_archiver.c:3673
 #, 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:3567
+#: pg_backup_archiver.c:3722
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "n'a pas pu configurer la méthode « default_table_access_method » : %s"
 
-#: pg_backup_archiver.c:3616
+#: pg_backup_archiver.c:3771
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "n'a pas pu modifier la méthode d'accès aux tables : %s"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3872
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "ne sait pas comment initialiser le propriétaire du type d'objet « %s »"
 
-#: pg_backup_archiver.c:4004
+#: pg_backup_archiver.c:4007
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "entrée TOC inattendue dans : %d %s %s"
+
+#: pg_backup_archiver.c:4155
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "n'a pas trouver la chaîne magique dans le fichier d'en-tête"
 
-#: pg_backup_archiver.c:4018
+#: pg_backup_archiver.c:4169
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "version non supportée (%d.%d) dans le fichier d'en-tête"
 
-#: pg_backup_archiver.c:4023
+#: pg_backup_archiver.c:4174
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "échec de la vérification sur la taille de l'entier (%lu)"
 
-#: pg_backup_archiver.c:4027
+#: pg_backup_archiver.c:4178
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "l'archive a été créée sur une machine disposant d'entiers plus larges, certaines opérations peuvent échouer"
 
-#: pg_backup_archiver.c:4037
+#: pg_backup_archiver.c:4188
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "le format attendu (%d) diffère du format du fichier (%d)"
 
-#: pg_backup_archiver.c:4059
+#: pg_backup_archiver.c:4210
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "l'archive est compressée mais cette installation ne supporte pas la compression (%s) -- aucune donnée ne sera disponible"
 
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:4246
 #, c-format
 msgid "invalid creation date in header"
 msgstr "date de création invalide dans l'en-tête"
 
-#: pg_backup_archiver.c:4229
+#: pg_backup_archiver.c:4380
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "traitement de l'élément %d %s %s"
 
-#: pg_backup_archiver.c:4314
+#: pg_backup_archiver.c:4465
 #, c-format
 msgid "entering main parallel loop"
 msgstr "entrée dans la boucle parallèle principale"
 
-#: pg_backup_archiver.c:4325
+#: pg_backup_archiver.c:4476
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "omission de l'élément %d %s %s"
 
-#: pg_backup_archiver.c:4334
+#: pg_backup_archiver.c:4485
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "lancement de l'élément %d %s %s"
 
-#: pg_backup_archiver.c:4388
+#: pg_backup_archiver.c:4539
 #, c-format
 msgid "finished main parallel loop"
 msgstr "fin de la boucle parallèle principale"
 
-#: pg_backup_archiver.c:4424
+#: pg_backup_archiver.c:4575
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "traitement de l'élément manquant %d %s %s"
 
-#: pg_backup_archiver.c:4966
+#: pg_backup_archiver.c:5117
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "la table « %s » n'a pas pu être créée, ses données ne seront pas restaurées"
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "OID invalide pour le « Large Object »"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "erreur lors de la recherche dans le fichier : %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "le bloc de données %d a une mauvaise position de recherche"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "type de bloc de données non reconnu (%d) lors de la recherche dans l'archive"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file"
 msgstr ""
@@ -1169,218 +1274,157 @@ msgstr ""
 "différent, ce qui ne peut pas être géré à cause d'un fichier non gérable en\n"
 "recherche"
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr "n'a pas pu trouver l'identifiant de bloc %d dans l'archive -- possible corruption de l'archive"
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
-msgstr "ID de bloc inattendu (%d) lors de la lecture des données -- %d attendu"
+msgstr "identifiant de bloc inattendu (%d) lors de la lecture des données -- %d attendu"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "type de bloc de données %d non reconnu lors de la restauration de l'archive"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
-#: pg_backup_tar.c:1032
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
+#: pg_backup_tar.c:1007
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "n'a pas pu déterminer la position de recherche dans le fichier d'archive : %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "n'a pas pu fermer le fichier d'archive : %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "peut seulement rouvrir l'archive en entrée"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "la restauration parallélisée n'est pas supportée à partir de stdin"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr "la restauration parallélisée n'est pas supportée à partir de fichiers sans table de matière"
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "n'a pas pu initialiser la recherche de position dans le fichier d'archive : %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "compression activée"
 
-#: pg_backup_db.c:42
-#, c-format
-msgid "could not get server_version from libpq"
-msgstr "n'a pas pu obtenir server_version de libpq"
-
-#: pg_backup_db.c:53 pg_dumpall.c:1830
+#: pg_backup_db.c:41
 #, c-format
-msgid "aborting because of server version mismatch"
-msgstr "annulation à cause de la différence des versions"
+msgid "could not get \"server_version\" from libpq"
+msgstr "n'a pas pu obtenir « server_version » de libpq"
 
-#: pg_backup_db.c:54 pg_dumpall.c:1831
-#, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "version du serveur : %s ; %s version : %s"
-
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "déjà connecté à une base de données"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1677 pg_dumpall.c:1779
-msgid "Password: "
-msgstr "Mot de passe : "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "n'a pas pu se connecter à la base de données"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "échec de la reconnexion : %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1704 pg_dumpall.c:1788
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1893 pg_dumpall.c:1916
-#, c-format
-msgid "query failed: %s"
-msgstr "échec de la requête : %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "Query was: %s"
-msgstr "La requête était : %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
 msgstr[0] "la requête a renvoyé %d ligne au lieu d'une seule : %s"
 msgstr[1] "la requête a renvoyé %d lignes au lieu d'une seule : %s"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %sLa commande était : %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "n'a pas pu exécuter la requête"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "erreur renvoyée par PQputCopyData : %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "erreur renvoyée par PQputCopyEnd : %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY échoué pour la table « %s » : %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2283
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "résultats supplémentaires non attendus durant l'exécution de COPY sur la table « %s »"
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "n'a pas pu démarrer la transaction de la base de données"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "n'a pas pu valider la transaction de la base de données"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "aucun répertoire cible indiqué"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "n'a pas pu fermer le répertoire « %s » : %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "n'a pas pu créer le répertoire « %s » : %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "n'a pas pu écrire dans le fichier en sortie : %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "n'a pas pu fermer le fichier de données : %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier de données « %s » : %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "n'a pas pu ouvrir le fichier TOC « %s » du Large Object en entrée : %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "ligne invalide dans le fichier TOC du Large Object « %s » : « %s »"
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "erreur lors de la lecture du TOC du fichier Large Object « %s »"
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "n'a pas pu fermer le TOC du Large Object « %s » : %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "n'a pas pu fermer le fichier de données LO : %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "n'a pas pu écrire dans le fichier TOC des Large Objects : %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "n'a pas pu fermer le fichier TOC des Large Objects : %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "nom du fichier trop long : « %s »"
@@ -1436,152 +1480,162 @@ msgstr "syntaxe inattendue de l'instruction COPY : « %s »"
 msgid "invalid OID for large object (%u)"
 msgstr "OID invalide pour le « Large Object » (%u)"
 
-#: pg_backup_tar.c:1048
+#: pg_backup_tar.c:1023
 #, c-format
 msgid "could not close temporary file: %m"
 msgstr "n'a pas pu fermer le fichier temporaire : m"
 
-#: pg_backup_tar.c:1051
+#: pg_backup_tar.c:1026
 #, c-format
 msgid "actual file length (%lld) does not match expected (%lld)"
 msgstr "la longueur réelle du fichier (%lld) ne correspond pas à ce qui était attendu (%lld)"
 
-#: pg_backup_tar.c:1097 pg_backup_tar.c:1128
+#: pg_backup_tar.c:1072 pg_backup_tar.c:1103
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive"
 msgstr "n'a pas pu trouver l'en-tête du fichier « %s » dans l'archive tar"
 
-#: pg_backup_tar.c:1115
+#: pg_backup_tar.c:1090
 #, 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."
 msgstr "la restauration désordonnée de données n'est pas supportée avec ce format d'archive : « %s » est requis mais vient avant « %s » dans le fichier d'archive."
 
-#: pg_backup_tar.c:1162
+#: pg_backup_tar.c:1137
 #, c-format
 msgid "incomplete tar header found (%lu byte)"
 msgid_plural "incomplete tar header found (%lu bytes)"
 msgstr[0] "en-tête incomplet du fichier tar (%lu octet)"
 msgstr[1] "en-tête incomplet du fichier tar (%lu octets)"
 
-#: pg_backup_tar.c:1201
+#: pg_backup_tar.c:1176
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "en-tête tar corrompu trouvé dans %s (%d attendu, %d calculé ) à la position %llu du fichier"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "nom de section non reconnu : « %s »"
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "plus d'emplacements on_exit_nicely"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_dump.c:728 pg_restore.c:344
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
 #, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas être utilisées ensemble"
+msgid "options %s and %s cannot be used together"
+msgstr "les options « %s » et « %s » ne peuvent pas être utilisées ensemble"
 
-#: pg_dump.c:731
+#: pg_dump.c:865
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "les options « -s/--schema-only » et « --include-foreign-data » ne peuvent pas être utilisées ensemble"
+msgid "option %s is not supported with parallel backup"
+msgstr "l'option %s n'est pas acceptée avec une sauvegarde parallélisée"
 
-#: pg_dump.c:734
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "l'option --include-foreign-data n'est pas supportée avec une sauvegarde parallélisée"
+msgid "option %s requires option %s"
+msgstr "l'option %s requiert l'option %s"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:894
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "les options « -c/--clean » et « -a/--data-only » ne peuvent pas être utilisées ensemble"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "l'option %s requiert les options %s, %s ou %s"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "l'option --if-exists nécessite l'option -c/--clean"
+msgid "could not generate restrict key"
+msgstr "n'a pas pu générer la clé de restriction"
 
-#: pg_dump.c:747
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "l'option --on-conflict-do-nothing requiert l'option --inserts, --rows-per-insert, ou --column-inserts"
+msgid "invalid restrict key"
+msgstr "clé de restriction invalide"
 
-#: pg_dump.c:776
+#: pg_dump.c:917
+#, c-format
+msgid "option %s can only be used with %s"
+msgstr "l'option %s peut seulement être utilisée avec %s"
+
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "algorithme de compression inconnu :  « %s »"
 
-#: pg_dump.c:783
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "spécification de compression invalide : %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "l'option de compression « %s » n'est pas actuellement supportée par pg_dump"
 
-#: pg_dump.c:808
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "la sauvegarde parallélisée n'est supportée qu'avec le format directory"
 
-#: pg_dump.c:854
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "le dernier OID interne est %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "aucun schéma correspondant n'a été trouvé"
 
-#: pg_dump.c:880
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "aucune table correspondante n'a été trouvée"
 
-#: pg_dump.c:908
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "aucune extension correspondante n'a été trouvée"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s exporte une base de données dans un fichier texte ou dans d'autres\n"
-"formats.\n"
+"%s exporte une base de données dans un script texte ou dans d'autres formats.\n"
 "\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:635 pg_restore.c:452
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [BASE]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:638 pg_restore.c:455
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1590,12 +1644,12 @@ msgstr ""
 "\n"
 "Options générales :\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=FICHIER           nom du fichier ou du répertoire en sortie\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1604,24 +1658,24 @@ msgstr ""
 "  -F, --format=c|d|t|p         format du fichier de sortie (personnalisé,\n"
 "                               répertoire, tar, texte (par défaut))\n"
 
-#: pg_dump.c:1100
+#: pg_dump.c:1274
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr ""
 "  -j, --jobs=NOMBRE            utilise ce nombre de jobs en parallèle pour la\n"
 "                               sauvegarde\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:640
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:641
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                affiche la version puis quitte\n"
 
-#: pg_dump.c:1103
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1630,31 +1684,31 @@ msgstr ""
 "  -Z, --compress=METHODE[:DETAIL]\n"
 "                               compresse comme indiqué\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:642
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=DÉLAI    échec après l'attente du DÉLAI pour un verrou de\n"
 "                               table\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:670
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  --no-sync                    n'attend pas que les modifications soient\n"
 "                               proprement écrites sur disque\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "      --sync-method=METHODE configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:643
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   affiche cette aide puis quitte\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:644
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1663,66 +1717,66 @@ msgstr ""
 "\n"
 "Options contrôlant le contenu en sortie :\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:645
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, 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 schéma\n"
+msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
+msgstr "  -a, --data-only              sauvegarde uniquement les données, pas le schéma et les statistiques\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          inclut les « Large Objects » dans la sauvegarde\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (comme --large-objects, obsolète)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       exclut les « Large Objects » de la sauvegarde\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (comme --no-large-objects, obsolète)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1290 pg_restore.c:550
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr ""
 "  -c, --clean                  nettoie/supprime les objets de la base de données\n"
 "                               avant de les créer\n"
 
-#: pg_dump.c:1117
+#: pg_dump.c:1291
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr ""
 "  -C, --create                 inclut les commandes de création de la base\n"
 "                               dans la sauvegarde\n"
 
-#: pg_dump.c:1118
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=MOTIF        sauvegarde uniquement les extensions indiquées\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:647
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=ENCODAGE      sauvegarde les données dans l'encodage ENCODAGE\n"
 
-#: pg_dump.c:1120
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=MOTIF           sauvegarde uniquement les schémas indiqués\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=MOTIF   ne sauvegarde pas les schémas indiqués\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1731,50 +1785,48 @@ msgstr ""
 "  -O, --no-owner               ne sauvegarde pas les propriétaires des objets\n"
 "                               lors de l'utilisation du format texte\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:651
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, 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"
+msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr "  -s, --schema-only            sauvegarde uniquement le schéma, pas les données et les statistiques\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1299
 #, 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 à utiliser\n"
 "                               avec le format texte\n"
 
-#: pg_dump.c:1126
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=MOTIF            sauvegarde uniquement les tables indiquées\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=MOTIF    ne sauvegarde pas les tables indiquées\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:654
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, 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:1129 pg_dumpall.c:655
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr ""
 "  --binary-upgrade             à n'utiliser que par les outils de mise à jour\n"
 "                               seulement\n"
 
-#: pg_dump.c:1130 pg_dumpall.c:656
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr ""
 "  --column-inserts             sauvegarde les données avec des commandes INSERT\n"
 "                               en précisant les noms des colonnes\n"
 
-#: pg_dump.c:1131 pg_dumpall.c:657
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
@@ -1782,14 +1834,14 @@ msgstr ""
 "                               dans le but de respecter le standard SQL en\n"
 "                               matière de guillemets\n"
 
-#: pg_dump.c:1132 pg_dumpall.c:658 pg_restore.c:483
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers           désactive les triggers en mode de restauration\n"
 "                               des données seules\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1799,12 +1851,12 @@ msgstr ""
 "                               sauvegarde uniquement le contenu visible par cet\n"
 "                               utilisateur)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=MOTIF    ne sauvegarde PAS les extensions indiquées\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1814,12 +1866,12 @@ msgstr ""
 "  --exclude-table-and-children=MOTIF\n"
 "                               ne sauvegarde PAS les tables indiquées, ceci incluant les tables filles et les partitions\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=MOTIF   ne sauvegarde pas les tables indiquées\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1829,14 +1881,14 @@ msgstr ""
 "  --exclude-table-data-and-children=MOTIF\n"
 "                               ne sauvegarde PAS les données des tables indiquées, ceci incluant les tables filles et les partitions\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:660
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr ""
 "  --extra-float-digits=NUM     surcharge la configuration par défaut de\n"
 "                               extra_float_digits\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
@@ -1845,14 +1897,14 @@ msgstr ""
 "  --filter=NOMFICHIER          inclut ou exclut des objets et des données à partir de la sauvegarde\n"
 "                               basée sur les expressions dans NOMFICHIER\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:662 pg_restore.c:487
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr ""
 "  --if-exists                  utilise IF EXISTS lors de la suppression des\n"
 "                               objets\n"
 
-#: pg_dump.c:1147
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1862,103 +1914,143 @@ msgstr ""
 "  --include-foreign-data=MOTIF inclut les données des tables externes pour les\n"
 "                               serveurs distants correspondant au motif MOTIF\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:663
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr ""
 "  --inserts                    sauvegarde les données avec des instructions\n"
 "                               INSERT plutôt que COPY\n"
 
-#: pg_dump.c:1151 pg_dumpall.c:664
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    charger les partitions via la table racine\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:665
+#: pg_dump.c:1326 pg_dumpall.c:730
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
-msgstr "  --no-comments                ne sauvegarde pas les commentaires\n"
+msgid "  --no-comments                do not dump comment commands\n"
+msgstr "  --no-comments                ne sauvegarde pas les commandes de commentaires\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:666
+#: pg_dump.c:1327 pg_dumpall.c:731
+#, c-format
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    ne sauvegarde pas les données\n"
+
+#: pg_dump.c:1328 pg_dumpall.c:732
+#, c-format
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                ne sauvegarde pas les politiques de sécurité des données\n"
+
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            ne sauvegarde pas les publications\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:668
+#: pg_dump.c:1330 pg_dumpall.c:735
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-schema                  ne sauvegarde pas le schéma\n"
+
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr ""
 "  --no-security-labels         ne sauvegarde pas les affectations de labels de\n"
 "                               sécurité\n"
 
-#: pg_dump.c:1155 pg_dumpall.c:669
+#: pg_dump.c:1332 pg_dumpall.c:737
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistics              ne sauvegarde pas les statistiques\n"
+
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           ne sauvegarde pas les souscriptions\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:671
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     ne sauvegarde pas les méthodes d'accès aux tables\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:672
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             ne sauvegarde pas les affectations de tablespaces\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:673
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr ""
 "  --no-toast-compression       ne sauvegarde pas les méthodes de compression de\n"
 "                               TOAST\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:674
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, 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 non\n"
 "                               journalisées\n"
 
-#: pg_dump.c:1160 pg_dumpall.c:675
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr ""
 "  --on-conflict-do-nothing     ajoute ON CONFLICT DO NOTHING aux commandes\n"
 "                               INSERT\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:676
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, 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 même\n"
 "                               s'il ne s'agit pas de mots clés\n"
 
-#: pg_dump.c:1162 pg_dumpall.c:677
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=CLE           utilise la chaîne fournie comme clé pour \\restrict de psql\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NROWS      nombre de lignes par INSERT ; implique --inserts\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1342
 #, 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, data\n"
 "                               ou post-data)\n"
 
-#: pg_dump.c:1164
+#: pg_dump.c:1343 pg_dumpall.c:748
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              inclut la données de la séquence dans la sauvegarde\n"
+
+#: pg_dump.c:1344
 #, 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"
 
-#: pg_dump.c:1165
+#: pg_dump.c:1345
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          utilise l'image donnée pour la sauvegarde\n"
 
-#: pg_dump.c:1166 pg_restore.c:497
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --with-statistics            sauvegarde les statistiques\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
+#, c-format
+msgid "  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr "  --statistics-only            sauvegarde uniquement les statistiques, pas le schéma et les données\n"
+
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -1967,14 +2059,14 @@ msgstr ""
 "  --strict-names               requiert que les motifs des tables et/ou schémas\n"
 "                               correspondent à au moins une entité de chaque\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
 "                               child and partition tables\n"
 msgstr "  --table-and-children=MODÈLE sauvegarde uniquement les tables indiquées, en incluant les tables filles et les partitions\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:678 pg_restore.c:500
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1986,7 +2078,7 @@ msgstr ""
 "                               au lieu des commandes ALTER OWNER pour modifier\n"
 "                               les propriétaires\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:682 pg_restore.c:504
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -1995,46 +2087,46 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=BASE            base de données à sauvegarder\n"
 
-#: pg_dump.c:1176 pg_dumpall.c:684 pg_restore.c:505
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HÔTE              hôte du serveur de bases de données ou\n"
 "                               répertoire des sockets\n"
 
-#: pg_dump.c:1177 pg_dumpall.c:686 pg_restore.c:506
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT              numéro de port du serveur de bases de données\n"
 
-#: pg_dump.c:1178 pg_dumpall.c:687 pg_restore.c:507
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, 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:1179 pg_dumpall.c:688 pg_restore.c:508
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password            ne demande jamais un mot de passe\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:689 pg_restore.c:509
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password               force la demande du mot de passe (devrait\n"
 "                               survenir automatiquement)\n"
 
-#: pg_dump.c:1181 pg_dumpall.c:690
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=NOMROLE               exécute SET ROLE avant la sauvegarde\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2047,537 +2139,552 @@ msgstr ""
 "d'environnement PGDATABASE est alors utilisée.\n"
 "\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:694 pg_restore.c:516
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapporter les bogues à <%s>.\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:695 pg_restore.c:517
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "encodage client indiqué (« %s ») invalide"
 
-#: pg_dump.c:1352
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "les sauvegardes parallélisées sur un serveur standby ne sont pas supportées par cette version du serveur"
 
-#: pg_dump.c:1417
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "format de sortie « %s » invalide"
 
-#: pg_dump.c:1458 pg_dump.c:1514 pg_dump.c:1567 pg_dumpall.c:1467
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1605
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "mauvaise qualification du nom (trop de points entre les noms) : %s"
 
-#: pg_dump.c:1466
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "aucun schéma correspondant n'a été trouvé avec le motif « %s »"
 
-#: pg_dump.c:1519
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "aucune extension correspondante n'a été trouvée avec le motif « %s »"
 
-#: pg_dump.c:1572
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "aucun serveur distant correspondant n'a été trouvé avec le motif « %s »"
 
-#: pg_dump.c:1643
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "nom de relation incorrecte (trop de points entre les noms) : %s"
 
-#: pg_dump.c:1665
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "aucune table correspondante n'a été trouvée avec le motif « %s »"
 
-#: pg_dump.c:1692
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Vous n'êtes pas connecté à une base de données."
 
-#: pg_dump.c:1695
+#: pg_dump.c:1878
 #, 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"
 
-#: pg_dump.c:2154
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "sauvegarde du contenu de la table « %s.%s »"
 
-#: pg_dump.c:2264
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Sauvegarde du contenu de la table « %s » échouée : échec de PQgetCopyData()."
 
-#: pg_dump.c:2265 pg_dump.c:2275
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Message d'erreur du serveur : %s"
 
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "La commande était : %s"
 
-#: pg_dump.c:2274
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Sauvegarde du contenu de la table « %s » échouée : échec de PQgetResult()."
 
-#: pg_dump.c:2365
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "mauvais nombre de champs récupérés à partir de la table « %s »"
 
-#: pg_dump.c:3067
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "sauvegarde de la définition de la base de données"
 
-#: pg_dump.c:3176
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "fournisseur de locale non reconnu : %s"
 
-#: pg_dump.c:3537
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "encodage de la sauvegarde = %s"
 
-#: pg_dump.c:3562
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "sauvegarde de « standard_conforming_strings = %s »"
 
-#: pg_dump.c:3601
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "n'a pas pu analyser le résultat de current_schema()"
 
-#: pg_dump.c:3620
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "sauvegarde de « search_path = %s »"
 
-#: pg_dump.c:3656
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "lecture des « Large Objects »"
 
-#: pg_dump.c:3877
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "sauvegarde des « Large Objects » « %s »"
 
-#: pg_dump.c:3898
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "erreur lors de la lecture du « Large Object » %u : %s"
 
-#: pg_dump.c:4001
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "lecture des politiques de sécurité au niveau ligne"
 
-#: pg_dump.c:4142
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "type de commande inattendu pour la politique : %c"
 
-#: pg_dump.c:4592 pg_dump.c:5150 pg_dump.c:12362 pg_dump.c:18246
-#: pg_dump.c:18248 pg_dump.c:18870
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19681
+#: pg_dump.c:19683 pg_dump.c:20315
 #, c-format
 msgid "could not parse %s array"
 msgstr "n'a pas pu analyser le tableau %s"
 
-#: pg_dump.c:4806
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "les souscriptions ne sont pas sauvegardées parce que l'utilisateur courant n'est pas un superutilisateur"
 
-#: pg_dump.c:5012
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "la souscription d'OID %u n'existe pas"
 
-#: pg_dump.c:5019
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "vérification de santé échouée, table d'OID %u introuvable"
 
-#: pg_dump.c:5582
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "n'a pas pu trouver l'extension parent pour %s %s"
 
-#: pg_dump.c:5727
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "le schéma d'OID %u n'existe pas"
 
-#: pg_dump.c:7209 pg_dump.c:17617
+#: pg_dump.c:7009
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "ne peut pas exporter les statistiques pour le type de relation « %c »"
+
+#: pg_dump.c:7521 pg_dump.c:19008
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "vérification échouée, OID %u de la table parent de l'OID %u de la séquence introuvable"
 
-#: pg_dump.c:7352
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "vérification échouée, OID de table %u apparaissant dans partitioned introuvable"
 
-#: pg_dump.c:7583 pg_dump.c:7857 pg_dump.c:8304 pg_dump.c:8918 pg_dump.c:9040
-#: pg_dump.c:9188
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "OID de table %u non reconnu"
 
-#: pg_dump.c:7587
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "données d'index inattendu pour la table « %s »"
 
-#: pg_dump.c:8089
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "vérification échouée, OID %u de la table parent de l'OID %u de l'entrée de pg_rewrite introuvable"
 
-#: pg_dump.c:8922
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "données de colonne inattendues pour la table « %s »"
 
-#: pg_dump.c:8951
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "numérotation des colonnes invalide pour la table « %s »"
 
-#: pg_dump.c:9002
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "recherche des expressions par défaut de la table"
 
-#: pg_dump.c:9044
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "valeur adnum %d invalide pour la table « %s »"
 
-#: pg_dump.c:9138
+#: pg_dump.c:9570
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "recherche des contraintes NOT NULL invalides"
+
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "recherche des contraintes CHECK de la table"
 
-#: pg_dump.c:9192
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "%d contrainte de vérification attendue pour la table « %s » mais %d trouvée"
 msgstr[1] "%d contraintes de vérification attendues pour la table « %s » mais %d trouvée"
 
-#: pg_dump.c:9196
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Les catalogues système pourraient être corrompus."
 
-#: pg_dump.c:9886
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "le rôle d'OID %u n'existe pas"
 
-#: pg_dump.c:9998 pg_dump.c:10027
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "entrée pg_init_privs non supportée : %u %u %d"
 
-#: pg_dump.c:10574
+#: pg_dump.c:10968
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "statistiques sauvegardées dans le désordre (actuellement : %d %s %s, attendu : %d %s %s)"
+
+#: pg_dump.c:11109
+#, c-format
+msgid "unexpected null attname"
+msgstr "attname null inattendue"
+
+#: pg_dump.c:11138
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "n'a pas pu trouver une colonne d'index « %s »"
+
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "métadonnée manquante pour les Large Object « %s »"
 
-#: pg_dump.c:10857
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "la colonne typtype du type de données « %s » semble être invalide"
 
-#: pg_dump.c:12431
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "valeur provolatile non reconnue pour la fonction « %s »"
 
-#: pg_dump.c:12481 pg_dump.c:14377
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "valeur proparallel non reconnue pour la fonction « %s »"
 
-#: pg_dump.c:12611 pg_dump.c:12717 pg_dump.c:12724
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "n'a pas pu trouver la définition de la fonction d'OID %u"
 
-#: pg_dump.c:12650
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "valeur erronée dans le champ pg_cast.castfunc ou pg_cast.castmethod"
 
-#: pg_dump.c:12653
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "valeur erronée dans pg_cast.castmethod"
 
-#: pg_dump.c:12743
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "définition de transformation invalide, au moins un de trffromsql et trftosql ne doit pas valoir 0"
 
-#: pg_dump.c:12760
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "valeur erronée dans pg_transform.trffromsql"
 
-#: pg_dump.c:12781
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "valeur erronée dans pg_transform.trftosql"
 
-#: pg_dump.c:12926
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "les opérateurs postfixes ne sont plus supportés (opérateur « %s »)"
 
-#: pg_dump.c:13096
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "n'a pas pu trouver l'opérateur d'OID %s"
 
-#: pg_dump.c:13164
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "type « %c » invalide de la méthode d'accès « %s »"
 
-#: pg_dump.c:13838 pg_dump.c:13906
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "fournisseur de collationnement non reconnu : %s"
 
-#: pg_dump.c:13847 pg_dump.c:13854 pg_dump.c:13865 pg_dump.c:13875
-#: pg_dump.c:13890
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "collation « %s » invalide"
 
-#: pg_dump.c:14296
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "valeur non reconnue de aggfinalmodify pour l'agrégat « %s »"
 
-#: pg_dump.c:14352
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "valeur non reconnue de aggmfinalmodify pour l'agrégat « %s »"
 
-#: pg_dump.c:15069
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "type d'objet inconnu dans les droits par défaut : %d"
 
-#: pg_dump.c:15085
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "n'a pas pu analyser la liste ACL par défaut (%s)"
 
-#: pg_dump.c:15169
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "n'a pas pu analyser la liste ACL initiale (%s) ou par défaut (%s) pour l'objet « %s » (%s)"
 
-#: pg_dump.c:15194
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "n'a pas pu analyser la liste ACL (%s) ou par défaut (%s) pour l'objet « %s » (%s)"
 
-#: pg_dump.c:15737
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "la requête permettant d'obtenir la définition de la vue « %s » n'a renvoyé aucune donnée"
 
-#: pg_dump.c:15740
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "la requête permettant d'obtenir la définition de la vue « %s » a renvoyé plusieurs définitions"
 
-#: pg_dump.c:15747
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "la définition de la vue « %s » semble être vide (longueur nulle)"
 
-#: pg_dump.c:15832
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS n'est plus supporté (table « %s »)"
 
-#: pg_dump.c:16819
+#: pg_dump.c:18085
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "numéro de colonne %d invalide pour la table « %s »"
 
-#: pg_dump.c:16897
+#: pg_dump.c:18163
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "n'a pas pu analyser les colonnes statistiques de l'index"
 
-#: pg_dump.c:16899
+#: pg_dump.c:18165
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "n'a pas pu analyser les valeurs statistiques de l'index"
 
-#: pg_dump.c:16901
+#: pg_dump.c:18167
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "nombre de colonnes et de valeurs différentes pour les statistiques des index"
 
-#: pg_dump.c:17116
+#: pg_dump.c:18396
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "index manquant pour la contrainte « %s »"
 
-#: pg_dump.c:17351
+#: pg_dump.c:18665
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "type de contrainte inconnu : %c"
 
-#: pg_dump.c:17452 pg_dump.c:17681
+#: pg_dump.c:18718
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "type de séquence non reconnu : « %s »"
+
+#: pg_dump.c:18851 pg_dump.c:19089
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "la requête permettant d'obtenir les données de la séquence « %s » a renvoyé %d ligne (une seule attendue)"
 msgstr[1] "la requête permettant d'obtenir les données de la séquence « %s » a renvoyé %d ligne (une seule attendue)"
 
-#: pg_dump.c:17484
+#: pg_dump.c:18887
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "type de séquence non reconnu : « %s »"
+msgid "unrecognized sequence type: %d"
+msgstr "type de séquence non reconnu : %d"
 
-#: pg_dump.c:17998
+#: pg_dump.c:19112
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "échec pour obtenir les données de la séquence « %s » ; l'utilisateur pourrait ne pas avoir le droit SELECT sur la séquence ou la séquence pourrait avoir été supprimée"
+
+#: pg_dump.c:19433
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "la requête permettant d'obtenir la règle « %s » associée à la table « %s » a échoué : mauvais nombre de lignes renvoyées"
 
-#: pg_dump.c:18151
+#: pg_dump.c:19586
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "n'a pas pu trouver l'extension référencée %u"
 
-#: pg_dump.c:18250
+#: pg_dump.c:19685
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "nombre différent de configurations et de conditions pour l'extension"
 
-#: pg_dump.c:18382
+#: pg_dump.c:19817
 #, c-format
 msgid "reading dependency data"
 msgstr "lecture des données de dépendance"
 
-#: pg_dump.c:18468
+#: pg_dump.c:19903
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "pas d'objet référant %u %u"
 
-#: pg_dump.c:18479
+#: pg_dump.c:19914
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "pas d'objet référencé %u %u"
 
-#: pg_dump.c:18904 pg_dump.c:18942 pg_dumpall.c:1962 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20349 pg_dump.c:20387 pg_dumpall.c:1853 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "filtre %s pour « %s » n'est pas autorisé"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "dumpId %d invalide"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "dépendance invalide %d"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "n'a pas pu identifier la boucle de dépendance"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
-msgstr[0] "NOTE : il existe des contraintes de clés étrangères circulaires sur cette table :"
-msgstr[1] "NOTE : il existe des contraintes de clés étrangères circulaires sur ces tables :"
+msgstr[0] "il existe des contraintes de clés étrangères circulaires sur cette table :"
+msgstr[1] "il existe des contraintes de clés étrangères circulaires sur ces tables :"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "Il est possible de restaurer la sauvegarde sans utiliser --disable-triggers ou sans supprimer temporairement les contraintes."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "Considérez l'utilisation d'une sauvegarde complète au lieu d'une sauvegarde des données seulement pour éviter ce problème."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "n'a pas pu résoudre la boucle de dépendances parmi ces éléments :"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »"
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s"
 
-#: pg_dumpall.c:387
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "l'option --exclude-database ne peut pas être utilisée avec -g/--globals-only, -r/--roles-only ou -t/--tablespaces-only"
-
-#: pg_dumpall.c:395
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "les options « -g/--globals-only » et « -r/--roles-only » ne peuvent pas être utilisées ensemble"
-
 #: pg_dumpall.c:402
 #, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "les options « -g/--globals-only » et « -t/--tablespaces-only » ne peuvent pas être utilisées ensemble"
-
-#: pg_dumpall.c:412
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "les options « -r/--roles-only » et « -t/--tablespaces-only » ne peuvent pas être utilisées ensemble"
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "l'option %s ne peut pas être utilisée avec %s, %s ou %s"
 
-#: pg_dumpall.c:474 pg_dumpall.c:1771
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "n'a pas pu se connecter à la base de données « %s »"
-
-#: pg_dumpall.c:486
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2586,94 +2693,94 @@ msgstr ""
 "n'a pas pu se connecter aux bases « postgres » et « template1 ».\n"
 "Merci de préciser une autre base de données."
 
-#: pg_dumpall.c:634
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s extrait un cluster de bases de données PostgreSQL dans un fichier de\n"
+"%s extrait une instance de bases de données PostgreSQL dans un script de\n"
 "commandes SQL.\n"
 "\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:639
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=FICHIER           nom du fichier de sortie\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr ""
 "  -c, --clean                  nettoie (supprime) les bases de données avant de\n"
 "                               les créer\n"
 
-#: pg_dumpall.c:648
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           sauvegarde uniquement les objets système, pas\n"
 "                               le contenu des bases de données\n"
 
-#: pg_dumpall.c:649 pg_restore.c:475
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               omet la restauration des propriétaires des objets\n"
 
-#: pg_dumpall.c:650
+#: pg_dumpall.c:715
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr ""
 "  -r, --roles-only             sauvegarde uniquement les rôles, pas les bases\n"
 "                               de données ni les tablespaces\n"
 
-#: pg_dumpall.c:652
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NOM          indique le nom du super-utilisateur à utiliser\n"
 "                               avec le format texte\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:718
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr ""
 "  -t, --tablespaces-only       sauvegarde uniquement les tablespaces, pas les\n"
 "                               bases de données ni les rôles\n"
 
-#: pg_dumpall.c:659
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr ""
 "  --exclude-database=MOTIF     exclut les bases de données dont le nom\n"
 "                               correspond au motif\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr "  -f, --file=FICHIER           exclut les bases indiquées sous forme d'expressions dans FICHIER\n"
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          ne sauvegarde pas les mots de passe des rôles\n"
 
-#: pg_dumpall.c:683
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=CHAINE_CONNEX   connexion à l'aide de la chaîne de connexion\n"
 
-#: pg_dumpall.c:685
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=BASE          indique une autre base par défaut\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2686,106 +2793,104 @@ msgstr ""
 "standard.\n"
 "\n"
 
-#: pg_dumpall.c:837
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "nom de rôle commençant par « pg_ » ignoré (« %s »)"
 
-#: pg_dumpall.c:1059
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1127
+#, c-format
+msgid "ignoring role grant for missing role with OID %s"
+msgstr "ignore le don du rôle pour le rôle manquant d'OID %s"
+
+#: pg_dumpall.c:1165
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "n'a pas pu trouver un ordre de sauvegarde correct pour les appartenances au rôle « %s »"
 
-#: pg_dumpall.c:1194
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1191
+#, c-format
+msgid "ignoring role grant to missing role with OID %s"
+msgstr "ignore le don du rôle au rôle manquant d'OID %s"
+
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1206
+#, c-format
+msgid "grant of role \"%s\" to \"%s\" has invalid grantor OID %s"
+msgstr "le don du rôle « %s » à « %s » a un OID de donneur %s invalide"
+
+#: pg_dumpall.c:1208
+#, c-format
+msgid "This grant will be dumped without GRANTED BY."
+msgstr "Ce don sera sauvegardé sans GRANTED BY."
+
+#: pg_dumpall.c:1326
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "n'a pas pu analyser la liste d'ACL (%s) pour le paramètre « %s »"
 
-#: pg_dumpall.c:1321
+#: pg_dumpall.c:1453
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "n'a pas pu analyser la liste d'ACL (%s) pour le tablespace « %s »"
 
-#: pg_dumpall.c:1528
+#: pg_dumpall.c:1667
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "exclusion de la base de données « %s »"
 
-#: pg_dumpall.c:1532
+#: pg_dumpall.c:1671
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "sauvegarde de la base de données « %s »"
 
-#: pg_dumpall.c:1563
+#: pg_dumpall.c:1704
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "échec de pg_dump sur la base de données « %s », quitte"
 
-#: pg_dumpall.c:1569
+#: pg_dumpall.c:1710
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "n'a pas pu ré-ouvrir le fichier de sortie « %s » : %m"
 
-#: pg_dumpall.c:1613
+#: pg_dumpall.c:1754
 #, c-format
 msgid "running \"%s\""
 msgstr "exécute « %s »"
 
-#: pg_dumpall.c:1814
-#, c-format
-msgid "could not get server version"
-msgstr "n'a pas pu obtenir la version du serveur"
-
-#: pg_dumpall.c:1817
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "n'a pas pu analyser la version du serveur « %s »"
-
-#: pg_dumpall.c:1887 pg_dumpall.c:1910
-#, c-format
-msgid "executing %s"
-msgstr "exécution %s"
-
-#: pg_dumpall.c:1982
+#: pg_dumpall.c:1873
 msgid "unsupported filter object"
 msgstr "objet de filtre non supporté"
 
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "une seule des options -d/--dbname and -f/--file peut être indiquée"
 
-#: pg_restore.c:336
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "les options « -d/--dbname » et « -f/--file » ne peuvent pas être utilisées ensemble"
-
-#: pg_restore.c:350
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "les options -1/--single-transaction » et --transaction-size ne peuvent pas être utilisées ensemble"
-
-#: pg_restore.c:357
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "les options « -C/--create » et « -1/--single-transaction » ne peuvent pas être utilisées ensemble"
-
-#: pg_restore.c:361
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "ne peut pas spécifier à la fois l'option --single-transaction et demander plusieurs jobs"
 
-#: pg_restore.c:399
+#: pg_restore.c:480
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "le format d'archive « %s » n'est pas supporté ; merci d'utiliser psql"
+
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "format d'archive « %s » non reconnu ; merci d'indiquer « c », « d » ou « t »"
 
-#: pg_restore.c:438
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "erreurs ignorées lors de la restauration : %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2795,51 +2900,51 @@ msgstr ""
 "par pg_dump.\n"
 "\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FICHIER]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr ""
 "  -d, --dbname=NOM             nom de la base de données utilisée pour la\n"
 "                               connexion\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FICHIER           nom du fichier de sortie (- pour stdout)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:542
 #, 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"
 "                               automatique)\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list                   affiche la table des matières de l'archive (TOC)\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version                affiche la version puis quitte\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help                   affiche cette aide puis quitte\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -2848,34 +2953,34 @@ msgstr ""
 "\n"
 "Options contrôlant la restauration :\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              restaure uniquement les données, pas la structure\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 crée la base de données cible\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:552
 #, 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"
 
-#: pg_restore.c:469
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NOM              restaure l'index indiqué\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NOMBRE            utilise ce nombre de jobs en parallèle pour la\n"
 "                               restauration\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2884,61 +2989,61 @@ msgstr ""
 "  -L, --use-list=FICHIER       utilise la table des matières à partir de ce\n"
 "                               fichier pour sélectionner/trier la sortie\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:557
 #, 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"
 
-#: pg_restore.c:474
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=NOM     ne restaure pas les objets de ce schéma\n"
 
-#: pg_restore.c:476
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NOM(args)     restaure la fonction indiquée\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            restaure uniquement la structure, pas les données\n"
 
-#: pg_restore.c:478
+#: pg_restore.c:562
 #, 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 à utiliser\n"
 "                               pour désactiver les triggers\n"
 
-#: pg_restore.c:479
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NOM              restaure la relation indiquée (table, vue, etc)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NOM            restaure le trigger indiqué\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:565
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges          omet la restauration des droits sur les objets\n"
 "                               (grant/revoke)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:566
 #, 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:484
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        active la sécurité niveau ligne\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -2947,12 +3052,17 @@ msgstr ""
 "  --filter=NOMFICHIER          restaure ou ignore les objets suivant des expressions\n"
 "                               dans NOMFICHIER\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:572
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
-msgstr "  --no-comments                ne restaure pas les commentaires\n"
+msgid "  --no-comments                do not restore comment commands\n"
+msgstr "  --no-comments                ne restaure pas les commandes de commentaires\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:573
+#, c-format
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    ne restaure pas les données\n"
+
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2961,49 +3071,74 @@ msgstr ""
 "  --no-data-for-failed-tables  ne restaure pas les données des tables qui n'ont\n"
 "                               pas pu être créées\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:576
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr "  --no-policies                ne restaure pas les politiques de sécurité des lignes\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            ne restaure pas les publications\n"
 
-#: pg_restore.c:492
+#: pg_restore.c:578
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  ne restaure pas les schémas\n"
+
+#: pg_restore.c:579
 #, 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"
 
-#: pg_restore.c:493
+#: pg_restore.c:580
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              ne restaure pas les statistiques\n"
+
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           ne restaure pas les souscriptions\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     ne restaure pas les méthodes d'accès aux tables\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             ne restaure pas les affectations de tablespaces\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:585
 #, 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, data ou\n"
 "                               post-data)\n"
 
-#: pg_restore.c:499
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --with-statistics            restaure les statistiques\n"
+
+#: pg_restore.c:587
+#, c-format
+msgid "  --statistics-only            restore only the statistics, not schema or data\n"
+msgstr "  --statistics-only            restaure uniquement les statistiques, pas le schéma et les données\n"
+
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         valide après N objets\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=RÔLE                  exécute SET ROLE avant la restauration\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
@@ -3011,10 +3146,10 @@ msgid ""
 "multiple times to select multiple objects.\n"
 msgstr ""
 "\n"
-"Les options -I, -n, -N, -P, -t, -T et --section peuvent être combinées et\n"
-"indiquées plusieurs fois pour sélectionner plusieurs objets.\n"
+"Les options -I, -n, -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:515
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
@@ -3025,3 +3160,255 @@ msgstr ""
 "Si aucun nom de fichier n'est fourni en entrée, alors l'entrée standard est\n"
 "utilisée.\n"
 "\n"
+
+#, c-format
+#~ msgid "  --exclude-database=PATTERN   do not restore the specified database(s)\n"
+#~ msgstr "  --exclude-database=MOTIF     ne restaure pas la base de données indiquée\n"
+
+#, c-format
+#~ msgid "  --with-data                  dump the data\n"
+#~ msgstr "  --with-data                  sauvegarde les données\n"
+
+#, c-format
+#~ msgid "  --with-data                  restore the data\n"
+#~ msgstr "  --with-data                  restaure les données\n"
+
+#, c-format
+#~ msgid "  --with-schema                dump the schema\n"
+#~ msgstr "  --with-schema                sauvegarde le schéma\n"
+
+#, c-format
+#~ msgid "  --with-schema                restore the schema\n"
+#~ msgstr "  --with-schema                restaure le schéma\n"
+
+#, c-format
+#~ msgid "  -g, --globals-only           restore only global objects, no databases\n"
+#~ msgstr ""
+#~ "  -g, --globals-only           sauvegarde uniquement les objets globaux, pas\n"
+#~ "                               le contenu des bases de données\n"
+
+#, c-format
+#~ msgid "Individual databases can be restored using their specific archives."
+#~ msgstr "Les bases individuelles peuvent être restaurées en utilisant leurs archives spécifiques."
+
+#, c-format
+#~ msgid "considering PATTERN as NAME for --exclude-database option as no database connection while doing pg_restore"
+#~ msgstr "utilisation de MOTIF comme NOM pour l'option --exclude-database car aucune connexion lors du pg_restore"
+
+#, c-format
+#~ msgid "could not close directory \"%s\": %m"
+#~ msgstr "n'a pas pu fermer le répertoire « %s » : %m"
+
+#, c-format
+#~ msgid "could not connect to database"
+#~ msgstr "n'a pas pu se connecter à la base de données"
+
+#, c-format
+#~ msgid "could not execute query: %s"
+#~ msgstr "n'a pas pu exécuter la requête : %s"
+
+#, c-format
+#~ msgid "could not open file: \"%s\""
+#~ msgstr "n'a pas pu ouvrir le fichier : « %s »"
+
+#, c-format
+#~ msgid "could not write to LOs TOC file: %s"
+#~ msgstr "n'a pas pu écrire dans le fichier TOC des Large Objects : %s"
+
+#, c-format
+#~ msgid "database name \"%s\" matches exclude pattern \"%s\""
+#~ msgstr "le nom de base « %s » correspondre au motif d'exclusion « %s »"
+
+#, c-format
+#~ msgid "database restoring is skipped because file \"%s\" does not exist in directory \"%s\""
+#~ msgstr "la restauration de la base est ignorée parce que le fichier « %s » n'existe pas dans le répertoire « %s »"
+
+#, c-format
+#~ msgid "database restoring skipped because option -g/--globals-only was specified"
+#~ msgstr "restauration des bases ignorée parce que l'option -g/--globals-only a été indiquée"
+
+#, c-format
+#~ msgid "errors ignored on database \"%s\" restore: %d"
+#~ msgstr "erreurs ignorées lors de la restauration de la base « %s » : %d"
+
+#, c-format
+#~ msgid "executing query: %s"
+#~ msgstr "exécution de la requête : %s"
+
+#, c-format
+#~ msgid "found %d database name in \"%s\""
+#~ msgid_plural "found %d database names in \"%s\""
+#~ msgstr[0] "a trouvé %d nom de base dans « %s »"
+#~ msgstr[1] "a trouvé %d noms de base dans « %s »"
+
+#, c-format
+#~ msgid "found database \"%s\" (OID: %u) in file \"%s\""
+#~ msgstr "a trouvé la base « %s » (OID : %u) dans le fichier « %s »"
+
+#, c-format
+#~ msgid "found orphaned pg_auth_members entry for role %s"
+#~ msgstr "a trouvé une entrée pg_auth_members orpheline pour le rôle %s"
+
+#, c-format
+#~ msgid "ignored %d error in file \"%s\""
+#~ msgid_plural "ignored %d errors in file \"%s\""
+#~ msgstr[0] "%d erreur ignoré dans le fichier « %s »"
+#~ msgstr[1] "%d erreurs ignorées dans le fichier « %s »"
+
+#, c-format
+#~ msgid "invalid entry in file \"%s\" on line %d"
+#~ msgstr "entrée invalide dans le fichier « %s » sur la ligne %d"
+
+#, c-format
+#~ msgid "need to restore %d databases out of %d databases"
+#~ msgstr "doit restaurer %d bases sur %d"
+
+#, c-format
+#~ msgid "no database needs restoring out of %d database"
+#~ msgid_plural "no database needs restoring out of %d databases"
+#~ msgstr[0] "aucun base ne doit être restaurée parmi les %d base"
+#~ msgstr[1] "aucun base ne doit être restaurée parmi les %d bases"
+
+#, c-format
+#~ msgid "number of restored databases is %d"
+#~ msgstr "le nombre de bases restaurées est %d"
+
+#, c-format
+#~ msgid "option --exclude-database can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "l'option --exclude-database peut seulement être utilisée lors de la restauration d'une archive créée par pg_dumpall"
+
+#, c-format
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only"
+#~ msgstr "l'option --exclude-database ne peut pas être utilisée avec -g/--globals-only"
+
+#, c-format
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
+#~ msgstr "l'option --exclude-database ne peut pas être utilisée avec -g/--globals-only, -r/--roles-only ou -t/--tablespaces-only"
+
+#, c-format
+#~ msgid "option --if-exists requires option -c/--clean"
+#~ msgstr "l'option --if-exists nécessite l'option -c/--clean"
+
+#, c-format
+#~ msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
+#~ msgstr "l'option --on-conflict-do-nothing requiert l'option --inserts, --rows-per-insert, ou --column-inserts"
+
+#, c-format
+#~ msgid "option --restrict-key can only be used with --format=plain"
+#~ msgstr "l'option --restrict-key peut seulement être utilisée avec --format=plain"
+
+#, c-format
+#~ msgid "option -C/--create must be specified when restoring an archive created by pg_dumpall"
+#~ msgstr "l'option -C/--create doit être utilisée lors de la restauration d'une archive créée par pg_dumpall"
+
+#, c-format
+#~ msgid "option -F/--format=d|c|t requires option -f/--file"
+#~ msgstr "l'option -F/--format=d|c|t requiert l'option -f/--file"
+
+#, c-format
+#~ msgid "option -L/--use-list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "l'option -L/--use-list ne peut pas être utilisée lors de la restauration d'une archive créée par pg_dumpall"
+
+#, c-format
+#~ msgid "option -g/--globals-only can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "l'option -g/--globals-only peut seulement être utilisée lors de la restauration d'une archive créée par pg_dumpall"
+
+#, c-format
+#~ msgid "option -l/--list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "l'option -l/--list ne peut pas être utilisée lors de la restauration d'une archive créée par pg_dumpall"
+
+#, c-format
+#~ msgid "options --statistics and --no-statistics cannot be used together"
+#~ msgstr "les options --statistics et --no-statistics ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options --statistics-only and --no-statistics cannot be used together"
+#~ msgstr "les options --statistics-only et --no-statistics ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options --with-data and --no-data cannot be used together"
+#~ msgstr "les options --with-data et --no-data ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options --with-schema and --no-schema cannot be used together"
+#~ msgstr "les options --with-schema et --no-schem ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options --with-statistics and --no-statistics cannot be used together"
+#~ msgstr "les options --with-statistics et --no-statistics ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -1/--single-transaction and --transaction-size cannot be used together"
+#~ msgstr "les options -1/--single-transaction » et --transaction-size ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -C/--create and -1/--single-transaction cannot be used together"
+#~ msgstr "les options « -C/--create » et « -1/--single-transaction » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -a/--data-only and --no-data cannot be used together"
+#~ msgstr "les options -a/--data-only et --no-data ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -a/--data-only and --statistics-only cannot be used together"
+#~ msgstr "les options -a/--data-only et --statistics-only ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -c/--clean and -a/--data-only cannot be used together"
+#~ msgstr "les options « -c/--clean » et « -a/--data-only » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -d/--dbname and --restrict-key cannot be used together"
+#~ msgstr "les options « -d/--dbname » et « --restrict-key » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -d/--dbname and -f/--file cannot be used together"
+#~ msgstr "les options « -d/--dbname » et « -f/--file » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
+#~ msgstr "les options « -g/--globals-only » et « -r/--roles-only » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "les options « -g/--globals-only » et « -t/--tablespaces-only » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "les options « -r/--roles-only » et « -t/--tablespaces-only » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
+#~ msgstr "les options « -s/--schema-only » et « --include-foreign-data » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --no-schema cannot be used together"
+#~ msgstr "les options -s/--schema-only et --no-schema ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --statistics-only cannot be used together"
+#~ msgstr "les options -s/--schema-only et --statistics-only ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "options -s/--schema-only and -a/--data-only cannot be used together"
+#~ msgstr "les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas être utilisées ensemble"
+
+#, c-format
+#~ msgid "reconnection failed: %s"
+#~ msgstr "échec de la reconnexion : %s"
+
+#, c-format
+#~ msgid "restoring database \"%s\""
+#~ msgstr "restauration de la base de données « %s »"
+
+#, c-format
+#~ msgid "trying to connect to database \"%s\""
+#~ msgstr "tentative de connexion à la base de données « %s »"
+
+#, c-format
+#~ msgid "unhandled mode \"%s\""
+#~ msgstr "mode « %s » non géré"
+
+#, c-format
+#~ msgid "unrecognized output format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\""
+#~ msgstr "format d'archive « %s » non reconnu ; merci d'indiquer « c », « d »; « p » ou « t »"
diff --git a/src/bin/pg_dump/po/ja.po b/src/bin/pg_dump/po/ja.po
index 0b0dbacaffa..3c74562ef33 100644
--- a/src/bin/pg_dump/po/ja.po
+++ b/src/bin/pg_dump/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-14 09:41+0900\n"
-"PO-Revision-Date: 2025-04-14 10:24+0900\n"
+"POT-Creation-Date: 2026-01-13 11:09+0900\n"
+"PO-Revision-Date: 2026-01-13 11:53+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -43,9 +43,9 @@ msgid "hint: "
 msgstr "ヒント: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:108 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "このビルドでは%sによる圧縮をサポートしていません"
@@ -129,7 +129,7 @@ msgstr "コマンド\"%s\"から読み取れませんでした: %m"
 msgid "no data was returned by command \"%s\""
 msgstr "コマンド\"%s\"がデータを返却しませんでした"
 
-#: ../../common/exec.c:405 parallel.c:1621
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() が失敗しました: %m"
@@ -171,7 +171,7 @@ msgstr "ファイル\"%s\"のstatに失敗しました: %m"
 msgid "this build does not support sync method \"%s\""
 msgstr "このビルドでは同期方式\"%s\"をサポートしていません"
 
-#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:905
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
@@ -246,391 +246,421 @@ msgstr "シェルコマンドの引数に改行(LF)または復帰(CR)が含ま
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "データベース名に改行(LF)または復帰(CR)が含まれています: \"%s\"\n"
 
-#: common.c:111
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "機能拡張を読み込んでいます"
 
-#: common.c:114
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "機能拡張の構成要素を特定しています"
 
-#: common.c:117
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "スキーマを読み込んでいます"
 
-#: common.c:126
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "ユーザー定義テーブルを読み込んでいます"
 
-#: common.c:131
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "ユーザー定義関数を読み込んでいます"
 
-#: common.c:135
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "ユーザー定義型を読み込んでいます"
 
-#: common.c:139
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "手続き言語を読み込んでいます"
 
-#: common.c:142
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "ユーザー定義集約関数を読み込んでいます"
 
-#: common.c:145
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "ユーザー定義演算子を読み込んでいます"
 
-#: common.c:148
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "ユーザー定義アクセスメソッドを読み込んでいます"
 
-#: common.c:151
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "ユーザー定義演算子クラスを読み込んでいます"
 
-#: common.c:154
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "ユーザー定義演算子族を読み込んでいます"
 
-#: common.c:157
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "ユーザー定義のテキスト検索パーサを読み込んでいます"
 
-#: common.c:160
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "ユーザー定義のテキスト検索テンプレートを読み込んでいます"
 
-#: common.c:163
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "ユーザー定義のテキスト検索辞書を読み込んでいます"
 
-#: common.c:166
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "ユーザー定義のテキスト検索設定を読み込んでいます"
 
-#: common.c:169
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "ユーザー定義の外部データラッパーを読み込んでいます"
 
-#: common.c:172
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "ユーザー定義の外部サーバーを読み込んでいます"
 
-#: common.c:175
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "デフォルト権限設定を読み込んでいます"
 
-#: common.c:178
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "ユーザー定義の照合順序を読み込んでいます"
 
-#: common.c:181
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "ユーザー定義の変換を読み込んでいます"
 
-#: common.c:184
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "型キャストを読み込んでいます"
 
-#: common.c:187
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "変換を読み込んでいます"
 
-#: common.c:190
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "テーブル継承情報を読み込んでいます"
 
-#: common.c:193
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "イベントトリガを読み込んでいます"
 
-#: common.c:197
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "機能拡張構成テーブルを探しています"
 
-#: common.c:201
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "継承関係を検索しています"
 
-#: common.c:204
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "対象テーブルの列情報を読み込んでいます"
 
-#: common.c:207
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "子テーブルの継承列にフラグを設定しています"
 
-#: common.c:210
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "パーティション情報を読み込んでいます"
 
-#: common.c:213
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "インデックスを読み込んでいます"
 
-#: common.c:216
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "パーティション親テーブルのインデックスにフラグを設定しています"
 
-#: common.c:219
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "拡張統計情報を読み込んでいます"
 
-#: common.c:222
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "制約を読み込んでいます"
 
-#: common.c:225
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "トリガを読み込んでいます"
 
-#: common.c:228
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "書き換えルールを読み込んでいます"
 
-#: common.c:231
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "ポリシを読み込んでいます"
 
-#: common.c:234
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "パブリケーションを読み込んでいます"
 
-#: common.c:237
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "テーブルのパブリケーションへの所属を読み取っています"
 
-#: common.c:240
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "スキーマのパブリケーションへの所属を読み取っています"
 
-#: common.c:243
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "サブスクリプションを読み込んでいます"
 
-#: common.c:246
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "テーブルのサブスクリプションへの所属を読み取っています"
 
-#: common.c:309
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "健全性検査に失敗しました、テーブル\"%2$s\"(OID %3$u)の親のOID %1$uがありません"
 
-#: common.c:351
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "テーブル\"%2$s\"用の親テーブルの数%1$dが不正です"
 
-#: common.c:1087
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "数値配列\"%s\"のパースに失敗しました: 要素が多すぎます"
 
-#: common.c:1099
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "数値配列\"%s\"のパースに失敗しました: 数値に不正な文字が含まれています"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "圧縮ライブラリを初期化できませんでした: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "圧縮ストリームをクローズできませんでした: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "データを圧縮できませんでした: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "データを伸張できませんでした: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "圧縮ライブラリをクローズできませんでした: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "入力ファイルから読み込めませんでした: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:374 pg_backup_custom.c:650
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "ファイルに書き込めませんでした: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "入力ファイルから読み込めませんでした: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:372 pg_backup_custom.c:648 pg_backup_directory.c:533
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "入力ファイルから読み込めませんでした: ファイルの終端"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "LZ4伸張コンテキストを作成できませんでした: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "伸張できませんでした: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "LZ4伸張コンテクストを解放きませんでした: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "圧縮を終了できませんでした: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "LZ4圧縮を初期化できませんでした: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "LZ4ライブラリを初期化できません: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "書き込み中にエラーが発生しました: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "書き込み中にエラーが発生しました: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "出力ファイルに書き込めませんでした: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "展開を終了できませんでした: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "ファイルをクローズできませんでした: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "ファイルに書き込めませんでした: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "圧縮パラメータ\"%s\"を設定できませんでした: %s"
 
-#: compress_zstd.c:78 compress_zstd.c:232 compress_zstd.c:491
-#: compress_zstd.c:499
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "圧縮ライブラリを初期化できませんでした"
 
-#: compress_zstd.c:195 compress_zstd.c:309
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "データを伸張できませんでした: %s"
 
-#: compress_zstd.c:502
-#, c-format
-msgid "unhandled mode \"%s\""
-msgstr "処理されないモード \"%s\""
-
-#: connectdb.c:56 connectdb.c:164 pg_backup_db.c:126
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
 msgid "Password: "
 msgstr "パスワード: "
 
-#: connectdb.c:83 connectdb.c:173 pg_backup_db.c:203 pg_dump.c:925
-#: pg_dump_sort.c:1251 pg_dump_sort.c:1271
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: connectdb.c:156 pg_dumpall.c:548 pg_restore.c:534
+#: connectdb.c:157 pg_dumpall.c:520
 #, c-format
 msgid "could not connect to database \"%s\""
 msgstr "データベース\"%s\"へ接続できませんでした"
 
-#: connectdb.c:200
+#: connectdb.c:201
 #, c-format
 msgid "could not get server version"
 msgstr "サーバーバージョンを取得できませんでした"
 
-#: connectdb.c:204
+#: connectdb.c:205
 #, c-format
 msgid "could not parse server version \"%s\""
 msgstr "サーバーバージョン\"%s\"をパースできませんでした"
 
-#: connectdb.c:221 pg_backup_db.c:52
+#: connectdb.c:222 pg_backup_db.c:52
 #, c-format
 msgid "aborting because of server version mismatch"
 msgstr "サーバーバージョンの不一致のため処理を中断します"
 
-#: connectdb.c:222 pg_backup_db.c:53
+#: connectdb.c:223 pg_backup_db.c:53
 #, c-format
 msgid "server version: %s; %s version: %s"
 msgstr "サーバーバージョン: %s、%s バージョン: %s"
 
-#: connectdb.c:281 pg_dumpall.c:1859
+#: connectdb.c:282 pg_dumpall.c:1790
 #, c-format
 msgid "executing %s"
 msgstr "%s を実行しています"
 
-#: connectdb.c:287 pg_backup_db.c:210 pg_dumpall.c:1865
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
 #, c-format
 msgid "query failed: %s"
 msgstr "問い合わせが失敗しました: %s"
 
-#: connectdb.c:288 pg_backup_db.c:212 pg_dumpall.c:1866
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
 #, c-format
 msgid "Query was: %s"
 msgstr "問い合わせ: %s"
 
-#: dumputils.c:910
+#: dumputils.c:949
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を作成できませんでした: %m"
 
-#: dumputils.c:915
+#: dumputils.c:954
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"の権限を変更できませんでした: %m"
 
-#: dumputils.c:920
+#: dumputils.c:959
 #, c-format
 msgid "directory \"%s\" is not empty"
 msgstr "ディレクトリ\"%s\"は空です"
@@ -655,32 +685,32 @@ msgstr "標準入力からのフィルターの読み取り中%d行目に無効
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "ファイル\"%s\"からのフィルターの読み取り中%d行目に無効なフォーマット: %s"
 
-#: filter.c:240 filter.c:467
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "フィルターファイル\"%s\"から読み取れませんでした: %m"
 
-#: filter.c:243
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "想定外のファイル終端です"
 
-#: filter.c:310
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "オブジェクト名のパターンが指定されていません"
 
-#: filter.c:421
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "フィルタコマンドが見つかりません (\"include\" または\"exclude\"が指定可能です)"
 
-#: filter.c:432
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "不正なフィルターコマンド  (\"include\"または\"exclude\"が指定可能です)"
 
-#: filter.c:439
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "フィルターオブジェクトのタイプが指定されてません"
 
-#: filter.c:446
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "サポートされないフィルターオブジェクトタイプ: \"%.*s\""
@@ -690,27 +720,27 @@ msgstr "サポートされないフィルターオブジェクトタイプ: \"%.
 msgid "%s() failed: error code %d"
 msgstr "%s()が失敗しました: エラーコード %d"
 
-#: parallel.c:971
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "通信チャンネルを作成できませんでした: %m"
 
-#: parallel.c:1028
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "ワーカープロセスを作成できませんでした: %m"
 
-#: parallel.c:1158
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "リーダーから認識不能のコマンドを受信しました: \"%s\""
 
-#: parallel.c:1201 parallel.c:1439
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "ワーカーから不正なメッセージを受信しました: \"%s\""
 
-#: parallel.c:1333
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -719,52 +749,52 @@ msgstr ""
 "リレーション\"%s\"のロックを獲得できませんでした。\n"
 "通常これは、pg_dumpの親プロセスが初期のACCESS SHAREロックを獲得した後にだれかがテーブルに対してACCESS EXCLUSIVEロックを要求したことを意味しています。"
 
-#: parallel.c:1422
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "ワーカープロセスが突然終了しました"
 
-#: parallel.c:1544 parallel.c:1662
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "通信チャンネルに書き込めませんでした: %m"
 
-#: parallel.c:1746
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: ソケットを作成できませんでした: エラーコード %d"
 
-#: parallel.c:1757
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: バインドできませんでした: エラーコード %d"
 
-#: parallel.c:1764
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: リッスンできませんでした: エラーコード %d"
 
-#: parallel.c:1771
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s()が失敗しました: エラーコード %d"
 
-#: parallel.c:1782
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: 第二ソケットを作成できませんでした: エラーコード %d"
 
-#: parallel.c:1791
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: ソケットを接続できませんでした: エラーコード %d"
 
-#: parallel.c:1800
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: 接続を受け付けられませんでした: エラーコード %d"
 
-#: pg_backup_archiver.c:269 pg_backup_archiver.c:1732
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "出力ファイルをクローズできませんでした: %m"
@@ -779,440 +809,440 @@ msgstr "アーカイブ項目が正しいセクション順ではありません
 msgid "unexpected section code %d"
 msgstr "想定外のセクションコード %d"
 
-#: pg_backup_archiver.c:365
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
-msgstr "このアーカイブファイル形式での並列リストアはサポートしていません"
+msgstr "このアーカイブファイル形式での並列はサポートしていません"
 
-#: pg_backup_archiver.c:369
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "8.0 より古い pg_dump で作られたアーカイブでの並列リストアはサポートしていません"
 
-#: pg_backup_archiver.c:390
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "圧縮アーカイブから復元できませんでした(%s)"
 
-#: pg_backup_archiver.c:410
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "リストアのためデータベースに接続しています"
 
-#: pg_backup_archiver.c:412
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "1.3より古いアーカイブではデータベースへの直接接続はサポートされていません"
 
-#: pg_backup_archiver.c:455
+#: pg_backup_archiver.c:450
 #, c-format
 msgid "implied no-schema restore"
 msgstr "暗黙的にスキーマなしのリストアを行います"
 
-#: pg_backup_archiver.c:523
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "%s %sを削除しています"
 
-#: pg_backup_archiver.c:655
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "文\"%s\"中に IF EXISTS を挿入すべき場所が見つかりませでした"
 
-#: pg_backup_archiver.c:841 pg_backup_archiver.c:843
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "オリジナルのダンプファイルからの警告: %s"
 
-#: pg_backup_archiver.c:877
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "%s \"%s.%s\"を作成しています"
 
-#: pg_backup_archiver.c:880
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "%s \"%s\"を作成しています"
 
-#: pg_backup_archiver.c:930
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "新しいデータベース\"%s\"に接続しています"
 
-#: pg_backup_archiver.c:957
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "%sを処理しています"
 
-#: pg_backup_archiver.c:979
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "テーブル\"%s.%s\"のデータを処理しています"
 
-#: pg_backup_archiver.c:1049
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "%s %sを実行しています"
 
-#: pg_backup_archiver.c:1118
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "%sのトリガを無効にしています"
 
-#: pg_backup_archiver.c:1144
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "%sのトリガを有効にしています"
 
-#: pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "内部エラー -- WriteDataはDataDumperルーチンのコンテクスト外では呼び出せません"
 
-#: pg_backup_archiver.c:1404
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "選択した形式ではラージオブジェクト出力をサポートしていません"
 
-#: pg_backup_archiver.c:1467
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
-msgstr[0] "%d個のラージオブジェクトをリストアしました"
+msgstr[0] "%d個のラージオブジェクトを復元しました"
 
-#: pg_backup_archiver.c:1494 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "OID %uのラージオブジェクトをリストアしています"
 
-#: pg_backup_archiver.c:1506
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "ラージオブジェクト %u を作成できませんでした: %s"
 
-#: pg_backup_archiver.c:1511 pg_dump.c:4063
+#: pg_backup_archiver.c:1525 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "ラージオブジェクト %u をオープンできませんでした: %s"
 
-#: pg_backup_archiver.c:1567
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "TOCファイル\"%s\"をオープンできませんでした： %m"
 
-#: pg_backup_archiver.c:1595
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "行を無視しました: %s"
 
-#: pg_backup_archiver.c:1602 pg_backup_db.c:548
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "ID %dのエントリがありませんでした"
 
-#: pg_backup_archiver.c:1625 pg_backup_directory.c:187
-#: pg_backup_directory.c:581
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "TOCファイルをクローズできませんでした: %m"
 
-#: pg_backup_archiver.c:1713 pg_backup_custom.c:151 pg_backup_directory.c:301
-#: pg_backup_directory.c:568 pg_backup_directory.c:634
-#: pg_backup_directory.c:652 pg_dumpall.c:530
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "出力ファイル\"%s\"をオープンできませんでした: %m"
 
-#: pg_backup_archiver.c:1715 pg_backup_custom.c:157
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "出力ファイルをオープンできませんでした: %m"
 
-#: pg_backup_archiver.c:1798
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "ラージオブジェクトデータを%zuバイト書き出しました(結果は%d)"
 
-#: pg_backup_archiver.c:1804
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "ラージオブジェクトに書き込めませんでした: %s"
 
-#: pg_backup_archiver.c:1894
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "初期化中:"
 
-#: pg_backup_archiver.c:1899
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "TOC処理中:"
 
-#: pg_backup_archiver.c:1904
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "終了処理中:"
 
-#: pg_backup_archiver.c:1909
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "TOCエントリ%d; %u %u %s %s %s から"
 
-#: pg_backup_archiver.c:1985
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "不正なdumpId"
 
-#: pg_backup_archiver.c:2006
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "TABLE DATA項目に対する不正なテーブルdumpId"
 
-#: pg_backup_archiver.c:2098
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "想定外のデータオフセットフラグ %d"
 
-#: pg_backup_archiver.c:2111
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "ダンプファイルのファイルオフセットが大きすぎます"
 
-#: pg_backup_archiver.c:2222 pg_restore.c:838
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "ディレクトリ名が長すぎます: \"%s\""
 
-#: pg_backup_archiver.c:2272
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "ディレクトリ\"%s\"は有効なアーカイブではないようです（\"toc.dat\"がありません）"
 
-#: pg_backup_archiver.c:2280 pg_backup_custom.c:168 pg_backup_custom.c:813
-#: pg_backup_directory.c:172 pg_backup_directory.c:364
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "入力ファイル\"%s\"をオープンできませんでした: %m"
 
-#: pg_backup_archiver.c:2287 pg_backup_custom.c:174
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "入力ファイルをオープンできませんでした: %m"
 
-#: pg_backup_archiver.c:2293
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "入力ファイルを読み込めませんでした: %m"
 
-#: pg_backup_archiver.c:2295
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "入力ファイルが小さすぎます(読み取り%lu、想定は 5)"
 
-#: pg_backup_archiver.c:2327
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
-msgstr "入力ファイルがテキスト形式のダンプのようです。psqlを使用してください。"
+msgstr "入力ファイルがテキスト形式のようです。psqlを使用してください。"
 
-#: pg_backup_archiver.c:2333
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "入力ファイルが有効なアーカイブではないようです(小さすぎる?)"
 
-#: pg_backup_archiver.c:2339
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "入力ファイルが有効なアーカイブではないようです"
 
-#: pg_backup_archiver.c:2348
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "入力ファイルをクローズできませんでした: %m"
 
-#: pg_backup_archiver.c:2427
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "標準出力を追記用にオープンできませんでした: %m"
 
-#: pg_backup_archiver.c:2472
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "認識不能のファイル形式\"%d\""
 
-#: pg_backup_archiver.c:2553 pg_backup_archiver.c:4774
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "項目 %d %s %s の処理が完了"
 
-#: pg_backup_archiver.c:2557 pg_backup_archiver.c:4787
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "ワーカープロセスの処理失敗: 終了コード %d"
 
-#: pg_backup_archiver.c:2655
+#: pg_backup_archiver.c:2668
 #, c-format
 msgid "unexpected TOC entry in WriteToc(): %d %s %s"
 msgstr "WriteToc()で想定外のTOCエントリ: %d %s %s"
 
-#: pg_backup_archiver.c:2659 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
 #: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
 #: pg_backup_tar.c:1034
 #, c-format
 msgid "error during file seek: %m"
 msgstr "ファイルシーク中にエラーがありました: %m"
 
-#: pg_backup_archiver.c:2717
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "エントリID%dは範囲外です -- おそらくTOCの破損です"
 
-#: pg_backup_archiver.c:2800
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "WITH OIDSと定義されたテーブルのリストアは今後サポートされません"
 
-#: pg_backup_archiver.c:2882
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "認識不能のエンコーディング\"%s\""
 
-#: pg_backup_archiver.c:2888
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "不正なENCODING項目： %s"
 
-#: pg_backup_archiver.c:2906
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "不正なSTDSTRINGS項目： %s"
 
-#: pg_backup_archiver.c:2931
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "スキーマ \"%s\"が見つかりません"
 
-#: pg_backup_archiver.c:2938
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "テーブル\"%s\"が見つかりません"
 
-#: pg_backup_archiver.c:2945
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "インデックス\"%s\"が見つかりません"
 
-#: pg_backup_archiver.c:2952
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "関数\"%s\"が見つかりません"
 
-#: pg_backup_archiver.c:2959
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "トリガ\"%s\"が見つかりません"
 
-#: pg_backup_archiver.c:3420
+#: pg_backup_archiver.c:3469
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "セッションユーザーを\"%s\"に設定できませんでした: %s"
 
-#: pg_backup_archiver.c:3552
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "\"search_path\"を\"%s\"に設定できませんでした: %s"
 
-#: pg_backup_archiver.c:3613
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "\"default_tablespace\"を\"%s\"に設定できませんでした: %s"
 
-#: pg_backup_archiver.c:3662
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "\"default_table_access_method\"を設定できませんでした: %s"
 
-#: pg_backup_archiver.c:3711
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "テーブルアクセスメソッドを変更できませんでした: %s"
 
-#: pg_backup_archiver.c:3812
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "オブジェクトタイプ%sに対する所有者の設定方法がわかりません"
 
-#: pg_backup_archiver.c:3947
+#: pg_backup_archiver.c:4006
 #, c-format
 msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
 msgstr "_printTocEntry()で想定外のTOCエントリ: %d %s %s"
 
-#: pg_backup_archiver.c:4131
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "ファイルヘッダにマジック文字列がありませんでした"
 
-#: pg_backup_archiver.c:4145
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "ファイルヘッダ内のバージョン(%d.%d)はサポートされていません"
 
-#: pg_backup_archiver.c:4150
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "整数のサイズ(%lu)に関する健全性検査が失敗しました"
 
-#: pg_backup_archiver.c:4154
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "アーカイブはより大きなサイズの整数を持つマシンで作成されました、一部の操作が失敗する可能性があります"
 
-#: pg_backup_archiver.c:4164
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "想定した形式(%d)はファイル内にある形式(%d)と異なります"
 
-#: pg_backup_archiver.c:4186
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "アーカイブは圧縮されていますが、このインストールでは圧縮をサポートしていません (%s)-- データは利用できません"
 
-#: pg_backup_archiver.c:4222
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "ヘッダ内の作成日付が不正です"
 
-#: pg_backup_archiver.c:4356
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "項目 %d %s %s を処理しています"
 
-#: pg_backup_archiver.c:4441
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "メインの並列ループに入ります"
 
-#: pg_backup_archiver.c:4452
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "項目 %d %s %s をスキップしています"
 
-#: pg_backup_archiver.c:4461
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "項目 %d %s %s に着手します"
 
-#: pg_backup_archiver.c:4515
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "メインの並列ループが終了しました"
 
-#: pg_backup_archiver.c:4551
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "やり残し項目 %d %s %s を処理しています"
 
-#: pg_backup_archiver.c:5093
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "テーブル\"%s\"を作成できませんでした、このテーブルのデータは復元されません"
@@ -1235,7 +1265,7 @@ msgstr "アーカイブの探索中に認識不能のデータブロックタイ
 #: pg_backup_custom.c:518
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file"
-msgstr "アーカイブ中にブロックID %d がありません -- おそらくリストア要求が順不同だったためですが、入力ファイルがシーク不可なため処理できません"
+msgstr "アーカイブ中にブロックID %d がありません -- おそらく復元要求が順不同だったためですが、入力ファイルがシーク不可なため処理できません"
 
 #: pg_backup_custom.c:523
 #, c-format
@@ -1328,7 +1358,7 @@ msgstr "PQputCopyEnd からエラーが返されました: %s"
 msgid "COPY failed for table \"%s\": %s"
 msgstr "テーブル\"%s\"へのコピーに失敗しました: %s"
 
-#: pg_backup_db.c:460 pg_dump.c:2439
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "ファイル\"%s\"をCOPY中に想定していない余分な結果がありました"
@@ -1346,58 +1376,47 @@ msgstr "データベーストランザクションをコミットできません
 msgid "no output directory specified"
 msgstr "出力ディレクトリが指定されていません"
 
-#: pg_backup_directory.c:325 pg_backup_directory.c:474
-#: pg_backup_directory.c:512
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "出力ファイルに書き込めませんでした: %s"
-
-#: pg_backup_directory.c:343
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "データファイルをクローズできませんでした: %m"
 
-#: pg_backup_directory.c:376
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "データファイル\"%s\"をクローズできませんでした: %m"
 
-#: pg_backup_directory.c:423
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "ラージオブジェクトTOCファイル\"%s\"を入力用としてオープンできませんでした: %m"
 
-#: pg_backup_directory.c:434
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "ラージオブジェクトTOCファイル\"%s\"の中に不正な行がありました: \"%s\""
 
-#: pg_backup_directory.c:443
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "ラージオブジェクトTOCファイル\"%s\"の読み取り中にエラーがありました"
 
-#: pg_backup_directory.c:447
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "ラージオブジェクトTOCファイル\"%s\"をクローズできませんでした: %m"
 
-#: pg_backup_directory.c:670
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "ラージオブジェクトのデータファイルをクローズできませんでした: %m"
 
-#: pg_backup_directory.c:680
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "ラージオブジェクトのTOCファイルに書き出せませんでした: %s"
-
-#: pg_backup_directory.c:696
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "ラージオブジェクトのTOCファイルをクローズできませんでした: %m"
 
-#: pg_backup_directory.c:715
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "ファイル名が長すぎます: \"%s\""
@@ -1489,10 +1508,10 @@ msgstr "破損したtarヘッダが%sにありました(想定 %d、算出結果
 msgid "unrecognized section name: \"%s\""
 msgstr "認識不可のセクション名: \"%s\""
 
-#: pg_backup_utils.c:57 pg_dump.c:803 pg_dump.c:820 pg_dumpall.c:385
-#: pg_dumpall.c:395 pg_dumpall.c:403 pg_dumpall.c:411 pg_dumpall.c:418
-#: pg_dumpall.c:428 pg_dumpall.c:443 pg_dumpall.c:564 pg_restore.c:351
-#: pg_restore.c:367 pg_restore.c:378 pg_restore.c:388 pg_restore.c:517
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "詳細は\"%s --help\"を実行してください。"
@@ -1502,141 +1521,112 @@ msgstr "詳細は\"%s --help\"を実行してください。"
 msgid "out of on_exit_nicely slots"
 msgstr "on_exit_nicelyスロットが足りません"
 
-#: pg_dump.c:818 pg_dumpall.c:393 pg_restore.c:365
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "コマンドライン引数が多すぎます(先頭は\"%s\")"
 
-#: pg_dump.c:830 pg_restore.c:396
-#, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "-s/--schema-only と -a/--data-only オプションは同時には使用できません"
-
-#: pg_dump.c:832 pg_restore.c:398
-#, c-format
-msgid "options -s/--schema-only and --statistics-only cannot be used together"
-msgstr "-s/--schema-only と--statistics-only オプションは同時には使用できません"
-
-#: pg_dump.c:834 pg_restore.c:400
-#, c-format
-msgid "options -a/--data-only and --statistics-only cannot be used together"
-msgstr "-a/--data-only と --statistics-only オプションは同時には使用できません"
-
-#: pg_dump.c:838 pg_restore.c:404
-#, c-format
-msgid "options -a/--data-only and --no-data cannot be used together"
-msgstr "-a/--data-only と --no-data オプションは同時には使用できません"
-
-#: pg_dump.c:840 pg_restore.c:406
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
 #, c-format
-msgid "options -s/--schema-only and --no-schema cannot be used together"
-msgstr "-s/--schema-only と --no-schema オプションは同時には使用できません"
+msgid "options %s and %s cannot be used together"
+msgstr "オプション %s と %s は同時には使用できません"
 
-#: pg_dump.c:842 pg_restore.c:408
+#: pg_dump.c:865
 #, c-format
-msgid "options --statistics-only and --no-statistics cannot be used together"
-msgstr "オプション --statistics-only と --no-statistics とは同時には使用できません"
+msgid "option %s is not supported with parallel backup"
+msgstr "オプション %s はパラレルバックアップではサポートされません"
 
-#: pg_dump.c:846 pg_restore.c:412
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "options --with-data and --no-data cannot be used together"
-msgstr "--with-data と --no-data オプションは同時には使用できません"
+msgid "option %s requires option %s"
+msgstr "%s オプション指定時は%sオプションも必要です"
 
-#: pg_dump.c:848 pg_restore.c:414
+#: pg_dump.c:894
 #, c-format
-msgid "options --with-schema and --no-schema cannot be used together"
-msgstr "--with-schema と --no-schema オプションは同時には使用できません"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "%s オプション指定時は%s, %s または %s オプションも必要です"
 
-#: pg_dump.c:850 pg_restore.c:416
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options --with-statistics and --no-statistics cannot be used together"
-msgstr "オプション --with-statistics と --no-statistics とは同時には使用できません"
+msgid "could not generate restrict key"
+msgstr "制限キーを生成できませんでした"
 
-#: pg_dump.c:853
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "-s/--schema-only と --include-foreign-data オプションは同時には使用できません"
+msgid "invalid restrict key"
+msgstr "不正な制限キー"
 
-#: pg_dump.c:856
+#: pg_dump.c:917
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "オプション --include-foreign-data はパラレルバックアップではサポートされません"
+msgid "option %s can only be used with %s"
+msgstr "%s オプションは %s の指定時のみ使用できます"
 
-#: pg_dump.c:859 pg_restore.c:419
-#, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "-c/--clean と -a/--data-only オプションは同時には使用できません"
-
-#: pg_dump.c:862 pg_dumpall.c:423 pg_restore.c:462
-#, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "--if-existsは -c/--clean の指定が必要です"
-
-#: pg_dump.c:884
-#, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "--on-conflict-do-nothingオプションは--inserts、--rows-per-insert または --column-insertsを必要とします"
-
-#: pg_dump.c:913
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "認識できない圧縮アルゴリズム: \"%s\""
 
-#: pg_dump.c:920
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "不正な圧縮指定: %s"
 
-#: pg_dump.c:933
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "圧縮オプション\"%s\"は現時点ではpg_dumpではサポートされていません"
 
-#: pg_dump.c:945
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "並列バックアップはディレクトリ形式でのみサポートされます"
 
-#: pg_dump.c:991
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "最後の組み込みOIDは%u"
 
-#: pg_dump.c:1000
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "マッチするスキーマが見つかりません"
 
-#: pg_dump.c:1017
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "マッチするテーブルが見つかりません"
 
-#: pg_dump.c:1045
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "合致する機能拡張が見つかりません"
 
-#: pg_dump.c:1238
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%sはデータベースをテキストファイルまたはその他の形式でダンプします。\n"
+"%sは、ひとつのPostgreSQLデータベースをSQLスクリプトまたは他の形式でエクスポートします。\n"
 "\n"
 
-#: pg_dump.c:1239 pg_dumpall.c:699 pg_restore.c:648
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_dump.c:1240
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:1242 pg_dumpall.c:702 pg_restore.c:651
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1645,12 +1635,12 @@ msgstr ""
 "\n"
 "一般的なオプション;\n"
 
-#: pg_dump.c:1243
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=ファイル名        出力ファイルまたはディレクトリの名前\n"
 
-#: pg_dump.c:1244 pg_dumpall.c:704
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1659,22 +1649,22 @@ msgstr ""
 "  -F, --format=c|d|t|p         出力ファイルの形式(custom, directory, tar, \n"
 "                               plain text(デフォルト))\n"
 
-#: pg_dump.c:1246
+#: pg_dump.c:1274
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               ダンプ時に指定した数の並列ジョブを使用\n"
 
-#: pg_dump.c:1247 pg_dumpall.c:706
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                冗長モード\n"
 
-#: pg_dump.c:1248 pg_dumpall.c:707
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                バージョン情報を表示して終了\n"
 
-#: pg_dump.c:1249
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1683,29 +1673,29 @@ msgstr ""
 "  -Z, --compress=方式[:詳細]\n"
 "                         指定のとおり圧縮\n"
 
-#: pg_dump.c:1251 pg_dumpall.c:708
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=TIMEOUT  テーブルロックをTIMEOUT待ってから失敗\n"
 
-#: pg_dump.c:1252 pg_dumpall.c:740
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr "  --no-sync                    変更のディスクへの安全な書き出しを待機しない\n"
 
-#: pg_dump.c:1253
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr ""
 "  --sync-method=METHOD         ファイルをディスクに同期させる方法を指定\n"
 "\n"
 
-#: pg_dump.c:1254 pg_dumpall.c:709
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   このヘルプを表示して終了\n"
 
-#: pg_dump.c:1256 pg_dumpall.c:710
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1714,66 +1704,66 @@ msgstr ""
 "\n"
 "出力内容を制御するためのオプション:\n"
 
-#: pg_dump.c:1257 pg_dumpall.c:711
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, c-format
 msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
 msgstr "  -a, --data-only              データのみをダンプし、スキーマまたは統計情報をダンプしない\n"
 
-#: pg_dump.c:1258
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr ""
 "  -b, --large-objects          ダンプにラージオブジェクトを含める\n"
 "\n"
 
-#: pg_dump.c:1259
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (--large-objectsに同じ、非推奨)\n"
 
-#: pg_dump.c:1260
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       ダンプにラージオブジェクトを含めない\n"
 
-#: pg_dump.c:1261
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr ""
 "  --no-blobs                   (--no-large-objectsに同じ、非推奨)\n"
 "\n"
 
-#: pg_dump.c:1262 pg_restore.c:662
+#: pg_dump.c:1290 pg_restore.c:550
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                  再作成前にデータベースオブジェクトを整理(削除)\n"
 
-#: pg_dump.c:1263
+#: pg_dump.c:1291
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr "  -C, --create                 ダンプにデータベース生成用コマンドを含める\n"
 
-#: pg_dump.c:1264
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
-msgstr "  -e, --extension=PATTERN      指定した機能拡張のみをダンプ\n"
+msgstr "  -e, --extension=PATTERN      指定した機能拡張(群)のみをダンプ\n"
 
-#: pg_dump.c:1265 pg_dumpall.c:713
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=ENCODING      指定した符号化方式でデータをダンプ\n"
 
-#: pg_dump.c:1266
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
-msgstr "  -n, --schema=SCHEMA          指定したスキーマのみをダンプ\n"
+msgstr "  -n, --schema=SCHEMA          指定したスキーマ(群)のみをダンプ\n"
 
-#: pg_dump.c:1267
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
-msgstr "  -N, --exclude-schema=SCHEMA  指定したスキーマをダンプしない\n"
+msgstr "  -N, --exclude-schema=SCHEMA  指定したスキーマ(群)をダンプしない\n"
 
-#: pg_dump.c:1268
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1782,58 +1772,58 @@ msgstr ""
 "  -O, --no-owner               プレインテキスト形式で、オブジェクト所有権の\n"
 "                               復元を行わない\n"
 
-#: pg_dump.c:1270 pg_dumpall.c:717
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, c-format
 msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
 msgstr ""
 "  -s, --schema-only            スキーマのみをダンプし、データまたは統計情報を\n"
 "                               ダンプしない\n"
 
-#: pg_dump.c:1271
+#: pg_dump.c:1299
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr ""
 "  -S, --superuser=NAME         プレインテキスト形式で使用するスーパーユーザーの\n"
 "                               名前\n"
 
-#: pg_dump.c:1272
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=PATTERN          指定したテーブル(群)のみをダンプ\n"
 
-#: pg_dump.c:1273
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
-msgstr "  -T, --exclude-table=PATTERN  指定したテーブルをダンプしない\n"
+msgstr "  -T, --exclude-table=PATTERN  指定したテーブル(群)をダンプしない\n"
 
-#: pg_dump.c:1274 pg_dumpall.c:720
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          権限(grant/revoke)をダンプしない\n"
 
-#: pg_dump.c:1275 pg_dumpall.c:721
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             アップグレードユーティリティ専用\n"
 
-#: pg_dump.c:1276 pg_dumpall.c:722
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts             列名指定のINSERTコマンドでデータをダンプ\n"
 
-#: pg_dump.c:1277 pg_dumpall.c:723
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
 "  --disable-dollar-quoting     ドル記号による引用符付けを禁止、SQL標準の引用符\n"
 "                               付けを使用\n"
 
-#: pg_dump.c:1278 pg_dumpall.c:724 pg_restore.c:681
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
-msgstr "  --disable-triggers           データのみのリストアの際にトリガを無効化\n"
+msgstr "  --disable-triggers           データのみの復元の際にトリガを無効化\n"
 
-#: pg_dump.c:1279
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1842,12 +1832,12 @@ msgstr ""
 "  --enable-row-security        行セキュリティを有効化(ユーザーがアクセス可能な\n"
 "                               内容のみをダンプ)\n"
 
-#: pg_dump.c:1281
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
-msgstr "  --exclude-extension=PATTERN  指定した機能拡張をダンプしない\n"
+msgstr "  --exclude-extension=PATTERN  指定した機能拡張(群)をダンプしない\n"
 
-#: pg_dump.c:1282
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1858,12 +1848,12 @@ msgstr ""
 "                               指定したテーブル(群)を子テーブルを含めて\n"
 "                               ダンプしない\n"
 
-#: pg_dump.c:1285
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
-msgstr "  --exclude-table-data=PATTERN 指定したテーブルのデータをダンプしない\n"
+msgstr "  --exclude-table-data=PATTERN 指定したテーブル(群)のデータをダンプしない\n"
 
-#: pg_dump.c:1286
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1874,12 +1864,12 @@ msgstr ""
 "                               指定したテーブル(群)のデータを子テーブルを含めて\n"
 "                               ダンプしない\n"
 
-#: pg_dump.c:1289 pg_dumpall.c:726
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM     extra_float_digitsの設定を上書きする\n"
 
-#: pg_dump.c:1290
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
@@ -1888,12 +1878,12 @@ msgstr ""
 "  --filter=FILENAME            オブジェクトやデータの指定や除外を\n"
 "                               FILENAMEに記述された式をもとに行う\n"
 
-#: pg_dump.c:1292 pg_dumpall.c:728 pg_restore.c:685
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  オブジェクト削除の際に IF EXISTS を使用\n"
 
-#: pg_dump.c:1293
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1904,123 +1894,133 @@ msgstr ""
 "                               PATTERNに合致する外部サーバー上の外部テーブルの\n"
 "                               データを含める\n"
 
-#: pg_dump.c:1296 pg_dumpall.c:729
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    COPYではなくINSERTコマンドでデータをダンプ\n"
 
-#: pg_dump.c:1297 pg_dumpall.c:730
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    子テーブルをルートテーブル経由でロードする\n"
 
-#: pg_dump.c:1298 pg_dumpall.c:731
+#: pg_dump.c:1326 pg_dumpall.c:730
 #, c-format
 msgid "  --no-comments                do not dump comment commands\n"
 msgstr "  --no-comments                コメントコマンドをダンプしない\n"
 
-#: pg_dump.c:1299 pg_dumpall.c:732
+#: pg_dump.c:1327 pg_dumpall.c:731
 #, c-format
 msgid "  --no-data                    do not dump data\n"
 msgstr "  --no-data                    データをダンプしない\n"
 
-#: pg_dump.c:1300 pg_dumpall.c:733
+#: pg_dump.c:1328 pg_dumpall.c:732
 #, c-format
 msgid "  --no-policies                do not dump row security policies\n"
 msgstr "  --no-policies                行セキュリティポリシーをダンプしない\n"
 
-#: pg_dump.c:1301 pg_dumpall.c:734
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            パブリケーションをダンプしない\n"
 
-#: pg_dump.c:1302 pg_dumpall.c:736
+#: pg_dump.c:1330 pg_dumpall.c:735
 #, c-format
 msgid "  --no-schema                  do not dump schema\n"
 msgstr "  --no-schema                  スキーマをダンプしない\n"
 
-#: pg_dump.c:1303 pg_dumpall.c:737
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         セキュリティラベルの割り当てをダンプしない\n"
 
-#: pg_dump.c:1304 pg_dumpall.c:738
+#: pg_dump.c:1332 pg_dumpall.c:737
 #, c-format
 msgid "  --no-statistics              do not dump statistics\n"
 msgstr "  --no-statistics              統計情報をダンプしない\n"
 
-#: pg_dump.c:1305 pg_dumpall.c:739
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           サブスクリプションをダンプしない\n"
 
-#: pg_dump.c:1306 pg_dumpall.c:741
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     テーブルアクセスメソッドをダンプしない\n"
 
-#: pg_dump.c:1307 pg_dumpall.c:742
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             テーブルスペースの割り当てをダンプしない\n"
 
-#: pg_dump.c:1308 pg_dumpall.c:743
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       TOAST圧縮方式をダンプしない\n"
 
-#: pg_dump.c:1309 pg_dumpall.c:744
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     非ログテーブルのデータをダンプしない\n"
 
-#: pg_dump.c:1310 pg_dumpall.c:745
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     INSERTコマンドにON CONFLICT DO NOTHINGを付加する\n"
 
-#: pg_dump.c:1311 pg_dumpall.c:746
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr ""
 "  --quote-all-identifiers      すべての識別子をキーワードでなかったとしても\n"
 "                               引用符で囲む\n"
 
-#: pg_dump.c:1312 pg_dumpall.c:747
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=RESTRICT_KEY  \\restrict メタコマンドのキーに指定文字列を使う\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NROWS      INSERT毎の行数; --insertsを暗黙的に指定する\n"
 
-#: pg_dump.c:1313
+#: pg_dump.c:1342
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=SECTION            指定したセクション(pre-data、data または\n"
 "                               post-data)をダンプする\n"
 
-#: pg_dump.c:1314
+#: pg_dump.c:1343 pg_dumpall.c:748
 #, c-format
 msgid "  --sequence-data              include sequence data in dump\n"
 msgstr "  --sequence-data              ダンプにシーケンスデータを含める\n"
 
-#: pg_dump.c:1315
+#: pg_dump.c:1344
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr "  --serializable-deferrable    ダンプを異常なく実行できるようになるまで待機\n"
 
-#: pg_dump.c:1316
+#: pg_dump.c:1345
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          ダンプに指定のスナップショットを使用する\n"
 
-#: pg_dump.c:1317 pg_dumpall.c:748
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 統計情報をダンプする\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
 #, c-format
 msgid "  --statistics-only            dump only the statistics, not schema or data\n"
 msgstr ""
 "  --statistics-only            統計情報のみをダンプし、スキーマまたはデータを\n"
 "                               ダンプしない\n"
 
-#: pg_dump.c:1318 pg_restore.c:700
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -2029,7 +2029,7 @@ msgstr ""
 "  --strict-names               テーブル/スキーマの対象パターンが最低でも\n"
 "                               一つの実体にマッチすることを必須とする\n"
 
-#: pg_dump.c:1320
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -2038,7 +2038,7 @@ msgstr ""
 "  --table-and-children=PATTERN 指定したテーブル(群)のみを子テーブル\n"
 "                               を含めてダンプ\n"
 
-#: pg_dump.c:1322 pg_dumpall.c:749 pg_restore.c:703
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -2049,22 +2049,7 @@ msgstr ""
 "                               所有者をセットする際、ALTER OWNERコマンドの代わり\n"
 "                               にSET SESSION AUTHORIZATIONコマンドを使用する\n"
 
-#: pg_dump.c:1325 pg_dumpall.c:752 pg_restore.c:706
-#, c-format
-msgid "  --with-data                  dump the data\n"
-msgstr "  --with-data                  データをダンプする\n"
-
-#: pg_dump.c:1326 pg_dumpall.c:753 pg_restore.c:707
-#, c-format
-msgid "  --with-schema                dump the schema\n"
-msgstr "  --with-schema                スキーマをダンプする\n"
-
-#: pg_dump.c:1327 pg_dumpall.c:754 pg_restore.c:708
-#, c-format
-msgid "  --with-statistics            dump the statistics\n"
-msgstr "  --with-statistics            統計情報をダンプする\n"
-
-#: pg_dump.c:1329 pg_dumpall.c:756 pg_restore.c:710
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -2073,46 +2058,46 @@ msgstr ""
 "\n"
 "接続オプション:\n"
 
-#: pg_dump.c:1330
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAME      ダンプするデータベース\n"
 
-#: pg_dump.c:1331 pg_dumpall.c:758 pg_restore.c:711
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME      データベースサーバーのホストまたはソケット\n"
 "                           ディレクトリ\n"
 
-#: pg_dump.c:1332 pg_dumpall.c:760 pg_restore.c:712
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          データベースサーバーのポート番号\n"
 
-#: pg_dump.c:1333 pg_dumpall.c:761 pg_restore.c:713
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      指定したデータベースユーザーで接続\n"
 
-#: pg_dump.c:1334 pg_dumpall.c:762 pg_restore.c:714
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        パスワード入力を要求しない\n"
 
-#: pg_dump.c:1335 pg_dumpall.c:763 pg_restore.c:715
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password           パスワードプロンプトを強制表示\n"
 "                           (自動的に表示されるはず)\n"
 
-#: pg_dump.c:1336 pg_dumpall.c:764
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLENAME          ダンプの前に SET ROLE を行う\n"
 
-#: pg_dump.c:1338
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2124,570 +2109,549 @@ msgstr ""
 "データベース名が指定されなかった場合、環境変数PGDATABASEが使用されます\n"
 "\n"
 
-#: pg_dump.c:1340 pg_dumpall.c:768 pg_restore.c:722
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "バグは<%s>に報告してください。\n"
 
-#: pg_dump.c:1341 pg_dumpall.c:769 pg_restore.c:723
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ホームページ: <%s>\n"
 
-#: pg_dump.c:1360 pg_dumpall.c:581
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "不正なクライアントエンコーディング\"%s\"が指定されました"
 
-#: pg_dump.c:1508
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "スタンバイサーバーからの並列ダンプはこのサーバーバージョンではサポートされません"
 
-#: pg_dump.c:1573
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "不正な出力形式\"%s\"が指定されました"
 
-#: pg_dump.c:1614 pg_dump.c:1670 pg_dump.c:1723 pg_dumpall.c:1593
-#: pg_restore.c:974
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "修飾名が不適切です(ドット区切りの名前が多すぎます): %s"
 
-#: pg_dump.c:1622
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "パターン\"%s\"にマッチするスキーマが見つかりません"
 
-#: pg_dump.c:1675
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "パターン\"%s\"に合致する機能拡張が見つかりません"
 
-#: pg_dump.c:1728
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "パターン\"%s\"にマッチする外部サーバーが見つかりません"
 
-#: pg_dump.c:1799
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "リレーション名が不適切です(ドット区切りの名前が多すぎます): %s"
 
-#: pg_dump.c:1821
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "パターン \"%s\"にマッチするテーブルが見つかりません"
 
-#: pg_dump.c:1848
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "現在データベースに接続していません。"
 
-#: pg_dump.c:1851
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "データベース間の参照は実装されていません: %s"
 
-#: pg_dump.c:2310
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "テーブル \"%s.%s\"の内容をダンプしています"
 
-#: pg_dump.c:2420
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "テーブル\"%s\"の内容のダンプに失敗: PQgetCopyData()が失敗しました。"
 
-#: pg_dump.c:2421 pg_dump.c:2431
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "サーバーのエラーメッセージ: %s"
 
-#: pg_dump.c:2422 pg_dump.c:2432
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "コマンド: %s"
 
-#: pg_dump.c:2430
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "テーブル\"%s\"の内容のダンプに失敗: PQgetResult()が失敗しました。"
 
-#: pg_dump.c:2521
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "テーブル\"%s\"から取得したフィールドの数が間違っています"
 
-#: pg_dump.c:3236
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "データベース定義を保存しています"
 
-#: pg_dump.c:3351
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "認識できない照合順序プロバイダ: %s"
 
-#: pg_dump.c:3712
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "encoding = %s を保存しています"
 
-#: pg_dump.c:3737
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "\"standard_conforming_strings = %s\" を保存しています"
 
-#: pg_dump.c:3776
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "current_schemas()の結果をパースできませんでした"
 
-#: pg_dump.c:3795
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "\"search_path = %s\" を保存しています"
 
-#: pg_dump.c:3831
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "ラージオブジェクトを読み込んでいます"
 
-#: pg_dump.c:4052
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "ラージオブジェクト\"%s\"を保存しています"
 
-#: pg_dump.c:4073
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "ラージオブジェクト %u を読み取り中にエラーがありました: %s"
 
-#: pg_dump.c:4181
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "行レベルセキュリティポリシーを読み取ります"
 
-#: pg_dump.c:4322
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "想定外のポリシコマンドタイプ: \"%c\""
 
-#: pg_dump.c:4764 pg_dump.c:5321 pg_dump.c:7917 pg_dump.c:13277 pg_dump.c:19381
-#: pg_dump.c:19383 pg_dump.c:20015
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19678
+#: pg_dump.c:19680 pg_dump.c:20312
 #, c-format
 msgid "could not parse %s array"
 msgstr "%s配列をパースできませんでした"
 
-#: pg_dump.c:4980
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "現在のユーザーがスーパーユーザーではないため、サブスクリプションはダンプされません"
 
-#: pg_dump.c:5184
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "OID %uのサブスクリプションは存在しません"
 
-#: pg_dump.c:5191
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "健全性検査に失敗しました、OID %uのテーブルがありません"
 
-#: pg_dump.c:5777
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "%s %sの親となる機能拡張がありませんでした"
 
-#: pg_dump.c:5915
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "OID %uのスキーマは存在しません"
 
-#: pg_dump.c:6939
+#: pg_dump.c:7009
 #, c-format
-msgid "cannot dump statistics for relation kind '%c'"
-msgstr "リレーション種別\"%c\"の統計情報はダンプできません"
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "リレーション種別 '%c' の統計情報はダンプできません"
 
-#: pg_dump.c:7451 pg_dump.c:18725
+#: pg_dump.c:7521 pg_dump.c:19005
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "健全性検査に失敗しました、OID %2$u であるシーケンスの OID %1$u である親テーブルがありません"
 
-#: pg_dump.c:7596
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "健全性検査に失敗しました、pg_partitioned_tableにあるテーブルOID %u が見つかりません"
 
-#: pg_dump.c:7861 pg_dump.c:8154 pg_dump.c:8595 pg_dump.c:9232 pg_dump.c:9366
-#: pg_dump.c:9511 pg_dump.c:9611
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "認識できないテーブルOID %u"
 
-#: pg_dump.c:7865
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "テーブル\"%s\"に対する想定外のインデックスデータ"
 
-#: pg_dump.c:8382
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "健全性検査に失敗しました、OID %2$u であるpg_rewriteエントリのOID %1$u である親テーブルが見つかりません"
 
-#: pg_dump.c:9236
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "テーブル\"%s\"に対する想定外の列データ"
 
-#: pg_dump.c:9266
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "テーブル\"%s\"の列番号が不正です"
 
-#: pg_dump.c:9328
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "テーブルのデフォルト式を探しています"
 
-#: pg_dump.c:9370
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "テーブル\"%2$s\"用のadnumの値%1$dが不正です"
 
-#: pg_dump.c:9463
+#: pg_dump.c:9570
 #, c-format
-msgid "finding invalid not null constraints"
+msgid "finding invalid not-null constraints"
 msgstr "未検証の非NULL制約を探しています"
 
-#: pg_dump.c:9561
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "テーブルのチェック制約を探しています"
 
-#: pg_dump.c:9615
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "テーブル\"%2$s\"で想定する検査制約は%1$d個でしたが、%3$dありました"
 
-#: pg_dump.c:9619
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "システムカタログが破損している可能性があります。"
 
-#: pg_dump.c:10411
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "OID が %u であるロールは存在しません"
 
-#: pg_dump.c:10523 pg_dump.c:10552
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "非サポートのpg_init_privsエントリ: %u %u %d"
 
-#: pg_dump.c:10843
+#: pg_dump.c:10968
 #, c-format
-msgid "stats dumped out of order (current: %d %s %s) (expected: %d %s %s)"
-msgstr "統計情報が異常な順序でダンプされています (現在: %d %s %s) (想定: %d %s %s)"
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "統計情報が異常な順序でダンプされています (現在: %d %s %s, 想定: %d %s %s)"
 
-#: pg_dump.c:10971
+#: pg_dump.c:11109
 #, c-format
-msgid "attname cannot be NULL"
-msgstr "attname はNULLにはできません"
+msgid "unexpected null attname"
+msgstr "attname が NULL です"
 
-#: pg_dump.c:11000
+#: pg_dump.c:11138
 #, c-format
 msgid "could not find index attname \"%s\""
 msgstr "\"%s\" というインデックスのattnameは見つかりませんでした"
 
-#: pg_dump.c:11486
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "ラージオブジェクト\"%s\"のメタデータがありません"
 
-#: pg_dump.c:11772
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "データ型\"%s\"のtyptypeが不正なようです"
 
-#: pg_dump.c:13348
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "関数\"%s\"のprovolatileの値が認識できません"
 
-#: pg_dump.c:13398 pg_dump.c:15294
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "関数\"%s\"のproparallel値が認識できません"
 
-#: pg_dump.c:13528 pg_dump.c:13634 pg_dump.c:13641
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "OID %uの関数の関数定義が見つかりませんでした"
 
-#: pg_dump.c:13567
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "pg_cast.castfuncまたはpg_cast.castmethodフィールドの値がおかしいです"
 
-#: pg_dump.c:13570
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "pg_cast.castmethod フィールドの値がおかしいです"
 
-#: pg_dump.c:13660
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "おかしな変換定義、trffromsql か trftosql の少なくとも一方は非ゼロであるはずです"
 
-#: pg_dump.c:13677
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "pg_cast.castmethod フィールドの値がおかしいです"
 
-#: pg_dump.c:13698
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "pg_cast.castmethod フィールドの値がおかしいです"
 
-#: pg_dump.c:13843
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "後置演算子は今後サポートされません(演算子\"%s\")"
 
-#: pg_dump.c:14013
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "OID %sの演算子がありませんでした"
 
-#: pg_dump.c:14081
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "アクセスメソッド\"%2$s\"の不正なタイプ\"%1$c\""
 
-#: pg_dump.c:14755 pg_dump.c:14823
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "認識できないの照合順序プロバイダ: %s"
 
-#: pg_dump.c:14764 pg_dump.c:14771 pg_dump.c:14782 pg_dump.c:14792
-#: pg_dump.c:14807
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "不正な照合順序\"%s\""
 
-#: pg_dump.c:15213
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "集約\"%s\"のaggfinalmodifyの値が識別できません"
 
-#: pg_dump.c:15269
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "集約\"%s\"のaggmfinalmodifyの値が識別できません"
 
-#: pg_dump.c:15989
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "デフォルト権限設定中の認識できないオブジェクト型: %d"
 
-#: pg_dump.c:16005
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "デフォルトの ACL リスト(%s)をパースできませんでした"
 
-#: pg_dump.c:16089
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "オブジェクト\"%3$s\"(%4$s)の初期ACLリスト(%1$s)またはデフォルト値(%2$s)をパースできませんでした"
 
-#: pg_dump.c:16114
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "オブジェクト\"%3$s\"(%4$s)のACLリスト(%1$s)またはデフォルト値(%2$s)をパースできませんでした"
 
-#: pg_dump.c:16657
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "ビュー\"%s\"の定義を取り出すための問い合わせがデータを返却しませんでした"
 
-#: pg_dump.c:16660
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "ビュー\"%s\"の定義を取り出すための問い合わせが2つ以上の定義を返却しました"
 
-#: pg_dump.c:16667
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "ビュー\"%s\"の定義が空のようです(長さが0)"
 
-#: pg_dump.c:16752
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDSは今後サポートされません(テーブル\"%s\")"
 
-#: pg_dump.c:17842
+#: pg_dump.c:18082
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "テーブル\"%2$s\"の列番号%1$dは不正です"
 
-#: pg_dump.c:17920
+#: pg_dump.c:18160
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "インデックス統計列をパースできませんでした"
 
-#: pg_dump.c:17922
+#: pg_dump.c:18162
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "インデックス統計値をパースできませんでした"
 
-#: pg_dump.c:17924
+#: pg_dump.c:18164
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "インデックス統計に対して列と値の数が合致しません"
 
-#: pg_dump.c:18139
+#: pg_dump.c:18393
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "制約\"%s\"のインデックスが見つかりません"
 
-#: pg_dump.c:18383
+#: pg_dump.c:18662
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "制約のタイプが識別できません: %c"
 
-#: pg_dump.c:18436
+#: pg_dump.c:18715
 #, c-format
 msgid "unrecognized sequence type: %s"
 msgstr "認識されないシーケンスの型\"%s\""
 
-#: pg_dump.c:18568 pg_dump.c:18800
+#: pg_dump.c:18848 pg_dump.c:19086
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "シーケンス\"%s\"のデータを得るための問い合わせが%d行返却しました(想定は1)"
 
-#: pg_dump.c:18604
+#: pg_dump.c:18884
 #, c-format
 msgid "unrecognized sequence type: %d"
 msgstr "認識されないシーケンスの型: %d"
 
-#: pg_dump.c:19133
+#: pg_dump.c:19109
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "シーケンス \"%s\" のデータ取得に失敗しました; ユーザーはこのシーケンスへの SELECT 権限を持っていないか、シーケンスが同時に削除された可能性があります"
+
+#: pg_dump.c:19430
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "テーブル\"%2$s\"のルール\"%1$s\"を得るための問い合わせが失敗しました: 間違った行数が返却されました"
 
-#: pg_dump.c:19286
+#: pg_dump.c:19583
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "親の機能拡張%uが見つかりません"
 
-#: pg_dump.c:19385
+#: pg_dump.c:19682
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "機能拡張に対して設定と条件の数が一致しません"
 
-#: pg_dump.c:19517
+#: pg_dump.c:19814
 #, c-format
 msgid "reading dependency data"
 msgstr "データの依存データを読み込んでいます"
 
-#: pg_dump.c:19603
+#: pg_dump.c:19900
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "参照元オブジェクト%u %uがありません"
 
-#: pg_dump.c:19614
+#: pg_dump.c:19911
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "参照先オブジェクト%u %uがありません"
 
-#: pg_dump.c:20049 pg_dump.c:20087 pg_dumpall.c:1911 pg_restore.c:757
-#: pg_restore.c:803
+#: pg_dump.c:20346 pg_dump.c:20384 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "\"%2$s\"に対しては%1$sフィルターを指定できません"
 
-#: pg_dump_sort.c:436
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "不正なdumpId %d"
 
-#: pg_dump_sort.c:442
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "不正な依存関係 %d"
 
-#: pg_dump_sort.c:606
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "依存関係のループが見つかりませんでした"
 
-#: pg_dump_sort.c:1247
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "次のテーブルの中で外部キー制約の循環があります: "
 
-#: pg_dump_sort.c:1252
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
-msgstr "--disable-triggersの使用または一時的な制約の削除を行わずにこのダンプをリストアすることはできないかもしれません。"
+msgstr "--disable-triggersを使用するか、制約を一時的に削除しないと、このダンプデータからのリストアはできない可能性があります。"
 
-#: pg_dump_sort.c:1253
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "この問題を回避するために--data-onlyダンプの代わりに完全なダンプを使用することを検討してください。"
 
-#: pg_dump_sort.c:1265
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "以下の項目の間の依存関係のループを解決できませんでした:"
 
-#: pg_dumpall.c:244
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "%2$sには\"%1$s\"プログラムが必要ですが、\"%3$s\"と同じディレクトリにありませんでした。"
 
-#: pg_dumpall.c:247
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "\"%2$s\"がプログラム\"%1$s\"を見つけましたが、これは%3$sと同じバージョンではありませんでした。"
 
 #: pg_dumpall.c:402
 #, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "--exclude-database オプションは -g/--globals-only、-r/--roles-only もしくは -t/--tablespaces-only と一緒には使用できません"
-
-#: pg_dumpall.c:410
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "-g/--globals-onlyと-r/--roles-onlyオプションは同時に使用できません"
-
-#: pg_dumpall.c:417
-#, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "-g/--globals-onlyと-t/--tablespaces-onlyオプションは同時に使用できません"
-
-#: pg_dumpall.c:427
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "-r/--roles-onlyと-t/--tablespaces-onlyオプションは同時に使用できません"
-
-#: pg_dumpall.c:442
-#, c-format
-msgid "option -F/--format=d|c|t requires option -f/--file"
-msgstr "オプション -F/--format=d|c|t はオプション -f/--file の指定が必要です"
-
-#: pg_dumpall.c:524 pg_restore.c:1050 pg_restore.c:1295
-#, c-format
-msgid "could not open \"%s\": %m"
-msgstr "\"%s\"をオープンできませんでした: %m"
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "オプション %s は %s, %s および %s と同時には使用できません"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2696,89 +2660,89 @@ msgstr ""
 "\"postgres\"または\"template1\"データベースに接続できませんでした\n"
 "代わりのデータベースを指定してください。"
 
-#: pg_dumpall.c:698
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster based on specified dump format.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%sはPostgreSQLデータベースクラスタを指定されたダンプ形式で抽出します。\n"
+"%sは、PostgreSQLデータベースクラスタをSQLスクリプト形式でエクスポートします。\n"
 "\n"
 
-#: pg_dumpall.c:700
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:703
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=ファイル名        出力ファイル名\n"
 
-#: pg_dumpall.c:712
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  再作成前にデータベースを整理（削除）\n"
 
-#: pg_dumpall.c:714
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           グローバルオブジェクトのみをダンプし、\n"
 "                               データベースをダンプしない\n"
 
-#: pg_dumpall.c:715 pg_restore.c:672
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               オブジェクトの所有権の復元を省略\n"
 
-#: pg_dumpall.c:716
+#: pg_dumpall.c:715
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr ""
 "  -r, --roles-only             ロールのみをダンプ。\n"
 "                               データベースとテーブル空間をダンプしない\n"
 
-#: pg_dumpall.c:718
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NAME         ダンプで使用するスーパーユーザーのユーザー名を\n"
 "                               指定\n"
 
-#: pg_dumpall.c:719
+#: pg_dumpall.c:718
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr ""
 "  -t, --tablespaces-only       テーブル空間のみをダンプ。データベースとロールを\n"
 "                               ダンプしない\n"
 
-#: pg_dumpall.c:725
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr "  --exclude-database=PATTERN   PATTERNに合致する名前のデータベースを除外\n"
 
-#: pg_dumpall.c:727
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr "  --filter=FILENAME            FILENAMEで指定された式に基づいてデータベースを除外する\n"
 
-#: pg_dumpall.c:735
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          ロールのパスワードをダンプしない\n"
 
-#: pg_dumpall.c:757
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=CONSTR      接続文字列を用いた接続\n"
 
-#: pg_dumpall.c:759
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    代替のデフォルトデータベースを指定\n"
 
-#: pg_dumpall.c:766
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2790,210 +2754,138 @@ msgstr ""
 "-f/--file が指定されない場合、SQLスクリプトは標準出力に書き出されます。\n"
 "\n"
 
-#: pg_dumpall.c:911
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "\"pg_\"で始まるロール名はスキップされました(%s)"
 
 #. translator: %s represents a numeric role OID
-#: pg_dumpall.c:1125 pg_dumpall.c:1183 pg_dumpall.c:1192
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
 #, c-format
 msgid "found orphaned pg_auth_members entry for role %s"
 msgstr "ロール %s に対する pg_auth_members エントリがありましたが、このロールは存在しません"
 
-#: pg_dumpall.c:1158
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "ロール\"%s\"のメンバーシップに対して正当なダンプ順序が見つかりませんでした"
 
-#: pg_dumpall.c:1313
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "パラメータ\"%2$s\"のACLリスト(%1$s)をパースできませんでした"
 
-#: pg_dumpall.c:1440
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "テーブル空間\"%2$s\"のACLリスト(%1$s)をパースできませんでした"
 
-#: pg_dumpall.c:1657
-#, c-format
-msgid "could not create subdirectory \"%s\": %m"
-msgstr "サブディレクトリ\"%s\"を作成できませんでした: %m"
-
-#: pg_dumpall.c:1664
-#, c-format
-msgid "could not open map file: %s"
-msgstr "マップファイルを開くことができませんでした: %s"
-
-#: pg_dumpall.c:1681 pg_restore.c:1004
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "データベース\"%s\"を除外します"
 
-#: pg_dumpall.c:1702
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "データベース\"%s\"をダンプしています"
 
-#: pg_dumpall.c:1731
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "データベース\"%s\"のダンプが失敗しました、終了します"
 
-#: pg_dumpall.c:1744
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "出力ファイル\"%s\"を再オープンできませんでした: %m"
 
-#: pg_dumpall.c:1812
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "\"%s\"を実行しています"
 
-#: pg_dumpall.c:1931
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "サポートされていないフィルターオブジェクト"
 
-#: pg_dumpall.c:1974
-#, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\""
-msgstr "アーカイブ形式\"%s\"が認識できません; \"c\"、\"d\"、\"p\" または\"t\"を指定してください"
-
-#: pg_restore.c:373
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "-d/--dbnameと-f/--fileのどちらか一方が指定されていなければなりません"
 
-#: pg_restore.c:377
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only"
-msgstr "オプション --exclude-database は -g/--globals-only と一緒には使用できません"
-
-#: pg_restore.c:387
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "オプション-d/--dbnameと-f/--fileは同時に使用できません"
-
-#: pg_restore.c:422
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "オプション -1/--single-transaction と --transaction-size とは同時には使用できません"
-
-#: pg_restore.c:429
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "オプション-C/--createと-1/--single-transactionとは同時には使用できません"
-
 #: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "--single-transaction と複数ジョブは同時には指定できません"
 
-#: pg_restore.c:481
+#: pg_restore.c:480
 #, c-format
 msgid "archive format \"%s\" is not supported; please use psql"
 msgstr "アーカイブ形式\"%s\"はサポートされていません、psqlを使ってください"
 
-#: pg_restore.c:485
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "アーカイブ形式\"%s\"が認識できません; \"c\"、\"d\"または\"t\"を指定してください"
 
-#: pg_restore.c:506
-#, c-format
-msgid "option -l/--list cannot be used when restoring an archive created by pg_dumpall"
-msgstr "オプション -l/--list はpg_dumpallで作成されたアーカイブの復元では使用できません"
-
-#: pg_restore.c:508
-#, c-format
-msgid "option -L/--use-list cannot be used when restoring an archive created by pg_dumpall"
-msgstr "オプション-L/--use-list はpg_dumpallで作成されたアーカイブの復元では使用できません"
-
-#: pg_restore.c:516
-#, c-format
-msgid "-C/--create option should be specified when restoring an archive created by pg_dumpall"
-msgstr "pg_dumpallで作成されたアーカイブを復元する際には、-C/--create オプションの指定が必要です"
-
-#: pg_restore.c:518
-#, c-format
-msgid "Individual databases can be restored using their specific archives."
-msgstr "各々のデータベースは対応するアーカイブを使って復元できます。"
-
-#: pg_restore.c:550
-#, c-format
-msgid "database restoring skipped as -g/--globals-only option was specified"
-msgstr "-g/--globals-only オプションが指定されているため、データベースの復元はスキップされました"
-
-#: pg_restore.c:565
-#, c-format
-msgid "option --exclude-database can be used only when restoring an archive created by pg_dumpall"
-msgstr "オプション --exclude-database はpg_dumpallで作成したアーカイブの復元時のみ使用できます"
-
-#: pg_restore.c:568
-#, c-format
-msgid "option -g/--globals-only can be used only when restoring an archive created by pg_dumpall"
-msgstr "オプション -g/--globals-only はpg_dumpallで作成したアーカイブの復元時のみ使用できます"
-
-#: pg_restore.c:576
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "リストア中に無視されたエラー数: %d"
 
-#: pg_restore.c:646
+#: pg_restore.c:535
 #, c-format
 msgid ""
-"%s restores a PostgreSQL database from an archive created by pg_dump or pg_dumpall.\n"
-"If the archive is created by pg_dumpall, then restores multiple databases also.\n"
+"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
 msgstr ""
-"%sはpg_dumpまたはpg_dumpallで作成したアーカイブからPostgreSQLデータベースを復元します。\n"
-"pg_dumpallで作成されたものの場合は、複数のデータベースを復元します。\n"
+"%sはpg_dumpで作成したアーカイブからPostgreSQLデータベースを復元します。\n"
 "\n"
 
-#: pg_restore.c:649
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FILE]\n"
 
-#: pg_restore.c:652
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        接続するデータベース名\n"
 
-#: pg_restore.c:653
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FILENAME      出力ファイル名(- で標準出力)\n"
 
-#: pg_restore.c:654
+#: pg_restore.c:542
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
 "  -F, --format=c|d|t         バックアップファイルの形式\n"
 "                           （自動的に設定されるはずです）\n"
 
-#: pg_restore.c:655
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               アーカイブのTOCの要約を表示\n"
 
-#: pg_restore.c:656
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            冗長モード\n"
 
-#: pg_restore.c:657
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version             バージョン情報を表示し、終了します\n"
 
-#: pg_restore.c:658
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help                このヘルプを表示し、終了します\n"
 
-#: pg_restore.c:660
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -3002,39 +2894,32 @@ msgstr ""
 "\n"
 "リストア制御用のオプション:\n"
 
-#: pg_restore.c:661
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
-msgstr "  -a, --data-only          データのみをリストア。スキーマをリストアしない\n"
+msgstr "  -a, --data-only          データのみを復元。スキーマを復元しない\n"
 
-#: pg_restore.c:663
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create             対象のデータベースを作成\n"
 
-#: pg_restore.c:664
+#: pg_restore.c:552
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error      エラー時に終了。デフォルトは継続\n"
 
-#: pg_restore.c:665
-#, c-format
-msgid "  -g, --globals-only           restore only global objects, no databases\n"
-msgstr ""
-"  -g, --globals-only           グローバルオブジェクトのみを復元し、\n"
-"                               データベースを復元しない\n"
-
-#: pg_restore.c:666
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
-msgstr "  -I, --index=NAME         指名したインデックスをリストア\n"
+msgstr "  -I, --index=NAME         指名したインデックスを復元n\n"
 
-#: pg_restore.c:667
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM           リストア時に指定した数の並列ジョブを使用\n"
 
-#: pg_restore.c:668
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -3043,62 +2928,57 @@ msgstr ""
 "  -L, --use-list=FILENAME  このファイルの内容に従って SELECT や\n"
 "                           出力のソートを行います\n"
 
-#: pg_restore.c:670
+#: pg_restore.c:557
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
-msgstr "  -n, --schema=NAME        指定したスキーマのオブジェクトのみをリストア\n"
+msgstr "  -n, --schema=NAME        指定したスキーマのオブジェクトのみを復元\n"
 
-#: pg_restore.c:671
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
-msgstr "  -N, --exclude-schema=NAME    指定したスキーマのオブジェクトはリストアしない\n"
+msgstr "  -N, --exclude-schema=NAME    指定したスキーマのオブジェクトは復元しない\n"
 
-#: pg_restore.c:673
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
-msgstr "  -P, --function=NAME(args)           指名された関数をリストア\n"
+msgstr "  -P, --function=NAME(args)           指名された関数を復元\n"
 
-#: pg_restore.c:674
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
-msgstr "  -s, --schema-only        スキーマのみをリストア。データをリストアしない\n"
+msgstr "  -s, --schema-only        スキーマのみを復元。データを復元しない\n"
 
-#: pg_restore.c:675
+#: pg_restore.c:562
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAME     トリガを無効にするためのスーパーユーザーの名前\n"
 
-#: pg_restore.c:676
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
-msgstr "  -t, --table=NAME             指名したリレーション(テーブル、ビューなど)をリストア\n"
+msgstr "  -t, --table=NAME             指名したリレーション(テーブル、ビューなど)を復元\n"
 
-#: pg_restore.c:677
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
-msgstr "  -T, --trigger=NAME       指名したトリガをリストア\n"
-
-#: pg_restore.c:678
-#, c-format
-msgid "  --exclude-database=PATTERN   exclude databases whose name matches with pattern\n"
-msgstr "  --exclude-database=<パターン> <パターン>に合致する名前のデータベースを除外\n"
+msgstr "  -T, --trigger=NAME       指名したトリガを復元\n"
 
-#: pg_restore.c:679
+#: pg_restore.c:565
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      アクセス権限(grant/revoke)の復元を省略\n"
 
-#: pg_restore.c:680
+#: pg_restore.c:566
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
-msgstr "  -1, --single-transaction     単一のトランザクションとしてリストア\n"
+msgstr "  -1, --single-transaction     リストアを単一トランザクションで実行\n"
 
-#: pg_restore.c:682
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        行セキュリティを有効にします\n"
 
-#: pg_restore.c:683
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -3107,97 +2987,100 @@ msgstr ""
 "  --filter=FILENAME            オブジェクトの復元またはスキップをFILENAMEに\n"
 "                               記述されている式を元に行う\n"
 
-#: pg_restore.c:686
+#: pg_restore.c:572
 #, c-format
 msgid "  --no-comments                do not restore comment commands\n"
-msgstr "  --no-comments                コメントコマンドをリストアしない\n"
+msgstr "  --no-comments                コメントコマンドを復元しない\n"
 
-#: pg_restore.c:687
+#: pg_restore.c:573
 #, c-format
 msgid "  --no-data                    do not restore data\n"
-msgstr "  --no-data                    データをリストアしない\n"
+msgstr "  --no-data                    データを復元しない\n"
 
-#: pg_restore.c:688
+#: pg_restore.c:574
 #, 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    作成できなかったテーッブルのデータはリストア\n"
-"                                 しない\n"
+msgstr "  --no-data-for-failed-tables    作成できなかったテーブルのデータは復元しない\n"
 
-#: pg_restore.c:690
+#: pg_restore.c:576
 #, c-format
 msgid "  --no-policies                do not restore row security policies\n"
-msgstr "  --no-policies                行セキュリティポリシーをリストアしない\n"
+msgstr "  --no-policies                行セキュリティポリシーを復元しない\n"
 
-#: pg_restore.c:691
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
-msgstr "  --no-publications            パブリケーションをリストアしない\n"
+msgstr "  --no-publications            パブリケーションを復元しない\n"
 
-#: pg_restore.c:692
+#: pg_restore.c:578
 #, c-format
 msgid "  --no-schema                  do not restore schema\n"
-msgstr "  --no-schema                  スキーマをリストアしない\n"
+msgstr "  --no-schema                  スキーマを復元しない\n"
 
-#: pg_restore.c:693
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
-msgstr "  --no-security-labels     セキュリティラベルをリストアしない\n"
+msgstr "  --no-security-labels     セキュリティラベルを復元しない\n"
 
-#: pg_restore.c:694
+#: pg_restore.c:580
 #, c-format
 msgid "  --no-statistics              do not restore statistics\n"
-msgstr "  --no-statistics              統計情報をリストアしない\n"
+msgstr "  --no-statistics              統計情報を復元しない\n"
 
-#: pg_restore.c:695
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
-msgstr "  --no-subscriptions           サブスクリプションをリストアしない\n"
+msgstr "  --no-subscriptions           サブスクリプションを復元しない\n"
 
-#: pg_restore.c:696
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
-msgstr "  --no-table-access-method     テーブルアクセスメソッドをリストアしない\n"
+msgstr "  --no-table-access-method     テーブルアクセスメソッドを復元しない\n"
 
-#: pg_restore.c:697
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
-msgstr "  --no-tablespaces         テーブル空間の割り当てをリストアしない\n"
+msgstr "  --no-tablespaces         テーブル空間の割り当てを復元しない\n"
 
-#: pg_restore.c:698
+#: pg_restore.c:585
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
-msgstr "  --section=SECTION        指定されたセクション（データ前部、データ、データ後部）をリストア\n"
+msgstr "  --section=SECTION        指定されたセクション（データ前部、データ、データ後部）を復元\n"
 
-#: pg_restore.c:699
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 統計情報を復元する\n"
+
+#: pg_restore.c:587
 #, c-format
 msgid "  --statistics-only            restore only the statistics, not schema or data\n"
-msgstr "  --statistics-only            統計情報のみをリストア、スキーマまたはデータをリストアしない\n"
+msgstr "  --statistics-only            統計情報のみを復元、スキーマやデータを復元しない\n"
 
-#: pg_restore.c:702
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         Nオブジェクトごとにコミットします\n"
 
-#: pg_restore.c:716
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          リストアに先立って SET ROLE します\n"
 
-#: pg_restore.c:718
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
-"The options -I, -n, -N, -P, -t, -T, --section, and --exclude-database can be combined\n"
-"and specified multiple times to select multiple objects.\n"
+"The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n"
+"multiple times to select multiple objects.\n"
 msgstr ""
 "\n"
-"オプション -I、-n、-N、-P、-t、-T、--section および --exclude-databaseを組み\n"
-"合わせて複数回指定することで複数のオブジェクトを指定できます。\n"
+"オプション -I、-n、-N、-P、-t、-T および --section を組み合わせて複数回\n"
+"指定することで複数のオブジェクトを指定できます。\n"
 
-#: pg_restore.c:721
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
@@ -3208,94 +3091,178 @@ msgstr ""
 "入力ファイル名が指定されない場合、標準入力が使用されます。\n"
 "\n"
 
-#: pg_restore.c:940
-#, c-format
-msgid "considering PATTERN as NAME for --exclude-database option as no db connection while doing pg_restore."
-msgstr "pg_restoreの実行中にDB接続がないため、--exclude-database オプションの<パターン>は<名前>とみなします。"
+#~ msgid "  --exclude-database=PATTERN   do not restore the specified database(s)\n"
+#~ msgstr "  --exclude-database=PATTERN   指定したデータベース(群)を復元しない\n"
 
-#: pg_restore.c:985
-#, c-format
-msgid "database \"%s\" matches exclude pattern: \"%s\""
-msgstr "データベース\"%s\"は除外パターンに合致します: \"%s\""
+#~ msgid "  --with-data                  dump the data\n"
+#~ msgstr "  --with-data                  データをダンプする\n"
 
-#: pg_restore.c:1040
-#, c-format
-msgid "database restoring is skipped as \"map.dat\" is not present in \"%s\""
-msgstr "\"%s\"に \"map.dat\" がないため、データベースの復元をスキップします"
+#~ msgid "  --with-data                  restore the data\n"
+#~ msgstr "  --with-data                  データを復元する\n"
 
-#: pg_restore.c:1069
-#, c-format
-msgid "found database \"%s\" (OID: %u) in \"%s\""
-msgstr "\"%3$s\" 内でデータベース \"%1$s\" (OID: %2$u) を検出しました。"
+#~ msgid "  --with-schema                dump the schema\n"
+#~ msgstr "  --with-schema                スキーマをダンプする\n"
 
-#: pg_restore.c:1074
-#, c-format
-msgid "invalid entry in \"%s\" at line : %d"
-msgstr "\"%s\" 内に不正なエントリ: 行 %d"
+#~ msgid "  --with-schema                restore the schema\n"
+#~ msgstr "  --with-schema                スキーマを復元する\n"
 
-#: pg_restore.c:1123
-#, c-format
-msgid "found %d database names in \"map.dat\""
-msgstr "\"map.dat\" 内に %d 個のデータベースを検出しました"
+#~ msgid "  -g, --globals-only           restore only global objects, no databases\n"
+#~ msgstr ""
+#~ "  -g, --globals-only           グローバルオブジェクトのみを復元し、\n"
+#~ "                               データベースを復元しない\n"
 
-#: pg_restore.c:1127
-#, c-format
-msgid "trying to connect database \"postgres\""
-msgstr "データベース\"postgres\"に接続を試みています"
+#~ msgid "Individual databases can be restored using their specific archives."
+#~ msgstr "各々のデータベースは対応するアーカイブを使って復元できます。"
 
-#: pg_restore.c:1136
-#, c-format
-msgid "trying to connect database \"template1\""
-msgstr "データベース\"template1\"に接続を試みています"
+#~ msgid "considering PATTERN as NAME for --exclude-database option as no database connection while doing pg_restore"
+#~ msgstr "pg_restoreの実行中にデータベース接続がないため、--exclude-database オプションの<パターン>は<名前>とみなします。"
 
-#: pg_restore.c:1160
-#, c-format
-msgid "no database needs to restore out of %d databases"
-msgstr "%d 個のデータベースの中で復元が必要なものはありません"
+#~ msgid "could not execute query: %s"
+#~ msgstr "問い合わせを実行できませんでした: %s"
 
-#: pg_restore.c:1164
-#, c-format
-msgid "need to restore %d databases out of %d databases"
-msgstr "%2$d 個のうち %1$d 個のデータベースの復元が必要です"
+#~ msgid "could not open file: \"%s\""
+#~ msgstr "ファイルを開くことができませんでした: \"%s\""
 
-#: pg_restore.c:1213
-#, c-format
-msgid "restoring database \"%s\""
-msgstr "データベース\"%s\"の復元中"
+#~ msgid "could not write to LOs TOC file: %s"
+#~ msgstr "ラージオブジェクトのTOCファイルに書き出せませんでした: %s"
 
-#: pg_restore.c:1254
-#, c-format
-msgid "errors ignored on database \"%s\" restore: %d"
-msgstr "データベース\"%s\"の復元中に無視されたエラー数: %d"
+#~ msgid "database name \"%s\" matches exclude pattern \"%s\""
+#~ msgstr "データベース名\"%s\"は除外パターン\"%s\"に合致します"
 
-#: pg_restore.c:1261
-#, c-format
-msgid "number of restored databases is %d"
-msgstr "復元されたデータベースの数は %d です"
+#~ msgid "database restoring is skipped because file \"%s\" does not exist in directory \"%s\""
+#~ msgstr "ディレクトリ \"%2$s\" 内にファイル \"%1$s\" がないため、データベースの復元をスキップします"
 
-#: pg_restore.c:1324
-#, c-format
-msgid "executing query: %s"
-msgstr "実行クエリ: %s"
+#~ msgid "database restoring skipped because option -g/--globals-only was specified"
+#~ msgstr "-g/--globals-only オプションが指定されているため、データベースの復元はスキップされました"
 
-#: pg_restore.c:1335
-#, c-format
-msgid ""
-"could not execute query: \"%s\" \n"
-"Command was: \"%s\""
-msgstr ""
-"クエリを実行できませんでした: \"%s\"\n"
-"コマンドは: \"%s\""
+#~ msgid "errors ignored on database \"%s\" restore: %d"
+#~ msgstr "データベース\"%s\"の復元中に無視されたエラー数: %d"
 
-#: pg_restore.c:1342
-#, c-format
-msgid "ignored %d errors in \"%s\""
-msgstr "\"%2$s\" 内のエラー%1$d件を無視しました"
+#~ msgid "executing query: %s"
+#~ msgstr "実行クエリ: %s"
 
-#: pg_restore.c:1373
-#, c-format
-msgid "could not open file: \"%s\""
-msgstr "ファイルを開くことができませんでした: \"%s\""
+#~ msgid "found %d database name in \"%s\""
+#~ msgid_plural "found %d database names in \"%s\""
+#~ msgstr[0] "\"%2$s\" 内に %1$d 個のデータベース名を検出しました"
+
+#~ msgid "found database \"%s\" (OID: %u) in file \"%s\""
+#~ msgstr "ファイル \"%3$s\" 内でデータベース \"%1$s\" (OID: %2$u) を検出しました。"
+
+#~ msgid "ignored %d error in file \"%s\""
+#~ msgid_plural "ignored %d errors in file \"%s\""
+#~ msgstr[0] "ファイル \"%2$s\" 内のエラー%1$d件を無視しました"
+
+#~ msgid "invalid entry in file \"%s\" on line %d"
+#~ msgstr "ファイル\"%s\"の%d行目に不正なエントリ"
+
+#~ msgid "need to restore %d databases out of %d databases"
+#~ msgstr "%2$d 個のうち %1$d 個のデータベースの復元が必要です"
+
+#~ msgid "no database needs restoring out of %d database"
+#~ msgid_plural "no database needs restoring out of %d databases"
+#~ msgstr[0] "%d 個のデータベースの中で復元が必要なものはありません"
+
+#~ msgid "number of restored databases is %d"
+#~ msgstr "復元されたデータベースの数は %d です"
+
+#~ msgid "option --exclude-database can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "オプション --exclude-database はpg_dumpallで作成したアーカイブの復元時のみ使用できます"
+
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only"
+#~ msgstr "オプション --exclude-database は -g/--globals-only と一緒には使用できません"
+
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
+#~ msgstr "--exclude-database オプションは -g/--globals-only、-r/--roles-only もしくは -t/--tablespaces-only と一緒には使用できません"
+
+#~ msgid "option --if-exists requires option -c/--clean"
+#~ msgstr "--if-existsは -c/--clean の指定が必要です"
+
+#~ msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
+#~ msgstr "--on-conflict-do-nothingオプションは--inserts、--rows-per-insert または --column-insertsを必要とします"
+
+#~ msgid "option --restrict-key can only be used with --format=plain"
+#~ msgstr "オプション --restrict-key は --format=plain を指定したときのみ指定可能です"
+
+#~ msgid "option -C/--create must be specified when restoring an archive created by pg_dumpall"
+#~ msgstr "pg_dumpallで作成されたアーカイブを復元する際には、-C/--create オプションの指定が必須です"
+
+#~ msgid "option -F/--format=d|c|t requires option -f/--file"
+#~ msgstr "オプション -F/--format=d|c|t はオプション -f/--file の指定が必要です"
+
+#~ msgid "option -L/--use-list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "オプション-L/--use-list はpg_dumpallで作成されたアーカイブの復元では使用できません"
+
+#~ msgid "option -g/--globals-only can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "オプション -g/--globals-only はpg_dumpallで作成したアーカイブの復元時のみ使用できます"
+
+#~ msgid "option -l/--list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "オプション -l/--list はpg_dumpallで作成されたアーカイブの復元では使用できません"
+
+#~ msgid "options --statistics and --no-statistics cannot be used together"
+#~ msgstr "オプション --statistics と --no-statistics とは同時には使用できません"
+
+#~ msgid "options --statistics-only and --no-statistics cannot be used together"
+#~ msgstr "オプション --statistics-only と --no-statistics とは同時には使用できません"
+
+#~ msgid "options --with-data and --no-data cannot be used together"
+#~ msgstr "--with-data と --no-data オプションは同時には使用できません"
+
+#~ msgid "options --with-schema and --no-schema cannot be used together"
+#~ msgstr "--with-schema と --no-schema オプションは同時には使用できません"
+
+#~ msgid "options --with-statistics and --no-statistics cannot be used together"
+#~ msgstr "オプション --with-statistics と --no-statistics とは同時には使用できません"
+
+#~ msgid "options -1/--single-transaction and --transaction-size cannot be used together"
+#~ msgstr "オプション -1/--single-transaction と --transaction-size とは同時には使用できません"
+
+#~ msgid "options -C/--create and -1/--single-transaction cannot be used together"
+#~ msgstr "オプション-C/--createと-1/--single-transactionとは同時には使用できません"
+
+#~ msgid "options -a/--data-only and --no-data cannot be used together"
+#~ msgstr "-a/--data-only と --no-data オプションは同時には使用できません"
+
+#~ msgid "options -a/--data-only and --statistics-only cannot be used together"
+#~ msgstr "-a/--data-only と --statistics-only オプションは同時には使用できません"
+
+#~ msgid "options -c/--clean and -a/--data-only cannot be used together"
+#~ msgstr "-c/--clean と -a/--data-only オプションは同時には使用できません"
+
+#~ msgid "options -d/--dbname and --restrict-key cannot be used together"
+#~ msgstr "オプション -d/--dbname と --restrict-key は同時に使用できません"
+
+#~ msgid "options -d/--dbname and -f/--file cannot be used together"
+#~ msgstr "オプション-d/--dbnameと-f/--fileは同時に使用できません"
+
+#~ msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
+#~ msgstr "-g/--globals-onlyと-r/--roles-onlyオプションは同時に使用できません"
+
+#~ msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "-g/--globals-onlyと-t/--tablespaces-onlyオプションは同時に使用できません"
+
+#~ msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "-r/--roles-onlyと-t/--tablespaces-onlyオプションは同時に使用できません"
+
+#~ msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
+#~ msgstr "-s/--schema-only と --include-foreign-data オプションは同時には使用できません"
+
+#~ msgid "options -s/--schema-only and --no-schema cannot be used together"
+#~ msgstr "-s/--schema-only と --no-schema オプションは同時には使用できません"
+
+#~ msgid "options -s/--schema-only and --statistics-only cannot be used together"
+#~ msgstr "-s/--schema-only と--statistics-only オプションは同時には使用できません"
+
+#~ msgid "options -s/--schema-only and -a/--data-only cannot be used together"
+#~ msgstr "-s/--schema-only と -a/--data-only オプションは同時には使用できません"
+
+#~ msgid "restoring database \"%s\""
+#~ msgstr "データベース\"%s\"の復元中"
+
+#~ msgid "trying to connect to database \"%s\""
+#~ msgstr "データベース\"%s\"に接続を試みています"
+
+#~ msgid "unhandled mode \"%s\""
+#~ msgstr "処理されないモード \"%s\""
 
-#~ msgid "could not close directory \"%s\": %m"
-#~ msgstr "ディレクトリ\"%s\"をクローズできませんでした: %m"
+#~ msgid "unrecognized output format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\""
+#~ msgstr "認識不能の出力形式\"%s\"; \"c\"、\"d\"、\"p\" または\"t\"を指定してください"
diff --git a/src/bin/pg_dump/po/ka.po b/src/bin/pg_dump/po/ka.po
index c045ae75748..c7f38491b99 100644
--- a/src/bin/pg_dump/po/ka.po
+++ b/src/bin/pg_dump/po/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-05-02 22:21+0000\n"
-"PO-Revision-Date: 2025-05-03 01:26+0200\n"
+"POT-Creation-Date: 2026-01-16 13:52+0000\n"
+"PO-Revision-Date: 2026-01-17 03:40+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
 #: ../../../src/common/logging.c:279
 #, c-format
@@ -39,9 +39,9 @@ msgid "hint: "
 msgstr "მინიშნება: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:108 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "ამ აგებაში %s-ით შეკუმშვის მხარდაჭრა არ არსებობს"
@@ -125,7 +125,7 @@ msgstr "ბრძანებიდან \"%s\" წაკითხვის შ
 msgid "no data was returned by command \"%s\""
 msgstr "ბრძანებამ \"%s\" მონაცემები არ დააბრუნა"
 
-#: ../../common/exec.c:405 parallel.c:1621
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s()-ის შეცდომა: %m"
@@ -167,7 +167,7 @@ msgstr "ფაილი \"%s\" არ არსებობს: %m"
 msgid "this build does not support sync method \"%s\""
 msgstr "ამ აგებას სინქრონიზაციის მეთოდის \"%s\" მხარდაჭერა არ გააჩნია"
 
-#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:905
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "საქაღალდის (%s) გახსნის შეცდომა: %m"
@@ -242,341 +242,371 @@ msgstr "გარსის ბრძანების არგუმენტ
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "მონაცემთა ბაზის სახელი ხაზის გადატანას ან კარეტის დაბრუნებას შეიცავს: \"%s\"\n"
 
-#: common.c:111
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "გაფართოებების წაკითხვა"
 
-#: common.c:114
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "გაფართოების ნომრების იდენტიფიკაცია"
 
-#: common.c:117
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "სქემების კითხვა"
 
-#: common.c:126
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "მომხმარებლის მიერ განსაზღვრული ცხრილების კითხვა"
 
-#: common.c:131
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "მომხმარებლის მიერ განსაზღვრული ფუნქციების კითხვა"
 
-#: common.c:135
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "მომხმარებლის მიერ განსაზღვრული ტიპების კითხვა"
 
-#: common.c:139
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "პროცედურული ენების კითხვა"
 
-#: common.c:142
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "მომხმარებლის მიერ განსაზღვრული აგრეგატული ფუნქციების კითხვა"
 
-#: common.c:145
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "მომხმარებლის მიერ განსაზღვრული ოპერატორების კითხვა"
 
-#: common.c:148
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "მომხმარებლის მიერ განსაზღვრული წვდომის მეთოდების კითხვა"
 
-#: common.c:151
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "მომხმარებლის მიერ განსაზღვრული ოპერატორის კლასების კითხვა"
 
-#: common.c:154
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "მომხმარებლის მიერ განსაზღვრული ოპერატორის ოჯახების კითხვა"
 
-#: common.c:157
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "მომხმარებლის მიერ განსაზღვრული ტექსტის ძებნის დამმუშავებლების კითხვა"
 
-#: common.c:160
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "მომხმარებლის მიერ განსაზღვრული ტექსტის ძებნის შაბლონების კითხვა"
 
-#: common.c:163
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "მომხმარებლის მიერ განსაზღვრული ტექსტის ძებნის ლექსიკონების კითხვა"
 
-#: common.c:166
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "მომხმარებლის მიერ განსაზღვრული ტექსტის ძებნის კონფიგურაციების კითხვა"
 
-#: common.c:169
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "მომხმარებლის მიერ განსაზღვრული გარე მონაცემების გადამტანების კითხვა"
 
-#: common.c:172
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "მომხმარებლის მიერ განსაზღვრული გარე სერვერების კითხვა"
 
-#: common.c:175
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "ნაგულისხმევი წვდომების კითხვა"
 
-#: common.c:178
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "მომხმარებლის მიერ განსაზღვრული კოლაციების კითხვა"
 
-#: common.c:181
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "მომხმარებლის მიერ განსაზღვრული გადაყვანების კითხვა"
 
-#: common.c:184
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "ტიპის კასტების კითხვა"
 
-#: common.c:187
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "გარდაქმნების კითხვა"
 
-#: common.c:190
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "ცხრილების მეკვიდრეობითობის ინფორმაციის კითხვა"
 
-#: common.c:193
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "მოვლენების ტრიგერების კითხვა"
 
-#: common.c:197
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "გაფართოების ცხრილების მოძებნა"
 
-#: common.c:201
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "მემკვიდრეობითი ურთიერთობების მოძებნა"
 
-#: common.c:204
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "საინტერესო ცხრილების სვეტების ინფორმაციის კითხვა"
 
-#: common.c:207
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "ქვეცხრილებში მემკვიდრეობით სვეტებზე ალმის დასმა"
 
-#: common.c:210
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "დანაყოფების მონაცემების კითხვა"
 
-#: common.c:213
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "ინდექსების კითხვა"
 
-#: common.c:216
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "დაყოფილ ცხრილებში ინდექსებზე ალმის დასმა"
 
-#: common.c:219
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "გაფართოებული სტატისტიკის კითხვა"
 
-#: common.c:222
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "შეზღუდვების კითხვა"
 
-#: common.c:225
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "ტრიგერების კითხვა"
 
-#: common.c:228
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "გადაწერის წესების კითხვა"
 
-#: common.c:231
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "წესების კითხვა"
 
-#: common.c:234
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "გამოცემების კითხვა"
 
-#: common.c:237
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "ცხრილების გამოცემის წევრობის კითხვა"
 
-#: common.c:240
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "სქემების გამოცემის წევრობის კითხვა"
 
-#: common.c:243
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "გამოწერების კითხვა"
 
-#: common.c:246
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "ცხრილების გამოწერის წევრობის კითხვა"
 
-#: common.c:309
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "სისწორის შემოწმების შეცდომა. ცხრილის (\"%2$s\", OID %3$u) მშობელი OID (%1$u) არ არსებობს"
 
-#: common.c:351
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "მშობლების არასწორი რაოდენობა %d ცხრილისთვის \"%s\""
 
-#: common.c:1109
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "რიცხვითი მასივის \"%s\" დამუშავების შეცდომა: მეტისმეტად ბევრი რიცხვი"
 
-#: common.c:1121
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "რიცხვითი მასივის \"%s\" დამუშავების შეცდომა: რიცხვში არასწორის სიმბოლოებია"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "შეკუმშვის ბიბლიოთეკის ინიციალიზება ვერ მოხერხდა: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "შეკუმშვის ნაკადის დახურვის შეცდომა: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "მონაცემების შეკუმშვა შეუძლებელია: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "მონაცემების განშლის შეცდომა: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "შეკუმშვის ბიბლიოთეკის დახურვის შეცდომა: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "შეყვანის ფაილების წაკითხვის შეცდომა: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:375 pg_backup_custom.c:650
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "ფაილში ჩაწერის შეცდომა: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "შემოსატანი ფაილის წაკითხვის შეცდომა: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:373 pg_backup_custom.c:648 pg_backup_directory.c:533
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "შეყვანის ფაილების წაკითხვის შეცდომა: ფაილის დასასრული"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "lz4 შეკუმშვის კონტექსტის შექმნის შეცდომა: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "მონაცემების გაშლის შეცდომა: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "lz4 შეკუმშვის კონტექსტის გასუფთავების შეცდომა: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "შეკუმშვის დასრულების შეცდომა: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "lz4-ით შეკუმშვის ინიციალიზაციის შეცდომა: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "LZ4 ბიბლიოთეკის ინიციალიზაცია შეუძლებელია: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "შეცდომა ჩაწერისას: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "შეცდომა ჩაწერისას: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "გამოტანის ფაილში ჩაწერის შეცდომა: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "დეკომპრესიის დასრულების შეცდომა: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "ვერ დავხურე ფაილი: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "ვერ ჩავწერე ფაილში: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "შეკუმშვის პარამეტრის (%s) დაყენების შეცდომა: %s"
 
-#: compress_zstd.c:78 compress_zstd.c:233 compress_zstd.c:492
-#: compress_zstd.c:500
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "შეკუმშვის ბიბლიოთეკის ინიციალიზაციის შეცდომა"
 
-#: compress_zstd.c:196 compress_zstd.c:310
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "მონაცემების გაშლის შეცდომა: %s"
 
-#: compress_zstd.c:503
-#, c-format
-msgid "unhandled mode \"%s\""
-msgstr "დაუმუშავებელი რეჟიმი \"%s\""
-
 #: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
 msgid "Password: "
 msgstr "პაროლი: "
 
-#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:925
-#: pg_dump_sort.c:1251 pg_dump_sort.c:1271
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: connectdb.c:157 pg_dumpall.c:548 pg_restore.c:544
+#: connectdb.c:157 pg_dumpall.c:520
 #, c-format
 msgid "could not connect to database \"%s\""
 msgstr "მონაცემთა ბაზასთან დაკავშირება ვერ მოხერხდა \"%s\""
@@ -601,35 +631,35 @@ msgstr "ოპერაცია გაუქმდა სერვერის
 msgid "server version: %s; %s version: %s"
 msgstr "სერვერის ვერსია: %s; %s ვერსია: %s"
 
-#: connectdb.c:282 pg_dumpall.c:1859
+#: connectdb.c:282 pg_dumpall.c:1790
 #, c-format
 msgid "executing %s"
 msgstr "%s -ის შესრულება"
 
-#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1865
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
 #, c-format
 msgid "query failed: %s"
 msgstr "მოთხოვნის შეცდომა: %s"
 
-#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1866
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
 #, c-format
 msgid "Query was: %s"
 msgstr "მოთხოვნის შინაარსი: %s"
 
-#: dumputils.c:910
+#: dumputils.c:949
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "საქაღალდის (%s) შექმნის შეცდომა: %m"
 
-#: dumputils.c:915
+#: dumputils.c:954
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "საქაღალდის წვდომების შეცვლა შეუძლებელია \"%s\": %m"
 
-#: dumputils.c:920
+#: dumputils.c:959
 #, c-format
 msgid "directory \"%s\" is not empty"
-msgstr "საქაღალდე \"%s\" მაგრამ ცარიელი არაა"
+msgstr "საქაღალდე \"%s\" ცარიელი არაა"
 
 #: filter.c:48
 #, c-format
@@ -651,32 +681,32 @@ msgstr "არასწორი ფორმატი ფილტრში, 
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "არასწორი ფორმატი ფილტრში, რომელიც წავიკითხე ფაილიდან \"%s\", ხაზზე %d: %s"
 
-#: filter.c:240 filter.c:467
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "ფილტრის ფაილიდან \"%s\" წაკითხვა შეუძლებელია: %m"
 
-#: filter.c:243
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "ფაილის მოულოდნელი დასასრული"
 
-#: filter.c:310
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "აკლია ობიექტის სახელის ნიმუში"
 
-#: filter.c:421
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "ფილტრის ბრძანება ვერ ვიპოვე (მოველოდი \"include\" ან \"exclude\")"
 
-#: filter.c:432
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "არასწორი ფილტრის ბრძანება (მოველოდი \"include\" ან \"exclude\")"
 
-#: filter.c:439
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "აკლია ფილტრის ობიექტის ტიპი"
 
-#: filter.c:446
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "მხარდაუჭერელი ფილტრის ობიექტის ტიპი: \"%.*s\""
@@ -686,27 +716,27 @@ msgstr "მხარდაუჭერელი ფილტრის ობი
 msgid "%s() failed: error code %d"
 msgstr "%s() -ის შეცდომა: შეცდომის კოდი: %d"
 
-#: parallel.c:971
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "საკომუნიკაციო არხების შექმნა ვერ მოხერხდა: %m"
 
-#: parallel.c:1028
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "დამხმარე პროცესის შექმნა შეუძლებელია: %m"
 
-#: parallel.c:1158
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "თავსართიდან მიღებული ბრძანება უცნობია: %s"
 
-#: parallel.c:1201 parallel.c:1439
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "დამხმარე პროცესისგან მიღებულია არასწორი შეტყობინება: %s"
 
-#: parallel.c:1333
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -715,52 +745,52 @@ msgstr ""
 "ურთიერთობის (\"%s\") დაბლოკვის შეცდომა\n"
 "ეს ჩვეულებრივ ნიშნავს, რომ ვინმემ მოითხოვა ACCESS EXCLUSIVE ბლოკი ცხრილზე მას შემდეგ, რაც pg_dump-ის მშობელმა პროცესმა საწყისი ACCESS SHARE ბლოკი ცხრილზე უკვე მიიღო."
 
-#: parallel.c:1422
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "დამხმარე პროტოკოლის პროცესი მოულოდნელად მოკვდა"
 
-#: parallel.c:1544 parallel.c:1662
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "საკომუნიკაციო არხში ჩაწერის შეცდომა: %m"
 
-#: parallel.c:1746
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: სოკეტის შექმნის შეცდომა. შეცდომის კოდი: %d"
 
-#: parallel.c:1757
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: მიბმის შეცდომა: შეცდომის კოდი: %d"
 
-#: parallel.c:1764
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: მოსმენის შეცდომა: შეცდომის კოდი: %d"
 
-#: parallel.c:1771
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s() -ის შეცდომა: შეცდომის კოდი %d"
 
-#: parallel.c:1782
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: მეორე სოკეტის შექნა შეუძლებელია: შეცდომის კოდი: %d"
 
-#: parallel.c:1791
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: სოკეტთან მიერთების შეცდომა: შეცდომის კოდი %d"
 
-#: parallel.c:1800
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: შეერთების დადასტურება შეუძლებელია: შეცდომის კოდი %d"
 
-#: pg_backup_archiver.c:269 pg_backup_archiver.c:1732
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "გამოტანის ფაილის დახურვის შეცდომა: %m"
@@ -775,442 +805,442 @@ msgstr "არქივის ჩანაწერების მიმდე
 msgid "unexpected section code %d"
 msgstr "სექციის მოულოდნელი კოდი %d"
 
-#: pg_backup_archiver.c:365
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "არქივის ფაილის ამ ფორმატზე პარალელური აღდგენა მხარდაჭერილი არაა"
 
-#: pg_backup_archiver.c:369
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "არქივის ფაილზე, რომელიც 8.0 pg_dump-ით ან უფრო ძველით შეიქმნა, პარალელური აღდგენა მხარდაჭერილი არაა"
 
-#: pg_backup_archiver.c:390
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "შეკუმშული არქივიდან (%s) აღდგენა შეუძლებელია"
 
-#: pg_backup_archiver.c:410
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "მონაცემთა ბაზასთან დაკავშირება აღდგენისთვის"
 
-#: pg_backup_archiver.c:412
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "ბაზასთან პირდაპირი შეერთება 1.3 ან უფრო ძველ არქივებში მხარდაჭერილი არაა"
 
-#: pg_backup_archiver.c:455
+#: pg_backup_archiver.c:450
 #, c-format
 msgid "implied no-schema restore"
-msgstr "სავარაუდო no-schema აღდგენა"
+msgstr "სავარაუდო no-schema-ის აღდგენა"
 
-#: pg_backup_archiver.c:523
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "მოცილება %s %s"
 
-#: pg_backup_archiver.c:655
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "ვერ ვიპოვე, ოპერაციაში \"%s\" IF EXISTS სად უნდა ჩავსვა"
 
-#: pg_backup_archiver.c:841 pg_backup_archiver.c:843
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "გაფრთხილება საწყისი გამოტანილი ფაილიდან: %s"
 
-#: pg_backup_archiver.c:877
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "იქმნება %s \"%s.%s\""
 
-#: pg_backup_archiver.c:880
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "იქმნება %s \"%s\""
 
-#: pg_backup_archiver.c:930
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "ახალ ბაზასთან მიერთება \"%s\""
 
-#: pg_backup_archiver.c:957
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "დამუშავება %s"
 
-#: pg_backup_archiver.c:979
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "მონაცემების დამუშავება ცხრილისთვის \"%s.%s\""
 
-#: pg_backup_archiver.c:1049
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "შესრულება %s %s"
 
-#: pg_backup_archiver.c:1118
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "%s-სთვის ტრიგერების გამორთვა"
 
-#: pg_backup_archiver.c:1144
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "%s-სთვის ტრიგერების ჩართვა"
 
-#: pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "შიდა შეცდომა -- WriteData-ს DataDumper-ის ქვეპროგრამის კონტექსტის გარეთ ვერ გამოიძახებთ"
 
-#: pg_backup_archiver.c:1404
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "არჩეულ ფორმატს დიდი ობიექტების გამოტანის საშუალება არ გააჩნია"
 
-#: pg_backup_archiver.c:1467
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "აღდგენილია %d დიდი ობიექტი"
 msgstr[1] "აღდგენილია %d დიდი ობიექტი"
 
-#: pg_backup_archiver.c:1494 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "მიმდინარეობს დიდი ობიექტის აღდგენა OID-ით: %u"
 
-#: pg_backup_archiver.c:1506
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "დიდი ობიექტის (%u) შექმნის შეცდომა: %s"
 
-#: pg_backup_archiver.c:1511 pg_dump.c:4063
+#: pg_backup_archiver.c:1525 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "დიდი ობიექტის (%u) გახსნის შეცდომა: %s"
 
-#: pg_backup_archiver.c:1567
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
-msgstr "\"TOC\" ფაილის (%s) გახსნის შეცდომა: %m"
+msgstr "TOC ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: pg_backup_archiver.c:1595
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "ხაზი გამოტოვებულია: %s"
 
-#: pg_backup_archiver.c:1602 pg_backup_db.c:548
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "ჩანაწერი ID-ით %d არ არსებობს"
 
-#: pg_backup_archiver.c:1625 pg_backup_directory.c:187
-#: pg_backup_directory.c:581
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
-msgstr "\"TOC\" ფაილის დახურვის შეცდომა: %m"
+msgstr "TOC ფაილის დახურვის შეცდომა: %m"
 
-#: pg_backup_archiver.c:1713 pg_backup_custom.c:151 pg_backup_directory.c:301
-#: pg_backup_directory.c:568 pg_backup_directory.c:634
-#: pg_backup_directory.c:652 pg_dumpall.c:530
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "გამოტანის ფაილის (\"%s\") გახსნის შეცდომა: %m"
 
-#: pg_backup_archiver.c:1715 pg_backup_custom.c:157
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "გამოტანის ფაილის გახსნის შეცდომა: %m"
 
-#: pg_backup_archiver.c:1798
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "ჩაწერილია დიდი ობიექტის მონაცემების %zu ბაიტი (შედეგი = %d)"
 msgstr[1] "ჩაწერილია დიდი ობიექტის მონაცემების %zu ბაიტი (შედეგი = %d)"
 
-#: pg_backup_archiver.c:1804
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "დიდი ობიექტის ჩაწერის შეცდომა: %s"
 
-#: pg_backup_archiver.c:1894
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
-msgstr "\"INITIALIZING\"-ის დროს:"
+msgstr "INITIALIZING-ის დროს:"
 
-#: pg_backup_archiver.c:1899
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
-msgstr "\"PROCESSING TOC\"-ის დროს:"
+msgstr "PROCESSING TOC-ის დროს:"
 
-#: pg_backup_archiver.c:1904
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
-msgstr "\"FINALIZING\"-ის დროს:"
+msgstr "FINALIZING-ის დროს:"
 
-#: pg_backup_archiver.c:1909
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "შინაარსის ჩანაწერიდან %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1985
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "არასწორი dumpId"
 
-#: pg_backup_archiver.c:2006
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "ცხრილის არასწორი dumpId-ი TABLE DATA ელემენტისთვის"
 
-#: pg_backup_archiver.c:2098
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "მონაცემების წანაცვლების მოულოდნელი ალამი: %d"
 
-#: pg_backup_archiver.c:2111
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "გამოტანილ ფაილში ფაილის წანაცვლება ძალიან დიდია"
 
-#: pg_backup_archiver.c:2222 pg_restore.c:847
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "საქაღალდის სახელი ძალიან გრძელია : \"%s\""
 
-#: pg_backup_archiver.c:2272
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "საქაღალდე \"%s\" სწორ არქივს არ ჰგავს (\"toc.dat\" არ არსებობს)"
 
-#: pg_backup_archiver.c:2280 pg_backup_custom.c:168 pg_backup_custom.c:813
-#: pg_backup_directory.c:172 pg_backup_directory.c:364
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "შეყვანის ფაილის (\"%s\") გახსნის შეცდომა: %m"
 
-#: pg_backup_archiver.c:2287 pg_backup_custom.c:174
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "შეყვანის ფაილის გახსნის შეცდომა: %m"
 
-#: pg_backup_archiver.c:2293
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "შემოსატანი ფაილის წაკითხვის შეცდომა: %m"
 
-#: pg_backup_archiver.c:2295
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "შეყვანის ფაილი ძალიან მოკლეა (წავიკითხე %lu, მოსალოდნელია 5)"
 
-#: pg_backup_archiver.c:2327
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "შეყვანის ფაილი, როგორც ჩანს, არის ტექსტის ფორმატის დამპია. გთხოვთ გამოიყენოთ psql."
 
-#: pg_backup_archiver.c:2333
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "შეყვანილი ფაილი სწორ არქივს არ ჰგავს (ძალიან მოკლეა)"
 
-#: pg_backup_archiver.c:2339
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "შეყვანის ფაილი სწორ არქივს არ ჰგავს"
 
-#: pg_backup_archiver.c:2348
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "შეყვანის ფაილის დახურვის შეცდომა: %m"
 
-#: pg_backup_archiver.c:2427
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "stdout-ის ბოლოში მისაწერად გახსნა შეუძლებელია: %m"
 
-#: pg_backup_archiver.c:2472
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "ფაილის უცნობი ფორმატი \"%d\""
 
-#: pg_backup_archiver.c:2553 pg_backup_archiver.c:4774
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "დასრულებული ელემენტი %d %s %s"
 
-#: pg_backup_archiver.c:2557 pg_backup_archiver.c:4787
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "დამხმარე პროცესის შეცდომა: გამოსვლის კოდი %d"
 
-#: pg_backup_archiver.c:2655
+#: pg_backup_archiver.c:2668
 #, c-format
 msgid "unexpected TOC entry in WriteToc(): %d %s %s"
 msgstr "მოულოდნელი TOC-ის ჩანაწერი ფუნქციაში WriteToc(): %d %s %s"
 
-#: pg_backup_archiver.c:2659 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
 #: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
 #: pg_backup_tar.c:1034
 #, c-format
 msgid "error during file seek: %m"
 msgstr "ფაილში გადახვევის პრობლემა: %m"
 
-#: pg_backup_archiver.c:2717
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "ელემენტის ID %d დიაპაზონს გარეთაა -- შეიძლება სარჩევი დაზიანებულია"
 
-#: pg_backup_archiver.c:2800
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "ცხრილების, აღწერილი WITH OIDS -ით, აღდგენა მხარდაჭერილი აღარაა"
 
-#: pg_backup_archiver.c:2882
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "უცნობი კოდირება \"%s\""
 
-#: pg_backup_archiver.c:2888
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
-msgstr "არასწორი ჩანაწერი \"ENCODING\": %s"
+msgstr "არასწორი ელემენტი \"ENCODING\": %s"
 
-#: pg_backup_archiver.c:2906
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
-msgstr "არასწორი ჩანაწერი \"STDSTRINGS\": %s"
+msgstr "არასწორი ელემენტი \"STDSTRINGS\": %s"
 
-#: pg_backup_archiver.c:2931
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "სქემა \"%s\" არ არსებობს"
 
-#: pg_backup_archiver.c:2938
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "ცხრილი %s არ არსებობს"
 
-#: pg_backup_archiver.c:2945
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "ინდექსი %s არ არსებობს"
 
-#: pg_backup_archiver.c:2952
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "ფუნქცია %s არ არსებობს"
 
-#: pg_backup_archiver.c:2959
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "ტრიგერი %s არ არსებობს"
 
-#: pg_backup_archiver.c:3420
+#: pg_backup_archiver.c:3469
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "სესიის მომხმარებლის %s-ზე დაყენების შეცდომა: %s"
 
-#: pg_backup_archiver.c:3552
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "\"session_path\"-ის %s-ზე დაყენების შეცდომა: %s"
 
-#: pg_backup_archiver.c:3613
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
-msgstr "\"default_tablespace\"-ის %s-ზე დაყენების შეცდომა: %s"
+msgstr "default_tablespace-ის %s-ზე დაყენების შეცდომა: %s"
 
-#: pg_backup_archiver.c:3662
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
-msgstr "\"default_table_access_method\"-ის დაყენების შეცდომა: %s"
+msgstr "default_table_access_method-ის დაყენების შეცდომა: %s"
 
-#: pg_backup_archiver.c:3711
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "ცხრილის წვდომის მეთოდის შეცვლა შეუძლებელია: %s"
 
-#: pg_backup_archiver.c:3812
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "არ ვიცი, როგორ დავაყენო ობიექტის მოცემული ტიპის (%s) მფლობელი"
 
-#: pg_backup_archiver.c:3947
+#: pg_backup_archiver.c:4006
 #, c-format
 msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
 msgstr "მოულოდნელი TOC ჩანაწერი ფუნქციაში _printTocEntry(): %d %s %s"
 
-#: pg_backup_archiver.c:4131
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "ფაილის თავსართში მაგიური სტრიქონი ნაპოვნი არაა"
 
-#: pg_backup_archiver.c:4145
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "ფაილის თავსართში არსებული ვერსია (%d.%d) მხარდაუჭერელია"
 
-#: pg_backup_archiver.c:4150
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "მთელი რიცხვის ზომის (%lu) სისწორის შემოწმების შეცდომა"
 
-#: pg_backup_archiver.c:4154
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "არქივი შეიქმნა მანქანაზე, სადაც მთელი რიცხვი უფრო დიდია. ზოგიერთი ოპერაცია შეიძლება შეცდომით დასრულდეს"
 
-#: pg_backup_archiver.c:4164
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "მოსალოდნელი ფორმატი (%d) განსხვავდება ფაილის ფორმატისგან (%d)"
 
-#: pg_backup_archiver.c:4186
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "არქივი შეკუმშულია, მაგრამ ამ ვერსიას შეკუმშვის(%s) მხარდაჭერა არ გააჩნია -- მონაცემები მიუწვდომელი იქნება"
 
-#: pg_backup_archiver.c:4222
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "თავსართში არსებული შექმნის დრო არასწორია"
 
-#: pg_backup_archiver.c:4356
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "მუშავდება ელემენტი %d %s %s"
 
-#: pg_backup_archiver.c:4441
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "მთავარი პარალელური მარყუჟის დასაწყისი"
 
-#: pg_backup_archiver.c:4452
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "ელემენტის გამოტოვება %d %s %s"
 
-#: pg_backup_archiver.c:4461
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "ელემენტის გაშვება %d %s %s"
 
-#: pg_backup_archiver.c:4515
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "მთავარი პარალელური მარყუჟის დასასრული"
 
-#: pg_backup_archiver.c:4551
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "გამორჩენილი ჩანაწერის დამუშავება %d %s %s"
 
-#: pg_backup_archiver.c:5093
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "ცხრილის (%s) შექმნა შეუძლებელია. მონაცემების აღდგენა არ მოხდება"
@@ -1289,7 +1319,7 @@ msgstr "შემკუმშველი აქტიურია"
 #: pg_backup_db.c:41
 #, c-format
 msgid "could not get \"server_version\" from libpq"
-msgstr "libpq-დან \"server_version\"-ის მიღება შეუძლებელია"
+msgstr "libpq-დან \"server_version\"-ის მიღების შეცდომა"
 
 #: pg_backup_db.c:118
 #, c-format
@@ -1315,19 +1345,19 @@ msgstr "მოთხოვნის შესრულების შეცდ
 #: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
-msgstr "\"PQputCopyData\"-ის მიერ დაბრუნებული შეცდომა: %s"
+msgstr "PQputCopyData-ის მიერ დაბრუნებული შეცდომა: %s"
 
 #: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
-msgstr "\"PQputCopyEnd\"-ის მიერ დაბრუნებული შეცდომა: %s"
+msgstr "PQputCopyEnd-ის მიერ დაბრუნებული შეცდომა: %s"
 
 #: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY-ის შეცდომა ცხრილისთვის \"%s\": %s"
 
-#: pg_backup_db.c:460 pg_dump.c:2439
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "მოულოდნელი დამატებითი შედეგები COPY-ის დროს ცხრილისთვის \"%s\""
@@ -1345,58 +1375,47 @@ msgstr "ბაზის ტრანზაქციის გადაცემ
 msgid "no output directory specified"
 msgstr "გამოტანის საქაღალდე მითითებული არაა"
 
-#: pg_backup_directory.c:325 pg_backup_directory.c:474
-#: pg_backup_directory.c:512
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "გამოსატან ფაილში ჩაწერის შეცდომა: %s"
-
-#: pg_backup_directory.c:343
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "მონაცემების ფაილის დახურვის შეცდომა: %m"
 
-#: pg_backup_directory.c:376
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "მონაცემების ფაილის (%s) დახურვის შეცდომა: %m"
 
-#: pg_backup_directory.c:423
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "დიდი ობიექტის სარჩევის ფაილის %s წასაკითხად გახსნის შეცდომა: %m"
 
-#: pg_backup_directory.c:434
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "არასწორი ხაზი დიდი ობიექტის ცხრილის ფაილში \"%s\": %s"
 
-#: pg_backup_directory.c:443
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "დიდი ობიექტის სარჩევის ფაილის წაკითხვის შეცდომა: %s"
 
-#: pg_backup_directory.c:447
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "დიდი ობიექტის სარჩევის ფაილის (%s) დახურვის შეცდომა: %m"
 
-#: pg_backup_directory.c:670
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
-msgstr "'LO' მონაცემების ფაილის დახურვის შეცდომა: %m"
-
-#: pg_backup_directory.c:680
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "'LO'-ების სარჩევის ფაილში ჩაწერა შეუძლებელია: %s"
+msgstr "LO-ის მონაცემების ფაილის დახურვის შეცდომა: %m"
 
-#: pg_backup_directory.c:696
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
-msgstr "'LO'-ის სარჩევის ფაილის დახურვის შეცდომა: %m"
+msgstr "LO-ებისის TOC ფაილის დახურვის შეცდომა: %m"
 
-#: pg_backup_directory.c:715
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "%s: ფაილის სახელი ძალიან გრძელია"
@@ -1445,7 +1464,7 @@ msgstr "დროებითი ფაილის სახელის გე
 #: pg_backup_tar.c:619
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\""
-msgstr "\"COPY ოპერატორის მოულოდნელი სინტაქსი: %s"
+msgstr "COPY ოპერატორის მოულოდნელი სინტაქსი: %s"
 
 #: pg_backup_tar.c:903
 #, c-format
@@ -1489,10 +1508,10 @@ msgstr "%s-ში ნაპოვნია დაზიანებული თ
 msgid "unrecognized section name: \"%s\""
 msgstr "სექციის უცნობი სახელი: %s"
 
-#: pg_backup_utils.c:57 pg_dump.c:803 pg_dump.c:820 pg_dumpall.c:385
-#: pg_dumpall.c:395 pg_dumpall.c:403 pg_dumpall.c:411 pg_dumpall.c:418
-#: pg_dumpall.c:428 pg_dumpall.c:443 pg_dumpall.c:564 pg_restore.c:361
-#: pg_restore.c:377 pg_restore.c:388 pg_restore.c:398 pg_restore.c:527
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'."
@@ -1502,141 +1521,112 @@ msgstr "მეტი ინფორმაციისთვის სცად
 msgid "out of on_exit_nicely slots"
 msgstr "on_exit_nicely ტიპის სლოტები აღარ დარჩა"
 
-#: pg_dump.c:818 pg_dumpall.c:393 pg_restore.c:375
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "მეტისმეტად ბევრი ბრძანების-სტრიქონის არგუმენტი (პირველია \"%s\")"
 
-#: pg_dump.c:830 pg_restore.c:406
-#, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "პარამეტრებს -s/--schema-only და -a/--data-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dump.c:832 pg_restore.c:408
-#, c-format
-msgid "options -s/--schema-only and --statistics-only cannot be used together"
-msgstr "პარამეტრებს -s/--schema-only და --statistics-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dump.c:834 pg_restore.c:410
-#, c-format
-msgid "options -a/--data-only and --statistics-only cannot be used together"
-msgstr "პარამეტრებს -a/--data-only და --statistics-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dump.c:838 pg_restore.c:414
-#, c-format
-msgid "options -a/--data-only and --no-data cannot be used together"
-msgstr "პარამეტრებს -a/--data-only და --no-data ერთად ვერ გამოიყენებთ"
-
-#: pg_dump.c:840 pg_restore.c:416
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
 #, c-format
-msgid "options -s/--schema-only and --no-schema cannot be used together"
-msgstr "პარამეტრებს -s/--schema-only და --no-schema ერთად ვერ გამოიყენებთ"
+msgid "options %s and %s cannot be used together"
+msgstr "პარამეტრებს %s და -%s ერთად ვერ გამოიყენებთ"
 
-#: pg_dump.c:842 pg_restore.c:418
+#: pg_dump.c:865
 #, c-format
-msgid "options --statistics-only and --no-statistics cannot be used together"
-msgstr "პარამეტრებს --statistics-only და --no-statistics ერთად ვერ გამოიყენებთ"
+msgid "option %s is not supported with parallel backup"
+msgstr "პარამეტრი %s მხარდაუჭერელია პარალელური მარქაფისას"
 
-#: pg_dump.c:846 pg_restore.c:422
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "options --with-data and --no-data cannot be used together"
-msgstr "პარამეტრებს --with-data და --no-data ერთად ვერ გამოიყენებთ"
+msgid "option %s requires option %s"
+msgstr "პარამეტრს %s სჭირდება პარამეტრი %s"
 
-#: pg_dump.c:848 pg_restore.c:424
+#: pg_dump.c:894
 #, c-format
-msgid "options --with-schema and --no-schema cannot be used together"
-msgstr "პარამეტრებს --with-schema და --no-schema ერთად ვერ გამოიყენებთ"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "პარამეტრს %s პარამეტრი %s, %s, ან %s"
 
-#: pg_dump.c:850 pg_restore.c:426
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options --with-statistics and --no-statistics cannot be used together"
-msgstr "პარამეტრებს --with-statistics და --no-statistics ერთად ვერ გამოიყენებთ"
+msgid "could not generate restrict key"
+msgstr "შეზღუდვის გასაღების გენერაცია შეუძლებელია"
 
-#: pg_dump.c:853
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "პარამეტრებს -s/--schema-only და --include-foreign-data ერთად ვერ გამოიყენებთ"
+msgid "invalid restrict key"
+msgstr "არასწორი შეზღუდვის გასაღები"
 
-#: pg_dump.c:856
+#: pg_dump.c:917
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "პარამეტრი --include-foreign-data მხარდაუჭერელია პარალელური მარქაფისას"
+msgid "option %s can only be used with %s"
+msgstr "პარამეტრს %s გამოიყენებთ, მხოლოდ, პარამეტრთან %s ერთად"
 
-#: pg_dump.c:859 pg_restore.c:429
-#, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "პარამეტრებს -c/--clean და -a/--data-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dump.c:862 pg_dumpall.c:423 pg_restore.c:472
-#, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "--if-exists -ს -c/--clean პარამეტრი ესაჭიროება"
-
-#: pg_dump.c:884
-#, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "--on-conflict-do-nothing -ს --inserts, --rows-per-insert ან --column-inserts ესაჭიროება"
-
-#: pg_dump.c:913
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "შეკუმშვის უცხო ალგორითმი: \"%s\""
 
-#: pg_dump.c:920
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "შეკუმშვის არასწორი სპეციფიკაცია: %s"
 
-#: pg_dump.c:933
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "შეკუმშვის პარამეტრი \"%s\"-ი pg_dump-ის მიერ ამჟამად მხარდაჭერილი არაა"
 
-#: pg_dump.c:945
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "პარალელური მარქაფი მხოლოდ საქაღალდის რეჟიმშია მხარდაჭერილი"
 
-#: pg_dump.c:991
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "ბოლო ჩაშენებული OID %u"
 
-#: pg_dump.c:1000
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "შესაბამისი სქემები ნაპოვნი არაა"
 
-#: pg_dump.c:1017
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "შესაბამისი ცხრილები ნაპოვნი არაა"
 
-#: pg_dump.c:1045
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "შესაბამისი გაფართოებები ნაპოვნი არაა"
 
-#: pg_dump.c:1238
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s მონაცემთა ბაზას გამოიტანს, როგორც ტექსტურ ფაილს ან სხვა ფორმატებს.\n"
+"%s გაიტანს PostgreSQL მონაცემთა ბაზას SQL სკრიპტის ან სხვა ფორმატის სახით.\n"
 "\n"
 
-#: pg_dump.c:1239 pg_dumpall.c:699 pg_restore.c:657
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "გამოყენება:\n"
 
-#: pg_dump.c:1240
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [პარამეტრი]... [ბაზისსახელი]\n"
 
-#: pg_dump.c:1242 pg_dumpall.c:702 pg_restore.c:660
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1645,12 +1635,12 @@ msgstr ""
 "\n"
 "ზოგადი პარამეტრები:\n"
 
-#: pg_dump.c:1243
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=FILENAME          გამოტანის ფაილის სახელი\n"
 
-#: pg_dump.c:1244 pg_dumpall.c:704
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1659,22 +1649,22 @@ msgstr ""
 "  -F, --format=c|d|t|p         გამოტანის ფაილის ფორმატი (custom, directory, tar\n"
 "                               უბრალო ტექსტი (ნაგულისხმევი))\n"
 
-#: pg_dump.c:1246
+#: pg_dump.c:1274
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               მითითებული რაოდენობის პარალელური დავალების გაშვება\n"
 
-#: pg_dump.c:1247 pg_dumpall.c:706
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                   დამატებითი ინფორმაციის გამოტანა\n"
 
-#: pg_dump.c:1248 pg_dumpall.c:707
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
 
-#: pg_dump.c:1249
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1683,27 +1673,27 @@ msgstr ""
 "  -Z, --compress=მეთოდი[:წვრილმანი]\n"
 "                         შეკუმშვის მითითება\n"
 
-#: pg_dump.c:1251 pg_dumpall.c:708
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=TIMEOUT  ცხრილის დაბლოკვისას TIMEOUT ის შემდეგ შეცდომის გამოგდება\n"
 
-#: pg_dump.c:1252 pg_dumpall.c:740
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr "            --no-sync             არ დაველოდო ცვლილებების დისკზე უსაფრთხოდ ჩაწერას\n"
 
-#: pg_dump.c:1253
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "      --sync-method=მეთოდი          ფაილების დისკზე სინქრონიზაციის მეთოდის დაყენება\n"
 
-#: pg_dump.c:1254 pg_dumpall.c:709
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help     ამ დახმარების ჩვენება და გასვლა\n"
 
-#: pg_dump.c:1256 pg_dumpall.c:710
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1712,62 +1702,62 @@ msgstr ""
 "\n"
 "პარამეტრები, რომლებიც აკონტროლებენ გამოტანას:\n"
 
-#: pg_dump.c:1257 pg_dumpall.c:711
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, c-format
 msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
 msgstr "  -a, --data-only              მოხდება, მხოლოდ, მონაცემების დამპი, მაგრამ არა სქემის ან სტატისტიკის\n"
 
-#: pg_dump.c:1258
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects                  გამოტანილი იქნება დიდი ობიექტებიც\n"
 
-#: pg_dump.c:1259
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (იგივე, რაც--large-objects, რომელიც მოძველებულია)\n"
 
-#: pg_dump.c:1260
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects               დიდი ობიექტები გამოტანილი არ იქნება\n"
 
-#: pg_dump.c:1261
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (იგივე, რაც --no-large-objects, რომელიც მოძველებულია)\n"
 
-#: pg_dump.c:1262 pg_restore.c:671
+#: pg_dump.c:1290 pg_restore.c:550
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                  ბაზის ობიექტების წაშლა თავიდან შექმნამდე\n"
 
-#: pg_dump.c:1263
+#: pg_dump.c:1291
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr "  -C, --create                 გამოტანილში ბაზის შექმნის ბრძანებების მიყოლება\n"
 
-#: pg_dump.c:1264
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=PATTERN      მხოლოდ მითითებული გაფართოებების გამოტანა\n"
 
-#: pg_dump.c:1265 pg_dumpall.c:713
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=ENCODING      მხოლოდ მითითებული კოდირების მქონე მონაცემების გამოტანა\n"
 
-#: pg_dump.c:1266
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=PATTERN         მხოლოდ მითითებული სქემების გამოტანა\n"
 
-#: pg_dump.c:1267
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=PATTERN მითითებული სქემები გამოტანილი არ იქნება\n"
 
-#: pg_dump.c:1268
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1776,52 +1766,52 @@ msgstr ""
 "  -O, --no-owner               უბრალო ტექსტურ ფორმატში ობიექტების მფლობელობის \n"
 "                               აღდგენის გამოტოვება\n"
 
-#: pg_dump.c:1270 pg_dumpall.c:717
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, c-format
 msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
 msgstr "  -s, --schema-only            მოხდება, მხოლოდ, სქემის დამპი, მაგრამ არა მონაცემების ან სტატისტიკის\n"
 
-#: pg_dump.c:1271
+#: pg_dump.c:1299
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME         უბრალო ტექსტურ ფაილში გამოტანისას გამოყენებული ზემომხმარებლის სახელი\n"
 
-#: pg_dump.c:1272
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=შაბლონი          მხოლოდ მითითებული ცხრილების დამპი\n"
 
-#: pg_dump.c:1273
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=PATTERN  მითითებული ცხრილები გამოტანილი არ იქნება\n"
 
-#: pg_dump.c:1274 pg_dumpall.c:720
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          პრივილეგიები (dump/revoke) გამოტანილი არ იქნება\n"
 
-#: pg_dump.c:1275 pg_dumpall.c:721
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             გამოიყენება მხოლოდ განახლების პროგრამების მიერ\n"
 
-#: pg_dump.c:1276 pg_dumpall.c:722
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts             მონაცემების დამპი ისე, როგორც ბრძანება INSERT, სვეტების სახელებით\n"
 
-#: pg_dump.c:1277 pg_dumpall.c:723
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr "  --disable-dollar-quoting     დოლარით ციტირების გამორთვა. სტანდარტული SQL ციტირების გამოყენება\n"
 
-#: pg_dump.c:1278 pg_dumpall.c:724 pg_restore.c:689
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr "  --disable-triggers           მხოლოდ მონაცემების აღდგენისას ტრიგერების გამორთვა\n"
 
-#: pg_dump.c:1279
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1830,12 +1820,12 @@ msgstr ""
 "  --enable-row-security        მწკრივების უსაფრთხოების ჩართვა (მხოლოდ იმ მონაცემების დამპი, \n"
 "                               რაზეც მომხმარებელს წვდომა გააჩნია)\n"
 
-#: pg_dump.c:1281
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=PATTERN  მითითებული გაფართოებ(ებ)-ი გამოტანილი *არ* იქნება\n"
 
-#: pg_dump.c:1282
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1846,12 +1836,12 @@ msgstr ""
 "                              მითითებული ცხრილები დამპში არ იქნება,\n"
 "                               შვილი და დაყოფილი ცხრილების ჩათვლით\n"
 
-#: pg_dump.c:1285
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  -T, --exclude-table=შაბლონი  შაბლონით მითითებული ცხრილები\n"
 
-#: pg_dump.c:1286
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1862,12 +1852,12 @@ msgstr ""
 "                              მითითებული ცხრილების მონაცემები დამპში არ იქნება,\n"
 "                               შვილი და დაყოფილი ცხრილების ჩათვლით\n"
 
-#: pg_dump.c:1289 pg_dumpall.c:726
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM     extra_float_digits-ის ნაგულისხმევი პარამეტრის გადაფარვა\n"
 
-#: pg_dump.c:1290
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
@@ -1876,12 +1866,12 @@ msgstr ""
 "  --filter=ფაილისსახელი            დამპიდან ობიექტების და მონაცემების, რომლებიც ემთხვევა მითითებულ\n"
 "                               ფაილისსახელში მყოფ გამოსახულებას, ამოღება ან ჩასმა\n"
 
-#: pg_dump.c:1292 pg_dumpall.c:728 pg_restore.c:694
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  ობიექტების გადაყრისას IF EXISTS -ის გამოყენება\n"
 
-#: pg_dump.c:1293
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1892,117 +1882,127 @@ msgstr ""
 "                               მონაცემების ჩასმა უცხო სერვერებზე მდებარე , უცხო ცხრილებიდან, რომლებიც\n"
 "                               შაბლონს ემთხვევა\n"
 
-#: pg_dump.c:1296 pg_dumpall.c:729
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    მონაცემების დამპი INSERT ბრძანებების მსგავსად, COPY-ის მაგიერ\n"
 
-#: pg_dump.c:1297 pg_dumpall.c:730
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    დანაყოფების root ცხრილს გავლით ჩატვირთვა\n"
 
-#: pg_dump.c:1298 pg_dumpall.c:731
+#: pg_dump.c:1326 pg_dumpall.c:730
 #, c-format
 msgid "  --no-comments                do not dump comment commands\n"
 msgstr "  --no-comments                კომენტარის ბრძანებების დამპი არ მოხდება\n"
 
-#: pg_dump.c:1299 pg_dumpall.c:732
+#: pg_dump.c:1327 pg_dumpall.c:731
 #, c-format
 msgid "  --no-data                    do not dump data\n"
 msgstr "  --no-data                    მონაცემების დამპი არ მოხდება\n"
 
-#: pg_dump.c:1300 pg_dumpall.c:733
+#: pg_dump.c:1328 pg_dumpall.c:732
 #, c-format
 msgid "  --no-policies                do not dump row security policies\n"
-msgstr "  --no-policies                მწკრივის უსაფრთხოების პოლიტიკების დამპი არ მოხდება\n"
+msgstr "  --no-policies                მწკრივის უსაფრთხოების პოლიტიკის დამპი არ მოხდება\n"
 
-#: pg_dump.c:1301 pg_dumpall.c:734
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            გამოცემების გარეშე\n"
 
-#: pg_dump.c:1302 pg_dumpall.c:736
+#: pg_dump.c:1330 pg_dumpall.c:735
 #, c-format
 msgid "  --no-schema                  do not dump schema\n"
 msgstr "  --no-schema                  სქემების დამპი არ მოხდება\n"
 
-#: pg_dump.c:1303 pg_dumpall.c:737
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         უსაფრთხოების ჭდეების მინიჭებების გარეშე\n"
 
-#: pg_dump.c:1304 pg_dumpall.c:738
+#: pg_dump.c:1332 pg_dumpall.c:737
 #, c-format
 msgid "  --no-statistics              do not dump statistics\n"
 msgstr "  --no-statistics              სტატისტიკის დამპი არ მოხდება\n"
 
-#: pg_dump.c:1305 pg_dumpall.c:739
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           გამოწერების გარეშე\n"
 
-#: pg_dump.c:1306 pg_dumpall.c:741
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     ცხრილის წვდომის მეთოდები\n"
 
-#: pg_dump.c:1307 pg_dumpall.c:742
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             ცხრილის სივრცის მინიჭებები\n"
 
-#: pg_dump.c:1308 pg_dumpall.c:743
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       TOAST-ის შეკუმშვის მეთოდები დამპში არ ჩაიწერება\n"
 
-#: pg_dump.c:1309 pg_dumpall.c:744
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     ის ცხრილები, რომლებსაც ჟურნალი არ აქვთ, დამპში არ ჩაიწერება\n"
 
-#: pg_dump.c:1310 pg_dumpall.c:745
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     INSERT ბრძანებებისთვის ON CONFLICT DO NOTHING -ის დამატება\n"
 
-#: pg_dump.c:1311 pg_dumpall.c:746
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr "  --quote-all-identifiers      ყველა იდენტიფიკატორის ციტირება. მაშინაც კი, თუ ისინი საკვანძო სიტყვები არაა\n"
 
-#: pg_dump.c:1312 pg_dumpall.c:747
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=RESTRICT_KEY  მოწოდებული სტრიქონის გამოყენება, როგორც psql-ის \\შეზღუდვის გასაღები\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NROWS      მწკრივების რიცხვი თითოეული INSERT-ისთვის ; ასევე მიუთითებს --inserts\n"
 
-#: pg_dump.c:1313
+#: pg_dump.c:1342
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr "  --section=სექცია            მითითებული სექცია (pre-data, data, ან post-data)\n"
 
-#: pg_dump.c:1314
+#: pg_dump.c:1343 pg_dumpall.c:748
 #, c-format
 msgid "  --sequence-data              include sequence data in dump\n"
 msgstr "  --sequence-data              მიმდევრობის მონაცემების ჩასმა დამპში\n"
 
-#: pg_dump.c:1315
+#: pg_dump.c:1344
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr "  --serializable-deferrable    მოცდა, სანამ დამპის გაშვება ანომალიების გარეშე იქნება შესაძლებელი\n"
 
-#: pg_dump.c:1316
+#: pg_dump.c:1345
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          დამპისთვის მითითებული სწრაფი ასლის გამოყენება\n"
 
-#: pg_dump.c:1317 pg_dumpall.c:748
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics            სტატისტიკის დამპი\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
 #, c-format
 msgid "  --statistics-only            dump only the statistics, not schema or data\n"
 msgstr "  --statistics-only            მოხდება, მხოლოდ, სტატისტიკის დამპი, მაგრამ არ სქემის ან მონაცემების\n"
 
-#: pg_dump.c:1318 pg_restore.c:709
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -2011,7 +2011,7 @@ msgstr ""
 "  --strict-names               მოთხოვნა, რომ ცხრილი ან/და სქემა შეიცავდეს შაბლონებს, რომლებიც\n"
 "                               ერთ ელემენტს მაინც ემთხვევა\n"
 
-#: pg_dump.c:1320
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -2020,7 +2020,7 @@ msgstr ""
 "  --table-and-children=შაბლონი მხოლოდ მითითებული ცხრილების დამპი,\n"
 "                               შვილი და დაყოფილი ცხრილების ჩათვლით\n"
 
-#: pg_dump.c:1322 pg_dumpall.c:749 pg_restore.c:712
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -2031,22 +2031,7 @@ msgstr ""
 "                               მფლობელობის დასაყენებლად ALTER OWNER ბრძანებების მაგიერ\n"
 "                               SET SESSION AUTHORIZATION -ის გამოყენება\n"
 
-#: pg_dump.c:1325 pg_dumpall.c:752 pg_restore.c:715
-#, c-format
-msgid "  --with-data                  dump the data\n"
-msgstr "  --with-data                  მონაცემების დამპი\n"
-
-#: pg_dump.c:1326 pg_dumpall.c:753 pg_restore.c:716
-#, c-format
-msgid "  --with-schema                dump the schema\n"
-msgstr "  --with-schema                სქემების დამპი\n"
-
-#: pg_dump.c:1327 pg_dumpall.c:754 pg_restore.c:717
-#, c-format
-msgid "  --with-statistics            dump the statistics\n"
-msgstr "  --with-statistics            სტატისტიკის დამპი\n"
-
-#: pg_dump.c:1329 pg_dumpall.c:756 pg_restore.c:719
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -2055,42 +2040,42 @@ msgstr ""
 "\n"
 "შეერთების პარამეტრები:\n"
 
-#: pg_dump.c:1330
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=ბაზისსახელი      მონაცემთა ბაზის სახელი\n"
 
-#: pg_dump.c:1331 pg_dumpall.c:758 pg_restore.c:720
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      მონაცემთა ბაზის სერვერის ჰოსტის ან სოკეტის საქაღალდე\n"
 
-#: pg_dump.c:1332 pg_dumpall.c:760 pg_restore.c:721
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          მონაცემთა ბაზის სერვერის პორტი\n"
 
-#: pg_dump.c:1333 pg_dumpall.c:761 pg_restore.c:722
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=მომხმარებელი  ბაზის მომხმარებლის სახელი\n"
 
-#: pg_dump.c:1334 pg_dumpall.c:762 pg_restore.c:723
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        არასოდეს მკითხო პაროლი\n"
 
-#: pg_dump.c:1335 pg_dumpall.c:763 pg_restore.c:724
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           პაროლის ყოველთვის კითხვა (ავტომატურად უნდა ხდებოდეს)\n"
 
-#: pg_dump.c:1336 pg_dumpall.c:764
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLENAME          აღდგენამდე SET ROLE -ის გაშვება\n"
 
-#: pg_dump.c:1338
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2103,573 +2088,552 @@ msgstr ""
 "ცვლადი გამოიყენება.\n"
 "\n"
 
-#: pg_dump.c:1340 pg_dumpall.c:768 pg_restore.c:731
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "შეცდომების შესახებ მიწერეთ: <%s>\n"
 
-#: pg_dump.c:1341 pg_dumpall.c:769 pg_restore.c:732
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s-ის საწყისი გვერდია: <%s>\n"
 
-#: pg_dump.c:1360 pg_dumpall.c:581
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "კლიენტის მითითებული კოდირება არასწორია: %s"
 
-#: pg_dump.c:1508
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "სერვერის ამ ვერსიაში უქმე სერვერებიდან პარალელური დამპი მხარდაჭერილი არაა"
 
-#: pg_dump.c:1573
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "გამოტანის მითითებული ფორმატი არასწორია: %s"
 
-#: pg_dump.c:1614 pg_dump.c:1670 pg_dump.c:1723 pg_dumpall.c:1593
-#: pg_restore.c:984
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "არასწორი სრული სახელი (ძალიან ბევრი წერტილიანი სახელი): %s"
 
-#: pg_dump.c:1622
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "შესაბამისი სქემა შაბლონისთვის \"%s\" ვერ ვიპოვე"
 
-#: pg_dump.c:1675
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "შესაბამისი გაფართოება შაბლონისთვის \"%s\" ვერ ვიპოვე"
 
-#: pg_dump.c:1728
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "შესაბამისი უცხო სერვერი შაბლონისთვის \"%s\" ვერ ვიპოვე"
 
-#: pg_dump.c:1799
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "ურთიერთობის არასწორი სახელი (ძალიან ბევრი წერტილიანი სახელი): %s"
 
-#: pg_dump.c:1821
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "შესაბამისი ცხრილი შაბლონისთვის \"%s\" ვერ ვიპოვე"
 
-#: pg_dump.c:1848
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "ამჟამად მონაცემთა ბაზასთან მიერთებული არ ბრძანდებით."
 
-#: pg_dump.c:1851
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ბაზებს შორის ბმულები განხორციელებული არაა: %s"
 
-#: pg_dump.c:2310
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "ცხრილის შემცველობის გამოტანა: \"%s.%s\""
 
-#: pg_dump.c:2420
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "ცხრილის (\"%s\") დამპის შეცდომა: PQgetCopyData() failed."
 
-#: pg_dump.c:2421 pg_dump.c:2431
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "შეცდომა სერვერიდან: %s"
 
-#: pg_dump.c:2422 pg_dump.c:2432
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "ბრძანება იყო: %s"
 
-#: pg_dump.c:2430
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "ცხრილის (\"%s\") დამპის შეცდომა: PQgetResult() failed."
 
-#: pg_dump.c:2521
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "ცხრილიდან \"%s\" მიღებულია ველების არასწორი რაოდენობა"
 
-#: pg_dump.c:3236
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "ბაზის აღწერის შენახვა"
 
-#: pg_dump.c:3351
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "ენის უცნობი მომწოდებელი: %s"
 
-#: pg_dump.c:3712
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "კოდირების შენახვა = %s"
 
-#: pg_dump.c:3737
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "შენახვა: \"standard_conforming_strings = %s\""
 
-#: pg_dump.c:3776
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "current_schemas() -ის შედეგის დამუშავების შეცდომა"
 
-#: pg_dump.c:3795
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "შენახვა: \"search_path = %s\""
 
-#: pg_dump.c:3831
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "დიდი ობიექტების კითხვა"
 
-#: pg_dump.c:4052
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "მიმდინარეობს შენახვა დიდი ობიექტებისთვის \"%s\""
 
-#: pg_dump.c:4073
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "დიდი ობიექტის (%u) წაკითხვის შეცდომა: %s"
 
-#: pg_dump.c:4181
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "მწკრივის დონის უსაფრთხოების წესების წაკითხვა"
 
-#: pg_dump.c:4322
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "წესების ბრძანების მოულოდნელი ტიპი: %c"
 
-#: pg_dump.c:4764 pg_dump.c:5321 pg_dump.c:7917 pg_dump.c:13287 pg_dump.c:19405
-#: pg_dump.c:19407 pg_dump.c:20039
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19678
+#: pg_dump.c:19680 pg_dump.c:20312
 #, c-format
 msgid "could not parse %s array"
 msgstr "მასივის დამუშავების შეცდომა: %s"
 
-#: pg_dump.c:4980
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "გამოწერები დამპში არ ჩაწერილა. მიმდინარე მომხმარებელი ზემომხმარებელი არაა"
 
-#: pg_dump.c:5184
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "გამოწერა OID-ით %u არ არსებობს"
 
-#: pg_dump.c:5191
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "სისწორის შემოწმების შეცდომა. ცხრილი OID-ით %u აღმოჩენილი არაა"
 
-#: pg_dump.c:5777
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "%s-სთვის მშობელი გაფართოება ვერ ვიპოვე %s"
 
-#: pg_dump.c:5915
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "სქემა OID-ით %u არ არსებობს"
 
-#: pg_dump.c:6939
+#: pg_dump.c:7009
 #, c-format
-msgid "cannot dump statistics for relation kind '%c'"
-msgstr "სტატისტიკის დამპი ურთიერთობის ტიპისთვის '%c' შეუძლებელია"
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "სტატისტიკის დამპი ურთიერთობის ტიპისთვის \"%c\" შეუძლებელია"
 
-#: pg_dump.c:7451 pg_dump.c:18749
+#: pg_dump.c:7521 pg_dump.c:19005
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "სისწორის შემოწმების შეცდომა. მშობელი ცხრილი OID-ით %u მიმდევრობიდან OID-ით %u არ არსებობს"
 
-#: pg_dump.c:7596
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "სისწორის შემოწმების შეცდომა. pg_parttioned_table-ში მოხსენიებული ცხრილი OID-ით %u ვერ ვიპოვე"
 
-#: pg_dump.c:7861 pg_dump.c:8154 pg_dump.c:8595 pg_dump.c:9232 pg_dump.c:9367
-#: pg_dump.c:9512 pg_dump.c:9612
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "ცხრილის უცნობი OID: %u"
 
-#: pg_dump.c:7865
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "მოულოდნელი ინდექსის მონაცემები ცხრილისთვის \"%s\""
 
-#: pg_dump.c:8382
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "სისწორის შემოწმების შეცდომა. მშობელი ცხრილი OID-ით %u pg_rewrite-ის ელემენტიდან OID-ით %u ვერ ვიპოვე"
 
-#: pg_dump.c:9236
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "სვეტის მოულოდნელი მონაცემები ცხრილისთვის %s"
 
-#: pg_dump.c:9267
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "ცხრილში \"%s\" სვეტები არასწორადაა დანომრილი"
 
-#: pg_dump.c:9329
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "ვეძებ ცხრილის ნაგულისხმევ გამოსახულებებს"
 
-#: pg_dump.c:9371
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "adnum -ის არასწორი მნიშვნელობა %d ცხრილისთვის \"%s\""
 
-#: pg_dump.c:9464
+#: pg_dump.c:9570
 #, c-format
-msgid "finding invalid not null constraints"
+msgid "finding invalid not-null constraints"
 msgstr "ვეძებ არასწორ არანულოვან შეზღუდვებს"
 
-#: pg_dump.c:9562
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "ვეძებ ცხრილის შემოწმების შეზღუდვებს"
 
-#: pg_dump.c:9616
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "მოველოდი %d შემოწმების შეზღუდვას ცხრილზე \"%s\", მაგრამ %d"
 msgstr[1] "მოველოდი %d შემოწმების შეზღუდვას ცხრილზე \"%s\", მაგრამ %d"
 
-#: pg_dump.c:9620
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "სისტემის კატალოგი შეიძლება დაზიანებულია."
 
-#: pg_dump.c:10421
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "როლი OID-ით %u არ არსებობს"
 
-#: pg_dump.c:10533 pg_dump.c:10562
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "pg_init_privs -ის არასწორი ჩანაწერი: %u %u %d"
 
-#: pg_dump.c:10853
+#: pg_dump.c:10968
 #, c-format
-msgid "stats dumped out of order (current: %d %s %s) (expected: %d %s %s)"
-msgstr "სტატისტიკის დამპი დალაგებული არაა (მიმდინარე: %d %s %s) (მოველოდი: %d %s %s)"
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "სტატისტიკის დამპი დალაგებული არაა (მიმდინარე: %d %s %s. მოველოდი: %d %s %s)"
 
-#: pg_dump.c:10981
+#: pg_dump.c:11109
 #, c-format
-msgid "attname cannot be NULL"
-msgstr "attname NULL ვერ იქნება"
+msgid "unexpected null attname"
+msgstr "მოულოდნელი null attname"
 
-#: pg_dump.c:11010
+#: pg_dump.c:11138
 #, c-format
 msgid "could not find index attname \"%s\""
 msgstr "ინდექსის attname \"%s\" აღმოჩენილი არაა"
 
-#: pg_dump.c:11496
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "აკლია მეტამონაცემები დიდი ობიექტებისთვის \"%s\""
 
-#: pg_dump.c:11782
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "მონაცემის ტიპი %s-ის typetype თურმე არასორია"
 
-#: pg_dump.c:13358
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "უცნობი provolatile მნიშვნელობა ფუნქციისთვის \"%s\""
 
-#: pg_dump.c:13408 pg_dump.c:15304
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "უცნობი proparallel მნიშვნელობა ფუნქციისთვის \"%s\""
 
-#: pg_dump.c:13538 pg_dump.c:13644 pg_dump.c:13651
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "ფუნქციის აღწერა ფუნქციისთვის OID-ით %u ვერ ვიპოვე"
 
-#: pg_dump.c:13577
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "pg_cast.castfunc ან pg_cast.castmethod ველების არასწორი მნიშვნელობა"
 
-#: pg_dump.c:13580
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "pg_cast.castmethod ველის არასწორი მნიშვნელობა"
 
-#: pg_dump.c:13670
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "არასწორი გარდაქმნის აღწერა. ერთ-ერთი, trffromsql ან trftosql ნულს არ უნდა უდრიდეს"
 
-#: pg_dump.c:13687
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "pg_transform.trffromsql ველის არასწორი მნიშვნელობა"
 
-#: pg_dump.c:13708
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "pg_transform.trftosql ველის არასწორი მნიშვნელობა"
 
-#: pg_dump.c:13853
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "postfix ოპერატორები მხარდაჭერილი აღარაა (ოპერატორი \"%s\")"
 
-#: pg_dump.c:14023
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "ოპერატორი OID-ით %s  არ არსებობს"
 
-#: pg_dump.c:14091
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "წვდომის მეთოდის (%2$s) არასწორი ტიპი: %1$c"
 
-#: pg_dump.c:14765 pg_dump.c:14833
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "კოლაციის უცნობი მომწოდებელი: %s"
 
-#: pg_dump.c:14774 pg_dump.c:14781 pg_dump.c:14792 pg_dump.c:14802
-#: pg_dump.c:14817
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "არასწორი კოლაცია \"%s\""
 
-#: pg_dump.c:15223
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "აგრეგატის (%s) aggfinalmodify -ის უცნობი ტიპი"
 
-#: pg_dump.c:15279
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "აგრეგატის (%s) aggmfinalmodify -ის უცნობი ტიპი"
 
-#: pg_dump.c:15999
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "ნაგულისხმევ პრივილეგიებში არსებული ობიექტის უცნობი ტიპი: %d"
 
-#: pg_dump.c:16015
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "ნაგულიხმები ACL სიის ანალიზი შეუძლებელია: %s"
 
-#: pg_dump.c:16099
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "საწყისი ACL სიის (%s) დამუშავების შეცდომა ან ნაგულისხმევი (%s) ობიექტისთვის \"%s\" (%s)"
 
-#: pg_dump.c:16124
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "შეცდომა ACL სიის (%s) დამუშავებისას ან ნაგულისხმევი (%s) ობიექტისთვის \"%s\" (%s)"
 
-#: pg_dump.c:16667
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "ხედის (%s) აღწერის გამოთხოვამ მონაცემები არ დააბრუნა"
 
-#: pg_dump.c:16670
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "ხედის (%s) აღწერის გამოთხოვამ ერთზე მეტი აღწერა დააბრუნა"
 
-#: pg_dump.c:16677
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "ხედის (%s) აღწერა, როგორც ჩანს, ცარიელია (ნულოვანი სიგრძე)"
 
-#: pg_dump.c:16762
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS-ები უკვე მხარდაუჭერელია (ცხრილი \"%s\")"
 
-#: pg_dump.c:17852
+#: pg_dump.c:18082
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "სვეტების არასწორი რიცხვი %d ცხრილისთვის %s"
 
-#: pg_dump.c:17930
+#: pg_dump.c:18160
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "ინდექსის სტატისტიკის სვეტების დამუშავების შეცდომა"
 
-#: pg_dump.c:17932
+#: pg_dump.c:18162
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "ინდექსის სტატისტიკის მნიშვნელობების დამუშავების შეცდომა"
 
-#: pg_dump.c:17934
+#: pg_dump.c:18164
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "ინდექსის სტატისტიკისთვის სვეტებისა და მნიშვნელობების რაოდენობა არ ემთხვევა"
 
-#: pg_dump.c:18163
+#: pg_dump.c:18393
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "შეზღუდვას ინდექსი აკლია: \"%s\""
 
-#: pg_dump.c:18407
+#: pg_dump.c:18662
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "შეზღუდვის უცნობი ტიპი: %c"
 
-#: pg_dump.c:18460
+#: pg_dump.c:18715
 #, c-format
 msgid "unrecognized sequence type: %s"
 msgstr "მიმდევრობის უცნობი ტიპი: %s"
 
-#: pg_dump.c:18592 pg_dump.c:18824
+#: pg_dump.c:18848 pg_dump.c:19086
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "მოთხოვნამ, რომელსაც მონაცემები მიმდევრობიდან (%s) უნდა მიეღო, %d მწკრივი დააბრუნა. (მოველოდი: 1)"
 msgstr[1] "მოთხოვნამ, რომელსაც მონაცემები მიმდევრობიდან (%s) უნდა მიეღო, %d მწკრივი დააბრუნა. (მოველოდი: 1)"
 
-#: pg_dump.c:18628
+#: pg_dump.c:18884
 #, c-format
 msgid "unrecognized sequence type: %d"
 msgstr "მიმდევრობის უცნობი ტიპი: %d"
 
-#: pg_dump.c:19157
+#: pg_dump.c:19109
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "ჩავარდა მონაცემების მიღება მიმდევრობისთვის \"%s\". მომხმარებელს, შეიძლება, SELECT პრივილეგია არ აქვს მიმდევრობაზე, ან მიმდევრობა, შეიძლება, იმავე დროს წაიშალა"
+
+#: pg_dump.c:19430
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "მოთხოვნის შეცდომა, რომელსაც ცხრილისთვის \"%2$s\" წესი \"%1$s\" უნდა მიეღო: დაბრუნებულია მწკრივების არასწორი რაოდენობა"
 
-#: pg_dump.c:19310
+#: pg_dump.c:19583
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "მიბმული გაფართოება (%u) ვერ ვიპოვე"
 
-#: pg_dump.c:19409
+#: pg_dump.c:19682
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "კონფიგურაციებისა და პირობების რაოდენობა გაფართოებისთვის არ ემთხვევა"
 
-#: pg_dump.c:19541
+#: pg_dump.c:19814
 #, c-format
 msgid "reading dependency data"
 msgstr "დამოკიდებულების მონაცემების კითხვა"
 
-#: pg_dump.c:19627
+#: pg_dump.c:19900
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "მიბმადი ობიექტის გარეშე %u %u"
 
-#: pg_dump.c:19638
+#: pg_dump.c:19911
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "მიბმული ობიექტის გარეშე %u %u"
 
-#: pg_dump.c:20073 pg_dump.c:20111 pg_dumpall.c:1911 pg_restore.c:766
-#: pg_restore.c:812
+#: pg_dump.c:20346 pg_dump.c:20384 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "ფილტრი %s \"%s\"-სთვის დაშვებული არაა"
 
-#: pg_dump_sort.c:436
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "არასწორი dumpId %d"
 
-#: pg_dump_sort.c:442
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "არასწორი დამოკიდებულება %d"
 
-#: pg_dump_sort.c:606
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "დამოკიდებულებების მარყუჟები ნაპოვნი არაა"
 
-#: pg_dump_sort.c:1247
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "ცხრილები, რომლებშიც აღმოჩენილია წრიული გარე-გასაღების შეზღუდვები:"
 msgstr[1] "ცხრილები, რომლებშიც აღმოჩენილია წრიული გარე-გასაღების შეზღუდვები:"
 
-#: pg_dump_sort.c:1252
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "შეიძლება დამპის აღდგენა --disable-trigger-ების გამორთვის ან დროებით შეზღუდვების გადაყრის გარეშე ვერ შეძლოთ."
 
-#: pg_dump_sort.c:1253
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "ამ პრობლემის ასარიდებლად უმჯობესია --data-only -ის მაგიერ სრული დამპი აიღოთ."
 
-#: pg_dump_sort.c:1265
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "ამ ელემენტებს შორის დამოკიდებულებების მარყუჟის ამოხსნა შეუძლებელია:"
 
-#: pg_dumpall.c:244
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "პროგრამა \"%s\" სჭირდება \"%s\"-ს, მაგრამ იგივე საქაღალდეში, სადაც \"%s\", ნაპოვნი არაა"
 
-#: pg_dumpall.c:247
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "პროგრამა „%s“ ნაპოვნია „%s“-ის მიერ, მაგრამ ვერსია, იგივეა არაა, რაც %s"
 
 #: pg_dumpall.c:402
 #, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "პარამეტრი --exclude-database არ შეიძლება, -g/--globals-only, -r/--roles-only, და -t/--tablespaces-only -სთან ერთად იყოს გამოყენებული"
-
-#: pg_dumpall.c:410
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "პარამეტრებს -g/--globals-only და -r/--roles-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dumpall.c:417
-#, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "პარამეტრებს -g/--globals-only და -t/--tablespaces-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dumpall.c:427
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "პარამეტრებს -r/--roles-only და -t/--tablespaces-only ერთად ვერ გამოიყენებთ"
-
-#: pg_dumpall.c:442
-#, c-format
-msgid "option -F/--format=d|c|t requires option -f/--file"
-msgstr "პარამეტრს -F/--format=d|c|t სჭირდება პარამეტრი -f/--file"
-
-#: pg_dumpall.c:524 pg_restore.c:1061 pg_restore.c:1317
-#, c-format
-msgid "could not open \"%s\": %m"
-msgstr "\"%s\" ვერ გავხსენი: %m"
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "პარამეტრს %s ვერ გამოიყენებთ პარამეტრებთან %s, %s, ან %s ერთად"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2678,81 +2642,81 @@ msgstr ""
 "ვერ დაუკავშირდა მონაცემთა ბაზებს \"postgres\" ან \"template1\"\n"
 "გთხოვთ მიუთითოთ ალტერნატიული მონაცემთა ბაზა."
 
-#: pg_dumpall.c:698
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster based on specified dump format.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s გაშლის PostgreSQL-ის მონაცემთა ბაზაის კლასტერს მითითებული დამპის ფორმატის მიხედვით.\n"
+"%s გაიტანს PostgreSQL-ის მონაცემთა ბაზის კლასტერს SQL სკრიპტის სახით.\n"
 "\n"
 
-#: pg_dumpall.c:700
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [პარამეტრი]...\n"
 
-#: pg_dumpall.c:703
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=FILENAME          გამოტანის ფაილის სახელი\n"
 
-#: pg_dumpall.c:712
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  ბაზის წაშლა თავიდან შექმნამდე\n"
 
-#: pg_dumpall.c:714
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
-msgstr "  -g, --globals-only           მოხდება, მხოლოდ, გლობალური ობიექტების დამპი და არა ბაზები\n"
+msgstr "  -g, --globals-only           წაიშლება მხოლოდ გლობალური ობიექტები და არა ბაზები\n"
 
-#: pg_dumpall.c:715 pg_restore.c:681
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               ობიექტების მფლობელობის აღდგენის გამოტოვება\n"
 
-#: pg_dumpall.c:716
+#: pg_dumpall.c:715
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only             გამოიტანს მხოლოდ როლებს და არც ბაზებს და არც ცხრილების სივრცეებს\n"
 
-#: pg_dumpall.c:718
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NAME         გამოსაყენებელი ზემომხმარებლის სახელი\n"
 
-#: pg_dumpall.c:719
+#: pg_dumpall.c:718
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only       გამოიტანს მხლოდ ცხრილების სივრცეებს და არც ბაზებს და არც როლებს\n"
 
-#: pg_dumpall.c:725
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr "  --exclude-database=PATTERN   გამორიცხავს ბაზებს, რომლებიც PATTERN-ს ემთხვევა\n"
 
-#: pg_dumpall.c:727
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr "  --filter=FILENAME            ფაილში მითითებული მონაცემთა ბაზების ამოღება\n"
 
-#: pg_dumpall.c:735
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          როლების პაროლები გამოტანილ არ იქნება\n"
 
-#: pg_dumpall.c:757
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=CONNSTR   კავშირის სტრიქონი\n"
 
-#: pg_dumpall.c:759
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=ბაზისსახელი      ალტერნატიული ბაზის სახელი)\n"
 
-#: pg_dumpall.c:766
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2765,206 +2729,136 @@ msgstr ""
 "სტანდარტულ გამოტანაზე იქნება გამოტანილი.\n"
 "\n"
 
-#: pg_dumpall.c:911
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "როლის სახელი, რომელიც \"pg_\"-ით იწყება, გამოტოვებულია (%s)"
 
 #. translator: %s represents a numeric role OID
-#: pg_dumpall.c:1125 pg_dumpall.c:1183 pg_dumpall.c:1192
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
 #, c-format
 msgid "found orphaned pg_auth_members entry for role %s"
 msgstr "აღმოჩენილია მიტოვებული pg_auth-ის წევრის ჩანაწერი როლისთვის %s"
 
-#: pg_dumpall.c:1158
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "სწორი დამპის მიმდევრობა წევრობისთვის როლში \"%s\" აღმოჩენილი არაა"
 
-#: pg_dumpall.c:1313
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "ვერ გაანალიზდა ACL სია (%s) პარამეტრისთვის \"%s\""
 
-#: pg_dumpall.c:1440
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "შეცდომა ACL-ის სიის (%s) დამუშავებისთვის ცხრილის სივრცისთვის \"%s\""
 
-#: pg_dumpall.c:1657
-#, c-format
-msgid "could not create subdirectory \"%s\": %m"
-msgstr "ქვესაქაღალდის (%s) შექმნის შეცდომა: %m"
-
-#: pg_dumpall.c:1664
-#, c-format
-msgid "could not open map file: %s"
-msgstr "შეუძლებელია რუკის ფაილის გახსნა: %s"
-
-#: pg_dumpall.c:1681 pg_restore.c:1014
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "გამოირიცხა ბაზა \"%s\""
 
-#: pg_dumpall.c:1702
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "დამპის გამოტანა ბაზისთვის \"%s\""
 
-#: pg_dumpall.c:1731
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "pg_dump -ის შეცდომა ბაზაზე \"%s\". დასასრული"
 
-#: pg_dumpall.c:1744
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "გამოსატანი ფაილის თავიდან გახსნის შეცდომა \"%s\": %m"
 
-#: pg_dumpall.c:1812
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "%s -ის გაშვება"
 
-#: pg_dumpall.c:1931
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "მხარდაუჭერელი ფილტრის ობიექტი"
 
-#: pg_dumpall.c:1974
-#, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\""
-msgstr "არქივის უცნობი ფორმატი \"%s\"; გთხოვთ მიუთითოთ \"c\", \"d\" \"p\", ან \"t\""
-
-#: pg_restore.c:383
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "-d/--dbname და-f/--file -დან მხოლოდ ერთ-ერთის მითითება შეგიძლიათ"
 
-#: pg_restore.c:387
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only"
-msgstr "პარამეტრი --exclude-database არ შეიძლება, გამოიყენოთ პარამეტრთან -g/--globals-only ერთად"
-
-#: pg_restore.c:397
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "-d/--dbname და-f/--file ერთად არ გამოიყენება"
-
-#: pg_restore.c:432
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "პარამეტრებს -1/--single-transaction და --transaction-size ერთად ვერ გამოიყენებთ"
-
-#: pg_restore.c:439
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "-C/--create და -1/--single-transaction ერთად არ გამოიყენება"
-
-#: pg_restore.c:443
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "--single-transaction -ის მითითება ბევრ დავალებასთან ერთად შეუძლებელია"
 
-#: pg_restore.c:491
+#: pg_restore.c:480
 #, c-format
 msgid "archive format \"%s\" is not supported; please use psql"
 msgstr "არქივის ფორმატი \"%s\" მხარდაჭერილი არაა. გამოიყენეთ psql"
 
-#: pg_restore.c:495
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "არქივის უცნობი ფორმატი \"%s\"; გთხოვთ მიუთითოთ \"გ\", \"დ\", ან \"t\""
 
-#: pg_restore.c:516
-#, c-format
-msgid "option -l/--list cannot be used when restoring an archive created by pg_dumpall"
-msgstr "პარამეტრს -l/--list ვერ გამოიყენებთ pg_dumpall-ის მიერ შექმნილი არქივის აღდგენისას"
-
-#: pg_restore.c:518
-#, c-format
-msgid "option -L/--use-list cannot be used when restoring an archive created by pg_dumpall"
-msgstr "პარამეტრს -L/--use-list ვერ გამოიყენებთ pg_dumpall-ის მიერ შექმნილი არქივის აღდგენისას"
-
-#: pg_restore.c:526
-#, c-format
-msgid "-C/--create option should be specified when restoring an archive created by pg_dumpall"
-msgstr "პარამეტრი -C/--create, მხოლოდ, მაშინ უნდა მიუტითოთ, როცა ხდება pg_dumpall-ის მიერ შექმნილი არქივის აღდგენა"
-
-#: pg_restore.c:528
-#, c-format
-msgid "Individual databases can be restored using their specific archives."
-msgstr "ინდივიდუალური მონაცემთა ბაზის აღდგენა მათი სპეციფიკური არქივების გამოყენებითაა შესაძლებელი."
-
-#: pg_restore.c:560
-#, c-format
-msgid "database restoring skipped as -g/--globals-only option was specified"
-msgstr "მონაცემთა ბაზის აღდგენა გამოტოვებულია, რადგან მითითებულია პარამეტრი -g/--globals-only"
-
-#: pg_restore.c:575
-#, c-format
-msgid "option --exclude-database can be used only when restoring an archive created by pg_dumpall"
-msgstr "პარამეტრის --exclude-database გამოყენება, მხოლოდ, pg_dumpall-ით შექმნილი არქივის აღდგენისას შეგიძლიათ"
-
-#: pg_restore.c:578
-#, c-format
-msgid "option -g/--globals-only can be used only when restoring an archive created by pg_dumpall"
-msgstr "პარამეტრის -g/--globals-only გამოყენება, მხოლოდ, pg_dumpall-ით შექმნილი არქივის აღდგენისას შეგიძლიათ"
-
-#: pg_restore.c:586
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "აღდგენისას იგნორირებული შეცდომების რაოდენობა: %d"
 
-#: pg_restore.c:656
+#: pg_restore.c:535
 #, c-format
 msgid ""
-"%s restores PostgreSQL databases from archives created by pg_dump or pg_dumpall.\n"
+"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
 msgstr ""
-"%s აღადგენს PostgreSQL-ის მონაცემთა ბაზებს არქივებიდან, რომლებიც pg_dump-ის, ან pg_dumpall-ის მიერაა შექმნილი.\n"
+"%s აღადგენს PostgreSQL მონაცემთა ბაზას pg_dump-ის მიერ შექმნილი არქივებიდან.\n"
 "\n"
 
-#: pg_restore.c:658
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [პარამეტრი]... [ფაილი]\n"
 
-#: pg_restore.c:661
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=ბაზისსახელი      მონაცემთა ბაზის სახელი\n"
 
-#: pg_restore.c:662
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FILENAME          გამოტანის ფაილის სახელი(stdout-ზე გამოსატანად გამოიყენეთ \"-\")\n"
 
-#: pg_restore.c:663
+#: pg_restore.c:542
 #, 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:664
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               არქივის სარჩევის მიმოხილვის გამოტანა\n"
 
-#: pg_restore.c:665
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose                   დამატებითი ინფორმაციის გამოტანა\n"
 
-#: pg_restore.c:666
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
 
-#: pg_restore.c:667
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help     ამ დახმარების ჩვენება და გასვლა\n"
 
-#: pg_restore.c:669
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -2973,37 +2867,32 @@ msgstr ""
 "\n"
 "პარამეტრები, რომლებიც აკონტროლებენ გამოტანას:\n"
 
-#: pg_restore.c:670
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              აღდგება მხოლოდ მონაცემები, სქემის გარეშე\n"
 
-#: pg_restore.c:672
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 სამიზნე ბაზის შექმნა\n"
 
-#: pg_restore.c:673
+#: pg_restore.c:552
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error         დაუყოვნებლივი გამოსვლა შეცდომის შემთხვევაში\n"
 
-#: pg_restore.c:674
-#, c-format
-msgid "  -g, --globals-only           restore only global objects, no databases\n"
-msgstr "  -g, --globals-only           აღდგება, მხოლოდ, გლობალური ობიექტები და არა ბაზები\n"
-
-#: pg_restore.c:675
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAME             მითითებული სახელის მქონე ინდექსის აღდგენა\n"
 
-#: pg_restore.c:676
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM               აღდგენისას მითითებული რაოდენობის პარალელური დავალების გაშვება\n"
 
-#: pg_restore.c:677
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -3012,62 +2901,57 @@ msgstr ""
 "  -L, --use-list=FILENAME      გამოტანის ასარჩევად/დასალაგებლად მითითებული\n"
 "                               ფაილის შემცველობის გამოყენება\n"
 
-#: pg_restore.c:679
+#: pg_restore.c:557
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NAME            მხოლოდ მითითებული სქემის ობიექტების აღდგენა\n"
 
-#: pg_restore.c:680
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=სახელი    მითითებული სახელის მქონე სქემაში ობიექტები არ აღდგება\n"
 
-#: pg_restore.c:682
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=სახელი(არგები)    მითითებული სახელის მქონე ფუნქციის აღდგენა\n"
 
-#: pg_restore.c:683
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            აღდგება მხოლოდ სქემები, მონაცემები კი არა\n"
 
-#: pg_restore.c:684
+#: pg_restore.c:562
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAME         ტრიგერების გამოსართავად გამოყენებული ზემომხმარებლის სახელი\n"
 
-#: pg_restore.c:685
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NAME             მითითებული ურთიერთობის აღდგენა (ცხრილი, ხედი, და ა.შ.)\n"
 
-#: pg_restore.c:686
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAME მითითებული ტრიგერის აღდგენა \n"
 
-#: pg_restore.c:687
+#: pg_restore.c:565
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          წვდომის პრივილეგიების აღდგენის გამოტოვება (grant/revoke)\n"
 
-#: pg_restore.c:688
+#: pg_restore.c:566
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     აღდგენის ერთ ტრანზაქციად გაშვება\n"
 
-#: pg_restore.c:690
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        მწკრივების უსაფრთხოების ჩართვა\n"
 
-#: pg_restore.c:691
-#, c-format
-msgid "  --exclude-database=PATTERN   do not restore the specified database(s)\n"
-msgstr "  --exclude-database=PATTERN   მითითებული მონაცემთა ბაზ(ებ)-ის აღდგენა არ მოხდება\n"
-
-#: pg_restore.c:692
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -3076,17 +2960,17 @@ msgstr ""
 "  --filter=FILENAME            ობიექტების აღდგენა ან გამოტოვება ფაილში\n"
 "                               მითითებული გამოსახულებების მიხედვით\n"
 
-#: pg_restore.c:695
+#: pg_restore.c:572
 #, c-format
 msgid "  --no-comments                do not restore comment commands\n"
 msgstr "  --no-comments                კომენტარის ბრძანებები არ აღდგება\n"
 
-#: pg_restore.c:696
+#: pg_restore.c:573
 #, c-format
 msgid "  --no-data                    do not restore data\n"
 msgstr "  --no-data                    მონაცემები არ აღდგება\n"
 
-#: pg_restore.c:697
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -3095,78 +2979,83 @@ msgstr ""
 "  --no-data-for-failed-tables  ცხრილების, რომლის შექმნა შეუძლებელია,\n"
 "                               მონაცემები არ აღდგება\n"
 
-#: pg_restore.c:699
+#: pg_restore.c:576
 #, c-format
 msgid "  --no-policies                do not restore row security policies\n"
 msgstr "  --no-policies                მწკრივის უსაფრთხოების პოლიტიკები არ აღდგება\n"
 
-#: pg_restore.c:700
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            გამოცემები არ აღდგება\n"
 
-#: pg_restore.c:701
+#: pg_restore.c:578
 #, c-format
 msgid "  --no-schema                  do not restore schema\n"
 msgstr "  --no-schema                  სქემები არ აღდგება\n"
 
-#: pg_restore.c:702
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         უსაფრთხოების ჭდეები არ აღდგება\n"
 
-#: pg_restore.c:703
+#: pg_restore.c:580
 #, c-format
 msgid "  --no-statistics              do not restore statistics\n"
 msgstr "  --no-statistics              სტატისტიკის აღდგენა არ მოხდება\n"
 
-#: pg_restore.c:704
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           გამოწერები არ აღდგება\n"
 
-#: pg_restore.c:705
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     ცხრილის წვდომის მეთოდები არ აღდგება\n"
 
-#: pg_restore.c:706
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             ცხრილის სივრცის მინიჭებები არ აღდგება\n"
 
-#: pg_restore.c:707
+#: pg_restore.c:585
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr "  --section=სექცია            მითითებული სექციის აღდგენა (pre-data, data, ან post-data)\n"
 
-#: pg_restore.c:708
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics            სტატისტიკის აღდგენა\n"
+
+#: pg_restore.c:587
 #, c-format
 msgid "  --statistics-only            restore only the statistics, not schema or data\n"
 msgstr "  --statistics-only            აღდგება, მხოლოდ, სტატისტიკა, სქემა, ან მონაცემები კი - არა\n"
 
-#: pg_restore.c:711
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         გადაცემა ყოველი N ობიექტის შემდეგ\n"
 
-#: pg_restore.c:725
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          აღდგენამდე SET ROLE -ის გაშვება\n"
 
-#: pg_restore.c:727
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
-"The options -I, -n, -N, -P, -t, -T, --section, and --exclude-database can be combined\n"
-"and specified multiple times to select multiple objects.\n"
+"The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n"
+"multiple times to select multiple objects.\n"
 msgstr ""
 "\n"
-"შესაძლებელია პარამეტრების -I, -n, -N, -P, -t, -T, და --section ერთად და მრავალჯერ მითითება, მრავალი\n"
-"ობიექტის ამოსაღებად.\n"
+"შესაძლებელია პარამეტრების -I, -n, -N, -P, -t, -T და --section ერთად და მრავალჯერ მითითება ერთზე\n"
+"მეტი ობიექტის ამოსაღებად.\n"
 
-#: pg_restore.c:730
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
@@ -3177,102 +3066,29 @@ msgstr ""
 "თუ ფაილის სახელი მითითებული არაა, გამოყენებული იქნება სტანდარტული შეტანა.\n"
 "\n"
 
-#: pg_restore.c:949
-#, c-format
-msgid "considering PATTERN as NAME for --exclude-database option as no db connection while doing pg_restore."
-msgstr "ნიმუში ჩაითვლება სახელად პარამეტრისთვის --exclude-database, რადგან pg_restore-ის გაშვების დროს ბაზასთან კავშირი არ დამყარებულა."
-
-#: pg_restore.c:995
-#, c-format
-msgid "database \"%s\" matches exclude pattern: \"%s\""
-msgstr "მონაცემთა ბაზა \"%s\" ემთხვევა გამოტოვების ნიმუშს: \"%s\""
-
-#: pg_restore.c:1051
 #, c-format
-msgid "database restoring is skipped as \"map.dat\" is not present in \"%s\""
-msgstr "მონაცემთა ბაზის აღდგენა გამოტოვებულია, რადგან \"%s\"-ში ფაილი map.dat აღმოჩენილი არაა"
-
-#: pg_restore.c:1089
-#, c-format
-msgid "invalid entry in \"%s\" at line: %d"
-msgstr "არასწორი ჩანაწერი ფაილში \"%s\" ხაზზე: %d"
-
-#: pg_restore.c:1092
-#, c-format
-msgid "found database \"%s\" (OID: %u) in \"%s\""
-msgstr "აღდგენისას ფაილში \"%3$s\" აღმოჩენილია მონაცემთა ბაზა \"%1$s\" (OID: %2$u)."
-
-#: pg_restore.c:1145
-#, c-format
-msgid "found %d database names in \"map.dat\""
-msgstr "ფაილში map.dat აღმოჩენილია სულ %d მონაცემთა ბაზის სახელი"
-
-#: pg_restore.c:1149
-#, c-format
-msgid "trying to connect database \"postgres\""
-msgstr "ვცდილობ, მივუერთდე მონაცემთა ბაზას \"postgres\""
-
-#: pg_restore.c:1158
-#, c-format
-msgid "trying to connect database \"template1\""
-msgstr "ვცდილობ, მივუერთდე მონაცემთა ბაზას \"postgres\""
-
-#: pg_restore.c:1182
-#, c-format
-msgid "no database needs to restore out of %d databases"
-msgstr "%d მონაცემთა ბაზიდან აღსადგენი არცერთია"
-
-#: pg_restore.c:1186
-#, c-format
-msgid "need to restore %d databases out of %d databases"
-msgstr "საჭიროა %d მონაცემთა ბაზის აღდგენა %d-დან"
-
-#: pg_restore.c:1235
-#, c-format
-msgid "restoring database \"%s\""
-msgstr "მიმდინარეობს აღდგენა მონაცემთა ბაზისთვის \"%s\""
-
-#: pg_restore.c:1276
-#, c-format
-msgid "errors ignored on database \"%s\" restore: %d"
-msgstr "მონაცემთა ბაზის \"%s\" აღდგენისას გამოტოვებული შეცდომები: %d"
-
-#: pg_restore.c:1283
-#, c-format
-msgid "number of restored databases is %d"
-msgstr "აღდგენილი მონაცემთა ბაზების რაოდენობა: %d"
-
-#: pg_restore.c:1346
-#, c-format
-msgid "executing query: %s"
-msgstr "მიმდინარეობს შესრულება მოთხოვნის: %s"
+#~ msgid "  %s"
+#~ msgstr "  %s"
 
-#: pg_restore.c:1357
 #, c-format
-msgid ""
-"could not execute query: \"%s\" \n"
-"Command was: \"%s\""
-msgstr ""
-"ვერ შევასრულე მოთხოვნა: \"%s\"\n"
-"ბრძანება: \"%s\""
+#~ msgid "  --exclude-database=PATTERN   do not restore the specified database(s)\n"
+#~ msgstr "  --exclude-database=PATTERN   მითითებული მონაცემთა ბაზ(ებ)-ის აღდგენა არ მოხდება\n"
 
-#: pg_restore.c:1364
 #, c-format
-msgid "ignored %d errors in \"%s\""
-msgstr "გამოტოვებულია %d შეცდომა \"%s\"-ში"
+#~ msgid "  --with-data                  dump the data\n"
+#~ msgstr "  --with-data                  მონაცემების დამპი\n"
 
-#: pg_restore.c:1395
 #, c-format
-msgid "could not open file: \"%s\""
-msgstr "შეუძლებელია ფაილის გახსნა: \"%s\""
+#~ msgid "  --with-data                  restore the data\n"
+#~ msgstr "  --with-data                  მონაცემების აღდგენა\n"
 
 #, c-format
-#~ msgid "  %s"
-#~ msgstr "  %s"
+#~ msgid "  --with-schema                dump the schema\n"
+#~ msgstr "  --with-schema                სქემების დამპი\n"
 
 #, c-format
-#~ msgid "  --exclude-database=PATTERN   exclude databases whose name matches with pattern\n"
-#~ msgstr "  --exclude-database=ნიმუში   გამორიცხავს ბაზებს, რომლებიც ნიმუშს ემთხვევა\n"
+#~ msgid "  --with-schema                restore the schema\n"
+#~ msgstr "  --with-schema                სქემის აღდგენა\n"
 
 #, c-format
 #~ msgid "  -Z, --compress=0-9           compression level for compressed formats\n"
@@ -3287,17 +3103,29 @@ msgstr "შეუძლებელია ფაილის გახსნა:
 #~ "                         შეკუმშვის მითითება\n"
 
 #, c-format
-#~ msgid "Either remove the directory \"%s\" or its contents."
-#~ msgstr "ან წაშალეთ საქაღალდე \"%s\", ან მისი შემცველობა."
+#~ msgid "  -g, --globals-only           restore only global objects, no databases\n"
+#~ msgstr "  -g, --globals-only           აღდგება, მხოლოდ, გლობალური ობიექტები და არა ბაზები\n"
+
+#, c-format
+#~ msgid "Individual databases can be restored using their specific archives."
+#~ msgstr "ინდივიდუალური მონაცემთა ბაზის აღდგენა მათი სპეციფიკური არქივების გამოყენებითაა შესაძლებელი."
 
 #, c-format
 #~ msgid "cannot restore from compressed archive (compression not supported in this installation)"
 #~ msgstr "შეკუმშული არქივიდან აღდგენა შეუძლებელია (ამ აგებაში შეკუმშვა მხარდაჭერილი არაა)"
 
+#, c-format
+#~ msgid "considering PATTERN as NAME for --exclude-database option as no database connection while doing pg_restore"
+#~ msgstr "PATTERN ჩაითვლება NAME-ის სახით პარამეტრისთვის --exclude-database, რადგან მონაცემთა ბაზასთან კავშირი არ არსებობს პროგრამის pg_restore გამოყენებისას"
+
 #, c-format
 #~ msgid "could not change directory to \"%s\": %m"
 #~ msgstr "საქაღალდის %s-ზე შეცვლის შეცდომა: %m"
 
+#, c-format
+#~ msgid "could not close blob data file: %m"
+#~ msgstr "ბლობის ფაილის დახურვის შეცდომა: %m"
+
 #, c-format
 #~ msgid "could not close blobs TOC file: %m"
 #~ msgstr "ბლობების შინაარსის ფაილის დახურვის შეცდომა: %m"
@@ -3310,29 +3138,45 @@ msgstr "შეუძლებელია ფაილის გახსნა:
 #~ msgid "could not connect to database"
 #~ msgstr "ბაზასთან მიერთების შეცდომა"
 
+#, c-format
+#~ msgid "could not execute query: %s"
+#~ msgstr "ვერ შევასრულე მოთხოვნა: %s"
+
 #, c-format
 #~ msgid "could not identify current directory: %m"
 #~ msgstr "მიმდინარე საქაღალდის იდენტიფიკაციის პრობლემა: %m"
 
 #, c-format
-#~ msgid "could not open global.dat file: \"%s\""
-#~ msgstr "ვერ გავხსენი ფაილი global.dat: \"%s\""
+#~ msgid "could not open file: \"%s\""
+#~ msgstr "შეუძლებელია ფაილის გახსნა: \"%s\""
 
 #, c-format
-#~ msgid "could not open global.dat file: %s"
-#~ msgstr "ვერ გავხსენი ფაილი global.dat: %s"
+#~ msgid "could not read symbolic link \"%s\": %m"
+#~ msgstr "სიმბოლური ბმის \"%s\" წაკითხვის შეცდომა: %m"
 
 #, c-format
-#~ msgid "could not open map.dat file: \"%s\""
-#~ msgstr "შეუძლებელია map.dat ფაილის გახსნა: \"%s\""
+#~ msgid "could not write to LOs TOC file: %s"
+#~ msgstr "'LO'-ების სარჩევის ფაილში ჩაწერა შეუძლებელია: %s"
 
 #, c-format
-#~ msgid "could not read symbolic link \"%s\": %m"
-#~ msgstr "სიმბოლური ბმის \"%s\" წაკითხვის შეცდომა: %m"
+#~ msgid "database name \"%s\" matches exclude pattern \"%s\""
+#~ msgstr "მონაცემთა ბაზის სახელი \"%s\" ემთხვევა გამოტოვების ნიმუშს: \"%s\""
 
 #, c-format
-#~ msgid "errors ignored on global.dat file restore: %d"
-#~ msgstr "ფაილის global.dat აღდგენისას გამოტოვებული შეცდომები: %d"
+#~ msgid "database restoring is skipped because file \"%s\" does not exist in directory \"%s\""
+#~ msgstr "მონაცემთა ბაზის აღდგენა გამოტოვებულია, რადგან ფაილი \"%s\" არ არსებობს საქაღალდეში \"%s\""
+
+#, c-format
+#~ msgid "database restoring skipped because option -g/--globals-only was specified"
+#~ msgstr "მონაცემთა ბაზის აღდგენა გამოტოვებულია, რადგან მითითებულია პარამეტრი -g/--globals-only"
+
+#, c-format
+#~ msgid "errors ignored on database \"%s\" restore: %d"
+#~ msgstr "მონაცემთა ბაზის \"%s\" აღდგენისას გამოტოვებული შეცდომები: %d"
+
+#, c-format
+#~ msgid "executing query: %s"
+#~ msgstr "მიმდინარეობს შესრულება მოთხოვნის: %s"
 
 #, c-format
 #~ msgid "failed to LZ4 compress data: %s"
@@ -3346,6 +3190,22 @@ msgstr "შეუძლებელია ფაილის გახსნა:
 #~ msgid "failed to end decompression: %s"
 #~ msgstr "გაშლის დასრულების შეცდომა: %s"
 
+#, c-format
+#~ msgid "found %d database name in \"%s\""
+#~ msgid_plural "found %d database names in \"%s\""
+#~ msgstr[0] "ნაპოვნია მონაცემთა ბაზის %d სახელი \"%s\"-ში"
+#~ msgstr[1] "ნაპოვნია მონაცემთა ბაზის %d სახელი \"%s\"-ში"
+
+#, c-format
+#~ msgid "found database \"%s\" (OID: %u) in file \"%s\""
+#~ msgstr "აღმოჩენილია მონაცემთა ბაზა \"%s\" (OID: %u) ფაილში \"%s\""
+
+#, c-format
+#~ msgid "ignored %d error in file \"%s\""
+#~ msgid_plural "ignored %d errors in file \"%s\""
+#~ msgstr[0] "გამოტოვებულია %d შეცდომა ფაილში \"%s\""
+#~ msgstr[1] "გამოტოვებულია %d შეცდომა ფაილში \"%s\""
+
 #, c-format
 #~ msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\""
 #~ msgstr "არასწორი არგუმენტის სტრიქონი (%s) ტრიგერისთვის \"%s\" ცხრილზე \"%s\""
@@ -3354,10 +3214,148 @@ msgstr "შეუძლებელია ფაილის გახსნა:
 #~ msgid "invalid compression code: %d"
 #~ msgstr "შეკუმშვის არასწორი კოდი: %d"
 
+#, c-format
+#~ msgid "invalid entry in file \"%s\" on line %d"
+#~ msgstr "არასწორი ჩანაწერი ფაილში \"%s\" ხაზზე %d"
+
+#, c-format
+#~ msgid "need to restore %d databases out of %d databases"
+#~ msgstr "საჭიროა %d მონაცემთა ბაზების აღდგენა %d მონაცემთა ბაზებიდან"
+
+#, c-format
+#~ msgid "no database needs restoring out of %d database"
+#~ msgid_plural "no database needs restoring out of %d databases"
+#~ msgstr[0] "%d მონაცემთა ბაზიდან აღსადგენი არცერთია"
+#~ msgstr[1] "%d მონაცემთა ბაზიდან აღსადგენი არცერთია"
+
 #, c-format
 #~ msgid "not built with zlib support"
 #~ msgstr "არ არის აგებული zlib მხარდაჭერით"
 
+#, c-format
+#~ msgid "number of restored databases is %d"
+#~ msgstr "აღდგენილი მონაცემთა ბაზების რაოდენობა: %d"
+
+#, c-format
+#~ msgid "option --exclude-database can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "პარამეტრის --exclude-database გამოყენება, მხოლოდ, pg_dumpall-ით შექმნილი არქივის აღდგენისას შეგიძლიათ"
+
+#, c-format
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only"
+#~ msgstr "პარამეტრი --exclude-database არ შეიძლება, გამოიყენოთ პარამეტრთან -g/--globals-only ერთად"
+
+#, c-format
+#~ msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
+#~ msgstr "პარამეტრი --exclude-database არ შეიძლება -g/--globals-only, -r/--roles-only, და -t/--tablespaces-only -სთან ერთად იყოს გამოყენებული"
+
+#, c-format
+#~ msgid "option --if-exists requires option -c/--clean"
+#~ msgstr "--if-exists -ს -c/--clean პარამეტრი ესაჭიროება"
+
+#, c-format
+#~ msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
+#~ msgstr "--on-conflict-do-nothing -ს --inserts, --rows-per-insert ან --column-inserts ესაჭიროება"
+
+#, c-format
+#~ msgid "option --restrict-key can only be used with --format=plain"
+#~ msgstr "პარამეტრს --restrict-key მხოლოდ, პარამეტრთან --format=plain ერთად იქნეს გამოყენებული"
+
+#, c-format
+#~ msgid "option -C/--create must be specified when restoring an archive created by pg_dumpall"
+#~ msgstr "პარამეტრი -C/--create, მხოლოდ, მაშინ უნდა მიუთითოთ, როცა ხდება pg_dumpall-ის მიერ შექმნილი არქივის აღდგენა"
+
+#, c-format
+#~ msgid "option -F/--format=d|c|t requires option -f/--file"
+#~ msgstr "პარამეტრს -F/--format=d|c|t სჭირდება პარამეტრი -f/--file"
+
+#, c-format
+#~ msgid "option -L/--use-list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "პარამეტრს -L/--use-list ვერ გამოიყენებთ pg_dumpall-ის მიერ შექმნილი არქივის აღდგენისას"
+
+#, c-format
+#~ msgid "option -g/--globals-only can be used only when restoring an archive created by pg_dumpall"
+#~ msgstr "პარამეტრის -g/--globals-only გამოყენება, მხოლოდ, pg_dumpall-ით შექმნილი არქივის აღდგენისას შეგიძლიათ"
+
+#, c-format
+#~ msgid "option -l/--list cannot be used when restoring an archive created by pg_dumpall"
+#~ msgstr "პარამეტრს -l/--list ვერ გამოიყენებთ pg_dumpall-ის მიერ შექმნილი არქივის აღდგენისას"
+
+#, c-format
+#~ msgid "options --statistics and --no-statistics cannot be used together"
+#~ msgstr "პარამეტრებს --statistics და --no-statistics ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options --statistics-only and --no-statistics cannot be used together"
+#~ msgstr "პარამეტრებს --statistics-only და --no-statistics ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options --with-data and --no-data cannot be used together"
+#~ msgstr "პარამეტრებს --with-data და --no-data ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options --with-schema and --no-schema cannot be used together"
+#~ msgstr "პარამეტრებს --with-schema და --no-schema ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options --with-statistics and --no-statistics cannot be used together"
+#~ msgstr "პარამეტრებს --with-statistics და --no-statistics ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -1/--single-transaction and --transaction-size cannot be used together"
+#~ msgstr "პარამეტრებს -1/--single-transaction და --transaction-size ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -C/--create and -1/--single-transaction cannot be used together"
+#~ msgstr "-C/--create და -1/--single-transaction ერთად არ გამოიყენება"
+
+#, c-format
+#~ msgid "options -a/--data-only and --no-data cannot be used together"
+#~ msgstr "პარამეტრებს -a/--data-only და --no-data ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -a/--data-only and --statistics-only cannot be used together"
+#~ msgstr "პარამეტრებს -a/--data-only და --statistics-only ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -c/--clean and -a/--data-only cannot be used together"
+#~ msgstr "პარამეტრები -c/--clean და -a/--data-only ერთად ვერ გამოიყენება"
+
+#, c-format
+#~ msgid "options -d/--dbname and --restrict-key cannot be used together"
+#~ msgstr "პარამეტრები -d/--dbname და --restrict-key ერთად არ შეიძლება, გამოყენებულ იქნას"
+
+#, c-format
+#~ msgid "options -d/--dbname and -f/--file cannot be used together"
+#~ msgstr "-d/--dbname და-f/--file ერთად არ გამოიყენება"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
+#~ msgstr "პარამეტრები -g/--globals-only და -r/--roles-only ერთად ვერ გამოიყენება"
+
+#, c-format
+#~ msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "პარამეტრები -g/--globals-only და -t/--tablespaces-only ერთად ვერ გამოიყენება"
+
+#, c-format
+#~ msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr "პარამეტრები -r/--roles-only და -t/--tablespaces-only ერთად ვერ გამოიყენება"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
+#~ msgstr "პარამეტრები -s/--schema-only და --include-foreign-data ერთად ვერ გამოიყენება"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --no-schema cannot be used together"
+#~ msgstr "პარამეტრებს -s/--schema-only და --no-schema ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --statistics-only cannot be used together"
+#~ msgstr "პარამეტრებს -s/--schema-only და --statistics-only ერთად ვერ გამოიყენებთ"
+
+#, c-format
+#~ msgid "options -s/--schema-only and -a/--data-only cannot be used together"
+#~ msgstr "პარამეტრები -s/--schema-only და -a/--data-only ერთად ვერ გამოიყენება"
+
 #, c-format
 #~ msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)"
 #~ msgstr "მოთხოვნის შედეგია ნულოვანი ბმის ცხრილის სახელის უცხო გასაღების ტრიგერი \"%s\" ცხრილზე \"%s\" (ცხრილის OID: %u)"
@@ -3371,13 +3369,25 @@ msgstr "შეუძლებელია ფაილის გახსნა:
 #~ msgstr "მოთხოვნილი შეკუმშვა ამ აგებაში მხარდაუჭერელია. -- არქივი შეუკუმშავი იქნება"
 
 #, c-format
-#~ msgid "trying to connect database \"template1\" as failed to connect to database \"postgres\" to dump into out file"
-#~ msgstr "ვცდილობ, მივუერთდე მონაცემთა ბაზას \"template1\", რადგან მცდელობა, მივერთებოდი მონაცემთა ბაზას \"postgres\" გამოსატან ფაილში დამპისთვის, ჩავარდა"
+#~ msgid "restoring database \"%s\""
+#~ msgstr "მიმდინარეობს აღდგენა მონაცემთა ბაზისთვის \"%s\""
+
+#, c-format
+#~ msgid "trying to connect to database \"%s\""
+#~ msgstr "ვცდილობ, მივუერთდე მონაცემთა ბაზას \"%s\""
 
 #, c-format
 #~ msgid "unexpected tgtype value: %d"
 #~ msgstr "tgtype -ის არასწორი მნიშვნელობა: %d"
 
+#, c-format
+#~ msgid "unhandled mode \"%s\""
+#~ msgstr "დაუმუშავებელი რეჟიმი \"%s\""
+
 #, c-format
 #~ msgid "unrecognized collation provider '%c'"
 #~ msgstr "უცნობი კოლაციის მომწოდებელი '%c'"
+
+#, c-format
+#~ msgid "unrecognized output format \"%s\"; please specify \"c\", \"d\", \"p\", or \"t\""
+#~ msgstr "უცნობი გამოტანის ფორმატი \"%s\"; გთხოვთ მიუთითოთ \"c\", \"d\" \"p\", ან \"t\""
diff --git a/src/bin/pg_dump/po/ko.po b/src/bin/pg_dump/po/ko.po
index 296f7e5ff48..4f4ec2dcee4 100644
--- a/src/bin/pg_dump/po/ko.po
+++ b/src/bin/pg_dump/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_dump (PostgreSQL) 17\n"
+"Project-Id-Version: pg_dump (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:51+0000\n"
-"PO-Revision-Date: 2025-01-16 14:55+0900\n"
+"POT-Creation-Date: 2025-09-11 21:51+0000\n"
+"PO-Revision-Date: 2025-09-10 12:51+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -15,30 +15,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:428 compress_gzip.c:435
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "이 프로그램은 %s 압축 미지원 상태로 빌드 되었습니다"
@@ -110,27 +110,27 @@ msgstr "실행 할 \"%s\" 파일을 찾을 수 없음"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "\"%s\" 경로를 절대경로로 바꿀 수 없음: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "\"%s\" 명령을 실행할 수 없음: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "\"%s\" 명령에서 읽을 수 없음: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "\"%s\" 명령이 아무런 데이터도 반환하지 않음"
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "메모리 부족"
 
@@ -145,45 +145,44 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위해 파일 시스템 동기화를 할 수 없음: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일 상태 정보를 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:943
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 일 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -233,242 +232,242 @@ msgstr "%s 값은 %d부터 %d까지 지정할 수 있습니다."
 msgid "unrecognized sync method: %s"
 msgstr "알 수 없는 동기화 방법: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령 인자에 줄바꿈 문자가 있습니다: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 있습니다: \"%s\"\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "확장 기능 읽는 중"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "확장 멤버를 식별 중"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "스키마들을 읽는 중"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "사용자 정의 테이블들을 읽는 중"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "사용자 정의 함수들 읽는 중"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "사용자 정의 자료형을 읽는 중"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "프로시쥬얼 언어를 읽는 중"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "사용자 정의 집계 함수를 읽는 중"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "사용자 정의 연산자를 읽는 중"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "사용자 정의 접근 방법을 읽는 중"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "사용자 정의 연산자 클래스를 읽는 중"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "사용자 정의 연산자 부류들 읽는 중"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "사용자 정의 텍스트 검색 파서를 읽는 중"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "사용자 정의 텍스트 검색 템플릿을 읽는 중"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "사용자 정의 텍스트 검색 사전을 읽는 중"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "사용자 정의 텍스트 검색 구성을 읽는 중"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "사용자 정의 외부 데이터 래퍼를 읽는 중"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "사용자 정의 외부 서버를 읽는 중"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "기본 접근 권한 읽는 중"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "사용자 정의 글자 정렬(collation) 읽는 중"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "사용자 정의 인코딩 변환규칙을 읽는 중"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "형변환자(type cast)들을 읽는 중"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "변환자(transform) 읽는 중"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "테이블 상속 정보를 읽는 중"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "이벤트 트리거들을 읽는 중"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "확장 테이블을 찾는 중"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "상속 관계를 조사중"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "재미난 테이블들(interesting tables)을 위해 열 정보를 읽는 중"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "하위 테이블에서 상속된 열 구분중"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "파티션 자료 읽는 중"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "인덱스들을 읽는 중"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "하위 파티션 테이블에서 인덱스를 플래그 처리하는 중"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "확장 통계들을 읽는 중"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "제약 조건들을 읽는 중"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "트리거들을 읽는 중"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "룰(rule) 읽는 중"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "정책 읽는 중"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "발행 정보를 읽는 중"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "테이블의 발행 맵버쉽을 읽는 중"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "스키마의 발행 맵버쉽을 읽을 중"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "구독정보를 읽는 중"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "테이블의 구독 맵버쉽을 읽는 중"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "안전 검사 실패, OID %u인 부모 개체가 없음. 해당 테이블 \"%s\" (OID %u)"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "잘못된 부모 수: %d, 해당 테이블 \"%s\""
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "\"%s\" 숫자 배열을 분석할 수 없음: 너무 많은 숫자들이 있음"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "\"%s\" 숫자 배열을 분석할 수 없음: 숫자안에 이상한 글자가 있음"
@@ -483,7 +482,7 @@ msgstr "압축 라이브러리를 초기화 할 수 없음: %s"
 msgid "could not close compression stream: %s"
 msgstr "압축 스트림을 닫을 수 없음: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:113 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "자료를 압축할 수 없음: %s"
@@ -498,151 +497,246 @@ msgstr "자료 압축을 풀 수 없습니다: %s"
 msgid "could not close compression library: %s"
 msgstr "압축 라이브러리를 닫을 수 없음: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:277 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "입력 파일을 읽을 수 없음: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:374 pg_backup_custom.c:651
+#: compress_gzip.c:294 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "파일에 쓸 수 없음: %s"
+
+#: compress_gzip.c:310 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "입력 파일을 읽을 수 없음: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:372 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:312 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "입력 파일을 읽을 수 없음: 파일 끝"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "LZ4 압축 해제 컨텍스트를 만들 수 없음: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "압축 풀기 실패: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "LZ4 압축 해제 컨텍스트 반환 실패: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "압축 끝내기 실패: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "LZ4 압축 초기화 할 수 없음: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "LZ4 라이브러리를 초기화할 수 없음: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "파일 쓰기 작업하는 도중 오류 발생: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "파일 쓰기 작업하는 도중 오류 발생: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "출력 파일을 쓸 수 없음: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "압축 풀기 작업 끝내기 실패: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "파일을 닫을 수 없음: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "파일을 쓸 수 없습니다: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "\"%s\" 압축 매개 변수를 지정할 수 없음: %s"
 
-#: compress_zstd.c:78 compress_zstd.c:232 compress_zstd.c:491
-#: compress_zstd.c:499
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "압축 라이브러리를 초기화 할 수 없음"
 
-#: compress_zstd.c:195 compress_zstd.c:309
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "자료를 압축 해제 할 수 없음: %s"
 
-#: compress_zstd.c:502
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "암호: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:937
+#: pg_dump_sort.c:1466 pg_dump_sort.c:1486
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:514
+#, c-format
+msgid "could not connect to database \"%s\""
+msgstr "\"%s\" 데이터베이스에 접속할 수 없음"
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "서버 버전을 알 수 없음"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "\"%s\" 서버 버전을 분석할 수 없음"
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "서버 버전이 일치하지 않아 중단하는 중"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "서버 버전: %s; %s 버전: %s"
+
+#: connectdb.c:282 pg_dumpall.c:1784
+#, c-format
+msgid "executing %s"
+msgstr "실행중: %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1790
+#, c-format
+msgid "query failed: %s"
+msgstr "쿼리 실패: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1791
+#, c-format
+msgid "Query was: %s"
+msgstr "사용한 쿼리: %s"
+
+#: dumputils.c:948
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
+
+#: dumputils.c:953
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리의 액세스 권한을 바꿀 수 없습니다: %m"
+
+#: dumputils.c:958
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "\"%s\" 모드는 처리할 수 없음"
+msgid "directory \"%s\" is not empty"
+msgstr "\"%s\" 디렉터리가 비어있지 않음"
 
-#: filter.c:49
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "\"%s\" 필터 파일을 열 수 없음: %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "\"%s\" 필터 파일을 닫을 수 없음: %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr "표준 입력의 %d 번째 줄을 읽는데 잘못된 필터 포멧: %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "\"%s\" 파일의 %d 번째 줄에 잘못된 필터 포멧: %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "\"%s\" 필터 파일을 읽을 수 없음: %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "예상치 못한 파일 끝"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "객체 이름 패턴이 빠졌음"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "필터 명령이 없음 (\"include\" 또는 \"exclude\" 사용할 수 있음)"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "잘못된 필터 명령 (\"include\" 또는 \"exclude\" 사용할 수 있음)"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "필터 객체형이 빠졌음"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "지원하지 않는 필터 객체형: \"%.*s\""
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "%s() 실패: 오류 코드 %d"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "통신 체널을 만들 수 없음: %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "작업자 프로세스를 만들 수 없음: %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "리더로부터 알 수 없는 명령을 수신함: \"%s\""
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "작업 프로세스로부터 잘못된 메시지를 받음: \"%s\""
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -654,437 +748,454 @@ msgstr ""
 "이 상황은 일반적으로 다른 세션에서 해당 테이블을 이미 덤프하고 있거나 기타 다"
 "른 이유로 다른 세션에 의해서 선점 된 경우입니다."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "작업 프로세스가 예상치 않게 종료됨"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "통신 체널에에 쓸 수 없음: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: 소켓을 만들 수 없음: 오류 코드 %d"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: 바인딩 할 수 없음: 오류 코드 %d"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: 리슨 할 수 없음: 오류 코드 %d"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s() 실패: 오류 코드 %d"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: 두번째 소켓을 만들 수 없음: 오류 코드 %d"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: 소켓 접속 실패: 오류 코드 %d"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: 접속을 승인할 수 없음: 오류 코드 %d"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "출력 파일을 닫을 수 없음: %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:313 pg_backup_archiver.c:317
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "아카이브 아이템의 순서가 섹션에서 비정상적임"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "unexpected section code %d"
 msgstr "예상치 못한 섹션 코드 %d"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "이 아카이브 파일 형식에서는 병렬 복원이 지원되지 않음"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "8.0 이전 pg_dump로 만든 아카이브에서는 병렬 복원이 지원되지 않음"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "압축된 아카이브 (%s) 에서 복원할 수 없음"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "복원 작업을 위해 데이터베이스에 접속 중"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "pre-1.3 archive에서 직통 데이터베이스 접속은 지원되지 않음"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:450
 #, c-format
-msgid "implied data-only restore"
-msgstr "암묵적으로 자료만 복원"
+msgid "implied no-schema restore"
+msgstr "암묵적인 no-schema 복원"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "%s %s 삭제 중"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "\"%s\" 구문에서 insert IF EXISTS 부분을 찾을 수 없음"
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "원본 덤프 파일에서 발생한 경고: %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "%s \"%s.%s\" 만드는 중"
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "%s \"%s\" 만드는 중"
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "\"%s\" 새 데이터베이스에 접속중"
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "%s 처리 중"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "\"%s.%s\" 테이블의 자료를 처리 중"
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "실행중: %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "%s 트리거 작동을 비활성화 하는 중"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "%s 트리거 작동을 활성화 하는 중"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine"
 msgstr "내부 오류 -- WriteData는 DataDumper 루틴 영역 밖에서 호출 될 수 없음"
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "선택한 파일 양식으로는 large-object를 덤프할 수 없음"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "%d개의 큰 개체가 복원됨"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "%u OID large object를 복원중"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "%u large object를 만들 수 없음: %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3888
+#: pg_backup_archiver.c:1525 pg_dump.c:4085
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "%u large object를 열 수 없음: %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "TOC 파일 \"%s\"을(를) 열 수 없음: %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "줄 무시됨: %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "%d ID에 대한 항목을 찾지 못했음"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "TOC 파일을 닫을 수 없음: %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:548
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "\"%s\" 출력 파일을 열 수 없음: %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "출력 파일을 열 수 없음: %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "%zu 바이트의 큰 객체 데이터를 씀(결과 = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "큰 객체를 쓸 수 없음: %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "초기화 작업 중:"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "TOC 처리하는 중:"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "뒷 마무리 작업 중:"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "%d TOC 항목에서; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "잘못된 dumpID"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "TABLE DATA 아이템에 대한 잘못된 테이블 dumpId"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "예상치 못한 자료 옵셋 플래그 %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "덤프 파일에서 파일 옵셋 값이 너무 큽니다"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "디렉터리 이름이 너무 긺: \"%s\""
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid ""
 "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
 "exist)"
 msgstr "\"%s\" 디렉터리가 알맞은 아카이브용이 아님 (\"toc.dat\" 파일이 없음)"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "\"%s\" 입력 파일을 열 수 없음: %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "입력 파일을 열 수 없음: %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "입력 파일을 읽을 수 없음: %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "입력 파일이 너무 짧습니다 (%lu 읽었음, 예상치 5)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "입력 파일은 일반 텍스트 덤프 파일입니다. psql 명령을 사용하세요."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "입력 파일에서 타당한 아카이브를 찾을 수 없습니다(너무 짧은지?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "입력 파일에서 타당한 아카이브를 찾을 수 없음"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "입력 파일을 닫을 수 없음: %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "추가용 표준출력 파일을 열 수 없음: %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "알 수 없는 파일 포멧: \"%d\""
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4647
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4761
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "%d %s %s 항목 마침"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4660
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4774
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "작업자 프로세스 실패: 종료 코드 %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2668
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "WriteToc() 안에 예상치 못한 TOC 엔트리: %d %s %s"
+
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
+#: pg_backup_tar.c:1034
+#, c-format
+msgid "error during file seek: %m"
+msgstr "파일 seek 작업하는 도중 오류가 발생했습니다: %m"
+
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "%d ID 항목은 범위를 벗어났음 -- TOC 정보가 손상된 듯 합니다"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "WITH OIDS 옵션이 있는 테이블의 복원은 이제 지원하지 않습니다"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "알 수 없는 인코딩: \"%s\""
 
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "잘못된 ENCODING 항목: %s"
 
-#: pg_backup_archiver.c:2841
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "잘못된 STDSTRINGS 항목: %s"
 
-#: pg_backup_archiver.c:2866
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "\"%s\" 스키마를 찾을 수 없음"
 
-#: pg_backup_archiver.c:2873
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "\"%s\" 테이블을 찾을 수 없음"
 
-#: pg_backup_archiver.c:2880
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "\"%s\" 인덱스를 찾을 수 없음"
 
-#: pg_backup_archiver.c:2887
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "\"%s\" 함수를 찾을 수 없음"
 
-#: pg_backup_archiver.c:2894
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "\"%s\" 트리거를 찾을 수 없음"
 
-#: pg_backup_archiver.c:3325
+#: pg_backup_archiver.c:3433
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "\"%s\" 사용자로 세션 사용자를 지정할 수 없음: %s"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3575
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "\"search_path\"를 \"%s\"(으)로 지정할 수 없음: %s"
 
-#: pg_backup_archiver.c:3518
+#: pg_backup_archiver.c:3636
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "\"default_tablespace\"로 %s(으)로 지정할 수 없음: %s"
 
-#: pg_backup_archiver.c:3567
+#: pg_backup_archiver.c:3685
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "\"default_table_access_method\"를 지정할 수 없음: %s"
 
-#: pg_backup_archiver.c:3616
+#: pg_backup_archiver.c:3734
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "alter table access method 실행 할 수 없음: %s"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3835
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "\"%s\" 개체의 소유주를 지정할 수 없습니다"
 
-#: pg_backup_archiver.c:4004
+#: pg_backup_archiver.c:3970
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "_printTocEntry() 안에 예상치 못한 TOC 엔트리: %d %s %s"
+
+#: pg_backup_archiver.c:4118
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "파일 헤더에서 매직 문자열을 찾지 못했습니다"
 
-#: pg_backup_archiver.c:4018
+#: pg_backup_archiver.c:4132
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "파일 헤더에 있는 %d.%d 버전은 지원되지 않습니다"
 
-#: pg_backup_archiver.c:4023
+#: pg_backup_archiver.c:4137
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "정수 크기 (%lu) 안전성 검사 실패"
 
-#: pg_backup_archiver.c:4027
+#: pg_backup_archiver.c:4141
 #, c-format
 msgid ""
 "archive was made on a machine with larger integers, some operations might "
@@ -1093,12 +1204,12 @@ msgstr ""
 "이 아카이브는 큰 정수를 지원하는 시스템에서 만들어졌습니다. 그래서 몇 동작이 "
 "실패할 수도 있습니다."
 
-#: pg_backup_archiver.c:4037
+#: pg_backup_archiver.c:4151
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "예상되는 포멧 (%d)와 발견된 파일 포멧 (%d)이 서로 다름"
 
-#: pg_backup_archiver.c:4059
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid ""
 "archive is compressed, but this installation does not support compression "
@@ -1107,68 +1218,62 @@ msgstr ""
 "아카이브는 압축되어있지만, 이 프로그램에서는 (%s) 압축기능을 지원하지 못합니"
 "다 -- 이 안에 있는 자료를 모두 사용할 수 없습니다."
 
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "invalid creation date in header"
 msgstr "헤더에 잘못된 생성 날짜가 있음"
 
-#: pg_backup_archiver.c:4229
+#: pg_backup_archiver.c:4343
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "%d %s %s 항목을 처리하는 중"
 
-#: pg_backup_archiver.c:4314
+#: pg_backup_archiver.c:4428
 #, c-format
 msgid "entering main parallel loop"
 msgstr "기본 병렬 루프로 시작 중"
 
-#: pg_backup_archiver.c:4325
+#: pg_backup_archiver.c:4439
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "%d %s %s 항목을 건너뛰는 중"
 
-#: pg_backup_archiver.c:4334
+#: pg_backup_archiver.c:4448
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "%d %s %s 항목을 시작하는 중"
 
-#: pg_backup_archiver.c:4388
+#: pg_backup_archiver.c:4502
 #, c-format
 msgid "finished main parallel loop"
 msgstr "기본 병렬 루프 마침"
 
-#: pg_backup_archiver.c:4424
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "누락된 %d %s %s 항목 처리 중"
 
-#: pg_backup_archiver.c:4966
+#: pg_backup_archiver.c:5080
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "\"%s\" 테이블을 만들 수 없어, 해당 자료는 복원되지 않을 것입니다."
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "잘못된 large object용 OID"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "파일 seek 작업하는 도중 오류가 발생했습니다: %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "%d 자료 블록에 잘못된 접근 위치가 있음"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "아카이브 검색하는 동안 알 수 없는 자료 블럭 형태(%d)를 발견함"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1177,220 +1282,159 @@ msgstr ""
 "아카이브에서 블록 ID %d을(를) 찾지 못했습니다. 복원 요청이 잘못된 것 같습니"
 "다. 입력 파일을 검색할 수 없으므로 요청을 처리할 수 없습니다."
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr ""
 "아카이브에서 블록 ID %d을(를) 찾을 수 없습니다. 아카이브가 손상된 것 같습니"
 "다."
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
 msgstr "자료를 읽는 동안 예상치 못한 ID (%d) 발견됨 -- 예상값 %d"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "아카이브 복원하는 중에, 알 수 없는 자료 블럭 형태 %d 를 발견함"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
 #: pg_backup_tar.c:1032
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "아카이브 파일에서 검색 위치를 확인할 수 없음: %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "자료 파일을 닫을 수 없음: %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "입력 아카이브만 다시 열 수 있음"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "표준 입력을 이용한 병렬 복원 작업은 지원하지 않습니다"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr ""
 "시작 위치를 임의로 지정할 수 없는 파일로는 병렬 복원 작업을 할 수 없습니다."
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "아카이브 파일에서 검색 위치를 설정할 수 없음: %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "압축기 사용"
 
-#: pg_backup_db.c:42
-#, c-format
-msgid "could not get server_version from libpq"
-msgstr "libpq에서 server_verion 값을 구할 수 없음"
-
-#: pg_backup_db.c:53 pg_dumpall.c:1830
-#, c-format
-msgid "aborting because of server version mismatch"
-msgstr "서버 버전이 일치하지 않아 중단하는 중"
-
-#: pg_backup_db.c:54 pg_dumpall.c:1831
+#: pg_backup_db.c:41
 #, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "서버 버전: %s; %s 버전: %s"
+msgid "could not get \"server_version\" from libpq"
+msgstr "libpq에서 \"server_verion\" 값을 구할 수 없음"
 
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "데이터베이스에 이미 접속해 있음"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1677 pg_dumpall.c:1779
-msgid "Password: "
-msgstr "암호: "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "데이터베이스 접속을 할 수 없음"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "재연결 실패: %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1704 pg_dumpall.c:1788
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1893 pg_dumpall.c:1916
-#, c-format
-msgid "query failed: %s"
-msgstr "쿼리 실패: %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "Query was: %s"
-msgstr "사용한 쿼리: %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
 msgstr[0] "쿼리에서 한 개가 아닌 %d개의 행을 반환: %s"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %s사용된 명령: %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "쿼리를 실행 할 수 없음"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "PQputCopyData에 의해서 오류가 반환되었음: %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "PQputCopyEnd에 의해서 오류가 반환되었음: %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "\"%s\" 테이블을 위한 COPY 실패: %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2283
+#: pg_backup_db.c:460 pg_dump.c:2458
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "\"%s\" 테이블 COPY 작업 중 잘못된 부가 결과가 있음"
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "데이터베이스 트랜잭션을 시작할 수 없음"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "데이터베이스 트랜잭션을 commit 할 수 없음"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "자료가 저장될 디렉터리를 지정하지 않았음"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "출력 파일을 쓸 수 없음: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "자료 파일을 닫을 수 없음: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "\"%s\" 자료 파일을 닫을 수 없음: %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "입력용 large object TOC 파일(\"%s\")을 열 수 없음: %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "large object TOC 파일(\"%s\")을 닫을 수 없음: \"%s\""
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "large object TOC 파일(\"%s\")을 닫을 수 없음"
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "large object TOC 파일(\"%s\")을 닫을 수 없음: %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "LO 자료 파일을 닫을 수 없음: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "LO TOC 파일에 쓸 수 없음: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "LO TOC 파일을 닫을 수 없음: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "파일 이름이 너무 긺: \"%s\""
@@ -1482,57 +1526,92 @@ msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "%s 안에 손상된 tar 헤더 발견 (예상치 %d, 계산된 값 %d), 파일 위치 %llu"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "알 수 없는 섹션 이름: \"%s\""
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:799 pg_dump.c:816 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:403 pg_dumpall.c:411 pg_dumpall.c:418
+#: pg_dumpall.c:428 pg_dumpall.c:530 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:356
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "on_exit_nicely 슬롯 범위 벗어남"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:814 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인자를 지정했음 (시작: \"%s\")"
 
-#: pg_dump.c:728 pg_restore.c:344
+#: pg_dump.c:826 pg_restore.c:380
 #, c-format
 msgid "options -s/--schema-only and -a/--data-only cannot be used together"
 msgstr "-s/--schema-only 옵션과 -a/--data-only 옵션은 함께 사용할 수 없음"
 
-#: pg_dump.c:731
+#: pg_dump.c:828 pg_restore.c:382
+#, c-format
+msgid "options -s/--schema-only and --statistics-only cannot be used together"
+msgstr "-s/--schema-only 옵션과 --statistics-only 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:830 pg_restore.c:384
+#, c-format
+msgid "options -a/--data-only and --statistics-only cannot be used together"
+msgstr "-a/--data-only 옵션과 --statistics-only 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:834 pg_restore.c:388
+#, c-format
+msgid "options -a/--data-only and --no-data cannot be used together"
+msgstr "-a/--data-only 옵션과 --no-data 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:836 pg_restore.c:390
+#, c-format
+msgid "options -s/--schema-only and --no-schema cannot be used together"
+msgstr "-s/--schema-only 옵션과 --no-schema 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:838 pg_restore.c:392
+#, c-format
+msgid "options --statistics-only and --no-statistics cannot be used together"
+msgstr "--statistics-only 옵션과 --no-statistics 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:842 pg_restore.c:396
+#, c-format
+msgid "options --statistics and --no-statistics cannot be used together"
+msgstr "--statistics 옵션과 --no-statistics 옵션은 함께 사용할 수 없음"
+
+#: pg_dump.c:846 pg_dump.c:849 pg_restore.c:400 pg_restore.c:403
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "%s 옵션과, %s 옵션을 함께 사용할 수 없음"
+
+#: pg_dump.c:853
 #, c-format
 msgid ""
 "options -s/--schema-only and --include-foreign-data cannot be used together"
 msgstr ""
 "-s/--schema-only 옵션과 --include-foreign-data 옵션은 함께 사용할 수 없음"
 
-#: pg_dump.c:734
+#: pg_dump.c:856
 #, c-format
 msgid "option --include-foreign-data is not supported with parallel backup"
 msgstr "--include-foreign-data 옵션은 병렬 백업 작업에서 지원하지 않음"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:859 pg_restore.c:407
 #, c-format
 msgid "options -c/--clean and -a/--data-only cannot be used together"
 msgstr "-c/--clean 옵션과 -a/--data-only 옵션은 함께 사용할 수 없음"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:862 pg_dumpall.c:423 pg_restore.c:448
 #, c-format
 msgid "option --if-exists requires option -c/--clean"
 msgstr "--if-exists 옵션은 -c/--clean 옵션과 함께 사용해야 함"
 
-#: pg_dump.c:747
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "option --on-conflict-do-nothing requires option --inserts, --rows-per-"
@@ -1541,67 +1620,82 @@ msgstr ""
 "--on-conflict-do-nothing 옵션은 --inserts, --rows-per-insert 또는 --column-"
 "inserts 옵션과 함께 사용해야 함"
 
-#: pg_dump.c:776
+#: pg_dump.c:898 pg_dumpall.c:498 pg_restore.c:373
+#, c-format
+msgid "could not generate restrict key"
+msgstr "restrict 키를 만들 수 없음"
+
+#: pg_dump.c:900 pg_dumpall.c:500 pg_restore.c:375
+#, c-format
+msgid "invalid restrict key"
+msgstr "잘못된 restrict 키"
+
+#: pg_dump.c:903
+#, c-format
+msgid "option --restrict-key can only be used with --format=plain"
+msgstr "--restrict-key 옵션은 --format=plain 옵션을 사용할 때만 쓸 수 있음"
+
+#: pg_dump.c:925
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "알 수 없는 압축 알고리즘: \"%s\""
 
-#: pg_dump.c:783
+#: pg_dump.c:932
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "잘못된 압축 명세: %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:945
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "\"%s\" 압축 옵션은 pg_dump에서 현재 지원하지 않음"
 
-#: pg_dump.c:808
+#: pg_dump.c:957
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "병렬 백업은 디렉터리 기반 출력일 때만 사용할 수 있습니다."
 
-#: pg_dump.c:854
+#: pg_dump.c:1003
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "마지막 내장 OID는 %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1012
 #, c-format
 msgid "no matching schemas were found"
 msgstr "조건에 맞는 스키마가 없습니다"
 
-#: pg_dump.c:880
+#: pg_dump.c:1029
 #, c-format
 msgid "no matching tables were found"
 msgstr "조건에 맞는 테이블이 없습니다"
 
-#: pg_dump.c:908
+#: pg_dump.c:1057
 #, c-format
 msgid "no matching extensions were found"
 msgstr "조건에 맞는 확장 모듈이 없습니다"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1251
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s 프로그램은 데이터베이스를 텍스트 파일 또는 기타\n"
+"%s 프로그램은 데이터베이스를 SQL 스크립트 파일 또는 기타\n"
 "다른 형태의 파일로 덤프합니다.\n"
 "\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:635 pg_restore.c:452
+#: pg_dump.c:1252 pg_dumpall.c:694 pg_restore.c:523
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1253
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [옵션]... [DB이름]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:638 pg_restore.c:455
+#: pg_dump.c:1255 pg_dumpall.c:697 pg_restore.c:526
 #, c-format
 msgid ""
 "\n"
@@ -1610,12 +1704,12 @@ msgstr ""
 "\n"
 "일반 옵션들:\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1256
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=파일이름          출력 파일 또는 디렉터리 이름\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1257
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1624,22 +1718,22 @@ msgstr ""
 "  -F, --format=c|d|t|p         출력 파일 형식(사용자 지정, 디렉터리, tar,\n"
 "                               일반 텍스트(초기값))\n"
 
-#: pg_dump.c:1100
+#: pg_dump.c:1259
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=개수              덤프 작업을 병렬 처리 함\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:640
+#: pg_dump.c:1260 pg_dumpall.c:699
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                작업 내역을 자세히 봄\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:641
+#: pg_dump.c:1261 pg_dumpall.c:700
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                버전 정보를 보여주고 마침\n"
 
-#: pg_dump.c:1103
+#: pg_dump.c:1262
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1648,31 +1742,31 @@ msgstr ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
 "                               압축 지정\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:642
+#: pg_dump.c:1264 pg_dumpall.c:701
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=초       테이블 잠금 시 지정한 초만큼 기다린 후 실패\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:670
+#: pg_dump.c:1265 pg_dumpall.c:733
 #, c-format
 msgid ""
 "  --no-sync                    do not wait for changes to be written safely "
 "to disk\n"
 msgstr "  --no-sync                    fsync 작업 생략\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1266
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "  --sync-method=METHOD         파일을 디스크에 동기화할 방법 지정\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:643
+#: pg_dump.c:1267 pg_dumpall.c:702
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   이 도움말을 보여주고 마침\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:644
+#: pg_dump.c:1269 pg_dumpall.c:703
 #, c-format
 msgid ""
 "\n"
@@ -1681,34 +1775,36 @@ msgstr ""
 "\n"
 "출력 내용을 다루는 옵션들:\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:645
+#: pg_dump.c:1270 pg_dumpall.c:704
 #, c-format
-msgid "  -a, --data-only              dump only the data, not the schema\n"
-msgstr "  -a, --data-only              스키마 빼고 자료만 덤프\n"
+msgid ""
+"  -a, --data-only              dump only the data, not the schema or "
+"statistics\n"
+msgstr "  -a, --data-only              스키마와 통계정보를 빼고 자료만 덤프\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1271
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          큰 객체를 덤프에 포함\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1272
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (--large-objects 와 같음, 옛날 옵션)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1273
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       큰 객체 빼고 덤프\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1274
 #, c-format
 msgid ""
 "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr ""
 "  --no-blobs                   (--no-large-objects와 같음, 옛날 옵션)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1275 pg_restore.c:537
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) database objects before "
@@ -1717,34 +1813,34 @@ msgstr ""
 "  -c, --clean                  다시 만들기 전에 데이터베이스 개체 지우기(삭"
 "제)\n"
 
-#: pg_dump.c:1117
+#: pg_dump.c:1276
 #, c-format
 msgid ""
 "  -C, --create                 include commands to create database in dump\n"
 msgstr ""
 "  -C, --create                 데이터베이스 만드는 명령구문도 포함시킴\n"
 
-#: pg_dump.c:1118
+#: pg_dump.c:1277
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=PATTERN      지정한 확장 모듈들만 덤프 함\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:647
+#: pg_dump.c:1278 pg_dumpall.c:706
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=인코딩        지정한 인코딩으로 자료를 덤프 함\n"
 
-#: pg_dump.c:1120
+#: pg_dump.c:1279
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=PATTERN         지정한 SCHEMA들 자료만 덤프\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1280
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=PATTERN 지정한 SCHEMA들만 빼고 모두 덤프\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1281
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1753,12 +1849,15 @@ msgstr ""
 "  -O, --no-owner               일반 텍스트 형식에서\n"
 "                               개체 소유권 복원 건너뛰기\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:651
+#: pg_dump.c:1283 pg_dumpall.c:710
 #, c-format
-msgid "  -s, --schema-only            dump only the schema, no data\n"
-msgstr "  -s, --schema-only            자료구조(스키마)만 덤프\n"
+msgid ""
+"  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr ""
+"  -s, --schema-only            데이터나 통계정보를 빼고 자료구조(스키마)만 덤"
+"프\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1284
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use in plain-text "
@@ -1767,28 +1866,28 @@ msgstr ""
 "  -S, --superuser=NAME         일반 텍스트 형식에서 사용할 슈퍼유저 사용자 이"
 "름\n"
 
-#: pg_dump.c:1126
+#: pg_dump.c:1285
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=PATTERN          지정한 이름의 테이블들만 덤프\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1286
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=PATTERN  지정한 테이블들만 빼고 덤프\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:654
+#: pg_dump.c:1287 pg_dumpall.c:713
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges          접근 권한 (grant/revoke) 정보는 덤프 안 함\n"
 
-#: pg_dump.c:1129 pg_dumpall.c:655
+#: pg_dump.c:1288 pg_dumpall.c:714
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             업그레이드 유틸리티 전용\n"
 
-#: pg_dump.c:1130 pg_dumpall.c:656
+#: pg_dump.c:1289 pg_dumpall.c:715
 #, c-format
 msgid ""
 "  --column-inserts             dump data as INSERT commands with column "
@@ -1796,7 +1895,7 @@ msgid ""
 msgstr ""
 "  --column-inserts             칼럼 이름과 함께 INSERT 명령으로 자료 덤프\n"
 
-#: pg_dump.c:1131 pg_dumpall.c:657
+#: pg_dump.c:1290 pg_dumpall.c:716
 #, c-format
 msgid ""
 "  --disable-dollar-quoting     disable dollar quoting, use SQL standard "
@@ -1804,13 +1903,13 @@ msgid ""
 msgstr ""
 "  --disable-dollar-quoting     $ 인용 구문 사용안함, SQL 표준 따옴표 사용\n"
 
-#: pg_dump.c:1132 pg_dumpall.c:658 pg_restore.c:483
+#: pg_dump.c:1291 pg_dumpall.c:717 pg_restore.c:554
 #, c-format
 msgid ""
 "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr "  --disable-triggers           자료만 복원할 때 트리거 사용을 안함\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1292
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user "
@@ -1820,12 +1919,12 @@ msgstr ""
 "  --enable-row-security        로우 보안 활성화 (현재 작업자가 접근할 수\n"
 "                               있는 자료만 덤프 함)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1294
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=PATTERN  지정한 확장 모듈은 덤프하지 않음\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1295
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1837,13 +1936,13 @@ msgstr ""
 "                               상속 하위, 파티션 하위 테이블을 포함하는\n"
 "                               패턴의 테이블들은 빼고 덤프\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1298
 #, c-format
 msgid ""
 "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=PATTERN 해당 테이블 자료는 덤프 안함\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1299
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1854,14 +1953,14 @@ msgstr ""
 "                               상속 하위, 파티션 하위 테이블을 포함하는\n"
 "                               패턴의 테이블들의 자료는 빼고 덤프\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:660
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, c-format
 msgid ""
 "  --extra-float-digits=NUM     override default setting for "
 "extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM     기본 extra_float_digits 값 바꿈\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1303
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from "
@@ -1871,12 +1970,12 @@ msgstr ""
 "  --filter=FILENAME            지정한 파일의 규칙대로 포함하거나 제외할\n"
 "                               객체를 반영하여 덤프\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:662 pg_restore.c:487
+#: pg_dump.c:1305 pg_dumpall.c:721 pg_restore.c:558
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  객체 삭제 시 IF EXISTS 구문 사용\n"
 
-#: pg_dump.c:1147
+#: pg_dump.c:1306
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1887,60 +1986,80 @@ msgstr ""
 "                               지정한 패턴과 일치하는 외부 서버의 외부\n"
 "                               테이블 자료를 포함\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:663
+#: pg_dump.c:1309 pg_dumpall.c:722
 #, c-format
 msgid ""
 "  --inserts                    dump data as INSERT commands, rather than "
 "COPY\n"
 msgstr "  --inserts                    COPY 대신 INSERT 명령으로 자료 덤프\n"
 
-#: pg_dump.c:1151 pg_dumpall.c:664
+#: pg_dump.c:1310 pg_dumpall.c:723
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr ""
 "  --load-via-partition-root    상위 테이블을 통해 하위 테이블을 로드함\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:665
+#: pg_dump.c:1311 pg_dumpall.c:724
+#, c-format
+msgid "  --no-comments                do not dump comment commands\n"
+msgstr "  --no-comments                코멘트 명령들은 덤프 안함\n"
+
+#: pg_dump.c:1312 pg_dumpall.c:725
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
-msgstr "  --no-comments                코멘트는 덤프 안함\n"
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    데이터는 덤프 안함\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:666
+#: pg_dump.c:1313 pg_dumpall.c:726
+#, c-format
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                행 단위 보안 정책은 덤프 안함\n"
+
+#: pg_dump.c:1314 pg_dumpall.c:727
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            발행 정보는 덤프하지 않음\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:668
+#: pg_dump.c:1315 pg_dumpall.c:729
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-schema                  스키마는 덤프 안함\n"
+
+#: pg_dump.c:1316 pg_dumpall.c:730
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         보안 라벨 할당을 덤프 하지 않음\n"
 
-#: pg_dump.c:1155 pg_dumpall.c:669
+#: pg_dump.c:1317 pg_dumpall.c:731
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistics              통계정보는 덤프 안함\n"
+
+#: pg_dump.c:1318 pg_dumpall.c:732
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           구독 정보는 덤프하지 않음\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:671
+#: pg_dump.c:1319 pg_dumpall.c:734
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     테이블 접근 방법은 덤프하지 않음\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:672
+#: pg_dump.c:1320 pg_dumpall.c:735
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             테이블스페이스 할당을 덤프하지 않음\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:673
+#: pg_dump.c:1321 pg_dumpall.c:736
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       TOAST 압축 방법은 덤프하지 않음\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:674
+#: pg_dump.c:1322 pg_dumpall.c:737
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     언로그드 테이블 자료는 덤프하지 않음\n"
 
-#: pg_dump.c:1160 pg_dumpall.c:675
+#: pg_dump.c:1323 pg_dumpall.c:738
 #, c-format
 msgid ""
 "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT "
@@ -1949,14 +2068,20 @@ msgstr ""
 "  --on-conflict-do-nothing     INSERT 구문에 ON CONFLICT DO NOTHING 옵션 추"
 "가\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:676
+#: pg_dump.c:1324 pg_dumpall.c:739
 #, c-format
 msgid ""
 "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr ""
 "  --quote-all-identifiers      예약어가 아니여도 모든 식별자는 따옴표를 씀\n"
 
-#: pg_dump.c:1162 pg_dumpall.c:677
+#: pg_dump.c:1325 pg_dumpall.c:740 pg_restore.c:571
+#, c-format
+msgid ""
+"  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=RESTRICT_KEY  psql \\restrict 키 지정\n"
+
+#: pg_dump.c:1326 pg_dumpall.c:741
 #, c-format
 msgid ""
 "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
@@ -1964,7 +2089,7 @@ msgstr ""
 "  --rows-per-insert=NROWS      한 INSERT 명령으로 입력할 로우 수; --inserts\n"
 "                               옵션을 사용한 것으로 가정 함\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1327
 #, c-format
 msgid ""
 "  --section=SECTION            dump named section (pre-data, data, or post-"
@@ -1972,7 +2097,12 @@ msgid ""
 msgstr ""
 "  --section=SECTION            해당 섹션(pre-data, data, post-data)만 덤프\n"
 
-#: pg_dump.c:1164
+#: pg_dump.c:1328 pg_dumpall.c:742
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              덤프 안에 시퀀스 데이터 포함\n"
+
+#: pg_dump.c:1329
 #, c-format
 msgid ""
 "  --serializable-deferrable    wait until the dump can run without "
@@ -1981,12 +2111,24 @@ msgstr ""
 "  --serializable-deferrable    자료 정합성을 보장하기 위해 덤프 작업을\n"
 "                               직렬화 가능한 트랜잭션으로 처리 함\n"
 
-#: pg_dump.c:1165
+#: pg_dump.c:1330
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          지정한 스냅샷을 덤프 함\n"
 
-#: pg_dump.c:1166 pg_restore.c:497
+#: pg_dump.c:1331 pg_dumpall.c:743
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 통계정보 덤프\n"
+
+#: pg_dump.c:1332 pg_dumpall.c:744
+#, c-format
+msgid ""
+"  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr ""
+"  --statistics-only            스키마와 데이터를 빼고 통계정보만 덤프함\n"
+
+#: pg_dump.c:1333 pg_restore.c:575
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns "
@@ -1997,7 +2139,7 @@ msgstr ""
 "는\n"
 "                               객체가 적어도 하나 이상 있어야 함\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1335
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -2006,7 +2148,7 @@ msgstr ""
 "  --table-and-children=PATTERN 해당 패턴의 상속 하위, 파티션 하위 테이블만\n"
 "                               덤프\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:678 pg_restore.c:500
+#: pg_dump.c:1337 pg_dumpall.c:745 pg_restore.c:578
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -2019,7 +2161,7 @@ msgstr ""
 "명령\n"
 "                               대신 사용하여 소유권 설정\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:682 pg_restore.c:504
+#: pg_dump.c:1341 pg_dumpall.c:749 pg_restore.c:582
 #, c-format
 msgid ""
 "\n"
@@ -2028,45 +2170,45 @@ msgstr ""
 "\n"
 "연결 옵션들:\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1342
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAME      덤프할 데이터베이스\n"
 
-#: pg_dump.c:1176 pg_dumpall.c:684 pg_restore.c:505
+#: pg_dump.c:1343 pg_dumpall.c:751 pg_restore.c:583
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME      접속할 데이터베이스 서버 또는 소켓 디렉터리\n"
 
-#: pg_dump.c:1177 pg_dumpall.c:686 pg_restore.c:506
+#: pg_dump.c:1344 pg_dumpall.c:753 pg_restore.c:584
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          데이터베이스 서버의 포트 번호\n"
 
-#: pg_dump.c:1178 pg_dumpall.c:687 pg_restore.c:507
+#: pg_dump.c:1345 pg_dumpall.c:754 pg_restore.c:585
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      연결할 데이터베이스 사용자\n"
 
-#: pg_dump.c:1179 pg_dumpall.c:688 pg_restore.c:508
+#: pg_dump.c:1346 pg_dumpall.c:755 pg_restore.c:586
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        암호 프롬프트 표시 안 함\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:689 pg_restore.c:509
+#: pg_dump.c:1347 pg_dumpall.c:756 pg_restore.c:587
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
 msgstr "  -W, --password           암호 입력 프롬프트 보임(자동으로 처리함)\n"
 
-#: pg_dump.c:1181 pg_dumpall.c:690
+#: pg_dump.c:1348 pg_dumpall.c:757
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLENAME          덤프 전에 SET ROLE 수행\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "\n"
@@ -2079,430 +2221,460 @@ msgstr ""
 "사용합니다.\n"
 "\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:694 pg_restore.c:516
+#: pg_dump.c:1352 pg_dumpall.c:761 pg_restore.c:594
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "문제점 보고 주소 <%s>\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:695 pg_restore.c:517
+#: pg_dump.c:1353 pg_dumpall.c:762 pg_restore.c:595
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1372 pg_dumpall.c:560
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "클라이언트 인코딩 값이 잘못되었습니다: \"%s\""
 
-#: pg_dump.c:1352
+#: pg_dump.c:1520
 #, c-format
 msgid ""
 "parallel dumps from standby servers are not supported by this server version"
 msgstr "대기 서버에서 병렬 덤프는 이 서버 버전에서 지원하지 않음"
 
-#: pg_dump.c:1417
+#: pg_dump.c:1585
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "\"%s\" 값은 잘못된 출력 파일 형태입니다."
 
-#: pg_dump.c:1458 pg_dump.c:1514 pg_dump.c:1567 pg_dumpall.c:1467
+#: pg_dump.c:1626 pg_dump.c:1682 pg_dump.c:1735 pg_dumpall.c:1588
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "적당하지 않은 qualified 이름 입니다 (너무 많은 점이 있네요): %s"
 
-#: pg_dump.c:1466
+#: pg_dump.c:1634
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "\"%s\" 검색 조건에 만족하는 스키마가 없습니다"
 
-#: pg_dump.c:1519
+#: pg_dump.c:1687
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "\"%s\" 검색 조건에 만족하는 확장 모듈이 없습니다"
 
-#: pg_dump.c:1572
+#: pg_dump.c:1740
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "\"%s\" 검색 조건에 만족하는 외부 서버가 없습니다"
 
-#: pg_dump.c:1643
+#: pg_dump.c:1811
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr ""
 "적당하지 않은 릴레이션(relation) 이름 입니다 (너무 많은 점이 있네요): %s"
 
-#: pg_dump.c:1665
+#: pg_dump.c:1833
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "\"%s\" 검색 조건에 만족하는 테이블이 없습니다"
 
-#: pg_dump.c:1692
+#: pg_dump.c:1860
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "현재 데이터베이스에 연결되어있지 않습니다."
 
-#: pg_dump.c:1695
+#: pg_dump.c:1863
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "서로 다른 데이터베이스간의 참조는 구현되어있지 않습니다: %s"
 
-#: pg_dump.c:2154
+#: pg_dump.c:2329
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "\"%s.%s\" 테이블의 내용 덤프 중"
 
-#: pg_dump.c:2264
+#: pg_dump.c:2439
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "\"%s\" 테이블 내용을 덤프하면서 오류 발생: PQgetCopyData() 실패."
 
-#: pg_dump.c:2265 pg_dump.c:2275
+#: pg_dump.c:2440 pg_dump.c:2450
 #, c-format
 msgid "Error message from server: %s"
 msgstr "서버에서 보낸 오류 메시지: %s"
 
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2441 pg_dump.c:2451
 #, c-format
 msgid "Command was: %s"
 msgstr "사용된 명령: %s"
 
-#: pg_dump.c:2274
+#: pg_dump.c:2449
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "\"%s\" 테이블 내용을 덤프하면서 오류 발생: PQgetResult() 실패."
 
-#: pg_dump.c:2365
+#: pg_dump.c:2540
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "\"%s\" 테이블에서 잘못된 필드 수"
 
-#: pg_dump.c:3067
+#: pg_dump.c:3258
 #, c-format
 msgid "saving database definition"
 msgstr "데이터베이스 구성정보를 저장 중"
 
-#: pg_dump.c:3176
+#: pg_dump.c:3373
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "알 수 없는 로케일 제공자 이름: %s"
 
-#: pg_dump.c:3537
+#: pg_dump.c:3734
 #, c-format
 msgid "saving encoding = %s"
 msgstr "인코딩 = %s 저장 중"
 
-#: pg_dump.c:3562
+#: pg_dump.c:3759
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "\"standard_conforming_strings = %s\" 저장 중"
 
-#: pg_dump.c:3601
+#: pg_dump.c:3798
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "current_schemas() 결과를 분석할 수 없음"
 
-#: pg_dump.c:3620
+#: pg_dump.c:3817
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "\"search_path = %s\" 저장 중"
 
-#: pg_dump.c:3656
+#: pg_dump.c:3853
 #, c-format
 msgid "reading large objects"
 msgstr "large object 읽는 중"
 
-#: pg_dump.c:3877
+#: pg_dump.c:4074
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "\"%s\" large object들을 저장 중"
 
-#: pg_dump.c:3898
+#: pg_dump.c:4095
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "%u large object 읽는 중 오류: %s"
 
-#: pg_dump.c:4001
+#: pg_dump.c:4203
 #, c-format
 msgid "reading row-level security policies"
 msgstr "로우 단위 보안 정책 읽는 중"
 
-#: pg_dump.c:4142
+#: pg_dump.c:4344
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "예상치 못한 정책 명령 형태: %c"
 
-#: pg_dump.c:4592 pg_dump.c:5150 pg_dump.c:12364 pg_dump.c:18249
-#: pg_dump.c:18251 pg_dump.c:18873
+#: pg_dump.c:4786 pg_dump.c:5343 pg_dump.c:7972 pg_dump.c:13450 pg_dump.c:19643
+#: pg_dump.c:19645 pg_dump.c:20277
 #, c-format
 msgid "could not parse %s array"
 msgstr "%s 배열을 분석할 수 없음"
 
-#: pg_dump.c:4806
+#: pg_dump.c:5002
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr ""
 "현재 사용자가 슈퍼유저가 아니기 때문에 서브스크립션들은 덤프하지 못했음"
 
-#: pg_dump.c:5012
+#: pg_dump.c:5206
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "%u OID 구독이 없음"
 
-#: pg_dump.c:5019
+#: pg_dump.c:5213
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "안전 검사 실패, OID %u인 테이블 없음"
 
-#: pg_dump.c:5582
+#: pg_dump.c:5799
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "%s %s 객체와 관련된 상위 확장 기능을 찾을 수 없음"
 
-#: pg_dump.c:5727
+#: pg_dump.c:5937
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "OID %u 스키마 없음"
 
-#: pg_dump.c:7209 pg_dump.c:17620
+#: pg_dump.c:6994
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "\"%c\" 종류의 릴레이션용 통계정보를 덤프할 수 없음"
+
+#: pg_dump.c:7506 pg_dump.c:18987
 #, c-format
 msgid ""
 "failed sanity check, parent table with OID %u of sequence with OID %u not "
 "found"
 msgstr "의존성 검사 실패, 부모 테이블 OID %u 없음. 해당 시퀀스 개체 OID %u"
 
-#: pg_dump.c:7354
+#: pg_dump.c:7651
 #, c-format
 msgid ""
 "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "완전성 검사 실패, OID %u인 객체가 pg_partitioned_table에 없음"
 
-#: pg_dump.c:7585 pg_dump.c:7859 pg_dump.c:8306 pg_dump.c:8920 pg_dump.c:9042
-#: pg_dump.c:9190
+#: pg_dump.c:7916 pg_dump.c:8209 pg_dump.c:8672 pg_dump.c:9317 pg_dump.c:9456
+#: pg_dump.c:9601 pg_dump.c:9701
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "알 수 없는 테이블 OID %u"
 
-#: pg_dump.c:7589
+#: pg_dump.c:7920
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "\"%s\" 테이블의 인덱스 자료를 알 수 없음"
 
-#: pg_dump.c:8091
+#: pg_dump.c:8459
 #, c-format
 msgid ""
 "failed sanity check, parent table with OID %u of pg_rewrite entry with OID "
 "%u not found"
 msgstr "의존성 검사 실패, 부모 테이블 OID %u 없음. 해당 pg_rewrite 개체 OID %u"
 
-#: pg_dump.c:8924
+#: pg_dump.c:9321
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "\"%s\" 테이블의 알 수 없는 칼럼 자료"
 
-#: pg_dump.c:8953
+#: pg_dump.c:9353
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "\"%s\" 테이블에 매겨져 있는 열 번호가 잘못되었습니다"
 
-#: pg_dump.c:9004
+#: pg_dump.c:9418
 #, c-format
 msgid "finding table default expressions"
 msgstr "default 표현식 찾는 중"
 
-#: pg_dump.c:9046
+#: pg_dump.c:9460
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "적당하지 않는 adnum 값: %d, 해당 테이블 \"%s\""
 
-#: pg_dump.c:9140
+#: pg_dump.c:9553
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "잘못된 not-null 제약조건 찾는 중"
+
+#: pg_dump.c:9651
 #, c-format
 msgid "finding table check constraints"
 msgstr "테이블 체크 제약조건 찾는 중"
 
-#: pg_dump.c:9194
+#: pg_dump.c:9705
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] ""
 "%d개의 제약 조건이 \"%s\" 테이블에 있을 것으로 예상했으나 %d개를 찾음"
 
-#: pg_dump.c:9198
+#: pg_dump.c:9709
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "시스템 카탈로그가 손상되었는 것 같습니다."
 
-#: pg_dump.c:9888
+#: pg_dump.c:10514
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "%u OID 롤이 없음"
 
-#: pg_dump.c:10000 pg_dump.c:10029
+#: pg_dump.c:10626 pg_dump.c:10655
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "지원하지 않는 pg_init_privs 항목: %u %u %d"
 
-#: pg_dump.c:10576
+#: pg_dump.c:10951
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "statistics 덤프 순서가 이상함 (현재: %d %s %s, 기대값: %d %s %s)"
+
+#: pg_dump.c:11092
+#, c-format
+msgid "unexpected null attname"
+msgstr "예상치 못한 null attname"
+
+#: pg_dump.c:11121
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "인덱스 attname \"%s\" 찾을 수 없음"
+
+#: pg_dump.c:11607
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "\"%s\"large object의 메타정보가 없음"
 
-#: pg_dump.c:10859
+#: pg_dump.c:11893
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "\"%s\" 자료형의 typtype가 잘못 되어 있음"
 
-#: pg_dump.c:12433
+#: pg_dump.c:13521
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "\"%s\" 함수의 provolatile 값이 잘못 되었습니다"
 
-#: pg_dump.c:12483 pg_dump.c:14379
+#: pg_dump.c:13571 pg_dump.c:15467
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "\"%s\" 함수의 proparallel 값이 잘못 되었습니다"
 
-#: pg_dump.c:12613 pg_dump.c:12719 pg_dump.c:12726
+#: pg_dump.c:13701 pg_dump.c:13807 pg_dump.c:13814
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "%u OID 함수에 대한 함수 정의를 찾을 수 없음"
 
-#: pg_dump.c:12652
+#: pg_dump.c:13740
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "pg_cast.castfunc 또는 pg_cast.castmethod 필드에 잘못된 값이 있음"
 
-#: pg_dump.c:12655
+#: pg_dump.c:13743
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "pg_cast.castmethod 필드에 잘못된 값이 있음"
 
-#: pg_dump.c:12745
+#: pg_dump.c:13833
 #, c-format
 msgid ""
 "bogus transform definition, at least one of trffromsql and trftosql should "
 "be nonzero"
 msgstr "잘못된 전송 정의, trffromsql 또는 trftosql 중 하나는 비어 있으면 안됨"
 
-#: pg_dump.c:12762
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "pg_transform.trffromsql 필드에 잘못된 값이 있음"
 
-#: pg_dump.c:12783
+#: pg_dump.c:13871
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "pg_transform.trftosql 필드에 잘못된 값이 있음"
 
-#: pg_dump.c:12928
+#: pg_dump.c:14016
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "postfix 연산자는 더이상 지원하지 않습니다.(\"%s\" 연산자)"
 
-#: pg_dump.c:13098
+#: pg_dump.c:14186
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "%s OID의 연산자를 찾을 수 없음"
 
-#: pg_dump.c:13166
+#: pg_dump.c:14254
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "\"%c\" 잘못된 자료형, 해당 접근 방법: \"%s\""
 
-#: pg_dump.c:13840 pg_dump.c:13908
+#: pg_dump.c:14928 pg_dump.c:14996
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "알 수 없는 정렬규칙 제공자 이름: %s"
 
-#: pg_dump.c:13849 pg_dump.c:13856 pg_dump.c:13867 pg_dump.c:13877
-#: pg_dump.c:13892
+#: pg_dump.c:14937 pg_dump.c:14944 pg_dump.c:14955 pg_dump.c:14965
+#: pg_dump.c:14980
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "잘못된 문자정렬규칙 \"%s\""
 
-#: pg_dump.c:14298
+#: pg_dump.c:15386
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "\"%s\" 집계 함수용 aggfinalmodify 값이 이상함"
 
-#: pg_dump.c:14354
+#: pg_dump.c:15442
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "\"%s\" 집계 함수용 aggmfinalmodify 값이 이상함"
 
-#: pg_dump.c:15071
+#: pg_dump.c:16162
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "기본 접근 권한에서 알 수 없는 객체형이 있음: %d"
 
-#: pg_dump.c:15087
+#: pg_dump.c:16178
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "기본 ACL 목록 (%s)을 분석할 수 없음"
 
-#: pg_dump.c:15171
+#: pg_dump.c:16262
 #, c-format
 msgid ""
 "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr ""
 "초기 ACL 목록 (%s) 또는 default (%s) 분석할 수 없음, 해당 객체: \"%s\" (%s)"
 
-#: pg_dump.c:15196
+#: pg_dump.c:16287
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "ACL 목록 (%s) 또는 default (%s) 분석할 수 없음, 해당 객체: \"%s\" (%s)"
 
-#: pg_dump.c:15739
+#: pg_dump.c:16830
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "\"%s\" 뷰 정의 정보가 없습니다."
 
-#: pg_dump.c:15742
+#: pg_dump.c:16833
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "\"%s\" 뷰 정의 정보가 하나 이상 있습니다."
 
-#: pg_dump.c:15749
+#: pg_dump.c:16840
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "\"%s\" 뷰의 정의 내용이 비어있습니다."
 
-#: pg_dump.c:15834
+#: pg_dump.c:16925
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS 옵션은 더이상 지원하지 않음 (\"%s\" 테이블)"
 
-#: pg_dump.c:16821
+#: pg_dump.c:18065
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "잘못된 열 번호 %d, 해당 테이블 \"%s\""
 
-#: pg_dump.c:16899
+#: pg_dump.c:18143
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "인덱스 통계정보 칼럼 분석 실패"
 
-#: pg_dump.c:16901
+#: pg_dump.c:18145
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "인덱스 통계정보 값 분석 실패"
 
-#: pg_dump.c:16903
+#: pg_dump.c:18147
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "인덱스 통계정보용 칼럼수와 값수가 일치하지 않음"
 
-#: pg_dump.c:17118
+#: pg_dump.c:18376
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "\"%s\" 제약 조건을 위한 인덱스가 빠졌습니다"
 
-#: pg_dump.c:17353
+#: pg_dump.c:18645
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "알 수 없는 제약 조건 종류: %c"
 
-#: pg_dump.c:17454 pg_dump.c:17684
+#: pg_dump.c:18698
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "알 수 없는 시퀀스 형태: %s"
+
+#: pg_dump.c:18830 pg_dump.c:19062
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural ""
@@ -2510,12 +2682,12 @@ msgid_plural ""
 msgstr[0] ""
 "\"%s\" 시퀀스의 데이터를 가져오기 위한 쿼리에서 %d개의 행 반환(1개 필요)"
 
-#: pg_dump.c:17486
+#: pg_dump.c:18866
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "알 수 없는 시퀀스 형태: %s"
+msgid "unrecognized sequence type: %d"
+msgstr "알 수 없는 시퀀스 형태: %d"
 
-#: pg_dump.c:18001
+#: pg_dump.c:19395
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -2523,59 +2695,59 @@ msgid ""
 msgstr ""
 "\"%s\" 규칙(\"%s\" 테이블)을 가져오기 위한 쿼리 실패: 잘못된 행 수 반환"
 
-#: pg_dump.c:18154
+#: pg_dump.c:19548
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "%u 확장기능과 관련된 상위 확장 기능을 찾을 수 없음"
 
-#: pg_dump.c:18253
+#: pg_dump.c:19647
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "확장 모듈용 환경설정 매개변수 수와 조건 수가 일치 하지 않음"
 
-#: pg_dump.c:18385
+#: pg_dump.c:19779
 #, c-format
 msgid "reading dependency data"
 msgstr "의존 관계 자료 읽는 중"
 
-#: pg_dump.c:18471
+#: pg_dump.c:19865
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "%u %u 개체의 하위 관련 개체가 없음"
 
-#: pg_dump.c:18482
+#: pg_dump.c:19876
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "%u %u 개체의 상위 관련 개체가 없음"
 
-#: pg_dump.c:18907 pg_dump.c:18945 pg_dumpall.c:1962 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20311 pg_dump.c:20349 pg_dumpall.c:1836 pg_restore.c:629
+#: pg_restore.c:675
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "%s 필터(대상 \"%s\")는 허용하지 않음"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:648
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "잘못된 dumpId %d"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:654
 #, c-format
 msgid "invalid dependency %d"
 msgstr "잘못된 의존성 %d"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:818
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "의존 관계를 식별 할 수 없음"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1462
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "다음 데이블 간 참조키가 서로 교차하고 있음:"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1467
 #, c-format
 msgid ""
 "You might not be able to restore the dump without using --disable-triggers "
@@ -2584,7 +2756,7 @@ msgstr ""
 "--disable-triggers 옵션으로 복원할 수 있습니다. 또는 임시로 제약 조건을 삭제"
 "하고 복원하세요."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1468
 #, c-format
 msgid ""
 "Consider using a full dump instead of a --data-only dump to avoid this "
@@ -2592,12 +2764,12 @@ msgid ""
 msgstr ""
 "이 문제를 피하려면, --data-only 덤프 대신에 모든 덤프를 사용하길 권합니다."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "다음 항목 간 의존 관계를 분석할 수 없음:"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
@@ -2606,46 +2778,41 @@ msgstr ""
 "\"%s\" 프로그램이 %s 작업에서 필요로 하지만, \"%s\" 디렉터리 안에 함께 있지 "
 "않습니다"
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "\"%s\" 프로그램을 \"%s\" 작업 때문에 찾았지만, %s 버전과 같지 않습니다."
 
-#: pg_dumpall.c:387
+#: pg_dumpall.c:402
 #, c-format
 msgid ""
-"option --exclude-database cannot be used together with -g/--globals-only, "
-"-r/--roles-only, or -t/--tablespaces-only"
+"option --exclude-database cannot be used together with -g/--globals-only, -"
+"r/--roles-only, or -t/--tablespaces-only"
 msgstr ""
 "--exclude-database 옵션은 -g/--globals-only, -r/--roles-only, 또는 -t/--"
 "tablespaces-only 옵션과 함께 쓸 수 없음"
 
-#: pg_dumpall.c:395
+#: pg_dumpall.c:410
 #, c-format
 msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
 msgstr "-g/--globals-only 옵션과 -r/--roles-only 옵션은 함께 사용할 수 없음"
 
-#: pg_dumpall.c:402
+#: pg_dumpall.c:417
 #, c-format
 msgid ""
 "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
 msgstr ""
 "-g/--globals-only 옵션과 -t/--tablespaces-only 옵션은 함께 사용할 수 없음"
 
-#: pg_dumpall.c:412
+#: pg_dumpall.c:427
 #, c-format
 msgid ""
 "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
 msgstr ""
 "-r/--roles-only 옵션과 -t/--tablespaces-only 옵션은 함께 사용할 수 없음"
 
-#: pg_dumpall.c:474 pg_dumpall.c:1771
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "\"%s\" 데이터베이스에 접속할 수 없음"
-
-#: pg_dumpall.c:486
+#: pg_dumpall.c:528
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2654,45 +2821,45 @@ msgstr ""
 "\"postgres\" 또는 \"template1\" 데이터베이스에 연결할 수 없습니다.\n"
 "다른 데이터베이스를 지정하십시오."
 
-#: pg_dumpall.c:634
+#: pg_dumpall.c:693
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
 "%s 프로그램은 PostgreSQL 데이터베이스 클러스터를 SQL 스크립트 파일로\n"
 "추출하는 프로그램입니다.\n"
 "\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:695
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [옵션]...\n"
 
-#: pg_dumpall.c:639
+#: pg_dumpall.c:698
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=파일이름          출력 파일 이름\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:705
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr ""
 "  -c, --clean                  다시 만들기 전에 데이터베이스 지우기(삭제)\n"
 
-#: pg_dumpall.c:648
+#: pg_dumpall.c:707
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           데이터베이스는 제외하고 글로벌 개체만 덤프\n"
 
-#: pg_dumpall.c:649 pg_restore.c:475
+#: pg_dumpall.c:708 pg_restore.c:546
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               개체 소유권 복원 건너뛰기\n"
 
-#: pg_dumpall.c:650
+#: pg_dumpall.c:709
 #, c-format
 msgid ""
 "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
@@ -2700,12 +2867,12 @@ msgstr ""
 "  -r, --roles-only             데이터베이스나 테이블스페이스는 제외하고 역할"
 "만 덤프\n"
 
-#: pg_dumpall.c:652
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NAME         덤프에 사용할 슈퍼유저 사용자 이름\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:712
 #, c-format
 msgid ""
 "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
@@ -2713,36 +2880,36 @@ msgstr ""
 "  -t, --tablespaces-only       데이터베이스나 역할은 제외하고 테이블스페이스"
 "만 덤프\n"
 
-#: pg_dumpall.c:659
+#: pg_dumpall.c:718
 #, c-format
 msgid ""
 "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr ""
 "  --exclude-database=PATTERN   해당 PATTERN에 일치하는 데이터베이스 제외\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:720
 #, c-format
 msgid ""
 "  --filter=FILENAME            exclude databases based on expressions in "
 "FILENAME\n"
 msgstr "  --filter=FILENAME            필터 조건이 정의 파일을 사용하여 덤프\n"
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:728
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          롤용 비밀번호를 덤프하지 않음\n"
 
-#: pg_dumpall.c:683
+#: pg_dumpall.c:750
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=접속문자열  서버 접속 문자열\n"
 
-#: pg_dumpall.c:685
+#: pg_dumpall.c:752
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    대체용 기본 데이터베이스\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:759
 #, c-format
 msgid ""
 "\n"
@@ -2756,81 +2923,77 @@ msgstr ""
 "출력에 쓰여집니다.\n"
 "\n"
 
-#: pg_dumpall.c:837
+#: pg_dumpall.c:904
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "롤 이름이 \"pg_\"로 시작함, 무시함: (%s)"
 
-#: pg_dumpall.c:1059
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1121 pg_dumpall.c:1179 pg_dumpall.c:1188
+#, c-format
+msgid "found orphaned pg_auth_members entry for role %s"
+msgstr "%s 롤용 pg_auth_members 항목이 없음"
+
+#: pg_dumpall.c:1154
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "\"%s\" 롤은 덤프할 수 있는 롤을 포함하고 있지 않습니다"
 
-#: pg_dumpall.c:1194
+#: pg_dumpall.c:1309
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "ACL 목록 (%s)을 분석할 수 없음, 해당 매개변수 \"%s\""
 
-#: pg_dumpall.c:1321
+#: pg_dumpall.c:1436
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "테이블스페이스 용 ACL 목록 (%s)을 분석할 수 없음, 해당개체 \"%s\""
 
-#: pg_dumpall.c:1528
+#: pg_dumpall.c:1650
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "\"%s\" 데이터베이스를 제외하는 중"
 
-#: pg_dumpall.c:1532
+#: pg_dumpall.c:1654
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "\"%s\" 데이터베이스 덤프 중"
 
-#: pg_dumpall.c:1563
+#: pg_dumpall.c:1687
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "\"%s\" 데이터베이스에서 pg_dump 작업 중에 오류가 발생, 끝냅니다."
 
-#: pg_dumpall.c:1569
+#: pg_dumpall.c:1693
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "\"%s\" 출력 파일을 다시 열 수 없음: %m"
 
-#: pg_dumpall.c:1613
+#: pg_dumpall.c:1737
 #, c-format
 msgid "running \"%s\""
 msgstr "\"%s\" 가동중"
 
-#: pg_dumpall.c:1814
-#, c-format
-msgid "could not get server version"
-msgstr "서버 버전을 알 수 없음"
-
-#: pg_dumpall.c:1817
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "\"%s\" 서버 버전을 분석할 수 없음"
-
-#: pg_dumpall.c:1887 pg_dumpall.c:1910
-#, c-format
-msgid "executing %s"
-msgstr "실행중: %s"
-
-#: pg_dumpall.c:1982
+#: pg_dumpall.c:1856
 msgid "unsupported filter object"
 msgstr "지원하지 않는 필터 객체"
 
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "-d/--dbname 옵션 또는 -f/--file 옵션 중 하나를 지정해야 함"
 
-#: pg_restore.c:336
+#: pg_restore.c:355
 #, c-format
 msgid "options -d/--dbname and -f/--file cannot be used together"
 msgstr "-d/--dbname 옵션과 -f/--file 옵션은 함께 사용할 수 없음"
 
-#: pg_restore.c:350
+#: pg_restore.c:361
+#, c-format
+msgid "options -d/--dbname and --restrict-key cannot be used together"
+msgstr "-d/--dbname 옵션과 --restrict-key 옵션은 함께 사용할 수 없음"
+
+#: pg_restore.c:410
 #, c-format
 msgid ""
 "options -1/--single-transaction and --transaction-size cannot be used "
@@ -2838,29 +3001,34 @@ msgid ""
 msgstr ""
 "-1/--single-transaction 옵션과 --transaction-size 옵션은 함께 사용할 수 없음"
 
-#: pg_restore.c:357
+#: pg_restore.c:417
 #, c-format
 msgid "options -C/--create and -1/--single-transaction cannot be used together"
 msgstr "-C/--clean 옵션과 -1/--single-transaction 옵션은 함께 사용할 수 없음"
 
-#: pg_restore.c:361
+#: pg_restore.c:421
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "--single-transaction 및 병렬 작업을 함께 지정할 수는 없음"
 
-#: pg_restore.c:399
+#: pg_restore.c:467
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "\"%s\" 아카이브 양식은 지원하지 않습니다; psql을 사용하세요"
+
+#: pg_restore.c:471
 #, c-format
 msgid ""
 "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr ""
 "알 수 없는 아카이브 형식: \"%s\"; 사용할 수 있는 값: \"c\", \"d\", \"t\""
 
-#: pg_restore.c:438
+#: pg_restore.c:509
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "복원작업에서의 오류들이 무시되었음: %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:522
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2870,47 +3038,47 @@ msgstr ""
 "그 자료를 일괄 입력합니다.\n"
 "\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:524
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [옵션]... [파일]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:527
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        접속할 데이터베이스 이름\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:528
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FILENAME      출력 파일 이름 (표준 출력: -)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:529
 #, 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:459
+#: pg_restore.c:530
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               자료의 요약된 목차를 보여줌\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:531
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            자세한 정보 보여줌\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:532
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            버전 정보를 보여주고 마침\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:533
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               이 도움말을 보여주고 마침\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "\n"
@@ -2919,33 +3087,33 @@ msgstr ""
 "\n"
 "리스토어 처리를 위한 옵션들:\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:536
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              스키마는 빼고 자료만 입력함\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:538
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 작업 대상 데이터베이스를 만듦\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:539
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr ""
 "  -e, --exit-on-error          오류가 생기면 끝냄, 기본은 계속 진행함\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:540
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAME             지정한 인덱스 만듦\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:541
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM               여러 병렬 작업을 사용하여 복원\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:542
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2954,27 +3122,27 @@ msgstr ""
 "  -L, --use-list=FILENAME      출력을 선택하고 해당 순서를 지정하기 위해\n"
 "                               이 파일의 목차 사용\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:544
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NAME            해당 스키마의 개체들만 복원함\n"
 
-#: pg_restore.c:474
+#: pg_restore.c:545
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=NAME    해당 스키마의 개체들은 복원 안함\n"
 
-#: pg_restore.c:476
+#: pg_restore.c:547
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NAME(args)    지정한 함수 만듦\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:548
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            자료구조(스키마)만 만듦\n"
 
-#: pg_restore.c:478
+#: pg_restore.c:549
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use for disabling "
@@ -2983,35 +3151,35 @@ msgstr ""
 "  -S, --superuser=NAME         트리거를 사용하지 않기 위해 사용할 슈퍼유저\n"
 "                               사용자 이름\n"
 
-#: pg_restore.c:479
+#: pg_restore.c:550
 #, c-format
 msgid ""
 "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NAME             복원할 객체 이름 (테이블, 뷰, 기타)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:551
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAME           지정한 트리거 만듦\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:552
 #, c-format
 msgid ""
 "  -x, --no-privileges          skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x, --no-privileges          접근 권한(grant/revoke) 지정 안함\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:553
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     하나의 트랜잭션 작업으로 복원함\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:555
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        로우 보안 활성화\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:556
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -3019,12 +3187,17 @@ msgid ""
 msgstr ""
 "  --filter=FILENAME            지정한 파일의 필터 조건으로 객체를 복원함\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:559
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
-msgstr "  --no-comments                코멘트는 복원하지 않음\n"
+msgid "  --no-comments                do not restore comment commands\n"
+msgstr "  --no-comments                코멘트 명령들은 복원하지 않음\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:560
+#, c-format
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    데이터는 복원하지 않음\n"
+
+#: pg_restore.c:561
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not "
@@ -3034,32 +3207,47 @@ msgstr ""
 "  --no-data-for-failed-tables  만들 수 없는 테이블에 대해서는 자료를 덤프하"
 "지 않음\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:563
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr "  --no-policies                행 단위 보안 정책은 복원하지 않음\n"
+
+#: pg_restore.c:564
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            발행 정보는 복원 안함\n"
 
-#: pg_restore.c:492
+#: pg_restore.c:565
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  스키마는 복원하지 않음\n"
+
+#: pg_restore.c:566
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         보안 라벨을 복원하지 않음\n"
 
-#: pg_restore.c:493
+#: pg_restore.c:567
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              통계정보는 복원 안함\n"
+
+#: pg_restore.c:568
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           구독 정보는 복원 안함\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:569
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     테이블 접근 방법 복원 안함\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:570
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             테이블스페이스 할당을 복원하지 않음\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:572
 #, c-format
 msgid ""
 "  --section=SECTION            restore named section (pre-data, data, or "
@@ -3068,17 +3256,30 @@ msgstr ""
 "  --section=SECTION            지정한 섹션만 복원함\n"
 "                               섹션 종류: pre-data, data, post-data\n"
 
-#: pg_restore.c:499
+#: pg_restore.c:573
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 통계정보를 복원함\n"
+
+#: pg_restore.c:574
+#, c-format
+msgid ""
+"  --statistics-only            restore only the statistics, not schema or "
+"data\n"
+msgstr ""
+"  --statistics-only            스키마나 데이터는 빼고 통계정보만 복원함\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         N 개의 객체 다음에는 항상 commit\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:588
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          복원 전에 SET ROLE 수행\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:590
 #, c-format
 msgid ""
 "\n"
@@ -3091,7 +3292,7 @@ msgstr ""
 "기\n"
 "위해서 여러번 사용할 수 있습니다.\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:593
 #, c-format
 msgid ""
 "\n"
@@ -3102,7 +3303,21 @@ msgstr ""
 "사용할 입력 파일을 지정하지 않았다면, 표준 입력(stdin)을 사용합니다.\n"
 "\n"
 
-#, c-format
+#~ msgid "  %s"
+#~ msgstr "  %s"
+
+#~ msgid "could not close directory \"%s\": %m"
+#~ msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
+
+#~ msgid "could not connect to database"
+#~ msgstr "데이터베이스 접속을 할 수 없음"
+
+#~ msgid "could not write to LOs TOC file: %s"
+#~ msgstr "LO TOC 파일에 쓸 수 없음: %s"
+
+#~ msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\""
+#~ msgstr "잘못된 인수 문자열 (%s), 해당 트리거 \"%s\", 사용되는 테이블 \"%s\""
+
 #~ msgid ""
 #~ "query produced null referenced table name for foreign key trigger \"%s\" "
 #~ "on table \"%s\" (OID of table: %u)"
@@ -3110,14 +3325,11 @@ msgstr ""
 #~ "쿼리가 참조테이블 정보가 없는 \"%s\" 참조키 트리거를 \"%s\" (해당 OID: "
 #~ "%u) 테이블에서 만들었습니다."
 
-#, c-format
+#~ msgid "reconnection failed: %s"
+#~ msgstr "재연결 실패: %s"
+
 #~ msgid "unexpected tgtype value: %d"
 #~ msgstr "기대되지 않은 tgtype 값: %d"
 
-#, c-format
-#~ msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\""
-#~ msgstr "잘못된 인수 문자열 (%s), 해당 트리거 \"%s\", 사용되는 테이블 \"%s\""
-
-#, c-format
-#~ msgid "  %s"
-#~ msgstr "  %s"
+#~ msgid "unhandled mode \"%s\""
+#~ msgstr "\"%s\" 모드는 처리할 수 없음"
diff --git a/src/bin/pg_dump/po/ru.po b/src/bin/pg_dump/po/ru.po
index f0297f30d14..953ad1c2bde 100644
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
@@ -5,13 +5,13 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-07 07:35+0300\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 09:21+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -21,30 +21,30 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "эта сборка программы не поддерживает сжатие %s"
@@ -117,27 +117,27 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "нехватка памяти"
 
@@ -152,45 +152,44 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -240,423 +239,518 @@ msgstr "значение %s должно быть в диапазоне %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "чтение расширений"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "выявление членов расширений"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "чтение схем"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "чтение пользовательских таблиц"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "чтение пользовательских функций"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "чтение пользовательских типов"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "чтение процедурных языков"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "чтение пользовательских агрегатных функций"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "чтение пользовательских операторов"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "чтение пользовательских методов доступа"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "чтение пользовательских классов операторов"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "чтение пользовательских семейств операторов"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "чтение пользовательских анализаторов текстового поиска"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "чтение пользовательских шаблонов текстового поиска"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "чтение пользовательских словарей текстового поиска"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "чтение пользовательских конфигураций текстового поиска"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "чтение пользовательских оболочек сторонних данных"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "чтение пользовательских сторонних серверов"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "чтение прав по умолчанию"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "чтение пользовательских правил сортировки"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "чтение пользовательских преобразований"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "чтение приведений типов"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "чтение преобразований"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "чтение информации о наследовании таблиц"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "чтение событийных триггеров"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "поиск таблиц расширений"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "поиск связей наследования"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "чтение информации о столбцах интересующих таблиц"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "пометка наследованных столбцов в подтаблицах"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "чтение информации о секционировании"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "чтение индексов"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "пометка индексов в секционированных таблицах"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "чтение расширенной статистики"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "чтение ограничений"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "чтение триггеров"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "чтение правил перезаписи"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "чтение политик"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "чтение публикаций"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "чтение информации о таблицах, включённых в публикации"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "чтение информации о схемах, включённых в публикации"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "чтение подписок"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "чтение информации о таблицах, включённых в подписки"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr ""
 "нарушение целостности: родительская таблица с OID %u для таблицы \"%s\" (OID "
 "%u) не найдена"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "неверное число родителей (%d) для таблицы \"%s\""
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "не удалось разобрать числовой массив \"%s\": слишком много чисел"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "не удалось разобрать числовой массив \"%s\": неверный символ в числе"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "не удалось инициализировать библиотеку сжатия: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "не удалось закрыть поток сжатых данных: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "не удалось сжать данные: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "не удалось распаковать данные: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "не удалось закрыть библиотеку сжатия: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "не удалось прочитать входной файл: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:374 pg_backup_custom.c:651
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "не удалось записать в файл: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "не удалось прочитать входной файл: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:372 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "не удалось прочитать входной файл: конец файла"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "не удалось создать контекст распаковки LZ4: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "не удалось распаковать данные: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "не удалось освободить контекст распаковки LZ4: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "не удалось завершить сжатие: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "не удалось инициализировать LZ4: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "не удалось инициализировать библиотеку LZ4: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "ошибка при записи: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "ошибка при записи: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "не удалось записать в выходной файл: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "не удалось завершить распаковку: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "не удалось закрыть файл: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "не удалось записать в файл: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "не удалось задать параметр сжатия \"%s\": %s"
 
-#: compress_zstd.c:78 compress_zstd.c:232 compress_zstd.c:491
-#: compress_zstd.c:499
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "не удалось инициализировать библиотеку сжатия"
 
-#: compress_zstd.c:195 compress_zstd.c:309
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "не удалось распаковать данные: %s"
 
-#: compress_zstd.c:502
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Пароль: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:520
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "необрабатываемый режим \"%s\""
+msgid "could not connect to database \"%s\""
+msgstr "не удалось подключиться к базе данных: \"%s\""
 
-#: filter.c:49
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "не удалось узнать версию сервера"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "не удалось разобрать строку версии сервера \"%s\""
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "продолжение работы с другой версией сервера невозможно"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "версия сервера: %s; версия %s: %s"
+
+#: connectdb.c:282 pg_dumpall.c:1790
+#, c-format
+msgid "executing %s"
+msgstr "выполняется %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
+#, c-format
+msgid "query failed: %s"
+msgstr "ошибка при выполнении запроса: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
+#, c-format
+msgid "Query was: %s"
+msgstr "Выполнялся запрос: %s"
+
+#: dumputils.c:949
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "не удалось создать каталог \"%s\": %m"
+
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "не удалось поменять права для каталога \"%s\": %m"
+
+#: dumputils.c:959
+#, c-format
+msgid "directory \"%s\" is not empty"
+msgstr "каталог \"%s\" не пуст"
+
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "не удалось открыть файл фильтра \"%s\": %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "не удалось закрыть файл фильтра \"%s\": %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr ""
 "неверный формат в фильтре, прочитанном из стандартного ввода, в строке %d: %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr ""
 "неверный формат в фильтре, прочитанном из файла \"%s\", в строке %d: %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "не удалось прочитать файл фильтра \"%s\": %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "неожиданный конец файла"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "отсутствует шаблон имени объекта"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "отсутствует команда фильтра (ожидалась \"include\" или \"exclude\")"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "неверная команда фильтра (ожидалась \"include\" или \"exclude\")"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "отсутствует тип объекта фильтра"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "неподдерживаемый тип объекта фильтра: \"%.*s\""
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "ошибка в %s() (код ошибки: %d)"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "не удалось создать каналы межпроцессного взаимодействия: %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "не удалось создать рабочий процесс: %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "от ведущего процесса получена нераспознанная команда: \"%s\""
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "от рабочего процесса получено ошибочное сообщение: \"%s\""
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -669,157 +763,157 @@ msgstr ""
 "этой таблицы после того, как родительский процесс pg_dump получил для неё "
 "начальную блокировку ACCESS SHARE."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "рабочий процесс неожиданно прервался"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "не удалось записать в канал взаимодействия: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: не удалось создать сокет (код ошибки: %d)"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: не удалось привязаться к сокету (код ошибки: %d)"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: не удалось начать приём (код ошибки: %d)"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: ошибка в %s() (код ошибки: %d)"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: не удалось создать второй сокет (код ошибки: %d)"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: не удалось подключить сокет (код ошибки: %d)"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: не удалось принять соединение (код ошибки: %d)"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "не удалось закрыть выходной файл: %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:313 pg_backup_archiver.c:317
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "в последовательности элементов архива нарушен порядок разделов"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "unexpected section code %d"
 msgstr "неожиданный код раздела %d"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr ""
 "параллельное восстановление не поддерживается с выбранным форматом архивного "
 "файла"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr ""
 "параллельное восстановление возможно только для архивов, созданных pg_dump "
 "версии 8.0 и новее"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "восстановить данные из сжатого архива нельзя (%s)"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "подключение к базе данных для восстановления"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr ""
 "прямые подключения к базе данных не поддерживаются в архивах до версии 1.3"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:450
 #, c-format
-msgid "implied data-only restore"
-msgstr "подразумевается восстановление только данных"
+msgid "implied no-schema restore"
+msgstr "подразумевается восстановление без схемы"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "удаляется %s %s"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "не удалось определить, куда добавить IF EXISTS в оператор \"%s\""
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "предупреждение из исходного файла: %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "создаётся %s \"%s.%s\""
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "создаётся %s \"%s\""
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "подключение к новой базе данных \"%s\""
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "обрабатывается %s"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "обрабатываются данные таблицы \"%s.%s\""
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "выполняется %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "отключаются триггеры таблицы %s"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "включаются триггеры таблицы %s"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
@@ -828,12 +922,12 @@ msgstr ""
 "внутренняя ошибка -- WriteData нельзя вызывать вне контекста процедуры "
 "DataDumper"
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "выбранный формат не поддерживает выгрузку больших объектов"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
@@ -841,55 +935,55 @@ msgstr[0] "восстановлен %d большой объект"
 msgstr[1] "восстановлено %d больших объекта"
 msgstr[2] "восстановлено %d больших объектов"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "восстановление большого объекта с OID %u"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "не удалось создать большой объект %u: %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3888
+#: pg_backup_archiver.c:1525 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "не удалось открыть большой объект %u: %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "не удалось открыть файл оглавления \"%s\": %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "строка проигнорирована: %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "не найдена запись для ID %d"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "не удалось закрыть файл оглавления: %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "не удалось открыть выходной файл \"%s\": %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "не удалось открыть выходной файл: %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
@@ -897,221 +991,238 @@ msgstr[0] "записан %zu байт данных большого объек
 msgstr[1] "записано %zu байта данных большого объекта (результат = %d)"
 msgstr[2] "записано %zu байт данных большого объекта (результат = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "не удалось записать данные в большой объект: %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "при инициализации:"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "при обработке оглавления:"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "при завершении:"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "из записи оглавления %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "неверный dumpId"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "неверный dumpId таблицы в элементе TABLE DATA"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "неожиданный флаг смещения данных: %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "слишком большое смещение в файле выгрузки"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "слишком длинное имя каталога: \"%s\""
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid ""
 "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
 "exist)"
 msgstr "каталог \"%s\" не похож на архивный (в нём отсутствует \"toc.dat\")"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "не удалось открыть входной файл \"%s\": %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "не удалось открыть входной файл: %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "не удалось прочитать входной файл: %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "входной файл слишком короткий (прочитано байт: %lu, ожидалось: 5)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr ""
 "входной файл, видимо, имеет текстовый формат. Загрузите его с помощью psql."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "входной файл не похож на архив (возможно, слишком мал?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "входной файл не похож на архив"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "не удалось закрыть входной файл: %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "не удалось открыть stdout для добавления вывода: %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "неопознанный формат файла: \"%d\""
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4647
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "закончен объект %d %s %s"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4660
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "рабочий процесс завершился с кодом возврата %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2668
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "неожиданная запись оглавления в WriteToc(): %d %s %s"
+
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
+#: pg_backup_tar.c:1034
+#, c-format
+msgid "error during file seek: %m"
+msgstr "ошибка при перемещении в файле: %m"
+
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "ID записи %d вне диапазона - возможно повреждено оглавление"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "восстановление таблиц со свойством WITH OIDS больше не поддерживается"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "нераспознанная кодировка \"%s\""
 
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "неверный элемент ENCODING: %s"
 
-#: pg_backup_archiver.c:2841
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "неверный элемент STDSTRINGS: %s"
 
-#: pg_backup_archiver.c:2866
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "схема \"%s\" не найдена"
 
-#: pg_backup_archiver.c:2873
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "таблица \"%s\" не найдена"
 
-#: pg_backup_archiver.c:2880
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "индекс \"%s\" не найден"
 
-#: pg_backup_archiver.c:2887
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "функция \"%s\" не найдена"
 
-#: pg_backup_archiver.c:2894
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "триггер \"%s\" не найден"
 
-#: pg_backup_archiver.c:3325
+#: pg_backup_archiver.c:3469
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "не удалось переключить пользователя сеанса на \"%s\": %s"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "не удалось присвоить \"search_path\" значение \"%s\": %s"
 
-#: pg_backup_archiver.c:3518
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "не удалось задать для \"default_tablespace\" значение %s: %s"
 
-#: pg_backup_archiver.c:3567
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "не удалось задать \"default_table_access_method\": %s"
 
-#: pg_backup_archiver.c:3616
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "не удалось изменить табличный метод доступа: %s"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "неизвестно, как назначить владельца для объекта типа \"%s\""
 
-#: pg_backup_archiver.c:4004
+#: pg_backup_archiver.c:4006
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "неожиданная запись оглавления в _printTocEntry(): %d %s %s"
+
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "в заголовке файла не найдена нужная сигнатура"
 
-#: pg_backup_archiver.c:4018
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "неподдерживаемая версия (%d.%d) в заголовке файла"
 
-#: pg_backup_archiver.c:4023
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "несоответствие размера integer (%lu)"
 
-#: pg_backup_archiver.c:4027
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid ""
 "archive was made on a machine with larger integers, some operations might "
@@ -1120,12 +1231,12 @@ msgstr ""
 "архив был сделан на компьютере большей разрядности -- возможен сбой "
 "некоторых операций"
 
-#: pg_backup_archiver.c:4037
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "ожидаемый формат (%d) отличается от формата, указанного в файле (%d)"
 
-#: pg_backup_archiver.c:4059
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid ""
 "archive is compressed, but this installation does not support compression "
@@ -1134,68 +1245,62 @@ msgstr ""
 "архив сжат, но установленная версия не поддерживает сжатие (%s) -- данные "
 "будут недоступны"
 
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "неверная дата создания в заголовке"
 
-#: pg_backup_archiver.c:4229
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "обработка объекта %d %s %s"
 
-#: pg_backup_archiver.c:4314
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "вход в основной параллельный цикл"
 
-#: pg_backup_archiver.c:4325
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "объект %d %s %s пропускается"
 
-#: pg_backup_archiver.c:4334
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "объект %d %s %s запускается"
 
-#: pg_backup_archiver.c:4388
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "основной параллельный цикл закончен"
 
-#: pg_backup_archiver.c:4424
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "обработка пропущенного объекта %d %s %s"
 
-#: pg_backup_archiver.c:4966
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "создать таблицу \"%s\" не удалось, её данные не будут восстановлены"
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "неверный OID большого объекта"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "ошибка при перемещении в файле: %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "в блоке данных %d задана неверная позиция"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "нераспознанный тип блока данных (%d) при поиске архива"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1205,109 +1310,69 @@ msgstr ""
 "последовательного запроса восстановления, который нельзя обработать с "
 "файлом, не допускающим произвольный доступ"
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr "не удалось найти в архиве блок с ID %d -- возможно, архив испорчен"
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
 msgstr "при чтении данных получен неожиданный ID блока (%d) -- ожидался: %d"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "нераспознанный тип блока данных %d при восстановлении архива"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
 #: pg_backup_tar.c:1032
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "не удалось определить позицию в файле архива: %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "не удалось закрыть файл архива: %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "повторно открыть можно только входные файлы"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "параллельное восстановление из стандартного ввода не поддерживается"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr ""
 "параллельное восстановление возможно только с файлом произвольного доступа"
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "не удалось задать текущую позицию в файле архива: %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "сжатие активно"
 
-#: pg_backup_db.c:42
+#: pg_backup_db.c:41
 #, c-format
-msgid "could not get server_version from libpq"
-msgstr "не удалось получить версию сервера из libpq"
+msgid "could not get \"server_version\" from libpq"
+msgstr "не удалось получить значение \"server_version\" от libpq"
 
-#: pg_backup_db.c:53 pg_dumpall.c:1830
-#, c-format
-msgid "aborting because of server version mismatch"
-msgstr "продолжение работы с другой версией сервера невозможно"
-
-#: pg_backup_db.c:54 pg_dumpall.c:1831
-#, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "версия сервера: %s; версия %s: %s"
-
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "подключение к базе данных уже установлено"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1677 pg_dumpall.c:1779
-msgid "Password: "
-msgstr "Пароль: "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "не удалось переподключиться к базе"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "переподключиться не удалось: %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1704 pg_dumpall.c:1788
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1893 pg_dumpall.c:1916
-#, c-format
-msgid "query failed: %s"
-msgstr "ошибка при выполнении запроса: %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "Query was: %s"
-msgstr "Выполнялся запрос: %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -1316,111 +1381,90 @@ msgstr[1] "запрос вернул %d строки вместо одной: %s
 msgstr[2] "запрос вернул %d строк вместо одной: %s"
 
 # skip-rule: language-mix
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %sВыполнялась команда: %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "не удалось выполнить запрос"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "ошибка в PQputCopyData: %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "ошибка в PQputCopyEnd: %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "сбой команды COPY для таблицы \"%s\": %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2283
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "неожиданные лишние результаты получены при COPY для таблицы \"%s\""
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "не удаётся начать транзакцию"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "не удалось зафиксировать транзакцию"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "выходной каталог не указан"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "не удалось закрыть каталог \"%s\": %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "не удалось создать каталог \"%s\": %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "не удалось записать в выходной файл: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "не удалось закрыть файл данных: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "не удалось закрыть файл данных \"%s\": %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr ""
 "не удалось открыть для чтения файл оглавления больших объектов \"%s\": %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "неверная строка в файле оглавления больших объектов \"%s\": \"%s\""
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "ошибка чтения файла оглавления больших объектов \"%s\""
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "не удалось закрыть файл оглавления больших объектов \"%s\": %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "не удалось закрыть файл данных LO: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "не удалось записать в файл оглавления LO: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "не удалось закрыть файл оглавления LO: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "слишком длинное имя файла: \"%s\""
@@ -1517,129 +1561,133 @@ msgstr ""
 "заголовок tar в %s повреждён (ожидалось: %d, получено: %d), позиция в файле: "
 "%llu"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "нераспознанное имя раздела: \"%s\""
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "превышен предел обработчиков штатного выхода"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_dump.c:728 pg_restore.c:344
+# TO REVEIW
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "параметры %s и %s исключают друг друга"
+
+#: pg_dump.c:865
 #, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "параметры -s/--schema-only и -a/--data-only исключают друг друга"
+msgid "option %s is not supported with parallel backup"
+msgstr "параметр %s не поддерживается при копировании в параллельном режиме"
 
-#: pg_dump.c:731
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid ""
-"options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr ""
-"параметры -s/--schema-only и --include-foreign-data исключают друг друга"
+msgid "option %s requires option %s"
+msgstr "параметр %s требует указания %s"
 
-#: pg_dump.c:734
+#: pg_dump.c:894
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr ""
-"параметр --include-foreign-data не поддерживается при копировании в "
-"параллельном режиме"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "параметр %s требует указания %s, %s или %s"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "параметры -c/--clean и -a/--data-only исключают друг друга"
+msgid "could not generate restrict key"
+msgstr "не удалось сгенерировать ограничительный ключ"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "параметр --if-exists требует указания -c/--clean"
+msgid "invalid restrict key"
+msgstr "неверный ограничительный ключ"
 
-#: pg_dump.c:747
+#: pg_dump.c:917
 #, c-format
-msgid ""
-"option --on-conflict-do-nothing requires option --inserts, --rows-per-"
-"insert, or --column-inserts"
-msgstr ""
-"параметр --on-conflict-do-nothing требует указания --inserts, --rows-per-"
-"insert или --column-inserts"
+msgid "option %s can only be used with %s"
+msgstr "параметр %s можно использовать только с %s"
 
-#: pg_dump.c:776
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нераспознанный алгоритм сжатия: \"%s\""
 
-#: pg_dump.c:783
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неправильное указание сжатия: %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "pg_dump в настоящее время не поддерживает параметр сжатия \"%s\""
 
-#: pg_dump.c:808
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr ""
 "параллельное резервное копирование поддерживается только с форматом "
 "\"каталог\""
 
-#: pg_dump.c:854
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "последний системный OID: %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "соответствующие схемы не найдены"
 
-#: pg_dump.c:880
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "соответствующие таблицы не найдены"
 
-#: pg_dump.c:908
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "соответствующие расширения не найдены"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s сохраняет резервную копию БД в текстовом файле или другом виде.\n"
+"%s выгружает базу данных PostgreSQL в виде скрипта SQL и в других форматах.\n"
 "\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:635 pg_restore.c:452
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [ПАРАМЕТР]... [ИМЯ_БД]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:638 pg_restore.c:455
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1648,12 +1696,12 @@ msgstr ""
 "\n"
 "Общие параметры:\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=ИМЯ               имя выходного файла или каталога\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1663,7 +1711,7 @@ msgstr ""
 "                               (пользовательский | каталог | tar |\n"
 "                               текстовый (по умолчанию))\n"
 
-#: pg_dump.c:1100
+#: pg_dump.c:1274
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr ""
@@ -1671,18 +1719,18 @@ msgstr ""
 "число\n"
 "                               заданий\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:640
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                режим подробных сообщений\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:641
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                показать версию и выйти\n"
 
 # well-spelled: ИНФО
-#: pg_dump.c:1103
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1691,7 +1739,7 @@ msgstr ""
 "  -Z, --compress=МЕТОД[:ДОП_ИНФО]\n"
 "                               выполнять сжатие как указано\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:642
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
@@ -1699,7 +1747,7 @@ msgstr ""
 "  --lock-wait-timeout=ТАЙМ-АУТ прервать операцию при тайм-ауте блокировки "
 "таблицы\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:670
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid ""
 "  --no-sync                    do not wait for changes to be written safely "
@@ -1708,17 +1756,17 @@ msgstr ""
 "  --no-sync                    не ждать надёжного сохранения изменений на "
 "диске\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "  --sync-method=МЕТОД          метод синхронизации файлов с ФС\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:643
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   показать эту справку и выйти\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:644
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1727,35 +1775,39 @@ msgstr ""
 "\n"
 "Параметры, управляющие выводом:\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:645
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, c-format
-msgid "  -a, --data-only              dump only the data, not the schema\n"
-msgstr "  -a, --data-only              выгрузить только данные, без схемы\n"
+msgid ""
+"  -a, --data-only              dump only the data, not the schema or "
+"statistics\n"
+msgstr ""
+"  -a, --data-only              выгрузить только данные, без схемы и "
+"статистики\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          выгрузить большие объекты\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr ""
 "  --blobs                      (устаревшая альтернатива --large-objects)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       исключить из выгрузки большие объекты\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1289
 #, c-format
 msgid ""
 "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr ""
 "  --no-blobs                   (устаревшая альтернатива --no-large-objects)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1290 pg_restore.c:550
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) database objects before "
@@ -1764,7 +1816,7 @@ msgstr ""
 "  -c, --clean                  очистить (удалить) объекты БД при "
 "восстановлении\n"
 
-#: pg_dump.c:1117
+#: pg_dump.c:1291
 #, c-format
 msgid ""
 "  -C, --create                 include commands to create database in dump\n"
@@ -1772,28 +1824,28 @@ msgstr ""
 "  -C, --create                 добавить в копию команды создания базы "
 "данных\n"
 
-#: pg_dump.c:1118
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr ""
 "  -e, --extension=ШАБЛОН       выгрузить только указанное расширение(я)\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:647
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=КОДИРОВКА     выгружать данные в заданной кодировке\n"
 
-#: pg_dump.c:1120
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=ШАБЛОН          выгрузить только указанную схему(ы)\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=ШАБЛОН  НЕ выгружать указанную схему(ы)\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1802,12 +1854,15 @@ msgstr ""
 "  -O, --no-owner               не восстанавливать владение объектами\n"
 "                               при использовании текстового формата\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:651
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, c-format
-msgid "  -s, --schema-only            dump only the schema, no data\n"
-msgstr "  -s, --schema-only            выгрузить только схему, без данных\n"
+msgid ""
+"  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr ""
+"  -s, --schema-only            выгрузить только схему, без данных и "
+"статистики\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1299
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use in plain-text "
@@ -1816,27 +1871,27 @@ msgstr ""
 "  -S, --superuser=ИМЯ          имя пользователя, который будет задействован\n"
 "                               при восстановлении из текстового формата\n"
 
-#: pg_dump.c:1126
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=ШАБЛОН           выгрузить только указанную таблицу(ы)\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=ШАБЛОН   НЕ выгружать указанную таблицу(ы)\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:654
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          не выгружать права (назначение/отзыв)\n"
 
-#: pg_dump.c:1129 pg_dumpall.c:655
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             только для утилит обновления БД\n"
 
-#: pg_dump.c:1130 pg_dumpall.c:656
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, c-format
 msgid ""
 "  --column-inserts             dump data as INSERT commands with column "
@@ -1845,7 +1900,7 @@ msgstr ""
 "  --column-inserts             выгружать данные в виде INSERT с именами "
 "столбцов\n"
 
-#: pg_dump.c:1131 pg_dumpall.c:657
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, c-format
 msgid ""
 "  --disable-dollar-quoting     disable dollar quoting, use SQL standard "
@@ -1854,7 +1909,7 @@ msgstr ""
 "  --disable-dollar-quoting     отключить спецстроки с $, выводить строки\n"
 "                               по стандарту SQL\n"
 
-#: pg_dump.c:1132 pg_dumpall.c:658 pg_restore.c:483
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid ""
 "  --disable-triggers           disable triggers during data-only restore\n"
@@ -1862,7 +1917,7 @@ msgstr ""
 "  --disable-triggers           отключить триггеры при восстановлении\n"
 "                               только данных, без схемы\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user "
@@ -1873,12 +1928,12 @@ msgstr ""
 "только\n"
 "                               те данные, которые доступны пользователю)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=ШАБЛОН   НЕ выгружать указанное расширение(я)\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1890,7 +1945,7 @@ msgstr ""
 "                               НЕ выгружать указанную таблицу(ы), а также\n"
 "                               её секции и дочерние таблицы\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1313
 #, c-format
 msgid ""
 "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
@@ -1898,7 +1953,7 @@ msgstr ""
 "  --exclude-table-data=ШАБЛОН  НЕ выгружать данные указанной таблицы "
 "(таблиц)\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1910,7 +1965,7 @@ msgstr ""
 "(таблиц),\n"
 "                               а также её секций и дочерних таблиц\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:660
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid ""
 "  --extra-float-digits=NUM     override default setting for "
@@ -1918,7 +1973,7 @@ msgid ""
 msgstr ""
 "  --extra-float-digits=ЧИСЛО   переопределить значение extra_float_digits\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from "
@@ -1929,13 +1984,13 @@ msgstr ""
 "                               дампа в соответствии с выражениями в этом "
 "файле\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:662 pg_restore.c:487
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr ""
 "  --if-exists                  применять IF EXISTS при удалении объектов\n"
 
-#: pg_dump.c:1147
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1946,7 +2001,7 @@ msgstr ""
 "                               включать в копию данные сторонних таблиц с\n"
 "                               серверов с именами, подпадающими под ШАБЛОН\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:663
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, c-format
 msgid ""
 "  --inserts                    dump data as INSERT commands, rather than "
@@ -1955,57 +2010,77 @@ msgstr ""
 "  --inserts                    выгрузить данные в виде команд INSERT, не "
 "COPY\n"
 
-#: pg_dump.c:1151 pg_dumpall.c:664
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr ""
 "  --load-via-partition-root    загружать секции через главную таблицу\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:665
+#: pg_dump.c:1326 pg_dumpall.c:730
+#, c-format
+msgid "  --no-comments                do not dump comment commands\n"
+msgstr "  --no-comments                не выгружать команды комментариев\n"
+
+#: pg_dump.c:1327 pg_dumpall.c:731
+#, c-format
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    не выгружать данные\n"
+
+#: pg_dump.c:1328 pg_dumpall.c:732
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
-msgstr "  --no-comments                не выгружать комментарии\n"
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                не выгружать политики защиты строк\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:666
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            не выгружать публикации\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:668
+#: pg_dump.c:1330 pg_dumpall.c:735
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-schema                  не выгружать схему\n"
+
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr ""
 "  --no-security-labels         не выгружать назначения меток безопасности\n"
 
-#: pg_dump.c:1155 pg_dumpall.c:669
+#: pg_dump.c:1332 pg_dumpall.c:737
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistics              не выгружать статистику\n"
+
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           не выгружать подписки\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:671
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     не выгружать табличные методы доступа\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:672
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             не выгружать назначения табличных "
 "пространств\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:673
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       не выгружать методы сжатия TOAST\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:674
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr ""
 "  --no-unlogged-table-data     не выгружать данные нежурналируемых таблиц\n"
 
-#: pg_dump.c:1160 pg_dumpall.c:675
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid ""
 "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT "
@@ -2014,7 +2089,7 @@ msgstr ""
 "  --on-conflict-do-nothing     добавлять ON CONFLICT DO NOTHING в команды "
 "INSERT\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:676
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, c-format
 msgid ""
 "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
@@ -2022,7 +2097,17 @@ msgstr ""
 "  --quote-all-identifiers      заключать в кавычки все идентификаторы,\n"
 "                               а не только ключевые слова\n"
 
-#: pg_dump.c:1162 pg_dumpall.c:677
+# well-spelled: ОГР
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid ""
+"  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr ""
+"  --restrict-key=ОГР_КЛЮЧ      использовать заданную строку как ключ "
+"\\restrict\n"
+"                               в psql\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid ""
 "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
@@ -2030,7 +2115,7 @@ msgstr ""
 "  --rows-per-insert=ЧИСЛО      число строк в одном INSERT; подразумевает --"
 "inserts\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1342
 #, c-format
 msgid ""
 "  --section=SECTION            dump named section (pre-data, data, or post-"
@@ -2039,7 +2124,12 @@ msgstr ""
 "  --section=РАЗДЕЛ             выгрузить заданный раздел\n"
 "                               (pre-data, data или post-data)\n"
 
-#: pg_dump.c:1164
+#: pg_dump.c:1343 pg_dumpall.c:748
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              выгружать данные последовательностей\n"
+
+#: pg_dump.c:1344
 #, c-format
 msgid ""
 "  --serializable-deferrable    wait until the dump can run without "
@@ -2048,13 +2138,26 @@ msgstr ""
 "  --serializable-deferrable    дождаться момента для выгрузки данных без "
 "аномалий\n"
 
-#: pg_dump.c:1165
+#: pg_dump.c:1345
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr ""
 "  --snapshot=СНИМОК            использовать при выгрузке заданный снимок\n"
 
-#: pg_dump.c:1166 pg_restore.c:497
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 выгружать статистику\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
+#, c-format
+msgid ""
+"  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr ""
+"  --statistics-only            выгрузить только статистику, без схемы и "
+"данных\n"
+
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns "
@@ -2067,7 +2170,7 @@ msgstr ""
 "минимум\n"
 "                               один объект\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -2077,7 +2180,7 @@ msgstr ""
 "также\n"
 "                               её секции и дочерние таблицы\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:678 pg_restore.c:500
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -2089,7 +2192,7 @@ msgstr ""
 "                               устанавливать владельца, используя команды\n"
 "                               SET SESSION AUTHORIZATION вместо ALTER OWNER\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:682 pg_restore.c:504
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -2098,34 +2201,34 @@ msgstr ""
 "\n"
 "Параметры подключения:\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=БД          имя базы данных для выгрузки\n"
 
-#: pg_dump.c:1176 pg_dumpall.c:684 pg_restore.c:505
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ           компьютер с сервером баз данных или каталог "
 "сокетов\n"
 
-#: pg_dump.c:1177 pg_dumpall.c:686 pg_restore.c:506
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=ПОРТ          номер порта сервера БД\n"
 
-#: pg_dump.c:1178 pg_dumpall.c:687 pg_restore.c:507
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=ИМЯ       имя пользователя баз данных\n"
 
-#: pg_dump.c:1179 pg_dumpall.c:688 pg_restore.c:508
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        не запрашивать пароль\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:689 pg_restore.c:509
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -2133,12 +2236,12 @@ msgid ""
 msgstr ""
 "  -W, --password           запрашивать пароль всегда (обычно не требуется)\n"
 
-#: pg_dump.c:1181 pg_dumpall.c:690
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ИМЯ_РОЛИ          выполнить SET ROLE перед выгрузкой\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -2151,22 +2254,22 @@ msgstr ""
 "PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:694 pg_restore.c:516
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:695 pg_restore.c:517
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "указана неверная клиентская кодировка \"%s\""
 
-#: pg_dump.c:1352
+#: pg_dump.c:1535
 #, c-format
 msgid ""
 "parallel dumps from standby servers are not supported by this server version"
@@ -2174,170 +2277,175 @@ msgstr ""
 "выгрузка дампа в параллельном режиме с ведомых серверов не поддерживается "
 "данной версией сервера"
 
-#: pg_dump.c:1417
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "указан неверный формат вывода: \"%s\""
 
-#: pg_dump.c:1458 pg_dump.c:1514 pg_dump.c:1567 pg_dumpall.c:1467
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное имя (слишком много компонентов): %s"
 
-#: pg_dump.c:1466
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "схемы, соответствующие шаблону \"%s\", не найдены"
 
-#: pg_dump.c:1519
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "расширения, соответствующие шаблону \"%s\", не найдены"
 
-#: pg_dump.c:1572
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "сторонние серверы, соответствующие шаблону \"%s\", не найдены"
 
-#: pg_dump.c:1643
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "неверное имя отношения (слишком много компонентов): %s"
 
-#: pg_dump.c:1665
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "таблицы, соответствующие шаблону \"%s\", не найдены"
 
-#: pg_dump.c:1692
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "В данный момент вы не подключены к базе данных."
 
-#: pg_dump.c:1695
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ссылки между базами не реализованы: %s"
 
-#: pg_dump.c:2154
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "выгрузка содержимого таблицы \"%s.%s\""
 
-#: pg_dump.c:2264
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Ошибка выгрузки таблицы \"%s\": сбой в PQgetCopyData()."
 
-#: pg_dump.c:2265 pg_dump.c:2275
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Сообщение об ошибке с сервера: %s"
 
 # skip-rule: language-mix
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "Выполнялась команда: %s"
 
-#: pg_dump.c:2274
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Ошибка выгрузки таблицы \"%s\": сбой в PQgetResult()."
 
-#: pg_dump.c:2365
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "из таблицы \"%s\" получено неверное количество полей"
 
-#: pg_dump.c:3067
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "сохранение определения базы данных"
 
-#: pg_dump.c:3176
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нераспознанный провайдер локали: %s"
 
-#: pg_dump.c:3537
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "сохранение кодировки (%s)"
 
-#: pg_dump.c:3562
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "сохранение \"standard_conforming_strings = %s\""
 
-#: pg_dump.c:3601
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "не удалось разобрать результат current_schemas()"
 
-#: pg_dump.c:3620
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "сохранение \"search_path = %s\""
 
-#: pg_dump.c:3656
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "чтение больших объектов"
 
-#: pg_dump.c:3877
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "сохранение больших объектов \"%s\""
 
-#: pg_dump.c:3898
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "ошибка чтения большого объекта %u: %s"
 
-#: pg_dump.c:4001
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "чтение политик защиты на уровне строк"
 
-#: pg_dump.c:4142
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "нераспознанный тип команды в политике: %c"
 
-#: pg_dump.c:4592 pg_dump.c:5150 pg_dump.c:12364 pg_dump.c:18249
-#: pg_dump.c:18251 pg_dump.c:18873
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19678
+#: pg_dump.c:19680 pg_dump.c:20312
 #, c-format
 msgid "could not parse %s array"
 msgstr "не удалось разобрать массив %s"
 
-#: pg_dump.c:4806
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr ""
 "подписки не выгружены, так как текущий пользователь не суперпользователь"
 
-#: pg_dump.c:5012
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "подписка с OID %u не существует"
 
-#: pg_dump.c:5019
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "нарушение целостности: таблица с OID %u не найдена"
 
-#: pg_dump.c:5582
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "не удалось найти родительское расширение для %s %s"
 
-#: pg_dump.c:5727
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "схема с OID %u не существует"
 
-#: pg_dump.c:7209 pg_dump.c:17620
+#: pg_dump.c:7009
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "для отношения типа \"%c\" нельзя выгрузить статистику"
+
+#: pg_dump.c:7521 pg_dump.c:19005
 #, c-format
 msgid ""
 "failed sanity check, parent table with OID %u of sequence with OID %u not "
@@ -2346,7 +2454,7 @@ msgstr ""
 "нарушение целостности: по OID %u не удалось найти родительскую таблицу "
 "последовательности с OID %u"
 
-#: pg_dump.c:7354
+#: pg_dump.c:7666
 #, c-format
 msgid ""
 "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
@@ -2354,18 +2462,18 @@ msgstr ""
 "нарушение целостности: таблица с OID %u, фигурирующим в "
 "pg_partitioned_table, не найдена"
 
-#: pg_dump.c:7585 pg_dump.c:7859 pg_dump.c:8306 pg_dump.c:8920 pg_dump.c:9042
-#: pg_dump.c:9190
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "нераспознанный OID таблицы %u"
 
-#: pg_dump.c:7589
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "неожиданно получены данные индекса для таблицы \"%s\""
 
-#: pg_dump.c:8091
+#: pg_dump.c:8474
 #, c-format
 msgid ""
 "failed sanity check, parent table with OID %u of pg_rewrite entry with OID "
@@ -2374,32 +2482,37 @@ msgstr ""
 "нарушение целостности: по OID %u не удалось найти родительскую таблицу для "
 "записи pg_rewrite с OID %u"
 
-#: pg_dump.c:8924
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "неожиданно получены данные столбцов для таблицы \"%s\""
 
-#: pg_dump.c:8953
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "неверная нумерация столбцов в таблице \"%s\""
 
-#: pg_dump.c:9004
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "поиск выражений по умолчанию для таблиц"
 
-#: pg_dump.c:9046
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "неверное значение adnum (%d) в таблице \"%s\""
 
-#: pg_dump.c:9140
+#: pg_dump.c:9570
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "поиск некорректных ограничений NOT NULL"
+
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "поиск ограничений-проверок для таблиц"
 
-#: pg_dump.c:9194
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
@@ -2410,59 +2523,76 @@ msgstr[1] ""
 msgstr[2] ""
 "ожидалось %d ограничений-проверок для таблицы \"%s\", но найдено: %d"
 
-#: pg_dump.c:9198
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Возможно, повреждены системные каталоги."
 
-#: pg_dump.c:9888
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "роль с OID %u не существует"
 
-#: pg_dump.c:10000 pg_dump.c:10029
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "неподдерживаемая запись в pg_init_privs: %u %u %d"
 
-#: pg_dump.c:10576
+#: pg_dump.c:10968
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr ""
+"статистика выгружена в неправильном порядке (текущий: %d %s %s, ожидаемый: "
+"%d %s %s)"
+
+#: pg_dump.c:11109
+#, c-format
+msgid "unexpected null attname"
+msgstr "неожиданный null в имени атрибута (attname)"
+
+#: pg_dump.c:11138
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "не удалось получить для индекса имя атрибута (attname) \"%s\""
+
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "отсутствуют метаданные о больших объектах \"%s\""
 
-#: pg_dump.c:10859
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "у типа данных \"%s\" по-видимому неправильный тип типа"
 
 # TO REVEIW
-#: pg_dump.c:12433
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "недопустимое значение provolatile для функции \"%s\""
 
 # TO REVEIW
-#: pg_dump.c:12483 pg_dump.c:14379
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "недопустимое значение proparallel для функции \"%s\""
 
-#: pg_dump.c:12613 pg_dump.c:12719 pg_dump.c:12726
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "не удалось найти определение функции для функции с OID %u"
 
-#: pg_dump.c:12652
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "неприемлемое значение в поле pg_cast.castfunc или pg_cast.castmethod"
 
-#: pg_dump.c:12655
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "неприемлемое значение в поле pg_cast.castmethod"
 
-#: pg_dump.c:12745
+#: pg_dump.c:13850
 #, c-format
 msgid ""
 "bogus transform definition, at least one of trffromsql and trftosql should "
@@ -2471,63 +2601,63 @@ msgstr ""
 "неприемлемое определение преобразования (trffromsql или trftosql должно быть "
 "ненулевым)"
 
-#: pg_dump.c:12762
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "неприемлемое значение в поле pg_transform.trffromsql"
 
-#: pg_dump.c:12783
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "неприемлемое значение в поле pg_transform.trftosql"
 
-#: pg_dump.c:12928
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "постфиксные операторы больше не поддерживаются (оператор \"%s\")"
 
-#: pg_dump.c:13098
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "оператор с OID %s не найден"
 
-#: pg_dump.c:13166
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "неверный тип \"%c\" метода доступа \"%s\""
 
-#: pg_dump.c:13840 pg_dump.c:13908
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "нераспознанный провайдер правил сортировки: %s"
 
-#: pg_dump.c:13849 pg_dump.c:13856 pg_dump.c:13867 pg_dump.c:13877
-#: pg_dump.c:13892
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "неверное правило сортировки \"%s\""
 
-#: pg_dump.c:14298
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "нераспознанное значение aggfinalmodify для агрегата \"%s\""
 
-#: pg_dump.c:14354
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "нераспознанное значение aggmfinalmodify для агрегата \"%s\""
 
-#: pg_dump.c:15071
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "нераспознанный тип объекта в определении прав по умолчанию: %d"
 
-#: pg_dump.c:15087
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "не удалось разобрать список прав по умолчанию (%s)"
 
-#: pg_dump.c:15171
+#: pg_dump.c:16279
 #, c-format
 msgid ""
 "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
@@ -2535,20 +2665,20 @@ msgstr ""
 "не удалось разобрать изначальный список ACL (%s) или ACL по умолчанию (%s) "
 "для объекта \"%s\" (%s)"
 
-#: pg_dump.c:15196
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr ""
 "не удалось разобрать список ACL (%s) или ACL по умолчанию (%s) для объекта "
 "\"%s\" (%s)"
 
-#: pg_dump.c:15739
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr ""
 "запрос на получение определения представления \"%s\" не возвратил данные"
 
-#: pg_dump.c:15742
+#: pg_dump.c:16850
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition"
@@ -2556,49 +2686,54 @@ msgstr ""
 "запрос на получение определения представления \"%s\" возвратил несколько "
 "определений"
 
-#: pg_dump.c:15749
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "определение представления \"%s\" пустое (длина равна нулю)"
 
-#: pg_dump.c:15834
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "свойство WITH OIDS больше не поддерживается (таблица \"%s\")"
 
-#: pg_dump.c:16821
+#: pg_dump.c:18082
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "неверный номер столбца %d для таблицы \"%s\""
 
-#: pg_dump.c:16899
+#: pg_dump.c:18160
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "не удалось разобрать столбцы статистики в индексе"
 
-#: pg_dump.c:16901
+#: pg_dump.c:18162
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "не удалось разобрать значения статистики в индексе"
 
-#: pg_dump.c:16903
+#: pg_dump.c:18164
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr ""
 "столбцы, задающие статистику индекса, не соответствуют значениям по "
 "количеству"
 
-#: pg_dump.c:17118
+#: pg_dump.c:18393
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "отсутствует индекс для ограничения \"%s\""
 
-#: pg_dump.c:17353
+#: pg_dump.c:18662
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "нераспознанный тип ограничения: %c"
 
-#: pg_dump.c:17454 pg_dump.c:17684
+#: pg_dump.c:18715
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "нераспознанный тип последовательности: %s"
+
+#: pg_dump.c:18848 pg_dump.c:19086
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural ""
@@ -2613,12 +2748,21 @@ msgstr[2] ""
 "запрос на получение данных последовательности \"%s\" вернул %d строк "
 "(ожидалась 1)"
 
-#: pg_dump.c:17486
+#: pg_dump.c:18884
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "нераспознанный тип последовательности: %s"
+msgid "unrecognized sequence type: %d"
+msgstr "нераспознанный тип последовательности: %d"
 
-#: pg_dump.c:18001
+#: pg_dump.c:19109
+#, c-format
+msgid ""
+"failed to get data for sequence \"%s\"; user may lack SELECT privilege on "
+"the sequence or the sequence may have been concurrently dropped"
+msgstr ""
+"не удалось получить данные последовательности \"%s\"; возможно, пользователь "
+"не имеет права SELECT для неё или она была удалена"
+
+#: pg_dump.c:19430
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -2627,53 +2771,53 @@ msgstr ""
 "запрос на получение правила \"%s\" для таблицы \"%s\" возвратил неверное "
 "число строк"
 
-#: pg_dump.c:18154
+#: pg_dump.c:19583
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "не удалось найти упомянутое расширение %u"
 
-#: pg_dump.c:18253
+#: pg_dump.c:19682
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "конфигурации расширения не соответствуют условиям по количеству"
 
-#: pg_dump.c:18385
+#: pg_dump.c:19814
 #, c-format
 msgid "reading dependency data"
 msgstr "чтение информации о зависимостях"
 
-#: pg_dump.c:18471
+#: pg_dump.c:19900
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "нет подчинённого объекта %u %u"
 
-#: pg_dump.c:18482
+#: pg_dump.c:19911
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "нет вышестоящего объекта %u %u"
 
-#: pg_dump.c:18907 pg_dump.c:18945 pg_dumpall.c:1962 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20346 pg_dump.c:20384 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "фильтр %s для \"%s\" не допускается"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "неверный dumpId %d"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "неверная зависимость %d"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "не удалось определить цикл зависимостей"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
@@ -2681,7 +2825,7 @@ msgstr[0] "в следующей таблице зациклены ограни
 msgstr[1] "в следующих таблицах зациклены ограничения внешних ключей:"
 msgstr[2] "в следующих таблицах зациклены ограничения внешних ключей:"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1479
 #, c-format
 msgid ""
 "You might not be able to restore the dump without using --disable-triggers "
@@ -2690,7 +2834,7 @@ msgstr ""
 "Возможно, для восстановления базы потребуется использовать --disable-"
 "triggers или временно удалить ограничения."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1480
 #, c-format
 msgid ""
 "Consider using a full dump instead of a --data-only dump to avoid this "
@@ -2699,58 +2843,32 @@ msgstr ""
 "Во избежание этой проблемы, вероятно, стоит выгружать всю базу данных, а не "
 "только данные (--data-only)."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "не удалось разрешить цикл зависимостей для следующих объектов:"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\""
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: pg_dumpall.c:387
-#, c-format
-msgid ""
-"option --exclude-database cannot be used together with -g/--globals-only, -"
-"r/--roles-only, or -t/--tablespaces-only"
-msgstr ""
-"параметр --exclude-database несовместим с -g/--globals-only, -r/--roles-only "
-"и -t/--tablespaces-only"
-
-#: pg_dumpall.c:395
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "параметры -g/--globals-only и -r/--roles-only исключают друг друга"
-
+# TO REVEIW
 #: pg_dumpall.c:402
 #, c-format
-msgid ""
-"options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr ""
-"параметры -g/--globals-only и -t/--tablespaces-only исключают друг друга"
-
-#: pg_dumpall.c:412
-#, c-format
-msgid ""
-"options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "параметры -r/--roles-only и -t/--tablespaces-only исключают друг друга"
-
-#: pg_dumpall.c:474 pg_dumpall.c:1771
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "не удалось подключиться к базе данных: \"%s\""
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "параметр %s нельзя использовать вместе с %s, %s или %s"
 
-#: pg_dumpall.c:486
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2759,26 +2877,26 @@ msgstr ""
 "не удалось подключиться к базе данных \"postgres\" или \"template1\"\n"
 "Укажите другую базу данных."
 
-#: pg_dumpall.c:634
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s экспортирует всё содержимое кластера баз данных PostgreSQL в SQL-скрипт.\n"
+"%s выгружает базу данных PostgreSQL в виде скрипта SQL.\n"
 "\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [ПАРАМЕТР]...\n"
 
-#: pg_dumpall.c:639
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=ИМЯ_ФАЙЛА         имя выходного файла\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:711
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) databases before recreating\n"
@@ -2786,18 +2904,18 @@ msgstr ""
 "  -c, --clean                  очистить (удалить) базы данных перед\n"
 "                               восстановлением\n"
 
-#: pg_dumpall.c:648
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           выгрузить только глобальные объекты, без баз\n"
 
-#: pg_dumpall.c:649 pg_restore.c:475
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               не восстанавливать владение объектами\n"
 
-#: pg_dumpall.c:650
+#: pg_dumpall.c:715
 #, c-format
 msgid ""
 "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
@@ -2805,13 +2923,13 @@ msgstr ""
 "  -r, --roles-only             выгрузить только роли, без баз данных\n"
 "                               и табличных пространств\n"
 
-#: pg_dumpall.c:652
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=ИМЯ          имя пользователя для выполнения выгрузки\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:718
 #, c-format
 msgid ""
 "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
@@ -2819,7 +2937,7 @@ msgstr ""
 "  -t, --tablespaces-only       выгружать только табличные пространства,\n"
 "                               без баз данных и ролей\n"
 
-#: pg_dumpall.c:659
+#: pg_dumpall.c:724
 #, c-format
 msgid ""
 "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
@@ -2827,7 +2945,7 @@ msgstr ""
 "  --exclude-database=ШАБЛОН    исключить базы с именами, подпадающими под "
 "шаблон\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:726
 #, c-format
 msgid ""
 "  --filter=FILENAME            exclude databases based on expressions in "
@@ -2836,22 +2954,22 @@ msgstr ""
 "  --filter=ИМЯ_ФАЙЛА           исключать базы данных в соответствии с\n"
 "                               выражениями в этом файле\n"
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          не выгружать пароли ролей\n"
 
-#: pg_dumpall.c:683
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=СТРОКА      подключиться с данной строкой подключения\n"
 
-#: pg_dumpall.c:685
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=ИМЯ_БД    выбор другой базы данных по умолчанию\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2865,114 +2983,91 @@ msgstr ""
 "вывод.\n"
 "\n"
 
-#: pg_dumpall.c:837
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "имя роли, начинающееся с \"pg_\", пропущено (%s)"
 
-#: pg_dumpall.c:1059
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
+#, c-format
+msgid "found orphaned pg_auth_members entry for role %s"
+msgstr "обнаружена потерянная запись pg_auth_members для роли %s"
+
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "не удалось найти подходящий порядок выгрузки для членов роли \"%s\""
 
-#: pg_dumpall.c:1194
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "не удалось разобрать список ACL (%s) для параметра \"%s\""
 
-#: pg_dumpall.c:1321
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr ""
 "не удалось разобрать список управления доступом (%s) для табл. пространства "
 "\"%s\""
 
-#: pg_dumpall.c:1528
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "база данных \"%s\" исключается"
 
-#: pg_dumpall.c:1532
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "выгрузка базы данных \"%s\""
 
-#: pg_dumpall.c:1563
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "ошибка при обработке базы \"%s\", pg_dump завершается"
 
-#: pg_dumpall.c:1569
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "не удалось повторно открыть выходной файл \"%s\": %m"
 
-#: pg_dumpall.c:1613
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "выполняется \"%s\""
 
-#: pg_dumpall.c:1814
-#, c-format
-msgid "could not get server version"
-msgstr "не удалось узнать версию сервера"
-
-#: pg_dumpall.c:1817
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "не удалось разобрать строку версии сервера \"%s\""
-
-#: pg_dumpall.c:1887 pg_dumpall.c:1910
-#, c-format
-msgid "executing %s"
-msgstr "выполняется %s"
-
-#: pg_dumpall.c:1982
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "неподдерживаемый объект фильтра"
 
 # TO REVEIW
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "необходимо указать -d/--dbname или -f/--file"
 
-# TO REVEIW
-#: pg_restore.c:336
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "параметры -d/--dbname и -f/--file исключают друг друга"
-
-#: pg_restore.c:350
-#, c-format
-msgid ""
-"options -1/--single-transaction and --transaction-size cannot be used "
-"together"
-msgstr ""
-"параметры -1/--single-transaction и --transaction-size исключают друг друга"
-
-#: pg_restore.c:357
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "параметры -C/--create и -1/--single-transaction исключают друг друга"
-
-#: pg_restore.c:361
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "параметр --single-transaction допускается только с одним заданием"
 
-#: pg_restore.c:399
+#: pg_restore.c:480
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "формат архива \"%s\" не поддерживается; используйте psql"
+
+#: pg_restore.c:484
 #, c-format
 msgid ""
 "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "нераспознанный формат архива \"%s\"; укажите \"c\", \"d\" или \"t\""
 
-#: pg_restore.c:438
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "при восстановлении проигнорировано ошибок: %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2982,49 +3077,49 @@ msgstr ""
 "pg_dump.\n"
 "\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [ПАРАМЕТР]... [ФАЙЛ]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=БД          подключиться к указанной базе данных\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr ""
 "  -f, --file=ИМЯ_ФАЙЛА     имя выходного файла (или - для вывода в stdout)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:542
 #, 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:459
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               вывести краткое оглавление архива\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            выводить подробные сообщения\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            показать версию и выйти\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               показать эту справку и выйти\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -3033,35 +3128,35 @@ msgstr ""
 "\n"
 "Параметры, управляющие восстановлением:\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              восстановить только данные, без схемы\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 создать целевую базу данных\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:552
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr ""
 "  -e, --exit-on-error          выйти при ошибке (по умолчанию - продолжать)\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=ИМЯ              восстановить указанный индекс\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=ЧИСЛО             распараллелить восстановление на указанное "
 "число заданий\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -3070,13 +3165,13 @@ msgstr ""
 "  -L, --use-list=ИМЯ_ФАЙЛА     использовать оглавление из этого файла для\n"
 "                               чтения/упорядочивания данных\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:557
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr ""
 "  -n, --schema=ИМЯ             восстановить объекты только в этой схеме\n"
 
-#: pg_restore.c:474
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr ""
@@ -3084,17 +3179,17 @@ msgstr ""
 
 # skip-rule: no-space-before-parentheses
 # well-spelled: арг
-#: pg_restore.c:476
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=ИМЯ(арг-ты)   восстановить заданную функцию\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            восстановить только схему, без данных\n"
 
-#: pg_restore.c:478
+#: pg_restore.c:562
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use for disabling "
@@ -3103,7 +3198,7 @@ msgstr ""
 "  -S, --superuser=ИМЯ          имя суперпользователя для отключения "
 "триггеров\n"
 
-#: pg_restore.c:479
+#: pg_restore.c:563
 #, c-format
 msgid ""
 "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
@@ -3111,12 +3206,12 @@ msgstr ""
 "  -t, --table=ИМЯ              восстановить заданное отношение (таблицу, "
 "представление и т. п.)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=ИМЯ            восстановить заданный триггер\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:565
 #, c-format
 msgid ""
 "  -x, --no-privileges          skip restoration of access privileges (grant/"
@@ -3125,18 +3220,18 @@ msgstr ""
 "  -x, --no-privileges          не восстанавливать права доступа\n"
 "                               (назначение/отзыв)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:566
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr ""
 "  -1, --single-transaction     выполнить восстановление в одной транзакции\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        включить защиту на уровне строк\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -3145,12 +3240,17 @@ msgstr ""
 "  --filter=ИМЯ_ФАЙЛА           восстанавливать или пропускать объекты\n"
 "                               в соответствии с выражениями в этом файле\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:572
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
+msgid "  --no-comments                do not restore comment commands\n"
 msgstr "  --no-comments                не восстанавливать комментарии\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:573
+#, c-format
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    не восстанавливать данные\n"
+
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not "
@@ -3160,35 +3260,51 @@ msgstr ""
 "  --no-data-for-failed-tables  не восстанавливать данные таблиц, которые\n"
 "                               не удалось создать\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:576
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr ""
+"  --no-policies                не восстанавливать политики защиты строк\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            не восстанавливать публикации\n"
 
-#: pg_restore.c:492
+#: pg_restore.c:578
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  не восстанавливать схему\n"
+
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         не восстанавливать метки безопасности\n"
 
-#: pg_restore.c:493
+#: pg_restore.c:580
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              не восстанавливать статистику\n"
+
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           не восстанавливать подписки\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr ""
 "  --no-table-access-method     не восстанавливать табличные методы доступа\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             не восстанавливать назначения табл. "
 "пространств\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:585
 #, c-format
 msgid ""
 "  --section=SECTION            restore named section (pre-data, data, or "
@@ -3197,18 +3313,32 @@ msgstr ""
 "  --section=РАЗДЕЛ             восстановить заданный раздел\n"
 "                               (pre-data, data или post-data)\n"
 
-#: pg_restore.c:499
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 восстанавливать статистику\n"
+
+#: pg_restore.c:587
+#, c-format
+msgid ""
+"  --statistics-only            restore only the statistics, not schema or "
+"data\n"
+msgstr ""
+"  --statistics-only            восстановить только статистику, без схемы и "
+"данных\n"
+
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr ""
 "  --transaction-size=N         выполнять COMMIT после каждых N объектов\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ИМЯ_РОЛИ          выполнить SET ROLE перед восстановлением\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
@@ -3221,7 +3351,7 @@ msgstr ""
 "указывать\n"
 "несколько раз для выбора нескольких объектов.\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
@@ -3233,6 +3363,125 @@ msgstr ""
 "ввода.\n"
 "\n"
 
+#, c-format
+#~ msgid "options -s/--schema-only and -a/--data-only cannot be used together"
+#~ msgstr "параметры -s/--schema-only и -a/--data-only исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -s/--schema-only and --statistics-only cannot be used together"
+#~ msgstr "параметры -s/--schema-only и --statistics-only исключают друг друга"
+
+#, c-format
+#~ msgid "options -a/--data-only and --statistics-only cannot be used together"
+#~ msgstr "параметры -a/--data-only и --statistics-only исключают друг друга"
+
+#, c-format
+#~ msgid "options -a/--data-only and --no-data cannot be used together"
+#~ msgstr "параметры -a/--data-only и --no-data исключают друг друга"
+
+#, c-format
+#~ msgid "options -s/--schema-only and --no-schema cannot be used together"
+#~ msgstr "параметры -s/--schema-only и --no-schema исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options --statistics-only and --no-statistics cannot be used together"
+#~ msgstr "параметры --statistics-only и --no-statistics исключают друг друга"
+
+#, c-format
+#~ msgid "options --statistics and --no-statistics cannot be used together"
+#~ msgstr "параметры --statistics и --no-statistics исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -s/--schema-only and --include-foreign-data cannot be used "
+#~ "together"
+#~ msgstr ""
+#~ "параметры -s/--schema-only и --include-foreign-data исключают друг друга"
+
+#, c-format
+#~ msgid "options -c/--clean and -a/--data-only cannot be used together"
+#~ msgstr "параметры -c/--clean и -a/--data-only исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "option --on-conflict-do-nothing requires option --inserts, --rows-per-"
+#~ "insert, or --column-inserts"
+#~ msgstr ""
+#~ "параметр --on-conflict-do-nothing требует указания --inserts, --rows-per-"
+#~ "insert или --column-inserts"
+
+#, c-format
+#~ msgid ""
+#~ "option --exclude-database cannot be used together with -g/--globals-only, "
+#~ "-r/--roles-only, or -t/--tablespaces-only"
+#~ msgstr ""
+#~ "параметр --exclude-database несовместим с -g/--globals-only, -r/--roles-"
+#~ "only и -t/--tablespaces-only"
+
+#, c-format
+#~ msgid ""
+#~ "options -g/--globals-only and -r/--roles-only cannot be used together"
+#~ msgstr "параметры -g/--globals-only и -r/--roles-only исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -g/--globals-only and -t/--tablespaces-only cannot be used "
+#~ "together"
+#~ msgstr ""
+#~ "параметры -g/--globals-only и -t/--tablespaces-only исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
+#~ msgstr ""
+#~ "параметры -r/--roles-only и -t/--tablespaces-only исключают друг друга"
+
+# TO REVEIW
+#, c-format
+#~ msgid "options -d/--dbname and -f/--file cannot be used together"
+#~ msgstr "параметры -d/--dbname и -f/--file исключают друг друга"
+
+# TO REVEIW
+#, c-format
+#~ msgid "options -d/--dbname and --restrict-key cannot be used together"
+#~ msgstr "параметры -d/--dbname и --restrict-key исключают друг друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -1/--single-transaction and --transaction-size cannot be used "
+#~ "together"
+#~ msgstr ""
+#~ "параметры -1/--single-transaction и --transaction-size исключают друг "
+#~ "друга"
+
+#, c-format
+#~ msgid ""
+#~ "options -C/--create and -1/--single-transaction cannot be used together"
+#~ msgstr ""
+#~ "параметры -C/--create и -1/--single-transaction исключают друг друга"
+
+#, c-format
+#~ msgid "unhandled mode \"%s\""
+#~ msgstr "необрабатываемый режим \"%s\""
+
+#, c-format
+#~ msgid "could not connect to database"
+#~ msgstr "не удалось переподключиться к базе"
+
+#, c-format
+#~ msgid "reconnection failed: %s"
+#~ msgstr "переподключиться не удалось: %s"
+
+#, c-format
+#~ msgid "could not close directory \"%s\": %m"
+#~ msgstr "не удалось закрыть каталог \"%s\": %m"
+
+#, c-format
+#~ msgid "could not write to LOs TOC file: %s"
+#~ msgstr "не удалось записать в файл оглавления LO: %s"
+
 #, c-format
 #~ msgid ""
 #~ "query produced null referenced table name for foreign key trigger \"%s\" "
@@ -3257,10 +3506,6 @@ msgstr ""
 #~ msgid "could not identify current directory: %m"
 #~ msgstr "не удалось определить текущий каталог: %m"
 
-#, c-format
-#~ msgid "could not change directory to \"%s\": %m"
-#~ msgstr "не удалось перейти в каталог \"%s\": %m"
-
 #, c-format
 #~ msgid "could not read symbolic link \"%s\": %m"
 #~ msgstr "не удалось прочитать символическую ссылку \"%s\": %m"
@@ -3488,9 +3733,6 @@ msgstr ""
 #~ msgid "allocating AH for %s, format %d\n"
 #~ msgstr "выделение структуры AH для %s, формат %d\n"
 
-#~ msgid "read TOC entry %d (ID %d) for %s %s\n"
-#~ msgstr "прочитана запись оглавления %d (ID %d): %s %s\n"
-
 #~ msgid "could not set default_with_oids: %s"
 #~ msgstr "не удалось установить параметр default_with_oids: %s"
 
@@ -3775,9 +4017,6 @@ msgstr ""
 #~ msgid "missing pg_database entry for this database\n"
 #~ msgstr "для этой базы данных отсутствует запись в pg_database\n"
 
-#~ msgid "found more than one pg_database entry for this database\n"
-#~ msgstr "для этой базы данных найдено несколько записей в pg_database\n"
-
 #~ msgid "could not find entry for pg_indexes in pg_class\n"
 #~ msgstr "для pg_indexes не найдена запись в pg_class\n"
 
diff --git a/src/bin/pg_dump/po/sv.po b/src/bin/pg_dump/po/sv.po
index 8fbe8b3636b..349c39a08ac 100644
--- a/src/bin/pg_dump/po/sv.po
+++ b/src/bin/pg_dump/po/sv.po
@@ -1,13 +1,14 @@
 # Swedish message translation file for pg_dump
 # Peter Eisentraut <peter_e@gmx.net>, 2001, 2009, 2010.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017,
+#   2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-27 15:52+0000\n"
-"PO-Revision-Date: 2024-08-27 18:32+0200\n"
+"POT-Creation-Date: 2026-02-04 16:22+0000\n"
+"PO-Revision-Date: 2026-02-04 19:29+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -16,30 +17,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "detta bygge stöder inte komprimering med %s"
@@ -108,27 +109,27 @@ msgstr "kunde inte hitta en \"%s\" att köra"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "kunde inte konvertera sökvägen \"%s\" till en absolut sökväg: %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "kunde inte köra kommandot \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "kunde inte läsa från kommando \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ingen data returnerades från kommandot \"%s\""
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "slut på minne"
 
@@ -143,45 +144,44 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -231,416 +231,511 @@ msgstr "%s måste vara i intervallet %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "okänd synkmetod: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "läser utökningar"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "identifierar utökningsmedlemmar"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "läser scheman"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "läser användardefinierade tabeller"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "läser användardefinierade funktioner"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "läser användardefinierade typer"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "läser procedurspråk"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "läser användardefinierade aggregatfunktioner"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "läser användardefinierade operatorer"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "läser användardefinierade accessmetoder"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "läser användardefinierade operatorklasser"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "läser användardefinierade operator-familjer"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "läser användardefinierade textsöktolkare"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "läser användardefinierade textsökmallar"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "läser användardefinierade textsökordlistor"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "läser användardefinierade textsökkonfigurationer"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "läser användardefinierade främmande data-omvandlare"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "läser användardefinierade främmande servrar"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "läser standardrättigheter"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "läser användardefinierade jämförelser"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "läser användardefinierade konverteringar"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "läser typomvandlingar"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "läser transformer"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "läser information om arv av tabeller"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "läser händelsetriggrar"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "hittar utökningstabeller"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "hittar arvrelationer"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "läser kolumninfo flr intressanta tabeller"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "markerar ärvda kolumner i undertabeller"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "läser partitioneringsdata"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "läser index"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "flaggar index i partitionerade tabeller"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "läser utökad statistik"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "läser integritetsvillkor"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "läser triggrar"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "läser omskrivningsregler"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "läser policys"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "läser publiceringar"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "läser publiceringsmedlemskap för tabeller"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "läser publiceringsmedlemskap för scheman"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "läser prenumerationer"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "läser prenumerationsmedlemskap för tabeller"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "misslyckades med riktighetskontroll, hittade inte förälder-OID %u för tabell \"%s\" (OID %u)"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "ogiltigt antal (%d) föräldrar för tabell \"%s\""
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "kunde inte tolka numerisk array \"%s\": för många nummer"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "kunde inte tolka numerisk array \"%s\": ogiltigt tecken i nummer"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "kunde inte initiera komprimeringsbibliotek: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "kunde inte stänga komprimeringsströmmen: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "kunde inte komprimera data: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "kunde inte packa upp data: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "kunde inte stänga komprimeringsbiblioteket: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "kunde inte läsa från infilen: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:373 pg_backup_custom.c:651
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "kan inte skriva till fil: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "kunde inte läsa från infilen: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:371 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "kunde inte läsa från infilen: slut på filen"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "kunde inte skapa kontext för LZ4-dekomprimering: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "kunde inte dekomprimera: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "kunde inte frigöra kontext för LZ4-dekomprimering: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "kunde inte avsluta komprimering: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "kunde inte initiera LZ4-komprimering: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "kunde inte initiera LZ4-bibliotek: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "fel vid skrivning: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "fel vid skrivning: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "kunde inte skriva till utdatafil: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "kunde inte avsluta dekomprimering: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "kunde inte stänga fil: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "kunde inte skriva till fil: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "kunde inte sätta komprimeringsparameter \"%s\": %s"
 
-#: compress_zstd.c:78 compress_zstd.c:231 compress_zstd.c:490
-#: compress_zstd.c:498
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "kunde inte initierar komprimeringsbibliotek"
 
-#: compress_zstd.c:194 compress_zstd.c:308
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "kunde inte dekomprimera data: %s"
 
-#: compress_zstd.c:501
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Lösenord: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:952
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:520
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "kan inte hantera läget \"%s\""
+msgid "could not connect to database \"%s\""
+msgstr "kunde inte ansluta till databasen \"%s\""
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "kunde inte hämta serverversionen"
 
-#: filter.c:49
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "kunde inte tolka versionsträngen \"%s\""
+
+#: connectdb.c:222 pg_backup_db.c:52
+#, c-format
+msgid "aborting because of server version mismatch"
+msgstr "avbryter då serverversionerna i matchar"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "server version: %s; %s version: %s"
+
+#: connectdb.c:282 pg_dumpall.c:1790
+#, c-format
+msgid "executing %s"
+msgstr "kör: %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
+#, c-format
+msgid "query failed: %s"
+msgstr "fråga misslyckades: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
+#, c-format
+msgid "Query was: %s"
+msgstr "Frågan var: %s"
+
+#: dumputils.c:949
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "kunde inte skapa katalog \"%s\": %m"
+
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "kunde inte ändra rättigheter på katalogen \"%s\": %m"
+
+#: dumputils.c:959
+#, c-format
+msgid "directory \"%s\" is not empty"
+msgstr "katalogen \"%s\" är inte tom"
+
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "kunde inte öppna filterfil \"%s\": %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "kunde inte stänga filterfil \"%s\": %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr "ogiltigt format i filter som lästs från standard input på rad %d: %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "ogiltigt format i filter som lästs från fil \"%s\" på rad %d: %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "kunde inte läsa från filterfil \"%s\": %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "oväntat slut på fil"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "saknar mall för objektnamn"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "hittade inte filterkommandon (förväntade \"include\" eller \"exclude\")"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "ogiltigt filterkommando (förväntade \"include\" eller \"exclude\")"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "saknas typ på filterobjekt"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "typen för filterobjekt stöd ej: \"%.*s\""
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "%s() misslyckades: felkod %d"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "kunde inte skapa kommunikationskanaler: %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "kunde inte skapa arbetsprocess: %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "okänt kommando mottaget från ledare: \"%s\""
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "ogiltigt meddelande mottaget från arbetare: \"%s\""
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -650,727 +745,677 @@ msgstr ""
 "Dette beror oftast på att någon tagit ett ACCESS EXCLUSIVE-lås på tabellen\n"
 "efter att pg_dumps föräldraprocess tagit ett ACCESS SHARE-lås på tabellen."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "en arbetsprocess dog oväntat"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "kunde inte skriva till kommunikationskanal: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: kunde inte skapa uttag (socket): felkod %d"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: kunde inte göra \"bind\": felkod %d"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: kunde inte göra \"listen\": felkod %d"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s() misslyckades: felkod %d"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: kunde inte skapa ett andra uttag (socket): felkod %d"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: kunde itne ansluta till uttag (socket): felkod %d"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: kunde inte acceptera anslutning: felkod %d"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "kunde inte stänga utdatafilen: %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:313 pg_backup_archiver.c:317
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "arkivobjekten är inte i korrekt sektionsordning"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "unexpected section code %d"
 msgstr "oväntad sektionskod %d"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "parallell återställning stöds inte med detta arkivformat"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "parallell återställning stöds inte med arkiv som skapats av en pre-8.0 pg_dump"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "kan inte återställa från komprimerat arkiv (%s)"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "kopplar upp mot databas för återställning"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "direkta databasuppkopplingar stöds inte i arkiv från före version 1.3"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:450
 #, c-format
-msgid "implied data-only restore"
-msgstr "implicerad återställning av enbart data"
+msgid "implied no-schema restore"
+msgstr "implicerad återställning av icke-schema"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "tar bort %s %s"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "kunde inte hitta var IF EXISTS skulle stoppas in i sats \"%s\""
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "varning från orginaldumpfilen: %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "skapar %s \"%s.%s\""
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "skapar %s \"%s\""
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "kopplar upp mot ny databas \"%s\""
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "processar %s"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "processar data för tabell \"%s.%s\""
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "kör %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "stänger av trigger för %s"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "slår på trigger för %s"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "internt fel -- WriteData kan inte anropas utanför kontexten av en DataDumper-rutin"
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "utmatning av stora objekt stöds inte i det valda formatet"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
 msgstr[0] "återställde %d stor objekt"
 msgstr[1] "återställde %d stora objekt"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "återställer stort objekt med OID %u"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "kunde inte skapa stort objekt %u: %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3888
+#: pg_backup_archiver.c:1525 pg_dump.c:4100
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "kunde inte öppna stort objekt %u: %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "kunde inte öppna TOC-filen \"%s\": %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "rad ignorerad: %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "kunde inte hitta en post för ID %d"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "kunde inte stänga TOC-filen: %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "kunde inte öppna utdatafilen \"%s\": %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "kunde inte öppna utdatafilen: %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
 msgstr[0] "skrev %zu byte data av stort objekt (resultat = %d)"
 msgstr[1] "skrev %zu bytes data av stort objekt (resultat = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "kunde inte skriva till stort objekt: %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "vid INITIERING:"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "vid HANTERING AV TOC:"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "vid SLUTFÖRANDE:"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "från TOC-post %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "felaktigt dumpId"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "felaktig tabell-dumpId för TABLE DATA-objekt"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "oväntad data-offset-flagga %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "fil-offset i dumpfilen är för stort"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "katalognamn för långt: \"%s\""
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "katalogen \"%s\" verkar inte vara ett giltigt arkiv (\"toc.dat\" finns inte)"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "kunde inte öppna indatafilen \"%s\": %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "kan inte öppna infil: %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "kan inte läsa infilen: %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "indatafilen är för kort (läste %lu, förväntade 5)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "indatafilen verkar vara en dump i textformat. Använd psql."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "indatafilen verkar inte vara ett korrekt arkiv (för kort?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "indatafilen verkar inte vara ett korrekt arkiv"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "kunde inte stänga indatafilen: %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "kunde inte öppna stdout för append: %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "känner inte igen filformat \"%d\""
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4647
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "klar med objekt %d %s %s"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4660
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "arbetsprocess misslyckades: felkod %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2668
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "oväntad TOC-post i WriteToc(): %d %s %s"
+
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
+#: pg_backup_tar.c:1034
+#, c-format
+msgid "error during file seek: %m"
+msgstr "fel vid sökning: %m"
+
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "post-ID %d utanför sitt intervall -- kanske en trasig TOC"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "återeställa tabeller med WITH OIDS stöds inte längre"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "okänd teckenkodning \"%s\""
 
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "ogiltigt ENCODING-val: %s"
 
-#: pg_backup_archiver.c:2841
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "ogiltigt STDSTRINGS-val: %s"
 
-#: pg_backup_archiver.c:2866
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "schema \"%s\" hittades inte"
 
-#: pg_backup_archiver.c:2873
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "tabell \"%s\" hittades inte"
 
-#: pg_backup_archiver.c:2880
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "index \"%s\" hittades inte"
 
-#: pg_backup_archiver.c:2887
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "funktion \"%s\" hittades inte"
 
-#: pg_backup_archiver.c:2894
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "trigger \"%s\" hittades inte"
 
-#: pg_backup_archiver.c:3325
+#: pg_backup_archiver.c:3469
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "kunde inte sätta sessionsanvändare till \"%s\": %s"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "kunde inte sätta \"search_path\" till \"%s\": %s"
 
-#: pg_backup_archiver.c:3518
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "kunde inte sätta \"default_tablespace\" till %s: %s"
 
-#: pg_backup_archiver.c:3567
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "kunde inte sätta \"default_table_access_method\": %s"
 
-#: pg_backup_archiver.c:3616
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "kunde inte ändra tabellaccessmetod: %s"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "vet inte hur man sätter ägare för objekttyp \"%s\""
 
-#: pg_backup_archiver.c:4004
+#: pg_backup_archiver.c:4006
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "oväntad TOC-post i _printTocEntry(): %d %s %s"
+
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "kunde inte hitta den magiska strängen i filhuvudet"
 
-#: pg_backup_archiver.c:4018
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "ej supportad version (%d.%d) i filhuvudet"
 
-#: pg_backup_archiver.c:4023
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "riktighetskontroll på heltalsstorlek (%lu) misslyckades"
 
-#: pg_backup_archiver.c:4027
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "arkivet skapades på en maskin med större heltal, en del operationer kan misslyckas"
 
-#: pg_backup_archiver.c:4037
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "förväntat format (%d) skiljer sig från formatet som fanns i filen (%d)"
 
-#: pg_backup_archiver.c:4059
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "arkivet är komprimerat, men denna installation stödjer inte komprimering (%s) -- ingen data kommer kunna läsas"
 
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "ogiltig skapandedatum i huvud"
 
-#: pg_backup_archiver.c:4229
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "processar objekt %d %s %s"
 
-#: pg_backup_archiver.c:4314
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "går in i parallella huvudloopen"
 
-#: pg_backup_archiver.c:4325
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "hoppar över objekt %d %s %s"
 
-#: pg_backup_archiver.c:4334
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "startar objekt %d %s %s"
 
-#: pg_backup_archiver.c:4388
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "klar med parallella huvudloopen"
 
-#: pg_backup_archiver.c:4424
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "processar saknat objekt %d %s %s"
 
-#: pg_backup_archiver.c:4966
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "tabell \"%s\" kunde inte skapas, dess data kommer ej återställas"
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "ogiltig OID för stort objekt"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "fel vid sökning: %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "datablock %d har fel sökposition"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "känner inte igen datablocktyp (%d) vid genomsökning av arkiv"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file"
 msgstr "kunde inte hitta block ID %d i arkiv -- kanske på grund av en återställningbegäran i oordning vilket inte kan hanteras då inputfilen inte är sökbar"
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr "kunde inte hitta block ID %d i arkiv -- möjligen ett trasigt arkiv"
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
 msgstr "hittade oväntat block-ID (%d) vid läsning av data -- förväntade %d"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "ej igenkänd datablockstyp %d vid återställande av arkiv"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
 #: pg_backup_tar.c:1032
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "kunde inte bestämma sökposition i arkivfil: %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "kan inte stänga arkivfilen: %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "kan inte återöppna indataarkiven"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "parallell återställning från standard in stöds inte"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr "parallell återställning för en icke sökbar fil stöds inte"
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "kunde inte söka till rätt position i arkivfilen: %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "komprimerare aktiv"
 
-#: pg_backup_db.c:42
-#, c-format
-msgid "could not get server_version from libpq"
-msgstr "kunde inte hämta serverversionen från libpq"
-
-#: pg_backup_db.c:53 pg_dumpall.c:1830
-#, c-format
-msgid "aborting because of server version mismatch"
-msgstr "avbryter då serverversionerna i matchar"
-
-#: pg_backup_db.c:54 pg_dumpall.c:1831
+#: pg_backup_db.c:41
 #, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "server version: %s; %s version: %s"
+msgid "could not get \"server_version\" from libpq"
+msgstr "kunde inte hämta \"server_versionen\" från libpq"
 
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "är redan uppkopplad mot en databas"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1677 pg_dumpall.c:1779
-msgid "Password: "
-msgstr "Lösenord: "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "kunde inte ansluta till databasen"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "återanslutning misslyckades: %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1704 pg_dumpall.c:1788
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1893 pg_dumpall.c:1916
-#, c-format
-msgid "query failed: %s"
-msgstr "fråga misslyckades: %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "Query was: %s"
-msgstr "Frågan var: %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
 msgstr[0] "fråga gav %d rad istället för en: %s"
 msgstr[1] "fråga gav %d rader istället för en: %s"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s: %sKommandot var: %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "kunde inte utföra fråga"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "fel returnerat av PQputCopyData: %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "fel returnerat av PQputCopyEnd: %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY misslyckades för tabell \"%s\": %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2283
+#: pg_backup_db.c:460 pg_dump.c:2473
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "oväntade extraresultat under kopiering (COPY) av tabell \"%s\""
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "kunde inte starta databastransaktionen"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "kunde inte genomföra databastransaktionen"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "ingen utdatakatalog angiven"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "kunde inte stänga katalog \"%s\": %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "kunde inte skapa katalog \"%s\": %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "kunde inte skriva till utdatafil: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "kan inte stänga datafil: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "kan inte stänga datafil \"%s\": %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "kunde inte öppna stora objekts TOC-fil \"%s\" för läsning: %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "ogiltig rad i stora objekts TOC-fil \"%s\": \"%s\""
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "fel vid lösning av stora objekts TOC-fil \"%s\""
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "kunde inte stänga stora objekts TOC-fil \"%s\": %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "kan inte stänga LO-datafil: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "kunde inte skriva till TOC-fil för LO: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "kunde inte stänga TOC-fil för LO: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "filnamnet är för långt: \"%s\""
@@ -1458,119 +1503,130 @@ msgstr[1] "inkomplett tar-huvud hittat (%lu bytes)"
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "trasigt tar-huvud hittat i %s (förväntade %d, beräknad %d) filposition %llu"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "okänt sektionsnamn: \"%s\""
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:800 pg_dump.c:817 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "slut på on_exit_nicely-slottar"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:815 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_dump.c:728 pg_restore.c:344
+#: pg_dump.c:827 pg_dump.c:830 pg_dump.c:833 pg_dump.c:838 pg_dump.c:841
+#: pg_dump.c:844 pg_dump.c:849 pg_dump.c:854 pg_dump.c:857 pg_dump.c:861
+#: pg_dump.c:869 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
 #, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "flaggorna \"bara schema\" (-s) och \"bara data\" (-a) kan inte användas tillsammans"
+msgid "options %s and %s cannot be used together"
+msgstr "flaggorna %s och %s kan inte användas tillsammans"
 
-#: pg_dump.c:731
+#: pg_dump.c:865
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "flaggorna -s/--schema-only och --include-foreign-data kan inte användas tillsammans"
+msgid "option %s is not supported with parallel backup"
+msgstr "flaggan %s stöds inte med parallell backup"
 
-#: pg_dump.c:734
+#: pg_dump.c:873 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "flaggan --include-foreign-data stöds inte med parallell backup"
+msgid "option %s requires option %s"
+msgstr "flaggan %s kräver även flaggan %s"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:894
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "flaggorna \"nollställ\" (-c) och \"bara data\" (-a) kan inte användas tillsammans"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "flaggan %s kräver någon av flaggorna %s, %s eller %s"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:912 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "flaggan --if-exists kräver flaggan -c/--clean"
+msgid "could not generate restrict key"
+msgstr "kunde inte generera begränsningsnyckel"
 
-#: pg_dump.c:747
+#: pg_dump.c:914 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "flagga --on-conflict-do-nothing kräver --inserts, --rows-per-insert eller --column-inserts"
+msgid "invalid restrict key"
+msgstr "ogiltig begränsningsnyckel"
 
-#: pg_dump.c:776
+#: pg_dump.c:917
+#, c-format
+msgid "option %s can only be used with %s"
+msgstr "flaggan %s kan bara användas med %s"
+
+#: pg_dump.c:940
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "okänd komprimeringsalgoritm: \"%s\""
 
-#: pg_dump.c:783
+#: pg_dump.c:947
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "ogiltig inställning för komprimering: %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:960
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "komprimeringsflaggan \"%s\" stöds inte än av pg_dump"
 
-#: pg_dump.c:808
+#: pg_dump.c:972
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "parallell backup stöds bara med katalogformat"
 
-#: pg_dump.c:854
+#: pg_dump.c:1018
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "sista inbyggda OID är %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1027
 #, c-format
 msgid "no matching schemas were found"
 msgstr "hittade inga matchande scheman"
 
-#: pg_dump.c:880
+#: pg_dump.c:1044
 #, c-format
 msgid "no matching tables were found"
 msgstr "hittade inga matchande tabeller"
 
-#: pg_dump.c:908
+#: pg_dump.c:1072
 #, c-format
 msgid "no matching extensions were found"
 msgstr "hittade inga matchande utökningar"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1266
 #, c-format
 msgid ""
-"%s dumps a database as a text file or to other formats.\n"
+"%s exports a PostgreSQL database as an SQL script or to other formats.\n"
 "\n"
 msgstr ""
-"%s dumpar en databas som en textfil eller i andra format.\n"
+"%s exporterar en PostgreSQL-databas som ett SQL-skript eller till andra format.\n"
 "\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:635 pg_restore.c:452
+#: pg_dump.c:1267 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1268
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [FLAGGA]... [DBNAMN]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:638 pg_restore.c:455
+#: pg_dump.c:1270 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid ""
 "\n"
@@ -1579,12 +1635,12 @@ msgstr ""
 "\n"
 "Allmänna flaggor:\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1271
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=FILENAME          fil eller katalognamn för utdata\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1272
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1593,22 +1649,22 @@ msgstr ""
 "  -F, --format=c|d|t|p         utdatans filformat (egen (c), katalog (d), tar (t),\n"
 "                               ren text (p) (standard))\n"
 
-#: pg_dump.c:1100
+#: pg_dump.c:1274
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               använd så här många parellella job för att dumpa\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:640
+#: pg_dump.c:1275 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                visa mer information\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:641
+#: pg_dump.c:1276 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                visa versionsinformation, avsluta sedan\n"
 
-#: pg_dump.c:1103
+#: pg_dump.c:1277
 #, c-format
 msgid ""
 "  -Z, --compress=METHOD[:DETAIL]\n"
@@ -1617,27 +1673,27 @@ msgstr ""
 "  -Z, --compress=METOD[:DETALJ]\n"
 "                               komprimera som angivet\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:642
+#: pg_dump.c:1279 pg_dumpall.c:707
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=TIMEOUT  misslyckas efter att ha väntat i TIMEOUT på tabellås\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:670
+#: pg_dump.c:1280 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr "  --no-sync                    vänta inte på att ändingar säkert skrivits till disk\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1281
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "  --sync-method=METOD          sätt synkmetod för att synka filer till disk\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:643
+#: pg_dump.c:1282 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   visa denna hjälp, avsluta sedan\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:644
+#: pg_dump.c:1284 pg_dumpall.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1646,62 +1702,62 @@ msgstr ""
 "\n"
 "Flaggor som styr utmatning:\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:645
+#: pg_dump.c:1285 pg_dumpall.c:710
 #, c-format
-msgid "  -a, --data-only              dump only the data, not the schema\n"
-msgstr "  -a, --data-only              dumpa bara data, inte schema\n"
+msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
+msgstr "  -a, --data-only              dumpa bara data, inte schema eller statistik\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1286
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          inkludera stora objekt i dumpen\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1287
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (samma som --large-objects, obsolet)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1288
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -B, --no-large-objects       exkludera stora objekt i dumpen\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1289
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (samma som --no-large-objects, obsolet)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1290 pg_restore.c:550
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                  nollställ (drop) databasobjekt innan återskapande\n"
 
-#: pg_dump.c:1117
+#: pg_dump.c:1291
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr "  -C, --create                 inkludera kommandon för att skapa databasen i dumpen\n"
 
-#: pg_dump.c:1118
+#: pg_dump.c:1292
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=MALL         dumpa bara de angivna utökningarna\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:647
+#: pg_dump.c:1293 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=KODNING       dumpa data i teckenkodning KODNING\n"
 
-#: pg_dump.c:1120
+#: pg_dump.c:1294
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=MALL            dumpa bara de angivna scheman\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1295
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=MALL    dumpa INTE de angivna scheman\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1296
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1710,52 +1766,52 @@ msgstr ""
 "  -O, --no-owner               hoppa över återställande av objektägare i\n"
 "                               textformatdumpar\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:651
+#: pg_dump.c:1298 pg_dumpall.c:716
 #, c-format
-msgid "  -s, --schema-only            dump only the schema, no data\n"
-msgstr "  -s, --schema-only            dumpa bara scheman, inte data\n"
+msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr "  -s, --schema-only            dumpa bara scheman, inte data eller statistik\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1299
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME         namn på superuser för textformatdumpar\n"
 
-#: pg_dump.c:1126
+#: pg_dump.c:1300
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=MALL             dumpa bara de angivna tabellerna\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1301
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=MALL     dumpa INTE de angivna tabellerna\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:654
+#: pg_dump.c:1302 pg_dumpall.c:719
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          dumpa inte rättigheter (grant/revoke)\n"
 
-#: pg_dump.c:1129 pg_dumpall.c:655
+#: pg_dump.c:1303 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             används bara av uppgraderingsverktyg\n"
 
-#: pg_dump.c:1130 pg_dumpall.c:656
+#: pg_dump.c:1304 pg_dumpall.c:721
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts             dumpa data som INSERT med kolumnnamn\n"
 
-#: pg_dump.c:1131 pg_dumpall.c:657
+#: pg_dump.c:1305 pg_dumpall.c:722
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr "  --disable-dollar-quoting     slå av dollar-citering, använd standard SQL-citering\n"
 
-#: pg_dump.c:1132 pg_dumpall.c:658 pg_restore.c:483
+#: pg_dump.c:1306 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr "  --disable-triggers           slå av triggrar vid återställning av enbart data\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1307
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1764,12 +1820,12 @@ msgstr ""
 "  --enable-row-security        slå på radsäkerhet (dumpa bara data användaren\n"
 "                               har rätt till)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=MALL     dumpa INTE de angivna utökningarna\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1310
 #, c-format
 msgid ""
 "  --exclude-table-and-children=PATTERN\n"
@@ -1780,12 +1836,12 @@ msgstr ""
 "                               dumpa INTE angivna tabeller, inklusive\n"
 "                               barn och partitionstabeller\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=MALL    dumpa INTE data för de angivna tabellerna\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1314
 #, c-format
 msgid ""
 "  --exclude-table-data-and-children=PATTERN\n"
@@ -1796,12 +1852,12 @@ msgstr ""
 "                               dumpa INTE data för angivna tabeller,\n"
 "                               inklusive barn och partitionstabeller\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:660
+#: pg_dump.c:1317 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM     övertrumfa standardinställningen för extra_float_digits\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1318
 #, c-format
 msgid ""
 "  --filter=FILENAME            include or exclude objects and data from dump\n"
@@ -1811,12 +1867,12 @@ msgstr ""
 "                               från dump baserat på uttryck i FILNAMN\n"
 "\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:662 pg_restore.c:487
+#: pg_dump.c:1320 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  använd IF EXISTS när objekt droppas\n"
 
-#: pg_dump.c:1147
+#: pg_dump.c:1321
 #, c-format
 msgid ""
 "  --include-foreign-data=PATTERN\n"
@@ -1827,87 +1883,129 @@ msgstr ""
 "                               inkludera data i främmande tabeller från\n"
 "                               främmande servrar som matchar MALL\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:663
+#: pg_dump.c:1324 pg_dumpall.c:728
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    dumpa data som INSERT, istället för COPY\n"
 
-#: pg_dump.c:1151 pg_dumpall.c:664
+#: pg_dump.c:1325 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    ladda partitioner via root-tabellen\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:665
+#: pg_dump.c:1326 pg_dumpall.c:730
+#, c-format
+msgid "  --no-comments                do not dump comment commands\n"
+msgstr "  --no-comments                dumpa inte kommentarskommandon\n"
+
+#: pg_dump.c:1327 pg_dumpall.c:731
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
-msgstr "  --no-comments                dumpa inte kommentarer\n"
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    dumpa inte data\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:666
+#: pg_dump.c:1328 pg_dumpall.c:732
+#, c-format
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                dumpa inte säkerhetspolicyer\n"
+
+#: pg_dump.c:1329 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            dumpa inte publiceringar\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:668
+#: pg_dump.c:1330 pg_dumpall.c:735
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-comments                dumpa inte schema\n"
+
+#: pg_dump.c:1331 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         dumpa inte tilldelning av säkerhetsetiketter\n"
 
-#: pg_dump.c:1155 pg_dumpall.c:669
+#: pg_dump.c:1332 pg_dumpall.c:737
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistics              dumpa inte statistik\n"
+
+#: pg_dump.c:1333 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           dumpa inte prenumereringar\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:671
+#: pg_dump.c:1334 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method     dumpa inte tabellaccessmetoder\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:672
+#: pg_dump.c:1335 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             dumpa inte användning av tabellutymmen\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:673
+#: pg_dump.c:1336 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       dumpa inte komprimeringsmetoder för TOAST\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:674
+#: pg_dump.c:1337 pg_dumpall.c:743
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     dumpa inte ologgad tabelldata\n"
 
-#: pg_dump.c:1160 pg_dumpall.c:675
+#: pg_dump.c:1338 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     addera ON CONFLICT DO NOTHING till INSERT-kommandon\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:676
+#: pg_dump.c:1339 pg_dumpall.c:745
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr "  --quote-all-identifiers      citera alla identifierar, även om de inte är nyckelord\n"
 
-#: pg_dump.c:1162 pg_dumpall.c:677
+#: pg_dump.c:1340 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr ""
+"  --restrict-key=BEGRÄNSNINGS_NYCKEL\n"
+"                               använd denns sträng som nyckel för psql \\restrict\n"
+
+#: pg_dump.c:1341 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NRADER     antal rader per INSERT; implicerar --inserts\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1342
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SEKTION            dumpa namngiven sektion (pre-data, data eller post-data)\n"
 
-#: pg_dump.c:1164
+#: pg_dump.c:1343 pg_dumpall.c:748
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              inkludera sekvensdata i dumpen\n"
+
+#: pg_dump.c:1344
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 
-#: pg_dump.c:1165
+#: pg_dump.c:1345
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          använda namngivet snapshot för att dumpa\n"
 
-#: pg_dump.c:1166 pg_restore.c:497
+#: pg_dump.c:1346 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 dumpa statistik\n"
+
+#: pg_dump.c:1347 pg_dumpall.c:750
+#, c-format
+msgid "  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr "  --statistics-only            dumpa bara statistik, inte schema eller data\n"
+
+#: pg_dump.c:1348 pg_restore.c:588
 #, c-format
 msgid ""
 "  --strict-names               require table and/or schema include patterns to\n"
@@ -1916,7 +2014,7 @@ msgstr ""
 "  --strict-names               kräv att mallar för tabeller och/eller scheman matchar\n"
 "                               minst en sak var\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1350
 #, c-format
 msgid ""
 "  --table-and-children=PATTERN dump only the specified table(s), including\n"
@@ -1925,7 +2023,7 @@ msgstr ""
 "  --table-and-children=MALL    dumpa bara angivna tabell(er), inklusive\n"
 "                               barn och partitionstabeller\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:678 pg_restore.c:500
+#: pg_dump.c:1352 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1936,7 +2034,7 @@ msgstr ""
 "                               använd kommandot SET SESSION AUTHORIZATION istället för\n"
 "                               kommandot ALTER OWNER för att sätta ägare\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:682 pg_restore.c:504
+#: pg_dump.c:1356 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid ""
 "\n"
@@ -1945,42 +2043,42 @@ msgstr ""
 "\n"
 "Flaggor för anslutning:\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1357
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAMN      databasens som skall dumpas\n"
 
-#: pg_dump.c:1176 pg_dumpall.c:684 pg_restore.c:505
+#: pg_dump.c:1358 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=VÄRDNAMN      databasens värdnamn eller socketkatalog\n"
 
-#: pg_dump.c:1177 pg_dumpall.c:686 pg_restore.c:506
+#: pg_dump.c:1359 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          databasens värdport\n"
 
-#: pg_dump.c:1178 pg_dumpall.c:687 pg_restore.c:507
+#: pg_dump.c:1360 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAMN      anslut med datta användarnamn mot databasen\n"
 
-#: pg_dump.c:1179 pg_dumpall.c:688 pg_restore.c:508
+#: pg_dump.c:1361 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        fråga aldrig efter lösenord\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:689 pg_restore.c:509
+#: pg_dump.c:1362 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           fråga om lösenord (borde ske automatiskt)\n"
 
-#: pg_dump.c:1181 pg_dumpall.c:690
+#: pg_dump.c:1363 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLLNAMN          gör SET ROLE innan dumpen\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1365
 #, c-format
 msgid ""
 "\n"
@@ -1993,537 +2091,552 @@ msgstr ""
 "PGDATABASE att användas.\n"
 "\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:694 pg_restore.c:516
+#: pg_dump.c:1367 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapportera fel till <%s>.\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:695 pg_restore.c:517
+#: pg_dump.c:1368 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1387 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "ogiltig klientteckenkodning \"%s\" angiven"
 
-#: pg_dump.c:1352
+#: pg_dump.c:1535
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "parallella dumpar från standby-server stöds inte av denna serverversion"
 
-#: pg_dump.c:1417
+#: pg_dump.c:1600
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "ogiltigt utdataformat \"%s\" angivet"
 
-#: pg_dump.c:1458 pg_dump.c:1514 pg_dump.c:1567 pg_dumpall.c:1467
+#: pg_dump.c:1641 pg_dump.c:1697 pg_dump.c:1750 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "ej korrekt kvalificerat namn (för många namn med punkt): %s"
 
-#: pg_dump.c:1466
+#: pg_dump.c:1649
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "hittade inga matchande scheman för mallen \"%s\""
 
-#: pg_dump.c:1519
+#: pg_dump.c:1702
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "hittade inga matchande utökningar för mallen \"%s\""
 
-#: pg_dump.c:1572
+#: pg_dump.c:1755
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "hittade inga matchande främmande servrar för mallen \"%s\""
 
-#: pg_dump.c:1643
+#: pg_dump.c:1826
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "ej korrekt relationsnamn (för många namn med punkt): %s"
 
-#: pg_dump.c:1665
+#: pg_dump.c:1848
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "hittade inga matchande tabeller för mallen \"%s\""
 
-#: pg_dump.c:1692
+#: pg_dump.c:1875
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Du är för närvarande inte uppkopplad mot en databas."
 
-#: pg_dump.c:1695
+#: pg_dump.c:1878
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "referenser till andra databaser är inte implementerat: %s"
 
-#: pg_dump.c:2154
+#: pg_dump.c:2344
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "dumpar innehållet i tabell \"%s.%s\""
 
-#: pg_dump.c:2264
+#: pg_dump.c:2454
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Dumpning av innehållet i tabellen \"%s\" misslyckades: PQendcopy() misslyckades."
 
-#: pg_dump.c:2265 pg_dump.c:2275
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Felmeddelandet från servern: %s"
 
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2456 pg_dump.c:2466
 #, c-format
 msgid "Command was: %s"
 msgstr "Kommandot var: %s"
 
-#: pg_dump.c:2274
+#: pg_dump.c:2464
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Dumpning av innehållet i tabellen \"%s\" misslyckades: PQgetResult() misslyckades."
 
-#: pg_dump.c:2365
+#: pg_dump.c:2555
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "fel antal fält hämtades för tabell \"%s\""
 
-#: pg_dump.c:3067
+#: pg_dump.c:3273
 #, c-format
 msgid "saving database definition"
 msgstr "sparar databasdefinition"
 
-#: pg_dump.c:3176
+#: pg_dump.c:3388
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "okänd lokalleverantör: %s"
 
-#: pg_dump.c:3537
+#: pg_dump.c:3749
 #, c-format
 msgid "saving encoding = %s"
 msgstr "sparar kodning = %s"
 
-#: pg_dump.c:3562
+#: pg_dump.c:3774
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "sparar \"standard_conforming_strings = %s\""
 
-#: pg_dump.c:3601
+#: pg_dump.c:3813
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "kunde inte parsa resultat från current_schemas()"
 
-#: pg_dump.c:3620
+#: pg_dump.c:3832
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "sparar \"search_path = %s\""
 
-#: pg_dump.c:3656
+#: pg_dump.c:3868
 #, c-format
 msgid "reading large objects"
 msgstr "läser stora objekt"
 
-#: pg_dump.c:3877
+#: pg_dump.c:4089
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "sparar stora objekt \"%s\""
 
-#: pg_dump.c:3898
+#: pg_dump.c:4110
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "fel vid läsning av stort objekt %u: %s"
 
-#: pg_dump.c:4001
+#: pg_dump.c:4218
 #, c-format
 msgid "reading row-level security policies"
 msgstr "läser säkerhetspolicy på radnivå"
 
-#: pg_dump.c:4142
+#: pg_dump.c:4359
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "oväntad kommandotyp för policy: %c"
 
-#: pg_dump.c:4592 pg_dump.c:5150 pg_dump.c:12362 pg_dump.c:18246
-#: pg_dump.c:18248 pg_dump.c:18870
+#: pg_dump.c:4801 pg_dump.c:5358 pg_dump.c:7987 pg_dump.c:13467 pg_dump.c:19678
+#: pg_dump.c:19680 pg_dump.c:20312
 #, c-format
 msgid "could not parse %s array"
 msgstr "kunde inte parsa arrayen %s"
 
-#: pg_dump.c:4806
+#: pg_dump.c:5017
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "prenumerationer har inte dumpats få aktuell användare inte är en superuser"
 
-#: pg_dump.c:5012
+#: pg_dump.c:5221
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "prenumeration med OID %u existerar inte"
 
-#: pg_dump.c:5019
+#: pg_dump.c:5228
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "misslyckades med riktighetskontroll, hittade inte tabell med OID %u"
 
-#: pg_dump.c:5582
+#: pg_dump.c:5814
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "kunde inte hitta föräldrautökning för %s %s"
 
-#: pg_dump.c:5727
+#: pg_dump.c:5952
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "schema med OID %u existerar inte"
 
-#: pg_dump.c:7209 pg_dump.c:17617
+#: pg_dump.c:7009
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "kan inte dumpa statistik för relation av typ \"%c\""
+
+#: pg_dump.c:7521 pg_dump.c:19005
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "misslyckades med riktighetskontroll, föräldratabell med OID %u för sekvens med OID %u hittas inte"
 
-#: pg_dump.c:7352
+#: pg_dump.c:7666
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "misslyckades med riktighetskontroll, hittade inte tabell med OID %u i pg_partitioned_table"
 
-#: pg_dump.c:7583 pg_dump.c:7857 pg_dump.c:8304 pg_dump.c:8918 pg_dump.c:9040
-#: pg_dump.c:9188
+#: pg_dump.c:7931 pg_dump.c:8224 pg_dump.c:8687 pg_dump.c:9334 pg_dump.c:9473
+#: pg_dump.c:9618 pg_dump.c:9718
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "okänt tabell-OID %u"
 
-#: pg_dump.c:7587
+#: pg_dump.c:7935
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "oväntat indexdata för tabell \"%s\""
 
-#: pg_dump.c:8089
+#: pg_dump.c:8474
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "misslyckades med riktighetskontroll, föräldratabell med OID %u för pg_rewrite-rad med OID %u hittades inte"
 
-#: pg_dump.c:8922
+#: pg_dump.c:9338
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "oväntad kolumndata för tabell \"%s\""
 
-#: pg_dump.c:8951
+#: pg_dump.c:9370
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "ogiltigt kolumnnumrering i tabell \"%s\""
 
-#: pg_dump.c:9002
+#: pg_dump.c:9435
 #, c-format
 msgid "finding table default expressions"
 msgstr "hittar tabellers default-uttryck"
 
-#: pg_dump.c:9044
+#: pg_dump.c:9477
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "felaktigt adnum-värde %d för tabell \"%s\""
 
-#: pg_dump.c:9138
+#: pg_dump.c:9570
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "hittar ogiltiga icke-null-villkor"
+
+#: pg_dump.c:9668
 #, c-format
 msgid "finding table check constraints"
 msgstr "hittar tabellers check-villkor"
 
-#: pg_dump.c:9192
+#: pg_dump.c:9722
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
 msgstr[0] "förväntade %d check-villkor för tabell \"%s\" men hittade %d"
 msgstr[1] "förväntade %d check-villkor för tabell \"%s\" men hittade %d"
 
-#: pg_dump.c:9196
+#: pg_dump.c:9726
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Systemkatalogerna kan vara trasiga."
 
-#: pg_dump.c:9886
+#: pg_dump.c:10531
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "roll med OID %u existerar inte"
 
-#: pg_dump.c:9998 pg_dump.c:10027
+#: pg_dump.c:10643 pg_dump.c:10672
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "ogiltig pg_init_privs-post: %u %u %d"
 
-#: pg_dump.c:10574
+#: pg_dump.c:10968
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "statistik dumpad i omkastad ordning (nuvarande: %d %s %s, förväntad: %d %s %s)"
+
+#: pg_dump.c:11109
+#, c-format
+msgid "unexpected null attname"
+msgstr "attname är oväntat null"
+
+#: pg_dump.c:11138
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "kunde inte hitta index attname \"%s\""
+
+#: pg_dump.c:11624
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "saknar metadata för stort objekt \"%s\""
 
-#: pg_dump.c:10857
+#: pg_dump.c:11910
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "typtype för datatyp \"%s\" verkar vara ogiltig"
 
-#: pg_dump.c:12431
+#: pg_dump.c:13538
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "okänt provolatile-värde för funktion \"%s\""
 
-#: pg_dump.c:12481 pg_dump.c:14377
+#: pg_dump.c:13588 pg_dump.c:15484
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "okänt proparallel-värde för funktion \"%s\""
 
-#: pg_dump.c:12611 pg_dump.c:12717 pg_dump.c:12724
+#: pg_dump.c:13718 pg_dump.c:13824 pg_dump.c:13831
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "kunde inte hitta funktionsdefinitionen för funktion med OID %u"
 
-#: pg_dump.c:12650
+#: pg_dump.c:13757
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "felaktigt värde i fältet pg_cast.castfunc eller pg_cast.castmethod"
 
-#: pg_dump.c:12653
+#: pg_dump.c:13760
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "felaktigt värde i fältet pg_cast.castmethod"
 
-#: pg_dump.c:12743
+#: pg_dump.c:13850
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "felaktig transform-definition, minst en av trffromsql och trftosql måste vara ickenoll"
 
-#: pg_dump.c:12760
+#: pg_dump.c:13867
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "felaktigt värde i fältet pg_transform.trffromsql"
 
-#: pg_dump.c:12781
+#: pg_dump.c:13888
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "felaktigt värde i fältet pg_transform.trftosql"
 
-#: pg_dump.c:12926
+#: pg_dump.c:14033
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "postfix-operatorer stöds inte längre (operator \"%s\")"
 
-#: pg_dump.c:13096
+#: pg_dump.c:14203
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "kunde inte hitta en operator med OID %s."
 
-#: pg_dump.c:13164
+#: pg_dump.c:14271
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "ogiltig typ \"%c\" för accessmetod \"%s\""
 
-#: pg_dump.c:13838 pg_dump.c:13906
+#: pg_dump.c:14945 pg_dump.c:15013
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "okänd jämförelseleverantör: %s"
 
-#: pg_dump.c:13847 pg_dump.c:13854 pg_dump.c:13865 pg_dump.c:13875
-#: pg_dump.c:13890
+#: pg_dump.c:14954 pg_dump.c:14961 pg_dump.c:14972 pg_dump.c:14982
+#: pg_dump.c:14997
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "ogiltig jämförelse \"%s\""
 
-#: pg_dump.c:14296
+#: pg_dump.c:15403
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "okänt aggfinalmodify-värde för aggregat \"%s\""
 
-#: pg_dump.c:14352
+#: pg_dump.c:15459
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "okänt aggmfinalmodify-värde för aggregat \"%s\""
 
-#: pg_dump.c:15069
+#: pg_dump.c:16179
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "okänd objekttyp i standardrättigheter: %d"
 
-#: pg_dump.c:15085
+#: pg_dump.c:16195
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "kunde inte parsa standard-ACL-lista (%s)"
 
-#: pg_dump.c:15169
+#: pg_dump.c:16279
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "kunde inte parsa initial ACL-lista (%s) eller default (%s) för objekt \"%s\" (%s)"
 
-#: pg_dump.c:15194
+#: pg_dump.c:16304
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "kunde inte parsa ACL-lista (%s) eller default (%s) för objekt \"%s\" (%s)"
 
-#: pg_dump.c:15737
+#: pg_dump.c:16847
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "fråga för att hämta definition av vy \"%s\" returnerade ingen data"
 
-#: pg_dump.c:15740
+#: pg_dump.c:16850
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "fråga för att hämta definition av vy \"%s\" returnerade mer än en definition"
 
-#: pg_dump.c:15747
+#: pg_dump.c:16857
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "definition av vy \"%s\" verkar vara tom (längd noll)"
 
-#: pg_dump.c:15832
+#: pg_dump.c:16942
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS stöds inte längre (tabell \"%s\")"
 
-#: pg_dump.c:16819
+#: pg_dump.c:18082
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "ogiltigt kolumnnummer %d för tabell \"%s\""
 
-#: pg_dump.c:16897
+#: pg_dump.c:18160
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "kunde inte parsa kolumn i indexstatistik"
 
-#: pg_dump.c:16899
+#: pg_dump.c:18162
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "kunde inte parsa värden i indexstatistik"
 
-#: pg_dump.c:16901
+#: pg_dump.c:18164
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "antal kolumner och värden stämmer inte i indexstatistik"
 
-#: pg_dump.c:17116
+#: pg_dump.c:18393
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "saknar index för integritetsvillkor \"%s\""
 
-#: pg_dump.c:17351
+#: pg_dump.c:18662
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "oväntad integritetsvillkorstyp: %c"
 
-#: pg_dump.c:17452 pg_dump.c:17681
+#: pg_dump.c:18715
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "okänd sekvenstyp: %s"
+
+#: pg_dump.c:18848 pg_dump.c:19086
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
 msgstr[0] "fråga för att hämta data för sekvens \"%s\" returnerade %d rad (förväntade 1)"
 msgstr[1] "fråga för att hämta data för sekvens \"%s\" returnerade %d rader (förväntade 1)"
 
-#: pg_dump.c:17484
+#: pg_dump.c:18884
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "okänd sekvenstyp: %s"
+msgid "unrecognized sequence type: %d"
+msgstr "okänd sekvenstyp: %d"
+
+#: pg_dump.c:19109
+#, c-format
+msgid "failed to get data for sequence \"%s\"; user may lack SELECT privilege on the sequence or the sequence may have been concurrently dropped"
+msgstr "misslyckades att hämta data för sekvensen \"%s\"; användaren kanske saknar SELECT-rättighet på sekvensen eller så har sekvensen slängts av en parallell operation"
 
-#: pg_dump.c:17998
+#: pg_dump.c:19430
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "fråga för att hämta regel \"%s\" för tabell \"%s\" misslyckades: fel antal rader returnerades"
 
-#: pg_dump.c:18151
+#: pg_dump.c:19583
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "kunde inte hitta refererad utökning %u"
 
-#: pg_dump.c:18250
+#: pg_dump.c:19682
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "antal konfigurationer och villkor stämmer inte för utökning"
 
-#: pg_dump.c:18382
+#: pg_dump.c:19814
 #, c-format
 msgid "reading dependency data"
 msgstr "läser beroendedata"
 
-#: pg_dump.c:18468
+#: pg_dump.c:19900
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "inget refererande objekt %u %u"
 
-#: pg_dump.c:18479
+#: pg_dump.c:19911
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "inget refererat objekt %u %u"
 
-#: pg_dump.c:18904 pg_dump.c:18942 pg_dumpall.c:1962 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20346 pg_dump.c:20384 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "%s-filter för \"%s\" tillåts inte"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "ogiltigt dumpId %d"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "ogiltigt beroende %d"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "kunde inte fastställa beroendeloop"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
 msgstr[0] "det finns cirkulära främmande nyckelberoenden för denna tabell:"
 msgstr[1] "det finns cirkulära främmande nyckelberoenden för dessa tabeller:"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "Du kan eventiellt inte återställa dumpen utan att använda --disable-triggers eller temporärt droppa vilkoren."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "Överväg att göra en full dump istället för --data-only för att undvika detta problem."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "kunde inte räta ut beroendeloopen för dessa saker:"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\""
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s"
 
-#: pg_dumpall.c:387
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "flaggan --exclude-database kan inte användas tillsammans med -g/--globals-only, -r/--roles-only eller -t/--tablespaces-only"
-
-#: pg_dumpall.c:395
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "flaggorna \"bara gobala\" (-g) och \"bara roller\" (-r) kan inte användas tillsammans"
-
 #: pg_dumpall.c:402
 #, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "flaggorna \"bara globala\" (-g) och \"bara tabellutrymmen\" (-t) kan inte användas tillsammans"
-
-#: pg_dumpall.c:412
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "flaggorna \"bara roller\" (-r) och \"bara tabellutrymmen\" (-t) kan inte användas tillsammans"
-
-#: pg_dumpall.c:474 pg_dumpall.c:1771
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "kunde inte ansluta till databasen \"%s\""
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "flaggan %s kan inte användas tillsammans med %s, %s eller %s"
 
-#: pg_dumpall.c:486
+#: pg_dumpall.c:534
 #, c-format
 msgid ""
 "could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2532,81 +2645,81 @@ msgstr ""
 "kunde inte ansluta till databasen \"postgres\" eller \"template1\"\n"
 "Ange en annan databas."
 
-#: pg_dumpall.c:634
+#: pg_dumpall.c:699
 #, c-format
 msgid ""
-"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"%s exports a PostgreSQL database cluster as an SQL script.\n"
 "\n"
 msgstr ""
-"%s extraherar ett PostgreSQL databaskluster till en SQL-scriptfil.\n"
+"%s extraherar ett PostgreSQL databaskluster som ett SQL-script.\n"
 "\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [FLAGGA]...\n"
 
-#: pg_dumpall.c:639
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=FILENAME          utdatafilnamn\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  nollställ (drop) databaser innan återskapning\n"
 
-#: pg_dumpall.c:648
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr "  -g, --globals-only           dumpa bara globala objekt, inte databaser\n"
 
-#: pg_dumpall.c:649 pg_restore.c:475
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               återställ inte objektägare\n"
 
-#: pg_dumpall.c:650
+#: pg_dumpall.c:715
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only             dumpa endast roller, inte databaser eller tabellutrymmen\n"
 
-#: pg_dumpall.c:652
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NAMN         namn på superuser för användning i dumpen\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:718
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only       dumpa endasdt tabellutrymmen, inte databaser eller roller\n"
 
-#: pg_dumpall.c:659
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr "  --exclude-database=MALL      uteslut databaser vars namn matchar MALL\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr "  --filter=FILENAMN            exkludera databaser givet uttryck i FILENAMN\n"
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          dumpa inte lösenord för roller\n"
 
-#: pg_dumpall.c:683
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=ANSLSTR     anslut med anslutningssträng\n"
 
-#: pg_dumpall.c:685
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAMN    alternativ standarddatabas\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:765
 #, c-format
 msgid ""
 "\n"
@@ -2618,106 +2731,87 @@ msgstr ""
 "Om -f/--file inte används så kommer SQL-skriptet skriva till standard ut.\n"
 "\n"
 
-#: pg_dumpall.c:837
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "rollnamn som startar med \"pg_\" hoppas över (%s)"
 
-#: pg_dumpall.c:1059
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
+#, c-format
+msgid "found orphaned pg_auth_members entry for role %s"
+msgstr "hittade föräldralös pg_auth_members-post för roll %s"
+
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "kunde inte hitta en korrekt dumpordning för medlemskap i rollen \"%s\""
 
-#: pg_dumpall.c:1194
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "kunde inte parsa ACL-listan (%s) för parameter \"%s\""
 
-#: pg_dumpall.c:1321
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "kunde inte tolka ACL-listan (%s) för tabellutrymme \"%s\""
 
-#: pg_dumpall.c:1528
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "utesluter databas \"%s\""
 
-#: pg_dumpall.c:1532
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "dumpar databas \"%s\""
 
-#: pg_dumpall.c:1563
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "pg_dump misslyckades med databas \"%s\", avslutar"
 
-#: pg_dumpall.c:1569
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "kunde inte öppna om utdatafilen \"%s\": %m"
 
-#: pg_dumpall.c:1613
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "kör \"%s\""
 
-#: pg_dumpall.c:1814
-#, c-format
-msgid "could not get server version"
-msgstr "kunde inte hämta serverversionen"
-
-#: pg_dumpall.c:1817
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "kunde inte tolka versionsträngen \"%s\""
-
-#: pg_dumpall.c:1887 pg_dumpall.c:1910
-#, c-format
-msgid "executing %s"
-msgstr "kör: %s"
-
-#: pg_dumpall.c:1982
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "filterobjektet stöds inte"
 
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "en av flaggorna -d/--dbname och -f/--file måste anges"
 
-#: pg_restore.c:336
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "flaggorna -d/--dbname och -f/--file kan inte användas ihop"
-
-#: pg_restore.c:350
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "flaggorna -1/--single-transaction och --transaction-size kan inte användas tillsammans"
-
-#: pg_restore.c:357
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "flaggorna -C/--create och -1/--single-transaction kan inte användas tillsammans"
-
-#: pg_restore.c:361
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "kan inte ange både --single-transaction och multipla job"
 
-#: pg_restore.c:399
+#: pg_restore.c:480
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "arkivformat \"%s\" stöds inte, använd psql"
+
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "okänt arkivformat \"%s\"; vänligen ange \"c\", \"d\" eller \"t\""
 
-#: pg_restore.c:438
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "fel ignorerade vid återställande: %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:535
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2726,47 +2820,47 @@ msgstr ""
 "%s återställer en PostgreSQL-databas från ett arkiv skapat av pg_dump.\n"
 "\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [FLAGGA]... [FIL]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAMN        koppla upp med databasnamn\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FILNAMN       utdatafilnamn (- för stdout)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:542
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr "  -F, --format=c|d|t       backupens filformat (bör ske automatiskt)\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               skriv ut summerad TOC för arkivet\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            visa mer information\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            visa versionsinformation, avsluta sedan\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               visa denna hjälp, avsluta sedan\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:548
 #, c-format
 msgid ""
 "\n"
@@ -2775,32 +2869,32 @@ msgstr ""
 "\n"
 "Flaggor som styr återställning:\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              återställ bara data, inte scheman\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 skapa måldatabasen\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:552
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error          avsluta vid fel, standard är att fortsätta\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAMN             återställ namngivet index\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM               använda så här många parallella job för återställning\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:555
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2809,57 +2903,57 @@ msgstr ""
 "  -L, --use-list=FILNAMN       använd innehållsförteckning från denna fil för\n"
 "                               att välja/sortera utdata\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:557
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NAMN            återställ enbart objekt i detta schema\n"
 
-#: pg_restore.c:474
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=NAMN    återställ inte objekt i detta schema\n"
 
-#: pg_restore.c:476
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NAMN(arg)     återställ namngiven funktion\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            återställ bara scheman, inte data\n"
 
-#: pg_restore.c:478
+#: pg_restore.c:562
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAMN         namn på superuser för att slå av triggrar\n"
 
-#: pg_restore.c:479
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NAMN             återställ namngiven relation (tabell, vy, osv.)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAMN           återställ namngiven trigger\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:565
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          återställ inte åtkomsträttigheter (grant/revoke)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:566
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     återställ i en enda transaktion\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        aktivera radsäkerhet\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:569
 #, c-format
 msgid ""
 "  --filter=FILENAME            restore or skip objects based on expressions\n"
@@ -2868,12 +2962,17 @@ msgstr ""
 "  --filter=FILENAMN            återställ eller hoppa över objekt\n"
 "                               baserat på uttryck i FILENAMN\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:572
+#, c-format
+msgid "  --no-comments                do not restore comment commands\n"
+msgstr "  --no-comments                återställ inte kommentarskommandon\n"
+
+#: pg_restore.c:573
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
-msgstr "  --no-comments                återställ inte kommentarer\n"
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    återställ inte data\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:574
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2882,47 +2981,72 @@ msgstr ""
 "  --no-data-for-failed-tables  återställ inte data för tabeller som\n"
 "                               inte kunde skapas\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:576
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr "  --no-policies                återställ inte särkerhetspolicyer\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications            återställ inte publiceringar\n"
 
-#: pg_restore.c:492
+#: pg_restore.c:578
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  återställ inte schema\n"
+
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         återställ inte säkerhetsetiketter\n"
 
-#: pg_restore.c:493
+#: pg_restore.c:580
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              återställ inte statistik\n"
+
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions           återställ inte prenumerationer\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method     återställ inte tabellaccessmetoder\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             återställ inte användning av tabellutymmen\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:585
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SEKTION            återställ namngiven sektion (pre-data, data eller post-data)\n"
 
-#: pg_restore.c:499
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 återställ statistik\n"
+
+#: pg_restore.c:587
+#, c-format
+msgid "  --statistics-only            restore only the statistics, not schema or data\n"
+msgstr "  --statistics-only            återställ bara statistik, inte schema och data\n"
+
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         gör commit efter var N:e objekt\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          gör SET ROLE innan återställning\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:603
 #, c-format
 msgid ""
 "\n"
@@ -2933,7 +3057,7 @@ msgstr ""
 "Flaggorna -I, -n, -N, -P, -t, -T och --section kan kombineras och anges\n"
 "många gånger för att välja flera objekt.\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:606
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_dump/po/uk.po b/src/bin/pg_dump/po/uk.po
index f92561f2eb4..6476ba8d787 100644
--- a/src/bin/pg_dump/po/uk.po
+++ b/src/bin/pg_dump/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-23 10:51+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:22+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,33 +14,33 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_dump.pot\n"
-"X-Crowdin-File-ID: 986\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_dump.pot\n"
+"X-Crowdin-File-ID: 1089\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
 
 #: ../../common/compression.c:132 ../../common/compression.c:141
-#: ../../common/compression.c:150 compress_gzip.c:413 compress_gzip.c:420
-#: compress_io.c:109 compress_lz4.c:780 compress_lz4.c:787 compress_zstd.c:25
-#: compress_zstd.c:31
+#: ../../common/compression.c:150 compress_gzip.c:441 compress_gzip.c:448
+#: compress_io.c:108 compress_lz4.c:800 compress_lz4.c:807 compress_zstd.c:26
+#: compress_zstd.c:32
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "ця збірка не підтримує стиснення з %s"
@@ -109,27 +109,27 @@ msgstr "неможливо знайти \"%s\" для виконання"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не вдалося знайти абсолютний шлях \"%s\": %m"
 
-#: ../../common/exec.c:382
+#: ../../common/exec.c:363
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не вдалося виконати команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не вдалося прочитати висновок команди \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не повернула жодних даних"
 
-#: ../../common/exec.c:424 parallel.c:1609
+#: ../../common/exec.c:405 parallel.c:1611
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
@@ -144,45 +144,44 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 dumputils.c:944
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_backup_directory.c:182
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -232,578 +231,673 @@ msgstr "%s має бути в діапазоні %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: common.c:135
+#: common.c:112
 #, c-format
 msgid "reading extensions"
 msgstr "читання розширень"
 
-#: common.c:138
+#: common.c:115
 #, c-format
 msgid "identifying extension members"
 msgstr "ідентифікація членів розширення"
 
-#: common.c:141
+#: common.c:118
 #, c-format
 msgid "reading schemas"
 msgstr "читання схемів"
 
-#: common.c:150
+#: common.c:127
 #, c-format
 msgid "reading user-defined tables"
 msgstr "читання користувацьких таблиць"
 
-#: common.c:155
+#: common.c:132
 #, c-format
 msgid "reading user-defined functions"
 msgstr "читання користувацьких функцій"
 
-#: common.c:159
+#: common.c:136
 #, c-format
 msgid "reading user-defined types"
 msgstr "читання користувацьких типів"
 
-#: common.c:163
+#: common.c:140
 #, c-format
 msgid "reading procedural languages"
 msgstr "читання процедурних мов"
 
-#: common.c:166
+#: common.c:143
 #, c-format
 msgid "reading user-defined aggregate functions"
 msgstr "читання користувацьких агрегатних функцій"
 
-#: common.c:169
+#: common.c:146
 #, c-format
 msgid "reading user-defined operators"
 msgstr "читання користувацьких операторів"
 
-#: common.c:172
+#: common.c:149
 #, c-format
 msgid "reading user-defined access methods"
 msgstr "читання користувацьких методів доступу"
 
-#: common.c:175
+#: common.c:152
 #, c-format
 msgid "reading user-defined operator classes"
 msgstr "читання користувацьких класів операторів"
 
-#: common.c:178
+#: common.c:155
 #, c-format
 msgid "reading user-defined operator families"
 msgstr "читання користувацьких сімейств операторів"
 
-#: common.c:181
+#: common.c:158
 #, c-format
 msgid "reading user-defined text search parsers"
 msgstr "читання користувацьких парсерів текстового пошуку"
 
-#: common.c:184
+#: common.c:161
 #, c-format
 msgid "reading user-defined text search templates"
 msgstr "читання користувацьких шаблонів текстового пошуку"
 
-#: common.c:187
+#: common.c:164
 #, c-format
 msgid "reading user-defined text search dictionaries"
 msgstr "читання користувацьких словників текстового пошуку"
 
-#: common.c:190
+#: common.c:167
 #, c-format
 msgid "reading user-defined text search configurations"
 msgstr "читання користувацьких конфігурацій текстового пошуку"
 
-#: common.c:193
+#: common.c:170
 #, c-format
 msgid "reading user-defined foreign-data wrappers"
 msgstr "читання користувацьких джерел сторонніх даних"
 
-#: common.c:196
+#: common.c:173
 #, c-format
 msgid "reading user-defined foreign servers"
 msgstr "читання користувацьких сторонніх серверів"
 
-#: common.c:199
+#: common.c:176
 #, c-format
 msgid "reading default privileges"
 msgstr "читання прав за замовчуванням"
 
-#: common.c:202
+#: common.c:179
 #, c-format
 msgid "reading user-defined collations"
 msgstr "читання користувацьких сортувань"
 
-#: common.c:205
+#: common.c:182
 #, c-format
 msgid "reading user-defined conversions"
 msgstr "читання користувацьких перетворень"
 
-#: common.c:208
+#: common.c:185
 #, c-format
 msgid "reading type casts"
 msgstr "читання типу приведення"
 
-#: common.c:211
+#: common.c:188
 #, c-format
 msgid "reading transforms"
 msgstr "читання перетворень"
 
-#: common.c:214
+#: common.c:191
 #, c-format
 msgid "reading table inheritance information"
 msgstr "читання інформації про успадкування таблиці"
 
-#: common.c:217
+#: common.c:194
 #, c-format
 msgid "reading event triggers"
 msgstr "читання тригерів подій"
 
-#: common.c:221
+#: common.c:198
 #, c-format
 msgid "finding extension tables"
 msgstr "пошук таблиць розширень"
 
-#: common.c:225
+#: common.c:202
 #, c-format
 msgid "finding inheritance relationships"
 msgstr "пошук відносин успадкування"
 
-#: common.c:228
+#: common.c:205
 #, c-format
 msgid "reading column info for interesting tables"
 msgstr "читання інформації про стовпці цікавлячої таблиці"
 
-#: common.c:231
+#: common.c:208
 #, c-format
 msgid "flagging inherited columns in subtables"
 msgstr "помітка успадкованих стовпців в підтаблицях"
 
-#: common.c:234
+#: common.c:211
 #, c-format
 msgid "reading partitioning data"
 msgstr "читання даних секції"
 
-#: common.c:237
+#: common.c:214
 #, c-format
 msgid "reading indexes"
 msgstr "читання індексів"
 
-#: common.c:240
+#: common.c:217
 #, c-format
 msgid "flagging indexes in partitioned tables"
 msgstr "помітка індексів в секційних таблицях"
 
-#: common.c:243
+#: common.c:220
 #, c-format
 msgid "reading extended statistics"
 msgstr "читання розширеної статистики"
 
-#: common.c:246
+#: common.c:223
 #, c-format
 msgid "reading constraints"
 msgstr "читання обмежень"
 
-#: common.c:249
+#: common.c:226
 #, c-format
 msgid "reading triggers"
 msgstr "читання тригерів"
 
-#: common.c:252
+#: common.c:229
 #, c-format
 msgid "reading rewrite rules"
 msgstr "читання правил перезаписування"
 
-#: common.c:255
+#: common.c:232
 #, c-format
 msgid "reading policies"
 msgstr "читання політик"
 
-#: common.c:258
+#: common.c:235
 #, c-format
 msgid "reading publications"
 msgstr "читання публікацій"
 
-#: common.c:261
+#: common.c:238
 #, c-format
 msgid "reading publication membership of tables"
 msgstr "читання членства публікації для таблиць"
 
-#: common.c:264
+#: common.c:241
 #, c-format
 msgid "reading publication membership of schemas"
 msgstr "читання членства публікації для схем"
 
-#: common.c:267
+#: common.c:244
 #, c-format
 msgid "reading subscriptions"
 msgstr "читання підписок"
 
-#: common.c:270
+#: common.c:247
 #, c-format
 msgid "reading subscription membership of tables"
 msgstr "читання підписки членства таблиць"
 
-#: common.c:333
+#: common.c:310
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found"
 msgstr "помилка перевірки, батьківський елемент ідентифікатора OID %u для таблиці \"%s\" (ідентифікатор OID %u) не знайдено"
 
-#: common.c:375
+#: common.c:352
 #, c-format
 msgid "invalid number of parents %d for table \"%s\""
 msgstr "неприпустиме число батьківських елементів %d для таблиці \"%s\""
 
-#: common.c:1098
+#: common.c:1128
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers"
 msgstr "не вдалося проаналізувати числовий масив \"%s\": забагато чисел"
 
-#: common.c:1110
+#: common.c:1140
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number"
 msgstr "не вдалося проаналізувати числовий масив \"%s\": неприпустимий характер числа"
 
-#: compress_gzip.c:69 compress_gzip.c:183
+#: compress_gzip.c:78 compress_gzip.c:192
 #, c-format
 msgid "could not initialize compression library: %s"
 msgstr "не вдалося ініціалізувати бібліотеку стиснення: %s"
 
-#: compress_gzip.c:93
+#: compress_gzip.c:102
 #, c-format
 msgid "could not close compression stream: %s"
 msgstr "не вдалося закрити потік стиснення: %s"
 
-#: compress_gzip.c:113 compress_lz4.c:227 compress_zstd.c:109
+#: compress_gzip.c:122 compress_lz4.c:228 compress_zstd.c:110
 #, c-format
 msgid "could not compress data: %s"
 msgstr "не вдалося стиснути дані: %s"
 
-#: compress_gzip.c:199 compress_gzip.c:214
+#: compress_gzip.c:208 compress_gzip.c:223
 #, c-format
 msgid "could not uncompress data: %s"
 msgstr "не вдалося розпакувати дані: %s"
 
-#: compress_gzip.c:221
+#: compress_gzip.c:230
 #, c-format
 msgid "could not close compression library: %s"
 msgstr "не вдалося закрити бібліотеку стиснення: %s"
 
-#: compress_gzip.c:266 compress_lz4.c:608 compress_lz4.c:628 compress_lz4.c:647
+#: compress_gzip.c:290 compress_lz4.c:513 compress_lz4.c:616 compress_lz4.c:633
 #, c-format
 msgid "could not read from input file: %s"
 msgstr "не вдалося прочитати з вхідного файлу: %s"
 
-#: compress_gzip.c:295 compress_none.c:97 compress_none.c:139
-#: compress_zstd.c:373 pg_backup_custom.c:651
+#: compress_gzip.c:307 compress_zstd.c:382
+#, c-format
+msgid "could not write to file: %s"
+msgstr "не вдалося записати до файлу: %s"
+
+#: compress_gzip.c:323 compress_lz4.c:494 compress_none.c:94
+#: compress_none.c:135 compress_zstd.c:315 pg_backup_custom.c:650
 #, c-format
 msgid "could not read from input file: %m"
 msgstr "не вдалося прочитати з вхідного файлу: %m"
 
-#: compress_gzip.c:297 compress_lz4.c:630 compress_none.c:141
-#: compress_zstd.c:371 pg_backup_custom.c:649 pg_backup_directory.c:565
+#: compress_gzip.c:325 compress_lz4.c:635 compress_none.c:137
+#: compress_zstd.c:400 pg_backup_custom.c:648 pg_backup_directory.c:515
 #: pg_backup_tar.c:740 pg_backup_tar.c:763
 #, c-format
 msgid "could not read from input file: end of file"
 msgstr "не вдалося прочитати з вхідного файлу: кінець файлу"
 
-#: compress_lz4.c:157
+#: compress_lz4.c:158
 #, c-format
 msgid "could not create LZ4 decompression context: %s"
 msgstr "не вдалося створити контекст декомпресії LZ4: %s"
 
-#: compress_lz4.c:180
+#: compress_lz4.c:181
 #, c-format
 msgid "could not decompress: %s"
 msgstr "не вдалося розпакувати: %s"
 
-#: compress_lz4.c:193
+#: compress_lz4.c:194
 #, c-format
 msgid "could not free LZ4 decompression context: %s"
 msgstr "не вдалося звільнити контекст декомпресії LZ4: %s"
 
-#: compress_lz4.c:259 compress_lz4.c:266 compress_lz4.c:680 compress_lz4.c:690
+#: compress_lz4.c:260 compress_lz4.c:267 compress_lz4.c:689 compress_lz4.c:704
 #, c-format
 msgid "could not end compression: %s"
 msgstr "не вдалося закінчити стискання: %s"
 
-#: compress_lz4.c:301
+#: compress_lz4.c:302
 #, c-format
 msgid "could not initialize LZ4 compression: %s"
 msgstr "не вдалося ініціалізувати стискання LZ4: %s"
 
-#: compress_lz4.c:697
+#: compress_lz4.c:463 compress_lz4.c:581
+#, c-format
+msgid "unable to initialize LZ4 library: %s"
+msgstr "не вдалося ініціалізувати бібліотеку LZ4: %s"
+
+#: compress_lz4.c:593
+#, c-format
+msgid "error during writing: %s"
+msgstr "помилка під час записування: %s"
+
+#: compress_lz4.c:599
+#, c-format
+msgid "error during writing: %m"
+msgstr "помилка під час записування: %m"
+
+#: compress_lz4.c:698
+#, c-format
+msgid "could not write to output file: %m"
+msgstr "не вдалося записати до вихідного файлу: %m"
+
+#: compress_lz4.c:711
 #, c-format
 msgid "could not end decompression: %s"
 msgstr "не вдалося закінчити розпакування: %s"
 
-#: compress_zstd.c:66
+#: compress_lz4.c:726 compress_none.c:156
+#, c-format
+msgid "could not close file: %m"
+msgstr "не вдалося закрити файл: %m"
+
+#: compress_none.c:109 compress_zstd.c:389
+#, c-format
+msgid "could not write to file: %m"
+msgstr "не вдалося записати до файлу: %m"
+
+#: compress_zstd.c:67
 #, c-format
 msgid "could not set compression parameter \"%s\": %s"
 msgstr "не вдалося встановити параметр стискання \"%s\": %s"
 
-#: compress_zstd.c:78 compress_zstd.c:231 compress_zstd.c:490
-#: compress_zstd.c:498
+#: compress_zstd.c:79 compress_zstd.c:234 compress_zstd.c:283
+#: compress_zstd.c:373
 #, c-format
 msgid "could not initialize compression library"
 msgstr "не вдалося ініціалізувати бібліотеку стискання"
 
-#: compress_zstd.c:194 compress_zstd.c:308
+#: compress_zstd.c:197 compress_zstd.c:336
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "не вдалося розпакувати дані: %s"
 
-#: compress_zstd.c:501
+#: connectdb.c:56 connectdb.c:165 pg_backup_db.c:126
+msgid "Password: "
+msgstr "Пароль: "
+
+#: connectdb.c:83 connectdb.c:174 pg_backup_db.c:203 pg_dump.c:951
+#: pg_dump_sort.c:1478 pg_dump_sort.c:1498
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: connectdb.c:157 pg_dumpall.c:520
+#, c-format
+msgid "could not connect to database \"%s\""
+msgstr "не вдалося зв'язатися з базою даних \"%s\""
+
+#: connectdb.c:201
+#, c-format
+msgid "could not get server version"
+msgstr "не вдалося отримати версію серверу"
+
+#: connectdb.c:205
+#, c-format
+msgid "could not parse server version \"%s\""
+msgstr "не вдалося аналізувати версію серверу \"%s\""
+
+#: connectdb.c:222 pg_backup_db.c:52
 #, c-format
-msgid "unhandled mode \"%s\""
-msgstr "непідтримуваний режим \"%s\""
+msgid "aborting because of server version mismatch"
+msgstr "переривання через невідповідність версії серверу"
+
+#: connectdb.c:223 pg_backup_db.c:53
+#, c-format
+msgid "server version: %s; %s version: %s"
+msgstr "версія серверу: %s; версія %s: %s"
 
-#: filter.c:49
+#: connectdb.c:282 pg_dumpall.c:1790
+#, c-format
+msgid "executing %s"
+msgstr "виконується %s"
+
+#: connectdb.c:288 pg_backup_db.c:210 pg_dumpall.c:1796
+#, c-format
+msgid "query failed: %s"
+msgstr "запит не вдався: %s"
+
+#: connectdb.c:289 pg_backup_db.c:212 pg_dumpall.c:1797
+#, c-format
+msgid "Query was: %s"
+msgstr "Запит був: %s"
+
+#: dumputils.c:949
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "не вдалося створити каталог \"%s\": %m"
+
+#: dumputils.c:954
+#, c-format
+msgid "could not change permissions of directory \"%s\": %m"
+msgstr "не вдалося змінити дозволи каталогу \"%s\": %m"
+
+#: dumputils.c:959
+#, c-format
+msgid "directory \"%s\" is not empty"
+msgstr "каталог \"%s\" не порожній"
+
+#: filter.c:48
 #, c-format
 msgid "could not open filter file \"%s\": %m"
 msgstr "не вдалося відкрити файл фільтра \"%s\": %m"
 
-#: filter.c:72
+#: filter.c:71
 #, c-format
 msgid "could not close filter file \"%s\": %m"
 msgstr "не вдалося закрити файл фільтра \"%s\": %m"
 
-#: filter.c:165
+#: filter.c:164
 #, c-format
 msgid "invalid format in filter read from standard input on line %d: %s"
 msgstr "неприпустимий формат у фільтрі прочитаний з стандартного введення в рядку %d: %s"
 
-#: filter.c:168
+#: filter.c:167
 #, c-format
 msgid "invalid format in filter read from file \"%s\" on line %d: %s"
 msgstr "неприпустимий формат прочитанний у файлі \"%s\" в рядку %d: %s"
 
-#: filter.c:241 filter.c:468
+#: filter.c:243 filter.c:470
 #, c-format
 msgid "could not read from filter file \"%s\": %m"
 msgstr "не вдалося прочитати з файлу фільтра %s: %m"
 
-#: filter.c:244
+#: filter.c:246
 msgid "unexpected end of file"
 msgstr "несподіваний кінець файлу"
 
-#: filter.c:311
+#: filter.c:313
 msgid "missing object name pattern"
 msgstr "відсутній шаблон назви об'єкта"
 
-#: filter.c:422
+#: filter.c:424
 msgid "no filter command found (expected \"include\" or \"exclude\")"
 msgstr "не знайдено команди фільтрів (очікувалося \"include\" або \"exclude\")"
 
-#: filter.c:433
+#: filter.c:435
 msgid "invalid filter command (expected \"include\" or \"exclude\")"
 msgstr "неприпустима команда фільтра (очікувалась \"include\" або \"exclude\")"
 
-#: filter.c:440
+#: filter.c:442
 msgid "missing filter object type"
 msgstr "відсутній тип об'єкту фільтру"
 
-#: filter.c:447
+#: filter.c:449
 #, c-format
 msgid "unsupported filter object type: \"%.*s\""
 msgstr "непідтримуваний тип об'єкта фільтру: \"%.*s\""
 
-#: parallel.c:251
+#: parallel.c:253
 #, c-format
 msgid "%s() failed: error code %d"
 msgstr "%s() помилка: код помилки %d"
 
-#: parallel.c:959
+#: parallel.c:961
 #, c-format
 msgid "could not create communication channels: %m"
 msgstr "не вдалося створити канали зв'язку: %m"
 
-#: parallel.c:1016
+#: parallel.c:1018
 #, c-format
 msgid "could not create worker process: %m"
 msgstr "не вдалося створити робочий процес: %m"
 
-#: parallel.c:1146
+#: parallel.c:1148
 #, c-format
 msgid "unrecognized command received from leader: \"%s\""
 msgstr "нерозпізнана команда отримана від лідера: \"%s\""
 
-#: parallel.c:1189 parallel.c:1427
+#: parallel.c:1191 parallel.c:1429
 #, c-format
 msgid "invalid message received from worker: \"%s\""
 msgstr "отримане невірне повідомлення від робочого процесу: \"%s\""
 
-#: parallel.c:1321
+#: parallel.c:1323
 #, 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."
 msgstr "не вдалося отримати блокування відношення \"%s\"\n"
 "Це, зазвичай, означає, що хтось зробив запит на монопольне блокування таблиці після того, як батьківський процес pg_dump отримав початкове блокування спільного доступу для таблиці."
 
-#: parallel.c:1410
+#: parallel.c:1412
 #, c-format
 msgid "a worker process died unexpectedly"
 msgstr "робочий процес завершився несподівано"
 
-#: parallel.c:1532 parallel.c:1650
+#: parallel.c:1534 parallel.c:1652
 #, c-format
 msgid "could not write to the communication channel: %m"
 msgstr "не вдалося записати до каналу зв'язку: %m"
 
-#: parallel.c:1734
+#: parallel.c:1736
 #, c-format
 msgid "pgpipe: could not create socket: error code %d"
 msgstr "pgpipe: не вдалося створити сокет: код помилки %d"
 
-#: parallel.c:1745
+#: parallel.c:1747
 #, c-format
 msgid "pgpipe: could not bind: error code %d"
 msgstr "pgpipe: не вдалося прив'язати: код помилки %d"
 
-#: parallel.c:1752
+#: parallel.c:1754
 #, c-format
 msgid "pgpipe: could not listen: error code %d"
 msgstr "pgpipe: не вдалося прослухати: код помилки %d"
 
-#: parallel.c:1759
+#: parallel.c:1761
 #, c-format
 msgid "pgpipe: %s() failed: error code %d"
 msgstr "pgpipe: %s() помилка: код помилки %d"
 
-#: parallel.c:1770
+#: parallel.c:1772
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d"
 msgstr "pgpipe: не вдалося створити другий сокет: код помилки %d"
 
-#: parallel.c:1779
+#: parallel.c:1781
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d"
 msgstr "pgpipe: не вдалося зв'язатися з сокетом: код помилки %d"
 
-#: parallel.c:1788
+#: parallel.c:1790
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d"
 msgstr "pgpipe: не вдалося прийняти зв'язок: код помилки %d"
 
-#: pg_backup_archiver.c:261 pg_backup_archiver.c:1706
+#: pg_backup_archiver.c:269 pg_backup_archiver.c:1745
 #, c-format
 msgid "could not close output file: %m"
 msgstr "не вдалося закрити вихідний файл: %m"
 
-#: pg_backup_archiver.c:305 pg_backup_archiver.c:309
+#: pg_backup_archiver.c:313 pg_backup_archiver.c:317
 #, c-format
 msgid "archive items not in correct section order"
 msgstr "елементи архіву в неправильному порядку"
 
-#: pg_backup_archiver.c:315
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "unexpected section code %d"
 msgstr "неочікуваний код розділу %d"
 
-#: pg_backup_archiver.c:352
+#: pg_backup_archiver.c:360
 #, c-format
 msgid "parallel restore is not supported with this archive file format"
 msgstr "паралельне відновлення не підтримується з цим файлом архівного формату"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:364
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump"
 msgstr "паралельне відновлення не підтримується з архівами, зробленими pre-8.0 pg_dump"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:385
 #, c-format
 msgid "cannot restore from compressed archive (%s)"
 msgstr "не можна відновити зі стиснутого архіву (%s)"
 
-#: pg_backup_archiver.c:397
+#: pg_backup_archiver.c:405
 #, c-format
 msgid "connecting to database for restore"
 msgstr "підключення до бази даних для відновлення"
 
-#: pg_backup_archiver.c:399
+#: pg_backup_archiver.c:407
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives"
 msgstr "прямі з'днання з базою даних не підтримуються в архівах у версіях до 1.3"
 
-#: pg_backup_archiver.c:442
+#: pg_backup_archiver.c:450
 #, c-format
-msgid "implied data-only restore"
-msgstr "мається на увазі відновлення лише даних"
+msgid "implied no-schema restore"
+msgstr "мається на увазі відновлення без схеми"
 
-#: pg_backup_archiver.c:510
+#: pg_backup_archiver.c:529
 #, c-format
 msgid "dropping %s %s"
 msgstr "видалення %s %s"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:661
 #, c-format
 msgid "could not find where to insert IF EXISTS in statement \"%s\""
 msgstr "не вдалося знайти, куди вставити IF EXISTS в інструкції \"%s\""
 
-#: pg_backup_archiver.c:828 pg_backup_archiver.c:830
+#: pg_backup_archiver.c:855 pg_backup_archiver.c:857
 #, c-format
 msgid "warning from original dump file: %s"
 msgstr "попередження з оригінального файлу дамп: %s"
 
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "creating %s \"%s.%s\""
 msgstr "створення %s \"%s.%s\""
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:894
 #, c-format
 msgid "creating %s \"%s\""
 msgstr "створення %s \" \"%s\""
 
-#: pg_backup_archiver.c:917
+#: pg_backup_archiver.c:944
 #, c-format
 msgid "connecting to new database \"%s\""
 msgstr "підключення до нової бази даних \"%s\""
 
-#: pg_backup_archiver.c:944
+#: pg_backup_archiver.c:971
 #, c-format
 msgid "processing %s"
 msgstr "обробка %s"
 
-#: pg_backup_archiver.c:966
+#: pg_backup_archiver.c:993
 #, c-format
 msgid "processing data for table \"%s.%s\""
 msgstr "обробка даних для таблиці \"%s.%s\""
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1063
 #, c-format
 msgid "executing %s %s"
 msgstr "виконання %s %s"
 
-#: pg_backup_archiver.c:1096
+#: pg_backup_archiver.c:1132
 #, c-format
 msgid "disabling triggers for %s"
 msgstr "вимкнення тригерів для %s"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "enabling triggers for %s"
 msgstr "увімкнення тригерів для %s"
 
-#: pg_backup_archiver.c:1187
+#: pg_backup_archiver.c:1223
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine"
 msgstr "внутрішня помилка - WriteData не може бути викликана поза контекстом підпрограми DataDumper "
 
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1418
 #, c-format
 msgid "large-object output not supported in chosen format"
 msgstr "вивід великих об'єктів не підтримується у вибраному форматі"
 
-#: pg_backup_archiver.c:1442
+#: pg_backup_archiver.c:1481
 #, c-format
 msgid "restored %d large object"
 msgid_plural "restored %d large objects"
@@ -812,55 +906,55 @@ msgstr[1] "відновлено %d великих об'єкти"
 msgstr[2] "відновлено %d великих об'єктів"
 msgstr[3] "відновлено %d великих об'єктів"
 
-#: pg_backup_archiver.c:1469 pg_backup_tar.c:683
+#: pg_backup_archiver.c:1508 pg_backup_tar.c:683
 #, c-format
 msgid "restoring large object with OID %u"
 msgstr "відновлення великого об'єкту з OID %u"
 
-#: pg_backup_archiver.c:1481
+#: pg_backup_archiver.c:1520
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "не вдалося створити великий об'єкт %u: %s"
 
-#: pg_backup_archiver.c:1486 pg_dump.c:3888
+#: pg_backup_archiver.c:1525 pg_dump.c:4099
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "не вдалося відкрити великий об'єкт %u: %s"
 
-#: pg_backup_archiver.c:1542
+#: pg_backup_archiver.c:1581
 #, c-format
 msgid "could not open TOC file \"%s\": %m"
 msgstr "не вдалося відкрити файл TOC \"%s\": %m"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1609
 #, c-format
 msgid "line ignored: %s"
 msgstr "рядок проігноровано: %s"
 
-#: pg_backup_archiver.c:1577 pg_backup_db.c:609
+#: pg_backup_archiver.c:1616 pg_backup_db.c:548
 #, c-format
 msgid "could not find entry for ID %d"
 msgstr "не вдалося знайти введення для ID %d"
 
-#: pg_backup_archiver.c:1600 pg_backup_directory.c:219
-#: pg_backup_directory.c:613
+#: pg_backup_archiver.c:1639 pg_backup_directory.c:187
+#: pg_backup_directory.c:563
 #, c-format
 msgid "could not close TOC file: %m"
 msgstr "не вдалося закрити файл TOC: %m"
 
-#: pg_backup_archiver.c:1687 pg_backup_custom.c:152 pg_backup_directory.c:333
-#: pg_backup_directory.c:600 pg_backup_directory.c:666
-#: pg_backup_directory.c:684 pg_dumpall.c:506
+#: pg_backup_archiver.c:1726 pg_backup_custom.c:151 pg_backup_directory.c:301
+#: pg_backup_directory.c:550 pg_backup_directory.c:616
+#: pg_backup_directory.c:634 pg_dumpall.c:554
 #, c-format
 msgid "could not open output file \"%s\": %m"
 msgstr "не вдалося відкрити вихідний файл \"%s\": %m"
 
-#: pg_backup_archiver.c:1689 pg_backup_custom.c:158
+#: pg_backup_archiver.c:1728 pg_backup_custom.c:157
 #, c-format
 msgid "could not open output file: %m"
 msgstr "не вдалося відкрити вихідний файл: %m"
 
-#: pg_backup_archiver.c:1772
+#: pg_backup_archiver.c:1811
 #, c-format
 msgid "wrote %zu byte of large object data (result = %d)"
 msgid_plural "wrote %zu bytes of large object data (result = %d)"
@@ -869,400 +963,371 @@ msgstr[1] "записано %zu байти даних великого об'єк
 msgstr[2] "записано %zu байтів даних великого об'єкта (результат = %d)"
 msgstr[3] "записано %zu байтів даних великого об'єкта (результат = %d)"
 
-#: pg_backup_archiver.c:1778
+#: pg_backup_archiver.c:1817
 #, c-format
 msgid "could not write to large object: %s"
 msgstr "не вдалося записати до великого об'єкту: %s"
 
-#: pg_backup_archiver.c:1868
+#: pg_backup_archiver.c:1907
 #, c-format
 msgid "while INITIALIZING:"
 msgstr "при ІНІЦІАЛІЗАЦІЇ:"
 
-#: pg_backup_archiver.c:1873
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "while PROCESSING TOC:"
 msgstr "при ОБРОБЦІ TOC:"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1917
 #, c-format
 msgid "while FINALIZING:"
 msgstr "при ЗАВЕРШЕННІ:"
 
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1922
 #, c-format
 msgid "from TOC entry %d; %u %u %s %s %s"
 msgstr "зі входження до TOC %d; %u %u %s %s %s"
 
-#: pg_backup_archiver.c:1959
+#: pg_backup_archiver.c:1998
 #, c-format
 msgid "bad dumpId"
 msgstr "невірний dumpId"
 
-#: pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:2019
 #, c-format
 msgid "bad table dumpId for TABLE DATA item"
 msgstr "невірна таблиця dumpId для елементу даних таблиці"
 
-#: pg_backup_archiver.c:2072
+#: pg_backup_archiver.c:2111
 #, c-format
 msgid "unexpected data offset flag %d"
 msgstr "неочікувана позначка зсуву даних %d"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "file offset in dump file is too large"
 msgstr "зсув файлу у файлі дампу завеликий"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2235
 #, c-format
 msgid "directory name too long: \"%s\""
 msgstr "ім'я каталогу задовге: \"%s\""
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2285
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)"
 msgstr "каталог \"%s\" не схожий на архівний (\"toc.dat\" не існує)"
 
-#: pg_backup_archiver.c:2254 pg_backup_custom.c:169 pg_backup_custom.c:812
-#: pg_backup_directory.c:204 pg_backup_directory.c:396
+#: pg_backup_archiver.c:2293 pg_backup_custom.c:168 pg_backup_custom.c:813
+#: pg_backup_directory.c:172 pg_backup_directory.c:358
 #, c-format
 msgid "could not open input file \"%s\": %m"
 msgstr "не вдалося відкрити вхідний файл \"%s\": %m"
 
-#: pg_backup_archiver.c:2261 pg_backup_custom.c:175
+#: pg_backup_archiver.c:2300 pg_backup_custom.c:174
 #, c-format
 msgid "could not open input file: %m"
 msgstr "не вдалося відкрити вхідний файл: %m"
 
-#: pg_backup_archiver.c:2267
+#: pg_backup_archiver.c:2306
 #, c-format
 msgid "could not read input file: %m"
 msgstr "не вдалося прочитати вхідний файл: %m"
 
-#: pg_backup_archiver.c:2269
+#: pg_backup_archiver.c:2308
 #, c-format
 msgid "input file is too short (read %lu, expected 5)"
 msgstr "вхідний файл закороткий (прочитано %lu, очікувалось 5)"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2340
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql."
 msgstr "вхідний файл схожий на дамп текстового формату. Будь ласка, використайте psql."
 
-#: pg_backup_archiver.c:2307
+#: pg_backup_archiver.c:2346
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)"
 msgstr "вхідний файл не схожий на архівний (закороткий?)"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2352
 #, c-format
 msgid "input file does not appear to be a valid archive"
 msgstr "вхідний файл не схожий на архівний"
 
-#: pg_backup_archiver.c:2322
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "could not close input file: %m"
 msgstr "не вдалося закрити вхідний файл: %m"
 
-#: pg_backup_archiver.c:2401
+#: pg_backup_archiver.c:2440
 #, c-format
 msgid "could not open stdout for appending: %m"
 msgstr "не вдалося відкрити stdout для додавання: %m"
 
-#: pg_backup_archiver.c:2446
+#: pg_backup_archiver.c:2485
 #, c-format
 msgid "unrecognized file format \"%d\""
 msgstr "нерозпізнаний формат файлу \"%d\""
 
-#: pg_backup_archiver.c:2527 pg_backup_archiver.c:4647
+#: pg_backup_archiver.c:2566 pg_backup_archiver.c:4797
 #, c-format
 msgid "finished item %d %s %s"
 msgstr "завершений об'єкт %d %s %s"
 
-#: pg_backup_archiver.c:2531 pg_backup_archiver.c:4660
+#: pg_backup_archiver.c:2570 pg_backup_archiver.c:4810
 #, c-format
 msgid "worker process failed: exit code %d"
 msgstr "помилка при робочому процесі: код виходу %d"
 
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2668
+#, c-format
+msgid "unexpected TOC entry in WriteToc(): %d %s %s"
+msgstr "неочікуваний запис TOC в WriteToc(): %d %s %s"
+
+#: pg_backup_archiver.c:2672 pg_backup_custom.c:440 pg_backup_custom.c:506
+#: pg_backup_custom.c:635 pg_backup_custom.c:871 pg_backup_tar.c:1029
+#: pg_backup_tar.c:1034
+#, c-format
+msgid "error during file seek: %m"
+msgstr "помилка під час пошуку файлу oobe. xml: %m"
+
+#: pg_backup_archiver.c:2730
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC"
 msgstr "введення ідентифікатора %d поза діапазоном -- можливо, зміст пошкоджений"
 
-#: pg_backup_archiver.c:2736
+#: pg_backup_archiver.c:2813
 #, c-format
 msgid "restoring tables WITH OIDS is not supported anymore"
 msgstr "відновлення таблиць WITH OIDS більше не підтримується"
 
-#: pg_backup_archiver.c:2818
+#: pg_backup_archiver.c:2895
 #, c-format
 msgid "unrecognized encoding \"%s\""
 msgstr "нерозпізнане кодування \"%s\""
 
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2901
 #, c-format
 msgid "invalid ENCODING item: %s"
 msgstr "невірний об'єкт КОДУВАННЯ: %s"
 
-#: pg_backup_archiver.c:2841
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "invalid STDSTRINGS item: %s"
 msgstr "невірний об'єкт STDSTRINGS: %s"
 
-#: pg_backup_archiver.c:2866
+#: pg_backup_archiver.c:2944
 #, c-format
 msgid "schema \"%s\" not found"
 msgstr "схему \"%s\" не знайдено"
 
-#: pg_backup_archiver.c:2873
+#: pg_backup_archiver.c:2951
 #, c-format
 msgid "table \"%s\" not found"
 msgstr "таблицю \"%s\" не знайдено"
 
-#: pg_backup_archiver.c:2880
+#: pg_backup_archiver.c:2958
 #, c-format
 msgid "index \"%s\" not found"
 msgstr "індекс \"%s\" не знайдено"
 
-#: pg_backup_archiver.c:2887
+#: pg_backup_archiver.c:2965
 #, c-format
 msgid "function \"%s\" not found"
 msgstr "функцію \"%s\" не знайдено"
 
-#: pg_backup_archiver.c:2894
+#: pg_backup_archiver.c:2972
 #, c-format
 msgid "trigger \"%s\" not found"
 msgstr "тригер \"%s\" не знайдено"
 
-#: pg_backup_archiver.c:3325
+#: pg_backup_archiver.c:3469
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "не вдалося встановити користувача сеансу для \"%s\": %s"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3611
 #, c-format
 msgid "could not set \"search_path\" to \"%s\": %s"
 msgstr "не вдалося встановити \"search_path\" для \"%s\": %s"
 
-#: pg_backup_archiver.c:3518
+#: pg_backup_archiver.c:3672
 #, c-format
 msgid "could not set \"default_tablespace\" to %s: %s"
 msgstr "не вдалося встановити \"default_tablespace\" для %s: %s"
 
-#: pg_backup_archiver.c:3567
+#: pg_backup_archiver.c:3721
 #, c-format
 msgid "could not set \"default_table_access_method\": %s"
 msgstr "не вдалося встановити \"default_table_access_method\" для: %s"
 
-#: pg_backup_archiver.c:3616
+#: pg_backup_archiver.c:3770
 #, c-format
 msgid "could not alter table access method: %s"
 msgstr "не вдалося змінити метод доступу до таблиці: %s"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3871
 #, c-format
 msgid "don't know how to set owner for object type \"%s\""
 msgstr "невідомо, як встановити власника об'єкту типу \"%s\""
 
-#: pg_backup_archiver.c:4004
+#: pg_backup_archiver.c:4006
+#, c-format
+msgid "unexpected TOC entry in _printTocEntry(): %d %s %s"
+msgstr "неочікуваний запис TOC у _printTocEntry(): %d %s %s"
+
+#: pg_backup_archiver.c:4154
 #, c-format
 msgid "did not find magic string in file header"
 msgstr "в заголовку файлу не знайдено магічного рядка"
 
-#: pg_backup_archiver.c:4018
+#: pg_backup_archiver.c:4168
 #, c-format
 msgid "unsupported version (%d.%d) in file header"
 msgstr "в заголовку непідтримувана версія (%d.%d)"
 
-#: pg_backup_archiver.c:4023
+#: pg_backup_archiver.c:4173
 #, c-format
 msgid "sanity check on integer size (%lu) failed"
 msgstr "перевірка на розмір цілого числа (%lu) не вдалася"
 
-#: pg_backup_archiver.c:4027
+#: pg_backup_archiver.c:4177
 #, c-format
 msgid "archive was made on a machine with larger integers, some operations might fail"
 msgstr "архів зроблено на архітектурі з більшими цілими числами, деякі операції можуть не виконуватися"
 
-#: pg_backup_archiver.c:4037
+#: pg_backup_archiver.c:4187
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)"
 msgstr "очікуваний формат (%d) відрізняється від знайденого формату у файлі (%d)"
 
-#: pg_backup_archiver.c:4059
+#: pg_backup_archiver.c:4209
 #, c-format
 msgid "archive is compressed, but this installation does not support compression (%s) -- no data will be available"
 msgstr "архів стиснено, але ця інсталяція не підтримує стискання (%s) -- дані не будуть доступними"
 
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:4245
 #, c-format
 msgid "invalid creation date in header"
 msgstr "неприпустима дата створення у заголовку"
 
-#: pg_backup_archiver.c:4229
+#: pg_backup_archiver.c:4379
 #, c-format
 msgid "processing item %d %s %s"
 msgstr "обробка елементу %d %s %s"
 
-#: pg_backup_archiver.c:4314
+#: pg_backup_archiver.c:4464
 #, c-format
 msgid "entering main parallel loop"
 msgstr "введення головного паралельного циклу"
 
-#: pg_backup_archiver.c:4325
+#: pg_backup_archiver.c:4475
 #, c-format
 msgid "skipping item %d %s %s"
 msgstr "пропускається елемент %d %s %s "
 
-#: pg_backup_archiver.c:4334
+#: pg_backup_archiver.c:4484
 #, c-format
 msgid "launching item %d %s %s"
 msgstr "запуск елементу %d %s %s "
 
-#: pg_backup_archiver.c:4388
+#: pg_backup_archiver.c:4538
 #, c-format
 msgid "finished main parallel loop"
 msgstr "головний паралельний цикл завершився"
 
-#: pg_backup_archiver.c:4424
+#: pg_backup_archiver.c:4574
 #, c-format
 msgid "processing missed item %d %s %s"
 msgstr "обробка втраченого елементу %d %s %s"
 
-#: pg_backup_archiver.c:4966
+#: pg_backup_archiver.c:5116
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data"
 msgstr "не вдалося створити таблицю \"%s\", дані не будуть відновлені"
 
-#: pg_backup_custom.c:376 pg_backup_null.c:143
+#: pg_backup_custom.c:375 pg_backup_null.c:143
 #, c-format
 msgid "invalid OID for large object"
 msgstr "неприпустимий ідентифікатор OID для великого об’єкту"
 
-#: pg_backup_custom.c:441 pg_backup_custom.c:507 pg_backup_custom.c:636
-#: pg_backup_custom.c:870 pg_backup_tar.c:1029 pg_backup_tar.c:1034
-#, c-format
-msgid "error during file seek: %m"
-msgstr "помилка під час пошуку файлу oobe. xml: %m"
-
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:479
 #, c-format
 msgid "data block %d has wrong seek position"
 msgstr "блок даних %d має неправильну позицію пошуку"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive"
 msgstr "нерозпізнаний тип блоку даних (%d) під час пошуку архіву"
 
-#: pg_backup_custom.c:519
+#: pg_backup_custom.c:518
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file"
 msgstr "не вдалося зайти в архіві блок з ідентифікатором %d -- можливо, через непослідовність запиту відновлення, який не можна обробити через файл, що не допускає довільний вхід"
 
-#: pg_backup_custom.c:524
+#: pg_backup_custom.c:523
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive"
 msgstr "не вдалося знайти в архіві блок з ідентифікатором %d -- можливо, архів пошкоджений"
 
-#: pg_backup_custom.c:531
+#: pg_backup_custom.c:530
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d"
 msgstr "знайдено неочікуваний блок з ідентифікатором (%d) під час читання даних -- очікувалося %d"
 
-#: pg_backup_custom.c:545
+#: pg_backup_custom.c:544
 #, c-format
 msgid "unrecognized data block type %d while restoring archive"
 msgstr "нерозпізнаний тип блоку даних %d при відновленні архіву"
 
-#: pg_backup_custom.c:751 pg_backup_custom.c:803 pg_backup_custom.c:945
+#: pg_backup_custom.c:750 pg_backup_custom.c:804 pg_backup_custom.c:946
 #: pg_backup_tar.c:1032
 #, c-format
 msgid "could not determine seek position in archive file: %m"
 msgstr "не вдалося визначити позицію пошуку у файлі архіву: %m"
 
-#: pg_backup_custom.c:767 pg_backup_custom.c:807
+#: pg_backup_custom.c:768 pg_backup_custom.c:808
 #, c-format
 msgid "could not close archive file: %m"
 msgstr "не вдалося закрити архівний файл: %m"
 
-#: pg_backup_custom.c:790
+#: pg_backup_custom.c:791
 #, c-format
 msgid "can only reopen input archives"
 msgstr "можливо повторно відкрити лише вхідні архіви"
 
-#: pg_backup_custom.c:797
+#: pg_backup_custom.c:798
 #, c-format
 msgid "parallel restore from standard input is not supported"
 msgstr "паралельне відновлення зі стандартного вводу не підтримується"
 
-#: pg_backup_custom.c:799
+#: pg_backup_custom.c:800
 #, c-format
 msgid "parallel restore from non-seekable file is not supported"
 msgstr "паралельне відновлення з файлу без вільного доступу не підтримується"
 
-#: pg_backup_custom.c:815
+#: pg_backup_custom.c:816
 #, c-format
 msgid "could not set seek position in archive file: %m"
 msgstr "не вдалося набрати позицію пошуку у файлі архіву: %m"
 
-#: pg_backup_custom.c:894
+#: pg_backup_custom.c:895
 #, c-format
 msgid "compressor active"
 msgstr "ущільнювач активний"
 
-#: pg_backup_db.c:42
-#, c-format
-msgid "could not get server_version from libpq"
-msgstr "не вдалося отримати версію серверу з libpq"
-
-#: pg_backup_db.c:53 pg_dumpall.c:1830
-#, c-format
-msgid "aborting because of server version mismatch"
-msgstr "переривання через невідповідність версії серверу"
-
-#: pg_backup_db.c:54 pg_dumpall.c:1831
+#: pg_backup_db.c:41
 #, c-format
-msgid "server version: %s; %s version: %s"
-msgstr "версія серверу: %s; версія %s: %s"
+msgid "could not get \"server_version\" from libpq"
+msgstr "не вдалося отримати \"server_version\" з libpq"
 
-#: pg_backup_db.c:120
+#: pg_backup_db.c:118
 #, c-format
 msgid "already connected to a database"
 msgstr "вже під'єднано до бази даних"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1677 pg_dumpall.c:1779
-msgid "Password: "
-msgstr "Пароль: "
-
-#: pg_backup_db.c:170
-#, c-format
-msgid "could not connect to database"
-msgstr "не вдалося зв'язатися з базою даних"
-
-#: pg_backup_db.c:187
-#, c-format
-msgid "reconnection failed: %s"
-msgstr "помилка повторного підключення: %s"
-
-#: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:788 pg_dump_sort.c:1213
-#: pg_dump_sort.c:1233 pg_dumpall.c:1704 pg_dumpall.c:1788
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:271 pg_dumpall.c:1893 pg_dumpall.c:1916
-#, c-format
-msgid "query failed: %s"
-msgstr "запит не вдався: %s"
-
-#: pg_backup_db.c:273 pg_dumpall.c:1894 pg_dumpall.c:1917
-#, c-format
-msgid "Query was: %s"
-msgstr "Запит був: %s"
-
-#: pg_backup_db.c:315
+#: pg_backup_db.c:254
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -1271,110 +1336,89 @@ msgstr[1] "запит повернув %d рядки замість одного
 msgstr[2] "запит повернув %d рядків замість одного: %s"
 msgstr[3] "запит повернув %d рядків замість одного: %s"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:290
 #, c-format
 msgid "%s: %sCommand was: %s"
 msgstr "%s:%sКоманда була: %s"
 
-#: pg_backup_db.c:407 pg_backup_db.c:481 pg_backup_db.c:488
+#: pg_backup_db.c:346 pg_backup_db.c:420 pg_backup_db.c:427
 msgid "could not execute query"
 msgstr "не вдалося виконати запит"
 
-#: pg_backup_db.c:460
+#: pg_backup_db.c:399
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "помилка повернулася від PQputCopyData: %s"
 
-#: pg_backup_db.c:509
+#: pg_backup_db.c:448
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "помилка повернулася від PQputCopyEnd: %s"
 
-#: pg_backup_db.c:515
+#: pg_backup_db.c:454
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "КОПІЮВАННЯ для таблиці \"%s\" не вдалося: %s"
 
-#: pg_backup_db.c:521 pg_dump.c:2283
+#: pg_backup_db.c:460 pg_dump.c:2472
 #, c-format
 msgid "unexpected extra results during COPY of table \"%s\""
 msgstr "неочікувані зайві результати під час копіювання таблиці \"%s\""
 
-#: pg_backup_db.c:533
+#: pg_backup_db.c:472
 msgid "could not start database transaction"
 msgstr "не вдалося почати транзакцію бази даних"
 
-#: pg_backup_db.c:541
+#: pg_backup_db.c:480
 msgid "could not commit database transaction"
 msgstr "не вдалося затвердити транзакцію бази даних"
 
-#: pg_backup_directory.c:153
+#: pg_backup_directory.c:154
 #, c-format
 msgid "no output directory specified"
 msgstr "вихідний каталог не вказано"
 
-#: pg_backup_directory.c:186
-#, c-format
-msgid "could not close directory \"%s\": %m"
-msgstr "не вдалося закрити каталог \"%s\": %m"
-
-#: pg_backup_directory.c:192
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "не вдалося створити каталог \"%s\": %m"
-
-#: pg_backup_directory.c:357 pg_backup_directory.c:506
-#: pg_backup_directory.c:544
-#, c-format
-msgid "could not write to output file: %s"
-msgstr "не можливо записати у вихідний файл: %s"
-
-#: pg_backup_directory.c:375
+#: pg_backup_directory.c:337
 #, c-format
 msgid "could not close data file: %m"
 msgstr "не вдалося закрити файл даних: %m"
 
-#: pg_backup_directory.c:408
+#: pg_backup_directory.c:370
 #, c-format
 msgid "could not close data file \"%s\": %m"
 msgstr "не вдалося закрити файл даних \"%s\": %m"
 
-#: pg_backup_directory.c:455
+#: pg_backup_directory.c:422
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %m"
 msgstr "не вдалося відкрити великий об'єкт файлу TOC \"%s\" для вводу: %m"
 
-#: pg_backup_directory.c:466
+#: pg_backup_directory.c:433
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\""
 msgstr "невірна лінія у великому об'єкті файлу TOC \"%s\": \"%s\""
 
-#: pg_backup_directory.c:475
+#: pg_backup_directory.c:442
 #, c-format
 msgid "error reading large object TOC file \"%s\""
 msgstr "помилка читання великого об'єкту файлу TOC \"%s\""
 
-#: pg_backup_directory.c:479
+#: pg_backup_directory.c:446
 #, c-format
 msgid "could not close large object TOC file \"%s\": %m"
 msgstr "не вдалося закрити великий об'єкт файлу TOC \"%s\" %m"
 
-#: pg_backup_directory.c:702
+#: pg_backup_directory.c:652
 #, c-format
 msgid "could not close LO data file: %m"
 msgstr "не вдалося закрити файл даних LO: %m"
 
-#: pg_backup_directory.c:712
-#, c-format
-msgid "could not write to LOs TOC file: %s"
-msgstr "не вдалося записати в файл LO TOC: %s"
-
-#: pg_backup_directory.c:728
+#: pg_backup_directory.c:671
 #, c-format
 msgid "could not close LOs TOC file: %m"
 msgstr "не вдалося закрити файл LO TOC: %m"
 
-#: pg_backup_directory.c:747
+#: pg_backup_directory.c:690
 #, c-format
 msgid "file name too long: \"%s\""
 msgstr "ім'я файлу задовге: \"%s\""
@@ -1464,302 +1508,313 @@ msgstr[3] "знайдено незавершений tar-заголовок (%lu
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %llu"
 msgstr "знайдено пошкоджений заголовок tar у %s (очікувалося %d, обчислено %d) позиції файлу %llu"
 
-#: pg_backup_utils.c:54
+#: pg_backup_utils.c:56
 #, c-format
 msgid "unrecognized section name: \"%s\""
 msgstr "нерозпізнане ім’я розділу: \"%s\""
 
-#: pg_backup_utils.c:55 pg_dump.c:694 pg_dump.c:711 pg_dumpall.c:370
-#: pg_dumpall.c:380 pg_dumpall.c:388 pg_dumpall.c:396 pg_dumpall.c:403
-#: pg_dumpall.c:413 pg_dumpall.c:488 pg_restore.c:307 pg_restore.c:323
-#: pg_restore.c:337
+#: pg_backup_utils.c:57 pg_dump.c:799 pg_dump.c:816 pg_dumpall.c:385
+#: pg_dumpall.c:395 pg_dumpall.c:405 pg_dumpall.c:414 pg_dumpall.c:422
+#: pg_dumpall.c:434 pg_dumpall.c:536 pg_restore.c:326 pg_restore.c:342
+#: pg_restore.c:357
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_backup_utils.c:66
+#: pg_backup_utils.c:68
 #, c-format
 msgid "out of on_exit_nicely slots"
 msgstr "перевищено межу on_exit_nicely слотів"
 
-#: pg_dump.c:709 pg_dumpall.c:378 pg_restore.c:321
+#: pg_dump.c:814 pg_dumpall.c:393 pg_restore.c:340
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_dump.c:728 pg_restore.c:344
+#: pg_dump.c:826 pg_dump.c:829 pg_dump.c:832 pg_dump.c:837 pg_dump.c:840
+#: pg_dump.c:843 pg_dump.c:848 pg_dump.c:853 pg_dump.c:856 pg_dump.c:860
+#: pg_dump.c:868 pg_dumpall.c:412 pg_dumpall.c:420 pg_dumpall.c:432
+#: pg_restore.c:355 pg_restore.c:362 pg_restore.c:382 pg_restore.c:385
+#: pg_restore.c:388 pg_restore.c:393 pg_restore.c:396 pg_restore.c:399
+#: pg_restore.c:404 pg_restore.c:409 pg_restore.c:412 pg_restore.c:416
+#: pg_restore.c:420 pg_restore.c:428
+#, c-format
+msgid "options %s and %s cannot be used together"
+msgstr "параметри %s і %s не можна використовувати разом"
+
+#: pg_dump.c:864
 #, c-format
-msgid "options -s/--schema-only and -a/--data-only cannot be used together"
-msgstr "параметри -s/--schema-only і -a/--data-only не можуть використовуватись разом"
+msgid "option %s is not supported with parallel backup"
+msgstr "параметр %s не підтримується з паралельним резервним копіюванням"
 
-#: pg_dump.c:731
+#: pg_dump.c:872 pg_dumpall.c:427 pg_restore.c:460
 #, c-format
-msgid "options -s/--schema-only and --include-foreign-data cannot be used together"
-msgstr "параметри  -s/--schema-only і  --include-foreign-data не можуть використовуватись разом"
+msgid "option %s requires option %s"
+msgstr "параметр %s потребує параметр %s"
 
-#: pg_dump.c:734
+#: pg_dump.c:893
 #, c-format
-msgid "option --include-foreign-data is not supported with parallel backup"
-msgstr "параметр --include-foreign-data не підтримується з паралельним резервним копіюванням"
+msgid "option %s requires option %s, %s, or %s"
+msgstr "параметр %s потребує параметр %s, %s або %s"
 
-#: pg_dump.c:737 pg_restore.c:347
+#: pg_dump.c:911 pg_dumpall.c:504 pg_restore.c:375
 #, c-format
-msgid "options -c/--clean and -a/--data-only cannot be used together"
-msgstr "параметри -c/--clean і -a/--data-only не можна використовувати разом"
+msgid "could not generate restrict key"
+msgstr "не вдалося створити ключ обмеження"
 
-#: pg_dump.c:740 pg_dumpall.c:408 pg_restore.c:375
+#: pg_dump.c:913 pg_dumpall.c:506 pg_restore.c:377
 #, c-format
-msgid "option --if-exists requires option -c/--clean"
-msgstr "параметр --if-exists потребує параметр -c/--clean"
+msgid "invalid restrict key"
+msgstr "невірний ключ обмеження"
 
-#: pg_dump.c:747
+#: pg_dump.c:916
 #, c-format
-msgid "option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts"
-msgstr "параметр --on-conflict-do-nothing вимагає опції --inserts, --rows-per-insert або --column-inserts"
+msgid "option %s can only be used with %s"
+msgstr "параметр %s можна використовувати лише з %s"
 
-#: pg_dump.c:776
+#: pg_dump.c:939
 #, c-format
 msgid "unrecognized compression algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм стискання: \"%s\""
 
-#: pg_dump.c:783
+#: pg_dump.c:946
 #, c-format
 msgid "invalid compression specification: %s"
 msgstr "неприпустима специфікація стискання: %s"
 
-#: pg_dump.c:796
+#: pg_dump.c:959
 #, c-format
 msgid "compression option \"%s\" is not currently supported by pg_dump"
 msgstr "параметр стиснення \"%s\" в даний час не підтримується pg_dump"
 
-#: pg_dump.c:808
+#: pg_dump.c:971
 #, c-format
 msgid "parallel backup only supported by the directory format"
 msgstr "паралельне резервне копіювання підтримується лише з форматом \"каталог\""
 
-#: pg_dump.c:854
+#: pg_dump.c:1017
 #, c-format
 msgid "last built-in OID is %u"
 msgstr "останній вбудований OID %u"
 
-#: pg_dump.c:863
+#: pg_dump.c:1026
 #, c-format
 msgid "no matching schemas were found"
 msgstr "відповідних схем не знайдено"
 
-#: pg_dump.c:880
+#: pg_dump.c:1043
 #, c-format
 msgid "no matching tables were found"
 msgstr "відповідних таблиць не знайдено"
 
-#: pg_dump.c:908
+#: pg_dump.c:1071
 #, c-format
 msgid "no matching extensions were found"
 msgstr "не знайдено відповідних розширень"
 
-#: pg_dump.c:1092
+#: pg_dump.c:1265
 #, c-format
-msgid "%s dumps a database as a text file or to other formats.\n\n"
-msgstr "%s зберігає резервну копію бази даних в текстовому файлі або в інших форматах.\n\n"
+msgid "%s exports a PostgreSQL database as an SQL script or to other formats.\n\n"
+msgstr "%s експортує базу даних PostgreSQL як SQL-скрипт або в інші формати.\n\n"
 
-#: pg_dump.c:1093 pg_dumpall.c:635 pg_restore.c:452
+#: pg_dump.c:1266 pg_dumpall.c:700 pg_restore.c:536
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_dump.c:1094
+#: pg_dump.c:1267
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:1096 pg_dumpall.c:638 pg_restore.c:455
+#: pg_dump.c:1269 pg_dumpall.c:703 pg_restore.c:539
 #, c-format
 msgid "\n"
 "General options:\n"
 msgstr "\n"
 "Основні налаштування:\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1270
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=FILENAME          ім'я файлу виводу або каталогу\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1271
 #, 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         формат файлу виводу (спеціальний, каталог, tar,\n"
 "                               звичайний текст (за замовчуванням))\n"
 
-#: pg_dump.c:1100
+#: pg_dump.c:1273
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM            використовувати ці паралельні завдання для вивантаження\n"
 
-#: pg_dump.c:1101 pg_dumpall.c:640
+#: pg_dump.c:1274 pg_dumpall.c:705
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                детальний режим\n"
 
-#: pg_dump.c:1102 pg_dumpall.c:641
+#: pg_dump.c:1275 pg_dumpall.c:706
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                вивести інформацію про версію, потім вийти\n"
 
-#: pg_dump.c:1103
+#: pg_dump.c:1276
 #, c-format
 msgid "  -Z, --compress=METHOD[:DETAIL]\n"
 "                               compress as specified\n"
 msgstr "  -Z, --compress=METHOD[:DETAIL]\n"
 "                         стискати як вказано\n"
 
-#: pg_dump.c:1105 pg_dumpall.c:642
+#: pg_dump.c:1278 pg_dumpall.c:707
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=TIMEOUT  помилка після очікування TIMEOUT для блокування таблиці\n"
 
-#: pg_dump.c:1106 pg_dumpall.c:670
+#: pg_dump.c:1279 pg_dumpall.c:739
 #, c-format
 msgid "  --no-sync                    do not wait for changes to be written safely to disk\n"
 msgstr "  --no-sync                    не чекати безпечного збереження змін на диск\n"
 
-#: pg_dump.c:1107
+#: pg_dump.c:1280
 #, c-format
 msgid "  --sync-method=METHOD         set method for syncing files to disk\n"
 msgstr "  --sync-method=METHOD         встановити метод для синхронізації файлів на диск\n"
 
-#: pg_dump.c:1108 pg_dumpall.c:643
+#: pg_dump.c:1281 pg_dumpall.c:708
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   показати цю довідку, потім вийти\n"
 
-#: pg_dump.c:1110 pg_dumpall.c:644
+#: pg_dump.c:1283 pg_dumpall.c:709
 #, c-format
 msgid "\n"
 "Options controlling the output content:\n"
 msgstr "\n"
 "Параметри, що керують вихідним вмістом:\n"
 
-#: pg_dump.c:1111 pg_dumpall.c:645
+#: pg_dump.c:1284 pg_dumpall.c:710
 #, c-format
-msgid "  -a, --data-only              dump only the data, not the schema\n"
-msgstr "  -a, --data-only              вивантажити лише дані, без схеми\n"
+msgid "  -a, --data-only              dump only the data, not the schema or statistics\n"
+msgstr "  -a, --data-only              вивантажити тільки дані, не схему або статистику\n"
 
-#: pg_dump.c:1112
+#: pg_dump.c:1285
 #, c-format
 msgid "  -b, --large-objects          include large objects in dump\n"
 msgstr "  -b, --large-objects          включити у вивантаження великі об'єкти\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1286
 #, c-format
 msgid "  --blobs                      (same as --large-objects, deprecated)\n"
 msgstr "  --blobs                      (те саме, що --large-objects, застарілий)\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1287
 #, c-format
 msgid "  -B, --no-large-objects       exclude large objects in dump\n"
 msgstr "  -b, --no-large-objects         виключити з вивантаження великі об'єкти\n"
 
-#: pg_dump.c:1115
+#: pg_dump.c:1288
 #, c-format
 msgid "  --no-blobs                   (same as --no-large-objects, deprecated)\n"
 msgstr "  --no-blobs                   (те саме, що --no-large-objects, застарілий)\n"
 
-#: pg_dump.c:1116 pg_restore.c:466
+#: pg_dump.c:1289 pg_restore.c:550
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                 видалити об'єкти бази даних перед перед повторним створенням\n"
 
-#: pg_dump.c:1117
+#: pg_dump.c:1290
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr "  -C, --create                 включити у вивантаження команди для створення бази даних\n"
 
-#: pg_dump.c:1118
+#: pg_dump.c:1291
 #, c-format
 msgid "  -e, --extension=PATTERN      dump the specified extension(s) only\n"
 msgstr "  -e, --extension=PATTERN       вивантажити лише вказане(і) розширення\n"
 
-#: pg_dump.c:1119 pg_dumpall.c:647
+#: pg_dump.c:1292 pg_dumpall.c:712
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=ENCODING      вивантажити дані в кодуванні ENCODING\n"
 
-#: pg_dump.c:1120
+#: pg_dump.c:1293
 #, c-format
 msgid "  -n, --schema=PATTERN         dump the specified schema(s) only\n"
 msgstr "  -n, --schema=PATTERN          вивантажити лише вказану схему(и)\n"
 
-#: pg_dump.c:1121
+#: pg_dump.c:1294
 #, c-format
 msgid "  -N, --exclude-schema=PATTERN do NOT dump the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=PATTERN  НЕ вивантажувати вказану схему(и)\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1295
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership in\n"
 "                               plain-text format\n"
 msgstr "  -O, --no-owner               пропускати відновлення володіння об'єктами\n"
 "                               при використанні текстового формату\n"
 
-#: pg_dump.c:1124 pg_dumpall.c:651
+#: pg_dump.c:1297 pg_dumpall.c:716
 #, c-format
-msgid "  -s, --schema-only            dump only the schema, no data\n"
-msgstr "  -s, --schema-only            вивантажити лише схему, без даних\n"
+msgid "  -s, --schema-only            dump only the schema, no data or statistics\n"
+msgstr "  -s, --schema-only            вивантажити тільки схему, без даних або статистики\n"
 
-#: pg_dump.c:1125
+#: pg_dump.c:1298
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME         ім'я користувача, яке буде використовуватись у звичайних текстових форматах\n"
 
-#: pg_dump.c:1126
+#: pg_dump.c:1299
 #, c-format
 msgid "  -t, --table=PATTERN          dump only the specified table(s)\n"
 msgstr "  -t, --table=PATTERN           вивантажити лише вказані таблиці\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1300
 #, c-format
 msgid "  -T, --exclude-table=PATTERN  do NOT dump the specified table(s)\n"
 msgstr "  -T, --exclude-table=PATTERN    НЕ вивантажувати вказані таблиці\n"
 
-#: pg_dump.c:1128 pg_dumpall.c:654
+#: pg_dump.c:1301 pg_dumpall.c:719
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          не вивантажувати права (надання/відкликання)\n"
 
-#: pg_dump.c:1129 pg_dumpall.c:655
+#: pg_dump.c:1302 pg_dumpall.c:720
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             для використання лише утилітами оновлення\n"
 
-#: pg_dump.c:1130 pg_dumpall.c:656
+#: pg_dump.c:1303 pg_dumpall.c:721
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts             вивантажити дані у вигляді команд INSERT з іменами стовпців\n"
 
-#: pg_dump.c:1131 pg_dumpall.c:657
+#: pg_dump.c:1304 pg_dumpall.c:722
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr "  --disable-dollar-quoting  вимкнути цінову пропозицію $, використовувати SQL стандартну цінову пропозицію\n"
 
-#: pg_dump.c:1132 pg_dumpall.c:658 pg_restore.c:483
+#: pg_dump.c:1305 pg_dumpall.c:723 pg_restore.c:567
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr "  --disable-triggers           вимкнути тригери лише під час відновлення даних\n"
 
-#: pg_dump.c:1133
+#: pg_dump.c:1306
 #, c-format
 msgid "  --enable-row-security        enable row security (dump only content user has\n"
 "                               access to)\n"
 msgstr "  --enable-row-security        активувати захист на рівні рядків (вивантажити лише той вміст, до якого\n"
 "                               користувач має доступ)\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1308
 #, c-format
 msgid "  --exclude-extension=PATTERN  do NOT dump the specified extension(s)\n"
 msgstr "  --exclude-extension=PATTERN НЕ вивантажувати вказане розширення\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1309
 #, c-format
 msgid "  --exclude-table-and-children=PATTERN\n"
 "                               do NOT dump the specified table(s), including\n"
@@ -1768,12 +1823,12 @@ msgstr "  --exclude-table-and-children=PATTERN\n"
 "                               не вивантажувати зазначені таблиці, включно\n"
 "                               з дочірніми та секціонованими таблицями\n"
 
-#: pg_dump.c:1139
+#: pg_dump.c:1312
 #, c-format
 msgid "  --exclude-table-data=PATTERN do NOT dump data for the specified table(s)\n"
 msgstr "  --exclude-table-data=PATTERN   НЕ вивантажувати дані вказаних таблиць\n"
 
-#: pg_dump.c:1140
+#: pg_dump.c:1313
 #, c-format
 msgid "  --exclude-table-data-and-children=PATTERN\n"
 "                               do NOT dump data for the specified table(s),\n"
@@ -1782,24 +1837,24 @@ msgstr "  --exclude-table-data-and-children=PATTERN\n"
 "                               не вивантажувати дані зазначених таблиць,\n"
 "                               включно з дочірніми та секціонованими таблицями\n"
 
-#: pg_dump.c:1143 pg_dumpall.c:660
+#: pg_dump.c:1316 pg_dumpall.c:725
 #, c-format
 msgid "  --extra-float-digits=NUM     override default setting for extra_float_digits\n"
 msgstr "  --extra-float-digits=NUM змінити параметр за замовчуванням для extra_float_digits\n"
 
-#: pg_dump.c:1144
+#: pg_dump.c:1317
 #, c-format
 msgid "  --filter=FILENAME            include or exclude objects and data from dump\n"
 "                               based on expressions in FILENAME\n"
 msgstr "  --filter=FILENAME            включати або виключати об'єкти та дані з дампу\n"
 "                               на основі виразів у FILENAME\n"
 
-#: pg_dump.c:1146 pg_dumpall.c:662 pg_restore.c:487
+#: pg_dump.c:1319 pg_dumpall.c:727 pg_restore.c:571
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  використовувати IF EXISTS під час видалення об'єктів\n"
 
-#: pg_dump.c:1147
+#: pg_dump.c:1320
 #, c-format
 msgid "  --include-foreign-data=PATTERN\n"
 "                               include data of foreign tables on foreign\n"
@@ -1808,101 +1863,141 @@ msgstr "  --include-foreign-data=ШАБЛОН\n"
 "                               включають дані підлеглих таблиць на підлеглих\n"
 "                               сервери, що відповідають ШАБЛОНУ\n"
 
-#: pg_dump.c:1150 pg_dumpall.c:663
+#: pg_dump.c:1323 pg_dumpall.c:728
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    вивантажити дані у вигляді команд INSERT, не COPY\n"
 
-#: pg_dump.c:1151 pg_dumpall.c:664
+#: pg_dump.c:1324 pg_dumpall.c:729
 #, c-format
 msgid "  --load-via-partition-root    load partitions via the root table\n"
 msgstr "  --load-via-partition-root    завантажувати секції через головну таблицю\n"
 
-#: pg_dump.c:1152 pg_dumpall.c:665
+#: pg_dump.c:1325 pg_dumpall.c:730
 #, c-format
-msgid "  --no-comments                do not dump comments\n"
+msgid "  --no-comments                do not dump comment commands\n"
 msgstr "  --no-comments                не вивантажувати коментарі\n"
 
-#: pg_dump.c:1153 pg_dumpall.c:666
+#: pg_dump.c:1326 pg_dumpall.c:731
+#, c-format
+msgid "  --no-data                    do not dump data\n"
+msgstr "  --no-data                    не вивантажувати дані\n"
+
+#: pg_dump.c:1327 pg_dumpall.c:732
+#, c-format
+msgid "  --no-policies                do not dump row security policies\n"
+msgstr "  --no-policies                не вивантажувати політики безпеки рядків\n"
+
+#: pg_dump.c:1328 pg_dumpall.c:733
 #, c-format
 msgid "  --no-publications            do not dump publications\n"
 msgstr "  --no-publications            не вивантажувати публікації\n"
 
-#: pg_dump.c:1154 pg_dumpall.c:668
+#: pg_dump.c:1329 pg_dumpall.c:735
+#, c-format
+msgid "  --no-schema                  do not dump schema\n"
+msgstr "  --no-schema                  не вивантажувати схему\n"
+
+#: pg_dump.c:1330 pg_dumpall.c:736
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         не вивантажувати завдання міток безпеки\n"
 
-#: pg_dump.c:1155 pg_dumpall.c:669
+#: pg_dump.c:1331 pg_dumpall.c:737
+#, c-format
+msgid "  --no-statistics              do not dump statistics\n"
+msgstr "  --no-statistics              не вивантажувати статистику\n"
+
+#: pg_dump.c:1332 pg_dumpall.c:738
 #, c-format
 msgid "  --no-subscriptions           do not dump subscriptions\n"
 msgstr "  --no-subscriptions           не вивантажувати підписки\n"
 
-#: pg_dump.c:1156 pg_dumpall.c:671
+#: pg_dump.c:1333 pg_dumpall.c:740
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
 msgstr "  --no-table-access-method не вивантажувати табличні методи доступу\n"
 
-#: pg_dump.c:1157 pg_dumpall.c:672
+#: pg_dump.c:1334 pg_dumpall.c:741
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             не вивантажувати призначення табличних просторів\n"
 
-#: pg_dump.c:1158 pg_dumpall.c:673
+#: pg_dump.c:1335 pg_dumpall.c:742
 #, c-format
 msgid "  --no-toast-compression       do not dump TOAST compression methods\n"
 msgstr "  --no-toast-compression       не вивантажувати методи стиснення TOAST\n"
 
-#: pg_dump.c:1159 pg_dumpall.c:674
+#: pg_dump.c:1336 pg_dumpall.c:743
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     не вивантажувати дані таблиць, які не журналюються\n"
 
-#: pg_dump.c:1160 pg_dumpall.c:675
+#: pg_dump.c:1337 pg_dumpall.c:744
 #, c-format
 msgid "  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"
 msgstr "  --on-conflict-do-nothing     додавати ON CONFLICT DO NOTHING до команди INSERT\n"
 
-#: pg_dump.c:1161 pg_dumpall.c:676
+#: pg_dump.c:1338 pg_dumpall.c:745
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr "  --quote-all-identifiers      укладати в лапки всі ідентифікатори, а не тільки ключові слова\n"
 
-#: pg_dump.c:1162 pg_dumpall.c:677
+#: pg_dump.c:1339 pg_dumpall.c:746 pg_restore.c:584
+#, c-format
+msgid "  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"
+msgstr "  --restrict-key=RESTRICT_KEY  використовувати наданий рядок як ключ \\restrict для psql\n"
+
+#: pg_dump.c:1340 pg_dumpall.c:747
 #, c-format
 msgid "  --rows-per-insert=NROWS      number of rows per INSERT; implies --inserts\n"
 msgstr "  --rows-per-insert=NROWS      кількість рядків для INSERT; вимагає параметру --inserts\n"
 
-#: pg_dump.c:1163
+#: pg_dump.c:1341
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SECTION            вивантажити вказану секцію (pre-data, data або post-data)\n"
 
-#: pg_dump.c:1164
+#: pg_dump.c:1342 pg_dumpall.c:748
+#, c-format
+msgid "  --sequence-data              include sequence data in dump\n"
+msgstr "  --sequence-data              включити дані послідовностей у вивантаження\n"
+
+#: pg_dump.c:1343
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr "  --serializable-deferrable    чекати коли вивантаження можна буде виконати без аномалій\n"
 
-#: pg_dump.c:1165
+#: pg_dump.c:1344
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          використовувати під час вивантаження вказаний знімок\n"
 
-#: pg_dump.c:1166 pg_restore.c:497
+#: pg_dump.c:1345 pg_dumpall.c:749
+#, c-format
+msgid "  --statistics                 dump the statistics\n"
+msgstr "  --statistics                 вивантажити статистику\n"
+
+#: pg_dump.c:1346 pg_dumpall.c:750
+#, c-format
+msgid "  --statistics-only            dump only the statistics, not schema or data\n"
+msgstr "  --statistics-only            вивантажити тільки статистику, без схеми або даних\n"
+
+#: pg_dump.c:1347 pg_restore.c:588
 #, c-format
 msgid "  --strict-names               require table and/or schema include patterns to\n"
 "                               match at least one entity each\n"
 msgstr "  --strict-names               потребувати, щоб при вказівці шаблону включення\n"
 "                               таблиці і/або схеми йому відповідав мінімум один об'єкт\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1349
 #, c-format
 msgid "  --table-and-children=PATTERN dump only the specified table(s), including\n"
 "                               child and partition tables\n"
 msgstr "  --table-and-children=PATTERN вивантажувати лише зазначені таблиці,\n"
 "                               включно з дочірніми та секціонованими таблицями\n"
 
-#: pg_dump.c:1170 pg_dumpall.c:678 pg_restore.c:500
+#: pg_dump.c:1351 pg_dumpall.c:751 pg_restore.c:591
 #, c-format
 msgid "  --use-set-session-authorization\n"
 "                               use SET SESSION AUTHORIZATION commands instead of\n"
@@ -1911,49 +2006,49 @@ msgstr "  --use-set-session-authorization\n"
 "                               щоб встановити власника, використати команди SET SESSION AUTHORIZATION,\n"
 "                               замість команд ALTER OWNER\n"
 
-#: pg_dump.c:1174 pg_dumpall.c:682 pg_restore.c:504
+#: pg_dump.c:1355 pg_dumpall.c:755 pg_restore.c:595
 #, c-format
 msgid "\n"
 "Connection options:\n"
 msgstr "\n"
 "Налаштування з'єднання:\n"
 
-#: pg_dump.c:1175
+#: pg_dump.c:1356
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAME      ім'я бази даних для вивантаження\n"
 
-#: pg_dump.c:1176 pg_dumpall.c:684 pg_restore.c:505
+#: pg_dump.c:1357 pg_dumpall.c:757 pg_restore.c:596
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      хост серверу баз даних або каталог сокетів\n"
 
-#: pg_dump.c:1177 pg_dumpall.c:686 pg_restore.c:506
+#: pg_dump.c:1358 pg_dumpall.c:759 pg_restore.c:597
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          номер порту сервера бази даних\n"
 
-#: pg_dump.c:1178 pg_dumpall.c:687 pg_restore.c:507
+#: pg_dump.c:1359 pg_dumpall.c:760 pg_restore.c:598
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      підключатись як вказаний користувач бази даних\n"
 
-#: pg_dump.c:1179 pg_dumpall.c:688 pg_restore.c:508
+#: pg_dump.c:1360 pg_dumpall.c:761 pg_restore.c:599
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        ніколи не запитувати пароль\n"
 
-#: pg_dump.c:1180 pg_dumpall.c:689 pg_restore.c:509
+#: pg_dump.c:1361 pg_dumpall.c:762 pg_restore.c:600
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           запитувати пароль завжди (повинно траплятись автоматично)\n"
 
-#: pg_dump.c:1181 pg_dumpall.c:690
+#: pg_dump.c:1362 pg_dumpall.c:763
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLENAME          виконати SET ROLE до вивантаження\n"
 
-#: pg_dump.c:1183
+#: pg_dump.c:1364
 #, c-format
 msgid "\n"
 "If no database name is supplied, then the PGDATABASE environment\n"
@@ -1961,239 +2056,249 @@ msgid "\n"
 msgstr "\n"
 "Якщо ім'я бази даних не вказано, тоді використовується значення змінної середовища PGDATABASE.\n\n"
 
-#: pg_dump.c:1185 pg_dumpall.c:694 pg_restore.c:516
+#: pg_dump.c:1366 pg_dumpall.c:767 pg_restore.c:607
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Повідомляти про помилки на <%s>.\n"
 
-#: pg_dump.c:1186 pg_dumpall.c:695 pg_restore.c:517
+#: pg_dump.c:1367 pg_dumpall.c:768 pg_restore.c:608
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: pg_dump.c:1205 pg_dumpall.c:518
+#: pg_dump.c:1386 pg_dumpall.c:566
 #, c-format
 msgid "invalid client encoding \"%s\" specified"
 msgstr "вказано неприпустиме клієнтське кодування \"%s\""
 
-#: pg_dump.c:1352
+#: pg_dump.c:1534
 #, c-format
 msgid "parallel dumps from standby servers are not supported by this server version"
 msgstr "паралельні вивантаження для резервних серверів не підтримуються цією версію сервера"
 
-#: pg_dump.c:1417
+#: pg_dump.c:1599
 #, c-format
 msgid "invalid output format \"%s\" specified"
 msgstr "вказано неприпустимий формат виводу \"%s\""
 
-#: pg_dump.c:1458 pg_dump.c:1514 pg_dump.c:1567 pg_dumpall.c:1467
+#: pg_dump.c:1640 pg_dump.c:1696 pg_dump.c:1749 pg_dumpall.c:1594
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неправильне повне ім'я (забагато компонентів): %s"
 
-#: pg_dump.c:1466
+#: pg_dump.c:1648
 #, c-format
 msgid "no matching schemas were found for pattern \"%s\""
 msgstr "не знайдено відповідних схем для візерунку \"%s\""
 
-#: pg_dump.c:1519
+#: pg_dump.c:1701
 #, c-format
 msgid "no matching extensions were found for pattern \"%s\""
 msgstr "не знайдено відповідних розширень для шаблону \"%s\""
 
-#: pg_dump.c:1572
+#: pg_dump.c:1754
 #, c-format
 msgid "no matching foreign servers were found for pattern \"%s\""
 msgstr "не знайдено відповідних підлеглих серверів для шаблону \"%s\""
 
-#: pg_dump.c:1643
+#: pg_dump.c:1825
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "неправильне ім'я зв'язку (забагато компонентів): %s"
 
-#: pg_dump.c:1665
+#: pg_dump.c:1847
 #, c-format
 msgid "no matching tables were found for pattern \"%s\""
 msgstr "не знайдено відповідних таблиць для візерунку\"%s\""
 
-#: pg_dump.c:1692
+#: pg_dump.c:1874
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "На даний момент ви від'єднанні від бази даних."
 
-#: pg_dump.c:1695
+#: pg_dump.c:1877
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "міжбазові посилання не реалізовані: %s"
 
-#: pg_dump.c:2154
+#: pg_dump.c:2343
 #, c-format
 msgid "dumping contents of table \"%s.%s\""
 msgstr "вивантажування змісту таблиці \"%s.%s\""
 
-#: pg_dump.c:2264
+#: pg_dump.c:2453
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed."
 msgstr "Помилка вивантажування змісту таблиці \"%s\": помилка в PQgetCopyData()."
 
-#: pg_dump.c:2265 pg_dump.c:2275
+#: pg_dump.c:2454 pg_dump.c:2464
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Повідомлення про помилку від сервера: %s"
 
-#: pg_dump.c:2266 pg_dump.c:2276
+#: pg_dump.c:2455 pg_dump.c:2465
 #, c-format
 msgid "Command was: %s"
 msgstr "Команда була: %s"
 
-#: pg_dump.c:2274
+#: pg_dump.c:2463
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed."
 msgstr "Помилка вивантажування змісту таблиці \"%s\": помилка в PQgetResult(). "
 
-#: pg_dump.c:2365
+#: pg_dump.c:2554
 #, c-format
 msgid "wrong number of fields retrieved from table \"%s\""
 msgstr "неправильна кількість полів отриманих з таблиці \"%s\""
 
-#: pg_dump.c:3067
+#: pg_dump.c:3272
 #, c-format
 msgid "saving database definition"
 msgstr "збереження визначення бази даних"
 
-#: pg_dump.c:3176
+#: pg_dump.c:3387
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нерозпізнаний постачальник локалів: %s"
 
-#: pg_dump.c:3537
+#: pg_dump.c:3748
 #, c-format
 msgid "saving encoding = %s"
 msgstr "збереження кодування = %s"
 
-#: pg_dump.c:3562
+#: pg_dump.c:3773
 #, c-format
 msgid "saving \"standard_conforming_strings = %s\""
 msgstr "збереження \"standard_conforming_strings = %s\""
 
-#: pg_dump.c:3601
+#: pg_dump.c:3812
 #, c-format
 msgid "could not parse result of current_schemas()"
 msgstr "не вдалося проаналізувати результат current_schemas()"
 
-#: pg_dump.c:3620
+#: pg_dump.c:3831
 #, c-format
 msgid "saving \"search_path = %s\""
 msgstr "збереження \"search_path = %s\""
 
-#: pg_dump.c:3656
+#: pg_dump.c:3867
 #, c-format
 msgid "reading large objects"
 msgstr "читання великих об’єктів"
 
-#: pg_dump.c:3877
+#: pg_dump.c:4088
 #, c-format
 msgid "saving large objects \"%s\""
 msgstr "збереження великих об’єктів \"%s\""
 
-#: pg_dump.c:3898
+#: pg_dump.c:4109
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "помилка читання великих об’єктів %u: %s"
 
-#: pg_dump.c:4001
+#: pg_dump.c:4217
 #, c-format
 msgid "reading row-level security policies"
 msgstr "читання політик безпеки на рівні рядків"
 
-#: pg_dump.c:4142
+#: pg_dump.c:4358
 #, c-format
 msgid "unexpected policy command type: %c"
 msgstr "неочікуваний тип команди в політиці: %c"
 
-#: pg_dump.c:4592 pg_dump.c:5150 pg_dump.c:12362 pg_dump.c:18247
-#: pg_dump.c:18249 pg_dump.c:18871
+#: pg_dump.c:4800 pg_dump.c:5357 pg_dump.c:7986 pg_dump.c:13466 pg_dump.c:19664
+#: pg_dump.c:19666 pg_dump.c:20298
 #, c-format
 msgid "could not parse %s array"
 msgstr "не вдалося аналізувати масив %s"
 
-#: pg_dump.c:4806
+#: pg_dump.c:5016
 #, c-format
 msgid "subscriptions not dumped because current user is not a superuser"
 msgstr "підписки не вивантажені через те, що чинний користувач не є суперкористувачем"
 
-#: pg_dump.c:5012
+#: pg_dump.c:5220
 #, c-format
 msgid "subscription with OID %u does not exist"
 msgstr "підписки %u з OID не існує"
 
-#: pg_dump.c:5019
+#: pg_dump.c:5227
 #, c-format
 msgid "failed sanity check, table with OID %u not found"
 msgstr "помилка цілісності, таблиця з OID %u не знайдена"
 
-#: pg_dump.c:5582
+#: pg_dump.c:5813
 #, c-format
 msgid "could not find parent extension for %s %s"
 msgstr "не вдалося знайти батьківський елемент для %s %s"
 
-#: pg_dump.c:5727
+#: pg_dump.c:5951
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "схема з OID %u не існує"
 
-#: pg_dump.c:7209 pg_dump.c:17618
+#: pg_dump.c:7008
+#, c-format
+msgid "cannot dump statistics for relation kind \"%c\""
+msgstr "не можна вивантажити статистику для відношення типу \"%c\""
+
+#: pg_dump.c:7520 pg_dump.c:19003
 #, c-format
 msgid "failed sanity check, parent table with OID %u of sequence with OID %u not found"
 msgstr "помилка цілісності, за OID %u не вдалося знайти батьківську таблицю послідовності з OID %u"
 
-#: pg_dump.c:7352
+#: pg_dump.c:7665
 #, c-format
 msgid "failed sanity check, table OID %u appearing in pg_partitioned_table not found"
 msgstr "помилка цілісності, OID %u не знайдено в таблиці pg_partitioned_table"
 
-#: pg_dump.c:7583 pg_dump.c:7857 pg_dump.c:8304 pg_dump.c:8918 pg_dump.c:9040
-#: pg_dump.c:9188
+#: pg_dump.c:7930 pg_dump.c:8223 pg_dump.c:8686 pg_dump.c:9333 pg_dump.c:9472
+#: pg_dump.c:9617 pg_dump.c:9717
 #, c-format
 msgid "unrecognized table OID %u"
 msgstr "нерозпізнаний OID таблиці %u"
 
-#: pg_dump.c:7587
+#: pg_dump.c:7934
 #, c-format
 msgid "unexpected index data for table \"%s\""
 msgstr "неочікувані дані індексу для таблиці \"%s\""
 
-#: pg_dump.c:8089
+#: pg_dump.c:8473
 #, c-format
 msgid "failed sanity check, parent table with OID %u of pg_rewrite entry with OID %u not found"
 msgstr "помилка цілісності, за OID %u не вдалося знайти батьківську таблицю для запису pg_rewrite з OID %u"
 
-#: pg_dump.c:8922
+#: pg_dump.c:9337
 #, c-format
 msgid "unexpected column data for table \"%s\""
 msgstr "неочікувані дані стовпця для таблиці \"%s\""
 
-#: pg_dump.c:8951
+#: pg_dump.c:9369
 #, c-format
 msgid "invalid column numbering in table \"%s\""
 msgstr "неприпустима нумерація стовпців у таблиці \"%s\""
 
-#: pg_dump.c:9002
+#: pg_dump.c:9434
 #, c-format
 msgid "finding table default expressions"
 msgstr "пошук виразів за замовчуванням для таблиці"
 
-#: pg_dump.c:9044
+#: pg_dump.c:9476
 #, c-format
 msgid "invalid adnum value %d for table \"%s\""
 msgstr "неприпустиме значення adnum %d для таблиці \"%s\""
 
-#: pg_dump.c:9138
+#: pg_dump.c:9569
+#, c-format
+msgid "finding invalid not-null constraints"
+msgstr "пошук недійсних обмежень NOT NULL"
+
+#: pg_dump.c:9667
 #, c-format
 msgid "finding table check constraints"
 msgstr "пошук перевірочних обмежень таблиці"
 
-#: pg_dump.c:9192
+#: pg_dump.c:9721
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d"
@@ -2202,178 +2307,198 @@ msgstr[1] "очікувалось %d обмеження-перевірки дл
 msgstr[2] "очікувалось %d обмежень-перевірок для таблиці \"%s\", але знайдено %d"
 msgstr[3] "очікувалось %d обмежень-перевірок для таблиці \"%s\", але знайдено %d"
 
-#: pg_dump.c:9196
+#: pg_dump.c:9725
 #, c-format
 msgid "The system catalogs might be corrupted."
 msgstr "Системні каталоги можуть бути пошкоджені."
 
-#: pg_dump.c:9886
+#: pg_dump.c:10530
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "роль з OID %u не існує"
 
-#: pg_dump.c:9998 pg_dump.c:10027
+#: pg_dump.c:10642 pg_dump.c:10671
 #, c-format
 msgid "unsupported pg_init_privs entry: %u %u %d"
 msgstr "непідтримуваний запис в pg_init_privs: %u %u %d"
 
-#: pg_dump.c:10574
+#: pg_dump.c:10967
+#, c-format
+msgid "statistics dumped out of order (current: %d %s %s, expected: %d %s %s)"
+msgstr "статистика вивантажена не в порядку (поточно: %d %s %s, очікувалось: %d %s %s)"
+
+#: pg_dump.c:11108
+#, c-format
+msgid "unexpected null attname"
+msgstr "неочікуваний NULL attname"
+
+#: pg_dump.c:11137
+#, c-format
+msgid "could not find index attname \"%s\""
+msgstr "не вдалося знайти attname індексу \"%s\""
+
+#: pg_dump.c:11623
 #, c-format
 msgid "missing metadata for large objects \"%s\""
 msgstr "відсутні метадані для великих об'єктів \"%s\""
 
-#: pg_dump.c:10857
+#: pg_dump.c:11909
 #, c-format
 msgid "typtype of data type \"%s\" appears to be invalid"
 msgstr "typtype типу даних \"%s\" має неприпустимий вигляд"
 
-#: pg_dump.c:12431
+#: pg_dump.c:13537
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\""
 msgstr "нерозпізнане значення provolatile для функції \"%s\""
 
-#: pg_dump.c:12481 pg_dump.c:14377
+#: pg_dump.c:13587 pg_dump.c:15483
 #, c-format
 msgid "unrecognized proparallel value for function \"%s\""
 msgstr "нерозпізнане значення proparallel для функції \"%s\""
 
-#: pg_dump.c:12611 pg_dump.c:12717 pg_dump.c:12724
+#: pg_dump.c:13717 pg_dump.c:13823 pg_dump.c:13830
 #, c-format
 msgid "could not find function definition for function with OID %u"
 msgstr "не вдалося знайти визначення функції для функції з OID %u"
 
-#: pg_dump.c:12650
+#: pg_dump.c:13756
 #, c-format
 msgid "bogus value in pg_cast.castfunc or pg_cast.castmethod field"
 msgstr "неприпустиме значення в полі pg_cast.castfunc або pg_cast.castmethod"
 
-#: pg_dump.c:12653
+#: pg_dump.c:13759
 #, c-format
 msgid "bogus value in pg_cast.castmethod field"
 msgstr "неприпустиме значення в полі pg_cast.castmethod"
 
-#: pg_dump.c:12743
+#: pg_dump.c:13849
 #, c-format
 msgid "bogus transform definition, at least one of trffromsql and trftosql should be nonzero"
 msgstr "неприпустиме визначення перетворення, як мінімум одне з trffromsql і trftosql повинно бути ненульовим"
 
-#: pg_dump.c:12760
+#: pg_dump.c:13866
 #, c-format
 msgid "bogus value in pg_transform.trffromsql field"
 msgstr "неприпустиме значення в полі pg_transform.trffromsql"
 
-#: pg_dump.c:12781
+#: pg_dump.c:13887
 #, c-format
 msgid "bogus value in pg_transform.trftosql field"
 msgstr "неприпустиме значення в полі pg_transform.trftosql"
 
-#: pg_dump.c:12926
+#: pg_dump.c:14032
 #, c-format
 msgid "postfix operators are not supported anymore (operator \"%s\")"
 msgstr "постфіксні оператори більше не підтримуються (оператор \"%s\")"
 
-#: pg_dump.c:13096
+#: pg_dump.c:14202
 #, c-format
 msgid "could not find operator with OID %s"
 msgstr "не вдалося знайти оператора з OID %s"
 
-#: pg_dump.c:13164
+#: pg_dump.c:14270
 #, c-format
 msgid "invalid type \"%c\" of access method \"%s\""
 msgstr "неприпустимий тип \"%c\" методу доступу \"%s\""
 
-#: pg_dump.c:13838 pg_dump.c:13906
+#: pg_dump.c:14944 pg_dump.c:15012
 #, c-format
 msgid "unrecognized collation provider: %s"
 msgstr "нерозпізнаний постачальник правил сортування: %s"
 
-#: pg_dump.c:13847 pg_dump.c:13854 pg_dump.c:13865 pg_dump.c:13875
-#: pg_dump.c:13890
+#: pg_dump.c:14953 pg_dump.c:14960 pg_dump.c:14971 pg_dump.c:14981
+#: pg_dump.c:14996
 #, c-format
 msgid "invalid collation \"%s\""
 msgstr "неприпустиме правило сортування \"%s\""
 
-#: pg_dump.c:14296
+#: pg_dump.c:15402
 #, c-format
 msgid "unrecognized aggfinalmodify value for aggregate \"%s\""
 msgstr "нерозпізнане значення aggfinalmodify для агрегату \"%s\""
 
-#: pg_dump.c:14352
+#: pg_dump.c:15458
 #, c-format
 msgid "unrecognized aggmfinalmodify value for aggregate \"%s\""
 msgstr "нерозпізнане значення aggmfinalmodify для агрегату \"%s\""
 
-#: pg_dump.c:15069
+#: pg_dump.c:16178
 #, c-format
 msgid "unrecognized object type in default privileges: %d"
 msgstr "нерозпізнаний тип об’єкта у стандартному праві: %d"
 
-#: pg_dump.c:15085
+#: pg_dump.c:16194
 #, c-format
 msgid "could not parse default ACL list (%s)"
 msgstr "не вдалося проаналізувати стандартний ACL список (%s)"
 
-#: pg_dump.c:15169
+#: pg_dump.c:16278
 #, c-format
 msgid "could not parse initial ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "не вдалося аналізувати початковий список ACL (%s) або за замовченням (%s) для об'єкта \"%s\" (%s)"
 
-#: pg_dump.c:15194
+#: pg_dump.c:16303
 #, c-format
 msgid "could not parse ACL list (%s) or default (%s) for object \"%s\" (%s)"
 msgstr "не вдалося аналізувати список ACL (%s) або за замовчуванням (%s) для об'єкту \"%s\" (%s)"
 
-#: pg_dump.c:15737
+#: pg_dump.c:16846
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data"
 msgstr "запит на отримання визначення перегляду \"%s\" не повернув дані"
 
-#: pg_dump.c:15740
+#: pg_dump.c:16849
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition"
 msgstr "запит на отримання визначення перегляду \"%s\" повернув більше, ніж одне визначення"
 
-#: pg_dump.c:15747
+#: pg_dump.c:16856
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)"
 msgstr "визначення перегляду \"%s\" пусте (довжина нуль)"
 
-#: pg_dump.c:15832
+#: pg_dump.c:16941
 #, c-format
 msgid "WITH OIDS is not supported anymore (table \"%s\")"
 msgstr "WITH OIDS більше не підтримується (таблиця\"%s\")"
 
-#: pg_dump.c:16819
+#: pg_dump.c:18081
 #, c-format
 msgid "invalid column number %d for table \"%s\""
 msgstr "неприпустиме число стовпців %d для таблиці \"%s\""
 
-#: pg_dump.c:16897
+#: pg_dump.c:18159
 #, c-format
 msgid "could not parse index statistic columns"
 msgstr "не вдалося проаналізувати стовпці статистики індексів"
 
-#: pg_dump.c:16899
+#: pg_dump.c:18161
 #, c-format
 msgid "could not parse index statistic values"
 msgstr "не вдалося проаналізувати значення статистики індексів"
 
-#: pg_dump.c:16901
+#: pg_dump.c:18163
 #, c-format
 msgid "mismatched number of columns and values for index statistics"
 msgstr "невідповідна кількість стовпців і значень для статистики індексів"
 
-#: pg_dump.c:17116
+#: pg_dump.c:18392
 #, c-format
 msgid "missing index for constraint \"%s\""
 msgstr "пропущено індекс для обмеження \"%s\""
 
-#: pg_dump.c:17351
+#: pg_dump.c:18661
 #, c-format
 msgid "unrecognized constraint type: %c"
 msgstr "нерозпізнаний тип обмеження: %c"
 
-#: pg_dump.c:17452 pg_dump.c:17682
+#: pg_dump.c:18714
+#, c-format
+msgid "unrecognized sequence type: %s"
+msgstr "нерозпізнаний тип послідовності: %s"
+
+#: pg_dump.c:18846 pg_dump.c:19078
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)"
@@ -2382,63 +2507,63 @@ msgstr[1] "запит на отримання даних послідовнос
 msgstr[2] "запит на отримання даних послідовності \"%s\" повернув %d рядків (очікувалося 1)"
 msgstr[3] "запит на отримання даних послідовності \"%s\" повернув %d рядків (очікувалося 1)"
 
-#: pg_dump.c:17484
+#: pg_dump.c:18882
 #, c-format
-msgid "unrecognized sequence type: %s"
-msgstr "нерозпізнаний тип послідовності: %s"
+msgid "unrecognized sequence type: %d"
+msgstr "нерозпізнаний тип послідовності: %d"
 
-#: pg_dump.c:17999
+#: pg_dump.c:19416
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "помилка запиту на отримання правила \"%s\" для таблиці \"%s\": повернено неправильне число рядків "
 
-#: pg_dump.c:18152
+#: pg_dump.c:19569
 #, c-format
 msgid "could not find referenced extension %u"
 msgstr "не вдалося знайти згадане розширення %u"
 
-#: pg_dump.c:18251
+#: pg_dump.c:19668
 #, c-format
 msgid "mismatched number of configurations and conditions for extension"
 msgstr "невідповідна кількість конфігурацій і умов для розширення"
 
-#: pg_dump.c:18383
+#: pg_dump.c:19800
 #, c-format
 msgid "reading dependency data"
 msgstr "читання даних залежності"
 
-#: pg_dump.c:18469
+#: pg_dump.c:19886
 #, c-format
 msgid "no referencing object %u %u"
 msgstr "немає об’єкту посилання %u %u"
 
-#: pg_dump.c:18480
+#: pg_dump.c:19897
 #, c-format
 msgid "no referenced object %u %u"
 msgstr "немає посилання на об'єкт %u %u"
 
-#: pg_dump.c:18905 pg_dump.c:18943 pg_dumpall.c:1962 pg_restore.c:551
-#: pg_restore.c:597
+#: pg_dump.c:20332 pg_dump.c:20370 pg_dumpall.c:1842 pg_restore.c:642
+#: pg_restore.c:688
 #, c-format
 msgid "%s filter for \"%s\" is not allowed"
 msgstr "фільтр %s для \"%s\" не дозволений"
 
-#: pg_dump_sort.c:424
+#: pg_dump_sort.c:660
 #, c-format
 msgid "invalid dumpId %d"
 msgstr "неприпустимий dumpId %d"
 
-#: pg_dump_sort.c:430
+#: pg_dump_sort.c:666
 #, c-format
 msgid "invalid dependency %d"
 msgstr "неприпустима залежність %d"
 
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:830
 #, c-format
 msgid "could not identify dependency loop"
 msgstr "не вдалося ідентифікувати цикл залежності"
 
-#: pg_dump_sort.c:1209
+#: pg_dump_sort.c:1474
 #, c-format
 msgid "there are circular foreign-key constraints on this table:"
 msgid_plural "there are circular foreign-key constraints among these tables:"
@@ -2447,134 +2572,114 @@ msgstr[1] "у наступних таблицях зациклені зовні
 msgstr[2] "у наступних таблицях зациклені зовнішні ключі:"
 msgstr[3] "у наступних таблицях зациклені зовнішні ключі:"
 
-#: pg_dump_sort.c:1214
+#: pg_dump_sort.c:1479
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints."
 msgstr "Ви не зможете відновити дамп без використання --disable-triggers або тимчасово розірвати обмеження."
 
-#: pg_dump_sort.c:1215
+#: pg_dump_sort.c:1480
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem."
 msgstr "Можливо, використання повного вивантажування замість --data-only вивантажування допоможе уникнути цієї проблеми."
 
-#: pg_dump_sort.c:1227
+#: pg_dump_sort.c:1492
 #, c-format
 msgid "could not resolve dependency loop among these items:"
 msgstr "не вдалося вирішити цикл залежності серед цих елементів:"
 
-#: pg_dumpall.c:231
+#: pg_dumpall.c:240
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\""
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:243
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s"
 
-#: pg_dumpall.c:387
-#, c-format
-msgid "option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only"
-msgstr "параметр --exclude-database не можна використовувати разом з -g/--globals-only, -r/--roles-only або -t/--tablespaces-only"
-
-#: pg_dumpall.c:395
-#, c-format
-msgid "options -g/--globals-only and -r/--roles-only cannot be used together"
-msgstr "параметри -g/--globals-only і -r/--roles-only не можна використовувати разом"
-
 #: pg_dumpall.c:402
 #, c-format
-msgid "options -g/--globals-only and -t/--tablespaces-only cannot be used together"
-msgstr "параметри -g/--globals-only і -t/--tablespaces-only не можна використовувати разом"
-
-#: pg_dumpall.c:412
-#, c-format
-msgid "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
-msgstr "параметри -r/--roles-only і -t/--tablespaces-only не можна використовувати разом"
-
-#: pg_dumpall.c:474 pg_dumpall.c:1771
-#, c-format
-msgid "could not connect to database \"%s\""
-msgstr "не вдалося зв'язатися з базою даних \"%s\""
+msgid "option %s cannot be used together with %s, %s, or %s"
+msgstr "параметр %s не можна використовувати разом з %s, %s або %s"
 
-#: pg_dumpall.c:486
+#: pg_dumpall.c:534
 #, c-format
 msgid "could not connect to databases \"postgres\" or \"template1\"\n"
 "Please specify an alternative database."
 msgstr "не вдалося зв'язатися з базами даних \"postgres\" або \"template1\"\n"
 "Будь ласка, вкажіть альтернативну базу даних."
 
-#: pg_dumpall.c:634
+#: pg_dumpall.c:699
 #, c-format
-msgid "%s extracts a PostgreSQL database cluster into an SQL script file.\n\n"
-msgstr "%s експортує кластер баз даних PostgreSQL до SQL-скрипту.\n\n"
+msgid "%s exports a PostgreSQL database cluster as an SQL script.\n\n"
+msgstr "%s експортує кластер баз даних PostgreSQL як SQL скрипт.\n\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:701
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s: [OPTION]...\n"
 
-#: pg_dumpall.c:639
+#: pg_dumpall.c:704
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=FILENAME  ім'я вихідного файлу\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:711
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean              очистити (видалити) бази даних перед відтворенням\n"
 
-#: pg_dumpall.c:648
+#: pg_dumpall.c:713
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr "  -g, --globals-only         вивантажувати лише глобальні об’єкти, не бази даних\n"
 
-#: pg_dumpall.c:649 pg_restore.c:475
+#: pg_dumpall.c:714 pg_restore.c:559
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner         пропускається відновлення форми власності об’єктом\n"
 
-#: pg_dumpall.c:650
+#: pg_dumpall.c:715
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only        вивантажувати лише ролі, не бази даних або табличні простори\n"
 
-#: pg_dumpall.c:652
+#: pg_dumpall.c:717
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NAME        ім'я суперкористувача для використання при вивантажуванні\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:718
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only        вивантажувати лише табличні простори, не бази даних або ролі\n"
 
-#: pg_dumpall.c:659
+#: pg_dumpall.c:724
 #, c-format
 msgid "  --exclude-database=PATTERN   exclude databases whose name matches PATTERN\n"
 msgstr "  --exclude-database=PATTERN виключити бази даних, ім'я яких відповідає PATTERN\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:726
 #, c-format
 msgid "  --filter=FILENAME            exclude databases based on expressions in FILENAME\n"
 msgstr "  --filter=FILENAME            виключити бази даних, на основі виразів у FILENAME\n"
 
-#: pg_dumpall.c:667
+#: pg_dumpall.c:734
 #, c-format
 msgid "  --no-role-passwords          do not dump passwords for roles\n"
 msgstr "  --no-role-passwords          не вивантажувати паролі для ролей\n"
 
-#: pg_dumpall.c:683
+#: pg_dumpall.c:756
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=CONNSTR     підключення з використанням рядку підключення \n"
 
-#: pg_dumpall.c:685
+#: pg_dumpall.c:758
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    альтернативна база даних за замовчуванням\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:765
 #, c-format
 msgid "\n"
 "If -f/--file is not used, then the SQL script will be written to the standard\n"
@@ -2582,298 +2687,309 @@ msgid "\n"
 msgstr "\n"
 "Якщо -f/--file не використовується, тоді SQL- сценарій буде записаний до стандартного виводу.\n\n"
 
-#: pg_dumpall.c:837
+#: pg_dumpall.c:910
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "пропущено ім’я ролі, що починається з \"pg_\" (%s)"
 
-#: pg_dumpall.c:1059
+#. translator: %s represents a numeric role OID
+#: pg_dumpall.c:1127 pg_dumpall.c:1185 pg_dumpall.c:1194
+#, c-format
+msgid "found orphaned pg_auth_members entry for role %s"
+msgstr "знайдено забутий запис в pg_auth_members для ролі %s"
+
+#: pg_dumpall.c:1160
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "не вдалося знайти правильний порядок вивантаження членства в ролі \"%s\""
 
-#: pg_dumpall.c:1194
+#: pg_dumpall.c:1315
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "не вдалося аналізувати список ACL (%s) для параметра \"%s\""
 
-#: pg_dumpall.c:1321
+#: pg_dumpall.c:1442
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr "не вдалося аналізувати список ACL (%s) для табличного простору \"%s\""
 
-#: pg_dumpall.c:1528
+#: pg_dumpall.c:1656
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "виключаємо базу даних \"%s\""
 
-#: pg_dumpall.c:1532
+#: pg_dumpall.c:1660
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "вивантажуємо базу даних \"%s\""
 
-#: pg_dumpall.c:1563
+#: pg_dumpall.c:1693
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "помилка pg_dump для бази даних \"%s\", завершення роботи"
 
-#: pg_dumpall.c:1569
+#: pg_dumpall.c:1699
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "не вдалося повторно відкрити файл виводу \"%s\": %m"
 
-#: pg_dumpall.c:1613
+#: pg_dumpall.c:1743
 #, c-format
 msgid "running \"%s\""
 msgstr "виконується \"%s\""
 
-#: pg_dumpall.c:1814
-#, c-format
-msgid "could not get server version"
-msgstr "не вдалося отримати версію серверу"
-
-#: pg_dumpall.c:1817
-#, c-format
-msgid "could not parse server version \"%s\""
-msgstr "не вдалося аналізувати версію серверу \"%s\""
-
-#: pg_dumpall.c:1887 pg_dumpall.c:1910
-#, c-format
-msgid "executing %s"
-msgstr "виконується %s"
-
-#: pg_dumpall.c:1982
+#: pg_dumpall.c:1862
 msgid "unsupported filter object"
 msgstr "непідтримуваний об'єкт фільтру"
 
-#: pg_restore.c:329
+#: pg_restore.c:348
 #, c-format
 msgid "one of -d/--dbname and -f/--file must be specified"
 msgstr "необхідно вказати один з -d/--dbname або -f/--file"
 
-#: pg_restore.c:336
-#, c-format
-msgid "options -d/--dbname and -f/--file cannot be used together"
-msgstr "параметри -d/--dbname і -f/--file не можуть використовуватись разом"
-
-#: pg_restore.c:350
-#, c-format
-msgid "options -1/--single-transaction and --transaction-size cannot be used together"
-msgstr "параметри -1/--single-transaction і --transaction-size не можуть використовуватись разом"
-
-#: pg_restore.c:357
-#, c-format
-msgid "options -C/--create and -1/--single-transaction cannot be used together"
-msgstr "параметри -C/--create і -1/--single-transaction не можуть використовуватись разом"
-
-#: pg_restore.c:361
+#: pg_restore.c:433
 #, c-format
 msgid "cannot specify both --single-transaction and multiple jobs"
 msgstr "параметр --single-transaction допускається лише з одним завданням"
 
-#: pg_restore.c:399
+#: pg_restore.c:480
+#, c-format
+msgid "archive format \"%s\" is not supported; please use psql"
+msgstr "формат архіву \"%s\" не підтримується; будь ласка, використовуйте psql"
+
+#: pg_restore.c:484
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\""
 msgstr "нерозпізнаний формат архіву \"%s\"; будь ласка, вкажіть \"c\", \"d\" або \"t\""
 
-#: pg_restore.c:438
+#: pg_restore.c:522
 #, c-format
 msgid "errors ignored on restore: %d"
 msgstr "при відновленні проігноровано помилок: %d"
 
-#: pg_restore.c:451
+#: pg_restore.c:535
 #, c-format
 msgid "%s restores a PostgreSQL database from an archive created by pg_dump.\n\n"
 msgstr "%s відновлює базу даних PostgreSQL з архіву, створеного командою pg_dump.\n\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:537
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FILE]\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:540
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        підключитись до вказаної бази даних\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:541
 #, c-format
 msgid "  -f, --file=FILENAME      output file name (- for stdout)\n"
 msgstr "  -f, --file=FILENAME ім'я файлу виводу (- для stdout)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:542
 #, 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:459
+#: pg_restore.c:543
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               вивести короткий зміст архіву\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:544
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            детальний режим\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:545
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію, потім вийти\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:546
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: pg_restore.c:464
+#: pg_restore.c:548
 #, c-format
 msgid "\n"
 "Options controlling the restore:\n"
 msgstr "\n"
 "Параметри, що  керують відновленням:\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:549
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              відновити лише дані, без схеми\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:551
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 створити цільову базу даних\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:552
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error          вийти при помилці, продовжувати за замовчуванням\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:553
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAME            відновити вказаний індекс\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:554
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM               щоб виконати відновлення, використайте ці паралельні завдання\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:555
 #, c-format
 msgid "  -L, --use-list=FILENAME      use table of contents from this file for\n"
 "                               selecting/ordering output\n"
 msgstr "  -L, --use-list=FILENAME      використовувати зміст з цього файлу для \n"
 "                               вибору/упорядкування даних\n"
 
-#: pg_restore.c:473
+#: pg_restore.c:557
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NAME            відновити об'єкти лише в цій схемі\n"
 
-#: pg_restore.c:474
+#: pg_restore.c:558
 #, c-format
 msgid "  -N, --exclude-schema=NAME    do not restore objects in this schema\n"
 msgstr "  -N, --exclude-schema=NAME    не відновлювати об'єкти в цій схемі\n"
 
-#: pg_restore.c:476
+#: pg_restore.c:560
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NAME(args)    відновити вказану функцію\n"
 
-#: pg_restore.c:477
+#: pg_restore.c:561
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            відновити лише схему, без даних\n"
 
-#: pg_restore.c:478
+#: pg_restore.c:562
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAME         ім'я суперкористувача для вимкнення тригерів\n"
 
-#: pg_restore.c:479
+#: pg_restore.c:563
 #, c-format
 msgid "  -t, --table=NAME             restore named relation (table, view, etc.)\n"
 msgstr "  -t, --table=NAME             відновити вказане відношення (таблицю, подання і т. д.)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:564
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAME           відновити вказаний тригер\n"
 
-#: pg_restore.c:481
+#: pg_restore.c:565
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          пропустити відновлення прав доступу (grant/revoke)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:566
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     відновити в одній транзакції\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:568
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security       активувати захист на рівні рядків\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:569
 #, c-format
 msgid "  --filter=FILENAME            restore or skip objects based on expressions\n"
 "                               in FILENAME\n"
 msgstr "  --filter=FILENAME            відновлювати або пропускати об'єкти на основі виразів\n"
 "                               у FILENAME\n"
 
-#: pg_restore.c:488
+#: pg_restore.c:572
 #, c-format
-msgid "  --no-comments                do not restore comments\n"
+msgid "  --no-comments                do not restore comment commands\n"
 msgstr "  --no-comments                не відновлювати коментарі\n"
 
-#: pg_restore.c:489
+#: pg_restore.c:573
+#, c-format
+msgid "  --no-data                    do not restore data\n"
+msgstr "  --no-data                    не відновлювати дані\n"
+
+#: pg_restore.c:574
 #, 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   не відновлювати дані таблиць, які не вдалося створити\n"
 
-#: pg_restore.c:491
+#: pg_restore.c:576
+#, c-format
+msgid "  --no-policies                do not restore row security policies\n"
+msgstr "  --no-policies                не відновлювати політики безпеки рядків\n"
+
+#: pg_restore.c:577
 #, c-format
 msgid "  --no-publications            do not restore publications\n"
 msgstr "  --no-publications           не відновлювати публікації \n"
 
-#: pg_restore.c:492
+#: pg_restore.c:578
+#, c-format
+msgid "  --no-schema                  do not restore schema\n"
+msgstr "  --no-schema                  не відновлювати схему\n"
+
+#: pg_restore.c:579
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         не відновлювати мітки безпеки \n"
 
-#: pg_restore.c:493
+#: pg_restore.c:580
+#, c-format
+msgid "  --no-statistics              do not restore statistics\n"
+msgstr "  --no-statistics              не відновлювати статистику\n"
+
+#: pg_restore.c:581
 #, c-format
 msgid "  --no-subscriptions           do not restore subscriptions\n"
 msgstr "  --no-subscriptions          не відновлювати підписки\n"
 
-#: pg_restore.c:494
+#: pg_restore.c:582
 #, c-format
 msgid "  --no-table-access-method     do not restore table access methods\n"
 msgstr "  --no-table-access-method не відновлювати табличний метод доступу\n"
 
-#: pg_restore.c:495
+#: pg_restore.c:583
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces           не відновлювати завдання табличного простору\n"
 
-#: pg_restore.c:496
+#: pg_restore.c:585
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SECTION             відновлювати названий розділ (pre-data, data або post-data)\n"
 
-#: pg_restore.c:499
+#: pg_restore.c:586
+#, c-format
+msgid "  --statistics                 restore the statistics\n"
+msgstr "  --statistics                 відновити статистику\n"
+
+#: pg_restore.c:587
+#, c-format
+msgid "  --statistics-only            restore only the statistics, not schema or data\n"
+msgstr "  --statistics-only            відновити тільки статистику, без схеми або даних\n"
+
+#: pg_restore.c:590
 #, c-format
 msgid "  --transaction-size=N         commit after every N objects\n"
 msgstr "  --transaction-size=N         затверджувати транзакцію після N об'єктів\n"
 
-#: pg_restore.c:510
+#: pg_restore.c:601
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          виконати  SET ROLE перед відновленням\n"
 
-#: pg_restore.c:512
+#: pg_restore.c:603
 #, c-format
 msgid "\n"
 "The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n"
@@ -2882,7 +2998,7 @@ msgstr "\n"
 "Параметри -I, -n, -N, -P, -t, -T, і --section можна групувати і вказувати\n"
 "декілька разів для вибору декількох об'єктів.\n"
 
-#: pg_restore.c:515
+#: pg_restore.c:606
 #, c-format
 msgid "\n"
 "If no input file name is supplied, then standard input is used.\n\n"
diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index c3c5fae11ea..37d893d5e6a 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -237,24 +237,6 @@
 	'pg_restore: options -C\/--create and -1\/--single-transaction cannot be used together'
 );
 
-command_fails_like(
-	[ 'pg_restore', '--exclude-database=foo', '--globals-only', '-d', 'xxx' ],
-	qr/\Qpg_restore: error: option --exclude-database cannot be used together with -g\/--globals-only\E/,
-	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only'
-);
-
-command_fails_like(
-	[ 'pg_restore', '--exclude-database=foo', '-d', 'xxx', 'dumpdir' ],
-	qr/\Qpg_restore: error: option --exclude-database can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --exclude-database is used in pg_restore with dump of pg_dump'
-);
-
-command_fails_like(
-	[ 'pg_restore', '--globals-only', '-d', 'xxx', 'dumpdir' ],
-	qr/\Qpg_restore: error: option -g\/--globals-only can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --globals-only is not used in pg_restore with dump of pg_dump'
-);
-
 # also fails for -r and -t, but it seems pointless to add more tests for those.
 command_fails_like(
 	[ 'pg_dumpall', '--exclude-database=foo', '--globals-only' ],
@@ -262,8 +244,4 @@
 	'pg_dumpall: option --exclude-database cannot be used together with -g/--globals-only'
 );
 
-command_fails_like(
-	[ 'pg_dumpall', '--format', 'x' ],
-	qr/\Qpg_dumpall: error: unrecognized output format "x";\E/,
-	'pg_dumpall: unrecognized output format');
 done_testing();
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 4c701ef543b..509244b26f8 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -68,7 +68,7 @@
 			'--no-data',
 			'--sequence-data',
 			'--binary-upgrade',
-			'--with-statistics',
+			'--statistics',
 			'--dbname' => 'postgres',    # alternative way to specify database
 		],
 		restore_cmd => [
@@ -76,7 +76,7 @@
 			'--format' => 'custom',
 			'--verbose',
 			'--file' => "$tempdir/binary_upgrade.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/binary_upgrade.dump",
 		],
 	},
@@ -90,13 +90,13 @@
 			'--format' => 'custom',
 			'--compress' => '1',
 			'--file' => "$tempdir/compression_gzip_custom.dump",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--file' => "$tempdir/compression_gzip_custom.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_gzip_custom.dump",
 		],
 		command_like => {
@@ -119,7 +119,7 @@
 			'--format' => 'directory',
 			'--compress' => 'gzip:1',
 			'--file' => "$tempdir/compression_gzip_dir",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		# Give coverage for manually compressed blobs.toc files during
@@ -137,7 +137,7 @@
 			'pg_restore',
 			'--jobs' => '2',
 			'--file' => "$tempdir/compression_gzip_dir.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_gzip_dir",
 		],
 	},
@@ -150,7 +150,7 @@
 			'--format' => 'plain',
 			'--compress' => '1',
 			'--file' => "$tempdir/compression_gzip_plain.sql.gz",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		# Decompress the generated file to run through the tests.
@@ -169,13 +169,13 @@
 			'--format' => 'custom',
 			'--compress' => 'lz4',
 			'--file' => "$tempdir/compression_lz4_custom.dump",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--file' => "$tempdir/compression_lz4_custom.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_lz4_custom.dump",
 		],
 		command_like => {
@@ -198,9 +198,18 @@
 			'--format' => 'directory',
 			'--compress' => 'lz4:1',
 			'--file' => "$tempdir/compression_lz4_dir",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
+		# Give coverage for manually compressed blobs.toc files during
+		# restore.
+		compress_cmd => {
+			program => $ENV{'LZ4'},
+			args => [
+				'-z', '-f', '-m', '--rm',
+				"$tempdir/compression_lz4_dir/blobs_*.toc",
+			],
+		},
 		# Verify that data files were compressed
 		glob_patterns => [
 			"$tempdir/compression_lz4_dir/toc.dat",
@@ -210,7 +219,7 @@
 			'pg_restore',
 			'--jobs' => '2',
 			'--file' => "$tempdir/compression_lz4_dir.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_lz4_dir",
 		],
 	},
@@ -223,7 +232,7 @@
 			'--format' => 'plain',
 			'--compress' => 'lz4',
 			'--file' => "$tempdir/compression_lz4_plain.sql.lz4",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		# Decompress the generated file to run through the tests.
@@ -245,13 +254,13 @@
 			'--format' => 'custom',
 			'--compress' => 'zstd',
 			'--file' => "$tempdir/compression_zstd_custom.dump",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--file' => "$tempdir/compression_zstd_custom.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_zstd_custom.dump",
 		],
 		command_like => {
@@ -273,7 +282,7 @@
 			'--format' => 'directory',
 			'--compress' => 'zstd:1',
 			'--file' => "$tempdir/compression_zstd_dir",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		# Give coverage for manually compressed blobs.toc files during
@@ -294,7 +303,7 @@
 			'pg_restore',
 			'--jobs' => '2',
 			'--file' => "$tempdir/compression_zstd_dir.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/compression_zstd_dir",
 		],
 	},
@@ -308,7 +317,7 @@
 			'--format' => 'plain',
 			'--compress' => 'zstd:long',
 			'--file' => "$tempdir/compression_zstd_plain.sql.zst",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		# Decompress the generated file to run through the tests.
@@ -327,7 +336,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/clean.sql",
 			'--clean',
-			'--with-statistics',
+			'--statistics',
 			'--dbname' => 'postgres',    # alternative way to specify database
 		],
 	},
@@ -338,7 +347,7 @@
 			'--clean',
 			'--if-exists',
 			'--encoding' => 'UTF8',      # no-op, just for testing
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -357,7 +366,7 @@
 			'--create',
 			'--no-reconnect',    # no-op, just for testing
 			'--verbose',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -376,7 +385,7 @@
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/defaults.sql",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -385,7 +394,7 @@
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/defaults_no_public.sql",
-			'--with-statistics',
+			'--statistics',
 			'regress_pg_dump_test',
 		],
 	},
@@ -395,7 +404,7 @@
 			'pg_dump', '--no-sync',
 			'--clean',
 			'--file' => "$tempdir/defaults_no_public_clean.sql",
-			'--with-statistics',
+			'--statistics',
 			'regress_pg_dump_test',
 		],
 	},
@@ -404,7 +413,7 @@
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/defaults_public_owner.sql",
-			'--with-statistics',
+			'--statistics',
 			'regress_public_owner',
 		],
 	},
@@ -419,14 +428,14 @@
 			'pg_dump',
 			'--format' => 'custom',
 			'--file' => "$tempdir/defaults_custom_format.dump",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--format' => 'custom',
 			'--file' => "$tempdir/defaults_custom_format.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/defaults_custom_format.dump",
 		],
 		command_like => {
@@ -451,14 +460,14 @@
 			'pg_dump',
 			'--format' => 'directory',
 			'--file' => "$tempdir/defaults_dir_format",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--format' => 'directory',
 			'--file' => "$tempdir/defaults_dir_format.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/defaults_dir_format",
 		],
 		command_like => {
@@ -484,13 +493,13 @@
 			'--format' => 'directory',
 			'--jobs' => 2,
 			'--file' => "$tempdir/defaults_parallel",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--file' => "$tempdir/defaults_parallel.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/defaults_parallel",
 		],
 	},
@@ -502,14 +511,14 @@
 			'pg_dump',
 			'--format' => 'tar',
 			'--file' => "$tempdir/defaults_tar_format.tar",
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--format' => 'tar',
 			'--file' => "$tempdir/defaults_tar_format.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/defaults_tar_format.tar",
 		],
 	},
@@ -518,7 +527,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/exclude_dump_test_schema.sql",
 			'--exclude-schema' => 'dump_test',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -527,7 +536,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/exclude_test_table.sql",
 			'--exclude-table' => 'dump_test.test_table',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -536,7 +545,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/exclude_measurement.sql",
 			'--exclude-table-and-children' => 'dump_test.measurement',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -546,7 +555,7 @@
 			'--file' => "$tempdir/exclude_measurement_data.sql",
 			'--exclude-table-data-and-children' => 'dump_test.measurement',
 			'--no-unlogged-table-data',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -556,7 +565,7 @@
 			'--file' => "$tempdir/exclude_test_table_data.sql",
 			'--exclude-table-data' => 'dump_test.test_table',
 			'--no-unlogged-table-data',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -575,7 +584,7 @@
 			'--file' => "$tempdir/pg_dumpall_globals.sql",
 			'--globals-only',
 			'--no-sync',
-			'--with-statistics',
+			'--statistics',
 		],
 	},
 	pg_dumpall_globals_clean => {
@@ -585,14 +594,14 @@
 			'--globals-only',
 			'--clean',
 			'--no-sync',
-			'--with-statistics',
+			'--statistics',
 		],
 	},
 	pg_dumpall_dbprivs => {
 		dump_cmd => [
 			'pg_dumpall', '--no-sync',
 			'--file' => "$tempdir/pg_dumpall_dbprivs.sql",
-			'--with-statistics',
+			'--statistics',
 		],
 	},
 	pg_dumpall_exclude => {
@@ -602,7 +611,7 @@
 			'--file' => "$tempdir/pg_dumpall_exclude.sql",
 			'--exclude-database' => '*dump_test*',
 			'--no-sync',
-			'--with-statistics',
+			'--statistics',
 		],
 	},
 	no_toast_compression => {
@@ -610,7 +619,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_toast_compression.sql",
 			'--no-toast-compression',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -619,7 +628,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_large_objects.sql",
 			'--no-large-objects',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -628,16 +637,33 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_policies.sql",
 			'--no-policies',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
+	no_policies_restore => {
+		dump_cmd => [
+			'pg_dump', '--no-sync',
+			'--format' => 'custom',
+			'--file' => "$tempdir/no_policies_restore.dump",
+			'--statistics',
+			'postgres',
+		],
+		restore_cmd => [
+			'pg_restore',
+			'--format' => 'custom',
+			'--file' => "$tempdir/no_policies_restore.sql",
+			'--no-policies',
+			'--statistics',
+			"$tempdir/no_policies_restore.dump",
+		],
+	},
 	no_privs => {
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_privs.sql",
 			'--no-privileges',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -646,16 +672,42 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_owner.sql",
 			'--no-owner',
-			'--with-statistics',
+			'--statistics',
+			'postgres',
+		],
+	},
+	no_subscriptions => {
+		dump_cmd => [
+			'pg_dump', '--no-sync',
+			'--file' => "$tempdir/no_subscriptions.sql",
+			'--no-subscriptions',
+			'--statistics',
 			'postgres',
 		],
 	},
+	no_subscriptions_restore => {
+		dump_cmd => [
+			'pg_dump', '--no-sync',
+			'--format' => 'custom',
+			'--file' => "$tempdir/no_subscriptions_restore.dump",
+			'--statistics',
+			'postgres',
+		],
+		restore_cmd => [
+			'pg_restore',
+			'--format' => 'custom',
+			'--file' => "$tempdir/no_subscriptions_restore.sql",
+			'--no-subscriptions',
+			'--statistics',
+			"$tempdir/no_subscriptions_restore.dump",
+		],
+	},
 	no_table_access_method => {
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/no_table_access_method.sql",
 			'--no-table-access-method',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -664,7 +716,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/only_dump_test_schema.sql",
 			'--schema' => 'dump_test',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -675,7 +727,7 @@
 			'--table' => 'dump_test.test_table',
 			'--lock-wait-timeout' =>
 			  (1000 * $PostgreSQL::Test::Utils::timeout_default),
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -686,7 +738,7 @@
 			'--table-and-children' => 'dump_test.measurement',
 			'--lock-wait-timeout' =>
 			  (1000 * $PostgreSQL::Test::Utils::timeout_default),
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -696,7 +748,7 @@
 			'--file' => "$tempdir/role.sql",
 			'--role' => 'regress_dump_test_role',
 			'--schema' => 'dump_test_second_schema',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -709,13 +761,13 @@
 			'--file' => "$tempdir/role_parallel",
 			'--role' => 'regress_dump_test_role',
 			'--schema' => 'dump_test_second_schema',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 		restore_cmd => [
 			'pg_restore',
 			'--file' => "$tempdir/role_parallel.sql",
-			'--with-statistics',
+			'--statistics',
 			"$tempdir/role_parallel",
 		],
 	},
@@ -744,7 +796,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/section_pre_data.sql",
 			'--section' => 'pre-data',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -753,7 +805,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/section_data.sql",
 			'--section' => 'data',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -762,7 +814,7 @@
 			'pg_dump', '--no-sync',
 			'--file' => "$tempdir/section_post_data.sql",
 			'--section' => 'post-data',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -773,7 +825,7 @@
 			'--schema' => 'dump_test',
 			'--large-objects',
 			'--no-large-objects',
-			'--with-statistics',
+			'--statistics',
 			'postgres',
 		],
 	},
@@ -789,7 +841,7 @@
 			'pg_dump', '--no-sync',
 			"--file=$tempdir/no_data_no_schema.sql", '--no-data',
 			'--no-schema', 'postgres',
-			'--with-statistics',
+			'--statistics',
 		],
 	},
 	statistics_only => {
@@ -799,18 +851,11 @@
 			'postgres',
 		],
 	},
-	schema_only_with_statistics => {
-		dump_cmd => [
-			'pg_dump', '--no-sync',
-			"--file=$tempdir/schema_only_with_statistics.sql",
-			'--schema-only', '--with-statistics', 'postgres',
-		],
-	},
 	no_schema => {
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			"--file=$tempdir/no_schema.sql", '--no-schema',
-			'--with-statistics', 'postgres',
+			'--statistics', 'postgres',
 		],
 	},);
 
@@ -878,8 +923,11 @@
 	no_large_objects => 1,
 	no_owner => 1,
 	no_policies => 1,
+	no_policies_restore => 1,
 	no_privs => 1,
 	no_statistics => 1,
+	no_subscriptions => 1,
+	no_subscriptions_restore => 1,
 	no_table_access_method => 1,
 	pg_dumpall_dbprivs => 1,
 	pg_dumpall_exclude => 1,
@@ -888,6 +936,16 @@
 
 # This is where the actual tests are defined.
 my %tests = (
+	'restrict' => {
+		all_runs => 1,
+		regexp => qr/^\\restrict [a-zA-Z0-9]+$/m,
+	},
+
+	'unrestrict' => {
+		all_runs => 1,
+		regexp => qr/^\\unrestrict [a-zA-Z0-9]+$/m,
+	},
+
 	'ALTER DEFAULT PRIVILEGES FOR ROLE regress_dump_test_role GRANT' => {
 		create_order => 14,
 		create_sql   => 'ALTER DEFAULT PRIVILEGES
@@ -1278,6 +1336,43 @@
 		},
 	},
 
+	'CONSTRAINT NOT NULL / NO INHERIT' => {
+		create_sql => 'CREATE TABLE dump_test.test_table_nonn (
+		col1 int NOT NULL NO INHERIT,
+		col2 int);
+		CREATE TABLE dump_test.test_table_nonn_chld1 (
+		   CONSTRAINT nn NOT NULL col2 NO INHERIT)
+		INHERITS (dump_test.test_table_nonn); ',
+		regexp => qr/^
+			\QCREATE TABLE dump_test.test_table_nonn (\E \n^\s+
+			\Qcol1 integer NOT NULL NO INHERIT\E
+			/xm,
+		like => {
+			%full_runs, %dump_test_schema_runs,
+			section_pre_data => 1,
+			binary_upgrade => 1,
+		},
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_measurement => 1,
+		},
+	},
+
+	'CONSTRAINT NOT NULL / NO INHERIT (child1)' => {
+		regexp => qr/^
+			\QCREATE TABLE dump_test.test_table_nonn_chld1 (\E \n^\s+
+			\QCONSTRAINT nn NOT NULL col2 NO INHERIT\E
+			/xm,
+		like => {
+			%full_runs, %dump_test_schema_runs, section_pre_data => 1,
+		},
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_measurement => 1,
+			binary_upgrade => 1,
+		},
+	},
+
 	'CONSTRAINT PRIMARY KEY / WITHOUT OVERLAPS' => {
 		create_sql => 'CREATE TABLE dump_test.test_table_tpk (
 							col1 int4range,
@@ -1508,6 +1603,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -1826,6 +1922,27 @@
 		},
 	},
 
+	'COMMENT ON POLICY p1' => {
+		create_order => 55,
+		create_sql => 'COMMENT ON POLICY p1 ON dump_test.test_table
+					   IS \'comment on policy\';',
+		regexp =>
+		  qr/^COMMENT ON POLICY p1 ON dump_test.test_table IS 'comment on policy';/m,
+		like => {
+			%full_runs,
+			%dump_test_schema_runs,
+			only_dump_test_table => 1,
+			section_post_data => 1,
+		},
+		unlike => {
+			exclude_dump_test_schema => 1,
+			exclude_test_table => 1,
+			no_policies => 1,
+			no_policies_restore => 1,
+			only_dump_measurement => 1,
+		},
+	},
+
 	'COMMENT ON PUBLICATION pub1' => {
 		create_order => 55,
 		create_sql   => 'COMMENT ON PUBLICATION pub1
@@ -1842,6 +1959,10 @@
 		regexp =>
 		  qr/^COMMENT ON SUBSCRIPTION sub1 IS 'comment on subscription';/m,
 		like => { %full_runs, section_post_data => 1, },
+		unlike => {
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
+		},
 	},
 
 	'COMMENT ON TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1' => {
@@ -2230,6 +2351,27 @@
 		},
 	},
 
+	'newline of role or table name in comment' => {
+		create_sql => qq{CREATE ROLE regress_newline;
+						 ALTER ROLE regress_newline SET enable_seqscan = off;
+						 ALTER ROLE regress_newline
+							RENAME TO "regress_newline\nattack";
+
+						 -- meet getPartitioningInfo() "unsafe" condition
+						 CREATE TYPE pp_colors AS
+							ENUM ('green', 'blue', 'black');
+						 CREATE TABLE pp_enumpart (a pp_colors)
+							PARTITION BY HASH (a);
+						 CREATE TABLE pp_enumpart1 PARTITION OF pp_enumpart
+							FOR VALUES WITH (MODULUS 2, REMAINDER 0);
+						 CREATE TABLE pp_enumpart2 PARTITION OF pp_enumpart
+							FOR VALUES WITH (MODULUS 2, REMAINDER 1);
+						 ALTER TABLE pp_enumpart
+							RENAME TO "pp_enumpart\nattack";},
+		regexp => qr/\n--[^\n]*\nattack/s,
+		like => {},
+	},
+
 	'CREATE TABLESPACE regress_dump_tablespace' => {
 		create_order => 2,
 		create_sql => q(
@@ -2377,17 +2519,19 @@
 		create_sql   => 'CREATE DOMAIN dump_test.us_postal_code AS TEXT
 		               COLLATE "C"
 					   DEFAULT \'10014\'
+					   CONSTRAINT nn NOT NULL
 					   CHECK(VALUE ~ \'^\d{5}$\' OR
 							 VALUE ~ \'^\d{5}-\d{4}$\');
+					   COMMENT ON CONSTRAINT nn
+						 ON DOMAIN dump_test.us_postal_code IS \'not null\';
 					   COMMENT ON CONSTRAINT us_postal_code_check
 						 ON DOMAIN dump_test.us_postal_code IS \'check it\';',
 		regexp => qr/^
-			\QCREATE DOMAIN dump_test.us_postal_code AS text COLLATE pg_catalog."C" DEFAULT '10014'::text\E\n\s+
+			\QCREATE DOMAIN dump_test.us_postal_code AS text COLLATE pg_catalog."C" CONSTRAINT nn NOT NULL DEFAULT '10014'::text\E\n\s+
 			\QCONSTRAINT us_postal_code_check CHECK \E
 			\Q(((VALUE ~ '^\d{5}\E
 			\$\Q'::text) OR (VALUE ~ '^\d{5}-\d{4}\E\$
 			\Q'::text)));\E(.|\n)*
-			\QCOMMENT ON CONSTRAINT us_postal_code_check ON DOMAIN dump_test.us_postal_code IS 'check it';\E
 			/xm,
 		like =>
 		  { %full_runs, %dump_test_schema_runs, section_pre_data => 1, },
@@ -2397,6 +2541,30 @@
 		},
 	},
 
+	'COMMENT ON CONSTRAINT ON DOMAIN (1)' => {
+		regexp => qr/^
+		\QCOMMENT ON CONSTRAINT nn ON DOMAIN dump_test.us_postal_code IS 'not null';\E
+		/xm,
+		like =>
+		  { %full_runs, %dump_test_schema_runs, section_pre_data => 1, },
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_measurement => 1,
+		},
+	},
+
+	'COMMENT ON CONSTRAINT ON DOMAIN (2)' => {
+		regexp => qr/^
+		\QCOMMENT ON CONSTRAINT us_postal_code_check ON DOMAIN dump_test.us_postal_code IS 'check it';\E
+		/xm,
+		like =>
+		  { %full_runs, %dump_test_schema_runs, section_pre_data => 1, },
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_measurement => 1,
+		},
+	},
+
 	'CREATE FUNCTION dump_test.pltestlang_call_handler' => {
 		create_order => 17,
 		create_sql   => 'CREATE FUNCTION dump_test.pltestlang_call_handler()
@@ -3121,6 +3289,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3143,6 +3312,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3165,6 +3335,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3187,6 +3358,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3209,6 +3381,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3231,6 +3404,7 @@
 			exclude_dump_test_schema => 1,
 			exclude_test_table => 1,
 			no_policies => 1,
+			no_policies_restore => 1,
 			only_dump_measurement => 1,
 		},
 	},
@@ -3292,6 +3466,10 @@
 			\QCREATE SUBSCRIPTION sub1 CONNECTION 'dbname=doesnotexist' PUBLICATION pub1 WITH (connect = false, slot_name = 'sub1', streaming = parallel);\E
 			/xm,
 		like => { %full_runs, section_post_data => 1, },
+		unlike => {
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
+		},
 	},
 
 	'CREATE SUBSCRIPTION sub2' => {
@@ -3303,6 +3481,10 @@
 			\QCREATE SUBSCRIPTION sub2 CONNECTION 'dbname=doesnotexist' PUBLICATION pub1 WITH (connect = false, slot_name = 'sub2', streaming = off, origin = none);\E
 			/xm,
 		like => { %full_runs, section_post_data => 1, },
+		unlike => {
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
+		},
 	},
 
 	'CREATE SUBSCRIPTION sub3' => {
@@ -3314,6 +3496,10 @@
 			\QCREATE SUBSCRIPTION sub3 CONNECTION 'dbname=doesnotexist' PUBLICATION pub1 WITH (connect = false, slot_name = 'sub3', streaming = on);\E
 			/xm,
 		like => { %full_runs, section_post_data => 1, },
+		unlike => {
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
+		},
 	},
 
 
@@ -4178,8 +4364,7 @@
 	},
 
 	'ALTER TABLE measurement PRIMARY KEY' => {
-		all_runs     => 1,
-		catch_all    => 'CREATE ... commands',
+		catch_all => 'CREATE ... commands',
 		create_order => 93,
 		create_sql =>
 		  'ALTER TABLE dump_test.measurement ADD PRIMARY KEY (city_id, logdate);',
@@ -4230,7 +4415,6 @@
 	},
 
 	'ALTER INDEX ... ATTACH PARTITION (primary key)' => {
-		all_runs  => 1,
 		catch_all => 'CREATE ... commands',
 		regexp    => qr/^
 		\QALTER INDEX dump_test.measurement_pkey ATTACH PARTITION dump_test_second_schema.measurement_y2006m2_pkey\E
@@ -5160,6 +5344,17 @@
 	qr/\Qpg_dump: error: no matching schemas were found for pattern\E/,
 	'no matching schemas');
 
+command_fails_like(
+	[
+		'pg_dump',
+		'--port' => $port,
+		'--strict-names',
+		'--schema-only',
+		'--statistics',
+	],
+	qr/\Qpg_dump: error: options -s\/--schema-only and --statistics cannot be used together\E/,
+	'cannot use --schema-only and --statistics together');
+
 command_fails_like(
 	[
 		'pg_dump',
@@ -5187,7 +5382,12 @@
 # Test dumping pg_catalog (for research -- cannot be reloaded)
 
 $node->command_ok(
-	[ 'pg_dump', '--port' => $port, '--schema' => 'pg_catalog' ],
+	[
+		'pg_dump',
+		'--port' => $port,
+		'--schema' => 'pg_catalog',
+		'--file' => "$tempdir/pgdump_pgcatalog.dmp"
+	],
 	'pg_dump: option -n pg_catalog');
 
 #########################################
@@ -5197,7 +5397,8 @@
 	[
 		'pg_dumpall',
 		'--port' => $port,
-		'--exclude-database' => '"myhost.mydb"'
+		'--exclude-database' => '"myhost.mydb"',
+		'--file' => "$tempdir/pgdumpall.dmp"
 	],
 	'pg_dumpall: option --exclude-database handles database names with embedded dots'
 );
@@ -5346,9 +5547,10 @@
 
 		# Check for proper test definitions
 		#
-		# There should be a "like" list, even if it is empty.  (This
-		# makes the test more self-documenting.)
-		if (!defined($tests{$test}->{like}))
+		# Either "all_runs" should be set or there should be a "like" list,
+		# even if it is empty.  (This makes the test more self-documenting.)
+		if (!defined($tests{$test}->{all_runs})
+			&& !defined($tests{$test}->{like}))
 		{
 			die "missing \"like\" in test \"$test\"";
 		}
@@ -5384,9 +5586,10 @@
 			next;
 		}
 
-		# Run the test listed as a like, unless it is specifically noted
-		# as an unlike (generally due to an explicit exclusion or similar).
-		if ($tests{$test}->{like}->{$test_key}
+		# Run the test if all_runs is set or if listed as a like, unless it is
+		# specifically noted as an unlike (generally due to an explicit
+		# exclusion or similar).
+		if (($tests{$test}->{like}->{$test_key} || $tests{$test}->{all_runs})
 			&& !defined($tests{$test}->{unlike}->{$test_key}))
 		{
 			if (!ok($output_file =~ $tests{$test}->{regexp},
diff --git a/src/bin/pg_dump/t/003_pg_dump_with_server.pl b/src/bin/pg_dump/t/003_pg_dump_with_server.pl
index 8dc014ed6ed..c83d3899dfb 100644
--- a/src/bin/pg_dump/t/003_pg_dump_with_server.pl
+++ b/src/bin/pg_dump/t/003_pg_dump_with_server.pl
@@ -16,6 +16,22 @@
 $node->init;
 $node->start;
 
+#########################################
+# pg_dumpall: newline in database name
+
+$node->safe_psql('postgres', qq{CREATE DATABASE "regress_\nattack"});
+
+my (@cmd, $stdout, $stderr);
+@cmd = ("pg_dumpall", '--port' => $port, '--exclude-database=postgres');
+print("# Running: " . join(" ", @cmd) . "\n");
+my $result = IPC::Run::run \@cmd, '>' => \$stdout, '2>' => \$stderr;
+ok(!$result, "newline in dbname: exit code not 0");
+like(
+	$stderr,
+	qr/shell command argument contains a newline/,
+	"newline in dbname: stderr matches");
+unlike($stdout, qr/^attack/m, "newline in dbname: no comment escape");
+
 #########################################
 # Verify that dumping foreign data includes only foreign tables of
 # matching servers
diff --git a/src/bin/pg_dump/t/005_pg_dump_filterfile.pl b/src/bin/pg_dump/t/005_pg_dump_filterfile.pl
index f05e8a20e05..f38fc411084 100644
--- a/src/bin/pg_dump/t/005_pg_dump_filterfile.pl
+++ b/src/bin/pg_dump/t/005_pg_dump_filterfile.pl
@@ -418,10 +418,16 @@
 	qr/invalid filter command/,
 	"invalid syntax: incorrect filter command");
 
-# Test invalid object type
+# Test invalid object type.
+#
+# This test also verifies that keywords are correctly recognized as strings of
+# non-whitespace characters. If the parser incorrectly treats non-whitespace
+# delimiters (like hyphens) as keyword boundaries, "table-data" might be
+# misread as the valid object type "table". To catch such issues,
+# "table-data" is used here as an intentionally invalid object type.
 open $inputfile, '>', "$tempdir/inputfile.txt"
   or die "unable to open filterfile for writing";
-print $inputfile "include xxx";
+print $inputfile "exclude table-data one";
 close $inputfile;
 
 command_fails_like(
@@ -432,8 +438,8 @@
 		'--filter' => "$tempdir/inputfile.txt",
 		'postgres'
 	],
-	qr/unsupported filter object type: "xxx"/,
-	"invalid syntax: invalid object type specified, should be table, schema, foreign_data or data"
+	qr/unsupported filter object type: "table-data"/,
+	"invalid syntax: invalid object type specified"
 );
 
 # Test missing object identifier pattern
@@ -534,7 +540,7 @@
 ok($dump !~ qr/^\\connect postgres/m, "database postgres is not dumped");
 ok($dump =~ qr/^\\connect template1/m, "database template1 is dumped");
 
-# Make sure this option dont break the existing limitation of using
+# Make sure this option doesn't break the existing limitation of using
 # --globals-only with exclusions
 command_fails_like(
 	[
diff --git a/src/bin/pg_dump/t/006_pg_dumpall.pl b/src/bin/pg_dump/t/006_pg_dumpall.pl
deleted file mode 100644
index c274b777586..00000000000
--- a/src/bin/pg_dump/t/006_pg_dumpall.pl
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright (c) 2021-2025, PostgreSQL Global Development Group
-
-use strict;
-use warnings FATAL => 'all';
-
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $tempdir = PostgreSQL::Test::Utils::tempdir;
-my $run_db = 'postgres';
-my $sep = $windows_os ? "\\" : "/";
-
-# Tablespace locations used by "restore_tablespace" test case.
-my $tablespace1 = "${tempdir}${sep}tbl1";
-my $tablespace2 = "${tempdir}${sep}tbl2";
-mkdir($tablespace1) || die "mkdir $tablespace1 $!";
-mkdir($tablespace2) || die "mkdir $tablespace2 $!";
-
-# Scape tablespace locations on Windows.
-$tablespace1 = $windows_os ? ($tablespace1 =~ s/\\/\\\\/gr) : $tablespace1;
-$tablespace2 = $windows_os ? ($tablespace2 =~ s/\\/\\\\/gr) : $tablespace2;
-
-# Where pg_dumpall will be executed.
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-
-###############################################################
-# Definition of the pg_dumpall test cases to run.
-#
-# Each of these test cases are named and those names are used for fail
-# reporting and also to save the dump and restore information needed for the
-# test to assert.
-#
-# The "setup_sql" is a psql valid script that contains SQL commands to execute
-# before of actually execute the tests. The setups are all executed before of
-# any test execution.
-#
-# The "dump_cmd" and "restore_cmd" are the commands that will be executed. The
-# "restore_cmd" must have the --file flag to save the restore output so that we
-# can assert on it.
-#
-# The "like" and "unlike" is a regexp that is used to match the pg_restore
-# output. It must have at least one of then filled per test cases but it also
-# can have both. See "excluding_databases" test case for example.
-my %pgdumpall_runs = (
-	restore_roles => {
-		setup_sql => '
-		CREATE ROLE dumpall WITH ENCRYPTED PASSWORD \'admin\' SUPERUSER;
-		CREATE ROLE dumpall2 WITH REPLICATION CONNECTION LIMIT 10;',
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_roles",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_roles.sql",
-			"$tempdir/restore_roles",
-		],
-		like => qr/
-			^\s*\QCREATE ROLE dumpall;\E\s*\n
-			\s*\QALTER ROLE dumpall WITH SUPERUSER INHERIT NOCREATEROLE NOCREATEDB NOLOGIN NOREPLICATION NOBYPASSRLS PASSWORD 'SCRAM-SHA-256\E
-			[^']+';\s*\n
-			\s*\QCREATE ROLE dumpall2;\E
-			\s*\QALTER ROLE dumpall2 WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB NOLOGIN REPLICATION NOBYPASSRLS CONNECTION LIMIT 10;\E
-		/xm
-	},
-
-	restore_tablespace => {
-		setup_sql => "
-		CREATE ROLE tap;
-		CREATE TABLESPACE tbl1 OWNER tap LOCATION '$tablespace1';
-		CREATE TABLESPACE tbl2 OWNER tap LOCATION '$tablespace2' WITH (seq_page_cost=1.0);",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_tablespace",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_tablespace.sql",
-			"$tempdir/restore_tablespace",
-		],
-		# Match "E" as optional since it is added on LOCATION when running on
-		# Windows.
-		like => qr/^
-			\n\QCREATE TABLESPACE tbl1 OWNER tap LOCATION \E(?:E)?\Q'$tablespace1';\E
-			\n\QCREATE TABLESPACE tbl2 OWNER tap LOCATION \E(?:E)?\Q'$tablespace2';\E
-			\n\QALTER TABLESPACE tbl2 SET (seq_page_cost=1.0);\E
-		/xm,
-	},
-
-	restore_grants => {
-		setup_sql => "
-		CREATE DATABASE tapgrantsdb;
-		CREATE SCHEMA private;
-		CREATE SEQUENCE serial START 101;
-		CREATE FUNCTION fn() RETURNS void AS \$\$
-		BEGIN
-		END;
-		\$\$ LANGUAGE plpgsql;
-		CREATE ROLE super;
-		CREATE ROLE grant1;
-		CREATE ROLE grant2;
-		CREATE ROLE grant3;
-		CREATE ROLE grant4;
-		CREATE ROLE grant5;
-		CREATE ROLE grant6;
-		CREATE ROLE grant7;
-		CREATE ROLE grant8;
-
-		CREATE TABLE t (id int);
-		INSERT INTO t VALUES (1), (2), (3), (4);
-
-		GRANT SELECT ON TABLE t TO grant1;
-		GRANT INSERT ON TABLE t TO grant2;
-		GRANT ALL PRIVILEGES ON TABLE t to grant3;
-		GRANT CONNECT, CREATE ON DATABASE tapgrantsdb TO grant4;
-		GRANT USAGE, CREATE ON SCHEMA private TO grant5;
-		GRANT USAGE, SELECT, UPDATE ON SEQUENCE serial TO grant6;
-		GRANT super TO grant7;
-		GRANT EXECUTE ON FUNCTION fn() TO grant8;
-		",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_grants",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'directory',
-			'--file' => "$tempdir/restore_grants.sql",
-			"$tempdir/restore_grants",
-		],
-		like => qr/^
-			\n\QGRANT super TO grant7 WITH INHERIT TRUE GRANTED BY\E
-			(.*\n)*
-			\n\QGRANT ALL ON SCHEMA private TO grant5;\E
-			(.*\n)*
-			\n\QGRANT ALL ON FUNCTION public.fn() TO grant8;\E
-			(.*\n)*
-			\n\QGRANT ALL ON SEQUENCE public.serial TO grant6;\E
-			(.*\n)*
-			\n\QGRANT SELECT ON TABLE public.t TO grant1;\E
-			\n\QGRANT INSERT ON TABLE public.t TO grant2;\E
-			\n\QGRANT ALL ON TABLE public.t TO grant3;\E
-			(.*\n)*
-			\n\QGRANT CREATE,CONNECT ON DATABASE tapgrantsdb TO grant4;\E
-		/xm,
-	},
-
-	excluding_databases => {
-		setup_sql => 'CREATE DATABASE db1;
-		\c db1
-		CREATE TABLE t1 (id int);
-		INSERT INTO t1 VALUES (1), (2), (3), (4);
-		CREATE TABLE t2 (id int);
-		INSERT INTO t2 VALUES (1), (2), (3), (4);
-
-		CREATE DATABASE db2;
-		\c db2
-		CREATE TABLE t3 (id int);
-		INSERT INTO t3 VALUES (1), (2), (3), (4);
-		CREATE TABLE t4 (id int);
-		INSERT INTO t4 VALUES (1), (2), (3), (4);
-
-		CREATE DATABASE dbex3;
-		\c dbex3
-		CREATE TABLE t5 (id int);
-		INSERT INTO t5 VALUES (1), (2), (3), (4);
-		CREATE TABLE t6 (id int);
-		INSERT INTO t6 VALUES (1), (2), (3), (4);
-
-		CREATE DATABASE dbex4;
-		\c dbex4
-		CREATE TABLE t7 (id int);
-		INSERT INTO t7 VALUES (1), (2), (3), (4);
-		CREATE TABLE t8 (id int);
-		INSERT INTO t8 VALUES (1), (2), (3), (4);
-
-		CREATE DATABASE db5;
-		\c db5
-		CREATE TABLE t9 (id int);
-		INSERT INTO t9 VALUES (1), (2), (3), (4);
-		CREATE TABLE t10 (id int);
-		INSERT INTO t10 VALUES (1), (2), (3), (4);
-		',
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--file' => "$tempdir/excluding_databases",
-			'--exclude-database' => 'dbex*',
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'directory',
-			'--file' => "$tempdir/excluding_databases.sql",
-			'--exclude-database' => 'db5',
-			"$tempdir/excluding_databases",
-		],
-		like => qr/^
-			\n\QCREATE DATABASE db1\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t1 (\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t2 (\E
-			(.*\n)*
-			\n\QCREATE DATABASE db2\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t3 (\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t4 (/xm,
-		unlike => qr/^
-			\n\QCREATE DATABASE db3\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t5 (\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t6 (\E
-			(.*\n)*
-			\n\QCREATE DATABASE db4\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t7 (\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t8 (\E
-			\n\QCREATE DATABASE db5\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t9 (\E
-			(.*\n)*
-			\n\QCREATE TABLE public.t10 (\E
-		/xm,
-	},
-
-	format_directory => {
-		setup_sql => "CREATE TABLE format_directory(a int, b boolean, c text);
-		INSERT INTO format_directory VALUES (1, true, 'name1'), (2, false, 'name2');",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--file' => "$tempdir/format_directory",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'directory',
-			'--file' => "$tempdir/format_directory.sql",
-			"$tempdir/format_directory",
-		],
-		like => qr/^\n\QCOPY public.format_directory (a, b, c) FROM stdin;/xm
-	},
-
-	format_tar => {
-		setup_sql => "CREATE TABLE format_tar(a int, b boolean, c text);
-		INSERT INTO format_tar VALUES (1, false, 'name3'), (2, true, 'name4');",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'tar',
-			'--file' => "$tempdir/format_tar",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'tar',
-			'--file' => "$tempdir/format_tar.sql",
-			"$tempdir/format_tar",
-		],
-		like => qr/^\n\QCOPY public.format_tar (a, b, c) FROM stdin;/xm
-	},
-
-	format_custom => {
-		setup_sql => "CREATE TABLE format_custom(a int, b boolean, c text);
-		INSERT INTO format_custom VALUES (1, false, 'name5'), (2, true, 'name6');",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'custom',
-			'--file' => "$tempdir/format_custom",
-		],
-		restore_cmd => [
-			'pg_restore', '-C',
-			'--format' => 'custom',
-			'--file' => "$tempdir/format_custom.sql",
-			"$tempdir/format_custom",
-		],
-		like => qr/^ \n\QCOPY public.format_custom (a, b, c) FROM stdin;/xm
-	},
-
-	dump_globals_only => {
-		setup_sql => "CREATE TABLE format_dir(a int, b boolean, c text);
-		INSERT INTO format_dir VALUES (1, false, 'name5'), (2, true, 'name6');",
-		dump_cmd => [
-			'pg_dumpall',
-			'--format' => 'directory',
-			'--globals-only',
-			'--file' => "$tempdir/dump_globals_only",
-		],
-		restore_cmd => [
-			'pg_restore', '-C', '--globals-only',
-			'--format' => 'directory',
-			'--file' => "$tempdir/dump_globals_only.sql",
-			"$tempdir/dump_globals_only",
-		],
-		like => qr/
-            ^\s*\QCREATE ROLE dumpall;\E\s*\n
-			/xm
-	},);
-
-# First execute the setup_sql
-foreach my $run (sort keys %pgdumpall_runs)
-{
-	if ($pgdumpall_runs{$run}->{setup_sql})
-	{
-		$node->safe_psql($run_db, $pgdumpall_runs{$run}->{setup_sql});
-	}
-}
-
-# Execute the tests
-foreach my $run (sort keys %pgdumpall_runs)
-{
-	# Create a new target cluster to pg_restore each test case run so that we
-	# don't need to take care of the cleanup from the target cluster after each
-	# run.
-	my $target_node = PostgreSQL::Test::Cluster->new("target_$run");
-	$target_node->init;
-	$target_node->start;
-
-	# Dumpall from node cluster.
-	$node->command_ok(\@{ $pgdumpall_runs{$run}->{dump_cmd} },
-		"$run: pg_dumpall runs");
-
-	# Restore the dump on "target_node" cluster.
-	my @restore_cmd = (
-		@{ $pgdumpall_runs{$run}->{restore_cmd} },
-		'--host', $target_node->host, '--port', $target_node->port);
-
-	my ($stdout, $stderr) = run_command(\@restore_cmd);
-
-	# pg_restore --file output file.
-	my $output_file = slurp_file("$tempdir/${run}.sql");
-
-	if (   !($pgdumpall_runs{$run}->{like})
-		&& !($pgdumpall_runs{$run}->{unlike}))
-	{
-		die "missing \"like\" or \"unlike\" in test \"$run\"";
-	}
-
-	if ($pgdumpall_runs{$run}->{like})
-	{
-		like($output_file, $pgdumpall_runs{$run}->{like}, "should dump $run");
-	}
-
-	if ($pgdumpall_runs{$run}->{unlike})
-	{
-		unlike(
-			$output_file,
-			$pgdumpall_runs{$run}->{unlike},
-			"should not dump $run");
-	}
-}
-
-# Some negative test case with dump of pg_dumpall and restore using pg_restore
-# test case 1: when -C is not used in pg_restore with dump of pg_dumpall
-$node->command_fails_like(
-	[
-		'pg_restore',
-		"$tempdir/format_custom",
-		'--format' => 'custom',
-		'--file' => "$tempdir/error_test.sql",
-	],
-	qr/\Qpg_restore: error: option -C\/--create must be specified when restoring an archive created by pg_dumpall\E/,
-	'When -C is not used in pg_restore with dump of pg_dumpall');
-
-# test case 2: When --list option is used with dump of pg_dumpall
-$node->command_fails_like(
-	[
-		'pg_restore',
-		"$tempdir/format_custom", '-C',
-		'--format' => 'custom',
-		'--list',
-		'--file' => "$tempdir/error_test.sql",
-	],
-	qr/\Qpg_restore: error: option -l\/--list cannot be used when restoring an archive created by pg_dumpall\E/,
-	'When --list is used in pg_restore with dump of pg_dumpall');
-
-# test case 3: When non-exist database is given with -d option
-$node->command_fails_like(
-	[
-		'pg_restore',
-		"$tempdir/format_custom", '-C',
-		'--format' => 'custom',
-		'-d' => 'dbpq',
-	],
-	qr/\Qpg_restore: error: could not connect to database "dbpq"\E/,
-	'When non-existent database is given with -d option in pg_restore with dump of pg_dumpall'
-);
-
-$node->stop('fast');
-
-done_testing();
diff --git a/src/bin/pg_dump/t/010_dump_connstr.pl b/src/bin/pg_dump/t/010_dump_connstr.pl
index 055a9abd249..2738f3ae134 100644
--- a/src/bin/pg_dump/t/010_dump_connstr.pl
+++ b/src/bin/pg_dump/t/010_dump_connstr.pl
@@ -1,5 +1,5 @@
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 use strict;
diff --git a/src/bin/pg_dump/t/oracle/001_pg_dump_ora_specific.pl b/src/bin/pg_dump/t/oracle/001_pg_dump_ora_specific.pl
index c2a1cdbf2c5..db9e8ead2f6 100644
--- a/src/bin/pg_dump/t/oracle/001_pg_dump_ora_specific.pl
+++ b/src/bin/pg_dump/t/oracle/001_pg_dump_ora_specific.pl
@@ -1,6 +1,6 @@
 
 # Copyright (c) 2021-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/src/bin/pg_resetwal/Makefile b/src/bin/pg_resetwal/Makefile
index bc7dc30f967..47f7211b74f 100644
--- a/src/bin/pg_resetwal/Makefile
+++ b/src/bin/pg_resetwal/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_resetwal
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 1998-2025, PostgreSQL Global Development Group
 #
 # src/bin/pg_resetwal/Makefile
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index 110b1ff9c96..535be441d7a 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -21,7 +21,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/pg_resetwal/pg_resetwal.c
  *
@@ -71,8 +71,10 @@ static TransactionId set_xid = 0;
 static TransactionId set_oldest_commit_ts_xid = 0;
 static TransactionId set_newest_commit_ts_xid = 0;
 static Oid	set_oid = 0;
+static bool mxid_given = false;
 static MultiXactId set_mxid = 0;
-static MultiXactOffset set_mxoff = (MultiXactOffset) -1;
+static bool mxoff_given = false;
+static MultiXactOffset set_mxoff = 0;
 static TimeLineID minXlogTli = 0;
 static XLogSegNo minXlogSegNo = 0;
 static int	WalSegSz;
@@ -120,6 +122,7 @@ main(int argc, char *argv[])
 	MultiXactId set_oldestmxid = 0;
 	char	   *endptr;
 	char	   *endptr2;
+	int64		tmpi64;
 	char	   *DataDir = NULL;
 	char	   *log_fname = NULL;
 	int			fd;
@@ -257,8 +260,6 @@ main(int argc, char *argv[])
 					pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 					exit(1);
 				}
-				if (set_mxid == 0)
-					pg_fatal("multitransaction ID (-m) must not be 0");
 
 				/*
 				 * XXX It'd be nice to have more sanity checks here, e.g. so
@@ -266,19 +267,23 @@ main(int argc, char *argv[])
 				 */
 				if (set_oldestmxid == 0)
 					pg_fatal("oldest multitransaction ID (-m) must not be 0");
+				mxid_given = true;
 				break;
 
 			case 'O':
 				errno = 0;
-				set_mxoff = strtoul(optarg, &endptr, 0);
+				tmpi64 = strtoi64(optarg, &endptr, 0);
 				if (endptr == optarg || *endptr != '\0' || errno != 0)
 				{
 					pg_log_error("invalid argument for option %s", "-O");
 					pg_log_error_hint("Try \"%s --help\" for more information.", progname);
 					exit(1);
 				}
-				if (set_mxoff == -1)
-					pg_fatal("multitransaction offset (-O) must not be -1");
+				if (tmpi64 < 0 || tmpi64 > (int64) MaxMultiXactOffset)
+					pg_fatal("multitransaction offset (-O) must be between 0 and %u", MaxMultiXactOffset);
+
+				set_mxoff = (MultiXactOffset) tmpi64;
+				mxoff_given = true;
 				break;
 
 			case 'l':
@@ -475,7 +480,7 @@ main(int argc, char *argv[])
 	if (set_oid != 0)
 		ControlFile.checkPointCopy.nextOid = set_oid;
 
-	if (set_mxid != 0)
+	if (mxid_given)
 	{
 		ControlFile.checkPointCopy.nextMulti = set_mxid;
 
@@ -485,7 +490,7 @@ main(int argc, char *argv[])
 		ControlFile.checkPointCopy.oldestMultiDB = InvalidOid;
 	}
 
-	if (set_mxoff != -1)
+	if (mxoff_given)
 		ControlFile.checkPointCopy.nextMultiOffset = set_mxoff;
 
 	if (minXlogTli > ControlFile.checkPointCopy.ThisTimeLineID)
@@ -847,7 +852,7 @@ PrintNewControlValues(void)
 				 newXlogSegNo, WalSegSz);
 	printf(_("First log segment after reset:        %s\n"), fname);
 
-	if (set_mxid != 0)
+	if (mxid_given)
 	{
 		printf(_("NextMultiXactId:                      %u\n"),
 			   ControlFile.checkPointCopy.nextMulti);
@@ -857,7 +862,7 @@ PrintNewControlValues(void)
 			   ControlFile.checkPointCopy.oldestMultiDB);
 	}
 
-	if (set_mxoff != -1)
+	if (mxoff_given)
 	{
 		printf(_("NextMultiOffset:                      %u\n"),
 			   ControlFile.checkPointCopy.nextMultiOffset);
@@ -873,6 +878,10 @@ PrintNewControlValues(void)
 	{
 		printf(_("NextXID:                              %u\n"),
 			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+	}
+
+	if (set_oldest_xid != 0)
+	{
 		printf(_("OldestXID:                            %u\n"),
 			   ControlFile.checkPointCopy.oldestXid);
 		printf(_("OldestXID's DB:                       %u\n"),
@@ -1084,6 +1093,8 @@ KillExistingArchiveStatus(void)
 
 	if (closedir(xldir))
 		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
+
+#undef ARCHSTATDIR
 }
 
 /*
@@ -1118,7 +1129,10 @@ KillExistingWALSummaries(void)
 		pg_fatal("could not read directory \"%s\": %m", WALSUMMARYDIR);
 
 	if (closedir(xldir))
-		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
+		pg_fatal("could not close directory \"%s\": %m", WALSUMMARYDIR);
+
+#undef WALSUMMARY_NHEXCHARS
+#undef WALSUMMARYDIR
 }
 
 /*
diff --git a/src/bin/pg_resetwal/po/de.po b/src/bin/pg_resetwal/po/de.po
index 28af25d939e..daead7311c3 100644
--- a/src/bin/pg_resetwal/po/de.po
+++ b/src/bin/pg_resetwal/po/de.po
@@ -1,14 +1,14 @@
 # German message translation file for pg_resetwal
-# Peter Eisentraut <peter@eisentraut.org>, 2002 - 2024.
+# Peter Eisentraut <peter@eisentraut.org>, 2002 - 2026.
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-06-16 07:51+0000\n"
-"PO-Revision-Date: 2024-03-26 11:01+0100\n"
+"POT-Creation-Date: 2026-02-04 18:51+0000\n"
+"PO-Revision-Date: 2026-02-05 14:15+0100\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "Fehler: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "Detail: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "Tipp: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht lesen: %m"
@@ -76,20 +76,20 @@ msgstr ""
 "diesem Fall wären die Ergebnisse unten falsch und die PostgreSQL-Installation\n"
 "wäre inkompatibel mit diesem Datenverzeichnis."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1172
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht öffnen: %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1180 pg_resetwal.c:1192
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schreiben: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
@@ -105,35 +105,35 @@ msgstr "Speicher aufgebraucht\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "konnte Dateisystem für Datei »%s« nicht synchronisieren: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "diese Installation unterstützt Sync-Methode »%s« nicht"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1089
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1103
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
@@ -184,152 +184,147 @@ msgid "unrecognized sync method: %s"
 msgstr "unbekannte Sync-Methode: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "ungültiges Argument für Option %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "Transaktions-ID-Epoche (-e) darf nicht -1 sein"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "älteste Transaktions-ID (-u) muss größer oder gleich %u sein"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "Transaktions-ID (-x) muss größer oder gleich %u sein"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "Transaktions-ID (-c) muss entweder %u oder größer oder gleich %u sein"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) darf nicht 0 sein"
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "Multitransaktions-ID (-m) darf nicht 0 sein"
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "älteste Multitransaktions-ID (-m) darf nicht 0 sein"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "Multitransaktions-Offset (-O) darf nicht -1 sein"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "Multitransaktions-Offset (-O) muss zwischen 0 und %u sein"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "Argument von %s muss eine Zweierpotenz zwischen 1 und 1024 sein"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "zu viele Kommandozeilenargumente (das erste ist »%s«)"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "kein Datenverzeichnis angegeben"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "kann nicht von »root« ausgeführt werden"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Sie müssen %s als PostgreSQL-Superuser ausführen."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Verzeichnis »%s« nicht lesen: %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "konnte nicht in Verzeichnis »%s« wechseln: %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "Sperrdatei »%s« existiert"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "Läuft der Server?  Wenn nicht, dann Sperrdatei löschen und nochmal versuchen."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "es wird nicht fortgefahren, weil Kontrolldateiwerte geschätzt wurden"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "Wenn diese Werte akzeptabel scheinen, dann benutzen Sie -f, um das Zurücksetzen zu erzwingen."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "Datenbankserver wurde nicht sauber heruntergefahren"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Beim Zurücksetzen des Write-Ahead-Logs können Daten verloren gehen."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "Wenn Sie trotzdem weiter machen wollen, dann benutzen Sie -f, um das Zurücksetzen zu erzwingen."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "Write-Ahead-Log wurde zurückgesetzt\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "unerwartete leere Datei »%s«"
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "Datenverzeichnis hat falsche Version"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "Datei »%s« enthält »%s«, was nicht mit der Version dieses Programms »%s« kompatibel ist."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -340,24 +335,24 @@ msgstr ""
 "  touch %s\n"
 "aus und versuchen Sie es erneut."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control existiert, aber mit ungültiger CRC; mit Vorsicht fortfahren"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_control gibt ungültige WAL-Segmentgröße an (%d Byte); mit Vorsicht fortfahren"
 msgstr[1] "pg_control gibt ungültige WAL-Segmentgröße an (%d Bytes); mit Vorsicht fortfahren"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control existiert, aber ist kaputt oder hat falsche Version; wird ignoriert"
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -366,7 +361,7 @@ msgstr ""
 "Geschätzte pg_control-Werte:\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -375,167 +370,180 @@ msgstr ""
 "Aktuelle pg_control-Werte:\n"
 "\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control-Versionsnummer:                   %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversionsnummer:                       %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Datenbanksystemidentifikation:               %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Datenbanksystemidentifikation:               %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID des letzten Checkpoints:          %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes des letzten Checkpoints:    %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "aus"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "an"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID des letzten Checkpoints:             %u:%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID des letzten Checkpoints:             %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId des letzten Checkpoints:     %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset des letzten Checkpoints:     %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID des letzten Checkpoints:           %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB der oldestXID des letzten Checkpoints:    %u\n"
 
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID des letzten Checkpoints:     %u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid des letzten Checkpoints:      %u\n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB des oldestMulti des letzten Checkpoints:  %u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Maximale Datenausrichtung (Alignment):       %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Datenbankblockgröße:                         %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blöcke pro Segment:                          %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL-Blockgröße:                              %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Bytes pro WAL-Segment:                       %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximale Bezeichnerlänge:                    %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Maximale Spalten in einem Index:             %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Maximale Größe eines Stücks TOAST:           %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Größe eines Large-Object-Chunks:             %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Speicherung von Datum/Zeit-Typen:            %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64-Bit-Ganzzahlen"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Übergabe von Float8-Argumenten:              %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "Referenz"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "Wert"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Datenseitenprüfsummenversion:                %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Standard für Vorzeichen von »char«-Daten:    %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "mit Vorzeichen"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "ohne Vorzeichen"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -548,82 +556,82 @@ msgstr ""
 "Zu ändernde Werte:\n"
 "\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Erstes Logdateisegment nach Zurücksetzen:    %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                             %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                              %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                            %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                             %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                     %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                     %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                                   %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                              %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID-Epoche:                              %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                           %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                           %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1106
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht schließen: %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1098
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht löschen: %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1197
 #, c-format
 msgid "fsync error: %m"
 msgstr "fsync-Fehler: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1206
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -632,17 +640,17 @@ msgstr ""
 "%s setzt den PostgreSQL-Write-Ahead-Log zurück.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1207
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1208
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [OPTION]... DATENVERZEICHNIS\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "\n"
@@ -651,12 +659,12 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1211
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]VERZ     Datenbankverzeichnis\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1212
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
@@ -665,22 +673,22 @@ msgstr ""
 "  -f, --force            Änderung erzwingen, auch nach unsauberem Herunterfahren\n"
 "                         oder wenn pg_control-Werte geschätzt werden mussten\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          keine Änderungen; nur zeigen, was gemacht werden würde\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -689,7 +697,7 @@ msgstr ""
 "\n"
 "Optionen um Kontrolldateiwerte setzen:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1219
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -700,47 +708,54 @@ msgstr ""
 "                                   älteste und neuste Transaktion mit Commit-\n"
 "                                   Timestamp setzen (Null bedeutet keine Änderung)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCHE            nächste Transaktions-ID-Epoche setzen\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1223
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr "  -l, --next-wal-file=WALDATEI     minimale Startposition für neuen WAL setzen\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1224
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr "  -m, --multixact-ids=MXID,MXID    nächste und älteste Multitransaktions-ID setzen\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1225
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               nächste OID setzen\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1226
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET    nächsten Multitransaktions-Offset setzen\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1227
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  älteste Transaktions-ID setzen\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1228
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    nächste Transaktions-ID setzen\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1229
+#, c-format
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr ""
+"      --char-signedness=OPTION     Standard für Vorzeichen von »char« auf\n"
+"                                   »signed« oder »unsigned« setzen\n"
+
+#: pg_resetwal.c:1230
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=ZAHL           Größe eines WAL-Segments, in Megabytes\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1232
 #, c-format
 msgid ""
 "\n"
@@ -749,7 +764,7 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1233
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s Homepage: <%s>\n"
diff --git a/src/bin/pg_resetwal/po/es.po b/src/bin/pg_resetwal/po/es.po
index ed1ed5e5c86..e52ef79e4a2 100644
--- a/src/bin/pg_resetwal/po/es.po
+++ b/src/bin/pg_resetwal/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_resetwal (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:50+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:19+0000\n"
+"PO-Revision-Date: 2025-12-06 09:41+0100\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -23,33 +23,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
@@ -82,20 +82,20 @@ msgstr ""
 "serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
 "directorio de datos."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1172
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1180 pg_resetwal.c:1192
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
@@ -111,35 +111,35 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1089
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1103
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -190,152 +190,147 @@ msgid "unrecognized sync method: %s"
 msgstr "método de sync no reconocido: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "argumento no válido para la opción %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "el \"epoch\" de ID de transacción (-e) no debe ser -1"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "el ID de transacción más antiguo (-u) debe ser mayor o igual a %u"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "el ID de transacción (-x) debe ser mayor o igual a %u"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "el ID de transacción (-c) debe ser %u o bien mayor o igual a %u"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) no debe ser cero"
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "el ID de multitransacción (-m) no debe ser 0"
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "el ID de multitransacción más antiguo (-m) no debe ser 0"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "la posición de multitransacción (-O) no debe ser -1"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "la posición de multitransacción (-O) debe estar entre 0 y %u"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "el argumento de %s debe ser una potencia de dos entre 1 y 1024"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "directorio de datos no especificado"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "no puede ser ejecutado con el usuario «root»"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Debe ejecutar %s con el superusuario de PostgreSQL."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "no se pudo cambiar al directorio «%s»: %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "el archivo candado «%s» existe"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "¿Hay un servidor corriendo? Si no, borre el archivo candado e inténtelo de nuevo."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "no continuando porque los valores del archivo de control fueron asumidos"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "Si estos valores parecen aceptables, use -f para forzar reinicio."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "el directorio de destino no fue apagado limpiamente"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Reiniciar el \"write-ahead log\" puede causar pérdida de datos."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "Si quiere proceder de todas formas, use -f para forzar reinicio."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "\"Write-ahead log\" restablecido\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "archivo vacío inesperado «%s»"
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "el directorio de datos tiene la versión equivocada"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "El archivo «%s» contiene «%s», que no es compatible con la versión «%s» de este programa."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -346,24 +341,24 @@ msgstr ""
 "   touch %s\n"
 "y pruebe de nuevo."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "existe pg_control pero tiene un CRC no válido, proceda con precaución"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_control especifica un tamaño de segmento de WAL no válido (%d byte), proceda con precaución"
 msgstr[1] "pg_control especifica un tamaño de segmento de WAL no válido (%d bytes), proceda con precaución"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "existe pg_control pero está roto o tiene la versión equivocada; ignorándolo"
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -372,7 +367,7 @@ msgstr ""
 "Valores de pg_control asumidos:\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -381,167 +376,180 @@ msgstr ""
 "Valores actuales de pg_control:\n"
 "\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Número de versión de pg_control:                 %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Número de versión de catálogo:                   %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Identificador de sistema:                        %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Identificador de sistema:                        %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID del checkpoint más reciente:          %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes del checkpoint más reciente:    %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "desactivado"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "activado"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID del checkpoint más reciente:             %u:%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID del checkpoint más reciente:             %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId del checkpoint más reciente:     %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset del checkpoint más reciente:     %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID del checkpoint más reciente:           %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "BD del oldestXID del checkpoint más reciente:    %u\n"
 
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID del checkpoint más reciente:     %u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid del checkpoint más reciente:      %u\n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "BD del oldestMultiXid del checkpt. más reciente: %u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid del último checkpoint:         %u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid del último checkpoint:         %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Máximo alineamiento de datos:                    %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Tamaño del bloque de la base de datos:           %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Bloques por segmento de relación grande:         %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Tamaño del bloque de WAL:                        %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Bytes por segmento WAL:                          %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Longitud máxima de identificadores:              %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Máximo número de columnas en un índice:          %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Longitud máxima de un trozo TOAST:               %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Longitud máxima de un trozo de objeto grande:    %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Tipo de almacenamiento hora/fecha:               %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "enteros de 64 bits"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Paso de parámetros float8:                       %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "por referencia"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "por valor"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Versión de suma de verificación de datos:        %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Presencia de signo en datos «char»:              %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "con signo"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "sin signo"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -554,82 +562,82 @@ msgstr ""
 "Valores a cambiar:\n"
 "\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Primer segmento de log después de reiniciar:     %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "Base de datos del OldestMulti:        %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "Base de datos del OldestXID:          %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "Epoch del NextXID:                    %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1106
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1098
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "no se pudo borrar el archivo «%s»: %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1197
 #, c-format
 msgid "fsync error: %m"
 msgstr "error de fsync: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1206
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -638,17 +646,17 @@ msgstr ""
 "%s restablece el WAL (\"write-ahead log\") de PostgreSQL.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1207
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1208
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [OPCIÓN]... DATADIR\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "\n"
@@ -657,12 +665,12 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1211
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR  directorio de datos\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1212
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
@@ -672,22 +680,22 @@ msgstr ""
 "                         de un apagado no limpio o si los valores de pg_control\n"
 "                         tuvieron que asumirse\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          no actualiza, sólo muestra lo que se haría\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostrar información de versión, luego salir\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostrar esta ayuda, luego salir\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -696,7 +704,7 @@ msgstr ""
 "\n"
 "Opciones para sobreescribir valores del archivo de control:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1219
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -708,53 +716,58 @@ msgstr ""
 "                                   transacciones que llevan timestamp de commit\n"
 "                                   (cero significa no cambiar)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr ""
 "  -e, --epoch=XIDEPOCH             asigna el siguiente \"epoch\" de ID de\n"
 "                                   transacción\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1223
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr ""
 "  -l, --next-wal-file=ARCHIVOWAL   fuerza una ubicación inicial mínima para\n"
 "                                   nuevo WAL\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1224
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr ""
 "  -m, --multixact-ids=MXID,MXID    asigna el siguiente ID de multitransacción\n"
 "                                   y el más antiguo\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1225
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               asigna el siguiente OID\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1226
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET    asigna la siguiente pos. de multitransacción\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1227
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  asigna el ID de transacción más antiguo\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1228
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    asigna el siguiente ID de transacción\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1229
+#, c-format
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr "      --char-signedness=OPCIÓN     definir presencia de signo a «signed» o «unsigned»\n"
+
+#: pg_resetwal.c:1230
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=TAMAÑO         tamaño de segmentos de WAL, en megabytes\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1232
 #, c-format
 msgid ""
 "\n"
@@ -763,7 +776,7 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1233
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
diff --git a/src/bin/pg_resetwal/po/fr.po b/src/bin/pg_resetwal/po/fr.po
index dac983a2a57..f0e992a9c19 100644
--- a/src/bin/pg_resetwal/po/fr.po
+++ b/src/bin/pg_resetwal/po/fr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-22 10:21+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2026-02-18 04:50+0000\n"
+"PO-Revision-Date: 2026-02-18 14:32+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,35 +21,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier « %s » : %m"
@@ -82,20 +82,20 @@ msgstr ""
 "résultats ci-dessous sont incorrects, et l'installation de PostgreSQL\n"
 "est incompatible avec ce répertoire des données."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1172
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1180 pg_resetwal.c:1192
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
@@ -111,35 +111,35 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1089
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1103
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -190,152 +190,147 @@ msgid "unrecognized sync method: %s"
 msgstr "méthode de synchronisation non reconnu : %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "argument invalide pour l'option %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "la valeur epoch de l'identifiant de transaction (-e) ne doit pas être -1"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "l'identifiant de transaction le plus ancien (-u) doit être supérieur ou égal à %u"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "l'identifiant de transaction (-x) doit être supérieur ou égal à %u"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "l'identifiant de transaction (-c) doit être %u ou supérieur ou égal à %u"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "l'OID (-o) ne doit pas être 0"
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "l'identifiant de multi-transaction (-m) ne doit pas être 0"
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "l'identifiant de multi-transaction le plus ancien (-m) ne doit pas être 0"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "le décalage de multi-transaction (-O) ne doit pas être -1"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "le décalage de multi-transaction (-O) doit être entre 0 et %u"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "l'argument de %s doit être une puissance de 2 comprise entre 1 et 1024"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "aucun répertoire de données indiqué"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "ne peut pas être exécuté par « root »"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "n'a pas pu lire les droits du répertoire « %s » : %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "n'a pas pu modifier le répertoire par « %s » : %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "le fichier verrou « %s » existe"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "Le serveur est-il démarré ? Sinon, supprimer le fichier verrou et réessayer."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "ne continue pas car les valeurs du fichier de contrôle devraient être devinées"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "Si ces valeurs semblent acceptables, utiliser -f pour forcer la réinitialisation."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "le serveur de bases de données n'a pas été arrêté proprement"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Réinitialiser les journaux de transactions pourrait causer des pertes de données."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "Si vous voulez continuer malgré tout, utiliser -f pour forcer la réinitialisation."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "Réinitialisation des journaux de transactions\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "fichier vide inattendu « %s »"
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "le répertoire des données a une mauvaise version"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "Le fichier « %s » contient « %s », qui n'est pas compatible avec la version « %s » de ce programme."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -346,24 +341,24 @@ msgstr ""
 "  touch %s\n"
 "et réessayer."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control existe mais son CRC est invalide ; agir avec précaution"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_control spécifie une taille invalide de segment WAL (%d octet) ; agir avec précaution"
 msgstr[1] "pg_control spécifie une taille invalide de segment WAL (%d octets) ; agir avec précaution"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control existe mais est corrompu ou de mauvaise version ; ignoré"
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -372,7 +367,7 @@ msgstr ""
 "Valeurs de pg_control devinées :\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -381,167 +376,180 @@ msgstr ""
 "Valeurs actuelles de pg_control :\n"
 "\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Numéro de version de pg_control :                       %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Numéro de version du catalogue :                        %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Identifiant du système de base de données :             %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Identifiant du système de base de données :             %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "désactivé"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "activé"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "Dernier NextXID du point de contrôle :                  %u:%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Dernier NextOID du point de contrôle :                  %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "Dernier oldestXID du point de contrôle :                %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
 
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "Dernier oldestMultiXid du point de contrôle :           %u\n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "Dernier oldestMulti du point de contrôle de la base :   %u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "Dernier oldestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "Dernier newestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Alignement maximal des données :                        %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Taille du bloc de la base de données :                  %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocs par segment des relations volumineuses :          %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Taille de bloc du journal de transaction :              %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Octets par segment du journal de transaction :          %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Longueur maximale des identifiants :                    %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Nombre maximum de colonnes d'un index:                  %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Longueur maximale d'un morceau TOAST :                  %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Taille d'un morceau de Large Object :                   %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Stockage du type date/heure :                           %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "entiers 64-bits"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Passage d'argument float8 :                             %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "par référence"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "par valeur"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Version des sommes de contrôle des pages de données :   %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Propriété « signedness » par défaut d'une donnée char : %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "signé"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "non signé"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -554,82 +562,82 @@ msgstr ""
 "Valeurs à changer :\n"
 "\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Premier segment du journal après réinitialisation :     %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                     %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                       %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID Epoch:                        %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1106
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "n'a pas pu fermer le répertoire « %s » : %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1098
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "n'a pas pu supprimer le fichier « %s » : %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1197
 #, c-format
 msgid "fsync error: %m"
 msgstr "erreur fsync : %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1206
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -638,17 +646,17 @@ msgstr ""
 "%s réinitialise le journal des transactions PostgreSQL.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1207
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1208
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "\n"
@@ -657,36 +665,36 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1211
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr "  [-D, --pgdata] RÉP_DONNEES       répertoire de la base de données\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1212
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
 "                         if pg_control values had to be guessed\n"
 msgstr "  -i, --interactive                force la mise à jour, y compris un arrêt pas propre ou si les valeurs de pg_control doivent être devinées\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr ""
 "  -n, --dry-run                    pas de mise à jour, affiche\n"
 "                                   simplement ce qui sera fait\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version                    affiche la version puis quitte\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                       affiche cette aide puis quitte\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -695,7 +703,7 @@ msgstr ""
 "\n"
 "Options contrôlant les valeurs du fichier de contrôle :\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1219
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -707,59 +715,66 @@ msgstr ""
 "                                   et la plus récente contenant les dates/heures\n"
 "                                   de validation (zéro signifie aucun changement)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr ""
 "  -e, --epoch=XIDEPOCH             configure la valeur epoch du prochain\n"
 "                                   identifiant de transaction\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1223
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr ""
 "  -l, --next-wal-file=FICHIERWAL   configure l'emplacement minimal de début\n"
 "                                   des WAL du nouveau journal de transactions\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1224
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr ""
 "  -m, --multixact-ids=MXID,MXID    configure le prochain et le plus ancien\n"
 "                                   identifiants multi-transactions\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1225
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               configure le prochain OID\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1226
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr ""
 "  -O, --multixact-offset=DÉCALAGE  configure le prochain décalage\n"
 "                                   multitransaction\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1227
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr ""
 "  -u, --oldest-transaction-id=XID  configure l'identifiant de transaction le\n"
 "                                   plus ancien\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1228
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr ""
 "  -x, --next-transaction-id=XID    configure le prochain identifiant de\n"
 "                                   transaction\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1229
+#, c-format
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr ""
+"      --char-signedness=OPTION     configure la propriété signedness d'un\\n\n"
+"                                   caractère à \"signed\" ou \"unsigned\"\n"
+
+#: pg_resetwal.c:1230
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=TAILLE         configure la taille des segments WAL, en Mo\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1232
 #, c-format
 msgid ""
 "\n"
@@ -768,7 +783,15 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1233
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
+
+#, c-format
+#~ msgid "Database system identifier:           %llu\n"
+#~ msgstr "Identifiant du système de base de données :             %llu\n"
+
+#, c-format
+#~ msgid "multitransaction ID (-m) must not be 0"
+#~ msgstr "l'identifiant de multi-transaction (-m) ne doit pas être 0"
diff --git a/src/bin/pg_resetwal/po/ja.po b/src/bin/pg_resetwal/po/ja.po
index e0cd4d5748c..131e8ccc4c0 100644
--- a/src/bin/pg_resetwal/po/ja.po
+++ b/src/bin/pg_resetwal/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_resetwal (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-03-31 09:53+0900\n"
-"PO-Revision-Date: 2025-03-31 16:31+0900\n"
+"POT-Creation-Date: 2025-11-17 11:43+0900\n"
+"PO-Revision-Date: 2025-11-17 13:23+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -42,13 +42,13 @@ msgstr "詳細: "
 msgid "hint: "
 msgstr "ヒント: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:389 pg_resetwal.c:547
-#: pg_resetwal.c:595
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "ファイル\"%s\"を読み取り用にオープンできませんでした: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:556 pg_resetwal.c:610
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ファイル\"%s\"の読み取りに失敗しました: %m"
@@ -82,12 +82,12 @@ msgstr ""
 
 #: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
 #: ../../common/file_utils.c:370 ../../common/file_utils.c:428
-#: ../../common/file_utils.c:502 pg_resetwal.c:1158
+#: ../../common/file_utils.c:502 pg_resetwal.c:1163
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ファイル\"%s\"をオープンできませんでした: %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1166 pg_resetwal.c:1178
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1171 pg_resetwal.c:1183
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "ファイル\"%s\"を書き出せませんでした: %m"
@@ -126,13 +126,13 @@ msgid "this build does not support sync method \"%s\""
 msgstr "このビルドでは同期方式\"%s\"をサポートしていません"
 
 #: ../../common/file_utils.c:156 ../../common/file_utils.c:304
-#: pg_resetwal.c:952 pg_resetwal.c:1005 pg_resetwal.c:1040 pg_resetwal.c:1078
+#: pg_resetwal.c:957 pg_resetwal.c:1010 pg_resetwal.c:1045 pg_resetwal.c:1083
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
 
 #: ../../common/file_utils.c:174 ../../common/file_utils.c:338
-#: pg_resetwal.c:978 pg_resetwal.c:1019 pg_resetwal.c:1057 pg_resetwal.c:1092
+#: pg_resetwal.c:983 pg_resetwal.c:1024 pg_resetwal.c:1062 pg_resetwal.c:1097
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を読み取れませんでした: %m"
@@ -188,152 +188,147 @@ msgid "unrecognized sync method: %s"
 msgstr "認識できない同期方式: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:166 pg_resetwal.c:179 pg_resetwal.c:192 pg_resetwal.c:205
-#: pg_resetwal.c:212 pg_resetwal.c:231 pg_resetwal.c:244 pg_resetwal.c:252
-#: pg_resetwal.c:272 pg_resetwal.c:283 pg_resetwal.c:317
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "オプション%sの引数が不正です"
 
-#: pg_resetwal.c:167 pg_resetwal.c:180 pg_resetwal.c:193 pg_resetwal.c:206
-#: pg_resetwal.c:213 pg_resetwal.c:232 pg_resetwal.c:245 pg_resetwal.c:253
-#: pg_resetwal.c:273 pg_resetwal.c:284 pg_resetwal.c:318 pg_resetwal.c:326
-#: pg_resetwal.c:339 pg_resetwal.c:346
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "詳細は\"%s --help\"を実行してください。"
 
-#: pg_resetwal.c:171
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "トランザクションIDの基点(-e)は-1にはできません"
 
-#: pg_resetwal.c:184
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "最古のトランザクションID(-u)は%uもしくはそれ以上でなければなりません"
 
-#: pg_resetwal.c:197
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "トランザクションID(-x)は%uもしくはそれ以上でなければなりません"
 
-#: pg_resetwal.c:219 pg_resetwal.c:223
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "トランザクションID(-c)は%uまたは%u以上でなければなりません"
 
-#: pg_resetwal.c:236
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID(-o)は0にはできません"
 
-#: pg_resetwal.c:257
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "マルチトランザクションID(-m)は0にはできません"
-
-#: pg_resetwal.c:264
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "最古のマルチトランザクションID(-m)は0にはできません"
 
-#: pg_resetwal.c:277
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "マルチトランザクションオフセット(-O)は-1にはできません"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "マルチトランザクションオフセット(-O)は0と%uとの間である必要があります"
 
-#: pg_resetwal.c:303
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "%sの引数は1から1024までの間の2の累乗でなければなりません"
 
-#: pg_resetwal.c:337
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "コマンドライン引数が多すぎます。(先頭は\"%s\")"
 
-#: pg_resetwal.c:345
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "データディレクトリが指定されていません"
 
-#: pg_resetwal.c:359
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\"では実行できません"
 
-#: pg_resetwal.c:360
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "PostgreSQLのスーパーユーザーで%sを実行しなければなりません"
 
-#: pg_resetwal.c:370
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"の権限を読み取れませんでした: %m"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "ディレクトリ\"%s\"に移動できませんでした: %m"
 
-#: pg_resetwal.c:394
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "ロックファイル\"%s\"が存在します"
 
-#: pg_resetwal.c:395
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "サーバーが稼動していませんか? そうでなければロックファイルを削除し再実行してください。"
 
-#: pg_resetwal.c:497
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "制御ファイルの値が推測値であるため、処理をここで終了します"
 
-#: pg_resetwal.c:498
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "この値を許容できる場合は、-fを使用して強制リセットしてください。"
 
-#: pg_resetwal.c:507
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "ターゲットサーバーはクリーンにシャットダウンされていません"
 
-#: pg_resetwal.c:508
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "先行書き込みロ(WAL)グをリセットすると、データが失われる可能性があります。"
 
-#: pg_resetwal.c:509
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "とにかく続行したいという場合には、-f でリセットを強行できます。"
 
-#: pg_resetwal.c:522
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "先行書き込みログがリセットされました\n"
 
-#: pg_resetwal.c:554
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "想定外の空のファイル\"%s\""
 
-#: pg_resetwal.c:564
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "データディレクトリのバージョンが違います"
 
-#: pg_resetwal.c:565
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "ファイル\"%s\"では\"%s\"となっています、これはこのプログラムのバージョン\"%s\"と互換性がありません"
 
-#: pg_resetwal.c:598
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -344,23 +339,23 @@ msgstr ""
 "  touch %s\n"
 "の後に再実行してください。"
 
-#: pg_resetwal.c:626
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_controlがありましたが、CRCが不正でした; 注意して進めてください"
 
-#: pg_resetwal.c:635
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_controlにあるWALセグメントサイズ(%dバイト)は不正です; 注意して進めてください"
 
-#: pg_resetwal.c:646
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_controlがありましたが、破損あるいは間違ったバージョンです; 無視します"
 
-#: pg_resetwal.c:741
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -369,7 +364,7 @@ msgstr ""
 "pg_controlの推測値:\n"
 "\n"
 
-#: pg_resetwal.c:743
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -378,180 +373,180 @@ msgstr ""
 "現在のpg_controlの値:\n"
 "\n"
 
-#: pg_resetwal.c:745
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_controlバージョン番号:                    %u\n"
 
-#: pg_resetwal.c:747
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "カタログバージョン番号:                      %u\n"
 
-#: pg_resetwal.c:749
+#: pg_resetwal.c:754
 #, c-format
 msgid "Database system identifier:           %<PRIu64>\n"
 msgstr "データベースシステム識別子:                  %<PRIu64>\n"
 
-#: pg_resetwal.c:751
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "最終チェックポイントの時系列ID:              %u\n"
 
-#: pg_resetwal.c:753
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "最終チェックポイントのfull_page_writes:      %s\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "オフ"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "オン"
 
-#: pg_resetwal.c:755
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "最終チェックポイントのNextXID:               %u:%u\n"
 
-#: pg_resetwal.c:758
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "最終チェックポイントのNextOID:               %u\n"
 
-#: pg_resetwal.c:760
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "最終チェックポイントのNextMultiXactId:       %u\n"
 
-#: pg_resetwal.c:762
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "最終チェックポイントのNextMultiOffset:       %u\n"
 
-#: pg_resetwal.c:764
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "最終チェックポイントのoldestXID:             %u\n"
 
-#: pg_resetwal.c:766
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "最終チェックポイントのoldestXIDのDB:         %u\n"
 
-#: pg_resetwal.c:768
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "最終チェックポイントのoldestActiveXID:       %u\n"
 
-#: pg_resetwal.c:770
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "最終チェックポイントのoldestMultiXid:        %u\n"
 
-#: pg_resetwal.c:772
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "最終チェックポイントのoldestMultiのDB:       %u\n"
 
-#: pg_resetwal.c:774
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "最終チェックポイントのoldestCommitTsXid:     %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "最終チェックポイントのnewestCommitTsXid:     %u\n"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "最大データアラインメント:                    %u\n"
 
-#: pg_resetwal.c:781
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "データベースのブロックサイズ:                %u\n"
 
-#: pg_resetwal.c:783
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "大きなリレーションのセグメント毎のブロック数:%u\n"
 
-#: pg_resetwal.c:785
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WALのブロックサイズ:                         %u\n"
 
-#: pg_resetwal.c:787 pg_resetwal.c:875
+#: pg_resetwal.c:792 pg_resetwal.c:880
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "WALセグメント当たりのバイト数:               %u\n"
 
-#: pg_resetwal.c:789
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "識別子の最大長:                              %u\n"
 
-#: pg_resetwal.c:791
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "インデックス内の最大列数:                    %u\n"
 
-#: pg_resetwal.c:793
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "TOASTチャンクの最大サイズ:                   %u\n"
 
-#: pg_resetwal.c:795
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "ラージオブジェクトチャンクのサイズ:          %u\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "日付/時刻型の格納方式:                       %s\n"
 
-#: pg_resetwal.c:799
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64ビット整数"
 
-#: pg_resetwal.c:800
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Float8引数の渡し方:                          %s\n"
 
-#: pg_resetwal.c:801
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "参照渡し"
 
-#: pg_resetwal.c:801
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "値渡し"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "データベージチェックサムのバージョン:        %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:809
 #, c-format
 msgid "Default char data signedness:         %s\n"
 msgstr "デフォルトのchar型の符号あり/なし:    %s\n"
 
-#: pg_resetwal.c:805
+#: pg_resetwal.c:810
 msgid "signed"
 msgstr "signed"
 
-#: pg_resetwal.c:805
+#: pg_resetwal.c:810
 msgid "unsigned"
 msgstr "unsigned"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -564,82 +559,82 @@ msgstr ""
 "変更される値:\n"
 "\n"
 
-#: pg_resetwal.c:822
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "リセット後最初のWALセグメント:               %s\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                             %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                              %u\n"
 
-#: pg_resetwal.c:830
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMultiのDB:                             %u\n"
 
-#: pg_resetwal.c:836
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                             %u\n"
 
-#: pg_resetwal.c:842
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                     %u\n"
 
-#: pg_resetwal.c:848
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                     %u\n"
 
-#: pg_resetwal.c:850
+#: pg_resetwal.c:855
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                                   %u\n"
 
-#: pg_resetwal.c:852
+#: pg_resetwal.c:857
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXIDのDB:                               %u\n"
 
-#: pg_resetwal.c:858
+#: pg_resetwal.c:863
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID基点:                                 %u\n"
 
-#: pg_resetwal.c:864
+#: pg_resetwal.c:869
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                           %u\n"
 
-#: pg_resetwal.c:869
+#: pg_resetwal.c:874
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                           %u\n"
 
-#: pg_resetwal.c:981 pg_resetwal.c:1022 pg_resetwal.c:1060 pg_resetwal.c:1095
+#: pg_resetwal.c:986 pg_resetwal.c:1027 pg_resetwal.c:1065 pg_resetwal.c:1100
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をクローズできませんでした: %m"
 
-#: pg_resetwal.c:1014 pg_resetwal.c:1052 pg_resetwal.c:1087
+#: pg_resetwal.c:1019 pg_resetwal.c:1057 pg_resetwal.c:1092
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "ファイル\"%s\"を削除できませんでした: %m"
 
-#: pg_resetwal.c:1183
+#: pg_resetwal.c:1188
 #, c-format
 msgid "fsync error: %m"
 msgstr "fsyncエラー: %m"
 
-#: pg_resetwal.c:1192
+#: pg_resetwal.c:1197
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -648,17 +643,17 @@ msgstr ""
 "%sはPostgreSQLの先行書き込みログをリセットします。\n"
 "\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1198
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1199
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [OPTION]... DATADIR\n"
 
-#: pg_resetwal.c:1196
+#: pg_resetwal.c:1201
 #, c-format
 msgid ""
 "\n"
@@ -667,12 +662,12 @@ msgstr ""
 "\n"
 "オプション:\n"
 
-#: pg_resetwal.c:1197
+#: pg_resetwal.c:1202
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR  データディレクトリ\n"
 
-#: pg_resetwal.c:1198
+#: pg_resetwal.c:1203
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
@@ -681,22 +676,22 @@ msgstr ""
 "  -f, --force            クリーンではないシャットダウンの後、もしくはpg_control\n"
 "                         の値の推定が必要となった場合でも更新を強行する\n"
 
-#: pg_resetwal.c:1200
+#: pg_resetwal.c:1205
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          更新をせず、単に何が行なわれるかを表示\n"
 
-#: pg_resetwal.c:1201
+#: pg_resetwal.c:1206
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          バージョン情報を表示して終了\n"
 
-#: pg_resetwal.c:1202
+#: pg_resetwal.c:1207
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             このヘルプを表示して終了\n"
 
-#: pg_resetwal.c:1204
+#: pg_resetwal.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -705,7 +700,7 @@ msgstr ""
 "\n"
 "制御ファイルの値を上書きするためのオプション:\n"
 
-#: pg_resetwal.c:1205
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -716,52 +711,52 @@ msgstr ""
 "                                  コミットタイムスタンプを持つ最古と最新の\n"
 "                                  トランザクション(0は変更しないことを意味する)\n"
 
-#: pg_resetwal.c:1208
+#: pg_resetwal.c:1213
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCH            次のトランザクションIDの基点を設定\n"
 
-#: pg_resetwal.c:1209
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr "  -l, --next-wal-file=WALFILE     新しいWALの最小開始ポイントを設定\n"
 
-#: pg_resetwal.c:1210
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr "  -m, --multixact-ids=MXID,MXID   次および最古のマルチトランザクションIDを設定\n"
 
-#: pg_resetwal.c:1211
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID              次のOIDを設定\n"
 
-#: pg_resetwal.c:1212
+#: pg_resetwal.c:1217
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET   次のマルチトランザクションオフセットを設定\n"
 
-#: pg_resetwal.c:1213
+#: pg_resetwal.c:1218
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID 最古のトランザクションIDを設定\n"
 
-#: pg_resetwal.c:1214
+#: pg_resetwal.c:1219
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID   次のトランザクションIDを設定\n"
 
-#: pg_resetwal.c:1215
+#: pg_resetwal.c:1220
 #, c-format
-msgid "      --char-signedness=OPTION     set char signedness to \"signed\"  or \"unsigned\"\n"
-msgstr "      --char-signedness=OPTION    char型を符号付きまたは符号なしに設定する\n"
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr "      --char-signedness=OPTION     char型を符号付きまたは符号なしに設定する\n"
 
-#: pg_resetwal.c:1216
+#: pg_resetwal.c:1221
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=SIZE          WALセグメントのサイズ、単位はメガバイト\n"
 
-#: pg_resetwal.c:1218
+#: pg_resetwal.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -770,7 +765,10 @@ msgstr ""
 "\n"
 "バグは<%s>に報告してください。\n"
 
-#: pg_resetwal.c:1219
+#: pg_resetwal.c:1224
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ホームページ: <%s>\n"
+
+#~ msgid "multitransaction ID (-m) must not be 0"
+#~ msgstr "マルチトランザクションID(-m)は0にはできません"
diff --git a/src/bin/pg_resetwal/po/ka.po b/src/bin/pg_resetwal/po/ka.po
index 033dd63d494..aa6269b6b57 100644
--- a/src/bin/pg_resetwal/po/ka.po
+++ b/src/bin/pg_resetwal/po/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_resetwal (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-05-02 22:20+0000\n"
-"PO-Revision-Date: 2025-05-03 01:24+0200\n"
+"POT-Creation-Date: 2025-11-14 21:20+0000\n"
+"PO-Revision-Date: 2025-11-16 12:57+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
 #: ../../../src/common/logging.c:279
 #, c-format
@@ -38,13 +38,13 @@ msgstr "დეტალები: "
 msgid "hint: "
 msgstr "მინიშნება: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:389 pg_resetwal.c:547
-#: pg_resetwal.c:595
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:556 pg_resetwal.c:610
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "ფაილის (%s) წაკითხვის შეცდომა: %m"
@@ -77,12 +77,12 @@ msgstr ""
 
 #: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
 #: ../../common/file_utils.c:370 ../../common/file_utils.c:428
-#: ../../common/file_utils.c:502 pg_resetwal.c:1158
+#: ../../common/file_utils.c:502 pg_resetwal.c:1163
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1166 pg_resetwal.c:1178
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1171 pg_resetwal.c:1183
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "ფაილში (%s) ჩაწერის შეცდომა: %m"
@@ -121,13 +121,13 @@ msgid "this build does not support sync method \"%s\""
 msgstr "ამ აგებას სინქრონიზაციის მეთოდის \"%s\" მხარდაჭერა არ გააჩნია"
 
 #: ../../common/file_utils.c:156 ../../common/file_utils.c:304
-#: pg_resetwal.c:952 pg_resetwal.c:1005 pg_resetwal.c:1040 pg_resetwal.c:1078
+#: pg_resetwal.c:957 pg_resetwal.c:1010 pg_resetwal.c:1045 pg_resetwal.c:1083
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "საქაღალდის (%s) გახსნის შეცდომა: %m"
 
 #: ../../common/file_utils.c:174 ../../common/file_utils.c:338
-#: pg_resetwal.c:978 pg_resetwal.c:1019 pg_resetwal.c:1057 pg_resetwal.c:1092
+#: pg_resetwal.c:983 pg_resetwal.c:1024 pg_resetwal.c:1062 pg_resetwal.c:1097
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "საქაღალდის (%s) წაკითხვის შეცდომა: %m"
@@ -183,152 +183,147 @@ msgid "unrecognized sync method: %s"
 msgstr "უცნობი სინქრონიზაციის მეთოდი: \"%s\""
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:166 pg_resetwal.c:179 pg_resetwal.c:192 pg_resetwal.c:205
-#: pg_resetwal.c:212 pg_resetwal.c:231 pg_resetwal.c:244 pg_resetwal.c:252
-#: pg_resetwal.c:272 pg_resetwal.c:283 pg_resetwal.c:317
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "არასწორი არგუმენტი პარამეტრისთვის: %s"
 
-#: pg_resetwal.c:167 pg_resetwal.c:180 pg_resetwal.c:193 pg_resetwal.c:206
-#: pg_resetwal.c:213 pg_resetwal.c:232 pg_resetwal.c:245 pg_resetwal.c:253
-#: pg_resetwal.c:273 pg_resetwal.c:284 pg_resetwal.c:318 pg_resetwal.c:326
-#: pg_resetwal.c:339 pg_resetwal.c:346
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'."
 
-#: pg_resetwal.c:171
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "ტრანზაქციის ID-ის ეპოქა (-e) -1 არ უნდა იყოს"
 
-#: pg_resetwal.c:184
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "ძველი ტრანზაქციის ID (-u) %u-ზე მეტი ან ტოლი უნდა იყოს"
 
-#: pg_resetwal.c:197
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "ტრანზაქციის ID (-x) %u_ზე მეტი ან ტოლი უნდა იყოს"
 
-#: pg_resetwal.c:219 pg_resetwal.c:223
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "ტრანზაქციის ID (-c) ან %u უნდა იყოს, ან %u-ზე მეტი ან ტოლი"
 
-#: pg_resetwal.c:236
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) 0 არ უნდა იყოს"
 
-#: pg_resetwal.c:257
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "მულტიტრანზაქციის ID (-m) 0 არ უნდა იყო"
-
-#: pg_resetwal.c:264
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "უძველესი მულტრანზაქციის ID (-m) 0 არ უნდა იყოს"
 
-#: pg_resetwal.c:277
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "მულიტრანზაქციის წანაცვლება (-O) -1 არ უნდა იყოს"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "მულტიტრანზაქციის წანაცვლება (-O) უნდა იყოს შუალედიდან 0 და %u"
 
-#: pg_resetwal.c:303
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "%s-ის არგუმენტი 2-ის ხარისხი უნდა იყოს 1-1024 შუალედიდან"
 
-#: pg_resetwal.c:337
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "მეტისმეტად ბევრი ბრძანების-სტრიქონის არგუმენტი (პირველია \"%s\")"
 
-#: pg_resetwal.c:345
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "მონაცემების საქაღალდე მითითებული არაა"
 
-#: pg_resetwal.c:359
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "root-ით ვერ გაეშვება"
 
-#: pg_resetwal.c:360
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "%s PostgreSQL-ის ზემომხმარებლით უნდა გაუშვათ."
 
-#: pg_resetwal.c:370
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "საქაღალდის წვდომების წაკითხვა შეუძლებელია \"%s\": %m"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "საქაღალდის %s-ზე შეცვლის შეცდომა: %m"
 
-#: pg_resetwal.c:394
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "ბლოკის ფაილი არსებობს: %s"
 
-#: pg_resetwal.c:395
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "სერვერი გაშვებულია?  თუ არა, წაშალეთ ბლოკის ფაილი და თავიდან სცადეთ."
 
-#: pg_resetwal.c:497
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "არ გავაგრძელებ, რადგან კონტროლი ფაილის მნიშვნელობებს ჩემით მივხვდი"
 
-#: pg_resetwal.c:498
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "თუ ეს მნიშვნელობები მისაღებია, ძალით ჩამოსაყრელად გამოიყენეთ -f ."
 
-#: pg_resetwal.c:507
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "მონაცემთა ბაზა წესების დაცვით არ გათიშულა"
 
-#: pg_resetwal.c:508
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "წინასწარ-ჩაწერადი ჟურნალის ჩამოყრამ, შეიძლება, მონაცემების დაკარგვა გამოიწვიოს."
 
-#: pg_resetwal.c:509
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "თუ ეს მნიშვნელობები მისაღებია, ძალით ჩამოსაყრელად გამოიყენეთ -f ."
 
-#: pg_resetwal.c:522
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "წინასწარ-ჩაწერი ჟურნალის საწყის მნიშვნელობაზე დაბრუნება\n"
 
-#: pg_resetwal.c:554
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "მოულოდნელად ფაილი ცარიელია: \"%s\""
 
-#: pg_resetwal.c:564
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "მონაცემების საქაღალდე არასწორ ვერსიას ეკუთვნის"
 
-#: pg_resetwal.c:565
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "ფაილი \"%s\" შეიცავს \"%s\"-ს, რომელიც ამ პროგრამის ვერსიასთან (%s) შეუთავსებელია."
 
-#: pg_resetwal.c:598
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -339,24 +334,24 @@ msgstr ""
 "  touch %s\n"
 "და თავიდან სცადეთ."
 
-#: pg_resetwal.c:626
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control არსებობს, მაგრამ გააჩნია არასწორი CRC; ფრთხილად"
 
-#: pg_resetwal.c:635
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_control WAL-ის არასწორი სეგმენტის ზომას (%d ბაიტი) მიუთითებს; ფრთხილად"
 msgstr[1] "pg_control WAL-ის არასწორი სეგმენტის ზომას (%d ბაიტი) მიუთითებს; ფრთხილად"
 
-#: pg_resetwal.c:646
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control არსებობს, მაგრამ ან გაფუჭებულია, ან ძველი ვერსია; იგნორირებულია"
 
-#: pg_resetwal.c:741
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -365,7 +360,7 @@ msgstr ""
 "Pg_control გამოცნობილი მნიშვნელობები:\n"
 "\n"
 
-#: pg_resetwal.c:743
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -374,180 +369,180 @@ msgstr ""
 "Pg_control მიმდინარე მნიშვნელობები:\n"
 "\n"
 
-#: pg_resetwal.c:745
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control ვერსიის ნომერი:            %u\n"
 
-#: pg_resetwal.c:747
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "კატალოგის ვერსიის ნომერი:               %u\n"
 
-#: pg_resetwal.c:749
+#: pg_resetwal.c:754
 #, c-format
 msgid "Database system identifier:           %<PRIu64>\n"
 msgstr "ბაზის სისტემური იდენტიფიკატორი:           %<PRIu64>\n"
 
-#: pg_resetwal.c:751
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "უახლესი საკონტროლო წერტილისTimeLineID:       %u\n"
 
-#: pg_resetwal.c:753
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "უახლესი უკანასკნელი საკონტროლო წერტილის full_page_writes: %s\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "გამორთული"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "ჩართ"
 
-#: pg_resetwal.c:755
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "უახლესი საკონტროლო წერტილის NextXID:          %u:%u\n"
 
-#: pg_resetwal.c:758
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "უახლესი საკონტროლო წერტილის NextOID:          %u\n"
 
-#: pg_resetwal.c:760
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "უახლესი საკონტროლო წერტილის NextMultiXactId:  %u\n"
 
-#: pg_resetwal.c:762
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "უახლესი საკონტროლო წერტილის NextMultiOffset:  %u\n"
 
-#: pg_resetwal.c:764
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestXID:        %u\n"
 
-#: pg_resetwal.c:766
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestXID's DB:   %u\n"
 
-#: pg_resetwal.c:768
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestActiveXID:  %u\n"
 
-#: pg_resetwal.c:770
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestMultiXid:   %u\n"
 
-#: pg_resetwal.c:772
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestMulti's DB: %u\n"
 
-#: pg_resetwal.c:774
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "უახლესი საკონტროლო წერტილის oldestCommitTsXid:%u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "უახლესი საკონტროლო წერტილის newestCommitTsXid:%u\n"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "მონაცემების სწორების მაქსიმუმი:            %u\n"
 
-#: pg_resetwal.c:781
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "ბაზის ბლოკის ზომა:                  %u\n"
 
-#: pg_resetwal.c:783
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "დიდი ურთიერთობის სეგმენტები თითოეულ ბლოკში: %u\n"
 
-#: pg_resetwal.c:785
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL ბლოკის ზომა:                       %u\n"
 
-#: pg_resetwal.c:787 pg_resetwal.c:875
+#: pg_resetwal.c:792 pg_resetwal.c:880
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "ბაიტები თითოეულ WAL სეგმენტში:         %u\n"
 
-#: pg_resetwal.c:789
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "იდენტიფიკატორების მაქსიმალური სიგრძე:     %u\n"
 
-#: pg_resetwal.c:791
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "ინდექსში სვეტების მაქსიმალური რაოდენობა:          %u\n"
 
-#: pg_resetwal.c:793
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "TOAST ნაგლეჯის მაქსიმალური ზომა:        %u\n"
 
-#: pg_resetwal.c:795
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "დიდი ობიექტის ნაგლეჯის ზომა:        %u\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "თარიღის ტიპის საცავი:               %s\n"
 
-#: pg_resetwal.c:799
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64-ბიტიანი მთელ რიცხვები"
 
-#: pg_resetwal.c:800
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Float8 არგუმენტის გადაცემა:              %s\n"
 
-#: pg_resetwal.c:801
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "ბმით"
 
-#: pg_resetwal.c:801
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "მნიშვნელობით"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "მონაცემების გვერდის საკონტროლო ჯამის ვერსია:           %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:809
 #, c-format
 msgid "Default char data signedness:         %s\n"
 msgstr "ნაგულისხმევი სტრიქონის მონაცემების ნიშნიანობა:          %s\n"
 
-#: pg_resetwal.c:805
+#: pg_resetwal.c:810
 msgid "signed"
 msgstr "ნიშნიანი"
 
-#: pg_resetwal.c:805
+#: pg_resetwal.c:810
 msgid "unsigned"
 msgstr "უნიშნო"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -560,82 +555,82 @@ msgstr ""
 "შესაცვლელი მნიშვნელობები:\n"
 "\n"
 
-#: pg_resetwal.c:822
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "საწყის მნიშვნელობაზე დაბრუნების შემდეგ ჟურნალის პირველი სეგმენტი:   %s\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:830
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                     %u\n"
 
-#: pg_resetwal.c:836
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:842
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetwal.c:848
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetwal.c:850
+#: pg_resetwal.c:855
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:852
+#: pg_resetwal.c:857
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                       %u\n"
 
-#: pg_resetwal.c:858
+#: pg_resetwal.c:863
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID epoch:                        %u\n"
 
-#: pg_resetwal.c:864
+#: pg_resetwal.c:869
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:869
+#: pg_resetwal.c:874
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:981 pg_resetwal.c:1022 pg_resetwal.c:1060 pg_resetwal.c:1095
+#: pg_resetwal.c:986 pg_resetwal.c:1027 pg_resetwal.c:1065 pg_resetwal.c:1100
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "საქაღალდის %s-ზე დახურვის შეცდომა: %m"
 
-#: pg_resetwal.c:1014 pg_resetwal.c:1052 pg_resetwal.c:1087
+#: pg_resetwal.c:1019 pg_resetwal.c:1057 pg_resetwal.c:1092
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "ფაილის (\"%s\") წაშლის შეცდომა: %m"
 
-#: pg_resetwal.c:1183
+#: pg_resetwal.c:1188
 #, c-format
 msgid "fsync error: %m"
 msgstr "fsync error: %m"
 
-#: pg_resetwal.c:1192
+#: pg_resetwal.c:1197
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -644,17 +639,17 @@ msgstr ""
 "%s PostgreSQL-ის წინასწარ-ჩაწერად ჟურნალს საწყის მნიშვნელობაზე აბრუნებს.\n"
 "\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1198
 #, c-format
 msgid "Usage:\n"
 msgstr "გამოყენება:\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1199
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [პარამეტრი]... [მონაცემებისსაქაღალდე]\n"
 
-#: pg_resetwal.c:1196
+#: pg_resetwal.c:1201
 #, c-format
 msgid ""
 "\n"
@@ -663,12 +658,12 @@ msgstr ""
 "\n"
 "პარამეტრები:\n"
 
-#: pg_resetwal.c:1197
+#: pg_resetwal.c:1202
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR     მონაცემების საქაღალდე\n"
 
-#: pg_resetwal.c:1198
+#: pg_resetwal.c:1203
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
@@ -677,22 +672,22 @@ msgstr ""
 "  -f, --force            ნაძალადევი განახლების შესრულებას მას შემდეგაც კი, თუ პროცესი არასწორად გაითიშა,\n"
 "                         ან, თუ pg_control-ის მნიშვნელობების მიხვედრა მომიწია\n"
 
-#: pg_resetwal.c:1200
+#: pg_resetwal.c:1205
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run         განახლების გარეშე. უბრალოდ ნაჩვენები იქნება, რა მოხდებოდა\n"
 
-#: pg_resetwal.c:1201
+#: pg_resetwal.c:1206
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
 
-#: pg_resetwal.c:1202
+#: pg_resetwal.c:1207
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                   ამ დახმარების ჩვენება და გასვლა\n"
 
-#: pg_resetwal.c:1204
+#: pg_resetwal.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -701,7 +696,7 @@ msgstr ""
 "\n"
 "პარამეტრები კონტროლის ფაილის მნიშვნელობის გადასაფარად:\n"
 
-#: pg_resetwal.c:1205
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -712,52 +707,52 @@ msgstr ""
 "                                   უახლესი და უძველესი ტრანზაქციების მითითება,\n"
 "                                   დროის შტამპის მატარებლით(0 ნიშნავს, რომ არ შეიცვლება)\n"
 
-#: pg_resetwal.c:1208
+#: pg_resetwal.c:1213
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCH             შემდეგი ტრანზაქციის ID-ის ეპოქსი დაყენება\n"
 
-#: pg_resetwal.c:1209
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr "  -l, --next-wal-file=WALFILE      ახალი WAL-ის მინიმალური საწყისი მდებარეობის დაყენება\n"
 
-#: pg_resetwal.c:1210
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr "  -m, --multixact-ids=MXID,MXID    შემდეგი და უძველესი მულტრანზაქციის ID-ების დაყენება\n"
 
-#: pg_resetwal.c:1211
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               შემდეგი OID-ის დაყენება\n"
 
-#: pg_resetwal.c:1212
+#: pg_resetwal.c:1217
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=წანაცვლება    შემდეგი მულტიტრანზაქციის წანაცვლების დაყენება\n"
 
-#: pg_resetwal.c:1213
+#: pg_resetwal.c:1218
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  უძველესი ტრანზაქციის ID-ის დაყენება\n"
 
-#: pg_resetwal.c:1214
+#: pg_resetwal.c:1219
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    შემდეგი ტრანზაქციის ID-ის დაყენება\n"
 
-#: pg_resetwal.c:1215
+#: pg_resetwal.c:1220
 #, c-format
 msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
 msgstr "      --char-signedness=OPTION     სიმბოლოს ნიშნიანობის დაყენება \"signed\"-ზე, ან \"unsigned\"-ზე\n"
 
-#: pg_resetwal.c:1216
+#: pg_resetwal.c:1221
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=ზომა    WAL სეგმენტების ზომა, მეგაბაიტებში\n"
 
-#: pg_resetwal.c:1218
+#: pg_resetwal.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -766,7 +761,7 @@ msgstr ""
 "\n"
 "შეცდომების შესახებ მიწერეთ: %s\n"
 
-#: pg_resetwal.c:1219
+#: pg_resetwal.c:1224
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s-ის საწყისი გვერდია: <%s>\n"
@@ -822,3 +817,7 @@ msgstr "%s-ის საწყისი გვერდია: <%s>\n"
 #, c-format
 #~ msgid "could not load library \"%s\": error code %lu"
 #~ msgstr "ბიბლიოთეკის (\"%s\") ჩატვირთვის შეცდომა: შეცდომის კოდი: %lu"
+
+#, c-format
+#~ msgid "multitransaction ID (-m) must not be 0"
+#~ msgstr "მულტიტრანზაქციის ID (-m) 0 არ უნდა იყო"
diff --git a/src/bin/pg_resetwal/po/ko.po b/src/bin/pg_resetwal/po/ko.po
index c27ba3a2627..18947296cc2 100644
--- a/src/bin/pg_resetwal/po/ko.po
+++ b/src/bin/pg_resetwal/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_resetwal (PostgreSQL) 17\n"
+"Project-Id-Version: pg_resetwal (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:50+0000\n"
-"PO-Revision-Date: 2025-01-16 16:15+0900\n"
+"POT-Creation-Date: 2025-09-11 21:50+0000\n"
+"PO-Revision-Date: 2025-09-10 13:41+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -15,33 +15,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:389 pg_resetwal.c:547
+#: pg_resetwal.c:595
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "\"%s\" 파일 일기 모드로 열기 실패: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:556 pg_resetwal.c:610
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
@@ -75,20 +75,20 @@ msgstr ""
 "이럴 경우, 출력 결과가 바르지 않을 수 있고,\n"
 "설치된 PostgreSQL 프로그램과 데이터 디렉터리가 호환되지 않을 수 있습니다."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1158
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1166 pg_resetwal.c:1178
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
@@ -104,35 +104,35 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "널 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 파일 시스템 동기화를 할 수 없음: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일 상태 정보를 구할 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:952 pg_resetwal.c:1005 pg_resetwal.c:1040 pg_resetwal.c:1078
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:978 pg_resetwal.c:1019 pg_resetwal.c:1057 pg_resetwal.c:1092
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -183,156 +183,156 @@ msgid "unrecognized sync method: %s"
 msgstr "알 수 없는 동기화 방법: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:166 pg_resetwal.c:179 pg_resetwal.c:192 pg_resetwal.c:205
+#: pg_resetwal.c:212 pg_resetwal.c:231 pg_resetwal.c:244 pg_resetwal.c:252
+#: pg_resetwal.c:272 pg_resetwal.c:283 pg_resetwal.c:317
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "%s 옵션의 잘못된 인자"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:167 pg_resetwal.c:180 pg_resetwal.c:193 pg_resetwal.c:206
+#: pg_resetwal.c:213 pg_resetwal.c:232 pg_resetwal.c:245 pg_resetwal.c:253
+#: pg_resetwal.c:273 pg_resetwal.c:284 pg_resetwal.c:318 pg_resetwal.c:326
+#: pg_resetwal.c:339 pg_resetwal.c:346
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:171
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "트랜잭션 ID epoch (-e) 값은 -1이 아니여야함"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:184
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "제일 오래된 트랜잭션 ID (-u)는 %u 보다 크거나 같아야 함"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:197
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "트랜잭션 ID (-x)는 %u 보다 크거나 같아야 함"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:219 pg_resetwal.c:223
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "-c 옵션으로 지정한 트랜잭션 ID는 %u이거나 %u이상이어야 함"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:236
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) 값은 0이 아니여야함"
 
-#: pg_resetwal.c:255
+#: pg_resetwal.c:257
 #, c-format
 msgid "multitransaction ID (-m) must not be 0"
 msgstr "멀티트랜잭션 ID (-m) 값은 0이 아니여야함"
 
-#: pg_resetwal.c:262
+#: pg_resetwal.c:264
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "제일 오래된 멀티트랜잭션 ID (-m) 값은 0이 아니여야함"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:277
 #, c-format
 msgid "multitransaction offset (-O) must not be -1"
 msgstr "멀티트랜잭션 옵셋 (-O) 값은 -1이 아니여야함"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:303
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "%s 값은 1부터 1024사이 2^n 값이어야 합니다"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:337
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인수를 지정했습니다. (처음 \"%s\")"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:345
 #, c-format
 msgid "no data directory specified"
 msgstr "데이터 디렉터리를 지정하지 않았음"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:359
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\" 계정으로는 실행 할 수 없음"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:360
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "PostgreSQL superuser로 %s 프로그램을 실행하십시오."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:370
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 읽기 권한 없음: %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:376
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "\"%s\" 이름의 디렉터리로 이동할 수 없습니다: %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:394
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "\"%s\" 잠금 파일이 있음"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:395
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr ""
 "서버가 가동중인가요? 그렇지 않다면, 이 파일을 지우고 다시 시도하십시오."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:497
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "컨트롤 파일 값들이 추정되었기에 더 이상 진행하지 않습니다."
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:498
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr ""
 "이 설정값들이 타당하다고 판단되면, 강제로 갱신하려면, -f 옵션을 쓰세요."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:507
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "데이터베이스 서버가 깔끔하게 중지 되지 못했습니다."
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:508
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "미리 쓰기 로그를 리셋하면 자료를 잃어버릴 수 있습니다."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:509
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "이 설정값들로 강제로 갱신하려면, -f 옵션을 쓰세요."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:522
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "트랜잭션 로그 재설정\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:554
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "\"%s\" 파일은 예상치 않게 비었음"
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:564
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "잘못된 버전의 데이터 디렉터리입니다."
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:565
 #, c-format
 msgid ""
 "File \"%s\" contains \"%s\", which is not compatible with this program's "
 "version \"%s\"."
 msgstr "\"%s\" 파일 버전은 \"%s\", 이 프로그램 버전은 \"%s\"."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:598
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -343,12 +343,12 @@ msgstr ""
 "보십시오.\n"
 "  touch %s"
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:626
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control 파일이 있지만, CRC값이 잘못되었습니다; 경고와 함께 진행함"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:635
 #, c-format
 msgid ""
 "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
@@ -359,12 +359,12 @@ msgstr[0] ""
 "pg_control 파일에 잘못된 WAL 조각 파일 크기(%d 바이트)가 지정됨; 경고와 함께 "
 "진행함"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:646
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control 파일이 있지만, 손상되었거나 버전을 알 수 없음; 무시함"
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:741
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -373,7 +373,7 @@ msgstr ""
 "추측된 pg_control 설정값들:\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:743
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -382,167 +382,180 @@ msgstr ""
 "현재 pg_control 설정값들:\n"
 "\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:745
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control 버전 번호:                 %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:747
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "카탈로그 버전 번호:                   %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:749
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "데이터베이스 시스템 식별자:           %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "데이터베이스 시스템 식별자:           %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:751
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "마지막 체크포인트 TimeLineID:         %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:753
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "마지막 체크포인트 full_page_writes:   %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:754
 msgid "off"
 msgstr "off"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:754
 msgid "on"
 msgstr "on"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:755
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "마지막 체크포인트 NextXID:            %u:%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "마지막 체크포인트 NextOID:            %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "마지막 체크포인트 NextMultiXactId:    %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:762
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "마지막 체크포인트 NextMultiOffset:    %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:764
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "마지막 체크포인트 제일 오래된 XID:    %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:766
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "마지막 체크포인트 제일 오래된 XID의 DB:%u\n"
 
-#: pg_resetwal.c:746
+#: pg_resetwal.c:768
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "마지막 체크포인트 제일 오래된 ActiveXID:%u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:770
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "마지막 체크포인트 제일 오래된 MultiXid:%u\n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:772
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "마지막 체크포인트 제일 오래된 MultiXid의 DB:%u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:774
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "마지막 체크포인트 제일 오래된 CommitTsXid:%u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:776
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "마지막 체크포인트 최신 CommitTsXid:   %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:778
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "최대 자료 정렬:                       %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:781
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "데이터베이스 블록 크기:               %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:783
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "대형 릴레이션의 세그먼트당 블럭 갯수: %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:785
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL 블록 크기:                        %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:787 pg_resetwal.c:875
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "WAL 세그먼트의 크기(byte):            %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:789
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "식별자 최대 길이:                     %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:791
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "인덱스에서 사용하는 최대 열 수:      %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:793
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "TOAST 청크의 최대 크기:        %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:795
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "대형객체 청크의 최대 크기:            %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:798
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "날짜/시간형 자료의 저장방식:          %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:799
 msgid "64-bit integers"
 msgstr "64-비트 정수"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:800
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Float8 인수 전달:                     %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:801
 msgid "by reference"
 msgstr "참조별"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:801
 msgid "by value"
 msgstr "값별"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:802
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "데이터 페이지 체크섬 버전:            %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:804
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "기본 문자 자료 부호:                  %s\n"
+
+#: pg_resetwal.c:805
+msgid "signed"
+msgstr "부호있음"
+
+#: pg_resetwal.c:805
+msgid "unsigned"
+msgstr "부호없음"
+
+#: pg_resetwal.c:818
 #, c-format
 msgid ""
 "\n"
@@ -555,82 +568,82 @@ msgstr ""
 "변경될 값:\n"
 "\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:822
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "리셋 뒤 첫 로그 세그먼트:             %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:826
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:828
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:830
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMultiXid의 DB:                  %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:836
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:842
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:848
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:850
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:852
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID의 DB:                       %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:858
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID epoch:                        %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:864
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "제일 오래된 CommitTsXid:              %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:869
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "최근 CommitTsXid:                     %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:981 pg_resetwal.c:1022 pg_resetwal.c:1060 pg_resetwal.c:1095
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1014 pg_resetwal.c:1052 pg_resetwal.c:1087
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "\"%s\" 파일을 지울 수 없음: %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1183
 #, c-format
 msgid "fsync error: %m"
 msgstr "fsync 오류: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1192
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -639,17 +652,17 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 트랜잭션 로그를 다시 설정합니다.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1193
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1194
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [옵션]... DATADIR\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1196
 #, c-format
 msgid ""
 "\n"
@@ -658,12 +671,12 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1197
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR  데이터 디렉터리\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1198
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown "
@@ -673,22 +686,22 @@ msgstr ""
 "  -f, --force            비정상적으로 종료되었거나 pg_control 값을 추측해야\n"
 "                         하는 경우에도 강제로 갱신함\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1200
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          갱신하지 않음, 컨트롤 값들을 보여주기만함\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1201
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          버전 정보를 보여주고 마침\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1202
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             이 도움말을 표시하고 종료\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1204
 #, c-format
 msgid ""
 "\n"
@@ -697,7 +710,7 @@ msgstr ""
 "\n"
 "컨트롤 파일 값을 바꿀 옵션들:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1205
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -710,12 +723,12 @@ msgstr ""
 "션\n"
 "                                   ID 값 (0이면 바꾸지 않음)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1208
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCH             다음 트랙잭션 ID epoch 지정\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1209
 #, c-format
 msgid ""
 "  -l, --next-wal-file=WALFILE      set minimum starting location for new "
@@ -724,39 +737,48 @@ msgstr ""
 "  -l, --next-wal-file=WALFILE      새 트랜잭션 로그를 위한 WAL 최소 시작 위치"
 "를 강제로 지정\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr ""
 "  -m, --multixact-ids=MXID,MXID    다음 제일 오래된 멀티트랜잭션 ID 지정\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1211
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               다음 OID 지정\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1212
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET    다음 멀티트랜잭션 옵셋 지정\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1213
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  제일 오래된 트랜잭션 ID 지정\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    다음 트랜잭션 ID 지정\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1215
+#, c-format
+msgid ""
+"      --char-signedness=OPTION     set char signedness to \"signed\" or "
+"\"unsigned\"\n"
+msgstr ""
+"      --char-signedness=OPTION     문자 부호를 \"signed\" 또는 \"unsigned"
+"\"로 지정\n"
+
+#: pg_resetwal.c:1216
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=SIZE           WAL 조각 파일 크기, MB 단위\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -765,16 +787,14 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1219
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#, c-format
-#~ msgid "argument of --wal-segsize must be a number"
-#~ msgstr "--wal-segsize 값은 숫자여야 합니다"
+#~ msgid "  -f, --force                      force update to be done\n"
+#~ msgstr "  -f, --force                      강제로 갱신함\n"
 
-#, c-format
 #~ msgid ""
 #~ "The database server was not shut down cleanly.\n"
 #~ "Resetting the write-ahead log might cause data to be lost.\n"
@@ -784,6 +804,5 @@ msgstr "%s 홈페이지: <%s>\n"
 #~ "트랜잭션 로그를 다시 설정하는 것은 자료 손실을 야기할 수 있습니다.\n"
 #~ "그럼에도 불구하고 진행하려면, -f 옵션을 사용해서 강제 설정을 하십시오.\n"
 
-#, c-format
-#~ msgid "  -f, --force                      force update to be done\n"
-#~ msgstr "  -f, --force                      강제로 갱신함\n"
+#~ msgid "argument of --wal-segsize must be a number"
+#~ msgstr "--wal-segsize 값은 숫자여야 합니다"
diff --git a/src/bin/pg_resetwal/po/ru.po b/src/bin/pg_resetwal/po/ru.po
index c26776baad2..b5c0ea47bb3 100644
--- a/src/bin/pg_resetwal/po/ru.po
+++ b/src/bin/pg_resetwal/po/ru.po
@@ -5,13 +5,13 @@
 # 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-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_resetxlog (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
-"PO-Revision-Date: 2024-09-05 12:19+0300\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 09:15+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -21,33 +21,33 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
@@ -80,20 +80,20 @@ msgstr ""
 "этой программой. В этом случае результаты будут неверными и\n"
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1172
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1180 pg_resetwal.c:1192
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
@@ -109,35 +109,35 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1089
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1103
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -188,154 +188,149 @@ msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "недопустимый аргумент параметра %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "эпоха ID транзакции (-e) не должна быть равна -1"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "ID старейшей транзакции (-u) должен быть больше или равен %u"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "ID транзакции (-x) должен быть больше или равен %u"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "ID транзакции (-c) должен быть равен %u, либо больше или равен %u"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) не должен быть равен 0"
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "ID мультитранзакции (-m) не должен быть равен 0"
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "ID старейшей мультитранзакции (-m) не должен быть равен 0"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "смещение мультитранзакции (-O) не должно быть равно -1"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "смещение мультитранзакции (-O) должно быть от 0 до %u"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "аргументом %s должна быть степень двух от 1 до 1024"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог данных не указан"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "программу не должен запускать root"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Запускать %s нужно от имени суперпользователя PostgreSQL."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не удалось прочитать права на каталог \"%s\": %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "не удалось перейти в каталог \"%s\": %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "файл блокировки \"%s\" существует"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr ""
 "Возможно, сервер запущен? Если нет, удалите этот файл и попробуйте снова."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr ""
 "выполнение прервано, так как значения из контрольного файла являются "
 "предполагаемыми"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr ""
 "Если эти значения всё же приемлемы, выполните сброс принудительно, добавив "
 "ключ -f."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "сервер баз данных не был остановлен штатно"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Сброс журнала предзаписи может привести к потере данных."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr ""
 "Если вы всё же хотите продолжить, выполните сброс принудительно, добавив "
 "ключ -f."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "Журнал предзаписи сброшен\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "файл \"%s\" оказался пустым"
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "каталог данных имеет неверную версию"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid ""
 "File \"%s\" contains \"%s\", which is not compatible with this program's "
@@ -343,7 +338,7 @@ msgid ""
 msgstr ""
 "Файл \"%s\" содержит строку \"%s\", а ожидается версия программы \"%s\"."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -354,14 +349,14 @@ msgstr ""
 "  touch %s\n"
 "и повторите попытку."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr ""
 "pg_control существует, но его контрольная сумма неверна; продолжайте с "
 "осторожностью"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid ""
 "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
@@ -378,14 +373,14 @@ msgstr[2] ""
 "в pg_control указан некорректный размер сегмента WAL (%d Б); продолжайте с "
 "осторожностью"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr ""
 "pg_control испорчен или имеет неизвестную либо недопустимую версию; "
 "игнорируется..."
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -394,7 +389,7 @@ msgstr ""
 "Предполагаемые значения pg_control:\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -403,181 +398,194 @@ msgstr ""
 "Текущие значения pg_control:\n"
 "\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Номер версии pg_control:              %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Номер версии каталога:                %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Идентификатор системы баз данных:     %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Идентификатор системы баз данных:     %<PRIu64>\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Линия времени последней конт. точки:  %u\n"
 
 # skip-rule: no-space-after-period
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Режим full_page_writes последней к.т: %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "выкл."
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "вкл."
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID последней конт. точки:        %u:%u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID последней конт. точки:        %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId послед. конт. точки:  %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset послед. конт. точки:  %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID последней конт. точки:      %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "БД с oldestXID последней конт. точки: %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID последней к. т.:      %u\n"
 
 # skip-rule: capital-letter-first
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid последней конт. точки: %u\n"
 
 # skip-rule: capital-letter-first, double-space
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "БД с oldestMulti последней к. т.:     %u\n"
 
 # skip-rule: capital-letter-first, double-space
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid последней к. т.:    %u\n"
 
 # skip-rule: capital-letter-first, double-space
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid последней к. т.:    %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Макс. предел выравнивания данных:     %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Размер блока БД:                      %u\n"
 
 # skip-rule: double-space
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Блоков в макс. сегменте отношений:    %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Размер блока WAL:                     %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Байт в сегменте WAL:                  %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Максимальная длина идентификаторов:   %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Макс. число столбцов в индексе:       %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Максимальный размер порции TOAST:     %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Размер порции большого объекта:       %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Формат хранения даты/времени:         %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64-битные целые"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Передача аргумента float8:            %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "по ссылке"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "по значению"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Версия контрольных сумм страниц:      %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Знаковость char по умолчанию:         %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "знаковое"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "беззнаковое"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -590,82 +598,82 @@ msgstr ""
 "Значения, которые будут изменены:\n"
 "\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Первый сегмент журнала после сброса:  %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "БД с oldestMultiXid:                  %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "БД с oldestXID:                       %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "Эпоха NextXID:                        %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1106
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не удалось закрыть каталог \"%s\": %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1098
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "ошибка удаления файла \"%s\": %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1197
 #, c-format
 msgid "fsync error: %m"
 msgstr "ошибка синхронизации с ФС: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1206
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -674,17 +682,17 @@ msgstr ""
 "%s сбрасывает журнал предзаписи PostgreSQL.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1207
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1208
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [ПАРАМЕТР]... КАТ_ДАННЫХ\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1210
 #, c-format
 msgid ""
 "\n"
@@ -693,12 +701,12 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1211
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]КАТ_ДАННЫХ каталог данных\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1212
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown "
@@ -710,24 +718,24 @@ msgstr ""
 "нештатного\n"
 "                         отключения сервера\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr ""
 "  -n, --dry-run          показать, какие действия будут выполнены, но не\n"
 "                         выполнять их\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1215
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          показать версию и выйти\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1216
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             показать эту справку и выйти\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -736,7 +744,7 @@ msgstr ""
 "\n"
 "Параметры, переопределяющие значения из контрольного файла:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1219
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -748,13 +756,13 @@ msgstr ""
 "                                   задать старейшую и новейшую транзакции,\n"
 "                                   несущие метки времени (0 — не менять)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr ""
 "  -e, --epoch=XIDEPOCH             задать эпоху для ID следующей транзакции\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1223
 #, c-format
 msgid ""
 "  -l, --next-wal-file=WALFILE      set minimum starting location for new "
@@ -763,7 +771,7 @@ msgstr ""
 "  -l, --next-wal-file=ФАЙЛ_WAL     задать минимальное начальное положение\n"
 "                                   для нового WAL\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1224
 #, c-format
 msgid ""
 "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
@@ -771,35 +779,44 @@ msgstr ""
 "  -m, --multixact-ids=MXID,MXID    задать ID следующей и старейшей\n"
 "                                   мультитранзакции\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1225
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               задать следующий OID\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1226
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr ""
 "  -O, --multixact-offset=СМЕЩЕНИЕ  задать смещение следующей "
 "мультитранзакции\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1227
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  задать ID старейшей ID\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1228
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    задать ID следующей транзакции\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1229
+#, c-format
+msgid ""
+"      --char-signedness=OPTION     set char signedness to \"signed\" or "
+"\"unsigned\"\n"
+msgstr ""
+"      --char-signedness=ВАРИАНТ    установить знаковость char: \"signed\" "
+"или \"unsigned\"\n"
+
+#: pg_resetwal.c:1230
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr ""
 "      --wal-segsize=РАЗМЕР         размер сегментов WAL (в мегабайтах)\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1232
 #, c-format
 msgid ""
 "\n"
@@ -808,11 +825,15 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1233
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
+#, c-format
+#~ msgid "multitransaction ID (-m) must not be 0"
+#~ msgstr "ID мультитранзакции (-m) не должен быть равен 0"
+
 #, c-format
 #~ msgid "argument of --wal-segsize must be a number"
 #~ msgstr "аргументом --wal-segsize должно быть число"
diff --git a/src/bin/pg_resetwal/po/sv.po b/src/bin/pg_resetwal/po/sv.po
index 71529e5ebf2..ea6f60c0021 100644
--- a/src/bin/pg_resetwal/po/sv.po
+++ b/src/bin/pg_resetwal/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for resetxlog.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 # Peter Eisentraut <peter_e@gmx.net>, 2010.
 # Mats Erik Andersson <bsd@gisladisker.se>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 17:51+0000\n"
-"PO-Revision-Date: 2024-07-12 23:47+0200\n"
+"POT-Creation-Date: 2026-02-02 01:50+0000\n"
+"PO-Revision-Date: 2026-02-02 23:26+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "kunde inte läsa fil \"%s\": %m"
@@ -75,20 +75,20 @@ msgstr ""
 "inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1167
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1175 pg_resetwal.c:1187
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
@@ -104,35 +104,35 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1087
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1101
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -183,152 +183,147 @@ msgid "unrecognized sync method: %s"
 msgstr "okänd synkmetod: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "ogiltigt argument för flaggan %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "Epoch (-e) för transaktions-ID får inte vara -1."
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "äldsta transaktions-ID (-u) måste vara större än eller lika med %u"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "transaktions-ID (-x) måste vara större än eller lika med %u"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "transaktions-ID (-c) måste antingen vara %u eller större än eller lika med %u"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) får inte vara 0."
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "Multitransaktions-ID (-m) får inte vara 0."
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "Äldsta multitransaktions-ID (-m) får inte vara 0."
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "Multitransaktionsoffset (-O) får inte vara -1."
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "multitransaktionsoffset (-O) måste vara mellan 0 och %u"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "argumentet till %s måste vara en tvåpotens mellan 1 och 1024"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "ingen datakatalog angiven"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "kan inte köras av \"root\""
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Du måste köra %s som PostgreSQL:s superuser."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "kunde inte läsa rättigheter på katalog \"%s\": %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "kunde inte byta katalog till \"%s\": %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "låsfil med namn \"%s\" finns redan"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "Kör servern redan? Om inte, radera låsfilen och försök igen."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "fortsätter inte eftersom kontrollfilens värden har gissats"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "Om dessa värden verkar godtagbara, använd då -f för att framtvinga återställning."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "databasservern stångdes inte ner utan fel"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Nollställa write-ahead-loggen kan göra att data förloras."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "Om du vill fortsätta ändå, använd -f för att framtvinga återställning."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "Återställning av write-ahead-log\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "oväntad tom fil \"%s\""
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "datakatalogen har fel version"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "Filen \"%s\" innehåller \"%s\", vilket inte är kompatibelt med detta programmets version \"%s\"."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -338,24 +333,24 @@ msgstr ""
 "Om du är säker på att sökvägen till datakatalogen är riktig,\n"
 "utför då \"touch %s\" och försök sedan igen."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control existerar men har ogiltig CRC. Fortsätt med varsamhet."
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
 msgstr[0] "pg_control anger ogiltig WAL-segmentstorlek (%d byte); fortsätt med varsamhet."
 msgstr[1] "pg_control anger ogiltig WAL-segmentstorlek (%d byte); fortsätt med varsamhet."
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control existerar men är trasig eller har fel version. Den ignoreras."
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -364,7 +359,7 @@ msgstr ""
 "Gissade värden för pg_control:\n"
 "\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -376,168 +371,181 @@ msgstr ""
 # November 26th, 2014: Insert six additional space characters
 # for best alignment with Swedish translation.
 # Translations should be checked against those of pg_controldata.
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Versionsnummer för pg_control:              %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversion:                             %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Databasens systemidentifierare:             %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Databasens systemidentifierare:             %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID vid senaste kontrollpunkt:       %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Senaste kontrollpunktens full_page_writes:  %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "av"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "på"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "NextXID vid senaste kontrollpunkt:          %u:%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID vid senaste kontrollpunkt:          %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId vid senaste kontrollpunkt:  %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset vid senaste kontrollpunkt:  %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID vid senaste kontrollpunkt:        %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB för oldestXID vid senaste kontrollpunkt: %u\n"
 
 # FIXME: too wide
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID vid senaste kontrollpunkt:  %u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid vid senaste kontrollpunkt:   %u\n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB för oldestMulti vid senaste kontrollpkt: %u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid vid senaste kontrollpunkt:%u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid vid senaste kontrollpunkt:%u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Maximal jämkning av data (alignment):       %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Databasens blockstorlek:                    %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Block per segment i en stor relation:       %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Blockstorlek i transaktionsloggen:          %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Segmentstorlek i transaktionsloggen:        %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximal längd för identifierare:            %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Maximalt antal kolonner i ett index:        %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Maximal storlek för en TOAST-enhet:         %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Storlek för large-object-enheter:           %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Representation av dag och tid:              %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64-bitars heltal"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Åtkomst till float8-argument:               %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "referens"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "värdeåtkomst"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Checksummaversion för datasidor:            %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Standard signering för char-data:           %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "signerad"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "osignerad"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid ""
 "\n"
@@ -552,82 +560,82 @@ msgstr ""
 
 # November 26th, 2014: Insert additional spacing to fit
 # with the first translated text, which uses most characters.
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Första loggsegment efter återställning: %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                        %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                         %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "DB för OldestMulti:                     %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                        %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                              %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "DB för OldestXID:                       %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "Epoch för NextXID:                       %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1104
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "kunde inte stänga katalog \"%s\": %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1096
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "kunde inte radera fil \"%s\": %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1192
 #, c-format
 msgid "fsync error: %m"
 msgstr "misslyckad fsync: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1201
 #, c-format
 msgid ""
 "%s resets the PostgreSQL write-ahead log.\n"
@@ -636,17 +644,17 @@ msgstr ""
 "%s återställer write-ahead-log för PostgreSQL.\n"
 "\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1202
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1203
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [FLAGGA]... DATAKATALOG\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1205
 #, c-format
 msgid ""
 "\n"
@@ -655,12 +663,12 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1206
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR  datakatalog\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1207
 #, c-format
 msgid ""
 "  -f, --force            force update to be done even after unclean shutdown or\n"
@@ -669,29 +677,31 @@ msgstr ""
 "  -f, --force            tvinga uppdatering även om servern inte stängts ner\n"
 "                         korrekt eller om värden i pg_control har gissats\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1209
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          ingen updatering; visa bara planerade åtgärder\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1210
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          visa versionsinformation, avsluta sedan\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1211
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             visa den här hjälpen, avsluta sedan\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1213
 #, c-format
 msgid ""
 "\n"
 "Options to override control file values:\n"
-msgstr "\nFlaggor som övertrumfar värden i kontrollfilen:\n"
+msgstr ""
+"\n"
+"Flaggor som övertrumfar värden i kontrollfilen:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1214
 #, c-format
 msgid ""
 "  -c, --commit-timestamp-ids=XID,XID\n"
@@ -703,47 +713,52 @@ msgstr ""
 "                                   kan ha commit-tidstämpel (noll betyder\n"
 "                                   ingen ändring)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1217
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCH             sätter epoch för nästa transaktions-ID\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1218
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr "  -l, --next-wal-file=WALFIL       sätt minsta startposition för ny WAL\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1219
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr "  -m, --multixact-ids=MXID,MXID    sätt nästa och äldsta multitransaktions-ID\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1220
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               sätt nästa OID\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1221
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET    sätt nästa multitransaktionsoffset\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  sätt äldsta transaktions-ID\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1223
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    sätt nästa transaktions-ID\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1224
+#, c-format
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr "      --char-signedness=FLAGGA     sätt signering för char till \"signed\" eller \"unsigned\"\n"
+
+#: pg_resetwal.c:1225
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=STORLEK        storlek på WAL-segment i megabyte\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1227
 #, c-format
 msgid ""
 "\n"
@@ -752,7 +767,7 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1228
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
diff --git a/src/bin/pg_resetwal/po/uk.po b/src/bin/pg_resetwal/po/uk.po
index 0b18f98387d..f596a1dac93 100644
--- a/src/bin/pg_resetwal/po/uk.po
+++ b/src/bin/pg_resetwal/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:21+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:21+0000\n"
+"PO-Revision-Date: 2026-01-02 15:48\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,36 +14,36 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_resetwal.pot\n"
-"X-Crowdin-File-ID: 1010\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_resetwal.pot\n"
+"X-Crowdin-File-ID: 1085\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
 
-#: ../../common/controldata_utils.c:97 pg_resetwal.c:370 pg_resetwal.c:525
-#: pg_resetwal.c:573
+#: ../../common/controldata_utils.c:97 pg_resetwal.c:394 pg_resetwal.c:552
+#: pg_resetwal.c:600
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
-#: ../../common/controldata_utils.c:110 pg_resetwal.c:534 pg_resetwal.c:588
+#: ../../common/controldata_utils.c:110 pg_resetwal.c:561 pg_resetwal.c:615
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не вдалося прочитати файл \"%s\": %m"
@@ -71,20 +71,20 @@ msgid "possible byte ordering mismatch\n"
 msgstr "можлива помилка у послідовності байтів.\n"
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 pg_resetwal.c:1134
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 pg_resetwal.c:1167
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:249 pg_resetwal.c:1142 pg_resetwal.c:1154
+#: ../../common/controldata_utils.c:249 pg_resetwal.c:1175 pg_resetwal.c:1187
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
@@ -100,35 +100,35 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
-#: pg_resetwal.c:928 pg_resetwal.c:981 pg_resetwal.c:1016 pg_resetwal.c:1054
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
+#: pg_resetwal.c:961 pg_resetwal.c:1014 pg_resetwal.c:1049 pg_resetwal.c:1087
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
-#: pg_resetwal.c:954 pg_resetwal.c:995 pg_resetwal.c:1033 pg_resetwal.c:1068
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
+#: pg_resetwal.c:987 pg_resetwal.c:1028 pg_resetwal.c:1066 pg_resetwal.c:1101
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -179,152 +179,147 @@ msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetwal.c:164 pg_resetwal.c:177 pg_resetwal.c:190 pg_resetwal.c:203
-#: pg_resetwal.c:210 pg_resetwal.c:229 pg_resetwal.c:242 pg_resetwal.c:250
-#: pg_resetwal.c:270 pg_resetwal.c:281
+#: pg_resetwal.c:169 pg_resetwal.c:182 pg_resetwal.c:195 pg_resetwal.c:208
+#: pg_resetwal.c:215 pg_resetwal.c:234 pg_resetwal.c:247 pg_resetwal.c:255
+#: pg_resetwal.c:274 pg_resetwal.c:288 pg_resetwal.c:322
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "неприпустимий аргумент для параметру %s"
 
-#: pg_resetwal.c:165 pg_resetwal.c:178 pg_resetwal.c:191 pg_resetwal.c:204
-#: pg_resetwal.c:211 pg_resetwal.c:230 pg_resetwal.c:243 pg_resetwal.c:251
-#: pg_resetwal.c:271 pg_resetwal.c:282 pg_resetwal.c:307 pg_resetwal.c:320
-#: pg_resetwal.c:327
+#: pg_resetwal.c:170 pg_resetwal.c:183 pg_resetwal.c:196 pg_resetwal.c:209
+#: pg_resetwal.c:216 pg_resetwal.c:235 pg_resetwal.c:248 pg_resetwal.c:256
+#: pg_resetwal.c:275 pg_resetwal.c:289 pg_resetwal.c:323 pg_resetwal.c:331
+#: pg_resetwal.c:344 pg_resetwal.c:351
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_resetwal.c:169
+#: pg_resetwal.c:174
 #, c-format
 msgid "transaction ID epoch (-e) must not be -1"
 msgstr "епоха ID транзакції (-e) не повинна бути -1"
 
-#: pg_resetwal.c:182
+#: pg_resetwal.c:187
 #, c-format
 msgid "oldest transaction ID (-u) must be greater than or equal to %u"
 msgstr "найстаріший ID транзакції (-u) має бути більший або рівним %u"
 
-#: pg_resetwal.c:195
+#: pg_resetwal.c:200
 #, c-format
 msgid "transaction ID (-x) must be greater than or equal to %u"
 msgstr "ID транзакції (-x) має бути більшим чи рівним %u"
 
-#: pg_resetwal.c:217 pg_resetwal.c:221
+#: pg_resetwal.c:222 pg_resetwal.c:226
 #, c-format
 msgid "transaction ID (-c) must be either %u or greater than or equal to %u"
 msgstr "ідентифікатор транзакції (-c) має бути або %u, або більше чи дорівнювати %u"
 
-#: pg_resetwal.c:234
+#: pg_resetwal.c:239
 #, c-format
 msgid "OID (-o) must not be 0"
 msgstr "OID (-o) не може бути 0"
 
-#: pg_resetwal.c:255
-#, c-format
-msgid "multitransaction ID (-m) must not be 0"
-msgstr "ID мультитранзакції (-m) не повинен бути 0"
-
-#: pg_resetwal.c:262
+#: pg_resetwal.c:265
 #, c-format
 msgid "oldest multitransaction ID (-m) must not be 0"
 msgstr "найстарший ID мультитранзакції (-m) не повинен бути 0"
 
-#: pg_resetwal.c:275
+#: pg_resetwal.c:279
 #, c-format
-msgid "multitransaction offset (-O) must not be -1"
-msgstr "зсув мультитранзакції (-O) не повинен бути -1"
+msgid "multitransaction offset (-O) must be between 0 and %u"
+msgstr "зсув мультитранзакції (O) повинен бути між 0 і %u"
 
-#: pg_resetwal.c:301
+#: pg_resetwal.c:308
 #, c-format
 msgid "argument of %s must be a power of two between 1 and 1024"
 msgstr "аргумент %s має бути ступенем двійки в діапазоні від 1 до 1024"
 
-#: pg_resetwal.c:318
+#: pg_resetwal.c:342
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_resetwal.c:326
+#: pg_resetwal.c:350
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог даних не вказано"
 
-#: pg_resetwal.c:340
+#: pg_resetwal.c:364
 #, c-format
 msgid "cannot be executed by \"root\""
 msgstr "\"root\" не може це виконувати"
 
-#: pg_resetwal.c:341
+#: pg_resetwal.c:365
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser."
 msgstr "Запускати %s треба від суперкористувача PostgreSQL."
 
-#: pg_resetwal.c:351
+#: pg_resetwal.c:375
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не вдалося прочитати дозволи на каталог \"%s\": %m"
 
-#: pg_resetwal.c:357
+#: pg_resetwal.c:381
 #, c-format
 msgid "could not change directory to \"%s\": %m"
 msgstr "не вдалося змінити каталог на \"%s\": %m"
 
-#: pg_resetwal.c:375
+#: pg_resetwal.c:399
 #, c-format
 msgid "lock file \"%s\" exists"
 msgstr "файл блокування \"%s\" вже існує"
 
-#: pg_resetwal.c:376
+#: pg_resetwal.c:400
 #, c-format
 msgid "Is a server running?  If not, delete the lock file and try again."
 msgstr "Чи запущений сервер? Якщо ні, видаліть файл блокування і спробуйте знову."
 
-#: pg_resetwal.c:475
+#: pg_resetwal.c:502
 #, c-format
 msgid "not proceeding because control file values were guessed"
 msgstr "не виконується, оскільки значення контрольного файлу були вгадані"
 
-#: pg_resetwal.c:476
+#: pg_resetwal.c:503
 #, c-format
 msgid "If these values seem acceptable, use -f to force reset."
 msgstr "Якщо ці значення здаються прийнятними, використовуйте -f для примусового скидання."
 
-#: pg_resetwal.c:485
+#: pg_resetwal.c:512
 #, c-format
 msgid "database server was not shut down cleanly"
 msgstr "сервер бази даних завершив роботу некоректно"
 
-#: pg_resetwal.c:486
+#: pg_resetwal.c:513
 #, c-format
 msgid "Resetting the write-ahead log might cause data to be lost."
 msgstr "Скидання журналу попереднього запису може призвести до втрати даних."
 
-#: pg_resetwal.c:487
+#: pg_resetwal.c:514
 #, c-format
 msgid "If you want to proceed anyway, use -f to force reset."
 msgstr "Якщо ви все одно хочете продовжити, використовуйте -f для примусового скидання."
 
-#: pg_resetwal.c:500
+#: pg_resetwal.c:527
 #, c-format
 msgid "Write-ahead log reset\n"
 msgstr "Журнал передзапису скинуто\n"
 
-#: pg_resetwal.c:532
+#: pg_resetwal.c:559
 #, c-format
 msgid "unexpected empty file \"%s\""
 msgstr "неочікуваний порожній файл \"%s\""
 
-#: pg_resetwal.c:542
+#: pg_resetwal.c:569
 #, c-format
 msgid "data directory is of wrong version"
 msgstr "каталог даних неправильної версії"
 
-#: pg_resetwal.c:543
+#: pg_resetwal.c:570
 #, c-format
 msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
 msgstr "Файл \"%s\" містить \"%s\", який не сумісний з версією цієї програми \"%s\"."
 
-#: pg_resetwal.c:576
+#: pg_resetwal.c:603
 #, c-format
 msgid "If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
@@ -333,12 +328,12 @@ msgstr "Якщо Ви впевнені, що шлях каталогу дани
 " touch %s\n"
 "і спробуйте знову."
 
-#: pg_resetwal.c:604
+#: pg_resetwal.c:631
 #, c-format
 msgid "pg_control exists but has invalid CRC; proceed with caution"
 msgstr "pg_control існує, але має недопустимий CRC; продовжуйте з обережністю"
 
-#: pg_resetwal.c:613
+#: pg_resetwal.c:640
 #, c-format
 msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
 msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
@@ -347,320 +342,333 @@ msgstr[1] "pg_control вказує неприпустимий розмір се
 msgstr[2] "pg_control вказує неприпустимий розмір сегмента WAL (%d байтів); продовжуйте з обережністю"
 msgstr[3] "pg_control вказує неприпустимий розмір сегмента WAL (%d байтів); продовжуйте з обережністю"
 
-#: pg_resetwal.c:624
+#: pg_resetwal.c:651
 #, c-format
 msgid "pg_control exists but is broken or wrong version; ignoring it"
 msgstr "pg_control існує, але зламаний або неправильної версії; ігнорується"
 
-#: pg_resetwal.c:719
+#: pg_resetwal.c:746
 #, c-format
 msgid "Guessed pg_control values:\n\n"
 msgstr "Припустимі значення pg_control:\n\n"
 
-#: pg_resetwal.c:721
+#: pg_resetwal.c:748
 #, c-format
 msgid "Current pg_control values:\n\n"
 msgstr "Поточні значення pg_control:\n\n"
 
-#: pg_resetwal.c:723
+#: pg_resetwal.c:750
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control номер версії:            %u\n"
 
-#: pg_resetwal.c:725
+#: pg_resetwal.c:752
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Номер версії каталогу:               %u\n"
 
-#: pg_resetwal.c:727
+#: pg_resetwal.c:754
 #, c-format
-msgid "Database system identifier:           %llu\n"
-msgstr "Системний ідентифікатор бази даних:           %llu\n"
+msgid "Database system identifier:           %<PRIu64>\n"
+msgstr "Ідентифікатор системи бази даних:           %<PRIu64>\n"
 
-#: pg_resetwal.c:729
+#: pg_resetwal.c:756
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Останній TimeLineID контрольної точки: %u\n"
 
-#: pg_resetwal.c:731
+#: pg_resetwal.c:758
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "Останній full_page_writes контрольної точки: %s\n"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "off"
 msgstr "вимк"
 
-#: pg_resetwal.c:732
+#: pg_resetwal.c:759
 msgid "on"
 msgstr "увімк"
 
-#: pg_resetwal.c:733
+#: pg_resetwal.c:760
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "Останній NextXID контрольної точки: %u%u\n"
 
-#: pg_resetwal.c:736
+#: pg_resetwal.c:763
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Останній NextOID контрольної точки: %u\n"
 
-#: pg_resetwal.c:738
+#: pg_resetwal.c:765
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "Останній NextMultiXactId контрольної точки: %u\n"
 
-#: pg_resetwal.c:740
+#: pg_resetwal.c:767
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "Останній NextMultiOffset контрольної точки: %u\n"
 
-#: pg_resetwal.c:742
+#: pg_resetwal.c:769
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "Останній oldestXID контрольної точки: %u\n"
 
-#: pg_resetwal.c:744
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "Остання DB останнього oldestXID контрольної точки: %u\n"
 
-#: pg_resetwal.c:746
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "Останній oldestActiveXID контрольної точки: %u\n"
 
-#: pg_resetwal.c:748
+#: pg_resetwal.c:775
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "Останній oldestMultiXid контрольної точки: %u \n"
 
-#: pg_resetwal.c:750
+#: pg_resetwal.c:777
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "Остання DB останньої oldestMulti контрольної точки: %u\n"
 
-#: pg_resetwal.c:752
+#: pg_resetwal.c:779
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "Останній oldestCommitTsXid контрольної точки:%u\n"
 
-#: pg_resetwal.c:754
+#: pg_resetwal.c:781
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "Останній newestCommitTsXid контрольної точки: %u\n"
 
-#: pg_resetwal.c:756
+#: pg_resetwal.c:783
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Максимальне вирівнювання даних: %u\n"
 
-#: pg_resetwal.c:759
+#: pg_resetwal.c:786
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Розмір блоку бази даних: %u\n"
 
-#: pg_resetwal.c:761
+#: pg_resetwal.c:788
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Блоків на сегмент великого відношення: %u\n"
 
-#: pg_resetwal.c:763
+#: pg_resetwal.c:790
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Pозмір блоку WAL: %u\n"
 
-#: pg_resetwal.c:765 pg_resetwal.c:851
+#: pg_resetwal.c:792 pg_resetwal.c:884
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Байтів на сегмент WAL: %u\n"
 
-#: pg_resetwal.c:767
+#: pg_resetwal.c:794
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Максимальна довжина ідентифікаторів:  %u\n"
 
-#: pg_resetwal.c:769
+#: pg_resetwal.c:796
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Максимальна кількість стовпців в індексі: %u\n"
 
-#: pg_resetwal.c:771
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Максимальний розмір сегменту TOAST: %u\n"
 
-#: pg_resetwal.c:773
+#: pg_resetwal.c:800
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Розмір сегменту великих обїєктів: %u\n"
 
-#: pg_resetwal.c:776
+#: pg_resetwal.c:803
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Дата/час типу сховища: %s\n"
 
-#: pg_resetwal.c:777
+#: pg_resetwal.c:804
 msgid "64-bit integers"
 msgstr "64-бітні цілі"
 
-#: pg_resetwal.c:778
+#: pg_resetwal.c:805
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Передача аргументу Float8:      %s\n"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by reference"
 msgstr "за посиланням"
 
-#: pg_resetwal.c:779
+#: pg_resetwal.c:806
 msgid "by value"
 msgstr "за значенням"
 
-#: pg_resetwal.c:780
+#: pg_resetwal.c:807
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Версія контрольних сум сторінок даних:      %u\n"
 
-#: pg_resetwal.c:794
+#: pg_resetwal.c:809
+#, c-format
+msgid "Default char data signedness:         %s\n"
+msgstr "Знаковість символьних даних за замовчуванням: %s\n"
+
+#: pg_resetwal.c:810
+msgid "signed"
+msgstr "знаковий"
+
+#: pg_resetwal.c:810
+msgid "unsigned"
+msgstr "беззнаковий"
+
+#: pg_resetwal.c:823
 #, c-format
 msgid "\n\n"
 "Values to be changed:\n\n"
 msgstr "\n\n"
 "Значення, що потребують зміни:\n\n"
 
-#: pg_resetwal.c:798
+#: pg_resetwal.c:827
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Перший сегмент журналу після скидання:        %s\n"
 
-#: pg_resetwal.c:802
+#: pg_resetwal.c:831
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                       %u\n"
 
-#: pg_resetwal.c:804
+#: pg_resetwal.c:833
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetwal.c:806
+#: pg_resetwal.c:835
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                     %u\n"
 
-#: pg_resetwal.c:812
+#: pg_resetwal.c:841
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetwal.c:818
+#: pg_resetwal.c:847
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                %u\n"
 
-#: pg_resetwal.c:824
+#: pg_resetwal.c:853
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                               %u\n"
 
-#: pg_resetwal.c:826
+#: pg_resetwal.c:859
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetwal.c:828
+#: pg_resetwal.c:861
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                        %u\n"
 
-#: pg_resetwal.c:834
+#: pg_resetwal.c:867
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "Епоха NextXID:                        %u\n"
 
-#: pg_resetwal.c:840
+#: pg_resetwal.c:873
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                   %u\n"
 
-#: pg_resetwal.c:845
+#: pg_resetwal.c:878
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                     %u\n"
 
-#: pg_resetwal.c:957 pg_resetwal.c:998 pg_resetwal.c:1036 pg_resetwal.c:1071
+#: pg_resetwal.c:990 pg_resetwal.c:1031 pg_resetwal.c:1069 pg_resetwal.c:1104
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не вдалося закрити каталог \"%s\": %m"
 
-#: pg_resetwal.c:990 pg_resetwal.c:1028 pg_resetwal.c:1063
+#: pg_resetwal.c:1023 pg_resetwal.c:1061 pg_resetwal.c:1096
 #, c-format
 msgid "could not delete file \"%s\": %m"
 msgstr "не вдалося видалити файл \"%s\": %m"
 
-#: pg_resetwal.c:1159
+#: pg_resetwal.c:1192
 #, c-format
 msgid "fsync error: %m"
 msgstr "помилка fsync: %m"
 
-#: pg_resetwal.c:1168
+#: pg_resetwal.c:1201
 #, c-format
 msgid "%s resets the PostgreSQL write-ahead log.\n\n"
 msgstr "%s скидає журнал передзапису PostgreSQL.\n\n"
 
-#: pg_resetwal.c:1169
+#: pg_resetwal.c:1202
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_resetwal.c:1170
+#: pg_resetwal.c:1203
 #, c-format
 msgid "  %s [OPTION]... DATADIR\n"
 msgstr "  %s [OPTION]... DATADIR\n"
 
-#: pg_resetwal.c:1172
+#: pg_resetwal.c:1205
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_resetwal.c:1173
+#: pg_resetwal.c:1206
 #, c-format
 msgid " [-D, --pgdata=]DATADIR  data directory\n"
 msgstr " [-D, --pgdata=]DATADIR  каталог з даними\n"
 
-#: pg_resetwal.c:1174
+#: pg_resetwal.c:1207
 #, c-format
 msgid "  -f, --force            force update to be done even after unclean shutdown or\n"
 "                         if pg_control values had to be guessed\n"
 msgstr "  -f, --force            змусити оновлення виконуватися навіть після нечистого вимкнення або\n"
 "                         якщо значення pg_control потрібно було вгадувати\n"
 
-#: pg_resetwal.c:1176
+#: pg_resetwal.c:1209
 #, c-format
 msgid "  -n, --dry-run          no update, just show what would be done\n"
 msgstr "  -n, --dry-run          не оновлювати, просто показати, що було б зроблено\n"
 
-#: pg_resetwal.c:1177
+#: pg_resetwal.c:1210
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: pg_resetwal.c:1178
+#: pg_resetwal.c:1211
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help              показати цю довідку потім вийти\n"
 
-#: pg_resetwal.c:1180
+#: pg_resetwal.c:1213
 #, c-format
 msgid "\n"
 "Options to override control file values:\n"
 msgstr "\n"
 "Опції для перевизначення значень контрольного файлу:\n"
 
-#: pg_resetwal.c:1181
+#: pg_resetwal.c:1214
 #, c-format
 msgid "  -c, --commit-timestamp-ids=XID,XID\n"
 "                                   set oldest and newest transactions bearing\n"
@@ -669,54 +677,59 @@ msgstr "  -c, --commit-timestamp-ids=XID,XID\n"
 "                                   встановити найстарішу та найновішу транзакції\n"
 "                                   затвердити позначку часу (нуль означає залишити без змін)\n"
 
-#: pg_resetwal.c:1184
+#: pg_resetwal.c:1217
 #, c-format
 msgid "  -e, --epoch=XIDEPOCH             set next transaction ID epoch\n"
 msgstr "  -e, --epoch=XIDEPOCH             встановити наступну епоху ID транзакцій\n"
 
-#: pg_resetwal.c:1185
+#: pg_resetwal.c:1218
 #, c-format
 msgid "  -l, --next-wal-file=WALFILE      set minimum starting location for new WAL\n"
 msgstr "  -l, --next-wal-file=WALFILE      задати мінімальне початкове розташування для нового WAL\n"
 
-#: pg_resetwal.c:1186
+#: pg_resetwal.c:1219
 #, c-format
 msgid "  -m, --multixact-ids=MXID,MXID    set next and oldest multitransaction ID\n"
 msgstr "  -m, --multixact-ids=MXID,MXID    задати ID наступної і найстарішої мультитранзакції\n"
 
-#: pg_resetwal.c:1187
+#: pg_resetwal.c:1220
 #, c-format
 msgid "  -o, --next-oid=OID               set next OID\n"
 msgstr "  -o, --next-oid=OID               задати наступний OID\n"
 
-#: pg_resetwal.c:1188
+#: pg_resetwal.c:1221
 #, c-format
 msgid "  -O, --multixact-offset=OFFSET    set next multitransaction offset\n"
 msgstr "  -O, --multixact-offset=OFFSET    задати зсув наступної мультитранзакції\n"
 
-#: pg_resetwal.c:1189
+#: pg_resetwal.c:1222
 #, c-format
 msgid "  -u, --oldest-transaction-id=XID  set oldest transaction ID\n"
 msgstr "  -u, --oldest-transaction-id=XID  задати ID найстарішої транзакції\n"
 
-#: pg_resetwal.c:1190
+#: pg_resetwal.c:1223
 #, c-format
 msgid "  -x, --next-transaction-id=XID    set next transaction ID\n"
 msgstr "  -x, --next-transaction-id=XID    задати ID наступної транзакції\n"
 
-#: pg_resetwal.c:1191
+#: pg_resetwal.c:1224
+#, c-format
+msgid "      --char-signedness=OPTION     set char signedness to \"signed\" or \"unsigned\"\n"
+msgstr "      --char-signedness=OPTION     встановити знаковість char в \"signed\" або \"unsigned\"\n"
+
+#: pg_resetwal.c:1225
 #, c-format
 msgid "      --wal-segsize=SIZE           size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=SIZE           розмір сегментів WAL, у мегабайтах\n"
 
-#: pg_resetwal.c:1193
+#: pg_resetwal.c:1227
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_resetwal.c:1194
+#: pg_resetwal.c:1228
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
diff --git a/src/bin/pg_resetwal/t/001_basic.pl b/src/bin/pg_resetwal/t/001_basic.pl
index d6bbbd0ceda..90ecb8afe18 100644
--- a/src/bin/pg_resetwal/t/001_basic.pl
+++ b/src/bin/pg_resetwal/t/001_basic.pl
@@ -119,10 +119,12 @@
 	[ 'pg_resetwal', '-m' => '10,bar', $node->data_dir ],
 	qr/error: invalid argument for option -m/,
 	'fails with incorrect -m option part 2');
-command_fails_like(
-	[ 'pg_resetwal', '-m' => '0,10', $node->data_dir ],
-	qr/must not be 0/,
-	'fails with -m value 0 part 1');
+
+# This used to be forbidden, but nextMulti can legitimately be 0 after
+# wraparound, so we now accept it in pg_resetwal too.
+command_ok([ 'pg_resetwal', '-m' => '0,10', $node->data_dir ],
+	'succeeds with -m value 0 part 1');
+
 command_fails_like(
 	[ 'pg_resetwal', '-m' => '10,0', $node->data_dir ],
 	qr/must not be 0/,
@@ -143,7 +145,7 @@
 	'fails with incorrect -O option');
 command_fails_like(
 	[ 'pg_resetwal', '-O' => '-1', $node->data_dir ],
-	qr/must not be -1/,
+	qr/must be between 0 and 4294967295/,
 	'fails with -O value -1');
 # --wal-segsize
 command_fails_like(
diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile
index 8d1d37fabd7..b2eed22b404 100644
--- a/src/bin/pg_rewind/Makefile
+++ b/src/bin/pg_rewind/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_rewind
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Portions Copyright (c) 2013-2025, PostgreSQL Global Development Group
 #
 # src/bin/pg_rewind/Makefile
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c
index 55659ce201f..074ac41b026 100644
--- a/src/bin/pg_rewind/file_ops.c
+++ b/src/bin/pg_rewind/file_ops.c
@@ -48,6 +48,9 @@ open_target_file(const char *path, bool trunc)
 {
 	int			mode;
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target file path is unsafe for open: \"%s\"", path);
+
 	if (dry_run)
 		return;
 
@@ -188,6 +191,9 @@ remove_target_file(const char *path, bool missing_ok)
 {
 	char		dstpath[MAXPGPATH];
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target file path is unsafe for removal: \"%s\"", path);
+
 	if (dry_run)
 		return;
 
@@ -208,6 +214,9 @@ truncate_target_file(const char *path, off_t newsize)
 	char		dstpath[MAXPGPATH];
 	int			fd;
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target file path is unsafe for truncation: \"%s\"", path);
+
 	if (dry_run)
 		return;
 
@@ -230,6 +239,10 @@ create_target_dir(const char *path)
 {
 	char		dstpath[MAXPGPATH];
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target directory path is unsafe for directory creation: \"%s\"",
+				 path);
+
 	if (dry_run)
 		return;
 
@@ -244,6 +257,10 @@ remove_target_dir(const char *path)
 {
 	char		dstpath[MAXPGPATH];
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target directory path is unsafe for directory removal: \"%s\"",
+				 path);
+
 	if (dry_run)
 		return;
 
@@ -258,6 +275,9 @@ create_target_symlink(const char *path, const char *link)
 {
 	char		dstpath[MAXPGPATH];
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target symlink path is unsafe for creation: \"%s\"", path);
+
 	if (dry_run)
 		return;
 
@@ -272,6 +292,9 @@ remove_target_symlink(const char *path)
 {
 	char		dstpath[MAXPGPATH];
 
+	if (!path_is_safe_for_extraction(path))
+		pg_fatal("target symlink path is unsafe for removal: \"%s\"", path);
+
 	if (dry_run)
 		return;
 
@@ -327,7 +350,7 @@ slurpFile(const char *datadir, const char *path, size_t *filesize)
 				 fullpath);
 
 	if (fstat(fd, &statbuf) < 0)
-		pg_fatal("could not open file \"%s\" for reading: %m",
+		pg_fatal("could not stat file \"%s\": %m",
 				 fullpath);
 
 	len = statbuf.st_size;
diff --git a/src/bin/pg_rewind/po/es.po b/src/bin/pg_rewind/po/es.po
index 794c991edcd..199af89c494 100644
--- a/src/bin/pg_rewind/po/es.po
+++ b/src/bin/pg_rewind/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:52+0000\n"
-"PO-Revision-Date: 2024-11-16 14:24+0100\n"
+"POT-Creation-Date: 2026-02-06 23:21+0000\n"
+"PO-Revision-Date: 2026-02-07 09:58+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -21,33 +21,33 @@ msgstr ""
 "X-Generator: Poedit 2.4.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
 
-#: ../../common/controldata_utils.c:97 file_ops.c:326 file_ops.c:330
+#: ../../common/controldata_utils.c:97 file_ops.c:326
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:371
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
@@ -58,7 +58,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo «%s»: %m"
@@ -81,9 +81,9 @@ msgstr ""
 "serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
 "directorio de datos."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
 #: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
@@ -94,8 +94,8 @@ msgstr "no se pudo abrir el archivo «%s»: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
@@ -111,34 +111,34 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: ../../fe_utils/archive.c:86 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -223,23 +223,28 @@ msgstr "%s debe estar en el rango %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "método sync no reconocido: %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
 
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
@@ -310,6 +315,12 @@ msgstr "no se pudo crear el link simbólico en «%s»: %m"
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "no se pudo eliminar el enlace simbólico «%s»: %m"
 
+#: file_ops.c:330
+#, c-format
+#| msgid "could not open file \"%s\" for reading: %m"
+msgid "could not stat file \"%s\" for reading: %m"
+msgstr "no se pudo hacer “stat” al archivo «%s» para lectura: %m"
+
 #: file_ops.c:441
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
@@ -325,17 +336,17 @@ msgstr "la ruta «%s» del enlace simbólico es demasiado larga"
 msgid "could not close directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: filemap.c:297
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "el archivo de datos «%s» en el origen no es un archivo regular"
 
-#: filemap.c:302 filemap.c:335
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "archivo origen duplicado «%s»"
 
-#: filemap.c:390
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "modificación de página inesperada para el archivo no regular «%s»"
@@ -355,142 +366,142 @@ msgstr "el archivo «%s» tiene un tipo diferente en el origen y en el destino"
 msgid "could not decide what to do with file \"%s\""
 msgstr "no se pudo decidir qué hacer con el archivo «%s»"
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "no se pudo limpiar «search_path»: %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "«full_page_writes» debe estar activado en el servidor de origen"
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "no se pudo preparar sentencia para obtener el contenido del archivo: %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "error ejecutando consulta (%s) en el servidor de origen: %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "conjunto de resultados inesperados de la consulta"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "error ejecutando consulta (%s) en el servidor de origen: %s"
 
-#: libpq_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr "resultado «%s» no reconocido para la ubicación de inserción WAL actual"
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "no se pudo obtener el listado de archivos: %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "conjunto de resultados inesperado mientras se obtenía el listado de archivos"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "no se pudo enviar la consulta: %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "no se pudo establecer la coneción libpq a modo «single row»"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "resultados inesperados mientras se obtenían archivos remotos: %s"
 
-#: libpq_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "se recibieron más trozos de datos que los solicitados"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "tamaño del conjunto de resultados inesperado mientras se obtenían archivos remotos"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u"
 msgstr "tipos de dato inesperados en el conjunto de resultados mientras se obtenían archivos remotos: %u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "formato de resultados inesperado mientras se obtenían archivos remotos"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "valores nulos inesperados en el resultado mientras se obtenían archivos remotos"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "largo del resultado inesperado mientras se obtenían los archivos remotos"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "se recibieron datos para el archivo «%s», cuando se solicitó para «%s»"
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
-msgid "received data at offset %lld of file \"%s\", when requested for offset %lld"
-msgstr "se recibieron datos en la posición %lld del archivo «%s», cuando se solicitó para la posición %lld"
+msgid "received data at offset %<PRId64> of file \"%s\", when requested for offset %lld"
+msgstr "se recibieron datos en la posición %<PRId64> del archivo «%s», cuando se solicitó para la posición %lld"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "se recibió más de lo solicitado para el archivo «%s»"
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "se recibió un número inesperado de trozos de datos"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "no se pudo obtener el archivo remoto «%s»: %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "conjunto de resultados inesperado mientras se obtenía el archivo remoto «%s»"
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de origen «%s»: %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr "el tamaño del archivo de origen «%s» cambió concurrentemente: se esperaban %d bytes, se copiaron %d"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "no se pudo posicionar en archivo de origen: %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "EOF inesperado mientras se leía el archivo «%s»"
@@ -706,11 +717,6 @@ msgstr "Debe ejecutar %s con el superusuario de PostgreSQL."
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -731,154 +737,154 @@ msgstr "servidores divergieron en la posición de WAL %X/%X en el timeline %u"
 msgid "no rewind required"
 msgstr "no se requiere rebobinar"
 
-#: pg_rewind.c:463
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr "rebobinando desde el último checkpoint común en %X/%X en el timeline %u"
 
-#: pg_rewind.c:473
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "leyendo la lista de archivos de origen"
 
-#: pg_rewind.c:477
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "leyendo la lista de archivos de destino"
 
-#: pg_rewind.c:486
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "leyendo WAL en destino"
 
-#: pg_rewind.c:507
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "se necesitan copiar %lu MB (tamaño total de directorio de origen es %lu MB)"
 
-#: pg_rewind.c:525
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "sincronizando directorio de datos de destino"
 
-#: pg_rewind.c:541
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "¡Listo!"
 
-#: pg_rewind.c:621
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "no se decidió una acción para el archivo «%s»"
 
-#: pg_rewind.c:653
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "el sistema origen fue modificado mientras pg_rewind estaba en ejecución"
 
-#: pg_rewind.c:657
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "creando etiqueta de respaldo y actualizando archivo de control"
 
-#: pg_rewind.c:707
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "el sistema origen estaba en un estado inesperado al final del rebobinado"
 
-#: pg_rewind.c:739
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "clusters de origen y destino son de sistemas diferentes"
 
-#: pg_rewind.c:747
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "los clusters no son compatibles con esta versión de pg_rewind"
 
-#: pg_rewind.c:757
+#: pg_rewind.c:759
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\""
 msgstr "el servidor de destino necesita tener sumas de verificación de datos o «wal_log_hints» activados"
 
-#: pg_rewind.c:768
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "el directorio de destino debe estar apagado limpiamente"
 
-#: pg_rewind.c:778
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "el directorio de origen debe estar apagado limpiamente"
 
-#: pg_rewind.c:825
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "%*s/%s kB (%d%%) copiados"
 
-#: pg_rewind.c:951
+#: pg_rewind.c:953
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines"
 msgstr "no se pudo encontrar un ancestro común en el timeline de los clusters de origen y destino"
 
-#: pg_rewind.c:992
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "el búfer del backup label es demasiado pequeño"
 
-#: pg_rewind.c:1015
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "CRC de archivo de control inesperado"
 
-#: pg_rewind.c:1027
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
 msgstr "tamaño del archivo de control %d inesperado, se esperaba %d"
 
-#: pg_rewind.c:1037
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "tamaño de segmento de WAL no válido (%d byte) en archivo de control"
 msgstr[1] "tamaño de segmento de WAL no válido (%d bytes) en archivo de control"
 
-#: pg_rewind.c:1041
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "El tamaño de segmento de WAL debe ser una potencia de dos entre 1 MB y 1 GB."
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "el programa «%s» es requerido por %s, pero no se encontró en el mismo directorio que «%s»"
 
-#: pg_rewind.c:1081 pg_rewind.c:1149
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "el programa «%s» fue encontrado por «%s» pero no es de la misma versión que %s"
 
-#: pg_rewind.c:1110
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
-msgstr "no se pudo leer restore_command en el clúster de destino"
+msgid "could not read \"restore_command\" from target cluster"
+msgstr "no se pudo leer «restore_command» en el clúster de destino"
 
-#: pg_rewind.c:1115
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "«restore_command» no está definido en el clúster de destino"
 
-#: pg_rewind.c:1153
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr "ejecutando «%s» en el servidor de destino para completar la recuperación de caídas"
 
-#: pg_rewind.c:1191
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr "el modo «single-user» en el servidor de destino falló"
 
-#: pg_rewind.c:1192
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "La orden era: % s"
@@ -918,157 +924,157 @@ msgstr "datos no válidos en archivo de historia"
 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."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "desplazamiento de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord solicitado por %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "largo de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "no hay bandera de contrecord en %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "largo de contrecord %u no válido (se esperaba %lld) en %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ID de gestor de recursos %u no válido en %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "registro con prev-link %X/%X incorrecto en %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "suma de verificación de los datos del gestor de recursos incorrecta en el registro en %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "número mágico %04X no válido en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "info bits %04X no válidos en segment WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %llu, identificador en pg_control es %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %<PRIu64>, identificador en pg_control es %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: tamaño de segmento incorrecto en cabecera de paǵina"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: XLOG_BLCKSZ incorrecto en cabecera de paǵina"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "pageaddr %X/%X inesperado en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ID de timeline %u fuera de secuencia (después de %u) en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u fuera de orden en %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, 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:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, 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:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_COMPRESSED están definidos, pero el largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, 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:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u no válido en %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "registro con largo no válido en %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "no se pudo localizar un bloque de respaldo con ID %d en el registro WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "no se pudo restaurar la imagen en %X/%X con bloque especificado %d no válido"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X con estado no válido, bloque %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con %s que no está soportado por esta instalación, bloque %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con un método desconocido, bloque %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "no se pudo descomprimir la imagen en %X/%X, bloque %d"
diff --git a/src/bin/pg_rewind/po/fr.po b/src/bin/pg_rewind/po/fr.po
index da4f2e14520..dcc799a59e3 100644
--- a/src/bin/pg_rewind/po/fr.po
+++ b/src/bin/pg_rewind/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-29 17:53+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-08 05:23+0000\n"
+"PO-Revision-Date: 2025-07-08 10:45+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
@@ -46,19 +46,19 @@ msgstr "astuce :  "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:350
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:352
+#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:373
 #, 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"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier « %s » : %m"
@@ -81,10 +81,10 @@ msgstr ""
 "résultats ci-dessous sont incorrects, et l'installation de PostgreSQL\n"
 "est incompatible avec ce répertoire des données."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: parsexlog.c:312
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
@@ -94,8 +94,8 @@ msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
@@ -111,34 +111,34 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: ../../fe_utils/archive.c:86 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -223,29 +223,34 @@ msgstr "%s doit être compris entre %d et %d"
 msgid "unrecognized sync method: %s"
 msgstr "méthode de synchronisation non reconnu : %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier « %s » : %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
@@ -325,177 +330,177 @@ msgstr "la cible du lien symbolique « %s » est trop longue"
 msgid "could not close directory \"%s\": %m"
 msgstr "n'a pas pu fermer le répertoire « %s » : %m"
 
-#: filemap.c:235
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "le fichier de données « %s » en source n'est pas un fichier standard"
 
-#: filemap.c:240 filemap.c:273
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "fichier source « %s » dupliqué"
 
-#: filemap.c:328
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "modification inattendue de page pour le fichier non standard « %s »"
 
-#: filemap.c:682 filemap.c:776
+#: filemap.c:744 filemap.c:846
 #, c-format
 msgid "unknown file type for \"%s\""
 msgstr "type de fichier inconnu pour « %s »"
 
-#: filemap.c:709
+#: filemap.c:779
 #, c-format
 msgid "file \"%s\" is of different type in source and target"
 msgstr "le fichier « %s » a un type différent pour la source et la cible"
 
-#: filemap.c:781
+#: filemap.c:851
 #, c-format
 msgid "could not decide what to do with file \"%s\""
 msgstr "n'a pas pu décider que faire avec le fichier « %s » : %m"
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "n'a pas pu effacer « search_path » : %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "« full_page_writes » doit être activé sur le serveur source"
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "n'a pas pu préparer l'instruction pour récupérer le contenu du fichier : %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "erreur lors de l'exécution de la requête (%s) sur le serveur source : %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "ensemble de résultats inattendu provenant de la requête"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, 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_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr "résultat non reconnu « %s » pour l'emplacement d'insertion actuel dans les WAL"
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "n'a pas pu récupérer la liste des fichiers : %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "ensemble de résultats inattendu lors de la récupération de la liste des fichiers"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "n'a pas pu envoyer la requête : %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "n'a pas pu configurer la connexion libpq en mode ligne seule"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, 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_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "a reçu plus de morceaux de données que demandé"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "taille inattendue de l'ensemble de résultats lors de la récupération des fichiers distants"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u"
 msgstr "types de données inattendus dans l'ensemble de résultats lors de la récupération des fichiers distants : %u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "format de résultat inattendu lors de la récupération des fichiers distants"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "valeurs NULL inattendues dans le résultat lors de la récupération des fichiers distants"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "longueur de résultats inattendu lors de la récupération des fichiers distants"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "a reçu des données du fichier « %s » alors que « %s » était demandé"
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
-msgid "received data at offset %lld of file \"%s\", when requested for offset %lld"
-msgstr "a reçu des données au décalage %lld du fichier « %s » alors que le décalage %lld était demandé"
+msgid "received data at offset %<PRId64> of file \"%s\", when requested for offset %lld"
+msgstr "a reçu des données au décalage %<PRId64> du fichier « %s » alors que le décalage %lld était demandé"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "a reçu plus que demandé pour le fichier « %s »"
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "nombre de morceaux de données reçus inattendu"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "n'a pas pu récupérer le fichier distant « %s » : %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "ensemble de résultats inattendu lors de la récupération du fichier distant « %s »"
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier source « %s » : %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr "la taille du fichier source « %s » a changé : %d octets attendus, %d copiés"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "n'a pas pu chercher dans le fichier source : %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "EOF inattendu lors de la lecture du fichier « %s »"
 
-#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:199
+#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:201
 #, c-format
 msgid "out of memory while allocating a WAL reading processor"
 msgstr "manque mémoire lors de l'allocation d'un processeur de lecture de journaux de transactions"
@@ -515,22 +520,22 @@ msgstr "n'a pas pu lire l'enregistrement WAL précédent à %X/%X"
 msgid "end pointer %X/%X is not a valid end point; expected %X/%X"
 msgstr "le pointeur de fin %X/%X n'est pas un pointeur de fin valide ; %X/%X attendu"
 
-#: parsexlog.c:212
+#: parsexlog.c:214
 #, c-format
 msgid "could not find previous WAL record at %X/%X: %s"
 msgstr "n'a pas pu trouver l'enregistrement WAL précédent à %X/%X : %s"
 
-#: parsexlog.c:216
+#: parsexlog.c:218
 #, c-format
 msgid "could not find previous WAL record at %X/%X"
 msgstr "n'a pas pu trouver l'enregistrement WAL précédent à %X/%X"
 
-#: parsexlog.c:341
+#: parsexlog.c:362
 #, c-format
 msgid "could not seek in file \"%s\": %m"
 msgstr "n'a pas pu parcourir le fichier « %s » : %m"
 
-#: parsexlog.c:440
+#: parsexlog.c:461
 #, c-format
 msgid "WAL record modifies a relation, but record type is not recognized: lsn: %X/%X, rmid: %d, rmgr: %s, info: %02X"
 msgstr "l'enregistrement WAL modifie une relation mais le type d'enregistrement n'est pas reconnu : lsn : %X/%X, rmid : %d, rmgr : %s, info : %02X"
@@ -711,11 +716,6 @@ msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL."
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "n'a pas pu lire les droits du répertoire « %s » : %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -736,154 +736,154 @@ msgstr "les serveurs ont divergé à la position %X/%X des WAL sur la timeline %
 msgid "no rewind required"
 msgstr "pas de retour en arrière requis"
 
-#: pg_rewind.c:460
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr "retour en arrière depuis le dernier checkpoint commun à %X/%X sur la ligne de temps %u"
 
-#: pg_rewind.c:470
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "lecture de la liste des fichiers sources"
 
-#: pg_rewind.c:474
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "lecture de la liste des fichiers cibles"
 
-#: pg_rewind.c:483
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "lecture du WAL dans la cible"
 
-#: pg_rewind.c:504
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "a besoin de copier %lu Mo (la taille totale du répertoire source est %lu Mo)"
 
-#: pg_rewind.c:522
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "synchronisation du répertoire des données cible"
 
-#: pg_rewind.c:538
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "Terminé !"
 
-#: pg_rewind.c:618
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "aucune action décidée pour le fichier « %s »"
 
-#: pg_rewind.c:650
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "le système source a été modifié alors que pg_rewind était en cours d'exécution"
 
-#: pg_rewind.c:654
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "création du fichier backup_label et mise à jour du fichier contrôle"
 
-#: pg_rewind.c:704
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "le système source était dans un état inattendu en fin de rewind"
 
-#: pg_rewind.c:736
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "les instances source et cible proviennent de systèmes différents"
 
-#: pg_rewind.c:744
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "les instances ne sont pas compatibles avec cette version de pg_rewind"
 
-#: pg_rewind.c:754
+#: pg_rewind.c:759
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\""
 msgstr "le serveur cible doit soit utiliser les sommes de contrôle sur les données soit avoir wal_log_hints configuré à on"
 
-#: pg_rewind.c:765
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "le serveur cible doit être arrêté proprement"
 
-#: pg_rewind.c:775
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "le répertoire de données source doit être arrêté proprement"
 
-#: pg_rewind.c:822
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "%*s/%s Ko (%d%%) copiés"
 
-#: pg_rewind.c:948
+#: pg_rewind.c:953
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines"
 msgstr "n'a pas pu trouver l'ancêtre commun des lignes de temps des instances source et cible"
 
-#: pg_rewind.c:989
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "tampon du label de sauvegarde trop petit"
 
-#: pg_rewind.c:1012
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "CRC inattendu pour le fichier de contrôle"
 
-#: pg_rewind.c:1024
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
 msgstr "taille %d inattendue du fichier de contrôle, %d attendu"
 
-#: pg_rewind.c:1034
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "taille invalide du segment WAL dans le fichier de contrôle (%d octet)"
 msgstr[1] "taille invalide du segment WAL dans le fichier de contrôle (%d octets)"
 
-#: pg_rewind.c:1038
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "La taille du segment WAL doit être une puissance de deux comprise entre 1 Mo et 1 Go."
 
-#: pg_rewind.c:1075 pg_rewind.c:1143
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »"
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s"
 
-#: pg_rewind.c:1107
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
-msgstr "n'a pas pu lire restore_command à partir de l'instance cible"
+msgid "could not read \"restore_command\" from target cluster"
+msgstr "n'a pas pu lire le paramètre « restore_command » à partir de l'instance cible"
 
-#: pg_rewind.c:1112
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "« restore_command» n'est pas configuré sur l'instance cible"
 
-#: pg_rewind.c:1150
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr "exécution de « %s » pour terminer la restauration après crash du serveur cible"
 
-#: pg_rewind.c:1188
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr "le mot simple-utilisateur de postgres a échoué pour l'instance cible"
 
-#: pg_rewind.c:1189
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "La commande était : %s"
@@ -925,159 +925,159 @@ msgstr ""
 "Les identifiants timeline doivent être plus petits que les enfants des\n"
 "identifiants timeline."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "décalage invalide de l'enregistrement à %X/%X : attendait au moins %u, a eu %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "« contrecord » est requis par %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1135
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "longueur invalide de l'enregistrement à %X/%X : attendait au moins %u, a eu %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:759
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "il n'existe pas de drapeau contrecord à %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:772
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "longueur %u invalide du contrecord (%lld attendu) à %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1143
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "identifiant du gestionnaire de ressources invalide %u à %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1156 xlogreader.c:1172
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "enregistrement avec prev-link %X/%X incorrect à %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1210
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "somme de contrôle des données du gestionnaire de ressources incorrecte à\n"
 "l'enregistrement %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1244
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "numéro magique invalide %04X dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1259 xlogreader.c:1301
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "bits d'information %04X invalides dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1275
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "Le fichier WAL provient d'une instance différente : l'identifiant système de la base dans le fichier WAL est %llu, alors que l'identifiant système de la base dans pg_control est %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "Le fichier WAL provient d'une instance différente : l'identifiant système de la base dans le fichier WAL est %<PRIu64>, alors que l'identifiant système de la base dans pg_control est %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1283
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "Le fichier WAL provient d'une instance différente : taille invalide du segment dans l'en-tête de page"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1289
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "Le fichier WAL provient d'une instance différente : XLOG_BLCKSZ incorrect dans l'en-tête de page"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1321
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "pageaddr %X/%X inattendue dans le journal de transactions %s, LSN %X/%X, segment %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1347
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "identifiant timeline %u hors de la séquence (après %u) dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1759
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u désordonné à %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1783
 #, 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:1780
+#: xlogreader.c:1790
 #, 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:1816
+#: xlogreader.c:1826
 #, 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:1832
+#: xlogreader.c:1842
 #, 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:1846
+#: xlogreader.c:1856
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1871
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1887
 #, 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:1889
+#: xlogreader.c:1899
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u invalide à %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1966
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "enregistrement de longueur invalide à %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:1992
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "n'a pas pu localiser le bloc de sauvegarde d'ID %d dans l'enregistrement WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2076
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "n'a pas pu restaurer l'image à %X/%X avec le bloc invalide %d indiqué"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2083
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X avec un état invalide, bloc %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2110 xlogreader.c:2127
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X compressé avec %s, qui est non supporté par le serveur, bloc %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2136
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X compressé avec une méthode inconnue, bloc %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2144
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "n'a pas pu décompresser l'image à %X/%X, bloc %d"
diff --git a/src/bin/pg_rewind/po/ko.po b/src/bin/pg_rewind/po/ko.po
index 459bbd71401..0525ea26d48 100644
--- a/src/bin/pg_rewind/po/ko.po
+++ b/src/bin/pg_rewind/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_rewind (PostgreSQL) 17\n"
+"Project-Id-Version: pg_rewind (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:53+0000\n"
-"PO-Revision-Date: 2025-01-16 16:58+0900\n"
+"POT-Creation-Date: 2025-09-11 21:53+0000\n"
+"PO-Revision-Date: 2025-09-09 16:45+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -42,8 +42,8 @@ msgstr "힌트: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "\"%s\" 파일 일기 모드로 열기 실패: %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:371
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "\"%s\" 파일을 읽을 수 없음: %m"
@@ -54,7 +54,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "\"%s\" 파일을 닫을 수 없음: %m"
@@ -78,9 +78,9 @@ msgstr ""
 "이럴 경우, 출력 결과가 바르지 않을 수 있고,\n"
 "설치된 PostgreSQL 프로그램과 데이터 디렉터리가 호환되지 않을 수 있습니다."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
 #: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
@@ -91,8 +91,8 @@ msgstr "\"%s\" 파일을 열 수 없음: %m"
 msgid "could not write file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
@@ -108,34 +108,34 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 복제할 수 없음(내부 오류)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위한 파일 시스템 동기화 실패: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: ../../fe_utils/archive.c:86 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -220,29 +220,34 @@ msgstr "%s 값은 %d..%d 범위 안에 있어야 함"
 msgid "unrecognized sync method: %s"
 msgstr "알 수 없는 동기화 방법: %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "\"%s\" 파일 쓰기 실패: %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "\"%s\" 파일을 만들 수 없음: %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령 인자에 줄바꿈 문자가 있음: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
@@ -322,17 +327,17 @@ msgstr "\"%s\" 심볼릭 링크의 대상이 너무 긺"
 msgid "could not close directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
 
-#: filemap.c:297
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "\"%s\" 자료 파일은 일반 파일이 아님"
 
-#: filemap.c:302 filemap.c:335
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "\"%s\" 소스 파일을 두 번 지정했습니다"
 
-#: filemap.c:390
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "\"%s\" 비일반 파일의 페이지 변경 정보가 잘못됨"
@@ -352,146 +357,147 @@ msgstr "\"%s\" 파일 형식이 소스와 타켓이 서로 다름"
 msgid "could not decide what to do with file \"%s\""
 msgstr "\"%s\" 파일로 뭘 해야할지 결정할 수 없음"
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "\"search_path\"를 지울 수 없음: %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "원본 서버는 \"full_page_writes\" 옵션으로 운영되어야 함"
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "파일 내용을 뽑기 위한 구문을 준비할 수 없음: %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "원본 서버에서 쿼리 (%s) 실행 오류: %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "쿼리 결과가 바르지 않음"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "원본에서에서 쿼리(%s) 실행 오류: %s"
 
-#: libpq_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr "현재 WAL 삽입 위치를 위한 결과가 잘못됨 : \"%s\""
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "파일 목록을 가져올 수 없음: %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "파일 목록을 가져온 결과가 잘못 됨"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "쿼리를 보낼 수 없음: %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "libpq 연결을 단일 로우 모드로 지정할 수 없음"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "원격 파일을 가져오는 도중 결과가 잘못됨: %s"
 
-#: libpq_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "용천 된 것보다 많은 데이터 청크를 받았음"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "원격 파일을 가져오는 도중 결과 집합의 크기가 잘못 됨"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid ""
 "unexpected data types in result set while fetching remote files: %u %u %u"
 msgstr "원격 파일을 가져오는 도중 결과 집합의 자료형이 잘못 됨: %u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "원격 파일을 가져오는 중 예상치 못한 결과 형식 발견"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "원격 파일을 가져오는 도중 결과안에 null 값이 잘못됨"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "원격 파일을 가져오는 도중 결과 길이가 잘못됨"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "\"%s\" 파일용 데이터를 받았음, \"%s\" 요청 처리용"
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
 msgid ""
-"received data at offset %lld of file \"%s\", when requested for offset %lld"
+"received data at offset %<PRId64> of file \"%s\", when requested for offset "
+"%lld"
 msgstr ""
-"%lld 오프셋(해당파일: \"%s\")에 데이터를 받았음, %lld 오프셋 요청 처리용"
+"%<PRId64> 오프셋(해당파일: \"%s\")에 데이터를 받았음, %lld 오프셋 요청 처리용"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "\"%s\" 파일을 위한 보다 많은 요청을 받았음"
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "데이터 청크 수신 숫자가 이상함"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "\"%s\" 원격 파일을 가져올 수 없음: %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "\"%s\" 원격파일을 가져오는 도중 결과 집합이 잘못 됨"
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "\"%s\" 원본 파일을 열 수 없음: %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid ""
 "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr "\"%s\" 소스 파일 크기가 현재 변경 되었음: 기대값: %d, 실재값 %d"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "원본 파일에서 seek 작업을 할 수 없음: %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "\"%s\" 파일을 읽는 중 예상치 못한 EOF"
@@ -722,11 +728,6 @@ msgstr "PostgreSQL superuser로 %s 프로그램을 실행하십시오."
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 읽기 권한 없음: %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -747,72 +748,72 @@ msgstr "서버 분기 WAL 위치: %X/%X, 타임라인 %u"
 msgid "no rewind required"
 msgstr "되감을 필요 없음"
 
-#: pg_rewind.c:463
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr "재동기화 시작함, 마지막 체크포인트 위치 %X/%X, 타임라인 %u"
 
-#: pg_rewind.c:473
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "원본 파일 목록 읽는 중"
 
-#: pg_rewind.c:477
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "대상 파일 목록 읽는 중"
 
-#: pg_rewind.c:486
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "대상 서버에서 WAL 읽는 중"
 
-#: pg_rewind.c:507
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "복사를 위해서 %lu MB 필요함 (원본 디렉토리 전체 크기는 %lu MB)"
 
-#: pg_rewind.c:525
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "대상 데이터 디렉터리 동기화 중"
 
-#: pg_rewind.c:541
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "완료!"
 
-#: pg_rewind.c:621
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "%s 외부 테이블 접근 권한 없음"
 
-#: pg_rewind.c:653
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "pg_rewind 실행 되고 있는 중에 원본 시스템이 변경 되었음"
 
-#: pg_rewind.c:657
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "백업 라벨을 만들고, 컨트롤 파일을 갱신 중"
 
-#: pg_rewind.c:707
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "rewind 끝에 원본 시스템의 상태가 예상값과 다름"
 
-#: pg_rewind.c:739
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "원본과 대상 클러스터가 서로 다른 시스템임"
 
-#: pg_rewind.c:747
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "해당 클러스터는 이 pg_rewind 버전으로 작업할 수 없음"
 
-#: pg_rewind.c:757
+#: pg_rewind.c:759
 #, c-format
 msgid ""
 "target server needs to use either data checksums or \"wal_log_hints = on\""
@@ -820,54 +821,54 @@ msgstr ""
 "대상 서버의 데이터 클러스터가 데이터 체크섬 기능을 켰거나,  \"wal_log_hints "
 "= on\" 설정이 되어야 함"
 
-#: pg_rewind.c:768
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "대상 서버는 정상 종료되어야 함"
 
-#: pg_rewind.c:778
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "원본 데이터 디렉토리는 정상적으로 종료되어야 함"
 
-#: pg_rewind.c:825
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "%*s/%s kB (%d%%) 복사됨"
 
-#: pg_rewind.c:951
+#: pg_rewind.c:953
 #, c-format
 msgid ""
 "could not find common ancestor of the source and target cluster's timelines"
 msgstr "원본과 대상 서버의 공통된 상위 타임라인을 찾을 수 없음"
 
-#: pg_rewind.c:992
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "백업 라벨 버퍼가 너무 작음"
 
-#: pg_rewind.c:1015
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "컨트롤 파일 CRC 오류"
 
-#: pg_rewind.c:1027
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
 msgstr "컨트롤 파일의 크기가 %d 로 비정상, 정상값 %d"
 
-#: pg_rewind.c:1037
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "컨트롤 파일 안에 잘못된 WAL 조각 크기 (%d 바이트)"
 
-#: pg_rewind.c:1041
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL 조각 파일은 1MB부터 1GB 사이 2^n 크기여야 함"
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
@@ -876,34 +877,34 @@ msgstr ""
 "\"%s\" 프로그램이 %s 작업에서 필요합니다. 그런데, 이 파일이 \"%s\" 파일이 있"
 "는 디렉터리안에 없습니다."
 
-#: pg_rewind.c:1081 pg_rewind.c:1149
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "\"%s\" 프로그램을 \"%s\" 작업 때문에 찾았지만 이 파일은 %s 프로그램의 버전과 "
 "다릅니다."
 
-#: pg_rewind.c:1110
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
-msgstr "대상 클러스터에 restore_command 설정을 읽을 수 없음"
+msgid "could not read \"restore_command\" from target cluster"
+msgstr "대상 클러스터에 \"restore_command\" 설정을 읽을 수 없음"
 
-#: pg_rewind.c:1115
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "대상 클러스터에 \"restore_command\" 설정이 없음"
 
-#: pg_rewind.c:1153
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr "대상 서버에서 비정상 종료 후 복구 작업을 위해 \"%s\" 실행 중"
 
-#: pg_rewind.c:1191
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr "대상 클러스터를 단일 사용자 모드로 postgres 실행 실패"
 
-#: pg_rewind.c:1192
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "사용된 명령: %s"
@@ -943,66 +944,66 @@ msgstr "내역 파일에 잘못된 자료가 있음"
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "타임라인 ID는 하위 타임라인 ID보다 작아야 합니다."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 오프셋:위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "%X/%X에서 contrecord를 필요로 함"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 길이:위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "%X/%X 위치에 contrecord 플래그가 없음"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "잘못된 contrecord 길이 %u (기대값: %lld), 위치 %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "잘못된 자원 관리 ID %u, 위치: %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "레코드의 잘못된 프리링크 %X/%X, 해당 레코드 %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "잘못된 자원관리자 데이터 체크섬, 위치: %X/%X 레코드"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "%04X 매직 번호가 잘못됨, WAL 조각파일: %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 정보 비트 %04X, WAL 조각파일: %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
-"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %llu, "
-"pg_control 의 식별자는 %llu"
+"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %<PRIu64>, "
+"pg_control 의 식별자는 %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -1011,7 +1012,7 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더에 지정된 값이 잘"
 "못된 조각 크기임"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -1020,12 +1021,12 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더의 XLOG_BLCKSZ 값"
 "이 바르지 않음"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 페이지 주소 %X/%X, WAL 조각파일: %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -1034,22 +1035,22 @@ msgstr ""
 "타임라인 범위 벗어남 %u (이전 번호 %u), WAL 조각파일: %s, LSN %X/%X, 오프셋 "
 "%u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "%u block_id는 범위를 벗어남, 위치 %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA 지정했지만, %X/%X 에 자료가 없음"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -1058,19 +1059,19 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE 설정이 되어 있지만, 옵셋: %u, 길이: %u, 블록 이미지 길이: "
 "%u, 대상: %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED 설정이 되어 있지만, 블록 이미지 길이: %u, 대상: %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -1079,37 +1080,37 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE, BKPIMAGE_COMPRESSED 지정 안되어 있으나, 블록 이미지 길이"
 "는 %u, 대상: %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL 설정이 되어 있지만, %X/%X 에 이전 릴레이션 없음"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "잘못된 block_id %u, 위치 %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "잘못된 레코드 길이, 위치 %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "WAL 레코드에 %d ID 백업 블록이 없음"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "%X/%X 위치에 이미지 복원 실패(%d 블록이 바르지 않음)"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "%X/%X 에 잘못된 상태값으로 이미지 복원 실패, 블록 %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
@@ -1118,25 +1119,22 @@ msgstr ""
 "%X/%X 위치에 %s 압축된 이미지 복원 실패, 해당 엔진이 지원하지 않음, 해당블"
 "록: %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "%X/%X 위치에 알수 없는 압축 방식의 이미지 복원 실패, 해당블록: %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "%X/%X 에서 이미 압축 풀기 실패, 블록 %d"
 
-#, c-format
 #~ msgid "missing contrecord at %X/%X"
 #~ msgstr "%X/%X 위치에 contrecord 없음"
 
-#, c-format
 #~ msgid "out of memory while trying to decode a record of length %u"
 #~ msgstr "%u 길이의 레코드를 디코딩 하는 중 메모리 부족"
 
-#, c-format
 #~ msgid "record length %u at %X/%X too long"
 #~ msgstr "너무 긴 길이(%u)의 레코드가 %X/%X에 있음"
diff --git a/src/bin/pg_rewind/po/ru.po b/src/bin/pg_rewind/po/ru.po
index 6f3d63dec58..3e0809832e9 100644
--- a/src/bin/pg_rewind/po/ru.po
+++ b/src/bin/pg_rewind/po/ru.po
@@ -1,13 +1,13 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2015-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-07 13:07+0300\n"
+"POT-Creation-Date: 2026-02-21 05:19+0200\n"
+"PO-Revision-Date: 2026-02-07 09:14+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,33 +17,33 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
 
-#: ../../common/controldata_utils.c:97 file_ops.c:326 file_ops.c:330
+#: ../../common/controldata_utils.c:97 file_ops.c:326
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:371
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
@@ -54,7 +54,7 @@ msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %zu)"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "не удалось закрыть файл \"%s\": %m"
@@ -77,9 +77,9 @@ msgstr ""
 "этой программой. В этом случае результаты будут неверными и\n"
 "установленный PostgreSQL будет несовместим с этим каталогом данных."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
 #: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
@@ -90,8 +90,8 @@ msgstr "не удалось открыть файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
@@ -107,34 +107,34 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
-#: ../../fe_utils/archive.c:86 file_ops.c:417
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
+#: ../../fe_utils/archive.c:86 file_ops.c:330 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -219,31 +219,36 @@ msgstr "значение %s должно быть в диапазоне %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "не удалось записать в файл \"%s\": %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "не удалось создать файл \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
@@ -324,17 +329,17 @@ msgstr "целевой путь символической ссылки \"%s\" 
 msgid "could not close directory \"%s\": %m"
 msgstr "не удалось закрыть каталог \"%s\": %m"
 
-#: filemap.c:297
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "файл данных \"%s\" в источнике не является обычным файлом"
 
-#: filemap.c:302 filemap.c:335
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "повторный исходный файл \"%s\""
 
-#: filemap.c:390
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "неожиданная модификация страницы для файла особого вида \"%s\""
@@ -354,78 +359,78 @@ msgstr "файл \"%s\" имеет разный тип в исходном и ц
 msgid "could not decide what to do with file \"%s\""
 msgstr "не удалось определить, что делать с файлом \"%s\""
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "не удалось очистить \"search_path\": %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "на исходном сервере должен быть включён режим \"full_page_writes\""
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "не удалось подготовить оператор для извлечения содержимого файла: %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "ошибка выполнения запроса (%s) на исходном сервере: %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "неожиданный результат запроса"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "ошибка выполнения запроса (%s) на исходном сервере: %s"
 
-#: libpq_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr ""
 "нераспознанный результат \"%s\" вместо текущей позиции добавления в WAL"
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "не удалось получить список файлов: %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "неожиданный результат при получении списка файлов"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "не удалось отправить запрос: %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "не удалось перевести подключение libpq в однострочный режим"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "неожиданный результат при получении файлов с сервера: %s"
 
-#: libpq_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "получено больше сегментов данных, чем запрошено"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "неожиданный размер набора результатов при получении файлов с сервера"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid ""
 "unexpected data types in result set while fetching remote files: %u %u %u"
@@ -433,72 +438,73 @@ msgstr ""
 "неожиданные типы данных в наборе результатов при получении файлов с сервера: "
 "%u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "неожиданный формат результата при получении файлов с сервера"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "неожиданные значения NULL в результате при получении файлов с сервера"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "неожиданная длина результата при получении файлов с сервера"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "получены данные для файла \"%s\", а запрашивались данные для \"%s\""
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
 msgid ""
-"received data at offset %lld of file \"%s\", when requested for offset %lld"
-msgstr ""
-"получены данные по смещению %lld в файле \"%s\", а запрашивались по смещению "
+"received data at offset %<PRId64> of file \"%s\", when requested for offset "
 "%lld"
+msgstr ""
+"получены данные по смещению %<PRId64> в файле \"%s\", а запрашивались по "
+"смещению %lld"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "получено больше данных, чем запрошено для файла \"%s\""
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "получено неожиданное количество сегментов данных"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "не удалось получить с сервера файл \"%s\": %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "неожиданный набор результатов при получении файла \"%s\" с сервера"
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "не удалось открыть исходный файл \"%s\": %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid ""
 "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr ""
 "размер исходного файла \"%s\" изменился, ожидалось байт: %d, скопировано: %d"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "не удалось переместиться в исходном файле: %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "неожиданный конец файла при чтении \"%s\""
@@ -742,11 +748,6 @@ msgstr "Запускать %s нужно от имени суперпользо
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не удалось прочитать права на каталог \"%s\": %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -767,74 +768,74 @@ msgstr "серверы разошлись в позиции WAL %X/%X на ли
 msgid "no rewind required"
 msgstr "перемотка не требуется"
 
-#: pg_rewind.c:463
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr ""
 "перемотка от последней общей контрольной точки в позиции %X/%X на линии "
 "времени %u"
 
-#: pg_rewind.c:473
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "чтение списка исходных файлов"
 
-#: pg_rewind.c:477
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "чтение списка целевых файлов"
 
-#: pg_rewind.c:486
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "чтение WAL в целевом кластере"
 
-#: pg_rewind.c:507
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "требуется скопировать %lu МБ (общий размер исходного каталога: %lu МБ)"
 
-#: pg_rewind.c:525
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "синхронизация целевого каталога данных"
 
-#: pg_rewind.c:541
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "Готово!"
 
-#: pg_rewind.c:621
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "действие не определено для файла \"%s\""
 
-#: pg_rewind.c:653
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "в исходной системе произошли изменения в процессе работы pg_rewind"
 
-#: pg_rewind.c:657
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "создание метки копии и модификация управляющего файла"
 
-#: pg_rewind.c:707
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "исходная система оказалась в неожиданном состоянии после перемотки"
 
-#: pg_rewind.c:739
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "исходный и целевой кластеры относятся к разным системам"
 
-#: pg_rewind.c:747
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "кластеры несовместимы с этой версией pg_rewind"
 
-#: pg_rewind.c:757
+#: pg_rewind.c:759
 #, c-format
 msgid ""
 "target server needs to use either data checksums or \"wal_log_hints = on\""
@@ -842,44 +843,44 @@ msgstr ""
 "на целевом сервере должны быть контрольные суммы данных или \"wal_log_hints "
 "= on\""
 
-#: pg_rewind.c:768
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "целевой сервер должен быть выключен штатно"
 
-#: pg_rewind.c:778
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "работа с исходным каталогом данных должна быть завершена штатно"
 
-#: pg_rewind.c:825
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "%*s/%s КБ (%d%%) скопировано"
 
-#: pg_rewind.c:951
+#: pg_rewind.c:953
 #, c-format
 msgid ""
 "could not find common ancestor of the source and target cluster's timelines"
 msgstr ""
 "не удалось найти общего предка линий времени исходного и целевого кластеров"
 
-#: pg_rewind.c:992
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "буфер для метки копии слишком мал"
 
-#: pg_rewind.c:1015
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "неверная контрольная сумма управляющего файла"
 
-#: pg_rewind.c:1027
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
-msgstr "неверный размер управляющего файла (%d), ожидалось: %d"
+msgstr "неверный размер управляющего файла (%d), ожидался: %d"
 
-#: pg_rewind.c:1037
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -887,50 +888,50 @@ msgstr[0] "управляющий файл содержит неверный р
 msgstr[1] "управляющий файл содержит неверный размер сегмента WAL (%d Б)"
 msgstr[2] "управляющий файл содержит неверный размер сегмента WAL (%d Б)"
 
-#: pg_rewind.c:1041
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr ""
 "Размер сегмента WAL должен задаваться степенью 2 в интервале от 1 МБ до 1 ГБ."
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\""
 
-#: pg_rewind.c:1081 pg_rewind.c:1149
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: pg_rewind.c:1110
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
+msgid "could not read \"restore_command\" from target cluster"
 msgstr "не удалось прочитать параметр \"restore_command\" в целевом кластере"
 
-#: pg_rewind.c:1115
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "параметр \"restore_command\" в целевом кластере не определён"
 
-#: pg_rewind.c:1153
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr ""
 "выполнение \"%s\" для восстановления согласованности на целевом сервере"
 
-#: pg_rewind.c:1191
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr ""
 "не удалось запустить postgres в целевом кластере в однопользовательском "
 "режиме"
 
-#: pg_rewind.c:1192
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "Выполнялась команда: %s"
@@ -971,72 +972,72 @@ msgid "Timeline IDs must be less than child timeline's ID."
 msgstr ""
 "Идентификаторы линий времени должны быть меньше идентификатора линии-потомка."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверное смещение записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "в позиции %X/%X запрошено продолжение записи"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверная длина записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "нет флага contrecord в позиции %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неверная длина contrecord: %u (ожидалась %lld) в позиции %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "неверный ID менеджера ресурсов %u в позиции %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запись с неверной ссылкой назад %X/%X в позиции %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "некорректная контрольная сумма данных менеджера ресурсов в записи в позиции "
 "%X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверное магическое число %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверные информационные биты %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
 "файл WAL принадлежит другой СУБД: в нём указан идентификатор системы БД "
-"%llu, а идентификатор системы pg_control: %llu"
+"%<PRIu64>, а идентификатор системы pg_control: %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -1045,7 +1046,7 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный размер сегмента в заголовке "
 "страницы"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -1054,12 +1055,12 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный XLOG_BLCKSZ в заголовке "
 "страницы"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неожиданный pageaddr %X/%X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -1068,23 +1069,23 @@ msgstr ""
 "нарушение последовательности ID линии времени %u (после %u) в сегменте WAL "
 "%s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "идентификатор блока %u идёт не по порядку в позиции %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA установлен, но данных в позиции %X/%X нет"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -1093,21 +1094,21 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE установлен, но для пропуска заданы смещение %u и длина %u "
 "при длине образа блока %u в позиции %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED установлен, но длина образа блока равна %u в позиции %X/"
 "%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -1116,41 +1117,41 @@ msgstr ""
 "ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_COMPRESSED не установлены, но длина образа "
 "блока равна %u в позиции %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr ""
 "BKPBLOCK_SAME_REL установлен, но предыдущее значение не задано в позиции %X/"
 "%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "неверный идентификатор блока %u в позиции %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запись с неверной длиной в позиции %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не удалось найти копию блока с ID %d в записи журнала WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с указанным неверным блоком %d"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с неверным состоянием, блок %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
@@ -1159,7 +1160,7 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый методом %s, который не "
 "поддерживается этой сборкой, блок %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
@@ -1167,11 +1168,15 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый неизвестным методом, "
 "блок %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не удалось развернуть образ в позиции %X/%X, блок %d"
 
+#, c-format
+#~ msgid "could not stat file \"%s\" for reading: %m"
+#~ msgstr "не удалось получить информацию о файле \"%s\" для чтения: %m"
+
 #, c-format
 #~ msgid "out of memory while trying to decode a record of length %u"
 #~ msgstr "не удалось выделить память для декодирования записи длины %u"
diff --git a/src/bin/pg_rewind/po/sv.po b/src/bin/pg_rewind/po/sv.po
index 7894e029f20..ed614e4ef5d 100644
--- a/src/bin/pg_rewind/po/sv.po
+++ b/src/bin/pg_rewind/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_rewind
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-27 15:53+0000\n"
-"PO-Revision-Date: 2024-08-27 18:32+0200\n"
+"POT-Creation-Date: 2026-02-07 08:23+0000\n"
+"PO-Revision-Date: 2026-02-07 09:30+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,44 +17,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
 
-#: ../../common/controldata_utils.c:97 file_ops.c:326 file_ops.c:330
+#: ../../common/controldata_utils.c:97 file_ops.c:326
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:350
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "kunde inte läsa fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:352
+#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:373
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "kunde inte läsa fil \"%s\": läste %d av %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "kunde inte stänga fil \"%s\": %m"
@@ -76,10 +76,10 @@ msgstr ""
 "inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
 "och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: parsexlog.c:312
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
@@ -89,8 +89,8 @@ msgstr "kunde inte öppna fil \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "kunde inte skriva fil \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
@@ -106,34 +106,34 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: ../../fe_utils/archive.c:86 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -218,29 +218,34 @@ msgstr "%s måste vara i intervallet %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "okänd synkmetod: %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "kunde inte skriva till fil \"%s\": %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "kunde inte skapa fil \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
@@ -305,6 +310,11 @@ msgstr "kunde inte skapa en symnbolisk länk vid \"%s\": %m"
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "kan inte ta bort symbolisk länk \"%s\": %m"
 
+#: file_ops.c:330
+#, c-format
+msgid "could not stat file \"%s\" for reading: %m"
+msgstr "kunde inte göra stat() på filen \"%s\" för läsning: %m"
+
 #: file_ops.c:441
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
@@ -320,177 +330,177 @@ msgstr "mål för symbolisk länk \"%s\" är för lång"
 msgid "could not close directory \"%s\": %m"
 msgstr "kunde inte stänga katalog \"%s\": %m"
 
-#: filemap.c:235
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "datafil \"%s\" i källan är inte en vanlig fil"
 
-#: filemap.c:240 filemap.c:273
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "duplicerad källflagga \"%s\""
 
-#: filemap.c:328
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "oväntad sidmodifiering för icke-regulär fil \"%s\""
 
-#: filemap.c:682 filemap.c:776
+#: filemap.c:744 filemap.c:846
 #, c-format
 msgid "unknown file type for \"%s\""
 msgstr "okänd filtyp på \"%s\""
 
-#: filemap.c:709
+#: filemap.c:779
 #, c-format
 msgid "file \"%s\" is of different type in source and target"
 msgstr "filen \"%s\" har olika typ i källa och mål"
 
-#: filemap.c:781
+#: filemap.c:851
 #, c-format
 msgid "could not decide what to do with file \"%s\""
 msgstr "kunde inte bestämma vad som skulle göras med filen \"%s\""
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "kunde inte nollställa \"search_path\": %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "\"full_page_writes\" måste vara påslagen i källservern"
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "kunde inte förbereda satsen för att hämta filinnehåll: %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "fel vid körande av fråga (%s) på källserver: %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "oväntad resultatmängd från fråga"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "fel vid körande av fråga (%s) i källserver: %s"
 
-#: libpq_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr "oväntat resultat \"%s\" för nuvarande WAL-insättningsposition"
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "kunde inte hämta fillista: %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "oväntad resultatmängd vid hämtning av fillista"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "kunde inte skicka fråga: %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "kunde inte sätta libpq-anslutning till enradsläge"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "oväntat resultat vid hämtning av extern fil: %s"
 
-#: libpq_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "tog emot fler datastycken än efterfrågat"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "oväntad resultatmängdstorlek vid hämtning av externa filer"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u"
 msgstr "oväntade datayper i resultatmängd vid hämtning av externa filer: %u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "oväntat resultatformat vid hämtning av externa filer"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "oväntade null-värden i resultat vid hämtning av externa filer"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "oväntad resultatlängd vid hämtning av externa filer"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "fick data för filen \"%s\", men efterfrågade för \"%s\""
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
-msgid "received data at offset %lld of file \"%s\", when requested for offset %lld"
-msgstr "fick data från offset %lld i fil \"%s\", men efterfrågade offset %lld"
+msgid "received data at offset %<PRId64> of file \"%s\", when requested for offset %lld"
+msgstr "fick data från offset %<PRId64> i fil \"%s\", men efterfrågade offset %lld"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "tog emot mer än efterfrågat för filen \"%s\""
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "oväntat antal datastycken togs emot"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "kunde inte hämta extern fil \"%s\": %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "oväntat resultatmängd vid hämtning av extern fil \"%s\""
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "kunde inte öppna källfil \"%s\": %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr "storleken på källfilen \"%s\" ändrades under körning: %d byte förväntades, %d kopierades"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "kunde inte söka i källfil: %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "oväntad EOF under läsning av fil \"%s\""
 
-#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:199
+#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:201
 #, c-format
 msgid "out of memory while allocating a WAL reading processor"
 msgstr "slut på minne vid allokering av en WAL-läs-processor"
@@ -510,22 +520,22 @@ msgstr "kunde inte läsa WAL-post vid %X/%X"
 msgid "end pointer %X/%X is not a valid end point; expected %X/%X"
 msgstr "slutpekare %X/%X är inte en giltig slutposition; förväntade %X/%X"
 
-#: parsexlog.c:212
+#: parsexlog.c:214
 #, c-format
 msgid "could not find previous WAL record at %X/%X: %s"
 msgstr "kunde inte hitta föregående WAL-post vid %X/%X: %s"
 
-#: parsexlog.c:216
+#: parsexlog.c:218
 #, c-format
 msgid "could not find previous WAL record at %X/%X"
 msgstr "kunde inte hitta förgående WAL-post vid %X/%X"
 
-#: parsexlog.c:341
+#: parsexlog.c:362
 #, c-format
 msgid "could not seek in file \"%s\": %m"
 msgstr "kunde inte söka (seek) i fil \"%s\": %m"
 
-#: parsexlog.c:440
+#: parsexlog.c:461
 #, c-format
 msgid "WAL record modifies a relation, but record type is not recognized: lsn: %X/%X, rmid: %d, rmgr: %s, info: %02X"
 msgstr "WAL-post modifierar en relation, men posttypen känns inte igen: lsn: %X/%X, rmid: %d, rmgr: %s, info: %02X"
@@ -701,11 +711,6 @@ msgstr "Du måste köra %s som PostgreSQL:s superuser."
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "kunde inte läsa rättigheter på katalog \"%s\": %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -726,154 +731,154 @@ msgstr "servrarna divergerade vid WAL-position %X/%X på tidslinje %u"
 msgid "no rewind required"
 msgstr "ingen rewind krävs"
 
-#: pg_rewind.c:460
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr "rewind från senaste gemensamma checkpoint vid %X/%X på tidslinje %u"
 
-#: pg_rewind.c:470
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "läser källfillista"
 
-#: pg_rewind.c:474
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "läser målfillista"
 
-#: pg_rewind.c:483
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "läser WAL i målet"
 
-#: pg_rewind.c:504
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "behöver kopiera %lu MB (total källkatalogstorlek är %lu MB)"
 
-#: pg_rewind.c:522
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "synkar måldatakatalog"
 
-#: pg_rewind.c:538
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "Klar!"
 
-#: pg_rewind.c:618
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "ingen åtgärd beslutades för filen \"%s\""
 
-#: pg_rewind.c:650
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "källsystemet ändrades samtidigt som pg_rewind kördes"
 
-#: pg_rewind.c:654
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "skapar backupetikett och uppdaterar kontrollfil"
 
-#: pg_rewind.c:704
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "källsystemet var i ett oväntat tillstånd vid slutet av återspolningen"
 
-#: pg_rewind.c:736
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "källa och målkluster är från olika system"
 
-#: pg_rewind.c:744
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "klustren är inte kompatibla med denna version av pg_rewind"
 
-#: pg_rewind.c:754
+#: pg_rewind.c:759
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\""
 msgstr "målservern behöver använda antingen datachecksums eller \"wal_log_hints = on\""
 
-#: pg_rewind.c:765
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "målserver måste stängas ner utan fel"
 
-#: pg_rewind.c:775
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "måldatakatalog måste stängas ner utan fel"
 
-#: pg_rewind.c:822
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "%*s/%s kB (%d%%) kopierad"
 
-#: pg_rewind.c:948
+#: pg_rewind.c:953
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines"
 msgstr "kunde inte finna en gemensam anfader av källa och målklusterets tidslinjer"
 
-#: pg_rewind.c:989
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "backupetikett-buffer för liten"
 
-#: pg_rewind.c:1012
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "oväntad kontrollfil-CRC"
 
-#: pg_rewind.c:1024
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
 msgstr "oväntad kontrollfilstorlek %d, förväntade %d"
 
-#: pg_rewind.c:1034
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
 msgstr[0] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 msgstr[1] "ogiltigt WAL-segmentstorlek i kontrollfil (%d byte)"
 
-#: pg_rewind.c:1038
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "WAL-segmentstorleken måste vara en tvåpotens mellan 1 MB och 1 GB."
 
-#: pg_rewind.c:1075 pg_rewind.c:1143
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\""
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s"
 
-#: pg_rewind.c:1107
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
-msgstr "kunde inte läsa restore_command från målklustret"
+msgid "could not read \"restore_command\" from target cluster"
+msgstr "kunde inte läsa \"restore_command\" från målklustret"
 
-#: pg_rewind.c:1112
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "\"restore_command\" är inte satt i målklustret"
 
-#: pg_rewind.c:1150
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr "kör \"%s\" för målservern för att slutföra krashåterställning"
 
-#: pg_rewind.c:1188
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr "postgres enanvändarläge misslyckades i målklustret"
 
-#: pg_rewind.c:1189
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "Kommandot var: %s"
@@ -913,157 +918,157 @@ msgstr "ogiltig data i historikfil"
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "Tidslinje-ID:er måste vara mindre än barnens tidslinje-ID:er."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postlängd vid %X/%X: förväntade minst %u, fick %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord är begärd vid %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postlängd vid %X/%X: förväntade minst %u, fick %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "det finns ingen contrecord-flagga vid %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "ogiltig contrecord-längd %u (förväntade %lld) vid %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ogiltigt resurshanterar-ID %u vid %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "post med inkorrekt prev-link %X/%X vid %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "felaktig resurshanterardatakontrollsumma i post vid %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "felaktigt magiskt nummer %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ogiltiga infobitar %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %llu, pg_control databassystemidentifierare är %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %<PRIu64>, pg_control databassystemidentifierare är %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt segmentstorlek i sidhuvud"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt XLOG_BLCKSZ i sidhuvud"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "oväntad sidadress %X/%X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ej-i-sekvens för tidslinje-ID %u (efter %u) i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "ej-i-sekvens block_id %u vid %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är satt men ingen data inkluderad vid %X/%X"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är ej satt men datalängden är %u vid %X/%X"
 
-#: xlogreader.c:1816
+#: xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är satt men håloffset %u längd %u blockavbildlängd %u vid %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är inte satt men håloffset %u längd %u vid %X/%X"
 
-#: xlogreader.c:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED är satt men blockavbildlängd %u vid %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "varken BKPIMAGE_HAS_HOLE eller BKPIMAGE_COMPRESSED är satt men blockavbildlängd är %u vid %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL är satt men ingen tidigare rel vid %X/%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ogiltig block_id %u vid %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "post med ogiltig längd vid %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "kunde inte hitta backup-block med ID %d i WAL-post"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt block %d angivet"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt state, block %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med %s stöds inte av bygget, block %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med okänd metod, block %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "kunde inte packa upp avbild vid %X/%X, block %d"
diff --git a/src/bin/pg_rewind/po/uk.po b/src/bin/pg_rewind/po/uk.po
index dfcc9ac3269..bb7bf614ff2 100644
--- a/src/bin/pg_rewind/po/uk.po
+++ b/src/bin/pg_rewind/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:23+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:23+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_rewind.pot\n"
-"X-Crowdin-File-ID: 1030\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_rewind.pot\n"
+"X-Crowdin-File-ID: 1093\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -42,19 +42,19 @@ msgstr "підказка: "
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
 
-#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:104
-#: local_source.c:163 parsexlog.c:350
+#: ../../common/controldata_utils.c:110 file_ops.c:341 local_source.c:102
+#: local_source.c:161 parsexlog.c:371
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не вдалося прочитати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:352
+#: ../../common/controldata_utils.c:119 file_ops.c:344 parsexlog.c:373
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %zu"
 
 #: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
-#: local_source.c:121 local_source.c:172
+#: local_source.c:119 local_source.c:170
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "неможливо закрити файл \"%s\": %m"
@@ -72,10 +72,10 @@ msgid "possible byte ordering mismatch\n"
 msgstr "можлива помилка у послідовності байтів.\n"
 "Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
 
-#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:70
-#: ../../common/file_utils.c:347 ../../common/file_utils.c:406
-#: ../../common/file_utils.c:480 ../../fe_utils/recovery_gen.c:140
-#: parsexlog.c:312
+#: ../../common/controldata_utils.c:230 ../../common/file_utils.c:69
+#: ../../common/file_utils.c:370 ../../common/file_utils.c:428
+#: ../../common/file_utils.c:502 ../../fe_utils/recovery_gen.c:141
+#: parsexlog.c:333
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
@@ -85,8 +85,8 @@ msgstr "не можливо відкрити файл \"%s\": %m"
 msgid "could not write file \"%s\": %m"
 msgstr "не вдалося записати файл \"%s\": %m"
 
-#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:418
-#: ../../common/file_utils.c:488
+#: ../../common/controldata_utils.c:268 ../../common/file_utils.c:440
+#: ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
@@ -102,34 +102,34 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #: ../../fe_utils/archive.c:86 file_ops.c:417
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281 file_ops.c:388
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304 file_ops.c:388
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315 file_ops.c:462
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338 file_ops.c:462
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -214,29 +214,34 @@ msgstr "%s має бути в діапазоні %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
-#: ../../fe_utils/recovery_gen.c:39 ../../fe_utils/recovery_gen.c:50
-#: ../../fe_utils/recovery_gen.c:89 ../../fe_utils/recovery_gen.c:109
-#: ../../fe_utils/recovery_gen.c:168
+#: ../../fe_utils/recovery_gen.c:40 ../../fe_utils/recovery_gen.c:51
+#: ../../fe_utils/recovery_gen.c:90 ../../fe_utils/recovery_gen.c:110
+#: ../../fe_utils/recovery_gen.c:169 ../../fe_utils/recovery_gen.c:230
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
-#: ../../fe_utils/recovery_gen.c:143
+#: ../../fe_utils/recovery_gen.c:144
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "неможливо записати до файлу \"%s\": %m"
 
-#: ../../fe_utils/recovery_gen.c:152
+#: ../../fe_utils/recovery_gen.c:153
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "неможливо створити файл \"%s\": %m"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/recovery_gen.c:215 pg_rewind.c:311
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
@@ -316,177 +321,177 @@ msgstr "таргет символічного посилання \"%s\" задо
 msgid "could not close directory \"%s\": %m"
 msgstr "не вдалося закрити каталог \"%s\": %m"
 
-#: filemap.c:235
+#: filemap.c:298
 #, c-format
 msgid "data file \"%s\" in source is not a regular file"
 msgstr "файл даних \"%s\" в джерелі не є регулярним файлом"
 
-#: filemap.c:240 filemap.c:273
+#: filemap.c:303 filemap.c:336
 #, c-format
 msgid "duplicate source file \"%s\""
 msgstr "дублікат вихідного файлу \"%s\""
 
-#: filemap.c:328
+#: filemap.c:391
 #, c-format
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "неочікувана модифікація сторінки для нерегулярного файлу \"%s\""
 
-#: filemap.c:682 filemap.c:776
+#: filemap.c:744 filemap.c:846
 #, c-format
 msgid "unknown file type for \"%s\""
 msgstr "невідомий тип файлу для \"%s\""
 
-#: filemap.c:709
+#: filemap.c:779
 #, c-format
 msgid "file \"%s\" is of different type in source and target"
 msgstr "файл \"%s\" має різні типи у джерелі та цілі"
 
-#: filemap.c:781
+#: filemap.c:851
 #, c-format
 msgid "could not decide what to do with file \"%s\""
 msgstr "не вдалося вирішити, що робити з файлом \"%s\""
 
-#: libpq_source.c:131
+#: libpq_source.c:130
 #, c-format
 msgid "could not clear \"search_path\": %s"
 msgstr "не вдалося очистити \"search_path\": %s"
 
-#: libpq_source.c:142
+#: libpq_source.c:141
 #, c-format
 msgid "\"full_page_writes\" must be enabled in the source server"
 msgstr "\"full_page_writes\" слід ввімкнути на вихідному сервері"
 
-#: libpq_source.c:153
+#: libpq_source.c:152
 #, c-format
 msgid "could not prepare statement to fetch file contents: %s"
 msgstr "не вдалося підготувати інструкцію щоб отримати вміст файлу: %s"
 
-#: libpq_source.c:172
+#: libpq_source.c:171
 #, c-format
 msgid "error running query (%s) on source server: %s"
 msgstr "помилка при виконанні запиту (%s) на вихідному сервері: %s"
 
-#: libpq_source.c:177
+#: libpq_source.c:176
 #, c-format
 msgid "unexpected result set from query"
 msgstr "неочікуваний результат запиту"
 
-#: libpq_source.c:199
+#: libpq_source.c:198
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "помилка при виконанні запиту (%s) на початковому сервері: %s"
 
-#: libpq_source.c:220
+#: libpq_source.c:219
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location"
 msgstr "нерозпізнаний результат \"%s\" замість поточної добавленої позиції WAL"
 
-#: libpq_source.c:271
+#: libpq_source.c:270
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "не вдалося отримати список файлів: %s"
 
-#: libpq_source.c:276
+#: libpq_source.c:275
 #, c-format
 msgid "unexpected result set while fetching file list"
 msgstr "неочікуваний результат при отриманні списку файлів"
 
-#: libpq_source.c:477
+#: libpq_source.c:476
 #, c-format
 msgid "could not send query: %s"
 msgstr "не вдалося надіслати запит: %s"
 
-#: libpq_source.c:480
+#: libpq_source.c:479
 #, c-format
 msgid "could not set libpq connection to single row mode"
 msgstr "не вдалося встановити libpq з'єднання для однорядкового режиму"
 
-#: libpq_source.c:510
+#: libpq_source.c:509
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "неочікуваний результат при отриманні віддалених файлів: %s"
 
-#: libpq_source.c:515
+#: libpq_source.c:514
 #, c-format
 msgid "received more data chunks than requested"
 msgstr "отримано більше фрагментів даних, ніж запитувалось"
 
-#: libpq_source.c:519
+#: libpq_source.c:518
 #, c-format
 msgid "unexpected result set size while fetching remote files"
 msgstr "неочікуваний розмір набору результатів при отриманні віддалених файлів"
 
-#: libpq_source.c:525
+#: libpq_source.c:524
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u"
 msgstr "неочікувані типи даних в результаті при отриманні віддалених файлів: %u %u %u"
 
-#: libpq_source.c:533
+#: libpq_source.c:532
 #, c-format
 msgid "unexpected result format while fetching remote files"
 msgstr "неочікуваний формат результату при отриманні віддалених файлів"
 
-#: libpq_source.c:539
+#: libpq_source.c:538
 #, c-format
 msgid "unexpected null values in result while fetching remote files"
 msgstr "неочікувані нульові значення в результаті при отриманні віддалених файлів"
 
-#: libpq_source.c:543
+#: libpq_source.c:542
 #, c-format
 msgid "unexpected result length while fetching remote files"
 msgstr "неочікувана довжина результату при отриманні віддалених файлів"
 
-#: libpq_source.c:576
+#: libpq_source.c:575
 #, c-format
 msgid "received data for file \"%s\", when requested for \"%s\""
 msgstr "отримані дані для файлу \"%s\", коли запитувалось для \"%s\""
 
-#: libpq_source.c:580
+#: libpq_source.c:579
 #, c-format
-msgid "received data at offset %lld of file \"%s\", when requested for offset %lld"
-msgstr "отримано дані по зсуву %lld файлу \"%s\", коли запитувалось про зсув %lld"
+msgid "received data at offset %<PRId64> of file \"%s\", when requested for offset %lld"
+msgstr "отримано дані по зсуву %<PRId64> файлу \"%s\", коли запитувалось про зсув %lld"
 
-#: libpq_source.c:592
+#: libpq_source.c:591
 #, c-format
 msgid "received more than requested for file \"%s\""
 msgstr "отримано більше, ніж запитувалось для файлу \"%s\""
 
-#: libpq_source.c:605
+#: libpq_source.c:604
 #, c-format
 msgid "unexpected number of data chunks received"
 msgstr "отримано неочікувану кількість фрагментів даних"
 
-#: libpq_source.c:648
+#: libpq_source.c:647
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "не вдалося отримати віддалений файл \"%s\": %s"
 
-#: libpq_source.c:653
+#: libpq_source.c:652
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\""
 msgstr "неочікуваний набір результатів при отриманні віддаленого файлу \"%s\""
 
-#: local_source.c:90 local_source.c:142
+#: local_source.c:88 local_source.c:140
 #, c-format
 msgid "could not open source file \"%s\": %m"
 msgstr "не вдалося відкрити вихідний файл \"%s\": %m"
 
-#: local_source.c:117
+#: local_source.c:115
 #, c-format
 msgid "size of source file \"%s\" changed concurrently: %d bytes expected, %d copied"
 msgstr "розмір вихідного файлу \"%s\" паралельно змінився: очікувалося %d байт, %d скопійовано"
 
-#: local_source.c:146
+#: local_source.c:144
 #, c-format
 msgid "could not seek in source file: %m"
 msgstr "не вдалося знайти у вихідному файлі: %m"
 
-#: local_source.c:165
+#: local_source.c:163
 #, c-format
 msgid "unexpected EOF while reading file \"%s\""
 msgstr "неочікуваний кінець при читанні файлу \"%s\""
 
-#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:199
+#: parsexlog.c:80 parsexlog.c:139 parsexlog.c:201
 #, c-format
 msgid "out of memory while allocating a WAL reading processor"
 msgstr "недостатньо пам'яті під час виділення обробника читання WAL"
@@ -506,22 +511,22 @@ msgstr "не вдалося прочитати запис WAL на %X/%X"
 msgid "end pointer %X/%X is not a valid end point; expected %X/%X"
 msgstr "кінцевий покажчик %X/%X не є допустимою кінцевою точкою; очікувалось %X/%X"
 
-#: parsexlog.c:212
+#: parsexlog.c:214
 #, c-format
 msgid "could not find previous WAL record at %X/%X: %s"
 msgstr "не вдалося знайти попередній запис WAL на %X/%X: %s"
 
-#: parsexlog.c:216
+#: parsexlog.c:218
 #, c-format
 msgid "could not find previous WAL record at %X/%X"
 msgstr "не вдалося знайти попередній запис WAL на %X/%X"
 
-#: parsexlog.c:341
+#: parsexlog.c:362
 #, c-format
 msgid "could not seek in file \"%s\": %m"
 msgstr "не вдалося знайти в файлі \"%s\": %m"
 
-#: parsexlog.c:440
+#: parsexlog.c:461
 #, c-format
 msgid "WAL record modifies a relation, but record type is not recognized: lsn: %X/%X, rmid: %d, rmgr: %s, info: %02X"
 msgstr "WAL модифікує відношення, але тип запису не розпізнано: lsn: %X/%X, rmid: %d, rmgr: %s, info: %02X"
@@ -678,11 +683,6 @@ msgstr "Запускати %s треба від суперкористувача
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не вдалося прочитати дозволи на каталог \"%s\": %m"
 
-#: pg_rewind.c:311
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pg_rewind.c:314
 #, c-format
 msgid "connected to server"
@@ -703,112 +703,112 @@ msgstr "сервери розійшлись в позиції WAL %X/%X на л
 msgid "no rewind required"
 msgstr "перемотування не потрібне"
 
-#: pg_rewind.c:460
+#: pg_rewind.c:464
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u"
 msgstr "перемотування від останньої спільної контрольної точки на %X/%X на лінії часу %u"
 
-#: pg_rewind.c:470
+#: pg_rewind.c:474
 #, c-format
 msgid "reading source file list"
 msgstr "читання списку файлів із джерела"
 
-#: pg_rewind.c:474
+#: pg_rewind.c:478
 #, c-format
 msgid "reading target file list"
 msgstr "читання списку цільових файлів"
 
-#: pg_rewind.c:483
+#: pg_rewind.c:487
 #, c-format
 msgid "reading WAL in target"
 msgstr "читання WAL у цілі"
 
-#: pg_rewind.c:504
+#: pg_rewind.c:508
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)"
 msgstr "треба скопіювати %lu МБ (загальний розмір каталогу джерела становить %lu МБ)"
 
-#: pg_rewind.c:522
+#: pg_rewind.c:526
 #, c-format
 msgid "syncing target data directory"
 msgstr "синхронізація цільового каталогу даних"
 
-#: pg_rewind.c:538
+#: pg_rewind.c:543
 #, c-format
 msgid "Done!"
 msgstr "Готово!"
 
-#: pg_rewind.c:618
+#: pg_rewind.c:623
 #, c-format
 msgid "no action decided for file \"%s\""
 msgstr "жодних дій щодо файлу \"%s\" не прийнято"
 
-#: pg_rewind.c:650
+#: pg_rewind.c:655
 #, c-format
 msgid "source system was modified while pg_rewind was running"
 msgstr "вихідну систему було змінено під час роботи pg_rewind"
 
-#: pg_rewind.c:654
+#: pg_rewind.c:659
 #, c-format
 msgid "creating backup label and updating control file"
 msgstr "створення мітки резервного копіювання і оновлення контрольного файлу"
 
-#: pg_rewind.c:704
+#: pg_rewind.c:709
 #, c-format
 msgid "source system was in unexpected state at end of rewind"
 msgstr "вихідна система була в неочікуваному стані наприкінці перемотування"
 
-#: pg_rewind.c:736
+#: pg_rewind.c:741
 #, c-format
 msgid "source and target clusters are from different systems"
 msgstr "початковий і цільовий кластер належать до різних систем"
 
-#: pg_rewind.c:744
+#: pg_rewind.c:749
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind"
 msgstr "кластери не сумісні з даною версією pg_rewind"
 
-#: pg_rewind.c:754
+#: pg_rewind.c:759
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\""
 msgstr "цільовий сервер потребує використання контрольної суми даних або \"wal_log_hints = on\""
 
-#: pg_rewind.c:765
+#: pg_rewind.c:770
 #, c-format
 msgid "target server must be shut down cleanly"
 msgstr "цільовий сервер повинен бути вимкненим штатно"
 
-#: pg_rewind.c:775
+#: pg_rewind.c:780
 #, c-format
 msgid "source data directory must be shut down cleanly"
 msgstr "робота з початковим каталогом даних повинна бути завершена штатно"
 
-#: pg_rewind.c:822
+#: pg_rewind.c:827
 #, c-format
 msgid "%*s/%s kB (%d%%) copied"
 msgstr "скопійовано %*s/%s кБ (%d%%)"
 
-#: pg_rewind.c:948
+#: pg_rewind.c:953
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines"
 msgstr "не вдалося знайти спільного предка ліній часу початкового та цільового кластерів"
 
-#: pg_rewind.c:989
+#: pg_rewind.c:994
 #, c-format
 msgid "backup label buffer too small"
 msgstr "буфер для мітки резервного копіювання замалий"
 
-#: pg_rewind.c:1012
+#: pg_rewind.c:1017
 #, c-format
 msgid "unexpected control file CRC"
 msgstr "неочікуваний контрольний файл CRC"
 
-#: pg_rewind.c:1024
+#: pg_rewind.c:1029
 #, c-format
 msgid "unexpected control file size %d, expected %d"
 msgstr "неочікуваний розмір контрольного файлу %d, очікувалося %d"
 
-#: pg_rewind.c:1034
+#: pg_rewind.c:1039
 #, c-format
 msgid "invalid WAL segment size in control file (%d byte)"
 msgid_plural "invalid WAL segment size in control file (%d bytes)"
@@ -817,42 +817,42 @@ msgstr[1] "невірний розмір сегмента WAL у файлі ке
 msgstr[2] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 msgstr[3] "невірний розмір сегмента WAL у файлі керування (%d байтів)"
 
-#: pg_rewind.c:1038
+#: pg_rewind.c:1043
 #, c-format
 msgid "The WAL segment size must be a power of two between 1 MB and 1 GB."
 msgstr "Розмір сегмента WAL повинен бути степенем двійки від 1 МБ до 1 ГБ."
 
-#: pg_rewind.c:1075 pg_rewind.c:1143
+#: pg_rewind.c:1080 pg_rewind.c:1148
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\""
 
-#: pg_rewind.c:1078 pg_rewind.c:1146
+#: pg_rewind.c:1083 pg_rewind.c:1151
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s"
 
-#: pg_rewind.c:1107
+#: pg_rewind.c:1112
 #, c-format
-msgid "could not read restore_command from target cluster"
+msgid "could not read \"restore_command\" from target cluster"
 msgstr "не вдалося прочитати \"restore_command\" з цільового кластеру"
 
-#: pg_rewind.c:1112
+#: pg_rewind.c:1117
 #, c-format
 msgid "\"restore_command\" is not set in the target cluster"
 msgstr "команда \"restore_command\" не встановлена в цільовому кластері"
 
-#: pg_rewind.c:1150
+#: pg_rewind.c:1155
 #, c-format
 msgid "executing \"%s\" for target server to complete crash recovery"
 msgstr "виконання \"%s\" для цільового серверу, щоб завершити відновлення після аварійного завершення роботи"
 
-#: pg_rewind.c:1188
+#: pg_rewind.c:1193
 #, c-format
 msgid "postgres single-user mode in target cluster failed"
 msgstr "не вдалося ввімкнути однокористувацький режим postgres в цільовому кластері"
 
-#: pg_rewind.c:1189
+#: pg_rewind.c:1194
 #, c-format
 msgid "Command was: %s"
 msgstr "Команда була: %s"
@@ -892,157 +892,157 @@ msgstr "неприпустимі дані у файлі історії"
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "Ідентифікатори ліній часу повинні бути меншими від ідентифікатора дочірньої лінії."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "неприпустиме зміщення запису в %X/%X: очікувалось хоча б %u, отримано %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "по зсуву %X/%X запитано продовження запису"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "неприпустима довжина запису %X/%X: очікувалась мінімум %u, отримано %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
-msgstr "немає прапорця contrecord в позиції %X/%X"
+msgstr "немає прапора contrecord на %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неприпустима довжина contrecord %u (очікувалось %lld) на %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "невірний ID менеджера ресурсів %u в %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запис з неправильним попереднім посиланням %X/%X на %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "некоректна контрольна сума даних менеджера ресурсів у запису по зсуву %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірне магічне число %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірні інформаційні біти %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %llu, а ідентифікатор системи баз даних pg_control - %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %<PRIu64>, а ідентифікатор системи баз даних pg_control - %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний розмір сегменту в заголовку сторінки"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний XLOG_BLCKSZ в заголовку сторінки"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неочікуваний pageaddr %X/%X у сегменті WAL %s, LSN %X/%X, зміщення %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "порушення послідовності ID лінії часу %u (після %u) у сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "ідентифікатор блока %u out-of-order в позиції %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA встановлений, але немає даних в позиції %X/%X"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE встановлений, але для пропуску задані: зсув %u, довжина %u, при довжині образу блока %u в позиції %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED встановлений, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ні BKPIMAGE_HAS_HOLE, ні BKPIMAGE_COMPRESSED не встановлені, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL встановлений, але попереднє значення не задано в позиції %X/%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "невірний ідентифікатор блоку %u в позиції %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запис з невірною довжиною на %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не вдалося знайти блок резервної копії з ID %d у записі WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "не вдалося відновити зображення %X/%X з недійсним вказаним блоком %d"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "не вдалося відновити зображення %X/%X з недійсним станом, блок %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "не вдалося відновити зображення в %X/%X, стиснуте %s, не підтримується збіркою, блок %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "не вдалося відновити зображення %X/%X стиснуте з невідомим методом, блок %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не вдалося розпакувати зображення на %X/%X, блок %d"
diff --git a/src/bin/pg_test_fsync/po/es.po b/src/bin/pg_test_fsync/po/es.po
index dff84abf123..d231455cde5 100644
--- a/src/bin/pg_test_fsync/po/es.po
+++ b/src/bin/pg_test_fsync/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_test_fsync (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:53+0000\n"
+"POT-Creation-Date: 2026-02-06 23:22+0000\n"
 "PO-Revision-Date: 2024-11-16 14:24+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.4.3\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -52,87 +52,87 @@ msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
 #. translator: maintain alignment with NA_FORMAT
-#: pg_test_fsync.c:38
+#: pg_test_fsync.c:37
 #, c-format
 msgid "%13.3f ops/sec  %6.0f usecs/op\n"
 msgstr "%13.3f ops/seg  %6.0f usegs/op\n"
 
-#: pg_test_fsync.c:56
+#: pg_test_fsync.c:55
 #, c-format
 msgid "could not create thread for alarm"
 msgstr "no se pudo crear el thread para la alarma"
 
-#: pg_test_fsync.c:101
+#: pg_test_fsync.c:100
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: pg_test_fsync.c:165
+#: pg_test_fsync.c:163
 #, c-format
 msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
 msgstr "Empleo: %s [-f ARCHIVO] [-s SEG-POR-PRUEBA]\n"
 
-#: pg_test_fsync.c:191
+#: pg_test_fsync.c:189
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "argumento no válido para la opción %s"
 
-#: pg_test_fsync.c:192 pg_test_fsync.c:204 pg_test_fsync.c:213
+#: pg_test_fsync.c:190 pg_test_fsync.c:202 pg_test_fsync.c:211
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_test_fsync.c:198
+#: pg_test_fsync.c:196
 #, c-format
 msgid "%s must be in range %u..%u"
 msgstr "%s debe estar en el rango %u..%u"
 
-#: pg_test_fsync.c:211
+#: pg_test_fsync.c:209
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_test_fsync.c:217
+#: pg_test_fsync.c:215
 #, c-format
 msgid "%u second per test\n"
 msgid_plural "%u seconds per test\n"
 msgstr[0] "%u segundo por prueba\n"
 msgstr[1] "%u segundos por prueba\n"
 
-#: pg_test_fsync.c:222
+#: pg_test_fsync.c:220
 #, c-format
 msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
 msgstr "O_DIRECT tiene soporte en esta plataforma para open_datasync y open_sync.\n"
 
-#: pg_test_fsync.c:224
+#: pg_test_fsync.c:222
 #, c-format
 msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
 msgstr "F_NOCACHE tiene soporte en esta plataforma para open_datasync y open_sync.\n"
 
-#: pg_test_fsync.c:226
+#: pg_test_fsync.c:224
 #, c-format
 msgid "Direct I/O is not supported on this platform.\n"
 msgstr "Direct I/O no está soportado en esta plataforma.\n"
 
-#: pg_test_fsync.c:251 pg_test_fsync.c:341 pg_test_fsync.c:363
-#: pg_test_fsync.c:387 pg_test_fsync.c:531 pg_test_fsync.c:543
-#: pg_test_fsync.c:559 pg_test_fsync.c:565 pg_test_fsync.c:587
+#: pg_test_fsync.c:249 pg_test_fsync.c:339 pg_test_fsync.c:361
+#: pg_test_fsync.c:385 pg_test_fsync.c:529 pg_test_fsync.c:541
+#: pg_test_fsync.c:557 pg_test_fsync.c:563 pg_test_fsync.c:585
 msgid "could not open output file"
 msgstr "no se pudo abrir el archivo de salida"
 
-#: pg_test_fsync.c:255 pg_test_fsync.c:325 pg_test_fsync.c:350
-#: pg_test_fsync.c:372 pg_test_fsync.c:396 pg_test_fsync.c:435
-#: pg_test_fsync.c:494 pg_test_fsync.c:533 pg_test_fsync.c:561
-#: pg_test_fsync.c:592
+#: pg_test_fsync.c:253 pg_test_fsync.c:323 pg_test_fsync.c:348
+#: pg_test_fsync.c:370 pg_test_fsync.c:394 pg_test_fsync.c:433
+#: pg_test_fsync.c:492 pg_test_fsync.c:531 pg_test_fsync.c:559
+#: pg_test_fsync.c:590
 msgid "write failed"
 msgstr "escritura falló"
 
-#: pg_test_fsync.c:259 pg_test_fsync.c:374 pg_test_fsync.c:398
-#: pg_test_fsync.c:535 pg_test_fsync.c:567
+#: pg_test_fsync.c:257 pg_test_fsync.c:372 pg_test_fsync.c:396
+#: pg_test_fsync.c:533 pg_test_fsync.c:565
 msgid "fsync failed"
 msgstr "fsync falló"
 
-#: pg_test_fsync.c:298
+#: pg_test_fsync.c:296
 #, c-format
 msgid ""
 "\n"
@@ -141,7 +141,7 @@ msgstr ""
 "\n"
 "Comparar métodos de sincronización de archivos usando una escritura de %dkB:\n"
 
-#: pg_test_fsync.c:300
+#: pg_test_fsync.c:298
 #, c-format
 msgid ""
 "\n"
@@ -150,21 +150,21 @@ msgstr ""
 "\n"
 "Comparar métodos de sincronización de archivos usando dos escrituras de %dkB:\n"
 
-#: pg_test_fsync.c:301
+#: pg_test_fsync.c:299
 #, c-format
 msgid "(in \"wal_sync_method\" preference order, except fdatasync is Linux's default)\n"
 msgstr "(en orden de preferencia de «wal_sync_method», excepto en Linux donde fdatasync es el predeterminado)\n"
 
-#: pg_test_fsync.c:312 pg_test_fsync.c:415 pg_test_fsync.c:482
+#: pg_test_fsync.c:310 pg_test_fsync.c:413 pg_test_fsync.c:480
 msgid "n/a*"
 msgstr "n/a*"
 
-#: pg_test_fsync.c:331 pg_test_fsync.c:403 pg_test_fsync.c:441
-#: pg_test_fsync.c:500
+#: pg_test_fsync.c:329 pg_test_fsync.c:401 pg_test_fsync.c:439
+#: pg_test_fsync.c:498
 msgid "n/a"
 msgstr "n/a"
 
-#: pg_test_fsync.c:446
+#: pg_test_fsync.c:444
 #, c-format
 msgid ""
 "* This file system and its mount options do not support direct\n"
@@ -173,7 +173,7 @@ msgstr ""
 "* Este sistema de archivos con sus opciones de montaje no soportan\n"
 "  Direct I/O, e.g. ext4 en modo journal.\n"
 
-#: pg_test_fsync.c:454
+#: pg_test_fsync.c:452
 #, c-format
 msgid ""
 "\n"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "Comparar open_sync con diferentes tamaños de escritura:\n"
 
-#: pg_test_fsync.c:455
+#: pg_test_fsync.c:453
 #, c-format
 msgid ""
 "(This is designed to compare the cost of writing 16kB in different write\n"
@@ -191,27 +191,27 @@ msgstr ""
 "(Esto está diseñado para comparar el costo de escribir 16kB en diferentes\n"
 "tamaños de escrituras open_sync.)\n"
 
-#: pg_test_fsync.c:458
+#: pg_test_fsync.c:456
 msgid " 1 * 16kB open_sync write"
 msgstr " 1 * 16kB escritura open_sync"
 
-#: pg_test_fsync.c:459
+#: pg_test_fsync.c:457
 msgid " 2 *  8kB open_sync writes"
 msgstr " 2 *  8kB escrituras open_sync"
 
-#: pg_test_fsync.c:460
+#: pg_test_fsync.c:458
 msgid " 4 *  4kB open_sync writes"
 msgstr " 4 *  4kB escrituras open_sync"
 
-#: pg_test_fsync.c:461
+#: pg_test_fsync.c:459
 msgid " 8 *  2kB open_sync writes"
 msgstr " 8 *  2kB escrituras open_sync"
 
-#: pg_test_fsync.c:462
+#: pg_test_fsync.c:460
 msgid "16 *  1kB open_sync writes"
 msgstr "16 *  1kB escrituras open_sync"
 
-#: pg_test_fsync.c:516
+#: pg_test_fsync.c:514
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +220,7 @@ msgstr ""
 "\n"
 "Probar si se respeta fsync en un descriptor de archivo que no es de escritura:\n"
 
-#: pg_test_fsync.c:517
+#: pg_test_fsync.c:515
 #, c-format
 msgid ""
 "(If the times are similar, fsync() can sync data written on a different\n"
@@ -229,7 +229,7 @@ msgstr ""
 "(Si los tiempos son similares, fsync() puede sincronizar datos escritos\n"
 "en un descriptor diferente.)\n"
 
-#: pg_test_fsync.c:582
+#: pg_test_fsync.c:580
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_test_fsync/po/ru.po b/src/bin/pg_test_fsync/po/ru.po
index c6fccd00352..2ed3322d0e6 100644
--- a/src/bin/pg_test_fsync/po/ru.po
+++ b/src/bin/pg_test_fsync/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_test_fsync (PostgreSQL) 10\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2024-09-04 18:11+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -49,47 +49,47 @@ msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
 #. translator: maintain alignment with NA_FORMAT
-#: pg_test_fsync.c:38
+#: pg_test_fsync.c:37
 #, c-format
 msgid "%13.3f ops/sec  %6.0f usecs/op\n"
 msgstr "%13.3f оп/с     %6.0f мкс/оп\n"
 
-#: pg_test_fsync.c:56
+#: pg_test_fsync.c:55
 #, c-format
 msgid "could not create thread for alarm"
 msgstr "не удалось создать поток для обработки сигналов"
 
-#: pg_test_fsync.c:101
+#: pg_test_fsync.c:100
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: pg_test_fsync.c:165
+#: pg_test_fsync.c:163
 #, c-format
 msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
 msgstr "Использование: %s [-f ИМЯ_ФАЙЛА ] [-s ТЕСТ_СЕК]\n"
 
-#: pg_test_fsync.c:191
+#: pg_test_fsync.c:189
 #, c-format
 msgid "invalid argument for option %s"
 msgstr "недопустимый аргумент параметра %s"
 
-#: pg_test_fsync.c:192 pg_test_fsync.c:204 pg_test_fsync.c:213
+#: pg_test_fsync.c:190 pg_test_fsync.c:202 pg_test_fsync.c:211
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_test_fsync.c:198
+#: pg_test_fsync.c:196
 #, c-format
 msgid "%s must be in range %u..%u"
 msgstr "значение %s должно быть в диапазоне %u..%u"
 
-#: pg_test_fsync.c:211
+#: pg_test_fsync.c:209
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_test_fsync.c:217
+#: pg_test_fsync.c:215
 #, c-format
 msgid "%u second per test\n"
 msgid_plural "%u seconds per test\n"
@@ -97,42 +97,42 @@ msgstr[0] "на тест отводится %u сек.\n"
 msgstr[1] "на тест отводится %u сек.\n"
 msgstr[2] "на тест отводится %u сек.\n"
 
-#: pg_test_fsync.c:222
+#: pg_test_fsync.c:220
 #, c-format
 msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
 msgstr ""
 "O_DIRECT на этой платформе не поддерживается для open_datasync и open_sync.\n"
 
-#: pg_test_fsync.c:224
+#: pg_test_fsync.c:222
 #, c-format
 msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
 msgstr ""
 "F_NOCACHE на этой платформе поддерживается для open_datasync и open_sync.\n"
 
-#: pg_test_fsync.c:226
+#: pg_test_fsync.c:224
 #, c-format
 msgid "Direct I/O is not supported on this platform.\n"
 msgstr "Прямой ввод/вывод не поддерживается на этой платформе.\n"
 
-#: pg_test_fsync.c:251 pg_test_fsync.c:341 pg_test_fsync.c:363
-#: pg_test_fsync.c:387 pg_test_fsync.c:531 pg_test_fsync.c:543
-#: pg_test_fsync.c:559 pg_test_fsync.c:565 pg_test_fsync.c:587
+#: pg_test_fsync.c:249 pg_test_fsync.c:339 pg_test_fsync.c:361
+#: pg_test_fsync.c:385 pg_test_fsync.c:529 pg_test_fsync.c:541
+#: pg_test_fsync.c:557 pg_test_fsync.c:563 pg_test_fsync.c:585
 msgid "could not open output file"
 msgstr "не удалось открыть выходной файл"
 
-#: pg_test_fsync.c:255 pg_test_fsync.c:325 pg_test_fsync.c:350
-#: pg_test_fsync.c:372 pg_test_fsync.c:396 pg_test_fsync.c:435
-#: pg_test_fsync.c:494 pg_test_fsync.c:533 pg_test_fsync.c:561
-#: pg_test_fsync.c:592
+#: pg_test_fsync.c:253 pg_test_fsync.c:323 pg_test_fsync.c:348
+#: pg_test_fsync.c:370 pg_test_fsync.c:394 pg_test_fsync.c:433
+#: pg_test_fsync.c:492 pg_test_fsync.c:531 pg_test_fsync.c:559
+#: pg_test_fsync.c:590
 msgid "write failed"
 msgstr "ошибка записи"
 
-#: pg_test_fsync.c:259 pg_test_fsync.c:374 pg_test_fsync.c:398
-#: pg_test_fsync.c:535 pg_test_fsync.c:567
+#: pg_test_fsync.c:257 pg_test_fsync.c:372 pg_test_fsync.c:396
+#: pg_test_fsync.c:533 pg_test_fsync.c:565
 msgid "fsync failed"
 msgstr "ошибка синхронизации с ФС"
 
-#: pg_test_fsync.c:298
+#: pg_test_fsync.c:296
 #, c-format
 msgid ""
 "\n"
@@ -141,7 +141,7 @@ msgstr ""
 "\n"
 "Сравнение методов синхронизации файлов при однократной записи %d КБ:\n"
 
-#: pg_test_fsync.c:300
+#: pg_test_fsync.c:298
 #, c-format
 msgid ""
 "\n"
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Сравнение методов синхронизации файлов при двухкратной записи %d КБ:\n"
 
-#: pg_test_fsync.c:301
+#: pg_test_fsync.c:299
 #, c-format
 msgid ""
 "(in \"wal_sync_method\" preference order, except fdatasync is Linux's "
@@ -159,16 +159,16 @@ msgstr ""
 "(в порядке предпочтения для \"wal_sync_method\", за исключением того, что в "
 "Linux предпочитается fdatasync)\n"
 
-#: pg_test_fsync.c:312 pg_test_fsync.c:415 pg_test_fsync.c:482
+#: pg_test_fsync.c:310 pg_test_fsync.c:413 pg_test_fsync.c:480
 msgid "n/a*"
 msgstr "н/д*"
 
-#: pg_test_fsync.c:331 pg_test_fsync.c:403 pg_test_fsync.c:441
-#: pg_test_fsync.c:500
+#: pg_test_fsync.c:329 pg_test_fsync.c:401 pg_test_fsync.c:439
+#: pg_test_fsync.c:498
 msgid "n/a"
 msgstr "н/д"
 
-#: pg_test_fsync.c:446
+#: pg_test_fsync.c:444
 #, c-format
 msgid ""
 "* This file system and its mount options do not support direct\n"
@@ -177,7 +177,7 @@ msgstr ""
 "* Эта файловая система с текущими параметрами монтирования не поддерживает\n"
 "  прямой ввод/вывод, как например, ext4 в режиме журналирования.\n"
 
-#: pg_test_fsync.c:454
+#: pg_test_fsync.c:452
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Сравнение open_sync при различных объёмах записываемых данных:\n"
 
-#: pg_test_fsync.c:455
+#: pg_test_fsync.c:453
 #, c-format
 msgid ""
 "(This is designed to compare the cost of writing 16kB in different write\n"
@@ -197,27 +197,27 @@ msgstr ""
 "записи с open_sync.)\n"
 
 # skip-rule: double-space
-#: pg_test_fsync.c:458
+#: pg_test_fsync.c:456
 msgid " 1 * 16kB open_sync write"
 msgstr "запись с open_sync  1 * 16 КБ"
 
-#: pg_test_fsync.c:459
+#: pg_test_fsync.c:457
 msgid " 2 *  8kB open_sync writes"
 msgstr "запись с open_sync  2 *  8 КБ"
 
-#: pg_test_fsync.c:460
+#: pg_test_fsync.c:458
 msgid " 4 *  4kB open_sync writes"
 msgstr "запись с open_sync  4 *  4 КБ"
 
-#: pg_test_fsync.c:461
+#: pg_test_fsync.c:459
 msgid " 8 *  2kB open_sync writes"
 msgstr "запись с open_sync  8 *  2 КБ"
 
-#: pg_test_fsync.c:462
+#: pg_test_fsync.c:460
 msgid "16 *  1kB open_sync writes"
 msgstr "запись с open_sync 16 *  1 КБ"
 
-#: pg_test_fsync.c:516
+#: pg_test_fsync.c:514
 #, c-format
 msgid ""
 "\n"
@@ -227,7 +227,7 @@ msgstr ""
 "Проверка, производится ли fsync с указателем файла, открытого не для "
 "записи:\n"
 
-#: pg_test_fsync.c:517
+#: pg_test_fsync.c:515
 #, c-format
 msgid ""
 "(If the times are similar, fsync() can sync data written on a different\n"
@@ -237,7 +237,7 @@ msgstr ""
 "данные,\n"
 "записанные через другой дескриптор.)\n"
 
-#: pg_test_fsync.c:582
+#: pg_test_fsync.c:580
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_test_fsync/po/sv.po b/src/bin/pg_test_fsync/po/sv.po
index 3d03f5afe8c..c1e5738a3c0 100644
--- a/src/bin/pg_test_fsync/po/sv.po
+++ b/src/bin/pg_test_fsync/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 14:25+0000\n"
-"PO-Revision-Date: 2024-07-12 19:06+0200\n"
+"PO-Revision-Date: 2025-07-29 19:45+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/bin/pg_test_timing/pg_test_timing.c b/src/bin/pg_test_timing/pg_test_timing.c
index ce7aad4b25a..8b358006388 100644
--- a/src/bin/pg_test_timing/pg_test_timing.c
+++ b/src/bin/pg_test_timing/pg_test_timing.c
@@ -149,7 +149,7 @@ test_timing(unsigned int duration)
 		if (diff < 0)
 		{
 			fprintf(stderr, _("Detected clock going backwards in time.\n"));
-			fprintf(stderr, _("Time warp: %d ms\n"), diff);
+			fprintf(stderr, _("Time warp: %d us\n"), diff);
 			exit(1);
 		}
 
diff --git a/src/bin/pg_test_timing/po/de.po b/src/bin/pg_test_timing/po/de.po
index 288d7e6af2d..a2dc1da6317 100644
--- a/src/bin/pg_test_timing/po/de.po
+++ b/src/bin/pg_test_timing/po/de.po
@@ -1,15 +1,15 @@
 # German message translation file for pg_test_timing
-# Copyright (C) 2021 PostgreSQL Global Development Group
+# Copyright (C) 2026 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_test_timing (PostgreSQL) 13\n"
+"Project-Id-Version: pg_test_timing (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-06-16 07:51+0000\n"
-"PO-Revision-Date: 2021-04-12 16:37+0200\n"
+"POT-Creation-Date: 2026-05-05 12:12+0000\n"
+"PO-Revision-Date: 2026-05-06 15:50+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -68,8 +68,8 @@ msgstr "Rückwärts gehende Uhr festgestellt.\n"
 
 #: pg_test_timing.c:152
 #, c-format
-msgid "Time warp: %d ms\n"
-msgstr "Zeitdifferenz: %d ms\n"
+msgid "Time warp: %d us\n"
+msgstr "Zeitdifferenz: %d µs\n"
 
 #: pg_test_timing.c:175
 #, c-format
diff --git a/src/bin/pg_test_timing/po/es.po b/src/bin/pg_test_timing/po/es.po
index c8de0f2c870..58b2dec510f 100644
--- a/src/bin/pg_test_timing/po/es.po
+++ b/src/bin/pg_test_timing/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_test_timing (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:50+0000\n"
+"POT-Creation-Date: 2026-02-06 23:19+0000\n"
 "PO-Revision-Date: 2024-11-16 14:24+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
diff --git a/src/bin/pg_test_timing/po/fr.po b/src/bin/pg_test_timing/po/fr.po
index 3be64c4b32a..106e0c44f87 100644
--- a/src/bin/pg_test_timing/po/fr.po
+++ b/src/bin/pg_test_timing/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-22 10:20+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2026-05-08 18:51+0000\n"
+"PO-Revision-Date: 2026-05-08 21:51+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.9\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
@@ -71,8 +71,8 @@ msgstr "Détection d'une horloge partant à rebours.\n"
 
 #: pg_test_timing.c:152
 #, c-format
-msgid "Time warp: %d ms\n"
-msgstr "Décalage de temps : %d ms\n"
+msgid "Time warp: %d us\n"
+msgstr "Décalage de temps : %d us\n"
 
 #: pg_test_timing.c:175
 #, c-format
diff --git a/src/bin/pg_test_timing/po/sv.po b/src/bin/pg_test_timing/po/sv.po
index d1fcae77547..ede1215ede3 100644
--- a/src/bin/pg_test_timing/po/sv.po
+++ b/src/bin/pg_test_timing/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 14:21+0000\n"
-"PO-Revision-Date: 2024-07-12 19:07+0200\n"
+"PO-Revision-Date: 2025-07-29 19:45+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/bin/pg_test_timing/po/uk.po b/src/bin/pg_test_timing/po/uk.po
index 52837fbbda2..a9a0536d5ab 100644
--- a/src/bin/pg_test_timing/po/uk.po
+++ b/src/bin/pg_test_timing/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:21+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:51+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_test_timing.pot\n"
-"X-Crowdin-File-ID: 1002\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_test_timing.pot\n"
+"X-Crowdin-File-ID: 1057\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 81865cd3e48..7fd4b3886da 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -23,6 +23,7 @@ static void check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster);
 static void check_for_user_defined_postfix_ops(ClusterInfo *cluster);
 static void check_for_incompatible_polymorphics(ClusterInfo *cluster);
 static void check_for_tables_with_oids(ClusterInfo *cluster);
+static void check_for_not_null_inheritance(ClusterInfo *cluster);
 static void check_for_pg_role_prefix(ClusterInfo *cluster);
 static void check_for_new_tablespace_dir(void);
 static void check_for_user_defined_encoding_conversions(ClusterInfo *cluster);
@@ -419,7 +420,7 @@ process_data_type_check(DbInfo *dbinfo, PGresult *res, void *arg)
 	if (!state->result)
 	{
 		pg_log(PG_REPORT, "failed check: %s", _(state->check->status));
-		appendPQExpBuffer(*state->report, "\n%s\n%s    %s\n",
+		appendPQExpBuffer(*state->report, "\n%s\n%s\n    %s\n",
 						  _(state->check->report_text),
 						  _("A list of the problem columns is in the file:"),
 						  output_path);
@@ -671,6 +672,14 @@ check_and_dump_old_cluster(void)
 	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
 		check_for_tables_with_oids(&old_cluster);
 
+	/*
+	 * Pre-PG 18 allowed child tables to omit not-null constraints that their
+	 * parents columns have, but schema restore fails for them.  Verify there
+	 * are none, iff applicable.
+	 */
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1800)
+		check_for_not_null_inheritance(&old_cluster);
+
 	/*
 	 * Pre-PG 10 allowed tables with 'unknown' type columns and non WAL logged
 	 * hash indexes
@@ -1623,6 +1632,94 @@ check_for_tables_with_oids(ClusterInfo *cluster)
 		check_ok();
 }
 
+/*
+ * Callback function for processing results of query for
+ * check_for_not_null_inheritance.
+ */
+static void
+process_inconsistent_notnull(DbInfo *dbinfo, PGresult *res, void *arg)
+{
+	UpgradeTaskReport *report = (UpgradeTaskReport *) arg;
+	int			ntups = PQntuples(res);
+	int			i_nspname = PQfnumber(res, "nspname");
+	int			i_relname = PQfnumber(res, "relname");
+	int			i_attname = PQfnumber(res, "attname");
+
+	AssertVariableIsOfType(&process_inconsistent_notnull,
+						   UpgradeTaskProcessCB);
+
+	if (ntups == 0)
+		return;
+
+	if (report->file == NULL &&
+		(report->file = fopen_priv(report->path, "w")) == NULL)
+		pg_fatal("could not open file \"%s\": %m", report->path);
+
+	fprintf(report->file, "In database: %s\n", dbinfo->db_name);
+
+	for (int rowno = 0; rowno < ntups; rowno++)
+	{
+		fprintf(report->file, "  %s.%s.%s\n",
+				PQgetvalue(res, rowno, i_nspname),
+				PQgetvalue(res, rowno, i_relname),
+				PQgetvalue(res, rowno, i_attname));
+	}
+}
+
+/*
+ * check_for_not_null_inheritance()
+ *
+ * An attempt to create child tables lacking not-null constraints that are
+ * present in their parents errors out.  This can no longer occur since 18,
+ * but previously there were various ways for that to happen.  Check that
+ * the cluster to be upgraded doesn't have any of those problems.
+ */
+static void
+check_for_not_null_inheritance(ClusterInfo *cluster)
+{
+	UpgradeTaskReport report;
+	UpgradeTask *task;
+	const char *query;
+
+	prep_status("Checking for not-null constraint inconsistencies");
+
+	report.file = NULL;
+	snprintf(report.path, sizeof(report.path), "%s/%s",
+			 log_opts.basedir,
+			 "not_null_inconsistent_columns.txt");
+
+	query = "SELECT nspname, cc.relname, ac.attname "
+		"FROM pg_catalog.pg_inherits i, pg_catalog.pg_attribute ac, "
+		"     pg_catalog.pg_attribute ap, pg_catalog.pg_class cc, "
+		"     pg_catalog.pg_namespace nc "
+		"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "
+		"      AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "
+		"      AND cc.relnamespace = nc.oid "
+		"      AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull";
+
+	task = upgrade_task_create();
+	upgrade_task_add_step(task, query,
+						  process_inconsistent_notnull,
+						  true, &report);
+	upgrade_task_run(task, cluster);
+	upgrade_task_free(task);
+
+	if (report.file)
+	{
+		fclose(report.file);
+		pg_log(PG_REPORT, "fatal");
+		pg_fatal("Your installation contains inconsistent NOT NULL constraints.\n"
+				 "If the parent column(s) are NOT NULL, then the child column must\n"
+				 "also be marked NOT NULL, or the upgrade will fail.\n"
+				 "You can fix this by running\n"
+				 "    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+				 "on each column listed in the file:\n"
+				 "    %s", report.path);
+	}
+	else
+		check_ok();
+}
+
 
 /*
  * check_for_pg_role_prefix()
@@ -1874,14 +1971,19 @@ check_for_unicode_update(ClusterInfo *cluster)
 		"  SELECT oper.oid, oper.oprcode, collid FROM pg_operator oper, collations "
 		"  WHERE oprname IN ('~', '~*', '!~', '!~*', '~~*', '!~~*') AND "
 		"        oprnamespace='pg_catalog'::regnamespace AND "
-		"        oprright='text'::regtype "
+		"        oprright='pg_catalog.text'::pg_catalog.regtype "
 		"), "
 	/* functions that use the input collation for character semantics */
 		"coll_functions(procid, collid) AS ( "
 		"  SELECT proc.oid, collid FROM pg_proc proc, collations "
-		"  WHERE proname IN ('lower','initcap','upper') AND "
-		"        pronamespace='pg_catalog'::regnamespace AND "
-		"        proargtypes[0] = 'text'::regtype "
+		"  WHERE pronamespace='pg_catalog'::regnamespace AND "
+		"        ((proname IN ('lower','initcap','upper','casefold') AND "
+		"          pronargs = 1 AND "
+		"          proargtypes[0] = 'pg_catalog.text'::pg_catalog.regtype) OR "
+		"         (proname = 'substring' AND pronargs = 2 AND "
+		"          proargtypes[0] = 'pg_catalog.text'::pg_catalog.regtype AND "
+		"          proargtypes[1] = 'pg_catalog.text'::pg_catalog.regtype) OR "
+		"         proname LIKE 'regexp_%') "
 	/* include functions behind the operators listed above */
 		"  UNION "
 		"  SELECT procid, collid FROM coll_operators "
@@ -2225,9 +2327,9 @@ check_old_cluster_subscription_state(void)
 	 * states listed below are not supported:
 	 *
 	 * a) SUBREL_STATE_DATASYNC: A relation upgraded while in this state would
-	 * retain a replication slot, which could not be dropped by the sync
-	 * worker spawned after the upgrade because the subscription ID used for
-	 * the slot name won't match anymore.
+	 * retain a replication slot and origin. The sync worker spawned after the
+	 * upgrade cannot drop them because the subscription ID used for the slot
+	 * and origin name no longer matches.
 	 *
 	 * b) SUBREL_STATE_SYNCDONE: A relation upgraded while in this state would
 	 * retain the replication origin when there is a failure in tablesync
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 2b66dc6873b..20130a60b8b 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -3,7 +3,7 @@
  *
  *	controldata functions
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/controldata.c
  */
@@ -624,7 +624,7 @@ get_control_data(ClusterInfo *cluster)
 		(!got_large_object &&
 		 cluster->controldata.ctrl_ver >= LARGE_OBJECT_SIZE_PG_CONTROL_VER) ||
 		!got_date_is_int || !got_data_checksum_version ||
-		!got_database_mode_is_oracle ||
+		//!got_database_mode_is_oracle ||
         (!got_default_char_signedness &&
             cluster->controldata.cat_ver >= DEFAULT_CHAR_SIGNEDNESS_CAT_VER))	
 	{
@@ -767,8 +767,8 @@ check_control_data(ControlData *oldctrl,
 	else if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
 		pg_fatal("old and new cluster pg_controldata checksum versions do not match");
 
-	if (oldctrl->database_mode_is_oracle != newctrl->database_mode_is_oracle)
-		pg_fatal("old and new pg_controldata database mode do not match\n");
+//	if (oldctrl->database_mode_is_oracle != newctrl->database_mode_is_oracle)
+//		pg_fatal("old and new pg_controldata database mode do not match\n");
 }
 
 
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index 183f08ce1e8..806bf3bef97 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -21,9 +21,10 @@ generate_old_dump(void)
 
 	/* run new pg_dumpall binary for globals */
 	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
-			  "\"%s/pg_dumpall\" %s --globals-only --quote-all-identifiers "
+			  "\"%s/pg_dumpall\" %s%s --globals-only --quote-all-identifiers "
 			  "--binary-upgrade %s --no-sync -f \"%s/%s\"",
 			  new_cluster.bindir, cluster_conn_opts(&old_cluster),
+			  protocol_negotiation_supported(&old_cluster) ? "" : " -d \"max_protocol_version=3.0\"",
 			  log_opts.verbose ? "--verbose" : "",
 			  log_opts.dumpdir,
 			  GLOBALS_DUMP_FILE);
@@ -43,6 +44,9 @@ generate_old_dump(void)
 		initPQExpBuffer(&connstr);
 		appendPQExpBufferStr(&connstr, "dbname=");
 		appendConnStrVal(&connstr, old_db->db_name);
+		if (!protocol_negotiation_supported(&old_cluster))
+			appendPQExpBufferStr(&connstr, " max_protocol_version=3.0");
+
 		initPQExpBuffer(&escaped_connstr);
 		appendShellString(&escaped_connstr, connstr.data);
 		termPQExpBuffer(&connstr);
@@ -58,7 +62,7 @@ generate_old_dump(void)
 						   (user_opts.transfer_mode == TRANSFER_MODE_SWAP) ?
 						   "" : "--sequence-data",
 						   log_opts.verbose ? "--verbose" : "",
-						   user_opts.do_statistics ? "--with-statistics" : "--no-statistics",
+						   user_opts.do_statistics ? "--statistics" : "--no-statistics",
 						   log_opts.dumpdir,
 						   sql_file_name, escaped_connstr.data);
 
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 06b19c2d58f..b60d9b24963 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -3,7 +3,7 @@
  *
  *	information support functions
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/info.c
  */
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index b44a072920c..cbdc8058d3e 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -3,7 +3,7 @@
  *
  *	options functions
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/option.c
  */
@@ -115,8 +115,8 @@ parseCommandLine(int argc, char *argv[])
 	if (os_user_effective_id == 0)
 		pg_fatal("%s: cannot be run as root", os_info.progname);
 
-	while ((option = getopt_long(argc, argv, "b:B:cd:D:j:kNo:O:p:P:q:Q:rs:U:v",	
-								 long_options, &optindex)) != -1)
+	while ((option = getopt_long(argc, argv, "b:B:cd:D:gj:kNo:O:p:P:q:Q:rs:U:v",
+					long_options, &optindex)) != -1)
 	{
 		switch (option)
 		{
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 0dcbbb6e8e6..a83f78fbb46 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -3,7 +3,7 @@
  *
  *	main source file
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/pg_upgrade.c
  */
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index d23911923d0..b10599e4587 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -1,7 +1,7 @@
 /*
  *	pg_upgrade.h
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/pg_upgrade.h
  */
@@ -499,6 +499,7 @@ unsigned int str2uint(const char *str);
 /* version.c */
 
 bool		jsonb_9_4_check_applicable(ClusterInfo *cluster);
+bool		protocol_negotiation_supported(const ClusterInfo *cluster);
 void		old_9_6_invalidate_hash_indexes(ClusterInfo *cluster,
 											bool check_mode);
 
diff --git a/src/bin/pg_upgrade/po/de.po b/src/bin/pg_upgrade/po/de.po
index 4a225c29f21..3369224f211 100644
--- a/src/bin/pg_upgrade/po/de.po
+++ b/src/bin/pg_upgrade/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_upgrade (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-08 04:51+0000\n"
-"PO-Revision-Date: 2025-04-08 08:44+0200\n"
+"POT-Creation-Date: 2025-08-07 14:20+0000\n"
+"PO-Revision-Date: 2025-08-08 00:01+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -55,11 +55,11 @@ msgstr "Argument des Shell-Befehls enthält Newline oder Carriage Return: »%s«
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "Datenbankname enthält Newline oder Carriage Return: »%s«\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Prüfe auf systemdefinierte zusammengesetzte Typen in Benutzertabellen"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -72,11 +72,11 @@ msgstr ""
 "nicht aktualisiert werden. Sie können die Problemspalten löschen\n"
 "und das Upgrade neu starten.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Prüfe auf inkompatiblen Datentyp »line«"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -90,11 +90,11 @@ msgstr ""
 "Cluster gegenwärtig nicht aktualisiert werden. Sie können die\n"
 "Problemspalten löschen und das Upgrade neu starten.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Prüfe auf reg*-Datentypen in Benutzertabellen"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -107,11 +107,11 @@ msgstr ""
 "gegenwärtig nicht aktualiert werden. Sie können die Problemspalten\n"
 "löschen und das Upgrade neu starten.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Prüfe auf inkompatiblen Datentyp »aclitem«"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -124,11 +124,11 @@ msgstr ""
 "werden. Sie können die Problemspalten löschen und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Prüfe auf ungültige Benutzerspalten mit Typ »unknown«"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -141,11 +141,11 @@ msgstr ""
 "werden. Sie können die Problemspalten löschen und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "Prüfe auf ungültige Benutzerspalten mit Typ »sql_identifier«"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -158,11 +158,11 @@ msgstr ""
 "werden. Sie können die Problemspalten löschen und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "Prüfe auf inkompatiblen Datentyp »jsonb« in Benutzertabellen"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -175,11 +175,11 @@ msgstr ""
 "aktualisiert werden. Sie können die Problemspalten löschen und das\n"
 "Upgrade neu starten.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "Prüfe auf entfernten Datentyp »abstime« in Benutzertabellen"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -193,11 +193,11 @@ msgstr ""
 "löschen oder in einen anderen Datentyp ändern und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "Prüfe auf entfernten Datentyp »reltime« in Benutzertabellen"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -211,11 +211,11 @@ msgstr ""
 "löschen oder in einen anderen Datentyp ändern und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "Prüfe auf entfernten Datentyp »tinterval« in Benutzertabellen"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -229,34 +229,34 @@ msgstr ""
 "löschen oder in einen anderen Datentyp ändern und das Upgrade neu\n"
 "starten.\n"
 
-#: check.c:421
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "fehlgeschlagene Prüfung: %s"
 
-#: check.c:424
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "Eine Liste der Problemspalten ist in der Datei:"
 
-#: check.c:430 check.c:1026 check.c:1177 check.c:1260 check.c:1349 check.c:1440
-#: check.c:1572 check.c:1657 check.c:1704 check.c:1784 check.c:2089
-#: check.c:2108 check.c:2154 check.c:2207 file.c:378 file.c:415 function.c:208
-#: option.c:519 version.c:79 version.c:162
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2189 check.c:2208 check.c:2254 check.c:2307 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht öffnen: %m"
 
-#: check.c:472
+#: check.c:473
 #, c-format
 msgid "Checking data type usage"
 msgstr "Prüfe Verwendung von Datentypen"
 
-#: check.c:526
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Datentypprüfungen fehlgeschlagen: %s"
 
-#: check.c:575
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -265,7 +265,7 @@ msgstr ""
 "Führe Konsistenzprüfungen am alten laufenden Server durch\n"
 "---------------------------------------------------------"
 
-#: check.c:581
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -274,13 +274,12 @@ msgstr ""
 "Führe Konsistenzprüfungen durch\n"
 "-------------------------------"
 
-#: check.c:745
-#, fuzzy, c-format
-#| msgid "This utility can only upgrade from PostgreSQL version %s and later."
+#: check.c:754
+#, c-format
 msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
-msgstr "Dieses Programm kann nur Upgrades von PostgreSQL Version %s oder später durchführen."
+msgstr "Swap-Modus kann nur Cluster von PostgreSQL Version %s oder später aktualisien."
 
-#: check.c:768
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +288,7 @@ msgstr ""
 "\n"
 "*Cluster sind kompatibel*"
 
-#: check.c:776
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -301,19 +300,21 @@ msgstr ""
 "neuen Cluster neu mit initdb initialisieren, bevor fortgesetzt\n"
 "werden kann."
 
-#: check.c:817
+#: check.c:826
 #, c-format
 msgid ""
-"Some optimizer statistics may not have been transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"Einige Optimizer-Statistiken wurden möglicherweise von pg_upgrade\n"
-"nicht übertragen. Wenn Sie den neuen Server starten, sollte Sie diesen\n"
-"Befehl ausführen:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only"
+"Einige Statistiken werden von pg_upgrade nicht übertragen.\n"
+"Wenn Sie den neuen Server starten, sollte Sie diese zwei Befehle\n"
+"ausführen:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:823
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -322,7 +323,7 @@ msgstr ""
 "Mit diesem Skript können die Dateien des alten Clusters gelöscht werden:\n"
 "    %s"
 
-#: check.c:828
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -335,63 +336,62 @@ msgstr ""
 "Datenverzeichnis des neuen Clusters im alten Cluster-Verzeichnis\n"
 "liegen.  Der Inhalt des alten Clusters muss von Hand gelöscht werden."
 
-#: check.c:840
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Prüfe Cluster-Versionen"
 
-#: check.c:852
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "Dieses Programm kann nur Upgrades von PostgreSQL Version %s oder später durchführen."
 
-#: check.c:857
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Dieses Programm kann nur Upgrades auf PostgreSQL Version %s durchführen."
 
-#: check.c:866
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "Dieses Programm kann keine Downgrades auf ältere Hauptversionen von PostgreSQL durchführen."
 
-#: check.c:871
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "Die Daten- und Programmverzeichnisse des alten Clusters stammen von verschiedenen Hauptversionen."
 
-#: check.c:874
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "Die Daten- und Programmverzeichnisse des neuen Clusters stammen von verschiedenen Hauptversionen."
 
-#: check.c:885
-#, fuzzy, c-format
-#| msgid "This utility can only upgrade from PostgreSQL version %s and later."
-msgid "%s option cannot be used to upgrade from PostgreSQL %s and later."
-msgstr "Dieses Programm kann nur Upgrades von PostgreSQL Version %s oder später durchführen."
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "Die Option %s kann nicht für Upgrades von PostgreSQL %s oder später verwendet werden."
 
-#: check.c:901
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "Wenn ein laufender Server geprüft wird, müssen die alte und die neue Portnummer verschieden sein."
 
-#: check.c:921
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "Datenbank »%s« im neuen Cluster ist nicht leer: Relation »%s.%s« gefunden"
 
-#: check.c:944
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Prüfe Tablespace-Verzeichnisse des neuen Clusters"
 
-#: check.c:955
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "Tablespace-Verzeichnis für neuen Cluster existiert bereits: »%s«"
 
-#: check.c:989
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -400,7 +400,7 @@ msgstr ""
 "\n"
 "WARNUNG:  das neue Datenverzeichnis sollte nicht im alten Datenverzeichnis, d.h. %s, liegen"
 
-#: check.c:1013
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -409,53 +409,54 @@ msgstr ""
 "\n"
 "WARNUNG:  benutzerdefinierte Tablespace-Pfade sollten nicht im Datenverzeichnis, d.h. %s, liegen"
 
-#: check.c:1023
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Erzeuge Skript zum Löschen des alten Clusters"
 
-#: check.c:1051
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht ausführbar machen: %m"
 
-#: check.c:1071
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Prüfe ob der Datenbankbenutzer der Installationsbenutzer ist"
 
-#: check.c:1087
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "Datenbankbenutzer »%s« ist nicht der Installationsbenutzer"
 
-#: check.c:1098
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "konnte die Anzahl der Benutzer nicht ermitteln"
 
-#: check.c:1106
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "Nur der Installationsbenutzer darf im neuen Cluster definiert sein."
 
-#: check.c:1136
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Prüfe Verbindungseinstellungen der Datenbank"
 
-#: check.c:1164
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 darf keine Verbindungen erlauben, d.h. ihr pg_database.datallowconn muss falsch sein"
 
-#: check.c:1191 check.c:1312 check.c:1408 check.c:1536 check.c:1612
-#: check.c:1670 check.c:1753 check.c:2121 check.c:2263 function.c:229
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2221 check.c:2363
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "fatal"
 
-#: check.c:1192
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
@@ -475,27 +476,27 @@ msgstr ""
 "Liste der Datenbanken mit diesem Problem ist in der Datei:\n"
 "    %s"
 
-#: check.c:1217
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Prüfe auf vorbereitete Transaktionen"
 
-#: check.c:1226
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "Der alte Cluster enthält vorbereitete Transaktionen"
 
-#: check.c:1228
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "Der neue Cluster enthält vorbereitete Transaktionen"
 
-#: check.c:1288
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Prüfe auf contrib/isn mit unpassender bigint-Übergabe"
 
-#: check.c:1313
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -515,12 +516,12 @@ msgstr ""
 "der problematischen Funktionen ist in der Datei:\n"
 "    %s"
 
-#: check.c:1393
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Prüfe auf benutzerdefinierte Postfix-Operatoren"
 
-#: check.c:1409
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -535,12 +536,12 @@ msgstr ""
 "Liste der benutzerdefinierten Postfixoperatoren ist in der Datei:\n"
 "    %s"
 
-#: check.c:1464
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Prüfe auf inkompatible polymorphische Funktionen"
 
-#: check.c:1537
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -561,12 +562,12 @@ msgstr ""
 "Eine Liste der problematischen Objekte ist in der Datei:\n"
 "    %s"
 
-#: check.c:1597
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Prüfe auf Tabellen mit WITH OIDS"
 
-#: check.c:1613
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -581,12 +582,37 @@ msgstr ""
 "Eine Liste der Tabellen mit dem Problem ist in der Datei:\n"
 "    %s"
 
-#: check.c:1640
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Prüfe auf Inkonsistenzen bei Not-Null-Constraints"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"Ihre Installation enthält inkonsistente NOT-NULL-Constraints.\n"
+"Wenn die Spalte in der Elterntabelle NOT NULL ist, dann muss die\n"
+"Spalte in der abgeleiteten Tabelle auch NOT NULL sein, ansonsten wird\n"
+"das Upgrade fehlschlagen.\n"
+"Sie können dies reparieren, indem Sie\n"
+"    ALTER TABLE tabellenname ALTER spalte SET NOT NULL;\n"
+"für jede Spalte in dieser Datei ausführen:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Prüfe auf Rollen, die mit »pg_« anfangen"
 
-#: check.c:1671
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -601,12 +627,12 @@ msgstr ""
 "Eine Liste der Rollen, die mit »pg_« anfangen, ist in der Datei:\n"
 "    %s"
 
-#: check.c:1725
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Prüfe auf benutzerdefinierte Kodierungsumwandlungen"
 
-#: check.c:1754
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -625,70 +651,74 @@ msgstr ""
 "in der Datei:\n"
 "    %s"
 
-#: check.c:1839
+#: check.c:1939
 #, c-format
 msgid "Checking for objects affected by Unicode update"
 msgstr "Prüfe auf vom Unicode-Update betroffene Objekte"
 
-#: check.c:1933 version.c:121
+#: check.c:2033 version.c:121
 #, c-format
 msgid "warning"
 msgstr "Warnung"
 
-#: check.c:1934
+#: check.c:2034
 #, c-format
 msgid ""
-"Your installation contains relations that may be affected by a new version of Unicode.\n"
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
 "A list of potentially-affected relations is in the file:\n"
 "    %s"
 msgstr ""
+"Ihre Installation enthält Relationen, die von einer neuen Version von\n"
+"Unicode betroffen sein könnten. Eine Liste der möglicherweise\n"
+"betroffenen Relationen ist in der Datei:\n"
+"    %s"
 
-#: check.c:1970
+#: check.c:2070
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Prüfe logische Replikations-Slots des neuen Clusters"
 
-#: check.c:1978
+#: check.c:2078
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "konnte Anzahl der logischen Replikations-Slots nicht zählen"
 
-#: check.c:1983
+#: check.c:2083
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "0 logische Replikations-Slots erwartet aber %d gefunden"
 
-#: check.c:1993 check.c:2044
+#: check.c:2093 check.c:2144
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "konnte Parametereinstellung im neuen Cluster nicht ermitteln"
 
-#: check.c:1998
+#: check.c:2098
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "»wal_level« muss »logical« sein, aber es ist auf »%s« gesetzt"
 
-#: check.c:2004
+#: check.c:2104
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "»max_replication_slots« (%d) muss größer als oder gleich der Anzahl der logischen Replikations-Slots (%d) im alten Cluster sein"
 
-#: check.c:2036
+#: check.c:2136
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Prüfe Konfiguration für Subskriptionen im neuen Cluster"
 
-#: check.c:2048
+#: check.c:2148
 #, c-format
 msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
 msgstr "»max_active_replication_origins« (%d) muss größer als oder gleich der Anzahl der Subskriptionen (%d) im alten Cluster sein"
 
-#: check.c:2070
+#: check.c:2170
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Prüfe auf gültige logische Replikations-Slots"
 
-#: check.c:2122
+#: check.c:2222
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -704,12 +734,12 @@ msgstr ""
 "Eine Liste der problematischen Slots ist in der Datei:\n"
 "    %s"
 
-#: check.c:2182
+#: check.c:2282
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Prüfe Subskriptionszustand"
 
-#: check.c:2264
+#: check.c:2364
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -769,8 +799,8 @@ msgstr "Im alten Cluster fehlen Cluster-Zustandsinformationen:"
 msgid "The target cluster lacks cluster state information:"
 msgstr "Im neuen Cluster fehlen Cluster-Zustandsinformationen:"
 
-#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:603 pg_upgrade.c:643
-#: pg_upgrade.c:992 relfilenumber.c:610 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -897,10 +927,9 @@ msgid "  data checksum version"
 msgstr "  Datenprüfsummenversion"
 
 #: controldata.c:685
-#, fuzzy, c-format
-#| msgid "  default collation: %s\n"
+#, c-format
 msgid "  default char signedness"
-msgstr "  Standardsortierfolge: %s\n"
+msgstr "  Standard für Vorzeichen von »char«-Daten"
 
 #: controldata.c:687
 #, c-format
@@ -976,45 +1005,48 @@ msgstr "die alte Cluster verwendet Datenprüfsummen, aber der neue nicht"
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "Prüfsummenversionen im alten und neuen Cluster stimmen nicht überein"
 
-#: controldata.c:761
-#, fuzzy, c-format
-#| msgid "Adding \".old\" suffix to old global/pg_control"
-msgid "Adding \".old\" suffix to old "
-msgstr "Füge Endung ».old« an altes global/pg_control an"
+#. translator: %s is the file path of the control file
+#: controldata.c:762
+#, c-format
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Füge Endung ».old« an altes »%s« an"
 
-#: controldata.c:766
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
 
-#: controldata.c:771
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/%s.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "Wenn Sie den alten Cluster starten wollen, müssen Sie die Endung\n"
-"».old« von %s/%s.old entfernen. Da der »link«-Modus\n"
+"».old« von »%s/%s.old« entfernen. Da der »link«-Modus\n"
 "verwendet wurde, kann der alte Cluster nicht gefahrlos gestartet\n"
 "werden, nachdem der neue Cluster gestartet worden ist."
 
-#: controldata.c:778
+#: controldata.c:780
 #, c-format
 msgid ""
 "\n"
 "Because \"swap\" mode was used, the old cluster can no longer be\n"
 "safely started."
 msgstr ""
+"\n"
+"Da der »swap«-Modus verwendet wurde, kann der alte Cluster nicht mehr\n"
+"gefahrlos gestartet werden."
 
-#: controldata.c:782 file.c:455
-#, fuzzy, c-format
-#| msgid "unrecognized status code"
+#: controldata.c:784 file.c:455
+#, c-format
 msgid "unrecognized transfer mode"
-msgstr "nicht erkannter Statuscode"
+msgstr "nicht erkannter Transfermodus"
 
 #: dump.c:20
 #, c-format
@@ -1046,7 +1078,7 @@ msgstr "konnte pg_ctl-Version nicht ermitteln von %s"
 msgid "command too long"
 msgstr "Befehl zu lang"
 
-#: exec.c:160 pg_upgrade.c:312
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "konnte Logdatei »%s« nicht öffnen: %m"
@@ -1083,7 +1115,7 @@ msgstr ""
 "Prüfen Sie die letzten Zeilen von »%s« für den\n"
 "wahrscheinlichen Grund für das Scheitern."
 
-#: exec.c:218 pg_upgrade.c:322
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "konnte nicht in Logdatei »%s «schreiben: %m"
@@ -1550,6 +1582,8 @@ msgid ""
 "  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
 "                                \"unsigned\"\n"
 msgstr ""
+"  --set-char-signedness=OPTION  Standard für Vorzeichen von »char« auf »signed«\n"
+"                                oder »unsigned« setzen\n"
 
 #: option.c:334
 #, c-format
@@ -1706,7 +1740,7 @@ msgstr "konnte Arbeitsprozess nicht erzeugen: %m"
 msgid "could not create worker thread: %m"
 msgstr "konnte Arbeits-Thread nicht erzeugen: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() fehlgeschlagen: %m"
@@ -1721,12 +1755,12 @@ msgstr "Kindprozess wurde abnormal beendet: Status %d"
 msgid "child worker exited abnormally: %m"
 msgstr "Kindprozess wurde abnormal beendet: %m"
 
-#: pg_upgrade.c:111
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Verzeichnis »%s« nicht lesen: %m"
 
-#: pg_upgrade.c:143
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1737,17 +1771,17 @@ msgstr ""
 "Führe Upgrade durch\n"
 "-------------------"
 
-#: pg_upgrade.c:191
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Setze nächste OID im neuen Cluster"
 
-#: pg_upgrade.c:215
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Synchronisiere Datenverzeichnis auf Festplatte"
 
-#: pg_upgrade.c:231
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1758,23 +1792,24 @@ msgstr ""
 "Upgrade abgeschlossen\n"
 "---------------------"
 
-#: pg_upgrade.c:264 pg_upgrade.c:277 pg_upgrade.c:284 pg_upgrade.c:291
-#: pg_upgrade.c:309 pg_upgrade.c:320
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "Verzeichnispfad für neuen Cluster ist zu lang"
 
-#: pg_upgrade.c:298 pg_upgrade.c:300 pg_upgrade.c:302 pg_upgrade.c:304
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
 
-#: pg_upgrade.c:353
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: konnte eigene Programmdatei nicht finden"
 
-#: pg_upgrade.c:379
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1783,7 +1818,7 @@ msgstr ""
 "Es läuft scheinbar ein Postmaster für den alten Cluster.\n"
 "Bitte beenden Sie diesen Postmaster und versuchen Sie es erneut."
 
-#: pg_upgrade.c:392
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1792,97 +1827,95 @@ msgstr ""
 "Es läuft scheinbar ein Postmaster für den neuen Cluster.\n"
 "Bitte beenden Sie diesen Postmaster und versuchen Sie es erneut."
 
-#: pg_upgrade.c:418
-#, fuzzy, c-format
-#| msgid "Setting locale and encoding for new cluster"
+#: pg_upgrade.c:421
+#, c-format
 msgid "Setting the default char signedness for new cluster"
-msgstr "Setze Locale und Kodierung für neuen Cluster"
+msgstr "Setze Standard für Vorzeichen von »char« für neuen Cluster"
 
-#: pg_upgrade.c:446
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Setze Locale und Kodierung für neuen Cluster"
 
-#: pg_upgrade.c:524
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Analysiere alle Zeilen im neuen Cluster"
 
-#: pg_upgrade.c:537
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Friere alle Zeilen im neuen Cluster ein"
 
-#: pg_upgrade.c:557
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Stelle globale Objekte im neuen Cluster wieder her"
 
-#: pg_upgrade.c:574
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Stelle Datenbankschemas im neuen Cluster wieder her"
 
-#: pg_upgrade.c:709
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Lösche Dateien aus neuem %s"
 
-#: pg_upgrade.c:713
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "konnte Verzeichnis »%s« nicht löschen"
 
-#: pg_upgrade.c:732
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Kopiere altes %s zum neuen Server"
 
-#: pg_upgrade.c:758
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Setze älteste XID im neuen Cluster"
 
-#: pg_upgrade.c:766
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "Setze nächste Transaktions-ID und -epoche im neuen Cluster"
 
-#: pg_upgrade.c:796
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "Setze nächste Multixact-ID und nächstes Offset im neuen Cluster"
 
-#: pg_upgrade.c:820
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Setze älteste Multixact-ID im neuen Cluster"
 
-#: pg_upgrade.c:840
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Setze WAL-Archive zurück"
 
-#: pg_upgrade.c:883
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Setze frozenxid und minmxid im neuen Cluster"
 
-#: pg_upgrade.c:885
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Setze minmxid im neuen Cluster"
 
-#: pg_upgrade.c:976
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Stelle logische Replikations-Slots im neuen Cluster wieder her"
 
 #: relfilenumber.c:68
-#, fuzzy, c-format
-#| msgid "could not fsync file \"%s\": %m"
+#, c-format
 msgid "could not synchronize file \"%s\": %m"
-msgstr "konnte Datei »%s« nicht fsyncen: %m"
+msgstr "konnte Datei »%s« nicht synchronisieren: %m"
 
 #: relfilenumber.c:114
 #, c-format
@@ -1905,10 +1938,9 @@ msgid "Linking user relation files"
 msgstr "Verknüpfe Benutzertabellendateien"
 
 #: relfilenumber.c:126
-#, fuzzy, c-format
-#| msgid "syncing data directory"
+#, c-format
 msgid "Swapping data directories"
-msgstr "synchronisiere Datenverzeichnis"
+msgstr "Vertausche Datenverzeichnisse"
 
 #: relfilenumber.c:200
 #, c-format
@@ -1920,45 +1952,30 @@ msgstr "alte Datenbank »%s« nicht im neuen Cluster gefunden"
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 
-#: relfilenumber.c:293 relfilenumber.c:297
-#, fuzzy, c-format
-#| msgid "could not create directory \"%s\": %m"
-msgid "could not create directory \"%s\""
-msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
-
 #: relfilenumber.c:301 relfilenumber.c:305
-#, fuzzy, c-format
-#| msgid "could not rename file \"%s\" to \"%s\": %m"
-msgid "could not rename \"%s\" to \"%s\""
-msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "konnte Verzeichnis »%s« nicht in »%s« umbenennen: %m"
 
 #: relfilenumber.c:375 relfilenumber.c:402
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
 
-#: relfilenumber.c:393 relfilenumber.c:420
-#, fuzzy, c-format
-#| msgid "could not rename file \"%s\" to \"%s\": %m"
-msgid "could not rename \"%s\" to \"%s\": %m"
-msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
-
 #: relfilenumber.c:396 relfilenumber.c:434
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 
 #: relfilenumber.c:439
-#, fuzzy, c-format
-#| msgid "could not close directory \"%s\": %m"
+#, c-format
 msgid "could not synchronize directory \"%s\": %m"
-msgstr "konnte Verzeichnis »%s« nicht schließen: %m"
+msgstr "konnte Verzeichnis »%s« nicht synchronisieren: %m"
 
 #: relfilenumber.c:441
-#, fuzzy, c-format
-#| msgid "could not create directory \"%s\": %m"
+#, c-format
 msgid "could not synchronize parent directory of \"%s\": %m"
-msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
+msgstr "konnte übergeordnetes Verzeichnis von »%s« nicht synchronisieren: %m"
 
 #: relfilenumber.c:598
 #, c-format
@@ -1993,7 +2010,7 @@ msgstr "verknüpfe »%s« nach »%s«"
 #: relfilenumber.c:644
 #, c-format
 msgid "should never happen"
-msgstr ""
+msgstr "sollte nie vorkommen"
 
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
@@ -2026,7 +2043,7 @@ msgstr "konnte Versionsdatei »%s« nicht öffnen: %m"
 msgid "could not parse version file \"%s\""
 msgstr "konnte Versionsdatei »%s« nicht interpretieren"
 
-#: server.c:317
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -2035,7 +2052,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:321
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -2044,7 +2061,7 @@ msgstr ""
 "konnte nicht mit dem Postmaster für den alten Cluster verbinden, gestartet mit dem Befehl:\n"
 "%s"
 
-#: server.c:325
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -2053,22 +2070,22 @@ msgstr ""
 "konnte nicht mit dem Postmaster für den neuen Cluster verbinden, gestartet mit dem Befehl:\n"
 "%s"
 
-#: server.c:339
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl konnte den Quellserver nicht starten, oder Verbindung fehlgeschlagen"
 
-#: server.c:341
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl konnte den Zielserver nicht starten, oder Verbindung fehlgeschlagen"
 
-#: server.c:386
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
-#: server.c:399
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "libpq-Umgebungsvariable %s hat einen nicht lokalen Serverwert: %s"
@@ -2097,6 +2114,16 @@ msgstr "konnte »stat« für Tablespace-Verzeichnis »%s« nicht ausführen: %m"
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "Tablespace-Pfad »%s« ist kein Verzeichnis"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "Verbindungsfehler: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "ungültiges Socket"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
diff --git a/src/bin/pg_upgrade/po/es.po b/src/bin/pg_upgrade/po/es.po
index ea5213cd854..369bf1dec5b 100644
--- a/src/bin/pg_upgrade/po/es.po
+++ b/src/bin/pg_upgrade/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_upgrade (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:49+0000\n"
-"PO-Revision-Date: 2024-11-16 09:10+0100\n"
+"POT-Creation-Date: 2026-02-06 23:19+0000\n"
+"PO-Revision-Date: 2025-11-08 19:07+0100\n"
 "Last-Translator: Álvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -60,11 +60,11 @@ msgstr "el argumento de la orden de shell contiene un salto de línea o retorno
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Verificando tipos compuestos definidos por el sistema en tablas de usuario"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -76,11 +76,11 @@ msgstr ""
 "versiones de PostgreSQL, por lo que este clúster no puede ser actualizado.\n"
 "Puede eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Verificando datos de usuario de tipo «line» incompatible"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -94,11 +94,11 @@ msgstr ""
 "actualmente ser actualizado.  Puede eliminar las columnas problemáticas y\n"
 "reiniciar la actualización.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Verificando tipos de datos reg* en datos de usuario"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -110,11 +110,11 @@ msgstr ""
 "por lo que este clúster no puede ser actualizado.\n"
 "Puede eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Verificando datos de usuario de tipo «aclitem» incompatible"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -126,11 +126,11 @@ msgstr ""
 "por lo que este clúster no puede ser actualizado.\n"
 "Puede eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Verificando columnas de usuario del tipo no válido «unknown»"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -142,11 +142,11 @@ msgstr ""
 "por lo que este clúster no puede ser actualizado. Puede\n"
 "eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "Verificando columnas de usuario del tipo «sql_identifier»"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -158,11 +158,11 @@ msgstr ""
 "este clúster no puede ser actualizado.\n"
 "Puede eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "Verificando datos de usuario de tipo «jsonb» incompatible"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -174,11 +174,11 @@ msgstr ""
 "por lo que este clúster no puede ser actualizado.\n"
 "Puede eliminar las columnas problemáticas y reiniciar la actualización.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "Verificando tipo de datos «abstime» eliminado en tablas de usuario"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -192,11 +192,11 @@ msgstr ""
 "Puede eliminar las columnas problemáticas, o cambiarlas a otro\n"
 "tipo de dato, y reiniciar la actualización.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "Verificando tipo de datos «reltime» eliminado en tablas de usuario"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -210,11 +210,11 @@ msgstr ""
 "Puede eliminar las columnas problemáticas, o cambiarlas a otro\n"
 "tipo de dato, y reiniciar la actualización.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "Verificando tipo de datos «tinterval» eliminado en tablas de usuario"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -228,35 +228,35 @@ msgstr ""
 "Puede eliminar las columnas problemáticas, o cambiarlas a otro\n"
 "tipo de dato, y reiniciar la actualización.\n"
 
-#: check.c:345
-#, c-format
-msgid "Checking data type usage"
-msgstr "Verificando el uso de tipos de datos"
-
-#: check.c:480
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "falló la comprobación: %s"
 
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "Una lista de las columnas problemáticas está en el archivo:"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "Verificando el uso de tipos de datos"
+
 # FIXME this should probably use plural msgfmt
-#: check.c:522
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Verificaciones de tipos de datos fallidas: %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -265,7 +265,7 @@ msgstr ""
 "Verificando Consistencia en Vivo en el Servidor Antiguo\n"
 "-------------------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -274,7 +274,12 @@ msgstr ""
 "Verificando Consistencia\n"
 "------------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr "El modo swap sólo puede actualizar desde PostgreSQL versión %s y posterior."
+
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +288,7 @@ msgstr ""
 "\n"
 "*Los clústers son compatibles*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -294,18 +299,20 @@ msgstr ""
 "Si pg_upgrade falla a partir de este punto, deberá re-ejecutar initdb\n"
 "en el clúster nuevo antes de continuar."
 
-#: check.c:767
+#: check.c:826
 #, c-format
 msgid ""
-"Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"Las estadísticas para el optimizador no son transferidas por pg_upgrade.\n"
-"Una vez que inicie el servidor nuevo, considere ejecutar:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Algunas estadísticas no son transferidas por pg_upgrade.\n"
+"Una vez que inicie el servidor nuevo, considere ejecutar estas dos órdenes:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -314,7 +321,7 @@ msgstr ""
 "Ejecutando este script se borrarán los archivos de datos del servidor antiguo:\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -327,57 +334,62 @@ msgstr ""
 "o el directorio de datos del servidor nuevo.  El contenido del servidor\n"
 "antiguo debe ser borrado manualmente."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Verificando las versiones de los clústers"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "Este programa sólo puede actualizar desde PostgreSQL versión %s y posterior."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Este programa sólo puede actualizar a PostgreSQL versión %s."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "Este programa no puede usarse para volver a versiones anteriores de PostgreSQL."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "El directorio de datos antiguo y el directorio de binarios antiguo son de versiones diferentes."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "El directorio de datos nuevo y el directorio de binarios nuevo son de versiones diferentes."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "La opción %s no puede usarse para actualizar desde PostgreSQL %s y posterior."
+
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "Al verificar servidores en caliente, los números de port antiguo y nuevo deben ser diferentes."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "La base de datos «%s» del clúster nuevo no está vacía: se encontró la relación «%s.%s»"
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Verificando los directorios de tablespaces para el nuevo clúster"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "directorio de tablespace para el nuevo clúster ya existe: «%s»"
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -387,7 +399,7 @@ msgstr ""
 "ADVERTENCIA: el directorio de datos nuevo no debería estar dentro del directorio antiguo,\n"
 "esto es, %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -396,92 +408,94 @@ msgstr ""
 "\n"
 "ADVERTENCIA: las ubicaciones de tablespaces definidos por el usuario no deberían estar dentro del directorio de datos, esto es, %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Creando un script para borrar el clúster antiguo"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "no se pudo agregar permisos de ejecución al archivo «%s»: %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Verificando que el usuario de base de datos es el usuario de instalación"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "el usuario de base de datos «%s» no es el usuario de instalación"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "no se pudo determinar el número de usuarios"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "Sólo el usuario de instalación puede estar definido en el nuevo clúster."
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Verificando los parámetros de conexión de bases de datos"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 no debe permitir conexiones, es decir su pg_database.datallowconn debe ser «false»"
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "fatal"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
 "Todas las bases de datos que no son template0 deben permitir conexiones,\n"
-"es decir, pg_database.datallowconn debe ser true. Su instalación contiene\n"
-"bases de datos que no son template0 que tienen pg_database.datallowconn\n"
-"definido a false. Considere permitir conexiones para todas las bases de\n"
-"datos que no son template0 o eliminar las bases de datos que no permiten\n"
-"conexión. Un listado de las bases de datos con el problema se encuentra en:\n"
+"es decir, pg_database.datallowconn debe ser true y pg_database.datconnlimit\n"
+"no debe ser -2. Su instalación contiene bases de datos que no son template0\n"
+"a las cuales no se puede conectar.  Considere permitir conexiones para todas\n"
+"las bases de datos que no son template0 o eliminar las bases de datos que no\n"
+"permiten conexión. Un listado de las bases de datos con el problema se\n"
+"encuentra en:\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Verificando transacciones preparadas"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "El clúster de origen contiene transacciones preparadas"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "El clúster de destino contiene transacciones preparadas"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Verificando contrib/isn con discordancia en mecanismo de paso de bigint"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -500,12 +514,12 @@ msgstr ""
 "Un listado de funciones problemáticas está en el archivo:\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Verificando operadores postfix definidos por el usuario"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -520,12 +534,12 @@ msgstr ""
 "Una lista de operadores postfix definidos por el usuario aparece en el archivo:\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Verificando funciones polimórficas incompatibles"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -544,12 +558,12 @@ msgstr ""
 "«anycompatible». Una lista de los objetos problemáticos está en el archivo:\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Verificando tablas WITH OIDS"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -564,12 +578,35 @@ msgstr ""
 "Una lista de tablas con este problema aparece en el archivo:\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Verificando inconsistencias en restricciones not-null"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"Su instalación contiene restricciones NOT NULL inconsistentes.  Si las\n"
+"columnas padre son NOT NULL, entonces las columnas hijas deben ser también\n"
+"NOT NULL, o la actualización fallará. Puede corregir esto ejecutando\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"en cada columna listada en el archivo:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Verificando roles que empiecen con «pg_»"
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -584,12 +621,12 @@ msgstr ""
 "Un listado de los roles que empiezan con «pg_» está en el archivo:\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Verificando conversiones de codificación definidas por el usuario"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -606,52 +643,74 @@ msgstr ""
 "Un listado de las conversiones de codificación definidas por el usuario está en el archivo:\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "Verificando objetos afectados por actualización de Unicode"
+
+#: check.c:2038 version.c:121
+#, c-format
+msgid "warning"
+msgstr "atención"
+
+#: check.c:2039
+#, c-format
+msgid ""
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr ""
+"Su instalación contiene relaciones que podrían ser afectadas por una nueva\n"
+"versión de Unicode.  Una lista de las relaciones potencialmente afectadas\n"
+"está en el archivo:\n"
+"    %s"
+
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Verificando slots de replicación lógica en el clúster nuevo"
 
-#: check.c:1754
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "no se pudo contar el número de slots de replicación lógica"
 
-#: check.c:1759
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "se esperaban 0 slots de replicación lógica pero se encontraron %d"
 
-#: check.c:1769 check.c:1820
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "no se pudo determinar el valor de los parámetros en el clúster nuevo"
 
-#: check.c:1774
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "«wal_level» debe ser «logical», pero está definido a «%s»"
 
-#: check.c:1780
+#: check.c:2109
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "«max_replicacion_slots» (%d) debe ser mayor o igual al número de slots de replicación lógica en el cluster antiguo (%d)"
 
-#: check.c:1812
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Verificando configuraciones del clúster nuevo para suscripciones"
 
-#: check.c:1824
+#: check.c:2153
 #, c-format
-msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
-msgstr "«max_replication_slots» (%d) debe ser mayor o igual al número de suscripciones en el clúster antiguo (%d)"
+msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
+msgstr "«max_active_replication_origins» (%d) debe ser mayor o igual al número de suscripciones en el clúster antiguo (%d)"
 
-#: check.c:1846
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Verificando los slots de replicación lógica válidos"
 
-#: check.c:1898
+#: check.c:2227
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -666,12 +725,12 @@ msgstr ""
 "Un listado de los slots problemáticos está en el archivo:\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Verificando el estado de suscripción"
 
-#: check.c:2023
+#: check.c:2369
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -684,184 +743,189 @@ msgstr ""
 "Una lista de las suscripciones problemáticas está en el archivo:\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "no se pudo obtener datos de control usando %s: %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d: problema de estado del clúster"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid "The source cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "El clúster de origen fue apagado mientras estaba en modo de recuperación. Para actualizarlo, use «rsync» como está documentado, o apáguelo siendo primario."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid "The target cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "El clúster de destino fue apagado mientras estaba en modo de recuperación. Para actualizarlo, use «rsync» como está documentado, o apáguelo siendo primario."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "El clúster de origen no fue apagado limpiamente, el estado fue reportado como: «%s»"
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "El clúster de destino no fue apagado limpiamente, el estado fue reportado como: «%s»"
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "no se pudo obtener datos de control usando %s: %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "Al clúster de origen le falta información de estado:"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "Al cluster de destino le falta información de estado:"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d: problema en pg_resetwal"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d: problema de extracción de controldata"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "Al clúster de origen le falta información de control requerida:"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "Al clúster de destino le falta información de control requerida:"
 
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  siguiente XID del último checkpoint"
 
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  siguiente OID del último checkpoint"
 
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  siguiente MultiXactId del último checkpoint"
 
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  MultiXactId más antiguo del último checkpoint"
 
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  XID más antiguo del último checkpoint"
 
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  siguiente MultiXactOffset del siguiente checkpoint"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  primer segmento de WAL después del reinicio"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  método de paso de argumentos float8"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  alineamiento máximo"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  tamaño de bloques"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  tamaño de segmento de relación grande"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  tamaño de bloque de WAL"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  tamaño de segmento de WAL"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  máximo largo de identificadores"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  máximo número de columnas indexadas"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  tamaño máximo de trozos TOAST"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  tamaño de trozos de objetos grandes"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  fechas/horas son enteros?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  versión del checksum de datos"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  presencia de signo en datos «char»"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr "No se puede continuar sin la información de control requerida. Terminando"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid ""
 "old and new pg_controldata alignments are invalid or do not match.\n"
@@ -870,91 +934,109 @@ msgstr ""
 "Alineamientos de pg_controldata antiguo y nuevo no son válidos o no coinciden.\n"
 "Seguramente un clúster es 32-bit y el otro es 64-bit"
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr "Los tamaños de bloque antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid "old and new pg_controldata maximum relation segment sizes are invalid or do not match"
 msgstr "El tamaño máximo de segmento de relación antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr "El tamaño de bloques de WAL antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid "old and new pg_controldata WAL segment sizes are invalid or do not match"
 msgstr "El tamaño de segmentos de WAL antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid "old and new pg_controldata maximum identifier lengths are invalid or do not match"
 msgstr "Los máximos largos de identificador antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid "old and new pg_controldata maximum indexed columns are invalid or do not match"
 msgstr "La cantidad máxima de columnas indexadas antigua y nueva no son válidos o no coinciden"
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not match"
 msgstr "Los máximos de trozos TOAST antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid "old and new pg_controldata large-object chunk sizes are invalid or do not match"
 msgstr "Los tamaños de trozos de objetos grandes antiguo y nuevo no son válidos o no coinciden"
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr "Los tipos de almacenamiento de fecha/hora antiguo y nuevo no coinciden"
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr "El clúster antiguo no usa checksums de datos pero el nuevo sí"
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr "El clúster antiguo usa checksums de datos pero el nuevo no"
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "Las versiones de checksum de datos antigua y nueva no coinciden"
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "Agregando el sufijo «.old» a global/pg_control"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Agregando el sufijo «.old» al «%s» antiguo"
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "Si desea iniciar el clúster antiguo, necesitará eliminar el sufijo\n"
-"«.old» de %s/global/pg_control.old.\n"
+"«.old» de «%s/%s.old».\n"
 "Puesto que se usó el modo «link», el clúster antiguo no puede usarse\n"
 "en forma segura después de que el clúster nuevo haya sido iniciado."
 
+#: controldata.c:780
+#, c-format
+msgid ""
+"\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr ""
+"\n"
+"Debido a que se usó el modo «swap», el clúster antiguo no puede ser\n"
+"iniciado en forma segura."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "modo de transferencia no reconocido"
+
 #: dump.c:20
 #, c-format
 msgid "Creating dump of global objects"
@@ -985,7 +1067,7 @@ msgstr "no se pudo obtener la salida de versión de pg_ctl de %s"
 msgid "command too long"
 msgstr "orden demasiado larga"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de registro «%s»: %m"
@@ -1022,7 +1104,7 @@ msgstr ""
 "Consulte las últimas líneas de «%s» para saber\n"
 "la causa probable de la falla."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "no se pudo escribir al archivo de log «%s»"
@@ -1147,7 +1229,7 @@ msgstr "no se pudo clonar el archivo entre los directorios viejo y nuevo: %m"
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range no está soportado en esta plataforma"
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid ""
 "could not create hard link between old and new data directories: %m\n"
@@ -1156,22 +1238,31 @@ msgstr ""
 "No se pudo crear un link duro entre los directorios de datos nuevo y antiguo: %m\n"
 "En modo link los directorios de dato nuevo y antiguo deben estar en el mismo sistema de archivos."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid ""
+"could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file system."
+msgstr ""
+"No se pudo crear un link duro entre los directorios de datos nuevo y antiguo: %m\n"
+"En modo swap los directorios de dato nuevo y antiguo deben estar en el mismo sistema de archivos."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "Verificando la presencia de las bibliotecas requeridas"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "no se pudo cargar la biblioteca «%s»: %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "En la base de datos: %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid ""
 "Your installation references loadable libraries that are missing from the\n"
@@ -1186,51 +1277,51 @@ msgstr ""
 "de las bibliotecas problemáticas está en el archivo:\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid "Relation names for OID %u in database \"%s\" do not match: old name \"%s.%s\", new name \"%s.%s\""
 msgstr "Los nombres de relación para OID %u en la base de datos «%s» no coinciden: nombre antiguo «%s.%s», nombre nuevo «%s.%s»"
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "No hubo coincidencia en las tablas nueva y antigua en la base de datos «%s»"
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " que es un índice en «%s.%s»"
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " que es un índice en el OID %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " que es la tabla TOAST para «%s.%s»"
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " que es la tabla TOAST para el OID %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid "No match found in old cluster for new relation with OID %u in database \"%s\": %s"
 msgstr ""
 "No se encontró equivalente en el clúster antiguo para la relación nueva con OID %u\n"
 "en la base de datos «%s»: %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid "No match found in new cluster for old relation with OID %u in database \"%s\": %s"
 msgstr ""
 "No se encontró equivalente en el clúster nuevo para la antigua relación con OID %u\n"
 "en la base de datos «%s»: %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid ""
 "\n"
@@ -1239,7 +1330,7 @@ msgstr ""
 "\n"
 "bases de datos de origen:"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid ""
 "\n"
@@ -1248,104 +1339,109 @@ msgstr ""
 "\n"
 "bases de datos de destino:"
 
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "template0 no encontrado"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "Base de datos: «%s»"
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "relname: «%s.%s»: reloid: %u reltblspace: «%s»"
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "Slots de replicación lógica en la base de datos:"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "nombre de slot: «%s», plugin de salida: «%s», two_phase: %s"
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s: no puede ejecutarse como root"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "número de puerto antiguo no válido"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "número de puerto nuevo no válido"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "argumento no válido para la opción %s"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Pruebe «%s --help» para mayor información.\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "Ejecutando en modo verboso"
 
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "residen los binarios del clúster antiguo"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "residen los binarios del clúster nuevo"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "residen los datos del clúster antiguo"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "residen los datos del clúster nuevo"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "se crearán los sockets"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "no se pudo identificar el directorio actual"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid "cannot run pg_upgrade from inside the new cluster data directory on Windows"
 msgstr "no se puede ejecutar pg_upgrade desde dentro del directorio de datos del clúster nuevo en Windows"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid ""
 "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n"
 "\n"
 msgstr "pg_upgrade actualiza un clúster PostgreSQL a una versión «mayor» diferente.\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid ""
 "  pg_upgrade [OPTION]...\n"
@@ -1354,17 +1450,17 @@ msgstr ""
 "  pg_upgrade [OPCIÓN]...\n"
 "\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr "  -b, --old-bindir=BINDIR       directorio de ejecutables del clúster antiguo\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid ""
 "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
@@ -1373,107 +1469,126 @@ msgstr ""
 "  -B, --new-bindir=BINDIR       directorio de ejecutables del clúster nuevo\n"
 "                                (por omisión el mismo directorio que pg_upgrade)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid "  -c, --check                   check clusters only, don't change any data\n"
 msgstr "  -c, --check                   sólo verificar clústers, no cambiar datos\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=DATADIR     directorio de datos del clúster antiguo\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=DATADIR     directorio de datos del clúster nuevo\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid "  -j, --jobs=NUM                number of simultaneous processes or threads to use\n"
 msgstr "  -j, --jobs=NUM                máximo de procesos paralelos para restaurar\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid "  -k, --link                    link instead of copying files to new cluster\n"
 msgstr "  -k, --link                    enlazar (link) archivos en vez de copiarlos\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid "  -N, --no-sync                 do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync                 no esperar que los cambios se sincronicen a disco\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
 msgstr "  -o, --old-options=OPCIONES    opciones a pasar al servidor antiguo\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
 msgstr "  -O, --new-options=OPCIONES    opciones a pasar al servidor nuevo\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr "  -p, --old-port=PUERTO         número de puerto del clúster antiguo (def. %d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr "  -P, --new-port=PUERTO         número de puerto del clúster nuevo (def. %d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid "  -r, --retain                  retain SQL and log files after success\n"
 msgstr "  -r, --retain                  preservar archivos SQL y logs en caso de éxito\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid "  -s, --socketdir=DIR           socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=DIR           directorio de sockets a usar (omisión: dir. actual)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr "  -U, --username=NOMBRE         superusuario del clúster (def. «%s»)\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr "  -v, --verbose                 activar registro interno verboso\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                 mostrar información de versión y salir\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid "  --clone                       clone instead of copying files to new cluster\n"
 msgstr "  --clone                       clonar los archivos en vez de copiarlos\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr "  --copy                        copiar los archivos al clúster nuevo (por omisión)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid "  --copy-file-range             copy files to new cluster with copy_file_range\n"
 msgstr "  --copy-file-range             copiar archivos usando copy_file_range\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid "  --no-statistics               do not import statistics from old cluster\n"
+msgstr "  --no-statistics               no volcar estadísticas desde el clúster antiguo\n"
+
+#: option.c:332
+#, c-format
+msgid ""
+"  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
+"                                \"unsigned\"\n"
+msgstr ""
+"  --set-char-signedness=OPCIÓN  define que «char» en la nueva instalación sean\n"
+"                                «signed» o «unsigned»\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr "  --swap                        mover directorios de datos al cluster nuevo\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr "  --sync-method=MÉTODO          definir método de sincronizar archivos a disco\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                    mostrar esta ayuda y salir\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid ""
 "\n"
@@ -1488,7 +1603,7 @@ msgstr ""
 "  apagar el postmaster que atiende al clúster antiguo\n"
 "  apagar el postmaster que atiende al clúster nuevo\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid ""
 "\n"
@@ -1505,7 +1620,7 @@ msgstr ""
 "  el directorio «bin» para la versión antigua (-b BINDIR)\n"
 "  el directorio «bin» para la versión nueva   (-B BINDIR)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid ""
 "\n"
@@ -1518,7 +1633,7 @@ msgstr ""
 "  pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n"
 "o\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid ""
 "  $ export PGDATAOLD=oldCluster/data\n"
@@ -1533,7 +1648,7 @@ msgstr ""
 "  $ export PGBINNEW=clusterNuevo/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid ""
 "  C:\\> set PGDATAOLD=oldCluster/data\n"
@@ -1548,7 +1663,7 @@ msgstr ""
 "  C:\\> set PGBINNEW=clusterNuevo/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid ""
 "\n"
@@ -1557,12 +1672,12 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid ""
 "You must identify the directory where the %s.\n"
@@ -1571,32 +1686,32 @@ msgstr ""
 "Debe identificar el directorio donde %s.\n"
 "Por favor use la opción %s o la variable de ambiente %s."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "Buscando el directorio de datos real para el clúster de origen"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "Buscando el directorio de datos real para el clúster de destino"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "no se pudo obtener el directorio de datos usando %s: %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "no se pudo obtener el directorio de datos usando %s: %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "no se pudo leer la línea %d del archivo «%s»: %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "número de port entregado por el usuario %hu corregido a %hu"
@@ -1611,7 +1726,7 @@ msgstr "no se pudo crear el proceso hijo: %m"
 msgid "could not create worker thread: %m"
 msgstr "no se pudo crear el thread trabajador: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
@@ -1626,12 +1741,12 @@ msgstr "el proceso hijo terminó anormalmente: estado %d"
 msgid "child worker exited abnormally: %m"
 msgstr "el hijo trabajador terminó anormalmente: %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1642,17 +1757,17 @@ msgstr ""
 "Llevando a cabo el Upgrade\n"
 "--------------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Seteando siguiente OID para el nuevo clúster"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Sincronizando directorio de datos a disco"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1663,23 +1778,24 @@ msgstr ""
 "Actualización Completa\n"
 "----------------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "nombre de directorio para el nuevo clúster es demasiado largo"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: no se pudo encontrar el ejecutable propio"
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1688,7 +1804,7 @@ msgstr ""
 "Parece haber un postmaster sirviendo el clúster antiguo.\n"
 "Por favor detenga ese postmaster e inténtelo nuevamente."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1697,141 +1813,191 @@ msgstr ""
 "Parece haber un postmaster sirviendo el clúster nuevo.\n"
 "Por favor detenga ese postmaster e inténtelo nuevamente."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "Estableciendo la presencia de signo para el clúster nuevo"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Estableciendo la configuración regional y codificación para el nuevo clúster"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Analizando todas las filas en el clúster nuevo"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Congelando todas las filas en el nuevo clúster"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Restaurando objetos globales en el nuevo clúster"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Restaurando esquemas de bases de datos en el clúster nuevo"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Eliminando archivos del nuevo %s"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "no se pudo eliminar directorio «%s»"
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Copiando el %s antiguo al nuevo servidor"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Estableciendo XID más antiguo para el nuevo clúster"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "Seteando el ID de transacción y «época» siguientes en el nuevo clúster"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "Seteando el multixact ID y offset siguientes en el nuevo clúster"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Seteando el multixact ID más antiguo en el nuevo clúster"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Reseteando los archivos de WAL"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Seteando contadores frozenxid y minmxid en el clúster nuevo"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Seteando contador minmxid en el clúster nuevo"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Restaurando slots de replicación lógica en el nuevo clúster"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "no se pudo sincronizar el archivo «%s»: %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "Clonando archivos de relaciones de usuario"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "Copiando archivos de relaciones de usuario"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr "Copiando archivos de relaciones de usuario con copy_file_range"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "Enlazando archivos de relaciones de usuario"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "Intercambiando directorios de datos"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "la base de datos «%s» no se encontró en el clúster nuevo"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "no se pudo hacer stat al archivo «%s»: %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "no se pudo renombrar el directorio de «%s» a «%s»: %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "no se pudo abrir el directorio «%s»: %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "no se pudo leer el directorio «%s»: %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "no se pudo sincronizar el directorio «%s»: %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "no se pudo sincronizar el directorio padre de «%s»: %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
 msgstr "error mientras se comprobaba la existencia del archivo «%s.%s» («%s» a «%s»); %m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "reescribiendo «%s» a «%s»"
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "clonando «%s» a «%s»"
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "copiando «%s» a «%s»"
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
 msgstr "copiando «%s» a «%s» con copy_file_range"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "enlazando «%s» a «%s»"
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "nunca debería suceder"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -1863,7 +2029,7 @@ msgstr "no se pudo abrir el archivo de versión «%s»: %m"
 msgid "could not parse version file \"%s\""
 msgstr "no se pudo interpretar el archivo de versión «%s»"
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -1872,7 +2038,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -1881,7 +2047,7 @@ msgstr ""
 "no se pudo conectar al postmaster de origen iniciado con la orden:\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -1890,22 +2056,22 @@ msgstr ""
 "no se pudo conectar al postmaster de destino iniciado con la orden:\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl no pudo iniciar el servidor de origen, o la conexión falló"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl no pudo iniciar el servidor de destino, o la conexión falló"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "la variable de ambiente libpq %s tiene un valor de servidor no-local: %s"
@@ -1934,6 +2100,16 @@ msgstr "no se pudo hace stat al directorio de tablespace «%s»: %m"
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "la ruta de tablespace «%s» no es un directorio"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "fallo de conexión: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "socket no válido"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -1954,11 +2130,6 @@ msgstr "éxito"
 msgid "Checking for hash indexes"
 msgstr "Verificando índices hash"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "atención"
-
 #: version.c:123
 #, c-format
 msgid ""
@@ -1993,17 +2164,17 @@ msgstr ""
 "cuando se ejecute en psql con el superusuario de la base de datos recreará\n"
 "los índices no válidos; hasta entonces, ninguno de esos índices será usado."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "Verificando actualizaciones para extensiones"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "aviso"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_upgrade/po/fr.po b/src/bin/pg_upgrade/po/fr.po
index 6117d1fb48d..dcdcf58261c 100644
--- a/src/bin/pg_upgrade/po/fr.po
+++ b/src/bin/pg_upgrade/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-10-29 18:20+0000\n"
-"PO-Revision-Date: 2024-10-30 07:41+0100\n"
+"POT-Creation-Date: 2025-09-20 04:49+0000\n"
+"PO-Revision-Date: 2025-09-20 11:01+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.7\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
@@ -51,21 +51,21 @@ msgstr "l'utilisateur n'existe pas"
 msgid "user name lookup failure: error code %lu"
 msgstr "échec de la recherche du nom d'utilisateur : code d'erreur %lu"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Vérification des types composites définis par le système dans les tables utilisateurs"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -77,11 +77,11 @@ msgstr ""
 "de PostgreSQL, donc cette instance ne peut pas être mise à jour actuellement. Vous pouvez\n"
 "supprimer les colonnes problématiques, puis relancer la mise à jour.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Vérification des types de données line incompatibles"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -94,11 +94,11 @@ msgstr ""
 "et nouvelle versions, donc cette instance ne peut pas être mise à jour\n"
 "actuellement. Vous pouvez supprimer les colonnes problématiques et relancer la mise à jour.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Vérification des types de données reg* dans les tables utilisateurs"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -111,11 +111,11 @@ msgstr ""
 "jour actuellement. Vous pouvez supprimer les colonnes problématiques et relancer\n"
 "la mise à jour.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Vérification des types de données « aclitem » incompatibles"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -127,11 +127,11 @@ msgstr ""
 "cette instance ne peut pas être mise à jour actuellement. Vous pouvez supprimer les\n"
 "colonnes problématiques et relancer la mise à jour.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Vérification des colonnes utilisateurs « unknown » invalides"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -143,11 +143,11 @@ msgstr ""
 "cette instance ne peut pas être mise à jour pour l'instant. Vous pouvez\n"
 "supprimer les colonnes problématiques, puis relancer la mise à jour.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "Vérification des colonnes utilisateurs « sql_identifier » invalides"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -159,11 +159,11 @@ msgstr ""
 "donc cette instance ne peut pas être mise à jour actuellement. Vous pouvez supprimer\n"
 "les colonnes problématiques, puis relancer la mise à jour.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "Vérification du type de données « json » incompatible dans les tables utilisateurs"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -175,11 +175,11 @@ msgstr ""
 "cette instance ne peut pas être mise à jour actuellement. Vous pouvez supprimer les\n"
 "colonnes problématiques et relancer la mise à jour.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "Vérification du type de données « abstime » supprimé dans les tables utilisateurs"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -193,11 +193,11 @@ msgstr ""
 "supprimer les colonnes problématiques ou les convertir en un autre type de données,\n"
 "et relancer la mise à jour.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "Vérification du type de données « reltime » supprimé dans les tables utilisateurs"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -211,11 +211,11 @@ msgstr ""
 "supprimer les colonnes problématiques ou les convertir en un autre type de données,\n"
 "et relancer la mise à jour.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "Vérification du type de données « tinterval » supprimé dans les tables utilisateurs"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -229,34 +229,34 @@ msgstr ""
 "supprimer les colonnes problématiques ou les convertir en un autre type de données,\n"
 "et relancer la mise à jour.\n"
 
-#: check.c:345
-#, c-format
-msgid "Checking data type usage"
-msgstr "Vérification de l'utilisation du type de données"
-
-#: check.c:480
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "vérification échouée : %s"
 
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "Une liste des colonnes problématiques se trouve dans le fichier :"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: check.c:522
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "Vérification de l'utilisation du type de données"
+
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Échec de la vérification des types de données : %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -265,7 +265,7 @@ msgstr ""
 "Exécution de tests de cohérence sur l'ancien serveur\n"
 "----------------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -274,7 +274,12 @@ msgstr ""
 "Exécution de tests de cohérence\n"
 "-------------------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr "Le mode swap peut seulement mettre à jour des instances de version %s et ultérieures de PostgreSQL."
+
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +288,7 @@ msgstr ""
 "\n"
 "*Les instances sont compatibles*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -294,18 +299,20 @@ msgstr ""
 "Si pg_upgrade échoue après cela, vous devez ré-exécuter initdb\n"
 "sur la nouvelle instance avant de continuer."
 
-#: check.c:767
+#: check.c:826
 #, c-format
 msgid ""
-"Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"Les statistiques de l'optimiseur ne sont pas transférées par pg_upgrade.\n"
-"Une fois le nouveau serveur démarré, pensez à exécuter :\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Certaines statistiques ne sont pas transférées par pg_upgrade.\n"
+"Une fois le nouveau serveur démarré, pensez à exécuter ces deux commandes :\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -314,7 +321,7 @@ msgstr ""
 "Exécuter ce script supprimera les fichiers de données de l'ancienne instance :\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -328,57 +335,62 @@ msgstr ""
 "de l'ancienne instance. Le contenu de l'ancienne instance doit être supprimé\n"
 "manuellement."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Vérification des versions des instances"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "Cet outil peut seulement mettre à jour les versions %s et ultérieures de PostgreSQL."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Cet outil peut seulement mettre à jour vers la version %s de PostgreSQL."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "Cet outil ne peut pas être utilisé pour mettre à jour vers des versions majeures plus anciennes de PostgreSQL."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "Les répertoires des données de l'ancienne instance et des binaires sont de versions majeures différentes."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "Les répertoires des données de la nouvelle instance et des binaires sont de versions majeures différentes."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "L'option %s ne peut pas être utilisé pour les mises à jour vers PostgreSQL %s et ultérieurs."
+
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "Lors de la vérification d'un serveur en production, l'ancien numéro de port doit être différent du nouveau."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "La nouvelle instance « %s » n'est pas vide : relation « %s.%s » trouvée"
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Vérification des répertoires de tablespace de la nouvelle instance"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "le répertoire du tablespace de la nouvelle instance existe déjà : « %s »"
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -387,7 +399,7 @@ msgstr ""
 "\n"
 "AVERTISSEMENT : le nouveau répertoire de données ne doit pas être à l'intérieur de l'ancien répertoire de données, %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -396,92 +408,94 @@ msgstr ""
 "\n"
 "AVERTISSEMENT : les emplacements des tablespaces utilisateurs ne doivent pas être à l'intérieur du répertoire de données, %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Création du script pour supprimer l'ancienne instance"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "n'a pas pu ajouter les droits d'exécution pour le fichier « %s » : %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Vérification que l'utilisateur de la base de données est l'utilisateur d'installation"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "l'utilisateur de la base de données « %s » n'est pas l'utilisateur d'installation"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "n'a pas pu déterminer le nombre d'utilisateurs"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "Seul l'utilisateur d'installation peut être défini dans la nouvelle instance."
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Vérification des paramètres de connexion de la base de données"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 ne doit pas autoriser les connexions, ie pg_database.datallowconn doit valoir false"
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "fatal"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
-"Tous les bases de données, en dehors de template0, doivent autoriser les connexions,\n"
-"autrement dit leur pg_database.datallowconn doit être à true. Votre installation contient\n"
-"des bases, hors template0, dont le pg_database.datallowconn est configuré à false.\n"
+"Toutes les bases de données, en dehors de template0, doivent autoriser les connexions,\n"
+"autrement dit leur pg_database.datallowconn doit être à true et pg_database.datconnlimit\n"
+"ne doit pas valoir -2. Votre installation contient des bases, hors template0, auxquelles\n"
+"il n'est pas possible de se connecter.\n"
 "Autorisez les connections aux bases, hors template0, ou supprimez les bases qui\n"
 "n'autorisent pas les connexions. Une liste des bases problématiques se trouve dans\n"
 "le fichier :\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Vérification des transactions préparées"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "L'instance source contient des transactions préparées"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "L'instance cible contient des transactions préparées"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Vérification de contrib/isn avec une différence sur le passage des bigint"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -502,12 +516,12 @@ msgstr ""
 "dans le fichier :\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Vérification des opérateurs postfixes définis par les utilisateurs"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -522,12 +536,12 @@ msgstr ""
 "Une liste des opérateurs postfixes définis par les utilisateurs se trouve dans le fichier :\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Vérification des fonctions polymorphiques incompatibles"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -547,12 +561,12 @@ msgstr ""
 "des objets problématiques se trouve dans le fichier\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Vérification des tables WITH OIDS"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -567,12 +581,36 @@ msgstr ""
 "Une liste des tables ayant ce problème se trouve dans le fichier :\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Vérification des incohérences des contraintes NOT NULL"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"Votre installation contient des contraintes NOT NULL incohérentes.\n"
+"Si les colonnes parents sont NOT NULL, alors la colonne enfant doit\n"
+"aussi être marquée NOT NULL, sinon la mise à jour échouera.\n"
+"Vous pouvez corriger ceci en exécutant\n"
+"  ALTER TABLE nom_table ALTER nom_colonne SET NOT NULL;\n"
+"sur chaque colonne listée dans le fichier :\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Vérification des rôles commençant avec « pg_ »"
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -587,12 +625,12 @@ msgstr ""
 "Une liste des rôles commençant par « pg_ » se trouve dans le fichier :\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Vérification des conversions d'encodage définies par les utilisateurs"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -609,52 +647,73 @@ msgstr ""
 "Une liste des conversions d'encodage définies par l'utilisateur se trouve dans le fichier :\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "Vérification des objets affectés par la mise à jour Unicode"
+
+#: check.c:2038 version.c:121
+#, c-format
+msgid "warning"
+msgstr "attention"
+
+#: check.c:2039
+#, c-format
+msgid ""
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr ""
+"Votre installation contient des relations qui pourraient être affectées par une nouvelle version d'Unicode.\n"
+"Une liste des relations potentiellement affectées se trouve dans le fichier :\n"
+"    %s"
+
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Vérification des slots de réplication logique de la nouvelle instance"
 
-#: check.c:1754
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "n'a pas pu compter le nombre de slots de réplication logique"
 
-#: check.c:1759
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "attendait 0 slot de réplication logique mais en a trouvé %d"
 
-#: check.c:1769 check.c:1820
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "n'a pas pu déterminer la configuration sur la nouvelle instance"
 
-#: check.c:1774
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "« wal_level » doit être configuré à « logical » mais est configuré à « %s »"
 
-#: check.c:1780
+#: check.c:2109
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "« max_replication_slots » (%d) doit être supérieur ou égal au nombre de slots de réplication logique (%d) sur l'ancienne instance"
 
-#: check.c:1812
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Vérification de la configuration de la nouvelle instance pour les souscriptions"
 
-#: check.c:1824
+#: check.c:2153
 #, c-format
-msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
-msgstr "« max_replication_slots » (%d) doit être supérieur ou égal au nombre de souscriptions (%d) sur l'ancienne instance"
+msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
+msgstr "« max_active_replication_origins » (%d) doit être supérieur ou égal au nombre de souscriptions (%d) sur l'ancienne instance"
 
-#: check.c:1846
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Vérification des slots de réplication logique valides"
 
-#: check.c:1898
+#: check.c:2227
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -669,12 +728,12 @@ msgstr ""
 "une liste des slots problématiques dans le fichier :\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Vérification de l'état de souscription"
 
-#: check.c:2023
+#: check.c:2369
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -688,184 +747,189 @@ msgstr ""
 "mise à jour. Vous trouverez une liste des souscriptions problématiques dans le fichier :\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "n'a pas pu obtenir les données de contrôle en utilisant %s : %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d : problème sur l'état de l'instance de la base de données"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid "The source cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "L'instance source a été arrêté alors qu'elle était en mode restauration. Pour mettre à jour, utilisez « rsync » comme documenté ou arrêtez-la en tant que serveur primaire."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid "The target cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "L'instance cible a été arrêté alors qu'elle était en mode restauration. Pour mettre à jour, utilisez « rsync » comme documenté ou arrêtez-la en tant que serveur primaire."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "L'instance source n'a pas été arrêtée proprement, état reporté comme : « %s »"
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "L'instance cible n'a pas été arrêtée proprement, état reporté comme : « %s »"
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "n'a pas pu obtenir les données de contrôle en utilisant %s : %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "Il manque certaines informations d'état requises sur l'instance source :"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "Il manque certaines informations d'état requises sur l'instance cible :"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d : problème avec pg_resetwal"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d : problème de récupération des controldata"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "Il manque certaines informations de contrôle requises sur l'instance source :"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "Il manque certaines informations de contrôle requises sur l'instance cible :"
 
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  XID du prochain checkpoint"
 
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  prochain OID du dernier checkpoint"
 
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  prochain MultiXactId du dernier checkpoint"
 
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  plus ancien MultiXactId du dernier checkpoint"
 
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  oldestXID du dernier checkpoint"
 
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  prochain MultiXactOffset du dernier checkpoint"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  premier segment WAL après réinitialisation"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  méthode de passage de arguments float8"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  alignement maximale"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  taille de bloc"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  taille de segment des relations"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  taille de bloc d'un WAL"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  taille d'un segment WAL"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  longueur maximum d'un identifiant"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  nombre maximum de colonnes indexées"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  taille maximale d'un morceau de TOAST"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  taille d'un morceau Large-Object"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  les dates/heures sont-ils des integers?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  version des sommes de contrôle des données"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  propriété « signedness » par défaut d'une donnée char"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr "Ne peut pas continuer sans les informations de contrôle requises, en arrêt"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid ""
 "old and new pg_controldata alignments are invalid or do not match.\n"
@@ -874,92 +938,109 @@ msgstr ""
 "les alignements sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata.\n"
 "Il est probable qu'une installation soit en 32 bits et l'autre en 64 bits."
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr "les tailles de bloc sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid "old and new pg_controldata maximum relation segment sizes are invalid or do not match"
 msgstr "les tailles maximales de segment de relation sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr "les tailles de bloc des WAL sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid "old and new pg_controldata WAL segment sizes are invalid or do not match"
 msgstr "les tailles de segment de WAL sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid "old and new pg_controldata maximum identifier lengths are invalid or do not match"
 msgstr "les longueurs maximales des identifiants sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid "old and new pg_controldata maximum indexed columns are invalid or do not match"
 msgstr "les nombres maximums de colonnes indexées sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not match"
 msgstr "les tailles maximales de morceaux des TOAST sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid "old and new pg_controldata large-object chunk sizes are invalid or do not match"
 msgstr "les tailles des morceaux de Large Objects sont invalides ou ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr "les types de stockage date/heure ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr "l'ancienne instance n'utilise pas les sommes de contrôle alors que la nouvelle les utilise"
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr "l'ancienne instance utilise les sommes de contrôle alors que la nouvelle ne les utilise pas"
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "les versions des sommes de contrôle ne correspondent pas entre l'ancien et le nouveau pg_controldata."
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "Ajout du suffixe « .old » à l'ancien global/pg_control"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Ajout du suffixe « .old » à l'ancien « %s »"
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "Si vous voulez démarrer l'ancienne instance, vous devez supprimer\n"
-"le suffixe « .old » du fichier %s/global/pg_control.old.\n"
+"le suffixe « .old » du fichier %s/%s.old.\n"
 "\n"
 "Comme le mode lien était utilisé, l'ancienne instance ne peut pas\n"
 "être démarré proprement une fois que la nouvelle instance a été démarrée."
 
+#: controldata.c:780
+#, c-format
+msgid ""
+"\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr ""
+"\n"
+"Comme le mode swap a été utilisé, l'ancienne instance ne peut plus être démarrée."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "mode de transfert inconnu"
+
 #: dump.c:20
 #, c-format
 msgid "Creating dump of global objects"
@@ -990,7 +1071,7 @@ msgstr "n'a pas pu obtenir la version de pg_ctl à partir de %s"
 msgid "command too long"
 msgstr "commande trop longue"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le journal applicatif « %s » : %m"
@@ -1027,7 +1108,7 @@ msgstr ""
 "Consultez les dernières lignes de « %s » pour\n"
 "trouver la cause probable de l'échec."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "n'a pas pu écrire dans le fichier de traces « %s »"
@@ -1152,7 +1233,7 @@ msgstr "n'a pas pu exécuter copy_file_range entre l'ancien et le nouveau réper
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range non supporté sur cette plateforme"
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid ""
 "could not create hard link between old and new data directories: %m\n"
@@ -1161,22 +1242,31 @@ msgstr ""
 "n'a pas pu créer le lien physique entre l'ancien et le nouveau répertoires de données : %m\n"
 "Dans le mode lien, les ancien et nouveau répertoires de données doivent être sur le même système de fichiers."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid ""
+"could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file system."
+msgstr ""
+"n'a pas pu créer le lien physique entre l'ancien et le nouveau répertoires de données : %m\n"
+"Dans le mode swap, les ancien et nouveau répertoires de données doivent être sur le même système de fichiers."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "Vérification de la présence des bibliothèques requises"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "n'a pas pu charger la bibliothèque « %s » : %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "Dans la base de données : %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid ""
 "Your installation references loadable libraries that are missing from the\n"
@@ -1191,47 +1281,47 @@ msgstr ""
 "Une liste des bibliothèques problématiques est disponible dans le fichier :\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid "Relation names for OID %u in database \"%s\" do not match: old name \"%s.%s\", new name \"%s.%s\""
 msgstr "Les noms de relation pour l'OID %u dans la base de données « %s » ne correspondent pas : ancien nom « %s.%s », nouveau nom « %s.%s »"
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "Échec de correspondance des anciennes et nouvelles tables dans la base de données « %s »"
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " qui est un index sur \"%s.%s\""
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " qui est un index sur l'OID %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " qui est la table TOAST pour « %s.%s »"
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " qui est la table TOAST pour l'OID %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid "No match found in old cluster for new relation with OID %u in database \"%s\": %s"
 msgstr "Aucune correspondance trouvée dans l'ancienne instance pour la nouvelle relation d'OID %u dans la base de données « %s » : %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid "No match found in new cluster for old relation with OID %u in database \"%s\": %s"
 msgstr "Aucune correspondance trouvée dans la nouvelle instance pour la nouvelle relation d'OID %u dans la base de données « %s » : %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid ""
 "\n"
@@ -1240,7 +1330,7 @@ msgstr ""
 "\n"
 "bases de données sources :"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid ""
 "\n"
@@ -1255,92 +1345,97 @@ msgstr ""
 #                 (errcode(ERRCODE_CASE_NOT_FOUND),
 #                  errmsg("case not found"),
 #                  errhint("CASE statement is missing ELSE part.")));
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "template0 introuvable"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "Base de données : « %s »"
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "relname : « %s.%s », reloid : %u, reltblspace : « %s »"
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "Les slots de réplication logique dans la base de données :"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "nom du slot « %s », plugin de sortie « %s », two_phase %s"
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s : ne peut pas être exécuté en tant que root"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "ancien numéro de port invalide"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "nouveau numéro de port invalide"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "argument invalide pour l'option %s"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "Exécution en mode verbeux"
 
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "les binaires de l'ancienne instance résident"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "les binaires de la nouvelle instance résident"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "les données de l'ancienne instance résident"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "les données de la nouvelle instance résident"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "les sockets seront créés"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "n'a pas pu déterminer le répertoire courant"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid "cannot run pg_upgrade from inside the new cluster data directory on Windows"
 msgstr "ne peut pas exécuter pg_upgrade depuis le répertoire de données de la nouvelle instance sur Windows"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid ""
 "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n"
@@ -1349,12 +1444,12 @@ msgstr ""
 "pg_upgrade met à jour une instance PostgreSQL vers une version majeure\n"
 "différente.\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid ""
 "  pg_upgrade [OPTION]...\n"
@@ -1363,19 +1458,19 @@ msgstr ""
 "  pg_upgrade [OPTION]...\n"
 "\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr ""
 "  -b, --old-bindir=RÉP_BIN       répertoire des exécutables de l'ancienne\n"
 "                                 instance\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid ""
 "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
@@ -1385,131 +1480,150 @@ msgstr ""
 "                                 instance (par défaut, le même répertoire que\n"
 "                                 pg_upgrade)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid "  -c, --check                   check clusters only, don't change any data\n"
 msgstr ""
 "  -c, --check                    vérifie seulement les instances, pas de\n"
 "                                 modifications\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=RÉP_DONNÉES  répertoire des données de l'ancienne instance\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=RÉP_DONNÉES  répertoire des données de la nouvelle instance\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid "  -j, --jobs=NUM                number of simultaneous processes or threads to use\n"
 msgstr ""
 "  -j, --jobs=NUM                 nombre de processus ou threads simultanés à\n"
 "                                 utiliser\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid "  -k, --link                    link instead of copying files to new cluster\n"
 msgstr ""
 "  -k, --link                     lie les fichiers au lieu de les copier vers la\n"
 "                                 nouvelle instance\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid "  -N, --no-sync                 do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync                   n'attend pas que les modifications soient proprement\n"
 "                                 écrites sur disque\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
 msgstr ""
 "  -o, --old-options=OPTIONS      options à passer au serveur de l'ancienne\n"
 "                                 instance\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
 msgstr ""
 "  -O, --new-options=OPTIONS      options à passer au serveur de la nouvelle\n"
 "                                 instance\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr ""
 "  -p, --old-port=PORT            numéro de port de l'ancienne instance (par\n"
 "                                 défaut %d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr ""
 "  -P, --new-port=PORT            numéro de port de la nouvelle instance (par\n"
 "                                 défaut %d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid "  -r, --retain                  retain SQL and log files after success\n"
 msgstr ""
 "  -r, --retain                   conserve les fichiers SQL et de traces en cas\n"
 "                                 de succès\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid "  -s, --socketdir=DIR           socket directory to use (default current dir.)\n"
 msgstr ""
 "  -s, --socketdir=RÉP_SOCKET     répertoire de la socket à utiliser (par défaut\n"
 "                                 le répertoire courant)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr ""
 "  -U, --username=NOM             super-utilisateur de l'instance (par défaut\n"
 "                                 « %s »)\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr "  -v, --verbose                  active des traces internes verbeuses\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                  affiche la version, puis quitte\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid "  --clone                       clone instead of copying files to new cluster\n"
 msgstr ""
 "  --clone                        clone au lieu de copier les fichiers vers la\n"
 "                                 nouvelle instance\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr "  --copy                         copie les fichiers vers la nouvelle instance (par défaut)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid "  --copy-file-range             copy files to new cluster with copy_file_range\n"
 msgstr "  --copy-file-range              copie les fichiers vers la nouvelle instance avec copy_file_range\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid "  --no-statistics               do not import statistics from old cluster\n"
+msgstr "  --no-statistics                n'importe pas les statistiques de l'ancienne instance\n"
+
+#: option.c:332
+#, c-format
+msgid ""
+"  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
+"                                \"unsigned\"\n"
+msgstr ""
+"  --set-char-signedness=OPTION   configure la propriété signedness d'un\n"
+"                                 caractère à \"signed\" ou \"unsigned\"\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr "  --swap                         déplace les répertoires de données vers la nouvelle instance\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr "  --sync-method=METHODE          configure la méthode pour synchroniser les fichiers sur disque\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                     affiche cette aide, puis quitte\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid ""
 "\n"
@@ -1525,7 +1639,7 @@ msgstr ""
 "  arrêter le postmaster de la nouvelle instance\n"
 "\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid ""
 "\n"
@@ -1542,7 +1656,7 @@ msgstr ""
 "  le répertoire « bin » pour l'ancienne version (-b RÉP_BIN)\n"
 "  le répertoire « bin » pour la nouvelle version (-B RÉP_BIN)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid ""
 "\n"
@@ -1555,7 +1669,7 @@ msgstr ""
 "  pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n"
 "ou\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid ""
 "  $ export PGDATAOLD=oldCluster/data\n"
@@ -1570,7 +1684,7 @@ msgstr ""
 "  $ export PGBINNEW=newCluster/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid ""
 "  C:\\> set PGDATAOLD=oldCluster/data\n"
@@ -1585,7 +1699,7 @@ msgstr ""
 "  C:\\> set PGBINNEW=newCluster/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid ""
 "\n"
@@ -1594,12 +1708,12 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid ""
 "You must identify the directory where the %s.\n"
@@ -1608,32 +1722,32 @@ msgstr ""
 "Vous devez identifier le répertoire où le %s.\n"
 "Merci d'utiliser l'option en ligne de commande %s ou la variable d'environnement %s."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "Recherche du vrai répertoire des données pour l'instance source"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "Recherche du vrai répertoire des données pour l'instance cible"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "n'a pas pu obtenir le répertoire des données en utilisant %s : %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "n'a pas pu obtenir le répertoire des données en utilisant %s : %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "n'a pas pu lire la ligne %d du fichier « %s » : %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "ancien numéro de port %hu fourni par l'utilisateur corrigé en %hu"
@@ -1648,7 +1762,7 @@ msgstr "n'a pas pu créer le processus worker : %m"
 msgid "could not create worker thread: %m"
 msgstr "n'a pas pu créer le fil de travail: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
@@ -1663,12 +1777,12 @@ msgstr "le processus fils a quitté anormalement : statut %d"
 msgid "child worker exited abnormally: %m"
 msgstr "le processus fils a quitté anormalement : %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "n'a pas pu lire les droits du répertoire « %s » : %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1679,17 +1793,17 @@ msgstr ""
 "Réalisation de la mise à jour\n"
 "-----------------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Configuration du prochain OID sur la nouvelle instance"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Synchronisation du répertoire des données sur disque"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1700,23 +1814,24 @@ msgstr ""
 "Mise à jour terminée\n"
 "--------------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "le chemin du répertoire pour la nouvelle instance est trop long"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s : n'a pas pu trouver l'exécutable du programme"
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1725,7 +1840,7 @@ msgstr ""
 "Il semble qu'un postmaster est démarré sur l'ancienne instance.\n"
 "Merci d'arrêter ce postmaster et d'essayer de nouveau."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1734,141 +1849,191 @@ msgstr ""
 "Il semble qu'un postmaster est démarré sur la nouvelle instance.\n"
 "Merci d'arrêter ce postmaster et d'essayer de nouveau."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "Configuration de la propriété signedness pour la nouvelle instance"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Configuration de la locale et de l'encodage pour la nouvelle instance"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Analyse de toutes les lignes dans la nouvelle instance"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Gel de toutes les lignes dans la nouvelle instance"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Restauration des objets globaux dans la nouvelle instance"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Restauration des schémas des bases de données dans la nouvelle instance"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Suppression des fichiers à partir du nouveau %s"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "n'a pas pu supprimer le répertoire « %s »"
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Copie de l'ancien %s vers le nouveau serveur"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Configuration du plus ancien XID sur la nouvelle instance"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "Configuration du prochain identifiant de transaction et de l'epoch pour la nouvelle instance"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "Configuration du prochain MultiXactId et décalage pour la nouvelle instance"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Configuration du plus ancien identifiant multixact sur la nouvelle instance"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Réinitialisation des archives WAL"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Configuration des compteurs frozenxid et minmxid  dans la nouvelle instance"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Configuration du compteur minmxid dans la nouvelle instance"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Restauration des slots de réplication logique dans la nouvelle instance"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "n'a pas pu synchroniser le fichier « %s » : %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "Clonage des fichiers des relations utilisateurs"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "Copie des fichiers des relations utilisateurs"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr "Copie des fichiers des relations utilisateurs avec copy_file_range"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "Création des liens pour les fichiers des relations utilisateurs"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "Échange des répertoires de données"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "ancienne base de données « %s » introuvable dans la nouvelle instance"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "n'a pas pu tester le fichier « %s » : %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "n'a pas pu renommer le répertoire « %s » en « %s » : %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "n'a pas pu lire le répertoire « %s » : %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "n'a pas pu synchroniser le répertoire « %s » : %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "n'a pas pu synchroniser le répertoire parent de « %s » : %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
 msgstr "erreur lors de la vérification de l'existence du fichier « %s.%s » (« %s » vers « %s ») : %m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "réécriture de « %s » en « %s »"
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "clonage de « %s » en « %s »"
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "copie de « %s » en « %s »"
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
 msgstr "copie de « %s » en « %s » avec copy_file_range"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "lien de « %s » vers « %s »"
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "ne devrait jamais arriver"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -1900,7 +2065,7 @@ msgstr "n'a pas pu ouvrir le fichier de version « %s » : %m"
 msgid "could not parse version file \"%s\""
 msgstr "n'a pas pu analyser le fichier de version « %s »"
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -1909,7 +2074,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -1918,7 +2083,7 @@ msgstr ""
 "n'a pas pu se connecter au postmaster source lancé avec la commande :\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -1927,22 +2092,22 @@ msgstr ""
 "n'a pas pu se connecter au postmaster cible lancé avec la commande :\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl a échoué à démarrer le serveur source ou connexion échouée"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl a échoué à démarrer le serveur cible ou connexion échouée"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "la variable d'environnement libpq %s a une valeur serveur non locale : %s"
@@ -1971,6 +2136,16 @@ msgstr "n'a pas pu tester le répertoire « %s » du tablespace : %m"
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "le chemin « %s » du tablespace n'est pas un répertoire"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "échec de la connexion : %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "socket invalide"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -1991,11 +2166,6 @@ msgstr "ok"
 msgid "Checking for hash indexes"
 msgstr "Vérification des index hash"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "attention"
-
 #: version.c:123
 #, c-format
 msgid ""
@@ -2030,17 +2200,17 @@ msgstr ""
 "une fois exécuté par psql en tant que superutilisateur va recréer tous les\n"
 "index invalides. Avant cela, aucun de ces index ne sera utilisé."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "Vérification des mises à jour d'extension"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "notice"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_upgrade/po/ja.po b/src/bin/pg_upgrade/po/ja.po
index 0994211cdf4..9cb007f13fd 100644
--- a/src/bin/pg_upgrade/po/ja.po
+++ b/src/bin/pg_upgrade/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_upgrade (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-14 09:41+0900\n"
-"PO-Revision-Date: 2025-04-14 10:26+0900\n"
+"POT-Creation-Date: 2025-10-10 15:48+0900\n"
+"PO-Revision-Date: 2025-10-10 16:07+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -24,7 +24,7 @@ msgstr ""
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
 msgid "out of memory\n"
-msgstr "メモリ不足です\n"
+msgstr "メモリ不足\n"
 
 #: ../../common/fe_memutils.c:92 ../../common/fe_memutils.c:153
 #, c-format
@@ -60,11 +60,11 @@ msgstr "シェルコマンドの引数に改行(LF)または復帰(CR)が含ま
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "データベース名に改行(LF)または復帰(CR)が含まれています: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "ユーザーテーブル内のシステム定義複合型を確認しています"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -76,11 +76,11 @@ msgstr ""
 "このクラスタは現時点ではアップグレードできません。問題の列を削除したのちに\n"
 "アップグレードを再実行することができます。\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "非互換の \"line\" データ型を確認しています"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -93,11 +93,11 @@ msgstr ""
 "変更されているため、このクラスタは現時点ではアップグレードできません。\n"
 "問題の列を削除したのちにアップグレードを再実行できます。\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "ユーザーテーブル内の reg * データ型をチェックしています"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -109,11 +109,11 @@ msgstr ""
 "保存されないため、現時点ではこのクラスタをアップグレードすることはできません。\n"
 "問題の列を削除したのち、アップグレードを再実行できます。\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "非互換の\"aclitem\"データ型を確認しています"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -125,11 +125,11 @@ msgstr ""
 "現時点ではこのクラスタをアップグレードすることはできません。\n"
 "問題の列を削除したのち、アップグレードを再実行できます。\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "無効な\"unknown\"ユーザー列をチェックしています"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -141,11 +141,11 @@ msgstr ""
 "ではアップグレードできません。問題の列を削除したのち、アップグレードを\n"
 "再実行できます。\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "無効な\"sql_identifier\"ユーザー列を確認しています"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -157,11 +157,11 @@ msgstr ""
 "アップグレードできません。問題のある列を削除した後にアップグレードを再実行する\n"
 "ことができます。\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "ユーザーテーブル内の非互換の\"jsonb\"データ型を確認しています"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -173,11 +173,11 @@ msgstr ""
 "クラスタをアップグレードすることはできません。 問題の列を削除したのち、\n"
 "アップグレードを再実行できます。\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "ユーザーテーブル内の削除された\"abstime\"データ型を確認しています"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -191,11 +191,11 @@ msgstr ""
 "問題の列を削除するか、他のデータ型に変更した後にアップグレードを\n"
 "再実行できます。\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "ユーザーテーブル中内の削除された\"reltime\"データ型を確認しています"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -208,11 +208,11 @@ msgstr ""
 "このクラスタは現時点ではアップグレードできません。問題の列を削除するか、\n"
 "他のデータ型に変更した後にアップグレードを再実行できます。\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "ユーザーテーブル内の削除された\"tinterval\"データ型を確認しています"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -225,34 +225,34 @@ msgstr ""
 "このクラスタは現時点ではアップグレードできません。問題の列を削除するか、\n"
 "他のデータ型に変更した後にアップグレードを再実行できます。\n"
 
-#: check.c:421
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "問題を検出した項目: %s"
 
-#: check.c:424
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "問題の列の一覧は以下のファイルにあります:"
 
-#: check.c:430 check.c:1026 check.c:1177 check.c:1260 check.c:1349 check.c:1440
-#: check.c:1572 check.c:1657 check.c:1704 check.c:1784 check.c:2089
-#: check.c:2108 check.c:2154 check.c:2207 file.c:378 file.c:415 function.c:208
-#: option.c:519 version.c:79 version.c:162
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ファイル\"%s\"をオープンできませんでした: %m"
 
-#: check.c:472
+#: check.c:473
 #, c-format
 msgid "Checking data type usage"
 msgstr "データ型の使用を確認しています"
 
-#: check.c:526
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "問題を検出したデータ型確認項目: %s"
 
-#: check.c:575
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -261,7 +261,7 @@ msgstr ""
 "元の実行中サーバーの一貫性チェックを実行しています。\n"
 "--------------------------------------------------"
 
-#: check.c:581
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -270,12 +270,12 @@ msgstr ""
 "整合性チェックを実行しています。\n"
 "-----------------------------"
 
-#: check.c:745
+#: check.c:754
 #, c-format
 msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
 msgstr "スワップモードはPostgreSQL %s以降のバージョンからのアップグレードのみ可能です。"
 
-#: check.c:768
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +284,7 @@ msgstr ""
 "\n"
 "* クラスタは互換性があります *"
 
-#: check.c:776
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -295,18 +295,20 @@ msgstr ""
 "この後pg_upgradeが失敗した場合は、続ける前に新しいクラスタを\n"
 "initdbで再作成する必要があります。"
 
-#: check.c:817
+#: check.c:826
 #, c-format
 msgid ""
-"Some optimizer statistics may not have been transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"オプティマイザー統計の一部は pg_upgrade で転送されなかった可能性があります。\n"
-"新しいサーバーを起動した後、次の操作を検討してください。\n"
-"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only"
+"統計情報の一部は pg_upgrade では転送されません。\n"
+"新しいサーバーを起動した後、次の2つのコマンドの実行を検討してください。\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:823
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -315,7 +317,7 @@ msgstr ""
 "このスクリプトを実行すると、旧クラスタのデータファイルが削除されます:\n"
 "    %s"
 
-#: check.c:828
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -328,62 +330,62 @@ msgstr ""
 "ファイルを削除するためのスクリプトを作成できませんでした。 古い\n"
 "クラスタの内容は手動で削除する必要があります。"
 
-#: check.c:840
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "クラスタのバージョンを確認しています"
 
-#: check.c:852
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "このユーティリティではPostgreSQLバージョン%s以降のバージョンからのみアップグレードできます。"
 
-#: check.c:857
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "このユーティリティは、PostgreSQLバージョン%sにのみアップグレードできます。"
 
-#: check.c:866
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "このユーティリティは PostgreSQL の過去のメジャーバージョンにダウングレードする用途では使用できません。"
 
-#: check.c:871
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "旧クラスタのデータとバイナリのディレクトリは異なるメジャーバージョンのものです。"
 
-#: check.c:874
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "新クラスタのデータとバイナリのディレクトリは異なるメジャーバージョンのものです。"
 
-#: check.c:885
+#: check.c:897
 #, c-format
-msgid "%s option cannot be used to upgrade from PostgreSQL %s and later."
-msgstr "PostgreSQL %s以降からのアップグレードでは %s オプションは使用できません。"
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "PostgreSQL %2$s以降からのアップグレードでは %1$s オプションは使用できません。"
 
-#: check.c:901
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "稼働中のサーバーをチェックする場合、新旧のポート番号が異なっている必要があります。"
 
-#: check.c:921
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "新クラスタのデータベース\"%s\"が空ではありません: リレーション\"%s.%s\"が見つかりました"
 
-#: check.c:944
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "新しいクラスタのテーブル空間ディレクトリを確認しています"
 
-#: check.c:955
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "新しいクラスタのテーブル空間ディレクトリはすでに存在します: \"%s\""
 
-#: check.c:989
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -392,7 +394,7 @@ msgstr ""
 "\n"
 "警告: 新データディレクトリが旧データディレクトリ、つまり %sの中にあってはなりません"
 
-#: check.c:1013
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -401,53 +403,54 @@ msgstr ""
 "\n"
 "警告: ユーザー定義テーブル空間の場所がデータディレクトリ、つまり %s の中にあってはなりません。"
 
-#: check.c:1023
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "旧クラスタを削除するスクリプトを作成しています"
 
-#: check.c:1051
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "ファイル\"%s\"に実行権限を追加できませんでした: %m"
 
-#: check.c:1071
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "データベースユーザーがインストールユーザーかどうかをチェックしています"
 
-#: check.c:1087
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "データベースユーザー\"%s\"がインストールユーザーではありません"
 
-#: check.c:1098
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "ユーザー数を特定できませんでした"
 
-#: check.c:1106
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "新クラスタ内で定義できるのはインストールユーザーのみです。"
 
-#: check.c:1136
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "データベース接続の設定を確認しています"
 
-#: check.c:1164
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 には接続を許可してはなりません。すなわち、pg_database.datallowconn は false である必要があります"
 
-#: check.c:1191 check.c:1312 check.c:1408 check.c:1536 check.c:1612
-#: check.c:1670 check.c:1753 check.c:2121 check.c:2263 function.c:229
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "致命的"
 
-#: check.c:1192
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
@@ -466,27 +469,27 @@ msgstr ""
 "一覧が以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1217
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "準備済みトランザクションをチェックしています"
 
-#: check.c:1226
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "移行元クラスタに準備済みトランザクションがあります"
 
-#: check.c:1228
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "移行先クラスタに準備済みトランザクションがあります"
 
-#: check.c:1288
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "bigint を渡す際にミスマッチが発生する contrib/isn をチェックしています"
 
-#: check.c:1313
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -506,12 +509,12 @@ msgstr ""
 "問題のある関数の一覧は以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1393
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "ユーザー定義の後置演算子を確認しています"
 
-#: check.c:1409
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -526,12 +529,12 @@ msgstr ""
 "以下のファイルにユーザー定義後置演算子の一覧があります:\n"
 "    %s"
 
-#: check.c:1464
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "非互換の多態関数を確認しています"
 
-#: check.c:1537
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -549,12 +552,12 @@ msgstr ""
 "問題となるオブジェクトの一覧は以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1597
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "WITH OIDS宣言されたテーブルをチェックしています"
 
-#: check.c:1613
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -569,12 +572,36 @@ msgstr ""
 "以下のファイルにこの問題を抱えるテーブルの一覧があります:\n"
 "    %s"
 
-#: check.c:1640
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "非NULL制約の整合性を確認しています"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"このクラスタには整合性の取れていない NOT NULL 制約があります。\n"
+"親テーブルの列が NOT NULL である場合、子テーブルの列も NOT NULL としてマーク\n"
+"されていなければ、アップグレードは失敗します。\n"
+"この状態は、次のコマンドを\n"
+"  ALTER TABLE テーブル名 ALTER 列名 SET NOT NULL;\n"
+"以下のファイルにリストされている各列に対して実行することで解消できます:\n"
+"  %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "'pg_' で始まるロールをチェックしています"
 
-#: check.c:1671
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -590,12 +617,12 @@ msgstr ""
 "\"pg_\"で始まるロールの一覧は以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1725
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "ユーザー定義のエンコーディング変換を確認しています"
 
-#: check.c:1754
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -613,20 +640,20 @@ msgstr ""
 "ユーザー定義のエンコーディング変換の一覧は以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1839
+#: check.c:1939
 #, c-format
 msgid "Checking for objects affected by Unicode update"
 msgstr "Unicodeの更新によって影響を受けるオブジェクトを確認しています"
 
-#: check.c:1933 version.c:121
+#: check.c:2038 version.c:121
 #, c-format
 msgid "warning"
 msgstr "警告"
 
-#: check.c:1934
+#: check.c:2039
 #, c-format
 msgid ""
-"Your installation contains relations that may be affected by a new version of Unicode.\n"
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
 "A list of potentially-affected relations is in the file:\n"
 "    %s"
 msgstr ""
@@ -634,52 +661,52 @@ msgstr ""
 "影響を受ける可能性があるリレーションの一覧は以下のファイルにあります:\n"
 "    %s"
 
-#: check.c:1970
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "新しいクラスタの論理レプリケーションスロットを確認しています"
 
-#: check.c:1978
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "論理レプリケーションスロットの数を数えられませんでした"
 
-#: check.c:1983
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "論理レプリケーションスロット数は0であることを期待していましたが、%d個ありました"
 
-#: check.c:1993 check.c:2044
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "新クラスタ上のパラメータ設定を決定できませんでした"
 
-#: check.c:1998
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\"は\"logical\"でなければなりませんが\"%s\"に設定されています"
 
-#: check.c:2004
+#: check.c:2109
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "\"max_replication_slots\" (%d) は旧クラスタにおける論理レプリケーションスロットの数(%d)以上でなければなりません"
 
-#: check.c:2036
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "新しいクラスタの構成のサブスクリプションを確認しています"
 
-#: check.c:2048
+#: check.c:2153
 #, c-format
 msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
 msgstr "\"max_active_replication_origins\" (%d) は旧クラスタにおけるサブスクリプションの数(%d)以上でなければなりません"
 
-#: check.c:2070
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "有効な論理レプリケーションスロットを確認しています"
 
-#: check.c:2122
+#: check.c:2227
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -694,12 +721,12 @@ msgstr ""
 "問題のある列の一覧は、以下のファイルにあります: \n"
 "    %s"
 
-#: check.c:2182
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "サブスクリプション状態を確認しています"
 
-#: check.c:2264
+#: check.c:2369
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -964,32 +991,34 @@ msgstr "旧クラスタではデータチェックサムを使用しています
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "新旧の pg_controldata 間でチェックサムのバージョンが一致しません"
 
-#: controldata.c:761
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old "
-msgstr "古い global/pg_control に \".old\" サフィックスを追加しています"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "古い \"%s\" に \".old\" サフィックスを追加します"
 
-#: controldata.c:766
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %m"
 
-#: controldata.c:771
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/%s.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
-"旧クラスタを起動する場合、%s/%s.oldから\n"
+"旧クラスタを起動する場合、\"%s/%s.old\"から\n"
 "\".old\"拡張子を削除する必要があります。「リンク」モードが使われて\n"
 "いるため、一度新クラスタを起動してしまうと旧クラスタは安全に起動\n"
 "することができなくなります。"
 
-#: controldata.c:778
+#: controldata.c:780
 #, c-format
 msgid ""
 "\n"
@@ -999,7 +1028,7 @@ msgstr ""
 "\n"
 "\"swap\"モードが使用されているため, 古いクラスタは今後安全に起動できません"
 
-#: controldata.c:782 file.c:455
+#: controldata.c:784 file.c:455
 #, c-format
 msgid "unrecognized transfer mode"
 msgstr "識別できない転送モード"
@@ -1700,7 +1729,7 @@ msgstr "ワーカープロセスを作成できませんでした: %m"
 msgid "could not create worker thread: %m"
 msgstr "ワーカースレッドを作成できませんでした: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() が失敗しました: %m"
@@ -1759,6 +1788,7 @@ msgid "directory path for new cluster is too long"
 msgstr "新クラスタのディレクトリ・パスが長すぎます"
 
 #: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"を作成できませんでした: %m"
@@ -1911,26 +1941,16 @@ msgstr "新クラスタ内に旧データベース\"%s\"が見つかりません
 msgid "could not stat file \"%s\": %m"
 msgstr "ファイル\"%s\"のstatに失敗しました: %m"
 
-#: relfilenumber.c:293 relfilenumber.c:297
-#, c-format
-msgid "could not create directory \"%s\""
-msgstr "ディレクトリ\"%s\"を作成できませんでした"
-
 #: relfilenumber.c:301 relfilenumber.c:305
 #, c-format
-msgid "could not rename \"%s\" to \"%s\""
-msgstr "ファイル\"%s\"の名前を\"%s\"に変更できませんでした"
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "ディレクトリ\"%s\"の名前を\"%s\"に変更できませんでした: %m"
 
 #: relfilenumber.c:375 relfilenumber.c:402
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
 
-#: relfilenumber.c:393 relfilenumber.c:420
-#, c-format
-msgid "could not rename \"%s\" to \"%s\": %m"
-msgstr "\"%s\"の名前を\"%s\"に変更できませんでした: %m"
-
 #: relfilenumber.c:396 relfilenumber.c:434
 #, c-format
 msgid "could not read directory \"%s\": %m"
@@ -2012,7 +2032,7 @@ msgstr "バージョンファイル\"%s\"をオープンできませんでした
 msgid "could not parse version file \"%s\""
 msgstr "バージョンファイル\"%s\"をパースできませんでした"
 
-#: server.c:317
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -2021,7 +2041,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:321
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -2030,7 +2050,7 @@ msgstr ""
 "以下のコマンドで起動した移行元postmasterに接続できませんでした:\n"
 "%s"
 
-#: server.c:325
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -2039,22 +2059,22 @@ msgstr ""
 "以下のコマンドで起動した移行先postmasterに接続できませんでした:\n"
 "%s"
 
-#: server.c:339
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl が移行元サーバーの起動に失敗した、あるいは接続に失敗しました"
 
-#: server.c:341
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl が移行先サーバーの起動に失敗した、あるいは接続に失敗しました"
 
-#: server.c:386
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "メモリ不足です"
 
-#: server.c:399
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "libpq の環境変数 %s で、ローカルでないサーバー値が設定されています: %s"
@@ -2083,26 +2103,16 @@ msgstr "テーブル空間のディレクトリ\"%s\"をstatできませんで
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "テーブル空間のパス\"%s\"がディレクトリではありません"
 
-#: task.c:195
-#, c-format
-msgid "failed to create connection with connection string: \"%s\""
-msgstr "次の接続文字列で接続できませんでした: \"%s\""
-
-#: task.c:217 task.c:268 task.c:283 task.c:294
+#: task.c:216 task.c:267 task.c:282 task.c:293
 #, c-format
 msgid "connection failure: %s"
 msgstr "接続失敗: %s"
 
-#: task.c:396
+#: task.c:395
 #, c-format
 msgid "invalid socket"
 msgstr "不正なソケットです"
 
-#: task.c:405
-#, c-format
-msgid "select() failed: %m"
-msgstr "select() が失敗しました: %m"
-
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
diff --git a/src/bin/pg_upgrade/po/ka.po b/src/bin/pg_upgrade/po/ka.po
index 2160e67da18..58d0acd1eae 100644
--- a/src/bin/pg_upgrade/po/ka.po
+++ b/src/bin/pg_upgrade/po/ka.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_upgrade (PostgreSQL) 18\n"
+"Project-Id-Version: pg_upgrade (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-05-02 22:20+0000\n"
-"PO-Revision-Date: 2025-05-03 01:23+0200\n"
+"POT-Creation-Date: 2025-08-15 21:19+0000\n"
+"PO-Revision-Date: 2025-08-16 16:35+0200\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
@@ -58,11 +58,11 @@ msgstr "გარსის ბრძანების არგუმენტ
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "მონაცემთა ბაზის სახელი ხაზის გადატანას ან კარეტის დაბრუნებას შეიცავს: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "მომხმარებლის ცხრილებში სისტემის მიერ განსაზღვრული კომპოზიტური ტიპების შემოწმება"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -74,11 +74,11 @@ msgstr ""
 "ამ კლასტერის განახლება ამჟამად შეუძლებელია  შეგიძლიათ\n"
 "წაშალოთ პრობლემური სვეტები და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "შეუთავსებელი \"line\" მონაცემთა ტიპის შემოწმება"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -92,11 +92,11 @@ msgstr ""
 "კლასტერის ძველი ვერსიის განახლება ამჟამად შეუძლებელია.  შეგიძლიათ\n"
 "წაშალოთ ეს სვეტები და თავიდან გაუშვათ განახლება.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "მომხმარებლის ცხრილებში reg* მონაცემის ტიპების შემოწმება"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -108,11 +108,11 @@ msgstr ""
 "განახლება შეუძლებელია.  პრობლემის მოსაგვარებლად,\n"
 "შეგიძლიათ წაშალოთ შესაბამისის სვეტები და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "შეუთავსებელი \"aclitem\" მონაცემთა ტიპის შემოწმება"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -124,11 +124,11 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური\n"
 "სვეტები და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "არასწორი \"unknown\" მომხმარებლის სვეტების შემოწმება"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -140,11 +140,11 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური\n"
 "სვეტები და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "არასწორი \"sql_identifier\" მომხმარებლის სვეტების შემოწმება"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -156,11 +156,11 @@ msgstr ""
 "ამჟამად ამ კლასტერის განახლება შეუძლებელია.\n"
 "შეგიძლიათ,   წაშალოთ პრობლემური სვეტები და თავიდან გაუშვათ განახლება.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "მომხმარებლის ცხრილებში შეუთავსებელი \"jsonb\" მონაცემების ტიპის შემოწმება"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -172,11 +172,11 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური\n"
 "სვეტები და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "მომხმარებლის ცხრილებში წაშლილი \"abstime\" მონაცემის ტიპების შემოწმება"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -190,11 +190,11 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური სვეტები,\n"
 "ან შეცვალოთ მათი ტიპი და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "მომხმარებლის ცხრილებში წაშლილი \"reltime\" მონაცემის ტიპების შემოწმება"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -208,11 +208,11 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური სვეტები,\n"
 "ან შეცვალოთ მათი ტიპი და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "მომხმარებლის ცხრილებში წაშლილი \"tinterval\" მონაცემის ტიპების შემოწმება"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -226,34 +226,34 @@ msgstr ""
 "შეუძლებელია  შეგიძლიათ წაშალოთ პრობლემური სვეტები,\n"
 "ან შეცვალოთ მათი ტიპი და განახლება თავიდან გაუშვათ.\n"
 
-#: check.c:421
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "ჩავარდა შემოწმება: %s"
 
-#: check.c:424
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "პრობლემური სვეტების სია არის ფაილში:"
 
-#: check.c:430 check.c:1029 check.c:1180 check.c:1263 check.c:1352 check.c:1443
-#: check.c:1575 check.c:1660 check.c:1707 check.c:1787 check.c:2092
-#: check.c:2111 check.c:2157 check.c:2210 file.c:378 file.c:415 function.c:208
-#: option.c:519 version.c:79 version.c:162
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2189 check.c:2208 check.c:2254 check.c:2307 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "ფაილის (%s) გახსნის შეცდომა: %m"
 
-#: check.c:472
+#: check.c:473
 #, c-format
 msgid "Checking data type usage"
 msgstr "მონაცემის ტიპის გამოყენების შემოწმება"
 
-#: check.c:526
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "მონაცემის ტიპის შემოწმებები ჩავარდა: %s"
 
-#: check.c:575
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -262,7 +262,7 @@ msgstr ""
 "თანმიმდევრულობის შემოწმების შესრულება ძველ ცოცხალ სერვერზე\n"
 "------------------------------------------------"
 
-#: check.c:581
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -271,12 +271,12 @@ msgstr ""
 "თანმიმდევრულობის შემოწმების ჩატარება\n"
 "-----------------------------"
 
-#: check.c:745
+#: check.c:754
 #, c-format
 msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
 msgstr "რეჟიმის 'swap' გამოყენება კლასტერის ვერსიის ასაწევად შესაძლებელია PostgreSQL-ის ვერსიაში %s და შემდეგ."
 
-#: check.c:768
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +285,7 @@ msgstr ""
 "\n"
 "*კლასტერები თავსებადია *"
 
-#: check.c:776
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +296,7 @@ msgstr ""
 "თუ ამ წერტილის შემდეგ pg_upgrade ავარიულად დასრულდება, გაგრძელებამდე\n"
 "ახალი კლასტერის init-db-ის გაკეთება შეიძლება თავიდან მოგიწიოთ."
 
-#: check.c:817
+#: check.c:826
 #, c-format
 msgid ""
 "Some statistics are not transferred by pg_upgrade.\n"
@@ -309,7 +309,7 @@ msgstr ""
 "    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
 "    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:826
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -318,7 +318,7 @@ msgstr ""
 "ამ სკრიპტის გაშვება ძველი კლასტერის მონაცემების ფაილებს წაშლის:\n"
 "   %s"
 
-#: check.c:831
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -331,62 +331,62 @@ msgstr ""
 "ძველი კლასტერის მონაცემების წაშლის სკრიპტის შექმნა შეუძლებელია.  ძველი კლასტერის\n"
 " შემცველობა ხელით უნდა წაშალოთ."
 
-#: check.c:843
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "კლასტერის ვერსიების შემოწმება"
 
-#: check.c:855
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "ამ პროგრამას განახლება PostgreSQL-ის ვერსიის %s-დან და ზემოთ შეუძლია."
 
-#: check.c:860
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "ამ პროგრამას შეუძლია მხოლოდ PostgreSQL ვერსიაზე გადასვლა %s."
 
-#: check.c:869
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "ეს პროგრამა არ შეიძლება გამოყენებულ იქნას უფრო ძველი ძირითადი PostgreSQL ვერსიების ჩამოსაწევად."
 
-#: check.c:874
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "ძველი კლასტერის მონაცემები და გამშვები ფაილის საქაღალდეები სხვადასხვა ძირითადი ვერსიიდანაა."
 
-#: check.c:877
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "ახალი კლასტერის მონაცემებისა და გამშვები ფაილების საქაღალდეები სხვადასხვა ძირითად ვერსიებს მიეკუთვნება."
 
-#: check.c:888
+#: check.c:897
 #, c-format
-msgid "%s option cannot be used to upgrade from PostgreSQL %s and later."
-msgstr "პარამეტრს %s ვერ გამოიყენებთ PostgreSQL %s-დან და უფრო ახლიდან განახლებისას."
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "პარამეტრს %s ვერ გამოიყენებთ PostgreSQL %s-დან და უფრო ახლიდან განახლებისთვის."
 
-#: check.c:904
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "ცოცხალი სერვერის შემოწმებისას ძველი და ახალი პორტის ნომრები სხვადასხვა უნდა იყოს."
 
-#: check.c:924
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "ახალი კლასტერული მონაცემთა ბაზა \"%s\" ცარიელი არაა: ნაპოვნია ურთიერთობა \"%s.%s\""
 
-#: check.c:947
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "ახალი კლასტერის ცხრილების სივრცის საქაღალდეების შემოწმება"
 
-#: check.c:958
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "ახალი კლასტერის ცხრილების სივრცის საქაღალდე უკვე არსებობს: \"%s\""
 
-#: check.c:992
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -395,7 +395,7 @@ msgstr ""
 "\n"
 "გაფრთხილება:  ახალი მონაცემების საქაღალდე ძველი მონაცემების საქაღალდის შიგნით არ უნდა იყოს. მაგ: %s"
 
-#: check.c:1016
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -404,53 +404,54 @@ msgstr ""
 "\n"
 "გაფრთხილება:  მომხმარებლის მიერ აღწერილი ცხრილის სივრცეების მდებარეობები მონაცემების საქაღალდის შიგნით არ უნდა იყოს. მაგ: %s"
 
-#: check.c:1026
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "ძველი კლასტერის წასაშლელად სკრიპტის შექმნა"
 
-#: check.c:1054
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "ფაილზე \"%s\" გაშვების წვდომის დამატების შეცდომა: %m"
 
-#: check.c:1074
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "შემოწმება, დამყენებელი მომხმარებელი დაყენების მომხმარებელს თუ უდრის"
 
-#: check.c:1090
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "მონაცემთა ბაზის მომხმარებელი \"%s\" არ არის დაყენების მომხმარებელი"
 
-#: check.c:1101
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "ვერ დადგინდა მომხმარებელთა რაოდენობა"
 
-#: check.c:1109
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "ახალი კლასტერისთვის მხოლოდ დაყენების მომხმარებლის მითითებაა შესაძლებელი."
 
-#: check.c:1139
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "მონაცემთა ბაზის კავშირის პარამეტრების შემოწმება"
 
-#: check.c:1167
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0-თან დაკავშირება შეუძლებელი უნდა იყოს. ანუ, მისი pg_database.datallowconn პარამეტრი false უნდა იყოს"
 
-#: check.c:1194 check.c:1315 check.c:1411 check.c:1539 check.c:1615
-#: check.c:1673 check.c:1756 check.c:2124 check.c:2266 function.c:229
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2221 check.c:2363
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "ფატალური"
 
-#: check.c:1195
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
@@ -461,35 +462,35 @@ msgid ""
 "connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
-"ყველა არა-template0 მონაცემთა ბაზა უნდა უშვებდეს მიერთებას, ანუ მათი\n"
-"pg_database.datallowconn ჭეშმარიტი უნდა იყოს და pg_database.datconnlimit არ\n"
-"უნდა იყოს -2.  ბაზის თქვენი ვარიანტი შეიცავს არა-template0 მონაცემთა ბაზებს,\n"
-"რომლებთანაც მიერთება შეუძლებელია.  იფიქრეთ, რომ დაუშვათ მიერთება ყველა\n"
-"არა-template0 მონაცემთა ბაზებთან, ან წაშალეთ ბაზები, რომლებიც არ უშვებენ კავშირს.\n"
-"ამ პრობლემის მქონე მონაცემთა ბაზების შენახულია ფაილში:\n"
-"     %s"
+"ყველა არა-template0 ბაზაზე მიერთება შესაძლებელი უნდა იყოს, ანუ მათი\n"
+"pg_database.datallowconn ჭეშმარიტი უნდა იყოს და pg_database.datconnlimit -2-ის ტოლი.\n"
+"თქვენი ვერსია შეიცავს არა-template0 ბაზებს, რომლებთან მიერთებაც შეიძლებელია.\n"
+"სასურველია დაუშვათ მიერთება ყველა არა-template0 ბაზაზე, ან\n"
+"წაშალოთ ბაზები, რომლებზეც წვდომა არ არსებობს.\n"
+"პრობლემური ბაზების სიის ნახვა შეგიძლიათ ფაილში:\n"
+"    %s"
 
-#: check.c:1220
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "მომზადებული ტრანზაქციების შემოწმება"
 
-#: check.c:1229
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "საწყისი კლასტერი მომზადებულ ტრანზაქციებს შეიცავს"
 
-#: check.c:1231
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "სამიზნე კლასტერი მომზადებულ ტრანზაქციებს შეიცავს"
 
-#: check.c:1291
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "\"contrib/isn\"-ის bgint-passing-ის არ-დამთხვევაზე შემოწმება"
 
-#: check.c:1316
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -506,12 +507,12 @@ msgstr ""
 ", განაახლოთ ბაზა და აღადგინოთ ფუნქციები.  პრობლემური ფუნქციების სია შეგიძლიათ იხილოთ ფაილში:\n"
 "   %s"
 
-#: check.c:1396
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "მომხმარებლის მიერ აღწერილი postfix ოპერატორების არსებობის შემოწმება"
 
-#: check.c:1412
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -526,12 +527,12 @@ msgstr ""
 "მომხმარებლის მიერ აღწერილი postfix ოპერატორების სიის ნახვა შეგიძლიათ ფაილში:\n"
 "   %s"
 
-#: check.c:1467
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "შეუთავსებელი პოლიმორფული ფუნქციების არსებობის შემოწმება"
 
-#: check.c:1540
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -550,12 +551,12 @@ msgstr ""
 "ფაილში არსებული პრობლემური ობიექტები:\n"
 "  %s"
 
-#: check.c:1600
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "WITH OIDS ცხრილების შემოწმება"
 
-#: check.c:1616
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -570,12 +571,36 @@ msgstr ""
 "ცხრილების სია, რომელსაც ეს პრობლემა გააჩნიათ, შეგიძლიათ იხილოთ ფაილში:\n"
 "    %s"
 
-#: check.c:1643
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "მოწმდება არა-ნულოვანი შეზღუდვის შეუსაბამობები"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"თქვენი დაყენებული ვერსია შეიცავს არამდგრად NOT NULL შეზღუდვებს.\n"
+"თუ მშობელი სვეტ(ებ)-ი NOT NULL ტიპისაა, მაშინ შვილი სვეტებიც NOT NULL\n"
+"უნდა იყოს, ან ვერსიის აწევა ჩავარდება.\n"
+"ამის გასწორება შეგიძლიათ ბრძანებით\n"
+"  ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"თითოეულ სვეტზე, რომელიც ჩამოთვლილია ფაილში:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "როლების შემოწმება, რომლებიც \"pg_\"-ით იწყება"
 
-#: check.c:1674
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -590,12 +615,12 @@ msgstr ""
 "როლების სია, რომლებიც \"pg_\"-ით იწყებიან, შეგიძლიათ იპოვოთ ფაილში:\n"
 "    %s"
 
-#: check.c:1728
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "მომხმარებლის მიერ განსაზღვრული კოდირების კონვერტაციის შემოწმება"
 
-#: check.c:1757
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -611,73 +636,73 @@ msgstr ""
 "მომხმარებლის მიერ აღწერილი გადაყვანების ნახვა შეგიძლიათ ფაილში:\n"
 "    %s"
 
-#: check.c:1842
+#: check.c:1939
 #, c-format
 msgid "Checking for objects affected by Unicode update"
-msgstr "უნიკოდის განახლების გავლენის ქვეშ მოქცეული ობიექტების შემოწმება"
+msgstr "მიმდინარეობს ობიექტების შემოწმება, რომლებზეც შეუძლება, უნიკოდის განახლებას გავლენა ჰქონდეს"
 
-#: check.c:1936 version.c:121
+#: check.c:2033 version.c:121
 #, c-format
 msgid "warning"
 msgstr "გაფრთხილება"
 
-#: check.c:1937
+#: check.c:2034
 #, c-format
 msgid ""
-"Your installation contains relations that may be affected by a new version of Unicode.\n"
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
 "A list of potentially-affected relations is in the file:\n"
 "    %s"
 msgstr ""
-"პროგრამის თქვენი ვერსია შეიცავს ურთიერთობას, რომელზეც, შეიძლება, უნიკოდის ახალ ვერსიას ჰქონდეს გავლენა.\n"
-"პოტენციურად გავლენის ქვეშ მოქცეული ურთიერთობები შენახულია ფაილში:\n"
+"პროგრამის თქვენი ვერსია შეიცავს ურთიერთობებს, რომლებზეც, შეიძლება, უნიკოდის ახალი ვერსიას გავლენა ჰქონდეს.\n"
+"პოტენციურად გავლენის ქვეშ მოქცეული ურთიერთობების სია იხილეთ ფაილში:\n"
 "    %s"
 
-#: check.c:1973
+#: check.c:2070
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "ახალი კლასტერის ლოგიკური რეპლიკაციის სლოტების შემოწმება"
 
-#: check.c:1981
+#: check.c:2078
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "ლოგიკური რეპლიკაციის სლოტების რაოდენობის დათვლა შეუძლებელია"
 
-#: check.c:1986
+#: check.c:2083
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "მოველოდი 0 ლოგიკური რეპლიკაციის სლოტს, მაგრამ, მივიღე %d"
 
-#: check.c:1996 check.c:2047
+#: check.c:2093 check.c:2144
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "ახალ კლასტერზე პარამეტრის მნიშვნელობების დადგენა შეუძლებელია"
 
-#: check.c:2001
+#: check.c:2098
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\" უნდა იყოს \"logical\", მაგრამ მნიშვნელობაა \"%s\""
 
-#: check.c:2007
+#: check.c:2104
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "\"max_replication_slots\" (%d) ძველი კლასტერის ლოგიკური რეპლიკაციების სლოტების რაოდენობაზე (%d) მეტი ან ტოლი უნდა იყოს"
 
-#: check.c:2039
+#: check.c:2136
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "ახალი კლასტერის კონფიგურაციის გამოწერებზე შემოწმება"
 
-#: check.c:2051
+#: check.c:2148
 #, c-format
 msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
 msgstr "\"max_active_replication_origins\" (%d) ძველი კლასტერის გამოწერების რაოდენობაზე (%d) მეტი ან ტოლი უნდა იყოს"
 
-#: check.c:2073
+#: check.c:2170
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "სწორ ლოგიკური რეპლიკაციის სლოტებზე შემოწმება"
 
-#: check.c:2125
+#: check.c:2222
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -692,12 +717,12 @@ msgstr ""
 "პრობლემური სლოტების ნახვა შეგიძლიათ ფაილში:\n"
 "    %s"
 
-#: check.c:2185
+#: check.c:2282
 #, c-format
 msgid "Checking for subscription state"
 msgstr "გამოწერის მდგომარეობის შემოწმება"
 
-#: check.c:2267
+#: check.c:2364
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -965,9 +990,9 @@ msgstr "ძველი და ახალი კლასტერების
 #: controldata.c:762
 #, c-format
 msgid "Adding \".old\" suffix to old \"%s\""
-msgstr "'.old\" სუფიქსის დამატება ძველ \"%s\"-ზე"
+msgstr "\".old\" სუფიქსის დამატება ძველ \"%s\"-სთვის"
 
-#: controldata.c:767
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "გადარქმევის შეცდომა %s - %s: %m"
@@ -1212,7 +1237,7 @@ msgid ""
 "In swap mode the old and new data directories must be on the same file system."
 msgstr ""
 "ძველი და ახალი მონაცემების საქაღალდეებს შუა მყარი ბმულის შექმნა შეუძლებელია: %m\n"
-"რეჟიმში 'swap' ძველი და ახალი მონაცემების საქაღალდეები ერთი და იგივე ფაილურ სისტემაზე უნდა იყოს."
+"მიმოცვლის რეჟიმში ძველი და ახალი მონაცემთა საქაღალდეები ერთი და იგივე ფაილურ სისტემაზე უნდა იყოს."
 
 #: function.c:173
 #, c-format
@@ -1691,7 +1716,7 @@ msgstr "დამხმარე პროცესის შექმნა შ
 msgid "could not create worker thread: %m"
 msgstr "დამხმარე ნაკადის შექმნა შეუძლებელია: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s()-ის შეცდომა: %m"
@@ -1750,6 +1775,7 @@ msgid "directory path for new cluster is too long"
 msgstr "ახალი კლასტერის საქაღალდის ბილიკი ძალიან გრძელია"
 
 #: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "საქაღალდის (%s) შექმნის შეცდომა: %m"
@@ -1890,7 +1916,7 @@ msgstr "მომხმარებლის ურთიერთობის 
 #: relfilenumber.c:126
 #, c-format
 msgid "Swapping data directories"
-msgstr "მონაცემების საქაღალდის შეცვლა"
+msgstr "მონაცემების საქაღალდეების შეცვლა"
 
 #: relfilenumber.c:200
 #, c-format
@@ -1902,26 +1928,16 @@ msgstr "ძველი მონაცემთა ბაზა \"%s\" ახ
 msgid "could not stat file \"%s\": %m"
 msgstr "ფაილი \"%s\" არ არსებობს: %m"
 
-#: relfilenumber.c:293 relfilenumber.c:297
-#, c-format
-msgid "could not create directory \"%s\""
-msgstr "საქაღალდის (%s) შექმნის შეცდომა"
-
 #: relfilenumber.c:301 relfilenumber.c:305
 #, c-format
-msgid "could not rename \"%s\" to \"%s\""
-msgstr "სახელის გადარქმევის შეცდომა \"%s\"-დან \"%s\"-ზე"
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "ვერ გადავარქვი სახელი საქაღალდეს '%s\" \"%s\"-ზე: %m"
 
 #: relfilenumber.c:375 relfilenumber.c:402
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "საქაღალდის (%s) გახსნის შეცდომა: %m"
 
-#: relfilenumber.c:393 relfilenumber.c:420
-#, c-format
-msgid "could not rename \"%s\" to \"%s\": %m"
-msgstr "სახელის გადარქმევის შეცდომა \"%s\"-დან \"%s\"-ზე: %m"
-
 #: relfilenumber.c:396 relfilenumber.c:434
 #, c-format
 msgid "could not read directory \"%s\": %m"
@@ -2003,7 +2019,7 @@ msgstr "ვერსიის ფაილის გახსნის შეც
 msgid "could not parse version file \"%s\""
 msgstr "ვერსიის ფაილის დამუშავების შეცდომა \"%s\""
 
-#: server.c:317
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -2012,7 +2028,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:321
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -2021,7 +2037,7 @@ msgstr ""
 "ვერ ვუკავშირდები საწყის postmaster-ს, რომელიც შემდეგი ბრძანებით გაეშვა:\n"
 "%s"
 
-#: server.c:325
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -2030,22 +2046,22 @@ msgstr ""
 "ვერ ვუკავშირდები სამიზნე postmaster-ს, რომელიც შემდეგი ბრძანებით გაეშვა:\n"
 "%s"
 
-#: server.c:339
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl-ის შეცდომა საწყისი სერვერის გაშვებისას ან შეერთების შეცდომა"
 
-#: server.c:341
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl-ის შეცდომა სამიზნე სერვერის გაშვებისას ან შეერთების შეცდომა"
 
-#: server.c:386
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "არასაკმარისი მეხსიერება"
 
-#: server.c:399
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "libpq-ის გარემოს ცვლად %s-ს არალოკალური სერვერის მნიშვნელობა: %s გააჩნია"
@@ -2074,26 +2090,16 @@ msgstr "ცხრილების სივრცის საქაღალ
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "ცხრილების სივრცის ბილიკი %s საქაღალდეს არ წარმოადგენს"
 
-#: task.c:195
-#, c-format
-msgid "failed to create connection with connection string: \"%s\""
-msgstr "ჩავარდა მიერთების შექმნა მიერთების სტრიქონით: \"%s\""
-
-#: task.c:217 task.c:268 task.c:283 task.c:294
+#: task.c:216 task.c:267 task.c:282 task.c:293
 #, c-format
 msgid "connection failure: %s"
 msgstr "მიერთების შეცდომა: %s"
 
-#: task.c:396
+#: task.c:395
 #, c-format
 msgid "invalid socket"
 msgstr "არასწორი სოკეტი"
 
-#: task.c:405
-#, c-format
-msgid "select() failed: %m"
-msgstr "select() ჩავარდა: %m"
-
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
diff --git a/src/bin/pg_upgrade/po/ko.po b/src/bin/pg_upgrade/po/ko.po
index 800eb1a2f0f..402b9e34685 100644
--- a/src/bin/pg_upgrade/po/ko.po
+++ b/src/bin/pg_upgrade/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_upgrade (PostgreSQL) 17\n"
+"Project-Id-Version: pg_upgrade (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:50+0000\n"
-"PO-Revision-Date: 2025-01-17 15:47+0900\n"
+"POT-Creation-Date: 2025-09-11 21:50+0000\n"
+"PO-Revision-Date: 2025-09-10 10:52+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -47,21 +47,21 @@ msgstr "사용자 없음"
 msgid "user name lookup failure: error code %lu"
 msgstr "사용자 이름 찾기 실패: 오류 코드 %lu"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령 인자에 줄바꿈 문자가 있음: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "사용자가 만든 테이블에 내장 복합 자료형을 쓰는지 확인 중"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -73,11 +73,11 @@ msgstr ""
 "이 자료형의 OID 값이 PostgreSQL 버전별로 다를 수 있어,\n"
 "업그레이드 할 수 없습니다. 해당 칼럼을 삭제한 뒤 다시 업그레이드하세요.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "\"line\" 자료형 호환성 확인 중"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -89,11 +89,11 @@ msgstr ""
 "이 자료형의 입출력 방식이 옛 버전과 새 버전에서 서로 호환하지 않습니다.\n"
 "먼저 이 자료형을 사용하는 테이블을 삭제 후 업그레이드 작업을 하세요.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "사용자가 만든 테이블에 reg* 자료형을 쓰는지 확인 중"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -105,11 +105,11 @@ msgstr ""
 "있습니다.  그래서 업그레이드 작업을 진행할 수 없습니다.\n"
 "사용하고 있는 칼럼을 지우고 업그레이드 작업을 다시 시도하세요.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "\"aclitem\" 자료형 호환성 확인 중"
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -121,11 +121,11 @@ msgstr ""
 "그래서, 업그레이드 작업이 불가능합니다.\n"
 "해당 칼럼들을 지우고 업그레이드 작업을 진행하세요.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "잘못된 \"unknown\" 사용자 칼럼을 확인 중"
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -137,11 +137,11 @@ msgstr ""
 "이 자료형은 더 이상 사용할 수 없습니다. 이 문제를 옛 버전에서 먼저 정리하고\n"
 "업그레이드 작업을 진행하세요.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "잘못된 \"sql_identifier\" 사용자 칼럼을 확인 중"
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -152,11 +152,11 @@ msgstr ""
 "있습니다.  이 자료형의 저장 양식이 바뀌었기에, 업그레이드 할 수\n"
 "없습니다. 해당 테이블의 칼럼을 지우고 다시 업그레이드 하십시오.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "사용자 테이블에서 \"jsonb\" 자료형 호환성 검사 중"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -168,11 +168,11 @@ msgstr ""
 "그래서, 업그레이드 작업이 불가능합니다.\n"
 "해당 칼럼들을 지우고 업그레이드 작업을 진행하세요.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "사용자가 만든 테이블에 \"abstime\" 자료형을 쓰는지 확인 중"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -186,11 +186,11 @@ msgstr ""
 "해당 칼럼들을 지우거나, 다른 자료형으로 바꾼 뒤,\n"
 "업그레이드 작업을 진행하세요.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "사용자가 만든 테이블에 \"reltime\" 자료형을 쓰는지 확인 중"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -204,11 +204,11 @@ msgstr ""
 "해당 칼럼들을 지우거나, 다른 자료형으로 바꾼 뒤,\n"
 "업그레이드 작업을 진행하세요.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "사용자가 만든 테이블에 \"tinterval\" 자료형을 쓰는지 확인 중"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -222,34 +222,34 @@ msgstr ""
 "해당 칼럼들을 지우거나, 다른 자료형으로 바꾼 뒤,\n"
 "업그레이드 작업을 진행하세요.\n"
 
-#: check.c:345
-#, c-format
-msgid "Checking data type usage"
-msgstr "자료형 사용 현황 검사 중"
-
-#: check.c:480
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "검사 실패: %s"
 
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "문제 칼럼 목록을 다음 파일 안에 있습니다:"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: check.c:522
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "자료형 사용 현황 검사 중"
+
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "자료형 검사 실패: %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -258,7 +258,7 @@ msgstr ""
 "옛 운영 서버에서 일관성 검사를 진행합니다.\n"
 "------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -267,7 +267,13 @@ msgstr ""
 "일관성 검사 수행중\n"
 "------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid ""
+"Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr "Swap 모드는 PostgreSQL %s 과 그 이상 버전에서 사용할 수 있습니다."
+
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +282,7 @@ msgstr ""
 "\n"
 "*클러스터 호환성*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -287,18 +293,20 @@ msgstr ""
 "여기서 pg_upgrade 작업을 실패한다면, 재시도 하기 전에 먼저\n"
 "새 클러스터를 처음부터 다시 만들어 진행해야 합니다."
 
-#: check.c:767
+#: check.c:826
 #, c-format
 msgid ""
-"Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"pg_upgrade 작업에서는 최적화기를 위한 통계 정보까지 업그레이드\n"
-"하지는 않습니다. 새 서버가 실행 될 때, 다음 명령을 수행하길 권합니다:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"pg_upgrade 작업은 몇 통계 정보를 업그레이드 하지는 않습니다.\n"
+"새 서버가 실행 될 때, 다음 두 명령을 수행하길 권합니다:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -307,7 +315,7 @@ msgstr ""
 "아래 스크립트를 실행하면, 옛 클러스터 자료를 지울 것입니다:\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -319,22 +327,22 @@ msgstr ""
 "사용자 정의 테이블스페이스나, 새 클러스터가 옛 클러스터 안에\n"
 "있기 때문입니다.  옛 클러스터 자료는 직접 찾아서 지우세요."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "클러스터 버전 검사 중"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "이 도구는 PostgreSQL %s 과 그 이상 버전에서 사용할 수 있습니다."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "이 도구는 PostgreSQL %s 버전으로만 업그레이드 할 수 있습니다."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid ""
 "This utility cannot be used to downgrade to older major PostgreSQL versions."
@@ -342,52 +350,57 @@ msgstr ""
 "이 도구는 더 낮은 메이져 PostgreSQL 버전으로 다운그레이드하는데 사용할 수 없"
 "습니다."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid ""
 "Old cluster data and binary directories are from different major versions."
 msgstr "옛 클러스터 자료와 실행파일 디렉터리가 서로 메이져 버전이 다릅니다."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid ""
 "New cluster data and binary directories are from different major versions."
 msgstr "새 클러스터 자료와 실행파일 디렉터리가 서로 메이져 버전이 다릅니다."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "%s 옵션은 PostgreSQL %s 과 그 이상 버전에서 사용할 수 있습니다."
+
+#: check.c:913
 #, c-format
 msgid ""
 "When checking a live server, the old and new port numbers must be different."
 msgstr ""
 "운영 서버 검사를 할 때는, 옛 서버, 새 서버의 포트를 다르게 지정해야 합니다."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr ""
 "\"%s\" 새 데이터베이스 클러스터가 비어있지 않음: \"%s.%s\" 릴레이션을 찾았음"
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "새 클러스터 테이블스페이스 디렉터리 검사 중"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "새 클러스터 테이블스페이스 디렉터리가 이미 있음: \"%s\""
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
-"WARNING:  new data directory should not be inside the old data directory, "
-"i.e. %s"
+"WARNING:  new data directory should not be inside the old data directory, i."
+"e. %s"
 msgstr ""
 "\n"
 "경고: 새 데이터 디렉터리는 옛 데이터 디렉터리 안에 둘 수 없습니다, 예: %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -398,42 +411,42 @@ msgstr ""
 "경고: 사용자 정의 테이블스페이스 위치를 데이터 디렉터리 안에 둘 수 없습니다, "
 "예: %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "옛 클러스터를 지우는 스크립트를 만듭니다"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "\"%s\" 파일에 실행 권한을 추가 할 수 없음: %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "데이터베이스 사용자가 설치 작업을 한 사용자인지 확인합니다"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "\"%s\" 데이터베이스 사용자는 설치 작업을 한 사용자가 아닙니다"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "사용자 수를 확인할 수 없음"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "새 클러스터에서만 설치 사용 사용자가 정의될 수 있음"
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "데이터베이스 연결 설정을 확인 중"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid ""
 "template0 must not allow connections, i.e. its pg_database.datallowconn must "
@@ -442,52 +455,54 @@ msgstr ""
 "template0 데이터베이스 접속을 금지해야 합니다. 예: 해당 데이터베이스의 "
 "pg_database.datallowconn 값이 false여야 합니다."
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "치명적 오류"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
 "template0이 아닌 모든 데이터베이스는 연결을 허용해야하며, 즉 \n"
-"pg_database.datallowconn 값이 true여야합니다. 설치된 데이터베이스\n"
+"pg_database.datallowconn 값이 true여야하고, pg_database.datconnlimit\n"
+"값은 -2여야 합니다. 설치된 데이터베이스\n"
 "중 pg_database.datallowconn 값이 false로 설정된 template0이 아닌\n"
 "데이터베이스가 있습니다. template0이 아닌 데이터베이스의 모든 연결을\n"
 "허용하거나 연결을 허용하지 않는 데이터베이스를 삭제하는 것이 좋습니다.\n"
 "문제가 있는 데이터베이스 목록은 다음 파일에 기록해 두었습니다:\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "미리 준비된 트랜잭션을 확인 중"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "옛 클러스터에 미리 준비된 트랜잭션이 있음"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "새 클러스터에 미리 준비된 트랜잭션이 있음"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "contrib/isn 모듈의 bigint 처리가 서로 같은지 확인 중"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -505,12 +520,12 @@ msgstr ""
 "복원할 수 있습니다.  문제가 있는 함수는 아래 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "사용자 정의 postfix 연산자를 검사 중"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -525,17 +540,17 @@ msgstr ""
 "관련 사용자 정의 postfix 연산자 목록은 아래 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "불완전한 다형 함수를 확인합니다"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
-"polymorphic functions with arguments of type \"anyarray\" or "
-"\"anyelement\".\n"
+"polymorphic functions with arguments of type \"anyarray\" or \"anyelement"
+"\".\n"
 "These user-defined objects must be dropped before upgrading and restored\n"
 "afterwards, changing them to refer to the new corresponding functions with\n"
 "arguments of type \"anycompatiblearray\" and \"anycompatible\".\n"
@@ -550,12 +565,12 @@ msgstr ""
 "다음 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "WITH OIDS 옵션 있는 테이블 확인 중"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -571,12 +586,36 @@ msgstr ""
 "관련 테이블 목록은 아래 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "not-null 제약 조건 일관성 검사 중"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"NOT NULL 제약 조건들이 일관성을 유지하고 있지 않습니다.\n"
+"상위 칼럼에 NOT NULL 지정을 했다면, 하위 칼럼에도 해야합니다.\n"
+"그렇지 않으면 업그레이드를 실패합니다.\n"
+"다음 명령으로 이 문제를 해결 할 수 있습니다:\n"
+"    ALTER TABLE 테이블이름 ALTER 칼럼 SET NOT NULL;\n"
+"이런 문제 칼럼들의 목록은 다음 파일에 있습니다:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "\"pg_\"로 시작하는 롤 확인 중"
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -591,12 +630,12 @@ msgstr ""
 "\"pg_\"로 시작하는 롤 이름 목록은 다음 파일에 있습니다:\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "사용자 정의 인코딩 변환규칙을 검사 중"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -613,32 +652,54 @@ msgstr ""
 "해당 변환 규칙 목록은 아래 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "유니코드 업데이트를 위한 객체 영향도 검사 중"
+
+#: check.c:2038 version.c:121
+#, c-format
+msgid "warning"
+msgstr "경고"
+
+#: check.c:2039
+#, c-format
+msgid ""
+"Your installation contains relations that might be affected by a new version "
+"of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr ""
+"새 버전의 유니코드로 업그레이드하면 영향을 받는 릴레이션이 있습니다.\n"
+"이 릴레이션들의 목록은 다음 파일에 있습니다:\n"
+"    %s"
+
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "새 클러스터 논리 복제 슬롯 검사 중"
 
-#: check.c:1754
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "논리 복제 슬롯 개수를 파악할 수 없음"
 
-#: check.c:1759
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "논리 복제 슬롯이 없다고 판단했는데, %d개 발견 됨"
 
-#: check.c:1769 check.c:1820
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "새 클러스터용 매개변수 설정을 조사 할 수 없음"
 
-#: check.c:1774
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\" 설정값은 \"logical\"이어야 하는데, \"%s\"임"
 
-#: check.c:1780
+#: check.c:2109
 #, c-format
 msgid ""
 "\"max_replication_slots\" (%d) must be greater than or equal to the number "
@@ -647,26 +708,26 @@ msgstr ""
 "\"max_replication_slots\" 설정값(%d)이 옛 클러스터 논리 복제 슬롯 수(%d)와 같"
 "거나 커야 함"
 
-#: check.c:1812
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "구독을 위한 새 클러스터 환경 설정을 검사 중"
 
-#: check.c:1824
+#: check.c:2153
 #, c-format
 msgid ""
-"\"max_replication_slots\" (%d) must be greater than or equal to the number "
-"of subscriptions (%d) on the old cluster"
+"\"max_active_replication_origins\" (%d) must be greater than or equal to the "
+"number of subscriptions (%d) on the old cluster"
 msgstr ""
-"\"max_replication_slots\" 설정값(%d)이 옛 클러스터 구독 수(%d)와 같거나 커야 "
-"함"
+"\"max_active_replication_origins\" 설정값(%d)이 옛 클러스터 구독 수(%d)와 같"
+"거나 커야 함"
 
-#: check.c:1846
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "논리 복제 슬롯 유효성 검사 중"
 
-#: check.c:1898
+#: check.c:2227
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be "
@@ -683,12 +744,12 @@ msgstr ""
 "해당 문제의 슬롯 목록은 다음 파일 안에 있습니다:\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "구독 상태 검사 중"
 
-#: check.c:2023
+#: check.c:2369
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations "
@@ -704,17 +765,17 @@ msgstr ""
 "해당 문제의 구독 목록은 다음 파일 안에 있습니다:\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "%s 사용하는 컨트롤 자료를 구할 수 없음: %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d: 데이터베이스 클러스터 상태 문제"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid ""
 "The source cluster was shut down while in recovery mode.  To upgrade, use "
@@ -724,7 +785,7 @@ msgstr ""
 "다.  업그레이드 하려면, 문서에 언급한 것 처럼 \"rsync\"를 사용하든가, 그 서버"
 "를 운영 서버 모드로 바꾼 뒤 중지하고 작업하십시오."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid ""
 "The target cluster was shut down while in recovery mode.  To upgrade, use "
@@ -734,164 +795,169 @@ msgstr ""
 "다.  업그레이드 하려면, 문서에 언급한 것 처럼 \"rsync\"를 사용하든가, 그 서버"
 "를 운영 서버 모드로 바꾼 뒤 중지하고 작업하십시오."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "원본 클러스터는 정상적으로 종료되어야 함, 종료 상태값: \"%s\""
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "대상 클러스터는 정상 종료되어야 함, 종료 상태값: \"%s\""
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "%s 사용하는 컨트롤 자료를 구할 수 없음: %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "원본 클러스터에 클러스터 상태 정보가 없음:"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "대상 클러스터에 클러스터 상태 정보가 없음:"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d: pg_resetwal 문제"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d: controldata 복원 문제"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "옛 클러스터에 필요한 컨트롤 정보가 몇몇 빠져있음:"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "새 클러스터에 필요한 컨트롤 정보가 몇몇 빠져있음:"
 
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  체크포인트 다음 XID"
 
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  마지막 체크포인트 다음 OID"
 
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  마지막 체크포인트 다음 MultiXactId"
 
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  마지막 체크포인트 제일 오래된 MultiXactId"
 
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  마지막 체크포인트 제일 오래된 XID"
 
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  마지막 체크포인트 다음 MultiXactOffset"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  리셋 뒤 첫 WAL 조각"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  float8 인자 처리 방식"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  최대 정렬"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  블록 크기"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  대형 릴레이션 조각 크기"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  WAL 블록 크기"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  WAL 조각 크기"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  최대 식별자 길이"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  최대 인덱스 칼럼 수"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  최대 토스트 조각 크기"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  대형 객체 조각 크기"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  date/time 자료형을 정수로?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  자료 체크섬 버전"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  기본 문자 부호"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr "필요한 컨트롤 정보 없이는 진행할 수 없음, 중지 함"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid ""
 "old and new pg_controldata alignments are invalid or do not match.\n"
@@ -900,107 +966,125 @@ msgstr ""
 "클러스터간 pg_controldata 정렬이 서로 다릅니다.\n"
 "하나는 32비트고, 하나는 64비트인 경우 같습니다."
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr "클러스터간 pg_controldata 블록 크기가 서로 다릅니다."
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid ""
 "old and new pg_controldata maximum relation segment sizes are invalid or do "
 "not match"
 msgstr "클러스터간 pg_controldata 최대 릴레이션 조각 크가가 서로 다릅니다."
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr "클러스터간 pg_controldata WAL 블록 크기가 서로 다릅니다."
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid ""
 "old and new pg_controldata WAL segment sizes are invalid or do not match"
 msgstr "클러스터간 pg_controldata WAL 조각 크기가 서로 다릅니다."
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid ""
 "old and new pg_controldata maximum identifier lengths are invalid or do not "
 "match"
 msgstr "클러스터간 pg_controldata 최대 식별자 길이가 서로 다릅니다."
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid ""
 "old and new pg_controldata maximum indexed columns are invalid or do not "
 "match"
 msgstr "클러스터간 pg_controldata 최대 인덱스 칼럼수가 서로 다릅니다."
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid ""
 "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not "
 "match"
 msgstr "클러스터간 pg_controldata 최대 토스트 조각 크기가 서로 다릅니다."
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid ""
 "old and new pg_controldata large-object chunk sizes are invalid or do not "
 "match"
 msgstr "클러스터간 pg_controldata 대형 객체 조각 크기가 서로 다릅니다."
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr "클러스터간 pg_controldata date/time 저장 크기가 서로 다릅니다."
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr ""
 "옛 클러스터는 데이터 체크섬 기능을 사용하지 않고, 새 클러스터는 사용하고 있습"
 "니다."
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr ""
 "옛 클러스터는 데이터 체크섬 기능을 사용하고, 새 클러스터는 사용하고 있지 않습"
 "니다."
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "클러스터간 pg_controldata 체크섬 버전이 서로 다릅니다."
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "옛 global/pg_control 파일에 \".old\" 이름을 덧붙입니다."
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "\".old\" 이름을 덧붙입니다, 대상 파일: \"%s\""
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "옛 버전으로 옛 클러스터를 사용해서 서버를 실행하려면,\n"
-"%s/global/pg_control.old 파일의 이름을 \".old\" 빼고 바꾸어\n"
+"\".old\"를 \"%s/%s.old\" 파일에서 빼고\n"
 "사용해야합니다. 업그레이드를 \"link\" 모드로 했기 때문에,\n"
 "한번이라도 새 버전의 서버가 이 클러스터를 이용해서 실행되었다면,\n"
 "이 파일이 더 이상 안전하지 않기 때문입니다."
 
+#: controldata.c:780
+#, c-format
+msgid ""
+"\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr ""
+"\n"
+"\"swap\" 모드가 사용되었기 때문에,\n"
+"옛 클러스터는 더 이상 옛 버전으로 시작할 수 없습니다."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "알 수 없는 전송 모드"
+
 #: dump.c:20
 #, c-format
 msgid "Creating dump of global objects"
@@ -1031,7 +1115,7 @@ msgstr "%s에서 pg_ctl 버전을 알 수 없음"
 msgid "command too long"
 msgstr "명령이 너무 긺"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "\"%s\" 로그 파일을 열 수 없음: %m"
@@ -1068,7 +1152,7 @@ msgstr ""
 "\"%s\" 파일의 마지막 부분을 살펴보면\n"
 "이 문제를 풀 실마리가 보일 것입니다."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "\"%s\" 로그 파일을 쓸 수 없음: %m"
@@ -1154,8 +1238,8 @@ msgstr "\"%s.%s\" (\"%s\" / \"%s\") 릴레이션 복사 중 오류: %m"
 #: file.c:172
 #, c-format
 msgid ""
-"error while copying relation \"%s.%s\": could not copy file range from "
-"\"%s\" to \"%s\": %m"
+"error while copying relation \"%s.%s\": could not copy file range from \"%s"
+"\" to \"%s\": %m"
 msgstr "\"%s.%s\" 릴레이션 복사 중 오류: 실패 복사 범위: \"%s\" - \"%s\": %m"
 
 #: file.c:194
@@ -1200,7 +1284,7 @@ msgstr "옛 데이터 디렉터리와 새 데이터 디렉터리 사이 파일 
 msgid "copy_file_range not supported on this platform"
 msgstr "이 운영체제는 copy_file_range 기능을 제공하지 않습니다."
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid ""
 "could not create hard link between old and new data directories: %m\n"
@@ -1210,22 +1294,32 @@ msgstr ""
 "데이터 디렉터리간 하드 링크를 만들 수 없음: %m\n"
 "하드 링크를 사용하려면, 두 디렉터리가 같은 시스템 볼륨 안에 있어야 합니다."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid ""
+"could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file "
+"system."
+msgstr ""
+"데이터 디렉터리간 하드 링크를 만들 수 없음: %m\n"
+"swap 모드를 사용하려면, 두 디렉터리가 같은 시스템 볼륨 안에 있어야 합니다."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "필요한 라이브러리 확인 중"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "\"%s\" 라이브러리 로드 실패: %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "데이터베이스: %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid ""
 "Your installation references loadable libraries that are missing from the\n"
@@ -1239,57 +1333,57 @@ msgstr ""
 "업그레이드 작업을 해야합니다.  문제가 있는 라이브러리들은 다음과 같습니다:\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid ""
-"Relation names for OID %u in database \"%s\" do not match: old name \"%s."
-"%s\", new name \"%s.%s\""
+"Relation names for OID %u in database \"%s\" do not match: old name \"%s.%s"
+"\", new name \"%s.%s\""
 msgstr ""
 "%u OID에 대한 \"%s\" 데이터베이스 이름이 서로 다릅니다: 옛 이름: \"%s.%s\", "
 "새 이름: \"%s.%s\""
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "\"%s\" 데이터베이스 내 테이블 이름이 서로 다릅니다"
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " 해당 인덱스: \"%s.%s\""
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " 해당 인덱스의 OID: %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " \"%s.%s\" 객체의 토스트 테이블"
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " 해당 토스트 베이블의 OID: %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid ""
-"No match found in old cluster for new relation with OID %u in database "
-"\"%s\": %s"
+"No match found in old cluster for new relation with OID %u in database \"%s"
+"\": %s"
 msgstr ""
 "새 클러스터의 %u OID (해당 데이터베이스: \"%s\")가 옛 클러스터에 없음: %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid ""
-"No match found in new cluster for old relation with OID %u in database "
-"\"%s\": %s"
+"No match found in new cluster for old relation with OID %u in database \"%s"
+"\": %s"
 msgstr ""
 "옛 클러스터의 %u OID (해당 데이터베이스: \"%s\")가 새 클러스터에 없음: %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1392,7 @@ msgstr ""
 "\n"
 "원본 데이터베이스:"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid ""
 "\n"
@@ -1307,87 +1401,92 @@ msgstr ""
 "\n"
 "대상 데이터베이스:"
 
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "template0 찾을 수 없음"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "데이터베이스: \"%s\""
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "relname: \"%s.%s\": reloid: %u reltblspace: \"%s\""
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "해당 데이터베이스 안에 있는 논리 복제 슬롯들:"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "슬롯 이름: \"%s\", 출력 플러그인: \"%s\", two_phase: %s"
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s: root 권한으로 실행할 수 없음"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "잘못된 옛 포트 번호"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "잘못된 새 포트 번호"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "%s 옵션의 잘못된 인자"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "보다 자세한 사용법은 \"%s --help\" 명령을 이용하세요.\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인자를 지정 했음 (시작: \"%s\")"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "작업 내역을 자세히 봄"
 
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "옛 클러스터 실행파일 위치"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "새 클러스터 실팽파일 위치"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "옛 클러스터 자료 위치"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "새 클러스터 자료 위치"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "소켓 파일 만들 위치"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "현재 디렉터리 위치를 알 수 없음"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid ""
 "cannot run pg_upgrade from inside the new cluster data directory on Windows"
@@ -1395,7 +1494,7 @@ msgstr ""
 "윈도우즈 환경에서는 pg_upgrade 명령은 새 클러스터 데이터 디렉터리 안에서는 실"
 "행할 수 없음"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid ""
 "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n"
@@ -1404,12 +1503,12 @@ msgstr ""
 "pg_upgrade는 다른 메이저 버전으로 PostgreSQL 클러스터를 업그레이드합니다.\n"
 "\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid ""
 "  pg_upgrade [OPTION]...\n"
@@ -1418,17 +1517,17 @@ msgstr ""
 "  pg_upgrade [옵션]...\n"
 "\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "옵션:\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr "  -b, --old-bindir=BINDIR       옛 클러스터 실행 파일의 디렉터리\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid ""
 "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
@@ -1437,23 +1536,23 @@ msgstr ""
 "  -B, --new-bindir=BINDIR       새 클러스터 실행 파일의 디렉터리 (기본값:\n"
 "                                pg_upgrade가 있는 디렉터리)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid ""
 "  -c, --check                   check clusters only, don't change any data\n"
 msgstr "  -c, --check                   실 작업 없이, 그냥 검사만\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=DATADIR     옛 클러스터 데이터 디렉터리\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=DATADIR     새 클러스터 데이터 디렉터리\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                number of simultaneous processes or threads "
@@ -1461,7 +1560,7 @@ msgid ""
 msgstr ""
 "  -j, --jobs=NUM                동시에 작업할 프로세스 또는 쓰레드 수\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid ""
 "  -k, --link                    link instead of copying files to new "
@@ -1469,7 +1568,7 @@ msgid ""
 msgstr ""
 "  -k, --link                    새 클러스터 구축을 복사 대신 링크 사용\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid ""
 "  -N, --no-sync                 do not wait for changes to be written safely "
@@ -1477,36 +1576,36 @@ msgid ""
 msgstr ""
 "  -N, --no-sync                 작업 완료 뒤 디스크 동기화 작업을 하지 않음\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid ""
 "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
 msgstr "  -o, --old-options=옵션        옛 서버에서 사용할 서버 옵션들\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid ""
 "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
 msgstr "  -O, --new-options=옵션        새 서버에서 사용할 서버 옵션들\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr "  -p, --old-port=PORT           옛 클러스터 포트 번호 (기본값 %d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr "  -P, --new-port=PORT           새 클러스터 포트 번호 (기본값 %d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid ""
 "  -r, --retain                  retain SQL and log files after success\n"
 msgstr ""
 "  -r, --retain                  작업 완료 후 사용했던 SQL과 로그 파일 남김\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid ""
 "  -s, --socketdir=DIR           socket directory to use (default current "
@@ -1515,23 +1614,23 @@ msgstr ""
 "  -s, --socketdir=DIR           사용할 소켓 디렉터리 (기본값: 현재 디렉터"
 "리)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr "  -U, --username=이름           클러스터 슈퍼유저 (기본값 \"%s\")\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr "  -v, --verbose                 작업 내역을 자세히 남김\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid ""
 "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                 버전 정보를 보여주고 마침\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid ""
 "  --clone                       clone instead of copying files to new "
@@ -1539,30 +1638,52 @@ msgid ""
 msgstr ""
 "  --clone                       새 클러스터 구축을 복사 대신 클론 사용\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr "  --copy                        새 클러스터로 파일 복사 (기본값)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid ""
 "  --copy-file-range             copy files to new cluster with "
 "copy_file_range\n"
 msgstr "  --copy-file-range             copy_file_range 기능을 이용해서 복사\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid ""
+"  --no-statistics               do not import statistics from old cluster\n"
+msgstr ""
+"  --no-statistics               옛 클러스터의 statistics 정보는 옮기지 않음\n"
+
+#: option.c:332
+#, c-format
+msgid ""
+"  --set-char-signedness=OPTION  set new cluster char signedness to \"signed"
+"\" or\n"
+"                                \"unsigned\"\n"
+msgstr ""
+"  --set-char-signedness=OPTION  새 클러스터의 문자 부호를 \"signed\" 또는\n"
+"                                \"unsigned\"로 지정\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr "  --swap                        데이터 디렉터리를 새 클러스터로 이동\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr ""
 "  --sync-method=METHOD          파일을 디스크에 동기화 하는 방법 지정\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                    이 도움말을 보여주고 마침\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid ""
 "\n"
@@ -1577,7 +1698,7 @@ msgstr ""
 "  옛 서버를 중지하고\n"
 "  새 서버도 중지하세요.\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid ""
 "\n"
@@ -1594,7 +1715,7 @@ msgstr ""
 "  옛 버전의 \"bin\" 디렉터리 (-b BINDIR)\n"
 "  새 버전의 \"bin\" 디렉터리 (-B BINDIR)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid ""
 "\n"
@@ -1609,7 +1730,7 @@ msgstr ""
 "newCluster/bin\n"
 "또는\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid ""
 "  $ export PGDATAOLD=oldCluster/data\n"
@@ -1624,7 +1745,7 @@ msgstr ""
 "  $ export PGBINNEW=newCluster/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid ""
 "  C:\\> set PGDATAOLD=oldCluster/data\n"
@@ -1639,7 +1760,7 @@ msgstr ""
 "  C:\\> set PGBINNEW=newCluster/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid ""
 "\n"
@@ -1648,12 +1769,12 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid ""
 "You must identify the directory where the %s.\n"
@@ -1662,32 +1783,32 @@ msgstr ""
 "%s 위치의 디렉터리를 알고 있어야 함.\n"
 "%s 명령행 옵션이나, %s 환경 변수를 사용하세요."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "원본 클러스터용 실 데이터 디렉터리를 찾는 중"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "대상 클러스터용 실 데이터 디렉터리를 찾는 중"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "%s 지정한 데이터 디렉터리를 찾을 수 없음: %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "%s 지정한 데이터 디렉터리를 찾을 수 없음: %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "%d 번째 줄을 \"%s\" 파일에서 읽을 수 없음: %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "지정한 %hu 옛 포트 번호를 %hu 번호로 바꿈"
@@ -1702,7 +1823,7 @@ msgstr "작업용 프로세스를 만들 수 없음: %m"
 msgid "could not create worker thread: %m"
 msgstr "작업용 쓰레드를 만들 수 없음: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
@@ -1717,12 +1838,12 @@ msgstr "하위 작업자가 비정상 종료됨: 상태값 %d"
 msgid "child worker exited abnormally: %m"
 msgstr "하위 작업자가 비정상 종료됨: %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 접근권한을 읽을 수 없음: %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1733,17 +1854,17 @@ msgstr ""
 "업그레이드 진행 중\n"
 "------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "새 클러스터용 다음 OID 설정 중"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "데이터 디렉터리 fsync 작업 중"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1754,23 +1875,24 @@ msgstr ""
 "업그레이드 마침\n"
 "---------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "새 클러스터용 디렉터리 이름이 너무 김"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 만들 수 없음: %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: 실행할 프로그램을 찾을 수 없습니다."
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1779,7 +1901,7 @@ msgstr ""
 "옛 서버가 현재 운영 되고 있습니다.\n"
 "먼저 서버를 중지하고 진행하세요."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1788,142 +1910,192 @@ msgstr ""
 "새 서버가 현재 운영 되고 있습니다.\n"
 "먼저 서버를 중지하고 진행하세요."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "새 클러스터용 기본 문자 부호 설정 중"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "새 클러스터용 로케일과 인코딩 설정 중"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "새 클러스터의 모든 로우에 대해서 통계 정보 수집 중"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "새 클러스터의 모든 로우에 대해서 영구 격리(freeze) 중"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "새 클러스터에 전역 객체를 복원 중"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "새 클러스터에 데이터베이스 스키마 복원 중"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "새 %s에서 파일 지우는 중"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "\"%s\" 디렉터리를 삭제 할 수 없음"
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "옛 %s 객체를 새 서버로 복사 중"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "새 클러스터용 제일 오래된 XID 설정 중"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "새 클러스터용 다음 트랜잭션 ID와 epoch 값 설정 중"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "새 클러스터용 다음 멀티 트랜잭션 ID와 위치 값 설정 중"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "새 클러스터용 제일 오래된 멀티 트랜잭션 ID 설정 중"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "WAL 아카이브 재설정 중"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "새 클러스터에서 frozenxid, minmxid 값 설정 중"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "새 클러스터에서 minmxid 값 설정 중"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "새 클러스터에 논리 복제 슬롯을 복원 중"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "\"%s\" 파일 fsync 실패: %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "사용자 릴레이션 파일 클론 중"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "사용자 릴레이션 파일 복사 중"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr "사용자 릴레이션 파일을 copy_file_range 기능으로 복사 중"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "사용자 릴레이션 파일 링크 중"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "데이터 디렉터리 swap 중"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "\"%s\" 이름의 옛 데이터베이스를 새 클러스터에서 찾을 수 없음"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "\"%s\" 디렉터리를 \"%s\" 이름을 바꿀 수 없음: %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리 열 수 없음: %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리를 sync 할 수 없음: %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "\"%s\" 의 상위 디렉터리를 sync 할 수 없음: %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid ""
 "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
 msgstr "\"%s.%s\" (\"%s\" / \"%s\") 파일이 있는지 확인 도중 오류 발생: %m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "\"%s\" 객체를 \"%s\" 객체로 다시 쓰는 중"
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "\"%s\" 객체를 \"%s\" 객체로 클론 중"
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "\"%s\" 객체를 \"%s\" 객체로 복사 중"
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
 msgstr "\"%s\" 객체를 \"%s\" 객체로 copy_file_range 기능으로 복사 중"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "\"%s\" 객체를 \"%s\" 객체로 링크 중"
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "절대 발생하지 않아야 함"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -1955,7 +2127,7 @@ msgstr "\"%s\" 버전 파일 열기 실패: %m"
 msgid "could not parse version file \"%s\""
 msgstr "\"%s\" 버전 파일 구문 분석 실패"
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -1964,7 +2136,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -1973,7 +2145,7 @@ msgstr ""
 "다음 명령으로 실행된 원본 서버로 접속할 수 없음:\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -1982,22 +2154,22 @@ msgstr ""
 "다음 명령으로 실행된 대상 서버로 접속할 수 없음:\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "원본 서버를 실행하는 pg_ctl 작업 실패, 또는 연결 실패"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "대상 서버를 실행하는 pg_ctl 작업 실패, 또는 연결 실패"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "%s libpq 환경 변수가 로컬 서버 값이 아님: %s"
@@ -2026,6 +2198,16 @@ msgstr "\"%s\" 테이블스페이스 디렉터리의 상태 정보를 구할 수
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "\"%s\" 테이블스페이스 경로는 디렉터리가 아님"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "연결 실패: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "잘못된 소켓"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -2046,11 +2228,6 @@ msgstr "ok"
 msgid "Checking for hash indexes"
 msgstr "해쉬 인덱스 확인 중"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "경고"
-
 #: version.c:123
 #, c-format
 msgid ""
@@ -2085,17 +2262,17 @@ msgstr ""
 "    %s\n"
 "이 작업이 있기 전까지는 해당 인덱스는 invalid 상태로 사용할 수 없게 됩니다."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "확장 모듈 업데이트 확인 중"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "알림"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid ""
 "\n"
@@ -2112,6 +2289,5 @@ msgstr ""
 "파일 안에 있습니다. 데이터베이스 슈퍼유저로 psql로 접속해서\n"
 "이 파일 안에 있는 명령을 수행하면 확장 모듈을 업데이트 할 수 있습니다."
 
-#, c-format
 #~ msgid "Checking for incompatible \"jsonb\" data type"
 #~ msgstr "\"jsonb\" 자료형 호환성 확인 중"
diff --git a/src/bin/pg_upgrade/po/ru.po b/src/bin/pg_upgrade/po/ru.po
index 71fa979972e..178a13f7a78 100644
--- a/src/bin/pg_upgrade/po/ru.po
+++ b/src/bin/pg_upgrade/po/ru.po
@@ -1,14 +1,14 @@
 # Russian message translation file for pg_upgrade
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <a.lakhin@postgrespro.ru>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Lakhin <a.lakhin@postgrespro.ru>
 # Maxim Yablokov <m.yablokov@postgrespro.ru>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_upgrade (PostgreSQL) 10\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-02 08:21+0300\n"
-"PO-Revision-Date: 2024-11-02 08:31+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 22:22+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -48,24 +48,24 @@ msgstr "пользователь не существует"
 msgid "user name lookup failure: error code %lu"
 msgstr "распознать имя пользователя не удалось (код ошибки: %lu)"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Проверка системных составных типов в пользовательских таблицах"
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -79,11 +79,11 @@ msgstr ""
 "проблемные\n"
 "столбцы и перезапустить обновление.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Проверка несовместимого типа данных \"line\""
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -99,11 +99,11 @@ msgstr ""
 "можете\n"
 "удалить проблемные столбцы и перезапустить обновление.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Проверка типов данных reg* в пользовательских таблицах"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -115,11 +115,11 @@ msgstr ""
 "pg_upgrade, так что обновление кластера в текущем состоянии невозможно. Вы\n"
 "можете удалить проблемные столбцы и перезапустить обновление.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Проверка несовместимого типа данных \"aclitem\""
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -134,11 +134,11 @@ msgstr ""
 "и\n"
 "перезапустить обновление.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Проверка неправильных пользовательских столбцов типа \"unknown\""
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -152,12 +152,12 @@ msgstr ""
 "проблемные\n"
 "столбцы и перезапустить обновление.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr ""
 "Проверка неправильных пользовательских столбцов типа \"sql_identifier\""
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -169,12 +169,12 @@ msgstr ""
 "поэтому обновить данный кластер невозможно. Вы можете удалить проблемные\n"
 "столбцы и перезапустить обновление.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr ""
 "Проверка несовместимого типа данных \"jsonb\" в пользовательских таблицах"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -187,12 +187,12 @@ msgstr ""
 "и\n"
 "перезапустить обновление.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr ""
 "Проверка удалённого типа данных \"abstime\" в пользовательских таблицах"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -208,12 +208,12 @@ msgstr ""
 "поменять\n"
 "их тип на другой, а затем перезапустить обновление.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr ""
 "Проверка удалённого типа данных \"reltime\" в пользовательских таблицах"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -229,12 +229,12 @@ msgstr ""
 "поменять\n"
 "их тип на другой, а затем перезапустить обновление.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr ""
 "Проверка удалённого типа данных \"tinterval\" в пользовательских таблицах"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -250,34 +250,34 @@ msgstr ""
 "поменять\n"
 "их тип на другой, а затем перезапустить обновление.\n"
 
-#: check.c:345
-#, c-format
-msgid "Checking data type usage"
-msgstr "Проверка использования типов данных"
-
-#: check.c:480
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "не пройдена проверка: %s"
 
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "Список проблемных столбцов приведён в файле:"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: check.c:522
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "Проверка использования типов данных"
+
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Проверки типов данных не пройдены: %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -286,7 +286,7 @@ msgstr ""
 "Проверка целостности на старом работающем сервере\n"
 "-------------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -295,7 +295,14 @@ msgstr ""
 "Проведение проверок целостности\n"
 "-------------------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid ""
+"Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr ""
+"В режиме подмены возможно обновление только с версии PostgreSQL %s и новее."
+
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +311,7 @@ msgstr ""
 "\n"
 "*Кластеры совместимы*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -316,18 +323,20 @@ msgstr ""
 "initdb\n"
 "для нового кластера, чтобы продолжить."
 
-#: check.c:767
+#: check.c:826
 #, c-format
 msgid ""
-"Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"Статистика оптимизатора утилитой pg_upgrade не переносится.\n"
-"Запустив новый сервер, имеет смысл выполнить:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Некоторая статистика утилитой pg_upgrade не переносится.\n"
+"Запустив новый сервер, имеет смысл выполнить эти две команды:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -336,7 +345,7 @@ msgstr ""
 "При запуске этого скрипта будут удалены файлы данных старого кластера:\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -349,24 +358,24 @@ msgstr ""
 "пространства или каталог данных нового кластера.\n"
 "Содержимое старого кластера нужно будет удалить вручную."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Проверка версий кластеров"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr ""
 "Эта утилита может производить обновление только с версии PostgreSQL %s и "
 "новее."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Эта утилита может повышать версию PostgreSQL только до %s."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid ""
 "This utility cannot be used to downgrade to older major PostgreSQL versions."
@@ -374,7 +383,7 @@ msgstr ""
 "Эта утилита не может понижать версию до более старой основной версии "
 "PostgreSQL."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid ""
 "Old cluster data and binary directories are from different major versions."
@@ -382,7 +391,7 @@ msgstr ""
 "Каталоги данных и исполняемых файлов старого кластера относятся к разным "
 "основным версиям."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid ""
 "New cluster data and binary directories are from different major versions."
@@ -390,7 +399,13 @@ msgstr ""
 "Каталоги данных и исполняемых файлов нового кластера относятся к разным "
 "основным версиям."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr ""
+"Параметр %s нельзя использовать при обновлении с PostgreSQL %s и новее."
+
+#: check.c:913
 #, c-format
 msgid ""
 "When checking a live server, the old and new port numbers must be different."
@@ -398,24 +413,24 @@ msgstr ""
 "Для проверки работающего сервера новый номер порта должен отличаться от "
 "старого."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr ""
 "Новая база данных кластера \"%s\" не пустая: найдено отношение \"%s.%s\""
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Проверка каталогов табличных пространств в новом кластере"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr ""
 "каталог табличного пространства в новом кластере уже существует: \"%s\""
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -426,7 +441,7 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ:  новый каталог данных не должен располагаться внутри старого "
 "каталога данных, то есть, в %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -437,42 +452,42 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ:  пользовательские табличные пространства не должны "
 "располагаться внутри каталога данных, то есть, в %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Создание скрипта для удаления старого кластера"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "не удалось добавить право выполнения для файла \"%s\": %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Проверка, является ли пользователь БД стартовым пользователем"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "пользователь БД \"%s\" не является стартовым пользователем"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "не удалось определить количество пользователей"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "В новом кластере может быть определён только стартовый пользователь."
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Проверка параметров подключения к базе данных"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid ""
 "template0 must not allow connections, i.e. its pg_database.datallowconn must "
@@ -481,52 +496,56 @@ msgstr ""
 "база template0 не должна допускать подключения, то есть её свойство "
 "pg_database.datallowconn должно быть false"
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "сбой"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
-"Все базы, кроме template0, должны допускать подключения, то есть их свойство "
-"pg_database.datallowconn должно быть true. В вашей инсталляции содержатся\n"
-"базы (не считая template0), у которых pg_database.datallowconn — false.\n"
-"Имеет смысл разрешить подключения для всех баз данных, кроме template0,\n"
-"или удалить базы, к которым нельзя подключаться. Список баз данных\n"
-"с этой проблемой содержится в файле:\n"
+"Все базы, кроме template0, должны допускать подключения, то есть их "
+"свойство\n"
+"pg_database.datallowconn должно быть true, а pg_database.datconnlimit\n"
+"отлично от -2. В вашей инсталляции имеются базы (кроме template), к которым\n"
+"нельзя подключиться. Вы можете разрешить подключения для всех баз данных, "
+"кроме\n"
+"template0, или удалить базы, к которым нельзя подключаться. Список баз "
+"данных\n"
+"приведён в файле:\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Проверка наличия подготовленных транзакций"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "Исходный кластер содержит подготовленные транзакции"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "Целевой кластер содержит подготовленные транзакции"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Проверка несоответствия при передаче bigint в contrib/isn"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -548,12 +567,12 @@ msgstr ""
 "проблемных функций приведён в файле:\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Проверка пользовательских постфиксных операторов"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -569,12 +588,12 @@ msgstr ""
 "Список пользовательских постфиксных операторов приведён в файле:\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Проверка несовместимых полиморфных функций"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -595,12 +614,12 @@ msgstr ""
 "Список проблемных объектов приведён в файле:\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Проверка таблиц со свойством WITH OIDS"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -616,12 +635,36 @@ msgstr ""
 "Список проблемных таблиц приведён в файле:\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Проверка несогласованных ограничений NOT NULL"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"В вашей инсталляции содержатся несогласованные ограничения NOT NULL.\n"
+"Если родительские столбцы помечены NOT NULL, пометку NOT NULL должны\n"
+"иметь и их дочерние столбцы, иначе обновление невозможно.\n"
+"Исправить эту ситуацию можно, выполнив:\n"
+"    ALTER TABLE имя_таблицы ALTER столбец SET NOT NULL;\n"
+"для всех столбцов, перечисленных в файле:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Проверка ролей с именами, начинающимися с \"pg_\""
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -636,12 +679,12 @@ msgstr ""
 "Список ролей с префиксом \"pg_\" приведён в файле:\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Проверка пользовательских перекодировок"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -658,32 +701,55 @@ msgstr ""
 "Список пользовательских перекодировок приведён в файле:\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "Проверка объектов, затрагиваемых обновлением Unicode"
+
+#: check.c:2038 version.c:121
+#, c-format
+msgid "warning"
+msgstr "предупреждение"
+
+#: check.c:2039
+#, c-format
+msgid ""
+"Your installation contains relations that might be affected by a new version "
+"of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr ""
+"В вашей инсталляции содержатся отношения, на которые может повлиять "
+"обновление версии Unicode.\n"
+"Список потенциально затрагиваемых отношений содержится в файле:\n"
+"    %s"
+
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Проверка слотов логической репликации в новом кластере"
 
-#: check.c:1754
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "не удалось получить количество слотов логической репликации"
 
-#: check.c:1759
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "обнаружено слотов логической репликации: %d, тогда как ожидалось 0"
 
-#: check.c:1769 check.c:1820
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "не удалось получить значения параметров в новом кластере"
 
-#: check.c:1774
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\" должен иметь значение \"logical\", а имеет \"%s\""
 
-#: check.c:1780
+#: check.c:2109
 #, c-format
 msgid ""
 "\"max_replication_slots\" (%d) must be greater than or equal to the number "
@@ -692,26 +758,26 @@ msgstr ""
 "значение \"max_replication_slots\" (%d) должно быть больше или равно числу "
 "слотов логической репликации (%d) в старом кластере"
 
-#: check.c:1812
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Проверка конфигурации нового кластера для использования подписок"
 
-#: check.c:1824
+#: check.c:2153
 #, c-format
 msgid ""
-"\"max_replication_slots\" (%d) must be greater than or equal to the number "
-"of subscriptions (%d) on the old cluster"
+"\"max_active_replication_origins\" (%d) must be greater than or equal to the "
+"number of subscriptions (%d) on the old cluster"
 msgstr ""
-"значение \"max_replication_slots\" (%d) должно быть больше или равно числу "
-"подписок (%d) в старом кластере"
+"значение \"max_active_replication_origins\" (%d) должно быть больше или "
+"равно числу подписок (%d) в старом кластере"
 
-#: check.c:1846
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Проверка корректности слотов логической репликации"
 
-#: check.c:1898
+#: check.c:2227
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be "
@@ -729,12 +795,12 @@ msgstr ""
 "Список проблемных слотов приведён в файле:\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Проверка состояния подписок"
 
-#: check.c:2023
+#: check.c:2369
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations "
@@ -752,17 +818,17 @@ msgstr ""
 "Список проблемных подписок приведён в файле:\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "не удалось получить управляющие данные, выполнив %s: %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d: недопустимое состояние кластера баз данных"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid ""
 "The source cluster was shut down while in recovery mode.  To upgrade, use "
@@ -772,7 +838,7 @@ msgstr ""
 "обновление, используйте документированный способ с rsync или отключите его в "
 "режиме главного сервера."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid ""
 "The target cluster was shut down while in recovery mode.  To upgrade, use "
@@ -782,174 +848,179 @@ msgstr ""
 "обновление, используйте документированный способ с rsync или отключите его в "
 "режиме главного сервера."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr ""
 "Исходный кластер не был отключён штатным образом, записанное состояние: "
 "\"%s\""
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr ""
 "Целевой кластер не был отключён штатным образом, записанное состояние: \"%s\""
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "не удалось получить управляющие данные, выполнив %s: %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "В исходном кластере не хватает информации о состоянии кластера:"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "В целевом кластере не хватает информации о состоянии кластера:"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d: проблема с выводом pg_resetwal"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d: проблема с получением управляющих данных"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "В исходном кластере не хватает необходимой управляющей информации:"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "В целевом кластере не хватает необходимой управляющей информации:"
 
 # skip-rule: capital-letter-first
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  следующий XID конт. точки"
 
 # skip-rule: capital-letter-first
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  следующий OID последней конт. точки"
 
 # skip-rule: capital-letter-first
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  следующий MultiXactId последней конт. точки"
 
 # skip-rule: capital-letter-first
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  старейший MultiXactId последней конт. точки"
 
 # skip-rule: capital-letter-first
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  oldestXID последней конт. точки"
 
 # skip-rule: capital-letter-first
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  следующий MultiXactOffset последней конт. точки"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  первый сегмент WAL после сброса"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  метод передачи аргумента float8"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  максимальное выравнивание"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  размер блока"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  размер сегмента большого отношения"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  размер блока WAL"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  размер сегмента WAL"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  максимальная длина идентификатора"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  максимальное число столбцов в индексе"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  максимальный размер порции TOAST"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  размер порции большого объекта"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  дата/время представлены целыми числами?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  версия контрольных сумм данных"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  знаковость char по умолчанию"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr ""
 "Нет необходимой управляющей информации для продолжения, работа прерывается"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid ""
 "old and new pg_controldata alignments are invalid or do not match.\n"
@@ -958,13 +1029,13 @@ msgstr ""
 "старое и новое выравнивание в pg_controldata различаются или некорректны\n"
 "Вероятно, один кластер установлен в 32-битной системе, а другой ~ в 64-битной"
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr ""
 "старый и новый размер блоков в pg_controldata различаются или некорректны"
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid ""
 "old and new pg_controldata maximum relation segment sizes are invalid or do "
@@ -973,13 +1044,13 @@ msgstr ""
 "старый и новый максимальный размер сегментов отношений в pg_controldata "
 "различаются или некорректны"
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr ""
 "старый и новый размер блоков WAL в pg_controldata различаются или некорректны"
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid ""
 "old and new pg_controldata WAL segment sizes are invalid or do not match"
@@ -987,7 +1058,7 @@ msgstr ""
 "старый и новый размер сегментов WAL в pg_controldata различаются или "
 "некорректны"
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid ""
 "old and new pg_controldata maximum identifier lengths are invalid or do not "
@@ -996,7 +1067,7 @@ msgstr ""
 "старая и новая максимальная длина идентификаторов в pg_controldata "
 "различаются или некорректны"
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid ""
 "old and new pg_controldata maximum indexed columns are invalid or do not "
@@ -1005,7 +1076,7 @@ msgstr ""
 "старый и новый максимум числа столбцов, составляющих индексы, в "
 "pg_controldata различаются или некорректны"
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid ""
 "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not "
@@ -1014,7 +1085,7 @@ msgstr ""
 "старый и новый максимальный размер порции TOAST в pg_controldata различаются "
 "или некорректны"
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid ""
 "old and new pg_controldata large-object chunk sizes are invalid or do not "
@@ -1022,57 +1093,75 @@ msgid ""
 msgstr ""
 "старый и новый размер порции большого объекта различаются или некорректны"
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr ""
 "старый и новый тип хранения даты/времени в pg_controldata различаются или "
 "некорректны"
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr ""
 "в старом кластере не применялись контрольные суммы данных, но в новом они "
 "есть"
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr ""
 "в старом кластере применялись контрольные суммы данных, но в новом их нет"
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr ""
 "старая и новая версия контрольных сумм кластера в pg_controldata различаются"
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "Добавление расширения \".old\" к старому файлу global/pg_control"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Добавление расширения \".old\" к старому файлу \"%s\""
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "Если вы захотите запустить старый кластер, вам нужно будет убрать\n"
-"расширение \".old\" у файла %s/global/pg_control.old.\n"
+"расширение \".old\" у файла \"%s/%s.old\".\n"
 "Так как применялся режим \"ссылок\", работа старого кластера\n"
 "после того, как будет запущен новый, не гарантируется."
 
+#: controldata.c:780
+#, c-format
+msgid ""
+"\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr ""
+"\n"
+"Так как использовался режим \"подмены\", старый кластер уже не может быть\n"
+"запущен штатно."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "нераспознанный режим передачи данных"
+
 #: dump.c:20
 #, c-format
 msgid "Creating dump of global objects"
@@ -1103,7 +1192,7 @@ msgstr "не удалось получить версию pg_ctl из резул
 msgid "command too long"
 msgstr "команда слишком длинная"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не удалось открыть файл протокола \"%s\": %m"
@@ -1140,7 +1229,7 @@ msgstr ""
 "Чтобы понять причину ошибки, просмотрите последние несколько строк\n"
 "файла \"%s\"."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "не удалось записать в файл протокола \"%s\": %m"
@@ -1293,7 +1382,7 @@ msgstr ""
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range не поддерживается в этой ОС"
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid ""
 "could not create hard link between old and new data directories: %m\n"
@@ -1305,22 +1394,34 @@ msgstr ""
 "В режиме \"ссылок\" старый и новый каталоги данных должны находиться в одной "
 "файловой системе."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid ""
+"could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file "
+"system."
+msgstr ""
+"не удалось создать жёсткую ссылку между старым и новым каталогами данных: "
+"%m\n"
+"В режиме подмены старый и новый каталоги данных должны находиться в одной "
+"файловой системе."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "Проверка наличия требуемых библиотек"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "загрузить библиотеку \"%s\" не удалось: %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "В базе данных: %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid ""
 "Your installation references loadable libraries that are missing from the\n"
@@ -1335,7 +1436,7 @@ msgstr ""
 "библиотек приведён в файле:\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid ""
 "Relation names for OID %u in database \"%s\" do not match: old name \"%s."
@@ -1344,32 +1445,32 @@ msgstr ""
 "Имена отношения с OID %u в базе данных \"%s\" различаются: старое имя - \"%s."
 "%s\", новое - \"%s.%s\""
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "Не удалось сопоставить старые таблицы с новыми в базе данных \"%s\""
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " это индекс в \"%s.%s\""
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " это индекс в отношении с OID %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " это TOAST-таблица для \"%s.%s\""
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " это TOAST-таблица для отношения с OID %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid ""
 "No match found in old cluster for new relation with OID %u in database "
@@ -1378,7 +1479,7 @@ msgstr ""
 "В старом кластере не нашлось соответствия для нового отношения с OID %u в "
 "базе данных \"%s\": %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid ""
 "No match found in new cluster for old relation with OID %u in database "
@@ -1387,7 +1488,7 @@ msgstr ""
 "В новом кластере не нашлось соответствия для старого отношения с OID %u в "
 "базе данных \"%s\": %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid ""
 "\n"
@@ -1396,7 +1497,7 @@ msgstr ""
 "\n"
 "исходные базы данных:"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid ""
 "\n"
@@ -1405,94 +1506,99 @@ msgstr ""
 "\n"
 "целевые базы данных:"
 
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "база template0 не найдена"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "База данных: \"%s\""
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "имя_отношения: \"%s.%s\", oid_отношения: %u, табл_пространство: %s\""
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "Слоты логической репликации в базе данных:"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "слот: \"%s\", модуль вывода: \"%s\", двухфазный: %s"
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s: программу не должен запускать root"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "неверный старый номер порта"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "неверный новый номер порта"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "недопустимый аргумент параметра %s"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "Программа запущена в режиме подробных сообщений"
 
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "расположение исполняемых файлов старого кластера"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "расположение исполняемых файлов нового кластера"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "расположение данных старого кластера"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "расположение данных нового кластера"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "расположение сокетов"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "не удалось определить текущий каталог"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid ""
 "cannot run pg_upgrade from inside the new cluster data directory on Windows"
 msgstr ""
 "в Windows нельзя запустить pg_upgrade внутри каталога данных нового кластера"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid ""
 "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n"
@@ -1501,12 +1607,12 @@ msgstr ""
 "pg_upgrade обновляет кластер PostgreSQL до другой основной версии.\n"
 "\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid ""
 "  pg_upgrade [OPTION]...\n"
@@ -1515,18 +1621,18 @@ msgstr ""
 "  pg_upgrade [ПАРАМЕТР]...\n"
 "\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr ""
 "  -b, --old-bindir=КАТ_BIN      каталог исполняемых файлов старого кластера\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid ""
 "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
@@ -1535,7 +1641,7 @@ msgstr ""
 "  -B, --new-bindir=КАТ_BIN      каталог исполняемых файлов нового кластера\n"
 "                                (по умолчанию каталог программы pg_upgrade)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid ""
 "  -c, --check                   check clusters only, don't change any data\n"
@@ -1543,17 +1649,17 @@ msgstr ""
 "  -c, --check                   только проверить кластеры, не меняя никакие "
 "данные\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=КАТ_ДАННЫХ  каталог данных старого кластера\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=КАТ_ДАННЫХ  каталог данных нового кластера\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                number of simultaneous processes or threads "
@@ -1563,7 +1669,7 @@ msgstr ""
 "или\n"
 "                                потоков\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid ""
 "  -k, --link                    link instead of copying files to new "
@@ -1573,7 +1679,7 @@ msgstr ""
 "файлов\n"
 "                                в новый кластер\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid ""
 "  -N, --no-sync                 do not wait for changes to be written safely "
@@ -1582,7 +1688,7 @@ msgstr ""
 "  -N, --no-sync                 не ждать завершения сохранения данных на "
 "диске\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid ""
 "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
@@ -1590,7 +1696,7 @@ msgstr ""
 "  -o, --old-options=ПАРАМЕТРЫ   параметры старого кластера, передаваемые "
 "серверу\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid ""
 "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
@@ -1598,21 +1704,21 @@ msgstr ""
 "  -O, --new-options=ПАРАМЕТРЫ   параметры нового кластера, передаваемые "
 "серверу\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr ""
 "  -p, --old-port=ПОРТ           номер порта старого кластера (по умолчанию "
 "%d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr ""
 "  -P, --new-port=ПОРТ           номер порта нового кластера (по умолчанию "
 "%d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid ""
 "  -r, --retain                  retain SQL and log files after success\n"
@@ -1620,7 +1726,7 @@ msgstr ""
 "  -r, --retain                  сохранить файлы журналов и SQL в случае "
 "успеха\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid ""
 "  -s, --socketdir=DIR           socket directory to use (default current "
@@ -1628,27 +1734,27 @@ msgid ""
 msgstr ""
 "  -s, --socketdir=КАТАЛОГ       каталог сокетов (по умолчанию текущий)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr ""
 "  -U, --username=ИМЯ            суперпользователь кластера (по умолчанию "
 "\"%s\")\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr ""
 "  -v, --verbose                 включить вывод подробных внутренних "
 "сообщений\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid ""
 "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                 показать версию и выйти\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid ""
 "  --clone                       clone instead of copying files to new "
@@ -1657,14 +1763,14 @@ msgstr ""
 "  --clone                       клонировать, а не копировать файлы в новый "
 "кластер\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr ""
 "  --copy                        копировать файлы в новый кластер (по "
 "умолчанию)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid ""
 "  --copy-file-range             copy files to new cluster with "
@@ -1673,17 +1779,42 @@ msgstr ""
 "  --copy-file-range             копировать файлы в новый кластер, используя\n"
 "                                функцию copy_file_range\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid ""
+"  --no-statistics               do not import statistics from old cluster\n"
+msgstr ""
+"  --no-statistics               не импортировать статистику из старого "
+"кластера\n"
+
+#: option.c:332
+#, c-format
+msgid ""
+"  --set-char-signedness=OPTION  set new cluster char signedness to "
+"\"signed\" or\n"
+"                                \"unsigned\"\n"
+msgstr ""
+"  --set-char-signedness=OPTION  установить для нового кластера знаковость "
+"char\n"
+"                                по умолчанию: \"signed\" или \"unsigned\"\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr ""
+"  --swap                        перенести каталоги данных в новый кластер\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr "  --sync-method=МЕТОД           метод синхронизации файлов с ФС\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                    показать эту справку и выйти\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid ""
 "\n"
@@ -1698,7 +1829,7 @@ msgstr ""
 "  остановить процесс postmaster, обслуживающий старый кластер\n"
 "  остановить процесс postmaster, обслуживающий новый кластер\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid ""
 "\n"
@@ -1715,7 +1846,7 @@ msgstr ""
 "  путь к каталогу \"bin\" старой версии (-b КАТ_BIN)\n"
 "  путь к каталогу \"bin\" новой версии (-B КАТ_BIN)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid ""
 "\n"
@@ -1730,7 +1861,7 @@ msgstr ""
 "bin -B новый_кластер/bin\n"
 "или\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid ""
 "  $ export PGDATAOLD=oldCluster/data\n"
@@ -1745,7 +1876,7 @@ msgstr ""
 "  $ export PGBINNEW=новый_кластер/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid ""
 "  C:\\> set PGDATAOLD=oldCluster/data\n"
@@ -1760,7 +1891,7 @@ msgstr ""
 "  C:\\> set PGBINNEW=новый_кластер/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid ""
 "\n"
@@ -1769,12 +1900,12 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid ""
 "You must identify the directory where the %s.\n"
@@ -1784,32 +1915,32 @@ msgstr ""
 "Воспользуйтесь для этого ключом командной строки %s или переменной окружения "
 "%s."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "Поиск фактического каталога данных для исходного кластера"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "Поиск фактического каталога данных для целевого кластера"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "не удалось получить каталог данных, выполнив %s: %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "не удалось получить каталог данных, выполнив %s: %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "не удалось прочитать строку %d из файла \"%s\": %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "заданный пользователем старый номер порта %hu изменён на %hu"
@@ -1824,7 +1955,7 @@ msgstr "не удалось создать рабочий процесс: %m"
 msgid "could not create worker thread: %m"
 msgstr "не удалось создать рабочий поток: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
@@ -1839,12 +1970,12 @@ msgstr "дочерний процесс завершился нештатно с
 msgid "child worker exited abnormally: %m"
 msgstr "дочерний процесс завершился аварийно: %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не удалось прочитать права на каталог \"%s\": %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1855,17 +1986,17 @@ msgstr ""
 "Выполнение обновления\n"
 "---------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Установка следующего OID для нового кластера"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Синхронизация каталога данных с ФС"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1876,23 +2007,24 @@ msgstr ""
 "Обновление завершено\n"
 "--------------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "путь к каталогу данных нового кластера слишком длинный"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: не удалось найти свой исполняемый файл"
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1901,7 +2033,7 @@ msgstr ""
 "Видимо, запущен процесс postmaster, обслуживающий старый кластер.\n"
 "Остановите его и попробуйте ещё раз."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1910,116 +2042,161 @@ msgstr ""
 "Видимо, запущен процесс postmaster, обслуживающий новый кластер.\n"
 "Остановите его и попробуйте ещё раз."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "Установка знаковости char по умолчанию для нового кластера"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Установка локали и кодировки для нового кластера"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Анализ всех строк в новом кластере"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Замораживание всех строк в новом кластере"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Восстановление глобальных объектов в новом кластере"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Восстановление схем баз данных в новом кластере"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Удаление файлов из нового каталога %s"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "ошибка при удалении каталога \"%s\""
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Копирование старого каталога %s на новый сервер"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Установка старейшего OID для нового кластера"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr ""
 "Установка следующего идентификатора транзакции и эпохи для нового кластера"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr ""
 "Установка следующего идентификатора и смещения мультитранзакции для нового "
 "кластера"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Установка старейшего идентификатора мультитранзакции в новом кластере"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Сброс архивов WAL"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Установка счётчиков frozenxid и minmxid в новом кластере"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Установка счётчика minmxid в новом кластере"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Восстановление слотов логической репликации в новом кластере"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "не удалось синхронизировать файл \"%s\": %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "Клонирование файлов пользовательских отношений"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "Копирование файлов пользовательских отношений"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr ""
 "Копирование файлов пользовательских отношений с помощью copy_file_range"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "Подключение файлов пользовательских отношений ссылками"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "Подмена каталогов данных"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "старая база данных \"%s\" не найдена в новом кластере"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "не удалось получить информацию о файле \"%s\": %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "не удалось переименовать каталог \"%s\" в \"%s\": %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "не удалось открыть каталог \"%s\": %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "не удалось прочитать каталог \"%s\": %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "не удалось синхронизировать каталог \"%s\": %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "не удалось синхронизировать родительский каталог \"%s\": %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid ""
 "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
@@ -2027,31 +2204,36 @@ msgstr ""
 "ошибка при проверке существования файла \"%s.%s\" (перенос \"%s\" в \"%s\"): "
 "%m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "переписывание \"%s\" в \"%s\""
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "клонирование \"%s\" в \"%s\""
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "копирование \"%s\" в \"%s\""
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
 msgstr "копирование \"%s\" в \"%s\" с помощью copy_file_range"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "создание ссылки на \"%s\" в \"%s\""
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "невозможный случай"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -2083,7 +2265,7 @@ msgstr "не удалось открыть файл с версией \"%s\": %m
 msgid "could not parse version file \"%s\""
 msgstr "не удалось разобрать файл с версией \"%s\""
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -2092,7 +2274,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -2102,7 +2284,7 @@ msgstr ""
 "командой:\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -2112,26 +2294,26 @@ msgstr ""
 "командой:\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr ""
 "программа pg_ctl не смогла запустить исходный сервер, либо к нему не удалось "
 "подключиться"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr ""
 "программа pg_ctl не смогла запустить целевой сервер, либо к нему не удалось "
 "подключиться"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr ""
@@ -2162,6 +2344,16 @@ msgstr ""
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "путь табличного пространства \"%s\" не указывает на каталог"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "ошибка подключения: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "неверный сокет"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -2182,11 +2374,6 @@ msgstr "ок"
 msgid "Checking for hash indexes"
 msgstr "Проверка хеш-индексов"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "предупреждение"
-
 #: version.c:123
 #, c-format
 msgid ""
@@ -2221,17 +2408,17 @@ msgstr ""
 "будучи выполненным администратором БД в psql, пересоздаст все неправильные\n"
 "индексы; до этого никакие хеш-индексы не будут использоваться."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "Проверка обновлённых расширений"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "замечание"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid ""
 "\n"
@@ -2452,9 +2639,6 @@ msgstr ""
 #~ "проверка файла \"%s\" не пройдена: не удаётся прочитать файл (нет "
 #~ "доступа)\n"
 
-#~ msgid "connection to database failed: %s"
-#~ msgstr "не удалось подключиться к базе: %s"
-
 #~ msgid ""
 #~ "\n"
 #~ "connection to database failed: %s"
diff --git a/src/bin/pg_upgrade/po/sv.po b/src/bin/pg_upgrade/po/sv.po
index 51ad41bff55..75dcfaac22c 100644
--- a/src/bin/pg_upgrade/po/sv.po
+++ b/src/bin/pg_upgrade/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-12 13:50+0000\n"
-"PO-Revision-Date: 2025-02-12 20:38+0100\n"
+"POT-Creation-Date: 2025-08-09 01:50+0000\n"
+"PO-Revision-Date: 2025-08-09 20:10+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -47,21 +47,21 @@ msgstr "användaren finns inte"
 msgid "user name lookup failure: error code %lu"
 msgstr "misslyckad sökning efter användarnamn: felkod %lu"
 
-#: ../../fe_utils/string_utils.c:608
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:781
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Letar i användartabeller efter systemdefinierade typer av sorten \"composite\""
 
-#: check.c:118
+#: check.c:119
 msgid ""
 "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
@@ -73,11 +73,11 @@ msgstr ""
 "PostgreSQL-versioner så detta kluster kan inte uppgraderas för tillfället.\n"
 "Du kan slänga problemkolumnerna och återstarta uppgraderingen.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Letar efter inkompatibel \"line\"-datatyp"
 
-#: check.c:137
+#: check.c:138
 msgid ""
 "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
@@ -91,11 +91,11 @@ msgstr ""
 "Du kan radera problemkolumnerna och återstarta uppgraderingen.\n"
 
 # FIXME: is this msgid correct?
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Letar efter reg*-datatyper i användartabeller"
 
-#: check.c:181
+#: check.c:182
 msgid ""
 "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
@@ -107,11 +107,11 @@ msgstr ""
 "så detta kluster kan för närvarande inte uppgraderas. Du kan ta bort\n"
 "problemkolumnerna och starta om uppgraderingen.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Letar efter inkompatibel datatype \"aclitem\""
 
-#: check.c:198
+#: check.c:199
 msgid ""
 "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
@@ -123,11 +123,11 @@ msgstr ""
 "kan för närvarande inte uppgraderas. Du kan ta bort problemkolumnerna\n"
 "och starta om uppgraderingen.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Letar efter ogiltiga användarkolumner av typen \"unknown\""
 
-#: check.c:222
+#: check.c:223
 msgid ""
 "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
@@ -139,11 +139,11 @@ msgstr ""
 "för närvarande inte uppgraderas. Du kan radera problemkolumnerna och\n"
 "återstarta uppgraderingen.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "Letar efter ogiltiga användarkolumner av typen \"sql_identifier\""
 
-#: check.c:244
+#: check.c:245
 msgid ""
 "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
@@ -155,11 +155,11 @@ msgstr ""
 "närvarande inte uppgraderas. Du kan radera problemkolumnerna och\n"
 "återstarta uppgraderingen.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "Letar efter inkompatibel datatyp \"jsonb\"-datatyp i användartabeller"
 
-#: check.c:260
+#: check.c:261
 msgid ""
 "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
@@ -171,11 +171,11 @@ msgstr ""
 "för närvarande inte uppgraderas. Du kan ta bort problemkolumnerna och\n"
 "starta om uppgraderingen.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "Letar efter borttagen datatype \"abstime\" i användartabeller"
 
-#: check.c:277
+#: check.c:278
 msgid ""
 "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
@@ -188,11 +188,11 @@ msgstr ""
 "kan för närvarande inte uppgraderas. Du kan ta bort problemkolumnerna\n"
 "eller ändra dem till en annan datatype och starta om uppgraderingen.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "Letar efter borttagen datatype \"reltime\" i användartabeller"
 
-#: check.c:290
+#: check.c:291
 msgid ""
 "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
@@ -205,11 +205,11 @@ msgstr ""
 "kan för närvarande inte uppgraderas. Du kan ta bort problemkolumnerna\n"
 "eller ändra dem till en annan datatype och starta om uppgraderingen.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "Letar efter borttagen datatype \"tinterval\" i användartabeller"
 
-#: check.c:303
+#: check.c:304
 msgid ""
 "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
@@ -222,34 +222,34 @@ msgstr ""
 "kan för närvarande inte uppgraderas. Du kan ta bort problemkolumnerna\n"
 "eller ändra dem till en annan datatype och starta om uppgraderingen.\n"
 
-#: check.c:345
-#, c-format
-msgid "Checking data type usage"
-msgstr "Letar efter användning av datatyp"
-
-#: check.c:480
+#: check.c:422
 #, c-format
 msgid "failed check: %s"
 msgstr "misslyckad kontroll: %s"
 
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "En lista med problemkolumner finns i filen:"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2189 check.c:2208 check.c:2254 check.c:2307 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: check.c:522
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "Letar efter användning av datatyp"
+
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Kontroll av datatyper misslyckades: %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid ""
 "Performing Consistency Checks on Old Live Server\n"
@@ -258,7 +258,7 @@ msgstr ""
 "Utför konsistenskontroller på gamla live-servern\n"
 "------------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid ""
 "Performing Consistency Checks\n"
@@ -267,7 +267,12 @@ msgstr ""
 "Utför konsistenskontroller\n"
 "--------------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr "Swap-läget kan bara uppgradera kluster från PostgreSQL version %s eller senare."
+
+#: check.c:777
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +281,7 @@ msgstr ""
 "\n"
 "*Klustren är kompatibla*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid ""
 "\n"
@@ -287,18 +292,20 @@ msgstr ""
 "Om pg_upgrade misslyckas efter denna punkt så måste du\n"
 "köra om initdb på nya klustret innan du fortsätter."
 
-#: check.c:767
+#: check.c:826
 #, c-format
 msgid ""
-"Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+"Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 msgstr ""
-"Optimeringsstatistik överförs inte av pg_upgrade.\n"
-"När du startar nya servern så vill du nog köra:\n"
-"     %s/vacuumdb %s--all --analyze-in-stages"
+"Viss statistik överförs inte av pg_upgrade.\n"
+"När du startar nya servern så överväg att köra dessa två kommandon:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid ""
 "Running this script will delete the old cluster's data files:\n"
@@ -307,7 +314,7 @@ msgstr ""
 "När detta skript körs så raderas gamla klustrets datafiler:\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid ""
 "Could not create a script to delete the old cluster's data files\n"
@@ -320,57 +327,62 @@ msgstr ""
 "ligger i gamla klusterkatalogen. Det gamla klustrets innehåll\n"
 "måste raderas för hand."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Kontrollerar klustrets versioner"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "Detta verktyg kan bara uppgradera från PostgreSQL version %s eller senare."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Detta verktyg kan bara uppgradera till PostgreSQL version %s."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "Detta verktyg kan inte användas för att nergradera till äldre major-versioner av PostgreSQL."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "Gammal klusterdata och binära kataloger är från olika major-versioner."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "Nya klusterdata och binära kataloger är från olika major-versioner."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "Flaggan %s kan inte användas för att uppgradera från PostgreSQL %s eller senare."
+
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "Vid kontroll av en live-server så måste gamla och nya portnumren vara olika."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "Nya databasklustret \"%s\" är inte tomt: hittade relation \"%s.%s\""
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Letar efter nya tablespace-kataloger i klustret"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "i klustret finns redan ny tablespace-katalog: \"%s\""
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid ""
 "\n"
@@ -379,7 +391,7 @@ msgstr ""
 "\n"
 "VARNING:  nya datakatalogen skall inte ligga inuti den gamla datakatalogen, dvs. %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid ""
 "\n"
@@ -388,92 +400,93 @@ msgstr ""
 "\n"
 "VARNING:  användardefinierade tabellutrymmens plats skall inte vara i datakatalogen, dvs. %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Skapar skript för att radera gamla klustret"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "kunde inte lägga till rättigheten \"körbar\" på filen \"%s\": %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Kontrollerar att databasanvändaren är installationsanvändaren"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "databasanvändare \"%s\" är inte installationsanvändaren"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "kunde inte bestämma antalet användare"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "Bara installationsanvändaren får finnas i nya klustret."
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Kontrollerar databasens anslutningsinställningar"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 får inte tillåta anslutningar, dvs dess pg_database.datallowconn måste vara false"
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2221 check.c:2363
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "fatalt"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid ""
 "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
 msgstr ""
 "Alla databaser förutom template0 måste tillåta anslutningar, dvs deras\n"
-"pg_database.datallowconn måste vara true. Din installation har andra\n"
-"databaser än template0 som har pg_database.datallowconn sat till false\n"
-"Överväg att tillåta anslutningar för alla databaser förutom template0\n"
-"eller släng de databaser som inte tillåter anslutningar. En lista med\n"
-"problemdatabaser finns i filen:\n"
+"pg_database.datallowconn måste vara true och pg_database.datconnlimit\n"
+"får inte vara -2. Din installation har andra databaser än template0\n"
+"som inte går att ansluta till. Överväg att tillåta anslutningar för\n"
+"alla databaser förutom template0 eller släng de databaser som inte\n"
+"tillåter anslutningar. En lista med problemdatabaser finns i filen:\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Letar efter förberedda transaktioner"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "Källklustret innehåller förberedda transaktioner"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "Målklustret innehåller förberedda transaktioner"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Letar efter contrib/isn med bigint-anropsfel"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid ""
 "Your installation contains \"contrib/isn\" functions which rely on the\n"
@@ -492,12 +505,12 @@ msgstr ""
 "En lista med problemfunktionerna finns i filen:\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Letar efter användardefinierade postfix-operatorer"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid ""
 "Your installation contains user-defined postfix operators, which are not\n"
@@ -512,12 +525,12 @@ msgstr ""
 "En lista med användardefinierade postfix-operatorer finns i filen:\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Letar efter inkompatibla polymorfa funktioner"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid ""
 "Your installation contains user-defined objects that refer to internal\n"
@@ -538,12 +551,12 @@ msgstr ""
 "En lista med problemobjekten finns i filen:\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Letar efter tabeller med WITH OIDS"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid ""
 "Your installation contains tables declared WITH OIDS, which is not\n"
@@ -558,12 +571,36 @@ msgstr ""
 "En lista över tabeller med detta problem finns i filen:\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Kontrollerar att icke-null-villkor är konsistenta"
+
+#: check.c:1711
+#, c-format
+msgid ""
+"Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr ""
+"Din installation har inkonsistenta NOT NULL-villkor.\n"
+"Om en föräldrakolumn är NOT NULL så måste barnkolumnen också\n"
+"sättas till NOT NULL annars så kommer uppgraderingen misslyckas.\n"
+"Du kan lösa detta genom att köra\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"för varje kolumn som listas i filen:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Letar efter roller som startar med \"pg_\""
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid ""
 "Your installation contains roles starting with \"pg_\".\n"
@@ -578,12 +615,12 @@ msgstr ""
 "En lista med rollerna som startar på \"pg_\" finns i denna fil:\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Letar efter användardefinierade teckenkodkonverteringar"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid ""
 "Your installation contains user-defined encoding conversions.\n"
@@ -600,52 +637,73 @@ msgstr ""
 "En lista med användardefinierade teckenkodkonverteringar finns i filen:\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "Letar efter objekt som påverkas av uppdatering av Unicode"
+
+#: check.c:2033 version.c:121
+#, c-format
+msgid "warning"
+msgstr "varning"
+
+#: check.c:2034
+#, c-format
+msgid ""
+"Your installation contains relations that might be affected by a new version of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr ""
+"Din installation innehåller relationer som kan påverkas av en ny version av Unicode.\n"
+"En lista med potentiellt påverkade relationer är i filen:\n"
+"    %s"
+
+#: check.c:2070
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Letar efter replikeringsslottar i nya klustret"
 
-#: check.c:1754
+#: check.c:2078
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "kunde inte räkna antalet logiska replikeringsslottar"
 
-#: check.c:1759
+#: check.c:2083
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "förväntade 0 logiska replikeringsslottar men hittade %d."
 
-#: check.c:1769 check.c:1820
+#: check.c:2093 check.c:2144
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "kunde inte plocka fram inställningar i det nya klustret"
 
-#: check.c:1774
+#: check.c:2098
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\" måste vara satt till \"logical\" men är satt som \"%s\""
 
-#: check.c:1780
+#: check.c:2104
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "\"max_replication_slots\" (%d) måste vara större än eller lika med antalet logiska replikeringsslottar (%d) i gamla klustret"
 
-#: check.c:1812
+#: check.c:2136
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Letar efter konfiguration för prenumerationer i nya klustret"
 
-#: check.c:1824
+#: check.c:2148
 #, c-format
-msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
-msgstr "\"max_replication_slots\" (%d) måste vara större än eller lika med antaler prenumerationer (%d) i gamla klustret"
+msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
+msgstr "\"max_active_replication_origins\" (%d) måste vara större än eller lika med antalet prenumerationer (%d) i gamla klustret"
 
-#: check.c:1846
+#: check.c:2170
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Letar efter giltiga logiska replikeringsslottar"
 
-#: check.c:1898
+#: check.c:2222
 #, c-format
 msgid ""
 "Your installation contains logical replication slots that cannot be upgraded.\n"
@@ -660,12 +718,12 @@ msgstr ""
 "En lista med problemkolumner finns i filen:\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2282
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Kontrollerar läget för prenumerationer"
 
-#: check.c:2023
+#: check.c:2364
 #, c-format
 msgid ""
 "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
@@ -680,184 +738,189 @@ msgstr ""
 "En lista med problemkolumner finns i filen:\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "kunde inte hämta kontrolldata med %s: %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d: state-problem för databaskluster"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid "The source cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "Källklustret stängdes ner när det var i återställningsläge. För att uppgradera så använd \"rsync\" enligt dokumentation eller stäng ner den som en primär."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid "The target cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "Målklustret stängdes ner när det var i återställningsläge. För att uppgradera så använd \"rsync\" enligt dokumentation eller stäng ner den som en primär."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "Källklustret har inte stängts ner på ett korrekt sätt, dess tillstånd rapporteras som: \"%s\""
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "Målklustret har inte stängts ner på ett korrekt sätt, dess tillstånd rapporteras som: \"%s\"."
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "kunde inte hämta kontrolldata med %s: %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "Källklustret saknar information om kluster-state:"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "Målklustret saknar information om kluster-state:"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d: pg_resetwal-problem"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d: problem vid hämtning av kontrolldata"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "Källklustret saknar lite kontrolldata som krävs:"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "Målklustret saknar lite kontrolldata som krävs:"
 
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  checkpoint nästa-XID"
 
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  senaste checkpoint nästa-OID"
 
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  senaster checkpoint nästa-MultiXactId"
 
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  senaste checkpoint äldsta-MultiXactId"
 
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  senaste checkpoint äldsta-XID"
 
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  senaste checkpoint nästa-MultiXactOffset"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  första WAL-segmentet efter reset"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  float8 argumentöverföringsmetod"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  maximal alignment"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  blockstorlek"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  stora relationers segmentstorlek"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  WAL-blockstorlek"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  WAL-segmentstorlek"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  maximal identifierarlängd"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  maximalt antal indexerade kolumner"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  maximal TOAST-chunkstorlek"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  stora-objekt chunkstorlek"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  datum/tid är heltal?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  datachecksumversion"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  standard signering för char"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr "Kan inte fortsätta utan kontrollinformation som krävs, avslutar"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid ""
 "old and new pg_controldata alignments are invalid or do not match.\n"
@@ -866,91 +929,109 @@ msgstr ""
 "gamla och nya pg_controldata-alignments är ogiltiga eller matchar inte.\n"
 "Troligen är ett kluster en 32-bitars-installation och den andra 64-bitars"
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata-blockstorlekar är ogiltiga eller matchar inte"
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid "old and new pg_controldata maximum relation segment sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata maximala relationssegmentstorlekar är ogiltiga eller matchar inte"
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata WAL-blockstorlekar är ogiltiga eller matchar inte"
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid "old and new pg_controldata WAL segment sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata WAL-segmentstorlekar är ogiltiga eller matchar inte"
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid "old and new pg_controldata maximum identifier lengths are invalid or do not match"
 msgstr "gamla och nya pg_controldata maximal identifierarlängder är ogiltiga eller matchar inte"
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid "old and new pg_controldata maximum indexed columns are invalid or do not match"
 msgstr "gamla och nya pg_controldata maximalt indexerade kolumner ogiltiga eller matchar inte"
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata maximal TOAST-chunkstorlek ogiltiga eller matchar inte"
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid "old and new pg_controldata large-object chunk sizes are invalid or do not match"
 msgstr "gamla och nya pg_controldata stora-objekt-chunkstorlekar är ogiltiga eller matchar inte"
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr "gamla och nya pg_controldata datum/tid-lagringstyper matchar inte"
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr "gamla klustret använder inte datachecksummor men nya gör det"
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr "gamla klustret använder datachecksummor men nya gör inte det"
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "gamla och nya klustrets pg_controldata checksumversioner matchar inte"
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "Lägger till \".old\"-suffix till gamla global/pg_control"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Lägger till \".old\"-suffix till gamla \"%s\""
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid ""
 "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr ""
 "\n"
 "Om du vill starta gamla klustret så måste du ta bort\n"
-"\".old\"-suffixet från %s/global/pg_control.old.\n"
+"\".old\"-suffixet från %s/%s.old.\n"
 "Detta då \"link\"-läge användes och gamla klustret kan inte\n"
 "startas på ett säkert sätt efter att nya klustret startats."
 
+#: controldata.c:780
+#, c-format
+msgid ""
+"\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr ""
+"\n"
+"Eftersom läget \"swap\" användes så kan det gamla klustret inte\n"
+"längre startas på ett säkert sätt."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "okänt överföringsläge"
+
 #: dump.c:20
 #, c-format
 msgid "Creating dump of global objects"
@@ -981,7 +1062,7 @@ msgstr "kunde inte läsa versionutdata för pg_ctl från %s"
 msgid "command too long"
 msgstr "kommandot för långt"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "kunde inte öppna loggfil \"%s\": %m"
@@ -1018,7 +1099,7 @@ msgstr ""
 "Se de sista raderna i \"%s\" för\n"
 "en trolig orsak till misslyckandet."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "kunde inte skriva till loggfil \"%s\": %m"
@@ -1143,7 +1224,7 @@ msgstr "kunde inte kopiera filintervall mellan gamla och nya datakatalogerna: %m
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range stöds inte på denna plattform"
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid ""
 "could not create hard link between old and new data directories: %m\n"
@@ -1152,22 +1233,31 @@ msgstr ""
 "kunde inte skapa hård länk mellan gamla och nya datakatalogerna: %m\n"
 "I länk-läge måste gamla och nya datakatalogerna vara i samma filsystem."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid ""
+"could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file system."
+msgstr ""
+"kunde inte skapa hård länk mellan gamla och nya datakatalogerna: %m\n"
+"I swap-läge måste gamla och nya datakatalogerna vara i samma filsystem."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "Kontrollerar att krävda länkbibliotek finns"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "kunde inte ladda länkbibliotek \"%s\": %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "I databas: %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid ""
 "Your installation references loadable libraries that are missing from the\n"
@@ -1182,47 +1272,47 @@ msgstr ""
 "med problembiblioteken finns i filen:\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid "Relation names for OID %u in database \"%s\" do not match: old name \"%s.%s\", new name \"%s.%s\""
 msgstr "Relationsname för OID %u i databas \"%s\" matchar inte: gammalt namn \"%s.%s\", nytt namn \"%s.%s\""
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "Misslyckades med att matcha ihop gamla och nya tabeller i databas \"%s\""
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " vilket är ett index för \"%s.%s\""
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " vilket är ett index för OID %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " vilket är TOAST-tabellen för \"%s.%s\""
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " vilket är TOAST-tabellen för OID %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid "No match found in old cluster for new relation with OID %u in database \"%s\": %s"
 msgstr "Ingen träff hittad i gamla klustret för ny relation med OID %u i databas \"%s\": %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid "No match found in new cluster for old relation with OID %u in database \"%s\": %s"
 msgstr "Ingen träff hittad i nya klustret för gammal relation med OID %u i databas \"%s\": %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid ""
 "\n"
@@ -1231,7 +1321,7 @@ msgstr ""
 "\n"
 "källdatabaser:"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid ""
 "\n"
@@ -1240,93 +1330,98 @@ msgstr ""
 "\n"
 "måldatabaser:"
 
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "hittade inte template0"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "Databas: \"%s\""
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "relnamn: \"%s.%s\": reloid: %u reltblutrymme: \"%s\""
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "Logiska replikeringsslottar i databasen:"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "slot_name \"%s\", utdata-plugin \"%s\", two_phase \"%s\""
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s: kan inte köras som root"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "ogiltigt gammalt portnummer"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "ogiltigt nytt portnummer"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "ogiltigt argument för flaggan %s"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "Kör i utförligt läge"
 
 # FIXME: the source code need to be fixed here. it paste words together
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "gamla klusterbinärer är i"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "nya klusterbinärer är i"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "gamla klusterdatan är i"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "nya klusterdatan är i"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "uttag kommer skapas"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "kunde inte bestämma aktuell katalog"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid "cannot run pg_upgrade from inside the new cluster data directory on Windows"
 msgstr "kan inte köra pg_upgrade inifrån nya klusterdatakatalogen i Windows"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid ""
 "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n"
@@ -1335,12 +1430,12 @@ msgstr ""
 "pg_upgrade uppgraderar ett PostgreSQL-kluster till en annan major-version.\n"
 "\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid ""
 "  pg_upgrade [OPTION]...\n"
@@ -1349,17 +1444,17 @@ msgstr ""
 "  pg_upgrade [FLAGGA]...\n"
 "\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr "  -b, --old-bindir=BINKAT       gamla klustrets katalog för körbara filer\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid ""
 "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
@@ -1368,107 +1463,126 @@ msgstr ""
 "  -B, --new-bindir=BINKAT       nya klustrets katalog för körbara filer\n"
 "                                (standard är samma som för pg_upgrade)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid "  -c, --check                   check clusters only, don't change any data\n"
 msgstr "  -c, --check                   testa klustren bara, ändra ingen data\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=DATAKAT     gamla klustrets datakatalog\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=DATAKAT     nya klustrets datakatalog\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid "  -j, --jobs=NUM                number of simultaneous processes or threads to use\n"
 msgstr "  -j, --jobs=NUM                antal samtidiga processer eller trådar att använda\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid "  -k, --link                    link instead of copying files to new cluster\n"
 msgstr "  -k, --link                    länka istället för att kopiera filer till nya klustret\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid "  -N, --no-sync                 do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync                 vänta inte på att ändingar säkert skrivits till disk\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
 msgstr "  -o, --old-options=FLAGGOR     serverflaggor för gamla klustret\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
 msgstr "  -O, --new-options=FLAGGOR     serverflaggor för nya klustret\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr "  -p, --old-port=PORT           gamla klustrets portnummer (standard %d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr "  -P, --new-port=PORT           nya klustrets portnummer (standard %d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid "  -r, --retain                  retain SQL and log files after success\n"
 msgstr "  -r, --retain                  behåll SQL och loggfiler efter lyckad uppgradering\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid "  -s, --socketdir=DIR           socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=KAT           uttagskatalog (standard är aktuell katalog.)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr "  -U, --username=NAMN           klustrets superuser (standard \"%s\")\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr "  -v, --verbose                 slå på utförligt intern loggning\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                 visa versionsinformation, avsluta sedan\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid "  --clone                       clone instead of copying files to new cluster\n"
-msgstr "  -clone                        klona istället för att kopiera filer till nya klustret\n"
+msgstr "  --clone                       klona istället för att kopiera filer till nya klustret\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr "  --copy                        kopiera filer till nya klustret (standard)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid "  --copy-file-range             copy files to new cluster with copy_file_range\n"
 msgstr "  --copy-file-range             kopiera filer till nya klustret med copy_file_range\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid "  --no-statistics               do not import statistics from old cluster\n"
+msgstr "  --no-statistics               importera inte statistik från gamla klustret\n"
+
+#: option.c:332
+#, c-format
+msgid ""
+"  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
+"                                \"unsigned\"\n"
+msgstr ""
+"  --set-char-signedness=FLAGGA  sätt signering för char i nya klustret\n"
+"                                till \"signed\" eller \"unsigned\"\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr "  --swap                        flytta datakataloger till nya klustret\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr "  --sync-method=METOD           sätt synkmetod för att synka filer till disk\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                    visa denns hjälp, avsluta sedan\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1597,7 @@ msgstr ""
 "  stänga ner den postmaster som hanterar gamla klustret\n"
 "  stänga ner den postmaster som hanterar nya klustret\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid ""
 "\n"
@@ -1500,7 +1614,7 @@ msgstr ""
 "  \"bin\"-katalogen för gamla versionen (-b BINKAT)\n"
 "  \"bin\"-katalogen för nya versionen (-B BINKAT)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid ""
 "\n"
@@ -1513,7 +1627,7 @@ msgstr ""
 "  pg_upgrade -d gammaltKluster/data -D nyttKluster/data -b gammaltKluster/bin -B nyttKluster/bin\n"
 "eller\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid ""
 "  $ export PGDATAOLD=oldCluster/data\n"
@@ -1528,7 +1642,7 @@ msgstr ""
 "  $ export PGBINNEW=nyttKluster/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid ""
 "  C:\\> set PGDATAOLD=oldCluster/data\n"
@@ -1543,7 +1657,7 @@ msgstr ""
 "  C:\\> set PGBINNEW=nyttKluster/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid ""
 "\n"
@@ -1552,12 +1666,12 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid ""
 "You must identify the directory where the %s.\n"
@@ -1566,32 +1680,32 @@ msgstr ""
 "Du måste identifiera katalogen där %s.\n"
 "Använd kommandoradsflaggan %s eller omgivningsvariabeln %s."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "Letar efter den riktiga datakatalogen i källklustret"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "Letar efter den riktiga datakatalogen för målklustret"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "kunde inte hämta datakatalogen med %s: %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "kunde inte hämta datakatalogen med %s: %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "kunde inte läsa rad %d från fil \"%s\": %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "användarangivet gammalt portnummer %hu korrigerat till %hu"
@@ -1606,7 +1720,7 @@ msgstr "kunde inte skapa arbetsprocess: %m"
 msgid "could not create worker thread: %m"
 msgstr "kunde inte skapa arbetstråd: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
@@ -1621,12 +1735,12 @@ msgstr "barnprocess avslutade felaktigt: status %d"
 msgid "child worker exited abnormally: %m"
 msgstr "barnprocess avslutade felaktigt: %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "kunde inte läsa rättigheter på katalog \"%s\": %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid ""
 "\n"
@@ -1637,17 +1751,17 @@ msgstr ""
 "Utför uppgradering\n"
 "------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Sätter nästa OID för nya klustret"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Synkar datakatalog till disk"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid ""
 "\n"
@@ -1658,23 +1772,24 @@ msgstr ""
 "Uppgradering klar\n"
 "-----------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "katalogsökväg för nytt kluster är för lång"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "kunde inte skapa katalog \"%s\": %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: kunde inte hitta det egna programmets körbara fil"
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the old cluster.\n"
@@ -1683,7 +1798,7 @@ msgstr ""
 "Det verkar vara en postmaster igång som hanterar gamla klustret.\n"
 "Stänga ner den postmastern och försök igen."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid ""
 "There seems to be a postmaster servicing the new cluster.\n"
@@ -1692,141 +1807,191 @@ msgstr ""
 "Det verkar vara en postmaster igång som hanterar nya klustret.\n"
 "Stänga ner den postmastern och försök igen."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "Sätter standard signering för char i nya klustret"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Sätter lokal och teckenkodning för nya klustret"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Analyserar alla rader i nya klustret"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Fryser alla rader i nya klustret"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Återställer globala objekt i nya klustret"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Återställer databasscheman i nya klustret"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Raderar filer från ny %s"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "kunde inte ta bort katalog \"%s\""
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Kopierar gammal %s till ny server"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Sätter äldsta XID för nya klustret"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "Sätter nästa transaktions-ID och epoch för nytt kluster"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "Sätter nästa multixact-ID och offset för nytt kluster"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Sätter äldsta multixact-ID i nytt kluster"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Resettar WAL-arkiv"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Sätter räknarna frozenxid och minmxid för nytt kluster"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Sätter räknarenm minmxid för nytt kluster"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Återställer logiska replikeringsslottar i nya klustret"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "kunde inte synkronisera filen \"%s\": %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "Klonar användarens relationsfiler"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "Kopierar användarens relationsfiler"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr "Kopierar användarens relationsfiler med copy_file_range"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "Länkar användarens relationsfiler"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "Swappar datakataloger"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "gamla databasen \"%s\" kan inte hittas i nya klustret"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "kunde inte göra stat() på fil \"%s\": %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "kunde inte döpa om katalog \"%s\" till \"%s\": %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "kunde inte öppna katalog \"%s\": %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "kunde inte läsa katalog \"%s\": %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "kunde inte synkronisera katalogen \"%s\": %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "kunde inte synkronisera föräldrakatalogen till \"%s\": %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
 msgstr "fel vid kontroll av filexistens \"%s.%s\" (\"%s\" till \"%s\"): %m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "skriver om \"%s\" till \"%s\""
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "klonar \"%s\" till \"%s\""
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "kopierar \"%s\" till \"%s\""
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
 msgstr "kopierar \"%s\" till \"%s\" med copy_file_range"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "länkar \"%s\" till \"%s\""
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "skall aldrig hända"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -1858,7 +2023,7 @@ msgstr "kunde inte öppna versionsfil \"%s\": %m"
 msgid "could not parse version file \"%s\""
 msgstr "kunde inte tolka versionsfil \"%s\""
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid ""
 "\n"
@@ -1867,7 +2032,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid ""
 "could not connect to source postmaster started with the command:\n"
@@ -1876,7 +2041,7 @@ msgstr ""
 "kunde inte ansluta till käll-postmaster som startats med kommandot:\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid ""
 "could not connect to target postmaster started with the command:\n"
@@ -1885,22 +2050,22 @@ msgstr ""
 "kunde inte ansluta till mål-postmaster som startats med kommandot:\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl misslyckades att start källservern eller så misslyckades anslutningen"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl misslyckades att start målservern eller så misslyckades anslutningen"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "libpq:s omgivningsvariabel %s har ett icke-lokalt servervärde: %s"
@@ -1929,6 +2094,16 @@ msgstr "kunde inte göra stat på tablespace-katalog \"%s\": %m"
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "tablespace-sökväg \"%s\" är inte en katalog"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "anslutningsfel: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "ogiltig socket"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -1949,11 +2124,6 @@ msgstr "ok"
 msgid "Checking for hash indexes"
 msgstr "Letar efter hash-index"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "varning"
-
 #: version.c:123
 #, c-format
 msgid ""
@@ -1988,17 +2158,17 @@ msgstr ""
 "kan köras med psql av databasens superuser och kommer återskapa alla\n"
 "ogiltiga index; innan dess så kommer inget av dess index användas."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "Letar efter uppdatering av utökningar"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "notis"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_upgrade/po/uk.po b/src/bin/pg_upgrade/po/uk.po
index 4a0ec9a1eda..2329a111937 100644
--- a/src/bin/pg_upgrade/po/uk.po
+++ b/src/bin/pg_upgrade/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:20+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:20+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_upgrade.pot\n"
-"X-Crowdin-File-ID: 1028\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_upgrade.pot\n"
+"X-Crowdin-File-ID: 1055\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
@@ -47,21 +47,21 @@ msgstr "користувача не існує"
 msgid "user name lookup failure: error code %lu"
 msgstr "невдала підстановка імені користувача: код помилки %lu"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: check.c:111
+#: check.c:112
 msgid "Checking for system-defined composite types in user tables"
 msgstr "Перевірка складених типів визначених системою у таблицях користувача"
 
-#: check.c:118
+#: check.c:119
 msgid "Your installation contains system-defined composite types in user tables.\n"
 "These type OIDs are not stable across PostgreSQL versions,\n"
 "so this cluster cannot currently be upgraded.  You can drop the\n"
@@ -70,11 +70,11 @@ msgstr "Ваша інсталяція містить системно визна
 "OID цих типів не стабільні між версіями PostgreSQL, тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:132
+#: check.c:133
 msgid "Checking for incompatible \"line\" data type"
 msgstr "Перевірка несумісного типу даних \"line\""
 
-#: check.c:137
+#: check.c:138
 msgid "Your installation contains the \"line\" data type in user tables.\n"
 "This data type changed its internal and input/output format\n"
 "between your old and new versions so this\n"
@@ -85,11 +85,11 @@ msgstr "Ваша інсталяція містить тип даних \"line\"
 "тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:154
+#: check.c:155
 msgid "Checking for reg* data types in user tables"
 msgstr "Перевірка типів даних reg* в користувацьких таблицях"
 
-#: check.c:181
+#: check.c:182
 msgid "Your installation contains one of the reg* data types in user tables.\n"
 "These data types reference system OIDs that are not preserved by\n"
 "pg_upgrade, so this cluster cannot currently be upgraded.  You can\n"
@@ -98,11 +98,11 @@ msgstr "Ваша інсталяція містить один з типів да
 "Ці типи даних посилаються на OID системи, які не зберігаються за допомогою pg_upgrade, тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:193
+#: check.c:194
 msgid "Checking for incompatible \"aclitem\" data type"
 msgstr "Перевірка несумісного типу даних \"aclitem\""
 
-#: check.c:198
+#: check.c:199
 msgid "Your installation contains the \"aclitem\" data type in user tables.\n"
 "The internal format of \"aclitem\" changed in PostgreSQL version 16\n"
 "so this cluster cannot currently be upgraded.  You can drop the\n"
@@ -111,11 +111,11 @@ msgstr "Ваша інсталяція містить тип даних \"aclitem
 "тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:217
+#: check.c:218
 msgid "Checking for invalid \"unknown\" user columns"
 msgstr "Перевірка неприпустимих користувацьких стовпців \"unknown\""
 
-#: check.c:222
+#: check.c:223
 msgid "Your installation contains the \"unknown\" data type in user tables.\n"
 "This data type is no longer allowed in tables, so this cluster\n"
 "cannot currently be upgraded.  You can drop the problem columns\n"
@@ -125,11 +125,11 @@ msgstr "Ваша інсталяція містить \"unknown\" тип дани
 "тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:239
+#: check.c:240
 msgid "Checking for invalid \"sql_identifier\" user columns"
 msgstr "Перевірка неприпустимих користувацьких стовпців \"sql_identifier\""
 
-#: check.c:244
+#: check.c:245
 msgid "Your installation contains the \"sql_identifier\" data type in user tables.\n"
 "The on-disk format for this data type has changed, so this\n"
 "cluster cannot currently be upgraded.  You can drop the problem\n"
@@ -139,11 +139,11 @@ msgstr "Ваша інсталяція містить \"sql_identifier\" тип 
 "тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:255
+#: check.c:256
 msgid "Checking for incompatible \"jsonb\" data type in user tables"
 msgstr "Перевірка несумісного типу даних \"jsonb\" в користувацьких таблицях"
 
-#: check.c:260
+#: check.c:261
 msgid "Your installation contains the \"jsonb\" data type in user tables.\n"
 "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
 "cluster cannot currently be upgraded.  You can drop the problem \n"
@@ -153,11 +153,11 @@ msgstr "Ваша інсталяція містить тип даних \"jsonb\"
 "тому цей кластер наразі не може бути оновлений.\n"
 "Ви можете видалити проблемні стовпці та перезапустити оновлення.\n"
 
-#: check.c:272
+#: check.c:273
 msgid "Checking for removed \"abstime\" data type in user tables"
 msgstr "Перевірка видаленого типу даних \"abstime\" в користувацьких таблицях"
 
-#: check.c:277
+#: check.c:278
 msgid "Your installation contains the \"abstime\" data type in user tables.\n"
 "The \"abstime\" type has been removed in PostgreSQL version 12,\n"
 "so this cluster cannot currently be upgraded.  You can drop the\n"
@@ -169,11 +169,11 @@ msgstr "Користувацькі таблиці у вашій інсталяц
 "стовпці або змінити їх на інший тип даних, і перезапустити\n"
 "оновлення.\n"
 
-#: check.c:285
+#: check.c:286
 msgid "Checking for removed \"reltime\" data type in user tables"
 msgstr "Перевірка видаленого типу даних \"reltime\" в користувацьких таблицях"
 
-#: check.c:290
+#: check.c:291
 msgid "Your installation contains the \"reltime\" data type in user tables.\n"
 "The \"reltime\" type has been removed in PostgreSQL version 12,\n"
 "so this cluster cannot currently be upgraded.  You can drop the\n"
@@ -185,11 +185,11 @@ msgstr "Користувацькі таблиці у вашій інсталяц
 "стовпці або змінити їх на інший тип даних, і перезапустити\n"
 "оновлення.\n"
 
-#: check.c:298
+#: check.c:299
 msgid "Checking for removed \"tinterval\" data type in user tables"
 msgstr "Перевірка видаленого типу даних \"tinterval\" в користувацьких таблицях"
 
-#: check.c:303
+#: check.c:304
 msgid "Your installation contains the \"tinterval\" data type in user tables.\n"
 "The \"tinterval\" type has been removed in PostgreSQL version 12,\n"
 "so this cluster cannot currently be upgraded.  You can drop the\n"
@@ -201,55 +201,60 @@ msgstr "Користувацькі таблиці у вашій інсталяц
 "стовпці або змінити їх на інший тип даних, і перезапустити\n"
 "оновлення.\n"
 
-#: check.c:345
+#: check.c:422
 #, c-format
-msgid "Checking data type usage"
-msgstr "Перевірка використання типів даних"
+msgid "failed check: %s"
+msgstr "невдала перевірка: %s"
 
-#: check.c:480
-#, c-format
-msgid "    failed check: %s"
-msgstr "    помилка перевірки: %s"
-
-#: check.c:483
+#: check.c:425
 msgid "A list of the problem columns is in the file:"
 msgstr "Список проблемних стовпців знаходиться у файлі:"
 
-#: check.c:495 check.c:963 check.c:1136 check.c:1251 check.c:1345 check.c:1473
-#: check.c:1549 check.c:1613 check.c:1686 check.c:1865 check.c:1884
-#: check.c:1953 check.c:2005 file.c:378 file.c:415 function.c:189 option.c:493
-#: version.c:79 version.c:177
+#: check.c:431 check.c:1038 check.c:1189 check.c:1272 check.c:1361 check.c:1452
+#: check.c:1584 check.c:1656 check.c:1757 check.c:1804 check.c:1884
+#: check.c:2194 check.c:2213 check.c:2259 check.c:2312 file.c:378 file.c:415
+#: function.c:208 option.c:519 version.c:79 version.c:162
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: check.c:522
+#: check.c:473
+#, c-format
+msgid "Checking data type usage"
+msgstr "Перевірка використання типів даних"
+
+#: check.c:527
 #, c-format
 msgid "Data type checks failed: %s"
 msgstr "Помилка перевірки типів даних: %s"
 
-#: check.c:563
+#: check.c:576
 #, c-format
 msgid "Performing Consistency Checks on Old Live Server\n"
 "------------------------------------------------"
 msgstr "Перевірка цілістності на старому працюючому сервері\n"
 "------------------------------------------------"
 
-#: check.c:569
+#: check.c:582
 #, c-format
 msgid "Performing Consistency Checks\n"
 "-----------------------------"
 msgstr "Проведення перевірок цілістності\n"
 "-----------------------------"
 
-#: check.c:718
+#: check.c:754
+#, c-format
+msgid "Swap mode can only upgrade clusters from PostgreSQL version %s and later."
+msgstr "Режим заміни може оновлювати лише кластери з PostgreSQL версії %s та новіші."
+
+#: check.c:777
 #, c-format
 msgid "\n"
 "*Clusters are compatible*"
 msgstr "\n"
 "*Кластери сумісні*"
 
-#: check.c:726
+#: check.c:785
 #, c-format
 msgid "\n"
 "If pg_upgrade fails after this point, you must re-initdb the\n"
@@ -258,23 +263,25 @@ msgstr "\n"
 "Якщо робота pg_upgrade після цієї точки перерветься, вам потрібно буде заново виконати initdb \n"
 "для нового кластера, перед продовженням."
 
-#: check.c:767
+#: check.c:826
 #, c-format
-msgid "Optimizer statistics are not transferred by pg_upgrade.\n"
-"Once you start the new server, consider running:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
-msgstr "Статистика оптимізатора не передається за допомогою pg_upgrade.\n"
-"Після запуску нового серверу розгляньте можливість запуску:\n"
-"    %s/vacuumdb %s--all --analyze-in-stages"
+msgid "Some statistics are not transferred by pg_upgrade.\n"
+"Once you start the new server, consider running these two commands:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
+msgstr "Деякі статистики не переносяться за допомогою pg_upgrade.\n"
+"Після запуску нового серверу розгляньте можливість виконання цих двох команд:\n"
+"    %s/vacuumdb %s--all --analyze-in-stages --missing-stats-only\n"
+"    %s/vacuumdb %s--all --analyze-only"
 
-#: check.c:773
+#: check.c:835
 #, c-format
 msgid "Running this script will delete the old cluster's data files:\n"
 "    %s"
 msgstr "При запуску цього скрипту файли даних старого кластера будуть видалені:\n"
 "    %s"
 
-#: check.c:778
+#: check.c:840
 #, c-format
 msgid "Could not create a script to delete the old cluster's data files\n"
 "because user-defined tablespaces or the new cluster's data directory\n"
@@ -285,154 +292,160 @@ msgstr "Не вдалося створити скрипт для видален
 "простори або каталог даних нового кластера. Вміст старого кластера\n"
 "треба буде видалити вручну."
 
-#: check.c:790
+#: check.c:852
 #, c-format
 msgid "Checking cluster versions"
 msgstr "Перевірка версій кластерів"
 
-#: check.c:802
+#: check.c:864
 #, c-format
 msgid "This utility can only upgrade from PostgreSQL version %s and later."
 msgstr "Ця утиліта може виконувати оновлення тільки з версії PostgreSQL %s і новіше."
 
-#: check.c:807
+#: check.c:869
 #, c-format
 msgid "This utility can only upgrade to PostgreSQL version %s."
 msgstr "Ця утиліта може тільки підвищувати версію PostgreSQL до версії %s."
 
-#: check.c:816
+#: check.c:878
 #, c-format
 msgid "This utility cannot be used to downgrade to older major PostgreSQL versions."
 msgstr "Ця утиліта не може використовуватись для пониження версії до більш старих основних версій PostgreSQL."
 
-#: check.c:821
+#: check.c:883
 #, c-format
 msgid "Old cluster data and binary directories are from different major versions."
 msgstr "Каталог даних і двійковий каталог старого кластера з різних основних версій."
 
-#: check.c:824
+#: check.c:886
 #, c-format
 msgid "New cluster data and binary directories are from different major versions."
 msgstr "Каталог даних нового кластера і двійковий каталог з різних основних версій."
 
-#: check.c:839
+#: check.c:897
+#, c-format
+msgid "The option %s cannot be used for upgrades from PostgreSQL %s and later."
+msgstr "Параметр %s не може використовуватися для оновлень з PostgreSQL %s та новіших."
+
+#: check.c:913
 #, c-format
 msgid "When checking a live server, the old and new port numbers must be different."
 msgstr "Для перевірки працюючого сервера, старий і новий номер порта повинні бути різними."
 
-#: check.c:859
+#: check.c:933
 #, c-format
 msgid "New cluster database \"%s\" is not empty: found relation \"%s.%s\""
 msgstr "Новий кластер бази даних \"%s\" не порожній: знайдено відношення \"%s.%s\""
 
-#: check.c:882
+#: check.c:956
 #, c-format
 msgid "Checking for new cluster tablespace directories"
 msgstr "Перевірка каталогів табличних просторів кластера"
 
-#: check.c:893
+#: check.c:967
 #, c-format
 msgid "new cluster tablespace directory already exists: \"%s\""
 msgstr "каталог нового кластерного табличного простору вже існує: \"%s\""
 
-#: check.c:926
+#: check.c:1001
 #, c-format
 msgid "\n"
 "WARNING:  new data directory should not be inside the old data directory, i.e. %s"
 msgstr "\n"
 "ПОПЕРЕДЖЕННЯ: новий каталог даних не повинен бути всередині старого каталогу даних, наприклад %s"
 
-#: check.c:950
+#: check.c:1025
 #, c-format
 msgid "\n"
 "WARNING:  user-defined tablespace locations should not be inside the data directory, i.e. %s"
 msgstr "\n"
 "ПОПЕРЕДЖЕННЯ: користувацькі розташування табличних просторів не повинні бути всередині каталогу даних, наприклад %s"
 
-#: check.c:960
+#: check.c:1035
 #, c-format
 msgid "Creating script to delete old cluster"
 msgstr "Створення скрипту для видалення старого кластеру"
 
-#: check.c:1014
+#: check.c:1063
 #, c-format
 msgid "could not add execute permission to file \"%s\": %m"
 msgstr "не вдалося додати право виконання для файлу \"%s\": %m"
 
-#: check.c:1034
+#: check.c:1083
 #, c-format
 msgid "Checking database user is the install user"
 msgstr "Перевірка, чи є користувач бази даних стартовим користувачем"
 
-#: check.c:1050
+#: check.c:1099
 #, c-format
 msgid "database user \"%s\" is not the install user"
 msgstr "користувач бази даних \"%s\" не є стартовим користувачем"
 
-#: check.c:1061
+#: check.c:1110
 #, c-format
 msgid "could not determine the number of users"
 msgstr "не вдалося визначити кількість користувачів"
 
-#: check.c:1069
+#: check.c:1118
 #, c-format
 msgid "Only the install user can be defined in the new cluster."
 msgstr "В новому кластері може бути визначеним тільки стартовий користувач."
 
-#: check.c:1098
+#: check.c:1148
 #, c-format
 msgid "Checking database connection settings"
 msgstr "Перевірка параметрів підключення до бази даних"
 
-#: check.c:1124
+#: check.c:1176
 #, c-format
 msgid "template0 must not allow connections, i.e. its pg_database.datallowconn must be false"
 msgstr "template0 не повинна дозволяти підключення, тобто pg_database.datallowconn повинно бути false"
 
-#: check.c:1150 check.c:1270 check.c:1367 check.c:1492 check.c:1568
-#: check.c:1626 check.c:1706 check.c:1897 check.c:2022 function.c:210
+#: check.c:1203 check.c:1324 check.c:1420 check.c:1548 check.c:1624
+#: check.c:1710 check.c:1770 check.c:1853 check.c:2226 check.c:2368
+#: function.c:229
 #, c-format
 msgid "fatal"
 msgstr "збій"
 
-#: check.c:1151
+#: check.c:1204
 #, c-format
 msgid "All non-template0 databases must allow connections, i.e. their\n"
-"pg_database.datallowconn must be true.  Your installation contains\n"
-"non-template0 databases with their pg_database.datallowconn set to\n"
-"false.  Consider allowing connection for all non-template0 databases\n"
-"or drop the databases which do not allow connections.  A list of\n"
-"databases with the problem is in the file:\n"
+"pg_database.datallowconn must be true and pg_database.datconnlimit\n"
+"must not be -2.  Your installation contains non-template0 databases\n"
+"which cannot be connected to.  Consider allowing connection for all\n"
+"non-template0 databases or drop the databases which do not allow\n"
+"connections.  A list of databases with the problem is in the file:\n"
 "    %s"
-msgstr "Всі бази даних, окрім template0, повинні дозволяти підключення, тобто\n"
-"pg_database.datallowconn повинно бути true. Ваша інсталяція містить\n"
-"бази даних окрім template0 значення pg_database.datallowconn яких дорівнює \n"
-"false. Розгляньте можливість надати дозвіл на з’єднання для всіх баз даних, \n"
-"які не є шаблоном, або видалити баз даних, які не дозволяють з’єднання. \n"
-"Список баз даних з проблемою знаходиться у файлі:\n"
+msgstr "Всі бази даних, крім template0, повинні дозволяти з'єднання, тобто\n"
+"їх pg_database.datallowconn має бути true, а pg_database.datconnlimit\n"
+"не повинен бути -2. Ваша інсталяція містить бази даних, що не є template0,\n"
+"до яких неможливо приєднатися. Розгляньте можливість дозволу з'єднань\n"
+"для всіх баз даних, що не є template0, або видаліть бази даних, які не\n"
+"дозволяють з'єднання. Список баз даних з цією проблемою знаходиться у файлі:\n"
 "    %s"
 
-#: check.c:1176
+#: check.c:1229
 #, c-format
 msgid "Checking for prepared transactions"
 msgstr "Перевірка підготовлених транзакцій"
 
-#: check.c:1185
+#: check.c:1238
 #, c-format
 msgid "The source cluster contains prepared transactions"
 msgstr "Початковий кластер містить підготовлені транзакції"
 
-#: check.c:1187
+#: check.c:1240
 #, c-format
 msgid "The target cluster contains prepared transactions"
 msgstr "Цільовий кластер містить підготовлені транзакції"
 
-#: check.c:1212
+#: check.c:1300
 #, c-format
 msgid "Checking for contrib/isn with bigint-passing mismatch"
 msgstr "Перевірка невідповідності при передаванні bigint в contrib/isn"
 
-#: check.c:1271
+#: check.c:1325
 #, c-format
 msgid "Your installation contains \"contrib/isn\" functions which rely on the\n"
 "bigint data type.  Your old and new clusters pass bigint values\n"
@@ -444,12 +457,12 @@ msgid "Your installation contains \"contrib/isn\" functions which rely on the\n"
 msgstr "Ваша інсталяція містить функції \"contrib/isn\", що використовують тип даних bigint. Старі та нові кластери передають значення bigint по-різному, тому цей кластер наразі неможливо оновити. Ви можете вручну вивантажити бази даних зі старого кластеру, що використовує засоби \"contrib/isn\", видалити їх, виконати оновлення, а потім відновити їх. Список проблемних функцій подано у файлі:\n"
 "    %s"
 
-#: check.c:1293
+#: check.c:1405
 #, c-format
 msgid "Checking for user-defined postfix operators"
 msgstr "Перевірка постфіксних операторів визначених користувачем"
 
-#: check.c:1368
+#: check.c:1421
 #, c-format
 msgid "Your installation contains user-defined postfix operators, which are not\n"
 "supported anymore.  Consider dropping the postfix operators and replacing\n"
@@ -461,12 +474,12 @@ msgstr "Ваша інсталяція містить користувацькі
 "Список користувацьких постфіксних операторів знаходиться у файлі:\n"
 "    %s"
 
-#: check.c:1392
+#: check.c:1476
 #, c-format
 msgid "Checking for incompatible polymorphic functions"
 msgstr "Перевірка несумісних поліморфних функцій"
 
-#: check.c:1493
+#: check.c:1549
 #, c-format
 msgid "Your installation contains user-defined objects that refer to internal\n"
 "polymorphic functions with arguments of type \"anyarray\" or \"anyelement\".\n"
@@ -483,12 +496,12 @@ msgstr "У вашій інсталяції містяться користува
 "Список проблемних об'єктів знаходиться у файлі:\n"
 "    %s"
 
-#: check.c:1517
+#: check.c:1609
 #, c-format
 msgid "Checking for tables WITH OIDS"
 msgstr "Перевірка таблиць WITH OIDS"
 
-#: check.c:1569
+#: check.c:1625
 #, c-format
 msgid "Your installation contains tables declared WITH OIDS, which is not\n"
 "supported anymore.  Consider removing the oid column using\n"
@@ -500,12 +513,33 @@ msgstr "Ваша інсталяція містить таблиці, створ
 "Список проблемних таблиць подано у файлі:\n"
 "    %s"
 
-#: check.c:1596
+#: check.c:1684
+#, c-format
+msgid "Checking for not-null constraint inconsistencies"
+msgstr "Перевірка невідповідності обмеженням-null"
+
+#: check.c:1711
+#, c-format
+msgid "Your installation contains inconsistent NOT NULL constraints.\n"
+"If the parent column(s) are NOT NULL, then the child column must\n"
+"also be marked NOT NULL, or the upgrade will fail.\n"
+"You can fix this by running\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"on each column listed in the file:\n"
+"    %s"
+msgstr "Ваша інсталяція містить суперечливі обмеження NOT NULL.\n"
+"Якщо батьківські стовпці мають значення NOT NULL, то дочірні стовпці також повинні бути позначені як NOT NULL, інакше оновлення не відбудеться.\n"
+"Ви можете виправити це, виконавши команду\n"
+"    ALTER TABLE tablename ALTER column SET NOT NULL;\n"
+"для кожного стовпця, зазначеного у файлі:\n"
+"    %s"
+
+#: check.c:1740
 #, c-format
 msgid "Checking for roles starting with \"pg_\""
 msgstr "Перевірка ролей, які починаються з \"pg_\""
 
-#: check.c:1627
+#: check.c:1771
 #, c-format
 msgid "Your installation contains roles starting with \"pg_\".\n"
 "\"pg_\" is a reserved prefix for system roles.  The cluster\n"
@@ -518,12 +552,12 @@ msgstr "Ваша інсталяція містить ролі, які почин
 "Список ролей, які починаються з \"pg_\" у файлі:\n"
 "    %s"
 
-#: check.c:1647
+#: check.c:1825
 #, c-format
 msgid "Checking for user-defined encoding conversions"
 msgstr "Перевірка користувацьких перетворення кодувань"
 
-#: check.c:1707
+#: check.c:1854
 #, c-format
 msgid "Your installation contains user-defined encoding conversions.\n"
 "The conversion function parameters changed in PostgreSQL version 14\n"
@@ -538,52 +572,71 @@ msgstr "Ваша інсталяція містить користувацькі
 "Список перетворень кодувань знаходиться у файлі:\n"
 "    %s"
 
-#: check.c:1746
+#: check.c:1939
+#, c-format
+msgid "Checking for objects affected by Unicode update"
+msgstr "Перевірка об'єктів, що можуть бути зачеплені оновленням Unicode"
+
+#: check.c:2038 version.c:121
+#, c-format
+msgid "warning"
+msgstr "попередження"
+
+#: check.c:2039
+#, c-format
+msgid "Your installation contains relations that might be affected by a new version of Unicode.\n"
+"A list of potentially-affected relations is in the file:\n"
+"    %s"
+msgstr "Ваша інсталяція містить відношення, які можуть бути зачеплені новою версією Unicode.\n"
+"Список потенційно зачеплених відношень знаходиться у файлі:\n"
+"    %s"
+
+#: check.c:2075
 #, c-format
 msgid "Checking for new cluster logical replication slots"
 msgstr "Перевірка наявності нових слотів логічної реплікації кластера"
 
-#: check.c:1754
+#: check.c:2083
 #, c-format
 msgid "could not count the number of logical replication slots"
 msgstr "не вдалося порахувати кількість слотів логічної реплікації"
 
-#: check.c:1759
+#: check.c:2088
 #, c-format
 msgid "expected 0 logical replication slots but found %d"
 msgstr "очікувалося 0 слотів логічної реплікації, але знайдено %d"
 
-#: check.c:1769 check.c:1820
+#: check.c:2098 check.c:2149
 #, c-format
 msgid "could not determine parameter settings on new cluster"
 msgstr "не вдалося визначити налаштування параметрів на новому кластері"
 
-#: check.c:1774
+#: check.c:2103
 #, c-format
 msgid "\"wal_level\" must be \"logical\" but is set to \"%s\""
 msgstr "\"wal_level\" має бути \"logical\", але встановлено значення \"%s\""
 
-#: check.c:1780
+#: check.c:2109
 #, c-format
 msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of logical replication slots (%d) on the old cluster"
 msgstr "\"max_replication_slots\" (%d) має бути більше або дорівнювати кількості слотів логічної реплікації (%d) на старому кластері"
 
-#: check.c:1812
+#: check.c:2141
 #, c-format
 msgid "Checking for new cluster configuration for subscriptions"
 msgstr "Перевірка нової конфігурації кластера для підписок"
 
-#: check.c:1824
+#: check.c:2153
 #, c-format
-msgid "\"max_replication_slots\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
-msgstr "\"max_replication_slots\" (%d) має бути більше або дорівнювати кількості підписок (%d) на старому кластері"
+msgid "\"max_active_replication_origins\" (%d) must be greater than or equal to the number of subscriptions (%d) on the old cluster"
+msgstr "\"max_active_replication_origins\" (%d) має бути більше або дорівнювати кількості підписок (%d) на старому кластері"
 
-#: check.c:1846
+#: check.c:2175
 #, c-format
 msgid "Checking for valid logical replication slots"
 msgstr "Перевірка дійсних слотів логічної реплікації"
 
-#: check.c:1898
+#: check.c:2227
 #, c-format
 msgid "Your installation contains logical replication slots that cannot be upgraded.\n"
 "You can remove invalid slots and/or consume the pending WAL for other slots,\n"
@@ -596,12 +649,12 @@ msgstr "Ваша інсталяція містить слоти логічної
 "Список проблемних слотів знаходиться у файлі:\n"
 "    %s"
 
-#: check.c:1922
+#: check.c:2287
 #, c-format
 msgid "Checking for subscription state"
 msgstr "Перевірка стану підписки"
 
-#: check.c:2023
+#: check.c:2369
 #, c-format
 msgid "Your installation contains subscriptions without origin or having relations not in i (initialize) or r (ready) state.\n"
 "You can allow the initial sync to finish for all relations and then restart the upgrade.\n"
@@ -612,272 +665,293 @@ msgstr "У вашій інсталяції є підписки, які не ма
 "Список проблемних підписок знаходиться у файлі:\n"
 "    %s"
 
-#: controldata.c:129 controldata.c:199
+#: controldata.c:133 controldata.c:203
 #, c-format
 msgid "could not get control data using %s: %m"
 msgstr "не вдалося отримати контрольні дані за допомогою %s: %m"
 
-#: controldata.c:139
+#: controldata.c:143
 #, c-format
 msgid "%d: database cluster state problem"
 msgstr "%d: неприпустимий стан кластера баз даних"
 
-#: controldata.c:158
+#: controldata.c:162
 #, c-format
 msgid "The source cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "Початковий кластер завершив роботу в режимі відновлення. Щоб виконати оновлення, використайте документований спосіб з \"rsync\" або вимкніть його в режимі головного серверу."
 
-#: controldata.c:160
+#: controldata.c:164
 #, c-format
 msgid "The target cluster was shut down while in recovery mode.  To upgrade, use \"rsync\" as documented or shut it down as a primary."
 msgstr "Цільовий кластер завершив роботу в режимі відновлення. Щоб виконати оновлення, використайте документований спосіб з \"rsync\" або вимкніть його в режимі головного серверу."
 
-#: controldata.c:165
+#: controldata.c:169
 #, c-format
 msgid "The source cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "Кластер джерел не був вимкнений повністю, про що повідомлялося у звітах стану: \"%s\""
 
-#: controldata.c:167
+#: controldata.c:171
 #, c-format
 msgid "The target cluster was not shut down cleanly, state reported as: \"%s\""
 msgstr "Цільовий кластер не був закритий \"чисто\", про що повідомив стан: \"%s\""
 
-#: controldata.c:175 controldata.c:507
+#: controldata.c:179 controldata.c:530
 #, c-format
 msgid "could not get control data using %s: %s"
 msgstr "не вдалося отримати контрольні дані за допомогою %s: %s"
 
-#: controldata.c:181
+#: controldata.c:185
 #, c-format
 msgid "The source cluster lacks cluster state information:"
 msgstr "В початковому кластері відсутня інформація про стан кластера:"
 
-#: controldata.c:183
+#: controldata.c:187
 #, c-format
 msgid "The target cluster lacks cluster state information:"
 msgstr "В цільовому кластері відсутня інформація про стан кластера:"
 
-#: controldata.c:213 dump.c:50 exec.c:118 pg_upgrade.c:556 pg_upgrade.c:596
-#: pg_upgrade.c:945 relfilenumber.c:233 server.c:34 util.c:337
+#: controldata.c:217 dump.c:50 exec.c:118 pg_upgrade.c:606 pg_upgrade.c:646
+#: pg_upgrade.c:995 relfilenumber.c:610 server.c:34 util.c:337
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: controldata.c:220
+#: controldata.c:224
 #, c-format
 msgid "%d: pg_resetwal problem"
 msgstr "%d: проблема pg_resetwal"
 
-#: controldata.c:230 controldata.c:240 controldata.c:251 controldata.c:262
-#: controldata.c:273 controldata.c:292 controldata.c:303 controldata.c:314
-#: controldata.c:325 controldata.c:336 controldata.c:347 controldata.c:358
-#: controldata.c:361 controldata.c:365 controldata.c:375 controldata.c:387
-#: controldata.c:398 controldata.c:409 controldata.c:420 controldata.c:431
-#: controldata.c:442 controldata.c:453 controldata.c:464 controldata.c:475
-#: controldata.c:486 controldata.c:497
+#: controldata.c:234 controldata.c:244 controldata.c:255 controldata.c:266
+#: controldata.c:277 controldata.c:296 controldata.c:307 controldata.c:318
+#: controldata.c:329 controldata.c:340 controldata.c:351 controldata.c:362
+#: controldata.c:365 controldata.c:369 controldata.c:379 controldata.c:391
+#: controldata.c:402 controldata.c:413 controldata.c:424 controldata.c:435
+#: controldata.c:446 controldata.c:457 controldata.c:468 controldata.c:479
+#: controldata.c:490 controldata.c:501 controldata.c:512 controldata.c:521
 #, c-format
 msgid "%d: controldata retrieval problem"
 msgstr "%d: проблема з отриманням контрольних даних"
 
-#: controldata.c:578
+#: controldata.c:618
 #, c-format
 msgid "The source cluster lacks some required control information:"
 msgstr "У початковому кластері відсутня необхідна контрольна інформація:"
 
-#: controldata.c:581
+#: controldata.c:621
 #, c-format
 msgid "The target cluster lacks some required control information:"
 msgstr "У цільовому кластері відсутня необхідна контрольна інформація:"
 
-#: controldata.c:584
+#: controldata.c:624
 #, c-format
 msgid "  checkpoint next XID"
 msgstr "  наступний XID контрольної точки"
 
-#: controldata.c:587
+#: controldata.c:627
 #, c-format
 msgid "  latest checkpoint next OID"
 msgstr "  наступний OID останньої контрольної точки"
 
-#: controldata.c:590
+#: controldata.c:630
 #, c-format
 msgid "  latest checkpoint next MultiXactId"
 msgstr "  наступний MultiXactId останньої контрольної точки"
 
-#: controldata.c:594
+#: controldata.c:634
 #, c-format
 msgid "  latest checkpoint oldest MultiXactId"
 msgstr "  найстарший MultiXactId останньої контрольної точки"
 
-#: controldata.c:597
+#: controldata.c:637
 #, c-format
 msgid "  latest checkpoint oldestXID"
 msgstr "  найстарший oldestXID останньої контрольної точки"
 
-#: controldata.c:600
+#: controldata.c:640
 #, c-format
 msgid "  latest checkpoint next MultiXactOffset"
 msgstr "  наступний MultiXactOffset останньої контрольної точки"
 
-#: controldata.c:603
+#: controldata.c:643
 #, c-format
 msgid "  first WAL segment after reset"
 msgstr "  перший сегмет WAL після скидання"
 
-#: controldata.c:606
+#: controldata.c:646
 #, c-format
 msgid "  float8 argument passing method"
 msgstr "  метод передачі аргументу float8"
 
-#: controldata.c:609
+#: controldata.c:649
 #, c-format
 msgid "  maximum alignment"
 msgstr "  максимальне вирівнювання"
 
-#: controldata.c:612
+#: controldata.c:652
 #, c-format
 msgid "  block size"
 msgstr "  розмір блоку"
 
-#: controldata.c:615
+#: controldata.c:655
 #, c-format
 msgid "  large relation segment size"
 msgstr "  розмір сегменту великого відношення"
 
-#: controldata.c:618
+#: controldata.c:658
 #, c-format
 msgid "  WAL block size"
 msgstr "  розмір блоку WAL"
 
-#: controldata.c:621
+#: controldata.c:661
 #, c-format
 msgid "  WAL segment size"
 msgstr "  розмір сегменту WAL"
 
-#: controldata.c:624
+#: controldata.c:664
 #, c-format
 msgid "  maximum identifier length"
 msgstr "  максимальна довжина ідентифікатора"
 
-#: controldata.c:627
+#: controldata.c:667
 #, c-format
 msgid "  maximum number of indexed columns"
 msgstr "  максимальна кількість індексованих стовпців"
 
-#: controldata.c:630
+#: controldata.c:670
 #, c-format
 msgid "  maximum TOAST chunk size"
 msgstr "  максимальний розмір порції TOAST"
 
-#: controldata.c:634
+#: controldata.c:674
 #, c-format
 msgid "  large-object chunk size"
 msgstr "  розмір порції великого об'єкту"
 
-#: controldata.c:637
+#: controldata.c:677
 #, c-format
 msgid "  dates/times are integers?"
 msgstr "  дата/час представлені цілими числами?"
 
-#: controldata.c:641
+#: controldata.c:681
 #, c-format
 msgid "  data checksum version"
 msgstr "  версія контрольних сум даних"
 
-#: controldata.c:643
+#: controldata.c:685
+#, c-format
+msgid "  default char signedness"
+msgstr "  знаковість символів за замовчуванням"
+
+#: controldata.c:687
 #, c-format
 msgid "Cannot continue without required control information, terminating"
 msgstr "Не можна продовжити без необхідної контрольної інформації, завершення"
 
-#: controldata.c:658
+#: controldata.c:702
 #, c-format
 msgid "old and new pg_controldata alignments are invalid or do not match.\n"
 "Likely one cluster is a 32-bit install, the other 64-bit"
 msgstr "старе і нове вирівнювання в pg_controldata неприпустимі або не збігаються\n"
 "Ймовірно, один кластер встановлений у 32-бітній системі, а інший - у 64-бітній"
 
-#: controldata.c:662
+#: controldata.c:706
 #, c-format
 msgid "old and new pg_controldata block sizes are invalid or do not match"
 msgstr "старий і новий розмір блоків в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:665
+#: controldata.c:709
 #, c-format
 msgid "old and new pg_controldata maximum relation segment sizes are invalid or do not match"
 msgstr "старий і новий максимальний розмір сегментів відношень в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:668
+#: controldata.c:712
 #, c-format
 msgid "old and new pg_controldata WAL block sizes are invalid or do not match"
 msgstr "старий і новий розмір блоків WAL в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:671
+#: controldata.c:715
 #, c-format
 msgid "old and new pg_controldata WAL segment sizes are invalid or do not match"
 msgstr "старий і новий розмір сегментів WAL в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:674
+#: controldata.c:718
 #, c-format
 msgid "old and new pg_controldata maximum identifier lengths are invalid or do not match"
 msgstr "стара і нова максимальна довжина ідентифікаторів в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:677
+#: controldata.c:721
 #, c-format
 msgid "old and new pg_controldata maximum indexed columns are invalid or do not match"
 msgstr "стара і нова максимальна кількість індексованих стовпців в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:680
+#: controldata.c:724
 #, c-format
 msgid "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not match"
 msgstr "старий і новий максимальний розмір порції TOAST в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:685
+#: controldata.c:729
 #, c-format
 msgid "old and new pg_controldata large-object chunk sizes are invalid or do not match"
 msgstr "старий і новий розмір порції великого об'єкту в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:688
+#: controldata.c:732
 #, c-format
 msgid "old and new pg_controldata date/time storage types do not match"
 msgstr "старий і новий тип сховища дати/часу в pg_controldata неприпустимі або не збігаються"
 
-#: controldata.c:701
+#: controldata.c:745
 #, c-format
 msgid "old cluster does not use data checksums but the new one does"
 msgstr "старий кластер не використовує контрольні суми даних, але новий використовує"
 
-#: controldata.c:704
+#: controldata.c:748
 #, c-format
 msgid "old cluster uses data checksums but the new one does not"
 msgstr "старий кластер використовує контрольні суми даних, але новий не використовує"
 
-#: controldata.c:706
+#: controldata.c:750
 #, c-format
 msgid "old and new cluster pg_controldata checksum versions do not match"
 msgstr "стара і нова версія контрольних сум кластера в pg_controldata не збігаються"
 
-#: controldata.c:717
+#. translator: %s is the file path of the control file
+#: controldata.c:762
 #, c-format
-msgid "Adding \".old\" suffix to old global/pg_control"
-msgstr "Додавання суфікса \".old\" до старого файла global/pg_control"
+msgid "Adding \".old\" suffix to old \"%s\""
+msgstr "Додавання суфікса \".old\" до старого \"%s\""
 
-#: controldata.c:722
+#: controldata.c:767 relfilenumber.c:393 relfilenumber.c:420
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
 
-#: controldata.c:726
+#. translator: %s/%s is the file path of the control file
+#: controldata.c:773
 #, c-format
 msgid "\n"
 "If you want to start the old cluster, you will need to remove\n"
-"the \".old\" suffix from %s/global/pg_control.old.\n"
+"the \".old\" suffix from \"%s/%s.old\".\n"
 "Because \"link\" mode was used, the old cluster cannot be safely\n"
 "started once the new cluster has been started."
 msgstr "\n"
-"Якщо ви хочете запустити старий кластер, вам необхідно видалити\n"
-"суфікс \".old\" з файлу %s/global/pg_control.old. Через використання\n"
-"режиму \"link\" робота старого кластера після запуску нового може бути\n"
-"небезпечна."
+"Якщо ви хочете запустити старий кластер, вам потрібно буде видалити\n"
+"суфікс \".old\" з \"%s/%s.old\".\n"
+"Через використання режиму \"link\" старий кластер не може бути безпечно\n"
+"запущений після того, як новий кластер був запущений."
+
+#: controldata.c:780
+#, c-format
+msgid "\n"
+"Because \"swap\" mode was used, the old cluster can no longer be\n"
+"safely started."
+msgstr "\n"
+"Через використання режиму \"swap\" старий кластер більше не може бути\n"
+"безпечно запущений."
+
+#: controldata.c:784 file.c:455
+#, c-format
+msgid "unrecognized transfer mode"
+msgstr "нерозпізнаний режим передачі"
 
 #: dump.c:20
 #, c-format
@@ -909,7 +983,7 @@ msgstr "не вдалося отримати версію pg_ctl з резуль
 msgid "command too long"
 msgstr "команда занадто довга"
 
-#: exec.c:160 pg_upgrade.c:311
+#: exec.c:160 pg_upgrade.c:315
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не вдалося відкрити файл журналу \"%s\": %m"
@@ -940,7 +1014,7 @@ msgid "Consult the last few lines of \"%s\" for\n"
 msgstr "Щоб зрозуміти причину неполадки, зверніться до декількох останніх рядків\n"
 "файлу \"%s\"."
 
-#: exec.c:218 pg_upgrade.c:321
+#: exec.c:218 pg_upgrade.c:325
 #, c-format
 msgid "could not write to log file \"%s\": %m"
 msgstr "не вдалося записати до файлу журналу \"%s\": %m"
@@ -1065,29 +1139,36 @@ msgstr "не вдалося скопіювати діапазон файлу м
 msgid "copy_file_range not supported on this platform"
 msgstr "copy_file_range не підтримується на цій платформі"
 
-#: file.c:447
+#: file.c:449
 #, c-format
 msgid "could not create hard link between old and new data directories: %m\n"
 "In link mode the old and new data directories must be on the same file system."
 msgstr "не вдалося створити жорстке посилання між старим і новим каталогами даних: %m\n"
 "В режимі посилань старий і новий каталоги даних повинні знаходитись в одній файловій системі."
 
-#: function.c:154
+#: file.c:452
+#, c-format
+msgid "could not create hard link between old and new data directories: %m\n"
+"In swap mode the old and new data directories must be on the same file system."
+msgstr "не вдалося створити жорстке посилання між старим і новим каталогами даних: %m\n"
+"В режимі заміни старий і новий каталоги даних повинні знаходитись в одній файловій системі."
+
+#: function.c:173
 #, c-format
 msgid "Checking for presence of required libraries"
 msgstr "Перевірка наявності необхідних бібліотек"
 
-#: function.c:190
+#: function.c:209
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "не вдалося завантажити бібліотеку \"%s\": %s"
 
-#: function.c:201
+#: function.c:220
 #, c-format
 msgid "In database: %s\n"
 msgstr "У базі даних: %s\n"
 
-#: function.c:211
+#: function.c:230
 #, c-format
 msgid "Your installation references loadable libraries that are missing from the\n"
 "new installation.  You can add these libraries to the new installation,\n"
@@ -1100,278 +1181,300 @@ msgstr "У вашій інсталяції є посилання на заван
 "проблемних бібліотек подано у файлі:\n"
 "    %s"
 
-#: info.c:128
+#: info.c:131
 #, c-format
 msgid "Relation names for OID %u in database \"%s\" do not match: old name \"%s.%s\", new name \"%s.%s\""
 msgstr "Імена відношень з OID %u в базі даних \"%s\" не збігаються: старе ім'я \"%s.%s\", нове ім'я \"%s.%s\""
 
-#: info.c:148
+#: info.c:151
 #, c-format
 msgid "Failed to match up old and new tables in database \"%s\""
 msgstr "Не вдалося зіставити старі таблиці з новими в базі даних \"%s\""
 
-#: info.c:229
+#: info.c:232
 #, c-format
 msgid " which is an index on \"%s.%s\""
 msgstr " це індекс в \"%s.%s\""
 
-#: info.c:239
+#: info.c:242
 #, c-format
 msgid " which is an index on OID %u"
 msgstr " це індекс у відношенні з OID %u"
 
-#: info.c:251
+#: info.c:254
 #, c-format
 msgid " which is the TOAST table for \"%s.%s\""
 msgstr " це TOAST-таблиця для \"%s.%s\""
 
-#: info.c:259
+#: info.c:262
 #, c-format
 msgid " which is the TOAST table for OID %u"
 msgstr " це TOAST-таблиця для відношення з OID %u"
 
-#: info.c:263
+#: info.c:266
 #, c-format
 msgid "No match found in old cluster for new relation with OID %u in database \"%s\": %s"
 msgstr "У старому кластері не знайдено відповідності для нового відношення з OID %u в базі даних %s\": %s"
 
-#: info.c:266
+#: info.c:269
 #, c-format
 msgid "No match found in new cluster for old relation with OID %u in database \"%s\": %s"
 msgstr "У новому кластері не знайдено відповідності для старого відношення з OID %u в базі даних \"%s\": %s"
 
-#: info.c:300
+#: info.c:325
 #, c-format
 msgid "\n"
 "source databases:"
 msgstr "\n"
 "вихідні бази даних:"
 
-#: info.c:302
+#: info.c:327
 #, c-format
 msgid "\n"
 "target databases:"
 msgstr "\n"
 "цільові бази даних:"
 
-#: info.c:346
+#: info.c:371
 #, c-format
 msgid "template0 not found"
 msgstr "template0 не знайдено"
 
-#: info.c:805
+#: info.c:817
 #, c-format
 msgid "Database: \"%s\""
 msgstr "База даних: %s\""
 
-#: info.c:818
+#: info.c:830
 #, c-format
 msgid "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 msgstr "relname: \"%s.%s\", reloid: %u, reltblspace: \"%s\""
 
-#: info.c:832
+#: info.c:844
 #, c-format
 msgid "Logical replication slots in the database:"
 msgstr "Логічні слоти реплікації в базі даних:"
 
-#: info.c:838
+#: info.c:850
 #, c-format
 msgid "slot name: \"%s\", output plugin: \"%s\", two_phase: %s"
 msgstr "назва слоту: \"%s\", плагін виводу: \"%s\", two_phase: %s"
 
-#: option.c:105
+#: option.c:110
 #, c-format
 msgid "%s: cannot be run as root"
 msgstr "%s: не можна запустити як root"
 
-#: option.c:172
+#: option.c:177
 #, c-format
 msgid "invalid old port number"
 msgstr "неприпустимий старий номер порту"
 
-#: option.c:177
+#: option.c:182
 #, c-format
 msgid "invalid new port number"
 msgstr "неприпустимий новий номер порту"
 
-#: option.c:216
+#: option.c:230
+#, c-format
+msgid "invalid argument for option %s"
+msgstr "неприпустимий аргумент для параметру %s"
+
+#: option.c:238
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
 
-#: option.c:223
+#: option.c:245
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: option.c:229
+#: option.c:251
 #, c-format
 msgid "Running in verbose mode"
 msgstr "Виконується в детальному режимі"
 
-#: option.c:247
+#: option.c:269
 msgid "old cluster binaries reside"
 msgstr "розташування двійкових даних старого кластера"
 
-#: option.c:249
+#: option.c:271
 msgid "new cluster binaries reside"
 msgstr "розташування двійкових даних нового кластера"
 
-#: option.c:251
+#: option.c:273
 msgid "old cluster data resides"
 msgstr "розташування даних старого кластера"
 
-#: option.c:253
+#: option.c:275
 msgid "new cluster data resides"
 msgstr "розташування даних нового кластера"
 
-#: option.c:255
+#: option.c:277
 msgid "sockets will be created"
 msgstr "сокети будуть створені"
 
-#: option.c:272 option.c:374
+#: option.c:294 option.c:400
 #, c-format
 msgid "could not determine current directory"
 msgstr "не вдалося визначити поточний каталог"
 
-#: option.c:275
+#: option.c:297
 #, c-format
 msgid "cannot run pg_upgrade from inside the new cluster data directory on Windows"
 msgstr "у Windows не можна виконати pg_upgrade всередині каталогу даних нового кластера"
 
-#: option.c:284
+#: option.c:306
 #, c-format
 msgid "pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\n"
 msgstr "pg_upgrade оновлює кластер PostgreSQL до іншої основної версії.\n\n"
 
-#: option.c:285
+#: option.c:307
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: option.c:286
+#: option.c:308
 #, c-format
 msgid "  pg_upgrade [OPTION]...\n\n"
 msgstr "  pg_upgrade [OPTION]...\n\n"
 
-#: option.c:287
+#: option.c:309
 #, c-format
 msgid "Options:\n"
 msgstr "Параметри:\n"
 
-#: option.c:288
+#: option.c:310
 #, c-format
 msgid "  -b, --old-bindir=BINDIR       old cluster executable directory\n"
 msgstr "  -b, --old-bindir=BINDIR       каталог виконуваних файлів старого кластера\n"
 
-#: option.c:289
+#: option.c:311
 #, c-format
 msgid "  -B, --new-bindir=BINDIR       new cluster executable directory (default\n"
 "                                same directory as pg_upgrade)\n"
 msgstr "  -B, --new-bindir=BINDIR       каталог виконуваних файлів нового кластера (за замовчуванням\n"
 "                                той самий каталог, що і pg_upgrade)\n"
 
-#: option.c:291
+#: option.c:313
 #, c-format
 msgid "  -c, --check                   check clusters only, don't change any data\n"
 msgstr "  -c, --check                   тільки перевірити кластери, не змінювати ніякі дані\n"
 
-#: option.c:292
+#: option.c:314
 #, c-format
 msgid "  -d, --old-datadir=DATADIR     old cluster data directory\n"
 msgstr "  -d, --old-datadir=DATADIR     каталог даних старого кластера\n"
 
-#: option.c:293
+#: option.c:315
 #, c-format
 msgid "  -D, --new-datadir=DATADIR     new cluster data directory\n"
 msgstr "  -D, --new-datadir=DATADIR    каталог даних нового кластера\n"
 
-#: option.c:294
+#: option.c:316
 #, c-format
 msgid "  -j, --jobs=NUM                number of simultaneous processes or threads to use\n"
 msgstr "  -j, --jobs=NUM число одночасних процесів або потоків для використання\n"
 
-#: option.c:295
+#: option.c:317
 #, c-format
 msgid "  -k, --link                    link instead of copying files to new cluster\n"
 msgstr "  -k, --link                    встановлювати посилання замість копіювання файлів до нового кластера\n"
 
-#: option.c:296
+#: option.c:318
 #, c-format
 msgid "  -N, --no-sync                 do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --no-sync не чекати завершення збереження змін на диску\n"
 
-#: option.c:297
+#: option.c:319
 #, c-format
 msgid "  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"
 msgstr "  -o, --old-options=OPTIONS     параметри старого кластера, які передаються серверу\n"
 
-#: option.c:298
+#: option.c:320
 #, c-format
 msgid "  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"
 msgstr "  -O, --new-options=OPTIONS     параметри нового кластера, які передаються серверу\n"
 
-#: option.c:299
+#: option.c:321
 #, c-format
 msgid "  -p, --old-port=PORT           old cluster port number (default %d)\n"
 msgstr "  -p, --old-port=PORT           номер порту старого кластера (за замовчуванням %d)\n"
 
-#: option.c:300
+#: option.c:322
 #, c-format
 msgid "  -P, --new-port=PORT           new cluster port number (default %d)\n"
 msgstr "  -P, --new-port=PORT           номер порту нового кластера (за замовчуванням %d)\n"
 
-#: option.c:301
+#: option.c:323
 #, c-format
 msgid "  -r, --retain                  retain SQL and log files after success\n"
 msgstr "  -r, --retain                  зберегти файли журналів і SQL після успішного завершення\n"
 
-#: option.c:302
+#: option.c:324
 #, c-format
 msgid "  -s, --socketdir=DIR           socket directory to use (default current dir.)\n"
 msgstr "  -s, --socketdir=DIR           директорія сокету для використання (за замовчування поточна директорія)\n"
 
-#: option.c:303
+#: option.c:325
 #, c-format
 msgid "  -U, --username=NAME           cluster superuser (default \"%s\")\n"
 msgstr "  -U, --username=NAME           суперкористувач кластера (за замовчуванням \"%s\")\n"
 
-#: option.c:304
+#: option.c:326
 #, c-format
 msgid "  -v, --verbose                 enable verbose internal logging\n"
 msgstr "  -v, --verbose                 активувати виведення детальних внутрішніх повідомлень\n"
 
-#: option.c:305
+#: option.c:327
 #, c-format
 msgid "  -V, --version                 display version information, then exit\n"
 msgstr "  -V, --version                 відобразити інформацію про версію, потім вийти\n"
 
-#: option.c:306
+#: option.c:328
 #, c-format
 msgid "  --clone                       clone instead of copying files to new cluster\n"
 msgstr "  --clone                       клонувати замість копіювання файлів до нового кластера\n"
 
-#: option.c:307
+#: option.c:329
 #, c-format
 msgid "  --copy                        copy files to new cluster (default)\n"
 msgstr "  --copy                        копіювати файли до нового кластеру (за замовчуванням)\n"
 
-#: option.c:308
+#: option.c:330
 #, c-format
 msgid "  --copy-file-range             copy files to new cluster with copy_file_range\n"
 msgstr "  --copy-file-range             копіювати файли в новий кластер за допомогою copy_file_range\n"
 
-#: option.c:309
+#: option.c:331
+#, c-format
+msgid "  --no-statistics               do not import statistics from old cluster\n"
+msgstr "  --no-statistics               не імпортувати статистику з старого кластера\n"
+
+#: option.c:332
+#, c-format
+msgid "  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
+"                                \"unsigned\"\n"
+msgstr "  --set-char-signedness=OPTION  встановити знаковість символів нового кластера на \"signed\" або\n"
+"                                \"unsigned\"\n"
+
+#: option.c:334
+#, c-format
+msgid "  --swap                        move data directories to new cluster\n"
+msgstr "  --swap                        переміщення каталогів даних до нового кластера\n"
+
+#: option.c:335
 #, c-format
 msgid "  --sync-method=METHOD          set method for syncing files to disk\n"
 msgstr "  --sync-method=METHOD          встановити метод синхронізації файлів на диск\n"
 
-#: option.c:310
+#: option.c:336
 #, c-format
 msgid "  -?, --help                    show this help, then exit\n"
 msgstr "  -?, --help                    показати цю довідку, потім вийти\n"
 
-#: option.c:311
+#: option.c:337
 #, c-format
 msgid "\n"
 "Before running pg_upgrade you must:\n"
@@ -1384,7 +1487,7 @@ msgstr "\n"
 "  завершити процес postmaster, який обслуговує старий кластер\n"
 "  завершити процес postmaster, який обслуговує новий кластер\n"
 
-#: option.c:316
+#: option.c:342
 #, c-format
 msgid "\n"
 "When you run pg_upgrade, you must provide the following information:\n"
@@ -1399,7 +1502,7 @@ msgstr "\n"
 "  каталог \"bin\" старого кластера (-b BINDIR)\n"
 "  каталог \"bin\" нового кластера (-B BINDIR)\n"
 
-#: option.c:322
+#: option.c:348
 #, c-format
 msgid "\n"
 "For example:\n"
@@ -1410,7 +1513,7 @@ msgstr "\n"
 "  pg_upgrade -d старий_кластер/data -D новий_кластер/data -b старий_кластер/bin -B новий_кластер/bin\n"
 "або\n"
 
-#: option.c:327
+#: option.c:353
 #, c-format
 msgid "  $ export PGDATAOLD=oldCluster/data\n"
 "  $ export PGDATANEW=newCluster/data\n"
@@ -1423,7 +1526,7 @@ msgstr "  $ export PGDATAOLD=старий_кластер/data\n"
 "  $ export PGBINNEW=новий_кластер/bin\n"
 "  $ pg_upgrade\n"
 
-#: option.c:333
+#: option.c:359
 #, c-format
 msgid "  C:\\> set PGDATAOLD=oldCluster/data\n"
 "  C:\\> set PGDATANEW=newCluster/data\n"
@@ -1436,51 +1539,51 @@ msgstr "  C:\\> set PGDATAOLD=старий_кластер/data\n"
 "  C:\\> set PGBINNEW=новий_кластер/bin\n"
 "  C:\\> pg_upgrade\n"
 
-#: option.c:339
+#: option.c:365
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: option.c:340
+#: option.c:366
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: option.c:380
+#: option.c:406
 #, c-format
 msgid "You must identify the directory where the %s.\n"
 "Please use the %s command-line option or the %s environment variable."
 msgstr "Ви повинні визначити каталог, де знаходиться %s.\n"
 "Будь ласка, використайте параметр командного рядка %s або змінну середовища %s."
 
-#: option.c:433
+#: option.c:459
 #, c-format
 msgid "Finding the real data directory for the source cluster"
 msgstr "Пошук дійсного каталогу даних для початкового кластера"
 
-#: option.c:435
+#: option.c:461
 #, c-format
 msgid "Finding the real data directory for the target cluster"
 msgstr "Пошук дійсного каталогу даних для цільового кластера"
 
-#: option.c:448
+#: option.c:474
 #, c-format
 msgid "could not get data directory using %s: %m"
 msgstr "не вдалося отримати каталог даних, виконавши %s: %m"
 
-#: option.c:452
+#: option.c:478
 #, c-format
 msgid "could not get data directory using %s: %s"
 msgstr "не вдалося отримати каталог даних, виконавши %s: %s"
 
-#: option.c:500
+#: option.c:526
 #, c-format
 msgid "could not read line %d from file \"%s\": %m"
 msgstr "не вдалося прочитати рядок %d з файлу \"%s\": %m"
 
-#: option.c:517
+#: option.c:543
 #, c-format
 msgid "user-supplied old port number %hu corrected to %hu"
 msgstr "вказаний користувачем старий номер порту %hu змінений на %hu"
@@ -1495,7 +1598,7 @@ msgstr "не вдалося створити робочий процес: %m"
 msgid "could not create worker thread: %m"
 msgstr "не вдалося створити робочий потік: %m"
 
-#: parallel.c:294
+#: parallel.c:294 task.c:404
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
@@ -1510,12 +1613,12 @@ msgstr "дочірній процес завершився ненормальн
 msgid "child worker exited abnormally: %m"
 msgstr "дочірній процес завершився аварійно: %m"
 
-#: pg_upgrade.c:115
+#: pg_upgrade.c:114
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не вдалося прочитати дозволи на каталог \"%s\": %m"
 
-#: pg_upgrade.c:147
+#: pg_upgrade.c:146
 #, c-format
 msgid "\n"
 "Performing Upgrade\n"
@@ -1524,17 +1627,17 @@ msgstr "\n"
 "Виконання оновлення\n"
 "------------------"
 
-#: pg_upgrade.c:192
+#: pg_upgrade.c:194
 #, c-format
 msgid "Setting next OID for new cluster"
 msgstr "Встановлення наступного OID для нового кластера"
 
-#: pg_upgrade.c:216
+#: pg_upgrade.c:218
 #, c-format
 msgid "Sync data directory to disk"
 msgstr "Синхронізація каталогу даних на диск"
 
-#: pg_upgrade.c:230
+#: pg_upgrade.c:234
 #, c-format
 msgid "\n"
 "Upgrade Complete\n"
@@ -1543,171 +1646,222 @@ msgstr "\n"
 "Оновлення завершено\n"
 "----------------"
 
-#: pg_upgrade.c:263 pg_upgrade.c:276 pg_upgrade.c:283 pg_upgrade.c:290
-#: pg_upgrade.c:308 pg_upgrade.c:319
+#: pg_upgrade.c:267 pg_upgrade.c:280 pg_upgrade.c:287 pg_upgrade.c:294
+#: pg_upgrade.c:312 pg_upgrade.c:323
 #, c-format
 msgid "directory path for new cluster is too long"
 msgstr "шлях каталогу для нового кластеру занадто довгий"
 
-#: pg_upgrade.c:297 pg_upgrade.c:299 pg_upgrade.c:301 pg_upgrade.c:303
+#: pg_upgrade.c:301 pg_upgrade.c:303 pg_upgrade.c:305 pg_upgrade.c:307
+#: relfilenumber.c:293 relfilenumber.c:297
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не вдалося створити каталог \"%s\": %m"
 
-#: pg_upgrade.c:352
+#: pg_upgrade.c:356
 #, c-format
 msgid "%s: could not find own program executable"
 msgstr "%s: не вдалося знайти файл виконання власної програми"
 
-#: pg_upgrade.c:378
+#: pg_upgrade.c:382
 #, c-format
 msgid "There seems to be a postmaster servicing the old cluster.\n"
 "Please shutdown that postmaster and try again."
 msgstr "Мабуть, запущений процес postmaster, який обслуговує старий кластер.\n"
 "Будь ласка, завершіть роботу процесу і спробуйте знову."
 
-#: pg_upgrade.c:391
+#: pg_upgrade.c:395
 #, c-format
 msgid "There seems to be a postmaster servicing the new cluster.\n"
 "Please shutdown that postmaster and try again."
 msgstr "Мабуть, запущений процес postmaster, який обслуговує новий кластер.\n"
 "Будь ласка, завершіть роботу процесу і спробуйте знову."
 
-#: pg_upgrade.c:413
+#: pg_upgrade.c:421
+#, c-format
+msgid "Setting the default char signedness for new cluster"
+msgstr "Встановлення знаковості символів за замовчуванням для нового кластера"
+
+#: pg_upgrade.c:449
 #, c-format
 msgid "Setting locale and encoding for new cluster"
 msgstr "Установка локалі та кодування для нового кластеру"
 
-#: pg_upgrade.c:489
+#: pg_upgrade.c:527
 #, c-format
 msgid "Analyzing all rows in the new cluster"
 msgstr "Аналіз всіх рядків у новому кластері"
 
-#: pg_upgrade.c:502
+#: pg_upgrade.c:540
 #, c-format
 msgid "Freezing all rows in the new cluster"
 msgstr "Закріплення всіх рядків у новому кластері"
 
-#: pg_upgrade.c:522
+#: pg_upgrade.c:560
 #, c-format
 msgid "Restoring global objects in the new cluster"
 msgstr "Відновлення глобальних об'єктів у новому кластері"
 
-#: pg_upgrade.c:538
+#: pg_upgrade.c:577
 #, c-format
 msgid "Restoring database schemas in the new cluster"
 msgstr "Відновлення схем баз даних у новому кластері"
 
-#: pg_upgrade.c:662
+#: pg_upgrade.c:712
 #, c-format
 msgid "Deleting files from new %s"
 msgstr "Видалення файлів з нового %s"
 
-#: pg_upgrade.c:666
+#: pg_upgrade.c:716
 #, c-format
 msgid "could not delete directory \"%s\""
 msgstr "не вдалося видалити каталог \"%s\""
 
-#: pg_upgrade.c:685
+#: pg_upgrade.c:735
 #, c-format
 msgid "Copying old %s to new server"
 msgstr "Копіювання старого %s до нового серверу"
 
-#: pg_upgrade.c:711
+#: pg_upgrade.c:761
 #, c-format
 msgid "Setting oldest XID for new cluster"
 msgstr "Встановлення найстарішого XID для нового кластеру"
 
-#: pg_upgrade.c:719
+#: pg_upgrade.c:769
 #, c-format
 msgid "Setting next transaction ID and epoch for new cluster"
 msgstr "Установка наступного ID транзакції й епохи для нового кластера"
 
-#: pg_upgrade.c:749
+#: pg_upgrade.c:799
 #, c-format
 msgid "Setting next multixact ID and offset for new cluster"
 msgstr "Установка наступного ID і зсуву мультитранзакції для нового кластера"
 
-#: pg_upgrade.c:773
+#: pg_upgrade.c:823
 #, c-format
 msgid "Setting oldest multixact ID in new cluster"
 msgstr "Установка найстаршого ID мультитранзакції в новому кластері"
 
-#: pg_upgrade.c:793
+#: pg_upgrade.c:843
 #, c-format
 msgid "Resetting WAL archives"
 msgstr "Скидання архівів WAL"
 
-#: pg_upgrade.c:836
+#: pg_upgrade.c:886
 #, c-format
 msgid "Setting frozenxid and minmxid counters in new cluster"
 msgstr "Установка лічильників frozenxid і minmxid у новому кластері"
 
-#: pg_upgrade.c:838
+#: pg_upgrade.c:888
 #, c-format
 msgid "Setting minmxid counter in new cluster"
 msgstr "Установка лічильника minmxid у новому кластері"
 
-#: pg_upgrade.c:929
+#: pg_upgrade.c:979
 #, c-format
 msgid "Restoring logical replication slots in the new cluster"
 msgstr "Відновлення слотів логічної реплікації в новому кластері"
 
-#: relfilenumber.c:35
+#: relfilenumber.c:68
+#, c-format
+msgid "could not synchronize file \"%s\": %m"
+msgstr "не вдалося синхронізувати файл \"%s\": %m"
+
+#: relfilenumber.c:114
 #, c-format
 msgid "Cloning user relation files"
 msgstr "Клонування файлів користувацьких відношень"
 
-#: relfilenumber.c:38
+#: relfilenumber.c:117
 #, c-format
 msgid "Copying user relation files"
 msgstr "Копіювання файлів користувацьких відношень"
 
-#: relfilenumber.c:41
+#: relfilenumber.c:120
 #, c-format
 msgid "Copying user relation files with copy_file_range"
 msgstr "Копіювання файлів користувацьких відношень за допомогою copy_file_range"
 
-#: relfilenumber.c:44
+#: relfilenumber.c:123
 #, c-format
 msgid "Linking user relation files"
 msgstr "Приєднання файлів користувацьких відношень"
 
-#: relfilenumber.c:118
+#: relfilenumber.c:126
+#, c-format
+msgid "Swapping data directories"
+msgstr "Заміна каталогів даних"
+
+#: relfilenumber.c:200
 #, c-format
 msgid "old database \"%s\" not found in the new cluster"
 msgstr "стара база даних \"%s\" не знайдена в новому кластері"
 
-#: relfilenumber.c:221
+#: relfilenumber.c:287
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
+
+#: relfilenumber.c:301 relfilenumber.c:305
+#, c-format
+msgid "could not rename directory \"%s\" to \"%s\": %m"
+msgstr "не вдалося перейменувати каталог \"%s\" на \"%s\": %m"
+
+#: relfilenumber.c:375 relfilenumber.c:402
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "не вдалося відкрити каталог \"%s\": %m"
+
+#: relfilenumber.c:396 relfilenumber.c:434
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "не вдалося прочитати каталог \"%s\": %m"
+
+#: relfilenumber.c:439
+#, c-format
+msgid "could not synchronize directory \"%s\": %m"
+msgstr "не вдалося синхронізувати каталог \"%s\": %m"
+
+#: relfilenumber.c:441
+#, c-format
+msgid "could not synchronize parent directory of \"%s\": %m"
+msgstr "не вдалося синхронізувати батьківський каталог \"%s\": %m"
+
+#: relfilenumber.c:598
 #, c-format
 msgid "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %m"
 msgstr "помилка під час перевірки існування файлу \"%s.%s\" (з \"%s\" в \"%s\"): %m"
 
-#: relfilenumber.c:238
+#: relfilenumber.c:615
 #, c-format
 msgid "rewriting \"%s\" to \"%s\""
 msgstr "переписування \"%s\" на \"%s\""
 
-#: relfilenumber.c:246
+#: relfilenumber.c:623
 #, c-format
 msgid "cloning \"%s\" to \"%s\""
 msgstr "клонування \"%s\" до \"%s\""
 
-#: relfilenumber.c:251
+#: relfilenumber.c:628
 #, c-format
 msgid "copying \"%s\" to \"%s\""
 msgstr "копіювання \"%s\" в \"%s\""
 
-#: relfilenumber.c:256
+#: relfilenumber.c:633
 #, c-format
 msgid "copying \"%s\" to \"%s\" with copy_file_range"
-msgstr ""
+msgstr "копіювання \"%s\" в \"%s\" з copy_file_range"
 
-#: relfilenumber.c:261
+#: relfilenumber.c:638
 #, c-format
 msgid "linking \"%s\" to \"%s\""
 msgstr "створення посилання на \"%s\" в \"%s\""
 
+#: relfilenumber.c:644
+#, c-format
+msgid "should never happen"
+msgstr "ніколи не повинно трапитися"
+
 #: server.c:39 server.c:143 util.c:248 util.c:278
 #, c-format
 msgid "Failure, exiting\n"
@@ -1737,43 +1891,43 @@ msgstr "не вдалося відкрити файл версії \"%s\": %m"
 msgid "could not parse version file \"%s\""
 msgstr "не вдалося проаналізувати файл версії \"%s\""
 
-#: server.c:310
+#: server.c:299
 #, c-format
 msgid "\n"
 "%s"
 msgstr "\n"
 "%s"
 
-#: server.c:314
+#: server.c:303
 #, c-format
 msgid "could not connect to source postmaster started with the command:\n"
 "%s"
 msgstr "не вдалося підключитися до початкового процесу postmaster, запущеного командою:\n"
 "%s"
 
-#: server.c:318
+#: server.c:307
 #, c-format
 msgid "could not connect to target postmaster started with the command:\n"
 "%s"
 msgstr "не вдалося підключитися до цільового процесу postmaster, запущеного командою:\n"
 "%s"
 
-#: server.c:332
+#: server.c:321
 #, c-format
 msgid "pg_ctl failed to start the source server, or connection failed"
 msgstr "pg_ctl не зміг запустити початковий сервер або сталася помилка підключення"
 
-#: server.c:334
+#: server.c:323
 #, c-format
 msgid "pg_ctl failed to start the target server, or connection failed"
 msgstr "pg_ctl не зміг запустити цільовий сервер або сталася помилка підключення"
 
-#: server.c:379
+#: server.c:368 task.c:195
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
-#: server.c:392
+#: server.c:381
 #, c-format
 msgid "libpq environment variable %s has a non-local server value: %s"
 msgstr "у змінній середовища для libpq %s задано не локальне значення: %s"
@@ -1793,13 +1947,23 @@ msgstr "каталог табличного простору \"%s\" не існ
 #: tablespace.c:87
 #, c-format
 msgid "could not stat tablespace directory \"%s\": %m"
-msgstr ""
+msgstr "не вдалося отримати стан каталогу табличного простору \"%s\": %m"
 
 #: tablespace.c:92
 #, c-format
 msgid "tablespace path \"%s\" is not a directory"
 msgstr "шлях табличного простору \"%s\" не вказує на каталог"
 
+#: task.c:216 task.c:267 task.c:282 task.c:293
+#, c-format
+msgid "connection failure: %s"
+msgstr "помилка з'єднання: %s"
+
+#: task.c:395
+#, c-format
+msgid "invalid socket"
+msgstr "неприпустимий сокет"
+
 #: util.c:53 util.c:56 util.c:139 util.c:170 util.c:172
 #, c-format
 msgid "%-*s"
@@ -1820,11 +1984,6 @@ msgstr "ok"
 msgid "Checking for hash indexes"
 msgstr "Перевірка геш-індексів"
 
-#: version.c:121
-#, c-format
-msgid "warning"
-msgstr "попередження"
-
 #: version.c:123
 #, c-format
 msgid "\n"
@@ -1854,17 +2013,17 @@ msgstr "\n"
 "після виконання суперкористувачем бази даних в psql, повторно створить\n"
 "всі неприпустимі індекси; до цього ніякі геш-індекси не будуть використовуватись."
 
-#: version.c:153
+#: version.c:187
 #, c-format
 msgid "Checking for extension updates"
 msgstr "Перевірка оновлень розширення"
 
-#: version.c:200
+#: version.c:201
 #, c-format
 msgid "notice"
 msgstr "повідомлення"
 
-#: version.c:201
+#: version.c:202
 #, c-format
 msgid "\n"
 "Your installation contains extensions that should be updated\n"
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 3d3e208768d..f23ce52faa2 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -3,7 +3,7 @@
  *
  *	database server functions
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/server.c
  */
@@ -75,6 +75,8 @@ get_db_conn(ClusterInfo *cluster, const char *db_name)
 		appendPQExpBufferStr(&conn_opts, " host=");
 		appendConnStrVal(&conn_opts, cluster->sockdir);
 	}
+	if (!protocol_negotiation_supported(cluster))
+		appendPQExpBufferStr(&conn_opts, " max_protocol_version=3.0");
 
 	conn = PQconnectdb(conn_opts.data);
 	termPQExpBuffer(&conn_opts);
@@ -251,24 +253,6 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
 	if (cluster == &new_cluster)
 		appendPQExpBufferStr(&pgoptions, " -c synchronous_commit=off -c fsync=off -c full_page_writes=off");
 
-	/*
-	 * Use max_slot_wal_keep_size as -1 to prevent the WAL removal by the
-	 * checkpointer process.  If WALs required by logical replication slots
-	 * are removed, the slots are unusable.  This setting prevents the
-	 * invalidation of slots during the upgrade. We set this option when
-	 * cluster is PG17 or later because logical replication slots can only be
-	 * migrated since then. Besides, max_slot_wal_keep_size is added in PG13.
-	 */
-	if (GET_MAJOR_VERSION(cluster->major_version) >= 1700)
-		appendPQExpBufferStr(&pgoptions, " -c max_slot_wal_keep_size=-1");
-
-	/*
-	 * Use idle_replication_slot_timeout=0 to prevent slot invalidation due to
-	 * idle_timeout by checkpointer process during upgrade.
-	 */
-	if (GET_MAJOR_VERSION(cluster->major_version) >= 1800)
-		appendPQExpBufferStr(&pgoptions, " -c idle_replication_slot_timeout=0");
-
 	/*
 	 * Use -b to disable autovacuum and logical replication launcher
 	 * (effective in PG17 or later for the latter).
diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
index ff96c5a53c5..511f60835d7 100644
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -87,6 +87,7 @@ sub get_dump_for_comparison
 	$node->run_log(
 		[
 			'pg_dump', '--no-sync',
+			'--restrict-key=test',
 			'-d' => $node->connstr($db),
 			'-f' => $dumpfile
 		]);
@@ -371,6 +372,9 @@ sub get_dump_for_comparison
 {
 	my $dstnode = PostgreSQL::Test::Cluster->new('dst_node');
 
+	skip "regress_dump_restore not enabled in PG_TEST_EXTRA"
+	  if (!$ENV{PG_TEST_EXTRA}
+		|| $ENV{PG_TEST_EXTRA} !~ /\bregress_dump_restore\b/);
 	skip "different Postgres versions"
 	  if ($oldnode->pg_version != $dstnode->pg_version);
 	skip "source node not using default install"
@@ -419,8 +423,10 @@ sub get_dump_for_comparison
 # Take a dump before performing the upgrade as a base comparison. Note
 # that we need to use pg_dumpall from the new node here.
 my @dump_command = (
-	'pg_dumpall', '--no-sync', '-d', $oldnode->connstr('postgres'),
-	'-f',         $dump1_file);
+	'pg_dumpall', '--no-sync',
+	'--restrict-key=test',
+	'--dbname' => $oldnode->connstr('postgres'),
+	'--file' => $dump1_file);
 # --extra-float-digits is needed when upgrading from a version older than 11.
 push(@dump_command, '--extra-float-digits', '0')
   if ($oldnode->pg_version < 12);
@@ -606,8 +612,10 @@ sub get_dump_for_comparison
 
 # Second dump from the upgraded instance.
 @dump_command = (
-	'pg_dumpall', '--no-sync', '-d', $newnode->connstr('postgres'),
-	'-f',         $dump2_file);
+	'pg_dumpall', '--no-sync',
+	'--restrict-key=test',
+	'--dbname' => $newnode->connstr('postgres'),
+	'--file' => $dump2_file);
 # --extra-float-digits is needed when upgrading from a version older than 11.
 push(@dump_command, '--extra-float-digits', '0')
   if ($oldnode->pg_version < 12);
@@ -634,4 +642,4 @@ sub get_dump_for_comparison
 	print "=== EOF ===\n";
 }
 
-done_testing();
\ No newline at end of file
+done_testing();
diff --git a/src/bin/pg_upgrade/t/004_subscription.pl b/src/bin/pg_upgrade/t/004_subscription.pl
index e46f02c6cc6..37fd7071df3 100644
--- a/src/bin/pg_upgrade/t/004_subscription.pl
+++ b/src/bin/pg_upgrade/t/004_subscription.pl
@@ -200,23 +200,27 @@
 rmtree($new_sub->data_dir . "/pg_upgrade_output.d");
 
 # Verify that the upgrade should be successful with tables in 'ready'/'init'
-# state along with retaining the replication origin's remote lsn, subscription's
-# running status, and failover option.
+# state along with retaining the replication origin's remote lsn,
+# subscription's running status, and failover option. Use multiple tables to
+# verify deterministic pg_dump ordering of subscription relations during
+# --binary-upgrade.
 $publisher->safe_psql(
 	'postgres', qq[
+		CREATE TABLE tab_upgraded(id int);
 		CREATE TABLE tab_upgraded1(id int);
-		CREATE PUBLICATION regress_pub4 FOR TABLE tab_upgraded1;
+		CREATE PUBLICATION regress_pub4 FOR TABLE tab_upgraded, tab_upgraded1;
 ]);
 
 $old_sub->safe_psql(
 	'postgres', qq[
+		CREATE TABLE tab_upgraded(id int);
 		CREATE TABLE tab_upgraded1(id int);
 		CREATE SUBSCRIPTION regress_sub4 CONNECTION '$connstr' PUBLICATION regress_pub4 WITH (failover = true);
 ]);
 
-# Wait till the table tab_upgraded1 reaches 'ready' state
+# Wait till the tables tab_upgraded and tab_upgraded1 reach 'ready' state
 my $synced_query =
-  "SELECT count(1) = 1 FROM pg_subscription_rel WHERE srsubstate = 'r'";
+  "SELECT count(1) = 2 FROM pg_subscription_rel WHERE srsubstate = 'r'";
 $old_sub->poll_query_until('postgres', $synced_query)
   or die "Timed out while waiting for the table to reach ready state";
 
@@ -254,6 +258,8 @@
 # Have the subscription in disabled state before upgrade
 $old_sub->safe_psql('postgres', "ALTER SUBSCRIPTION regress_sub5 DISABLE");
 
+my $tab_upgraded_oid = $old_sub->safe_psql('postgres',
+	"SELECT oid FROM pg_class WHERE relname = 'tab_upgraded'");
 my $tab_upgraded1_oid = $old_sub->safe_psql('postgres',
 	"SELECT oid FROM pg_class WHERE relname = 'tab_upgraded1'");
 my $tab_upgraded2_oid = $old_sub->safe_psql('postgres',
@@ -268,9 +274,9 @@
 
 # ------------------------------------------------------
 # Check that pg_upgrade is successful when all tables are in ready or in
-# init state (tab_upgraded1 table is in ready state and tab_upgraded2 table is
-# in init state) along with retaining the replication origin's remote lsn,
-# subscription's running status, and failover option.
+# init state (tab_upgraded and tab_upgraded1 tables are in ready state and
+# tab_upgraded2 table is in init state) along with retaining the replication
+# origin's remote lsn, subscription's running status, and failover option.
 # ------------------------------------------------------
 command_ok(
 	[
@@ -317,9 +323,10 @@
 # Subscription relations should be preserved
 $result = $new_sub->safe_psql('postgres',
 	"SELECT srrelid, srsubstate FROM pg_subscription_rel ORDER BY srrelid");
-is( $result, qq($tab_upgraded1_oid|r
+is( $result, qq($tab_upgraded_oid|r
+$tab_upgraded1_oid|r
 $tab_upgraded2_oid|i),
-	"there should be 2 rows in pg_subscription_rel(representing tab_upgraded1 and tab_upgraded2)"
+	"there should be 3 rows in pg_subscription_rel(representing tab_upgraded, tab_upgraded1 and tab_upgraded2)"
 );
 
 # The replication origin's remote_lsn should be preserved
diff --git a/src/bin/pg_upgrade/task.c b/src/bin/pg_upgrade/task.c
index ee0e2457152..a19ea8445a0 100644
--- a/src/bin/pg_upgrade/task.c
+++ b/src/bin/pg_upgrade/task.c
@@ -188,6 +188,8 @@ start_conn(const ClusterInfo *cluster, UpgradeTaskSlot *slot)
 		appendPQExpBufferStr(&conn_opts, " host=");
 		appendConnStrVal(&conn_opts, cluster->sockdir);
 	}
+	if (!protocol_negotiation_supported(cluster))
+		appendPQExpBufferStr(&conn_opts, " max_protocol_version=3.0");
 
 	slot->conn = PQconnectStart(conn_opts.data);
 
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 3e2fe439495..c0cd7c7ec2f 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -3,7 +3,7 @@
  *
  *	Postgres-version-specific routines
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	Copyright (c) 2010-2025, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/version.c
  */
@@ -30,6 +30,24 @@ jsonb_9_4_check_applicable(ClusterInfo *cluster)
 	return false;
 }
 
+/*
+ * Older servers can't support newer protocol versions, so their connection
+ * strings will need to lock max_protocol_version to 3.0.
+ */
+bool
+protocol_negotiation_supported(const ClusterInfo *cluster)
+{
+	/*
+	 * The February 2018 patch release (9.3.21, 9.4.16, 9.5.11, 9.6.7, and
+	 * 10.2) added support for NegotiateProtocolVersion. But ClusterInfo only
+	 * has information about the major version number. To ensure we can still
+	 * upgrade older unpatched servers, just assume anything prior to PG11
+	 * can't negotiate. It's not possible for those servers to make use of
+	 * newer protocols anyway, so nothing is lost.
+	 */
+	return (GET_MAJOR_VERSION(cluster->major_version) >= 1100);
+}
+
 /*
  * old_9_6_invalidate_hash_indexes()
  *	9.6 -> 10
diff --git a/src/bin/pg_verifybackup/astreamer_verify.c b/src/bin/pg_verifybackup/astreamer_verify.c
index 33cf67670a7..ba49a0520e2 100644
--- a/src/bin/pg_verifybackup/astreamer_verify.c
+++ b/src/bin/pg_verifybackup/astreamer_verify.c
@@ -165,7 +165,7 @@ member_verify_header(astreamer *streamer, astreamer_member *member)
 	char		pathname[MAXPGPATH];
 
 	/* We are only interested in normal files. */
-	if (member->is_directory || member->is_link)
+	if (!member->is_regular)
 		return;
 
 	/*
diff --git a/src/bin/pg_verifybackup/po/de.po b/src/bin/pg_verifybackup/po/de.po
index a9e24931100..a04ee41add8 100644
--- a/src/bin/pg_verifybackup/po/de.po
+++ b/src/bin/pg_verifybackup/po/de.po
@@ -1,13 +1,13 @@
 # German message translation file for pg_verifybackup
-# Copyright (C) 2020-2025 PostgreSQL Global Development Group
+# Copyright (C) 2020-2026 PostgreSQL Global Development Group
 # This file is distributed under the same license as the pg_verifybackup (PostgreSQL) package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_verifybackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-29 14:48+0000\n"
-"PO-Revision-Date: 2025-04-29 18:57+0200\n"
+"POT-Creation-Date: 2026-05-05 12:10+0000\n"
+"PO-Revision-Date: 2026-05-06 16:09+0200\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -92,7 +92,7 @@ msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
 
 #: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
-#: ../../common/jsonapi.c:2407 ../../common/parse_manifest.c:157
+#: ../../common/jsonapi.c:2459 ../../common/parse_manifest.c:157
 #: ../../common/parse_manifest.c:852
 #, c-format
 msgid "out of memory"
@@ -122,103 +122,103 @@ msgstr "Speicher aufgebraucht\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 
-#: ../../common/jsonapi.c:2432
+#: ../../common/jsonapi.c:2484
 msgid "Recursive descent parser cannot use incremental lexer."
 msgstr "Parser mit rekursivem Abstieg kann inkrementellen Lexer nicht benutzen."
 
-#: ../../common/jsonapi.c:2434
+#: ../../common/jsonapi.c:2486
 msgid "Incremental parser requires incremental lexer."
 msgstr "Inkrementeller Parser benötigt inkrementellen Lexer."
 
-#: ../../common/jsonapi.c:2436
+#: ../../common/jsonapi.c:2488
 msgid "JSON nested too deep, maximum permitted depth is 6400."
 msgstr "JSON zu tief geschachtelt, maximale erlaubte Tiefe ist 6400."
 
-#: ../../common/jsonapi.c:2438
+#: ../../common/jsonapi.c:2490
 #, c-format
 msgid "Escape sequence \"\\%.*s\" is invalid."
 msgstr "Escape-Sequenz »\\%.*s« ist nicht gültig."
 
-#: ../../common/jsonapi.c:2442
+#: ../../common/jsonapi.c:2494
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Zeichen mit Wert 0x%02x muss escapt werden."
 
-#: ../../common/jsonapi.c:2446
+#: ../../common/jsonapi.c:2498
 #, c-format
 msgid "Expected end of input, but found \"%.*s\"."
 msgstr "Ende der Eingabe erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2449
+#: ../../common/jsonapi.c:2501
 #, c-format
 msgid "Expected array element or \"]\", but found \"%.*s\"."
 msgstr "Array-Element oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2452
+#: ../../common/jsonapi.c:2504
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%.*s\"."
 msgstr "»,« oder »]« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2455
+#: ../../common/jsonapi.c:2507
 #, c-format
 msgid "Expected \":\", but found \"%.*s\"."
 msgstr "»:« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2458
+#: ../../common/jsonapi.c:2510
 #, c-format
 msgid "Expected JSON value, but found \"%.*s\"."
 msgstr "JSON-Wert erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2461
+#: ../../common/jsonapi.c:2513
 msgid "The input string ended unexpectedly."
 msgstr "Die Eingabezeichenkette endete unerwartet."
 
-#: ../../common/jsonapi.c:2463
+#: ../../common/jsonapi.c:2515
 #, c-format
 msgid "Expected string or \"}\", but found \"%.*s\"."
 msgstr "Zeichenkette oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2466
+#: ../../common/jsonapi.c:2518
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%.*s\"."
 msgstr "»,« oder »}« erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2469
+#: ../../common/jsonapi.c:2521
 #, c-format
 msgid "Expected string, but found \"%.*s\"."
 msgstr "Zeichenkette erwartet, aber »%.*s« gefunden."
 
-#: ../../common/jsonapi.c:2472
+#: ../../common/jsonapi.c:2524
 #, c-format
 msgid "Token \"%.*s\" is invalid."
 msgstr "Token »%.*s« ist ungültig."
 
-#: ../../common/jsonapi.c:2478
+#: ../../common/jsonapi.c:2530
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kann nicht in »text« umgewandelt werden."
 
-#: ../../common/jsonapi.c:2480
+#: ../../common/jsonapi.c:2532
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "Nach »\\u« müssen vier Hexadezimalziffern folgen."
 
-#: ../../common/jsonapi.c:2483
+#: ../../common/jsonapi.c:2535
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Unicode-Escape-Werte können nicht für Code-Punkt-Werte über 007F verwendet werden, wenn die Kodierung nicht UTF8 ist."
 
-#: ../../common/jsonapi.c:2492
+#: ../../common/jsonapi.c:2544
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Unicode-Escape-Wert konnte nicht in die Serverkodierung %s umgewandelt werden."
 
-#: ../../common/jsonapi.c:2499
+#: ../../common/jsonapi.c:2551
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicode-High-Surrogate darf nicht auf ein High-Surrogate folgen."
 
-#: ../../common/jsonapi.c:2501
+#: ../../common/jsonapi.c:2553
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicode-Low-Surrogate muss auf ein High-Surrogate folgen."
 
-#: ../../common/jsonapi.c:2523
+#: ../../common/jsonapi.c:2575
 msgid "out of memory while constructing error description"
 msgstr "Speicher aufgebraucht beim Konstruieren der Fehlerbeschreibung"
 
@@ -401,7 +401,7 @@ msgstr "konnte Komprimierungsniveau %d nicht setzen: %s"
 
 #: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
 #: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
-#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#: ../../fe_utils/astreamer_zstd.c:130 ../../fe_utils/astreamer_zstd.c:285
 #, c-format
 msgid "this build does not support compression with %s"
 msgstr "diese Installation unterstützt keine Komprimierung mit %s"
@@ -422,7 +422,7 @@ msgid "could not initialize compression library"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren"
 
 #: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
-#: ../../fe_utils/astreamer_zstd.c:333
+#: ../../fe_utils/astreamer_zstd.c:330
 #, c-format
 msgid "could not decompress data: %s"
 msgstr "konnte Daten nicht dekomprimieren: %s"
@@ -437,8 +437,8 @@ msgstr "konnte lz4-Komprimierungskontext nicht erzeugen: %s"
 msgid "could not write lz4 header: %s"
 msgstr "konnte lz4-Header nicht schreiben: %s"
 
-#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
-#: ../../fe_utils/astreamer_zstd.c:227
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:182
+#: ../../fe_utils/astreamer_zstd.c:224
 #, c-format
 msgid "could not compress data: %s"
 msgstr "konnte Daten nicht komprimieren: %s"
@@ -453,22 +453,27 @@ msgstr "konnte lz4-Komprimierung nicht beenden: %s"
 msgid "could not initialize compression library: %s"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s"
 
-#: ../../fe_utils/astreamer_tar.c:244
-#, c-format
-msgid "tar file trailer exceeds 2 blocks"
-msgstr "Tar-Datei-Trailer überschreitet 2 Blöcke"
-
-#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#: ../../fe_utils/astreamer_tar.c:254 astreamer_verify.c:130
 #, c-format
 msgid "unexpected state while parsing tar archive"
 msgstr "unerwarteter Zustand beim Parsen des Tar-Archivs"
 
-#: ../../fe_utils/astreamer_tar.c:292
+#: ../../fe_utils/astreamer_tar.c:300
+#, c-format
+msgid "input file does not appear to be a valid tar archive"
+msgstr "Eingabedatei scheint kein gültiges Tar-Archiv zu sein"
+
+#: ../../fe_utils/astreamer_tar.c:307
 #, c-format
 msgid "tar member has empty name"
 msgstr "Tar-Mitglied hat leeren Namen"
 
-#: ../../fe_utils/astreamer_tar.c:326
+#: ../../fe_utils/astreamer_tar.c:328
+#, c-format
+msgid "pax extensions to tar format are not supported"
+msgstr "PAX-Erweiterungen des Tar-Formats werden nicht unterstützt"
+
+#: ../../fe_utils/astreamer_tar.c:357
 #, c-format
 msgid "COPY stream ended before last file was finished"
 msgstr "COPY-Strom endete vor dem Ende der letzten Datei"
@@ -488,12 +493,12 @@ msgstr "konnte zstd-Komprimierungsniveau nicht auf %d setzen: %s"
 msgid "could not set compression worker count to %d: %s"
 msgstr "konnte Komprimierungs-Worker-Anzahl nicht auf %d setzen: %s"
 
-#: ../../fe_utils/astreamer_zstd.c:120
+#: ../../fe_utils/astreamer_zstd.c:119
 #, c-format
 msgid "could not enable long-distance mode: %s"
 msgstr "konnte Long-Distance-Modus nicht einschalten: %s"
 
-#: ../../fe_utils/astreamer_zstd.c:279
+#: ../../fe_utils/astreamer_zstd.c:276
 #, c-format
 msgid "could not create zstd decompression context"
 msgstr "konnte zstd-Dekomprimierungskontext nicht erzeugen"
diff --git a/src/bin/pg_verifybackup/po/es.po b/src/bin/pg_verifybackup/po/es.po
index 0cb958f3448..d660b92b11f 100644
--- a/src/bin/pg_verifybackup/po/es.po
+++ b/src/bin/pg_verifybackup/po/es.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_verifybackup (PostgreSQL) 16\n"
+"Project-Id-Version: pg_verifybackup (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-05-22 07:17+0000\n"
-"PO-Revision-Date: 2023-05-22 12:06+0200\n"
+"POT-Creation-Date: 2026-02-06 23:17+0000\n"
+"PO-Revision-Date: 2025-09-21 10:28+0200\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -19,26 +19,102 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.3\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "no se pudo abrir archivo «%s» para lectura: %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "no se pudo leer el archivo «%s»: %m"
+
+#: ../../common/controldata_utils.c:119
+#, c-format
+msgid "could not read file \"%s\": read %d of %zu"
+msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "no se pudo cerrar el archivo «%s»: %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "discordancia en orden de bytes"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid ""
+"possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr ""
+"posible discordancia en orden de bytes\n"
+"El ordenamiento de bytes usado para almacenar el archivo pg_control puede no\n"
+"coincidir con el usado por este programa.  En tal caso los resultados de abajo\n"
+"serían erróneos, y la instalación de PostgreSQL sería incompatible con este\n"
+"directorio de datos."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "no se pudo abrir el archivo «%s»: %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "no se pudo escribir el archivo «%s»: %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "memoria agotada"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "éxito"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "el búfer de destino es demasiado pequeño"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "falla de openSSL"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -50,390 +126,603 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2435
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr "El parser recursivo descendiente no puede usar el lexer incremental."
+
+#: ../../common/jsonapi.c:2437
+msgid "Incremental parser requires incremental lexer."
+msgstr "El parser incremental requiere el lexer incremental."
+
+#: ../../common/jsonapi.c:2439
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr "JSON anidado demasiado profundamente, profundidad máxima es 6400."
+
+#: ../../common/jsonapi.c:2441
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "La secuencia de escape «%s» no es válida."
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "La secuencia de escape «\\%.*s» no es válida."
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Los caracteres con valor 0x%02x deben ser escapados."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2449
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "Se esperaba el fin de la entrada, se encontró «%s»."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "Se esperaba el fin de la entrada, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2452
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Se esperaba un elemento de array o «]», se encontró «%s»."
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "Se esperaba un elemento de array o «]», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2455
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "Se esperaba «,» o «]», se encontró «%s»."
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "Se esperaba «,» o «]», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2458
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "Se esperaba «:», se encontró «%s»."
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "Se esperaba «:», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2461
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "Se esperaba un valor JSON, se encontró «%s»."
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "Se esperaba un valor JSON, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "La cadena de entrada terminó inesperadamente."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2466
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Se esperaba una cadena o «}», se encontró «%s»."
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "Se esperaba una cadena o «}», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2469
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "Se esperaba «,» o «}», se encontró «%s»."
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "Se esperaba «,» o «}», se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2472
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "Se esperaba una cadena, se encontró «%s»."
+msgid "Expected string, but found \"%.*s\"."
+msgstr "Se esperaba una cadena, se encontró «%.*s»."
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2475
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "El elemento «%s» no es válido."
+msgid "Token \"%.*s\" is invalid."
+msgstr "El elemento «%.*s» no es válido."
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 no puede ser convertido a text."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "«\\u» debe ser seguido por cuatro dígitos hexadecimales."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Los valores de escape Unicode no se pueden utilizar para valores de código superiores a 007F cuando la codificación no es UTF8."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "El valor de escape Unicode no pudo ser traducido a la codificación del servidor %s."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Un «high-surrogate» Unicode no puede venir después de un «high-surrogate»."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Un «low-surrogate» Unicode debe seguir a un «high-surrogate»."
 
-# XXX change upstream message
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "procesamiento falló"
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "memoria agotada mientras se construía una descripción de error"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "no se pudo inicializar la suma de verificación del manifiesto"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "el manifiesto terminó inesperadamente"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "no se pudo actualizar la suma de verificación del manifiesto"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "inicio de objeto inesperado"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "fin de objeto inesperado"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "inicio de array inesperado"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "fin de array inesperado"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "se esperaba indicador de versión"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "campo de nivel superior no reconocido"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "campo de archivo inesperado"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "campo de rango de WAL inesperado"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "campo de objeto inesperado"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "escalar inesperado"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "la versión de manifiesto no es un número entero"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "versión de manifiesto inesperada"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "escalar inesperado"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "el identificador de sistema en el manifiesto no es un número entero"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "ruta de archivo faltante"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "hay ambos ruta de archivo (path name) y ruta codificada (encoded path name)"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "tamaño faltante"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "suma de comprobación sin algoritmo"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "no se pudo decodificar el nombre del archivo"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "el tamaño del archivo no es un número entero"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
-msgstr "algoritmo de suma de comprobación no reconocido: \"%s\""
+msgstr "algoritmo de suma de comprobación no reconocido: «%s»"
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
-msgstr "suma de comprobación no válida para el archivo \"%s\": \"%s\""
+msgstr "suma de comprobación no válida para el archivo «%s»: «%s»"
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "falta el timeline"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "falta el LSN de inicio"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "falta el LSN de término"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "el timeline no es un número entero"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "no se pudo interpretar el LSN de inicio"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "no se pudo interpretar el LSN de término"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "esperado al menos 2 líneas"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "última línea no termina en nueva línea"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "memoria agotada"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "no se pudo inicializar la suma de verificación del manifiesto"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "no se pudo actualizar la suma de verificación del manifiesto"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "no se pudo finalizar la suma de verificación del manifiesto"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "el manifiesto no tiene suma de comprobación"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
-msgstr "suma de comprobación de manifiesto no válida: \"%s\""
+msgstr "suma de comprobación de manifiesto no válida: «%s»"
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "discordancia en la suma de comprobación del manifiesto"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "no se pudo analizar el manifiesto de la copia de seguridad: %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "no se pudo crear el archivo comprimido «%s»: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "no se pudo duplicar stdout: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "no se pudo abrir el archivo de salida: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "no se pudo definir el nivel de compresión %d: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "esta instalación no soporta compresión con %s"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "no se pudo escribir al archivo comprimido «%s»: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "no se pudo cerrar el archivo comprimido «%s»: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "no se pudo inicializar la biblioteca de compresión"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "no se pudo descomprimir datos: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "no se pudo crear un contexto de compresión lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "no se pudo escribir la cabecera lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "no se pudo comprimir datos: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "no se pudo terminar la compresión lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "no se pudo inicializar la biblioteca de compresión: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "la terminación del archivo tar excede de 2 bloques"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "se encontró un estado inesperado mientras se interpretaba el archivo tar"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "miembro de tar tiene nombre vacío"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "el flujo COPY terminó antes que el último archivo estuviera completo"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "no se pudo restablecer el contexto de compresión zstd"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "no se pudo definir el nivel de compresión zstd a %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "no se pudo definir la cantidad de procesos ayudantes de compresión a %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "no se pudo habilitar el modo de larga distancia: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "no se pudo crear el contexto de descompresión zstd"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "el archivo «%s» está presente en el archivador «%s» pero no en el manifiesto"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid "file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the manifest"
+msgstr "el archivo «%s» tiene un tamaño %llu en el archivador «%s» pero tamaño %<PRIu64> en el manifiesto"
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s: no se pudo inicializar la suma de verificación para el archivo «%s»"
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "no se pudo actualizar la suma de verificación para el archivo «%s»"
+
+#: astreamer_verify.c:300
+#, c-format
+msgid "file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> bytes were read"
+msgstr "el archivo «%s» en el archivador «%s» debería contener %<PRIu64> bytes, pero se leyeron %<PRIu64> bytes"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "no se pudo finalizar la suma de verificación para el archivo «%s»"
+
+#: astreamer_verify.c:320
+#, c-format
+msgid "file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "el archivo «%s» en el archivador «%s» tiene una suma de comprobación de longitud %d, pero se esperaba %d"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "no coincide la suma de comprobación para el archivo «%s» en el archivador «%s»"
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "tamaño del archivo de control %d inesperado, se esperaba %d"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s: %s: el valor de CRC es incorrecto"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s: %s: versión de archivo de control inesperado"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid "%s: %s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: %s: el identificador de sistema del manifiesto es %<PRIu64>, pero el archivo de control tiene %<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "formato de respaldo «%s» no válido, debe ser «plain» o «tar»"
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "no fue especificado el directorio de respaldo"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "no se puede especificar %s junto con %s"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "el programa «%s» es requerido por %s, pero no pudo encontrarlo en el mismo directorio que «%s»"
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "el programa «%s» fue encontrado por «%s», pero no es de la misma versión que %s"
 
-#: pg_verifybackup.c:378
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "backup successfully verified\n"
-msgstr "copia de seguridad verificada correctamente\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
-#, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "no se pudo abrir el archivo «%s»: %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "no se pudo leer el archivo «%s»: %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump no puede leer archivos tar"
+
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "Debe usar -n/--no-parse-wal al verificar un respaldo de formato tar."
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "copia de seguridad verificada correctamente\n"
+
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "no se pudo leer el archivo «%s»: leídos %d de %lld"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "nombre de ruta duplicado en el manifiesto de la copia de seguridad: \"%s\""
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "no se pudo leer el archivo «%s»: leídos %lld de %lld"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "no se pudo abrir el directorio «%s»: %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "nombre de ruta duplicado en el manifiesto de la copia de seguridad: «%s»"
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo o directorio «%s»: %m"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\" no es un archivo o directorio"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "«%s» no es un archivo regular o un directorio"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
-msgstr "\"%s\" está presente en el disco pero no en el manifiesto"
+msgstr "«%s» está presente en el disco pero no en el manifiesto"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
-msgstr "\"%s\" tiene un tamaño %lld en el disco pero un tamaño %zu en el manifiesto"
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
+msgstr "«%s» tiene un tamaño %llu en el disco pero un tamaño %llu en el manifiesto"
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "\"%s\" está presente en el manifiesto pero no en el disco"
+msgid "%s: CRC is incorrect"
+msgstr "%s: el valor de CRC es incorrecto"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "no se pudo inicializar la suma de verificación para el archivo «%s»"
+msgid "%s: unexpected control file version"
+msgstr "%s: versión de archivo de control inesperado"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "no se pudo actualizar la suma de verificación para el archivo «%s»"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: el identificador de sistema del manifiesto es %<PRIu64>, pero el archivo de control tiene %<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "no se pudo cerrar el archivo «%s»: %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "el archivo «%s» no es un archivo regular"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "el archivo \"%s\" debe contener %zu bytes, pero se leyeron %zu bytes"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "el archivo «%s» no se esperaba en un respaldo de formato tar"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "no se pudo finalizar la suma de verificación para el archivo «%s»"
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "«%s» está presente en el manifiesto pero no en el disco"
+
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "no se pudo inicializar la suma de verificación para el archivo «%s»"
+
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr "el archivo «%s» debe contener %<PRIu64> bytes, pero se leyeron %<PRIu64>"
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
-msgstr "el archivo \"%s\" tiene una suma de comprobación de longitud %d, pero se esperaba %d"
+msgstr "el archivo «%s» tiene una suma de comprobación de longitud %d, pero se esperaba %d"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
-msgstr "no coincide la suma de comprobación para el archivo \"%s\""
+msgstr "no coincide la suma de comprobación para el archivo «%s»"
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "Error al interpretar el WAL para el timeline %u"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s kB (%d%%) verificados"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid ""
 "%s verifies a backup against the backup manifest.\n"
@@ -442,7 +731,7 @@ msgstr ""
 "%s verifica una copia de seguridad con el fichero de manifiesto de la copia de seguridad.\n"
 "\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid ""
 "Usage:\n"
@@ -453,62 +742,67 @@ msgstr ""
 "  %s [OPCIÓN]... BACKUPDIR\n"
 "\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error         salir inmediatamente en caso de error\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t            formato de salida (plain, tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr "  -i, --ignore=RELATIVE_PATH  ignorar la ruta indicada\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=PATH    usar la ruta especificada para el manifiesto\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal          no intentar analizar archivos WAL\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress              mostrar información de progreso\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr "  -q, --quiet                 no escribir ningún mensaje, excepto errores\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums        omitir la verificación de la suma de comprobación\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr "  -w, --wal-directory=PATH    utilizar la ruta especificada para los archivos WAL\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               mostrar la información de la versión, luego salir\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  muestra esta ayuda, luego salir\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -517,7 +811,7 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
diff --git a/src/bin/pg_verifybackup/po/fr.po b/src/bin/pg_verifybackup/po/fr.po
index da8c72f6427..421a315c400 100644
--- a/src/bin/pg_verifybackup/po/fr.po
+++ b/src/bin/pg_verifybackup/po/fr.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 15\n"
+"Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-07-29 09:17+0000\n"
-"PO-Revision-Date: 2023-09-05 07:49+0200\n"
+"POT-Creation-Date: 2026-05-08 18:48+0000\n"
+"PO-Revision-Date: 2026-05-08 21:52+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,28 +19,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.9\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "n'a pas pu lire le fichier « %s » : %m"
+
+#: ../../common/controldata_utils.c:119
+#, 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"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "n'a pas pu fermer le fichier « %s » : %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "différence de l'ordre des octets"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid ""
+"possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr ""
+"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 de PostgreSQL\n"
+"est incompatible avec ce répertoire des données."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "impossible d'écrire le fichier « %s » : %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2459 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "succès"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "tampon de destination trop petit"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "échec OpenSSL"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -52,391 +128,610 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2484
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr "L'analyseur (parser) en descente récursive ne peut pas utiliser l'analyseur (lexer) incrémental."
+
+#: ../../common/jsonapi.c:2486
+msgid "Incremental parser requires incremental lexer."
+msgstr "L'analyser (parser) incrémental nécessite l'analyseur (lexer) incrémental."
+
+#: ../../common/jsonapi.c:2488
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr "JSON trop profondément imbriqué, profondeur maximum permise est 6400."
+
+#: ../../common/jsonapi.c:2490
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "La séquence d'échappement « \\%s » est invalide."
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "La séquence d'échappement « \\%.*s » est invalide."
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2494
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Le caractère de valeur 0x%02x doit être échappé."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2498
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "Attendait une fin de l'entrée, mais a trouvé « %s »."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "Fin de l'entrée attendue, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2501
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Élément de tableau ou « ] » attendu, mais trouvé « %s »."
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "Élément de tableau ou « ] » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2504
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "« , » ou « ] » attendu, mais trouvé « %s »."
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "« , » ou « ] » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2507
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "« : » attendu, mais trouvé « %s »."
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "« : » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2510
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "Valeur JSON attendue, mais « %s » trouvé."
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "Valeur JSON attendue, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2513
 msgid "The input string ended unexpectedly."
 msgstr "La chaîne en entrée se ferme de manière inattendue."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2515
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Chaîne ou « } » attendu, mais « %s » trouvé."
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "Chaîne ou « } » attendu, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2518
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "« , » ou « } » attendu, mais trouvé « %s »."
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "« , » ou « } » attendu, mais trouvé « %.*s »."
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2521
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "Chaîne attendue, mais « %s » trouvé."
+msgid "Expected string, but found \"%.*s\"."
+msgstr "Chaîne attendue, mais « %.*s » trouvé."
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2524
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "Le jeton « %s » n'est pas valide."
+msgid "Token \"%.*s\" is invalid."
+msgstr "Le jeton « %.*s » n'est pas valide."
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2530
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 ne peut pas être converti en texte."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2532
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "« \\u » doit être suivi par quatre chiffres hexadécimaux."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2535
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Les valeurs d'échappement Unicode ne peuvent pas être utilisées pour des valeurs de point code au-dessus de 007F quand l'encodage n'est pas UTF8."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2544
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "La valeur d'échappement unicode ne peut pas être traduite dans l'encodage du serveur %s."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2551
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Une substitution unicode haute ne doit pas suivre une substitution haute."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2553
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Une substitution unicode basse ne doit pas suivre une substitution haute."
 
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "échec de l'analyse"
+#: ../../common/jsonapi.c:2575
+msgid "out of memory while constructing error description"
+msgstr "manque mémoire lors de la construction de la description de l'erreur"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "n'a pas pu initialiser la somme de contrôle du manifeste"
+
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "le manifeste se termine de façon inattendue"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "n'a pas pu mettre à jour la somme de contrôle du manifeste"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "début d'objet inattendu"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "fin d'objet inattendue"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "début de tableau inattendu"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "fin de tableau inattendue"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "indicateur de version inattendu"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "champ haut niveau inconnu"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "champ de fichier inattendu"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "champ d'intervalle de WAL inattendu"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "champ d'objet inattendu"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "scalaire inattendu"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "la version du manifeste n'est pas un entier"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "version du manifeste inattendue"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "scalaire inattendu"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "l'identifieur système dans le manifeste n'est pas un entier"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "nom de chemin manquant"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "le nom du chemin et le nom du chemin encodé"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "taille manquante"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "somme de contrôle sans algorithme"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "n'a pas pu décoder le nom du fichier"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "la taille du fichier n'est pas un entier"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "algorithme de somme de contrôle inconnu : « %s »"
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "somme de contrôle invalide pour le fichier « %s » : « %s »"
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "timeline manquante"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "LSN de début manquante"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "LSN de fin manquante"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "la timeline n'est pas un entier"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "n'a pas pu analyser le LSN de début"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "n'a pas pu analyser le LSN de fin"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "attendait au moins deux lignes"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "dernière ligne non terminée avec un caractère newline"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "n'a pas pu initialiser la somme de contrôle du manifeste"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "n'a pas pu mettre à jour la somme de contrôle du manifeste"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "n'a pas pu finaliser la somme de contrôle du manifeste"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "le manifeste n'a pas de somme de contrôle"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "somme de contrôle du manifeste invalide : « %s »"
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "différence de somme de contrôle pour le manifeste"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "n'a pas pu analyser le manifeste de sauvegarde : %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "n'a pas pu créer le fichier compressé « %s » : %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "n'a pas pu dupliquer la sortie (stdout) : %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "n'a pas pu ouvrir le fichier de sauvegarde : %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "n'a pas pu configurer le niveau de compression %d : %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:130 ../../fe_utils/astreamer_zstd.c:285
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "cette construction ne supporte pas la compression avec %s"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "n'a pas pu écrire dans le fichier compressé « %s » : %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "n'a pas pu fermer le fichier compressé « %s » : %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "n'a pas pu initialiser la bibliothèque de compression"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:330
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "n'a pas pu décompresser les données : %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "n'a pas pu créer le contexte de compression lz4 : %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "n'a pas pu écrire l'entête lz4 : %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:182
+#: ../../fe_utils/astreamer_zstd.c:224
+#, c-format
+msgid "could not compress data: %s"
+msgstr "n'a pas pu compresser les données : %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "n'a pas pu terminer la compression lz4 : %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "n'a pas pu initialiser la bibliothèque de compression : %s"
+
+#: ../../fe_utils/astreamer_tar.c:254 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "état inattendu lors de l'analyse de l'archive tar"
+
+#: ../../fe_utils/astreamer_tar.c:300
+#, c-format
+msgid "input file does not appear to be a valid tar archive"
+msgstr "le fichier en entrée ne semble pas être une archive tar valide"
+
+#: ../../fe_utils/astreamer_tar.c:307
+#, c-format
+msgid "tar member has empty name"
+msgstr "le membre de tar a un nom vide"
+
+#: ../../fe_utils/astreamer_tar.c:328
+#, c-format
+msgid "pax extensions to tar format are not supported"
+msgstr "les extensions pax au format tar ne sont pas supportés"
+
+#: ../../fe_utils/astreamer_tar.c:357
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "le flux COPY s'est terminé avant que le dernier fichier soit terminé"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "n'a pas pu créer le contexte de compression zstd"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "n'a pas pu configurer le niveau de compression zstd à %d : %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "n'a pas pu configurer le nombre de workers de compression à %d : %s"
+
+#: ../../fe_utils/astreamer_zstd.c:119
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "n'a pas pu activer le mode distance longue : %s"
+
+#: ../../fe_utils/astreamer_zstd.c:276
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "n'a pas pu créer le contexte de décompression zstd"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "le fichier « %s » est présent dans l'archive « %s » mais pas dans le manifeste"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid "file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the manifest"
+msgstr "le fichier « %s » a une taille de %llu dans l'archive « %s » mais de %<PRIu64> dans le manifeste"
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s : n'a pas pu initialiser la somme de contrôle du fichier « %s »"
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "n'a pas pu mettre à jour la somme de contrôle du fichier « %s »"
+
+#: astreamer_verify.c:300
+#, c-format
+msgid "file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> bytes were read"
+msgstr "le fichier « %s » dans l'archive « %s » devrait contenir %<PRIu64> octets, mais la lecture produit %<PRIu64> octets"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "n'a pas pu finaliser la somme de contrôle du fichier « %s »"
+
+#: astreamer_verify.c:320
+#, c-format
+msgid "file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "le fichier « %s » dans l'archive « %s » a une somme de contrôle de taille %d, alors que %d était attendu"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "différence de somme de contrôle pour le fichier « %s » dans l'archive « %s »"
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "taille %d inattendue du fichier de contrôle, %d attendu"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s : %s : la valeur CRC n'est pas correcte"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s : %s : version inattendue pour le fichier de contrôle"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid "%s: %s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s : %s : l'identifieur système du manifeste est %<PRIu64>, mais le fichier de contrôle a %<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "format de sortie « %s » invalide, doit être soit « plain » soit « tar »"
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "pas de répertoire de sauvegarde spécifié"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "ne peut pas spécifier à la fois %s et %s"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé dans le même répertoire que « %s »"
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "le programme « %s » a été trouvé par « %s » mais n'est pas de la même version que %s"
 
-#: pg_verifybackup.c:378
-#, c-format
-msgid "backup successfully verified\n"
-msgstr "sauvegarde vérifiée avec succès\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "n'a pas pu lire le fichier « %s » : %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump ne peut pas lire les fichiers tar"
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "Vous devez utiliser -n/--no-parse-wal pour la vérification d'une sauvegarde au format tar."
+
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "sauvegarde vérifiée avec succès\n"
+
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %lld"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "nom de chemin dupliqué dans le manifeste de sauvegarde : « %s »"
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "n'a pas pu lire le fichier « %s » : a lu %lld sur %lld"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "nom de chemin dupliqué dans le manifeste de sauvegarde : « %s »"
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "n'a pas pu fermer le répertoire « %s » : %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, 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"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
+msgid "\"%s\" is not a regular file or directory"
 msgstr "« %s » n'est ni un fichier ni un répertoire"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
 msgstr "« %s » est présent sur disque mais pas dans le manifeste"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
-msgstr "« %s » a une taille de %lld sur disque mais de %zu dans le manifeste"
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
+msgstr "« %s » a une taille de %llu sur disque mais de %llu dans le manifeste"
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "« %s » est présent dans le manifeste mais pas sur disque"
+msgid "%s: CRC is incorrect"
+msgstr "%s : la valeur CRC n'est pas correcte"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "n'a pas pu initialiser la somme de contrôle du fichier « %s »"
+msgid "%s: unexpected control file version"
+msgstr "%s : version inattendue pour le fichier de contrôle"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "n'a pas pu mettre à jour la somme de contrôle du fichier « %s »"
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s : l'identifieur système du manifeste est %<PRIu64>, mais le fichier de contrôle a %<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "n'a pas pu fermer le fichier « %s » : %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "le fichier « %s » n'est pas un fichier standard"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "le fichier « %s » devrait contenir %zu octets, mais la lecture produit %zu octets"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "le fichier « %s » n'est pas attendu dans une sauvegarde au format tar"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "n'a pas pu finaliser la somme de contrôle du fichier « %s »"
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "« %s » est présent dans le manifeste mais pas sur disque"
+
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "n'a pas pu initialiser la somme de contrôle du fichier « %s »"
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr "le fichier « %s » devrait contenir %<PRIu64> octets, mais la lecture produit %<PRIu64> octets"
+
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
 msgstr "le fichier « %s » a une somme de contrôle de taille %d, alors que %d était attendu"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
 msgstr "différence de somme de contrôle pour le fichier « %s »"
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "analyse du WAL échouée pour la timeline %u"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s Ko (%d%%) vérifiés"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid ""
 "%s verifies a backup against the backup manifest.\n"
@@ -445,7 +740,7 @@ msgstr ""
 "%s vérifie une sauvegarde à partir du manifeste de sauvegarde.\n"
 "\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid ""
 "Usage:\n"
@@ -456,62 +751,67 @@ msgstr ""
 "  %s [OPTION]... REP_SAUVEGARDE\n"
 "\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error         quitte immédiatement en cas d'erreur\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t               format de sauvegarde (plain, tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr "  -i, --ignore=CHEMIN_RELATIF ignore le chemin indiqué\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=CHEMIN  utilise le chemin spécifié pour le manifeste\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal          n'essaie pas d'analyse les fichiers WAL\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress              affiche les informations de progression\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr "  -q, --quiet                 n'affiche aucun message sauf pour les erreurs\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums        ignore la vérification des sommes de contrôle\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr "  -w, --wal-directory=CHEMIN  utilise le chemin spécifié pour les fichiers WAL\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               affiche la version, puis quitte\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  affiche cette aide, puis quitte\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -520,18 +820,15 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
 #, c-format
-#~ msgid "Try \"%s --help\" for more information.\n"
-#~ msgstr "Essayez « %s --help » pour plus d'informations.\n"
-
-#~ msgid "could not read file \"%s\": read %d of %zu"
-#~ msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %zu"
+#~ msgid "%s: manifest system identifier is %llu, but control file has %llu"
+#~ msgstr "%s: l'identifieur système du manifeste est %llu, mais le fichier de contrôle a %llu"
 
 #, c-format
-#~ msgid "fatal: "
-#~ msgstr "fatal : "
+#~ msgid "tar file trailer exceeds 2 blocks"
+#~ msgstr "la fin du fichier tar fait plus de 2 blocs"
diff --git a/src/bin/pg_verifybackup/po/ja.po b/src/bin/pg_verifybackup/po/ja.po
index c910fb236cc..4ef9c51f42d 100644
--- a/src/bin/pg_verifybackup/po/ja.po
+++ b/src/bin/pg_verifybackup/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_verifybackup (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-14 09:42+0900\n"
-"PO-Revision-Date: 2025-04-14 10:32+0900\n"
+"POT-Creation-Date: 2025-04-30 10:33+0900\n"
+"PO-Revision-Date: 2025-04-30 11:22+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -380,20 +380,134 @@ msgstr "目録チェックサムの不一致"
 msgid "could not parse backup manifest: %s"
 msgstr "バックアップ目録をパースできませんでした: %s"
 
-#: astreamer_verify.c:130
+#: ../../fe_utils/astreamer_gzip.c:115
 #, c-format
-msgid "unexpected state while parsing tar file"
-msgstr "tarファイルのパース中に想定外の状態"
+msgid "could not create compressed file \"%s\": %m"
+msgstr "圧縮ファイル\"%s\"を作成できませんでした: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "標準出力の複製に失敗しました: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "出力ファイルをオープンできませんでした: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "圧縮レベルを%dに設定できませんでした: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "このビルドでは%sによる圧縮をサポートしていません"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "圧縮ファイル\"%s\"に書き込めませんでした: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "圧縮ファイル\"%s\"をクローズすることができませんでした: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "圧縮ライブラリを初期化できませんでした"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "データを伸張できませんでした: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "lz4圧縮コンテクストを生成できませんでした: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "lz4ヘッダを出力できませんでした: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "データを圧縮できませんでした: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "lz4圧縮を終了できませんでした: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "圧縮ライブラリを初期化できませんでした: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "tarファイル後続ブロックが2ブロックを超えています"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "tarアーカイブのパース中に想定外の状態"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "tarメンバーの名前が空です"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "最後のファイルが終わる前にCOPYストリームが終了しました"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "zstd圧縮コンテクストを生成できませんでした"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "zstd圧縮レベルを%dに設定できませんでした: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "圧縮ワーカー数を%dに設定できませんでした: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "長距離モードを有効化できませんでした: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "zstd伸張コンテクストを生成できませんでした"
 
 #: astreamer_verify.c:198
 #, c-format
-msgid "\"%s\" is present in \"%s\" but not in the manifest"
-msgstr "\"%s\"は\"%s\"には存在しますが、目録には存在しません"
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "ファイル\"%s\"はアーカイブ\"%s\"には存在しますが、目録には存在しません"
 
 #: astreamer_verify.c:211
 #, c-format
-msgid "\"%s\" has size %llu in \"%s\" but size %<PRIu64> in the manifest"
-msgstr "\"%1$s\"は\"%3$s\"内でのサイズは%2$lluですが、目録上は%4$<PRIu64>となっています"
+msgid "file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the manifest"
+msgstr "ファル\"%1$s\"はアーカイブ\"%3$s\"内でのサイズは%2$lluですが、目録上は%4$<PRIu64>となっています"
 
 #: astreamer_verify.c:236
 #, c-format
@@ -407,8 +521,8 @@ msgstr "ファイル\"%s\"のチェックサムの更新ができませんでし
 
 #: astreamer_verify.c:300
 #, c-format
-msgid "file \"%s\" in \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64> bytes"
-msgstr "ファイル\"%s\"は\"%s\"内では%<PRIu64>バイトを含んでいるはずですが、%<PRIu64>バイトしか読み込まれませんでした"
+msgid "file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> bytes were read"
+msgstr "アーカイブ\"%2$s\"内のファイル\"%1$s\"は%3$<PRIu64>バイトを含んでいるはずですが、%4$<PRIu64>バイトしか読み込まれませんでした"
 
 #: astreamer_verify.c:312 pg_verifybackup.c:1179
 #, c-format
@@ -417,13 +531,13 @@ msgstr "ファイル\"%s\"のチェックサムの完了ができませんでし
 
 #: astreamer_verify.c:320
 #, c-format
-msgid "file \"%s\" in \"%s\" has checksum of length %d, but expected %d"
-msgstr "ファイル\"%s\"の\"%s\"内でのチェックサムの長さは%dですが、期待している長さは%dです"
+msgid "file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "アーカイブ\"%2$s\"内のファイル\"%1$s\"のチェックサムの長さは%3$dですが、期待している長さは%4$dです"
 
 #: astreamer_verify.c:325
 #, c-format
-msgid "checksum mismatch for file \"%s\" in \"%s\""
-msgstr "\"%s\"内のファイル\"%s\"のチェックサムが一致しません"
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "アーカイブ\"%2$s\"内のファイル\"%1$s\"のチェックサムが一致しません"
 
 #: astreamer_verify.c:387
 #, c-format
@@ -497,7 +611,7 @@ msgstr "pg_waldumpはtarファイルを読めません"
 
 #: pg_verifybackup.c:341
 #, c-format
-msgid "You must use -n or --no-parse-wal when verifying a tar-format backup."
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
 msgstr "tarフォーマットのバックアップを検証するときには -n または --no-parse-wal を使う必要があります。"
 
 #: pg_verifybackup.c:383
@@ -532,8 +646,8 @@ msgstr "\"%s\"というファイルまたはディレクトリの情報を取得
 
 #: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\"はファイルまたはディレクトリではありません"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "\"%s\"は通常ファイルでもディレクトリでもありません"
 
 #: pg_verifybackup.c:711
 #, c-format
@@ -562,8 +676,8 @@ msgstr "%s: 目録のシステム識別子が%<PRIu64>ですが、制御ファ
 
 #: pg_verifybackup.c:906
 #, c-format
-msgid "\"%s\" is not a plain file"
-msgstr "\"%s\"は通常ファイルではありません"
+msgid "file \"%s\" is not a regular file"
+msgstr "ファイル\"%s\"は通常のファイルではありません"
 
 #: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
diff --git a/src/bin/pg_verifybackup/po/ko.po b/src/bin/pg_verifybackup/po/ko.po
index acdc3da5e02..bf45572f7d5 100644
--- a/src/bin/pg_verifybackup/po/ko.po
+++ b/src/bin/pg_verifybackup/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_verifybackup (PostgreSQL) 16\n"
+"Project-Id-Version: pg_verifybackup (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-09-07 05:47+0000\n"
-"PO-Revision-Date: 2023-05-26 13:22+0900\n"
+"POT-Creation-Date: 2025-09-11 21:48+0000\n"
+"PO-Revision-Date: 2025-09-10 10:25+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: PostgreSQL Korea <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -16,26 +16,103 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "읽기용으로 \"%s\" 파일을 열 수 없음: %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "\"%s\" 파일을 읽을 수 없음: %m"
+
+#: ../../common/controldata_utils.c:119
+#, c-format
+msgid "could not read file \"%s\": read %d of %zu"
+msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %zu"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "\"%s\" 파일을 닫을 수 없음: %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "바이트 순서 불일치"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid ""
+"possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr ""
+"바이트 순서 일치하지 않는 문제\n"
+"바이트 순서 정보는 pg_control 파일을 저장할 때 사용되는데,\n"
+"이 파일의 바이트 순서 정보와 이 프로그램에서 사용하는 순서 정보가 다릅니다.\n"
+"이럴 경우, 출력 결과가 바르지 않을 수 있고,\n"
+"설치된 PostgreSQL 프로그램과 데이터 디렉터리가 호환되지 않을 수 있습니다."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "\"%s\" 파일을 열 수 없음: %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "\"%s\" 파일을 쓸 수 없음: %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "메모리 부족"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "성공"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "대상 버퍼가 너무 적음"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "OpenSSL 실패"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -47,74 +124,86 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2435
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr "재귀적 하강 구문분석은 증분형 어휘 분석을 할 수 없습니다."
+
+#: ../../common/jsonapi.c:2437
+msgid "Incremental parser requires incremental lexer."
+msgstr "증분형 구문분석은 증분형 어휘 분석이 필요합니다."
+
+#: ../../common/jsonapi.c:2439
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr "JSON 계층이 너무 깊습니다. 최대 깊이는 6400 단계입니다."
+
+#: ../../common/jsonapi.c:2441
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "잘못된 이스케이프 조합: \"\\%s\""
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "잘못된 이스케이프 조합: \"\\%.*s\""
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "0x%02x 값의 문자는 이스케이프 되어야함."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2449
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "입력 자료의 끝을 기대했는데, \"%s\" 값이 더 있음."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "입력 자료의 끝을 기대했는데, \"%.*s\" 값이 더 있음."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2452
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "\"]\" 가 필요한데 \"%s\"이(가) 있음"
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "배열 요소나, \"]\" 가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2455
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "\",\" 또는 \"]\"가 필요한데 \"%s\"이(가) 있음"
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "\",\" 또는 \"]\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2458
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "\":\"가 필요한데 \"%s\"이(가) 있음"
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "\":\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2461
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "JSON 값을 기대했는데, \"%s\" 값임"
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "JSON 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "입력 문자열이 예상치 않게 끝났음."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2466
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "\"}\"가 필요한데 \"%s\"이(가) 있음"
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "문자열이나, \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2469
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "\",\" 또는 \"}\"가 필요한데 \"%s\"이(가) 있음"
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "\",\" 또는 \"}\"가 필요한데 \"%.*s\"이(가) 있음"
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2472
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "문자열 값을 기대했는데, \"%s\" 값임"
+msgid "Expected string, but found \"%.*s\"."
+msgstr "문자열 값을 기대했는데, \"%.*s\" 값임"
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2475
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "잘못된 토큰: \"%s\""
+msgid "Token \"%.*s\" is invalid."
+msgstr "잘못된 토큰: \"%.*s\""
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 값은 text 형으로 변환할 수 없음."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" 표기법은 뒤에 4개의 16진수가 와야합니다."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -122,199 +211,398 @@ msgstr ""
 "인코딩은 UTF8이 아닐 때 유니코드 이스케이프 값은 007F 이상 코드 포인트 값으"
 "로 사용할 수 없음."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "서버 인코딩이 %s 인 경우 해당 유니코드 이스케이프 값을 변환할 수 없음."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드)는 상위 딸림 코드 뒤에 오면 안됨."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "유니코드 상위 surrogate(딸림 코드) 뒤에는 하위 딸림 코드가 있어야 함."
 
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "구문 분석 실패"
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "오류 설명을 작성하는 중 메모리 부족"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "메니페스트 체크섬 초기화를 할 수 없음"
+
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "메니페스트가 비정상적으로 끝났음"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "메니페스트 체크섬 갱신 할 수 없음"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "비정상적인 개체 시작"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "비정상적인 개체 끝"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "비정상적인 배열 시작"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "비정상적인 배열 끝"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "버전 지시자가 있어야 함"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "최상위 필드를 알 수 없음"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "예상치 못한 파일 필드"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "예상치 못한 WAL 범위 필드"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "예상치 못한 개체 필드"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "예상치 못한 스칼라"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "매니페이스 버전이 정수가 아님"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "예상치 못한 메니페스트 버전"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "예상치 못한 스칼라"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "매니페이스 안 system identifier가 정수가 아님"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "패스 이름 빠짐"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "패스 이름과 인코딩 된 패스 이름이 함께 있음"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "크기 빠짐"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "알고리즘 없는 체크섬"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "파일 이름을 디코딩할 수 없음"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "파일 크기가 정수가 아님"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "알 수 없는 체크섬 알고리즘: \"%s\""
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "\"%s\" 파일의 체크섬이 잘못됨: \"%s\""
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "타임라인 빠짐"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "시작 LSN 빠짐"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "끝 LSN 빠짐"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "타임라인이 정수가 아님"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "시작 LSN 값을 분석할 수 없음"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "끝 LSN 값을 분석할 수 없음"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "적어도 2줄이 더 있어야 함"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "마지막 줄에 줄바꿈 문자가 없음"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "메모리 부족"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "메니페스트 체크섬 초기화를 할 수 없음"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "메니페스트 체크섬 갱신 할 수 없음"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "메니페스트 체크섬 마무리 작업 할 수 없음"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "메니페스트에 체크섬 없음"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "잘못된 메니페스트 체크섬: \"%s\""
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "메니페스트 체크섬 불일치"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "백업 메니페스트 구문 분석 실패: %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "\"%s\" 압축 파일 만들기 실패: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "stdout을 중복할 수 없음: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "출력파일을 열 수 없음: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "잘못된 압축 수위 %d: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "이 서버는 %s 압축을 지원하지 않습니다."
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "\"%s\" 압축 파일 쓰기 실패: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "\"%s\" 압축 파일 닫기 실패: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "압축 라이브러리를 초기화할 수 없음"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "압축 풀기 실패: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "lz4 압축 컨텍스트 정보를 생성할 수 없습니다: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "lz4 헤더를 쓸 수 없음: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "자료를 압축할 수 없음: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "lz4 압축을 끝낼 수 없음: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "압축 라이브러리를 초기화 할 수 없음: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "tar 파일 끝부분에서 2 블록이 초과됨"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "tar 아카이브 분석 중 예상치 못한 상태 발견"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "tar 맴버에 이름이 없음"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "마지막 파일을 끝내기 전에 COPY 스트림이 끝났음"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "zstd 압축 컨텍스트를 만들 수 없음"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "zstd 압축 수준을 %d 값으로 지정할 수 없음: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "압축 작업자 수를 %d 값으로 지정할 수 없음: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "long-distance 모드를 활성화 할 수 없음: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "zstd 압축 컨텍스트를 만들 수 없음"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "\"%s\" 파일이 \"%s\" 아카이브에는 있으나, 메니페스트 안에는 없음"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid ""
+"file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the "
+"manifest"
+msgstr ""
+"\"%s\" 파일의 디스크 크기는 %llu 이나(대상 아카이브: \"%s\") 메니페스트 안에"
+"는 %<PRIu64> 입니다."
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s: \"%s\" 파일 체크섬을 초기화 할 수 없음"
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "\"%s\" 파일 체크섬을 갱신할 수 없음"
+
+#: astreamer_verify.c:300
+#, c-format
+msgid ""
+"file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> "
+"bytes were read"
+msgstr ""
+"\"%s\" 파일(대상 아카이브: \"%s\")은 %<PRIu64> 바이트이나 %<PRIu64> 바이트를 "
+"읽음"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "\"%s\" 파일 체크섬을 마무리 할 수 없음"
+
+#: astreamer_verify.c:320
+#, c-format
+msgid ""
+"file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "\"%s\" 파일(대상 아카이브: \"%s\") 체크섬 %d, 예상되는 값: %d"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "\"%s\" 파일(대상 아카이브: \"%s\")의 체크섬이 맞지 않음"
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "컨트롤 파일의 크기가 %d 로 비정상, 정상값 %d"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s: %s: CRC 값이 잘못됨"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s: %s: 예상치 못한 컨트롤 파일 버전"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid ""
+"%s: %s: manifest system identifier is %<PRIu64>, but control file has "
+"%<PRIu64>"
+msgstr ""
+"%s: %s: manifest system identifier = %<PRIu64>, 컨트롤 파일 = %<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "\"%s\" 값은 잘못된 백업 형식, \"plain\" 또는 \"tar\" 만 사용 가능"
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "백업 디렉터리를 지정하지 않았음"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "너무 많은 명령행 인자를 지정했습니다. (처음 \"%s\")"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "%s 옵션과 %s 옵션을 같이 지정할 수는 없음"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
@@ -322,122 +610,138 @@ msgid ""
 msgstr ""
 "\"%s\" 프로그램이 %s 작업에서 필요하지만 같은 \"%s\" 디렉터리 내에 없습니다."
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "\"%s\" 프로그램을 \"%s\" 작업을 위해 찾았지만 %s 버전과 같지 않습니다."
 
-#: pg_verifybackup.c:378
-#, c-format
-msgid "backup successfully verified\n"
-msgstr "백업 검사 완료\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "\"%s\" 파일을 열 수 없음: %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일의 상태값을 알 수 없음: %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "\"%s\" 파일을 읽을 수 없음: %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump가 tar 파일을 읽을 수 없음"
+
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "tar 형식 백업을 검사할 때는 -n/--no-parse-wal 옵션을 사용하세요."
+
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "백업 검사 완료\n"
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "\"%s\" 파일을 읽을 수 없음: %d 읽음, 전체 %lld"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "백업 메니페스트 안에 경로 이름이 중복됨: \"%s\""
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "\"%s\" 파일을 읽을 수 없음: %lld 읽음, 전체 %lld"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "\"%s\" 디렉터리 열 수 없음: %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "백업 메니페스트 안에 경로 이름이 중복됨: \"%s\""
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 닫을 수 없음: %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "파일 또는 디렉터리 \"%s\"의 상태를 확인할 수 없음: %m"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\" 이름은 파일이나 디렉터리가 아님"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "\"%s\" 이름은 일반 파일이나 디렉터리가 아님"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
 msgstr "디스크에는 \"%s\" 개체가 있으나, 메니페스트 안에는 없음"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
-msgstr "\"%s\" 의 디스크 크기는 %lld 이나 메니페스트 안에는 %zu 입니다."
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
+msgstr "\"%s\" 의 디스크 크기는 %llu 이나 메니페스트 안에는 %llu 입니다."
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "메니페스트 안에는 \"%s\" 개체가 있으나 디스크에는 없음"
+msgid "%s: CRC is incorrect"
+msgstr "%s: CRC 값이 잘못됨"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "\"%s\" 파일 체크섬을 초기화 할 수 없음"
+msgid "%s: unexpected control file version"
+msgstr "%s: 예상치 못한 컨트롤 파일 버전"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "\"%s\" 파일 체크섬을 갱신할 수 없음"
+msgid ""
+"%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: manifest system identifier = %<PRIu64>, 컨트롤 파일 = %<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "\"%s\" 파일을 닫을 수 없음: %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "\"%s\" 파일은 일반 파일이 아님"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "\"%s\" 파일은 %zu 바이트이나 %zu 바이트를 읽음"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "tar 형식 백업에 \"%s\" 파일이 없습니다"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "\"%s\" 파일 체크섬을 마무리 할 수 없음"
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "메니페스트 안에는 \"%s\" 개체가 있으나 디스크에는 없음"
+
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "\"%s\" 파일 체크섬을 초기화 할 수 없음"
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr "\"%s\" 파일은 %<PRIu64> 바이트이나 %<PRIu64> 바이트를 읽음"
+
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
 msgstr "\"%s\" 파일 체크섬 %d, 예상되는 값: %d"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
 msgstr "\"%s\" 파일의 체크섬이 맞지 않음"
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "타임라인 %u번의 WAL 분석 오류"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s kB (%d%%) 검사됨"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid ""
 "%s verifies a backup against the backup manifest.\n"
@@ -446,7 +750,7 @@ msgstr ""
 "%s 프로그램은 백업 메니페스트로 백업을 검사합니다.\n"
 "\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid ""
 "Usage:\n"
@@ -457,64 +761,69 @@ msgstr ""
 "  %s [옵션]... 백업디렉터리\n"
 "\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "옵션들:\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error         오류가 있으면 작업 중지\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t            출력 형식 (plain, tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr "  -i, --ignore=상대경로       지정한 경로 건너뜀\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=경로    메니페스트 파일 경로 지정\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal          WAL 파일 검사 건너뜀\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress              진행 정보를 보여줌\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid ""
 "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr ""
 "  -q, --quiet                 오류를 빼고 나머지는 아무 것도 안 보여줌\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums        체크섬 검사 건너뜀\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr "  -w, --wal-directory=경로    WAL 파일이 있는 경로 지정\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               버전 정보를 보여주고 마침\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  이 도움말을 보여주고 마침\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -523,7 +832,10 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
+
+#~ msgid "parsing failed"
+#~ msgstr "구문 분석 실패"
diff --git a/src/bin/pg_verifybackup/po/ru.po b/src/bin/pg_verifybackup/po/ru.po
index 64005feedfd..a4f76ac9518 100644
--- a/src/bin/pg_verifybackup/po/ru.po
+++ b/src/bin/pg_verifybackup/po/ru.po
@@ -1,10 +1,10 @@
-# Alexander Lakhin <a.lakhin@postgrespro.ru>, 2020, 2021, 2022, 2023.
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024, 2025 Alexander Lakhin <a.lakhin@postgrespro.ru>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_verifybackup (PostgreSQL) 13\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-08-28 07:59+0300\n"
-"PO-Revision-Date: 2023-08-30 12:42+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 19:04+0300\n"
 "Last-Translator: Alexander Lakhin <a.lakhin@postgrespro.ru>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -15,26 +15,102 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 19.12.3\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "не удалось открыть файл \"%s\" для чтения: %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "не удалось прочитать файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:119
+#, c-format
+msgid "could not read file \"%s\": read %d of %zu"
+msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %zu)"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "не удалось закрыть файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "несоответствие порядка байт"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid ""
+"possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr ""
+"возможно несоответствие порядка байт\n"
+"Порядок байт в файле pg_control может не соответствовать используемому\n"
+"этой программой. В этом случае результаты будут неверными и\n"
+"установленный PostgreSQL будет несовместим с этим каталогом данных."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "не удалось открыть файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "не удалось записать файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "нехватка памяти"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "успех"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "буфер назначения слишком мал"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "ошибка OpenSSL"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -46,74 +122,91 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2435
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr ""
+"Инкрементальный лексический анализатор не подходит для нисходящего "
+"рекурсивного разбора."
+
+#: ../../common/jsonapi.c:2437
+msgid "Incremental parser requires incremental lexer."
+msgstr ""
+"Для инкрементального разбора требуется инкрементальный лексический "
+"анализатор."
+
+#: ../../common/jsonapi.c:2439
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr ""
+"Слишком большая вложенность JSON, максимальная допустимая глубина: 6400."
+
+#: ../../common/jsonapi.c:2441
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "Неверная спецпоследовательность: \"\\%s\"."
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "Неверная спецпоследовательность: \"\\%.*s\"."
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ с кодом 0x%02x необходимо экранировать."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2449
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "Ожидался конец текста, но обнаружено продолжение \"%s\"."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "Ожидался конец текста, но обнаружено продолжение \"%.*s\"."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2452
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Ожидался элемент массива или \"]\", но обнаружено \"%s\"."
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "Ожидался элемент массива или \"]\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2455
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "Ожидалась \",\" или \"]\", но обнаружено \"%s\"."
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "Ожидалась \",\" или \"]\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2458
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "Ожидалось \":\", но обнаружено \"%s\"."
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "Ожидалось \":\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2461
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "Ожидалось значение JSON, но обнаружено \"%s\"."
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "Ожидалось значение JSON, но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Неожиданный конец входной строки."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2466
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Ожидалась строка или \"}\", но обнаружено \"%s\"."
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "Ожидалась строка или \"}\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2469
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "Ожидалась \",\" или \"}\", но обнаружено \"%s\"."
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "Ожидалась \",\" или \"}\", но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2472
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "Ожидалась строка, но обнаружено \"%s\"."
+msgid "Expected string, but found \"%.*s\"."
+msgstr "Ожидалась строка, но обнаружено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2475
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "Ошибочный элемент текста \"%s\"."
+msgid "Token \"%.*s\" is invalid."
+msgstr "Ошибочный элемент \"%.*s\"."
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 нельзя преобразовать в текст."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" должны следовать четыре шестнадцатеричные цифры."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2486
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the encoding is not UTF8."
@@ -121,327 +214,549 @@ msgstr ""
 "Спецкоды Unicode для значений выше 007F можно использовать только с "
 "кодировкой UTF8."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid ""
 "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Спецкод Unicode нельзя преобразовать в серверную кодировку %s."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr ""
 "Старшее слово суррогата Unicode не может следовать за другим старшим словом."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Младшее слово суррогата Unicode должно следовать за старшим словом."
 
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "ошибка при разборе"
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "нехватка памяти при составлении описания ошибки"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "не удалось подготовить контекст контрольной суммы манифеста"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "неожиданный конец манифеста"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "не удалось изменить контекст контрольной суммы манифеста"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "неожиданное начало объекта"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "неожиданный конец объекта"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "неожиданное начало массива"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "неожиданный конец массива"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "ожидалось указание версии"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "нераспознанное поле на верхнем уровне"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "неизвестное поле для файла"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "неизвестное поле в указании диапазона WAL"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "неожиданное поле объекта"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "неожиданное скалярное значение"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "версия манифеста не является целым числом"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "неожиданная версия манифеста"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "неожиданное скалярное значение"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "идентификатор системы в манифесте не является целым числом"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "отсутствует указание пути"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
-msgstr "указание пути задано в обычном виде и в закодированном"
+msgstr "путь задан в обычном виде и в закодированном"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "отсутствует указание размера"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "не задан алгоритм расчёта контрольной суммы"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "не удалось декодировать имя файла"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "размер файла не является целочисленным"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нераспознанный алгоритм расчёта контрольных сумм: \"%s\""
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "неверная контрольная сумма для файла \"%s\": \"%s\""
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "отсутствует линия времени"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "отсутствует начальный LSN"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "отсутствует конечный LSN"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
-msgstr "линия времени задаётся не целым числом"
+msgstr "линия времени задана не целым числом"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "не удалось разобрать начальный LSN"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "не удалось разобрать конечный LSN"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "ожидалось как минимум 2 строки"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "последняя строка не оканчивается символом новой строки"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "нехватка памяти"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "не удалось подготовить контекст контрольной суммы манифеста"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "не удалось изменить контекст контрольной суммы манифеста"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "не удалось завершить расчёт контрольной суммы манифеста"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "в манифесте нет контрольной суммы"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "неверная контрольная сумма в манифесте: \"%s\""
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "ошибка контрольной суммы манифеста"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "не удалось разобрать манифест копии: %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "не удалось создать сжатый файл \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "не удалось продублировать stdout: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "не удалось открыть выходной файл: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "не удалось установить уровень сжатия %d: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "эта сборка программы не поддерживает сжатие %s"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "не удалось записать сжатый файл \"%s\": %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "не удалось закрыть сжатый файл \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "не удалось инициализировать библиотеку сжатия"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "не удалось распаковать данные: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "не удалось создать контекст сжатия lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "не удалось записать заголовок lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "не удалось сжать данные: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "не удалось завершить сжатие lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "не удалось инициализировать библиотеку сжатия: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "окончание файла tar занимает больше 2 блоков"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "неожиданное состояние при разборе архива tar"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "пустое имя у компонента tar"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "поток COPY закончился до завершения последнего файла"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "не удалось создать контекст сжатия zstd"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "не удалось установить для zstd уровень сжатия %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "не удалось установить число потоков сжатия %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "не удалось включить режим большой дистанции: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "не удалось создать контекст распаковки zstd"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "файл \"%s\" присутствует в архиве \"%s\", но отсутствует в манифесте"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid ""
+"file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the "
+"manifest"
+msgstr ""
+"файл \"%s\" имеет размер %llu в архиве \"%s\", тогда как размер в манифесте: "
+"%<PRIu64>"
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s: не удалось подготовить контекст контрольной суммы файла \"%s\""
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "не удалось изменить контекст контрольной суммы файла \"%s\""
+
+#: astreamer_verify.c:300
+#, c-format
+msgid ""
+"file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> "
+"bytes were read"
+msgstr ""
+"файл \"%s\" в архиве \"%s\" должен содержать байт: %<PRIu64>, но фактически "
+"прочитано: %<PRIu64>"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "не удалось завершить расчёт контрольной суммы файла \"%s\""
+
+#: astreamer_verify.c:320
+#, c-format
+msgid ""
+"file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr ""
+"для файла \"%s\" в архиве \"%s\" задана контрольная сумма размером %d, но "
+"ожидаемый размер: %d"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "ошибка контрольной суммы для файла \"%s\" в архиве \"%s\""
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "неверный размер управляющего файла (%d), ожидался: %d"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s: %s: ошибка CRC"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s: %s: неожиданная версия управляющего файла"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid ""
+"%s: %s: manifest system identifier is %<PRIu64>, but control file has "
+"%<PRIu64>"
+msgstr ""
+"%s: %s: идентификатор системы в манифесте %<PRIu64>, а в управляющем файле "
+"%<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "неверный формат файла копии \"%s\", должен быть \"plain\" или \"tar\""
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "каталог копии не указан"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "указать %s и %s одновременно нельзя"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid ""
 "program \"%s\" is needed by %s but was not found in the same directory as "
 "\"%s\""
 msgstr "программа \"%s\" нужна для %s, но она не найдена в каталоге \"%s\""
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: pg_verifybackup.c:378
-#, c-format
-msgid "backup successfully verified\n"
-msgstr "копия проверена успешно\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "не удалось открыть файл \"%s\": %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "не удалось прочитать файл \"%s\": %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump не может читать файлы tar"
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "Для проверки копии в tar-формате нужно использовать -n/--no-parse-wal."
+
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "копия проверена успешно\n"
+
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %d из %lld)"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "дублирующийся путь в манифесте копии: \"%s\""
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "не удалось прочитать файл \"%s\" (прочитано байт: %lld из %lld)"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "не удалось открыть каталог \"%s\": %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "дублирующийся путь в манифесте копии: \"%s\""
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не удалось закрыть каталог \"%s\": %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "не удалось получить информацию о файле или каталоге \"%s\": %m"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\" не указывает на файл или каталог"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "\"%s\" не является обычным файлом или каталогом"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
 msgstr "файл \"%s\" присутствует на диске, но отсутствует в манифесте"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
 msgstr ""
-"файл \"%s\" имеет размер на диске: %lld, тогда как размер в манифесте: %zu"
+"файл \"%s\" имеет размер на диске: %llu, тогда как размер в манифесте: %llu"
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "файл \"%s\" присутствует в манифесте, но отсутствует на диске"
+msgid "%s: CRC is incorrect"
+msgstr "%s: ошибка CRC"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "не удалось подготовить контекст контрольной суммы файла \"%s\""
+msgid "%s: unexpected control file version"
+msgstr "%s: неожиданная версия управляющего файла"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "не удалось изменить контекст контрольной суммы файла \"%s\""
+msgid ""
+"%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr ""
+"%s: идентификатор системы в манифесте %<PRIu64>, а в управляющем файле "
+"%<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "не удалось закрыть файл \"%s\": %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "\"%s\" — не обычный файл"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "файл \"%s\" должен содержать байт: %zu, но фактически прочитано: %zu"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "файл \"%s\" не ожидается в копии формата tar"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "не удалось завершить расчёт контрольной суммы файла \"%s\""
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "файл \"%s\" присутствует в манифесте, но отсутствует на диске"
+
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "не удалось подготовить контекст контрольной суммы файла \"%s\""
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr ""
+"файл \"%s\" должен содержать байт: %<PRIu64>, но фактически прочитано: "
+"%<PRIu64>"
+
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
 msgstr ""
 "для файла \"%s\" задана контрольная сумма размером %d, но ожидаемый размер: "
 "%d"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
 msgstr "ошибка контрольной суммы для файла \"%s\""
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "не удалось разобрать WAL для линии времени %u"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s КБ (%d%%) проверено"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid ""
 "%s verifies a backup against the backup manifest.\n"
@@ -450,7 +765,7 @@ msgstr ""
 "%s проверяет резервную копию, используя манифест копии.\n"
 "\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid ""
 "Usage:\n"
@@ -461,67 +776,72 @@ msgstr ""
 "  %s [ПАРАМЕТР]... КАТАЛОГ_КОПИИ\n"
 "\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error         немедленный выход при ошибке\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t            формат копии (plain (обычный), tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr ""
 "  -i, --ignore=ОТНОСИТЕЛЬНЫЙ_ПУТЬ\n"
 "                              игнорировать заданный путь\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=ПУТЬ    использовать заданный файл манифеста\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal          не пытаться разбирать файлы WAL\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress              показывать прогресс операции\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid ""
 "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr ""
 "  -q, --quiet                 не выводить никаких сообщений, кроме ошибок\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums        пропустить проверку контрольных сумм\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr ""
 "  -w, --wal-directory=ПУТЬ    использовать заданный путь к файлам WAL\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               показать версию и выйти\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  показать эту справку и выйти\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -530,10 +850,13 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
+#~ msgid "parsing failed"
+#~ msgstr "ошибка при разборе"
+
 #~ msgid "fatal: "
 #~ msgstr "важно: "
diff --git a/src/bin/pg_verifybackup/po/sv.po b/src/bin/pg_verifybackup/po/sv.po
index 17240feeb5c..7615345ba47 100644
--- a/src/bin/pg_verifybackup/po/sv.po
+++ b/src/bin/pg_verifybackup/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_verifybackup
 # Copyright (C) 2020 PostgreSQL Global Development Group
 # This file is distributed under the same license as the pg_verifybackup (PostgreSQL) package.
-# Dennis Björklund <db@zigo.dhs.org>, 2020, 2021, 2022, 2023.
+# Dennis Björklund <db@zigo.dhs.org>, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 16\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-08-01 14:17+0000\n"
-"PO-Revision-Date: 2023-08-01 22:19+0200\n"
+"POT-Creation-Date: 2025-05-16 16:18+0000\n"
+"PO-Revision-Date: 2025-05-16 20:33+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,26 +17,101 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "kunde inte öppna filen \"%s\" för läsning: %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "kunde inte läsa fil \"%s\": %m"
+
+#: ../../common/controldata_utils.c:119
+#, c-format
+msgid "could not read file \"%s\": read %d of %zu"
+msgstr "kunde inte läsa fil \"%s\": läste %d av %zu"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "kunde inte stänga fil \"%s\": %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "byte-ordning stämmer inte"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid ""
+"possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr ""
+"möjligt fel i byteordning\n"
+"Den byteordning som filen från pg_control lagrats med passar kanske\n"
+"inte detta program. I så fall kan nedanstående resultat vara felaktiga\n"
+"och PostgreSQL-installationen vara inkompatibel med databaskatalogen."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "kunde inte öppna fil \"%s\": %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "kunde inte skriva fil \"%s\": %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "kunde inte fsync:a fil \"%s\": %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "lyckades"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "destinationsbuffer för liten"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "OpenSSL-fel"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -48,389 +123,603 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2435
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr "Recursive-descent-parser kan inte använda inkrementell lexer."
+
+#: ../../common/jsonapi.c:2437
+msgid "Incremental parser requires incremental lexer."
+msgstr "Inkrementell parser kräver en inkrementell lexer."
+
+#: ../../common/jsonapi.c:2439
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr "JSON nästlad för djupt, maximal tillåtet djup är 6400."
+
+#: ../../common/jsonapi.c:2441
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "Escape-sekvens \"\\%s\" är ogiltig."
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "Escape-sekvens \"\\%.*s\" är ogiltig."
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Tecken med värde 0x%02x måste escape:as."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2449
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "Förväntade slut på indata, men hittade \"%s\"."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "Förväntade slut på indata, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2452
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Färväntade array-element eller \"]\", men hittade \"%s\"."
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "Färväntade array-element eller \"]\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2455
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "Förväntade \",\" eller \"]\", men hittade \"%s\"."
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "Förväntade \",\" eller \"]\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2458
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "Förväntade sig \":\" men hittade \"%s\"."
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "Förväntade sig \":\" men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2461
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "Förväntade JSON-värde, men hittade \"%s\"."
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "Förväntade JSON-värde, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Indatasträngen avslutades oväntat."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2466
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Färväntade sträng eller \"}\", men hittade \"%s\"."
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "Färväntade sträng eller \"}\", men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2469
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "Förväntade sig \",\" eller \"}\" men hittade \"%s\"."
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "Förväntade sig \",\" eller \"}\" men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2472
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "Förväntade sträng, men hittade \"%s\"."
+msgid "Expected string, but found \"%.*s\"."
+msgstr "Förväntade sträng, men hittade \"%.*s\"."
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2475
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "Token \"%s\" är ogiltig."
+msgid "Token \"%.*s\" is invalid."
+msgstr "Token \"%.*s\" är ogiltig."
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 kan inte konverteras till text."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" måste följas av fyra hexdecimala siffror."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Escape-värden för unicode kan inte användas för kodpunkter med värde över 007F när kodningen inte är UTF8."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Escape-värde för unicode kan inte översättas till serverns kodning %s."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Unicodes övre surrogathalva får inte komma efter en övre surrogathalva."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Unicodes lägre surrogathalva måste följa en övre surrogathalva."
 
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "parsning misslyckades"
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "slut på minne vid skapande av felbeskrivning"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "kunde inte initiera kontrollsumma för backup-manifest"
+
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "manifestet avslutades oväntat"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "kunde inte uppdatera kontrollsumma för backup-manifest"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "oväntad objektstart"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "oväntat objektslut"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "oväntad array-start"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "oväntat array-slut"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "förväntade en versionsindikator"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "okänt toppnivåfält"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "oväntat filfält"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "oväntat WAL-intervall-fält"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "oväntat objektfält"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "oväntad skalar"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "manifestversion är inte ett heltal"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "oväntad manifestversion"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "oväntad skalar"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "manifestets systemidentifierare är inte ett heltal"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "saknas sökväg"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "både sökväg och kodad sökväg"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "saknar storlek"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "kontrollsumma utan algoritm"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "kunde inte avkoda filnamn"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "filstorlek är inte ett haltal"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "okänd algoritm för kontrollsumma: \"%s\""
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "ogiltig kontrollsumma för fil \"%s\": \"%s\""
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "saknar tidslinje"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "saknar start-LSN"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "saknar slut-LSN"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "tidslinje är inte ett heltal"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "kunde inte parsa start-LSN"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "kunde inte parsa slut-LSN"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "förväntade minst två rader"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "sista raden är inte nyradsterminerad"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "kunde inte initiera kontrollsumma för backup-manifest"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "kunde inte uppdatera kontrollsumma för backup-manifest"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "kunde inte göra klart kontrollsumma för backup-manifest"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "manifestet har ingen kontrollsumma"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "ogiltig kontrollsumma för manifest: \"%s\""
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "kontrollsumma för manifest matchar inte"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "kunde inte parsa backup-manifest: %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "kunde inte skapa komprimerad fil \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "kunde inte duplicera stdout: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "kunde inte öppna utdatafilen: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "kunde inte sätta komprimeringsnivå %d: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "detta bygge stöder inte komprimering med %s"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "kunde inte skriva till komprimerad fil \"%s\": %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "kunde inte stänga komprimerad fil \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "kunde inte initierar komprimeringsbibliotek"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "kunde inte dekomprimera data: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "kunde inte skapa kontext för lz4-komprimering: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "kunde inte skriva lz4-header: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "kunde inte komprimera data: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "kunde inte avsluta lz4-komprimering: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "kunde inte initiera komprimeringsbibliotek: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "tarfilens slutdel överskred 2 block"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "oväntat tillstånd vid parsning av tar-arkiv"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "tar-medlem har tomt namn"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "COPY-ström avslutade innan sista filen var klar"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "kunde inte skapa kontext för zstd-komprimering"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "kunde inte sätta zstd-komprimeringsnivå till %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "kunde inte sätta komprimeringens arbetarantal till %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "kunde inte aktivera långdistansläge: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "kunde inte skapa kontext för zstd-dekomprimering"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "filen \"%s\" finns i arkivet \"%s\" men inte i manifestetet"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid "file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the manifest"
+msgstr "filen \"%s\" har storlek %llu i arkivet \"%s\" men storlek %<PRIu64> i manifestet"
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s: kunde inte initiera kontrollsumma för filen \"%s\""
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "kunde inte uppdatera kontrollsumma för filen \"%s\""
+
+#: astreamer_verify.c:300
+#, c-format
+msgid "file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> bytes were read"
+msgstr "filen \"%s\" i arkivet \"%s\" skall innehålla %<PRIu64> byte men vi läste %<PRIu64> byte"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "kunde inte göra klart kontrollsumma för filen \"%s\""
+
+#: astreamer_verify.c:320
+#, c-format
+msgid "file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "filen \"%s\" i arkivet \"%s\" har kontrollsumma med längd %d men förväntade %d"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "kontrollsumman matchar inte för fil \"%s\" i arkivet \"%s\""
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "oväntad kontrollfilstorlek %d, förväntade %d"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s: %s: CRC är inkorrekt"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s: %s: oväntad version på kontrollfil"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid "%s: %s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: %s: manifestets systemidentifierare är %<PRIu64> men kontrollfilern har %<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "ogiltigt backupformat \"%s\", måste vara \"plain\" eller \"tar\""
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "ingen backup-katalog angiven"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "kan inte ange både %s och %s"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "programmet \"%s\" behövs av %s men hittades inte i samma katalog som \"%s\""
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "programmet \"%s\" hittades av \"%s\" men är inte av samma version som %s"
 
-#: pg_verifybackup.c:378
-#, c-format
-msgid "backup successfully verified\n"
-msgstr "korrekt verifierad backup\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "kunde inte öppna fil \"%s\": %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "kunde inte läsa fil \"%s\": %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump kan inte läsa tar-filer"
+
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "Du måste använda -n/--no-parse-wal för att verifiera en backup i tar-format."
+
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "korrekt verifierad backup\n"
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "kunde inte läsa fil \"%s\": läste %d av %lld"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "duplicerad sökväg i backup-manifest: \"%s\""
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "kunde inte läsa fil \"%s\": läste %lld av %lld"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "kunde inte öppna katalog \"%s\": %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "duplicerad sökväg i backup-manifest: \"%s\""
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "kunde inte stänga katalog \"%s\": %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "kunde inte ta status på fil eller katalog \"%s\": %m"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\" är inte en fil eller katalog"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "\"%s\" är inte en vanlig fil eller katalog"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
 msgstr "\"%s\" finns på disk men är inte i manifestet"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
-msgstr "\"%s\" har storlek %lld på disk men storlek %zu i manifestet"
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
+msgstr "\"%s\" har storlek %llu på disk men storlek %llu i manifestet"
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "\"%s\" finns i manifestet men inte på disk"
+msgid "%s: CRC is incorrect"
+msgstr "%s: CRC är inkorrekt"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "kunde inte initiera kontrollsumma för filen \"%s\""
+msgid "%s: unexpected control file version"
+msgstr "%s: oväntad version på kontrollfil"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "kunde inte uppdatera kontrollsumma för filen \"%s\""
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: manifestets systemidentifierare är %<PRIu64> men kontrollfilern har %<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "kunde inte stänga fil \"%s\": %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "filen \"%s\" är inte en normal fil"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "filen \"%s\" skall innehålla %zu byte men vi läste %zu byte"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "filen \"%s\" förväntades inte vara en backup i tar-format"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "kunde inte göra klart kontrollsumma för filen \"%s\""
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "\"%s\" finns i manifestet men inte på disk"
+
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "kunde inte initiera kontrollsumma för filen \"%s\""
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr "filen \"%s\" skall innehålla %<PRIu64> byte men vi läste %<PRIu64> byte"
+
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
 msgstr "filen \"%s\" har kontrollsumma med längd %d men förväntade %d"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
 msgstr "kontrollsumman matchar inte för fil \"%s\""
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "WAL-parsning misslyckades för tidslinje %u"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s kB (%d%%) verifierad"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid ""
 "%s verifies a backup against the backup manifest.\n"
@@ -439,7 +728,7 @@ msgstr ""
 "%s verifierar en backup gentemot backup-manifestet.\n"
 "\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid ""
 "Usage:\n"
@@ -450,62 +739,67 @@ msgstr ""
 "  %s [FLAGGOR]... BACKUPKAT\n"
 "\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error         avsluta direkt vid fel\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t            backupformat (plain, tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr "  -i, --ignore=RELATIV_SÖKVÄG hoppa över angiven sökväg\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=SÖKVÄG  använd denna sökväg till manifestet\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal          försök inte parsa WAL-filer\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress              visa förloppsinformation\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr "  -q, --quiet                 skriv inte ut några meddelanden förutom fel\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums        hoppa över verifiering av kontrollsummor\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr "  -w, --wal-directory=SÖKVÄG  använd denna sökväg till WAL-filer\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version               visa versionsinformation, avsluta sedan\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                  visa denna hjälp, avsluta sedan\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -514,35 +808,7 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
-
-#, 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."
-#~ msgstr ""
-#~ "Programmet \"%s\" behövs av %s men hittades inte i samma\n"
-#~ "katalog som \"%s\".\n"
-#~ "Kontrollera din installation."
-
-#, c-format
-#~ msgid ""
-#~ "The program \"%s\" was found by \"%s\"\n"
-#~ "but was not the same version as %s.\n"
-#~ "Check your installation."
-#~ msgstr ""
-#~ "Programmet \"%s\" hittades av \"%s\"\n"
-#~ "men är inte av samma version som %s.\n"
-#~ "Kontrollera din installation."
-
-#, c-format
-#~ msgid "Try \"%s --help\" for more information.\n"
-#~ msgstr "Försök med \"%s --help\" för mer information.\n"
-
-#, c-format
-#~ msgid "fatal: "
-#~ msgstr "fatalt: "
diff --git a/src/bin/pg_verifybackup/po/uk.po b/src/bin/pg_verifybackup/po/uk.po
index 034b9764232..8ee669d9bde 100644
--- a/src/bin/pg_verifybackup/po/uk.po
+++ b/src/bin/pg_verifybackup/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-04-19 11:17+0000\n"
-"PO-Revision-Date: 2023-12-19 15:37\n"
+"POT-Creation-Date: 2025-12-31 02:18+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,29 +14,100 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_16_STABLE/pg_verifybackup.pot\n"
-"X-Crowdin-File-ID: 959\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_verifybackup.pot\n"
+"X-Crowdin-File-ID: 1059\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
 
+#: ../../common/controldata_utils.c:97
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "не вдалося відкрити файл \"%s\" для читання: %m"
+
+#: ../../common/controldata_utils.c:110 pg_verifybackup.c:440
+#: pg_verifybackup.c:478 pg_verifybackup.c:1025 pg_verifybackup.c:1144
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "не вдалося прочитати файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:119
+#, c-format
+msgid "could not read file \"%s\": read %d of %zu"
+msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %zu"
+
+#: ../../common/controldata_utils.c:132 ../../common/controldata_utils.c:280
+#: pg_verifybackup.c:1030 pg_verifybackup.c:1150
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "неможливо закрити файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:168
+msgid "byte ordering mismatch"
+msgstr "неправильний порядок байтів"
+
+#: ../../common/controldata_utils.c:170
+#, c-format
+msgid "possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, and\n"
+"the PostgreSQL installation would be incompatible with this data directory."
+msgstr "можлива помилка у послідовності байтів.\n"
+"Порядок байтів, що використовують для зберігання файлу pg_control, може не відповідати тому, який використовується цією програмою. У такому випадку результати нижче будуть неправильним, і інсталяція PostgreSQL буде несумісною з цим каталогом даних."
+
+#: ../../common/controldata_utils.c:230 pg_verifybackup.c:408
+#: pg_verifybackup.c:1005 pg_verifybackup.c:1113
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "не можливо відкрити файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:249
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "не вдалося записати файл \"%s\": %m"
+
+#: ../../common/controldata_utils.c:268
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "не вдалося fsync файл \"%s\": %m"
+
+#: ../../common/cryptohash.c:261 ../../common/cryptohash_openssl.c:356
+#: ../../common/jsonapi.c:2410 ../../common/parse_manifest.c:157
+#: ../../common/parse_manifest.c:852
+#, c-format
+msgid "out of memory"
+msgstr "недостатньо пам'яті"
+
+#: ../../common/cryptohash.c:266 ../../common/cryptohash.c:272
+#: ../../common/cryptohash_openssl.c:368 ../../common/cryptohash_openssl.c:376
+msgid "success"
+msgstr "успіх"
+
+#: ../../common/cryptohash.c:268 ../../common/cryptohash_openssl.c:370
+msgid "destination buffer too small"
+msgstr "буфер призначення занадто малий"
+
+#: ../../common/cryptohash_openssl.c:372
+msgid "OpenSSL failure"
+msgstr "Помилка OpenSSL"
+
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../common/fe_memutils.c:161
 #, c-format
@@ -48,463 +119,682 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/jsonapi.c:1144
+#: ../../common/jsonapi.c:2435
+msgid "Recursive descent parser cannot use incremental lexer."
+msgstr "Рекурсивний спуск не може використовувати інкрементний лексичний аналізатор."
+
+#: ../../common/jsonapi.c:2437
+msgid "Incremental parser requires incremental lexer."
+msgstr "Інкрементний аналізатор потребує Інкрементний лексичний аналізатор."
+
+#: ../../common/jsonapi.c:2439
+msgid "JSON nested too deep, maximum permitted depth is 6400."
+msgstr "JSON вкладений занадто глибокий, максимально дозволена глибина - 6400."
+
+#: ../../common/jsonapi.c:2441
 #, c-format
-msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "Неприпустима спеціальна послідовність \"\\%s\"."
+msgid "Escape sequence \"\\%.*s\" is invalid."
+msgstr "Неприпустима спеціальна послідовність \"\\%.*s\"."
 
-#: ../../common/jsonapi.c:1147
+#: ../../common/jsonapi.c:2445
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Символ зі значенням 0x%02x повинен бути пропущений."
 
-#: ../../common/jsonapi.c:1150
+#: ../../common/jsonapi.c:2449
 #, c-format
-msgid "Expected end of input, but found \"%s\"."
-msgstr "Очікувався кінець введення, але знайдено \"%s\"."
+msgid "Expected end of input, but found \"%.*s\"."
+msgstr "Очікувався кінець введення, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1153
+#: ../../common/jsonapi.c:2452
 #, c-format
-msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Очікувався елемент масиву або \"]\", але знайдено \"%s\"."
+msgid "Expected array element or \"]\", but found \"%.*s\"."
+msgstr "Очікувався елемент масиву або \"]\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1156
+#: ../../common/jsonapi.c:2455
 #, c-format
-msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "Очікувалось \",\" або \"]\", але знайдено \"%s\"."
+msgid "Expected \",\" or \"]\", but found \"%.*s\"."
+msgstr "Очікувалось \",\" або \"]\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1159
+#: ../../common/jsonapi.c:2458
 #, c-format
-msgid "Expected \":\", but found \"%s\"."
-msgstr "Очікувалось \":\", але знайдено \"%s\"."
+msgid "Expected \":\", but found \"%.*s\"."
+msgstr "Очікувалось \":\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1162
+#: ../../common/jsonapi.c:2461
 #, c-format
-msgid "Expected JSON value, but found \"%s\"."
-msgstr "Очікувалось значення JSON, але знайдено \"%s\"."
+msgid "Expected JSON value, but found \"%.*s\"."
+msgstr "Очікувалось значення JSON, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1165
+#: ../../common/jsonapi.c:2464
 msgid "The input string ended unexpectedly."
 msgstr "Несподіваний кінець вхідного рядка."
 
-#: ../../common/jsonapi.c:1167
+#: ../../common/jsonapi.c:2466
 #, c-format
-msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Очікувався рядок або \"}\", але знайдено \"%s\"."
+msgid "Expected string or \"}\", but found \"%.*s\"."
+msgstr "Очікувався рядок або \"}\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1170
+#: ../../common/jsonapi.c:2469
 #, c-format
-msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "Очікувалось \",\" або \"}\", але знайдено \"%s\"."
+msgid "Expected \",\" or \"}\", but found \"%.*s\"."
+msgstr "Очікувалось \",\" або \"}\", але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1173
+#: ../../common/jsonapi.c:2472
 #, c-format
-msgid "Expected string, but found \"%s\"."
-msgstr "Очікувався рядок, але знайдено \"%s\"."
+msgid "Expected string, but found \"%.*s\"."
+msgstr "Очікувався рядок, але знайдено \"%.*s\"."
 
-#: ../../common/jsonapi.c:1176
+#: ../../common/jsonapi.c:2475
 #, c-format
-msgid "Token \"%s\" is invalid."
-msgstr "Неприпустимий маркер \"%s\"."
+msgid "Token \"%.*s\" is invalid."
+msgstr "Неприпустимий маркер \"%.*s\"."
 
-#: ../../common/jsonapi.c:1179
+#: ../../common/jsonapi.c:2481
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 не можна перетворити в текст."
 
-#: ../../common/jsonapi.c:1181
+#: ../../common/jsonapi.c:2483
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "За \"\\u\" повинні прямувати чотири шістнадцяткових числа."
 
-#: ../../common/jsonapi.c:1184
+#: ../../common/jsonapi.c:2486
 msgid "Unicode escape values cannot be used for code point values above 007F when the encoding is not UTF8."
 msgstr "Значення виходу Unicode не можна використовувати для значень кодових точок більше 007F, якщо кодування не UTF8."
 
-#: ../../common/jsonapi.c:1187
+#: ../../common/jsonapi.c:2495
 #, c-format
 msgid "Unicode escape value could not be translated to the server's encoding %s."
 msgstr "Значення символу Unicode не вдалося перекласти в кодування сервера %s."
 
-#: ../../common/jsonapi.c:1190
+#: ../../common/jsonapi.c:2502
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Старший сурогат Unicode не повинен прямувати за іншим старшим сурогатом."
 
-#: ../../common/jsonapi.c:1192
+#: ../../common/jsonapi.c:2504
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Молодший сурогат Unicode не повинен прямувати за іншим молодшим сурогатом."
 
-#: parse_manifest.c:150
-msgid "parsing failed"
-msgstr "помилка парсингу"
+#: ../../common/jsonapi.c:2526
+msgid "out of memory while constructing error description"
+msgstr "недостатньо пам'яті під час створення опису помилки"
+
+#: ../../common/parse_manifest.c:159 ../../common/parse_manifest.c:854
+#, c-format
+msgid "could not initialize checksum of manifest"
+msgstr "не вдалося ініціалізувати контрольну суму маніфесту"
 
-#: parse_manifest.c:152
+#: ../../common/parse_manifest.c:203 ../../common/parse_manifest.c:260
 msgid "manifest ended unexpectedly"
 msgstr "маніфест закінчився несподівано"
 
-#: parse_manifest.c:191
+#: ../../common/parse_manifest.c:209 ../../common/parse_manifest.c:861
+#, c-format
+msgid "could not update checksum of manifest"
+msgstr "не вдалося оновити контрольну суму маніфесту"
+
+#: ../../common/parse_manifest.c:301
 msgid "unexpected object start"
 msgstr "неочікуваний початок об'єкта"
 
-#: parse_manifest.c:226
+#: ../../common/parse_manifest.c:336
 msgid "unexpected object end"
 msgstr "неочікуваний кінець об'єкта"
 
-#: parse_manifest.c:255
+#: ../../common/parse_manifest.c:365
 msgid "unexpected array start"
 msgstr "неочікуваний початок масиву"
 
-#: parse_manifest.c:280
+#: ../../common/parse_manifest.c:390
 msgid "unexpected array end"
 msgstr "неочікуваний кінець масиву"
 
-#: parse_manifest.c:307
+#: ../../common/parse_manifest.c:417
 msgid "expected version indicator"
 msgstr "індикатор очікуваної версії"
 
-#: parse_manifest.c:336
+#: ../../common/parse_manifest.c:453
 msgid "unrecognized top-level field"
 msgstr "нерозпізнане поле верхнього рівня"
 
-#: parse_manifest.c:355
+#: ../../common/parse_manifest.c:472
 msgid "unexpected file field"
 msgstr "неочікуване поле файлу"
 
-#: parse_manifest.c:369
+#: ../../common/parse_manifest.c:486
 msgid "unexpected WAL range field"
 msgstr "неочікуване поле діапазону WAL"
 
-#: parse_manifest.c:375
+#: ../../common/parse_manifest.c:492
 msgid "unexpected object field"
 msgstr "неочікуване поле об'єкта"
 
-#: parse_manifest.c:407
+#: ../../common/parse_manifest.c:582
+msgid "unexpected scalar"
+msgstr "неочікуваний скаляр"
+
+#: ../../common/parse_manifest.c:608
+msgid "manifest version not an integer"
+msgstr "версія маніфесту не ціле число"
+
+#: ../../common/parse_manifest.c:612
 msgid "unexpected manifest version"
 msgstr "неочікувана версія маніфесту"
 
-#: parse_manifest.c:458
-msgid "unexpected scalar"
-msgstr "неочікуваний скаляр"
+#: ../../common/parse_manifest.c:636
+msgid "system identifier in manifest not an integer"
+msgstr "системний ідентифікатор в маніфесті не ціле число"
 
-#: parse_manifest.c:484
+#: ../../common/parse_manifest.c:661
 msgid "missing path name"
 msgstr "пропущено шлях"
 
-#: parse_manifest.c:487
+#: ../../common/parse_manifest.c:664
 msgid "both path name and encoded path name"
 msgstr "і ім'я шляху, і закодований шлях"
 
-#: parse_manifest.c:489
+#: ../../common/parse_manifest.c:666
 msgid "missing size"
 msgstr "відсутній розмір"
 
-#: parse_manifest.c:492
+#: ../../common/parse_manifest.c:669
 msgid "checksum without algorithm"
 msgstr "контрольна сума без алгоритму"
 
-#: parse_manifest.c:506
+#: ../../common/parse_manifest.c:683
 msgid "could not decode file name"
 msgstr "не вдалося декодувати ім'я файлу"
 
-#: parse_manifest.c:516
+#: ../../common/parse_manifest.c:693
 msgid "file size is not an integer"
 msgstr "розмір файлу не є цілим числом"
 
-#: parse_manifest.c:522
+#: ../../common/parse_manifest.c:699
 #, c-format
 msgid "unrecognized checksum algorithm: \"%s\""
 msgstr "нерозпізнаний алгоритм контрольної суми: \"%s\""
 
-#: parse_manifest.c:541
+#: ../../common/parse_manifest.c:718
 #, c-format
 msgid "invalid checksum for file \"%s\": \"%s\""
 msgstr "неприпустима контрольна сума для файлу \"%s\": \"%s\""
 
-#: parse_manifest.c:584
+#: ../../common/parse_manifest.c:761
 msgid "missing timeline"
 msgstr "відсутня часова шкала"
 
-#: parse_manifest.c:586
+#: ../../common/parse_manifest.c:763
 msgid "missing start LSN"
 msgstr "відсутній LSN початку"
 
-#: parse_manifest.c:588
+#: ../../common/parse_manifest.c:765
 msgid "missing end LSN"
 msgstr "відсутній LSN кінця"
 
-#: parse_manifest.c:594
+#: ../../common/parse_manifest.c:771
 msgid "timeline is not an integer"
 msgstr "часова лінія не є цілим числом"
 
-#: parse_manifest.c:597
+#: ../../common/parse_manifest.c:774
 msgid "could not parse start LSN"
 msgstr "не вдалося проаналізувати початковий LSN"
 
-#: parse_manifest.c:600
+#: ../../common/parse_manifest.c:777
 msgid "could not parse end LSN"
 msgstr "не вдалося проаналізувати кінцевий LSN"
 
-#: parse_manifest.c:661
+#: ../../common/parse_manifest.c:842
 msgid "expected at least 2 lines"
 msgstr "очікувалося принаймні 2 рядки"
 
-#: parse_manifest.c:664
+#: ../../common/parse_manifest.c:845
 msgid "last line not newline-terminated"
 msgstr "останній рядок не завершений новим рядком"
 
-#: parse_manifest.c:669
-#, c-format
-msgid "out of memory"
-msgstr "недостатньо пам'яті"
-
-#: parse_manifest.c:671
-#, c-format
-msgid "could not initialize checksum of manifest"
-msgstr "не вдалося ініціалізувати контрольну суму маніфесту"
-
-#: parse_manifest.c:673
-#, c-format
-msgid "could not update checksum of manifest"
-msgstr "не вдалося оновити контрольну суму маніфесту"
-
-#: parse_manifest.c:676
+#: ../../common/parse_manifest.c:864
 #, c-format
 msgid "could not finalize checksum of manifest"
 msgstr "не вдалося остаточно завершити контрольну суму маніфесту"
 
-#: parse_manifest.c:680
+#: ../../common/parse_manifest.c:868
 #, c-format
 msgid "manifest has no checksum"
 msgstr "у маніфесті немає контрольної суми"
 
-#: parse_manifest.c:684
+#: ../../common/parse_manifest.c:872
 #, c-format
 msgid "invalid manifest checksum: \"%s\""
 msgstr "неприпустима контрольна сума маніфесту: \"%s\""
 
-#: parse_manifest.c:688
+#: ../../common/parse_manifest.c:876
 #, c-format
 msgid "manifest checksum mismatch"
 msgstr "невідповідність контрольної суми маніфесту"
 
-#: parse_manifest.c:703
+#: ../../common/parse_manifest.c:891
 #, c-format
 msgid "could not parse backup manifest: %s"
 msgstr "не вдалося проаналізувати маніфест резервної копії: %s"
 
-#: pg_verifybackup.c:273 pg_verifybackup.c:282 pg_verifybackup.c:293
+#: ../../fe_utils/astreamer_gzip.c:115
+#, c-format
+msgid "could not create compressed file \"%s\": %m"
+msgstr "не вдалося створити стиснутий файл \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:127
+#, c-format
+msgid "could not duplicate stdout: %m"
+msgstr "не вдалося дублювати stdout: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:131
+#, c-format
+msgid "could not open output file: %m"
+msgstr "не вдалося відкрити вихідний файл: %m"
+
+#: ../../fe_utils/astreamer_gzip.c:135
+#, c-format
+msgid "could not set compression level %d: %s"
+msgstr "не вдалося встановити рівень стискання %d: %s"
+
+#: ../../fe_utils/astreamer_gzip.c:140 ../../fe_utils/astreamer_gzip.c:273
+#: ../../fe_utils/astreamer_lz4.c:102 ../../fe_utils/astreamer_lz4.c:300
+#: ../../fe_utils/astreamer_zstd.c:133 ../../fe_utils/astreamer_zstd.c:288
+#, c-format
+msgid "this build does not support compression with %s"
+msgstr "ця збірка не підтримує стиснення з %s"
+
+#: ../../fe_utils/astreamer_gzip.c:167
+#, c-format
+msgid "could not write to compressed file \"%s\": %s"
+msgstr "не вдалося записати до стиснутого файлу \"%s\": %s"
+
+#: ../../fe_utils/astreamer_gzip.c:191
+#, c-format
+msgid "could not close compressed file \"%s\": %m"
+msgstr "не вдалося закрити стиснутий файл \"%s\": %m"
+
+#: ../../fe_utils/astreamer_gzip.c:269
+#, c-format
+msgid "could not initialize compression library"
+msgstr "не вдалося ініціалізувати бібліотеку стискання"
+
+#: ../../fe_utils/astreamer_gzip.c:320 ../../fe_utils/astreamer_lz4.c:356
+#: ../../fe_utils/astreamer_zstd.c:333
+#, c-format
+msgid "could not decompress data: %s"
+msgstr "не вдалося розпакувати дані: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:97
+#, c-format
+msgid "could not create lz4 compression context: %s"
+msgstr "не вдалося створити контекст стиснення lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:142
+#, c-format
+msgid "could not write lz4 header: %s"
+msgstr "не вдалося записати заголовок lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:191 ../../fe_utils/astreamer_zstd.c:185
+#: ../../fe_utils/astreamer_zstd.c:227
+#, c-format
+msgid "could not compress data: %s"
+msgstr "не вдалося стиснути дані: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:243
+#, c-format
+msgid "could not end lz4 compression: %s"
+msgstr "не вдалося закінчити стискання lz4: %s"
+
+#: ../../fe_utils/astreamer_lz4.c:295
+#, c-format
+msgid "could not initialize compression library: %s"
+msgstr "не вдалося ініціалізувати бібліотеку стиснення: %s"
+
+#: ../../fe_utils/astreamer_tar.c:244
+#, c-format
+msgid "tar file trailer exceeds 2 blocks"
+msgstr "причіп файлу tar перевищує 2 блоки"
+
+#: ../../fe_utils/astreamer_tar.c:249 astreamer_verify.c:130
+#, c-format
+msgid "unexpected state while parsing tar archive"
+msgstr "неочікуваний стан під час розбору архіву tar"
+
+#: ../../fe_utils/astreamer_tar.c:292
+#, c-format
+msgid "tar member has empty name"
+msgstr "частина tar містить порожню назву"
+
+#: ../../fe_utils/astreamer_tar.c:326
+#, c-format
+msgid "COPY stream ended before last file was finished"
+msgstr "потік COPY завершився до завершення останнього файлу"
+
+#: ../../fe_utils/astreamer_zstd.c:89
+#, c-format
+msgid "could not create zstd compression context"
+msgstr "не вдалося створити контекст стиснення zstd"
+
+#: ../../fe_utils/astreamer_zstd.c:95
+#, c-format
+msgid "could not set zstd compression level to %d: %s"
+msgstr "не вдалося встановити рівень стискання zstd на %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:109
+#, c-format
+msgid "could not set compression worker count to %d: %s"
+msgstr "не вдалося встановити кількість процесів стискання на %d: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:120
+#, c-format
+msgid "could not enable long-distance mode: %s"
+msgstr "не вдалося включити режим довгої відстані: %s"
+
+#: ../../fe_utils/astreamer_zstd.c:279
+#, c-format
+msgid "could not create zstd decompression context"
+msgstr "не вдалося створити контекст zstd декомпресії"
+
+#: astreamer_verify.c:198
+#, c-format
+msgid "file \"%s\" is present in archive \"%s\" but not in the manifest"
+msgstr "файл \"%s\" присутній в архіві \"%s\", але відсутній у маніфесті"
+
+#: astreamer_verify.c:211
+#, c-format
+msgid "file \"%s\" has size %llu in archive \"%s\" but size %<PRIu64> in the manifest"
+msgstr "файл \"%s\" має розмір %llu в архіві \"%s\", але розмір %<PRIu64> у маніфесті"
+
+#: astreamer_verify.c:236
+#, c-format
+msgid "%s: could not initialize checksum of file \"%s\""
+msgstr "%s: не вдалося ініціалізувати контрольну суму файлу \"%s\""
+
+#: astreamer_verify.c:274 pg_verifybackup.c:1133
+#, c-format
+msgid "could not update checksum of file \"%s\""
+msgstr "не вдалося оновити контрольну суму файлу \"%s\""
+
+#: astreamer_verify.c:300
+#, c-format
+msgid "file \"%s\" in archive \"%s\" should contain %<PRIu64> bytes, but %<PRIu64> bytes were read"
+msgstr "файл \"%s\" в архіві \"%s\" повинен містити %<PRIu64> байтів, але було прочитано %<PRIu64> байтів"
+
+#: astreamer_verify.c:312 pg_verifybackup.c:1179
+#, c-format
+msgid "could not finalize checksum of file \"%s\""
+msgstr "не вдалося остаточно завершити контрольну суму файлу \"%s\""
+
+#: astreamer_verify.c:320
+#, c-format
+msgid "file \"%s\" in archive \"%s\" has checksum of length %d, but expected %d"
+msgstr "файл \"%s\" в архіві \"%s\" має контрольну суму довжини %d, але очікувалось %d"
+
+#: astreamer_verify.c:325
+#, c-format
+msgid "checksum mismatch for file \"%s\" in archive \"%s\""
+msgstr "невідповідність контрольної суми для файлу \"%s\" в архіві \"%s\""
+
+#: astreamer_verify.c:387
+#, c-format
+msgid "unexpected control file size %d, expected %d"
+msgstr "неочікуваний розмір контрольного файлу %d, очікувалося %d"
+
+#: astreamer_verify.c:399
+#, c-format
+msgid "%s: %s: CRC is incorrect"
+msgstr "%s: %s: CRC невірний"
+
+#: astreamer_verify.c:405
+#, c-format
+msgid "%s: %s: unexpected control file version"
+msgstr "%s: %s: неочікувана версія контрольного файлу"
+
+#: astreamer_verify.c:412
+#, c-format
+msgid "%s: %s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: %s: системний ідентифікатор маніфесту %<PRIu64>, але контрольний файл має %<PRIu64>"
+
+#: pg_verifybackup.c:208
+#, c-format
+msgid "invalid backup format \"%s\", must be \"plain\" or \"tar\""
+msgstr "неприпустимий формат резервної копії \"%s\", має бути \"plain\" або \"tar\""
+
+#: pg_verifybackup.c:229 pg_verifybackup.c:238 pg_verifybackup.c:249
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_verifybackup.c:281
+#: pg_verifybackup.c:237
 #, c-format
 msgid "no backup directory specified"
 msgstr "не вказано папку резервної копії"
 
-#: pg_verifybackup.c:291
+#: pg_verifybackup.c:247
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: pg_verifybackup.c:299
+#: pg_verifybackup.c:255
 #, c-format
 msgid "cannot specify both %s and %s"
 msgstr "не можна вказати як %s, так і %s"
 
-#: pg_verifybackup.c:319
+#: pg_verifybackup.c:275
 #, c-format
 msgid "program \"%s\" is needed by %s but was not found in the same directory as \"%s\""
 msgstr "програма \"%s\" потрібна для %s, але не знайдена в тому ж каталозі, що й \"%s\""
 
-#: pg_verifybackup.c:322
+#: pg_verifybackup.c:278
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr "програма \"%s\" знайдена для \"%s\", але має відмінну версію від %s"
 
-#: pg_verifybackup.c:378
-#, c-format
-msgid "backup successfully verified\n"
-msgstr "резервну копію успішно перевірено\n"
-
-#: pg_verifybackup.c:404 pg_verifybackup.c:748
+#: pg_verifybackup.c:304 pg_verifybackup.c:625
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "не можливо відкрити файл \"%s\": %m"
+msgid "could not open directory \"%s\": %m"
+msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: pg_verifybackup.c:408
+#: pg_verifybackup.c:323 pg_verifybackup.c:412
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: pg_verifybackup.c:428 pg_verifybackup.c:779
+#: pg_verifybackup.c:340
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "не вдалося прочитати файл \"%s\": %m"
+msgid "pg_waldump cannot read tar files"
+msgstr "pg_waldump не може читати файли tar"
+
+#: pg_verifybackup.c:341
+#, c-format
+msgid "You must use -n/--no-parse-wal when verifying a tar-format backup."
+msgstr "Ви повинні використовувати -n/--no-parse-wal при перевірці резервної копії tar-формату."
 
-#: pg_verifybackup.c:431
+#: pg_verifybackup.c:383
+#, c-format
+msgid "backup successfully verified\n"
+msgstr "резервну копію успішно перевірено\n"
+
+#: pg_verifybackup.c:442
 #, c-format
 msgid "could not read file \"%s\": read %d of %lld"
 msgstr "не вдалося прочитати файл \"%s\": прочитано %d з %lld"
 
-#: pg_verifybackup.c:491
+#: pg_verifybackup.c:480
 #, c-format
-msgid "duplicate path name in backup manifest: \"%s\""
-msgstr "дубльований шлях у маніфесті резервного копіювання: \"%s\""
+msgid "could not read file \"%s\": read %lld of %lld"
+msgstr "не вдалося прочитати файл \"%s\": прочитано %lld з %lld"
 
-#: pg_verifybackup.c:554 pg_verifybackup.c:561
+#: pg_verifybackup.c:563
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "не вдалося відкрити каталог \"%s\": %m"
+msgid "duplicate path name in backup manifest: \"%s\""
+msgstr "дубльований шлях у маніфесті резервного копіювання: \"%s\""
 
-#: pg_verifybackup.c:593
+#: pg_verifybackup.c:657 pg_verifybackup.c:827
 #, c-format
 msgid "could not close directory \"%s\": %m"
 msgstr "не вдалося закрити каталог \"%s\": %m"
 
-#: pg_verifybackup.c:613
+#: pg_verifybackup.c:678 pg_verifybackup.c:897
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "не вдалося отримати інформацію про файл або каталог \"%s\": %m"
 
-#: pg_verifybackup.c:636
+#: pg_verifybackup.c:701
 #, c-format
-msgid "\"%s\" is not a file or directory"
-msgstr "\"%s\" не є файлом або каталогом"
+msgid "\"%s\" is not a regular file or directory"
+msgstr "\"%s\" не є звичайним файлом або каталогом"
 
-#: pg_verifybackup.c:646
+#: pg_verifybackup.c:711
 #, c-format
 msgid "\"%s\" is present on disk but not in the manifest"
 msgstr "\"%s\" присутній на диску, але не у маніфесті"
 
-#: pg_verifybackup.c:658
+#: pg_verifybackup.c:723
 #, c-format
-msgid "\"%s\" has size %lld on disk but size %zu in the manifest"
-msgstr "\"%s\" має розмір %lld на диску, але розмір %zu у маніфесті"
+msgid "\"%s\" has size %llu on disk but size %llu in the manifest"
+msgstr "\"%s\" має розмір %llu на диску, але розмір %llu у маніфесті"
 
-#: pg_verifybackup.c:689
+#: pg_verifybackup.c:765
 #, c-format
-msgid "\"%s\" is present in the manifest but not on disk"
-msgstr "\"%s\" присутній у маніфесті, але не на диску"
+msgid "%s: CRC is incorrect"
+msgstr "%s: CRC невірний"
 
-#: pg_verifybackup.c:756
+#: pg_verifybackup.c:769
 #, c-format
-msgid "could not initialize checksum of file \"%s\""
-msgstr "не вдалося ініціалізувати контрольну суму файлу \"%s\""
+msgid "%s: unexpected control file version"
+msgstr "%s: неочікувана версія контрольного файлу"
 
-#: pg_verifybackup.c:768
+#: pg_verifybackup.c:774
 #, c-format
-msgid "could not update checksum of file \"%s\""
-msgstr "не вдалося оновити контрольну суму файлу \"%s\""
+msgid "%s: manifest system identifier is %<PRIu64>, but control file has %<PRIu64>"
+msgstr "%s: системний ідентифікатор маніфесту %<PRIu64>, але контрольний файл має %<PRIu64>"
 
-#: pg_verifybackup.c:785
+#: pg_verifybackup.c:906
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "неможливо закрити файл \"%s\": %m"
+msgid "file \"%s\" is not a regular file"
+msgstr "файл \"%s\" не є звичайним файлом"
 
-#: pg_verifybackup.c:804
+#: pg_verifybackup.c:936 pg_verifybackup.c:957
 #, c-format
-msgid "file \"%s\" should contain %zu bytes, but read %zu bytes"
-msgstr "файл \"%s\" мусить містити %zu байтів, але прочитано %zu байтів"
+msgid "file \"%s\" is not expected in a tar format backup"
+msgstr "файл \"%s\" не очікується у резервній копії формату tar"
 
-#: pg_verifybackup.c:814
+#: pg_verifybackup.c:1049
 #, c-format
-msgid "could not finalize checksum of file \"%s\""
-msgstr "не вдалося остаточно завершити контрольну суму файлу \"%s\""
+msgid "\"%s\" is present in the manifest but not on disk"
+msgstr "\"%s\" присутній у маніфесті, але не на диску"
 
-#: pg_verifybackup.c:822
+#: pg_verifybackup.c:1121
+#, c-format
+msgid "could not initialize checksum of file \"%s\""
+msgstr "не вдалося ініціалізувати контрольну суму файлу \"%s\""
+
+#: pg_verifybackup.c:1169
+#, c-format
+msgid "file \"%s\" should contain %<PRIu64> bytes, but read %<PRIu64>"
+msgstr "файл \"%s\" повинен містити %<PRIu64> байтів, але прочитано %<PRIu64>"
+
+#: pg_verifybackup.c:1187
 #, c-format
 msgid "file \"%s\" has checksum of length %d, but expected %d"
 msgstr "файл \"%s\" має контрольну суму довжини %d, але очікувалось %d"
 
-#: pg_verifybackup.c:826
+#: pg_verifybackup.c:1191
 #, c-format
 msgid "checksum mismatch for file \"%s\""
 msgstr "невідповідність контрольної суми для файлу \"%s\""
 
-#: pg_verifybackup.c:851
+#: pg_verifybackup.c:1217
 #, c-format
 msgid "WAL parsing failed for timeline %u"
 msgstr "не вдалося проаналізувати WAL для часової шкали %u"
 
-#: pg_verifybackup.c:965
+#: pg_verifybackup.c:1351
 #, c-format
 msgid "%*s/%s kB (%d%%) verified"
 msgstr "%*s/%s MB (%d%%) перевірено"
 
-#: pg_verifybackup.c:982
+#: pg_verifybackup.c:1368
 #, c-format
 msgid "%s verifies a backup against the backup manifest.\n\n"
 msgstr "%s перевіряє резервну копію відповідно до маніфесту резервного копіювання.\n\n"
 
-#: pg_verifybackup.c:983
+#: pg_verifybackup.c:1369
 #, c-format
 msgid "Usage:\n"
 "  %s [OPTION]... BACKUPDIR\n\n"
 msgstr "Використання:\n"
 "  %s [OPTION]... КАТАЛОГ_КОПІЮВАННЯ\n\n"
 
-#: pg_verifybackup.c:984
+#: pg_verifybackup.c:1370
 #, c-format
 msgid "Options:\n"
 msgstr "Параметри:\n"
 
-#: pg_verifybackup.c:985
+#: pg_verifybackup.c:1371
 #, c-format
 msgid "  -e, --exit-on-error         exit immediately on error\n"
 msgstr "  -e, --exit-on-error вийти при помилці\n"
 
-#: pg_verifybackup.c:986
+#: pg_verifybackup.c:1372
+#, c-format
+msgid "  -F, --format=p|t            backup format (plain, tar)\n"
+msgstr "  -F, --format=p|t            формат резервної копії (plain, tar)\n"
+
+#: pg_verifybackup.c:1373
 #, c-format
 msgid "  -i, --ignore=RELATIVE_PATH  ignore indicated path\n"
 msgstr "  -i, --ignore=RELATIVE_PATH ігнорувати вказаний шлях\n"
 
-#: pg_verifybackup.c:987
+#: pg_verifybackup.c:1374
 #, c-format
 msgid "  -m, --manifest-path=PATH    use specified path for manifest\n"
 msgstr "  -m, --manifest-path=PATH використовувати вказаний шлях для маніфесту\n"
 
-#: pg_verifybackup.c:988
+#: pg_verifybackup.c:1375
 #, c-format
 msgid "  -n, --no-parse-wal          do not try to parse WAL files\n"
 msgstr "  -n, --no-parse-wal не намагатися аналізувати файли WAL\n"
 
-#: pg_verifybackup.c:989
+#: pg_verifybackup.c:1376
 #, c-format
 msgid "  -P, --progress              show progress information\n"
 msgstr "  -P, --progress                повідомляти про хід процесу\n"
 
-#: pg_verifybackup.c:990
+#: pg_verifybackup.c:1377
 #, c-format
 msgid "  -q, --quiet                 do not print any output, except for errors\n"
 msgstr "  -q, --quiet            не друкувати жодного виводу, окрім помилок\n"
 
-#: pg_verifybackup.c:991
+#: pg_verifybackup.c:1378
 #, c-format
 msgid "  -s, --skip-checksums        skip checksum verification\n"
 msgstr "  -s, --skip-checksums не перевіряти контрольні суми\n"
 
-#: pg_verifybackup.c:992
+#: pg_verifybackup.c:1379
 #, c-format
 msgid "  -w, --wal-directory=PATH    use specified path for WAL files\n"
 msgstr "  -w, --wal-directory=PATH використовувати вказаний шлях для файлів WAL\n"
 
-#: pg_verifybackup.c:993
+#: pg_verifybackup.c:1380
 #, c-format
 msgid "  -V, --version               output version information, then exit\n"
 msgstr "  -V, --version                вивести інформацію про версію, потім вийти\n"
 
-#: pg_verifybackup.c:994
+#: pg_verifybackup.c:1381
 #, c-format
 msgid "  -?, --help                  show this help, then exit\n"
 msgstr "  -?, --help                   показати цю довідку, потім вийти\n"
 
-#: pg_verifybackup.c:995
+#: pg_verifybackup.c:1382
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_verifybackup.c:996
+#: pg_verifybackup.c:1383
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl
index 0c564dceece..9d089f8984e 100644
--- a/src/bin/pg_verifybackup/t/003_corruption.pl
+++ b/src/bin/pg_verifybackup/t/003_corruption.pl
@@ -13,6 +13,7 @@
 use Test::More;
 
 my $tar = $ENV{TAR};
+my @tar_p_flags = tar_portability_options($tar);
 
 my $primary = PostgreSQL::Test::Cluster->new('primary');
 $primary->init(allows_streaming => 1);
@@ -154,8 +155,8 @@
 		# have a TAR program available. Note that this destructively modifies
 		# the backup directory.
 		if (   !$scenario->{'needs_unix_permissions'}
-			|| !defined $tar
-			|| $tar eq '')
+			&& defined $tar
+			&& $tar ne '')
 		{
 			my $tar_backup_path = $primary->backup_dir . '/tar_' . $name;
 			mkdir($tar_backup_path) || die "mkdir $tar_backup_path: $!";
@@ -171,14 +172,23 @@
 
 				chdir($tspath) || die "chdir: $!";
 				command_ok(
-					[ $tar, '-cf', "$tar_backup_path/$tsoid.tar", '.' ]);
+					[
+						$tar, @tar_p_flags,
+						'-cf' => "$tar_backup_path/$tsoid.tar",
+						'.'
+					]);
 				chdir($cwd) || die "chdir: $!";
 				rmtree($tspath);
 			}
 
 			# tar and remove pg_wal
 			chdir($backup_path . '/pg_wal') || die "chdir: $!";
-			command_ok([ $tar, '-cf', "$tar_backup_path/pg_wal.tar", '.' ]);
+			command_ok(
+				[
+					$tar, @tar_p_flags,
+					'-cf' => "$tar_backup_path/pg_wal.tar",
+					'.'
+				]);
 			chdir($cwd) || die "chdir: $!";
 			rmtree($backup_path . '/pg_wal');
 
@@ -190,7 +200,12 @@
 
 			# Construct base.tar with what's left.
 			chdir($backup_path) || die "chdir: $!";
-			command_ok([ $tar, '-cf' => "$tar_backup_path/base.tar", '.' ]);
+			command_ok(
+				[
+					$tar, @tar_p_flags,
+					'-cf' => "$tar_backup_path/base.tar",
+					'.'
+				]);
 			chdir($cwd) || die "chdir: $!";
 
 			# Now check that the backup no longer verifies. We must use -n
diff --git a/src/bin/pg_verifybackup/t/008_untar.pl b/src/bin/pg_verifybackup/t/008_untar.pl
index deed3ec247d..bc3d6b352ad 100644
--- a/src/bin/pg_verifybackup/t/008_untar.pl
+++ b/src/bin/pg_verifybackup/t/008_untar.pl
@@ -16,6 +16,22 @@
 $primary->init(allows_streaming => 1);
 $primary->start;
 
+# Create file with some random data and an arbitrary size, useful to check
+# the solidity of the compression and decompression logic.  The size of the
+# file is chosen to be around 640kB.  This has proven to be large enough to
+# detect some issues related to LZ4, and low enough to not impact the runtime
+# of the test significantly.
+my $junk_data = $primary->safe_psql(
+	'postgres', qq(
+		SELECT string_agg(encode(sha256(i::bytea), 'hex'), '')
+		FROM generate_series(1, 10240) s(i);));
+my $data_dir = $primary->data_dir;
+my $junk_file = "$data_dir/junk";
+open my $jf, '>', $junk_file
+  or die "Could not create junk file: $!";
+print $jf $junk_data;
+close $jf;
+
 # Create a tablespace directory.
 my $source_ts_path = PostgreSQL::Test::Utils::tempdir_short();
 
@@ -52,6 +68,12 @@
 		'backup_archive' => [ 'base.tar.lz4', "$tsoid.tar.lz4" ],
 		'enabled' => check_pg_config("#define USE_LZ4 1")
 	},
+	{
+		'compression_method' => 'lz4',
+		'backup_flags' => [ '--compress', 'server-lz4:5' ],
+		'backup_archive' => [ 'base.tar.lz4', "$tsoid.tar.lz4" ],
+		'enabled' => check_pg_config("#define USE_LZ4 1")
+	},
 	{
 		'compression_method' => 'zstd',
 		'backup_flags' => [ '--compress', 'server-zstd' ],
diff --git a/src/bin/pg_verifybackup/t/010_client_untar.pl b/src/bin/pg_verifybackup/t/010_client_untar.pl
index bab582c7e6d..af50dbb8674 100644
--- a/src/bin/pg_verifybackup/t/010_client_untar.pl
+++ b/src/bin/pg_verifybackup/t/010_client_untar.pl
@@ -15,7 +15,23 @@
 $primary->init(allows_streaming => 1);
 $primary->start;
 
-my $backup_path  = $primary->backup_dir . '/client-backup';
+# Create file with some random data and an arbitrary size, useful to check
+# the solidity of the compression and decompression logic.  The size of the
+# file is chosen to be around 640kB.  This has proven to be large enough to
+# detect some issues related to LZ4, and low enough to not impact the runtime
+# of the test significantly.
+my $junk_data = $primary->safe_psql(
+	'postgres', qq(
+		SELECT string_agg(encode(sha256(i::bytea), 'hex'), '')
+		FROM generate_series(1, 10240) s(i);));
+my $data_dir = $primary->data_dir;
+my $junk_file = "$data_dir/junk";
+open my $jf, '>', $junk_file
+  or die "Could not create junk file: $!";
+print $jf $junk_data;
+close $jf;
+
+my $backup_path = $primary->backup_dir . '/client-backup';
 my $extract_path = $primary->backup_dir . '/extracted-backup';
 
 my @test_configuration = (
@@ -37,6 +53,12 @@
 		'backup_archive' => 'base.tar.lz4',
 		'enabled' => check_pg_config("#define USE_LZ4 1")
 	},
+	{
+		'compression_method' => 'lz4',
+		'backup_flags' => [ '--compress', 'client-lz4:1' ],
+		'backup_archive' => 'base.tar.lz4',
+		'enabled' => check_pg_config("#define USE_LZ4 1")
+	},
 	{
 		'compression_method' => 'zstd',
 		'backup_flags' => [ '--compress', 'client-zstd:5' ],
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 51fb76efc48..a3c0368f196 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -160,7 +160,7 @@ create_fullpage_directory(char *path)
 static void
 split_path(const char *path, char **dir, char **fname)
 {
-	char	   *sep;
+	const char *sep;
 
 	/* split filepath into directory & filename */
 	sep = strrchr(path, '/');
diff --git a/src/bin/pg_waldump/po/es.po b/src/bin/pg_waldump/po/es.po
index 18864a7bcd4..6d937a65f0b 100644
--- a/src/bin/pg_waldump/po/es.po
+++ b/src/bin/pg_waldump/po/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_waldump (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:48+0000\n"
-"PO-Revision-Date: 2024-11-16 14:24+0100\n"
+"POT-Creation-Date: 2026-02-06 23:18+0000\n"
+"PO-Revision-Date: 2025-09-21 11:39+0200\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -20,22 +20,22 @@ msgstr ""
 "X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -51,45 +51,45 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -454,157 +454,157 @@ msgstr "error en registro de WAL en %X/%X: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "desplazamiento de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord solicitado por %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "largo de registro no válido en %X/%X: se esperaba al menos %u, se obtuvo %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "no hay bandera de contrecord en %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "largo de contrecord %u no válido (se esperaba %lld) en %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ID de gestor de recursos %u no válido en %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "registro con prev-link %X/%X incorrecto en %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "suma de verificación de los datos del gestor de recursos incorrecta en el registro en %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "número mágico %04X no válido en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "info bits %04X no válidos en segment WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %llu, identificador en pg_control es %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "archivo WAL es de un sistema de bases de datos distinto: identificador de sistema en archivo WAL es %<PRIu64>, identificador en pg_control es %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: tamaño de segmento incorrecto en cabecera de paǵina"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "archivo WAL es de un sistema de bases de datos distinto: XLOG_BLCKSZ incorrecto en cabecera de paǵina"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "pageaddr %X/%X inesperado en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ID de timeline %u fuera de secuencia (después de %u) en segmento WAL %s, LSN %X/%X, posición %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u fuera de orden en %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, 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:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, 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:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_COMPRESSED están definidos, pero el largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, 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:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u no válido en %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "registro con largo no válido en %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "no se pudo localizar un bloque de respaldo con ID %d en el registro WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "no se pudo restaurar la imagen en %X/%X con bloque especificado %d no válido"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X con estado no válido, bloque %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con %s que no está soportado por esta instalación, bloque %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "no se pudo restaurar la imagen en %X/%X comprimida con un método desconocido, bloque %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "no se pudo descomprimir la imagen en %X/%X, bloque %d"
diff --git a/src/bin/pg_waldump/po/fr.po b/src/bin/pg_waldump/po/fr.po
index f127e5e7aab..28ce7eecf5b 100644
--- a/src/bin/pg_waldump/po/fr.po
+++ b/src/bin/pg_waldump/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-22 10:19+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-08 05:19+0000\n"
+"PO-Revision-Date: 2025-07-08 10:46+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce : "
@@ -52,45 +52,45 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -477,159 +477,159 @@ msgstr "erreur dans l'enregistrement des journaux de transactions à %X/%X : %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "décalage invalide de l'enregistrement à %X/%X : attendait au moins %u, a eu %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "« contrecord » est requis par %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1135
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "longueur invalide de l'enregistrement à %X/%X : attendait au moins %u, a eu %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:759
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "il n'existe pas de drapeau contrecord à %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:772
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "longueur %u invalide du contrecord (%lld attendu) à %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1143
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "identifiant du gestionnaire de ressources invalide %u à %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1156 xlogreader.c:1172
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "enregistrement avec prev-link %X/%X incorrect à %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1210
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "somme de contrôle des données du gestionnaire de ressources incorrecte à\n"
 "l'enregistrement %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1244
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "numéro magique invalide %04X dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1259 xlogreader.c:1301
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "bits d'information %04X invalides dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1275
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "Le fichier WAL provient d'une instance différente : l'identifiant système de la base dans le fichier WAL est %llu, alors que l'identifiant système de la base dans pg_control est %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "Le fichier WAL provient d'une instance différente : l'identifiant système de la base dans le fichier WAL est %<PRIu64>, alors que l'identifiant système de la base dans pg_control est %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1283
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "Le fichier WAL provient d'une instance différente : taille invalide du segment dans l'en-tête de page"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1289
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "Le fichier WAL provient d'une instance différente : XLOG_BLCKSZ incorrect dans l'en-tête de page"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1321
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "pageaddr %X/%X inattendue dans le journal de transactions %s, LSN %X/%X, segment %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1347
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "identifiant timeline %u hors de la séquence (après %u) dans le segment WAL %s, LSN %X/%X, décalage %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1759
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u désordonné à %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1783
 #, 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:1780
+#: xlogreader.c:1790
 #, 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:1816
+#: xlogreader.c:1826
 #, 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:1832
+#: xlogreader.c:1842
 #, 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:1846
+#: xlogreader.c:1856
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1871
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1887
 #, 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:1889
+#: xlogreader.c:1899
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u invalide à %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1966
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "enregistrement de longueur invalide à %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:1992
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "n'a pas pu localiser le bloc de sauvegarde d'ID %d dans l'enregistrement WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2076
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "n'a pas pu restaurer l'image à %X/%X avec le bloc invalide %d indiqué"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2083
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X avec un état invalide, bloc %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2110 xlogreader.c:2127
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X compressé avec %s, qui est non supporté par le serveur, bloc %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2136
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "n'a pas pu restaurer l'image à %X/%X compressé avec une méthode inconnue, bloc %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2144
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "n'a pas pu décompresser l'image à %X/%X, bloc %d"
diff --git a/src/bin/pg_waldump/po/ko.po b/src/bin/pg_waldump/po/ko.po
index 25e4c0cfe2c..0d23eb5bd92 100644
--- a/src/bin/pg_waldump/po/ko.po
+++ b/src/bin/pg_waldump/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_waldump (PostgreSQL) 17\n"
+"Project-Id-Version: pg_waldump (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:48+0000\n"
-"PO-Revision-Date: 2025-01-16 14:06+0900\n"
+"POT-Creation-Date: 2025-09-11 21:49+0000\n"
+"PO-Revision-Date: 2025-09-09 16:43+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -48,45 +48,45 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "널 포인터를 중복할 수 없음 (내부 오류)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위해 파일 시스템 동기화를 할 수 없음: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일 상태 값을 구할 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -456,66 +456,66 @@ msgstr "%X/%X 위치에서 WAL 레코드 오류: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 오프셋: 위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "%X/%X에서 contrecord를 필요로 함"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "잘못된 레코드 길이: 위치 %X/%X, 기대값 %u, 실재값 %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "%X/%X 위치에 contrecord 플래그가 없음"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "잘못된 contrecord 길이 %u (기대값: %lld), 위치 %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "잘못된 자원 관리 ID %u, 위치: %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "레코드의 잘못된 프리링크 %X/%X, 해당 레코드 %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "잘못된 자원관리자 데이터 체크섬, 위치: %X/%X 레코드"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "%04X 매직 번호가 잘못됨, WAL 조각 파일 %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 정보 비트 %04X, WAL 조각 파일 %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
-"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %llu, "
-"pg_control 의 식별자는 %llu"
+"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %<PRIu64>, "
+"pg_control 의 식별자는 %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -524,7 +524,7 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더에 지정된 값이 잘"
 "못된 조각 크기임"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -533,12 +533,12 @@ msgstr ""
 "WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더의 XLOG_BLCKSZ 값"
 "이 바르지 않음"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "잘못된 페이지 주소 %X/%X, WAL 조각 파일 %s, LSN %X/%X, 오프셋 %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -547,22 +547,22 @@ msgstr ""
 "타임라인 범위 벗어남 %u (이전 번호 %u), WAL 조각 파일 %s, LSN %X/%X, 오프셋 "
 "%u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "%u block_id는 범위를 벗어남, 위치 %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA 지정했지만, %X/%X 에 자료가 없음"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -571,19 +571,19 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE 설정이 되어 있지만, 옵셋: %u, 길이: %u, 블록 이미지 길이: "
 "%u, 대상: %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED 설정이 되어 있지만, 블록 이미지 길이: %u, 대상: %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -592,37 +592,37 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE, BKPIMAGE_COMPRESSED 지정 안되어 있으나, 블록 이미지 길이"
 "는 %u, 대상: %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL 설정이 되어 있지만, %X/%X 에 이전 릴레이션 없음"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "잘못된 block_id %u, 위치 %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "잘못된 레코드 길이, 위치 %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "WAL 레코드에서 %d ID의 백업 블록 위치를 바르게 잡을 수 없음"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "%X/%X 위치에 이미지를 복원할 수 없음, 해당 %d 블록이 깨졌음"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "이미지 복원 실패, 잘못된 상태의 압축 이미지, 위치 %X/%X, 블록 %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
@@ -631,26 +631,23 @@ msgstr ""
 "%X/%X 압축 위치에 이미지 복원할 수 없음, %s 압축을 지원하지 않음, 해당 블록: "
 "%d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr ""
 "%X/%X 압축 위치에 이미지 복원할 수 없음, 알 수 없은 방법, 해당 블록: %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "압축 이미지 풀기 실패, 위치 %X/%X, 블록 %d"
 
-#, c-format
 #~ msgid "missing contrecord at %X/%X"
 #~ msgstr "%X/%X 위치에 contrecord 없음"
 
-#, c-format
 #~ msgid "out of memory while trying to decode a record of length %u"
 #~ msgstr "%u 길이 레코드를 디코드 작업을 위한 메모리가 부족함"
 
-#, c-format
 #~ msgid "record length %u at %X/%X too long"
 #~ msgstr "너무 긴 길이(%u)의 레코드가 %X/%X에 있음"
diff --git a/src/bin/pg_waldump/po/ru.po b/src/bin/pg_waldump/po/ru.po
index bafe5a3233c..175ed305c62 100644
--- a/src/bin/pg_waldump/po/ru.po
+++ b/src/bin/pg_waldump/po/ru.po
@@ -1,13 +1,13 @@
 # Russian message translation file for pg_waldump
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <a.lakhin@postgrespro.ru>, 2017, 2018, 2019, 2020, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2017, 2018, 2019, 2020, 2022, 2023, 2024, 2025 Alexander Lakhin <a.lakhin@postgrespro.ru>
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_waldump (PostgreSQL) 10\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
-"PO-Revision-Date: 2024-09-07 08:59+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-08-30 22:30+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,22 +17,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -48,45 +48,45 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -490,72 +490,72 @@ msgstr "ошибка в записи WAL в позиции %X/%X: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверное смещение записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "в позиции %X/%X запрошено продолжение записи"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr ""
 "неверная длина записи в позиции %X/%X: ожидалось минимум %u, получено %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "нет флага contrecord в позиции %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неверная длина contrecord: %u (ожидалась %lld) в позиции %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "неверный ID менеджера ресурсов %u в позиции %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запись с неверной ссылкой назад %X/%X в позиции %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "некорректная контрольная сумма данных менеджера ресурсов в записи в позиции "
 "%X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверное магическое число %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr ""
 "неверные информационные биты %04X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
 msgid ""
 "WAL file is from different database system: WAL file database system "
-"identifier is %llu, pg_control database system identifier is %llu"
+"identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
 msgstr ""
 "файл WAL принадлежит другой СУБД: в нём указан идентификатор системы БД "
-"%llu, а идентификатор системы pg_control: %llu"
+"%<PRIu64>, а идентификатор системы pg_control: %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect segment size in page "
@@ -564,7 +564,7 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный размер сегмента в заголовке "
 "страницы"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid ""
 "WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -573,12 +573,12 @@ msgstr ""
 "файл WAL принадлежит другой СУБД: некорректный XLOG_BLCKSZ в заголовке "
 "страницы"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неожиданный pageaddr %X/%X в сегменте WAL %s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, "
@@ -587,23 +587,23 @@ msgstr ""
 "нарушение последовательности ID линии времени %u (после %u) в сегменте WAL "
 "%s, LSN %X/%X, смещение %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "идентификатор блока %u идёт не по порядку в позиции %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA установлен, но данных в позиции %X/%X нет"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -612,21 +612,21 @@ msgstr ""
 "BKPIMAGE_HAS_HOLE установлен, но для пропуска заданы смещение %u и длина %u "
 "при длине образа блока %u в позиции %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_COMPRESSED установлен, но длина образа блока равна %u в позиции %X/"
 "%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image "
@@ -635,41 +635,41 @@ msgstr ""
 "ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_COMPRESSED не установлены, но длина образа "
 "блока равна %u в позиции %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr ""
 "BKPBLOCK_SAME_REL установлен, но предыдущее значение не задано в позиции %X/"
 "%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "неверный идентификатор блока %u в позиции %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запись с неверной длиной в позиции %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не удалось найти копию блока с ID %d в записи журнала WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с указанным неверным блоком %d"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr ""
 "не удалось восстановить образ в позиции %X/%X с неверным состоянием, блок %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with %s not supported by build, "
@@ -678,7 +678,7 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый методом %s, который не "
 "поддерживается этой сборкой, блок %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid ""
 "could not restore image at %X/%X compressed with unknown method, block %d"
@@ -686,7 +686,7 @@ msgstr ""
 "не удалось восстановить образ в позиции %X/%X, сжатый неизвестным методом, "
 "блок %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не удалось развернуть образ в позиции %X/%X, блок %d"
diff --git a/src/bin/pg_waldump/po/sv.po b/src/bin/pg_waldump/po/sv.po
index 24173636e1a..17c8808c93c 100644
--- a/src/bin/pg_waldump/po/sv.po
+++ b/src/bin/pg_waldump/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pg_waldump
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 14:19+0000\n"
-"PO-Revision-Date: 2024-07-12 19:11+0200\n"
+"POT-Creation-Date: 2025-05-16 16:19+0000\n"
+"PO-Revision-Date: 2025-05-16 20:20+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -48,45 +48,45 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -451,158 +451,158 @@ msgstr "fel i WAL-post vid %X/%X: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postoffset vid %X/%X: förväntade minst %u, fick %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord är begärd vid %X/%X"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1135
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "ogiltig postlängd vid %X/%X: förväntade minst %u, fick %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:759
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
 msgstr "det finns ingen contrecord-flagga vid %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:772
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "ogiltig contrecord-längd %u (förväntade %lld) vid %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1143
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ogiltigt resurshanterar-ID %u vid %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1156 xlogreader.c:1172
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "post med inkorrekt prev-link %X/%X vid %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1210
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "felaktig resurshanterardatakontrollsumma i post vid %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1244
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "felaktigt magiskt nummer %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1259 xlogreader.c:1301
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "ogiltiga infobitar %04X i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1275
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %llu, pg_control databassystemidentifierare är %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL-fil är från ett annat databassystem: WAL-filens databassystemidentifierare är %<PRIu64>, pg_control databassystemidentifierare är %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1283
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt segmentstorlek i sidhuvud"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1289
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "WAL-fil är från ett annat databassystem: inkorrekt XLOG_BLCKSZ i sidhuvud"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1321
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "oväntad sidadress %X/%X i WAL-segment %s, LSN %X/%X, offset %u"
 
 # FIXME
-#: xlogreader.c:1346
+#: xlogreader.c:1347
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "\"ej i sekvens\"-fel på tidslinje-ID %u (efter %u) i WAL-segment %s, LSN %X/%X, offset %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1759
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "\"ej i sekvens\"-block_id %u vid %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1783
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är satt men ingen data inkluderad vid %X/%X"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1790
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA är ej satt men datalängden är %u vid %X/%X"
 
-#: xlogreader.c:1816
+#: xlogreader.c:1826
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är satt men håloffset %u längd %u blockavbildlängd %u vid %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1842
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE är inte satt men håloffset %u längd %u vid %X/%X"
 
-#: xlogreader.c:1846
+#: xlogreader.c:1856
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED är satt men blockavbildlängd %u vid %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1871
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "varken BKPIMAGE_HAS_HOLE eller BKPIMAGE_COMPRESSED är satt men blockavbildlängd är %u vid %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1887
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL är satt men ingen tidigare rel vid %X/%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1899
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ogiltig block_id %u vid %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1966
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "post med ogiltig längd vid %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:1992
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "kunde inte hitta backup-block med ID %d i WAL-post"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2076
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt block %d angivet"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2083
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X med ogiltigt state, block %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2110 xlogreader.c:2127
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med %s stöds inte av bygget, block %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2136
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "kunde inte återställa avbild vid %X/%X, komprimerad med okänd metod, block %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2144
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "kunde inte packa upp avbild vid %X/%X, block %d"
diff --git a/src/bin/pg_waldump/po/uk.po b/src/bin/pg_waldump/po/uk.po
index 09da6eebce3..f7f7cc74eb3 100644
--- a/src/bin/pg_waldump/po/uk.po
+++ b/src/bin/pg_waldump/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:19+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:19+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_waldump.pot\n"
-"X-Crowdin-File-ID: 984\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_waldump.pot\n"
+"X-Crowdin-File-ID: 1041\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -48,45 +48,45 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480 pg_waldump.c:199
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502 pg_waldump.c:199
 #: pg_waldump.c:532
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #: pg_waldump.c:1104 pg_waldump.c:1127
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -434,157 +434,157 @@ msgstr "помилка у записі WAL у %X/%X: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: xlogreader.c:619
+#: xlogreader.c:620
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
 msgstr "неприпустиме зміщення запису в %X/%X: очікувалось хоча б %u, отримано %u"
 
-#: xlogreader.c:628
+#: xlogreader.c:629
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "по зсуву %X/%X запитано продовження запису"
 
-#: xlogreader.c:669 xlogreader.c:1134
+#: xlogreader.c:670 xlogreader.c:1145
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
 msgstr "неприпустима довжина запису %X/%X: очікувалась мінімум %u, отримано %u"
 
-#: xlogreader.c:758
+#: xlogreader.c:760
 #, c-format
 msgid "there is no contrecord flag at %X/%X"
-msgstr "немає прапорця contrecord в позиції %X/%X"
+msgstr "немає прапора contrecord на %X/%X"
 
-#: xlogreader.c:771
+#: xlogreader.c:773
 #, c-format
 msgid "invalid contrecord length %u (expected %lld) at %X/%X"
 msgstr "неприпустима довжина contrecord %u (очікувалось %lld) на %X/%X"
 
-#: xlogreader.c:1142
+#: xlogreader.c:1153
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "невірний ID менеджера ресурсів %u в %X/%X"
 
-#: xlogreader.c:1155 xlogreader.c:1171
+#: xlogreader.c:1166 xlogreader.c:1182
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "запис з неправильним попереднім посиланням %X/%X на %X/%X"
 
-#: xlogreader.c:1209
+#: xlogreader.c:1220
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "некоректна контрольна сума даних менеджера ресурсів у запису по зсуву %X/%X"
 
-#: xlogreader.c:1243
+#: xlogreader.c:1254
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірне магічне число %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1258 xlogreader.c:1300
+#: xlogreader.c:1269 xlogreader.c:1311
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "невірні інформаційні біти %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1274
+#: xlogreader.c:1285
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %llu, pg_control database system identifier is %llu"
-msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %llu, а ідентифікатор системи баз даних pg_control - %llu"
+msgid "WAL file is from different database system: WAL file database system identifier is %<PRIu64>, pg_control database system identifier is %<PRIu64>"
+msgstr "WAL файл належить іншій системі баз даних: ідентифікатор системи баз даних де міститься WAL файл - %<PRIu64>, а ідентифікатор системи баз даних pg_control - %<PRIu64>"
 
-#: xlogreader.c:1282
+#: xlogreader.c:1293
 #, c-format
 msgid "WAL file is from different database system: incorrect segment size in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний розмір сегменту в заголовку сторінки"
 
-#: xlogreader.c:1288
+#: xlogreader.c:1299
 #, c-format
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
 msgstr "Файл WAL належить іншій системі баз даних: некоректний XLOG_BLCKSZ в заголовку сторінки"
 
-#: xlogreader.c:1320
+#: xlogreader.c:1331
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "неочікуваний pageaddr %X/%X у сегменті WAL %s, LSN %X/%X, зміщення %u"
 
-#: xlogreader.c:1346
+#: xlogreader.c:1357
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
 msgstr "порушення послідовності ID лінії часу %u (після %u) у сегменті WAL %s, LSN %X/%X, зсув %u"
 
-#: xlogreader.c:1749
+#: xlogreader.c:1769
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "ідентифікатор блока %u out-of-order в позиції %X/%X"
 
-#: xlogreader.c:1773
+#: xlogreader.c:1793
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA встановлений, але немає даних в позиції %X/%X"
 
-#: xlogreader.c:1780
+#: xlogreader.c:1800
 #, 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:1816
+#: xlogreader.c:1836
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE встановлений, але для пропуску задані: зсув %u, довжина %u, при довжині образу блока %u в позиції %X/%X"
 
-#: xlogreader.c:1832
+#: xlogreader.c:1852
 #, 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:1846
+#: xlogreader.c:1866
 #, c-format
 msgid "BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_COMPRESSED встановлений, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: xlogreader.c:1861
+#: xlogreader.c:1881
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ні BKPIMAGE_HAS_HOLE, ні BKPIMAGE_COMPRESSED не встановлені, але довжина образу блока дорівнює %u в позиції %X/%X"
 
-#: xlogreader.c:1877
+#: xlogreader.c:1897
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL встановлений, але попереднє значення не задано в позиції %X/%X"
 
-#: xlogreader.c:1889
+#: xlogreader.c:1909
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "невірний ідентифікатор блоку %u в позиції %X/%X"
 
-#: xlogreader.c:1956
+#: xlogreader.c:1976
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запис з невірною довжиною на %X/%X"
 
-#: xlogreader.c:1982
+#: xlogreader.c:2002
 #, c-format
 msgid "could not locate backup block with ID %d in WAL record"
 msgstr "не вдалося знайти блок резервної копії з ID %d у записі WAL"
 
-#: xlogreader.c:2066
+#: xlogreader.c:2086
 #, c-format
 msgid "could not restore image at %X/%X with invalid block %d specified"
 msgstr "не вдалося відновити зображення %X/%X з недійсним вказаним блоком %d"
 
-#: xlogreader.c:2073
+#: xlogreader.c:2093
 #, c-format
 msgid "could not restore image at %X/%X with invalid state, block %d"
 msgstr "не вдалося відновити зображення %X/%X з недійсним станом, блок %d"
 
-#: xlogreader.c:2100 xlogreader.c:2117
+#: xlogreader.c:2120 xlogreader.c:2137
 #, c-format
 msgid "could not restore image at %X/%X compressed with %s not supported by build, block %d"
 msgstr "не вдалося відновити зображення в %X/%X, стиснуте %s, не підтримується збіркою, блок %d"
 
-#: xlogreader.c:2126
+#: xlogreader.c:2146
 #, c-format
 msgid "could not restore image at %X/%X compressed with unknown method, block %d"
 msgstr "не вдалося відновити зображення %X/%X стиснуте з невідомим методом, блок %d"
 
-#: xlogreader.c:2134
+#: xlogreader.c:2154
 #, c-format
 msgid "could not decompress image at %X/%X, block %d"
 msgstr "не вдалося розпакувати зображення на %X/%X, блок %d"
diff --git a/src/bin/pg_waldump/t/002_save_fullpage.pl b/src/bin/pg_waldump/t/002_save_fullpage.pl
index 9100ade21da..17f3352e1ce 100644
--- a/src/bin/pg_waldump/t/002_save_fullpage.pl
+++ b/src/bin/pg_waldump/t/002_save_fullpage.pl
@@ -105,8 +105,9 @@ sub get_block_lsn
 	my ($hi_lsn_bk, $lo_lsn_bk) = get_block_lsn($fullpath, $blocksize);
 
 	# The LSN on the block comes before the file's LSN.
-	ok( $hi_lsn_fn . $lo_lsn_fn gt $hi_lsn_bk . $lo_lsn_bk,
-		'LSN stored in the file precedes the one stored in the block');
+	ok( $hi_lsn_fn . $lo_lsn_fn ge $hi_lsn_bk . $lo_lsn_bk,
+		"LSN stored in the file $hi_lsn_fn/$lo_lsn_fn precedes the one stored in the block $hi_lsn_bk/$lo_lsn_bk"
+	);
 }
 
 ok($file_count > 0, 'verify that at least one block has been saved');
diff --git a/src/bin/pg_walsummary/po/es.po b/src/bin/pg_walsummary/po/es.po
index 7584da24ef5..7afad71250c 100644
--- a/src/bin/pg_walsummary/po/es.po
+++ b/src/bin/pg_walsummary/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_walsummary (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-11-16 05:23+0000\n"
+"POT-Creation-Date: 2026-02-06 23:22+0000\n"
 "PO-Revision-Date: 2024-08-01 12:41-0400\n"
 "Last-Translator: Álvaor Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Vim\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -51,45 +51,45 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
-#: pg_walsummary.c:109
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
+#: pg_walsummary.c:108
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -109,22 +109,22 @@ msgstr "%s debe estar en el rango %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "método sync no reconocido: %s"
 
-#: pg_walsummary.c:87 pg_walsummary.c:95
+#: pg_walsummary.c:86 pg_walsummary.c:94
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: pg_walsummary.c:94
+#: pg_walsummary.c:93
 #, c-format
 msgid "no input files specified"
 msgstr "no se especificaron archivos de entrada"
 
-#: pg_walsummary.c:252
+#: pg_walsummary.c:251
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: pg_walsummary.c:267
+#: pg_walsummary.c:266
 #, c-format
 msgid ""
 "%s prints the contents of a WAL summary file.\n"
@@ -133,17 +133,17 @@ msgstr ""
 "%s imprime el contenido de un archivo de resumen de WAL.\n"
 "\n"
 
-#: pg_walsummary.c:268
+#: pg_walsummary.c:267
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_walsummary.c:269
+#: pg_walsummary.c:268
 #, c-format
 msgid "  %s [OPTION]... FILE...\n"
 msgstr "  %s [OPCIÓN]... ARCHIVO...\n"
 
-#: pg_walsummary.c:270
+#: pg_walsummary.c:269
 #, c-format
 msgid ""
 "\n"
@@ -152,27 +152,27 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: pg_walsummary.c:271
+#: pg_walsummary.c:270
 #, c-format
 msgid "  -i, --individual          list block numbers individually, not as ranges\n"
 msgstr "  -i, --individual          listar números de bloque individualmente, no como rangos\n"
 
-#: pg_walsummary.c:272
+#: pg_walsummary.c:271
 #, c-format
 msgid "  -q, --quiet               don't print anything, just parse the files\n"
 msgstr "  -q, --quiet               no escribir nada, sólo procesar los archivos\n"
 
-#: pg_walsummary.c:273
+#: pg_walsummary.c:272
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: pg_walsummary.c:274
+#: pg_walsummary.c:273
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: pg_walsummary.c:276
+#: pg_walsummary.c:275
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: pg_walsummary.c:277
+#: pg_walsummary.c:276
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
diff --git a/src/bin/pg_walsummary/po/ru.po b/src/bin/pg_walsummary/po/ru.po
index 1dcd7aaf72a..0fe35651185 100644
--- a/src/bin/pg_walsummary/po/ru.po
+++ b/src/bin/pg_walsummary/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_walsummary (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:31+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2024-09-05 14:47+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 21.12.3\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -46,45 +46,45 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
-#: pg_walsummary.c:109
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
+#: pg_walsummary.c:108
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -104,22 +104,22 @@ msgstr "значение %s должно быть в диапазоне %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нераспознанный метод синхронизации: %s"
 
-#: pg_walsummary.c:87 pg_walsummary.c:95
+#: pg_walsummary.c:86 pg_walsummary.c:94
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_walsummary.c:94
+#: pg_walsummary.c:93
 #, c-format
 msgid "no input files specified"
 msgstr "нет входных файлов"
 
-#: pg_walsummary.c:252
+#: pg_walsummary.c:251
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удалось прочитать файл \"%s\": %m"
 
-#: pg_walsummary.c:267
+#: pg_walsummary.c:266
 #, c-format
 msgid ""
 "%s prints the contents of a WAL summary file.\n"
@@ -128,17 +128,17 @@ msgstr ""
 "%s выводит содержимое файла обобщения WAL.\n"
 "\n"
 
-#: pg_walsummary.c:268
+#: pg_walsummary.c:267
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_walsummary.c:269
+#: pg_walsummary.c:268
 #, c-format
 msgid "  %s [OPTION]... FILE...\n"
 msgstr "  %s [ПАРАМЕТР]... [ФАЙЛ]...\n"
 
-#: pg_walsummary.c:270
+#: pg_walsummary.c:269
 #, c-format
 msgid ""
 "\n"
@@ -147,7 +147,7 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: pg_walsummary.c:271
+#: pg_walsummary.c:270
 #, c-format
 msgid ""
 "  -i, --individual          list block numbers individually, not as ranges\n"
@@ -155,24 +155,24 @@ msgstr ""
 "  -i, --individual          выводить номера блоков по одному, не "
 "диапазонами\n"
 
-#: pg_walsummary.c:272
+#: pg_walsummary.c:271
 #, c-format
 msgid ""
 "  -q, --quiet               don't print anything, just parse the files\n"
 msgstr ""
 "  -q, --quiet               не выводить ничего, только разобрать файлы\n"
 
-#: pg_walsummary.c:273
+#: pg_walsummary.c:272
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: pg_walsummary.c:274
+#: pg_walsummary.c:273
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: pg_walsummary.c:276
+#: pg_walsummary.c:275
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: pg_walsummary.c:277
+#: pg_walsummary.c:276
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
diff --git a/src/bin/pg_walsummary/po/sv.po b/src/bin/pg_walsummary/po/sv.po
index 14e987f3aaf..8879a8a9195 100644
--- a/src/bin/pg_walsummary/po/sv.po
+++ b/src/bin/pg_walsummary/po/sv.po
@@ -4,10 +4,10 @@
 # Dennis Björklund <db@zigo.dhs.org>, 2024.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 17:54+0000\n"
-"PO-Revision-Date: 2024-07-12 23:39+0200\n"
+"PO-Revision-Date: 2025-07-29 19:46+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/bin/pg_walsummary/po/uk.po b/src/bin/pg_walsummary/po/uk.po
index 523b46a7f12..e4a5d1aa256 100644
--- a/src/bin/pg_walsummary/po/uk.po
+++ b/src/bin/pg_walsummary/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:24+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:54+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pg_walsummary.pot\n"
-"X-Crowdin-File-ID: 992\n"
+"X-Crowdin-File: /REL_18_STABLE/pg_walsummary.pot\n"
+"X-Crowdin-File-ID: 1049\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -48,45 +48,45 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
-#: pg_walsummary.c:109
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
+#: pg_walsummary.c:108
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -106,71 +106,71 @@ msgstr "%s має бути в діапазоні %d..%d"
 msgid "unrecognized sync method: %s"
 msgstr "нерозпізнаний метод синхронізації: %s"
 
-#: pg_walsummary.c:87 pg_walsummary.c:95
+#: pg_walsummary.c:86 pg_walsummary.c:94
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: pg_walsummary.c:94
+#: pg_walsummary.c:93
 #, c-format
 msgid "no input files specified"
 msgstr "не вказано вхідні файли"
 
-#: pg_walsummary.c:252
+#: pg_walsummary.c:251
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не вдалося прочитати файл \"%s\": %m"
 
-#: pg_walsummary.c:267
+#: pg_walsummary.c:266
 #, c-format
 msgid "%s prints the contents of a WAL summary file.\n\n"
 msgstr "%s друкує вміст файлу зведення WAL.\n\n"
 
-#: pg_walsummary.c:268
+#: pg_walsummary.c:267
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: pg_walsummary.c:269
+#: pg_walsummary.c:268
 #, c-format
 msgid "  %s [OPTION]... FILE...\n"
 msgstr "  %s [OPTION]... FILE...\n"
 
-#: pg_walsummary.c:270
+#: pg_walsummary.c:269
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: pg_walsummary.c:271
+#: pg_walsummary.c:270
 #, c-format
 msgid "  -i, --individual          list block numbers individually, not as ranges\n"
 msgstr "  -i, --individual          вивести номера блоків індивідуально, не як діапазони\n"
 
-#: pg_walsummary.c:272
+#: pg_walsummary.c:271
 #, c-format
 msgid "  -q, --quiet               don't print anything, just parse the files\n"
 msgstr "  -q, --quiet не друкувати нічого, просто розібрати файли\n"
 
-#: pg_walsummary.c:273
+#: pg_walsummary.c:272
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: pg_walsummary.c:274
+#: pg_walsummary.c:273
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: pg_walsummary.c:276
+#: pg_walsummary.c:275
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: pg_walsummary.c:277
+#: pg_walsummary.c:276
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
diff --git a/src/bin/pg_walsummary/t/002_blocks.pl b/src/bin/pg_walsummary/t/002_blocks.pl
index 270332780a4..0f98c7df82e 100644
--- a/src/bin/pg_walsummary/t/002_blocks.pl
+++ b/src/bin/pg_walsummary/t/002_blocks.pl
@@ -47,11 +47,12 @@
 ok($result, "WAL summarization caught up after insert");
 
 # The WAL summarizer should have generated some IO statistics.
-my $stats_reads = $node1->safe_psql(
+$node1->poll_query_until(
 	'postgres',
-	qq{SELECT sum(reads) > 0 FROM pg_stat_io
-   WHERE backend_type = 'walsummarizer' AND object = 'wal'});
-is($stats_reads, 't', "WAL summarizer generates statistics for WAL reads");
+	q{SELECT sum(reads) > 0 FROM pg_stat_io
+   WHERE backend_type = 'walsummarizer' AND object = 'wal'})
+  or die
+  "Timed out while waiting for WAL summarizer to generate statistics for WAL reads";
 
 # Find the highest LSN that is summarized on disk.
 my $summarized_lsn = $node1->safe_psql('postgres', <<EOM);
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 3db931adaf1..479a67cea9e 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -3059,7 +3059,14 @@ commandFailed(CState *st, const char *cmd, const char *message)
 static void
 commandError(CState *st, const char *message)
 {
-	Assert(sql_script[st->use_file].commands[st->command]->type == SQL_COMMAND);
+	/*
+	 * Errors should only be detected during an SQL command or the
+	 * \endpipeline meta command. Any other case triggers an assertion
+	 * failure.
+	 */
+	Assert(sql_script[st->use_file].commands[st->command]->type == SQL_COMMAND ||
+		   sql_script[st->use_file].commands[st->command]->meta == META_ENDPIPELINE);
+
 	pg_log_info("client %d got an error in command %d (SQL) of script %d; %s",
 				st->id, st->command, st->use_file, message);
 }
@@ -3349,9 +3356,23 @@ readCommandResponse(CState *st, MetaCommand meta, char *varprefix)
 				st->num_syncs--;
 				if (st->num_syncs == 0 && PQexitPipelineMode(st->con) != 1)
 					pg_log_error("client %d failed to exit pipeline mode: %s", st->id,
-								 PQerrorMessage(st->con));
+								 PQresultErrorMessage(res));
 				break;
 
+			case PGRES_COPY_IN:
+			case PGRES_COPY_OUT:
+			case PGRES_COPY_BOTH:
+				pg_log_error("COPY is not supported in pgbench, aborting");
+
+				/*
+				 * We need to exit the copy state.  Otherwise, PQgetResult()
+				 * will always return an empty PGresult as an effect of
+				 * getCopyResult(), leading to an infinite loop in the error
+				 * cleanup done below.
+				 */
+				PQendcopy(st->con);
+				goto error;
+
 			case PGRES_NONFATAL_ERROR:
 			case PGRES_FATAL_ERROR:
 				st->estatus = getSQLErrorStatus(PQresultErrorField(res,
@@ -3359,7 +3380,7 @@ readCommandResponse(CState *st, MetaCommand meta, char *varprefix)
 				if (canRetryError(st->estatus))
 				{
 					if (verbose_errors)
-						commandError(st, PQerrorMessage(st->con));
+						commandError(st, PQresultErrorMessage(res));
 					goto error;
 				}
 				/* fall through */
@@ -3368,7 +3389,7 @@ readCommandResponse(CState *st, MetaCommand meta, char *varprefix)
 				/* anything else is unexpected */
 				pg_log_error("client %d script %d aborted in command %d query %d: %s",
 							 st->id, st->use_file, st->command, qrynum,
-							 PQerrorMessage(st->con));
+							 PQresultErrorMessage(res));
 				goto error;
 		}
 
@@ -3490,12 +3511,18 @@ doRetry(CState *st, pg_time_usec_t *now)
 }
 
 /*
- * Read results and discard it until a sync point.
+ * Read and discard results until the last sync point.
  */
 static int
 discardUntilSync(CState *st)
 {
-	/* send a sync */
+	bool		received_sync = false;
+
+	/*
+	 * Send a Sync message to ensure at least one PGRES_PIPELINE_SYNC is
+	 * received and to avoid an infinite loop, since all earlier ones may have
+	 * already been received.
+	 */
 	if (!PQpipelineSync(st->con))
 	{
 		pg_log_error("client %d aborted: failed to send a pipeline sync",
@@ -3503,18 +3530,42 @@ discardUntilSync(CState *st)
 		return 0;
 	}
 
-	/* receive PGRES_PIPELINE_SYNC and null following it */
+	/*
+	 * Continue reading results until the last sync point, i.e., until
+	 * reaching null just after PGRES_PIPELINE_SYNC.
+	 */
 	for (;;)
 	{
 		PGresult   *res = PQgetResult(st->con);
 
-		if (PQresultStatus(res) == PGRES_PIPELINE_SYNC)
+		if (PQstatus(st->con) == CONNECTION_BAD)
 		{
+			pg_log_error("client %d aborted while rolling back the transaction after an error; perhaps the backend died while processing",
+						 st->id);
 			PQclear(res);
-			res = PQgetResult(st->con);
-			Assert(res == NULL);
+			return 0;
+		}
+
+		if (PQresultStatus(res) == PGRES_PIPELINE_SYNC)
+			received_sync = true;
+		else if (received_sync && res == NULL)
+		{
+			/*
+			 * Reset ongoing sync count to 0 since all PGRES_PIPELINE_SYNC
+			 * results have been discarded.
+			 */
+			st->num_syncs = 0;
 			break;
 		}
+		else
+		{
+			/*
+			 * If a PGRES_PIPELINE_SYNC is followed by something other than
+			 * PGRES_PIPELINE_SYNC or NULL, another PGRES_PIPELINE_SYNC will
+			 * appear later. Reset received_sync to false to wait for it.
+			 */
+			received_sync = false;
+		}
 		PQclear(res);
 	}
 
@@ -6190,7 +6241,7 @@ findBuiltin(const char *name)
 static int
 parseScriptWeight(const char *option, char **script)
 {
-	char	   *sep;
+	const char *sep;
 	int			weight;
 
 	if ((sep = strrchr(option, WSEP)))
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index ab025217d29..ea316a51089 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -1810,6 +1810,17 @@ BEGIN
 }
 	});
 
+# Test copy in pgbench
+$node->pgbench(
+	'-t 10',
+	2,
+	[],
+	[ qr{COPY is not supported in pgbench, aborting} ],
+	'Test copy in script',
+	{
+		'001_copy' => q{ COPY pgbench_accounts FROM stdin }
+	});
+
 # Clean up
 $node->safe_psql('postgres', 'DROP TABLE counter;');
 
diff --git a/src/bin/psql/.gitignore b/src/bin/psql/.gitignore
index 7272f6e35db..80fd164d987 100644
--- a/src/bin/psql/.gitignore
+++ b/src/bin/psql/.gitignore
@@ -2,5 +2,9 @@
 /tab-complete.c
 /sql_help.h
 /sql_help.c
+/ora_psqlscanslash.c
+/psqlplusparse.c
+/psqlplusparse.h
+/psqlplusscan.c
 /psql
 /tmp_check/
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index f9f64e35da8..fe837dc6650 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/psql/Makefile
 #
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 27c5e204b00..8fda909b826 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -42,7 +42,7 @@
 #include "mainloop.h"
 #include "pqexpbuffer.h"
 #include "psqlscanslash.h"
-#include "ora_psqlscanslash.h" 
+#include "ora_psqlscanslash.h"
 #include "settings.h"
 #include "variables.h"
 
@@ -134,6 +134,8 @@ static backslashResult exec_command_pset(PsqlScanState scan_state, bool active_b
 static backslashResult exec_command_quit(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_reset(PsqlScanState scan_state, bool active_branch,
 										  PQExpBuffer query_buf);
+static backslashResult exec_command_restrict(PsqlScanState scan_state, bool active_branch,
+											 const char *cmd);
 static backslashResult exec_command_s(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_sendpipeline(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_set(PsqlScanState scan_state, bool active_branch);
@@ -146,6 +148,8 @@ static backslashResult exec_command_syncpipeline(PsqlScanState scan_state, bool
 static backslashResult exec_command_t(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_T(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_timing(PsqlScanState scan_state, bool active_branch);
+static backslashResult exec_command_unrestrict(PsqlScanState scan_state, bool active_branch,
+											   const char *cmd);
 static backslashResult exec_command_unset(PsqlScanState scan_state, bool active_branch,
 										  const char *cmd);
 static backslashResult exec_command_write(PsqlScanState scan_state, bool active_branch,
@@ -197,6 +201,8 @@ static char *pset_value_string(const char *param, printQueryOpt *popt);
 static void checkWin32Codepage(void);
 #endif
 
+static bool restricted;
+static char *restrict_key;
 
 
 /*----------
@@ -253,8 +259,19 @@ HandleSlashCmds(PsqlScanState scan_state,
 
 	Assert(cmd != NULL);
 
-	/* And try to execute it */
-	status = exec_command(cmd, scan_state, cstack, query_buf, previous_buf);
+	/*
+	 * And try to execute it.
+	 *
+	 * If we are in "restricted" mode, the only allowable backslash command is
+	 * \unrestrict (to exit restricted mode).
+	 */
+	if (restricted && strcmp(cmd, "unrestrict") != 0)
+	{
+		pg_log_error("backslash commands are restricted; only \\unrestrict is allowed");
+		status = PSQL_CMD_ERROR;
+	}
+	else
+		status = exec_command(cmd, scan_state, cstack, query_buf, previous_buf);
 
 	if (status == PSQL_CMD_UNKNOWN)
 	{
@@ -294,7 +311,7 @@ HandleSlashCmds(PsqlScanState scan_state,
 	/* if there is a trailing \\, swallow it */
 	if (db_mode == DB_PG)
 		psql_scan_slash_command_end(scan_state);
-	else if(db_mode == DB_ORACLE)
+	else if (db_mode == DB_ORACLE)
 		ora_psql_scan_slash_command_end(scan_state);
 
 	free(cmd);
@@ -435,6 +452,8 @@ exec_command(const char *cmd,
 		status = exec_command_quit(scan_state, active_branch);
 	else if (strcmp(cmd, "r") == 0 || strcmp(cmd, "reset") == 0)
 		status = exec_command_reset(scan_state, active_branch, query_buf);
+	else if (strcmp(cmd, "restrict") == 0)
+		status = exec_command_restrict(scan_state, active_branch, cmd);
 	else if (strcmp(cmd, "s") == 0)
 		status = exec_command_s(scan_state, active_branch);
 	else if (strcmp(cmd, "sendpipeline") == 0)
@@ -457,6 +476,8 @@ exec_command(const char *cmd,
 		status = exec_command_T(scan_state, active_branch);
 	else if (strcmp(cmd, "timing") == 0)
 		status = exec_command_timing(scan_state, active_branch);
+	else if (strcmp(cmd, "unrestrict") == 0)
+		status = exec_command_unrestrict(scan_state, active_branch, cmd);
 	else if (strcmp(cmd, "unset") == 0)
 		status = exec_command_unset(scan_state, active_branch, cmd);
 	else if (strcmp(cmd, "w") == 0 || strcmp(cmd, "write") == 0)
@@ -1038,6 +1059,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
 		show_system = strchr(cmd, 'S') ? true : false;
 
 		getDbCompatibleMode(pset.db);
+
 		/*
 		 * The 'x' option turns expanded mode on for this command only. This
 		 * is allowed in all \d* commands, except \d by itself, since \dx is a
@@ -2781,6 +2803,35 @@ exec_command_reset(PsqlScanState scan_state, bool active_branch,
 	return PSQL_CMD_SKIP_LINE;
 }
 
+/*
+ * \restrict -- enter "restricted mode" with the provided key
+ */
+static backslashResult
+exec_command_restrict(PsqlScanState scan_state, bool active_branch,
+					  const char *cmd)
+{
+	if (active_branch)
+	{
+		char	   *opt;
+
+		Assert(!restricted);
+
+		opt = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, true);
+		if (opt == NULL || opt[0] == '\0')
+		{
+			pg_log_error("\\%s: missing required argument", cmd);
+			return PSQL_CMD_ERROR;
+		}
+
+		restrict_key = pstrdup(opt);
+		restricted = true;
+	}
+	else
+		ignore_slash_options(scan_state);
+
+	return PSQL_CMD_SKIP_LINE;
+}
+
 /*
  * \s -- save history in a file or show it on the screen
  */
@@ -3162,6 +3213,46 @@ exec_command_timing(PsqlScanState scan_state, bool active_branch)
 	return success ? PSQL_CMD_SKIP_LINE : PSQL_CMD_ERROR;
 }
 
+/*
+ * \unrestrict -- exit "restricted mode" if provided key matches
+ */
+static backslashResult
+exec_command_unrestrict(PsqlScanState scan_state, bool active_branch,
+						const char *cmd)
+{
+	if (active_branch)
+	{
+		char	   *opt;
+
+		opt = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, true);
+		if (opt == NULL || opt[0] == '\0')
+		{
+			pg_log_error("\\%s: missing required argument", cmd);
+			return PSQL_CMD_ERROR;
+		}
+
+		if (!restricted)
+		{
+			pg_log_error("\\%s: not currently in restricted mode", cmd);
+			return PSQL_CMD_ERROR;
+		}
+		else if (strcmp(opt, restrict_key) == 0)
+		{
+			pfree(restrict_key);
+			restricted = false;
+		}
+		else
+		{
+			pg_log_error("\\%s: wrong key", cmd);
+			return PSQL_CMD_ERROR;
+		}
+	}
+	else
+		ignore_slash_options(scan_state);
+
+	return PSQL_CMD_SKIP_LINE;
+}
+
 /*
  * \unset -- unset variable
  */
@@ -3538,6 +3629,7 @@ static backslashResult
 exec_command_parser(PsqlScanState scan_state, bool active_branch)
 {
 	bool		success = true;
+
 	if (active_branch)
 	{
 		getDbCompatibleMode(pset.db);
@@ -4535,6 +4627,7 @@ SyncVariables(void)
 {
 	char		vbuf[32];
 	const char *server_version;
+	char	   *service_name;
 
 	/* get stuff from connection */
 	pset.encoding = PQclientEncoding(pset.db);
@@ -4544,12 +4637,16 @@ SyncVariables(void)
 	setFmtEncoding(pset.encoding);
 
 	SetVariable(pset.vars, "DBNAME", PQdb(pset.db));
-	SetVariable(pset.vars, "SERVICE", PQservice(pset.db));
 	SetVariable(pset.vars, "USER", PQuser(pset.db));
 	SetVariable(pset.vars, "HOST", PQhost(pset.db));
 	SetVariable(pset.vars, "PORT", PQport(pset.db));
 	SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));
 
+	service_name = get_conninfo_value("service");
+	SetVariable(pset.vars, "SERVICE", service_name);
+	if (service_name)
+		pg_free(service_name);
+
 	/* this bit should match connection_warnings(): */
 	/* Try to get full text form of version, might include "devel" etc */
 	server_version = PQparameterStatus(pset.db, "server_version");
@@ -5191,7 +5288,7 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 	/* header line width in expanded mode */
 	else if (strcmp(param, "xheader_width") == 0)
 	{
-		if (! value)
+		if (!value)
 			;
 		else if (pg_strcasecmp(value, "full") == 0)
 			popt->topt.expanded_header_width_type = PRINT_XHEADER_FULL;
@@ -5743,15 +5840,16 @@ pset_value_string(const char *param, printQueryOpt *popt)
 	else if (strcmp(param, "xheader_width") == 0)
 	{
 		if (popt->topt.expanded_header_width_type == PRINT_XHEADER_FULL)
-			return(pstrdup("full"));
+			return (pstrdup("full"));
 		else if (popt->topt.expanded_header_width_type == PRINT_XHEADER_COLUMN)
-			return(pstrdup("column"));
+			return (pstrdup("column"));
 		else if (popt->topt.expanded_header_width_type == PRINT_XHEADER_PAGE)
-			return(pstrdup("page"));
+			return (pstrdup("page"));
 		else
 		{
 			/* must be PRINT_XHEADER_EXACT_WIDTH */
-			char wbuff[32];
+			char		wbuff[32];
+
 			snprintf(wbuff, sizeof(wbuff), "%d",
 					 popt->topt.expanded_header_exact_width);
 			return pstrdup(wbuff);
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 2e357996c7f..ba4ef2edfe6 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/common.c
@@ -28,7 +28,10 @@
 #include "fe_utils/cancel.h"
 #include "fe_utils/mbprint.h"
 #include "fe_utils/string_utils.h"
+#include "mb/pg_wchar.h"
+#include "oracle_fe_utils/ora_string_utils.h"
 #include "portability/instr_time.h"
+#include "psqlplus.h"
 #include "settings.h"
 
 static bool DescribeQuery(const char *query, double *elapsed_msec);
@@ -40,6 +43,9 @@ static int	ExecQueryAndProcessResults(const char *query,
 									   const printQueryOpt *opt,
 									   FILE *printQueryFout);
 static bool command_no_begin(const char *query);
+static bool is_select_command(const char *query);
+static Ivyresult *psql_exec_pbe(const char *sql, HostVariable *hv, struct _variable **bindvar);
+static bool IvyPrintQueryResults(PGresult *results, bool quiet, bool isoracall);
 
 
 /*
@@ -1526,7 +1532,16 @@ DescribeQuery(const char *query, double *elapsed_msec)
 			}
 
 			if (OK && result)
-				OK = PrintQueryResult(result, true, NULL, NULL, NULL);
+			{
+				if (db_mode == DB_ORACLE)
+				{
+					OK = IvyPrintQueryResults(result, false, false);
+				}
+				else
+				{
+					OK = PrintQueryResult(result, true, NULL, NULL, NULL);
+				}
+			}
 
 			termPQExpBuffer(&buf);
 		}
@@ -2618,6 +2633,41 @@ session_username(void)
 		return PQuser(pset.db);
 }
 
+/*
+ * Return the value of option for keyword in the current connection.
+ *
+ * The caller is responsible for freeing the result value allocated.
+ */
+char *
+get_conninfo_value(const char *keyword)
+{
+	PQconninfoOption *opts;
+	PQconninfoOption *serviceopt = NULL;
+	char	   *res = NULL;
+
+	if (pset.db == NULL)
+		return NULL;
+
+	opts = PQconninfo(pset.db);
+	if (opts == NULL)
+		return NULL;
+
+	for (PQconninfoOption *opt = opts; opt->keyword != NULL; ++opt)
+	{
+		if (strcmp(opt->keyword, keyword) == 0)
+		{
+			serviceopt = opt;
+			break;
+		}
+	}
+
+	/* Take a copy of the value, as it is freed by PQconninfoFree(). */
+	if (serviceopt && serviceopt->val != NULL)
+		res = pg_strdup(serviceopt->val);
+	PQconninfoFree(opts);
+
+	return res;
+}
 
 /* expand_tilde
  *
@@ -2757,3 +2807,1417 @@ recognized_connection_string(const char *connstr)
 {
 	return uri_prefix_length(connstr) != 0 || strchr(connstr, '=') != NULL;
 }
+
+
+/* Begin - IvorySQL EXECUTE */
+
+/*
+ * AcceptResult
+ *
+ * Checks whether a result is valid, giving an error message if necessary;
+ * and ensures that the connection to the backend is still up.
+ *
+ * Returns true for valid result, false for error state.
+ */
+static bool
+IvyAcceptResult(const PGresult *result)
+{
+	bool		OK;
+
+	if (!result)
+		OK = false;
+	else
+		switch (PQresultStatus(result))
+		{
+			case PGRES_COMMAND_OK:
+			case PGRES_TUPLES_OK:
+			case PGRES_EMPTY_QUERY:
+			case PGRES_COPY_IN:
+			case PGRES_COPY_OUT:
+				/* Fine, do nothing */
+				OK = true;
+				break;
+
+			case PGRES_BAD_RESPONSE:
+			case PGRES_NONFATAL_ERROR:
+			case PGRES_FATAL_ERROR:
+				OK = false;
+				break;
+
+			default:
+				OK = false;
+				pg_log_error("unexpected PQresultStatus: %d",
+							 PQresultStatus(result));
+				break;
+		}
+
+	if (!OK)
+	{
+		const char *error = PQerrorMessage(pset.db);
+
+		if (strlen(error))
+			pg_log_info("%s", error);
+
+		CheckConnection();
+	}
+
+	return OK;
+}
+
+
+/*
+ * ExecQueryUsingCursor: run a SELECT-like query using a cursor
+ *
+ * This feature allows result sets larger than RAM to be dealt with.
+ *
+ * Returns true if the query executed successfully, false otherwise.
+ *
+ * If pset.timing is on, total query time (exclusive of result-printing) is
+ * stored into *elapsed_msec.
+ */
+static bool
+ExecQueryUsingCursor(const char *query, double *elapsed_msec)
+{
+	bool		OK = true;
+	PGresult   *results;
+	PQExpBufferData buf;
+	printQueryOpt my_popt = pset.popt;
+	FILE	   *fout;
+	bool		is_pipe;
+	bool		is_pager = false;
+	bool		started_txn = false;
+	int64		total_tuples = 0;
+	int			ntuples;
+	int			fetch_count;
+	char		fetch_cmd[64];
+	instr_time	before,
+				after;
+	int			flush_error;
+
+	*elapsed_msec = 0;
+	INSTR_TIME_SET_ZERO(before);
+
+	/* initialize print options for partial table output */
+	my_popt.topt.start_table = true;
+	my_popt.topt.stop_table = false;
+	my_popt.topt.prior_records = 0;
+
+	if (pset.timing)
+		INSTR_TIME_SET_CURRENT(before);
+
+	/* if we're not in a transaction, start one */
+	if (PQtransactionStatus(pset.db) == PQTRANS_IDLE)
+	{
+		results = PQexec(pset.db, "BEGIN");
+		OK = IvyAcceptResult(results) &&
+			(PQresultStatus(results) == PGRES_COMMAND_OK);
+		ClearOrSaveResult(results);
+		if (!OK)
+			return false;
+		started_txn = true;
+	}
+
+	/* Send DECLARE CURSOR */
+	initPQExpBuffer(&buf);
+	appendPQExpBuffer(&buf, "DECLARE _psql_cursor NO SCROLL CURSOR FOR\n%s",
+					  query);
+
+	results = PQexec(pset.db, buf.data);
+	OK = IvyAcceptResult(results) &&
+		(PQresultStatus(results) == PGRES_COMMAND_OK);
+	if (!OK)
+		SetResultVariables(results, OK);
+	ClearOrSaveResult(results);
+	termPQExpBuffer(&buf);
+	if (!OK)
+		goto cleanup;
+
+	if (pset.timing)
+	{
+		INSTR_TIME_SET_CURRENT(after);
+		INSTR_TIME_SUBTRACT(after, before);
+		*elapsed_msec += INSTR_TIME_GET_MILLISEC(after);
+	}
+
+	/*
+	 * In \gset mode, we force the fetch count to be 2, so that we will throw
+	 * the appropriate error if the query returns more than one row.
+	 */
+	if (pset.gset_prefix)
+		fetch_count = 2;
+	else
+		fetch_count = pset.fetch_count;
+
+	snprintf(fetch_cmd, sizeof(fetch_cmd),
+			 "FETCH FORWARD %d FROM _psql_cursor",
+			 fetch_count);
+
+	/* prepare to write output to \g argument, if any */
+	if (pset.gfname)
+	{
+		if (!openQueryOutputFile(pset.gfname, &fout, &is_pipe))
+		{
+			OK = false;
+			goto cleanup;
+		}
+		if (is_pipe)
+			disable_sigpipe_trap();
+	}
+	else
+	{
+		fout = pset.queryFout;
+		is_pipe = false;		/* doesn't matter */
+	}
+
+	/* clear any pre-existing error indication on the output stream */
+	clearerr(fout);
+
+	for (;;)
+	{
+		if (pset.timing)
+			INSTR_TIME_SET_CURRENT(before);
+
+		/* get fetch_count tuples at a time */
+		results = PQexec(pset.db, fetch_cmd);
+
+		if (pset.timing)
+		{
+			INSTR_TIME_SET_CURRENT(after);
+			INSTR_TIME_SUBTRACT(after, before);
+			*elapsed_msec += INSTR_TIME_GET_MILLISEC(after);
+		}
+
+		if (PQresultStatus(results) != PGRES_TUPLES_OK)
+		{
+			/* shut down pager before printing error message */
+			if (is_pager)
+			{
+				ClosePager(fout);
+				is_pager = false;
+			}
+
+			OK = IvyAcceptResult(results);
+			Assert(!OK);
+			SetResultVariables(results, OK);
+			ClearOrSaveResult(results);
+			break;
+		}
+
+		if (pset.gset_prefix)
+		{
+			/* StoreQueryTuple will complain if not exactly one row */
+			OK = StoreQueryTuple(results);
+			ClearOrSaveResult(results);
+			break;
+		}
+
+		/*
+		 * Note we do not deal with \gdesc, \gexec or \crosstabview modes here
+		 */
+
+		ntuples = PQntuples(results);
+		total_tuples += ntuples;
+
+		if (ntuples < fetch_count)
+		{
+			/* this is the last result set, so allow footer decoration */
+			my_popt.topt.stop_table = true;
+		}
+		else if (fout == stdout && !is_pager)
+		{
+			/*
+			 * If query requires multiple result sets, hack to ensure that
+			 * only one pager instance is used for the whole mess
+			 */
+			fout = PageOutput(INT_MAX, &(my_popt.topt));
+			is_pager = true;
+		}
+
+		printQuery(results, &my_popt, fout, is_pager, pset.logfile);
+
+		ClearOrSaveResult(results);
+
+		/* after the first result set, disallow header decoration */
+		my_popt.topt.start_table = false;
+		my_popt.topt.prior_records += ntuples;
+
+		/*
+		 * Make sure to flush the output stream, so intermediate results are
+		 * visible to the client immediately.  We check the results because if
+		 * the pager dies/exits/etc, there's no sense throwing more data at
+		 * it.
+		 */
+		flush_error = fflush(fout);
+
+		/*
+		 * Check if we are at the end, if a cancel was pressed, or if there
+		 * were any errors either trying to flush out the results, or more
+		 * generally on the output stream at all.  If we hit any errors
+		 * writing things to the stream, we presume $PAGER has disappeared and
+		 * stop bothering to pull down more data.
+		 */
+		if (ntuples < fetch_count || cancel_pressed || flush_error ||
+			ferror(fout))
+			break;
+	}
+
+	if (pset.gfname)
+	{
+		/* close \g argument file/pipe */
+		if (is_pipe)
+		{
+			pclose(fout);
+			restore_sigpipe_trap();
+		}
+		else
+			fclose(fout);
+	}
+	else if (is_pager)
+	{
+		/* close transient pager */
+		ClosePager(fout);
+	}
+
+	if (OK)
+	{
+		/*
+		 * We don't have a PGresult here, and even if we did it wouldn't have
+		 * the right row count, so fake SetResultVariables().  In error cases,
+		 * we already set the result variables above.
+		 */
+		char		buf[32];
+
+		SetVariable(pset.vars, "ERROR", "false");
+		SetVariable(pset.vars, "SQLSTATE", "00000");
+		snprintf(buf, sizeof(buf), INT64_FORMAT, total_tuples);
+		SetVariable(pset.vars, "ROW_COUNT", buf);
+	}
+
+cleanup:
+	if (pset.timing)
+		INSTR_TIME_SET_CURRENT(before);
+
+	/*
+	 * We try to close the cursor on either success or failure, but on failure
+	 * ignore the result (it's probably just a bleat about being in an aborted
+	 * transaction)
+	 */
+	results = PQexec(pset.db, "CLOSE _psql_cursor");
+	if (OK)
+	{
+		OK = IvyAcceptResult(results) &&
+			(PQresultStatus(results) == PGRES_COMMAND_OK);
+		ClearOrSaveResult(results);
+	}
+	else
+		PQclear(results);
+
+	if (started_txn)
+	{
+		results = PQexec(pset.db, OK ? "COMMIT" : "ROLLBACK");
+		OK &= IvyAcceptResult(results) &&
+			(PQresultStatus(results) == PGRES_COMMAND_OK);
+		ClearOrSaveResult(results);
+	}
+
+	if (pset.timing)
+	{
+		INSTR_TIME_SET_CURRENT(after);
+		INSTR_TIME_SUBTRACT(after, before);
+		*elapsed_msec += INSTR_TIME_GET_MILLISEC(after);
+	}
+
+	return OK;
+}
+
+/*
+ * PrintQueryStatus: report command status as required
+ *
+ * Note: Utility function for use by PrintQueryResults() only.
+ */
+static void
+IvyPrintQueryStatus(PGresult *results)
+{
+	char		buf[16];
+
+	if (!pset.quiet)
+	{
+		if (pset.popt.topt.format == PRINT_HTML)
+		{
+			fputs("<p>", pset.queryFout);
+			html_escaped_print(PQcmdStatus(results), pset.queryFout);
+			fputs("</p>\n", pset.queryFout);
+		}
+		else
+			fprintf(pset.queryFout, "%s\n", PQcmdStatus(results));
+	}
+
+	if (pset.logfile)
+		fprintf(pset.logfile, "%s\n", PQcmdStatus(results));
+
+	snprintf(buf, sizeof(buf), "%u", (unsigned int) PQoidValue(results));
+	SetVariable(pset.vars, "LASTOID", buf);
+}
+
+/*
+ * PrintQueryTuples: assuming query result is OK, print its tuples
+ *
+ * Returns true if successful, false otherwise.
+ */
+static bool
+IvyPrintQueryTuples(const PGresult *results)
+{
+	bool		result = true;
+
+	/* write output to \g argument, if any */
+	if (pset.gfname)
+	{
+		FILE	   *fout;
+		bool		is_pipe;
+
+		if (!openQueryOutputFile(pset.gfname, &fout, &is_pipe))
+			return false;
+		if (is_pipe)
+			disable_sigpipe_trap();
+
+		printQuery(results, &pset.popt, fout, false, pset.logfile);
+		if (ferror(fout))
+		{
+			pg_log_error("could not print result table: %m");
+			result = false;
+		}
+
+		if (is_pipe)
+		{
+			pclose(fout);
+			restore_sigpipe_trap();
+		}
+		else
+			fclose(fout);
+	}
+	else
+	{
+		printQuery(results, &pset.popt, pset.queryFout, false, pset.logfile);
+		if (ferror(pset.queryFout))
+		{
+			pg_log_error("could not print result table: %m");
+			result = false;
+		}
+	}
+
+	return result;
+}
+
+/*
+ * Like PrintQueryStatus(), except that the command 
+ * status message is specified by the caller and It
+ * is usually an Oracle-compatible message text.
+ */
+static void
+PrintQueryStatus2(PGresult *results, char *cmdstatus)
+{
+	char		buf[16];
+
+	if (!pset.quiet)
+	{
+		if (pset.popt.topt.format == PRINT_HTML)
+		{
+			fputs("<p>", pset.queryFout);
+			html_escaped_print(cmdstatus, pset.queryFout);
+			fputs("</p>\n", pset.queryFout);
+		}
+		else
+			fprintf(pset.queryFout, "%s\n", cmdstatus);
+	}
+
+	if (pset.logfile)
+		fprintf(pset.logfile, "%s\n", cmdstatus);
+
+	snprintf(buf, sizeof(buf), "%u", (unsigned int) PQoidValue(results));
+	SetVariable(pset.vars, "LASTOID", buf);
+}
+
+/*
+ * PrintQueryResults: print out (or store or execute) query results as required
+ *
+ * Note: Utility function for use by SendQuery() only.
+ *
+ * Returns true if the query executed successfully, false otherwise.
+ */
+static bool
+IvyPrintQueryResults(PGresult *results, bool quiet, bool isoracall)
+{
+	bool		success;
+	const char *cmdstatus;
+
+	if (!results)
+		return false;
+
+	switch (PQresultStatus(results))
+	{
+		case PGRES_TUPLES_OK:
+
+			cmdstatus = PQcmdStatus(results);
+
+			/*
+			 * DO and CALL stmt with OUT parameters will generate result
+			 * tuples, we expect to suppress the output of result tuples.
+			 */
+			if (db_mode == DB_ORACLE && isoracall && strncmp(cmdstatus, "DO", 2) == 0)
+			{
+				PrintQueryStatus2(results, "\nCall completed.\n");
+				success = true;
+				break;
+			}
+			else if (db_mode == DB_ORACLE && quiet && strncmp(cmdstatus, "DO", 2) == 0)
+			{
+				PrintQueryStatus2(results, "\nPL/iSQL procedure successfully completed.\n");
+				success = true;
+				break;
+			}
+			else if (db_mode == DB_ORACLE && quiet && strncmp(cmdstatus, "CALL", 4) == 0)
+			{
+				PrintQueryStatus2(results, "\nCall completed.\n");
+				success = true;
+				break;
+			}
+
+			/* store or execute or print the data ... */
+			if (pset.gset_prefix)
+				success = StoreQueryTuple(results);
+			else if (pset.gexec_flag)
+				success = ExecQueryTuples(results);
+			else if (pset.crosstab_flag)
+				success = PrintResultInCrosstab(results);
+			else
+				success = IvyPrintQueryTuples(results);
+
+			/* if it's INSERT/UPDATE/DELETE RETURNING, also print status */
+			if (strncmp(cmdstatus, "INSERT", 6) == 0 ||
+				strncmp(cmdstatus, "UPDATE", 6) == 0 ||
+				strncmp(cmdstatus, "DELETE", 6) == 0)
+				IvyPrintQueryStatus(results);
+			break;
+
+		case PGRES_COMMAND_OK:
+			cmdstatus = PQcmdStatus(results);
+			if (db_mode == DB_ORACLE && isoracall && strncmp(cmdstatus, "DO", 2) == 0)
+				PrintQueryStatus2(results, "\nCall completed.\n");
+			else if (db_mode == DB_ORACLE && strncmp(cmdstatus, "DO", 2) == 0)
+				PrintQueryStatus2(results, "\nPL/iSQL procedure successfully completed.\n");
+			else if (db_mode == DB_ORACLE && strncmp(cmdstatus, "CALL", 4) == 0)
+				PrintQueryStatus2(results, "\nCall completed.\n");
+			else
+				IvyPrintQueryStatus(results);
+			success = true;
+			break;
+
+		case PGRES_EMPTY_QUERY:
+			success = true;
+			break;
+
+		case PGRES_COPY_OUT:
+		case PGRES_COPY_IN:
+			/* nothing to do here */
+			success = true;
+			break;
+
+		case PGRES_BAD_RESPONSE:
+		case PGRES_NONFATAL_ERROR:
+		case PGRES_FATAL_ERROR:
+			success = false;
+			break;
+
+		default:
+			success = false;
+			pg_log_error("unexpected PQresultStatus: %d",
+						 PQresultStatus(results));
+			break;
+	}
+
+	fflush(pset.queryFout);
+
+	return success;
+}
+
+/*
+ * ProcessResult: utility function for use by SendQuery() only
+ *
+ * When our command string contained a COPY FROM STDIN or COPY TO STDOUT,
+ * PQexec() has stopped at the PGresult associated with the first such
+ * command.  In that event, we'll marshal data for the COPY and then cycle
+ * through any subsequent PGresult objects.
+ *
+ * When the command string contained no such COPY command, this function
+ * degenerates to an AcceptResult() call.
+ *
+ * Changes its argument to point to the last PGresult of the command string,
+ * or NULL if that result was for a COPY TO STDOUT.  (Returning NULL prevents
+ * the command status from being printed, which we want in that case so that
+ * the status line doesn't get taken as part of the COPY data.)
+ *
+ * Returns true on complete success, false otherwise.  Possible failure modes
+ * include purely client-side problems; check the transaction status for the
+ * server-side opinion.
+ */
+static bool
+ProcessResult(PGresult **results)
+{
+	bool		success = true;
+	bool		first_cycle = true;
+
+	for (;;)
+	{
+		ExecStatusType result_status;
+		bool		is_copy;
+		PGresult   *next_result;
+
+		if (!IvyAcceptResult(*results))
+		{
+			/*
+			 * Failure at this point is always a server-side failure or a
+			 * failure to submit the command string.  Either way, we're
+			 * finished with this command string.
+			 */
+			success = false;
+			break;
+		}
+
+		result_status = PQresultStatus(*results);
+		switch (result_status)
+		{
+			case PGRES_EMPTY_QUERY:
+			case PGRES_COMMAND_OK:
+			case PGRES_TUPLES_OK:
+				is_copy = false;
+				break;
+
+			case PGRES_COPY_OUT:
+			case PGRES_COPY_IN:
+				is_copy = true;
+				break;
+
+			default:
+				/* AcceptResult() should have caught anything else. */
+				is_copy = false;
+				pg_log_error("unexpected PQresultStatus: %d", result_status);
+				break;
+		}
+
+		if (is_copy)
+		{
+			/*
+			 * Marshal the COPY data.  Either subroutine will get the
+			 * connection out of its COPY state, then call PQresultStatus()
+			 * once and report any error.
+			 *
+			 * For COPY OUT, direct the output to pset.copyStream if it's set,
+			 * otherwise to pset.gfname if it's set, otherwise to queryFout.
+			 * For COPY IN, use pset.copyStream as data source if it's set,
+			 * otherwise cur_cmd_source.
+			 */
+			FILE	   *copystream;
+			PGresult   *copy_result;
+
+			SetCancelConn(pset.db);
+			if (result_status == PGRES_COPY_OUT)
+			{
+				bool		need_close = false;
+				bool		is_pipe = false;
+
+				if (pset.copyStream)
+				{
+					/* invoked by \copy */
+					copystream = pset.copyStream;
+				}
+				else if (pset.gfname)
+				{
+					/* invoked by \g */
+					if (openQueryOutputFile(pset.gfname,
+											&copystream, &is_pipe))
+					{
+						need_close = true;
+						if (is_pipe)
+							disable_sigpipe_trap();
+					}
+					else
+						copystream = NULL;	/* discard COPY data entirely */
+				}
+				else
+				{
+					/* fall back to the generic query output stream */
+					copystream = pset.queryFout;
+				}
+
+				success = handleCopyOut(pset.db,
+										copystream,
+										&copy_result)
+					&& success
+					&& (copystream != NULL);
+
+				/*
+				 * Suppress status printing if the report would go to the same
+				 * place as the COPY data just went.  Note this doesn't
+				 * prevent error reporting, since handleCopyOut did that.
+				 */
+				if (copystream == pset.queryFout)
+				{
+					PQclear(copy_result);
+					copy_result = NULL;
+				}
+
+				if (need_close)
+				{
+					/* close \g argument file/pipe */
+					if (is_pipe)
+					{
+						pclose(copystream);
+						restore_sigpipe_trap();
+					}
+					else
+					{
+						fclose(copystream);
+					}
+				}
+			}
+			else
+			{
+				/* COPY IN */
+				copystream = pset.copyStream ? pset.copyStream : pset.cur_cmd_source;
+				success = handleCopyIn(pset.db,
+									   copystream,
+									   PQbinaryTuples(*results),
+									   &copy_result) && success;
+			}
+			ResetCancelConn();
+
+			/*
+			 * Replace the PGRES_COPY_OUT/IN result with COPY command's exit
+			 * status, or with NULL if we want to suppress printing anything.
+			 */
+			PQclear(*results);
+			*results = copy_result;
+		}
+		else if (first_cycle)
+		{
+			/* fast path: no COPY commands; PQexec visited all results */
+			break;
+		}
+
+		/*
+		 * Check PQgetResult() again.  In the typical case of a single-command
+		 * string, it will return NULL.  Otherwise, we'll have other results
+		 * to process that may include other COPYs.  We keep the last result.
+		 */
+		next_result = PQgetResult(pset.db);
+		if (!next_result)
+			break;
+
+		PQclear(*results);
+		*results = next_result;
+		first_cycle = false;
+	}
+
+	SetResultVariables(*results, success);
+
+	/* may need this to recover from conn loss during COPY */
+	if (!first_cycle && !CheckConnection())
+		return false;
+
+	return success;
+}
+
+/*
+ * Check whether the specified command is a SELECT (or VALUES).
+ */
+
+static bool
+is_select_command(const char *query)
+{
+	int			wordlen;
+
+	/*
+	 * First advance over any whitespace, comments and left parentheses.
+	 */
+	for (;;)
+	{
+		query = skip_white_space(query);
+		if (query[0] == '(')
+			query++;
+		else
+			break;
+	}
+
+	/*
+	 * Check word length (since "selectx" is not "select").
+	 */
+	wordlen = 0;
+	while (isalpha((unsigned char) query[wordlen]))
+		wordlen += PQmblenBounded(&query[wordlen], pset.encoding);
+
+	if (wordlen == 6 && pg_strncasecmp(query, "select", 6) == 0)
+		return true;
+
+	if (wordlen == 6 && pg_strncasecmp(query, "values", 6) == 0)
+		return true;
+
+	return false;
+}
+
+/*
+ * Advance the given char pointer over white space and oracle-style comments.
+ */
+char *
+psqlplus_skip_space(char *query)
+{
+	bool	slashstar_start = false;
+
+	while (*query)
+	{
+		int			mblen = PQmblenBounded(query, pset.encoding);
+
+		/*
+		 * Note: we assume the encoding is a superset of ASCII, so that for
+		 * example "query[0] == '/'" is meaningful.  However, we do NOT assume
+		 * that the second and subsequent bytes of a multibyte character
+		 * couldn't look like ASCII characters; so it is critical to advance
+		 * by mblen, not 1, whenever we haven't exactly identified the
+		 * character we are skipping over.
+		 */
+		if (isspace((unsigned char) *query))
+			query += mblen;
+		else if (!slashstar_start && query[0] == '/' && query[1] == '*')
+		{
+			slashstar_start = true;
+			query += 2;
+		}
+		else if (slashstar_start && query[0] == '*' && query[1] == '/')
+		{
+			slashstar_start = false;
+			query += 2;
+		}
+		else if (!slashstar_start && query[0] == '-' && query[1] == '-')
+		{
+			query += 2;
+
+			/*
+			 * We have to skip to end of line since any slash-star inside the
+			 * -- comment does NOT start a slash-star comment.
+			 */
+			while (*query)
+			{
+				if (*query == '\n')
+				{
+					query++;
+					break;
+				}
+				query += PQmblenBounded(query, pset.encoding);
+			}
+		}
+		else if (slashstar_start)
+			query += mblen;
+		else
+			break;				/* found first token */
+	}
+
+	return query;
+}
+
+/*
+ * Get the host variable from the query, return the HostVariable
+ * array successfully, and return NULL if it fails; if the failure
+ * is caused by the execution of the get_parameter_description() function,
+ * error is set to true.
+ */
+HostVariable *
+get_hostvariables(const char *sql, bool *error)
+{
+	PQExpBuffer query = createPQExpBuffer();
+	PGresult	*res;
+	HostVariable *host = NULL;
+	char		*newsql = NULL;
+	char		*ptr = NULL;
+
+	*error = false;
+	if (!sql)
+		return NULL;
+
+	/* double write quote */
+	newsql = pg_malloc0(strlen(sql) * 2);	/* enough */
+	ptr = newsql;
+
+	while (*sql != '\0')
+	{
+		if (*sql == '\'')
+			*ptr++ = *sql;
+		*ptr++ = *sql;
+		sql++;
+	}
+	*ptr = '\0';
+
+	appendPQExpBuffer(query, "select * from get_parameter_description('%s');", newsql);
+	res = PQexec(pset.db, query->data);
+
+	if (PQresultStatus(res) == PGRES_TUPLES_OK)
+	{
+		int	ntuples = PQntuples(res);
+		int	i_name;
+		int	i_position;
+		int	i_hint;
+
+		i_name = PQfnumber(res, "name");
+		i_position = PQfnumber(res, "position");
+		i_hint = PQfnumber(res, "hint");
+
+		/* No placeholders do not need to use PBE */
+		if (ntuples == 1)
+			return NULL;
+
+		/* is an anonymous block and has placeholders */
+		if (ntuples > 1)
+		{
+			char	*cmdtag = NULL;
+			int		i;
+
+			host = pg_malloc0(sizeof(HostVariable));
+			host->hostvars = (HostVariableEntry *) pg_malloc((ntuples - 1) * sizeof(HostVariableEntry));
+			host->length = ntuples - 1;
+
+			cmdtag = PQgetvalue(res, 0, i_name);
+			if (pg_strcasecmp(cmdtag, "DO")== 0)
+				host->isdostmt = true;
+			else if (pg_strcasecmp(cmdtag, "CALL")== 0)
+			{
+				host->iscallstmt = true;
+				host->convertcall = PQgetisnull(res, 0, i_hint) ? NULL : pg_strdup(PQgetvalue(res, 0, i_hint));
+			}
+			else
+			{
+				host->isdostmt = false;
+				host->iscallstmt = false;
+				host->convertcall = NULL;
+			}
+
+			/* First tuple is not a placeholder info tuple, start with 1 */
+			for (i = 1; i < ntuples; i++)
+			{
+				host->hostvars[i-1].name = pg_strdup(PQgetvalue(res, i, i_name));
+				host->hostvars[i-1].position = atoi(PQgetvalue(res, i, i_position));
+			}
+		}
+	}
+	else
+	{
+		pg_log_info("%s", PQerrorMessage(pset.db));	
+		*error = true;
+	}
+
+	PQclear(res);
+	destroyPQExpBuffer(query);
+	pg_free(newsql);
+
+	return host;
+}
+
+/*
+ * Like SendQuery, except that we send queries
+ * using the extended query protocol.
+ */
+bool
+SendQuery_PBE(const char *query, HostVariable *hv)
+{
+	PGresult   *results;
+	Ivyresult	*ivyresults = NULL;
+	PGTransactionStatusType transaction_status;
+	double		elapsed_msec = 0;
+	bool		OK = false;
+	bool		on_error_rollback_savepoint = false;
+	static bool on_error_rollback_warning = false;
+
+	if (!hv)
+		return SendQuery(query); /* In theory, this shouldn't happen */
+
+	if (!pset.db)
+	{
+		pg_log_error("You are currently not connected to a database.");
+		goto sendquery_cleanup;
+	}
+
+	if (pset.singlestep)
+	{
+		char		buf[3];
+
+		fflush(stderr);
+		printf(_("***(Single step mode: verify command)*******************************************\n"
+				 "%s\n"
+				 "***(press return to proceed or enter x and return to cancel)********************\n"),
+			   query);
+		fflush(stdout);
+		if (fgets(buf, sizeof(buf), stdin) != NULL)
+			if (buf[0] == 'x')
+				goto sendquery_cleanup;
+		if (cancel_pressed)
+			goto sendquery_cleanup;
+	}
+	else if (pset.echo == PSQL_ECHO_QUERIES)
+	{
+		puts(query);
+		fflush(stdout);
+	}
+
+	if (pset.logfile)
+	{
+		fprintf(pset.logfile,
+				_("********* QUERY **********\n"
+				  "%s\n"
+				  "**************************\n\n"), query);
+		fflush(pset.logfile);
+	}
+
+	SetCancelConn(pset.db);
+
+	transaction_status = PQtransactionStatus(pset.db);
+
+	if (transaction_status == PQTRANS_IDLE &&
+		!pset.autocommit &&
+		!command_no_begin(query))
+	{
+		results = PQexec(pset.db, "BEGIN");
+		if (PQresultStatus(results) != PGRES_COMMAND_OK)
+		{
+			pg_log_info("%s", PQerrorMessage(pset.db));
+			ClearOrSaveResult(results);
+			ResetCancelConn();
+			goto sendquery_cleanup;
+		}
+		ClearOrSaveResult(results);
+		transaction_status = PQtransactionStatus(pset.db);
+	}
+
+	if (transaction_status == PQTRANS_INTRANS &&
+		pset.on_error_rollback != PSQL_ERROR_ROLLBACK_OFF &&
+		(pset.cur_cmd_interactive ||
+		 pset.on_error_rollback == PSQL_ERROR_ROLLBACK_ON))
+	{
+		if (on_error_rollback_warning == false && pset.sversion < 80000)
+		{
+			char		sverbuf[32];
+
+			pg_log_warning("The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.",
+						   formatPGVersionNumber(pset.sversion, false,
+												 sverbuf, sizeof(sverbuf)));
+			on_error_rollback_warning = true;
+		}
+		else
+		{
+			results = PQexec(pset.db, "SAVEPOINT pg_psql_temporary_savepoint");
+			if (PQresultStatus(results) != PGRES_COMMAND_OK)
+			{
+				pg_log_info("%s", PQerrorMessage(pset.db));
+				ClearOrSaveResult(results);
+				ResetCancelConn();
+				goto sendquery_cleanup;
+			}
+			ClearOrSaveResult(results);
+			on_error_rollback_savepoint = true;
+		}
+	}
+
+	if (pset.gdesc_flag)
+	{
+		/* Describe query's result columns, without executing it */
+		OK = DescribeQuery(query, &elapsed_msec);
+		ResetCancelConn();
+		results = NULL;			/* PQclear(NULL) does nothing */
+	}
+	else if (pset.fetch_count <= 0 || pset.gexec_flag ||
+			 pset.crosstab_flag || !is_select_command(query))
+	{
+		/* Default fetch-it-all-and-print mode */
+		struct _variable **bindvar;
+		char	*p = NULL;
+		bool	missing = false;
+		instr_time	before,
+					after;
+
+		if (pset.timing)
+			INSTR_TIME_SET_CURRENT(before);
+
+		bindvar = (struct _variable **) pg_malloc0(sizeof(struct _variable *) * hv->length);
+
+		/*
+		 * If there are multiple host variables that have not be declared,
+		 * the order of detection in the Oracle error message is from the
+		 * back to the front.
+		 */
+		for (int i = hv->length; i > 0; i--)
+		{
+			p = hv->hostvars[i - 1].name;
+			p++;	/* skip colon */
+			bindvar[i - 1] = BindVariableExist(pset.vars, p);
+
+			if (bindvar[i - 1] == NULL)
+			{
+				missing= true;
+				break;
+			}
+		}
+
+		if (missing)
+		{
+			pg_log_error("Bind variable \"%s\" not declared.", p);
+			ResetCancelConn();
+			results = NULL;			/* PQclear(NULL) does nothing */
+			OK = false;
+		}
+		else
+		{
+			/* exec using PBE */
+			ivyresults = psql_exec_pbe(query, hv, bindvar);
+
+			if (!ivyresults)
+			{
+				ResetCancelConn();
+				results = NULL;			/* PQclear(NULL) does nothing */
+				OK = false;
+			}
+			else
+			{
+				results = ivyresults->result;
+
+				/* these operations are included in the timing result: */
+				ResetCancelConn();
+				OK = ProcessResult(&results);
+
+				if (pset.timing)
+				{
+					INSTR_TIME_SET_CURRENT(after);
+					INSTR_TIME_SUBTRACT(after, before);
+					elapsed_msec = INSTR_TIME_GET_MILLISEC(after);
+				}
+
+				/* but printing results isn't: */
+				if (OK && results)
+					OK = IvyPrintQueryResults(results, true, hv->iscallstmt);
+			}
+		}
+		pg_free(bindvar);
+	}
+	else
+	{
+		/* Fetch-in-segments mode */
+		OK = ExecQueryUsingCursor(query, &elapsed_msec);
+		ResetCancelConn();
+		results = NULL;			/* PQclear(NULL) does nothing */
+	}
+
+	if (!OK && pset.echo == PSQL_ECHO_ERRORS)
+		pg_log_info("STATEMENT:  %s", query);
+
+	/* If we made a temporary savepoint, possibly release/rollback */
+	if (on_error_rollback_savepoint)
+	{
+		const char *svptcmd = NULL;
+
+		transaction_status = PQtransactionStatus(pset.db);
+
+		switch (transaction_status)
+		{
+			case PQTRANS_INERROR:
+				/* We always rollback on an error */
+				svptcmd = "ROLLBACK TO pg_psql_temporary_savepoint";
+				break;
+
+			case PQTRANS_IDLE:
+				/* If they are no longer in a transaction, then do nothing */
+				break;
+
+			case PQTRANS_INTRANS:
+
+				/*
+				 * Do nothing if they are messing with savepoints themselves:
+				 * If the user did COMMIT AND CHAIN, RELEASE or ROLLBACK, our
+				 * savepoint is gone. If they issued a SAVEPOINT, releasing
+				 * ours would remove theirs.
+				 */
+				if (results &&
+					(strcmp(PQcmdStatus(results), "COMMIT") == 0 ||
+					 strcmp(PQcmdStatus(results), "SAVEPOINT") == 0 ||
+					 strcmp(PQcmdStatus(results), "RELEASE") == 0 ||
+					 strcmp(PQcmdStatus(results), "ROLLBACK") == 0))
+					svptcmd = NULL;
+				else
+					svptcmd = "RELEASE pg_psql_temporary_savepoint";
+				break;
+
+			case PQTRANS_ACTIVE:
+			case PQTRANS_UNKNOWN:
+			default:
+				OK = false;
+				/* PQTRANS_UNKNOWN is expected given a broken connection. */
+				if (transaction_status != PQTRANS_UNKNOWN || ConnectionUp())
+					pg_log_error("unexpected transaction status (%d)",
+								 transaction_status);
+				break;
+		}
+
+		if (svptcmd)
+		{
+			PGresult   *svptres;
+
+			svptres = PQexec(pset.db, svptcmd);
+			if (PQresultStatus(svptres) != PGRES_COMMAND_OK)
+			{
+				pg_log_info("%s", PQerrorMessage(pset.db));
+				ClearOrSaveResult(svptres);
+				OK = false;
+
+				PQclear(results);
+				ResetCancelConn();
+				goto sendquery_cleanup;
+			}
+			PQclear(svptres);
+		}
+	}
+
+	ClearOrSaveResult(results);
+	if (ivyresults)
+	{
+		free(ivyresults);
+		ivyresults = NULL;
+	}
+
+	/* Possible microtiming output */
+	if (pset.timing)
+		PrintTiming(elapsed_msec);
+
+	/* check for events that may occur during query execution */
+
+	if (pset.encoding != PQclientEncoding(pset.db) &&
+		PQclientEncoding(pset.db) >= 0)
+	{
+		/* track effects of SET CLIENT_ENCODING */
+		pset.encoding = PQclientEncoding(pset.db);
+		pset.popt.topt.encoding = pset.encoding;
+		SetVariable(pset.vars, "ENCODING",
+					pg_encoding_to_char(pset.encoding));
+	}
+
+	PrintNotifications();
+
+	/* perform cleanup that should occur after any attempted query */
+
+sendquery_cleanup:
+
+	/* reset \g's output-to-filename trigger */
+	if (pset.gfname)
+	{
+		free(pset.gfname);
+		pset.gfname = NULL;
+	}
+
+	/* restore print settings if \g changed them */
+	if (pset.gsavepopt)
+	{
+		restorePsetInfo(&pset.popt, pset.gsavepopt);
+		pset.gsavepopt = NULL;
+	}
+
+	/* reset \gset trigger */
+	if (pset.gset_prefix)
+	{
+		free(pset.gset_prefix);
+		pset.gset_prefix = NULL;
+	}
+
+	/* reset \gdesc trigger */
+	pset.gdesc_flag = false;
+
+	/* reset \gexec trigger */
+	pset.gexec_flag = false;
+
+	/* reset \crosstabview trigger */
+	pset.crosstab_flag = false;
+	for (int i = 0; i < lengthof(pset.ctv_args); i++)
+	{
+		pg_free(pset.ctv_args[i]);
+		pset.ctv_args[i] = NULL;
+	}
+
+	return OK;
+}
+
+/*
+ * exec_anonymous_pbe
+ * 
+ * Execute query using the extended query protocol and update host variables.
+ */
+static Ivyresult *
+psql_exec_pbe(const char *sql, HostVariable *hv, struct _variable **bindvar)
+{
+	IvyPreparedStatement *stmthandle = NULL;
+	Ivyconn		*conn;
+	Ivyresult	*res;
+	IvyError	*errhp = NULL;
+	char		**var = NULL;
+	IvyBindInfo	**bindinfo = NULL;
+	int			*indp = NULL;
+	int			*var_sz = NULL;
+	int			i;
+
+	if (!sql || !hv || !bindvar)
+		return NULL;
+
+	conn = Ivyconnectdb2(pset.db);
+
+	/* this shouldn't happen */
+	if (Ivystatus(conn) == CONNECTION_BAD)
+	{
+		pg_log_error("database connection lost.");
+		pg_log_error("%s", IvyerrorMessage(conn));
+		Ivyfinish2(conn);
+		return NULL;
+	}
+
+	if (!IvyHandleAlloc(NULL, (void **) &stmthandle,IVY_HANDLE_STMT,4, NULL))
+	{
+		pg_log_error("IvyHandleAlloc alloc stmt handle failed");
+		Ivyfinish2(conn);
+		return NULL;
+	}
+
+	if (!IvyHandleAlloc(NULL, (void **) &errhp, IVY_HANDLE_ERROR, 4, NULL))
+	{
+		pg_log_error("IvyHandleAlloc alloc error handle failed");
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		Ivyfinish2(conn);
+		return NULL;
+	}
+
+	/* PREPARE */
+	if (!IvyStmtPrepare(stmthandle, errhp, sql, strlen(sql), 0, 0))
+	{
+		pg_log_error("%s", errhp->error_msg);
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		Ivyfinish2(conn);
+		return NULL;
+	}
+
+	var = (char **) pg_malloc0(hv->length * sizeof(char *));
+	bindinfo = (IvyBindInfo **) pg_malloc0(hv->length * sizeof(IvyBindInfo *));
+	indp = pg_malloc0(hv->length * sizeof(int));
+	var_sz = pg_malloc0(hv->length * sizeof(int));
+
+	for (i = 0; i < hv->length; i++)
+	{
+		switch (bindvar[i]->typoid)
+		{
+			case NUMBEROID:
+				var_sz[i] = 256;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case BINARY_FLOATOID:
+				var_sz[i] = 256;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case BINARY_DOUBLEOID:
+				var_sz[i] = 256;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case ORACHARCHAROID:
+				var_sz[i] = (bindvar[i]->typmod - VARHDRSZ) * pg_encoding_max_length(pset.encoding) + 1;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case ORACHARBYTEOID:
+				var_sz[i] = bindvar[i]->typmod - VARHDRSZ + 1;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case ORAVARCHARCHAROID:
+				var_sz[i] = (bindvar[i]->typmod - VARHDRSZ) * pg_encoding_max_length(pset.encoding) + 1;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			case ORAVARCHARBYTEOID:
+				var_sz[i] = bindvar[i]->typmod - VARHDRSZ + 1;
+				var[i] = (char *) pg_malloc0(var_sz[i]);
+				break;
+			/* TODO */
+			//case REFCURSOR:
+			//case BLOB:
+			//case CLOB:
+			//case NCLOB:
+			//case BFILE:
+			default:
+				{
+					pg_log_error("Unsupported bind variable types: %d", bindvar[i]->typoid);
+					IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+					IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+					Ivyfinish2(conn);
+					return NULL;
+				}
+		}
+
+		if (bindvar[i]->value)
+			strcpy(var[i], bindvar[i]->value);
+
+		bindinfo[i] = NULL;
+		indp[i] = 0;
+	}
+
+	/* BIND */
+	for (i = 0; i < hv->length; i++)
+	{
+		IvyBindByPos(stmthandle,
+					&bindinfo[i],
+					errhp,
+					hv->hostvars[i].position,
+					var[i],
+					var_sz[i],
+					bindvar[i]->typoid | 0x60000000  /* inout */,
+					&indp[i],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+	}
+
+	/* EXECUTE */
+	res = IvyStmtExecute2(conn, stmthandle, errhp, hv);
+
+	if (IvyresultStatus(res) != PGRES_TUPLES_OK &&
+		IvyresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		pg_log_error("%s", errhp->error_msg);
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		Ivyclear(res);
+		Ivyfinish2(conn);
+		goto pbe_failure;
+	}
+
+	IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+	IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+
+	/* update host variable */
+	for (i = 0; i < hv->length; i++)
+	{
+		char	*p = hv->hostvars[i].name;
+
+		if (var[i])
+			AssignBindVariable(pset.vars, ++p, var[i]);
+	}
+
+pbe_failure:
+	for (i = 0; i < hv->length; i++)
+	{
+		if (var[i])
+			pg_free(var[i]);
+	}
+	pg_free(var);
+	pg_free(bindinfo);
+	pg_free(indp);
+	pg_free(var_sz);
+
+	return res;
+}
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 8ec9d9b846e..6711aeafddf 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/common.h
@@ -16,6 +16,7 @@
 #include "fe_utils/psqlscan.h"
 #include "oracle_fe_utils/ora_psqlscan.h" 
 #include "libpq-fe.h"
+#include "libpq-ivy.h"
 
 extern bool openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
 extern bool setQFout(const char *fname);
@@ -44,10 +45,14 @@ extern bool SendQuery(const char *query);
 extern bool is_superuser(void);
 extern bool standard_strings(void);
 extern const char *session_username(void);
+extern char *get_conninfo_value(const char *keyword);
 
 extern void expand_tilde(char **filename);
 extern void clean_extended_state(void);
 
 extern bool recognized_connection_string(const char *connstr);
+extern char *psqlplus_skip_space(char *query);
+extern HostVariable *get_hostvariables(const char *sql, bool *error);
+extern bool SendQuery_PBE(const char *query, HostVariable *hv);
 
 #endif							/* COMMON_H */
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 6d5024f4b70..5edb8cb5427 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -7,7 +7,7 @@
  * information for an old server, but not to fail outright.  (But failing
  * against a pre-9.2 server is allowed.)
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/describe.c
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 7790440a572..6ba42d4b4c2 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -171,6 +171,10 @@ slashUsage(unsigned short int pager)
 	HELP0("  \\gset [PREFIX]         execute query and store result in psql variables\n");
 	HELP0("  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n");
 	HELP0("  \\q                     quit psql\n");
+	HELP0("  \\restrict RESTRICT_KEY\n"
+		  "                         enter restricted mode with provided key\n");
+	HELP0("  \\unrestrict RESTRICT_KEY\n"
+		  "                         exit restricted mode if key matches\n");
 	HELP0("  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
 		  "                         execute query every SEC seconds, up to N times,\n"
 		  "                         stop if less than MIN rows are returned\n");
@@ -244,6 +248,7 @@ slashUsage(unsigned short int pager)
 	HELP0("  \\dg[Sx+] [PATTERN]     list roles\n");
 	HELP0("  \\di[Sx+] [PATTERN]     list indexes\n");
 	HELP0("  \\dl[x+]                list large objects, same as \\lo_list\n");
+	HELP0("  \\dk[S+] [PATTERN]      list packages\n");
 	HELP0("  \\dL[Sx+] [PATTERN]     list procedural languages\n");
 	HELP0("  \\dm[Sx+] [PATTERN]     list materialized views\n");
 	HELP0("  \\dn[Sx+] [PATTERN]     list schemas\n");
@@ -477,6 +482,9 @@ helpVariables(unsigned short int pager)
 		  "    border style (number)\n");
 	HELP0("  columns\n"
 		  "    target width for the wrapped format\n");
+	HELPN("  csv_fieldsep\n"
+		  "    field separator for CSV output format (default \"%c\")\n",
+		  DEFAULT_CSV_FIELD_SEP);
 	HELP0("  expanded (or x)\n"
 		  "    expanded output [on, off, auto]\n");
 	HELPN("  fieldsep\n"
@@ -749,7 +757,7 @@ void
 print_copyright(void)
 {
 	puts("PostgreSQL Database Management System\n"
-		 "(formerly known as Postgres, then as Postgres95)\n\n"
+		 "(also known as Postgres, formerly known as Postgres95)\n\n"
 		 "Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group\n\n"
 		 "Portions Copyright (c) 1994, The Regents of the University of California\n\n"
 		 "Permission to use, copy, modify, and distribute this software and its\n"
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index edd7dc445d0..d77cfe2d230 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/mainloop.c
@@ -98,6 +98,8 @@ MainLoop(FILE *source)
 	/* main loop to get queries and execute them */
 	while (successResult == EXIT_SUCCESS)
 	{
+		bool	exec_dostmt = false;
+
 		/*
 		 * Clean up after a previous Control-C
 		 */
@@ -444,7 +446,11 @@ MainLoop(FILE *source)
 		 * Since we haven't implemented this continuation character yet, we
 		 * temporarily assume that these client commands are all single-line.
 		 */
-		if (db_mode == DB_ORACLE && pset.stmt_lineno == 1)
+		if (db_mode == DB_ORACLE &&
+			pset.stmt_lineno == 1 &&
+			prompt_status != (promptStatus_t) ORAPROMPT_DOLLARQUOTE &&
+			prompt_status != (promptStatus_t) ORAPROMPT_SINGLEQUOTE &&
+			prompt_status != (promptStatus_t) ORAPROMPT_DOUBLEQUOTE)
 		{
 		    PsqlScanState	pstate;
 		    yyscan_t		yyscanner;
@@ -539,12 +545,67 @@ MainLoop(FILE *source)
 		                    PrintBindVariables(pset.vars, pb->print_items);
 		                }
 		                break;
+					case PSQLPLUS_CMD_EXECUTE:
+						{
+							psqlplus_cmd_execute *exec = (psqlplus_cmd_execute *) pstate->psqlpluscmd;
+							char *tmpline = exec->plisqlstmts;
+							PQExpBuffer newline_buf;
+
+							if (pset.execute_run_prepare)
+								goto non_psqlplus_cmd;
+
+							tmpline = psqlplus_skip_space(tmpline);
+							if (*tmpline == '\0' ||
+								(tmpline[0] == '\n' && tmpline[1] == '\0'))
+							{
+								pg_log_error("Usage: EXEC[UTE] statement");
+								goto psqlplus_next;
+							}
+
+							newline_buf = createPQExpBuffer();
+							if (PQExpBufferBroken(newline_buf))
+							{
+								pg_log_error("out of memory");
+								exit(EXIT_FAILURE);
+							}
+
+							appendPQExpBufferStr(newline_buf, "BEGIN ");
+							appendPQExpBuffer(newline_buf, "%s", tmpline);
+							if (newline_buf->data[newline_buf->len - 1] != ';')
+								appendPQExpBufferChar(newline_buf, ';');
+							appendPQExpBufferStr(newline_buf, " END;");
+
+							/* Send anonymous directly without '/' */
+							exec_dostmt = true;
+
+							/* save client command in history */
+							if (pset.cur_cmd_interactive)
+							{
+								pg_append_history(psqlplus_line, history_buf);
+								pg_send_history(history_buf);
+							}
+
+							/* rescan */
+							ora_psql_scan_finish(ora_scan_state);
+							free(line);
+							line = pg_strdup(newline_buf->data);
+							destroyPQExpBuffer(newline_buf);
+							/* reset parsing state since we are rewritten whole line */
+							ora_psql_scan_reset(ora_scan_state);
+							ora_psql_scan_setup(ora_scan_state, line, strlen(line),
+											pset.encoding, standard_strings());
+
+							/* the query after rewriting is no longer a psqlplus command */
+							goto non_psqlplus_cmd;
+						}
+						break;
 
 		            default:
 		                pg_log_error("Invalid PSQL*PLUS client command.");
 		                break;
 		        }
 
+psqlplus_next:
 		        /* If in interactive mode, add command to history */
 		        if (pset.cur_cmd_interactive)
 		        {
@@ -574,7 +635,9 @@ MainLoop(FILE *source)
 		        token = strtokx(pstate->scanline, whitespace, NULL, NULL,
 		                        0, false, false, pset.encoding);
 
-		        if (token && pg_strcasecmp(token, "variable") == 0)
+			if (token && 
+				(pg_strcasecmp(token, "variable") == 0 ||
+				 pg_strcasecmp(token, "var") == 0))
 		        {
 		            token = strtokx(NULL, whitespace, NULL, NULL,
 		                            0, false, false, pset.encoding);
@@ -656,6 +719,7 @@ MainLoop(FILE *source)
 		                {
 		                    pg_free(pl->items);
 		                    pg_free(pl);
+				    break;
 		                }
 		            }
 		        }
@@ -679,6 +743,7 @@ MainLoop(FILE *source)
 		        continue;
 		    }
 
+non_psqlplus_cmd:
 		    /* Not a compatible Oracle client command, release resources */
 		    psqlplus_scanner_finish(yyscanner);
 		    ora_psql_scan_destroy(pstate);
@@ -897,11 +962,19 @@ MainLoop(FILE *source)
 
 				/*
 				 * Send command if semicolon found, or if end of line and we're in
-				 * single-line mode.
+				 * single-line mode or in EXECUTE cmd.
 				 */
 				if (ora_scan_result == ORAPSCAN_SEMICOLON ||
-					(ora_scan_result == ORAPSCAN_EOL && pset.singleline))
+					(ora_scan_result == ORAPSCAN_EOL && pset.singleline) ||
+					(exec_dostmt && ora_scan_result == ORAPSCAN_EOL))
 				{
+					if (exec_dostmt)
+					{
+						line_saved_in_history = true;
+						exec_dostmt = false;
+						ora_psql_scan_reset(ora_scan_state);
+					}
+
 					/*
 					 * Save line in history.  We use history_buf to accumulate
 					 * multi-line queries into a single history entry.  Note that
@@ -918,7 +991,72 @@ MainLoop(FILE *source)
 					/* execute query unless we're in an inactive \if branch */
 					if (conditional_active(cond_stack))
 					{
-						success = SendQuery(query_buf->data);
+						HostVariable *hv = NULL;
+						PsqlScanState	pstate;
+						yyscan_t		yyscanner;
+						psql_YYSTYPE	lval;
+						int				token;
+						bool			hasparam = false;
+						bool			haserror = false;
+						char			*sql = pg_strdup(query_buf->data);
+
+						pstate = ora_psql_scan_create(&psqlplus_callbacks);
+						ora_psql_scan_setup(pstate, sql,
+											strlen(sql),
+											pset.encoding,
+											standard_strings());
+
+						yyscanner = psqlplus_scanner_init(pstate);
+						token = orapsql_yylex(&lval, yyscanner);
+						while(token)
+						{
+							if (token == BINDVARREF)
+							{
+								hasparam = true;
+								break;
+							}
+							token = orapsql_yylex(&lval, yyscanner);
+						}
+
+						psqlplus_scanner_finish(yyscanner);
+						ora_psql_scan_destroy(pstate);
+						pg_free(sql);
+
+						if (hasparam)
+							hv = get_hostvariables(query_buf->data, &haserror);
+
+						if (hv)
+						{
+							int	i;
+
+							success = SendQuery_PBE(query_buf->data, hv);
+
+							/* clean */
+							for (i = 0; i < hv->length; i++)
+							{
+								if (hv->hostvars && hv->hostvars[i].name)
+									pg_free(hv->hostvars[i].name);
+							}
+
+							if (hv->convertcall)
+								pg_free(hv->convertcall);
+
+							if (hv->hostvars)
+								pg_free(hv->hostvars);
+							pg_free(hv);
+						}
+						else
+						{
+							/*
+							 * If get_hostvariables() fails due to a syntax error,
+							 * SendQuery() will also fail, and there is no need to
+							 * do transmission and parsing again.
+							 */
+							if (haserror)
+								success = false;
+							else
+								success = SendQuery(query_buf->data);
+						}
 						slashCmdStatus = success ? PSQL_CMD_SEND : PSQL_CMD_ERROR;
 						pset.stmt_lineno = 1;
 
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index 870a1a7342e..0fb3eea31cd 100644
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/mainloop.h
diff --git a/src/bin/psql/meson.build b/src/bin/psql/meson.build
index beadef4f647..e9c62afa54b 100644
--- a/src/bin/psql/meson.build
+++ b/src/bin/psql/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 psql_sources = files(
diff --git a/src/bin/psql/ora_prompt.c b/src/bin/psql/ora_prompt.c
index 861ef4608c5..ccf8e497190 100644
--- a/src/bin/psql/ora_prompt.c
+++ b/src/bin/psql/ora_prompt.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 2000-2024, PostgreSQL Global Development Group
  *
  * src/bin/psql/prompt.c
@@ -179,6 +179,21 @@ ora_get_prompt(Ora_promptStatus_t status, ConditionalStack cstack)
 					}
 					break;
 
+					/* pipeline status */
+				case 'P':
+					if (pset.db)
+					{
+						PGpipelineStatus status = PQpipelineStatus(pset.db);
+
+						if (status == PQ_PIPELINE_ON)
+							strlcpy(buf, "on", sizeof(buf));
+						else if (status == PQ_PIPELINE_ABORTED)
+							strlcpy(buf, "abort", sizeof(buf));
+						else
+							strlcpy(buf, "off", sizeof(buf));
+					}
+					break;
+
 				case '0':
 				case '1':
 				case '2':
diff --git a/src/bin/psql/ora_prompt.h b/src/bin/psql/ora_prompt.h
index d1c1cb8942c..2615611b7d8 100644
--- a/src/bin/psql/ora_prompt.h
+++ b/src/bin/psql/ora_prompt.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 2000-2024, PostgreSQL Global Development Group
  *
  * src/bin/psql/prompt.h
diff --git a/src/bin/psql/ora_psqlscanslash.h b/src/bin/psql/ora_psqlscanslash.h
index 9372b8f1c9d..4d1e00fa49e 100644
--- a/src/bin/psql/ora_psqlscanslash.h
+++ b/src/bin/psql/ora_psqlscanslash.h
@@ -5,7 +5,7 @@
  *
  * Copyright:
  * Copyright (c) 2000-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/psql/ora_psqlscanslash.h
  */
diff --git a/src/bin/psql/ora_psqlscanslash.l b/src/bin/psql/ora_psqlscanslash.l
index 14b8d89aa36..415b9b30065 100644
--- a/src/bin/psql/ora_psqlscanslash.l
+++ b/src/bin/psql/ora_psqlscanslash.l
@@ -11,7 +11,7 @@
  * Authored by lanke@highgo.com, 20220705.
  *
  * Copyright:
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index 78747ffc1a0..a48d230996e 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -1,5 +1,5 @@
 # German message translation file for psql
-# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2025.
+# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2026.
 #
 # Use these quotes: »%s«
 #
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-27 00:48+0000\n"
-"PO-Revision-Date: 2025-04-27 16:04+0200\n"
+"POT-Creation-Date: 2026-02-04 18:48+0000\n"
+"PO-Revision-Date: 2026-02-05 14:19+0100\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -78,7 +78,7 @@ msgid "%s() failed: %m"
 msgstr "%s() fehlgeschlagen: %m"
 
 #: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
-#: command.c:1636 command.c:3985 command.c:4034 command.c:4159 input.c:225
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -100,7 +100,7 @@ msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 msgid "could not look up effective user ID %ld: %s"
 msgstr "konnte effektive Benutzer-ID %ld nicht nachschlagen: %s"
 
-#: ../../common/username.c:45 command.c:700
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "Benutzer existiert nicht"
 
@@ -194,171 +194,174 @@ msgstr "Argument des Shell-Befehls enthält Newline oder Carriage Return: »%s«
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "Datenbankname enthält Newline oder Carriage Return: »%s«\n"
 
-#: command.c:245
+#: command.c:254
+#, c-format
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "Backslash-Befehle sind eingeschränkt; nur \\unrestrict ist erlaubt"
+
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "ungültige Anweisung \\%s"
 
-#: command.c:247
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Versuchen Sie \\? für Hilfe."
 
-#: command.c:265
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: überflüssiges Argument »%s« ignoriert"
 
-#: command.c:317
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "Befehl \\%s ignoriert; verwenden Sie \\endif oder Strg-C um den aktuellen \\if-Block zu beenden"
 
-#: command.c:552 command.c:747 command.c:1882 command.c:2050 command.c:2363
-#: command.c:2377 command.c:2409 command.c:2498 command.c:2611 command.c:2889
-#: command.c:3151 command.c:3191
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
 #, c-format
 msgid "\\%s: missing required argument"
 msgstr "\\%s: notwendiges Argument fehlt"
 
-#: command.c:698
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "konnte Home-Verzeichnis für Benutzer-ID %ld nicht ermitteln: %s"
 
-#: command.c:717
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: konnte nicht in das Verzeichnis »%s« wechseln: %m"
 
-#: command.c:789
+#: command.c:811
 #, 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:815
+#: command.c:839
 msgid "Connection Information"
 msgstr "Verbindungsinformationen"
 
-#: command.c:816 describe.c:4721
+#: command.c:840 describe.c:4722
 msgid "Parameter"
 msgstr "Parameter"
 
-#: command.c:817 describe.c:4722
+#: command.c:841 describe.c:4723
 msgid "Value"
 msgstr "Wert"
 
-#: command.c:820 describe.c:3873
+#: command.c:844 describe.c:3874
 msgid "Database"
 msgstr "Datenbank"
 
-#: command.c:824
+#: command.c:848
 msgid "Client User"
 msgstr "Client-Benutzer"
 
-#: command.c:833 command.c:848
+#: command.c:857 command.c:872
 msgid "Host Address"
 msgstr "Hostadresse"
 
-#: command.c:838
+#: command.c:862
 msgid "Socket Directory"
 msgstr "Socket-Verzeichnis"
 
-#: command.c:844
+#: command.c:868
 msgid "Host"
 msgstr "Host"
 
-#: command.c:854
+#: command.c:878
 msgid "Server Port"
 msgstr "Serverport"
 
-#: command.c:858 describe.c:246 describe.c:3614 describe.c:3954
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
 msgid "Options"
 msgstr "Optionen"
 
-#: command.c:862
+#: command.c:886
 msgid "Protocol Version"
 msgstr "Protokollversion"
 
-#: command.c:866
+#: command.c:890
 msgid "Password Used"
 msgstr "Passwort verwendet"
 
-#: command.c:867 command.c:871 command.c:879 command.c:912
+#: command.c:891 command.c:895 command.c:903 command.c:936
 msgid "false"
 msgstr "falsch"
 
-#: command.c:867 command.c:871 command.c:879 command.c:912
+#: command.c:891 command.c:895 command.c:903 command.c:936
 msgid "true"
 msgstr "wahr"
 
-#: command.c:870
-#, fuzzy
-#| msgid "GSSAPI authentication not supported"
+#: command.c:894
 msgid "GSSAPI Authenticated"
-msgstr "Authentifizierung mit GSSAPI nicht unterstützt"
+msgstr "GSSAPI-authentifiziert"
 
-#: command.c:874
+#: command.c:898
 msgid "Backend PID"
 msgstr "Backend-PID"
 
-#: command.c:878
-msgid "TLS Connection"
-msgstr "TLS-Verbindung"
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL-Verbindung"
 
-#: command.c:898
-msgid "TLS Library"
-msgstr "TLS-Bibliothek"
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSL-Bibliothek"
 
-#: command.c:899 command.c:902 command.c:905 command.c:908 command.c:920
-#: command.c:924 command.c:4423 command.c:4424
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
 msgid "unknown"
 msgstr "unbekannt"
 
-#: command.c:901
-msgid "TLS Protocol"
-msgstr "TLS-Protokoll"
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSL-Protokoll"
 
-#: command.c:904
-msgid "TLS Key Bits"
-msgstr "TLS-Schlüssel-Bits"
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "SSL-Schlüssel-Bits"
 
-#: command.c:907
-msgid "TLS Cipher"
-msgstr "TLS-Verschlüsselungsmethode"
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL-Verschlüsselungsmethode"
 
-#: command.c:910
-msgid "TLS Compression"
-msgstr "TLS-Komprimierung"
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL-Komprimierung"
 
-#: command.c:914
+#: command.c:938
 msgid "ALPN"
 msgstr "ALPN"
 
-#: command.c:915 command.c:4426
+#: command.c:939 command.c:4519
 msgid "none"
 msgstr "keine"
 
-#: command.c:1332 command.c:1433 command.c:3184
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "kein Anfragepuffer"
 
-#: command.c:1365 command.c:6307
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "ungültige Zeilennummer: %s"
 
-#: command.c:1511
+#: command.c:1535
 msgid "No changes"
 msgstr "keine Änderungen"
 
-#: command.c:1596
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: ungültiger Kodierungsname oder Umwandlungsprozedur nicht gefunden"
 
-#: command.c:1632 command.c:2572 command.c:3981 command.c:4179 command.c:6413
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
 #: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
 #: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
 #: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
@@ -367,238 +370,233 @@ msgstr "%s: ungültiger Kodierungsname oder Umwandlungsprozedur nicht gefunden"
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1639
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "Es gibt keinen vorangegangenen Fehler."
 
-#: command.c:1742
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
 #, c-format
 msgid "\\%s not allowed in pipeline mode"
 msgstr "\\%s im Pipeline-Modus nicht erlaubt"
 
-#: command.c:1798
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: rechte Klammer fehlt"
 
-#: command.c:1924
+#: command.c:1948
 #, c-format
 msgid "\\getresults: invalid number of requested results"
-msgstr ""
-
-#: command.c:1949
-#, c-format
-msgid "\\gexec not allowed in pipeline mode"
-msgstr "\\gexec im Pipeline-Modus nicht erlaubt"
+msgstr "\\getresults: ungültige Anzahl angeforderter Ergebnisse"
 
-#: command.c:1975
-#, c-format
-msgid "\\gset not allowed in pipeline mode"
-msgstr "\\gset im Pipeline-Modus nicht erlaubt"
-
-#: command.c:2181
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: kann nicht nach \\else kommen"
 
-#: command.c:2186
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: kein passendes \\if"
 
-#: command.c:2250
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: kann nicht nach \\else kommen"
 
-#: command.c:2255
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: kein passendes \\if"
 
-#: command.c:2295
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: kein passendes \\if"
 
-#: command.c:2473
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "Anfragepuffer ist leer."
 
-#: command.c:2550
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Neues Passwort für Benutzer »%s« eingeben: "
 
-#: command.c:2554
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Geben Sie es noch einmal ein: "
 
-#: command.c:2563
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Passwörter stimmten nicht überein."
 
-#: command.c:2646
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: konnte Wert für Variable nicht lesen"
 
-#: command.c:2748
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "Anfragepuffer wurde gelöscht."
 
-#: command.c:2770
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Befehlsgeschichte in Datei »%s« geschrieben.\n"
 
-#: command.c:2800
+#: command.c:2853
 #, c-format
 msgid "\\sendpipeline must be used after \\bind or \\bind_named"
 msgstr "\\sendpipeline muss nach \\bind oder \\bind_named verwendet werden"
 
-#: command.c:2807
+#: command.c:2860
 #, c-format
 msgid "\\sendpipeline not allowed outside of pipeline mode"
 msgstr "\\sendpipeline ist außerhalb des Pipeline-Modus nicht erlaubt"
 
-#: command.c:2894
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: Name der Umgebungsvariable darf kein »=« enthalten"
 
-#: command.c:2942
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "Funktionsname wird benötigt"
 
-#: command.c:2944
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "Sichtname wird benötigt"
 
-#: command.c:3123
+#: command.c:3176
 msgid "Timing is on."
 msgstr "Zeitmessung ist an."
 
-#: command.c:3125
+#: command.c:3178
 msgid "Timing is off."
 msgstr "Zeitmessung ist aus."
 
-#: command.c:3211 command.c:3249 command.c:4694 command.c:4697 command.c:4700
-#: command.c:4706 command.c:4708 command.c:4734 command.c:4744 command.c:4756
-#: command.c:4770 command.c:4797 command.c:4855 common.c:77 copy.c:329
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: aktuell nicht im Restricted-Modus"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: falscher Schlüssel"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
 #: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:3238 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:3287
-#, c-format
-msgid "\\watch not allowed in pipeline mode"
-msgstr "\\watch im Pipeline-Modus nicht erlaubt"
-
-#: command.c:3319 command.c:3385
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: Intervallwert mehrmals angegeben"
 
-#: command.c:3329 command.c:3395
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: falscher Intervallwert »%s«"
 
-#: command.c:3339
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: Wiederholungszahl mehrmals angegeben"
 
-#: command.c:3349
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: falsche Wiederholungszahl »%s«"
 
-#: command.c:3359
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: Mindestzeilenzahl mehrmals angegeben"
 
-#: command.c:3369
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: falsche Mindestzeilenzahl »%s«"
 
-#: command.c:3376
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: unbekannter Parameter »%s«"
 
-#: command.c:3782 startup.c:248 startup.c:298
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Passwort: "
 
-#: command.c:3787 startup.c:295
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Passwort für Benutzer %s: "
 
-#: command.c:3843
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "Geben Sie Benutzer, Host oder Port nicht separat an, wenn eine Verbindungsangabe verwendet wird"
 
-#: command.c:3878
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "Es gibt keine Verbindung, von der die Parameter verwendet werden können"
 
-#: command.c:4185
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Vorherige Verbindung wurde behalten"
 
-#: command.c:4191
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:4247
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« auf Adresse »%s« auf Port »%s«.\n"
 
-#: command.c:4250
+#: command.c:4343
 #, 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"
 
-#: command.c:4256
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« auf Host »%s« (Adresse »%s«) auf Port »%s«.\n"
 
-#: command.c:4259
+#: command.c:4352
 #, 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"
 
-#: command.c:4264
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s«.\n"
 
-#: command.c:4370
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, Server %s)\n"
 
-#: command.c:4383
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -607,25 +605,25 @@ msgstr ""
 "WARNUNG: %s-Hauptversion %s, Server-Hauptversion %s.\n"
 "         Einige Features von psql werden eventuell nicht funktionieren.\n"
 
-#: command.c:4422
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL-Verbindung (Protokoll: %s, Verschlüsselungsmethode: %s, Komprimierung: %s, ALPN: %s)\n"
 
-#: command.c:4425 help.c:39
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "aus"
 
-#: command.c:4425 help.c:39
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "an"
 
-#: command.c:4440
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "GSSAPI-verschlüsselte Verbindung\n"
 
-#: command.c:4460
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -637,284 +635,284 @@ msgstr ""
 "         richtig. Einzelheiten finden Sie auf der psql-Handbuchseite unter\n"
 "         »Notes for Windows users«.\n"
 
-#: command.c:4569
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "Umgebungsvariable PSQL_EDITOR_LINENUMBER_ARG muss gesetzt werden, um eine Zeilennummer angeben zu können"
 
-#: command.c:4599
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "konnte Editor »%s« nicht starten"
 
-#: command.c:4601
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "konnte /bin/sh nicht starten"
 
-#: command.c:4651
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "konnte temporäres Verzeichnis nicht finden: %s"
 
-#: command.c:4678
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "konnte temporäre Datei »%s« nicht öffnen: %m"
 
-#: command.c:5014
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: Abkürzung »%s« ist nicht eindeutig, passt auf »%s« und »%s«"
 
-#: command.c:5034
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: zulässige Formate sind aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:5053
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: zulässige Linienstile sind ascii, old-ascii, unicode"
 
-#: command.c:5068
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: zulässige Unicode-Rahmnenlinienstile sind single, double"
 
-#: command.c:5083
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: zulässige Unicode-Spaltenlinienstile sind single, double"
 
-#: command.c:5098
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: zulässige Unicode-Kopflinienstile sind single, double"
 
-#: command.c:5150
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: zulässige Werte für xheader_width sind »%s« (Standard), »%s«, »%s« oder eine Zahl, die die genaue Breite angibt"
 
-#: command.c:5167
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep muss ein einzelnes Ein-Byte-Zeichen sein"
 
-#: command.c:5172
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldsep kann nicht doppeltes Anführungszeichen, Newline oder Carriage Return sein"
 
-#: command.c:5310 command.c:5511
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: unbekannte Option: %s"
 
-#: command.c:5330
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Rahmenstil ist %d.\n"
 
-#: command.c:5336
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Zielbreite ist nicht gesetzt.\n"
 
-#: command.c:5338
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Zielbreite ist %d.\n"
 
-#: command.c:5345
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Erweiterte Anzeige ist an.\n"
 
-#: command.c:5347
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Erweiterte Anzeige wird automatisch verwendet.\n"
 
-#: command.c:5349
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Erweiterte Anzeige ist aus.\n"
 
-#: command.c:5356 command.c:5358 command.c:5360
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "Erweiterte Kopfzeilenbreite ist »%s«.\n"
 
-#: command.c:5362
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "Erweiterte Kopfzeilenbreite ist %d.\n"
 
-#: command.c:5368
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "Feldtrennzeichen für CSV ist »%s«.\n"
 
-#: command.c:5376 command.c:5384
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Feldtrennzeichen ist ein Null-Byte.\n"
 
-#: command.c:5378
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Feldtrennzeichen ist »%s«.\n"
 
-#: command.c:5391
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Standardfußzeile ist an.\n"
 
-#: command.c:5393
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Standardfußzeile ist aus.\n"
 
-#: command.c:5399
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Ausgabeformat ist »%s«.\n"
 
-#: command.c:5405
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Linienstil ist %s.\n"
 
-#: command.c:5412
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null-Anzeige ist »%s«.\n"
 
-#: command.c:5420
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Lokalisiertes Format für numerische Daten ist an.\n"
 
-#: command.c:5422
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Lokalisiertes Format für numerische Daten ist aus.\n"
 
-#: command.c:5429
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Pager wird für lange Ausgaben verwendet.\n"
 
-#: command.c:5431
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Pager wird immer verwendet.\n"
 
-#: command.c:5433
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Pager-Verwendung ist aus.\n"
 
-#: command.c:5439
+#: command.c:5537
 #, 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:5449 command.c:5459
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Satztrennzeichen ist ein Null-Byte.\n"
 
-#: command.c:5451
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Satztrennzeichen ist <newline>.\n"
 
-#: command.c:5453
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Satztrennzeichen ist »%s«.\n"
 
-#: command.c:5466
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Tabellenattribute sind »%s«.\n"
 
-#: command.c:5469
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tabellenattribute sind nicht gesetzt.\n"
 
-#: command.c:5476
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titel ist »%s«.\n"
 
-#: command.c:5478
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Titel ist nicht gesetzt.\n"
 
-#: command.c:5485
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Nur Datenzeilen ist an.\n"
 
-#: command.c:5487
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Nur Datenzeilen ist aus.\n"
 
-#: command.c:5493
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Unicode-Rahmenlinienstil ist »%s«.\n"
 
-#: command.c:5499
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Unicode-Spaltenlinienstil ist »%s«.\n"
 
-#: command.c:5505
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Unicode-Kopflinienstil ist »%s«.\n"
 
-#: command.c:5754
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: fehlgeschlagen"
 
-#: command.c:5792
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch kann nicht mit einer leeren Anfrage verwendet werden"
 
-#: command.c:5824
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "konnte Timer nicht setzen: %m"
 
-#: command.c:5893
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (alle %gs)\n"
 
-#: command.c:5896
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (alle %gs)\n"
 
-#: command.c:5960
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "konnte nicht auf Signale warten: %m"
 
-#: command.c:6016 command.c:6023 common.c:667 common.c:674 common.c:1159
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -927,12 +925,12 @@ msgstr ""
 "/************************/\n"
 "\n"
 
-#: command.c:6202
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "»%s.%s« ist keine Sicht"
 
-#: command.c:6218
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "konnte reloptions-Array nicht interpretieren"
@@ -992,7 +990,7 @@ msgstr "Zeit: %.3f ms (%02d:%02d:%06.3f)\n"
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Zeit: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:661 common.c:718 common.c:1130 describe.c:6370
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Sie sind gegenwärtig nicht mit einer Datenbank verbunden."
@@ -1048,14 +1046,14 @@ msgstr "ANWEISUNG:  %s"
 msgid "unexpected transaction status (%d)"
 msgstr "unerwarteter Transaktionsstatus (%d)"
 
-#: common.c:1398 describe.c:2063
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Spalte"
 
-#: common.c:1399 describe.c:176 describe.c:362 describe.c:380 describe.c:1081
-#: describe.c:1243 describe.c:1773 describe.c:1797 describe.c:2064
-#: describe.c:4057 describe.c:4321 describe.c:4568 describe.c:4728
-#: describe.c:6004
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Typ"
 
@@ -1067,7 +1065,7 @@ msgstr "Der Befehl hat kein Ergebnis oder das Ergebnis hat keine Spalten.\n"
 #: common.c:1670
 #, c-format
 msgid "No pending results to get"
-msgstr ""
+msgstr "Keine unerledigten Ergebnisse abzuholen"
 
 #: common.c:1748
 #, c-format
@@ -1077,7 +1075,12 @@ msgstr "Empfangen der Ergebnisse im Chunked-Modus fehlgeschlagen"
 #: common.c:1797
 #, c-format
 msgid "Pipeline aborted, command did not run"
-msgstr ""
+msgstr "Pipeline abgebrochen, Befehl wurde nicht ausgeführt"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY in einer Pipeline wird nicht unterstützt, Verbindung wird abgebrochen"
 
 #: copy.c:98
 #, c-format
@@ -1184,40 +1187,40 @@ msgstr "\\crosstabview: zweideutiger Spaltenname: »%s«"
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: Spaltenname nicht gefunden: »%s«"
 
-#: describe.c:94 describe.c:342 describe.c:649 describe.c:826 describe.c:1073
-#: describe.c:1230 describe.c:1306 describe.c:4046 describe.c:4308
-#: describe.c:4566 describe.c:4647 describe.c:4879 describe.c:5091
-#: describe.c:5340 describe.c:5581 describe.c:5650 describe.c:5661
-#: describe.c:5717 describe.c:6116 describe.c:6196
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:95 describe.c:173 describe.c:234 describe.c:343 describe.c:650
-#: describe.c:827 describe.c:958 describe.c:1074 describe.c:1307
-#: describe.c:4047 describe.c:4309 describe.c:4483 describe.c:4567
-#: describe.c:4648 describe.c:4809 describe.c:4880 describe.c:5092
-#: describe.c:5213 describe.c:5341 describe.c:5582 describe.c:5651
-#: describe.c:5662 describe.c:5718 describe.c:5915 describe.c:5985
-#: describe.c:6193 describe.c:6421 describe.c:6767
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Name"
 
-#: describe.c:96 describe.c:355 describe.c:373
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Ergebnisdatentyp"
 
-#: describe.c:97 describe.c:356 describe.c:374
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Argumentdatentypen"
 
-#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:432
-#: describe.c:681 describe.c:846 describe.c:1010 describe.c:1309
-#: describe.c:2084 describe.c:3773 describe.c:4105 describe.c:4362
-#: describe.c:4507 describe.c:4580 describe.c:4657 describe.c:4822
-#: describe.c:5004 describe.c:5150 describe.c:5222 describe.c:5342
-#: describe.c:5492 describe.c:5533 describe.c:5598 describe.c:5654
-#: describe.c:5663 describe.c:5719 describe.c:5933 describe.c:6007
-#: describe.c:6130 describe.c:6197 describe.c:7303
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1234,11 +1237,11 @@ msgstr "Der Server (Version %s) unterstützt keine Zugriffsmethoden."
 msgid "Index"
 msgstr "Index"
 
-#: describe.c:175 describe.c:4065 describe.c:4334 describe.c:6117
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Tabelle"
 
-#: describe.c:183 describe.c:5917
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Handler"
 
@@ -1246,11 +1249,11 @@ msgstr "Handler"
 msgid "List of access methods"
 msgstr "Liste der Zugriffsmethoden"
 
-#: describe.c:235 describe.c:415 describe.c:674 describe.c:959 describe.c:1229
-#: describe.c:4058 describe.c:4310 describe.c:4484 describe.c:4811
-#: describe.c:5214 describe.c:5916 describe.c:5986 describe.c:6422
-#: describe.c:6643 describe.c:6768 describe.c:6938 describe.c:7023
-#: describe.c:7291
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Eigentümer"
 
@@ -1258,7 +1261,7 @@ msgstr "Eigentümer"
 msgid "Location"
 msgstr "Pfad"
 
-#: describe.c:247 describe.c:672 describe.c:1008 describe.c:4104
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Größe"
 
@@ -1266,1174 +1269,1170 @@ msgstr "Größe"
 msgid "List of tablespaces"
 msgstr "Liste der Tablespaces"
 
-#: describe.c:315
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwSx+] as options"
-msgstr "\\df akzeptiert nur [anptwSx+] als Optionen"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df akzeptiert nur [%s] als Optionen"
 
-#: describe.c:323
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df akzeptiert die Option »%c« nicht mit Serverversion %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:358 describe.c:376
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "Agg"
 
-#: describe.c:359 describe.c:377
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "Fenster"
 
-#: describe.c:360
+#: describe.c:361
 msgid "proc"
 msgstr "Proz"
 
-#: describe.c:361 describe.c:379
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "Funk"
 
-#: describe.c:378 describe.c:1439
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "Trigger"
 
-#: describe.c:393
+#: describe.c:394
 msgid "immutable"
 msgstr "unveränderlich"
 
-#: describe.c:394
+#: describe.c:395
 msgid "stable"
 msgstr "stabil"
 
-#: describe.c:395
+#: describe.c:396
 msgid "volatile"
 msgstr "volatil"
 
-#: describe.c:396
+#: describe.c:397
 msgid "Volatility"
 msgstr "Volatilität"
 
-#: describe.c:407
+#: describe.c:408
 msgid "restricted"
 msgstr "beschränkt"
 
-#: describe.c:408
+#: describe.c:409
 msgid "safe"
 msgstr "sicher"
 
-#: describe.c:409
+#: describe.c:410
 msgid "unsafe"
 msgstr "unsicher"
 
-#: describe.c:410
+#: describe.c:411
 msgid "Parallel"
 msgstr "Parallel"
 
-#: describe.c:416
+#: describe.c:417
 msgid "definer"
 msgstr "definer"
 
-#: describe.c:417
+#: describe.c:418
 msgid "invoker"
 msgstr "invoker"
 
-#: describe.c:418
+#: describe.c:419
 msgid "Security"
 msgstr "Sicherheit"
 
-#: describe.c:419 describe.c:837 describe.c:1778 describe.c:1802
-#: describe.c:1931 describe.c:4651 describe.c:4992 describe.c:5001
-#: describe.c:5139 describe.c:5144 describe.c:6926 describe.c:7125
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
 msgid "yes"
 msgstr "ja"
 
-#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
-#: describe.c:1932 describe.c:4651 describe.c:4989 describe.c:5002
-#: describe.c:5139 describe.c:6927 describe.c:7126
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
 msgid "no"
 msgstr "nein"
 
-#: describe.c:421 describe.c:839 describe.c:5003 describe.c:7127
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
 msgid "Leakproof?"
-msgstr ""
+msgstr "Leakproof?"
 
-#: describe.c:426
+#: describe.c:427
 msgid "Language"
 msgstr "Sprache"
 
-#: describe.c:429 describe.c:671
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: describe.c:608
+#: describe.c:609
 msgid "List of functions"
 msgstr "Liste der Funktionen"
 
-#: describe.c:673
+#: describe.c:674
 msgid "Elements"
 msgstr "Elemente"
 
-#: describe.c:724
+#: describe.c:725
 msgid "List of data types"
 msgstr "Liste der Datentypen"
 
-#: describe.c:828
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Linker Typ"
 
-#: describe.c:829
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Rechter Typ"
 
-#: describe.c:830
+#: describe.c:831
 msgid "Result type"
 msgstr "Ergebnistyp"
 
-#: describe.c:836 describe.c:4817 describe.c:4981 describe.c:5491
-#: describe.c:7221 describe.c:7225
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Funktion"
 
-#: describe.c:923
+#: describe.c:924
 msgid "List of operators"
 msgstr "Liste der Operatoren"
 
-#: describe.c:960
+#: describe.c:961
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: describe.c:968 describe.c:972
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Locale-Provider"
 
-#: describe.c:976 describe.c:5111
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Sortierfolge"
 
-#: describe.c:977 describe.c:5112
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Zeichentyp"
 
-#: describe.c:981 describe.c:985 describe.c:989 describe.c:5117 describe.c:5121
-#: describe.c:5125
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Locale"
 
-#: describe.c:993 describe.c:997 describe.c:5130 describe.c:5134
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "ICU-Regeln"
 
-#: describe.c:1009
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:1034
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Liste der Datenbanken"
 
-#: describe.c:1075 describe.c:1232 describe.c:4048
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "Tabelle"
 
-#: describe.c:1076 describe.c:4049
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "Sicht"
 
-#: describe.c:1077 describe.c:4050
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "materialisierte Sicht"
 
-#: describe.c:1078 describe.c:1234 describe.c:4052
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "Sequenz"
 
-#: describe.c:1079 describe.c:4054
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "Fremdtabelle"
 
-#: describe.c:1080 describe.c:4055 describe.c:4319
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "partitionierte Tabelle"
 
-#: describe.c:1096
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Spaltenprivilegien"
 
-#: describe.c:1127 describe.c:1161
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Policys"
 
-#: describe.c:1189 describe.c:4734 describe.c:6883
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Zugriffsprivilegien"
 
-#: describe.c:1236
+#: describe.c:1237
 msgid "function"
 msgstr "Funktion"
 
-#: describe.c:1238
+#: describe.c:1239
 msgid "type"
 msgstr "Typ"
 
-#: describe.c:1240
+#: describe.c:1241
 msgid "schema"
 msgstr "Schema"
 
-#: describe.c:1242
+#: describe.c:1243
 msgid "large object"
 msgstr "Large Object"
 
-#: describe.c:1264
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Vorgegebene Zugriffsprivilegien"
 
-#: describe.c:1308
+#: describe.c:1309
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:1322
+#: describe.c:1323
 msgid "table constraint"
 msgstr "Tabellen-Constraint"
 
-#: describe.c:1346
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "Domänen-Constraint"
 
-#: describe.c:1370
+#: describe.c:1371
 msgid "operator class"
 msgstr "Operatorklasse"
 
-#: describe.c:1394
+#: describe.c:1395
 msgid "operator family"
 msgstr "Operatorfamilie"
 
-#: describe.c:1417
+#: describe.c:1418
 msgid "rule"
 msgstr "Rule"
 
-#: describe.c:1462
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Objektbeschreibungen"
 
-#: describe.c:1527
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "Keine Relation namens »%s« gefunden"
 
-#: describe.c:1530 describe.c:4206
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "Keine Relationen gefunden"
 
-#: describe.c:1726
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "Keine Relation mit OID %s gefunden"
 
-#: describe.c:1774 describe.c:1798
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Start"
 
-#: describe.c:1775 describe.c:1799
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Minimum"
 
-#: describe.c:1776 describe.c:1800
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Maximum"
 
-#: describe.c:1777 describe.c:1801
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Inkrement"
 
-#: describe.c:1780 describe.c:1804
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "Zyklisch?"
 
-#: describe.c:1781 describe.c:1805
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Cache"
 
-#: describe.c:1846
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Eigentümer: %s"
 
-#: describe.c:1850
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Sequenz für Identitätsspalte: %s"
 
-#: describe.c:1858
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Ungeloggte Sequenz »%s.%s«"
 
-#: describe.c:1861
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequenz »%s.%s«"
 
-#: describe.c:2004
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Ungeloggte Tabelle »%s.%s«"
 
-#: describe.c:2007
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabelle »%s.%s«"
 
-#: describe.c:2011
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Sicht »%s.%s«"
 
-#: describe.c:2015
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Materialisierte Sicht »%s.%s«"
 
-#: describe.c:2020
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Ungeloggter Index »%s.%s«"
 
-#: describe.c:2023
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index »%s.%s«"
 
-#: describe.c:2028
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Ungeloggter partitionierter Index »%s.%s«"
 
-#: describe.c:2031
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Partitionierter Index »%s.%s«"
 
-#: describe.c:2035
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-Tabelle »%s.%s«"
 
-#: describe.c:2039
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Zusammengesetzter Typ »%s.%s«"
 
-#: describe.c:2043
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Fremdtabelle »%s.%s«"
 
-#: describe.c:2048
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Ungeloggte partitionierte Tabelle »%s.%s«"
 
-#: describe.c:2051
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Partitionierte Tabelle »%s.%s«"
 
-#: describe.c:2067 describe.c:4569
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Sortierfolge"
 
-#: describe.c:2068 describe.c:4570
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "NULL erlaubt?"
 
-#: describe.c:2069 describe.c:4571
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "Vorgabewert"
 
-#: describe.c:2072
+#: describe.c:2073
 msgid "Key?"
 msgstr "Schlüssel?"
 
-#: describe.c:2074 describe.c:4887 describe.c:4898
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Definition"
 
-#: describe.c:2076 describe.c:5932 describe.c:6006 describe.c:6071
-#: describe.c:6129
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "FDW-Optionen"
 
-#: describe.c:2078
+#: describe.c:2079
 msgid "Storage"
 msgstr "Speicherung"
 
-#: describe.c:2080
+#: describe.c:2081
 msgid "Compression"
 msgstr "Kompression"
 
-#: describe.c:2082
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Statistikziel"
 
-#: describe.c:2224
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Partition von: %s %s%s"
 
-#: describe.c:2237
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Kein Partitions-Constraint"
 
-#: describe.c:2239
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Partitions-Constraint: %s"
 
-#: describe.c:2263
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Partitionsschlüssel: %s"
 
-#: describe.c:2289
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Gehört zu Tabelle: »%s.%s«"
 
-#: describe.c:2362
+#: describe.c:2363
 msgid "primary key, "
 msgstr "Primärschlüssel, "
 
-#: describe.c:2365
+#: describe.c:2366
 msgid "unique"
 msgstr "unique"
 
-#: describe.c:2367
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls not distinct"
 
-#: describe.c:2368
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2375
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "für Tabelle »%s.%s«"
 
-#: describe.c:2379
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", Prädikat (%s)"
 
-#: describe.c:2382
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", geclustert"
 
-#: describe.c:2385
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", ungültig"
 
-#: describe.c:2388
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", DEFERRABLE"
 
-#: describe.c:2391
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", INITIALLY DEFERRED"
 
-#: describe.c:2394
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", Replika-Identität"
 
-#: describe.c:2455
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Indexe:"
 
-#: describe.c:2543
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Check-Constraints:"
 
-#: describe.c:2604
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Fremdschlüssel-Constraints:"
 
-#: describe.c:2663
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Fremdschlüsselverweise von:"
 
-#: describe.c:2712
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Policys:"
 
-#: describe.c:2715
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Policys (Sicherheit auf Zeilenebene erzwungen):"
 
-#: describe.c:2718
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Policys (Sicherheit auf Zeilenebene eingeschaltet): (keine)"
 
-#: describe.c:2721
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Policys (Sicherheit auf Zeilenebene erzwungen): (keine)"
 
-#: describe.c:2724
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Policys (Sicherheit auf Zeilenebene ausgeschaltet):"
 
-#: describe.c:2784 describe.c:2889
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Statistikobjekte:"
 
-#: describe.c:2991 describe.c:3191
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Regeln:"
 
-#: describe.c:2994
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Abgeschaltete Regeln:"
 
-#: describe.c:2997
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Regeln, die immer aktiv werden:"
 
-#: describe.c:3000
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Regeln, die nur im Replikat aktiv werden:"
 
-#: describe.c:3079 describe.c:5275
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Publikationen:"
 
-#: describe.c:3126
+#: describe.c:3127
 msgid "Not-null constraints:"
 msgstr "Not-Null-Constraints:"
 
-#: describe.c:3140
-#, fuzzy
-#| msgid "No inheritance"
+#: describe.c:3141
 msgid " (local, inherited)"
-msgstr "keine Vererbung"
+msgstr "(lokal, geerbt)"
 
-#: describe.c:3141
-#, fuzzy
-#| msgid "No inheritance"
+#: describe.c:3142
 msgid " (inherited)"
-msgstr "keine Vererbung"
+msgstr "(geerbt)"
 
-#: describe.c:3174
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Sichtdefinition:"
 
-#: describe.c:3337
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Trigger:"
 
-#: describe.c:3340
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Abgeschaltete Benutzer-Trigger:"
 
-#: describe.c:3343
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Abgeschaltete interne Trigger:"
 
-#: describe.c:3346
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Trigger, die immer aktiv werden:"
 
-#: describe.c:3349
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Trigger, die nur im Replikat aktiv werden:"
 
-#: describe.c:3420
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Server: %s"
 
-#: describe.c:3428
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "FDW-Optionen: (%s)"
 
-#: describe.c:3449
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Erbt von"
 
-#: describe.c:3514
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Anzahl Partitionen: %d"
 
-#: describe.c:3523
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Anzahl Partitionen: %d (Mit \\d+ alle anzeigen.)"
 
-#: describe.c:3525
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Anzahl Kindtabellen: %d (Mit \\d+ alle anzeigen.)"
 
-#: describe.c:3532
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Kindtabellen"
 
-#: describe.c:3532
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: describe.c:3565
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Getypte Tabelle vom Typ: %s"
 
-#: describe.c:3583
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Replika-Identität"
 
-#: describe.c:3596
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Hat OIDs: ja"
 
-#: describe.c:3605
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Zugriffsmethode: %s"
 
-#: describe.c:3682
+#: describe.c:3683
 #, 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:3694
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", Tablespace »%s«"
 
-#: describe.c:3767
+#: describe.c:3768
 msgid "List of roles"
 msgstr "Liste der Rollen"
 
-#: describe.c:3769 describe.c:3937
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Rollenname"
 
-#: describe.c:3770
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Attribute"
 
-#: describe.c:3781
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Superuser"
 
-#: describe.c:3784
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "keine Vererbung"
 
-#: describe.c:3787
+#: describe.c:3788
 msgid "Create role"
 msgstr "Rolle erzeugen"
 
-#: describe.c:3790
+#: describe.c:3791
 msgid "Create DB"
 msgstr "DB erzeugen"
 
-#: describe.c:3793
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "kann nicht einloggen"
 
-#: describe.c:3796
+#: describe.c:3797
 msgid "Replication"
 msgstr "Replikation"
 
-#: describe.c:3800
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Bypass RLS"
 
-#: describe.c:3809
+#: describe.c:3810
 msgid "No connections"
 msgstr "keine Verbindungen"
 
-#: describe.c:3811
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: describe.c:3821
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Passwort gültig bis "
 
-#: describe.c:3872
+#: describe.c:3873
 msgid "Role"
 msgstr "Rolle"
 
-#: describe.c:3874
+#: describe.c:3875
 msgid "Settings"
 msgstr "Einstellung"
 
-#: describe.c:3898
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "Keine Einstellungen für Rolle »%s« und Datenbank »%s« gefunden"
 
-#: describe.c:3901
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "Keine Einstellungen für Rolle »%s« gefunden"
 
-#: describe.c:3904
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "Keine Einstellungen gefunden"
 
-#: describe.c:3908
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Liste der Einstellungen"
 
-#: describe.c:3938
+#: describe.c:3939
 msgid "Member of"
 msgstr "Mitglied von"
 
-#: describe.c:3955
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Grantor"
 
-#: describe.c:3981
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "Liste der Rollen-Grants"
 
-#: describe.c:4051
+#: describe.c:4052
 msgid "index"
 msgstr "Index"
 
-#: describe.c:4053
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST-Tabelle"
 
-#: describe.c:4056 describe.c:4320
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "partitionierter Index"
 
-#: describe.c:4080
+#: describe.c:4081
 msgid "permanent"
 msgstr "permanent"
 
-#: describe.c:4081
+#: describe.c:4082
 msgid "temporary"
 msgstr "temporär"
 
-#: describe.c:4082
+#: describe.c:4083
 msgid "unlogged"
 msgstr "ungeloggt"
 
-#: describe.c:4083
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Persistenz"
 
-#: describe.c:4099 describe.c:4343
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Zugriffsmethode"
 
-#: describe.c:4179
+#: describe.c:4180
 #, c-format
 msgid "Did not find any relations named \"%s\"."
 msgstr "Keine Relationen namens »%s« gefunden"
 
-#: describe.c:4182
+#: describe.c:4183
 #, c-format
 msgid "Did not find any tables named \"%s\"."
 msgstr "Keine Tabellen namens »%s« gefunden"
 
-#: describe.c:4185
+#: describe.c:4186
 #, c-format
 msgid "Did not find any indexes named \"%s\"."
 msgstr "Keine Indexe namens »%s« gefunden"
 
-#: describe.c:4188
+#: describe.c:4189
 #, c-format
 msgid "Did not find any views named \"%s\"."
 msgstr "Keine Sichten namens »%s« gefunden"
 
-#: describe.c:4191
+#: describe.c:4192
 #, c-format
 msgid "Did not find any materialized views named \"%s\"."
 msgstr "Keine materialisierten Sichten namens »%s« gefunden"
 
-#: describe.c:4194
+#: describe.c:4195
 #, c-format
 msgid "Did not find any sequences named \"%s\"."
 msgstr "Keine Sequenzen namens »%s« gefunden"
 
-#: describe.c:4197
+#: describe.c:4198
 #, c-format
 msgid "Did not find any foreign tables named \"%s\"."
 msgstr "Keine Fremdtabellen namens »%s« gefunden"
 
-#: describe.c:4208
+#: describe.c:4209
 #, c-format
 msgid "Did not find any tables."
 msgstr "Keine Tabellen gefunden"
 
-#: describe.c:4210
+#: describe.c:4211
 #, c-format
 msgid "Did not find any indexes."
 msgstr "Keine Indexe gefunden"
 
-#: describe.c:4212
+#: describe.c:4213
 #, c-format
 msgid "Did not find any views."
 msgstr "Keine Sichten gefunden"
 
-#: describe.c:4214
+#: describe.c:4215
 #, c-format
 msgid "Did not find any materialized views."
 msgstr "Keine materialisierten Sichten gefunden"
 
-#: describe.c:4216
+#: describe.c:4217
 #, c-format
 msgid "Did not find any sequences."
 msgstr "Keine Sequenzen gefunden"
 
-#: describe.c:4218
+#: describe.c:4219
 #, c-format
 msgid "Did not find any foreign tables."
 msgstr "Keine Fremdtabellen gefunden"
 
-#: describe.c:4226
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Liste der Relationen"
 
-#: describe.c:4227
+#: describe.c:4228
 msgid "List of tables"
 msgstr "Liste der Tabellen"
 
-#: describe.c:4228
+#: describe.c:4229
 msgid "List of indexes"
 msgstr "Liste der Indexe"
 
-#: describe.c:4229
+#: describe.c:4230
 msgid "List of views"
 msgstr "Liste der Sichten"
 
-#: describe.c:4230
+#: describe.c:4231
 msgid "List of materialized views"
 msgstr "Liste der materialisierten Sichten"
 
-#: describe.c:4231
+#: describe.c:4232
 msgid "List of sequences"
 msgstr "Liste der Sequenzen"
 
-#: describe.c:4232 describe.c:6162
+#: describe.c:4233 describe.c:6163
 msgid "List of foreign tables"
 msgstr "Liste der Fremdtabellen"
 
-#: describe.c:4281
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "Der Server (Version %s) unterstützt keine deklarative Tabellenpartitionierung."
 
-#: describe.c:4292
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Liste partitionierter Indexe"
 
-#: describe.c:4294
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Liste partitionierte Tabellen"
 
-#: describe.c:4298
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Liste partitionierter Relationen"
 
-#: describe.c:4329
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Elternname"
 
-#: describe.c:4349
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Größe Leaf-Partition"
 
-#: describe.c:4352 describe.c:4358
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Gesamtgröße"
 
-#: describe.c:4485
+#: describe.c:4486
 msgid "Trusted"
 msgstr "Vertraut"
 
-#: describe.c:4494
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Interne Sprache"
 
-#: describe.c:4495
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Call-Handler"
 
-#: describe.c:4496 describe.c:5918
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Validator"
 
-#: describe.c:4497
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Inline-Handler"
 
-#: describe.c:4531
+#: describe.c:4532
 msgid "List of languages"
 msgstr "Liste der Sprachen"
 
-#: describe.c:4572
+#: describe.c:4573
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:4615
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Liste der Domänen"
 
-#: describe.c:4649
+#: describe.c:4650
 msgid "Source"
 msgstr "Quelle"
 
-#: describe.c:4650
+#: describe.c:4651
 msgid "Destination"
 msgstr "Ziel"
 
-#: describe.c:4652 describe.c:6928
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "Standard?"
 
-#: describe.c:4693
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Liste der Konversionen"
 
-#: describe.c:4729
+#: describe.c:4730
 msgid "Context"
 msgstr "Kontext"
 
-#: describe.c:4761
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Liste der Konfigurationsparameter"
 
-#: describe.c:4763
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Liste der veränderten Konfigurationsparameter"
 
-#: describe.c:4790
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "Der Server (Version %s) unterstützt keine Ereignistrigger."
 
-#: describe.c:4810
+#: describe.c:4811
 msgid "Event"
 msgstr "Ereignis"
 
-#: describe.c:4812
+#: describe.c:4813
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: describe.c:4813
+#: describe.c:4814
 msgid "replica"
 msgstr "Replika"
 
-#: describe.c:4814
+#: describe.c:4815
 msgid "always"
 msgstr "immer"
 
-#: describe.c:4815
+#: describe.c:4816
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: describe.c:4816 describe.c:6769
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Eingeschaltet"
 
-#: describe.c:4818
+#: describe.c:4819
 msgid "Tags"
 msgstr "Tags"
 
-#: describe.c:4841
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Liste der Ereignistrigger"
 
-#: describe.c:4868
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "Der Server (Version %s) unterstützt keine erweiterten Statistiken."
 
-#: describe.c:4905
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4906
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: describe.c:4916
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4939
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "Liste der erweiterten Statistiken"
 
-#: describe.c:4966
+#: describe.c:4967
 msgid "Source type"
 msgstr "Quelltyp"
 
-#: describe.c:4967
+#: describe.c:4968
 msgid "Target type"
 msgstr "Zieltyp"
 
-#: describe.c:4991
+#: describe.c:4992
 msgid "in assignment"
 msgstr "in Zuweisung"
 
-#: describe.c:4993
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Implizit?"
 
-#: describe.c:5057
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Liste der Typumwandlungen"
 
-#: describe.c:5102 describe.c:5106
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Provider"
 
-#: describe.c:5140 describe.c:5145
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Deterministisch?"
 
-#: describe.c:5184
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Liste der Sortierfolgen"
 
-#: describe.c:5245
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Liste der Schemas"
 
-#: describe.c:5361
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Liste der Textsucheparser"
 
-#: describe.c:5411
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "Kein Textsucheparser namens »%s« gefunden"
 
-#: describe.c:5414
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "Keine Textsucheparser gefunden"
 
-#: describe.c:5489
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Parsen starten"
 
-#: describe.c:5490
+#: describe.c:5491
 msgid "Method"
 msgstr "Methode"
 
-#: describe.c:5494
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Nächstes Token lesen"
 
-#: describe.c:5496
+#: describe.c:5497
 msgid "End parse"
 msgstr "Parsen beenden"
 
-#: describe.c:5498
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Überschrift ermitteln"
 
-#: describe.c:5500
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Tokentypen ermitteln"
 
-#: describe.c:5510
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Textsucheparser »%s.%s«"
 
-#: describe.c:5513
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Textsucheparser »%s«"
 
-#: describe.c:5532
+#: describe.c:5533
 msgid "Token name"
 msgstr "Tokenname"
 
-#: describe.c:5545
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tokentypen für Parser »%s.%s«"
 
-#: describe.c:5548
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tokentypen für Parser »%s«"
 
-#: describe.c:5592
+#: describe.c:5593
 msgid "Template"
 msgstr "Vorlage"
 
-#: describe.c:5593
+#: describe.c:5594
 msgid "Init options"
 msgstr "Initialisierungsoptionen"
 
-#: describe.c:5619
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Liste der Textsuchewörterbücher"
 
-#: describe.c:5652
+#: describe.c:5653
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:5653
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:5684
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Liste der Textsuchevorlagen"
 
-#: describe.c:5738
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Liste der Textsuchekonfigurationen"
 
-#: describe.c:5789
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "Keine Textsuchekonfiguration namens »%s« gefunden"
 
-#: describe.c:5792
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "Keine Textsuchekonfigurationen gefunden"
 
-#: describe.c:5858
+#: describe.c:5859
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:5859
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Wörterbücher"
 
-#: describe.c:5870
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Textsuchekonfiguration »%s.%s«"
 
-#: describe.c:5873
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Textsuchekonfiguration »%s«"
 
-#: describe.c:5877
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2442,7 +2441,7 @@ msgstr ""
 "\n"
 "Parser: »%s.%s«"
 
-#: describe.c:5880
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2451,275 +2450,273 @@ msgstr ""
 "\n"
 "Parser: »%s«"
 
-#: describe.c:5959
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Liste der Fremddaten-Wrapper"
 
-#: describe.c:5987
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Fremddaten-Wrapper"
 
-#: describe.c:6005 describe.c:6194
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:6035
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Liste der Fremdserver"
 
-#: describe.c:6060 describe.c:6118
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:6061
+#: describe.c:6062
 msgid "User name"
 msgstr "Benutzername"
 
-#: describe.c:6090
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Liste der Benutzerabbildungen"
 
-#: describe.c:6195
-#, fuzzy
-#| msgid "Default footer is on.\n"
+#: describe.c:6196
 msgid "Default version"
-msgstr "Standardfußzeile ist an.\n"
+msgstr "Standardversion"
 
-#: describe.c:6216
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Liste der installierten Erweiterungen"
 
-#: describe.c:6264
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "Keine Erweiterung namens »%s« gefunden"
 
-#: describe.c:6267
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "Keine Erweiterungen gefunden"
 
-#: describe.c:6311
+#: describe.c:6312
 msgid "Object description"
 msgstr "Objektbeschreibung"
 
-#: describe.c:6320
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objekte in Erweiterung »%s«"
 
-#: describe.c:6361
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "falscher qualifizierter Name (zu viele Namensteile): %s"
 
-#: describe.c:6375
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: %s"
 
-#: describe.c:6406 describe.c:6542
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "Der Server (Version %s) unterstützt keine Publikationen."
 
-#: describe.c:6423 describe.c:6644
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Alle Tabellen"
 
-#: describe.c:6424 describe.c:6645
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Inserts"
 
-#: describe.c:6425 describe.c:6646
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Updates"
 
-#: describe.c:6426 describe.c:6647
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Deletes"
 
-#: describe.c:6430 describe.c:6649
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Truncates"
 
-#: describe.c:6439 describe.c:6573 describe.c:6651
+#: describe.c:6440 describe.c:6574 describe.c:6652
 msgid "Generated columns"
 msgstr "Generierte Spalten"
 
-#: describe.c:6443 describe.c:6653
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Über Wurzel"
 
-#: describe.c:6464
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Liste der Publikationen"
 
-#: describe.c:6611
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "Keine Publikation namens »%s« gefunden"
 
-#: describe.c:6614
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "Keine Publikationen gefunden"
 
-#: describe.c:6640
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Publikation %s"
 
-#: describe.c:6697
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Tabellen:"
 
-#: describe.c:6709
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Tabellen aus Schemas:"
 
-#: describe.c:6754
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "Der Server (Version %s) unterstützt keine Subskriptionen."
 
-#: describe.c:6770
+#: describe.c:6771
 msgid "Publication"
 msgstr "Publikation"
 
-#: describe.c:6779
+#: describe.c:6780
 msgid "Binary"
 msgstr "Binär"
 
-#: describe.c:6788 describe.c:6792
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "Streaming"
 
-#: describe.c:6800
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Two-Phase-Commit"
 
-#: describe.c:6801
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Bei Fehler abschalten"
 
-#: describe.c:6808
+#: describe.c:6809
 msgid "Origin"
 msgstr "Herkunft"
 
-#: describe.c:6809
+#: describe.c:6810
 msgid "Password required"
 msgstr "Passwort nötig"
 
-#: describe.c:6810
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "Als Eigentümer ausführen?"
 
-#: describe.c:6815
+#: describe.c:6816
 msgid "Failover"
 msgstr "Failover"
 
-#: describe.c:6820
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Synchroner Commit"
 
-#: describe.c:6821
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Verbindungsinfo"
 
-#: describe.c:6827
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Skip-LSN"
 
-#: describe.c:6853
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Liste der Subskriptionen"
 
-#: describe.c:6882
+#: describe.c:6883
 msgid "(none)"
 msgstr "(keine)"
 
-#: describe.c:6922 describe.c:7017 describe.c:7109 describe.c:7212
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6923
+#: describe.c:6924
 msgid "Input type"
 msgstr "Eingabetyp"
 
-#: describe.c:6924
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Storage-Typ"
 
-#: describe.c:6925
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Operatorklasse"
 
-#: describe.c:6937 describe.c:7018 describe.c:7110 describe.c:7213
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Operatorfamilie"
 
-#: describe.c:6972
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Liste der Operatorklassen"
 
-#: describe.c:7019
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Passende Typen"
 
-#: describe.c:7060
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Liste der Operatorfamilien"
 
-#: describe.c:7111
+#: describe.c:7112
 msgid "Operator"
 msgstr "Operator"
 
-#: describe.c:7112
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Strategie"
 
-#: describe.c:7113
+#: describe.c:7114
 msgid "ordering"
 msgstr "Sortieren"
 
-#: describe.c:7114
+#: describe.c:7115
 msgid "search"
 msgstr "Suchen"
 
-#: describe.c:7115
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Zweck"
 
-#: describe.c:7124
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "Sortier-Opfamilie"
 
-#: describe.c:7167
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "Liste der Operatoren in Operatorfamilien"
 
-#: describe.c:7214
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Registrierter linker Typ"
 
-#: describe.c:7215
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Registrierter rechter Typ"
 
-#: describe.c:7216
+#: describe.c:7217
 msgid "Number"
 msgstr "Nummer"
 
-#: describe.c:7259
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Liste der Unterstützungsfunktionen in Operatorfamilien"
 
-#: describe.c:7290
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7310
+#: describe.c:7311
 msgid "Large objects"
 msgstr "Large Objects"
 
@@ -2731,7 +2728,7 @@ msgstr ""
 "psql ist das interaktive PostgreSQL-Terminal.\n"
 "\n"
 
-#: help.c:61 help.c:384 help.c:470 help.c:516
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
@@ -3033,6 +3030,22 @@ msgstr "  \\q                     psql beenden\n"
 
 #: help.c:174
 msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict RESTRICT_KEY\n"
+"                         Restricted-Modus mit angegebenem Schlüssel starten\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         Restricted-Modus beenden, wenn der Schlüssel passt\n"
+
+#: help.c:178
+msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
 "                         execute query every SEC seconds, up to N times,\n"
 "                         stop if less than MIN rows are returned\n"
@@ -3041,210 +3054,210 @@ msgstr ""
 "                         Anfrage alle SEK Sekunden ausführen, bis zu N Mal,\n"
 "                         aufhören wenn weniger als MIN Zeilen zurückgegeben werden\n"
 
-#: help.c:177 help.c:185 help.c:197 help.c:207 help.c:214 help.c:271 help.c:279
-#: help.c:299 help.c:312 help.c:321 help.c:327
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
-#: help.c:179
+#: help.c:183
 msgid "Help\n"
 msgstr "Hilfe\n"
 
-#: help.c:181
+#: help.c:185
 msgid "  \\? [commands]          show help on backslash commands\n"
 msgstr "  \\? [commands]          Hilfe über Backslash-Befehle anzeigen\n"
 
-#: help.c:182
+#: help.c:186
 msgid "  \\? options             show help on psql command-line options\n"
 msgstr "  \\? options             Hilfe über psql-Kommandozeilenoptionen anzeigen\n"
 
-#: help.c:183
+#: help.c:187
 msgid "  \\? variables           show help on special variables\n"
 msgstr "  \\? variables           Hilfe über besondere Variablen anzeigen\n"
 
-#: help.c:184
+#: help.c:188
 msgid "  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"
 msgstr "  \\h [NAME]              Syntaxhilfe über SQL-Anweisung, * für alle Anweisungen\n"
 
-#: help.c:187
+#: help.c:191
 msgid "Query Buffer\n"
 msgstr "Anfragepuffer\n"
 
-#: help.c:188
+#: help.c:192
 msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr "  \\e [DATEI] [ZEILE]     Anfragepuffer (oder Datei) mit externem Editor bearbeiten\n"
 
-#: help.c:189
+#: help.c:193
 msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr "  \\ef [FUNKNAME [ZEILE]] Funktionsdefinition mit externem Editor bearbeiten\n"
 
-#: help.c:190
+#: help.c:194
 msgid "  \\ev [VIEWNAME [LINE]]  edit view definition with external editor\n"
 msgstr "  \\ev [SICHTNAME [ZEILE]] Sichtdefinition mit externem Editor bearbeiten\n"
 
-#: help.c:191
+#: help.c:195
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     aktuellen Inhalt der Anfragepuffers zeigen\n"
 
-#: help.c:192
+#: help.c:196
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     Anfragepuffer löschen\n"
 
-#: help.c:194
+#: help.c:198
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [DATEI]             Befehlsgeschichte ausgeben oder in Datei schreiben\n"
 
-#: help.c:196
+#: help.c:200
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w DATEI               Anfragepuffer in Datei schreiben\n"
 
-#: help.c:199
+#: help.c:203
 msgid "Input/Output\n"
 msgstr "Eingabe/Ausgabe\n"
 
-#: help.c:200
+#: help.c:204
 msgid "  \\copy ...              perform SQL COPY with data stream to the client host\n"
 msgstr "  \\copy ...              SQL COPY mit Datenstrom auf Client-Host ausführen\n"
 
-#: help.c:201
+#: help.c:205
 msgid "  \\echo [-n] [STRING]    write string to standard output (-n for no newline)\n"
 msgstr "  \\echo [-n] [TEXT]      Text auf Standardausgabe schreiben (-n für ohne Newline)\n"
 
-#: help.c:202
+#: help.c:206
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i DATEI               Befehle aus Datei ausführen\n"
 
-#: help.c:203
+#: help.c:207
 msgid "  \\ir FILE               as \\i, but relative to location of current script\n"
 msgstr "  \\ir DATEI              wie \\i, aber relativ zum Ort des aktuellen Skripts\n"
 
-#: help.c:204
+#: help.c:208
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr "  \\o [DATEI]             alle Anfrageergebnisse in Datei oder |Pipe schreiben\n"
 
-#: help.c:205
+#: help.c:209
 msgid "  \\qecho [-n] [STRING]   write string to \\o output stream (-n for no newline)\n"
 msgstr ""
 "  \\qecho [-n] [TEXT]     Text auf Ausgabestrom für \\o schreiben (-n für ohne\n"
 "                         Newline)\n"
 
-#: help.c:206
+#: help.c:210
 msgid "  \\warn [-n] [STRING]    write string to standard error (-n for no newline)\n"
 msgstr ""
 "  \\warn [-n] [TEXT]      Text auf Standardfehlerausgabe schreiben (-n für ohne\n"
 "                         Newline)\n"
 
-#: help.c:209
+#: help.c:213
 msgid "Conditional\n"
 msgstr "Bedingte Anweisungen\n"
 
-#: help.c:210
+#: help.c:214
 msgid "  \\if EXPR               begin conditional block\n"
 msgstr "  \\if AUSDRUCK           Beginn einer bedingten Anweisung\n"
 
-#: help.c:211
+#: help.c:215
 msgid "  \\elif EXPR             alternative within current conditional block\n"
 msgstr "  \\elif AUSDRUCK         Alternative in aktueller bedingter Anweisung\n"
 
-#: help.c:212
+#: help.c:216
 msgid "  \\else                  final alternative within current conditional block\n"
 msgstr "  \\else                  letzte Alternative in aktueller bedingter Anweisung\n"
 
-#: help.c:213
+#: help.c:217
 msgid "  \\endif                 end conditional block\n"
 msgstr "  \\endif                 Ende einer bedingten Anweisung\n"
 
-#: help.c:216
+#: help.c:220
 msgid "Informational\n"
 msgstr "Informationen\n"
 
-#: help.c:217
+#: help.c:221
 msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
 msgstr "  (Optionen: S = Systemobjekte zeigen, x = erweiterte Ausgabe, + = mehr Details)\n"
 
-#: help.c:218
+#: help.c:222
 msgid "  \\d[Sx+]                list tables, views, and sequences\n"
 msgstr "  \\d[Sx+]                Tabellen, Sichten und Sequenzen auflisten\n"
 
-#: help.c:219
+#: help.c:223
 msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr "  \\d[S+]   NAME          Tabelle, Sicht, Sequenz oder Index beschreiben\n"
 
-#: help.c:220
+#: help.c:224
 msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
 msgstr "  \\da[Sx]  [MUSTER]      Aggregatfunktionen auflisten\n"
 
-#: help.c:221
+#: help.c:225
 msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
 msgstr "  \\dA[x+]  [MUSTER]      Zugriffsmethoden auflisten\n"
 
-#: help.c:222
+#: help.c:226
 msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
 msgstr "  \\dAc[x+] [AMMUST [TYPMUST]]   Operatorklassen auflisten\n"
 
-#: help.c:223
+#: help.c:227
 msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
 msgstr "  \\dAf[x+] [AMMUST [TYPMUST]]   Operatorfamilien auflisten\n"
 
-#: help.c:224
+#: help.c:228
 msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
 msgstr "  \\dAo[x+] [AMMUST [OPFMUST]]   Operatoren in Operatorfamilien auflisten\n"
 
-#: help.c:225
+#: help.c:229
 msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
 msgstr "  \\dAp[x+] [AMMUST [OPFMUST]]   Unterst.funktionen in Operatorfamilien auflisten\n"
 
-#: help.c:226
+#: help.c:230
 msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
 msgstr "  \\db[x+]  [MUSTER]      Tablespaces auflisten\n"
 
-#: help.c:227
+#: help.c:231
 msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
 msgstr "  \\dc[Sx+] [MUSTER]      Konversionen auflisten\n"
 
-#: help.c:228
+#: help.c:232
 msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
 msgstr "  \\dconfig[x+] [MUSTER]  Konfigurationsparameter auflisten\n"
 
-#: help.c:229
+#: help.c:233
 msgid "  \\dC[x+]  [PATTERN]     list casts\n"
 msgstr "  \\dC[x+]  [MUSTER]      Typumwandlungen (Casts) auflisten\n"
 
-#: help.c:230
+#: help.c:234
 msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
 msgstr ""
 "  \\dd[Sx]  [MUSTER]      Objektbeschreibungen zeigen, die nirgendwo anders\n"
 "                         erscheinen\n"
 
-#: help.c:231
+#: help.c:235
 msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
 msgstr "  \\dD[Sx+] [MUSTER]      Domänen auflisten\n"
 
-#: help.c:232
+#: help.c:236
 msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
 msgstr "  \\ddp[x]  [MUSTER]      Vorgabeprivilegien auflisten\n"
 
-#: help.c:233
+#: help.c:237
 msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
 msgstr "  \\dE[Sx+] [MUSTER]      Fremdtabellen auflisten\n"
 
-#: help.c:234
+#: help.c:238
 msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
 msgstr "  \\des[x+] [MUSTER]      Fremdserver auflisten\n"
 
-#: help.c:235
+#: help.c:239
 msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
 msgstr "  \\det[x+] [MUSTER]      Fremdtabellen auflisten\n"
 
-#: help.c:236
+#: help.c:240
 msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
 msgstr "  \\deu[x+] [MUSTER]      Benutzerabbildungen auflisten\n"
 
-#: help.c:237
+#: help.c:241
 msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
 msgstr "  \\dew[x+] [MUSTER]      Fremddaten-Wrapper auflisten\n"
 
-#: help.c:238
+#: help.c:242
 msgid ""
 "  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
@@ -3252,47 +3265,47 @@ msgstr ""
 "  \\df[anptw][Sx+] [FUNKMUSTR [TYPMUSTR ...]]\n"
 "                         Funktionen [nur Agg/normale/Proz/Trigger/Fenster] auflisten\n"
 
-#: help.c:240
+#: help.c:244
 msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
 msgstr "  \\dF[x+]  [MUSTER]      Textsuchekonfigurationen auflisten\n"
 
-#: help.c:241
+#: help.c:245
 msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
 msgstr "  \\dFd[x+] [MUSTER]      Textsuchewörterbücher auflisten\n"
 
-#: help.c:242
+#: help.c:246
 msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
 msgstr "  \\dFp[x+] [MUSTER]      Textsucheparser auflisten\n"
 
-#: help.c:243
+#: help.c:247
 msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
 msgstr "  \\dFt[x+] [MUSTER]      Textsuchevorlagen auflisten\n"
 
-#: help.c:244
+#: help.c:248
 msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
 msgstr "  \\dg[Sx+] [MUSTER]      Rollen auflisten\n"
 
-#: help.c:245
+#: help.c:249
 msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
 msgstr "  \\di[Sx+] [MUSTER]      Indexe auflisten\n"
 
-#: help.c:246
+#: help.c:250
 msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
 msgstr "  \\dl[x+]                Large Objects auflisten, wie \\lo_list\n"
 
-#: help.c:247
+#: help.c:251
 msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
 msgstr "  \\dL[Sx+] [MUSTER]      prozedurale Sprachen auflisten\n"
 
-#: help.c:248
+#: help.c:252
 msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
 msgstr "  \\dm[Sx+] [MUSTER]      materialisierte Sichten auflisten\n"
 
-#: help.c:249
+#: help.c:253
 msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
 msgstr "  \\dn[Sx+] [MUSTER]      Schemas auflisten\n"
 
-#: help.c:250
+#: help.c:254
 msgid ""
 "  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
@@ -3300,99 +3313,101 @@ msgstr ""
 "  \\do[Sx+] [OPMUST [TYPMUST [TYPMUST]]]\n"
 "                         Operatoren auflisten\n"
 
-#: help.c:252
+#: help.c:256
 msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
 msgstr "  \\dO[Sx+] [MUSTER]      Sortierfolgen auflisten\n"
 
-#: help.c:253
+#: help.c:257
 msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
 msgstr ""
 "  \\dp[Sx]  [MUSTER]      Zugriffsprivilegien für Tabellen, Sichten und\n"
 "                         Sequenzen auflisten\n"
 
-#: help.c:254
+#: help.c:258
 msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
 msgstr ""
 "  \\dP[itnx+] [MUSTER]    partitionierte Relationen [nur Indexe/Tabellen]\n"
 "                         auflisten [n=geschachtelt]\n"
 
-#: help.c:255
-msgid "  \\drds[x] [ROLEPTRN [DBPTRN]] list per-database role settings\n"
+#: help.c:259
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
 msgstr ""
 "  \\drds[x] [ROLLMUST [DBMUST]]\n"
 "                         datenbankspezifische Rolleneinstellungen auflisten\n"
 
-#: help.c:256
+#: help.c:261
 msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
 msgstr "  \\drg[Sx] [MUSTER]      Rollen-Grants auflisten\n"
 
-#: help.c:257
+#: help.c:262
 msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
 msgstr "  \\dRp[x+] [MUSTER]      Replikationspublikationen auflisten\n"
 
-#: help.c:258
+#: help.c:263
 msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
 msgstr "  \\dRs[x+] [MUSTER]      Replikationssubskriptionen auflisten\n"
 
-#: help.c:259
+#: help.c:264
 msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
 msgstr "  \\ds[Sx+] [MUSTER]      Sequenzen auflisten\n"
 
-#: help.c:260
+#: help.c:265
 msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
 msgstr "  \\dt[Sx+] [MUSTER]      Tabellen auflisten\n"
 
-#: help.c:261
+#: help.c:266
 msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
 msgstr "  \\dT[Sx+] [MUSTER]      Datentypen auflisten\n"
 
-#: help.c:262
+#: help.c:267
 msgid "  \\du[Sx+] [PATTERN]     list roles\n"
 msgstr "  \\du[Sx+] [MUSTER]      Rollen auflisten\n"
 
-#: help.c:263
+#: help.c:268
 msgid "  \\dv[Sx+] [PATTERN]     list views\n"
 msgstr "  \\dv[Sx+] [MUSTER]      Sichten auflisten\n"
 
-#: help.c:264
+#: help.c:269
 msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
 msgstr "  \\dx[x+]  [MUSTER]      Erweiterungen auflisten\n"
 
-#: help.c:265
+#: help.c:270
 msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
 msgstr "  \\dX[x]   [MUSTER]      erweiterte Statistiken auflisten\n"
 
-#: help.c:266
+#: help.c:271
 msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
 msgstr "  \\dy[x+]  [MUSTER]      Ereignistrigger auflisten\n"
 
-#: help.c:267
+#: help.c:272
 msgid "  \\l[x+]   [PATTERN]     list databases\n"
 msgstr "  \\l[x+]   [MUSTER]      Datenbanken auflisten\n"
 
-#: help.c:268
+#: help.c:273
 msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
 msgstr "  \\sf[+]   FUNKNAME      Funktionsdefinition zeigen\n"
 
-#: help.c:269
+#: help.c:274
 msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
 msgstr "  \\sv[+]   SICHTNAME     Sichtdefinition zeigen\n"
 
-#: help.c:270
+#: help.c:275
 msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
 msgstr "  \\z[Sx]   [MUSTER]      äquivalent zu \\dp\n"
 
-#: help.c:273
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "Large Objects\n"
 
-#: help.c:274
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr ""
 "  \\lo_export LOBOID DATEI\n"
 "                         Large Object in Datei schreiben\n"
 
-#: help.c:275
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3400,38 +3415,38 @@ msgstr ""
 "  \\lo_import DATEI [KOMMENTAR]\n"
 "                         Large Object aus Datei lesen\n"
 
-#: help.c:277
+#: help.c:282
 msgid "  \\lo_list[x+]           list large objects\n"
 msgstr "  \\lo_list[x+]           Large Objects auflisten\n"
 
-#: help.c:278
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      Large Object löschen\n"
 
-#: help.c:281
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Formatierung\n"
 
-#: help.c:282
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                     zwischen unausgerichtetem und ausgerichtetem Ausgabemodus\n"
 "                         umschalten\n"
 
-#: help.c:283
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [TEXT]              Tabellentitel setzen oder löschen\n"
 
-#: help.c:284
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr "  \\f [ZEICHEN]           Feldtrennzeichen zeigen oder setzen\n"
 
-#: help.c:285
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML-Ausgabemodus umschalten (gegenwärtig %s)\n"
 
-#: help.c:287
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3449,29 +3464,29 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:294
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            nur Datenzeilen zeigen (gegenwärtig %s)\n"
 
-#: help.c:296
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [TEXT]              HTML <table>-Tag-Attribute setzen oder löschen\n"
 
-#: help.c:297
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       erweiterte Ausgabe umschalten (gegenwärtig %s)\n"
 
-#: help.c:298
+#: help.c:303
 msgid "auto"
 msgstr "auto"
 
-#: help.c:301
+#: help.c:306
 msgid "Connection\n"
 msgstr "Verbindung\n"
 
-#: help.c:303
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3480,7 +3495,7 @@ msgstr ""
 "  \\c[onnect] {[DBNAME|- BENUTZER|- HOST|- PORT|-] | conninfo}\n"
 "                         mit neuer Datenbank verbinden (aktuell »%s«)\n"
 
-#: help.c:307
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3488,120 +3503,118 @@ msgstr ""
 "  \\c[onnect] {[DBNAME|- BENUTZER|- HOST|- PORT|-] | conninfo}\n"
 "                         mit neuer Datenbank verbinden (aktuell keine Verbindung)\n"
 
-#: help.c:309
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              Informationen über aktuelle Verbindung anzeigen\n"
 
-#: help.c:310
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [KODIERUNG]  Client-Kodierung zeigen oder setzen\n"
 
-#: help.c:311
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr ""
 "  \\password [BENUTZERNAME]\n"
 "                         sicheres Ändern eines Benutzerpasswortes\n"
 
-#: help.c:314
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Betriebssystem\n"
 
-#: help.c:315
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [VERZ]             Arbeitsverzeichnis wechseln\n"
 
-#: help.c:316
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR Umgebungsvariable auslesen\n"
 
-#: help.c:317
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NAME [WERT]    Umgebungsvariable setzen oder löschen\n"
 
-#: help.c:318
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       Zeitmessung umschalten (gegenwärtig %s)\n"
 
-#: help.c:320
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr "  \\! [BEFEHL]            Befehl in Shell ausführen oder interaktive Shell starten\n"
 
-#: help.c:323
+#: help.c:328
 msgid "Variables\n"
 msgstr "Variablen\n"
 
-#: help.c:324
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [TEXT] NAME    interne Variable vom Benutzer abfragen\n"
 
-#: help.c:325
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [NAME [WERT]]     interne Variable setzen, oder alle anzeigen\n"
 
-#: help.c:326
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NAME            interne Variable löschen\n"
 
-#: help.c:329
+#: help.c:334
 msgid "Extended Query Protocol\n"
-msgstr ""
+msgstr "Erweitertes Anfrageprotokoll\n"
 
-#: help.c:330
+#: help.c:335
 msgid "  \\bind [PARAM]...       set query parameters\n"
 msgstr "  \\bind [PARAM]...       Anfrageparameter setzen\n"
 
-#: help.c:331
+#: help.c:336
 msgid ""
 "  \\bind_named STMT_NAME [PARAM]...\n"
 "                         set query parameters for an existing prepared statement\n"
 msgstr ""
+"  \\bind_named BEF-NAME [PARAM]...\n"
+"                         Anfrageparameter für bestehenden vorbereiteten Befehl setzen\n"
 
-#: help.c:333
-msgid "  \\close STMT_NAME       close an existing prepared statement\n"
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
 msgstr ""
+"  \\close_prepared BEF-NAME\n"
+"                         bestehenden vorbereiteten Befehl schließen\n"
 
-#: help.c:334
+#: help.c:340
 msgid "  \\endpipeline           exit pipeline mode\n"
 msgstr "  \\endpipeline           Pipeline-Modus beenden\n"
 
-#: help.c:335
-#, fuzzy
-#| msgid "  -e, --echo                show the commands being sent to the server\n"
+#: help.c:341
 msgid "  \\flush                 flush output data to the server\n"
-msgstr ""
-"  -e, --echo                zeige die Befehle, die an den Server\n"
-"                            gesendet werden\n"
+msgstr "  \\flush                 Ausgabedaten an den Server flushen\n"
 
-#: help.c:336
+#: help.c:342
 msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
-msgstr ""
+msgstr "  \\flushrequest          Anfrage an den Server senden, den Ausgabepuffer zu flushen\n"
 
-#: help.c:337
-msgid ""
-"  \\getresults [NUM_RES]  read NUM_RES pending results. All pending results are\n"
-"                         read if no argument is provided\n"
-msgstr ""
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr "  \\getresults [ANZ_RES]  ANZ_RES unerledigte Ergebnisse lesen, oder alle wenn kein Argument\n"
 
-#: help.c:339
-#, fuzzy
-#| msgid "deallocate a prepared statement"
+#: help.c:344
 msgid "  \\parse STMT_NAME       create a prepared statement\n"
-msgstr "gibt einen vorbereiteten Befehl frei"
+msgstr "  \\parse BEF-NAME        vorbereiteten Befehl erzeugen\n"
 
-#: help.c:340
+#: help.c:345
 msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
-msgstr ""
+msgstr "  \\sendpipeline          eine erweiterte Anfrage an eine laufende Pipeline senden\n"
 
-#: help.c:341
+#: help.c:346
 msgid "  \\startpipeline         enter pipeline mode\n"
 msgstr "  \\startpipeline         Pipeline-Modus beginnen\n"
 
-#: help.c:342
+#: help.c:347
 msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
-msgstr ""
+msgstr "  \\syncpipeline          Synchronisierungspunkt zu einer laufenden Pipeline hinzufügen\n"
 
-#: help.c:381
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
@@ -3609,11 +3622,11 @@ msgstr ""
 "Liste besonderer Variablen\n"
 "\n"
 
-#: help.c:383
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "psql-Variablen:\n"
 
-#: help.c:385
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3623,7 +3636,7 @@ msgstr ""
 "  oder \\set NAME WERT innerhalb von psql\n"
 "\n"
 
-#: help.c:387
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3631,7 +3644,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    wenn gesetzt werden alle erfolgreichen SQL-Befehle automatisch committet\n"
 
-#: help.c:389
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3641,7 +3654,7 @@ msgstr ""
 "    bestimmt, ob SQL-Schlüsselwörter in Groß- oder Kleinschreibung\n"
 "    vervollständigt werden [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:392
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3649,7 +3662,7 @@ msgstr ""
 "  DBNAME\n"
 "    Name der aktuellen Datenbank\n"
 
-#: help.c:394
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3659,7 +3672,7 @@ msgstr ""
 "    kontrolliert, welche Eingaben auf die Standardausgabe geschrieben werden\n"
 "    [all, errors, none, queries]\n"
 
-#: help.c:397
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3669,7 +3682,7 @@ msgstr ""
 "    wenn gesetzt, interne Anfragen, die von Backslash-Befehlen ausgeführt werden,\n"
 "    anzeigen; wenn auf »noexec« gesetzt, nur anzeigen, nicht ausführen\n"
 
-#: help.c:400
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3677,7 +3690,7 @@ msgstr ""
 "  ENCODING\n"
 "    aktuelle Zeichensatzkodierung des Clients\n"
 
-#: help.c:402
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3685,7 +3698,7 @@ msgstr ""
 "  ERROR\n"
 "    »true« wenn die letzte Anfrage fehlgeschlagen ist, sonst »false«\n"
 
-#: help.c:404
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3693,7 +3706,7 @@ msgstr ""
 "  FETCH_COUNT\n"
 "    Anzahl auf einmal zu holender und anzuzeigender Zeilen (0 = unbegrenzt)\n"
 
-#: help.c:406
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3701,7 +3714,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    wenn gesetzt werden Tabellenzugriffsmethoden nicht angezeigt\n"
 
-#: help.c:408
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3709,7 +3722,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    wenn gesetzt werden Kompressionsmethoden nicht angezeigt\n"
 
-#: help.c:410
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3717,7 +3730,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    kontrolliert Befehlsgeschichte [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:412
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3725,7 +3738,7 @@ msgstr ""
 "  HISTFILE\n"
 "    Dateiname für die Befehlsgeschichte\n"
 
-#: help.c:414
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3733,7 +3746,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    maximale Anzahl der in der Befehlsgeschichte zu speichernden Befehle\n"
 
-#: help.c:416
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3741,7 +3754,7 @@ msgstr ""
 "  HOST\n"
 "    der aktuell verbundene Datenbankserverhost\n"
 
-#: help.c:418
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3749,7 +3762,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    Anzahl benötigter EOFs um eine interaktive Sitzung zu beenden\n"
 
-#: help.c:420
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3757,7 +3770,7 @@ msgstr ""
 "  LASTOID\n"
 "    Wert der zuletzt beinträchtigten OID\n"
 
-#: help.c:422
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3768,7 +3781,7 @@ msgstr ""
 "    Fehlermeldung und SQLSTATE des letzten Fehlers, oder leer und »000000« wenn\n"
 "    kein Fehler\n"
 
-#: help.c:425
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3777,7 +3790,7 @@ msgstr ""
 "    wenn gesetzt beendet ein Fehler die Transaktion nicht (verwendet implizite\n"
 "    Sicherungspunkte)\n"
 
-#: help.c:427
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3785,7 +3798,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    Skriptausführung bei Fehler beenden\n"
 
-#: help.c:429
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3793,7 +3806,7 @@ msgstr ""
 "  PORT\n"
 "    Serverport der aktuellen Verbindung\n"
 
-#: help.c:431
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3801,7 +3814,7 @@ msgstr ""
 "  PROMPT1\n"
 "    der normale psql-Prompt\n"
 
-#: help.c:433
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3809,7 +3822,7 @@ msgstr ""
 "  PROMPT2\n"
 "    der Prompt, wenn eine Anweisung von der vorherigen Zeile fortgesetzt wird\n"
 
-#: help.c:435
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3817,7 +3830,7 @@ msgstr ""
 "  PROMPT3\n"
 "    der Prompt während COPY ... FROM STDIN\n"
 
-#: help.c:437
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3825,7 +3838,7 @@ msgstr ""
 "  QUIET\n"
 "    stille Ausführung (wie Option -q)\n"
 
-#: help.c:439
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3833,7 +3846,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    Anzahl der von der letzten Anfrage beeinträchtigten Zeilen, oder 0\n"
 
-#: help.c:441
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3843,7 +3856,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    Serverversion (kurze Zeichenkette oder numerisches Format)\n"
 
-#: help.c:444
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3851,7 +3864,7 @@ msgstr ""
 "  SHELL_ERROR\n"
 "    »true« wenn der letzte Shell-Befehl fehlgeschlagen ist, sonst »false«\n"
 
-#: help.c:446
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3859,7 +3872,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    Statuscode des letzten Shell-Befehls\n"
 
-#: help.c:448
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3867,7 +3880,7 @@ msgstr ""
 "  SHOW_ALL_RESULTS\n"
 "    alle Ergebnisse einer kombinierten Anfrage (\\;) anzeigen statt nur das letzte\n"
 
-#: help.c:450
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3876,7 +3889,7 @@ msgstr ""
 "    kontrolliert die Anzeige von Kontextinformationen in Meldungen\n"
 "    [never, errors, always]\n"
 
-#: help.c:452
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3884,7 +3897,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    wenn gesetzt beendet Zeilenende die SQL-Anweisung (wie Option -S)\n"
 
-#: help.c:454
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3892,7 +3905,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    Einzelschrittmodus (wie Option -s)\n"
 
-#: help.c:456
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3900,7 +3913,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    SQLSTATE der letzten Anfrage, oder »00000« wenn kein Fehler\n"
 
-#: help.c:458
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3908,7 +3921,7 @@ msgstr ""
 "  USER\n"
 "    der aktuell verbundene Datenbankbenutzer\n"
 
-#: help.c:460
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3917,7 +3930,7 @@ msgstr ""
 "    kontrolliert wieviele Details in Fehlermeldungen enthalten sind\n"
 "    [default, verbose, terse, sqlstate]\n"
 
-#: help.c:462
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3929,13 +3942,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    Version von psql (lange Zeichenkette, kurze Zeichenkette oder numerisch)\n"
 
-#: help.c:466
+#: help.c:471
+#, c-format
 msgid ""
 "  WATCH_INTERVAL\n"
-"    if set to a number, overrides the default two second \\watch interval\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
 msgstr ""
+"  WATCH_INTERVAL\n"
+"    Anzahl Sekunden, die \\watch zwischen Ausführungen wartet (Standard %s)\n"
 
-#: help.c:469
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3943,7 +3959,7 @@ msgstr ""
 "\n"
 "Anzeigeeinstellungen:\n"
 
-#: help.c:471
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3953,7 +3969,7 @@ msgstr ""
 "  oder \\pset NAME [WERT] innerhalb von psql\n"
 "\n"
 
-#: help.c:473
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3961,7 +3977,7 @@ msgstr ""
 "  border\n"
 "    Rahmenstil (Zahl)\n"
 
-#: help.c:475
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3969,7 +3985,16 @@ msgstr ""
 "  columns\n"
 "    Zielbreite für das Format »wrapped«\n"
 
-#: help.c:477
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    Feldtrennzeichen für CSV-Ausgabeformat (Standard »%c«)\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3977,7 +4002,7 @@ msgstr ""
 "  expanded (oder x)\n"
 "    erweiterte Ausgabe [on, off, auto]\n"
 
-#: help.c:479
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3986,7 +4011,7 @@ msgstr ""
 "  fieldsep\n"
 "    Feldtrennzeichen für unausgerichteten Ausgabemodus (Standard »%s«)\n"
 
-#: help.c:482
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3994,7 +4019,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    Feldtrennzeichen für unausgerichteten Ausgabemodus auf Null-Byte setzen\n"
 
-#: help.c:484
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -4002,7 +4027,7 @@ msgstr ""
 "  footer\n"
 "    Tabellenfußzeile ein- oder auschalten [on, off]\n"
 
-#: help.c:486
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -4010,7 +4035,7 @@ msgstr ""
 "  format\n"
 "    Ausgabeformat setzen [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:488
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -4018,7 +4043,7 @@ msgstr ""
 "  linestyle\n"
 "    Rahmenlinienstil setzen [ascii, old-ascii, unicode]\n"
 
-#: help.c:490
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -4026,7 +4051,7 @@ msgstr ""
 "  null\n"
 "    setzt die Zeichenkette, die anstelle eines NULL-Wertes ausgegeben wird\n"
 
-#: help.c:492
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -4035,7 +4060,7 @@ msgstr ""
 "    Verwendung eines Locale-spezifischen Zeichens zur Trennung von Zifferngruppen\n"
 "    einschalten [on, off]\n"
 
-#: help.c:494
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -4043,7 +4068,7 @@ msgstr ""
 "  pager\n"
 "    kontrolliert Verwendung eines externen Pager-Programms [yes, no, always]\n"
 
-#: help.c:496
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -4051,7 +4076,7 @@ msgstr ""
 "  recordsep\n"
 "    Satztrennzeichen für unausgerichteten Ausgabemodus\n"
 
-#: help.c:498
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -4059,7 +4084,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    Satztrennzeichen für unausgerichteten Ausgabemodus auf Null-Byte setzen\n"
 
-#: help.c:500
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -4069,7 +4094,7 @@ msgstr ""
 "    Attribute für das »table«-Tag im Format »html« oder proportionale\n"
 "    Spaltenbreite für links ausgerichtete Datentypen im Format »latex-longtable«\n"
 
-#: help.c:503
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -4077,7 +4102,7 @@ msgstr ""
 "  title\n"
 "    setzt den Titel darauffolgend ausgegebener Tabellen\n"
 
-#: help.c:505
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -4085,7 +4110,7 @@ msgstr ""
 "  tuples_only\n"
 "    wenn gesetzt werden nur die eigentlichen Tabellendaten gezeigt\n"
 
-#: help.c:507
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -4097,7 +4122,7 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    setzt den Stil für Unicode-Linien [single, double]\n"
 
-#: help.c:511
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -4107,7 +4132,7 @@ msgstr ""
 "    setzt die maximale Breite der Kopfzeile für die erweiterte Ausgabe\n"
 "    [full, column, page, ganze Zahl]\n"
 
-#: help.c:515
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -4115,7 +4140,7 @@ msgstr ""
 "\n"
 "Umgebungsvariablen:\n"
 
-#: help.c:519
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -4125,7 +4150,7 @@ msgstr ""
 "  oder \\setenv NAME [WERT] innerhalb von psql\n"
 "\n"
 
-#: help.c:521
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -4137,7 +4162,7 @@ msgstr ""
 "  oder \\setenv NAME [WERT] innerhalb von psql\n"
 "\n"
 
-#: help.c:524
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -4145,7 +4170,7 @@ msgstr ""
 "  COLUMNS\n"
 "    Anzahl Spalten im Format »wrapped«\n"
 
-#: help.c:526
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -4153,7 +4178,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    wie Verbindungsparameter »application_name«\n"
 
-#: help.c:528
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -4161,7 +4186,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    wie Verbindungsparameter »dbname«\n"
 
-#: help.c:530
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -4169,7 +4194,7 @@ msgstr ""
 "  PGHOST\n"
 "    wie Verbindungsparameter »host«\n"
 
-#: help.c:532
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -4177,7 +4202,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    Name der Passwortdatei\n"
 
-#: help.c:534
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -4185,7 +4210,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    Verbindungspasswort (nicht empfohlen)\n"
 
-#: help.c:536
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -4193,7 +4218,7 @@ msgstr ""
 "  PGPORT\n"
 "    wie Verbindungsparameter »port«\n"
 
-#: help.c:538
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -4201,7 +4226,7 @@ msgstr ""
 "  PGUSER\n"
 "    wie Verbindungsparameter »user«\n"
 
-#: help.c:540
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -4209,7 +4234,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    Editor für Befehle \\e, \\ef und \\ev\n"
 
-#: help.c:542
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -4217,7 +4242,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    wie die Zeilennummer beim Aufruf des Editors angegeben wird\n"
 
-#: help.c:544
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -4225,7 +4250,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    alternativer Pfad für History-Datei\n"
 
-#: help.c:546
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -4233,7 +4258,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    Name des externen Pager-Programms\n"
 
-#: help.c:549
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -4241,7 +4266,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    Name des externen Pager-Programms für \\watch\n"
 
-#: help.c:552
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -4249,7 +4274,7 @@ msgstr ""
 "  PSQLRC\n"
 "    alternativer Pfad für .psqlrc-Datei des Benutzers\n"
 
-#: help.c:554
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -4257,7 +4282,7 @@ msgstr ""
 "  SHELL\n"
 "    Shell für den Befehl \\!\n"
 
-#: help.c:556
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -4265,11 +4290,11 @@ msgstr ""
 "  TMPDIR\n"
 "    Verzeichnis für temporäre Dateien\n"
 
-#: help.c:616
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Verfügbare Hilfe:\n"
 
-#: help.c:711
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -4288,7 +4313,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:734
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4421,189 +4446,189 @@ msgstr "%s: Speicher aufgebraucht"
 #: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
 #: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
 #: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
-#: sql_help.c:894 sql_help.c:899 sql_help.c:926 sql_help.c:928 sql_help.c:930
-#: sql_help.c:932 sql_help.c:935 sql_help.c:937 sql_help.c:984 sql_help.c:1029
-#: sql_help.c:1034 sql_help.c:1039 sql_help.c:1044 sql_help.c:1049
-#: sql_help.c:1068 sql_help.c:1079 sql_help.c:1081 sql_help.c:1102
-#: sql_help.c:1112 sql_help.c:1113 sql_help.c:1115 sql_help.c:1117
-#: sql_help.c:1129 sql_help.c:1133 sql_help.c:1135 sql_help.c:1147
-#: sql_help.c:1149 sql_help.c:1151 sql_help.c:1153 sql_help.c:1172
-#: sql_help.c:1174 sql_help.c:1178 sql_help.c:1182 sql_help.c:1186
-#: sql_help.c:1189 sql_help.c:1190 sql_help.c:1191 sql_help.c:1194
-#: sql_help.c:1197 sql_help.c:1199 sql_help.c:1341 sql_help.c:1343
-#: sql_help.c:1346 sql_help.c:1349 sql_help.c:1351 sql_help.c:1353
-#: sql_help.c:1356 sql_help.c:1359 sql_help.c:1487 sql_help.c:1489
-#: sql_help.c:1491 sql_help.c:1494 sql_help.c:1515 sql_help.c:1518
-#: sql_help.c:1521 sql_help.c:1524 sql_help.c:1528 sql_help.c:1530
-#: sql_help.c:1532 sql_help.c:1534 sql_help.c:1548 sql_help.c:1551
-#: sql_help.c:1553 sql_help.c:1555 sql_help.c:1565 sql_help.c:1567
-#: sql_help.c:1577 sql_help.c:1579 sql_help.c:1589 sql_help.c:1592
-#: sql_help.c:1615 sql_help.c:1617 sql_help.c:1619 sql_help.c:1621
-#: sql_help.c:1624 sql_help.c:1626 sql_help.c:1629 sql_help.c:1632
-#: sql_help.c:1683 sql_help.c:1726 sql_help.c:1729 sql_help.c:1731
-#: sql_help.c:1733 sql_help.c:1736 sql_help.c:1738 sql_help.c:1740
-#: sql_help.c:1743 sql_help.c:1793 sql_help.c:1809 sql_help.c:2044
-#: sql_help.c:2113 sql_help.c:2132 sql_help.c:2145 sql_help.c:2203
-#: sql_help.c:2211 sql_help.c:2221 sql_help.c:2249 sql_help.c:2282
-#: sql_help.c:2300 sql_help.c:2328 sql_help.c:2451 sql_help.c:2497
-#: sql_help.c:2522 sql_help.c:2545 sql_help.c:2549 sql_help.c:2583
-#: sql_help.c:2603 sql_help.c:2625 sql_help.c:2639 sql_help.c:2660
-#: sql_help.c:2689 sql_help.c:2722 sql_help.c:2745 sql_help.c:2794
-#: sql_help.c:3098 sql_help.c:3111 sql_help.c:3128 sql_help.c:3144
-#: sql_help.c:3184 sql_help.c:3238 sql_help.c:3242 sql_help.c:3244
-#: sql_help.c:3251 sql_help.c:3270 sql_help.c:3297 sql_help.c:3332
-#: sql_help.c:3344 sql_help.c:3353 sql_help.c:3399 sql_help.c:3413
-#: sql_help.c:3441 sql_help.c:3449 sql_help.c:3461 sql_help.c:3471
-#: sql_help.c:3479 sql_help.c:3487 sql_help.c:3495 sql_help.c:3503
-#: sql_help.c:3512 sql_help.c:3523 sql_help.c:3531 sql_help.c:3539
-#: sql_help.c:3547 sql_help.c:3555 sql_help.c:3565 sql_help.c:3574
-#: sql_help.c:3583 sql_help.c:3591 sql_help.c:3601 sql_help.c:3612
-#: sql_help.c:3620 sql_help.c:3629 sql_help.c:3640 sql_help.c:3649
-#: sql_help.c:3657 sql_help.c:3665 sql_help.c:3673 sql_help.c:3681
-#: sql_help.c:3689 sql_help.c:3697 sql_help.c:3705 sql_help.c:3713
-#: sql_help.c:3721 sql_help.c:3729 sql_help.c:3746 sql_help.c:3755
-#: sql_help.c:3763 sql_help.c:3780 sql_help.c:3795 sql_help.c:4110
-#: sql_help.c:4233 sql_help.c:4262 sql_help.c:4278 sql_help.c:4280
-#: sql_help.c:4784 sql_help.c:4832 sql_help.c:4991
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "Name"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1886
-#: sql_help.c:3414 sql_help.c:4551
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "Aggregatsignatur"
 
 #: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
 #: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
 #: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
-#: sql_help.c:849 sql_help.c:888 sql_help.c:938 sql_help.c:985 sql_help.c:1038
-#: sql_help.c:1070 sql_help.c:1080 sql_help.c:1116 sql_help.c:1136
-#: sql_help.c:1150 sql_help.c:1200 sql_help.c:1350 sql_help.c:1488
-#: sql_help.c:1531 sql_help.c:1552 sql_help.c:1566 sql_help.c:1578
-#: sql_help.c:1591 sql_help.c:1618 sql_help.c:1684 sql_help.c:1737
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "neuer_Name"
 
 #: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
 #: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
 #: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
-#: sql_help.c:893 sql_help.c:936 sql_help.c:1043 sql_help.c:1082
-#: sql_help.c:1114 sql_help.c:1134 sql_help.c:1148 sql_help.c:1198
-#: sql_help.c:1417 sql_help.c:1490 sql_help.c:1533 sql_help.c:1554
-#: sql_help.c:1616 sql_help.c:1732 sql_help.c:3084
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "neuer_Eigentümer"
 
 #: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
 #: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
-#: sql_help.c:834 sql_help.c:898 sql_help.c:1048 sql_help.c:1118
-#: sql_help.c:1152 sql_help.c:1352 sql_help.c:1535 sql_help.c:1556
-#: sql_help.c:1568 sql_help.c:1580 sql_help.c:1620 sql_help.c:1739
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "neues_Schema"
 
-#: sql_help.c:44 sql_help.c:1950 sql_help.c:3415 sql_help.c:4580
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "wobei Aggregatsignatur Folgendes ist:"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
 #: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
 #: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
-#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1030
-#: sql_help.c:1035 sql_help.c:1040 sql_help.c:1045 sql_help.c:1050
-#: sql_help.c:1904 sql_help.c:1921 sql_help.c:1927 sql_help.c:1951
-#: sql_help.c:1954 sql_help.c:1957 sql_help.c:2114 sql_help.c:2133
-#: sql_help.c:2136 sql_help.c:2452 sql_help.c:2661 sql_help.c:3416
-#: sql_help.c:3419 sql_help.c:3422 sql_help.c:3513 sql_help.c:3602
-#: sql_help.c:3630 sql_help.c:3983 sql_help.c:4450 sql_help.c:4557
-#: sql_help.c:4564 sql_help.c:4570 sql_help.c:4581 sql_help.c:4584
-#: sql_help.c:4587
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "Argmodus"
 
 #: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
 #: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
 #: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
-#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1031
-#: sql_help.c:1036 sql_help.c:1041 sql_help.c:1046 sql_help.c:1051
-#: sql_help.c:1905 sql_help.c:1922 sql_help.c:1928 sql_help.c:1952
-#: sql_help.c:1955 sql_help.c:1958 sql_help.c:2115 sql_help.c:2134
-#: sql_help.c:2137 sql_help.c:2453 sql_help.c:2662 sql_help.c:3417
-#: sql_help.c:3420 sql_help.c:3423 sql_help.c:3514 sql_help.c:3603
-#: sql_help.c:3631 sql_help.c:4558 sql_help.c:4565 sql_help.c:4571
-#: sql_help.c:4582 sql_help.c:4585 sql_help.c:4588
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "Argname"
 
 #: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
 #: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
 #: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
-#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1032
-#: sql_help.c:1037 sql_help.c:1042 sql_help.c:1047 sql_help.c:1052
-#: sql_help.c:1906 sql_help.c:1923 sql_help.c:1929 sql_help.c:1953
-#: sql_help.c:1956 sql_help.c:1959 sql_help.c:2454 sql_help.c:2663
-#: sql_help.c:3418 sql_help.c:3421 sql_help.c:3424 sql_help.c:3515
-#: sql_help.c:3604 sql_help.c:3632 sql_help.c:4559 sql_help.c:4566
-#: sql_help.c:4572 sql_help.c:4583 sql_help.c:4586 sql_help.c:4589
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "Argtyp"
 
-#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:979
-#: sql_help.c:1131 sql_help.c:1549 sql_help.c:1678 sql_help.c:1710
-#: sql_help.c:1762 sql_help.c:1821 sql_help.c:2011 sql_help.c:2018
-#: sql_help.c:2331 sql_help.c:2389 sql_help.c:2398 sql_help.c:2407
-#: sql_help.c:2498 sql_help.c:2723 sql_help.c:2816 sql_help.c:3113
-#: sql_help.c:3298 sql_help.c:3320 sql_help.c:3462 sql_help.c:3819
-#: sql_help.c:4027 sql_help.c:4277 sql_help.c:4279 sql_help.c:5059
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "Option"
 
-#: sql_help.c:115 sql_help.c:980 sql_help.c:1679 sql_help.c:2499
-#: sql_help.c:2724 sql_help.c:3299 sql_help.c:3463
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "wobei Option Folgendes sein kann:"
 
-#: sql_help.c:116 sql_help.c:2263
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:117 sql_help.c:981 sql_help.c:1680 sql_help.c:2264
-#: sql_help.c:2500 sql_help.c:2725 sql_help.c:3300
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "Verbindungslimit"
 
-#: sql_help.c:118 sql_help.c:2265
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "istemplate"
 
-#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1355
-#: sql_help.c:1410 sql_help.c:4283
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "neuer_Tablespace"
 
 #: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
-#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:988
-#: sql_help.c:992 sql_help.c:995 sql_help.c:1057 sql_help.c:1059
-#: sql_help.c:1060 sql_help.c:1211 sql_help.c:1213 sql_help.c:1687
-#: sql_help.c:1691 sql_help.c:1694 sql_help.c:2464 sql_help.c:2667
-#: sql_help.c:3995 sql_help.c:4301 sql_help.c:4462 sql_help.c:4772
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "Konfigurationsparameter"
 
 #: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
 #: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
-#: sql_help.c:934 sql_help.c:989 sql_help.c:1058 sql_help.c:1132
-#: sql_help.c:1177 sql_help.c:1181 sql_help.c:1185 sql_help.c:1188
-#: sql_help.c:1193 sql_help.c:1196 sql_help.c:1212 sql_help.c:1388
-#: sql_help.c:1412 sql_help.c:1465 sql_help.c:1473 sql_help.c:1493
-#: sql_help.c:1550 sql_help.c:1634 sql_help.c:1688 sql_help.c:1711
-#: sql_help.c:2332 sql_help.c:2390 sql_help.c:2399 sql_help.c:2408
-#: sql_help.c:2465 sql_help.c:2466 sql_help.c:2530 sql_help.c:2533
-#: sql_help.c:2567 sql_help.c:2668 sql_help.c:2669 sql_help.c:2692
-#: sql_help.c:2817 sql_help.c:2856 sql_help.c:2967 sql_help.c:2980
-#: sql_help.c:2994 sql_help.c:3040 sql_help.c:3048 sql_help.c:3070
-#: sql_help.c:3087 sql_help.c:3114 sql_help.c:3321 sql_help.c:4028
-#: sql_help.c:4773 sql_help.c:4774 sql_help.c:4775 sql_help.c:4776
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "Wert"
 
@@ -4611,10 +4636,10 @@ msgstr "Wert"
 msgid "target_role"
 msgstr "Zielrolle"
 
-#: sql_help.c:215 sql_help.c:943 sql_help.c:2316 sql_help.c:2697
-#: sql_help.c:2770 sql_help.c:2775 sql_help.c:3958 sql_help.c:3967
-#: sql_help.c:3986 sql_help.c:3998 sql_help.c:4425 sql_help.c:4434
-#: sql_help.c:4453 sql_help.c:4465
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "Schemaname"
 
@@ -4629,57 +4654,57 @@ msgstr "wobei abgekürztes_Grant_oder_Revoke Folgendes sein kann:"
 #: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
 #: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
 #: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
-#: sql_help.c:852 sql_help.c:999 sql_help.c:1354 sql_help.c:1698
-#: sql_help.c:2503 sql_help.c:2504 sql_help.c:2505 sql_help.c:2506
-#: sql_help.c:2507 sql_help.c:2641 sql_help.c:2728 sql_help.c:2729
-#: sql_help.c:2730 sql_help.c:3303 sql_help.c:3304 sql_help.c:3305
-#: sql_help.c:3306 sql_help.c:3307 sql_help.c:4007 sql_help.c:4011
-#: sql_help.c:4474 sql_help.c:4478 sql_help.c:4794
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "Rollenname"
 
-#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:942 sql_help.c:1370
-#: sql_help.c:1372 sql_help.c:1376 sql_help.c:1427 sql_help.c:1439
-#: sql_help.c:1469 sql_help.c:1728 sql_help.c:2285 sql_help.c:2289
-#: sql_help.c:2411 sql_help.c:2417 sql_help.c:2526 sql_help.c:2696
-#: sql_help.c:2833 sql_help.c:2838 sql_help.c:2840 sql_help.c:2962
-#: sql_help.c:2975 sql_help.c:2989 sql_help.c:2998 sql_help.c:3010
-#: sql_help.c:3044 sql_help.c:4060 sql_help.c:4076 sql_help.c:4078
-#: sql_help.c:4176 sql_help.c:4179 sql_help.c:4181 sql_help.c:4644
-#: sql_help.c:4645 sql_help.c:4654 sql_help.c:4701 sql_help.c:4702
-#: sql_help.c:4703 sql_help.c:4704 sql_help.c:4705 sql_help.c:4706
-#: sql_help.c:4747 sql_help.c:4748 sql_help.c:4753 sql_help.c:4758
-#: sql_help.c:4902 sql_help.c:4903 sql_help.c:4912 sql_help.c:4959
-#: sql_help.c:4960 sql_help.c:4961 sql_help.c:4962 sql_help.c:4963
-#: sql_help.c:4964 sql_help.c:5020 sql_help.c:5022 sql_help.c:5089
-#: sql_help.c:5149 sql_help.c:5150 sql_help.c:5159 sql_help.c:5206
-#: sql_help.c:5207 sql_help.c:5208 sql_help.c:5209 sql_help.c:5210
-#: sql_help.c:5211
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "Ausdruck"
 
-#: sql_help.c:263 sql_help.c:2286
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "Domänen-Constraint"
 
 #: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
-#: sql_help.c:502 sql_help.c:1347 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:1398 sql_help.c:1399 sql_help.c:1426 sql_help.c:1438
-#: sql_help.c:1460 sql_help.c:1892 sql_help.c:1894 sql_help.c:2288
-#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2997 sql_help.c:3009
-#: sql_help.c:4073
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "Constraint-Name"
 
-#: sql_help.c:268 sql_help.c:1348
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "neuer_Constraint-Name"
 
-#: sql_help.c:277 sql_help.c:2287
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "wobei Domänen-Constraint Folgendes ist:"
 
-#: sql_help.c:344 sql_help.c:1130
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "neue_Version"
 
@@ -4695,82 +4720,82 @@ msgstr "wobei Elementobjekt Folgendes ist:"
 #: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
 #: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
 #: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
-#: sql_help.c:395 sql_help.c:1884 sql_help.c:1889 sql_help.c:1896
-#: sql_help.c:1897 sql_help.c:1898 sql_help.c:1899 sql_help.c:1900
-#: sql_help.c:1901 sql_help.c:1902 sql_help.c:1907 sql_help.c:1909
-#: sql_help.c:1913 sql_help.c:1915 sql_help.c:1919 sql_help.c:1924
-#: sql_help.c:1925 sql_help.c:1932 sql_help.c:1933 sql_help.c:1934
-#: sql_help.c:1935 sql_help.c:1936 sql_help.c:1937 sql_help.c:1938
-#: sql_help.c:1939 sql_help.c:1940 sql_help.c:1941 sql_help.c:1942
-#: sql_help.c:1947 sql_help.c:1948 sql_help.c:4547 sql_help.c:4552
-#: sql_help.c:4553 sql_help.c:4554 sql_help.c:4555 sql_help.c:4561
-#: sql_help.c:4562 sql_help.c:4567 sql_help.c:4568 sql_help.c:4573
-#: sql_help.c:4574 sql_help.c:4575 sql_help.c:4576 sql_help.c:4577
-#: sql_help.c:4578
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "Objektname"
 
-#: sql_help.c:353 sql_help.c:1885 sql_help.c:4550
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "Aggregatname"
 
-#: sql_help.c:355 sql_help.c:1887 sql_help.c:2179 sql_help.c:2183
-#: sql_help.c:2185 sql_help.c:3432
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "Quelltyp"
 
-#: sql_help.c:356 sql_help.c:1888 sql_help.c:2180 sql_help.c:2184
-#: sql_help.c:2186 sql_help.c:3433
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "Zieltyp"
 
-#: sql_help.c:363 sql_help.c:816 sql_help.c:1903 sql_help.c:2181
-#: sql_help.c:2224 sql_help.c:2304 sql_help.c:2584 sql_help.c:2615
-#: sql_help.c:3190 sql_help.c:4449 sql_help.c:4556 sql_help.c:4673
-#: sql_help.c:4677 sql_help.c:4681 sql_help.c:4684 sql_help.c:4931
-#: sql_help.c:4935 sql_help.c:4939 sql_help.c:4942 sql_help.c:5178
-#: sql_help.c:5182 sql_help.c:5186 sql_help.c:5189
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "Funktionsname"
 
-#: sql_help.c:368 sql_help.c:809 sql_help.c:1910 sql_help.c:2608
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "Operatorname"
 
-#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1911
-#: sql_help.c:2585 sql_help.c:3556
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "linker_Typ"
 
-#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1912
-#: sql_help.c:2586 sql_help.c:3557
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "rechter_Typ"
 
 #: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
 #: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
-#: sql_help.c:1447 sql_help.c:1914 sql_help.c:1916 sql_help.c:2605
-#: sql_help.c:2626 sql_help.c:3018 sql_help.c:3566 sql_help.c:3575
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "Indexmethode"
 
-#: sql_help.c:376 sql_help.c:1920 sql_help.c:4563
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "Prozedurname"
 
-#: sql_help.c:380 sql_help.c:1926 sql_help.c:3982 sql_help.c:4569
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "Routinenname"
 
-#: sql_help.c:392 sql_help.c:1416 sql_help.c:1943 sql_help.c:2460
-#: sql_help.c:2666 sql_help.c:2970 sql_help.c:3157 sql_help.c:3737
-#: sql_help.c:4004 sql_help.c:4471
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "Typname"
 
-#: sql_help.c:393 sql_help.c:1944 sql_help.c:2459 sql_help.c:2665
-#: sql_help.c:3158 sql_help.c:3390 sql_help.c:3738 sql_help.c:3989
-#: sql_help.c:4456
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "Sprachname"
 
@@ -4778,149 +4803,149 @@ msgstr "Sprachname"
 msgid "and aggregate_signature is:"
 msgstr "und Aggregatsignatur Folgendes ist:"
 
-#: sql_help.c:419 sql_help.c:2046 sql_help.c:2329
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "Handler-Funktion"
 
-#: sql_help.c:420 sql_help.c:2330
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "Validator-Funktion"
 
-#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1033
-#: sql_help.c:1342 sql_help.c:1625
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "Aktion"
 
 #: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
 #: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
 #: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
-#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:941 sql_help.c:1111
-#: sql_help.c:1344 sql_help.c:1362 sql_help.c:1366 sql_help.c:1367
-#: sql_help.c:1371 sql_help.c:1373 sql_help.c:1374 sql_help.c:1375
-#: sql_help.c:1377 sql_help.c:1378 sql_help.c:1380 sql_help.c:1383
-#: sql_help.c:1384 sql_help.c:1386 sql_help.c:1389 sql_help.c:1391
-#: sql_help.c:1392 sql_help.c:1440 sql_help.c:1441 sql_help.c:1442
-#: sql_help.c:1444 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1463 sql_help.c:1468 sql_help.c:1475 sql_help.c:1476
-#: sql_help.c:1727 sql_help.c:1730 sql_help.c:1734 sql_help.c:1770
-#: sql_help.c:1891 sql_help.c:2008 sql_help.c:2014 sql_help.c:2028
-#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2387 sql_help.c:2402
-#: sql_help.c:2416 sql_help.c:2457 sql_help.c:2525 sql_help.c:2531
-#: sql_help.c:2564 sql_help.c:2695 sql_help.c:2802 sql_help.c:2837
-#: sql_help.c:2839 sql_help.c:2952 sql_help.c:2961 sql_help.c:2971
-#: sql_help.c:2974 sql_help.c:2984 sql_help.c:2988 sql_help.c:3011
-#: sql_help.c:3012 sql_help.c:3013 sql_help.c:3015 sql_help.c:3016
-#: sql_help.c:3023 sql_help.c:3024 sql_help.c:3038 sql_help.c:3043
-#: sql_help.c:3050 sql_help.c:3051 sql_help.c:3067 sql_help.c:3193
-#: sql_help.c:3333 sql_help.c:3961 sql_help.c:3962 sql_help.c:4059
-#: sql_help.c:4075 sql_help.c:4077 sql_help.c:4079 sql_help.c:4175
-#: sql_help.c:4178 sql_help.c:4180 sql_help.c:4182 sql_help.c:4428
-#: sql_help.c:4429 sql_help.c:4549 sql_help.c:4710 sql_help.c:4717
-#: sql_help.c:4719 sql_help.c:4968 sql_help.c:4975 sql_help.c:4977
-#: sql_help.c:5019 sql_help.c:5021 sql_help.c:5023 sql_help.c:5077
-#: sql_help.c:5215 sql_help.c:5222 sql_help.c:5224
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "Spaltenname"
 
-#: sql_help.c:471 sql_help.c:696 sql_help.c:1345 sql_help.c:1735
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "neuer_Spaltenname"
 
-#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1054
-#: sql_help.c:1361 sql_help.c:1635
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "wobei Aktion Folgendes sein kann:"
 
-#: sql_help.c:478 sql_help.c:483 sql_help.c:1103 sql_help.c:1363
-#: sql_help.c:1368 sql_help.c:1637 sql_help.c:1641 sql_help.c:2283
-#: sql_help.c:2388 sql_help.c:2604 sql_help.c:2795 sql_help.c:2953
-#: sql_help.c:3240 sql_help.c:4234
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "Datentyp"
 
-#: sql_help.c:479 sql_help.c:484 sql_help.c:1364 sql_help.c:1369
-#: sql_help.c:1470 sql_help.c:1638 sql_help.c:1642 sql_help.c:2284
-#: sql_help.c:2391 sql_help.c:2527 sql_help.c:2955 sql_help.c:2963
-#: sql_help.c:2976 sql_help.c:2990 sql_help.c:3045 sql_help.c:3241
-#: sql_help.c:3247 sql_help.c:4070
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "Sortierfolge"
 
-#: sql_help.c:480 sql_help.c:1365 sql_help.c:2392 sql_help.c:2403
-#: sql_help.c:2956 sql_help.c:2972 sql_help.c:2985
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "Spalten-Constraint"
 
-#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1385 sql_help.c:5071
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "ganze_Zahl"
 
-#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1387
-#: sql_help.c:1390
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "Attributoption"
 
-#: sql_help.c:500 sql_help.c:1394 sql_help.c:2393 sql_help.c:2404
-#: sql_help.c:2957 sql_help.c:2973 sql_help.c:2986
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "Tabellen-Constraint"
 
-#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1400
-#: sql_help.c:1401 sql_help.c:1402 sql_help.c:1403 sql_help.c:1945
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "Triggername"
 
-#: sql_help.c:507 sql_help.c:508 sql_help.c:1414 sql_help.c:1415
-#: sql_help.c:2396 sql_help.c:2401 sql_help.c:2960 sql_help.c:2983
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "Elterntabelle"
 
-#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1053
-#: sql_help.c:1594 sql_help.c:2315
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "Erweiterungsname"
 
-#: sql_help.c:569 sql_help.c:1055 sql_help.c:2461
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "Ausführungskosten"
 
-#: sql_help.c:570 sql_help.c:1056 sql_help.c:2462
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "Ergebniszeilen"
 
-#: sql_help.c:571 sql_help.c:2463
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "Support-Funktion"
 
-#: sql_help.c:593 sql_help.c:595 sql_help.c:978 sql_help.c:986 sql_help.c:990
-#: sql_help.c:993 sql_help.c:996 sql_help.c:1677 sql_help.c:1685
-#: sql_help.c:1689 sql_help.c:1692 sql_help.c:1695 sql_help.c:2771
-#: sql_help.c:2773 sql_help.c:2776 sql_help.c:2777 sql_help.c:3959
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:3965 sql_help.c:3968
-#: sql_help.c:3969 sql_help.c:3971 sql_help.c:3972 sql_help.c:3974
-#: sql_help.c:3975 sql_help.c:3977 sql_help.c:3978 sql_help.c:3980
-#: sql_help.c:3981 sql_help.c:3987 sql_help.c:3988 sql_help.c:3990
-#: sql_help.c:3991 sql_help.c:3993 sql_help.c:3994 sql_help.c:3996
-#: sql_help.c:3997 sql_help.c:3999 sql_help.c:4000 sql_help.c:4002
-#: sql_help.c:4003 sql_help.c:4005 sql_help.c:4006 sql_help.c:4008
-#: sql_help.c:4009 sql_help.c:4426 sql_help.c:4427 sql_help.c:4431
-#: sql_help.c:4432 sql_help.c:4435 sql_help.c:4436 sql_help.c:4438
-#: sql_help.c:4439 sql_help.c:4441 sql_help.c:4442 sql_help.c:4444
-#: sql_help.c:4445 sql_help.c:4447 sql_help.c:4448 sql_help.c:4454
-#: sql_help.c:4455 sql_help.c:4457 sql_help.c:4458 sql_help.c:4460
-#: sql_help.c:4461 sql_help.c:4463 sql_help.c:4464 sql_help.c:4466
-#: sql_help.c:4467 sql_help.c:4469 sql_help.c:4470 sql_help.c:4472
-#: sql_help.c:4473 sql_help.c:4475 sql_help.c:4476
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "Rollenangabe"
 
-#: sql_help.c:594 sql_help.c:596 sql_help.c:1708 sql_help.c:2250
-#: sql_help.c:2779 sql_help.c:3318 sql_help.c:3771 sql_help.c:4804
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "Benutzername"
 
-#: sql_help.c:597 sql_help.c:998 sql_help.c:1697 sql_help.c:2778
-#: sql_help.c:4010 sql_help.c:4477
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "wobei Rollenangabe Folgendes sein kann:"
 
@@ -4928,22 +4953,22 @@ msgstr "wobei Rollenangabe Folgendes sein kann:"
 msgid "group_name"
 msgstr "Gruppenname"
 
-#: sql_help.c:620 sql_help.c:1466 sql_help.c:2262 sql_help.c:2534
-#: sql_help.c:2568 sql_help.c:2968 sql_help.c:2981 sql_help.c:2995
-#: sql_help.c:3041 sql_help.c:3071 sql_help.c:3083 sql_help.c:4001
-#: sql_help.c:4468
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "Tablespace-Name"
 
-#: sql_help.c:622 sql_help.c:715 sql_help.c:1408 sql_help.c:1418
-#: sql_help.c:1461 sql_help.c:1823
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "Indexname"
 
-#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1411
-#: sql_help.c:1413 sql_help.c:1464 sql_help.c:2532 sql_help.c:2566
-#: sql_help.c:2966 sql_help.c:2979 sql_help.c:2993 sql_help.c:3039
-#: sql_help.c:3069
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "Storage-Parameter"
 
@@ -4951,1920 +4976,1924 @@ msgstr "Storage-Parameter"
 msgid "column_number"
 msgstr "Spaltennummer"
 
-#: sql_help.c:655 sql_help.c:1908 sql_help.c:4560
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:714 sql_help.c:1393 sql_help.c:2954
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "Kompressionsmethode"
 
-#: sql_help.c:716 sql_help.c:1409
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "neue_Zugriffsmethode"
 
-#: sql_help.c:753 sql_help.c:2589
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "Res-Funktion"
 
-#: sql_help.c:754 sql_help.c:2590
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "Join-Funktion"
 
-#: sql_help.c:755 sql_help.c:2587
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "Kommutator-Op"
 
-#: sql_help.c:756 sql_help.c:2588
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "Umkehrungs-Op"
 
-#: sql_help.c:808 sql_help.c:820 sql_help.c:2607
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "Strategienummer"
 
 #: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
-#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2609 sql_help.c:2610
-#: sql_help.c:2613 sql_help.c:2614
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "Optyp"
 
-#: sql_help.c:812 sql_help.c:2611
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "Sortierfamilienname"
 
-#: sql_help.c:813 sql_help.c:823 sql_help.c:2612
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "Unterst-Nummer"
 
-#: sql_help.c:817 sql_help.c:2182 sql_help.c:2616 sql_help.c:3160
-#: sql_help.c:3162
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "Argumenttyp"
 
-#: sql_help.c:848 sql_help.c:851 sql_help.c:940 sql_help.c:1069 sql_help.c:1110
-#: sql_help.c:1590 sql_help.c:1593 sql_help.c:1769 sql_help.c:1822
-#: sql_help.c:1893 sql_help.c:1918 sql_help.c:1931 sql_help.c:1946
-#: sql_help.c:2007 sql_help.c:2013 sql_help.c:2386 sql_help.c:2400
-#: sql_help.c:2523 sql_help.c:2563 sql_help.c:2640 sql_help.c:2694
-#: sql_help.c:2747 sql_help.c:2801 sql_help.c:2834 sql_help.c:2841
-#: sql_help.c:2951 sql_help.c:2969 sql_help.c:2982 sql_help.c:3066
-#: sql_help.c:3186 sql_help.c:3368 sql_help.c:3592 sql_help.c:3641
-#: sql_help.c:3747 sql_help.c:3957 sql_help.c:3963 sql_help.c:4024
-#: sql_help.c:4057 sql_help.c:4424 sql_help.c:4430 sql_help.c:4548
-#: sql_help.c:4661 sql_help.c:4724 sql_help.c:4763 sql_help.c:4919
-#: sql_help.c:4982 sql_help.c:5017 sql_help.c:5076 sql_help.c:5166
-#: sql_help.c:5229
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "Tabellenname"
 
-#: sql_help.c:853 sql_help.c:2642
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "Using-Ausdruck"
 
-#: sql_help.c:854 sql_help.c:2643
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "Check-Ausdruck"
 
-#: sql_help.c:927 sql_help.c:929 sql_help.c:931 sql_help.c:2690
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "Publikationsobjekt"
 
-#: sql_help.c:933 sql_help.c:2691
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "Publikations-Drop-Objekt"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "Publikationsparameter"
 
-#: sql_help.c:939 sql_help.c:2693
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "wobei Publikationsobjekt Folgendes sein kann:"
 
-#: sql_help.c:982 sql_help.c:1681 sql_help.c:2501 sql_help.c:2726
-#: sql_help.c:3301
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "Tabelle-und-Spalten"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "wobei Publikations-Drop-Objekt Folgendes sein kann:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "und Tabelle-und-Spalten Folgendes ist:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "Passwort"
 
-#: sql_help.c:983 sql_help.c:1682 sql_help.c:2502 sql_help.c:2727
-#: sql_help.c:3302
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "Zeit"
 
-#: sql_help.c:987 sql_help.c:991 sql_help.c:994 sql_help.c:997 sql_help.c:1686
-#: sql_help.c:1690 sql_help.c:1693 sql_help.c:1696 sql_help.c:3970
-#: sql_help.c:4437
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "Datenbankname"
 
-#: sql_help.c:1104 sql_help.c:2796
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "Inkrement"
 
-#: sql_help.c:1105 sql_help.c:2797
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "Minwert"
 
-#: sql_help.c:1106 sql_help.c:2798
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "Maxwert"
 
-#: sql_help.c:1107 sql_help.c:2799 sql_help.c:4657 sql_help.c:4761
-#: sql_help.c:4915 sql_help.c:5093 sql_help.c:5162
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "Start"
 
-#: sql_help.c:1108 sql_help.c:1382
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "Restart"
 
-#: sql_help.c:1109 sql_help.c:2800
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "Cache"
 
-#: sql_help.c:1154
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "neues_Ziel"
 
-#: sql_help.c:1173 sql_help.c:2853
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "Verbindungsinfo"
 
-#: sql_help.c:1175 sql_help.c:1179 sql_help.c:1183 sql_help.c:2854
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "Publikationsname"
 
-#: sql_help.c:1176 sql_help.c:1180 sql_help.c:1184
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "Publikationsoption"
 
-#: sql_help.c:1187
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "Refresh-Option"
 
-#: sql_help.c:1192 sql_help.c:2855
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "Subskriptionsparameter"
 
-#: sql_help.c:1195
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "Skip-Option"
 
-#: sql_help.c:1357 sql_help.c:1360
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "Partitionsname"
 
-#: sql_help.c:1358 sql_help.c:2405 sql_help.c:2987
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "Partitionsbegrenzungsangabe"
 
-#: sql_help.c:1379 sql_help.c:1430 sql_help.c:3001
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "Sequenzoptionen"
 
-#: sql_help.c:1381
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "Sequenzoption"
 
-#: sql_help.c:1395
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "Tabellen-Constraint-für-Index"
 
-#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1406 sql_help.c:1407
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:1419 sql_help.c:2419 sql_help.c:3031
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "und Partitionsbegrenzungsangabe Folgendes ist:"
 
-#: sql_help.c:1420 sql_help.c:1421 sql_help.c:1422 sql_help.c:2420
-#: sql_help.c:2421 sql_help.c:2422 sql_help.c:3032 sql_help.c:3033
-#: sql_help.c:3034
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "Partitionsbegrenzungsausdruck"
 
-#: sql_help.c:1423 sql_help.c:1424 sql_help.c:2423 sql_help.c:2424
-#: sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "numerische_Konstante"
 
-#: sql_help.c:1425
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "und Spalten-Constraint Folgendes ist:"
 
-#: sql_help.c:1428 sql_help.c:2412 sql_help.c:2455 sql_help.c:2664
-#: sql_help.c:2999
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "Vorgabeausdruck"
 
-#: sql_help.c:1429 sql_help.c:2413 sql_help.c:3000
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "Generierungsausdruck"
 
-#: sql_help.c:1431 sql_help.c:1432 sql_help.c:1443 sql_help.c:1446
-#: sql_help.c:1450 sql_help.c:3002 sql_help.c:3003 sql_help.c:3014
-#: sql_help.c:3017 sql_help.c:3021
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "Indexparameter"
 
-#: sql_help.c:1433 sql_help.c:1454 sql_help.c:3004 sql_help.c:3025
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "Reftabelle"
 
-#: sql_help.c:1434 sql_help.c:1455 sql_help.c:1456 sql_help.c:3005
-#: sql_help.c:3026 sql_help.c:3027
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "Refspalte"
 
-#: sql_help.c:1435 sql_help.c:1436 sql_help.c:1457 sql_help.c:1458
-#: sql_help.c:3006 sql_help.c:3007 sql_help.c:3028 sql_help.c:3029
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "Fremdschlüsselaktion"
 
-#: sql_help.c:1437 sql_help.c:2414 sql_help.c:3008
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "und Tabellen-Constraint Folgendes ist:"
 
-#: sql_help.c:1448 sql_help.c:3019
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "Exclude-Element"
 
-#: sql_help.c:1449 sql_help.c:3020 sql_help.c:4655 sql_help.c:4759
-#: sql_help.c:4913 sql_help.c:5091 sql_help.c:5160
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "Operator"
 
-#: sql_help.c:1451 sql_help.c:2535 sql_help.c:3022
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "Prädikat"
 
-#: sql_help.c:1459
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "und Tabellen-Constraint-für-Index Folgendes ist:"
 
-#: sql_help.c:1462 sql_help.c:3037
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "Indexparameter bei UNIQUE-, PRIMARY KEY- und EXCLUDE-Constraints sind:"
 
-#: sql_help.c:1467 sql_help.c:3042
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "Exclude-Element in einem EXCLUDE-Constraint ist:"
 
-#: sql_help.c:1471 sql_help.c:2528 sql_help.c:2964 sql_help.c:2977
-#: sql_help.c:2991 sql_help.c:3046 sql_help.c:4071
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "Opklasse"
 
-#: sql_help.c:1472 sql_help.c:2529 sql_help.c:3047
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "Opklassen-Parameter"
 
-#: sql_help.c:1474 sql_help.c:3049
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "Fremdschlüsselaktion in FOREIGN KEY/REFERENCES ist:"
 
-#: sql_help.c:1492 sql_help.c:1495 sql_help.c:3086
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "Tablespace-Option"
 
-#: sql_help.c:1516 sql_help.c:1519 sql_help.c:1525 sql_help.c:1529
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "Tokentyp"
 
-#: sql_help.c:1517 sql_help.c:1520
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "Wörterbuchname"
 
-#: sql_help.c:1522 sql_help.c:1526
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "altes_Wörterbuch"
 
-#: sql_help.c:1523 sql_help.c:1527
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "neues_Wörterbuch"
 
-#: sql_help.c:1622 sql_help.c:1636 sql_help.c:1639 sql_help.c:1640
-#: sql_help.c:3239
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "Attributname"
 
-#: sql_help.c:1623
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "neuer_Attributname"
 
-#: sql_help.c:1627 sql_help.c:1631
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "neuer_Enum-Wert"
 
-#: sql_help.c:1628
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "Nachbar-Enum-Wert"
 
-#: sql_help.c:1630
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "existierender_Enum-Wert"
 
-#: sql_help.c:1633
+#: sql_help.c:1647
 msgid "property"
 msgstr "Eigenschaft"
 
-#: sql_help.c:1709 sql_help.c:2397 sql_help.c:2406 sql_help.c:2812
-#: sql_help.c:3319 sql_help.c:3772 sql_help.c:3979 sql_help.c:4025
-#: sql_help.c:4446
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "Servername"
 
-#: sql_help.c:1741 sql_help.c:1744 sql_help.c:3334
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "Sichtoptionsname"
 
-#: sql_help.c:1742 sql_help.c:3335
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "Sichtoptionswert"
 
-#: sql_help.c:1763 sql_help.c:5060
-msgid "table_and_columns"
-msgstr "Tabelle-und-Spalten"
-
-#: sql_help.c:1764 sql_help.c:1824 sql_help.c:2019 sql_help.c:3821
-#: sql_help.c:4281 sql_help.c:5061
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "wobei Option eine der folgenden sein kann:"
 
-#: sql_help.c:1765 sql_help.c:1766 sql_help.c:1825 sql_help.c:2021
-#: sql_help.c:2025 sql_help.c:2208 sql_help.c:3822 sql_help.c:3823
-#: sql_help.c:3824 sql_help.c:3825 sql_help.c:3826 sql_help.c:3827
-#: sql_help.c:3828 sql_help.c:3829 sql_help.c:3830 sql_help.c:3831
-#: sql_help.c:4282 sql_help.c:4284 sql_help.c:5062 sql_help.c:5063
-#: sql_help.c:5064 sql_help.c:5065 sql_help.c:5066 sql_help.c:5067
-#: sql_help.c:5068 sql_help.c:5069 sql_help.c:5070 sql_help.c:5072
-#: sql_help.c:5073
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1767 sql_help.c:5074
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "Größe"
 
-#: sql_help.c:1768 sql_help.c:5075
-msgid "and table_and_columns is:"
-msgstr "und Tabelle-und-Spalten Folgendes ist:"
-
-#: sql_help.c:1784 sql_help.c:4820 sql_help.c:4822 sql_help.c:4846
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "Transaktionsmodus"
 
-#: sql_help.c:1785 sql_help.c:4823 sql_help.c:4847
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "wobei Transaktionsmodus Folgendes sein kann:"
 
-#: sql_help.c:1794 sql_help.c:4665 sql_help.c:4674 sql_help.c:4678
-#: sql_help.c:4682 sql_help.c:4685 sql_help.c:4923 sql_help.c:4932
-#: sql_help.c:4936 sql_help.c:4940 sql_help.c:4943 sql_help.c:5170
-#: sql_help.c:5179 sql_help.c:5183 sql_help.c:5187 sql_help.c:5190
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "Argument"
 
-#: sql_help.c:1890
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "Relationsname"
 
-#: sql_help.c:1895 sql_help.c:3973 sql_help.c:4440
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "Domänenname"
 
-#: sql_help.c:1917
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "Policy-Name"
 
-#: sql_help.c:1930
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:1949 sql_help.c:4579
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "Zeichenkettenkonstante"
 
-#: sql_help.c:1974 sql_help.c:4243 sql_help.c:4493
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "Transaktions-ID"
 
-#: sql_help.c:2009 sql_help.c:2016 sql_help.c:4097
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "Dateiname"
 
-#: sql_help.c:2010 sql_help.c:2017 sql_help.c:2749 sql_help.c:2750
-#: sql_help.c:2751
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "Befehl"
 
-#: sql_help.c:2012 sql_help.c:2748 sql_help.c:3189 sql_help.c:3371
-#: sql_help.c:4081 sql_help.c:4166 sql_help.c:4169 sql_help.c:4172
-#: sql_help.c:4648 sql_help.c:4650 sql_help.c:4752 sql_help.c:4754
-#: sql_help.c:4906 sql_help.c:4908 sql_help.c:5026 sql_help.c:5153
-#: sql_help.c:5155
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "Bedingung"
 
-#: sql_help.c:2015 sql_help.c:2569 sql_help.c:3072 sql_help.c:3336
-#: sql_help.c:3354 sql_help.c:4061
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "Anfrage"
 
-#: sql_help.c:2020
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "Formatname"
 
-#: sql_help.c:2022
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "Trennzeichen"
 
-#: sql_help.c:2023
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "Null-Zeichenkette"
 
-#: sql_help.c:2024
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "Vorgabewert-Zeichenkette"
 
-#: sql_help.c:2026
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "Quote-Zeichen"
 
-#: sql_help.c:2027
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "Escape-Zeichen"
 
-#: sql_help.c:2031
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "Fehleraktion"
 
-#: sql_help.c:2032
-#, fuzzy
-#| msgid "syntax error"
+#: sql_help.c:2046
 msgid "maxerror"
-msgstr "Syntaxfehler"
+msgstr "Max-Fehler"
 
-#: sql_help.c:2033
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "Kodierungsname"
 
-#: sql_help.c:2034
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "Verbose-Modus"
 
-#: sql_help.c:2045
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "Zugriffsmethodentyp"
 
-#: sql_help.c:2116 sql_help.c:2135 sql_help.c:2138
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "Arg-Datentyp"
 
-#: sql_help.c:2117 sql_help.c:2139 sql_help.c:2147
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "Übergangsfunktion"
 
-#: sql_help.c:2118 sql_help.c:2140 sql_help.c:2148
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "Zustandsdatentyp"
 
-#: sql_help.c:2119 sql_help.c:2141 sql_help.c:2149
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "Zustandsdatengröße"
 
-#: sql_help.c:2120 sql_help.c:2142 sql_help.c:2150
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "Abschlussfunktion"
 
-#: sql_help.c:2121 sql_help.c:2151
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "Combine-Funktion"
 
-#: sql_help.c:2122 sql_help.c:2152
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "Serialisierungsfunktion"
 
-#: sql_help.c:2123 sql_help.c:2153
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "Deserialisierungsfunktion"
 
-#: sql_help.c:2124 sql_help.c:2143 sql_help.c:2154
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "Anfangswert"
 
-#: sql_help.c:2125 sql_help.c:2155
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "Moving-Übergangsfunktion"
 
-#: sql_help.c:2126 sql_help.c:2156
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "Moving-Inversfunktion"
 
-#: sql_help.c:2127 sql_help.c:2157
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "Moving-Zustandsdatentyp"
 
-#: sql_help.c:2128 sql_help.c:2158
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "Moving-Zustandsdatengröße"
 
-#: sql_help.c:2129 sql_help.c:2159
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "Moving-Abschlussfunktion"
 
-#: sql_help.c:2130 sql_help.c:2160
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "Moving-Anfangswert"
 
-#: sql_help.c:2131 sql_help.c:2161
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "Sortieroperator"
 
-#: sql_help.c:2144
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "oder die alte Syntax"
 
-#: sql_help.c:2146
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "Basistyp"
 
-#: sql_help.c:2204 sql_help.c:2254
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "Locale"
 
-#: sql_help.c:2205 sql_help.c:2255
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2206 sql_help.c:2256
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2207 sql_help.c:4546
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "Provider"
 
-#: sql_help.c:2209
+#: sql_help.c:2223
 msgid "rules"
 msgstr "Regeln"
 
-#: sql_help.c:2210 sql_help.c:2317
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "Version"
 
-#: sql_help.c:2212
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "existierende_Sortierfolge"
 
-#: sql_help.c:2222
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "Quellkodierung"
 
-#: sql_help.c:2223
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "Zielkodierung"
 
-#: sql_help.c:2251 sql_help.c:3112
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "Vorlage"
 
-#: sql_help.c:2252
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "Kodierung"
 
-#: sql_help.c:2253
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "Strategie"
 
-#: sql_help.c:2257
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "Builtin-Locale"
 
-#: sql_help.c:2258
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "ICU-Locale"
 
-#: sql_help.c:2259
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "ICU-Regeln"
 
-#: sql_help.c:2260
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "Locale-Provider"
 
-#: sql_help.c:2261
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "Sortierfolgenversion"
 
-#: sql_help.c:2266
+#: sql_help.c:2280
 msgid "oid"
 msgstr "OID"
 
-#: sql_help.c:2301 sql_help.c:2746 sql_help.c:3185
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "Ereignis"
 
-#: sql_help.c:2302
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "Filtervariable"
 
-#: sql_help.c:2303
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "Filterwert"
 
-#: sql_help.c:2394 sql_help.c:2958
+#: sql_help.c:2408 sql_help.c:2978
 msgid "source_table"
 msgstr "Quelltabelle"
 
-#: sql_help.c:2395 sql_help.c:2959
+#: sql_help.c:2409 sql_help.c:2979
 msgid "like_option"
 msgstr "Like-Option"
 
-#: sql_help.c:2409 sql_help.c:2996
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "wobei Spalten-Constraint Folgendes ist:"
 
-#: sql_help.c:2418 sql_help.c:3030
+#: sql_help.c:2432 sql_help.c:3050
 msgid "and like_option is:"
 msgstr "und Like-Option Folgendes ist:"
 
-#: sql_help.c:2456
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "Rückgabetyp"
 
-#: sql_help.c:2458
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "Spaltentyp"
 
-#: sql_help.c:2467 sql_help.c:2670
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "Definition"
 
-#: sql_help.c:2468 sql_help.c:2671
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "Objektdatei"
 
-#: sql_help.c:2469 sql_help.c:2672
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "Linksymbol"
 
-#: sql_help.c:2470 sql_help.c:2673
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "SQL-Rumpf"
 
-#: sql_help.c:2508 sql_help.c:2731 sql_help.c:3308
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "Uid"
 
-#: sql_help.c:2524 sql_help.c:2565 sql_help.c:2965 sql_help.c:2978
-#: sql_help.c:2992 sql_help.c:3068
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "Methode"
 
-#: sql_help.c:2546
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "Handler"
 
-#: sql_help.c:2547
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "Inline-Handler"
 
-#: sql_help.c:2548
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "Valfunktion"
 
-#: sql_help.c:2606
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "Familienname"
 
-#: sql_help.c:2617
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "Storage-Typ"
 
-#: sql_help.c:2752 sql_help.c:3192
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "wobei Ereignis eins der folgenden sein kann:"
 
-#: sql_help.c:2772 sql_help.c:2774
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "Schemaelement"
 
-#: sql_help.c:2813
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "Servertyp"
 
-#: sql_help.c:2814
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "Serverversion"
 
-#: sql_help.c:2815 sql_help.c:3976 sql_help.c:4443
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "FDW-Name"
 
-#: sql_help.c:2832 sql_help.c:2835
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "Statistikname"
 
-#: sql_help.c:2836
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "Statistikart"
 
-#: sql_help.c:2852
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "Subskriptionsname"
 
-#: sql_help.c:3085
+#: sql_help.c:3105
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: sql_help.c:3099
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "Parser-Name"
 
-#: sql_help.c:3100
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "Quellkonfig"
 
-#: sql_help.c:3129
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "Startfunktion"
 
-#: sql_help.c:3130
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "Gettext-Funktion"
 
-#: sql_help.c:3131
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "Endfunktion"
 
-#: sql_help.c:3132
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "Lextypenfunktion"
 
-#: sql_help.c:3133
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "Headline-Funktion"
 
-#: sql_help.c:3145
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "Init-Funktion"
 
-#: sql_help.c:3146
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "Lexize-Funktion"
 
-#: sql_help.c:3159
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "From-SQL-Funktionsname"
 
-#: sql_help.c:3161
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "To-SQL-Funktionsname"
 
-#: sql_help.c:3187
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "verwiesener_Tabellenname"
 
-#: sql_help.c:3188
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "Übergangsrelationsname"
 
-#: sql_help.c:3191
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "Argumente"
 
-#: sql_help.c:3243
+#: sql_help.c:3263
 msgid "label"
 msgstr "Label"
 
-#: sql_help.c:3245
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "Untertyp"
 
-#: sql_help.c:3246
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "Untertyp-Operatorklasse"
 
-#: sql_help.c:3248
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "Canonical-Funktion"
 
-#: sql_help.c:3249
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "Untertyp-Diff-Funktion"
 
-#: sql_help.c:3250
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "Multirange-Typname"
 
-#: sql_help.c:3252
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "Eingabefunktion"
 
-#: sql_help.c:3253
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "Ausgabefunktion"
 
-#: sql_help.c:3254
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "Empfangsfunktion"
 
-#: sql_help.c:3255
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "Sendefunktion"
 
-#: sql_help.c:3256
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "Typmod-Eingabefunktion"
 
-#: sql_help.c:3257
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "Typmod-Ausgabefunktion"
 
-#: sql_help.c:3258
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "Analyze-Funktion"
 
-#: sql_help.c:3259
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "Subscript-Funktion"
 
-#: sql_help.c:3260
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "interne_Länge"
 
-#: sql_help.c:3261
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "Ausrichtung"
 
-#: sql_help.c:3262
+#: sql_help.c:3282
 msgid "storage"
 msgstr "Speicherung"
 
-#: sql_help.c:3263
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "wie_Typ"
 
-#: sql_help.c:3264
+#: sql_help.c:3284
 msgid "category"
 msgstr "Kategorie"
 
-#: sql_help.c:3265
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "bevorzugt"
 
-#: sql_help.c:3266
+#: sql_help.c:3286
 msgid "default"
 msgstr "Vorgabewert"
 
-#: sql_help.c:3267
+#: sql_help.c:3287
 msgid "element"
 msgstr "Element"
 
-#: sql_help.c:3268
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "Trennzeichen"
 
-#: sql_help.c:3269
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "sortierbar"
 
-#: sql_help.c:3367 sql_help.c:4056 sql_help.c:4152 sql_help.c:4643
-#: sql_help.c:4746 sql_help.c:4901 sql_help.c:5016 sql_help.c:5148
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "With-Anfrage"
 
-#: sql_help.c:3369 sql_help.c:4058 sql_help.c:4662 sql_help.c:4668
-#: sql_help.c:4671 sql_help.c:4675 sql_help.c:4679 sql_help.c:4687
-#: sql_help.c:4920 sql_help.c:4926 sql_help.c:4929 sql_help.c:4933
-#: sql_help.c:4937 sql_help.c:4945 sql_help.c:5018 sql_help.c:5167
-#: sql_help.c:5173 sql_help.c:5176 sql_help.c:5180 sql_help.c:5184
-#: sql_help.c:5192
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "Alias"
 
-#: sql_help.c:3370 sql_help.c:4647 sql_help.c:4689 sql_help.c:4691
-#: sql_help.c:4695 sql_help.c:4697 sql_help.c:4698 sql_help.c:4699
-#: sql_help.c:4751 sql_help.c:4905 sql_help.c:4947 sql_help.c:4949
-#: sql_help.c:4953 sql_help.c:4955 sql_help.c:4956 sql_help.c:4957
-#: sql_help.c:5025 sql_help.c:5152 sql_help.c:5194 sql_help.c:5196
-#: sql_help.c:5200 sql_help.c:5202 sql_help.c:5203 sql_help.c:5204
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "From-Element"
 
-#: sql_help.c:3372 sql_help.c:3857 sql_help.c:4210 sql_help.c:5027
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "Cursor-Name"
 
-#: sql_help.c:3373 sql_help.c:4064 sql_help.c:4158 sql_help.c:5028
-#, fuzzy
-#| msgid "output_name"
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
 msgid "output_alias"
-msgstr "Ausgabename"
+msgstr "Ausgabealias"
 
-#: sql_help.c:3374 sql_help.c:4065 sql_help.c:4159 sql_help.c:5029
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "Ausgabeausdruck"
 
-#: sql_help.c:3375 sql_help.c:4066 sql_help.c:4160 sql_help.c:4646
-#: sql_help.c:4749 sql_help.c:4904 sql_help.c:5030 sql_help.c:5151
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "Ausgabename"
 
-#: sql_help.c:3391
+#: sql_help.c:3411
 msgid "code"
 msgstr "Code"
 
-#: sql_help.c:3796
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "Parameter"
 
-#: sql_help.c:3820 sql_help.c:4235
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "Anweisung"
 
-#: sql_help.c:3856 sql_help.c:4209
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "Richtung"
 
-#: sql_help.c:3858 sql_help.c:4211
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "wobei Richtung eine der folgenden sein kann:"
 
-#: sql_help.c:3859 sql_help.c:3860 sql_help.c:3861 sql_help.c:3862
-#: sql_help.c:3863 sql_help.c:4212 sql_help.c:4213 sql_help.c:4214
-#: sql_help.c:4215 sql_help.c:4216 sql_help.c:4656 sql_help.c:4658
-#: sql_help.c:4760 sql_help.c:4762 sql_help.c:4914 sql_help.c:4916
-#: sql_help.c:5092 sql_help.c:5094 sql_help.c:5161 sql_help.c:5163
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "Anzahl"
 
-#: sql_help.c:3966 sql_help.c:4433
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "Sequenzname"
 
-#: sql_help.c:3984 sql_help.c:4451
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "Argname"
 
-#: sql_help.c:3985 sql_help.c:4452
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "Argtyp"
 
-#: sql_help.c:3992 sql_help.c:4459
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:4023
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "fernes_Schema"
 
-#: sql_help.c:4026
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "lokales_Schema"
 
-#: sql_help.c:4062
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "Konfliktziel"
 
-#: sql_help.c:4063
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "Konfliktaktion"
 
-#: sql_help.c:4067
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "wobei Konfliktziel Folgendes sein kann:"
 
-#: sql_help.c:4068
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "Indexspaltenname"
 
-#: sql_help.c:4069
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "Indexausdruck"
 
-#: sql_help.c:4072
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "Indexprädikat"
 
-#: sql_help.c:4074
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "und Konfliktaktion Folgendes sein kann:"
 
-#: sql_help.c:4080 sql_help.c:4183 sql_help.c:5024
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "Sub-SELECT"
 
-#: sql_help.c:4089 sql_help.c:4224 sql_help.c:4999
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "Kanal"
 
-#: sql_help.c:4111
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "Sperrmodus"
 
-#: sql_help.c:4112
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "wobei Sperrmodus Folgendes sein kann:"
 
-#: sql_help.c:4153
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "Zieltabellenname"
 
-#: sql_help.c:4154
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "Zielalias"
 
-#: sql_help.c:4155
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "Datenquelle"
 
-#: sql_help.c:4156 sql_help.c:4692 sql_help.c:4950 sql_help.c:5197
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "Verbundbedingung"
 
-#: sql_help.c:4157
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "When-Klausel"
 
-#: sql_help.c:4161
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "wobei Datenquelle Folgendes ist:"
 
-#: sql_help.c:4162
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "Quelltabellenname"
 
-#: sql_help.c:4163
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "Quellanfrage"
 
-#: sql_help.c:4164
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "Quellalias"
 
-#: sql_help.c:4165
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "und When-Klausel Folgendes ist:"
 
-#: sql_help.c:4167 sql_help.c:4170
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "Merge-Update"
 
-#: sql_help.c:4168 sql_help.c:4171
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "Merge-Delete"
 
-#: sql_help.c:4173
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "Merge-Insert"
 
-#: sql_help.c:4174
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "und Merge-Insert Folgendes ist:"
 
-#: sql_help.c:4177
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "und Merge-Update Folgendes ist:"
 
-#: sql_help.c:4184
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "und Merge-Delete Folgendes ist:"
 
-#: sql_help.c:4225
+#: sql_help.c:4245
 msgid "payload"
 msgstr "Payload"
 
-#: sql_help.c:4252
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "alte_Rolle"
 
-#: sql_help.c:4253
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "neue_Rolle"
 
-#: sql_help.c:4292 sql_help.c:4501 sql_help.c:4509
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "Sicherungspunktsname"
 
-#: sql_help.c:4649 sql_help.c:4707 sql_help.c:4907 sql_help.c:4965
-#: sql_help.c:5154 sql_help.c:5212
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "Gruppierelement"
 
-#: sql_help.c:4651 sql_help.c:4755 sql_help.c:4909 sql_help.c:5156
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "Fenstername"
 
-#: sql_help.c:4652 sql_help.c:4756 sql_help.c:4910 sql_help.c:5157
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "Fensterdefinition"
 
-#: sql_help.c:4653 sql_help.c:4667 sql_help.c:4711 sql_help.c:4757
-#: sql_help.c:4911 sql_help.c:4925 sql_help.c:4969 sql_help.c:5158
-#: sql_help.c:5172 sql_help.c:5216
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "Select"
 
-#: sql_help.c:4659 sql_help.c:4917 sql_help.c:5164
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "From-Referenz"
 
-#: sql_help.c:4660 sql_help.c:4918 sql_help.c:5165
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "wobei From-Element Folgendes sein kann:"
 
-#: sql_help.c:4663 sql_help.c:4669 sql_help.c:4672 sql_help.c:4676
-#: sql_help.c:4688 sql_help.c:4921 sql_help.c:4927 sql_help.c:4930
-#: sql_help.c:4934 sql_help.c:4946 sql_help.c:5168 sql_help.c:5174
-#: sql_help.c:5177 sql_help.c:5181 sql_help.c:5193
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "Spaltenalias"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5169
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "Stichprobenmethode"
 
-#: sql_help.c:4666 sql_help.c:4924 sql_help.c:5171
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "Startwert"
 
-#: sql_help.c:4670 sql_help.c:4709 sql_help.c:4928 sql_help.c:4967
-#: sql_help.c:5175 sql_help.c:5214
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "With-Anfragename"
 
-#: sql_help.c:4680 sql_help.c:4683 sql_help.c:4686 sql_help.c:4938
-#: sql_help.c:4941 sql_help.c:4944 sql_help.c:5185 sql_help.c:5188
-#: sql_help.c:5191
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "Spaltendefinition"
 
-#: sql_help.c:4690 sql_help.c:4696 sql_help.c:4948 sql_help.c:4954
-#: sql_help.c:5195 sql_help.c:5201
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "Verbundtyp"
 
-#: sql_help.c:4693 sql_help.c:4951 sql_help.c:5198
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "Verbundspalte"
 
-#: sql_help.c:4694 sql_help.c:4952 sql_help.c:5199
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "Join-Using-Alias"
 
-#: sql_help.c:4700 sql_help.c:4958 sql_help.c:5205
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "und Gruppierelement eins der folgenden sein kann:"
 
-#: sql_help.c:4708 sql_help.c:4966 sql_help.c:5213
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "und With-Anfrage ist:"
 
-#: sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "values"
 
-#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4715 sql_help.c:4973 sql_help.c:5220
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4716 sql_help.c:4974 sql_help.c:5221
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4718 sql_help.c:4976 sql_help.c:5223
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "Search-Seq-Spaltenname"
 
-#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "Cycle-Mark-Spaltenname"
 
-#: sql_help.c:4721 sql_help.c:4979 sql_help.c:5226
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "Cycle-Mark-Wert"
 
-#: sql_help.c:4722 sql_help.c:4980 sql_help.c:5227
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "Cycle-Mark-Standard"
 
-#: sql_help.c:4723 sql_help.c:4981 sql_help.c:5228
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "Cycle-Pfad-Spaltenname"
 
-#: sql_help.c:4750
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "neue_Tabelle"
 
-#: sql_help.c:4821
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "Snapshot-ID"
 
-#: sql_help.c:5090
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "Sortierausdruck"
 
-#: sql_help.c:5235 sql_help.c:6219
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "bricht die aktuelle Transaktion ab"
 
-#: sql_help.c:5241
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "ändert die Definition einer Aggregatfunktion"
 
-#: sql_help.c:5247
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "ändert die Definition einer Sortierfolge"
 
-#: sql_help.c:5253
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "ändert die Definition einer Zeichensatzkonversion"
 
-#: sql_help.c:5259
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "ändert eine Datenbank"
 
-#: sql_help.c:5265
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "definiert vorgegebene Zugriffsprivilegien"
 
-#: sql_help.c:5271
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "ändert die Definition einer Domäne"
 
-#: sql_help.c:5277
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "ändert die Definition eines Ereignistriggers"
 
-#: sql_help.c:5283
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "ändert die Definition einer Erweiterung"
 
-#: sql_help.c:5289
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "ändert die Definition eines Fremddaten-Wrappers"
 
-#: sql_help.c:5295
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "ändert die Definition einer Fremdtabelle"
 
-#: sql_help.c:5301
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "ändert die Definition einer Funktion"
 
-#: sql_help.c:5307
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "ändert Rollenname oder -mitglieder"
 
-#: sql_help.c:5313
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "ändert die Definition eines Index"
 
-#: sql_help.c:5319
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "ändert die Definition einer prozeduralen Sprache"
 
-#: sql_help.c:5325
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "ändert die Definition eines Large Object"
 
-#: sql_help.c:5331
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "ändert die Definition einer materialisierten Sicht"
 
-#: sql_help.c:5337
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "ändert die Definition eines Operators"
 
-#: sql_help.c:5343
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "ändert die Definition einer Operatorklasse"
 
-#: sql_help.c:5349
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "ändert die Definition einer Operatorfamilie"
 
-#: sql_help.c:5355
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "ändert die Definition einer Policy für Sicherheit auf Zeilenebene"
 
-#: sql_help.c:5361
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "ändert die Definition einer Prozedur"
 
-#: sql_help.c:5367
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "ändert die Definition einer Publikation"
 
-#: sql_help.c:5373 sql_help.c:5475
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "ändert eine Datenbankrolle"
 
-#: sql_help.c:5379
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "ändert die Definition einer Routine"
 
-#: sql_help.c:5385
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "ändert die Definition einer Regel"
 
-#: sql_help.c:5391
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "ändert die Definition eines Schemas"
 
-#: sql_help.c:5397
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "ändert die Definition eines Sequenzgenerators"
 
-#: sql_help.c:5403
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "ändert die Definition eines Fremdservers"
 
-#: sql_help.c:5409
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "ändert die Definition eines erweiterten Statistikobjekts"
 
-#: sql_help.c:5415
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "ändert die Definition einer Subskription"
 
-#: sql_help.c:5421
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "ändert einen Server-Konfigurationsparameter"
 
-#: sql_help.c:5427
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "ändert die Definition einer Tabelle"
 
-#: sql_help.c:5433
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "ändert die Definition eines Tablespace"
 
-#: sql_help.c:5439
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "ändert die Definition einer Textsuchekonfiguration"
 
-#: sql_help.c:5445
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "ändert die Definition eines Textsuchewörterbuchs"
 
-#: sql_help.c:5451
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "ändert die Definition eines Textsucheparsers"
 
-#: sql_help.c:5457
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "ändert die Definition einer Textsuchevorlage"
 
-#: sql_help.c:5463
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "ändert die Definition eines Triggers"
 
-#: sql_help.c:5469
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "ändert die Definition eines Typs"
 
-#: sql_help.c:5481
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "ändert die Definition einer Benutzerabbildung"
 
-#: sql_help.c:5487
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "ändert die Definition einer Sicht"
 
-#: sql_help.c:5493
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "sammelt Statistiken über eine Datenbank"
 
-#: sql_help.c:5499 sql_help.c:6297
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "startet einen Transaktionsblock"
 
-#: sql_help.c:5505
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "ruft eine Prozedur auf"
 
-#: sql_help.c:5511
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "erzwingt einen Checkpoint im Write-Ahead-Log"
 
-#: sql_help.c:5517
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "schließt einen Cursor"
 
-#: sql_help.c:5523
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "clustert eine Tabelle nach einem Index"
 
-#: sql_help.c:5529
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "definiert oder ändert den Kommentar eines Objektes"
 
-#: sql_help.c:5535 sql_help.c:6093
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "schließt die aktuelle Transaktion ab"
 
-#: sql_help.c:5541
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "schließt eine Transaktion ab, die vorher für Two-Phase-Commit vorbereitet worden war"
 
-#: sql_help.c:5547
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "kopiert Daten zwischen einer Datei und einer Tabelle"
 
-#: sql_help.c:5553
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "definiert eine neue Zugriffsmethode"
 
-#: sql_help.c:5559
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "definiert eine neue Aggregatfunktion"
 
-#: sql_help.c:5565
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "definiert eine neue Typumwandlung"
 
-#: sql_help.c:5571
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "definiert eine neue Sortierfolge"
 
-#: sql_help.c:5577
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "definiert eine neue Kodierungskonversion"
 
-#: sql_help.c:5583
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "erzeugt eine neue Datenbank"
 
-#: sql_help.c:5589
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "definiert eine neue Domäne"
 
-#: sql_help.c:5595
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "definiert einen neuen Ereignistrigger"
 
-#: sql_help.c:5601
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "installiert eine Erweiterung"
 
-#: sql_help.c:5607
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "definiert einen neuen Fremddaten-Wrapper"
 
-#: sql_help.c:5613
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "definiert eine neue Fremdtabelle"
 
-#: sql_help.c:5619
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "definiert eine neue Funktion"
 
-#: sql_help.c:5625 sql_help.c:5685 sql_help.c:5787
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "definiert eine neue Datenbankrolle"
 
-#: sql_help.c:5631
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "definiert einen neuen Index"
 
-#: sql_help.c:5637
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "definiert eine neue prozedurale Sprache"
 
-#: sql_help.c:5643
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "definiert eine neue materialisierte Sicht"
 
-#: sql_help.c:5649
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "definiert einen neuen Operator"
 
-#: sql_help.c:5655
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "definiert eine neue Operatorklasse"
 
-#: sql_help.c:5661
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "definiert eine neue Operatorfamilie"
 
-#: sql_help.c:5667
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "definiert eine neue Policy für Sicherheit auf Zeilenebene für eine Tabelle"
 
-#: sql_help.c:5673
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "definiert eine neue Prozedur"
 
-#: sql_help.c:5679
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "definiert eine neue Publikation"
 
-#: sql_help.c:5691
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "definiert eine neue Umschreiberegel"
 
-#: sql_help.c:5697
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "definiert ein neues Schema"
 
-#: sql_help.c:5703
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "definiert einen neuen Sequenzgenerator"
 
-#: sql_help.c:5709
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "definiert einen neuen Fremdserver"
 
-#: sql_help.c:5715
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "definiert erweiterte Statistiken"
 
-#: sql_help.c:5721
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "definiert eine neue Subskription"
 
-#: sql_help.c:5727
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "definiert eine neue Tabelle"
 
-#: sql_help.c:5733 sql_help.c:6255
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "definiert eine neue Tabelle aus den Ergebnissen einer Anfrage"
 
-#: sql_help.c:5739
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "definiert einen neuen Tablespace"
 
-#: sql_help.c:5745
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "definiert eine neue Textsuchekonfiguration"
 
-#: sql_help.c:5751
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "definiert ein neues Textsuchewörterbuch"
 
-#: sql_help.c:5757
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "definiert einen neuen Textsucheparser"
 
-#: sql_help.c:5763
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "definiert eine neue Textsuchevorlage"
 
-#: sql_help.c:5769
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "definiert eine neue Transformation"
 
-#: sql_help.c:5775
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "definiert einen neuen Trigger"
 
-#: sql_help.c:5781
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "definiert einen neuen Datentyp"
 
-#: sql_help.c:5793
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "definiert eine neue Abbildung eines Benutzers auf einen Fremdserver"
 
-#: sql_help.c:5799
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "definiert eine neue Sicht"
 
-#: sql_help.c:5805
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "gibt einen vorbereiteten Befehl frei"
 
-#: sql_help.c:5811
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "definiert einen Cursor"
 
-#: sql_help.c:5817
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "löscht Zeilen einer Tabelle"
 
-#: sql_help.c:5823
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "verwirft den Sitzungszustand"
 
-#: sql_help.c:5829
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "führt einen anonymen Codeblock aus"
 
-#: sql_help.c:5835
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "entfernt eine Zugriffsmethode"
 
-#: sql_help.c:5841
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "entfernt eine Aggregatfunktion"
 
-#: sql_help.c:5847
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "entfernt eine Typumwandlung"
 
-#: sql_help.c:5853
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "entfernt eine Sortierfolge"
 
-#: sql_help.c:5859
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "entfernt eine Zeichensatzkonversion"
 
-#: sql_help.c:5865
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "entfernt eine Datenbank"
 
-#: sql_help.c:5871
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "entfernt eine Domäne"
 
-#: sql_help.c:5877
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "entfernt einen Ereignistrigger"
 
-#: sql_help.c:5883
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "entfernt eine Erweiterung"
 
-#: sql_help.c:5889
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "entfernt einen Fremddaten-Wrapper"
 
-#: sql_help.c:5895
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "entfernt eine Fremdtabelle"
 
-#: sql_help.c:5901
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "entfernt eine Funktion"
 
-#: sql_help.c:5907 sql_help.c:5973 sql_help.c:6075
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "entfernt eine Datenbankrolle"
 
-#: sql_help.c:5913
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "entfernt einen Index"
 
-#: sql_help.c:5919
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "entfernt eine prozedurale Sprache"
 
-#: sql_help.c:5925
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "entfernt eine materialisierte Sicht"
 
-#: sql_help.c:5931
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "entfernt einen Operator"
 
-#: sql_help.c:5937
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "entfernt eine Operatorklasse"
 
-#: sql_help.c:5943
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "entfernt eine Operatorfamilie"
 
-#: sql_help.c:5949
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "entfernt die einer Datenbankrolle gehörenden Datenbankobjekte"
 
-#: sql_help.c:5955
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "entfernt eine Policy für Sicherheit auf Zeilenebene von einer Tabelle"
 
-#: sql_help.c:5961
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "entfernt eine Prozedur"
 
-#: sql_help.c:5967
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "entfernt eine Publikation"
 
-#: sql_help.c:5979
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "entfernt eine Routine"
 
-#: sql_help.c:5985
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "entfernt eine Umschreiberegel"
 
-#: sql_help.c:5991
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "entfernt ein Schema"
 
-#: sql_help.c:5997
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "entfernt eine Sequenz"
 
-#: sql_help.c:6003
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "entfernt einen Fremdserverdeskriptor"
 
-#: sql_help.c:6009
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "entfernt erweiterte Statistiken"
 
-#: sql_help.c:6015
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "entfernt eine Subskription"
 
-#: sql_help.c:6021
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "entfernt eine Tabelle"
 
-#: sql_help.c:6027
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "entfernt einen Tablespace"
 
-#: sql_help.c:6033
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "entfernt eine Textsuchekonfiguration"
 
-#: sql_help.c:6039
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "entfernt ein Textsuchewörterbuch"
 
-#: sql_help.c:6045
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "entfernt einen Textsucheparser"
 
-#: sql_help.c:6051
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "entfernt eine Textsuchevorlage"
 
-#: sql_help.c:6057
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "entfernt eine Transformation"
 
-#: sql_help.c:6063
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "entfernt einen Trigger"
 
-#: sql_help.c:6069
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "entfernt einen Datentyp"
 
-#: sql_help.c:6081
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "entfernt eine Benutzerabbildung für einen Fremdserver"
 
-#: sql_help.c:6087
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "entfernt eine Sicht"
 
-#: sql_help.c:6099
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "führt einen vorbereiteten Befehl aus"
 
-#: sql_help.c:6105
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "zeigt den Ausführungsplan eines Befehls"
 
-#: sql_help.c:6111
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "liest Zeilen aus einer Anfrage mit einem Cursor"
 
-#: sql_help.c:6117
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "definiert Zugriffsprivilegien"
 
-#: sql_help.c:6123
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "importiert Tabellendefinitionen von einem Fremdserver"
 
-#: sql_help.c:6129
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "erzeugt neue Zeilen in einer Tabelle"
 
-#: sql_help.c:6135
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "hört auf eine Benachrichtigung"
 
-#: sql_help.c:6141
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "lädt eine dynamische Bibliotheksdatei"
 
-#: sql_help.c:6147
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "sperrt eine Tabelle"
 
-#: sql_help.c:6153
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "fügt Zeilen in eine Tabelle ein oder ändert oder löscht Zeilen einer Tabelle, abhängig von Bedingungen"
 
-#: sql_help.c:6159
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "positioniert einen Cursor"
 
-#: sql_help.c:6165
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "erzeugt eine Benachrichtigung"
 
-#: sql_help.c:6171
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "bereitet einen Befehl zur Ausführung vor"
 
-#: sql_help.c:6177
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "bereitet die aktuelle Transaktion für Two-Phase-Commit vor"
 
-#: sql_help.c:6183
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "ändert den Eigentümer der der Rolle gehörenden Datenbankobjekte"
 
-#: sql_help.c:6189
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "ersetzt den Inhalt einer materialisierten Sicht"
 
-#: sql_help.c:6195
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "baut Indexe neu"
 
-#: sql_help.c:6201
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "gibt einen zuvor definierten Sicherungspunkt frei"
 
-#: sql_help.c:6207
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "setzt einen Konfigurationsparameter auf die Voreinstellung zurück"
 
-#: sql_help.c:6213
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "entfernt Zugriffsprivilegien"
 
-#: sql_help.c:6225
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "storniert eine Transaktion, die vorher für Two-Phase-Commit vorbereitet worden war"
 
-#: sql_help.c:6231
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "rollt eine Transaktion bis zu einem Sicherungspunkt zurück"
 
-#: sql_help.c:6237
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "definiert einen neuen Sicherungspunkt in der aktuellen Transaktion"
 
-#: sql_help.c:6243
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "definiert oder ändert ein Security-Label eines Objektes"
 
-#: sql_help.c:6249 sql_help.c:6303 sql_help.c:6339
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "liest Zeilen aus einer Tabelle oder Sicht"
 
-#: sql_help.c:6261
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "ändert einen Konfigurationsparameter"
 
-#: sql_help.c:6267
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "setzt die Zeitsteuerung für Check-Constraints in der aktuellen Transaktion"
 
-#: sql_help.c:6273
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "setzt den aktuellen Benutzernamen der aktuellen Sitzung"
 
-#: sql_help.c:6279
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr "setzt den Sitzungsbenutzernamen und den aktuellen Benutzernamen der aktuellen Sitzung"
 
-#: sql_help.c:6285
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "setzt die Charakteristika der aktuellen Transaktion"
 
-#: sql_help.c:6291
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "zeigt den Wert eines Konfigurationsparameters"
 
-#: sql_help.c:6309
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "leert eine oder mehrere Tabellen"
 
-#: sql_help.c:6315
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "beendet das Hören auf eine Benachrichtigung"
 
-#: sql_help.c:6321
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "aktualisiert Zeilen einer Tabelle"
 
-#: sql_help.c:6327
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "säubert und analysiert eine Datenbank"
 
-#: sql_help.c:6333
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "berechnet eine Zeilenmenge"
 
@@ -6907,7 +6936,7 @@ msgstr "überflüssiges Kommandozeilenargument »%s« ignoriert"
 msgid "could not find own program executable"
 msgstr "konnte eigene Programmdatei nicht finden"
 
-#: tab-complete.in.c:6606
+#: tab-complete.in.c:6639
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6930,28 +6959,28 @@ msgstr "ungültiger Wert »%s« für »%s«: ganze Zahl erwartet"
 
 #: variables.c:207
 #, c-format
-msgid "invalid input syntax for \"%s\""
-msgstr "ungültige Eingabesyntax für »%s«"
+msgid "invalid input syntax for variable \"%s\""
+msgstr "ungültige Eingabesyntax für Variable »%s«"
 
 #: variables.c:218
 #, c-format
-msgid "invalid value \"%s\" for \"%s\": must be greater than %.2f"
-msgstr "ungültiger Wert »%s« für »%s«: muss größer als %.2f sein"
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "ungültiger Wert »%s« für Variable »%s«: muss größer als %.2f sein"
 
 #: variables.c:225
 #, c-format
-msgid "invalid value \"%s\" for \"%s\": must be less than %.2f"
-msgstr "ungültiger Wert »%s« für »%s«: muss kleiner als %.2f sein"
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "ungültiger Wert »%s« für Variable »%s«: muss kleiner als %.2f sein"
 
 #: variables.c:241
 #, c-format
-msgid "\"%s\" is out of range for \"%s\""
-msgstr "»%s« ist außerhalb des gültigen Bereichs für »%s«"
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Variable »%s«"
 
 #: variables.c:247
 #, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr "ungültiger Wert »%s« für »%s«"
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "ungültiger Wert »%s« für Variable »%s«"
 
 #: variables.c:294
 #, c-format
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
index bc110c4dcad..9347d9d2ef3 100644
--- a/src/bin/psql/po/es.po
+++ b/src/bin/psql/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:47+0000\n"
-"PO-Revision-Date: 2024-12-07 09:06+0100\n"
+"POT-Creation-Date: 2026-02-06 23:17+0000\n"
+"PO-Revision-Date: 2025-12-06 09:44+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -23,22 +23,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -63,28 +63,28 @@ msgstr "no se pudo encontrar un «%s» para ejecutar"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "no se pudo resolver la ruta «%s» a forma absoluta: %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "no se pudo leer desde la orden «%s»: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "la orden «%s» no retornó datos"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() falló: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1373 command.c:3459 command.c:3508 command.c:3633 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -106,7 +106,7 @@ msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 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:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "el usuario no existe"
 
@@ -167,8 +167,8 @@ msgstr "Interrumpido\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "No se puede imprimir el contenido de la tabla: el número de celdas %lld es igual o mayor al máximo %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "No se puede imprimir el contenido de la tabla: el número de celdas %<PRIu64> es igual o mayor al máximo %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -177,15 +177,15 @@ msgstr "No se puede agregar un encabezado al contenido de la tabla: la cantidad
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "No se puede agregar una celda al contenido de la tabla: la cantidad de celdas de %lld ha sido excedida.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "No se puede agregar una celda al contenido de la tabla: la cantidad de celdas de %<PRIu64> ha sido excedida.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "formato de salida no válido (error interno): %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "saltando expansión recursiva de la variable «%s»"
@@ -200,302 +200,409 @@ msgstr "el argumento de la orden de shell contiene un salto de línea o retorno
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
+#: command.c:254
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "no se pudo buscar el usuario local de ID %d: %s"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "las órdenes backslash están restringidas; sólo se permite \\unrestrict"
 
-#: ../../port/user.c:48 ../../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "no existe un usuario local con ID %d"
-
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "orden \\%s no válida"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Digite \\? para obtener ayuda."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: argumento extra «%s» ignorado"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "orden \\%s ignorada: use \\endif o Ctrl-C para salir del bloque \\if actual"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s: falta argumento requerido"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "no se pudo obtener directorio home para el usuario de ID %ld: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: no se pudo cambiar directorio a «%s»: %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "No está conectado a una base de datos.\n"
 
-#: command.c:667
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
-msgstr "Está conectado a la base de datos «%s» como el usuario «%s» en la dirección «%s» port «%s».\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "Información de Conexión"
 
-#: command.c:670
-#, 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:840 describe.c:4722
+msgid "Parameter"
+msgstr "Parámetro"
 
-#: command.c:676
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
-msgstr "Está conectado a la base de datos «%s» como el usuario «%s» en el servidor «%s» (dirección «%s») port «%s».\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "Valor"
 
-#: command.c:679
-#, 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:844 describe.c:3874
+msgid "Database"
+msgstr "Base de Datos"
+
+#: command.c:848
+msgid "Client User"
+msgstr "Usuario Cliente"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "Dirección de Host"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "Directorio de Socket"
+
+#: command.c:868
+msgid "Host"
+msgstr "Host"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "Puerto del Servidor"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "Opciones"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "Versión de Protocolo"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "Se Usó Contraseña"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "falso"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "verdadero"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "Autenticado con GSSAPI"
+
+#: command.c:898
+msgid "Backend PID"
+msgstr "PID de Backend"
 
-#: command.c:1069 command.c:1170 command.c:2676
+#: command.c:902
+msgid "SSL Connection"
+msgstr "Conexión SSL"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "Biblioteca SSL"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "desconocido"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "Protocolo SSL"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "Bits de Llave SSL"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "Cifrado de SSL"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "Compresión SSL"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "ninguno"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "no hay búfer de consulta"
 
-#: command.c:1102 command.c:5779
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "número de línea no válido: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: nombre de codificación no válido o procedimiento de conversión no encontrado"
 
-#: command.c:1369 command.c:2158 command.c:3455 command.c:3653 command.c:5885
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1376
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "No hay error anterior."
 
-#: command.c:1489
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s no se permite en modo pipeline"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: falta el paréntesis derecho"
 
-#: command.c:1573 command.c:1692 command.c:1996 command.c:2010 command.c:2029
-#: command.c:2197 command.c:2438 command.c:2643 command.c:2683
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s: falta argumento requerido"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: cantidad de resultados solicitados no válida"
 
-#: command.c:1823
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: no puede ocurrir después de \\else"
 
-#: command.c:1828
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: no hay un \\if coincidente"
 
-#: command.c:1892
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: no puede ocurrir después de \\else"
 
-#: command.c:1897
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: no hay un \\if coincidente"
 
-#: command.c:1937
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: no hay un \\if coincidente"
 
-#: command.c:2093
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "El búfer de consulta está vacío."
 
-#: command.c:2136
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Ingrese nueva contraseña para usuario «%s»: "
 
-#: command.c:2140
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: command.c:2149
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Las contraseñas no coinciden."
 
-#: command.c:2232
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "%s: no se pudo leer el valor para la variable"
 
-#: command.c:2334
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "El búfer de consulta ha sido reiniciado (limpiado)."
 
-#: command.c:2356
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Se escribió la historia en el archivo «%s».\n"
 
-#: command.c:2443
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline debe ser usado después de \\bind o \\bind_named"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline no se permite fuera del modo pipeline"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: el nombre de variable de ambiente no debe contener «=»"
 
-#: command.c:2491
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "el nombre de la función es requerido"
 
-#: command.c:2493
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "el nombre de la vista es requerido"
 
-#: command.c:2615
+#: command.c:3176
 msgid "Timing is on."
 msgstr "El despliegue de duración está activado."
 
-#: command.c:2617
+#: command.c:3178
 msgid "Timing is off."
 msgstr "El despliegue de duración está desactivado."
 
-#: command.c:2703 command.c:2741 command.c:4166 command.c:4169 command.c:4172
-#: command.c:4178 command.c:4180 command.c:4206 command.c:4216 command.c:4228
-#: command.c:4242 command.c:4269 command.c:4327 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: no se está actualmente en modo restringido"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: llave errónea"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2730 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2802 command.c:2868
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: valor de intervalo ese especifica más de una vez"
 
-#: command.c:2812 command.c:2878
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: valor de intervalo incorrecto «%s»"
 
-#: command.c:2822
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: cantidad de iteraciones se especifica más de una vez"
 
-#: command.c:2832
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: cantidad de iteraciones incorrecta «%s»"
 
-#: command.c:2842
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: mínima cantidad de filas se especifica más de una vez"
 
-#: command.c:2852
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: cantidad mínima de filas incorrecta «%s»"
 
-#: command.c:2859
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: parámetro «%s» no reconocido"
 
-#: command.c:3256 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: command.c:3261 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Contraseña para usuario %s: "
 
-#: command.c:3317
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "No proporcione usuario, host o puerto de forma separada al usar una cadena de conexión"
 
-#: command.c:3352
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "No existe una conexión de base de datos para poder reusar sus parámetros"
 
-#: command.c:3659
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Se ha mantenido la conexión anterior"
 
-#: command.c:3665
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:3721
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "Ahora está conectado a la base de datos «%s» como el usuario «%s» en la dirección «%s» port «%s».\n"
 
-#: command.c:3724
+#: command.c:4343
 #, 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:3730
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "Ahora está conectado a la base de datos «%s» como el usuario «%s» en el servidor «%s» (dirección «%s») port «%s».\n"
 
-#: command.c:3733
+#: command.c:4352
 #, 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:3738
+#: command.c:4357
 #, 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:3844
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:3857
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -504,33 +611,25 @@ msgstr ""
 "ADVERTENCIA: %s versión mayor %s, servidor versión mayor %s.\n"
 "          Algunas características de psql podrían no funcionar.\n"
 
-#: command.c:3896
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "Conexión SSL (protocolo: %s, cifrado: %s, compresión: %s, ALPN: %s)\n"
 
-#: command.c:3897 command.c:3898
-msgid "unknown"
-msgstr "desconocido"
-
-#: command.c:3899 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "desactivado"
 
-#: command.c:3899 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "activado"
 
-#: command.c:3900
-msgid "none"
-msgstr "ninguno"
-
-#: command.c:3914
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "Conexión Cifrada GSSAPI\n"
 
-#: command.c:3934
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -543,284 +642,284 @@ msgstr ""
 "            Vea la página de referencia de psql «Notes for Windows users»\n"
 "            para obtener más detalles.\n"
 
-#: command.c:4041
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "la variable de ambiente PSQL_EDITOR_LINENUMBER_SWITCH debe estar definida para poder especificar un número de línea"
 
-#: command.c:4071
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "no se pudo iniciar el editor «%s»"
 
-#: command.c:4073
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "no se pudo iniciar /bin/sh"
 
-#: command.c:4123
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "no se pudo ubicar el directorio temporal: %s"
 
-#: command.c:4150
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "no se pudo abrir archivo temporal «%s»: %m"
 
-#: command.c:4486
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: abreviación ambigua «%s» coincide tanto con «%s» como con «%s»"
 
-#: command.c:4506
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: formatos permitidos son aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4525
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: estilos de línea permitidos son ascii, old-ascii, unicode"
 
-#: command.c:4540
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: estilos de línea Unicode de borde permitidos son single, double"
 
-#: command.c:4555
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: estilos de línea Unicode de columna permitidos son single, double"
 
-#: command.c:4570
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: estilos de línea Unicode de encabezado permitidos son single, double"
 
-#: command.c:4622
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: los valores permitidos de xheader_width son «%s» (por omisión), «%s», «%s», o un número que indica el ancho exacto"
 
-#: command.c:4639
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep debe ser un carácter de un solo byte"
 
-#: command.c:4644
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldset ni puede ser una comilla doble, un salto de línea, o un retorno de carro"
 
-#: command.c:4782 command.c:4983
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: opción desconocida: %s"
 
-#: command.c:4802
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "El estilo de borde es %d.\n"
 
-#: command.c:4808
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "El ancho no está definido.\n"
 
-#: command.c:4810
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "El ancho es %d.\n"
 
-#: command.c:4817
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Se ha activado el despliegue expandido.\n"
 
-#: command.c:4819
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "El despliegue expandido se usa automáticamente.\n"
 
-#: command.c:4821
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Se ha desactivado el despliegue expandido.\n"
 
-#: command.c:4828 command.c:4830 command.c:4832
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "El ancho del encabezado expandido es '%s'.\n"
 
-#: command.c:4834
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "El ancho de encabezado expandido es %d.\n"
 
-#: command.c:4840
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "El separador de campos para CSV es «%s».\n"
 
-#: command.c:4848 command.c:4856
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "El separador de campos es el byte cero.\n"
 
-#: command.c:4850
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "El separador de campos es «%s».\n"
 
-#: command.c:4863
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "El pie por omisión está activo.\n"
 
-#: command.c:4865
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "El pie de página por omisión está desactivado.\n"
 
-#: command.c:4871
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "El formato de salida es %s.\n"
 
-#: command.c:4877
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "El estilo de línea es %s.\n"
 
-#: command.c:4884
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Despliegue de nulos es «%s».\n"
 
-#: command.c:4892
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "La salida numérica ajustada localmente está habilitada.\n"
 
-#: command.c:4894
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "La salida numérica ajustada localmente está deshabilitada.\n"
 
-#: command.c:4901
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "El paginador se usará para salida larga.\n"
 
-#: command.c:4903
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "El paginador se usará siempre.\n"
 
-#: command.c:4905
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "El paginador no se usará.\n"
 
-#: command.c:4911
+#: command.c:5537
 #, 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] "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:4921 command.c:4931
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "El separador de filas es el byte cero.\n"
 
-#: command.c:4923
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "El separador de filas es <salto de línea>.\n"
 
-#: command.c:4925
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "El separador de filas es «%s».\n"
 
-#: command.c:4938
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Los atributos de tabla son «%s».\n"
 
-#: command.c:4941
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Los atributos de tabla han sido indefinidos.\n"
 
-#: command.c:4948
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "El título es «%s».\n"
 
-#: command.c:4950
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "El título ha sido indefinido.\n"
 
-#: command.c:4957
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Mostrar sólo filas está activado.\n"
 
-#: command.c:4959
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Mostrar sólo filas está desactivado.\n"
 
-#: command.c:4965
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "El estilo Unicode de borde es «%s».\n"
 
-#: command.c:4971
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "El estilo de línea Unicode de columna es «%s».\n"
 
-#: command.c:4977
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "El estilo de línea Unicode de encabezado es «%s».\n"
 
-#: command.c:5226
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: falló"
 
-#: command.c:5264
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch no puede ser usado con una consulta vacía"
 
-#: command.c:5296
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "no se pudo establecer un temporizador: %m"
 
-#: command.c:5365
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (cada %gs)\n"
 
-#: command.c:5368
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (cada %gs)\n"
 
-#: command.c:5432
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "no se pudo esperar señales: %m"
 
-#: command.c:5488 command.c:5495 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -833,107 +932,107 @@ msgstr ""
 "/************************/\n"
 "\n"
 
-#: command.c:5674
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "«%s.%s» no es una vista"
 
-#: command.c:5690
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "no se pudo interpretar el array reloptions"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "no se puede escapar sin una conexión activa"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "el argumento de la orden de shell contiene un salto de línea o retorno de carro: «%s»"
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "se ha perdido la conexión al servidor"
 
-#: common.c:355
+#: common.c:367
 #, 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:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "Falló.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Con éxito.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "PQresultStatus no esperado: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Duración: %.3f ms\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "Duración: %.3f ms (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "Duración: %.3f ms (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Duración: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "No está conectado a una base de datos."
 
-#: common.c:714
+#: common.c:749
 #, 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:717
+#: common.c:752
 #, 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:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "no se pudo mostrar la tabla de resultados: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "\\gset no retornó renglón alguno"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "\\gset retornó más de un renglón"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "se ignoró intentó de hacer \\gset a variable con tratamiento especial «%s»"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify command)******************************************/\n"
@@ -944,37 +1043,52 @@ msgstr ""
 "%s\n"
 "/**(presione enter para continuar, o x y enter para cancelar)******************/\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "SENTENCIA:  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "estado de transacción inesperado (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Columna"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Tipo"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "La orden no tiene resultado, o el resultado no tiene columnas.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "No hay resultados pendientes que obtener"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "la obtención de resultados en modo trozado falló"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "Pipeline abortado, la orden no se ejecutó"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "no se soporta COPY en un pipeline, abortando conexión"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1027,11 +1141,11 @@ msgstr ""
 "Ingrese los datos a ser copiados seguidos de un fin de línea.\n"
 "Termine con un backslash y un punto, o una señal EOF."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "se abortó por un error de lectura"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "tratando de salir del modo copy"
 
@@ -1078,1164 +1192,1254 @@ msgstr "\\crosstabview: nombre de columna «%s» ambiguo"
 #: crosstabview.c:679
 #, c-format
 msgid "\\crosstabview: column name not found: \"%s\""
-msgstr "\\crosstabview: nombre de columna «%s» no encontrado"
+msgstr "\\crosstabview: nombre de columna no encontrado: «%s»"
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Nombre"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Tipo de dato de salida"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Tipos de datos de argumentos"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Descripción"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "Listado de funciones de agregación"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "El servidor (versión %s) no soporta métodos de acceso."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "Indice"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Tabla"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Manejador"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
-msgstr "Lista de métodos de acceso"
+msgstr "Listado de métodos de acceso"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Dueño"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "Ubicación"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "Opciones"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Tamaño"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "Listado de tablespaces"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df sólo acepta las opciones [antpwS+]"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df sólo acepta las opciones [%s]"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df no acepta la opción «%c» en un servidor versión %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "ventana"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "proc"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "func"
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "disparador"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "inmutable"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "estable"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "volátil"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "Volatilidad"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "restringida"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "segura"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "insegura"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "Paralelismo"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "definidor"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "invocador"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "Seguridad"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "sí"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "no"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "¿Leakproof?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "Lenguaje"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Nombre interno"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "Listado de funciones"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "Listado de tipos de dato"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Tipo arg izq"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Tipo arg der"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "Tipo resultado"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Función"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "Listado de operadores"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "Codificación"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Proveedor de locale"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Collate"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Configuración regional"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "Reglas ICU:"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Listado de base de datos"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "tabla"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "vista"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "vista materializada"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "secuencia"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "tabla foránea"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "tabla particionada"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Privilegios de acceso a columnas"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Políticas"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Privilegios"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "función"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "tipo"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "esquema"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "objeto grande"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Privilegios de acceso por omisión"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "restricción de tabla"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "restricción de dominio"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "clase de operadores"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "familia de operadores"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "regla"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Descripciones de objetos"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "No se encontró relación llamada «%s»."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "No se encontró ninguna relación."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "No se encontró relación con OID %s."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Inicio"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Máximo"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Incremento"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "sí"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "no"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "¿Cicla?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Cache"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Asociada a: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Secuencia para columna identidad: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Secuencia unlogged «%s.%s»"
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Secuencia «%s.%s»"
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Tabla unlogged «%s.%s»"
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabla «%s.%s»"
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vista «%s.%s»"
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Vista materializada unlogged «%s.%s»"
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Vista materializada \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Índice unlogged «%s.%s»"
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Índice «%s.%s»"
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Índice particionado unlogged «%s.%s»"
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Índice particionado «%s.%s»"
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Tabla TOAST «%s.%s»"
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo compuesto «%s.%s»"
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Tabla foránea «%s.%s»"
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Tabla unlogged particionada «%s.%s»"
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Tabla particionada «%s.%s»"
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Ordenamiento"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "Nulable"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "Por omisión"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "¿Llave?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Definición"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "Opciones de FDW"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "Compresión"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Estadísticas"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Partición de: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Sin restricción de partición"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Restricción de partición: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Llave de partición: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Tabla dueña: «%s.%s»"
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "llave primaria, "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "único"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls no distintos"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "de tabla «%s.%s»"
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", clustered"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", no válido"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", postergable"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", inicialmente postergada"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", identidad de replicación"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Índices:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Restricciones CHECK:"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Restricciones de llave foránea:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Políticas:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Políticas (seguridad de registros forzada):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Políticas (seguridad de filas activa): (ninguna)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Políticas (seguridad de filas forzada): (ninguna)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Políticas (seguridad de filas inactiva):"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Objetos de estadísticas:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Reglas:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Reglas deshabilitadas:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Reglas que se activan siempre:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Reglas que se activan sólo en las réplicas:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Publicaciones:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Restricción not-null:"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (local, heredada)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (heredada)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Definición de vista:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Triggers:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Disparadores de usuario deshabilitados:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Disparadores internos deshabilitados:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Disparadores que siempre se ejecutan:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Disparadores que se ejecutan sólo en las réplicas:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Servidor: %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "Opciones de FDW: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Hereda"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Número de particiones: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Número de particiones: %d (Use \\d+ para listarlas.)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, 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:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Tablas hijas"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Particiones"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabla tipada de tipo: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Identidad de replicación"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Tiene OIDs: sí"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Método de acceso: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace «%s»"
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
-msgstr "Lista de roles"
+msgstr "Listado de roles"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Nombre de rol"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Superusuario"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "Sin herencia"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "Crear rol"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "Crear BD"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "No puede conectarse"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "Replicación"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Ignora RLS"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "Ninguna conexión"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d conexión"
 msgstr[1] "%d conexiones"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Constraseña válida hasta "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "Nombre de rol"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "Base de Datos"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "Parámetros"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "No se encontró ningún parámetro para el rol «%s» y la base de datos «%s»."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "No se encontró ningún parámetro para el rol «%s»."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "No se encontró ningún parámetro."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Listado de parámetros"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "Miembro de"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Otorgador"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
-msgstr "Lista de roles otorgados"
+msgstr "Listado de roles otorgados"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "índice"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "Tabla TOAST"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "índice particionado"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "permanente"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "temporal"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "unlogged"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Persistencia"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Método de acceso"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "No se encontraron relaciones con el nombre «%s»."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "No se encontraron tablas con el nombre «%s»."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "No se encontraron índices con el nombre «%s»."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "No se encontraron vistas con el nombre «%s»."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "No se encontraron vista materializadas con el nombre «%s»."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "No se encontraron secuencias con el nombre «%s»."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "No se encontraron tablas foráneas con el nombre «%s»."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "No se encontraron tablas."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "No se encontraron índices."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "No se encontraron vistas."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "No se encontraron vistas materializadas."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "No se encontraron secuencias."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "No se encontraron tablas foráneas."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Listado de relaciones"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "Listado de tablas"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "Listado de índices"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "Listado de vistas"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "Listado de vistas materializadas"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "Listado de secuencias"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "Listado de tablas foráneas"
+
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "El servidor (versión %s) no soporta particionamiento declarativo de tablas."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Listado de índices particionados"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Listado de tablas particionadas"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Listado de relaciones particionadas"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Nombre del padre"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Tamaño de particiones hoja"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Tamaño total"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "Confiable"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Lenguaje interno"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Manejador de llamada"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Validador"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Manejador en línea"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
-msgstr "Lista de lenguajes"
+msgstr "Listado de lenguajes"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Listado de dominios"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "Fuente"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "Por omisión?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Listado de conversiones"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "Parámetro"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "Valor"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "Contexto"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Listado de parámetro de configuración"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Listado de parámetros de configuración no-default"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "El servidor (versión %s) no soporta triggers por eventos."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "Evento"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "activo"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "réplica"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "siempre"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "inactivo"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Activo"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Listado de disparadores por eventos"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "El servidor (versión %s) no soporta estadísticas extendidas."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Dependencias"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
-msgstr "Lista de estadísticas extendidas"
+msgstr "Listado de estadísticas extendidas"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Tipo fuente"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Tipo destino"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "en asignación"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Implícito?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Listado de conversiones de tipo (casts)"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Proveedor"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "¿Determinístico?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Listado de ordenamientos"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Listado de esquemas"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Listado de analizadores de búsqueda en texto"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "No se encontró ningún analizador de búsqueda en texto llamado «%s»."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "No se encontró ningún analizador de búsqueda en texto."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Inicio de parse"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "Método"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Obtener siguiente elemento"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "Fin de parse"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Obtener encabezado"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Obtener tipos de elemento"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analizador de búsqueda en texto «%s.%s»"
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analizador de búsqueda en texto «%s»"
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "Nombre de elemento"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para el analizador «%s.%s»"
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para el analizador «%s»"
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "Plantilla"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "Opciones de inicialización"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Listado de diccionarios de búsqueda en texto"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Fn. análisis léx."
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Listado de plantillas de búsqueda en texto"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Listado de configuraciones de búsqueda en texto"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "No se encontró una configuración de búsqueda en texto llamada «%s»."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "No se encontró una configuración de búsqueda en texto."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Diccionarios"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuración de búsqueda en texto «%s.%s»"
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuración de búsqueda en texto «%s»"
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2244,7 +2448,7 @@ msgstr ""
 "\n"
 "Analizador: «%s.%s»"
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2253,273 +2457,277 @@ msgstr ""
 "\n"
 "Analizador: «%s»"
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Listado de conectores de datos externos"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Conectores de datos externos"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Versión"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Listado de servidores foráneos"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Listado de mapeos de usuario"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "Listado de tablas foráneas"
+#: describe.c:6196
+msgid "Default version"
+msgstr "Versión por omisión"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Listado de extensiones instaladas"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "No se encontró extensión llamada «%s»."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "No se encontró ninguna extensión."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "Descripción de objeto"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objetos en extensión «%s»"
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "no están implementadas las referencias entre bases de datos: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "El servidor (versión %s) no soporta publicaciones."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Todas las tablas"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Inserts"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Updates"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Deletes"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Truncates"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "Columnas generadas"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Via root"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Listado de publicaciones"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "No se encontró publicación llamada «%s»."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "No se encontró ninguna publicación."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Publicación %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Tablas:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Tablas de esquemas:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "El servidor (versión %s) no soporta suscripciones."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "Publicación"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "Binario"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "De flujo"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Commit 2-fases"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Desactivar en error"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "Origen"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "Contraseña requerida"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "¿Ejec. como dueño?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "“Failover”"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Commit síncrono"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Conninfo"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Saltar LSN"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Listado de suscripciones"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Tipo de almacenamiento"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Clase de operador"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Familia de operadores"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Listado de clases de operador"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Tipos aplicables"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Listado de familias de operadores"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "Operador"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Estrategia"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "ordenamiento"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "búsqueda"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Propósito"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "familia de ops de ordenamiento"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
-msgstr "Lista de operadores de familias de operadores"
+msgstr "Listado de operadores de familias de operadores"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Tipo de dato izquierdo registrado"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Tipo de dato derecho registrado"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "Número"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Listado de funciones de la familia de operadores %s"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "Objetos grandes"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2527,11 +2735,11 @@ msgstr ""
 "psql es el terminal interactivo de PostgreSQL.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:502
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2539,27 +2747,27 @@ msgstr ""
 "  psql [OPCIONES]... [BASE-DE-DATOS [USUARIO]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "Opciones generales:\n"
 
-#: help.c:68
+#: help.c:65
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr "  -c, --command=ORDEN  ejecutar sólo una orden (SQL o interna) y salir\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
-msgstr "  -d, --dbname=BASE      base de datos a la cual conectarse\n"
+msgstr "  -d, --dbname=BASE    base de datos a la cual conectarse\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=ARCHIVO   ejecutar órdenes desde archivo, luego salir\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list           listar bases de datos, luego salir\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2569,15 +2777,15 @@ msgstr ""
 "                       definir variable de psql NOMBRE a VALOR\n"
 "                       (p.ej. -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version        mostrar información de versión, luego salir\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc      no leer archivo de configuración (~/.psqlrc)\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
@@ -2585,19 +2793,19 @@ msgstr ""
 "  -1 («uno»), --single-transaction\n"
 "                       ejecuta órdenes en una única transacción\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=opcs]    mostrar esta ayuda, luego salir\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commands  listar órdenes backslash, luego salir\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variables listar variables especiales, luego salir\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2605,47 +2813,47 @@ msgstr ""
 "\n"
 "Opciones de entrada y salida:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all       mostrar las órdenes del script\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors    mostrar órdenes fallidas\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries   mostrar órdenes enviadas al servidor\n"
 
-#: help.c:87
+#: help.c:84
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden    mostrar consultas generadas por órdenes internas\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ARCH  envía el registro de la sesión a un archivo\n"
 
-#: help.c:89
+#: help.c:86
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr "  -n, --no-readline    deshabilitar edición de línea de órdenes (readline)\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=ARCHIVO enviar resultados de consultas a archivo (u |orden)\n"
 
-#: help.c:91
+#: help.c:88
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet          modo silencioso (sin mensajes, sólo resultados)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step    modo paso a paso (confirmar cada consulta)\n"
 
-#: help.c:93
+#: help.c:90
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr "  -S, --single-line    modo de líneas (fin de línea termina la orden SQL)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2653,15 +2861,15 @@ msgstr ""
 "\n"
 "Opciones de formato de salida:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align       modo de salida desalineado\n"
 
-#: help.c:97
+#: help.c:94
 msgid "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr "      --csv            modo de salida de tabla CSV (valores separados por comas)\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -2670,15 +2878,15 @@ msgstr ""
 "  -F, --field-separator=CADENA  separador de campos para salida desalineada\n"
 "                       (por omisión: «%s»)\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html           modo de salida en tablas HTML\n"
 
-#: help.c:102
+#: help.c:99
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr "  -P, --pset=VAR[=ARG] definir opción de impresión VAR en ARG (ver orden \\pset)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: newline)\n"
@@ -2686,21 +2894,21 @@ msgstr ""
 "  -R, --record-separator=CADENA  separador de registros para salida desalineada\n"
 "                       (por omisión: salto de línea)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only    sólo muestra registros\n"
 
-#: help.c:106
+#: help.c:103
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr ""
 "  -T, --table-attr=TEXTO\n"
 "                       definir atributos de marcas de tabla HTML (ancho, borde)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded       activar modo expandido de salida de tablas\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero byte\n"
@@ -2708,7 +2916,7 @@ msgstr ""
 "  -z, --field-separator-zero\n"
 "                       definir separador de campos para salida desalineada al byte cero\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero byte\n"
@@ -2716,7 +2924,7 @@ msgstr ""
 "  -0, --record-separator-zero\n"
 "                       definir separador de filas para salida desalineada al byte cero\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2724,31 +2932,31 @@ msgstr ""
 "\n"
 "Opciones de conexión:\n"
 
-#: help.c:114
+#: help.c:111
 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"
+"  -h, --host=ANFITRIÓN    anfitrión de la base de datos o\n"
+"                          directorio del enchufe (socket)\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
-msgstr "  -p, --port=PUERTO        puerto del servidor\n"
+msgstr "  -p, --port=PUERTO       puerto del servidor\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
-msgstr "  -U, --username=USUARIO    nombre usuario de la base de datos\n"
+msgstr "  -U, --username=USUARIO  nombre usuario de la base de datos\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
-msgstr "  -w, --no-password    nunca pedir contraseña\n"
+msgstr "  -w, --no-password       nunca pedir contraseña\n"
 
-#: help.c:118
+#: help.c:115
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
-"  -W, --password       forzar petición de contraseña\n"
-"                       (debería ser automático)\n"
+"  -W, --password          forzar petición de contraseña\n"
+"                          (debería ser automático)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
@@ -2762,41 +2970,35 @@ msgstr ""
 "en la documentación de PostgreSQL.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Reporte de errores a <%s>.\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "General\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr ""
-"  \\bind [PARAM]...\n"
-"                  definir parámetros de consulta\n"
-
-#: help.c:168
+#: help.c:164
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright      mostrar términos de uso y distribución de PostgreSQL\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr ""
 "  \\crosstabview [COLUMNAS]\n"
 "                  ejecutar la consulta y desplegar en «crosstab»\n"
 
-#: help.c:170
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose     mostrar error más reciente en máxima verbosidad\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2805,30 +3007,46 @@ msgstr ""
 "                  ejecuta la consulta (y envía el resultado a un fichero o |pipe);\n"
 "                  \\g sin argumentos es equivalente a un punto y coma\n"
 
-#: help.c:173
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc          describir resultado de la consulta, sin ejecutarla\n"
 
-#: help.c:174
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec          ejecutar la consulta, luego ejecuta cada valor del resultado\n"
 
-#: help.c:175
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr ""
 "  \\gset [PREFIJO] ejecutar la consulta y almacenar el resultado en variables\n"
 "                  de psql\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr ""
 "  \\gx [(OPTIONS)] [FILE]\n"
 "                  como \\g, pero fuerza el modo de salida expandido\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q              salir de psql\n"
 
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict LLAVE_RESTRICT\n"
+"                  iniciar modo restringido con la llave indicada\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict LLAVE_RESTRICT\n"
+"                  salir de modo restringido si la llave coincide\n"
+
 #: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
@@ -2839,8 +3057,8 @@ msgstr ""
 "                  ejecutar consulta cada SEG segundos, hasta N veces,\n"
 "                  deteniéndose si menos de MIN registros son devueltos\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -2963,271 +3181,273 @@ msgid "Informational\n"
 msgstr "Informativo\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "   (opciones: S = desplegar objetos de sistema, + = agregar más detalle)\n"
+msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
+msgstr "   (opciones: S = mostrar objs. de sistema, x = modo expandido, + = más detalle)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]            listar tablas, vistas y secuencias\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]            listar tablas, vistas y secuencias\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]  NOMBRE    describir tabla, índice, secuencia o vista\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
+msgstr "  \\d[S+]  NOMBRE     describir tabla, índice, secuencia o vista\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [PATRÓN]  listar funciones de agregación\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [PATRÓN]  listar funciones de agregación\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [PATRÓN]  listar métodos de acceso\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [PATRÓN]  listar métodos de acceso\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  listar las clases de operadores\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  listar las clases de operadores\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  listar las familias de operadores\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  listar las familias de operadores\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   listar los operadores de la familia de operadores\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]   listar los operadores de la familia de operadores\n"
 
 #: help.c:229
-msgid "  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   enumera las funciones de la familia de operadores\n"
+msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
+msgstr "  \\dAp[x+] [AMPTRN [OPFPTRN]]   enumera las funciones de la familia de operadores\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [PATRÓN]  listar tablespaces\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [PATRÓN]  listar tablespaces\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [PATRÓN]  listar conversiones\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [PATRÓN]  listar conversiones\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [PATRÓN]  listar parámetros de configuración\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [PATRÓN]  listar parámetros de configuración\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [PATRÓN]  listar conversiones de tipo (casts)\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [PATRÓN]  listar conversiones de tipo (casts)\n"
 
 #: help.c:234
-msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
-msgstr "  \\dd[S]  [PATRÓN]  listar comentarios de objetos que no aparecen en otra parte\n"
+msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
+msgstr "  \\dd[Sx]  [PATRÓN]  listar comentarios de objetos que no aparecen en otra parte\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [PATRÓN]  listar dominios\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [PATRÓN]  listar dominios\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp    [PATRÓN]  listar privilegios por omisión\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x] [PATRÓN]   listar privilegios por omisión\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [PATRÓN]  listar tablas foráneas\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[S+] [PATRÓN]   listar tablas foráneas\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [PATRÓN]  listar servidores foráneos\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [PATRÓN]  listar servidores foráneos\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [PATRÓN]  listar tablas foráneas\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [PATRÓN]  listar tablas foráneas\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [PATRÓN]  listar mapeos de usuario\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [PATRÓN]  listar mapeos de usuario\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [PATRÓN]  listar conectores de datos externos\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [PATRÓN]  listar conectores de datos externos\n"
 
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
 msgstr ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
-"                    listar funciones [sólo ag./normal/proc./trigger/ventana]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"                     listar funciones [sólo ag./normal/proc./trigger/ventana]\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [PATRÓN]  listar configuraciones de búsqueda en texto\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [PATRÓN]  listar configuraciones de búsqueda en texto\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [PATRÓN]  listar diccionarios de búsqueda en texto\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [PATRÓN]  listar diccionarios de búsqueda en texto\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [PATRÓN]  listar analizadores (parsers) de búsq. en texto\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [PATRÓN]  listar analizadores (parsers) de búsq. en texto\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [PATRÓN]  listar plantillas de búsqueda en texto\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [PATRÓN]  listar plantillas de búsqueda en texto\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [PATRÓN]  listar roles\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [PATRÓN]  listar roles\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [PATRÓN]  listar índices\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [PATRÓN]  listar índices\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+]            listar objetos grandes, lo mismo que \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]            listar objetos grandes, lo mismo que \\lo_list\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [PATRÓN]  listar lenguajes procedurales\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [PATRÓN]  listar lenguajes procedurales\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [PATRÓN]  listar vistas materializadas\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [PATRÓN]  listar vistas materializadas\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [PATRÓN]  listar esquemas\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [PATRÓN]  listar esquemas\n"
 
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
-msgstr ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
-"                    listar operadores\n"
+msgstr "  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]  listar operadores\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S]  [PATRÓN]  listar ordenamientos (collations)\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [PATRÓN]  listar ordenamientos (collations)\n"
 
 #: help.c:257
-msgid "  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr "  \\dp[S]  [PATRÓN]  listar privilegios de acceso a tablas, vistas y secuencias\n"
+msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
+msgstr "  \\dp[Sx]  [PATRÓN]  listar privilegios de acceso a tablas, vistas y secuencias\n"
 
 #: help.c:258
-msgid "  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"
-msgstr "  \\dP[tin+] [PATRÓN] listar relaciones particionadas (sólo tablas/índices) [n=anidadas]\n"
+msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
+msgstr "  \\dP[itnx+] [PATRN] listar relaciones particionadas (sólo tablas/índices) [n=anidadas]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
 msgstr ""
-"  \\drds [PATRÓN_ROL [PATRÓN_BASE]]\n"
-"                    listar parámetros de rol por base de datos\n"
-
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\drg[S] [PATRÓN]  listar roles\n"
+"  \\drds[x] [PATRÓN_ROL [PATRÓN_BASE]]\n"
+"                     listar parámetros de rol por base de datos\n"
 
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [PATRÓN]  listar publicaciones de replicación\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\drg[Sx] [PATRÓN]  listar roles otorgados\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [PATRÓN]  listar suscripciones de replicación\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [PATRÓN]  listar publicaciones de replicación\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [PATRÓN]  listar secuencias\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [PATRÓN]  listar suscripciones de replicación\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [PATRÓN]  listar tablas\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [PATRÓN]  listar secuencias\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [PATRÓN]  listar tipos de dato\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [PATRÓN]  listar tablas\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [PATRÓN]  listar roles\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [PATRÓN]  listar tipos de dato\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [PATRÓN]  listar vistas\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [PATRÓN]  listar roles\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [PATRÓN]  listar extensiones\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [PATRÓN]  listar vistas\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [PATRÓN]  listar estadísticas extendidas\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [PATRÓN]  listar extensiones\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]  [PATRÓN]  listar disparadores por eventos\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [PATRÓN]  listar estadísticas extendidas\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [PATRÓN]  listar bases de datos\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [PATRÓN]  listar disparadores por eventos\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  FUNCIÓN   mostrar la definición de una función\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [PATRÓN]  listar bases de datos\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  VISTA     mostrar la definición de una vista\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]    FUNCIÓN  mostrar la definición de una función\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]   [PATRÓN]  lo mismo que \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]    VISTA    mostrar la definición de una vista\n"
+
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]   [PATRÓN]  lo mismo que \\dp\n"
 
-#: help.c:277
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "Objetos Grandes\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
-msgstr "  \\lo_export LOBOID ARCHIVO escribir objeto grande a archivo\n"
+msgstr ""
+"  \\lo_export LOBOID ARCHIVO\n"
+"                     escribir objeto grande a archivo\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
 msgstr ""
 "  \\lo_import ARCHIVO [COMENTARIO]\n"
-"                    leer objeto grande desde archivo\n"
-
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+]       listar objetos grandes\n"
+"                     leer objeto grande desde archivo\n"
 
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]       listar objetos grandes\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
-msgstr "  \\lo_unlink LOBOID borrar un objeto grande\n"
+msgstr "  \\lo_unlink LOBOID  borrar un objeto grande\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Formato\n"
 
-#: help.c:286
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a              cambiar entre modo de salida alineado y sin alinear\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [CADENA]     definir título de tabla, o indefinir si es vacío\n"
 
-#: help.c:288
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr ""
 "  \\f [CADENA]     mostrar o definir separador de campos para\n"
 "                  modo de salida sin alinear\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H              cambiar modo de salida HTML (actualmente %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3244,29 +3464,29 @@ msgstr ""
 "                   tuples_only|unicode_border_linestyle|unicode_column_linestyle|\n"
 "                   unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]      mostrar sólo filas (actualmente %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [CADENA]      definir atributos HTML de <table>, o indefinir si es vacío\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto] cambiar modo expandido (actualmente %s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "auto"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "Conexiones\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3275,7 +3495,7 @@ msgstr ""
 "  \\c[onnect] [BASE-DE-DATOS|- USUARIO|- ANFITRIÓN|- PUERTO|- | conninfo]\n"
 "                  conectar a una nueva base de datos (actual: «%s»)\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3283,84 +3503,140 @@ msgstr ""
 "  \\c[onnect] [BASE-DE-DATOS|- USUARIO|- ANFITRIÓN|- PUERTO|- | conninfo]\n"
 "                  conectar a una nueva base de datos (no hay conexión actual)\n"
 
-#: help.c:313
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo       despliega la información sobre la conexión actual\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr ""
 "  \\encoding [CODIFICACIÓN]\n"
 "                  mostrar o definir codificación del cliente\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr ""
 "  \\password [USUARIO]\n"
 "                  cambiar la contraseña para un usuario en forma segura\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Sistema Operativo\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]        cambiar el directorio de trabajo actual\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR obtener variable de ambiente\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr ""
 "  \\setenv NOMBRE [VALOR]\n"
 "                   definir o indefinir variable de ambiente\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off] mostrar tiempo de ejecución de órdenes\n"
 "                   (actualmente %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr ""
 "  \\! [ORDEN]       ejecutar orden en intérprete de órdenes (shell),\n"
 "                   o iniciar intérprete interactivo\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "Variables\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [TEXTO] NOMBRE  preguntar al usuario el valor de la variable\n"
 
-#: help.c:329
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr ""
 "  \\set [NOMBRE [VALOR]]   definir variables internas,\n"
 "                          listar todas si no se dan parámetros\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOMBRE           indefinir (eliminar) variable interna\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "Protocolo Extendido de Consultas\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       definir parámetros de consulta\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr ""
+"  \\bind_named NOMBRE_SENTENCIA [PARAM]...\n"
+"                         define parámetros para una sentencia preparada existente\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared NOMBRE_SENTENCIA\n"
+"                         cerrar una sentencia preparada existente\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           salir de modo pipeline\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 enviar datos salientes al servidor\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest          solicitar al servidor enviar datos salientes\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr "  \\getresults [NÚM_RES]  leer NÚM_RES resultados pendientes, o todos si no hay argumento\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse NOM_SENTENCIA   crea una sentencia preparada\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          enviar una consulta extendida a un pipeline en curso\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         entrar en modo pipeline\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline          agregar punto de sincronización a un pipeline en curso\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
 msgstr ""
-"Lista de variables con tratamiento especial\n"
+"Listado de variables con tratamiento especial\n"
 "\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "variables psql:\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3369,7 +3645,7 @@ msgstr ""
 "  psql --set=NOMBRE=VALOR\n"
 "  o \\set NOMBRE VALOR dentro de psql\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3377,7 +3653,7 @@ msgstr ""
 "  AUTOCOMMIT         si está definida, órdenes SQL exitosas se comprometen\n"
 "                     automáticamente\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3386,13 +3662,13 @@ msgstr ""
 "  COMP_KEYWORD_CASE  determina si usar mayúsculas al completar palabras SQL\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
 msgstr "  DBNAME             la base de datos actualmente conectada\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3401,7 +3677,7 @@ msgstr ""
 "  ECHO               controla qué entrada se escribe a la salida estándar\n"
 "                     [all, errors, none, queries]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3410,13 +3686,13 @@ msgstr ""
 "  ECHO_HIDDEN        muestra consultas internas usadas por órdenes backslash\n"
 "                     con «noexec» sólo las muestra sin ejecutarlas\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
 msgstr "  ENCODING           codificación actual del cliente\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3424,7 +3700,7 @@ msgstr ""
 "  ERROR\n"
 "    «true» si la última consulta falló; si no, «false»\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3432,15 +3708,13 @@ msgstr ""
 "  FETCH_COUNT        número de filas del resultado que extraer y mostrar cada vez\n"
 "                     (por omisión: 0=sin límite)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
-msgstr ""
-"  HIDE_TABLEAM\n"
-"                     ocultar métodos de acceso de tabla\n"
+msgstr "  HIDE_TABLEAM       ocultar métodos de acceso de tabla\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3448,7 +3722,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "                     ocultar métodos de compresión\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3456,25 +3730,25 @@ msgstr ""
 "  HISTCONTROL        controla la lista de historia de órdenes\n"
 "                     [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
 msgstr "  HISTFILE           nombre de archivo para almacenar historia de órdenes\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
 msgstr "  HISTSIZE           número de órdenes a guardar en la historia de órdenes\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
 msgstr "  HOST               el servidor actualmente conectado\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3482,13 +3756,13 @@ msgstr ""
 "  IGNOREEOF          si no está definida, enviar un EOF a sesión interactiva\n"
 "                     termina la aplicación\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
 msgstr "  LASTOID            el valor del último OID afectado\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3499,7 +3773,7 @@ msgstr ""
 "                     mensaje y SQLSTATE del último error, o cadena vacía y\n"
 "                     «00000» si no hubo\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3507,25 +3781,25 @@ msgstr ""
 "  ON_ERROR_ROLLBACK  si está definido, un error no aborta la transacción\n"
 "                     (usa «savepoints» implícitos)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
 msgstr "  ON_ERROR_STOP      detiene ejecución por lotes al ocurrir un error\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
 msgstr "  PORT               puerto del servidor de la conexión actual\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
 msgstr "  PROMPT1            especifica el prompt estándar de psql\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3533,19 +3807,19 @@ msgstr ""
 "  PROMPT2            especifica el prompt usado cuando una sentencia continúa\n"
 "                     de una línea anterior\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
 msgstr "  PROMPT3            especifica el prompt usado durante COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
 msgstr "  QUIET              ejecuta silenciosamente (igual que -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3553,7 +3827,7 @@ msgstr ""
 "  ROW_COUNT          número de tuplas retornadas o afectadas por última\n"
 "                     consulta, o 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3563,32 +3837,27 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "                     versión del servidor (cadena corta o numérica)\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
-msgstr ""
-"  SHELL_ERROR\n"
-"    «true» si la última orden de shell falló, «false» si tuvo éxito\n"
+msgstr "  SHELL_ERROR        «true» si la última orden de shell falló, «false» si tuvo éxito\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
-msgstr ""
-"  SHELL_EXIT_CODE\n"
-"    estado de salida de la última orden de shell\n"
+msgstr "  SHELL_EXIT_CODE    estado de salida de la última orden de shell\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
 msgstr ""
-"  SHOW_ALL_RESULTS\n"
-"    mostrar todos los resultados de una consulta combinada (\\;) en lugar\n"
-"    de sólo mostrar el último\n"
+"  SHOW_ALL_RESULTS   mostrar todos los resultados de una consulta\n"
+"                     combinada (\\;) en lugar de sólo mostrar el último\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3596,31 +3865,31 @@ msgstr ""
 "  SHOW_CONTEXT       controla el despliegue de campos de contexto de mensaje\n"
 "                     [never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
 msgstr "  SINGLELINE         fin de línea termina modo de órdenes SQL (igual que -S)\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
 msgstr "  SINGLESTEP         modo paso a paso (igual que -s)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
 msgstr "  SQLSTATE           SQLSTATE de la última consulta, o «00000» si no hubo error\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
 msgstr "  USER               el usuario actualmente conectado\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3628,7 +3897,7 @@ msgstr ""
 "  VERBOSITY          controla la verbosidad de errores [default, verbose,\n"
 "                     terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3640,7 +3909,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "                     versión de psql (cadena verbosa, corta o numérica)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL     número de segundos que \\watch espera entre ejecuciones\n"
+"                     (por omisión %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3648,7 +3926,7 @@ msgstr ""
 "\n"
 "Parámetros de despliegue:\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3658,25 +3936,32 @@ msgstr ""
 "  o \\pset NOMBRE [VALOR] dentro de psql\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
 msgstr "  border             estilo de borde (número)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
 msgstr "  columns            define el ancho para formato «wrapped»\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr "  csv_fieldsep       separador de campos para CSV (por omisión: «%c»)\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
 msgstr "  expanded (o x)     salida expandida [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3685,37 +3970,37 @@ msgstr ""
 "  fieldsep           separador de campos para formato «unaligned»\n"
 "                     (por omisión: «%s»)\n"
 
-#: help.c:468
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
 msgstr "  fieldsep_zero      separador de campos en «unaligned» es byte cero\n"
 
-#: help.c:470
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
 msgstr "  footer             activa o desactiva el pie de tabla [on, off]\n"
 
-#: help.c:472
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 msgstr "  format             define el formato de salida [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
 msgstr "  linestyle          define el estilo de dibujo de líneas [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
 msgstr "  null               define la cadena a imprimirse para valores null\n"
 
-#: help.c:478
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -3723,26 +4008,26 @@ msgstr ""
 "  numericlocale      activa despliegue de carácter específico del lenguaje para\n"
 "                     separar grupos de dígitos\n"
 
-#: help.c:480
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
 msgstr "  pager              controla cuándo se usará un paginador externo [yes, no, always]\n"
 
-#: help.c:482
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
 msgstr "  recordsep          separador de registros (líneas) para formato «unaligned»\n"
 
-#: help.c:484
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
 msgstr "  recordsep_zero     separador de registros en «unaligned» es byte cero\n"
 
 # XXX WTF does this mean?
-#: help.c:486
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -3752,19 +4037,19 @@ msgstr ""
 "                     o ancho proporcional de columnas alineadas a la izquierda\n"
 "                     en formato «latex-longtable»\n"
 
-#: help.c:489
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
 msgstr "  title              define el título de tablas\n"
 
-#: help.c:491
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
 msgstr "  tuples_only        si está definido, sólo los datos de la tabla se muestran\n"
 
-#: help.c:493
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -3776,17 +4061,16 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "                     define el estilo de líneas Unicode [single, double]\n"
 
-#: help.c:497
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
 "    [full, column, page, integer value]\n"
 msgstr ""
-"  xheader_width\n"
-"    define el ancho máximo del encabezado para el formato expandido\n"
-"    [full, column, page, valor entero]\n"
+"  xheader_width      define el ancho máximo del encabezado para el formato\n"
+"                     expandido [full, column, page, valor entero]\n"
 
-#: help.c:501
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -3794,7 +4078,7 @@ msgstr ""
 "\n"
 "Variables de ambiente:\n"
 
-#: help.c:505
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -3803,7 +4087,7 @@ msgstr ""
 "  NOMBRE=VALOR [NOMBRE=VALOR] psql ...\n"
 "  o \\setenv NOMBRE [VALOR] dentro de psql\n"
 
-#: help.c:507
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -3814,55 +4098,55 @@ msgstr ""
 "  psql ...\n"
 "  o \\setenv NOMBRE [VALOR] dentro de psql\n"
 
-#: help.c:510
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
 msgstr "  COLUMNS            número de columnas para formato «wrapped»\n"
 
-#: help.c:512
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
 msgstr "  PGAPPNAME          igual que el parámetro de conexión application_name\n"
 
-#: help.c:514
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
 msgstr "  PGDATABASE         igual que el parámetro de conexión dbname\n"
 
-#: help.c:516
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
 msgstr "  PGHOST             igual que el parámetro de conexión host\n"
 
-#: help.c:518
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
 msgstr "  PGPASSFILE         nombre de archivo de contraseñas\n"
 
-#: help.c:520
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
 msgstr "  PGPASSWORD         contraseña de la conexión (no recomendado)\n"
 
-#: help.c:522
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
 msgstr "  PGPORT             igual que el parámetro de conexión port\n"
 
-#: help.c:524
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
 msgstr "  PGUSER             igual que el parámetro de conexión user\n"
 
-#: help.c:526
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -3870,7 +4154,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "                     editor usado por órdenes \\e, \\ef, y \\ev\n"
 
-#: help.c:528
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -3878,47 +4162,47 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARGS\n"
 "                     cómo especificar número de línea al invocar al editor\n"
 
-#: help.c:530
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
 msgstr "  PSQL_HISTORY       ubicación alternativa del archivo de historia de órdenes\n"
 
-#: help.c:532
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
 msgstr "  PSQL_PAGER, PAGER  nombre de programa paginador externo\n"
 
-#: help.c:535
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
 msgstr "  PSQL_WATCH_PAGER   paginador externo para usar con \\watch\n"
 
-#: help.c:538
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
 msgstr "  PSQLRC             ubicación alternativa para el archivo .psqlrc del usuario\n"
 
-#: help.c:540
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
 msgstr "  SHELL              intérprete usado por la orden \\!\n"
 
-#: help.c:542
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
 msgstr "  TMPDIR             directorio para archivos temporales\n"
 
-#: help.c:602
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Ayuda disponible:\n"
 
-#: help.c:697
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -3937,7 +4221,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:720
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4043,12 +4327,12 @@ msgstr "consulta ignorada; use \\endif o Ctrl-C para salir del bloque \\if actua
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "se alcanzó EOF sin encontrar el/los \\endif de cierre"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "una cadena de caracteres entre comillas está inconclusa"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: memoria agotada"
@@ -4056,2463 +4340,2483 @@ msgstr "%s: memoria agotada"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:245
-#: sql_help.c:247 sql_help.c:248 sql_help.c:250 sql_help.c:252 sql_help.c:255
-#: sql_help.c:257 sql_help.c:259 sql_help.c:261 sql_help.c:276 sql_help.c:277
-#: sql_help.c:278 sql_help.c:280 sql_help.c:329 sql_help.c:331 sql_help.c:333
-#: sql_help.c:335 sql_help.c:404 sql_help.c:409 sql_help.c:411 sql_help.c:453
-#: sql_help.c:455 sql_help.c:458 sql_help.c:460 sql_help.c:529 sql_help.c:534
-#: sql_help.c:539 sql_help.c:544 sql_help.c:549 sql_help.c:603 sql_help.c:605
-#: sql_help.c:607 sql_help.c:609 sql_help.c:611 sql_help.c:614 sql_help.c:616
-#: sql_help.c:619 sql_help.c:630 sql_help.c:632 sql_help.c:676 sql_help.c:678
-#: sql_help.c:680 sql_help.c:683 sql_help.c:685 sql_help.c:687 sql_help.c:728
-#: sql_help.c:732 sql_help.c:736 sql_help.c:757 sql_help.c:760 sql_help.c:763
-#: sql_help.c:792 sql_help.c:804 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:833 sql_help.c:836 sql_help.c:865 sql_help.c:870 sql_help.c:875
-#: sql_help.c:880 sql_help.c:885 sql_help.c:912 sql_help.c:914 sql_help.c:916
-#: sql_help.c:918 sql_help.c:921 sql_help.c:923 sql_help.c:970 sql_help.c:1015
-#: sql_help.c:1020 sql_help.c:1025 sql_help.c:1030 sql_help.c:1035
-#: sql_help.c:1054 sql_help.c:1065 sql_help.c:1067 sql_help.c:1087
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1118 sql_help.c:1120 sql_help.c:1132
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1138 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1163 sql_help.c:1167 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1175 sql_help.c:1176 sql_help.c:1179
-#: sql_help.c:1182 sql_help.c:1184 sql_help.c:1324 sql_help.c:1326
-#: sql_help.c:1329 sql_help.c:1332 sql_help.c:1334 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1464 sql_help.c:1466
-#: sql_help.c:1468 sql_help.c:1471 sql_help.c:1492 sql_help.c:1495
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1505 sql_help.c:1507
-#: sql_help.c:1509 sql_help.c:1511 sql_help.c:1525 sql_help.c:1528
-#: sql_help.c:1530 sql_help.c:1532 sql_help.c:1542 sql_help.c:1544
-#: sql_help.c:1554 sql_help.c:1556 sql_help.c:1566 sql_help.c:1569
-#: sql_help.c:1592 sql_help.c:1594 sql_help.c:1596 sql_help.c:1598
-#: sql_help.c:1601 sql_help.c:1603 sql_help.c:1606 sql_help.c:1609
-#: sql_help.c:1660 sql_help.c:1703 sql_help.c:1706 sql_help.c:1708
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:1715 sql_help.c:1717
-#: sql_help.c:1720 sql_help.c:1770 sql_help.c:1786 sql_help.c:2019
-#: sql_help.c:2088 sql_help.c:2107 sql_help.c:2120 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2196 sql_help.c:2224 sql_help.c:2257
-#: sql_help.c:2275 sql_help.c:2303 sql_help.c:2414 sql_help.c:2460
-#: sql_help.c:2485 sql_help.c:2508 sql_help.c:2512 sql_help.c:2546
-#: sql_help.c:2566 sql_help.c:2588 sql_help.c:2602 sql_help.c:2623
-#: sql_help.c:2652 sql_help.c:2685 sql_help.c:2708 sql_help.c:2755
-#: sql_help.c:3053 sql_help.c:3066 sql_help.c:3083 sql_help.c:3099
-#: sql_help.c:3139 sql_help.c:3193 sql_help.c:3197 sql_help.c:3199
-#: sql_help.c:3206 sql_help.c:3225 sql_help.c:3252 sql_help.c:3287
-#: sql_help.c:3299 sql_help.c:3308 sql_help.c:3352 sql_help.c:3366
-#: sql_help.c:3394 sql_help.c:3402 sql_help.c:3414 sql_help.c:3424
-#: sql_help.c:3432 sql_help.c:3440 sql_help.c:3448 sql_help.c:3456
-#: sql_help.c:3465 sql_help.c:3476 sql_help.c:3484 sql_help.c:3492
-#: sql_help.c:3500 sql_help.c:3508 sql_help.c:3518 sql_help.c:3527
-#: sql_help.c:3536 sql_help.c:3544 sql_help.c:3554 sql_help.c:3565
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3593 sql_help.c:3602
-#: sql_help.c:3610 sql_help.c:3618 sql_help.c:3626 sql_help.c:3634
-#: sql_help.c:3642 sql_help.c:3650 sql_help.c:3658 sql_help.c:3666
-#: sql_help.c:3674 sql_help.c:3682 sql_help.c:3699 sql_help.c:3708
-#: sql_help.c:3716 sql_help.c:3733 sql_help.c:3748 sql_help.c:4061
-#: sql_help.c:4182 sql_help.c:4211 sql_help.c:4227 sql_help.c:4229
-#: sql_help.c:4733 sql_help.c:4781 sql_help.c:4940
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "nombre"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:340 sql_help.c:1863
-#: sql_help.c:3367 sql_help.c:4500
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "signatura_func_agregación"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:260
-#: sql_help.c:281 sql_help.c:412 sql_help.c:459 sql_help.c:538 sql_help.c:586
-#: sql_help.c:604 sql_help.c:631 sql_help.c:684 sql_help.c:759 sql_help.c:814
-#: sql_help.c:835 sql_help.c:874 sql_help.c:924 sql_help.c:971 sql_help.c:1024
-#: sql_help.c:1056 sql_help.c:1066 sql_help.c:1101 sql_help.c:1121
-#: sql_help.c:1135 sql_help.c:1185 sql_help.c:1333 sql_help.c:1465
-#: sql_help.c:1508 sql_help.c:1529 sql_help.c:1543 sql_help.c:1555
-#: sql_help.c:1568 sql_help.c:1595 sql_help.c:1661 sql_help.c:1714
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "nuevo_nombre"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:258
-#: sql_help.c:279 sql_help.c:410 sql_help.c:495 sql_help.c:543 sql_help.c:633
-#: sql_help.c:642 sql_help.c:707 sql_help.c:731 sql_help.c:762 sql_help.c:817
-#: sql_help.c:879 sql_help.c:922 sql_help.c:1029 sql_help.c:1068
-#: sql_help.c:1099 sql_help.c:1119 sql_help.c:1133 sql_help.c:1183
-#: sql_help.c:1399 sql_help.c:1467 sql_help.c:1510 sql_help.c:1531
-#: sql_help.c:1593 sql_help.c:1709 sql_help.c:3039
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "nuevo_dueño"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:262 sql_help.c:332
-#: sql_help.c:461 sql_help.c:548 sql_help.c:686 sql_help.c:735 sql_help.c:765
-#: sql_help.c:820 sql_help.c:884 sql_help.c:1034 sql_help.c:1103
-#: sql_help.c:1137 sql_help.c:1335 sql_help.c:1512 sql_help.c:1533
-#: sql_help.c:1545 sql_help.c:1557 sql_help.c:1597 sql_help.c:1716
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "nuevo_esquema"
 
-#: sql_help.c:44 sql_help.c:1927 sql_help.c:3368 sql_help.c:4529
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "donde signatura_func_agregación es:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:350 sql_help.c:363
-#: sql_help.c:367 sql_help.c:383 sql_help.c:386 sql_help.c:389 sql_help.c:530
-#: sql_help.c:535 sql_help.c:540 sql_help.c:545 sql_help.c:550 sql_help.c:866
-#: sql_help.c:871 sql_help.c:876 sql_help.c:881 sql_help.c:886 sql_help.c:1016
-#: sql_help.c:1021 sql_help.c:1026 sql_help.c:1031 sql_help.c:1036
-#: sql_help.c:1881 sql_help.c:1898 sql_help.c:1904 sql_help.c:1928
-#: sql_help.c:1931 sql_help.c:1934 sql_help.c:2089 sql_help.c:2108
-#: sql_help.c:2111 sql_help.c:2415 sql_help.c:2624 sql_help.c:3369
-#: sql_help.c:3372 sql_help.c:3375 sql_help.c:3466 sql_help.c:3555
-#: sql_help.c:3583 sql_help.c:3936 sql_help.c:4399 sql_help.c:4506
-#: sql_help.c:4513 sql_help.c:4519 sql_help.c:4530 sql_help.c:4533
-#: sql_help.c:4536
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "modo_arg"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:351 sql_help.c:364
-#: sql_help.c:368 sql_help.c:384 sql_help.c:387 sql_help.c:390 sql_help.c:531
-#: sql_help.c:536 sql_help.c:541 sql_help.c:546 sql_help.c:551 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:882 sql_help.c:887 sql_help.c:1017
-#: sql_help.c:1022 sql_help.c:1027 sql_help.c:1032 sql_help.c:1037
-#: sql_help.c:1882 sql_help.c:1899 sql_help.c:1905 sql_help.c:1929
-#: sql_help.c:1932 sql_help.c:1935 sql_help.c:2090 sql_help.c:2109
-#: sql_help.c:2112 sql_help.c:2416 sql_help.c:2625 sql_help.c:3370
-#: sql_help.c:3373 sql_help.c:3376 sql_help.c:3467 sql_help.c:3556
-#: sql_help.c:3584 sql_help.c:4507 sql_help.c:4514 sql_help.c:4520
-#: sql_help.c:4531 sql_help.c:4534 sql_help.c:4537
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "nombre_arg"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:352 sql_help.c:365
-#: sql_help.c:369 sql_help.c:385 sql_help.c:388 sql_help.c:391 sql_help.c:532
-#: sql_help.c:537 sql_help.c:542 sql_help.c:547 sql_help.c:552 sql_help.c:868
-#: sql_help.c:873 sql_help.c:878 sql_help.c:883 sql_help.c:888 sql_help.c:1018
-#: sql_help.c:1023 sql_help.c:1028 sql_help.c:1033 sql_help.c:1038
-#: sql_help.c:1883 sql_help.c:1900 sql_help.c:1906 sql_help.c:1930
-#: sql_help.c:1933 sql_help.c:1936 sql_help.c:2417 sql_help.c:2626
-#: sql_help.c:3371 sql_help.c:3374 sql_help.c:3377 sql_help.c:3468
-#: sql_help.c:3557 sql_help.c:3585 sql_help.c:4508 sql_help.c:4515
-#: sql_help.c:4521 sql_help.c:4532 sql_help.c:4535 sql_help.c:4538
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "tipo_arg"
 
-#: sql_help.c:114 sql_help.c:407 sql_help.c:484 sql_help.c:496 sql_help.c:965
-#: sql_help.c:1116 sql_help.c:1526 sql_help.c:1655 sql_help.c:1687
-#: sql_help.c:1739 sql_help.c:1798 sql_help.c:1987 sql_help.c:1994
-#: sql_help.c:2306 sql_help.c:2356 sql_help.c:2363 sql_help.c:2372
-#: sql_help.c:2461 sql_help.c:2686 sql_help.c:2777 sql_help.c:3068
-#: sql_help.c:3253 sql_help.c:3275 sql_help.c:3415 sql_help.c:3772
-#: sql_help.c:3980 sql_help.c:4226 sql_help.c:4228 sql_help.c:5006
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "opción"
 
-#: sql_help.c:115 sql_help.c:966 sql_help.c:1656 sql_help.c:2462
-#: sql_help.c:2687 sql_help.c:3254 sql_help.c:3416
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "donde opción puede ser:"
 
-#: sql_help.c:116 sql_help.c:2238
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:117 sql_help.c:967 sql_help.c:1657 sql_help.c:2239
-#: sql_help.c:2463 sql_help.c:2688 sql_help.c:3255
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "límite_conexiones"
 
-#: sql_help.c:118 sql_help.c:2240
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "esplantilla"
 
-#: sql_help.c:124 sql_help.c:621 sql_help.c:689 sql_help.c:703 sql_help.c:1338
-#: sql_help.c:1392 sql_help.c:4232
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "nuevo_tablespace"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:558 sql_help.c:560
-#: sql_help.c:561 sql_help.c:891 sql_help.c:893 sql_help.c:894 sql_help.c:974
-#: sql_help.c:978 sql_help.c:981 sql_help.c:1043 sql_help.c:1045
-#: sql_help.c:1046 sql_help.c:1196 sql_help.c:1198 sql_help.c:1664
-#: sql_help.c:1668 sql_help.c:1671 sql_help.c:2427 sql_help.c:2630
-#: sql_help.c:3948 sql_help.c:4250 sql_help.c:4411 sql_help.c:4721
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "parámetro_de_configuración"
 
-#: sql_help.c:128 sql_help.c:408 sql_help.c:479 sql_help.c:485 sql_help.c:497
-#: sql_help.c:559 sql_help.c:613 sql_help.c:695 sql_help.c:705 sql_help.c:892
-#: sql_help.c:920 sql_help.c:975 sql_help.c:1044 sql_help.c:1117
-#: sql_help.c:1162 sql_help.c:1166 sql_help.c:1170 sql_help.c:1173
-#: sql_help.c:1178 sql_help.c:1181 sql_help.c:1197 sql_help.c:1371
-#: sql_help.c:1394 sql_help.c:1442 sql_help.c:1450 sql_help.c:1470
-#: sql_help.c:1527 sql_help.c:1611 sql_help.c:1665 sql_help.c:1688
-#: sql_help.c:2307 sql_help.c:2357 sql_help.c:2364 sql_help.c:2373
-#: sql_help.c:2428 sql_help.c:2429 sql_help.c:2493 sql_help.c:2496
-#: sql_help.c:2530 sql_help.c:2631 sql_help.c:2632 sql_help.c:2655
-#: sql_help.c:2778 sql_help.c:2817 sql_help.c:2927 sql_help.c:2940
-#: sql_help.c:2954 sql_help.c:2995 sql_help.c:3003 sql_help.c:3025
-#: sql_help.c:3042 sql_help.c:3069 sql_help.c:3276 sql_help.c:3981
-#: sql_help.c:4722 sql_help.c:4723 sql_help.c:4724 sql_help.c:4725
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "valor"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "rol_destino"
 
-#: sql_help.c:203 sql_help.c:929 sql_help.c:2291 sql_help.c:2660
-#: sql_help.c:2733 sql_help.c:2738 sql_help.c:3911 sql_help.c:3920
-#: sql_help.c:3939 sql_help.c:3951 sql_help.c:4374 sql_help.c:4383
-#: sql_help.c:4402 sql_help.c:4414
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "nombre_de_esquema"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "grant_o_revoke_abreviado"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "donde grant_o_revoke_abreviado es uno de:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:584 sql_help.c:620 sql_help.c:688 sql_help.c:838 sql_help.c:985
-#: sql_help.c:1337 sql_help.c:1675 sql_help.c:2466 sql_help.c:2467
-#: sql_help.c:2468 sql_help.c:2469 sql_help.c:2470 sql_help.c:2604
-#: sql_help.c:2691 sql_help.c:2692 sql_help.c:2693 sql_help.c:3258
-#: sql_help.c:3259 sql_help.c:3260 sql_help.c:3261 sql_help.c:3262
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:4423 sql_help.c:4427
-#: sql_help.c:4743
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "nombre_de_rol"
 
-#: sql_help.c:246 sql_help.c:265 sql_help.c:472 sql_help.c:928 sql_help.c:1353
-#: sql_help.c:1355 sql_help.c:1359 sql_help.c:1409 sql_help.c:1421
-#: sql_help.c:1446 sql_help.c:1705 sql_help.c:2260 sql_help.c:2264
-#: sql_help.c:2376 sql_help.c:2381 sql_help.c:2489 sql_help.c:2659
-#: sql_help.c:2794 sql_help.c:2799 sql_help.c:2801 sql_help.c:2922
-#: sql_help.c:2935 sql_help.c:2949 sql_help.c:2958 sql_help.c:2970
-#: sql_help.c:2999 sql_help.c:4012 sql_help.c:4027 sql_help.c:4029
-#: sql_help.c:4125 sql_help.c:4128 sql_help.c:4130 sql_help.c:4593
-#: sql_help.c:4594 sql_help.c:4603 sql_help.c:4650 sql_help.c:4651
-#: sql_help.c:4652 sql_help.c:4653 sql_help.c:4654 sql_help.c:4655
-#: sql_help.c:4696 sql_help.c:4697 sql_help.c:4702 sql_help.c:4707
-#: sql_help.c:4851 sql_help.c:4852 sql_help.c:4861 sql_help.c:4908
-#: sql_help.c:4909 sql_help.c:4910 sql_help.c:4911 sql_help.c:4912
-#: sql_help.c:4913 sql_help.c:4968 sql_help.c:4970 sql_help.c:5036
-#: sql_help.c:5096 sql_help.c:5097 sql_help.c:5106 sql_help.c:5153
-#: sql_help.c:5154 sql_help.c:5155 sql_help.c:5156 sql_help.c:5157
-#: sql_help.c:5158
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "expresión"
 
-#: sql_help.c:249 sql_help.c:2261
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "restricción_de_dominio"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:256 sql_help.c:264 sql_help.c:487
-#: sql_help.c:488 sql_help.c:1330 sql_help.c:1379 sql_help.c:1380
-#: sql_help.c:1381 sql_help.c:1408 sql_help.c:1420 sql_help.c:1437
-#: sql_help.c:1869 sql_help.c:1871 sql_help.c:2263 sql_help.c:2375
-#: sql_help.c:2380 sql_help.c:2957 sql_help.c:2969 sql_help.c:4024
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "nombre_restricción"
 
-#: sql_help.c:254 sql_help.c:1331
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "nuevo_nombre_restricción"
 
-#: sql_help.c:263 sql_help.c:2262
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "donde restricción_de_dominio es:"
 
-#: sql_help.c:330 sql_help.c:1115
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "nueva_versión"
 
-#: sql_help.c:334 sql_help.c:336
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "objeto_miembro"
 
-#: sql_help.c:337
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "dondo objeto_miembro es:"
 
-#: sql_help.c:338 sql_help.c:343 sql_help.c:344 sql_help.c:345 sql_help.c:346
-#: sql_help.c:347 sql_help.c:348 sql_help.c:353 sql_help.c:357 sql_help.c:359
-#: sql_help.c:361 sql_help.c:370 sql_help.c:371 sql_help.c:372 sql_help.c:373
-#: sql_help.c:374 sql_help.c:375 sql_help.c:376 sql_help.c:377 sql_help.c:380
-#: sql_help.c:381 sql_help.c:1861 sql_help.c:1866 sql_help.c:1873
-#: sql_help.c:1874 sql_help.c:1875 sql_help.c:1876 sql_help.c:1877
-#: sql_help.c:1878 sql_help.c:1879 sql_help.c:1884 sql_help.c:1886
-#: sql_help.c:1890 sql_help.c:1892 sql_help.c:1896 sql_help.c:1901
-#: sql_help.c:1902 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1912 sql_help.c:1913 sql_help.c:1914 sql_help.c:1915
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:1918 sql_help.c:1919
-#: sql_help.c:1924 sql_help.c:1925 sql_help.c:4496 sql_help.c:4501
-#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4516 sql_help.c:4517 sql_help.c:4522
-#: sql_help.c:4523 sql_help.c:4524 sql_help.c:4525 sql_help.c:4526
-#: sql_help.c:4527
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "nombre_de_objeto"
 
-#: sql_help.c:339 sql_help.c:1862 sql_help.c:4499
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "nombre_función_agregación"
 
-#: sql_help.c:341 sql_help.c:1864 sql_help.c:2154 sql_help.c:2158
-#: sql_help.c:2160 sql_help.c:3385
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "tipo_fuente"
 
-#: sql_help.c:342 sql_help.c:1865 sql_help.c:2155 sql_help.c:2159
-#: sql_help.c:2161 sql_help.c:3386
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "tipo_destino"
 
-#: sql_help.c:349 sql_help.c:802 sql_help.c:1880 sql_help.c:2156
-#: sql_help.c:2199 sql_help.c:2279 sql_help.c:2547 sql_help.c:2578
-#: sql_help.c:3145 sql_help.c:4398 sql_help.c:4505 sql_help.c:4622
-#: sql_help.c:4626 sql_help.c:4630 sql_help.c:4633 sql_help.c:4880
-#: sql_help.c:4884 sql_help.c:4888 sql_help.c:4891 sql_help.c:5125
-#: sql_help.c:5129 sql_help.c:5133 sql_help.c:5136
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "nombre_de_función"
 
-#: sql_help.c:354 sql_help.c:795 sql_help.c:1887 sql_help.c:2571
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "nombre_operador"
 
-#: sql_help.c:355 sql_help.c:729 sql_help.c:733 sql_help.c:737 sql_help.c:1888
-#: sql_help.c:2548 sql_help.c:3509
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "tipo_izq"
 
-#: sql_help.c:356 sql_help.c:730 sql_help.c:734 sql_help.c:738 sql_help.c:1889
-#: sql_help.c:2549 sql_help.c:3510
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "tipo_der"
 
-#: sql_help.c:358 sql_help.c:360 sql_help.c:758 sql_help.c:761 sql_help.c:764
-#: sql_help.c:793 sql_help.c:805 sql_help.c:813 sql_help.c:816 sql_help.c:819
-#: sql_help.c:1426 sql_help.c:1891 sql_help.c:1893 sql_help.c:2568
-#: sql_help.c:2589 sql_help.c:2975 sql_help.c:3519 sql_help.c:3528
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "método_de_índice"
 
-#: sql_help.c:362 sql_help.c:1897 sql_help.c:4512
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "nombre_de_procedimiento"
 
-#: sql_help.c:366 sql_help.c:1903 sql_help.c:3935 sql_help.c:4518
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "nombre_de_rutina"
 
-#: sql_help.c:378 sql_help.c:1398 sql_help.c:1920 sql_help.c:2423
-#: sql_help.c:2629 sql_help.c:2930 sql_help.c:3112 sql_help.c:3690
-#: sql_help.c:3957 sql_help.c:4420
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "nombre_de_tipo"
 
-#: sql_help.c:379 sql_help.c:1921 sql_help.c:2422 sql_help.c:2628
-#: sql_help.c:3113 sql_help.c:3343 sql_help.c:3691 sql_help.c:3942
-#: sql_help.c:4405
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "nombre_lenguaje"
 
-#: sql_help.c:382
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "y signatura_func_agregación es:"
 
-#: sql_help.c:405 sql_help.c:2021 sql_help.c:2304
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "función_manejadora"
 
-#: sql_help.c:406 sql_help.c:2305
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "función_validadora"
 
-#: sql_help.c:454 sql_help.c:533 sql_help.c:677 sql_help.c:869 sql_help.c:1019
-#: sql_help.c:1325 sql_help.c:1602
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "acción"
 
-#: sql_help.c:456 sql_help.c:463 sql_help.c:467 sql_help.c:468 sql_help.c:471
-#: sql_help.c:473 sql_help.c:474 sql_help.c:475 sql_help.c:477 sql_help.c:480
-#: sql_help.c:482 sql_help.c:483 sql_help.c:681 sql_help.c:691 sql_help.c:693
-#: sql_help.c:696 sql_help.c:698 sql_help.c:699 sql_help.c:927 sql_help.c:1096
-#: sql_help.c:1327 sql_help.c:1345 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1354 sql_help.c:1356 sql_help.c:1357 sql_help.c:1358
-#: sql_help.c:1360 sql_help.c:1361 sql_help.c:1363 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1369 sql_help.c:1372 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1422 sql_help.c:1424 sql_help.c:1431
-#: sql_help.c:1440 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1704 sql_help.c:1707 sql_help.c:1711 sql_help.c:1747
-#: sql_help.c:1868 sql_help.c:1984 sql_help.c:1990 sql_help.c:2004
-#: sql_help.c:2005 sql_help.c:2006 sql_help.c:2354 sql_help.c:2367
-#: sql_help.c:2420 sql_help.c:2488 sql_help.c:2494 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2763 sql_help.c:2798 sql_help.c:2800
-#: sql_help.c:2912 sql_help.c:2921 sql_help.c:2931 sql_help.c:2934
-#: sql_help.c:2944 sql_help.c:2948 sql_help.c:2971 sql_help.c:2973
-#: sql_help.c:2980 sql_help.c:2993 sql_help.c:2998 sql_help.c:3005
-#: sql_help.c:3006 sql_help.c:3022 sql_help.c:3148 sql_help.c:3288
-#: sql_help.c:3914 sql_help.c:3915 sql_help.c:4011 sql_help.c:4026
-#: sql_help.c:4028 sql_help.c:4030 sql_help.c:4124 sql_help.c:4127
-#: sql_help.c:4129 sql_help.c:4131 sql_help.c:4377 sql_help.c:4378
-#: sql_help.c:4498 sql_help.c:4659 sql_help.c:4666 sql_help.c:4668
-#: sql_help.c:4917 sql_help.c:4924 sql_help.c:4926 sql_help.c:4967
-#: sql_help.c:4969 sql_help.c:4971 sql_help.c:5024 sql_help.c:5162
-#: sql_help.c:5169 sql_help.c:5171
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "nombre_de_columna"
 
-#: sql_help.c:457 sql_help.c:682 sql_help.c:1328 sql_help.c:1712
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "nuevo_nombre_de_columna"
 
-#: sql_help.c:462 sql_help.c:554 sql_help.c:690 sql_help.c:890 sql_help.c:1040
-#: sql_help.c:1344 sql_help.c:1612
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "donde acción es una de:"
 
-#: sql_help.c:464 sql_help.c:469 sql_help.c:1088 sql_help.c:1346
-#: sql_help.c:1351 sql_help.c:1614 sql_help.c:1618 sql_help.c:2258
-#: sql_help.c:2355 sql_help.c:2567 sql_help.c:2756 sql_help.c:2913
-#: sql_help.c:3195 sql_help.c:4183
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "tipo_de_dato"
 
-#: sql_help.c:465 sql_help.c:470 sql_help.c:1347 sql_help.c:1352
-#: sql_help.c:1447 sql_help.c:1615 sql_help.c:1619 sql_help.c:2259
-#: sql_help.c:2358 sql_help.c:2490 sql_help.c:2915 sql_help.c:2923
-#: sql_help.c:2936 sql_help.c:2950 sql_help.c:3000 sql_help.c:3196
-#: sql_help.c:3202 sql_help.c:4021
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "ordenamiento"
 
-#: sql_help.c:466 sql_help.c:1348 sql_help.c:2359 sql_help.c:2368
-#: sql_help.c:2916 sql_help.c:2932 sql_help.c:2945
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "restricción_de_columna"
 
-#: sql_help.c:476 sql_help.c:618 sql_help.c:692 sql_help.c:1368 sql_help.c:5018
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "entero"
 
-#: sql_help.c:478 sql_help.c:481 sql_help.c:694 sql_help.c:697 sql_help.c:1370
-#: sql_help.c:1373
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "opción_de_atributo"
 
-#: sql_help.c:486 sql_help.c:1377 sql_help.c:2360 sql_help.c:2369
-#: sql_help.c:2917 sql_help.c:2933 sql_help.c:2946
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "restricción_de_tabla"
 
-#: sql_help.c:489 sql_help.c:490 sql_help.c:491 sql_help.c:492 sql_help.c:1382
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:1922
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "nombre_disparador"
 
-#: sql_help.c:493 sql_help.c:494 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:2361 sql_help.c:2366 sql_help.c:2920 sql_help.c:2943
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "tabla_padre"
 
-#: sql_help.c:553 sql_help.c:610 sql_help.c:679 sql_help.c:889 sql_help.c:1039
-#: sql_help.c:1571 sql_help.c:2290
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "nombre_de_extensión"
 
-#: sql_help.c:555 sql_help.c:1041 sql_help.c:2424
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "costo_de_ejecución"
 
-#: sql_help.c:556 sql_help.c:1042 sql_help.c:2425
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "núm_de_filas"
 
-#: sql_help.c:557 sql_help.c:2426
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "función_de_soporte"
 
-#: sql_help.c:579 sql_help.c:581 sql_help.c:964 sql_help.c:972 sql_help.c:976
-#: sql_help.c:979 sql_help.c:982 sql_help.c:1654 sql_help.c:1662
-#: sql_help.c:1666 sql_help.c:1669 sql_help.c:1672 sql_help.c:2734
-#: sql_help.c:2736 sql_help.c:2739 sql_help.c:2740 sql_help.c:3912
-#: sql_help.c:3913 sql_help.c:3917 sql_help.c:3918 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3924 sql_help.c:3925 sql_help.c:3927
-#: sql_help.c:3928 sql_help.c:3930 sql_help.c:3931 sql_help.c:3933
-#: sql_help.c:3934 sql_help.c:3940 sql_help.c:3941 sql_help.c:3943
-#: sql_help.c:3944 sql_help.c:3946 sql_help.c:3947 sql_help.c:3949
-#: sql_help.c:3950 sql_help.c:3952 sql_help.c:3953 sql_help.c:3955
-#: sql_help.c:3956 sql_help.c:3958 sql_help.c:3959 sql_help.c:3961
-#: sql_help.c:3962 sql_help.c:4375 sql_help.c:4376 sql_help.c:4380
-#: sql_help.c:4381 sql_help.c:4384 sql_help.c:4385 sql_help.c:4387
-#: sql_help.c:4388 sql_help.c:4390 sql_help.c:4391 sql_help.c:4393
-#: sql_help.c:4394 sql_help.c:4396 sql_help.c:4397 sql_help.c:4403
-#: sql_help.c:4404 sql_help.c:4406 sql_help.c:4407 sql_help.c:4409
-#: sql_help.c:4410 sql_help.c:4412 sql_help.c:4413 sql_help.c:4415
-#: sql_help.c:4416 sql_help.c:4418 sql_help.c:4419 sql_help.c:4421
-#: sql_help.c:4422 sql_help.c:4424 sql_help.c:4425
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "especificación_de_rol"
 
-#: sql_help.c:580 sql_help.c:582 sql_help.c:1685 sql_help.c:2225
-#: sql_help.c:2742 sql_help.c:3273 sql_help.c:3724 sql_help.c:4753
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "nombre_de_usuario"
 
-#: sql_help.c:583 sql_help.c:984 sql_help.c:1674 sql_help.c:2741
-#: sql_help.c:3963 sql_help.c:4426
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "donde especificación_de_rol puede ser:"
 
-#: sql_help.c:585
+#: sql_help.c:599
 msgid "group_name"
 msgstr "nombre_de_grupo"
 
-#: sql_help.c:606 sql_help.c:1443 sql_help.c:2237 sql_help.c:2497
-#: sql_help.c:2531 sql_help.c:2928 sql_help.c:2941 sql_help.c:2955
-#: sql_help.c:2996 sql_help.c:3026 sql_help.c:3038 sql_help.c:3954
-#: sql_help.c:4417
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "nombre_de_tablespace"
 
-#: sql_help.c:608 sql_help.c:701 sql_help.c:1390 sql_help.c:1400
-#: sql_help.c:1438 sql_help.c:1800
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "nombre_índice"
 
-#: sql_help.c:612 sql_help.c:615 sql_help.c:704 sql_help.c:706 sql_help.c:1393
-#: sql_help.c:1395 sql_help.c:1441 sql_help.c:2495 sql_help.c:2529
-#: sql_help.c:2926 sql_help.c:2939 sql_help.c:2953 sql_help.c:2994
-#: sql_help.c:3024
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "parámetro_de_almacenamiento"
 
-#: sql_help.c:617
+#: sql_help.c:631
 msgid "column_number"
 msgstr "número_de_columna"
 
-#: sql_help.c:641 sql_help.c:1885 sql_help.c:4509
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "oid_de_objeto_grande"
 
-#: sql_help.c:700 sql_help.c:1376 sql_help.c:2914
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "método_de_compresión"
 
-#: sql_help.c:702 sql_help.c:1391
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "nuevo_método_de_acceso"
 
-#: sql_help.c:739 sql_help.c:2552
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "proc_res"
 
-#: sql_help.c:740 sql_help.c:2553
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "proc_join"
 
-#: sql_help.c:741 sql_help.c:2550
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "op_conm"
 
-#: sql_help.c:742 sql_help.c:2551
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "op_neg"
 
-#: sql_help.c:794 sql_help.c:806 sql_help.c:2570
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "número_de_estrategia"
 
-#: sql_help.c:796 sql_help.c:797 sql_help.c:800 sql_help.c:801 sql_help.c:807
-#: sql_help.c:808 sql_help.c:810 sql_help.c:811 sql_help.c:2572 sql_help.c:2573
-#: sql_help.c:2576 sql_help.c:2577
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "tipo_op"
 
-#: sql_help.c:798 sql_help.c:2574
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "nombre_familia_ordenamiento"
 
-#: sql_help.c:799 sql_help.c:809 sql_help.c:2575
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "número_de_soporte"
 
-#: sql_help.c:803 sql_help.c:2157 sql_help.c:2579 sql_help.c:3115
-#: sql_help.c:3117
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:834 sql_help.c:837 sql_help.c:926 sql_help.c:1055 sql_help.c:1095
-#: sql_help.c:1567 sql_help.c:1570 sql_help.c:1746 sql_help.c:1799
-#: sql_help.c:1870 sql_help.c:1895 sql_help.c:1908 sql_help.c:1923
-#: sql_help.c:1983 sql_help.c:1989 sql_help.c:2353 sql_help.c:2365
-#: sql_help.c:2486 sql_help.c:2526 sql_help.c:2603 sql_help.c:2657
-#: sql_help.c:2710 sql_help.c:2762 sql_help.c:2795 sql_help.c:2802
-#: sql_help.c:2911 sql_help.c:2929 sql_help.c:2942 sql_help.c:3021
-#: sql_help.c:3141 sql_help.c:3322 sql_help.c:3545 sql_help.c:3594
-#: sql_help.c:3700 sql_help.c:3910 sql_help.c:3916 sql_help.c:3977
-#: sql_help.c:4009 sql_help.c:4373 sql_help.c:4379 sql_help.c:4497
-#: sql_help.c:4610 sql_help.c:4673 sql_help.c:4712 sql_help.c:4868
-#: sql_help.c:4931 sql_help.c:4965 sql_help.c:5023 sql_help.c:5113
-#: sql_help.c:5176
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "nombre_de_tabla"
 
-#: sql_help.c:839 sql_help.c:2605
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "expresión_using"
 
-#: sql_help.c:840 sql_help.c:2606
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "expresión_check"
 
-#: sql_help.c:913 sql_help.c:915 sql_help.c:917 sql_help.c:2653
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "objeto_de_publicación"
 
-#: sql_help.c:919 sql_help.c:2654
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "objeto_drop_publicación"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "parámetro_de_publicación"
 
-#: sql_help.c:925 sql_help.c:2656
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "donde objeto_de_publicación es uno de:"
 
-#: sql_help.c:968 sql_help.c:1658 sql_help.c:2464 sql_help.c:2689
-#: sql_help.c:3256
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "tabla_y_columnas"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "donde objeto_drop_publicación es uno de:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "y tabla_y_columnas es:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "contraseña"
 
-#: sql_help.c:969 sql_help.c:1659 sql_help.c:2465 sql_help.c:2690
-#: sql_help.c:3257
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "fecha_hora"
 
-#: sql_help.c:973 sql_help.c:977 sql_help.c:980 sql_help.c:983 sql_help.c:1663
-#: sql_help.c:1667 sql_help.c:1670 sql_help.c:1673 sql_help.c:3923
-#: sql_help.c:4386
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "nombre_de_base_de_datos"
 
-#: sql_help.c:1089 sql_help.c:2757
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:1090 sql_help.c:2758
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "valormin"
 
-#: sql_help.c:1091 sql_help.c:2759
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "valormax"
 
-#: sql_help.c:1092 sql_help.c:2760 sql_help.c:4606 sql_help.c:4710
-#: sql_help.c:4864 sql_help.c:5040 sql_help.c:5109
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "inicio"
 
-#: sql_help.c:1093 sql_help.c:1365
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "reinicio"
 
-#: sql_help.c:1094 sql_help.c:2761
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:1139
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "nuevo_valor"
 
-#: sql_help.c:1158 sql_help.c:2814
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "conninfo"
 
-#: sql_help.c:1160 sql_help.c:1164 sql_help.c:1168 sql_help.c:2815
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "nombre_de_publicación"
 
-#: sql_help.c:1161 sql_help.c:1165 sql_help.c:1169
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "opción_de_publicación"
 
-#: sql_help.c:1172
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "opción_refresh"
 
-#: sql_help.c:1177 sql_help.c:2816
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "parámetro_de_suscripción"
 
-#: sql_help.c:1180
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "opción_skip"
 
-#: sql_help.c:1340 sql_help.c:1343
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "nombre_de_partición"
 
-#: sql_help.c:1341 sql_help.c:2370 sql_help.c:2947
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "borde_de_partición"
 
-#: sql_help.c:1362 sql_help.c:1412 sql_help.c:2961
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "opciones_de_secuencia"
 
-#: sql_help.c:1364
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "opción_de_secuencia"
 
-#: sql_help.c:1378
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "restricción_de_tabla_con_índice"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "nombre_regla_de_reescritura"
 
-#: sql_help.c:1401 sql_help.c:2382 sql_help.c:2986
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "y borde_de_partición es:"
 
-#: sql_help.c:1402 sql_help.c:1403 sql_help.c:1404 sql_help.c:2383
-#: sql_help.c:2384 sql_help.c:2385 sql_help.c:2987 sql_help.c:2988
-#: sql_help.c:2989
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "expresión_de_borde_de_partición"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:2386 sql_help.c:2387
-#: sql_help.c:2990 sql_help.c:2991
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "literal_numérico"
 
-#: sql_help.c:1407
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "donde restricción_de_columna es:"
 
-#: sql_help.c:1410 sql_help.c:2377 sql_help.c:2418 sql_help.c:2627
-#: sql_help.c:2959
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "expr_por_omisión"
 
-#: sql_help.c:1411 sql_help.c:2378 sql_help.c:2960
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "expr_de_generación"
 
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1423 sql_help.c:1425
-#: sql_help.c:1429 sql_help.c:2962 sql_help.c:2963 sql_help.c:2972
-#: sql_help.c:2974 sql_help.c:2978
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "parámetros_de_índice"
 
-#: sql_help.c:1415 sql_help.c:1432 sql_help.c:2964 sql_help.c:2981
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "tabla_ref"
 
-#: sql_help.c:1416 sql_help.c:1433 sql_help.c:2965 sql_help.c:2982
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "columna_ref"
 
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1434 sql_help.c:1435
-#: sql_help.c:2966 sql_help.c:2967 sql_help.c:2983 sql_help.c:2984
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "acción_referencial"
 
-#: sql_help.c:1419 sql_help.c:2379 sql_help.c:2968
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "y restricción_de_tabla es:"
 
-#: sql_help.c:1427 sql_help.c:2976
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "elemento_de_exclusión"
 
-#: sql_help.c:1428 sql_help.c:2977 sql_help.c:4604 sql_help.c:4708
-#: sql_help.c:4862 sql_help.c:5038 sql_help.c:5107
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "operador"
 
-#: sql_help.c:1430 sql_help.c:2498 sql_help.c:2979
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "predicado"
 
-#: sql_help.c:1436
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "y restricción_de_tabla_con_índice es:"
 
-#: sql_help.c:1439 sql_help.c:2992
+#: sql_help.c:1476 sql_help.c:3057
 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:1444 sql_help.c:2997
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "elemento_de_exclusión en una restricción EXCLUDE es:"
 
-#: sql_help.c:1448 sql_help.c:2491 sql_help.c:2924 sql_help.c:2937
-#: sql_help.c:2951 sql_help.c:3001 sql_help.c:4022
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "clase_de_ops"
 
-#: sql_help.c:1449 sql_help.c:2492 sql_help.c:3002
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "parámetro_opclass"
 
-#: sql_help.c:1451 sql_help.c:3004
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "acción_referencial en una restricción FOREIGN KEY/REFERENCES es:"
 
-#: sql_help.c:1469 sql_help.c:1472 sql_help.c:3041
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "opción_de_tablespace"
 
-#: sql_help.c:1493 sql_help.c:1496 sql_help.c:1502 sql_help.c:1506
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "tipo_de_token"
 
-#: sql_help.c:1494 sql_help.c:1497
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "nombre_diccionario"
 
-#: sql_help.c:1499 sql_help.c:1503
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "diccionario_antiguo"
 
-#: sql_help.c:1500 sql_help.c:1504
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "diccionario_nuevo"
 
-#: sql_help.c:1599 sql_help.c:1613 sql_help.c:1616 sql_help.c:1617
-#: sql_help.c:3194
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "nombre_atributo"
 
-#: sql_help.c:1600
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "nuevo_nombre_atributo"
 
-#: sql_help.c:1604 sql_help.c:1608
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "nuevo_valor_enum"
 
-#: sql_help.c:1605
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "valor_enum_vecino"
 
-#: sql_help.c:1607
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "valor_enum_existente"
 
-#: sql_help.c:1610
+#: sql_help.c:1647
 msgid "property"
 msgstr "propiedad"
 
-#: sql_help.c:1686 sql_help.c:2362 sql_help.c:2371 sql_help.c:2773
-#: sql_help.c:3274 sql_help.c:3725 sql_help.c:3932 sql_help.c:3978
-#: sql_help.c:4395
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "nombre_de_servidor"
 
-#: sql_help.c:1718 sql_help.c:1721 sql_help.c:3289
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "nombre_opción_de_vista"
 
-#: sql_help.c:1719 sql_help.c:3290
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "valor_opción_de_vista"
 
-#: sql_help.c:1740 sql_help.c:5007
-msgid "table_and_columns"
-msgstr "tabla_y_columnas"
-
-#: sql_help.c:1741 sql_help.c:1801 sql_help.c:1995 sql_help.c:3774
-#: sql_help.c:4230 sql_help.c:5008
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "donde opción puede ser una de:"
 
-#: sql_help.c:1742 sql_help.c:1743 sql_help.c:1802 sql_help.c:1997
-#: sql_help.c:2001 sql_help.c:2183 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:3777 sql_help.c:3778 sql_help.c:3779 sql_help.c:3780
-#: sql_help.c:3781 sql_help.c:3782 sql_help.c:3783 sql_help.c:3784
-#: sql_help.c:4231 sql_help.c:4233 sql_help.c:5009 sql_help.c:5010
-#: sql_help.c:5011 sql_help.c:5012 sql_help.c:5013 sql_help.c:5014
-#: sql_help.c:5015 sql_help.c:5016 sql_help.c:5017 sql_help.c:5019
-#: sql_help.c:5020
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:1744 sql_help.c:5021
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "tamaño"
 
-#: sql_help.c:1745 sql_help.c:5022
-msgid "and table_and_columns is:"
-msgstr "y tabla_y_columnas es:"
-
-#: sql_help.c:1761 sql_help.c:4769 sql_help.c:4771 sql_help.c:4795
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "modo_de_transacción"
 
-#: sql_help.c:1762 sql_help.c:4772 sql_help.c:4796
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "donde modo_de_transacción es uno de:"
 
-#: sql_help.c:1771 sql_help.c:4614 sql_help.c:4623 sql_help.c:4627
-#: sql_help.c:4631 sql_help.c:4634 sql_help.c:4872 sql_help.c:4881
-#: sql_help.c:4885 sql_help.c:4889 sql_help.c:4892 sql_help.c:5117
-#: sql_help.c:5126 sql_help.c:5130 sql_help.c:5134 sql_help.c:5137
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "argumento"
 
-#: sql_help.c:1867
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "nombre_relación"
 
-#: sql_help.c:1872 sql_help.c:3926 sql_help.c:4389
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "nombre_de_dominio"
 
-#: sql_help.c:1894
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "nombre_de_política"
 
-#: sql_help.c:1907
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "nombre_regla"
 
-#: sql_help.c:1926 sql_help.c:4528
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "literal_de_cadena"
 
-#: sql_help.c:1951 sql_help.c:4192 sql_help.c:4442
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "id_de_transacción"
 
-#: sql_help.c:1985 sql_help.c:1992 sql_help.c:4048
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "nombre_de_archivo"
 
-#: sql_help.c:1986 sql_help.c:1993 sql_help.c:2712 sql_help.c:2713
-#: sql_help.c:2714
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "orden"
 
-#: sql_help.c:1988 sql_help.c:2711 sql_help.c:3144 sql_help.c:3325
-#: sql_help.c:4032 sql_help.c:4115 sql_help.c:4118 sql_help.c:4121
-#: sql_help.c:4597 sql_help.c:4599 sql_help.c:4701 sql_help.c:4703
-#: sql_help.c:4855 sql_help.c:4857 sql_help.c:4974 sql_help.c:5100
-#: sql_help.c:5102
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "condición"
 
-#: sql_help.c:1991 sql_help.c:2532 sql_help.c:3027 sql_help.c:3291
-#: sql_help.c:3309 sql_help.c:4013
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "consulta"
 
-#: sql_help.c:1996
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "nombre_de_formato"
 
-#: sql_help.c:1998
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "carácter_delimitador"
 
-#: sql_help.c:1999
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "cadena_null"
 
-#: sql_help.c:2000
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "cadena_por_omisión"
 
-#: sql_help.c:2002
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "carácter_de_comilla"
 
-#: sql_help.c:2003
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "carácter_de_escape"
 
-#: sql_help.c:2007
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "acción_en_error"
 
-#: sql_help.c:2008
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "máx.error"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "nombre_codificación"
 
-#: sql_help.c:2009
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "verbosidad"
 
-#: sql_help.c:2020
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "tipo_de_método_de_acceso"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2113
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "tipo_de_dato_arg"
 
-#: sql_help.c:2092 sql_help.c:2114 sql_help.c:2122
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "func_transición"
 
-#: sql_help.c:2093 sql_help.c:2115 sql_help.c:2123
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "tipo_de_dato_de_estado"
 
-#: sql_help.c:2094 sql_help.c:2116 sql_help.c:2124
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "tamaño_de_dato_de_estado"
 
-#: sql_help.c:2095 sql_help.c:2117 sql_help.c:2125
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "func_final"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "func_combinación"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "func_serial"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "func_deserial"
 
-#: sql_help.c:2099 sql_help.c:2118 sql_help.c:2129
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "condición_inicial"
 
-#: sql_help.c:2100 sql_help.c:2130
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "func_transición_m"
 
-#: sql_help.c:2101 sql_help.c:2131
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "func_inv_m"
 
-#: sql_help.c:2102 sql_help.c:2132
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "tipo_de_dato_de_estado_m"
 
-#: sql_help.c:2103 sql_help.c:2133
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "tamaño_de_dato_de_estado_m"
 
-#: sql_help.c:2104 sql_help.c:2134
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "func_final_m"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "condición_inicial_m"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "operador_de_ordenamiento"
 
-#: sql_help.c:2119
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "o la sintaxis antigua"
 
-#: sql_help.c:2121
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:2179 sql_help.c:2229
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "configuración regional"
 
-#: sql_help.c:2180 sql_help.c:2230
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2181 sql_help.c:2231
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2182 sql_help.c:4495
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "proveedor"
 
-#: sql_help.c:2184
+#: sql_help.c:2223
 msgid "rules"
 msgstr "reglas"
 
-#: sql_help.c:2185 sql_help.c:2292
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "versión"
 
-#: sql_help.c:2187
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "ordenamiento_existente"
 
-#: sql_help.c:2197
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "codificación_origen"
 
-#: sql_help.c:2198
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "codificación_destino"
 
-#: sql_help.c:2226 sql_help.c:3067
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "plantilla"
 
-#: sql_help.c:2227
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "codificación"
 
-#: sql_help.c:2228
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "estrategia"
 
-#: sql_help.c:2232
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "locale_builtin"
 
-#: sql_help.c:2233
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "locale_icu"
 
-#: sql_help.c:2234
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "reglas_icu"
 
-#: sql_help.c:2235
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "proveedor_locale"
 
-#: sql_help.c:2236
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "versión_ordenamiento"
 
-#: sql_help.c:2241
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2276 sql_help.c:2709 sql_help.c:3140
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "evento"
 
-#: sql_help.c:2277
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "variable_de_filtrado"
 
-#: sql_help.c:2278
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "valor_de_filtrado"
 
-#: sql_help.c:2374 sql_help.c:2956
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "tabla_origen"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "opción_de_like"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "donde restricción_de_columna es:"
 
-#: sql_help.c:2419
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "y opción_de_like es:"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "tipo_ret"
 
-#: sql_help.c:2421
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "tipo_columna"
 
-#: sql_help.c:2430 sql_help.c:2633
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "definición"
 
-#: sql_help.c:2431 sql_help.c:2634
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "archivo_obj"
 
-#: sql_help.c:2432 sql_help.c:2635
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "símbolo_enlace"
 
-#: sql_help.c:2433 sql_help.c:2636
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "contenido_sql"
 
-#: sql_help.c:2471 sql_help.c:2694 sql_help.c:3263
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2487 sql_help.c:2528 sql_help.c:2925 sql_help.c:2938
-#: sql_help.c:2952 sql_help.c:3023
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "método"
 
-#: sql_help.c:2509
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "manejador_de_llamada"
 
-#: sql_help.c:2510
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "manejador_en_línea"
 
-#: sql_help.c:2511
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "función_val"
 
-#: sql_help.c:2569
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "nombre_familia"
 
-#: sql_help.c:2580
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "tipo_almacenamiento"
 
-#: sql_help.c:2715 sql_help.c:3147
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "donde evento puede ser una de:"
 
-#: sql_help.c:2735 sql_help.c:2737
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "elemento_de_esquema"
 
-#: sql_help.c:2774
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "tipo_de_servidor"
 
-#: sql_help.c:2775
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "versión_de_servidor"
 
-#: sql_help.c:2776 sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "nombre_fdw"
 
-#: sql_help.c:2793 sql_help.c:2796
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "nombre_de_estadística"
 
-#: sql_help.c:2797
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "tipo_de_estadística"
 
-#: sql_help.c:2813
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "nombre_de_suscripción"
 
-#: sql_help.c:2918
-msgid "source_table"
-msgstr "tabla_origen"
-
-#: sql_help.c:2919
-msgid "like_option"
-msgstr "opción_de_like"
-
-#: sql_help.c:2985
-msgid "and like_option is:"
-msgstr "y opción_de_like es:"
-
-#: sql_help.c:3040
+#: sql_help.c:3105
 msgid "directory"
 msgstr "directorio"
 
-#: sql_help.c:3054
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "nombre_de_parser"
 
-#: sql_help.c:3055
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "config_origen"
 
-#: sql_help.c:3084
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "función_inicio"
 
-#: sql_help.c:3085
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "función_gettoken"
 
-#: sql_help.c:3086
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "función_fin"
 
-#: sql_help.c:3087
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "función_lextypes"
 
-#: sql_help.c:3088
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "función_headline"
 
-#: sql_help.c:3100
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "función_init"
 
-#: sql_help.c:3101
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "función_lexize"
 
-#: sql_help.c:3114
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "nombre_de_función_from"
 
-#: sql_help.c:3116
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "nombre_de_función_to"
 
-#: sql_help.c:3142
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "nombre_tabla_referenciada"
 
-#: sql_help.c:3143
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "nombre_de_relación_de_transición"
 
-#: sql_help.c:3146
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "argumentos"
 
-#: sql_help.c:3198
+#: sql_help.c:3263
 msgid "label"
 msgstr "etiqueta"
 
-#: sql_help.c:3200
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "subtipo"
 
-#: sql_help.c:3201
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "clase_de_operador_del_subtipo"
 
-#: sql_help.c:3203
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "función_canónica"
 
-#: sql_help.c:3204
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "función_diff_del_subtipo"
 
-#: sql_help.c:3205
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "nombre_de_tipo_de_multirango"
 
-#: sql_help.c:3207
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "función_entrada"
 
-#: sql_help.c:3208
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "función_salida"
 
-#: sql_help.c:3209
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "función_receive"
 
-#: sql_help.c:3210
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "función_send"
 
-#: sql_help.c:3211
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "función_entrada_del_modificador_de_tipo"
 
-#: sql_help.c:3212
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "función_salida_del_modificador_de_tipo"
 
-#: sql_help.c:3213
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "función_analyze"
 
-#: sql_help.c:3214
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "función_de_subíndice"
 
-#: sql_help.c:3215
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "largo_interno"
 
-#: sql_help.c:3216
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "alineamiento"
 
-#: sql_help.c:3217
+#: sql_help.c:3282
 msgid "storage"
 msgstr "almacenamiento"
 
-#: sql_help.c:3218
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "como_tipo"
 
-#: sql_help.c:3219
+#: sql_help.c:3284
 msgid "category"
 msgstr "categoría"
 
-#: sql_help.c:3220
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "preferido"
 
-#: sql_help.c:3221
+#: sql_help.c:3286
 msgid "default"
 msgstr "valor_por_omisión"
 
-#: sql_help.c:3222
+#: sql_help.c:3287
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:3223
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "delimitador"
 
-#: sql_help.c:3224
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "ordenable"
 
-#: sql_help.c:3321 sql_help.c:4008 sql_help.c:4102 sql_help.c:4592
-#: sql_help.c:4695 sql_help.c:4850 sql_help.c:4964 sql_help.c:5095
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "consulta_with"
 
-#: sql_help.c:3323 sql_help.c:4010 sql_help.c:4611 sql_help.c:4617
-#: sql_help.c:4620 sql_help.c:4624 sql_help.c:4628 sql_help.c:4636
-#: sql_help.c:4869 sql_help.c:4875 sql_help.c:4878 sql_help.c:4882
-#: sql_help.c:4886 sql_help.c:4894 sql_help.c:4966 sql_help.c:5114
-#: sql_help.c:5120 sql_help.c:5123 sql_help.c:5127 sql_help.c:5131
-#: sql_help.c:5139
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:3324 sql_help.c:4596 sql_help.c:4638 sql_help.c:4640
-#: sql_help.c:4644 sql_help.c:4646 sql_help.c:4647 sql_help.c:4648
-#: sql_help.c:4700 sql_help.c:4854 sql_help.c:4896 sql_help.c:4898
-#: sql_help.c:4902 sql_help.c:4904 sql_help.c:4905 sql_help.c:4906
-#: sql_help.c:4973 sql_help.c:5099 sql_help.c:5141 sql_help.c:5143
-#: sql_help.c:5147 sql_help.c:5149 sql_help.c:5150 sql_help.c:5151
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "item_de_from"
 
-#: sql_help.c:3326 sql_help.c:3810 sql_help.c:4159 sql_help.c:4975
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "nombre_de_cursor"
 
-#: sql_help.c:3327 sql_help.c:4016 sql_help.c:4108 sql_help.c:4976
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "alias_de_salida"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "expresión_de_salida"
 
-#: sql_help.c:3328 sql_help.c:4017 sql_help.c:4109 sql_help.c:4595
-#: sql_help.c:4698 sql_help.c:4853 sql_help.c:4977 sql_help.c:5098
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "nombre_de_salida"
 
-#: sql_help.c:3344
+#: sql_help.c:3411
 msgid "code"
 msgstr "código"
 
-#: sql_help.c:3749
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "parámetro"
 
-#: sql_help.c:3773 sql_help.c:4184
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "sentencia"
 
-#: sql_help.c:3809 sql_help.c:4158
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "dirección"
 
-#: sql_help.c:3811 sql_help.c:4160
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "donde dirección puede ser una de:"
 
-#: sql_help.c:3812 sql_help.c:3813 sql_help.c:3814 sql_help.c:3815
-#: sql_help.c:3816 sql_help.c:4161 sql_help.c:4162 sql_help.c:4163
-#: sql_help.c:4164 sql_help.c:4165 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4709 sql_help.c:4711 sql_help.c:4863 sql_help.c:4865
-#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5108 sql_help.c:5110
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "cantidad"
 
-#: sql_help.c:3919 sql_help.c:4382
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "nombre_secuencia"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "nombre_arg"
 
-#: sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "tipo_arg"
 
-#: sql_help.c:3945 sql_help.c:4408
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3976
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "esquema_remoto"
 
-#: sql_help.c:3979
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "esquema_local"
 
-#: sql_help.c:4014
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "destino_de_conflict"
 
-#: sql_help.c:4015
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "acción_de_conflict"
 
-#: sql_help.c:4018
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "donde destino_de_conflict puede ser uno de:"
 
-#: sql_help.c:4019
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "nombre_de_columna_de_índice"
 
-#: sql_help.c:4020
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "expresión_de_índice"
 
-#: sql_help.c:4023
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "predicado_de_índice"
 
-#: sql_help.c:4025
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "donde acción_de_conflict es una de:"
 
-#: sql_help.c:4031 sql_help.c:4132 sql_help.c:4972
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "sub-SELECT"
 
-#: sql_help.c:4040 sql_help.c:4173 sql_help.c:4948
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:4062
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "modo_bloqueo"
 
-#: sql_help.c:4063
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "donde modo_bloqueo es uno de:"
 
-#: sql_help.c:4103
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "nombre_de_tabla_destino"
 
-#: sql_help.c:4104
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "alias_de_destino"
 
-#: sql_help.c:4105
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "origin_de_datos"
 
-#: sql_help.c:4106 sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "condición_de_join"
 
-#: sql_help.c:4107
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "cláusula_when"
 
-#: sql_help.c:4110
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "donde origen_de_datos es:"
 
-#: sql_help.c:4111
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "nombre_tabla_origen"
 
-#: sql_help.c:4112
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "consulta_origen"
 
-#: sql_help.c:4113
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "alias_origen"
 
-#: sql_help.c:4114
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "y cláusula_when es:"
 
-#: sql_help.c:4116 sql_help.c:4119
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "update_de_merge"
 
-#: sql_help.c:4117 sql_help.c:4120
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "delete_de_merge"
 
-#: sql_help.c:4122
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "insert_de_merge"
 
-#: sql_help.c:4123
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "y insert_de_merge es:"
 
-#: sql_help.c:4126
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "y update_de_merge es:"
 
-#: sql_help.c:4133
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "y delete_de_merge es:"
 
-#: sql_help.c:4174
+#: sql_help.c:4245
 msgid "payload"
 msgstr "carga"
 
-#: sql_help.c:4201
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "rol_antiguo"
 
-#: sql_help.c:4202
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "rol_nuevo"
 
-#: sql_help.c:4241 sql_help.c:4450 sql_help.c:4458
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "nombre_de_savepoint"
 
-#: sql_help.c:4598 sql_help.c:4656 sql_help.c:4856 sql_help.c:4914
-#: sql_help.c:5101 sql_help.c:5159
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "elemento_agrupante"
 
-#: sql_help.c:4600 sql_help.c:4704 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "nombre_de_ventana"
 
-#: sql_help.c:4601 sql_help.c:4705 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "definición_de_ventana"
 
-#: sql_help.c:4602 sql_help.c:4616 sql_help.c:4660 sql_help.c:4706
-#: sql_help.c:4860 sql_help.c:4874 sql_help.c:4918 sql_help.c:5105
-#: sql_help.c:5119 sql_help.c:5163
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:4608 sql_help.c:4866 sql_help.c:5111
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "referencia_en_from"
 
-#: sql_help.c:4609 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "donde item_de_from puede ser uno de:"
 
-#: sql_help.c:4612 sql_help.c:4618 sql_help.c:4621 sql_help.c:4625
-#: sql_help.c:4637 sql_help.c:4870 sql_help.c:4876 sql_help.c:4879
-#: sql_help.c:4883 sql_help.c:4895 sql_help.c:5115 sql_help.c:5121
-#: sql_help.c:5124 sql_help.c:5128 sql_help.c:5140
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "alias_de_columna"
 
-#: sql_help.c:4613 sql_help.c:4871 sql_help.c:5116
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "método_de_sampleo"
 
-#: sql_help.c:4615 sql_help.c:4873 sql_help.c:5118
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "semilla"
 
-#: sql_help.c:4619 sql_help.c:4658 sql_help.c:4877 sql_help.c:4916
-#: sql_help.c:5122 sql_help.c:5161
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "nombre_consulta_with"
 
-#: sql_help.c:4629 sql_help.c:4632 sql_help.c:4635 sql_help.c:4887
-#: sql_help.c:4890 sql_help.c:4893 sql_help.c:5132 sql_help.c:5135
-#: sql_help.c:5138
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "definición_de_columna"
 
-#: sql_help.c:4639 sql_help.c:4645 sql_help.c:4897 sql_help.c:4903
-#: sql_help.c:5142 sql_help.c:5148
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "tipo_de_join"
 
-#: sql_help.c:4642 sql_help.c:4900 sql_help.c:5145
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "columna_de_join"
 
-#: sql_help.c:4643 sql_help.c:4901 sql_help.c:5146
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "join_con_alias"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "donde elemento_agrupante puede ser una de:"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "y consulta_with es:"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "valores"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4665 sql_help.c:4923 sql_help.c:5168
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4667 sql_help.c:4925 sql_help.c:5170
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "nombre_col_para_sec_de_búsqueda"
 
-#: sql_help.c:4669 sql_help.c:4927 sql_help.c:5172
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "nombre_col_para_marca_de_ciclo"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "valor_marca_de_ciclo"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "valor_predet_marca_de_ciclo"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "nombre_col_para_ruta_de_ciclo"
 
-#: sql_help.c:4699
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "nueva_tabla"
 
-#: sql_help.c:4770
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "id_de_snapshot"
 
-#: sql_help.c:5037
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "expresión_orden"
 
-#: sql_help.c:5182 sql_help.c:6166
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "aborta la transacción en curso"
 
-#: sql_help.c:5188
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "cambia la definición de una función de agregación"
 
-#: sql_help.c:5194
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "cambia la definición de un ordenamiento"
 
-#: sql_help.c:5200
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "cambia la definición de una conversión"
 
-#: sql_help.c:5206
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "cambia una base de datos"
 
-#: sql_help.c:5212
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "define privilegios de acceso por omisión"
 
-#: sql_help.c:5218
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "cambia la definición de un dominio"
 
-#: sql_help.c:5224
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "cambia la definición de un disparador por evento"
 
-#: sql_help.c:5230
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "cambia la definición de una extensión"
 
-#: sql_help.c:5236
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "cambia la definición de un conector de datos externos"
 
-#: sql_help.c:5242
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "cambia la definición de una tabla foránea"
 
-#: sql_help.c:5248
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "cambia la definición de una función"
 
-#: sql_help.c:5254
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "cambiar nombre del rol o membresía"
 
-#: sql_help.c:5260
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "cambia la definición de un índice"
 
-#: sql_help.c:5266
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "cambia la definición de un lenguaje procedural"
 
-#: sql_help.c:5272
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "cambia la definición de un objeto grande"
 
-#: sql_help.c:5278
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "cambia la definición de una vista materializada"
 
-#: sql_help.c:5284
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "cambia la definición de un operador"
 
-#: sql_help.c:5290
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "cambia la definición de una clase de operadores"
 
-#: sql_help.c:5296
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "cambia la definición de una familia de operadores"
 
-#: sql_help.c:5302
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "cambia la definición de una política de seguridad a nivel de registros"
 
-#: sql_help.c:5308
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "cambia la definición de un procedimiento"
 
-#: sql_help.c:5314
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "cambia la definición de una publicación"
 
-#: sql_help.c:5320 sql_help.c:5422
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "cambia un rol de la base de datos"
 
-#: sql_help.c:5326
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "cambia la definición de una rutina"
 
-#: sql_help.c:5332
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "cambia la definición de una regla"
 
-#: sql_help.c:5338
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "cambia la definición de un esquema"
 
-#: sql_help.c:5344
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "cambia la definición de un generador secuencial"
 
-#: sql_help.c:5350
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "cambia la definición de un servidor foráneo"
 
-#: sql_help.c:5356
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "cambia la definición de un objeto de estadísticas extendidas"
 
-#: sql_help.c:5362
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "cambia la definición de una suscripción"
 
-#: sql_help.c:5368
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "cambia un parámetro de configuración del servidor"
 
-#: sql_help.c:5374
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "cambia la definición de una tabla"
 
-#: sql_help.c:5380
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "cambia la definición de un tablespace"
 
-#: sql_help.c:5386
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "cambia la definición de una configuración de búsqueda en texto"
 
-#: sql_help.c:5392
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "cambia la definición de un diccionario de búsqueda en texto"
 
-#: sql_help.c:5398
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "cambia la definición de un analizador de búsqueda en texto"
 
-#: sql_help.c:5404
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "cambia la definición de una plantilla de búsqueda en texto"
 
-#: sql_help.c:5410
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "cambia la definición de un disparador"
 
-#: sql_help.c:5416
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "cambia la definición de un tipo"
 
-#: sql_help.c:5428
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "cambia la definición de un mapeo de usuario"
 
-#: sql_help.c:5434
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "cambia la definición de una vista"
 
-#: sql_help.c:5440
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "recolecta estadísticas sobre una base de datos"
 
-#: sql_help.c:5446 sql_help.c:6244
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "inicia un bloque de transacción"
 
-#: sql_help.c:5452
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "invocar un procedimiento"
 
-#: sql_help.c:5458
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "fuerza un checkpoint de wal"
 
-#: sql_help.c:5464
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "cierra un cursor"
 
-#: sql_help.c:5470
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "reordena una tabla siguiendo un índice"
 
-#: sql_help.c:5476
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "define o cambia un comentario sobre un objeto"
 
-#: sql_help.c:5482 sql_help.c:6040
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "compromete la transacción en curso"
 
-#: sql_help.c:5488
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "confirma una transacción que fue preparada para two-phase commit"
 
-#: sql_help.c:5494
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "copia datos entre un archivo y una tabla"
 
-#: sql_help.c:5500
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "define un nuevo método de acceso"
 
-#: sql_help.c:5506
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "define una nueva función de agregación"
 
-#: sql_help.c:5512
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "define una nueva conversión de tipo"
 
-#: sql_help.c:5518
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "define un nuevo ordenamiento"
 
-#: sql_help.c:5524
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "define una nueva conversión de codificación"
 
-#: sql_help.c:5530
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "crea una nueva base de datos"
 
-#: sql_help.c:5536
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "define un nuevo dominio"
 
-#: sql_help.c:5542
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "define un nuevo disparador por evento"
 
-#: sql_help.c:5548
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "instala una extensión"
 
-#: sql_help.c:5554
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "define un nuevo conector de datos externos"
 
-#: sql_help.c:5560
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "define una nueva tabla foránea"
 
-#: sql_help.c:5566
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "define una nueva función"
 
-#: sql_help.c:5572 sql_help.c:5632 sql_help.c:5734
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "define un nuevo rol de la base de datos"
 
-#: sql_help.c:5578
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "define un nuevo índice"
 
-#: sql_help.c:5584
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "define un nuevo lenguaje procedural"
 
-#: sql_help.c:5590
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "define una nueva vista materializada"
 
-#: sql_help.c:5596
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "define un nuevo operador"
 
-#: sql_help.c:5602
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "define una nueva clase de operadores"
 
-#: sql_help.c:5608
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "define una nueva familia de operadores"
 
-#: sql_help.c:5614
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "define una nueva política de seguridad a nivel de registros para una tabla"
 
-#: sql_help.c:5620
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "define un nuevo procedimiento"
 
-#: sql_help.c:5626
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "define una nueva publicación"
 
-#: sql_help.c:5638
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "define una nueva regla de reescritura"
 
-#: sql_help.c:5644
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "define un nuevo esquema"
 
-#: sql_help.c:5650
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "define un nuevo generador secuencial"
 
-#: sql_help.c:5656
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "define un nuevo servidor foráneo"
 
-#: sql_help.c:5662
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "define estadísticas extendidas"
 
-#: sql_help.c:5668
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "define una nueva suscripción"
 
-#: sql_help.c:5674
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "define una nueva tabla"
 
-#: sql_help.c:5680 sql_help.c:6202
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "crea una nueva tabla usando los resultados de una consulta"
 
-#: sql_help.c:5686
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "define un nuevo tablespace"
 
-#: sql_help.c:5692
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "define una nueva configuración de búsqueda en texto"
 
-#: sql_help.c:5698
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "define un nuevo diccionario de búsqueda en texto"
 
-#: sql_help.c:5704
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "define un nuevo analizador de búsqueda en texto"
 
-#: sql_help.c:5710
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "define una nueva plantilla de búsqueda en texto"
 
-#: sql_help.c:5716
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "define una nueva transformación"
 
-#: sql_help.c:5722
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "define un nuevo disparador"
 
-#: sql_help.c:5728
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "define un nuevo tipo de datos"
 
-#: sql_help.c:5740
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "define un nuevo mapa de usuario a servidor foráneo"
 
-#: sql_help.c:5746
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "define una nueva vista"
 
-#: sql_help.c:5752
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "elimina una sentencia preparada"
 
-#: sql_help.c:5758
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "define un nuevo cursor"
 
-#: sql_help.c:5764
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "elimina filas de una tabla"
 
-#: sql_help.c:5770
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "descartar datos de la sesión"
 
-#: sql_help.c:5776
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "ejecutar un bloque anónimo de código"
 
-#: sql_help.c:5782
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "elimina un método de acceso"
 
-#: sql_help.c:5788
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "elimina una función de agregación"
 
-#: sql_help.c:5794
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "elimina una conversión de tipo"
 
-#: sql_help.c:5800
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "elimina un ordenamiento"
 
-#: sql_help.c:5806
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "elimina una conversión de codificación"
 
-#: sql_help.c:5812
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "elimina una base de datos"
 
-#: sql_help.c:5818
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "elimina un dominio"
 
-#: sql_help.c:5824
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "elimina un disparador por evento"
 
-#: sql_help.c:5830
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "elimina una extensión"
 
-#: sql_help.c:5836
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "elimina un conector de datos externos"
 
-#: sql_help.c:5842
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "elimina una tabla foránea"
 
-#: sql_help.c:5848
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "elimina una función"
 
-#: sql_help.c:5854 sql_help.c:5920 sql_help.c:6022
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "elimina un rol de base de datos"
 
-#: sql_help.c:5860
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "elimina un índice"
 
-#: sql_help.c:5866
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "elimina un lenguaje procedural"
 
-#: sql_help.c:5872
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "elimina una vista materializada"
 
-#: sql_help.c:5878
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "elimina un operador"
 
-#: sql_help.c:5884
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "elimina una clase de operadores"
 
-#: sql_help.c:5890
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "elimina una familia de operadores"
 
-#: sql_help.c:5896
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "elimina objetos de propiedad de un rol de la base de datos"
 
-#: sql_help.c:5902
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "elimina una política de seguridad a nivel de registros de una tabla"
 
-#: sql_help.c:5908
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "elimina un procedimiento"
 
-#: sql_help.c:5914
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "elimina una publicación"
 
-#: sql_help.c:5926
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "elimina una rutina"
 
-#: sql_help.c:5932
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "elimina una regla de reescritura"
 
-#: sql_help.c:5938
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "elimina un esquema"
 
-#: sql_help.c:5944
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "elimina un generador secuencial"
 
-#: sql_help.c:5950
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "elimina un descriptor de servidor foráneo"
 
-#: sql_help.c:5956
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "elimina estadísticas extendidas"
 
-#: sql_help.c:5962
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "elimina una suscripción"
 
-#: sql_help.c:5968
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "elimina una tabla"
 
-#: sql_help.c:5974
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "elimina un tablespace"
 
-#: sql_help.c:5980
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "elimina una configuración de búsqueda en texto"
 
-#: sql_help.c:5986
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "elimina un diccionario de búsqueda en texto"
 
-#: sql_help.c:5992
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "elimina un analizador de búsqueda en texto"
 
-#: sql_help.c:5998
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "elimina una plantilla de búsqueda en texto"
 
-#: sql_help.c:6004
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "elimina una transformación"
 
-#: sql_help.c:6010
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "elimina un disparador"
 
-#: sql_help.c:6016
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "elimina un tipo de datos"
 
-#: sql_help.c:6028
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "elimina un mapeo de usuario para un servidor remoto"
 
-#: sql_help.c:6034
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "elimina una vista"
 
-#: sql_help.c:6046
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "ejecuta una sentencia preparada"
 
-#: sql_help.c:6052
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "muestra el plan de ejecución de una sentencia"
 
-#: sql_help.c:6058
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "recupera filas de una consulta usando un cursor"
 
-#: sql_help.c:6064
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "define privilegios de acceso"
 
-#: sql_help.c:6070
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "importa definiciones de tablas desde un servidor foráneo"
 
-#: sql_help.c:6076
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "crea nuevas filas en una tabla"
 
-#: sql_help.c:6082
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "escucha notificaciones"
 
-#: sql_help.c:6088
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "carga un archivo de biblioteca compartida"
 
-#: sql_help.c:6094
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "bloquea una tabla"
 
-#: sql_help.c:6100
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "condicionalmente inserta, actualiza o elimina filas de una tabla"
 
-#: sql_help.c:6106
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "reposiciona un cursor"
 
-#: sql_help.c:6112
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "genera una notificación"
 
-#: sql_help.c:6118
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "prepara una sentencia para ejecución"
 
-#: sql_help.c:6124
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "prepara la transacción actual para two-phase commit"
 
-#: sql_help.c:6130
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "cambia de dueño a los objetos de propiedad de un rol de la base de datos"
 
-#: sql_help.c:6136
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "reemplaza los contenidos de una vista materializada"
 
-#: sql_help.c:6142
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "reconstruye índices"
 
-#: sql_help.c:6148
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "libera un “savepoint” definido previamente"
 
-#: sql_help.c:6154
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "restaura el valor de un parámetro de configuración al valor inicial"
 
-#: sql_help.c:6160
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "revoca privilegios de acceso"
 
-#: sql_help.c:6172
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "cancela una transacción que fue previamente preparada para two-phase commit"
 
-#: sql_help.c:6178
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "descartar hacia un “savepoint”"
 
-#: sql_help.c:6184
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "define un nuevo ”savepoint” en la transacción en curso"
 
-#: sql_help.c:6190
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "define o cambia una etiqueta de seguridad sobre un objeto"
 
-#: sql_help.c:6196 sql_help.c:6250 sql_help.c:6286
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "recupera filas desde una tabla o vista"
 
-#: sql_help.c:6208
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "cambia un parámetro de configuración"
 
-#: sql_help.c:6214
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "define el modo de verificación de las restricciones de la transacción en curso"
 
-#: sql_help.c:6220
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "define el identificador de usuario actual de la sesión actual"
 
-#: sql_help.c:6226
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr ""
 "define el identificador del usuario de sesión y el identificador\n"
 "del usuario actual de la sesión en curso"
 
-#: sql_help.c:6232
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "define las características de la transacción en curso"
 
-#: sql_help.c:6238
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "muestra el valor de un parámetro de configuración"
 
-#: sql_help.c:6256
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "vacía una tabla o conjunto de tablas"
 
-#: sql_help.c:6262
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "deja de escuchar una notificación"
 
-#: sql_help.c:6268
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "actualiza filas de una tabla"
 
-#: sql_help.c:6274
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "recolecta basura y opcionalmente estadísticas sobre una base de datos"
 
-#: sql_help.c:6280
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "calcula un conjunto de registros"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 sólo puede ser usado en modo no interactivo"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de registro «%s»: %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6521,27 +6825,27 @@ msgstr ""
 "Digite «help» para obtener ayuda.\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "no se pudo definir parámetro de impresión «%s»"
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "se ignoró argumento extra «%s» en línea de órdenes"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "no se pudo encontrar el ejecutable propio"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6639
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6552,22 +6856,47 @@ msgstr ""
 "La consulta era:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "valor «%s» no reconocido para «%s»: se esperaba booleano"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "valor «%s» no válido para «%s»: se esperaba número entero"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "sintaxis de entrada no válida para la variable «%s»"
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "valor «%s» no válido para variable «%s»: debe ser mayor que %.2f"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "valor «%s» no válido para variable «%s»: debe ser menor que %.2f"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "el valor «%s» está fuera de rango para la variable «%s»"
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "el valor «%s» no es válido para la variable «%s»"
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "nombre de variable no válido: «%s»"
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
diff --git a/src/bin/psql/po/fr.po b/src/bin/psql/po/fr.po
index 1d5fb8c7b6c..54630318e12 100644
--- a/src/bin/psql/po/fr.po
+++ b/src/bin/psql/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-05 00:48+0000\n"
-"PO-Revision-Date: 2025-02-05 09:06+0100\n"
+"POT-Creation-Date: 2026-02-18 04:48+0000\n"
+"PO-Revision-Date: 2026-02-18 14:34+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
@@ -62,28 +62,28 @@ msgstr "n'a pas pu trouver un « %s » à exécuter"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "n'a pas pu résoudre le chemin « %s » en sa forme absolue : %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "n'a pas pu exécuter la commande « %s » : %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "n'a pas pu lire à partir de la commande « %s » : %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "aucune donnée n'a été renvoyée par la commande « %s »"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "échec de %s() : %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1372 command.c:3458 command.c:3507 command.c:3632 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -105,7 +105,7 @@ msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 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:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "l'utilisateur n'existe pas"
 
@@ -166,8 +166,8 @@ msgstr "Interrompu\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Ne peut pas afficher le contenu de la table : le nombre de cellules %lld est égal à ou dépasse le maximum %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Ne peut pas afficher le contenu de la table : le nombre de cellules %<PRIu64> est égal à ou dépasse le maximum %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -178,327 +178,434 @@ msgstr ""
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
 msgstr ""
 "Ne peut pas ajouter une cellule au contenu de la table : le nombre total des\n"
-"cellules %lld est dépassé.\n"
+"cellules %<PRIu64> est dépassé.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "format de sortie invalide (erreur interne) : %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "ignore l'expansion récursive de la variable « %s »"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
+#: command.c:254
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "n'a pas pu rechercher l'identifiant de l'utilisateur local %d : %s"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "les commandes antislashs sont restreintes ; seule \\unrestrict est autorisée"
 
-#: ../../port/user.c:48 ../../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
-
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "commande \\%s invalide"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Essayez \\? pour l'aide."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s : argument « %s » supplémentaire ignoré"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "commande \\%s ignorée ; utilisez \\endif ou Ctrl-C pour quitter le bloc \\if courant"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s : argument requis manquant"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "n'a pas pu obtenir le répertoire principal pour l'identifiant d'utilisateur %ld : %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s : n'a pas pu accéder au répertoire « %s » : %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "Vous n'êtes pas connecté à une base de données.\n"
 
-#: command.c:667
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
-msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » à l'adresse « %s » via le port « %s ».\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "Informations de connexion"
 
-#: command.c:670
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » via le socket dans « %s » via le port « %s ».\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "Paramètre"
 
-#: command.c:676
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%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 » (adresse « %s ») via le port « %s ».\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "Valeur"
 
-#: command.c:679
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » sur l'hôte « %s » via le port « %s ».\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "Base de données"
+
+#: command.c:848
+msgid "Client User"
+msgstr "Utilisateur client"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "Adresse hôte"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "Répertoire de la socket"
+
+#: command.c:868
+msgid "Host"
+msgstr "Hôte"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "Port du serveur"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "Options"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "Version du protocole"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "Mot de passe utilisé"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "faux"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "Vrai"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "GSSAPI authentifié"
+
+#: command.c:898
+msgid "Backend PID"
+msgstr "PID backend"
 
-#: command.c:1069 command.c:1170 command.c:2675
+#: command.c:902
+msgid "SSL Connection"
+msgstr "Connexion SSL"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "Bibliothèque SSL"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "inconnu"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "Protocole SSL"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "Bits de la clé SSL"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "Algorithme SSL"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "Compression SSL"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "aucun"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "aucun tampon de requête"
 
-#: command.c:1102 command.c:5776
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "numéro de ligne invalide : %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s : nom d'encodage invalide ou procédure de conversion introuvable"
 
-#: command.c:1368 command.c:2157 command.c:3454 command.c:3652 command.c:5882
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1375
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "Il n'y a pas d'erreur précédente."
 
-#: command.c:1488
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s non autorisé dans le mode pipeline"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: parenthèse droite manquante"
 
-#: command.c:1572 command.c:1691 command.c:1995 command.c:2009 command.c:2028
-#: command.c:2196 command.c:2437 command.c:2642 command.c:2682
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s : argument requis manquant"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults : nombre invalide de résultats demandés"
 
-#: command.c:1822
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif : ne peut pas survenir après \\else"
 
-#: command.c:1827
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif : pas de \\if correspondant"
 
-#: command.c:1891
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else : ne peut pas survenir après \\else"
 
-#: command.c:1896
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else : pas de \\if correspondant"
 
-#: command.c:1936
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif : pas de \\if correspondant"
 
-#: command.c:2092
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "Le tampon de requête est vide."
 
-#: command.c:2135
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Saisir le nouveau mot de passe de l'utilisateur « %s » : "
 
-#: command.c:2139
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Saisir le mot de passe à nouveau : "
 
-#: command.c:2148
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Les mots de passe ne sont pas identiques."
 
-#: command.c:2231
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s : n'a pas pu lire la valeur pour la variable"
 
-#: command.c:2333
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "Le tampon de requête a été effacé."
 
-#: command.c:2355
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Historique sauvegardé dans le fichier « %s ».\n"
 
-#: command.c:2442
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline doit être utilisé après \\bind ou \\bind_named"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline non autorisé en dehors du mode pipeline"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s : le nom de la variable d'environnement ne doit pas contenir « = »"
 
-#: command.c:2490
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "le nom de la fonction est requis"
 
-#: command.c:2492
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "le nom de la vue est requis"
 
-#: command.c:2614
+#: command.c:3176
 msgid "Timing is on."
 msgstr "Chronométrage activé."
 
-#: command.c:2616
+#: command.c:3178
 msgid "Timing is off."
 msgstr "Chronométrage désactivé."
 
-#: command.c:2702 command.c:2740 command.c:4163 command.c:4166 command.c:4169
-#: command.c:4175 command.c:4177 command.c:4203 command.c:4213 command.c:4225
-#: command.c:4239 command.c:4266 command.c:4324 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s : n'est pas actuellement en mode restreint"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s : mauvaise clé"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s : %m"
 
-#: command.c:2729 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: command.c:2801 command.c:2867
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch : la valeur d'intervalle est spécifiée plus d'une fois"
 
-#: command.c:2811 command.c:2877
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch : valeur d'intervalle incorrecte « %s »"
 
-#: command.c:2821
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: le nombre d'itération est spécifié plus d'une fois"
 
-#: command.c:2831
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch : nombre d'itération incorrect « %s »"
 
-#: command.c:2841
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: nombre de lignes minimum spécifié plus d'une fois"
 
-#: command.c:2851
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch : nombre de lignes minimum incorrect « %s »"
 
-#: command.c:2858
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch : paramètre « %s » non reconnu"
 
-#: command.c:3255 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: command.c:3260 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Mot de passe pour l'utilisateur %s : "
 
-#: command.c:3316
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "Ne pas donner utilisateur, hôte ou port lors de l'utilisation d'une chaîne de connexion"
 
-#: command.c:3351
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "Aucune connexion de base existante pour réutiliser ses paramètres"
 
-#: command.c:3658
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Connexion précédente conservée"
 
-#: command.c:3664
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect : %s"
 
-#: command.c:3720
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "Vous êtes maintenant connecté à la base de données « %s » en tant qu'utilisateur « %s » à l'adresse « %s » via le port « %s ».\n"
 
-#: command.c:3723
+#: command.c:4343
 #, 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"
 
-#: command.c:3729
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%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 » (adresse « %s » ) via le port « %s ».\n"
 
-#: command.c:3732
+#: command.c:4352
 #, 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"
 
-#: command.c:3737
+#: command.c:4357
 #, 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"
 
-#: command.c:3843
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, serveur %s)\n"
 
-#: command.c:3856
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -507,33 +614,25 @@ msgstr ""
 "ATTENTION : %s version majeure %s, version majeure du serveur %s.\n"
 "         Certaines fonctionnalités de psql pourraient ne pas fonctionner.\n"
 
-#: command.c:3895
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "Connexion SSL (protocole : %s, chiffrement : %s, compression : %s, ALPN : %s)\n"
 
-#: command.c:3896 command.c:3897
-msgid "unknown"
-msgstr "inconnu"
-
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "désactivé"
 
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "activé"
 
-#: command.c:3899
-msgid "none"
-msgstr "aucun"
-
-#: command.c:3913
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "connexion chiffrée avec GSSAPI\n"
 
-#: command.c:3933
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -545,284 +644,284 @@ msgstr ""
 "            Voir la section « Notes aux utilisateurs de Windows » de la page\n"
 "            référence de psql pour les détails.\n"
 
-#: command.c:4038
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "la variable d'environnement PSQL_EDITOR_LINENUMBER_ARG doit être définie avec un numéro de ligne"
 
-#: command.c:4068
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "n'a pas pu exécuter l'éditeur « %s »"
 
-#: command.c:4070
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "n'a pas pu exécuter /bin/sh"
 
-#: command.c:4120
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "n'a pas pu localiser le répertoire temporaire : %s"
 
-#: command.c:4147
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier temporaire « %s » : %m"
 
-#: command.c:4483
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: abréviation ambiguë : « %s » correspond à « %s » comme à « %s »"
 
-#: command.c:4503
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset : les formats autorisés sont aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4522
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: les styles de lignes autorisés sont ascii, old-ascii, unicode"
 
-#: command.c:4537
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset : les styles autorisés de ligne de bordure Unicode sont single, double"
 
-#: command.c:4552
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset : les styles autorisés pour la ligne de colonne Unicode sont single, double"
 
-#: command.c:4567
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset : les styles autorisés pour la ligne d'en-tête Unicode sont single, double"
 
-#: command.c:4619
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: les valeurs acceptées pour xheader_width sont « %s » (par défaut), « %s », « %s » ou un nombre indiquant la largeur exacte"
 
-#: command.c:4636
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep doit être un unique caractère d'un octet"
 
-#: command.c:4641
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldsep ne peut pas être un guillemet, un retour à la ligne ou un retour chariot"
 
-#: command.c:4779 command.c:4980
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset : option inconnue : %s"
 
-#: command.c:4799
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Le style de bordure est %d.\n"
 
-#: command.c:4805
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "La largeur cible n'est pas configuré.\n"
 
-#: command.c:4807
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "La largeur cible est %d.\n"
 
-#: command.c:4814
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Affichage étendu activé.\n"
 
-#: command.c:4816
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "L'affichage étendu est utilisé automatiquement.\n"
 
-#: command.c:4818
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Affichage étendu désactivé.\n"
 
-#: command.c:4825 command.c:4827 command.c:4829
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "La largeur étendue de l'entête est « %s ».\n"
 
-#: command.c:4831
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "La largeur étendue de l'entête est %d.\n"
 
-#: command.c:4837
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "Le séparateur de champs pour un CSV est « %s ».\n"
 
-#: command.c:4845 command.c:4853
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Le séparateur de champs est l'octet zéro.\n"
 
-#: command.c:4847
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Le séparateur de champs est « %s ».\n"
 
-#: command.c:4860
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Le bas de page pas défaut est activé.\n"
 
-#: command.c:4862
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Le bas de page par défaut est désactivé.\n"
 
-#: command.c:4868
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Le format de sortie est %s.\n"
 
-#: command.c:4874
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Le style de ligne est %s.\n"
 
-#: command.c:4881
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "L'affichage de null est « %s ».\n"
 
-#: command.c:4889
+#: command.c:5518
 #, 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"
 
-#: command.c:4891
+#: command.c:5520
 #, 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"
 
-#: command.c:4898
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Le paginateur est utilisé pour les affichages longs.\n"
 
-#: command.c:4900
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Le paginateur est toujours utilisé.\n"
 
-#: command.c:4902
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "L'utilisation du paginateur est désactivé.\n"
 
-#: command.c:4908
+#: command.c:5537
 #, 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"
 
-#: command.c:4918 command.c:4928
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Le séparateur d'enregistrements est l'octet zéro.\n"
 
-#: command.c:4920
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Le séparateur d'enregistrement est <saut de ligne>.\n"
 
-#: command.c:4922
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Le séparateur d'enregistrements est « %s ».\n"
 
-#: command.c:4935
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Les attributs de la table sont « %s ».\n"
 
-#: command.c:4938
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Les attributs de la table ne sont pas définis.\n"
 
-#: command.c:4945
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Le titre est « %s ».\n"
 
-#: command.c:4947
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Le titre n'est pas défini.\n"
 
-#: command.c:4954
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "L'affichage des tuples seuls est activé.\n"
 
-#: command.c:4956
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "L'affichage des tuples seuls est désactivé.\n"
 
-#: command.c:4962
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Le style de bordure Unicode est « %s ».\n"
 
-#: command.c:4968
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Le style de ligne Unicode est « %s ».\n"
 
-#: command.c:4974
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Le style d'en-tête Unicode est « %s ».\n"
 
-#: command.c:5223
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\! : échec"
 
-#: command.c:5261
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch ne peut pas être utilisé avec une requête vide"
 
-#: command.c:5293
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "n'a pas pu configurer le chronomètre : %m"
 
-#: command.c:5362
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (chaque %gs)\n"
 
-#: command.c:5365
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (chaque %gs)\n"
 
-#: command.c:5429
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "n'a pas pu attendre le signal : %m"
 
-#: command.c:5485 command.c:5492 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -835,111 +934,111 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: command.c:5671
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "« %s.%s » n'est pas une vue"
 
-#: command.c:5687
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "n'a pas pu analyser le tableau reloptions"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "ne peut mettre entre guillemets sans connexion active"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "l'argument de la commande shell contient un retour à la ligne ou un retour chariot : « %s »"
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "la connexion au serveur a été perdue"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "La connexion au serveur a été perdue. Tentative de réinitialisation : "
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "Échec.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Succès.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "PQresultStatus inattendu : %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Temps : %.3f ms\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "Durée : %.3f ms (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "Durée : %.3f ms (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Durée : %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Vous n'êtes pas connecté à une base de données."
 
-#: common.c:714
+#: common.c:749
 #, 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"
 "processus serveur de PID %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, 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"
 "PID %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "n'a pas pu imprimer la table résultante : %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "aucune ligne retournée pour \\gset"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "plus d'une ligne retournée pour \\gset"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "tentative ignorée d'utilisation de \\gset dans une variable traitée spécialement « %s »"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify command)******************************************/\n"
@@ -950,37 +1049,52 @@ msgstr ""
 "%s\n"
 "***(appuyez sur entrée pour l'exécuter ou tapez x puis entrée pour annuler)***\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "INSTRUCTION :  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "état de la transaction inattendu (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Colonne"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Type"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "La commande n'a pas de résultats ou le résultat n'a pas de colonnes.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "Aucun résultat en attente à obtenir"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "échec de la récupération des résultats en mode par morceau"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "Pipeline annulé, la commande ne s'est pas exécutée"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY dans un pipeline n'est pas accepté, annulation de la connexion"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1033,11 +1147,11 @@ msgstr ""
 "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:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "annulé du fait d'une erreur de lecture"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "tente de sortir du mode copy"
 
@@ -1086,1162 +1200,1252 @@ msgstr "\\crosstabview : nom de colonne ambigu : « %s »"
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview : nom de colonne non trouvé : « %s »"
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Schéma"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Nom"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Type de données du résultat"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Type de données des paramètres"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Description"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "Liste des fonctions d'agrégation"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "Le serveur (version %s) ne supporte pas les méthodes d'accès."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "Index"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Table"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Gestionnaire"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "Liste des méthodes d'accès"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "Emplacement"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "Options"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Taille"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "Liste des tablespaces"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df ne prend que [anptwS+] comme options"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df ne prend que [%s] comme options"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df ne prend pas d'option « %c » pour un serveur en version %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "window"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "proc"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "func"
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "immutable"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "stable"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "Volatibilité"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "restricted"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "safe"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "unsafe"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "Parallèle"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "definer"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "invoker"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "Sécurité"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "oui"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "non"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Leakproof ?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "Langage"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Nom interne"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "Liste des fonctions"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "Éléments"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "Liste des types de données"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Type de l'arg. gauche"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Type de l'arg. droit"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "Type du résultat"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Fonction"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "Liste des opérateurs"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "Encodage"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Fournisseur de locale"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Collationnement"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Type caract."
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Locale"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "Règles ICU :"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Liste des bases de données"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "table"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "vue"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "vue matérialisée"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "séquence"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "table distante"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "table partitionnée"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Droits d'accès à la colonne"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Politiques"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Droits d'accès"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "fonction"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "type"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "schéma"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "« Large Object »"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Droits d'accès par défaut"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "Objet"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "contrainte de table"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "contrainte de domaine"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "classe d'opérateur"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "famille d'opérateur"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "règle"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Descriptions des objets"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "Aucune relation nommée « %s » n'a été trouvée."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "Aucune relation n'a été trouvée."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "Aucune relation avec l'OID « %s » n'a été trouvée."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Début"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Minimum"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Maximum"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Incrément"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "oui"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "non"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "Cycles ?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Cache"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Propriétaire : %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Séquence pour la colonne d'identité : %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Séquence non journalisée « %s.%s »"
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Séquence « %s.%s »"
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Table non tracée « %s.%s »"
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Table « %s.%s »"
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vue « %s.%s »"
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Vue matérialisée non journalisée « %s.%s »"
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Vue matérialisée « %s.%s »"
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Index non tracé « %s.%s »"
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index « %s.%s »"
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Index partitionné non journalisé « %s.%s »"
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Index partitionné « %s.%s »"
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Table TOAST « %s.%s »"
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Type composé « %s.%s »"
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Table distante « %s.%s »"
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Table non journalisée « %s.%s »"
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Table partitionnée « %s.%s »"
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Collationnement"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "NULL-able"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "Par défaut"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "Clé ?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Définition"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "Options FDW"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "Stockage"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "Compression"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Cible de statistiques"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Partition de : %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Aucune contrainte de partition"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Contrainte de partition : %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Clé de partition : %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Table propriétaire : « %s.%s »"
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "clé primaire, "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "unique"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls non distincts"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr " , "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "pour la table « %s.%s »"
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", prédicat (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", en cluster"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", invalide"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", déferrable"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", initialement déferré"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", identité réplica"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Index :"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Contraintes de vérification :"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Contraintes de clés étrangères :"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Référencé par :"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Politiques :"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Politiques (mode sécurité de ligne activé en forcé) :"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Politiques (mode sécurité de ligne activé) : (aucune)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Politiques (mode sécurité de ligne activé en forcé) : (aucune)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Politiques (mode sécurité de ligne désactivé) :"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Objets statistiques :"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Règles :"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Règles désactivées :"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Règles toujours activées :"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Règles activées uniquement sur le réplica :"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Publications :"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Contraintes NOT NULL :"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (local, hérité)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (hérité)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Définition de la vue :"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Triggers :"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Triggers utilisateurs désactivés :"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Triggers internes désactivés :"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Triggers toujours activés :"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Triggers activés uniquement sur le réplica :"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Serveur : %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "Options FDW : (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Hérite de"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Nombre de partitions : %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Nombre de partitions : %d (utilisez \\d+ pour les lister)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, 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:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Tables enfant"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Partitions"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Table de type : %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Identité de réplicat"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Contient des OID : oui"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Méthode d'accès : %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace « %s »"
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "Liste des rôles"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Nom du rôle"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Attributs"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Superutilisateur"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "Pas d'héritage"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "Créer un rôle"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "Créer une base"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "Ne peut pas se connecter"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "Réplication"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Contournement RLS"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "Sans connexions"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d connexion"
 msgstr[1] "%d connexions"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Mot de passe valide jusqu'à "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "Rôle"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "Base de données"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "Réglages"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "Aucune configuration pour le rôle « %s » et la base de données « %s » n'a été trouvée."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "Aucune configuration pour le rôle « %s » n'a été trouvée."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "Aucune configuration n'a été trouvée."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Liste des paramètres"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "Membre de"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Donneur de droits"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "Liste des droits de rôles"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "index"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "Table TOAST"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "index partitionné"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "permanent"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "temporaire"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "non journalisé"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Persistence"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Méthode d'accès"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "N'a pas trouvé de relation nommée « %s »."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "N'a pas trouvé de table nommée « %s »."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "N'a pas trouvé d'index nommé « %s »."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "N'a pas trouvé de vue nommée « %s »."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "N'a pas trouvé de vue matérialisée nommée « %s »."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "N'a pas trouvé de séquence nommée « %s »."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "N'a pas trouvé de table distante nommée « %s »."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "N'a pas trouvé de tables."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "N'a pas trouvé d'index."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "N'a pas trouvé de vues."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "N'a pas trouvé de vues matérialisées."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "N'a pas trouvé de séquences."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "N'a pas trouvé de tables distantes."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Liste des relations"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "Liste des tables"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "Liste des index"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "Liste des vues"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "Liste des vues matérialisées"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "Liste des séquences"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "Liste des tables distantes"
+
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "Le serveur (version %s) ne supporte pas le partitionnement déclaratif des tables."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Liste des index partitionnés"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Liste des tables partitionnées"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Liste des relations partitionnées"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Nom du parent"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Taille de la partition de dernier niveau"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Taille totale"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "De confiance"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Langage interne"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Gestionnaire d'appel"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Validateur"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Gestionnaire en ligne"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "Liste des langages"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "Vérification"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Liste des domaines"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "Source"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "Destination"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "Par défaut ?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Liste des conversions"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "Paramètre"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "Valeur"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "Contexte"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Liste des paramètres de configuration"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Liste des paramètres de configuration à valeur personnalisée"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "Le serveur (version %s) ne supporte pas les triggers d'événement."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "Événement"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "activé"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "réplicat"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "toujours"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "désactivé"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Activé"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "Tags"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Liste des triggers sur évènement"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "Le serveur (version %s) ne supporte pas les statistiques étendues."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Dépendances"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "Liste des statistiques étendues"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Type source"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Type cible"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "assigné"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Implicite ?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Liste des conversions explicites"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Déterministe ?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Liste des collationnements"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Liste des schémas"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Liste des analyseurs de la recherche de texte"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "Aucun analyseur de la recherche de texte nommé « %s » n'a été trouvé."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "Aucun analyseur de recherche de texte n'a été trouvé."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Début de l'analyse"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "Méthode"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Obtenir le prochain jeton"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "Fin de l'analyse"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Obtenir l'en-tête"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Obtenir les types de jeton"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analyseur « %s.%s » de la recherche de texte"
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analyseur « %s » de la recherche de texte"
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "Nom du jeton"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Types de jeton pour l'analyseur « %s.%s »"
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Types de jeton pour l'analyseur « %s »"
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "Modèle"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "Options d'initialisation"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Liste des dictionnaires de la recherche de texte"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "Initialisation"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Liste des modèles de la recherche de texte"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Liste des configurations de la recherche de texte"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "Aucune configuration de la recherche de texte nommée « %s » n'a été trouvée."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "Aucune configuration de recherche de texte n'a été trouvée."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "Jeton"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Dictionnaires"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuration « %s.%s » de la recherche de texte"
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuration « %s » de la recherche de texte"
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2250,7 +2454,7 @@ msgstr ""
 "\n"
 "Analyseur : « %s.%s »"
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2259,273 +2463,277 @@ msgstr ""
 "\n"
 "Analyseur : « %s »"
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Liste des wrappers de données distantes"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Wrapper des données distantes"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Liste des serveurs distants"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Serveur"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "Nom de l'utilisateur"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Liste des correspondances utilisateurs"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "Liste des tables distantes"
+#: describe.c:6196
+msgid "Default version"
+msgstr "Version par défaut"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Liste des extensions installées"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "Aucune extension nommée « %s » n'a été trouvée."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "Aucune extension n'a été trouvée."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "Description d'objet"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objets dans l'extension « %s »"
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "mauvaise qualification du nom (trop de points entre les noms) : %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, 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"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "Le serveur (version %s) ne supporte pas les publications."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Toutes les tables"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Insertions"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Suppressions"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Tronque"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "Colonnes générées"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Via la racine"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Liste des publications"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "Aucune publication nommée « %s » n'a été trouvée."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "Aucune publication n'a été trouvée."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Publication %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Tables :"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Tables des schémas :"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "Le serveur (version %s) ne supporte pas les souscriptions."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "Publication"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "Binaire"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "Flux"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Commit en deux phases"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Désactiver en cas d'erreur"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "Origine"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "Mot de passe requis"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "Exécuté en tant que propriétaire ?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "Failover"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Validation synchrone"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Informations de connexion"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Ignore LSN"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Liste des souscriptions"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(aucun)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "Type en entrée"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Type de stockage"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Classe d'opérateur"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Famille d'opérateur"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Liste des classes d'opérateurs"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Types applicables"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Liste des familles d'opérateurs"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "Opérateur"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Stratégie"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "ordre"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "recherche"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "But"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "Tri famille d'opérateur"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "Liste d'opérateurs des familles d'opérateurs"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Type de l'arg. gauche enregistré"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Type de l'arg. droit enregistré"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "Numéro"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Liste des fonctions de support des familles d'opérateurs"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "« Large objects »"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2533,11 +2741,11 @@ msgstr ""
 "psql est l'interface interactive de PostgreSQL.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:502
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2545,29 +2753,29 @@ msgstr ""
 "  psql [OPTIONS]... [BASE [UTILISATEUR]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "Options générales :\n"
 
-#: help.c:68
+#: help.c:65
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr ""
 "  -c, --command=COMMANDE  exécute une commande unique (SQL ou interne), puis\n"
 "                          quitte\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=BASE       base de données de connexion\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=FICHIER      exécute les commandes du fichier, puis quitte\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list              affiche les bases de données disponibles, puis quitte\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2577,15 +2785,15 @@ msgstr ""
 "                          configure la variable psql NOM en VALEUR\n"
 "                          (par exemple : -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version           affiche la version puis quitte\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc         ne lit pas le fichier de démarrage (~/.psqlrc)\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
@@ -2594,19 +2802,19 @@ msgstr ""
 "                          exécute dans une transaction unique (si non\n"
 "                          interactif)\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=options]    affiche cette aide et quitte\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commandes    liste les méta-commandes, puis quitte\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variables    liste les variables spéciales, puis quitte\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2614,59 +2822,59 @@ msgstr ""
 "\n"
 "Options d'entrée/sortie :\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all          affiche les lignes du script\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors       affiche les commandes échouées\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries      affiche les commandes envoyées au serveur\n"
 
-#: help.c:87
+#: help.c:84
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr ""
 "  -E, --echo-hidden       affiche les requêtes engendrées par les commandes\n"
 "                          internes\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FICHIER  envoie les traces dans le fichier\n"
 
-#: help.c:89
+#: help.c:86
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline       désactive l'édition avancée de la ligne de commande\n"
 "                          (readline)\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=FICHIER    écrit les résultats des requêtes dans un fichier (ou\n"
 "                          |tube)\n"
 
-#: help.c:91
+#: help.c:88
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet             s'exécute silencieusement (pas de messages, uniquement\n"
 "                          le résultat des requêtes)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step       active le mode étape par étape (confirmation pour\n"
 "                          chaque requête)\n"
 
-#: help.c:93
+#: help.c:90
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr ""
 "  -S, --single-line       active le mode ligne par ligne (EOL termine la\n"
 "                          commande SQL)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2674,19 +2882,19 @@ msgstr ""
 "\n"
 "Options de formatage de la sortie :\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr ""
 "  -A, --no-align          active le mode d'affichage non aligné des tables\n"
 "                          (-P format=unaligned)\n"
 
-#: help.c:97
+#: help.c:94
 msgid "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr ""
 "      --csv               mode d'affichage CSV (valeurs séparées par des\n"
 "                          virgules)\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -2696,19 +2904,19 @@ msgstr ""
 "                          séparateur de champs pour un affichage non aligné\n"
 "                          (par défaut : « %s »)\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr ""
 "  -H, --html              active le mode d'affichage HTML des tables\n"
 "                          (-P format=html)\n"
 
-#: help.c:102
+#: help.c:99
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr ""
 "  -P, --pset=VAR[=ARG]    initialise l'option d'impression VAR à ARG (voir la\n"
 "                          commande \\pset)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: newline)\n"
@@ -2717,21 +2925,21 @@ msgstr ""
 "                          séparateur d'enregistrements pour un affichage non\n"
 "                          aligné (par défaut : saut de ligne)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only       affiche seulement les lignes (-P tuples_only)\n"
 
-#: help.c:106
+#: help.c:103
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr ""
 "  -T, --table-attr=TEXTE  initialise les attributs des balises HTML de tableau\n"
 "                          (largeur, bordure)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded          active l'affichage étendu des tables (-P expanded)\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero byte\n"
@@ -2740,7 +2948,7 @@ msgstr ""
 "                          initialise le séparateur de champs pour un affichage\n"
 "                          non aligné à l'octet zéro\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero byte\n"
@@ -2749,7 +2957,7 @@ msgstr ""
 "                          initialise le séparateur d'enregistrements pour un\n"
 "                          affichage non aligné à l'octet zéro\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2757,31 +2965,31 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HÔTE         hôte du serveur de bases de données ou\n"
 "                          répertoire des sockets\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=PORT         port du serveur de bases de données\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=NOM      nom de l'utilisateur de la base de données\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password       ne demande jamais un mot de passe\n"
 
-#: help.c:118
+#: help.c:115
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password          force la demande du mot de passe (devrait survenir\n"
 "                          automatiquement)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
@@ -2795,39 +3003,35 @@ msgstr ""
 "la documentation de PostgreSQL.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapporter les bogues à <%s>.\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "Général\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       configure les paramètres de la requête\n"
-
-#: help.c:168
+#: help.c:164
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright           affiche les conditions d'utilisation et de\n"
 "                       distribution de PostgreSQL\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr "  \\crosstabview [COLONNES] exécute la requête et affiche le résultat dans un tableau croisé\n"
 
-#: help.c:170
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose            affiche le message d'erreur le plus récent avec une verbosité maximale\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2835,26 +3039,42 @@ msgstr ""
 "  \\g [(OPTIONS)] [FICHIER]  exécute la requête (et envoie les résultats à un fichier ou à |pipe);\n"
 "                         \\g sans arguments est équivalent à un point-virgule\n"
 
-#: help.c:173
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc             décrit le résultat de la requête sans l'exécuter\n"
 
-#: help.c:174
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec             exécute la requête et exécute chaque valeur du résultat\n"
 
-#: help.c:175
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [PRÉFIXE]         exécute la requête et enregistre le résultat dans des variables psql\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr "  \\gx [(OPTIONS)] [FICHIER] comme \\g, mais force le mode de sortie étendu\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                   quitte psql\n"
 
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict CLE_RESTRICTION\n"
+"                         entre en mode restreint avec la clé fournie\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict CLE_RESTRICTION\n"
+"                         sort du mode restreint si la clé correspond\n"
+
 #: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
@@ -2865,8 +3085,8 @@ msgstr ""
 "                         exécute la requête chaque SEC secondes, jusqu'à N fois,\n"
 "                         s'arrête si moins de MIN lignes sont renvoyés\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -2999,248 +3219,250 @@ msgid "Informational\n"
 msgstr "Informations\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (options : S = affiche les objets systèmes, + = informations supplémentaires)\n"
+msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
+msgstr "  (options : S = affiche les objets systèmes, x = mode étendu, + = informations supplémentaires)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]               affiche la liste des tables, vues et séquences\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]              affiche la liste des tables, vues et séquences\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr ""
 "  \\d[S+] NOM           affiche la description de la table, de la vue,\n"
 "                       de la séquence ou de l'index\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S] [MODÈLE]      affiche les agrégats\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx] [MODÈLE]     affiche les agrégats\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+] [MODÈLE]      affiche la liste des méthodes d'accès\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+] [MODÈLE]     affiche la liste des méthodes d'accès\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  affiche les classes d'opérateurs\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]] affiche les classes d'opérateurs\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  affiche les familles d'opérateur\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]] affiche les familles d'opérateur\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   affiche les opérateurs des familles d'opérateur\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]  affiche les opérateurs des familles d'opérateur\n"
 
 #: help.c:229
-msgid "  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   liste les fonctions de support des familles d'opérateur\n"
+msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
+msgstr "  \\dAp[x+] [AMPTRN [OPFPTRN]]  liste les fonctions de support des familles d'opérateur\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+] [MODÈLE]      affiche la liste des tablespaces\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+] [MODÈLE]     affiche la liste des tablespaces\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [MODÈLE]     affiche la liste des conversions\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [MODÈLE]    affiche la liste des conversions\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [MODÈLE]  affiche les paramètres de configuration\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [MODÈLE] affiche les paramètres de configuration\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+] [MODÈLE]      affiche la liste des transtypages\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+] [MODÈLE]     affiche la liste des transtypages\n"
 
 #: help.c:234
-msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
+msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
 msgstr ""
-"  \\dd[S] [MODÈLE]      affiche les commentaires des objets dont le commentaire\n"
+"  \\dd[Sx] [MODÈLE]     affiche les commentaires des objets dont le commentaire\n"
 "                        n'est affiché nul part ailleurs\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [MODÈLE]     affiche la liste des domaines\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [MODÈLE]    affiche la liste des domaines\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp   [MODÈLE]      affiche les droits par défaut\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]   [MODÈLE]   affiche les droits par défaut\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [MODÈLE]     affiche la liste des tables distantes\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [MODÈLE]    affiche la liste des tables distantes\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [MODÈLE]     affiche la liste des serveurs distants\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [MODÈLE]    affiche la liste des serveurs distants\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [MODÈLE]     affiche la liste des tables distantes\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [MODÈLE]    affiche la liste des tables distantes\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [MODÈLE]     affiche la liste des correspondances utilisateurs\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [MODÈLE]    affiche la liste des correspondances utilisateurs\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [MODÈLE]     affiche la liste des wrappers de données distantes\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [MODÈLE]    affiche la liste des wrappers de données distantes\n"
 
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
 msgstr ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         affiche la liste des fonctions [seulement agrégat/normal/procédure/trigger/window]\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
 msgstr ""
-"  \\dF[+] [MODÈLE]      affiche la liste des configurations de la recherche\n"
+"  \\dF[x+] [MODÈLE]     affiche la liste des configurations de la recherche\n"
 "                        plein texte\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
 msgstr ""
-"  \\dFd[+] [MODÈLE]     affiche la liste des dictionnaires de la recherche de\n"
+"  \\dFd[x+] [MODÈLE]    affiche la liste des dictionnaires de la recherche de\n"
 "                        texte\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
 msgstr ""
-"  \\dFp[+] [MODÈLE]        affiche la liste des analyseurs de la recherche de\n"
+"  \\dFp[x+] [MODÈLE]       affiche la liste des analyseurs de la recherche de\n"
 "                       texte\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
 msgstr ""
-"  \\dFt[+] [MODÈLE]     affiche la liste des modèles de la recherche de\n"
+"  \\dFt[x+] [MODÈLE]    affiche la liste des modèles de la recherche de\n"
 "                        texte\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+]  [MODÈLE]    affiche la liste des rôles (utilisateurs)\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+]  [MODÈLE]   affiche la liste des rôles (utilisateurs)\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [MODÈLE]     affiche la liste des index\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [MODÈLE]    affiche la liste des index\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+]                 liste des « Large Objects », identique à \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]                liste des « Large Objects », identique à \\lo_list\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [MODÈLE]     affiche la liste des langages procéduraux\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [MODÈLE]    affiche la liste des langages procéduraux\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [MODÈLE]     affiche la liste des vues matérialisées\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [MODÈLE]    affiche la liste des vues matérialisées\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+]  [MODÈLE]    affiche la liste des schémas\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+]  [MODÈLE]   affiche la liste des schémas\n"
 
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
 msgstr ""
-"  \\do[S+]  [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+]  [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                        affiche la liste des opérateurs\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [MODÈLE]     affiche la liste des collationnements\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [MODÈLE]    affiche la liste des collationnements\n"
 
 #: help.c:257
-msgid "  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
+msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
 msgstr ""
-"  \\dp[S]  [MODÈLE]     affiche la liste des droits d'accès aux tables,\n"
+"  \\dp[Sx]  [MODÈLE]    affiche la liste des droits d'accès aux tables,\n"
 "                        vues, séquences\n"
 
 #: help.c:258
-msgid "  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"
-msgstr "  \\dP[itn+] [PATTERN]    affiche les relations partitionnées [seulement index/table]  [n=imbriquées]\n"
+msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
+msgstr "  \\dP[itnx+] [PATTERN]   affiche les relations partitionnées [seulement index/table]  [n=imbriquées]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
 msgstr ""
-"  \\drds [ROLEPTRN [DBPTRN]] liste la configuration utilisateur par base de données\n"
+"  \\drds[x] [ROLEPTRN [DBPTRN]] liste la configuration utilisateur par base de données\n"
 "\n"
 
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\dg[S]  [MODÈLE]     affiche la liste des droits des rôles\n"
-
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[S+] [MODÈLE]    affiche la liste des publications de réplication\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\dg[Sx]  [MODÈLE]    affiche la liste des droits des rôles\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [MODÈLE]     affiche la liste des souscriptions de réplication\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [MODÈLE]   affiche la liste des publications de réplication\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [MODÈLE]     affiche la liste des séquences\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [MODÈLE]    affiche la liste des souscriptions de réplication\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [MODÈLE]     affiche la liste des tables\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [MODÈLE]    affiche la liste des séquences\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [MODÈLE]     affiche la liste des types de données\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [MODÈLE]    affiche la liste des tables\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+]  [MODÈLE]    affiche la liste des rôles (utilisateurs)\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [MODÈLE]    affiche la liste des types de données\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [MODÈLE]     affiche la liste des vues\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+]  [MODÈLE]   affiche la liste des rôles (utilisateurs)\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+] [MODÈLE]      affiche la liste des extensions\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [MODÈLE]    affiche la liste des vues\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX   [MODÈLE]      affiche les statistiques étendues\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+] [MODÈLE]     affiche la liste des extensions\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]   [MODÈLE]   affiche les triggers sur évènement\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [MODÈLE]   affiche les statistiques étendues\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+] [MODÈLE]     affiche la liste des bases de données\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]   [MODÈLE]  affiche les triggers sur évènement\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+] [FONCTION]    édite la définition d'une fonction\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+] [MODÈLE]    affiche la liste des bases de données\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv [FONCTION]       édite la définition d'une vue\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+] [FONCTION]   édite la définition d'une fonction\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]      [MODÈLE]  identique à \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+] [FONCTION]    édite la définition d'une vue\n"
+
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]      [MODÈLE] identique à \\dp\n"
 
-#: help.c:277
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "« Large objects »\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr ""
 "  \\lo_export LOBOID FICHIER\n"
 "                         écrit un « Large Object » dans le fichier\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3248,42 +3470,42 @@ msgstr ""
 "  \\lo_import FICHIER [COMMENTAIRE]\n"
 "                         lit un « Large Object » à partir du fichier\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\dl[+]                 liste des « Large Objects »\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\dl[x+]                liste des « Large Objects »\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      supprime un « Large Object »\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Formatage\n"
 
-#: help.c:286
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                   bascule entre les modes de sortie alignée et non\n"
 "                        alignée\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [CHAÎNE]          initialise le titre d'une table, ou le désactive en\n"
 "                        l'absence d'argument\n"
 
-#: help.c:288
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr ""
 "  \\f [CHAÎNE]          affiche ou initialise le séparateur de champ pour\n"
 "                        une sortie non alignée des requêtes\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                   bascule le mode de sortie HTML (actuellement %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3301,31 +3523,31 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t                   affiche uniquement les lignes (actuellement %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [CHAÎNE]          initialise les attributs HTML de la balise <table>,\n"
 "                        ou l'annule en l'absence d'argument\n"
 
-#: help.c:301
+#: help.c:302
 #, 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"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "auto"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "Connexions\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3335,7 +3557,7 @@ msgstr ""
 "                        se connecte à une autre base de données\n"
 "                        (actuellement « %s »)\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3344,71 +3566,129 @@ msgstr ""
 "                        se connecte à une nouvelle base de données\n"
 "                        (aucune connexion actuellement)\n"
 
-#: help.c:313
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo            affiche des informations sur la connexion en cours\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [ENCODAGE] affiche ou initialise l'encodage du client\n"
 
-#: help.c:315
+#: help.c:316
 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"
 "                        utilisateur\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Système d'exploitation\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [RÉPERTOIRE]     change de répertoire de travail\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR récupère une variable d'environnement\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NOM [VALEUR] (dés)initialise une variable d'environnement\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off]     bascule l'activation du chronométrage des commandes\n"
 "                        (actuellement %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr ""
 "  \\! [COMMANDE]        exécute la commande dans un shell ou exécute un\n"
 "                        shell interactif\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "Variables\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [TEXTE] NOM  demande à l'utilisateur de configurer la variable\n"
 "                        interne\n"
 
-#: help.c:329
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr ""
 "  \\set [NOM [VALEUR]]  initialise une variable interne ou les affiche\n"
 "                        toutes en l'absence de paramètre\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOM           désactive (supprime) la variable interne\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "Protocole de requêtes étendues\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       configure les paramètres de la requête\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr ""
+"  \\bind_named NOM_REQ [PARAM]...\n"
+"                     initialise les paramètres de la requête pour une requête préparée existante\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared NOM_REQ\n"
+"                     ferme une requête préparée existante\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline       quitte le mode pipeline\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush             envoie les données en sortie au serveur\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest      envoie une demande au serveur de vider son tampon en sortie\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr ""
+"  \\getresults [NB_RES]\n"
+"                     lit NB_RES résultats en attente ou tous si aucun argument\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse NOM_REQ     crée une requête préparée\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline      envoie une requête étendue vers un pipeline en cours\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         enter pipeline mode\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline      ajout un point de synchronisation vers un pipeline en cours\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
@@ -3416,11 +3696,11 @@ msgstr ""
 "Liste des variables traitées spécialement\n"
 "\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "variables psql :\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3430,7 +3710,7 @@ msgstr ""
 "  ou \\set NOM VALEUR dans psql\n"
 "\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3438,7 +3718,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    si activé, les commandes SQL réussies sont automatiquement validées\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3448,7 +3728,7 @@ msgstr ""
 "    détermine la casse utilisée pour compléter les mots clés SQL\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3456,7 +3736,7 @@ msgstr ""
 "  DBNAME\n"
 "    le nom de base de données actuel\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3466,7 +3746,7 @@ msgstr ""
 "    contrôle ce qui est envoyé sur la sortie standard\n"
 "    [all, errors, none, queries]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3476,7 +3756,7 @@ msgstr ""
 "    si activé, affiche les requêtes internes exécutées par les méta-commandes ;\n"
 "    si configuré à « noexec », affiche les requêtes sans les exécuter\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3484,7 +3764,7 @@ msgstr ""
 "  ENCODING\n"
 "    encodage du jeu de caractères client\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3492,7 +3772,7 @@ msgstr ""
 "  ERROR\n"
 "    true si la dernière requête a échoué, sinon false\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3501,7 +3781,7 @@ msgstr ""
 "    le nombre de lignes résultats à récupérer et à afficher à la fois\n"
 "    (0 pour illimité)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3509,7 +3789,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "   si activé, les méthodes d'accès ne sont pas affichées\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3517,7 +3797,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    si activé, les méthodes de compression methods ne sont pas affichées\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3525,7 +3805,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    contrôle l'historique des commandes [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3533,7 +3813,7 @@ msgstr ""
 "  HISTFILE\n"
 "    nom du fichier utilisé pour stocker l'historique des commandes\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3541,7 +3821,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    nombre maximum de commandes à stocker dans l'historique de commandes\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3549,7 +3829,7 @@ msgstr ""
 "  HOST\n"
 "    l'hôte de la base de données\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3557,7 +3837,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    nombre d'EOF nécessaire pour terminer une session interactive\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3565,7 +3845,7 @@ msgstr ""
 "  LASTOID\n"
 "    valeur du dernier OID affecté\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3575,7 +3855,7 @@ msgstr ""
 "  LAST_ERROR_SQLSTATE\n"
 "    message et SQLSTATE de la dernière erreur ou une chaîne vide et \"00000\" if si aucune erreur\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3583,7 +3863,7 @@ msgstr ""
 "  ON_ERROR_ROLLBACK\n"
 "    si activé, une erreur n'arrête pas une transaction (utilise des savepoints implicites)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3591,7 +3871,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    arrête l'exécution d'un batch après une erreur\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3599,7 +3879,7 @@ msgstr ""
 "  PORT\n"
 "    port du serveur pour la connexion actuelle\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3607,7 +3887,7 @@ msgstr ""
 "  PROMPT1\n"
 "    spécifie l'invite standard de psql\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3615,7 +3895,7 @@ msgstr ""
 "  PROMPT2\n"
 "    spécifie l'invite utilisé quand une requête continue après la ligne courante\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3623,7 +3903,7 @@ msgstr ""
 "  PROMPT3\n"
 "    spécifie l'invite utilisée lors d'un COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3631,7 +3911,7 @@ msgstr ""
 "  QUIET\n"
 "    s'exécute en silence (identique à l'option -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3639,7 +3919,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    nombre de lignes renvoyées ou affectées par la dernière requête, ou 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3649,7 +3929,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    version du serveur (chaîne courte ou format numérique)\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3657,7 +3937,7 @@ msgstr ""
 "  SHELL_ERROR\n"
 "    true si la dernière requête a échoué, sinon false\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3665,7 +3945,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    code de sortie de la dernière commande shell\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3673,7 +3953,7 @@ msgstr ""
 "  SHOW_ALL_RESULTS\n"
 "    affiche tous les résultats d'une requête combinée (\\;) au lieu du dernier uniquement\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3681,7 +3961,7 @@ msgstr ""
 "  SHOW_CONTEXT\n"
 "    contrôle l'affichage des champs de contexte du message [never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3689,7 +3969,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    une fin de ligne termine le mode de commande SQL (identique à l'option -S)\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3697,7 +3977,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    mode pas à pas (identique à l'option -s)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3705,7 +3985,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    SQLSTATE de la dernière requête, ou \"00000\" si aucune erreur\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3713,7 +3993,7 @@ msgstr ""
 "  USER\n"
 "    l'utilisateur actuellement connecté\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3721,7 +4001,7 @@ msgstr ""
 "  VERBOSITY\n"
 "    contrôle la verbosité des rapports d'erreurs [default, verbose, terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3733,7 +4013,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    version de psql (chaîne longue, chaîne courte, ou format numérique)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL\n"
+"    nombre de secondes \\watch attend entre chaque exécutions (par défaut %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3741,7 +4030,7 @@ msgstr ""
 "\n"
 "Paramètres d'affichage :\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3751,7 +4040,7 @@ msgstr ""
 "  ou \\pset NOM [VALEUR] dans psql\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3759,7 +4048,7 @@ msgstr ""
 "  border\n"
 "    style de bordure (nombre)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3767,7 +4056,16 @@ msgstr ""
 "  columns\n"
 "    largeur cible pour le format encadré\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    champ séparateur pour le format de sortie CSV (par défaut « %c »)\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3775,7 +4073,7 @@ msgstr ""
 "  expanded (ou x)\n"
 "    sortie étendue [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3784,7 +4082,7 @@ msgstr ""
 "  fieldsep\n"
 "    champ séparateur pour l'affichage non aligné (par défaut « %s »)\n"
 
-#: help.c:468
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3792,7 +4090,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    configure le séparateur de champ pour l'affichage non alignée à l'octet zéro\n"
 
-#: help.c:470
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3800,7 +4098,7 @@ msgstr ""
 "  footer\n"
 "    active ou désactive l'affiche du bas de tableau [on, off]\n"
 
-#: help.c:472
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3808,7 +4106,7 @@ msgstr ""
 "  format\n"
 "    active le format de sortie [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -3816,7 +4114,7 @@ msgstr ""
 "  linestyle\n"
 "    configure l'affichage des lignes de bordure [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -3824,7 +4122,7 @@ msgstr ""
 "  null\n"
 "    configure la chaîne à afficher à la place d'une valeur NULL\n"
 
-#: help.c:478
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -3833,7 +4131,7 @@ msgstr ""
 "    active ou désactive l'affichage d'un caractère spécifique à la locale pour séparer\n"
 "    des groupes de chiffres [on, off]\n"
 
-#: help.c:480
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -3841,7 +4139,7 @@ msgstr ""
 "  pager\n"
 "    contrôle quand un paginateur externe est utilisé [yes, no, always]\n"
 
-#: help.c:482
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -3849,7 +4147,7 @@ msgstr ""
 "  recordsep\n"
 "    enregistre le séparateur de ligne pour les affichages non alignés\n"
 
-#: help.c:484
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -3858,7 +4156,7 @@ msgstr ""
 "    initialise le séparateur d'enregistrements pour un affichage\n"
 "    non aligné à l'octet zéro\n"
 
-#: help.c:486
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -3869,7 +4167,7 @@ msgstr ""
 "    proportionnelles de colonnes pour les types de données alignés à gauche dans le\n"
 "    format latex-longtable\n"
 
-#: help.c:489
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -3877,7 +4175,7 @@ msgstr ""
 "  title\n"
 "    configure le titre de la table pour toute table affichée\n"
 
-#: help.c:491
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -3885,7 +4183,7 @@ msgstr ""
 "  tuples_only\n"
 "    si activé, seules les données de la table sont affichées\n"
 
-#: help.c:493
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -3897,7 +4195,7 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    configure le style d'affichage de ligne Unicode [single, double]\n"
 
-#: help.c:497
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -3907,7 +4205,7 @@ msgstr ""
 "    configure la largeur maximale de l'entête dans le format étendu\n"
 "    [full, column, page, valeur entière]\n"
 
-#: help.c:501
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -3915,7 +4213,7 @@ msgstr ""
 "\n"
 "Variables d'environnement :\n"
 
-#: help.c:505
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -3925,7 +4223,7 @@ msgstr ""
 "  ou \\setenv NOM [VALEUR] dans psql\n"
 "\n"
 
-#: help.c:507
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -3937,7 +4235,7 @@ msgstr ""
 "  ou \\setenv NOM [VALEUR] dans psql\n"
 "\n"
 
-#: help.c:510
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -3945,7 +4243,7 @@ msgstr ""
 "  COLUMNS\n"
 "    nombre de colonnes pour le format encadré\n"
 
-#: help.c:512
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -3953,7 +4251,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    identique au paramètre de connexion application_name\n"
 
-#: help.c:514
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -3961,7 +4259,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    identique au paramètre de connexion dbname\n"
 
-#: help.c:516
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -3969,7 +4267,7 @@ msgstr ""
 "  PGHOST\n"
 "    identique au paramètre de connexion host\n"
 
-#: help.c:518
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -3977,7 +4275,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    nom du fichier de mot de passe\n"
 
-#: help.c:520
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -3985,7 +4283,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    mot de passe de connexion (non recommendé)\n"
 
-#: help.c:522
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -3993,7 +4291,7 @@ msgstr ""
 "  PGPORT\n"
 "    identique au paramètre de connexion port\n"
 
-#: help.c:524
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -4001,7 +4299,7 @@ msgstr ""
 "  PGUSER\n"
 "    identique au paramètre de connexion user\n"
 
-#: help.c:526
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -4009,7 +4307,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    éditeur utilisé par les commandes \\e, \\ef et \\ev\n"
 
-#: help.c:528
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -4017,7 +4315,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    comment spécifier un numéro de ligne lors de l'appel de l'éditeur\n"
 
-#: help.c:530
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -4025,7 +4323,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    autre emplacement pour le fichier d'historique des commandes\n"
 
-#: help.c:532
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -4033,7 +4331,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    nom du paginateur externe\n"
 
-#: help.c:535
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -4041,7 +4339,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    nom du paginateur externe utilisé pour \\watch\n"
 
-#: help.c:538
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -4049,7 +4347,7 @@ msgstr ""
 "  PSQLRC\n"
 "    autre emplacement pour le fichier .psqlrc de l'utilisateur\n"
 
-#: help.c:540
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -4057,7 +4355,7 @@ msgstr ""
 "  SHELL\n"
 "    shell utilisé par la commande \\!\n"
 
-#: help.c:542
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -4065,11 +4363,11 @@ msgstr ""
 "  TMPDIR\n"
 "    répertoire pour les fichiers temporaires\n"
 
-#: help.c:602
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Aide-mémoire disponible :\n"
 
-#: help.c:697
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -4088,7 +4386,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:720
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4195,12 +4493,12 @@ msgstr "requête ignorée ; utilisez \\endif ou Ctrl-C pour quitter le bloc \\if
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "a atteint EOF sans trouver le(s) \\endif fermant"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "chaîne entre guillemets non terminée"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s : mémoire épuisée"
@@ -4208,2467 +4506,2487 @@ msgstr "%s : mémoire épuisée"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:245
-#: sql_help.c:247 sql_help.c:248 sql_help.c:250 sql_help.c:252 sql_help.c:255
-#: sql_help.c:257 sql_help.c:259 sql_help.c:261 sql_help.c:276 sql_help.c:277
-#: sql_help.c:278 sql_help.c:280 sql_help.c:329 sql_help.c:331 sql_help.c:333
-#: sql_help.c:335 sql_help.c:404 sql_help.c:409 sql_help.c:411 sql_help.c:453
-#: sql_help.c:455 sql_help.c:458 sql_help.c:460 sql_help.c:529 sql_help.c:534
-#: sql_help.c:539 sql_help.c:544 sql_help.c:549 sql_help.c:603 sql_help.c:605
-#: sql_help.c:607 sql_help.c:609 sql_help.c:611 sql_help.c:614 sql_help.c:616
-#: sql_help.c:619 sql_help.c:630 sql_help.c:632 sql_help.c:676 sql_help.c:678
-#: sql_help.c:680 sql_help.c:683 sql_help.c:685 sql_help.c:687 sql_help.c:728
-#: sql_help.c:732 sql_help.c:736 sql_help.c:757 sql_help.c:760 sql_help.c:763
-#: sql_help.c:792 sql_help.c:804 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:833 sql_help.c:836 sql_help.c:865 sql_help.c:870 sql_help.c:875
-#: sql_help.c:880 sql_help.c:885 sql_help.c:912 sql_help.c:914 sql_help.c:916
-#: sql_help.c:918 sql_help.c:921 sql_help.c:923 sql_help.c:970 sql_help.c:1015
-#: sql_help.c:1020 sql_help.c:1025 sql_help.c:1030 sql_help.c:1035
-#: sql_help.c:1054 sql_help.c:1065 sql_help.c:1067 sql_help.c:1087
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1118 sql_help.c:1120 sql_help.c:1132
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1138 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1163 sql_help.c:1167 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1175 sql_help.c:1176 sql_help.c:1179
-#: sql_help.c:1182 sql_help.c:1184 sql_help.c:1324 sql_help.c:1326
-#: sql_help.c:1329 sql_help.c:1332 sql_help.c:1334 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1464 sql_help.c:1466
-#: sql_help.c:1468 sql_help.c:1471 sql_help.c:1492 sql_help.c:1495
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1505 sql_help.c:1507
-#: sql_help.c:1509 sql_help.c:1511 sql_help.c:1525 sql_help.c:1528
-#: sql_help.c:1530 sql_help.c:1532 sql_help.c:1542 sql_help.c:1544
-#: sql_help.c:1554 sql_help.c:1556 sql_help.c:1566 sql_help.c:1569
-#: sql_help.c:1592 sql_help.c:1594 sql_help.c:1596 sql_help.c:1598
-#: sql_help.c:1601 sql_help.c:1603 sql_help.c:1606 sql_help.c:1609
-#: sql_help.c:1660 sql_help.c:1703 sql_help.c:1706 sql_help.c:1708
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:1715 sql_help.c:1717
-#: sql_help.c:1720 sql_help.c:1770 sql_help.c:1786 sql_help.c:2019
-#: sql_help.c:2088 sql_help.c:2107 sql_help.c:2120 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2196 sql_help.c:2224 sql_help.c:2257
-#: sql_help.c:2275 sql_help.c:2303 sql_help.c:2414 sql_help.c:2460
-#: sql_help.c:2485 sql_help.c:2508 sql_help.c:2512 sql_help.c:2546
-#: sql_help.c:2566 sql_help.c:2588 sql_help.c:2602 sql_help.c:2623
-#: sql_help.c:2652 sql_help.c:2685 sql_help.c:2708 sql_help.c:2755
-#: sql_help.c:3053 sql_help.c:3066 sql_help.c:3083 sql_help.c:3099
-#: sql_help.c:3139 sql_help.c:3193 sql_help.c:3197 sql_help.c:3199
-#: sql_help.c:3206 sql_help.c:3225 sql_help.c:3252 sql_help.c:3287
-#: sql_help.c:3299 sql_help.c:3308 sql_help.c:3352 sql_help.c:3366
-#: sql_help.c:3394 sql_help.c:3402 sql_help.c:3414 sql_help.c:3424
-#: sql_help.c:3432 sql_help.c:3440 sql_help.c:3448 sql_help.c:3456
-#: sql_help.c:3465 sql_help.c:3476 sql_help.c:3484 sql_help.c:3492
-#: sql_help.c:3500 sql_help.c:3508 sql_help.c:3518 sql_help.c:3527
-#: sql_help.c:3536 sql_help.c:3544 sql_help.c:3554 sql_help.c:3565
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3593 sql_help.c:3602
-#: sql_help.c:3610 sql_help.c:3618 sql_help.c:3626 sql_help.c:3634
-#: sql_help.c:3642 sql_help.c:3650 sql_help.c:3658 sql_help.c:3666
-#: sql_help.c:3674 sql_help.c:3682 sql_help.c:3699 sql_help.c:3708
-#: sql_help.c:3716 sql_help.c:3733 sql_help.c:3748 sql_help.c:4061
-#: sql_help.c:4182 sql_help.c:4211 sql_help.c:4227 sql_help.c:4229
-#: sql_help.c:4733 sql_help.c:4781 sql_help.c:4940
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "nom"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:340 sql_help.c:1863
-#: sql_help.c:3367 sql_help.c:4500
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "signature_agrégat"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:260
-#: sql_help.c:281 sql_help.c:412 sql_help.c:459 sql_help.c:538 sql_help.c:586
-#: sql_help.c:604 sql_help.c:631 sql_help.c:684 sql_help.c:759 sql_help.c:814
-#: sql_help.c:835 sql_help.c:874 sql_help.c:924 sql_help.c:971 sql_help.c:1024
-#: sql_help.c:1056 sql_help.c:1066 sql_help.c:1101 sql_help.c:1121
-#: sql_help.c:1135 sql_help.c:1185 sql_help.c:1333 sql_help.c:1465
-#: sql_help.c:1508 sql_help.c:1529 sql_help.c:1543 sql_help.c:1555
-#: sql_help.c:1568 sql_help.c:1595 sql_help.c:1661 sql_help.c:1714
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "nouveau_nom"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:258
-#: sql_help.c:279 sql_help.c:410 sql_help.c:495 sql_help.c:543 sql_help.c:633
-#: sql_help.c:642 sql_help.c:707 sql_help.c:731 sql_help.c:762 sql_help.c:817
-#: sql_help.c:879 sql_help.c:922 sql_help.c:1029 sql_help.c:1068
-#: sql_help.c:1099 sql_help.c:1119 sql_help.c:1133 sql_help.c:1183
-#: sql_help.c:1399 sql_help.c:1467 sql_help.c:1510 sql_help.c:1531
-#: sql_help.c:1593 sql_help.c:1709 sql_help.c:3039
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "nouveau_propriétaire"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:262 sql_help.c:332
-#: sql_help.c:461 sql_help.c:548 sql_help.c:686 sql_help.c:735 sql_help.c:765
-#: sql_help.c:820 sql_help.c:884 sql_help.c:1034 sql_help.c:1103
-#: sql_help.c:1137 sql_help.c:1335 sql_help.c:1512 sql_help.c:1533
-#: sql_help.c:1545 sql_help.c:1557 sql_help.c:1597 sql_help.c:1716
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "nouveau_schéma"
 
-#: sql_help.c:44 sql_help.c:1927 sql_help.c:3368 sql_help.c:4529
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "où signature_agrégat est :"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:350 sql_help.c:363
-#: sql_help.c:367 sql_help.c:383 sql_help.c:386 sql_help.c:389 sql_help.c:530
-#: sql_help.c:535 sql_help.c:540 sql_help.c:545 sql_help.c:550 sql_help.c:866
-#: sql_help.c:871 sql_help.c:876 sql_help.c:881 sql_help.c:886 sql_help.c:1016
-#: sql_help.c:1021 sql_help.c:1026 sql_help.c:1031 sql_help.c:1036
-#: sql_help.c:1881 sql_help.c:1898 sql_help.c:1904 sql_help.c:1928
-#: sql_help.c:1931 sql_help.c:1934 sql_help.c:2089 sql_help.c:2108
-#: sql_help.c:2111 sql_help.c:2415 sql_help.c:2624 sql_help.c:3369
-#: sql_help.c:3372 sql_help.c:3375 sql_help.c:3466 sql_help.c:3555
-#: sql_help.c:3583 sql_help.c:3936 sql_help.c:4399 sql_help.c:4506
-#: sql_help.c:4513 sql_help.c:4519 sql_help.c:4530 sql_help.c:4533
-#: sql_help.c:4536
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "mode_argument"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:351 sql_help.c:364
-#: sql_help.c:368 sql_help.c:384 sql_help.c:387 sql_help.c:390 sql_help.c:531
-#: sql_help.c:536 sql_help.c:541 sql_help.c:546 sql_help.c:551 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:882 sql_help.c:887 sql_help.c:1017
-#: sql_help.c:1022 sql_help.c:1027 sql_help.c:1032 sql_help.c:1037
-#: sql_help.c:1882 sql_help.c:1899 sql_help.c:1905 sql_help.c:1929
-#: sql_help.c:1932 sql_help.c:1935 sql_help.c:2090 sql_help.c:2109
-#: sql_help.c:2112 sql_help.c:2416 sql_help.c:2625 sql_help.c:3370
-#: sql_help.c:3373 sql_help.c:3376 sql_help.c:3467 sql_help.c:3556
-#: sql_help.c:3584 sql_help.c:4507 sql_help.c:4514 sql_help.c:4520
-#: sql_help.c:4531 sql_help.c:4534 sql_help.c:4537
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "nom_agrégat"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:352 sql_help.c:365
-#: sql_help.c:369 sql_help.c:385 sql_help.c:388 sql_help.c:391 sql_help.c:532
-#: sql_help.c:537 sql_help.c:542 sql_help.c:547 sql_help.c:552 sql_help.c:868
-#: sql_help.c:873 sql_help.c:878 sql_help.c:883 sql_help.c:888 sql_help.c:1018
-#: sql_help.c:1023 sql_help.c:1028 sql_help.c:1033 sql_help.c:1038
-#: sql_help.c:1883 sql_help.c:1900 sql_help.c:1906 sql_help.c:1930
-#: sql_help.c:1933 sql_help.c:1936 sql_help.c:2417 sql_help.c:2626
-#: sql_help.c:3371 sql_help.c:3374 sql_help.c:3377 sql_help.c:3468
-#: sql_help.c:3557 sql_help.c:3585 sql_help.c:4508 sql_help.c:4515
-#: sql_help.c:4521 sql_help.c:4532 sql_help.c:4535 sql_help.c:4538
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "type_argument"
 
-#: sql_help.c:114 sql_help.c:407 sql_help.c:484 sql_help.c:496 sql_help.c:965
-#: sql_help.c:1116 sql_help.c:1526 sql_help.c:1655 sql_help.c:1687
-#: sql_help.c:1739 sql_help.c:1798 sql_help.c:1987 sql_help.c:1994
-#: sql_help.c:2306 sql_help.c:2356 sql_help.c:2363 sql_help.c:2372
-#: sql_help.c:2461 sql_help.c:2686 sql_help.c:2777 sql_help.c:3068
-#: sql_help.c:3253 sql_help.c:3275 sql_help.c:3415 sql_help.c:3772
-#: sql_help.c:3980 sql_help.c:4226 sql_help.c:4228 sql_help.c:5006
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "option"
 
-#: sql_help.c:115 sql_help.c:966 sql_help.c:1656 sql_help.c:2462
-#: sql_help.c:2687 sql_help.c:3254 sql_help.c:3416
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "où option peut être :"
 
-#: sql_help.c:116 sql_help.c:2238
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:117 sql_help.c:967 sql_help.c:1657 sql_help.c:2239
-#: sql_help.c:2463 sql_help.c:2688 sql_help.c:3255
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "limite_de_connexion"
 
-#: sql_help.c:118 sql_help.c:2240
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "istemplate"
 
-#: sql_help.c:124 sql_help.c:621 sql_help.c:689 sql_help.c:703 sql_help.c:1338
-#: sql_help.c:1392 sql_help.c:4232
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "nouveau_tablespace"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:558 sql_help.c:560
-#: sql_help.c:561 sql_help.c:891 sql_help.c:893 sql_help.c:894 sql_help.c:974
-#: sql_help.c:978 sql_help.c:981 sql_help.c:1043 sql_help.c:1045
-#: sql_help.c:1046 sql_help.c:1196 sql_help.c:1198 sql_help.c:1664
-#: sql_help.c:1668 sql_help.c:1671 sql_help.c:2427 sql_help.c:2630
-#: sql_help.c:3948 sql_help.c:4250 sql_help.c:4411 sql_help.c:4721
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "paramètre_configuration"
 
-#: sql_help.c:128 sql_help.c:408 sql_help.c:479 sql_help.c:485 sql_help.c:497
-#: sql_help.c:559 sql_help.c:613 sql_help.c:695 sql_help.c:705 sql_help.c:892
-#: sql_help.c:920 sql_help.c:975 sql_help.c:1044 sql_help.c:1117
-#: sql_help.c:1162 sql_help.c:1166 sql_help.c:1170 sql_help.c:1173
-#: sql_help.c:1178 sql_help.c:1181 sql_help.c:1197 sql_help.c:1371
-#: sql_help.c:1394 sql_help.c:1442 sql_help.c:1450 sql_help.c:1470
-#: sql_help.c:1527 sql_help.c:1611 sql_help.c:1665 sql_help.c:1688
-#: sql_help.c:2307 sql_help.c:2357 sql_help.c:2364 sql_help.c:2373
-#: sql_help.c:2428 sql_help.c:2429 sql_help.c:2493 sql_help.c:2496
-#: sql_help.c:2530 sql_help.c:2631 sql_help.c:2632 sql_help.c:2655
-#: sql_help.c:2778 sql_help.c:2817 sql_help.c:2927 sql_help.c:2940
-#: sql_help.c:2954 sql_help.c:2995 sql_help.c:3003 sql_help.c:3025
-#: sql_help.c:3042 sql_help.c:3069 sql_help.c:3276 sql_help.c:3981
-#: sql_help.c:4722 sql_help.c:4723 sql_help.c:4724 sql_help.c:4725
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "valeur"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "rôle_cible"
 
-#: sql_help.c:203 sql_help.c:929 sql_help.c:2291 sql_help.c:2660
-#: sql_help.c:2733 sql_help.c:2738 sql_help.c:3911 sql_help.c:3920
-#: sql_help.c:3939 sql_help.c:3951 sql_help.c:4374 sql_help.c:4383
-#: sql_help.c:4402 sql_help.c:4414
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "nom_schéma"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "grant_ou_revoke_raccourci"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "où abbreviated_grant_or_revoke fait partie de :"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:584 sql_help.c:620 sql_help.c:688 sql_help.c:838 sql_help.c:985
-#: sql_help.c:1337 sql_help.c:1675 sql_help.c:2466 sql_help.c:2467
-#: sql_help.c:2468 sql_help.c:2469 sql_help.c:2470 sql_help.c:2604
-#: sql_help.c:2691 sql_help.c:2692 sql_help.c:2693 sql_help.c:3258
-#: sql_help.c:3259 sql_help.c:3260 sql_help.c:3261 sql_help.c:3262
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:4423 sql_help.c:4427
-#: sql_help.c:4743
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "nom_rôle"
 
-#: sql_help.c:246 sql_help.c:265 sql_help.c:472 sql_help.c:928 sql_help.c:1353
-#: sql_help.c:1355 sql_help.c:1359 sql_help.c:1409 sql_help.c:1421
-#: sql_help.c:1446 sql_help.c:1705 sql_help.c:2260 sql_help.c:2264
-#: sql_help.c:2376 sql_help.c:2381 sql_help.c:2489 sql_help.c:2659
-#: sql_help.c:2794 sql_help.c:2799 sql_help.c:2801 sql_help.c:2922
-#: sql_help.c:2935 sql_help.c:2949 sql_help.c:2958 sql_help.c:2970
-#: sql_help.c:2999 sql_help.c:4012 sql_help.c:4027 sql_help.c:4029
-#: sql_help.c:4125 sql_help.c:4128 sql_help.c:4130 sql_help.c:4593
-#: sql_help.c:4594 sql_help.c:4603 sql_help.c:4650 sql_help.c:4651
-#: sql_help.c:4652 sql_help.c:4653 sql_help.c:4654 sql_help.c:4655
-#: sql_help.c:4696 sql_help.c:4697 sql_help.c:4702 sql_help.c:4707
-#: sql_help.c:4851 sql_help.c:4852 sql_help.c:4861 sql_help.c:4908
-#: sql_help.c:4909 sql_help.c:4910 sql_help.c:4911 sql_help.c:4912
-#: sql_help.c:4913 sql_help.c:4968 sql_help.c:4970 sql_help.c:5036
-#: sql_help.c:5096 sql_help.c:5097 sql_help.c:5106 sql_help.c:5153
-#: sql_help.c:5154 sql_help.c:5155 sql_help.c:5156 sql_help.c:5157
-#: sql_help.c:5158
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "expression"
 
-#: sql_help.c:249 sql_help.c:2261
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "contrainte_domaine"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:256 sql_help.c:264 sql_help.c:487
-#: sql_help.c:488 sql_help.c:1330 sql_help.c:1379 sql_help.c:1380
-#: sql_help.c:1381 sql_help.c:1408 sql_help.c:1420 sql_help.c:1437
-#: sql_help.c:1869 sql_help.c:1871 sql_help.c:2263 sql_help.c:2375
-#: sql_help.c:2380 sql_help.c:2957 sql_help.c:2969 sql_help.c:4024
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "nom_contrainte"
 
-#: sql_help.c:254 sql_help.c:1331
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "nouvelle_nom_contrainte"
 
-#: sql_help.c:263 sql_help.c:2262
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "où contrainte_domaine est :"
 
-#: sql_help.c:330 sql_help.c:1115
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "nouvelle_version"
 
-#: sql_help.c:334 sql_help.c:336
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "objet_membre"
 
-#: sql_help.c:337
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "où objet_membre fait partie de :"
 
-#: sql_help.c:338 sql_help.c:343 sql_help.c:344 sql_help.c:345 sql_help.c:346
-#: sql_help.c:347 sql_help.c:348 sql_help.c:353 sql_help.c:357 sql_help.c:359
-#: sql_help.c:361 sql_help.c:370 sql_help.c:371 sql_help.c:372 sql_help.c:373
-#: sql_help.c:374 sql_help.c:375 sql_help.c:376 sql_help.c:377 sql_help.c:380
-#: sql_help.c:381 sql_help.c:1861 sql_help.c:1866 sql_help.c:1873
-#: sql_help.c:1874 sql_help.c:1875 sql_help.c:1876 sql_help.c:1877
-#: sql_help.c:1878 sql_help.c:1879 sql_help.c:1884 sql_help.c:1886
-#: sql_help.c:1890 sql_help.c:1892 sql_help.c:1896 sql_help.c:1901
-#: sql_help.c:1902 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1912 sql_help.c:1913 sql_help.c:1914 sql_help.c:1915
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:1918 sql_help.c:1919
-#: sql_help.c:1924 sql_help.c:1925 sql_help.c:4496 sql_help.c:4501
-#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4516 sql_help.c:4517 sql_help.c:4522
-#: sql_help.c:4523 sql_help.c:4524 sql_help.c:4525 sql_help.c:4526
-#: sql_help.c:4527
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "nom_objet"
 
-#: sql_help.c:339 sql_help.c:1862 sql_help.c:4499
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "nom_agrégat"
 
-#: sql_help.c:341 sql_help.c:1864 sql_help.c:2154 sql_help.c:2158
-#: sql_help.c:2160 sql_help.c:3385
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "type_source"
 
-#: sql_help.c:342 sql_help.c:1865 sql_help.c:2155 sql_help.c:2159
-#: sql_help.c:2161 sql_help.c:3386
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "type_cible"
 
-#: sql_help.c:349 sql_help.c:802 sql_help.c:1880 sql_help.c:2156
-#: sql_help.c:2199 sql_help.c:2279 sql_help.c:2547 sql_help.c:2578
-#: sql_help.c:3145 sql_help.c:4398 sql_help.c:4505 sql_help.c:4622
-#: sql_help.c:4626 sql_help.c:4630 sql_help.c:4633 sql_help.c:4880
-#: sql_help.c:4884 sql_help.c:4888 sql_help.c:4891 sql_help.c:5125
-#: sql_help.c:5129 sql_help.c:5133 sql_help.c:5136
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "nom_fonction"
 
-#: sql_help.c:354 sql_help.c:795 sql_help.c:1887 sql_help.c:2571
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "nom_opérateur"
 
-#: sql_help.c:355 sql_help.c:729 sql_help.c:733 sql_help.c:737 sql_help.c:1888
-#: sql_help.c:2548 sql_help.c:3509
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "type_argument_gauche"
 
-#: sql_help.c:356 sql_help.c:730 sql_help.c:734 sql_help.c:738 sql_help.c:1889
-#: sql_help.c:2549 sql_help.c:3510
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "type_argument_droit"
 
-#: sql_help.c:358 sql_help.c:360 sql_help.c:758 sql_help.c:761 sql_help.c:764
-#: sql_help.c:793 sql_help.c:805 sql_help.c:813 sql_help.c:816 sql_help.c:819
-#: sql_help.c:1426 sql_help.c:1891 sql_help.c:1893 sql_help.c:2568
-#: sql_help.c:2589 sql_help.c:2975 sql_help.c:3519 sql_help.c:3528
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "méthode_indexage"
 
-#: sql_help.c:362 sql_help.c:1897 sql_help.c:4512
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "nom_procédure"
 
-#: sql_help.c:366 sql_help.c:1903 sql_help.c:3935 sql_help.c:4518
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "nom_routine"
 
-#: sql_help.c:378 sql_help.c:1398 sql_help.c:1920 sql_help.c:2423
-#: sql_help.c:2629 sql_help.c:2930 sql_help.c:3112 sql_help.c:3690
-#: sql_help.c:3957 sql_help.c:4420
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "nom_type"
 
-#: sql_help.c:379 sql_help.c:1921 sql_help.c:2422 sql_help.c:2628
-#: sql_help.c:3113 sql_help.c:3343 sql_help.c:3691 sql_help.c:3942
-#: sql_help.c:4405
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "nom_langage"
 
-#: sql_help.c:382
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "et signature_agrégat est :"
 
-#: sql_help.c:405 sql_help.c:2021 sql_help.c:2304
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "fonction_gestionnaire"
 
-#: sql_help.c:406 sql_help.c:2305
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "fonction_validateur"
 
-#: sql_help.c:454 sql_help.c:533 sql_help.c:677 sql_help.c:869 sql_help.c:1019
-#: sql_help.c:1325 sql_help.c:1602
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "action"
 
-#: sql_help.c:456 sql_help.c:463 sql_help.c:467 sql_help.c:468 sql_help.c:471
-#: sql_help.c:473 sql_help.c:474 sql_help.c:475 sql_help.c:477 sql_help.c:480
-#: sql_help.c:482 sql_help.c:483 sql_help.c:681 sql_help.c:691 sql_help.c:693
-#: sql_help.c:696 sql_help.c:698 sql_help.c:699 sql_help.c:927 sql_help.c:1096
-#: sql_help.c:1327 sql_help.c:1345 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1354 sql_help.c:1356 sql_help.c:1357 sql_help.c:1358
-#: sql_help.c:1360 sql_help.c:1361 sql_help.c:1363 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1369 sql_help.c:1372 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1422 sql_help.c:1424 sql_help.c:1431
-#: sql_help.c:1440 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1704 sql_help.c:1707 sql_help.c:1711 sql_help.c:1747
-#: sql_help.c:1868 sql_help.c:1984 sql_help.c:1990 sql_help.c:2004
-#: sql_help.c:2005 sql_help.c:2006 sql_help.c:2354 sql_help.c:2367
-#: sql_help.c:2420 sql_help.c:2488 sql_help.c:2494 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2763 sql_help.c:2798 sql_help.c:2800
-#: sql_help.c:2912 sql_help.c:2921 sql_help.c:2931 sql_help.c:2934
-#: sql_help.c:2944 sql_help.c:2948 sql_help.c:2971 sql_help.c:2973
-#: sql_help.c:2980 sql_help.c:2993 sql_help.c:2998 sql_help.c:3005
-#: sql_help.c:3006 sql_help.c:3022 sql_help.c:3148 sql_help.c:3288
-#: sql_help.c:3914 sql_help.c:3915 sql_help.c:4011 sql_help.c:4026
-#: sql_help.c:4028 sql_help.c:4030 sql_help.c:4124 sql_help.c:4127
-#: sql_help.c:4129 sql_help.c:4131 sql_help.c:4377 sql_help.c:4378
-#: sql_help.c:4498 sql_help.c:4659 sql_help.c:4666 sql_help.c:4668
-#: sql_help.c:4917 sql_help.c:4924 sql_help.c:4926 sql_help.c:4967
-#: sql_help.c:4969 sql_help.c:4971 sql_help.c:5024 sql_help.c:5162
-#: sql_help.c:5169 sql_help.c:5171
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "nom_colonne"
 
-#: sql_help.c:457 sql_help.c:682 sql_help.c:1328 sql_help.c:1712
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "nouvelle_nom_colonne"
 
-#: sql_help.c:462 sql_help.c:554 sql_help.c:690 sql_help.c:890 sql_help.c:1040
-#: sql_help.c:1344 sql_help.c:1612
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "où action fait partie de :"
 
-#: sql_help.c:464 sql_help.c:469 sql_help.c:1088 sql_help.c:1346
-#: sql_help.c:1351 sql_help.c:1614 sql_help.c:1618 sql_help.c:2258
-#: sql_help.c:2355 sql_help.c:2567 sql_help.c:2756 sql_help.c:2913
-#: sql_help.c:3195 sql_help.c:4183
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "type_données"
 
-#: sql_help.c:465 sql_help.c:470 sql_help.c:1347 sql_help.c:1352
-#: sql_help.c:1447 sql_help.c:1615 sql_help.c:1619 sql_help.c:2259
-#: sql_help.c:2358 sql_help.c:2490 sql_help.c:2915 sql_help.c:2923
-#: sql_help.c:2936 sql_help.c:2950 sql_help.c:3000 sql_help.c:3196
-#: sql_help.c:3202 sql_help.c:4021
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "collationnement"
 
-#: sql_help.c:466 sql_help.c:1348 sql_help.c:2359 sql_help.c:2368
-#: sql_help.c:2916 sql_help.c:2932 sql_help.c:2945
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "contrainte_colonne"
 
-#: sql_help.c:476 sql_help.c:618 sql_help.c:692 sql_help.c:1368 sql_help.c:5018
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "entier"
 
-#: sql_help.c:478 sql_help.c:481 sql_help.c:694 sql_help.c:697 sql_help.c:1370
-#: sql_help.c:1373
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "option_attribut"
 
-#: sql_help.c:486 sql_help.c:1377 sql_help.c:2360 sql_help.c:2369
-#: sql_help.c:2917 sql_help.c:2933 sql_help.c:2946
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "contrainte_table"
 
-#: sql_help.c:489 sql_help.c:490 sql_help.c:491 sql_help.c:492 sql_help.c:1382
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:1922
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "nom_trigger"
 
-#: sql_help.c:493 sql_help.c:494 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:2361 sql_help.c:2366 sql_help.c:2920 sql_help.c:2943
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "table_parent"
 
-#: sql_help.c:553 sql_help.c:610 sql_help.c:679 sql_help.c:889 sql_help.c:1039
-#: sql_help.c:1571 sql_help.c:2290
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "nom_extension"
 
-#: sql_help.c:555 sql_help.c:1041 sql_help.c:2424
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "coût_exécution"
 
-#: sql_help.c:556 sql_help.c:1042 sql_help.c:2425
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "lignes_de_résultat"
 
-#: sql_help.c:557 sql_help.c:2426
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "fonction_support"
 
-#: sql_help.c:579 sql_help.c:581 sql_help.c:964 sql_help.c:972 sql_help.c:976
-#: sql_help.c:979 sql_help.c:982 sql_help.c:1654 sql_help.c:1662
-#: sql_help.c:1666 sql_help.c:1669 sql_help.c:1672 sql_help.c:2734
-#: sql_help.c:2736 sql_help.c:2739 sql_help.c:2740 sql_help.c:3912
-#: sql_help.c:3913 sql_help.c:3917 sql_help.c:3918 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3924 sql_help.c:3925 sql_help.c:3927
-#: sql_help.c:3928 sql_help.c:3930 sql_help.c:3931 sql_help.c:3933
-#: sql_help.c:3934 sql_help.c:3940 sql_help.c:3941 sql_help.c:3943
-#: sql_help.c:3944 sql_help.c:3946 sql_help.c:3947 sql_help.c:3949
-#: sql_help.c:3950 sql_help.c:3952 sql_help.c:3953 sql_help.c:3955
-#: sql_help.c:3956 sql_help.c:3958 sql_help.c:3959 sql_help.c:3961
-#: sql_help.c:3962 sql_help.c:4375 sql_help.c:4376 sql_help.c:4380
-#: sql_help.c:4381 sql_help.c:4384 sql_help.c:4385 sql_help.c:4387
-#: sql_help.c:4388 sql_help.c:4390 sql_help.c:4391 sql_help.c:4393
-#: sql_help.c:4394 sql_help.c:4396 sql_help.c:4397 sql_help.c:4403
-#: sql_help.c:4404 sql_help.c:4406 sql_help.c:4407 sql_help.c:4409
-#: sql_help.c:4410 sql_help.c:4412 sql_help.c:4413 sql_help.c:4415
-#: sql_help.c:4416 sql_help.c:4418 sql_help.c:4419 sql_help.c:4421
-#: sql_help.c:4422 sql_help.c:4424 sql_help.c:4425
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "specification_role"
 
-#: sql_help.c:580 sql_help.c:582 sql_help.c:1685 sql_help.c:2225
-#: sql_help.c:2742 sql_help.c:3273 sql_help.c:3724 sql_help.c:4753
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "nom_utilisateur"
 
-#: sql_help.c:583 sql_help.c:984 sql_help.c:1674 sql_help.c:2741
-#: sql_help.c:3963 sql_help.c:4426
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "où specification_role peut être :"
 
-#: sql_help.c:585
+#: sql_help.c:599
 msgid "group_name"
 msgstr "nom_groupe"
 
-#: sql_help.c:606 sql_help.c:1443 sql_help.c:2237 sql_help.c:2497
-#: sql_help.c:2531 sql_help.c:2928 sql_help.c:2941 sql_help.c:2955
-#: sql_help.c:2996 sql_help.c:3026 sql_help.c:3038 sql_help.c:3954
-#: sql_help.c:4417
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "nom_tablespace"
 
-#: sql_help.c:608 sql_help.c:701 sql_help.c:1390 sql_help.c:1400
-#: sql_help.c:1438 sql_help.c:1800
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "nom_index"
 
-#: sql_help.c:612 sql_help.c:615 sql_help.c:704 sql_help.c:706 sql_help.c:1393
-#: sql_help.c:1395 sql_help.c:1441 sql_help.c:2495 sql_help.c:2529
-#: sql_help.c:2926 sql_help.c:2939 sql_help.c:2953 sql_help.c:2994
-#: sql_help.c:3024
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "paramètre_stockage"
 
-#: sql_help.c:617
+#: sql_help.c:631
 msgid "column_number"
 msgstr "numéro_colonne"
 
-#: sql_help.c:641 sql_help.c:1885 sql_help.c:4509
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "oid_large_object"
 
-#: sql_help.c:700 sql_help.c:1376 sql_help.c:2914
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "méthode_compression"
 
-#: sql_help.c:702 sql_help.c:1391
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "new_access_method"
 
-#: sql_help.c:739 sql_help.c:2552
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "res_proc"
 
-#: sql_help.c:740 sql_help.c:2553
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "join_proc"
 
-#: sql_help.c:741 sql_help.c:2550
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:742 sql_help.c:2551
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:794 sql_help.c:806 sql_help.c:2570
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "numéro_de_stratégie"
 
-#: sql_help.c:796 sql_help.c:797 sql_help.c:800 sql_help.c:801 sql_help.c:807
-#: sql_help.c:808 sql_help.c:810 sql_help.c:811 sql_help.c:2572 sql_help.c:2573
-#: sql_help.c:2576 sql_help.c:2577
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "type_op"
 
-#: sql_help.c:798 sql_help.c:2574
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "nom_famille_tri"
 
-#: sql_help.c:799 sql_help.c:809 sql_help.c:2575
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "numéro_de_support"
 
-#: sql_help.c:803 sql_help.c:2157 sql_help.c:2579 sql_help.c:3115
-#: sql_help.c:3117
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "type_argument"
 
-#: sql_help.c:834 sql_help.c:837 sql_help.c:926 sql_help.c:1055 sql_help.c:1095
-#: sql_help.c:1567 sql_help.c:1570 sql_help.c:1746 sql_help.c:1799
-#: sql_help.c:1870 sql_help.c:1895 sql_help.c:1908 sql_help.c:1923
-#: sql_help.c:1983 sql_help.c:1989 sql_help.c:2353 sql_help.c:2365
-#: sql_help.c:2486 sql_help.c:2526 sql_help.c:2603 sql_help.c:2657
-#: sql_help.c:2710 sql_help.c:2762 sql_help.c:2795 sql_help.c:2802
-#: sql_help.c:2911 sql_help.c:2929 sql_help.c:2942 sql_help.c:3021
-#: sql_help.c:3141 sql_help.c:3322 sql_help.c:3545 sql_help.c:3594
-#: sql_help.c:3700 sql_help.c:3910 sql_help.c:3916 sql_help.c:3977
-#: sql_help.c:4009 sql_help.c:4373 sql_help.c:4379 sql_help.c:4497
-#: sql_help.c:4610 sql_help.c:4673 sql_help.c:4712 sql_help.c:4868
-#: sql_help.c:4931 sql_help.c:4965 sql_help.c:5023 sql_help.c:5113
-#: sql_help.c:5176
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "nom_table"
 
-#: sql_help.c:839 sql_help.c:2605
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "expression_using"
 
-#: sql_help.c:840 sql_help.c:2606
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "expression_check"
 
-#: sql_help.c:913 sql_help.c:915 sql_help.c:917 sql_help.c:2653
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "objet_publication"
 
-#: sql_help.c:919 sql_help.c:2654
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "objet_supprime_publication"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "paramètre_publication"
 
-#: sql_help.c:925 sql_help.c:2656
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "où publication_object fait partie de :"
 
-#: sql_help.c:968 sql_help.c:1658 sql_help.c:2464 sql_help.c:2689
-#: sql_help.c:3256
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "table_et_colonnes"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "où objet_supprime_publication fait partie de :"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "et table_et_colonnes est :"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "mot_de_passe"
 
-#: sql_help.c:969 sql_help.c:1659 sql_help.c:2465 sql_help.c:2690
-#: sql_help.c:3257
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "horodatage"
 
-#: sql_help.c:973 sql_help.c:977 sql_help.c:980 sql_help.c:983 sql_help.c:1663
-#: sql_help.c:1667 sql_help.c:1670 sql_help.c:1673 sql_help.c:3923
-#: sql_help.c:4386
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "nom_base_de_donnée"
 
-#: sql_help.c:1089 sql_help.c:2757
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "incrément"
 
-#: sql_help.c:1090 sql_help.c:2758
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "valeur_min"
 
-#: sql_help.c:1091 sql_help.c:2759
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "valeur_max"
 
-#: sql_help.c:1092 sql_help.c:2760 sql_help.c:4606 sql_help.c:4710
-#: sql_help.c:4864 sql_help.c:5040 sql_help.c:5109
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "début"
 
-#: sql_help.c:1093 sql_help.c:1365
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "nouveau_début"
 
-#: sql_help.c:1094 sql_help.c:2761
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:1139
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "nouvelle_cible"
 
-#: sql_help.c:1158 sql_help.c:2814
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "conninfo"
 
-#: sql_help.c:1160 sql_help.c:1164 sql_help.c:1168 sql_help.c:2815
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "nom_publication"
 
-#: sql_help.c:1161 sql_help.c:1165 sql_help.c:1169
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "option_publication"
 
-#: sql_help.c:1172
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "option_rafraichissement"
 
-#: sql_help.c:1177 sql_help.c:2816
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "paramètre_souscription"
 
-#: sql_help.c:1180
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "option_skip"
 
-#: sql_help.c:1340 sql_help.c:1343
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "nom_partition"
 
-#: sql_help.c:1341 sql_help.c:2370 sql_help.c:2947
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "spec_limite_partition"
 
-#: sql_help.c:1362 sql_help.c:1412 sql_help.c:2961
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "options_séquence"
 
-#: sql_help.c:1364
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "option_séquence"
 
-#: sql_help.c:1378
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "contrainte_table_utilisant_index"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "nom_règle_réécriture"
 
-#: sql_help.c:1401 sql_help.c:2382 sql_help.c:2986
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "et partition_bound_spec est :"
 
-#: sql_help.c:1402 sql_help.c:1403 sql_help.c:1404 sql_help.c:2383
-#: sql_help.c:2384 sql_help.c:2385 sql_help.c:2987 sql_help.c:2988
-#: sql_help.c:2989
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "expr_limite_partition"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:2386 sql_help.c:2387
-#: sql_help.c:2990 sql_help.c:2991
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "numeric_literal"
 
-#: sql_help.c:1407
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "et contrainte_colonne est :"
 
-#: sql_help.c:1410 sql_help.c:2377 sql_help.c:2418 sql_help.c:2627
-#: sql_help.c:2959
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "expression_par_défaut"
 
-#: sql_help.c:1411 sql_help.c:2378 sql_help.c:2960
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "expression_génération"
 
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1423 sql_help.c:1425
-#: sql_help.c:1429 sql_help.c:2962 sql_help.c:2963 sql_help.c:2972
-#: sql_help.c:2974 sql_help.c:2978
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "paramètres_index"
 
-#: sql_help.c:1415 sql_help.c:1432 sql_help.c:2964 sql_help.c:2981
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "table_référence"
 
-#: sql_help.c:1416 sql_help.c:1433 sql_help.c:2965 sql_help.c:2982
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "colonne_référence"
 
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1434 sql_help.c:1435
-#: sql_help.c:2966 sql_help.c:2967 sql_help.c:2983 sql_help.c:2984
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "action"
 
-#: sql_help.c:1419 sql_help.c:2379 sql_help.c:2968
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "et contrainte_table est :"
 
-#: sql_help.c:1427 sql_help.c:2976
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "élément_exclusion"
 
-#: sql_help.c:1428 sql_help.c:2977 sql_help.c:4604 sql_help.c:4708
-#: sql_help.c:4862 sql_help.c:5038 sql_help.c:5107
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "opérateur"
 
-#: sql_help.c:1430 sql_help.c:2498 sql_help.c:2979
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "prédicat"
 
-#: sql_help.c:1436
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "et contrainte_table_utilisant_index est :"
 
-#: sql_help.c:1439 sql_help.c:2992
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "dans les contraintes UNIQUE, PRIMARY KEY et EXCLUDE, les paramètres_index sont :"
 
-#: sql_help.c:1444 sql_help.c:2997
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "élément_exclusion dans une contrainte EXCLUDE est :"
 
-#: sql_help.c:1448 sql_help.c:2491 sql_help.c:2924 sql_help.c:2937
-#: sql_help.c:2951 sql_help.c:3001 sql_help.c:4022
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "classe_d_opérateur"
 
-#: sql_help.c:1449 sql_help.c:2492 sql_help.c:3002
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "paramètre_opclass"
 
-#: sql_help.c:1451 sql_help.c:3004
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "referential_action dans une contrainte FOREIGN KEY/REFERENCES est :"
 
-#: sql_help.c:1469 sql_help.c:1472 sql_help.c:3041
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "option_tablespace"
 
-#: sql_help.c:1493 sql_help.c:1496 sql_help.c:1502 sql_help.c:1506
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "type_jeton"
 
-#: sql_help.c:1494 sql_help.c:1497
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "nom_dictionnaire"
 
-#: sql_help.c:1499 sql_help.c:1503
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "ancien_dictionnaire"
 
-#: sql_help.c:1500 sql_help.c:1504
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "nouveau_dictionnaire"
 
-#: sql_help.c:1599 sql_help.c:1613 sql_help.c:1616 sql_help.c:1617
-#: sql_help.c:3194
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "nom_attribut"
 
-#: sql_help.c:1600
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "nouveau_nom_attribut"
 
-#: sql_help.c:1604 sql_help.c:1608
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "nouvelle_valeur_enum"
 
-#: sql_help.c:1605
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "valeur_enum_voisine"
 
-#: sql_help.c:1607
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "valeur_enum_existante"
 
-#: sql_help.c:1610
+#: sql_help.c:1647
 msgid "property"
 msgstr "propriété"
 
-#: sql_help.c:1686 sql_help.c:2362 sql_help.c:2371 sql_help.c:2773
-#: sql_help.c:3274 sql_help.c:3725 sql_help.c:3932 sql_help.c:3978
-#: sql_help.c:4395
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "nom_serveur"
 
-#: sql_help.c:1718 sql_help.c:1721 sql_help.c:3289
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "nom_option_vue"
 
-#: sql_help.c:1719 sql_help.c:3290
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "valeur_option_vue"
 
-#: sql_help.c:1740 sql_help.c:5007
-msgid "table_and_columns"
-msgstr "table_et_colonnes"
-
-#: sql_help.c:1741 sql_help.c:1801 sql_help.c:1995 sql_help.c:3774
-#: sql_help.c:4230 sql_help.c:5008
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "où option fait partie de :"
 
-#: sql_help.c:1742 sql_help.c:1743 sql_help.c:1802 sql_help.c:1997
-#: sql_help.c:2001 sql_help.c:2183 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:3777 sql_help.c:3778 sql_help.c:3779 sql_help.c:3780
-#: sql_help.c:3781 sql_help.c:3782 sql_help.c:3783 sql_help.c:3784
-#: sql_help.c:4231 sql_help.c:4233 sql_help.c:5009 sql_help.c:5010
-#: sql_help.c:5011 sql_help.c:5012 sql_help.c:5013 sql_help.c:5014
-#: sql_help.c:5015 sql_help.c:5016 sql_help.c:5017 sql_help.c:5019
-#: sql_help.c:5020
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1744 sql_help.c:5021
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "taille"
 
-#: sql_help.c:1745 sql_help.c:5022
-msgid "and table_and_columns is:"
-msgstr "et table_et_colonnes est :"
-
-#: sql_help.c:1761 sql_help.c:4769 sql_help.c:4771 sql_help.c:4795
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "mode_transaction"
 
-#: sql_help.c:1762 sql_help.c:4772 sql_help.c:4796
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "où mode_transaction fait partie de :"
 
-#: sql_help.c:1771 sql_help.c:4614 sql_help.c:4623 sql_help.c:4627
-#: sql_help.c:4631 sql_help.c:4634 sql_help.c:4872 sql_help.c:4881
-#: sql_help.c:4885 sql_help.c:4889 sql_help.c:4892 sql_help.c:5117
-#: sql_help.c:5126 sql_help.c:5130 sql_help.c:5134 sql_help.c:5137
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "argument"
 
-#: sql_help.c:1867
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "nom_relation"
 
-#: sql_help.c:1872 sql_help.c:3926 sql_help.c:4389
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "nom_domaine"
 
-#: sql_help.c:1894
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "nom_politique"
 
-#: sql_help.c:1907
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "nom_règle"
 
-#: sql_help.c:1926 sql_help.c:4528
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "littéral_chaîne"
 
-#: sql_help.c:1951 sql_help.c:4192 sql_help.c:4442
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "id_transaction"
 
-#: sql_help.c:1985 sql_help.c:1992 sql_help.c:4048
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "nom_fichier"
 
-#: sql_help.c:1986 sql_help.c:1993 sql_help.c:2712 sql_help.c:2713
-#: sql_help.c:2714
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "commande"
 
-#: sql_help.c:1988 sql_help.c:2711 sql_help.c:3144 sql_help.c:3325
-#: sql_help.c:4032 sql_help.c:4115 sql_help.c:4118 sql_help.c:4121
-#: sql_help.c:4597 sql_help.c:4599 sql_help.c:4701 sql_help.c:4703
-#: sql_help.c:4855 sql_help.c:4857 sql_help.c:4974 sql_help.c:5100
-#: sql_help.c:5102
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "condition"
 
-#: sql_help.c:1991 sql_help.c:2532 sql_help.c:3027 sql_help.c:3291
-#: sql_help.c:3309 sql_help.c:4013
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "requête"
 
-#: sql_help.c:1996
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "nom_format"
 
-#: sql_help.c:1998
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "caractère_délimiteur"
 
-#: sql_help.c:1999
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "chaîne_null"
 
-#: sql_help.c:2000
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "chaîne_par_défaut"
 
-#: sql_help.c:2002
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "caractère_guillemet"
 
-#: sql_help.c:2003
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "chaîne_d_échappement"
 
-#: sql_help.c:2007
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "action_erreur"
 
-#: sql_help.c:2008
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "maxerror"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "nom_encodage"
 
-#: sql_help.c:2009
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "verbosité"
 
-#: sql_help.c:2020
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "access_method_type"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2113
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "type_données_arg"
 
-#: sql_help.c:2092 sql_help.c:2114 sql_help.c:2122
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "sfunc"
 
-#: sql_help.c:2093 sql_help.c:2115 sql_help.c:2123
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "type_de_données_statut"
 
-#: sql_help.c:2094 sql_help.c:2116 sql_help.c:2124
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "taille_de_données_statut"
 
-#: sql_help.c:2095 sql_help.c:2117 sql_help.c:2125
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "ffunc"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "combinefunc"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "serialfunc"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "deserialfunc"
 
-#: sql_help.c:2099 sql_help.c:2118 sql_help.c:2129
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "condition_initiale"
 
-#: sql_help.c:2100 sql_help.c:2130
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "msfunc"
 
-#: sql_help.c:2101 sql_help.c:2131
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "minvfunc"
 
-#: sql_help.c:2102 sql_help.c:2132
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "m_type_de_données_statut"
 
-#: sql_help.c:2103 sql_help.c:2133
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "m_taille_de_données_statut"
 
-#: sql_help.c:2104 sql_help.c:2134
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "mffunc"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "m_condition_initiale"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "opérateur_de_tri"
 
-#: sql_help.c:2119
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "ou l'ancienne syntaxe"
 
-#: sql_help.c:2121
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "type_base"
 
-#: sql_help.c:2179 sql_help.c:2229
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "locale"
 
-#: sql_help.c:2180 sql_help.c:2230
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2181 sql_help.c:2231
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2182 sql_help.c:4495
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "fournisseur"
 
-#: sql_help.c:2184
+#: sql_help.c:2223
 msgid "rules"
 msgstr "règles"
 
-#: sql_help.c:2185 sql_help.c:2292
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "version"
 
-#: sql_help.c:2187
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "collationnement_existant"
 
-#: sql_help.c:2197
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "encodage_source"
 
-#: sql_help.c:2198
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "encodage_destination"
 
-#: sql_help.c:2226 sql_help.c:3067
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "modèle"
 
-#: sql_help.c:2227
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "encodage"
 
-#: sql_help.c:2228
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "stratégie"
 
-#: sql_help.c:2232
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "builtin_locale"
 
-#: sql_help.c:2233
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "icu_locale"
 
-#: sql_help.c:2234
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "règles_icu"
 
-#: sql_help.c:2235
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "locale_provider"
 
-#: sql_help.c:2236
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "collation_version"
 
-#: sql_help.c:2241
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2276 sql_help.c:2709 sql_help.c:3140
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "événement"
 
-#: sql_help.c:2277
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "filter_variable"
 
-#: sql_help.c:2278
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "filtre_valeur"
 
-#: sql_help.c:2374 sql_help.c:2956
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "table_source"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "option_like"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "où contrainte_colonne est :"
 
-#: sql_help.c:2419
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "et option_like est :"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "type_en_retour"
 
-#: sql_help.c:2421
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "type_colonne"
 
-#: sql_help.c:2430 sql_help.c:2633
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "définition"
 
-#: sql_help.c:2431 sql_help.c:2634
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "fichier_objet"
 
-#: sql_help.c:2432 sql_help.c:2635
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "symbole_link"
 
-#: sql_help.c:2433 sql_help.c:2636
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "corps_sql"
 
-#: sql_help.c:2471 sql_help.c:2694 sql_help.c:3263
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2487 sql_help.c:2528 sql_help.c:2925 sql_help.c:2938
-#: sql_help.c:2952 sql_help.c:3023
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "méthode"
 
-#: sql_help.c:2509
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "gestionnaire_d_appel"
 
-#: sql_help.c:2510
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "gestionnaire_en_ligne"
 
-#: sql_help.c:2511
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "fonction_val"
 
-#: sql_help.c:2569
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "nom_famille"
 
-#: sql_help.c:2580
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "type_stockage"
 
-#: sql_help.c:2715 sql_help.c:3147
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "où événement fait partie de :"
 
-#: sql_help.c:2735 sql_help.c:2737
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "élément_schéma"
 
-#: sql_help.c:2774
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "type_serveur"
 
-#: sql_help.c:2775
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "version_serveur"
 
-#: sql_help.c:2776 sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "nom_fdw"
 
-#: sql_help.c:2793 sql_help.c:2796
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "nom_statistique"
 
-#: sql_help.c:2797
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "statistics_kind"
 
-#: sql_help.c:2813
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "nom_souscription"
 
-#: sql_help.c:2918
-msgid "source_table"
-msgstr "table_source"
-
-#: sql_help.c:2919
-msgid "like_option"
-msgstr "option_like"
-
-#: sql_help.c:2985
-msgid "and like_option is:"
-msgstr "et option_like est :"
-
-#: sql_help.c:3040
+#: sql_help.c:3105
 msgid "directory"
 msgstr "répertoire"
 
-#: sql_help.c:3054
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "nom_analyseur"
 
-#: sql_help.c:3055
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "configuration_source"
 
-#: sql_help.c:3084
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "fonction_start"
 
-#: sql_help.c:3085
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "fonction_gettoken"
 
-#: sql_help.c:3086
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "fonction_end"
 
-#: sql_help.c:3087
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "fonction_lextypes"
 
-#: sql_help.c:3088
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "fonction_headline"
 
-#: sql_help.c:3100
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "fonction_init"
 
-#: sql_help.c:3101
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "fonction_lexize"
 
-#: sql_help.c:3114
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "nom_fonction_from_sql"
 
-#: sql_help.c:3116
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "nom_fonction_to_sql"
 
-#: sql_help.c:3142
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "nom_table_référencée"
 
-#: sql_help.c:3143
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "nom_relation_transition"
 
-#: sql_help.c:3146
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "arguments"
 
-#: sql_help.c:3198
+#: sql_help.c:3263
 msgid "label"
 msgstr "label"
 
-#: sql_help.c:3200
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "sous_type"
 
-#: sql_help.c:3201
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "classe_opérateur_sous_type"
 
-#: sql_help.c:3203
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "fonction_canonique"
 
-#: sql_help.c:3204
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "fonction_diff_sous_type"
 
-#: sql_help.c:3205
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "nom_type_multirange"
 
-#: sql_help.c:3207
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:3208
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:3209
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "fonction_receive"
 
-#: sql_help.c:3210
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "fonction_send"
 
-#: sql_help.c:3211
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "fonction_en_entrée_modificateur_type"
 
-#: sql_help.c:3212
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "fonction_en_sortie_modificateur_type"
 
-#: sql_help.c:3213
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "fonction_analyze"
 
-#: sql_help.c:3214
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "fonction_indice"
 
-#: sql_help.c:3215
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "longueur_interne"
 
-#: sql_help.c:3216
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "alignement"
 
-#: sql_help.c:3217
+#: sql_help.c:3282
 msgid "storage"
 msgstr "stockage"
 
-#: sql_help.c:3218
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "type_like"
 
-#: sql_help.c:3219
+#: sql_help.c:3284
 msgid "category"
 msgstr "catégorie"
 
-#: sql_help.c:3220
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "préféré"
 
-#: sql_help.c:3221
+#: sql_help.c:3286
 msgid "default"
 msgstr "par défaut"
 
-#: sql_help.c:3222
+#: sql_help.c:3287
 msgid "element"
 msgstr "élément"
 
-#: sql_help.c:3223
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "délimiteur"
 
-#: sql_help.c:3224
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "collationnable"
 
-#: sql_help.c:3321 sql_help.c:4008 sql_help.c:4102 sql_help.c:4592
-#: sql_help.c:4695 sql_help.c:4850 sql_help.c:4964 sql_help.c:5095
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "requête_with"
 
-#: sql_help.c:3323 sql_help.c:4010 sql_help.c:4611 sql_help.c:4617
-#: sql_help.c:4620 sql_help.c:4624 sql_help.c:4628 sql_help.c:4636
-#: sql_help.c:4869 sql_help.c:4875 sql_help.c:4878 sql_help.c:4882
-#: sql_help.c:4886 sql_help.c:4894 sql_help.c:4966 sql_help.c:5114
-#: sql_help.c:5120 sql_help.c:5123 sql_help.c:5127 sql_help.c:5131
-#: sql_help.c:5139
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:3324 sql_help.c:4596 sql_help.c:4638 sql_help.c:4640
-#: sql_help.c:4644 sql_help.c:4646 sql_help.c:4647 sql_help.c:4648
-#: sql_help.c:4700 sql_help.c:4854 sql_help.c:4896 sql_help.c:4898
-#: sql_help.c:4902 sql_help.c:4904 sql_help.c:4905 sql_help.c:4906
-#: sql_help.c:4973 sql_help.c:5099 sql_help.c:5141 sql_help.c:5143
-#: sql_help.c:5147 sql_help.c:5149 sql_help.c:5150 sql_help.c:5151
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "élément_from"
 
-#: sql_help.c:3326 sql_help.c:3810 sql_help.c:4159 sql_help.c:4975
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "nom_curseur"
 
-#: sql_help.c:3327 sql_help.c:4016 sql_help.c:4108 sql_help.c:4976
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "alias_en_sortie"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "expression_en_sortie"
 
-#: sql_help.c:3328 sql_help.c:4017 sql_help.c:4109 sql_help.c:4595
-#: sql_help.c:4698 sql_help.c:4853 sql_help.c:4977 sql_help.c:5098
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "nom_en_sortie"
 
-#: sql_help.c:3344
+#: sql_help.c:3411
 msgid "code"
 msgstr "code"
 
-#: sql_help.c:3749
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "paramètre"
 
-#: sql_help.c:3773 sql_help.c:4184
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "instruction"
 
-#: sql_help.c:3809 sql_help.c:4158
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "direction"
 
-#: sql_help.c:3811 sql_help.c:4160
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "où direction fait partie de :"
 
-#: sql_help.c:3812 sql_help.c:3813 sql_help.c:3814 sql_help.c:3815
-#: sql_help.c:3816 sql_help.c:4161 sql_help.c:4162 sql_help.c:4163
-#: sql_help.c:4164 sql_help.c:4165 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4709 sql_help.c:4711 sql_help.c:4863 sql_help.c:4865
-#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5108 sql_help.c:5110
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "nombre"
 
-#: sql_help.c:3919 sql_help.c:4382
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "nom_séquence"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "nom_argument"
 
-#: sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "type_arg"
 
-#: sql_help.c:3945 sql_help.c:4408
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3976
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "schema_distant"
 
-#: sql_help.c:3979
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "schéma_local"
 
-#: sql_help.c:4014
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "cible_conflit"
 
-#: sql_help.c:4015
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "action_conflit"
 
-#: sql_help.c:4018
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "où cible_conflit fait partie de :"
 
-#: sql_help.c:4019
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "index_nom_colonne"
 
-#: sql_help.c:4020
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "index_expression"
 
-#: sql_help.c:4023
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "index_prédicat"
 
-#: sql_help.c:4025
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "où action_conflit fait partie de :"
 
-#: sql_help.c:4031 sql_help.c:4132 sql_help.c:4972
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "sous-SELECT"
 
-#: sql_help.c:4040 sql_help.c:4173 sql_help.c:4948
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:4062
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "mode_de_verrou"
 
-#: sql_help.c:4063
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "où mode_de_verrou fait partie de :"
 
-#: sql_help.c:4103
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "target_table_name"
 
-#: sql_help.c:4104
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "target_alias"
 
-#: sql_help.c:4105
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "data_source"
 
-#: sql_help.c:4106 sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "condition_de_jointure"
 
-#: sql_help.c:4107
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "when_clause"
 
-#: sql_help.c:4110
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "où data_source est :"
 
-#: sql_help.c:4111
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "source_table_name"
 
-#: sql_help.c:4112
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "source_query"
 
-#: sql_help.c:4113
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "source_alias"
 
-#: sql_help.c:4114
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "et when_clause est :"
 
-#: sql_help.c:4116 sql_help.c:4119
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "merge_delete"
 
-#: sql_help.c:4117 sql_help.c:4120
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4122
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4123
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "et merge_insert est :"
 
-#: sql_help.c:4126
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "et merge_update est :"
 
-#: sql_help.c:4133
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "et merge_delete est :"
 
-#: sql_help.c:4174
+#: sql_help.c:4245
 msgid "payload"
 msgstr "contenu"
 
-#: sql_help.c:4201
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "ancien_rôle"
 
-#: sql_help.c:4202
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "nouveau_rôle"
 
-#: sql_help.c:4241 sql_help.c:4450 sql_help.c:4458
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "nom_savepoint"
 
-#: sql_help.c:4598 sql_help.c:4656 sql_help.c:4856 sql_help.c:4914
-#: sql_help.c:5101 sql_help.c:5159
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "element_regroupement"
 
-#: sql_help.c:4600 sql_help.c:4704 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "nom_window"
 
-#: sql_help.c:4601 sql_help.c:4705 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "définition_window"
 
-#: sql_help.c:4602 sql_help.c:4616 sql_help.c:4660 sql_help.c:4706
-#: sql_help.c:4860 sql_help.c:4874 sql_help.c:4918 sql_help.c:5105
-#: sql_help.c:5119 sql_help.c:5163
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "sélection"
 
-#: sql_help.c:4608 sql_help.c:4866 sql_help.c:5111
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "reference_from"
 
-#: sql_help.c:4609 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "où élément_from fait partie de :"
 
-#: sql_help.c:4612 sql_help.c:4618 sql_help.c:4621 sql_help.c:4625
-#: sql_help.c:4637 sql_help.c:4870 sql_help.c:4876 sql_help.c:4879
-#: sql_help.c:4883 sql_help.c:4895 sql_help.c:5115 sql_help.c:5121
-#: sql_help.c:5124 sql_help.c:5128 sql_help.c:5140
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "alias_colonne"
 
-#: sql_help.c:4613 sql_help.c:4871 sql_help.c:5116
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "méthode_echantillonnage"
 
-#: sql_help.c:4615 sql_help.c:4873 sql_help.c:5118
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "graine"
 
-#: sql_help.c:4619 sql_help.c:4658 sql_help.c:4877 sql_help.c:4916
-#: sql_help.c:5122 sql_help.c:5161
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "nom_requête_with"
 
-#: sql_help.c:4629 sql_help.c:4632 sql_help.c:4635 sql_help.c:4887
-#: sql_help.c:4890 sql_help.c:4893 sql_help.c:5132 sql_help.c:5135
-#: sql_help.c:5138
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "définition_colonne"
 
-#: sql_help.c:4639 sql_help.c:4645 sql_help.c:4897 sql_help.c:4903
-#: sql_help.c:5142 sql_help.c:5148
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "type_de_jointure"
 
-#: sql_help.c:4642 sql_help.c:4900 sql_help.c:5145
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "colonne_de_jointure"
 
-#: sql_help.c:4643 sql_help.c:4901 sql_help.c:5146
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "join_utilisant_alias"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "où element_regroupement fait partie de :"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "et requête_with est :"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "valeurs"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4665 sql_help.c:4923 sql_help.c:5168
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4667 sql_help.c:4925 sql_help.c:5170
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "nom_colonne_seq_recherche"
 
-#: sql_help.c:4669 sql_help.c:4927 sql_help.c:5172
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "nom_colonne_marque_cycle"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "valeur_marque_cycle"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "défaut_marque_cyle"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "nom_colonne_chemin_cycle"
 
-#: sql_help.c:4699
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "nouvelle_table"
 
-#: sql_help.c:4770
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "id_snapshot"
 
-#: sql_help.c:5037
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "expression_de_tri"
 
-#: sql_help.c:5182 sql_help.c:6166
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "abandonner la transaction en cours"
 
-#: sql_help.c:5188
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "modifier la définition d'une fonction d'agrégation"
 
-#: sql_help.c:5194
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "modifier la définition d'un collationnement"
 
-#: sql_help.c:5200
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "modifier la définition d'une conversion"
 
-#: sql_help.c:5206
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "modifier une base de données"
 
-#: sql_help.c:5212
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "définir les droits d'accès par défaut"
 
-#: sql_help.c:5218
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "modifier la définition d'un domaine"
 
-#: sql_help.c:5224
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "modifier la définition d'un trigger sur évènement"
 
-#: sql_help.c:5230
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "modifier la définition d'une extension"
 
-#: sql_help.c:5236
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "modifier la définition d'un wrapper de données distantes"
 
-#: sql_help.c:5242
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "modifier la définition d'une table distante"
 
-#: sql_help.c:5248
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "modifier la définition d'une fonction"
 
-#: sql_help.c:5254
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "modifier le nom d'un groupe ou la liste des ses membres"
 
-#: sql_help.c:5260
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "modifier la définition d'un index"
 
-#: sql_help.c:5266
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "modifier la définition d'un langage procédural"
 
-#: sql_help.c:5272
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "modifier la définition d'un « Large Object »"
 
-#: sql_help.c:5278
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "modifier la définition d'une vue matérialisée"
 
-#: sql_help.c:5284
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "modifier la définition d'un opérateur"
 
-#: sql_help.c:5290
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "modifier la définition d'une classe d'opérateurs"
 
-#: sql_help.c:5296
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "modifier la définition d'une famille d'opérateur"
 
-#: sql_help.c:5302
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "modifier la définition d'une politique de sécurité au niveau ligne"
 
-#: sql_help.c:5308
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "modifier la définition d'une procédure"
 
-#: sql_help.c:5314
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "modifier la définition d'une publication"
 
-#: sql_help.c:5320 sql_help.c:5422
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "modifier un rôle"
 
-#: sql_help.c:5326
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "modifier la définition d'une routine"
 
-#: sql_help.c:5332
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "modifier la définition d'une règle"
 
-#: sql_help.c:5338
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "modifier la définition d'un schéma"
 
-#: sql_help.c:5344
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "modifier la définition d'un générateur de séquence"
 
-#: sql_help.c:5350
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "modifier la définition d'un serveur distant"
 
-#: sql_help.c:5356
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "modifier la définition d'un objet de statistiques étendues"
 
-#: sql_help.c:5362
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "modifier la définition d'une souscription"
 
-#: sql_help.c:5368
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "modifie un paramètre de configuration du serveur"
 
-#: sql_help.c:5374
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "modifier la définition d'une table"
 
-#: sql_help.c:5380
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "modifier la définition d'un tablespace"
 
-#: sql_help.c:5386
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "modifier la définition d'une configuration de la recherche de texte"
 
-#: sql_help.c:5392
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "modifier la définition d'un dictionnaire de la recherche de texte"
 
-#: sql_help.c:5398
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "modifier la définition d'un analyseur de la recherche de texte"
 
-#: sql_help.c:5404
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "modifier la définition d'un modèle de la recherche de texte"
 
-#: sql_help.c:5410
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "modifier la définition d'un trigger"
 
-#: sql_help.c:5416
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "modifier la définition d'un type"
 
-#: sql_help.c:5428
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "modifier la définition d'une correspondance d'utilisateur"
 
-#: sql_help.c:5434
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "modifier la définition d'une vue"
 
-#: sql_help.c:5440
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "acquérir des statistiques concernant la base de données"
 
-#: sql_help.c:5446 sql_help.c:6244
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "débuter un bloc de transaction"
 
-#: sql_help.c:5452
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "appeler une procédure"
 
-#: sql_help.c:5458
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "forcer un point de vérification des journaux de transactions"
 
-#: sql_help.c:5464
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "fermer un curseur"
 
-#: sql_help.c:5470
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "réorganiser (cluster) une table en fonction d'un index"
 
-#: sql_help.c:5476
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "définir ou modifier les commentaires d'un objet"
 
-#: sql_help.c:5482 sql_help.c:6040
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "valider la transaction en cours"
 
-#: sql_help.c:5488
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "valider une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
-#: sql_help.c:5494
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "copier des données entre un fichier et une table"
 
-#: sql_help.c:5500
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "définir une nouvelle méthode d'accès"
 
-#: sql_help.c:5506
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "définir une nouvelle fonction d'agrégation"
 
-#: sql_help.c:5512
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "définir un nouveau transtypage"
 
-#: sql_help.c:5518
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "définir un nouveau collationnement"
 
-#: sql_help.c:5524
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "définir une nouvelle conversion d'encodage"
 
-#: sql_help.c:5530
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "créer une nouvelle base de données"
 
-#: sql_help.c:5536
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "définir un nouveau domaine"
 
-#: sql_help.c:5542
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "définir un nouveau trigger sur évènement"
 
-#: sql_help.c:5548
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "installer une extension"
 
-#: sql_help.c:5554
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "définir un nouveau wrapper de données distantes"
 
-#: sql_help.c:5560
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "définir une nouvelle table distante"
 
-#: sql_help.c:5566
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "définir une nouvelle fonction"
 
-#: sql_help.c:5572 sql_help.c:5632 sql_help.c:5734
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "définir un nouveau rôle"
 
-#: sql_help.c:5578
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "définir un nouvel index"
 
-#: sql_help.c:5584
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "définir un nouveau langage de procédures"
 
-#: sql_help.c:5590
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "définir une nouvelle vue matérialisée"
 
-#: sql_help.c:5596
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "définir un nouvel opérateur"
 
-#: sql_help.c:5602
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "définir une nouvelle classe d'opérateur"
 
-#: sql_help.c:5608
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "définir une nouvelle famille d'opérateur"
 
-#: sql_help.c:5614
+#: sql_help.c:5687
 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"
 
-#: sql_help.c:5620
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "définir une nouvelle procédure"
 
-#: sql_help.c:5626
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "définir une nouvelle publication"
 
-#: sql_help.c:5638
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "définir une nouvelle règle de réécriture"
 
-#: sql_help.c:5644
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "définir un nouveau schéma"
 
-#: sql_help.c:5650
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "définir un nouveau générateur de séquence"
 
-#: sql_help.c:5656
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "définir un nouveau serveur distant"
 
-#: sql_help.c:5662
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "définir des statistiques étendues"
 
-#: sql_help.c:5668
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "définir une nouvelle souscription"
 
-#: sql_help.c:5674
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "définir une nouvelle table"
 
-#: sql_help.c:5680 sql_help.c:6202
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "définir une nouvelle table à partir des résultats d'une requête"
 
-#: sql_help.c:5686
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "définir un nouveau tablespace"
 
-#: sql_help.c:5692
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "définir une nouvelle configuration de la recherche de texte"
 
-#: sql_help.c:5698
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "définir un nouveau dictionnaire de la recherche de texte"
 
-#: sql_help.c:5704
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "définir un nouvel analyseur de la recherche de texte"
 
-#: sql_help.c:5710
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "définir un nouveau modèle de la recherche de texte"
 
-#: sql_help.c:5716
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "définir une nouvelle transformation"
 
-#: sql_help.c:5722
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "définir un nouveau trigger"
 
-#: sql_help.c:5728
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "définir un nouveau type de données"
 
-#: sql_help.c:5740
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "définit une nouvelle correspondance d'un utilisateur vers un serveur distant"
 
-#: sql_help.c:5746
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "définir une nouvelle vue"
 
-#: sql_help.c:5752
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "désallouer une instruction préparée"
 
-#: sql_help.c:5758
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "définir un curseur"
 
-#: sql_help.c:5764
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "supprimer des lignes d'une table"
 
-#: sql_help.c:5770
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "annuler l'état de la session"
 
-#: sql_help.c:5776
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "exécute un bloc de code anonyme"
 
-#: sql_help.c:5782
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "supprimer une méthode d'accès"
 
-#: sql_help.c:5788
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "supprimer une fonction d'agrégation"
 
-#: sql_help.c:5794
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "supprimer un transtypage"
 
-#: sql_help.c:5800
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "supprimer un collationnement"
 
-#: sql_help.c:5806
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "supprimer une conversion"
 
-#: sql_help.c:5812
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "supprimer une base de données"
 
-#: sql_help.c:5818
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "supprimer un domaine"
 
-#: sql_help.c:5824
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "supprimer un trigger sur évènement"
 
-#: sql_help.c:5830
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "supprimer une extension"
 
-#: sql_help.c:5836
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "supprimer un wrapper de données distantes"
 
-#: sql_help.c:5842
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "supprimer une table distante"
 
-#: sql_help.c:5848
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "supprimer une fonction"
 
-#: sql_help.c:5854 sql_help.c:5920 sql_help.c:6022
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "supprimer un rôle de la base de données"
 
-#: sql_help.c:5860
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "supprimer un index"
 
-#: sql_help.c:5866
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "supprimer un langage procédural"
 
-#: sql_help.c:5872
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "supprimer une vue matérialisée"
 
-#: sql_help.c:5878
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "supprimer un opérateur"
 
-#: sql_help.c:5884
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "supprimer une classe d'opérateur"
 
-#: sql_help.c:5890
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "supprimer une famille d'opérateur"
 
-#: sql_help.c:5896
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "supprimer les objets appartenant à un rôle"
 
-#: sql_help.c:5902
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "supprimer une politique de sécurité au niveau ligne pour une table"
 
-#: sql_help.c:5908
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "supprimer une procédure"
 
-#: sql_help.c:5914
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "supprimer une publication"
 
-#: sql_help.c:5926
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "supprimer une routine"
 
-#: sql_help.c:5932
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "supprimer une règle de réécriture"
 
-#: sql_help.c:5938
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "supprimer un schéma"
 
-#: sql_help.c:5944
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "supprimer une séquence"
 
-#: sql_help.c:5950
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "supprimer un descripteur de serveur distant"
 
-#: sql_help.c:5956
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "supprimer des statistiques étendues"
 
-#: sql_help.c:5962
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "supprimer une souscription"
 
-#: sql_help.c:5968
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "supprimer une table"
 
-#: sql_help.c:5974
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "supprimer un tablespace"
 
-#: sql_help.c:5980
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "supprimer une configuration de la recherche de texte"
 
-#: sql_help.c:5986
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "supprimer un dictionnaire de la recherche de texte"
 
-#: sql_help.c:5992
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "supprimer un analyseur de la recherche de texte"
 
-#: sql_help.c:5998
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "supprimer un modèle de la recherche de texte"
 
-#: sql_help.c:6004
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "supprimer une transformation"
 
-#: sql_help.c:6010
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "supprimer un trigger"
 
-#: sql_help.c:6016
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "supprimer un type de données"
 
-#: sql_help.c:6028
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "supprime une correspondance utilisateur pour un serveur distant"
 
-#: sql_help.c:6034
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "supprimer une vue"
 
-#: sql_help.c:6046
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "exécuter une instruction préparée"
 
-#: sql_help.c:6052
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "afficher le plan d'exécution d'une instruction"
 
-#: sql_help.c:6058
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "extraire certaines lignes d'une requête à l'aide d'un curseur"
 
-#: sql_help.c:6064
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "définir des privilèges d'accès"
 
-#: sql_help.c:6070
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "importer la définition d'une table à partir d'un serveur distant"
 
-#: sql_help.c:6076
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "créer de nouvelles lignes dans une table"
 
-#: sql_help.c:6082
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "se mettre à l'écoute d'une notification"
 
-#: sql_help.c:6088
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "charger un fichier de bibliothèque partagée"
 
-#: sql_help.c:6094
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "verrouiller une table"
 
-#: sql_help.c:6100
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "insère, modifie ou supprime des lignes d'une table de façon conditionnelle"
 
-#: sql_help.c:6106
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "positionner un curseur"
 
-#: sql_help.c:6112
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "engendrer une notification"
 
-#: sql_help.c:6118
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "préparer une instruction pour exécution"
 
-#: sql_help.c:6124
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "préparer la transaction en cours pour une validation en deux phases"
 
-#: sql_help.c:6130
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "changer le propriétaire des objets d'un rôle"
 
-#: sql_help.c:6136
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "remplacer le contenu d'une vue matérialisée"
 
-#: sql_help.c:6142
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "reconstruire des index"
 
-#: sql_help.c:6148
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "détruire un savepoint précédemment défini"
 
-#: sql_help.c:6154
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "réinitialiser un paramètre d'exécution à sa valeur par défaut"
 
-#: sql_help.c:6160
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "supprimer des privilèges d'accès"
 
-#: sql_help.c:6172
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "annuler une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
-#: sql_help.c:6178
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "annuler jusqu'au point de retournement"
 
-#: sql_help.c:6184
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "définir un nouveau point de retournement pour la transaction en cours"
 
-#: sql_help.c:6190
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "définir ou modifier un label de sécurité à un objet"
 
-#: sql_help.c:6196 sql_help.c:6250 sql_help.c:6286
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "extraire des lignes d'une table ou d'une vue"
 
-#: sql_help.c:6208
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "modifier un paramètre d'exécution"
 
-#: sql_help.c:6214
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "définir le moment de la vérification des contraintes pour la transaction en cours"
 
-#: sql_help.c:6220
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "définir l'identifiant actuel de l'utilisateur de la session courante"
 
-#: sql_help.c:6226
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr ""
 "définir l'identifiant de l'utilisateur de session et l'identifiant actuel de\n"
 "l'utilisateur de la session courante"
 
-#: sql_help.c:6232
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "définir les caractéristiques de la transaction en cours"
 
-#: sql_help.c:6238
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "afficher la valeur d'un paramètre d'exécution"
 
-#: sql_help.c:6256
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "vider une table ou un ensemble de tables"
 
-#: sql_help.c:6262
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "arrêter l'écoute d'une notification"
 
-#: sql_help.c:6268
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "actualiser les lignes d'une table"
 
-#: sql_help.c:6274
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "compacter et optionnellement analyser une base de données"
 
-#: sql_help.c:6280
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "calculer un ensemble de lignes"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 peut seulement être utilisé dans un mode non interactif"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le journal applicatif « %s » : %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6677,27 +6995,27 @@ msgstr ""
 "Saisissez « help » pour l'aide.\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "n'a pas pu configurer le paramètre d'impression « %s »"
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "option supplémentaire « %s » ignorée"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "n'a pas pu trouver son propre exécutable"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6639
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6708,22 +7026,47 @@ msgstr ""
 "La requête était :\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "valeur « %s » non reconnue pour « %s » : booléen attendu"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "valeur « %s » invalide pour « %s » : entier attendu"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "syntaxe en entrée invalide pour la variable « %s »"
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "valeur « %s » invalide pour la variable « %s » : doit être supérieur à %.2f"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "valeur « %s » invalide pour la variable « %s » : doit être inférieur à %.2f"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "la valeur « %s » est en dehors des limites pour la variable « %s »"
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "valeur « %s » invalide pour la variable « %s »"
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "nom de variable « %s » invalide"
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
@@ -6732,6 +7075,44 @@ msgstr ""
 "valeur « %s » non reconnue pour « %s »\n"
 "Les valeurs disponibles sont : %s."
 
+#, c-format
+#~ msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
+#~ msgstr ""
+#~ "Ne peut pas ajouter une cellule au contenu de la table : le nombre total des\n"
+#~ "cellules %lld est dépassé.\n"
+
+#, c-format
+#~ msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
+#~ msgstr "Ne peut pas afficher le contenu de la table : le nombre de cellules %lld est égal à ou dépasse le maximum %lld.\n"
+
+#, c-format
+#~ msgid "Unlogged materialized view \"%s.%s\""
+#~ msgstr "Vue matérialisée non journalisée « %s.%s »"
+
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
+#~ msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » à l'adresse « %s » via le port « %s ».\n"
+
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%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 » (adresse « %s ») via le port « %s ».\n"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "n'a pas pu rechercher l'identifiant de l'utilisateur local %d : %s"
+
+#, c-format
+#~ msgid "local user with ID %d does not exist"
+#~ msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
+
 #~ msgid "partition_name1"
 #~ msgstr "nom_partition1"
 
diff --git a/src/bin/psql/po/ja.po b/src/bin/psql/po/ja.po
index 25c0e2e0e74..534a9049865 100644
--- a/src/bin/psql/po/ja.po
+++ b/src/bin/psql/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-08 10:37+0900\n"
-"PO-Revision-Date: 2025-04-08 11:22+0900\n"
+"POT-Creation-Date: 2025-11-28 14:19+0900\n"
+"PO-Revision-Date: 2025-11-28 15:44+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -83,7 +83,7 @@ msgid "%s() failed: %m"
 msgstr "%s() が失敗しました: %m"
 
 #: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
-#: command.c:1636 command.c:3985 command.c:4034 command.c:4159 input.c:225
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -105,7 +105,7 @@ msgstr "null ポインターを複製することはできません(内部エラ
 msgid "could not look up effective user ID %ld: %s"
 msgstr "実効ユーザーID %ld が見つかりませんでした: %s"
 
-#: ../../common/username.c:45 command.c:700
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "ユーザーが存在しません"
 
@@ -165,8 +165,8 @@ msgstr "割り込み\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %<PRId64> is equal to or exceeds maximum %zu.\n"
-msgstr "テーブルの内容を表示できません: セル数%<PRId64>が上限値%zu以上です。\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "テーブルの内容を表示できません: セル数%<PRIu64>が上限値%zu以上です。\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -175,8 +175,8 @@ msgstr "テーブルの内容にヘッダーを追加できません: 列数の
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %<PRId64> exceeded.\n"
-msgstr "テーブルの内容にセルを追加できません: セルの総数%<PRId64>を超過しています。\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "テーブルの内容にセルを追加できません: セルの総数%<PRIu64>を超過しています。\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -198,409 +198,409 @@ msgstr "シェルコマンドの引数に改行(LF)または復帰(CR)が含ま
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "データベース名に改行(LF)または復帰(CR)が含まれています: \"%s\"\n"
 
-#: command.c:245
+#: command.c:254
+#, c-format
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "バックスラッシュコマンドは制限されています; \\unrestrict のみ実行可能です"
+
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "不正なコマンド \\%s "
 
-#: command.c:247
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr " \\? でヘルプを表示します。"
 
-#: command.c:265
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: 余分な引数\"%s\"は無視されました"
 
-#: command.c:317
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "\\%s コマンドは無視されます; 現在の\\ifブロックを抜けるには\\endifまたはCtrl-Cを使用します"
 
-#: command.c:552 command.c:747 command.c:1882 command.c:2050 command.c:2363
-#: command.c:2377 command.c:2409 command.c:2498 command.c:2611 command.c:2889
-#: command.c:3151 command.c:3191
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
 #, c-format
 msgid "\\%s: missing required argument"
 msgstr "\\%s: 必要な引数がありません"
 
-#: command.c:698
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "ユーザーID %ldのホームディレクトリを取得できませんでした : %s"
 
-#: command.c:717
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: ディレクトリを\"%s\"に変更できませんでした: %m"
 
-#: command.c:789
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "現在データベースに接続していません。\n"
 
-#: command.c:815
+#: command.c:839
 msgid "Connection Information"
 msgstr "接続情報"
 
-#: command.c:816 describe.c:4721
+#: command.c:840 describe.c:4722
 msgid "Parameter"
 msgstr "パラメータ"
 
-#: command.c:817 describe.c:4722
+#: command.c:841 describe.c:4723
 msgid "Value"
 msgstr "値"
 
-#: command.c:820 describe.c:3873
+#: command.c:844 describe.c:3874
 msgid "Database"
 msgstr "データベース"
 
-#: command.c:824
+#: command.c:848
 msgid "Client User"
 msgstr "クライアントユーザー"
 
-#: command.c:833 command.c:848
+#: command.c:857 command.c:872
 msgid "Host Address"
 msgstr "ソケットディレクトリ"
 
-#: command.c:838
+#: command.c:862
 msgid "Socket Directory"
 msgstr "ソケットディレクトリ"
 
-#: command.c:844
+#: command.c:868
 msgid "Host"
 msgstr "ホスト"
 
-#: command.c:854
+#: command.c:878
 msgid "Server Port"
 msgstr "サーバーポート"
 
-#: command.c:858 describe.c:246 describe.c:3614 describe.c:3954
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
 msgid "Options"
 msgstr "オプション"
 
-#: command.c:862
+#: command.c:886
 msgid "Protocol Version"
 msgstr "プロトコルバージョン"
 
-#: command.c:866
+#: command.c:890
 msgid "Password Used"
 msgstr "パスワード使用"
 
-#: command.c:867 command.c:871 command.c:879 command.c:912
+#: command.c:891 command.c:895 command.c:903 command.c:936
 msgid "false"
 msgstr "false"
 
-#: command.c:867 command.c:871 command.c:879 command.c:912
+#: command.c:891 command.c:895 command.c:903 command.c:936
 msgid "true"
 msgstr "true"
 
-#: command.c:870
+#: command.c:894
 msgid "GSSAPI Authenticated"
 msgstr "GSSAPI認証"
 
-#: command.c:874
+#: command.c:898
 msgid "Backend PID"
 msgstr "バックエンドPID"
 
-#: command.c:878
-msgid "TLS Connection"
-msgstr "TLS接続"
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL接続"
 
-#: command.c:898
-msgid "TLS Library"
-msgstr "TLSライブラリ"
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSLライブラリ"
 
-#: command.c:899 command.c:902 command.c:905 command.c:908 command.c:920
-#: command.c:924 command.c:4423 command.c:4424
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
 msgid "unknown"
 msgstr "不明"
 
-#: command.c:901
-msgid "TLS Protocol"
-msgstr "TLSプロトコル"
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSLプロトコル"
 
-#: command.c:904
-msgid "TLS Key Bits"
-msgstr "TKSキービット数"
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "SSLキービット数"
 
-#: command.c:907
-msgid "TLS Cipher"
-msgstr "TLS暗号化方式"
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL暗号化方式"
 
-#: command.c:910
-msgid "TLS Compression"
-msgstr "TLS圧縮"
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL圧縮"
 
-#: command.c:914
+#: command.c:938
 msgid "ALPN"
 msgstr "ALPN"
 
-#: command.c:915 command.c:4426
+#: command.c:939 command.c:4519
 msgid "none"
 msgstr "なし"
 
-#: command.c:1332 command.c:1433 command.c:3184
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "問い合わせバッファがありません"
 
-#: command.c:1365 command.c:6307
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "不正な行番号です: %s"
 
-#: command.c:1511
+#: command.c:1535
 msgid "No changes"
 msgstr "変更されていません"
 
-#: command.c:1596
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: エンコーディング名が不正であるか、または変換プロシージャが見つかりません。"
 
-#: command.c:1632 command.c:2572 command.c:3981 command.c:4179 command.c:6413
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
 #: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
-#: common.c:1264 common.c:1376 common.c:1414 common.c:1688 common.c:1768
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
 #: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
 #: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1639
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "直前のエラーはありません。"
 
-#: command.c:1742
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
 #, c-format
 msgid "\\%s not allowed in pipeline mode"
 msgstr "\\%s はパイプラインモードでは使用できません"
 
-#: command.c:1798
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: 右括弧がありません"
 
-#: command.c:1924
+#: command.c:1948
 #, c-format
 msgid "\\getresults: invalid number of requested results"
 msgstr "\\getresults: 要求された結果の数が不正"
 
-#: command.c:1949
-#, c-format
-msgid "\\gexec not allowed in pipeline mode"
-msgstr "\\gexec はパイプラインモードでは使用できません"
-
-#: command.c:1975
-#, c-format
-msgid "\\gset not allowed in pipeline mode"
-msgstr "\\gset はパイプラインモードでは使用できません"
-
-#: command.c:2181
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: \\else の後には置けません"
 
-#: command.c:2186
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: 対応する \\if がありません"
 
-#: command.c:2250
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: \\else の後には置けません"
 
-#: command.c:2255
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: 対応する \\if がありません"
 
-#: command.c:2295
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: 対応する \\if がありません"
 
-#: command.c:2473
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "問い合わせバッファは空です。"
 
-#: command.c:2550
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "ユーザー\"%s\"の新しいパスワードを入力してください: "
 
-#: command.c:2554
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "もう一度入力してください: "
 
-#: command.c:2563
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "パスワードが一致しませんでした。"
 
-#: command.c:2646
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: 変数の値を読み取ることができませんでした"
 
-#: command.c:2748
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "問い合わせバッファがリセット(クリア)されました。"
 
-#: command.c:2770
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "ファイル\"%s\"にヒストリーを出力しました。\n"
 
-#: command.c:2800
+#: command.c:2853
 #, c-format
 msgid "\\sendpipeline must be used after \\bind or \\bind_named"
 msgstr "\\sendpipeline は  \\bind または \\bind_named の後で使用する必要があります"
 
-#: command.c:2807
+#: command.c:2860
 #, c-format
 msgid "\\sendpipeline not allowed outside of pipeline mode"
 msgstr "\\sendpipeline はパイプラインモード以外では使用できません"
 
-#: command.c:2894
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: 環境変数名に\"=\"を含めることはできません"
 
-#: command.c:2942
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "関数名が必要です"
 
-#: command.c:2944
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "ビュー名が必要です"
 
-#: command.c:3123
+#: command.c:3176
 msgid "Timing is on."
 msgstr "タイミングは on です。"
 
-#: command.c:3125
+#: command.c:3178
 msgid "Timing is off."
 msgstr "タイミングは off です。"
 
-#: command.c:3211 command.c:3249 command.c:4694 command.c:4697 command.c:4700
-#: command.c:4706 command.c:4708 command.c:4734 command.c:4744 command.c:4756
-#: command.c:4770 command.c:4797 command.c:4855 common.c:77 copy.c:329
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: 現在制限モードではありません"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: キーが間違っています"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
 #: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:3238 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:3287
-#, c-format
-msgid "\\watch not allowed in pipeline mode"
-msgstr "\\watch はパイプラインモードでは使用できません"
-
-#: command.c:3319 command.c:3385
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: インターバル値が2回以上指定されました"
 
-#: command.c:3329 command.c:3395
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: 不正なインターバル値 \"%s\""
 
-#: command.c:3339
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: 反復回数が2回以上指定されました"
 
-#: command.c:3349
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: 不正な反復回数 '%s'"
 
-#: command.c:3359
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: 詐称行数が2回以上指定されました"
 
-#: command.c:3369
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: 不正な最小行数 \"%s\""
 
-#: command.c:3376
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: 認識できないパラーメータ \"%s\""
 
-#: command.c:3782 startup.c:248 startup.c:298
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "パスワード： "
 
-#: command.c:3787 startup.c:295
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "ユーザー %s のパスワード: "
 
-#: command.c:3843
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "接続文字列使用時はユーザー、ホストおよびポートは個別に指定しないでください"
 
-#: command.c:3878
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "パラメータ再利用に使用可能なデータベース接続がありません"
 
-#: command.c:4185
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "以前の接続は保持されています"
 
-#: command.c:4191
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:4247
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "データベース\"%s\"にユーザー\"%s\"として、ホスト\"%s\"のポート\"%s\"で接続しました。\n"
 
-#: command.c:4250
+#: command.c:4343
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "データベース\"%s\"にユーザー\"%s\"として、ソケット\"%s\"のポート\"%s\"を介して接続しました。\n"
 
-#: command.c:4256
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "データベース\"%s\"にユーザー\"%s\"として、ホスト\"%s\"(アドレス\"%s\")のポート\"%s\"で接続しました。\n"
 
-#: command.c:4259
+#: command.c:4352
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "データベース\"%s\"にユーザー\"%s\"として、ホスト\"%s\"のポート\"%s\"を介して接続しました。\n"
 
-#: command.c:4264
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "データベース\"%s\"にユーザー\"%s\"として接続しました。\n"
 
-#: command.c:4370
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s、サーバー %s)\n"
 
-#: command.c:4383
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -609,25 +609,25 @@ msgstr ""
 "警告： %s のメジャーバージョンは %s ですが、サーバーのメジャーバージョンは %s です。\n"
 "         psql の機能の中で、動作しないものがあるかもしれません。\n"
 
-#: command.c:4422
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL接続(プロトコル: %s、暗号化方式: %s、圧縮: %s、ALPN: %s)\n"
 
-#: command.c:4425 help.c:39
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "オフ"
 
-#: command.c:4425 help.c:39
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "オン"
 
-#: command.c:4440
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "GSSAPI暗号化接続\n"
 
-#: command.c:4460
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -638,283 +638,283 @@ msgstr ""
 "      8ビット文字が正しく表示されない可能性があります。詳細はpsqlリファレンスマニュアルの\n"
 "      \"Windowsユーザー向けの注意\" (Notes for Windows users)を参照してください。\n"
 
-#: command.c:4569
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "環境変数PSQL_EDITOR_LINENUMBER_ARGで行番号を指定する必要があります"
 
-#: command.c:4599
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "エディタ\"%s\"を起動できませんでした"
 
-#: command.c:4601
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "/bin/shを起動できませんでした"
 
-#: command.c:4651
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "一時ディレクトリが見つかりませんでした: %s"
 
-#: command.c:4678
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "一時ファイル\"%s\"をオープンできませんでした: %m"
 
-#: command.c:5014
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: 曖昧な短縮形\"%s\"が\"%s\"と\"%s\"のどちらにも合致します"
 
-#: command.c:5034
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: 有効なフォーマットはaligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:5053
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: 有効な線のスタイルは ascii, old-ascii, unicode"
 
-#: command.c:5068
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: 有効な Unicode 罫線のスタイルは single, double"
 
-#: command.c:5083
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: 有効な Unicode 列罫線のスタイルは single, double"
 
-#: command.c:5098
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: 有効な Unicode ヘッダー罫線のスタイルは single, double"
 
-#: command.c:5150
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: xheader_widthに指定可能な値は、\"%s\" (default)、\"%s\"、\"%s\"、または幅そのものを指定する数値です"
 
-#: command.c:5167
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsepは単一の1バイト文字でなければなりません"
 
-#: command.c:5172
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldsepはダブルクォート、改行(LF)または復帰(CR)にはできません"
 
-#: command.c:5310 command.c:5511
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: 未定義のオプション：%s"
 
-#: command.c:5330
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "罫線スタイルは %d です。\n"
 
-#: command.c:5336
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "ターゲットの幅が設定されていません。\n"
 
-#: command.c:5338
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "ターゲットの幅は %d です。\n"
 
-#: command.c:5345
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "拡張表示は on です。\n"
 
-#: command.c:5347
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "拡張表示が自動的に使われます。\n"
 
-#: command.c:5349
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "拡張表示は off です。\n"
 
-#: command.c:5356 command.c:5358 command.c:5360
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "拡張表示ヘッダ幅は\"%s\"です。\n"
 
-#: command.c:5362
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "拡張表示ヘッダ幅は%dです。\n"
 
-#: command.c:5368
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "CSVのフィールド区切り文字は\"%s\"です。\n"
 
-#: command.c:5376 command.c:5384
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "フィールド区切り文字はゼロバイトです。\n"
 
-#: command.c:5378
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "フィールド区切り文字は\"%s\"です。\n"
 
-#: command.c:5391
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "デフォルトフッター(行数の表示)は on です。\n"
 
-#: command.c:5393
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "デフォルトフッター(行数の表示)は off です。\n"
 
-#: command.c:5399
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "出力形式は %s です。\n"
 
-#: command.c:5405
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "線のスタイルは %s です。\n"
 
-#: command.c:5412
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null表示は\"%s\"です。\n"
 
-#: command.c:5420
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "『数値出力時のロケール調整』は on です。\n"
 
-#: command.c:5422
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "『数値出力時のロケール調整』は off です。\n"
 
-#: command.c:5429
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "表示が縦に長くなる場合はページャーを使います。\n"
 
-#: command.c:5431
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "常にページャーを使います。\n"
 
-#: command.c:5433
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "「ページャーを使う」は off です。\n"
 
-#: command.c:5439
+#: command.c:5537
 #, 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] "%d 行未満の場合、ページャーは使われません。\n"
 
-#: command.c:5449 command.c:5459
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "レコードの区切り文字はゼロバイトです\n"
 
-#: command.c:5451
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "レコード区切り文字は<newline>です。\n"
 
-#: command.c:5453
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "レコード区切り記号は\"%s\"です。\n"
 
-#: command.c:5466
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "テーブル属性は\"%s\"です。\n"
 
-#: command.c:5469
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "テーブル属性は設定されていません。\n"
 
-#: command.c:5476
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "タイトルは\"%s\"です。\n"
 
-#: command.c:5478
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "タイトルは設定されていません。\n"
 
-#: command.c:5485
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "「タプルのみ表示」は on です。\n"
 
-#: command.c:5487
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "「タプルのみ表示」は off です。\n"
 
-#: command.c:5493
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Unicode の罫線スタイルは\"%s\"です。\n"
 
-#: command.c:5499
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Unicode 行罫線のスタイルは\"%s\"です。\n"
 
-#: command.c:5505
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Unicodeヘッダー行のスタイルは\"%s\"です。\n"
 
-#: command.c:5754
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: 失敗"
 
-#: command.c:5792
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watchは空の問い合わせでは使えません"
 
-#: command.c:5824
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "タイマーを設定できません: %m"
 
-#: command.c:5893
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (%g 秒毎)\n"
 
-#: command.c:5896
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (%g 秒毎)\n"
 
-#: command.c:5960
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "シグナルを待機できませんでした: %m"
 
-#: command.c:6016 command.c:6023 common.c:667 common.c:674 common.c:1159
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -927,12 +927,12 @@ msgstr ""
 "/************************/\n"
 "\n"
 
-#: command.c:6202
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\"はビューではありません"
 
-#: command.c:6218
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "reloptions配列をパースできませんでした"
@@ -992,7 +992,7 @@ msgstr "時間: %.3f ミリ秒 (%02d:%02d:%06.3f)\n"
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "時間: %.3f ミリ秒 (%.0f 日 %02d:%02d:%06.3f)\n"
 
-#: common.c:661 common.c:718 common.c:1130 describe.c:6370
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "現在データベースに接続していません。"
@@ -1048,14 +1048,14 @@ msgstr "文:  %s"
 msgid "unexpected transaction status (%d)"
 msgstr "想定外のトランザクション状態(%d)"
 
-#: common.c:1398 describe.c:2063
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "列"
 
-#: common.c:1399 describe.c:176 describe.c:362 describe.c:380 describe.c:1081
-#: describe.c:1243 describe.c:1773 describe.c:1797 describe.c:2064
-#: describe.c:4057 describe.c:4321 describe.c:4568 describe.c:4728
-#: describe.c:6004
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "タイプ"
 
@@ -1064,21 +1064,26 @@ msgstr "タイプ"
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "このコマンドは結果を返却しないか、結果にカラムが含まれません。\n"
 
-#: common.c:1653
+#: common.c:1670
 #, c-format
 msgid "No pending results to get"
 msgstr "取得すべき保留中の結果はありません"
 
-#: common.c:1731
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "チャンクモードでの結果の取得に失敗しました"
 
-#: common.c:1780
+#: common.c:1797
 #, c-format
 msgid "Pipeline aborted, command did not run"
 msgstr "パイプラインが中断され、コマンドは実行されませんでした"
 
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "パイプライン中のCOPYはサポートされていません、接続を中断します"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1184,40 +1189,40 @@ msgstr "\\crosstabview: 列名があいまいです: \"%s\""
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: 列名が見つかりませんでした: \"%s\""
 
-#: describe.c:94 describe.c:342 describe.c:649 describe.c:826 describe.c:1073
-#: describe.c:1230 describe.c:1306 describe.c:4046 describe.c:4308
-#: describe.c:4566 describe.c:4647 describe.c:4879 describe.c:5091
-#: describe.c:5340 describe.c:5581 describe.c:5650 describe.c:5661
-#: describe.c:5717 describe.c:6116 describe.c:6196
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "スキーマ"
 
-#: describe.c:95 describe.c:173 describe.c:234 describe.c:343 describe.c:650
-#: describe.c:827 describe.c:958 describe.c:1074 describe.c:1307
-#: describe.c:4047 describe.c:4309 describe.c:4483 describe.c:4567
-#: describe.c:4648 describe.c:4809 describe.c:4880 describe.c:5092
-#: describe.c:5213 describe.c:5341 describe.c:5582 describe.c:5651
-#: describe.c:5662 describe.c:5718 describe.c:5915 describe.c:5985
-#: describe.c:6193 describe.c:6421 describe.c:6767
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "名前"
 
-#: describe.c:96 describe.c:355 describe.c:373
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "結果のデータ型"
 
-#: describe.c:97 describe.c:356 describe.c:374
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "引数のデータ型"
 
-#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:432
-#: describe.c:681 describe.c:846 describe.c:1010 describe.c:1309
-#: describe.c:2084 describe.c:3773 describe.c:4105 describe.c:4362
-#: describe.c:4507 describe.c:4580 describe.c:4657 describe.c:4822
-#: describe.c:5004 describe.c:5150 describe.c:5222 describe.c:5342
-#: describe.c:5492 describe.c:5533 describe.c:5598 describe.c:5654
-#: describe.c:5663 describe.c:5719 describe.c:5933 describe.c:6007
-#: describe.c:6130 describe.c:6197 describe.c:7303
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "説明"
 
@@ -1234,11 +1239,11 @@ msgstr "このサーバー(バージョン%s)はアクセスメソッドをサ
 msgid "Index"
 msgstr "インデックス"
 
-#: describe.c:175 describe.c:4065 describe.c:4334 describe.c:6117
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "テーブル"
 
-#: describe.c:183 describe.c:5917
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "ハンドラ"
 
@@ -1246,11 +1251,11 @@ msgstr "ハンドラ"
 msgid "List of access methods"
 msgstr "アクセスメソッド一覧"
 
-#: describe.c:235 describe.c:415 describe.c:674 describe.c:959 describe.c:1229
-#: describe.c:4058 describe.c:4310 describe.c:4484 describe.c:4811
-#: describe.c:5214 describe.c:5916 describe.c:5986 describe.c:6422
-#: describe.c:6643 describe.c:6768 describe.c:6938 describe.c:7023
-#: describe.c:7291
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "所有者"
 
@@ -1258,7 +1263,7 @@ msgstr "所有者"
 msgid "Location"
 msgstr "場所"
 
-#: describe.c:247 describe.c:672 describe.c:1008 describe.c:4104
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "サイズ"
 
@@ -1266,1169 +1271,1169 @@ msgstr "サイズ"
 msgid "List of tablespaces"
 msgstr "テーブル空間一覧"
 
-#: describe.c:315
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwSx+] as options"
-msgstr "\\dfで指定できるオプションは [anptwSx+] のみです"
+msgid "\\df only takes [%s] as options"
+msgstr "\\dfで指定できるオプションは [%s] のみです"
 
-#: describe.c:323
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\dfはこのサーバーバージョン%2$sでは\"%1$c\"オプションは指定できません"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:358 describe.c:376
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "集約"
 
-#: describe.c:359 describe.c:377
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "ウィンドウ"
 
-#: describe.c:360
+#: describe.c:361
 msgid "proc"
 msgstr "プロシージャ"
 
-#: describe.c:361 describe.c:379
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "関数"
 
-#: describe.c:378 describe.c:1439
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "トリガー"
 
-#: describe.c:393
+#: describe.c:394
 msgid "immutable"
 msgstr "IMMUTABLE"
 
-#: describe.c:394
+#: describe.c:395
 msgid "stable"
 msgstr "STABLE"
 
-#: describe.c:395
+#: describe.c:396
 msgid "volatile"
 msgstr "VOLATILE"
 
-#: describe.c:396
+#: describe.c:397
 msgid "Volatility"
 msgstr "関数の変動性分類"
 
-#: describe.c:407
+#: describe.c:408
 msgid "restricted"
 msgstr "制限付き"
 
-#: describe.c:408
+#: describe.c:409
 msgid "safe"
 msgstr "安全"
 
-#: describe.c:409
+#: describe.c:410
 msgid "unsafe"
 msgstr "危険"
 
-#: describe.c:410
+#: describe.c:411
 msgid "Parallel"
 msgstr "並列実行"
 
-#: describe.c:416
+#: describe.c:417
 msgid "definer"
 msgstr "定義ロール"
 
-#: describe.c:417
+#: describe.c:418
 msgid "invoker"
 msgstr "起動ロール"
 
-#: describe.c:418
+#: describe.c:419
 msgid "Security"
 msgstr "セキュリティ"
 
-#: describe.c:419 describe.c:837 describe.c:1778 describe.c:1802
-#: describe.c:1931 describe.c:4651 describe.c:4992 describe.c:5001
-#: describe.c:5139 describe.c:5144 describe.c:6926 describe.c:7125
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
 msgid "yes"
 msgstr "はい"
 
-#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
-#: describe.c:1932 describe.c:4651 describe.c:4989 describe.c:5002
-#: describe.c:5139 describe.c:6927 describe.c:7126
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
 msgid "no"
 msgstr "いいえ"
 
-#: describe.c:421 describe.c:839 describe.c:5003 describe.c:7127
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
 msgid "Leakproof?"
 msgstr "無漏洩?"
 
-#: describe.c:426
+#: describe.c:427
 msgid "Language"
 msgstr "手続き言語"
 
-#: describe.c:429 describe.c:671
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "内部名"
 
-#: describe.c:608
+#: describe.c:609
 msgid "List of functions"
 msgstr "関数一覧"
 
-#: describe.c:673
+#: describe.c:674
 msgid "Elements"
 msgstr "構成要素"
 
-#: describe.c:724
+#: describe.c:725
 msgid "List of data types"
 msgstr "データ型一覧"
 
-#: describe.c:828
+#: describe.c:829
 msgid "Left arg type"
 msgstr "左辺の型"
 
-#: describe.c:829
+#: describe.c:830
 msgid "Right arg type"
 msgstr "右辺の型"
 
-#: describe.c:830
+#: describe.c:831
 msgid "Result type"
 msgstr "結果の型"
 
-#: describe.c:836 describe.c:4817 describe.c:4981 describe.c:5491
-#: describe.c:7221 describe.c:7225
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "関数"
 
-#: describe.c:923
+#: describe.c:924
 msgid "List of operators"
 msgstr "演算子一覧"
 
-#: describe.c:960
+#: describe.c:961
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: describe.c:968 describe.c:972
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "ロケールプロバイダー"
 
-#: describe.c:976 describe.c:5111
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "照合順序"
 
-#: describe.c:977 describe.c:5112
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype(変換演算子)"
 
-#: describe.c:981 describe.c:985 describe.c:989 describe.c:5117 describe.c:5121
-#: describe.c:5125
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "ロケール"
 
-#: describe.c:993 describe.c:997 describe.c:5130 describe.c:5134
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "ICUルール:"
 
-#: describe.c:1009
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "テーブル空間"
 
-#: describe.c:1034
+#: describe.c:1035
 msgid "List of databases"
 msgstr "データベース一覧"
 
-#: describe.c:1075 describe.c:1232 describe.c:4048
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "テーブル"
 
-#: describe.c:1076 describe.c:4049
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "ビュー"
 
-#: describe.c:1077 describe.c:4050
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "実体化ビュー"
 
-#: describe.c:1078 describe.c:1234 describe.c:4052
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "シーケンス"
 
-#: describe.c:1079 describe.c:4054
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "外部テーブル"
 
-#: describe.c:1080 describe.c:4055 describe.c:4319
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "パーティションテーブル"
 
-#: describe.c:1096
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "列の権限"
 
-#: describe.c:1127 describe.c:1161
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "ポリシー"
 
-#: describe.c:1189 describe.c:4734 describe.c:6883
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "アクセス権限"
 
-#: describe.c:1236
+#: describe.c:1237
 msgid "function"
 msgstr "関数"
 
-#: describe.c:1238
+#: describe.c:1239
 msgid "type"
 msgstr "型"
 
-#: describe.c:1240
+#: describe.c:1241
 msgid "schema"
 msgstr "スキーマ"
 
-#: describe.c:1242
+#: describe.c:1243
 msgid "large object"
 msgstr "ラージオブジェクト"
 
-#: describe.c:1264
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "デフォルトのアクセス権限"
 
-#: describe.c:1308
+#: describe.c:1309
 msgid "Object"
 msgstr "オブジェクト"
 
-#: describe.c:1322
+#: describe.c:1323
 msgid "table constraint"
 msgstr "テーブル制約"
 
-#: describe.c:1346
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "ドメイン制約"
 
-#: describe.c:1370
+#: describe.c:1371
 msgid "operator class"
 msgstr "演算子クラス"
 
-#: describe.c:1394
+#: describe.c:1395
 msgid "operator family"
 msgstr "演算子族"
 
-#: describe.c:1417
+#: describe.c:1418
 msgid "rule"
 msgstr "ルール"
 
-#: describe.c:1462
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "オブジェクトの説明"
 
-#: describe.c:1527
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "\"%s\"という名前のリレーションは見つかりませんでした。"
 
-#: describe.c:1530 describe.c:4206
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "リレーションが見つかりませんでした。"
 
-#: describe.c:1726
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "OID %sを持つリレーションが見つかりませんでした。"
 
-#: describe.c:1774 describe.c:1798
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "開始"
 
-#: describe.c:1775 describe.c:1799
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "最小"
 
-#: describe.c:1776 describe.c:1800
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "最大"
 
-#: describe.c:1777 describe.c:1801
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "増分"
 
-#: describe.c:1780 describe.c:1804
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "循環？"
 
-#: describe.c:1781 describe.c:1805
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "キャッシュ"
 
-#: describe.c:1846
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "所有者: %s"
 
-#: describe.c:1850
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "識別列のシーケンス: %s"
 
-#: describe.c:1858
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "ログ出力なしのシーケンス\"%s.%s\""
 
-#: describe.c:1861
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "シーケンス \"%s.%s\""
 
-#: describe.c:2004
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "ログ出力なしのテーブル\"%s.%s\""
 
-#: describe.c:2007
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "テーブル\"%s.%s\""
 
-#: describe.c:2011
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "ビュー\"%s.%s\""
 
-#: describe.c:2015
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "実体化ビュー\"%s.%s\""
 
-#: describe.c:2020
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "ログ出力なしのインデックス\"%s.%s\""
 
-#: describe.c:2023
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "インデックス\"%s.%s\""
 
-#: describe.c:2028
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "ログ出力なしのパーティション親インデックス\"%s.%s\""
 
-#: describe.c:2031
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "パーティションインデックス\"%s.%s\""
 
-#: describe.c:2035
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST テーブル\"%s.%s\""
 
-#: describe.c:2039
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "複合型\"%s.%s\""
 
-#: describe.c:2043
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "外部テーブル\"%s.%s\""
 
-#: describe.c:2048
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "ログ出力なしのパーティション親テーブル\"%s.%s\""
 
-#: describe.c:2051
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "パーティションテーブル\"%s.%s\""
 
-#: describe.c:2067 describe.c:4569
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "照合順序"
 
-#: describe.c:2068 describe.c:4570
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "Null 値を許容"
 
-#: describe.c:2069 describe.c:4571
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "デフォルト"
 
-#: describe.c:2072
+#: describe.c:2073
 msgid "Key?"
 msgstr "キー?"
 
-#: describe.c:2074 describe.c:4887 describe.c:4898
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "定義"
 
-#: describe.c:2076 describe.c:5932 describe.c:6006 describe.c:6071
-#: describe.c:6129
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "FDW オプション"
 
-#: describe.c:2078
+#: describe.c:2079
 msgid "Storage"
 msgstr "ストレージ"
 
-#: describe.c:2080
+#: describe.c:2081
 msgid "Compression"
 msgstr "圧縮"
 
-#: describe.c:2082
+#: describe.c:2083
 msgid "Stats target"
 msgstr "統計目標"
 
-#: describe.c:2224
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "親パーティション: %s %s%s"
 
-#: describe.c:2237
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "パーティション制約なし"
 
-#: describe.c:2239
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "パーティションの制約: %s"
 
-#: describe.c:2263
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "パーティションキー: %s"
 
-#: describe.c:2289
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "所属先テーブル\"%s.%s\""
 
-#: describe.c:2362
+#: describe.c:2363
 msgid "primary key, "
 msgstr "プライマリキー, "
 
-#: describe.c:2365
+#: describe.c:2366
 msgid "unique"
 msgstr "ユニーク"
 
-#: describe.c:2367
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls not distinct"
 
-#: describe.c:2368
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2375
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "テーブル\"%s.%s\"用"
 
-#: describe.c:2379
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr "、述語 (%s)"
 
-#: describe.c:2382
+#: describe.c:2383
 msgid ", clustered"
 msgstr "、クラスター化"
 
-#: describe.c:2385
+#: describe.c:2386
 msgid ", invalid"
 msgstr "無効"
 
-#: describe.c:2388
+#: describe.c:2389
 msgid ", deferrable"
 msgstr "、遅延可能"
 
-#: describe.c:2391
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr "、最初から遅延中"
 
-#: describe.c:2394
+#: describe.c:2395
 msgid ", replica identity"
 msgstr "、レプリカの id"
 
-#: describe.c:2455
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "インデックス:"
 
-#: describe.c:2543
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Check 制約:"
 
-#: describe.c:2604
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "外部キー制約:"
 
-#: describe.c:2663
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "参照元:"
 
-#: describe.c:2712
+#: describe.c:2713
 msgid "Policies:"
 msgstr "ポリシー:"
 
-#: describe.c:2715
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "ポリシー(行セキュリティを強制的に有効化):"
 
-#: describe.c:2718
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "ポリシー(行セキュリティ有効化): (なし)"
 
-#: describe.c:2721
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "ポリシー(行セキュリティを強制的に有効化): (なし)"
 
-#: describe.c:2724
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "ポリシー(行セキュリティを無効化):"
 
-#: describe.c:2784 describe.c:2889
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "統計オブジェクト:"
 
-#: describe.c:2991 describe.c:3191
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "ルール:"
 
-#: describe.c:2994
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "無効化されたルール:"
 
-#: describe.c:2997
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "常に適用するルール:"
 
-#: describe.c:3000
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "レプリカ上でのみ適用するルール:"
 
-#: describe.c:3079 describe.c:5275
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "パブリケーション:"
 
-#: describe.c:3126
+#: describe.c:3127
 msgid "Not-null constraints:"
 msgstr "非NULL制約:"
 
-#: describe.c:3140
+#: describe.c:3141
 msgid " (local, inherited)"
 msgstr "(ローカル、継承)"
 
-#: describe.c:3141
+#: describe.c:3142
 msgid " (inherited)"
 msgstr "(継承)"
 
-#: describe.c:3174
+#: describe.c:3175
 msgid "View definition:"
 msgstr "ビューの定義:"
 
-#: describe.c:3337
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "トリガー:"
 
-#: describe.c:3340
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "無効化されたユーザートリガ:"
 
-#: describe.c:3343
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "無効化された内部トリガー:"
 
-#: describe.c:3346
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "常に適用するするトリガー:"
 
-#: describe.c:3349
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "レプリカ上でのみ適用するトリガー:"
 
-#: describe.c:3420
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "サーバー: %s"
 
-#: describe.c:3428
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "FDW オプション: (%s)"
 
-#: describe.c:3449
+#: describe.c:3450
 msgid "Inherits"
 msgstr "継承元"
 
-#: describe.c:3514
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "パーティション数: %d"
 
-#: describe.c:3523
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "パーティション数: %d (\\d+ で一覧を表示)。"
 
-#: describe.c:3525
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "子テーブル数: %d (\\d+ で一覧を表示)"
 
-#: describe.c:3532
+#: describe.c:3533
 msgid "Child tables"
 msgstr "子テーブル"
 
-#: describe.c:3532
+#: describe.c:3533
 msgid "Partitions"
 msgstr "パーティション"
 
-#: describe.c:3565
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "%s 型の型付きテーブル"
 
-#: describe.c:3583
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "レプリカ識別"
 
-#: describe.c:3596
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "OID あり: はい"
 
-#: describe.c:3605
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "アクセスメソッド: %s"
 
-#: describe.c:3682
+#: describe.c:3683
 #, 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:3694
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr "、テーブル空間\"%s\""
 
-#: describe.c:3767
+#: describe.c:3768
 msgid "List of roles"
 msgstr "ロール一覧"
 
-#: describe.c:3769 describe.c:3937
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "ロール名"
 
-#: describe.c:3770
+#: describe.c:3771
 msgid "Attributes"
 msgstr "属性"
 
-#: describe.c:3781
+#: describe.c:3782
 msgid "Superuser"
 msgstr "スーパーユーザー"
 
-#: describe.c:3784
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "継承なし"
 
-#: describe.c:3787
+#: describe.c:3788
 msgid "Create role"
 msgstr "ロール作成可"
 
-#: describe.c:3790
+#: describe.c:3791
 msgid "Create DB"
 msgstr "DB作成可"
 
-#: describe.c:3793
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "ログインできません"
 
-#: describe.c:3796
+#: describe.c:3797
 msgid "Replication"
 msgstr "レプリケーション可"
 
-#: describe.c:3800
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "RLS のバイパス"
 
-#: describe.c:3809
+#: describe.c:3810
 msgid "No connections"
 msgstr "接続なし"
 
-#: describe.c:3811
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d 個の接続"
 
-#: describe.c:3821
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "パスワードの有効期限 "
 
-#: describe.c:3872
+#: describe.c:3873
 msgid "Role"
 msgstr "ロール"
 
-#: describe.c:3874
+#: describe.c:3875
 msgid "Settings"
 msgstr "設定"
 
-#: describe.c:3898
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "ロール\"%s\"とデータベース\"%s\"の設定が見つかりませんでした。"
 
-#: describe.c:3901
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "ロール\"%s\"の設定が見つかりませんでした。"
 
-#: describe.c:3904
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "設定が見つかりませんでした。"
 
-#: describe.c:3908
+#: describe.c:3909
 msgid "List of settings"
 msgstr "設定一覧"
 
-#: describe.c:3938
+#: describe.c:3939
 msgid "Member of"
 msgstr "所属グループ"
 
-#: describe.c:3955
+#: describe.c:3956
 msgid "Grantor"
 msgstr "付与者"
 
-#: describe.c:3981
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "ロール権限付与一覧"
 
-#: describe.c:4051
+#: describe.c:4052
 msgid "index"
 msgstr "インデックス"
 
-#: describe.c:4053
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST テーブル"
 
-#: describe.c:4056 describe.c:4320
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "パーティションインデックス"
 
-#: describe.c:4080
+#: describe.c:4081
 msgid "permanent"
 msgstr "永続"
 
-#: describe.c:4081
+#: describe.c:4082
 msgid "temporary"
 msgstr "一時"
 
-#: describe.c:4082
+#: describe.c:4083
 msgid "unlogged"
 msgstr "ログなし"
 
-#: describe.c:4083
+#: describe.c:4084
 msgid "Persistence"
 msgstr "永続性"
 
-#: describe.c:4099 describe.c:4343
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "アクセスメソッド"
 
-#: describe.c:4179
+#: describe.c:4180
 #, c-format
 msgid "Did not find any relations named \"%s\"."
 msgstr "\"%s\"という名前のリレーションは見つかりませんでした。"
 
-#: describe.c:4182
+#: describe.c:4183
 #, c-format
 msgid "Did not find any tables named \"%s\"."
 msgstr "\"%s\"という名前のテーブルは見つかりませんでした。"
 
-#: describe.c:4185
+#: describe.c:4186
 #, c-format
 msgid "Did not find any indexes named \"%s\"."
 msgstr "\"%s\"という名前のインデックスは見つかりませんでした。"
 
-#: describe.c:4188
+#: describe.c:4189
 #, c-format
 msgid "Did not find any views named \"%s\"."
 msgstr "\"%s\"という名前のビューは見つかりませんでした。"
 
-#: describe.c:4191
+#: describe.c:4192
 #, c-format
 msgid "Did not find any materialized views named \"%s\"."
 msgstr "\"%s\"という名前の実体化ビューは見つかりませんでした。"
 
-#: describe.c:4194
+#: describe.c:4195
 #, c-format
 msgid "Did not find any sequences named \"%s\"."
 msgstr "\"%s\"という名前のシーケンスは見つかりませんでした。"
 
-#: describe.c:4197
+#: describe.c:4198
 #, c-format
 msgid "Did not find any foreign tables named \"%s\"."
 msgstr "\"%s\"という名前の外部テーブルは見つかりませんでした。"
 
-#: describe.c:4208
+#: describe.c:4209
 #, c-format
 msgid "Did not find any tables."
 msgstr "テーブルが見つかりませんでした。"
 
-#: describe.c:4210
+#: describe.c:4211
 #, c-format
 msgid "Did not find any indexes."
 msgstr "インデックスが見つかりませんでした。"
 
-#: describe.c:4212
+#: describe.c:4213
 #, c-format
 msgid "Did not find any views."
 msgstr "ビューが見つかりませんでした。"
 
-#: describe.c:4214
+#: describe.c:4215
 #, c-format
 msgid "Did not find any materialized views."
 msgstr "実体化ビューが見つかりませんでした。"
 
-#: describe.c:4216
+#: describe.c:4217
 #, c-format
 msgid "Did not find any sequences."
 msgstr "シーケンスが見つかりませんでした。"
 
-#: describe.c:4218
+#: describe.c:4219
 #, c-format
 msgid "Did not find any foreign tables."
 msgstr "外部テーブルが見つかりませんでした。"
 
-#: describe.c:4226
+#: describe.c:4227
 msgid "List of relations"
 msgstr "リレーション一覧"
 
-#: describe.c:4227
+#: describe.c:4228
 msgid "List of tables"
 msgstr "テーブル一覧"
 
-#: describe.c:4228
+#: describe.c:4229
 msgid "List of indexes"
 msgstr "インデックス一覧"
 
-#: describe.c:4229
+#: describe.c:4230
 msgid "List of views"
 msgstr "ビュー一覧"
 
-#: describe.c:4230
+#: describe.c:4231
 msgid "List of materialized views"
 msgstr "実体化ビュー一覧"
 
-#: describe.c:4231
+#: describe.c:4232
 msgid "List of sequences"
 msgstr "シーケンス一覧"
 
-#: describe.c:4232 describe.c:6162
+#: describe.c:4233 describe.c:6163
 msgid "List of foreign tables"
 msgstr "外部テーブル一覧"
 
-#: describe.c:4281
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "このサーバー(バージョン%s)は宣言的テーブルパーティショニングをサポートしていません。"
 
-#: describe.c:4292
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "パーティションインデックスの一覧"
 
-#: describe.c:4294
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "パーティションテーブルの一覧"
 
-#: describe.c:4298
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "パーティションリレーションの一覧"
 
-#: describe.c:4329
+#: describe.c:4330
 msgid "Parent name"
 msgstr "親の名前"
 
-#: describe.c:4349
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "末端パーティションのサイズ"
 
-#: describe.c:4352 describe.c:4358
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "トータルサイズ"
 
-#: describe.c:4485
+#: describe.c:4486
 msgid "Trusted"
 msgstr "信頼済み"
 
-#: describe.c:4494
+#: describe.c:4495
 msgid "Internal language"
 msgstr "内部言語"
 
-#: describe.c:4495
+#: describe.c:4496
 msgid "Call handler"
 msgstr "呼び出しハンドラー"
 
-#: describe.c:4496 describe.c:5918
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "バリデーター"
 
-#: describe.c:4497
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "インラインハンドラー"
 
-#: describe.c:4531
+#: describe.c:4532
 msgid "List of languages"
 msgstr "手続き言語一覧"
 
-#: describe.c:4572
+#: describe.c:4573
 msgid "Check"
 msgstr "CHECK制約"
 
-#: describe.c:4615
+#: describe.c:4616
 msgid "List of domains"
 msgstr "ドメイン一覧"
 
-#: describe.c:4649
+#: describe.c:4650
 msgid "Source"
 msgstr "変換元"
 
-#: describe.c:4650
+#: describe.c:4651
 msgid "Destination"
 msgstr "変換先"
 
-#: describe.c:4652 describe.c:6928
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "デフォルト?"
 
-#: describe.c:4693
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "符号化方式一覧"
 
-#: describe.c:4729
+#: describe.c:4730
 msgid "Context"
 msgstr "コンテクスト"
 
-#: describe.c:4761
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "設定パラメータの一覧"
 
-#: describe.c:4763
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "非デフォルトの設定パラメータの一覧"
 
-#: describe.c:4790
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "このサーバー(バージョン%s)はイベントトリガーをサポートしていません。"
 
-#: describe.c:4810
+#: describe.c:4811
 msgid "Event"
 msgstr "イベント"
 
-#: describe.c:4812
+#: describe.c:4813
 msgid "enabled"
 msgstr "有効"
 
-#: describe.c:4813
+#: describe.c:4814
 msgid "replica"
 msgstr "レプリカ"
 
-#: describe.c:4814
+#: describe.c:4815
 msgid "always"
 msgstr "常時"
 
-#: describe.c:4815
+#: describe.c:4816
 msgid "disabled"
 msgstr "無効"
 
-#: describe.c:4816 describe.c:6769
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "有効状態"
 
-#: describe.c:4818
+#: describe.c:4819
 msgid "Tags"
 msgstr "タグ"
 
-#: describe.c:4841
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "イベントトリガー一覧"
 
-#: describe.c:4868
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "このサーバー(バージョン%s)は拡張統計情報をサポートしていません。"
 
-#: describe.c:4905
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4906
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Dependencies"
 
-#: describe.c:4916
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4939
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "拡張統計情報の一覧"
 
-#: describe.c:4966
+#: describe.c:4967
 msgid "Source type"
 msgstr "変換元の型"
 
-#: describe.c:4967
+#: describe.c:4968
 msgid "Target type"
 msgstr "変換先の型"
 
-#: describe.c:4991
+#: describe.c:4992
 msgid "in assignment"
 msgstr "代入時のみ"
 
-#: describe.c:4993
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "暗黙的に適用 ?"
 
-#: describe.c:5057
+#: describe.c:5058
 msgid "List of casts"
 msgstr "キャスト一覧"
 
-#: describe.c:5102 describe.c:5106
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: describe.c:5140 describe.c:5145
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "確定的?"
 
-#: describe.c:5184
+#: describe.c:5185
 msgid "List of collations"
 msgstr "照合順序一覧"
 
-#: describe.c:5245
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "スキーマ一覧"
 
-#: describe.c:5361
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "テキスト検索用パーサ一覧"
 
-#: describe.c:5411
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "テキスト検索用パーサ\"%s\"が見つかりませんでした。"
 
-#: describe.c:5414
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "テキスト検索パーサが見つかりませんでした。"
 
-#: describe.c:5489
+#: describe.c:5490
 msgid "Start parse"
 msgstr "パース開始"
 
-#: describe.c:5490
+#: describe.c:5491
 msgid "Method"
 msgstr "メソッド"
 
-#: describe.c:5494
+#: describe.c:5495
 msgid "Get next token"
 msgstr "次のトークンを取得"
 
-#: describe.c:5496
+#: describe.c:5497
 msgid "End parse"
 msgstr "パース終了"
 
-#: describe.c:5498
+#: describe.c:5499
 msgid "Get headline"
 msgstr "見出しを取得"
 
-#: describe.c:5500
+#: describe.c:5501
 msgid "Get token types"
 msgstr "トークンタイプを取得"
 
-#: describe.c:5510
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "テキスト検索パーサ\"%s.%s\""
 
-#: describe.c:5513
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "テキスト検索パーサ\"%s\""
 
-#: describe.c:5532
+#: describe.c:5533
 msgid "Token name"
 msgstr "トークン名"
 
-#: describe.c:5545
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "パーサ\"%s.%s\"のトークンタイプ"
 
-#: describe.c:5548
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "パーサ\"%s\"のトークンタイプ"
 
-#: describe.c:5592
+#: describe.c:5593
 msgid "Template"
 msgstr "テンプレート"
 
-#: describe.c:5593
+#: describe.c:5594
 msgid "Init options"
 msgstr "初期化オプション"
 
-#: describe.c:5619
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "テキスト検索用辞書一覧"
 
-#: describe.c:5652
+#: describe.c:5653
 msgid "Init"
 msgstr "初期化"
 
-#: describe.c:5653
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Lex 処理"
 
-#: describe.c:5684
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "テキスト検索テンプレート一覧"
 
-#: describe.c:5738
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "テキスト検索設定一覧"
 
-#: describe.c:5789
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "テキスト検索用設定\"%s\"が見つかりませんでした。"
 
-#: describe.c:5792
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "テキスト検索設定が見つかりませんでした。"
 
-#: describe.c:5858
+#: describe.c:5859
 msgid "Token"
 msgstr "トークン"
 
-#: describe.c:5859
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "辞書"
 
-#: describe.c:5870
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "テキスト検索設定\"%s.%s\""
 
-#: describe.c:5873
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "テキスト検索設定\"%s\""
 
-#: describe.c:5877
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2437,7 +2442,7 @@ msgstr ""
 "\n"
 "パーサ: \"%s.%s\""
 
-#: describe.c:5880
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2446,273 +2451,273 @@ msgstr ""
 "\n"
 "パーサ: \"%s\""
 
-#: describe.c:5959
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "外部データラッパ一覧"
 
-#: describe.c:5987
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "外部データラッパ"
 
-#: describe.c:6005 describe.c:6194
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "バージョン"
 
-#: describe.c:6035
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "外部サーバー一覧"
 
-#: describe.c:6060 describe.c:6118
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "サーバー"
 
-#: describe.c:6061
+#: describe.c:6062
 msgid "User name"
 msgstr "ユーザー名"
 
-#: describe.c:6090
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "ユーザーマッピング一覧"
 
-#: describe.c:6195
+#: describe.c:6196
 msgid "Default version"
 msgstr "デフォルトバージョン"
 
-#: describe.c:6216
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "インストール済みの拡張一覧"
 
-#: describe.c:6264
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "\"%s\"という名前の機能拡張が見つかりませんでした。"
 
-#: describe.c:6267
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "機能拡張が見つかりませんでした。"
 
-#: describe.c:6311
+#: describe.c:6312
 msgid "Object description"
 msgstr "オブジェクトの説明"
 
-#: describe.c:6320
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "機能拡張\"%s\"内のオブジェクト"
 
-#: describe.c:6361
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "修飾名が不適切です(ドット区切りの名前が多すぎます): %s"
 
-#: describe.c:6375
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "データベース間の参照は実装されていません: %s"
 
-#: describe.c:6406 describe.c:6542
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "このサーバー(バージョン%s)はパブリケーションをサポートしていません。"
 
-#: describe.c:6423 describe.c:6644
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "全テーブル"
 
-#: describe.c:6424 describe.c:6645
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Insert文"
 
-#: describe.c:6425 describe.c:6646
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Update文"
 
-#: describe.c:6426 describe.c:6647
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Delete文"
 
-#: describe.c:6430 describe.c:6649
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Truncate文"
 
-#: describe.c:6439 describe.c:6573 describe.c:6651
+#: describe.c:6440 describe.c:6574 describe.c:6652
 msgid "Generated columns"
 msgstr "生成列"
 
-#: describe.c:6443 describe.c:6653
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "最上位パーティションテーブル経由"
 
-#: describe.c:6464
+#: describe.c:6465
 msgid "List of publications"
 msgstr "パブリケーション一覧"
 
-#: describe.c:6611
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "\"%s\"という名前のパブリケーションが見つかりませんでした。"
 
-#: describe.c:6614
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "パブリケーションが見つかりませんでした。"
 
-#: describe.c:6640
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "パブリケーション %s"
 
-#: describe.c:6697
+#: describe.c:6698
 msgid "Tables:"
 msgstr "テーブル:"
 
-#: describe.c:6709
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "以下のスキーマ内のテーブル:"
 
-#: describe.c:6754
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "このサーバー(バージョン%s)はサブスクリプションをサポートしていません。"
 
-#: describe.c:6770
+#: describe.c:6771
 msgid "Publication"
 msgstr "パブリケーション"
 
-#: describe.c:6779
+#: describe.c:6780
 msgid "Binary"
 msgstr "バイナリ"
 
-#: describe.c:6788 describe.c:6792
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "ストリーミング"
 
-#: describe.c:6800
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "2相コミット"
 
-#: describe.c:6801
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "エラー時無効化"
 
-#: describe.c:6808
+#: describe.c:6809
 msgid "Origin"
 msgstr "起点"
 
-#: describe.c:6809
+#: describe.c:6810
 msgid "Password required"
 msgstr "パスワード必須"
 
-#: describe.c:6810
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "所有者として実行?"
 
-#: describe.c:6815
+#: describe.c:6816
 msgid "Failover"
 msgstr "フェイルオーバー"
 
-#: describe.c:6820
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "同期コミット"
 
-#: describe.c:6821
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "接続情報"
 
-#: describe.c:6827
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "スキップLSN"
 
-#: describe.c:6853
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "サブスクリプション一覧"
 
-#: describe.c:6882
+#: describe.c:6883
 msgid "(none)"
 msgstr "(権限なし)"
 
-#: describe.c:6922 describe.c:7017 describe.c:7109 describe.c:7212
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6923
+#: describe.c:6924
 msgid "Input type"
 msgstr "入力の型"
 
-#: describe.c:6924
+#: describe.c:6925
 msgid "Storage type"
 msgstr "ストレージタイプ"
 
-#: describe.c:6925
+#: describe.c:6926
 msgid "Operator class"
 msgstr "演算子クラス"
 
-#: describe.c:6937 describe.c:7018 describe.c:7110 describe.c:7213
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "演算子族"
 
-#: describe.c:6972
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "演算子クラス一覧"
 
-#: describe.c:7019
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "適用可能型"
 
-#: describe.c:7060
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "演算子族一覧"
 
-#: describe.c:7111
+#: describe.c:7112
 msgid "Operator"
 msgstr "演算子"
 
-#: describe.c:7112
+#: describe.c:7113
 msgid "Strategy"
 msgstr "ストラテジ"
 
-#: describe.c:7113
+#: describe.c:7114
 msgid "ordering"
 msgstr "順序付け"
 
-#: describe.c:7114
+#: describe.c:7115
 msgid "search"
 msgstr "検索"
 
-#: describe.c:7115
+#: describe.c:7116
 msgid "Purpose"
 msgstr "目的"
 
-#: describe.c:7124
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "ソート演算子族"
 
-#: describe.c:7167
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "演算子族の演算子一覧"
 
-#: describe.c:7214
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "登録左辺型"
 
-#: describe.c:7215
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "登録右辺型"
 
-#: describe.c:7216
+#: describe.c:7217
 msgid "Number"
 msgstr "番号"
 
-#: describe.c:7259
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "演算子族のサポート関数一覧"
 
-#: describe.c:7290
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7310
+#: describe.c:7311
 msgid "Large objects"
 msgstr "ラージ オブジェクト"
 
@@ -2724,7 +2729,7 @@ msgstr ""
 "psql は PostgreSQL の対話型ターミナルです。\n"
 "\n"
 
-#: help.c:61 help.c:381 help.c:467 help.c:513
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "使い方:\n"
 
@@ -2973,46 +2978,18 @@ msgid "General\n"
 msgstr "一般\n"
 
 #: help.c:164
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       問い合わせパラメータを設定\n"
-
-#: help.c:165
-msgid ""
-"  \\bind_named STMT_NAME [PARAM]...\n"
-"                         set query parameters for an existing prepared statement\n"
-msgstr ""
-"  \\bind_named STMT_NAME [PARAM]...\n"
-"                         既存の準備済みの文にパラメータを設定する\n"
-
-#: help.c:167
-msgid "  \\close STMT_NAME       close an existing prepared statement\n"
-msgstr "  \\close STMT_NAME       準備済みの文をクローズする\n"
-
-#: help.c:168
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             PostgreSQL の使い方と配布条件を表示\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr "  \\crosstabview [列リスト] 問い合わせを実行し、結果をクロス表形式で出力\n"
 
-#: help.c:170
-msgid "  \\endpipeline           exit pipeline mode\n"
-msgstr "  \\endpipeline           パイプラインモードを終了\n"
-
-#: help.c:171
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose            最後のエラーメッセージを最大の冗長性で表示\n"
 
-#: help.c:172
-msgid "  \\flush                 push unsent data to the server\n"
-msgstr "  \\flush                 未送信のデータをサーバーへ送信\n"
-
-#: help.c:173
-msgid "  \\flushrequest          send a flushrequest command\n"
-msgstr "  \\flushrequest          flushrequestコマンドを送信\n"
-
-#: help.c:174
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -3020,51 +2997,43 @@ msgstr ""
 "  \\g [(OPTIONS)] [FILE]  問い合わせ実行 (結果はファイルまたは |パイプへ出力);\n"
 "                         引数なしの\\gはセミコロンと同義\n"
 
-#: help.c:176
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc                 問い合わせを実行せずに結果の形式を出力する\n"
 
-#: help.c:177
-msgid ""
-"  \\getresults [NUM_RES]  read NUM_RES pending results. All pending results are\n"
-"                         read if no argument is provided\n"
-msgstr ""
-"  \\getresults [結果数]   指定した \"結果数\" 分の未取得の結果を読み取る。\n"
-"                         引数なしの場合、すべての未取得の結果を読み取る\n"
-
-#: help.c:179
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec                 問い合わせを実行し、結果の中の個々の値を実行\n"
 
-#: help.c:180
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [PREFIX]         問い合わせを実行して結果を psql 変数に格納\n"
 
-#: help.c:181
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr "  \\gx [ファイル名]       \\g と同じ、ただし拡張出力モードを強制\n"
 
-#: help.c:182
-msgid "  \\parse STMT_NAME       create a prepared statement\n"
-msgstr "  \\parse STMT_NAME       準備済みの文を作成\n"
-
-#: help.c:183
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     psql を終了する\n"
 
-#: help.c:184
-msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
-msgstr "  \\sendpipeline          実行中のパイプラインに拡張問い合わせを送出\n"
-
-#: help.c:185
-msgid "  \\startpipeline         enter pipeline mode\n"
-msgstr "  \\startpipeline         パイプラインモードを開始\n"
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict RESTRICT_KEY\n"
+"                         指定のキーで制限モードを開始する\n"
 
-#: help.c:186
-msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
-msgstr "  \\syncpipeline          実行中のパイプラインに同期ポイントを追加\n"
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         キーが一致していれば制限モードを終了する\n"
 
-#: help.c:187
+#: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
 "                         execute query every SEC seconds, up to N times,\n"
@@ -3074,214 +3043,214 @@ msgstr ""
 "                         SEC秒ごとに最大N回まで分を実行。返却行数がMIN行より\n"
 "                         少ない場合には停止する\n"
 
-#: help.c:190 help.c:198 help.c:210 help.c:220 help.c:227 help.c:284 help.c:292
-#: help.c:312 help.c:325 help.c:334
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
-#: help.c:192
+#: help.c:183
 msgid "Help\n"
 msgstr "ヘルプ\n"
 
-#: help.c:194
+#: help.c:185
 msgid "  \\? [commands]          show help on backslash commands\n"
 msgstr "  \\? [コマンド]          バックスラッシュコマンドのヘルプを表示\n"
 
-#: help.c:195
+#: help.c:186
 msgid "  \\? options             show help on psql command-line options\n"
 msgstr "  \\? オプション          psql のコマンドライン・オプションのヘルプを表示\n"
 
-#: help.c:196
+#: help.c:187
 msgid "  \\? variables           show help on special variables\n"
 msgstr "  \\? 変数名              特殊変数のヘルプを表示\n"
 
-#: help.c:197
+#: help.c:188
 msgid "  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"
 msgstr "  \\h [名前]              SQLコマンドの文法ヘルプの表示。* で全コマンドを表示\n"
 
-#: help.c:200
+#: help.c:191
 msgid "Query Buffer\n"
 msgstr "問い合わせバッファ\n"
 
-#: help.c:201
+#: help.c:192
 msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr ""
 "  \\e [ファイル] [行番号] 現在の問い合わせバッファ(やファイル)を外部エディタで\n"
 "                         編集\n"
 
-#: help.c:202
+#: help.c:193
 msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr "  \\ef [関数名 [行番号]]  関数定義を外部エディタで編集\n"
 
-#: help.c:203
+#: help.c:194
 msgid "  \\ev [VIEWNAME [LINE]]  edit view definition with external editor\n"
 msgstr "  \\ev [ビュー名 [行番号]] ビュー定義を外部エディタで編集\n"
 
-#: help.c:204
+#: help.c:195
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     問い合わせバッファの内容を表示\n"
 
-#: help.c:205
+#: help.c:196
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     問い合わせバッファをリセット(クリア)\n"
 
-#: help.c:207
+#: help.c:198
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [ファイル]          ヒストリを表示またはファイルに保存\n"
 
-#: help.c:209
+#: help.c:200
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w ファイル            問い合わせバッファの内容をファイルに保存\n"
 
-#: help.c:212
+#: help.c:203
 msgid "Input/Output\n"
 msgstr "入出力\n"
 
-#: help.c:213
+#: help.c:204
 msgid "  \\copy ...              perform SQL COPY with data stream to the client host\n"
 msgstr ""
 "  \\copy ...              クライアントホストに対し、データストリームを使って\n"
 "                         SQL COPYを実行\n"
 
-#: help.c:214
+#: help.c:205
 msgid "  \\echo [-n] [STRING]    write string to standard output (-n for no newline)\n"
 msgstr "  \\echo [-n] [文字列]    文字列を標準出力に書き込む (-n で改行しない)\n"
 
-#: help.c:215
+#: help.c:206
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i ファイル            ファイルからコマンドを読み込んで実行\n"
 
-#: help.c:216
+#: help.c:207
 msgid "  \\ir FILE               as \\i, but relative to location of current script\n"
 msgstr ""
 "  \\ir ファイル           \\i と同じ。ただし現在のスクリプトの場所からの相対パス\n"
 "                         で指定\n"
 
-#: help.c:217
+#: help.c:208
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr "  \\o [ファイル]          問い合わせ結果をすべてファイルまたは |パイプ へ送出\n"
 
-#: help.c:218
+#: help.c:209
 msgid "  \\qecho [-n] [STRING]   write string to \\o output stream (-n for no newline)\n"
 msgstr ""
 "  \\qecho [-n] [文字列]   文字列を\\oで指定した出力ストリームに書き込む(-n で改行\n"
 "                         しない)\n"
 
-#: help.c:219
+#: help.c:210
 msgid "  \\warn [-n] [STRING]    write string to standard error (-n for no newline)\n"
 msgstr "  \\warn [-n] [文字列]    文字列を標準エラー出力に書き込む (-n で改行しない)\n"
 
-#: help.c:222
+#: help.c:213
 msgid "Conditional\n"
 msgstr "条件分岐\n"
 
-#: help.c:223
+#: help.c:214
 msgid "  \\if EXPR               begin conditional block\n"
 msgstr "  \\if EXPR               条件分岐ブロックの開始\n"
 
-#: help.c:224
+#: help.c:215
 msgid "  \\elif EXPR             alternative within current conditional block\n"
 msgstr "  \\elif EXPR             現在の条件分岐ブロック内の選択肢\n"
 
-#: help.c:225
+#: help.c:216
 msgid "  \\else                  final alternative within current conditional block\n"
 msgstr "  \\else                  現在の条件分岐ブロックにおける最後の選択肢\n"
 
-#: help.c:226
+#: help.c:217
 msgid "  \\endif                 end conditional block\n"
 msgstr "  \\endif                 条件分岐ブロックの終了\n"
 
-#: help.c:229
+#: help.c:220
 msgid "Informational\n"
 msgstr "情報表示\n"
 
-#: help.c:230
+#: help.c:221
 msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
 msgstr "  (オプション：S = システムオブジェクトを表示、x = 拡張モード、+ = 詳細表示)\n"
 
-#: help.c:231
+#: help.c:222
 msgid "  \\d[Sx+]                list tables, views, and sequences\n"
 msgstr "  \\d[Sx+]                テーブル、ビュー、およびシーケンスの一覧を表示\n"
 
-#: help.c:232
+#: help.c:223
 msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr ""
 "  \\d[S+]   名前          テーブル、ビュー、シーケンス、またはインデックスの\n"
 "                         説明を表示\n"
 
-#: help.c:233
+#: help.c:224
 msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
 msgstr "  \\da[Sx]  [パターン]    集約関数の一覧を表示\n"
 
-#: help.c:234
+#: help.c:225
 msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
 msgstr "  \\dA[x+]  [パターン]    アクセスメソッドの一覧を表示\n"
 
-#: help.c:235
+#: help.c:226
 msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
 msgstr "  \\dAc[x+] [AMパターン [型パターン]]  演算子クラスの一覧を表示\n"
 
-#: help.c:236
+#: help.c:227
 msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
 msgstr "  \\dAf[x+] [AMパターン [型パターン]] 演算子族の一覧を表示\n"
 
-#: help.c:237
+#: help.c:228
 msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
 msgstr "  \\dAo[x+] [AMパターン [型パターン]] 演算子族の演算子の一覧を表示\n"
 
-#: help.c:238
+#: help.c:229
 msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
 msgstr "  \\dAp[x+] [AMパターン [型パターン]] 演算子族のサポート関数の一覧を表示\n"
 
-#: help.c:239
+#: help.c:230
 msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
 msgstr "  \\db[x+]  [パターン]    テーブル空間の一覧を表示\n"
 
-#: help.c:240
+#: help.c:231
 msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
 msgstr "  \\dc[Sx+] [パターン]    符号化方式間の変換の一覧を表示\n"
 
-#: help.c:241
+#: help.c:232
 msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
 msgstr "  \\dconfig[x+] [パターン] 設定パラメータの一覧を表示\n"
 
-#: help.c:242
+#: help.c:233
 msgid "  \\dC[x+]  [PATTERN]     list casts\n"
 msgstr "  \\dC[x+]  [パターン]    キャストの一覧を表示します。\n"
 
-#: help.c:243
+#: help.c:234
 msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
 msgstr "  \\dd[Sx]  [パターン]    他では表示されないオブジェクトの説明を表示\n"
 
-#: help.c:244
+#: help.c:235
 msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
 msgstr "  \\dD[Sx+] [パターン]    ドメインの一覧を表示\n"
 
-#: help.c:245
+#: help.c:236
 msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
 msgstr "  \\ddp[x]  [パターン]    デフォルト権限の一覧を表示\n"
 
-#: help.c:246
+#: help.c:237
 msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
 msgstr "  \\dE[Sx+] [パターン]    外部テーブルの一覧を表示\n"
 
-#: help.c:247
+#: help.c:238
 msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
 msgstr "  \\des[x+] [パターン]    外部サーバーの一覧を表示\n"
 
-#: help.c:248
+#: help.c:239
 msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
 msgstr "  \\det[x+] [パターン]    外部テーブルの一覧を表示\n"
 
-#: help.c:249
+#: help.c:240
 msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
 msgstr "  \\deu[x+] [パターン]    ユーザーマッピングの一覧を表示\n"
 
-#: help.c:250
+#: help.c:241
 msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
 msgstr "  \\dew[x+] [パターン]    外部データラッパの一覧を表示\n"
 
-#: help.c:251
+#: help.c:242
 msgid ""
 "  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
@@ -3290,47 +3259,47 @@ msgstr ""
 "                         [集約/通常/プロシージャ/トリガー/ウィンドウ]\n"
 "                         関数のみの一覧を表示\n"
 
-#: help.c:253
+#: help.c:244
 msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
 msgstr "  \\dF[x+]  [パターン]    テキスト検索設定の一覧を表示\n"
 
-#: help.c:254
+#: help.c:245
 msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
 msgstr "  \\dFd[x+] [パターン]    テキスト検索辞書の一覧を表示\n"
 
-#: help.c:255
+#: help.c:246
 msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
 msgstr "  \\dFp[x+] [パターン]    テキスト検索パーサの一覧を表示\n"
 
-#: help.c:256
+#: help.c:247
 msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
 msgstr "  \\dFt[x+] [パターン]    テキスト検索テンプレートの一覧を表示\n"
 
-#: help.c:257
+#: help.c:248
 msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
 msgstr "  \\dg[Sx+] [パターン]    ロールの一覧を表示\n"
 
-#: help.c:258
+#: help.c:249
 msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
 msgstr "  \\di[Sx+] [パターン]    インデックスの一覧を表示\n"
 
-#: help.c:259
+#: help.c:250
 msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
 msgstr "  \\dl[x+]                ラージオブジェクトの一覧を表示、\\lo_list と同じ\n"
 
-#: help.c:260
+#: help.c:251
 msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
 msgstr "  \\dL[Sx+] [パターン]    手続き言語の一覧を表示\n"
 
-#: help.c:261
+#: help.c:252
 msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
 msgstr "  \\dm[Sx+] [パターン]    実体化ビューの一覧を表示\n"
 
-#: help.c:262
+#: help.c:253
 msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
 msgstr "  \\dn[Sx+] [パターン]    スキーマの一覧を表示\n"
 
-#: help.c:263
+#: help.c:254
 msgid ""
 "  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
@@ -3338,98 +3307,100 @@ msgstr ""
 "  \\do[Sx+] [演算子パターン [型パターン [型パターン]]]\n"
 "                         演算子の一覧を表示\n"
 
-#: help.c:265
+#: help.c:256
 msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
 msgstr "  \\dO[Sx+] [パターン]    照合順序の一覧を表示\n"
 
-#: help.c:266
+#: help.c:257
 msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
 msgstr "  \\dp[Sx]  [パターン]    テーブル、ビュー、シーケンスのアクセス権の一覧を表示\n"
 
-#: help.c:267
+#: help.c:258
 msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
 msgstr ""
 "  \\dP[itnx+] [パターン]  パーティションリレーション[テーブル/インデックスのみ]\n"
 "                         の一覧を表示 [n=入れ子]\n"
 " \n"
 
-#: help.c:268
-msgid "  \\drds[x] [ROLEPTRN [DBPTRN]] list per-database role settings\n"
+#: help.c:259
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
 msgstr ""
 "  \\drds[x] [ロールパターン [DBパターン]]\n"
 "                         データベース毎のロール設定の一覧を表示\n"
 
-#: help.c:269
+#: help.c:261
 msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
 msgstr "  \\drg[Sx] [パターン]    ロール権限付与の一覧を表示\n"
 
-#: help.c:270
+#: help.c:262
 msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
 msgstr "  \\dRp[x+] [パターン]    レプリケーションのパブリケーションの一覧を表示\n"
 
-#: help.c:271
+#: help.c:263
 msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
 msgstr "  \\dRs[x+] [パターン]    レプリケーションのサブスクリプションの一覧を表示\n"
 
-#: help.c:272
+#: help.c:264
 msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
 msgstr "  \\ds[Sx+] [パターン]    シーケンスの一覧を表示\n"
 
-#: help.c:273
+#: help.c:265
 msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
 msgstr "  \\dt[Sx+] [パターン]    テーブルの一覧を表示\n"
 
-#: help.c:274
+#: help.c:266
 msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
 msgstr "  \\dT[Sx+] [パターン]    データ型の一覧を表示\n"
 
-#: help.c:275
+#: help.c:267
 msgid "  \\du[Sx+] [PATTERN]     list roles\n"
 msgstr "  \\du[Sx+] [パターン]    ロールの一覧を表示\n"
 
-#: help.c:276
+#: help.c:268
 msgid "  \\dv[Sx+] [PATTERN]     list views\n"
 msgstr "  \\dv[Sx+] [パターン]    ビューの一覧を表示\n"
 
-#: help.c:277
+#: help.c:269
 msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
 msgstr "  \\dx[x+]  [パターン]    機能拡張の一覧を表示\n"
 
-#: help.c:278
+#: help.c:270
 msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
 msgstr "  \\dX[x]   [パターン]    拡張統計情報の一覧を表示\n"
 
-#: help.c:279
+#: help.c:271
 msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
 msgstr "  \\dy[x+]  [パターン]    イベントトリガーの一覧を表示\n"
 
-#: help.c:280
+#: help.c:272
 msgid "  \\l[x+]   [PATTERN]     list databases\n"
 msgstr "  \\l[x+]   [パターン]    データベースの一覧を表示\n"
 
-#: help.c:281
+#: help.c:273
 msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
 msgstr "  \\sf[+]   関数名        関数の定義を表示\n"
 
-#: help.c:282
+#: help.c:274
 msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
 msgstr "  \\sv[+]   ビュー名      ビューの定義を表示\n"
 
-#: help.c:283
+#: help.c:275
 msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
 msgstr "  \\z[Sx]   [パターン]    \\dp と同じ\n"
 
-#: help.c:286
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "ラージ・オブジェクト\n"
 
-#: help.c:287
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr ""
 "  \\lo_export LOBOID ファイル名\n"
 "                         ラージ・オブエジェクトをファイルに書き込む\n"
 
-#: help.c:288
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3437,38 +3408,38 @@ msgstr ""
 "  \\lo_import ファイル名 [コメント]\n"
 "                         ラージ・オブジェクトをファイルから読み込む\n"
 
-#: help.c:290
+#: help.c:282
 msgid "  \\lo_list[x+]           list large objects\n"
 msgstr "  \\lo_list[x+]           ラージ・オブジェクトの一覧を表示\n"
 
-#: help.c:291
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      ラージ・オブジェクトを削除\n"
 
-#: help.c:294
+#: help.c:286
 msgid "Formatting\n"
 msgstr "書式設定\n"
 
-#: help.c:295
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                     非整列と整列間の出力モードの切り替え\n"
 
-#: help.c:296
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [文字列]            テーブルのタイトルを設定、値がなければ削除\n"
 
-#: help.c:297
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr ""
 "  \\f [文字列]            問い合わせ結果の非整列出力時のフィールド区切り文字を\n"
 "                         表示または設定\n"
 
-#: help.c:298
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML出力モードの切り替え (現在値: %s)\n"
 
-#: help.c:300
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3486,29 +3457,29 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:307
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            結果行のみ表示 (現在値: %s)\n"
 
-#: help.c:309
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [文字列]            HTMLの<table>タグ属性の設定、値がなければ解除\n"
 
-#: help.c:310
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       拡張出力の切り替え (現在値: %s)\n"
 
-#: help.c:311
+#: help.c:303
 msgid "auto"
 msgstr "自動(auto)"
 
-#: help.c:314
+#: help.c:306
 msgid "Connection\n"
 msgstr "接続\n"
 
-#: help.c:316
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3517,7 +3488,7 @@ msgstr ""
 "  \\c[onnect] {[DB名|- ユーザー名|- ホスト名|- ポート番号|-] | 接続文字列}\n"
 "                         新しいデータベースに接続 (現在: \"%s\")\n"
 
-#: help.c:320
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3525,64 +3496,122 @@ msgstr ""
 "  \\c[onnect] {[DB名|- ユーザー名|- ホスト名|- ポート番号|-] | 接続文字列}\n"
 "                         新しいデータベースに接続 (現在: 未接続)\n"
 
-#: help.c:322
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              現在の接続に関する情報を表示\n"
 
-#: help.c:323
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [エンコーディング] クライアントのエンコーディングを表示または設定\n"
 
-#: help.c:324
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [ユーザー名]   ユーザーのパスワードを安全に変更\n"
 
-#: help.c:327
+#: help.c:319
 msgid "Operating System\n"
 msgstr "オペレーティングシステム\n"
 
-#: help.c:328
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]              カレントディレクトリを変更\n"
 
-#: help.c:329
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr ""
 "  \\getenv psql変数 環境変数\n"
 "                         環境変数を取得\n"
 
-#: help.c:330
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv 名前 [値]      環境変数を設定または解除\n"
 
-#: help.c:331
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       コマンドの実行時間表示の切り替え (現在値: %s)\n"
 
-#: help.c:333
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr ""
 "  \\! [コマンド]          シェルでコマンドを実行するか、もしくは対話型シェルを\n"
 "                         起動します。\n"
 
-#: help.c:336
+#: help.c:328
 msgid "Variables\n"
 msgstr "変数\n"
 
-#: help.c:337
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [テキスト] 変数名  ユーザーに対して内部変数の設定を要求します\n"
 
-#: help.c:338
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [変数名 [値]]     内部変数の値を設定、パラメータがなければ一覧を表示\n"
 
-#: help.c:339
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset 変数名          内部変数を削除\n"
 
-#: help.c:378
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "拡張問い合わせプロトコル\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       問い合わせパラメータを設定\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         既存の準備済みの文にパラメータを設定する\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared ステートメント名\n"
+"                         既存の準備済みの文をクローズする\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           パイプラインモードを終了\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 出力データをサーバーへ送信\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest          サーバーに出力バッファ内容の送信を要求する\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr ""
+"  \\getresults [結果数]   指定した \"結果数\" 行の未取得の結果を読み取る。\n"
+"                         引数なしの場合、未取得の結果をすべて読み取る\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse STMT_NAME       準備済みの文を作成\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          実行中のパイプラインに拡張問い合わせを送出\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         パイプラインモードを開始\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline          実行中のパイプラインに同期ポイントを追加\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
@@ -3590,11 +3619,11 @@ msgstr ""
 "特別に扱われる変数の一覧\n"
 "\n"
 
-#: help.c:380
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "psql変数:\n"
 
-#: help.c:382
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3604,7 +3633,7 @@ msgstr ""
 "  またはpsql内で \\set 名前 値\n"
 "\n"
 
-#: help.c:384
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3612,7 +3641,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    セットされている場合、SQLコマンドが成功した際に自動的にコミット\n"
 
-#: help.c:386
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3622,7 +3651,7 @@ msgstr ""
 "    SQLキーワードの補完に使う文字ケースを指定\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:389
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3630,7 +3659,7 @@ msgstr ""
 "  DBNAME\n"
 "    現在接続中のデータベース名\n"
 
-#: help.c:391
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3640,7 +3669,7 @@ msgstr ""
 "    どの入力を標準出力への出力対象とするかを設定\n"
 "    [all, errors, none, queries]\n"
 
-#: help.c:394
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3650,7 +3679,7 @@ msgstr ""
 "    セットされていれば、バックスラッシュコマンドで実行される内部問い合わせを\n"
 "    表示; \"noexec\"を設定した場合は実行せずに表示のみ\n"
 
-#: help.c:397
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3658,7 +3687,7 @@ msgstr ""
 "  ENCODING\n"
 "    現在のクライアント側の文字セットのエンコーディング\n"
 
-#: help.c:399
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3666,7 +3695,7 @@ msgstr ""
 "  ERROR\n"
 "    最後の問い合わせが失敗であれば\"true\"、そうでなければ\"false\"\n"
 
-#: help.c:401
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3674,7 +3703,7 @@ msgstr ""
 "  FETCH_COUNT\n"
 "    一度に取得および表示する結果の行数 (0 = 無制限)\n"
 
-#: help.c:403
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3682,7 +3711,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    設定すると、テーブルアクセスメソッドは表示されない\n"
 
-#: help.c:405
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3690,7 +3719,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    設定すると、圧縮方式は表示されない\n"
 
-#: help.c:407
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3698,7 +3727,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    コマンド履歴の制御 [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:409
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3706,7 +3735,7 @@ msgstr ""
 "  HISTFILE\n"
 "    コマンド履歴を保存するファイルの名前\n"
 
-#: help.c:411
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3714,7 +3743,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    コマンド履歴で保存するコマンド数の上限\n"
 
-#: help.c:413
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3722,7 +3751,7 @@ msgstr ""
 "  HOST\n"
 "    現在接続中のデータベースサーバーホスト\n"
 
-#: help.c:415
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3730,7 +3759,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    対話形セッションを終わらせるのに必要なEOFの数\n"
 
-#: help.c:417
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3738,7 +3767,7 @@ msgstr ""
 "  LASTOID\n"
 "    最後の変更の影響を受けたOID\n"
 
-#: help.c:419
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3749,7 +3778,7 @@ msgstr ""
 "    最後のエラーのメッセージおよび SQLSTATE、\n"
 "    なにもなければ空の文字列および\"00000\"\n"
 
-#: help.c:422
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3758,7 +3787,7 @@ msgstr ""
 "    セットされている場合、エラーでトランザクションを停止しない (暗黙のセーブ\n"
 "    ポイントを使用)\n"
 
-#: help.c:424
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3766,7 +3795,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    エラー発生後にバッチ実行を停止\n"
 
-#: help.c:426
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3774,7 +3803,7 @@ msgstr ""
 "  PORT\n"
 "    現在の接続のサーバーポート\n"
 
-#: help.c:428
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3782,7 +3811,7 @@ msgstr ""
 "  PROMPT1\n"
 "    psql の標準のプロンプトを指定\n"
 
-#: help.c:430
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3790,7 +3819,7 @@ msgstr ""
 "  PROMPT2\n"
 "    文が前行から継続する場合のプロンプトを指定\n"
 
-#: help.c:432
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3798,7 +3827,7 @@ msgstr ""
 "  PROMPT3\n"
 "    COPY ... FROM STDIN の最中に使われるプロンプトを指定\n"
 
-#: help.c:434
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3806,7 +3835,7 @@ msgstr ""
 "  QUIET\n"
 "    メッセージを表示しない (-q オプションと同じ)\n"
 
-#: help.c:436
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3814,7 +3843,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    最後の問い合わせで返却した、または影響を与えた行の数、または0\n"
 
-#: help.c:438
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3824,7 +3853,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    サーバーのバージョン(短い文字列または数値)\n"
 
-#: help.c:441
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3832,7 +3861,7 @@ msgstr ""
 "  SHELL_ERROR\n"
 "    最後のシェルコマンドが失敗であれば\"true\"、成功であれば\"false\"\n"
 
-#: help.c:443
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3840,7 +3869,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    最後に実行したシェルコマンドの終了ステータス\n"
 
-#: help.c:445
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3848,7 +3877,7 @@ msgstr ""
 "  SHOW_ALL_RESULTS\n"
 "    複合問い合わせ(\\;)の最後の結果のみではなくすべてを表示する\n"
 
-#: help.c:447
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3856,7 +3885,7 @@ msgstr ""
 "  SHOW_CONTEXT\n"
 "    メッセージコンテキストフィールドの表示を制御 [never, errors, always]\n"
 
-#: help.c:449
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3864,7 +3893,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    セットした場合、改行はSQLコマンドを終端する (-S オプションと同じ)\n"
 
-#: help.c:451
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3872,7 +3901,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    シングルステップモード (-s オプションと同じ)\n"
 
-#: help.c:453
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3880,7 +3909,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    最後の問い合わせの SQLSTATE、またはエラーでなければ\"00000\"\n"
 
-#: help.c:455
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3888,7 +3917,7 @@ msgstr ""
 "  USER\n"
 "    現在接続中のデータベースユーザー\n"
 
-#: help.c:457
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3896,7 +3925,7 @@ msgstr ""
 "  VERBOSITY\n"
 "    エラー報告の詳細度を制御 [default, verbose, terse, sqlstate]\n"
 
-#: help.c:459
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3908,15 +3937,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    psql のバージョン(長い文字列、短い文字列または数値)\n"
 
-#: help.c:463
+#: help.c:471
+#, c-format
 msgid ""
 "  WATCH_INTERVAL\n"
-"    if set to a number, overrides the default two second \\watch interval\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
 msgstr ""
 "  WATCH_INTERVAL\n"
-"    数値の場合、\\watch間隔のデフォルトである2秒を変更します\n"
+"    実行間の待機秒数 (デフォルト %s)\n"
 
-#: help.c:466
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3924,7 +3954,7 @@ msgstr ""
 "\n"
 "表示設定:\n"
 
-#: help.c:468
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3934,7 +3964,7 @@ msgstr ""
 "  またはpsql内で \\pset 名前 [値]\n"
 "\n"
 
-#: help.c:470
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3942,7 +3972,7 @@ msgstr ""
 "  border\n"
 "    境界線のスタイル (番号)\n"
 
-#: help.c:472
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3950,7 +3980,16 @@ msgstr ""
 "  columns\n"
 "    折り返し形式で目標とする横幅\n"
 
-#: help.c:474
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    CSV出力形式のフィールド区切り文字(デフォルトは \"%c\")\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3958,7 +3997,7 @@ msgstr ""
 "  expanded (or x)\n"
 "    拡張出力 [on, off, auto]\n"
 
-#: help.c:476
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3967,7 +4006,7 @@ msgstr ""
 "  fieldsep\n"
 "    非整列出力でのフィールド区切り文字(デフォルトは \"%s\")\n"
 
-#: help.c:479
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3975,7 +4014,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    非整列出力でのフィールド区切り文字をバイト値の0に設定\n"
 
-#: help.c:481
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3983,7 +4022,7 @@ msgstr ""
 "  footer\n"
 "     テーブルフッター出力の要否を設定 [on, off]\n"
 
-#: help.c:483
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3991,7 +4030,7 @@ msgstr ""
 "  format\n"
 "    出力フォーマットを設定 [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:485
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -3999,7 +4038,7 @@ msgstr ""
 "  linestyle\n"
 "    境界線の描画スタイルを設定 [ascii, old-ascii, unicode]\n"
 
-#: help.c:487
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -4007,7 +4046,7 @@ msgstr ""
 "  null\n"
 "    null 値の代わりに表示する文字列を設定\n"
 
-#: help.c:489
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -4015,7 +4054,7 @@ msgstr ""
 "  numericlocale\n"
 "    ロケール固有文字での桁区切りを表示するかどうかを指定\n"
 
-#: help.c:491
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -4023,7 +4062,7 @@ msgstr ""
 "  pager\n"
 "    いつ外部ページャーを使うかを制御 [yes, no, always]\n"
 
-#: help.c:493
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -4031,7 +4070,7 @@ msgstr ""
 "  recordsep\n"
 "    非整列出力でのレコード(行)区切り\n"
 
-#: help.c:495
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -4039,7 +4078,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    非整列出力でレコード区切りにバイト値の0に設定\n"
 
-#: help.c:497
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -4049,7 +4088,7 @@ msgstr ""
 "    HTMLフォーマット時のtableタグの属性、もしくは latex-longtable\n"
 "    フォーマット時に左寄せするデータ型の相対カラム幅を指定\n"
 
-#: help.c:500
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -4057,7 +4096,7 @@ msgstr ""
 "  title\n"
 "    以降に表示される表のタイトルを設定\n"
 
-#: help.c:502
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -4065,7 +4104,7 @@ msgstr ""
 "  tuples_only\n"
 "    セットされた場合、実際のテーブルデータのみを表示\n"
 
-#: help.c:504
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -4077,7 +4116,7 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    Unicode による線描画時のスタイルを設定 [single, double]\n"
 
-#: help.c:508
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -4087,7 +4126,7 @@ msgstr ""
 "    拡張出力のヘッダの最大幅を指定します\n"
 "    [full, column, page, 整数値]\n"
 
-#: help.c:512
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -4095,7 +4134,7 @@ msgstr ""
 "\n"
 "環境変数:\n"
 
-#: help.c:516
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -4105,7 +4144,7 @@ msgstr ""
 "  またはpsql内で \\setenv 名前 [値]\n"
 "\n"
 
-#: help.c:518
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -4117,7 +4156,7 @@ msgstr ""
 "  またはpsq内で \\setenv 名前 [値]\n"
 "\n"
 
-#: help.c:521
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -4125,7 +4164,7 @@ msgstr ""
 "  COLUMNS\n"
 "     折り返し書式におけるカラム数\n"
 
-#: help.c:523
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -4133,7 +4172,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    application_name 接続パラメータと同じ\n"
 
-#: help.c:525
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -4141,7 +4180,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    dbname 接続パラメータと同じ\n"
 
-#: help.c:527
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -4149,7 +4188,7 @@ msgstr ""
 "  PGHOST\n"
 "    host 接続パラメータと同じ\n"
 
-#: help.c:529
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -4157,7 +4196,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "     パスワードファイル名\n"
 
-#: help.c:531
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -4165,7 +4204,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    接続用パスワード (推奨されません)\n"
 
-#: help.c:533
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -4173,7 +4212,7 @@ msgstr ""
 "  PGPORT\n"
 "    port 接続パラメータと同じ\n"
 
-#: help.c:535
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -4181,7 +4220,7 @@ msgstr ""
 "  PGUSER\n"
 "    user 接続パラメータと同じ\n"
 
-#: help.c:537
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -4189,7 +4228,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    \\e, \\ef, \\ev コマンドで使われるエディタ\n"
 
-#: help.c:539
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -4197,7 +4236,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    エディタの起動時に行番号を指定する方法\n"
 
-#: help.c:541
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -4205,7 +4244,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "     コマンドライン履歴ファイルの代替の場所\n"
 
-#: help.c:543
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -4213,7 +4252,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    外部ページャープログラムの名前\n"
 
-#: help.c:546
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -4221,7 +4260,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    \\watchで使用する外部ページャープログラムの名前\n"
 
-#: help.c:549
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -4229,7 +4268,7 @@ msgstr ""
 "  PSQLRC\n"
 "    ユーザーの .psqlrc ファイルの代替の場所\n"
 
-#: help.c:551
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -4237,7 +4276,7 @@ msgstr ""
 "  SHELL\n"
 "    \\! コマンドで使われるシェル\n"
 
-#: help.c:553
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -4245,11 +4284,11 @@ msgstr ""
 "  TMPDIR\n"
 "    テンポラリファイル用ディレクトリ\n"
 
-#: help.c:613
+#: help.c:625
 msgid "Available help:\n"
 msgstr "利用可能なヘルプ:\n"
 
-#: help.c:708
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -4268,7 +4307,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:731
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4400,189 +4439,189 @@ msgstr "%s: メモリ不足です"
 #: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
 #: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
 #: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
-#: sql_help.c:894 sql_help.c:899 sql_help.c:926 sql_help.c:928 sql_help.c:930
-#: sql_help.c:932 sql_help.c:935 sql_help.c:937 sql_help.c:984 sql_help.c:1029
-#: sql_help.c:1034 sql_help.c:1039 sql_help.c:1044 sql_help.c:1049
-#: sql_help.c:1068 sql_help.c:1079 sql_help.c:1081 sql_help.c:1102
-#: sql_help.c:1112 sql_help.c:1113 sql_help.c:1115 sql_help.c:1117
-#: sql_help.c:1129 sql_help.c:1133 sql_help.c:1135 sql_help.c:1147
-#: sql_help.c:1149 sql_help.c:1151 sql_help.c:1153 sql_help.c:1172
-#: sql_help.c:1174 sql_help.c:1178 sql_help.c:1182 sql_help.c:1186
-#: sql_help.c:1189 sql_help.c:1190 sql_help.c:1191 sql_help.c:1194
-#: sql_help.c:1197 sql_help.c:1199 sql_help.c:1341 sql_help.c:1343
-#: sql_help.c:1346 sql_help.c:1349 sql_help.c:1351 sql_help.c:1353
-#: sql_help.c:1356 sql_help.c:1359 sql_help.c:1487 sql_help.c:1489
-#: sql_help.c:1491 sql_help.c:1494 sql_help.c:1515 sql_help.c:1518
-#: sql_help.c:1521 sql_help.c:1524 sql_help.c:1528 sql_help.c:1530
-#: sql_help.c:1532 sql_help.c:1534 sql_help.c:1548 sql_help.c:1551
-#: sql_help.c:1553 sql_help.c:1555 sql_help.c:1565 sql_help.c:1567
-#: sql_help.c:1577 sql_help.c:1579 sql_help.c:1589 sql_help.c:1592
-#: sql_help.c:1615 sql_help.c:1617 sql_help.c:1619 sql_help.c:1621
-#: sql_help.c:1624 sql_help.c:1626 sql_help.c:1629 sql_help.c:1632
-#: sql_help.c:1683 sql_help.c:1726 sql_help.c:1729 sql_help.c:1731
-#: sql_help.c:1733 sql_help.c:1736 sql_help.c:1738 sql_help.c:1740
-#: sql_help.c:1743 sql_help.c:1793 sql_help.c:1809 sql_help.c:2044
-#: sql_help.c:2113 sql_help.c:2132 sql_help.c:2145 sql_help.c:2203
-#: sql_help.c:2211 sql_help.c:2221 sql_help.c:2249 sql_help.c:2282
-#: sql_help.c:2300 sql_help.c:2328 sql_help.c:2451 sql_help.c:2497
-#: sql_help.c:2522 sql_help.c:2545 sql_help.c:2549 sql_help.c:2583
-#: sql_help.c:2603 sql_help.c:2625 sql_help.c:2639 sql_help.c:2660
-#: sql_help.c:2689 sql_help.c:2722 sql_help.c:2745 sql_help.c:2794
-#: sql_help.c:3098 sql_help.c:3111 sql_help.c:3128 sql_help.c:3144
-#: sql_help.c:3184 sql_help.c:3238 sql_help.c:3242 sql_help.c:3244
-#: sql_help.c:3251 sql_help.c:3270 sql_help.c:3297 sql_help.c:3332
-#: sql_help.c:3344 sql_help.c:3353 sql_help.c:3399 sql_help.c:3413
-#: sql_help.c:3441 sql_help.c:3449 sql_help.c:3461 sql_help.c:3471
-#: sql_help.c:3479 sql_help.c:3487 sql_help.c:3495 sql_help.c:3503
-#: sql_help.c:3512 sql_help.c:3523 sql_help.c:3531 sql_help.c:3539
-#: sql_help.c:3547 sql_help.c:3555 sql_help.c:3565 sql_help.c:3574
-#: sql_help.c:3583 sql_help.c:3591 sql_help.c:3601 sql_help.c:3612
-#: sql_help.c:3620 sql_help.c:3629 sql_help.c:3640 sql_help.c:3649
-#: sql_help.c:3657 sql_help.c:3665 sql_help.c:3673 sql_help.c:3681
-#: sql_help.c:3689 sql_help.c:3697 sql_help.c:3705 sql_help.c:3713
-#: sql_help.c:3721 sql_help.c:3729 sql_help.c:3746 sql_help.c:3755
-#: sql_help.c:3763 sql_help.c:3780 sql_help.c:3795 sql_help.c:4110
-#: sql_help.c:4233 sql_help.c:4262 sql_help.c:4278 sql_help.c:4280
-#: sql_help.c:4784 sql_help.c:4832 sql_help.c:4991
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "名前"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1886
-#: sql_help.c:3414 sql_help.c:4551
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "集約関数のシグニチャー"
 
 #: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
 #: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
 #: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
-#: sql_help.c:849 sql_help.c:888 sql_help.c:938 sql_help.c:985 sql_help.c:1038
-#: sql_help.c:1070 sql_help.c:1080 sql_help.c:1116 sql_help.c:1136
-#: sql_help.c:1150 sql_help.c:1200 sql_help.c:1350 sql_help.c:1488
-#: sql_help.c:1531 sql_help.c:1552 sql_help.c:1566 sql_help.c:1578
-#: sql_help.c:1591 sql_help.c:1618 sql_help.c:1684 sql_help.c:1737
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "新しい名前"
 
 #: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
 #: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
 #: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
-#: sql_help.c:893 sql_help.c:936 sql_help.c:1043 sql_help.c:1082
-#: sql_help.c:1114 sql_help.c:1134 sql_help.c:1148 sql_help.c:1198
-#: sql_help.c:1417 sql_help.c:1490 sql_help.c:1533 sql_help.c:1554
-#: sql_help.c:1616 sql_help.c:1732 sql_help.c:3084
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "新しい所有者"
 
 #: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
 #: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
-#: sql_help.c:834 sql_help.c:898 sql_help.c:1048 sql_help.c:1118
-#: sql_help.c:1152 sql_help.c:1352 sql_help.c:1535 sql_help.c:1556
-#: sql_help.c:1568 sql_help.c:1580 sql_help.c:1620 sql_help.c:1739
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "新しいスキーマ"
 
-#: sql_help.c:44 sql_help.c:1950 sql_help.c:3415 sql_help.c:4580
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "集約関数のシグニチャーには以下のものがあります:"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
 #: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
 #: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
-#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1030
-#: sql_help.c:1035 sql_help.c:1040 sql_help.c:1045 sql_help.c:1050
-#: sql_help.c:1904 sql_help.c:1921 sql_help.c:1927 sql_help.c:1951
-#: sql_help.c:1954 sql_help.c:1957 sql_help.c:2114 sql_help.c:2133
-#: sql_help.c:2136 sql_help.c:2452 sql_help.c:2661 sql_help.c:3416
-#: sql_help.c:3419 sql_help.c:3422 sql_help.c:3513 sql_help.c:3602
-#: sql_help.c:3630 sql_help.c:3983 sql_help.c:4450 sql_help.c:4557
-#: sql_help.c:4564 sql_help.c:4570 sql_help.c:4581 sql_help.c:4584
-#: sql_help.c:4587
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "引数のモード"
 
 #: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
 #: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
 #: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
-#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1031
-#: sql_help.c:1036 sql_help.c:1041 sql_help.c:1046 sql_help.c:1051
-#: sql_help.c:1905 sql_help.c:1922 sql_help.c:1928 sql_help.c:1952
-#: sql_help.c:1955 sql_help.c:1958 sql_help.c:2115 sql_help.c:2134
-#: sql_help.c:2137 sql_help.c:2453 sql_help.c:2662 sql_help.c:3417
-#: sql_help.c:3420 sql_help.c:3423 sql_help.c:3514 sql_help.c:3603
-#: sql_help.c:3631 sql_help.c:4558 sql_help.c:4565 sql_help.c:4571
-#: sql_help.c:4582 sql_help.c:4585 sql_help.c:4588
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "引数の名前"
 
 #: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
 #: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
 #: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
-#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1032
-#: sql_help.c:1037 sql_help.c:1042 sql_help.c:1047 sql_help.c:1052
-#: sql_help.c:1906 sql_help.c:1923 sql_help.c:1929 sql_help.c:1953
-#: sql_help.c:1956 sql_help.c:1959 sql_help.c:2454 sql_help.c:2663
-#: sql_help.c:3418 sql_help.c:3421 sql_help.c:3424 sql_help.c:3515
-#: sql_help.c:3604 sql_help.c:3632 sql_help.c:4559 sql_help.c:4566
-#: sql_help.c:4572 sql_help.c:4583 sql_help.c:4586 sql_help.c:4589
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "引数の型"
 
-#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:979
-#: sql_help.c:1131 sql_help.c:1549 sql_help.c:1678 sql_help.c:1710
-#: sql_help.c:1762 sql_help.c:1821 sql_help.c:2011 sql_help.c:2018
-#: sql_help.c:2331 sql_help.c:2389 sql_help.c:2398 sql_help.c:2407
-#: sql_help.c:2498 sql_help.c:2723 sql_help.c:2816 sql_help.c:3113
-#: sql_help.c:3298 sql_help.c:3320 sql_help.c:3462 sql_help.c:3819
-#: sql_help.c:4027 sql_help.c:4277 sql_help.c:4279 sql_help.c:5059
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "オプション"
 
-#: sql_help.c:115 sql_help.c:980 sql_help.c:1679 sql_help.c:2499
-#: sql_help.c:2724 sql_help.c:3299 sql_help.c:3463
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "オプションには以下のものがあります:"
 
-#: sql_help.c:116 sql_help.c:2263
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "接続の可否(真偽値)"
 
-#: sql_help.c:117 sql_help.c:981 sql_help.c:1680 sql_help.c:2264
-#: sql_help.c:2500 sql_help.c:2725 sql_help.c:3300
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "最大同時接続数"
 
-#: sql_help.c:118 sql_help.c:2265
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "テンプレートかどうか(真偽値)"
 
-#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1355
-#: sql_help.c:1410 sql_help.c:4283
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "新しいテーブル空間名"
 
 #: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
-#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:988
-#: sql_help.c:992 sql_help.c:995 sql_help.c:1057 sql_help.c:1059
-#: sql_help.c:1060 sql_help.c:1211 sql_help.c:1213 sql_help.c:1687
-#: sql_help.c:1691 sql_help.c:1694 sql_help.c:2464 sql_help.c:2667
-#: sql_help.c:3995 sql_help.c:4301 sql_help.c:4462 sql_help.c:4772
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "設定パラメータ"
 
 #: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
 #: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
-#: sql_help.c:934 sql_help.c:989 sql_help.c:1058 sql_help.c:1132
-#: sql_help.c:1177 sql_help.c:1181 sql_help.c:1185 sql_help.c:1188
-#: sql_help.c:1193 sql_help.c:1196 sql_help.c:1212 sql_help.c:1388
-#: sql_help.c:1412 sql_help.c:1465 sql_help.c:1473 sql_help.c:1493
-#: sql_help.c:1550 sql_help.c:1634 sql_help.c:1688 sql_help.c:1711
-#: sql_help.c:2332 sql_help.c:2390 sql_help.c:2399 sql_help.c:2408
-#: sql_help.c:2465 sql_help.c:2466 sql_help.c:2530 sql_help.c:2533
-#: sql_help.c:2567 sql_help.c:2668 sql_help.c:2669 sql_help.c:2692
-#: sql_help.c:2817 sql_help.c:2856 sql_help.c:2967 sql_help.c:2980
-#: sql_help.c:2994 sql_help.c:3040 sql_help.c:3048 sql_help.c:3070
-#: sql_help.c:3087 sql_help.c:3114 sql_help.c:3321 sql_help.c:4028
-#: sql_help.c:4773 sql_help.c:4774 sql_help.c:4775 sql_help.c:4776
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "値"
 
@@ -4590,10 +4629,10 @@ msgstr "値"
 msgid "target_role"
 msgstr "対象のロール"
 
-#: sql_help.c:215 sql_help.c:943 sql_help.c:2316 sql_help.c:2697
-#: sql_help.c:2770 sql_help.c:2775 sql_help.c:3958 sql_help.c:3967
-#: sql_help.c:3986 sql_help.c:3998 sql_help.c:4425 sql_help.c:4434
-#: sql_help.c:4453 sql_help.c:4465
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "スキーマ名"
 
@@ -4608,57 +4647,57 @@ msgstr "GRANT/REVOKEの省略形は以下のいずれかです:"
 #: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
 #: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
 #: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
-#: sql_help.c:852 sql_help.c:999 sql_help.c:1354 sql_help.c:1698
-#: sql_help.c:2503 sql_help.c:2504 sql_help.c:2505 sql_help.c:2506
-#: sql_help.c:2507 sql_help.c:2641 sql_help.c:2728 sql_help.c:2729
-#: sql_help.c:2730 sql_help.c:3303 sql_help.c:3304 sql_help.c:3305
-#: sql_help.c:3306 sql_help.c:3307 sql_help.c:4007 sql_help.c:4011
-#: sql_help.c:4474 sql_help.c:4478 sql_help.c:4794
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "ロール名"
 
-#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:942 sql_help.c:1370
-#: sql_help.c:1372 sql_help.c:1376 sql_help.c:1427 sql_help.c:1439
-#: sql_help.c:1469 sql_help.c:1728 sql_help.c:2285 sql_help.c:2289
-#: sql_help.c:2411 sql_help.c:2417 sql_help.c:2526 sql_help.c:2696
-#: sql_help.c:2833 sql_help.c:2838 sql_help.c:2840 sql_help.c:2962
-#: sql_help.c:2975 sql_help.c:2989 sql_help.c:2998 sql_help.c:3010
-#: sql_help.c:3044 sql_help.c:4060 sql_help.c:4076 sql_help.c:4078
-#: sql_help.c:4176 sql_help.c:4179 sql_help.c:4181 sql_help.c:4644
-#: sql_help.c:4645 sql_help.c:4654 sql_help.c:4701 sql_help.c:4702
-#: sql_help.c:4703 sql_help.c:4704 sql_help.c:4705 sql_help.c:4706
-#: sql_help.c:4747 sql_help.c:4748 sql_help.c:4753 sql_help.c:4758
-#: sql_help.c:4902 sql_help.c:4903 sql_help.c:4912 sql_help.c:4959
-#: sql_help.c:4960 sql_help.c:4961 sql_help.c:4962 sql_help.c:4963
-#: sql_help.c:4964 sql_help.c:5020 sql_help.c:5022 sql_help.c:5089
-#: sql_help.c:5149 sql_help.c:5150 sql_help.c:5159 sql_help.c:5206
-#: sql_help.c:5207 sql_help.c:5208 sql_help.c:5209 sql_help.c:5210
-#: sql_help.c:5211
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "評価式"
 
-#: sql_help.c:263 sql_help.c:2286
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "ドメイン制約"
 
 #: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
-#: sql_help.c:502 sql_help.c:1347 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:1398 sql_help.c:1399 sql_help.c:1426 sql_help.c:1438
-#: sql_help.c:1460 sql_help.c:1892 sql_help.c:1894 sql_help.c:2288
-#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2997 sql_help.c:3009
-#: sql_help.c:4073
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "制約名"
 
-#: sql_help.c:268 sql_help.c:1348
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "新しい制約名"
 
-#: sql_help.c:277 sql_help.c:2287
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "ドメイン制約は以下の通りです:"
 
-#: sql_help.c:344 sql_help.c:1130
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "新しいバージョン"
 
@@ -4674,82 +4713,82 @@ msgstr "メンバーオブジェクトは以下の通りです:"
 #: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
 #: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
 #: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
-#: sql_help.c:395 sql_help.c:1884 sql_help.c:1889 sql_help.c:1896
-#: sql_help.c:1897 sql_help.c:1898 sql_help.c:1899 sql_help.c:1900
-#: sql_help.c:1901 sql_help.c:1902 sql_help.c:1907 sql_help.c:1909
-#: sql_help.c:1913 sql_help.c:1915 sql_help.c:1919 sql_help.c:1924
-#: sql_help.c:1925 sql_help.c:1932 sql_help.c:1933 sql_help.c:1934
-#: sql_help.c:1935 sql_help.c:1936 sql_help.c:1937 sql_help.c:1938
-#: sql_help.c:1939 sql_help.c:1940 sql_help.c:1941 sql_help.c:1942
-#: sql_help.c:1947 sql_help.c:1948 sql_help.c:4547 sql_help.c:4552
-#: sql_help.c:4553 sql_help.c:4554 sql_help.c:4555 sql_help.c:4561
-#: sql_help.c:4562 sql_help.c:4567 sql_help.c:4568 sql_help.c:4573
-#: sql_help.c:4574 sql_help.c:4575 sql_help.c:4576 sql_help.c:4577
-#: sql_help.c:4578
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "オブジェクト名"
 
-#: sql_help.c:353 sql_help.c:1885 sql_help.c:4550
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "集約関数名"
 
-#: sql_help.c:355 sql_help.c:1887 sql_help.c:2179 sql_help.c:2183
-#: sql_help.c:2185 sql_help.c:3432
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "変換前の型"
 
-#: sql_help.c:356 sql_help.c:1888 sql_help.c:2180 sql_help.c:2184
-#: sql_help.c:2186 sql_help.c:3433
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "変換後の型"
 
-#: sql_help.c:363 sql_help.c:816 sql_help.c:1903 sql_help.c:2181
-#: sql_help.c:2224 sql_help.c:2304 sql_help.c:2584 sql_help.c:2615
-#: sql_help.c:3190 sql_help.c:4449 sql_help.c:4556 sql_help.c:4673
-#: sql_help.c:4677 sql_help.c:4681 sql_help.c:4684 sql_help.c:4931
-#: sql_help.c:4935 sql_help.c:4939 sql_help.c:4942 sql_help.c:5178
-#: sql_help.c:5182 sql_help.c:5186 sql_help.c:5189
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "関数名"
 
-#: sql_help.c:368 sql_help.c:809 sql_help.c:1910 sql_help.c:2608
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "演算子名"
 
-#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1911
-#: sql_help.c:2585 sql_help.c:3556
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "左辺の型"
 
-#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1912
-#: sql_help.c:2586 sql_help.c:3557
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "右辺の型"
 
 #: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
 #: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
-#: sql_help.c:1447 sql_help.c:1914 sql_help.c:1916 sql_help.c:2605
-#: sql_help.c:2626 sql_help.c:3018 sql_help.c:3566 sql_help.c:3575
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "インデックスメソッド"
 
-#: sql_help.c:376 sql_help.c:1920 sql_help.c:4563
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "プロシージャ名"
 
-#: sql_help.c:380 sql_help.c:1926 sql_help.c:3982 sql_help.c:4569
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "ルーチン名"
 
-#: sql_help.c:392 sql_help.c:1416 sql_help.c:1943 sql_help.c:2460
-#: sql_help.c:2666 sql_help.c:2970 sql_help.c:3157 sql_help.c:3737
-#: sql_help.c:4004 sql_help.c:4471
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "型名"
 
-#: sql_help.c:393 sql_help.c:1944 sql_help.c:2459 sql_help.c:2665
-#: sql_help.c:3158 sql_help.c:3390 sql_help.c:3738 sql_help.c:3989
-#: sql_help.c:4456
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "言語名"
 
@@ -4757,149 +4796,149 @@ msgstr "言語名"
 msgid "and aggregate_signature is:"
 msgstr "集約関数のシグニチャーは以下の通りです:"
 
-#: sql_help.c:419 sql_help.c:2046 sql_help.c:2329
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "ハンドラー関数"
 
-#: sql_help.c:420 sql_help.c:2330
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "バリデーター関数"
 
-#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1033
-#: sql_help.c:1342 sql_help.c:1625
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "アクション"
 
 #: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
 #: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
 #: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
-#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:941 sql_help.c:1111
-#: sql_help.c:1344 sql_help.c:1362 sql_help.c:1366 sql_help.c:1367
-#: sql_help.c:1371 sql_help.c:1373 sql_help.c:1374 sql_help.c:1375
-#: sql_help.c:1377 sql_help.c:1378 sql_help.c:1380 sql_help.c:1383
-#: sql_help.c:1384 sql_help.c:1386 sql_help.c:1389 sql_help.c:1391
-#: sql_help.c:1392 sql_help.c:1440 sql_help.c:1441 sql_help.c:1442
-#: sql_help.c:1444 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1463 sql_help.c:1468 sql_help.c:1475 sql_help.c:1476
-#: sql_help.c:1727 sql_help.c:1730 sql_help.c:1734 sql_help.c:1770
-#: sql_help.c:1891 sql_help.c:2008 sql_help.c:2014 sql_help.c:2028
-#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2387 sql_help.c:2402
-#: sql_help.c:2416 sql_help.c:2457 sql_help.c:2525 sql_help.c:2531
-#: sql_help.c:2564 sql_help.c:2695 sql_help.c:2802 sql_help.c:2837
-#: sql_help.c:2839 sql_help.c:2952 sql_help.c:2961 sql_help.c:2971
-#: sql_help.c:2974 sql_help.c:2984 sql_help.c:2988 sql_help.c:3011
-#: sql_help.c:3012 sql_help.c:3013 sql_help.c:3015 sql_help.c:3016
-#: sql_help.c:3023 sql_help.c:3024 sql_help.c:3038 sql_help.c:3043
-#: sql_help.c:3050 sql_help.c:3051 sql_help.c:3067 sql_help.c:3193
-#: sql_help.c:3333 sql_help.c:3961 sql_help.c:3962 sql_help.c:4059
-#: sql_help.c:4075 sql_help.c:4077 sql_help.c:4079 sql_help.c:4175
-#: sql_help.c:4178 sql_help.c:4180 sql_help.c:4182 sql_help.c:4428
-#: sql_help.c:4429 sql_help.c:4549 sql_help.c:4710 sql_help.c:4717
-#: sql_help.c:4719 sql_help.c:4968 sql_help.c:4975 sql_help.c:4977
-#: sql_help.c:5019 sql_help.c:5021 sql_help.c:5023 sql_help.c:5077
-#: sql_help.c:5215 sql_help.c:5222 sql_help.c:5224
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "列名"
 
-#: sql_help.c:471 sql_help.c:696 sql_help.c:1345 sql_help.c:1735
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "新しい列名"
 
-#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1054
-#: sql_help.c:1361 sql_help.c:1635
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "アクションは以下のいずれかです:"
 
-#: sql_help.c:478 sql_help.c:483 sql_help.c:1103 sql_help.c:1363
-#: sql_help.c:1368 sql_help.c:1637 sql_help.c:1641 sql_help.c:2283
-#: sql_help.c:2388 sql_help.c:2604 sql_help.c:2795 sql_help.c:2953
-#: sql_help.c:3240 sql_help.c:4234
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "データ型"
 
-#: sql_help.c:479 sql_help.c:484 sql_help.c:1364 sql_help.c:1369
-#: sql_help.c:1470 sql_help.c:1638 sql_help.c:1642 sql_help.c:2284
-#: sql_help.c:2391 sql_help.c:2527 sql_help.c:2955 sql_help.c:2963
-#: sql_help.c:2976 sql_help.c:2990 sql_help.c:3045 sql_help.c:3241
-#: sql_help.c:3247 sql_help.c:4070
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "照合順序"
 
-#: sql_help.c:480 sql_help.c:1365 sql_help.c:2392 sql_help.c:2403
-#: sql_help.c:2956 sql_help.c:2972 sql_help.c:2985
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "カラム制約"
 
-#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1385 sql_help.c:5071
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "整数"
 
-#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1387
-#: sql_help.c:1390
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "属性オプション"
 
-#: sql_help.c:500 sql_help.c:1394 sql_help.c:2393 sql_help.c:2404
-#: sql_help.c:2957 sql_help.c:2973 sql_help.c:2986
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "テーブル制約"
 
-#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1400
-#: sql_help.c:1401 sql_help.c:1402 sql_help.c:1403 sql_help.c:1945
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "トリガー名"
 
-#: sql_help.c:507 sql_help.c:508 sql_help.c:1414 sql_help.c:1415
-#: sql_help.c:2396 sql_help.c:2401 sql_help.c:2960 sql_help.c:2983
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "親テーブル"
 
-#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1053
-#: sql_help.c:1594 sql_help.c:2315
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "拡張名"
 
-#: sql_help.c:569 sql_help.c:1055 sql_help.c:2461
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "実行コスト"
 
-#: sql_help.c:570 sql_help.c:1056 sql_help.c:2462
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "結果の行数"
 
-#: sql_help.c:571 sql_help.c:2463
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "サポート関数"
 
-#: sql_help.c:593 sql_help.c:595 sql_help.c:978 sql_help.c:986 sql_help.c:990
-#: sql_help.c:993 sql_help.c:996 sql_help.c:1677 sql_help.c:1685
-#: sql_help.c:1689 sql_help.c:1692 sql_help.c:1695 sql_help.c:2771
-#: sql_help.c:2773 sql_help.c:2776 sql_help.c:2777 sql_help.c:3959
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:3965 sql_help.c:3968
-#: sql_help.c:3969 sql_help.c:3971 sql_help.c:3972 sql_help.c:3974
-#: sql_help.c:3975 sql_help.c:3977 sql_help.c:3978 sql_help.c:3980
-#: sql_help.c:3981 sql_help.c:3987 sql_help.c:3988 sql_help.c:3990
-#: sql_help.c:3991 sql_help.c:3993 sql_help.c:3994 sql_help.c:3996
-#: sql_help.c:3997 sql_help.c:3999 sql_help.c:4000 sql_help.c:4002
-#: sql_help.c:4003 sql_help.c:4005 sql_help.c:4006 sql_help.c:4008
-#: sql_help.c:4009 sql_help.c:4426 sql_help.c:4427 sql_help.c:4431
-#: sql_help.c:4432 sql_help.c:4435 sql_help.c:4436 sql_help.c:4438
-#: sql_help.c:4439 sql_help.c:4441 sql_help.c:4442 sql_help.c:4444
-#: sql_help.c:4445 sql_help.c:4447 sql_help.c:4448 sql_help.c:4454
-#: sql_help.c:4455 sql_help.c:4457 sql_help.c:4458 sql_help.c:4460
-#: sql_help.c:4461 sql_help.c:4463 sql_help.c:4464 sql_help.c:4466
-#: sql_help.c:4467 sql_help.c:4469 sql_help.c:4470 sql_help.c:4472
-#: sql_help.c:4473 sql_help.c:4475 sql_help.c:4476
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "ロールの指定"
 
-#: sql_help.c:594 sql_help.c:596 sql_help.c:1708 sql_help.c:2250
-#: sql_help.c:2779 sql_help.c:3318 sql_help.c:3771 sql_help.c:4804
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "ユーザー名"
 
-#: sql_help.c:597 sql_help.c:998 sql_help.c:1697 sql_help.c:2778
-#: sql_help.c:4010 sql_help.c:4477
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "ロール指定は以下の通りです:"
 
@@ -4907,22 +4946,22 @@ msgstr "ロール指定は以下の通りです:"
 msgid "group_name"
 msgstr "グループ名"
 
-#: sql_help.c:620 sql_help.c:1466 sql_help.c:2262 sql_help.c:2534
-#: sql_help.c:2568 sql_help.c:2968 sql_help.c:2981 sql_help.c:2995
-#: sql_help.c:3041 sql_help.c:3071 sql_help.c:3083 sql_help.c:4001
-#: sql_help.c:4468
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "テーブル空間名"
 
-#: sql_help.c:622 sql_help.c:715 sql_help.c:1408 sql_help.c:1418
-#: sql_help.c:1461 sql_help.c:1823
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "インデックス名"
 
-#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1411
-#: sql_help.c:1413 sql_help.c:1464 sql_help.c:2532 sql_help.c:2566
-#: sql_help.c:2966 sql_help.c:2979 sql_help.c:2993 sql_help.c:3039
-#: sql_help.c:3069
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "ストレージパラメータ"
 
@@ -4930,1916 +4969,1924 @@ msgstr "ストレージパラメータ"
 msgid "column_number"
 msgstr "列番号"
 
-#: sql_help.c:655 sql_help.c:1908 sql_help.c:4560
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "ラージオブジェクトのOID"
 
-#: sql_help.c:714 sql_help.c:1393 sql_help.c:2954
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "圧縮方式"
 
-#: sql_help.c:716 sql_help.c:1409
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "新しいアクセスメソッド"
 
-#: sql_help.c:753 sql_help.c:2589
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "制約選択評価関数"
 
-#: sql_help.c:754 sql_help.c:2590
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "結合選択評価関数"
 
-#: sql_help.c:755 sql_help.c:2587
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "交代演算子"
 
-#: sql_help.c:756 sql_help.c:2588
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "否定演算子"
 
-#: sql_help.c:808 sql_help.c:820 sql_help.c:2607
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "戦略番号"
 
 #: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
-#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2609 sql_help.c:2610
-#: sql_help.c:2613 sql_help.c:2614
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "演算子の型"
 
-#: sql_help.c:812 sql_help.c:2611
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "ソートファミリー名"
 
-#: sql_help.c:813 sql_help.c:823 sql_help.c:2612
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "サポート番号"
 
-#: sql_help.c:817 sql_help.c:2182 sql_help.c:2616 sql_help.c:3160
-#: sql_help.c:3162
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "引数の型"
 
-#: sql_help.c:848 sql_help.c:851 sql_help.c:940 sql_help.c:1069 sql_help.c:1110
-#: sql_help.c:1590 sql_help.c:1593 sql_help.c:1769 sql_help.c:1822
-#: sql_help.c:1893 sql_help.c:1918 sql_help.c:1931 sql_help.c:1946
-#: sql_help.c:2007 sql_help.c:2013 sql_help.c:2386 sql_help.c:2400
-#: sql_help.c:2523 sql_help.c:2563 sql_help.c:2640 sql_help.c:2694
-#: sql_help.c:2747 sql_help.c:2801 sql_help.c:2834 sql_help.c:2841
-#: sql_help.c:2951 sql_help.c:2969 sql_help.c:2982 sql_help.c:3066
-#: sql_help.c:3186 sql_help.c:3368 sql_help.c:3592 sql_help.c:3641
-#: sql_help.c:3747 sql_help.c:3957 sql_help.c:3963 sql_help.c:4024
-#: sql_help.c:4057 sql_help.c:4424 sql_help.c:4430 sql_help.c:4548
-#: sql_help.c:4661 sql_help.c:4724 sql_help.c:4763 sql_help.c:4919
-#: sql_help.c:4982 sql_help.c:5017 sql_help.c:5076 sql_help.c:5166
-#: sql_help.c:5229
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "テーブル名"
 
-#: sql_help.c:853 sql_help.c:2642
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "USING式"
 
-#: sql_help.c:854 sql_help.c:2643
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "CHECK式"
 
-#: sql_help.c:927 sql_help.c:929 sql_help.c:931 sql_help.c:2690
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "発行オブジェクト"
 
-#: sql_help.c:933 sql_help.c:2691
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "削除発行オブジェクト"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "パブリケーションパラメータ"
 
-#: sql_help.c:939 sql_help.c:2693
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "発行オブジェクトは以下のいずれかです:"
 
-#: sql_help.c:982 sql_help.c:1681 sql_help.c:2501 sql_help.c:2726
-#: sql_help.c:3301
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "テーブルおよび列"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "また、削除発行オブジェクトは以下のいずれかです:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "そしてテーブルと列の指定は以下の通りです:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "パスワード"
 
-#: sql_help.c:983 sql_help.c:1682 sql_help.c:2502 sql_help.c:2727
-#: sql_help.c:3302
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "タイムスタンプ"
 
-#: sql_help.c:987 sql_help.c:991 sql_help.c:994 sql_help.c:997 sql_help.c:1686
-#: sql_help.c:1690 sql_help.c:1693 sql_help.c:1696 sql_help.c:3970
-#: sql_help.c:4437
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "データベース名"
 
-#: sql_help.c:1104 sql_help.c:2796
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "増分値"
 
-#: sql_help.c:1105 sql_help.c:2797
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "最小値"
 
-#: sql_help.c:1106 sql_help.c:2798
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "最大値"
 
-#: sql_help.c:1107 sql_help.c:2799 sql_help.c:4657 sql_help.c:4761
-#: sql_help.c:4915 sql_help.c:5093 sql_help.c:5162
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "開始番号"
 
-#: sql_help.c:1108 sql_help.c:1382
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "再開始番号"
 
-#: sql_help.c:1109 sql_help.c:2800
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "キャッシュ割り当て数"
 
-#: sql_help.c:1154
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "新しいターゲット"
 
-#: sql_help.c:1173 sql_help.c:2853
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "接続文字列"
 
-#: sql_help.c:1175 sql_help.c:1179 sql_help.c:1183 sql_help.c:2854
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "パブリケーション名"
 
-#: sql_help.c:1176 sql_help.c:1180 sql_help.c:1184
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "パブリケーション・オプション"
 
-#: sql_help.c:1187
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "{REFRESH PUBLICATION の追加オプション}"
 
-#: sql_help.c:1192 sql_help.c:2855
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "{SUBSCRIPTION パラメータ名}"
 
-#: sql_help.c:1195
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "スキップオプション"
 
-#: sql_help.c:1357 sql_help.c:1360
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "パーティション名"
 
-#: sql_help.c:1358 sql_help.c:2405 sql_help.c:2987
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "パーティション境界の仕様"
 
-#: sql_help.c:1379 sql_help.c:1430 sql_help.c:3001
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "シーケンスオプション"
 
-#: sql_help.c:1381
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "シーケンスオプション"
 
-#: sql_help.c:1395
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "インデックスを使うテーブルの制約"
 
-#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1406 sql_help.c:1407
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "書き換えルール名"
 
-#: sql_help.c:1419 sql_help.c:2419 sql_help.c:3031
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "パーティション境界の仕様は以下の通りです:"
 
-#: sql_help.c:1420 sql_help.c:1421 sql_help.c:1422 sql_help.c:2420
-#: sql_help.c:2421 sql_help.c:2422 sql_help.c:3032 sql_help.c:3033
-#: sql_help.c:3034
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "パーティション境界式"
 
-#: sql_help.c:1423 sql_help.c:1424 sql_help.c:2423 sql_help.c:2424
-#: sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "numericリテラル"
 
-#: sql_help.c:1425
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "そしてカラム制約は以下の通りです:"
 
-#: sql_help.c:1428 sql_help.c:2412 sql_help.c:2455 sql_help.c:2664
-#: sql_help.c:2999
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "デフォルト表現"
 
-#: sql_help.c:1429 sql_help.c:2413 sql_help.c:3000
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "生成式"
 
-#: sql_help.c:1431 sql_help.c:1432 sql_help.c:1443 sql_help.c:1446
-#: sql_help.c:1450 sql_help.c:3002 sql_help.c:3003 sql_help.c:3014
-#: sql_help.c:3017 sql_help.c:3021
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "インデックスパラメータ"
 
-#: sql_help.c:1433 sql_help.c:1454 sql_help.c:3004 sql_help.c:3025
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "参照テーブル"
 
-#: sql_help.c:1434 sql_help.c:1455 sql_help.c:1456 sql_help.c:3005
-#: sql_help.c:3026 sql_help.c:3027
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "参照列"
 
-#: sql_help.c:1435 sql_help.c:1436 sql_help.c:1457 sql_help.c:1458
-#: sql_help.c:3006 sql_help.c:3007 sql_help.c:3028 sql_help.c:3029
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "参照動作"
 
-#: sql_help.c:1437 sql_help.c:2414 sql_help.c:3008
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "テーブル制約は以下の通りです:"
 
-#: sql_help.c:1448 sql_help.c:3019
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "除外対象要素"
 
-#: sql_help.c:1449 sql_help.c:3020 sql_help.c:4655 sql_help.c:4759
-#: sql_help.c:4913 sql_help.c:5091 sql_help.c:5160
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "演算子"
 
-#: sql_help.c:1451 sql_help.c:2535 sql_help.c:3022
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "インデックスの述語"
 
-#: sql_help.c:1459
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "テーブル制約は以下の通りです:"
 
-#: sql_help.c:1462 sql_help.c:3037
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "UNIQUE, PRIMARY KEY, EXCLUDE 制約のインデックスパラメータは以下の通りです:"
 
-#: sql_help.c:1467 sql_help.c:3042
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "EXCLUDE 制約の除外対象要素は以下の通りです:"
 
-#: sql_help.c:1471 sql_help.c:2528 sql_help.c:2964 sql_help.c:2977
-#: sql_help.c:2991 sql_help.c:3046 sql_help.c:4071
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "演算子クラス"
 
-#: sql_help.c:1472 sql_help.c:2529 sql_help.c:3047
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "演算子クラスパラメータ"
 
-#: sql_help.c:1474 sql_help.c:3049
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "FOREIGN KEY/REFERENCES制約の参照動作は以下の通り:"
 
-#: sql_help.c:1492 sql_help.c:1495 sql_help.c:3086
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "テーブル空間のオプション"
 
-#: sql_help.c:1516 sql_help.c:1519 sql_help.c:1525 sql_help.c:1529
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "トークンの型"
 
-#: sql_help.c:1517 sql_help.c:1520
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "辞書名"
 
-#: sql_help.c:1522 sql_help.c:1526
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "元の辞書"
 
-#: sql_help.c:1523 sql_help.c:1527
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "新しい辞書"
 
-#: sql_help.c:1622 sql_help.c:1636 sql_help.c:1639 sql_help.c:1640
-#: sql_help.c:3239
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "属性名"
 
-#: sql_help.c:1623
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "新しい属性名"
 
-#: sql_help.c:1627 sql_help.c:1631
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "新しい列挙値"
 
-#: sql_help.c:1628
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "隣接した列挙値"
 
-#: sql_help.c:1630
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "既存の列挙値"
 
-#: sql_help.c:1633
+#: sql_help.c:1647
 msgid "property"
 msgstr "プロパティ"
 
-#: sql_help.c:1709 sql_help.c:2397 sql_help.c:2406 sql_help.c:2812
-#: sql_help.c:3319 sql_help.c:3772 sql_help.c:3979 sql_help.c:4025
-#: sql_help.c:4446
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "サーバー名"
 
-#: sql_help.c:1741 sql_help.c:1744 sql_help.c:3334
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "ビューのオプション名"
 
-#: sql_help.c:1742 sql_help.c:3335
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "ビューオプションの値"
 
-#: sql_help.c:1763 sql_help.c:5060
-msgid "table_and_columns"
-msgstr "テーブルおよび列"
-
-#: sql_help.c:1764 sql_help.c:1824 sql_help.c:2019 sql_help.c:3821
-#: sql_help.c:4281 sql_help.c:5061
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "オプションには以下のうちのいずれかを指定します:"
 
-#: sql_help.c:1765 sql_help.c:1766 sql_help.c:1825 sql_help.c:2021
-#: sql_help.c:2025 sql_help.c:2208 sql_help.c:3822 sql_help.c:3823
-#: sql_help.c:3824 sql_help.c:3825 sql_help.c:3826 sql_help.c:3827
-#: sql_help.c:3828 sql_help.c:3829 sql_help.c:3830 sql_help.c:3831
-#: sql_help.c:4282 sql_help.c:4284 sql_help.c:5062 sql_help.c:5063
-#: sql_help.c:5064 sql_help.c:5065 sql_help.c:5066 sql_help.c:5067
-#: sql_help.c:5068 sql_help.c:5069 sql_help.c:5070 sql_help.c:5072
-#: sql_help.c:5073
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "真偽値"
 
-#: sql_help.c:1767 sql_help.c:5074
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "サイズ"
 
-#: sql_help.c:1768 sql_help.c:5075
-msgid "and table_and_columns is:"
-msgstr "そしてテーブルと列の指定は以下の通りです:"
-
-#: sql_help.c:1784 sql_help.c:4820 sql_help.c:4822 sql_help.c:4846
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "トランザクションのモード"
 
-#: sql_help.c:1785 sql_help.c:4823 sql_help.c:4847
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "トランザクションのモードは以下の通りです:"
 
-#: sql_help.c:1794 sql_help.c:4665 sql_help.c:4674 sql_help.c:4678
-#: sql_help.c:4682 sql_help.c:4685 sql_help.c:4923 sql_help.c:4932
-#: sql_help.c:4936 sql_help.c:4940 sql_help.c:4943 sql_help.c:5170
-#: sql_help.c:5179 sql_help.c:5183 sql_help.c:5187 sql_help.c:5190
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "引数"
 
-#: sql_help.c:1890
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "リレーション名"
 
-#: sql_help.c:1895 sql_help.c:3973 sql_help.c:4440
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "ドメイン名"
 
-#: sql_help.c:1917
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "ポリシー名"
 
-#: sql_help.c:1930
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "ルール名"
 
-#: sql_help.c:1949 sql_help.c:4579
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "文字列リテラル"
 
-#: sql_help.c:1974 sql_help.c:4243 sql_help.c:4493
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "トランザクションID"
 
-#: sql_help.c:2009 sql_help.c:2016 sql_help.c:4097
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "ファイル名"
 
-#: sql_help.c:2010 sql_help.c:2017 sql_help.c:2749 sql_help.c:2750
-#: sql_help.c:2751
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "コマンド"
 
-#: sql_help.c:2012 sql_help.c:2748 sql_help.c:3189 sql_help.c:3371
-#: sql_help.c:4081 sql_help.c:4166 sql_help.c:4169 sql_help.c:4172
-#: sql_help.c:4648 sql_help.c:4650 sql_help.c:4752 sql_help.c:4754
-#: sql_help.c:4906 sql_help.c:4908 sql_help.c:5026 sql_help.c:5153
-#: sql_help.c:5155
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "条件"
 
-#: sql_help.c:2015 sql_help.c:2569 sql_help.c:3072 sql_help.c:3336
-#: sql_help.c:3354 sql_help.c:4061
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "問い合わせ"
 
-#: sql_help.c:2020
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "フォーマット名"
 
-#: sql_help.c:2022
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "区切り文字"
 
-#: sql_help.c:2023
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "NULL文字列"
 
-#: sql_help.c:2024
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "デフォルト文字列"
 
-#: sql_help.c:2026
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "引用符文字"
 
-#: sql_help.c:2027
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "エスケープ文字"
 
-#: sql_help.c:2031
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "エラー処理"
 
-#: sql_help.c:2032
+#: sql_help.c:2046
 msgid "maxerror"
 msgstr "許容エラー数"
 
-#: sql_help.c:2033
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "エンコーディング名"
 
-#: sql_help.c:2034
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "詳細度"
 
-#: sql_help.c:2045
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "アクセスメソッドの型"
 
-#: sql_help.c:2116 sql_help.c:2135 sql_help.c:2138
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "入力データ型"
 
-#: sql_help.c:2117 sql_help.c:2139 sql_help.c:2147
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "状態遷移関数"
 
-#: sql_help.c:2118 sql_help.c:2140 sql_help.c:2148
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "状態データの型"
 
-#: sql_help.c:2119 sql_help.c:2141 sql_help.c:2149
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "状態データのサイズ"
 
-#: sql_help.c:2120 sql_help.c:2142 sql_help.c:2150
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "終了関数"
 
-#: sql_help.c:2121 sql_help.c:2151
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "結合関数"
 
-#: sql_help.c:2122 sql_help.c:2152
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "シリアライズ関数"
 
-#: sql_help.c:2123 sql_help.c:2153
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "デシリアライズ関数"
 
-#: sql_help.c:2124 sql_help.c:2143 sql_help.c:2154
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "初期条件"
 
-#: sql_help.c:2125 sql_help.c:2155
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "前方状態遷移関数"
 
-#: sql_help.c:2126 sql_help.c:2156
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "逆状態遷移関数"
 
-#: sql_help.c:2127 sql_help.c:2157
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "移動集約モード時の状態値のデータ型"
 
-#: sql_help.c:2128 sql_help.c:2158
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "移動集約モード時の状態値のデータサイズ"
 
-#: sql_help.c:2129 sql_help.c:2159
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "移動集約モード時の終了関数"
 
-#: sql_help.c:2130 sql_help.c:2160
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "移動集約モード時の初期条件"
 
-#: sql_help.c:2131 sql_help.c:2161
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "ソート演算子"
 
-#: sql_help.c:2144
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "または古い構文"
 
-#: sql_help.c:2146
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "基本の型"
 
-#: sql_help.c:2204 sql_help.c:2254
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "ロケール"
 
-#: sql_help.c:2205 sql_help.c:2255
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "照合順序"
 
-#: sql_help.c:2206 sql_help.c:2256
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "Ctype(変換演算子)"
 
-#: sql_help.c:2207 sql_help.c:4546
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "プロバイダ"
 
-#: sql_help.c:2209
+#: sql_help.c:2223
 msgid "rules"
 msgstr "ルール"
 
-#: sql_help.c:2210 sql_help.c:2317
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "バージョン"
 
-#: sql_help.c:2212
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "既存の照合順序"
 
-#: sql_help.c:2222
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "変換元のエンコーディング"
 
-#: sql_help.c:2223
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "変換先のエンコーディング"
 
-#: sql_help.c:2251 sql_help.c:3112
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "テンプレート"
 
-#: sql_help.c:2252
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "エンコード"
 
-#: sql_help.c:2253
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "ストラテジ"
 
-#: sql_help.c:2257
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "組み込みロケール"
 
-#: sql_help.c:2258
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "ICUロケール"
 
-#: sql_help.c:2259
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "ICUルール(群)"
 
-#: sql_help.c:2260
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "ロケールプロバイダ"
 
-#: sql_help.c:2261
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "照合順序バージョン"
 
-#: sql_help.c:2266
+#: sql_help.c:2280
 msgid "oid"
 msgstr "オブジェクトID"
 
-#: sql_help.c:2301 sql_help.c:2746 sql_help.c:3185
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "イベント"
 
-#: sql_help.c:2302
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "フィルター変数"
 
-#: sql_help.c:2303
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "フィルター値"
 
-#: sql_help.c:2394 sql_help.c:2958
+#: sql_help.c:2408 sql_help.c:2978
 msgid "source_table"
 msgstr "コピー元のテーブル"
 
-#: sql_help.c:2395 sql_help.c:2959
+#: sql_help.c:2409 sql_help.c:2979
 msgid "like_option"
 msgstr "LIKEオプション"
 
-#: sql_help.c:2409 sql_help.c:2996
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "カラム制約は以下の通りです:"
 
-#: sql_help.c:2418 sql_help.c:3030
+#: sql_help.c:2432 sql_help.c:3050
 msgid "and like_option is:"
 msgstr "LIKE オプションは以下の通りです:"
 
-#: sql_help.c:2456
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "戻り値の型"
 
-#: sql_help.c:2458
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "列の型"
 
-#: sql_help.c:2467 sql_help.c:2670
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "定義"
 
-#: sql_help.c:2468 sql_help.c:2671
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "オブジェクトファイル名"
 
-#: sql_help.c:2469 sql_help.c:2672
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "リンクシンボル"
 
-#: sql_help.c:2470 sql_help.c:2673
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "SQL本体"
 
-#: sql_help.c:2508 sql_help.c:2731 sql_help.c:3308
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "UID"
 
-#: sql_help.c:2524 sql_help.c:2565 sql_help.c:2965 sql_help.c:2978
-#: sql_help.c:2992 sql_help.c:3068
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "インデックスメソッド"
 
-#: sql_help.c:2546
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "呼び出しハンドラー"
 
-#: sql_help.c:2547
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "インラインハンドラー"
 
-#: sql_help.c:2548
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "バリデーション関数"
 
-#: sql_help.c:2606
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "演算子族の名前"
 
-#: sql_help.c:2617
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "ストレージタイプ"
 
-#: sql_help.c:2752 sql_help.c:3192
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "イベントは以下のいずれかです:"
 
-#: sql_help.c:2772 sql_help.c:2774
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "スキーマ要素"
 
-#: sql_help.c:2813
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "サーバーのタイプ"
 
-#: sql_help.c:2814
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "サーバーのバージョン"
 
-#: sql_help.c:2815 sql_help.c:3976 sql_help.c:4443
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "外部データラッパ名"
 
-#: sql_help.c:2832 sql_help.c:2835
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "統計オブジェクト名"
 
-#: sql_help.c:2836
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "統計種別"
 
-#: sql_help.c:2852
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "サブスクリプション名"
 
-#: sql_help.c:3085
+#: sql_help.c:3105
 msgid "directory"
 msgstr "ディレクトリ"
 
-#: sql_help.c:3099
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "パーサ名"
 
-#: sql_help.c:3100
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "複製元の設定"
 
-#: sql_help.c:3129
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "開始関数"
 
-#: sql_help.c:3130
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "トークン取得関数"
 
-#: sql_help.c:3131
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "終了関数"
 
-#: sql_help.c:3132
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "LEXTYPE関数"
 
-#: sql_help.c:3133
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "見出し関数"
 
-#: sql_help.c:3145
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "初期処理関数"
 
-#: sql_help.c:3146
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "LEXIZE関数"
 
-#: sql_help.c:3159
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "{FROM SQL 関数名}"
 
-#: sql_help.c:3161
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "{TO SQL 関数名}"
 
-#: sql_help.c:3187
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "被参照テーブル名"
 
-#: sql_help.c:3188
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "移行用リレーション名"
 
-#: sql_help.c:3191
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "引数"
 
-#: sql_help.c:3243
+#: sql_help.c:3263
 msgid "label"
 msgstr "ラベル"
 
-#: sql_help.c:3245
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "当該範囲のデータ型"
 
-#: sql_help.c:3246
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "当該範囲のデータ型の演算子クラス"
 
-#: sql_help.c:3248
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "正規化関数"
 
-#: sql_help.c:3249
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "当該範囲のデータ型の差分抽出関数"
 
-#: sql_help.c:3250
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "複範囲型名"
 
-#: sql_help.c:3252
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "入力関数"
 
-#: sql_help.c:3253
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "出力関数"
 
-#: sql_help.c:3254
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "受信関数"
 
-#: sql_help.c:3255
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "送信関数"
 
-#: sql_help.c:3256
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "型修飾子の入力関数"
 
-#: sql_help.c:3257
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "型修飾子の出力関数"
 
-#: sql_help.c:3258
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "分析関数"
 
-#: sql_help.c:3259
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "添字関数"
 
-#: sql_help.c:3260
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "内部長"
 
-#: sql_help.c:3261
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "バイト境界"
 
-#: sql_help.c:3262
+#: sql_help.c:3282
 msgid "storage"
 msgstr "ストレージ"
 
-#: sql_help.c:3263
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "LIKEの型"
 
-#: sql_help.c:3264
+#: sql_help.c:3284
 msgid "category"
 msgstr "カテゴリー"
 
-#: sql_help.c:3265
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "優先データ型かどうか(真偽値)"
 
-#: sql_help.c:3266
+#: sql_help.c:3286
 msgid "default"
 msgstr "デフォルト"
 
-#: sql_help.c:3267
+#: sql_help.c:3287
 msgid "element"
 msgstr "要素のデータ型"
 
-#: sql_help.c:3268
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "区切り記号"
 
-#: sql_help.c:3269
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "照合可能"
 
-#: sql_help.c:3367 sql_help.c:4056 sql_help.c:4152 sql_help.c:4643
-#: sql_help.c:4746 sql_help.c:4901 sql_help.c:5016 sql_help.c:5148
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "WITH問い合わせ"
 
-#: sql_help.c:3369 sql_help.c:4058 sql_help.c:4662 sql_help.c:4668
-#: sql_help.c:4671 sql_help.c:4675 sql_help.c:4679 sql_help.c:4687
-#: sql_help.c:4920 sql_help.c:4926 sql_help.c:4929 sql_help.c:4933
-#: sql_help.c:4937 sql_help.c:4945 sql_help.c:5018 sql_help.c:5167
-#: sql_help.c:5173 sql_help.c:5176 sql_help.c:5180 sql_help.c:5184
-#: sql_help.c:5192
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "別名"
 
-#: sql_help.c:3370 sql_help.c:4647 sql_help.c:4689 sql_help.c:4691
-#: sql_help.c:4695 sql_help.c:4697 sql_help.c:4698 sql_help.c:4699
-#: sql_help.c:4751 sql_help.c:4905 sql_help.c:4947 sql_help.c:4949
-#: sql_help.c:4953 sql_help.c:4955 sql_help.c:4956 sql_help.c:4957
-#: sql_help.c:5025 sql_help.c:5152 sql_help.c:5194 sql_help.c:5196
-#: sql_help.c:5200 sql_help.c:5202 sql_help.c:5203 sql_help.c:5204
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "FROM項目"
 
-#: sql_help.c:3372 sql_help.c:3857 sql_help.c:4210 sql_help.c:5027
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "カーソル名"
 
-#: sql_help.c:3373 sql_help.c:4064 sql_help.c:4158 sql_help.c:5028
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
 msgid "output_alias"
 msgstr "出力別名"
 
-#: sql_help.c:3374 sql_help.c:4065 sql_help.c:4159 sql_help.c:5029
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "出力表現"
 
-#: sql_help.c:3375 sql_help.c:4066 sql_help.c:4160 sql_help.c:4646
-#: sql_help.c:4749 sql_help.c:4904 sql_help.c:5030 sql_help.c:5151
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "出力名"
 
-#: sql_help.c:3391
+#: sql_help.c:3411
 msgid "code"
 msgstr "コードブロック"
 
-#: sql_help.c:3796
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "パラメータ"
 
-#: sql_help.c:3820 sql_help.c:4235
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "文"
 
-#: sql_help.c:3856 sql_help.c:4209
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "方向"
 
-#: sql_help.c:3858 sql_help.c:4211
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "方向 は以下のうちのいずれか:"
 
-#: sql_help.c:3859 sql_help.c:3860 sql_help.c:3861 sql_help.c:3862
-#: sql_help.c:3863 sql_help.c:4212 sql_help.c:4213 sql_help.c:4214
-#: sql_help.c:4215 sql_help.c:4216 sql_help.c:4656 sql_help.c:4658
-#: sql_help.c:4760 sql_help.c:4762 sql_help.c:4914 sql_help.c:4916
-#: sql_help.c:5092 sql_help.c:5094 sql_help.c:5161 sql_help.c:5163
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "取り出す位置や行数"
 
-#: sql_help.c:3966 sql_help.c:4433
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "シーケンス名"
 
-#: sql_help.c:3984 sql_help.c:4451
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "引数名"
 
-#: sql_help.c:3985 sql_help.c:4452
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "引数の型"
 
-#: sql_help.c:3992 sql_help.c:4459
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "ラージオブジェクトid"
 
-#: sql_help.c:4023
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "リモートスキーマ"
 
-#: sql_help.c:4026
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "ローカルスキーマ"
 
-#: sql_help.c:4062
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "競合ターゲット"
 
-#: sql_help.c:4063
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "競合時アクション"
 
-#: sql_help.c:4067
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "競合ターゲットは以下のいずれかです:"
 
-#: sql_help.c:4068
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "インデックスのカラム名"
 
-#: sql_help.c:4069
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "インデックス表現"
 
-#: sql_help.c:4072
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "インデックスの述語"
 
-#: sql_help.c:4074
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "競合時アクションは以下のいずれかです:"
 
-#: sql_help.c:4080 sql_help.c:4183 sql_help.c:5024
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "副問い合わせ句"
 
-#: sql_help.c:4089 sql_help.c:4224 sql_help.c:4999
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "チャネル"
 
-#: sql_help.c:4111
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "ロックモード"
 
-#: sql_help.c:4112
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "ロックモードは以下のいずれかです:"
 
-#: sql_help.c:4153
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "ターゲットテーブル名"
 
-#: sql_help.c:4154
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "ターゲット別名"
 
-#: sql_help.c:4155
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "データ源"
 
-#: sql_help.c:4156 sql_help.c:4692 sql_help.c:4950 sql_help.c:5197
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "JOIN条件"
 
-#: sql_help.c:4157
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "WHEN句"
 
-#: sql_help.c:4161
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "ここで\"データ源\"は以下の通り:"
 
-#: sql_help.c:4162
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "データ源テーブル名"
 
-#: sql_help.c:4163
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "データ源問い合わせ"
 
-#: sql_help.c:4164
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "データ源別名"
 
-#: sql_help.c:4165
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "WHEN句は以下の通り:"
 
-#: sql_help.c:4167 sql_help.c:4170
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "マージ更新"
 
-#: sql_help.c:4168 sql_help.c:4171
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "マージ削除"
 
-#: sql_help.c:4173
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "マージ挿入"
 
-#: sql_help.c:4174
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "そして\"マージ挿入\"は以下の通り:"
 
-#: sql_help.c:4177
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "そして\"マージ更新\"は以下の通り:"
 
-#: sql_help.c:4184
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "そして\"マージ削除\"は以下の通り:"
 
-#: sql_help.c:4225
+#: sql_help.c:4245
 msgid "payload"
 msgstr "ペイロード"
 
-#: sql_help.c:4252
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "元のロール"
 
-#: sql_help.c:4253
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "新しいロール"
 
-#: sql_help.c:4292 sql_help.c:4501 sql_help.c:4509
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "セーブポイント名"
 
-#: sql_help.c:4649 sql_help.c:4707 sql_help.c:4907 sql_help.c:4965
-#: sql_help.c:5154 sql_help.c:5212
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "グルーピング要素"
 
-#: sql_help.c:4651 sql_help.c:4755 sql_help.c:4909 sql_help.c:5156
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "ウィンドウ名"
 
-#: sql_help.c:4652 sql_help.c:4756 sql_help.c:4910 sql_help.c:5157
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "ウィンドウ定義"
 
-#: sql_help.c:4653 sql_help.c:4667 sql_help.c:4711 sql_help.c:4757
-#: sql_help.c:4911 sql_help.c:4925 sql_help.c:4969 sql_help.c:5158
-#: sql_help.c:5172 sql_help.c:5216
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "SELECT句"
 
-#: sql_help.c:4659 sql_help.c:4917 sql_help.c:5164
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "FROM参照"
 
-#: sql_help.c:4660 sql_help.c:4918 sql_help.c:5165
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "FROM項目は以下のいずれかです:"
 
-#: sql_help.c:4663 sql_help.c:4669 sql_help.c:4672 sql_help.c:4676
-#: sql_help.c:4688 sql_help.c:4921 sql_help.c:4927 sql_help.c:4930
-#: sql_help.c:4934 sql_help.c:4946 sql_help.c:5168 sql_help.c:5174
-#: sql_help.c:5177 sql_help.c:5181 sql_help.c:5193
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "列別名"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5169
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "サンプリングメソッド"
 
-#: sql_help.c:4666 sql_help.c:4924 sql_help.c:5171
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "乱数シード"
 
-#: sql_help.c:4670 sql_help.c:4709 sql_help.c:4928 sql_help.c:4967
-#: sql_help.c:5175 sql_help.c:5214
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "WITH問い合わせ名"
 
-#: sql_help.c:4680 sql_help.c:4683 sql_help.c:4686 sql_help.c:4938
-#: sql_help.c:4941 sql_help.c:4944 sql_help.c:5185 sql_help.c:5188
-#: sql_help.c:5191
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "カラム定義"
 
-#: sql_help.c:4690 sql_help.c:4696 sql_help.c:4948 sql_help.c:4954
-#: sql_help.c:5195 sql_help.c:5201
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "JOINタイプ"
 
-#: sql_help.c:4693 sql_help.c:4951 sql_help.c:5198
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "JOINカラム"
 
-#: sql_help.c:4694 sql_help.c:4952 sql_help.c:5199
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "JOIN用別名"
 
-#: sql_help.c:4700 sql_help.c:4958 sql_help.c:5205
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "グルーピング要素は以下のいずれかです:"
 
-#: sql_help.c:4708 sql_help.c:4966 sql_help.c:5213
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "WITH問い合わせは以下のいずれかです:"
 
-#: sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "VALUES句"
 
-#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "INSERT句"
 
-#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "UPDATE句"
 
-#: sql_help.c:4715 sql_help.c:4973 sql_help.c:5220
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "DELETE句"
 
-#: sql_help.c:4716 sql_help.c:4974 sql_help.c:5221
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "MERGE句"
 
-#: sql_help.c:4718 sql_help.c:4976 sql_help.c:5223
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "SEARCH順序列名"
 
-#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "循環識別列名"
 
-#: sql_help.c:4721 sql_help.c:4979 sql_help.c:5226
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "循環識別値"
 
-#: sql_help.c:4722 sql_help.c:4980 sql_help.c:5227
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "循環識別デフォルト"
 
-#: sql_help.c:4723 sql_help.c:4981 sql_help.c:5228
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "循環パス列名"
 
-#: sql_help.c:4750
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "新しいテーブル"
 
-#: sql_help.c:4821
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "スナップショットID"
 
-#: sql_help.c:5090
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "ソート表現"
 
-#: sql_help.c:5235 sql_help.c:6219
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "現在のトランザクションを中止します"
 
-#: sql_help.c:5241
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "集約関数の定義を変更します"
 
-#: sql_help.c:5247
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "照合順序の定義を変更します"
 
-#: sql_help.c:5253
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "エンコーディング変換ルールの定義を変更します"
 
-#: sql_help.c:5259
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "データベースを変更します"
 
-#: sql_help.c:5265
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "デフォルトのアクセス権限を定義します"
 
-#: sql_help.c:5271
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "ドメインの定義を変更します"
 
-#: sql_help.c:5277
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "イベントトリガーの定義を変更します"
 
-#: sql_help.c:5283
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "機能拡張の定義を変更します"
 
-#: sql_help.c:5289
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "外部データラッパの定義を変更します"
 
-#: sql_help.c:5295
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "外部テーブルの定義を変更します"
 
-#: sql_help.c:5301
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "関数の定義を変更します"
 
-#: sql_help.c:5307
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "ロール名またはメンバーシップを変更します"
 
-#: sql_help.c:5313
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "インデックスの定義を変更します"
 
-#: sql_help.c:5319
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "手続き言語の定義を変更します"
 
-#: sql_help.c:5325
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "ラージオブジェクトの定義を変更します"
 
-#: sql_help.c:5331
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "実体化ビューの定義を変更します"
 
-#: sql_help.c:5337
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "演算子の定義を変更します"
 
-#: sql_help.c:5343
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "演算子クラスの定義を変更します"
 
-#: sql_help.c:5349
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "演算子族の定義を変更します"
 
-#: sql_help.c:5355
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "行レベルのセキュリティ ポリシーの定義を変更します"
 
-#: sql_help.c:5361
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "プロシージャの定義を変更します"
 
-#: sql_help.c:5367
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "パブリケーションの定義を変更します"
 
-#: sql_help.c:5373 sql_help.c:5475
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "データベースロールを変更します"
 
-#: sql_help.c:5379
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "ルーチンの定義を変更します"
 
-#: sql_help.c:5385
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "ルールの定義を変更します"
 
-#: sql_help.c:5391
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "スキーマの定義を変更します"
 
-#: sql_help.c:5397
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "シーケンス生成器の定義を変更します"
 
-#: sql_help.c:5403
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "外部サーバーの定義を変更します"
 
-#: sql_help.c:5409
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "拡張統計情報オブジェクトの定義を変更します"
 
-#: sql_help.c:5415
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "サブスクリプションの定義を変更します"
 
-#: sql_help.c:5421
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "サーバーの設定パラメータを変更します"
 
-#: sql_help.c:5427
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "テーブルの定義を変更します。"
 
-#: sql_help.c:5433
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "テーブル空間の定義を変更します"
 
-#: sql_help.c:5439
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "テキスト検索設定の定義を変更します"
 
-#: sql_help.c:5445
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "テキスト検索辞書の定義を変更します"
 
-#: sql_help.c:5451
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "テキスト検索パーサーの定義を変更します"
 
-#: sql_help.c:5457
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "テキスト検索テンプレートの定義を変更します"
 
-#: sql_help.c:5463
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "トリガーの定義を変更します"
 
-#: sql_help.c:5469
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "型の定義を変更します"
 
-#: sql_help.c:5481
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "ユーザーマッピングの定義を変更します"
 
-#: sql_help.c:5487
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "ビューの定義を変更します"
 
-#: sql_help.c:5493
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "データベースの統計情報を収集します"
 
-#: sql_help.c:5499 sql_help.c:6297
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "トランザクション区間を開始します"
 
-#: sql_help.c:5505
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "プロシージャを実行します"
 
-#: sql_help.c:5511
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "先行書き込みログのチェックポイントを強制的に実行します"
 
-#: sql_help.c:5517
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "カーソルを閉じます"
 
-#: sql_help.c:5523
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "インデックスに従ってテーブルをクラスタ化します"
 
-#: sql_help.c:5529
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "オブジェクトのコメントを定義または変更します"
 
-#: sql_help.c:5535 sql_help.c:6093
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "現在のトランザクションをコミットします"
 
-#: sql_help.c:5541
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "二相コミットのために事前に準備されたトランザクションをコミットします"
 
-#: sql_help.c:5547
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "ファイルとテーブルとの間でデータをコピーします"
 
-#: sql_help.c:5553
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "新しいアクセスメソッドを定義します"
 
-#: sql_help.c:5559
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "新しい集約関数を定義します"
 
-#: sql_help.c:5565
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "新しい型変換を定義します"
 
-#: sql_help.c:5571
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "新しい照合順序を定義します"
 
-#: sql_help.c:5577
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "新しいエンコーディング変換を定義します"
 
-#: sql_help.c:5583
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "新しいデータベースを作成します"
 
-#: sql_help.c:5589
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "新しいドメインを定義します"
 
-#: sql_help.c:5595
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "新しいイベントトリガーを定義します"
 
-#: sql_help.c:5601
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "機能拡張をインストールします"
 
-#: sql_help.c:5607
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "新しい外部データラッパを定義します"
 
-#: sql_help.c:5613
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "新しい外部テーブルを定義します"
 
-#: sql_help.c:5619
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "新しい関数を定義します"
 
-#: sql_help.c:5625 sql_help.c:5685 sql_help.c:5787
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "新しいデータベースロールを定義します"
 
-#: sql_help.c:5631
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "新しいインデックスを定義します"
 
-#: sql_help.c:5637
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "新しい手続き言語を定義します"
 
-#: sql_help.c:5643
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "新しい実体化ビューを定義します"
 
-#: sql_help.c:5649
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "新しい演算子を定義します"
 
-#: sql_help.c:5655
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "新しい演算子クラスを定義します"
 
-#: sql_help.c:5661
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "新しい演算子族を定義します"
 
-#: sql_help.c:5667
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "テーブルに対して新しい行レベルセキュリティポリシーを定義します"
 
-#: sql_help.c:5673
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "新しいプロシージャを定義します"
 
-#: sql_help.c:5679
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "新しいパブリケーションを定義します"
 
-#: sql_help.c:5691
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "新しい書き換えルールを定義します"
 
-#: sql_help.c:5697
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "新しいスキーマを定義します"
 
-#: sql_help.c:5703
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "新しいシーケンス生成器を定義します。"
 
-#: sql_help.c:5709
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "新しい外部サーバーを定義します"
 
-#: sql_help.c:5715
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "拡張統計情報を定義します"
 
-#: sql_help.c:5721
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "新しいサブスクリプションを定義します"
 
-#: sql_help.c:5727
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "新しいテーブルを定義します"
 
-#: sql_help.c:5733 sql_help.c:6255
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "問い合わせの結果から新しいテーブルを定義します"
 
-#: sql_help.c:5739
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "新しいテーブル空間を定義します"
 
-#: sql_help.c:5745
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "新しいテキスト検索設定を定義します"
 
-#: sql_help.c:5751
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "新しいテキスト検索辞書を定義します"
 
-#: sql_help.c:5757
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "新しいテキスト検索パーサーを定義します"
 
-#: sql_help.c:5763
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "新しいテキスト検索テンプレートを定義します"
 
-#: sql_help.c:5769
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "新しいデータ変換を定義します"
 
-#: sql_help.c:5775
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "新しいトリガーを定義します"
 
-#: sql_help.c:5781
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "新しいデータ型を定義します"
 
-#: sql_help.c:5793
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "外部サーバーに対するユーザーの新しいマッピングを定義します。"
 
-#: sql_help.c:5799
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "新しいビューを定義します"
 
-#: sql_help.c:5805
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "準備した文を解放します"
 
-#: sql_help.c:5811
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "カーソルを定義します"
 
-#: sql_help.c:5817
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "テーブルの行を削除します"
 
-#: sql_help.c:5823
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "セッション状態を破棄します"
 
-#: sql_help.c:5829
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "無名コードブロックを実行します"
 
-#: sql_help.c:5835
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "アクセスメソッドを削除します"
 
-#: sql_help.c:5841
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "集約関数を削除します"
 
-#: sql_help.c:5847
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "型変換を削除します"
 
-#: sql_help.c:5853
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "照合順序を削除します"
 
-#: sql_help.c:5859
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "符号化方式変換を削除します"
 
-#: sql_help.c:5865
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "データベースを削除します"
 
-#: sql_help.c:5871
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "ドメインを削除します"
 
-#: sql_help.c:5877
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "イベントトリガーを削除します"
 
-#: sql_help.c:5883
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "機能拡張を削除します"
 
-#: sql_help.c:5889
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "外部データラッパを削除します"
 
-#: sql_help.c:5895
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "外部テーブルを削除します"
 
-#: sql_help.c:5901
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "関数を削除します"
 
-#: sql_help.c:5907 sql_help.c:5973 sql_help.c:6075
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "データベースロールを削除します"
 
-#: sql_help.c:5913
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "インデックスを削除します"
 
-#: sql_help.c:5919
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "手続き言語を削除します"
 
-#: sql_help.c:5925
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "実体化ビューを削除します"
 
-#: sql_help.c:5931
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "演算子を削除します"
 
-#: sql_help.c:5937
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "演算子クラスを削除します"
 
-#: sql_help.c:5943
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "演算子族を削除します"
 
-#: sql_help.c:5949
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "データベースロールが所有するデータベースオブジェクトを削除します"
 
-#: sql_help.c:5955
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "テーブルから行レベルのセキュリティポリシーを削除します"
 
-#: sql_help.c:5961
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "プロシージャを削除します"
 
-#: sql_help.c:5967
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "パブリケーションを削除します"
 
-#: sql_help.c:5979
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "ルーチンを削除します"
 
-#: sql_help.c:5985
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "書き換えルールを削除します"
 
-#: sql_help.c:5991
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "スキーマを削除します"
 
-#: sql_help.c:5997
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "シーケンスを削除します"
 
-#: sql_help.c:6003
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "外部サーバー記述子を削除します"
 
-#: sql_help.c:6009
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "拡張統計情報を削除します"
 
-#: sql_help.c:6015
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "サブスクリプションを削除します"
 
-#: sql_help.c:6021
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "テーブルを削除します"
 
-#: sql_help.c:6027
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "テーブル空間を削除します"
 
-#: sql_help.c:6033
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "テキスト検索設定を削除します"
 
-#: sql_help.c:6039
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "テキスト検索辞書を削除します"
 
-#: sql_help.c:6045
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "テキスト検索パーサーを削除します"
 
-#: sql_help.c:6051
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "テキスト検索テンプレートを削除します"
 
-#: sql_help.c:6057
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "データ変換を削除します"
 
-#: sql_help.c:6063
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "トリガーを削除します"
 
-#: sql_help.c:6069
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "データ型を削除します"
 
-#: sql_help.c:6081
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "外部サーバーのユーザーマッピングを削除します"
 
-#: sql_help.c:6087
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "ビューを削除します"
 
-#: sql_help.c:6099
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "準備した文を実行します"
 
-#: sql_help.c:6105
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "文の実行計画を表示します"
 
-#: sql_help.c:6111
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "カーソルを使って問い合わせから行を取り出します"
 
-#: sql_help.c:6117
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "アクセス権限を定義します"
 
-#: sql_help.c:6123
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "外部サーバーからテーブル定義をインポートします"
 
-#: sql_help.c:6129
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "テーブルに新しい行を作成します"
 
-#: sql_help.c:6135
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "通知メッセージを監視します"
 
-#: sql_help.c:6141
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "共有ライブラリファイルをロードします"
 
-#: sql_help.c:6147
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "テーブルをロックします"
 
-#: sql_help.c:6153
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "条件によってテーブルの行を挿入、更新または削除する"
 
-#: sql_help.c:6159
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "カーソルを位置づけます"
 
-#: sql_help.c:6165
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "通知を生成します"
 
-#: sql_help.c:6171
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "実行に備えて文を準備します"
 
-#: sql_help.c:6177
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "二相コミットに備えて現在のトランザクションを準備します"
 
-#: sql_help.c:6183
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "データベースロールが所有するデータベースオブジェクトの所有権を変更します"
 
-#: sql_help.c:6189
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "実体化ビューの内容を置き換えます"
 
-#: sql_help.c:6195
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "インデックスを再構築します"
 
-#: sql_help.c:6201
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "以前に定義されたセーブポイントを解放します"
 
-#: sql_help.c:6207
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "実行時パラメータの値をデフォルト値に戻します"
 
-#: sql_help.c:6213
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "アクセス権限を削除します"
 
-#: sql_help.c:6225
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "二相コミットのために事前に準備されたトランザクションをキャンセルします"
 
-#: sql_help.c:6231
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "セーブポイントまでロールバックします"
 
-#: sql_help.c:6237
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "現在のトランザクション内で新しいセーブポイントを定義します"
 
-#: sql_help.c:6243
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "オブジェクトに適用されるセキュリティラベルを定義または変更します"
 
-#: sql_help.c:6249 sql_help.c:6303 sql_help.c:6339
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "テーブルまたはビューから行を取得します"
 
-#: sql_help.c:6261
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "実行時パラメータを変更します"
 
-#: sql_help.c:6267
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "現在のトランザクションについて、制約チェックのタイミングを設定します"
 
-#: sql_help.c:6273
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "現在のセッションの現在のユーザー識別子を設定します"
 
-#: sql_help.c:6279
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr "セッションのユーザー識別子および現在のセッションの現在のユーザー識別子を設定します"
 
-#: sql_help.c:6285
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "現在のトランザクションの特性を設定します"
 
-#: sql_help.c:6291
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "実行時パラメータの値を表示します"
 
-#: sql_help.c:6309
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "一つの、または複数のテーブルを空にします"
 
-#: sql_help.c:6315
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "通知メッセージの監視を中止します"
 
-#: sql_help.c:6321
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "テーブルの行を更新します"
 
-#: sql_help.c:6327
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "ガーベッジコレクションを行い、また必要に応じてデータベースを分析します"
 
-#: sql_help.c:6333
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "行セットを計算します"
 
@@ -6882,7 +6929,7 @@ msgstr "余分なコマンドライン引数\"%s\"は無視されました"
 msgid "could not find own program executable"
 msgstr "実行可能ファイルが見つかりませんでした"
 
-#: tab-complete.in.c:6606
+#: tab-complete.in.c:6633
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6905,28 +6952,28 @@ msgstr "\"%2$s\"の値\"%1$s\"が不正です: 整数を指定してください
 
 #: variables.c:207
 #, c-format
-msgid "invalid input syntax for \"%s\""
-msgstr "\"%s\"に対する不正な入力構文"
+msgid "invalid input syntax for variable \"%s\""
+msgstr "変数\"%s\"に対する不正な入力構文"
 
 #: variables.c:218
 #, c-format
-msgid "invalid value \"%s\" for \"%s\": must be greater than %.2f"
-msgstr "\"%2$s\"の値\"%1$s\"が不正です: %3$.2f より大きい必要があります"
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "変数\"%2$s\"の値\"%1$s\"が不正です: %3$.2f より大きい必要があります"
 
 #: variables.c:225
 #, c-format
-msgid "invalid value \"%s\" for \"%s\": must be less than %.2f"
-msgstr "\"%2$s\"の値\"%1$s\"が不正です: %3$.2f より小さい必要があります"
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "変数\"%2$s\"の値\"%1$s\"が不正です: %3$.2f より小さい必要があります"
 
 #: variables.c:241
 #, c-format
-msgid "\"%s\" is out of range for \"%s\""
-msgstr "\"%s\"は\"%s\"の範囲外です"
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "値\"%s\"は変数%sの範囲外です"
 
 #: variables.c:247
 #, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr "\"%2$s\"に対する不正な値\"%1$s\""
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "変数\"%2$s\"に対する不正な値\"%1$s\""
 
 #: variables.c:294
 #, c-format
@@ -6941,3 +6988,15 @@ msgid ""
 msgstr ""
 "\"%2$s\"の値\"%1$s\"が認識できません。\n"
 "有効な値は %3$s。"
+
+#~ msgid "\"%s\" is out of range for \"%s\""
+#~ msgstr "\"%s\"は\"%s\"の範囲外です"
+
+#~ msgid "\\gexec not allowed in pipeline mode"
+#~ msgstr "\\gexec はパイプラインモードでは使用できません"
+
+#~ msgid "\\gset not allowed in pipeline mode"
+#~ msgstr "\\gset はパイプラインモードでは使用できません"
+
+#~ msgid "\\watch not allowed in pipeline mode"
+#~ msgstr "\\watch はパイプラインモードでは使用できません"
diff --git a/src/bin/psql/po/ka.po b/src/bin/psql/po/ka.po
index 1469e49f5d5..7d7c7e0c869 100644
--- a/src/bin/psql/po/ka.po
+++ b/src/bin/psql/po/ka.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: psql (PostgreSQL) 17\n"
+"Project-Id-Version: psql (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-06-14 02:18+0000\n"
-"PO-Revision-Date: 2024-06-14 06:17+0200\n"
+"POT-Creation-Date: 2025-12-11 05:48+0000\n"
+"PO-Revision-Date: 2025-12-13 13:10+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,24 +16,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.8\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "შეცდომა: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "გაფრთხილება: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "დეტალები: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "მინიშნება: "
@@ -58,28 +58,28 @@ msgstr "გასაშვებად ფაილის \"%s\" პოვნა
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "ბილიკის (\"%s\") აბსოლუტურ ფორმაში ამოხსნის შეცდომა: %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "ბრძანების (\"%s\") შესრულების შეცდომა: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "ბრძანებიდან \"%s\" წაკითხვის შეცდომა: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ბრძანებამ \"%s\" მონაცემები არ დააბრუნა"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s()-ის შეცდომა: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1372 command.c:3458 command.c:3507 command.c:3632 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -101,7 +101,7 @@ msgstr "ნულოვანი მაჩვენებლის დუბლ
 msgid "could not look up effective user ID %ld: %s"
 msgstr "მომხმარებლის ეფექტური ID-ის (%ld) ამოხსნა შეუძლებელია: %s"
 
-#: ../../common/username.c:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "მომხმარებელი არ არსებობს"
 
@@ -162,8 +162,8 @@ msgstr "შეწყვეტილია\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "ვერ გამოვიტანე ცხრილის შემცველობა: უჯრედების რაოდენობა %lld მაქსიმუმის %lld ტოლი ან მასზე მეტია.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "ვერ გამოვიტანე ცხრილის შემცველობა: უჯრედების რაოდენობა %<PRIu64> მაქსიმუმის %zu ტოლი ან მასზე მეტია.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -172,325 +172,432 @@ msgstr "ცხრილის შემცველობაზე თავს
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "ცხრილის შემცველობაზე უჯრედის დამატება შეუძლებელია: უჯრედების ჯამური რაოდენობა %lld-ზე მეტია.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "ცხრილის შემცველობაზე უჯრედის დამატება შეუძლებელია: უჯრედების ჯამური რაოდენობა %<PRIu64>-ზე მეტია.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "გამოტანის არასწორი ფორმატი (შიდა შეცდომა): %d"
 
-#: ../../fe_utils/psqlscan.l:718
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "რეკურსიული გაფართოების გამოტოვება ცვლადისთვის \"%s\""
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "გარსის ბრძანების არგუმენტი ხაზის გადატანას ან კარეტის დაბრუნებას შეიცავს: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "მონაცემთა ბაზის სახელი ხაზის გადატანას ან კარეტის დაბრუნებას შეიცავს: \"%s\"\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
+#: command.c:254
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "ლოკალური მომხმარებლის ID-ის (%d) ამოხსნა შეუძლებელია: %s"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "უკუღმა დახრილი ხაზიანი ბრძანებები შეზღუდულია. დაშვებულია, მხოლოდ, \\unrestrict"
 
-#: ../../port/user.c:48 ../../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "ლოკალური მომხმარებელი ID-ით %d არ არსებობს"
-
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "არასწორი ბრძანება \\%s"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "დახმარებისთვის სცადეთ \\? ."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: დამატებითი არგუმენტი \"%s\" იგნორირებულია"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "\\%s ბრძანება გნორირებულია; მიმდინარე \\if ბლოკიდან გამოსასვლელად გამოიყენეთ \\endif ან Control-C"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s: აკლია საჭირო არგუმენტი"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "მომხმარებლის, ID-ით %ld, საწყის საქაღალდეზე გადასვლის შეცდომა: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: საქაღალდის \"%s\"-ზე შეცვლის შეცდომა: %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "ამჟამად მონაცემთა ბაზასთან მიერთებული არ ბრძანდებით.\n"
 
-#: command.c:667
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
-msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" მისამართზე \"%s\" და პორტზე \"%s\".\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "შეერთების ინფორმაცია"
 
-#: command.c:670
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" სოკეტით \"%s\" და პორტზე \"%s\".\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "პარამეტრი"
 
-#: command.c:676
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
-msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" (მისამართით \"%s\") და პორტზე \"%s\".\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "მნიშვნელობა"
 
-#: command.c:679
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" და პორტზე \"%s\".\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "მონაცემთა ბაზა"
+
+#: command.c:848
+msgid "Client User"
+msgstr "კლიენტის მომხმარებელი"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "ჰოსტის მისამართი"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "სოკეტის საქაღალდე"
+
+#: command.c:868
+msgid "Host"
+msgstr "ჰოსტი"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "სერვერის პორტი"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "პარამეტრები"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "პროტოკოლის ვერსია"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "გამოყენებულია პაროლი"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "ცრუ"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "ჭეშმარიტი"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "GSSAPI-ით ავთენტიკაციით"
 
-#: command.c:1069 command.c:1170 command.c:2675
+#: command.c:898
+msgid "Backend PID"
+msgstr "უკანაბოლოს PID"
+
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL კავშირი"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSL ბიბლიოთეკა"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "უცნობი"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSL პროტოკოლი"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "SSL გასაღების ბიტები"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL შიფრი"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL შეკუმშვა"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "არცერთი"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "მოთხოვნების ბაფერის გარეშე"
 
-#: command.c:1102 command.c:5771
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "ხაზის არასწორი ნომერი: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "ცვლილებების გარეშე"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: კოდირების არასწორი სახელი ან გადაყვანის პროცედურა არ არსებობს"
 
-#: command.c:1368 command.c:2157 command.c:3454 command.c:3652 command.c:5877
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1347 common.c:1385 common.c:1482 common.c:1548
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1375
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "წინა შეცდომის გარეშე."
 
-#: command.c:1488
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s დაუშვებელია კომუნიკაციის არხის რეჟიმში"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: აკლია მარჯვენა მრგვალი ფრჩხილი"
 
-#: command.c:1572 command.c:1691 command.c:1995 command.c:2009 command.c:2028
-#: command.c:2196 command.c:2437 command.c:2642 command.c:2682
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s: აკლია საჭირო არგუმენტი"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: მოთხოვნილი შედეგების არასწორი რიცხვი"
 
-#: command.c:1822
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: არ შეიძლება \\else -ის შემდეგ იყოს"
 
-#: command.c:1827
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: შესაბამისი \\if -ის გარეშე"
 
-#: command.c:1891
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: ვერ გაჩნდება \\else -ის შემდეგ"
 
-#: command.c:1896
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: შესაბამისი \\if -ის გარეშე"
 
-#: command.c:1936
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: შესაბამისი \\if -ის გარეშე"
 
-#: command.c:2092
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "მოთხოვნის ბაფერი ცარიელია."
 
-#: command.c:2135
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "შეიყვანეთ მომხმარებლის (\"%s\") ახალი პაროლი: "
 
-#: command.c:2139
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "შეიყვანეთ კდევ ერთხელ: "
 
-#: command.c:2148
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "პაროლები არ ემთხვევა."
 
-#: command.c:2231
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: ცვლადის მნიშვნელობის წაკითხვის შეცდომა"
 
-#: command.c:2333
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "მოთხოვნის ბაფერი ცარიელია(გასუფთავდა)."
 
-#: command.c:2355
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "ისტორია ჩაწერილია ფაილში \"%s\".\n"
 
-#: command.c:2442
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline აუცილებელია, \\bind, ან \\bind_named ბრძანებების შემდეგ გამოიყენოთ"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline დაუშვებელია საკომუნიკაციო არხის რეჟიმის გარეთ"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: გარემოს ცვლადის სახელი \"=\" -ს არ შეიძლება შეიცავდეს"
 
-#: command.c:2490
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "ფუნქციის სახელი აუცილებელია"
 
-#: command.c:2492
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "საჭიროა ხედის სახელი"
 
-#: command.c:2614
+#: command.c:3176
 msgid "Timing is on."
 msgstr "დროის დათვლა ჩართულია."
 
-#: command.c:2616
+#: command.c:3178
 msgid "Timing is off."
 msgstr "დროის დათვლა გამორთულია."
 
-#: command.c:2702 command.c:2740 command.c:4163 command.c:4166 command.c:4169
-#: command.c:4175 command.c:4177 command.c:4203 command.c:4213 command.c:4225
-#: command.c:4239 command.c:4266 command.c:4324 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: არ იმყოფებით შეზღუდულ რეჟიმში"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: არასწორი გასაღები"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2729 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2801 command.c:2867
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: ინტერვალის მნიშვნელობა ერთზე მეტჯერაა მითითებული"
 
-#: command.c:2811 command.c:2877
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: არასწორი ინტერვალის მნიშვნელობა \"%s\""
 
-#: command.c:2821
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: იტერაციის რაოდენობა ერთზე მეტჯერაა მითითებული"
 
-#: command.c:2831
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: არასწორი იტერაციების რაოდენობა \"%s\""
 
-#: command.c:2841
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: მინიმალური მწკრივების რაოდენობა ერთზე მეტჯერაა მითითებული"
 
-#: command.c:2851
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: არასწორი მინიმალური მწკრივების რაოდენობა \"%s\""
 
-#: command.c:2858
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: უცნობი პარამეტრი \"%s\""
 
-#: command.c:3255 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "პაროლი: "
 
-#: command.c:3260 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "პაროლი მომხმარებლისთვის %s: "
 
-#: command.c:3316
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "შეერთების სტრიქონის გამოყენებისას მომხმარებლის, ჰოსტისა და და პორტის არ მითითება"
 
-#: command.c:3351
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "მონაცემთა ბაზის კავშირი პარამეტრების ხელახლა გამოსაყენებლად არ არსებობს"
 
-#: command.c:3658
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "წინა შეერთება ჯერ კიდევ არსებობს"
 
-#: command.c:3664
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:3720
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" მისამართზე \"%s\" და პორტზე \"%s\".\n"
 
-#: command.c:3723
+#: command.c:4343
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" სოკეტით \"%s\" და პორტზე \"%s\".\n"
 
-#: command.c:3729
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" (მისამართით \"%s\") და პორტზე \"%s\".\n"
 
-#: command.c:3732
+#: command.c:4352
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" და პორტზე \"%s\".\n"
 
-#: command.c:3737
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\"\n"
 
-#: command.c:3843
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, სერვერი %s)\n"
 
-#: command.c:3856
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -499,33 +606,25 @@ msgstr ""
 "გაფრთხილება: %s ძირითადი ვერსია %s, სერვერის ძირითადი ვერსია %s.\n"
 "         psql-ის ზოგიერთმა ფუნქციამ შეიძლება არ იმუშაოს.\n"
 
-#: command.c:3895
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL შეერთება (პროტოკოლი: %s, შიფრაცია: %s, შეკუშმვა: %s, ALPN: %s)\n"
 
-#: command.c:3896 command.c:3897
-msgid "unknown"
-msgstr "უცნობი"
-
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "გამორთული"
 
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "ჩართ"
 
-#: command.c:3899
-msgid "none"
-msgstr "არცერთი"
-
-#: command.c:3913
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "GSSAPI-ით დაშიფრული შეერთება\n"
 
-#: command.c:3933
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -536,284 +635,284 @@ msgstr ""
 "          8-ბიტიანი სიმბოლოებმა შეიძლება სწორად არ იმუშაოს. მეტი დეტალებისთვის\n"
 "          იხილეთ psql-ის დოკუმენტაციის გვერდი გვერდი \"შენიშვნები Windows-ის მომხმარებლებისთვის\".\n"
 
-#: command.c:4038
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "საჭიროა გარემოს ცვლადის PSQL_EDITOR_LINENUMBER_ARG დაყენება ხაზის ნომერზე"
 
-#: command.c:4068
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "რედაქტორის გაშვების შეცდომა: \"%s\""
 
-#: command.c:4070
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "/bin/sh-ის გაშვების შეცდომა"
 
-#: command.c:4120
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "დროებითი საქაღალდის მოძებნის შეცდომა: %s"
 
-#: command.c:4147
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "დროებითი ფაილის (\"%s\") გახსნის შეცდომა: %m"
 
-#: command.c:4483
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: \"%s\"-ის არასწორი აბრევიატურა ორივეს, \"%s\"-ს და \"%s-ს ემთხვევა\""
 
-#: command.c:4503
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: დასაშვები ფორმატებია: aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4522
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: ხაზის ნებადართული სტილებია ascii, old-ascii და unicode"
 
-#: command.c:4537
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: უნიკოდის საზღვრის ხაზის ნებადართული სტილებია single და double"
 
-#: command.c:4552
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: უნიკოდის სვეტის ხაზის ნებადართული სტილებია single და double"
 
-#: command.c:4567
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset:უნიკოდის თავსართის ხაზების ნებადართულ სტილებია single და double"
 
-#: command.c:4619
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
-msgstr "\\pset: xheader_width-ის დაშვებული მნიშვნელობებია \"%s\" (ნაგულისხმები), \"%s\", \"%s\", ან რიცხვი, რომელიც ზუსტ სიგანეზე მიუთითებს"
+msgstr "\\pset: xheader_width-ის დაშვებული მნიშვნელობებია \"%s\" (ნაგულისხმევი), \"%s\", \"%s\", ან რიცხვი, რომელიც ზუსტ სიგანეზე მიუთითებს"
 
-#: command.c:4636
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep ერთი ერთბაიტიანი სიმბოლო უნდა იყოს"
 
-#: command.c:4641
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldsep არ შეიძლება იყოს ორმაგი ბრჭყალი, ხაზის დასასრული და კარეტის გადატანა"
 
-#: command.c:4779 command.c:4980
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: არასწორი პარამეტრი: %s"
 
-#: command.c:4799
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "საზღვრის სტილი: %d\n"
 
-#: command.c:4805
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "სამიზნის სიგანე დაყენებული არაა.\n"
 
-#: command.c:4807
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "სამიზნის სიგანეა %d.\n"
 
-#: command.c:4814
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "გაფართოებული ეკრანი ჩართულია.\n"
 
-#: command.c:4816
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "გაფართოებული ეკრანი ავტომატურად გამოიყენება.\n"
 
-#: command.c:4818
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "გაფართოებული ეკრანი გამორთულია.\n"
 
-#: command.c:4825 command.c:4827 command.c:4829
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "გაფართოებული თავსართის სიგანეა \"%s\".\n"
 
-#: command.c:4831
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "გაფართოებული თავსართია %d.\n"
 
-#: command.c:4837
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "CSV-ში ველების განმაცალკევებელია \"%s\".\n"
 
-#: command.c:4845 command.c:4853
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "ველების განმაცალკევებელი ნულოვანი ბაიტია.\n"
 
-#: command.c:4847
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "ველების განმაცალკევებელია \"%s\".\n"
 
-#: command.c:4860
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "მდგომარეობის ზოლი ჩართულია.\n"
 
-#: command.c:4862
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
-msgstr "ნაგულისხმები ქვესართი გამორთულია\n"
+msgstr "ნაგულისხმევი ქვესართი გამორთულია\n"
 
-#: command.c:4868
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "გამოტანის ფორმატია %s.\n"
 
-#: command.c:4874
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "ხაზის სტილია %s.\n"
 
-#: command.c:4881
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "ნულოვანია ეკრანია \"%s\".\n"
 
-#: command.c:4889
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "რიცხვების ენაზე მორგებული გამოტანა ჩართულია.\n"
 
-#: command.c:4891
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "რიცხვების ენაზე მორგებული გამოტანა გამორთულა.\n"
 
-#: command.c:4898
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "გრძელი გამოტანისას გამოიყენება გვერდების გადამრთველი.\n"
 
-#: command.c:4900
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "გვერდების გადამრთველი ყოველთვის გამოიყენება.\n"
 
-#: command.c:4902
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "გვერდების გადამრთველი გამორთულია.\n"
 
-#: command.c:4908
+#: command.c:5537
 #, 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] "გვერდების გადამრთველი %d-ზე ნაკლებ ხაზზე არ მუშაობს.\n"
 msgstr[1] "გვერდების გადამრთველი %d-ზე ნაკლებ ხაზზე არ მუშაობს.\n"
 
-#: command.c:4918 command.c:4928
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "ჩანაწერის გამყოფი ნული ბაიტია.\n"
 
-#: command.c:4920
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "ჩანაწერის გამყოფია <newline>.\n"
 
-#: command.c:4922
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "ჩანაწერის გამყოფია \"%s\".\n"
 
-#: command.c:4935
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "ცხრილის ატრიბუტებია \"%s\".\n"
 
-#: command.c:4938
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "ცხრილის ატრიბუტები მოხსნილია.\n"
 
-#: command.c:4945
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "სათაურია \"%s\".\n"
 
-#: command.c:4947
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "სათაურის დაყენება გაუქმდა.\n"
 
-#: command.c:4954
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "მხოლოდ სტრუქტურები ჩართულია.\n"
 
-#: command.c:4956
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "მხოლოდ სტრუქტურები გამორთულია.\n"
 
-#: command.c:4962
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "უნიკოდის საზღვრის ხაზის სტილია \"%s\".\n"
 
-#: command.c:4968
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "უნიკოდის სვეტის ხაზის სტილია \"%s\".\n"
 
-#: command.c:4974
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "უნიკოდის თავსართის ხაზის სტილია \"%s\".\n"
 
-#: command.c:5223
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: შეცდომა"
 
-#: command.c:5257
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch ცარიელი მოთხოვნით გამოყენებული ვერ იქნება"
 
-#: command.c:5289
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "დროის აღმრიცხველის დაყენების შეცდომა: %m"
 
-#: command.c:5358
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (ყოველ %g-ში)\n"
 
-#: command.c:5361
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (ყოველ %g-ში)\n"
 
-#: command.c:5424
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "სიგნალებისთვის დალოდება შეუძლებელია: %m"
 
-#: command.c:5480 command.c:5487 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -826,107 +925,107 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: command.c:5666
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\" ხედი არაა"
 
-#: command.c:5682
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "reloptions მასივის დამუშავების შეცდომა"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "გაქცევა აქტიური შეერთებს გარეშე შეუძლებელია"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "გარსის ბრძანება ხაზის გადატანას ან კარეტის დაბრუნებას შეიცავს: \"%s\""
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "სერვერთან კავშირი დაკარგულია"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "სერვერთან კავშირი დაკარგულია. ვეცდები თავიდან დავიწყო: "
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "ჩავარდა.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "წარმატებულია.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "მოულოდნელი PQresultStatus: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "დრო: %.3f მწმ\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "დრო: %.3f მწმ (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "დრო: %.3f მწმ (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "დრო: %.3f მწმ (%.0f დღე %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "ამჟამად მონაცემთა ბაზასთან მიერთებული არ ბრძანდებით."
 
-#: common.c:714
+#: common.c:749
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "მიღებულია ასინქრონული გაფრთხილება \"%s\" შემცველობით \"%s\" სერვერის პროცესისგან PID-ით %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "მიღებულია ასინქრონული გაფრთხილება \"%s\" სერვერის პროცესისგან PID-ით %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "შედეგების ცხრილის გამოტანის შეცდომა: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "\\gset -სთვის მწკრივები არ დაბრუნებულა"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "\\gset -სთვის ერთზე მეტი მწკრივი დაბრუნდა"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "მცდელობა, \\gset-ი სპეციალურ ცვლადზე (\"%s\") ყოფილიყო გამოყენებული, იგნორირებულია"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify command)******************************************/\n"
@@ -937,37 +1036,52 @@ msgstr ""
 "%s\n"
 "***(დააწექით Enter-ს გასაგრძელებლად. გასაუქმებლად კი x-ს და შემდეგ Enter-ს )********************\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "ოპერატორი:   %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "ტრანზაქციის მოულოდნელი სტატუსი (%d)"
 
-#: common.c:1369 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "სვეტი"
 
-#: common.c:1370 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "ტიპი"
 
-#: common.c:1419
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "ბრძანებას შედეგები არ აქვს, ან შედეგებში სვეტები არაა.\n"
 
-#: common.c:1511
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "მისაღები შედეგები დარჩენილი არაა"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "ნაგლეჯების რეჟიმში შედეგების გამოთხოვა ჩავარდა"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "კომუნიკაციის არხი გაუქმდა. ბრძანება არ გაშვებულა"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY კომუნიკაციის არხში მხარდაჭერილი არაა. კავშირი გაუქმდება"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1020,11 +1134,11 @@ msgstr ""
 "შეიყვანეთ დასაკოპირებელიმ ხაზის გადატანით დასრულებული მონაცემები.\n"
 "დაასრულეთ უკანა ხაზით და წერტილით იგივე ხაზში ხაზით, ან EOF სიგნალით."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "დასრულდა კითხვის შეცდომის გამო"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "კოპირების რეჟიმიდან გამოსვლის მცდელობა"
 
@@ -1073,1162 +1187,1252 @@ msgstr "\\crosstabview: სვეტის არასწორი სახე
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: სვეტის სახელი არ არსებობს: \"%s\""
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "სქემა"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "სახელი"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "შედეგის მონაცემების ტიპი"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "არგუმენტის მონაცემების ტიპი"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "აღწერა"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "აგრეგატული ფუნქცების სია"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "სერვერს (ვერსია %s) წვდომის მეთოდების მხარდაჭერა არ გააჩნია."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "ინდექსი"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "ცხრილი"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "დამმუშავებელი"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "წვდომის მეთოდების სია"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "მფლობელი"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "მდებარეობა"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "პარამეტრები"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "ზომა"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "ცხრილის სივრცეების სია"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df მხოლოდ [anptwS+] -ს იღებს პარამეტრად"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df მხოლოდ [%s] -ს იღებს პარამეტრებად"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df - არ იღებს \"%c\" პარამეტრს, როცა სერვერის ვერსიაა %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "აგ"
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "ფანჯარა"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "პროც"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "ფუნქც"
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "ტრიგერი"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "დაურღვეველი"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "სტაბილური"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "ცვალებადი"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "ცვალებადობა"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "შეზღუდულია"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "უსაფრთხო"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "unsafe"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "პარალელური"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "აღმწერი"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "ჩამწოდებელი"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "დიახ"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "არა"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Leakproof?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "ენა"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "შიდა სახელი"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "ფუნქციების სია"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "ელემენტები"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "მონაცემების ტიპების სია"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "მარცხენა არგუმენტის ტიპი"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "მარჯვენა არგუმენტის ტიპი"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "შედეგის ტიპი"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "ფუნქცია"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "ოპერატორების სია"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "კოდირება"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "ლოკალის მომწოდებელი"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "დაშლა"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "ლოკალი"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "ICU წესები"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "ცხრილების სივრცე"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "მონაცემთა ბაზების სია"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "ცხრილი"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "ხედი"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "მატერიალიზებული ხედი"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "მიმდევრობა"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "გარე ცხრილი"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "დაყოფილი ცხრილი"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "სვეტის წვდომები"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "წესები"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "წვდომები"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "ფუნქცია"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "ტიპი"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "schema"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "დიდი ობიექტი"
+
+#: describe.c:1265
 msgid "Default access privileges"
-msgstr "ნაგულისხმები წვდომები"
+msgstr "ნაგულისხმევი წვდომები"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "ობიექტი"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "ცხრილის შეზღუდვები"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "დომენის შეზღუდვები"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "ოპერატორის კლასი"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "ოპერატორის ოჯახი"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "ობიექტების აღწერა"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "ურთიერთობა სახელით \"%s\" არ არსებობს."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "ურთიერთობები ნაპოვნი არაა."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "ურთიერთობები, რომლის OID=%s, არ არსებობს."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "დაწყება"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "მინიმუმი"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "მაქსიმუმი"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "გაზრდა"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "დიახ"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "არა"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "ციკლები?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "კეში"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "მფლობელი: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "იდენტიფიკაციის სვეტის მიმდევრობა: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "ჟურნალში არ-ჩაწერილი მიმდევრომა \"%s.%s\""
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "მიმდევრობა \"%s.%s\""
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "ჟურნალში არ-ჩაწერილი ცხრილი \"%s.%s\""
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "ცხრილი \"%s.%s\""
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "ხედი \"%s.%s\""
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "ჟურნალში არ-ჩაწერილი მატერიალიზებული ხედი \"%s.%s\""
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "მატერიალიზებული ხედი \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "ჟურნალში არ-ჩაწერილი ინდექსი \"%s.%s\""
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "ინდექსი \"%s.%s\""
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "ჟურნალში არ-ჩაწერილი დაყოფილი ინდექსი \"%s.%s\""
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "დაყოფილი ინდექი \"%s.%s\""
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST ცხრილი \"%s.%s\""
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "კომპოზიტის ტიპი \"%s.%s\""
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "გარე ცხრილი \"%s.%s\""
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "ჟურნალში არ-ჩაწერილი დაყოფილი ცხრილი \"%s.%s\""
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "დაყოფილი ცხრილი \"%s.%s\""
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "კოლაცია"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "განულებადი"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "ნაგულისხმევი"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "გასაღები?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "განმარტება"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "FDW -ის მორგება"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "საცავი"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "შეკუმშვა"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "სამიზნის სტატისტიკა"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "დანაყოფი: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "დანაყოფის შეზღუდვების გარეშე"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "დანაყოფის შეზღუდვა: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "დანაყოფს გასაღები: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "ცხრილის მფლობელი: \"%s.%s\""
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "ძირითადი გასაღები. "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "უნიკალური"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " ნულები განსხვავებული არაა"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "ცხრილისთვის \"%s.%s\""
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", პრედიკატი (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", დაკლასტერებული"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", არასწორი"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", deferrable"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", თავიდან გადადებული"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", რეპლიკის იდენტიფიკატორი"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "ინდექსები:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "შეამოწმეთ შეზღუდვები:"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "გარე-გასაღების შეზღუდვები:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "ბმული გარედან:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "წესები:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "წესები (მწკრივების გაძლიერებული დაცვა ჩართულია):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "წესები (მწკრივების დაცვა ჩართულია): (არცერთი)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "წესები (მწკრივების გაძლიერებული დაცვა ჩართულია: (არცერთი)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "წესები (მწკრივების უსაფრთხოება გამორთულია)"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "სტატისტიკის ობიექტები:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "წესები:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "გამორთული წესები:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "ყოველთვის გაშვებადი წესები:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "მხოლოდ რეპლიკაზე გაშვებადი წესები:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "გამოცემები:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "არანულოვანი შეზღუდვები:"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (ლოკალური, მემკვიდრეობით)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (მემკვიდრეობით)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "აღწერის ნახვა:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "ტრიგერები:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "მომხმარებლის გამორთული ტრიგერები:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "გამორთული შიდა ტრიგერები:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "ყოველთვის გაშვებადი ტრიგერები:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "მხოლოდ რეპლიკაზე გაშვებადი ტრიგერები:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "სერვერი: %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "FDW პარამეტრები: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "მემკვიდრეობით"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "დანაყოფების რიცხვი: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "დანაყოფების რიცხვი: %d (სიის მისაღებად გამოიყენეთ \\d+.)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "შვილი ცხრილების რიცხვი: %d (სიის გამოსატანად გამოიყენეთ \\d+ )"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "შვილი ცხრილები"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "დანაყოფები"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "ტიპიზირებული ცხრილის ტიპი: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "რეპლიკის იდენტიფიკატორი"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "აქვს OID-ები: დიახ"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "წვდომის მეთოდი: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", ცხრილების სივრცე: \"%s\""
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "როლების სია"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "როლის სახელი"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "ატრიბუტები"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "ზემომხმარებელი"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "მემკვიდრეობითობის გარეშე"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "როლის შექმნა"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "ბაზის შექმნა"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "შესვლა შეუძლებელია"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "რეპლიკაცია"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "RLS-ის გამოტოვება"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "შეერთებების გარეშე"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d შეერთება"
 msgstr[1] "%d შეერთება"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "პაროლს ვადა "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "როლი"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "მონაცემთა ბაზა"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "მორგება"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "როლისთვის \"%s\" და ბაზისთვის \"%s\" პარამეტრები ნაპოვნი არაა."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "როლისთვის (\"%s\") პარამეტრები ნაპოვნი არაა."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "პარამეტრები ნაპოვნი არაა."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "პარამეტრების სია"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "წარმოადგენს წევრს"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "მიმნიჭებელი"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "როლების მინიჭებების სია"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "ინდექსი"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST ცხრილი"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "დაყოფილი ინდექსი"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "მუდმივი"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "დროებითი"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "ჟურნალში არ-ჩაწერილი"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "შენახვა"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "წვდომის მეთოდი"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "ურთიერთობა სახელით \"%s\" არ არსებობს."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "ცხრილი სახელით \"%s\" აღმოჩენილი არაა."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "ინდექსი სახელით \"%s\" აღმოჩენილი არაა."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "ხედი სახელით \"%s\" აღმოჩენილი არაა."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "მატერიალიზებული ხედი სახელით \"%s\" არ არსებობს."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "მიმდევრობა სახელით \"%s\" აღმოჩენილი არაა."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "გარე ცხრილი სახელით \"%s\" არ არსებობს."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "ცხრილები აღმოჩენილი არაა."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "ინდექსები აღმოჩენილი არაა."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "ხედები აღმოჩენილი არაა."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "მატერიალიზებული ხედის აღმოჩენილი არაა."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "მიმდევრობები აღმოჩენილი არაა."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "გარე ცხრილები აღმოჩენილი არაა."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "ურთიერთობების სია"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "ცხრილების სია"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "ინდექსების სია"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "ხედების სია"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "მატერიალიზებული ხედების სია"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "მიმდევრობების სია"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "გარე ცხრილების სია"
+
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "სერვერს (ვერსია %s) ცხრილების დეკლარატიულ დაყოფის მხარდაჭერა არ გააჩნია."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "დაყოფილი ინდექსების სია"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "დაყოფილი ცხრილების სია"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "დაყოფილი ურთიერთობების სია"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "მშობლის სახელი"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "ბოლო დანაყოფის ზომა"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "ჯამური ზომა"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "სანდო"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "შიდა ენა"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "გამოძახების დამმუშავებელი"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "შემმოწმებელი"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "ჩადგმული კოდის დამმუშავებელი"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "ენების სია"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "შემოწმება"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "დომენების სია"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "წყარო"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "დანიშნულება"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
-msgstr "ნაგულისხმები?"
+msgstr "ნაგულისხმევი?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "გადაყვანების სია"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "პარამეტრი"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "მნიშვნელობა"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "კონტექსტი"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "კონფიგურაციის პარამეტრების სია"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
-msgstr "კონფიგურაციის არანაგულისხმებადი პარამეტრების სია"
+msgstr "კონფიგურაციის არანაგულისხმევადი პარამეტრების სია"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "სერვერს (ვერსია %s) მოვლენის ტრიგერების მხარდაჭერა არ გააჩნია."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "მოვლენა"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "ჩართულია"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "replica"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "ყოველთვის"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "გამორთულია"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "ჩართულია"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "ჭდეები"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "მოვლენების ტრიგერების სია"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "სერვერს (ვერსია %s) გაფართოებული სტატისტიკის მხარდაჭერა არ გააჩნია."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "დამოკიდებულებები"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "გაფართოებული სტატისტიკის სია"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "წყაროს ტიპი"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "სამიზნის ტიპი"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "მინიჭებაში"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "აშკარა?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "კასტების სია"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "სერვისის მომწოდებელი"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "დეტერმნისტული?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "კოლაციების სია"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "სქემების სია"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "ტექსტური ძებნის დამმუშავებლების სია"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "ტექსტის ძებნის დამმუშავებელი სახელით \"%s\" არ არსებობს."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "ტექსტის ძებნის დამმუშავებლები ვერ ვიპოვე."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "დამუშავების დაწყება"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "მეთოდი"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "შემდეგი კოდის მიღება"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "დამუშავების დასასრული"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "ამონაწერის მიღება"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "კოდის ტიპების მიღება"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "ტექსტის ძებნის დამმუშავებელი \"%s.%s\""
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "ტექსტის ძებნის დამმუშავებელი \"%s\""
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "კოდის სახელი"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "კოდის ტიპები დამმუშავებლისთვის \"%s.%s\""
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "კოდის ტიპები დამმუშავებლისთვის \"%s\""
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "ნიმუში"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "ინიციალიზაციის პარამეტრები"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "ტექსტის ძებნის ლექსიკონების სია"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "ერთეული"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "ლექსით გამოყოფა"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "ტექსტის ძებნის შაბლონების სია"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "ტექსტის ძებნის კონფიგურაციების სია"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "ტექსტის ძებნის კონფიგურაცია სახელით \"%s\" არ არსებობს."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "ტექსტის ძებნის არცერთი კონფიგურაცია ნაპოვნი არაა."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "ტოკენი"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "ლექსიკონები"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "ტექსტის ძებნის კონფიგურაცია \"%s.%s\""
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "ტექსტის ძებნის კონფიგურაცია \"%s\""
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2237,7 +2441,7 @@ msgstr ""
 "\n"
 "დამმუშავებელი: \"%s.%s\""
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2246,273 +2450,277 @@ msgstr ""
 "\n"
 "დამუშავებელი: \"%s\""
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "გარე მონაცემების გადამტანების სია"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "გარე-მონაცემების გადამტანი"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "ვერსია"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "გარე სერვერების სია"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "სერვერი"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "მომხმარებლის სახელი"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "მომხმარებლების მიმაგრებების სია"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "გარე ცხრილების სია"
+#: describe.c:6196
+msgid "Default version"
+msgstr "ნაგულისხმევი ვერსია"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "დაყენებული გაფართოებების სია"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "გაფართოება სახელით \"%s\" არ არსებობს."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "გაფართოებების პოვნა შეუძლებელია."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "ობიექტის აღწერა"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "ობიექტები გაფართებაში \"%s\""
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "არასწორი სრული სახელი (ძალიან ბევრი წერტილიანი სახელი): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ბაზებს შორის ბმულები განხორციელებული არაა: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "სერვერს (ვერსია %s) გამოცემების მხარდაჭერა არ გააჩნია."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "ყველა ცხრილი"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "ჩასმები"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "განახლებები"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "წაშლები"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "შეკვეცები"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "გენერირებული სვეტები"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Root-ის გავლით"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "გამოცემების სია"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "გამოცემა სახელით \"%s\" არ არსებობს."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "გამოცემების გარეშე."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "პუბლიკაცია %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "ცხრილები:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "ცხრილები სქემებიდან:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "სერვერს (ვერსია %s) გამოწერების მხარდაჭერა არ გააჩნია."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "გამოცება"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "ბინარული"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "გაადაცემა"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "ორ-ფაზიანი გადაცემა"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "გამორთვა შეცდომის შემთხვევაში"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "საწყისი"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "პაროლი აუცილებელია"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "გავუშვა მფლობელით?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "გადართვა"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "სინქრონული გადაგზავნა"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "შეერთ. ინფო"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "LSN-ის გამოტოვება"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "გამოწერების სია"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(არცერთი)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "შეყვანის ტიპი"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "საცავის ტიპი"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "ოპერატორის კლასი"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "ოპერატორის ოჯახი"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "ოპერატორის კლასების სია"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "განკუთვნილი ტიპები"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "ოპერატორის ოჯახების სია"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "ოპერატორი"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "სტრატეგია"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "დალაგება"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "ძებნა"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "მიზანი"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "ოპერატორის ოჯახის დალაგება"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "ოპერატორის ოჯახების ოპერატორების სია"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "რეგისტრირებული მარცხენა ტიპი"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "რეგისტრირებული მარჯვენა ტიპი"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "რიცხვი"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "ოპერატორის ოჯახების ფუნქციების სია"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "დიდი ობიექტები"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2520,11 +2728,11 @@ msgstr ""
 "psql PostgreSQL-ის ინტერაქტიური ტერმინალია.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:499
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "გამოყენება:\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2532,27 +2740,27 @@ msgstr ""
 "  psql [პარამეტრი]... [ბაზისსახელი [მომხმსახელი]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "ზოგადი პარამეტრები:\n"
 
-#: help.c:68
+#: help.c:65
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr "  -c, --command=ბრძანება    მხოლოდ ერთი (SQL ან შიდა) ბრძანების გაშვება და გასვლა\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=DBNAME    მისაერთებელი ბაზის სახელი\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=ფალისსახელი      ბრძანებების ფაილიდან შესრულება და გასვლა\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list               ხელმისაწვდომი ბაზების სიის გამოტანა და გასვლა\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2562,15 +2770,15 @@ msgstr ""
 "                           psql -ის მითითებული სახელის მქონე ცვლადისთვის მითითებული მნიშვნელობის მინიჭება\n"
 "                           (მაგ:, -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          გაშვებისას წასაკითხი ფაილის (~/.psqlrc) წაკითხვის შეცდომა\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
@@ -2578,19 +2786,19 @@ msgstr ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           როგორც ერთი ტრანზაქციის, ისე გაშვება (თუ არაინტერაქტიურია)\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=პარამეტრები]     ამ დახმარების ჩვენება და გასვლა\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commands      \"\\\"-ით დაწყებული ბრძანებების ჩვენება და გასვლა\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variables     განსაკუთრებული ცვლადების სიის გამოტანა და გასვლა\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2598,47 +2806,47 @@ msgstr ""
 "\n"
 "შეტანისა და გამოტანის პარამეტრები:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           სკრიპტიდან წაკითხულის ეკრანზე ჩვენება\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        შეცდომის გამომტანი ბრძანებების ჩვენება\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       სერვერზე გაგზავნილი ბრძანებების გამოტანა\n"
 
-#: help.c:87
+#: help.c:84
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        შიდა ბრძანებების მიერ გენერირებული მოთხოვნების გამოტანა\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FILENAME  სესიის ჟურნალის ფაილში ჩაწერა\n"
 
-#: help.c:89
+#: help.c:86
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr "  -n, --no-readline        ბრძანების სტრიქონის დამატებითი კონტროლის (readline) გამორთვა\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=FILENAME    მოთხოვნის შედეგების ფაილში ჩაწერა (ან |ფაიფში)\n"
 
-#: help.c:91
+#: help.c:88
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet              ჩუმად გაშვება (შეტყობინებების გარეშე, მხოლოდ მოთხოვნის შედეგები)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        ერთნაბიჯიანი რეჟიმი (თითოეული მოთხოვნის დადასტურება)\n"
 
-#: help.c:93
+#: help.c:90
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr "  -S, --single-line        ერთხაზიანი რეჟიმი (ხაზის დასრულება SQL-ის ბრძანებასაც ასრულებს)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2646,52 +2854,52 @@ msgstr ""
 "\n"
 "გამოტანის ფორმატის მორგება:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           ცხრილის დაულაგებლად გამოტანის რეჟიმი\n"
 
-#: help.c:97
+#: help.c:94
 msgid "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr "      --csv                CSV (მძიმით გამოყოფილი მნიშვნელობები) ცხრილის გამოტანის რეჟიმი\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
 "                           field separator for unaligned output (default: \"%s\")\n"
 msgstr ""
 "  -F, --field-separator=სტრიქონი\n"
-"                           ველების გამყოფ სიმბოლო დაულაგებელი გამოტანისთვის (ნაგულისხმები: \"%s\")\n"
+"                           ველების გამყოფ სიმბოლო დაულაგებელი გამოტანისთვის (ნაგულისხმევი: \"%s\")\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML ცხრილის გამოტანის რეჟიმი\n"
 
-#: help.c:102
+#: help.c:99
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr "  -P, --pset=ცვლ[=არგ]     ცვლ გამოტანის პარამეტრის არგ-ზე დაყენება (იხ, \\pset ბრძანება)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: newline)\n"
 msgstr ""
 "  -R, --record-separator=სტრიქონი\n"
-"                           ჩანაწერების გამყოფი დაულაგებელი გამოტანისთვის (ნაგულისხმები: ახალი ხაზი)\n"
+"                           ჩანაწერების გამყოფი დაულაგებელი გამოტანისთვის (ნაგულისხმევი: ახალი ხაზი)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        მხოლოდ მწკრივების გამოტანა\n"
 
-#: help.c:106
+#: help.c:103
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr "  -T, --table-attr=ტექსტი    HTML ცხრილის ჭდის ატრიბუტების დაყენება (მაგ: სიგრძე, საზღვარი)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           ცხრილის გაფართოებული გამოტანის ჩართვა\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero byte\n"
@@ -2699,7 +2907,7 @@ msgstr ""
 "  -z, --field-separator-zero\n"
 "                           დაულაგებელი გამოტანის ველების გამყოფად ნულოვანი ბაიტის დაყენება\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero byte\n"
@@ -2707,7 +2915,7 @@ msgstr ""
 "  -0, --record-separator-zero\n"
 "                           დაულაგებელი გამოტანის ჩანაწერების გამყოფის ნულოვან ბაიტზე დაყენება\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2715,27 +2923,27 @@ msgstr ""
 "\n"
 "შეერთების პარამეტრები:\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      მონაცემთა ბაზის სერვერის ჰოსტის ან სოკეტის საქაღალდე\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=PORT          მონაცემთა ბაზის სერვერის პორტი\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=სახელი     ბაზის ზემომხმარებლის სახელი\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        არასოდეს მკითხო პაროლი\n"
 
-#: help.c:118
+#: help.c:115
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           პაროლის ყოველთვის კითხვა (ავტომატურად უნდა ხდებოდეს)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
@@ -2749,37 +2957,33 @@ msgstr ""
 "ან გაეცანით \"psql\" განყოფილებას PostgreSQL-ის დოკუმენტაციაში.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "შეცდომების შესახებ მიწერეთ: <%s>\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s-ის საწყისი გვერდია: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "ზოგადი\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       მოთხოვნის პარამეტრების დაყენება\n"
-
-#: help.c:168
+#: help.c:164
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             აჩვენებს PostgreSQL-ის გამოყენებისა და დისტრიბუციის პირობებს\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr "  \\crosstabview [სვეტები] შეასრულებს მოთხოვნას და შედეგს crosstab-ში აჩვენებს\n"
 
-#: help.c:170
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose            ბოლო შეცდომის დეტალების მაქსიმალურად ჩვენება\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2787,26 +2991,42 @@ msgstr ""
 "  \\g [(პარამეტრი)] [ფაილი]  მოთხოვნის შესრულება (და შედეგის ფაილში ან |ფაიფში გაგზავნა;\n"
 "                         \\g არგუმენტების გარეშე იგივეა, რაც წერტილმძიმე\n"
 
-#: help.c:173
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc                 მოთხოვნის შედეგის აღწერა მისი შესრულების გარეშე\n"
 
-#: help.c:174
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec                 ჯერ მოთხოვნის, მერე კი მისი თითოეული შედეგის შესრულება\n"
 
-#: help.c:175
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [პრეფიქსი]         მოთხოვნის შესრულება და შედეგის psql-ის ცვლადებში შენახვა\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr "  \\gx [(პარამეტრები)] [ფაილი] როგორც \\g, მაგრამ გამოტანის რეჟიმი უფრო ფართო იქნება\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     psql-დან გასვლა\n"
 
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict RESTRICT_KEY\n"
+"                         შეზღუდულ რეჟიმზე გადართვა მოწოდებული გასაღებით\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         შეზღუდული რეჟიმიდან გახსნა, თუ გასაღები ემთხვევა\n"
+
 #: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
@@ -2817,8 +3037,8 @@ msgstr ""
 "                         მოთხოვნის შესრულება ყოველ SEC წამში ერთხელ, მაქს N-ჯერ\n"
 "                         გაჩერება, თუ MIN მწკრივზე ნაკლები დაბრუნდება\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -2931,230 +3151,234 @@ msgid "Informational\n"
 msgstr "საინფორმაციო\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (პარამეტრები: S = სისტემური ობიექტების ჩვენება, + = დამატებითი დეტალები)\n"
+msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
+msgstr "  (პარამეტრები: S = სისტემური ობიექტების ჩვენება, x = გაფართოებული რეჟიმი, + = დამატებითი დეტალები)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]                 ცხრილების, ხედებისა და მიმდევრობების სია\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]                 ცხრილების, ხედებისა და მიმდევრობების სია\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr "  \\d[S+]  NAME           ცხრილის, ხედის, მიმდევრობის ან ინდექსის აღწერა\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [PATTERN]      აგრეგატების სია\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [PATTERN]      აგრეგატების სია\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [PATTERN]      წვდომის მეთოდების სია\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [PATTERN]     წვდომის მეთოდების სია\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  ოპერატორის კლასების სია\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  ოპერატორის კლასების სია\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  ოპერატორების ოჯახების სია\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  ოპერატორის ოჯახების სია\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   ოპერატორების ოჯახების ოპერატორების სია\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]   ოპერატორის ოჯახების ოპერატორების სია\n"
 
 #: help.c:229
-msgid "  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   ოპერატორის ოჯახების მხარდაჭერის ფუნქციების სია\n"
+msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
+msgstr "  \\dAp[x+] [AMPTRN [OPFPTRN]]   ოპერატორის ოჯახების მხარდაჭერის ფუნქციების სია\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [PATTERN]      ცხრილის სივრცეების სია\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [PATTERN]      ცხრილის სივრცეების სია\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [PATTERN]      გადაყვანების სია\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [PATTERN]      გადაყვანების სია\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [PATTERN]  კონფიგურაციის პარამეტრების სია\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [PATTERN]  კონფიგურაციის პარამეტრების სია\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [PATTERN]      კასტების სია\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [PATTERN]      კასტების სია\n"
 
 #: help.c:234
-msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
-msgstr "  \\dd[S]  [შაბლონი]      ობიექტის აღწერის ჩვენება, რომელიც სხვაგან არსადაა ნაჩვენები\n"
+msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
+msgstr "  \\dd[Sx]  [შაბლონი]      ობიექტის აღწერის ჩვენება, რომელიც სხვაგან არსადაა ნაჩვენები\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [PATTERN]      დომენების სია\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [PATTERN]      დომენების სია\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp    [შაბლონი]      ნაგულისხმები პრივილეგიების სია\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]    [შაბლონი]      ნაგულისხმევი პრივილეგიების სია\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [შაბლონი]      გარე ცხრილების სია\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [შაბლონი]      გარე ცხრილების სია\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [შაბლონი]      გარე სერვერების სია\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [შაბლონი]      გარე სერვერების სია\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [შაბლონი]      გარე ცხრილების სია\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [შაბლონი]      გარე ცხრილების სია\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [PATTERN]      მომხმარებლების მომხმარებლის სია\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [PATTERN]      მომხმარებლების მომხმარებლის სია\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [შაბლონი]      გარე მონაცემების გადამტანების სია\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [შაბლონი]      გარე მონაცემების გადამტანების სია\n"
 
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
 msgstr ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         ფუნქციების [მხოლოდ agg/normal/procedure/trigger/window] სია\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [შაბლონი]      ტექსტის ძებნის კონფიგურაციების სია\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [შაბლონი]      ტექსტის ძებნის კონფიგურაციების სია\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [შაბლონი]      ტექსტის ძებნის ლექსიკონების სია\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [შაბლონი]      ტექსტის ძებნის ლექსიკონების სია\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [PATTERN]      ტექსტის ძებნის დამმუშავებლების სია\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [PATTERN]      ტექსტის ძებნის დამმუშავებლების სია\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [შაბლონი]      ტექსტის ძებნის შაბლონების სია\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [შაბლონი]      ტექსტის ძებნის შაბლონების სია\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [შაბლონი]      როლების სია\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [შაბლონი]      როლების სია\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [შაბლონი]      ინდექსების სია\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [შაბლონი]      ინდექსების სია\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+]                 დიდი ობიექტების სია. იგივე, რაც \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]                 დიდი ობიექტების სია. იგივე, რაც \\lo_list\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [შაბლონი]      პროცედურული ენების სია\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [შაბლონი]      პროცედურული ენების სია\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [შაბლონი]      მატერიალიზებული ხედების სია\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [შაბლონი]      მატერიალიზებული ხედების სია\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [შაბლონი]      სქემების სია\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [შაბლონი]      სქემების სია\n"
 
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
 msgstr ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         ოპერატორების სია\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [შაბლონი]      კოლაციების სია\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [შაბლონი]      კოლაციების სია\n"
 
 #: help.c:257
-msgid "  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr "  \\dp[S]     [შაბლონი]      ცხრილის, ხედის და მიმდევრობის წვდომის უფლებების სია\n"
+msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
+msgstr "  \\dp[Sx]     [შაბლონი]      ცხრილის, ხედის და მიმდევრობის წვდომის უფლებების სია\n"
 
 #: help.c:258
-msgid "  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"
+msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
 msgstr "  \\dP[itn+] [შაბლონი]    [მხოლოდ ინდექსი/ცხრილი] დაყოფილი ურთიერთობების სია [n=ჩადგმული]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
-msgstr "  \\drds [ROLEPTRN [DBPTRN]] თითოეული ბაზის როლის პარამეტრების სია\n"
-
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\dg[S] [შაბლონი]      როლების მინიჭებების სია\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
+msgstr ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         თითოეული ბაზის როლის პარამეტრების სია\n"
 
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [შაბლონი]      რეპლიკაციის გამოცემების სია\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\dg[Sx] [შაბლონი]      როლის მინიჭებების სია\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [შაბლონი]      რეპლიკაციის გამოწერების სია\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [შაბლონი]      რეპლიკაციის გამოცემების სია\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [შაბლონი]      მიმდევრობების სია\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [შაბლონი]      რეპლიკაციის გამოწერების სია\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [შაბლონი]      ცხრილების სია\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [შაბლონი]      მიმდევრობების სია\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [შაბლონი]      მონაცემის ტიპების სია\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [შაბლონი]      ცხრილების სია\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [შაბლონი]      როლების სია\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [შაბლონი]      მონაცემის ტიპების სია\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [შაბლონი]      ხედების სია\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [შაბლონი]      როლების სია\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [შაბლონი]      გაფართოებების სია\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [შაბლონი]      ხედების სია\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [შაბლონი]      გაფართოებული სტატისტიკის სია\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [შაბლონი]      გაფართოებების სია\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]  [შაბლონი]      მოვლენის ტრიგერების სია\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [შაბლონი]      გაფართოებული სტატისტიკის სია\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [შაბლონი]      მონაცემთა ბაზების სია\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [შაბლონი]      მოვლენის ტრიგერების სია\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  FUNCNAME       ფუნქციის აღწერის ჩვენება\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [შაბლონი]      მონაცემთა ბაზების სია\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  ხედისსახელი       ხედის აღწერის ჩვენება\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]  FUNCNAME       ფუნქციის აღწერის ჩვენება\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]      [შაბლონი]      იგივე, რაც \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]  ხედისსახელი       ხედის აღწერის ჩვენება\n"
+
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]      [შაბლონი]      იგივე, რაც \\dp\n"
 
-#: help.c:277
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "დიდი ობიექტები\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr "  \\lo_export LOBOID FILE დიდი ობიექტის ფაილში ჩაწერა\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3162,36 +3386,36 @@ msgstr ""
 "  \\lo_import ფაილი [კომენტარი]\n"
 "                         დიდი ობიექტის ფაილიდან წაკითხვა\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+]            დიდი ობიექტების სია\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]            დიდი ობიექტების სია\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      დიდი ობიექტის წაშლა\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "ფორმატირება\n"
 
-#: help.c:286
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                     სწორებულ და გაუსწორებელ რეჟიმებს შორის გადართვა\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [სტრიქონი]            ცხრილის სათაურის დაყენება. ან წაშლა, თუ მითითებული არაა\n"
 
-#: help.c:288
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr "  \\f [სტრიქონი]            მოთხოვნის შედეგის დაულაგებელი გამოტანის ველების გამყოფის დაყენება ან ჩვენება\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML გამოტანის რეჟიმის გადართვა (მიმდინარე %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3199,7 +3423,7 @@ msgid ""
 "                         numericlocale|pager|pager_min_lines|recordsep|\n"
 "                         recordsep_zero|tableattr|title|tuples_only|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
-"                         unicode_header_linestyle)\n"
+"                         unicode_header_linestyle|xheader_width)\n"
 msgstr ""
 "  \\pset [სახელი [მნიშვნელობა]]   ცხრილის გამოტანის პარამეტრის დაყენება\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3207,31 +3431,31 @@ msgstr ""
 "                         numericlocale|pager|pager_min_lines|recordsep|\n"
 "                         recordsep_zero|tableattr|title|tuples_only|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
-"                         unicode_header_linestyle)\n"
+"                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            მხოლოდ მწკრივების ჩვენება(ამჟამად %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [STRING]            HTML-ის <table> ჭდის ატრიბუტების დაყენება. ან გასუფთავება, თუ მითითებული არაფერია\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       გაფართოებული გამოტანის გადართვა (ამჟამად %s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "ავტომატური"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "შეერთება\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3240,7 +3464,7 @@ msgstr ""
 "  \\c[onnect] {[ბაზისსახელი|- მომხმარებელი|- ჰოსტი|- პორტ|-] | conninfo}\n"
 "                         ახალ ბაზასთან მიერთება (მიმდინარე \"%s\")\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3248,60 +3472,118 @@ msgstr ""
 "  \\c[onnect] {[ბაზისსახელი|- მომხმარებელი|- ჰოსტი|- პორტ|-] | conninfo}\n"
 "                         ახალ ბაზასთან მიერთება (მიმდინარე შეერთება არ არსებობს)\n"
 
-#: help.c:313
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              მიმდინარე შეერთების შესახებ ინფორმაციის გამოტანა\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [კოდირება]   კლიენტის კოდირების ჩვენება ან დაყენება\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [მომხმარებელი]   მომხმარებლის პაროლის უსაფრთხოდ შეცვლა\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "ოპერაციული სისტემა\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [საქ]              მიმდინარე საქაღალდის შეცვლა\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR გარემოს ცვლადის გამოთხოვა\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv სახელი [მნიშვნელობა]   გარემოს ცვლადის დაყენება ან მოხსნა\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       ბრძანებების ტაიმერის გადართვა (ამჟამად %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr "  \\! [ბრძანება]           გარსის ბრძანების შესრულება ან ინტერაქტიური გარსის გაშვება\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "ცვლადები\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [ტექსტი] სახელი    მომხმარებლისთვის შიდა ცვლადის დაყენების შეთავაზება\n"
 
-#: help.c:329
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [სახელი [მნიშვნელობა]]    დააყენებს შიდა ცვლადს, ან, თუ პარამეტრები მითითებული არაა, მათ სიას გამოიტანს\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset სახელი            შიდა ცვლადის მოხსნა (წაშლა)\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "გაფართოებული მოთხოვნის პროტოკოლი\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       მოთხოვნის პარამეტრების დაყენება\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         მოთხოვნის პარამეტრების დაყენება არსებული მომზადებული ოპერატორისთვის\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared STMT_NAME\n"
+"             არსებული მომზადებული ოპერატორის დახურვა\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           კომუნიკაციის არხის რეჟიმიდან გასვლა\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 გაუგზავნელი მონაცემების გადაგზავნა სერვერზე\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest          სერვერისთვის მისი გამოტანის ბუფერის გაგზავნის მოთხოვნის გაგზავნა\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr ""
+"  \\getresults [NUM_RES]   NUM_RES დარჩენილი შედეგის წაკითხვა. ან ყველასი, თუ არგუმენტი მითითებული არაა\n"
+"\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse STMT_NAME       მომზადებული ოპერატორის შექმნა\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          გაფართოებული მოთხოვნის გაგზავნა მიმდინარე საკომუნიკაციო არხისთვის\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         კომუნიკაციის არხის რეჟიმზე გადასვლა\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline          სინქრონიზაციის წერტილის დამატება გამავალი კომუნიკაციის არხისთვის\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
@@ -3309,11 +3591,11 @@ msgstr ""
 "განსაკუთრებულად მოსაპყრობი ცვლადების სია\n"
 "\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "psql-ის ცვლადები:\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3323,7 +3605,7 @@ msgstr ""
 "  ან \\set სახელი მნიშვნელობა psql-ის შიგნით\n"
 "\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3331,7 +3613,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    iთუ დაყენებულია, წარმატებული SQL ბრძანებები ავტომატურად იქნება გადაცემული\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3341,7 +3623,7 @@ msgstr ""
 "    განსაზღვრავს სიმბოლოების ზომას SQL-ის საკვანძო სიტყვების დასრულებისას\n"
 "    [პატარა (lower), upper (დიდი), პატარის_შენარჩუნება (preserve-lower), დიდის_შენარჩუნება (preserve-upper)]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3349,7 +3631,7 @@ msgstr ""
 "  DBNAME\n"
 "    ბაზის სახელი, რომელთანაც ამჟამად მიერთებული ბრძანდებით\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3359,7 +3641,7 @@ msgstr ""
 "    აკონტროლებს, შეყვანილიდან რა გამოჩნდება სტანდარტულ გამოტანაზე\n"
 "    [all(ყველაფერი), errors(შეცდომები), none(არაფერი), queries(მოთხოვნები)]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3369,7 +3651,7 @@ msgstr ""
 "    თუ დაყენებულია, \\-ით დაწყებული შიდა მოთხოვნები ნაჩვენები იქნება;\n"
 "    თუ მნიშვნელობაა 'noexe', შიდა ბრძანებები ნაჩვენები იქნება, მაგრამ შესრულებული არა\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3377,7 +3659,7 @@ msgstr ""
 "  ENCODING\n"
 "    მიმდინარე კლიენტის სიმბოლოების კოდირება\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3385,7 +3667,7 @@ msgstr ""
 "  ERROR\n"
 "    \"true\" თუ ბოლო მოთხოვნა ავარიული იყო. არადა \"false\"\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3393,7 +3675,7 @@ msgstr ""
 "  FETCH_COUNT\n"
 "    შედეგის გამოსათხოვი მწკრივების რაოდენობა ერთი ჩვენებისთვის (0=უსასრულო)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3401,7 +3683,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    თუ დაყენებულა, ცხრილის წვდომის მეთოდები ნაჩვენები არ იქნება\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3409,7 +3691,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    თუ ჩართულია, შეკუმშვის მეთოდები ნაჩვენები არ იქნება\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3417,7 +3699,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    ბრძანებების ისტორიის კონროლი[ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3425,7 +3707,7 @@ msgstr ""
 "  HISTFILE\n"
 "    ბრძანებების ისტორიის შესანახი ფაილის სახელი\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3433,7 +3715,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    ისტორიაში შენახული ბრძანებების მაქსიმალური რაოდენობა\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3441,7 +3723,7 @@ msgstr ""
 "  HOST\n"
 "    ამჟამად მიერთებული მონაცემთა ბაზის სერვერის ჰოსტი\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3449,7 +3731,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    ინტერაქტიური სესიის დასამთავრებლად საჭირო EOF-ების რაოდენობა\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3457,7 +3739,7 @@ msgstr ""
 "  LASTOID\n"
 "    უკანასკნელად შეცვლილი OID-ის მნიშვნელობა\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3467,7 +3749,7 @@ msgstr ""
 "  LAST_ERROR_SQLSTATE\n"
 "    უკანასკნელი შეცდომის შეტყობინება და SQLSTATE. თუ შეცდომა არ არსებობს, დაბრუნდება ცარიელი სტრიქონი და \"00000\"\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3475,7 +3757,7 @@ msgstr ""
 "  ON_ERROR_ROLLBACK\n"
 "    თუ დაყენებულია, შეცდომა ტრანზაქციას არ გააჩერებს (გამოიყენება არაპირდაპირი შესანახი წერტილები)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3483,7 +3765,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    ბრძანებების პაკეტის შესრულების შეწყვეტა პირველივე შეცდომის შემდეგ\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3491,7 +3773,7 @@ msgstr ""
 "  პორტი\n"
 "    სერვერის პორტი მიმდინარე შეერთებისთვის\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3499,7 +3781,7 @@ msgstr ""
 "  PROMPT1\n"
 "    psql-ის ბრძანების სტრიქონის აღწერა\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3507,7 +3789,7 @@ msgstr ""
 "  PROMPT2\n"
 "    ბრძანების სტრიქონის მითითება, როცა ბრძანება წინა ხაზიდან გრძელდება\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3515,7 +3797,7 @@ msgstr ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3523,7 +3805,7 @@ msgstr ""
 "  QUIET\n"
 "    ჩუმი ოპერაციები(იგივე, რაც პარამეტრი -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3531,7 +3813,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    ბოლო მოთხოვნის მიერ დაბრუნებული ან შეცვლილი მწკრივები. ან 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3541,7 +3823,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    სერვერის ვერსია(მოკლე სტრიქონის ან რიცხვით ფორმატში)\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3549,7 +3831,7 @@ msgstr ""
 "  SHELL_ERROR\n"
 "    \"true\", თუ ბოლო მოთხოვნა ავარიული იყო. არადა \"false\"\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3557,7 +3839,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    გარსის ბოლო ბრძანების გამოსვლის სტატუსი\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3565,7 +3847,7 @@ msgstr ""
 "  SHOW_ALL_RESULTS\n"
 "    მხოლოდ ბოლოს მაგიერ კომბინირებული მოთხოვნის ყველა შედეგის ჩვენება (\\;)\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3573,7 +3855,7 @@ msgstr ""
 "  SHOW_CONTEXT\n"
 "    შეტყობინების კონტექსტის ველების ჩვენების კონტროლი[never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3581,7 +3863,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    iთუ დაყენებულია, ხაზის დაბოლოება SQL-ის ბრძანებასაც დაასრულებს (იგივე, რაც -S პარამეტრი)\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3589,7 +3871,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    ერთნაბიჯიანი რეჟიმი. (იგივე, რაც -s პარამეტრი)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3597,7 +3879,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    უკანასკნელი მოთხოვნის SQLSTATE. \"00000\", თუ შეცდომა არ მომხდარა\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3605,7 +3887,7 @@ msgstr ""
 "  USER\n"
 "    ბაზასთან მიერთებული მომხმარებლის სახელი\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3613,7 +3895,7 @@ msgstr ""
 "  VERBOSITY\n"
 "    შეცდომის ანგარშების დეტალურობის კონტროლი [default, verbose, terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3625,7 +3907,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    psql-ის ვერსია (სრული ვერსია, მოკლე ვერსია თუ რიცხვითი ფორმატი)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL\n"
+"    წამების რაოდენობა, რომელსაც ბრძანება \\watch იცდის გაშვებებს შორის (ნაგულისხმევი %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3633,7 +3924,7 @@ msgstr ""
 "\n"
 "ჩვენების პარამეტრები:\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3643,7 +3934,7 @@ msgstr ""
 "  ან \\pset სახ [მიშნვნ] psql-ში\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3651,7 +3942,7 @@ msgstr ""
 "  border\n"
 "    საზღვრის სტილი (რიცხვი)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3659,7 +3950,16 @@ msgstr ""
 "  columns\n"
 "    სამიზნის სიგანე გადატანილი ფორმატისთვის\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    ველების გამყოფი CSV გამოტანის ფორმატისთვის (ნაგულისხმევია \"%c\")\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3667,16 +3967,16 @@ msgstr ""
 "  expanded (or x)\n"
 "    გაფართოებული გამოტანა [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
 "    field separator for unaligned output (default \"%s\")\n"
 msgstr ""
 "  fieldsep\n"
-"    ველების გამყოფი დაულაგების გამოტანისათვის (ნაგულისხმები \"%s\")\n"
+"    ველების გამყოფი დაულაგების გამოტანისათვის (ნაგულისხმევი \"%s\")\n"
 
-#: help.c:468
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3684,7 +3984,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    დაულაგებელი გამოტანის ველების გამყოფის ნულოვან ბაიტზე დაყენება\n"
 
-#: help.c:470
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3692,7 +3992,7 @@ msgstr ""
 "  footer\n"
 "    ცხრილის მინაწერების ჩვენების ჩაართ/გამორთ[on, off]\n"
 
-#: help.c:472
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3700,7 +4000,7 @@ msgstr ""
 "  format\n"
 "    გამოტანის ფორმატის დაყენება [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -3708,7 +4008,7 @@ msgstr ""
 "  linestyle\n"
 "    საზღვრის ხაზის ხატვის სტილი [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -3716,7 +4016,7 @@ msgstr ""
 "  null\n"
 "    ნულოვანი ბაიტის მიერ ნაჩვენები სიმბოლო\n"
 
-#: help.c:478
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -3724,7 +4024,7 @@ msgstr ""
 "  numericlocale\n"
 "    ციფრის ჯგუფების გასაყოფად ენის სპეციფიკური სიმბოლოს გამოყენება\n"
 
-#: help.c:480
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -3732,7 +4032,7 @@ msgstr ""
 "  pager\n"
 "    გვერდების გარე გადამრთველის გამოყენება[yes, no, always]\n"
 
-#: help.c:482
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -3740,7 +4040,7 @@ msgstr ""
 "  recordsep\n"
 "    დაულაგებელი გამოტანის ჩანაწერების(ხაზების) გამყოფი\n"
 
-#: help.c:484
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -3748,7 +4048,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    დაულაგებელი გამოტანის ველების გამყოფის ნულოვან ბაიტზე დაყენება\n"
 
-#: help.c:486
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -3758,7 +4058,7 @@ msgstr ""
 "    მიუთითებს HTML ფორმატის table ჭდის ატრიბუტებს ან სვეტების პოპორციულ სიგანეს\n"
 "     მარცხნივ სწორებული მონაცემების ტიპებისთვის latex-longtable ფორმატში\n"
 
-#: help.c:489
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -3766,7 +4066,7 @@ msgstr ""
 "  title\n"
 "    ცხრილის სათაურის დაყენება შემდგომ დაბეჭდილი ცხრილებისთვის\n"
 
-#: help.c:491
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -3774,7 +4074,7 @@ msgstr ""
 "  tuples_only\n"
 "    თუ დაყენებულია, ნაჩვენები იქნება მხოლოდ მიმდინარე მონაცემები\n"
 
-#: help.c:493
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -3786,7 +4086,17 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    უნიკოდის ხაზის დახატვის სტილი [single, double]\n"
 
-#: help.c:498
+#: help.c:520
+msgid ""
+"  xheader_width\n"
+"    set the maximum width of the header for expanded output\n"
+"    [full, column, page, integer value]\n"
+msgstr ""
+"  xheader_width\n"
+"    აყენებს თავსართის მაქსიმალურ სიგანეს გაფართოებული გამოტანისთვის\n"
+"    [სრული, სვეტი, გვერდი, მთელი_რიცხვი]\n"
+
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -3794,7 +4104,7 @@ msgstr ""
 "\n"
 "გარემოს ცვლადები:\n"
 
-#: help.c:502
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -3804,7 +4114,7 @@ msgstr ""
 "  ან \\setenv სახელი[მნიშვნელობა ] psql-ის სიგნით\n"
 "\n"
 
-#: help.c:504
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -3816,7 +4126,7 @@ msgstr ""
 "  ან \\setenv სახელი [მნიშვნელობა] psql-ში\n"
 "\n"
 
-#: help.c:507
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -3824,7 +4134,7 @@ msgstr ""
 "  COLUMNS\n"
 "    გადასატანი ფორმატის სვეტების რაოდენობა\n"
 
-#: help.c:509
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -3832,7 +4142,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    იგივე, რაც შეერთების პარამეტრი აპლიკაციის_სახელი\n"
 
-#: help.c:511
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -3840,7 +4150,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    იგივე, რაც შეერთების dbname პარამეტრი\n"
 
-#: help.c:513
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -3848,7 +4158,7 @@ msgstr ""
 "  PGHOST\n"
 "    იგივე, რაც ჰოსტი შეერთების პარამეტრებში\n"
 
-#: help.c:515
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -3856,7 +4166,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    პაროლების ფაილის სახელი\n"
 
-#: help.c:517
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -3864,7 +4174,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    შეერთების პაროლი (რეკომენდებული არაა)\n"
 
-#: help.c:519
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -3872,7 +4182,7 @@ msgstr ""
 "  PGPORT\n"
 "    იგივე, რაც პორტი შეერთების პარამეტრებში\n"
 
-#: help.c:521
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -3880,7 +4190,7 @@ msgstr ""
 "  PGUSER\n"
 "    იგივე, რაც მომხმარებლის სახელი შეერთების პარამეტრებში\n"
 
-#: help.c:523
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -3888,7 +4198,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    \\e, \\ef, და \\ev ბრძანების მიერ გამოყენებული რედაქტორი\n"
 
-#: help.c:525
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -3896,7 +4206,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    რედაქტორის გამოძახებისას ხაზის ნომრის მითითების ხერხი\n"
 
-#: help.c:527
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -3904,7 +4214,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    ბრძანებების ისტორიის ფაილის ალტერნატიული მდებარეობა\n"
 
-#: help.c:529
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -3912,7 +4222,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    გვერდების გადამრთველი გარე პროგრამის სახელი\n"
 
-#: help.c:532
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -3920,7 +4230,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    \\watch-ისთვის გამოყენებული გვერდების გადამრთველი გარე პროგრამა\n"
 
-#: help.c:535
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -3928,7 +4238,7 @@ msgstr ""
 "  PSQLRC\n"
 "    მომხმარებლის .psqlrc ფაილის ალტერნატიული მდებარეობა\n"
 
-#: help.c:537
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -3936,7 +4246,7 @@ msgstr ""
 "  SHELL\n"
 "    \\! ბრძანების მიერ გამოყენებული გარსი\n"
 
-#: help.c:539
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -3944,11 +4254,11 @@ msgstr ""
 "  TMPDIR\n"
 "    დროებითი ფაილების საქაღალდე\n"
 
-#: help.c:599
+#: help.c:625
 msgid "Available help:\n"
 msgstr "ხელმისაწვდომი დახმარება:\n"
 
-#: help.c:694
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -3967,7 +4277,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:717
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4073,12 +4383,12 @@ msgstr "მოთხოვნა იგნორირებულია; მი
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "მიღწეულია EOF დამხურავი \\endif-ების პოვნის გარეშე"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "ბრჭყალებში ჩასმული ციტატის დაუსრულებელი სტრიქონი"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: არასაკმარისი მეხსიერება"
@@ -4086,2470 +4396,2481 @@ msgstr "%s: არასაკმარისი მეხსიერება"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:240
-#: sql_help.c:242 sql_help.c:243 sql_help.c:245 sql_help.c:247 sql_help.c:250
-#: sql_help.c:252 sql_help.c:254 sql_help.c:256 sql_help.c:268 sql_help.c:269
-#: sql_help.c:270 sql_help.c:272 sql_help.c:321 sql_help.c:323 sql_help.c:325
-#: sql_help.c:327 sql_help.c:396 sql_help.c:401 sql_help.c:403 sql_help.c:445
-#: sql_help.c:447 sql_help.c:450 sql_help.c:452 sql_help.c:521 sql_help.c:526
-#: sql_help.c:531 sql_help.c:536 sql_help.c:541 sql_help.c:595 sql_help.c:597
-#: sql_help.c:599 sql_help.c:601 sql_help.c:603 sql_help.c:606 sql_help.c:608
-#: sql_help.c:611 sql_help.c:622 sql_help.c:624 sql_help.c:668 sql_help.c:670
-#: sql_help.c:672 sql_help.c:675 sql_help.c:677 sql_help.c:679 sql_help.c:720
-#: sql_help.c:724 sql_help.c:728 sql_help.c:749 sql_help.c:752 sql_help.c:755
-#: sql_help.c:784 sql_help.c:796 sql_help.c:804 sql_help.c:807 sql_help.c:810
-#: sql_help.c:825 sql_help.c:828 sql_help.c:857 sql_help.c:862 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:904 sql_help.c:906 sql_help.c:908
-#: sql_help.c:910 sql_help.c:913 sql_help.c:915 sql_help.c:962 sql_help.c:1007
-#: sql_help.c:1012 sql_help.c:1017 sql_help.c:1022 sql_help.c:1027
-#: sql_help.c:1046 sql_help.c:1057 sql_help.c:1059 sql_help.c:1079
-#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1092 sql_help.c:1094
-#: sql_help.c:1106 sql_help.c:1110 sql_help.c:1112 sql_help.c:1124
-#: sql_help.c:1126 sql_help.c:1128 sql_help.c:1130 sql_help.c:1149
-#: sql_help.c:1151 sql_help.c:1155 sql_help.c:1159 sql_help.c:1163
-#: sql_help.c:1166 sql_help.c:1167 sql_help.c:1168 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1176 sql_help.c:1323 sql_help.c:1325
-#: sql_help.c:1328 sql_help.c:1331 sql_help.c:1333 sql_help.c:1335
-#: sql_help.c:1338 sql_help.c:1341 sql_help.c:1343 sql_help.c:1349
-#: sql_help.c:1473 sql_help.c:1475 sql_help.c:1477 sql_help.c:1480
-#: sql_help.c:1501 sql_help.c:1504 sql_help.c:1507 sql_help.c:1510
-#: sql_help.c:1514 sql_help.c:1516 sql_help.c:1518 sql_help.c:1520
-#: sql_help.c:1534 sql_help.c:1537 sql_help.c:1539 sql_help.c:1541
-#: sql_help.c:1551 sql_help.c:1553 sql_help.c:1563 sql_help.c:1565
-#: sql_help.c:1575 sql_help.c:1578 sql_help.c:1601 sql_help.c:1603
-#: sql_help.c:1605 sql_help.c:1607 sql_help.c:1610 sql_help.c:1612
-#: sql_help.c:1615 sql_help.c:1618 sql_help.c:1669 sql_help.c:1712
-#: sql_help.c:1715 sql_help.c:1717 sql_help.c:1719 sql_help.c:1722
-#: sql_help.c:1724 sql_help.c:1726 sql_help.c:1729 sql_help.c:1779
-#: sql_help.c:1795 sql_help.c:2028 sql_help.c:2097 sql_help.c:2116
-#: sql_help.c:2129 sql_help.c:2187 sql_help.c:2195 sql_help.c:2205
-#: sql_help.c:2233 sql_help.c:2266 sql_help.c:2284 sql_help.c:2312
-#: sql_help.c:2423 sql_help.c:2469 sql_help.c:2494 sql_help.c:2517
-#: sql_help.c:2521 sql_help.c:2555 sql_help.c:2575 sql_help.c:2597
-#: sql_help.c:2611 sql_help.c:2632 sql_help.c:2661 sql_help.c:2694
-#: sql_help.c:2717 sql_help.c:2764 sql_help.c:3062 sql_help.c:3075
-#: sql_help.c:3092 sql_help.c:3108 sql_help.c:3148 sql_help.c:3202
-#: sql_help.c:3206 sql_help.c:3208 sql_help.c:3215 sql_help.c:3234
-#: sql_help.c:3261 sql_help.c:3296 sql_help.c:3308 sql_help.c:3317
-#: sql_help.c:3361 sql_help.c:3375 sql_help.c:3403 sql_help.c:3411
-#: sql_help.c:3423 sql_help.c:3433 sql_help.c:3441 sql_help.c:3449
-#: sql_help.c:3457 sql_help.c:3465 sql_help.c:3474 sql_help.c:3485
-#: sql_help.c:3493 sql_help.c:3501 sql_help.c:3509 sql_help.c:3517
-#: sql_help.c:3527 sql_help.c:3536 sql_help.c:3545 sql_help.c:3553
-#: sql_help.c:3563 sql_help.c:3574 sql_help.c:3582 sql_help.c:3591
-#: sql_help.c:3602 sql_help.c:3611 sql_help.c:3619 sql_help.c:3627
-#: sql_help.c:3635 sql_help.c:3643 sql_help.c:3651 sql_help.c:3659
-#: sql_help.c:3667 sql_help.c:3675 sql_help.c:3683 sql_help.c:3691
-#: sql_help.c:3708 sql_help.c:3717 sql_help.c:3725 sql_help.c:3742
-#: sql_help.c:3757 sql_help.c:4070 sql_help.c:4191 sql_help.c:4220
-#: sql_help.c:4236 sql_help.c:4238 sql_help.c:4742 sql_help.c:4790
-#: sql_help.c:4949
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "name"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:332 sql_help.c:1872
-#: sql_help.c:3376 sql_help.c:4509
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "აგრეგატის სახელმოწერა"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:255
-#: sql_help.c:273 sql_help.c:404 sql_help.c:451 sql_help.c:530 sql_help.c:578
-#: sql_help.c:596 sql_help.c:623 sql_help.c:676 sql_help.c:751 sql_help.c:806
-#: sql_help.c:827 sql_help.c:866 sql_help.c:916 sql_help.c:963 sql_help.c:1016
-#: sql_help.c:1048 sql_help.c:1058 sql_help.c:1093 sql_help.c:1113
-#: sql_help.c:1127 sql_help.c:1177 sql_help.c:1332 sql_help.c:1474
-#: sql_help.c:1517 sql_help.c:1538 sql_help.c:1552 sql_help.c:1564
-#: sql_help.c:1577 sql_help.c:1604 sql_help.c:1670 sql_help.c:1723
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "ახალი_სახელი"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:253
-#: sql_help.c:271 sql_help.c:402 sql_help.c:487 sql_help.c:535 sql_help.c:625
-#: sql_help.c:634 sql_help.c:699 sql_help.c:723 sql_help.c:754 sql_help.c:809
-#: sql_help.c:871 sql_help.c:914 sql_help.c:1021 sql_help.c:1060
-#: sql_help.c:1091 sql_help.c:1111 sql_help.c:1125 sql_help.c:1175
-#: sql_help.c:1408 sql_help.c:1476 sql_help.c:1519 sql_help.c:1540
-#: sql_help.c:1602 sql_help.c:1718 sql_help.c:3048
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "ახალი_მფლობელი"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:257 sql_help.c:324
-#: sql_help.c:453 sql_help.c:540 sql_help.c:678 sql_help.c:727 sql_help.c:757
-#: sql_help.c:812 sql_help.c:876 sql_help.c:1026 sql_help.c:1095
-#: sql_help.c:1129 sql_help.c:1334 sql_help.c:1521 sql_help.c:1542
-#: sql_help.c:1554 sql_help.c:1566 sql_help.c:1606 sql_help.c:1725
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "ახალი_სქემა"
 
-#: sql_help.c:44 sql_help.c:1936 sql_help.c:3377 sql_help.c:4538
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "სადაც aggregate_signature არის:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:342 sql_help.c:355
-#: sql_help.c:359 sql_help.c:375 sql_help.c:378 sql_help.c:381 sql_help.c:522
-#: sql_help.c:527 sql_help.c:532 sql_help.c:537 sql_help.c:542 sql_help.c:858
-#: sql_help.c:863 sql_help.c:868 sql_help.c:873 sql_help.c:878 sql_help.c:1008
-#: sql_help.c:1013 sql_help.c:1018 sql_help.c:1023 sql_help.c:1028
-#: sql_help.c:1890 sql_help.c:1907 sql_help.c:1913 sql_help.c:1937
-#: sql_help.c:1940 sql_help.c:1943 sql_help.c:2098 sql_help.c:2117
-#: sql_help.c:2120 sql_help.c:2424 sql_help.c:2633 sql_help.c:3378
-#: sql_help.c:3381 sql_help.c:3384 sql_help.c:3475 sql_help.c:3564
-#: sql_help.c:3592 sql_help.c:3945 sql_help.c:4408 sql_help.c:4515
-#: sql_help.c:4522 sql_help.c:4528 sql_help.c:4539 sql_help.c:4542
-#: sql_help.c:4545
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "არგრეჟიმი"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:343 sql_help.c:356
-#: sql_help.c:360 sql_help.c:376 sql_help.c:379 sql_help.c:382 sql_help.c:523
-#: sql_help.c:528 sql_help.c:533 sql_help.c:538 sql_help.c:543 sql_help.c:859
-#: sql_help.c:864 sql_help.c:869 sql_help.c:874 sql_help.c:879 sql_help.c:1009
-#: sql_help.c:1014 sql_help.c:1019 sql_help.c:1024 sql_help.c:1029
-#: sql_help.c:1891 sql_help.c:1908 sql_help.c:1914 sql_help.c:1938
-#: sql_help.c:1941 sql_help.c:1944 sql_help.c:2099 sql_help.c:2118
-#: sql_help.c:2121 sql_help.c:2425 sql_help.c:2634 sql_help.c:3379
-#: sql_help.c:3382 sql_help.c:3385 sql_help.c:3476 sql_help.c:3565
-#: sql_help.c:3593 sql_help.c:4516 sql_help.c:4523 sql_help.c:4529
-#: sql_help.c:4540 sql_help.c:4543 sql_help.c:4546
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "არგსახელი"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:344 sql_help.c:357
-#: sql_help.c:361 sql_help.c:377 sql_help.c:380 sql_help.c:383 sql_help.c:524
-#: sql_help.c:529 sql_help.c:534 sql_help.c:539 sql_help.c:544 sql_help.c:860
-#: sql_help.c:865 sql_help.c:870 sql_help.c:875 sql_help.c:880 sql_help.c:1010
-#: sql_help.c:1015 sql_help.c:1020 sql_help.c:1025 sql_help.c:1030
-#: sql_help.c:1892 sql_help.c:1909 sql_help.c:1915 sql_help.c:1939
-#: sql_help.c:1942 sql_help.c:1945 sql_help.c:2426 sql_help.c:2635
-#: sql_help.c:3380 sql_help.c:3383 sql_help.c:3386 sql_help.c:3477
-#: sql_help.c:3566 sql_help.c:3594 sql_help.c:4517 sql_help.c:4524
-#: sql_help.c:4530 sql_help.c:4541 sql_help.c:4544 sql_help.c:4547
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "არგტიპი"
 
-#: sql_help.c:114 sql_help.c:399 sql_help.c:476 sql_help.c:488 sql_help.c:957
-#: sql_help.c:1108 sql_help.c:1535 sql_help.c:1664 sql_help.c:1696
-#: sql_help.c:1748 sql_help.c:1807 sql_help.c:1996 sql_help.c:2003
-#: sql_help.c:2315 sql_help.c:2365 sql_help.c:2372 sql_help.c:2381
-#: sql_help.c:2470 sql_help.c:2695 sql_help.c:2786 sql_help.c:3077
-#: sql_help.c:3262 sql_help.c:3284 sql_help.c:3424 sql_help.c:3781
-#: sql_help.c:3989 sql_help.c:4235 sql_help.c:4237 sql_help.c:5015
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "მორგება"
 
-#: sql_help.c:115 sql_help.c:958 sql_help.c:1665 sql_help.c:2471
-#: sql_help.c:2696 sql_help.c:3263 sql_help.c:3425
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "სადაც option შეიძლება იყოს:"
 
-#: sql_help.c:116 sql_help.c:2247
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "შეერთ_ნებართვ"
 
-#: sql_help.c:117 sql_help.c:959 sql_help.c:1666 sql_help.c:2248
-#: sql_help.c:2472 sql_help.c:2697 sql_help.c:3264
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "შეერთ_ლიმიტი"
 
-#: sql_help.c:118 sql_help.c:2249
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "შაბლონია"
 
-#: sql_help.c:124 sql_help.c:613 sql_help.c:681 sql_help.c:695 sql_help.c:1337
-#: sql_help.c:1401 sql_help.c:4241
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "ცხრილების_ახალი_სივრცე"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:550 sql_help.c:552
-#: sql_help.c:553 sql_help.c:883 sql_help.c:885 sql_help.c:886 sql_help.c:966
-#: sql_help.c:970 sql_help.c:973 sql_help.c:1035 sql_help.c:1037
-#: sql_help.c:1038 sql_help.c:1188 sql_help.c:1190 sql_help.c:1673
-#: sql_help.c:1677 sql_help.c:1680 sql_help.c:2436 sql_help.c:2639
-#: sql_help.c:3957 sql_help.c:4259 sql_help.c:4420 sql_help.c:4730
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "კონფიგურაციის_პარამეტრი"
 
-#: sql_help.c:128 sql_help.c:400 sql_help.c:471 sql_help.c:477 sql_help.c:489
-#: sql_help.c:551 sql_help.c:605 sql_help.c:687 sql_help.c:697 sql_help.c:884
-#: sql_help.c:912 sql_help.c:967 sql_help.c:1036 sql_help.c:1109
-#: sql_help.c:1154 sql_help.c:1158 sql_help.c:1162 sql_help.c:1165
-#: sql_help.c:1170 sql_help.c:1173 sql_help.c:1189 sql_help.c:1380
-#: sql_help.c:1403 sql_help.c:1451 sql_help.c:1459 sql_help.c:1479
-#: sql_help.c:1536 sql_help.c:1620 sql_help.c:1674 sql_help.c:1697
-#: sql_help.c:2316 sql_help.c:2366 sql_help.c:2373 sql_help.c:2382
-#: sql_help.c:2437 sql_help.c:2438 sql_help.c:2502 sql_help.c:2505
-#: sql_help.c:2539 sql_help.c:2640 sql_help.c:2641 sql_help.c:2664
-#: sql_help.c:2787 sql_help.c:2826 sql_help.c:2936 sql_help.c:2949
-#: sql_help.c:2963 sql_help.c:3004 sql_help.c:3012 sql_help.c:3034
-#: sql_help.c:3051 sql_help.c:3078 sql_help.c:3285 sql_help.c:3990
-#: sql_help.c:4731 sql_help.c:4732 sql_help.c:4733 sql_help.c:4734
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "მნიშვნელობა"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "სამიზნე_როლი"
 
-#: sql_help.c:203 sql_help.c:921 sql_help.c:2300 sql_help.c:2669
-#: sql_help.c:2742 sql_help.c:2747 sql_help.c:3920 sql_help.c:3929
-#: sql_help.c:3948 sql_help.c:3960 sql_help.c:4383 sql_help.c:4392
-#: sql_help.c:4411 sql_help.c:4423
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "schema_name"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "შეთავაზება_GRANT_ან_REVOKE"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "სადაც abbreviated_grant_or_revoke ერთ-ერთია სიიდან:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:576 sql_help.c:612 sql_help.c:680 sql_help.c:830 sql_help.c:977
-#: sql_help.c:1336 sql_help.c:1684 sql_help.c:2475 sql_help.c:2476
-#: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2613
-#: sql_help.c:2700 sql_help.c:2701 sql_help.c:2702 sql_help.c:3267
-#: sql_help.c:3268 sql_help.c:3269 sql_help.c:3270 sql_help.c:3271
-#: sql_help.c:3969 sql_help.c:3973 sql_help.c:4432 sql_help.c:4436
-#: sql_help.c:4752
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "role_name"
 
-#: sql_help.c:241 sql_help.c:464 sql_help.c:920 sql_help.c:1362 sql_help.c:1364
-#: sql_help.c:1368 sql_help.c:1418 sql_help.c:1430 sql_help.c:1455
-#: sql_help.c:1714 sql_help.c:2269 sql_help.c:2273 sql_help.c:2385
-#: sql_help.c:2390 sql_help.c:2498 sql_help.c:2668 sql_help.c:2803
-#: sql_help.c:2808 sql_help.c:2810 sql_help.c:2931 sql_help.c:2944
-#: sql_help.c:2958 sql_help.c:2967 sql_help.c:2979 sql_help.c:3008
-#: sql_help.c:4021 sql_help.c:4036 sql_help.c:4038 sql_help.c:4134
-#: sql_help.c:4137 sql_help.c:4139 sql_help.c:4602 sql_help.c:4603
-#: sql_help.c:4612 sql_help.c:4659 sql_help.c:4660 sql_help.c:4661
-#: sql_help.c:4662 sql_help.c:4663 sql_help.c:4664 sql_help.c:4705
-#: sql_help.c:4706 sql_help.c:4711 sql_help.c:4716 sql_help.c:4860
-#: sql_help.c:4861 sql_help.c:4870 sql_help.c:4917 sql_help.c:4918
-#: sql_help.c:4919 sql_help.c:4920 sql_help.c:4921 sql_help.c:4922
-#: sql_help.c:4977 sql_help.c:4979 sql_help.c:5045 sql_help.c:5105
-#: sql_help.c:5106 sql_help.c:5115 sql_help.c:5162 sql_help.c:5163
-#: sql_help.c:5164 sql_help.c:5165 sql_help.c:5166 sql_help.c:5167
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
-msgstr "გამსახულება"
+msgstr "expression"
 
-#: sql_help.c:244 sql_help.c:2270
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "დომენის_შეზღუდვა"
 
-#: sql_help.c:246 sql_help.c:248 sql_help.c:251 sql_help.c:479 sql_help.c:480
-#: sql_help.c:1329 sql_help.c:1388 sql_help.c:1389 sql_help.c:1390
-#: sql_help.c:1417 sql_help.c:1429 sql_help.c:1446 sql_help.c:1878
-#: sql_help.c:1880 sql_help.c:2272 sql_help.c:2384 sql_help.c:2389
-#: sql_help.c:2966 sql_help.c:2978 sql_help.c:4033
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "შეზღუდვის_სახელი"
 
-#: sql_help.c:249 sql_help.c:1330
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "ახალი_შეზღუდვის_სახელი"
 
-#: sql_help.c:322 sql_help.c:1107
+#: sql_help.c:277 sql_help.c:2301
+msgid "where domain_constraint is:"
+msgstr "სადაც domain_constraint არის:"
+
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "ახალი_მნიშვნელობა"
 
-#: sql_help.c:326 sql_help.c:328
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "member_object"
 
-#: sql_help.c:329
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "სადაც member_object არის:"
 
-#: sql_help.c:330 sql_help.c:335 sql_help.c:336 sql_help.c:337 sql_help.c:338
-#: sql_help.c:339 sql_help.c:340 sql_help.c:345 sql_help.c:349 sql_help.c:351
-#: sql_help.c:353 sql_help.c:362 sql_help.c:363 sql_help.c:364 sql_help.c:365
-#: sql_help.c:366 sql_help.c:367 sql_help.c:368 sql_help.c:369 sql_help.c:372
-#: sql_help.c:373 sql_help.c:1870 sql_help.c:1875 sql_help.c:1882
-#: sql_help.c:1883 sql_help.c:1884 sql_help.c:1885 sql_help.c:1886
-#: sql_help.c:1887 sql_help.c:1888 sql_help.c:1893 sql_help.c:1895
-#: sql_help.c:1899 sql_help.c:1901 sql_help.c:1905 sql_help.c:1910
-#: sql_help.c:1911 sql_help.c:1918 sql_help.c:1919 sql_help.c:1920
-#: sql_help.c:1921 sql_help.c:1922 sql_help.c:1923 sql_help.c:1924
-#: sql_help.c:1925 sql_help.c:1926 sql_help.c:1927 sql_help.c:1928
-#: sql_help.c:1933 sql_help.c:1934 sql_help.c:4505 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4512 sql_help.c:4513 sql_help.c:4519
-#: sql_help.c:4520 sql_help.c:4525 sql_help.c:4526 sql_help.c:4531
-#: sql_help.c:4532 sql_help.c:4533 sql_help.c:4534 sql_help.c:4535
-#: sql_help.c:4536
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "ობიექტის_სახელი"
 
-#: sql_help.c:331 sql_help.c:1871 sql_help.c:4508
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "აგრეგატის სახელი"
 
-#: sql_help.c:333 sql_help.c:1873 sql_help.c:2163 sql_help.c:2167
-#: sql_help.c:2169 sql_help.c:3394
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "წყაროს_ტიპი"
 
-#: sql_help.c:334 sql_help.c:1874 sql_help.c:2164 sql_help.c:2168
-#: sql_help.c:2170 sql_help.c:3395
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "სამიზნის_ტიპი"
 
-#: sql_help.c:341 sql_help.c:794 sql_help.c:1889 sql_help.c:2165
-#: sql_help.c:2208 sql_help.c:2288 sql_help.c:2556 sql_help.c:2587
-#: sql_help.c:3154 sql_help.c:4407 sql_help.c:4514 sql_help.c:4631
-#: sql_help.c:4635 sql_help.c:4639 sql_help.c:4642 sql_help.c:4889
-#: sql_help.c:4893 sql_help.c:4897 sql_help.c:4900 sql_help.c:5134
-#: sql_help.c:5138 sql_help.c:5142 sql_help.c:5145
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "ფუნქციის_სახელი"
 
-#: sql_help.c:346 sql_help.c:787 sql_help.c:1896 sql_help.c:2580
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "ოპერატორის_სახელი"
 
-#: sql_help.c:347 sql_help.c:721 sql_help.c:725 sql_help.c:729 sql_help.c:1897
-#: sql_help.c:2557 sql_help.c:3518
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "მარჯვენა ტიპი"
 
-#: sql_help.c:348 sql_help.c:722 sql_help.c:726 sql_help.c:730 sql_help.c:1898
-#: sql_help.c:2558 sql_help.c:3519
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "right_type"
 
-#: sql_help.c:350 sql_help.c:352 sql_help.c:750 sql_help.c:753 sql_help.c:756
-#: sql_help.c:785 sql_help.c:797 sql_help.c:805 sql_help.c:808 sql_help.c:811
-#: sql_help.c:1435 sql_help.c:1900 sql_help.c:1902 sql_help.c:2577
-#: sql_help.c:2598 sql_help.c:2984 sql_help.c:3528 sql_help.c:3537
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "ინდექსის_მეთოდი"
 
-#: sql_help.c:354 sql_help.c:1906 sql_help.c:4521
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "პროცედურის სახელი"
 
-#: sql_help.c:358 sql_help.c:1912 sql_help.c:3944 sql_help.c:4527
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "ქვეპროგრამის სახელი"
 
-#: sql_help.c:370 sql_help.c:1407 sql_help.c:1929 sql_help.c:2432
-#: sql_help.c:2638 sql_help.c:2939 sql_help.c:3121 sql_help.c:3699
-#: sql_help.c:3966 sql_help.c:4429
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "ტიპის სახელი"
 
-#: sql_help.c:371 sql_help.c:1930 sql_help.c:2431 sql_help.c:2637
-#: sql_help.c:3122 sql_help.c:3352 sql_help.c:3700 sql_help.c:3951
-#: sql_help.c:4414
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "ენის_სახელი"
 
-#: sql_help.c:374
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "და აგრეგატული_ხელმოწერა არის:"
 
-#: sql_help.c:397 sql_help.c:2030 sql_help.c:2313
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "დამმუშავებელი_ფუნქცია"
 
-#: sql_help.c:398 sql_help.c:2314
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "შემმოწმებელი_ფუნქცია"
 
-#: sql_help.c:446 sql_help.c:525 sql_help.c:669 sql_help.c:861 sql_help.c:1011
-#: sql_help.c:1324 sql_help.c:1611
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "ქმედება"
 
-#: sql_help.c:448 sql_help.c:455 sql_help.c:459 sql_help.c:460 sql_help.c:463
-#: sql_help.c:465 sql_help.c:466 sql_help.c:467 sql_help.c:469 sql_help.c:472
-#: sql_help.c:474 sql_help.c:475 sql_help.c:673 sql_help.c:683 sql_help.c:685
-#: sql_help.c:688 sql_help.c:690 sql_help.c:691 sql_help.c:919 sql_help.c:1088
-#: sql_help.c:1326 sql_help.c:1354 sql_help.c:1358 sql_help.c:1359
-#: sql_help.c:1363 sql_help.c:1365 sql_help.c:1366 sql_help.c:1367
-#: sql_help.c:1369 sql_help.c:1370 sql_help.c:1372 sql_help.c:1375
-#: sql_help.c:1376 sql_help.c:1378 sql_help.c:1381 sql_help.c:1383
-#: sql_help.c:1384 sql_help.c:1431 sql_help.c:1433 sql_help.c:1440
-#: sql_help.c:1449 sql_help.c:1454 sql_help.c:1461 sql_help.c:1462
-#: sql_help.c:1713 sql_help.c:1716 sql_help.c:1720 sql_help.c:1756
-#: sql_help.c:1877 sql_help.c:1993 sql_help.c:1999 sql_help.c:2013
-#: sql_help.c:2014 sql_help.c:2015 sql_help.c:2363 sql_help.c:2376
-#: sql_help.c:2429 sql_help.c:2497 sql_help.c:2503 sql_help.c:2536
-#: sql_help.c:2667 sql_help.c:2772 sql_help.c:2807 sql_help.c:2809
-#: sql_help.c:2921 sql_help.c:2930 sql_help.c:2940 sql_help.c:2943
-#: sql_help.c:2953 sql_help.c:2957 sql_help.c:2980 sql_help.c:2982
-#: sql_help.c:2989 sql_help.c:3002 sql_help.c:3007 sql_help.c:3014
-#: sql_help.c:3015 sql_help.c:3031 sql_help.c:3157 sql_help.c:3297
-#: sql_help.c:3923 sql_help.c:3924 sql_help.c:4020 sql_help.c:4035
-#: sql_help.c:4037 sql_help.c:4039 sql_help.c:4133 sql_help.c:4136
-#: sql_help.c:4138 sql_help.c:4140 sql_help.c:4386 sql_help.c:4387
-#: sql_help.c:4507 sql_help.c:4668 sql_help.c:4675 sql_help.c:4677
-#: sql_help.c:4926 sql_help.c:4933 sql_help.c:4935 sql_help.c:4976
-#: sql_help.c:4978 sql_help.c:4980 sql_help.c:5033 sql_help.c:5171
-#: sql_help.c:5178 sql_help.c:5180
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "column_name"
 
-#: sql_help.c:449 sql_help.c:674 sql_help.c:1327 sql_help.c:1721
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "ახალი_სვეტის_სახელი"
 
-#: sql_help.c:454 sql_help.c:546 sql_help.c:682 sql_help.c:882 sql_help.c:1032
-#: sql_help.c:1353 sql_help.c:1621
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "და როცა ქმედება არის ერთერთი სიიდან:"
 
-#: sql_help.c:456 sql_help.c:461 sql_help.c:1080 sql_help.c:1355
-#: sql_help.c:1360 sql_help.c:1623 sql_help.c:1627 sql_help.c:2267
-#: sql_help.c:2364 sql_help.c:2576 sql_help.c:2765 sql_help.c:2922
-#: sql_help.c:3204 sql_help.c:4192
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "მონაცემების_ტიპი"
 
-#: sql_help.c:457 sql_help.c:462 sql_help.c:1356 sql_help.c:1361
-#: sql_help.c:1456 sql_help.c:1624 sql_help.c:1628 sql_help.c:2268
-#: sql_help.c:2367 sql_help.c:2499 sql_help.c:2924 sql_help.c:2932
-#: sql_help.c:2945 sql_help.c:2959 sql_help.c:3009 sql_help.c:3205
-#: sql_help.c:3211 sql_help.c:4030
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "კოლაცია"
 
-#: sql_help.c:458 sql_help.c:1357 sql_help.c:2368 sql_help.c:2377
-#: sql_help.c:2925 sql_help.c:2941 sql_help.c:2954
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "column_constraint"
 
-#: sql_help.c:468 sql_help.c:610 sql_help.c:684 sql_help.c:1377 sql_help.c:5027
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "მთელი რიცხვი"
 
-#: sql_help.c:470 sql_help.c:473 sql_help.c:686 sql_help.c:689 sql_help.c:1379
-#: sql_help.c:1382
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "ატრიბუტის პარამეტრი"
 
-#: sql_help.c:478 sql_help.c:1386 sql_help.c:2369 sql_help.c:2378
-#: sql_help.c:2926 sql_help.c:2942 sql_help.c:2955
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "ცხრილის_შეზღუდვები"
 
-#: sql_help.c:481 sql_help.c:482 sql_help.c:483 sql_help.c:484 sql_help.c:1391
-#: sql_help.c:1392 sql_help.c:1393 sql_help.c:1394 sql_help.c:1931
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "ტრიგერის_სახელი"
 
-#: sql_help.c:485 sql_help.c:486 sql_help.c:1405 sql_help.c:1406
-#: sql_help.c:2370 sql_help.c:2375 sql_help.c:2929 sql_help.c:2952
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "მშობელი_ცხრილი"
 
-#: sql_help.c:545 sql_help.c:602 sql_help.c:671 sql_help.c:881 sql_help.c:1031
-#: sql_help.c:1580 sql_help.c:2299
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "გაფართოების სახელი"
 
-#: sql_help.c:547 sql_help.c:1033 sql_help.c:2433
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "გაშვების_ფასი"
 
-#: sql_help.c:548 sql_help.c:1034 sql_help.c:2434
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "მწკრივები_შედეგში"
 
-#: sql_help.c:549 sql_help.c:2435
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "დამხმარე_ფუნქცია"
 
-#: sql_help.c:571 sql_help.c:573 sql_help.c:956 sql_help.c:964 sql_help.c:968
-#: sql_help.c:971 sql_help.c:974 sql_help.c:1663 sql_help.c:1671
-#: sql_help.c:1675 sql_help.c:1678 sql_help.c:1681 sql_help.c:2743
-#: sql_help.c:2745 sql_help.c:2748 sql_help.c:2749 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3926 sql_help.c:3927 sql_help.c:3930
-#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3934 sql_help.c:3936
-#: sql_help.c:3937 sql_help.c:3939 sql_help.c:3940 sql_help.c:3942
-#: sql_help.c:3943 sql_help.c:3949 sql_help.c:3950 sql_help.c:3952
-#: sql_help.c:3953 sql_help.c:3955 sql_help.c:3956 sql_help.c:3958
-#: sql_help.c:3959 sql_help.c:3961 sql_help.c:3962 sql_help.c:3964
-#: sql_help.c:3965 sql_help.c:3967 sql_help.c:3968 sql_help.c:3970
-#: sql_help.c:3971 sql_help.c:4384 sql_help.c:4385 sql_help.c:4389
-#: sql_help.c:4390 sql_help.c:4393 sql_help.c:4394 sql_help.c:4396
-#: sql_help.c:4397 sql_help.c:4399 sql_help.c:4400 sql_help.c:4402
-#: sql_help.c:4403 sql_help.c:4405 sql_help.c:4406 sql_help.c:4412
-#: sql_help.c:4413 sql_help.c:4415 sql_help.c:4416 sql_help.c:4418
-#: sql_help.c:4419 sql_help.c:4421 sql_help.c:4422 sql_help.c:4424
-#: sql_help.c:4425 sql_help.c:4427 sql_help.c:4428 sql_help.c:4430
-#: sql_help.c:4431 sql_help.c:4433 sql_help.c:4434
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "role_specification"
 
-#: sql_help.c:572 sql_help.c:574 sql_help.c:1694 sql_help.c:2234
-#: sql_help.c:2751 sql_help.c:3282 sql_help.c:3733 sql_help.c:4762
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "მომხმარებლის_სახელი"
 
-#: sql_help.c:575 sql_help.c:976 sql_help.c:1683 sql_help.c:2750
-#: sql_help.c:3972 sql_help.c:4435
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "სადაც role_specification შეიძლება იყოს:"
 
-#: sql_help.c:577
+#: sql_help.c:599
 msgid "group_name"
 msgstr "ჯგუფის_სახელი"
 
-#: sql_help.c:598 sql_help.c:1452 sql_help.c:2246 sql_help.c:2506
-#: sql_help.c:2540 sql_help.c:2937 sql_help.c:2950 sql_help.c:2964
-#: sql_help.c:3005 sql_help.c:3035 sql_help.c:3047 sql_help.c:3963
-#: sql_help.c:4426
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "ცხრილების_სივრცის_სახელი"
 
-#: sql_help.c:600 sql_help.c:693 sql_help.c:1399 sql_help.c:1409
-#: sql_help.c:1447 sql_help.c:1809
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "ინდექსის_სახელი"
 
-#: sql_help.c:604 sql_help.c:607 sql_help.c:696 sql_help.c:698 sql_help.c:1402
-#: sql_help.c:1404 sql_help.c:1450 sql_help.c:2504 sql_help.c:2538
-#: sql_help.c:2935 sql_help.c:2948 sql_help.c:2962 sql_help.c:3003
-#: sql_help.c:3033
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "საცავის_პარამეტრი"
 
-#: sql_help.c:609
+#: sql_help.c:631
 msgid "column_number"
 msgstr "column_number"
 
-#: sql_help.c:633 sql_help.c:1894 sql_help.c:4518
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "დიდი_ობიექტის_oid"
 
-#: sql_help.c:692 sql_help.c:1385 sql_help.c:2923
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "შეკუმშვის_მეთოდი"
 
-#: sql_help.c:694 sql_help.c:1400
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "წვდომის_ახალი_მეთოდი"
 
-#: sql_help.c:731 sql_help.c:2561
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "შეზღუდვის_პროცედურა"
 
-#: sql_help.c:732 sql_help.c:2562
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "შეერთების_პროცედურა"
 
-#: sql_help.c:733 sql_help.c:2559
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "კომუტ_ოპერ"
 
-#: sql_help.c:734 sql_help.c:2560
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "უარყ_ოპერატ"
 
-#: sql_help.c:786 sql_help.c:798 sql_help.c:2579
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "strategy_number"
 
-#: sql_help.c:788 sql_help.c:789 sql_help.c:792 sql_help.c:793 sql_help.c:799
-#: sql_help.c:800 sql_help.c:802 sql_help.c:803 sql_help.c:2581 sql_help.c:2582
-#: sql_help.c:2585 sql_help.c:2586
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "ოპ_ტიპი"
 
-#: sql_help.c:790 sql_help.c:2583
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "დალაგების_ოჯახის_სახელი"
 
-#: sql_help.c:791 sql_help.c:801 sql_help.c:2584
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "დამხმარე_რიცხვი"
 
-#: sql_help.c:795 sql_help.c:2166 sql_help.c:2588 sql_help.c:3124
-#: sql_help.c:3126
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "არგუმენტის_ტიპი"
 
-#: sql_help.c:826 sql_help.c:829 sql_help.c:918 sql_help.c:1047 sql_help.c:1087
-#: sql_help.c:1576 sql_help.c:1579 sql_help.c:1755 sql_help.c:1808
-#: sql_help.c:1879 sql_help.c:1904 sql_help.c:1917 sql_help.c:1932
-#: sql_help.c:1992 sql_help.c:1998 sql_help.c:2362 sql_help.c:2374
-#: sql_help.c:2495 sql_help.c:2535 sql_help.c:2612 sql_help.c:2666
-#: sql_help.c:2719 sql_help.c:2771 sql_help.c:2804 sql_help.c:2811
-#: sql_help.c:2920 sql_help.c:2938 sql_help.c:2951 sql_help.c:3030
-#: sql_help.c:3150 sql_help.c:3331 sql_help.c:3554 sql_help.c:3603
-#: sql_help.c:3709 sql_help.c:3919 sql_help.c:3925 sql_help.c:3986
-#: sql_help.c:4018 sql_help.c:4382 sql_help.c:4388 sql_help.c:4506
-#: sql_help.c:4619 sql_help.c:4682 sql_help.c:4721 sql_help.c:4877
-#: sql_help.c:4940 sql_help.c:4974 sql_help.c:5032 sql_help.c:5122
-#: sql_help.c:5185
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "ცხრილის_სახელი"
 
-#: sql_help.c:831 sql_help.c:2614
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
-msgstr "გამოყენების_გამოხატულება"
+msgstr "using_expression"
 
-#: sql_help.c:832 sql_help.c:2615
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "გამოსახულების_შემოწმება"
 
-#: sql_help.c:905 sql_help.c:907 sql_help.c:909 sql_help.c:2662
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
-msgstr "გამოცემის_ობიექტი"
+msgstr "publication_object"
 
-#: sql_help.c:911 sql_help.c:2663
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "publication_drop_object"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
-msgstr "გამოცემის_პარამეტრი"
+msgstr "publication_parameter"
 
-#: sql_help.c:917 sql_help.c:2665
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "სადაც publication_object ერთ-ერთია სიიდან:"
 
-#: sql_help.c:960 sql_help.c:1667 sql_help.c:2473 sql_help.c:2698
-#: sql_help.c:3265
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "ცხრილი_და სვეტები"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "და publication_drop_object ერთ-ერთია სიიდან:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "და table_and_columns არის:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "პაროლი"
 
-#: sql_help.c:961 sql_help.c:1668 sql_help.c:2474 sql_help.c:2699
-#: sql_help.c:3266
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "დროის შტამპი"
 
-#: sql_help.c:965 sql_help.c:969 sql_help.c:972 sql_help.c:975 sql_help.c:1672
-#: sql_help.c:1676 sql_help.c:1679 sql_help.c:1682 sql_help.c:3932
-#: sql_help.c:4395
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "ბაზის_სახელი"
 
-#: sql_help.c:1081 sql_help.c:2766
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "გაზრდა"
 
-#: sql_help.c:1082 sql_help.c:2767
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "მინ_მნიშვნელობა"
 
-#: sql_help.c:1083 sql_help.c:2768
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "მაქს_მნიშვნელობა"
 
-#: sql_help.c:1084 sql_help.c:2769 sql_help.c:4615 sql_help.c:4719
-#: sql_help.c:4873 sql_help.c:5049 sql_help.c:5118
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "დაწყება"
 
-#: sql_help.c:1085 sql_help.c:1374
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "გადატვრთვა"
 
-#: sql_help.c:1086 sql_help.c:2770
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "კეში"
 
-#: sql_help.c:1131
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "ახალი_სამიზნე"
 
-#: sql_help.c:1150 sql_help.c:2823
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "შეერთ_ინფო"
 
-#: sql_help.c:1152 sql_help.c:1156 sql_help.c:1160 sql_help.c:2824
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
-msgstr "გამოცემის_სახელი"
+msgstr "publication_name"
 
-#: sql_help.c:1153 sql_help.c:1157 sql_help.c:1161
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
-msgstr "გამოცემის_მორგება"
+msgstr "publication_option"
 
-#: sql_help.c:1164
+#: sql_help.c:1201
 msgid "refresh_option"
-msgstr "განახლების_პარამეტრები"
+msgstr "refresh_option"
 
-#: sql_help.c:1169 sql_help.c:2825
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
-msgstr "გამოწერის_პარამეტრი"
+msgstr "subscription_parameter"
 
-#: sql_help.c:1172
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "პარამეტრის_გამოტოვება"
 
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1344 sql_help.c:1352
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "დანაყოფის_სახელი"
 
-#: sql_help.c:1340 sql_help.c:1346 sql_help.c:1348 sql_help.c:2379
-#: sql_help.c:2956
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "დანაყოფის_საზღვრის_მითითება"
 
-#: sql_help.c:1345 sql_help.c:1350
-msgid "partition_name1"
-msgstr "დანაყოფის_სახელი1"
-
-#: sql_help.c:1347 sql_help.c:1351
-msgid "partition_name2"
-msgstr "დანაყოფის_სახელი2"
-
-#: sql_help.c:1371 sql_help.c:1421 sql_help.c:2970
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "მიმდევრობის_პარამეტრები"
 
-#: sql_help.c:1373
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "მიმდევრობის_პარამეტრი"
 
-#: sql_help.c:1387
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "ცხრილის_შეზღუდვა_ინდექსით"
 
-#: sql_help.c:1395 sql_help.c:1396 sql_help.c:1397 sql_help.c:1398
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "გადაწერის_წესის_სახელი"
 
-#: sql_help.c:1410 sql_help.c:2391 sql_help.c:2995
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "და დანაყოფის_საზღვარის_სპეციფიკაცია არის:"
 
-#: sql_help.c:1411 sql_help.c:1412 sql_help.c:1413 sql_help.c:2392
-#: sql_help.c:2393 sql_help.c:2394 sql_help.c:2996 sql_help.c:2997
-#: sql_help.c:2998
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "დანაყოფის_საზღვრის_გამოსახულება"
 
-#: sql_help.c:1414 sql_help.c:1415 sql_help.c:2395 sql_help.c:2396
-#: sql_help.c:2999 sql_help.c:3000
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "numeric_literal"
 
-#: sql_help.c:1416
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "და სვეტის_შეზღუდვა არის:"
 
-#: sql_help.c:1419 sql_help.c:2386 sql_help.c:2427 sql_help.c:2636
-#: sql_help.c:2968
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
-msgstr "ნაგულისხმები_გამოსახულება"
+msgstr "ნაგულისხმევი_გამოსახულება"
 
-#: sql_help.c:1420 sql_help.c:2387 sql_help.c:2969
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "გენერირებული_გამოსახულება"
 
-#: sql_help.c:1422 sql_help.c:1423 sql_help.c:1432 sql_help.c:1434
-#: sql_help.c:1438 sql_help.c:2971 sql_help.c:2972 sql_help.c:2981
-#: sql_help.c:2983 sql_help.c:2987
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "ინდექსის_პარამეტრები"
 
-#: sql_help.c:1424 sql_help.c:1441 sql_help.c:2973 sql_help.c:2990
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "მიბმების_ცხრილი"
 
-#: sql_help.c:1425 sql_help.c:1442 sql_help.c:2974 sql_help.c:2991
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "მიბმული_სვეტი"
 
-#: sql_help.c:1426 sql_help.c:1427 sql_help.c:1443 sql_help.c:1444
-#: sql_help.c:2975 sql_help.c:2976 sql_help.c:2992 sql_help.c:2993
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "მიბმის_ქმედებები"
 
-#: sql_help.c:1428 sql_help.c:2388 sql_help.c:2977
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "და table_constraint არის:"
 
-#: sql_help.c:1436 sql_help.c:2985
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "ელემენტის_ამოღება"
 
-#: sql_help.c:1437 sql_help.c:2986 sql_help.c:4613 sql_help.c:4717
-#: sql_help.c:4871 sql_help.c:5047 sql_help.c:5116
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "ოპერატორი"
 
-#: sql_help.c:1439 sql_help.c:2507 sql_help.c:2988
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "პრედიკატი"
 
-#: sql_help.c:1445
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "და table_constraint_using_index არის:"
 
-#: sql_help.c:1448 sql_help.c:3001
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "ინდექსის_პარამეტრები UNIQUE, PRIMARY KEY და EXCLUDE შეზღუდვებში:"
 
-#: sql_help.c:1453 sql_help.c:3006
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "ელემენტის_ამოღება EXCLUDE შეზღუდვაში წარმოადგენს:"
 
-#: sql_help.c:1457 sql_help.c:2500 sql_help.c:2933 sql_help.c:2946
-#: sql_help.c:2960 sql_help.c:3010 sql_help.c:4031
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "ოპერატ_კლასი"
 
-#: sql_help.c:1458 sql_help.c:2501 sql_help.c:3011
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "ოპერატ_კლასის_პარამეტრი"
 
-#: sql_help.c:1460 sql_help.c:3013
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "მიბმის ქმედება FOREIGN KEY/REFERENCES შეზღუდვაში წარმოადგენს:"
 
-#: sql_help.c:1478 sql_help.c:1481 sql_help.c:3050
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "ცხრილების_სივრცის_პარამეტრი"
 
-#: sql_help.c:1502 sql_help.c:1505 sql_help.c:1511 sql_help.c:1515
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "კოდის_ტიპი"
 
-#: sql_help.c:1503 sql_help.c:1506
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "ლექსიკონის_სახელი"
 
-#: sql_help.c:1508 sql_help.c:1512
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "ძველი_ლექსიკონი"
 
-#: sql_help.c:1509 sql_help.c:1513
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "ახალი_ლექსიკონი"
 
-#: sql_help.c:1608 sql_help.c:1622 sql_help.c:1625 sql_help.c:1626
-#: sql_help.c:3203
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "ატრიბუტის_სახელი"
 
-#: sql_help.c:1609
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "ახალი_ატრიბუტის_სახელი"
 
-#: sql_help.c:1613 sql_help.c:1617
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "ათვლის_ახალი_მნიშვნელობა"
 
-#: sql_help.c:1614
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "მეზობლად_ათვლის_მნიშვნელობა"
 
-#: sql_help.c:1616
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "აღრიცხვის_არსებული_მნიშვნელობა"
 
-#: sql_help.c:1619
+#: sql_help.c:1647
 msgid "property"
 msgstr "თვისება"
 
-#: sql_help.c:1695 sql_help.c:2371 sql_help.c:2380 sql_help.c:2782
-#: sql_help.c:3283 sql_help.c:3734 sql_help.c:3941 sql_help.c:3987
-#: sql_help.c:4404
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "server_name"
 
-#: sql_help.c:1727 sql_help.c:1730 sql_help.c:3298
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "ხედის_პარამეტრის_სახელი"
 
-#: sql_help.c:1728 sql_help.c:3299
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "ხედის_პარამეტრის_მნიშვნელობა"
 
-#: sql_help.c:1749 sql_help.c:5016
-msgid "table_and_columns"
-msgstr "ცხრილი_და სვეტები"
-
-#: sql_help.c:1750 sql_help.c:1810 sql_help.c:2004 sql_help.c:3783
-#: sql_help.c:4239 sql_help.c:5017
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "სადაც option შეიძლება იყოს ერთ-ერთი სიიდან:"
 
-#: sql_help.c:1751 sql_help.c:1752 sql_help.c:1811 sql_help.c:2006
-#: sql_help.c:2010 sql_help.c:2192 sql_help.c:3784 sql_help.c:3785
-#: sql_help.c:3786 sql_help.c:3787 sql_help.c:3788 sql_help.c:3789
-#: sql_help.c:3790 sql_help.c:3791 sql_help.c:3792 sql_help.c:3793
-#: sql_help.c:4240 sql_help.c:4242 sql_help.c:5018 sql_help.c:5019
-#: sql_help.c:5020 sql_help.c:5021 sql_help.c:5022 sql_help.c:5023
-#: sql_help.c:5024 sql_help.c:5025 sql_help.c:5026 sql_help.c:5028
-#: sql_help.c:5029
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "ლოგიკური"
 
-#: sql_help.c:1753 sql_help.c:5030
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "ზომა"
 
-#: sql_help.c:1754 sql_help.c:5031
-msgid "and table_and_columns is:"
-msgstr "და table_and_columns არის:"
-
-#: sql_help.c:1770 sql_help.c:4778 sql_help.c:4780 sql_help.c:4804
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "ტრანზაქციის_რეჟიმი"
 
-#: sql_help.c:1771 sql_help.c:4781 sql_help.c:4805
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "სადაც transaction_mode შეიძლება იყოს ერთ-ერთი სიიდან:"
 
-#: sql_help.c:1780 sql_help.c:4623 sql_help.c:4632 sql_help.c:4636
-#: sql_help.c:4640 sql_help.c:4643 sql_help.c:4881 sql_help.c:4890
-#: sql_help.c:4894 sql_help.c:4898 sql_help.c:4901 sql_help.c:5126
-#: sql_help.c:5135 sql_help.c:5139 sql_help.c:5143 sql_help.c:5146
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "არგიმენტი"
 
-#: sql_help.c:1876
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "ურთიერთობის_სახელი"
 
-#: sql_help.c:1881 sql_help.c:3935 sql_help.c:4398
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "დომენის_სახელი"
 
-#: sql_help.c:1903
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "policy_name"
 
-#: sql_help.c:1916
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "rule_name"
 
-#: sql_help.c:1935 sql_help.c:4537
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "string_literal"
 
-#: sql_help.c:1960 sql_help.c:4201 sql_help.c:4451
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "ტრანზაქციის_id"
 
-#: sql_help.c:1994 sql_help.c:2001 sql_help.c:4057
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "ფაილის სახელი"
 
-#: sql_help.c:1995 sql_help.c:2002 sql_help.c:2721 sql_help.c:2722
-#: sql_help.c:2723
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "ბრძანება"
 
-#: sql_help.c:1997 sql_help.c:2720 sql_help.c:3153 sql_help.c:3334
-#: sql_help.c:4041 sql_help.c:4124 sql_help.c:4127 sql_help.c:4130
-#: sql_help.c:4606 sql_help.c:4608 sql_help.c:4710 sql_help.c:4712
-#: sql_help.c:4864 sql_help.c:4866 sql_help.c:4983 sql_help.c:5109
-#: sql_help.c:5111
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "მდგომარეობა"
 
-#: sql_help.c:2000 sql_help.c:2541 sql_help.c:3036 sql_help.c:3300
-#: sql_help.c:3318 sql_help.c:4022
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "მოთხოვნა"
 
-#: sql_help.c:2005
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "ფორმატის_სახელი"
 
-#: sql_help.c:2007
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "გამყოფი_სიმბოლო"
 
-#: sql_help.c:2008
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "ნულოვანი_სტრიქონი"
 
-#: sql_help.c:2009
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "default_string"
 
-#: sql_help.c:2011
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "ციტატის_სიმბოლო"
 
-#: sql_help.c:2012
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "escape_character"
 
-#: sql_help.c:2016
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "error_action"
 
-#: sql_help.c:2017
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "მაქსშეცდომა"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "კოდირების-სახელი"
 
-#: sql_help.c:2018
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "დეტალურობა"
 
-#: sql_help.c:2029
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "წვდომის_მეთოდის_ტიპი"
 
-#: sql_help.c:2100 sql_help.c:2119 sql_help.c:2122
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "არგ_მონაც_ტიპი"
 
-#: sql_help.c:2101 sql_help.c:2123 sql_help.c:2131
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "მდგომარეობის_ფუნქცია"
 
-#: sql_help.c:2102 sql_help.c:2124 sql_help.c:2132
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "მდგომარეობის_მონაცემების_ტიპი"
 
-#: sql_help.c:2103 sql_help.c:2125 sql_help.c:2133
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "მდგომარეობის_მონაცემების_ზომა"
 
-#: sql_help.c:2104 sql_help.c:2126 sql_help.c:2134
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "დასრულების ფუნქცია"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "კომბინ_ფუნქც"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "დესერიალიზაციის_ფუნქცია"
 
-#: sql_help.c:2107 sql_help.c:2137
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "დესერიალიზაციის_ფუნქც"
 
-#: sql_help.c:2108 sql_help.c:2127 sql_help.c:2138
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "საწყისი_მდგომარეობა"
 
-#: sql_help.c:2109 sql_help.c:2139
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "გადაადგ_მდგომ_ფუნქცია"
 
-#: sql_help.c:2110 sql_help.c:2140
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "გადაადგ_მინ_მნიშვნ_ფუნქცია"
 
-#: sql_help.c:2111 sql_help.c:2141
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "გადაადგ_მონაც_ტიპი"
 
-#: sql_help.c:2112 sql_help.c:2142
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "გადაადგ_მონაც_ზომ"
 
-#: sql_help.c:2113 sql_help.c:2143
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "გადადგ_დასრულ_ფუნქცია"
 
-#: sql_help.c:2114 sql_help.c:2144
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "გადაადგ­_დასაწყ_ფუნქცია"
 
-#: sql_help.c:2115 sql_help.c:2145
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "დალაგების_ოპერატორი"
 
-#: sql_help.c:2128
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "ან ძველი სინტაქსი"
 
-#: sql_help.c:2130
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "base_type"
 
-#: sql_help.c:2188 sql_help.c:2238
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "ლოკალი"
 
-#: sql_help.c:2189 sql_help.c:2239
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2190 sql_help.c:2240
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2191 sql_help.c:4504
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "მომწოდებელი"
 
-#: sql_help.c:2193
+#: sql_help.c:2223
 msgid "rules"
 msgstr "rules"
 
-#: sql_help.c:2194 sql_help.c:2301
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "ვერსია"
 
-#: sql_help.c:2196
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "არსებული_კოლაცია"
 
-#: sql_help.c:2206
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "წყაროს_კოდირება"
 
-#: sql_help.c:2207
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "სამიზნე_კოდირება"
 
-#: sql_help.c:2235 sql_help.c:3076
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "შაბლონი"
 
-#: sql_help.c:2236
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "კოდირება"
 
-#: sql_help.c:2237
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "სტრატეგია"
 
-#: sql_help.c:2241
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "builtin_locale"
 
-#: sql_help.c:2242
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "icu_ენა"
 
-#: sql_help.c:2243
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "icu_rules"
 
-#: sql_help.c:2244
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "locale_provider"
 
-#: sql_help.c:2245
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "კოლაციის ვერსია"
 
-#: sql_help.c:2250
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2271
-msgid "where domain_constraint is:"
-msgstr "სადაც domain_constraint არის:"
-
-#: sql_help.c:2285 sql_help.c:2718 sql_help.c:3149
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "მოვლენა"
 
-#: sql_help.c:2286
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "ფილტრის_ცვლადი"
 
-#: sql_help.c:2287
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "ფილტრის_მნიშვნელობა"
 
-#: sql_help.c:2383 sql_help.c:2965
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "წყაროს_ცხრილი"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "მსგავსების_პარამეტრი"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "სადაც column_constraint არის:"
 
-#: sql_help.c:2428
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "და like_option არის:"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "დაბრუნების_ტიპი"
 
-#: sql_help.c:2430
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "column_type"
 
-#: sql_help.c:2439 sql_help.c:2642
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "აღწერა"
 
-#: sql_help.c:2440 sql_help.c:2643
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "ობიექტის_ფაილი"
 
-#: sql_help.c:2441 sql_help.c:2644
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "link_symbol"
 
-#: sql_help.c:2442 sql_help.c:2645
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "sql_ის_სხეული"
 
-#: sql_help.c:2480 sql_help.c:2703 sql_help.c:3272
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2496 sql_help.c:2537 sql_help.c:2934 sql_help.c:2947
-#: sql_help.c:2961 sql_help.c:3032
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "მეთოდი"
 
-#: sql_help.c:2518
+#: sql_help.c:2560
 msgid "call_handler"
-msgstr "გამოძახების_დამმუშავებელი"
+msgstr "call_handler"
 
-#: sql_help.c:2519
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "ჩადგმული_კოდის_დამმუშავებელი"
 
-#: sql_help.c:2520
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "მნიშვნფუნქცია"
 
-#: sql_help.c:2578
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "ოჯახის_სახელი"
 
-#: sql_help.c:2589
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "საცავის_ტიპი"
 
-#: sql_help.c:2724 sql_help.c:3156
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "სადაც event შეიძლება იყოს ერთ-ერთი:"
 
-#: sql_help.c:2744 sql_help.c:2746
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "schema_element"
 
-#: sql_help.c:2783
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "server_type"
 
-#: sql_help.c:2784
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "server_version"
 
-#: sql_help.c:2785 sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "fdw_name"
 
-#: sql_help.c:2802 sql_help.c:2805
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "statistics_name"
 
-#: sql_help.c:2806
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "statistics_kind"
 
-#: sql_help.c:2822
+#: sql_help.c:2872
 msgid "subscription_name"
-msgstr "გამოწერის_სახელი"
-
-#: sql_help.c:2927
-msgid "source_table"
-msgstr "წყაროს_ცხრილი"
-
-#: sql_help.c:2928
-msgid "like_option"
-msgstr "მსგავსების_პარამეტრი"
-
-#: sql_help.c:2994
-msgid "and like_option is:"
-msgstr "და like_option არის:"
+msgstr "subscription_name"
 
-#: sql_help.c:3049
+#: sql_help.c:3105
 msgid "directory"
 msgstr "საქაღალდე"
 
-#: sql_help.c:3063
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "დამმუშავებლის_სახელი"
 
-#: sql_help.c:3064
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "წყაროს_კონფიგურაცია"
 
-#: sql_help.c:3093
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "გაშვების_ფუნქცია"
 
-#: sql_help.c:3094
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "კოდის_მიღების_ფუნქცია"
 
-#: sql_help.c:3095
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "დასრულების ფუნქცია"
 
-#: sql_help.c:3096
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "ლექს_ტიპების_ფუნქცია"
 
-#: sql_help.c:3097
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "headline_function"
 
-#: sql_help.c:3109
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "ინიციალიზაციის_ფუნქცია"
 
-#: sql_help.c:3110
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "ლექსით_გამოყოფის_ფუნქცია"
 
-#: sql_help.c:3123
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "sql_ფუნქციის_სახელიდან"
 
-#: sql_help.c:3125
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "ფუნქციის_სახელი_sql_ში"
 
-#: sql_help.c:3151
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "მიბმული_ცხრილის_სახელი"
 
-#: sql_help.c:3152
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "გარდამავალი_ურთიერთობის_სახელი"
 
-#: sql_help.c:3155
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "არგუმენტები"
 
-#: sql_help.c:3207
+#: sql_help.c:3263
 msgid "label"
 msgstr "ჭდე"
 
-#: sql_help.c:3209
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "ქვეტიპი"
 
-#: sql_help.c:3210
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "ქვეტიპის_ოპერატორის_კლასი"
 
-#: sql_help.c:3212
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "კანონიკური_ფუნქცია"
 
-#: sql_help.c:3213
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "ქვეტიპის_სხვაობის_ფუნქცია"
 
-#: sql_help.c:3214
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "მრავალდიაპაზონიანი_ტიპის_სახელი"
 
-#: sql_help.c:3216
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "შეყვანის_ფუნქცია"
 
-#: sql_help.c:3217
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "გამოტანის_ფუნქცია"
 
-#: sql_help.c:3218
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "მიღების_ფუნქცია"
 
-#: sql_help.c:3219
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "საწყისი_მნიშვნელობის_ფუნქცია"
 
-#: sql_help.c:3220
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "ტიპის_მოდიფიკატორის_შემყვანის_ფუნქცია"
 
-#: sql_help.c:3221
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "ტიპის_მოტიფიკატორის_გამოტანის_ფუნქცია"
 
-#: sql_help.c:3222
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "ფუნქციის_ანალიზი"
 
-#: sql_help.c:3223
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "ინდექსით_მიმართვის_ფუნქცია"
 
-#: sql_help.c:3224
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "შიდასიგრძე"
 
-#: sql_help.c:3225
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "სწორება"
 
-#: sql_help.c:3226
+#: sql_help.c:3282
 msgid "storage"
 msgstr "საცავი"
 
-#: sql_help.c:3227
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "მსგავსების_ტიპი"
 
-#: sql_help.c:3228
+#: sql_help.c:3284
 msgid "category"
 msgstr "კატეგორია"
 
-#: sql_help.c:3229
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "რჩეული"
 
-#: sql_help.c:3230
+#: sql_help.c:3286
 msgid "default"
-msgstr "ნაგულისხმები"
+msgstr "ნაგულისხმევი"
 
-#: sql_help.c:3231
+#: sql_help.c:3287
 msgid "element"
 msgstr "ელემენტი"
 
-#: sql_help.c:3232
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "გამყოფი"
 
-#: sql_help.c:3233
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "დალაგებადი"
 
-#: sql_help.c:3330 sql_help.c:4017 sql_help.c:4111 sql_help.c:4601
-#: sql_help.c:4704 sql_help.c:4859 sql_help.c:4973 sql_help.c:5104
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "მოთხოვნით"
 
-#: sql_help.c:3332 sql_help.c:4019 sql_help.c:4620 sql_help.c:4626
-#: sql_help.c:4629 sql_help.c:4633 sql_help.c:4637 sql_help.c:4645
-#: sql_help.c:4878 sql_help.c:4884 sql_help.c:4887 sql_help.c:4891
-#: sql_help.c:4895 sql_help.c:4903 sql_help.c:4975 sql_help.c:5123
-#: sql_help.c:5129 sql_help.c:5132 sql_help.c:5136 sql_help.c:5140
-#: sql_help.c:5148
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "მეტსახელი"
 
-#: sql_help.c:3333 sql_help.c:4605 sql_help.c:4647 sql_help.c:4649
-#: sql_help.c:4653 sql_help.c:4655 sql_help.c:4656 sql_help.c:4657
-#: sql_help.c:4709 sql_help.c:4863 sql_help.c:4905 sql_help.c:4907
-#: sql_help.c:4911 sql_help.c:4913 sql_help.c:4914 sql_help.c:4915
-#: sql_help.c:4982 sql_help.c:5108 sql_help.c:5150 sql_help.c:5152
-#: sql_help.c:5156 sql_help.c:5158 sql_help.c:5159 sql_help.c:5160
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "ჩანაწერიდან"
 
-#: sql_help.c:3335 sql_help.c:3819 sql_help.c:4168 sql_help.c:4984
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "კურსორის_სახელი"
 
-#: sql_help.c:3336 sql_help.c:4025 sql_help.c:4117 sql_help.c:4985
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "გამოტანის_ფსევდონიმი"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "გამოტანის_გამოსახულება"
 
-#: sql_help.c:3337 sql_help.c:4026 sql_help.c:4118 sql_help.c:4604
-#: sql_help.c:4707 sql_help.c:4862 sql_help.c:4986 sql_help.c:5107
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
-msgstr "გამოტანს_სახელი"
+msgstr "გამოტანის_სახელი"
 
-#: sql_help.c:3353
+#: sql_help.c:3411
 msgid "code"
 msgstr "კოდი"
 
-#: sql_help.c:3758
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "Პარამეტრი"
 
-#: sql_help.c:3782 sql_help.c:4193
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "ოპერატორი"
 
-#: sql_help.c:3818 sql_help.c:4167
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "მიმართულება"
 
-#: sql_help.c:3820 sql_help.c:4169
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "სადაც direction შეიძლება იყოს ერთ-ერთი:"
 
-#: sql_help.c:3821 sql_help.c:3822 sql_help.c:3823 sql_help.c:3824
-#: sql_help.c:3825 sql_help.c:4170 sql_help.c:4171 sql_help.c:4172
-#: sql_help.c:4173 sql_help.c:4174 sql_help.c:4614 sql_help.c:4616
-#: sql_help.c:4718 sql_help.c:4720 sql_help.c:4872 sql_help.c:4874
-#: sql_help.c:5048 sql_help.c:5050 sql_help.c:5117 sql_help.c:5119
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "რაოდენობა"
 
-#: sql_help.c:3928 sql_help.c:4391
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "მიმდევრობის _სახელი"
 
-#: sql_help.c:3946 sql_help.c:4409
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "არგ_სახელი"
 
-#: sql_help.c:3947 sql_help.c:4410
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "არგ_ტიპი"
 
-#: sql_help.c:3954 sql_help.c:4417
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3985
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "დაშორებული_სქემა"
 
-#: sql_help.c:3988
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "ლოკალური_სქემა"
 
-#: sql_help.c:4023
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "კონფლიქტის_ობიექტი"
 
-#: sql_help.c:4024
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "ქმედება_კონფლიქტის_დროს"
 
-#: sql_help.c:4027
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "სადაც conflict_target შეიძლება იყოს სიიდან:"
 
-#: sql_help.c:4028
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "ინდექსის_სვეტის_სახელი"
 
-#: sql_help.c:4029
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "გამოსახულების_ინდექსი"
 
-#: sql_help.c:4032
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "ინდექსის_პრედიკატი"
 
-#: sql_help.c:4034
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "და conflict_action შეიძლება იყოს სიიდან:"
 
-#: sql_help.c:4040 sql_help.c:4141 sql_help.c:4981
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "ქვე-SELECT"
 
-#: sql_help.c:4049 sql_help.c:4182 sql_help.c:4957
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "არხი"
 
-#: sql_help.c:4071
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "ბლოკის_რეჟიმი"
 
-#: sql_help.c:4072
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "სადაც lockmode ერთერთია სიიდან:"
 
-#: sql_help.c:4112
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "სამიზნე ცხრილის სახელი"
 
-#: sql_help.c:4113
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "სამიზნე_მეტსახელი"
 
-#: sql_help.c:4114
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "მონაცემების_წყარო"
 
-#: sql_help.c:4115 sql_help.c:4650 sql_help.c:4908 sql_help.c:5153
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "შეერთების პირობა"
 
-#: sql_help.c:4116
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "პირობა_როდის"
 
-#: sql_help.c:4119
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "სადაც data_source არის:"
 
-#: sql_help.c:4120
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "წყაროს_ცხრილის_სახელი"
 
-#: sql_help.c:4121
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "წყაროს_მოთხოვნა"
 
-#: sql_help.c:4122
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "წყაროს_მეტსახელი"
 
-#: sql_help.c:4123
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "და when_clause არის:"
 
-#: sql_help.c:4125 sql_help.c:4128
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
-msgstr "განახლების_შერწყმა"
+msgstr "merge_update"
 
-#: sql_help.c:4126 sql_help.c:4129
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4131
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "ჩასმის_შერწყმა"
 
-#: sql_help.c:4132
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "და merge_insert არის:"
 
-#: sql_help.c:4135
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "და merge_update არის:"
 
-#: sql_help.c:4142
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "და merge_delete არის:"
 
-#: sql_help.c:4183
+#: sql_help.c:4245
 msgid "payload"
 msgstr "შემცველობა"
 
-#: sql_help.c:4210
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "ძველი_როლი"
 
-#: sql_help.c:4211
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "ახალი_როლი"
 
-#: sql_help.c:4250 sql_help.c:4459 sql_help.c:4467
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "შენახვის_წერტილის_სახელი"
 
-#: sql_help.c:4607 sql_help.c:4665 sql_help.c:4865 sql_help.c:4923
-#: sql_help.c:5110 sql_help.c:5168
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "დაჯგუფების_ელემენტი"
 
-#: sql_help.c:4609 sql_help.c:4713 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "ფანჯრის_სახელი"
 
-#: sql_help.c:4610 sql_help.c:4714 sql_help.c:4868 sql_help.c:5113
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "ფანჯრის_აღწერა"
 
-#: sql_help.c:4611 sql_help.c:4625 sql_help.c:4669 sql_help.c:4715
-#: sql_help.c:4869 sql_help.c:4883 sql_help.c:4927 sql_help.c:5114
-#: sql_help.c:5128 sql_help.c:5172
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "არჩევა"
 
-#: sql_help.c:4617 sql_help.c:4875 sql_help.c:5120
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "from_reference"
 
-#: sql_help.c:4618 sql_help.c:4876 sql_help.c:5121
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "სადაც from_item შეიძლება იყოს სიიდან ერთი:"
 
-#: sql_help.c:4621 sql_help.c:4627 sql_help.c:4630 sql_help.c:4634
-#: sql_help.c:4646 sql_help.c:4879 sql_help.c:4885 sql_help.c:4888
-#: sql_help.c:4892 sql_help.c:4904 sql_help.c:5124 sql_help.c:5130
-#: sql_help.c:5133 sql_help.c:5137 sql_help.c:5149
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "column_alias"
 
-#: sql_help.c:4622 sql_help.c:4880 sql_help.c:5125
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "sampling_method"
 
-#: sql_help.c:4624 sql_help.c:4882 sql_help.c:5127
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "საწყისი მნიშვნელობა"
 
-#: sql_help.c:4628 sql_help.c:4667 sql_help.c:4886 sql_help.c:4925
-#: sql_help.c:5131 sql_help.c:5170
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "მოთხოვნის_სახელით"
 
-#: sql_help.c:4638 sql_help.c:4641 sql_help.c:4644 sql_help.c:4896
-#: sql_help.c:4899 sql_help.c:4902 sql_help.c:5141 sql_help.c:5144
-#: sql_help.c:5147
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "column_definition"
 
-#: sql_help.c:4648 sql_help.c:4654 sql_help.c:4906 sql_help.c:4912
-#: sql_help.c:5151 sql_help.c:5157
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "შეერთების_ტიპი"
 
-#: sql_help.c:4651 sql_help.c:4909 sql_help.c:5154
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "join_column"
 
-#: sql_help.c:4652 sql_help.c:4910 sql_help.c:5155
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "მეტსახელით_შეერთბა"
 
-#: sql_help.c:4658 sql_help.c:4916 sql_help.c:5161
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "და grouping_element შეძლება იყოს სიიდან ერთი:"
 
-#: sql_help.c:4666 sql_help.c:4924 sql_help.c:5169
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "და with_query არის:"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "მნიშვნელობები"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "ჩასმა"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "განახლება"
 
-#: sql_help.c:4673 sql_help.c:4931 sql_help.c:5176
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4674 sql_help.c:4932 sql_help.c:5177
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "შერწყმა"
 
-#: sql_help.c:4676 sql_help.c:4934 sql_help.c:5179
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "ბოლო_ძებნის_სვეტის_სახელი"
 
-#: sql_help.c:4678 sql_help.c:4936 sql_help.c:5181
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "ციკლის_ნიშნიანი_სვეტის_სახელი"
 
-#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5182
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "ციკლის ნიშნის მნიშვნელობა"
 
-#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5183
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
-msgstr "ციკლის_ნაგულისხმები_ნიშანი"
+msgstr "ციკლის_ნაგულისხმევი_ნიშანი"
 
-#: sql_help.c:4681 sql_help.c:4939 sql_help.c:5184
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "ციკლის_ბილიკის_სვეტის_სახელი"
 
-#: sql_help.c:4708
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "ახალი_ცხრილის"
 
-#: sql_help.c:4779
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "snapshot_id"
 
-#: sql_help.c:5046
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "დალაგების_გამოსახულება"
 
-#: sql_help.c:5191 sql_help.c:6175
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "მიმდინარე ტრანზაქციის გაუქმება"
 
-#: sql_help.c:5197
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "აგრეგატული ფუნქციის აღწერის შექმნა"
 
-#: sql_help.c:5203
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "კოლაციის აღწერის შეცვლა"
 
-#: sql_help.c:5209
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "გადაყვანის აღწერის შეცვლა"
 
-#: sql_help.c:5215
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "მონაცემთა ბაზის შეცვლა"
 
-#: sql_help.c:5221
+#: sql_help.c:5285
 msgid "define default access privileges"
-msgstr "წვდომის ნაგულისხმები უფლებების აღწერა"
+msgstr "წვდომის ნაგულისხმევი უფლებების აღწერა"
 
-#: sql_help.c:5227
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "დომენის აღწერის შეცვლა"
 
-#: sql_help.c:5233
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "დომენის აღწერის შეცვლა"
 
-#: sql_help.c:5239
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "გაფართოების აღწერის შეცვლა"
 
-#: sql_help.c:5245
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "გარე-მონაცემების გადამტანის აღწერის შეცვლა"
 
-#: sql_help.c:5251
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "გარე ცხრილის აღწერის შეცვლა"
 
-#: sql_help.c:5257
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "ფუნქციის აღწერის შეცვლა"
 
-#: sql_help.c:5263
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "როლის სახელის ან წევრობის შეცვლა"
 
-#: sql_help.c:5269
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "ინდექსის აღწერის შეცვლა"
 
-#: sql_help.c:5275
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "პროცედურული ენის აღწერის შეცვლა"
 
-#: sql_help.c:5281
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "დიდი ობიექტის აღწერის შეცვლა"
 
-#: sql_help.c:5287
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "მატერიალიზებული ხედის აღწერის შეცვლა"
 
-#: sql_help.c:5293
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "ოპერატორის აღწერის შეცვლა"
 
-#: sql_help.c:5299
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "ოპერატორის კლასის აღწერის შეცვლა"
 
-#: sql_help.c:5305
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "ოპერატორის ოჯახის აღწერის შეცვლა"
 
-#: sql_help.c:5311
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "მწკრივის-დონის-უსაფრთხოების წესების აღწერის შეცვლა"
 
-#: sql_help.c:5317
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "პროცედურის აღწერის შეცვლა"
 
-#: sql_help.c:5323
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "გამოცემის აღწერის შეცვლა"
 
-#: sql_help.c:5329 sql_help.c:5431
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "მონაცემთა ბაზის როლის შეცვლა"
 
-#: sql_help.c:5335
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "ქვეპროგრამის აღწერის შეცვლა"
 
-#: sql_help.c:5341
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "წესის აღწერის შეცვლა"
 
-#: sql_help.c:5347
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "სქემის აღწერის შეცვლა"
 
-#: sql_help.c:5353
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "მიმდევრობის გენერატორის აღწერის შეცვლა"
 
-#: sql_help.c:5359
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "გარე სერვერის აღწერის შეცვლა"
 
-#: sql_help.c:5365
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "სტატისტიკის გაფართოებული ობიექტის აღწერის შეცვლა"
 
-#: sql_help.c:5371
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "გამოწერის აღწერის შეცვლა"
 
-#: sql_help.c:5377
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "სერვერის კონფიგურაციის პარამეტრის შეცვლა"
 
-#: sql_help.c:5383
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "ცხრილის აღწერის შეცვლა"
 
-#: sql_help.c:5389
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "ცხრილების სივრცის აღწერის შეცვლა"
 
-#: sql_help.c:5395
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "ტექსტის ძებნის კონფიგურაციის აღწერის შეცვლა"
 
-#: sql_help.c:5401
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "ტექსტის ძებნის ლექსიკონის აღწერის შეცვლა"
 
-#: sql_help.c:5407
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "ტექსტის ძებნის დამმუშავებლის აღწერს შეცვლა"
 
-#: sql_help.c:5413
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "ტექსტის ძებნის შაბლონის აღწერის შეცვლა"
 
-#: sql_help.c:5419
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "ტრიგერის აღწერის შეცვლა"
 
-#: sql_help.c:5425
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "ტიპის აღწერის შეცვლა"
 
-#: sql_help.c:5437
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "მომხარებლის მიბმის აღწერის შეცვლა"
 
-#: sql_help.c:5443
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "ხედის აღწერის შეცვლა"
 
-#: sql_help.c:5449
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "მონაცემების სტატისტიკის მოგროვება"
 
-#: sql_help.c:5455 sql_help.c:6253
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "ტრანზაქციის ბლოკის დაწყება"
 
-#: sql_help.c:5461
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "პროცედურის ჩაწოდება"
 
-#: sql_help.c:5467
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "წინასწარ-ჩაწერად ჟურნალში საკონტროლო წერტილის დასმა"
 
-#: sql_help.c:5473
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "კურსორის დახურვა"
 
-#: sql_help.c:5479
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "ცხრილის გადაჯგუფება ინდექსის მიხედვით"
 
-#: sql_help.c:5485
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "ობიექტის კომენტარის აღწერა ან შეცვლა"
 
-#: sql_help.c:5491 sql_help.c:6049
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "მიმდინარე ტრანზაქციის გადაცემა"
 
-#: sql_help.c:5497
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "წინასწარ ორ ფაზაში გადასაცემად მომზადებული ტრანზაქციის გადაცემა"
 
-#: sql_help.c:5503
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "მონაცემების კოპირება ფაილსა და ცხრილს შორის"
 
-#: sql_help.c:5509
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "წვდომის ახალი მეთოდის აღწერა"
 
-#: sql_help.c:5515
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "ახალი აგრეგატული ფუნქციის აღწერა"
 
-#: sql_help.c:5521
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "ახალი კასტის აღწერა"
 
-#: sql_help.c:5527
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "ახალი კოლაციის აღწერა"
 
-#: sql_help.c:5533
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "კოდირების ახალი გადაყვანის აღწერა"
 
-#: sql_help.c:5539
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "ახალი მონაცემთა ბაზის შექმნა"
 
-#: sql_help.c:5545
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "ახალი დომენის შექმნა"
 
-#: sql_help.c:5551
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "მოვლენის ახალი ტრიგერის აღწერა"
 
-#: sql_help.c:5557
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "გაფართოების დაყენება"
 
-#: sql_help.c:5563
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "გარე მონაცემების ახალი გადამტანის აღწერა"
 
-#: sql_help.c:5569
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "მონაცემების გარე ცხრილის აღწერა"
 
-#: sql_help.c:5575
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "ახალი ფუნქციის აღწერა"
 
-#: sql_help.c:5581 sql_help.c:5641 sql_help.c:5743
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "მონაცემთა ბაზის ახალი როლის აღწერა"
 
-#: sql_help.c:5587
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "ახალი ინდექსის აღწერა"
 
-#: sql_help.c:5593
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "ახალი პროცედურული ენის აღწერა"
 
-#: sql_help.c:5599
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "ახალი მატერიალიზებული ხედის აღწერა"
 
-#: sql_help.c:5605
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "ახალი ოპერატორის აღწერა"
 
-#: sql_help.c:5611
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "ოპერატორის ახალი კლასის აღწერა"
 
-#: sql_help.c:5617
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "ოპერატორის ახალი ოჯახის აღწერა"
 
-#: sql_help.c:5623
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "ცხრილისთვის ახალი მწკრივის-დონის-უსაფრთხოების წესის აღწერა"
 
-#: sql_help.c:5629
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "ახალი პროცედურის აღწერა"
 
-#: sql_help.c:5635
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "ახალი გამოცემის აღწერა"
 
-#: sql_help.c:5647
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "ახალი გადაწერის წესის აღწერა"
 
-#: sql_help.c:5653
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "ახალი სქემის აღწერა"
 
-#: sql_help.c:5659
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "მიმდევრობის ახალი გენერატორის აღწერა"
 
-#: sql_help.c:5665
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "ახალი გარე სერვერის აღწერა"
 
-#: sql_help.c:5671
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "გაფართოებული სტატისტიკის აღწერა"
 
-#: sql_help.c:5677
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "ახალი გამოწერის აღწერა"
 
-#: sql_help.c:5683
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "ახალი ცხრილის აღწერა"
 
-#: sql_help.c:5689 sql_help.c:6211
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "მოთხოვნის შედეგებიდან ახალი ცხრილის აღწერა"
 
-#: sql_help.c:5695
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "ცხრილების ახალი სივრცის აღწერა"
 
-#: sql_help.c:5701
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "ტექსტის ძებნის ახალი კონფიგურაციის აღწერა"
 
-#: sql_help.c:5707
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "ტექსტის ძებნის ახალ ლექსიკონის აღწერა"
 
-#: sql_help.c:5713
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "ტექსტის ძებნის ახალი დამმუშავებლის აღწერა"
 
-#: sql_help.c:5719
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "ტექსტის ძებნის ახალი შაბლონის აღწერა"
 
-#: sql_help.c:5725
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "ახალი გარდაქმნის აღწერა"
 
-#: sql_help.c:5731
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "ახალი ტრიგერის აღწერა"
 
-#: sql_help.c:5737
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "მონაცემების ახალი ტიპის აღწერა"
 
-#: sql_help.c:5749
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "მომხმარებლის გარე სერვერთან ახალი ბმის აღწერა"
 
-#: sql_help.c:5755
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "ახალი ხედის აღწერა"
 
-#: sql_help.c:5761
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "მომზადებული ოპერატორის გათავისუფლება"
 
-#: sql_help.c:5767
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "კურსორის აღწერა"
 
-#: sql_help.c:5773
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "ცხრილში მწკრივების წაშლა"
 
-#: sql_help.c:5779
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "სესიის მდგომარეობის მოშორება"
 
-#: sql_help.c:5785
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "კოდის ანონიმური ბლოკის შესრულება"
 
-#: sql_help.c:5791
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "წვდომის მეთოდის წაშლა"
 
-#: sql_help.c:5797
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "აგრეგატული ფუნქციის წაშლა"
 
-#: sql_help.c:5803
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "კასტის წაშლა"
 
-#: sql_help.c:5809
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "კოლაციის წაშლა"
 
-#: sql_help.c:5815
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "გადაყვანის წაშლა"
 
-#: sql_help.c:5821
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "მონაცემთა ბაზის წაშლა"
 
-#: sql_help.c:5827
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "დომენის წაშლა"
 
-#: sql_help.c:5833
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "მოვლენის ტრიგერის წაშლა"
 
-#: sql_help.c:5839
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "გაფართოების წაშლა"
 
-#: sql_help.c:5845
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "გარე-მონაცემების გადამტანის წაშლა"
 
-#: sql_help.c:5851
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "გარე ცხრილის წაშლა"
 
-#: sql_help.c:5857
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "ფუნქციის წაშლა"
 
-#: sql_help.c:5863 sql_help.c:5929 sql_help.c:6031
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "მონაცემთა ბაზის როლის წაშლა"
 
-#: sql_help.c:5869
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "ინდექსის წაშლა"
 
-#: sql_help.c:5875
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "პროცედურული ენის წაშლა"
 
-#: sql_help.c:5881
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "მატერიალიზებული ხედის წაშლა"
 
-#: sql_help.c:5887
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "ოპერატორის წაშლა"
 
-#: sql_help.c:5893
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "ოპერატორის კლასის წაშლა"
 
-#: sql_help.c:5899
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "ოპერატორის ოჯახის წაშლა"
 
-#: sql_help.c:5905
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "მონაცემთა ბაზის როლის მფლობელობაში მყოფი ბაზის ობიექტების წაშლა"
 
-#: sql_help.c:5911
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "ცხრილიდან მწკრივის-დონის უსაფრთხოების წესის წაშლა"
 
-#: sql_help.c:5917
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "პროცედურის წაშლა"
 
-#: sql_help.c:5923
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "გამოცემის წაშლა"
 
-#: sql_help.c:5935
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "წესრიგის წაშლა"
 
-#: sql_help.c:5941
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "გადაწერის წესის წაშლა"
 
-#: sql_help.c:5947
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "სქემის წაშლა"
 
-#: sql_help.c:5953
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "მიმდევრობის წაშლა"
 
-#: sql_help.c:5959
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "გარე სერვერის დესკრიპტორის წაშლა"
 
-#: sql_help.c:5965
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "გაფართოებული სტატისტიკის წაშლა"
 
-#: sql_help.c:5971
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "გამოწერის წაშლა"
 
-#: sql_help.c:5977
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "ცხრილის წაშლა"
 
-#: sql_help.c:5983
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "ცხრილების სივრცის წაშლა"
 
-#: sql_help.c:5989
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "ტექსტის ძებნის კონფიგურაციის წაშლა"
 
-#: sql_help.c:5995
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "ტექსტის ძებნის ლექსიკონის წაშლა"
 
-#: sql_help.c:6001
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "ტექსტის ძებნის დამმუშავებლის წაშლა"
 
-#: sql_help.c:6007
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "ტექსტის ძებნის შაბლონის წაშლა"
 
-#: sql_help.c:6013
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "გარდაქმნის წაშლა"
 
-#: sql_help.c:6019
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "ტრიგერის წაშლა"
 
-#: sql_help.c:6025
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "მონაცემების ტიპის წაშლა"
 
-#: sql_help.c:6037
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "მომხმარებლის გარე სერვერისთვის მიბმის წაშლა"
 
-#: sql_help.c:6043
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "ხედის წაშლა"
 
-#: sql_help.c:6055
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "მზა ოპერატორის შესრულება"
 
-#: sql_help.c:6061
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "ოპერატორის შესრულების გეგმის ჩვენება"
 
-#: sql_help.c:6067
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "კურსორის გამოყენებით მოთხოვნიდან მწკრივების მიღება"
 
-#: sql_help.c:6073
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "წვდომის უფლებების აღწერა"
 
-#: sql_help.c:6079
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "ცხრილის აღწერების უცხო სერვერიდან შემოტანა"
 
-#: sql_help.c:6085
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "ცხრილში ახალი მწკრივების შექმნა"
 
-#: sql_help.c:6091
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "შეტყობინების მოლოდინი"
 
-#: sql_help.c:6097
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "გაზიარებული ბიბლიოთეკის ფაილის ჩატვირთვა"
 
-#: sql_help.c:6103
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "ცხრილის დაბლოკვა"
 
-#: sql_help.c:6109
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "ცხრილის მწკრივების ჩასმა, განახლება ან წაშლა პირობის მიხედვით"
 
-#: sql_help.c:6115
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "კურსორის მოთავსება"
 
-#: sql_help.c:6121
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "შეტყობინების გენერაცია"
 
-#: sql_help.c:6127
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "ოპერატორის გასაშვებად მომზადება"
 
-#: sql_help.c:6133
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "ტრანზაქციის მომზადება ორ ფაზაში გადასაცემად"
 
-#: sql_help.c:6139
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "ბაზის როლის მფლობელობაში მყოფი ბაზის ობიექტების მფლობელის შეცვლა"
 
-#: sql_help.c:6145
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "მატერიალიზებული ხედის შემცველობის ჩანაცვლება"
 
-#: sql_help.c:6151
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "ინდექსების თავიდან აგება"
 
-#: sql_help.c:6157
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "ადრე აღწერილი შენახვის წერტილის მოხსნა"
 
-#: sql_help.c:6163
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "გაშვების პარამეტრის მნიშვნელობის საწყის მნიშვნელობაზე აღდგენა"
 
-#: sql_help.c:6169
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "წვდომის უფლებების წაშლა"
 
-#: sql_help.c:6181
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "წინასწარ ორ ფაზაში გადასაცემად მომზადებული ტრანზაქციის გაუქმება"
 
-#: sql_help.c:6187
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "შენახვის წერტილზე დაბრუნება"
 
-#: sql_help.c:6193
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "ახალი შესანახი წერტილის აღწერა მიმდინარე ტრანზაქციაში"
 
-#: sql_help.c:6199
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "ობიექტზე გადატარებული უსაფრთხოების ჭდის აღწერა ან შეცვლა"
 
-#: sql_help.c:6205 sql_help.c:6259 sql_help.c:6295
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "მწკრივის მიღება ცხრილიდან ან ხედიდან"
 
-#: sql_help.c:6217
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "გაშვების პარამეტრის შეცვლა"
 
-#: sql_help.c:6223
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "მიმდინარე ტრანზაქციის შეზღუდვის შემოწმების დროის დაყენება"
 
-#: sql_help.c:6229
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "მიმდინარე სესიის მიმდინარე მომხმარებლის იდენტიფიკატორის დაყენება"
 
-#: sql_help.c:6235
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr "სესიის მომხმარებლის იდენტიფიკატორისა და მიმდინარე სესიის მიმდინარე მომხმარებლის იდენტიფიკატორის დაყენება"
 
-#: sql_help.c:6241
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "მიმდინარე ტრანზაქციის თვისებების დაყენება"
 
-#: sql_help.c:6247
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "გაშვების პარამეტრის მნიშვნელობის ჩვენება"
 
-#: sql_help.c:6265
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "ცხრილის ან ცხრილების სეტის დაცარიელება"
 
-#: sql_help.c:6271
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "გაფრთხილებების მოსმენის შეწყვეტა"
 
-#: sql_help.c:6277
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "ცხრილის მწკრივების განახლება"
 
-#: sql_help.c:6283
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "ნაგვის-მოგროვება და ბაზის არასავალდებულო ანალიზი"
 
-#: sql_help.c:6289
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "მწკრივების სეტის გამოთვლა"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 მხოლოდ არაინტერაქტიურ რეჟიმში შეიძლება იყოს გამოყენებული"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "ჟურნალის ფაილის გახსნის შეცდომა \"%s\": %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6558,27 +6879,27 @@ msgstr ""
 "დახმარებისთვის აკრიფეთ \"help\".\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "გამოტანის პარამეტრის დაყენების შეცდომა: \"%s\""
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "ბრძანების სტრიქონის დამატებითი არგუმენტი \"%s\" იგნორირებულია"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "საკუთარი პროგრამის გამშვები ფაილის პოვნა შეუძლებელია"
 
-#: tab-complete.c:6230
+#: tab-complete.in.c:6633
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6589,22 +6910,47 @@ msgstr ""
 "მოთხოვნის ტექსტი:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "მნიშვნელობა \"%s\" \"%s\"-სთვის მიუღებელია: ველოდებოდი ლოგიკურ მნიშვნელობას"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "არასწორი მნიშვნელობა \"%s\" \"%s\"-სთვის (უნდა იყოს მთელი რიცხვი)"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "არასწორი შეყვანის სინტაქსი ცვლადისთვის \"%s\""
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "არასწორი მნიშვნელობა \"%s\" ცვლადისთვის \"%s\"-სთვის: უნდა იყოს %.2f-ზე მეტი"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "არასწორი მნიშვნელობა \"%s\" ცვლადისთვის \"%s\"-სთვის: უნდა იყოს %.2f-ზე ნაკლები"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "მნიშვნელობა \"%s\" დიაპაზონს გარეთაა ცვლადისთვის \"%s\""
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "არასწორი მნიშვნელობა \"%s\" ცვლადისთვის \"%s\""
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "ცვლადის არასწორი სახელი: \"%s\""
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
@@ -6629,15 +6975,16 @@ msgstr ""
 #~ msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 #~ msgstr "  -p, --port=PORT          მონაცემთა ბაზის სერვერის პორტი (ნაგულისხმები: \"%s\")\n"
 
+#~ msgid ""
+#~ "  WATCH_INTERVAL\n"
+#~ "    if set to a number, overrides the default two second \\watch interval\n"
+#~ msgstr ""
+#~ "  WATCH_INTERVAL\n"
+#~ "    თუ დაყენებულია რიცხვზე, გადაფარავს ნაგულისხმევ ორწამიან ინტერვალს \\watch-სთვის\n"
+
 #~ msgid "  \\watch [[i=]SEC] [c=N] execute query every SEC seconds, up to N times\n"
 #~ msgstr "  \\watch [[i=]SEC] [c=N] მოთხოვნის ყოველ SEC წამში ერთხელ გაშვება, N-ჯერ\n"
 
-#~ msgid " (inherited)"
-#~ msgstr " (მემკვიდრეობით)"
-
-#~ msgid " (local, inherited)"
-#~ msgstr " (ლოკალური, მემკვიდრეობით)"
-
 #, c-format
 #~ msgid "Expanded header width is 'column'.\n"
 #~ msgstr "გაფართოებული თავსართის სიგანეა 'column'.\n"
@@ -6653,19 +7000,53 @@ msgstr ""
 #~ msgid "ICU Locale"
 #~ msgstr "ICU ენა"
 
-#~ msgid "Not-null constraints:"
-#~ msgstr "არანულოვანი შეზღუდვები:"
-
 #~ msgid "Source code"
 #~ msgstr "საწყისი კოდი"
 
+#, c-format
+#~ msgid "Unlogged materialized view \"%s.%s\""
+#~ msgstr "ჟურნალში არ-ჩაწერილი მატერიალიზებული ხედი \"%s.%s\""
+
 #~ msgid "User set"
 #~ msgstr "მომხმარებელი დაყენებულია"
 
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
+#~ msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" მისამართზე \"%s\" და პორტზე \"%s\".\n"
+
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
+#~ msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" (მისამართით \"%s\") და პორტზე \"%s\".\n"
+
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
+#~ msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" ჰოსტზე \"%s\" და პორტზე \"%s\".\n"
+
+#, c-format
+#~ msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
+#~ msgstr "ახლა მიერთებული ბრძანდებით ბაზასთან \"%s\" როგორც მომხმარებელი \"%s\" სოკეტით \"%s\" და პორტზე \"%s\".\n"
+
+#, c-format
+#~ msgid "\\gexec not allowed in pipeline mode"
+#~ msgstr "\\gexec კომუნიკაციის რეჟიმში დაშვებული არაა"
+
+#, c-format
+#~ msgid "\\gset not allowed in pipeline mode"
+#~ msgstr "\\gset კომუნიკაციის რეჟიმში დაშვებული არაა"
+
+#, c-format
+#~| msgid "%s not allowed in pipeline mode"
+#~ msgid "\\gx not allowed in pipeline mode"
+#~ msgstr "\\gx კომუნიკაციის რეჟიმში დაშვებული არაა"
+
 #, c-format
 #~ msgid "\\watch cannot be used with COPY"
 #~ msgstr "\\watch -ს COPY-სთან ერთად ვერ გამოყენებთ"
 
+#, c-format
+#~ msgid "\\watch not allowed in pipeline mode"
+#~ msgstr "\\watch კომუნიკაციის არხის რეჟიმში დაშვებული არაა"
+
 #~ msgid "constraint"
 #~ msgstr "შეზღუდვა"
 
@@ -6677,6 +7058,10 @@ msgstr ""
 #~ msgid "could not identify current directory: %m"
 #~ msgstr "მიმდინარე საქაღალდის იდენტიფიკაციის პრობლემა: %m"
 
+#, c-format
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "ლოკალური მომხმარებლის ID-ის (%d) ამოხსნა შეუძლებელია: %s"
+
 #, c-format
 #~ msgid "could not read symbolic link \"%s\": %m"
 #~ msgstr "სიმბოლური ბმის \"%s\" წაკითხვის შეცდომა: %m"
@@ -6684,9 +7069,19 @@ msgstr ""
 #~ msgid "local socket"
 #~ msgstr "ლოკალური სოკეტი"
 
+#, c-format
+#~ msgid "local user with ID %d does not exist"
+#~ msgstr "ლოკალური მომხმარებელი ID-ით %d არ არსებობს"
+
 #~ msgid "mode"
 #~ msgstr "mode"
 
+#~ msgid "partition_name1"
+#~ msgstr "დანაყოფის_სახელი1"
+
+#~ msgid "partition_name2"
+#~ msgstr "დანაყოფის_სახელი2"
+
 #~ msgid "text"
 #~ msgstr "ტექსტი"
 
diff --git a/src/bin/psql/po/ko.po b/src/bin/psql/po/ko.po
index 6afbc04dd1d..91b8b7f8404 100644
--- a/src/bin/psql/po/ko.po
+++ b/src/bin/psql/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: psql (PostgreSQL) 17\n"
+"Project-Id-Version: psql (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:48+0000\n"
-"PO-Revision-Date: 2025-01-16 17:32+0900\n"
+"POT-Creation-Date: 2025-09-11 21:48+0000\n"
+"PO-Revision-Date: 2025-09-10 13:39+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <kr@postgresql.org>\n"
 "Language: ko\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -55,28 +55,28 @@ msgstr "실행할 \"%s\" 파일 찾을 수 없음"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "\"%s\" 경로를 절대경로로 바꿀 수 없음: %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "\"%s\" 명령을 실행할 수 없음: %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "\"%s\" 명령으로부터 읽을 수 없음: %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "\"%s\" 명령에서 아무 데이터도 반환하지 않음"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() 실패: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1372 command.c:3458 command.c:3507 command.c:3632 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -98,7 +98,7 @@ msgstr "null 포인터를 복제할 수 없음(내부 오류)\n"
 msgid "could not look up effective user ID %ld: %s"
 msgstr "UID %ld 해당하는 사용자를 찾을 수 없음: %s"
 
-#: ../../common/username.c:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "사용자 없음"
 
@@ -159,9 +159,10 @@ msgstr "인트럽트발생\n"
 #: ../../fe_utils/print.c:3188
 #, c-format
 msgid ""
-"Cannot print table contents: number of cells %lld is equal to or exceeds "
-"maximum %lld.\n"
-msgstr "테이블 내용을 출력할 수 없음: %lld개 셀 수가 최대값인 %lld개 이상임\n"
+"Cannot print table contents: number of cells %<PRIu64> is equal to or "
+"exceeds maximum %zu.\n"
+msgstr ""
+"테이블 내용을 출력할 수 없음: %<PRIu64>개 셀 수가 최대값인 %zu개 이상임\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -170,312 +171,408 @@ msgstr "테이블 내용에 헤더를 추가할 수 없음: 열 수가 %d개를
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "테이블 내용에 셀을 추가할 수 없음: 총 셀 수가 %lld개를 초과했습니다.\n"
+msgid ""
+"Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr ""
+"테이블 내용에 셀을 추가할 수 없음: 총 셀 수가 %<PRIu64>개를 초과했습니다.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "잘못된 출력 형식 (내부 오류): %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "\"%s\" 변수의 재귀적 확장을 건너뛰는 중"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령의 인자에 줄바꿈 문자가 있음: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 있음: \"%s\"\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "UID %d 해당하는 로컬 사용자를 찾을 수 없음: %s"
-
-#: ../../port/user.c:48 ../../port/user.c:84
+#: command.c:254
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "ID %d 로컬 사용자 없음"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "백슬래시 명령은 제한되었음; \\unrestrict 명령만 허용함"
 
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "잘못된 명령: \\%s"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "도움말을 보려면 \\?를 입력하십시오."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: \"%s\" 추가 인자가 무시되었음"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr ""
 "\\%s 명령은 무시함; 현재 \\if 블록을 중지하려면, \\endif 명령이나 Ctrl-C 키"
 "를 사용하세요."
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s: 필요한 인자가 빠졌음"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "UID %ld 사용자의 홈 디렉터리를 찾을 수 없음: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: \"%s\" 디렉터리로 이동할 수 없음: %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "현재 데이터베이스에 연결되어있지 않습니다.\n"
 
-#: command.c:667
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on address \"%s\" at "
-"port \"%s\".\n"
-msgstr ""
-"접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 주소=\"%s\", 포트=\"%s\".\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "연결 정보"
 
-#: command.c:670
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
-"port \"%s\".\n"
-msgstr ""
-"접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 소켓=\"%s\", 포트=\"%s\".\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "매개변수"
 
-#: command.c:676
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address "
-"\"%s\") at port \"%s\".\n"
-msgstr ""
-"접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\" (주소=\"%s\"), 포"
-"트=\"%s\".\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "값"
 
-#: command.c:679
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
-"\"%s\".\n"
-msgstr ""
-"접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\", 포트=\"%s\".\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "데이터베이스"
+
+#: command.c:848
+msgid "Client User"
+msgstr "클라이언트 유저"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "호스트 주소"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "소켓 디렉터리"
+
+#: command.c:868
+msgid "Host"
+msgstr "호스트"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "서버 포트"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "옵션"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "프로토콜 버전"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "비밀번호 사용됨"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "false"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "true"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "GSSAPI 인증됨"
 
-#: command.c:1069 command.c:1170 command.c:2675
+#: command.c:898
+msgid "Backend PID"
+msgstr "백엔드 PID"
+
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL 연결"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSL 라이브러리"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "알수없음"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSL 프로토콜"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "SSL 키 비트"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL 암호 알고리즘"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL 압축"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "none"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "쿼리 버퍼가 없음"
 
-#: command.c:1102 command.c:5776
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "잘못된 줄 번호: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "변경 내용 없음"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: 잘못된 인코딩 이름 또는 문자셋 변환 프로시저 없음"
 
-#: command.c:1368 command.c:2157 command.c:3454 command.c:3652 command.c:5882
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1375
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "이전 오류가 없습니다."
 
-#: command.c:1488
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "파이프라인 모드에서는 %s 허용 안함"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: 오른쪽 괄호 빠졌음"
 
-#: command.c:1572 command.c:1691 command.c:1995 command.c:2009 command.c:2028
-#: command.c:2196 command.c:2437 command.c:2642 command.c:2682
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s: 필요한 인자가 빠졌음"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: 요청된 결과의 수가 이상함"
 
-#: command.c:1822
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: \\else 구문 뒤에 올 수 없음"
 
-#: command.c:1827
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: \\if 명령과 짝이 안맞음"
 
-#: command.c:1891
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: \\else 명령 뒤에 올 수 없음"
 
-#: command.c:1896
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: \\if 명령과 짝이 안맞음"
 
-#: command.c:1936
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: \\if 명령과 짝이 안맞음"
 
-#: command.c:2092
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "쿼리 버퍼가 비었음."
 
-#: command.c:2135
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "\"%s\" 사용자의 새 암호: "
 
-#: command.c:2139
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "다시 입력해 주세요:"
 
-#: command.c:2148
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "암호가 서로 틀립니다."
 
-#: command.c:2231
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: 변수 값을 읽을 수 없음"
 
-#: command.c:2333
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "쿼리 버퍼 초기화 (비웠음)."
 
-#: command.c:2355
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "명령내역(history)을 \"%s\" 파일에 기록했습니다.\n"
 
-#: command.c:2442
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline 명령은 \\bind 또는 \\bind_named 뒤에 사용되어야 함"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline 명령은 파이브라인 모드 밖에서는 허용 안함"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: OS 환경 변수 이름에는 \"=\" 문자가 없어야 함"
 
-#: command.c:2490
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "함수 이름이 필요함"
 
-#: command.c:2492
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "뷰 이름이 필요함"
 
-#: command.c:2614
+#: command.c:3176
 msgid "Timing is on."
 msgstr "작업수행시간 보임"
 
-#: command.c:2616
+#: command.c:3178
 msgid "Timing is off."
 msgstr "작업수행시간 숨김"
 
-#: command.c:2702 command.c:2740 command.c:4163 command.c:4166 command.c:4169
-#: command.c:4175 command.c:4177 command.c:4203 command.c:4213 command.c:4225
-#: command.c:4239 command.c:4266 command.c:4324 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: 현재 엄격 모드가 아님"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: 잘못된 키"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2729 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2801 command.c:2867
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: 반복 간격 값은 하나만 지정해야 합니다"
 
-#: command.c:2811 command.c:2877
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: 잘못된 반복 간격 값 \"%s\""
 
-#: command.c:2821
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: 최대 반복 회수는 하나만 지정해야 합니다"
 
-#: command.c:2831
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: 잘못된 최대 반복 회수 \"%s\""
 
-#: command.c:2841
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: 최소 row 수 지정을 중복 지정했음"
 
-#: command.c:2851
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: 최소 row 수 값 잘못됨 \"%s\""
 
-#: command.c:2858
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: 알수 없는 매개 변수 \"%s\""
 
-#: command.c:3255 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "암호: "
 
-#: command.c:3260 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "%s 사용자의 암호: "
 
-#: command.c:3316
+#: command.c:3936
 #, c-format
 msgid ""
 "Do not give user, host, or port separately when using a connection string"
 msgstr ""
 "연결 문자열을 사용할 때는 user, host, port 를 따로 따로 지정하지 마세요."
 
-#: command.c:3351
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "재접속할 데이터베이스 연결 정보가 없음"
 
-#: command.c:3658
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "이전 연결이 유지되었음"
 
-#: command.c:3664
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\연결: %s"
 
-#: command.c:3720
+#: command.c:4340
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at "
@@ -483,7 +580,7 @@ msgid ""
 msgstr ""
 "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 주소=\"%s\", 포트=\"%s\".\n"
 
-#: command.c:3723
+#: command.c:4343
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -491,16 +588,16 @@ msgid ""
 msgstr ""
 "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 소켓=\"%s\", 포트=\"%s\".\n"
 
-#: command.c:3729
+#: command.c:4349
 #, c-format
 msgid ""
-"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" "
-"(address \"%s\") at port \"%s\".\n"
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s"
+"\" (address \"%s\") at port \"%s\".\n"
 msgstr ""
 "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\" (주소 \"%s\"), 포"
 "트=\"%s\".\n"
 
-#: command.c:3732
+#: command.c:4352
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -508,17 +605,17 @@ msgid ""
 msgstr ""
 "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\", 포트=\"%s\".\n"
 
-#: command.c:3737
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\".\n"
 
-#: command.c:3843
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s(%s, %s 서버)\n"
 
-#: command.c:3856
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -527,33 +624,25 @@ msgstr ""
 "경고: %s 메이저 버전 %s, 서버 메이저 버전 %s.\n"
 "         일부 psql 기능이 작동하지 않을 수도 있습니다.\n"
 
-#: command.c:3895
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL 연결정보 (프로토콜: %s, 암호화기법: %s, 압축: %s, ALPN: %s)\n"
 
-#: command.c:3896 command.c:3897
-msgid "unknown"
-msgstr "알수없음"
-
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "off"
 
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "on"
 
-#: command.c:3899
-msgid "none"
-msgstr "none"
-
-#: command.c:3913
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "암호화된 GSSAPI 연결\n"
 
-#: command.c:3933
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -565,7 +654,7 @@ msgstr ""
 "참조\n"
 "         페이지 \"Notes for Windows users\"를 참조하십시오.\n"
 
-#: command.c:4038
+#: command.c:4667
 #, c-format
 msgid ""
 "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -574,32 +663,32 @@ msgstr ""
 "지정한 줄번호를 사용하기 위해서는 PSQL_EDITOR_LINENUMBER_ARG 이름의 OS 환경변"
 "수가 설정되어 있어야 합니다."
 
-#: command.c:4068
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "\"%s\" 문서 편집기를 실행시킬 수 없음"
 
-#: command.c:4070
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "/bin/sh 명령을 실행할 수 없음"
 
-#: command.c:4120
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "임시 디렉터리 경로를 알 수 없음: %s"
 
-#: command.c:4147
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "\"%s\" 임시 파일을 열 수 없음: %m"
 
-#: command.c:4483
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: \"%s\" 생략형이 \"%s\" 또는 \"%s\" 값 모두 선택가능해서 모호함"
 
-#: command.c:4503
+#: command.c:5132
 #, c-format
 msgid ""
 "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-"
@@ -608,27 +697,27 @@ msgstr ""
 "\\pset: 허용되는 출력 형식: aligned, asciidoc, csv, html, latex, latex-"
 "longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4522
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: 사용할 수 있는 선 모양은 ascii, old-ascii, unicode"
 
-#: command.c:4537
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: 사용할 수 있는 유니코드 테두리 모양은 single, double"
 
-#: command.c:4552
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: 사용할 수 있는 유니코드 칼럼 선 모양은 single, double"
 
-#: command.c:4567
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: 사용할 수 있는 유니코드 헤더 선 모양은 single, double"
 
-#: command.c:4619
+#: command.c:5248
 #, c-format
 msgid ""
 "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", "
@@ -637,12 +726,12 @@ msgstr ""
 "\\pset: xheader_width 값은 \"%s\" (기본값), \"%s\", \"%s\", 또는 정확한 너비 "
 "숫자 입니다."
 
-#: command.c:4636
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep 문자는 1바이트의 단일 문자여야 함"
 
-#: command.c:4641
+#: command.c:5270
 #, c-format
 msgid ""
 "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage "
@@ -650,213 +739,213 @@ msgid ""
 msgstr ""
 "\\pset: csv_fieldsep 문자로 따옴표, 줄바꿈(\\n, \\r) 문자는 사용할 수 없음"
 
-#: command.c:4779 command.c:4980
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: 알 수 없는 옵션: %s"
 
-#: command.c:4799
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "html 테이블의 테두리를 %d로 지정했습니다.\n"
 
-#: command.c:4805
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "대상 너비 미지정.\n"
 
-#: command.c:4807
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "대상 너비는 %d입니다.\n"
 
-#: command.c:4814
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "칼럼 단위 보기 기능 켬.\n"
 
-#: command.c:4816
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "칼럼 단위 보기 기능을 자동으로 지정 함.\n"
 
-#: command.c:4818
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "칼럼 단위 보기 기능 끔.\n"
 
-#: command.c:4825 command.c:4827 command.c:4829
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "확장된 헤더 너비 = \"%s\".\n"
 
-#: command.c:4831
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "확장된 헤더 너비는 %d입니다.\n"
 
-#: command.c:4837
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "CSV용 필드 구분자: \"%s\".\n"
 
-#: command.c:4845 command.c:4853
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "필드 구분자가 0 바이트입니다.\n"
 
-#: command.c:4847
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "필드 구분자 \"%s\".\n"
 
-#: command.c:4860
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "기본 꼬릿말 보기 기능 켬.\n"
 
-#: command.c:4862
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "기본 꼬릿말 보기 기능 끔.\n"
 
-#: command.c:4868
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "현재 출력 형식: %s.\n"
 
-#: command.c:4874
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "선 모양: %s.\n"
 
-#: command.c:4881
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null 값은 \"%s\" 문자로 보여짐.\n"
 
-#: command.c:4889
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "로케일 맞춤 숫자 표기 기능 켬.\n"
 
-#: command.c:4891
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "로케일 맞춤 숫자 표기 기능 끔.\n"
 
-#: command.c:4898
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "긴 출력을 위해 페이저가 사용됨.\n"
 
-#: command.c:4900
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "항상 페이저가 사용됨.\n"
 
-#: command.c:4902
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "화면단위 보기 기능 끔(전체 자료 모두 보여줌).\n"
 
-#: command.c:4908
+#: command.c:5537
 #, 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] "%d 줄보다 적은 경우는 페이지 단위 보기가 사용되지 않음\n"
 
-#: command.c:4918 command.c:4928
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "레코드 구분자가 0 바이트임.\n"
 
-#: command.c:4920
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "레코드 구분자는 줄바꿈 문자입니다.\n"
 
-#: command.c:4922
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "레코드 구분자 \"%s\".\n"
 
-#: command.c:4935
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "테이블 속성: \"%s\".\n"
 
-#: command.c:4938
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "테이블 속성 모두 지움.\n"
 
-#: command.c:4945
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "출력 테이블의 제목: \"%s\"\n"
 
-#: command.c:4947
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "출력 테이블의 제목을 지정하지 않았습니다.\n"
 
-#: command.c:4954
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "자료만 보기 기능 켬.\n"
 
-#: command.c:4956
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "자료만 보기 기능 끔.\n"
 
-#: command.c:4962
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "유니코드 테두리 선문자: \"%s\".\n"
 
-#: command.c:4968
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "유니코드 칼럼 선문자: \"%s\".\n"
 
-#: command.c:4974
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "유니코드 헤더 선문자: \"%s\".\n"
 
-#: command.c:5223
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: 실패"
 
-#: command.c:5261
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch 명령으로 수행할 쿼리가 없습니다."
 
-#: command.c:5293
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "타이머 설정 실패: %m"
 
-#: command.c:5362
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (%g초 간격)\n"
 
-#: command.c:5365
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (%g초 간격)\n"
 
-#: command.c:5429
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "신호를 기다릴 수 없었음: %m"
 
-#: command.c:5485 command.c:5492 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -869,111 +958,111 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: command.c:5671
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\" 뷰(view)가 아님"
 
-#: command.c:5687
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "reloptions 배열을 분석할 수 없음"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "현재 접속한 연결 없이는 특수문자처리를 할 수 없음"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "쉘 명령의 인자에 줄바꿈 문자가 있음: \"%s\""
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "서버 접속 끊김"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "서버로부터 연결이 끊어졌습니다. 다시 연결을 시도합니다: "
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "실패.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "성공.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "PQresultStatus 반환값이 잘못됨: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "작업시간: %.3f ms\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "작업시간: %.3f ms (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "작업시간: %.3f ms (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "작업시간: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "현재 데이터베이스에 연결되어있지 않습니다."
 
-#: common.c:714
+#: common.c:749
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" with payload \"%s\" received from server "
 "process with PID %d.\n"
 msgstr "\"%s\" 비동기 통지를 받음, 부가정보: \"%s\", 보낸 프로세스: %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "동기화 신호 \"%s\" 받음, 해당 서버 프로세스 PID %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "결과 테이블을 출력할 수 없음: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "\\gset 해당 자료 없음"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "\\gset 실행 결과가 단일 자료가 아님"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr ""
 "\\gset 작업으로 특수하게 처리되는 변수인 \"%s\" 변수값을 바꿀 수 있어 무시함"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify "
@@ -986,37 +1075,52 @@ msgstr ""
 "%s\n"
 "***(Enter: 계속 진행, x Enter: 중지)********************\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "명령구문:  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "알 수 없는 트랜잭션 상태 (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "필드명"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "형태"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "해당 명령 결과가 없거나, 그 결과에는 칼럼이 없습니다.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "가져올 지연된 결과가 없음"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "청크된 모드에서 결과값 추출 실패"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "파이프라인 중지, 명령이 실행되지 않았음"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "파이프라인 안에서는 COPY 명령을 지원하지 않음, 연결 중지함"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1070,11 +1174,11 @@ msgstr ""
 "자료입력이 끝나면 backslash 점 (\\.) 마지막 줄 처음에 입력하는 EOF 시그널을 "
 "보내세요."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "읽기 실패로 중지됨"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "복사 모드를 종료하는 중"
 
@@ -1131,1162 +1235,1252 @@ msgstr "\\crosstabview: 칼럼 이름이 모호함: \"%s\""
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: 칼럼 이름 없음: \"%s\""
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "스키마"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "이름"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "반환 자료형"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "인자 자료형"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "설명"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "통계 함수 목록"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "서버(%s 버전)에서 접근 방법을 지원하지 않습니다."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "인덱스"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "테이블"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "핸들러"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "접근 방법 목록"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "소유주"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "위치"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "옵션"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "크기"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "테이블스페이스 목록"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df 명령은 [anptwS+]만 추가로 사용함"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df 명령은 [%s]만 추가로 사용함"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df 명령은 \"%c\" 옵션을 %s 버전 서버에서는 사용할 수 없음"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "집계"
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "창"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "proc"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "함수"
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "트리거"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "immutable"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "stable"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "휘발성"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "엄격함"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "safe"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "unsafe"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "병렬처리"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "definer"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "invoker"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "보안"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "예"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "아니오"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Leakproof?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "언어"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "내부 이름"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "함수 목록"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "요소"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "자료형 목록"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "왼쪽 인수 자료형"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "오른쪽 인수 자료형"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "반환 자료형"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "함수"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "연산자 목록"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "인코딩"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "로케일 제공자"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Collate"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "로케일"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "ICU 룰"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "테이블스페이스"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "데이터베이스 목록"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "테이블"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "뷰(view)"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "구체화된 뷰"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "시퀀스"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "외부 테이블"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "파티션 테이블"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "칼럼 접근권한"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "정책"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "액세스 권한"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "함수"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "type"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "스키마"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "대형 개체"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "기본 접근권한"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "개체"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "테이블 제약 조건"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "도메인 제약조건"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "연산자 클래스"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "연산자 부류"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "룰(rule)"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "개체 설명"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "\"%s\" 이름을 릴레이션(relation) 없음."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "관련 릴레이션 찾을 수 없음."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "%s oid의 어떤 릴레이션(relation)도 찾을 수 없음."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "시작"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "최소값"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "최대값"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "증가값"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "예"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "아니오"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "순환?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "캐쉬"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "소유주: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "식별 칼럼용 시퀀스: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "\"%s.%s\" 로그 미사용 시퀀스"
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "\"%s.%s\" 시퀀스"
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "로그 미사용 테이블 \"%s.%s\""
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "\"%s.%s\" 테이블"
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "\"%s.%s\" 뷰(view)"
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "트랜잭션 로그를 남기지 않은 구체화된 뷰 \"%s.%s\""
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Materialized 뷰 \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "\"%s.%s\" 로그 미사용 인덱스"
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "\"%s.%s\" 인덱스"
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "\"%s.%s\" 로그 미사용 파티션 인덱스"
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "\"%s.%s\" 파티션 인덱스"
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "\"%s.%s\" TOAST 테이블"
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "\"%s.%s\" 복합자료형"
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "\"%s.%s\" 외부 테이블"
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "로그 미사용 파티션 테이블 \"%s.%s\""
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "\"%s.%s\" 파티션 테이블"
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "정렬규칙"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "NULL허용"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "초기값"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "Key?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "정의"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "FDW 옵션"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "스토리지"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "압축"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "통계수집량"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "소속 파티션: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "파티션 제약 조건 없음"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "파티션 제약조건: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "파티션 키: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "소속 테이블: \"%s.%s\""
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "기본키, "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "고유"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls not distinct"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "적용테이블: \"%s.%s\""
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicate (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", 클러스됨"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", 잘못됨"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", 지연가능"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", 트랜잭션단위지연"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", 복제 식별자"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "인덱스들:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "체크 제약 조건:"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "참조키 제약 조건:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "다음에서 참조됨:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "정책:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "정책 (로우단위 보안정책 강제 활성화):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "정책 (로우단위 보안정책 활성화): (없음)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "정책 (로우단위 보안정책 강제 활성화): (없음)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "정책 (로우단위 보안정책 비활성화):"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "통계정보 객체:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "룰(rule)들:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "사용중지된 규칙:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "항상 발생하는 규칙:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "복제본에서만 발생하는 규칙:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "발행자:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Not-Null 제약 조건"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (로컬, 상속됨)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (상속됨)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "뷰 정의:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "트리거들:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "사용중지된 사용자 트리거:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "사용중지된 내부 트리거:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "항상 발생하는 트리거:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "복제본에서만 발생하는 트리거:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "서버: %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "FDW 옵션들: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "상속"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "파티션 테이블 수: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "파티션 테이블 수: %d (\\d+ 명령으로 볼 수 있음)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "하위 테이블 수: %d (\\d+ 명령으로 볼 수 있음)"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "하위 테이블"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "파티션들"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "자료형의 typed 테이블: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "복제 식별자"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "OID 사용: yes"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "접근 방법: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", \"%s\" 테이블스페이스"
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "롤 목록"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "롤 이름"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "속성"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "슈퍼유저"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "상속 없음"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "롤 만들기"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "DB 만들기"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "로그인할 수 없음"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "복제"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "RLS 통과"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "연결 없음"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d개 연결"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "비밀번호 만료기한: "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "롤"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "데이터베이스"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "설정"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "\"%s\" 롤과 \"%s\" 데이터베이스에 대한 특정 설정이 없습니다."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "\"%s\" 롤용 특정 설정이 없음."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "추가 설정 없음."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "설정 목록"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "소속 그룹"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "부여자"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "롤 부여 목록"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "인덱스"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST 테이블"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "파티션_인덱스"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "영구"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "임시"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "로깅안함"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "지속성"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "접근 방법"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "\"%s\" 이름의 릴레이션을 찾을 수 없습니다."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "\"%s\" 이름의 테이블을 찾을 수 없습니다."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "\"%s\" 이름의 인덱스를 찾을 수 없습니다."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "\"%s\" 이름의 뷰를 찾을 수 없습니다."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "\"%s\" 이름의 구체화된 뷰를 찾을 수 없습니다."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "\"%s\" 이름의 시퀀스를 찾을 수 없습니다."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "\"%s\" 이름의 외부 테이블을 찾을 수 없습니다."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "어떤 테이블도 없습니다."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "어떤 인덱스도 없습니다."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "어떤 뷰도 없습니다."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "어떤 구체화된 뷰도 없습니다."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "어떤 시퀀스도 없습니다."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "어떤 외부 테이블도 없습니다."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "릴레이션 목록"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "테이블 목록"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "인덱스 목록"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "뷰 목록"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "구체화된 뷰 목록"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "시퀀스 목록"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "외부 테이블 목록"
+
+#: describe.c:4282
 #, c-format
 msgid ""
 "The server (version %s) does not support declarative table partitioning."
 msgstr "이 서버(%s 버전)는 파티션 테이블 기능을 지원하지 않습니다."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "파티션 인덱스 목록"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "파티션 테이블 목록"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "파티션 릴레이션(relation) 목록"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "상위 이름"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "하위 파티션 크기"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "전체 크기"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "신뢰됨"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "내부 언어"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "호출 핸들러"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "유효성 검사기"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "인라인 핸들러"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "언어 목록"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "체크"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "도메인(domain) 목록"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "소스"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "설명"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "초기값?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "문자코드변환규칙(conversion) 목록"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "매개변수"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "값"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "컨텍스트"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "환경설정 매개변수 목록"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "기본값이 아닌 값으로 지정된 환경설정 매개변수 목록"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "이 서버(%s 버전)는 이벤트 트리거를 지원하지 않습니다."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "이벤트"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "활성화"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "replica"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "항상"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "비활성화"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "활성화"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "태그"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "이벤트 트리거 목록"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "이 서버(%s 버전)에서 확장 통계정보를 지원하지 않습니다."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Dependencies"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "확장 통계정보 목록"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Source 자료형"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Target 자료형"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "in assignment"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Implicit?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "형변환자 목록"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "제공자"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Deterministic?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "문자 정렬 목록"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "스키마 목록"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "텍스트 검색 파서 목록"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "\"%s\"(이)라는 전문 검색 분석기를 찾지 못했습니다."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "특정 전문 검색 분석기를 찾지 못했습니다."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "구문 분석 시작"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "방법"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "다음 토큰 가져오기"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "구문 분석 종료"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "헤드라인 가져오기"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "토큰 형식 가져오기"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "\"%s.%s\" 텍스트 검색 파서"
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "\"%s\" 텍스트 검색 파서"
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "토큰 이름"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "\"%s.%s\" 파서의 토큰 형식"
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "\"%s\" 파서의 토큰 형식"
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "템플릿"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "초기화 옵션"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "텍스트 검색 사전 목록"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "초기화"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "텍스트 검색 템플릿 목록"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "텍스트 검색 구성 목록"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "\"%s\"(이)라는 텍스트 검색 구성을 찾지 못했습니다."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "특정 텍스트 검색 구성을 찾지 못했습니다."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "토큰"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "사전"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "텍스트 검색 구성 \"%s.%s\""
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "텍스트 검색 구성 \"%s\""
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2295,7 +2489,7 @@ msgstr ""
 "\n"
 "파서: \"%s.%s\""
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2304,273 +2498,277 @@ msgstr ""
 "\n"
 "파서: \"%s\""
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "외부 데이터 래퍼 목록"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "외부 데이터 래퍼"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "버전"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "외부 서버 목록"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "서버"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "사용자 이름"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "사용자 매핑 목록"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "외부 테이블 목록"
+#: describe.c:6196
+msgid "Default version"
+msgstr "기본 버전"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "설치된 확장기능 목록"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "\"%s\" 이름의 확장 기능 모듈을 찾을 수 없습니다."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "추가할 확장 기능 모듈이 없음."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "개체 설명"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "\"%s\" 확장 기능 안에 포함된 객체들"
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "적당하지 않은 qualified 이름 입니다 (너무 많은 점이 있네요): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "서로 다른 데이터베이스간의 참조는 구현되어있지 않습니다: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "이 서버(%s 버전)는 논리 복제 발행 기능을 지원하지 않습니다."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "모든 테이블"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Inserts"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Updates"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Deletes"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Truncates"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "계산된 칼럼"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Via root"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "발행 목록"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "\"%s\" 이름의 발행 없음."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "발행 없음."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "%s 발행"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "테이블들:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "다음 스키마의 모든 테이블:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "이 서버(%s 버전)는 구독 기능을 지원하지 않습니다."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "발행"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "바이너리"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "스트리밍"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "2단계 커밋"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "오류가 생기면 비활성"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "오리진"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "비밀번호 필요함"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "소유주 권한으로 실행?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "Failover"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "동기식 커밋"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "연결정보"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "LSN 건너뜀"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "구독 목록"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(none)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "입력 자료형"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "스토리지 유형"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "연산자 클래스"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "연산자 부류"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "연산자 클래스 목록"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Applicable types"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "연산자 부류 목록"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "연산자"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "전략번호"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "ordering"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "search"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Purpose"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "정렬 연산자 부류"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "연산자 부류 소속 연산자 목록"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "등록된 왼쪽 자료형"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "등록된 오른쪽 자료형"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "번호"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "연산자 부류 소속 지원 함수 목록"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "대형 객체들"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2578,11 +2776,11 @@ msgstr ""
 "psql은 PostgreSQL 대화식 터미널입니다.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:502
+#: help.c:61 help.c:389 help.c:476 help.c:522
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2590,31 +2788,31 @@ msgstr ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "일반 옵션:\n"
 
-#: help.c:68
+#: help.c:65
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
 "exit\n"
 msgstr ""
 "  -c, --command=COMMAND    하나의 명령(SQL 또는 내부 명령)만 실행하고 끝냄\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=DBNAME      연결할 데이터베이스 이름\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=FILENAME      파일 안에 지정한 명령을 실행하고 끝냄\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr ""
 "  -l, --list               사용 가능한 데이터베이스 목록을 표시하고 끝냄\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2624,15 +2822,15 @@ msgstr ""
 "                           psql 변수 NAME을 VALUE로 설정\n"
 "                           (예, -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            버전 정보를 보여주고 마침\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          시작 파일(~/.psqlrc)을 읽지 않음\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-"
@@ -2641,21 +2839,21 @@ msgstr ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           명령 파일을 하나의 트랜잭션으로 실행\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=options]     이 도움말을 표시하고 종료\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr ""
 "      --help=commands      psql 내장명령어(\\문자로 시작하는)를 표시하고 종"
 "료\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variables     특별 변수들 보여주고, 종료\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2663,53 +2861,53 @@ msgstr ""
 "\n"
 "입출력 옵션:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           스크립트의 모든 입력 표시\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        실패한 명령들 출력\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       서버로 보낸 명령 표시\n"
 
-#: help.c:87
+#: help.c:84
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        내부 명령이 생성하는 쿼리 표시\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FILENAME  세션 로그를 파일로 보냄\n"
 
-#: help.c:89
+#: help.c:86
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline        확장된 명령행 편집 기능을 사용중지함(readline)\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=FILENAME    쿼리 결과를 파일(또는 |파이프)로 보냄\n"
 
-#: help.c:91
+#: help.c:88
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet              자동 실행(메시지 없이 쿼리 결과만 표시)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        단독 순차 모드(각 쿼리 확인)\n"
 
-#: help.c:93
+#: help.c:90
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
 "command)\n"
 msgstr "  -S, --single-line        한 줄 모드(줄 끝에서 SQL 명령이 종료됨)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2717,16 +2915,16 @@ msgstr ""
 "\n"
 "출력 형식 옵션:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           정렬되지 않은 표 형태의 출력 모드\n"
 
-#: help.c:97
+#: help.c:94
 msgid ""
 "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr "      --csv                CSV (쉼표-분리 자료) 테이블 출력 모드\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -2734,21 +2932,21 @@ msgid ""
 "\"%s\")\n"
 msgstr ""
 "  -F, --field-separator=STRING\n"
-"                           unaligned 출력용 필드 구분자 설정(기본 값: "
-"\"%s\")\n"
+"                           unaligned 출력용 필드 구분자 설정(기본 값: \"%s"
+"\")\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML 표 형태 출력 모드\n"
 
-#: help.c:102
+#: help.c:99
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
 "command)\n"
 msgstr ""
 "  -P, --pset=VAR[=ARG]     인쇄 옵션 VAR을 ARG로 설정(\\pset 명령 참조)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: "
@@ -2758,22 +2956,22 @@ msgstr ""
 "                           unaligned 출력용 레코드 구분자 설정\n"
 "                           (기본 값: 줄바꿈 문자)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        행만 인쇄\n"
 
-#: help.c:106
+#: help.c:103
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
 "border)\n"
 msgstr ""
 "  -T, --table-attr=TEXT    HTML table 태그 속성 설정(예: width, border)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           확장된 표 형태로 출력\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero "
@@ -2782,7 +2980,7 @@ msgstr ""
 "  -z, --field-separator-zero\n"
 "                           unaligned 출력용 필드 구분자를 0 바이트로 지정\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero "
@@ -2791,7 +2989,7 @@ msgstr ""
 "  -0, --record-separator-zero\n"
 "                           unaligned 출력용 레코드 구분자를 0 바이트로 지정\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2799,34 +2997,34 @@ msgstr ""
 "\n"
 "연결 옵션들:\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME      데이터베이스 서버 호스트 또는 소켓 디렉터리\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=PORT          데이터베이스 서버 포트\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=USERNAME  데이터베이스 사용자 이름\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        암호 프롬프트 표시 안 함\n"
 
-#: help.c:118
+#: help.c:115
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
 msgstr "  -W, --password           암호 입력 프롬프트 보임(자동으로 처리함)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
-"For more information, type \"\\?\" (for internal commands) or \"\\help\" "
-"(for SQL\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help"
+"\" (for SQL\n"
 "commands) from within psql, or consult the psql section in the PostgreSQL\n"
 "documentation.\n"
 "\n"
@@ -2837,43 +3035,39 @@ msgstr ""
 "설명서에서 psql 섹션을 참조하십시오.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "문제점 보고 주소: <%s>\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "일반\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       쿼리 매개 변수 지정\n"
-
-#: help.c:168
+#: help.c:164
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             PostgreSQL 사용법 및 저작권 정보 표시\n"
 
-#: help.c:169
+#: help.c:165
 msgid ""
 "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr ""
 "  \\crosstabview [칼럼들] 쿼리를 실행하고, 피봇 테이블 형태로 자료를 보여줌\n"
 
-#: help.c:170
+#: help.c:166
 msgid ""
 "  \\errverbose            show most recent error message at maximum "
 "verbosity\n"
 msgstr ""
 "  \\errverbose            최대 자세히 보기 상태에서 최근 오류를 다 보여줌\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2881,32 +3075,48 @@ msgstr ""
 "  \\g [(OPTIONS)] [FILE]  쿼리 실행 (결과는 지정한 파일로, 또는 |파이프로);\n"
 "                         \\g 명령에서 인자가 없으면 세미콜론과 같음\n"
 
-#: help.c:173
+#: help.c:169
 msgid ""
 "  \\gdesc                 describe result of query, without executing it\n"
 msgstr ""
 "  \\gdesc                 쿼리를 실행하지 않고 그 결과 칼럼과 자료형을 출력\n"
 
-#: help.c:174
+#: help.c:170
 msgid ""
 "  \\gexec                 execute query, then execute each value in its "
 "result\n"
 msgstr "  \\gexec                 쿼리를 실행하고, 그 결과를 각각 실행 함\n"
 
-#: help.c:175
+#: help.c:171
 msgid ""
 "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [PREFIX]         쿼리 실행 뒤 그 결과를 psql 변수로 저장\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr ""
 "  \\gx [(OPTIONS)] [FILE] \\g 명령과 같으나, 출력을 확장 모드로 강제함\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     psql 종료\n"
 
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict RESTRICT_KEY\n"
+"                         지정한 키로 엄격 모드로 진입\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         지정한 키가 맞다면 엄격 모드 해제\n"
+
 #: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
@@ -2917,8 +3127,8 @@ msgstr ""
 "                         SEC 초 마다 쿼리 반복, N 회만 실행,\n"
 "                         MIN 로우 보다 적게 출력하면 중지\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -3055,239 +3265,247 @@ msgid "Informational\n"
 msgstr "정보보기\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (옵션: S = 시스템 개체 표시, + = 추가 상세 정보)\n"
+msgid ""
+"  (options: S = show system objects, x = expanded mode, + = additional "
+"detail)\n"
+msgstr "  (옵션: S = 시스템 개체 표시, x = 확장 모드, + = 추가 상세 정보)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]                 테이블, 뷰 및 시퀀스 목록\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]                테이블, 뷰 및 시퀀스 목록\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]  NAME           테이블, 뷰, 시퀀스 또는 인덱스 설명\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
+msgstr "  \\d[S+]   NAME          테이블, 뷰, 시퀀스 또는 인덱스 설명\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [PATTERN]      집계 함수 목록\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [PATTERN]     집계 함수 목록\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [PATTERN]      접근 방법 목록\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [PATTERN]     접근 방법 목록\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  연산자 클래스 목록\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  연산자 클래스 목록\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  연산자 부류 목록\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  연산자 부류 목록\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   연산자 부류 소속 연산자 목록\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]   연산자 부류 소속 연산자 목록\n"
 
 #: help.c:229
 msgid ""
-"  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   연산자 가족에 포함된 지원 함수 목록\n"
+"  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator "
+"families\n"
+msgstr ""
+"  \\dAp[x+] [AMPTRN [OPFPTRN]]    연산자 가족에 포함된 지원 함수 목록\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [PATTERN]      테이블스페이스 목록\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [PATTERN]     테이블스페이스 목록\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [PATTERN]      문자셋 변환자 목록\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [PATTERN]     문자셋 변환자 목록\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [PATTERN]  환경설정 매개변수 목록\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [PATTERN] 환경설정 매개변수 목록\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [PATTERN]      자료형 변환자 목록\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [PATTERN]     자료형 변환자 목록\n"
 
 #: help.c:234
 msgid ""
-"  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
+"  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
 msgstr ""
-"  \\dd[S]  [PATTERN]      다른 곳에서는 볼 수 없는 객체 설명을 보여줌\n"
+"  \\dd[Sx]  [PATTERN]     다른 곳에서는 볼 수 없는 객체 설명을 보여줌\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [PATTERN]      도메인 목록\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [PATTERN]     도메인 목록\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp    [PATTERN]      기본 접근권한 목록\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]  [PATTERN]     기본 접근권한 목록\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [PATTERN]      외부 테이블 목록\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [PATTERN]     외부 테이블 목록\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [PATTERN]      외부 서버 목록\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [PATTERN]     외부 서버 목록\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [PATTERN]      외부 테이블 목록\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [PATTERN]     외부 테이블 목록\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [PATTERN]      사용자 매핑 목록\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [PATTERN]     사용자 매핑 목록\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [PATTERN]      외부 데이터 래퍼 목록\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [PATTERN]     외부 데이터 래퍼 목록\n"
 
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] "
 "functions\n"
 msgstr ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         [agg/normal/procedure/trigger/window 단일] 함수 목"
 "록\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [PATTERN]      텍스트 검색 구성 목록\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [PATTERN]     텍스트 검색 구성 목록\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [PATTERN]      텍스트 검색 사전 목록\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [PATTERN]     텍스트 검색 사전 목록\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [PATTERN]      텍스트 검색 파서 목록\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [PATTERN]     텍스트 검색 파서 목록\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [PATTERN]      텍스트 검색 템플릿 목록\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [PATTERN]     텍스트 검색 템플릿 목록\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [PATTERN]      롤 목록\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [PATTERN]     롤 목록\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [PATTERN]      인덱스 목록\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [PATTERN]     인덱스 목록\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+]                 큰 개체 목록, \\lo_list 명령과 같음\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]                큰 개체 목록, \\lo_list 명령과 같음\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [PATTERN]      프로시져 언어 목록\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [PATTERN]     프로시져 언어 목록\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [PATTERN]      materialized 뷰 목록\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [PATTERN]     구체화된 뷰 목록\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [PATTERN]      스키마 목록\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [PATTERN]     스키마 목록\n"
 
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
 msgstr ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         연산자 목록\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [PATTERN]      collation 목록\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [PATTERN]     collation 목록\n"
 
 #: help.c:257
 msgid ""
-"  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr "  \\dp[S]  [PATTERN]      테이블, 뷰 및 시퀀스 액세스 권한 목록\n"
+"  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
+msgstr "  \\dpx[S]  [PATTERN]     테이블, 뷰 및 시퀀스 액세스 권한 목록\n"
 
 #: help.c:258
 msgid ""
-"  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations "
+"  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations "
 "[n=nested]\n"
 msgstr ""
-"  \\dP[itn+] [PATTERN]    파티션 릴레이션 목록 [인덱스/테이블만] [n=nested]\n"
+"  \\dP[itnx+] [PATTERN]   파티션 릴레이션 목록 [인덱스/테이블만] [n=nested]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
-msgstr "  \\drds [ROLEPTRN [DBPTRN]] per-database 롤 설정 목록\n"
-
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\drg[S] [PATTERN]      롤 부여 목록\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
+msgstr ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         데이터베이스별 롤 설정 목록\n"
 
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [PATTERN]      복제 발행 목록\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\drg[Sx] [PATTERN]     롤 부여 목록\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [PATTERN]      복제 구독 목록\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [PATTERN]     복제 발행 목록\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [PATTERN]      시퀀스 목록\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [PATTERN]     복제 구독 목록\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [PATTERN]      테이블 목록\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [PATTERN]     시퀀스 목록\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [PATTERN]      데이터 형식 목록\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [PATTERN]     테이블 목록\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [PATTERN]      롤 목록\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [PATTERN]     데이터 형식 목록\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [PATTERN]      뷰 목록\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [PATTERN]     롤 목록\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [PATTERN]      확장 모듈 목록\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [PATTERN]     뷰 목록\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [PATTERN]      확장 통계 정보 목록\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [PATTERN]     확장 모듈 목록\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]  [PATTERN]      이벤트 트리거 목록\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [PATTERN]     확장 통계 정보 목록\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [PATTERN]      데이터베이스 목록\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [PATTERN]     이벤트 트리거 목록\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  함수이름       함수 정의 보기\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [PATTERN]     데이터베이스 목록\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+] 뷰이름          뷰 정의 보기\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]   함수이름      함수 정의 보기\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]   [PATTERN]      \\dp 와 같음\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]   뷰이름        뷰 정의 보기\n"
 
-#: help.c:277
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]   [PATTERN]     \\dp 와 같음\n"
+
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "큰 개체\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr "  \\lo_export LOBOID FILE 큰 개체를 파일로 저장\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3295,42 +3513,42 @@ msgstr ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         파일에서 큰 개체 가져오기\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+]            큰 개체 목록\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]           큰 개체 목록\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      큰 개체 삭제\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "출력 형식\n"
 
-#: help.c:286
+#: help.c:287
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                     정렬되지 않은 출력 모드와 정렬된 출력 모드 전환\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [STRING]            테이블 제목 설정 또는 값이 없는 경우 설정 안 함\n"
 
-#: help.c:288
+#: help.c:289
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
 "output\n"
 msgstr ""
 "  \\f [STRING]            unaligned 출력에 대해 필드 구분자 표시 또는 설정\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML 출력 모드 전환(현재 %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3348,32 +3566,32 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            행만 표시(현재 %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [STRING]            HTML <table> 태그 속성 설정 또는 비었는 경우 설정 "
 "안 함\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       확장된 출력 전환 (현재 %s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "자동"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "연결\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3382,7 +3600,7 @@ msgstr ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         새 데이터베이스에 접속 (현재 \"%s\")\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3390,56 +3608,56 @@ msgstr ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         새 데이터베이스에 접속 (현재 접속해 있지 않음)\n"
 
-#: help.c:313
+#: help.c:314
 msgid ""
 "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              현재 데이터베이스 접속 정보 보기\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [ENCODING]   클라이언트 인코딩 표시 또는 설정\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [USERNAME]   사용자 암호를 안전하게 변경\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "운영 체제\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]              현재 작업 디렉터리 변경\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR 환경 변수값을 psql 변수값으로\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NAME [VALUE]   환경 변수 지정 및 해제\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       명령 실행 시간 전환(현재 %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
 "shell\n"
 msgstr "  \\! [COMMAND]           셸 명령 실행 또는 대화식 셸 시작\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "변수\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [TEXT] NAME    사용자에게 내부 변수를 설정하라는 메시지 표시\n"
 
-#: help.c:329
+#: help.c:330
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
 "parameters\n"
@@ -3447,21 +3665,88 @@ msgstr ""
 "  \\set [NAME [VALUE]]    내부 변수 설정 또는 미지정 경우 모든 변수 목록 표"
 "시\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NAME            내부 변수 설정 해제(삭제)\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "확장된 쿼리 프로토콜\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       쿼리 매개 변수 지정\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared "
+"statement\n"
+msgstr ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         지정한 미리 준비된 구문을 위한 쿼리 매개변수 지정\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared STMT_NAME\n"
+"                         지정한 미리 준비된 구문을 닫음\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           파이프라인 모드 종료\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 해당 서버에 출력 자료를 flush함\n"
+
+#: help.c:342
+msgid ""
+"  \\flushrequest          send request to the server to flush its output "
+"buffer\n"
+msgstr ""
+"  \\flushrequest          출력 버퍼를 flush 하기 위해 해당 서버로 요청 보냄\n"
+
+#: help.c:343
+msgid ""
+"  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no "
+"argument\n"
+msgstr ""
+"  \\getresults [NUM_RES]  NUM_RES 개의 지연된 결과를 읽음, 생략하면 전체 읽"
+"음\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse STMT_NAME       미리 준비된 구문 만들기\n"
+
+#: help.c:345
+msgid ""
+"  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          진행 중인 파이프라인에 확장된 쿼리 보냄\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         파이프라인 모드로 진입\n"
+
+#: help.c:347
+msgid ""
+"  \\syncpipeline          add a synchronisation point to an ongoing "
+"pipeline\n"
+msgstr "  \\syncpipeline          진행 중인 파이프라인에 동기화 지점 추가\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
 msgstr "특별한 기능 설정 변수 목록\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "psql 변수들:\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3471,7 +3756,7 @@ msgstr ""
 "  또는 psql 명령 모드에서는 \\set NAME VALUE\n"
 "\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3479,7 +3764,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    설정 되면, SQL 명령이 정상 실행 되면 자동 커밋 함\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3489,7 +3774,7 @@ msgstr ""
 "    SQL 키워드 자동완성에서 대소문자 처리\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3497,7 +3782,7 @@ msgstr ""
 "  DBNAME\n"
 "    현재 접속한 데이터베이스 이름\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3507,7 +3792,7 @@ msgstr ""
 "    입력을 표준 출력으로 보낼 종류\n"
 "    [all, errors, none, queries]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3517,7 +3802,7 @@ msgstr ""
 "    지정 되면 psql 내장 명령어의 내부 쿼리를 출력함;\n"
 "    \"noexec\" 값으로 설정하면, 실행되지 않고 쿼리만 보여줌\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3525,7 +3810,7 @@ msgstr ""
 "  ENCODING\n"
 "    현재 클라이언트 인코딩 지정\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3533,7 +3818,7 @@ msgstr ""
 "  ERROR\n"
 "    마지막 쿼리가 실패했으면 \"true\", 아니면 \"false\"\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = "
@@ -3542,7 +3827,7 @@ msgstr ""
 "  FETCH_COUNT\n"
 "    쿼리 결과에 대해서 출력할 최대 로우 개수 (0=제한없음)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3550,7 +3835,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    지정하면 테이블 접근 방법을 보여주지 않음\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3558,7 +3843,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    지정하면 TOAST 압축 종류 보여주지 않음\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3566,7 +3851,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    명령 내역 처리 방법 [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3574,7 +3859,7 @@ msgstr ""
 "  HISTFILE\n"
 "    명령 내역을 저장할 파일 이름\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3582,7 +3867,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    명령 내역 최대 보관 개수\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3590,7 +3875,7 @@ msgstr ""
 "  HOST\n"
 "    현재 접속한 데이터베이스 서버 호스트\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3598,7 +3883,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    대화형 세션 종료를 위한 EOF 개수\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3606,7 +3891,7 @@ msgstr ""
 "  LASTOID\n"
 "    마지막 영향 받은 OID 값\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3617,7 +3902,7 @@ msgstr ""
 "  LAST_ERROR_SQLSTATE\n"
 "    마지막 오류 메시지와 SQLSTATE, 정상이면, 빈 문자열과 \"00000\"\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3625,7 +3910,7 @@ msgstr ""
 "  ON_ERROR_ROLLBACK\n"
 "    설정하면 오류 발생시에도 트랜잭션 중지 안함 (savepoint 암묵적 사용)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3633,7 +3918,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    배치 작업 시 오류가 발생하면 중지함\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3641,7 +3926,7 @@ msgstr ""
 "  PORT\n"
 "    현재 접속한 서버 포트\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3649,7 +3934,7 @@ msgstr ""
 "  PROMPT1\n"
 "    기본 psql 프롬프트 정의\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous "
@@ -3658,7 +3943,7 @@ msgstr ""
 "  PROMPT2\n"
 "    아직 구문이 덜 끝난 명령행의 프롬프트\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3666,7 +3951,7 @@ msgstr ""
 "  PROMPT3\n"
 "    COPY ... FROM STDIN 작업시 보일 프롬프트\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3674,7 +3959,7 @@ msgstr ""
 "  QUIET\n"
 "    조용히 실행 (-q 옵션과 같음)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3682,7 +3967,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    마지막 쿼리 작업 대상 로우 수, 또는 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3692,7 +3977,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    문자열 버전 정보나, 숫자 형식 버전 정보\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3700,7 +3985,7 @@ msgstr ""
 "  SHELL_ERROR\n"
 "    마지막 쉘 명령이 실패했으면 \"true\", 아니면 \"false\"\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3708,7 +3993,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    마지막 쉘 명령의 종료 코드\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3717,7 +4002,7 @@ msgstr ""
 "    여러 쿼리가 연속하는 경우(\\;) 모든 쿼리 결과를 출력, off면 마지막 결과"
 "만\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3725,7 +4010,7 @@ msgstr ""
 "  SHOW_CONTEXT\n"
 "    상황별 자세한 메시지 내용 출력 제어 [never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3733,7 +4018,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    한 줄에 하나의 SQL 명령 실행 (-S 옵션과 같음)\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3741,7 +4026,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    각 명령을 확인하며 실행 (-s 옵션과 같음)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3749,7 +4034,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    마지막 쿼리의 SQLSTATE 값, 오류가 없으면 \"00000\"\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3757,7 +4042,7 @@ msgstr ""
 "  USER\n"
 "    현재 접속한 데이터베이스 사용자\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3765,7 +4050,7 @@ msgstr ""
 "  VERBOSITY\n"
 "    오류 출력시 자세히 볼 내용 범위 [default, verbose, terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3777,7 +4062,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    psql 버전 (자세한 버전, 단순한 버전, 숫자형 버전)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL\n"
+"    \\watch 기다리는 초 (기본값 %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3785,7 +4079,7 @@ msgstr ""
 "\n"
 "출력 설정들:\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3795,7 +4089,7 @@ msgstr ""
 "  또는 psql 명령 모드에서는 \\pset NAME [VALUE]\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3803,7 +4097,7 @@ msgstr ""
 "  border\n"
 "    테두리 모양 (숫자)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3811,7 +4105,7 @@ msgstr ""
 "  columns\n"
 "    줄바꿈을 위한 너비 지정\n"
 
-#: help.c:463
+#: help.c:483
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3819,7 +4113,7 @@ msgstr ""
 "  expanded (또는 x)\n"
 "    확장된 출력 전환 [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:485
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3828,7 +4122,7 @@ msgstr ""
 "  fieldsep\n"
 "    unaligned 출력용 필드 구분자 (초기값 \"%s\"')\n"
 
-#: help.c:468
+#: help.c:488
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3836,7 +4130,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    unaligned 출력용 필드 구분자를 0 바이트로 지정\n"
 
-#: help.c:470
+#: help.c:490
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3844,7 +4138,7 @@ msgstr ""
 "  footer\n"
 "    테이블 꼬리말 보이기 전환 [on, off]\n"
 
-#: help.c:472
+#: help.c:492
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3852,7 +4146,7 @@ msgstr ""
 "  format\n"
 "    출력 양식 지정 [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:494
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -3860,7 +4154,7 @@ msgstr ""
 "  linestyle\n"
 "    테두리 선 모양 지정 [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:496
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -3868,7 +4162,7 @@ msgstr ""
 "  null\n"
 "    null 값 출력 방법\n"
 
-#: help.c:478
+#: help.c:498
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of "
@@ -3877,7 +4171,7 @@ msgstr ""
 "  numericlocale\n"
 "    숫자 출력에서 로케일 기반 천자리 분리 문자 활성화  [on, off]\n"
 
-#: help.c:480
+#: help.c:500
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -3885,7 +4179,7 @@ msgstr ""
 "  pager\n"
 "    외부 페이지 단위 보기 도구 사용 여부 [yes, no, always]\n"
 
-#: help.c:482
+#: help.c:502
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -3893,7 +4187,7 @@ msgstr ""
 "  recordsep\n"
 "    unaligned 출력용 레코드(줄) 구분자\n"
 
-#: help.c:484
+#: help.c:504
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -3901,7 +4195,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    unaligned 출력용 레코드 구분자를 0 바이트로 지정\n"
 
-#: help.c:486
+#: help.c:506
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -3911,7 +4205,7 @@ msgstr ""
 "    html 테이블 태그에 대한 속성이나,\n"
 "    latex-longtable 양식에서 왼쪽 정렬 자료용 칼럼 너비 지정\n"
 
-#: help.c:489
+#: help.c:509
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -3919,7 +4213,7 @@ msgstr ""
 "  title\n"
 "    테이블 제목 지정\n"
 
-#: help.c:491
+#: help.c:511
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -3927,7 +4221,7 @@ msgstr ""
 "  tuples_only\n"
 "    지정되면, 자료만 보임\n"
 
-#: help.c:493
+#: help.c:513
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -3939,7 +4233,7 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    유니코드 선 종류 [single, double]\n"
 
-#: help.c:497
+#: help.c:517
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -3949,7 +4243,7 @@ msgstr ""
 "    확장된 출력 화면에서 헤더의 최대 너비 지정\n"
 "    [full, column, page, integer value]\n"
 
-#: help.c:501
+#: help.c:521
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -3957,7 +4251,7 @@ msgstr ""
 "\n"
 "OS 환경 변수들:\n"
 
-#: help.c:505
+#: help.c:525
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -3967,7 +4261,7 @@ msgstr ""
 "  또는 psql 명령 모드에서는 \\setenv NAME [VALUE]\n"
 "\n"
 
-#: help.c:507
+#: help.c:527
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -3979,7 +4273,7 @@ msgstr ""
 "  또는 psql 명령 모드에서는 \\setenv NAME [VALUE]\n"
 "\n"
 
-#: help.c:510
+#: help.c:530
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -3987,7 +4281,7 @@ msgstr ""
 "  COLUMNS\n"
 "    다음 줄로 넘어갈 칼럼 수\n"
 
-#: help.c:512
+#: help.c:532
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -3995,7 +4289,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    application_name 변수값으로 사용됨\n"
 
-#: help.c:514
+#: help.c:534
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -4003,7 +4297,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    접속할 데이터베이스 이름\n"
 
-#: help.c:516
+#: help.c:536
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -4011,7 +4305,7 @@ msgstr ""
 "  PGHOST\n"
 "    서버 접속용 호스트 이름\n"
 
-#: help.c:518
+#: help.c:538
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -4019,7 +4313,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    서버 접속용 비밀번호가 저장된 파일 이름\n"
 
-#: help.c:520
+#: help.c:540
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -4027,7 +4321,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    서버 접속 비밀번호 (보안에 취약함)\n"
 
-#: help.c:522
+#: help.c:542
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -4035,7 +4329,7 @@ msgstr ""
 "  PGPORT\n"
 "    서버 접속용 포트\n"
 
-#: help.c:524
+#: help.c:544
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -4043,7 +4337,7 @@ msgstr ""
 "  PGUSER\n"
 "    서버 접속용 데이터베이스 사용자 이름\n"
 
-#: help.c:526
+#: help.c:546
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -4051,7 +4345,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    \\e, \\ef, \\ev 명령에서 사용할 외부 편집기 경로\n"
 
-#: help.c:528
+#: help.c:548
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -4059,7 +4353,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    외부 편집기 호출 시 사용할 줄번호 선택 옵션\n"
 
-#: help.c:530
+#: help.c:550
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -4067,7 +4361,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    사용자 .psql_history 파일 임의 지정\n"
 
-#: help.c:532
+#: help.c:552
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -4075,7 +4369,7 @@ msgstr ""
 "  PAGER\n"
 "    페이지 단위 보기에서 사용할 프로그램\n"
 
-#: help.c:535
+#: help.c:555
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -4083,7 +4377,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    \\watch 명령에서 사용할 외장 페이저 프로그램 이름\n"
 
-#: help.c:538
+#: help.c:558
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -4091,7 +4385,7 @@ msgstr ""
 "  PSQLRC\n"
 "    사용자 .psqlrc 파일의 임의 지정\n"
 
-#: help.c:540
+#: help.c:560
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -4099,7 +4393,7 @@ msgstr ""
 "  SHELL\n"
 "    \\! 명령에서 사용할 쉘\n"
 
-#: help.c:542
+#: help.c:562
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -4107,11 +4401,11 @@ msgstr ""
 "  TMPDIR\n"
 "    임시 파일을 사용할 디렉터리\n"
 
-#: help.c:602
+#: help.c:622
 msgid "Available help:\n"
 msgstr "사용 가능한 도움말:\n"
 
-#: help.c:697
+#: help.c:717
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -4129,7 +4423,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:720
+#: help.c:740
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4237,12 +4531,12 @@ msgstr ""
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "\\endif 없이 EOF 도달"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "마무리 안된 따옴표 안의 문자열"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: 메모리 부족"
@@ -4250,2463 +4544,2475 @@ msgstr "%s: 메모리 부족"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:245
-#: sql_help.c:247 sql_help.c:248 sql_help.c:250 sql_help.c:252 sql_help.c:255
-#: sql_help.c:257 sql_help.c:259 sql_help.c:261 sql_help.c:276 sql_help.c:277
-#: sql_help.c:278 sql_help.c:280 sql_help.c:329 sql_help.c:331 sql_help.c:333
-#: sql_help.c:335 sql_help.c:404 sql_help.c:409 sql_help.c:411 sql_help.c:453
-#: sql_help.c:455 sql_help.c:458 sql_help.c:460 sql_help.c:529 sql_help.c:534
-#: sql_help.c:539 sql_help.c:544 sql_help.c:549 sql_help.c:603 sql_help.c:605
-#: sql_help.c:607 sql_help.c:609 sql_help.c:611 sql_help.c:614 sql_help.c:616
-#: sql_help.c:619 sql_help.c:630 sql_help.c:632 sql_help.c:676 sql_help.c:678
-#: sql_help.c:680 sql_help.c:683 sql_help.c:685 sql_help.c:687 sql_help.c:728
-#: sql_help.c:732 sql_help.c:736 sql_help.c:757 sql_help.c:760 sql_help.c:763
-#: sql_help.c:792 sql_help.c:804 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:833 sql_help.c:836 sql_help.c:865 sql_help.c:870 sql_help.c:875
-#: sql_help.c:880 sql_help.c:885 sql_help.c:912 sql_help.c:914 sql_help.c:916
-#: sql_help.c:918 sql_help.c:921 sql_help.c:923 sql_help.c:970 sql_help.c:1015
-#: sql_help.c:1020 sql_help.c:1025 sql_help.c:1030 sql_help.c:1035
-#: sql_help.c:1054 sql_help.c:1065 sql_help.c:1067 sql_help.c:1087
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1118 sql_help.c:1120 sql_help.c:1132
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1138 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1163 sql_help.c:1167 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1175 sql_help.c:1176 sql_help.c:1179
-#: sql_help.c:1182 sql_help.c:1184 sql_help.c:1324 sql_help.c:1326
-#: sql_help.c:1329 sql_help.c:1332 sql_help.c:1334 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1464 sql_help.c:1466
-#: sql_help.c:1468 sql_help.c:1471 sql_help.c:1492 sql_help.c:1495
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1505 sql_help.c:1507
-#: sql_help.c:1509 sql_help.c:1511 sql_help.c:1525 sql_help.c:1528
-#: sql_help.c:1530 sql_help.c:1532 sql_help.c:1542 sql_help.c:1544
-#: sql_help.c:1554 sql_help.c:1556 sql_help.c:1566 sql_help.c:1569
-#: sql_help.c:1592 sql_help.c:1594 sql_help.c:1596 sql_help.c:1598
-#: sql_help.c:1601 sql_help.c:1603 sql_help.c:1606 sql_help.c:1609
-#: sql_help.c:1660 sql_help.c:1703 sql_help.c:1706 sql_help.c:1708
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:1715 sql_help.c:1717
-#: sql_help.c:1720 sql_help.c:1770 sql_help.c:1786 sql_help.c:2019
-#: sql_help.c:2088 sql_help.c:2107 sql_help.c:2120 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2196 sql_help.c:2224 sql_help.c:2257
-#: sql_help.c:2275 sql_help.c:2303 sql_help.c:2414 sql_help.c:2460
-#: sql_help.c:2485 sql_help.c:2508 sql_help.c:2512 sql_help.c:2546
-#: sql_help.c:2566 sql_help.c:2588 sql_help.c:2602 sql_help.c:2623
-#: sql_help.c:2652 sql_help.c:2685 sql_help.c:2708 sql_help.c:2755
-#: sql_help.c:3053 sql_help.c:3066 sql_help.c:3083 sql_help.c:3099
-#: sql_help.c:3139 sql_help.c:3193 sql_help.c:3197 sql_help.c:3199
-#: sql_help.c:3206 sql_help.c:3225 sql_help.c:3252 sql_help.c:3287
-#: sql_help.c:3299 sql_help.c:3308 sql_help.c:3352 sql_help.c:3366
-#: sql_help.c:3394 sql_help.c:3402 sql_help.c:3414 sql_help.c:3424
-#: sql_help.c:3432 sql_help.c:3440 sql_help.c:3448 sql_help.c:3456
-#: sql_help.c:3465 sql_help.c:3476 sql_help.c:3484 sql_help.c:3492
-#: sql_help.c:3500 sql_help.c:3508 sql_help.c:3518 sql_help.c:3527
-#: sql_help.c:3536 sql_help.c:3544 sql_help.c:3554 sql_help.c:3565
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3593 sql_help.c:3602
-#: sql_help.c:3610 sql_help.c:3618 sql_help.c:3626 sql_help.c:3634
-#: sql_help.c:3642 sql_help.c:3650 sql_help.c:3658 sql_help.c:3666
-#: sql_help.c:3674 sql_help.c:3682 sql_help.c:3699 sql_help.c:3708
-#: sql_help.c:3716 sql_help.c:3733 sql_help.c:3748 sql_help.c:4061
-#: sql_help.c:4182 sql_help.c:4211 sql_help.c:4227 sql_help.c:4229
-#: sql_help.c:4733 sql_help.c:4781 sql_help.c:4940
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:926 sql_help.c:928 sql_help.c:930
+#: sql_help.c:932 sql_help.c:935 sql_help.c:937 sql_help.c:984 sql_help.c:1029
+#: sql_help.c:1034 sql_help.c:1039 sql_help.c:1044 sql_help.c:1049
+#: sql_help.c:1068 sql_help.c:1079 sql_help.c:1081 sql_help.c:1102
+#: sql_help.c:1112 sql_help.c:1113 sql_help.c:1115 sql_help.c:1117
+#: sql_help.c:1129 sql_help.c:1133 sql_help.c:1135 sql_help.c:1147
+#: sql_help.c:1149 sql_help.c:1151 sql_help.c:1153 sql_help.c:1172
+#: sql_help.c:1174 sql_help.c:1178 sql_help.c:1182 sql_help.c:1186
+#: sql_help.c:1189 sql_help.c:1190 sql_help.c:1191 sql_help.c:1194
+#: sql_help.c:1197 sql_help.c:1199 sql_help.c:1341 sql_help.c:1343
+#: sql_help.c:1346 sql_help.c:1349 sql_help.c:1351 sql_help.c:1353
+#: sql_help.c:1356 sql_help.c:1359 sql_help.c:1487 sql_help.c:1489
+#: sql_help.c:1491 sql_help.c:1494 sql_help.c:1515 sql_help.c:1518
+#: sql_help.c:1521 sql_help.c:1524 sql_help.c:1528 sql_help.c:1530
+#: sql_help.c:1532 sql_help.c:1534 sql_help.c:1548 sql_help.c:1551
+#: sql_help.c:1553 sql_help.c:1555 sql_help.c:1565 sql_help.c:1567
+#: sql_help.c:1577 sql_help.c:1579 sql_help.c:1589 sql_help.c:1592
+#: sql_help.c:1615 sql_help.c:1617 sql_help.c:1619 sql_help.c:1621
+#: sql_help.c:1624 sql_help.c:1626 sql_help.c:1629 sql_help.c:1632
+#: sql_help.c:1683 sql_help.c:1726 sql_help.c:1729 sql_help.c:1731
+#: sql_help.c:1733 sql_help.c:1736 sql_help.c:1738 sql_help.c:1740
+#: sql_help.c:1743 sql_help.c:1793 sql_help.c:1809 sql_help.c:2044
+#: sql_help.c:2113 sql_help.c:2132 sql_help.c:2145 sql_help.c:2203
+#: sql_help.c:2211 sql_help.c:2221 sql_help.c:2249 sql_help.c:2282
+#: sql_help.c:2300 sql_help.c:2328 sql_help.c:2451 sql_help.c:2497
+#: sql_help.c:2522 sql_help.c:2545 sql_help.c:2549 sql_help.c:2583
+#: sql_help.c:2603 sql_help.c:2625 sql_help.c:2639 sql_help.c:2660
+#: sql_help.c:2689 sql_help.c:2722 sql_help.c:2745 sql_help.c:2794
+#: sql_help.c:3098 sql_help.c:3111 sql_help.c:3128 sql_help.c:3144
+#: sql_help.c:3184 sql_help.c:3238 sql_help.c:3242 sql_help.c:3244
+#: sql_help.c:3251 sql_help.c:3270 sql_help.c:3297 sql_help.c:3332
+#: sql_help.c:3344 sql_help.c:3353 sql_help.c:3399 sql_help.c:3413
+#: sql_help.c:3441 sql_help.c:3449 sql_help.c:3461 sql_help.c:3471
+#: sql_help.c:3479 sql_help.c:3487 sql_help.c:3495 sql_help.c:3503
+#: sql_help.c:3512 sql_help.c:3523 sql_help.c:3531 sql_help.c:3539
+#: sql_help.c:3547 sql_help.c:3555 sql_help.c:3565 sql_help.c:3574
+#: sql_help.c:3583 sql_help.c:3591 sql_help.c:3601 sql_help.c:3612
+#: sql_help.c:3620 sql_help.c:3629 sql_help.c:3640 sql_help.c:3649
+#: sql_help.c:3657 sql_help.c:3665 sql_help.c:3673 sql_help.c:3681
+#: sql_help.c:3689 sql_help.c:3697 sql_help.c:3705 sql_help.c:3713
+#: sql_help.c:3721 sql_help.c:3729 sql_help.c:3746 sql_help.c:3755
+#: sql_help.c:3763 sql_help.c:3780 sql_help.c:3795 sql_help.c:4110
+#: sql_help.c:4233 sql_help.c:4262 sql_help.c:4278 sql_help.c:4280
+#: sql_help.c:4784 sql_help.c:4832 sql_help.c:4991
 msgid "name"
 msgstr "이름"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:340 sql_help.c:1863
-#: sql_help.c:3367 sql_help.c:4500
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1886
+#: sql_help.c:3414 sql_help.c:4551
 msgid "aggregate_signature"
 msgstr "집계함수_식별구문"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:260
-#: sql_help.c:281 sql_help.c:412 sql_help.c:459 sql_help.c:538 sql_help.c:586
-#: sql_help.c:604 sql_help.c:631 sql_help.c:684 sql_help.c:759 sql_help.c:814
-#: sql_help.c:835 sql_help.c:874 sql_help.c:924 sql_help.c:971 sql_help.c:1024
-#: sql_help.c:1056 sql_help.c:1066 sql_help.c:1101 sql_help.c:1121
-#: sql_help.c:1135 sql_help.c:1185 sql_help.c:1333 sql_help.c:1465
-#: sql_help.c:1508 sql_help.c:1529 sql_help.c:1543 sql_help.c:1555
-#: sql_help.c:1568 sql_help.c:1595 sql_help.c:1661 sql_help.c:1714
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:938 sql_help.c:985 sql_help.c:1038
+#: sql_help.c:1070 sql_help.c:1080 sql_help.c:1116 sql_help.c:1136
+#: sql_help.c:1150 sql_help.c:1200 sql_help.c:1350 sql_help.c:1488
+#: sql_help.c:1531 sql_help.c:1552 sql_help.c:1566 sql_help.c:1578
+#: sql_help.c:1591 sql_help.c:1618 sql_help.c:1684 sql_help.c:1737
 msgid "new_name"
 msgstr "새이름"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:258
-#: sql_help.c:279 sql_help.c:410 sql_help.c:495 sql_help.c:543 sql_help.c:633
-#: sql_help.c:642 sql_help.c:707 sql_help.c:731 sql_help.c:762 sql_help.c:817
-#: sql_help.c:879 sql_help.c:922 sql_help.c:1029 sql_help.c:1068
-#: sql_help.c:1099 sql_help.c:1119 sql_help.c:1133 sql_help.c:1183
-#: sql_help.c:1399 sql_help.c:1467 sql_help.c:1510 sql_help.c:1531
-#: sql_help.c:1593 sql_help.c:1709 sql_help.c:3039
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:936 sql_help.c:1043 sql_help.c:1082
+#: sql_help.c:1114 sql_help.c:1134 sql_help.c:1148 sql_help.c:1198
+#: sql_help.c:1417 sql_help.c:1490 sql_help.c:1533 sql_help.c:1554
+#: sql_help.c:1616 sql_help.c:1732 sql_help.c:3084
 msgid "new_owner"
 msgstr "새사용자"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:262 sql_help.c:332
-#: sql_help.c:461 sql_help.c:548 sql_help.c:686 sql_help.c:735 sql_help.c:765
-#: sql_help.c:820 sql_help.c:884 sql_help.c:1034 sql_help.c:1103
-#: sql_help.c:1137 sql_help.c:1335 sql_help.c:1512 sql_help.c:1533
-#: sql_help.c:1545 sql_help.c:1557 sql_help.c:1597 sql_help.c:1716
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1048 sql_help.c:1118
+#: sql_help.c:1152 sql_help.c:1352 sql_help.c:1535 sql_help.c:1556
+#: sql_help.c:1568 sql_help.c:1580 sql_help.c:1620 sql_help.c:1739
 msgid "new_schema"
 msgstr "새스키마"
 
-#: sql_help.c:44 sql_help.c:1927 sql_help.c:3368 sql_help.c:4529
+#: sql_help.c:44 sql_help.c:1950 sql_help.c:3415 sql_help.c:4580
 msgid "where aggregate_signature is:"
 msgstr "집계함수_식별구문 사용법:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:350 sql_help.c:363
-#: sql_help.c:367 sql_help.c:383 sql_help.c:386 sql_help.c:389 sql_help.c:530
-#: sql_help.c:535 sql_help.c:540 sql_help.c:545 sql_help.c:550 sql_help.c:866
-#: sql_help.c:871 sql_help.c:876 sql_help.c:881 sql_help.c:886 sql_help.c:1016
-#: sql_help.c:1021 sql_help.c:1026 sql_help.c:1031 sql_help.c:1036
-#: sql_help.c:1881 sql_help.c:1898 sql_help.c:1904 sql_help.c:1928
-#: sql_help.c:1931 sql_help.c:1934 sql_help.c:2089 sql_help.c:2108
-#: sql_help.c:2111 sql_help.c:2415 sql_help.c:2624 sql_help.c:3369
-#: sql_help.c:3372 sql_help.c:3375 sql_help.c:3466 sql_help.c:3555
-#: sql_help.c:3583 sql_help.c:3936 sql_help.c:4399 sql_help.c:4506
-#: sql_help.c:4513 sql_help.c:4519 sql_help.c:4530 sql_help.c:4533
-#: sql_help.c:4536
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1030
+#: sql_help.c:1035 sql_help.c:1040 sql_help.c:1045 sql_help.c:1050
+#: sql_help.c:1904 sql_help.c:1921 sql_help.c:1927 sql_help.c:1951
+#: sql_help.c:1954 sql_help.c:1957 sql_help.c:2114 sql_help.c:2133
+#: sql_help.c:2136 sql_help.c:2452 sql_help.c:2661 sql_help.c:3416
+#: sql_help.c:3419 sql_help.c:3422 sql_help.c:3513 sql_help.c:3602
+#: sql_help.c:3630 sql_help.c:3983 sql_help.c:4450 sql_help.c:4557
+#: sql_help.c:4564 sql_help.c:4570 sql_help.c:4581 sql_help.c:4584
+#: sql_help.c:4587
 msgid "argmode"
 msgstr "인자모드"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:351 sql_help.c:364
-#: sql_help.c:368 sql_help.c:384 sql_help.c:387 sql_help.c:390 sql_help.c:531
-#: sql_help.c:536 sql_help.c:541 sql_help.c:546 sql_help.c:551 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:882 sql_help.c:887 sql_help.c:1017
-#: sql_help.c:1022 sql_help.c:1027 sql_help.c:1032 sql_help.c:1037
-#: sql_help.c:1882 sql_help.c:1899 sql_help.c:1905 sql_help.c:1929
-#: sql_help.c:1932 sql_help.c:1935 sql_help.c:2090 sql_help.c:2109
-#: sql_help.c:2112 sql_help.c:2416 sql_help.c:2625 sql_help.c:3370
-#: sql_help.c:3373 sql_help.c:3376 sql_help.c:3467 sql_help.c:3556
-#: sql_help.c:3584 sql_help.c:4507 sql_help.c:4514 sql_help.c:4520
-#: sql_help.c:4531 sql_help.c:4534 sql_help.c:4537
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1031
+#: sql_help.c:1036 sql_help.c:1041 sql_help.c:1046 sql_help.c:1051
+#: sql_help.c:1905 sql_help.c:1922 sql_help.c:1928 sql_help.c:1952
+#: sql_help.c:1955 sql_help.c:1958 sql_help.c:2115 sql_help.c:2134
+#: sql_help.c:2137 sql_help.c:2453 sql_help.c:2662 sql_help.c:3417
+#: sql_help.c:3420 sql_help.c:3423 sql_help.c:3514 sql_help.c:3603
+#: sql_help.c:3631 sql_help.c:4558 sql_help.c:4565 sql_help.c:4571
+#: sql_help.c:4582 sql_help.c:4585 sql_help.c:4588
 msgid "argname"
 msgstr "인자이름"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:352 sql_help.c:365
-#: sql_help.c:369 sql_help.c:385 sql_help.c:388 sql_help.c:391 sql_help.c:532
-#: sql_help.c:537 sql_help.c:542 sql_help.c:547 sql_help.c:552 sql_help.c:868
-#: sql_help.c:873 sql_help.c:878 sql_help.c:883 sql_help.c:888 sql_help.c:1018
-#: sql_help.c:1023 sql_help.c:1028 sql_help.c:1033 sql_help.c:1038
-#: sql_help.c:1883 sql_help.c:1900 sql_help.c:1906 sql_help.c:1930
-#: sql_help.c:1933 sql_help.c:1936 sql_help.c:2417 sql_help.c:2626
-#: sql_help.c:3371 sql_help.c:3374 sql_help.c:3377 sql_help.c:3468
-#: sql_help.c:3557 sql_help.c:3585 sql_help.c:4508 sql_help.c:4515
-#: sql_help.c:4521 sql_help.c:4532 sql_help.c:4535 sql_help.c:4538
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1032
+#: sql_help.c:1037 sql_help.c:1042 sql_help.c:1047 sql_help.c:1052
+#: sql_help.c:1906 sql_help.c:1923 sql_help.c:1929 sql_help.c:1953
+#: sql_help.c:1956 sql_help.c:1959 sql_help.c:2454 sql_help.c:2663
+#: sql_help.c:3418 sql_help.c:3421 sql_help.c:3424 sql_help.c:3515
+#: sql_help.c:3604 sql_help.c:3632 sql_help.c:4559 sql_help.c:4566
+#: sql_help.c:4572 sql_help.c:4583 sql_help.c:4586 sql_help.c:4589
 msgid "argtype"
 msgstr "인자자료형"
 
-#: sql_help.c:114 sql_help.c:407 sql_help.c:484 sql_help.c:496 sql_help.c:965
-#: sql_help.c:1116 sql_help.c:1526 sql_help.c:1655 sql_help.c:1687
-#: sql_help.c:1739 sql_help.c:1798 sql_help.c:1987 sql_help.c:1994
-#: sql_help.c:2306 sql_help.c:2356 sql_help.c:2363 sql_help.c:2372
-#: sql_help.c:2461 sql_help.c:2686 sql_help.c:2777 sql_help.c:3068
-#: sql_help.c:3253 sql_help.c:3275 sql_help.c:3415 sql_help.c:3772
-#: sql_help.c:3980 sql_help.c:4226 sql_help.c:4228 sql_help.c:5006
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:979
+#: sql_help.c:1131 sql_help.c:1549 sql_help.c:1678 sql_help.c:1710
+#: sql_help.c:1762 sql_help.c:1821 sql_help.c:2011 sql_help.c:2018
+#: sql_help.c:2331 sql_help.c:2389 sql_help.c:2398 sql_help.c:2407
+#: sql_help.c:2498 sql_help.c:2723 sql_help.c:2816 sql_help.c:3113
+#: sql_help.c:3298 sql_help.c:3320 sql_help.c:3462 sql_help.c:3819
+#: sql_help.c:4027 sql_help.c:4277 sql_help.c:4279 sql_help.c:5059
 msgid "option"
 msgstr "옵션"
 
-#: sql_help.c:115 sql_help.c:966 sql_help.c:1656 sql_help.c:2462
-#: sql_help.c:2687 sql_help.c:3254 sql_help.c:3416
+#: sql_help.c:115 sql_help.c:980 sql_help.c:1679 sql_help.c:2499
+#: sql_help.c:2724 sql_help.c:3299 sql_help.c:3463
 msgid "where option can be:"
 msgstr "옵션 사용법:"
 
-#: sql_help.c:116 sql_help.c:2238
+#: sql_help.c:116 sql_help.c:2263
 msgid "allowconn"
 msgstr "접속허용"
 
-#: sql_help.c:117 sql_help.c:967 sql_help.c:1657 sql_help.c:2239
-#: sql_help.c:2463 sql_help.c:2688 sql_help.c:3255
+#: sql_help.c:117 sql_help.c:981 sql_help.c:1680 sql_help.c:2264
+#: sql_help.c:2500 sql_help.c:2725 sql_help.c:3300
 msgid "connlimit"
 msgstr "접속제한"
 
-#: sql_help.c:118 sql_help.c:2240
+#: sql_help.c:118 sql_help.c:2265
 msgid "istemplate"
 msgstr "템플릿?"
 
-#: sql_help.c:124 sql_help.c:621 sql_help.c:689 sql_help.c:703 sql_help.c:1338
-#: sql_help.c:1392 sql_help.c:4232
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1355
+#: sql_help.c:1410 sql_help.c:4283
 msgid "new_tablespace"
 msgstr "새테이블스페이스"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:558 sql_help.c:560
-#: sql_help.c:561 sql_help.c:891 sql_help.c:893 sql_help.c:894 sql_help.c:974
-#: sql_help.c:978 sql_help.c:981 sql_help.c:1043 sql_help.c:1045
-#: sql_help.c:1046 sql_help.c:1196 sql_help.c:1198 sql_help.c:1664
-#: sql_help.c:1668 sql_help.c:1671 sql_help.c:2427 sql_help.c:2630
-#: sql_help.c:3948 sql_help.c:4250 sql_help.c:4411 sql_help.c:4721
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:988
+#: sql_help.c:992 sql_help.c:995 sql_help.c:1057 sql_help.c:1059
+#: sql_help.c:1060 sql_help.c:1211 sql_help.c:1213 sql_help.c:1687
+#: sql_help.c:1691 sql_help.c:1694 sql_help.c:2464 sql_help.c:2667
+#: sql_help.c:3995 sql_help.c:4301 sql_help.c:4462 sql_help.c:4772
 msgid "configuration_parameter"
 msgstr "환경설정_매개변수"
 
-#: sql_help.c:128 sql_help.c:408 sql_help.c:479 sql_help.c:485 sql_help.c:497
-#: sql_help.c:559 sql_help.c:613 sql_help.c:695 sql_help.c:705 sql_help.c:892
-#: sql_help.c:920 sql_help.c:975 sql_help.c:1044 sql_help.c:1117
-#: sql_help.c:1162 sql_help.c:1166 sql_help.c:1170 sql_help.c:1173
-#: sql_help.c:1178 sql_help.c:1181 sql_help.c:1197 sql_help.c:1371
-#: sql_help.c:1394 sql_help.c:1442 sql_help.c:1450 sql_help.c:1470
-#: sql_help.c:1527 sql_help.c:1611 sql_help.c:1665 sql_help.c:1688
-#: sql_help.c:2307 sql_help.c:2357 sql_help.c:2364 sql_help.c:2373
-#: sql_help.c:2428 sql_help.c:2429 sql_help.c:2493 sql_help.c:2496
-#: sql_help.c:2530 sql_help.c:2631 sql_help.c:2632 sql_help.c:2655
-#: sql_help.c:2778 sql_help.c:2817 sql_help.c:2927 sql_help.c:2940
-#: sql_help.c:2954 sql_help.c:2995 sql_help.c:3003 sql_help.c:3025
-#: sql_help.c:3042 sql_help.c:3069 sql_help.c:3276 sql_help.c:3981
-#: sql_help.c:4722 sql_help.c:4723 sql_help.c:4724 sql_help.c:4725
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:934 sql_help.c:989 sql_help.c:1058 sql_help.c:1132
+#: sql_help.c:1177 sql_help.c:1181 sql_help.c:1185 sql_help.c:1188
+#: sql_help.c:1193 sql_help.c:1196 sql_help.c:1212 sql_help.c:1388
+#: sql_help.c:1412 sql_help.c:1465 sql_help.c:1473 sql_help.c:1493
+#: sql_help.c:1550 sql_help.c:1634 sql_help.c:1688 sql_help.c:1711
+#: sql_help.c:2332 sql_help.c:2390 sql_help.c:2399 sql_help.c:2408
+#: sql_help.c:2465 sql_help.c:2466 sql_help.c:2530 sql_help.c:2533
+#: sql_help.c:2567 sql_help.c:2668 sql_help.c:2669 sql_help.c:2692
+#: sql_help.c:2817 sql_help.c:2856 sql_help.c:2967 sql_help.c:2980
+#: sql_help.c:2994 sql_help.c:3040 sql_help.c:3048 sql_help.c:3070
+#: sql_help.c:3087 sql_help.c:3114 sql_help.c:3321 sql_help.c:4028
+#: sql_help.c:4773 sql_help.c:4774 sql_help.c:4775 sql_help.c:4776
 msgid "value"
 msgstr "값"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "대상롤"
 
-#: sql_help.c:203 sql_help.c:929 sql_help.c:2291 sql_help.c:2660
-#: sql_help.c:2733 sql_help.c:2738 sql_help.c:3911 sql_help.c:3920
-#: sql_help.c:3939 sql_help.c:3951 sql_help.c:4374 sql_help.c:4383
-#: sql_help.c:4402 sql_help.c:4414
+#: sql_help.c:215 sql_help.c:943 sql_help.c:2316 sql_help.c:2697
+#: sql_help.c:2770 sql_help.c:2775 sql_help.c:3958 sql_help.c:3967
+#: sql_help.c:3986 sql_help.c:3998 sql_help.c:4425 sql_help.c:4434
+#: sql_help.c:4453 sql_help.c:4465
 msgid "schema_name"
 msgstr "스키마이름"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "grant_또는_revoke_내용"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "grant_또는_revoke_내용에 사용되는 구문:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:584 sql_help.c:620 sql_help.c:688 sql_help.c:838 sql_help.c:985
-#: sql_help.c:1337 sql_help.c:1675 sql_help.c:2466 sql_help.c:2467
-#: sql_help.c:2468 sql_help.c:2469 sql_help.c:2470 sql_help.c:2604
-#: sql_help.c:2691 sql_help.c:2692 sql_help.c:2693 sql_help.c:3258
-#: sql_help.c:3259 sql_help.c:3260 sql_help.c:3261 sql_help.c:3262
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:4423 sql_help.c:4427
-#: sql_help.c:4743
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:999 sql_help.c:1354 sql_help.c:1698
+#: sql_help.c:2503 sql_help.c:2504 sql_help.c:2505 sql_help.c:2506
+#: sql_help.c:2507 sql_help.c:2641 sql_help.c:2728 sql_help.c:2729
+#: sql_help.c:2730 sql_help.c:3303 sql_help.c:3304 sql_help.c:3305
+#: sql_help.c:3306 sql_help.c:3307 sql_help.c:4007 sql_help.c:4011
+#: sql_help.c:4474 sql_help.c:4478 sql_help.c:4794
 msgid "role_name"
 msgstr "롤이름"
 
-#: sql_help.c:246 sql_help.c:265 sql_help.c:472 sql_help.c:928 sql_help.c:1353
-#: sql_help.c:1355 sql_help.c:1359 sql_help.c:1409 sql_help.c:1421
-#: sql_help.c:1446 sql_help.c:1705 sql_help.c:2260 sql_help.c:2264
-#: sql_help.c:2376 sql_help.c:2381 sql_help.c:2489 sql_help.c:2659
-#: sql_help.c:2794 sql_help.c:2799 sql_help.c:2801 sql_help.c:2922
-#: sql_help.c:2935 sql_help.c:2949 sql_help.c:2958 sql_help.c:2970
-#: sql_help.c:2999 sql_help.c:4012 sql_help.c:4027 sql_help.c:4029
-#: sql_help.c:4125 sql_help.c:4128 sql_help.c:4130 sql_help.c:4593
-#: sql_help.c:4594 sql_help.c:4603 sql_help.c:4650 sql_help.c:4651
-#: sql_help.c:4652 sql_help.c:4653 sql_help.c:4654 sql_help.c:4655
-#: sql_help.c:4696 sql_help.c:4697 sql_help.c:4702 sql_help.c:4707
-#: sql_help.c:4851 sql_help.c:4852 sql_help.c:4861 sql_help.c:4908
-#: sql_help.c:4909 sql_help.c:4910 sql_help.c:4911 sql_help.c:4912
-#: sql_help.c:4913 sql_help.c:4968 sql_help.c:4970 sql_help.c:5036
-#: sql_help.c:5096 sql_help.c:5097 sql_help.c:5106 sql_help.c:5153
-#: sql_help.c:5154 sql_help.c:5155 sql_help.c:5156 sql_help.c:5157
-#: sql_help.c:5158
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:942 sql_help.c:1370
+#: sql_help.c:1372 sql_help.c:1376 sql_help.c:1427 sql_help.c:1439
+#: sql_help.c:1469 sql_help.c:1728 sql_help.c:2285 sql_help.c:2289
+#: sql_help.c:2411 sql_help.c:2417 sql_help.c:2526 sql_help.c:2696
+#: sql_help.c:2833 sql_help.c:2838 sql_help.c:2840 sql_help.c:2962
+#: sql_help.c:2975 sql_help.c:2989 sql_help.c:2998 sql_help.c:3010
+#: sql_help.c:3044 sql_help.c:4060 sql_help.c:4076 sql_help.c:4078
+#: sql_help.c:4176 sql_help.c:4179 sql_help.c:4181 sql_help.c:4644
+#: sql_help.c:4645 sql_help.c:4654 sql_help.c:4701 sql_help.c:4702
+#: sql_help.c:4703 sql_help.c:4704 sql_help.c:4705 sql_help.c:4706
+#: sql_help.c:4747 sql_help.c:4748 sql_help.c:4753 sql_help.c:4758
+#: sql_help.c:4902 sql_help.c:4903 sql_help.c:4912 sql_help.c:4959
+#: sql_help.c:4960 sql_help.c:4961 sql_help.c:4962 sql_help.c:4963
+#: sql_help.c:4964 sql_help.c:5020 sql_help.c:5022 sql_help.c:5089
+#: sql_help.c:5149 sql_help.c:5150 sql_help.c:5159 sql_help.c:5206
+#: sql_help.c:5207 sql_help.c:5208 sql_help.c:5209 sql_help.c:5210
+#: sql_help.c:5211
 msgid "expression"
 msgstr "표현식"
 
-#: sql_help.c:249 sql_help.c:2261
+#: sql_help.c:263 sql_help.c:2286
 msgid "domain_constraint"
 msgstr "도메인_제약조건"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:256 sql_help.c:264 sql_help.c:487
-#: sql_help.c:488 sql_help.c:1330 sql_help.c:1379 sql_help.c:1380
-#: sql_help.c:1381 sql_help.c:1408 sql_help.c:1420 sql_help.c:1437
-#: sql_help.c:1869 sql_help.c:1871 sql_help.c:2263 sql_help.c:2375
-#: sql_help.c:2380 sql_help.c:2957 sql_help.c:2969 sql_help.c:4024
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1347 sql_help.c:1396 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1399 sql_help.c:1426 sql_help.c:1438
+#: sql_help.c:1460 sql_help.c:1892 sql_help.c:1894 sql_help.c:2288
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2997 sql_help.c:3009
+#: sql_help.c:4073
 msgid "constraint_name"
 msgstr "제약조건_이름"
 
-#: sql_help.c:254 sql_help.c:1331
+#: sql_help.c:268 sql_help.c:1348
 msgid "new_constraint_name"
 msgstr "새제약조건_이름"
 
-#: sql_help.c:263 sql_help.c:2262
+#: sql_help.c:277 sql_help.c:2287
 msgid "where domain_constraint is:"
 msgstr "도메인_제약조건 사용법:"
 
-#: sql_help.c:330 sql_help.c:1115
+#: sql_help.c:344 sql_help.c:1130
 msgid "new_version"
 msgstr "새버전"
 
-#: sql_help.c:334 sql_help.c:336
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "맴버_객체"
 
-#: sql_help.c:337
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "맴버_객체 사용법:"
 
-#: sql_help.c:338 sql_help.c:343 sql_help.c:344 sql_help.c:345 sql_help.c:346
-#: sql_help.c:347 sql_help.c:348 sql_help.c:353 sql_help.c:357 sql_help.c:359
-#: sql_help.c:361 sql_help.c:370 sql_help.c:371 sql_help.c:372 sql_help.c:373
-#: sql_help.c:374 sql_help.c:375 sql_help.c:376 sql_help.c:377 sql_help.c:380
-#: sql_help.c:381 sql_help.c:1861 sql_help.c:1866 sql_help.c:1873
-#: sql_help.c:1874 sql_help.c:1875 sql_help.c:1876 sql_help.c:1877
-#: sql_help.c:1878 sql_help.c:1879 sql_help.c:1884 sql_help.c:1886
-#: sql_help.c:1890 sql_help.c:1892 sql_help.c:1896 sql_help.c:1901
-#: sql_help.c:1902 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1912 sql_help.c:1913 sql_help.c:1914 sql_help.c:1915
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:1918 sql_help.c:1919
-#: sql_help.c:1924 sql_help.c:1925 sql_help.c:4496 sql_help.c:4501
-#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4516 sql_help.c:4517 sql_help.c:4522
-#: sql_help.c:4523 sql_help.c:4524 sql_help.c:4525 sql_help.c:4526
-#: sql_help.c:4527
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1884 sql_help.c:1889 sql_help.c:1896
+#: sql_help.c:1897 sql_help.c:1898 sql_help.c:1899 sql_help.c:1900
+#: sql_help.c:1901 sql_help.c:1902 sql_help.c:1907 sql_help.c:1909
+#: sql_help.c:1913 sql_help.c:1915 sql_help.c:1919 sql_help.c:1924
+#: sql_help.c:1925 sql_help.c:1932 sql_help.c:1933 sql_help.c:1934
+#: sql_help.c:1935 sql_help.c:1936 sql_help.c:1937 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1940 sql_help.c:1941 sql_help.c:1942
+#: sql_help.c:1947 sql_help.c:1948 sql_help.c:4547 sql_help.c:4552
+#: sql_help.c:4553 sql_help.c:4554 sql_help.c:4555 sql_help.c:4561
+#: sql_help.c:4562 sql_help.c:4567 sql_help.c:4568 sql_help.c:4573
+#: sql_help.c:4574 sql_help.c:4575 sql_help.c:4576 sql_help.c:4577
+#: sql_help.c:4578
 msgid "object_name"
 msgstr "객체이름"
 
-#: sql_help.c:339 sql_help.c:1862 sql_help.c:4499
+#: sql_help.c:353 sql_help.c:1885 sql_help.c:4550
 msgid "aggregate_name"
 msgstr "집계함수이름"
 
-#: sql_help.c:341 sql_help.c:1864 sql_help.c:2154 sql_help.c:2158
-#: sql_help.c:2160 sql_help.c:3385
+#: sql_help.c:355 sql_help.c:1887 sql_help.c:2179 sql_help.c:2183
+#: sql_help.c:2185 sql_help.c:3432
 msgid "source_type"
 msgstr "기존자료형"
 
-#: sql_help.c:342 sql_help.c:1865 sql_help.c:2155 sql_help.c:2159
-#: sql_help.c:2161 sql_help.c:3386
+#: sql_help.c:356 sql_help.c:1888 sql_help.c:2180 sql_help.c:2184
+#: sql_help.c:2186 sql_help.c:3433
 msgid "target_type"
 msgstr "대상자료형"
 
-#: sql_help.c:349 sql_help.c:802 sql_help.c:1880 sql_help.c:2156
-#: sql_help.c:2199 sql_help.c:2279 sql_help.c:2547 sql_help.c:2578
-#: sql_help.c:3145 sql_help.c:4398 sql_help.c:4505 sql_help.c:4622
-#: sql_help.c:4626 sql_help.c:4630 sql_help.c:4633 sql_help.c:4880
-#: sql_help.c:4884 sql_help.c:4888 sql_help.c:4891 sql_help.c:5125
-#: sql_help.c:5129 sql_help.c:5133 sql_help.c:5136
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1903 sql_help.c:2181
+#: sql_help.c:2224 sql_help.c:2304 sql_help.c:2584 sql_help.c:2615
+#: sql_help.c:3190 sql_help.c:4449 sql_help.c:4556 sql_help.c:4673
+#: sql_help.c:4677 sql_help.c:4681 sql_help.c:4684 sql_help.c:4931
+#: sql_help.c:4935 sql_help.c:4939 sql_help.c:4942 sql_help.c:5178
+#: sql_help.c:5182 sql_help.c:5186 sql_help.c:5189
 msgid "function_name"
 msgstr "함수이름"
 
-#: sql_help.c:354 sql_help.c:795 sql_help.c:1887 sql_help.c:2571
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1910 sql_help.c:2608
 msgid "operator_name"
 msgstr "연산자이름"
 
-#: sql_help.c:355 sql_help.c:729 sql_help.c:733 sql_help.c:737 sql_help.c:1888
-#: sql_help.c:2548 sql_help.c:3509
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1911
+#: sql_help.c:2585 sql_help.c:3556
 msgid "left_type"
 msgstr "왼쪽인자_자료형"
 
-#: sql_help.c:356 sql_help.c:730 sql_help.c:734 sql_help.c:738 sql_help.c:1889
-#: sql_help.c:2549 sql_help.c:3510
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1912
+#: sql_help.c:2586 sql_help.c:3557
 msgid "right_type"
 msgstr "오른쪽인자_자료형"
 
-#: sql_help.c:358 sql_help.c:360 sql_help.c:758 sql_help.c:761 sql_help.c:764
-#: sql_help.c:793 sql_help.c:805 sql_help.c:813 sql_help.c:816 sql_help.c:819
-#: sql_help.c:1426 sql_help.c:1891 sql_help.c:1893 sql_help.c:2568
-#: sql_help.c:2589 sql_help.c:2975 sql_help.c:3519 sql_help.c:3528
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1447 sql_help.c:1914 sql_help.c:1916 sql_help.c:2605
+#: sql_help.c:2626 sql_help.c:3018 sql_help.c:3566 sql_help.c:3575
 msgid "index_method"
 msgstr "색인방법"
 
-#: sql_help.c:362 sql_help.c:1897 sql_help.c:4512
+#: sql_help.c:376 sql_help.c:1920 sql_help.c:4563
 msgid "procedure_name"
 msgstr "프로시져_이름"
 
-#: sql_help.c:366 sql_help.c:1903 sql_help.c:3935 sql_help.c:4518
+#: sql_help.c:380 sql_help.c:1926 sql_help.c:3982 sql_help.c:4569
 msgid "routine_name"
 msgstr "루틴_이름"
 
-#: sql_help.c:378 sql_help.c:1398 sql_help.c:1920 sql_help.c:2423
-#: sql_help.c:2629 sql_help.c:2930 sql_help.c:3112 sql_help.c:3690
-#: sql_help.c:3957 sql_help.c:4420
+#: sql_help.c:392 sql_help.c:1416 sql_help.c:1943 sql_help.c:2460
+#: sql_help.c:2666 sql_help.c:2970 sql_help.c:3157 sql_help.c:3737
+#: sql_help.c:4004 sql_help.c:4471
 msgid "type_name"
 msgstr "자료형이름"
 
-#: sql_help.c:379 sql_help.c:1921 sql_help.c:2422 sql_help.c:2628
-#: sql_help.c:3113 sql_help.c:3343 sql_help.c:3691 sql_help.c:3942
-#: sql_help.c:4405
+#: sql_help.c:393 sql_help.c:1944 sql_help.c:2459 sql_help.c:2665
+#: sql_help.c:3158 sql_help.c:3390 sql_help.c:3738 sql_help.c:3989
+#: sql_help.c:4456
 msgid "lang_name"
 msgstr "언어_이름"
 
-#: sql_help.c:382
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "집계함수_식별구문 사용법:"
 
-#: sql_help.c:405 sql_help.c:2021 sql_help.c:2304
+#: sql_help.c:419 sql_help.c:2046 sql_help.c:2329
 msgid "handler_function"
 msgstr "핸들러_함수"
 
-#: sql_help.c:406 sql_help.c:2305
+#: sql_help.c:420 sql_help.c:2330
 msgid "validator_function"
 msgstr "유효성검사_함수"
 
-#: sql_help.c:454 sql_help.c:533 sql_help.c:677 sql_help.c:869 sql_help.c:1019
-#: sql_help.c:1325 sql_help.c:1602
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1033
+#: sql_help.c:1342 sql_help.c:1625
 msgid "action"
 msgstr "동작"
 
-#: sql_help.c:456 sql_help.c:463 sql_help.c:467 sql_help.c:468 sql_help.c:471
-#: sql_help.c:473 sql_help.c:474 sql_help.c:475 sql_help.c:477 sql_help.c:480
-#: sql_help.c:482 sql_help.c:483 sql_help.c:681 sql_help.c:691 sql_help.c:693
-#: sql_help.c:696 sql_help.c:698 sql_help.c:699 sql_help.c:927 sql_help.c:1096
-#: sql_help.c:1327 sql_help.c:1345 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1354 sql_help.c:1356 sql_help.c:1357 sql_help.c:1358
-#: sql_help.c:1360 sql_help.c:1361 sql_help.c:1363 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1369 sql_help.c:1372 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1422 sql_help.c:1424 sql_help.c:1431
-#: sql_help.c:1440 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1704 sql_help.c:1707 sql_help.c:1711 sql_help.c:1747
-#: sql_help.c:1868 sql_help.c:1984 sql_help.c:1990 sql_help.c:2004
-#: sql_help.c:2005 sql_help.c:2006 sql_help.c:2354 sql_help.c:2367
-#: sql_help.c:2420 sql_help.c:2488 sql_help.c:2494 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2763 sql_help.c:2798 sql_help.c:2800
-#: sql_help.c:2912 sql_help.c:2921 sql_help.c:2931 sql_help.c:2934
-#: sql_help.c:2944 sql_help.c:2948 sql_help.c:2971 sql_help.c:2973
-#: sql_help.c:2980 sql_help.c:2993 sql_help.c:2998 sql_help.c:3005
-#: sql_help.c:3006 sql_help.c:3022 sql_help.c:3148 sql_help.c:3288
-#: sql_help.c:3914 sql_help.c:3915 sql_help.c:4011 sql_help.c:4026
-#: sql_help.c:4028 sql_help.c:4030 sql_help.c:4124 sql_help.c:4127
-#: sql_help.c:4129 sql_help.c:4131 sql_help.c:4377 sql_help.c:4378
-#: sql_help.c:4498 sql_help.c:4659 sql_help.c:4666 sql_help.c:4668
-#: sql_help.c:4917 sql_help.c:4924 sql_help.c:4926 sql_help.c:4967
-#: sql_help.c:4969 sql_help.c:4971 sql_help.c:5024 sql_help.c:5162
-#: sql_help.c:5169 sql_help.c:5171
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:941 sql_help.c:1111
+#: sql_help.c:1344 sql_help.c:1362 sql_help.c:1366 sql_help.c:1367
+#: sql_help.c:1371 sql_help.c:1373 sql_help.c:1374 sql_help.c:1375
+#: sql_help.c:1377 sql_help.c:1378 sql_help.c:1380 sql_help.c:1383
+#: sql_help.c:1384 sql_help.c:1386 sql_help.c:1389 sql_help.c:1391
+#: sql_help.c:1392 sql_help.c:1440 sql_help.c:1441 sql_help.c:1442
+#: sql_help.c:1444 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
+#: sql_help.c:1463 sql_help.c:1468 sql_help.c:1475 sql_help.c:1476
+#: sql_help.c:1727 sql_help.c:1730 sql_help.c:1734 sql_help.c:1770
+#: sql_help.c:1891 sql_help.c:2008 sql_help.c:2014 sql_help.c:2028
+#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2387 sql_help.c:2402
+#: sql_help.c:2416 sql_help.c:2457 sql_help.c:2525 sql_help.c:2531
+#: sql_help.c:2564 sql_help.c:2695 sql_help.c:2802 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2952 sql_help.c:2961 sql_help.c:2971
+#: sql_help.c:2974 sql_help.c:2984 sql_help.c:2988 sql_help.c:3011
+#: sql_help.c:3012 sql_help.c:3013 sql_help.c:3015 sql_help.c:3016
+#: sql_help.c:3023 sql_help.c:3024 sql_help.c:3038 sql_help.c:3043
+#: sql_help.c:3050 sql_help.c:3051 sql_help.c:3067 sql_help.c:3193
+#: sql_help.c:3333 sql_help.c:3961 sql_help.c:3962 sql_help.c:4059
+#: sql_help.c:4075 sql_help.c:4077 sql_help.c:4079 sql_help.c:4175
+#: sql_help.c:4178 sql_help.c:4180 sql_help.c:4182 sql_help.c:4428
+#: sql_help.c:4429 sql_help.c:4549 sql_help.c:4710 sql_help.c:4717
+#: sql_help.c:4719 sql_help.c:4968 sql_help.c:4975 sql_help.c:4977
+#: sql_help.c:5019 sql_help.c:5021 sql_help.c:5023 sql_help.c:5077
+#: sql_help.c:5215 sql_help.c:5222 sql_help.c:5224
 msgid "column_name"
 msgstr "칼럼이름"
 
-#: sql_help.c:457 sql_help.c:682 sql_help.c:1328 sql_help.c:1712
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1345 sql_help.c:1735
 msgid "new_column_name"
 msgstr "새칼럼이름"
 
-#: sql_help.c:462 sql_help.c:554 sql_help.c:690 sql_help.c:890 sql_help.c:1040
-#: sql_help.c:1344 sql_help.c:1612
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1054
+#: sql_help.c:1361 sql_help.c:1635
 msgid "where action is one of:"
 msgstr "동작 사용법:"
 
-#: sql_help.c:464 sql_help.c:469 sql_help.c:1088 sql_help.c:1346
-#: sql_help.c:1351 sql_help.c:1614 sql_help.c:1618 sql_help.c:2258
-#: sql_help.c:2355 sql_help.c:2567 sql_help.c:2756 sql_help.c:2913
-#: sql_help.c:3195 sql_help.c:4183
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1103 sql_help.c:1363
+#: sql_help.c:1368 sql_help.c:1637 sql_help.c:1641 sql_help.c:2283
+#: sql_help.c:2388 sql_help.c:2604 sql_help.c:2795 sql_help.c:2953
+#: sql_help.c:3240 sql_help.c:4234
 msgid "data_type"
 msgstr "자료형"
 
-#: sql_help.c:465 sql_help.c:470 sql_help.c:1347 sql_help.c:1352
-#: sql_help.c:1447 sql_help.c:1615 sql_help.c:1619 sql_help.c:2259
-#: sql_help.c:2358 sql_help.c:2490 sql_help.c:2915 sql_help.c:2923
-#: sql_help.c:2936 sql_help.c:2950 sql_help.c:3000 sql_help.c:3196
-#: sql_help.c:3202 sql_help.c:4021
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1364 sql_help.c:1369
+#: sql_help.c:1470 sql_help.c:1638 sql_help.c:1642 sql_help.c:2284
+#: sql_help.c:2391 sql_help.c:2527 sql_help.c:2955 sql_help.c:2963
+#: sql_help.c:2976 sql_help.c:2990 sql_help.c:3045 sql_help.c:3241
+#: sql_help.c:3247 sql_help.c:4070
 msgid "collation"
 msgstr "collation"
 
-#: sql_help.c:466 sql_help.c:1348 sql_help.c:2359 sql_help.c:2368
-#: sql_help.c:2916 sql_help.c:2932 sql_help.c:2945
+#: sql_help.c:480 sql_help.c:1365 sql_help.c:2392 sql_help.c:2403
+#: sql_help.c:2956 sql_help.c:2972 sql_help.c:2985
 msgid "column_constraint"
 msgstr "칼럼_제약조건"
 
-#: sql_help.c:476 sql_help.c:618 sql_help.c:692 sql_help.c:1368 sql_help.c:5018
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1385 sql_help.c:5071
 msgid "integer"
 msgstr "정수"
 
-#: sql_help.c:478 sql_help.c:481 sql_help.c:694 sql_help.c:697 sql_help.c:1370
-#: sql_help.c:1373
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1387
+#: sql_help.c:1390
 msgid "attribute_option"
 msgstr "속성_옵션"
 
-#: sql_help.c:486 sql_help.c:1377 sql_help.c:2360 sql_help.c:2369
-#: sql_help.c:2917 sql_help.c:2933 sql_help.c:2946
+#: sql_help.c:500 sql_help.c:1394 sql_help.c:2393 sql_help.c:2404
+#: sql_help.c:2957 sql_help.c:2973 sql_help.c:2986
 msgid "table_constraint"
 msgstr "테이블_제약조건"
 
-#: sql_help.c:489 sql_help.c:490 sql_help.c:491 sql_help.c:492 sql_help.c:1382
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:1922
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1400
+#: sql_help.c:1401 sql_help.c:1402 sql_help.c:1403 sql_help.c:1945
 msgid "trigger_name"
 msgstr "트리거이름"
 
-#: sql_help.c:493 sql_help.c:494 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:2361 sql_help.c:2366 sql_help.c:2920 sql_help.c:2943
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1414 sql_help.c:1415
+#: sql_help.c:2396 sql_help.c:2401 sql_help.c:2960 sql_help.c:2983
 msgid "parent_table"
 msgstr "상위_테이블"
 
-#: sql_help.c:553 sql_help.c:610 sql_help.c:679 sql_help.c:889 sql_help.c:1039
-#: sql_help.c:1571 sql_help.c:2290
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1053
+#: sql_help.c:1594 sql_help.c:2315
 msgid "extension_name"
 msgstr "확장모듈이름"
 
-#: sql_help.c:555 sql_help.c:1041 sql_help.c:2424
+#: sql_help.c:569 sql_help.c:1055 sql_help.c:2461
 msgid "execution_cost"
 msgstr "실행비용"
 
-#: sql_help.c:556 sql_help.c:1042 sql_help.c:2425
+#: sql_help.c:570 sql_help.c:1056 sql_help.c:2462
 msgid "result_rows"
 msgstr "반환자료수"
 
-#: sql_help.c:557 sql_help.c:2426
+#: sql_help.c:571 sql_help.c:2463
 msgid "support_function"
 msgstr "지원_함수"
 
-#: sql_help.c:579 sql_help.c:581 sql_help.c:964 sql_help.c:972 sql_help.c:976
-#: sql_help.c:979 sql_help.c:982 sql_help.c:1654 sql_help.c:1662
-#: sql_help.c:1666 sql_help.c:1669 sql_help.c:1672 sql_help.c:2734
-#: sql_help.c:2736 sql_help.c:2739 sql_help.c:2740 sql_help.c:3912
-#: sql_help.c:3913 sql_help.c:3917 sql_help.c:3918 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3924 sql_help.c:3925 sql_help.c:3927
-#: sql_help.c:3928 sql_help.c:3930 sql_help.c:3931 sql_help.c:3933
-#: sql_help.c:3934 sql_help.c:3940 sql_help.c:3941 sql_help.c:3943
-#: sql_help.c:3944 sql_help.c:3946 sql_help.c:3947 sql_help.c:3949
-#: sql_help.c:3950 sql_help.c:3952 sql_help.c:3953 sql_help.c:3955
-#: sql_help.c:3956 sql_help.c:3958 sql_help.c:3959 sql_help.c:3961
-#: sql_help.c:3962 sql_help.c:4375 sql_help.c:4376 sql_help.c:4380
-#: sql_help.c:4381 sql_help.c:4384 sql_help.c:4385 sql_help.c:4387
-#: sql_help.c:4388 sql_help.c:4390 sql_help.c:4391 sql_help.c:4393
-#: sql_help.c:4394 sql_help.c:4396 sql_help.c:4397 sql_help.c:4403
-#: sql_help.c:4404 sql_help.c:4406 sql_help.c:4407 sql_help.c:4409
-#: sql_help.c:4410 sql_help.c:4412 sql_help.c:4413 sql_help.c:4415
-#: sql_help.c:4416 sql_help.c:4418 sql_help.c:4419 sql_help.c:4421
-#: sql_help.c:4422 sql_help.c:4424 sql_help.c:4425
+#: sql_help.c:593 sql_help.c:595 sql_help.c:978 sql_help.c:986 sql_help.c:990
+#: sql_help.c:993 sql_help.c:996 sql_help.c:1677 sql_help.c:1685
+#: sql_help.c:1689 sql_help.c:1692 sql_help.c:1695 sql_help.c:2771
+#: sql_help.c:2773 sql_help.c:2776 sql_help.c:2777 sql_help.c:3959
+#: sql_help.c:3960 sql_help.c:3964 sql_help.c:3965 sql_help.c:3968
+#: sql_help.c:3969 sql_help.c:3971 sql_help.c:3972 sql_help.c:3974
+#: sql_help.c:3975 sql_help.c:3977 sql_help.c:3978 sql_help.c:3980
+#: sql_help.c:3981 sql_help.c:3987 sql_help.c:3988 sql_help.c:3990
+#: sql_help.c:3991 sql_help.c:3993 sql_help.c:3994 sql_help.c:3996
+#: sql_help.c:3997 sql_help.c:3999 sql_help.c:4000 sql_help.c:4002
+#: sql_help.c:4003 sql_help.c:4005 sql_help.c:4006 sql_help.c:4008
+#: sql_help.c:4009 sql_help.c:4426 sql_help.c:4427 sql_help.c:4431
+#: sql_help.c:4432 sql_help.c:4435 sql_help.c:4436 sql_help.c:4438
+#: sql_help.c:4439 sql_help.c:4441 sql_help.c:4442 sql_help.c:4444
+#: sql_help.c:4445 sql_help.c:4447 sql_help.c:4448 sql_help.c:4454
+#: sql_help.c:4455 sql_help.c:4457 sql_help.c:4458 sql_help.c:4460
+#: sql_help.c:4461 sql_help.c:4463 sql_help.c:4464 sql_help.c:4466
+#: sql_help.c:4467 sql_help.c:4469 sql_help.c:4470 sql_help.c:4472
+#: sql_help.c:4473 sql_help.c:4475 sql_help.c:4476
 msgid "role_specification"
 msgstr "롤_명세"
 
-#: sql_help.c:580 sql_help.c:582 sql_help.c:1685 sql_help.c:2225
-#: sql_help.c:2742 sql_help.c:3273 sql_help.c:3724 sql_help.c:4753
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1708 sql_help.c:2250
+#: sql_help.c:2779 sql_help.c:3318 sql_help.c:3771 sql_help.c:4804
 msgid "user_name"
 msgstr "사용자이름"
 
-#: sql_help.c:583 sql_help.c:984 sql_help.c:1674 sql_help.c:2741
-#: sql_help.c:3963 sql_help.c:4426
+#: sql_help.c:597 sql_help.c:998 sql_help.c:1697 sql_help.c:2778
+#: sql_help.c:4010 sql_help.c:4477
 msgid "where role_specification can be:"
 msgstr "롤_명세 사용법:"
 
-#: sql_help.c:585
+#: sql_help.c:599
 msgid "group_name"
 msgstr "그룹이름"
 
-#: sql_help.c:606 sql_help.c:1443 sql_help.c:2237 sql_help.c:2497
-#: sql_help.c:2531 sql_help.c:2928 sql_help.c:2941 sql_help.c:2955
-#: sql_help.c:2996 sql_help.c:3026 sql_help.c:3038 sql_help.c:3954
-#: sql_help.c:4417
+#: sql_help.c:620 sql_help.c:1466 sql_help.c:2262 sql_help.c:2534
+#: sql_help.c:2568 sql_help.c:2968 sql_help.c:2981 sql_help.c:2995
+#: sql_help.c:3041 sql_help.c:3071 sql_help.c:3083 sql_help.c:4001
+#: sql_help.c:4468
 msgid "tablespace_name"
 msgstr "테이블스페이스이름"
 
-#: sql_help.c:608 sql_help.c:701 sql_help.c:1390 sql_help.c:1400
-#: sql_help.c:1438 sql_help.c:1800
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1408 sql_help.c:1418
+#: sql_help.c:1461 sql_help.c:1823
 msgid "index_name"
 msgstr "인덱스이름"
 
-#: sql_help.c:612 sql_help.c:615 sql_help.c:704 sql_help.c:706 sql_help.c:1393
-#: sql_help.c:1395 sql_help.c:1441 sql_help.c:2495 sql_help.c:2529
-#: sql_help.c:2926 sql_help.c:2939 sql_help.c:2953 sql_help.c:2994
-#: sql_help.c:3024
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1411
+#: sql_help.c:1413 sql_help.c:1464 sql_help.c:2532 sql_help.c:2566
+#: sql_help.c:2966 sql_help.c:2979 sql_help.c:2993 sql_help.c:3039
+#: sql_help.c:3069
 msgid "storage_parameter"
 msgstr "스토리지_매개변수"
 
-#: sql_help.c:617
+#: sql_help.c:631
 msgid "column_number"
 msgstr "칼럼번호"
 
-#: sql_help.c:641 sql_help.c:1885 sql_help.c:4509
+#: sql_help.c:655 sql_help.c:1908 sql_help.c:4560
 msgid "large_object_oid"
 msgstr "대형_객체_oid"
 
-#: sql_help.c:700 sql_help.c:1376 sql_help.c:2914
+#: sql_help.c:714 sql_help.c:1393 sql_help.c:2954
 msgid "compression_method"
 msgstr "압축_방법"
 
-#: sql_help.c:702 sql_help.c:1391
+#: sql_help.c:716 sql_help.c:1409
 msgid "new_access_method"
 msgstr "새_접근_방법"
 
-#: sql_help.c:739 sql_help.c:2552
+#: sql_help.c:753 sql_help.c:2589
 msgid "res_proc"
 msgstr "res_proc"
 
-#: sql_help.c:740 sql_help.c:2553
+#: sql_help.c:754 sql_help.c:2590
 msgid "join_proc"
 msgstr "join_proc"
 
-#: sql_help.c:741 sql_help.c:2550
+#: sql_help.c:755 sql_help.c:2587
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:742 sql_help.c:2551
+#: sql_help.c:756 sql_help.c:2588
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:794 sql_help.c:806 sql_help.c:2570
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2607
 msgid "strategy_number"
 msgstr "전략_번호"
 
-#: sql_help.c:796 sql_help.c:797 sql_help.c:800 sql_help.c:801 sql_help.c:807
-#: sql_help.c:808 sql_help.c:810 sql_help.c:811 sql_help.c:2572 sql_help.c:2573
-#: sql_help.c:2576 sql_help.c:2577
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2609 sql_help.c:2610
+#: sql_help.c:2613 sql_help.c:2614
 msgid "op_type"
 msgstr "연산자자료형"
 
-#: sql_help.c:798 sql_help.c:2574
+#: sql_help.c:812 sql_help.c:2611
 msgid "sort_family_name"
 msgstr "정렬_가족_이름"
 
-#: sql_help.c:799 sql_help.c:809 sql_help.c:2575
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2612
 msgid "support_number"
 msgstr "지원_번호"
 
-#: sql_help.c:803 sql_help.c:2157 sql_help.c:2579 sql_help.c:3115
-#: sql_help.c:3117
+#: sql_help.c:817 sql_help.c:2182 sql_help.c:2616 sql_help.c:3160
+#: sql_help.c:3162
 msgid "argument_type"
 msgstr "인자자료형"
 
-#: sql_help.c:834 sql_help.c:837 sql_help.c:926 sql_help.c:1055 sql_help.c:1095
-#: sql_help.c:1567 sql_help.c:1570 sql_help.c:1746 sql_help.c:1799
-#: sql_help.c:1870 sql_help.c:1895 sql_help.c:1908 sql_help.c:1923
-#: sql_help.c:1983 sql_help.c:1989 sql_help.c:2353 sql_help.c:2365
-#: sql_help.c:2486 sql_help.c:2526 sql_help.c:2603 sql_help.c:2657
-#: sql_help.c:2710 sql_help.c:2762 sql_help.c:2795 sql_help.c:2802
-#: sql_help.c:2911 sql_help.c:2929 sql_help.c:2942 sql_help.c:3021
-#: sql_help.c:3141 sql_help.c:3322 sql_help.c:3545 sql_help.c:3594
-#: sql_help.c:3700 sql_help.c:3910 sql_help.c:3916 sql_help.c:3977
-#: sql_help.c:4009 sql_help.c:4373 sql_help.c:4379 sql_help.c:4497
-#: sql_help.c:4610 sql_help.c:4673 sql_help.c:4712 sql_help.c:4868
-#: sql_help.c:4931 sql_help.c:4965 sql_help.c:5023 sql_help.c:5113
-#: sql_help.c:5176
+#: sql_help.c:848 sql_help.c:851 sql_help.c:940 sql_help.c:1069 sql_help.c:1110
+#: sql_help.c:1590 sql_help.c:1593 sql_help.c:1769 sql_help.c:1822
+#: sql_help.c:1893 sql_help.c:1918 sql_help.c:1931 sql_help.c:1946
+#: sql_help.c:2007 sql_help.c:2013 sql_help.c:2386 sql_help.c:2400
+#: sql_help.c:2523 sql_help.c:2563 sql_help.c:2640 sql_help.c:2694
+#: sql_help.c:2747 sql_help.c:2801 sql_help.c:2834 sql_help.c:2841
+#: sql_help.c:2951 sql_help.c:2969 sql_help.c:2982 sql_help.c:3066
+#: sql_help.c:3186 sql_help.c:3368 sql_help.c:3592 sql_help.c:3641
+#: sql_help.c:3747 sql_help.c:3957 sql_help.c:3963 sql_help.c:4024
+#: sql_help.c:4057 sql_help.c:4424 sql_help.c:4430 sql_help.c:4548
+#: sql_help.c:4661 sql_help.c:4724 sql_help.c:4763 sql_help.c:4919
+#: sql_help.c:4982 sql_help.c:5017 sql_help.c:5076 sql_help.c:5166
+#: sql_help.c:5229
 msgid "table_name"
 msgstr "테이블_이름"
 
-#: sql_help.c:839 sql_help.c:2605
+#: sql_help.c:853 sql_help.c:2642
 msgid "using_expression"
 msgstr "using_expression"
 
-#: sql_help.c:840 sql_help.c:2606
+#: sql_help.c:854 sql_help.c:2643
 msgid "check_expression"
 msgstr "체크_표현식"
 
-#: sql_help.c:913 sql_help.c:915 sql_help.c:917 sql_help.c:2653
+#: sql_help.c:927 sql_help.c:929 sql_help.c:931 sql_help.c:2690
 msgid "publication_object"
 msgstr "발행_객체"
 
-#: sql_help.c:919 sql_help.c:2654
+#: sql_help.c:933 sql_help.c:2691
 msgid "publication_parameter"
 msgstr "발행_매개변수"
 
-#: sql_help.c:925 sql_help.c:2656
+#: sql_help.c:939 sql_help.c:2693
 msgid "where publication_object is one of:"
 msgstr "발행_객체 사용법:"
 
-#: sql_help.c:968 sql_help.c:1658 sql_help.c:2464 sql_help.c:2689
-#: sql_help.c:3256
+#: sql_help.c:982 sql_help.c:1681 sql_help.c:2501 sql_help.c:2726
+#: sql_help.c:3301
 msgid "password"
 msgstr "암호"
 
-#: sql_help.c:969 sql_help.c:1659 sql_help.c:2465 sql_help.c:2690
-#: sql_help.c:3257
+#: sql_help.c:983 sql_help.c:1682 sql_help.c:2502 sql_help.c:2727
+#: sql_help.c:3302
 msgid "timestamp"
 msgstr "타임스탬프"
 
-#: sql_help.c:973 sql_help.c:977 sql_help.c:980 sql_help.c:983 sql_help.c:1663
-#: sql_help.c:1667 sql_help.c:1670 sql_help.c:1673 sql_help.c:3923
-#: sql_help.c:4386
+#: sql_help.c:987 sql_help.c:991 sql_help.c:994 sql_help.c:997 sql_help.c:1686
+#: sql_help.c:1690 sql_help.c:1693 sql_help.c:1696 sql_help.c:3970
+#: sql_help.c:4437
 msgid "database_name"
 msgstr "데이터베이스_이름"
 
-#: sql_help.c:1089 sql_help.c:2757
+#: sql_help.c:1104 sql_help.c:2796
 msgid "increment"
 msgstr "증가값"
 
-#: sql_help.c:1090 sql_help.c:2758
+#: sql_help.c:1105 sql_help.c:2797
 msgid "minvalue"
 msgstr "최소값"
 
-#: sql_help.c:1091 sql_help.c:2759
+#: sql_help.c:1106 sql_help.c:2798
 msgid "maxvalue"
 msgstr "최대값"
 
-#: sql_help.c:1092 sql_help.c:2760 sql_help.c:4606 sql_help.c:4710
-#: sql_help.c:4864 sql_help.c:5040 sql_help.c:5109
+#: sql_help.c:1107 sql_help.c:2799 sql_help.c:4657 sql_help.c:4761
+#: sql_help.c:4915 sql_help.c:5093 sql_help.c:5162
 msgid "start"
 msgstr "시작"
 
-#: sql_help.c:1093 sql_help.c:1365
+#: sql_help.c:1108 sql_help.c:1382
 msgid "restart"
 msgstr "재시작"
 
-#: sql_help.c:1094 sql_help.c:2761
+#: sql_help.c:1109 sql_help.c:2800
 msgid "cache"
 msgstr "캐쉬"
 
-#: sql_help.c:1139
+#: sql_help.c:1154
 msgid "new_target"
 msgstr "새대상"
 
-#: sql_help.c:1158 sql_help.c:2814
+#: sql_help.c:1173 sql_help.c:2853
 msgid "conninfo"
 msgstr "접속정보"
 
-#: sql_help.c:1160 sql_help.c:1164 sql_help.c:1168 sql_help.c:2815
+#: sql_help.c:1175 sql_help.c:1179 sql_help.c:1183 sql_help.c:2854
 msgid "publication_name"
 msgstr "발행_이름"
 
-#: sql_help.c:1161 sql_help.c:1165 sql_help.c:1169
+#: sql_help.c:1176 sql_help.c:1180 sql_help.c:1184
 msgid "publication_option"
 msgstr "발행_옵션"
 
-#: sql_help.c:1172
+#: sql_help.c:1187
 msgid "refresh_option"
 msgstr "새로고침_옵션"
 
-#: sql_help.c:1177 sql_help.c:2816
+#: sql_help.c:1192 sql_help.c:2855
 msgid "subscription_parameter"
 msgstr "구독_매개변수"
 
-#: sql_help.c:1180
+#: sql_help.c:1195
 msgid "skip_option"
 msgstr "skip_option"
 
-#: sql_help.c:1340 sql_help.c:1343
+#: sql_help.c:1357 sql_help.c:1360
 msgid "partition_name"
 msgstr "파티션_이름"
 
-#: sql_help.c:1341 sql_help.c:2370 sql_help.c:2947
+#: sql_help.c:1358 sql_help.c:2405 sql_help.c:2987
 msgid "partition_bound_spec"
 msgstr "파티션_범위_정의"
 
-#: sql_help.c:1362 sql_help.c:1412 sql_help.c:2961
+#: sql_help.c:1379 sql_help.c:1430 sql_help.c:3001
 msgid "sequence_options"
 msgstr "시퀀스_옵션"
 
-#: sql_help.c:1364
+#: sql_help.c:1381
 msgid "sequence_option"
 msgstr "시퀀스_옵션"
 
-#: sql_help.c:1378
+#: sql_help.c:1395
 msgid "table_constraint_using_index"
 msgstr "색인을_사용하는_테이블_제약조건"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1406 sql_help.c:1407
 msgid "rewrite_rule_name"
 msgstr "rewrite_룰_이름"
 
-#: sql_help.c:1401 sql_help.c:2382 sql_help.c:2986
+#: sql_help.c:1419 sql_help.c:2419 sql_help.c:3031
 msgid "and partition_bound_spec is:"
 msgstr "파티션_범위_정의 사용법:"
 
-#: sql_help.c:1402 sql_help.c:1403 sql_help.c:1404 sql_help.c:2383
-#: sql_help.c:2384 sql_help.c:2385 sql_help.c:2987 sql_help.c:2988
-#: sql_help.c:2989
+#: sql_help.c:1420 sql_help.c:1421 sql_help.c:1422 sql_help.c:2420
+#: sql_help.c:2421 sql_help.c:2422 sql_help.c:3032 sql_help.c:3033
+#: sql_help.c:3034
 msgid "partition_bound_expr"
 msgstr "파티션_범위_표현식"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:2386 sql_help.c:2387
-#: sql_help.c:2990 sql_help.c:2991
+#: sql_help.c:1423 sql_help.c:1424 sql_help.c:2423 sql_help.c:2424
+#: sql_help.c:3035 sql_help.c:3036
 msgid "numeric_literal"
 msgstr "숫자"
 
-#: sql_help.c:1407
+#: sql_help.c:1425
 msgid "and column_constraint is:"
 msgstr "칼럼_제약조건 사용법:"
 
-#: sql_help.c:1410 sql_help.c:2377 sql_help.c:2418 sql_help.c:2627
-#: sql_help.c:2959
+#: sql_help.c:1428 sql_help.c:2412 sql_help.c:2455 sql_help.c:2664
+#: sql_help.c:2999
 msgid "default_expr"
 msgstr "초기값_표현식"
 
-#: sql_help.c:1411 sql_help.c:2378 sql_help.c:2960
+#: sql_help.c:1429 sql_help.c:2413 sql_help.c:3000
 msgid "generation_expr"
 msgstr "생성_표현식"
 
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1423 sql_help.c:1425
-#: sql_help.c:1429 sql_help.c:2962 sql_help.c:2963 sql_help.c:2972
-#: sql_help.c:2974 sql_help.c:2978
+#: sql_help.c:1431 sql_help.c:1432 sql_help.c:1443 sql_help.c:1446
+#: sql_help.c:1450 sql_help.c:3002 sql_help.c:3003 sql_help.c:3014
+#: sql_help.c:3017 sql_help.c:3021
 msgid "index_parameters"
 msgstr "색인_매개변수"
 
-#: sql_help.c:1415 sql_help.c:1432 sql_help.c:2964 sql_help.c:2981
+#: sql_help.c:1433 sql_help.c:1454 sql_help.c:3004 sql_help.c:3025
 msgid "reftable"
 msgstr "참조테이블"
 
-#: sql_help.c:1416 sql_help.c:1433 sql_help.c:2965 sql_help.c:2982
+#: sql_help.c:1434 sql_help.c:1455 sql_help.c:1456 sql_help.c:3005
+#: sql_help.c:3026 sql_help.c:3027
 msgid "refcolumn"
 msgstr "참조칼럼"
 
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1434 sql_help.c:1435
-#: sql_help.c:2966 sql_help.c:2967 sql_help.c:2983 sql_help.c:2984
+#: sql_help.c:1435 sql_help.c:1436 sql_help.c:1457 sql_help.c:1458
+#: sql_help.c:3006 sql_help.c:3007 sql_help.c:3028 sql_help.c:3029
 msgid "referential_action"
 msgstr "참조_방식"
 
-#: sql_help.c:1419 sql_help.c:2379 sql_help.c:2968
+#: sql_help.c:1437 sql_help.c:2414 sql_help.c:3008
 msgid "and table_constraint is:"
 msgstr "테이블_제약조건 사용법:"
 
-#: sql_help.c:1427 sql_help.c:2976
+#: sql_help.c:1448 sql_help.c:3019
 msgid "exclude_element"
 msgstr "exclude_요소"
 
-#: sql_help.c:1428 sql_help.c:2977 sql_help.c:4604 sql_help.c:4708
-#: sql_help.c:4862 sql_help.c:5038 sql_help.c:5107
+#: sql_help.c:1449 sql_help.c:3020 sql_help.c:4655 sql_help.c:4759
+#: sql_help.c:4913 sql_help.c:5091 sql_help.c:5160
 msgid "operator"
 msgstr "연산자"
 
-#: sql_help.c:1430 sql_help.c:2498 sql_help.c:2979
+#: sql_help.c:1451 sql_help.c:2535 sql_help.c:3022
 msgid "predicate"
 msgstr "범위한정구문"
 
-#: sql_help.c:1436
+#: sql_help.c:1459
 msgid "and table_constraint_using_index is:"
 msgstr "색인을_사용하는_테이블_제약조건 사용법:"
 
-#: sql_help.c:1439 sql_help.c:2992
+#: sql_help.c:1462 sql_help.c:3037
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "UNIQUE, PRIMARY KEY, EXCLUDE 제약조건에서 쓰는 색인_매개변수 사용법:"
 
-#: sql_help.c:1444 sql_help.c:2997
+#: sql_help.c:1467 sql_help.c:3042
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "EXCLUDE 제약조건에서 쓰는 exclude_요소 사용법:"
 
-#: sql_help.c:1448 sql_help.c:2491 sql_help.c:2924 sql_help.c:2937
-#: sql_help.c:2951 sql_help.c:3001 sql_help.c:4022
+#: sql_help.c:1471 sql_help.c:2528 sql_help.c:2964 sql_help.c:2977
+#: sql_help.c:2991 sql_help.c:3046 sql_help.c:4071
 msgid "opclass"
 msgstr "연산자클래스"
 
-#: sql_help.c:1449 sql_help.c:2492 sql_help.c:3002
+#: sql_help.c:1472 sql_help.c:2529 sql_help.c:3047
 msgid "opclass_parameter"
 msgstr "opclass_매개변수"
 
-#: sql_help.c:1451 sql_help.c:3004
+#: sql_help.c:1474 sql_help.c:3049
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "FOREIGN KEY/REFERENCES 제약조건에서 쓰는 참조_방식 사용법:"
 
-#: sql_help.c:1469 sql_help.c:1472 sql_help.c:3041
+#: sql_help.c:1492 sql_help.c:1495 sql_help.c:3086
 msgid "tablespace_option"
 msgstr "테이블스페이스_옵션"
 
-#: sql_help.c:1493 sql_help.c:1496 sql_help.c:1502 sql_help.c:1506
+#: sql_help.c:1516 sql_help.c:1519 sql_help.c:1525 sql_help.c:1529
 msgid "token_type"
 msgstr "토큰_종류"
 
-#: sql_help.c:1494 sql_help.c:1497
+#: sql_help.c:1517 sql_help.c:1520
 msgid "dictionary_name"
 msgstr "사전이름"
 
-#: sql_help.c:1499 sql_help.c:1503
+#: sql_help.c:1522 sql_help.c:1526
 msgid "old_dictionary"
 msgstr "옛사전"
 
-#: sql_help.c:1500 sql_help.c:1504
+#: sql_help.c:1523 sql_help.c:1527
 msgid "new_dictionary"
 msgstr "새사전"
 
-#: sql_help.c:1599 sql_help.c:1613 sql_help.c:1616 sql_help.c:1617
-#: sql_help.c:3194
+#: sql_help.c:1622 sql_help.c:1636 sql_help.c:1639 sql_help.c:1640
+#: sql_help.c:3239
 msgid "attribute_name"
 msgstr "속성이름"
 
-#: sql_help.c:1600
+#: sql_help.c:1623
 msgid "new_attribute_name"
 msgstr "새속성이름"
 
-#: sql_help.c:1604 sql_help.c:1608
+#: sql_help.c:1627 sql_help.c:1631
 msgid "new_enum_value"
 msgstr "새_enum_값"
 
-#: sql_help.c:1605
+#: sql_help.c:1628
 msgid "neighbor_enum_value"
 msgstr "옆_enum_값"
 
-#: sql_help.c:1607
+#: sql_help.c:1630
 msgid "existing_enum_value"
 msgstr "기존_enum_값"
 
-#: sql_help.c:1610
+#: sql_help.c:1633
 msgid "property"
 msgstr "속성"
 
-#: sql_help.c:1686 sql_help.c:2362 sql_help.c:2371 sql_help.c:2773
-#: sql_help.c:3274 sql_help.c:3725 sql_help.c:3932 sql_help.c:3978
-#: sql_help.c:4395
+#: sql_help.c:1709 sql_help.c:2397 sql_help.c:2406 sql_help.c:2812
+#: sql_help.c:3319 sql_help.c:3772 sql_help.c:3979 sql_help.c:4025
+#: sql_help.c:4446
 msgid "server_name"
 msgstr "서버이름"
 
-#: sql_help.c:1718 sql_help.c:1721 sql_help.c:3289
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:3334
 msgid "view_option_name"
 msgstr "뷰_옵션이름"
 
-#: sql_help.c:1719 sql_help.c:3290
+#: sql_help.c:1742 sql_help.c:3335
 msgid "view_option_value"
 msgstr "뷰_옵션_값"
 
-#: sql_help.c:1740 sql_help.c:5007
+#: sql_help.c:1763 sql_help.c:5060
 msgid "table_and_columns"
 msgstr "테이블과_칼럼"
 
-#: sql_help.c:1741 sql_help.c:1801 sql_help.c:1995 sql_help.c:3774
-#: sql_help.c:4230 sql_help.c:5008
+#: sql_help.c:1764 sql_help.c:1824 sql_help.c:2019 sql_help.c:3821
+#: sql_help.c:4281 sql_help.c:5061
 msgid "where option can be one of:"
 msgstr "옵션 사용법:"
 
-#: sql_help.c:1742 sql_help.c:1743 sql_help.c:1802 sql_help.c:1997
-#: sql_help.c:2001 sql_help.c:2183 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:3777 sql_help.c:3778 sql_help.c:3779 sql_help.c:3780
-#: sql_help.c:3781 sql_help.c:3782 sql_help.c:3783 sql_help.c:3784
-#: sql_help.c:4231 sql_help.c:4233 sql_help.c:5009 sql_help.c:5010
-#: sql_help.c:5011 sql_help.c:5012 sql_help.c:5013 sql_help.c:5014
-#: sql_help.c:5015 sql_help.c:5016 sql_help.c:5017 sql_help.c:5019
-#: sql_help.c:5020
+#: sql_help.c:1765 sql_help.c:1766 sql_help.c:1825 sql_help.c:2021
+#: sql_help.c:2025 sql_help.c:2208 sql_help.c:3822 sql_help.c:3823
+#: sql_help.c:3824 sql_help.c:3825 sql_help.c:3826 sql_help.c:3827
+#: sql_help.c:3828 sql_help.c:3829 sql_help.c:3830 sql_help.c:3831
+#: sql_help.c:4282 sql_help.c:4284 sql_help.c:5062 sql_help.c:5063
+#: sql_help.c:5064 sql_help.c:5065 sql_help.c:5066 sql_help.c:5067
+#: sql_help.c:5068 sql_help.c:5069 sql_help.c:5070 sql_help.c:5072
+#: sql_help.c:5073
 msgid "boolean"
 msgstr "불린"
 
-#: sql_help.c:1744 sql_help.c:5021
+#: sql_help.c:1767 sql_help.c:5074
 msgid "size"
 msgstr "크기"
 
-#: sql_help.c:1745 sql_help.c:5022
+#: sql_help.c:1768 sql_help.c:5075
 msgid "and table_and_columns is:"
 msgstr "테이블과_칼럼 사용법:"
 
-#: sql_help.c:1761 sql_help.c:4769 sql_help.c:4771 sql_help.c:4795
+#: sql_help.c:1784 sql_help.c:4820 sql_help.c:4822 sql_help.c:4846
 msgid "transaction_mode"
 msgstr "트랜잭션모드"
 
-#: sql_help.c:1762 sql_help.c:4772 sql_help.c:4796
+#: sql_help.c:1785 sql_help.c:4823 sql_help.c:4847
 msgid "where transaction_mode is one of:"
 msgstr "트랜잭션모드 사용법:"
 
-#: sql_help.c:1771 sql_help.c:4614 sql_help.c:4623 sql_help.c:4627
-#: sql_help.c:4631 sql_help.c:4634 sql_help.c:4872 sql_help.c:4881
-#: sql_help.c:4885 sql_help.c:4889 sql_help.c:4892 sql_help.c:5117
-#: sql_help.c:5126 sql_help.c:5130 sql_help.c:5134 sql_help.c:5137
+#: sql_help.c:1794 sql_help.c:4665 sql_help.c:4674 sql_help.c:4678
+#: sql_help.c:4682 sql_help.c:4685 sql_help.c:4923 sql_help.c:4932
+#: sql_help.c:4936 sql_help.c:4940 sql_help.c:4943 sql_help.c:5170
+#: sql_help.c:5179 sql_help.c:5183 sql_help.c:5187 sql_help.c:5190
 msgid "argument"
 msgstr "인자"
 
-#: sql_help.c:1867
+#: sql_help.c:1890
 msgid "relation_name"
 msgstr "릴레이션이름"
 
-#: sql_help.c:1872 sql_help.c:3926 sql_help.c:4389
+#: sql_help.c:1895 sql_help.c:3973 sql_help.c:4440
 msgid "domain_name"
 msgstr "도메인이름"
 
-#: sql_help.c:1894
+#: sql_help.c:1917
 msgid "policy_name"
 msgstr "정책이름"
 
-#: sql_help.c:1907
+#: sql_help.c:1930
 msgid "rule_name"
 msgstr "룰이름"
 
-#: sql_help.c:1926 sql_help.c:4528
+#: sql_help.c:1949 sql_help.c:4579
 msgid "string_literal"
 msgstr "문자열_리터럴"
 
-#: sql_help.c:1951 sql_help.c:4192 sql_help.c:4442
+#: sql_help.c:1974 sql_help.c:4243 sql_help.c:4493
 msgid "transaction_id"
 msgstr "트랜잭션_id"
 
-#: sql_help.c:1985 sql_help.c:1992 sql_help.c:4048
+#: sql_help.c:2009 sql_help.c:2016 sql_help.c:4097
 msgid "filename"
 msgstr "파일이름"
 
-#: sql_help.c:1986 sql_help.c:1993 sql_help.c:2712 sql_help.c:2713
-#: sql_help.c:2714
+#: sql_help.c:2010 sql_help.c:2017 sql_help.c:2749 sql_help.c:2750
+#: sql_help.c:2751
 msgid "command"
 msgstr "명령어"
 
-#: sql_help.c:1988 sql_help.c:2711 sql_help.c:3144 sql_help.c:3325
-#: sql_help.c:4032 sql_help.c:4115 sql_help.c:4118 sql_help.c:4121
-#: sql_help.c:4597 sql_help.c:4599 sql_help.c:4701 sql_help.c:4703
-#: sql_help.c:4855 sql_help.c:4857 sql_help.c:4974 sql_help.c:5100
-#: sql_help.c:5102
+#: sql_help.c:2012 sql_help.c:2748 sql_help.c:3189 sql_help.c:3371
+#: sql_help.c:4081 sql_help.c:4166 sql_help.c:4169 sql_help.c:4172
+#: sql_help.c:4648 sql_help.c:4650 sql_help.c:4752 sql_help.c:4754
+#: sql_help.c:4906 sql_help.c:4908 sql_help.c:5026 sql_help.c:5153
+#: sql_help.c:5155
 msgid "condition"
 msgstr "조건"
 
-#: sql_help.c:1991 sql_help.c:2532 sql_help.c:3027 sql_help.c:3291
-#: sql_help.c:3309 sql_help.c:4013
+#: sql_help.c:2015 sql_help.c:2569 sql_help.c:3072 sql_help.c:3336
+#: sql_help.c:3354 sql_help.c:4061
 msgid "query"
 msgstr "쿼리문"
 
-#: sql_help.c:1996
+#: sql_help.c:2020
 msgid "format_name"
 msgstr "입출력양식이름"
 
-#: sql_help.c:1998
+#: sql_help.c:2022
 msgid "delimiter_character"
 msgstr "구분문자"
 
-#: sql_help.c:1999
+#: sql_help.c:2023
 msgid "null_string"
 msgstr "널문자열"
 
-#: sql_help.c:2000
+#: sql_help.c:2024
 msgid "default_string"
 msgstr "기본_문자열"
 
-#: sql_help.c:2002
+#: sql_help.c:2026
 msgid "quote_character"
 msgstr "인용부호"
 
-#: sql_help.c:2003
+#: sql_help.c:2027
 msgid "escape_character"
 msgstr "이스케이프 문자"
 
-#: sql_help.c:2007
+#: sql_help.c:2031
 msgid "error_action"
 msgstr "오류_동작"
 
-#: sql_help.c:2008
+#: sql_help.c:2032
+msgid "maxerror"
+msgstr "최대오류"
+
+#: sql_help.c:2033
 msgid "encoding_name"
 msgstr "인코딩이름"
 
-#: sql_help.c:2009
+#: sql_help.c:2034
 msgid "verbosity"
 msgstr "로그출력수준"
 
-#: sql_help.c:2020
+#: sql_help.c:2045
 msgid "access_method_type"
 msgstr "접근_방법_종류"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2113
+#: sql_help.c:2116 sql_help.c:2135 sql_help.c:2138
 msgid "arg_data_type"
 msgstr "인자자료형"
 
-#: sql_help.c:2092 sql_help.c:2114 sql_help.c:2122
+#: sql_help.c:2117 sql_help.c:2139 sql_help.c:2147
 msgid "sfunc"
 msgstr "sfunc"
 
-#: sql_help.c:2093 sql_help.c:2115 sql_help.c:2123
+#: sql_help.c:2118 sql_help.c:2140 sql_help.c:2148
 msgid "state_data_type"
 msgstr "state_data_type"
 
-#: sql_help.c:2094 sql_help.c:2116 sql_help.c:2124
+#: sql_help.c:2119 sql_help.c:2141 sql_help.c:2149
 msgid "state_data_size"
 msgstr "state_data_size"
 
-#: sql_help.c:2095 sql_help.c:2117 sql_help.c:2125
+#: sql_help.c:2120 sql_help.c:2142 sql_help.c:2150
 msgid "ffunc"
 msgstr "ffunc"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2121 sql_help.c:2151
 msgid "combinefunc"
 msgstr "combinefunc"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2122 sql_help.c:2152
 msgid "serialfunc"
 msgstr "serialfunc"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2123 sql_help.c:2153
 msgid "deserialfunc"
 msgstr "deserialfunc"
 
-#: sql_help.c:2099 sql_help.c:2118 sql_help.c:2129
+#: sql_help.c:2124 sql_help.c:2143 sql_help.c:2154
 msgid "initial_condition"
 msgstr "initial_condition"
 
-#: sql_help.c:2100 sql_help.c:2130
+#: sql_help.c:2125 sql_help.c:2155
 msgid "msfunc"
 msgstr "msfunc"
 
-#: sql_help.c:2101 sql_help.c:2131
+#: sql_help.c:2126 sql_help.c:2156
 msgid "minvfunc"
 msgstr "minvfunc"
 
-#: sql_help.c:2102 sql_help.c:2132
+#: sql_help.c:2127 sql_help.c:2157
 msgid "mstate_data_type"
 msgstr "mstate_data_type"
 
-#: sql_help.c:2103 sql_help.c:2133
+#: sql_help.c:2128 sql_help.c:2158
 msgid "mstate_data_size"
 msgstr "mstate_data_size"
 
-#: sql_help.c:2104 sql_help.c:2134
+#: sql_help.c:2129 sql_help.c:2159
 msgid "mffunc"
 msgstr "mffunc"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2130 sql_help.c:2160
 msgid "minitial_condition"
 msgstr "minitial_condition"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2131 sql_help.c:2161
 msgid "sort_operator"
 msgstr "정렬연산자"
 
-#: sql_help.c:2119
+#: sql_help.c:2144
 msgid "or the old syntax"
 msgstr "또는 옛날 구문"
 
-#: sql_help.c:2121
+#: sql_help.c:2146
 msgid "base_type"
 msgstr "기본자료형"
 
-#: sql_help.c:2179 sql_help.c:2229
+#: sql_help.c:2204 sql_help.c:2254
 msgid "locale"
 msgstr "로케일"
 
-#: sql_help.c:2180 sql_help.c:2230
+#: sql_help.c:2205 sql_help.c:2255
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2181 sql_help.c:2231
+#: sql_help.c:2206 sql_help.c:2256
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2182 sql_help.c:4495
+#: sql_help.c:2207 sql_help.c:4546
 msgid "provider"
 msgstr "제공자"
 
-#: sql_help.c:2184
+#: sql_help.c:2209
 msgid "rules"
 msgstr "룰"
 
-#: sql_help.c:2185 sql_help.c:2292
+#: sql_help.c:2210 sql_help.c:2317
 msgid "version"
 msgstr "버전"
 
-#: sql_help.c:2187
+#: sql_help.c:2212
 msgid "existing_collation"
 msgstr "기존_collation"
 
-#: sql_help.c:2197
+#: sql_help.c:2222
 msgid "source_encoding"
 msgstr "원래인코딩"
 
-#: sql_help.c:2198
+#: sql_help.c:2223
 msgid "dest_encoding"
 msgstr "대상인코딩"
 
-#: sql_help.c:2226 sql_help.c:3067
+#: sql_help.c:2251 sql_help.c:3112
 msgid "template"
 msgstr "템플릿"
 
-#: sql_help.c:2227
+#: sql_help.c:2252
 msgid "encoding"
 msgstr "인코딩"
 
-#: sql_help.c:2228
+#: sql_help.c:2253
 msgid "strategy"
 msgstr "전략번호"
 
-#: sql_help.c:2232
+#: sql_help.c:2257
 msgid "builtin_locale"
 msgstr "내장_로케일"
 
-#: sql_help.c:2233
+#: sql_help.c:2258
 msgid "icu_locale"
 msgstr "icu_로케일"
 
-#: sql_help.c:2234
+#: sql_help.c:2259
 msgid "icu_rules"
 msgstr "icu_룰"
 
-#: sql_help.c:2235
+#: sql_help.c:2260
 msgid "locale_provider"
 msgstr "로케일_제공자"
 
-#: sql_help.c:2236
+#: sql_help.c:2261
 msgid "collation_version"
 msgstr "collation_version"
 
-#: sql_help.c:2241
+#: sql_help.c:2266
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2276 sql_help.c:2709 sql_help.c:3140
+#: sql_help.c:2301 sql_help.c:2746 sql_help.c:3185
 msgid "event"
 msgstr "이벤트"
 
-#: sql_help.c:2277
+#: sql_help.c:2302
 msgid "filter_variable"
 msgstr "필터_변수"
 
-#: sql_help.c:2278
+#: sql_help.c:2303
 msgid "filter_value"
 msgstr "필터_값"
 
-#: sql_help.c:2374 sql_help.c:2956
+#: sql_help.c:2394 sql_help.c:2958
+msgid "source_table"
+msgstr "원본테이블"
+
+#: sql_help.c:2395 sql_help.c:2959
+msgid "like_option"
+msgstr "LIKE구문옵션"
+
+#: sql_help.c:2409 sql_help.c:2996
 msgid "where column_constraint is:"
 msgstr "칼럼_제약조건 사용법:"
 
-#: sql_help.c:2419
+#: sql_help.c:2418 sql_help.c:3030
+msgid "and like_option is:"
+msgstr "LIKE구문옵션 사용법:"
+
+#: sql_help.c:2456
 msgid "rettype"
 msgstr "rettype"
 
-#: sql_help.c:2421
+#: sql_help.c:2458
 msgid "column_type"
 msgstr "칼럼_자료형"
 
-#: sql_help.c:2430 sql_help.c:2633
+#: sql_help.c:2467 sql_help.c:2670
 msgid "definition"
 msgstr "함수정의"
 
-#: sql_help.c:2431 sql_help.c:2634
+#: sql_help.c:2468 sql_help.c:2671
 msgid "obj_file"
 msgstr "오브젝트파일"
 
-#: sql_help.c:2432 sql_help.c:2635
+#: sql_help.c:2469 sql_help.c:2672
 msgid "link_symbol"
 msgstr "연결할_함수명"
 
-#: sql_help.c:2433 sql_help.c:2636
+#: sql_help.c:2470 sql_help.c:2673
 msgid "sql_body"
 msgstr "sql_본문"
 
-#: sql_help.c:2471 sql_help.c:2694 sql_help.c:3263
+#: sql_help.c:2508 sql_help.c:2731 sql_help.c:3308
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2487 sql_help.c:2528 sql_help.c:2925 sql_help.c:2938
-#: sql_help.c:2952 sql_help.c:3023
+#: sql_help.c:2524 sql_help.c:2565 sql_help.c:2965 sql_help.c:2978
+#: sql_help.c:2992 sql_help.c:3068
 msgid "method"
 msgstr "색인방법"
 
-#: sql_help.c:2509
+#: sql_help.c:2546
 msgid "call_handler"
 msgstr "호출_핸들러"
 
-#: sql_help.c:2510
+#: sql_help.c:2547
 msgid "inline_handler"
 msgstr "인라인_핸들러"
 
-#: sql_help.c:2511
+#: sql_help.c:2548
 msgid "valfunction"
 msgstr "구문검사함수"
 
-#: sql_help.c:2569
+#: sql_help.c:2606
 msgid "family_name"
 msgstr "family_name"
 
-#: sql_help.c:2580
+#: sql_help.c:2617
 msgid "storage_type"
 msgstr "스토리지_유형"
 
-#: sql_help.c:2715 sql_help.c:3147
+#: sql_help.c:2752 sql_help.c:3192
 msgid "where event can be one of:"
 msgstr "이벤트 사용법:"
 
-#: sql_help.c:2735 sql_help.c:2737
+#: sql_help.c:2772 sql_help.c:2774
 msgid "schema_element"
 msgstr "스키마_요소"
 
-#: sql_help.c:2774
+#: sql_help.c:2813
 msgid "server_type"
 msgstr "서버_종류"
 
-#: sql_help.c:2775
+#: sql_help.c:2814
 msgid "server_version"
 msgstr "서버_버전"
 
-#: sql_help.c:2776 sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:2815 sql_help.c:3976 sql_help.c:4443
 msgid "fdw_name"
 msgstr "fdw_이름"
 
-#: sql_help.c:2793 sql_help.c:2796
+#: sql_help.c:2832 sql_help.c:2835
 msgid "statistics_name"
 msgstr "통계정보_이름"
 
-#: sql_help.c:2797
+#: sql_help.c:2836
 msgid "statistics_kind"
 msgstr "통계정보_종류"
 
-#: sql_help.c:2813
+#: sql_help.c:2852
 msgid "subscription_name"
 msgstr "구독_이름"
 
-#: sql_help.c:2918
-msgid "source_table"
-msgstr "원본테이블"
-
-#: sql_help.c:2919
-msgid "like_option"
-msgstr "LIKE구문옵션"
-
-#: sql_help.c:2985
-msgid "and like_option is:"
-msgstr "LIKE구문옵션 사용법:"
-
-#: sql_help.c:3040
+#: sql_help.c:3085
 msgid "directory"
 msgstr "디렉터리"
 
-#: sql_help.c:3054
+#: sql_help.c:3099
 msgid "parser_name"
 msgstr "구문분석기_이름"
 
-#: sql_help.c:3055
+#: sql_help.c:3100
 msgid "source_config"
 msgstr "원본_설정"
 
-#: sql_help.c:3084
+#: sql_help.c:3129
 msgid "start_function"
 msgstr "시작_함수"
 
-#: sql_help.c:3085
+#: sql_help.c:3130
 msgid "gettoken_function"
 msgstr "gettoken함수"
 
-#: sql_help.c:3086
+#: sql_help.c:3131
 msgid "end_function"
 msgstr "종료_함수"
 
-#: sql_help.c:3087
+#: sql_help.c:3132
 msgid "lextypes_function"
 msgstr "lextypes함수"
 
-#: sql_help.c:3088
+#: sql_help.c:3133
 msgid "headline_function"
 msgstr "headline함수"
 
-#: sql_help.c:3100
+#: sql_help.c:3145
 msgid "init_function"
 msgstr "init함수"
 
-#: sql_help.c:3101
+#: sql_help.c:3146
 msgid "lexize_function"
 msgstr "lexize함수"
 
-#: sql_help.c:3114
+#: sql_help.c:3159
 msgid "from_sql_function_name"
 msgstr "sql에서_언어로_바꿀때쓸_함수이름"
 
-#: sql_help.c:3116
+#: sql_help.c:3161
 msgid "to_sql_function_name"
 msgstr "언어에서_sql로_바꿀때쓸_함수이름"
 
-#: sql_help.c:3142
+#: sql_help.c:3187
 msgid "referenced_table_name"
 msgstr "참조된_테이블_이름"
 
-#: sql_help.c:3143
+#: sql_help.c:3188
 msgid "transition_relation_name"
 msgstr "전달_릴레이션_이름"
 
-#: sql_help.c:3146
+#: sql_help.c:3191
 msgid "arguments"
 msgstr "인자들"
 
-#: sql_help.c:3198
+#: sql_help.c:3243
 msgid "label"
 msgstr "enum요소"
 
-#: sql_help.c:3200
+#: sql_help.c:3245
 msgid "subtype"
 msgstr "subtype"
 
-#: sql_help.c:3201
+#: sql_help.c:3246
 msgid "subtype_operator_class"
 msgstr "subtype_operator_class"
 
-#: sql_help.c:3203
+#: sql_help.c:3248
 msgid "canonical_function"
 msgstr "canonical_function"
 
-#: sql_help.c:3204
+#: sql_help.c:3249
 msgid "subtype_diff_function"
 msgstr "subtype_diff_function"
 
-#: sql_help.c:3205
+#: sql_help.c:3250
 msgid "multirange_type_name"
 msgstr "다중범위_자료형_이름"
 
-#: sql_help.c:3207
+#: sql_help.c:3252
 msgid "input_function"
 msgstr "입력함수"
 
-#: sql_help.c:3208
+#: sql_help.c:3253
 msgid "output_function"
 msgstr "출력함수"
 
-#: sql_help.c:3209
+#: sql_help.c:3254
 msgid "receive_function"
 msgstr "받는함수"
 
-#: sql_help.c:3210
+#: sql_help.c:3255
 msgid "send_function"
 msgstr "주는함수"
 
-#: sql_help.c:3211
+#: sql_help.c:3256
 msgid "type_modifier_input_function"
 msgstr "type_modifier_input_function"
 
-#: sql_help.c:3212
+#: sql_help.c:3257
 msgid "type_modifier_output_function"
 msgstr "type_modifier_output_function"
 
-#: sql_help.c:3213
+#: sql_help.c:3258
 msgid "analyze_function"
 msgstr "분석함수"
 
-#: sql_help.c:3214
+#: sql_help.c:3259
 msgid "subscript_function"
 msgstr "구독_함수"
 
-#: sql_help.c:3215
+#: sql_help.c:3260
 msgid "internallength"
 msgstr "내부길이"
 
-#: sql_help.c:3216
+#: sql_help.c:3261
 msgid "alignment"
 msgstr "정렬"
 
-#: sql_help.c:3217
+#: sql_help.c:3262
 msgid "storage"
 msgstr "스토리지"
 
-#: sql_help.c:3218
+#: sql_help.c:3263
 msgid "like_type"
 msgstr "like_type"
 
-#: sql_help.c:3219
+#: sql_help.c:3264
 msgid "category"
 msgstr "category"
 
-#: sql_help.c:3220
+#: sql_help.c:3265
 msgid "preferred"
 msgstr "preferred"
 
-#: sql_help.c:3221
+#: sql_help.c:3266
 msgid "default"
 msgstr "기본값"
 
-#: sql_help.c:3222
+#: sql_help.c:3267
 msgid "element"
 msgstr "요소"
 
-#: sql_help.c:3223
+#: sql_help.c:3268
 msgid "delimiter"
 msgstr "구분자"
 
-#: sql_help.c:3224
+#: sql_help.c:3269
 msgid "collatable"
 msgstr "collatable"
 
-#: sql_help.c:3321 sql_help.c:4008 sql_help.c:4102 sql_help.c:4592
-#: sql_help.c:4695 sql_help.c:4850 sql_help.c:4964 sql_help.c:5095
+#: sql_help.c:3367 sql_help.c:4056 sql_help.c:4152 sql_help.c:4643
+#: sql_help.c:4746 sql_help.c:4901 sql_help.c:5016 sql_help.c:5148
 msgid "with_query"
 msgstr "with절_쿼리"
 
-#: sql_help.c:3323 sql_help.c:4010 sql_help.c:4611 sql_help.c:4617
-#: sql_help.c:4620 sql_help.c:4624 sql_help.c:4628 sql_help.c:4636
-#: sql_help.c:4869 sql_help.c:4875 sql_help.c:4878 sql_help.c:4882
-#: sql_help.c:4886 sql_help.c:4894 sql_help.c:4966 sql_help.c:5114
-#: sql_help.c:5120 sql_help.c:5123 sql_help.c:5127 sql_help.c:5131
-#: sql_help.c:5139
+#: sql_help.c:3369 sql_help.c:4058 sql_help.c:4662 sql_help.c:4668
+#: sql_help.c:4671 sql_help.c:4675 sql_help.c:4679 sql_help.c:4687
+#: sql_help.c:4920 sql_help.c:4926 sql_help.c:4929 sql_help.c:4933
+#: sql_help.c:4937 sql_help.c:4945 sql_help.c:5018 sql_help.c:5167
+#: sql_help.c:5173 sql_help.c:5176 sql_help.c:5180 sql_help.c:5184
+#: sql_help.c:5192
 msgid "alias"
 msgstr "별칭"
 
-#: sql_help.c:3324 sql_help.c:4596 sql_help.c:4638 sql_help.c:4640
-#: sql_help.c:4644 sql_help.c:4646 sql_help.c:4647 sql_help.c:4648
-#: sql_help.c:4700 sql_help.c:4854 sql_help.c:4896 sql_help.c:4898
-#: sql_help.c:4902 sql_help.c:4904 sql_help.c:4905 sql_help.c:4906
-#: sql_help.c:4973 sql_help.c:5099 sql_help.c:5141 sql_help.c:5143
-#: sql_help.c:5147 sql_help.c:5149 sql_help.c:5150 sql_help.c:5151
+#: sql_help.c:3370 sql_help.c:4647 sql_help.c:4689 sql_help.c:4691
+#: sql_help.c:4695 sql_help.c:4697 sql_help.c:4698 sql_help.c:4699
+#: sql_help.c:4751 sql_help.c:4905 sql_help.c:4947 sql_help.c:4949
+#: sql_help.c:4953 sql_help.c:4955 sql_help.c:4956 sql_help.c:4957
+#: sql_help.c:5025 sql_help.c:5152 sql_help.c:5194 sql_help.c:5196
+#: sql_help.c:5200 sql_help.c:5202 sql_help.c:5203 sql_help.c:5204
 msgid "from_item"
 msgstr "from절_항목"
 
-#: sql_help.c:3326 sql_help.c:3810 sql_help.c:4159 sql_help.c:4975
+#: sql_help.c:3372 sql_help.c:3857 sql_help.c:4210 sql_help.c:5027
 msgid "cursor_name"
 msgstr "커서이름"
 
-#: sql_help.c:3327 sql_help.c:4016 sql_help.c:4108 sql_help.c:4976
+#: sql_help.c:3373 sql_help.c:4064 sql_help.c:4158 sql_help.c:5028
+msgid "output_alias"
+msgstr "출력_별칭"
+
+#: sql_help.c:3374 sql_help.c:4065 sql_help.c:4159 sql_help.c:5029
 msgid "output_expression"
 msgstr "출력표현식"
 
-#: sql_help.c:3328 sql_help.c:4017 sql_help.c:4109 sql_help.c:4595
-#: sql_help.c:4698 sql_help.c:4853 sql_help.c:4977 sql_help.c:5098
+#: sql_help.c:3375 sql_help.c:4066 sql_help.c:4160 sql_help.c:4646
+#: sql_help.c:4749 sql_help.c:4904 sql_help.c:5030 sql_help.c:5151
 msgid "output_name"
 msgstr "출력_이름"
 
-#: sql_help.c:3344
+#: sql_help.c:3391
 msgid "code"
 msgstr "코드"
 
-#: sql_help.c:3749
+#: sql_help.c:3796
 msgid "parameter"
 msgstr "매개변수"
 
-#: sql_help.c:3773 sql_help.c:4184
+#: sql_help.c:3820 sql_help.c:4235
 msgid "statement"
 msgstr "명령구문"
 
-#: sql_help.c:3809 sql_help.c:4158
+#: sql_help.c:3856 sql_help.c:4209
 msgid "direction"
 msgstr "방향"
 
-#: sql_help.c:3811 sql_help.c:4160
+#: sql_help.c:3858 sql_help.c:4211
 msgid "where direction can be one of:"
 msgstr "방향 사용법:"
 
-#: sql_help.c:3812 sql_help.c:3813 sql_help.c:3814 sql_help.c:3815
-#: sql_help.c:3816 sql_help.c:4161 sql_help.c:4162 sql_help.c:4163
-#: sql_help.c:4164 sql_help.c:4165 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4709 sql_help.c:4711 sql_help.c:4863 sql_help.c:4865
-#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5108 sql_help.c:5110
+#: sql_help.c:3859 sql_help.c:3860 sql_help.c:3861 sql_help.c:3862
+#: sql_help.c:3863 sql_help.c:4212 sql_help.c:4213 sql_help.c:4214
+#: sql_help.c:4215 sql_help.c:4216 sql_help.c:4656 sql_help.c:4658
+#: sql_help.c:4760 sql_help.c:4762 sql_help.c:4914 sql_help.c:4916
+#: sql_help.c:5092 sql_help.c:5094 sql_help.c:5161 sql_help.c:5163
 msgid "count"
 msgstr "출력개수"
 
-#: sql_help.c:3919 sql_help.c:4382
+#: sql_help.c:3966 sql_help.c:4433
 msgid "sequence_name"
 msgstr "시퀀스이름"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:3984 sql_help.c:4451
 msgid "arg_name"
 msgstr "인자이름"
 
-#: sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:3985 sql_help.c:4452
 msgid "arg_type"
 msgstr "인자자료형"
 
-#: sql_help.c:3945 sql_help.c:4408
+#: sql_help.c:3992 sql_help.c:4459
 msgid "loid"
 msgstr "큰개체_oid"
 
-#: sql_help.c:3976
+#: sql_help.c:4023
 msgid "remote_schema"
 msgstr "원격_스키마"
 
-#: sql_help.c:3979
+#: sql_help.c:4026
 msgid "local_schema"
 msgstr "로컬_스키마"
 
-#: sql_help.c:4014
+#: sql_help.c:4062
 msgid "conflict_target"
 msgstr "충돌_대상"
 
-#: sql_help.c:4015
+#: sql_help.c:4063
 msgid "conflict_action"
 msgstr "충돌_작업"
 
-#: sql_help.c:4018
+#: sql_help.c:4067
 msgid "where conflict_target can be one of:"
 msgstr "충돌_대상 사용법:"
 
-#: sql_help.c:4019
+#: sql_help.c:4068
 msgid "index_column_name"
 msgstr "인덱스칼럼이름"
 
-#: sql_help.c:4020
+#: sql_help.c:4069
 msgid "index_expression"
 msgstr "인덱스표현식"
 
-#: sql_help.c:4023
+#: sql_help.c:4072
 msgid "index_predicate"
 msgstr "부분인덱스식"
 
-#: sql_help.c:4025
+#: sql_help.c:4074
 msgid "and conflict_action is one of:"
 msgstr "충돌_작업 사용법:"
 
-#: sql_help.c:4031 sql_help.c:4132 sql_help.c:4972
+#: sql_help.c:4080 sql_help.c:4183 sql_help.c:5024
 msgid "sub-SELECT"
 msgstr "서브셀렉트"
 
-#: sql_help.c:4040 sql_help.c:4173 sql_help.c:4948
+#: sql_help.c:4089 sql_help.c:4224 sql_help.c:4999
 msgid "channel"
 msgstr "채널"
 
-#: sql_help.c:4062
+#: sql_help.c:4111
 msgid "lockmode"
 msgstr "잠금모드"
 
-#: sql_help.c:4063
+#: sql_help.c:4112
 msgid "where lockmode is one of:"
 msgstr "잠금모드 사용법:"
 
-#: sql_help.c:4103
+#: sql_help.c:4153
 msgid "target_table_name"
 msgstr "대상_테이블_이름"
 
-#: sql_help.c:4104
+#: sql_help.c:4154
 msgid "target_alias"
 msgstr "대상_별칭"
 
-#: sql_help.c:4105
+#: sql_help.c:4155
 msgid "data_source"
 msgstr "데이터_소스"
 
-#: sql_help.c:4106 sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4156 sql_help.c:4692 sql_help.c:4950 sql_help.c:5197
 msgid "join_condition"
 msgstr "조인_조건"
 
-#: sql_help.c:4107
+#: sql_help.c:4157
 msgid "when_clause"
 msgstr "when절"
 
-#: sql_help.c:4110
+#: sql_help.c:4161
 msgid "where data_source is:"
 msgstr "데이터_소스 사용법:"
 
-#: sql_help.c:4111
+#: sql_help.c:4162
 msgid "source_table_name"
 msgstr "원본_테이블_이름"
 
-#: sql_help.c:4112
+#: sql_help.c:4163
 msgid "source_query"
 msgstr "소스_쿼리"
 
-#: sql_help.c:4113
+#: sql_help.c:4164
 msgid "source_alias"
 msgstr "소스_별칭"
 
-#: sql_help.c:4114
+#: sql_help.c:4165
 msgid "and when_clause is:"
 msgstr "when절 사용법:"
 
-#: sql_help.c:4116 sql_help.c:4119
+#: sql_help.c:4167 sql_help.c:4170
 msgid "merge_update"
 msgstr "merge_update"
 
-#: sql_help.c:4117 sql_help.c:4120
+#: sql_help.c:4168 sql_help.c:4171
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4122
+#: sql_help.c:4173
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4123
+#: sql_help.c:4174
 msgid "and merge_insert is:"
 msgstr "merge_insert 사용법:"
 
-#: sql_help.c:4126
+#: sql_help.c:4177
 msgid "and merge_update is:"
 msgstr "merge_update 사용법:"
 
-#: sql_help.c:4133
+#: sql_help.c:4184
 msgid "and merge_delete is:"
 msgstr "merge_delete 사용법:"
 
-#: sql_help.c:4174
+#: sql_help.c:4225
 msgid "payload"
 msgstr "payload"
 
-#: sql_help.c:4201
+#: sql_help.c:4252
 msgid "old_role"
 msgstr "기존롤"
 
-#: sql_help.c:4202
+#: sql_help.c:4253
 msgid "new_role"
 msgstr "새롤"
 
-#: sql_help.c:4241 sql_help.c:4450 sql_help.c:4458
+#: sql_help.c:4292 sql_help.c:4501 sql_help.c:4509
 msgid "savepoint_name"
 msgstr "savepoint_name"
 
-#: sql_help.c:4598 sql_help.c:4656 sql_help.c:4856 sql_help.c:4914
-#: sql_help.c:5101 sql_help.c:5159
+#: sql_help.c:4649 sql_help.c:4707 sql_help.c:4907 sql_help.c:4965
+#: sql_help.c:5154 sql_help.c:5212
 msgid "grouping_element"
 msgstr "grouping_element"
 
-#: sql_help.c:4600 sql_help.c:4704 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4651 sql_help.c:4755 sql_help.c:4909 sql_help.c:5156
 msgid "window_name"
 msgstr "윈도우이름"
 
-#: sql_help.c:4601 sql_help.c:4705 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4652 sql_help.c:4756 sql_help.c:4910 sql_help.c:5157
 msgid "window_definition"
 msgstr "원도우정의"
 
-#: sql_help.c:4602 sql_help.c:4616 sql_help.c:4660 sql_help.c:4706
-#: sql_help.c:4860 sql_help.c:4874 sql_help.c:4918 sql_help.c:5105
-#: sql_help.c:5119 sql_help.c:5163
+#: sql_help.c:4653 sql_help.c:4667 sql_help.c:4711 sql_help.c:4757
+#: sql_help.c:4911 sql_help.c:4925 sql_help.c:4969 sql_help.c:5158
+#: sql_help.c:5172 sql_help.c:5216
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:4608 sql_help.c:4866 sql_help.c:5111
+#: sql_help.c:4659 sql_help.c:4917 sql_help.c:5164
 msgid "from_reference"
 msgstr "from_reference"
 
-#: sql_help.c:4609 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4660 sql_help.c:4918 sql_help.c:5165
 msgid "where from_item can be one of:"
 msgstr "from절_항목 사용법:"
 
-#: sql_help.c:4612 sql_help.c:4618 sql_help.c:4621 sql_help.c:4625
-#: sql_help.c:4637 sql_help.c:4870 sql_help.c:4876 sql_help.c:4879
-#: sql_help.c:4883 sql_help.c:4895 sql_help.c:5115 sql_help.c:5121
-#: sql_help.c:5124 sql_help.c:5128 sql_help.c:5140
+#: sql_help.c:4663 sql_help.c:4669 sql_help.c:4672 sql_help.c:4676
+#: sql_help.c:4688 sql_help.c:4921 sql_help.c:4927 sql_help.c:4930
+#: sql_help.c:4934 sql_help.c:4946 sql_help.c:5168 sql_help.c:5174
+#: sql_help.c:5177 sql_help.c:5181 sql_help.c:5193
 msgid "column_alias"
 msgstr "칼럼별칭"
 
-#: sql_help.c:4613 sql_help.c:4871 sql_help.c:5116
+#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5169
 msgid "sampling_method"
 msgstr "표본추출방법"
 
-#: sql_help.c:4615 sql_help.c:4873 sql_help.c:5118
+#: sql_help.c:4666 sql_help.c:4924 sql_help.c:5171
 msgid "seed"
 msgstr "seed"
 
-#: sql_help.c:4619 sql_help.c:4658 sql_help.c:4877 sql_help.c:4916
-#: sql_help.c:5122 sql_help.c:5161
+#: sql_help.c:4670 sql_help.c:4709 sql_help.c:4928 sql_help.c:4967
+#: sql_help.c:5175 sql_help.c:5214
 msgid "with_query_name"
 msgstr "with절_쿼리_이름"
 
-#: sql_help.c:4629 sql_help.c:4632 sql_help.c:4635 sql_help.c:4887
-#: sql_help.c:4890 sql_help.c:4893 sql_help.c:5132 sql_help.c:5135
-#: sql_help.c:5138
+#: sql_help.c:4680 sql_help.c:4683 sql_help.c:4686 sql_help.c:4938
+#: sql_help.c:4941 sql_help.c:4944 sql_help.c:5185 sql_help.c:5188
+#: sql_help.c:5191
 msgid "column_definition"
 msgstr "칼럼정의"
 
-#: sql_help.c:4639 sql_help.c:4645 sql_help.c:4897 sql_help.c:4903
-#: sql_help.c:5142 sql_help.c:5148
+#: sql_help.c:4690 sql_help.c:4696 sql_help.c:4948 sql_help.c:4954
+#: sql_help.c:5195 sql_help.c:5201
 msgid "join_type"
 msgstr "조인_종류"
 
-#: sql_help.c:4642 sql_help.c:4900 sql_help.c:5145
+#: sql_help.c:4693 sql_help.c:4951 sql_help.c:5198
 msgid "join_column"
 msgstr "조인_칼럼"
 
-#: sql_help.c:4643 sql_help.c:4901 sql_help.c:5146
+#: sql_help.c:4694 sql_help.c:4952 sql_help.c:5199
 msgid "join_using_alias"
 msgstr "조인_별칭"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4700 sql_help.c:4958 sql_help.c:5205
 msgid "and grouping_element can be one of:"
 msgstr "grouping_element 사용법:"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4708 sql_help.c:4966 sql_help.c:5213
 msgid "and with_query is:"
 msgstr "with절_쿼리 사용법:"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "values"
 msgstr "값"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4715 sql_help.c:4973 sql_help.c:5220
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4665 sql_help.c:4923 sql_help.c:5168
+#: sql_help.c:4716 sql_help.c:4974 sql_help.c:5221
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4667 sql_help.c:4925 sql_help.c:5170
+#: sql_help.c:4718 sql_help.c:4976 sql_help.c:5223
 msgid "search_seq_col_name"
 msgstr "search_seq_col_name"
 
-#: sql_help.c:4669 sql_help.c:4927 sql_help.c:5172
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "cycle_mark_col_name"
 msgstr "cycle_mark_col_name"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4721 sql_help.c:4979 sql_help.c:5226
 msgid "cycle_mark_value"
 msgstr "cycle_mark_value"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4722 sql_help.c:4980 sql_help.c:5227
 msgid "cycle_mark_default"
 msgstr "cycle_mark_default"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4723 sql_help.c:4981 sql_help.c:5228
 msgid "cycle_path_col_name"
 msgstr "cycle_path_col_name"
 
-#: sql_help.c:4699
+#: sql_help.c:4750
 msgid "new_table"
 msgstr "새테이블"
 
-#: sql_help.c:4770
+#: sql_help.c:4821
 msgid "snapshot_id"
 msgstr "스냅샷_id"
 
-#: sql_help.c:5037
+#: sql_help.c:5090
 msgid "sort_expression"
 msgstr "정렬_표현식"
 
-#: sql_help.c:5182 sql_help.c:6166
+#: sql_help.c:5235 sql_help.c:6219
 msgid "abort the current transaction"
 msgstr "현재 트랜잭션 중지함"
 
-#: sql_help.c:5188
+#: sql_help.c:5241
 msgid "change the definition of an aggregate function"
 msgstr "집계함수 정보 바꾸기"
 
-#: sql_help.c:5194
+#: sql_help.c:5247
 msgid "change the definition of a collation"
 msgstr "collation 정의 바꾸기"
 
-#: sql_help.c:5200
+#: sql_help.c:5253
 msgid "change the definition of a conversion"
 msgstr "문자코드 변환규칙(conversion) 정보 바꾸기"
 
-#: sql_help.c:5206
+#: sql_help.c:5259
 msgid "change a database"
 msgstr "데이터베이스 변경"
 
-#: sql_help.c:5212
+#: sql_help.c:5265
 msgid "define default access privileges"
 msgstr "기본 접근 권한 정의"
 
-#: sql_help.c:5218
+#: sql_help.c:5271
 msgid "change the definition of a domain"
 msgstr "도메인 정보 바꾸기"
 
-#: sql_help.c:5224
+#: sql_help.c:5277
 msgid "change the definition of an event trigger"
 msgstr "트리거 정보 바꾸기"
 
-#: sql_help.c:5230
+#: sql_help.c:5283
 msgid "change the definition of an extension"
 msgstr "확장모듈 정의 바꾸기"
 
-#: sql_help.c:5236
+#: sql_help.c:5289
 msgid "change the definition of a foreign-data wrapper"
 msgstr "외부 데이터 래퍼 정의 바꾸기"
 
-#: sql_help.c:5242
+#: sql_help.c:5295
 msgid "change the definition of a foreign table"
 msgstr "외부 테이블 정의 바꾸기"
 
-#: sql_help.c:5248
+#: sql_help.c:5301
 msgid "change the definition of a function"
 msgstr "함수 정보 바꾸기"
 
-#: sql_help.c:5254
+#: sql_help.c:5307
 msgid "change role name or membership"
 msgstr "롤 이름이나 맴버쉽 바꾸기"
 
-#: sql_help.c:5260
+#: sql_help.c:5313
 msgid "change the definition of an index"
 msgstr "인덱스 정의 바꾸기"
 
-#: sql_help.c:5266
+#: sql_help.c:5319
 msgid "change the definition of a procedural language"
 msgstr "procedural language 정보 바꾸기"
 
-#: sql_help.c:5272
+#: sql_help.c:5325
 msgid "change the definition of a large object"
 msgstr "대형 객체 정의 바꾸기"
 
-#: sql_help.c:5278
+#: sql_help.c:5331
 msgid "change the definition of a materialized view"
 msgstr "materialized 뷰 정의 바꾸기"
 
-#: sql_help.c:5284
+#: sql_help.c:5337
 msgid "change the definition of an operator"
 msgstr "연산자 정의 바꾸기"
 
-#: sql_help.c:5290
+#: sql_help.c:5343
 msgid "change the definition of an operator class"
 msgstr "연산자 클래스 정보 바꾸기"
 
-#: sql_help.c:5296
+#: sql_help.c:5349
 msgid "change the definition of an operator family"
 msgstr "연산자 부류의 정의 바꾸기"
 
-#: sql_help.c:5302
+#: sql_help.c:5355
 msgid "change the definition of a row-level security policy"
 msgstr "로우 단위 보안 정책의 정의 바꾸기"
 
-#: sql_help.c:5308
+#: sql_help.c:5361
 msgid "change the definition of a procedure"
 msgstr "프로시져 정의 바꾸기"
 
-#: sql_help.c:5314
+#: sql_help.c:5367
 msgid "change the definition of a publication"
 msgstr "발행 정보 바꾸기"
 
-#: sql_help.c:5320 sql_help.c:5422
+#: sql_help.c:5373 sql_help.c:5475
 msgid "change a database role"
 msgstr "데이터베이스 롤 변경"
 
-#: sql_help.c:5326
+#: sql_help.c:5379
 msgid "change the definition of a routine"
 msgstr "루틴 정의 바꾸기"
 
-#: sql_help.c:5332
+#: sql_help.c:5385
 msgid "change the definition of a rule"
 msgstr "룰 정의 바꾸기"
 
-#: sql_help.c:5338
+#: sql_help.c:5391
 msgid "change the definition of a schema"
 msgstr "스키마 이름 바꾸기"
 
-#: sql_help.c:5344
+#: sql_help.c:5397
 msgid "change the definition of a sequence generator"
 msgstr "시퀀스 정보 바꾸기"
 
-#: sql_help.c:5350
+#: sql_help.c:5403
 msgid "change the definition of a foreign server"
 msgstr "외부 서버 정의 바꾸기"
 
-#: sql_help.c:5356
+#: sql_help.c:5409
 msgid "change the definition of an extended statistics object"
 msgstr "확장 통계정보 객체 정의 바꾸기"
 
-#: sql_help.c:5362
+#: sql_help.c:5415
 msgid "change the definition of a subscription"
 msgstr "구독 정보 바꾸기"
 
-#: sql_help.c:5368
+#: sql_help.c:5421
 msgid "change a server configuration parameter"
 msgstr "서버 환경 설정 매개 변수 바꾸기"
 
-#: sql_help.c:5374
+#: sql_help.c:5427
 msgid "change the definition of a table"
 msgstr "테이블 정보 바꾸기"
 
-#: sql_help.c:5380
+#: sql_help.c:5433
 msgid "change the definition of a tablespace"
 msgstr "테이블스페이스 정의 바꾸기"
 
-#: sql_help.c:5386
+#: sql_help.c:5439
 msgid "change the definition of a text search configuration"
 msgstr "텍스트 검색 구성 정의 바꾸기"
 
-#: sql_help.c:5392
+#: sql_help.c:5445
 msgid "change the definition of a text search dictionary"
 msgstr "텍스트 검색 사전 정의 바꾸기"
 
-#: sql_help.c:5398
+#: sql_help.c:5451
 msgid "change the definition of a text search parser"
 msgstr "텍스트 검색 파서 정의 바꾸기"
 
-#: sql_help.c:5404
+#: sql_help.c:5457
 msgid "change the definition of a text search template"
 msgstr "텍스트 검색 템플릿 정의 바꾸기"
 
-#: sql_help.c:5410
+#: sql_help.c:5463
 msgid "change the definition of a trigger"
 msgstr "트리거 정보 바꾸기"
 
-#: sql_help.c:5416
+#: sql_help.c:5469
 msgid "change the definition of a type"
 msgstr "자료형 정의 바꾸기"
 
-#: sql_help.c:5428
+#: sql_help.c:5481
 msgid "change the definition of a user mapping"
 msgstr "사용자 매핑 정의 바꾸기"
 
-#: sql_help.c:5434
+#: sql_help.c:5487
 msgid "change the definition of a view"
 msgstr "뷰 정의 바꾸기"
 
-#: sql_help.c:5440
+#: sql_help.c:5493
 msgid "collect statistics about a database"
 msgstr "데이터베이스 사용 통계 정보를 갱신함"
 
-#: sql_help.c:5446 sql_help.c:6244
+#: sql_help.c:5499 sql_help.c:6297
 msgid "start a transaction block"
 msgstr "트랜잭션 블럭을 시작함"
 
-#: sql_help.c:5452
+#: sql_help.c:5505
 msgid "invoke a procedure"
 msgstr "프로시져 호출"
 
-#: sql_help.c:5458
+#: sql_help.c:5511
 msgid "force a write-ahead log checkpoint"
 msgstr "트랜잭션 로그를 강제로 체크포인트 함"
 
-#: sql_help.c:5464
+#: sql_help.c:5517
 msgid "close a cursor"
 msgstr "커서 닫기"
 
-#: sql_help.c:5470
+#: sql_help.c:5523
 msgid "cluster a table according to an index"
 msgstr "지정한 인덱스 기준으로 테이블 자료를 다시 저장함"
 
-#: sql_help.c:5476
+#: sql_help.c:5529
 msgid "define or change the comment of an object"
 msgstr "해당 개체의 코멘트를 지정하거나 수정함"
 
-#: sql_help.c:5482 sql_help.c:6040
+#: sql_help.c:5535 sql_help.c:6093
 msgid "commit the current transaction"
 msgstr "현재 트랜잭션 commit"
 
-#: sql_help.c:5488
+#: sql_help.c:5541
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "two-phase 커밋을 위해 먼저 준비된 트랜잭션을 커밋하세요."
 
-#: sql_help.c:5494
+#: sql_help.c:5547
 msgid "copy data between a file and a table"
 msgstr "테이블과 파일 사이 자료를 복사함"
 
-#: sql_help.c:5500
+#: sql_help.c:5553
 msgid "define a new access method"
 msgstr "새 접속 방법 정의"
 
-#: sql_help.c:5506
+#: sql_help.c:5559
 msgid "define a new aggregate function"
 msgstr "새 집계합수 만들기"
 
-#: sql_help.c:5512
+#: sql_help.c:5565
 msgid "define a new cast"
 msgstr "새 형변환자 만들기"
 
-#: sql_help.c:5518
+#: sql_help.c:5571
 msgid "define a new collation"
 msgstr "새 collation 만들기"
 
-#: sql_help.c:5524
+#: sql_help.c:5577
 msgid "define a new encoding conversion"
 msgstr "새 문자코드변환규칙(conversion) 만들기"
 
-#: sql_help.c:5530
+#: sql_help.c:5583
 msgid "create a new database"
 msgstr "데이터베이스 생성"
 
-#: sql_help.c:5536
+#: sql_help.c:5589
 msgid "define a new domain"
 msgstr "새 도메인 만들기"
 
-#: sql_help.c:5542
+#: sql_help.c:5595
 msgid "define a new event trigger"
 msgstr "새 이벤트 트리거 만들기"
 
-#: sql_help.c:5548
+#: sql_help.c:5601
 msgid "install an extension"
 msgstr "확장 모듈 설치"
 
-#: sql_help.c:5554
+#: sql_help.c:5607
 msgid "define a new foreign-data wrapper"
 msgstr "새 외부 데이터 래퍼 정의"
 
-#: sql_help.c:5560
+#: sql_help.c:5613
 msgid "define a new foreign table"
 msgstr "새 외부 테이블 정의"
 
-#: sql_help.c:5566
+#: sql_help.c:5619
 msgid "define a new function"
 msgstr "새 함수 만들기"
 
-#: sql_help.c:5572 sql_help.c:5632 sql_help.c:5734
+#: sql_help.c:5625 sql_help.c:5685 sql_help.c:5787
 msgid "define a new database role"
 msgstr "새 데이터베이스 롤 만들기"
 
-#: sql_help.c:5578
+#: sql_help.c:5631
 msgid "define a new index"
 msgstr "새 인덱스 만들기"
 
-#: sql_help.c:5584
+#: sql_help.c:5637
 msgid "define a new procedural language"
 msgstr "새 프로시주얼 언어 만들기"
 
-#: sql_help.c:5590
+#: sql_help.c:5643
 msgid "define a new materialized view"
 msgstr "새 materialized 뷰 만들기"
 
-#: sql_help.c:5596
+#: sql_help.c:5649
 msgid "define a new operator"
 msgstr "새 연산자 만들기"
 
-#: sql_help.c:5602
+#: sql_help.c:5655
 msgid "define a new operator class"
 msgstr "새 연잔자 클래스 만들기"
 
-#: sql_help.c:5608
+#: sql_help.c:5661
 msgid "define a new operator family"
 msgstr "새 연산자 부류 만들기"
 
-#: sql_help.c:5614
+#: sql_help.c:5667
 msgid "define a new row-level security policy for a table"
 msgstr "특정 테이블에 로우 단위 보안 정책 정의"
 
-#: sql_help.c:5620
+#: sql_help.c:5673
 msgid "define a new procedure"
 msgstr "새 프로시져 만들기"
 
-#: sql_help.c:5626
+#: sql_help.c:5679
 msgid "define a new publication"
 msgstr "새 발행 만들기"
 
-#: sql_help.c:5638
+#: sql_help.c:5691
 msgid "define a new rewrite rule"
 msgstr "새 룰(rule) 만들기"
 
-#: sql_help.c:5644
+#: sql_help.c:5697
 msgid "define a new schema"
 msgstr "새 스키마(schema) 만들기"
 
-#: sql_help.c:5650
+#: sql_help.c:5703
 msgid "define a new sequence generator"
 msgstr "새 시퀀스 만들기"
 
-#: sql_help.c:5656
+#: sql_help.c:5709
 msgid "define a new foreign server"
 msgstr "새 외부 서버 정의"
 
-#: sql_help.c:5662
+#: sql_help.c:5715
 msgid "define extended statistics"
 msgstr "새 확장 통계정보 만들기"
 
-#: sql_help.c:5668
+#: sql_help.c:5721
 msgid "define a new subscription"
 msgstr "새 구독 만들기"
 
-#: sql_help.c:5674
+#: sql_help.c:5727
 msgid "define a new table"
 msgstr "새 테이블 만들기"
 
-#: sql_help.c:5680 sql_help.c:6202
+#: sql_help.c:5733 sql_help.c:6255
 msgid "define a new table from the results of a query"
 msgstr "쿼리 결과를 새 테이블로 만들기"
 
-#: sql_help.c:5686
+#: sql_help.c:5739
 msgid "define a new tablespace"
 msgstr "새 테이블스페이스 만들기"
 
-#: sql_help.c:5692
+#: sql_help.c:5745
 msgid "define a new text search configuration"
 msgstr "새 텍스트 검색 구성 정의"
 
-#: sql_help.c:5698
+#: sql_help.c:5751
 msgid "define a new text search dictionary"
 msgstr "새 텍스트 검색 사전 정의"
 
-#: sql_help.c:5704
+#: sql_help.c:5757
 msgid "define a new text search parser"
 msgstr "새 텍스트 검색 파서 정의"
 
-#: sql_help.c:5710
+#: sql_help.c:5763
 msgid "define a new text search template"
 msgstr "새 텍스트 검색 템플릿 정의"
 
-#: sql_help.c:5716
+#: sql_help.c:5769
 msgid "define a new transform"
 msgstr "새 transform 만들기"
 
-#: sql_help.c:5722
+#: sql_help.c:5775
 msgid "define a new trigger"
 msgstr "새 트리거 만들기"
 
-#: sql_help.c:5728
+#: sql_help.c:5781
 msgid "define a new data type"
 msgstr "새 자료형 만들기"
 
-#: sql_help.c:5740
+#: sql_help.c:5793
 msgid "define a new mapping of a user to a foreign server"
 msgstr "사용자와 외부 서버 간의 새 매핑 정의"
 
-#: sql_help.c:5746
+#: sql_help.c:5799
 msgid "define a new view"
 msgstr "새 view 만들기"
 
-#: sql_help.c:5752
+#: sql_help.c:5805
 msgid "deallocate a prepared statement"
 msgstr "준비된 구문(prepared statement) 지우기"
 
-#: sql_help.c:5758
+#: sql_help.c:5811
 msgid "define a cursor"
 msgstr "커서 지정"
 
-#: sql_help.c:5764
+#: sql_help.c:5817
 msgid "delete rows of a table"
 msgstr "테이블의 자료 삭제"
 
-#: sql_help.c:5770
+#: sql_help.c:5823
 msgid "discard session state"
 msgstr "세션 상태 삭제"
 
-#: sql_help.c:5776
+#: sql_help.c:5829
 msgid "execute an anonymous code block"
 msgstr "임의 코드 블록 실행"
 
-#: sql_help.c:5782
+#: sql_help.c:5835
 msgid "remove an access method"
 msgstr "접근 방법 삭제"
 
-#: sql_help.c:5788
+#: sql_help.c:5841
 msgid "remove an aggregate function"
 msgstr "집계 함수 삭제"
 
-#: sql_help.c:5794
+#: sql_help.c:5847
 msgid "remove a cast"
 msgstr "형변환자 삭제"
 
-#: sql_help.c:5800
+#: sql_help.c:5853
 msgid "remove a collation"
 msgstr "collation 삭제"
 
-#: sql_help.c:5806
+#: sql_help.c:5859
 msgid "remove a conversion"
 msgstr "문자코드 변환규칙(conversion) 삭제"
 
-#: sql_help.c:5812
+#: sql_help.c:5865
 msgid "remove a database"
 msgstr "데이터베이스 삭제"
 
-#: sql_help.c:5818
+#: sql_help.c:5871
 msgid "remove a domain"
 msgstr "도메인 삭제"
 
-#: sql_help.c:5824
+#: sql_help.c:5877
 msgid "remove an event trigger"
 msgstr "이벤트 트리거 삭제"
 
-#: sql_help.c:5830
+#: sql_help.c:5883
 msgid "remove an extension"
 msgstr "확장 모듈 삭제"
 
-#: sql_help.c:5836
+#: sql_help.c:5889
 msgid "remove a foreign-data wrapper"
 msgstr "외부 데이터 래퍼 제거"
 
-#: sql_help.c:5842
+#: sql_help.c:5895
 msgid "remove a foreign table"
 msgstr "외부 테이블 삭제"
 
-#: sql_help.c:5848
+#: sql_help.c:5901
 msgid "remove a function"
 msgstr "함수 삭제"
 
-#: sql_help.c:5854 sql_help.c:5920 sql_help.c:6022
+#: sql_help.c:5907 sql_help.c:5973 sql_help.c:6075
 msgid "remove a database role"
 msgstr "데이터베이스 롤 삭제"
 
-#: sql_help.c:5860
+#: sql_help.c:5913
 msgid "remove an index"
 msgstr "인덱스 삭제"
 
-#: sql_help.c:5866
+#: sql_help.c:5919
 msgid "remove a procedural language"
 msgstr "프로시주얼 언어 삭제"
 
-#: sql_help.c:5872
+#: sql_help.c:5925
 msgid "remove a materialized view"
 msgstr "materialized 뷰 삭제"
 
-#: sql_help.c:5878
+#: sql_help.c:5931
 msgid "remove an operator"
 msgstr "연산자 삭제"
 
-#: sql_help.c:5884
+#: sql_help.c:5937
 msgid "remove an operator class"
 msgstr "연산자 클래스 삭제"
 
-#: sql_help.c:5890
+#: sql_help.c:5943
 msgid "remove an operator family"
 msgstr "연산자 부류 삭제"
 
-#: sql_help.c:5896
+#: sql_help.c:5949
 msgid "remove database objects owned by a database role"
 msgstr "데이터베이스 롤로 권한이 부여된 데이터베이스 개체들을 삭제하세요"
 
-#: sql_help.c:5902
+#: sql_help.c:5955
 msgid "remove a row-level security policy from a table"
 msgstr "해당 테이블에 정의된 로우 단위 보안 정책 삭제"
 
-#: sql_help.c:5908
+#: sql_help.c:5961
 msgid "remove a procedure"
 msgstr "프로시져 삭제"
 
-#: sql_help.c:5914
+#: sql_help.c:5967
 msgid "remove a publication"
 msgstr "발행 삭제"
 
-#: sql_help.c:5926
+#: sql_help.c:5979
 msgid "remove a routine"
 msgstr "루틴 삭제"
 
-#: sql_help.c:5932
+#: sql_help.c:5985
 msgid "remove a rewrite rule"
 msgstr "룰(rule) 삭제"
 
-#: sql_help.c:5938
+#: sql_help.c:5991
 msgid "remove a schema"
 msgstr "스키마(schema) 삭제"
 
-#: sql_help.c:5944
+#: sql_help.c:5997
 msgid "remove a sequence"
 msgstr "시퀀스 삭제"
 
-#: sql_help.c:5950
+#: sql_help.c:6003
 msgid "remove a foreign server descriptor"
 msgstr "외부 서버 설명자 제거"
 
-#: sql_help.c:5956
+#: sql_help.c:6009
 msgid "remove extended statistics"
 msgstr "확장 통계정보 삭제"
 
-#: sql_help.c:5962
+#: sql_help.c:6015
 msgid "remove a subscription"
 msgstr "구독 삭제"
 
-#: sql_help.c:5968
+#: sql_help.c:6021
 msgid "remove a table"
 msgstr "테이블 삭제"
 
-#: sql_help.c:5974
+#: sql_help.c:6027
 msgid "remove a tablespace"
 msgstr "테이블스페이스 삭제"
 
-#: sql_help.c:5980
+#: sql_help.c:6033
 msgid "remove a text search configuration"
 msgstr "텍스트 검색 구성 제거"
 
-#: sql_help.c:5986
+#: sql_help.c:6039
 msgid "remove a text search dictionary"
 msgstr "텍스트 검색 사전 제거"
 
-#: sql_help.c:5992
+#: sql_help.c:6045
 msgid "remove a text search parser"
 msgstr "텍스트 검색 파서 제거"
 
-#: sql_help.c:5998
+#: sql_help.c:6051
 msgid "remove a text search template"
 msgstr "텍스트 검색 템플릿 제거"
 
-#: sql_help.c:6004
+#: sql_help.c:6057
 msgid "remove a transform"
 msgstr "transform 삭제"
 
-#: sql_help.c:6010
+#: sql_help.c:6063
 msgid "remove a trigger"
 msgstr "트리거 삭제"
 
-#: sql_help.c:6016
+#: sql_help.c:6069
 msgid "remove a data type"
 msgstr "자료형 삭제"
 
-#: sql_help.c:6028
+#: sql_help.c:6081
 msgid "remove a user mapping for a foreign server"
 msgstr "외부 서버에 대한 사용자 매핑 제거"
 
-#: sql_help.c:6034
+#: sql_help.c:6087
 msgid "remove a view"
 msgstr "뷰(view) 삭제"
 
-#: sql_help.c:6046
+#: sql_help.c:6099
 msgid "execute a prepared statement"
 msgstr "준비된 구문(prepared statement) 실행"
 
-#: sql_help.c:6052
+#: sql_help.c:6105
 msgid "show the execution plan of a statement"
 msgstr "쿼리 실행계획 보기"
 
-#: sql_help.c:6058
+#: sql_help.c:6111
 msgid "retrieve rows from a query using a cursor"
 msgstr "해당 커서에서 자료 뽑기"
 
-#: sql_help.c:6064
+#: sql_help.c:6117
 msgid "define access privileges"
 msgstr "액세스 권한 지정하기"
 
-#: sql_help.c:6070
+#: sql_help.c:6123
 msgid "import table definitions from a foreign server"
 msgstr "외부 서버로부터 테이블 정의 가져오기"
 
-#: sql_help.c:6076
+#: sql_help.c:6129
 msgid "create new rows in a table"
 msgstr "테이블 자료 삽입"
 
-#: sql_help.c:6082
+#: sql_help.c:6135
 msgid "listen for a notification"
 msgstr "특정 서버 메시지 수신함"
 
-#: sql_help.c:6088
+#: sql_help.c:6141
 msgid "load a shared library file"
 msgstr "공유 라이브러리 파일 로드"
 
-#: sql_help.c:6094
+#: sql_help.c:6147
 msgid "lock a table"
 msgstr "테이블 잠금"
 
-#: sql_help.c:6100
+#: sql_help.c:6153
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "조건부 테이블 insert, update, delete"
 
-#: sql_help.c:6106
+#: sql_help.c:6159
 msgid "position a cursor"
 msgstr "커서 위치 옮기기"
 
-#: sql_help.c:6112
+#: sql_help.c:6165
 msgid "generate a notification"
 msgstr "특정 서버 메시지 발생"
 
-#: sql_help.c:6118
+#: sql_help.c:6171
 msgid "prepare a statement for execution"
 msgstr "준비된 구문(prepared statement) 만들기"
 
-#: sql_help.c:6124
+#: sql_help.c:6177
 msgid "prepare the current transaction for two-phase commit"
 msgstr "two-phase 커밋을 위해 현재 트랜잭션을 준비함"
 
-#: sql_help.c:6130
+#: sql_help.c:6183
 msgid "change the ownership of database objects owned by a database role"
 msgstr "데이터베이스 롤로 권한이 부여된 데이터베이스 개체들의 소유주 바꾸기"
 
-#: sql_help.c:6136
+#: sql_help.c:6189
 msgid "replace the contents of a materialized view"
 msgstr "구체화된 뷰의 내용 수정"
 
-#: sql_help.c:6142
+#: sql_help.c:6195
 msgid "rebuild indexes"
 msgstr "인덱스 다시 만들기"
 
-#: sql_help.c:6148
+#: sql_help.c:6201
 msgid "release a previously defined savepoint"
 msgstr "이전 정의된 savepoint를 지움"
 
-#: sql_help.c:6154
+#: sql_help.c:6207
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "실시간 환경 변수값을 초기값으로 다시 지정"
 
-#: sql_help.c:6160
+#: sql_help.c:6213
 msgid "remove access privileges"
 msgstr "액세스 권한 해제하기"
 
-#: sql_help.c:6172
+#: sql_help.c:6225
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "two-phase 커밋을 위해 먼저 준비되었던 트랜잭션 실행취소하기"
 
-#: sql_help.c:6178
+#: sql_help.c:6231
 msgid "roll back to a savepoint"
 msgstr "savepoint 파기하기"
 
-#: sql_help.c:6184
+#: sql_help.c:6237
 msgid "define a new savepoint within the current transaction"
 msgstr "현재 트랜잭션에서 새로운 savepoint 만들기"
 
-#: sql_help.c:6190
+#: sql_help.c:6243
 msgid "define or change a security label applied to an object"
 msgstr "해당 개체에 보안 라벨을 정의하거나 변경"
 
-#: sql_help.c:6196 sql_help.c:6250 sql_help.c:6286
+#: sql_help.c:6249 sql_help.c:6303 sql_help.c:6339
 msgid "retrieve rows from a table or view"
 msgstr "테이블이나 뷰의 자료를 출력"
 
-#: sql_help.c:6208
+#: sql_help.c:6261
 msgid "change a run-time parameter"
 msgstr "실시간 환경 변수값 바꾸기"
 
-#: sql_help.c:6214
+#: sql_help.c:6267
 msgid "set constraint check timing for the current transaction"
 msgstr "현재 트랜잭션에서 제약조건 설정"
 
-#: sql_help.c:6220
+#: sql_help.c:6273
 msgid "set the current user identifier of the current session"
 msgstr "현재 세션의 현재 사용자 식별자를 지정"
 
-#: sql_help.c:6226
+#: sql_help.c:6279
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
 msgstr "현재 세션의 사용자 인증을 지정함 - 사용자 지정"
 
-#: sql_help.c:6232
+#: sql_help.c:6285
 msgid "set the characteristics of the current transaction"
 msgstr "현재 트랜잭션의 성질을 지정함"
 
-#: sql_help.c:6238
+#: sql_help.c:6291
 msgid "show the value of a run-time parameter"
 msgstr "실시간 환경 변수값들을 보여줌"
 
-#: sql_help.c:6256
+#: sql_help.c:6309
 msgid "empty a table or set of tables"
 msgstr "하나 또는 지정한 여러개의 테이블에서 모든 자료 지움"
 
-#: sql_help.c:6262
+#: sql_help.c:6315
 msgid "stop listening for a notification"
 msgstr "특정 서버 메시지 수신 기능 끔"
 
-#: sql_help.c:6268
+#: sql_help.c:6321
 msgid "update rows of a table"
 msgstr "테이블 자료 갱신"
 
-#: sql_help.c:6274
+#: sql_help.c:6327
 msgid "garbage-collect and optionally analyze a database"
 msgstr "물리적인 자료 정리 작업 - 쓰레기값 청소"
 
-#: sql_help.c:6280
+#: sql_help.c:6333
 msgid "compute a set of rows"
 msgstr "compute a set of rows"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 옵션은 비대화형 모드에서만 사용할 수 있음"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "\"%s\" 잠금파일을 열 수 없음: %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6715,27 +7021,27 @@ msgstr ""
 "도움말을 보려면 \"help\"를 입력하십시오.\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "출력 매개 변수 \"%s\" 지정할 수 없음"
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "추가 명령행 인자 \"%s\" 무시됨"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "실행 가능한 프로그램을 찾을 수 없음"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6633
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6746,22 +7052,47 @@ msgstr ""
 "사용한 쿼리:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "잘못된 \"%s\" 값을 \"%s\" 변수값으로 사용함: 불린형이어야 함"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "\"%s\" 값은 \"%s\" 변수값으로 사용할 수 없음; 정수형이어야 함"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "\"%s\" 변수에 대한 잘못된 입력 구문"
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "\"%s\" 값은 \"%s\" 변수값으로 사용할 수 없음; %.2f보다 커야함"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "\"%s\" 값은 \"%s\" 변수값으로 사용할 수 없음; %.2f보다 작아야함"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "입력한 \"%s\" 값은 %s 변수값 범위를 초과했습니다"
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "\"%s\" 값은 \"%s\" 변수값으로 유효하지 않음"
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "잘못된 변수 이름: \"%s\""
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
@@ -6770,18 +7101,53 @@ msgstr ""
 "\"%s\" 값은 \"%s\" 변수값으로 사용할 수 없음\n"
 "사용할 수 있는 변수값: %s"
 
+#~ msgid ""
+#~ "  \\watch [[i=]SEC] [c=N] execute query every SEC seconds, up to N times\n"
+#~ msgstr "  \\watch [[i=]SEC] [c=N] SEC초 간격, N번 반복\n"
+
 #~ msgid "ICU Locale"
 #~ msgstr "ICU 로케일"
 
-#~ msgid "local socket"
-#~ msgstr "로컬 소켓"
+#~ msgid "Unlogged materialized view \"%s.%s\""
+#~ msgstr "트랜잭션 로그를 남기지 않은 구체화된 뷰 \"%s.%s\""
 
 #~ msgid ""
-#~ "  \\watch [[i=]SEC] [c=N] execute query every SEC seconds, up to N times\n"
-#~ msgstr "  \\watch [[i=]SEC] [c=N] SEC초 간격, N번 반복\n"
+#~ "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at "
+#~ "port \"%s\".\n"
+#~ msgstr ""
+#~ "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 주소=\"%s\", 포트=\"%s\".\n"
+
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" on host \"%s"
+#~ "\" (address \"%s\") at port \"%s\".\n"
+#~ msgstr ""
+#~ "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\" (주소=\"%s"
+#~ "\"), 포트=\"%s\".\n"
+
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+#~ "port \"%s\".\n"
+#~ msgstr ""
+#~ "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 호스트=\"%s\", 포트=\"%s"
+#~ "\".\n"
+
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+#~ "at port \"%s\".\n"
+#~ msgstr ""
+#~ "접속정보: 데이터베이스=\"%s\", 사용자=\"%s\", 소켓=\"%s\", 포트=\"%s\".\n"
 
 #~ msgid "constraint"
 #~ msgstr "제약조건"
 
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "UID %d 해당하는 로컬 사용자를 찾을 수 없음: %s"
+
+#~ msgid "local socket"
+#~ msgstr "로컬 소켓"
+
+#~ msgid "local user with ID %d does not exist"
+#~ msgstr "ID %d 로컬 사용자 없음"
+
 #~ msgid "where constraint is:"
 #~ msgstr "제약조건 사용법:"
diff --git a/src/bin/psql/po/ru.po b/src/bin/psql/po/ru.po
index 9ffcab1d2b8..be1beb51489 100644
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -4,14 +4,14 @@
 # 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-2025.
+# SPDX-FileCopyrightText: 2012-2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 # Maxim Yablokov <m.yablokov@postgrespro.ru>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2025-02-08 08:33+0200\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 09:12+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -21,22 +21,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -61,28 +61,28 @@ msgstr "не удалось найти запускаемый файл \"%s\""
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не удалось преобразовать относительный путь \"%s\" в абсолютный: %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не удалось прочитать вывод команды \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не выдала данные"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "ошибка в %s(): %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1372 command.c:3458 command.c:3507 command.c:3632 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -104,7 +104,7 @@ msgstr "попытка дублирования нулевого указате
 msgid "could not look up effective user ID %ld: %s"
 msgstr "выяснить эффективный идентификатор пользователя (%ld) не удалось: %s"
 
-#: ../../common/username.c:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "пользователь не существует"
 
@@ -167,11 +167,11 @@ msgstr "Прервано\n"
 #: ../../fe_utils/print.c:3188
 #, c-format
 msgid ""
-"Cannot print table contents: number of cells %lld is equal to or exceeds "
-"maximum %lld.\n"
+"Cannot print table contents: number of cells %<PRIu64> is equal to or "
+"exceeds maximum %zu.\n"
 msgstr ""
-"Вывести содержимое таблицы нельзя: число ячеек %lld достигло максимума "
-"%lld.\n"
+"Вывести содержимое таблицы нельзя: число ячеек %<PRIu64> достигло максимума "
+"%zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -181,299 +181,394 @@ msgstr ""
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
+msgid ""
+"Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
 msgstr ""
-"Ошибка добавления ячейки в таблицу: превышен предел числа ячеек (%lld).\n"
+"Ошибка добавления ячейки в таблицу: превышен предел числа ячеек "
+"(%<PRIu64>).\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "неверный формат вывода (внутренняя ошибка): %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "рекурсивное расширение переменной \"%s\" пропускается"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
-#, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "найти локального пользователя по идентификатору (%d) не удалось: %s"
-
-#: ../../port/user.c:48 ../../port/user.c:84
+#: command.c:254
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локальный пользователь с ID %d не существует"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr ""
+"команды с обратной косой чертой отключены; разрешается только \\unrestrict"
 
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "неверная команда \\%s"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Введите \\? для получения справки."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: лишний аргумент \"%s\" пропущен"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr ""
 "команда \\%s игнорируется; добавьте \\endif или нажмите Ctrl-C для "
 "завершения текущего блока \\if"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "отсутствует необходимый аргумент \\%s"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "не удалось получить домашний каталог пользователя c ид. %ld: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: не удалось перейти в каталог \"%s\": %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "В данный момент вы не подключены к базе данных.\n"
 
-#: command.c:667
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on address \"%s\" at "
-"port \"%s\".\n"
-msgstr ""
-"Вы подключены к базе данных \"%s\" как пользователь \"%s\" (адрес сервера "
-"\"%s\", порт \"%s\").\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "Информация о подключении"
 
-#: command.c:670
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
-"port \"%s\".\n"
-msgstr ""
-"Вы подключены к базе данных \"%s\" как пользователь \"%s\" через сокет в "
-"\"%s\", порт \"%s\".\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "Параметр"
 
-#: command.c:676
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address "
-"\"%s\") at port \"%s\".\n"
-msgstr ""
-"Вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
-"\"%s\": адрес \"%s\", порт \"%s\").\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "Значение"
 
-#: command.c:679
-#, c-format
-msgid ""
-"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
-"\"%s\".\n"
-msgstr ""
-"Вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
-"\"%s\", порт \"%s\").\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "БД"
+
+#: command.c:848
+msgid "Client User"
+msgstr "Подключённый пользователь"
 
-#: command.c:1069 command.c:1170 command.c:2675
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "Адрес узла"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "Каталог сокетов"
+
+#: command.c:868
+msgid "Host"
+msgstr "Узел"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "Порт сервера"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "Параметры"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "Версия протокола"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "Использован пароль"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "нет"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "да"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "Аутентификация GSSAPI"
+
+#: command.c:898
+msgid "Backend PID"
+msgstr "PID обслуживающего процесса"
+
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL-подключение"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "Библиотека SSL"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "неизвестно"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "Протокол SSL"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "Бит в ключе SSL"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "Шифр SSL"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "Сжатие SSL"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "нет"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "нет буфера запросов"
 
-#: command.c:1102 command.c:5776
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "неверный номер строки: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "Изменений нет"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr ""
 "%s: неверное название кодировки символов или не найдена процедура "
 "перекодировки"
 
-#: command.c:1368 command.c:2157 command.c:3454 command.c:3652 command.c:5882
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1375
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "Ошибки не было."
 
-#: command.c:1488
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s не допускается в конвейерном режиме"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: отсутствует правая скобка"
 
-#: command.c:1572 command.c:1691 command.c:1995 command.c:2009 command.c:2028
-#: command.c:2196 command.c:2437 command.c:2642 command.c:2682
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "отсутствует необходимый аргумент \\%s"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: запрошено неверное количество результатов"
 
-#: command.c:1822
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif не может находиться после \\else"
 
-#: command.c:1827
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif без соответствующего \\if"
 
-#: command.c:1891
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else не может находиться после \\else"
 
-#: command.c:1896
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else без соответствующего \\if"
 
-#: command.c:1936
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif без соответствующего \\if"
 
-#: command.c:2092
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "Буфер запроса пуст."
 
-#: command.c:2135
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Введите новый пароль для пользователя \"%s\": "
 
-#: command.c:2139
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: command.c:2148
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Пароли не совпадают."
 
-#: command.c:2231
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: не удалось прочитать значение переменной"
 
-#: command.c:2333
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "Буфер запроса сброшен (очищен)."
 
-#: command.c:2355
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "История записана в файл \"%s\".\n"
 
-#: command.c:2442
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr ""
+"\\sendpipeline может использоваться только после \\bind или \\bind_named"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline не допускается вне конвейерного режима"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: имя переменной окружения не может содержать знак \"=\""
 
-#: command.c:2490
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "требуется имя функции"
 
-#: command.c:2492
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "требуется имя представления"
 
-#: command.c:2614
+#: command.c:3176
 msgid "Timing is on."
 msgstr "Секундомер включён."
 
-#: command.c:2616
+#: command.c:3178
 msgid "Timing is off."
 msgstr "Секундомер выключен."
 
-#: command.c:2702 command.c:2740 command.c:4163 command.c:4166 command.c:4169
-#: command.c:4175 command.c:4177 command.c:4203 command.c:4213 command.c:4225
-#: command.c:4239 command.c:4266 command.c:4324 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: ограниченный режим не активен"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: неверный ключ"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2729 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2801 command.c:2867
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: длительность интервала указана неоднократно"
 
-#: command.c:2811 command.c:2877
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: некорректная длительность интервала \"%s\""
 
-#: command.c:2821
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: число итераций указано неоднократно"
 
-#: command.c:2831
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: некорректное число итераций \"%s\""
 
-#: command.c:2841
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: минимальное число строк указано неоднократно"
 
-#: command.c:2851
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: некорректное минимальное число строк \"%s\""
 
-#: command.c:2858
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: нераспознанный параметр \"%s\""
 
-#: command.c:3255 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Пароль: "
 
-#: command.c:3260 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Пароль пользователя %s: "
 
-#: command.c:3316
+#: command.c:3936
 #, c-format
 msgid ""
 "Do not give user, host, or port separately when using a connection string"
@@ -481,23 +576,23 @@ msgstr ""
 "Не указывайте пользователя, компьютер или порт отдельно, когда используете "
 "строку подключения"
 
-#: command.c:3351
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr ""
 "Нет подключения к базе, из которого можно было бы использовать параметры"
 
-#: command.c:3658
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Сохранено предыдущее подключение"
 
-#: command.c:3664
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:3720
+#: command.c:4340
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at "
@@ -506,7 +601,7 @@ msgstr ""
 "Сейчас вы подключены к базе данных \"%s\" как пользователь \"%s\" (адрес "
 "сервера \"%s\", порт \"%s\").\n"
 
-#: command.c:3723
+#: command.c:4343
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -515,7 +610,7 @@ msgstr ""
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" через сокет в "
 "\"%s\", порт \"%s\".\n"
 
-#: command.c:3729
+#: command.c:4349
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on host "
@@ -524,7 +619,7 @@ msgstr ""
 "Сейчас вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
 "\"%s\": адрес \"%s\", порт \"%s\").\n"
 
-#: command.c:3732
+#: command.c:4352
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -533,17 +628,17 @@ msgstr ""
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
 "\"%s\", порт \"%s\").\n"
 
-#: command.c:3737
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Вы подключены к базе данных \"%s\" как пользователь \"%s\".\n"
 
-#: command.c:3843
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, сервер %s)\n"
 
-#: command.c:3856
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -552,33 +647,25 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: %s имеет базовую версию %s, а сервер - %s.\n"
 "                Часть функций psql может не работать.\n"
 
-#: command.c:3895
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL-соединение (протокол: %s, шифр: %s, сжатие: %s, ALPN: %s)\n"
 
-#: command.c:3896 command.c:3897
-msgid "unknown"
-msgstr "неизвестно"
-
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "выкл."
 
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "вкл."
 
-#: command.c:3899
-msgid "none"
-msgstr "нет"
-
-#: command.c:3913
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "Соединение зашифровано GSSAPI\n"
 
-#: command.c:3933
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -591,7 +678,7 @@ msgstr ""
 "                Подробнее об этом смотрите документацию psql, раздел\n"
 "                \"Notes for Windows users\".\n"
 
-#: command.c:4038
+#: command.c:4667
 #, c-format
 msgid ""
 "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -600,33 +687,33 @@ msgstr ""
 "в переменной окружения PSQL_EDITOR_LINENUMBER_ARG должен быть указан номер "
 "строки"
 
-#: command.c:4068
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "не удалось запустить редактор \"%s\""
 
-#: command.c:4070
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "не удалось запустить /bin/sh"
 
-#: command.c:4120
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "не удалось найти временный каталог: %s"
 
-#: command.c:4147
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "не удалось открыть временный файл \"%s\": %m"
 
-#: command.c:4483
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr ""
 "\\pset: неоднозначному сокращению \"%s\" соответствует и \"%s\", и \"%s\""
 
-#: command.c:4503
+#: command.c:5132
 #, c-format
 msgid ""
 "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-"
@@ -635,27 +722,27 @@ msgstr ""
 "\\pset: допустимые форматы: aligned, asciidoc, csv, html, latex, latex-"
 "longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4522
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: допустимые стили линий: ascii, old-ascii, unicode"
 
-#: command.c:4537
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: допустимые стили Unicode-линий границ: single, double"
 
-#: command.c:4552
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: допустимые стили Unicode-линий столбцов: single, double"
 
-#: command.c:4567
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: допустимые стили Unicode-линий заголовков: single, double"
 
-#: command.c:4619
+#: command.c:5248
 #, c-format
 msgid ""
 "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", "
@@ -664,12 +751,12 @@ msgstr ""
 "\\pset: допустимые значения xheader_width: \"%s\" (по умолчанию), \"%s\", "
 "\"%s\", а также число, задающее точную ширину"
 
-#: command.c:4636
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: символ csv_fieldsep должен быть однобайтовым"
 
-#: command.c:4641
+#: command.c:5270
 #, c-format
 msgid ""
 "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage "
@@ -678,117 +765,117 @@ msgstr ""
 "\\pset: в качестве csv_fieldsep нельзя выбрать символ кавычек, новой строки "
 "или возврата каретки"
 
-#: command.c:4779 command.c:4980
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "неизвестный параметр \\pset: %s"
 
-#: command.c:4799
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Стиль границ: %d.\n"
 
-#: command.c:4805
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Ширина вывода сброшена.\n"
 
-#: command.c:4807
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Ширина вывода: %d.\n"
 
-#: command.c:4814
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Расширенный вывод включён.\n"
 
-#: command.c:4816
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Расширенный вывод применяется автоматически.\n"
 
-#: command.c:4818
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Расширенный вывод выключен.\n"
 
-#: command.c:4825 command.c:4827 command.c:4829
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "Ширина расширенного заголовка: \"%s\".\n"
 
-#: command.c:4831
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "Ширина расширенного заголовка: %d.\n"
 
-#: command.c:4837
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "Разделитель полей для CSV: \"%s\".\n"
 
-#: command.c:4845 command.c:4853
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Разделитель полей - нулевой байт.\n"
 
-#: command.c:4847
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Разделитель полей: \"%s\".\n"
 
-#: command.c:4860
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Строка итогов включена.\n"
 
-#: command.c:4862
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Строка итогов выключена.\n"
 
-#: command.c:4868
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Формат вывода: %s.\n"
 
-#: command.c:4874
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Установлен стиль линий: %s.\n"
 
-#: command.c:4881
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null выводится как: \"%s\".\n"
 
-#: command.c:4889
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Локализованный вывод чисел включён.\n"
 
-#: command.c:4891
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Локализованный вывод чисел выключен.\n"
 
-#: command.c:4898
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Постраничник используется для вывода длинного текста.\n"
 
-#: command.c:4900
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Постраничник используется всегда.\n"
 
-#: command.c:4902
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Постраничник выключен.\n"
 
-#: command.c:4908
+#: command.c:5537
 #, 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"
@@ -796,97 +883,97 @@ msgstr[0] "Постраничник не будет использоваться
 msgstr[1] "Постраничник не будет использоваться, если строк меньше %d\n"
 msgstr[2] "Постраничник не будет использоваться, если строк меньше %d\n"
 
-#: command.c:4918 command.c:4928
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Разделитель записей - нулевой байт.\n"
 
-#: command.c:4920
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Разделитель записей: <новая строка>.\n"
 
-#: command.c:4922
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Разделитель записей: \"%s\".\n"
 
-#: command.c:4935
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Атрибуты HTML-таблицы: \"%s\".\n"
 
-#: command.c:4938
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Атрибуты HTML-таблицы не заданы.\n"
 
-#: command.c:4945
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Заголовок: \"%s\".\n"
 
-#: command.c:4947
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Заголовок не задан.\n"
 
-#: command.c:4954
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Режим вывода только кортежей включён.\n"
 
-#: command.c:4956
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Режим вывода только кортежей выключен.\n"
 
-#: command.c:4962
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий границ: \"%s\".\n"
 
-#: command.c:4968
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий столбцов: \"%s\".\n"
 
-#: command.c:4974
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий границ: \"%s\".\n"
 
-#: command.c:5223
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: ошибка"
 
-#: command.c:5261
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch нельзя использовать с пустым запросом"
 
-#: command.c:5293
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "не удалось установить таймер: %m"
 
-#: command.c:5362
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (обновление: %g с)\n"
 
-#: command.c:5365
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (обновление: %g с)\n"
 
-#: command.c:5429
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "сбой при ожидании сигналов: %m"
 
-#: command.c:5485 command.c:5492 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -899,79 +986,79 @@ msgstr ""
 "/************************/\n"
 "\n"
 
-#: command.c:5671
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\" — не представление"
 
-#: command.c:5687
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "не удалось разобрать массив reloptions"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "экранирование строк не работает без подключения к БД"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\""
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "подключение к серверу было потеряно"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Подключение к серверу потеряно. Попытка восстановления "
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "неудачна.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "удачна.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "неожиданное значение PQresultStatus: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Время: %.3f мс\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "Время: %.3f мс (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "Время: %.3f мс (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Время: %.3f мс (%.0f д. %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "В данный момент вы не подключены к базе данных."
 
-#: common.c:714
+#: common.c:749
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" with payload \"%s\" received from server "
@@ -980,34 +1067,34 @@ msgstr ""
 "Получено асинхронное уведомление \"%s\" с сообщением-нагрузкой \"%s\" от "
 "серверного процесса с PID %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr ""
 "Получено асинхронное уведомление \"%s\" от серверного процесса с PID %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "не удалось вывести таблицу результатов: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "сервер не возвратил строк для \\gset"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "сервер возвратил больше одной строки для \\gset"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "попытка выполнить \\gset со специальной переменной \"%s\" игнорируется"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify "
@@ -1022,37 +1109,52 @@ msgstr ""
 "/**(Enter - выполнение; x и Enter - "
 "отмена)************************************/\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "ОПЕРАТОР:  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "неожиданное состояние транзакции (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Столбец"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Тип"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "Команда не выдала результат, либо в результате нет столбцов.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "Нет результатов, ожидающих получения"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "получить результаты в блочном режиме не удалось"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "Конвейерный режим прерван, команда не была выполнена"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY в конвейерном режиме не поддерживается, соединение прерывается"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1105,11 +1207,11 @@ msgstr ""
 "Вводите данные для копирования, разделяя строки переводом строки.\n"
 "Закончите ввод строкой '\\.' или сигналом EOF."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "прерывание из-за ошибки чтения"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "попытка выйти из режима копирования"
 
@@ -1169,768 +1271,781 @@ msgstr "\\crosstabview: неоднозначное имя столбца: \"%s\"
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: имя столбца не найдено: \"%s\""
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Схема"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Имя"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Тип данных результата"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Типы данных аргументов"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Описание"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "Список агрегатных функций"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "Сервер (версия %s) не поддерживает методы доступа."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "Индекс"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Таблица"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Обработчик"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "Список методов доступа"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Владелец"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "Расположение"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "Параметры"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Размер"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "Список табличных пространств"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df принимает в качестве параметров только [anptwS+]"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df принимает в качестве параметров только [%s]"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df не поддерживает параметр \"%c\" с сервером версии %s"
 
 # well-spelled: агр
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "агр."
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "оконная"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "проц."
 
 # well-spelled: функ
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "функ."
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "триггерная"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "постоянная"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "стабильная"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "изменчивая"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "Изменчивость"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "ограниченная"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "безопасная"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "небезопасная"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "Параллельность"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "определившего"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "вызывающего"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "Безопасность"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "да"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "нет"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Герметичная?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "Язык"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Внутреннее имя"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "Список функций"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "Элементы"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "Список типов данных"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Тип левого аргумента"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Тип правого аргумента"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "Результирующий тип"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Функция"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "Список операторов"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Провайдер локали"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "LC_COLLATE"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "LC_CTYPE"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Локаль"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "Правила ICU"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Табл. пространство"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Список баз данных"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "таблица"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "представление"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "материализованное представление"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "последовательность"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "сторонняя таблица"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "секционированная таблица"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Права для столбцов"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Политики"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Права доступа"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "функция"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "тип"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "схема"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "большой объект"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Права доступа по умолчанию"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "Объект"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "ограничение таблицы"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "ограничение домена"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "класс операторов"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "семейство операторов"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "правило"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Описание объекта"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "Отношение \"%s\" не найдено."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "Отношения не найдены."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "Отношение с OID %s не найдено."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Начальное_значение"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Минимум"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Максимум"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Шаг"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "да"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "нет"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "Зацикливается?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Кешируется"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Владелец: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Последовательность для столбца идентификации: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Нежурналируемая последовательность \"%s.%s\""
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Последовательность \"%s.%s\""
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Нежурналируемая таблица \"%s.%s\""
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Таблица \"%s.%s\""
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Представление \"%s.%s\""
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Нежурналируемое материализованное представление \"%s.%s\""
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Материализованное представление \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Нежурналируемый индекс \"%s.%s\""
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Индекс \"%s.%s\""
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Нежурналируемый секционированный индекс \"%s.%s\""
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Секционированный индекс \"%s.%s\""
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-таблица \"%s.%s\""
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Составной тип \"%s.%s\""
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Сторонняя таблица \"%s.%s\""
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Нежурналируемая секционированная таблица \"%s.%s\""
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Секционированная таблица \"%s.%s\""
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Правило сортировки"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "Допустимость NULL"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "По умолчанию"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "Ключевой?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Определение"
 
 # well-spelled: ОСД
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "Параметры ОСД"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "Хранилище"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "Сжатие"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Цель для статистики"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Секция: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Нет ограничения секции"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Ограничение секции: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Ключ разбиения: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Принадлежит таблице: \"%s.%s\""
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "первичный ключ, "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "уникальный"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " null не различаются"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "для таблицы \"%s.%s\""
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", предикат (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", кластеризованный"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", нерабочий"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", откладываемый"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", изначально отложенный"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", репликационный"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Индексы:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Ограничения-проверки:"
 
 # TO REWVIEW
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Ограничения внешнего ключа:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Ссылки извне:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Политики:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Политики (усиленная защита строк включена):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Политики (защита строк включена): (Нет)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Политики (усиленная защита строк включена): (Нет)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Политики (защита строк выключена):"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Объекты статистики:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Правила:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Отключённые правила:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Правила, срабатывающие всегда:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Правила, срабатывающие только в реплике:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Публикации:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Ограничения NOT NULL:"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (локальное, не наследуется)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (наследуется)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Определение представления:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Триггеры:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Отключённые пользовательские триггеры:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Отключённые внутренние триггеры:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Триггеры, срабатывающие всегда:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Триггеры, срабатывающие только в реплике:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Сервер: %s"
 
 # well-spelled: ОСД
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "Параметр ОСД: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Наследует"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Число секций: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Число секций: %d (чтобы просмотреть их, введите \\d+)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Дочерних таблиц: %d (чтобы просмотреть и их, воспользуйтесь \\d+)"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Дочерние таблицы"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Секции"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Типизированная таблица типа: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Идентификация реплики"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Содержит OID: да"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Метод доступа: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", табл. пространство \"%s\""
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "Список ролей"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Имя роли"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Суперпользователь"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "Не наследуется"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "Создаёт роли"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "Создаёт БД"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "Вход запрещён"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "Репликация"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Пропускать RLS"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "Нет подключений"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
@@ -1938,401 +2053,478 @@ msgstr[0] "%d подключение"
 msgstr[1] "%d подключения"
 msgstr[2] "%d подключений"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Пароль действует до "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "Роль"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "БД"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "Параметры"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "Параметры для роли \"%s\" и базы данных \"%s\" не найдены."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "Параметры для роли \"%s\" не найдены."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "Никакие параметры не найдены."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Список параметров"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "Член ролей"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Праводатель"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "Список назначений ролей"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "индекс"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST-таблица"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "секционированный индекс"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "постоянное"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "временное"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "нежурналируемое"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Хранение"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Метод доступа"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "Отношения с именем \"%s\" не найдены."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "Таблицы с именем \"%s\" не найдены."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "Индексы с именем \"%s\" не найдены."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "Представления с именем \"%s\" не найдены."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "Материализованные представления с именем \"%s\" не найдены."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "Последовательности с именем \"%s\" не найдены."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "Сторонние таблицы с именем \"%s\" не найдены."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "Никакие таблицы не найдены."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "Никакие индексы не найдены."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "Никакие представления не найдены."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "Никакие материализованные представления не найдены."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "Никакие последовательности не найдены."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "Никакие сторонние таблицы не найдены."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Список отношений"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "Список таблиц"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "Список индексов"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "Список представлений"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "Список материализованных представлений"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "Список последовательностей"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "Список сторонних таблиц"
+
+#: describe.c:4282
 #, c-format
 msgid ""
 "The server (version %s) does not support declarative table partitioning."
 msgstr ""
 "Сервер (версия %s) не поддерживает декларативное секционирование таблиц."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Список секционированных индексов"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Список секционированных таблиц"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Список секционированных отношений"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Имя родителя"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Размер конечной секции"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Общий размер"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "Доверенный"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Внутренний язык"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Обработчик вызова"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Функция проверки"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Обработчик внедрённого кода"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "Список языков"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "Проверка"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Список доменов"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "Источник"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "Назначение"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "По умолчанию?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Список преобразований"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "Параметр"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "Значение"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "Контекст"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Список параметров конфигурации"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Список изменённых параметров конфигурации"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "Сервер (версия %s) не поддерживает событийные триггеры."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "Событие"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "включён"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "реплика"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "всегда"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "отключён"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Включён"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "Теги"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Список событийных триггеров"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "Сервер (версия %s) не поддерживает расширенные статистики."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "Список расширенных статистик"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Исходный тип"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Целевой тип"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "в присваивании"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Неявное?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Список приведений типов"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Провайдер"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Детерминированное?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Список правил сортировки"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Список схем"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Список анализаторов текстового поиска"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "Анализатор текстового поиска \"%s\" не найден."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "Никакие анализаторы текстового поиска не найдены."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Начало разбора"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "Метод"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Получение следующего фрагмента"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "Окончание разбора"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Получение выдержки"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Получение типов фрагментов"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Анализатор текстового поиска \"%s.%s\""
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Анализатор текстового поиска \"%s\""
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "Имя фрагмента"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Типы фрагментов для анализатора \"%s.%s\""
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Типы фрагментов для анализатора \"%s\""
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "Шаблон"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "Параметры инициализации"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Список словарей текстового поиска"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "Инициализация"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Выделение лексем"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Список шаблонов текстового поиска"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Список конфигураций текстового поиска"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "Конфигурация текстового поиска \"%s\" не найдена."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "Никакие конфигурации текстового поиска не найдены."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "Фрагмент"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Словари"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Конфигурация текстового поиска \"%s.%s\""
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Конфигурация текстового поиска \"%s\""
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2341,7 +2533,7 @@ msgstr ""
 "\n"
 "Анализатор: \"%s.%s\""
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2350,273 +2542,277 @@ msgstr ""
 "\n"
 "Анализатор: \"%s\""
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Список обёрток сторонних данных"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Обёртка сторонних данных"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Версия"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Список сторонних серверов"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Сервер"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Список сопоставлений пользователей"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "Список сторонних таблиц"
+#: describe.c:6196
+msgid "Default version"
+msgstr "Версия по умолчанию"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Список установленных расширений"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "Расширение \"%s\" не найдено."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "Никакие расширения не найдены."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "Описание объекта"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Объекты в расширении \"%s\""
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное имя (слишком много компонентов): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "ссылки между базами не реализованы: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "Сервер (версия %s) не поддерживает публикации."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Все таблицы"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Добавления"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Изменения"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Удаления"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Опустошения"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "Генерируемые столбцы"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Через корень"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Список публикаций"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "Публикация \"%s\" не найдена."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "Никакие публикации не найдены."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Публикация %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Таблицы:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Таблицы из схем:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "Сервер (версия %s) не поддерживает подписки."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "Публикация"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "Бинарная"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "Потоковая"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Двухфазная фиксация"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Отключается при ошибке"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "Источник"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "Требуется пароль"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "Использовать владельца?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "Переносимая"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Синхронная фиксация"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Строка подключения"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Пропустить LSN"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Список подписок"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(нет)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "МД"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "Входной тип"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Тип хранения"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Класс операторов"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Семейство операторов"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Список классов операторов"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Применимые типы"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Список семейств операторов"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "Оператор"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Стратегия"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "сортировка"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "поиск"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Назначение"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "Семейство для сортировки"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "Список операторов из семейств операторов"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Зарегистрированный левый тип"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Зарегистрированный правый тип"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "Номер"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Список опорных функций из семейств операторов"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "Большие объекты"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2624,11 +2820,11 @@ msgstr ""
 "psql - это интерактивный терминал PostgreSQL.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:502
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2636,11 +2832,11 @@ msgstr ""
 "  psql [ПАРАМЕТР]... [БД [ПОЛЬЗОВАТЕЛЬ]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "Общие параметры:\n"
 
-#: help.c:68
+#: help.c:65
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
 "exit\n"
@@ -2648,19 +2844,19 @@ msgstr ""
 "  -c, --command=КОМАНДА    выполнить одну команду (SQL или внутреннюю) и "
 "выйти\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=БД          имя целевой базы данных\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=ИМЯ_ФАЙЛА     выполнить команды из файла и выйти\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list               вывести список баз данных и выйти\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2670,16 +2866,16 @@ msgstr ""
 "                           присвоить переменной psql ИМЯ заданное ЗНАЧЕНИЕ\n"
 "                           (например: -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            показать версию и выйти\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr ""
 "  -X, --no-psqlrc          игнорировать файл параметров запуска (~/.psqlrc)\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-"
@@ -2689,20 +2885,20 @@ msgstr ""
 "                           выполнить как одну транзакцию\n"
 "                           (в неинтерактивном режиме)\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=options]     показать эту справку и выйти\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commands      перечислить команды с \\ и выйти\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr ""
 "      --help=variables     перечислить специальные переменные и выйти\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2710,54 +2906,54 @@ msgstr ""
 "\n"
 "Параметры ввода/вывода:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           отображать все команды из скрипта\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        отображать команды с ошибками\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       отображать команды, отправляемые серверу\n"
 
-#: help.c:87
+#: help.c:84
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr ""
 "  -E, --echo-hidden        выводить запросы, порождённые внутренними "
 "командами\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ИМЯ_ФАЙЛА сохранять протокол работы в файл\n"
 
-#: help.c:89
+#: help.c:86
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline        отключить редактор командной строки readline\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=ИМЯ_ФАЙЛА   направить результаты запроса в файл (или канал "
 "|)\n"
 
-#: help.c:91
+#: help.c:88
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet              показывать только результаты запросов, без "
 "сообщений\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step        пошаговый режим (подтверждение каждого запроса)\n"
 
-#: help.c:93
+#: help.c:90
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
 "command)\n"
@@ -2765,7 +2961,7 @@ msgstr ""
 "  -S, --single-line        однострочный режим (конец строки завершает "
 "команду)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2773,11 +2969,11 @@ msgstr ""
 "\n"
 "Параметры вывода:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           режим вывода невыровненной таблицы\n"
 
-#: help.c:97
+#: help.c:94
 msgid ""
 "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr ""
@@ -2785,7 +2981,7 @@ msgstr ""
 "разделённые\n"
 "                           запятыми)\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -2796,11 +2992,11 @@ msgstr ""
 "                           разделителей полей при невыровненном выводе\n"
 "                           (по умолчанию: \"%s\")\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               вывод таблицы в формате HTML\n"
 
-#: help.c:102
+#: help.c:99
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
 "command)\n"
@@ -2809,7 +3005,7 @@ msgstr ""
 "ЗНАЧЕНИЕМ)\n"
 "                           (см. описание \\pset)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: "
@@ -2819,22 +3015,22 @@ msgstr ""
 "                           разделитель записей при невыровненном выводе\n"
 "                           (по умолчанию: новая строка)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        выводить только кортежи\n"
 
-#: help.c:106
+#: help.c:103
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
 "border)\n"
 msgstr ""
 "  -T, --table-attr=ТЕКСТ   установить атрибуты HTML-таблицы (width, border)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           включить развёрнутый вывод таблицы\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero "
@@ -2844,7 +3040,7 @@ msgstr ""
 "                           сделать разделителем полей при невыровненном\n"
 "                           выводе нулевой байт\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero "
@@ -2854,7 +3050,7 @@ msgstr ""
 "                           сделать разделителем записей при невыровненном\n"
 "                           нулевой байт\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2862,32 +3058,32 @@ msgstr ""
 "\n"
 "Параметры подключения:\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ           компьютер с сервером баз данных или каталог "
 "сокетов\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=ПОРТ          порт сервера баз данных\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=ИМЯ       имя пользователя БД\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        не запрашивать пароль\n"
 
-#: help.c:118
+#: help.c:115
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
 msgstr ""
 "  -W, --password           запрашивать пароль всегда (обычно не требуется)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or "
@@ -2903,40 +3099,36 @@ msgstr ""
 "документации PostgreSQL.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "Общие\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [ПАРАМЕТР]...    задать параметры запроса\n"
-
 # skip-rule: copyright
-#: help.c:168
+#: help.c:164
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright             условия использования и распространения "
 "PostgreSQL\n"
 
-#: help.c:169
+#: help.c:165
 msgid ""
 "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr ""
 "  \\crosstabview [СТОЛБЦЫ] выполнить запрос и вывести результат в "
 "перекрёстном виде\n"
 
-#: help.c:170
+#: help.c:166
 msgid ""
 "  \\errverbose            show most recent error message at maximum "
 "verbosity\n"
@@ -2944,7 +3136,7 @@ msgstr ""
 "  \\errverbose            вывести максимально подробное сообщение о "
 "последней ошибке\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2953,13 +3145,13 @@ msgstr ""
 "                          или канал |); \\g без аргументов равнозначно \";"
 "\"\n"
 
-#: help.c:173
+#: help.c:169
 msgid ""
 "  \\gdesc                 describe result of query, without executing it\n"
 msgstr ""
 "  \\gdesc                 описать результат запроса, но не выполнять его\n"
 
-#: help.c:174
+#: help.c:170
 msgid ""
 "  \\gexec                 execute query, then execute each value in its "
 "result\n"
@@ -2967,7 +3159,7 @@ msgstr ""
 "  \\gexec                 выполнить запрос, а затем выполнить каждую строку "
 "в результате\n"
 
-#: help.c:175
+#: help.c:171
 msgid ""
 "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr ""
@@ -2975,14 +3167,30 @@ msgstr ""
 "переменных\n"
 "                         psql\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr ""
 "  \\gx [(ПАРАМЕТРЫ)] [ФАЙЛ] то же, что \\g, но в режиме развёрнутого вывода\n"
 
-#: help.c:177
-msgid "  \\q                     quit psql\n"
-msgstr "  \\q                     выйти из psql\n"
+#: help.c:173
+msgid "  \\q                     quit psql\n"
+msgstr "  \\q                     выйти из psql\n"
+
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict ОГРАНИЧИВАЮЩИЙ_КЛЮЧ\n"
+"                         войти в ограниченный режим с указанным ключом\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict ОГРАНИЧИВАЮЩИЙ_КЛЮЧ\n"
+"                         выйти из ограниченного режима, если ключ совпадает\n"
 
 #: help.c:178
 msgid ""
@@ -2995,8 +3203,8 @@ msgstr ""
 "более\n"
 "                         N раз, остановиться, если получено менее MIN строк\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -3146,260 +3354,267 @@ msgid "Informational\n"
 msgstr "Информационные\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
+msgid ""
+"  (options: S = show system objects, x = expanded mode, + = additional "
+"detail)\n"
 msgstr ""
-"  (дополнения: S = показывать системные объекты, + = дополнительные "
-"подробности)\n"
+"  (дополнения: S = показывать системные объекты, x = расширенный режим, + = "
+"дополнительные подробности)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
 msgstr ""
-"  \\d[S+]                 список таблиц, представлений и "
+"  \\d[Sx+]                список таблиц, представлений и "
 "последовательностей\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr ""
-"  \\d[S+]  ИМЯ            описание таблицы, представления, "
+"  \\d[S+]   ИМЯ           описание таблицы, представления, "
 "последовательности\n"
 "                         или индекса\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [МАСКА]        список агрегатных функций\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [МАСКА]       список агрегатных функций\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [МАСКА]        список методов доступа\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [МАСКА]       список методов доступа\n"
 
 # well-spelled: МСК
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [МСК_МД [МСК_ТИПА]]  список классов операторов\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [МСК_МД [МСК_ТИПА]]  список классов операторов\n"
 
 # well-spelled: МСК
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [МСК_МД [МСК_ТИПА]]  список семейств операторов\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [МСК_МД [МСК_ТИПА]]  список семейств операторов\n"
 
 # well-spelled: МСК
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
 msgstr ""
-"  \\dAo[+] [МСК_МД [МСК_СОП]]   список операторов из семейств операторов\n"
+"  \\dAo[x+] [МСК_МД [МСК_СОП]]   список операторов из семейств операторов\n"
 
 # well-spelled: МСК
 #: help.c:229
 msgid ""
-"  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [МСК_МД [МСК_СОП]]   список опорных функций из семейств\n"
+"  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator "
+"families\n"
+msgstr "  \\dAp[x+] [МСК_МД [МСК_СОП]]   список опорных функций из семейств\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [МАСКА]        список табличных пространств\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [МАСКА]       список табличных пространств\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [МАСКА]        список преобразований\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [МАСКА]        список преобразований\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [МАСКА]    список параметров конфигурации\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [МАСКА]   список параметров конфигурации\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [МАСКА]        список приведений типов\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [МАСКА]       список приведений типов\n"
 
 #: help.c:234
 msgid ""
-"  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
+"  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
 msgstr ""
-"  \\dd[S]  [МАСКА]        описания объектов, не выводимые в других режимах\n"
+"  \\dd[Sx]  [МАСКА]       описания объектов, не выводимые в других режимах\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [МАСКА]        список доменов\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [МАСКА]       список доменов\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp    [МАСКА]        список прав по умолчанию\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]  [МАСКА]       список прав по умолчанию\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [МАСКА]        список сторонних таблиц\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [МАСКА]       список сторонних таблиц\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [МАСКА]        список сторонних серверов\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [МАСКА]       список сторонних серверов\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [МАСКА]        список сторонних таблиц\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [МАСКА]       список сторонних таблиц\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [МАСКА]        список сопоставлений пользователей\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [МАСКА]       список сопоставлений пользователей\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [МАСКА]        список обёрток сторонних данных\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [МАСКА]       список обёрток сторонних данных\n"
 
 # well-spelled: МСК, ФУНК
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] "
 "functions\n"
 msgstr ""
-"  \\df[anptw][S+] [МСК_ФУНК [МСК_ТИПА ...]]\n"
+"  \\df[anptw][Sx+] [МСК_ФУНК [МСК_ТИПА ...]]\n"
 "                         список функций [только агрегатных/обычных/процедур/"
 "триггеров/оконных]\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [МАСКА]        список конфигураций текстового поиска\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [МАСКА]       список конфигураций текстового поиска\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [МАСКА]        список словарей текстового поиска\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [МАСКА]       список словарей текстового поиска\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [МАСКА]        список анализаторов текстового поиска\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [МАСКА]       список анализаторов текстового поиска\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [МАСКА]        список шаблонов текстового поиска\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [МАСКА]       список шаблонов текстового поиска\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [МАСКА]        список ролей\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [МАСКА]       список ролей\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [МАСКА]        список индексов\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [МАСКА]       список индексов\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
 msgstr ""
-"  \\dl[+]                 список больших объектов (то же, что и \\lo_list)\n"
+"  \\dl[x+]                список больших объектов (то же, что и \\lo_list)\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [МАСКА]        список языков процедур\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [МАСКА]       список процедурных языков\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [МАСКА]        список материализованных представлений\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [МАСКА]       список материализованных представлений\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [МАСКА]        список схем\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [МАСКА]       список схем\n"
 
 # well-spelled: МСК
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
 msgstr ""
-"  \\do[S+] [МСК_ОП [МСК_ТИПА [МСК_ТИПА]]]\n"
+"  \\do[Sx+] [МСК_ОП [МСК_ТИПА [МСК_ТИПА]]]\n"
 "                         список операторов\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [МАСКА]        список правил сортировки\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [МАСКА]       список правил сортировки\n"
 
 #: help.c:257
 msgid ""
-"  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
+"  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
 msgstr ""
-"  \\dp[S]  [МАСКА]        список прав доступа к таблицам, представлениям и\n"
+"  \\dp[Sx]  [МАСКА]       список прав доступа к таблицам, представлениям и\n"
 "                         последовательностям\n"
 
 #: help.c:258
 msgid ""
-"  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations "
+"  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations "
 "[n=nested]\n"
 msgstr ""
-"  \\dP[itn+] [МАСКА]      список секционированных отношений\n"
+"  \\dP[itnx+] [МАСКА]     список секционированных отношений\n"
 "                          [только индексов (i)/таблиц (t)], с вложенностью "
 "(n)\n"
 
 # well-spelled: МСК
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
-msgstr "  \\drds [МСК_РОЛИ [МСК_БД]] список параметров роли на уровне БД\n"
-
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\drg[S] [МАСКА]        список назначений ролей\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
+msgstr ""
+"  \\drds[x] [МСК_РОЛИ [МСК_БД]]\n"
+"                         список параметров роли на уровне БД\n"
 
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [МАСКА]        список публикаций для репликации\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\drg[Sx] [МАСКА]       список назначений ролей\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [МАСКА]        список подписок на репликацию\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [МАСКА]       список публикаций для репликации\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [МАСКА]        список последовательностей\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [МАСКА]       список подписок на репликацию\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [МАСКА]        список таблиц\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [МАСКА]       список последовательностей\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [МАСКА]        список типов данных\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [МАСКА]       список таблиц\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [МАСКА]        список ролей\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [МАСКА]       список типов данных\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [МАСКА]        список представлений\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [МАСКА]       список ролей\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [МАСКА]        список расширений\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [МАСКА]       список представлений\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [МАСКА]        список расширенных статистик\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [МАСКА]       список расширений\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]  [МАСКА]        список событийных триггеров\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [МАСКА]       список расширенных статистик\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [МАСКА]        список баз данных\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [МАСКА]       список событийных триггеров\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  ИМЯ_ФУНКЦИИ    показать определение функции\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [МАСКА]       список баз данных\n"
 
-# well-spelled: ПРЕДСТ
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  ИМЯ_ПРЕДСТ     показать определение представления\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]   ИМЯ_ФУНКЦИИ   показать определение функции\n"
 
+# well-spelled: ПРЕДСТ
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]   [МАСКА]        то же, что и \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]   ИМЯ_ПРЕДСТ    показать определение представления\n"
+
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]   [МАСКА]       то же, что и \\dp\n"
 
-#: help.c:277
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "Большие объекты\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr "  \\lo_export OID_БО ФАЙЛ записать большой объект в файл\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3407,32 +3622,32 @@ msgstr ""
 "  \\lo_import ФАЙЛ [КОММЕНТАРИЙ]\n"
 "                         прочитать большой объект из файла\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+]            список больших объектов\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]           список больших объектов\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink OID_БО      удалить большой объект\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Форматирование\n"
 
-#: help.c:286
+#: help.c:287
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                     переключение режимов вывода:\n"
 "                         неформатированный/выровненный\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [СТРОКА]            задать заголовок таблицы или убрать, если не "
 "задан\n"
 
-#: help.c:288
+#: help.c:289
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
 "output\n"
@@ -3440,13 +3655,13 @@ msgstr ""
 "  \\f [СТРОКА]            показать или установить разделитель полей для\n"
 "                         неформатированного вывода\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr ""
 "  \\H                     переключить режим вывода в HTML (текущий: %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3464,34 +3679,34 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            режим вывода только строк (сейчас: %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [СТРОКА]            задать атрибуты для <table> или убрать, если не "
 "заданы\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr ""
 "  \\x [on|off|auto]       переключить режим развёрнутого вывода (сейчас: "
 "%s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "auto"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "Соединение\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3501,7 +3716,7 @@ msgstr ""
 "                         подключиться к другой базе данных\n"
 "                         (текущая: \"%s\")\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3510,43 +3725,43 @@ msgstr ""
 "                         подключиться к другой базе данных\n"
 "                         (сейчас подключения нет)\n"
 
-#: help.c:313
+#: help.c:314
 msgid ""
 "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              информация о текущем соединении\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [КОДИРОВКА]  показать/установить клиентскую кодировку\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [ИМЯ]        безопасно сменить пароль пользователя\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Операционная система\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [ПУТЬ]             сменить текущий каталог\n"
 
 # well-spelled: ОКР
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv ПЕР_PSQL ПЕР_ОКР прочитать переменную окружения\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr ""
 "  \\setenv ИМЯ [ЗНАЧЕНИЕ] установить или сбросить переменную окружения\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       включить/выключить секундомер (сейчас: %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
 "shell\n"
@@ -3554,17 +3769,17 @@ msgstr ""
 "  \\! [КОМАНДА]           выполнить команду в командной оболочке\n"
 "                         или запустить интерактивную оболочку\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "Переменные\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [ТЕКСТ] ИМЯ    предложить пользователю задать внутреннюю "
 "переменную\n"
 
-#: help.c:329
+#: help.c:330
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
 "parameters\n"
@@ -3572,11 +3787,85 @@ msgstr ""
 "  \\set [ИМЯ [ЗНАЧЕНИЕ]]  установить внутреннюю переменную или вывести все,\n"
 "                         если имя не задано\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset ИМЯ             сбросить (удалить) внутреннюю переменную\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "Протокол расширенных запросов\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [ПАРАМЕТР]...    задать параметры запроса\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared "
+"statement\n"
+msgstr ""
+"  \\bind_named ИМЯ_ОПЕР [ПАРАМ]...\n"
+"                         задать параметры запроса для существующего "
+"подготовленного\n"
+"                         оператора\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared ИМЯ_ОПЕР\n"
+"                         закрыть существующий подготовленный оператор\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           выйти из конвейерного режима\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr ""
+"  \\flush                 передать серверу выводимые данные из буфера\n"
+
+#: help.c:342
+msgid ""
+"  \\flushrequest          send request to the server to flush its output "
+"buffer\n"
+msgstr ""
+"  \\flushrequest          передать запрос серверу, чтобы сбросить его буфер "
+"вывода\n"
+
+#: help.c:343
+msgid ""
+"  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no "
+"argument\n"
+msgstr ""
+"  \\getresults [КОЛ_РЕЗ]  прочитать заданное количество результатов либо "
+"все,\n"
+"                          если параметр не указан\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse ИМЯ_ОПЕР        создать подготовленный оператор\n"
+
+#: help.c:345
+msgid ""
+"  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr ""
+"  \\sendpipeline          передать расширенный запрос в текущий конвейер\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         перейти в конвейерный режим\n"
+
+#: help.c:347
+msgid ""
+"  \\syncpipeline          add a synchronisation point to an ongoing "
+"pipeline\n"
+msgstr ""
+"  \\syncpipeline          добавить точку синхронизации в текущий конвейер\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
@@ -3584,11 +3873,11 @@ msgstr ""
 "Список специальных переменных\n"
 "\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "Переменные psql:\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3598,7 +3887,7 @@ msgstr ""
 "  или \\set ИМЯ ЗНАЧЕНИЕ в приглашении psql\n"
 "\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3606,7 +3895,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    если установлен, успешные SQL-команды фиксируются автоматически\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3618,7 +3907,7 @@ msgstr ""
 "                      preserve-lower (сохранять нижний),\n"
 "                      preserve-upper (сохранять верхний)]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3626,7 +3915,7 @@ msgstr ""
 "  DBNAME\n"
 "    имя текущей подключённой базы данных\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3637,7 +3926,7 @@ msgstr ""
 "    [all (всё), errors (ошибки), none (ничего),\n"
 "    queries (запросы)]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3647,7 +3936,7 @@ msgstr ""
 "    если включено, выводит внутренние запросы, порождаемые командами с \\;\n"
 "    если установлено значение \"noexec\", они выводятся, но не выполняются\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3655,7 +3944,7 @@ msgstr ""
 "  ENCODING\n"
 "    текущая кодировка клиентского набора символов\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3663,7 +3952,7 @@ msgstr ""
 "  ERROR\n"
 "    \"true\" в случае ошибки в последнем запросе, иначе — \"false\"\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = "
@@ -3673,7 +3962,7 @@ msgstr ""
 "    число результирующих строк, извлекаемых и отображаемых за раз\n"
 "    (0 = без ограничений)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3681,7 +3970,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    если установлено, табличные методы доступа не выводятся\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3689,7 +3978,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    если установлено, методы сжатия не выводятся\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3698,7 +3987,7 @@ msgstr ""
 "    управляет историей команд [ignorespace (игнорировать пробелы),\n"
 "    ignoredups (игнорировать дубли), ignoreboth (и то, и другое)]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3706,7 +3995,7 @@ msgstr ""
 "  HISTFILE\n"
 "    имя файла, в котором будет сохраняться история команд\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3714,7 +4003,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    максимальное число команд, сохраняемых в истории\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3722,7 +4011,7 @@ msgstr ""
 "  HOST\n"
 "    компьютер с сервером баз данных, к которому установлено подключение\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3730,7 +4019,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    количество EOF для завершения интерактивного сеанса\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3738,7 +4027,7 @@ msgstr ""
 "  LASTOID\n"
 "    значение последнего задействованного OID\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3751,7 +4040,7 @@ msgstr ""
 "\"00000\",\n"
 "    если ошибки не было\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3760,7 +4049,7 @@ msgstr ""
 "    если установлено, транзакция не прекращается при ошибке\n"
 "    (используются неявные точки сохранения)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3768,7 +4057,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    останавливать выполнение пакета команд после ошибки\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3776,7 +4065,7 @@ msgstr ""
 "  PORT\n"
 "    порт сервера для текущего соединения\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3784,7 +4073,7 @@ msgstr ""
 "  PROMPT1\n"
 "    устанавливает стандартное приглашение psql\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous "
@@ -3794,7 +4083,7 @@ msgstr ""
 "    устанавливает приглашение, которое выводится при переносе оператора\n"
 "    на новую строку\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3802,7 +4091,7 @@ msgstr ""
 "  PROMPT3\n"
 "    устанавливает приглашение для выполнения COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3810,7 +4099,7 @@ msgstr ""
 "  QUIET\n"
 "    выводить минимум сообщений (как и с параметром -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3819,7 +4108,7 @@ msgstr ""
 "    число строк, возвращённых или обработанных последним SQL-запросом, либо "
 "0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3829,7 +4118,7 @@ msgstr ""
 "  SERVER_VERSION_NUM\n"
 "    версия сервера (в коротком текстовом и числовом формате)\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3838,7 +4127,7 @@ msgstr ""
 "    \"true\" в случае ошибки последней команды оболочки, \"false\" в ином "
 "случае\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3846,7 +4135,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    код завершения последней команды оболочки\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3855,7 +4144,7 @@ msgstr ""
 "    выводить все результаты объединённых запросов (\\;), а не только "
 "последнего\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3864,7 +4153,7 @@ msgstr ""
 "    управляет отображением полей контекста сообщений\n"
 "    [never (не отображать никогда), errors (ошибки), always (всегда]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3873,7 +4162,7 @@ msgstr ""
 "    если установлено, конец строки завершает режим ввода SQL-команды\n"
 "    (как и с параметром -S)\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3881,7 +4170,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    пошаговый режим (как и с параметром -s)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3890,7 +4179,7 @@ msgstr ""
 "    SQLSTATE последнего запроса или \"00000\", если он выполнился без "
 "ошибок\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3898,7 +4187,7 @@ msgstr ""
 "  USER\n"
 "    текущий пользователь, подключённый к БД\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3907,7 +4196,7 @@ msgstr ""
 "    управляет детализацией отчётов об ошибках [default (по умолчанию),\n"
 "    verbose (подробно), terse (кратко), sqlstate (код состояния)]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3919,7 +4208,17 @@ msgstr ""
 "  VERSION_NUM\n"
 "    версия psql (в развёрнутом, в коротком текстовом и в числовом формате)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL\n"
+"    сколько секунд \\watch будет ждать перед следующим выполнением запроса\n"
+"    (по умолчанию %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3927,7 +4226,7 @@ msgstr ""
 "\n"
 "Параметры отображения:\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3937,7 +4236,7 @@ msgstr ""
 "  или \\pset ИМЯ [ЗНАЧЕНИЕ] в приглашении psql\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3945,7 +4244,7 @@ msgstr ""
 "  border\n"
 "    стиль границы (число)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3953,7 +4252,16 @@ msgstr ""
 "  columns\n"
 "    целевая ширина для формата с переносом\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    разделитель полей для формата вывода CSV (по умолчанию \"%c\")\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3961,7 +4269,7 @@ msgstr ""
 "  expanded (или x)\n"
 "    развёрнутый вывод [on (вкл.), off (выкл.), auto (авто)]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3970,7 +4278,7 @@ msgstr ""
 "  fieldsep\n"
 "    разделитель полей для неформатированного вывода (по умолчанию \"%s\")\n"
 
-#: help.c:468
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3978,7 +4286,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    устанавливает ноль разделителем полей при неформатированном выводе\n"
 
-#: help.c:470
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3986,7 +4294,7 @@ msgstr ""
 "  footer\n"
 "    включает или выключает вывод подписей таблицы [on (вкл.), off (выкл.)]\n"
 
-#: help.c:472
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3996,7 +4304,7 @@ msgstr ""
 "\n"
 "    aligned (выровненный), wrapped (с переносом), html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -4004,7 +4312,7 @@ msgstr ""
 "  linestyle\n"
 "    задаёт стиль рисования линий границы [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -4012,7 +4320,7 @@ msgstr ""
 "  null\n"
 "    устанавливает строку, выводимую вместо значения NULL\n"
 
-#: help.c:478
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of "
@@ -4021,7 +4329,7 @@ msgstr ""
 "  numericlocale\n"
 "    отключает вывод заданного локалью разделителя группы цифр\n"
 
-#: help.c:480
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -4030,7 +4338,7 @@ msgstr ""
 "    определяет, используется ли внешний постраничник\n"
 "    [yes (да), no (нет), always (всегда)]\n"
 
-#: help.c:482
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -4038,7 +4346,7 @@ msgstr ""
 "  recordsep\n"
 "    разделитель записей (строк) при неформатированном выводе\n"
 
-#: help.c:484
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -4046,7 +4354,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    устанавливает ноль разделителем записей при неформатированном выводе\n"
 
-#: help.c:486
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -4056,7 +4364,7 @@ msgstr ""
 "    задаёт атрибуты для тега table в формате html или пропорциональные\n"
 "    ширины столбцов для выровненных влево данных, в формате latex-longtable\n"
 
-#: help.c:489
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -4064,7 +4372,7 @@ msgstr ""
 "  title\n"
 "    задаёт заголовок таблицы для последовательно печатаемых таблиц\n"
 
-#: help.c:491
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -4072,7 +4380,7 @@ msgstr ""
 "  tuples_only\n"
 "    если установлено, выводятся только непосредственно табличные данные\n"
 
-#: help.c:493
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -4085,7 +4393,7 @@ msgstr ""
 "    задаёт стиль рисуемых линий Unicode [single (одинарные), double "
 "(двойные)]\n"
 
-#: help.c:497
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -4095,7 +4403,7 @@ msgstr ""
 "    задаёт максимальную ширину заголовка для развёрнутого вывода\n"
 "    [full (полностью), column (столбец), page (страница), целое значение]\n"
 
-#: help.c:501
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -4103,7 +4411,7 @@ msgstr ""
 "\n"
 "Переменные окружения:\n"
 
-#: help.c:505
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -4113,7 +4421,7 @@ msgstr ""
 "  или \\setenv ИМЯ [ЗНАЧЕНИЕ] в приглашении psql\n"
 "\n"
 
-#: help.c:507
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -4125,7 +4433,7 @@ msgstr ""
 "  или \\setenv ИМЯ ЗНАЧЕНИЕ в приглашении psql\n"
 "\n"
 
-#: help.c:510
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -4133,7 +4441,7 @@ msgstr ""
 "  COLUMNS\n"
 "    число столбцов для форматирования с переносом\n"
 
-#: help.c:512
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -4141,7 +4449,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    синоним параметра подключения application_name\n"
 
-#: help.c:514
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -4149,7 +4457,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    синоним параметра подключения dbname\n"
 
-#: help.c:516
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -4157,7 +4465,7 @@ msgstr ""
 "  PGHOST\n"
 "    синоним параметра подключения host\n"
 
-#: help.c:518
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -4165,7 +4473,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    имя файла с паролем\n"
 
-#: help.c:520
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -4173,7 +4481,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    пароль для подключения (использовать не рекомендуется)\n"
 
-#: help.c:522
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -4181,7 +4489,7 @@ msgstr ""
 "  PGPORT\n"
 "    синоним параметра подключения port\n"
 
-#: help.c:524
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -4189,7 +4497,7 @@ msgstr ""
 "  PGUSER\n"
 "    синоним параметра подключения user\n"
 
-#: help.c:526
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -4197,7 +4505,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    редактор, вызываемый командами \\e, \\ef и \\ev\n"
 
-#: help.c:528
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -4205,7 +4513,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    определяет способ передачи номера строки при вызове редактора\n"
 
-#: help.c:530
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -4213,7 +4521,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    альтернативное размещение файла с историей команд\n"
 
-#: help.c:532
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -4221,7 +4529,7 @@ msgstr ""
 "  PSQL_PAGER, PAGER\n"
 "    имя программы внешнего постраничника\n"
 
-#: help.c:535
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -4229,7 +4537,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    имя программы внешнего постраничника для \\watch\n"
 
-#: help.c:538
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -4237,7 +4545,7 @@ msgstr ""
 "  PSQLRC\n"
 "    альтернативное размещение пользовательского файла .psqlrc\n"
 
-#: help.c:540
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -4245,7 +4553,7 @@ msgstr ""
 "  SHELL\n"
 "    оболочка, вызываемая командой \\!\n"
 
-#: help.c:542
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -4253,11 +4561,11 @@ msgstr ""
 "  TMPDIR\n"
 "    каталог для временных файлов\n"
 
-#: help.c:602
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Имеющаяся справка:\n"
 
-#: help.c:697
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -4276,7 +4584,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:720
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4388,12 +4696,12 @@ msgstr ""
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "в закончившемся потоке команд не хватает \\endif"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершённая строка в кавычках"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: нехватка памяти"
@@ -4401,2420 +4709,2440 @@ msgstr "%s: нехватка памяти"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:245
-#: sql_help.c:247 sql_help.c:248 sql_help.c:250 sql_help.c:252 sql_help.c:255
-#: sql_help.c:257 sql_help.c:259 sql_help.c:261 sql_help.c:276 sql_help.c:277
-#: sql_help.c:278 sql_help.c:280 sql_help.c:329 sql_help.c:331 sql_help.c:333
-#: sql_help.c:335 sql_help.c:404 sql_help.c:409 sql_help.c:411 sql_help.c:453
-#: sql_help.c:455 sql_help.c:458 sql_help.c:460 sql_help.c:529 sql_help.c:534
-#: sql_help.c:539 sql_help.c:544 sql_help.c:549 sql_help.c:603 sql_help.c:605
-#: sql_help.c:607 sql_help.c:609 sql_help.c:611 sql_help.c:614 sql_help.c:616
-#: sql_help.c:619 sql_help.c:630 sql_help.c:632 sql_help.c:676 sql_help.c:678
-#: sql_help.c:680 sql_help.c:683 sql_help.c:685 sql_help.c:687 sql_help.c:728
-#: sql_help.c:732 sql_help.c:736 sql_help.c:757 sql_help.c:760 sql_help.c:763
-#: sql_help.c:792 sql_help.c:804 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:833 sql_help.c:836 sql_help.c:865 sql_help.c:870 sql_help.c:875
-#: sql_help.c:880 sql_help.c:885 sql_help.c:912 sql_help.c:914 sql_help.c:916
-#: sql_help.c:918 sql_help.c:921 sql_help.c:923 sql_help.c:970 sql_help.c:1015
-#: sql_help.c:1020 sql_help.c:1025 sql_help.c:1030 sql_help.c:1035
-#: sql_help.c:1054 sql_help.c:1065 sql_help.c:1067 sql_help.c:1087
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1118 sql_help.c:1120 sql_help.c:1132
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1138 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1163 sql_help.c:1167 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1175 sql_help.c:1176 sql_help.c:1179
-#: sql_help.c:1182 sql_help.c:1184 sql_help.c:1324 sql_help.c:1326
-#: sql_help.c:1329 sql_help.c:1332 sql_help.c:1334 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1464 sql_help.c:1466
-#: sql_help.c:1468 sql_help.c:1471 sql_help.c:1492 sql_help.c:1495
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1505 sql_help.c:1507
-#: sql_help.c:1509 sql_help.c:1511 sql_help.c:1525 sql_help.c:1528
-#: sql_help.c:1530 sql_help.c:1532 sql_help.c:1542 sql_help.c:1544
-#: sql_help.c:1554 sql_help.c:1556 sql_help.c:1566 sql_help.c:1569
-#: sql_help.c:1592 sql_help.c:1594 sql_help.c:1596 sql_help.c:1598
-#: sql_help.c:1601 sql_help.c:1603 sql_help.c:1606 sql_help.c:1609
-#: sql_help.c:1660 sql_help.c:1703 sql_help.c:1706 sql_help.c:1708
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:1715 sql_help.c:1717
-#: sql_help.c:1720 sql_help.c:1770 sql_help.c:1786 sql_help.c:2019
-#: sql_help.c:2088 sql_help.c:2107 sql_help.c:2120 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2196 sql_help.c:2224 sql_help.c:2257
-#: sql_help.c:2275 sql_help.c:2303 sql_help.c:2414 sql_help.c:2460
-#: sql_help.c:2485 sql_help.c:2508 sql_help.c:2512 sql_help.c:2546
-#: sql_help.c:2566 sql_help.c:2588 sql_help.c:2602 sql_help.c:2623
-#: sql_help.c:2652 sql_help.c:2685 sql_help.c:2708 sql_help.c:2755
-#: sql_help.c:3053 sql_help.c:3066 sql_help.c:3083 sql_help.c:3099
-#: sql_help.c:3139 sql_help.c:3193 sql_help.c:3197 sql_help.c:3199
-#: sql_help.c:3206 sql_help.c:3225 sql_help.c:3252 sql_help.c:3287
-#: sql_help.c:3299 sql_help.c:3308 sql_help.c:3352 sql_help.c:3366
-#: sql_help.c:3394 sql_help.c:3402 sql_help.c:3414 sql_help.c:3424
-#: sql_help.c:3432 sql_help.c:3440 sql_help.c:3448 sql_help.c:3456
-#: sql_help.c:3465 sql_help.c:3476 sql_help.c:3484 sql_help.c:3492
-#: sql_help.c:3500 sql_help.c:3508 sql_help.c:3518 sql_help.c:3527
-#: sql_help.c:3536 sql_help.c:3544 sql_help.c:3554 sql_help.c:3565
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3593 sql_help.c:3602
-#: sql_help.c:3610 sql_help.c:3618 sql_help.c:3626 sql_help.c:3634
-#: sql_help.c:3642 sql_help.c:3650 sql_help.c:3658 sql_help.c:3666
-#: sql_help.c:3674 sql_help.c:3682 sql_help.c:3699 sql_help.c:3708
-#: sql_help.c:3716 sql_help.c:3733 sql_help.c:3748 sql_help.c:4061
-#: sql_help.c:4182 sql_help.c:4211 sql_help.c:4227 sql_help.c:4229
-#: sql_help.c:4733 sql_help.c:4781 sql_help.c:4940
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "имя"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:340 sql_help.c:1863
-#: sql_help.c:3367 sql_help.c:4500
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "сигнатура_агр_функции"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:260
-#: sql_help.c:281 sql_help.c:412 sql_help.c:459 sql_help.c:538 sql_help.c:586
-#: sql_help.c:604 sql_help.c:631 sql_help.c:684 sql_help.c:759 sql_help.c:814
-#: sql_help.c:835 sql_help.c:874 sql_help.c:924 sql_help.c:971 sql_help.c:1024
-#: sql_help.c:1056 sql_help.c:1066 sql_help.c:1101 sql_help.c:1121
-#: sql_help.c:1135 sql_help.c:1185 sql_help.c:1333 sql_help.c:1465
-#: sql_help.c:1508 sql_help.c:1529 sql_help.c:1543 sql_help.c:1555
-#: sql_help.c:1568 sql_help.c:1595 sql_help.c:1661 sql_help.c:1714
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "новое_имя"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:258
-#: sql_help.c:279 sql_help.c:410 sql_help.c:495 sql_help.c:543 sql_help.c:633
-#: sql_help.c:642 sql_help.c:707 sql_help.c:731 sql_help.c:762 sql_help.c:817
-#: sql_help.c:879 sql_help.c:922 sql_help.c:1029 sql_help.c:1068
-#: sql_help.c:1099 sql_help.c:1119 sql_help.c:1133 sql_help.c:1183
-#: sql_help.c:1399 sql_help.c:1467 sql_help.c:1510 sql_help.c:1531
-#: sql_help.c:1593 sql_help.c:1709 sql_help.c:3039
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "новый_владелец"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:262 sql_help.c:332
-#: sql_help.c:461 sql_help.c:548 sql_help.c:686 sql_help.c:735 sql_help.c:765
-#: sql_help.c:820 sql_help.c:884 sql_help.c:1034 sql_help.c:1103
-#: sql_help.c:1137 sql_help.c:1335 sql_help.c:1512 sql_help.c:1533
-#: sql_help.c:1545 sql_help.c:1557 sql_help.c:1597 sql_help.c:1716
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "новая_схема"
 
-#: sql_help.c:44 sql_help.c:1927 sql_help.c:3368 sql_help.c:4529
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "где сигнатура_агр_функции:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:350 sql_help.c:363
-#: sql_help.c:367 sql_help.c:383 sql_help.c:386 sql_help.c:389 sql_help.c:530
-#: sql_help.c:535 sql_help.c:540 sql_help.c:545 sql_help.c:550 sql_help.c:866
-#: sql_help.c:871 sql_help.c:876 sql_help.c:881 sql_help.c:886 sql_help.c:1016
-#: sql_help.c:1021 sql_help.c:1026 sql_help.c:1031 sql_help.c:1036
-#: sql_help.c:1881 sql_help.c:1898 sql_help.c:1904 sql_help.c:1928
-#: sql_help.c:1931 sql_help.c:1934 sql_help.c:2089 sql_help.c:2108
-#: sql_help.c:2111 sql_help.c:2415 sql_help.c:2624 sql_help.c:3369
-#: sql_help.c:3372 sql_help.c:3375 sql_help.c:3466 sql_help.c:3555
-#: sql_help.c:3583 sql_help.c:3936 sql_help.c:4399 sql_help.c:4506
-#: sql_help.c:4513 sql_help.c:4519 sql_help.c:4530 sql_help.c:4533
-#: sql_help.c:4536
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "режим_аргумента"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:351 sql_help.c:364
-#: sql_help.c:368 sql_help.c:384 sql_help.c:387 sql_help.c:390 sql_help.c:531
-#: sql_help.c:536 sql_help.c:541 sql_help.c:546 sql_help.c:551 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:882 sql_help.c:887 sql_help.c:1017
-#: sql_help.c:1022 sql_help.c:1027 sql_help.c:1032 sql_help.c:1037
-#: sql_help.c:1882 sql_help.c:1899 sql_help.c:1905 sql_help.c:1929
-#: sql_help.c:1932 sql_help.c:1935 sql_help.c:2090 sql_help.c:2109
-#: sql_help.c:2112 sql_help.c:2416 sql_help.c:2625 sql_help.c:3370
-#: sql_help.c:3373 sql_help.c:3376 sql_help.c:3467 sql_help.c:3556
-#: sql_help.c:3584 sql_help.c:4507 sql_help.c:4514 sql_help.c:4520
-#: sql_help.c:4531 sql_help.c:4534 sql_help.c:4537
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "имя_аргумента"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:352 sql_help.c:365
-#: sql_help.c:369 sql_help.c:385 sql_help.c:388 sql_help.c:391 sql_help.c:532
-#: sql_help.c:537 sql_help.c:542 sql_help.c:547 sql_help.c:552 sql_help.c:868
-#: sql_help.c:873 sql_help.c:878 sql_help.c:883 sql_help.c:888 sql_help.c:1018
-#: sql_help.c:1023 sql_help.c:1028 sql_help.c:1033 sql_help.c:1038
-#: sql_help.c:1883 sql_help.c:1900 sql_help.c:1906 sql_help.c:1930
-#: sql_help.c:1933 sql_help.c:1936 sql_help.c:2417 sql_help.c:2626
-#: sql_help.c:3371 sql_help.c:3374 sql_help.c:3377 sql_help.c:3468
-#: sql_help.c:3557 sql_help.c:3585 sql_help.c:4508 sql_help.c:4515
-#: sql_help.c:4521 sql_help.c:4532 sql_help.c:4535 sql_help.c:4538
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "тип_аргумента"
 
-#: sql_help.c:114 sql_help.c:407 sql_help.c:484 sql_help.c:496 sql_help.c:965
-#: sql_help.c:1116 sql_help.c:1526 sql_help.c:1655 sql_help.c:1687
-#: sql_help.c:1739 sql_help.c:1798 sql_help.c:1987 sql_help.c:1994
-#: sql_help.c:2306 sql_help.c:2356 sql_help.c:2363 sql_help.c:2372
-#: sql_help.c:2461 sql_help.c:2686 sql_help.c:2777 sql_help.c:3068
-#: sql_help.c:3253 sql_help.c:3275 sql_help.c:3415 sql_help.c:3772
-#: sql_help.c:3980 sql_help.c:4226 sql_help.c:4228 sql_help.c:5006
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "параметр"
 
-#: sql_help.c:115 sql_help.c:966 sql_help.c:1656 sql_help.c:2462
-#: sql_help.c:2687 sql_help.c:3254 sql_help.c:3416
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "где допустимые параметры:"
 
-#: sql_help.c:116 sql_help.c:2238
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "разр_подключения"
 
-#: sql_help.c:117 sql_help.c:967 sql_help.c:1657 sql_help.c:2239
-#: sql_help.c:2463 sql_help.c:2688 sql_help.c:3255
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "предел_подключений"
 
-#: sql_help.c:118 sql_help.c:2240
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "это_шаблон"
 
-#: sql_help.c:124 sql_help.c:621 sql_help.c:689 sql_help.c:703 sql_help.c:1338
-#: sql_help.c:1392 sql_help.c:4232
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "новое_табл_пространство"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:558 sql_help.c:560
-#: sql_help.c:561 sql_help.c:891 sql_help.c:893 sql_help.c:894 sql_help.c:974
-#: sql_help.c:978 sql_help.c:981 sql_help.c:1043 sql_help.c:1045
-#: sql_help.c:1046 sql_help.c:1196 sql_help.c:1198 sql_help.c:1664
-#: sql_help.c:1668 sql_help.c:1671 sql_help.c:2427 sql_help.c:2630
-#: sql_help.c:3948 sql_help.c:4250 sql_help.c:4411 sql_help.c:4721
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "параметр_конфигурации"
 
-#: sql_help.c:128 sql_help.c:408 sql_help.c:479 sql_help.c:485 sql_help.c:497
-#: sql_help.c:559 sql_help.c:613 sql_help.c:695 sql_help.c:705 sql_help.c:892
-#: sql_help.c:920 sql_help.c:975 sql_help.c:1044 sql_help.c:1117
-#: sql_help.c:1162 sql_help.c:1166 sql_help.c:1170 sql_help.c:1173
-#: sql_help.c:1178 sql_help.c:1181 sql_help.c:1197 sql_help.c:1371
-#: sql_help.c:1394 sql_help.c:1442 sql_help.c:1450 sql_help.c:1470
-#: sql_help.c:1527 sql_help.c:1611 sql_help.c:1665 sql_help.c:1688
-#: sql_help.c:2307 sql_help.c:2357 sql_help.c:2364 sql_help.c:2373
-#: sql_help.c:2428 sql_help.c:2429 sql_help.c:2493 sql_help.c:2496
-#: sql_help.c:2530 sql_help.c:2631 sql_help.c:2632 sql_help.c:2655
-#: sql_help.c:2778 sql_help.c:2817 sql_help.c:2927 sql_help.c:2940
-#: sql_help.c:2954 sql_help.c:2995 sql_help.c:3003 sql_help.c:3025
-#: sql_help.c:3042 sql_help.c:3069 sql_help.c:3276 sql_help.c:3981
-#: sql_help.c:4722 sql_help.c:4723 sql_help.c:4724 sql_help.c:4725
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "значение"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "целевая_роль"
 
-#: sql_help.c:203 sql_help.c:929 sql_help.c:2291 sql_help.c:2660
-#: sql_help.c:2733 sql_help.c:2738 sql_help.c:3911 sql_help.c:3920
-#: sql_help.c:3939 sql_help.c:3951 sql_help.c:4374 sql_help.c:4383
-#: sql_help.c:4402 sql_help.c:4414
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "имя_схемы"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "предложение_GRANT_или_REVOKE"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "где допустимое предложение_GRANT_или_REVOKE:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:584 sql_help.c:620 sql_help.c:688 sql_help.c:838 sql_help.c:985
-#: sql_help.c:1337 sql_help.c:1675 sql_help.c:2466 sql_help.c:2467
-#: sql_help.c:2468 sql_help.c:2469 sql_help.c:2470 sql_help.c:2604
-#: sql_help.c:2691 sql_help.c:2692 sql_help.c:2693 sql_help.c:3258
-#: sql_help.c:3259 sql_help.c:3260 sql_help.c:3261 sql_help.c:3262
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:4423 sql_help.c:4427
-#: sql_help.c:4743
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "имя_роли"
 
-#: sql_help.c:246 sql_help.c:265 sql_help.c:472 sql_help.c:928 sql_help.c:1353
-#: sql_help.c:1355 sql_help.c:1359 sql_help.c:1409 sql_help.c:1421
-#: sql_help.c:1446 sql_help.c:1705 sql_help.c:2260 sql_help.c:2264
-#: sql_help.c:2376 sql_help.c:2381 sql_help.c:2489 sql_help.c:2659
-#: sql_help.c:2794 sql_help.c:2799 sql_help.c:2801 sql_help.c:2922
-#: sql_help.c:2935 sql_help.c:2949 sql_help.c:2958 sql_help.c:2970
-#: sql_help.c:2999 sql_help.c:4012 sql_help.c:4027 sql_help.c:4029
-#: sql_help.c:4125 sql_help.c:4128 sql_help.c:4130 sql_help.c:4593
-#: sql_help.c:4594 sql_help.c:4603 sql_help.c:4650 sql_help.c:4651
-#: sql_help.c:4652 sql_help.c:4653 sql_help.c:4654 sql_help.c:4655
-#: sql_help.c:4696 sql_help.c:4697 sql_help.c:4702 sql_help.c:4707
-#: sql_help.c:4851 sql_help.c:4852 sql_help.c:4861 sql_help.c:4908
-#: sql_help.c:4909 sql_help.c:4910 sql_help.c:4911 sql_help.c:4912
-#: sql_help.c:4913 sql_help.c:4968 sql_help.c:4970 sql_help.c:5036
-#: sql_help.c:5096 sql_help.c:5097 sql_help.c:5106 sql_help.c:5153
-#: sql_help.c:5154 sql_help.c:5155 sql_help.c:5156 sql_help.c:5157
-#: sql_help.c:5158
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "выражение"
 
-#: sql_help.c:249 sql_help.c:2261
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "ограничение_домена"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:256 sql_help.c:264 sql_help.c:487
-#: sql_help.c:488 sql_help.c:1330 sql_help.c:1379 sql_help.c:1380
-#: sql_help.c:1381 sql_help.c:1408 sql_help.c:1420 sql_help.c:1437
-#: sql_help.c:1869 sql_help.c:1871 sql_help.c:2263 sql_help.c:2375
-#: sql_help.c:2380 sql_help.c:2957 sql_help.c:2969 sql_help.c:4024
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "имя_ограничения"
 
-#: sql_help.c:254 sql_help.c:1331
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "имя_нового_ограничения"
 
-#: sql_help.c:263 sql_help.c:2262
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "где ограничение_домена может быть следующим:"
 
-#: sql_help.c:330 sql_help.c:1115
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "новая_версия"
 
-#: sql_help.c:334 sql_help.c:336
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "элемент_объект"
 
-#: sql_help.c:337
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "где элемент_объект:"
 
-#: sql_help.c:338 sql_help.c:343 sql_help.c:344 sql_help.c:345 sql_help.c:346
-#: sql_help.c:347 sql_help.c:348 sql_help.c:353 sql_help.c:357 sql_help.c:359
-#: sql_help.c:361 sql_help.c:370 sql_help.c:371 sql_help.c:372 sql_help.c:373
-#: sql_help.c:374 sql_help.c:375 sql_help.c:376 sql_help.c:377 sql_help.c:380
-#: sql_help.c:381 sql_help.c:1861 sql_help.c:1866 sql_help.c:1873
-#: sql_help.c:1874 sql_help.c:1875 sql_help.c:1876 sql_help.c:1877
-#: sql_help.c:1878 sql_help.c:1879 sql_help.c:1884 sql_help.c:1886
-#: sql_help.c:1890 sql_help.c:1892 sql_help.c:1896 sql_help.c:1901
-#: sql_help.c:1902 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1912 sql_help.c:1913 sql_help.c:1914 sql_help.c:1915
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:1918 sql_help.c:1919
-#: sql_help.c:1924 sql_help.c:1925 sql_help.c:4496 sql_help.c:4501
-#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4516 sql_help.c:4517 sql_help.c:4522
-#: sql_help.c:4523 sql_help.c:4524 sql_help.c:4525 sql_help.c:4526
-#: sql_help.c:4527
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "имя_объекта"
 
 # well-spelled: агр
-#: sql_help.c:339 sql_help.c:1862 sql_help.c:4499
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "имя_агр_функции"
 
-#: sql_help.c:341 sql_help.c:1864 sql_help.c:2154 sql_help.c:2158
-#: sql_help.c:2160 sql_help.c:3385
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "исходный_тип"
 
-#: sql_help.c:342 sql_help.c:1865 sql_help.c:2155 sql_help.c:2159
-#: sql_help.c:2161 sql_help.c:3386
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "целевой_тип"
 
-#: sql_help.c:349 sql_help.c:802 sql_help.c:1880 sql_help.c:2156
-#: sql_help.c:2199 sql_help.c:2279 sql_help.c:2547 sql_help.c:2578
-#: sql_help.c:3145 sql_help.c:4398 sql_help.c:4505 sql_help.c:4622
-#: sql_help.c:4626 sql_help.c:4630 sql_help.c:4633 sql_help.c:4880
-#: sql_help.c:4884 sql_help.c:4888 sql_help.c:4891 sql_help.c:5125
-#: sql_help.c:5129 sql_help.c:5133 sql_help.c:5136
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "имя_функции"
 
-#: sql_help.c:354 sql_help.c:795 sql_help.c:1887 sql_help.c:2571
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "имя_оператора"
 
-#: sql_help.c:355 sql_help.c:729 sql_help.c:733 sql_help.c:737 sql_help.c:1888
-#: sql_help.c:2548 sql_help.c:3509
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "тип_слева"
 
-#: sql_help.c:356 sql_help.c:730 sql_help.c:734 sql_help.c:738 sql_help.c:1889
-#: sql_help.c:2549 sql_help.c:3510
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "тип_справа"
 
-#: sql_help.c:358 sql_help.c:360 sql_help.c:758 sql_help.c:761 sql_help.c:764
-#: sql_help.c:793 sql_help.c:805 sql_help.c:813 sql_help.c:816 sql_help.c:819
-#: sql_help.c:1426 sql_help.c:1891 sql_help.c:1893 sql_help.c:2568
-#: sql_help.c:2589 sql_help.c:2975 sql_help.c:3519 sql_help.c:3528
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "метод_индекса"
 
-#: sql_help.c:362 sql_help.c:1897 sql_help.c:4512
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "имя_процедуры"
 
-#: sql_help.c:366 sql_help.c:1903 sql_help.c:3935 sql_help.c:4518
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "имя_подпрограммы"
 
-#: sql_help.c:378 sql_help.c:1398 sql_help.c:1920 sql_help.c:2423
-#: sql_help.c:2629 sql_help.c:2930 sql_help.c:3112 sql_help.c:3690
-#: sql_help.c:3957 sql_help.c:4420
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "имя_типа"
 
-#: sql_help.c:379 sql_help.c:1921 sql_help.c:2422 sql_help.c:2628
-#: sql_help.c:3113 sql_help.c:3343 sql_help.c:3691 sql_help.c:3942
-#: sql_help.c:4405
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "имя_языка"
 
-#: sql_help.c:382
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "и сигнатура_агр_функции:"
 
-#: sql_help.c:405 sql_help.c:2021 sql_help.c:2304
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "функция_обработчик"
 
-#: sql_help.c:406 sql_help.c:2305
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "функция_проверки"
 
-#: sql_help.c:454 sql_help.c:533 sql_help.c:677 sql_help.c:869 sql_help.c:1019
-#: sql_help.c:1325 sql_help.c:1602
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "действие"
 
-#: sql_help.c:456 sql_help.c:463 sql_help.c:467 sql_help.c:468 sql_help.c:471
-#: sql_help.c:473 sql_help.c:474 sql_help.c:475 sql_help.c:477 sql_help.c:480
-#: sql_help.c:482 sql_help.c:483 sql_help.c:681 sql_help.c:691 sql_help.c:693
-#: sql_help.c:696 sql_help.c:698 sql_help.c:699 sql_help.c:927 sql_help.c:1096
-#: sql_help.c:1327 sql_help.c:1345 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1354 sql_help.c:1356 sql_help.c:1357 sql_help.c:1358
-#: sql_help.c:1360 sql_help.c:1361 sql_help.c:1363 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1369 sql_help.c:1372 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1422 sql_help.c:1424 sql_help.c:1431
-#: sql_help.c:1440 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1704 sql_help.c:1707 sql_help.c:1711 sql_help.c:1747
-#: sql_help.c:1868 sql_help.c:1984 sql_help.c:1990 sql_help.c:2004
-#: sql_help.c:2005 sql_help.c:2006 sql_help.c:2354 sql_help.c:2367
-#: sql_help.c:2420 sql_help.c:2488 sql_help.c:2494 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2763 sql_help.c:2798 sql_help.c:2800
-#: sql_help.c:2912 sql_help.c:2921 sql_help.c:2931 sql_help.c:2934
-#: sql_help.c:2944 sql_help.c:2948 sql_help.c:2971 sql_help.c:2973
-#: sql_help.c:2980 sql_help.c:2993 sql_help.c:2998 sql_help.c:3005
-#: sql_help.c:3006 sql_help.c:3022 sql_help.c:3148 sql_help.c:3288
-#: sql_help.c:3914 sql_help.c:3915 sql_help.c:4011 sql_help.c:4026
-#: sql_help.c:4028 sql_help.c:4030 sql_help.c:4124 sql_help.c:4127
-#: sql_help.c:4129 sql_help.c:4131 sql_help.c:4377 sql_help.c:4378
-#: sql_help.c:4498 sql_help.c:4659 sql_help.c:4666 sql_help.c:4668
-#: sql_help.c:4917 sql_help.c:4924 sql_help.c:4926 sql_help.c:4967
-#: sql_help.c:4969 sql_help.c:4971 sql_help.c:5024 sql_help.c:5162
-#: sql_help.c:5169 sql_help.c:5171
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "имя_столбца"
 
-#: sql_help.c:457 sql_help.c:682 sql_help.c:1328 sql_help.c:1712
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "новое_имя_столбца"
 
-#: sql_help.c:462 sql_help.c:554 sql_help.c:690 sql_help.c:890 sql_help.c:1040
-#: sql_help.c:1344 sql_help.c:1612
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "где допустимое действие:"
 
-#: sql_help.c:464 sql_help.c:469 sql_help.c:1088 sql_help.c:1346
-#: sql_help.c:1351 sql_help.c:1614 sql_help.c:1618 sql_help.c:2258
-#: sql_help.c:2355 sql_help.c:2567 sql_help.c:2756 sql_help.c:2913
-#: sql_help.c:3195 sql_help.c:4183
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "тип_данных"
 
-#: sql_help.c:465 sql_help.c:470 sql_help.c:1347 sql_help.c:1352
-#: sql_help.c:1447 sql_help.c:1615 sql_help.c:1619 sql_help.c:2259
-#: sql_help.c:2358 sql_help.c:2490 sql_help.c:2915 sql_help.c:2923
-#: sql_help.c:2936 sql_help.c:2950 sql_help.c:3000 sql_help.c:3196
-#: sql_help.c:3202 sql_help.c:4021
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "правило_сортировки"
 
-#: sql_help.c:466 sql_help.c:1348 sql_help.c:2359 sql_help.c:2368
-#: sql_help.c:2916 sql_help.c:2932 sql_help.c:2945
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "ограничение_столбца"
 
-#: sql_help.c:476 sql_help.c:618 sql_help.c:692 sql_help.c:1368 sql_help.c:5018
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "целое"
 
-#: sql_help.c:478 sql_help.c:481 sql_help.c:694 sql_help.c:697 sql_help.c:1370
-#: sql_help.c:1373
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "атрибут"
 
-#: sql_help.c:486 sql_help.c:1377 sql_help.c:2360 sql_help.c:2369
-#: sql_help.c:2917 sql_help.c:2933 sql_help.c:2946
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "ограничение_таблицы"
 
-#: sql_help.c:489 sql_help.c:490 sql_help.c:491 sql_help.c:492 sql_help.c:1382
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:1922
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "имя_триггера"
 
-#: sql_help.c:493 sql_help.c:494 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:2361 sql_help.c:2366 sql_help.c:2920 sql_help.c:2943
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "таблица_родитель"
 
-#: sql_help.c:553 sql_help.c:610 sql_help.c:679 sql_help.c:889 sql_help.c:1039
-#: sql_help.c:1571 sql_help.c:2290
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "имя_расширения"
 
-#: sql_help.c:555 sql_help.c:1041 sql_help.c:2424
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "стоимость_выполнения"
 
-#: sql_help.c:556 sql_help.c:1042 sql_help.c:2425
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "строк_в_результате"
 
-#: sql_help.c:557 sql_help.c:2426
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "вспомогательная_функция"
 
-#: sql_help.c:579 sql_help.c:581 sql_help.c:964 sql_help.c:972 sql_help.c:976
-#: sql_help.c:979 sql_help.c:982 sql_help.c:1654 sql_help.c:1662
-#: sql_help.c:1666 sql_help.c:1669 sql_help.c:1672 sql_help.c:2734
-#: sql_help.c:2736 sql_help.c:2739 sql_help.c:2740 sql_help.c:3912
-#: sql_help.c:3913 sql_help.c:3917 sql_help.c:3918 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3924 sql_help.c:3925 sql_help.c:3927
-#: sql_help.c:3928 sql_help.c:3930 sql_help.c:3931 sql_help.c:3933
-#: sql_help.c:3934 sql_help.c:3940 sql_help.c:3941 sql_help.c:3943
-#: sql_help.c:3944 sql_help.c:3946 sql_help.c:3947 sql_help.c:3949
-#: sql_help.c:3950 sql_help.c:3952 sql_help.c:3953 sql_help.c:3955
-#: sql_help.c:3956 sql_help.c:3958 sql_help.c:3959 sql_help.c:3961
-#: sql_help.c:3962 sql_help.c:4375 sql_help.c:4376 sql_help.c:4380
-#: sql_help.c:4381 sql_help.c:4384 sql_help.c:4385 sql_help.c:4387
-#: sql_help.c:4388 sql_help.c:4390 sql_help.c:4391 sql_help.c:4393
-#: sql_help.c:4394 sql_help.c:4396 sql_help.c:4397 sql_help.c:4403
-#: sql_help.c:4404 sql_help.c:4406 sql_help.c:4407 sql_help.c:4409
-#: sql_help.c:4410 sql_help.c:4412 sql_help.c:4413 sql_help.c:4415
-#: sql_help.c:4416 sql_help.c:4418 sql_help.c:4419 sql_help.c:4421
-#: sql_help.c:4422 sql_help.c:4424 sql_help.c:4425
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "указание_роли"
 
-#: sql_help.c:580 sql_help.c:582 sql_help.c:1685 sql_help.c:2225
-#: sql_help.c:2742 sql_help.c:3273 sql_help.c:3724 sql_help.c:4753
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "имя_пользователя"
 
-#: sql_help.c:583 sql_help.c:984 sql_help.c:1674 sql_help.c:2741
-#: sql_help.c:3963 sql_help.c:4426
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "где допустимое указание_роли:"
 
-#: sql_help.c:585
+#: sql_help.c:599
 msgid "group_name"
 msgstr "имя_группы"
 
-#: sql_help.c:606 sql_help.c:1443 sql_help.c:2237 sql_help.c:2497
-#: sql_help.c:2531 sql_help.c:2928 sql_help.c:2941 sql_help.c:2955
-#: sql_help.c:2996 sql_help.c:3026 sql_help.c:3038 sql_help.c:3954
-#: sql_help.c:4417
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "табл_пространство"
 
-#: sql_help.c:608 sql_help.c:701 sql_help.c:1390 sql_help.c:1400
-#: sql_help.c:1438 sql_help.c:1800
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "имя_индекса"
 
-#: sql_help.c:612 sql_help.c:615 sql_help.c:704 sql_help.c:706 sql_help.c:1393
-#: sql_help.c:1395 sql_help.c:1441 sql_help.c:2495 sql_help.c:2529
-#: sql_help.c:2926 sql_help.c:2939 sql_help.c:2953 sql_help.c:2994
-#: sql_help.c:3024
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "параметр_хранения"
 
-#: sql_help.c:617
+#: sql_help.c:631
 msgid "column_number"
 msgstr "номер_столбца"
 
-#: sql_help.c:641 sql_help.c:1885 sql_help.c:4509
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "oid_большого_объекта"
 
-#: sql_help.c:700 sql_help.c:1376 sql_help.c:2914
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "метод_сжатия"
 
-#: sql_help.c:702 sql_help.c:1391
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "новый_метод_доступа"
 
-#: sql_help.c:739 sql_help.c:2552
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "процедура_ограничения"
 
-#: sql_help.c:740 sql_help.c:2553
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "процедура_соединения"
 
-#: sql_help.c:741 sql_help.c:2550
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "коммут_оператор"
 
-#: sql_help.c:742 sql_help.c:2551
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "обратный_оператор"
 
-#: sql_help.c:794 sql_help.c:806 sql_help.c:2570
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "номер_стратегии"
 
-#: sql_help.c:796 sql_help.c:797 sql_help.c:800 sql_help.c:801 sql_help.c:807
-#: sql_help.c:808 sql_help.c:810 sql_help.c:811 sql_help.c:2572 sql_help.c:2573
-#: sql_help.c:2576 sql_help.c:2577
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "тип_операции"
 
-#: sql_help.c:798 sql_help.c:2574
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "семейство_сортировки"
 
-#: sql_help.c:799 sql_help.c:809 sql_help.c:2575
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "номер_опорной_процедуры"
 
-#: sql_help.c:803 sql_help.c:2157 sql_help.c:2579 sql_help.c:3115
-#: sql_help.c:3117
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "тип_аргумента"
 
-#: sql_help.c:834 sql_help.c:837 sql_help.c:926 sql_help.c:1055 sql_help.c:1095
-#: sql_help.c:1567 sql_help.c:1570 sql_help.c:1746 sql_help.c:1799
-#: sql_help.c:1870 sql_help.c:1895 sql_help.c:1908 sql_help.c:1923
-#: sql_help.c:1983 sql_help.c:1989 sql_help.c:2353 sql_help.c:2365
-#: sql_help.c:2486 sql_help.c:2526 sql_help.c:2603 sql_help.c:2657
-#: sql_help.c:2710 sql_help.c:2762 sql_help.c:2795 sql_help.c:2802
-#: sql_help.c:2911 sql_help.c:2929 sql_help.c:2942 sql_help.c:3021
-#: sql_help.c:3141 sql_help.c:3322 sql_help.c:3545 sql_help.c:3594
-#: sql_help.c:3700 sql_help.c:3910 sql_help.c:3916 sql_help.c:3977
-#: sql_help.c:4009 sql_help.c:4373 sql_help.c:4379 sql_help.c:4497
-#: sql_help.c:4610 sql_help.c:4673 sql_help.c:4712 sql_help.c:4868
-#: sql_help.c:4931 sql_help.c:4965 sql_help.c:5023 sql_help.c:5113
-#: sql_help.c:5176
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "имя_таблицы"
 
-#: sql_help.c:839 sql_help.c:2605
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "выражение_использования"
 
-#: sql_help.c:840 sql_help.c:2606
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "выражение_проверки"
 
-#: sql_help.c:913 sql_help.c:915 sql_help.c:917 sql_help.c:2653
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "объект_публикации"
 
-#: sql_help.c:919 sql_help.c:2654
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "удаляемый_объект_публикации"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "параметр_публикации"
 
-#: sql_help.c:925 sql_help.c:2656
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "где объект_публикации:"
 
-#: sql_help.c:968 sql_help.c:1658 sql_help.c:2464 sql_help.c:2689
-#: sql_help.c:3256
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "таблица_и_столбцы"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "и удаляемый_объект_публикации:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "и таблица_и_столбцы:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "пароль"
 
-#: sql_help.c:969 sql_help.c:1659 sql_help.c:2465 sql_help.c:2690
-#: sql_help.c:3257
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "timestamp"
 
-#: sql_help.c:973 sql_help.c:977 sql_help.c:980 sql_help.c:983 sql_help.c:1663
-#: sql_help.c:1667 sql_help.c:1670 sql_help.c:1673 sql_help.c:3923
-#: sql_help.c:4386
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "имя_БД"
 
-#: sql_help.c:1089 sql_help.c:2757
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "шаг"
 
-#: sql_help.c:1090 sql_help.c:2758
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "мин_значение"
 
-#: sql_help.c:1091 sql_help.c:2759
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "макс_значение"
 
-#: sql_help.c:1092 sql_help.c:2760 sql_help.c:4606 sql_help.c:4710
-#: sql_help.c:4864 sql_help.c:5040 sql_help.c:5109
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "начальное_значение"
 
-#: sql_help.c:1093 sql_help.c:1365
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "значение_перезапуска"
 
-#: sql_help.c:1094 sql_help.c:2761
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "кеш"
 
-#: sql_help.c:1139
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "новое_имя"
 
-#: sql_help.c:1158 sql_help.c:2814
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "строка_подключения"
 
-#: sql_help.c:1160 sql_help.c:1164 sql_help.c:1168 sql_help.c:2815
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "имя_публикации"
 
-#: sql_help.c:1161 sql_help.c:1165 sql_help.c:1169
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "параметр_публикации"
 
-#: sql_help.c:1172
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "параметр_обновления"
 
-#: sql_help.c:1177 sql_help.c:2816
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "параметр_подписки"
 
-#: sql_help.c:1180
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "параметр_пропуска"
 
-#: sql_help.c:1340 sql_help.c:1343
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "имя_секции"
 
-#: sql_help.c:1341 sql_help.c:2370 sql_help.c:2947
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "указание_границ_секции"
 
-#: sql_help.c:1362 sql_help.c:1412 sql_help.c:2961
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "параметры_последовательности"
 
-#: sql_help.c:1364
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "параметр_последовательности"
 
-#: sql_help.c:1378
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "ограничение_таблицы_с_индексом"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "имя_правила_перезаписи"
 
-#: sql_help.c:1401 sql_help.c:2382 sql_help.c:2986
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "и указание_границ_секции:"
 
-#: sql_help.c:1402 sql_help.c:1403 sql_help.c:1404 sql_help.c:2383
-#: sql_help.c:2384 sql_help.c:2385 sql_help.c:2987 sql_help.c:2988
-#: sql_help.c:2989
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "выражение_границ_секции"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:2386 sql_help.c:2387
-#: sql_help.c:2990 sql_help.c:2991
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "числовая_константа"
 
-#: sql_help.c:1407
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "и ограничение_столбца:"
 
-#: sql_help.c:1410 sql_help.c:2377 sql_help.c:2418 sql_help.c:2627
-#: sql_help.c:2959
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "выражение_по_умолчанию"
 
-#: sql_help.c:1411 sql_help.c:2378 sql_help.c:2960
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "генерирующее_выражение"
 
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1423 sql_help.c:1425
-#: sql_help.c:1429 sql_help.c:2962 sql_help.c:2963 sql_help.c:2972
-#: sql_help.c:2974 sql_help.c:2978
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "параметры_индекса"
 
-#: sql_help.c:1415 sql_help.c:1432 sql_help.c:2964 sql_help.c:2981
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "целевая_таблица"
 
-#: sql_help.c:1416 sql_help.c:1433 sql_help.c:2965 sql_help.c:2982
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "целевой_столбец"
 
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1434 sql_help.c:1435
-#: sql_help.c:2966 sql_help.c:2967 sql_help.c:2983 sql_help.c:2984
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "ссылочное_действие"
 
-#: sql_help.c:1419 sql_help.c:2379 sql_help.c:2968
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "и ограничение_таблицы:"
 
-#: sql_help.c:1427 sql_help.c:2976
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "объект_исключения"
 
-#: sql_help.c:1428 sql_help.c:2977 sql_help.c:4604 sql_help.c:4708
-#: sql_help.c:4862 sql_help.c:5038 sql_help.c:5107
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "оператор"
 
-#: sql_help.c:1430 sql_help.c:2498 sql_help.c:2979
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "предикат"
 
-#: sql_help.c:1436
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "и ограничение_таблицы_с_индексом:"
 
-#: sql_help.c:1439 sql_help.c:2992
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "параметры_индекса в ограничениях UNIQUE, PRIMARY KEY и EXCLUDE:"
 
-#: sql_help.c:1444 sql_help.c:2997
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "объект_исключения в ограничении EXCLUDE:"
 
-#: sql_help.c:1448 sql_help.c:2491 sql_help.c:2924 sql_help.c:2937
-#: sql_help.c:2951 sql_help.c:3001 sql_help.c:4022
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "класс_оператора"
 
-#: sql_help.c:1449 sql_help.c:2492 sql_help.c:3002
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "параметр_класса_оп"
 
-#: sql_help.c:1451 sql_help.c:3004
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "ссылочное действие в ограничении FOREIGN KEY/REFERENCES:"
 
-#: sql_help.c:1469 sql_help.c:1472 sql_help.c:3041
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "параметр_табл_пространства"
 
-#: sql_help.c:1493 sql_help.c:1496 sql_help.c:1502 sql_help.c:1506
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "тип_фрагмента"
 
-#: sql_help.c:1494 sql_help.c:1497
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "имя_словаря"
 
-#: sql_help.c:1499 sql_help.c:1503
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "старый_словарь"
 
-#: sql_help.c:1500 sql_help.c:1504
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "новый_словарь"
 
-#: sql_help.c:1599 sql_help.c:1613 sql_help.c:1616 sql_help.c:1617
-#: sql_help.c:3194
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "имя_атрибута"
 
-#: sql_help.c:1600
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "новое_имя_атрибута"
 
-#: sql_help.c:1604 sql_help.c:1608
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "новое_значение_перечисления"
 
-#: sql_help.c:1605
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "соседнее_значение_перечисления"
 
-#: sql_help.c:1607
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "существующее_значение_перечисления"
 
-#: sql_help.c:1610
+#: sql_help.c:1647
 msgid "property"
 msgstr "свойство"
 
-#: sql_help.c:1686 sql_help.c:2362 sql_help.c:2371 sql_help.c:2773
-#: sql_help.c:3274 sql_help.c:3725 sql_help.c:3932 sql_help.c:3978
-#: sql_help.c:4395
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "имя_сервера"
 
-#: sql_help.c:1718 sql_help.c:1721 sql_help.c:3289
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "имя_параметра_представления"
 
-#: sql_help.c:1719 sql_help.c:3290
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "значение_параметра_представления"
 
-#: sql_help.c:1740 sql_help.c:5007
-msgid "table_and_columns"
-msgstr "таблица_и_столбцы"
-
-#: sql_help.c:1741 sql_help.c:1801 sql_help.c:1995 sql_help.c:3774
-#: sql_help.c:4230 sql_help.c:5008
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "где допустимый параметр:"
 
-#: sql_help.c:1742 sql_help.c:1743 sql_help.c:1802 sql_help.c:1997
-#: sql_help.c:2001 sql_help.c:2183 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:3777 sql_help.c:3778 sql_help.c:3779 sql_help.c:3780
-#: sql_help.c:3781 sql_help.c:3782 sql_help.c:3783 sql_help.c:3784
-#: sql_help.c:4231 sql_help.c:4233 sql_help.c:5009 sql_help.c:5010
-#: sql_help.c:5011 sql_help.c:5012 sql_help.c:5013 sql_help.c:5014
-#: sql_help.c:5015 sql_help.c:5016 sql_help.c:5017 sql_help.c:5019
-#: sql_help.c:5020
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "логическое_значение"
 
-#: sql_help.c:1744 sql_help.c:5021
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "размер"
 
-#: sql_help.c:1745 sql_help.c:5022
-msgid "and table_and_columns is:"
-msgstr "и таблица_и_столбцы:"
-
-#: sql_help.c:1761 sql_help.c:4769 sql_help.c:4771 sql_help.c:4795
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "режим_транзакции"
 
-#: sql_help.c:1762 sql_help.c:4772 sql_help.c:4796
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "где допустимый режим_транзакции:"
 
-#: sql_help.c:1771 sql_help.c:4614 sql_help.c:4623 sql_help.c:4627
-#: sql_help.c:4631 sql_help.c:4634 sql_help.c:4872 sql_help.c:4881
-#: sql_help.c:4885 sql_help.c:4889 sql_help.c:4892 sql_help.c:5117
-#: sql_help.c:5126 sql_help.c:5130 sql_help.c:5134 sql_help.c:5137
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "аргумент"
 
-#: sql_help.c:1867
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "имя_отношения"
 
-#: sql_help.c:1872 sql_help.c:3926 sql_help.c:4389
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "имя_домена"
 
-#: sql_help.c:1894
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "имя_политики"
 
-#: sql_help.c:1907
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "имя_правила"
 
-#: sql_help.c:1926 sql_help.c:4528
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "строковая_константа"
 
-#: sql_help.c:1951 sql_help.c:4192 sql_help.c:4442
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "код_транзакции"
 
-#: sql_help.c:1985 sql_help.c:1992 sql_help.c:4048
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "имя_файла"
 
-#: sql_help.c:1986 sql_help.c:1993 sql_help.c:2712 sql_help.c:2713
-#: sql_help.c:2714
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "команда"
 
-#: sql_help.c:1988 sql_help.c:2711 sql_help.c:3144 sql_help.c:3325
-#: sql_help.c:4032 sql_help.c:4115 sql_help.c:4118 sql_help.c:4121
-#: sql_help.c:4597 sql_help.c:4599 sql_help.c:4701 sql_help.c:4703
-#: sql_help.c:4855 sql_help.c:4857 sql_help.c:4974 sql_help.c:5100
-#: sql_help.c:5102
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "условие"
 
-#: sql_help.c:1991 sql_help.c:2532 sql_help.c:3027 sql_help.c:3291
-#: sql_help.c:3309 sql_help.c:4013
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "запрос"
 
-#: sql_help.c:1996
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "имя_формата"
 
-#: sql_help.c:1998
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "символ_разделитель"
 
-#: sql_help.c:1999
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "представление_NULL"
 
-#: sql_help.c:2000
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "представление_DEFAULT"
 
-#: sql_help.c:2002
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "символ_кавычек"
 
-#: sql_help.c:2003
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "спецсимвол"
 
-#: sql_help.c:2007
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "действие_при_ошибке"
 
-#: sql_help.c:2008
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "макс_ошибок"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "имя_кодировки"
 
-#: sql_help.c:2009
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "детализация"
 
-#: sql_help.c:2020
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "тип_метода_доступа"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2113
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "тип_данных_аргумента"
 
-#: sql_help.c:2092 sql_help.c:2114 sql_help.c:2122
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "функция_состояния"
 
-#: sql_help.c:2093 sql_help.c:2115 sql_help.c:2123
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "тип_данных_состояния"
 
-#: sql_help.c:2094 sql_help.c:2116 sql_help.c:2124
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "размер_данных_состояния"
 
-#: sql_help.c:2095 sql_help.c:2117 sql_help.c:2125
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "функция_завершения"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "комбинирующая_функция"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "функция_сериализации"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "функция_десериализации"
 
-#: sql_help.c:2099 sql_help.c:2118 sql_help.c:2129
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "начальное_условие"
 
-#: sql_help.c:2100 sql_help.c:2130
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "функция_состояния_движ"
 
-#: sql_help.c:2101 sql_help.c:2131
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "обратная_функция_движ"
 
-#: sql_help.c:2102 sql_help.c:2132
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "тип_данных_состояния_движ"
 
-#: sql_help.c:2103 sql_help.c:2133
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "размер_данных_состояния_движ"
 
-#: sql_help.c:2104 sql_help.c:2134
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "функция_завершения_движ"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "начальное_условие_движ"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "оператор_сортировки"
 
-#: sql_help.c:2119
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "или старый синтаксис"
 
-#: sql_help.c:2121
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "базовый_тип"
 
-#: sql_help.c:2179 sql_help.c:2229
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "код_локали"
 
-#: sql_help.c:2180 sql_help.c:2230
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "код_правила_сортировки"
 
-#: sql_help.c:2181 sql_help.c:2231
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "код_классификации_символов"
 
-#: sql_help.c:2182 sql_help.c:4495
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "провайдер"
 
-#: sql_help.c:2184
+#: sql_help.c:2223
 msgid "rules"
 msgstr "правила"
 
-#: sql_help.c:2185 sql_help.c:2292
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "версия"
 
-#: sql_help.c:2187
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "существующее_правило_сортировки"
 
-#: sql_help.c:2197
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "исходная_кодировка"
 
-#: sql_help.c:2198
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "целевая_кодировка"
 
-#: sql_help.c:2226 sql_help.c:3067
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "шаблон"
 
-#: sql_help.c:2227
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "кодировка"
 
-#: sql_help.c:2228
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "стратегия"
 
-#: sql_help.c:2232
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "встроенная_локаль"
 
-#: sql_help.c:2233
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "локаль_icu"
 
-#: sql_help.c:2234
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "правила_icu"
 
-#: sql_help.c:2235
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "провайдер_локали"
 
-#: sql_help.c:2236
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "версия_правила_сортировки"
 
-#: sql_help.c:2241
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2276 sql_help.c:2709 sql_help.c:3140
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "событие"
 
-#: sql_help.c:2277
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "переменная_фильтра"
 
-#: sql_help.c:2278
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "значение_фильтра"
 
-#: sql_help.c:2374 sql_help.c:2956
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "исходная_таблица"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "параметр_порождения"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "где ограничение_столбца:"
 
-#: sql_help.c:2419
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "и параметр_порождения:"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "тип_возврата"
 
-#: sql_help.c:2421
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "тип_столбца"
 
-#: sql_help.c:2430 sql_help.c:2633
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "определение"
 
-#: sql_help.c:2431 sql_help.c:2634
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "объектный_файл"
 
-#: sql_help.c:2432 sql_help.c:2635
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "символ_в_экспорте"
 
-#: sql_help.c:2433 sql_help.c:2636
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "тело_sql"
 
-#: sql_help.c:2471 sql_help.c:2694 sql_help.c:3263
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2487 sql_help.c:2528 sql_help.c:2925 sql_help.c:2938
-#: sql_help.c:2952 sql_help.c:3023
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "метод"
 
-#: sql_help.c:2509
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "обработчик_вызова"
 
-#: sql_help.c:2510
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "обработчик_внедрённого_кода"
 
-#: sql_help.c:2511
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "функция_проверки"
 
-#: sql_help.c:2569
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "имя_семейства"
 
-#: sql_help.c:2580
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "тип_хранения"
 
-#: sql_help.c:2715 sql_help.c:3147
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "где допустимое событие:"
 
-#: sql_help.c:2735 sql_help.c:2737
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "элемент_схемы"
 
-#: sql_help.c:2774
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "тип_сервера"
 
-#: sql_help.c:2775
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "версия_сервера"
 
-#: sql_help.c:2776 sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "имя_обёртки_сторонних_данных"
 
-#: sql_help.c:2793 sql_help.c:2796
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "имя_статистики"
 
-#: sql_help.c:2797
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "вид_статистики"
 
-#: sql_help.c:2813
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "имя_подписки"
 
-#: sql_help.c:2918
-msgid "source_table"
-msgstr "исходная_таблица"
-
-#: sql_help.c:2919
-msgid "like_option"
-msgstr "параметр_порождения"
-
-#: sql_help.c:2985
-msgid "and like_option is:"
-msgstr "и параметр_порождения:"
-
-#: sql_help.c:3040
+#: sql_help.c:3105
 msgid "directory"
 msgstr "каталог"
 
-#: sql_help.c:3054
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "имя_анализатора"
 
-#: sql_help.c:3055
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "исходная_конфигурация"
 
-#: sql_help.c:3084
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "функция_начала"
 
-#: sql_help.c:3085
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "функция_выдачи_фрагмента"
 
-#: sql_help.c:3086
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "функция_окончания"
 
-#: sql_help.c:3087
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "функция_лекс_типов"
 
-#: sql_help.c:3088
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "функция_создания_выдержек"
 
-#: sql_help.c:3100
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "функция_инициализации"
 
-#: sql_help.c:3101
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "функция_выделения_лексем"
 
-#: sql_help.c:3114
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "имя_функции_из_sql"
 
-#: sql_help.c:3116
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "имя_функции_в_sql"
 
-#: sql_help.c:3142
+#: sql_help.c:3207
 msgid "referenced_table_name"
-msgstr "ссылающаяся_таблица"
+msgstr "целевая_таблица"
 
-#: sql_help.c:3143
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "имя_переходного_отношения"
 
-#: sql_help.c:3146
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "аргументы"
 
-#: sql_help.c:3198
+#: sql_help.c:3263
 msgid "label"
 msgstr "метка"
 
-#: sql_help.c:3200
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "подтип"
 
-#: sql_help.c:3201
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "класс_оператора_подтипа"
 
-#: sql_help.c:3203
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "каноническая_функция"
 
-#: sql_help.c:3204
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "функция_различий_подтипа"
 
-#: sql_help.c:3205
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "имя_мультидиапазонного_типа"
 
-#: sql_help.c:3207
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "функция_ввода"
 
-#: sql_help.c:3208
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "функция_вывода"
 
-#: sql_help.c:3209
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "функция_получения"
 
-#: sql_help.c:3210
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "функция_отправки"
 
-#: sql_help.c:3211
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "функция_ввода_модификатора_типа"
 
-#: sql_help.c:3212
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "функция_вывода_модификатора_типа"
 
-#: sql_help.c:3213
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "функция_анализа"
 
-#: sql_help.c:3214
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "функция_обращения_по_индексу"
 
-#: sql_help.c:3215
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "внутр_длина"
 
-#: sql_help.c:3216
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "выравнивание"
 
-#: sql_help.c:3217
+#: sql_help.c:3282
 msgid "storage"
 msgstr "хранение"
 
-#: sql_help.c:3218
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "тип_образец"
 
-#: sql_help.c:3219
+#: sql_help.c:3284
 msgid "category"
 msgstr "категория"
 
-#: sql_help.c:3220
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "предпочитаемый"
 
-#: sql_help.c:3221
+#: sql_help.c:3286
 msgid "default"
 msgstr "по_умолчанию"
 
-#: sql_help.c:3222
+#: sql_help.c:3287
 msgid "element"
 msgstr "элемент"
 
-#: sql_help.c:3223
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "разделитель"
 
-#: sql_help.c:3224
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "сортируемый"
 
-#: sql_help.c:3321 sql_help.c:4008 sql_help.c:4102 sql_help.c:4592
-#: sql_help.c:4695 sql_help.c:4850 sql_help.c:4964 sql_help.c:5095
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "запрос_WITH"
 
-#: sql_help.c:3323 sql_help.c:4010 sql_help.c:4611 sql_help.c:4617
-#: sql_help.c:4620 sql_help.c:4624 sql_help.c:4628 sql_help.c:4636
-#: sql_help.c:4869 sql_help.c:4875 sql_help.c:4878 sql_help.c:4882
-#: sql_help.c:4886 sql_help.c:4894 sql_help.c:4966 sql_help.c:5114
-#: sql_help.c:5120 sql_help.c:5123 sql_help.c:5127 sql_help.c:5131
-#: sql_help.c:5139
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "псевдоним"
 
-#: sql_help.c:3324 sql_help.c:4596 sql_help.c:4638 sql_help.c:4640
-#: sql_help.c:4644 sql_help.c:4646 sql_help.c:4647 sql_help.c:4648
-#: sql_help.c:4700 sql_help.c:4854 sql_help.c:4896 sql_help.c:4898
-#: sql_help.c:4902 sql_help.c:4904 sql_help.c:4905 sql_help.c:4906
-#: sql_help.c:4973 sql_help.c:5099 sql_help.c:5141 sql_help.c:5143
-#: sql_help.c:5147 sql_help.c:5149 sql_help.c:5150 sql_help.c:5151
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "источник_данных"
 
-#: sql_help.c:3326 sql_help.c:3810 sql_help.c:4159 sql_help.c:4975
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "имя_курсора"
 
-#: sql_help.c:3327 sql_help.c:4016 sql_help.c:4108 sql_help.c:4976
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "псевдоним_результата"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "выражение_результата"
 
-#: sql_help.c:3328 sql_help.c:4017 sql_help.c:4109 sql_help.c:4595
-#: sql_help.c:4698 sql_help.c:4853 sql_help.c:4977 sql_help.c:5098
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "имя_результата"
 
-#: sql_help.c:3344
+#: sql_help.c:3411
 msgid "code"
 msgstr "внедрённый_код"
 
-#: sql_help.c:3749
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "параметр"
 
-#: sql_help.c:3773 sql_help.c:4184
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "оператор"
 
-#: sql_help.c:3809 sql_help.c:4158
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "направление"
 
-#: sql_help.c:3811 sql_help.c:4160
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "где допустимое направление:"
 
-#: sql_help.c:3812 sql_help.c:3813 sql_help.c:3814 sql_help.c:3815
-#: sql_help.c:3816 sql_help.c:4161 sql_help.c:4162 sql_help.c:4163
-#: sql_help.c:4164 sql_help.c:4165 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4709 sql_help.c:4711 sql_help.c:4863 sql_help.c:4865
-#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5108 sql_help.c:5110
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "число"
 
-#: sql_help.c:3919 sql_help.c:4382
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "имя_последовательности"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "имя_аргумента"
 
-#: sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "тип_аргумента"
 
-#: sql_help.c:3945 sql_help.c:4408
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "код_БО"
 
-#: sql_help.c:3976
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "удалённая_схема"
 
-#: sql_help.c:3979
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "локальная_схема"
 
-#: sql_help.c:4014
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "объект_конфликта"
 
-#: sql_help.c:4015
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "действие_при_конфликте"
 
-#: sql_help.c:4018
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "где допустимый объект_конфликта:"
 
-#: sql_help.c:4019
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "имя_столбца_индекса"
 
-#: sql_help.c:4020
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "выражение_индекса"
 
-#: sql_help.c:4023
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "предикат_индекса"
 
-#: sql_help.c:4025
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "а допустимое действие_при_конфликте:"
 
-#: sql_help.c:4031 sql_help.c:4132 sql_help.c:4972
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "вложенный_SELECT"
 
-#: sql_help.c:4040 sql_help.c:4173 sql_help.c:4948
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "канал"
 
-#: sql_help.c:4062
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "режим_блокировки"
 
-#: sql_help.c:4063
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "где допустимый режим_блокировки:"
 
-#: sql_help.c:4103
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "имя_целевой_таблицы"
 
-#: sql_help.c:4104
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "псевдоним_назначения"
 
-#: sql_help.c:4105
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "источник_данных"
 
-#: sql_help.c:4106 sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "условие_соединения"
 
-#: sql_help.c:4107
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "предложение_when"
 
-#: sql_help.c:4110
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "где источник_данных:"
 
-#: sql_help.c:4111
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "имя_исходной_таблицы"
 
-#: sql_help.c:4112
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "исходный_запрос"
 
-#: sql_help.c:4113
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "псевдоним_источника"
 
-#: sql_help.c:4114
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "и предложение_when:"
 
-#: sql_help.c:4116 sql_help.c:4119
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "merge_update"
 
-#: sql_help.c:4117 sql_help.c:4120
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4122
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4123
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "и merge_insert:"
 
-#: sql_help.c:4126
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "и merge_update:"
 
-#: sql_help.c:4133
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "и merge_delete:"
 
-#: sql_help.c:4174
+#: sql_help.c:4245
 msgid "payload"
 msgstr "сообщение_нагрузка"
 
-#: sql_help.c:4201
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "старая_роль"
 
-#: sql_help.c:4202
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "новая_роль"
 
-#: sql_help.c:4241 sql_help.c:4450 sql_help.c:4458
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "имя_точки_сохранения"
 
-#: sql_help.c:4598 sql_help.c:4656 sql_help.c:4856 sql_help.c:4914
-#: sql_help.c:5101 sql_help.c:5159
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "элемент_группирования"
 
-#: sql_help.c:4600 sql_help.c:4704 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "имя_окна"
 
-#: sql_help.c:4601 sql_help.c:4705 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "определение_окна"
 
-#: sql_help.c:4602 sql_help.c:4616 sql_help.c:4660 sql_help.c:4706
-#: sql_help.c:4860 sql_help.c:4874 sql_help.c:4918 sql_help.c:5105
-#: sql_help.c:5119 sql_help.c:5163
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:4608 sql_help.c:4866 sql_help.c:5111
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "ссылка_FROM"
 
-#: sql_help.c:4609 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "где допустимый источник_данных:"
 
-#: sql_help.c:4612 sql_help.c:4618 sql_help.c:4621 sql_help.c:4625
-#: sql_help.c:4637 sql_help.c:4870 sql_help.c:4876 sql_help.c:4879
-#: sql_help.c:4883 sql_help.c:4895 sql_help.c:5115 sql_help.c:5121
-#: sql_help.c:5124 sql_help.c:5128 sql_help.c:5140
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "псевдоним_столбца"
 
-#: sql_help.c:4613 sql_help.c:4871 sql_help.c:5116
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "метод_выборки"
 
-#: sql_help.c:4615 sql_help.c:4873 sql_help.c:5118
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "начальное_число"
 
-#: sql_help.c:4619 sql_help.c:4658 sql_help.c:4877 sql_help.c:4916
-#: sql_help.c:5122 sql_help.c:5161
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "имя_запроса_WITH"
 
-#: sql_help.c:4629 sql_help.c:4632 sql_help.c:4635 sql_help.c:4887
-#: sql_help.c:4890 sql_help.c:4893 sql_help.c:5132 sql_help.c:5135
-#: sql_help.c:5138
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "определение_столбца"
 
-#: sql_help.c:4639 sql_help.c:4645 sql_help.c:4897 sql_help.c:4903
-#: sql_help.c:5142 sql_help.c:5148
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "тип_соединения"
 
-#: sql_help.c:4642 sql_help.c:4900 sql_help.c:5145
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "столбец_соединения"
 
-#: sql_help.c:4643 sql_help.c:4901 sql_help.c:5146
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "псевдоним_использования_соединения"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "где допустимый элемент_группирования:"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "и запрос_WITH:"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "значения"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4665 sql_help.c:4923 sql_help.c:5168
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4667 sql_help.c:4925 sql_help.c:5170
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "имя_столбца_послед_поиска"
 
-#: sql_help.c:4669 sql_help.c:4927 sql_help.c:5172
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "имя_столбца_пометки_цикла"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "значение_пометки_цикла"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "пометка_цикла_по_умолчанию"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "имя_столбца_пути_цикла"
 
-#: sql_help.c:4699
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "новая_таблица"
 
-#: sql_help.c:4770
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "код_снимка"
 
-#: sql_help.c:5037
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "выражение_сортировки"
 
-#: sql_help.c:5182 sql_help.c:6166
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "прервать текущую транзакцию"
 
-#: sql_help.c:5188
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "изменить определение агрегатной функции"
 
-#: sql_help.c:5194
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "изменить определение правила сортировки"
 
-#: sql_help.c:5200
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "изменить определение преобразования"
 
-#: sql_help.c:5206
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "изменить атрибуты базы данных"
 
-#: sql_help.c:5212
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "определить права доступа по умолчанию"
 
-#: sql_help.c:5218
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "изменить определение домена"
 
-#: sql_help.c:5224
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "изменить определение событийного триггера"
 
-#: sql_help.c:5230
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "изменить определение расширения"
 
-#: sql_help.c:5236
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "изменить определение обёртки сторонних данных"
 
-#: sql_help.c:5242
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "изменить определение сторонней таблицы"
 
-#: sql_help.c:5248
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "изменить определение функции"
 
-#: sql_help.c:5254
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "изменить имя роли или членство"
 
-#: sql_help.c:5260
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "изменить определение индекса"
 
-#: sql_help.c:5266
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "изменить определение процедурного языка"
 
-#: sql_help.c:5272
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "изменить определение большого объекта"
 
-#: sql_help.c:5278
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "изменить определение материализованного представления"
 
-#: sql_help.c:5284
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "изменить определение оператора"
 
-#: sql_help.c:5290
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "изменить определение класса операторов"
 
-#: sql_help.c:5296
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "изменить определение семейства операторов"
 
-#: sql_help.c:5302
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "изменить определение политики защиты на уровне строк"
 
-#: sql_help.c:5308
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "изменить определение процедуры"
 
-#: sql_help.c:5314
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "изменить определение публикации"
 
-#: sql_help.c:5320 sql_help.c:5422
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "изменить роль пользователя БД"
 
-#: sql_help.c:5326
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "изменить определение подпрограммы"
 
-#: sql_help.c:5332
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "изменить определение правила"
 
-#: sql_help.c:5338
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "изменить определение схемы"
 
-#: sql_help.c:5344
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "изменить определение генератора последовательности"
 
-#: sql_help.c:5350
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "изменить определение стороннего сервера"
 
-#: sql_help.c:5356
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "изменить определение объекта расширенной статистики"
 
-#: sql_help.c:5362
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "изменить определение подписки"
 
-#: sql_help.c:5368
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "изменить параметр конфигурации сервера"
 
-#: sql_help.c:5374
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "изменить определение таблицы"
 
-#: sql_help.c:5380
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "изменить определение табличного пространства"
 
-#: sql_help.c:5386
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "изменить определение конфигурации текстового поиска"
 
-#: sql_help.c:5392
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "изменить определение словаря текстового поиска"
 
-#: sql_help.c:5398
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "изменить определение анализатора текстового поиска"
 
-#: sql_help.c:5404
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "изменить определение шаблона текстового поиска"
 
-#: sql_help.c:5410
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "изменить определение триггера"
 
-#: sql_help.c:5416
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "изменить определение типа"
 
-#: sql_help.c:5428
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "изменить сопоставление пользователей"
 
-#: sql_help.c:5434
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "изменить определение представления"
 
-#: sql_help.c:5440
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "собрать статистику о базе данных"
 
-#: sql_help.c:5446 sql_help.c:6244
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "начать транзакцию"
 
-#: sql_help.c:5452
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "вызвать процедуру"
 
-#: sql_help.c:5458
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "произвести контрольную точку в журнале предзаписи"
 
-#: sql_help.c:5464
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "закрыть курсор"
 
-#: sql_help.c:5470
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "перегруппировать таблицу по индексу"
 
-#: sql_help.c:5476
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "задать или изменить комментарий объекта"
 
-#: sql_help.c:5482 sql_help.c:6040
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "зафиксировать текущую транзакцию"
 
-#: sql_help.c:5488
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "зафиксировать транзакцию, ранее подготовленную для двухфазной фиксации"
 
-#: sql_help.c:5494
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "импорт/экспорт данных в файл"
 
-#: sql_help.c:5500
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "создать новый метод доступа"
 
-#: sql_help.c:5506
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "создать агрегатную функцию"
 
-#: sql_help.c:5512
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "создать приведение типов"
 
-#: sql_help.c:5518
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "создать правило сортировки"
 
-#: sql_help.c:5524
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "создать преобразование кодировки"
 
-#: sql_help.c:5530
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "создать базу данных"
 
-#: sql_help.c:5536
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "создать домен"
 
-#: sql_help.c:5542
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "создать событийный триггер"
 
-#: sql_help.c:5548
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "установить расширение"
 
-#: sql_help.c:5554
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "создать обёртку сторонних данных"
 
-#: sql_help.c:5560
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "создать стороннюю таблицу"
 
-#: sql_help.c:5566
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "создать функцию"
 
-#: sql_help.c:5572 sql_help.c:5632 sql_help.c:5734
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "создать роль пользователя БД"
 
-#: sql_help.c:5578
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "создать индекс"
 
-#: sql_help.c:5584
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "создать процедурный язык"
 
-#: sql_help.c:5590
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "создать материализованное представление"
 
-#: sql_help.c:5596
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "создать оператор"
 
-#: sql_help.c:5602
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "создать класс операторов"
 
-#: sql_help.c:5608
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "создать семейство операторов"
 
-#: sql_help.c:5614
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "создать новую политику защиты на уровне строк для таблицы"
 
-#: sql_help.c:5620
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "создать процедуру"
 
-#: sql_help.c:5626
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "создать публикацию"
 
-#: sql_help.c:5638
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "создать правило перезаписи"
 
-#: sql_help.c:5644
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "создать схему"
 
-#: sql_help.c:5650
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "создать генератор последовательностей"
 
-#: sql_help.c:5656
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "создать сторонний сервер"
 
-#: sql_help.c:5662
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "создать расширенную статистику"
 
-#: sql_help.c:5668
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "создать подписку"
 
-#: sql_help.c:5674
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "создать таблицу"
 
-#: sql_help.c:5680 sql_help.c:6202
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "создать таблицу из результатов запроса"
 
-#: sql_help.c:5686
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "создать табличное пространство"
 
-#: sql_help.c:5692
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "создать конфигурацию текстового поиска"
 
-#: sql_help.c:5698
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "создать словарь текстового поиска"
 
-#: sql_help.c:5704
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "создать анализатор текстового поиска"
 
-#: sql_help.c:5710
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "создать шаблон текстового поиска"
 
-#: sql_help.c:5716
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "создать преобразование"
 
-#: sql_help.c:5722
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "создать триггер"
 
-#: sql_help.c:5728
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "создать тип данных"
 
-#: sql_help.c:5740
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "создать сопоставление пользователя для стороннего сервера"
 
-#: sql_help.c:5746
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "создать представление"
 
-#: sql_help.c:5752
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "освободить подготовленный оператор"
 
-#: sql_help.c:5758
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "создать курсор"
 
-#: sql_help.c:5764
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "удалить записи таблицы"
 
-#: sql_help.c:5770
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "очистить состояние сеанса"
 
-#: sql_help.c:5776
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "выполнить анонимный блок кода"
 
-#: sql_help.c:5782
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "удалить метод доступа"
 
-#: sql_help.c:5788
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "удалить агрегатную функцию"
 
-#: sql_help.c:5794
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "удалить приведение типа"
 
-#: sql_help.c:5800
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "удалить правило сортировки"
 
-#: sql_help.c:5806
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "удалить преобразование"
 
-#: sql_help.c:5812
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "удалить базу данных"
 
-#: sql_help.c:5818
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "удалить домен"
 
-#: sql_help.c:5824
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "удалить событийный триггер"
 
-#: sql_help.c:5830
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "удалить расширение"
 
-#: sql_help.c:5836
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "удалить обёртку сторонних данных"
 
-#: sql_help.c:5842
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "удалить стороннюю таблицу"
 
-#: sql_help.c:5848
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "удалить функцию"
 
-#: sql_help.c:5854 sql_help.c:5920 sql_help.c:6022
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "удалить роль пользователя БД"
 
-#: sql_help.c:5860
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "удалить индекс"
 
-#: sql_help.c:5866
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "удалить процедурный язык"
 
-#: sql_help.c:5872
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "удалить материализованное представление"
 
-#: sql_help.c:5878
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "удалить оператор"
 
-#: sql_help.c:5884
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "удалить класс операторов"
 
-#: sql_help.c:5890
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "удалить семейство операторов"
 
-#: sql_help.c:5896
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "удалить объекты базы данных, принадлежащие роли"
 
-#: sql_help.c:5902
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "удалить из таблицы политику защиты на уровне строк"
 
-#: sql_help.c:5908
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "удалить процедуру"
 
-#: sql_help.c:5914
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "удалить публикацию"
 
-#: sql_help.c:5926
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "удалить подпрограмму"
 
-#: sql_help.c:5932
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "удалить правило перезаписи"
 
-#: sql_help.c:5938
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "удалить схему"
 
-#: sql_help.c:5944
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "удалить последовательность"
 
-#: sql_help.c:5950
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "удалить описание стороннего сервера"
 
-#: sql_help.c:5956
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "удалить расширенную статистику"
 
-#: sql_help.c:5962
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "удалить подписку"
 
-#: sql_help.c:5968
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "удалить таблицу"
 
-#: sql_help.c:5974
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "удалить табличное пространство"
 
-#: sql_help.c:5980
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "удалить конфигурацию текстового поиска"
 
-#: sql_help.c:5986
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "удалить словарь текстового поиска"
 
-#: sql_help.c:5992
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "удалить анализатор текстового поиска"
 
-#: sql_help.c:5998
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "удалить шаблон текстового поиска"
 
-#: sql_help.c:6004
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "удалить преобразование"
 
-#: sql_help.c:6010
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "удалить триггер"
 
-#: sql_help.c:6016
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "удалить тип данных"
 
-#: sql_help.c:6028
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "удалить сопоставление пользователя для стороннего сервера"
 
-#: sql_help.c:6034
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "удалить представление"
 
-#: sql_help.c:6046
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "выполнить подготовленный оператор"
 
-#: sql_help.c:6052
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "показать план выполнения оператора"
 
-#: sql_help.c:6058
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "получить результат запроса через курсор"
 
-#: sql_help.c:6064
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "определить права доступа"
 
-#: sql_help.c:6070
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "импортировать определения таблиц со стороннего сервера"
 
-#: sql_help.c:6076
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "добавить строки в таблицу"
 
-#: sql_help.c:6082
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "ожидать уведомления"
 
-#: sql_help.c:6088
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "загрузить файл разделяемой библиотеки"
 
-#: sql_help.c:6094
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "заблокировать таблицу"
 
-#: sql_help.c:6100
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "добавление, изменение или удаление строк таблицы по условию"
 
-#: sql_help.c:6106
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "установить курсор"
 
-#: sql_help.c:6112
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "сгенерировать уведомление"
 
-#: sql_help.c:6118
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "подготовить оператор для выполнения"
 
-#: sql_help.c:6124
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "подготовить текущую транзакцию для двухфазной фиксации"
 
-#: sql_help.c:6130
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "изменить владельца объектов БД, принадлежащих заданной роли"
 
-#: sql_help.c:6136
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "заменить содержимое материализованного представления"
 
-#: sql_help.c:6142
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "перестроить индексы"
 
-#: sql_help.c:6148
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "освободить ранее определённую точку сохранения"
 
-#: sql_help.c:6154
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "восстановить исходное значение параметра выполнения"
 
-#: sql_help.c:6160
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "удалить права доступа"
 
-#: sql_help.c:6172
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "отменить транзакцию, подготовленную ранее для двухфазной фиксации"
 
-#: sql_help.c:6178
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "откатиться к точке сохранения"
 
-#: sql_help.c:6184
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "определить новую точку сохранения в текущей транзакции"
 
-#: sql_help.c:6190
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "задать или изменить метку безопасности, применённую к объекту"
 
-#: sql_help.c:6196 sql_help.c:6250 sql_help.c:6286
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "выбрать строки из таблицы или представления"
 
-#: sql_help.c:6208
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "изменить параметр выполнения"
 
-#: sql_help.c:6214
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "установить время проверки ограничений для текущей транзакции"
 
-#: sql_help.c:6220
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "задать идентификатор текущего пользователя в текущем сеансе"
 
-#: sql_help.c:6226
+#: sql_help.c:6299
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -6822,45 +7150,45 @@ msgstr ""
 "задать идентификатор пользователя сеанса и идентификатор текущего "
 "пользователя в текущем сеансе"
 
-#: sql_help.c:6232
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "задать свойства текущей транзакции"
 
-#: sql_help.c:6238
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "показать значение параметра выполнения"
 
-#: sql_help.c:6256
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "опустошить таблицу или набор таблиц"
 
-#: sql_help.c:6262
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "прекратить ожидание уведомлений"
 
-#: sql_help.c:6268
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "изменить строки таблицы"
 
-#: sql_help.c:6274
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "произвести сборку мусора и проанализировать базу данных"
 
-#: sql_help.c:6280
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "получить набор строк"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 можно использовать только в неинтерактивном режиме"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не удалось открыть файл протокола \"%s\": %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6869,27 +7197,27 @@ msgstr ""
 "Введите \"help\", чтобы получить справку.\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "не удалось установить параметр печати \"%s\""
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "лишний аргумент \"%s\" проигнорирован"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "не удалось найти свой исполняемый файл"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6639
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6900,23 +7228,52 @@ msgstr ""
 "Запрос:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr ""
 "нераспознанное значение \"%s\" для \"%s\": ожидалось булевское значение"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "неправильное значение \"%s\" для \"%s\": ожидалось целое"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "неправильный синтаксис значения для переменной \"%s\""
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr ""
+"значение \"%s\" не подходит для переменной \"%s\"; оно должно быть больше "
+"%.2f"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr ""
+"значение \"%s\" не подходит для переменной \"%s\"; оно должно быть меньше "
+"%.2f"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "значение \"%s\" вне диапазона для переменной \"%s\""
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "неправильное значение \"%s\" для переменной \"%s\""
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "неправильное имя переменной: \"%s\""
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
@@ -6925,6 +7282,50 @@ msgstr ""
 "нераспознанное значение \"%s\" для \"%s\"\n"
 "Допустимые значения: %s."
 
+#, c-format
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "найти локального пользователя по идентификатору (%d) не удалось: %s"
+
+#, c-format
+#~ msgid "local user with ID %d does not exist"
+#~ msgstr "локальный пользователь с ID %d не существует"
+
+#, c-format
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at "
+#~ "port \"%s\".\n"
+#~ msgstr ""
+#~ "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (адрес сервера "
+#~ "\"%s\", порт \"%s\").\n"
+
+#, c-format
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+#~ "at port \"%s\".\n"
+#~ msgstr ""
+#~ "Вы подключены к базе данных \"%s\" как пользователь \"%s\" через сокет в "
+#~ "\"%s\", порт \"%s\".\n"
+
+#, c-format
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" on host "
+#~ "\"%s\" (address \"%s\") at port \"%s\".\n"
+#~ msgstr ""
+#~ "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
+#~ "\"%s\": адрес \"%s\", порт \"%s\").\n"
+
+#, c-format
+#~ msgid ""
+#~ "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+#~ "port \"%s\".\n"
+#~ msgstr ""
+#~ "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (компьютер "
+#~ "\"%s\", порт \"%s\").\n"
+
+#, c-format
+#~ msgid "Unlogged materialized view \"%s.%s\""
+#~ msgstr "Нежурналируемое материализованное представление \"%s.%s\""
+
 #~ msgid "ICU Locale"
 #~ msgstr "локаль ICU"
 
@@ -7154,9 +7555,6 @@ msgstr ""
 #~ msgid "\\%s: error while setting variable\n"
 #~ msgstr "\\%s: не удалось установить переменную\n"
 
-#~ msgid "could not set variable \"%s\"\n"
-#~ msgstr "не удалось установить переменную \"%s\"\n"
-
 #~ msgid "Modifiers"
 #~ msgstr "Модификаторы"
 
@@ -7172,9 +7570,6 @@ msgstr ""
 #~ msgid "Modifier"
 #~ msgstr "Модификатор"
 
-#~ msgid "%s: could not set variable \"%s\"\n"
-#~ msgstr "%s: не удалось установить переменную \"%s\"\n"
-
 #~ msgid "\\crosstabview: query must return results to be shown in crosstab\n"
 #~ msgstr ""
 #~ "\\crosstabview: запрос должен возвращать результаты для вывода в "
diff --git a/src/bin/psql/po/sv.po b/src/bin/psql/po/sv.po
index 38ef29bff55..a9e50b32141 100644
--- a/src/bin/psql/po/sv.po
+++ b/src/bin/psql/po/sv.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-12 13:48+0000\n"
-"PO-Revision-Date: 2025-02-12 20:57+0100\n"
+"POT-Creation-Date: 2026-02-02 01:48+0000\n"
+"PO-Revision-Date: 2026-02-02 23:07+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -58,28 +58,28 @@ msgstr "kunde inte hitta en \"%s\" att köra"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "kunde inte konvertera sökvägen \"%s\" till en absolut sökväg: %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "kunde inte köra kommandot \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "kunde inte läsa från kommando \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "ingen data returnerades från kommandot \"%s\""
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() misslyckades: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1373 command.c:3459 command.c:3508 command.c:3633 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -101,7 +101,7 @@ msgstr "kan inte duplicera null-pekare (internt fel)\n"
 msgid "could not look up effective user ID %ld: %s"
 msgstr "kunde inte slå upp effektivt användar-id %ld: %s"
 
-#: ../../common/username.c:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "användaren finns inte"
 
@@ -162,8 +162,8 @@ msgstr "Avbruten\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Kan inte skriva ut tabellinnehåll: antal celler %lld är lika med eller fler än maximala %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Kan inte skriva ut tabellinnehåll: antal celler %<PRIu64> är lika med eller fler än maximala %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -172,325 +172,432 @@ msgstr "Kan inte lägga till rubrik till tabellinnehåll: antal kolumner (%d) ö
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "Kan inte lägga till cell till tabellinnehåll: totala cellantalet %lld är överskridet.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "Kan inte lägga till cell till tabellinnehåll: totala cellantalet %<PRIu64> är överskridet.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "ogiltigt utdataformat (internt fel): %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "hoppar över rekursiv expandering av variabeln \"%s\""
 
-#: ../../fe_utils/string_utils.c:608
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:781
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
+#: command.c:254
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "kunde inte slå upp lokalt användar-id %d: %s"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "baksträckkommandon är begränsade; bara \\unrestrict tillåts"
 
-#: ../../port/user.c:48 ../../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "lokal användare med ID %d existerar inte"
-
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "ogiltigt kommando \\%s"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Försök med \\? för hjälp."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: extra argument \"%s\" ignorerat"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "kommandot \\%s ignorerat; använd \\endif eller Ctrl-C för att avsluta nuvarande \\if-block"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s: obligatoriskt argument saknas"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "kunde inte hämta hemkatalog för användar-ID %ld: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: kunde inte byta katalog till \"%s\": %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "Du är för närvarande inte uppkopplad mot en databas.\n"
 
-#: command.c:667
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
-msgstr "Du är uppkopplad upp mot databas \"%s\" som användare \"%s\" på adress \"%s\" på port \"%s\".\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "Anslutningsinformation"
 
-#: command.c:670
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "Du är uppkopplad mot databas \"%s\" som användare \"%s\" via uttag i \"%s\" på port \"%s\".\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "Parameter"
 
-#: command.c:676
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
-msgstr "Du är uppkopplad upp mot databas \"%s\" som användare \"%s\" på värd \"%s\" (adress \"%s\") på port \"%s\".\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "Värde"
 
-#: command.c:679
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "Du är uppkopplad upp mot databas \"%s\" som användare \"%s\" på värd \"%s\" på port \"%s\".\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "Databas"
+
+#: command.c:848
+msgid "Client User"
+msgstr "Klientanvändare"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "Värdadress"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "Socket-katalog"
+
+#: command.c:868
+msgid "Host"
+msgstr "Värd"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "Serverport"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "Alternativ"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "Protokollversion"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "Använd lösenord"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "falskt"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "sant"
+
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "GSSAPI-autentiserad"
+
+#: command.c:898
+msgid "Backend PID"
+msgstr "Backend-PID"
 
-#: command.c:1069 command.c:1170 command.c:2676
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL-anslutning"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSL-bibliotek"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "okänd"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSL-protokoll"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "SSL nyckelbitar"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL-krypto"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL-komprimering"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "ingen"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "ingen frågebuffert"
 
-#: command.c:1102 command.c:5779
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "ogiltigt radnummer: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: ogiltigt kodningsnamn eller konverteringsprocedur hittades inte"
 
-#: command.c:1369 command.c:2158 command.c:3455 command.c:3653 command.c:5885
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1376
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "Det finns inget tidigare fel."
 
-#: command.c:1489
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s tillåts inte i pipeline-läge"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: saknar höger parentes"
 
-#: command.c:1573 command.c:1692 command.c:1996 command.c:2010 command.c:2029
-#: command.c:2197 command.c:2438 command.c:2643 command.c:2683
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s: obligatoriskt argument saknas"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: ogiltigt antal efterfrågade resultat"
 
-#: command.c:1823
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: kan inte komma efter \\else"
 
-#: command.c:1828
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: ingen matchande \\if"
 
-#: command.c:1892
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: kan inte komma efter \\else"
 
-#: command.c:1897
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: ingen matchande \\if"
 
-#: command.c:1937
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: ingen matchande \\if"
 
-#: command.c:2093
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "Frågebufferten är tom."
 
-#: command.c:2136
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Mata in nytt lösenord för användare \"%s\": "
 
-#: command.c:2140
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Mata in det igen: "
 
-#: command.c:2149
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Lösenorden stämde inte överens."
 
-#: command.c:2232
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: kunde inte läsa värde på varibeln"
 
-#: command.c:2334
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "Frågebufferten har blivit borttagen."
 
-#: command.c:2356
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Skrev historiken till fil \"%s\".\n"
 
-#: command.c:2443
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline måste användas efter \\bind eller \\bind_named"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline tillåts inte utanför pipeline-läge"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: omgivningsvariabelnamn får ej innehålla \"=\""
 
-#: command.c:2491
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "funktionsnamn krävs"
 
-#: command.c:2493
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "vynamn krävs"
 
-#: command.c:2615
+#: command.c:3176
 msgid "Timing is on."
 msgstr "Tidtagning är på."
 
-#: command.c:2617
+#: command.c:3178
 msgid "Timing is off."
 msgstr "Tidtagning är av."
 
-#: command.c:2703 command.c:2741 command.c:4166 command.c:4169 command.c:4172
-#: command.c:4178 command.c:4180 command.c:4206 command.c:4216 command.c:4228
-#: command.c:4242 command.c:4269 command.c:4327 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: ej i begränsat läge just nu"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: fel nyckel"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2730 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2802 command.c:2868
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: värde på intervall angivet mer än en gång"
 
-#: command.c:2812 command.c:2878
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: inkorrekt intervallvärde \"%s\""
 
-#: command.c:2822
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: iterationsantal angivet mer än en gång"
 
-#: command.c:2832
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: inkorrekt iterationsantal \"%s\""
 
-#: command.c:2842
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: minsta radantal angivet mer än en gång"
 
-#: command.c:2852
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: inkorrekt minsta radantal \"%s\""
 
-#: command.c:2859
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: okänd parameter \"%s\""
 
-#: command.c:3256 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: command.c:3261 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Lösenord för användare %s: "
 
-#: command.c:3317
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "Ange inte användare, värd eller port separat tillsammans med en anslutningssträng"
 
-#: command.c:3352
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "Det finns ingen anslutning att återanvända parametrar från"
 
-#: command.c:3659
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Föregående anslutning bevarad"
 
-#: command.c:3665
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:3721
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "Du är nu uppkopplad mot databasen \"%s\" som användare \"%s\" på adress \"%s\" på port \"%s\".\n"
 
-#: command.c:3724
+#: command.c:4343
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "Du är nu uppkopplad mot databasen \"%s\" som användare \"%s\" via uttag i \"%s\" på port \"%s\".\n"
 
-#: command.c:3730
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "Du är nu uppkopplad mot databasen \"%s\" som användare \"%s\" på värd \"%s\" (adress \"%s\") på port \"%s\".\n"
 
-#: command.c:3733
+#: command.c:4352
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "Du är nu uppkopplad mot databasen \"%s\" som användare \"%s\" på värd \"%s\" på port \"%s\".\n"
 
-#: command.c:3738
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Du är nu uppkopplad mot databasen \"%s\" som användare \"%s\".\n"
 
-#: command.c:3844
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, server %s)\n"
 
-#: command.c:3857
+#: command.c:4476
 #, c-format
 msgid ""
 "WARNING: %s major version %s, server major version %s.\n"
@@ -499,33 +606,25 @@ msgstr ""
 "VARNING: %s huvudversion %s, server huvudversion %s.\n"
 "         En del psql-finesser kommer kanske inte fungera.\n"
 
-#: command.c:3896
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "SSL-anslutning (protokoll: %s, krypto: %s, komprimering: %s, ALPN: %s)\n"
 
-#: command.c:3897 command.c:3898
-msgid "unknown"
-msgstr "okänd"
-
-#: command.c:3899 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "av"
 
-#: command.c:3899 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "på"
 
-#: command.c:3900
-msgid "none"
-msgstr "ingen"
-
-#: command.c:3914
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "GSSAPI-krypterad anslutning\n"
 
-#: command.c:3934
+#: command.c:4553
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -536,284 +635,284 @@ msgstr ""
 "         8-bitars tecken kommer troligen inte fungera korrekt. Se psql:s\n"
 "         referensmanual i sektionen \"Notes for Windows users\" för mer detaljer.\n"
 
-#: command.c:4041
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "omgivningsvariabeln PSQL_EDITOR_LINENUMBER_ARG måste ange ett radnummer"
 
-#: command.c:4071
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "kunde inte starta editorn \"%s\""
 
-#: command.c:4073
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "kunde inte starta /bin/sh"
 
-#: command.c:4123
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "kunde inte hitta temp-katalog: %s"
 
-#: command.c:4150
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "kunde inte öppna temporär fil \"%s\": %m"
 
-#: command.c:4486
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: tvetydig förkortning \"%s\" matchar både \"%s\" och \"%s\""
 
-#: command.c:4506
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: tillåtna format är aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4525
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: tillåtna linjestilar är ascii, old-ascii, unicode"
 
-#: command.c:4540
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: tillåtna Unicode-ramstilar är single, double"
 
-#: command.c:4555
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: tillåtna Unicode-kolumnlinjestilar ärsingle, double"
 
-#: command.c:4570
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: tillåtna Unicode-rubriklinjestilar är single, double"
 
-#: command.c:4622
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: tillåtna värden på xheader_width är \"%s\" (standard), \"%s\", \"%s\" eller ett tal som anger exakt vidd"
 
-#: command.c:4639
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep måste vara ett ensamt en-byte-tecken"
 
-#: command.c:4644
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldset kan inte vara dubbelcitat, nyrad eller vagnretur"
 
-#: command.c:4782 command.c:4983
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: okänd parameter: %s"
 
-#: command.c:4802
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Ramstil är %d.\n"
 
-#: command.c:4808
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Målvidd är inte satt.\n"
 
-#: command.c:4810
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Målvidd är %d.\n"
 
-#: command.c:4817
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Utökad visning är på.\n"
 
-#: command.c:4819
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Utökad visning används automatiskt.\n"
 
-#: command.c:4821
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Utökad visning är av.\n"
 
-#: command.c:4828 command.c:4830 command.c:4832
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "Expanderad rubrikvidd är \"%s\".\n"
 
-#: command.c:4834
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "Expanderad rubrikvidd är %d.\n"
 
-#: command.c:4840
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "Fältseparatorn för CSV är \"%s\".\n"
 
-#: command.c:4848 command.c:4856
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Fältseparatorn är noll-byte.\n"
 
-#: command.c:4850
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Fältseparatorn är \"%s\".\n"
 
-#: command.c:4863
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Standard sidfot är på.\n"
 
-#: command.c:4865
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Standard sidfot är av.\n"
 
-#: command.c:4871
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Utdataformatet är \"%s\".\n"
 
-#: command.c:4877
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Linjestil är %s.\n"
 
-#: command.c:4884
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null-visare är \"%s\".\n"
 
-#: command.c:4892
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Lokal-anpassad numerisk utdata är på.\n"
 
-#: command.c:4894
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Lokal-anpassad numerisk utdata är av.\n"
 
-#: command.c:4901
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Siduppdelare är på för lång utdata.\n"
 
-#: command.c:4903
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Siduppdelare används alltid.\n"
 
-#: command.c:4905
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Siduppdelare är av.\n"
 
-#: command.c:4911
+#: command.c:5537
 #, 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] "Siduppdelare kommer inte användas för färre än %d linje.\n"
 msgstr[1] "Siduppdelare kommer inte användas för färre än %d linjer.\n"
 
-#: command.c:4921 command.c:4931
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Postseparatorn är noll-byte.\n"
 
-#: command.c:4923
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Postseparatorn är <nyrad>.\n"
 
-#: command.c:4925
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Postseparatorn är \"%s\".\n"
 
-#: command.c:4938
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Tabellattributen är \"%s\".\n"
 
-#: command.c:4941
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tabellattributen är ej satta.\n"
 
-#: command.c:4948
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titeln är \"%s\".\n"
 
-#: command.c:4950
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Titeln är inte satt.\n"
 
-#: command.c:4957
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Visa bara tupler är på.\n"
 
-#: command.c:4959
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Visa bara tupler är av.\n"
 
-#: command.c:4965
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Unicode-ramstil är \"%s\".\n"
 
-#: command.c:4971
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Unicode-kolumnLinjestil är \"%s\".\n"
 
-#: command.c:4977
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Unicode-rubriklinjestil är \"%s\".\n"
 
-#: command.c:5226
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: misslyckades"
 
-#: command.c:5264
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch kan inte användas på en tom fråga"
 
-#: command.c:5296
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "kunde inte sätta timer: %m"
 
-#: command.c:5365
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (varje %gs)\n"
 
-#: command.c:5368
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (varje %gs)\n"
 
-#: command.c:5432
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "kunde inte vänta på signaler: %m"
 
-#: command.c:5488 command.c:5495 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid ""
 "/******** QUERY *********/\n"
@@ -826,107 +925,107 @@ msgstr ""
 "/************************/\n"
 "\n"
 
-#: command.c:5674
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\" är inte en vy"
 
-#: command.c:5690
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "kunde inte parsa arrayen reloptions"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "kan inte escape:a utan en aktiv uppkoppling"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\""
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "uppkopplingen till servern har brutits"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Anslutningen till servern har brutits. Försöker starta om: "
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "Misslyckades.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Lyckades.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "oväntad PQresultStatus: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Tid: %.3f ms\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "Tid: %.3f ms (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "Tid: %.3f ms (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Tid: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "Du är för närvarande inte uppkopplad mot en databas."
 
-#: common.c:714
+#: common.c:749
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "Asynkron notificering \"%s\" mottagen med innehåll \"%s\" från serverprocess med PID %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Asynkron notificering \"%s\" mottagen från serverprocess med PID %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "kunde inte visa resultatabell: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "inga rader returnerades för \\gset"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "mer än en rad returnerades för \\gset"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "försök att utföra \\gset in i en speciellt hanterad variabel \"%s\" hoppas över"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid ""
 "/**(Single step mode: verify command)******************************************/\n"
@@ -937,37 +1036,52 @@ msgstr ""
 "%s\n"
 "/**(tryck return för att fortsätta eller skriv x och return för att avbryta)***/\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "SATS:  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "oväntad transaktionsstatus (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Kolumn"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Typ"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "Kommandot hade inget resultat eller så hade resultatet inga kolumner.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "Finns inga väntande resultat att få"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "hämta resultat i chunk-läge misslyckades"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "Pipeline avbruten, kommandot kördes inte"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY i en pipeline stöds inte, avbryter anslutning"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1020,11 +1134,11 @@ msgstr ""
 "Mata in data som skall kopieras följt av en nyrad.\n"
 "Avsluta med bakstreck och en punkt ensamma på en rad eller av en EOF."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "avbruten på grund av läsfel"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "försöker avsluta kopieringsläge"
 
@@ -1073,1167 +1187,1257 @@ msgstr "\\crosstabview: tvetydigt kolumnnamn: \"%s\""
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: hittar ej kolumnnamn: \"%s\""
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Namn"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Resultatdatatyp"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Argumentdatatyp"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Beskrivning"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "Lista med aggregatfunktioner"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "Servern (version %s) stöder inte accessmetoder."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "Index"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Tabell"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Hanterare"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "Lista med accessmetoder"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Ägare"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "Plats"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "Alternativ"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Storlek"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "Lista med tabellutrymmen"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df tar bara [anptwS+] som flaggor"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df tar bara [%s] som flaggor"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df tar inte en \"%c\"-flagga med serverversion %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "fönster"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "proc"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "funk"
 
 # Vi väljer att bevara den engelska termen då det dels refererar till kommandot CREATE TRIGGER
 # och dels för att detta begreppet normalt benäms som triggers i dagligt tal i Sverige.
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "trigger"
 
 # Vi väljer att bevara den engelska termen då det refererar till en del av CREATE FUNCTION-syntaxen
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "immutable"
 
 # Vi väljer att bevara den engelska termen då det refererar till en del av CREATE FUNCTION-syntaxen
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "stable"
 
 # Vi väljer att bevara den engelska termen då det refererar till en del av CREATE FUNCTION-syntaxen
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "Flyktighet"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "begränsad"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "säker"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "osäker"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "Parallell"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "definierare"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "anropare"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "Säkerhet"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "ja"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "nej"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Leakproof?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "Språk"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Internt namn"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "Lista med funktioner"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "Element"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "Lista med datatyper"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Vänster argumenttyp"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Höger argumenttyp"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "Resultattyp"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Funktion"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "Lista med operatorer"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "Kodning"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Lokalleverantör"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Jämförelse"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Lokal"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "ICU-regler"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Tabellutrymme"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Lista med databaser"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "tabell"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "vy"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "materialiserad vy"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "sekvens"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "främmande tabell"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "partitionerad tabell"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Kolumnrättigheter"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Policys"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Åtkomsträttigheter"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "funktion"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "typ"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "schema"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "stort objekt"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Standard accessrättigheter"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "tabellvillkor"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "domänvillkor"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "operatorklass"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "operatorfamilj"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Objektbeskrivningar"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "Kunde inte hitta en relation med namn \"%s\"."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "Kunde inte hitta några relationer."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "Kunde inte hitta en relation med OID %s."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Start"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Minimum"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Maximum"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Ökning"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "ja"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "nej"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "Cyklisk?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Cache"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Ägd av: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Sekvens för identitetskolumn: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Ologgat sekvens \"%s.%s\""
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sekvens \"%s.%s\""
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Ologgad tabell \"%s.%s\""
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabell \"%s.%s\""
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vy \"%s.%s\""
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Ologgad materialiserad vy \"%s.%s\""
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Materialiserad vy \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Ologgat index \"%s.%s\""
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index \"%s.%s\""
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Ologgat partitionerat index \"%s.%s\""
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Partitionerat index \"%s.%s\""
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-tabell \"%s.%s\""
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Sammansatt typ \"%s.%s\""
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Främmande tabell \"%s.%s\""
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Ologgad partitionerad tabell \"%s.%s\""
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Partitionerad tabell \"%s.%s\""
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Jämförelse"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "Nullbar"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "Standard"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "Nyckel?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Definition"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "FDW-alternativ"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "Lagring"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "Komprimering"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Statistikmål"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Partition av: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Inget partitioneringsvillkor"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Partitioneringsvillkor: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Partitioneringsnyckel: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Ägande tabell \"%s.%s\""
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "primärnyckel, "
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "unik"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " null-värden ej distinkta"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "för tabell \"%s.%s\""
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predikat (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", klustrad"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", ogiltig"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", uppskjutbar"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", initialt uppskjuten"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", replikaidentitet"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Index:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Kontrollvillkor:"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Främmande nyckel-villkor:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Refererad av:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Policys:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Policys (tvingad radsäkerhet påslagen):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Policys (radsäkerhet påslagna): (ingen)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Policys (tvingad radsäkerhet påslagen): (ingen)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Policys (radsäkerhet avstängd):"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Statistikobjekt:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Regler:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Avstängda regler:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Regler som alltid utförs:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Regler som utförs enbart på replika:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Publiceringar:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Icke-null-villkor"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (lokalt, ärvt)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr "(ärvt)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Vydefinition:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Triggrar:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Avstängda användartriggrar:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Avstängda interna triggrar:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Triggrar som alltid körs:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Triggrar som enbart körs på replika:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Server: %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "FDW-alternativ: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Ärver"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Antal partitioner: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Antal partitioner: %d (Använd \\d+ för att lista dem.)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Antal barntabeller: %d (Använd \\d+ för att lista dem.)"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Barntabeller"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Partitioner"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Typad tabell av typ: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Replikaidentitet"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Har OID:er: ja"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Accessmetod: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tabellutrymme: \"%s\""
 
 #. translator: before this string there's an index description like
 #. '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tabellutrymme: \"%s\""
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "Lista med roller"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Rollnamn"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Attribut"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Superanvändare"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "Inget arv"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "Skapa roll"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "Skapa DB"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "Kan inte logga in"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "Replikering"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Hopp över RLS"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "Inga uppkopplingar"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d uppkoppling"
 msgstr[1] "%d uppkopplingar"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Lösenord giltigt till "
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "Roll"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "Databas"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "Inställningar"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "Kunde inte hitta några inställningar för roll \"%s\" och databas \"%s\"."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "Kunde inte hitta några inställningar för roll \"%s\"."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "Kunde inte hitta några inställningar."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Lista med inställningar"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "Medlem av"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Rättighetsutdelare"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "Lista med roll-rättigheter"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "index"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "TOAST-tabell"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "partitionerat index"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "permanent"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "temporär"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "ologgad"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Persistens"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Accessmetod"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "Hittade inte några relationer med namn \"%s\"."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "Hittade inte några tabeller med namn \"%s\"."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "Hittade inte några index med namn \"%s\"."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "Hittade inte några vyer med namn \"%s\"."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "Hittade inte några materialiserade vyer med namn \"%s\"."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "Hittade inga sekvenser med namn \"%s\"."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "Hittade inga främmande tabeller med namn \"%s\"."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "Hittade inga tabeller."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "Hittade inga index."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "Hittade inga vyer."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "Hittade inga materialiserade vyer."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "Hittade inga sekvenser."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "Hittade inga främmande tabeller."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Lista med relationer"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "Lista med tabeller"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "Lista med index"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "Lista med vyer"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "Lista med materialiserade vyer"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "Lista med sekvenser"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "Lista med främmande tabeller"
+
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "Servern (version %s) stöder inte deklarativ tabellpartitionering."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Lista med partitionerade index"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Lista med partitionerade tabeller"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Lista med partitionerade relationer"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Föräldranamn"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Partitionsstorlek av löv"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Total storlek"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "Tillförlitlig"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Internt språk"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Anropshanterare"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Validerare"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Inline-hanterare"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "Lista med språk"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Lista med domäner"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "Källa"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "Mål"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "Standard?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Lista med konverteringar"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "Parameter"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "Värde"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "Kontext"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Lista med konfigurationsparametrar"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Lista med icke-defaulta konfigurationsparametrar"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "Servern (version %s) stöder inte händelsetriggrar."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "Händelse"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "påslagen"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "replika"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "alltid"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "avstängd"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Påslagen"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "Etiketter"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Lista med händelsetriggrar"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "Servern (version %s) stöder inte utökad statistik."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Nunika"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Beroenden"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "Lista med utökad statistik"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Källtyp"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Måltyp"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "i tilldelning"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Implicit?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Lista med typomvandlingar"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Leverantör"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Deterministisk?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Lista med jämförelser (collations)"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Lista med scheman"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Lista med textsökparsrar"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "Kunde inte hitta en textsökparser med namn \"%s\"."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "Kunde inte hitta några textsökparsrar."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Starta parsning"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "Metod"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Hämta nästa symbol"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "Avsluta parsning"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Hämta rubrik"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Hämta symboltyper"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Textsökparser \"%s.%s\""
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Textsökparser \"%s\""
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "Symbolnamn"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Symboltyper för parser \"%s.%s\""
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Symboltyper för parser \"%s\""
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "Mall"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "Initieringsalternativ"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Lista med textsökordlistor"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Symboluppdelning"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Lista med textsökmallar"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Lista med textsökkonfigurationer"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "Kunde inte hitta en textsökkonfiguration med namn \"%s\"."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "Kunde inte hitta några textsökkonfigurationer."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "Symbol"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Ordlistor"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Textsökkonfiguration \"%s.%s\""
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Textsökkonfiguration \"%s\""
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid ""
 "\n"
@@ -2242,7 +2446,7 @@ msgstr ""
 "\n"
 "Parser: \"%s.%s\""
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid ""
 "\n"
@@ -2251,273 +2455,277 @@ msgstr ""
 "\n"
 "Parser: \"%s\""
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Lista med främmande data-omvandlare"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Främmande data-omvandlare"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Lista med främmande servrar"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "Användarnamn"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Lista av användarmappningar"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "Lista med främmande tabeller"
+#: describe.c:6196
+msgid "Default version"
+msgstr "Standardversion"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Lista med installerade utökningar"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "Kunde inte hitta en utökning med namn \"%s\"."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "Kunde inte hitta några utökningar."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "Objektbeskrivning"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objekt i utökning \"%s\""
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "ej korrekt kvalificerat namn (för många namn med punkt): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "referenser till andra databaser är inte implementerat: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "Servern (version %s) stöder inte publiceringar."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Alla tabeller"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Insättningar"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Borttagningar"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Trunkeringar"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "Genererade kolumner"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Via root"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Lista med publiceringar"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "Kunde inte hitta någon publicering med namn \"%s\"."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "Kunde inte hitta några publiceringar."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Publicering %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Tabeller:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Tabeller från scheman:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "Denna server (version %s) stöder inte prenumerationer."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "Publicering"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "Binär"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "Strömmande"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Tvåfas-commit"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Stäng av vid fel"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "Ursprung"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "Lösenord krävs"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "Kör som ägare?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "Failover"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Synkron commit"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Anslutningsinfo"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Skippa LSN"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Lista med prenumerationer"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(ingen)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "AM"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "Indatatyp"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Lagringstyp"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Operatorklass"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Operatorfamilj"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Lista med operatorklasser"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Applicerbara typer"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Lista med operatorfamiljer"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "Operator"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Strategi"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "ordning"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "sök"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Ändamål"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "Sortering-opfamilj"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "Lista med operatorer i operatorfamiljer"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Registrerad vänstertyp"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Registrerad högertyp"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "Nummer"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Lista med supportfunktioner i operatorfamiljer"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "Stora objekt"
 
-#: help.c:63
+#: help.c:60
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -2525,11 +2733,11 @@ msgstr ""
 "psql är den interaktiva PostgreSQL-terminalen.\n"
 "\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:502
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: help.c:65
+#: help.c:62
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
 "\n"
@@ -2537,27 +2745,27 @@ msgstr ""
 "  psql [FLAGGA]... [DBNAMN [ANVÄNDARNAMN]]\n"
 "\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "Allmänna flaggor:\n"
 
-#: help.c:68
+#: help.c:65
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr "  -c, --command=KOMMANDO   kör ett kommando (SQL eller internt) och avsluta sedan\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=DBNAMN      namn på databas att ansluta till\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=FILNAMN       kör kommandon från fil och avsluta sedan\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list               lista befintliga databaser och avsluta sedan\n"
 
-#: help.c:72
+#: help.c:69
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -2567,15 +2775,15 @@ msgstr ""
 "                           sätt psql-variabel NAMN till VÄRDE\n"
 "                           (t.ex. -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            visa versionsinformation, avsluta sedan\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          läs inte startfilen (~/.psqlrc)\n"
 
-#: help.c:77
+#: help.c:74
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
@@ -2583,19 +2791,19 @@ msgstr ""
 "  -1 (\"ett\"), --single-transaction\n"
 "                           kör kommandofilen som en transaktion (om icke-interaktiv)\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=alternativ]  visa denna hjälp, avsluta sedan\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commands      lista bakstreck-kommandon, avsluta sedan\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variabler     lista speciella variabler, avsluta sedan\n"
 
-#: help.c:83
+#: help.c:80
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -2603,47 +2811,47 @@ msgstr ""
 "\n"
 "Flaggor för in-/utmatning:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           visa all indata från skript\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        visa misslyckade kommandon\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       visa kommandon som skickas till servern\n"
 
-#: help.c:87
+#: help.c:84
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        visa frågor som interna kommandon skapar\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FILENAME  skicka sessions-logg till fil\n"
 
-#: help.c:89
+#: help.c:86
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr "  -n, --no-readline        slå av förbättrad kommandoradsredigering (readline)\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=FILNAMN     skriv frågeresultat till fil (eller |rör)\n"
 
-#: help.c:91
+#: help.c:88
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet              kör tyst (inga meddelanden, endast frågeutdata)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        stegningsläge (bekräfta varje fråga)\n"
 
-#: help.c:93
+#: help.c:90
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr "  -S, --single-line        enradsläge (slutet på raden avslutar SQL-kommando)\n"
 
-#: help.c:95
+#: help.c:92
 msgid ""
 "\n"
 "Output format options:\n"
@@ -2651,15 +2859,15 @@ msgstr ""
 "\n"
 "Flaggor för utdataformat:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           ojusterad utskrift av tabeller\n"
 
-#: help.c:97
+#: help.c:94
 msgid "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr "      --csv                CSV-utmarningsläge (kommaseparerade värden)\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -2668,15 +2876,15 @@ msgstr ""
 "  -F, --field-separator=STRÄNG\n"
 "                           fältseparator för icke justerad utdata (standard: \"%s\")\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML-utskrift av tabeller\n"
 
-#: help.c:102
+#: help.c:99
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr "  -P, --pset=VAR[=ARG]     sätt utskriftsvariabel VAR till ARG (se kommando \\pset)\n"
 
-#: help.c:103
+#: help.c:100
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: newline)\n"
@@ -2684,19 +2892,19 @@ msgstr ""
 "  -R, --record-separator=STRÄNG\n"
 "                           sätt postseparator för icke justerad utdata (standard: newline)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        visa endast rader\n"
 
-#: help.c:106
+#: help.c:103
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr "  -T, --table-attr=TEXT    sätt HTML-tabellers flaggor (t.ex. width, border)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           slå på utökad utsrift av tabeller\n"
 
-#: help.c:108
+#: help.c:105
 msgid ""
 "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero byte\n"
@@ -2704,7 +2912,7 @@ msgstr ""
 "  -z, --field-separator-zero\n"
 "                           sätt fältseparator för icke justerad utdata till noll-byte\n"
 
-#: help.c:110
+#: help.c:107
 msgid ""
 "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero byte\n"
@@ -2712,7 +2920,7 @@ msgstr ""
 "  -0, --record-separator=zero\n"
 "                           sätt postseparator för icke justerad utdata till noll-byte\n"
 
-#: help.c:113
+#: help.c:110
 msgid ""
 "\n"
 "Connection options:\n"
@@ -2720,27 +2928,27 @@ msgstr ""
 "\n"
 "Flaggor för anslutning:\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=VÄRDNAMN      databasens värdnamn eller socketkatalog\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=PORT          databasserverns port\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=ANVNAMN   namn på databasens användare\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        fråga aldrig efter lösenord\n"
 
-#: help.c:118
+#: help.c:115
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           fråga om lösenord (borde ske automatiskt)\n"
 
-#: help.c:120
+#: help.c:117
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
@@ -2754,37 +2962,33 @@ msgstr ""
 "i PostgreSQL-dokumentationen.\n"
 "\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapportera fel till <%s>.\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "Allmänna\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       sätt frågeparameter\n"
-
-#: help.c:168
+#: help.c:164
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             visa PostgreSQL-upphovsrättsinformation\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr "  \\crosstabview [KOLUMNER] kör fråga och visa resultatet i en korstabell\n"
 
-#: help.c:170
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose            visa senste felmeddelande vid maximal verbositet\n"
 
-#: help.c:171
+#: help.c:167
 msgid ""
 "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
@@ -2792,26 +2996,42 @@ msgstr ""
 "  \\g [(FLAGGOR)] [FIL]   kör frågan (och skicka resultatet till fil eller |rör);\n"
 "                         \\g utan argument är samma som ett semikolon\n"
 
-#: help.c:173
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc                 beskriv resultatet av fråga utan att köra den\n"
 
-#: help.c:174
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec                 kör fråga, kör sen varje värde i resultatet\n"
 
-#: help.c:175
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [PREFIX]         kör frågan och spara resultatet i psql-variabler\n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr "  \\gx [(FLAGGOR)] [FIL]  som \\g, men tvinga expanderat utmatningsläge\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     avsluta psql\n"
 
+#: help.c:174
+msgid ""
+"  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr ""
+"  \\restrict RESTRICT_KEY\n"
+"                         gå in i begränsat läge med angiven nyckel\n"
+
+#: help.c:176
+msgid ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr ""
+"  \\unrestrict RESTRICT_KEY\n"
+"                         avsluta begränsat läge om nyckeln matchar\n"
+
 #: help.c:178
 msgid ""
 "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
@@ -2822,8 +3042,8 @@ msgstr ""
 "                         kör fråga var SEK sekund, upp till N gånger,\n"
 "                         stoppa om färre än MIN rader returneras\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -2936,232 +3156,234 @@ msgid "Informational\n"
 msgstr "Information\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (flaggor: S = lista systemobjekt, + = mer detaljer)\n"
+msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
+msgstr "  (flaggor: S = lista systemobjekt, x = expanderat läge, + = mer detaljer)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]                 lista tabeller, vyer och sekvenser\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]                lista tabeller, vyer och sekvenser\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
 msgstr "  \\d[S+]  NAMN           beskriv tabell, vy, sekvens eller index\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [MALL]         lista aggregatfunktioner\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [MALL]        lista aggregatfunktioner\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [MALL]         lista accessmetoder\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [MALL]        lista accessmetoder\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  lista operatorklasser\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]] lista operatorklasser\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  lista operatorfamiljer\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]] lista operatorfamiljer\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   lista operatorer i operatorfamiljer\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]  lista operatorer i operatorfamiljer\n"
 
 #: help.c:229
-msgid "  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   lista supportfunktioner i operatorfamiljer\n"
+msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
+msgstr "  \\dAp[x+] [AMPTRN [OPFPTRN]]  lista supportfunktioner i operatorfamiljer\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [MALL]         lista tabellutrymmen\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [MALL]        lista tabellutrymmen\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+]  [MALL]        lista konverteringar\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [MALL]        lista konverteringar\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [MALL]     lista konfigurationsparametrar\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [MALL]    lista konfigurationsparametrar\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [MALL]         lista typomvandlingar\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [MALL]        lista typomvandlingar\n"
 
 #: help.c:234
-msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
-msgstr "  \\dd[S]  [MALL]         visa objektbeskrivning som inte visas på andra ställen\n"
+msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
+msgstr "  \\dd[Sx]  [MALL]        visa objektbeskrivning som inte visas på andra ställen\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+]  [MALL]        lista domäner\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+]  [MALL]       lista domäner\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp     [MALL]        lista standardrättigheter\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]  [MALL]        lista standardrättigheter\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [MALL]         lista främmande tabeller\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [MALL]        lista främmande tabeller\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [MALL]         lista främmande servrar\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [MALL]        lista främmande servrar\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [MALL]         lista främmande tabeller\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [MALL]        lista främmande tabeller\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [MALL]         lista användarmappning\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [MALL]        lista användarmappning\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [MALL]         lista främmande data-omvandlare\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [MALL]        lista främmande data-omvandlare\n"
 
 #: help.c:242
 msgid ""
-"  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
 msgstr ""
-"  \\df[anptw][S+] [FUNKMALL [TYPMALL ...]]\n"
+"  \\df[anptw][Sx+] [FUNKMALL [TYPMALL ...]]\n"
 "                         lista [endast agg/normala/procedur/trigger/window] funktioner\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [MALL]         lista textsökkonfigurationer\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [MALL]        lista textsökkonfigurationer\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [MALL]         lista textsökordlistor\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [MALL]        lista textsökordlistor\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [MALL]         lista textsökparsrar\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [MALL]        lista textsökparsrar\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [MALL]         lista textsökmallar\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [MALL]        lista textsökmallar\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [MALL]         lista roller\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [MALL]        lista roller\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [MALL]         lista index\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [MALL]        lista index\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+]                 lista stora objekt, samma som \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]                lista stora objekt, samma som \\lo_list\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [MALL]         lista procedurspråk\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [MALL]        lista procedurspråk\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [MALL]         lista materialiserade vyer\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [MALL]        lista materialiserade vyer\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [MALL]         lista scheman\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [MALL]        lista scheman\n"
 
 #: help.c:254
 msgid ""
-"  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+"  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
 msgstr ""
-"  \\do[S+] [OPMALL [TYPMALL [TYPMALL]]]\n"
+"  \\do[Sx+] [OPMALL [TYPMALL [TYPMALL]]]\n"
 "                         lista operatorer\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [MALL]         lista jämförelser (collation)\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [MALL]        lista jämförelser (collation)\n"
 
 #: help.c:257
-msgid "  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr "  \\dp[S]  [MALL]         lista åtkomsträttigheter för tabeller, vyer och sekvenser\n"
+msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
+msgstr "  \\dp[Sx]  [MALL]        lista åtkomsträttigheter för tabeller, vyer och sekvenser\n"
 
 #: help.c:258
-msgid "  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"
-msgstr "  \\dP[tin+] [MALL]       lista [bara tabell/index] partitionerade relationer [n=nästlad]\n"
+msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
+msgstr "  \\dP[tinx+] [MALL]      lista [bara tabell/index] partitionerade relationer [n=nästlad]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
+msgid ""
+"  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
 msgstr ""
-"  \\drds [ROLLMALL1 [DBMALL2]]\n"
+"  \\drds[x] [ROLLMALL [DBMALL]]\n"
 "                         lista rollinställningar per databas\n"
 
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\drg[S] [MALL]         lista roll-rättigheter\n"
-
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [MALL]         lista replikeringspubliceringar\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\drg[Sx] [MALL]        lista roll-rättigheter\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [MALL]         lista replikeringsprenumerationer\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [MALL]        lista replikeringspubliceringar\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [MALL]         lista sekvenser\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [MALL]        lista replikeringsprenumerationer\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [MALL]         lista tabeller\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [MALL]        lista sekvenser\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [MALL]         lista datatyper\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [MALL]        lista tabeller\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [MALL]         lista roller\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [MALL]        lista datatyper\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [MALL]         lista vyer\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [MALL]        lista roller\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [MALL]         lista utökningar\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [MALL]        lista vyer\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [MALL]         lista utökad statistik\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [MALL]        lista utökningar\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]  [MALL]         lista händelsetriggrar\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]  [MALL]         lista utökad statistik\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [MALL]         lista databaser\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [MALL]        lista händelsetriggrar\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  FUNKNAMN       visa en funktions definition\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [MALL]        lista databaser\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  VYNAMN         visa en vys definition\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]  FUNKNAMN       visa en funktions definition\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]   [MALL]         samma som \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]  VYNAMN         visa en vys definition\n"
 
-#: help.c:277
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]   [MALL]        samma som \\dp\n"
+
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "Stora objekt\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr "  \\lo_export LOBOID FIL skriv stort objekt till fil\n"
 
-#: help.c:279
+#: help.c:280
 msgid ""
 "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
@@ -3169,36 +3391,36 @@ msgstr ""
 "  \\lo_import FIL [KOMMENTAR]\n"
 "                         läs stort objekt från fil\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+]            lista stora objekt\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]           lista stora objekt\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID      ta bort stort objekt\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Formatering\n"
 
-#: help.c:286
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                     byt mellan ojusterat och justerat utdataformat\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [TEXT]              sätt tabelltitel, eller nollställ\n"
 
-#: help.c:288
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr "  \\f [TEXT]              visa eller sätt fältseparatorn för ojusterad utmatning\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     slå på/av HTML-utskriftsläge (för närvarande: %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
@@ -3216,29 +3438,29 @@ msgstr ""
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
 "                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            visa endast rader (för närvarande: %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [TEXT]              sätt HTML-tabellens <table>-attribut, eller nollställ\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       slå på/av expanderat utmatningsläge (för närvarande: %s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "auto"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "Anslutning\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -3247,7 +3469,7 @@ msgstr ""
 "  \\c[onnect] {[DBNAMN|- ANVÄNDARE|- VÄRD|- PORT|-] | conninfo}\n"
 "                         koppla upp mot ny databas (för närvarande \"%s\")\n"
 
-#: help.c:311
+#: help.c:312
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
@@ -3255,70 +3477,128 @@ msgstr ""
 "  \\c[onnect] {[DBNAMN|- ANVÄNDARE|- VÄRD|- PORT|-] | conninfo}\n"
 "                         koppla upp mot ny databas (för närvarande ingen uppkoppling)\n"
 
-#: help.c:313
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              visa information om aktuell uppkoppling\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [KODNING]    visa eller sätt klientens teckenkodning\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [ANVÄNDARNAMN] byt användares lösenord på ett säkert sätt\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Operativsystem\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [KATALOG]          byt den aktuella katalogen\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVVAR hämta omgivningsvariabel\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NAMN [VÄRDE]   sätt eller nollställ omgivningsvariabel\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       slå på/av tidstagning av kommandon (för närvarande: %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr "  \\! [KOMMANDO]          kör kommando i skal eller starta interaktivt skal\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "Variabler\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [TEXT] NAMN    be användaren att sätta en intern variabel\n"
 
-#: help.c:329
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [NAMN [VÄRDE]]    sätt intern variabel, eller lista alla om ingen param\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NAME            ta bort intern variabel\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "Utökat frågeprotokoll\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       sätt frågeparameter\n"
+
+#: help.c:336
+msgid ""
+"  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr ""
+"  \\bind_named SATS_NAMN [PARAM]...\n"
+"                         ange frågeparametrar för en existerande förberedd sats\n"
+
+#: help.c:338
+msgid ""
+"  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr ""
+"  \\close_prepared SATS_NAME\n"
+"                         stäng en existerande förberedd sats\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           avsluta pipeline-läge\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 flusha utdata till servern\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest          skicka förfrågan till servern att flusha utdatabuffern\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr ""
+"  \\getresults [NUM_RES]  läs NUM_RES väntande resultat eller alla\n"
+"                         om argument inget argument anges\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse SATS_NAMN       skapa en förberedd sats\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          skicka en utökad fråga på en aktiv pipeline\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         gå in i pipeline-läge\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline          lägg till en synkroniseringspunkt till aktiv pipeline\n"
+
+#: help.c:386
 msgid ""
 "List of specially treated variables\n"
 "\n"
 msgstr "Lista av variabler som hanteras speciellt\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "psql-variabler:\n"
 
-#: help.c:373
+#: help.c:390
 msgid ""
 "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n"
@@ -3328,7 +3608,7 @@ msgstr ""
 "  eller \\set NAMN VÄRDE inne i psql\n"
 "\n"
 
-#: help.c:375
+#: help.c:392
 msgid ""
 "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
@@ -3336,7 +3616,7 @@ msgstr ""
 "  AUTOCOMMIT\n"
 "    om satt så kommer efterföljande SQL-kommandon commit:as automatiskt\n"
 
-#: help.c:377
+#: help.c:394
 msgid ""
 "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
@@ -3346,7 +3626,7 @@ msgstr ""
 "    bestämmer skiftläge för att komplettera SQL-nyckelord\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:380
+#: help.c:397
 msgid ""
 "  DBNAME\n"
 "    the currently connected database name\n"
@@ -3354,7 +3634,7 @@ msgstr ""
 "  DBNAME\n"
 "    den uppkopplade databasens namn\n"
 
-#: help.c:382
+#: help.c:399
 msgid ""
 "  ECHO\n"
 "    controls what input is written to standard output\n"
@@ -3364,7 +3644,7 @@ msgstr ""
 "    bestämmer vilken indata som skrivs till standard ut\n"
 "    [all, errors, none, queries]\n"
 
-#: help.c:385
+#: help.c:402
 msgid ""
 "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
@@ -3374,7 +3654,7 @@ msgstr ""
 "    om satt, visa interna frågor som körs av backåtstreckkommandon:\n"
 "    om satt till \"noexec\", bara visa dem utan att köra\n"
 
-#: help.c:388
+#: help.c:405
 msgid ""
 "  ENCODING\n"
 "    current client character set encoding\n"
@@ -3382,7 +3662,7 @@ msgstr ""
 "  ENCODING\n"
 "    aktuell teckenkodning för klient\n"
 
-#: help.c:390
+#: help.c:407
 msgid ""
 "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
@@ -3390,7 +3670,7 @@ msgstr ""
 "  ERROR\n"
 "    \"true\" om sista frågan misslyckades, \"false\" annars\n"
 
-#: help.c:392
+#: help.c:409
 msgid ""
 "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
@@ -3398,7 +3678,7 @@ msgstr ""
 "  FETCH_COUNT\n"
 "    antal resultatrader som hämtas och visas åt gången (0=obegränsat)\n"
 
-#: help.c:394
+#: help.c:411
 msgid ""
 "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
@@ -3406,7 +3686,7 @@ msgstr ""
 "  HIDE_TABLEAM\n"
 "    om satt så visas inte accessmetoder\n"
 
-#: help.c:396
+#: help.c:413
 msgid ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
@@ -3414,7 +3694,7 @@ msgstr ""
 "  HIDE_TOAST_COMPRESSION\n"
 "    om satt så visas inte komprimeringsmetoder\n"
 
-#: help.c:398
+#: help.c:415
 msgid ""
 "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
@@ -3422,7 +3702,7 @@ msgstr ""
 "  HISTCONTROL\n"
 "    styr kommandohistoriken [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid ""
 "  HISTFILE\n"
 "    file name used to store the command history\n"
@@ -3430,7 +3710,7 @@ msgstr ""
 "  HISTFILE\n"
 "    filnamn för att spara kommandohistoriken i\n"
 
-#: help.c:402
+#: help.c:419
 msgid ""
 "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
@@ -3438,7 +3718,7 @@ msgstr ""
 "  HISTSIZE\n"
 "    maximalt antal kommandon som sparas i kommandohistoriken\n"
 
-#: help.c:404
+#: help.c:421
 msgid ""
 "  HOST\n"
 "    the currently connected database server host\n"
@@ -3446,7 +3726,7 @@ msgstr ""
 "  HOST\n"
 "    den uppkopplade databasens värd\n"
 
-#: help.c:406
+#: help.c:423
 msgid ""
 "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
@@ -3454,7 +3734,7 @@ msgstr ""
 "  IGNOREEOF\n"
 "    antal EOF som behövs för att avsluta en interaktiv session\n"
 
-#: help.c:408
+#: help.c:425
 msgid ""
 "  LASTOID\n"
 "    value of the last affected OID\n"
@@ -3462,7 +3742,7 @@ msgstr ""
 "  LASTOID\n"
 "    värdet av den senast påverkade OID:en\n"
 
-#: help.c:410
+#: help.c:427
 msgid ""
 "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
@@ -3472,7 +3752,7 @@ msgstr ""
 "  LAST_ERROR_SQLSTATE\n"
 "    meddelande och SQLSTATE för sista felet eller en tom sträng och \"00000\" om det inte varit fel\n"
 
-#: help.c:413
+#: help.c:430
 msgid ""
 "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
@@ -3480,7 +3760,7 @@ msgstr ""
 "  ON_ERROR_ROLLBACK\n"
 "    om satt, ett fel stoppar inte en transaktion (använder implicita sparpunkter)\n"
 
-#: help.c:415
+#: help.c:432
 msgid ""
 "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
@@ -3488,7 +3768,7 @@ msgstr ""
 "  ON_ERROR_STOP\n"
 "    avsluta batchkörning vid fel\n"
 
-#: help.c:417
+#: help.c:434
 msgid ""
 "  PORT\n"
 "    server port of the current connection\n"
@@ -3496,7 +3776,7 @@ msgstr ""
 "  PORT\n"
 "    värdport för den aktuella uppkopplingen\n"
 
-#: help.c:419
+#: help.c:436
 msgid ""
 "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
@@ -3504,7 +3784,7 @@ msgstr ""
 "  PROMPT1\n"
 "    anger standardprompten för psql\n"
 
-#: help.c:421
+#: help.c:438
 msgid ""
 "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
@@ -3512,7 +3792,7 @@ msgstr ""
 "  PROMPT2\n"
 "    anger den prompt som används om en sats forsätter på efterföljande rad\n"
 
-#: help.c:423
+#: help.c:440
 msgid ""
 "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
@@ -3520,7 +3800,7 @@ msgstr ""
 "  PROMPT3\n"
 "    anger den prompt som används för COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid ""
 "  QUIET\n"
 "    run quietly (same as -q option)\n"
@@ -3528,7 +3808,7 @@ msgstr ""
 "  QUIET\n"
 "    kör tyst (samma som flaggan -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid ""
 "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
@@ -3536,7 +3816,7 @@ msgstr ""
 "  ROW_COUNT\n"
 "    antal rader som returnerades eller påverkades av senaste frågan alternativt 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid ""
 "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
@@ -3546,7 +3826,7 @@ msgstr ""
 "  SERVER_VERSION_NAME\n"
 "    serverns version (i kort sträng eller numeriskt format)\n"
 
-#: help.c:432
+#: help.c:449
 msgid ""
 "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
@@ -3554,7 +3834,7 @@ msgstr ""
 "  ERROR\n"
 "    \"true\" om sista frågan misslyckades, \"false\" annars\n"
 
-#: help.c:434
+#: help.c:451
 msgid ""
 "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
@@ -3562,7 +3842,7 @@ msgstr ""
 "  SHELL_EXIT_CODE\n"
 "    exit-kod för senaste skalkommandot\n"
 
-#: help.c:436
+#: help.c:453
 msgid ""
 "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
@@ -3571,7 +3851,7 @@ msgstr ""
 "    visa alla resultat från en kombinerad fråga (\\;) istället för bara\n"
 "    det sista\n"
 
-#: help.c:438
+#: help.c:455
 msgid ""
 "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
@@ -3579,7 +3859,7 @@ msgstr ""
 "  SHOW_CONTEXT\n"
 "    styr visning av meddelandekontextfält [never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid ""
 "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
@@ -3587,7 +3867,7 @@ msgstr ""
 "  SINGLELINE\n"
 "    om satt, slut på raden avslutar SQL-kommandon (samma som flaggan -S )\n"
 
-#: help.c:442
+#: help.c:459
 msgid ""
 "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
@@ -3595,7 +3875,7 @@ msgstr ""
 "  SINGLESTEP\n"
 "    stegningsläge (samma som flaggan -s)\n"
 
-#: help.c:444
+#: help.c:461
 msgid ""
 "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
@@ -3603,7 +3883,7 @@ msgstr ""
 "  SQLSTATE\n"
 "    SQLSTATE för sista frågan eller \"00000\" om det inte varit fel\n"
 
-#: help.c:446
+#: help.c:463
 msgid ""
 "  USER\n"
 "    the currently connected database user\n"
@@ -3611,7 +3891,7 @@ msgstr ""
 "  USER\n"
 "    den uppkopplade databasanvändaren\n"
 
-#: help.c:448
+#: help.c:465
 msgid ""
 "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
@@ -3619,7 +3899,7 @@ msgstr ""
 "  VERBOSITY\n"
 "    styr verbositet för felrapporter [default, verbose, terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid ""
 "  VERSION\n"
 "  VERSION_NAME\n"
@@ -3631,7 +3911,16 @@ msgstr ""
 "  VERSION_NUM\n"
 "    psql:s version (i lång sträng, kort sträng eller numeriskt format)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid ""
+"  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr ""
+"  WATCH_INTERVAL\n"
+"    antal sekunder som \\watch väntar mellan körningar (standard %s)\n"
+
+#: help.c:475
 msgid ""
 "\n"
 "Display settings:\n"
@@ -3639,7 +3928,7 @@ msgstr ""
 "\n"
 "Visningsinställningar:\n"
 
-#: help.c:457
+#: help.c:477
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n"
@@ -3649,7 +3938,7 @@ msgstr ""
 "  eller \\pset NAMN [VÄRDE] inne i psql\n"
 "\n"
 
-#: help.c:459
+#: help.c:479
 msgid ""
 "  border\n"
 "    border style (number)\n"
@@ -3657,7 +3946,7 @@ msgstr ""
 "  border\n"
 "    ramstil (nummer)\n"
 
-#: help.c:461
+#: help.c:481
 msgid ""
 "  columns\n"
 "    target width for the wrapped format\n"
@@ -3665,7 +3954,16 @@ msgstr ""
 "  columns\n"
 "    målvidd för wrappade format\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid ""
+"  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr ""
+"  csv_fieldsep\n"
+"    fältseparator för utdataformatet CSV (standard \"%c\")\n"
+
+#: help.c:486
 msgid ""
 "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
@@ -3673,7 +3971,7 @@ msgstr ""
 "  expanded (eller x)\n"
 "    expanderat utmatningsläge [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid ""
 "  fieldsep\n"
@@ -3682,7 +3980,7 @@ msgstr ""
 "  fieldsep\n"
 "    fältseparator för ej justerad utdata (standard \"%s\")\n"
 
-#: help.c:468
+#: help.c:491
 msgid ""
 "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
@@ -3690,7 +3988,7 @@ msgstr ""
 "  fieldsep_zero\n"
 "    sätt fältseparator för ej justerad utdata till noll-byte\n"
 
-#: help.c:470
+#: help.c:493
 msgid ""
 "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
@@ -3698,7 +3996,7 @@ msgstr ""
 "  footer\n"
 "    slå på/av visning av tabellfot [on, off]\n"
 
-#: help.c:472
+#: help.c:495
 msgid ""
 "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
@@ -3706,7 +4004,7 @@ msgstr ""
 "  format\n"
 "    sätt utdataformat [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid ""
 "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
@@ -3714,7 +4012,7 @@ msgstr ""
 "  linestyle\n"
 "    sätt ramlinjestil [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid ""
 "  null\n"
 "    set the string to be printed in place of a null value\n"
@@ -3722,7 +4020,7 @@ msgstr ""
 "  null\n"
 "    sätt sträng som visas istället för null-värden\n"
 
-#: help.c:478
+#: help.c:501
 msgid ""
 "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
@@ -3730,7 +4028,7 @@ msgstr ""
 "  numericlocale\n"
 "    slå på visning av lokalspecifika tecken för gruppering av siffror\n"
 
-#: help.c:480
+#: help.c:503
 msgid ""
 "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
@@ -3738,7 +4036,7 @@ msgstr ""
 "  pager\n"
 "    styr när en extern pagenerare används [yes, no, always]\n"
 
-#: help.c:482
+#: help.c:505
 msgid ""
 "  recordsep\n"
 "    record (line) separator for unaligned output\n"
@@ -3746,7 +4044,7 @@ msgstr ""
 "  recordsep\n"
 "    post (rad) separator för ej justerad utdata\n"
 
-#: help.c:484
+#: help.c:507
 msgid ""
 "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
@@ -3754,7 +4052,7 @@ msgstr ""
 "  recordsep_zero\n"
 "    sätt postseparator för ej justerad utdata till noll-byte\n"
 
-#: help.c:486
+#: help.c:509
 msgid ""
 "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
@@ -3764,7 +4062,7 @@ msgstr ""
 "    ange attribut för tabelltaggen i html-format eller proportionella\n"
 "    kolumnvidder för vänsterjusterade datatypet i latex-longtable-format\n"
 
-#: help.c:489
+#: help.c:512
 msgid ""
 "  title\n"
 "    set the table title for subsequently printed tables\n"
@@ -3772,7 +4070,7 @@ msgstr ""
 "  title\n"
 "    sätt tabelltitel för efterkommande tabellutskrifter\n"
 
-#: help.c:491
+#: help.c:514
 msgid ""
 "  tuples_only\n"
 "    if set, only actual table data is shown\n"
@@ -3780,7 +4078,7 @@ msgstr ""
 "  tuples_only\n"
 "    om satt, bara tabelldatan visas\n"
 
-#: help.c:493
+#: help.c:516
 msgid ""
 "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
@@ -3792,7 +4090,7 @@ msgstr ""
 "  unicode_header_linestyle\n"
 "    sätter stilen på Unicode-linjer [single, double]\n"
 
-#: help.c:497
+#: help.c:520
 msgid ""
 "  xheader_width\n"
 "    set the maximum width of the header for expanded output\n"
@@ -3802,7 +4100,7 @@ msgstr ""
 "    sätt maximal bredd på rubriken för expanderat utmatningsläge\n"
 "    [full, column, page, integer value]\n"
 
-#: help.c:501
+#: help.c:524
 msgid ""
 "\n"
 "Environment variables:\n"
@@ -3810,7 +4108,7 @@ msgstr ""
 "\n"
 "Omgivningsvariabler:\n"
 
-#: help.c:505
+#: help.c:528
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n"
@@ -3820,7 +4118,7 @@ msgstr ""
 "  eller \\setenv NAMN [VÄRDE] inne psql\n"
 "\n"
 
-#: help.c:507
+#: help.c:530
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
@@ -3832,7 +4130,7 @@ msgstr ""
 "  eller \\setenv NAMN [VÄRDE] inne i psql\n"
 "\n"
 
-#: help.c:510
+#: help.c:533
 msgid ""
 "  COLUMNS\n"
 "    number of columns for wrapped format\n"
@@ -3840,7 +4138,7 @@ msgstr ""
 "  COLUMNS\n"
 "    antal kolumner i wrappade format\n"
 
-#: help.c:512
+#: help.c:535
 msgid ""
 "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
@@ -3848,7 +4146,7 @@ msgstr ""
 "  PGAPPNAME\n"
 "    samma som anslutningsparametern \"application_name\"\n"
 
-#: help.c:514
+#: help.c:537
 msgid ""
 "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
@@ -3856,7 +4154,7 @@ msgstr ""
 "  PGDATABASE\n"
 "    samma som anslutningsparametern \"dbname\"\n"
 
-#: help.c:516
+#: help.c:539
 msgid ""
 "  PGHOST\n"
 "    same as the host connection parameter\n"
@@ -3864,7 +4162,7 @@ msgstr ""
 "  PGHOST\n"
 "    samma som anslutningsparametern \"host\"\n"
 
-#: help.c:518
+#: help.c:541
 msgid ""
 "  PGPASSFILE\n"
 "    password file name\n"
@@ -3872,7 +4170,7 @@ msgstr ""
 "  PGPASSFILE\n"
 "    lösenordsfilnamn\n"
 
-#: help.c:520
+#: help.c:543
 msgid ""
 "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
@@ -3880,7 +4178,7 @@ msgstr ""
 "  PGPASSWORD\n"
 "    uppkoppingens lösenord (rekommenderas inte)\n"
 
-#: help.c:522
+#: help.c:545
 msgid ""
 "  PGPORT\n"
 "    same as the port connection parameter\n"
@@ -3888,7 +4186,7 @@ msgstr ""
 "  PGPORT\n"
 "    samma som anslutingsparametern \"port\"\n"
 
-#: help.c:524
+#: help.c:547
 msgid ""
 "  PGUSER\n"
 "    same as the user connection parameter\n"
@@ -3896,7 +4194,7 @@ msgstr ""
 "  PGUSER\n"
 "    samma som anslutningsparametern \"user\"\n"
 
-#: help.c:526
+#: help.c:549
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
@@ -3904,7 +4202,7 @@ msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    redigerare som används av kommanona \\e, \\ef och \\ev\n"
 
-#: help.c:528
+#: help.c:551
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
@@ -3912,7 +4210,7 @@ msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    hur radnummer anges när redigerare startas\n"
 
-#: help.c:530
+#: help.c:553
 msgid ""
 "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
@@ -3920,7 +4218,7 @@ msgstr ""
 "  PSQL_HISTORY\n"
 "    alternativ plats för kommandohistorikfilen\n"
 
-#: help.c:532
+#: help.c:555
 msgid ""
 "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
@@ -3928,7 +4226,7 @@ msgstr ""
 "  PAGER\n"
 "    namnet på den externa pageneraren\n"
 
-#: help.c:535
+#: help.c:558
 msgid ""
 "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
@@ -3936,7 +4234,7 @@ msgstr ""
 "  PSQL_WATCH_PAGER\n"
 "    namn på externt paginerarprogram för \\watch\n"
 
-#: help.c:538
+#: help.c:561
 msgid ""
 "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
@@ -3944,7 +4242,7 @@ msgstr ""
 "  PSQLRC\n"
 "    alternativ plats för användarens \".psqlrc\"-fil\n"
 
-#: help.c:540
+#: help.c:563
 msgid ""
 "  SHELL\n"
 "    shell used by the \\! command\n"
@@ -3952,7 +4250,7 @@ msgstr ""
 "  SHELL\n"
 "    skalet som används av kommandot \\!\n"
 
-#: help.c:542
+#: help.c:565
 msgid ""
 "  TMPDIR\n"
 "    directory for temporary files\n"
@@ -3960,11 +4258,11 @@ msgstr ""
 "  TMPDIR\n"
 "    katalog för temporärfiler\n"
 
-#: help.c:602
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Tillgänglig hjälp:\n"
 
-#: help.c:697
+#: help.c:720
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -3983,7 +4281,7 @@ msgstr ""
 "URL: %s\n"
 "\n"
 
-#: help.c:720
+#: help.c:743
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -4089,12 +4387,12 @@ msgstr "fråga ignorerat; använd \\endif eller Ctrl-C för att avsluta aktuellt
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "kom till EOF utan att hitta avslutande \\endif"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "icketerminerad citerad sträng"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: slut på minne"
@@ -4102,2461 +4400,2481 @@ msgstr "%s: slut på minne"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:245
-#: sql_help.c:247 sql_help.c:248 sql_help.c:250 sql_help.c:252 sql_help.c:255
-#: sql_help.c:257 sql_help.c:259 sql_help.c:261 sql_help.c:276 sql_help.c:277
-#: sql_help.c:278 sql_help.c:280 sql_help.c:329 sql_help.c:331 sql_help.c:333
-#: sql_help.c:335 sql_help.c:404 sql_help.c:409 sql_help.c:411 sql_help.c:453
-#: sql_help.c:455 sql_help.c:458 sql_help.c:460 sql_help.c:529 sql_help.c:534
-#: sql_help.c:539 sql_help.c:544 sql_help.c:549 sql_help.c:603 sql_help.c:605
-#: sql_help.c:607 sql_help.c:609 sql_help.c:611 sql_help.c:614 sql_help.c:616
-#: sql_help.c:619 sql_help.c:630 sql_help.c:632 sql_help.c:676 sql_help.c:678
-#: sql_help.c:680 sql_help.c:683 sql_help.c:685 sql_help.c:687 sql_help.c:728
-#: sql_help.c:732 sql_help.c:736 sql_help.c:757 sql_help.c:760 sql_help.c:763
-#: sql_help.c:792 sql_help.c:804 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:833 sql_help.c:836 sql_help.c:865 sql_help.c:870 sql_help.c:875
-#: sql_help.c:880 sql_help.c:885 sql_help.c:912 sql_help.c:914 sql_help.c:916
-#: sql_help.c:918 sql_help.c:921 sql_help.c:923 sql_help.c:970 sql_help.c:1015
-#: sql_help.c:1020 sql_help.c:1025 sql_help.c:1030 sql_help.c:1035
-#: sql_help.c:1054 sql_help.c:1065 sql_help.c:1067 sql_help.c:1087
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1118 sql_help.c:1120 sql_help.c:1132
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1138 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1163 sql_help.c:1167 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1175 sql_help.c:1176 sql_help.c:1179
-#: sql_help.c:1182 sql_help.c:1184 sql_help.c:1324 sql_help.c:1326
-#: sql_help.c:1329 sql_help.c:1332 sql_help.c:1334 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1342 sql_help.c:1464 sql_help.c:1466
-#: sql_help.c:1468 sql_help.c:1471 sql_help.c:1492 sql_help.c:1495
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1505 sql_help.c:1507
-#: sql_help.c:1509 sql_help.c:1511 sql_help.c:1525 sql_help.c:1528
-#: sql_help.c:1530 sql_help.c:1532 sql_help.c:1542 sql_help.c:1544
-#: sql_help.c:1554 sql_help.c:1556 sql_help.c:1566 sql_help.c:1569
-#: sql_help.c:1592 sql_help.c:1594 sql_help.c:1596 sql_help.c:1598
-#: sql_help.c:1601 sql_help.c:1603 sql_help.c:1606 sql_help.c:1609
-#: sql_help.c:1660 sql_help.c:1703 sql_help.c:1706 sql_help.c:1708
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:1715 sql_help.c:1717
-#: sql_help.c:1720 sql_help.c:1770 sql_help.c:1786 sql_help.c:2019
-#: sql_help.c:2088 sql_help.c:2107 sql_help.c:2120 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2196 sql_help.c:2224 sql_help.c:2257
-#: sql_help.c:2275 sql_help.c:2303 sql_help.c:2414 sql_help.c:2460
-#: sql_help.c:2485 sql_help.c:2508 sql_help.c:2512 sql_help.c:2546
-#: sql_help.c:2566 sql_help.c:2588 sql_help.c:2602 sql_help.c:2623
-#: sql_help.c:2652 sql_help.c:2685 sql_help.c:2708 sql_help.c:2755
-#: sql_help.c:3053 sql_help.c:3066 sql_help.c:3083 sql_help.c:3099
-#: sql_help.c:3139 sql_help.c:3193 sql_help.c:3197 sql_help.c:3199
-#: sql_help.c:3206 sql_help.c:3225 sql_help.c:3252 sql_help.c:3287
-#: sql_help.c:3299 sql_help.c:3308 sql_help.c:3352 sql_help.c:3366
-#: sql_help.c:3394 sql_help.c:3402 sql_help.c:3414 sql_help.c:3424
-#: sql_help.c:3432 sql_help.c:3440 sql_help.c:3448 sql_help.c:3456
-#: sql_help.c:3465 sql_help.c:3476 sql_help.c:3484 sql_help.c:3492
-#: sql_help.c:3500 sql_help.c:3508 sql_help.c:3518 sql_help.c:3527
-#: sql_help.c:3536 sql_help.c:3544 sql_help.c:3554 sql_help.c:3565
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3593 sql_help.c:3602
-#: sql_help.c:3610 sql_help.c:3618 sql_help.c:3626 sql_help.c:3634
-#: sql_help.c:3642 sql_help.c:3650 sql_help.c:3658 sql_help.c:3666
-#: sql_help.c:3674 sql_help.c:3682 sql_help.c:3699 sql_help.c:3708
-#: sql_help.c:3716 sql_help.c:3733 sql_help.c:3748 sql_help.c:4061
-#: sql_help.c:4182 sql_help.c:4211 sql_help.c:4227 sql_help.c:4229
-#: sql_help.c:4733 sql_help.c:4781 sql_help.c:4940
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "namn"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:340 sql_help.c:1863
-#: sql_help.c:3367 sql_help.c:4500
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "aggregatsignatur"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:260
-#: sql_help.c:281 sql_help.c:412 sql_help.c:459 sql_help.c:538 sql_help.c:586
-#: sql_help.c:604 sql_help.c:631 sql_help.c:684 sql_help.c:759 sql_help.c:814
-#: sql_help.c:835 sql_help.c:874 sql_help.c:924 sql_help.c:971 sql_help.c:1024
-#: sql_help.c:1056 sql_help.c:1066 sql_help.c:1101 sql_help.c:1121
-#: sql_help.c:1135 sql_help.c:1185 sql_help.c:1333 sql_help.c:1465
-#: sql_help.c:1508 sql_help.c:1529 sql_help.c:1543 sql_help.c:1555
-#: sql_help.c:1568 sql_help.c:1595 sql_help.c:1661 sql_help.c:1714
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "nytt_namn"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:258
-#: sql_help.c:279 sql_help.c:410 sql_help.c:495 sql_help.c:543 sql_help.c:633
-#: sql_help.c:642 sql_help.c:707 sql_help.c:731 sql_help.c:762 sql_help.c:817
-#: sql_help.c:879 sql_help.c:922 sql_help.c:1029 sql_help.c:1068
-#: sql_help.c:1099 sql_help.c:1119 sql_help.c:1133 sql_help.c:1183
-#: sql_help.c:1399 sql_help.c:1467 sql_help.c:1510 sql_help.c:1531
-#: sql_help.c:1593 sql_help.c:1709 sql_help.c:3039
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "ny_ägare"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:262 sql_help.c:332
-#: sql_help.c:461 sql_help.c:548 sql_help.c:686 sql_help.c:735 sql_help.c:765
-#: sql_help.c:820 sql_help.c:884 sql_help.c:1034 sql_help.c:1103
-#: sql_help.c:1137 sql_help.c:1335 sql_help.c:1512 sql_help.c:1533
-#: sql_help.c:1545 sql_help.c:1557 sql_help.c:1597 sql_help.c:1716
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "nytt_schema"
 
-#: sql_help.c:44 sql_help.c:1927 sql_help.c:3368 sql_help.c:4529
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "där aggregatsignatur är:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:350 sql_help.c:363
-#: sql_help.c:367 sql_help.c:383 sql_help.c:386 sql_help.c:389 sql_help.c:530
-#: sql_help.c:535 sql_help.c:540 sql_help.c:545 sql_help.c:550 sql_help.c:866
-#: sql_help.c:871 sql_help.c:876 sql_help.c:881 sql_help.c:886 sql_help.c:1016
-#: sql_help.c:1021 sql_help.c:1026 sql_help.c:1031 sql_help.c:1036
-#: sql_help.c:1881 sql_help.c:1898 sql_help.c:1904 sql_help.c:1928
-#: sql_help.c:1931 sql_help.c:1934 sql_help.c:2089 sql_help.c:2108
-#: sql_help.c:2111 sql_help.c:2415 sql_help.c:2624 sql_help.c:3369
-#: sql_help.c:3372 sql_help.c:3375 sql_help.c:3466 sql_help.c:3555
-#: sql_help.c:3583 sql_help.c:3936 sql_help.c:4399 sql_help.c:4506
-#: sql_help.c:4513 sql_help.c:4519 sql_help.c:4530 sql_help.c:4533
-#: sql_help.c:4536
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "arg_läge"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:351 sql_help.c:364
-#: sql_help.c:368 sql_help.c:384 sql_help.c:387 sql_help.c:390 sql_help.c:531
-#: sql_help.c:536 sql_help.c:541 sql_help.c:546 sql_help.c:551 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:882 sql_help.c:887 sql_help.c:1017
-#: sql_help.c:1022 sql_help.c:1027 sql_help.c:1032 sql_help.c:1037
-#: sql_help.c:1882 sql_help.c:1899 sql_help.c:1905 sql_help.c:1929
-#: sql_help.c:1932 sql_help.c:1935 sql_help.c:2090 sql_help.c:2109
-#: sql_help.c:2112 sql_help.c:2416 sql_help.c:2625 sql_help.c:3370
-#: sql_help.c:3373 sql_help.c:3376 sql_help.c:3467 sql_help.c:3556
-#: sql_help.c:3584 sql_help.c:4507 sql_help.c:4514 sql_help.c:4520
-#: sql_help.c:4531 sql_help.c:4534 sql_help.c:4537
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "arg_namn"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:352 sql_help.c:365
-#: sql_help.c:369 sql_help.c:385 sql_help.c:388 sql_help.c:391 sql_help.c:532
-#: sql_help.c:537 sql_help.c:542 sql_help.c:547 sql_help.c:552 sql_help.c:868
-#: sql_help.c:873 sql_help.c:878 sql_help.c:883 sql_help.c:888 sql_help.c:1018
-#: sql_help.c:1023 sql_help.c:1028 sql_help.c:1033 sql_help.c:1038
-#: sql_help.c:1883 sql_help.c:1900 sql_help.c:1906 sql_help.c:1930
-#: sql_help.c:1933 sql_help.c:1936 sql_help.c:2417 sql_help.c:2626
-#: sql_help.c:3371 sql_help.c:3374 sql_help.c:3377 sql_help.c:3468
-#: sql_help.c:3557 sql_help.c:3585 sql_help.c:4508 sql_help.c:4515
-#: sql_help.c:4521 sql_help.c:4532 sql_help.c:4535 sql_help.c:4538
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "arg_typ"
 
-#: sql_help.c:114 sql_help.c:407 sql_help.c:484 sql_help.c:496 sql_help.c:965
-#: sql_help.c:1116 sql_help.c:1526 sql_help.c:1655 sql_help.c:1687
-#: sql_help.c:1739 sql_help.c:1798 sql_help.c:1987 sql_help.c:1994
-#: sql_help.c:2306 sql_help.c:2356 sql_help.c:2363 sql_help.c:2372
-#: sql_help.c:2461 sql_help.c:2686 sql_help.c:2777 sql_help.c:3068
-#: sql_help.c:3253 sql_help.c:3275 sql_help.c:3415 sql_help.c:3772
-#: sql_help.c:3980 sql_help.c:4226 sql_help.c:4228 sql_help.c:5006
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "flaggor"
 
-#: sql_help.c:115 sql_help.c:966 sql_help.c:1656 sql_help.c:2462
-#: sql_help.c:2687 sql_help.c:3254 sql_help.c:3416
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "där flaggor kan vara:"
 
-#: sql_help.c:116 sql_help.c:2238
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "tillåtansl"
 
-#: sql_help.c:117 sql_help.c:967 sql_help.c:1657 sql_help.c:2239
-#: sql_help.c:2463 sql_help.c:2688 sql_help.c:3255
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "anslutningstak"
 
-#: sql_help.c:118 sql_help.c:2240
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "ärmall"
 
-#: sql_help.c:124 sql_help.c:621 sql_help.c:689 sql_help.c:703 sql_help.c:1338
-#: sql_help.c:1392 sql_help.c:4232
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "nytt_tabellutrymme"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:558 sql_help.c:560
-#: sql_help.c:561 sql_help.c:891 sql_help.c:893 sql_help.c:894 sql_help.c:974
-#: sql_help.c:978 sql_help.c:981 sql_help.c:1043 sql_help.c:1045
-#: sql_help.c:1046 sql_help.c:1196 sql_help.c:1198 sql_help.c:1664
-#: sql_help.c:1668 sql_help.c:1671 sql_help.c:2427 sql_help.c:2630
-#: sql_help.c:3948 sql_help.c:4250 sql_help.c:4411 sql_help.c:4721
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "konfigurationsparameter"
 
-#: sql_help.c:128 sql_help.c:408 sql_help.c:479 sql_help.c:485 sql_help.c:497
-#: sql_help.c:559 sql_help.c:613 sql_help.c:695 sql_help.c:705 sql_help.c:892
-#: sql_help.c:920 sql_help.c:975 sql_help.c:1044 sql_help.c:1117
-#: sql_help.c:1162 sql_help.c:1166 sql_help.c:1170 sql_help.c:1173
-#: sql_help.c:1178 sql_help.c:1181 sql_help.c:1197 sql_help.c:1371
-#: sql_help.c:1394 sql_help.c:1442 sql_help.c:1450 sql_help.c:1470
-#: sql_help.c:1527 sql_help.c:1611 sql_help.c:1665 sql_help.c:1688
-#: sql_help.c:2307 sql_help.c:2357 sql_help.c:2364 sql_help.c:2373
-#: sql_help.c:2428 sql_help.c:2429 sql_help.c:2493 sql_help.c:2496
-#: sql_help.c:2530 sql_help.c:2631 sql_help.c:2632 sql_help.c:2655
-#: sql_help.c:2778 sql_help.c:2817 sql_help.c:2927 sql_help.c:2940
-#: sql_help.c:2954 sql_help.c:2995 sql_help.c:3003 sql_help.c:3025
-#: sql_help.c:3042 sql_help.c:3069 sql_help.c:3276 sql_help.c:3981
-#: sql_help.c:4722 sql_help.c:4723 sql_help.c:4724 sql_help.c:4725
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "värde"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "målroll"
 
-#: sql_help.c:203 sql_help.c:929 sql_help.c:2291 sql_help.c:2660
-#: sql_help.c:2733 sql_help.c:2738 sql_help.c:3911 sql_help.c:3920
-#: sql_help.c:3939 sql_help.c:3951 sql_help.c:4374 sql_help.c:4383
-#: sql_help.c:4402 sql_help.c:4414
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "schemanamn"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "förkortad_grant_eller_revoke"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "där förkortad_grant_eller_revok är en av:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:584 sql_help.c:620 sql_help.c:688 sql_help.c:838 sql_help.c:985
-#: sql_help.c:1337 sql_help.c:1675 sql_help.c:2466 sql_help.c:2467
-#: sql_help.c:2468 sql_help.c:2469 sql_help.c:2470 sql_help.c:2604
-#: sql_help.c:2691 sql_help.c:2692 sql_help.c:2693 sql_help.c:3258
-#: sql_help.c:3259 sql_help.c:3260 sql_help.c:3261 sql_help.c:3262
-#: sql_help.c:3960 sql_help.c:3964 sql_help.c:4423 sql_help.c:4427
-#: sql_help.c:4743
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "rollnamn"
 
-#: sql_help.c:246 sql_help.c:265 sql_help.c:472 sql_help.c:928 sql_help.c:1353
-#: sql_help.c:1355 sql_help.c:1359 sql_help.c:1409 sql_help.c:1421
-#: sql_help.c:1446 sql_help.c:1705 sql_help.c:2260 sql_help.c:2264
-#: sql_help.c:2376 sql_help.c:2381 sql_help.c:2489 sql_help.c:2659
-#: sql_help.c:2794 sql_help.c:2799 sql_help.c:2801 sql_help.c:2922
-#: sql_help.c:2935 sql_help.c:2949 sql_help.c:2958 sql_help.c:2970
-#: sql_help.c:2999 sql_help.c:4012 sql_help.c:4027 sql_help.c:4029
-#: sql_help.c:4125 sql_help.c:4128 sql_help.c:4130 sql_help.c:4593
-#: sql_help.c:4594 sql_help.c:4603 sql_help.c:4650 sql_help.c:4651
-#: sql_help.c:4652 sql_help.c:4653 sql_help.c:4654 sql_help.c:4655
-#: sql_help.c:4696 sql_help.c:4697 sql_help.c:4702 sql_help.c:4707
-#: sql_help.c:4851 sql_help.c:4852 sql_help.c:4861 sql_help.c:4908
-#: sql_help.c:4909 sql_help.c:4910 sql_help.c:4911 sql_help.c:4912
-#: sql_help.c:4913 sql_help.c:4968 sql_help.c:4970 sql_help.c:5036
-#: sql_help.c:5096 sql_help.c:5097 sql_help.c:5106 sql_help.c:5153
-#: sql_help.c:5154 sql_help.c:5155 sql_help.c:5156 sql_help.c:5157
-#: sql_help.c:5158
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "uttryck"
 
-#: sql_help.c:249 sql_help.c:2261
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "domain_villkor"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:256 sql_help.c:264 sql_help.c:487
-#: sql_help.c:488 sql_help.c:1330 sql_help.c:1379 sql_help.c:1380
-#: sql_help.c:1381 sql_help.c:1408 sql_help.c:1420 sql_help.c:1437
-#: sql_help.c:1869 sql_help.c:1871 sql_help.c:2263 sql_help.c:2375
-#: sql_help.c:2380 sql_help.c:2957 sql_help.c:2969 sql_help.c:4024
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "villkorsnamn"
 
-#: sql_help.c:254 sql_help.c:1331
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "nyy_villkorsnamn"
 
-#: sql_help.c:263 sql_help.c:2262
+#: sql_help.c:277 sql_help.c:2301
 msgid "where domain_constraint is:"
 msgstr "där domän_villkor är:"
 
-#: sql_help.c:330 sql_help.c:1115
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "ny_version"
 
-#: sql_help.c:334 sql_help.c:336
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "medlemsobjekt"
 
-#: sql_help.c:337
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "där medlemsobjekt är:"
 
-#: sql_help.c:338 sql_help.c:343 sql_help.c:344 sql_help.c:345 sql_help.c:346
-#: sql_help.c:347 sql_help.c:348 sql_help.c:353 sql_help.c:357 sql_help.c:359
-#: sql_help.c:361 sql_help.c:370 sql_help.c:371 sql_help.c:372 sql_help.c:373
-#: sql_help.c:374 sql_help.c:375 sql_help.c:376 sql_help.c:377 sql_help.c:380
-#: sql_help.c:381 sql_help.c:1861 sql_help.c:1866 sql_help.c:1873
-#: sql_help.c:1874 sql_help.c:1875 sql_help.c:1876 sql_help.c:1877
-#: sql_help.c:1878 sql_help.c:1879 sql_help.c:1884 sql_help.c:1886
-#: sql_help.c:1890 sql_help.c:1892 sql_help.c:1896 sql_help.c:1901
-#: sql_help.c:1902 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1912 sql_help.c:1913 sql_help.c:1914 sql_help.c:1915
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:1918 sql_help.c:1919
-#: sql_help.c:1924 sql_help.c:1925 sql_help.c:4496 sql_help.c:4501
-#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4510
-#: sql_help.c:4511 sql_help.c:4516 sql_help.c:4517 sql_help.c:4522
-#: sql_help.c:4523 sql_help.c:4524 sql_help.c:4525 sql_help.c:4526
-#: sql_help.c:4527
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "objektnamn"
 
-#: sql_help.c:339 sql_help.c:1862 sql_help.c:4499
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "aggregatnamn"
 
-#: sql_help.c:341 sql_help.c:1864 sql_help.c:2154 sql_help.c:2158
-#: sql_help.c:2160 sql_help.c:3385
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "källtyp"
 
-#: sql_help.c:342 sql_help.c:1865 sql_help.c:2155 sql_help.c:2159
-#: sql_help.c:2161 sql_help.c:3386
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "måltyp"
 
-#: sql_help.c:349 sql_help.c:802 sql_help.c:1880 sql_help.c:2156
-#: sql_help.c:2199 sql_help.c:2279 sql_help.c:2547 sql_help.c:2578
-#: sql_help.c:3145 sql_help.c:4398 sql_help.c:4505 sql_help.c:4622
-#: sql_help.c:4626 sql_help.c:4630 sql_help.c:4633 sql_help.c:4880
-#: sql_help.c:4884 sql_help.c:4888 sql_help.c:4891 sql_help.c:5125
-#: sql_help.c:5129 sql_help.c:5133 sql_help.c:5136
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "funktionsnamn"
 
-#: sql_help.c:354 sql_help.c:795 sql_help.c:1887 sql_help.c:2571
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "operatornamn"
 
-#: sql_help.c:355 sql_help.c:729 sql_help.c:733 sql_help.c:737 sql_help.c:1888
-#: sql_help.c:2548 sql_help.c:3509
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "vänster_typ"
 
-#: sql_help.c:356 sql_help.c:730 sql_help.c:734 sql_help.c:738 sql_help.c:1889
-#: sql_help.c:2549 sql_help.c:3510
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "höger_typ"
 
-#: sql_help.c:358 sql_help.c:360 sql_help.c:758 sql_help.c:761 sql_help.c:764
-#: sql_help.c:793 sql_help.c:805 sql_help.c:813 sql_help.c:816 sql_help.c:819
-#: sql_help.c:1426 sql_help.c:1891 sql_help.c:1893 sql_help.c:2568
-#: sql_help.c:2589 sql_help.c:2975 sql_help.c:3519 sql_help.c:3528
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "indexmetod"
 
-#: sql_help.c:362 sql_help.c:1897 sql_help.c:4512
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "procedurnamn"
 
-#: sql_help.c:366 sql_help.c:1903 sql_help.c:3935 sql_help.c:4518
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "rutinnamn"
 
-#: sql_help.c:378 sql_help.c:1398 sql_help.c:1920 sql_help.c:2423
-#: sql_help.c:2629 sql_help.c:2930 sql_help.c:3112 sql_help.c:3690
-#: sql_help.c:3957 sql_help.c:4420
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "typnamn"
 
-#: sql_help.c:379 sql_help.c:1921 sql_help.c:2422 sql_help.c:2628
-#: sql_help.c:3113 sql_help.c:3343 sql_help.c:3691 sql_help.c:3942
-#: sql_help.c:4405
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "språknamn"
 
-#: sql_help.c:382
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "och aggregatsignatur är:"
 
-#: sql_help.c:405 sql_help.c:2021 sql_help.c:2304
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "hanterarfunktion"
 
-#: sql_help.c:406 sql_help.c:2305
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "valideringsfunktion"
 
-#: sql_help.c:454 sql_help.c:533 sql_help.c:677 sql_help.c:869 sql_help.c:1019
-#: sql_help.c:1325 sql_help.c:1602
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "aktion"
 
-#: sql_help.c:456 sql_help.c:463 sql_help.c:467 sql_help.c:468 sql_help.c:471
-#: sql_help.c:473 sql_help.c:474 sql_help.c:475 sql_help.c:477 sql_help.c:480
-#: sql_help.c:482 sql_help.c:483 sql_help.c:681 sql_help.c:691 sql_help.c:693
-#: sql_help.c:696 sql_help.c:698 sql_help.c:699 sql_help.c:927 sql_help.c:1096
-#: sql_help.c:1327 sql_help.c:1345 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1354 sql_help.c:1356 sql_help.c:1357 sql_help.c:1358
-#: sql_help.c:1360 sql_help.c:1361 sql_help.c:1363 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1369 sql_help.c:1372 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1422 sql_help.c:1424 sql_help.c:1431
-#: sql_help.c:1440 sql_help.c:1445 sql_help.c:1452 sql_help.c:1453
-#: sql_help.c:1704 sql_help.c:1707 sql_help.c:1711 sql_help.c:1747
-#: sql_help.c:1868 sql_help.c:1984 sql_help.c:1990 sql_help.c:2004
-#: sql_help.c:2005 sql_help.c:2006 sql_help.c:2354 sql_help.c:2367
-#: sql_help.c:2420 sql_help.c:2488 sql_help.c:2494 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2763 sql_help.c:2798 sql_help.c:2800
-#: sql_help.c:2912 sql_help.c:2921 sql_help.c:2931 sql_help.c:2934
-#: sql_help.c:2944 sql_help.c:2948 sql_help.c:2971 sql_help.c:2973
-#: sql_help.c:2980 sql_help.c:2993 sql_help.c:2998 sql_help.c:3005
-#: sql_help.c:3006 sql_help.c:3022 sql_help.c:3148 sql_help.c:3288
-#: sql_help.c:3914 sql_help.c:3915 sql_help.c:4011 sql_help.c:4026
-#: sql_help.c:4028 sql_help.c:4030 sql_help.c:4124 sql_help.c:4127
-#: sql_help.c:4129 sql_help.c:4131 sql_help.c:4377 sql_help.c:4378
-#: sql_help.c:4498 sql_help.c:4659 sql_help.c:4666 sql_help.c:4668
-#: sql_help.c:4917 sql_help.c:4924 sql_help.c:4926 sql_help.c:4967
-#: sql_help.c:4969 sql_help.c:4971 sql_help.c:5024 sql_help.c:5162
-#: sql_help.c:5169 sql_help.c:5171
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "kolumnnamn"
 
-#: sql_help.c:457 sql_help.c:682 sql_help.c:1328 sql_help.c:1712
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "nytt_kolumnnamn"
 
-#: sql_help.c:462 sql_help.c:554 sql_help.c:690 sql_help.c:890 sql_help.c:1040
-#: sql_help.c:1344 sql_help.c:1612
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "där aktion är en av:"
 
-#: sql_help.c:464 sql_help.c:469 sql_help.c:1088 sql_help.c:1346
-#: sql_help.c:1351 sql_help.c:1614 sql_help.c:1618 sql_help.c:2258
-#: sql_help.c:2355 sql_help.c:2567 sql_help.c:2756 sql_help.c:2913
-#: sql_help.c:3195 sql_help.c:4183
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "datatyp"
 
-#: sql_help.c:465 sql_help.c:470 sql_help.c:1347 sql_help.c:1352
-#: sql_help.c:1447 sql_help.c:1615 sql_help.c:1619 sql_help.c:2259
-#: sql_help.c:2358 sql_help.c:2490 sql_help.c:2915 sql_help.c:2923
-#: sql_help.c:2936 sql_help.c:2950 sql_help.c:3000 sql_help.c:3196
-#: sql_help.c:3202 sql_help.c:4021
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "jämförelse"
 
-#: sql_help.c:466 sql_help.c:1348 sql_help.c:2359 sql_help.c:2368
-#: sql_help.c:2916 sql_help.c:2932 sql_help.c:2945
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "kolumnvillkor"
 
-#: sql_help.c:476 sql_help.c:618 sql_help.c:692 sql_help.c:1368 sql_help.c:5018
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "heltal"
 
-#: sql_help.c:478 sql_help.c:481 sql_help.c:694 sql_help.c:697 sql_help.c:1370
-#: sql_help.c:1373
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "attributalternativ"
 
-#: sql_help.c:486 sql_help.c:1377 sql_help.c:2360 sql_help.c:2369
-#: sql_help.c:2917 sql_help.c:2933 sql_help.c:2946
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "tabellvillkor"
 
-#: sql_help.c:489 sql_help.c:490 sql_help.c:491 sql_help.c:492 sql_help.c:1382
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:1922
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "triggernamn"
 
-#: sql_help.c:493 sql_help.c:494 sql_help.c:1396 sql_help.c:1397
-#: sql_help.c:2361 sql_help.c:2366 sql_help.c:2920 sql_help.c:2943
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "föräldertabell"
 
-#: sql_help.c:553 sql_help.c:610 sql_help.c:679 sql_help.c:889 sql_help.c:1039
-#: sql_help.c:1571 sql_help.c:2290
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "utökningsnamn"
 
-#: sql_help.c:555 sql_help.c:1041 sql_help.c:2424
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "körkostnad"
 
-#: sql_help.c:556 sql_help.c:1042 sql_help.c:2425
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "resultatrader"
 
-#: sql_help.c:557 sql_help.c:2426
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "supportfunktion"
 
-#: sql_help.c:579 sql_help.c:581 sql_help.c:964 sql_help.c:972 sql_help.c:976
-#: sql_help.c:979 sql_help.c:982 sql_help.c:1654 sql_help.c:1662
-#: sql_help.c:1666 sql_help.c:1669 sql_help.c:1672 sql_help.c:2734
-#: sql_help.c:2736 sql_help.c:2739 sql_help.c:2740 sql_help.c:3912
-#: sql_help.c:3913 sql_help.c:3917 sql_help.c:3918 sql_help.c:3921
-#: sql_help.c:3922 sql_help.c:3924 sql_help.c:3925 sql_help.c:3927
-#: sql_help.c:3928 sql_help.c:3930 sql_help.c:3931 sql_help.c:3933
-#: sql_help.c:3934 sql_help.c:3940 sql_help.c:3941 sql_help.c:3943
-#: sql_help.c:3944 sql_help.c:3946 sql_help.c:3947 sql_help.c:3949
-#: sql_help.c:3950 sql_help.c:3952 sql_help.c:3953 sql_help.c:3955
-#: sql_help.c:3956 sql_help.c:3958 sql_help.c:3959 sql_help.c:3961
-#: sql_help.c:3962 sql_help.c:4375 sql_help.c:4376 sql_help.c:4380
-#: sql_help.c:4381 sql_help.c:4384 sql_help.c:4385 sql_help.c:4387
-#: sql_help.c:4388 sql_help.c:4390 sql_help.c:4391 sql_help.c:4393
-#: sql_help.c:4394 sql_help.c:4396 sql_help.c:4397 sql_help.c:4403
-#: sql_help.c:4404 sql_help.c:4406 sql_help.c:4407 sql_help.c:4409
-#: sql_help.c:4410 sql_help.c:4412 sql_help.c:4413 sql_help.c:4415
-#: sql_help.c:4416 sql_help.c:4418 sql_help.c:4419 sql_help.c:4421
-#: sql_help.c:4422 sql_help.c:4424 sql_help.c:4425
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "rollspecifikation"
 
-#: sql_help.c:580 sql_help.c:582 sql_help.c:1685 sql_help.c:2225
-#: sql_help.c:2742 sql_help.c:3273 sql_help.c:3724 sql_help.c:4753
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "användarnamn"
 
-#: sql_help.c:583 sql_help.c:984 sql_help.c:1674 sql_help.c:2741
-#: sql_help.c:3963 sql_help.c:4426
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "där rollspecifikation kan vara:"
 
-#: sql_help.c:585
+#: sql_help.c:599
 msgid "group_name"
 msgstr "gruppnamn"
 
-#: sql_help.c:606 sql_help.c:1443 sql_help.c:2237 sql_help.c:2497
-#: sql_help.c:2531 sql_help.c:2928 sql_help.c:2941 sql_help.c:2955
-#: sql_help.c:2996 sql_help.c:3026 sql_help.c:3038 sql_help.c:3954
-#: sql_help.c:4417
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "tabellutrymmesnamn"
 
-#: sql_help.c:608 sql_help.c:701 sql_help.c:1390 sql_help.c:1400
-#: sql_help.c:1438 sql_help.c:1800
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "indexnamn"
 
-#: sql_help.c:612 sql_help.c:615 sql_help.c:704 sql_help.c:706 sql_help.c:1393
-#: sql_help.c:1395 sql_help.c:1441 sql_help.c:2495 sql_help.c:2529
-#: sql_help.c:2926 sql_help.c:2939 sql_help.c:2953 sql_help.c:2994
-#: sql_help.c:3024
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "lagringsparameter"
 
-#: sql_help.c:617
+#: sql_help.c:631
 msgid "column_number"
 msgstr "kolumnnummer"
 
-#: sql_help.c:641 sql_help.c:1885 sql_help.c:4509
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "stort_objekt_oid"
 
-#: sql_help.c:700 sql_help.c:1376 sql_help.c:2914
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "komprimeringsmetod"
 
-#: sql_help.c:702 sql_help.c:1391
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "ny_accessmetod"
 
-#: sql_help.c:739 sql_help.c:2552
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "res_proc"
 
-#: sql_help.c:740 sql_help.c:2553
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "join_proc"
 
-#: sql_help.c:741 sql_help.c:2550
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:742 sql_help.c:2551
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:794 sql_help.c:806 sql_help.c:2570
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "strateginummer"
 
-#: sql_help.c:796 sql_help.c:797 sql_help.c:800 sql_help.c:801 sql_help.c:807
-#: sql_help.c:808 sql_help.c:810 sql_help.c:811 sql_help.c:2572 sql_help.c:2573
-#: sql_help.c:2576 sql_help.c:2577
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "op_typ"
 
-#: sql_help.c:798 sql_help.c:2574
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "sorteringsfamiljnamn"
 
-#: sql_help.c:799 sql_help.c:809 sql_help.c:2575
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "supportnummer"
 
-#: sql_help.c:803 sql_help.c:2157 sql_help.c:2579 sql_help.c:3115
-#: sql_help.c:3117
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "argumenttyp"
 
-#: sql_help.c:834 sql_help.c:837 sql_help.c:926 sql_help.c:1055 sql_help.c:1095
-#: sql_help.c:1567 sql_help.c:1570 sql_help.c:1746 sql_help.c:1799
-#: sql_help.c:1870 sql_help.c:1895 sql_help.c:1908 sql_help.c:1923
-#: sql_help.c:1983 sql_help.c:1989 sql_help.c:2353 sql_help.c:2365
-#: sql_help.c:2486 sql_help.c:2526 sql_help.c:2603 sql_help.c:2657
-#: sql_help.c:2710 sql_help.c:2762 sql_help.c:2795 sql_help.c:2802
-#: sql_help.c:2911 sql_help.c:2929 sql_help.c:2942 sql_help.c:3021
-#: sql_help.c:3141 sql_help.c:3322 sql_help.c:3545 sql_help.c:3594
-#: sql_help.c:3700 sql_help.c:3910 sql_help.c:3916 sql_help.c:3977
-#: sql_help.c:4009 sql_help.c:4373 sql_help.c:4379 sql_help.c:4497
-#: sql_help.c:4610 sql_help.c:4673 sql_help.c:4712 sql_help.c:4868
-#: sql_help.c:4931 sql_help.c:4965 sql_help.c:5023 sql_help.c:5113
-#: sql_help.c:5176
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "tabellnamn"
 
-#: sql_help.c:839 sql_help.c:2605
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "using-uttryck"
 
-#: sql_help.c:840 sql_help.c:2606
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "check-uttryck"
 
-#: sql_help.c:913 sql_help.c:915 sql_help.c:917 sql_help.c:2653
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "publiceringsobject"
 
-#: sql_help.c:919 sql_help.c:2654
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "publiceringsslängobject"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "publiceringsparameter"
 
-#: sql_help.c:925 sql_help.c:2656
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "där publiceringsobjekt är en av:"
 
-#: sql_help.c:968 sql_help.c:1658 sql_help.c:2464 sql_help.c:2689
-#: sql_help.c:3256
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "tabell_och_kolumner"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "där publiceringsslängobjekt är en av:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "och tabell_och_kolumner är:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "lösenord"
 
-#: sql_help.c:969 sql_help.c:1659 sql_help.c:2465 sql_help.c:2690
-#: sql_help.c:3257
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "tidsstämpel"
 
-#: sql_help.c:973 sql_help.c:977 sql_help.c:980 sql_help.c:983 sql_help.c:1663
-#: sql_help.c:1667 sql_help.c:1670 sql_help.c:1673 sql_help.c:3923
-#: sql_help.c:4386
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "databasnamn"
 
-#: sql_help.c:1089 sql_help.c:2757
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "ökningsvärde"
 
-#: sql_help.c:1090 sql_help.c:2758
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "minvärde"
 
-#: sql_help.c:1091 sql_help.c:2759
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "maxvärde"
 
-#: sql_help.c:1092 sql_help.c:2760 sql_help.c:4606 sql_help.c:4710
-#: sql_help.c:4864 sql_help.c:5040 sql_help.c:5109
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "start"
 
-#: sql_help.c:1093 sql_help.c:1365
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "starta om"
 
-#: sql_help.c:1094 sql_help.c:2761
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:1139
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "nytt_mål"
 
-#: sql_help.c:1158 sql_help.c:2814
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "anslinfo"
 
-#: sql_help.c:1160 sql_help.c:1164 sql_help.c:1168 sql_help.c:2815
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "publiceringsnamn"
 
-#: sql_help.c:1161 sql_help.c:1165 sql_help.c:1169
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "publicerings_alternativ"
 
-#: sql_help.c:1172
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "refresh_alternativ"
 
-#: sql_help.c:1177 sql_help.c:2816
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "prenumerationsparameter"
 
-#: sql_help.c:1180
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "skip_alternativ"
 
-#: sql_help.c:1340 sql_help.c:1343
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "partitionsnamn"
 
-#: sql_help.c:1341 sql_help.c:2370 sql_help.c:2947
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "partitionsgränsspec"
 
-#: sql_help.c:1362 sql_help.c:1412 sql_help.c:2961
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "sekvensalternativ"
 
-#: sql_help.c:1364
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "sekvensalternativ"
 
-#: sql_help.c:1378
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "tabellvillkor_för_index"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "omskrivningsregelnamn"
 
-#: sql_help.c:1401 sql_help.c:2382 sql_help.c:2986
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "och partitionsgränsspec är:"
 
-#: sql_help.c:1402 sql_help.c:1403 sql_help.c:1404 sql_help.c:2383
-#: sql_help.c:2384 sql_help.c:2385 sql_help.c:2987 sql_help.c:2988
-#: sql_help.c:2989
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "partitionsgränsuttryck"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:2386 sql_help.c:2387
-#: sql_help.c:2990 sql_help.c:2991
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "numerisk_literal"
 
-#: sql_help.c:1407
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "och kolumnvillkor är:"
 
-#: sql_help.c:1410 sql_help.c:2377 sql_help.c:2418 sql_help.c:2627
-#: sql_help.c:2959
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "default_uttryck"
 
-#: sql_help.c:1411 sql_help.c:2378 sql_help.c:2960
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "generatoruttryck"
 
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1423 sql_help.c:1425
-#: sql_help.c:1429 sql_help.c:2962 sql_help.c:2963 sql_help.c:2972
-#: sql_help.c:2974 sql_help.c:2978
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "indexparametrar"
 
-#: sql_help.c:1415 sql_help.c:1432 sql_help.c:2964 sql_help.c:2981
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "reftabell"
 
-#: sql_help.c:1416 sql_help.c:1433 sql_help.c:2965 sql_help.c:2982
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "refkolumn"
 
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1434 sql_help.c:1435
-#: sql_help.c:2966 sql_help.c:2967 sql_help.c:2983 sql_help.c:2984
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "referentiell_aktion"
 
-#: sql_help.c:1419 sql_help.c:2379 sql_help.c:2968
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "och tabellvillkor är:"
 
-#: sql_help.c:1427 sql_help.c:2976
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "uteslutelement"
 
-#: sql_help.c:1428 sql_help.c:2977 sql_help.c:4604 sql_help.c:4708
-#: sql_help.c:4862 sql_help.c:5038 sql_help.c:5107
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "operator"
 
-#: sql_help.c:1430 sql_help.c:2498 sql_help.c:2979
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "predikat"
 
-#: sql_help.c:1436
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "och tabellvillkor_för_index är:"
 
-#: sql_help.c:1439 sql_help.c:2992
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "indexparametrar i UNIQUE-, PRIMARY KEY- och EXCLUDE-villkor är:"
 
-#: sql_help.c:1444 sql_help.c:2997
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "uteslutelement i ett EXCLUDE-villkort är:"
 
-#: sql_help.c:1448 sql_help.c:2491 sql_help.c:2924 sql_help.c:2937
-#: sql_help.c:2951 sql_help.c:3001 sql_help.c:4022
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "op-klass"
 
-#: sql_help.c:1449 sql_help.c:2492 sql_help.c:3002
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "opclass_parameter"
 
-#: sql_help.c:1451 sql_help.c:3004
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "referentiell_aktion i ett FOREIGN KEY/REFERENCES-villkor är:"
 
-#: sql_help.c:1469 sql_help.c:1472 sql_help.c:3041
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "tabellutrymmesalternativ"
 
-#: sql_help.c:1493 sql_help.c:1496 sql_help.c:1502 sql_help.c:1506
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "symboltyp"
 
-#: sql_help.c:1494 sql_help.c:1497
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "ordlistnamn"
 
-#: sql_help.c:1499 sql_help.c:1503
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "gammal_ordlista"
 
-#: sql_help.c:1500 sql_help.c:1504
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "ny_ordlista"
 
-#: sql_help.c:1599 sql_help.c:1613 sql_help.c:1616 sql_help.c:1617
-#: sql_help.c:3194
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "attributnamn"
 
-#: sql_help.c:1600
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "nytt_attributnamn"
 
-#: sql_help.c:1604 sql_help.c:1608
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "nytt_enumvärde"
 
-#: sql_help.c:1605
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "närliggande_enumvärde"
 
-#: sql_help.c:1607
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "existerande_enumvärde"
 
-#: sql_help.c:1610
+#: sql_help.c:1647
 msgid "property"
 msgstr "egenskap"
 
-#: sql_help.c:1686 sql_help.c:2362 sql_help.c:2371 sql_help.c:2773
-#: sql_help.c:3274 sql_help.c:3725 sql_help.c:3932 sql_help.c:3978
-#: sql_help.c:4395
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "servernamn"
 
-#: sql_help.c:1718 sql_help.c:1721 sql_help.c:3289
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "visningsalternativnamn"
 
-#: sql_help.c:1719 sql_help.c:3290
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "visningsalternativvärde"
 
-#: sql_help.c:1740 sql_help.c:5007
-msgid "table_and_columns"
-msgstr "tabell_och_kolumner"
-
-#: sql_help.c:1741 sql_help.c:1801 sql_help.c:1995 sql_help.c:3774
-#: sql_help.c:4230 sql_help.c:5008
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "där flaggor kan vara en av:"
 
-#: sql_help.c:1742 sql_help.c:1743 sql_help.c:1802 sql_help.c:1997
-#: sql_help.c:2001 sql_help.c:2183 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:3777 sql_help.c:3778 sql_help.c:3779 sql_help.c:3780
-#: sql_help.c:3781 sql_help.c:3782 sql_help.c:3783 sql_help.c:3784
-#: sql_help.c:4231 sql_help.c:4233 sql_help.c:5009 sql_help.c:5010
-#: sql_help.c:5011 sql_help.c:5012 sql_help.c:5013 sql_help.c:5014
-#: sql_help.c:5015 sql_help.c:5016 sql_help.c:5017 sql_help.c:5019
-#: sql_help.c:5020
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1744 sql_help.c:5021
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "storlek"
 
-#: sql_help.c:1745 sql_help.c:5022
-msgid "and table_and_columns is:"
-msgstr "och tabell_och_kolumner är:"
-
-#: sql_help.c:1761 sql_help.c:4769 sql_help.c:4771 sql_help.c:4795
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "transaktionsläge"
 
-#: sql_help.c:1762 sql_help.c:4772 sql_help.c:4796
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "där transaktionsläge är en av:"
 
-#: sql_help.c:1771 sql_help.c:4614 sql_help.c:4623 sql_help.c:4627
-#: sql_help.c:4631 sql_help.c:4634 sql_help.c:4872 sql_help.c:4881
-#: sql_help.c:4885 sql_help.c:4889 sql_help.c:4892 sql_help.c:5117
-#: sql_help.c:5126 sql_help.c:5130 sql_help.c:5134 sql_help.c:5137
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "argument"
 
-#: sql_help.c:1867
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "relationsnamn"
 
-#: sql_help.c:1872 sql_help.c:3926 sql_help.c:4389
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "domännamn"
 
-#: sql_help.c:1894
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "policynamn"
 
-#: sql_help.c:1907
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "regelnamn"
 
-#: sql_help.c:1926 sql_help.c:4528
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "sträng_literal"
 
-#: sql_help.c:1951 sql_help.c:4192 sql_help.c:4442
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "transaktions-id"
 
-#: sql_help.c:1985 sql_help.c:1992 sql_help.c:4048
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "filnamn"
 
-#: sql_help.c:1986 sql_help.c:1993 sql_help.c:2712 sql_help.c:2713
-#: sql_help.c:2714
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "kommando"
 
-#: sql_help.c:1988 sql_help.c:2711 sql_help.c:3144 sql_help.c:3325
-#: sql_help.c:4032 sql_help.c:4115 sql_help.c:4118 sql_help.c:4121
-#: sql_help.c:4597 sql_help.c:4599 sql_help.c:4701 sql_help.c:4703
-#: sql_help.c:4855 sql_help.c:4857 sql_help.c:4974 sql_help.c:5100
-#: sql_help.c:5102
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "villkor"
 
-#: sql_help.c:1991 sql_help.c:2532 sql_help.c:3027 sql_help.c:3291
-#: sql_help.c:3309 sql_help.c:4013
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "fråga"
 
-#: sql_help.c:1996
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "formatnamn"
 
-#: sql_help.c:1998
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "avdelartecken"
 
-#: sql_help.c:1999
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "null-sträng"
 
-#: sql_help.c:2000
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "standard-sträng"
 
-#: sql_help.c:2002
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "citattecken"
 
-#: sql_help.c:2003
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "escape-tecken"
 
-#: sql_help.c:2007
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "fel_aktion"
 
-#: sql_help.c:2008
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "maxfel"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "kodningsnamn"
 
-#: sql_help.c:2009
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "verbosity"
 
-#: sql_help.c:2020
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "accessmetodtyp"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2113
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "arg_datatyp"
 
-#: sql_help.c:2092 sql_help.c:2114 sql_help.c:2122
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "sfunc"
 
-#: sql_help.c:2093 sql_help.c:2115 sql_help.c:2123
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "tillståndsdatatyp"
 
-#: sql_help.c:2094 sql_help.c:2116 sql_help.c:2124
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "tillståndsdatastorlek"
 
-#: sql_help.c:2095 sql_help.c:2117 sql_help.c:2125
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "ffunc"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "kombinerafunk"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "serialiseringsfunk"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "deserialiseringsfunk"
 
-#: sql_help.c:2099 sql_help.c:2118 sql_help.c:2129
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "startvärde"
 
-#: sql_help.c:2100 sql_help.c:2130
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "msfunk"
 
-#: sql_help.c:2101 sql_help.c:2131
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "minvfunk"
 
-#: sql_help.c:2102 sql_help.c:2132
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "mtillståndsdatatyp"
 
-#: sql_help.c:2103 sql_help.c:2133
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "ntillståndsstorlek"
 
-#: sql_help.c:2104 sql_help.c:2134
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "mffunk"
 
-#: sql_help.c:2105 sql_help.c:2135
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "mstartvärde"
 
-#: sql_help.c:2106 sql_help.c:2136
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "sorteringsoperator"
 
-#: sql_help.c:2119
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "eller gamla syntaxen"
 
-#: sql_help.c:2121
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "bastyp"
 
-#: sql_help.c:2179 sql_help.c:2229
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "lokal"
 
-#: sql_help.c:2180 sql_help.c:2230
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:2181 sql_help.c:2231
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:2182 sql_help.c:4495
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "leverantör"
 
-#: sql_help.c:2184
+#: sql_help.c:2223
 msgid "rules"
 msgstr "regler"
 
-#: sql_help.c:2185 sql_help.c:2292
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "version"
 
-#: sql_help.c:2187
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "existerande_jämförelse"
 
-#: sql_help.c:2197
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "källkodning"
 
-#: sql_help.c:2198
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "målkodning"
 
-#: sql_help.c:2226 sql_help.c:3067
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "mall"
 
-#: sql_help.c:2227
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "kodning"
 
-#: sql_help.c:2228
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "strategi"
 
-#: sql_help.c:2232
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "inbyggd_lokal"
 
-#: sql_help.c:2233
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "icu_lokal"
 
-#: sql_help.c:2234
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "icu_regler"
 
-#: sql_help.c:2235
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "lokal_leverantör"
 
-#: sql_help.c:2236
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "jämförelse_version"
 
-#: sql_help.c:2241
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2276 sql_help.c:2709 sql_help.c:3140
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "händelse"
 
-#: sql_help.c:2277
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "filtervariabel"
 
-#: sql_help.c:2278
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "filtervärde"
 
-#: sql_help.c:2374 sql_help.c:2956
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "källtabell"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "like_alternativ"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "där kolumnvillkor är:"
 
-#: sql_help.c:2419
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "och likealternativ är:"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "rettyp"
 
-#: sql_help.c:2421
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "kolumntyp"
 
-#: sql_help.c:2430 sql_help.c:2633
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "definition"
 
-#: sql_help.c:2431 sql_help.c:2634
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "obj-fil"
 
-#: sql_help.c:2432 sql_help.c:2635
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "linksymbol"
 
-#: sql_help.c:2433 sql_help.c:2636
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "sql-kropp"
 
-#: sql_help.c:2471 sql_help.c:2694 sql_help.c:3263
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2487 sql_help.c:2528 sql_help.c:2925 sql_help.c:2938
-#: sql_help.c:2952 sql_help.c:3023
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "metod"
 
-#: sql_help.c:2509
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "anropshanterare"
 
-#: sql_help.c:2510
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "inline-hanterare"
 
-#: sql_help.c:2511
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "val-funktion"
 
-#: sql_help.c:2569
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "familjenamn"
 
-#: sql_help.c:2580
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "lagringstyp"
 
-#: sql_help.c:2715 sql_help.c:3147
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "där händelse kan vara en av:"
 
-#: sql_help.c:2735 sql_help.c:2737
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "schema-element"
 
-#: sql_help.c:2774
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "servertyp"
 
-#: sql_help.c:2775
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "serverversion"
 
-#: sql_help.c:2776 sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "fdw-namn"
 
-#: sql_help.c:2793 sql_help.c:2796
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "statistiknamn"
 
-#: sql_help.c:2797
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "statistiksort"
 
-#: sql_help.c:2813
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "prenumerationsnamn"
 
-#: sql_help.c:2918
-msgid "source_table"
-msgstr "källtabell"
-
-#: sql_help.c:2919
-msgid "like_option"
-msgstr "like_alternativ"
-
-#: sql_help.c:2985
-msgid "and like_option is:"
-msgstr "och likealternativ är:"
-
-#: sql_help.c:3040
+#: sql_help.c:3105
 msgid "directory"
 msgstr "katalog"
 
-#: sql_help.c:3054
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "parsernamn"
 
-#: sql_help.c:3055
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "källkonfig"
 
-#: sql_help.c:3084
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "startfunktion"
 
-#: sql_help.c:3085
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "gettoken_funktion"
 
-#: sql_help.c:3086
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "slutfunktion"
 
-#: sql_help.c:3087
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "symboltypfunktion"
 
-#: sql_help.c:3088
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "rubrikfunktion"
 
-#: sql_help.c:3100
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "init_funktion"
 
-#: sql_help.c:3101
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "symboluppdelningsfunktion"
 
-#: sql_help.c:3114
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "från_sql_funktionsnamn"
 
-#: sql_help.c:3116
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "till_sql_funktionsnamn"
 
-#: sql_help.c:3142
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "refererat_tabellnamn"
 
-#: sql_help.c:3143
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "övergångsrelationsnamn"
 
-#: sql_help.c:3146
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "argument"
 
-#: sql_help.c:3198
+#: sql_help.c:3263
 msgid "label"
 msgstr "etikett"
 
-#: sql_help.c:3200
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "subtyp"
 
-#: sql_help.c:3201
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "subtypoperatorklass"
 
-#: sql_help.c:3203
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "kanonisk_funktion"
 
-#: sql_help.c:3204
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "subtyp_diff_funktion"
 
-#: sql_help.c:3205
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "multirange_typnamn"
 
-#: sql_help.c:3207
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "inmatningsfunktion"
 
-#: sql_help.c:3208
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "utmatningsfunktion"
 
-#: sql_help.c:3209
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "mottagarfunktion"
 
-#: sql_help.c:3210
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "sändfunktion"
 
-#: sql_help.c:3211
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "typmodifiering_indatafunktion"
 
-#: sql_help.c:3212
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "typmodifiering_utdatafunktion"
 
-#: sql_help.c:3213
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "analysfunktion"
 
-#: sql_help.c:3214
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "arrayindexfunktion"
 
-#: sql_help.c:3215
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "internlängd"
 
-#: sql_help.c:3216
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "justering"
 
-#: sql_help.c:3217
+#: sql_help.c:3282
 msgid "storage"
 msgstr "lagring"
 
-#: sql_help.c:3218
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "liketyp"
 
-#: sql_help.c:3219
+#: sql_help.c:3284
 msgid "category"
 msgstr "kategori"
 
-#: sql_help.c:3220
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "föredragen"
 
-#: sql_help.c:3221
+#: sql_help.c:3286
 msgid "default"
 msgstr "standard"
 
-#: sql_help.c:3222
+#: sql_help.c:3287
 msgid "element"
 msgstr "element"
 
-#: sql_help.c:3223
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "avskiljare"
 
-#: sql_help.c:3224
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "sorterbar"
 
-#: sql_help.c:3321 sql_help.c:4008 sql_help.c:4102 sql_help.c:4592
-#: sql_help.c:4695 sql_help.c:4850 sql_help.c:4964 sql_help.c:5095
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "with_fråga"
 
-#: sql_help.c:3323 sql_help.c:4010 sql_help.c:4611 sql_help.c:4617
-#: sql_help.c:4620 sql_help.c:4624 sql_help.c:4628 sql_help.c:4636
-#: sql_help.c:4869 sql_help.c:4875 sql_help.c:4878 sql_help.c:4882
-#: sql_help.c:4886 sql_help.c:4894 sql_help.c:4966 sql_help.c:5114
-#: sql_help.c:5120 sql_help.c:5123 sql_help.c:5127 sql_help.c:5131
-#: sql_help.c:5139
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:3324 sql_help.c:4596 sql_help.c:4638 sql_help.c:4640
-#: sql_help.c:4644 sql_help.c:4646 sql_help.c:4647 sql_help.c:4648
-#: sql_help.c:4700 sql_help.c:4854 sql_help.c:4896 sql_help.c:4898
-#: sql_help.c:4902 sql_help.c:4904 sql_help.c:4905 sql_help.c:4906
-#: sql_help.c:4973 sql_help.c:5099 sql_help.c:5141 sql_help.c:5143
-#: sql_help.c:5147 sql_help.c:5149 sql_help.c:5150 sql_help.c:5151
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "frånval"
 
-#: sql_help.c:3326 sql_help.c:3810 sql_help.c:4159 sql_help.c:4975
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "markörnamn"
 
-#: sql_help.c:3327 sql_help.c:4016 sql_help.c:4108 sql_help.c:4976
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "utdataalias"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "utdatauttryck"
 
-#: sql_help.c:3328 sql_help.c:4017 sql_help.c:4109 sql_help.c:4595
-#: sql_help.c:4698 sql_help.c:4853 sql_help.c:4977 sql_help.c:5098
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "utdatanamn"
 
-#: sql_help.c:3344
+#: sql_help.c:3411
 msgid "code"
 msgstr "kod"
 
-#: sql_help.c:3749
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "parameter"
 
-#: sql_help.c:3773 sql_help.c:4184
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "sats"
 
-#: sql_help.c:3809 sql_help.c:4158
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "riktning"
 
-#: sql_help.c:3811 sql_help.c:4160
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "där riktning kan vara en av:"
 
-#: sql_help.c:3812 sql_help.c:3813 sql_help.c:3814 sql_help.c:3815
-#: sql_help.c:3816 sql_help.c:4161 sql_help.c:4162 sql_help.c:4163
-#: sql_help.c:4164 sql_help.c:4165 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4709 sql_help.c:4711 sql_help.c:4863 sql_help.c:4865
-#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5108 sql_help.c:5110
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "antal"
 
-#: sql_help.c:3919 sql_help.c:4382
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "sekvensnamn"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "arg_namn"
 
-#: sql_help.c:3938 sql_help.c:4401
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "arg_typ"
 
-#: sql_help.c:3945 sql_help.c:4408
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3976
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "externt_schema"
 
-#: sql_help.c:3979
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "lokalt_schema"
 
-#: sql_help.c:4014
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "konfliktmål"
 
-#: sql_help.c:4015
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "konfliktaktion"
 
-#: sql_help.c:4018
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "där konfliktmål kan vara en av:"
 
-#: sql_help.c:4019
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "indexkolumnnamn"
 
-#: sql_help.c:4020
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "indexuttryck"
 
-#: sql_help.c:4023
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "indexpredikat"
 
-#: sql_help.c:4025
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "och konfliktaktion är en av:"
 
-#: sql_help.c:4031 sql_help.c:4132 sql_help.c:4972
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "sub-SELECT"
 
-#: sql_help.c:4040 sql_help.c:4173 sql_help.c:4948
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "kanal"
 
-#: sql_help.c:4062
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "låsläge"
 
-#: sql_help.c:4063
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "där låsläge är en av:"
 
-#: sql_help.c:4103
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "måltabellnamn"
 
-#: sql_help.c:4104
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "målalias"
 
-#: sql_help.c:4105
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "datakälla"
 
-#: sql_help.c:4106 sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "join-villkor"
 
-#: sql_help.c:4107
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "when_sats"
 
-#: sql_help.c:4110
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "där datakälla är:"
 
-#: sql_help.c:4111
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "källtabellnamn"
 
-#: sql_help.c:4112
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "källfråga"
 
-#: sql_help.c:4113
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "källalias"
 
-#: sql_help.c:4114
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "och when_sats är:"
 
-#: sql_help.c:4116 sql_help.c:4119
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "merge_update"
 
-#: sql_help.c:4117 sql_help.c:4120
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4122
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4123
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "och merge_insert är:"
 
-#: sql_help.c:4126
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "och merge_update är:"
 
-#: sql_help.c:4133
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "och merge_delete är:"
 
-#: sql_help.c:4174
+#: sql_help.c:4245
 msgid "payload"
 msgstr "innehåll"
 
-#: sql_help.c:4201
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "gammal_roll"
 
-#: sql_help.c:4202
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "ny_roll"
 
-#: sql_help.c:4241 sql_help.c:4450 sql_help.c:4458
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "sparpunktnamn"
 
-#: sql_help.c:4598 sql_help.c:4656 sql_help.c:4856 sql_help.c:4914
-#: sql_help.c:5101 sql_help.c:5159
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "gruperingselement"
 
-#: sql_help.c:4600 sql_help.c:4704 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "fönsternamn"
 
-#: sql_help.c:4601 sql_help.c:4705 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "fönsterdefinition"
 
-#: sql_help.c:4602 sql_help.c:4616 sql_help.c:4660 sql_help.c:4706
-#: sql_help.c:4860 sql_help.c:4874 sql_help.c:4918 sql_help.c:5105
-#: sql_help.c:5119 sql_help.c:5163
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:4608 sql_help.c:4866 sql_help.c:5111
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "från_referens"
 
-#: sql_help.c:4609 sql_help.c:4867 sql_help.c:5112
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "där frånval kan vara en av:"
 
-#: sql_help.c:4612 sql_help.c:4618 sql_help.c:4621 sql_help.c:4625
-#: sql_help.c:4637 sql_help.c:4870 sql_help.c:4876 sql_help.c:4879
-#: sql_help.c:4883 sql_help.c:4895 sql_help.c:5115 sql_help.c:5121
-#: sql_help.c:5124 sql_help.c:5128 sql_help.c:5140
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "kolumnalias"
 
-#: sql_help.c:4613 sql_help.c:4871 sql_help.c:5116
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "samplingsmetod"
 
-#: sql_help.c:4615 sql_help.c:4873 sql_help.c:5118
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "frö"
 
-#: sql_help.c:4619 sql_help.c:4658 sql_help.c:4877 sql_help.c:4916
-#: sql_help.c:5122 sql_help.c:5161
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "with_frågenamn"
 
-#: sql_help.c:4629 sql_help.c:4632 sql_help.c:4635 sql_help.c:4887
-#: sql_help.c:4890 sql_help.c:4893 sql_help.c:5132 sql_help.c:5135
-#: sql_help.c:5138
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "kolumndefinition"
 
-#: sql_help.c:4639 sql_help.c:4645 sql_help.c:4897 sql_help.c:4903
-#: sql_help.c:5142 sql_help.c:5148
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "join-typ"
 
-#: sql_help.c:4642 sql_help.c:4900 sql_help.c:5145
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "join-kolumn"
 
-#: sql_help.c:4643 sql_help.c:4901 sql_help.c:5146
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "join_using_alias"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "och grupperingselement kan vara en av:"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "och with_fråga är:"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "värden"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4665 sql_help.c:4923 sql_help.c:5168
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "merge"
 
-#: sql_help.c:4667 sql_help.c:4925 sql_help.c:5170
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "söksekvens_kolumnnamn"
 
-#: sql_help.c:4669 sql_help.c:4927 sql_help.c:5172
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "cykelmarkering_kolumnnamn"
 
-#: sql_help.c:4670 sql_help.c:4928 sql_help.c:5173
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "cykelmarkering_värde"
 
-#: sql_help.c:4671 sql_help.c:4929 sql_help.c:5174
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "cykelmarkering_standard"
 
-#: sql_help.c:4672 sql_help.c:4930 sql_help.c:5175
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "cykelväg_kolumnnamn"
 
-#: sql_help.c:4699
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "ny_tabell"
 
-#: sql_help.c:4770
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "snapshot_id"
 
-#: sql_help.c:5037
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "sorteringsuttryck"
 
-#: sql_help.c:5182 sql_help.c:6166
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "avbryt aktuell transaktion"
 
-#: sql_help.c:5188
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "ändra definitionen av en aggregatfunktion"
 
-#: sql_help.c:5194
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "ändra definitionen av en jämförelse"
 
-#: sql_help.c:5200
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "ändra definitionen av en konvertering"
 
-#: sql_help.c:5206
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "ändra en databas"
 
-#: sql_help.c:5212
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "definiera standardaccessrättigheter"
 
-#: sql_help.c:5218
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "ändra definitionen av en domän"
 
-#: sql_help.c:5224
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "ändra definitionen av en händelsetrigger"
 
-#: sql_help.c:5230
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "ändra definitionen av en utökning"
 
-#: sql_help.c:5236
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "ändra definitionen av en främmande data-omvandlare"
 
-#: sql_help.c:5242
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "ändra definitionen av en främmande tabell"
 
-#: sql_help.c:5248
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "ändra definitionen av en funktion"
 
-#: sql_help.c:5254
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "ändra rollnamn eller medlemskap"
 
-#: sql_help.c:5260
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "ändra definitionen av ett index"
 
-#: sql_help.c:5266
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "ändra definitionen av ett procedur-språk"
 
-#: sql_help.c:5272
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "ändra definitionen av ett stort objekt"
 
-#: sql_help.c:5278
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "ändra definitionen av en materialiserad vy"
 
-#: sql_help.c:5284
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "ändra definitionen av en operator"
 
-#: sql_help.c:5290
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "ändra definitionen av en operatorklass"
 
-#: sql_help.c:5296
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "ändra definitionen av en operatorfamilj"
 
-#: sql_help.c:5302
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "ändra definitionen av en säkerhetspolicy på radnivå"
 
-#: sql_help.c:5308
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "ändra definitionen av en procedur"
 
-#: sql_help.c:5314
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "ändra definitionen av en publicering"
 
-#: sql_help.c:5320 sql_help.c:5422
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "ändra databasroll"
 
-#: sql_help.c:5326
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "ändra definitionen av en rutin"
 
-#: sql_help.c:5332
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "ändra definitionen av en regel"
 
-#: sql_help.c:5338
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "ändra definitionen av ett schema"
 
-#: sql_help.c:5344
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "ändra definitionen av en sekvensgenerator"
 
-#: sql_help.c:5350
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "ändra definitionen av en främmande server"
 
-#: sql_help.c:5356
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "ändra definitionen av ett utökat statistikobjekt"
 
-#: sql_help.c:5362
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "ändra definitionen av en prenumerering"
 
-#: sql_help.c:5368
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "ändra en servers konfigurationsparameter"
 
-#: sql_help.c:5374
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "ändra definitionen av en tabell"
 
-#: sql_help.c:5380
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "ändra definitionen av ett tabellutrymme"
 
-#: sql_help.c:5386
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "ändra definitionen av en textsökkonfiguration"
 
-#: sql_help.c:5392
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "ändra definitionen av en textsökordlista"
 
-#: sql_help.c:5398
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "ändra definitionen av en textsökparser"
 
-#: sql_help.c:5404
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "ändra definitionen av en textsökmall"
 
-#: sql_help.c:5410
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "ändra definitionen av en trigger"
 
-#: sql_help.c:5416
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "ändra definitionen av en typ"
 
-#: sql_help.c:5428
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "ändra definitionen av en användarmappning"
 
-#: sql_help.c:5434
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "ändra definitionen av en vy"
 
-#: sql_help.c:5440
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "samla in statistik om en databas"
 
-#: sql_help.c:5446 sql_help.c:6244
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "starta ett transaktionsblock"
 
-#: sql_help.c:5452
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "anropa en procedur"
 
-#: sql_help.c:5458
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "tvinga checkpoint i transaktionsloggen"
 
-#: sql_help.c:5464
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "stäng en markör"
 
-#: sql_help.c:5470
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "klustra en tabell efter ett index"
 
-#: sql_help.c:5476
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "definiera eller ändra en kommentar på ett objekt"
 
-#: sql_help.c:5482 sql_help.c:6040
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "utför den aktuella transaktionen"
 
-#: sql_help.c:5488
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "utför commit på en transaktion som tidigare förberetts för två-fas-commit"
 
-#: sql_help.c:5494
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "kopiera data mellan en fil och en tabell"
 
-#: sql_help.c:5500
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "definiera en ny accessmetod"
 
-#: sql_help.c:5506
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "definiera en ny aggregatfunktion"
 
-#: sql_help.c:5512
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "definiera en ny typomvandling"
 
-#: sql_help.c:5518
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "definiera en ny jämförelse"
 
-#: sql_help.c:5524
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "definiera en ny teckenkodningskonvertering"
 
-#: sql_help.c:5530
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "skapa en ny databas"
 
-#: sql_help.c:5536
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "definiera en ny domän"
 
-#: sql_help.c:5542
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "definiera en ny händelsetrigger"
 
-#: sql_help.c:5548
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "installera en utökning"
 
-#: sql_help.c:5554
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "definiera en ny främmande data-omvandlare"
 
-#: sql_help.c:5560
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "definiera en ny främmande tabell"
 
-#: sql_help.c:5566
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "definiera en ny funktion"
 
-#: sql_help.c:5572 sql_help.c:5632 sql_help.c:5734
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "definiera en ny databasroll"
 
-#: sql_help.c:5578
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "skapa ett nytt index"
 
-#: sql_help.c:5584
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "definiera ett nytt procedur-språk"
 
-#: sql_help.c:5590
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "definiera en ny materialiserad vy"
 
-#: sql_help.c:5596
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "definiera en ny operator"
 
-#: sql_help.c:5602
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "definiera en ny operatorklass"
 
-#: sql_help.c:5608
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "definiera en ny operatorfamilj"
 
-#: sql_help.c:5614
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "definiera en ny säkerhetspolicy på radnivå för en tabell"
 
-#: sql_help.c:5620
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "definiera ett ny procedur"
 
-#: sql_help.c:5626
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "definiera en ny publicering"
 
-#: sql_help.c:5638
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "definiera en ny omskrivningsregel"
 
-#: sql_help.c:5644
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "definiera ett nytt schema"
 
-#: sql_help.c:5650
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "definiera en ny sekvensgenerator"
 
-#: sql_help.c:5656
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "definiera en ny främmande server"
 
-#: sql_help.c:5662
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "definiera utökad statistik"
 
-#: sql_help.c:5668
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "definiera en ny prenumeration"
 
-#: sql_help.c:5674
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "definiera en ny tabell"
 
-#: sql_help.c:5680 sql_help.c:6202
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "definiera en ny tabell utifrån resultatet av en fråga"
 
-#: sql_help.c:5686
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "definiera ett nytt tabellutrymme"
 
-#: sql_help.c:5692
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "definiera en ny textsökkonfiguration"
 
-#: sql_help.c:5698
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "definiera en ny textsökordlista"
 
-#: sql_help.c:5704
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "definiera en ny textsökparser"
 
-#: sql_help.c:5710
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "definiera en ny textsökmall"
 
-#: sql_help.c:5716
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "definiera en ny transform"
 
-#: sql_help.c:5722
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "definiera en ny trigger"
 
-#: sql_help.c:5728
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "definiera en ny datatyp"
 
-#: sql_help.c:5740
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "definiera en ny mappning av en användare till en främmande server"
 
-#: sql_help.c:5746
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "definiera en ny vy"
 
-#: sql_help.c:5752
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "deallokera en förberedd sats"
 
-#: sql_help.c:5758
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "definiera en markör"
 
-#: sql_help.c:5764
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "radera rader i en tabell"
 
-#: sql_help.c:5770
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "släng sessionstillstånd"
 
-#: sql_help.c:5776
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "kör ett annonymt kodblock"
 
-#: sql_help.c:5782
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "ta bort en accessmetod"
 
-#: sql_help.c:5788
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "ta bort en aggregatfunktioner"
 
-#: sql_help.c:5794
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "ta bort en typomvandling"
 
-#: sql_help.c:5800
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "ta bort en jämförelse"
 
-#: sql_help.c:5806
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "ta bort en konvertering"
 
-#: sql_help.c:5812
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "ta bort en databas"
 
-#: sql_help.c:5818
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "ta bort en domän"
 
-#: sql_help.c:5824
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "ta bort en händelsetrigger"
 
-#: sql_help.c:5830
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "ta bort en utökning"
 
-#: sql_help.c:5836
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "ta bort en frammande data-omvandlare"
 
-#: sql_help.c:5842
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "ta bort en främmande tabell"
 
-#: sql_help.c:5848
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "ta bort en funktion"
 
-#: sql_help.c:5854 sql_help.c:5920 sql_help.c:6022
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "ta bort en databasroll"
 
-#: sql_help.c:5860
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "ta bort ett index"
 
-#: sql_help.c:5866
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "ta bort ett procedur-språk"
 
-#: sql_help.c:5872
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "ta bort en materialiserad vy"
 
-#: sql_help.c:5878
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "ta bort en operator"
 
-#: sql_help.c:5884
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "ta bort en operatorklass"
 
-#: sql_help.c:5890
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "ta bort en operatorfamilj"
 
-#: sql_help.c:5896
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "ta bort databasobjekt som ägs av databasroll"
 
-#: sql_help.c:5902
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "ta bort en säkerhetspolicy på radnivå från en tabell"
 
-#: sql_help.c:5908
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "ta bort en procedur"
 
-#: sql_help.c:5914
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "ta bort en publicering"
 
-#: sql_help.c:5926
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "ta bort en rutin"
 
-#: sql_help.c:5932
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "ta bort en omskrivningsregel"
 
-#: sql_help.c:5938
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "ta bort ett schema"
 
-#: sql_help.c:5944
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "ta bort en sekvens"
 
-#: sql_help.c:5950
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "ta bort en främmande server-deskriptor"
 
-#: sql_help.c:5956
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "ta bort utökad statistik"
 
-#: sql_help.c:5962
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "ta bort en prenumeration"
 
-#: sql_help.c:5968
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "ta bort en tabell"
 
-#: sql_help.c:5974
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "ta bort ett tabellutrymme"
 
-#: sql_help.c:5980
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "ta bort en textsökkonfiguration"
 
-#: sql_help.c:5986
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "ta bort en textsökordlista"
 
-#: sql_help.c:5992
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "ta bort en textsökparser"
 
-#: sql_help.c:5998
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "ta bort en textsökmall"
 
-#: sql_help.c:6004
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "ta bort en transform"
 
-#: sql_help.c:6010
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "ta bort en trigger"
 
-#: sql_help.c:6016
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "ta bort en datatyp"
 
-#: sql_help.c:6028
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "ta bort en användarmappning för en främmande server"
 
-#: sql_help.c:6034
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "ta bort en vy"
 
-#: sql_help.c:6046
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "utför en förberedd sats"
 
-#: sql_help.c:6052
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "visa körningsplanen för en sats"
 
-#: sql_help.c:6058
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "hämta rader från en fråga med hjälp av en markör"
 
-#: sql_help.c:6064
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "definera åtkomsträttigheter"
 
-#: sql_help.c:6070
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "importera tabelldefinitioner från en främmande server"
 
-#: sql_help.c:6076
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "skapa nya rader i en tabell"
 
-#: sql_help.c:6082
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "lyssna efter notifiering"
 
-#: sql_help.c:6088
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "ladda en delad biblioteksfil (shared library)"
 
-#: sql_help.c:6094
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "lås en tabell"
 
-#: sql_help.c:6100
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "villkorlig insert, updare eller delete av rader i en tabell"
 
-#: sql_help.c:6106
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "flytta en markör"
 
-#: sql_help.c:6112
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "generera en notifiering"
 
-#: sql_help.c:6118
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "förbered en sats för körning"
 
-#: sql_help.c:6124
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "avbryt aktuell transaktion för två-fas-commit"
 
-#: sql_help.c:6130
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "byt ägare på databasobjekt som ägs av en databasroll"
 
-#: sql_help.c:6136
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "ersätt innehållet av en materialiserad vy"
 
-#: sql_help.c:6142
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "återskapa index"
 
-#: sql_help.c:6148
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "frigör en tidigare definierad sparpunkt"
 
-#: sql_help.c:6154
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "återställ värde av körningsparameter till standardvärdet"
 
-#: sql_help.c:6160
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "ta bort åtkomsträttigheter"
 
-#: sql_help.c:6172
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "avbryt en transaktion som tidigare förberetts för två-fas-commit"
 
-#: sql_help.c:6178
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "rulla tillbaka till sparpunkt"
 
-#: sql_help.c:6184
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "definera en ny sparpunkt i den aktuella transaktionen"
 
-#: sql_help.c:6190
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "definiera eller ändra en säkerhetsetikett på ett objekt"
 
-#: sql_help.c:6196 sql_help.c:6250 sql_help.c:6286
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "hämta rader från en tabell eller vy"
 
-#: sql_help.c:6208
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "ändra en körningsparameter"
 
-#: sql_help.c:6214
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "sätt integritetsvillkorstiming för nuvarande transaktion"
 
-#: sql_help.c:6220
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "sätt användare för den aktiva sessionen"
 
-#: sql_help.c:6226
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr "sätt sessionsanvändaridentifierare och nuvarande användaridentifierare för den aktiva sessionen"
 
-#: sql_help.c:6232
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "sätt inställningar för nuvarande transaktionen"
 
-#: sql_help.c:6238
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "visa värde på en körningsparameter"
 
-#: sql_help.c:6256
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "töm en eller flera tabeller"
 
-#: sql_help.c:6262
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "sluta att lyssna efter notifiering"
 
-#: sql_help.c:6268
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "uppdatera rader i en tabell"
 
-#: sql_help.c:6274
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "skräpsamla och eventuellt analysera en databas"
 
-#: sql_help.c:6280
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "beräkna en mängd rader"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 kan bara användas i icke-interaktivt läge"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "kunde inte öppna loggfil \"%s\": %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -6565,27 +6883,27 @@ msgstr ""
 "Skriv \"help\" för hjälp.\n"
 "\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "kunde inte sätta utskriftsparameter \"%s\""
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "extra kommandoradsargument \"%s\" ignorerad"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "kunde inte hitta det egna programmets körbara fil"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6639
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -6596,22 +6914,47 @@ msgstr ""
 "Frågan var:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "okänt värde \"%s\" för \"%s\": förväntade sig en Boolean"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "ogiltigt värde \"%s\" för \"%s\": förväntade sig ett heltal"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "ogiltig indatassyntax för variabeln \"%s\""
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "ogiltigt värde \"%s\" för variabeln \"%s\": måste vara större än %.2f"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "ogiltigt värde \"%s\" för variabeln \"%s\": måste vara mindre än %.2f"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "värdet \"%s\" är utanför giltigt intervall för variabeln \"%s\""
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "ogiltigt värde \"%s\" för variabeln \"%s\""
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "ogiltigt variabelnamn: \"%s\""
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid ""
 "unrecognized value \"%s\" for \"%s\"\n"
diff --git a/src/bin/psql/po/uk.po b/src/bin/psql/po/uk.po
index bd64a745d18..4da22a8e08f 100644
--- a/src/bin/psql/po/uk.po
+++ b/src/bin/psql/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-23 10:48+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:18+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/psql.pot\n"
-"X-Crowdin-File-ID: 996\n"
+"X-Crowdin-File: /REL_18_STABLE/psql.pot\n"
+"X-Crowdin-File-ID: 1061\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -57,28 +57,28 @@ msgstr "неможливо знайти \"%s\" для виконання"
 msgid "could not resolve path \"%s\" to absolute form: %m"
 msgstr "не вдалося знайти абсолютний шлях \"%s\": %m"
 
-#: ../../common/exec.c:382 copy.c:326
+#: ../../common/exec.c:363 copy.c:326
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не вдалося виконати команду \"%s\": %m"
 
-#: ../../common/exec.c:394
+#: ../../common/exec.c:375
 #, c-format
 msgid "could not read from command \"%s\": %m"
 msgstr "не вдалося прочитати висновок команди \"%s\": %m"
 
-#: ../../common/exec.c:397
+#: ../../common/exec.c:378
 #, c-format
 msgid "no data was returned by command \"%s\""
 msgstr "команда \"%s\" не повернула жодних даних"
 
-#: ../../common/exec.c:424
+#: ../../common/exec.c:405
 #, c-format
 msgid "%s() failed: %m"
 msgstr "%s() помилка: %m"
 
-#: ../../common/exec.c:562 ../../common/exec.c:607 ../../common/exec.c:699
-#: command.c:1372 command.c:3458 command.c:3507 command.c:3632 input.c:225
+#: ../../common/exec.c:543 ../../common/exec.c:588 ../../common/exec.c:680
+#: command.c:1660 command.c:4078 command.c:4127 command.c:4252 input.c:225
 #: mainloop.c:80 mainloop.c:398
 #, c-format
 msgid "out of memory"
@@ -100,7 +100,7 @@ msgstr "неможливо дублювати нульовий покажчик
 msgid "could not look up effective user ID %ld: %s"
 msgstr "не можу знайти користувача з ефективним ID %ld: %s"
 
-#: ../../common/username.c:45 command.c:616
+#: ../../common/username.c:45 command.c:721
 msgid "user does not exist"
 msgstr "користувача не існує"
 
@@ -163,8 +163,8 @@ msgstr "Перервано\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Неможливо надрукувати вміст таблиці: кількість комірок %lld дорівнює або перевищує максимальне значення %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Неможливо надрукувати вміст таблиці: кількість клітинок %<PRIu64> дорівнює або перевищує максимум %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -173,358 +173,457 @@ msgstr "Неможливо додати заголовок до вмісту т
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "Неможливо додати комірку до вмісту таблиці: перевищено загальну кількість комірок %lld.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "Неможливо додати клітинку до вмісту таблиці: загальна кількість клітинок %<PRIu64> перевищена.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "невірний формат виводу (внутрішня помилка): %d"
 
-#: ../../fe_utils/psqlscan.l:732
+#: ../../fe_utils/psqlscan.l:723
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\""
 msgstr "пропуск рекурсивного розгортання змінної \"%s\""
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../port/user.c:43 ../../port/user.c:79
+#: command.c:254
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "не вдалося знайти локального користувача з ідентифікатором %d: %s"
+msgid "backslash commands are restricted; only \\unrestrict is allowed"
+msgstr "команди зі зворотною косою рискою обмежені; дозволена лише \\unrestrict"
 
-#: ../../port/user.c:48 ../../port/user.c:84
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локального користувача з ідентифікатором %d не існує"
-
-#: command.c:235
+#: command.c:262
 #, c-format
 msgid "invalid command \\%s"
 msgstr "Невірна команда \\%s"
 
-#: command.c:237
+#: command.c:264
 #, c-format
 msgid "Try \\? for help."
 msgstr "Спробуйте \\? для отримання довідки."
 
-#: command.c:255
+#: command.c:282
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored"
 msgstr "\\%s: зайвий аргумент \"%s\" проігноровано"
 
-#: command.c:307
+#: command.c:334
 #, c-format
 msgid "\\%s command ignored; use \\endif or Ctrl-C to exit current \\if block"
 msgstr "\\%s команду проігноровано; скористайтесь \\endif або Ctrl-C, щоб вийти з поточного блоку \\if"
 
-#: command.c:614
+#: command.c:573 command.c:768 command.c:1906 command.c:2074 command.c:2387
+#: command.c:2401 command.c:2433 command.c:2522 command.c:2635 command.c:2794
+#: command.c:2942 command.c:3202 command.c:3244 command.c:3284
+#, c-format
+msgid "\\%s: missing required argument"
+msgstr "\\%s: не вистачає обов'язкового аргументу"
+
+#: command.c:719
 #, c-format
 msgid "could not get home directory for user ID %ld: %s"
 msgstr "неможливо отримати домашню директорію для користувача ID %ld: %s"
 
-#: command.c:633
+#: command.c:738
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %m"
 msgstr "\\%s: неможливо змінити директорію на \"%s\": %m"
 
-#: command.c:657
+#: command.c:811
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "На даний момент ви від'єднанні від бази даних.\n"
 
-#: command.c:667
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
-msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" за аресою \"%s\" на порту \"%s\".\n"
+#: command.c:839
+msgid "Connection Information"
+msgstr "Інформація про підключення"
 
-#: command.c:670
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" через сокет в \"%s\" на порту \"%s\".\n"
+#: command.c:840 describe.c:4722
+msgid "Parameter"
+msgstr "Параметр"
 
-#: command.c:676
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
-msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" на хості \"%s\" (за аресою \"%s\") на порту \"%s\".\n"
+#: command.c:841 describe.c:4723
+msgid "Value"
+msgstr "Значення"
 
-#: command.c:679
-#, c-format
-msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" на хості \"%s\" на порту \"%s\".\n"
+#: command.c:844 describe.c:3874
+msgid "Database"
+msgstr "База даних"
+
+#: command.c:848
+msgid "Client User"
+msgstr "Користувач клієнта"
+
+#: command.c:857 command.c:872
+msgid "Host Address"
+msgstr "Адреса хоста"
+
+#: command.c:862
+msgid "Socket Directory"
+msgstr "Каталог сокетів"
+
+#: command.c:868
+msgid "Host"
+msgstr "Хост"
+
+#: command.c:878
+msgid "Server Port"
+msgstr "Порт сервера"
+
+#: command.c:882 describe.c:246 describe.c:3615 describe.c:3955
+msgid "Options"
+msgstr "Параметри"
+
+#: command.c:886
+msgid "Protocol Version"
+msgstr "Версія Протоколу"
+
+#: command.c:890
+msgid "Password Used"
+msgstr "Пароль використано"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "false"
+msgstr "хибно"
+
+#: command.c:891 command.c:895 command.c:903 command.c:936
+msgid "true"
+msgstr "істинно"
 
-#: command.c:1069 command.c:1170 command.c:2675
+#: command.c:894
+msgid "GSSAPI Authenticated"
+msgstr "Автентифіковано GSSAPI"
+
+#: command.c:898
+msgid "Backend PID"
+msgstr "PID бекенда"
+
+#: command.c:902
+msgid "SSL Connection"
+msgstr "SSL з'єднання"
+
+#: command.c:922
+msgid "SSL Library"
+msgstr "SSL бібліотека"
+
+#: command.c:923 command.c:926 command.c:929 command.c:932 command.c:944
+#: command.c:948 command.c:4516 command.c:4517
+msgid "unknown"
+msgstr "невідомо"
+
+#: command.c:925
+msgid "SSL Protocol"
+msgstr "SSL протокол"
+
+#: command.c:928
+msgid "SSL Key Bits"
+msgstr "Біти SSL ключа"
+
+#: command.c:931
+msgid "SSL Cipher"
+msgstr "SSL шифр"
+
+#: command.c:934
+msgid "SSL Compression"
+msgstr "SSL стиснення"
+
+#: command.c:938
+msgid "ALPN"
+msgstr "ALPN"
+
+#: command.c:939 command.c:4519
+msgid "none"
+msgstr "нічого"
+
+#: command.c:1356 command.c:1457 command.c:3277
 #, c-format
 msgid "no query buffer"
 msgstr "немає буферу запитів"
 
-#: command.c:1102 command.c:5771
+#: command.c:1389 command.c:6405
 #, c-format
 msgid "invalid line number: %s"
 msgstr "невірний номер рядка: %s"
 
-#: command.c:1248
+#: command.c:1535
 msgid "No changes"
 msgstr "Без змін"
 
-#: command.c:1333
+#: command.c:1620
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found"
 msgstr "%s: невірне ім'я кодування або не знайдено процедуру конверсії"
 
-#: command.c:1368 command.c:2157 command.c:3454 command.c:3652 command.c:5877
-#: common.c:221 common.c:270 common.c:440 common.c:1142 common.c:1160
-#: common.c:1228 common.c:1340 common.c:1378 common.c:1475 common.c:1541
-#: copy.c:486 copy.c:722 large_obj.c:157 large_obj.c:192 large_obj.c:254
-#: startup.c:304
+#: command.c:1656 command.c:2596 command.c:4074 command.c:4272 command.c:6511
+#: common.c:233 common.c:282 common.c:455 common.c:1178 common.c:1196
+#: common.c:1264 common.c:1376 common.c:1414 common.c:1705 common.c:1785
+#: copy.c:486 copy.c:731 large_obj.c:157 large_obj.c:192 large_obj.c:254
+#: startup.c:309
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1375
+#: command.c:1663
 msgid "There is no previous error."
 msgstr "Попередня помилка відсутня."
 
-#: command.c:1488
+#: command.c:1766 command.c:1973 command.c:1999 command.c:3380
+#, c-format
+msgid "\\%s not allowed in pipeline mode"
+msgstr "\\%s не дозволено в режимі конвеєра"
+
+#: command.c:1822
 #, c-format
 msgid "\\%s: missing right parenthesis"
 msgstr "\\%s: відсутня права дужка"
 
-#: command.c:1572 command.c:1691 command.c:1995 command.c:2009 command.c:2028
-#: command.c:2196 command.c:2437 command.c:2642 command.c:2682
+#: command.c:1948
 #, c-format
-msgid "\\%s: missing required argument"
-msgstr "\\%s: не вистачає обов'язкового аргументу"
+msgid "\\getresults: invalid number of requested results"
+msgstr "\\getresults: недійсна кількість запитуваних результатів"
 
-#: command.c:1822
+#: command.c:2205
 #, c-format
 msgid "\\elif: cannot occur after \\else"
 msgstr "\\elif: не може йти після \\else"
 
-#: command.c:1827
+#: command.c:2210
 #, c-format
 msgid "\\elif: no matching \\if"
 msgstr "\\elif: немає відповідного \\if"
 
-#: command.c:1891
+#: command.c:2274
 #, c-format
 msgid "\\else: cannot occur after \\else"
 msgstr "\\else: не може йти після \\else"
 
-#: command.c:1896
+#: command.c:2279
 #, c-format
 msgid "\\else: no matching \\if"
 msgstr "\\else: немає відповідного \\if"
 
-#: command.c:1936
+#: command.c:2319
 #, c-format
 msgid "\\endif: no matching \\if"
 msgstr "\\endif: немає відповідного \\if"
 
-#: command.c:2092
+#: command.c:2497
 msgid "Query buffer is empty."
 msgstr "Буфер запиту порожній."
 
-#: command.c:2135
+#: command.c:2574
 #, c-format
 msgid "Enter new password for user \"%s\": "
 msgstr "Введіть новий пароль користувача \"%s\": "
 
-#: command.c:2139
+#: command.c:2578
 msgid "Enter it again: "
 msgstr "Введіть знову: "
 
-#: command.c:2148
+#: command.c:2587
 #, c-format
 msgid "Passwords didn't match."
 msgstr "Паролі не співпадають."
 
-#: command.c:2231
+#: command.c:2670
 #, c-format
 msgid "\\%s: could not read value for variable"
 msgstr "\\%s: не вдалося прочитати значення змінної"
 
-#: command.c:2333
+#: command.c:2772
 msgid "Query buffer reset (cleared)."
 msgstr "Буфер запитів скинуто (очищено)."
 
-#: command.c:2355
+#: command.c:2823
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Історію записано до файлу \"%s\".\n"
 
-#: command.c:2442
+#: command.c:2853
+#, c-format
+msgid "\\sendpipeline must be used after \\bind or \\bind_named"
+msgstr "\\sendpipeline повинна використовуватися після \\bind або \\bind_named"
+
+#: command.c:2860
+#, c-format
+msgid "\\sendpipeline not allowed outside of pipeline mode"
+msgstr "\\sendpipeline не дозволена поза режимом конвеєра"
+
+#: command.c:2947
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\""
 msgstr "\\%s: змінна середовища не повинна містити \"=\""
 
-#: command.c:2490
+#: command.c:2995
 #, c-format
 msgid "function name is required"
 msgstr "необхідне ім'я функції"
 
-#: command.c:2492
+#: command.c:2997
 #, c-format
 msgid "view name is required"
 msgstr "необхідне ім'я подання"
 
-#: command.c:2614
+#: command.c:3176
 msgid "Timing is on."
 msgstr "Таймер увімкнено."
 
-#: command.c:2616
+#: command.c:3178
 msgid "Timing is off."
 msgstr "Таймер вимкнено."
 
-#: command.c:2702 command.c:2740 command.c:4163 command.c:4166 command.c:4169
-#: command.c:4175 command.c:4177 command.c:4203 command.c:4213 command.c:4225
-#: command.c:4239 command.c:4266 command.c:4324 common.c:77 copy.c:329
-#: copy.c:401 psqlscanslash.l:805 psqlscanslash.l:817 psqlscanslash.l:835
+#: command.c:3208
+#, c-format
+msgid "\\%s: not currently in restricted mode"
+msgstr "\\%s: наразі не в обмеженому режимі"
+
+#: command.c:3218
+#, c-format
+msgid "\\%s: wrong key"
+msgstr "\\%s: неправильний ключ"
+
+#: command.c:3304 command.c:3342 command.c:4792 command.c:4795 command.c:4798
+#: command.c:4804 command.c:4806 command.c:4832 command.c:4842 command.c:4854
+#: command.c:4868 command.c:4895 command.c:4953 common.c:77 copy.c:329
+#: copy.c:401 psqlscanslash.l:797 psqlscanslash.l:809 psqlscanslash.l:827
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: command.c:2729 copy.c:388
+#: command.c:3331 copy.c:388
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: command.c:2801 command.c:2867
+#: command.c:3412 command.c:3478
 #, c-format
 msgid "\\watch: interval value is specified more than once"
 msgstr "\\watch: інтервал зазначається неодноразово"
 
-#: command.c:2811 command.c:2877
+#: command.c:3422 command.c:3488
 #, c-format
 msgid "\\watch: incorrect interval value \"%s\""
 msgstr "\\watch: неправильне значення інтервалу \"%s\""
 
-#: command.c:2821
+#: command.c:3432
 #, c-format
 msgid "\\watch: iteration count is specified more than once"
 msgstr "\\watch: інтервал зазначається неодноразово"
 
-#: command.c:2831
+#: command.c:3442
 #, c-format
 msgid "\\watch: incorrect iteration count \"%s\""
 msgstr "\\watch: неправильна кількість ітерацій \"%s\""
 
-#: command.c:2841
+#: command.c:3452
 #, c-format
 msgid "\\watch: minimum row count specified more than once"
 msgstr "\\watch: мінімальна кількість рядків вказана більше одного разу"
 
-#: command.c:2851
+#: command.c:3462
 #, c-format
 msgid "\\watch: incorrect minimum row count \"%s\""
 msgstr "\\watch: неправильна мінімальна кількість рядків \"%s\""
 
-#: command.c:2858
+#: command.c:3469
 #, c-format
 msgid "\\watch: unrecognized parameter \"%s\""
 msgstr "\\watch: нерозпізнаний параметр \"%s\""
 
-#: command.c:3255 startup.c:243 startup.c:293
+#: command.c:3875 startup.c:248 startup.c:298
 msgid "Password: "
 msgstr "Пароль: "
 
-#: command.c:3260 startup.c:290
+#: command.c:3880 startup.c:295
 #, c-format
 msgid "Password for user %s: "
 msgstr "Пароль користувача %s:"
 
-#: command.c:3316
+#: command.c:3936
 #, c-format
 msgid "Do not give user, host, or port separately when using a connection string"
 msgstr "Не надайте користувачеві, хосту або порту окремо під час використання рядка підключення"
 
-#: command.c:3351
+#: command.c:3971
 #, c-format
 msgid "No database connection exists to re-use parameters from"
 msgstr "Не існує підключення до бази даних для повторного використання параметрів"
 
-#: command.c:3658
+#: command.c:4278
 #, c-format
 msgid "Previous connection kept"
 msgstr "Попереднє підключення триває"
 
-#: command.c:3664
+#: command.c:4284
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:3720
+#: command.c:4340
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"
 msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" за адресою \"%s\" на порту \"%s\".\n"
 
-#: command.c:3723
+#: command.c:4343
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "Ви тепер під'єднані до бази даних \"%s\" як користувач \"%s\" через сокет в \"%s\" на порту \"%s\".\n"
 
-#: command.c:3729
+#: command.c:4349
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"
 msgstr "Ви під'єднані до бази даних \"%s\" як користувач \"%s\" на хості \"%s\" (за адресою \"%s\") на порту \"%s\".\n"
 
-#: command.c:3732
+#: command.c:4352
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "Ви тепер під'єднані до бази даних \"%s\" як користувач \"%s\" на хості \"%s\" на порту \"%s\".\n"
 
-#: command.c:3737
+#: command.c:4357
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Ви тепер під'єднані до бази даних \"%s\" як користувач \"%s\".\n"
 
-#: command.c:3843
+#: command.c:4463
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, сервер %s)\n"
 
-#: command.c:3856
+#: command.c:4476
 #, c-format
 msgid "WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr "УВАГА: мажорна версія %s %s, мажорна версія сервера %s.\n"
 "         Деякі функції psql можуть не працювати.\n"
 
-#: command.c:3895
+#: command.c:4515
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, compression: %s, ALPN: %s)\n"
 msgstr "З'єднання SSL (протокол: %s, шифр: %s, компресія: %s, ALPN: %s)\n"
 
-#: command.c:3896 command.c:3897
-msgid "unknown"
-msgstr "невідомо"
-
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "off"
 msgstr "вимк"
 
-#: command.c:3898 help.c:42
+#: command.c:4518 help.c:39
 msgid "on"
 msgstr "увімк"
 
-#: command.c:3899
-msgid "none"
-msgstr "нічого"
-
-#: command.c:3913
+#: command.c:4533
 #, c-format
 msgid "GSSAPI-encrypted connection\n"
 msgstr "З'єднання зашифровано GSSAPI\n"
 
-#: command.c:3933
+#: command.c:4553
 #, 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"
@@ -533,187 +632,187 @@ msgstr "УВАГА: Кодова сторінка консолі (%u) відрі
 "         8-бітові символи можуть працювати неправильно. Детальніше у розділі \n"
 "         \"Нотатки для користувачів Windows\" у документації psql.\n"
 
-#: command.c:4038
+#: command.c:4667
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number"
 msgstr "змінна середовища PSQL_EDITOR_LINENUMBER_ARG має бути встановлена, щоб вказувати номер рядка"
 
-#: command.c:4068
+#: command.c:4697
 #, c-format
 msgid "could not start editor \"%s\""
 msgstr "неможливо запустити редактор \"%s\""
 
-#: command.c:4070
+#: command.c:4699
 #, c-format
 msgid "could not start /bin/sh"
 msgstr "неможливо запустити /bin/sh"
 
-#: command.c:4120
+#: command.c:4749
 #, c-format
 msgid "could not locate temporary directory: %s"
 msgstr "неможливо знайти тимчасову директорію: %s"
 
-#: command.c:4147
+#: command.c:4776
 #, c-format
 msgid "could not open temporary file \"%s\": %m"
 msgstr "неможливо відкрити тимчасовий файл \"%s\": %m"
 
-#: command.c:4483
+#: command.c:5112
 #, c-format
 msgid "\\pset: ambiguous abbreviation \"%s\" matches both \"%s\" and \"%s\""
 msgstr "\\pset: неоднозначна абревіатура \"%s\" відповідає обом \"%s\" і \"%s"
 
-#: command.c:4503
+#: command.c:5132
 #, c-format
 msgid "\\pset: allowed formats are aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 msgstr "\\pset: дозволені формати: aligned, asciidoc, csv, html, latex, latex-longtable, troff-ms, unaligned, wrapped"
 
-#: command.c:4522
+#: command.c:5151
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode"
 msgstr "\\pset: дозволені стилі ліній: ascii, old-ascii, unicode"
 
-#: command.c:4537
+#: command.c:5166
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double"
 msgstr "\\pset: дозволені стилі ліній рамок Unicode: single, double"
 
-#: command.c:4552
+#: command.c:5181
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double"
 msgstr "\\pset: дозволені стилі ліній стовпців для Unicode: single, double"
 
-#: command.c:4567
+#: command.c:5196
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double"
 msgstr "\\pset: дозволені стилі ліній заголовків для Unicode: single, double"
 
-#: command.c:4619
+#: command.c:5248
 #, c-format
 msgid "\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width"
 msgstr "\\pset: дозволені значення xheader_width є \"%s\" (за замовчуванням), \"%s\", \"%s\" або число, яке визначає точну ширину"
 
-#: command.c:4636
+#: command.c:5265
 #, c-format
 msgid "\\pset: csv_fieldsep must be a single one-byte character"
 msgstr "\\pset: csv_fieldsep повинен бути однобайтовим символом"
 
-#: command.c:4641
+#: command.c:5270
 #, c-format
 msgid "\\pset: csv_fieldsep cannot be a double quote, a newline, or a carriage return"
 msgstr "\\pset: csv_fieldsep не може бути подвійною лапкою, новим рядком або поверненням каретки"
 
-#: command.c:4779 command.c:4980
+#: command.c:5408 command.c:5609
 #, c-format
 msgid "\\pset: unknown option: %s"
 msgstr "\\pset: невідомий параметр: %s"
 
-#: command.c:4799
+#: command.c:5428
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Стиль рамки %d.\n"
 
-#: command.c:4805
+#: command.c:5434
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Цільова ширина не встановлена.\n"
 
-#: command.c:4807
+#: command.c:5436
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Цільова ширина %d.\n"
 
-#: command.c:4814
+#: command.c:5443
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Розширене відображення увімкнуто.\n"
 
-#: command.c:4816
+#: command.c:5445
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Розширене відображення використовується автоматично.\n"
 
-#: command.c:4818
+#: command.c:5447
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Розширене відображення вимкнуто.\n"
 
-#: command.c:4825 command.c:4827 command.c:4829
+#: command.c:5454 command.c:5456 command.c:5458
 #, c-format
 msgid "Expanded header width is \"%s\".\n"
 msgstr "Розширена ширина заголовка \"%s\".\n"
 
-#: command.c:4831
+#: command.c:5460
 #, c-format
 msgid "Expanded header width is %d.\n"
 msgstr "Розширена ширина заголовка %d.\n"
 
-#: command.c:4837
+#: command.c:5466
 #, c-format
 msgid "Field separator for CSV is \"%s\".\n"
 msgstr "Розділювач полів CSV: \"%s\".\n"
 
-#: command.c:4845 command.c:4853
+#: command.c:5474 command.c:5482
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Розділювач полів - нульовий байт.\n"
 
-#: command.c:4847
+#: command.c:5476
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Розділювач полів \"%s\".\n"
 
-#: command.c:4860
+#: command.c:5489
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Нинжній колонтитул увімкнуто за замовчуванням.\n"
 
-#: command.c:4862
+#: command.c:5491
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Нинжній колонтитул вимкнуто за замовчуванням.\n"
 
-#: command.c:4868
+#: command.c:5497
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Формат виводу %s.\n"
 
-#: command.c:4874
+#: command.c:5503
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Стиль лінії %s.\n"
 
-#: command.c:4881
+#: command.c:5510
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null відображається як \"%s\".\n"
 
-#: command.c:4889
+#: command.c:5518
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Локалізоване виведення чисел ввімкнено.\n"
 
-#: command.c:4891
+#: command.c:5520
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Локалізоване виведення чисел вимкнено.\n"
 
-#: command.c:4898
+#: command.c:5527
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Пейджер використовується для виведення довгого тексту.\n"
 
-#: command.c:4900
+#: command.c:5529
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Завжди використовується пейджер.\n"
 
-#: command.c:4902
+#: command.c:5531
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Пейджер не використовується.\n"
 
-#: command.c:4908
+#: command.c:5537
 #, 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"
@@ -722,97 +821,97 @@ msgstr[1] "Пейджер не буде використовуватися дл
 msgstr[2] "Пейджер не буде використовуватися для менш ніж %d рядків.\n"
 msgstr[3] "Пейджер не буде використовуватися для менш ніж %d рядка.\n"
 
-#: command.c:4918 command.c:4928
+#: command.c:5547 command.c:5557
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Розділювач записів - нульовий байт.\n"
 
-#: command.c:4920
+#: command.c:5549
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Розділювач записів: <newline>.\n"
 
-#: command.c:4922
+#: command.c:5551
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Розділювач записів: \"%s\".\n"
 
-#: command.c:4935
+#: command.c:5564
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Табличні атрибути \"%s\".\n"
 
-#: command.c:4938
+#: command.c:5567
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Атрибути таблиць не задані.\n"
 
-#: command.c:4945
+#: command.c:5574
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Заголовок: \"%s\".\n"
 
-#: command.c:4947
+#: command.c:5576
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Заголовок не встановлено.\n"
 
-#: command.c:4954
+#: command.c:5583
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Увімкнуто тільки кортежі.\n"
 
-#: command.c:4956
+#: command.c:5585
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Вимкнуто тільки кортежі.\n"
 
-#: command.c:4962
+#: command.c:5591
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Стиль ліній рамки для Unicode: \"%s\".\n"
 
-#: command.c:4968
+#: command.c:5597
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Стиль ліній стовпців для Unicode: \"%s\".\n"
 
-#: command.c:4974
+#: command.c:5603
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Стиль ліній заголовків для Unicode: \"%s\".\n"
 
-#: command.c:5223
+#: command.c:5852
 #, c-format
 msgid "\\!: failed"
 msgstr "\\!: помилка"
 
-#: command.c:5257
+#: command.c:5890
 #, c-format
 msgid "\\watch cannot be used with an empty query"
 msgstr "\\watch не може бути використано із пустим запитом"
 
-#: command.c:5289
+#: command.c:5922
 #, c-format
 msgid "could not set timer: %m"
 msgstr "не вдалося встановити таймер: %m"
 
-#: command.c:5358
+#: command.c:5991
 #, c-format
 msgid "%s\t%s (every %gs)\n"
 msgstr "%s\t%s (кожні %g сек)\n"
 
-#: command.c:5361
+#: command.c:5994
 #, c-format
 msgid "%s (every %gs)\n"
 msgstr "%s (кожні %g сек)\n"
 
-#: command.c:5424
+#: command.c:6058
 #, c-format
 msgid "could not wait for signals: %m"
 msgstr "не вдалося дочекатися сигналів: %m"
 
-#: command.c:5480 command.c:5487 common.c:632 common.c:639 common.c:1123
+#: command.c:6114 command.c:6121 common.c:667 common.c:674 common.c:1159
 #, c-format
 msgid "/******** QUERY *********/\n"
 "%s\n"
@@ -821,107 +920,107 @@ msgstr "/******** ЗАПИТ *********/\n"
 "%s\n"
 "/************************/\n\n"
 
-#: command.c:5666
+#: command.c:6300
 #, c-format
 msgid "\"%s.%s\" is not a view"
 msgstr "\"%s.%s\" не є поданням"
 
-#: command.c:5682
+#: command.c:6316
 #, c-format
 msgid "could not parse reloptions array"
 msgstr "неможливо розібрати масив reloptions"
 
-#: common.c:206
+#: common.c:218
 #, c-format
 msgid "cannot escape without active connection"
 msgstr "не можна вийти без активного з'єднання"
 
-#: common.c:247
+#: common.c:259
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\""
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\""
 
-#: common.c:351
+#: common.c:363
 #, c-format
 msgid "connection to server was lost"
 msgstr "з'єднання із сервером втрачено"
 
-#: common.c:355
+#: common.c:367
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "З'єднання із сервером втрачено. Спроба перевстановити:"
 
-#: common.c:360
+#: common.c:373
 #, c-format
 msgid "Failed.\n"
 msgstr "Помилка.\n"
 
-#: common.c:377
+#: common.c:390
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Вдало.\n"
 
-#: common.c:430 common.c:1061
+#: common.c:445 common.c:1097
 #, c-format
 msgid "unexpected PQresultStatus: %d"
 msgstr "неочікуваний PQresultStatus: %d"
 
-#: common.c:571
+#: common.c:606
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Час: %.3f мс\n"
 
-#: common.c:586
+#: common.c:621
 #, c-format
 msgid "Time: %.3f ms (%02d:%06.3f)\n"
 msgstr "Час: %.3f мс (%02d:%06.3f)\n"
 
-#: common.c:595
+#: common.c:630
 #, c-format
 msgid "Time: %.3f ms (%02d:%02d:%06.3f)\n"
 msgstr "Час: %.3f мс (%02d:%02d:%06.3f)\n"
 
-#: common.c:602
+#: common.c:637
 #, c-format
 msgid "Time: %.3f ms (%.0f d %02d:%02d:%06.3f)\n"
 msgstr "Час: %.3f мс (%.0f d %02d:%02d:%06.3f)\n"
 
-#: common.c:626 common.c:683 common.c:1094 describe.c:6192
+#: common.c:661 common.c:718 common.c:1130 describe.c:6371
 #, c-format
 msgid "You are currently not connected to a database."
 msgstr "На даний момент ви від'єднанні від бази даних."
 
-#: common.c:714
+#: common.c:749
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "Асинхронне сповіщення \"%s\" з навантаженням \"%s\" отримане від серверного процесу з PID %d.\n"
 
-#: common.c:717
+#: common.c:752
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Асинхронне сповіщення \"%s\" отримане від серверного процесу з PID %d.\n"
 
-#: common.c:748
+#: common.c:783
 #, c-format
 msgid "could not print result table: %m"
 msgstr "не вдалося надрукувати таблицю результатів: %m"
 
-#: common.c:768
+#: common.c:803
 #, c-format
 msgid "no rows returned for \\gset"
 msgstr "немає рядків повернутих для \\gset"
 
-#: common.c:773
+#: common.c:808
 #, c-format
 msgid "more than one row returned for \\gset"
 msgstr "більш, ніж один рядок повернуто для \\gset"
 
-#: common.c:791
+#: common.c:826
 #, c-format
 msgid "attempt to \\gset into specially treated variable \"%s\" ignored"
 msgstr "спробу виконати \\gset в спеціальну змінну \"%s\" проігноровано"
 
-#: common.c:1103
+#: common.c:1139
 #, c-format
 msgid "/**(Single step mode: verify command)******************************************/\n"
 "%s\n"
@@ -930,37 +1029,52 @@ msgstr "/**(Однокроковий режим: команда verify)*********
 "%s\n"
 "/**(натисніть клавішу Return, щоб продовжити, або введіть x і Return, щоб скасувати.)*******************/\n"
 
-#: common.c:1180
+#: common.c:1216
 #, c-format
 msgid "STATEMENT:  %s"
 msgstr "ІНСТРУКЦІЯ:  %s"
 
-#: common.c:1216
+#: common.c:1252
 #, c-format
 msgid "unexpected transaction status (%d)"
 msgstr "неочікуваний стан транзакції (%d)"
 
-#: common.c:1362 describe.c:2025
+#: common.c:1398 describe.c:2064
 msgid "Column"
 msgstr "Стовпець"
 
-#: common.c:1363 describe.c:169 describe.c:355 describe.c:373 describe.c:1043
-#: describe.c:1201 describe.c:1731 describe.c:1755 describe.c:2026
-#: describe.c:3956 describe.c:4167 describe.c:4404 describe.c:4564
-#: describe.c:5829
+#: common.c:1399 describe.c:176 describe.c:363 describe.c:381 describe.c:1082
+#: describe.c:1244 describe.c:1774 describe.c:1798 describe.c:2065
+#: describe.c:4058 describe.c:4322 describe.c:4569 describe.c:4729
+#: describe.c:6005
 msgid "Type"
 msgstr "Тип"
 
-#: common.c:1412
+#: common.c:1448
 #, c-format
 msgid "The command has no result, or the result has no columns.\n"
 msgstr "Команда не має результату або результат не має стовпців.\n"
 
-#: common.c:1504
+#: common.c:1670
+#, c-format
+msgid "No pending results to get"
+msgstr "Немає очікуваних результатів для отримання"
+
+#: common.c:1748
 #, c-format
 msgid "fetching results in chunked mode failed"
 msgstr "помилка отримання результатів у режимі частинами"
 
+#: common.c:1797
+#, c-format
+msgid "Pipeline aborted, command did not run"
+msgstr "Конвеєр перервано, команда не виконалася"
+
+#: common.c:1893
+#, c-format
+msgid "COPY in a pipeline is not supported, aborting connection"
+msgstr "COPY в конвеєрі не підтримується, перериваємо з'єднання"
+
 #: copy.c:98
 #, c-format
 msgid "\\copy: arguments required"
@@ -1011,11 +1125,11 @@ msgid "Enter data to be copied followed by a newline.\n"
 msgstr "Введіть дані для копювання, розділяючи переносом рядка.\n"
 "Завершіть введення за допомогою \"\\.\" або за допомогою сигналу EOF."
 
-#: copy.c:684
+#: copy.c:693
 msgid "aborted because of read failure"
 msgstr "перервано через помилку читання"
 
-#: copy.c:718
+#: copy.c:727
 msgid "trying to exit copy mode"
 msgstr "спроба вийти з режиму копіювання"
 
@@ -1064,763 +1178,776 @@ msgstr "\\crosstabview: неоднозначна назва стовпця: \"%s
 msgid "\\crosstabview: column name not found: \"%s\""
 msgstr "\\crosstabview: ім'я стовпця не знайдено: \"%s\""
 
-#: describe.c:87 describe.c:335 describe.c:626 describe.c:802 describe.c:1035
-#: describe.c:1190 describe.c:1264 describe.c:3945 describe.c:4154
-#: describe.c:4402 describe.c:4483 describe.c:4715 describe.c:4921
-#: describe.c:5165 describe.c:5406 describe.c:5475 describe.c:5486
-#: describe.c:5542 describe.c:5941 describe.c:6018
+#: describe.c:94 describe.c:343 describe.c:650 describe.c:827 describe.c:1074
+#: describe.c:1231 describe.c:1307 describe.c:4047 describe.c:4309
+#: describe.c:4567 describe.c:4648 describe.c:4880 describe.c:5092
+#: describe.c:5341 describe.c:5582 describe.c:5651 describe.c:5662
+#: describe.c:5718 describe.c:6117 describe.c:6197
 msgid "Schema"
 msgstr "Схема"
 
-#: describe.c:88 describe.c:166 describe.c:227 describe.c:336 describe.c:627
-#: describe.c:803 describe.c:924 describe.c:1036 describe.c:1265
-#: describe.c:3946 describe.c:4155 describe.c:4319 describe.c:4403
-#: describe.c:4484 describe.c:4645 describe.c:4716 describe.c:4922
-#: describe.c:5038 describe.c:5166 describe.c:5407 describe.c:5476
-#: describe.c:5487 describe.c:5543 describe.c:5740 describe.c:5810
-#: describe.c:6016 describe.c:6243 describe.c:6551
+#: describe.c:95 describe.c:173 describe.c:234 describe.c:344 describe.c:651
+#: describe.c:828 describe.c:959 describe.c:1075 describe.c:1308
+#: describe.c:4048 describe.c:4310 describe.c:4484 describe.c:4568
+#: describe.c:4649 describe.c:4810 describe.c:4881 describe.c:5093
+#: describe.c:5214 describe.c:5342 describe.c:5583 describe.c:5652
+#: describe.c:5663 describe.c:5719 describe.c:5916 describe.c:5986
+#: describe.c:6194 describe.c:6422 describe.c:6768
 msgid "Name"
 msgstr "Назва"
 
-#: describe.c:89 describe.c:348 describe.c:366
+#: describe.c:96 describe.c:356 describe.c:374
 msgid "Result data type"
 msgstr "Тип даних результату"
 
-#: describe.c:90 describe.c:349 describe.c:367
+#: describe.c:97 describe.c:357 describe.c:375
 msgid "Argument data types"
 msgstr "Типи даних аргументів"
 
-#: describe.c:98 describe.c:105 describe.c:177 describe.c:241 describe.c:415
-#: describe.c:658 describe.c:818 describe.c:972 describe.c:1267 describe.c:2046
-#: describe.c:3676 describe.c:4000 describe.c:4201 describe.c:4343
-#: describe.c:4416 describe.c:4493 describe.c:4658 describe.c:4834
-#: describe.c:4975 describe.c:5047 describe.c:5167 describe.c:5317
-#: describe.c:5358 describe.c:5423 describe.c:5479 describe.c:5488
-#: describe.c:5544 describe.c:5758 describe.c:5832 describe.c:5955
-#: describe.c:6019 describe.c:7078
+#: describe.c:105 describe.c:112 describe.c:184 describe.c:248 describe.c:433
+#: describe.c:682 describe.c:847 describe.c:1011 describe.c:1310
+#: describe.c:2085 describe.c:3774 describe.c:4106 describe.c:4363
+#: describe.c:4508 describe.c:4581 describe.c:4658 describe.c:4823
+#: describe.c:5005 describe.c:5151 describe.c:5223 describe.c:5343
+#: describe.c:5493 describe.c:5534 describe.c:5599 describe.c:5655
+#: describe.c:5664 describe.c:5720 describe.c:5934 describe.c:6008
+#: describe.c:6131 describe.c:6198 describe.c:7304
 msgid "Description"
 msgstr "Опис"
 
-#: describe.c:127
+#: describe.c:134
 msgid "List of aggregate functions"
 msgstr "Перелік агрегатних функцій"
 
-#: describe.c:152
+#: describe.c:159
 #, c-format
 msgid "The server (version %s) does not support access methods."
 msgstr "Сервер (версія %s) не підтримує методи доступу."
 
-#: describe.c:167
+#: describe.c:174
 msgid "Index"
 msgstr "Індекс"
 
-#: describe.c:168 describe.c:3964 describe.c:4180 describe.c:5942
+#: describe.c:175 describe.c:4066 describe.c:4335 describe.c:6118
 msgid "Table"
 msgstr "Таблиця"
 
-#: describe.c:176 describe.c:5742
+#: describe.c:183 describe.c:5918
 msgid "Handler"
 msgstr "Обробник"
 
-#: describe.c:199
+#: describe.c:206
 msgid "List of access methods"
 msgstr "Список методів доступу"
 
-#: describe.c:228 describe.c:401 describe.c:651 describe.c:925 describe.c:1189
-#: describe.c:3957 describe.c:4156 describe.c:4320 describe.c:4647
-#: describe.c:5039 describe.c:5741 describe.c:5811 describe.c:6244
-#: describe.c:6431 describe.c:6552 describe.c:6722 describe.c:6807
-#: describe.c:7066
+#: describe.c:235 describe.c:416 describe.c:675 describe.c:960 describe.c:1230
+#: describe.c:4059 describe.c:4311 describe.c:4485 describe.c:4812
+#: describe.c:5215 describe.c:5917 describe.c:5987 describe.c:6423
+#: describe.c:6644 describe.c:6769 describe.c:6939 describe.c:7024
+#: describe.c:7292
 msgid "Owner"
 msgstr "Власник"
 
-#: describe.c:229
+#: describe.c:236
 msgid "Location"
 msgstr "Розташування"
 
-#: describe.c:239 describe.c:3517 describe.c:3857
-msgid "Options"
-msgstr "Параметри"
-
-#: describe.c:240 describe.c:649 describe.c:970 describe.c:3999
+#: describe.c:247 describe.c:673 describe.c:1009 describe.c:4105
 msgid "Size"
 msgstr "Розмір"
 
-#: describe.c:263
+#: describe.c:270
 msgid "List of tablespaces"
 msgstr "Список табличних просторів"
 
-#: describe.c:308
+#: describe.c:316
 #, c-format
-msgid "\\df only takes [anptwS+] as options"
-msgstr "\\df приймає в якості параметрів тільки [anptwS+]"
+msgid "\\df only takes [%s] as options"
+msgstr "\\df приймає лише [%s] як параметри"
 
-#: describe.c:316
+#: describe.c:324
 #, c-format
 msgid "\\df does not take a \"%c\" option with server version %s"
 msgstr "\\df не приймає параметр \"%c\" із сервером версії %s"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:351 describe.c:369
+#: describe.c:359 describe.c:377
 msgid "agg"
 msgstr "агр."
 
-#: describe.c:352 describe.c:370
+#: describe.c:360 describe.c:378
 msgid "window"
 msgstr "вікно"
 
-#: describe.c:353
+#: describe.c:361
 msgid "proc"
 msgstr "проц"
 
-#: describe.c:354 describe.c:372
+#: describe.c:362 describe.c:380
 msgid "func"
 msgstr "функ"
 
-#: describe.c:371 describe.c:1397
+#: describe.c:379 describe.c:1440
 msgid "trigger"
 msgstr "тригер"
 
-#: describe.c:383
+#: describe.c:394
 msgid "immutable"
 msgstr "постійна"
 
-#: describe.c:384
+#: describe.c:395
 msgid "stable"
 msgstr "стабільна"
 
-#: describe.c:385
+#: describe.c:396
 msgid "volatile"
 msgstr "мінлива"
 
-#: describe.c:386
+#: describe.c:397
 msgid "Volatility"
 msgstr "Мінливість"
 
-#: describe.c:394
+#: describe.c:408
 msgid "restricted"
 msgstr "обмежений"
 
-#: describe.c:395
+#: describe.c:409
 msgid "safe"
 msgstr "безпечний"
 
-#: describe.c:396
+#: describe.c:410
 msgid "unsafe"
 msgstr "небезпечний"
 
-#: describe.c:397
+#: describe.c:411
 msgid "Parallel"
 msgstr "Паралельність"
 
-#: describe.c:402
+#: describe.c:417
 msgid "definer"
 msgstr "визначник"
 
-#: describe.c:403
+#: describe.c:418
 msgid "invoker"
 msgstr "викликач"
 
-#: describe.c:404
+#: describe.c:419
 msgid "Security"
 msgstr "Безпека"
 
-#: describe.c:409
+#: describe.c:420 describe.c:838 describe.c:1779 describe.c:1803
+#: describe.c:1932 describe.c:4652 describe.c:4993 describe.c:5002
+#: describe.c:5140 describe.c:5145 describe.c:6927 describe.c:7126
+msgid "yes"
+msgstr "так"
+
+#: describe.c:421 describe.c:839 describe.c:1780 describe.c:1804
+#: describe.c:1933 describe.c:4652 describe.c:4990 describe.c:5003
+#: describe.c:5140 describe.c:6928 describe.c:7127
+msgid "no"
+msgstr "ні"
+
+#: describe.c:422 describe.c:840 describe.c:5004 describe.c:7128
+msgid "Leakproof?"
+msgstr "Захищено від витоків?"
+
+#: describe.c:427
 msgid "Language"
 msgstr "Мова"
 
-#: describe.c:412 describe.c:648
+#: describe.c:430 describe.c:672
 msgid "Internal name"
 msgstr "Внутрішнє назва"
 
-#: describe.c:585
+#: describe.c:609
 msgid "List of functions"
 msgstr "Список функцій"
 
-#: describe.c:650
+#: describe.c:674
 msgid "Elements"
 msgstr "Елементи"
 
-#: describe.c:701
+#: describe.c:725
 msgid "List of data types"
 msgstr "Список типів даних"
 
-#: describe.c:804
+#: describe.c:829
 msgid "Left arg type"
 msgstr "Тип лівого аргумента"
 
-#: describe.c:805
+#: describe.c:830
 msgid "Right arg type"
 msgstr "Тип правого аргумента"
 
-#: describe.c:806
+#: describe.c:831
 msgid "Result type"
 msgstr "Результуючий тип"
 
-#: describe.c:811 describe.c:4653 describe.c:4817 describe.c:5316
-#: describe.c:6996 describe.c:7000
+#: describe.c:837 describe.c:4818 describe.c:4982 describe.c:5492
+#: describe.c:7222 describe.c:7226
 msgid "Function"
 msgstr "Функція"
 
-#: describe.c:891
+#: describe.c:924
 msgid "List of operators"
 msgstr "Список операторів"
 
-#: describe.c:926
+#: describe.c:961
 msgid "Encoding"
 msgstr "Кодування"
 
-#: describe.c:930 describe.c:934
+#: describe.c:969 describe.c:973
 msgid "Locale Provider"
 msgstr "Постачальник локалі"
 
-#: describe.c:938 describe.c:4936
+#: describe.c:977 describe.c:5112
 msgid "Collate"
 msgstr "Порядок сортування"
 
-#: describe.c:939 describe.c:4937
+#: describe.c:978 describe.c:5113
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:943 describe.c:947 describe.c:951 describe.c:4942 describe.c:4946
-#: describe.c:4950
+#: describe.c:982 describe.c:986 describe.c:990 describe.c:5118 describe.c:5122
+#: describe.c:5126
 msgid "Locale"
 msgstr "Локаль"
 
-#: describe.c:955 describe.c:959 describe.c:4955 describe.c:4959
+#: describe.c:994 describe.c:998 describe.c:5131 describe.c:5135
 msgid "ICU Rules"
 msgstr "Правила ICU"
 
-#: describe.c:971
+#: describe.c:1010
 msgid "Tablespace"
 msgstr "Табличний простір"
 
-#: describe.c:996
+#: describe.c:1035
 msgid "List of databases"
 msgstr "Список баз даних"
 
-#: describe.c:1037 describe.c:1192 describe.c:3947
+#: describe.c:1076 describe.c:1233 describe.c:4049
 msgid "table"
 msgstr "таблиця"
 
-#: describe.c:1038 describe.c:3948
+#: describe.c:1077 describe.c:4050
 msgid "view"
 msgstr "подання"
 
-#: describe.c:1039 describe.c:3949
+#: describe.c:1078 describe.c:4051
 msgid "materialized view"
 msgstr "матеріалізоване подання"
 
-#: describe.c:1040 describe.c:1194 describe.c:3951
+#: describe.c:1079 describe.c:1235 describe.c:4053
 msgid "sequence"
 msgstr "послідовність"
 
-#: describe.c:1041 describe.c:3953
+#: describe.c:1080 describe.c:4055
 msgid "foreign table"
 msgstr "зовнішня таблиця"
 
-#: describe.c:1042 describe.c:3954 describe.c:4165
+#: describe.c:1081 describe.c:4056 describe.c:4320
 msgid "partitioned table"
 msgstr "секційна таблиця"
 
-#: describe.c:1058
+#: describe.c:1097
 msgid "Column privileges"
 msgstr "Права для стовпців"
 
-#: describe.c:1089 describe.c:1123
+#: describe.c:1128 describe.c:1162
 msgid "Policies"
 msgstr "Політики"
 
-#: describe.c:1151 describe.c:4570 describe.c:6667
+#: describe.c:1190 describe.c:4735 describe.c:6884
 msgid "Access privileges"
 msgstr "Права доступу"
 
-#: describe.c:1196
+#: describe.c:1237
 msgid "function"
 msgstr "функція"
 
-#: describe.c:1198
+#: describe.c:1239
 msgid "type"
 msgstr "тип"
 
-#: describe.c:1200
+#: describe.c:1241
 msgid "schema"
 msgstr "схема"
 
-#: describe.c:1222
+#: describe.c:1243
+msgid "large object"
+msgstr "великий об'єкт"
+
+#: describe.c:1265
 msgid "Default access privileges"
 msgstr "Права доступу за замовчуванням"
 
-#: describe.c:1266
+#: describe.c:1309
 msgid "Object"
 msgstr "Об'єкт"
 
-#: describe.c:1280
+#: describe.c:1323
 msgid "table constraint"
 msgstr "обмеження таблиці"
 
-#: describe.c:1304
+#: describe.c:1347
 msgid "domain constraint"
 msgstr "обмеження домену"
 
-#: describe.c:1328
+#: describe.c:1371
 msgid "operator class"
 msgstr "клас операторів"
 
-#: describe.c:1352
+#: describe.c:1395
 msgid "operator family"
 msgstr "сімейство операторів"
 
-#: describe.c:1375
+#: describe.c:1418
 msgid "rule"
 msgstr "правило"
 
-#: describe.c:1420
+#: describe.c:1463
 msgid "Object descriptions"
 msgstr "Опис об'єкту"
 
-#: describe.c:1485 describe.c:4072
+#: describe.c:1528
 #, c-format
 msgid "Did not find any relation named \"%s\"."
 msgstr "Не знайдено жодного відношення під назвою \"%s\"."
 
-#: describe.c:1488 describe.c:4075
+#: describe.c:1531 describe.c:4207
 #, c-format
 msgid "Did not find any relations."
 msgstr "Не знайдено жодного відношення."
 
-#: describe.c:1684
+#: describe.c:1727
 #, c-format
 msgid "Did not find any relation with OID %s."
 msgstr "Не знайдено жодного відношення з OID %s."
 
-#: describe.c:1732 describe.c:1756
+#: describe.c:1775 describe.c:1799
 msgid "Start"
 msgstr "Початок"
 
-#: describe.c:1733 describe.c:1757
+#: describe.c:1776 describe.c:1800
 msgid "Minimum"
 msgstr "Мінімум"
 
-#: describe.c:1734 describe.c:1758
+#: describe.c:1777 describe.c:1801
 msgid "Maximum"
 msgstr "Максимум"
 
-#: describe.c:1735 describe.c:1759
+#: describe.c:1778 describe.c:1802
 msgid "Increment"
 msgstr "Приріст"
 
-#: describe.c:1736 describe.c:1760 describe.c:1889 describe.c:4487
-#: describe.c:4828 describe.c:4964 describe.c:4969 describe.c:6710
-msgid "yes"
-msgstr "так"
-
-#: describe.c:1737 describe.c:1761 describe.c:1890 describe.c:4487
-#: describe.c:4825 describe.c:4964 describe.c:6711
-msgid "no"
-msgstr "ні"
-
-#: describe.c:1738 describe.c:1762
+#: describe.c:1781 describe.c:1805
 msgid "Cycles?"
 msgstr "Цикли?"
 
-#: describe.c:1739 describe.c:1763
+#: describe.c:1782 describe.c:1806
 msgid "Cache"
 msgstr "Кеш"
 
-#: describe.c:1804
+#: describe.c:1847
 #, c-format
 msgid "Owned by: %s"
 msgstr "Власник: %s"
 
-#: describe.c:1808
+#: describe.c:1851
 #, c-format
 msgid "Sequence for identity column: %s"
 msgstr "Послідовність для стовпця identity: %s"
 
-#: describe.c:1816
+#: describe.c:1859
 #, c-format
 msgid "Unlogged sequence \"%s.%s\""
 msgstr "Послідовність без журналювання \"%s.%s\""
 
-#: describe.c:1819
+#: describe.c:1862
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Послідовність \"%s.%s\""
 
-#: describe.c:1962
+#: describe.c:2005
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Таблиця без журналювання \"%s.%s\""
 
-#: describe.c:1965
+#: describe.c:2008
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Таблиця \"%s.%s\""
 
-#: describe.c:1969
+#: describe.c:2012
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Подання \"%s.%s\""
 
-#: describe.c:1974
-#, c-format
-msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Матеріалізоване подання без журналювання \"%s.%s\""
-
-#: describe.c:1977
+#: describe.c:2016
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Матеріалізоване подання \"%s.%s\""
 
-#: describe.c:1982
+#: describe.c:2021
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Індекс без журналювання \"%s.%s\""
 
-#: describe.c:1985
+#: describe.c:2024
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Індекс \"%s.%s\""
 
-#: describe.c:1990
+#: describe.c:2029
 #, c-format
 msgid "Unlogged partitioned index \"%s.%s\""
 msgstr "Секційний індекс без журналювання \"%s.%s\""
 
-#: describe.c:1993
+#: describe.c:2032
 #, c-format
 msgid "Partitioned index \"%s.%s\""
 msgstr "Секційний індекс \"%s.%s\""
 
-#: describe.c:1997
+#: describe.c:2036
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Таблиця TOAST \"%s.%s\""
 
-#: describe.c:2001
+#: describe.c:2040
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Композитний тип \"%s.%s\""
 
-#: describe.c:2005
+#: describe.c:2044
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Зовнішня таблиця \"%s.%s\""
 
-#: describe.c:2010
+#: describe.c:2049
 #, c-format
 msgid "Unlogged partitioned table \"%s.%s\""
 msgstr "Секційна таблиця без журналювання \"%s.%s\""
 
-#: describe.c:2013
+#: describe.c:2052
 #, c-format
 msgid "Partitioned table \"%s.%s\""
 msgstr "Секційна таблиця \"%s.%s\""
 
-#: describe.c:2029 describe.c:4405
+#: describe.c:2068 describe.c:4570
 msgid "Collation"
 msgstr "Сортування"
 
-#: describe.c:2030 describe.c:4406
+#: describe.c:2069 describe.c:4571
 msgid "Nullable"
 msgstr "Обнуляється"
 
-#: describe.c:2031 describe.c:4407
+#: describe.c:2070 describe.c:4572
 msgid "Default"
 msgstr "За замовчуванням"
 
-#: describe.c:2034
+#: describe.c:2073
 msgid "Key?"
 msgstr "Ключ?"
 
-#: describe.c:2036 describe.c:4723 describe.c:4734
+#: describe.c:2075 describe.c:4888 describe.c:4899
 msgid "Definition"
 msgstr "Визначення"
 
-#: describe.c:2038 describe.c:5757 describe.c:5831 describe.c:5896
-#: describe.c:5954
+#: describe.c:2077 describe.c:5933 describe.c:6007 describe.c:6072
+#: describe.c:6130
 msgid "FDW options"
 msgstr "Налаштування FDW"
 
-#: describe.c:2040
+#: describe.c:2079
 msgid "Storage"
 msgstr "Сховище"
 
-#: describe.c:2042
+#: describe.c:2081
 msgid "Compression"
 msgstr "Стискання"
 
-#: describe.c:2044
+#: describe.c:2083
 msgid "Stats target"
 msgstr "Статистична ціль"
 
-#: describe.c:2180
+#: describe.c:2225
 #, c-format
 msgid "Partition of: %s %s%s"
 msgstr "Розділ: %s %s%s"
 
-#: describe.c:2193
+#: describe.c:2238
 msgid "No partition constraint"
 msgstr "Відсутнє розділове обмеження"
 
-#: describe.c:2195
+#: describe.c:2240
 #, c-format
 msgid "Partition constraint: %s"
 msgstr "Обмеження секції: %s"
 
-#: describe.c:2219
+#: describe.c:2264
 #, c-format
 msgid "Partition key: %s"
 msgstr "Ключ розділу: %s"
 
-#: describe.c:2245
+#: describe.c:2290
 #, c-format
 msgid "Owning table: \"%s.%s\""
 msgstr "Таблиця, що володіє: \"%s.%s\""
 
-#: describe.c:2314
+#: describe.c:2363
 msgid "primary key, "
 msgstr "первинний ключ,"
 
-#: describe.c:2317
+#: describe.c:2366
 msgid "unique"
 msgstr "унікальний"
 
-#: describe.c:2319
+#: describe.c:2368
 msgid " nulls not distinct"
 msgstr " nulls не відрізняються"
 
-#: describe.c:2320
+#: describe.c:2369
 msgid ", "
 msgstr ", "
 
-#: describe.c:2327
+#: describe.c:2376
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "для таблиці \"%s.%s\""
 
-#: describe.c:2331
+#: describe.c:2380
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", предикат (%s)"
 
-#: describe.c:2334
+#: describe.c:2383
 msgid ", clustered"
 msgstr ", кластеризовано"
 
-#: describe.c:2337
+#: describe.c:2386
 msgid ", invalid"
 msgstr ", недійсний"
 
-#: describe.c:2340
+#: describe.c:2389
 msgid ", deferrable"
 msgstr ", відтермінований"
 
-#: describe.c:2343
+#: describe.c:2392
 msgid ", initially deferred"
 msgstr ", від початку відтермінований"
 
-#: describe.c:2346
+#: describe.c:2395
 msgid ", replica identity"
 msgstr ", ідентичність репліки"
 
-#: describe.c:2400
+#: describe.c:2456
 msgid "Indexes:"
 msgstr "Індекси:"
 
-#: describe.c:2483
+#: describe.c:2544
 msgid "Check constraints:"
 msgstr "Обмеження перевірки:"
 
-#: describe.c:2551
+#: describe.c:2605
 msgid "Foreign-key constraints:"
 msgstr "Обмеження зовнішнього ключа:"
 
-#: describe.c:2614
+#: describe.c:2664
 msgid "Referenced by:"
 msgstr "Посилання ззовні:"
 
-#: describe.c:2664
+#: describe.c:2713
 msgid "Policies:"
 msgstr "Політики:"
 
-#: describe.c:2667
+#: describe.c:2716
 msgid "Policies (forced row security enabled):"
 msgstr "Політики (посилений захист рядків активовано):"
 
-#: describe.c:2670
+#: describe.c:2719
 msgid "Policies (row security enabled): (none)"
 msgstr "Політики (захист рядків ввімкнуто): (ні)"
 
-#: describe.c:2673
+#: describe.c:2722
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Політики (посилений захист рядків ввімкнуто): (ні)"
 
-#: describe.c:2676
+#: describe.c:2725
 msgid "Policies (row security disabled):"
 msgstr "Політики (захист рядків вимкнуто):"
 
-#: describe.c:2736 describe.c:2841
+#: describe.c:2785 describe.c:2890
 msgid "Statistics objects:"
 msgstr "Об'єкти статистики:"
 
-#: describe.c:2943 describe.c:3096
+#: describe.c:2992 describe.c:3192
 msgid "Rules:"
 msgstr "Правила:"
 
-#: describe.c:2946
+#: describe.c:2995
 msgid "Disabled rules:"
 msgstr "Вимкнені правила:"
 
-#: describe.c:2949
+#: describe.c:2998
 msgid "Rules firing always:"
 msgstr "Правила, що завжди працюють:"
 
-#: describe.c:2952
+#: describe.c:3001
 msgid "Rules firing on replica only:"
 msgstr "Правила, що працюють тільки на репліці:"
 
-#: describe.c:3031 describe.c:5100
+#: describe.c:3080 describe.c:5276
 msgid "Publications:"
 msgstr "Публікації:"
 
-#: describe.c:3079
+#: describe.c:3127
+msgid "Not-null constraints:"
+msgstr "Обмеження не-NULL:"
+
+#: describe.c:3141
+msgid " (local, inherited)"
+msgstr " (локально, успадковано)"
+
+#: describe.c:3142
+msgid " (inherited)"
+msgstr " (успадковано)"
+
+#: describe.c:3175
 msgid "View definition:"
 msgstr "Визначення подання:"
 
-#: describe.c:3242
+#: describe.c:3338
 msgid "Triggers:"
 msgstr "Тригери:"
 
-#: describe.c:3245
+#: describe.c:3341
 msgid "Disabled user triggers:"
 msgstr "Вимкнені користувацькі тригери:"
 
-#: describe.c:3248
+#: describe.c:3344
 msgid "Disabled internal triggers:"
 msgstr "Вимкнені внутрішні тригери:"
 
-#: describe.c:3251
+#: describe.c:3347
 msgid "Triggers firing always:"
 msgstr "Тригери, що завжди працюють:"
 
-#: describe.c:3254
+#: describe.c:3350
 msgid "Triggers firing on replica only:"
 msgstr "Тригери, що працюють тільки на репліці:"
 
-#: describe.c:3325
+#: describe.c:3421
 #, c-format
 msgid "Server: %s"
 msgstr "Сервер: %s"
 
-#: describe.c:3333
+#: describe.c:3429
 #, c-format
 msgid "FDW options: (%s)"
 msgstr "Налаштування FDW: (%s)"
 
-#: describe.c:3354
+#: describe.c:3450
 msgid "Inherits"
 msgstr "Успадковує"
 
-#: describe.c:3419
+#: describe.c:3515
 #, c-format
 msgid "Number of partitions: %d"
 msgstr "Число секцій: %d"
 
-#: describe.c:3428
+#: describe.c:3524
 #, c-format
 msgid "Number of partitions: %d (Use \\d+ to list them.)"
 msgstr "Кількість розділів: %d (\\d+ для списку)"
 
-#: describe.c:3430
+#: describe.c:3526
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Кількість дочірніх таблиць: %d (\\d+ для списку)"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Child tables"
 msgstr "Дочірні таблиці"
 
-#: describe.c:3437
+#: describe.c:3533
 msgid "Partitions"
 msgstr "Розділи"
 
-#: describe.c:3470
+#: describe.c:3566
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Типізована таблиця типу: %s"
 
-#: describe.c:3486
+#: describe.c:3584
 msgid "Replica Identity"
 msgstr "Ідентичність репліки"
 
-#: describe.c:3499
+#: describe.c:3597
 msgid "Has OIDs: yes"
 msgstr "Має OIDs: так"
 
-#: describe.c:3508
+#: describe.c:3606
 #, c-format
 msgid "Access method: %s"
 msgstr "Метод доступу: %s"
 
-#: describe.c:3585
+#: describe.c:3683
 #, 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:3597
+#: describe.c:3695
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", табличний простір \"%s\""
 
-#: describe.c:3670
+#: describe.c:3768
 msgid "List of roles"
 msgstr "Список ролей"
 
-#: describe.c:3672 describe.c:3840
+#: describe.c:3770 describe.c:3938
 msgid "Role name"
 msgstr "Ім'я ролі"
 
-#: describe.c:3673
+#: describe.c:3771
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: describe.c:3684
+#: describe.c:3782
 msgid "Superuser"
 msgstr "Суперкористувач"
 
-#: describe.c:3687
+#: describe.c:3785
 msgid "No inheritance"
 msgstr "Без успадкування"
 
-#: describe.c:3690
+#: describe.c:3788
 msgid "Create role"
 msgstr "Створити роль"
 
-#: describe.c:3693
+#: describe.c:3791
 msgid "Create DB"
 msgstr "Створити базу даних"
 
-#: describe.c:3696
+#: describe.c:3794
 msgid "Cannot login"
 msgstr "Не може увійти"
 
-#: describe.c:3699
+#: describe.c:3797
 msgid "Replication"
 msgstr "Реплікація"
 
-#: describe.c:3703
+#: describe.c:3801
 msgid "Bypass RLS"
 msgstr "Обхід RLC"
 
-#: describe.c:3712
+#: describe.c:3810
 msgid "No connections"
 msgstr "Без підключень"
 
-#: describe.c:3714
+#: describe.c:3812
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
@@ -1829,711 +1956,792 @@ msgstr[1] "%d підключення"
 msgstr[2] "%d підключень"
 msgstr[3] "%d підключення"
 
-#: describe.c:3724
+#: describe.c:3822
 msgid "Password valid until "
 msgstr "Пароль дійнсий до"
 
-#: describe.c:3775
+#: describe.c:3873
 msgid "Role"
 msgstr "Роль"
 
-#: describe.c:3776
-msgid "Database"
-msgstr "База даних"
-
-#: describe.c:3777
+#: describe.c:3875
 msgid "Settings"
 msgstr "Параметри"
 
-#: describe.c:3801
+#: describe.c:3899
 #, c-format
 msgid "Did not find any settings for role \"%s\" and database \"%s\"."
 msgstr "Не знайдено жодного параметра для ролі \"%s\" і бази даних \"%s\"."
 
-#: describe.c:3804
+#: describe.c:3902
 #, c-format
 msgid "Did not find any settings for role \"%s\"."
 msgstr "Не знайдено жодного параметру для ролі \"%s\"."
 
-#: describe.c:3807
+#: describe.c:3905
 #, c-format
 msgid "Did not find any settings."
 msgstr "Не знайдено жодного параметру."
 
-#: describe.c:3811
+#: describe.c:3909
 msgid "List of settings"
 msgstr "Список параметрів"
 
-#: describe.c:3841
+#: describe.c:3939
 msgid "Member of"
 msgstr "Член"
 
-#: describe.c:3858
+#: describe.c:3956
 msgid "Grantor"
 msgstr "Надавач"
 
-#: describe.c:3884
+#: describe.c:3982
 msgid "List of role grants"
 msgstr "Перелік наданих ролей"
 
-#: describe.c:3950
+#: describe.c:4052
 msgid "index"
 msgstr "індекс"
 
-#: describe.c:3952
+#: describe.c:4054
 msgid "TOAST table"
 msgstr "Таблиця TOAST"
 
-#: describe.c:3955 describe.c:4166
+#: describe.c:4057 describe.c:4321
 msgid "partitioned index"
 msgstr "секційний індекс"
 
-#: describe.c:3975
+#: describe.c:4081
 msgid "permanent"
 msgstr "постійна"
 
-#: describe.c:3976
+#: describe.c:4082
 msgid "temporary"
 msgstr "тимчасова"
 
-#: describe.c:3977
+#: describe.c:4083
 msgid "unlogged"
 msgstr "нежурнальована"
 
-#: describe.c:3978
+#: describe.c:4084
 msgid "Persistence"
 msgstr "Стійкість"
 
-#: describe.c:3994
+#: describe.c:4100 describe.c:4344
 msgid "Access method"
 msgstr "Метод доступу"
 
-#: describe.c:4079
+#: describe.c:4180
+#, c-format
+msgid "Did not find any relations named \"%s\"."
+msgstr "Не знайдено жодного відношення з назвою \"%s\"."
+
+#: describe.c:4183
+#, c-format
+msgid "Did not find any tables named \"%s\"."
+msgstr "Не знайдено жодної таблиці з назвою \"%s\"."
+
+#: describe.c:4186
+#, c-format
+msgid "Did not find any indexes named \"%s\"."
+msgstr "Не знайдено жодного індексу з назвою \"%s\"."
+
+#: describe.c:4189
+#, c-format
+msgid "Did not find any views named \"%s\"."
+msgstr "Не знайдено жодного подання з назвою \"%s\"."
+
+#: describe.c:4192
+#, c-format
+msgid "Did not find any materialized views named \"%s\"."
+msgstr "Не знайдено жодного матеріалізованого подання з назвою \"%s\"."
+
+#: describe.c:4195
+#, c-format
+msgid "Did not find any sequences named \"%s\"."
+msgstr "Не знайдено жодної послідовності з назвою \"%s\"."
+
+#: describe.c:4198
+#, c-format
+msgid "Did not find any foreign tables named \"%s\"."
+msgstr "Не знайдено жодної сторонньої таблиці з назвою \"%s\"."
+
+#: describe.c:4209
+#, c-format
+msgid "Did not find any tables."
+msgstr "Не знайдено жодної таблиці."
+
+#: describe.c:4211
+#, c-format
+msgid "Did not find any indexes."
+msgstr "Не знайдено жодного індексу."
+
+#: describe.c:4213
+#, c-format
+msgid "Did not find any views."
+msgstr "Не знайдено жодного подання."
+
+#: describe.c:4215
+#, c-format
+msgid "Did not find any materialized views."
+msgstr "Не знайдено жодного матеріалізованого подання."
+
+#: describe.c:4217
+#, c-format
+msgid "Did not find any sequences."
+msgstr "Не знайдено жодної послідовності."
+
+#: describe.c:4219
+#, c-format
+msgid "Did not find any foreign tables."
+msgstr "Не знайдено жодної сторонньої таблиці."
+
+#: describe.c:4227
 msgid "List of relations"
 msgstr "Список відношень"
 
-#: describe.c:4127
+#: describe.c:4228
+msgid "List of tables"
+msgstr "Список таблиць"
+
+#: describe.c:4229
+msgid "List of indexes"
+msgstr "Список індексів"
+
+#: describe.c:4230
+msgid "List of views"
+msgstr "Список виглядів"
+
+#: describe.c:4231
+msgid "List of materialized views"
+msgstr "Список матеріалізованих подань"
+
+#: describe.c:4232
+msgid "List of sequences"
+msgstr "Список послідовностей"
+
+#: describe.c:4233 describe.c:6163
+msgid "List of foreign tables"
+msgstr "Список сторонніх таблиць"
+
+#: describe.c:4282
 #, c-format
 msgid "The server (version %s) does not support declarative table partitioning."
 msgstr "Сервер (версія %s) не підтримує декларативне секціонування таблиць."
 
-#: describe.c:4138
+#: describe.c:4293
 msgid "List of partitioned indexes"
 msgstr "Список секційних індексів"
 
-#: describe.c:4140
+#: describe.c:4295
 msgid "List of partitioned tables"
 msgstr "Список секційних таблиць"
 
-#: describe.c:4144
+#: describe.c:4299
 msgid "List of partitioned relations"
 msgstr "Список секційних відношень"
 
-#: describe.c:4175
+#: describe.c:4330
 msgid "Parent name"
 msgstr "Батьківська назва"
 
-#: describe.c:4188
+#: describe.c:4350
 msgid "Leaf partition size"
 msgstr "Розмір дочірньої секції"
 
-#: describe.c:4191 describe.c:4197
+#: describe.c:4353 describe.c:4359
 msgid "Total size"
 msgstr "Загальний розмір"
 
-#: describe.c:4321
+#: describe.c:4486
 msgid "Trusted"
 msgstr "Надійний"
 
-#: describe.c:4330
+#: describe.c:4495
 msgid "Internal language"
 msgstr "Внутрішня мова"
 
-#: describe.c:4331
+#: describe.c:4496
 msgid "Call handler"
 msgstr "Обробник виклику"
 
-#: describe.c:4332 describe.c:5743
+#: describe.c:4497 describe.c:5919
 msgid "Validator"
 msgstr "Функція перевірки"
 
-#: describe.c:4333
+#: describe.c:4498
 msgid "Inline handler"
 msgstr "Оброблювач впровадженого коду"
 
-#: describe.c:4367
+#: describe.c:4532
 msgid "List of languages"
 msgstr "Список мов"
 
-#: describe.c:4408
+#: describe.c:4573
 msgid "Check"
 msgstr "Перевірка"
 
-#: describe.c:4451
+#: describe.c:4616
 msgid "List of domains"
 msgstr "Список доменів"
 
-#: describe.c:4485
+#: describe.c:4650
 msgid "Source"
 msgstr "Джерело"
 
-#: describe.c:4486
+#: describe.c:4651
 msgid "Destination"
 msgstr "Призначення"
 
-#: describe.c:4488 describe.c:6712
+#: describe.c:4653 describe.c:6929
 msgid "Default?"
 msgstr "За замовчуванням?"
 
-#: describe.c:4529
+#: describe.c:4694
 msgid "List of conversions"
 msgstr "Список перетворень"
 
-#: describe.c:4557
-msgid "Parameter"
-msgstr "Параметр"
-
-#: describe.c:4558
-msgid "Value"
-msgstr "Значення"
-
-#: describe.c:4565
+#: describe.c:4730
 msgid "Context"
 msgstr "Контекст"
 
-#: describe.c:4597
+#: describe.c:4762
 msgid "List of configuration parameters"
 msgstr "Список параметрів конфігурації"
 
-#: describe.c:4599
+#: describe.c:4764
 msgid "List of non-default configuration parameters"
 msgstr "Список параметрів конфігурації не за замовчуванням"
 
-#: describe.c:4626
+#: describe.c:4791
 #, c-format
 msgid "The server (version %s) does not support event triggers."
 msgstr "Сервер (версія %s) не підтримує тригери подій."
 
-#: describe.c:4646
+#: describe.c:4811
 msgid "Event"
 msgstr "Подія"
 
-#: describe.c:4648
+#: describe.c:4813
 msgid "enabled"
 msgstr "увімкнено"
 
-#: describe.c:4649
+#: describe.c:4814
 msgid "replica"
 msgstr "репліка"
 
-#: describe.c:4650
+#: describe.c:4815
 msgid "always"
 msgstr "завжди"
 
-#: describe.c:4651
+#: describe.c:4816
 msgid "disabled"
 msgstr "вимкнено"
 
-#: describe.c:4652 describe.c:6553
+#: describe.c:4817 describe.c:6770
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: describe.c:4654
+#: describe.c:4819
 msgid "Tags"
 msgstr "Теги"
 
-#: describe.c:4677
+#: describe.c:4842
 msgid "List of event triggers"
 msgstr "Список тригерів подій"
 
-#: describe.c:4704
+#: describe.c:4869
 #, c-format
 msgid "The server (version %s) does not support extended statistics."
 msgstr "Сервер (версія %s) не підтримує розширену статистику."
 
-#: describe.c:4741
+#: describe.c:4906
 msgid "Ndistinct"
 msgstr "Ndistinct"
 
-#: describe.c:4742
+#: describe.c:4907
 msgid "Dependencies"
 msgstr "Залежності"
 
-#: describe.c:4752
+#: describe.c:4917
 msgid "MCV"
 msgstr "MCV"
 
-#: describe.c:4775
+#: describe.c:4940
 msgid "List of extended statistics"
 msgstr "Список розширеної статистики"
 
-#: describe.c:4802
+#: describe.c:4967
 msgid "Source type"
 msgstr "Початковий тип"
 
-#: describe.c:4803
+#: describe.c:4968
 msgid "Target type"
 msgstr "Тип цілі"
 
-#: describe.c:4827
+#: describe.c:4992
 msgid "in assignment"
 msgstr "у призначенні"
 
-#: describe.c:4829
+#: describe.c:4994
 msgid "Implicit?"
 msgstr "Приховане?"
 
-#: describe.c:4887
+#: describe.c:5058
 msgid "List of casts"
 msgstr "Список приведення типів"
 
-#: describe.c:4927 describe.c:4931
+#: describe.c:5103 describe.c:5107
 msgid "Provider"
 msgstr "Постачальник"
 
-#: describe.c:4965 describe.c:4970
+#: describe.c:5141 describe.c:5146
 msgid "Deterministic?"
 msgstr "Детермінований?"
 
-#: describe.c:5009
+#: describe.c:5185
 msgid "List of collations"
 msgstr "Список правил сортування"
 
-#: describe.c:5070
+#: describe.c:5246
 msgid "List of schemas"
 msgstr "Список схем"
 
-#: describe.c:5186
+#: describe.c:5362
 msgid "List of text search parsers"
 msgstr "Список парсерів текстового пошуку"
 
-#: describe.c:5236
+#: describe.c:5412
 #, c-format
 msgid "Did not find any text search parser named \"%s\"."
 msgstr "Не знайдено жодного парсера текстового пошуку \"%s\"."
 
-#: describe.c:5239
+#: describe.c:5415
 #, c-format
 msgid "Did not find any text search parsers."
 msgstr "Не знайдено жодного парсера текстового пошуку."
 
-#: describe.c:5314
+#: describe.c:5490
 msgid "Start parse"
 msgstr "Почати розбір"
 
-#: describe.c:5315
+#: describe.c:5491
 msgid "Method"
 msgstr "Метод"
 
-#: describe.c:5319
+#: describe.c:5495
 msgid "Get next token"
 msgstr "Отримати наступний токен"
 
-#: describe.c:5321
+#: describe.c:5497
 msgid "End parse"
 msgstr "Закінчити розбір"
 
-#: describe.c:5323
+#: describe.c:5499
 msgid "Get headline"
 msgstr "Отримати заголовок"
 
-#: describe.c:5325
+#: describe.c:5501
 msgid "Get token types"
 msgstr "Отримати типи токенів"
 
-#: describe.c:5335
+#: describe.c:5511
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Парсер текстового пошуку \"%s.%s\""
 
-#: describe.c:5338
+#: describe.c:5514
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Парсер текстового пошуку \"%s\""
 
-#: describe.c:5357
+#: describe.c:5533
 msgid "Token name"
 msgstr "Ім'я токену"
 
-#: describe.c:5370
+#: describe.c:5546
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Типи токенів для парсера \"%s.%s\""
 
-#: describe.c:5373
+#: describe.c:5549
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Типи токенів для парсера \"%s\""
 
-#: describe.c:5417
+#: describe.c:5593
 msgid "Template"
 msgstr "Шаблон"
 
-#: describe.c:5418
+#: describe.c:5594
 msgid "Init options"
 msgstr "Параметри ініціалізації"
 
-#: describe.c:5444
+#: describe.c:5620
 msgid "List of text search dictionaries"
 msgstr "Список словників текстового пошуку"
 
-#: describe.c:5477
+#: describe.c:5653
 msgid "Init"
 msgstr "Ініціалізація"
 
-#: describe.c:5478
+#: describe.c:5654
 msgid "Lexize"
 msgstr "Виділення лексем"
 
-#: describe.c:5509
+#: describe.c:5685
 msgid "List of text search templates"
 msgstr "Список шаблонів текстового пошуку"
 
-#: describe.c:5563
+#: describe.c:5739
 msgid "List of text search configurations"
 msgstr "Список конфігурацій текстового пошуку"
 
-#: describe.c:5614
+#: describe.c:5790
 #, c-format
 msgid "Did not find any text search configuration named \"%s\"."
 msgstr "Не знайдено жодної конфігурації текстового пошуку під назвою \"%s\"."
 
-#: describe.c:5617
+#: describe.c:5793
 #, c-format
 msgid "Did not find any text search configurations."
 msgstr "Не знайдено жодної конфігурації текствого пошуку."
 
-#: describe.c:5683
+#: describe.c:5859
 msgid "Token"
 msgstr "Токен"
 
-#: describe.c:5684
+#: describe.c:5860
 msgid "Dictionaries"
 msgstr "Словники"
 
-#: describe.c:5695
+#: describe.c:5871
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Конфігурація пошуку тексту \"%s.%s\""
 
-#: describe.c:5698
+#: describe.c:5874
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Конфігурація пошуку тексту \"%s\""
 
-#: describe.c:5702
+#: describe.c:5878
 #, c-format
 msgid "\n"
 "Parser: \"%s.%s\""
 msgstr "\n"
 "Парсер: \"%s.%s\""
 
-#: describe.c:5705
+#: describe.c:5881
 #, c-format
 msgid "\n"
 "Parser: \"%s\""
 msgstr "\n"
 "Парсер: \"%s\""
 
-#: describe.c:5784
+#: describe.c:5960
 msgid "List of foreign-data wrappers"
 msgstr "Список джерел сторонніх даних"
 
-#: describe.c:5812
+#: describe.c:5988
 msgid "Foreign-data wrapper"
 msgstr "Джерело сторонніх даних"
 
-#: describe.c:5830 describe.c:6017
+#: describe.c:6006 describe.c:6195
 msgid "Version"
 msgstr "Версія"
 
-#: describe.c:5860
+#: describe.c:6036
 msgid "List of foreign servers"
 msgstr "Список сторонніх серверів"
 
-#: describe.c:5885 describe.c:5943
+#: describe.c:6061 describe.c:6119
 msgid "Server"
 msgstr "Сервер"
 
-#: describe.c:5886
+#: describe.c:6062
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: describe.c:5915
+#: describe.c:6091
 msgid "List of user mappings"
 msgstr "Список зіставлень користувачів"
 
-#: describe.c:5987
-msgid "List of foreign tables"
-msgstr "Список сторонніх таблиць"
+#: describe.c:6196
+msgid "Default version"
+msgstr "Версія за замовчуванням"
 
-#: describe.c:6038
+#: describe.c:6217
 msgid "List of installed extensions"
 msgstr "Список встановлених розширень"
 
-#: describe.c:6086
+#: describe.c:6265
 #, c-format
 msgid "Did not find any extension named \"%s\"."
 msgstr "Не знайдено жодного розширення під назвою \"%s\"."
 
-#: describe.c:6089
+#: describe.c:6268
 #, c-format
 msgid "Did not find any extensions."
 msgstr "Не знайдено жодного розширення."
 
-#: describe.c:6133
+#: describe.c:6312
 msgid "Object description"
 msgstr "Опис об'єкту"
 
-#: describe.c:6142
+#: describe.c:6321
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Об'єкти в розширенні \"%s\""
 
-#: describe.c:6183
+#: describe.c:6362
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неправильне повне ім'я (забагато компонентів): %s"
 
-#: describe.c:6197
+#: describe.c:6376
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "міжбазові посилання не реалізовані: %s"
 
-#: describe.c:6228 describe.c:6354
+#: describe.c:6407 describe.c:6543
 #, c-format
 msgid "The server (version %s) does not support publications."
 msgstr "Сервер (версія %s) не підтримує публікації."
 
-#: describe.c:6245 describe.c:6432
+#: describe.c:6424 describe.c:6645
 msgid "All tables"
 msgstr "Усі таблиці"
 
-#: describe.c:6246 describe.c:6433
+#: describe.c:6425 describe.c:6646
 msgid "Inserts"
 msgstr "Вставки"
 
-#: describe.c:6247 describe.c:6434
+#: describe.c:6426 describe.c:6647
 msgid "Updates"
 msgstr "Оновлення"
 
-#: describe.c:6248 describe.c:6435
+#: describe.c:6427 describe.c:6648
 msgid "Deletes"
 msgstr "Видалення"
 
-#: describe.c:6252 describe.c:6437
+#: describe.c:6431 describe.c:6650
 msgid "Truncates"
 msgstr "Очищення"
 
-#: describe.c:6256 describe.c:6439
+#: describe.c:6440 describe.c:6574 describe.c:6652
+msgid "Generated columns"
+msgstr "Генеровані стовпці"
+
+#: describe.c:6444 describe.c:6654
 msgid "Via root"
 msgstr "Через root"
 
-#: describe.c:6277
+#: describe.c:6465
 msgid "List of publications"
 msgstr "Список публікацій"
 
-#: describe.c:6401
+#: describe.c:6612
 #, c-format
 msgid "Did not find any publication named \"%s\"."
 msgstr "Не знайдено жодної публікації під назвою \"%s\"."
 
-#: describe.c:6404
+#: describe.c:6615
 #, c-format
 msgid "Did not find any publications."
 msgstr "Не знайдено жодної публікації."
 
-#: describe.c:6428
+#: describe.c:6641
 #, c-format
 msgid "Publication %s"
 msgstr "Публікація %s"
 
-#: describe.c:6481
+#: describe.c:6698
 msgid "Tables:"
 msgstr "Таблиці:"
 
-#: describe.c:6493
+#: describe.c:6710
 msgid "Tables from schemas:"
 msgstr "Таблиці зі схеми:"
 
-#: describe.c:6538
+#: describe.c:6755
 #, c-format
 msgid "The server (version %s) does not support subscriptions."
 msgstr "Сервер (версія %s) не підтримує підписки."
 
-#: describe.c:6554
+#: describe.c:6771
 msgid "Publication"
 msgstr "Публікація"
 
-#: describe.c:6563
+#: describe.c:6780
 msgid "Binary"
 msgstr "Бінарний"
 
-#: describe.c:6572 describe.c:6576
+#: describe.c:6789 describe.c:6793
 msgid "Streaming"
 msgstr "Потокова передача"
 
-#: describe.c:6584
+#: describe.c:6801
 msgid "Two-phase commit"
 msgstr "Двофазовий коміт"
 
-#: describe.c:6585
+#: describe.c:6802
 msgid "Disable on error"
 msgstr "Вимкнути при помилці"
 
-#: describe.c:6592
+#: describe.c:6809
 msgid "Origin"
 msgstr "Джерело"
 
-#: describe.c:6593
+#: describe.c:6810
 msgid "Password required"
 msgstr "Потрібен пароль"
 
-#: describe.c:6594
+#: describe.c:6811
 msgid "Run as owner?"
 msgstr "Запустити як власник?"
 
-#: describe.c:6599
+#: describe.c:6816
 msgid "Failover"
 msgstr "Відновлення після збою"
 
-#: describe.c:6604
+#: describe.c:6821
 msgid "Synchronous commit"
 msgstr "Синхронні затвердження"
 
-#: describe.c:6605
+#: describe.c:6822
 msgid "Conninfo"
 msgstr "Conninfo"
 
-#: describe.c:6611
+#: describe.c:6828
 msgid "Skip LSN"
 msgstr "Пропустити LSN"
 
-#: describe.c:6637
+#: describe.c:6854
 msgid "List of subscriptions"
 msgstr "Список підписок"
 
-#: describe.c:6666
+#: describe.c:6883
 msgid "(none)"
 msgstr "(нічого)"
 
-#: describe.c:6706 describe.c:6801 describe.c:6893 describe.c:6987
+#: describe.c:6923 describe.c:7018 describe.c:7110 describe.c:7213
 msgid "AM"
 msgstr "АМ"
 
-#: describe.c:6707
+#: describe.c:6924
 msgid "Input type"
 msgstr "Тип вводу"
 
-#: describe.c:6708
+#: describe.c:6925
 msgid "Storage type"
 msgstr "Тип сховища"
 
-#: describe.c:6709
+#: describe.c:6926
 msgid "Operator class"
 msgstr "Клас операторів"
 
-#: describe.c:6721 describe.c:6802 describe.c:6894 describe.c:6988
+#: describe.c:6938 describe.c:7019 describe.c:7111 describe.c:7214
 msgid "Operator family"
 msgstr "Сімейство операторів"
 
-#: describe.c:6756
+#: describe.c:6973
 msgid "List of operator classes"
 msgstr "Список класів операторів"
 
-#: describe.c:6803
+#: describe.c:7020
 msgid "Applicable types"
 msgstr "Типи для застосування"
 
-#: describe.c:6844
+#: describe.c:7061
 msgid "List of operator families"
 msgstr "Список сімейств операторів"
 
-#: describe.c:6895
+#: describe.c:7112
 msgid "Operator"
 msgstr "Оператор"
 
-#: describe.c:6896
+#: describe.c:7113
 msgid "Strategy"
 msgstr "Стратегія"
 
-#: describe.c:6897
+#: describe.c:7114
 msgid "ordering"
 msgstr "упорядкування"
 
-#: describe.c:6898
+#: describe.c:7115
 msgid "search"
 msgstr "пошук"
 
-#: describe.c:6899
+#: describe.c:7116
 msgid "Purpose"
 msgstr "Ціль"
 
-#: describe.c:6904
+#: describe.c:7125
 msgid "Sort opfamily"
 msgstr "Сімейство операторів сортування"
 
-#: describe.c:6942
+#: describe.c:7168
 msgid "List of operators of operator families"
 msgstr "Список операторів сімейств операторів"
 
-#: describe.c:6989
+#: describe.c:7215
 msgid "Registered left type"
 msgstr "Зареєстрований лівий тип"
 
-#: describe.c:6990
+#: describe.c:7216
 msgid "Registered right type"
 msgstr "Зареєстрований правий тип"
 
-#: describe.c:6991
+#: describe.c:7217
 msgid "Number"
 msgstr "Число"
 
-#: describe.c:7034
+#: describe.c:7260
 msgid "List of support functions of operator families"
 msgstr "Список функцій підтримки сімейств операторів"
 
-#: describe.c:7065
+#: describe.c:7291
 msgid "ID"
 msgstr "ID"
 
-#: describe.c:7085
+#: describe.c:7311
 msgid "Large objects"
 msgstr "Великі об'єкти"
 
-#: help.c:63
+#: help.c:60
 msgid "psql is the PostgreSQL interactive terminal.\n\n"
 msgstr "psql - це інтерактивний термінал PostgreSQL.\n\n"
 
-#: help.c:64 help.c:372 help.c:456 help.c:499
+#: help.c:61 help.c:389 help.c:476 help.c:525
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: help.c:65
+#: help.c:62
 msgid "  psql [OPTION]... [DBNAME [USERNAME]]\n\n"
 msgstr "  psql [ОПЦІЯ]... [БД [КОРИСТУВАЧ]]\n\n"
 
-#: help.c:67
+#: help.c:64
 msgid "General options:\n"
 msgstr "Основні налаштування:\n"
 
-#: help.c:68
+#: help.c:65
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr "  -c, --command=КОМАНДА    виконати лише одну команду (SQL або внутрішню) і вийти\n"
 
-#: help.c:69
+#: help.c:66
 msgid "  -d, --dbname=DBNAME      database name to connect to\n"
 msgstr "  -d, --dbname=DBNAME      назва бази даних для підключення\n"
 
-#: help.c:70
+#: help.c:67
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=FILENAME      виконує команди з файлу, потім виходить\n"
 
-#: help.c:71
+#: help.c:68
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list               виводить список доступних баз даних, потім виходить\n"
 
-#: help.c:72
+#: help.c:69
 msgid "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
 "                           (e.g., -v ON_ERROR_STOP=1)\n"
@@ -2541,93 +2749,93 @@ msgstr "  -v, --set=, --variable=NAME=VALUE\n"
 "                           присвоїти змінній psql NAME значення VALUE\n"
 "                           (наприклад, -v ON_ERROR_STOP=1)\n"
 
-#: help.c:75
+#: help.c:72
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію, потім вийти\n"
 
-#: help.c:76
+#: help.c:73
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          ігнорувати файл параметрів запуска (~/.psqlrc)\n"
 
-#: help.c:77
+#: help.c:74
 msgid "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
 msgstr "  -1 (\"один\"), --single-transaction\n"
 "                           виконує як одну транзакцію (якщо не інтерактивна)\n"
 
-#: help.c:79
+#: help.c:76
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help [=options]    показати цю довідку, потім вийти\n"
 
-#: help.c:80
+#: help.c:77
 msgid "      --help=commands      list backslash commands, then exit\n"
 msgstr "      --help=commands    перерахувати команди, потім вийти\n"
 
-#: help.c:81
+#: help.c:78
 msgid "      --help=variables     list special variables, then exit\n"
 msgstr "      --help=variables     перерахувати спеціальні змінні, потім вийти\n"
 
-#: help.c:83
+#: help.c:80
 msgid "\n"
 "Input and output options:\n"
 msgstr "\n"
 "Параметри вводу і виводу:\n"
 
-#: help.c:84
+#: help.c:81
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           відобразити всі вхідні дані з скрипта\n"
 
-#: help.c:85
+#: help.c:82
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        відобразити команди з помилками\n"
 
-#: help.c:86
+#: help.c:83
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       відобразити команди, відправлені на сервер\n"
 
-#: help.c:87
+#: help.c:84
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden       відобразити запити, згенеровані внутрішніми командами\n"
 
-#: help.c:88
+#: help.c:85
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FILENAME  зберегти протокол роботи у файл\n"
 
-#: help.c:89
+#: help.c:86
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr "  -n, --no-readline        вимкнути розширене редагування командного рядка (readline)\n"
 
-#: help.c:90
+#: help.c:87
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=FILENAME    надсилати результати запиту до файлу (або до каналу |)\n"
 
-#: help.c:91
+#: help.c:88
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet              тихий запуск (ніяких повідомлень, лише результат запитів)\n"
 
-#: help.c:92
+#: help.c:89
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        покроковий режим (підтвердження кожного запиту)\n"
 
-#: help.c:93
+#: help.c:90
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr "  -S, --single-line        однорядковий режим (кінець рядка завершує команду)\n"
 
-#: help.c:95
+#: help.c:92
 msgid "\n"
 "Output format options:\n"
 msgstr "\n"
 "Параметри формату виводу:\n"
 
-#: help.c:96
+#: help.c:93
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           режим виводу не вирівняної таблиці\n"
 
-#: help.c:97
+#: help.c:94
 msgid "      --csv                CSV (Comma-Separated Values) table output mode\n"
 msgstr "      --csv                режим виводу таблиць CSV (Comma-Separated Values)\n"
 
-#: help.c:98
+#: help.c:95
 #, c-format
 msgid "  -F, --field-separator=STRING\n"
 "                           field separator for unaligned output (default: \"%s\")\n"
@@ -2635,72 +2843,72 @@ msgstr "  -F, --field-separator=СТРОКА\n"
 "                           розділювач полів при не вирівняному виводі\n"
 "                           (за замовчуванням: \"%s\")\n"
 
-#: help.c:101
+#: help.c:98
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               вивід таблиці у форматі HTML\n"
 
-#: help.c:102
+#: help.c:99
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr "  -P, --pset=VAR[=ARG]     встановити параметр виводу змінної VAR значенню ARG (див. команду \"\\pset\")\n"
 
-#: help.c:103
+#: help.c:100
 msgid "  -R, --record-separator=STRING\n"
 "                           record separator for unaligned output (default: newline)\n"
 msgstr "  -R, --record-separator=СТРОКА\n"
 "                           розділювач записів при не вирівняному виводі\n"
 "                           (за замовчуванням: новий рядок)\n"
 
-#: help.c:105
+#: help.c:102
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        виводити лише рядки\n"
 
-#: help.c:106
+#: help.c:103
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr "  -T, --table-attr=ТЕКСТ   встановити атрибути HTML-таблиці (width, border)\n"
 
-#: help.c:107
+#: help.c:104
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           ввімкнути розширене виведення таблиці\n"
 
-#: help.c:108
+#: help.c:105
 msgid "  -z, --field-separator-zero\n"
 "                           set field separator for unaligned output to zero byte\n"
 msgstr "  -z, --field-separator-zero\n"
 "                           встановити розділювач полів для не вирівняного виводу в нульовий байт\n"
 
-#: help.c:110
+#: help.c:107
 msgid "  -0, --record-separator-zero\n"
 "                           set record separator for unaligned output to zero byte\n"
 msgstr "  -0, --record-separator-zero\n"
 "                           встановити розділювач записів для не вирівняного виводу в нульовий байт\n"
 
-#: help.c:113
+#: help.c:110
 msgid "\n"
 "Connection options:\n"
 msgstr "\n"
 "Налаштування з'єднання:\n"
 
-#: help.c:114
+#: help.c:111
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      хост серверу баз даних або каталог сокетів\n"
 
-#: help.c:115
+#: help.c:112
 msgid "  -p, --port=PORT          database server port\n"
 msgstr "  -p, --port=ПОРТ        порт сервера бази даних\n"
 
-#: help.c:116
+#: help.c:113
 msgid "  -U, --username=USERNAME  database user name\n"
 msgstr "  -U, --username=USERNAME  ім'я користувача бази даних\n"
 
-#: help.c:117
+#: help.c:114
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        ніколи не запитувати пароль\n"
 
-#: help.c:118
+#: help.c:115
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           запитувати пароль завжди (повинно траплятись автоматично)\n"
 
-#: help.c:120
+#: help.c:117
 msgid "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
 "commands) from within psql, or consult the psql section in the PostgreSQL\n"
@@ -2708,62 +2916,70 @@ msgid "\n"
 msgstr "\n"
 "Щоб дізнатися більше, введіть \"\\?\" (для внутрішніх команд) або \"\\help\"(для команд SQL) в psql, або звіртеся з розділом psql документації PostgreSQL. \n\n"
 
-#: help.c:123
+#: help.c:120
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Повідомляти про помилки на <%s>.\n"
 
-#: help.c:124
+#: help.c:121
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: help.c:166
+#: help.c:163
 msgid "General\n"
 msgstr "Загальні\n"
 
-#: help.c:167
-msgid "  \\bind [PARAM]...       set query parameters\n"
-msgstr "  \\bind [PARAM]...       встановити параметри запиту\n"
-
-#: help.c:168
+#: help.c:164
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             умови використання і розповсюдження PostgreSQL\n"
 
-#: help.c:169
+#: help.c:165
 msgid "  \\crosstabview [COLUMNS] execute query and display result in crosstab\n"
 msgstr "  \\crosstabview [COLUMNS] виконати запит і відобразити результат у перехресній таблиці\n"
 
-#: help.c:170
+#: help.c:166
 msgid "  \\errverbose            show most recent error message at maximum verbosity\n"
 msgstr "  \\errverbose            вивести максимально докладне повідомлення про останню помилку\n"
 
-#: help.c:171
+#: help.c:167
 msgid "  \\g [(OPTIONS)] [FILE]  execute query (and send result to file or |pipe);\n"
 "                         \\g with no arguments is equivalent to a semicolon\n"
 msgstr "  \\g [(OPTIONS)] [FILE]  виконати запит (і надіслати результат до файлу або |каналу);\n"
 "                         \\g без аргументів рівнозначно крапці з комою\n"
 
-#: help.c:173
+#: help.c:169
 msgid "  \\gdesc                 describe result of query, without executing it\n"
 msgstr "  \\gdesc                 описати результат запиту без виконання\n"
 
-#: help.c:174
+#: help.c:170
 msgid "  \\gexec                 execute query, then execute each value in its result\n"
 msgstr "  \\gexec                 виконати запит, потім виконати кожне значення в його результаті\n"
 
-#: help.c:175
+#: help.c:171
 msgid "  \\gset [PREFIX]         execute query and store result in psql variables\n"
 msgstr "  \\gset [PREFIX]        виконати запит та зберегти результат в змінних psql \n"
 
-#: help.c:176
+#: help.c:172
 msgid "  \\gx [(OPTIONS)] [FILE] as \\g, but forces expanded output mode\n"
 msgstr "  \\gx [(OPTIONS)] [FILE] як \\g, але вмикає розширений режим виводу\n"
 
-#: help.c:177
+#: help.c:173
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     вийти з psql\n"
 
+#: help.c:174
+msgid "  \\restrict RESTRICT_KEY\n"
+"                         enter restricted mode with provided key\n"
+msgstr "  \\restrict RESTRICT_KEY\n"
+"                         увійти в обмежений режим з наданим ключем\n"
+
+#: help.c:176
+msgid "  \\unrestrict RESTRICT_KEY\n"
+"                         exit restricted mode if key matches\n"
+msgstr "  \\unrestrict RESTRICT_KEY\n"
+"                         вийти з обмеженого режиму, якщо ключ співпадає\n"
+
 #: help.c:178
 msgid "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
 "                         execute query every SEC seconds, up to N times,\n"
@@ -2772,8 +2988,8 @@ msgstr "  \\watch [[i=]SEC] [c=N] [m=MIN]\n"
 "                         виконувати запит кожні SEC секунд, до N разів або\n"
 "                         зупинитися, якщо повернуто менше ніж MIN рядків\n"
 
-#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:275 help.c:283
-#: help.c:303 help.c:316 help.c:325
+#: help.c:181 help.c:189 help.c:201 help.c:211 help.c:218 help.c:276 help.c:284
+#: help.c:304 help.c:317 help.c:326 help.c:332
 msgid "\n"
 msgstr "\n"
 
@@ -2886,383 +3102,437 @@ msgid "Informational\n"
 msgstr "Інформаційний\n"
 
 #: help.c:221
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (параметри: S = показати системні об'єкти, + = додаткові деталі)\n"
+msgid "  (options: S = show system objects, x = expanded mode, + = additional detail)\n"
+msgstr "  (параметри: S = показати системні об'єкти, x = розширений режим, + = додаткові деталі)\n"
 
 #: help.c:222
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]                 вивести таблиці, подання і послідовності\n"
+msgid "  \\d[Sx+]                list tables, views, and sequences\n"
+msgstr "  \\d[Sx+]                список таблиць, подань і послідовностей\n"
 
 #: help.c:223
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]  NAME           описати таблицю, подання, послідовність або індекс\n"
+msgid "  \\d[S+]   NAME          describe table, view, sequence, or index\n"
+msgstr "  \\d[S+]   NAME          опис таблиці, подання, послідовності або індексу\n"
 
 #: help.c:224
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [PATTERN]      вивести агрегати\n"
+msgid "  \\da[Sx]  [PATTERN]     list aggregates\n"
+msgstr "  \\da[Sx]  [PATTERN]     список агрегатних функцій\n"
 
 #: help.c:225
-msgid "  \\dA[+]  [PATTERN]      list access methods\n"
-msgstr "  \\dA[+]  [PATTERN]      вивести методи доступу\n"
+msgid "  \\dA[x+]  [PATTERN]     list access methods\n"
+msgstr "  \\dA[x+]  [PATTERN]     список методів доступу\n"
 
 #: help.c:226
-msgid "  \\dAc[+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
-msgstr "  \\dAc[+] [AMPTRN [TYPEPTRN]]  список класів операторів\n"
+msgid "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  list operator classes\n"
+msgstr "  \\dAc[x+] [AMPTRN [TYPEPTRN]]  список класів операторів\n"
 
 #: help.c:227
-msgid "  \\dAf[+] [AMPTRN [TYPEPTRN]]  list operator families\n"
-msgstr "  \\dAf[+] [AMPTRN [TYPEPTRN]]  список сімейств операторів\n"
+msgid "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  list operator families\n"
+msgstr "  \\dAf[x+] [AMPTRN [TYPEPTRN]]  список сімейств операторів\n"
 
 #: help.c:228
-msgid "  \\dAo[+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
-msgstr "  \\dAo[+] [AMPTRN [OPFPTRN]]   список операторів сімейств операторів\n"
+msgid "  \\dAo[x+] [AMPTRN [OPFPTRN]]   list operators of operator families\n"
+msgstr "  \\dAo[x+] [AMPTRN [OPFPTRN]]   список операторів сімейств операторів\n"
 
 #: help.c:229
-msgid "  \\dAp[+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
-msgstr "  \\dAp[+] [AMPTRN [OPFPTRN]]   список функцій підтримки сімейств операторів\n"
+msgid "  \\dAp[x+] [AMPTRN [OPFPTRN]]   list support functions of operator families\n"
+msgstr "  \\dAp[x+] [AMPTRN [OPFPTRN]]   список функцій підтримки сімейств операторів\n"
 
 #: help.c:230
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [PATTERN]      вивести табличні простори\n"
+msgid "  \\db[x+]  [PATTERN]     list tablespaces\n"
+msgstr "  \\db[x+]  [PATTERN]     список табличних просторів\n"
 
 #: help.c:231
-msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [PATTERN]      вивести перетворення\n"
+msgid "  \\dc[Sx+] [PATTERN]     list conversions\n"
+msgstr "  \\dc[Sx+] [PATTERN]     список перетворень\n"
 
 #: help.c:232
-msgid "  \\dconfig[+] [PATTERN]  list configuration parameters\n"
-msgstr "  \\dconfig[+] [PATTERN]  вивести параметри конфігурації\n"
+msgid "  \\dconfig[x+] [PATTERN] list configuration parameters\n"
+msgstr "  \\dconfig[x+] [PATTERN] список параметрів конфігурації\n"
 
 #: help.c:233
-msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+]  [PATTERN]      вивести приведення типів\n"
+msgid "  \\dC[x+]  [PATTERN]     list casts\n"
+msgstr "  \\dC[x+]  [PATTERN]     список перетворень типів\n"
 
 #: help.c:234
-msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
-msgstr "  \\dd[S]  [PATTERN]      показати опис об'єкта, що не відображається в іншому місці\n"
+msgid "  \\dd[Sx]  [PATTERN]     show object descriptions not displayed elsewhere\n"
+msgstr "  \\dd[Sx]  [PATTERN]     показати описи об'єктів, не показані де інде\n"
 
 #: help.c:235
-msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [PATTERN]      вивести домени\n"
+msgid "  \\dD[Sx+] [PATTERN]     list domains\n"
+msgstr "  \\dD[Sx+] [PATTERN]     список доменів\n"
 
 #: help.c:236
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp    [PATTERN]      вивести привілеї за замовчуванням\n"
+msgid "  \\ddp[x]  [PATTERN]     list default privileges\n"
+msgstr "  \\ddp[x]  [PATTERN]     список прав за замовчуванням\n"
 
 #: help.c:237
-msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [PATTERN]      вивести зовнішні таблиці\n"
+msgid "  \\dE[Sx+] [PATTERN]     list foreign tables\n"
+msgstr "  \\dE[Sx+] [PATTERN]     список сторонніх таблиць\n"
 
 #: help.c:238
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [PATTERN]      вивести зовнішні сервери\n"
+msgid "  \\des[x+] [PATTERN]     list foreign servers\n"
+msgstr "  \\des[x+] [PATTERN]     список сторонніх серверів\n"
 
 #: help.c:239
-msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [PATTERN]      вивести зовнішні таблиці\n"
+msgid "  \\det[x+] [PATTERN]     list foreign tables\n"
+msgstr "  \\det[x+] [PATTERN]     список сторонніх таблиць\n"
 
 #: help.c:240
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [PATTERN]      вивести користувацькі зіставлення\n"
+msgid "  \\deu[x+] [PATTERN]     list user mappings\n"
+msgstr "  \\deu[x+] [PATTERN]     список зіставлень користувачів\n"
 
 #: help.c:241
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [PATTERN]      список джерел сторонніх даних\n"
+msgid "  \\dew[x+] [PATTERN]     list foreign-data wrappers\n"
+msgstr "  \\dew[x+] [PATTERN]     список обгорток сторонніх даних\n"
 
 #: help.c:242
-msgid "  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+msgid "  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
 "                         list [only agg/normal/procedure/trigger/window] functions\n"
-msgstr "  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
-"                         список [лише агрегатних/нормальних/процедурних/тригерних/віконних] функцій\n"
+msgstr "  \\df[anptw][Sx+] [FUNCPTRN [TYPEPTRN ...]]\n"
+"                         список [лише агрегатні/звичайні/процедури/тригерні/віконні] функцій\n"
 
 #: help.c:244
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [PATTERN]      вивести конфігурації текстового пошуку\n"
+msgid "  \\dF[x+]  [PATTERN]     list text search configurations\n"
+msgstr "  \\dF[x+]  [PATTERN]     список конфігурацій текстового пошуку\n"
 
 #: help.c:245
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [PATTERN]      вивести словники текстового пошуку\n"
+msgid "  \\dFd[x+] [PATTERN]     list text search dictionaries\n"
+msgstr "  \\dFd[x+] [PATTERN]     список словників текстового пошуку\n"
 
 #: help.c:246
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [PATTERN]      вивести парсери текстового пошуку\n"
+msgid "  \\dFp[x+] [PATTERN]     list text search parsers\n"
+msgstr "  \\dFp[x+] [PATTERN]     список аналізаторів текстового пошуку\n"
 
 #: help.c:247
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [PATTERN]      вивести шаблони текстового пошуку\n"
+msgid "  \\dFt[x+] [PATTERN]     list text search templates\n"
+msgstr "  \\dFt[x+] [PATTERN]     список шаблонів текстового пошуку\n"
 
 #: help.c:248
-msgid "  \\dg[S+] [PATTERN]      list roles\n"
-msgstr "  \\dg[S+] [PATTERN]      вивести ролі\n"
+msgid "  \\dg[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\dg[Sx+] [PATTERN]     список ролей\n"
 
 #: help.c:249
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [PATTERN]      вивести індекси\n"
+msgid "  \\di[Sx+] [PATTERN]     list indexes\n"
+msgstr "  \\di[Sx+] [PATTERN]     список індексів\n"
 
 #: help.c:250
-msgid "  \\dl[+]                 list large objects, same as \\lo_list\n"
-msgstr "  \\dl[+] вивести великі об'єкти, те саме, що \\lo_list\n"
+msgid "  \\dl[x+]                list large objects, same as \\lo_list\n"
+msgstr "  \\dl[x+]                список великих об'єктів, те саме, що й \\lo_list\n"
 
 #: help.c:251
-msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [PATTERN]      вивести процедурні мови\n"
+msgid "  \\dL[Sx+] [PATTERN]     list procedural languages\n"
+msgstr "  \\dL[Sx+] [PATTERN]     список процедурних мов\n"
 
 #: help.c:252
-msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [PATTERN]      вивести матеріалізовані подання\n"
+msgid "  \\dm[Sx+] [PATTERN]     list materialized views\n"
+msgstr "  \\dm[Sx+] [PATTERN]     список матеріалізованих подань\n"
 
 #: help.c:253
-msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+] [PATTERN]      вивести схеми\n"
+msgid "  \\dn[Sx+] [PATTERN]     list schemas\n"
+msgstr "  \\dn[Sx+] [PATTERN]     список схем\n"
 
 #: help.c:254
-msgid "  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+msgid "  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         list operators\n"
-msgstr "  \\do[S+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+msgstr "  \\do[Sx+] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
 "                         список операторів\n"
 
 #: help.c:256
-msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [PATTERN]      вивести правила сортування\n"
+msgid "  \\dO[Sx+] [PATTERN]     list collations\n"
+msgstr "  \\dO[Sx+] [PATTERN]     список правил сортування\n"
 
 #: help.c:257
-msgid "  \\dp[S]  [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr "  \\dp[S]   [PATTERN]      вивести привілеї доступу до таблиць, подань або послідовностей \n"
+msgid "  \\dp[Sx]  [PATTERN]     list table, view, and sequence access privileges\n"
+msgstr "  \\dp[Sx]  [PATTERN]     список прав доступу до таблиць, подань і послідовностей\n"
 
 #: help.c:258
-msgid "  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"
-msgstr "  \\dP[itn+] [PATTERN]    вивести [тільки індекс/таблицю] секційні відношення [n=вкладені]\n"
+msgid "  \\dP[itnx+] [PATTERN]   list [only index/table] partitioned relations [n=nested]\n"
+msgstr "  \\dP[itnx+] [PATTERN]   список [лише індекси/таблиці] секціонованих відношень [n=вкладені]\n"
 
 #: help.c:259
-msgid "  \\drds [ROLEPTRN [DBPTRN]] list per-database role settings\n"
-msgstr "  \\drds [ROLEPTRN [DBPTRN]] вивести налаштування ролей побазово\n"
-
-#: help.c:260
-msgid "  \\drg[S] [PATTERN]      list role grants\n"
-msgstr "  \\drg[S] [PATTERN]      вивести надані ролі\n"
+msgid "  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         list per-database role settings\n"
+msgstr "  \\drds[x] [ROLEPTRN [DBPTRN]]\n"
+"                         список налаштувань ролі для бази даних\n"
 
 #: help.c:261
-msgid "  \\dRp[+] [PATTERN]      list replication publications\n"
-msgstr "  \\dRp[+] [PATTERN]      вивести реплікаційні публікації\n"
+msgid "  \\drg[Sx] [PATTERN]     list role grants\n"
+msgstr "  \\drg[Sx] [PATTERN]     список надання ролей\n"
 
 #: help.c:262
-msgid "  \\dRs[+] [PATTERN]      list replication subscriptions\n"
-msgstr "  \\dRs[+] [PATTERN]      вивести реплікаційні підписки\n"
+msgid "  \\dRp[x+] [PATTERN]     list replication publications\n"
+msgstr "  \\dRp[x+] [PATTERN]     список публікацій реплікації\n"
 
 #: help.c:263
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [PATTERN]      вивести послідовності\n"
+msgid "  \\dRs[x+] [PATTERN]     list replication subscriptions\n"
+msgstr "  \\dRs[x+] [PATTERN]     список підписок реплікації\n"
 
 #: help.c:264
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [PATTERN]      вивести таблиці\n"
+msgid "  \\ds[Sx+] [PATTERN]     list sequences\n"
+msgstr "  \\ds[Sx+] [PATTERN]     список послідовностей\n"
 
 #: help.c:265
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [PATTERN]      вивести типи даних\n"
+msgid "  \\dt[Sx+] [PATTERN]     list tables\n"
+msgstr "  \\dt[Sx+] [PATTERN]     список таблиць\n"
 
 #: help.c:266
-msgid "  \\du[S+] [PATTERN]      list roles\n"
-msgstr "  \\du[S+] [PATTERN]      вивести ролі\n"
+msgid "  \\dT[Sx+] [PATTERN]     list data types\n"
+msgstr "  \\dT[Sx+] [PATTERN]     список типів даних\n"
 
 #: help.c:267
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [PATTERN]      вивести подання\n"
+msgid "  \\du[Sx+] [PATTERN]     list roles\n"
+msgstr "  \\du[Sx+] [PATTERN]     список ролей\n"
 
 #: help.c:268
-msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+]  [PATTERN]      вивести розширення\n"
+msgid "  \\dv[Sx+] [PATTERN]     list views\n"
+msgstr "  \\dv[Sx+] [PATTERN]     список подань\n"
 
 #: help.c:269
-msgid "  \\dX     [PATTERN]      list extended statistics\n"
-msgstr "  \\dX     [PATTERN]      список розширеної статистики\n"
+msgid "  \\dx[x+]  [PATTERN]     list extensions\n"
+msgstr "  \\dx[x+]  [PATTERN]     список розширень\n"
 
 #: help.c:270
-msgid "  \\dy[+]  [PATTERN]      list event triggers\n"
-msgstr "  \\dy[+]     [PATTERN]      вивести тригери подій\n"
+msgid "  \\dX[x]   [PATTERN]     list extended statistics\n"
+msgstr "  \\dX[x]   [PATTERN]     список розширеної статистики\n"
 
 #: help.c:271
-msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+]   [PATTERN]      вивести бази даних\n"
+msgid "  \\dy[x+]  [PATTERN]     list event triggers\n"
+msgstr "  \\dy[x+]  [PATTERN]     список тригерів подій\n"
 
 #: help.c:272
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  FUNCNAME       відобразити визначення функції\n"
+msgid "  \\l[x+]   [PATTERN]     list databases\n"
+msgstr "  \\l[x+]   [PATTERN]     список баз даних\n"
 
 #: help.c:273
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  VIEWNAME       відобразити визначення подання\n"
+msgid "  \\sf[+]   FUNCNAME      show a function's definition\n"
+msgstr "  \\sf[+]   FUNCNAME      показати визначення функції\n"
 
 #: help.c:274
-msgid "  \\z[S]   [PATTERN]      same as \\dp\n"
-msgstr "  \\z[S]   [PATTERN]      те саме, що \\dp\n"
+msgid "  \\sv[+]   VIEWNAME      show a view's definition\n"
+msgstr "  \\sv[+]   VIEWNAME      показати визначення подання\n"
+
+#: help.c:275
+msgid "  \\z[Sx]   [PATTERN]     same as \\dp\n"
+msgstr "  \\z[Sx]   [PATTERN]     те саме, що й \\dp\n"
 
-#: help.c:277
+#: help.c:278
 msgid "Large Objects\n"
 msgstr "Великі об'єкти\n"
 
-#: help.c:278
+#: help.c:279
 msgid "  \\lo_export LOBOID FILE write large object to file\n"
 msgstr "  \\lo_export LOBOID FILE записати великий об'єкт в файл\n"
 
-#: help.c:279
+#: help.c:280
 msgid "  \\lo_import FILE [COMMENT]\n"
 "                         read large object from file\n"
 msgstr "  \\lo_import FILE [COMMENT]\n"
 "                         читати великий об'єкт з файлу\n"
 
-#: help.c:281
-msgid "  \\lo_list[+]            list large objects\n"
-msgstr "  \\lo_list[+] вивести великі об'єкти\n"
-
 #: help.c:282
+msgid "  \\lo_list[x+]           list large objects\n"
+msgstr "  \\lo_list[x+]           список великих об'єктів\n"
+
+#: help.c:283
 msgid "  \\lo_unlink LOBOID      delete a large object\n"
 msgstr "  \\lo_unlink LOBOID видалити великий об’єкт\n"
 
-#: help.c:285
+#: help.c:286
 msgid "Formatting\n"
 msgstr "Форматування\n"
 
-#: help.c:286
+#: help.c:287
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                     перемикання між режимами виводу: unaligned, aligned\n"
 
-#: help.c:287
+#: help.c:288
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [STRING]           встановити заголовок таблиці або прибрати, якщо не задано\n"
 
-#: help.c:288
+#: help.c:289
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr "  \\f [STRING]            показати або встановити розділювач полів для не вирівняного виводу запиту\n"
 
-#: help.c:289
+#: help.c:290
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     переключити режим виводу HTML (поточний: %s)\n"
 
-#: help.c:291
+#: help.c:292
 msgid "  \\pset [NAME [VALUE]]   set table output option\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
 "                         fieldsep_zero|footer|format|linestyle|null|\n"
 "                         numericlocale|pager|pager_min_lines|recordsep|\n"
 "                         recordsep_zero|tableattr|title|tuples_only|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
-"                         unicode_header_linestyle)\n"
+"                         unicode_header_linestyle|xheader_width)\n"
 msgstr "  \\pset [NAME [VALUE]]   встановити параметр виводу таблиці\n"
 "                         (border|columns|csv_fieldsep|expanded|fieldsep|\n"
 "                         fieldsep_zero|footer|format|linestyle|null|\n"
 "                         numericlocale|pager|pager_min_lines|recordsep|\n"
 "                         recordsep_zero|tableattr|title|tuples_only|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|\n"
-"                         unicode_header_linestyle)\n"
+"                         unicode_header_linestyle|xheader_width)\n"
 
-#: help.c:298
+#: help.c:299
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]          показувати лише рядки (поточно %s)\n"
 
-#: help.c:300
+#: help.c:301
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [STRING]            встановити атрибути для HTML <table> або  прибрати, якщо не задані\n"
 
-#: help.c:301
+#: help.c:302
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off|auto]       переключити розширений вивід (поточний: %s)\n"
 
-#: help.c:302
+#: help.c:303
 msgid "auto"
 msgstr "авто"
 
-#: help.c:305
+#: help.c:306
 msgid "Connection\n"
 msgstr "Підключення\n"
 
-#: help.c:307
+#: help.c:308
 #, c-format
 msgid "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently \"%s\")\n"
 msgstr "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}                          під'єднатися до нової бази даних (поточно \"%s\")\n"
 
-#: help.c:311
+#: help.c:312
 msgid "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
 msgstr "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}                          під'єднатися до нової бази даних (зараз з'єднання відсутнє)\n"
 
-#: help.c:313
+#: help.c:314
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo             показати інформацію про поточне з'єднання\n"
 
-#: help.c:314
+#: help.c:315
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [ENCODING]   показати або встановити кодування клієнта\n"
 
-#: help.c:315
+#: help.c:316
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [USERNAME]  безпечно змінити пароль користувача \n"
 
-#: help.c:318
+#: help.c:319
 msgid "Operating System\n"
 msgstr "Операційна система\n"
 
-#: help.c:319
+#: help.c:320
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]             змінити поточний робочий каталог\n"
 
-#: help.c:320
+#: help.c:321
 msgid "  \\getenv PSQLVAR ENVVAR fetch environment variable\n"
 msgstr "  \\getenv PSQLVAR ENVAR отримати змінну середовища\n"
 
-#: help.c:321
+#: help.c:322
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NAME [VALUE]   встановити або скинути змінну середовища\n"
 
-#: help.c:322
+#: help.c:323
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       переключити таймер команд (поточний: %s)\n"
 
-#: help.c:324
+#: help.c:325
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr "  \\! [COMMAND]           виконати команду в оболонці або запустити інтерактивну оболонку\n"
 
-#: help.c:327
+#: help.c:328
 msgid "Variables\n"
 msgstr "Змінні\n"
 
-#: help.c:328
+#: help.c:329
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [TEXT] NAME    запитати користувача значення внутрішньої змінної\n"
 
-#: help.c:329
+#: help.c:330
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [NAME [VALUE]]    встановити внутрішню змінну або вивести всі, якщо не задані параметри\n"
 
-#: help.c:330
+#: help.c:331
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NAME            скинути (видалити) значення внутрішньої змінної\n"
 
-#: help.c:369
+#: help.c:334
+msgid "Extended Query Protocol\n"
+msgstr "Розширений протокол запитів\n"
+
+#: help.c:335
+msgid "  \\bind [PARAM]...       set query parameters\n"
+msgstr "  \\bind [PARAM]...       встановити параметри запиту\n"
+
+#: help.c:336
+msgid "  \\bind_named STMT_NAME [PARAM]...\n"
+"                         set query parameters for an existing prepared statement\n"
+msgstr "  \\bind_named STMT_NAME [PARAM]...\n"
+"                         встановити параметри запиту для існуючого підготовленого оператора\n"
+
+#: help.c:338
+msgid "  \\close_prepared STMT_NAME\n"
+"                         close an existing prepared statement\n"
+msgstr "  \\close_prepared STMT_NAME\n"
+"                         закрити існуючий підготовлений оператор\n"
+
+#: help.c:340
+msgid "  \\endpipeline           exit pipeline mode\n"
+msgstr "  \\endpipeline           вийти з режиму конвеєра\n"
+
+#: help.c:341
+msgid "  \\flush                 flush output data to the server\n"
+msgstr "  \\flush                 скинути вихідні дані на сервер\n"
+
+#: help.c:342
+msgid "  \\flushrequest          send request to the server to flush its output buffer\n"
+msgstr "  \\flushrequest          надіслати запит серверу на очищення буферу виводу\n"
+
+#: help.c:343
+msgid "  \\getresults [NUM_RES]  read NUM_RES pending results, or all if no argument\n"
+msgstr "  \\getresults [NUM_RES]  прочитати NUM_RES очікуваних результатів або всі, якщо немає аргументів\n"
+
+#: help.c:344
+msgid "  \\parse STMT_NAME       create a prepared statement\n"
+msgstr "  \\parse STMT_NAME       створити підготовлений оператор\n"
+
+#: help.c:345
+msgid "  \\sendpipeline          send an extended query to an ongoing pipeline\n"
+msgstr "  \\sendpipeline          надіслати розширений запит в поточний конвеєр\n"
+
+#: help.c:346
+msgid "  \\startpipeline         enter pipeline mode\n"
+msgstr "  \\startpipeline         увійти в режим конвеєра\n"
+
+#: help.c:347
+msgid "  \\syncpipeline          add a synchronisation point to an ongoing pipeline\n"
+msgstr "  \\syncpipeline          додати точку синхронізації в поточний конвеєр\n"
+
+#: help.c:386
 msgid "List of specially treated variables\n\n"
 msgstr "Список спеціальних змінних\n\n"
 
-#: help.c:371
+#: help.c:388
 msgid "psql variables:\n"
 msgstr "змінні psql:\n"
 
-#: help.c:373
+#: help.c:390
 msgid "  psql --set=NAME=VALUE\n"
 "  or \\set NAME VALUE inside psql\n\n"
 msgstr "  psql --set=ІМ'Я=ЗНАЧЕННЯ\n"
 "  або \\set ІМ'Я ЗНАЧЕННЯ усередині psql\n\n"
 
-#: help.c:375
+#: help.c:392
 msgid "  AUTOCOMMIT\n"
 "    if set, successful SQL commands are automatically committed\n"
 msgstr "  AUTOCOMMIT\n"
 "    якщо встановлений, успішні SQL-команди підтверджуються автоматично\n"
 
-#: help.c:377
+#: help.c:394
 msgid "  COMP_KEYWORD_CASE\n"
 "    determines the case used to complete SQL key words\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
@@ -3270,18 +3540,18 @@ msgstr "  COMP_KEYWORD_CASE\n"
 "    визначає регістр для автодоповнення ключових слів SQL\n"
 "    [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:380
+#: help.c:397
 msgid "  DBNAME\n"
 "    the currently connected database name\n"
 msgstr "  DBNAME     назва під'єднаної бази даних\n"
 
-#: help.c:382
+#: help.c:399
 msgid "  ECHO\n"
 "    controls what input is written to standard output\n"
 "    [all, errors, none, queries]\n"
 msgstr "  ECHO     контролює ввід, що виводиться на стандартний вивід    [all, errors, none, queries]\n"
 
-#: help.c:385
+#: help.c:402
 msgid "  ECHO_HIDDEN\n"
 "    if set, display internal queries executed by backslash commands;\n"
 "    if set to \"noexec\", just show them without execution\n"
@@ -3289,67 +3559,67 @@ msgstr "  ECHO_HIDDEN\n"
 "    якщо ввімкнено, виводить внутрішні запити, виконані за допомогою  \"\\\";\n"
 "    якщо встановлено значення \"noexec\", тільки виводяться, але не виконуються\n"
 
-#: help.c:388
+#: help.c:405
 msgid "  ENCODING\n"
 "    current client character set encoding\n"
 msgstr "  ENCODING\n"
 "    поточне кодування набору символів клієнта\n"
 
-#: help.c:390
+#: help.c:407
 msgid "  ERROR\n"
 "    \"true\" if last query failed, else \"false\"\n"
 msgstr "  ERROR\n"
 "    \"true\", якщо в останньому запиті є помилка, в іншому разі - \"false\"\n"
 
-#: help.c:392
+#: help.c:409
 msgid "  FETCH_COUNT\n"
 "    the number of result rows to fetch and display at a time (0 = unlimited)\n"
 msgstr "  FETCH_COUNT\n"
 "    число рядків з результатами для передачі та відображення за один раз (0 = необмежено)\n"
 
-#: help.c:394
+#: help.c:411
 msgid "  HIDE_TABLEAM\n"
 "    if set, table access methods are not displayed\n"
 msgstr "  HIDE_TABLEAM\n"
 "    якщо вказано, методи доступу до таблиць не відображаються\n"
 
-#: help.c:396
+#: help.c:413
 msgid "  HIDE_TOAST_COMPRESSION\n"
 "    if set, compression methods are not displayed\n"
 msgstr "  HIDE_TOAST_COMPRESSION\n"
 "    якщо встановлено, методи стискання не відображаються\n"
 
-#: help.c:398
+#: help.c:415
 msgid "  HISTCONTROL\n"
 "    controls command history [ignorespace, ignoredups, ignoreboth]\n"
 msgstr "  HISTCONTROL     контролює історію команд [ignorespace, ignoredups, ignoreboth]\n"
 
-#: help.c:400
+#: help.c:417
 msgid "  HISTFILE\n"
 "    file name used to store the command history\n"
 msgstr "  HISTFILE     ім'я файлу для зберігання історії команд\n"
 
-#: help.c:402
+#: help.c:419
 msgid "  HISTSIZE\n"
 "    maximum number of commands to store in the command history\n"
 msgstr "  HISTSIZE     максимальна кількість команд для зберігання в історії команд\n"
 
-#: help.c:404
+#: help.c:421
 msgid "  HOST\n"
 "    the currently connected database server host\n"
 msgstr "  HOST     поточний підключений хост сервера бази даних\n"
 
-#: help.c:406
+#: help.c:423
 msgid "  IGNOREEOF\n"
 "    number of EOFs needed to terminate an interactive session\n"
 msgstr "  IGNOREEOF     кількість EOF для завершення інтерактивної сесії\n"
 
-#: help.c:408
+#: help.c:425
 msgid "  LASTOID\n"
 "    value of the last affected OID\n"
 msgstr "  LASTOID     значення останнього залученого OID\n"
 
-#: help.c:410
+#: help.c:427
 msgid "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
 "    message and SQLSTATE of last error, or empty string and \"00000\" if none\n"
@@ -3357,55 +3627,55 @@ msgstr "  LAST_ERROR_MESSAGE\n"
 "  LAST_ERROR_SQLSTATE\n"
 "    повідомлення та код SQLSTATE останньої помилки, або пустий рядок та \"00000\", якщо помилки не було\n"
 
-#: help.c:413
+#: help.c:430
 msgid "  ON_ERROR_ROLLBACK\n"
 "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
 msgstr "  ON_ERROR_ROLLBACK\n"
 "    якщо встановлено, транзакція не припиняється у разі помилки (використовуються неявні точки збереження)\n"
 
-#: help.c:415
+#: help.c:432
 msgid "  ON_ERROR_STOP\n"
 "    stop batch execution after error\n"
 msgstr "  ON_ERROR_STOP\n"
 "    зупиняти виконання пакету команд після помилки\n"
 
-#: help.c:417
+#: help.c:434
 msgid "  PORT\n"
 "    server port of the current connection\n"
 msgstr "  PORT\n"
 "    порт сервера для поточного з'єднання\n"
 
-#: help.c:419
+#: help.c:436
 msgid "  PROMPT1\n"
 "    specifies the standard psql prompt\n"
 msgstr "  PROMPT1\n"
 "    визначає стандратне запрошення psql \n"
 
-#: help.c:421
+#: help.c:438
 msgid "  PROMPT2\n"
 "    specifies the prompt used when a statement continues from a previous line\n"
 msgstr "  PROMPT2\n"
 "    визначає запрошення, яке використовується при продовженні команди з попереднього рядка\n"
 
-#: help.c:423
+#: help.c:440
 msgid "  PROMPT3\n"
 "    specifies the prompt used during COPY ... FROM STDIN\n"
 msgstr "  PROMPT3\n"
 "    визначає запрошення, яке виконується під час COPY ... FROM STDIN\n"
 
-#: help.c:425
+#: help.c:442
 msgid "  QUIET\n"
 "    run quietly (same as -q option)\n"
 msgstr "  QUIET\n"
 "    тихий запуск ( як із параметром -q)\n"
 
-#: help.c:427
+#: help.c:444
 msgid "  ROW_COUNT\n"
 "    number of rows returned or affected by last query, or 0\n"
 msgstr "  ROW_COUNT\n"
 "    число повернених або оброблених рядків останнім запитом, або 0\n"
 
-#: help.c:429
+#: help.c:446
 msgid "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
 "    server's version (in short string or numeric format)\n"
@@ -3413,61 +3683,61 @@ msgstr "  SERVER_VERSION_NAME\n"
 "  SERVER_VERSION_NUM\n"
 "    версія серевера (у короткому текстовому або числовому форматі)\n"
 
-#: help.c:432
+#: help.c:449
 msgid "  SHELL_ERROR\n"
 "    \"true\" if the last shell command failed, \"false\" if it succeeded\n"
 msgstr "  SHELL_ERROR\n"
 "    \"true\", якщо остання команда оболонки завершилася помилкою, \"false\", якщо успішно\n"
 
-#: help.c:434
+#: help.c:451
 msgid "  SHELL_EXIT_CODE\n"
 "    exit status of the last shell command\n"
 msgstr "  SHEL_EXIT_CODE\n"
 "    статус виконання останньої команди оболонки\n"
 
-#: help.c:436
+#: help.c:453
 msgid "  SHOW_ALL_RESULTS\n"
 "    show all results of a combined query (\\;) instead of only the last\n"
 msgstr "  SHOW_ALL_RESULTS\n"
 "    показати всі результати комбінованого запиту (\\;) замість тільки останнього\n"
 
-#: help.c:438
+#: help.c:455
 msgid "  SHOW_CONTEXT\n"
 "    controls display of message context fields [never, errors, always]\n"
 msgstr "  SHOW_CONTEXT\n"
 "    керує відображенням полів контексту повідомлень [never, errors, always]\n"
 
-#: help.c:440
+#: help.c:457
 msgid "  SINGLELINE\n"
 "    if set, end of line terminates SQL commands (same as -S option)\n"
 msgstr "  SINGLELINE\n"
 "    якщо встановлено, кінець рядка завершує режим вводу SQL-команди (як з параметром -S)\n"
 
-#: help.c:442
+#: help.c:459
 msgid "  SINGLESTEP\n"
 "    single-step mode (same as -s option)\n"
 msgstr "  SINGLESTEP\n"
 "    покроковий режим (як з параметром -s)\n"
 
-#: help.c:444
+#: help.c:461
 msgid "  SQLSTATE\n"
 "    SQLSTATE of last query, or \"00000\" if no error\n"
 msgstr "  SQLSTATE\n"
 "    SQLSTATE останнього запиту, або \"00000\" якщо немає помилок\n"
 
-#: help.c:446
+#: help.c:463
 msgid "  USER\n"
 "    the currently connected database user\n"
 msgstr "  USER\n"
 "    поточний користувач, підключений до бази даних\n"
 
-#: help.c:448
+#: help.c:465
 msgid "  VERBOSITY\n"
 "    controls verbosity of error reports [default, verbose, terse, sqlstate]\n"
 msgstr "  VERBOSITY\n"
 "    контролює докладність звітів про помилку [default, verbose, terse, sqlstate]\n"
 
-#: help.c:450
+#: help.c:467
 msgid "  VERSION\n"
 "  VERSION_NAME\n"
 "  VERSION_NUM\n"
@@ -3477,98 +3747,112 @@ msgstr "  VERSION\n"
 "  VERSION_NUM\n"
 "    psql версія (в розгорнутому, в короткому текстовому або числовому форматі)\n"
 
-#: help.c:455
+#: help.c:471
+#, c-format
+msgid "  WATCH_INTERVAL\n"
+"    number of seconds \\watch waits between executions (default %s)\n"
+msgstr "  WATCH_INTERVAL\n"
+"    кількість секунд, які \\watch чекає між виконаннями (за замовчуванням %s)\n"
+
+#: help.c:475
 msgid "\n"
 "Display settings:\n"
 msgstr "\n"
 "Налаштування відобреження:\n"
 
-#: help.c:457
+#: help.c:477
 msgid "  psql --pset=NAME[=VALUE]\n"
 "  or \\pset NAME [VALUE] inside psql\n\n"
 msgstr "  psql --pset=NAME[=VALUE]\n"
 "  або \\pset ІМ'Я [VALUE] всередині psql\n\n"
 
-#: help.c:459
+#: help.c:479
 msgid "  border\n"
 "    border style (number)\n"
 msgstr "  border\n"
 "    стиль рамки (число)\n"
 
-#: help.c:461
+#: help.c:481
 msgid "  columns\n"
 "    target width for the wrapped format\n"
 msgstr "  columns\n"
 "    цільова ширина для формату з переносом\n"
 
-#: help.c:463
+#: help.c:483
+#, c-format
+msgid "  csv_fieldsep\n"
+"    field separator for CSV output format (default \"%c\")\n"
+msgstr "  csv_fieldsep\n"
+"    роздільник полів для формату CSV (за замовчуванням \"%c\")\n"
+
+#: help.c:486
 msgid "  expanded (or x)\n"
 "    expanded output [on, off, auto]\n"
 msgstr "  expanded (or x)\n"
 "    розширений вивід [on, off, auto]\n"
 
-#: help.c:465
+#: help.c:488
 #, c-format
 msgid "  fieldsep\n"
 "    field separator for unaligned output (default \"%s\")\n"
 msgstr "  fieldsep\n"
 "    розділювач полів для не вирівняного виводу (за замовчуванням \"%s\")\n"
 
-#: help.c:468
+#: help.c:491
 msgid "  fieldsep_zero\n"
 "    set field separator for unaligned output to a zero byte\n"
 msgstr "  fieldsep_zero\n"
 "    встановити розділювач полів для невирівняного виводу на нульовий байт\n"
 
-#: help.c:470
+#: help.c:493
 msgid "  footer\n"
 "    enable or disable display of the table footer [on, off]\n"
 msgstr "  footer\n"
 "    вмикає або вимикає вивід підписів таблиці [on, off]\n"
 
-#: help.c:472
+#: help.c:495
 msgid "  format\n"
 "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 msgstr "  format\n"
 "    встановити формат виводу [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:474
+#: help.c:497
 msgid "  linestyle\n"
 "    set the border line drawing style [ascii, old-ascii, unicode]\n"
 msgstr "  linestyle\n"
 "    встановлює стиль малювання ліній рамки [ascii, old-ascii, unicode]\n"
 
-#: help.c:476
+#: help.c:499
 msgid "  null\n"
 "    set the string to be printed in place of a null value\n"
 msgstr "  null\n"
 "    встановлює рядок, який буде виведено замість значення (null)\n"
 
-#: help.c:478
+#: help.c:501
 msgid "  numericlocale\n"
 "    enable display of a locale-specific character to separate groups of digits\n"
 msgstr "  numericlocale\n"
 "    вмикає виведення заданого локалью роздільника групи цифр\n"
 
-#: help.c:480
+#: help.c:503
 msgid "  pager\n"
 "    control when an external pager is used [yes, no, always]\n"
 msgstr "  pager\n"
 "    контролює використання зовнішнього пейджера  [yes, no, always]\n"
 
-#: help.c:482
+#: help.c:505
 msgid "  recordsep\n"
 "    record (line) separator for unaligned output\n"
 msgstr "  recordsep\n"
 "    розділювач записів (рядків) для не вирівняного виводу\n"
 
-#: help.c:484
+#: help.c:507
 msgid "  recordsep_zero\n"
 "    set record separator for unaligned output to a zero byte\n"
 msgstr "  recordsep_zero\n"
 "    встановлює розділювач записів для невирівняного виводу  на нульовий байт\n"
 
-#: help.c:486
+#: help.c:509
 msgid "  tableattr (or T)\n"
 "    specify attributes for table tag in html format, or proportional\n"
 "    column widths for left-aligned data types in latex-longtable format\n"
@@ -3576,19 +3860,19 @@ msgstr "  tableattr (або T)\n"
 "    вказує атрибути для тегу table у html форматі або пропорційні \n"
 "    ширини стовпців для вирівняних вліво даних, у latex-longtable форматі\n"
 
-#: help.c:489
+#: help.c:512
 msgid "  title\n"
 "    set the table title for subsequently printed tables\n"
 msgstr "  title\n"
 "    задає заголовок таблиці для послідовно друкованих таблиць\n"
 
-#: help.c:491
+#: help.c:514
 msgid "  tuples_only\n"
 "    if set, only actual table data is shown\n"
 msgstr "  tuples_only\n"
 "    якщо встановлено, виводяться лише фактичні табличні дані\n"
 
-#: help.c:493
+#: help.c:516
 msgid "  unicode_border_linestyle\n"
 "  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
@@ -3598,19 +3882,27 @@ msgstr "  unicode_border_linestyle\n"
 "  unicode_header_linestyle\n"
 "    задає стиль мальювання ліній (Unicode) [single, double]\n"
 
-#: help.c:498
+#: help.c:520
+msgid "  xheader_width\n"
+"    set the maximum width of the header for expanded output\n"
+"    [full, column, page, integer value]\n"
+msgstr "  xheader_width\n"
+"    встановити максимальну ширину заголовка для розширеного виводу\n"
+"    [full, column, page, integer value]\n"
+
+#: help.c:524
 msgid "\n"
 "Environment variables:\n"
 msgstr "\n"
 "Змінні оточення:\n"
 
-#: help.c:502
+#: help.c:528
 msgid "  NAME=VALUE [NAME=VALUE] psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n\n"
 msgstr "  ІМ'Я=ЗНАЧЕННЯ [ІМ'Я=ЗНАЧЕННЯ] psql ...\n"
 "  або \\setenv ІМ'Я [VALUE] всередині psql\n\n"
 
-#: help.c:504
+#: help.c:530
 msgid "  set NAME=VALUE\n"
 "  psql ...\n"
 "  or \\setenv NAME [VALUE] inside psql\n\n"
@@ -3618,107 +3910,107 @@ msgstr "  встановлює ІМ'Я=ЗНАЧЕННЯ\n"
 "  psql ...\n"
 "  або \\setenv ІМ'Я [VALUE]  всередині psql\n\n"
 
-#: help.c:507
+#: help.c:533
 msgid "  COLUMNS\n"
 "    number of columns for wrapped format\n"
 msgstr "  COLUMNS\n"
 "    число стовпців для форматування з переносом\n"
 
-#: help.c:509
+#: help.c:535
 msgid "  PGAPPNAME\n"
 "    same as the application_name connection parameter\n"
 msgstr "  PGAPPNAME\n"
 "     те саме, що параметр підключення application_name\n"
 
-#: help.c:511
+#: help.c:537
 msgid "  PGDATABASE\n"
 "    same as the dbname connection parameter\n"
 msgstr "  PGDATABASE\n"
 "    те саме, що параметр підключення dbname\n"
 
-#: help.c:513
+#: help.c:539
 msgid "  PGHOST\n"
 "    same as the host connection parameter\n"
 msgstr "  PGHOST\n"
 "    те саме, що параметр підключення host\n"
 
-#: help.c:515
+#: help.c:541
 msgid "  PGPASSFILE\n"
 "    password file name\n"
 msgstr "  PGPASSFILE\n"
 "    назва файлу з паролем\n"
 
-#: help.c:517
+#: help.c:543
 msgid "  PGPASSWORD\n"
 "    connection password (not recommended)\n"
 msgstr "  PGPASSWORD\n"
 "    пароль для підключення (не рекомендується)\n"
 
-#: help.c:519
+#: help.c:545
 msgid "  PGPORT\n"
 "    same as the port connection parameter\n"
 msgstr "  PGPORT\n"
 "    те саме, що параметр підключення port\n"
 
-#: help.c:521
+#: help.c:547
 msgid "  PGUSER\n"
 "    same as the user connection parameter\n"
 msgstr "  PGUSER\n"
 "    те саме, що параметр підключення user\n"
 
-#: help.c:523
+#: help.c:549
 msgid "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    editor used by the \\e, \\ef, and \\ev commands\n"
 msgstr "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "    редактор для команд \\e, \\ef і \\ev\n"
 
-#: help.c:525
+#: help.c:551
 msgid "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    how to specify a line number when invoking the editor\n"
 msgstr "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "    як вказати номер рядка при виклику редактора\n"
 
-#: help.c:527
+#: help.c:553
 msgid "  PSQL_HISTORY\n"
 "    alternative location for the command history file\n"
 msgstr "  PSQL_HISTORY\n"
 "    альтернативне розміщення файлу з історією команд\n"
 
-#: help.c:529
+#: help.c:555
 msgid "  PSQL_PAGER, PAGER\n"
 "    name of external pager program\n"
 msgstr "  PSQL_PAGER, PAGER\n"
 "    ім'я програми зовнішнього пейджеру\n"
 
-#: help.c:532
+#: help.c:558
 msgid "  PSQL_WATCH_PAGER\n"
 "    name of external pager program used for \\watch\n"
 msgstr "  PSQL_WATCH_PAGER\n"
 "    назва зовнішньої програми-пейджера для використання з \\watch\n"
 
-#: help.c:535
+#: help.c:561
 msgid "  PSQLRC\n"
 "    alternative location for the user's .psqlrc file\n"
 msgstr "  PSQLRC\n"
 "    альтернативне розміщення користувацького файла .psqlrc\n"
 
-#: help.c:537
+#: help.c:563
 msgid "  SHELL\n"
 "    shell used by the \\! command\n"
 msgstr "  SHELL\n"
 "    оболонка, що використовується командою \\!\n"
 
-#: help.c:539
+#: help.c:565
 msgid "  TMPDIR\n"
 "    directory for temporary files\n"
 msgstr "  TMPDIR\n"
 "    каталог для тимчасових файлів\n"
 
-#: help.c:599
+#: help.c:625
 msgid "Available help:\n"
 msgstr "Доступна довідка:\n"
 
-#: help.c:694
+#: help.c:720
 #, c-format
 msgid "Command:     %s\n"
 "Description: %s\n"
@@ -3731,7 +4023,7 @@ msgstr "Команда:     %s\n"
 "%s\n\n"
 "URL: %s\n\n"
 
-#: help.c:717
+#: help.c:743
 #, c-format
 msgid "No help available for \"%s\".\n"
 "Try \\h with no arguments to see available help.\n"
@@ -3831,12 +4123,12 @@ msgstr "запит ігнорується; введіть \\endif або нат
 msgid "reached EOF without finding closing \\endif(s)"
 msgstr "досягнуто кінця файлу без завершального \\endif"
 
-#: psqlscanslash.l:642
+#: psqlscanslash.l:633
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершений рядок в лапках"
 
-#: psqlscanslash.l:842
+#: psqlscanslash.l:834
 #, c-format
 msgid "%s: out of memory"
 msgstr "%s: бракує пам'яті"
@@ -3844,2485 +4136,2506 @@ msgstr "%s: бракує пам'яті"
 #: sql_help.c:35 sql_help.c:38 sql_help.c:41 sql_help.c:65 sql_help.c:66
 #: sql_help.c:68 sql_help.c:70 sql_help.c:81 sql_help.c:83 sql_help.c:85
 #: sql_help.c:113 sql_help.c:119 sql_help.c:121 sql_help.c:123 sql_help.c:125
-#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:240
-#: sql_help.c:242 sql_help.c:243 sql_help.c:245 sql_help.c:247 sql_help.c:250
-#: sql_help.c:252 sql_help.c:254 sql_help.c:256 sql_help.c:268 sql_help.c:269
-#: sql_help.c:270 sql_help.c:272 sql_help.c:321 sql_help.c:323 sql_help.c:325
-#: sql_help.c:327 sql_help.c:396 sql_help.c:401 sql_help.c:403 sql_help.c:445
-#: sql_help.c:447 sql_help.c:450 sql_help.c:452 sql_help.c:521 sql_help.c:526
-#: sql_help.c:531 sql_help.c:536 sql_help.c:541 sql_help.c:595 sql_help.c:597
-#: sql_help.c:599 sql_help.c:601 sql_help.c:603 sql_help.c:606 sql_help.c:608
-#: sql_help.c:611 sql_help.c:622 sql_help.c:624 sql_help.c:668 sql_help.c:670
-#: sql_help.c:672 sql_help.c:675 sql_help.c:677 sql_help.c:679 sql_help.c:720
-#: sql_help.c:724 sql_help.c:728 sql_help.c:749 sql_help.c:752 sql_help.c:755
-#: sql_help.c:784 sql_help.c:796 sql_help.c:804 sql_help.c:807 sql_help.c:810
-#: sql_help.c:825 sql_help.c:828 sql_help.c:857 sql_help.c:862 sql_help.c:867
-#: sql_help.c:872 sql_help.c:877 sql_help.c:904 sql_help.c:906 sql_help.c:908
-#: sql_help.c:910 sql_help.c:913 sql_help.c:915 sql_help.c:962 sql_help.c:1007
-#: sql_help.c:1012 sql_help.c:1017 sql_help.c:1022 sql_help.c:1027
-#: sql_help.c:1046 sql_help.c:1057 sql_help.c:1059 sql_help.c:1079
-#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1092 sql_help.c:1094
-#: sql_help.c:1106 sql_help.c:1110 sql_help.c:1112 sql_help.c:1124
-#: sql_help.c:1126 sql_help.c:1128 sql_help.c:1130 sql_help.c:1149
-#: sql_help.c:1151 sql_help.c:1155 sql_help.c:1159 sql_help.c:1163
-#: sql_help.c:1166 sql_help.c:1167 sql_help.c:1168 sql_help.c:1171
-#: sql_help.c:1174 sql_help.c:1176 sql_help.c:1316 sql_help.c:1318
-#: sql_help.c:1321 sql_help.c:1324 sql_help.c:1326 sql_help.c:1328
-#: sql_help.c:1331 sql_help.c:1334 sql_help.c:1456 sql_help.c:1458
-#: sql_help.c:1460 sql_help.c:1463 sql_help.c:1484 sql_help.c:1487
-#: sql_help.c:1490 sql_help.c:1493 sql_help.c:1497 sql_help.c:1499
-#: sql_help.c:1501 sql_help.c:1503 sql_help.c:1517 sql_help.c:1520
-#: sql_help.c:1522 sql_help.c:1524 sql_help.c:1534 sql_help.c:1536
-#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1558 sql_help.c:1561
-#: sql_help.c:1584 sql_help.c:1586 sql_help.c:1588 sql_help.c:1590
-#: sql_help.c:1593 sql_help.c:1595 sql_help.c:1598 sql_help.c:1601
-#: sql_help.c:1652 sql_help.c:1695 sql_help.c:1698 sql_help.c:1700
-#: sql_help.c:1702 sql_help.c:1705 sql_help.c:1707 sql_help.c:1709
-#: sql_help.c:1712 sql_help.c:1762 sql_help.c:1778 sql_help.c:2011
-#: sql_help.c:2080 sql_help.c:2099 sql_help.c:2112 sql_help.c:2170
-#: sql_help.c:2178 sql_help.c:2188 sql_help.c:2216 sql_help.c:2249
-#: sql_help.c:2267 sql_help.c:2295 sql_help.c:2406 sql_help.c:2452
-#: sql_help.c:2477 sql_help.c:2500 sql_help.c:2504 sql_help.c:2538
-#: sql_help.c:2558 sql_help.c:2580 sql_help.c:2594 sql_help.c:2615
-#: sql_help.c:2644 sql_help.c:2677 sql_help.c:2700 sql_help.c:2747
-#: sql_help.c:3045 sql_help.c:3058 sql_help.c:3075 sql_help.c:3091
-#: sql_help.c:3131 sql_help.c:3185 sql_help.c:3189 sql_help.c:3191
-#: sql_help.c:3198 sql_help.c:3217 sql_help.c:3244 sql_help.c:3279
-#: sql_help.c:3291 sql_help.c:3300 sql_help.c:3344 sql_help.c:3358
-#: sql_help.c:3386 sql_help.c:3394 sql_help.c:3406 sql_help.c:3416
-#: sql_help.c:3424 sql_help.c:3432 sql_help.c:3440 sql_help.c:3448
-#: sql_help.c:3457 sql_help.c:3468 sql_help.c:3476 sql_help.c:3484
-#: sql_help.c:3492 sql_help.c:3500 sql_help.c:3510 sql_help.c:3519
-#: sql_help.c:3528 sql_help.c:3536 sql_help.c:3546 sql_help.c:3557
-#: sql_help.c:3565 sql_help.c:3574 sql_help.c:3585 sql_help.c:3594
-#: sql_help.c:3602 sql_help.c:3610 sql_help.c:3618 sql_help.c:3626
-#: sql_help.c:3634 sql_help.c:3642 sql_help.c:3650 sql_help.c:3658
-#: sql_help.c:3666 sql_help.c:3674 sql_help.c:3691 sql_help.c:3700
-#: sql_help.c:3708 sql_help.c:3725 sql_help.c:3740 sql_help.c:4053
-#: sql_help.c:4174 sql_help.c:4203 sql_help.c:4219 sql_help.c:4221
-#: sql_help.c:4725 sql_help.c:4773 sql_help.c:4932
+#: sql_help.c:126 sql_help.c:129 sql_help.c:131 sql_help.c:133 sql_help.c:259
+#: sql_help.c:261 sql_help.c:262 sql_help.c:264 sql_help.c:266 sql_help.c:269
+#: sql_help.c:271 sql_help.c:273 sql_help.c:275 sql_help.c:290 sql_help.c:291
+#: sql_help.c:292 sql_help.c:294 sql_help.c:343 sql_help.c:345 sql_help.c:347
+#: sql_help.c:349 sql_help.c:418 sql_help.c:423 sql_help.c:425 sql_help.c:467
+#: sql_help.c:469 sql_help.c:472 sql_help.c:474 sql_help.c:543 sql_help.c:548
+#: sql_help.c:553 sql_help.c:558 sql_help.c:563 sql_help.c:617 sql_help.c:619
+#: sql_help.c:621 sql_help.c:623 sql_help.c:625 sql_help.c:628 sql_help.c:630
+#: sql_help.c:633 sql_help.c:644 sql_help.c:646 sql_help.c:690 sql_help.c:692
+#: sql_help.c:694 sql_help.c:697 sql_help.c:699 sql_help.c:701 sql_help.c:742
+#: sql_help.c:746 sql_help.c:750 sql_help.c:771 sql_help.c:774 sql_help.c:777
+#: sql_help.c:806 sql_help.c:818 sql_help.c:826 sql_help.c:829 sql_help.c:832
+#: sql_help.c:847 sql_help.c:850 sql_help.c:879 sql_help.c:884 sql_help.c:889
+#: sql_help.c:894 sql_help.c:899 sql_help.c:935 sql_help.c:937 sql_help.c:939
+#: sql_help.c:941 sql_help.c:944 sql_help.c:946 sql_help.c:998 sql_help.c:1043
+#: sql_help.c:1048 sql_help.c:1053 sql_help.c:1058 sql_help.c:1063
+#: sql_help.c:1082 sql_help.c:1093 sql_help.c:1095 sql_help.c:1116
+#: sql_help.c:1126 sql_help.c:1127 sql_help.c:1129 sql_help.c:1131
+#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1149 sql_help.c:1161
+#: sql_help.c:1163 sql_help.c:1165 sql_help.c:1167 sql_help.c:1186
+#: sql_help.c:1188 sql_help.c:1192 sql_help.c:1196 sql_help.c:1200
+#: sql_help.c:1203 sql_help.c:1204 sql_help.c:1205 sql_help.c:1208
+#: sql_help.c:1211 sql_help.c:1213 sql_help.c:1355 sql_help.c:1357
+#: sql_help.c:1360 sql_help.c:1363 sql_help.c:1365 sql_help.c:1367
+#: sql_help.c:1370 sql_help.c:1373 sql_help.c:1501 sql_help.c:1503
+#: sql_help.c:1505 sql_help.c:1508 sql_help.c:1529 sql_help.c:1532
+#: sql_help.c:1535 sql_help.c:1538 sql_help.c:1542 sql_help.c:1544
+#: sql_help.c:1546 sql_help.c:1548 sql_help.c:1562 sql_help.c:1565
+#: sql_help.c:1567 sql_help.c:1569 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1591 sql_help.c:1593 sql_help.c:1603 sql_help.c:1606
+#: sql_help.c:1629 sql_help.c:1631 sql_help.c:1633 sql_help.c:1635
+#: sql_help.c:1638 sql_help.c:1640 sql_help.c:1643 sql_help.c:1646
+#: sql_help.c:1697 sql_help.c:1740 sql_help.c:1743 sql_help.c:1745
+#: sql_help.c:1747 sql_help.c:1750 sql_help.c:1752 sql_help.c:1754
+#: sql_help.c:1757 sql_help.c:1807 sql_help.c:1823 sql_help.c:2058
+#: sql_help.c:2127 sql_help.c:2146 sql_help.c:2159 sql_help.c:2217
+#: sql_help.c:2225 sql_help.c:2235 sql_help.c:2263 sql_help.c:2296
+#: sql_help.c:2314 sql_help.c:2342 sql_help.c:2465 sql_help.c:2511
+#: sql_help.c:2536 sql_help.c:2559 sql_help.c:2563 sql_help.c:2597
+#: sql_help.c:2617 sql_help.c:2639 sql_help.c:2653 sql_help.c:2674
+#: sql_help.c:2707 sql_help.c:2742 sql_help.c:2765 sql_help.c:2814
+#: sql_help.c:3118 sql_help.c:3131 sql_help.c:3148 sql_help.c:3164
+#: sql_help.c:3204 sql_help.c:3258 sql_help.c:3262 sql_help.c:3264
+#: sql_help.c:3271 sql_help.c:3290 sql_help.c:3317 sql_help.c:3352
+#: sql_help.c:3364 sql_help.c:3373 sql_help.c:3419 sql_help.c:3433
+#: sql_help.c:3461 sql_help.c:3469 sql_help.c:3481 sql_help.c:3491
+#: sql_help.c:3499 sql_help.c:3507 sql_help.c:3515 sql_help.c:3523
+#: sql_help.c:3532 sql_help.c:3543 sql_help.c:3551 sql_help.c:3559
+#: sql_help.c:3567 sql_help.c:3575 sql_help.c:3585 sql_help.c:3594
+#: sql_help.c:3603 sql_help.c:3611 sql_help.c:3621 sql_help.c:3632
+#: sql_help.c:3640 sql_help.c:3649 sql_help.c:3660 sql_help.c:3669
+#: sql_help.c:3677 sql_help.c:3685 sql_help.c:3693 sql_help.c:3701
+#: sql_help.c:3709 sql_help.c:3717 sql_help.c:3725 sql_help.c:3733
+#: sql_help.c:3741 sql_help.c:3749 sql_help.c:3766 sql_help.c:3775
+#: sql_help.c:3783 sql_help.c:3800 sql_help.c:3815 sql_help.c:4130
+#: sql_help.c:4253 sql_help.c:4282 sql_help.c:4298 sql_help.c:4300
+#: sql_help.c:4804 sql_help.c:4852 sql_help.c:5011
 msgid "name"
 msgstr "назва"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:332 sql_help.c:1855
-#: sql_help.c:3359 sql_help.c:4492
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:354 sql_help.c:1900
+#: sql_help.c:3434 sql_help.c:4571
 msgid "aggregate_signature"
 msgstr "сигнатура_агр_функції"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:255
-#: sql_help.c:273 sql_help.c:404 sql_help.c:451 sql_help.c:530 sql_help.c:578
-#: sql_help.c:596 sql_help.c:623 sql_help.c:676 sql_help.c:751 sql_help.c:806
-#: sql_help.c:827 sql_help.c:866 sql_help.c:916 sql_help.c:963 sql_help.c:1016
-#: sql_help.c:1048 sql_help.c:1058 sql_help.c:1093 sql_help.c:1113
-#: sql_help.c:1127 sql_help.c:1177 sql_help.c:1325 sql_help.c:1457
-#: sql_help.c:1500 sql_help.c:1521 sql_help.c:1535 sql_help.c:1547
-#: sql_help.c:1560 sql_help.c:1587 sql_help.c:1653 sql_help.c:1706
+#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:274
+#: sql_help.c:295 sql_help.c:426 sql_help.c:473 sql_help.c:552 sql_help.c:600
+#: sql_help.c:618 sql_help.c:645 sql_help.c:698 sql_help.c:773 sql_help.c:828
+#: sql_help.c:849 sql_help.c:888 sql_help.c:947 sql_help.c:999 sql_help.c:1052
+#: sql_help.c:1084 sql_help.c:1094 sql_help.c:1130 sql_help.c:1150
+#: sql_help.c:1164 sql_help.c:1214 sql_help.c:1364 sql_help.c:1502
+#: sql_help.c:1545 sql_help.c:1566 sql_help.c:1580 sql_help.c:1592
+#: sql_help.c:1605 sql_help.c:1632 sql_help.c:1698 sql_help.c:1751
 msgid "new_name"
 msgstr "нова_назва"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:253
-#: sql_help.c:271 sql_help.c:402 sql_help.c:487 sql_help.c:535 sql_help.c:625
-#: sql_help.c:634 sql_help.c:699 sql_help.c:723 sql_help.c:754 sql_help.c:809
-#: sql_help.c:871 sql_help.c:914 sql_help.c:1021 sql_help.c:1060
-#: sql_help.c:1091 sql_help.c:1111 sql_help.c:1125 sql_help.c:1175
-#: sql_help.c:1391 sql_help.c:1459 sql_help.c:1502 sql_help.c:1523
-#: sql_help.c:1585 sql_help.c:1701 sql_help.c:3031
+#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:272
+#: sql_help.c:293 sql_help.c:424 sql_help.c:509 sql_help.c:557 sql_help.c:647
+#: sql_help.c:656 sql_help.c:721 sql_help.c:745 sql_help.c:776 sql_help.c:831
+#: sql_help.c:893 sql_help.c:945 sql_help.c:1057 sql_help.c:1096
+#: sql_help.c:1128 sql_help.c:1148 sql_help.c:1162 sql_help.c:1212
+#: sql_help.c:1431 sql_help.c:1504 sql_help.c:1547 sql_help.c:1568
+#: sql_help.c:1630 sql_help.c:1746 sql_help.c:3104
 msgid "new_owner"
 msgstr "новий_власник"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:257 sql_help.c:324
-#: sql_help.c:453 sql_help.c:540 sql_help.c:678 sql_help.c:727 sql_help.c:757
-#: sql_help.c:812 sql_help.c:876 sql_help.c:1026 sql_help.c:1095
-#: sql_help.c:1129 sql_help.c:1327 sql_help.c:1504 sql_help.c:1525
-#: sql_help.c:1537 sql_help.c:1549 sql_help.c:1589 sql_help.c:1708
+#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:276 sql_help.c:346
+#: sql_help.c:475 sql_help.c:562 sql_help.c:700 sql_help.c:749 sql_help.c:779
+#: sql_help.c:834 sql_help.c:898 sql_help.c:1062 sql_help.c:1132
+#: sql_help.c:1166 sql_help.c:1366 sql_help.c:1549 sql_help.c:1570
+#: sql_help.c:1582 sql_help.c:1594 sql_help.c:1634 sql_help.c:1753
 msgid "new_schema"
 msgstr "нова_схема"
 
-#: sql_help.c:44 sql_help.c:1919 sql_help.c:3360 sql_help.c:4521
+#: sql_help.c:44 sql_help.c:1964 sql_help.c:3435 sql_help.c:4600
 msgid "where aggregate_signature is:"
 msgstr "де сигнатура_агр_функції:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:342 sql_help.c:355
-#: sql_help.c:359 sql_help.c:375 sql_help.c:378 sql_help.c:381 sql_help.c:522
-#: sql_help.c:527 sql_help.c:532 sql_help.c:537 sql_help.c:542 sql_help.c:858
-#: sql_help.c:863 sql_help.c:868 sql_help.c:873 sql_help.c:878 sql_help.c:1008
-#: sql_help.c:1013 sql_help.c:1018 sql_help.c:1023 sql_help.c:1028
-#: sql_help.c:1873 sql_help.c:1890 sql_help.c:1896 sql_help.c:1920
-#: sql_help.c:1923 sql_help.c:1926 sql_help.c:2081 sql_help.c:2100
-#: sql_help.c:2103 sql_help.c:2407 sql_help.c:2616 sql_help.c:3361
-#: sql_help.c:3364 sql_help.c:3367 sql_help.c:3458 sql_help.c:3547
-#: sql_help.c:3575 sql_help.c:3928 sql_help.c:4391 sql_help.c:4498
-#: sql_help.c:4505 sql_help.c:4511 sql_help.c:4522 sql_help.c:4525
-#: sql_help.c:4528
+#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:364 sql_help.c:377
+#: sql_help.c:381 sql_help.c:397 sql_help.c:400 sql_help.c:403 sql_help.c:544
+#: sql_help.c:549 sql_help.c:554 sql_help.c:559 sql_help.c:564 sql_help.c:880
+#: sql_help.c:885 sql_help.c:890 sql_help.c:895 sql_help.c:900 sql_help.c:1044
+#: sql_help.c:1049 sql_help.c:1054 sql_help.c:1059 sql_help.c:1064
+#: sql_help.c:1918 sql_help.c:1935 sql_help.c:1941 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1971 sql_help.c:2128 sql_help.c:2147
+#: sql_help.c:2150 sql_help.c:2466 sql_help.c:2675 sql_help.c:3436
+#: sql_help.c:3439 sql_help.c:3442 sql_help.c:3533 sql_help.c:3622
+#: sql_help.c:3650 sql_help.c:4003 sql_help.c:4470 sql_help.c:4577
+#: sql_help.c:4584 sql_help.c:4590 sql_help.c:4601 sql_help.c:4604
+#: sql_help.c:4607
 msgid "argmode"
 msgstr "режим_аргументу"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:343 sql_help.c:356
-#: sql_help.c:360 sql_help.c:376 sql_help.c:379 sql_help.c:382 sql_help.c:523
-#: sql_help.c:528 sql_help.c:533 sql_help.c:538 sql_help.c:543 sql_help.c:859
-#: sql_help.c:864 sql_help.c:869 sql_help.c:874 sql_help.c:879 sql_help.c:1009
-#: sql_help.c:1014 sql_help.c:1019 sql_help.c:1024 sql_help.c:1029
-#: sql_help.c:1874 sql_help.c:1891 sql_help.c:1897 sql_help.c:1921
-#: sql_help.c:1924 sql_help.c:1927 sql_help.c:2082 sql_help.c:2101
-#: sql_help.c:2104 sql_help.c:2408 sql_help.c:2617 sql_help.c:3362
-#: sql_help.c:3365 sql_help.c:3368 sql_help.c:3459 sql_help.c:3548
-#: sql_help.c:3576 sql_help.c:4499 sql_help.c:4506 sql_help.c:4512
-#: sql_help.c:4523 sql_help.c:4526 sql_help.c:4529
+#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:365 sql_help.c:378
+#: sql_help.c:382 sql_help.c:398 sql_help.c:401 sql_help.c:404 sql_help.c:545
+#: sql_help.c:550 sql_help.c:555 sql_help.c:560 sql_help.c:565 sql_help.c:881
+#: sql_help.c:886 sql_help.c:891 sql_help.c:896 sql_help.c:901 sql_help.c:1045
+#: sql_help.c:1050 sql_help.c:1055 sql_help.c:1060 sql_help.c:1065
+#: sql_help.c:1919 sql_help.c:1936 sql_help.c:1942 sql_help.c:1966
+#: sql_help.c:1969 sql_help.c:1972 sql_help.c:2129 sql_help.c:2148
+#: sql_help.c:2151 sql_help.c:2467 sql_help.c:2676 sql_help.c:3437
+#: sql_help.c:3440 sql_help.c:3443 sql_help.c:3534 sql_help.c:3623
+#: sql_help.c:3651 sql_help.c:4578 sql_help.c:4585 sql_help.c:4591
+#: sql_help.c:4602 sql_help.c:4605 sql_help.c:4608
 msgid "argname"
 msgstr "ім'я_аргументу"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:344 sql_help.c:357
-#: sql_help.c:361 sql_help.c:377 sql_help.c:380 sql_help.c:383 sql_help.c:524
-#: sql_help.c:529 sql_help.c:534 sql_help.c:539 sql_help.c:544 sql_help.c:860
-#: sql_help.c:865 sql_help.c:870 sql_help.c:875 sql_help.c:880 sql_help.c:1010
-#: sql_help.c:1015 sql_help.c:1020 sql_help.c:1025 sql_help.c:1030
-#: sql_help.c:1875 sql_help.c:1892 sql_help.c:1898 sql_help.c:1922
-#: sql_help.c:1925 sql_help.c:1928 sql_help.c:2409 sql_help.c:2618
-#: sql_help.c:3363 sql_help.c:3366 sql_help.c:3369 sql_help.c:3460
-#: sql_help.c:3549 sql_help.c:3577 sql_help.c:4500 sql_help.c:4507
-#: sql_help.c:4513 sql_help.c:4524 sql_help.c:4527 sql_help.c:4530
+#: sql_help.c:47 sql_help.c:50 sql_help.c:53 sql_help.c:366 sql_help.c:379
+#: sql_help.c:383 sql_help.c:399 sql_help.c:402 sql_help.c:405 sql_help.c:546
+#: sql_help.c:551 sql_help.c:556 sql_help.c:561 sql_help.c:566 sql_help.c:882
+#: sql_help.c:887 sql_help.c:892 sql_help.c:897 sql_help.c:902 sql_help.c:1046
+#: sql_help.c:1051 sql_help.c:1056 sql_help.c:1061 sql_help.c:1066
+#: sql_help.c:1920 sql_help.c:1937 sql_help.c:1943 sql_help.c:1967
+#: sql_help.c:1970 sql_help.c:1973 sql_help.c:2468 sql_help.c:2677
+#: sql_help.c:3438 sql_help.c:3441 sql_help.c:3444 sql_help.c:3535
+#: sql_help.c:3624 sql_help.c:3652 sql_help.c:4579 sql_help.c:4586
+#: sql_help.c:4592 sql_help.c:4603 sql_help.c:4606 sql_help.c:4609
 msgid "argtype"
 msgstr "тип_аргументу"
 
-#: sql_help.c:114 sql_help.c:399 sql_help.c:476 sql_help.c:488 sql_help.c:957
-#: sql_help.c:1108 sql_help.c:1518 sql_help.c:1647 sql_help.c:1679
-#: sql_help.c:1731 sql_help.c:1790 sql_help.c:1979 sql_help.c:1986
-#: sql_help.c:2298 sql_help.c:2348 sql_help.c:2355 sql_help.c:2364
-#: sql_help.c:2453 sql_help.c:2678 sql_help.c:2769 sql_help.c:3060
-#: sql_help.c:3245 sql_help.c:3267 sql_help.c:3407 sql_help.c:3764
-#: sql_help.c:3972 sql_help.c:4218 sql_help.c:4220 sql_help.c:4998
+#: sql_help.c:114 sql_help.c:421 sql_help.c:498 sql_help.c:510 sql_help.c:993
+#: sql_help.c:1145 sql_help.c:1563 sql_help.c:1692 sql_help.c:1724
+#: sql_help.c:1776 sql_help.c:1835 sql_help.c:2025 sql_help.c:2032
+#: sql_help.c:2345 sql_help.c:2403 sql_help.c:2412 sql_help.c:2421
+#: sql_help.c:2512 sql_help.c:2743 sql_help.c:2836 sql_help.c:3133
+#: sql_help.c:3318 sql_help.c:3340 sql_help.c:3482 sql_help.c:3839
+#: sql_help.c:4047 sql_help.c:4297 sql_help.c:4299 sql_help.c:5079
 msgid "option"
 msgstr "параметр"
 
-#: sql_help.c:115 sql_help.c:958 sql_help.c:1648 sql_help.c:2454
-#: sql_help.c:2679 sql_help.c:3246 sql_help.c:3408
+#: sql_help.c:115 sql_help.c:994 sql_help.c:1693 sql_help.c:2513
+#: sql_help.c:2744 sql_help.c:3319 sql_help.c:3483
 msgid "where option can be:"
 msgstr "де параметр може бути:"
 
-#: sql_help.c:116 sql_help.c:2230
+#: sql_help.c:116 sql_help.c:2277
 msgid "allowconn"
 msgstr "дозвол_підкл"
 
-#: sql_help.c:117 sql_help.c:959 sql_help.c:1649 sql_help.c:2231
-#: sql_help.c:2455 sql_help.c:2680 sql_help.c:3247
+#: sql_help.c:117 sql_help.c:995 sql_help.c:1694 sql_help.c:2278
+#: sql_help.c:2514 sql_help.c:2745 sql_help.c:3320
 msgid "connlimit"
 msgstr "ліміт_підключень"
 
-#: sql_help.c:118 sql_help.c:2232
+#: sql_help.c:118 sql_help.c:2279
 msgid "istemplate"
 msgstr "чи_шаблон"
 
-#: sql_help.c:124 sql_help.c:613 sql_help.c:681 sql_help.c:695 sql_help.c:1330
-#: sql_help.c:1384 sql_help.c:4224
+#: sql_help.c:124 sql_help.c:635 sql_help.c:703 sql_help.c:717 sql_help.c:1369
+#: sql_help.c:1424 sql_help.c:4303
 msgid "new_tablespace"
 msgstr "новий_табл_простір"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:550 sql_help.c:552
-#: sql_help.c:553 sql_help.c:883 sql_help.c:885 sql_help.c:886 sql_help.c:966
-#: sql_help.c:970 sql_help.c:973 sql_help.c:1035 sql_help.c:1037
-#: sql_help.c:1038 sql_help.c:1188 sql_help.c:1190 sql_help.c:1656
-#: sql_help.c:1660 sql_help.c:1663 sql_help.c:2419 sql_help.c:2622
-#: sql_help.c:3940 sql_help.c:4242 sql_help.c:4403 sql_help.c:4713
+#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:572 sql_help.c:574
+#: sql_help.c:575 sql_help.c:905 sql_help.c:907 sql_help.c:908 sql_help.c:1002
+#: sql_help.c:1006 sql_help.c:1009 sql_help.c:1071 sql_help.c:1073
+#: sql_help.c:1074 sql_help.c:1225 sql_help.c:1227 sql_help.c:1701
+#: sql_help.c:1705 sql_help.c:1708 sql_help.c:2478 sql_help.c:2681
+#: sql_help.c:4015 sql_help.c:4321 sql_help.c:4482 sql_help.c:4792
 msgid "configuration_parameter"
 msgstr "параметр_конфігурації"
 
-#: sql_help.c:128 sql_help.c:400 sql_help.c:471 sql_help.c:477 sql_help.c:489
-#: sql_help.c:551 sql_help.c:605 sql_help.c:687 sql_help.c:697 sql_help.c:884
-#: sql_help.c:912 sql_help.c:967 sql_help.c:1036 sql_help.c:1109
-#: sql_help.c:1154 sql_help.c:1158 sql_help.c:1162 sql_help.c:1165
-#: sql_help.c:1170 sql_help.c:1173 sql_help.c:1189 sql_help.c:1363
-#: sql_help.c:1386 sql_help.c:1434 sql_help.c:1442 sql_help.c:1462
-#: sql_help.c:1519 sql_help.c:1603 sql_help.c:1657 sql_help.c:1680
-#: sql_help.c:2299 sql_help.c:2349 sql_help.c:2356 sql_help.c:2365
-#: sql_help.c:2420 sql_help.c:2421 sql_help.c:2485 sql_help.c:2488
-#: sql_help.c:2522 sql_help.c:2623 sql_help.c:2624 sql_help.c:2647
-#: sql_help.c:2770 sql_help.c:2809 sql_help.c:2919 sql_help.c:2932
-#: sql_help.c:2946 sql_help.c:2987 sql_help.c:2995 sql_help.c:3017
-#: sql_help.c:3034 sql_help.c:3061 sql_help.c:3268 sql_help.c:3973
-#: sql_help.c:4714 sql_help.c:4715 sql_help.c:4716 sql_help.c:4717
+#: sql_help.c:128 sql_help.c:422 sql_help.c:493 sql_help.c:499 sql_help.c:511
+#: sql_help.c:573 sql_help.c:627 sql_help.c:709 sql_help.c:719 sql_help.c:906
+#: sql_help.c:943 sql_help.c:1003 sql_help.c:1072 sql_help.c:1146
+#: sql_help.c:1191 sql_help.c:1195 sql_help.c:1199 sql_help.c:1202
+#: sql_help.c:1207 sql_help.c:1210 sql_help.c:1226 sql_help.c:1402
+#: sql_help.c:1426 sql_help.c:1479 sql_help.c:1487 sql_help.c:1507
+#: sql_help.c:1564 sql_help.c:1648 sql_help.c:1702 sql_help.c:1725
+#: sql_help.c:2346 sql_help.c:2404 sql_help.c:2413 sql_help.c:2422
+#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2544 sql_help.c:2547
+#: sql_help.c:2581 sql_help.c:2682 sql_help.c:2683 sql_help.c:2710
+#: sql_help.c:2837 sql_help.c:2876 sql_help.c:2987 sql_help.c:3000
+#: sql_help.c:3014 sql_help.c:3060 sql_help.c:3068 sql_help.c:3090
+#: sql_help.c:3107 sql_help.c:3134 sql_help.c:3341 sql_help.c:4048
+#: sql_help.c:4793 sql_help.c:4794 sql_help.c:4795 sql_help.c:4796
 msgid "value"
 msgstr "значення"
 
-#: sql_help.c:202
+#: sql_help.c:214
 msgid "target_role"
 msgstr "цільова_роль"
 
-#: sql_help.c:203 sql_help.c:921 sql_help.c:2283 sql_help.c:2652
-#: sql_help.c:2725 sql_help.c:2730 sql_help.c:3903 sql_help.c:3912
-#: sql_help.c:3931 sql_help.c:3943 sql_help.c:4366 sql_help.c:4375
-#: sql_help.c:4394 sql_help.c:4406
+#: sql_help.c:215 sql_help.c:950 sql_help.c:953 sql_help.c:2330 sql_help.c:2713
+#: sql_help.c:2790 sql_help.c:2795 sql_help.c:3978 sql_help.c:3987
+#: sql_help.c:4006 sql_help.c:4018 sql_help.c:4445 sql_help.c:4454
+#: sql_help.c:4473 sql_help.c:4485
 msgid "schema_name"
 msgstr "ім'я_схеми"
 
-#: sql_help.c:204
+#: sql_help.c:216
 msgid "abbreviated_grant_or_revoke"
 msgstr "скорочено_GRANT_або_REVOKE"
 
-#: sql_help.c:205
+#: sql_help.c:217
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "де скорочено_GRANT_або_REVOKE є одним з:"
 
-#: sql_help.c:206 sql_help.c:207 sql_help.c:208 sql_help.c:209 sql_help.c:210
-#: sql_help.c:211 sql_help.c:212 sql_help.c:213 sql_help.c:214 sql_help.c:215
-#: sql_help.c:576 sql_help.c:612 sql_help.c:680 sql_help.c:830 sql_help.c:977
-#: sql_help.c:1329 sql_help.c:1667 sql_help.c:2458 sql_help.c:2459
-#: sql_help.c:2460 sql_help.c:2461 sql_help.c:2462 sql_help.c:2596
-#: sql_help.c:2683 sql_help.c:2684 sql_help.c:2685 sql_help.c:3250
-#: sql_help.c:3251 sql_help.c:3252 sql_help.c:3253 sql_help.c:3254
-#: sql_help.c:3952 sql_help.c:3956 sql_help.c:4415 sql_help.c:4419
-#: sql_help.c:4735
+#: sql_help.c:218 sql_help.c:219 sql_help.c:220 sql_help.c:221 sql_help.c:222
+#: sql_help.c:223 sql_help.c:224 sql_help.c:225 sql_help.c:226 sql_help.c:227
+#: sql_help.c:228 sql_help.c:229 sql_help.c:598 sql_help.c:634 sql_help.c:702
+#: sql_help.c:852 sql_help.c:1013 sql_help.c:1368 sql_help.c:1712
+#: sql_help.c:2517 sql_help.c:2518 sql_help.c:2519 sql_help.c:2520
+#: sql_help.c:2521 sql_help.c:2655 sql_help.c:2748 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:3323 sql_help.c:3324 sql_help.c:3325
+#: sql_help.c:3326 sql_help.c:3327 sql_help.c:4027 sql_help.c:4031
+#: sql_help.c:4494 sql_help.c:4498 sql_help.c:4814
 msgid "role_name"
 msgstr "ім'я_ролі"
 
-#: sql_help.c:241 sql_help.c:464 sql_help.c:920 sql_help.c:1345 sql_help.c:1347
-#: sql_help.c:1351 sql_help.c:1401 sql_help.c:1413 sql_help.c:1438
-#: sql_help.c:1697 sql_help.c:2252 sql_help.c:2256 sql_help.c:2368
-#: sql_help.c:2373 sql_help.c:2481 sql_help.c:2651 sql_help.c:2786
-#: sql_help.c:2791 sql_help.c:2793 sql_help.c:2914 sql_help.c:2927
-#: sql_help.c:2941 sql_help.c:2950 sql_help.c:2962 sql_help.c:2991
-#: sql_help.c:4004 sql_help.c:4019 sql_help.c:4021 sql_help.c:4117
-#: sql_help.c:4120 sql_help.c:4122 sql_help.c:4585 sql_help.c:4586
-#: sql_help.c:4595 sql_help.c:4642 sql_help.c:4643 sql_help.c:4644
-#: sql_help.c:4645 sql_help.c:4646 sql_help.c:4647 sql_help.c:4688
-#: sql_help.c:4689 sql_help.c:4694 sql_help.c:4699 sql_help.c:4843
-#: sql_help.c:4844 sql_help.c:4853 sql_help.c:4900 sql_help.c:4901
-#: sql_help.c:4902 sql_help.c:4903 sql_help.c:4904 sql_help.c:4905
-#: sql_help.c:4960 sql_help.c:4962 sql_help.c:5028 sql_help.c:5088
-#: sql_help.c:5089 sql_help.c:5098 sql_help.c:5145 sql_help.c:5146
-#: sql_help.c:5147 sql_help.c:5148 sql_help.c:5149 sql_help.c:5150
+#: sql_help.c:260 sql_help.c:279 sql_help.c:486 sql_help.c:957 sql_help.c:1384
+#: sql_help.c:1386 sql_help.c:1390 sql_help.c:1441 sql_help.c:1453
+#: sql_help.c:1483 sql_help.c:1742 sql_help.c:2299 sql_help.c:2303
+#: sql_help.c:2425 sql_help.c:2431 sql_help.c:2540 sql_help.c:2717
+#: sql_help.c:2853 sql_help.c:2858 sql_help.c:2860 sql_help.c:2982
+#: sql_help.c:2995 sql_help.c:3009 sql_help.c:3018 sql_help.c:3030
+#: sql_help.c:3064 sql_help.c:4080 sql_help.c:4096 sql_help.c:4098
+#: sql_help.c:4196 sql_help.c:4199 sql_help.c:4201 sql_help.c:4664
+#: sql_help.c:4665 sql_help.c:4674 sql_help.c:4721 sql_help.c:4722
+#: sql_help.c:4723 sql_help.c:4724 sql_help.c:4725 sql_help.c:4726
+#: sql_help.c:4767 sql_help.c:4768 sql_help.c:4773 sql_help.c:4778
+#: sql_help.c:4922 sql_help.c:4923 sql_help.c:4932 sql_help.c:4979
+#: sql_help.c:4980 sql_help.c:4981 sql_help.c:4982 sql_help.c:4983
+#: sql_help.c:4984 sql_help.c:5040 sql_help.c:5042 sql_help.c:5109
+#: sql_help.c:5169 sql_help.c:5170 sql_help.c:5179 sql_help.c:5226
+#: sql_help.c:5227 sql_help.c:5228 sql_help.c:5229 sql_help.c:5230
+#: sql_help.c:5231
 msgid "expression"
 msgstr "вираз"
 
-#: sql_help.c:244 sql_help.c:2253
+#: sql_help.c:263 sql_help.c:2300
 msgid "domain_constraint"
 msgstr "обмеження_домену"
 
-#: sql_help.c:246 sql_help.c:248 sql_help.c:251 sql_help.c:479 sql_help.c:480
-#: sql_help.c:1322 sql_help.c:1371 sql_help.c:1372 sql_help.c:1373
-#: sql_help.c:1400 sql_help.c:1412 sql_help.c:1429 sql_help.c:1861
-#: sql_help.c:1863 sql_help.c:2255 sql_help.c:2367 sql_help.c:2372
-#: sql_help.c:2949 sql_help.c:2961 sql_help.c:4016
+#: sql_help.c:265 sql_help.c:267 sql_help.c:270 sql_help.c:278 sql_help.c:501
+#: sql_help.c:502 sql_help.c:1361 sql_help.c:1410 sql_help.c:1411
+#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1440 sql_help.c:1452
+#: sql_help.c:1474 sql_help.c:1906 sql_help.c:1908 sql_help.c:2302
+#: sql_help.c:2424 sql_help.c:2429 sql_help.c:3017 sql_help.c:3029
+#: sql_help.c:4093
 msgid "constraint_name"
 msgstr "ім'я_обмеження"
 
-#: sql_help.c:249 sql_help.c:1323
+#: sql_help.c:268 sql_help.c:1362
 msgid "new_constraint_name"
 msgstr "ім'я_нового_обмеження"
 
-#: sql_help.c:322 sql_help.c:1107
+#: sql_help.c:277 sql_help.c:2301
+msgid "where domain_constraint is:"
+msgstr "де обмеження_домену:"
+
+#: sql_help.c:344 sql_help.c:1144
 msgid "new_version"
 msgstr "нова_версія"
 
-#: sql_help.c:326 sql_help.c:328
+#: sql_help.c:348 sql_help.c:350
 msgid "member_object"
 msgstr "елемент_об'єкт"
 
-#: sql_help.c:329
+#: sql_help.c:351
 msgid "where member_object is:"
 msgstr "де елемент_об'єкт є:"
 
-#: sql_help.c:330 sql_help.c:335 sql_help.c:336 sql_help.c:337 sql_help.c:338
-#: sql_help.c:339 sql_help.c:340 sql_help.c:345 sql_help.c:349 sql_help.c:351
-#: sql_help.c:353 sql_help.c:362 sql_help.c:363 sql_help.c:364 sql_help.c:365
-#: sql_help.c:366 sql_help.c:367 sql_help.c:368 sql_help.c:369 sql_help.c:372
-#: sql_help.c:373 sql_help.c:1853 sql_help.c:1858 sql_help.c:1865
-#: sql_help.c:1866 sql_help.c:1867 sql_help.c:1868 sql_help.c:1869
-#: sql_help.c:1870 sql_help.c:1871 sql_help.c:1876 sql_help.c:1878
-#: sql_help.c:1882 sql_help.c:1884 sql_help.c:1888 sql_help.c:1893
-#: sql_help.c:1894 sql_help.c:1901 sql_help.c:1902 sql_help.c:1903
-#: sql_help.c:1904 sql_help.c:1905 sql_help.c:1906 sql_help.c:1907
-#: sql_help.c:1908 sql_help.c:1909 sql_help.c:1910 sql_help.c:1911
-#: sql_help.c:1916 sql_help.c:1917 sql_help.c:4488 sql_help.c:4493
-#: sql_help.c:4494 sql_help.c:4495 sql_help.c:4496 sql_help.c:4502
-#: sql_help.c:4503 sql_help.c:4508 sql_help.c:4509 sql_help.c:4514
-#: sql_help.c:4515 sql_help.c:4516 sql_help.c:4517 sql_help.c:4518
-#: sql_help.c:4519
+#: sql_help.c:352 sql_help.c:357 sql_help.c:358 sql_help.c:359 sql_help.c:360
+#: sql_help.c:361 sql_help.c:362 sql_help.c:367 sql_help.c:371 sql_help.c:373
+#: sql_help.c:375 sql_help.c:384 sql_help.c:385 sql_help.c:386 sql_help.c:387
+#: sql_help.c:388 sql_help.c:389 sql_help.c:390 sql_help.c:391 sql_help.c:394
+#: sql_help.c:395 sql_help.c:1898 sql_help.c:1903 sql_help.c:1910
+#: sql_help.c:1911 sql_help.c:1912 sql_help.c:1913 sql_help.c:1914
+#: sql_help.c:1915 sql_help.c:1916 sql_help.c:1921 sql_help.c:1923
+#: sql_help.c:1927 sql_help.c:1929 sql_help.c:1933 sql_help.c:1938
+#: sql_help.c:1939 sql_help.c:1946 sql_help.c:1947 sql_help.c:1948
+#: sql_help.c:1949 sql_help.c:1950 sql_help.c:1951 sql_help.c:1952
+#: sql_help.c:1953 sql_help.c:1954 sql_help.c:1955 sql_help.c:1956
+#: sql_help.c:1961 sql_help.c:1962 sql_help.c:4567 sql_help.c:4572
+#: sql_help.c:4573 sql_help.c:4574 sql_help.c:4575 sql_help.c:4581
+#: sql_help.c:4582 sql_help.c:4587 sql_help.c:4588 sql_help.c:4593
+#: sql_help.c:4594 sql_help.c:4595 sql_help.c:4596 sql_help.c:4597
+#: sql_help.c:4598
 msgid "object_name"
 msgstr "ім'я_об'єкту"
 
-#: sql_help.c:331 sql_help.c:1854 sql_help.c:4491
+#: sql_help.c:353 sql_help.c:1899 sql_help.c:4570
 msgid "aggregate_name"
 msgstr "ім'я_агр_функції"
 
-#: sql_help.c:333 sql_help.c:1856 sql_help.c:2146 sql_help.c:2150
-#: sql_help.c:2152 sql_help.c:3377
+#: sql_help.c:355 sql_help.c:1901 sql_help.c:2193 sql_help.c:2197
+#: sql_help.c:2199 sql_help.c:3452
 msgid "source_type"
 msgstr "початковий_тип"
 
-#: sql_help.c:334 sql_help.c:1857 sql_help.c:2147 sql_help.c:2151
-#: sql_help.c:2153 sql_help.c:3378
+#: sql_help.c:356 sql_help.c:1902 sql_help.c:2194 sql_help.c:2198
+#: sql_help.c:2200 sql_help.c:3453
 msgid "target_type"
 msgstr "тип_цілі"
 
-#: sql_help.c:341 sql_help.c:794 sql_help.c:1872 sql_help.c:2148
-#: sql_help.c:2191 sql_help.c:2271 sql_help.c:2539 sql_help.c:2570
-#: sql_help.c:3137 sql_help.c:4390 sql_help.c:4497 sql_help.c:4614
-#: sql_help.c:4618 sql_help.c:4622 sql_help.c:4625 sql_help.c:4872
-#: sql_help.c:4876 sql_help.c:4880 sql_help.c:4883 sql_help.c:5117
-#: sql_help.c:5121 sql_help.c:5125 sql_help.c:5128
+#: sql_help.c:363 sql_help.c:816 sql_help.c:1917 sql_help.c:2195
+#: sql_help.c:2238 sql_help.c:2318 sql_help.c:2598 sql_help.c:2629
+#: sql_help.c:3210 sql_help.c:4469 sql_help.c:4576 sql_help.c:4693
+#: sql_help.c:4697 sql_help.c:4701 sql_help.c:4704 sql_help.c:4951
+#: sql_help.c:4955 sql_help.c:4959 sql_help.c:4962 sql_help.c:5198
+#: sql_help.c:5202 sql_help.c:5206 sql_help.c:5209
 msgid "function_name"
 msgstr "ім'я_функції"
 
-#: sql_help.c:346 sql_help.c:787 sql_help.c:1879 sql_help.c:2563
+#: sql_help.c:368 sql_help.c:809 sql_help.c:1924 sql_help.c:2622
 msgid "operator_name"
 msgstr "ім'я_оператора"
 
-#: sql_help.c:347 sql_help.c:721 sql_help.c:725 sql_help.c:729 sql_help.c:1880
-#: sql_help.c:2540 sql_help.c:3501
+#: sql_help.c:369 sql_help.c:743 sql_help.c:747 sql_help.c:751 sql_help.c:1925
+#: sql_help.c:2599 sql_help.c:3576
 msgid "left_type"
 msgstr "тип_ліворуч"
 
-#: sql_help.c:348 sql_help.c:722 sql_help.c:726 sql_help.c:730 sql_help.c:1881
-#: sql_help.c:2541 sql_help.c:3502
+#: sql_help.c:370 sql_help.c:744 sql_help.c:748 sql_help.c:752 sql_help.c:1926
+#: sql_help.c:2600 sql_help.c:3577
 msgid "right_type"
 msgstr "тип_праворуч"
 
-#: sql_help.c:350 sql_help.c:352 sql_help.c:750 sql_help.c:753 sql_help.c:756
-#: sql_help.c:785 sql_help.c:797 sql_help.c:805 sql_help.c:808 sql_help.c:811
-#: sql_help.c:1418 sql_help.c:1883 sql_help.c:1885 sql_help.c:2560
-#: sql_help.c:2581 sql_help.c:2967 sql_help.c:3511 sql_help.c:3520
+#: sql_help.c:372 sql_help.c:374 sql_help.c:772 sql_help.c:775 sql_help.c:778
+#: sql_help.c:807 sql_help.c:819 sql_help.c:827 sql_help.c:830 sql_help.c:833
+#: sql_help.c:1461 sql_help.c:1928 sql_help.c:1930 sql_help.c:2619
+#: sql_help.c:2640 sql_help.c:3038 sql_help.c:3586 sql_help.c:3595
 msgid "index_method"
 msgstr "метод_індексу"
 
-#: sql_help.c:354 sql_help.c:1889 sql_help.c:4504
+#: sql_help.c:376 sql_help.c:1934 sql_help.c:4583
 msgid "procedure_name"
 msgstr "назва_процедури"
 
-#: sql_help.c:358 sql_help.c:1895 sql_help.c:3927 sql_help.c:4510
+#: sql_help.c:380 sql_help.c:1940 sql_help.c:4002 sql_help.c:4589
 msgid "routine_name"
 msgstr "ім'я_підпрограми"
 
-#: sql_help.c:370 sql_help.c:1390 sql_help.c:1912 sql_help.c:2415
-#: sql_help.c:2621 sql_help.c:2922 sql_help.c:3104 sql_help.c:3682
-#: sql_help.c:3949 sql_help.c:4412
+#: sql_help.c:392 sql_help.c:1430 sql_help.c:1957 sql_help.c:2474
+#: sql_help.c:2680 sql_help.c:2990 sql_help.c:3177 sql_help.c:3757
+#: sql_help.c:4024 sql_help.c:4491
 msgid "type_name"
 msgstr "назва_типу"
 
-#: sql_help.c:371 sql_help.c:1913 sql_help.c:2414 sql_help.c:2620
-#: sql_help.c:3105 sql_help.c:3335 sql_help.c:3683 sql_help.c:3934
-#: sql_help.c:4397
+#: sql_help.c:393 sql_help.c:1958 sql_help.c:2473 sql_help.c:2679
+#: sql_help.c:3178 sql_help.c:3410 sql_help.c:3758 sql_help.c:4009
+#: sql_help.c:4476
 msgid "lang_name"
 msgstr "назва_мови"
 
-#: sql_help.c:374
+#: sql_help.c:396
 msgid "and aggregate_signature is:"
 msgstr "і сигнатура_агр_функції:"
 
-#: sql_help.c:397 sql_help.c:2013 sql_help.c:2296
+#: sql_help.c:419 sql_help.c:2060 sql_help.c:2343
 msgid "handler_function"
 msgstr "функція_обробник"
 
-#: sql_help.c:398 sql_help.c:2297
+#: sql_help.c:420 sql_help.c:2344
 msgid "validator_function"
 msgstr "функція_перевірки"
 
-#: sql_help.c:446 sql_help.c:525 sql_help.c:669 sql_help.c:861 sql_help.c:1011
-#: sql_help.c:1317 sql_help.c:1594
+#: sql_help.c:468 sql_help.c:547 sql_help.c:691 sql_help.c:883 sql_help.c:1047
+#: sql_help.c:1356 sql_help.c:1639
 msgid "action"
 msgstr "дія"
 
-#: sql_help.c:448 sql_help.c:455 sql_help.c:459 sql_help.c:460 sql_help.c:463
-#: sql_help.c:465 sql_help.c:466 sql_help.c:467 sql_help.c:469 sql_help.c:472
-#: sql_help.c:474 sql_help.c:475 sql_help.c:673 sql_help.c:683 sql_help.c:685
-#: sql_help.c:688 sql_help.c:690 sql_help.c:691 sql_help.c:919 sql_help.c:1088
-#: sql_help.c:1319 sql_help.c:1337 sql_help.c:1341 sql_help.c:1342
-#: sql_help.c:1346 sql_help.c:1348 sql_help.c:1349 sql_help.c:1350
-#: sql_help.c:1352 sql_help.c:1353 sql_help.c:1355 sql_help.c:1358
-#: sql_help.c:1359 sql_help.c:1361 sql_help.c:1364 sql_help.c:1366
-#: sql_help.c:1367 sql_help.c:1414 sql_help.c:1416 sql_help.c:1423
-#: sql_help.c:1432 sql_help.c:1437 sql_help.c:1444 sql_help.c:1445
-#: sql_help.c:1696 sql_help.c:1699 sql_help.c:1703 sql_help.c:1739
-#: sql_help.c:1860 sql_help.c:1976 sql_help.c:1982 sql_help.c:1996
-#: sql_help.c:1997 sql_help.c:1998 sql_help.c:2346 sql_help.c:2359
-#: sql_help.c:2412 sql_help.c:2480 sql_help.c:2486 sql_help.c:2519
-#: sql_help.c:2650 sql_help.c:2755 sql_help.c:2790 sql_help.c:2792
-#: sql_help.c:2904 sql_help.c:2913 sql_help.c:2923 sql_help.c:2926
-#: sql_help.c:2936 sql_help.c:2940 sql_help.c:2963 sql_help.c:2965
-#: sql_help.c:2972 sql_help.c:2985 sql_help.c:2990 sql_help.c:2997
-#: sql_help.c:2998 sql_help.c:3014 sql_help.c:3140 sql_help.c:3280
-#: sql_help.c:3906 sql_help.c:3907 sql_help.c:4003 sql_help.c:4018
-#: sql_help.c:4020 sql_help.c:4022 sql_help.c:4116 sql_help.c:4119
-#: sql_help.c:4121 sql_help.c:4123 sql_help.c:4369 sql_help.c:4370
-#: sql_help.c:4490 sql_help.c:4651 sql_help.c:4658 sql_help.c:4660
-#: sql_help.c:4909 sql_help.c:4916 sql_help.c:4918 sql_help.c:4959
-#: sql_help.c:4961 sql_help.c:4963 sql_help.c:5016 sql_help.c:5154
-#: sql_help.c:5161 sql_help.c:5163
+#: sql_help.c:470 sql_help.c:477 sql_help.c:481 sql_help.c:482 sql_help.c:485
+#: sql_help.c:487 sql_help.c:488 sql_help.c:489 sql_help.c:491 sql_help.c:494
+#: sql_help.c:496 sql_help.c:497 sql_help.c:695 sql_help.c:705 sql_help.c:707
+#: sql_help.c:710 sql_help.c:712 sql_help.c:713 sql_help.c:956 sql_help.c:1125
+#: sql_help.c:1358 sql_help.c:1376 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1385 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
+#: sql_help.c:1391 sql_help.c:1392 sql_help.c:1394 sql_help.c:1397
+#: sql_help.c:1398 sql_help.c:1400 sql_help.c:1403 sql_help.c:1405
+#: sql_help.c:1406 sql_help.c:1454 sql_help.c:1455 sql_help.c:1456
+#: sql_help.c:1458 sql_help.c:1459 sql_help.c:1466 sql_help.c:1467
+#: sql_help.c:1477 sql_help.c:1482 sql_help.c:1489 sql_help.c:1490
+#: sql_help.c:1741 sql_help.c:1744 sql_help.c:1748 sql_help.c:1784
+#: sql_help.c:1905 sql_help.c:2022 sql_help.c:2028 sql_help.c:2042
+#: sql_help.c:2043 sql_help.c:2044 sql_help.c:2401 sql_help.c:2416
+#: sql_help.c:2430 sql_help.c:2471 sql_help.c:2539 sql_help.c:2545
+#: sql_help.c:2578 sql_help.c:2716 sql_help.c:2822 sql_help.c:2857
+#: sql_help.c:2859 sql_help.c:2972 sql_help.c:2981 sql_help.c:2991
+#: sql_help.c:2994 sql_help.c:3004 sql_help.c:3008 sql_help.c:3031
+#: sql_help.c:3032 sql_help.c:3033 sql_help.c:3035 sql_help.c:3036
+#: sql_help.c:3043 sql_help.c:3044 sql_help.c:3058 sql_help.c:3063
+#: sql_help.c:3070 sql_help.c:3071 sql_help.c:3087 sql_help.c:3213
+#: sql_help.c:3353 sql_help.c:3981 sql_help.c:3982 sql_help.c:4079
+#: sql_help.c:4095 sql_help.c:4097 sql_help.c:4099 sql_help.c:4195
+#: sql_help.c:4198 sql_help.c:4200 sql_help.c:4202 sql_help.c:4448
+#: sql_help.c:4449 sql_help.c:4569 sql_help.c:4730 sql_help.c:4737
+#: sql_help.c:4739 sql_help.c:4988 sql_help.c:4995 sql_help.c:4997
+#: sql_help.c:5039 sql_help.c:5041 sql_help.c:5043 sql_help.c:5097
+#: sql_help.c:5235 sql_help.c:5242 sql_help.c:5244
 msgid "column_name"
 msgstr "назва_стовпця"
 
-#: sql_help.c:449 sql_help.c:674 sql_help.c:1320 sql_help.c:1704
+#: sql_help.c:471 sql_help.c:696 sql_help.c:1359 sql_help.c:1749
 msgid "new_column_name"
 msgstr "нова_назва_стовпця"
 
-#: sql_help.c:454 sql_help.c:546 sql_help.c:682 sql_help.c:882 sql_help.c:1032
-#: sql_help.c:1336 sql_help.c:1604
+#: sql_help.c:476 sql_help.c:568 sql_help.c:704 sql_help.c:904 sql_help.c:1068
+#: sql_help.c:1375 sql_help.c:1649
 msgid "where action is one of:"
 msgstr "де допустима дія:"
 
-#: sql_help.c:456 sql_help.c:461 sql_help.c:1080 sql_help.c:1338
-#: sql_help.c:1343 sql_help.c:1606 sql_help.c:1610 sql_help.c:2250
-#: sql_help.c:2347 sql_help.c:2559 sql_help.c:2748 sql_help.c:2905
-#: sql_help.c:3187 sql_help.c:4175
+#: sql_help.c:478 sql_help.c:483 sql_help.c:1117 sql_help.c:1377
+#: sql_help.c:1382 sql_help.c:1651 sql_help.c:1655 sql_help.c:2297
+#: sql_help.c:2402 sql_help.c:2618 sql_help.c:2815 sql_help.c:2973
+#: sql_help.c:3260 sql_help.c:4254
 msgid "data_type"
 msgstr "тип_даних"
 
-#: sql_help.c:457 sql_help.c:462 sql_help.c:1339 sql_help.c:1344
-#: sql_help.c:1439 sql_help.c:1607 sql_help.c:1611 sql_help.c:2251
-#: sql_help.c:2350 sql_help.c:2482 sql_help.c:2907 sql_help.c:2915
-#: sql_help.c:2928 sql_help.c:2942 sql_help.c:2992 sql_help.c:3188
-#: sql_help.c:3194 sql_help.c:4013
+#: sql_help.c:479 sql_help.c:484 sql_help.c:1378 sql_help.c:1383
+#: sql_help.c:1484 sql_help.c:1652 sql_help.c:1656 sql_help.c:2298
+#: sql_help.c:2405 sql_help.c:2541 sql_help.c:2975 sql_help.c:2983
+#: sql_help.c:2996 sql_help.c:3010 sql_help.c:3065 sql_help.c:3261
+#: sql_help.c:3267 sql_help.c:4090
 msgid "collation"
 msgstr "правила_сортування"
 
-#: sql_help.c:458 sql_help.c:1340 sql_help.c:2351 sql_help.c:2360
-#: sql_help.c:2908 sql_help.c:2924 sql_help.c:2937
+#: sql_help.c:480 sql_help.c:1379 sql_help.c:2406 sql_help.c:2417
+#: sql_help.c:2976 sql_help.c:2992 sql_help.c:3005
 msgid "column_constraint"
 msgstr "обмеження_стовпця"
 
-#: sql_help.c:468 sql_help.c:610 sql_help.c:684 sql_help.c:1360 sql_help.c:5010
+#: sql_help.c:490 sql_help.c:632 sql_help.c:706 sql_help.c:1399 sql_help.c:5091
 msgid "integer"
 msgstr "ціле"
 
-#: sql_help.c:470 sql_help.c:473 sql_help.c:686 sql_help.c:689 sql_help.c:1362
-#: sql_help.c:1365
+#: sql_help.c:492 sql_help.c:495 sql_help.c:708 sql_help.c:711 sql_help.c:1401
+#: sql_help.c:1404
 msgid "attribute_option"
 msgstr "параметр_атрибуту"
 
-#: sql_help.c:478 sql_help.c:1369 sql_help.c:2352 sql_help.c:2361
-#: sql_help.c:2909 sql_help.c:2925 sql_help.c:2938
+#: sql_help.c:500 sql_help.c:1408 sql_help.c:2407 sql_help.c:2418
+#: sql_help.c:2977 sql_help.c:2993 sql_help.c:3006
 msgid "table_constraint"
 msgstr "обмеження_таблиці"
 
-#: sql_help.c:481 sql_help.c:482 sql_help.c:483 sql_help.c:484 sql_help.c:1374
-#: sql_help.c:1375 sql_help.c:1376 sql_help.c:1377 sql_help.c:1914
+#: sql_help.c:503 sql_help.c:504 sql_help.c:505 sql_help.c:506 sql_help.c:1414
+#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1959
 msgid "trigger_name"
 msgstr "ім'я_тригеру"
 
-#: sql_help.c:485 sql_help.c:486 sql_help.c:1388 sql_help.c:1389
-#: sql_help.c:2353 sql_help.c:2358 sql_help.c:2912 sql_help.c:2935
+#: sql_help.c:507 sql_help.c:508 sql_help.c:1428 sql_help.c:1429
+#: sql_help.c:2410 sql_help.c:2415 sql_help.c:2980 sql_help.c:3003
 msgid "parent_table"
 msgstr "батьківська_таблиця"
 
-#: sql_help.c:545 sql_help.c:602 sql_help.c:671 sql_help.c:881 sql_help.c:1031
-#: sql_help.c:1563 sql_help.c:2282
+#: sql_help.c:567 sql_help.c:624 sql_help.c:693 sql_help.c:903 sql_help.c:1067
+#: sql_help.c:1608 sql_help.c:2329
 msgid "extension_name"
 msgstr "ім'я_розширення"
 
-#: sql_help.c:547 sql_help.c:1033 sql_help.c:2416
+#: sql_help.c:569 sql_help.c:1069 sql_help.c:2475
 msgid "execution_cost"
 msgstr "вартість_виконання"
 
-#: sql_help.c:548 sql_help.c:1034 sql_help.c:2417
+#: sql_help.c:570 sql_help.c:1070 sql_help.c:2476
 msgid "result_rows"
 msgstr "рядки_результату"
 
-#: sql_help.c:549 sql_help.c:2418
+#: sql_help.c:571 sql_help.c:2477
 msgid "support_function"
 msgstr "функція_підтримки"
 
-#: sql_help.c:571 sql_help.c:573 sql_help.c:956 sql_help.c:964 sql_help.c:968
-#: sql_help.c:971 sql_help.c:974 sql_help.c:1646 sql_help.c:1654
-#: sql_help.c:1658 sql_help.c:1661 sql_help.c:1664 sql_help.c:2726
-#: sql_help.c:2728 sql_help.c:2731 sql_help.c:2732 sql_help.c:3904
-#: sql_help.c:3905 sql_help.c:3909 sql_help.c:3910 sql_help.c:3913
-#: sql_help.c:3914 sql_help.c:3916 sql_help.c:3917 sql_help.c:3919
-#: sql_help.c:3920 sql_help.c:3922 sql_help.c:3923 sql_help.c:3925
-#: sql_help.c:3926 sql_help.c:3932 sql_help.c:3933 sql_help.c:3935
-#: sql_help.c:3936 sql_help.c:3938 sql_help.c:3939 sql_help.c:3941
-#: sql_help.c:3942 sql_help.c:3944 sql_help.c:3945 sql_help.c:3947
-#: sql_help.c:3948 sql_help.c:3950 sql_help.c:3951 sql_help.c:3953
-#: sql_help.c:3954 sql_help.c:4367 sql_help.c:4368 sql_help.c:4372
-#: sql_help.c:4373 sql_help.c:4376 sql_help.c:4377 sql_help.c:4379
-#: sql_help.c:4380 sql_help.c:4382 sql_help.c:4383 sql_help.c:4385
-#: sql_help.c:4386 sql_help.c:4388 sql_help.c:4389 sql_help.c:4395
-#: sql_help.c:4396 sql_help.c:4398 sql_help.c:4399 sql_help.c:4401
-#: sql_help.c:4402 sql_help.c:4404 sql_help.c:4405 sql_help.c:4407
-#: sql_help.c:4408 sql_help.c:4410 sql_help.c:4411 sql_help.c:4413
-#: sql_help.c:4414 sql_help.c:4416 sql_help.c:4417
+#: sql_help.c:593 sql_help.c:595 sql_help.c:992 sql_help.c:1000 sql_help.c:1004
+#: sql_help.c:1007 sql_help.c:1010 sql_help.c:1691 sql_help.c:1699
+#: sql_help.c:1703 sql_help.c:1706 sql_help.c:1709 sql_help.c:2791
+#: sql_help.c:2793 sql_help.c:2796 sql_help.c:2797 sql_help.c:3979
+#: sql_help.c:3980 sql_help.c:3984 sql_help.c:3985 sql_help.c:3988
+#: sql_help.c:3989 sql_help.c:3991 sql_help.c:3992 sql_help.c:3994
+#: sql_help.c:3995 sql_help.c:3997 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:4001 sql_help.c:4007 sql_help.c:4008 sql_help.c:4010
+#: sql_help.c:4011 sql_help.c:4013 sql_help.c:4014 sql_help.c:4016
+#: sql_help.c:4017 sql_help.c:4019 sql_help.c:4020 sql_help.c:4022
+#: sql_help.c:4023 sql_help.c:4025 sql_help.c:4026 sql_help.c:4028
+#: sql_help.c:4029 sql_help.c:4446 sql_help.c:4447 sql_help.c:4451
+#: sql_help.c:4452 sql_help.c:4455 sql_help.c:4456 sql_help.c:4458
+#: sql_help.c:4459 sql_help.c:4461 sql_help.c:4462 sql_help.c:4464
+#: sql_help.c:4465 sql_help.c:4467 sql_help.c:4468 sql_help.c:4474
+#: sql_help.c:4475 sql_help.c:4477 sql_help.c:4478 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4483 sql_help.c:4484 sql_help.c:4486
+#: sql_help.c:4487 sql_help.c:4489 sql_help.c:4490 sql_help.c:4492
+#: sql_help.c:4493 sql_help.c:4495 sql_help.c:4496
 msgid "role_specification"
 msgstr "вказання_ролі"
 
-#: sql_help.c:572 sql_help.c:574 sql_help.c:1677 sql_help.c:2217
-#: sql_help.c:2734 sql_help.c:3265 sql_help.c:3716 sql_help.c:4745
+#: sql_help.c:594 sql_help.c:596 sql_help.c:1722 sql_help.c:2264
+#: sql_help.c:2799 sql_help.c:3338 sql_help.c:3791 sql_help.c:4824
 msgid "user_name"
 msgstr "ім'я_користувача"
 
-#: sql_help.c:575 sql_help.c:976 sql_help.c:1666 sql_help.c:2733
-#: sql_help.c:3955 sql_help.c:4418
+#: sql_help.c:597 sql_help.c:1012 sql_help.c:1711 sql_help.c:2798
+#: sql_help.c:4030 sql_help.c:4497
 msgid "where role_specification can be:"
 msgstr "де вказання_ролі може бути:"
 
-#: sql_help.c:577
+#: sql_help.c:599
 msgid "group_name"
 msgstr "ім'я_групи"
 
-#: sql_help.c:598 sql_help.c:1435 sql_help.c:2229 sql_help.c:2489
-#: sql_help.c:2523 sql_help.c:2920 sql_help.c:2933 sql_help.c:2947
-#: sql_help.c:2988 sql_help.c:3018 sql_help.c:3030 sql_help.c:3946
-#: sql_help.c:4409
+#: sql_help.c:620 sql_help.c:1480 sql_help.c:2276 sql_help.c:2548
+#: sql_help.c:2582 sql_help.c:2988 sql_help.c:3001 sql_help.c:3015
+#: sql_help.c:3061 sql_help.c:3091 sql_help.c:3103 sql_help.c:4021
+#: sql_help.c:4488
 msgid "tablespace_name"
 msgstr "ім'я_табличного_простору"
 
-#: sql_help.c:600 sql_help.c:693 sql_help.c:1382 sql_help.c:1392
-#: sql_help.c:1430 sql_help.c:1792
+#: sql_help.c:622 sql_help.c:715 sql_help.c:1422 sql_help.c:1432
+#: sql_help.c:1475 sql_help.c:1837
 msgid "index_name"
 msgstr "назва_індексу"
 
-#: sql_help.c:604 sql_help.c:607 sql_help.c:696 sql_help.c:698 sql_help.c:1385
-#: sql_help.c:1387 sql_help.c:1433 sql_help.c:2487 sql_help.c:2521
-#: sql_help.c:2918 sql_help.c:2931 sql_help.c:2945 sql_help.c:2986
-#: sql_help.c:3016
+#: sql_help.c:626 sql_help.c:629 sql_help.c:718 sql_help.c:720 sql_help.c:1425
+#: sql_help.c:1427 sql_help.c:1478 sql_help.c:2546 sql_help.c:2580
+#: sql_help.c:2986 sql_help.c:2999 sql_help.c:3013 sql_help.c:3059
+#: sql_help.c:3089
 msgid "storage_parameter"
 msgstr "параметр_зберігання"
 
-#: sql_help.c:609
+#: sql_help.c:631
 msgid "column_number"
 msgstr "номер_стовпця"
 
-#: sql_help.c:633 sql_help.c:1877 sql_help.c:4501
+#: sql_help.c:655 sql_help.c:1922 sql_help.c:4580
 msgid "large_object_oid"
 msgstr "oid_великого_об'єкта"
 
-#: sql_help.c:692 sql_help.c:1368 sql_help.c:2906
+#: sql_help.c:714 sql_help.c:1407 sql_help.c:2974
 msgid "compression_method"
 msgstr "compression_method"
 
-#: sql_help.c:694 sql_help.c:1383
+#: sql_help.c:716 sql_help.c:1423
 msgid "new_access_method"
 msgstr "новий_метод_доступа"
 
-#: sql_help.c:731 sql_help.c:2544
+#: sql_help.c:753 sql_help.c:2603
 msgid "res_proc"
 msgstr "res_процедура"
 
-#: sql_help.c:732 sql_help.c:2545
+#: sql_help.c:754 sql_help.c:2604
 msgid "join_proc"
 msgstr "процедура_приєднання"
 
-#: sql_help.c:733 sql_help.c:2542
+#: sql_help.c:755 sql_help.c:2601
 msgid "com_op"
 msgstr "комут_оператор"
 
-#: sql_help.c:734 sql_help.c:2543
+#: sql_help.c:756 sql_help.c:2602
 msgid "neg_op"
 msgstr "зворотній_оператор"
 
-#: sql_help.c:786 sql_help.c:798 sql_help.c:2562
+#: sql_help.c:808 sql_help.c:820 sql_help.c:2621
 msgid "strategy_number"
 msgstr "номер_стратегії"
 
-#: sql_help.c:788 sql_help.c:789 sql_help.c:792 sql_help.c:793 sql_help.c:799
-#: sql_help.c:800 sql_help.c:802 sql_help.c:803 sql_help.c:2564 sql_help.c:2565
-#: sql_help.c:2568 sql_help.c:2569
+#: sql_help.c:810 sql_help.c:811 sql_help.c:814 sql_help.c:815 sql_help.c:821
+#: sql_help.c:822 sql_help.c:824 sql_help.c:825 sql_help.c:2623 sql_help.c:2624
+#: sql_help.c:2627 sql_help.c:2628
 msgid "op_type"
 msgstr "тип_операції"
 
-#: sql_help.c:790 sql_help.c:2566
+#: sql_help.c:812 sql_help.c:2625
 msgid "sort_family_name"
 msgstr "ім'я_родини_сортування"
 
-#: sql_help.c:791 sql_help.c:801 sql_help.c:2567
+#: sql_help.c:813 sql_help.c:823 sql_help.c:2626
 msgid "support_number"
 msgstr "номер_підтримки"
 
-#: sql_help.c:795 sql_help.c:2149 sql_help.c:2571 sql_help.c:3107
-#: sql_help.c:3109
+#: sql_help.c:817 sql_help.c:2196 sql_help.c:2630 sql_help.c:3180
+#: sql_help.c:3182
 msgid "argument_type"
 msgstr "тип_аргументу"
 
-#: sql_help.c:826 sql_help.c:829 sql_help.c:918 sql_help.c:1047 sql_help.c:1087
-#: sql_help.c:1559 sql_help.c:1562 sql_help.c:1738 sql_help.c:1791
-#: sql_help.c:1862 sql_help.c:1887 sql_help.c:1900 sql_help.c:1915
-#: sql_help.c:1975 sql_help.c:1981 sql_help.c:2345 sql_help.c:2357
-#: sql_help.c:2478 sql_help.c:2518 sql_help.c:2595 sql_help.c:2649
-#: sql_help.c:2702 sql_help.c:2754 sql_help.c:2787 sql_help.c:2794
-#: sql_help.c:2903 sql_help.c:2921 sql_help.c:2934 sql_help.c:3013
-#: sql_help.c:3133 sql_help.c:3314 sql_help.c:3537 sql_help.c:3586
-#: sql_help.c:3692 sql_help.c:3902 sql_help.c:3908 sql_help.c:3969
-#: sql_help.c:4001 sql_help.c:4365 sql_help.c:4371 sql_help.c:4489
-#: sql_help.c:4602 sql_help.c:4665 sql_help.c:4704 sql_help.c:4860
-#: sql_help.c:4923 sql_help.c:4957 sql_help.c:5015 sql_help.c:5105
-#: sql_help.c:5168
+#: sql_help.c:848 sql_help.c:851 sql_help.c:952 sql_help.c:955 sql_help.c:1083
+#: sql_help.c:1124 sql_help.c:1604 sql_help.c:1607 sql_help.c:1783
+#: sql_help.c:1836 sql_help.c:1907 sql_help.c:1932 sql_help.c:1945
+#: sql_help.c:1960 sql_help.c:2021 sql_help.c:2027 sql_help.c:2400
+#: sql_help.c:2414 sql_help.c:2537 sql_help.c:2577 sql_help.c:2654
+#: sql_help.c:2715 sql_help.c:2767 sql_help.c:2821 sql_help.c:2854
+#: sql_help.c:2861 sql_help.c:2971 sql_help.c:2989 sql_help.c:3002
+#: sql_help.c:3086 sql_help.c:3206 sql_help.c:3388 sql_help.c:3612
+#: sql_help.c:3661 sql_help.c:3767 sql_help.c:3977 sql_help.c:3983
+#: sql_help.c:4044 sql_help.c:4077 sql_help.c:4444 sql_help.c:4450
+#: sql_help.c:4568 sql_help.c:4681 sql_help.c:4744 sql_help.c:4783
+#: sql_help.c:4939 sql_help.c:5002 sql_help.c:5037 sql_help.c:5096
+#: sql_help.c:5186 sql_help.c:5249
 msgid "table_name"
 msgstr "ім'я_таблиці"
 
-#: sql_help.c:831 sql_help.c:2597
+#: sql_help.c:853 sql_help.c:2656
 msgid "using_expression"
 msgstr "вираз_використання"
 
-#: sql_help.c:832 sql_help.c:2598
+#: sql_help.c:854 sql_help.c:2657
 msgid "check_expression"
 msgstr "вираз_перевірки"
 
-#: sql_help.c:905 sql_help.c:907 sql_help.c:909 sql_help.c:2645
+#: sql_help.c:936 sql_help.c:938 sql_help.c:2708
 msgid "publication_object"
 msgstr "об'єкт_публікація"
 
-#: sql_help.c:911 sql_help.c:2646
+#: sql_help.c:940
+msgid "publication_drop_object"
+msgstr "об'єкт_видалення_публікації"
+
+#: sql_help.c:942 sql_help.c:2709
 msgid "publication_parameter"
 msgstr "параметр_публікації"
 
-#: sql_help.c:917 sql_help.c:2648
+#: sql_help.c:948 sql_help.c:2711
 msgid "where publication_object is one of:"
 msgstr "де об'єкт_публікація є одним з:"
 
-#: sql_help.c:960 sql_help.c:1650 sql_help.c:2456 sql_help.c:2681
-#: sql_help.c:3248
+#: sql_help.c:949 sql_help.c:1777 sql_help.c:2712 sql_help.c:5080
+msgid "table_and_columns"
+msgstr "таблиця_і_стовпці"
+
+#: sql_help.c:951
+msgid "and publication_drop_object is one of:"
+msgstr "і об'єкт_видалення_публікації є одним з:"
+
+#: sql_help.c:954 sql_help.c:1782 sql_help.c:2714 sql_help.c:5095
+msgid "and table_and_columns is:"
+msgstr "і таблиця_і_стовпці:"
+
+#: sql_help.c:996 sql_help.c:1695 sql_help.c:2515 sql_help.c:2746
+#: sql_help.c:3321
 msgid "password"
 msgstr "пароль"
 
-#: sql_help.c:961 sql_help.c:1651 sql_help.c:2457 sql_help.c:2682
-#: sql_help.c:3249
+#: sql_help.c:997 sql_help.c:1696 sql_help.c:2516 sql_help.c:2747
+#: sql_help.c:3322
 msgid "timestamp"
 msgstr "мітка часу"
 
-#: sql_help.c:965 sql_help.c:969 sql_help.c:972 sql_help.c:975 sql_help.c:1655
-#: sql_help.c:1659 sql_help.c:1662 sql_help.c:1665 sql_help.c:3915
-#: sql_help.c:4378
+#: sql_help.c:1001 sql_help.c:1005 sql_help.c:1008 sql_help.c:1011
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1707 sql_help.c:1710
+#: sql_help.c:3990 sql_help.c:4457
 msgid "database_name"
 msgstr "назва_бази_даних"
 
-#: sql_help.c:1081 sql_help.c:2749
+#: sql_help.c:1118 sql_help.c:2816
 msgid "increment"
 msgstr "інкремент"
 
-#: sql_help.c:1082 sql_help.c:2750
+#: sql_help.c:1119 sql_help.c:2817
 msgid "minvalue"
 msgstr "мін_значення"
 
-#: sql_help.c:1083 sql_help.c:2751
+#: sql_help.c:1120 sql_help.c:2818
 msgid "maxvalue"
 msgstr "макс_значення"
 
-#: sql_help.c:1084 sql_help.c:2752 sql_help.c:4598 sql_help.c:4702
-#: sql_help.c:4856 sql_help.c:5032 sql_help.c:5101
+#: sql_help.c:1121 sql_help.c:2819 sql_help.c:4677 sql_help.c:4781
+#: sql_help.c:4935 sql_help.c:5113 sql_help.c:5182
 msgid "start"
 msgstr "початок"
 
-#: sql_help.c:1085 sql_help.c:1357
+#: sql_help.c:1122 sql_help.c:1396
 msgid "restart"
 msgstr "перезапуск"
 
-#: sql_help.c:1086 sql_help.c:2753
+#: sql_help.c:1123 sql_help.c:2820
 msgid "cache"
 msgstr "кеш"
 
-#: sql_help.c:1131
+#: sql_help.c:1168
 msgid "new_target"
 msgstr "нова_ціль"
 
-#: sql_help.c:1150 sql_help.c:2806
+#: sql_help.c:1187 sql_help.c:2873
 msgid "conninfo"
 msgstr "інформація_підключення"
 
-#: sql_help.c:1152 sql_help.c:1156 sql_help.c:1160 sql_help.c:2807
+#: sql_help.c:1189 sql_help.c:1193 sql_help.c:1197 sql_help.c:2874
 msgid "publication_name"
 msgstr "назва_публікації"
 
-#: sql_help.c:1153 sql_help.c:1157 sql_help.c:1161
+#: sql_help.c:1190 sql_help.c:1194 sql_help.c:1198
 msgid "publication_option"
 msgstr "publication_option"
 
-#: sql_help.c:1164
+#: sql_help.c:1201
 msgid "refresh_option"
 msgstr "опція_оновлення"
 
-#: sql_help.c:1169 sql_help.c:2808
+#: sql_help.c:1206 sql_help.c:2875
 msgid "subscription_parameter"
 msgstr "параметр_підписки"
 
-#: sql_help.c:1172
+#: sql_help.c:1209
 msgid "skip_option"
 msgstr "опція_пропуска"
 
-#: sql_help.c:1332 sql_help.c:1335
+#: sql_help.c:1371 sql_help.c:1374
 msgid "partition_name"
 msgstr "ім'я_розділу"
 
-#: sql_help.c:1333 sql_help.c:2362 sql_help.c:2939
+#: sql_help.c:1372 sql_help.c:2419 sql_help.c:3007
 msgid "partition_bound_spec"
 msgstr "специфікація_рамок_розділу"
 
-#: sql_help.c:1354 sql_help.c:1404 sql_help.c:2953
+#: sql_help.c:1393 sql_help.c:1444 sql_help.c:3021
 msgid "sequence_options"
 msgstr "опції_послідовності"
 
-#: sql_help.c:1356
+#: sql_help.c:1395
 msgid "sequence_option"
 msgstr "опція_послідовності"
 
-#: sql_help.c:1370
+#: sql_help.c:1409
 msgid "table_constraint_using_index"
 msgstr "індекс_обмеження_таблиці"
 
-#: sql_help.c:1378 sql_help.c:1379 sql_help.c:1380 sql_help.c:1381
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1421
 msgid "rewrite_rule_name"
 msgstr "ім'я_правила_перезапису"
 
-#: sql_help.c:1393 sql_help.c:2374 sql_help.c:2978
+#: sql_help.c:1433 sql_help.c:2433 sql_help.c:3051
 msgid "and partition_bound_spec is:"
 msgstr "і специфікація_рамок_розділу:"
 
-#: sql_help.c:1394 sql_help.c:1395 sql_help.c:1396 sql_help.c:2375
-#: sql_help.c:2376 sql_help.c:2377 sql_help.c:2979 sql_help.c:2980
-#: sql_help.c:2981
+#: sql_help.c:1434 sql_help.c:1435 sql_help.c:1436 sql_help.c:2434
+#: sql_help.c:2435 sql_help.c:2436 sql_help.c:3052 sql_help.c:3053
+#: sql_help.c:3054
 msgid "partition_bound_expr"
 msgstr "код_секції"
 
-#: sql_help.c:1397 sql_help.c:1398 sql_help.c:2378 sql_help.c:2379
-#: sql_help.c:2982 sql_help.c:2983
+#: sql_help.c:1437 sql_help.c:1438 sql_help.c:2437 sql_help.c:2438
+#: sql_help.c:3055 sql_help.c:3056
 msgid "numeric_literal"
 msgstr "числовий_літерал"
 
-#: sql_help.c:1399
+#: sql_help.c:1439
 msgid "and column_constraint is:"
 msgstr "і обмеження_стовпця:"
 
-#: sql_help.c:1402 sql_help.c:2369 sql_help.c:2410 sql_help.c:2619
-#: sql_help.c:2951
+#: sql_help.c:1442 sql_help.c:2426 sql_help.c:2469 sql_help.c:2678
+#: sql_help.c:3019
 msgid "default_expr"
 msgstr "вираз_за_замовчуванням"
 
-#: sql_help.c:1403 sql_help.c:2370 sql_help.c:2952
+#: sql_help.c:1443 sql_help.c:2427 sql_help.c:3020
 msgid "generation_expr"
 msgstr "код_генерації"
 
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:1415 sql_help.c:1417
-#: sql_help.c:1421 sql_help.c:2954 sql_help.c:2955 sql_help.c:2964
-#: sql_help.c:2966 sql_help.c:2970
+#: sql_help.c:1445 sql_help.c:1446 sql_help.c:1457 sql_help.c:1460
+#: sql_help.c:1464 sql_help.c:3022 sql_help.c:3023 sql_help.c:3034
+#: sql_help.c:3037 sql_help.c:3041
 msgid "index_parameters"
 msgstr "параметри_індексу"
 
-#: sql_help.c:1407 sql_help.c:1424 sql_help.c:2956 sql_help.c:2973
+#: sql_help.c:1447 sql_help.c:1468 sql_help.c:3024 sql_help.c:3045
 msgid "reftable"
 msgstr "залежна_таблиця"
 
-#: sql_help.c:1408 sql_help.c:1425 sql_help.c:2957 sql_help.c:2974
+#: sql_help.c:1448 sql_help.c:1469 sql_help.c:1470 sql_help.c:3025
+#: sql_help.c:3046 sql_help.c:3047
 msgid "refcolumn"
 msgstr "залежний_стовпець"
 
-#: sql_help.c:1409 sql_help.c:1410 sql_help.c:1426 sql_help.c:1427
-#: sql_help.c:2958 sql_help.c:2959 sql_help.c:2975 sql_help.c:2976
+#: sql_help.c:1449 sql_help.c:1450 sql_help.c:1471 sql_help.c:1472
+#: sql_help.c:3026 sql_help.c:3027 sql_help.c:3048 sql_help.c:3049
 msgid "referential_action"
 msgstr "дія_посилання"
 
-#: sql_help.c:1411 sql_help.c:2371 sql_help.c:2960
+#: sql_help.c:1451 sql_help.c:2428 sql_help.c:3028
 msgid "and table_constraint is:"
 msgstr "і обмеження_таблиці:"
 
-#: sql_help.c:1419 sql_help.c:2968
+#: sql_help.c:1462 sql_help.c:3039
 msgid "exclude_element"
 msgstr "об'єкт_виключення"
 
-#: sql_help.c:1420 sql_help.c:2969 sql_help.c:4596 sql_help.c:4700
-#: sql_help.c:4854 sql_help.c:5030 sql_help.c:5099
+#: sql_help.c:1463 sql_help.c:3040 sql_help.c:4675 sql_help.c:4779
+#: sql_help.c:4933 sql_help.c:5111 sql_help.c:5180
 msgid "operator"
 msgstr "оператор"
 
-#: sql_help.c:1422 sql_help.c:2490 sql_help.c:2971
+#: sql_help.c:1465 sql_help.c:2549 sql_help.c:3042
 msgid "predicate"
 msgstr "предикат"
 
-#: sql_help.c:1428
+#: sql_help.c:1473
 msgid "and table_constraint_using_index is:"
 msgstr "і індекс_обмеження_таблиці:"
 
-#: sql_help.c:1431 sql_help.c:2984
+#: sql_help.c:1476 sql_help.c:3057
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "параметри_індексу в обмеженнях UNIQUE, PRIMARY KEY, EXCLUDE:"
 
-#: sql_help.c:1436 sql_help.c:2989
+#: sql_help.c:1481 sql_help.c:3062
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "елемент_виключення в обмеженні EXCLUDE:"
 
-#: sql_help.c:1440 sql_help.c:2483 sql_help.c:2916 sql_help.c:2929
-#: sql_help.c:2943 sql_help.c:2993 sql_help.c:4014
+#: sql_help.c:1485 sql_help.c:2542 sql_help.c:2984 sql_help.c:2997
+#: sql_help.c:3011 sql_help.c:3066 sql_help.c:4091
 msgid "opclass"
 msgstr "клас_оператора"
 
-#: sql_help.c:1441 sql_help.c:2484 sql_help.c:2994
+#: sql_help.c:1486 sql_help.c:2543 sql_help.c:3067
 msgid "opclass_parameter"
 msgstr "opclass_parameter"
 
-#: sql_help.c:1443 sql_help.c:2996
+#: sql_help.c:1488 sql_help.c:3069
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "посилання на дію в обмеженні FOREIGN KEY/REFERENCES:"
 
-#: sql_help.c:1461 sql_help.c:1464 sql_help.c:3033
+#: sql_help.c:1506 sql_help.c:1509 sql_help.c:3106
 msgid "tablespace_option"
 msgstr "опція_табличного_простору"
 
-#: sql_help.c:1485 sql_help.c:1488 sql_help.c:1494 sql_help.c:1498
+#: sql_help.c:1530 sql_help.c:1533 sql_help.c:1539 sql_help.c:1543
 msgid "token_type"
 msgstr "тип_токену"
 
-#: sql_help.c:1486 sql_help.c:1489
+#: sql_help.c:1531 sql_help.c:1534
 msgid "dictionary_name"
 msgstr "ім'я_словника"
 
-#: sql_help.c:1491 sql_help.c:1495
+#: sql_help.c:1536 sql_help.c:1540
 msgid "old_dictionary"
 msgstr "старий_словник"
 
-#: sql_help.c:1492 sql_help.c:1496
+#: sql_help.c:1537 sql_help.c:1541
 msgid "new_dictionary"
 msgstr "новий_словник"
 
-#: sql_help.c:1591 sql_help.c:1605 sql_help.c:1608 sql_help.c:1609
-#: sql_help.c:3186
+#: sql_help.c:1636 sql_help.c:1650 sql_help.c:1653 sql_help.c:1654
+#: sql_help.c:3259
 msgid "attribute_name"
 msgstr "ім'я_атрибута"
 
-#: sql_help.c:1592
+#: sql_help.c:1637
 msgid "new_attribute_name"
 msgstr "нове_ім'я_атрибута"
 
-#: sql_help.c:1596 sql_help.c:1600
+#: sql_help.c:1641 sql_help.c:1645
 msgid "new_enum_value"
 msgstr "нове_значення_перерахування"
 
-#: sql_help.c:1597
+#: sql_help.c:1642
 msgid "neighbor_enum_value"
 msgstr "сусіднє_значення_перерахування"
 
-#: sql_help.c:1599
+#: sql_help.c:1644
 msgid "existing_enum_value"
 msgstr "існуюче_значення_перерахування"
 
-#: sql_help.c:1602
+#: sql_help.c:1647
 msgid "property"
 msgstr "властивість"
 
-#: sql_help.c:1678 sql_help.c:2354 sql_help.c:2363 sql_help.c:2765
-#: sql_help.c:3266 sql_help.c:3717 sql_help.c:3924 sql_help.c:3970
-#: sql_help.c:4387
+#: sql_help.c:1723 sql_help.c:2411 sql_help.c:2420 sql_help.c:2832
+#: sql_help.c:3339 sql_help.c:3792 sql_help.c:3999 sql_help.c:4045
+#: sql_help.c:4466
 msgid "server_name"
 msgstr "назва_серверу"
 
-#: sql_help.c:1710 sql_help.c:1713 sql_help.c:3281
+#: sql_help.c:1755 sql_help.c:1758 sql_help.c:3354
 msgid "view_option_name"
 msgstr "ім'я_параметра_представлення"
 
-#: sql_help.c:1711 sql_help.c:3282
+#: sql_help.c:1756 sql_help.c:3355
 msgid "view_option_value"
 msgstr "значення_параметра_представлення"
 
-#: sql_help.c:1732 sql_help.c:4999
-msgid "table_and_columns"
-msgstr "таблиця_і_стовпці"
-
-#: sql_help.c:1733 sql_help.c:1793 sql_help.c:1987 sql_help.c:3766
-#: sql_help.c:4222 sql_help.c:5000
+#: sql_help.c:1778 sql_help.c:1838 sql_help.c:2033 sql_help.c:3841
+#: sql_help.c:4301 sql_help.c:5081
 msgid "where option can be one of:"
 msgstr "де параметр може бути одним із:"
 
-#: sql_help.c:1734 sql_help.c:1735 sql_help.c:1794 sql_help.c:1989
-#: sql_help.c:1993 sql_help.c:2175 sql_help.c:3767 sql_help.c:3768
-#: sql_help.c:3769 sql_help.c:3770 sql_help.c:3771 sql_help.c:3772
-#: sql_help.c:3773 sql_help.c:3774 sql_help.c:3775 sql_help.c:3776
-#: sql_help.c:4223 sql_help.c:4225 sql_help.c:5001 sql_help.c:5002
-#: sql_help.c:5003 sql_help.c:5004 sql_help.c:5005 sql_help.c:5006
-#: sql_help.c:5007 sql_help.c:5008 sql_help.c:5009 sql_help.c:5011
-#: sql_help.c:5012
+#: sql_help.c:1779 sql_help.c:1780 sql_help.c:1839 sql_help.c:2035
+#: sql_help.c:2039 sql_help.c:2222 sql_help.c:3842 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:3849 sql_help.c:3850 sql_help.c:3851
+#: sql_help.c:4302 sql_help.c:4304 sql_help.c:5082 sql_help.c:5083
+#: sql_help.c:5084 sql_help.c:5085 sql_help.c:5086 sql_help.c:5087
+#: sql_help.c:5088 sql_help.c:5089 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5093
 msgid "boolean"
 msgstr "логічний"
 
-#: sql_help.c:1736 sql_help.c:5013
+#: sql_help.c:1781 sql_help.c:5094
 msgid "size"
 msgstr "розмір"
 
-#: sql_help.c:1737 sql_help.c:5014
-msgid "and table_and_columns is:"
-msgstr "і таблиця_і_стовпці:"
-
-#: sql_help.c:1753 sql_help.c:4761 sql_help.c:4763 sql_help.c:4787
+#: sql_help.c:1798 sql_help.c:4840 sql_help.c:4842 sql_help.c:4866
 msgid "transaction_mode"
 msgstr "режим_транзакції"
 
-#: sql_help.c:1754 sql_help.c:4764 sql_help.c:4788
+#: sql_help.c:1799 sql_help.c:4843 sql_help.c:4867
 msgid "where transaction_mode is one of:"
 msgstr "де режим_транзакції один з:"
 
-#: sql_help.c:1763 sql_help.c:4606 sql_help.c:4615 sql_help.c:4619
-#: sql_help.c:4623 sql_help.c:4626 sql_help.c:4864 sql_help.c:4873
-#: sql_help.c:4877 sql_help.c:4881 sql_help.c:4884 sql_help.c:5109
-#: sql_help.c:5118 sql_help.c:5122 sql_help.c:5126 sql_help.c:5129
+#: sql_help.c:1808 sql_help.c:4685 sql_help.c:4694 sql_help.c:4698
+#: sql_help.c:4702 sql_help.c:4705 sql_help.c:4943 sql_help.c:4952
+#: sql_help.c:4956 sql_help.c:4960 sql_help.c:4963 sql_help.c:5190
+#: sql_help.c:5199 sql_help.c:5203 sql_help.c:5207 sql_help.c:5210
 msgid "argument"
 msgstr "аргумент"
 
-#: sql_help.c:1859
+#: sql_help.c:1904
 msgid "relation_name"
 msgstr "назва_відношення"
 
-#: sql_help.c:1864 sql_help.c:3918 sql_help.c:4381
+#: sql_help.c:1909 sql_help.c:3993 sql_help.c:4460
 msgid "domain_name"
 msgstr "назва_домену"
 
-#: sql_help.c:1886
+#: sql_help.c:1931
 msgid "policy_name"
 msgstr "назва_політики"
 
-#: sql_help.c:1899
+#: sql_help.c:1944
 msgid "rule_name"
 msgstr "назва_правила"
 
-#: sql_help.c:1918 sql_help.c:4520
+#: sql_help.c:1963 sql_help.c:4599
 msgid "string_literal"
 msgstr "рядковий_літерал"
 
-#: sql_help.c:1943 sql_help.c:4184 sql_help.c:4434
+#: sql_help.c:1988 sql_help.c:4263 sql_help.c:4513
 msgid "transaction_id"
 msgstr "ідентифікатор_транзакції"
 
-#: sql_help.c:1977 sql_help.c:1984 sql_help.c:4040
+#: sql_help.c:2023 sql_help.c:2030 sql_help.c:4117
 msgid "filename"
 msgstr "ім'я файлу"
 
-#: sql_help.c:1978 sql_help.c:1985 sql_help.c:2704 sql_help.c:2705
-#: sql_help.c:2706
+#: sql_help.c:2024 sql_help.c:2031 sql_help.c:2769 sql_help.c:2770
+#: sql_help.c:2771
 msgid "command"
 msgstr "команда"
 
-#: sql_help.c:1980 sql_help.c:2703 sql_help.c:3136 sql_help.c:3317
-#: sql_help.c:4024 sql_help.c:4107 sql_help.c:4110 sql_help.c:4113
-#: sql_help.c:4589 sql_help.c:4591 sql_help.c:4693 sql_help.c:4695
-#: sql_help.c:4847 sql_help.c:4849 sql_help.c:4966 sql_help.c:5092
-#: sql_help.c:5094
+#: sql_help.c:2026 sql_help.c:2768 sql_help.c:3209 sql_help.c:3391
+#: sql_help.c:4101 sql_help.c:4186 sql_help.c:4189 sql_help.c:4192
+#: sql_help.c:4668 sql_help.c:4670 sql_help.c:4772 sql_help.c:4774
+#: sql_help.c:4926 sql_help.c:4928 sql_help.c:5046 sql_help.c:5173
+#: sql_help.c:5175
 msgid "condition"
 msgstr "умова"
 
-#: sql_help.c:1983 sql_help.c:2524 sql_help.c:3019 sql_help.c:3283
-#: sql_help.c:3301 sql_help.c:4005
+#: sql_help.c:2029 sql_help.c:2583 sql_help.c:3092 sql_help.c:3356
+#: sql_help.c:3374 sql_help.c:4081
 msgid "query"
 msgstr "запит"
 
-#: sql_help.c:1988
+#: sql_help.c:2034
 msgid "format_name"
 msgstr "назва_формату"
 
-#: sql_help.c:1990
+#: sql_help.c:2036
 msgid "delimiter_character"
 msgstr "символ_роздільник"
 
-#: sql_help.c:1991
+#: sql_help.c:2037
 msgid "null_string"
 msgstr "представлення_NULL"
 
-#: sql_help.c:1992
+#: sql_help.c:2038
 msgid "default_string"
 msgstr "рядок_за_замовчуванням"
 
-#: sql_help.c:1994
+#: sql_help.c:2040
 msgid "quote_character"
 msgstr "символ_лапок"
 
-#: sql_help.c:1995
+#: sql_help.c:2041
 msgid "escape_character"
 msgstr "символ_екранування"
 
-#: sql_help.c:1999
+#: sql_help.c:2045
 msgid "error_action"
 msgstr "error_action"
 
-#: sql_help.c:2000
+#: sql_help.c:2046
+msgid "maxerror"
+msgstr "макс_помилок"
+
+#: sql_help.c:2047
 msgid "encoding_name"
 msgstr "ім'я_кодування"
 
-#: sql_help.c:2001
+#: sql_help.c:2048
 msgid "verbosity"
 msgstr "детальність"
 
-#: sql_help.c:2012
+#: sql_help.c:2059
 msgid "access_method_type"
 msgstr "тип_метода_доступа"
 
-#: sql_help.c:2083 sql_help.c:2102 sql_help.c:2105
+#: sql_help.c:2130 sql_help.c:2149 sql_help.c:2152
 msgid "arg_data_type"
 msgstr "тип_даних_аргумента"
 
-#: sql_help.c:2084 sql_help.c:2106 sql_help.c:2114
+#: sql_help.c:2131 sql_help.c:2153 sql_help.c:2161
 msgid "sfunc"
 msgstr "функція_стану"
 
-#: sql_help.c:2085 sql_help.c:2107 sql_help.c:2115
+#: sql_help.c:2132 sql_help.c:2154 sql_help.c:2162
 msgid "state_data_type"
 msgstr "тип_даних_стану"
 
-#: sql_help.c:2086 sql_help.c:2108 sql_help.c:2116
+#: sql_help.c:2133 sql_help.c:2155 sql_help.c:2163
 msgid "state_data_size"
 msgstr "розмір_даних_стану"
 
-#: sql_help.c:2087 sql_help.c:2109 sql_help.c:2117
+#: sql_help.c:2134 sql_help.c:2156 sql_help.c:2164
 msgid "ffunc"
 msgstr "функція_завершення"
 
-#: sql_help.c:2088 sql_help.c:2118
+#: sql_help.c:2135 sql_help.c:2165
 msgid "combinefunc"
 msgstr "комбінуюча_функція"
 
-#: sql_help.c:2089 sql_help.c:2119
+#: sql_help.c:2136 sql_help.c:2166
 msgid "serialfunc"
 msgstr "функція_серіалізації"
 
-#: sql_help.c:2090 sql_help.c:2120
+#: sql_help.c:2137 sql_help.c:2167
 msgid "deserialfunc"
 msgstr "функція_десеріалізації"
 
-#: sql_help.c:2091 sql_help.c:2110 sql_help.c:2121
+#: sql_help.c:2138 sql_help.c:2157 sql_help.c:2168
 msgid "initial_condition"
 msgstr "початкова_умова"
 
-#: sql_help.c:2092 sql_help.c:2122
+#: sql_help.c:2139 sql_help.c:2169
 msgid "msfunc"
 msgstr "функція_стану_рух"
 
-#: sql_help.c:2093 sql_help.c:2123
+#: sql_help.c:2140 sql_help.c:2170
 msgid "minvfunc"
 msgstr "зворотна_функція_рух"
 
-#: sql_help.c:2094 sql_help.c:2124
+#: sql_help.c:2141 sql_help.c:2171
 msgid "mstate_data_type"
 msgstr "тип_даних_стану_рух"
 
-#: sql_help.c:2095 sql_help.c:2125
+#: sql_help.c:2142 sql_help.c:2172
 msgid "mstate_data_size"
 msgstr "розмір_даних_стану_рух"
 
-#: sql_help.c:2096 sql_help.c:2126
+#: sql_help.c:2143 sql_help.c:2173
 msgid "mffunc"
 msgstr "функція_завершення_рух"
 
-#: sql_help.c:2097 sql_help.c:2127
+#: sql_help.c:2144 sql_help.c:2174
 msgid "minitial_condition"
 msgstr "початкова_умова_рух"
 
-#: sql_help.c:2098 sql_help.c:2128
+#: sql_help.c:2145 sql_help.c:2175
 msgid "sort_operator"
 msgstr "оператор_сортування"
 
-#: sql_help.c:2111
+#: sql_help.c:2158
 msgid "or the old syntax"
 msgstr "або старий синтаксис"
 
-#: sql_help.c:2113
+#: sql_help.c:2160
 msgid "base_type"
 msgstr "базовий_тип"
 
-#: sql_help.c:2171 sql_help.c:2221
+#: sql_help.c:2218 sql_help.c:2268
 msgid "locale"
 msgstr "локаль"
 
-#: sql_help.c:2172 sql_help.c:2222
+#: sql_help.c:2219 sql_help.c:2269
 msgid "lc_collate"
 msgstr "код_правила_сортування"
 
-#: sql_help.c:2173 sql_help.c:2223
+#: sql_help.c:2220 sql_help.c:2270
 msgid "lc_ctype"
 msgstr "код_класифікації_символів"
 
-#: sql_help.c:2174 sql_help.c:4487
+#: sql_help.c:2221 sql_help.c:4566
 msgid "provider"
 msgstr "постачальник"
 
-#: sql_help.c:2176
+#: sql_help.c:2223
 msgid "rules"
 msgstr "правила"
 
-#: sql_help.c:2177 sql_help.c:2284
+#: sql_help.c:2224 sql_help.c:2331
 msgid "version"
 msgstr "версія"
 
-#: sql_help.c:2179
+#: sql_help.c:2226
 msgid "existing_collation"
 msgstr "існуюче_правило_сортування"
 
-#: sql_help.c:2189
+#: sql_help.c:2236
 msgid "source_encoding"
 msgstr "початкове_кодування"
 
-#: sql_help.c:2190
+#: sql_help.c:2237
 msgid "dest_encoding"
 msgstr "цільве_кодування"
 
-#: sql_help.c:2218 sql_help.c:3059
+#: sql_help.c:2265 sql_help.c:3132
 msgid "template"
 msgstr "шаблон"
 
-#: sql_help.c:2219
+#: sql_help.c:2266
 msgid "encoding"
 msgstr "кодування"
 
-#: sql_help.c:2220
+#: sql_help.c:2267
 msgid "strategy"
 msgstr "стратегія"
 
-#: sql_help.c:2224
+#: sql_help.c:2271
 msgid "builtin_locale"
 msgstr "вбудована_локаль"
 
-#: sql_help.c:2225
+#: sql_help.c:2272
 msgid "icu_locale"
 msgstr "icu_locale"
 
-#: sql_help.c:2226
+#: sql_help.c:2273
 msgid "icu_rules"
 msgstr "правила_icu"
 
-#: sql_help.c:2227
+#: sql_help.c:2274
 msgid "locale_provider"
 msgstr "локаль_провайдер"
 
-#: sql_help.c:2228
+#: sql_help.c:2275
 msgid "collation_version"
 msgstr "версія_сортування"
 
-#: sql_help.c:2233
+#: sql_help.c:2280
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2254
-msgid "where domain_constraint is:"
-msgstr "де обмеження_домену:"
-
-#: sql_help.c:2268 sql_help.c:2701 sql_help.c:3132
+#: sql_help.c:2315 sql_help.c:2766 sql_help.c:3205
 msgid "event"
 msgstr "подія"
 
-#: sql_help.c:2269
+#: sql_help.c:2316
 msgid "filter_variable"
 msgstr "змінна_фільтру"
 
-#: sql_help.c:2270
+#: sql_help.c:2317
 msgid "filter_value"
 msgstr "значення_фільтру"
 
-#: sql_help.c:2366 sql_help.c:2948
+#: sql_help.c:2408 sql_help.c:2978
+msgid "source_table"
+msgstr "вихідна_таблиця"
+
+#: sql_help.c:2409 sql_help.c:2979
+msgid "like_option"
+msgstr "параметр_породження"
+
+#: sql_help.c:2423 sql_help.c:3016
 msgid "where column_constraint is:"
 msgstr "де обмеження_стовпців:"
 
-#: sql_help.c:2411
+#: sql_help.c:2432 sql_help.c:3050
+msgid "and like_option is:"
+msgstr "і параметр_породження:"
+
+#: sql_help.c:2470
 msgid "rettype"
 msgstr "тип_результату"
 
-#: sql_help.c:2413
+#: sql_help.c:2472
 msgid "column_type"
 msgstr "тип_стовпця"
 
-#: sql_help.c:2422 sql_help.c:2625
+#: sql_help.c:2481 sql_help.c:2684
 msgid "definition"
 msgstr "визначення"
 
-#: sql_help.c:2423 sql_help.c:2626
+#: sql_help.c:2482 sql_help.c:2685
 msgid "obj_file"
 msgstr "об'єктний_файл"
 
-#: sql_help.c:2424 sql_help.c:2627
+#: sql_help.c:2483 sql_help.c:2686
 msgid "link_symbol"
 msgstr "символ_експорту"
 
-#: sql_help.c:2425 sql_help.c:2628
+#: sql_help.c:2484 sql_help.c:2687
 msgid "sql_body"
 msgstr "sql_body"
 
-#: sql_help.c:2463 sql_help.c:2686 sql_help.c:3255
+#: sql_help.c:2522 sql_help.c:2751 sql_help.c:3328
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2479 sql_help.c:2520 sql_help.c:2917 sql_help.c:2930
-#: sql_help.c:2944 sql_help.c:3015
+#: sql_help.c:2538 sql_help.c:2579 sql_help.c:2985 sql_help.c:2998
+#: sql_help.c:3012 sql_help.c:3088
 msgid "method"
 msgstr "метод"
 
-#: sql_help.c:2501
+#: sql_help.c:2560
 msgid "call_handler"
 msgstr "обробник_виклику"
 
-#: sql_help.c:2502
+#: sql_help.c:2561
 msgid "inline_handler"
 msgstr "обробник_впровадженого_коду"
 
-#: sql_help.c:2503
+#: sql_help.c:2562
 msgid "valfunction"
 msgstr "функція_перевірки"
 
-#: sql_help.c:2561
+#: sql_help.c:2620
 msgid "family_name"
 msgstr "назва_сімейства"
 
-#: sql_help.c:2572
+#: sql_help.c:2631
 msgid "storage_type"
 msgstr "тип_зберігання"
 
-#: sql_help.c:2707 sql_help.c:3139
+#: sql_help.c:2772 sql_help.c:3212
 msgid "where event can be one of:"
 msgstr "де подія може бути однією з:"
 
-#: sql_help.c:2727 sql_help.c:2729
+#: sql_help.c:2792 sql_help.c:2794
 msgid "schema_element"
 msgstr "елемент_схеми"
 
-#: sql_help.c:2766
+#: sql_help.c:2833
 msgid "server_type"
 msgstr "тип_серверу"
 
-#: sql_help.c:2767
+#: sql_help.c:2834
 msgid "server_version"
 msgstr "версія_серверу"
 
-#: sql_help.c:2768 sql_help.c:3921 sql_help.c:4384
+#: sql_help.c:2835 sql_help.c:3996 sql_help.c:4463
 msgid "fdw_name"
 msgstr "назва_fdw"
 
-#: sql_help.c:2785 sql_help.c:2788
+#: sql_help.c:2852 sql_help.c:2855
 msgid "statistics_name"
 msgstr "назва_статистики"
 
-#: sql_help.c:2789
+#: sql_help.c:2856
 msgid "statistics_kind"
 msgstr "вид_статистики"
 
-#: sql_help.c:2805
+#: sql_help.c:2872
 msgid "subscription_name"
 msgstr "назва_підписки"
 
-#: sql_help.c:2910
-msgid "source_table"
-msgstr "вихідна_таблиця"
-
-#: sql_help.c:2911
-msgid "like_option"
-msgstr "параметр_породження"
-
-#: sql_help.c:2977
-msgid "and like_option is:"
-msgstr "і параметр_породження:"
-
-#: sql_help.c:3032
+#: sql_help.c:3105
 msgid "directory"
 msgstr "каталог"
 
-#: sql_help.c:3046
+#: sql_help.c:3119
 msgid "parser_name"
 msgstr "назва_парсера"
 
-#: sql_help.c:3047
+#: sql_help.c:3120
 msgid "source_config"
 msgstr "початкова_конфігурація"
 
-#: sql_help.c:3076
+#: sql_help.c:3149
 msgid "start_function"
 msgstr "функція_початку"
 
-#: sql_help.c:3077
+#: sql_help.c:3150
 msgid "gettoken_function"
 msgstr "функція_видачі_токену"
 
-#: sql_help.c:3078
+#: sql_help.c:3151
 msgid "end_function"
 msgstr "функція_завершення"
 
-#: sql_help.c:3079
+#: sql_help.c:3152
 msgid "lextypes_function"
 msgstr "функція_лекс_типів"
 
-#: sql_help.c:3080
+#: sql_help.c:3153
 msgid "headline_function"
 msgstr "функція_створення_заголовків"
 
-#: sql_help.c:3092
+#: sql_help.c:3165
 msgid "init_function"
 msgstr "функція_ініціалізації"
 
-#: sql_help.c:3093
+#: sql_help.c:3166
 msgid "lexize_function"
 msgstr "функція_виділення_лексем"
 
-#: sql_help.c:3106
+#: sql_help.c:3179
 msgid "from_sql_function_name"
 msgstr "ім'я_функції_з_sql"
 
-#: sql_help.c:3108
+#: sql_help.c:3181
 msgid "to_sql_function_name"
 msgstr "ім'я_функції_в_sql"
 
-#: sql_help.c:3134
+#: sql_help.c:3207
 msgid "referenced_table_name"
 msgstr "ім'я_залежної_таблиці"
 
-#: sql_help.c:3135
+#: sql_help.c:3208
 msgid "transition_relation_name"
 msgstr "ім'я_перехідного_відношення"
 
-#: sql_help.c:3138
+#: sql_help.c:3211
 msgid "arguments"
 msgstr "аргументи"
 
-#: sql_help.c:3190
+#: sql_help.c:3263
 msgid "label"
 msgstr "мітка"
 
-#: sql_help.c:3192
+#: sql_help.c:3265
 msgid "subtype"
 msgstr "підтип"
 
-#: sql_help.c:3193
+#: sql_help.c:3266
 msgid "subtype_operator_class"
 msgstr "клас_оператора_підтипу"
 
-#: sql_help.c:3195
+#: sql_help.c:3268
 msgid "canonical_function"
 msgstr "канонічна_функція"
 
-#: sql_help.c:3196
+#: sql_help.c:3269
 msgid "subtype_diff_function"
 msgstr "функція_розбіжностей_підтипу"
 
-#: sql_help.c:3197
+#: sql_help.c:3270
 msgid "multirange_type_name"
 msgstr "multirange_type_name"
 
-#: sql_help.c:3199
+#: sql_help.c:3272
 msgid "input_function"
 msgstr "функція_вводу"
 
-#: sql_help.c:3200
+#: sql_help.c:3273
 msgid "output_function"
 msgstr "функція_виводу"
 
-#: sql_help.c:3201
+#: sql_help.c:3274
 msgid "receive_function"
 msgstr "функція_отримання"
 
-#: sql_help.c:3202
+#: sql_help.c:3275
 msgid "send_function"
 msgstr "функція_відправки"
 
-#: sql_help.c:3203
+#: sql_help.c:3276
 msgid "type_modifier_input_function"
 msgstr "функція_введення_модифікатора_типу"
 
-#: sql_help.c:3204
+#: sql_help.c:3277
 msgid "type_modifier_output_function"
 msgstr "функція_виводу_модифікатора_типу"
 
-#: sql_help.c:3205
+#: sql_help.c:3278
 msgid "analyze_function"
 msgstr "функція_аналізу"
 
-#: sql_help.c:3206
+#: sql_help.c:3279
 msgid "subscript_function"
 msgstr "subscript_function"
 
-#: sql_help.c:3207
+#: sql_help.c:3280
 msgid "internallength"
 msgstr "внутр_довжина"
 
-#: sql_help.c:3208
+#: sql_help.c:3281
 msgid "alignment"
 msgstr "вирівнювання"
 
-#: sql_help.c:3209
+#: sql_help.c:3282
 msgid "storage"
 msgstr "зберігання"
 
-#: sql_help.c:3210
+#: sql_help.c:3283
 msgid "like_type"
 msgstr "тип_зразок"
 
-#: sql_help.c:3211
+#: sql_help.c:3284
 msgid "category"
 msgstr "категорія"
 
-#: sql_help.c:3212
+#: sql_help.c:3285
 msgid "preferred"
 msgstr "привілейований"
 
-#: sql_help.c:3213
+#: sql_help.c:3286
 msgid "default"
 msgstr "за_замовчуванням"
 
-#: sql_help.c:3214
+#: sql_help.c:3287
 msgid "element"
 msgstr "елемент"
 
-#: sql_help.c:3215
+#: sql_help.c:3288
 msgid "delimiter"
 msgstr "роздільник"
 
-#: sql_help.c:3216
+#: sql_help.c:3289
 msgid "collatable"
 msgstr "сортувальний"
 
-#: sql_help.c:3313 sql_help.c:4000 sql_help.c:4094 sql_help.c:4584
-#: sql_help.c:4687 sql_help.c:4842 sql_help.c:4956 sql_help.c:5087
+#: sql_help.c:3387 sql_help.c:4076 sql_help.c:4172 sql_help.c:4663
+#: sql_help.c:4766 sql_help.c:4921 sql_help.c:5036 sql_help.c:5168
 msgid "with_query"
 msgstr "with_запит"
 
-#: sql_help.c:3315 sql_help.c:4002 sql_help.c:4603 sql_help.c:4609
-#: sql_help.c:4612 sql_help.c:4616 sql_help.c:4620 sql_help.c:4628
-#: sql_help.c:4861 sql_help.c:4867 sql_help.c:4870 sql_help.c:4874
-#: sql_help.c:4878 sql_help.c:4886 sql_help.c:4958 sql_help.c:5106
-#: sql_help.c:5112 sql_help.c:5115 sql_help.c:5119 sql_help.c:5123
-#: sql_help.c:5131
+#: sql_help.c:3389 sql_help.c:4078 sql_help.c:4682 sql_help.c:4688
+#: sql_help.c:4691 sql_help.c:4695 sql_help.c:4699 sql_help.c:4707
+#: sql_help.c:4940 sql_help.c:4946 sql_help.c:4949 sql_help.c:4953
+#: sql_help.c:4957 sql_help.c:4965 sql_help.c:5038 sql_help.c:5187
+#: sql_help.c:5193 sql_help.c:5196 sql_help.c:5200 sql_help.c:5204
+#: sql_help.c:5212
 msgid "alias"
 msgstr "псевдонім"
 
-#: sql_help.c:3316 sql_help.c:4588 sql_help.c:4630 sql_help.c:4632
-#: sql_help.c:4636 sql_help.c:4638 sql_help.c:4639 sql_help.c:4640
-#: sql_help.c:4692 sql_help.c:4846 sql_help.c:4888 sql_help.c:4890
-#: sql_help.c:4894 sql_help.c:4896 sql_help.c:4897 sql_help.c:4898
-#: sql_help.c:4965 sql_help.c:5091 sql_help.c:5133 sql_help.c:5135
-#: sql_help.c:5139 sql_help.c:5141 sql_help.c:5142 sql_help.c:5143
+#: sql_help.c:3390 sql_help.c:4667 sql_help.c:4709 sql_help.c:4711
+#: sql_help.c:4715 sql_help.c:4717 sql_help.c:4718 sql_help.c:4719
+#: sql_help.c:4771 sql_help.c:4925 sql_help.c:4967 sql_help.c:4969
+#: sql_help.c:4973 sql_help.c:4975 sql_help.c:4976 sql_help.c:4977
+#: sql_help.c:5045 sql_help.c:5172 sql_help.c:5214 sql_help.c:5216
+#: sql_help.c:5220 sql_help.c:5222 sql_help.c:5223 sql_help.c:5224
 msgid "from_item"
 msgstr "джерело_даних"
 
-#: sql_help.c:3318 sql_help.c:3802 sql_help.c:4151 sql_help.c:4967
+#: sql_help.c:3392 sql_help.c:3877 sql_help.c:4230 sql_help.c:5047
 msgid "cursor_name"
 msgstr "ім'я_курсору"
 
-#: sql_help.c:3319 sql_help.c:4008 sql_help.c:4100 sql_help.c:4968
+#: sql_help.c:3393 sql_help.c:4084 sql_help.c:4178 sql_help.c:5048
+msgid "output_alias"
+msgstr "псевдонім_виводу"
+
+#: sql_help.c:3394 sql_help.c:4085 sql_help.c:4179 sql_help.c:5049
 msgid "output_expression"
 msgstr "вираз_результату"
 
-#: sql_help.c:3320 sql_help.c:4009 sql_help.c:4101 sql_help.c:4587
-#: sql_help.c:4690 sql_help.c:4845 sql_help.c:4969 sql_help.c:5090
+#: sql_help.c:3395 sql_help.c:4086 sql_help.c:4180 sql_help.c:4666
+#: sql_help.c:4769 sql_help.c:4924 sql_help.c:5050 sql_help.c:5171
 msgid "output_name"
 msgstr "ім'я_результату"
 
-#: sql_help.c:3336
+#: sql_help.c:3411
 msgid "code"
 msgstr "код"
 
-#: sql_help.c:3741
+#: sql_help.c:3816
 msgid "parameter"
 msgstr "параметр"
 
-#: sql_help.c:3765 sql_help.c:4176
+#: sql_help.c:3840 sql_help.c:4255
 msgid "statement"
 msgstr "оператор"
 
-#: sql_help.c:3801 sql_help.c:4150
+#: sql_help.c:3876 sql_help.c:4229
 msgid "direction"
 msgstr "напрямок"
 
-#: sql_help.c:3803 sql_help.c:4152
+#: sql_help.c:3878 sql_help.c:4231
 msgid "where direction can be one of:"
 msgstr "де напрямок може бути одним із:"
 
-#: sql_help.c:3804 sql_help.c:3805 sql_help.c:3806 sql_help.c:3807
-#: sql_help.c:3808 sql_help.c:4153 sql_help.c:4154 sql_help.c:4155
-#: sql_help.c:4156 sql_help.c:4157 sql_help.c:4597 sql_help.c:4599
-#: sql_help.c:4701 sql_help.c:4703 sql_help.c:4855 sql_help.c:4857
-#: sql_help.c:5031 sql_help.c:5033 sql_help.c:5100 sql_help.c:5102
+#: sql_help.c:3879 sql_help.c:3880 sql_help.c:3881 sql_help.c:3882
+#: sql_help.c:3883 sql_help.c:4232 sql_help.c:4233 sql_help.c:4234
+#: sql_help.c:4235 sql_help.c:4236 sql_help.c:4676 sql_help.c:4678
+#: sql_help.c:4780 sql_help.c:4782 sql_help.c:4934 sql_help.c:4936
+#: sql_help.c:5112 sql_help.c:5114 sql_help.c:5181 sql_help.c:5183
 msgid "count"
 msgstr "кількість"
 
-#: sql_help.c:3911 sql_help.c:4374
+#: sql_help.c:3986 sql_help.c:4453
 msgid "sequence_name"
 msgstr "ім'я_послідовності"
 
-#: sql_help.c:3929 sql_help.c:4392
+#: sql_help.c:4004 sql_help.c:4471
 msgid "arg_name"
 msgstr "ім'я_аргументу"
 
-#: sql_help.c:3930 sql_help.c:4393
+#: sql_help.c:4005 sql_help.c:4472
 msgid "arg_type"
 msgstr "тип_аргументу"
 
-#: sql_help.c:3937 sql_help.c:4400
+#: sql_help.c:4012 sql_help.c:4479
 msgid "loid"
 msgstr "код_вел_об'єкту"
 
-#: sql_help.c:3968
+#: sql_help.c:4043
 msgid "remote_schema"
 msgstr "віддалена_схема"
 
-#: sql_help.c:3971
+#: sql_help.c:4046
 msgid "local_schema"
 msgstr "локальна_схема"
 
-#: sql_help.c:4006
+#: sql_help.c:4082
 msgid "conflict_target"
 msgstr "ціль_конфлікту"
 
-#: sql_help.c:4007
+#: sql_help.c:4083
 msgid "conflict_action"
 msgstr "дія_при_конфлікті"
 
-#: sql_help.c:4010
+#: sql_help.c:4087
 msgid "where conflict_target can be one of:"
 msgstr "де ціль_конфлікту може бути одним з:"
 
-#: sql_help.c:4011
+#: sql_help.c:4088
 msgid "index_column_name"
 msgstr "ім'я_стовпця_індексу"
 
-#: sql_help.c:4012
+#: sql_help.c:4089
 msgid "index_expression"
 msgstr "вираз_індексу"
 
-#: sql_help.c:4015
+#: sql_help.c:4092
 msgid "index_predicate"
 msgstr "предикат_індексу"
 
-#: sql_help.c:4017
+#: sql_help.c:4094
 msgid "and conflict_action is one of:"
 msgstr "і дія_при_конфлікті одна з:"
 
-#: sql_help.c:4023 sql_help.c:4124 sql_help.c:4964
+#: sql_help.c:4100 sql_help.c:4203 sql_help.c:5044
 msgid "sub-SELECT"
 msgstr "вкладений-SELECT"
 
-#: sql_help.c:4032 sql_help.c:4165 sql_help.c:4940
+#: sql_help.c:4109 sql_help.c:4244 sql_help.c:5019
 msgid "channel"
 msgstr "канал"
 
-#: sql_help.c:4054
+#: sql_help.c:4131
 msgid "lockmode"
 msgstr "режим_блокування"
 
-#: sql_help.c:4055
+#: sql_help.c:4132
 msgid "where lockmode is one of:"
 msgstr "де режим_блокування один з:"
 
-#: sql_help.c:4095
+#: sql_help.c:4173
 msgid "target_table_name"
 msgstr "ім'я_цілі_таблиці"
 
-#: sql_help.c:4096
+#: sql_help.c:4174
 msgid "target_alias"
 msgstr "псевдонім_цілі"
 
-#: sql_help.c:4097
+#: sql_help.c:4175
 msgid "data_source"
 msgstr "джерело_даних"
 
-#: sql_help.c:4098 sql_help.c:4633 sql_help.c:4891 sql_help.c:5136
+#: sql_help.c:4176 sql_help.c:4712 sql_help.c:4970 sql_help.c:5217
 msgid "join_condition"
 msgstr "умова_поєднання"
 
-#: sql_help.c:4099
+#: sql_help.c:4177
 msgid "when_clause"
 msgstr "when_твердження"
 
-#: sql_help.c:4102
+#: sql_help.c:4181
 msgid "where data_source is:"
 msgstr "де джерело_даних:"
 
-#: sql_help.c:4103
+#: sql_help.c:4182
 msgid "source_table_name"
 msgstr "ім'я_початкова_таблиці"
 
-#: sql_help.c:4104
+#: sql_help.c:4183
 msgid "source_query"
 msgstr "джерело_запит"
 
-#: sql_help.c:4105
+#: sql_help.c:4184
 msgid "source_alias"
 msgstr "джерело_псевдоніма"
 
-#: sql_help.c:4106
+#: sql_help.c:4185
 msgid "and when_clause is:"
 msgstr "і when_clause:"
 
-#: sql_help.c:4108 sql_help.c:4111
+#: sql_help.c:4187 sql_help.c:4190
 msgid "merge_update"
 msgstr "merge_update"
 
-#: sql_help.c:4109 sql_help.c:4112
+#: sql_help.c:4188 sql_help.c:4191
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4114
+#: sql_help.c:4193
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4115
+#: sql_help.c:4194
 msgid "and merge_insert is:"
 msgstr "і merge_insert:"
 
-#: sql_help.c:4118
+#: sql_help.c:4197
 msgid "and merge_update is:"
 msgstr "і merge_update:"
 
-#: sql_help.c:4125
+#: sql_help.c:4204
 msgid "and merge_delete is:"
 msgstr "і merge_delete:"
 
-#: sql_help.c:4166
+#: sql_help.c:4245
 msgid "payload"
 msgstr "зміст"
 
-#: sql_help.c:4193
+#: sql_help.c:4272
 msgid "old_role"
 msgstr "стара_роль"
 
-#: sql_help.c:4194
+#: sql_help.c:4273
 msgid "new_role"
 msgstr "нова_роль"
 
-#: sql_help.c:4233 sql_help.c:4442 sql_help.c:4450
+#: sql_help.c:4312 sql_help.c:4521 sql_help.c:4529
 msgid "savepoint_name"
 msgstr "ім'я_точки_збереження"
 
-#: sql_help.c:4590 sql_help.c:4648 sql_help.c:4848 sql_help.c:4906
-#: sql_help.c:5093 sql_help.c:5151
+#: sql_help.c:4669 sql_help.c:4727 sql_help.c:4927 sql_help.c:4985
+#: sql_help.c:5174 sql_help.c:5232
 msgid "grouping_element"
 msgstr "елемент_групування"
 
-#: sql_help.c:4592 sql_help.c:4696 sql_help.c:4850 sql_help.c:5095
+#: sql_help.c:4671 sql_help.c:4775 sql_help.c:4929 sql_help.c:5176
 msgid "window_name"
 msgstr "назва_вікна"
 
-#: sql_help.c:4593 sql_help.c:4697 sql_help.c:4851 sql_help.c:5096
+#: sql_help.c:4672 sql_help.c:4776 sql_help.c:4930 sql_help.c:5177
 msgid "window_definition"
 msgstr "визначення_вікна"
 
-#: sql_help.c:4594 sql_help.c:4608 sql_help.c:4652 sql_help.c:4698
-#: sql_help.c:4852 sql_help.c:4866 sql_help.c:4910 sql_help.c:5097
-#: sql_help.c:5111 sql_help.c:5155
+#: sql_help.c:4673 sql_help.c:4687 sql_help.c:4731 sql_help.c:4777
+#: sql_help.c:4931 sql_help.c:4945 sql_help.c:4989 sql_help.c:5178
+#: sql_help.c:5192 sql_help.c:5236
 msgid "select"
 msgstr "виберіть"
 
-#: sql_help.c:4600 sql_help.c:4858 sql_help.c:5103
+#: sql_help.c:4679 sql_help.c:4937 sql_help.c:5184
 msgid "from_reference"
 msgstr "from_reference"
 
-#: sql_help.c:4601 sql_help.c:4859 sql_help.c:5104
+#: sql_help.c:4680 sql_help.c:4938 sql_help.c:5185
 msgid "where from_item can be one of:"
 msgstr "де джерело_даних може бути одним з:"
 
-#: sql_help.c:4604 sql_help.c:4610 sql_help.c:4613 sql_help.c:4617
-#: sql_help.c:4629 sql_help.c:4862 sql_help.c:4868 sql_help.c:4871
-#: sql_help.c:4875 sql_help.c:4887 sql_help.c:5107 sql_help.c:5113
-#: sql_help.c:5116 sql_help.c:5120 sql_help.c:5132
+#: sql_help.c:4683 sql_help.c:4689 sql_help.c:4692 sql_help.c:4696
+#: sql_help.c:4708 sql_help.c:4941 sql_help.c:4947 sql_help.c:4950
+#: sql_help.c:4954 sql_help.c:4966 sql_help.c:5188 sql_help.c:5194
+#: sql_help.c:5197 sql_help.c:5201 sql_help.c:5213
 msgid "column_alias"
 msgstr "псевдонім_стовпця"
 
-#: sql_help.c:4605 sql_help.c:4863 sql_help.c:5108
+#: sql_help.c:4684 sql_help.c:4942 sql_help.c:5189
 msgid "sampling_method"
 msgstr "метод_вибірки"
 
-#: sql_help.c:4607 sql_help.c:4865 sql_help.c:5110
+#: sql_help.c:4686 sql_help.c:4944 sql_help.c:5191
 msgid "seed"
 msgstr "початкове_число"
 
-#: sql_help.c:4611 sql_help.c:4650 sql_help.c:4869 sql_help.c:4908
-#: sql_help.c:5114 sql_help.c:5153
+#: sql_help.c:4690 sql_help.c:4729 sql_help.c:4948 sql_help.c:4987
+#: sql_help.c:5195 sql_help.c:5234
 msgid "with_query_name"
 msgstr "ім'я_запиту_WITH"
 
-#: sql_help.c:4621 sql_help.c:4624 sql_help.c:4627 sql_help.c:4879
-#: sql_help.c:4882 sql_help.c:4885 sql_help.c:5124 sql_help.c:5127
-#: sql_help.c:5130
+#: sql_help.c:4700 sql_help.c:4703 sql_help.c:4706 sql_help.c:4958
+#: sql_help.c:4961 sql_help.c:4964 sql_help.c:5205 sql_help.c:5208
+#: sql_help.c:5211
 msgid "column_definition"
 msgstr "визначення_стовпця"
 
-#: sql_help.c:4631 sql_help.c:4637 sql_help.c:4889 sql_help.c:4895
-#: sql_help.c:5134 sql_help.c:5140
+#: sql_help.c:4710 sql_help.c:4716 sql_help.c:4968 sql_help.c:4974
+#: sql_help.c:5215 sql_help.c:5221
 msgid "join_type"
 msgstr "тип_поєднання"
 
-#: sql_help.c:4634 sql_help.c:4892 sql_help.c:5137
+#: sql_help.c:4713 sql_help.c:4971 sql_help.c:5218
 msgid "join_column"
 msgstr "стовпець_поєднання"
 
-#: sql_help.c:4635 sql_help.c:4893 sql_help.c:5138
+#: sql_help.c:4714 sql_help.c:4972 sql_help.c:5219
 msgid "join_using_alias"
 msgstr "join_using_alias"
 
-#: sql_help.c:4641 sql_help.c:4899 sql_help.c:5144
+#: sql_help.c:4720 sql_help.c:4978 sql_help.c:5225
 msgid "and grouping_element can be one of:"
 msgstr "і елемент_групування може бути одним з:"
 
-#: sql_help.c:4649 sql_help.c:4907 sql_help.c:5152
+#: sql_help.c:4728 sql_help.c:4986 sql_help.c:5233
 msgid "and with_query is:"
 msgstr "і запит_WITH:"
 
-#: sql_help.c:4653 sql_help.c:4911 sql_help.c:5156
+#: sql_help.c:4732 sql_help.c:4990 sql_help.c:5237
 msgid "values"
 msgstr "значення"
 
-#: sql_help.c:4654 sql_help.c:4912 sql_help.c:5157
+#: sql_help.c:4733 sql_help.c:4991 sql_help.c:5238
 msgid "insert"
 msgstr "вставка"
 
-#: sql_help.c:4655 sql_help.c:4913 sql_help.c:5158
+#: sql_help.c:4734 sql_help.c:4992 sql_help.c:5239
 msgid "update"
 msgstr "оновлення"
 
-#: sql_help.c:4656 sql_help.c:4914 sql_help.c:5159
+#: sql_help.c:4735 sql_help.c:4993 sql_help.c:5240
 msgid "delete"
 msgstr "видалення"
 
-#: sql_help.c:4657 sql_help.c:4915 sql_help.c:5160
+#: sql_help.c:4736 sql_help.c:4994 sql_help.c:5241
 msgid "merge"
 msgstr "об’єднати"
 
-#: sql_help.c:4659 sql_help.c:4917 sql_help.c:5162
+#: sql_help.c:4738 sql_help.c:4996 sql_help.c:5243
 msgid "search_seq_col_name"
 msgstr "search_seq_col_name"
 
-#: sql_help.c:4661 sql_help.c:4919 sql_help.c:5164
+#: sql_help.c:4740 sql_help.c:4998 sql_help.c:5245
 msgid "cycle_mark_col_name"
 msgstr "cycle_mark_col_name"
 
-#: sql_help.c:4662 sql_help.c:4920 sql_help.c:5165
+#: sql_help.c:4741 sql_help.c:4999 sql_help.c:5246
 msgid "cycle_mark_value"
 msgstr "cycle_mark_value"
 
-#: sql_help.c:4663 sql_help.c:4921 sql_help.c:5166
+#: sql_help.c:4742 sql_help.c:5000 sql_help.c:5247
 msgid "cycle_mark_default"
 msgstr "cycle_mark_default"
 
-#: sql_help.c:4664 sql_help.c:4922 sql_help.c:5167
+#: sql_help.c:4743 sql_help.c:5001 sql_help.c:5248
 msgid "cycle_path_col_name"
 msgstr "cycle_path_col_name"
 
-#: sql_help.c:4691
+#: sql_help.c:4770
 msgid "new_table"
 msgstr "нова_таблиця"
 
-#: sql_help.c:4762
+#: sql_help.c:4841
 msgid "snapshot_id"
 msgstr "код_знімку"
 
-#: sql_help.c:5029
+#: sql_help.c:5110
 msgid "sort_expression"
 msgstr "вираз_сортування"
 
-#: sql_help.c:5174 sql_help.c:6158
+#: sql_help.c:5255 sql_help.c:6239
 msgid "abort the current transaction"
 msgstr "перервати поточну транзакцію"
 
-#: sql_help.c:5180
+#: sql_help.c:5261
 msgid "change the definition of an aggregate function"
 msgstr "змінити визначення агрегатної функції"
 
-#: sql_help.c:5186
+#: sql_help.c:5267
 msgid "change the definition of a collation"
 msgstr "змінити визначення правила сортування"
 
-#: sql_help.c:5192
+#: sql_help.c:5273
 msgid "change the definition of a conversion"
 msgstr "змінити визначення перетворення"
 
-#: sql_help.c:5198
+#: sql_help.c:5279
 msgid "change a database"
 msgstr "змінити базу даних"
 
-#: sql_help.c:5204
+#: sql_help.c:5285
 msgid "define default access privileges"
 msgstr "визначити права доступу за замовчуванням"
 
-#: sql_help.c:5210
+#: sql_help.c:5291
 msgid "change the definition of a domain"
 msgstr "змінити визначення домену"
 
-#: sql_help.c:5216
+#: sql_help.c:5297
 msgid "change the definition of an event trigger"
 msgstr "змінити визначення тригеру події"
 
-#: sql_help.c:5222
+#: sql_help.c:5303
 msgid "change the definition of an extension"
 msgstr "змінити визначення розширення"
 
-#: sql_help.c:5228
+#: sql_help.c:5309
 msgid "change the definition of a foreign-data wrapper"
 msgstr "змінити визначення джерела сторонніх даних"
 
-#: sql_help.c:5234
+#: sql_help.c:5315
 msgid "change the definition of a foreign table"
 msgstr "змінити визначення сторонньої таблиці"
 
-#: sql_help.c:5240
+#: sql_help.c:5321
 msgid "change the definition of a function"
 msgstr "змінити визначення функції"
 
-#: sql_help.c:5246
+#: sql_help.c:5327
 msgid "change role name or membership"
 msgstr "змінити назву ролі або членства"
 
-#: sql_help.c:5252
+#: sql_help.c:5333
 msgid "change the definition of an index"
 msgstr "змінити визначення індексу"
 
-#: sql_help.c:5258
+#: sql_help.c:5339
 msgid "change the definition of a procedural language"
 msgstr "змінити визначення процедурної мови"
 
-#: sql_help.c:5264
+#: sql_help.c:5345
 msgid "change the definition of a large object"
 msgstr "змінити визначення великого об'єкту"
 
-#: sql_help.c:5270
+#: sql_help.c:5351
 msgid "change the definition of a materialized view"
 msgstr "змінити визначення матеріалізованого подання"
 
-#: sql_help.c:5276
+#: sql_help.c:5357
 msgid "change the definition of an operator"
 msgstr "змінити визначення оператора"
 
-#: sql_help.c:5282
+#: sql_help.c:5363
 msgid "change the definition of an operator class"
 msgstr "змінити визначення класа операторів"
 
-#: sql_help.c:5288
+#: sql_help.c:5369
 msgid "change the definition of an operator family"
 msgstr "змінити визначення сімейства операторів"
 
-#: sql_help.c:5294
+#: sql_help.c:5375
 msgid "change the definition of a row-level security policy"
 msgstr "змінити визначення політики безпеки на рівні рядків"
 
-#: sql_help.c:5300
+#: sql_help.c:5381
 msgid "change the definition of a procedure"
 msgstr "змінити визначення процедури"
 
-#: sql_help.c:5306
+#: sql_help.c:5387
 msgid "change the definition of a publication"
 msgstr "змінити визначення публікації"
 
-#: sql_help.c:5312 sql_help.c:5414
+#: sql_help.c:5393 sql_help.c:5495
 msgid "change a database role"
 msgstr "змінити роль бази даних"
 
-#: sql_help.c:5318
+#: sql_help.c:5399
 msgid "change the definition of a routine"
 msgstr "змінити визначення підпрограми"
 
-#: sql_help.c:5324
+#: sql_help.c:5405
 msgid "change the definition of a rule"
 msgstr "змінити визначення правила"
 
-#: sql_help.c:5330
+#: sql_help.c:5411
 msgid "change the definition of a schema"
 msgstr "змінити визначення схеми"
 
-#: sql_help.c:5336
+#: sql_help.c:5417
 msgid "change the definition of a sequence generator"
 msgstr "змінити визначення генератору послідовності"
 
-#: sql_help.c:5342
+#: sql_help.c:5423
 msgid "change the definition of a foreign server"
 msgstr "змінити визначення стороннього серверу"
 
-#: sql_help.c:5348
+#: sql_help.c:5429
 msgid "change the definition of an extended statistics object"
 msgstr "змінити визначення об'єкту розширеної статистики"
 
-#: sql_help.c:5354
+#: sql_help.c:5435
 msgid "change the definition of a subscription"
 msgstr "змінити визначення підписки"
 
-#: sql_help.c:5360
+#: sql_help.c:5441
 msgid "change a server configuration parameter"
 msgstr "змінити параметр конфігурації сервера"
 
-#: sql_help.c:5366
+#: sql_help.c:5447
 msgid "change the definition of a table"
 msgstr "змінити визначення таблиці"
 
-#: sql_help.c:5372
+#: sql_help.c:5453
 msgid "change the definition of a tablespace"
 msgstr "змінити визначення табличного простору"
 
-#: sql_help.c:5378
+#: sql_help.c:5459
 msgid "change the definition of a text search configuration"
 msgstr "змінити визначення конфігурації текстового пошуку"
 
-#: sql_help.c:5384
+#: sql_help.c:5465
 msgid "change the definition of a text search dictionary"
 msgstr "змінити визначення словника текстового пошуку"
 
-#: sql_help.c:5390
+#: sql_help.c:5471
 msgid "change the definition of a text search parser"
 msgstr "змінити визначення парсера текстового пошуку"
 
-#: sql_help.c:5396
+#: sql_help.c:5477
 msgid "change the definition of a text search template"
 msgstr "змінити визначення шаблона текстового пошуку"
 
-#: sql_help.c:5402
+#: sql_help.c:5483
 msgid "change the definition of a trigger"
 msgstr "змінити визначення тригеру"
 
-#: sql_help.c:5408
+#: sql_help.c:5489
 msgid "change the definition of a type"
 msgstr "змінити визначення типу"
 
-#: sql_help.c:5420
+#: sql_help.c:5501
 msgid "change the definition of a user mapping"
 msgstr "змінити визначення зіставлень користувачів"
 
-#: sql_help.c:5426
+#: sql_help.c:5507
 msgid "change the definition of a view"
 msgstr "змінити визначення подання"
 
-#: sql_help.c:5432
+#: sql_help.c:5513
 msgid "collect statistics about a database"
 msgstr "зібрати статистику про базу даних"
 
-#: sql_help.c:5438 sql_help.c:6236
+#: sql_help.c:5519 sql_help.c:6317
 msgid "start a transaction block"
 msgstr "розпочати транзакцію"
 
-#: sql_help.c:5444
+#: sql_help.c:5525
 msgid "invoke a procedure"
 msgstr "викликати процедуру"
 
-#: sql_help.c:5450
+#: sql_help.c:5531
 msgid "force a write-ahead log checkpoint"
 msgstr "провести контрольну точку в журналі попереднього запису"
 
-#: sql_help.c:5456
+#: sql_help.c:5537
 msgid "close a cursor"
 msgstr "закрити курсор"
 
-#: sql_help.c:5462
+#: sql_help.c:5543
 msgid "cluster a table according to an index"
 msgstr "перегрупувати таблицю за індексом"
 
-#: sql_help.c:5468
+#: sql_help.c:5549
 msgid "define or change the comment of an object"
 msgstr "задати або змінити коментар об'єкта"
 
-#: sql_help.c:5474 sql_help.c:6032
+#: sql_help.c:5555 sql_help.c:6113
 msgid "commit the current transaction"
 msgstr "затвердити поточну транзакцію"
 
-#: sql_help.c:5480
+#: sql_help.c:5561
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "затвердити транзакцію, раніше підготовлену до двохфазного затвердження"
 
-#: sql_help.c:5486
+#: sql_help.c:5567
 msgid "copy data between a file and a table"
 msgstr "копіювати дані між файлом та таблицею"
 
-#: sql_help.c:5492
+#: sql_help.c:5573
 msgid "define a new access method"
 msgstr "визначити новий метод доступу"
 
-#: sql_help.c:5498
+#: sql_help.c:5579
 msgid "define a new aggregate function"
 msgstr "визначити нову агрегатну функцію"
 
-#: sql_help.c:5504
+#: sql_help.c:5585
 msgid "define a new cast"
 msgstr "визначити приведення типів"
 
-#: sql_help.c:5510
+#: sql_help.c:5591
 msgid "define a new collation"
 msgstr "визначити нове правило сортування"
 
-#: sql_help.c:5516
+#: sql_help.c:5597
 msgid "define a new encoding conversion"
 msgstr "визначити нове перетворення кодування"
 
-#: sql_help.c:5522
+#: sql_help.c:5603
 msgid "create a new database"
 msgstr "створити нову базу даних"
 
-#: sql_help.c:5528
+#: sql_help.c:5609
 msgid "define a new domain"
 msgstr "визначити новий домен"
 
-#: sql_help.c:5534
+#: sql_help.c:5615
 msgid "define a new event trigger"
 msgstr "визначити новий тригер події"
 
-#: sql_help.c:5540
+#: sql_help.c:5621
 msgid "install an extension"
 msgstr "встановити розширення"
 
-#: sql_help.c:5546
+#: sql_help.c:5627
 msgid "define a new foreign-data wrapper"
 msgstr "визначити нове джерело сторонніх даних"
 
-#: sql_help.c:5552
+#: sql_help.c:5633
 msgid "define a new foreign table"
 msgstr "визначити нову сторонню таблицю"
 
-#: sql_help.c:5558
+#: sql_help.c:5639
 msgid "define a new function"
 msgstr "визначити нову функцію"
 
-#: sql_help.c:5564 sql_help.c:5624 sql_help.c:5726
+#: sql_help.c:5645 sql_help.c:5705 sql_help.c:5807
 msgid "define a new database role"
 msgstr "визначити нову роль бази даних"
 
-#: sql_help.c:5570
+#: sql_help.c:5651
 msgid "define a new index"
 msgstr "визначити новий індекс"
 
-#: sql_help.c:5576
+#: sql_help.c:5657
 msgid "define a new procedural language"
 msgstr "визначити нову процедурну мову"
 
-#: sql_help.c:5582
+#: sql_help.c:5663
 msgid "define a new materialized view"
 msgstr "визначити нове матеріалізоване подання"
 
-#: sql_help.c:5588
+#: sql_help.c:5669
 msgid "define a new operator"
 msgstr "визначити новий оператор"
 
-#: sql_help.c:5594
+#: sql_help.c:5675
 msgid "define a new operator class"
 msgstr "визначити новий клас оператора"
 
-#: sql_help.c:5600
+#: sql_help.c:5681
 msgid "define a new operator family"
 msgstr "визначити нове сімейство операторів"
 
-#: sql_help.c:5606
+#: sql_help.c:5687
 msgid "define a new row-level security policy for a table"
 msgstr "визначити нову політику безпеки на рівні рядків для таблиці"
 
-#: sql_help.c:5612
+#: sql_help.c:5693
 msgid "define a new procedure"
 msgstr "визначити нову процедуру"
 
-#: sql_help.c:5618
+#: sql_help.c:5699
 msgid "define a new publication"
 msgstr "визначити нову публікацію"
 
-#: sql_help.c:5630
+#: sql_help.c:5711
 msgid "define a new rewrite rule"
 msgstr "визначити нове правило перезапису"
 
-#: sql_help.c:5636
+#: sql_help.c:5717
 msgid "define a new schema"
 msgstr "визначити нову схему"
 
-#: sql_help.c:5642
+#: sql_help.c:5723
 msgid "define a new sequence generator"
 msgstr "визначити новий генератор послідовностей"
 
-#: sql_help.c:5648
+#: sql_help.c:5729
 msgid "define a new foreign server"
 msgstr "визначити новий сторонній сервер"
 
-#: sql_help.c:5654
+#: sql_help.c:5735
 msgid "define extended statistics"
 msgstr "визначити розширену статистику"
 
-#: sql_help.c:5660
+#: sql_help.c:5741
 msgid "define a new subscription"
 msgstr "визначити нову підписку"
 
-#: sql_help.c:5666
+#: sql_help.c:5747
 msgid "define a new table"
 msgstr "визначити нову таблицю"
 
-#: sql_help.c:5672 sql_help.c:6194
+#: sql_help.c:5753 sql_help.c:6275
 msgid "define a new table from the results of a query"
 msgstr "визначити нову таблицю з результатів запиту"
 
-#: sql_help.c:5678
+#: sql_help.c:5759
 msgid "define a new tablespace"
 msgstr "визначити новий табличний простір"
 
-#: sql_help.c:5684
+#: sql_help.c:5765
 msgid "define a new text search configuration"
 msgstr "визначити нову конфігурацію текстового пошуку"
 
-#: sql_help.c:5690
+#: sql_help.c:5771
 msgid "define a new text search dictionary"
 msgstr "визначити новий словник текстового пошуку"
 
-#: sql_help.c:5696
+#: sql_help.c:5777
 msgid "define a new text search parser"
 msgstr "визначити новий аналізатор текстового пошуку"
 
-#: sql_help.c:5702
+#: sql_help.c:5783
 msgid "define a new text search template"
 msgstr "визначити новий шаблон текстового пошуку"
 
-#: sql_help.c:5708
+#: sql_help.c:5789
 msgid "define a new transform"
 msgstr "визначити нове перетворення"
 
-#: sql_help.c:5714
+#: sql_help.c:5795
 msgid "define a new trigger"
 msgstr "визначити новий тригер"
 
-#: sql_help.c:5720
+#: sql_help.c:5801
 msgid "define a new data type"
 msgstr "визначити новий тип даних"
 
-#: sql_help.c:5732
+#: sql_help.c:5813
 msgid "define a new mapping of a user to a foreign server"
 msgstr "визначити нове зіставлення користувача для стороннього сервера"
 
-#: sql_help.c:5738
+#: sql_help.c:5819
 msgid "define a new view"
 msgstr "визначити нове подання"
 
-#: sql_help.c:5744
+#: sql_help.c:5825
 msgid "deallocate a prepared statement"
 msgstr "звільнити підготовлену команду"
 
-#: sql_help.c:5750
+#: sql_help.c:5831
 msgid "define a cursor"
 msgstr "визначити курсор"
 
-#: sql_help.c:5756
+#: sql_help.c:5837
 msgid "delete rows of a table"
 msgstr "видалити рядки таблиці"
 
-#: sql_help.c:5762
+#: sql_help.c:5843
 msgid "discard session state"
 msgstr "очистити стан сесії"
 
-#: sql_help.c:5768
+#: sql_help.c:5849
 msgid "execute an anonymous code block"
 msgstr "виконати анонімний блок коду"
 
-#: sql_help.c:5774
+#: sql_help.c:5855
 msgid "remove an access method"
 msgstr "видалити метод доступу"
 
-#: sql_help.c:5780
+#: sql_help.c:5861
 msgid "remove an aggregate function"
 msgstr "видалити агрегатну функцію"
 
-#: sql_help.c:5786
+#: sql_help.c:5867
 msgid "remove a cast"
 msgstr "видалити приведення типів"
 
-#: sql_help.c:5792
+#: sql_help.c:5873
 msgid "remove a collation"
 msgstr "видалити правило сортування"
 
-#: sql_help.c:5798
+#: sql_help.c:5879
 msgid "remove a conversion"
 msgstr "видалити перетворення"
 
-#: sql_help.c:5804
+#: sql_help.c:5885
 msgid "remove a database"
 msgstr "видалити базу даних"
 
-#: sql_help.c:5810
+#: sql_help.c:5891
 msgid "remove a domain"
 msgstr "видалити домен"
 
-#: sql_help.c:5816
+#: sql_help.c:5897
 msgid "remove an event trigger"
 msgstr "видалити тригер події"
 
-#: sql_help.c:5822
+#: sql_help.c:5903
 msgid "remove an extension"
 msgstr "видалити розширення"
 
-#: sql_help.c:5828
+#: sql_help.c:5909
 msgid "remove a foreign-data wrapper"
 msgstr "видалити джерело сторонніх даних"
 
-#: sql_help.c:5834
+#: sql_help.c:5915
 msgid "remove a foreign table"
 msgstr "видалити сторонню таблицю"
 
-#: sql_help.c:5840
+#: sql_help.c:5921
 msgid "remove a function"
 msgstr "видалити функцію"
 
-#: sql_help.c:5846 sql_help.c:5912 sql_help.c:6014
+#: sql_help.c:5927 sql_help.c:5993 sql_help.c:6095
 msgid "remove a database role"
 msgstr "видалити роль бази даних"
 
-#: sql_help.c:5852
+#: sql_help.c:5933
 msgid "remove an index"
 msgstr "видалити індекс"
 
-#: sql_help.c:5858
+#: sql_help.c:5939
 msgid "remove a procedural language"
 msgstr "видалити процедурну мову"
 
-#: sql_help.c:5864
+#: sql_help.c:5945
 msgid "remove a materialized view"
 msgstr "видалити матеріалізоване подання"
 
-#: sql_help.c:5870
+#: sql_help.c:5951
 msgid "remove an operator"
 msgstr "видалити оператор"
 
-#: sql_help.c:5876
+#: sql_help.c:5957
 msgid "remove an operator class"
 msgstr "видалити клас операторів"
 
-#: sql_help.c:5882
+#: sql_help.c:5963
 msgid "remove an operator family"
 msgstr "видалити сімейство операторів"
 
-#: sql_help.c:5888
+#: sql_help.c:5969
 msgid "remove database objects owned by a database role"
 msgstr "видалити об'єкти бази даних, що належать ролі"
 
-#: sql_help.c:5894
+#: sql_help.c:5975
 msgid "remove a row-level security policy from a table"
 msgstr "видалити політику безпеки на рівні рядків з таблиці"
 
-#: sql_help.c:5900
+#: sql_help.c:5981
 msgid "remove a procedure"
 msgstr "видалити процедуру"
 
-#: sql_help.c:5906
+#: sql_help.c:5987
 msgid "remove a publication"
 msgstr "видалити публікацію"
 
-#: sql_help.c:5918
+#: sql_help.c:5999
 msgid "remove a routine"
 msgstr "видалити підпрограму"
 
-#: sql_help.c:5924
+#: sql_help.c:6005
 msgid "remove a rewrite rule"
 msgstr "видалити правило перезапису"
 
-#: sql_help.c:5930
+#: sql_help.c:6011
 msgid "remove a schema"
 msgstr "видалити схему"
 
-#: sql_help.c:5936
+#: sql_help.c:6017
 msgid "remove a sequence"
 msgstr "видалити послідовність"
 
-#: sql_help.c:5942
+#: sql_help.c:6023
 msgid "remove a foreign server descriptor"
 msgstr "видалити опис стороннього серверу"
 
-#: sql_help.c:5948
+#: sql_help.c:6029
 msgid "remove extended statistics"
 msgstr "видалити розширену статистику"
 
-#: sql_help.c:5954
+#: sql_help.c:6035
 msgid "remove a subscription"
 msgstr "видалити підписку"
 
-#: sql_help.c:5960
+#: sql_help.c:6041
 msgid "remove a table"
 msgstr "видалити таблицю"
 
-#: sql_help.c:5966
+#: sql_help.c:6047
 msgid "remove a tablespace"
 msgstr "видалити табличний простір"
 
-#: sql_help.c:5972
+#: sql_help.c:6053
 msgid "remove a text search configuration"
 msgstr "видалити конфігурацію тектового пошуку"
 
-#: sql_help.c:5978
+#: sql_help.c:6059
 msgid "remove a text search dictionary"
 msgstr "видалити словник тектового пошуку"
 
-#: sql_help.c:5984
+#: sql_help.c:6065
 msgid "remove a text search parser"
 msgstr "видалити парсер тектового пошуку"
 
-#: sql_help.c:5990
+#: sql_help.c:6071
 msgid "remove a text search template"
 msgstr "видалити шаблон тектового пошуку"
 
-#: sql_help.c:5996
+#: sql_help.c:6077
 msgid "remove a transform"
 msgstr "видалити перетворення"
 
-#: sql_help.c:6002
+#: sql_help.c:6083
 msgid "remove a trigger"
 msgstr "видалити тригер"
 
-#: sql_help.c:6008
+#: sql_help.c:6089
 msgid "remove a data type"
 msgstr "видалити тип даних"
 
-#: sql_help.c:6020
+#: sql_help.c:6101
 msgid "remove a user mapping for a foreign server"
 msgstr "видалити зіставлення користувача для стороннього серверу"
 
-#: sql_help.c:6026
+#: sql_help.c:6107
 msgid "remove a view"
 msgstr "видалити подання"
 
-#: sql_help.c:6038
+#: sql_help.c:6119
 msgid "execute a prepared statement"
 msgstr "виконати підготовлену команду"
 
-#: sql_help.c:6044
+#: sql_help.c:6125
 msgid "show the execution plan of a statement"
 msgstr "показати план виконання команди"
 
-#: sql_help.c:6050
+#: sql_help.c:6131
 msgid "retrieve rows from a query using a cursor"
 msgstr "отримати рядки запиту з курсору"
 
-#: sql_help.c:6056
+#: sql_help.c:6137
 msgid "define access privileges"
 msgstr "визначити права доступу"
 
-#: sql_help.c:6062
+#: sql_help.c:6143
 msgid "import table definitions from a foreign server"
 msgstr "імпортувати визначення таблиць зі стороннього серверу"
 
-#: sql_help.c:6068
+#: sql_help.c:6149
 msgid "create new rows in a table"
 msgstr "створити нові рядки в таблиці"
 
-#: sql_help.c:6074
+#: sql_help.c:6155
 msgid "listen for a notification"
 msgstr "очікувати на повідомлення"
 
-#: sql_help.c:6080
+#: sql_help.c:6161
 msgid "load a shared library file"
 msgstr "завантажити файл спільної бібліотеки"
 
-#: sql_help.c:6086
+#: sql_help.c:6167
 msgid "lock a table"
 msgstr "заблокувати таблицю"
 
-#: sql_help.c:6092
+#: sql_help.c:6173
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "умовно вставити, оновити або видалити рядки таблиці"
 
-#: sql_help.c:6098
+#: sql_help.c:6179
 msgid "position a cursor"
 msgstr "розташувати курсор"
 
-#: sql_help.c:6104
+#: sql_help.c:6185
 msgid "generate a notification"
 msgstr "згенерувати повідомлення"
 
-#: sql_help.c:6110
+#: sql_help.c:6191
 msgid "prepare a statement for execution"
 msgstr "підготувати команду для виконання"
 
-#: sql_help.c:6116
+#: sql_help.c:6197
 msgid "prepare the current transaction for two-phase commit"
 msgstr "підготувати поточну транзакцію для двохфазного затвердження"
 
-#: sql_help.c:6122
+#: sql_help.c:6203
 msgid "change the ownership of database objects owned by a database role"
 msgstr "змінити власника об'єктів БД, що належать заданій ролі"
 
-#: sql_help.c:6128
+#: sql_help.c:6209
 msgid "replace the contents of a materialized view"
 msgstr "замінити вміст матеріалізованого подання"
 
-#: sql_help.c:6134
+#: sql_help.c:6215
 msgid "rebuild indexes"
 msgstr "перебудувати індекси"
 
-#: sql_help.c:6140
+#: sql_help.c:6221
 msgid "release a previously defined savepoint"
 msgstr "звільнити раніше визначену точку збереження"
 
-#: sql_help.c:6146
+#: sql_help.c:6227
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "відновити початкове значення параметру виконання"
 
-#: sql_help.c:6152
+#: sql_help.c:6233
 msgid "remove access privileges"
 msgstr "видалити права доступу"
 
-#: sql_help.c:6164
+#: sql_help.c:6245
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "скасувати транзакцію, раніше підготовлену до двохфазного затвердження"
 
-#: sql_help.c:6170
+#: sql_help.c:6251
 msgid "roll back to a savepoint"
 msgstr "відкотитися до точки збереження"
 
-#: sql_help.c:6176
+#: sql_help.c:6257
 msgid "define a new savepoint within the current transaction"
 msgstr "визначити нову точку збереження в рамках поточної транзакції"
 
-#: sql_help.c:6182
+#: sql_help.c:6263
 msgid "define or change a security label applied to an object"
 msgstr "визначити або змінити мітку безпеки, застосовану до об'єкта"
 
-#: sql_help.c:6188 sql_help.c:6242 sql_help.c:6278
+#: sql_help.c:6269 sql_help.c:6323 sql_help.c:6359
 msgid "retrieve rows from a table or view"
 msgstr "отримати рядки з таблиці або подання"
 
-#: sql_help.c:6200
+#: sql_help.c:6281
 msgid "change a run-time parameter"
 msgstr "змінити параметр виконання"
 
-#: sql_help.c:6206
+#: sql_help.c:6287
 msgid "set constraint check timing for the current transaction"
 msgstr "встановити час перевірки обмеження для поточної транзакції"
 
-#: sql_help.c:6212
+#: sql_help.c:6293
 msgid "set the current user identifier of the current session"
 msgstr "встановити ідентифікатор поточного користувача в поточній сесії"
 
-#: sql_help.c:6218
+#: sql_help.c:6299
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr "встановити ідентифікатор користувача сесії й ідентифікатор поточного користувача в поточній сесії"
 
-#: sql_help.c:6224
+#: sql_help.c:6305
 msgid "set the characteristics of the current transaction"
 msgstr "встановити характеристики поточної транзакції"
 
-#: sql_help.c:6230
+#: sql_help.c:6311
 msgid "show the value of a run-time parameter"
 msgstr "показати значення параметра виконання"
 
-#: sql_help.c:6248
+#: sql_help.c:6329
 msgid "empty a table or set of tables"
 msgstr "очистити таблицю або декілька таблиць"
 
-#: sql_help.c:6254
+#: sql_help.c:6335
 msgid "stop listening for a notification"
 msgstr "припинити очікування повідомлень"
 
-#: sql_help.c:6260
+#: sql_help.c:6341
 msgid "update rows of a table"
 msgstr "змінити рядки таблиці"
 
-#: sql_help.c:6266
+#: sql_help.c:6347
 msgid "garbage-collect and optionally analyze a database"
 msgstr "виконати збір сміття і проаналізувати базу даних"
 
-#: sql_help.c:6272
+#: sql_help.c:6353
 msgid "compute a set of rows"
 msgstr "отримати набір рядків"
 
-#: startup.c:220
+#: startup.c:225
 #, c-format
 msgid "-1 can only be used in non-interactive mode"
 msgstr "-1 можна використовувати лише в неінтерактивному режимі"
 
-#: startup.c:343
+#: startup.c:348
 #, c-format
 msgid "could not open log file \"%s\": %m"
 msgstr "не вдалося відкрити файл журналу \"%s\": %m"
 
-#: startup.c:460
+#: startup.c:465
 #, c-format
 msgid "Type \"help\" for help.\n\n"
 msgstr "Введіть \"help\", щоб отримати допомогу.\n\n"
 
-#: startup.c:612
+#: startup.c:617
 #, c-format
 msgid "could not set printing parameter \"%s\""
 msgstr "не вдалося встановити параметр друку \"%s\""
 
-#: startup.c:719
+#: startup.c:724
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: startup.c:735
+#: startup.c:740
 #, c-format
 msgid "extra command-line argument \"%s\" ignored"
 msgstr "зайвий аргумент \"%s\" проігнорований"
 
-#: startup.c:783
+#: startup.c:788
 #, c-format
 msgid "could not find own program executable"
 msgstr "не вдалося знайти ехе файл власної програми"
 
-#: tab-complete.c:6216
+#: tab-complete.in.c:6639
 #, c-format
 msgid "tab completion query failed: %s\n"
 "Query was:\n"
@@ -6331,22 +6644,47 @@ msgstr "помилка запиту Tab-доповнення: %s\n"
 "Запит:\n"
 "%s"
 
-#: variables.c:139
+#: variables.c:141
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\": Boolean expected"
 msgstr "нерозпізнане значення \"%s\" для \"%s\": очікувалося логічне значення"
 
-#: variables.c:176
+#: variables.c:178
 #, c-format
 msgid "invalid value \"%s\" for \"%s\": integer expected"
 msgstr "неправильне значення \"%s\" для \"%s\": очікувалося ціле число"
 
-#: variables.c:224
+#: variables.c:207
+#, c-format
+msgid "invalid input syntax for variable \"%s\""
+msgstr "невірний синтаксис вводу для змінної \"%s\""
+
+#: variables.c:218
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be greater than %.2f"
+msgstr "невірне значення \"%s\" для змінної \"%s\": повинно бути більше %.2f"
+
+#: variables.c:225
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\": must be less than %.2f"
+msgstr "невірне значення \"%s\" для змінної \"%s\": повинно бути менше %.2f"
+
+#: variables.c:241
+#, c-format
+msgid "value \"%s\" is out of range for variable \"%s\""
+msgstr "значення \"%s\" виходить за межі для змінної \"%s\""
+
+#: variables.c:247
+#, c-format
+msgid "invalid value \"%s\" for variable \"%s\""
+msgstr "невірне значення \"%s\" для змінної \"%s\""
+
+#: variables.c:294
 #, c-format
 msgid "invalid variable name: \"%s\""
 msgstr "неправильне ім'я змінної: \"%s\""
 
-#: variables.c:418
+#: variables.c:488
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"\n"
 "Available values are: %s."
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 43eff2c82f8..33be4536845 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -3005,6 +3005,11 @@ msgstr "  \\dg[S+] [模式]         列出角色\n"
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [模式]         列出索引\n"
 
+#: help.c:253
+#, c-format
+msgid "  \\dk[S+] [PATTERN]      list packages\n"
+msgstr "  \\dk[S+] [模式]         列出包\n"
+
 #: help.c:251
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 3aa7d2d06c8..92f01f900b1 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -169,8 +169,12 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
 					break;
 					/* service name */
 				case 's':
-					if (pset.db && PQservice(pset.db))
-						strlcpy(buf, PQservice(pset.db), sizeof(buf));
+					{
+						const char *service_name = GetVariable(pset.vars, "SERVICE");
+
+						if (service_name)
+							strlcpy(buf, service_name, sizeof(buf));
+					}
 					break;
 					/* backend pid */
 				case 'p':
@@ -184,6 +188,7 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
 					break;
 					/* pipeline status */
 				case 'P':
+					if (pset.db)
 					{
 						PGpipelineStatus status = PQpipelineStatus(pset.db);
 
@@ -193,9 +198,8 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
 							strlcpy(buf, "abort", sizeof(buf));
 						else
 							strlcpy(buf, "off", sizeof(buf));
-						break;
 					}
-
+					break;
 				case '0':
 				case '1':
 				case '2':
diff --git a/src/bin/psql/psqlplus.h b/src/bin/psql/psqlplus.h
index 6b36adfdd4b..b3e47c27ae8 100644
--- a/src/bin/psql/psqlplus.h
+++ b/src/bin/psql/psqlplus.h
@@ -7,7 +7,7 @@
  *
  * Authored by zhenmingyang@highgo.com, 20221221.
  *
- * Copyright (c) 2022-2025, IvorySQL Global Development Team
+ * Copyright (c) 2022-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		src/bin/psql/psqlplus.h
@@ -64,21 +64,30 @@ typedef struct PsqlScanKeyword
 #define MaxOraCharLen 2000	/* Maximum length for CHAR */
 #define MaxOraVarcharLen 32767	/* Maximum length for VARCHAR2 */
 
+#define BINDVARREF 3000
+
 /*
- * Scanner interface functions
- * 
- * The type of yyscanner is opaque outside psqlplus.l, so we forward declare
- * YYSTYPE and declare the external functions needed by the parser.
+ * The scanner returns extra data about scanned tokens in this union type.
+ * Note that this is a subset of the fields used in YYSTYPE of the bison
+ * parsers built atop the scanner.
  */
-union YYSTYPE;
+typedef union psql_YYSTYPE
+{
+	int			ival;
+	char	   *str;
+	const char *keyword;
+} psql_YYSTYPE;
 
+union YYSTYPE;
 /* Scanner lifecycle management */
 extern yyscan_t psqlplus_scanner_init(PsqlScanState state);
 extern void psqlplus_scanner_finish(yyscan_t yyscanner);
 /* Parser interface functions */
 extern int psqlplus_yyparse(yyscan_t yyscanner);
 extern int psqlplus_yylex(union YYSTYPE *lvalp, yyscan_t yyscanner);
+extern int orapsql_yylex(psql_YYSTYPE *lvalp, yyscan_t yyscanner);
 extern void psqlplus_yyerror(yyscan_t yyscanner, const char *message);
+extern void orapsql_yyerror(yyscan_t yyscanner, const char *message);
 
 /* Callback functions for the flex lexer */
 static const Ora_psqlScanCallbacks psqlplus_callbacks = {
diff --git a/src/bin/psql/psqlplusparse.y b/src/bin/psql/psqlplusparse.y
index 9061ea57da4..7c77b218870 100644
--- a/src/bin/psql/psqlplusparse.y
+++ b/src/bin/psql/psqlplusparse.y
@@ -8,7 +8,7 @@
  *
  * Authored by zhenmingyang@highgo.com, 20221221.
  *
- * Copyright (c) 2022-2025, IvorySQL Global Development Team
+ * Copyright (c) 2022-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		src/bin/psql/psqlplusparse.y
@@ -25,6 +25,7 @@
 
 static psqlplus_cmd_var *make_variable_node(void);
 static psqlplus_cmd_print *make_print_node(void);
+static psqlplus_cmd_execute *make_exec_node(void);
 static BindVarType *make_bindvartype(int32 oid, int32 typmod, const char *typname);
 static char *get_guc_settings(const char *gucname);
 static print_item *make_print_item(char *name, bool valid);
@@ -42,6 +43,7 @@ static print_list *merge_print_list(print_list *list1, print_list *list2);
 
 %union
 {
+	psql_YYSTYPE		psql_yysype;
 	int					ival;
 	char				*str;
 	const char			*keyword;
@@ -50,18 +52,20 @@ static print_list *merge_print_list(print_list *list1, print_list *list2);
 	print_list			*print_item_list;
 }
 
-%type <psqlplus_cmd> variable_stmt variable_spec print_stmt
+%type <psqlplus_cmd> variable_stmt variable_spec print_stmt exec_stmt
 %type <bindvartype> bind_vartype
 %type <print_item_list> print_items_list print_items
 %type <keyword> unreserved_keyword
+%type <keyword> variable_keyword exec_keyword
 %type <str> opt_varname bind_varname bind_varvalue
 %type <str> Sconst
 
-%token <keyword>	K_VARIABLE K_CHAR K_BYTE K_NCHAR K_VARCHAR2 K_NVARCHAR2
-	K_NUMBER K_BINARY_FLOAT K_BINARY_DOUBLE K_PRINT
+%token <keyword>	K_VAR K_VARIABLE K_CHAR K_BYTE K_NCHAR K_VARCHAR2 K_NVARCHAR2
+	K_NUMBER K_BINARY_FLOAT K_BINARY_DOUBLE K_PRINT K_EXECUTE K_EXEC
 %token <str>	IDENT FCONST LITERAL DQCONST SQCONST
 %token <ival>	ICONST
 %token <str>	SINGLE_QUOTE_NO_END DOUBLE_QUOTE_NO_END
+%token			TYPECAST
 
 %%
 
@@ -74,17 +78,21 @@ psqlplus_toplevel_stmt:
 			{
 				psql_yyget_extra(yyscanner)->psqlpluscmd = $1;
 			}
+		| exec_stmt opt_semi
+			{
+				psql_yyget_extra(yyscanner)->psqlpluscmd = $1;
+			}
 	;
 
 /*
  * Oracle SQL*PLUS VARIABLE statement.
  */
 variable_stmt:
-	K_VARIABLE variable_spec
+	variable_keyword variable_spec
 		{
 			$$ = $2;
 		}
-	| K_VARIABLE opt_varname truncate_char
+	| variable_keyword opt_varname truncate_char
 		{
 			/*
 			 * Oracle's unusual behavior, when encountering these characters 
@@ -102,6 +110,11 @@ variable_stmt:
 		}
 	;
 
+variable_keyword:
+			K_VARIABLE
+			| K_VAR
+		;
+
 variable_spec:
 		bind_varname
 			{
@@ -388,6 +401,33 @@ print_items:
 		}
 	;
 
+/*
+ * Oracle SQL*PLUS EXEC[UTE] statement.
+ */
+exec_stmt: exec_keyword
+		{
+			PsqlScanState state = psql_yyget_extra(yyscanner);
+
+			if (state->is_sqlplus_cmd)
+			{
+				psqlplus_cmd_execute *exec = make_exec_node();
+				int	offset = strlen(state->scanbuf);
+				exec->plisqlstmts = pg_strdup(state->scanline + offset);
+				state->psqlpluscmd = (psqlplus_cmd *) exec;
+				return 0;
+			}
+			else
+			{
+				return 1;
+			}
+		}
+	;
+
+exec_keyword:
+		K_EXECUTE
+		| K_EXEC
+	;
+
 /*
  * Single quotes and double quotes have different semantics 
  * in the PRINT command of SQL*PLUS ,  so the tokens of the 
@@ -408,10 +448,13 @@ unreserved_keyword:
 		| K_BINARY_FLOAT
 		| K_BYTE
 		| K_CHAR
+		| K_EXEC
+		| K_EXECUTE
 		| K_NCHAR
 		| K_NUMBER
 		| K_NVARCHAR2
 		| K_PRINT
+		| K_VAR
 		| K_VARCHAR2
 		| K_VARIABLE
 	;
@@ -442,6 +485,15 @@ make_print_node(void)
 	return print;
 }
 
+static psqlplus_cmd_execute *
+make_exec_node(void)
+{
+	psqlplus_cmd_execute *exec = pg_malloc0(sizeof(psqlplus_cmd_execute));
+	exec->cmd_type = PSQLPLUS_CMD_EXECUTE;
+	exec->plisqlstmts = NULL;
+	return exec;
+}
+
 static BindVarType *
 make_bindvartype(int32 oid, int32 typmod, const char *typname)
 {
@@ -538,6 +590,19 @@ merge_print_list(print_list *list1, print_list *list2)
 	return list1;
 }
 
-/* ... and the yylval macro, which flex will have its own definition for */
+int
+psqlplus_yylex(YYSTYPE *lvalp, yyscan_t yyscanner)
+{
+	return orapsql_yylex(&(lvalp->psql_yysype), yyscanner);
+}
+
+void
+psqlplus_yyerror(yyscan_t yyscanner, const char *message)
+{
+	/* do nothing */
+}
+
+/* yylex and the yylval macro, which flex will have its own definition */
 #undef yylval
+#undef yylex
 
diff --git a/src/bin/psql/psqlplusscan.l b/src/bin/psql/psqlplusscan.l
index d39cd50817f..6289636313b 100644
--- a/src/bin/psql/psqlplusscan.l
+++ b/src/bin/psql/psqlplusscan.l
@@ -8,7 +8,7 @@
  *
  * Authored by zhenmingyang@highgo.com, 20221221.
  *
- * Copyright (c) 2022-2025, IvorySQL Global Development Team
+ * Copyright (c) 2022-2026, IvorySQL Global Development Team
  *
  * Identification:
  *		src/bin/psql/psqlplusscan.l
@@ -36,15 +36,23 @@ static const PsqlScanKeyword psqlplus_keywords[] = {
 	PSQL_KEYWORD("binary_float", K_BINARY_FLOAT, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("byte", K_BYTE, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("char", K_CHAR, UNRESERVED_PSQL_KEYWORD)
+	PSQL_KEYWORD("exec", K_EXEC, UNRESERVED_PSQL_KEYWORD)
+	PSQL_KEYWORD("execute", K_EXECUTE, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("nchar", K_NCHAR, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("number", K_NUMBER, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("nvarchar2", K_NVARCHAR2, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("print", K_PRINT, UNRESERVED_PSQL_KEYWORD)
+	PSQL_KEYWORD("var", K_VAR, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("varchar2", K_VARCHAR2, UNRESERVED_PSQL_KEYWORD)
 	PSQL_KEYWORD("variable", K_VARIABLE, UNRESERVED_PSQL_KEYWORD)
 };
 
-const int	NumKeywords = lengthof(psqlplus_keywords);
+static const int	NumKeywords = lengthof(psqlplus_keywords);
+
+/*
+ * Set the type of YYSTYPE.
+ */
+#define YYSTYPE psql_YYSTYPE
 
 static const PsqlScanKeyword *PsqlplusKeywordLookup(const char *text);
 static int process_integer_literal(const char *token, YYSTYPE *lval);
@@ -65,7 +73,7 @@ static char *litbufdup(char *prefix, yyscan_t yyscanner);
 %option nounput
 %option noyywrap
 %option warn
-%option prefix="psqlplus_yy"
+%option prefix="orapsql_yy"
 
 /*
  * Exclusive states:
@@ -121,6 +129,15 @@ ident_cont		[A-Za-z\200-\377_0-9\#\$]
 
 identifier		{ident_start}{ident_cont}*
 
+typecast		"::"
+
+/*
+ * This flex rule is not used in the syntax of bison,
+ * we just use it to detect whether a bind variable is
+ * referenced in a SQL text.
+ */
+bindvarref		:{identifier}
+
 /*
  * "self" is the set of chars that should be returned
  * as single-character tokens.
@@ -217,6 +234,7 @@ xlinside		[^ ]+
 <xq>{quote}		{
 					BEGIN(INITIAL);
 					yylval->str = litbufdup(NULL, yyscanner);
+					cur_state->token_count++;
 					return SQCONST;
 				}
 
@@ -227,6 +245,7 @@ xlinside		[^ ]+
 					 */
 					BEGIN(INITIAL);
 					yylval->str = litbufdup("'", yyscanner);
+					cur_state->token_count++;
 					return SINGLE_QUOTE_NO_END;
 				}
 
@@ -245,33 +264,55 @@ xlinside		[^ ]+
 <xd>{dquote}	{
 					BEGIN(INITIAL);
 					yylval->str = litbufdup(NULL, yyscanner);
+					cur_state->token_count++;
 					return DQCONST;
 				}
 
 <xd><<EOF>>		{
 					BEGIN(INITIAL);
 					yylval->str = litbufdup("\"", yyscanner);
+					cur_state->token_count++;
 					return DOUBLE_QUOTE_NO_END;
 				}
 
+{typecast}		{
+					cur_state->token_count++;
+					return TYPECAST;
+				}
+
 {self}			{
+					cur_state->token_count++;
 					return yytext[0];
 				}
 
+{bindvarref}	{
+					/*
+					 * BINDVARREF is not a token number defined by bison,
+					 * it is just a simple macro within psqlplus.h.
+					 */
+					yylval->str = pg_strdup(yytext);
+					cur_state->token_count++;
+					return BINDVARREF;
+				}
+
 {integer}		{
+					cur_state->token_count++;
 					return process_integer_literal(yytext, yylval);
 				}
 {decimal}		{
+					cur_state->token_count++;
 					yylval->str = pg_strdup(yytext);
 					return FCONST;
 				}
 {decimalfail}	{
 					/* throw back the .., and treat as integer */
 					yyless(yyleng - 2);
+					cur_state->token_count++;
 					return process_integer_literal(yytext, yylval);
 				}
 {real}			{
 					yylval->str = pg_strdup(yytext);
+					cur_state->token_count++;
 					return FCONST;
 				}
 {realfail1}		{
@@ -280,11 +321,13 @@ xlinside		[^ ]+
 					 * remains is an {integer} or {decimal}.
 					 */
 					yyless(yyleng - 1);
+					cur_state->token_count++;
 					return process_integer_literal(yytext, yylval);
 				}
 {realfail2}		{
 					/* throw back the [Ee][+-], and proceed as above */
 					yyless(yyleng - 2);
+					cur_state->token_count++;
 					return process_integer_literal(yytext, yylval);
 				}
 
@@ -292,7 +335,6 @@ xlinside		[^ ]+
 					const PsqlScanKeyword *keyword;
 					char	   *ident;
 
-					cur_state->identifier_count++;
 					keyword = PsqlplusKeywordLookup(yytext);
 
 					if (keyword != NULL)
@@ -303,17 +345,22 @@ xlinside		[^ ]+
 						 * continue processing according to the native PG psql parsing
 						 * after returning, this command should not be sent to gram.y.
 						 */
-						if (cur_state->identifier_count == 1 &&
+						if (cur_state->token_count == 0 &&
 							(strcmp(keyword->name, "variable") == 0 ||
-							 strcmp(keyword->name, "print") == 0))
+							 strcmp(keyword->name, "var") == 0 ||
+							 strcmp(keyword->name, "print") == 0 ||
+							 strcmp(keyword->name, "execute") == 0 ||
+							 strcmp(keyword->name, "exec") == 0))
 							cur_state->is_sqlplus_cmd = true;
 
 						yylval->keyword = keyword->name;
+						cur_state->token_count++;
 						return keyword->value;
 					}
 
 					ident = psqlplus_downcase_identifier(yytext, yyleng);
 					yylval->str = ident;
+					cur_state->token_count++;
 					return IDENT;
 				}
 
@@ -330,12 +377,14 @@ xlinside		[^ ]+
 <xl>{space}		{
 					BEGIN(INITIAL);
 					yylval->str = litbufdup(NULL, yyscanner);
+					cur_state->token_count++;
 					return LITERAL;
 				}
 
 <xl><<EOF>>		{
 					BEGIN(INITIAL);
 					yylval->str = litbufdup(NULL, yyscanner);
+					cur_state->token_count++;
 					return LITERAL;
 				}
 
@@ -347,8 +396,7 @@ xlinside		[^ ]+
 
 /* LCOV_EXCL_STOP */
 
-void
-psqlplus_yyerror(yyscan_t yyscanner, const char *message)
+void orapsql_yyerror(yyscan_t yyscanner, const char *message)
 {
 	/* do nothing */
 }
@@ -365,7 +413,7 @@ psqlplus_scanner_init(PsqlScanState state)
 	/* Set current output target */
 	state->output_buf = NULL;
 
-	state->identifier_count = 0;
+	state->token_count = 0;
 	state->is_sqlplus_cmd = false;
 
 	/* initialize literal buffer */
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index fd82303f776..53a536c9108 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -169,6 +169,7 @@ typedef struct _psqlSettings
 	bool		singlestep;
 	bool		hide_compression;
 	bool		hide_tableam;
+	bool		execute_run_prepare;
 	int			fetch_count;
 	int			histsize;
 	int			ignoreeof;
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 9cd7e93f922..926ba8b20a5 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/startup.c
@@ -202,6 +202,7 @@ main(int argc, char *argv[])
 
 	/* Default values for variables (that don't match the result of \unset) */
 	SetVariableBool(pset.vars, "AUTOCOMMIT");
+	SetVariable(pset.vars, "EXECUTE_RUN_PREPARE", "off");
 	SetVariable(pset.vars, "PROMPT1", DEFAULT_PROMPT1);
 	SetVariable(pset.vars, "PROMPT2", DEFAULT_PROMPT2);
 	SetVariable(pset.vars, "PROMPT3", DEFAULT_PROMPT3);
@@ -395,8 +396,8 @@ main(int argc, char *argv[])
 			}
 			else if (cell->action == ACT_SINGLE_SLASH)
 			{
-				PsqlScanState scan_state;
-				ConditionalStack cond_stack;
+				PsqlScanState scan_state = NULL;
+				ConditionalStack cond_stack = NULL;
 
 				pg_logging_config(PG_LOG_FLAG_TERSE);
 
@@ -1230,6 +1231,12 @@ hide_compression_hook(const char *newval)
 							 &pset.hide_compression);
 }
 
+static bool
+execute_run_prepare_hook(const char *newval)
+{
+	return ParseVariableBool(newval, "EXECUTE_RUN_PREPARE", &pset.execute_run_prepare);
+}
+
 static bool
 hide_tableam_hook(const char *newval)
 {
@@ -1310,4 +1317,7 @@ EstablishVariableSpace(void)
 	SetVariableHooks(pset.vars, "WATCH_INTERVAL",
 					 watch_interval_substitute_hook,
 					 watch_interval_hook);
+	SetVariableHooks(pset.vars, "EXECUTE_RUN_PREPARE",
+					 bool_substitute_hook,
+					 execute_run_prepare_hook);
 }
diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl
index 80e893cbf54..4d26a8ce13f 100644
--- a/src/bin/psql/t/001_basic.pl
+++ b/src/bin/psql/t/001_basic.pl
@@ -531,4 +531,11 @@ sub psql_fails_like
 	qr/COPY in a pipeline is not supported, aborting connection/,
 	'\copy to in pipeline: fails');
 
+psql_fails_like(
+	$node,
+	qq{\\restrict test
+\\! should_fail},
+	qr/backslash commands are restricted; only \\unrestrict is allowed/,
+	'meta-command in restrict mode fails');
+
 done_testing();
diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index 6bb516920e5..50bf880fe83 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  *
  * src/bin/psql/tab-complete.in.c
@@ -1017,7 +1017,7 @@ static const SchemaQuery Query_for_trigger_of_table = {
 
 #define Query_for_list_of_database_vars \
 "SELECT conf FROM ("\
-"       SELECT setdatabase, pg_catalog.split_part(unnest(setconfig),'=',1) conf"\
+"       SELECT setdatabase, pg_catalog.split_part(pg_catalog.unnest(setconfig),'=',1) conf"\
 "         FROM pg_db_role_setting "\
 "       ) s, pg_database d "\
 " WHERE s.setdatabase = d.oid "\
@@ -1093,9 +1093,12 @@ Keywords_for_list_of_owner_roles, "PUBLIC"
 "  WHERE usename LIKE '%s'"
 
 #define Query_for_list_of_user_vars \
-" SELECT pg_catalog.split_part(pg_catalog.unnest(rolconfig),'=',1) "\
-"   FROM pg_catalog.pg_roles "\
-"  WHERE rolname LIKE '%s'"
+"SELECT conf FROM ("\
+"       SELECT rolname, pg_catalog.split_part(pg_catalog.unnest(rolconfig),'=',1) conf"\
+"         FROM pg_catalog.pg_roles"\
+"       ) s"\
+"  WHERE s.conf like '%s' "\
+"    AND s.rolname LIKE '%s'"
 
 #define Query_for_list_of_access_methods \
 " SELECT amname "\
@@ -1205,6 +1208,19 @@ Alter_procedure_options, "COST", "IMMUTABLE", "LEAKPROOF", "NOT LEAKPROOF", \
 Alter_routine_options, "CALLED ON NULL INPUT", "RETURNS NULL ON NULL INPUT", \
 "STRICT", "SUPPORT"
 
+/* COPY options shared between FROM and TO */
+#define Copy_common_options \
+"DELIMITER", "ENCODING", "ESCAPE", "FORMAT", "HEADER", "NULL", "QUOTE"
+
+/* COPY FROM options */
+#define Copy_from_options \
+Copy_common_options, "DEFAULT", "FORCE_NOT_NULL", "FORCE_NULL", "FREEZE", \
+"LOG_VERBOSITY", "ON_ERROR", "REJECT_LIMIT"
+
+/* COPY TO options */
+#define Copy_to_options \
+Copy_common_options, "FORCE_QUOTE"
+
 /*
  * These object types were introduced later than our support cutoff of
  * server version 9.2.  We use the VersionedQuery infrastructure so that
@@ -1912,11 +1928,11 @@ psql_completion(const char *text, int start, int end)
 		"\\out",
 		"\\parse", "\\password", "\\print", "\\prompt", "\\pset",
 		"\\qecho", "\\quit",
-		"\\reset",
+		"\\reset", "\\restrict",
 		"\\s", "\\sendpipeline", "\\set", "\\setenv", "\\sf",
 		"\\startpipeline", "\\sv", "\\syncpipeline",
 		"\\t", "\\T", "\\timing",
-		"\\unset",
+		"\\unrestrict", "\\unset",
 		"\\x",
 		"\\warn", "\\watch", "\\write",
 		"\\z",
@@ -2513,7 +2529,10 @@ match_previous_words(int pattern_id,
 
 	/* ALTER USER,ROLE <name> RESET */
 	else if (Matches("ALTER", "USER|ROLE", MatchAny, "RESET"))
+	{
+		set_completion_reference(prev2_wd);
 		COMPLETE_WITH_QUERY_PLUS(Query_for_list_of_user_vars, "ALL");
+	}
 
 	/* ALTER USER,ROLE <name> WITH */
 	else if (Matches("ALTER", "USER|ROLE", MatchAny, "WITH"))
@@ -2903,7 +2922,7 @@ match_previous_words(int pattern_id,
 	/* ALTER TABLE ALTER [COLUMN] <foo> SET */
 	else if (Matches("ALTER", "TABLE", MatchAny, "ALTER", "COLUMN", MatchAny, "SET") ||
 			 Matches("ALTER", "TABLE", MatchAny, "ALTER", MatchAny, "SET"))
-		COMPLETE_WITH("(", "COMPRESSION", "DATA TYPE", "DEFAULT", "EXPRESSION", "GENERATED", "NOT NULL", "STATISTICS", "STORAGE", "INVISIBLE"
+		COMPLETE_WITH("(", "COMPRESSION", "DATA TYPE", "DEFAULT", "EXPRESSION", "GENERATED", "NOT NULL", "STATISTICS", "STORAGE", "INVISIBLE",
 		/* a subset of ALTER SEQUENCE options */
 					  "INCREMENT", "MINVALUE", "MAXVALUE", "START", "NO", "CACHE", "CYCLE");
 	/* ALTER TABLE ALTER [COLUMN] <foo> SET ( */
@@ -3125,6 +3144,9 @@ match_previous_words(int pattern_id,
 		else if (TailMatches("VERBOSE|SKIP_LOCKED"))
 			COMPLETE_WITH("ON", "OFF");
 	}
+	else if (Matches("ANALYZE", "(*)"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_analyzables,
+										"ONLY");
 	else if (Matches("ANALYZE", MatchAnyN, "("))
 		/* "ANALYZE (" should be caught above, so assume we want columns */
 		COMPLETE_WITH_ATTR(prev2_wd);
@@ -3312,23 +3334,24 @@ match_previous_words(int pattern_id,
 	else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny))
 		COMPLETE_WITH("WITH (", "WHERE");
 
-	/* Complete COPY <sth> FROM|TO filename WITH ( */
-	else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "("))
-		COMPLETE_WITH("FORMAT", "FREEZE", "DELIMITER", "NULL",
-					  "HEADER", "QUOTE", "ESCAPE", "FORCE_QUOTE",
-					  "FORCE_NOT_NULL", "FORCE_NULL", "ENCODING", "DEFAULT",
-					  "ON_ERROR", "LOG_VERBOSITY", "REJECT_LIMIT");
+	/* Complete COPY <sth> FROM filename WITH ( */
+	else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny, "WITH", "("))
+		COMPLETE_WITH(Copy_from_options);
+
+	/* Complete COPY <sth> TO filename WITH ( */
+	else if (Matches("COPY|\\copy", MatchAny, "TO", MatchAny, "WITH", "("))
+		COMPLETE_WITH(Copy_to_options);
 
 	/* Complete COPY <sth> FROM|TO filename WITH (FORMAT */
 	else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "(", "FORMAT"))
 		COMPLETE_WITH("binary", "csv", "text");
 
 	/* Complete COPY <sth> FROM filename WITH (ON_ERROR */
-	else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "(", "ON_ERROR"))
+	else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny, "WITH", "(", "ON_ERROR"))
 		COMPLETE_WITH("stop", "ignore");
 
 	/* Complete COPY <sth> FROM filename WITH (LOG_VERBOSITY */
-	else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "(", "LOG_VERBOSITY"))
+	else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny, "WITH", "(", "LOG_VERBOSITY"))
 		COMPLETE_WITH("silent", "default", "verbose");
 
 	/* Complete COPY <sth> FROM <sth> WITH (<options>) */
@@ -4976,7 +4999,7 @@ match_previous_words(int pattern_id,
 	/* Complete with a variable name */
 	else if (TailMatches("SET|RESET") &&
 			 !TailMatches("UPDATE", MatchAny, "SET") &&
-			 !TailMatches("ALTER", "DATABASE", MatchAny, "RESET"))
+			 !TailMatches("ALTER", "DATABASE|USER|ROLE", MatchAny, "RESET"))
 		COMPLETE_WITH_QUERY_VERBATIM_PLUS(Query_for_list_of_set_vars,
 										  "CONSTRAINTS",
 										  "TRANSACTION",
@@ -5181,24 +5204,6 @@ match_previous_words(int pattern_id,
 										"VERBOSE",
 										"ANALYZE",
 										"ONLY");
-	else if (Matches("VACUUM", "FULL"))
-		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
-										"FREEZE",
-										"VERBOSE",
-										"ANALYZE",
-										"ONLY");
-	else if (Matches("VACUUM", MatchAnyN, "FREEZE"))
-		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
-										"VERBOSE",
-										"ANALYZE",
-										"ONLY");
-	else if (Matches("VACUUM", MatchAnyN, "VERBOSE"))
-		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
-										"ANALYZE",
-										"ONLY");
-	else if (Matches("VACUUM", MatchAnyN, "ANALYZE"))
-		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
-										"ONLY");
 	else if (HeadMatches("VACUUM", "(*") &&
 			 !HeadMatches("VACUUM", "(*)"))
 	{
@@ -5218,6 +5223,27 @@ match_previous_words(int pattern_id,
 		else if (TailMatches("INDEX_CLEANUP"))
 			COMPLETE_WITH("AUTO", "ON", "OFF");
 	}
+	else if (Matches("VACUUM", "(*)"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
+										"ONLY");
+	else if (Matches("VACUUM", "FULL"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
+										"FREEZE",
+										"VERBOSE",
+										"ANALYZE",
+										"ONLY");
+	else if (Matches("VACUUM", MatchAnyN, "FREEZE"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
+										"VERBOSE",
+										"ANALYZE",
+										"ONLY");
+	else if (Matches("VACUUM", MatchAnyN, "VERBOSE"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
+										"ANALYZE",
+										"ONLY");
+	else if (Matches("VACUUM", MatchAnyN, "ANALYZE"))
+		COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_vacuumables,
+										"ONLY");
 	else if (Matches("VACUUM", MatchAnyN, "("))
 		/* "VACUUM (" should be caught above, so assume we want columns */
 		COMPLETE_WITH_ATTR(prev2_wd);
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 825b4872795..7acce892a8d 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -196,6 +196,12 @@ valid_bind_variable_value(const int typoid, const int typmod, const char *value)
 				}
 			}
 			break;
+		/* TODO */
+		//case REFCURSOR:
+		//case BLOB:
+		//case CLOB:
+		//case NCLOB:
+		//case BFILE:
 		default:
 			pg_log_error("The datatype of the bind variable is not supported.");
 			break;
@@ -1008,9 +1014,12 @@ AssignBindVariable(VariableSpace space, const char *name, const char *value)
 	{
 		char	*newvalue = valid_bind_variable_value(current->typoid, current->typmod, value);
 
-		if (current->value)
-			pg_free(current->value);
-		current->value = newvalue;
+		if (newvalue)
+		{
+			if (current->value)
+				pg_free(current->value);
+			current->value = newvalue;
+		}
 	}
 	else
 	{
@@ -1063,3 +1072,37 @@ ValidBindVariableName(const char *name)
 
 	return true;
 }
+
+/*
+ * Checks whether a bind variable exists,and returns the
+ * bind variable if exists, otherwise returns NULL.
+ */
+struct _variable *
+BindVariableExist(VariableSpace space, const char *name)
+{
+	struct _variable *current;
+
+	if (!space || !name)
+		return NULL;
+
+	if (!ValidBindVariableName(name))
+	{
+		/* If the name is illegal, it must not exist */
+		return NULL;
+	}
+
+	for (current = space->next; current; current = current->next)
+	{
+		int			cmp = strcmp(current->name, name);
+
+		if (cmp == 0 && current->varkind == PSQL_BIND_VAR)
+		{
+			return current;
+		}
+
+		if (cmp > 0)
+			break;	/* it's not there */
+	}
+
+	return NULL;
+}
diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h
index 87fa13d5bc2..7289015f7d1 100644
--- a/src/bin/psql/variables.h
+++ b/src/bin/psql/variables.h
@@ -130,5 +130,6 @@ void		ListBindVariables(VariableSpace space, const char *name);
 void		PrintBindVariables(VariableSpace space, print_list *bvlist);
 bool		AssignBindVariable(VariableSpace space, const char *name, const char *value);
 bool		ValidBindVariableName(const char *name);
+struct _variable *BindVariableExist(VariableSpace space, const char *name);
 
 #endif							/* VARIABLES_H */
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 38c4806b7ab..4b8c87c76d7 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/bin/scripts/Makefile
 #
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 2dc8b4c9714..49faf1b121b 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -2,7 +2,7 @@
  *
  * clusterdb
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 2002-2025, PostgreSQL Global Development Group
  *
  * src/bin/scripts/clusterdb.c
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 5b2d0ae40b1..fb903167fd1 100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/scripts/createdb.c
  *
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 3869e961e99..62fff0d348d 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/scripts/createuser.c
  *
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 56d253ef642..ed3f0151c31 100644
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/scripts/dropdb.c
  *
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 1d783dafa97..f9c216dd3d6 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/scripts/dropuser.c
  *
diff --git a/src/bin/scripts/po/es.po b/src/bin/scripts/po/es.po
index 97f4e2e3068..22a89880214 100644
--- a/src/bin/scripts/po/es.po
+++ b/src/bin/scripts/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pgscripts (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:51+0000\n"
-"PO-Revision-Date: 2024-11-16 14:24+0100\n"
+"POT-Creation-Date: 2026-02-06 23:20+0000\n"
+"PO-Revision-Date: 2025-11-08 19:08+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -23,22 +23,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "precaución: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalle: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "consejo: "
@@ -54,44 +54,44 @@ msgstr "memoria agotada\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "no se pudo sincronizar el sistema de archivos para el archivo «%s»: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "esta instalación no soporta el método de sync «%s»"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
@@ -181,8 +181,8 @@ msgstr "Interrumpido\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "No se puede imprimir el contenido de la tabla: el número de celdas %lld es igual o mayor al máximo %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "No se puede imprimir el contenido de la tabla: el número de celdas %<PRIu64> es igual o mayor al máximo %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -191,8 +191,8 @@ msgstr "No se puede agregar un encabezado al contenido de la tabla: la cantidad
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "No se puede agregar una celda al contenido de la tabla: la cantidad de celdas de %lld ha sido excedida.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "No se puede agregar una celda al contenido de la tabla: la cantidad de celdas de %<PRIu64> ha sido excedida.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -219,41 +219,41 @@ msgstr "el argumento de la orden de shell contiene un salto de línea o retorno
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "el nombre de base de datos contiene un salto de línea o retorno de carro: «%s»\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:292 vacuumdb.c:312
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:310
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "demasiados argumentos en la línea de órdenes (el primero es «%s»)"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "no se puede reordenar todas las bases de datos y una de ellas en particular simultáneamente"
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "falló el reordenamiento de la tabla «%s» en la base de datos «%s»: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "falló el reordenamiento de la base de datos «%s»: %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: reordenando la base de datos «%s»\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -263,19 +263,19 @@ msgstr ""
 "en una base de datos.\n"
 "\n"
 
-#: clusterdb.c:275 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
-#: pg_isready.c:226 reindexdb.c:876 vacuumdb.c:1171
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1337
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: clusterdb.c:276 reindexdb.c:877 vacuumdb.c:1172
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1338
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [BASE-DE-DATOS]\n"
 
-#: clusterdb.c:277 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
-#: pg_isready.c:229 reindexdb.c:878 vacuumdb.c:1173
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -284,48 +284,48 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 reordenar todas las bases de datos\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=BASE         base de datos a reordenar\n"
 
-#: clusterdb.c:280 createuser.c:425 dropdb.c:174 dropuser.c:174
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, 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:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               no escribir ningún mensaje\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, 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:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             desplegar varios mensajes informativos\n"
 
-#: clusterdb.c:284 createuser.c:441 dropdb.c:177 dropuser.c:177
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, 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:285 createuser.c:449 dropdb.c:179 dropuser.c:179
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: clusterdb.c:286 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
-#: pg_isready.c:235 reindexdb.c:893 vacuumdb.c:1202
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1369
 #, c-format
 msgid ""
 "\n"
@@ -334,37 +334,37 @@ msgstr ""
 "\n"
 "Opciones de conexión:\n"
 
-#: clusterdb.c:287 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1203
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1370
 #, 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:288 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1204
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1371
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PUERTO         puerto del servidor\n"
 
-#: clusterdb.c:289 dropdb.c:183 vacuumdb.c:1205
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1372
 #, 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:290 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1206
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1373
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         nunca pedir contraseña\n"
 
-#: clusterdb.c:291 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1207
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1374
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            forzar la petición de contraseña\n"
 
-#: clusterdb.c:292 dropdb.c:186 vacuumdb.c:1208
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1375
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=BASE     base de datos de mantención alternativa\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid ""
 "\n"
@@ -373,8 +373,8 @@ msgstr ""
 "\n"
 "Lea la descripción de la orden CLUSTER de SQL para obtener mayores detalles.\n"
 
-#: clusterdb.c:294 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
-#: pg_isready.c:240 reindexdb.c:901 vacuumdb.c:1210
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1377
 #, c-format
 msgid ""
 "\n"
@@ -383,13 +383,13 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: clusterdb.c:295 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
-#: pg_isready.c:241 reindexdb.c:902 vacuumdb.c:1211
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1378
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -397,23 +397,23 @@ msgstr[0] "la consulta retornó %d fila en lugar de una: %s"
 msgstr[1] "la consulta retornó %d filas en lugar de una: %s"
 
 #. translator: abbreviation for "yes"
-#: common.c:132
+#: common.c:131
 msgid "y"
 msgstr "s"
 
 #. translator: abbreviation for "no"
-#: common.c:134
+#: common.c:133
 msgid "n"
 msgstr "n"
 
 #. translator: This is a question followed by the translated options for
 #. "yes" and "no".
-#: common.c:144
+#: common.c:143
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:165
+#: common.c:164
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "Por favor conteste «%s» o «%s».\n"
@@ -452,7 +452,7 @@ msgstr "  %s [OPCIÓN]... [NOMBRE] [DESCRIPCIÓN]\n"
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=TBLSPC   tablespace por omisión de la base de datos\n"
 
-#: createdb.c:304 reindexdb.c:882
+#: createdb.c:304 reindexdb.c:904
 #, c-format
 msgid "  -e, --echo                   show the commands being sent to the server\n"
 msgstr "  -e, --echo                mostrar las órdenes enviadas al servidor\n"
@@ -519,42 +519,42 @@ msgstr ""
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=PATRÓN     base de datos patrón a copiar\n"
 
-#: createdb.c:317 reindexdb.c:891
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de versión y salir\n"
 
-#: createdb.c:318 reindexdb.c:892
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: createdb.c:320 reindexdb.c:894
+#: createdb.c:320 reindexdb.c:916
 #, 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"
 
-#: createdb.c:321 reindexdb.c:895
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PUERTO         puerto del servidor\n"
 
-#: createdb.c:322 reindexdb.c:896
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=USUARIO    nombre de usuario para la conexión\n"
 
-#: createdb.c:323 reindexdb.c:897
+#: createdb.c:323 reindexdb.c:919
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password         nunca pedir contraseña\n"
 
-#: createdb.c:324 reindexdb.c:898
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password            forzar la petición de contraseña\n"
 
-#: createdb.c:325 reindexdb.c:899
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=BASE     base de datos de mantención alternativa\n"
@@ -715,9 +715,7 @@ msgstr "  -S, --no-superuser        el rol no será un superusuario (predetermin
 msgid ""
 "  -v, --valid-until=TIMESTAMP\n"
 "                            password expiration date and time for role\n"
-msgstr ""
-"  -v, --valid-until=TIEMPO\n"
-"                            fecha/hora de expiración de contraseña para el rol\n"
+msgstr "  -v, --valid-until=TIEMPO  fecha/hora de expiración de contraseña para el rol\n"
 
 #: createuser.c:442
 #, c-format
@@ -944,54 +942,54 @@ msgstr ""
 msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr "  -U, --username=USUARIO   nombre de usuario para la conexión\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr "no se puede usar múltiples procesos para reindexar índices de sistema"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr "no se puede reindexar todas las bases de datos y una de ellas en particular simultáneamente"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:514 vacuumdb.c:521 vacuumdb.c:528
-#: vacuumdb.c:535 vacuumdb.c:542 vacuumdb.c:549 vacuumdb.c:556 vacuumdb.c:563
-#: vacuumdb.c:570 vacuumdb.c:577 vacuumdb.c:584
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:559 vacuumdb.c:566 vacuumdb.c:573
+#: vacuumdb.c:580 vacuumdb.c:587 vacuumdb.c:594 vacuumdb.c:601 vacuumdb.c:608
+#: vacuumdb.c:615 vacuumdb.c:622 vacuumdb.c:629 vacuumdb.c:636
 #, c-format
 msgid "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr "no se puede usar la opción «%s» cuando con versiones más antiguas que PostgreSQL %s"
 
-#: reindexdb.c:586
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "falló la reindexación de la base de datos «%s»: %s"
 
-#: reindexdb.c:590
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "falló la reindexación del índice «%s» en la base de datos «%s»: %s"
 
-#: reindexdb.c:594
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "falló la reindexación del esquema «%s» en la base de datos «%s»: %s"
 
-#: reindexdb.c:598
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "falló la reindexación de los catálogos de sistema en la base de datos «%s»: %s"
 
-#: reindexdb.c:602
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "falló la reindexación de la tabla «%s» en la base de datos «%s»: %s"
 
-#: reindexdb.c:832
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: reindexando la base de datos «%s»\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:897
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -1000,62 +998,64 @@ msgstr ""
 "%s reindexa una base de datos PostgreSQL.\n"
 "\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                 reindexar todas las bases de datos\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr "      --concurrently        reindexar en modo concurrente\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=BASE-DATOS   base de datos a reindexar\n"
 
-#: reindexdb.c:883
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr "  -i, --index=ÍNDICE        recrear sólo este o estos índice(s)\n"
 
-#: reindexdb.c:884
+#: reindexdb.c:906
 #, c-format
 msgid "  -j, --jobs=NUM               use this many concurrent connections to reindex\n"
 msgstr "  -j, --jobs=NÚM            usar esta cantidad de conexiones concurrentes\n"
 
-#: reindexdb.c:885
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet               no desplegar mensajes\n"
 
-#: reindexdb.c:886
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr "  -s, --system              sólo reindexar los catálogos del sistema\n"
 
-#: reindexdb.c:887
+#: reindexdb.c:909
 #, 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:888
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr "  -t, --table=TABLA         reindexar sólo esta(s) tabla(s)\n"
 
-#: reindexdb.c:889
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
-msgstr "      --tablespace=TABLESPACE  tablespace donde se reconstruirán los índices\n"
+msgstr ""
+"      --tablespace=TABLESPACE\n"
+"                            tablespace donde se reconstruirán los índices\n"
 
-#: reindexdb.c:890
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose             desplegar varios mensajes informativos\n"
 
-#: reindexdb.c:900
+#: reindexdb.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1064,80 +1064,85 @@ msgstr ""
 "\n"
 "Lea la descripción de la orden REINDEX de SQL para obtener mayores detalles.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:325 vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:337
+#: vacuumdb.c:340 vacuumdb.c:343 vacuumdb.c:346 vacuumdb.c:355
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "no se puede usar la opción «%s» cuando se está sólo actualizando estadísticas"
 
-#: vacuumdb.c:346
+#: vacuumdb.c:358
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "no se puede usar la opción «%s» cuando se está ejecutando vacuum full"
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:364 vacuumdb.c:372
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "no se puede usar la opción «%s» junto con la opción «%s»"
 
-#: vacuumdb.c:432
+#: vacuumdb.c:380
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "no se puede usar la opción «%s» junto sin «%s» o «%s»"
+
+#: vacuumdb.c:454
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr "no se puede limpiar todas las bases de datos y una de ellas en particular simultáneamente"
 
-#: vacuumdb.c:436
+#: vacuumdb.c:458
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
 msgstr "no se puede limpiar todas las tablas en esquema(s) y tabla(s) específicas simultáneamente"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:462
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr "no es posible limpiar tablas específicas y excluir esquema(s) simultáneamente"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:466
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
 msgstr "no se puede limpiar todas las tablas en esquema(s) y excluir esquema(s) simultáneamente"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:479
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: vacuumdb.c:501
+#: vacuumdb.c:546
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Generando estadísticas mínimas para el optimizador (tamaño = 1)"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:547
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Generando estadísticas medias para el optimizador (tamaño = 10)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:548
 msgid "Generating default (full) optimizer statistics"
 msgstr "Generando estadísticas predeterminadas (completas) para el optimizador"
 
-#: vacuumdb.c:594
+#: vacuumdb.c:646
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: procesando la base de datos «%s»: %s\n"
 
-#: vacuumdb.c:597
+#: vacuumdb.c:649
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: limpiando la base de datos «%s»\n"
 
-#: vacuumdb.c:1159
+#: vacuumdb.c:1325
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "falló la limpieza de la tabla «%s» en la base de datos «%s»: %s"
 
-#: vacuumdb.c:1162
+#: vacuumdb.c:1328
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "falló la limpieza de la base de datos «%s»: %s"
 
-#: vacuumdb.c:1170
+#: vacuumdb.c:1336
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1146,136 +1151,141 @@ msgstr ""
 "%s limpia (VACUUM) y analiza una base de datos PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                    limpia todas las bases de datos\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1341
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr "      --buffer-usage-limit=SZ  tamaño de anillo de búfers a usar para vacuum\n"
 
-#: vacuumdb.c:1176
+#: vacuumdb.c:1342
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=BASE            base de datos a limpiar\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1343
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr "      --disable-page-skipping  desactiva todo comportamiento de saltar páginas\n"
 
-#: vacuumdb.c:1178
+#: vacuumdb.c:1344
 #, 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:1179
+#: vacuumdb.c:1345
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                   usar «vacuum full»\n"
 
-#: vacuumdb.c:1180
+#: vacuumdb.c:1346
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr "  -F, --freeze                 usar «vacuum freeze»\n"
 
-#: vacuumdb.c:1181
+#: vacuumdb.c:1347
 #, c-format
 msgid "      --force-index-cleanup       always remove index entries that point to dead tuples\n"
 msgstr "      --force-index-cleanup    siempre eliminar entradas de índice que apunten a tuplas muertas\n"
 
-#: vacuumdb.c:1182
+#: vacuumdb.c:1348
 #, 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:1183
+#: vacuumdb.c:1349
 #, c-format
 msgid "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to vacuum\n"
 msgstr "      --min-mxid-age=EDAD_MXID edad de multixact ID mínima de tablas a limpiar\n"
 
-#: vacuumdb.c:1184
+#: vacuumdb.c:1350
 #, c-format
 msgid "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to vacuum\n"
 msgstr "      --min-xid-age=EDAD_XID   edad de ID de transacción mínima de tablas a limpiar\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1351
+#, c-format
+msgid "      --missing-stats-only        only analyze relations with missing statistics\n"
+msgstr "      --missing-stats-only     sólo analizar relaciones sin estadísticas\n"
+
+#: vacuumdb.c:1352
 #, c-format
 msgid "      --no-index-cleanup          don't remove index entries that point to dead tuples\n"
 msgstr "      --no-index-cleanup       no eliminar entradas de índice que apunten a tuplas muertas\n"
 
-#: vacuumdb.c:1186
+#: vacuumdb.c:1353
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main        omitir la relación principal\n"
 
-#: vacuumdb.c:1187
+#: vacuumdb.c:1354
 #, c-format
 msgid "      --no-process-toast          skip the TOAST table associated with the table to vacuum\n"
 msgstr "      --no-process-toast       omitir la tabla TOAST asociada con la tabla a la que se hará vacuum\n"
 
-#: vacuumdb.c:1188
+#: vacuumdb.c:1355
 #, c-format
 msgid "      --no-truncate               don't truncate empty pages at the end of the table\n"
 msgstr "      --no-truncate            no truncar las páginas vacías al final de la tabla\n"
 
-#: vacuumdb.c:1189
+#: vacuumdb.c:1356
 #, c-format
 msgid "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) only\n"
 msgstr "  -n, --schema=ESQUEMA         limpia sólo tablas en el/los esquemas especificados\n"
 
-#: vacuumdb.c:1190
+#: vacuumdb.c:1357
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=ESQUEMA no limpia tablas en el/los esquemas especificados\n"
 
-#: vacuumdb.c:1191
+#: vacuumdb.c:1358
 #, c-format
 msgid "  -P, --parallel=PARALLEL_WORKERS use this many background workers for vacuum, if available\n"
 msgstr "  -P, --parallel=NPROCS        usar esta cantidad de procesos para vacuum, si están disponibles\n"
 
-#: vacuumdb.c:1192
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                  no desplegar mensajes\n"
 
-#: vacuumdb.c:1193
+#: vacuumdb.c:1360
 #, c-format
 msgid "      --skip-locked               skip relations that cannot be immediately locked\n"
 msgstr "      --skip-locked            ignorar relaciones que no pueden bloquearse inmediatamente\n"
 
-#: vacuumdb.c:1194
+#: vacuumdb.c:1361
 #, 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:1195
+#: vacuumdb.c:1362
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                desplegar varios mensajes informativos\n"
 
-#: vacuumdb.c:1196
+#: vacuumdb.c:1363
 #, 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:1197
+#: vacuumdb.c:1364
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                actualizar las estadísticas del optimizador\n"
 
-#: vacuumdb.c:1198
+#: vacuumdb.c:1365
 #, 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:1199
+#: vacuumdb.c:1366
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
@@ -1285,12 +1295,12 @@ msgstr ""
 "                               en múltiples etapas para resultados más rápidos;\n"
 "                               no hacer vacuum\n"
 
-#: vacuumdb.c:1201
+#: vacuumdb.c:1368
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                   mostrar esta ayuda y salir\n"
 
-#: vacuumdb.c:1209
+#: vacuumdb.c:1376
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/scripts/po/fr.po b/src/bin/scripts/po/fr.po
index 1582cf94510..258bd4376dd 100644
--- a/src/bin/scripts/po/fr.po
+++ b/src/bin/scripts/po/fr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-23 14:21+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-08 05:21+0000\n"
+"PO-Revision-Date: 2025-07-08 10:46+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "attention : "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "détail : "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "astuce :  "
@@ -54,44 +54,44 @@ msgstr "mémoire épuisée\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le système de fichiers pour le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "cette construction ne supporte pas la méthode de synchronisation « %s »"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
@@ -181,8 +181,8 @@ msgstr "Interrompu\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Ne peut pas afficher le contenu de la table : le nombre de cellules %lld est égal à ou dépasse le maximum %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Ne peut pas afficher le contenu de la table : le nombre de cellules %<PRIu64> est égal à ou dépasse le maximum %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -193,10 +193,10 @@ msgstr ""
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
 msgstr ""
 "Ne peut pas ajouter une cellule au contenu de la table : le nombre total des\n"
-"cellules %lld est dépassé.\n"
+"cellules %<PRIu64> est dépassé.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -213,51 +213,51 @@ msgstr "échec de la requête : %s"
 msgid "Query was: %s"
 msgstr "La requête était : %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, 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"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "le nom de la base contient un retour à la ligne ou un retour chariot : « %s »\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:291 vacuumdb.c:311
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:309
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "trop d'arguments en ligne de commande (le premier étant « %s »)"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "ne peut pas réorganiser à la fois toutes les bases de données et une base spécifique via la commande CLUSTER"
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "la réorganisation de la table « %s » de la base de données « %s » avec la commande CLUSTER a échoué : %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "la réorganisation de la base de données « %s » via la commande CLUSTER a échoué : %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s : réorganisation de la base de données « %s » via la commande CLUSTER\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -267,19 +267,19 @@ msgstr ""
 "base de données via la commande CLUSTER.\n"
 "\n"
 
-#: clusterdb.c:275 createdb.c:298 createuser.c:415 dropdb.c:172 dropuser.c:170
-#: pg_isready.c:226 reindexdb.c:868 vacuumdb.c:1147
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1332
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: clusterdb.c:276 reindexdb.c:869 vacuumdb.c:1148
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1333
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [BASE]\n"
 
-#: clusterdb.c:277 createdb.c:300 createuser.c:417 dropdb.c:174 dropuser.c:172
-#: pg_isready.c:229 reindexdb.c:870 vacuumdb.c:1149
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -288,48 +288,48 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                      réorganise toutes les bases de données\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=BASE              réorganise la base de données spécifiée\n"
 
-#: clusterdb.c:280 createuser.c:423 dropdb.c:175 dropuser.c:173
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, 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"
 
-#: clusterdb.c:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet                    n'écrit aucun message\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr "  -t, --table=TABLE              réorganise uniquement la table spécifiée\n"
 
-#: clusterdb.c:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose                  mode verbeux\n"
 
-#: clusterdb.c:284 createuser.c:439 dropdb.c:178 dropuser.c:176
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version                  affiche la version puis quitte\n"
 
-#: clusterdb.c:285 createuser.c:447 dropdb.c:180 dropuser.c:178
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                     affiche cette aide puis quitte\n"
 
-#: clusterdb.c:286 createdb.c:317 createuser.c:448 dropdb.c:181 dropuser.c:179
-#: pg_isready.c:235 reindexdb.c:885 vacuumdb.c:1178
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1364
 #, c-format
 msgid ""
 "\n"
@@ -338,39 +338,39 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: clusterdb.c:287 createuser.c:449 dropdb.c:182 dropuser.c:180 vacuumdb.c:1179
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1365
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HÔTE                hôte du serveur de bases de données ou\n"
 "                                 répertoire des sockets\n"
 
-#: clusterdb.c:288 createuser.c:450 dropdb.c:183 dropuser.c:181 vacuumdb.c:1180
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1366
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT                port du serveur de bases de données\n"
 
-#: clusterdb.c:289 dropdb.c:184 vacuumdb.c:1181
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1367
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=UTILISATEUR     nom d'utilisateur pour la connexion\n"
 
-#: clusterdb.c:290 createuser.c:452 dropdb.c:185 dropuser.c:183 vacuumdb.c:1182
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1368
 #, 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"
 
-#: clusterdb.c:291 createuser.c:453 dropdb.c:186 dropuser.c:184 vacuumdb.c:1183
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1369
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password                 force la demande d'un mot de passe\n"
 
-#: clusterdb.c:292 dropdb.c:187 vacuumdb.c:1184
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1370
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=BASE          indique une autre base par défaut\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid ""
 "\n"
@@ -379,8 +379,8 @@ msgstr ""
 "\n"
 "Lire la description de la commande SQL CLUSTER pour de plus amples détails.\n"
 
-#: clusterdb.c:294 createdb.c:325 createuser.c:454 dropdb.c:188 dropuser.c:185
-#: pg_isready.c:240 reindexdb.c:893 vacuumdb.c:1186
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -389,13 +389,13 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: clusterdb.c:295 createdb.c:326 createuser.c:455 dropdb.c:189 dropuser.c:186
-#: pg_isready.c:241 reindexdb.c:894 vacuumdb.c:1187
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1373
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -429,17 +429,17 @@ msgstr "Merci de répondre « %s » ou « %s ».\n"
 msgid "\"%s\" is not a valid encoding name"
 msgstr "« %s » n'est pas un nom d'encodage valide"
 
-#: createdb.c:260
+#: createdb.c:262
 #, c-format
 msgid "database creation failed: %s"
 msgstr "la création de la base de données a échoué : %s"
 
-#: createdb.c:279
+#: createdb.c:281
 #, c-format
 msgid "comment creation failed (database was created): %s"
 msgstr "l'ajout du commentaire a échoué (la base de données a été créée) : %s"
 
-#: createdb.c:297
+#: createdb.c:299
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -448,57 +448,57 @@ msgstr ""
 "%s crée une base de données PostgreSQL.\n"
 "\n"
 
-#: createdb.c:299
+#: createdb.c:301
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [OPTION]... [BASE] [DESCRIPTION]\n"
 
-#: createdb.c:301
+#: createdb.c:303
 #, 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"
 
-#: createdb.c:302 reindexdb.c:874
+#: createdb.c:304 reindexdb.c:904
 #, 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"
 
-#: createdb.c:303
+#: createdb.c:305
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=ENCODAGE       encodage de la base de données\n"
 
-#: createdb.c:304
+#: createdb.c:306
 #, 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 données\n"
 
-#: createdb.c:305
+#: createdb.c:307
 #, 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"
 
-#: createdb.c:306
+#: createdb.c:308
 #, 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"
 
-#: createdb.c:307
+#: createdb.c:309
 #, c-format
 msgid "      --builtin-locale=LOCALE  builtin locale setting for the database\n"
 msgstr "      --builtin-locale=LOCALE   paramètre de la locale native pour la base de données\n"
 
-#: createdb.c:308
+#: createdb.c:310
 #, c-format
 msgid "      --icu-locale=LOCALE      ICU locale setting for the database\n"
 msgstr "      --icu-locale=LOCALE       paramètre de la locale ICU pour la base de données\n"
 
-#: createdb.c:309
+#: createdb.c:311
 #, c-format
 msgid "      --icu-rules=RULES        ICU rules setting for the database\n"
 msgstr "      --icu-rules=RÈGLES        configuration des règles ICU pour la base de données\n"
 
-#: createdb.c:310
+#: createdb.c:312
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -507,66 +507,66 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                                fournisseur de locale pour la collation par défaut de la base de données\n"
 
-#: createdb.c:312
+#: createdb.c:314
 #, 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"
 
-#: createdb.c:313
+#: createdb.c:315
 #, c-format
 msgid "  -S, --strategy=STRATEGY      database creation strategy wal_log or file_copy\n"
 msgstr "  -S, --strategy=STRATEGIE      stratégie de création de base (wal_log ou file_copy)\n"
 
-#: createdb.c:314
+#: createdb.c:316
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=MODÈLE         base de données modèle à copier\n"
 
-#: createdb.c:315 reindexdb.c:883
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                 affiche la version puis quitte\n"
 
-#: createdb.c:316 reindexdb.c:884
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                    affiche cette aide puis quitte\n"
 
-#: createdb.c:318 reindexdb.c:886
+#: createdb.c:320 reindexdb.c:916
 #, c-format
 msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HÔTE               hôte du serveur de bases de données\n"
 "                                ou répertoire des sockets\n"
 
-#: createdb.c:319 reindexdb.c:887
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT               port du serveur de bases de données\n"
 
-#: createdb.c:320 reindexdb.c:888
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=UTILISATEUR    nom d'utilisateur pour la connexion\n"
 
-#: createdb.c:321 reindexdb.c:889
+#: createdb.c:323 reindexdb.c:919
 #, 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"
 
-#: createdb.c:322 reindexdb.c:890
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password                force la demande d'un mot de passe\n"
 
-#: createdb.c:323 reindexdb.c:891
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=BASE         indique une autre base par défaut\n"
 
-#: createdb.c:324
+#: createdb.c:326
 #, c-format
 msgid ""
 "\n"
@@ -604,17 +604,17 @@ msgstr "Le nouveau rôle est-il autorisé à créer des bases de données ?"
 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 ?"
 
-#: createuser.c:309
+#: createuser.c:311
 #, c-format
 msgid "password encryption failed: %s"
 msgstr "échec du chiffrement du mot de passe : %s"
 
-#: createuser.c:400
+#: createuser.c:402
 #, c-format
 msgid "creation of new role failed: %s"
 msgstr "la création du nouveau rôle a échoué : %s"
 
-#: createuser.c:414
+#: createuser.c:416
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -623,48 +623,48 @@ msgstr ""
 "%s crée un nouvel rôle PostgreSQL.\n"
 "\n"
 
-#: createuser.c:416 dropuser.c:171
+#: createuser.c:418 dropuser.c:172
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [OPTION]... [RÔLE]\n"
 
-#: createuser.c:418
+#: createuser.c:420
 #, c-format
 msgid ""
 "  -a, --with-admin=ROLE     ROLE will be a member of new role with admin\n"
 "                            option\n"
 msgstr "  -a, --with-admin=ROLE          ROLE sera un membre du nouveau rôle avec l'option admin\n"
 
-#: createuser.c:420
+#: createuser.c:422
 #, c-format
 msgid "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr ""
 "  -c, --connection-limit=N       nombre maximum de connexions pour le rôle (par\n"
 "                                 défaut sans limite)\n"
 
-#: createuser.c:421
+#: createuser.c:423
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb                 le rôle peut créer des bases de données\n"
 
-#: createuser.c:422
+#: createuser.c:424
 #, 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 données\n"
 "                                 (par défaut)\n"
 
-#: createuser.c:424
+#: createuser.c:426
 #, c-format
 msgid "  -g, --member-of=ROLE      new role will be a member of ROLE\n"
 msgstr "  -g, --member-of=ROLE           le nouveau rôle sera un membre de ROLE\n"
 
-#: createuser.c:425
+#: createuser.c:427
 #, c-format
 msgid "  --role=ROLE               (same as --member-of, deprecated)\n"
 msgstr "  --role=ROLE                    (identique à --member-of, obsolète)\n"
 
-#: createuser.c:426
+#: createuser.c:428
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -673,61 +673,61 @@ msgstr ""
 "  -i, --inherit                  le rôle hérite des droits des rôles dont il est\n"
 "                                 membre (par défaut)\n"
 
-#: createuser.c:428
+#: createuser.c:430
 #, 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"
 
-#: createuser.c:429
+#: createuser.c:431
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login                    le rôle peut se connecter (par défaut)\n"
 
-#: createuser.c:430
+#: createuser.c:432
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login                 le rôle ne peut pas se connecter\n"
 
-#: createuser.c:431
+#: createuser.c:433
 #, c-format
 msgid "  -m, --with-member=ROLE    ROLE will be a member of new role\n"
 msgstr "  -m, --with-member=ROLE         ROLE sera un membre du nouveau rôle\n"
 
-#: createuser.c:432
+#: createuser.c:434
 #, 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"
 
-#: createuser.c:433
+#: createuser.c:435
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole               le rôle peut créer des rôles\n"
 
-#: createuser.c:434
+#: createuser.c:436
 #, 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"
 
-#: createuser.c:435
+#: createuser.c:437
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser                le rôle est super-utilisateur\n"
 
-#: createuser.c:436
+#: createuser.c:438
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
 msgstr ""
 "  -S, --no-superuser             le rôle n'est pas super-utilisateur (par\n"
 "                                 défaut)\n"
 
-#: createuser.c:437
+#: createuser.c:439
 #, c-format
 msgid ""
 "  -v, --valid-until=TIMESTAMP\n"
 "                            password expiration date and time for role\n"
 msgstr "  -v, --valid-until=TIMESTAMP    date et heure d'expiration du mot de passe pour le rôle\n"
 
-#: createuser.c:440
+#: createuser.c:442
 #, c-format
 msgid ""
 "  --interactive             prompt for missing role name and attributes rather\n"
@@ -736,12 +736,12 @@ msgstr ""
 "  --interactive                  demande le nom du rôle et les attributs\n"
 "                                 plutôt qu'utiliser des valeurs par défaut\n"
 
-#: createuser.c:442
+#: createuser.c:444
 #, c-format
 msgid "  --bypassrls               role can bypass row-level security (RLS) policy\n"
 msgstr "  --bypassrls                    le rôle peut contourner la politique de sécurité niveau ligne (RLS)\n"
 
-#: createuser.c:443
+#: createuser.c:445
 #, c-format
 msgid ""
 "  --no-bypassrls            role cannot bypass row-level security (RLS) policy\n"
@@ -750,21 +750,21 @@ msgstr ""
 "  --no-bypassrls                 le rôle ne peut pas contourner la politique de sécurité niveau ligne (RLS)\n"
 "                                 (par défaut)\n"
 
-#: createuser.c:445
+#: createuser.c:447
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr ""
 "  --replication                  le rôle peut initier une connexion de\n"
 "                                 réplication\n"
 
-#: createuser.c:446
+#: createuser.c:448
 #, c-format
 msgid "  --no-replication          role cannot initiate replication (default)\n"
 msgstr ""
 "  --no-replication               le rôle ne peut pas initier de connexion de\n"
 "                                 réplication (par défaut)\n"
 
-#: createuser.c:451
+#: createuser.c:453
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
@@ -785,12 +785,12 @@ msgstr "La base de données « %s » sera définitivement supprimée.\n"
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: dropdb.c:157
+#: dropdb.c:156
 #, c-format
 msgid "database removal failed: %s"
 msgstr "la suppression de la base de données a échoué : %s"
 
-#: dropdb.c:171
+#: dropdb.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -799,26 +799,26 @@ msgstr ""
 "%s supprime une base de données PostgreSQL.\n"
 "\n"
 
-#: dropdb.c:173
+#: dropdb.c:172
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [OPTION]... BASE\n"
 
-#: dropdb.c:176
+#: dropdb.c:175
 #, c-format
 msgid "  -f, --force               try to terminate other connections before dropping\n"
 msgstr ""
 "  -f, --force                    essaie d'arrêter les autres connexions avant de\n"
 "                                 supprimer\n"
 
-#: dropdb.c:177
+#: dropdb.c:176
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr ""
 "  -i, --interactive              demande confirmation avant de supprimer quoi\n"
 "                                 que ce soit\n"
 
-#: dropdb.c:179
+#: dropdb.c:178
 #, c-format
 msgid "  --if-exists               don't report error if database doesn't exist\n"
 msgstr ""
@@ -839,12 +839,12 @@ msgstr "argument nom du rôle requis mais manquant"
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Le rôle « %s » sera définitivement supprimé.\n"
 
-#: dropuser.c:154
+#: dropuser.c:155
 #, c-format
 msgid "removal of role \"%s\" failed: %s"
 msgstr "la suppression du rôle « %s » a échoué : %s"
 
-#: dropuser.c:169
+#: dropuser.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
@@ -853,7 +853,7 @@ msgstr ""
 "%s supprime un rôle PostgreSQL.\n"
 "\n"
 
-#: dropuser.c:174
+#: dropuser.c:175
 #, c-format
 msgid ""
 "  -i, --interactive         prompt before deleting anything, and prompt for\n"
@@ -863,14 +863,14 @@ msgstr ""
 "                                 que ce soit, et demande le nom du rôle s'il\n"
 "                                 n'est pas indiqué\n"
 
-#: dropuser.c:177
+#: dropuser.c:178
 #, c-format
 msgid "  --if-exists               don't report error if user doesn't exist\n"
 msgstr ""
 "  --if-exists                    ne renvoie pas d'erreur si l'utilisateur\n"
 "                                 n'existe pas\n"
 
-#: dropuser.c:182
+#: dropuser.c:183
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr ""
@@ -965,54 +965,54 @@ msgstr ""
 msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr "  -U, --username=UTILISATEUR  nom d'utilisateur pour la connexion\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr "ne peut pas utiliser plusieurs jobs pour réindexer les catalogues systèmes"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr "ne peut pas réindexer toutes les bases de données et une base spécifique en même temps"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:515 vacuumdb.c:522 vacuumdb.c:529
-#: vacuumdb.c:536 vacuumdb.c:543 vacuumdb.c:550 vacuumdb.c:557 vacuumdb.c:562
-#: vacuumdb.c:566 vacuumdb.c:570 vacuumdb.c:574
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:558 vacuumdb.c:565 vacuumdb.c:572
+#: vacuumdb.c:579 vacuumdb.c:586 vacuumdb.c:593 vacuumdb.c:600 vacuumdb.c:607
+#: vacuumdb.c:614 vacuumdb.c:621 vacuumdb.c:628 vacuumdb.c:635
 #, c-format
 msgid "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr "ne peut utiliser l'option « %s » sur des versions serveurs plus anciennes que PostgreSQL %s"
 
-#: reindexdb.c:584
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "la réindexation de la base de données « %s » a échoué : %s"
 
-#: reindexdb.c:588
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "la réindexation de l'index « %s » dans la base de données « %s » a échoué : %s"
 
-#: reindexdb.c:592
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "la réindexation du schéma « %s » dans la base de données « %s » a échoué : %s"
 
-#: reindexdb.c:596
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "la réindexation des catalogues systèmes dans la base de données « %s » a échoué : %s"
 
-#: reindexdb.c:600
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "la réindexation de la table « %s » dans la base de données « %s » a échoué : %s"
 
-#: reindexdb.c:824
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s : réindexation de la base de données « %s »\n"
 
-#: reindexdb.c:867
+#: reindexdb.c:897
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -1021,66 +1021,66 @@ msgstr ""
 "%s réindexe une base de données PostgreSQL.\n"
 "\n"
 
-#: reindexdb.c:871
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                     réindexe toutes les bases de données\n"
 
-#: reindexdb.c:872
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr "      --concurrently            réindexation en concurrence\n"
 
-#: reindexdb.c:873
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=BASE             réindexe la base de données spécifiée\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr "  -i, --index=INDEX             réindexe uniquement l'index spécifié\n"
 
-#: reindexdb.c:876
+#: reindexdb.c:906
 #, c-format
 msgid "  -j, --jobs=NUM               use this many concurrent connections to reindex\n"
 msgstr ""
 "  -j, --jobs=NOMBRE             utilise ce nombre de connexions concurrentes\n"
 "                                pour l'opération de réindexation\n"
 
-#: reindexdb.c:877
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                   n'écrit aucun message\n"
 
-#: reindexdb.c:878
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr "  -s, --system                  réindexe seulement les catalogues système\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:909
 #, c-format
 msgid "  -S, --schema=SCHEMA          reindex specific schema(s) only\n"
 msgstr "  -S, --schema=SCHÉMA           réindexe uniquement le schéma spécifié\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr "  -t, --table=TABLE             réindexe uniquement la table spécifiée\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
 msgstr ""
 "      --tablespace=TABLESPACE   précise le tablespace où les index seront\n"
 "                                reconstruits\n"
 
-#: reindexdb.c:882
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose                 mode verbeux\n"
 
-#: reindexdb.c:892
+#: reindexdb.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1089,80 +1089,85 @@ msgstr ""
 "\n"
 "Lire la description de la commande SQL REINDEX pour plus d'informations.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:324 vacuumdb.c:327 vacuumdb.c:330 vacuumdb.c:333 vacuumdb.c:336
+#: vacuumdb.c:339 vacuumdb.c:342 vacuumdb.c:345 vacuumdb.c:354
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "ne peut pas utiliser l'option « %s » lors de l'exécution d'un ANALYZE seul"
 
-#: vacuumdb.c:346
+#: vacuumdb.c:357
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "ne peut pas utiliser l'option « %s » lors de l'exécution d'un VACUUM FULL"
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:363 vacuumdb.c:371
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "ne peut pas utiliser l'option « %s » lors de l'option « %s »"
 
-#: vacuumdb.c:432
+#: vacuumdb.c:379
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "ne peut pas utiliser l'option « %s » sans « %s » ou « %s »"
+
+#: vacuumdb.c:453
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr "ne peut pas exécuter VACUUM sur toutes les bases de données et sur une base spécifique en même temps"
 
-#: vacuumdb.c:436
+#: vacuumdb.c:457
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
 msgstr "ne peut pas exécuter VACUUM sur toutes les tables des schémas et sur des tables spécifiques en même temps"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:461
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr "ne peut pas exécuter VACUUM sur des tables spécifiques et exclure des schémas en même temps"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:465
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
 msgstr "ne peut pas exécuter VACUUM sur toutes les tables et exclure des schémas en même temps"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:478
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:545
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Génération de statistiques minimales pour l'optimiseur (une cible)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:546
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Génération de statistiques moyennes pour l'optimiseur (dix cibles)"
 
-#: vacuumdb.c:504
+#: vacuumdb.c:547
 msgid "Generating default (full) optimizer statistics"
 msgstr "Génération de statistiques complètes pour l'optimiseur"
 
-#: vacuumdb.c:583
+#: vacuumdb.c:645
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s : traitement de la base de données « %s » %s\n"
 
-#: vacuumdb.c:586
+#: vacuumdb.c:648
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s : exécution de VACUUM sur la base de données « %s »\n"
 
-#: vacuumdb.c:1135
+#: vacuumdb.c:1320
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "l'exécution de VACUUM sur la table « %s » dans la base de données « %s » a échoué : %s"
 
-#: vacuumdb.c:1138
+#: vacuumdb.c:1323
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "l'exécution de VACUUM sur la base de données « %s » a échoué : %s"
 
-#: vacuumdb.c:1146
+#: vacuumdb.c:1331
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1171,154 +1176,159 @@ msgstr ""
 "%s nettoie et analyse une base de données PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:1150
+#: vacuumdb.c:1335
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       exécute VACUUM sur toutes les bases de données\n"
 
-#: vacuumdb.c:1151
+#: vacuumdb.c:1336
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr "      --buffer-usage-limit=TAILLE taille du buffer spécialisé pour VACUUM\n"
 
-#: vacuumdb.c:1152
+#: vacuumdb.c:1337
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=BASE               exécute VACUUM sur cette base de données\n"
 
-#: vacuumdb.c:1153
+#: vacuumdb.c:1338
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr "      --disable-page-skipping     désactive le comportement page-skipping\n"
 
-#: vacuumdb.c:1154
+#: vacuumdb.c:1339
 #, 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"
 
-#: vacuumdb.c:1155
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      exécute VACUUM en mode FULL\n"
 
-#: vacuumdb.c:1156
+#: vacuumdb.c:1341
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr ""
 "  -F, --freeze                    gèle les informations de transactions des\n"
 "                                  lignes\n"
 
-#: vacuumdb.c:1157
+#: vacuumdb.c:1342
 #, c-format
 msgid "      --force-index-cleanup       always remove index entries that point to dead tuples\n"
 msgstr ""
 "      --force-index-cleanup       supprime toujours les enregistrements dans\n"
 "                                  l'index pointant vers des lignes mortes\n"
 
-#: vacuumdb.c:1158
+#: vacuumdb.c:1343
 #, c-format
 msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
 msgstr ""
 "  -j, --jobs=NOMBRE               utilise ce nombre de connexions concurrentes\n"
 "                                  pour le VACUUM\n"
 
-#: vacuumdb.c:1159
+#: vacuumdb.c:1344
 #, c-format
 msgid "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to vacuum\n"
 msgstr ""
 "      --min-mxid-age=MXID_AGE     âge minimum des identifiants de\n"
 "                                  multitransactions pour les tables à nettoyer\n"
 
-#: vacuumdb.c:1160
+#: vacuumdb.c:1345
 #, c-format
 msgid "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to vacuum\n"
 msgstr ""
 "      --min-xid-age=XID_AGE       âge minimum des identifiants de transactions\n"
 "                                  pour les tables à nettoyer\n"
 
-#: vacuumdb.c:1161
+#: vacuumdb.c:1346
+#, c-format
+msgid "      --missing-stats-only        only analyze relations with missing statistics\n"
+msgstr "      --missing-stats-only       analyse seulement les relations sans statistiques\n"
+
+#: vacuumdb.c:1347
 #, c-format
 msgid "      --no-index-cleanup          don't remove index entries that point to dead tuples\n"
 msgstr ""
 "      --no-index-cleanup          ne supprime pas les enregistrements dans\n"
 "                                  l'index pointant vers des lignes mortes\n"
 
-#: vacuumdb.c:1162
+#: vacuumdb.c:1348
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main           ignore la relation principale\n"
 
-#: vacuumdb.c:1163
+#: vacuumdb.c:1349
 #, c-format
 msgid "      --no-process-toast          skip the TOAST table associated with the table to vacuum\n"
 msgstr ""
 "      --no-process-toast          ignore la table TOAST associée à la table à\n"
 "                                  traiter\n"
 
-#: vacuumdb.c:1164
+#: vacuumdb.c:1350
 #, c-format
 msgid "      --no-truncate               don't truncate empty pages at the end of the table\n"
 msgstr ""
 "      --no-truncate               ne supprime pas les pages vides à la fin de\n"
 "                                  la table\n"
 
-#: vacuumdb.c:1165
+#: vacuumdb.c:1351
 #, c-format
 msgid "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) only\n"
 msgstr "  -n, --schema=MOTIF              exécute VACUUM uniquement sur les tables des schémas indiqués\n"
 
-#: vacuumdb.c:1166
+#: vacuumdb.c:1352
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=MOTIF      n'exécute pas VACUUM sur les tables des schémas indiqués\n"
 
-#: vacuumdb.c:1167
+#: vacuumdb.c:1353
 #, c-format
 msgid "  -P, --parallel=PARALLEL_WORKERS use this many background workers for vacuum, if available\n"
 msgstr ""
 "  -P, --parallel=NOMBRE           utilise ce nombre de processus en tâche de\n"
 "                                  fond pour le VACUUM, si possible\n"
 
-#: vacuumdb.c:1168
+#: vacuumdb.c:1354
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     n'écrit aucun message\n"
 
-#: vacuumdb.c:1169
+#: vacuumdb.c:1355
 #, c-format
 msgid "      --skip-locked               skip relations that cannot be immediately locked\n"
 msgstr ""
 "      --skip-locked               ignore les relations qui ne peuvent pas être\n"
 "                                  verrouillées immédiatement\n"
 
-#: vacuumdb.c:1170
+#: vacuumdb.c:1356
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr "  -t, --table='TABLE[(COLONNES)]' exécute VACUUM sur cette table\n"
 
-#: vacuumdb.c:1171
+#: vacuumdb.c:1357
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   mode verbeux\n"
 
-#: vacuumdb.c:1172
+#: vacuumdb.c:1358
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   affiche la version puis quitte\n"
 
-#: vacuumdb.c:1173
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   met à jour les statistiques de l'optimiseur\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1360
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
 msgstr ""
 "  -Z, --analyze-only              met seulement à jour les statistiques de\n"
 "                                  l'optimiseur ; pas de VACUUM\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1361
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
@@ -1328,12 +1338,12 @@ msgstr ""
 "                                  l'optimiseur, en plusieurs étapes pour de\n"
 "                                  meilleurs résultats ; pas de VACUUM\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1363
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      affiche cette aide puis quitte\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1371
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/scripts/po/ja.po b/src/bin/scripts/po/ja.po
index 1b6a7b9f999..cdb4e16e057 100644
--- a/src/bin/scripts/po/ja.po
+++ b/src/bin/scripts/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scripts (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-03-31 09:54+0900\n"
-"PO-Revision-Date: 2025-03-31 16:30+0900\n"
+"POT-Creation-Date: 2025-04-30 10:34+0900\n"
+"PO-Revision-Date: 2025-04-30 11:25+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -177,8 +177,8 @@ msgstr "中断されました\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %<PRId64> is equal to or exceeds maximum %zu.\n"
-msgstr "テーブルの内容を表示できません: セル数%<PRId64>が上限値%zu以上です。\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "テーブルの内容を表示できません: セル数%<PRIu64>が上限値%zu以上です。\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -187,8 +187,8 @@ msgstr "テーブルの内容に見出しを追加できませんでした：列
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %<PRId64> exceeded.\n"
-msgstr "テーブルの内容にセルを追加できません: セルの総数%<PRId64>を超過しています。\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "テーブルの内容にセルを追加できません: セルの総数%<PRIu64>を超過しています。\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
diff --git a/src/bin/scripts/po/ko.po b/src/bin/scripts/po/ko.po
index 5e694f07251..744067e80cc 100644
--- a/src/bin/scripts/po/ko.po
+++ b/src/bin/scripts/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pgscripts (PostgreSQL) 17\n"
+"Project-Id-Version: pgscripts (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:51+0000\n"
-"PO-Revision-Date: 2025-01-16 14:23+0900\n"
+"POT-Creation-Date: 2025-09-11 21:51+0000\n"
+"PO-Revision-Date: 2025-09-09 16:42+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "오류: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "경고: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "상세정보: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "힌트: "
@@ -46,44 +46,44 @@ msgstr "메모리 부족\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "null 포인터를 복제할 수 없음(내부 오류)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "\"%s\" 파일을 열 수 없음: %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "\"%s\" 파일을 위한 파일 시스템 동기화를 할 수 없음: %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "\"%s\" 파일 상태 정보를 구할 수 없음: %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "이 빌드는 \"%s\" 동기화 방법을 지원하지 않음"
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 열 수 없음: %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "\"%s\" 디렉터리를 읽을 수 없음: %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "\"%s\" 파일을 fsync 할 수 없음: %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "\"%s\" 파일을 \"%s\" 파일로 이름을 바꿀 수 없음: %m"
@@ -173,10 +173,11 @@ msgstr "인트럽트발생\n"
 #: ../../fe_utils/print.c:3188
 #, c-format
 msgid ""
-"Cannot print table contents: number of cells %lld is equal to or exceeds "
-"maximum %lld.\n"
+"Cannot print table contents: number of cells %<PRIu64> is equal to or "
+"exceeds maximum %zu.\n"
 msgstr ""
-"테이블 내용을 출력할 수 없음: %lld 셀 수가 최대값 %lld 개와 같거나 초과함.\n"
+"테이블 내용을 출력할 수 없음: %<PRIu64> 셀 수가 최대값 %zu 개와 같거나 초과"
+"함.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -185,8 +186,10 @@ msgstr "테이블 내용에 헤더를 추가할 수 없음: 열 수가 %d개를
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "테이블 내용에 셀을 추가할 수 없음: 총 셀 수가 %lld개를 초과했습니다.\n"
+msgid ""
+"Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr ""
+"테이블 내용에 셀을 추가할 수 없음: 총 셀 수가 %<PRIu64>개를 초과했습니다.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -203,51 +206,51 @@ msgstr "쿼리 실패: %s"
 msgid "Query was: %s"
 msgstr "사용한 쿼리: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "쉘 명령 인자에 줄바꿈 문자가 포함되었음: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "데이터베이스 이름에 줄바꿈 문자가 포함되었음: \"%s\"\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:292 vacuumdb.c:312
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "자세한 사항은 \"%s --help\" 명령으로 살펴보세요."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:310
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "명령행 인자를 너무 많이 지정했습니다 (시작: \"%s\")"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "모든 DB 작업과 특정 DB 작업은 동시에 할 수 없습니다."
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "\"%s\" 테이블(해당DB: \"%s\") 클러스터 작업 실패: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "\"%s\" 데이터베이스 클러스터 실패: %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: \"%s\" 데이터베이스 클러스터 작업 중\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -257,19 +260,19 @@ msgstr ""
 "다시 클러스터 작업을 합니다.\n"
 "\n"
 
-#: clusterdb.c:275 createdb.c:298 createuser.c:415 dropdb.c:172 dropuser.c:170
-#: pg_isready.c:226 reindexdb.c:872 vacuumdb.c:1158
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1337
 #, c-format
 msgid "Usage:\n"
 msgstr "사용법:\n"
 
-#: clusterdb.c:276 reindexdb.c:873 vacuumdb.c:1159
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1338
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [옵션]... [DB이름]\n"
 
-#: clusterdb.c:277 createdb.c:300 createuser.c:417 dropdb.c:174 dropuser.c:172
-#: pg_isready.c:229 reindexdb.c:874 vacuumdb.c:1160
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -278,49 +281,49 @@ msgstr ""
 "\n"
 "옵션들:\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 모든 데이터베이스를 대상으로\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       클러스터 작업할 DB\n"
 
-#: clusterdb.c:280 createuser.c:423 dropdb.c:175 dropuser.c:173
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                서버로 보내는 작업 명령을 보여줌\n"
 
-#: clusterdb.c:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               어떠한 메시지도 보여주지 않음\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr "  -t, --table=TABLE         지정한 테이블들만 클러스터\n"
 
-#: clusterdb.c:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             많은 출력 작성\n"
 
-#: clusterdb.c:284 createuser.c:439 dropdb.c:178 dropuser.c:176
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             버전 정보를 보여주고 마침\n"
 
-#: clusterdb.c:285 createuser.c:447 dropdb.c:180 dropuser.c:178
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                이 도움말을 보여주고 마침\n"
 
-#: clusterdb.c:286 createdb.c:317 createuser.c:448 dropdb.c:181 dropuser.c:179
-#: pg_isready.c:235 reindexdb.c:889 vacuumdb.c:1189
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1369
 #, c-format
 msgid ""
 "\n"
@@ -329,38 +332,38 @@ msgstr ""
 "\n"
 "연결 옵션들:\n"
 
-#: clusterdb.c:287 createuser.c:449 dropdb.c:182 dropuser.c:180 vacuumdb.c:1190
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1370
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME       데이터베이스 서버 호스트 또는 소켓 디렉터리\n"
 
-#: clusterdb.c:288 createuser.c:450 dropdb.c:183 dropuser.c:181 vacuumdb.c:1191
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1371
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           데이터베이스 서버 포트\n"
 
-#: clusterdb.c:289 dropdb.c:184 vacuumdb.c:1192
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1372
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=USERNAME   접속할 사용자이름\n"
 
-#: clusterdb.c:290 createuser.c:452 dropdb.c:185 dropuser.c:183 vacuumdb.c:1193
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1373
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         암호 프롬프트 표시 안 함\n"
 
-#: clusterdb.c:291 createuser.c:453 dropdb.c:186 dropuser.c:184 vacuumdb.c:1194
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1374
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            암호 프롬프트 표시함\n"
 
-#: clusterdb.c:292 dropdb.c:187 vacuumdb.c:1195
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1375
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAME   대체용 관리 대상 데이터베이스\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid ""
 "\n"
@@ -369,8 +372,8 @@ msgstr ""
 "\n"
 "보다 자세한 내용은 CLUSTER SQL 명령어 설명서를 참조하십시오.\n"
 
-#: clusterdb.c:294 createdb.c:325 createuser.c:454 dropdb.c:188 dropuser.c:185
-#: pg_isready.c:240 reindexdb.c:897 vacuumdb.c:1197
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1377
 #, c-format
 msgid ""
 "\n"
@@ -379,13 +382,13 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: clusterdb.c:295 createdb.c:326 createuser.c:455 dropdb.c:189 dropuser.c:186
-#: pg_isready.c:241 reindexdb.c:898 vacuumdb.c:1198
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1378
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -418,17 +421,17 @@ msgstr "\"%s\" 또는 \"%s\" 만 허용합니다.\n"
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" 이름은 잘못된 인코딩 이름임"
 
-#: createdb.c:260
+#: createdb.c:262
 #, c-format
 msgid "database creation failed: %s"
 msgstr "데이터베이스 만들기 실패: %s"
 
-#: createdb.c:279
+#: createdb.c:281
 #, c-format
 msgid "comment creation failed (database was created): %s"
 msgstr "코멘트 추가하기 실패 (데이터베이스는 만들어졌음): %s"
 
-#: createdb.c:297
+#: createdb.c:299
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -437,60 +440,60 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 데이터베이스를 만듭니다.\n"
 "\n"
 
-#: createdb.c:299
+#: createdb.c:301
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [옵션]... [DB이름] [설명]\n"
 
-#: createdb.c:301
+#: createdb.c:303
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr ""
 "  -D, --tablespace=TABLESPACE  데이터베이스를 위한 기본 테이블스페이스\n"
 
-#: createdb.c:302 reindexdb.c:878
+#: createdb.c:304 reindexdb.c:904
 #, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr "  -e, --echo                   서버로 보내는 작업 명령들을 보여줌\n"
 
-#: createdb.c:303
+#: createdb.c:305
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=ENCODING      데이터베이스 인코딩\n"
 
-#: createdb.c:304
+#: createdb.c:306
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr "  -l, --locale=LOCALE          데이터베이스의 로캘 설정\n"
 
-#: createdb.c:305
+#: createdb.c:307
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr "      --lc-collate=LOCALE      데이터베이스의 LC_COLLATE 설정\n"
 
-#: createdb.c:306
+#: createdb.c:308
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr "      --lc-ctype=LOCALE        데이터베이스의 LC_CTYPE 설정\n"
 
-#: createdb.c:307
+#: createdb.c:309
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE  builtin locale setting for the database\n"
 msgstr "      --builtin-locale=LOCALE  데이터베이스 내장 로케일 설정\n"
 
-#: createdb.c:308
+#: createdb.c:310
 #, c-format
 msgid "      --icu-locale=LOCALE      ICU locale setting for the database\n"
 msgstr "      --icu-locale=LOCALE      데이터베이스 ICU 로캘 설정\n"
 
-#: createdb.c:309
+#: createdb.c:311
 #, c-format
 msgid "      --icu-rules=RULES        ICU rules setting for the database\n"
 msgstr "      --icu-rules=RULES        데이터베이스 ICU 룰 설정\n"
 
-#: createdb.c:310
+#: createdb.c:312
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -500,12 +503,12 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                               데이터베이스 기본 문자 정렬 제공자 설정\n"
 
-#: createdb.c:312
+#: createdb.c:314
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr "  -O, --owner=OWNER            데이터베이스 소유주\n"
 
-#: createdb.c:313
+#: createdb.c:315
 #, c-format
 msgid ""
 "  -S, --strategy=STRATEGY      database creation strategy wal_log or "
@@ -514,54 +517,54 @@ msgstr ""
 "  -S, --strategy=STRATEGY      데이터베이스 만드는 전략(wal_log 또는 "
 "file_copy)\n"
 
-#: createdb.c:314
+#: createdb.c:316
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=TEMPLATE      복사할 템플릿 데이터베이스\n"
 
-#: createdb.c:315 reindexdb.c:887
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                버전 정보를 보여주고 마침\n"
 
-#: createdb.c:316 reindexdb.c:888
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   이 도움말을 보여주고 마침\n"
 
-#: createdb.c:318 reindexdb.c:890
+#: createdb.c:320 reindexdb.c:916
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME          데이터베이스 서버 호스트나 소켓 디렉터리\n"
 
-#: createdb.c:319 reindexdb.c:891
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              데이터베이스 서버 포트\n"
 
-#: createdb.c:320 reindexdb.c:892
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=USERNAME      접속할 사용자\n"
 
-#: createdb.c:321 reindexdb.c:893
+#: createdb.c:323 reindexdb.c:919
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password            암호 프롬프트 표시 안 함\n"
 
-#: createdb.c:322 reindexdb.c:894
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password               암호 프롬프트 표시함\n"
 
-#: createdb.c:323 reindexdb.c:895
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAME      대체용 관리 대상 데이터베이스\n"
 
-#: createdb.c:324
+#: createdb.c:326
 #, c-format
 msgid ""
 "\n"
@@ -600,17 +603,17 @@ msgstr "이 새 롤에게 데이터베이스를 만들 수 있는 권할을 줄
 msgid "Shall the new role be allowed to create more new roles?"
 msgstr "이 새 롤에게 또 다른 롤을 만들 수 있는 권한을 줄까요?"
 
-#: createuser.c:309
+#: createuser.c:311
 #, c-format
 msgid "password encryption failed: %s"
 msgstr "암호 암호화 실패: %s"
 
-#: createuser.c:400
+#: createuser.c:402
 #, c-format
 msgid "creation of new role failed: %s"
 msgstr "새 롤 만들기 실패: %s"
 
-#: createuser.c:414
+#: createuser.c:416
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -619,12 +622,12 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 롤을 만듭니다.\n"
 "\n"
 
-#: createuser.c:416 dropuser.c:171
+#: createuser.c:418 dropuser.c:172
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [옵션]... [롤이름]\n"
 
-#: createuser.c:418
+#: createuser.c:420
 #, c-format
 msgid ""
 "  -a, --with-admin=ROLE     ROLE will be a member of new role with admin\n"
@@ -633,34 +636,34 @@ msgstr ""
 "  -a, --with-admin=ROLE     지정한 롤이 새로 만들어질 롤의 관리 권한있는\n"
 "                            소속원이 됨\n"
 
-#: createuser.c:420
+#: createuser.c:422
 #, c-format
 msgid ""
 "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr "  -c, --connection-limit=N  연결 제한 수 (초기값: 무제한)\n"
 
-#: createuser.c:421
+#: createuser.c:423
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            새 데이터베이스를 만들 수 있음\n"
 
-#: createuser.c:422
+#: createuser.c:424
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases (default)\n"
 msgstr ""
 "  -D, --no-createdb         데이터베이스를 만들 수 있는 권한 없음 (초기값)\n"
 
-#: createuser.c:424
+#: createuser.c:426
 #, c-format
 msgid "  -g, --member-of=ROLE      new role will be a member of ROLE\n"
 msgstr "  -g, --member-of=ROLE      만들어지는 롤이 이 ROLE의 구성원이 됨\n"
 
-#: createuser.c:425
+#: createuser.c:427
 #, c-format
 msgid "  --role=ROLE               (same as --member-of, deprecated)\n"
 msgstr " --role=ROLE               (--member-of와 같음, 옛날 옵션)\n"
 
-#: createuser.c:426
+#: createuser.c:428
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -669,52 +672,52 @@ msgstr ""
 "  -i, --inherit             롤의 권한을 상속할 수 있음\n"
 "                            (초기값)\n"
 
-#: createuser.c:428
+#: createuser.c:430
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit          이 롤의 권한을 상속할 수 없음\n"
 
-#: createuser.c:429
+#: createuser.c:431
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login               로그인 허용 (초기값)\n"
 
-#: createuser.c:430
+#: createuser.c:432
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login            로그인 할 수 없음\n"
 
-#: createuser.c:431
+#: createuser.c:433
 #, c-format
 msgid "  -m, --with-member=ROLE    ROLE will be a member of new role\n"
 msgstr "  -m, --with-member=ROLE    ROLE이 새로 만들 롤의 소속원이 됨\n"
 
-#: createuser.c:432
+#: createuser.c:434
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt            새 롤의 암호 지정\n"
 
-#: createuser.c:433
+#: createuser.c:435
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole          새 롤을 만들 수 있음\n"
 
-#: createuser.c:434
+#: createuser.c:436
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles (default)\n"
 msgstr "  -R, --no-createrole       롤 만들 수 있는 권한 없음 (초기값)\n"
 
-#: createuser.c:435
+#: createuser.c:437
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           superuser 권한으로 지정\n"
 
-#: createuser.c:436
+#: createuser.c:438
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
 msgstr "  -S, --no-superuser        슈퍼유저 권한 없음 (초기값)\n"
 
-#: createuser.c:437
+#: createuser.c:439
 #, c-format
 msgid ""
 "  -v, --valid-until=TIMESTAMP\n"
@@ -723,7 +726,7 @@ msgstr ""
 "  -v, --valid-until=TIMESTAMP\n"
 "                            비밀번호 유효기한 지정\n"
 
-#: createuser.c:440
+#: createuser.c:442
 #, c-format
 msgid ""
 "  --interactive             prompt for missing role name and attributes "
@@ -733,13 +736,13 @@ msgstr ""
 "  --interactive             롤 이름과 속성을 초기값을 쓰지 않고\n"
 "                            각각 직접 입력 선택 함\n"
 
-#: createuser.c:442
+#: createuser.c:444
 #, c-format
 msgid ""
 "  --bypassrls               role can bypass row-level security (RLS) policy\n"
 msgstr "  --bypassrls               롤이 행 단위 보안 (RLS) 정책을 무시함\n"
 
-#: createuser.c:443
+#: createuser.c:445
 #, c-format
 msgid ""
 "  --no-bypassrls            role cannot bypass row-level security (RLS) "
@@ -749,18 +752,18 @@ msgstr ""
 "  --no-bypassrls            롤이 행 단위 보안 (RLS) 정책을 무시 못함\n"
 "                            (기본값)\n"
 
-#: createuser.c:445
+#: createuser.c:447
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr "  --replication             복제 기능 이용할 수 있는 롤\n"
 
-#: createuser.c:446
+#: createuser.c:448
 #, c-format
 msgid ""
 "  --no-replication          role cannot initiate replication (default)\n"
 msgstr "  --no-replication          복제 권한 없음 (기본값)\n"
 
-#: createuser.c:451
+#: createuser.c:453
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
@@ -782,12 +785,12 @@ msgstr "\"%s\" 데이터베이스가 완전히 삭제 될 것입니다.\n"
 msgid "Are you sure?"
 msgstr "정말 계속 할까요? (y/n) "
 
-#: dropdb.c:157
+#: dropdb.c:156
 #, c-format
 msgid "database removal failed: %s"
 msgstr "데이터베이스 삭제 실패: %s"
 
-#: dropdb.c:171
+#: dropdb.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -796,24 +799,24 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 데이터베이스를 삭제합니다.\n"
 "\n"
 
-#: dropdb.c:173
+#: dropdb.c:172
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [옵션]... DB이름\n"
 
-#: dropdb.c:176
+#: dropdb.c:175
 #, c-format
 msgid ""
 "  -f, --force               try to terminate other connections before "
 "dropping\n"
 msgstr "  -f, --force               삭제 전에 접속한 다른 세션들 강제로 끊음\n"
 
-#: dropdb.c:177
+#: dropdb.c:176
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         지우기 전에 한 번 더 물어봄\n"
 
-#: dropdb.c:179
+#: dropdb.c:178
 #, c-format
 msgid ""
 "  --if-exists               don't report error if database doesn't exist\n"
@@ -834,12 +837,12 @@ msgstr "롤 이름은 필수 입력 인자입니다"
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "\"%s\" 롤은 영구히 삭제될 것입니다.\n"
 
-#: dropuser.c:154
+#: dropuser.c:155
 #, c-format
 msgid "removal of role \"%s\" failed: %s"
 msgstr "\"%s\" 롤 삭제 실패: %s"
 
-#: dropuser.c:169
+#: dropuser.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
@@ -848,7 +851,7 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 롤을 삭제합니다.\n"
 "\n"
 
-#: dropuser.c:174
+#: dropuser.c:175
 #, c-format
 msgid ""
 "  -i, --interactive         prompt before deleting anything, and prompt for\n"
@@ -857,12 +860,12 @@ msgstr ""
 "  -i, --interactive         롤 이름을 입력하지 않았다면,\n"
 "                            해당 이름을 물어봄\n"
 
-#: dropuser.c:177
+#: dropuser.c:178
 #, c-format
 msgid "  --if-exists               don't report error if user doesn't exist\n"
 msgstr "  --if-exists               해당 롤이 없어도 오류를 보고하지 않음\n"
 
-#: dropuser.c:182
+#: dropuser.c:183
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
@@ -955,57 +958,57 @@ msgstr "  -t, --timeout=초         연결 제한 시간, 0 무제한 (초기값
 msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr "  -U, --username=USERNAME  접속할 사용자이름\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr "시스템 카탈로그 재색인 작업은 병렬로 처리할 수 없음"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr ""
 "모든 데이터베이스 재색인 작업과 특정 데이터베이스 재색인 작업은 동시에 진행"
 "할 수 없습니다"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:514 vacuumdb.c:521 vacuumdb.c:528
-#: vacuumdb.c:535 vacuumdb.c:542 vacuumdb.c:549 vacuumdb.c:556 vacuumdb.c:561
-#: vacuumdb.c:565 vacuumdb.c:569 vacuumdb.c:573
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:559 vacuumdb.c:566 vacuumdb.c:573
+#: vacuumdb.c:580 vacuumdb.c:587 vacuumdb.c:594 vacuumdb.c:601 vacuumdb.c:608
+#: vacuumdb.c:615 vacuumdb.c:622 vacuumdb.c:629 vacuumdb.c:636
 #, c-format
 msgid ""
 "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr "\"%s\" 옵션은 PostgreSQL %s 버전보다 오래된 서버에서는 사용할 수 없음"
 
-#: reindexdb.c:584
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "\"%s\" 데이터베이스 재색인 작업 실패: %s"
 
-#: reindexdb.c:588
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "\"%s\" 인덱스(해당DB: \"%s\") 재색인 작업 실패: %s"
 
-#: reindexdb.c:592
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "\"%s\" 스키마(해당DB: \"%s\") 재색인 작업 실패: %s"
 
-#: reindexdb.c:596
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "\"%s\" 데이터베이스 시스템 카탈로그 재색인 작업 실패: %s"
 
-#: reindexdb.c:600
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "\"%s\" 테이블(해당DB: \"%s\") 재색인 작업 실패: %s"
 
-#: reindexdb.c:828
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: \"%s\" 데이터베이스 재색인 작업 중\n"
 
-#: reindexdb.c:871
+#: reindexdb.c:897
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -1014,27 +1017,27 @@ msgstr ""
 "%s 프로그램은 PostgreSQL 데이터베이스 재색인 작업을 합니다.\n"
 "\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                    모든 데이터베이스 재색인\n"
 
-#: reindexdb.c:876
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr "      --concurrently           테이블 잠그지 않는 재색인\n"
 
-#: reindexdb.c:877
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=DBNAME          지정한 데이터베이스의 재색인 작업\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr "  -i, --index=INDEX            지정한 인덱스들만 다시 만듬\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:906
 #, c-format
 msgid ""
 "  -j, --jobs=NUM               use this many concurrent connections to "
@@ -1042,38 +1045,38 @@ msgid ""
 msgstr ""
 "  -j, --jobs=NUM                재색인 작업을 여러개의 연결로 동시에 작업함\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  어떠한 메시지도 보여주지 않음\n"
 
-#: reindexdb.c:882
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr "  -s, --system                 시스템 카탈로그 재색인\n"
 
-#: reindexdb.c:883
+#: reindexdb.c:909
 #, c-format
 msgid "  -S, --schema=SCHEMA          reindex specific schema(s) only\n"
 msgstr "  -S, --schema=SCHEMA          지정한 스키마들 자료만 덤프\n"
 
-#: reindexdb.c:884
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr "  -t, --table=TABLE            지정한 테이블들만 재색인 작업\n"
 
-#: reindexdb.c:885
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
 msgstr ""
 "      --tablespace=TABLESPACE  데이터베이스를 위한 기본 테이블스페이스\n"
 
-#: reindexdb.c:886
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose                작업내역의 자세한 출력\n"
 
-#: reindexdb.c:896
+#: reindexdb.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1082,29 +1085,34 @@ msgstr ""
 "\n"
 "보다 자세한 내용은 REINDEX SQL 명령어 설명서를 참조하십시오.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:325 vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:337
+#: vacuumdb.c:340 vacuumdb.c:343 vacuumdb.c:346 vacuumdb.c:355
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "통계 수집 전용 작업에서는 \"%s\" 옵션을 사용할 수 없음"
 
-#: vacuumdb.c:346
+#: vacuumdb.c:358
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "full vacuum 작업에서는 \"%s\" 옵션을 사용할 수 없음"
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:364 vacuumdb.c:372
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "\"%s\" 옵션과 \"%s\" 옵션을 함께 사용할 수 없음"
 
-#: vacuumdb.c:432
+#: vacuumdb.c:380
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "\"%s\" 옵션은 \"%s\" 옵션과 \"%s\" 옵션을 없이 사용할 수 없음"
+
+#: vacuumdb.c:454
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr ""
 "-a 옵션이 있을 경우는 한 데이터베이스를 대상으로 작업을 진행할 수 없습니다."
 
-#: vacuumdb.c:436
+#: vacuumdb.c:458
 #, c-format
 msgid ""
 "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
@@ -1112,12 +1120,12 @@ msgstr ""
 "스키마 안에 있는 모든 테이블을 청소하는 것과 특정 테이블만 청소하는 것을 동시"
 "에 할 수 없음"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:462
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr "특정 테이블만 청소하는 것과 스키마를 제외하는 것은 동시에 할 수 없음"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:466
 #, c-format
 msgid ""
 "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
@@ -1125,44 +1133,44 @@ msgstr ""
 "스키마 안 모든 테이블만 청소하는 것과 스키마를 제외하는 것은 동시에 할 수 없"
 "음"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:479
 #, c-format
 msgid "out of memory"
 msgstr "메모리 부족"
 
-#: vacuumdb.c:501
+#: vacuumdb.c:546
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "최소 최적화 통계 수집 수행 중 (1% 대상)"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:547
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "일반 최적화 통계 수집 수행 중 (10% 대상)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:548
 msgid "Generating default (full) optimizer statistics"
 msgstr "최대 최적화 통계 수집 수행중 (모든 자료 대상)"
 
-#: vacuumdb.c:582
+#: vacuumdb.c:646
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: \"%s\" 데이터베이스 작업 중: %s\n"
 
-#: vacuumdb.c:585
+#: vacuumdb.c:649
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: \"%s\" 데이터베이스를 청소 중\n"
 
-#: vacuumdb.c:1146
+#: vacuumdb.c:1325
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "\"%s\" 테이블 (해당 DB: \"%s\") 청소하기 실패: %s"
 
-#: vacuumdb.c:1149
+#: vacuumdb.c:1328
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "\"%s\" 데이터베이스 청소하기 실패: %s"
 
-#: vacuumdb.c:1157
+#: vacuumdb.c:1336
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1172,44 +1180,44 @@ msgstr ""
 "퀴리 최적화기의 참고 자료를 갱신합니다.\n"
 "\n"
 
-#: vacuumdb.c:1161
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       모든 데이터베이스 청소\n"
 
-#: vacuumdb.c:1162
+#: vacuumdb.c:1341
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr "      --buffer-usage-limit=SIZE   청소를 위한 링 버커 크기\n"
 
-#: vacuumdb.c:1163
+#: vacuumdb.c:1342
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             DBNAME 데이터베이스 청소\n"
 
-#: vacuumdb.c:1164
+#: vacuumdb.c:1343
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr "      --disable-page-skipping     모든 page-skipping 기능 비활성화\n"
 
-#: vacuumdb.c:1165
+#: vacuumdb.c:1344
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
 msgstr "  -e, --echo                      서버로 보내는 명령들을 보여줌\n"
 
-#: vacuumdb.c:1166
+#: vacuumdb.c:1345
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      대청소\n"
 
-#: vacuumdb.c:1167
+#: vacuumdb.c:1346
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr "  -F, --freeze                    행 트랜잭션 정보 동결\n"
 
-#: vacuumdb.c:1168
+#: vacuumdb.c:1347
 #, c-format
 msgid ""
 "      --force-index-cleanup       always remove index entries that point to "
@@ -1217,7 +1225,7 @@ msgid ""
 msgstr ""
 "      --force-index-cleanup       삭제된 튜플 대상 인덱스 항목 항상 삭제\n"
 
-#: vacuumdb.c:1169
+#: vacuumdb.c:1348
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                  use this many concurrent connections to "
@@ -1225,7 +1233,7 @@ msgid ""
 msgstr ""
 "  -j, --jobs=NUM                  청소 작업을 여러개의 연결로 동시에 작업함\n"
 
-#: vacuumdb.c:1170
+#: vacuumdb.c:1349
 #, c-format
 msgid ""
 "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to "
@@ -1233,7 +1241,7 @@ msgid ""
 msgstr ""
 "      --min-mxid-age=MXID_AGE     청소할 테이블의 최소 multixact ID 나이\n"
 
-#: vacuumdb.c:1171
+#: vacuumdb.c:1350
 #, c-format
 msgid ""
 "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to "
@@ -1241,7 +1249,14 @@ msgid ""
 msgstr ""
 "      --min-xid-age=XID_AGE       청소할 테이블의 최소 트랜잭션 ID 나이\n"
 
-#: vacuumdb.c:1172
+#: vacuumdb.c:1351
+#, c-format
+msgid ""
+"      --missing-stats-only        only analyze relations with missing "
+"statistics\n"
+msgstr "      --missing-stats-only        statistics 갱신 없이 analyze만 함\n"
+
+#: vacuumdb.c:1352
 #, c-format
 msgid ""
 "      --no-index-cleanup          don't remove index entries that point to "
@@ -1249,12 +1264,12 @@ msgid ""
 msgstr ""
 "      --no-index-cleanup          삭제된 튜플 대상 인덱스 항목 지우지 않음\n"
 
-#: vacuumdb.c:1173
+#: vacuumdb.c:1353
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main           메인 릴레이션 건너뜀\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1354
 #, c-format
 msgid ""
 "      --no-process-toast          skip the TOAST table associated with the "
@@ -1263,7 +1278,7 @@ msgstr ""
 "      --no-process-toast          vacuum 대상 테이블과 관련된 TOAST 테이블 건"
 "너뜀\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1355
 #, c-format
 msgid ""
 "      --no-truncate               don't truncate empty pages at the end of "
@@ -1271,7 +1286,7 @@ msgid ""
 msgstr ""
 "      --no-truncate               테이블 끝에 있는 빈 페이지를 지우지 않음\n"
 
-#: vacuumdb.c:1176
+#: vacuumdb.c:1356
 #, c-format
 msgid ""
 "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) "
@@ -1279,7 +1294,7 @@ msgid ""
 msgstr ""
 "  -n, --schema=SCHEMA             지정한 스키마 안에 있는 테이블만 청소함\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1357
 #, c-format
 msgid ""
 "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified "
@@ -1287,7 +1302,7 @@ msgid ""
 msgstr ""
 "  -N, --exclude-schema=SCHEMA     지정한 스키마 안에 있는 테이블만 청소안함\n"
 
-#: vacuumdb.c:1178
+#: vacuumdb.c:1358
 #, c-format
 msgid ""
 "  -P, --parallel=PARALLEL_WORKERS use this many background workers for "
@@ -1296,12 +1311,12 @@ msgstr ""
 "  -P, --parallel=병렬작업수       vacuum 작업을 병렬로 처리 할 수 있는 경우\n"
 "                                  백그라운드 작업 프로세스 수\n"
 
-#: vacuumdb.c:1179
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     어떠한 메시지도 보여주지 않음\n"
 
-#: vacuumdb.c:1180
+#: vacuumdb.c:1360
 #, c-format
 msgid ""
 "      --skip-locked               skip relations that cannot be immediately "
@@ -1309,28 +1324,28 @@ msgid ""
 msgstr ""
 "      --skip-locked               즉시 잠글 수 없는 릴레이션은 건너 뜀\n"
 
-#: vacuumdb.c:1181
+#: vacuumdb.c:1361
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  지정한 특정 테이블들만 청소\n"
 
-#: vacuumdb.c:1182
+#: vacuumdb.c:1362
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   작업내역의 자세한 출력\n"
 
-#: vacuumdb.c:1183
+#: vacuumdb.c:1363
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   버전 정보를 보여주고 마침\n"
 
-#: vacuumdb.c:1184
+#: vacuumdb.c:1364
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   쿼리최적화 통계 정보를 갱신함\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1365
 #, c-format
 msgid ""
 "  -Z, --analyze-only              only update optimizer statistics; no "
@@ -1339,7 +1354,7 @@ msgstr ""
 "  -Z, --analyze-only              청소 작업 없이 쿼리최적화 통계 정보만 갱신"
 "함\n"
 
-#: vacuumdb.c:1186
+#: vacuumdb.c:1366
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in "
@@ -1349,12 +1364,12 @@ msgstr ""
 "      --analyze-in-stages         보다 빠른 결과를 위해 다중 스테이지에서\n"
 "                                  최적화 통계치만 갱신함;청소 안함\n"
 
-#: vacuumdb.c:1188
+#: vacuumdb.c:1368
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      이 도움말을 표시하고 종료\n"
 
-#: vacuumdb.c:1196
+#: vacuumdb.c:1376
 #, c-format
 msgid ""
 "\n"
@@ -1363,64 +1378,52 @@ msgstr ""
 "\n"
 "보다 자세한 내용은 VACUUM SQL 명령어 설명서를 참조하십시오.\n"
 
-#, c-format
 #~ msgid "cannot cluster specific table(s) in all databases"
 #~ msgstr "모든 DB를 대상으로 특정 테이블들을 클러스터할 수 없음"
 
-#, c-format
+#~ msgid "cannot exclude specific schema(s) in all databases"
+#~ msgstr "모든 데이터베이스를 대상으로는 특정 스키마를 제외할 수 없음"
+
 #~ msgid "cannot reindex all databases and system catalogs at the same time"
 #~ msgstr ""
 #~ "모든 데이터베이스 재색인 작업과 시스템 카탈로그 재색인 작업은 동시에 진행"
 #~ "할 수 없습니다"
 
-#, c-format
-#~ msgid "cannot reindex specific schema(s) in all databases"
-#~ msgstr ""
-#~ "모든 데이터베이스 재색인 작업에서 특정 스키마들의 재색인 작업을 지정할 수 "
-#~ "없습니다"
-
-#, c-format
-#~ msgid "cannot reindex specific table(s) in all databases"
+#~ msgid ""
+#~ "cannot reindex specific index(es) and system catalogs at the same time"
 #~ msgstr ""
-#~ "모든 데이터베이스 재색인 작업에서 특정 테이블의 재색인 작업을 지정할 수 없"
-#~ "습니다"
+#~ "특정 인덱스와 시스템 카탈로그 재색인 작업은 동시에 진행할 수 없습니다"
 
-#, c-format
 #~ msgid "cannot reindex specific index(es) in all databases"
 #~ msgstr ""
 #~ "모든 데이터베이스 재색인 작업에서 특정 인덱스 재색인 작업을 지정할 수 없습"
 #~ "니다"
 
-#, c-format
 #~ msgid ""
 #~ "cannot reindex specific schema(s) and system catalogs at the same time"
 #~ msgstr ""
 #~ "특정 스키마와 시스템 카탈로그 재색인 작업은 동시에 진행할 수 없습니다"
 
-#, c-format
+#~ msgid "cannot reindex specific schema(s) in all databases"
+#~ msgstr ""
+#~ "모든 데이터베이스 재색인 작업에서 특정 스키마들의 재색인 작업을 지정할 수 "
+#~ "없습니다"
+
 #~ msgid ""
 #~ "cannot reindex specific table(s) and system catalogs at the same time"
 #~ msgstr ""
 #~ "특정 테이블과 시스템 카탈로그 재색인 작업은 동시에 진행할 수 없습니다"
 
-#, c-format
-#~ msgid ""
-#~ "cannot reindex specific index(es) and system catalogs at the same time"
+#~ msgid "cannot reindex specific table(s) in all databases"
 #~ msgstr ""
-#~ "특정 인덱스와 시스템 카탈로그 재색인 작업은 동시에 진행할 수 없습니다"
+#~ "모든 데이터베이스 재색인 작업에서 특정 테이블의 재색인 작업을 지정할 수 없"
+#~ "습니다"
 
-#, c-format
 #~ msgid "cannot use multiple jobs to reindex indexes"
 #~ msgstr "인덱스 다시 만들기에서는 다중 작업을 사용할 수 없음"
 
-#, c-format
-#~ msgid "cannot vacuum specific table(s) in all databases"
-#~ msgstr "모든 데이터베이스를 대상으로는 특정 테이블들을 청소할 수는 없음"
-
-#, c-format
 #~ msgid "cannot vacuum specific schema(s) in all databases"
 #~ msgstr "모든 데이터베이스를 대상으로는 특정 스키마들을 청소할 수는 없음"
 
-#, c-format
-#~ msgid "cannot exclude specific schema(s) in all databases"
-#~ msgstr "모든 데이터베이스를 대상으로는 특정 스키마를 제외할 수 없음"
+#~ msgid "cannot vacuum specific table(s) in all databases"
+#~ msgstr "모든 데이터베이스를 대상으로는 특정 테이블들을 청소할 수는 없음"
diff --git a/src/bin/scripts/po/ru.po b/src/bin/scripts/po/ru.po
index 2afac56ec19..df18f6fb518 100644
--- a/src/bin/scripts/po/ru.po
+++ b/src/bin/scripts/po/ru.po
@@ -3,13 +3,13 @@
 # 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, 2019, 2020, 2021, 2022, 2023, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pgscripts (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-05 08:25+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 17:25+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -19,22 +19,22 @@ msgstr ""
 "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"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "ошибка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "подробности: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "подсказка: "
@@ -50,44 +50,44 @@ msgstr "нехватка памяти\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удалось открыть файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "эта сборка программы не поддерживает метод синхронизации \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удалось прочитать каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удалось синхронизировать с ФС файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не удалось переименовать файл \"%s\" в \"%s\": %m"
@@ -179,11 +179,11 @@ msgstr "Прервано\n"
 #: ../../fe_utils/print.c:3188
 #, c-format
 msgid ""
-"Cannot print table contents: number of cells %lld is equal to or exceeds "
-"maximum %lld.\n"
+"Cannot print table contents: number of cells %<PRIu64> is equal to or "
+"exceeds maximum %zu.\n"
 msgstr ""
-"Вывести содержимое таблицы нельзя: число ячеек %lld достигло максимума "
-"%lld.\n"
+"Вывести содержимое таблицы нельзя: число ячеек %<PRIu64> достигло максимума "
+"%zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -193,9 +193,11 @@ msgstr ""
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
+msgid ""
+"Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
 msgstr ""
-"Ошибка добавления ячейки в таблицу: превышен предел числа ячеек (%lld).\n"
+"Ошибка добавления ячейки в таблицу: превышен предел числа ячеек "
+"(%<PRIu64>).\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -212,54 +214,54 @@ msgstr "ошибка при выполнении запроса: %s"
 msgid "Query was: %s"
 msgstr "Выполнялся запрос: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "аргумент команды оболочки содержит символ новой строки или перевода каретки: "
 "\"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr ""
 "имя базы данных содержит символ новой строки или перевода каретки: \"%s\"\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:292 vacuumdb.c:312
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:310
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "нельзя кластеризовать все базы и одну конкретную одновременно"
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "кластеризовать таблицу \"%s\" в базе \"%s\" не удалось: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "кластеризовать базу \"%s\" не удалось: %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: кластеризация базы \"%s\"\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -268,19 +270,19 @@ msgstr ""
 "%s упорядочивает данные всех кластеризованных таблиц в базе данных.\n"
 "\n"
 
-#: clusterdb.c:275 createdb.c:298 createuser.c:415 dropdb.c:172 dropuser.c:170
-#: pg_isready.c:226 reindexdb.c:872 vacuumdb.c:1170
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1337
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: clusterdb.c:276 reindexdb.c:873 vacuumdb.c:1171
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1338
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [ПАРАМЕТР]... [ИМЯ_БД]\n"
 
-#: clusterdb.c:277 createdb.c:300 createuser.c:417 dropdb.c:174 dropuser.c:172
-#: pg_isready.c:229 reindexdb.c:874 vacuumdb.c:1172
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -289,50 +291,50 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 кластеризовать все базы\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=ИМЯ_БД       имя базы данных для кластеризации\n"
 
-#: clusterdb.c:280 createuser.c:423 dropdb.c:175 dropuser.c:173
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                отображать команды, отправляемые серверу\n"
 
-#: clusterdb.c:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               не выводить никакие сообщения\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr ""
 "  -t, --table=ТАБЛИЦА       кластеризовать только указанную таблицу(ы)\n"
 
-#: clusterdb.c:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             выводить исчерпывающие сообщения\n"
 
-#: clusterdb.c:284 createuser.c:439 dropdb.c:178 dropuser.c:176
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: clusterdb.c:285 createuser.c:447 dropdb.c:180 dropuser.c:178
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: clusterdb.c:286 createdb.c:317 createuser.c:448 dropdb.c:181 dropuser.c:179
-#: pg_isready.c:235 reindexdb.c:889 vacuumdb.c:1201
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1369
 #, c-format
 msgid ""
 "\n"
@@ -341,40 +343,40 @@ msgstr ""
 "\n"
 "Параметры подключения:\n"
 
-#: clusterdb.c:287 createuser.c:449 dropdb.c:182 dropuser.c:180 vacuumdb.c:1202
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1370
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ            компьютер с сервером баз данных или каталог "
 "сокетов\n"
 
-#: clusterdb.c:288 createuser.c:450 dropdb.c:183 dropuser.c:181 vacuumdb.c:1203
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1371
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=ПОРТ           порт сервера баз данных\n"
 
-#: clusterdb.c:289 dropdb.c:184 vacuumdb.c:1204
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1372
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr ""
 "  -U, --username=ИМЯ        имя пользователя для подключения к серверу\n"
 
-#: clusterdb.c:290 createuser.c:452 dropdb.c:185 dropuser.c:183 vacuumdb.c:1205
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1373
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         не запрашивать пароль\n"
 
-#: clusterdb.c:291 createuser.c:453 dropdb.c:186 dropuser.c:184 vacuumdb.c:1206
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1374
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            запросить пароль\n"
 
-#: clusterdb.c:292 dropdb.c:187 vacuumdb.c:1207
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1375
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=ИМЯ_БД   сменить опорную базу данных\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid ""
 "\n"
@@ -383,8 +385,8 @@ msgstr ""
 "\n"
 "Подробнее о кластеризации вы можете узнать в описании SQL-команды CLUSTER.\n"
 
-#: clusterdb.c:294 createdb.c:325 createuser.c:454 dropdb.c:188 dropuser.c:185
-#: pg_isready.c:240 reindexdb.c:897 vacuumdb.c:1209
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1377
 #, c-format
 msgid ""
 "\n"
@@ -393,13 +395,13 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: clusterdb.c:295 createdb.c:326 createuser.c:455 dropdb.c:189 dropuser.c:186
-#: pg_isready.c:241 reindexdb.c:898 vacuumdb.c:1210
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1378
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -434,17 +436,17 @@ msgstr "Пожалуйста, введите \"%s\" или \"%s\".\n"
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" не является верным названием кодировки"
 
-#: createdb.c:260
+#: createdb.c:262
 #, c-format
 msgid "database creation failed: %s"
 msgstr "создать базу данных не удалось: %s"
 
-#: createdb.c:279
+#: createdb.c:281
 #, c-format
 msgid "comment creation failed (database was created): %s"
 msgstr "создать комментарий не удалось (база данных была создана): %s"
 
-#: createdb.c:297
+#: createdb.c:299
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -453,65 +455,65 @@ msgstr ""
 "%s создаёт базу данных PostgreSQL.\n"
 "\n"
 
-#: createdb.c:299
+#: createdb.c:301
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [ПАРАМЕТР]... [ИМЯ_БД] [ОПИСАНИЕ]\n"
 
 # well-spelled: ПРОСТР
-#: createdb.c:301
+#: createdb.c:303
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr ""
 "  -D, --tablespace=ТАБЛ_ПРОСТР табличное пространство по умолчанию для базы "
 "данных\n"
 
-#: createdb.c:302 reindexdb.c:878
+#: createdb.c:304 reindexdb.c:904
 #, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr ""
 "  -e, --echo                   отображать команды, отправляемые серверу\n"
 
-#: createdb.c:303
+#: createdb.c:305
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=КОДИРОВКА     кодировка базы данных\n"
 
-#: createdb.c:304
+#: createdb.c:306
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr "  -l, --locale=ЛОКАЛЬ          локаль для базы данных\n"
 
-#: createdb.c:305
+#: createdb.c:307
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr "      --lc-collate=ЛОКАЛЬ      параметр LC_COLLATE для базы данных\n"
 
-#: createdb.c:306
+#: createdb.c:308
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr "      --lc-ctype=ЛОКАЛЬ        параметр LC_CTYPE для базы данных\n"
 
-#: createdb.c:307
+#: createdb.c:309
 #, c-format
 msgid ""
 "      --builtin-locale=LOCALE  builtin locale setting for the database\n"
 msgstr "      --builtin-locale=ЛОКАЛЬ  имя встроенной локали для базы данных\n"
 
-#: createdb.c:308
+#: createdb.c:310
 #, c-format
 msgid "      --icu-locale=LOCALE      ICU locale setting for the database\n"
 msgstr "      --icu-locale=ЛОКАЛЬ      локаль ICU для базы данных\n"
 
-#: createdb.c:309
+#: createdb.c:311
 #, c-format
 msgid "      --icu-rules=RULES        ICU rules setting for the database\n"
 msgstr ""
 "      --icu-rules=ПРАВИЛА      настройка правил сортировки ICU для базы "
 "данных\n"
 
-#: createdb.c:310
+#: createdb.c:312
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -522,13 +524,13 @@ msgstr ""
 "                               провайдер локали для основного правила "
 "сортировки БД\n"
 
-#: createdb.c:312
+#: createdb.c:314
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr ""
 "  -O, --owner=ВЛАДЕЛЕЦ         пользователь-владелец новой базы данных\n"
 
-#: createdb.c:313
+#: createdb.c:315
 #, c-format
 msgid ""
 "  -S, --strategy=STRATEGY      database creation strategy wal_log or "
@@ -537,22 +539,22 @@ msgstr ""
 "  -S, --strategy=STRATEGY      стратегия создания базы данных: wal_log или "
 "file_copy\n"
 
-#: createdb.c:314
+#: createdb.c:316
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=ШАБЛОН        исходная база данных для копирования\n"
 
-#: createdb.c:315 reindexdb.c:887
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                показать версию и выйти\n"
 
-#: createdb.c:316 reindexdb.c:888
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   показать эту справку и выйти\n"
 
-#: createdb.c:318 reindexdb.c:890
+#: createdb.c:320 reindexdb.c:916
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
@@ -560,33 +562,33 @@ msgstr ""
 "  -h, --host=ИМЯ               компьютер с сервером баз данных или каталог "
 "сокетов\n"
 
-#: createdb.c:319 reindexdb.c:891
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=ПОРТ              порт сервера баз данных\n"
 
-#: createdb.c:320 reindexdb.c:892
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr ""
 "  -U, --username=ИМЯ           имя пользователя для подключения к серверу\n"
 
-#: createdb.c:321 reindexdb.c:893
+#: createdb.c:323 reindexdb.c:919
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password            не запрашивать пароль\n"
 
-#: createdb.c:322 reindexdb.c:894
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password               запросить пароль\n"
 
-#: createdb.c:323 reindexdb.c:895
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=ИМЯ_БД      сменить опорную базу данных\n"
 
-#: createdb.c:324
+#: createdb.c:326
 #, c-format
 msgid ""
 "\n"
@@ -624,17 +626,17 @@ msgstr "Новая роль должна иметь право создават
 msgid "Shall the new role be allowed to create more new roles?"
 msgstr "Новая роль должна иметь право создавать другие роли?"
 
-#: createuser.c:309
+#: createuser.c:311
 #, c-format
 msgid "password encryption failed: %s"
 msgstr "ошибка при шифровании пароля: %s"
 
-#: createuser.c:400
+#: createuser.c:402
 #, c-format
 msgid "creation of new role failed: %s"
 msgstr "создать роль не удалось: %s"
 
-#: createuser.c:414
+#: createuser.c:416
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -643,12 +645,12 @@ msgstr ""
 "%s создаёт роль пользователя PostgreSQL.\n"
 "\n"
 
-#: createuser.c:416 dropuser.c:171
+#: createuser.c:418 dropuser.c:172
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [ПАРАМЕТР]... [ИМЯ_РОЛИ]\n"
 
-#: createuser.c:418
+#: createuser.c:420
 #, c-format
 msgid ""
 "  -a, --with-admin=ROLE     ROLE will be a member of new role with admin\n"
@@ -658,7 +660,7 @@ msgstr ""
 "привилегией\n"
 "                            ADMIN\n"
 
-#: createuser.c:420
+#: createuser.c:422
 #, c-format
 msgid ""
 "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
@@ -666,29 +668,29 @@ msgstr ""
 "  -c, --connection-limit=N  предел подключений для роли\n"
 "                            (по умолчанию предела нет)\n"
 
-#: createuser.c:421
+#: createuser.c:423
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            роль с правом создания баз данных\n"
 
-#: createuser.c:422
+#: createuser.c:424
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases (default)\n"
 msgstr ""
 "  -D, --no-createdb         роль без права создания баз данных (по "
 "умолчанию)\n"
 
-#: createuser.c:424
+#: createuser.c:426
 #, c-format
 msgid "  -g, --member-of=ROLE      new role will be a member of ROLE\n"
 msgstr "  -g, --member-of=РОЛЬ      новая роль будет членом заданной роли\n"
 
-#: createuser.c:425
+#: createuser.c:427
 #, c-format
 msgid "  --role=ROLE               (same as --member-of, deprecated)\n"
 msgstr "  --role=РОЛЬ               (устаревшая альтернатива --member-of)\n"
 
-#: createuser.c:426
+#: createuser.c:428
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -698,57 +700,57 @@ msgstr ""
 "она\n"
 "                            включена (по умолчанию)\n"
 
-#: createuser.c:428
+#: createuser.c:430
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit          роль не наследует права\n"
 
-#: createuser.c:429
+#: createuser.c:431
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr ""
 "  -l, --login               роль с правом подключения к серверу (по "
 "умолчанию)\n"
 
-#: createuser.c:430
+#: createuser.c:432
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login            роль без права подключения\n"
 
-#: createuser.c:431
+#: createuser.c:433
 #, c-format
 msgid "  -m, --with-member=ROLE    ROLE will be a member of new role\n"
 msgstr "  -m, --with-member=РОЛЬ    заданная роль будет членом новой роли\n"
 
-#: createuser.c:432
+#: createuser.c:434
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt            назначить пароль новой роли\n"
 
-#: createuser.c:433
+#: createuser.c:435
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole          роль с правом создания других ролей\n"
 
-#: createuser.c:434
+#: createuser.c:436
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles (default)\n"
 msgstr ""
 "  -R, --no-createrole       роль без права создания ролей (по умолчанию)\n"
 
-#: createuser.c:435
+#: createuser.c:437
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           роль с полномочиями суперпользователя\n"
 
-#: createuser.c:436
+#: createuser.c:438
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
 msgstr ""
 "  -S, --no-superuser        роль без полномочий суперпользователя (по "
 "умолчанию)\n"
 
-#: createuser.c:437
+#: createuser.c:439
 #, c-format
 msgid ""
 "  -v, --valid-until=TIMESTAMP\n"
@@ -757,7 +759,7 @@ msgstr ""
 "  -v, --valid-until=ДАТА_ВРЕМЯ\n"
 "                            дата и время истечения срока пароля для роли\n"
 
-#: createuser.c:440
+#: createuser.c:442
 #, c-format
 msgid ""
 "  --interactive             prompt for missing role name and attributes "
@@ -767,7 +769,7 @@ msgstr ""
 "  --interactive             запрашивать отсутствующие атрибуты и имя роли,\n"
 "                            а не использовать значения по умолчанию\n"
 
-#: createuser.c:442
+#: createuser.c:444
 #, c-format
 msgid ""
 "  --bypassrls               role can bypass row-level security (RLS) policy\n"
@@ -775,7 +777,7 @@ msgstr ""
 "  --bypassrls               роль не будет подчиняться политикам защиты на\n"
 "                            уровне строк (RLS)\n"
 
-#: createuser.c:443
+#: createuser.c:445
 #, c-format
 msgid ""
 "  --no-bypassrls            role cannot bypass row-level security (RLS) "
@@ -785,12 +787,12 @@ msgstr ""
 "  --no-bypassrls            роль будет подчиняться политикам защиты на\n"
 "                            уровне строк (по умолчанию)\n"
 
-#: createuser.c:445
+#: createuser.c:447
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr "  --replication             роль может инициировать репликацию\n"
 
-#: createuser.c:446
+#: createuser.c:448
 #, c-format
 msgid ""
 "  --no-replication          role cannot initiate replication (default)\n"
@@ -798,7 +800,7 @@ msgstr ""
 "  --no-replication          роль не может инициировать репликацию\n"
 "                            (по умолчанию)\n"
 
-#: createuser.c:451
+#: createuser.c:453
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
@@ -820,12 +822,12 @@ msgstr "База данных \"%s\" будет удалена безвозвр
 msgid "Are you sure?"
 msgstr "Вы уверены? (y/n)"
 
-#: dropdb.c:157
+#: dropdb.c:156
 #, c-format
 msgid "database removal failed: %s"
 msgstr "ошибка при удалении базы данных: %s"
 
-#: dropdb.c:171
+#: dropdb.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -834,12 +836,12 @@ msgstr ""
 "%s удаляет базу данных PostgreSQL.\n"
 "\n"
 
-#: dropdb.c:173
+#: dropdb.c:172
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [ПАРАМЕТР]... БД\n"
 
-#: dropdb.c:176
+#: dropdb.c:175
 #, c-format
 msgid ""
 "  -f, --force               try to terminate other connections before "
@@ -848,12 +850,12 @@ msgstr ""
 "  -f, --force               пытаться закрыть другие подключения перед "
 "удалением\n"
 
-#: dropdb.c:177
+#: dropdb.c:176
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         подтвердить операцию удаления\n"
 
-#: dropdb.c:179
+#: dropdb.c:178
 #, c-format
 msgid ""
 "  --if-exists               don't report error if database doesn't exist\n"
@@ -874,12 +876,12 @@ msgstr "отсутствует необходимый аргумент: имя 
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Роль \"%s\" будет удалена безвозвратно.\n"
 
-#: dropuser.c:154
+#: dropuser.c:155
 #, c-format
 msgid "removal of role \"%s\" failed: %s"
 msgstr "ошибка при удалении роли \"%s\": %s"
 
-#: dropuser.c:169
+#: dropuser.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
@@ -888,7 +890,7 @@ msgstr ""
 "%s удаляет роль PostgreSQL.\n"
 "\n"
 
-#: dropuser.c:174
+#: dropuser.c:175
 #, c-format
 msgid ""
 "  -i, --interactive         prompt before deleting anything, and prompt for\n"
@@ -897,13 +899,13 @@ msgstr ""
 "  -i, --interactive         подтверждать операцию удаления и запрашивать\n"
 "                            имя роли, если оно не указано\n"
 
-#: dropuser.c:177
+#: dropuser.c:178
 #, c-format
 msgid "  --if-exists               don't report error if user doesn't exist\n"
 msgstr ""
 "  --if-exists               не считать ошибкой отсутствие пользователя\n"
 
-#: dropuser.c:182
+#: dropuser.c:183
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
@@ -1002,59 +1004,59 @@ msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr ""
 "  -U, --username=ИМЯ       имя пользователя для подключения к серверу\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr ""
 "нельзя задействовать несколько заданий для переиндексирования системных "
 "каталогов"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr ""
 "нельзя переиндексировать все базы данных и одну конкретную одновременно"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:514 vacuumdb.c:521 vacuumdb.c:528
-#: vacuumdb.c:535 vacuumdb.c:542 vacuumdb.c:549 vacuumdb.c:556 vacuumdb.c:563
-#: vacuumdb.c:570 vacuumdb.c:577 vacuumdb.c:584
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:559 vacuumdb.c:566 vacuumdb.c:573
+#: vacuumdb.c:580 vacuumdb.c:587 vacuumdb.c:594 vacuumdb.c:601 vacuumdb.c:608
+#: vacuumdb.c:615 vacuumdb.c:622 vacuumdb.c:629 vacuumdb.c:636
 #, c-format
 msgid ""
 "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr ""
 "параметр \"%s\" нельзя использовать с серверами PostgreSQL версии старее %s"
 
-#: reindexdb.c:584
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "переиндексировать базу данных \"%s\" не удалось: %s"
 
-#: reindexdb.c:588
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "перестроить индекс \"%s\" в базе \"%s\" не удалось: %s"
 
-#: reindexdb.c:592
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "переиндексировать схему \"%s\" в базе \"%s\" не удалось: %s"
 
-#: reindexdb.c:596
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "переиндексировать системные каталоги в базе \"%s\" не удалось: %s"
 
-#: reindexdb.c:600
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "переиндексировать таблицу \"%s\" в базе \"%s\" не удалось: %s"
 
-#: reindexdb.c:828
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: переиндексация базы данных \"%s\"\n"
 
-#: reindexdb.c:871
+#: reindexdb.c:897
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -1063,29 +1065,29 @@ msgstr ""
 "%s переиндексирует базу данных PostgreSQL.\n"
 "\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                    переиндексировать все базы данных\n"
 
-#: reindexdb.c:876
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr ""
 "      --concurrently           переиндексировать в неблокирующем режиме\n"
 
-#: reindexdb.c:877
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=БД              имя базы для переиндексации\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr ""
 "  -i, --index=ИНДЕКС           пересоздать только указанный индекс(ы)\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:906
 #, c-format
 msgid ""
 "  -j, --jobs=NUM               use this many concurrent connections to "
@@ -1094,24 +1096,24 @@ msgstr ""
 "  -j, --jobs=ЧИСЛО             запускать для переиндексации заданное число\n"
 "                               заданий\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  не выводить сообщения\n"
 
-#: reindexdb.c:882
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr ""
 "  -s, --system                 переиндексировать только системные каталоги\n"
 
-#: reindexdb.c:883
+#: reindexdb.c:909
 #, c-format
 msgid "  -S, --schema=SCHEMA          reindex specific schema(s) only\n"
 msgstr ""
 "  -S, --schema=СХЕМА           переиндексировать только указанную схему(ы)\n"
 
-#: reindexdb.c:884
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr ""
@@ -1119,19 +1121,19 @@ msgstr ""
 "таблицу(ы)\n"
 
 # well-spelled: ПРОСТР
-#: reindexdb.c:885
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
 msgstr ""
 "      --tablespace=ТАБЛ_ПРОСТР табличное пространство, в котором будут\n"
 "                               перестраиваться индексы\n"
 
-#: reindexdb.c:886
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose                выводить исчерпывающие сообщения\n"
 
-#: reindexdb.c:896
+#: reindexdb.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1140,28 +1142,33 @@ msgstr ""
 "\n"
 "Подробнее о переиндексации вы можете узнать в описании SQL-команды REINDEX.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:325 vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:337
+#: vacuumdb.c:340 vacuumdb.c:343 vacuumdb.c:346 vacuumdb.c:355
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "при выполнении только анализа нельзя использовать параметр \"%s\""
 
-#: vacuumdb.c:346
+#: vacuumdb.c:358
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "при выполнении полной очистки нельзя использовать параметр \"%s\""
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:364 vacuumdb.c:372
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "параметр \"%s\" нельзя использовать совместно с \"%s\""
 
-#: vacuumdb.c:432
+#: vacuumdb.c:380
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "параметр \"%s\" нельзя использовать без \"%s\" или \"%s\""
+
+#: vacuumdb.c:454
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr "нельзя очистить все базы данных и одну конкретную одновременно"
 
-#: vacuumdb.c:436
+#: vacuumdb.c:458
 #, c-format
 msgid ""
 "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
@@ -1169,57 +1176,57 @@ msgstr ""
 "нельзя очистить все таблицы в схеме(ах) и одну конкретную таблицу "
 "одновременно"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:462
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr ""
 "нельзя очистить конкретную таблицу(ы) и исключить схему(ы) одновременно"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:466
 #, c-format
 msgid ""
 "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
 msgstr ""
 "нельзя очистить все таблицы в схеме(ах) и исключить схему(ы) одновременно"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:479
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
 
-#: vacuumdb.c:501
+#: vacuumdb.c:546
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Вычисление минимальной статистики для оптимизатора (1 запись)"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:547
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Вычисление средней статистики для оптимизатора (10 записей)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:548
 msgid "Generating default (full) optimizer statistics"
 msgstr "Вычисление стандартной (полной) статистики для оптимизатора"
 
-#: vacuumdb.c:594
+#: vacuumdb.c:646
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: обработка базы данных \"%s\": %s\n"
 
-#: vacuumdb.c:597
+#: vacuumdb.c:649
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: очистка базы данных \"%s\"\n"
 
-#: vacuumdb.c:1158
+#: vacuumdb.c:1325
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "очистить таблицу \"%s\" в базе \"%s\" не удалось: %s"
 
-#: vacuumdb.c:1161
+#: vacuumdb.c:1328
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "очистить базу данных \"%s\" не удалось: %s"
 
-#: vacuumdb.c:1169
+#: vacuumdb.c:1336
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1228,12 +1235,12 @@ msgstr ""
 "%s очищает и анализирует базу данных PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:1173
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       очистить все базы данных\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1341
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr ""
@@ -1241,18 +1248,18 @@ msgstr ""
 "при\n"
 "                                  очистке\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1342
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=ИМЯ_БД             очистить указанную базу данных\n"
 
-#: vacuumdb.c:1176
+#: vacuumdb.c:1343
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr ""
 "      --disable-page-skipping     исключить все варианты пропуска страниц\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1344
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
@@ -1260,19 +1267,19 @@ msgid ""
 msgstr ""
 "  -e, --echo                      отображать команды, отправляемые серверу\n"
 
-#: vacuumdb.c:1178
+#: vacuumdb.c:1345
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      произвести полную очистку\n"
 
-#: vacuumdb.c:1179
+#: vacuumdb.c:1346
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr ""
 "  -F, --freeze                    заморозить информацию о транзакциях в "
 "строках\n"
 
-#: vacuumdb.c:1180
+#: vacuumdb.c:1347
 #, c-format
 msgid ""
 "      --force-index-cleanup       always remove index entries that point to "
@@ -1282,7 +1289,7 @@ msgstr ""
 "указывающие\n"
 "                                  на мёртвые кортежи\n"
 
-#: vacuumdb.c:1181
+#: vacuumdb.c:1348
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                  use this many concurrent connections to "
@@ -1291,7 +1298,7 @@ msgstr ""
 "  -j, --jobs=ЧИСЛО                запускать для очистки заданное число "
 "заданий\n"
 
-#: vacuumdb.c:1182
+#: vacuumdb.c:1349
 #, c-format
 msgid ""
 "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to "
@@ -1300,7 +1307,7 @@ msgstr ""
 "      --min-mxid-age=ВОЗРАСТ      минимальный возраст мультитранзакций для\n"
 "                                  таблиц, подлежащих очистке\n"
 
-#: vacuumdb.c:1183
+#: vacuumdb.c:1350
 #, c-format
 msgid ""
 "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to "
@@ -1310,7 +1317,16 @@ msgstr ""
 "таблиц,\n"
 "                                  подлежащих очистке\n"
 
-#: vacuumdb.c:1184
+#: vacuumdb.c:1351
+#, c-format
+msgid ""
+"      --missing-stats-only        only analyze relations with missing "
+"statistics\n"
+msgstr ""
+"      --missing-stats-only        анализировать только отношения без "
+"статистики\n"
+
+#: vacuumdb.c:1352
 #, c-format
 msgid ""
 "      --no-index-cleanup          don't remove index entries that point to "
@@ -1319,12 +1335,12 @@ msgstr ""
 "      --no-index-cleanup          не удалять элементы индекса, указывающие\n"
 "                                  на мёртвые кортежи\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1353
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main           пропускать основное отношение\n"
 
-#: vacuumdb.c:1186
+#: vacuumdb.c:1354
 #, c-format
 msgid ""
 "      --no-process-toast          skip the TOAST table associated with the "
@@ -1333,7 +1349,7 @@ msgstr ""
 "      --no-process-toast          пропускать TOAST-таблицу, связанную\n"
 "                                  с очищаемой таблицей\n"
 
-#: vacuumdb.c:1187
+#: vacuumdb.c:1355
 #, c-format
 msgid ""
 "      --no-truncate               don't truncate empty pages at the end of "
@@ -1342,7 +1358,7 @@ msgstr ""
 "      --no-truncate               не отсекать пустые страницы в конце "
 "таблицы\n"
 
-#: vacuumdb.c:1188
+#: vacuumdb.c:1356
 #, c-format
 msgid ""
 "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) "
@@ -1351,7 +1367,7 @@ msgstr ""
 "  -n, --schema=СХЕМА              очищать таблицы только в указанной "
 "схеме(ах)\n"
 
-#: vacuumdb.c:1189
+#: vacuumdb.c:1357
 #, c-format
 msgid ""
 "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified "
@@ -1359,7 +1375,7 @@ msgid ""
 msgstr ""
 "  -N, --exclude-schema=СХЕМА      не очищать таблицы в указанной схеме(ах)\n"
 
-#: vacuumdb.c:1190
+#: vacuumdb.c:1358
 #, c-format
 msgid ""
 "  -P, --parallel=PARALLEL_WORKERS use this many background workers for "
@@ -1369,12 +1385,12 @@ msgstr ""
 "                                  по возможности использовать для очистки\n"
 "                                  заданное число фоновых процессов\n"
 
-#: vacuumdb.c:1191
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     не выводить сообщения\n"
 
-#: vacuumdb.c:1192
+#: vacuumdb.c:1360
 #, c-format
 msgid ""
 "      --skip-locked               skip relations that cannot be immediately "
@@ -1383,29 +1399,29 @@ msgstr ""
 "      --skip-locked               пропускать отношения, которые не удаётся\n"
 "                                  заблокировать немедленно\n"
 
-#: vacuumdb.c:1193
+#: vacuumdb.c:1361
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr ""
 "  -t, --table='ТАБЛ[(СТОЛБЦЫ)]'   очистить только указанную таблицу(ы)\n"
 
-#: vacuumdb.c:1194
+#: vacuumdb.c:1362
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   выводить исчерпывающие сообщения\n"
 
-#: vacuumdb.c:1195
+#: vacuumdb.c:1363
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   показать версию и выйти\n"
 
-#: vacuumdb.c:1196
+#: vacuumdb.c:1364
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   обновить статистику оптимизатора\n"
 
-#: vacuumdb.c:1197
+#: vacuumdb.c:1365
 #, c-format
 msgid ""
 "  -Z, --analyze-only              only update optimizer statistics; no "
@@ -1414,7 +1430,7 @@ msgstr ""
 "  -Z, --analyze-only              только обновить статистику оптимизатора,\n"
 "                                  не очищать БД\n"
 
-#: vacuumdb.c:1198
+#: vacuumdb.c:1366
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in "
@@ -1426,12 +1442,12 @@ msgstr ""
 "                                  (в несколько проходов для большей "
 "скорости), без очистки\n"
 
-#: vacuumdb.c:1200
+#: vacuumdb.c:1368
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показать эту справку и выйти\n"
 
-#: vacuumdb.c:1208
+#: vacuumdb.c:1376
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/scripts/po/sv.po b/src/bin/scripts/po/sv.po
index 6dfeaecb092..2cc7724bf81 100644
--- a/src/bin/scripts/po/sv.po
+++ b/src/bin/scripts/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for postgresql
-# Dennis Björklund <db@zigo.dhs.org>, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 # Peter Eisentraut <peter_e@gmx.net>, 2013.
 # Mats Erik Andersson <bsd@gisladisker.se>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 17:52+0000\n"
-"PO-Revision-Date: 2024-07-12 22:17+0200\n"
+"POT-Creation-Date: 2025-05-16 16:21+0000\n"
+"PO-Revision-Date: 2025-05-16 20:24+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "detalj: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "tips: "
@@ -48,44 +48,44 @@ msgstr "slut på minne\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kan inte duplicera null-pekare (internt fel)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "kunde inte öppna fil \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "kan inte synkronisera filsystemet för fil \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "kunde inte göra stat() på fil \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "detta bygge stöder inte synkmetod \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "kunde inte öppna katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "kunde inte läsa katalog \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "kunde inte fsync:a fil \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "kunde inte döpa om fil \"%s\" till \"%s\": %m"
@@ -175,8 +175,8 @@ msgstr "Avbruten\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Kan inte skriva ut tabellinnehåll: antal celler %lld är lika med eller fler än maximala %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Kan inte skriva ut tabellinnehåll: antal celler %<PRIu64> är lika med eller fler än maximala %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -185,8 +185,8 @@ msgstr "Kan inte lägga till rubrik till tabellinnehåll: antal kolumner (%d) ö
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "Kan inte lägga till cell till tabellinnehåll: totala cellantalet %lld är överskridet.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "Kan inte lägga till cell till tabellinnehåll: totala cellantalet %<PRIu64> är överskridet.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -203,51 +203,51 @@ msgstr "fråga misslyckades: %s"
 msgid "Query was: %s"
 msgstr "Frågan var: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "shell-kommandots argument innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "databasnamnet innehåller nyrad eller vagnretur: \"%s\"\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:291 vacuumdb.c:311
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Försök med \"%s --help\" för mer information."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:309
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "för många kommandoradsargument (första är \"%s\")"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "kan inte klustra alla databaser och en angiven på samma gång"
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "klustring av tabell \"%s\" i databas \"%s\" misslyckades: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "klustring av databas \"%s\" misslyckades: %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: klustring av databas \"%s\"\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -256,19 +256,19 @@ msgstr ""
 "%s klustrar alla tidigare klustrade tabeller i en databas.\n"
 "\n"
 
-#: clusterdb.c:275 createdb.c:298 createuser.c:415 dropdb.c:172 dropuser.c:170
-#: pg_isready.c:226 reindexdb.c:868 vacuumdb.c:1147
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1332
 #, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: clusterdb.c:276 reindexdb.c:869 vacuumdb.c:1148
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1333
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [FLAGGA]... [DBNAMN]\n"
 
-#: clusterdb.c:277 createdb.c:300 createuser.c:417 dropdb.c:174 dropuser.c:172
-#: pg_isready.c:229 reindexdb.c:870 vacuumdb.c:1149
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -277,48 +277,48 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 klustra alla databaser\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       databas att klustra\n"
 
-#: clusterdb.c:280 createuser.c:423 dropdb.c:175 dropuser.c:173
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, c-format
 msgid "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                visa kommandon som skickas till servern\n"
 
-#: clusterdb.c:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               skriv inte ut några meddelanden\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr "  -t, --table=TABELL        klustra enbart ingivna tabeller\n"
 
-#: clusterdb.c:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             skriv massor med utdata\n"
 
-#: clusterdb.c:284 createuser.c:439 dropdb.c:178 dropuser.c:176
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             visa versionsinformation, avsluta sedan\n"
 
-#: clusterdb.c:285 createuser.c:447 dropdb.c:180 dropuser.c:178
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                visa denna hjälp, avsluta sedan\n"
 
-#: clusterdb.c:286 createdb.c:317 createuser.c:448 dropdb.c:181 dropuser.c:179
-#: pg_isready.c:235 reindexdb.c:885 vacuumdb.c:1178
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1364
 #, c-format
 msgid ""
 "\n"
@@ -327,37 +327,37 @@ msgstr ""
 "\n"
 "Flaggor för anslutning:\n"
 
-#: clusterdb.c:287 createuser.c:449 dropdb.c:182 dropuser.c:180 vacuumdb.c:1179
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1365
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=VÄRDNAMN       databasens värdnamn eller socketkatalog\n"
 
-#: clusterdb.c:288 createuser.c:450 dropdb.c:183 dropuser.c:181 vacuumdb.c:1180
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1366
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           databasserverns port\n"
 
-#: clusterdb.c:289 dropdb.c:184 vacuumdb.c:1181
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1367
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=ANVÄNDARE  användarnamn att ansluta som\n"
 
-#: clusterdb.c:290 createuser.c:452 dropdb.c:185 dropuser.c:183 vacuumdb.c:1182
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1368
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         fråga ej efter lösenord\n"
 
-#: clusterdb.c:291 createuser.c:453 dropdb.c:186 dropuser.c:184 vacuumdb.c:1183
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1369
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            framtvinga fråga om lösenord\n"
 
-#: clusterdb.c:292 dropdb.c:187 vacuumdb.c:1184
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1370
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAMN   annat val av underhållsdatabas\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid ""
 "\n"
@@ -366,8 +366,8 @@ msgstr ""
 "\n"
 "Läs beskrivningen av SQL-kommandot CLUSTER för detaljer.\n"
 
-#: clusterdb.c:294 createdb.c:325 createuser.c:454 dropdb.c:188 dropuser.c:185
-#: pg_isready.c:240 reindexdb.c:893 vacuumdb.c:1186
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -376,13 +376,13 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: clusterdb.c:295 createdb.c:326 createuser.c:455 dropdb.c:189 dropuser.c:186
-#: pg_isready.c:241 reindexdb.c:894 vacuumdb.c:1187
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1373
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -416,17 +416,17 @@ msgstr "Var vänlig att svara \"%s\" eller \"%s\".\n"
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" är inte ett giltigt kodningsnamn"
 
-#: createdb.c:260
+#: createdb.c:262
 #, c-format
 msgid "database creation failed: %s"
 msgstr "misslyckades att skapa databas: %s"
 
-#: createdb.c:279
+#: createdb.c:281
 #, c-format
 msgid "comment creation failed (database was created): %s"
 msgstr "misslyckades att skapa kommentar (databasen skapades): %s"
 
-#: createdb.c:297
+#: createdb.c:299
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -435,57 +435,57 @@ msgstr ""
 "%s skapar en PostgreSQL-databas.\n"
 "\n"
 
-#: createdb.c:299
+#: createdb.c:301
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [FLAGGA]... [DBNAMN] [BESKRIVNING]\n"
 
-#: createdb.c:301
+#: createdb.c:303
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=TABELLRYMD  förvalt tabellutrymme för databasen\n"
 
-#: createdb.c:302 reindexdb.c:874
+#: createdb.c:304 reindexdb.c:904
 #, c-format
 msgid "  -e, --echo                   show the commands being sent to the server\n"
 msgstr "  -e, --echo                   visa kommandon som skickas till servern\n"
 
-#: createdb.c:303
+#: createdb.c:305
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=KODNING       teckenkodning för databasen\n"
 
-#: createdb.c:304
+#: createdb.c:306
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr "  -l, --locale=LOKAL           lokalnamn för databasen\n"
 
-#: createdb.c:305
+#: createdb.c:307
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr "      --lc-collate=LOKAL       värde på LC_COLLATE för databasen\n"
 
-#: createdb.c:306
+#: createdb.c:308
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr "      --lc-ctype=LOKAL         värde på LC_CTYPE för databasen\n"
 
-#: createdb.c:307
+#: createdb.c:309
 #, c-format
 msgid "      --builtin-locale=LOCALE  builtin locale setting for the database\n"
 msgstr "      --builtin-locale=LOKAL   inbyggd lokal-inställning för databasen\n"
 
-#: createdb.c:308
+#: createdb.c:310
 #, c-format
 msgid "      --icu-locale=LOCALE      ICU locale setting for the database\n"
 msgstr "      --icu-locale=LOKAL       värde på ICU-lokal för databasen\n"
 
-#: createdb.c:309
+#: createdb.c:311
 #, c-format
 msgid "      --icu-rules=RULES        ICU rules setting for the database\n"
 msgstr "      --icu-rules=REGLER       ICU-regler för databasen\n"
 
-#: createdb.c:310
+#: createdb.c:312
 #, c-format
 msgid ""
 "      --locale-provider={builtin|libc|icu}\n"
@@ -494,64 +494,64 @@ msgstr ""
 "      --locale-provider={builtin|libc|icu}\n"
 "                               lokalleverantör av databasens standardjämförelser\n"
 
-#: createdb.c:312
+#: createdb.c:314
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr "  -O, --owner=ÄGARE            databasanvändare som äger nya databasen\n"
 
-#: createdb.c:313
+#: createdb.c:315
 #, c-format
 msgid "  -S, --strategy=STRATEGY      database creation strategy wal_log or file_copy\n"
 msgstr ""
 "  -S, --strategy=STRATEGI      strategi för att skapa en databas, wal_log\n"
 "                               eller file_copy\n"
 
-#: createdb.c:314
+#: createdb.c:316
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=MALL          databasmall att kopiera\n"
 
-#: createdb.c:315 reindexdb.c:883
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                visa versionsinformation, avsluta sedan\n"
 
-#: createdb.c:316 reindexdb.c:884
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   visa denna hjälp, avsluta sedan\n"
 
-#: createdb.c:318 reindexdb.c:886
+#: createdb.c:320 reindexdb.c:916
 #, c-format
 msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr "  -h, --host=VÄRDNAMN          databasens värdnamn eller socketkatalog\n"
 
-#: createdb.c:319 reindexdb.c:887
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              databasserverns port\n"
 
-#: createdb.c:320 reindexdb.c:888
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=ANVÄNDARE     användarnamn att ansluta som\n"
 
-#: createdb.c:321 reindexdb.c:889
+#: createdb.c:323 reindexdb.c:919
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password            fråga ej efter lösenord\n"
 
-#: createdb.c:322 reindexdb.c:890
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password               framtvinga fråga om lösenord\n"
 
-#: createdb.c:323 reindexdb.c:891
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAMN      annat val av underhållsdatabas\n"
 
-#: createdb.c:324
+#: createdb.c:326
 #, c-format
 msgid ""
 "\n"
@@ -589,17 +589,17 @@ msgstr "Skall den nya rollen tillåtas skapa databaser?"
 msgid "Shall the new role be allowed to create more new roles?"
 msgstr "Skall den nya rollen tillåtas skapa fler nya roller?"
 
-#: createuser.c:309
+#: createuser.c:311
 #, c-format
 msgid "password encryption failed: %s"
 msgstr "misslyckades med lösenordskryptering: %s"
 
-#: createuser.c:400
+#: createuser.c:402
 #, c-format
 msgid "creation of new role failed: %s"
 msgstr "misslyckades med att skapa ny roll: %s"
 
-#: createuser.c:414
+#: createuser.c:416
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -608,12 +608,12 @@ msgstr ""
 "%s skapar en ny PostgreSQL-roll.\n"
 "\n"
 
-#: createuser.c:416 dropuser.c:171
+#: createuser.c:418 dropuser.c:172
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [FLAGGA]... [ROLLNAMN]\n"
 
-#: createuser.c:418
+#: createuser.c:420
 #, c-format
 msgid ""
 "  -a, --with-admin=ROLE     ROLE will be a member of new role with admin\n"
@@ -622,32 +622,32 @@ msgstr ""
 "  -a, --with-admin=ROLL     ROLL kommer bli en medlem i nya rollen med\n"
 "                            adminrättigheter\n"
 
-#: createuser.c:420
+#: createuser.c:422
 #, c-format
 msgid "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr "  -c, --connection-limit=N  anslutningsgräns för roll (standard: ingen gräns)\n"
 
-#: createuser.c:421
+#: createuser.c:423
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            rollen kan skapa nya databaser\n"
 
-#: createuser.c:422
+#: createuser.c:424
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases (default)\n"
 msgstr "  -D, --no-createdb         rollen kan inte skapa databaser (standard)\n"
 
-#: createuser.c:424
+#: createuser.c:426
 #, c-format
 msgid "  -g, --member-of=ROLE      new role will be a member of ROLE\n"
 msgstr "  -g, --member-of=ROLL      nya rollen kommer bli medlem i ROLL\n"
 
-#: createuser.c:425
+#: createuser.c:427
 #, c-format
 msgid "  --role=ROLE               (same as --member-of, deprecated)\n"
 msgstr "  --role=ROLL               (samma som --member-of, obsolet)\n"
 
-#: createuser.c:426
+#: createuser.c:428
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -656,52 +656,52 @@ msgstr ""
 "  -i, --inherit             rollen ärver rättigheter från roller den\n"
 "                            är medlem i (standard)\n"
 
-#: createuser.c:428
+#: createuser.c:430
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit          rollen ärver inga rättigheter\n"
 
-#: createuser.c:429
+#: createuser.c:431
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login               rollen kan logga in (standard)\n"
 
-#: createuser.c:430
+#: createuser.c:432
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login            rollen kan inte logga in\n"
 
-#: createuser.c:431
+#: createuser.c:433
 #, c-format
 msgid "  -m, --with-member=ROLE    ROLE will be a member of new role\n"
 msgstr "  -m, --with-member=ROLL    ROLL kommer bli medlem i den nya rollen\n"
 
-#: createuser.c:432
+#: createuser.c:434
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt            tilldela den nya rollen ett lösenord\n"
 
-#: createuser.c:433
+#: createuser.c:435
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole          rollen kan skapa nya roller\n"
 
-#: createuser.c:434
+#: createuser.c:436
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles (default)\n"
 msgstr "  -R, --no-createrole       rollen kan inte skapa roller (standard)\n"
 
-#: createuser.c:435
+#: createuser.c:437
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           rollen blir en superuser\n"
 
-#: createuser.c:436
+#: createuser.c:438
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
 msgstr "  -S, --no-superuser        rollen blir inte superuser (standard)\n"
 
-#: createuser.c:437
+#: createuser.c:439
 #, c-format
 msgid ""
 "  -v, --valid-until=TIMESTAMP\n"
@@ -710,7 +710,7 @@ msgstr ""
 "  -v, --valid-until=TIMESTAMP\n"
 "                            datum och tid när rollens lösenord går ut\n"
 
-#: createuser.c:440
+#: createuser.c:442
 #, c-format
 msgid ""
 "  --interactive             prompt for missing role name and attributes rather\n"
@@ -719,12 +719,12 @@ msgstr ""
 "  --interactive             fråga efter rollnamn och egenskaper, snarare än\n"
 "                            att falla tillbaka på förval\n"
 
-#: createuser.c:442
+#: createuser.c:444
 #, c-format
 msgid "  --bypassrls               role can bypass row-level security (RLS) policy\n"
 msgstr "  --bypassrls               rollen kan gå förbi säkerhet på radnivå (RLS)\n"
 
-#: createuser.c:443
+#: createuser.c:445
 #, c-format
 msgid ""
 "  --no-bypassrls            role cannot bypass row-level security (RLS) policy\n"
@@ -733,17 +733,17 @@ msgstr ""
 "  --no-bypassrls            rollen kan inte gå förbi säkerhet på radnivå (RLS)\n"
 "                            (standard)\n"
 
-#: createuser.c:445
+#: createuser.c:447
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr "  --replication             rollen kan starta replikering\n"
 
-#: createuser.c:446
+#: createuser.c:448
 #, c-format
 msgid "  --no-replication          role cannot initiate replication (default)\n"
 msgstr "  --no-replication          rollen får inte starta replikering (standard)\n"
 
-#: createuser.c:451
+#: createuser.c:453
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr "  -U, --username=ANVÄNDARE  användarnamn att ansluta som (ej den som skapas)\n"
@@ -762,12 +762,12 @@ msgstr "Databasen \"%s\" kommer att tas bort permanent.\n"
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: dropdb.c:157
+#: dropdb.c:156
 #, c-format
 msgid "database removal failed: %s"
 msgstr "borttagning av databas misslyckades: %s"
 
-#: dropdb.c:171
+#: dropdb.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -776,22 +776,22 @@ msgstr ""
 "%s tar bort en PostgreSQL-databas.\n"
 "\n"
 
-#: dropdb.c:173
+#: dropdb.c:172
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [FLAGGA]... DBNAMN\n"
 
-#: dropdb.c:176
+#: dropdb.c:175
 #, c-format
 msgid "  -f, --force               try to terminate other connections before dropping\n"
 msgstr "  -f, --force               försöka stänga andra uppkopplingar innan radering\n"
 
-#: dropdb.c:177
+#: dropdb.c:176
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         fråga innan något tas bort\n"
 
-#: dropdb.c:179
+#: dropdb.c:178
 #, c-format
 msgid "  --if-exists               don't report error if database doesn't exist\n"
 msgstr "  --if-exists               felrapportera ej om databasen saknas\n"
@@ -810,19 +810,19 @@ msgstr "saknar ett nödvändigt rollnamn"
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Rollen \"%s\" kommer att tas bort permanent.\n"
 
-#: dropuser.c:154
+#: dropuser.c:155
 #, c-format
 msgid "removal of role \"%s\" failed: %s"
 msgstr "borttagning av rollen \"%s\" misslyckades: %s"
 
-#: dropuser.c:169
+#: dropuser.c:170
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
 "\n"
 msgstr "%s tar bort en PostgreSQL-roll.\n"
 
-#: dropuser.c:174
+#: dropuser.c:175
 #, c-format
 msgid ""
 "  -i, --interactive         prompt before deleting anything, and prompt for\n"
@@ -831,12 +831,12 @@ msgstr ""
 "  -i, --interactive         fråga innan något tas bort och fråga efter\n"
 "                            rollnamn om sådant saknas\n"
 
-#: dropuser.c:177
+#: dropuser.c:178
 #, c-format
 msgid "  --if-exists               don't report error if user doesn't exist\n"
 msgstr "  --if-exists               felrapportera ej om användaren saknas\n"
 
-#: dropuser.c:182
+#: dropuser.c:183
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr "  -U, --username=ANVÄNDARE  användare som ansluter (inte den som tas bort)\n"
@@ -925,54 +925,54 @@ msgstr "  -t, --timeout=SEK        sekunder att vänta på anslutning; 0 stänge
 msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr "  -U, --username=ANVÄNDARE användarnamn att ansluta som\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr "kan inte använda multipla jobb för att omindexera systemkataloger"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr "kan inte omindexera alla databaser och samtidigt en specifik databas"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:515 vacuumdb.c:522 vacuumdb.c:529
-#: vacuumdb.c:536 vacuumdb.c:543 vacuumdb.c:550 vacuumdb.c:557 vacuumdb.c:562
-#: vacuumdb.c:566 vacuumdb.c:570 vacuumdb.c:574
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:558 vacuumdb.c:565 vacuumdb.c:572
+#: vacuumdb.c:579 vacuumdb.c:586 vacuumdb.c:593 vacuumdb.c:600 vacuumdb.c:607
+#: vacuumdb.c:614 vacuumdb.c:621 vacuumdb.c:628 vacuumdb.c:635
 #, c-format
 msgid "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr "flaggan \"%s\" kan inte användas på serverversioner äldre än PostgreSQL %s"
 
-#: reindexdb.c:584
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "omindexering av databasen \"%s\" misslyckades: %s"
 
-#: reindexdb.c:588
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "omindexering av index \"%s\" i databasen \"%s\" misslyckades: %s"
 
-#: reindexdb.c:592
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "omindexering av schemat \"%s\" i databasen \"%s\" misslyckades: %s"
 
-#: reindexdb.c:596
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "omindexering av systemkataloger i databasen \"%s\" misslyckades: %s"
 
-#: reindexdb.c:600
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "omindexering av tabell \"%s\" i databasen \"%s\" misslyckades: %s"
 
-#: reindexdb.c:824
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: omindexering av databasen \"%s\"\n"
 
-#: reindexdb.c:867
+#: reindexdb.c:897
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -981,64 +981,64 @@ msgstr ""
 "%s indexerar om en PostgreSQL-databas.\n"
 "\n"
 
-#: reindexdb.c:871
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                    indexera om alla databaser\n"
 
-#: reindexdb.c:872
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr "      --concurrently           indexera om utan att låsa\n"
 
-#: reindexdb.c:873
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=DBNAME          databas att indexera om\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr "  -i, --index=INDEX            återskapa enbart angivna index\n"
 
-#: reindexdb.c:876
+#: reindexdb.c:906
 #, c-format
 msgid "  -j, --jobs=NUM               use this many concurrent connections to reindex\n"
 msgstr ""
 "  -j, --jobs=NUM               använd så här många samtida anslutningar\n"
 "                               för omindexering\n"
 
-#: reindexdb.c:877
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  skriv inte ut några meddelanden\n"
 
-#: reindexdb.c:878
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr "  -s, --system                 indexera enbart om systemkataloger\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:909
 #, c-format
 msgid "  -S, --schema=SCHEMA          reindex specific schema(s) only\n"
 msgstr "  -S, --schema=SCHEMA          indexera enbart om angivna scheman\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr "  -t, --table=TABELL           indexera enbart om angivna tabeller\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
 msgstr "      --tablespace=TABELLRYMD  tabellutrymme där index byggs om\n"
 
-#: reindexdb.c:882
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose                skriv massor med utdata\n"
 
-#: reindexdb.c:892
+#: reindexdb.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1047,80 +1047,85 @@ msgstr ""
 "\n"
 "Läs beskrivningen av SQL-kommandot REINDEX för detaljer.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:324 vacuumdb.c:327 vacuumdb.c:330 vacuumdb.c:333 vacuumdb.c:336
+#: vacuumdb.c:339 vacuumdb.c:342 vacuumdb.c:345 vacuumdb.c:354
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "flaggan \"%s\" kan inte användas vid enbart analys"
 
-#: vacuumdb.c:346
+#: vacuumdb.c:357
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "flaggan \"%s\" kan inte användas vid \"full vacuum\""
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:363 vacuumdb.c:371
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "flaggan \"%s\" kan inte användas tillsammans med flaggan \"%s\""
 
-#: vacuumdb.c:432
+#: vacuumdb.c:379
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "flaggan \"%s\" kan inte användas utan \"%s\" eller \"%s\""
+
+#: vacuumdb.c:453
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr "kan inte städa alla databaser och endast en angiven på samma gång"
 
-#: vacuumdb.c:436
+#: vacuumdb.c:457
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
 msgstr "kan inte städa alla tabeller i scheman samt angivna tabeller på samma gång"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:461
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr "kan inte städa angivna scheman och exkludera scheman på samma gång"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:465
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
 msgstr "kan inte städa alla tabeller i scheman och exkludera scheman på samma gång"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:478
 #, c-format
 msgid "out of memory"
 msgstr "slut på minne"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:545
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Skapar minimal optimeringsstatistik (1 mål)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:546
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Skapar medium optimeringsstatistik (10 mål)"
 
-#: vacuumdb.c:504
+#: vacuumdb.c:547
 msgid "Generating default (full) optimizer statistics"
 msgstr "Skapar förvald (full) optimeringsstatistik"
 
-#: vacuumdb.c:583
+#: vacuumdb.c:645
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: processar databasen \"%s\": %s\n"
 
-#: vacuumdb.c:586
+#: vacuumdb.c:648
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: städar databasen \"%s\".\n"
 
-#: vacuumdb.c:1135
+#: vacuumdb.c:1320
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "städning av tabell \"%s\" i databasen \"%s\" misslyckades: %s"
 
-#: vacuumdb.c:1138
+#: vacuumdb.c:1323
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "städning av databasen \"%s\" misslyckades: %s"
 
-#: vacuumdb.c:1146
+#: vacuumdb.c:1331
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1129,134 +1134,139 @@ msgstr ""
 "%s städar och analyserar en PostgreSQL-databas.\n"
 "\n"
 
-#: vacuumdb.c:1150
+#: vacuumdb.c:1335
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       städa i alla databaser\n"
 
-#: vacuumdb.c:1151
+#: vacuumdb.c:1336
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr "      --buffer-usage-limit=STORLEK storlek på ringbuffert som används vid städning\n"
 
-#: vacuumdb.c:1152
+#: vacuumdb.c:1337
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAMN             databas att städa i\n"
 
-#: vacuumdb.c:1153
+#: vacuumdb.c:1338
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr "      --disable-page-skipping     stäng av alla sidöverhoppande beteeenden\n"
 
-#: vacuumdb.c:1154
+#: vacuumdb.c:1339
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
 msgstr "  -e, --echo                      visa kommandon som skickas till servern\n"
 
-#: vacuumdb.c:1155
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      utför full städning\n"
 
-#: vacuumdb.c:1156
+#: vacuumdb.c:1341
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr "  -F, --freeze                    frys information om radtransaktioner\n"
 
-#: vacuumdb.c:1157
+#: vacuumdb.c:1342
 #, c-format
 msgid "      --force-index-cleanup       always remove index entries that point to dead tuples\n"
 msgstr "      --force-index-cleanup       ta alltid bort indexposter som pekar på döda tupler\n"
 
-#: vacuumdb.c:1158
+#: vacuumdb.c:1343
 #, c-format
 msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
 msgstr "  -j, --jobs=NUM                  använd så här många samtida anslutningar för städning\n"
 
-#: vacuumdb.c:1159
+#: vacuumdb.c:1344
 #, c-format
 msgid "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to vacuum\n"
 msgstr "      --min-mxid-age=MXID_ÅLDER   minimal multixact-ID-ålder i tabeller som skall städas\n"
 
-#: vacuumdb.c:1160
+#: vacuumdb.c:1345
 #, c-format
 msgid "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to vacuum\n"
 msgstr "      --min-xid-age=XID_ÅLDER     minimal transaktions-ID-ålder i tabeller som skall städas\n"
 
-#: vacuumdb.c:1161
+#: vacuumdb.c:1346
+#, c-format
+msgid "      --missing-stats-only        only analyze relations with missing statistics\n"
+msgstr "      --missing-stats-only        analyzera bara relationer som saknas statistik\n"
+
+#: vacuumdb.c:1347
 #, c-format
 msgid "      --no-index-cleanup          don't remove index entries that point to dead tuples\n"
 msgstr "      --no-index-cleanup          ta inte bort indexposter som pekar på döda tupler\n"
 
-#: vacuumdb.c:1162
+#: vacuumdb.c:1348
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main           skippa huvudrelationen\n"
 
-#: vacuumdb.c:1163
+#: vacuumdb.c:1349
 #, c-format
 msgid "      --no-process-toast          skip the TOAST table associated with the table to vacuum\n"
 msgstr "      --no-process-toast          hoppa över TOAST-tabellen som hör ihop med tabellen som städas\n"
 
-#: vacuumdb.c:1164
+#: vacuumdb.c:1350
 #, c-format
 msgid "      --no-truncate               don't truncate empty pages at the end of the table\n"
 msgstr "      --no-truncate               trunkera inte tomma sidor i slutet av tabellen\n"
 
-#: vacuumdb.c:1165
+#: vacuumdb.c:1351
 #, c-format
 msgid "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) only\n"
 msgstr "  -n, --schema=SCHEMA             städa enbart tabeller i angiva scheman\n"
 
-#: vacuumdb.c:1166
+#: vacuumdb.c:1352
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHEMA     städa inte tabeller i angivna scheman\n"
 
-#: vacuumdb.c:1167
+#: vacuumdb.c:1353
 #, c-format
 msgid "  -P, --parallel=PARALLEL_WORKERS use this many background workers for vacuum, if available\n"
 msgstr ""
 "  -P, --parallel=PARALLELLA_ARBETARE\n"
 "                                  använda så här många bakgrundsarbetare för städning, om det finns\n"
 
-#: vacuumdb.c:1168
+#: vacuumdb.c:1354
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     skriv inte ut några meddelanden\n"
 
-#: vacuumdb.c:1169
+#: vacuumdb.c:1355
 #, c-format
 msgid "      --skip-locked               skip relations that cannot be immediately locked\n"
 msgstr "      --skip-locked               hoppa äver relationer som inte kan låsas direkt\n"
 
-#: vacuumdb.c:1170
+#: vacuumdb.c:1356
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr "  -t, --table='TABELL[(KOLUMNER)]' städa enbart i dessa tabeller\n"
 
-#: vacuumdb.c:1171
+#: vacuumdb.c:1357
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   skriv massor med utdata\n"
 
-#: vacuumdb.c:1172
+#: vacuumdb.c:1358
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   visa versionsinformation, avsluta sedan\n"
 
-#: vacuumdb.c:1173
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   uppdatera optimeringsstatistik\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1360
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
 msgstr "  -Z, --analyze-only              uppdatera bara optimeringsstatistik; ingen städning\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1361
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
@@ -1265,12 +1275,12 @@ msgstr ""
 "      --analyze-in-stages         uppdatera bara optimeringsstatistik, men i\n"
 "                                  flera steg för snabbare resultat; ingen städning\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1363
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      visa denna hjälp, avsluta sedan\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1371
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/scripts/po/uk.po b/src/bin/scripts/po/uk.po
index 5ba97aa5045..5c558418dce 100644
--- a/src/bin/scripts/po/uk.po
+++ b/src/bin/scripts/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:22+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:22+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pgscripts.pot\n"
-"X-Crowdin-File-ID: 1038\n"
+"X-Crowdin-File: /REL_18_STABLE/pgscripts.pot\n"
+"X-Crowdin-File-ID: 1053\n"
 
-#: ../../../src/common/logging.c:276
+#: ../../../src/common/logging.c:279
 #, c-format
 msgid "error: "
 msgstr "помилка: "
 
-#: ../../../src/common/logging.c:283
+#: ../../../src/common/logging.c:286
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: ../../../src/common/logging.c:294
+#: ../../../src/common/logging.c:297
 #, c-format
 msgid "detail: "
 msgstr "деталі: "
 
-#: ../../../src/common/logging.c:301
+#: ../../../src/common/logging.c:304
 #, c-format
 msgid "hint: "
 msgstr "підказка: "
@@ -48,44 +48,44 @@ msgstr "недостатньо пам'яті\n"
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "неможливо дублювати нульовий покажчик (внутрішня помилка)\n"
 
-#: ../../common/file_utils.c:70 ../../common/file_utils.c:347
-#: ../../common/file_utils.c:406 ../../common/file_utils.c:480
+#: ../../common/file_utils.c:69 ../../common/file_utils.c:370
+#: ../../common/file_utils.c:428 ../../common/file_utils.c:502
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не можливо відкрити файл \"%s\": %m"
 
-#: ../../common/file_utils.c:76
+#: ../../common/file_utils.c:75
 #, c-format
 msgid "could not synchronize file system for file \"%s\": %m"
 msgstr "не вдалося синхронізувати файлову систему для файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:120 ../../common/file_utils.c:566
+#: ../../common/file_utils.c:123 ../../common/file_utils.c:588
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
 
-#: ../../common/file_utils.c:130 ../../common/file_utils.c:227
+#: ../../common/file_utils.c:133 ../../common/file_utils.c:243
 #: ../../fe_utils/option_utils.c:99
 #, c-format
 msgid "this build does not support sync method \"%s\""
 msgstr "ця збірка не підтримує метод синхронізації \"%s\""
 
-#: ../../common/file_utils.c:151 ../../common/file_utils.c:281
+#: ../../common/file_utils.c:156 ../../common/file_utils.c:304
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "не вдалося відкрити каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:169 ../../common/file_utils.c:315
+#: ../../common/file_utils.c:174 ../../common/file_utils.c:338
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не вдалося прочитати каталог \"%s\": %m"
 
-#: ../../common/file_utils.c:418 ../../common/file_utils.c:488
+#: ../../common/file_utils.c:440 ../../common/file_utils.c:510
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не вдалося fsync файл \"%s\": %m"
 
-#: ../../common/file_utils.c:498
+#: ../../common/file_utils.c:520
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "не вдалося перейменувати файл \"%s\" на \"%s\": %m"
@@ -177,8 +177,8 @@ msgstr "Перервано\n"
 
 #: ../../fe_utils/print.c:3188
 #, c-format
-msgid "Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"
-msgstr "Неможливо надрукувати вміст таблиці: кількість комірок %lld дорівнює або перевищує максимальне значення %lld.\n"
+msgid "Cannot print table contents: number of cells %<PRIu64> is equal to or exceeds maximum %zu.\n"
+msgstr "Неможливо надрукувати вміст таблиці: кількість клітинок %<PRIu64> дорівнює або перевищує максимум %zu.\n"
 
 #: ../../fe_utils/print.c:3229
 #, c-format
@@ -187,8 +187,8 @@ msgstr "Неможливо додати заголовок до вмісту т
 
 #: ../../fe_utils/print.c:3272
 #, c-format
-msgid "Cannot add cell to table content: total cell count of %lld exceeded.\n"
-msgstr "Неможливо додати комірку до вмісту таблиці: перевищено загальну кількість комірок %lld.\n"
+msgid "Cannot add cell to table content: total cell count of %<PRIu64> exceeded.\n"
+msgstr "Неможливо додати клітинку до вмісту таблиці: загальна кількість клітинок %<PRIu64> перевищена.\n"
 
 #: ../../fe_utils/print.c:3530
 #, c-format
@@ -205,174 +205,174 @@ msgstr "запит не вдався: %s"
 msgid "Query was: %s"
 msgstr "Запит був: %s"
 
-#: ../../fe_utils/string_utils.c:434
+#: ../../fe_utils/string_utils.c:587
 #, c-format
 msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
 msgstr "аргумент командної оболонки містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: ../../fe_utils/string_utils.c:607
+#: ../../fe_utils/string_utils.c:760
 #, c-format
 msgid "database name contains a newline or carriage return: \"%s\"\n"
 msgstr "назва бази даних містить символ нового рядка або повернення каретки: \"%s\"\n"
 
-#: clusterdb.c:114 clusterdb.c:133 createdb.c:149 createdb.c:168
+#: clusterdb.c:113 clusterdb.c:132 createdb.c:149 createdb.c:168
 #: createuser.c:195 createuser.c:210 dropdb.c:104 dropdb.c:113 dropdb.c:121
 #: dropuser.c:95 dropuser.c:110 dropuser.c:123 pg_isready.c:97 pg_isready.c:111
-#: reindexdb.c:177 reindexdb.c:196 vacuumdb.c:280 vacuumdb.c:300
+#: reindexdb.c:184 reindexdb.c:203 vacuumdb.c:292 vacuumdb.c:312
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Спробуйте \"%s --help\" для додаткової інформації."
 
-#: clusterdb.c:131 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
-#: pg_isready.c:109 reindexdb.c:194 vacuumdb.c:298
+#: clusterdb.c:130 createdb.c:166 createuser.c:208 dropdb.c:119 dropuser.c:108
+#: pg_isready.c:109 reindexdb.c:201 vacuumdb.c:310
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "забагато аргументів у командному рядку (перший \"%s\")"
 
-#: clusterdb.c:149
+#: clusterdb.c:148
 #, c-format
 msgid "cannot cluster all databases and a specific one at the same time"
 msgstr "неможливо кластеризувати всі бази даних і одну вказану одночасно"
 
-#: clusterdb.c:214
+#: clusterdb.c:213
 #, c-format
 msgid "clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "кластеризувати таблицю \"%s\" у базі даних \"%s\" не вдалося: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:216
 #, c-format
 msgid "clustering of database \"%s\" failed: %s"
 msgstr "кластеризувати базу даних \"%s\" не вдалося: %s"
 
-#: clusterdb.c:248
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: кластеризація бази даних \"%s\"\n"
 
-#: clusterdb.c:274
+#: clusterdb.c:273
 #, c-format
 msgid "%s clusters all previously clustered tables in a database.\n\n"
 msgstr "%s кластеризація усіх попередньо кластеризованих таблиць в базі даних.\n\n"
 
-#: clusterdb.c:275 createdb.c:298 createuser.c:415 dropdb.c:172 dropuser.c:170
-#: pg_isready.c:226 reindexdb.c:868 vacuumdb.c:1147
+#: clusterdb.c:274 createdb.c:300 createuser.c:417 dropdb.c:171 dropuser.c:171
+#: pg_isready.c:226 reindexdb.c:898 vacuumdb.c:1337
 #, c-format
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
-#: clusterdb.c:276 reindexdb.c:869 vacuumdb.c:1148
+#: clusterdb.c:275 reindexdb.c:899 vacuumdb.c:1338
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: clusterdb.c:277 createdb.c:300 createuser.c:417 dropdb.c:174 dropuser.c:172
-#: pg_isready.c:229 reindexdb.c:870 vacuumdb.c:1149
+#: clusterdb.c:276 createdb.c:302 createuser.c:419 dropdb.c:173 dropuser.c:173
+#: pg_isready.c:229 reindexdb.c:900 vacuumdb.c:1339
 #, c-format
 msgid "\n"
 "Options:\n"
 msgstr "\n"
 "Параметри:\n"
 
-#: clusterdb.c:278
+#: clusterdb.c:277
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                кластеризація усіх баз даних\n"
 
-#: clusterdb.c:279
+#: clusterdb.c:278
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=ІМ'Я_БД       база даних для кластеризації\n"
 
-#: clusterdb.c:280 createuser.c:423 dropdb.c:175 dropuser.c:173
+#: clusterdb.c:279 createuser.c:425 dropdb.c:174 dropuser.c:174
 #, c-format
 msgid "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo              показати команди, надіслані серверу\n"
 
-#: clusterdb.c:281
+#: clusterdb.c:280
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet             не виводити жодних повідомлень\n"
 
-#: clusterdb.c:282
+#: clusterdb.c:281
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr "  -t, --table=ТАБЛИЦЯ        кластеризувати тільки вказані таблиці\n"
 
-#: clusterdb.c:283
+#: clusterdb.c:282
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose              виводити багато інформації\n"
 
-#: clusterdb.c:284 createuser.c:439 dropdb.c:178 dropuser.c:176
+#: clusterdb.c:283 createuser.c:441 dropdb.c:177 dropuser.c:177
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version            вивести інформацію про версію і вийти\n"
 
-#: clusterdb.c:285 createuser.c:447 dropdb.c:180 dropuser.c:178
+#: clusterdb.c:284 createuser.c:449 dropdb.c:179 dropuser.c:179
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help               показати цю довідку, потім вийти\n"
 
-#: clusterdb.c:286 createdb.c:317 createuser.c:448 dropdb.c:181 dropuser.c:179
-#: pg_isready.c:235 reindexdb.c:885 vacuumdb.c:1178
+#: clusterdb.c:285 createdb.c:319 createuser.c:450 dropdb.c:180 dropuser.c:180
+#: pg_isready.c:235 reindexdb.c:915 vacuumdb.c:1369
 #, c-format
 msgid "\n"
 "Connection options:\n"
 msgstr "\n"
 "Налаштування з'єднання:\n"
 
-#: clusterdb.c:287 createuser.c:449 dropdb.c:182 dropuser.c:180 vacuumdb.c:1179
+#: clusterdb.c:286 createuser.c:451 dropdb.c:181 dropuser.c:181 vacuumdb.c:1370
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME     хост сервера бази даних або каталог сокетів\n"
 
-#: clusterdb.c:288 createuser.c:450 dropdb.c:183 dropuser.c:181 vacuumdb.c:1180
+#: clusterdb.c:287 createuser.c:452 dropdb.c:182 dropuser.c:182 vacuumdb.c:1371
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT         порт сервера бази даних\n"
 
-#: clusterdb.c:289 dropdb.c:184 vacuumdb.c:1181
+#: clusterdb.c:288 dropdb.c:183 vacuumdb.c:1372
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=ІМ'Я_КОРИСТУВАЧА   ім'я користувача для з'єднання з сервером\n"
 
-#: clusterdb.c:290 createuser.c:452 dropdb.c:185 dropuser.c:183 vacuumdb.c:1182
+#: clusterdb.c:289 createuser.c:454 dropdb.c:184 dropuser.c:184 vacuumdb.c:1373
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         ніколи не запитувати пароль\n"
 
-#: clusterdb.c:291 createuser.c:453 dropdb.c:186 dropuser.c:184 vacuumdb.c:1183
+#: clusterdb.c:290 createuser.c:455 dropdb.c:185 dropuser.c:185 vacuumdb.c:1374
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password           запросити пароль\n"
 
-#: clusterdb.c:292 dropdb.c:187 vacuumdb.c:1184
+#: clusterdb.c:291 dropdb.c:186 vacuumdb.c:1375
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAME    альтернативна бази даних для обслуговування\n"
 
-#: clusterdb.c:293
+#: clusterdb.c:292
 #, c-format
 msgid "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
 msgstr "\n"
 "Для деталей читайте опис команди SQL CLUSTER.\n"
 
-#: clusterdb.c:294 createdb.c:325 createuser.c:454 dropdb.c:188 dropuser.c:185
-#: pg_isready.c:240 reindexdb.c:893 vacuumdb.c:1186
+#: clusterdb.c:293 createdb.c:327 createuser.c:456 dropdb.c:187 dropuser.c:186
+#: pg_isready.c:240 reindexdb.c:923 vacuumdb.c:1377
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: clusterdb.c:295 createdb.c:326 createuser.c:455 dropdb.c:189 dropuser.c:186
-#: pg_isready.c:241 reindexdb.c:894 vacuumdb.c:1187
+#: clusterdb.c:294 createdb.c:328 createuser.c:457 dropdb.c:188 dropuser.c:187
+#: pg_isready.c:241 reindexdb.c:924 vacuumdb.c:1378
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
 
-#: common.c:107
+#: common.c:106
 #, c-format
 msgid "query returned %d row instead of one: %s"
 msgid_plural "query returned %d rows instead of one: %s"
@@ -408,134 +408,134 @@ msgstr "Відповідь має бути \"%s\" або \"%s\".\n"
 msgid "\"%s\" is not a valid encoding name"
 msgstr "\"%s\" не є невірним ім'ям кодування"
 
-#: createdb.c:260
+#: createdb.c:262
 #, c-format
 msgid "database creation failed: %s"
 msgstr "створити базу даних не вдалося: %s"
 
-#: createdb.c:279
+#: createdb.c:281
 #, c-format
 msgid "comment creation failed (database was created): %s"
 msgstr "не вдалося створити коментарі (база даних була створена): %s"
 
-#: createdb.c:297
+#: createdb.c:299
 #, c-format
 msgid "%s creates a PostgreSQL database.\n\n"
 msgstr "%s створює базу даних PostgreSQL.\n\n"
 
-#: createdb.c:299
+#: createdb.c:301
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 
-#: createdb.c:301
+#: createdb.c:303
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=ТАБЛИЧНИЙ_ПРОСТІР  табличний простір для бази даних за замовчуванням\n"
 
-#: createdb.c:302 reindexdb.c:874
+#: createdb.c:304 reindexdb.c:904
 #, c-format
 msgid "  -e, --echo                   show the commands being sent to the server\n"
 msgstr "  -e, --echo                   показати команди, надіслані серверу\n"
 
-#: createdb.c:303
+#: createdb.c:305
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=КОДУВАННЯ    кодування бази даних\n"
 
-#: createdb.c:304
+#: createdb.c:306
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr "  -l, --locale=ЛОКАЛЬ         параметри локалі бази даних\n"
 
-#: createdb.c:305
+#: createdb.c:307
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr "      --lc-collate=ЛОКАЛЬ      параметр LC_COLLATE для бази даних\n"
 
-#: createdb.c:306
+#: createdb.c:308
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr "      --lc-ctype=ЛОКАЛЬ        параметр LC_CTYPE для бази даних\n"
 
-#: createdb.c:307
+#: createdb.c:309
 #, c-format
 msgid "      --builtin-locale=LOCALE  builtin locale setting for the database\n"
 msgstr "      --builtin-locale=LOCALE  параметри вбудованої локалі бази даних\n"
 
-#: createdb.c:308
+#: createdb.c:310
 #, c-format
 msgid "      --icu-locale=LOCALE      ICU locale setting for the database\n"
 msgstr "      --icu-locale=LOCALE      параметр локалі ICU бази даних\n"
 
-#: createdb.c:309
+#: createdb.c:311
 #, c-format
 msgid "      --icu-rules=RULES        ICU rules setting for the database\n"
 msgstr "      --icu-locale=RULES        правила ICU для бази даних\n"
 
-#: createdb.c:310
+#: createdb.c:312
 #, c-format
 msgid "      --locale-provider={builtin|libc|icu}\n"
 "                               locale provider for the database's default collation\n"
 msgstr "      --locale-provider={builtin|libc|icu}\n"
 "                               провайдер локалі для сортування бази даних за замовчуванням\n"
 
-#: createdb.c:312
+#: createdb.c:314
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr "  -O, --власник=ВЛАСНИК          користувач-власник нової бази даних\n"
 
-#: createdb.c:313
+#: createdb.c:315
 #, c-format
 msgid "  -S, --strategy=STRATEGY      database creation strategy wal_log or file_copy\n"
 msgstr "  -S, --strategy=STRATEGY стратегія створення бази даних для wal_log або file_copy\n"
 
-#: createdb.c:314
+#: createdb.c:316
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --шаблон=ШАБЛОН          шаблонна база даних для копіювання\n"
 
-#: createdb.c:315 reindexdb.c:883
+#: createdb.c:317 reindexdb.c:913
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                вивести інформацію про версію, потім вийти\n"
 
-#: createdb.c:316 reindexdb.c:884
+#: createdb.c:318 reindexdb.c:914
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   показати цю довідку, потім вийти\n"
 
-#: createdb.c:318 reindexdb.c:886
+#: createdb.c:320 reindexdb.c:916
 #, c-format
 msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr "  -h, --host=ІМ'Я_ХОСТА     хост сервера бази даних або каталог сокетів\n"
 
-#: createdb.c:319 reindexdb.c:887
+#: createdb.c:321 reindexdb.c:917
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=ПОРТ        порт сервера бази даних\n"
 
-#: createdb.c:320 reindexdb.c:888
+#: createdb.c:322 reindexdb.c:918
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=ІМ'Я_КОРИСТУВАЧА   ім'я користувача для з'єднання з сервером\n"
 
-#: createdb.c:321 reindexdb.c:889
+#: createdb.c:323 reindexdb.c:919
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password         ніколи не запитувати пароль\n"
 
-#: createdb.c:322 reindexdb.c:890
+#: createdb.c:324 reindexdb.c:920
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password           запросити пароль\n"
 
-#: createdb.c:323 reindexdb.c:891
+#: createdb.c:325 reindexdb.c:921
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
 msgstr "  --maintenance-db=DBNAME     альтернативна бази даних для обслуговування\n"
 
-#: createdb.c:324
+#: createdb.c:326
 #, c-format
 msgid "\n"
 "By default, a database with the same name as the current user is created.\n"
@@ -571,146 +571,146 @@ msgstr "Чи дозволено новій ролі створювати баз
 msgid "Shall the new role be allowed to create more new roles?"
 msgstr "Чи дозволено новій ролі створювати інші нові ролі?"
 
-#: createuser.c:309
+#: createuser.c:311
 #, c-format
 msgid "password encryption failed: %s"
 msgstr "помилка шифрування пароля: %s"
 
-#: createuser.c:400
+#: createuser.c:402
 #, c-format
 msgid "creation of new role failed: %s"
 msgstr "не вдалося створити нову роль: %s"
 
-#: createuser.c:414
+#: createuser.c:416
 #, c-format
 msgid "%s creates a new PostgreSQL role.\n\n"
 msgstr "%s створює нову роль PostgreSQL.\n\n"
 
-#: createuser.c:416 dropuser.c:171
+#: createuser.c:418 dropuser.c:172
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [OPTION]... [ROLENAME]\n"
 
-#: createuser.c:418
+#: createuser.c:420
 #, c-format
 msgid "  -a, --with-admin=ROLE     ROLE will be a member of new role with admin\n"
 "                            option\n"
 msgstr "  -a, --with-admin=ROLE     ROLE стане членом нової ролі з правом\n"
 "                            адміністратора\n"
 
-#: createuser.c:420
+#: createuser.c:422
 #, c-format
 msgid "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr "  -c, --connection-limit=N   ліміт під'єднань для ролі (за замовчуванням ліміту немає)\n"
 
-#: createuser.c:421
+#: createuser.c:423
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb           роль може створювати нові бази даних\n"
 
-#: createuser.c:422
+#: createuser.c:424
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases (default)\n"
 msgstr "  -D, --no-createdb        роль не може створювати нові бази даних (за замовчуванням)\n"
 
-#: createuser.c:424
+#: createuser.c:426
 #, c-format
 msgid "  -g, --member-of=ROLE      new role will be a member of ROLE\n"
 msgstr "  -g, --member-of=ROLE      нова роль буде членом ROLE\n"
 
-#: createuser.c:425
+#: createuser.c:427
 #, c-format
 msgid "  --role=ROLE               (same as --member-of, deprecated)\n"
 msgstr "  --role=ROLE               (те саме, що --member-of, застаріло)\n"
 
-#: createuser.c:426
+#: createuser.c:428
 #, c-format
 msgid "  -i, --inherit             role inherits privileges of roles it is a\n"
 "                            member of (default)\n"
 msgstr "  -i, --inherit            роль переймає права від ролей до яких вона\n"
 "                           включена (за замовчуванням)\n"
 
-#: createuser.c:428
+#: createuser.c:430
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit         роль не переймає права\n"
 
-#: createuser.c:429
+#: createuser.c:431
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login             роль може увійти (за замовчуванням)\n"
 
-#: createuser.c:430
+#: createuser.c:432
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login          роль не може увійти\n"
 
-#: createuser.c:431
+#: createuser.c:433
 #, c-format
 msgid "  -m, --with-member=ROLE    ROLE will be a member of new role\n"
 msgstr "  -m, --with-member=ROLE    ROLE буде членом нової ролі\n"
 
-#: createuser.c:432
+#: createuser.c:434
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt           призначення паролю для нової ролі\n"
 
-#: createuser.c:433
+#: createuser.c:435
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole         роль може створювати нові ролі\n"
 
-#: createuser.c:434
+#: createuser.c:436
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles (default)\n"
 msgstr "  -R, --no-createrole       роль не може створювати нові бази даних (за замовчуванням)\n"
 
-#: createuser.c:435
+#: createuser.c:437
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           роль буде суперкористувачем\n"
 
-#: createuser.c:436
+#: createuser.c:438
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
 msgstr "  -S, --no-superuser       роль не буде суперкористувачем (за замовчуванням)\n"
 
-#: createuser.c:437
+#: createuser.c:439
 #, c-format
 msgid "  -v, --valid-until=TIMESTAMP\n"
 "                            password expiration date and time for role\n"
 msgstr "  -v, --valid-until=TIMESTAMP\n"
 "                            термін дії пароля для ролі\n"
 
-#: createuser.c:440
+#: createuser.c:442
 #, c-format
 msgid "  --interactive             prompt for missing role name and attributes rather\n"
 "                            than using defaults\n"
 msgstr "  --interactive             запитати пропущені ім’я ролі та атрибути, а не                                                                                        використовувати стандартні\n"
 
-#: createuser.c:442
+#: createuser.c:444
 #, c-format
 msgid "  --bypassrls               role can bypass row-level security (RLS) policy\n"
 msgstr "  --bypassrls               роль може обійти політику безпеки на рівні рядків (RLS)\n"
 
-#: createuser.c:443
+#: createuser.c:445
 #, c-format
 msgid "  --no-bypassrls            role cannot bypass row-level security (RLS) policy\n"
 "                            (default)\n"
 msgstr "  --no-bypassrls            роль не може обходити політику на рівні рядків (RLS)\n"
 "                            (за замовчуванням)\n"
 
-#: createuser.c:445
+#: createuser.c:447
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr "  --replication            роль може ініціювати реплікацію\n"
 
-#: createuser.c:446
+#: createuser.c:448
 #, c-format
 msgid "  --no-replication          role cannot initiate replication (default)\n"
 msgstr "  --no-replication          роль не може ініціювати реплікацію (за замовчуванням)\n"
 
-#: createuser.c:451
+#: createuser.c:453
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr "  -U, --username=USERNAME   ім'я користувача для підключення (не для створення)\n"
@@ -729,32 +729,32 @@ msgstr "База даних \"%s\" буде назавжди видалена.\n
 msgid "Are you sure?"
 msgstr "Ви впевнені?"
 
-#: dropdb.c:157
+#: dropdb.c:156
 #, c-format
 msgid "database removal failed: %s"
 msgstr "помилка при видаленні бази даних: %s"
 
-#: dropdb.c:171
+#: dropdb.c:170
 #, c-format
 msgid "%s removes a PostgreSQL database.\n\n"
 msgstr "%s видаляє базу даних PostgreSQL.\n\n"
 
-#: dropdb.c:173
+#: dropdb.c:172
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [OPTION]... ІМ'Я_БД\n"
 
-#: dropdb.c:176
+#: dropdb.c:175
 #, c-format
 msgid "  -f, --force               try to terminate other connections before dropping\n"
 msgstr "  -f, --force               спробувати завершити інші підключення перед видаленням\n"
 
-#: dropdb.c:177
+#: dropdb.c:176
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive       запитувати перед видаленням чого-небудь\n"
 
-#: dropdb.c:179
+#: dropdb.c:178
 #, c-format
 msgid "  --if-exists               don't report error if database doesn't exist\n"
 msgstr "  --if-exists            не повідомляти про помилку, якщо бази даних не існує\n"
@@ -773,29 +773,29 @@ msgstr "немає запитаного аргументу: імені ролі"
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Роль \"%s\" буде назавжди видалена.\n"
 
-#: dropuser.c:154
+#: dropuser.c:155
 #, c-format
 msgid "removal of role \"%s\" failed: %s"
 msgstr "помилка при видаленні ролі \"%s\": %s"
 
-#: dropuser.c:169
+#: dropuser.c:170
 #, c-format
 msgid "%s removes a PostgreSQL role.\n\n"
 msgstr "%s видаляє роль PostgreSQL.\n\n"
 
-#: dropuser.c:174
+#: dropuser.c:175
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything, and prompt for\n"
 "                            role name if not specified\n"
 msgstr "  -i, --interactive        запитувати перед видаленням чого-небудь і запитувати\n"
 "                            ім'я ролі, якщо не вказано\n"
 
-#: dropuser.c:177
+#: dropuser.c:178
 #, c-format
 msgid "  --if-exists               don't report error if user doesn't exist\n"
 msgstr "  --if-exists            не повідомляти про помилку, якщо користувача не існує\n"
 
-#: dropuser.c:182
+#: dropuser.c:183
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr "  -U, --username=USERNAME   ім'я користувача для підключення (не для розривання)\n"
@@ -880,335 +880,345 @@ msgstr "  -t, --timeout=SECS       секунд для очікування пр
 msgid "  -U, --username=USERNAME  user name to connect as\n"
 msgstr "  -U, --username=ІМ'Я_КОРИСТУВАЧА   ім'я користувача для з'єднання з сервером\n"
 
-#: reindexdb.c:210
+#: reindexdb.c:217
 #, c-format
 msgid "cannot use multiple jobs to reindex system catalogs"
 msgstr "не можна використовувати декілька завдань для переіндексування системних каталогів"
 
-#: reindexdb.c:215
+#: reindexdb.c:222
 #, c-format
 msgid "cannot reindex all databases and a specific one at the same time"
 msgstr "неможливо переіндексувати всі бази даних і одну вказану одночасно"
 
-#: reindexdb.c:296 reindexdb.c:303 vacuumdb.c:515 vacuumdb.c:522 vacuumdb.c:529
-#: vacuumdb.c:536 vacuumdb.c:543 vacuumdb.c:550 vacuumdb.c:557 vacuumdb.c:562
-#: vacuumdb.c:566 vacuumdb.c:570 vacuumdb.c:574
+#: reindexdb.c:302 reindexdb.c:309 vacuumdb.c:559 vacuumdb.c:566 vacuumdb.c:573
+#: vacuumdb.c:580 vacuumdb.c:587 vacuumdb.c:594 vacuumdb.c:601 vacuumdb.c:608
+#: vacuumdb.c:615 vacuumdb.c:622 vacuumdb.c:629 vacuumdb.c:636
 #, c-format
 msgid "cannot use the \"%s\" option on server versions older than PostgreSQL %s"
 msgstr "не можна використовувати параметр \"%s\" на серверній версії старішій за PostgreSQL %s"
 
-#: reindexdb.c:584
+#: reindexdb.c:597
 #, c-format
 msgid "reindexing of database \"%s\" failed: %s"
 msgstr "переіндексувати базу даних \"%s\" не вдалося: %s"
 
-#: reindexdb.c:588
+#: reindexdb.c:601
 #, c-format
 msgid "reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "переіндексувати індекси \"%s\" в базі даних \"%s\" не вдалося: %s"
 
-#: reindexdb.c:592
+#: reindexdb.c:605
 #, c-format
 msgid "reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr "переіндексувати схему \"%s\" в базі даних \"%s\" не вдалося: %s"
 
-#: reindexdb.c:596
+#: reindexdb.c:609
 #, c-format
 msgid "reindexing of system catalogs in database \"%s\" failed: %s"
 msgstr "переіндексування системних каталогів в базі даних \"%s\" не вдалося: %s"
 
-#: reindexdb.c:600
+#: reindexdb.c:613
 #, c-format
 msgid "reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "переіндексувати таблиці \"%s\" в базі даних \"%s\" не вдалося: %s"
 
-#: reindexdb.c:824
+#: reindexdb.c:854
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: переіндексування бази даних \"%s\"\n"
 
-#: reindexdb.c:867
+#: reindexdb.c:897
 #, c-format
 msgid "%s reindexes a PostgreSQL database.\n\n"
 msgstr "%s переіндексовує базу даних PostgreSQL.\n\n"
 
-#: reindexdb.c:871
+#: reindexdb.c:901
 #, c-format
 msgid "  -a, --all                    reindex all databases\n"
 msgstr "  -a, --all                    переіндексувати всі бази даних\n"
 
-#: reindexdb.c:872
+#: reindexdb.c:902
 #, c-format
 msgid "      --concurrently           reindex concurrently\n"
 msgstr "      --concurrently           переіндексувати одночасно\n"
 
-#: reindexdb.c:873
+#: reindexdb.c:903
 #, c-format
 msgid "  -d, --dbname=DBNAME          database to reindex\n"
 msgstr "  -d, --dbname=DBNAME          база даних для переіндексування\n"
 
-#: reindexdb.c:875
+#: reindexdb.c:905
 #, c-format
 msgid "  -i, --index=INDEX            recreate specific index(es) only\n"
 msgstr "  -i, --index=INDEX            повторно створити лише вказані індекси\n"
 
-#: reindexdb.c:876
+#: reindexdb.c:906
 #, c-format
 msgid "  -j, --jobs=NUM               use this many concurrent connections to reindex\n"
 msgstr "  -j, --jobs=NUM               використати цю кількість паралельних підключень для переіндексування\n"
 
-#: reindexdb.c:877
+#: reindexdb.c:907
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  не писати жодних повідомлень\n"
 
-#: reindexdb.c:878
+#: reindexdb.c:908
 #, c-format
 msgid "  -s, --system                 reindex system catalogs only\n"
 msgstr "  -s, --system                 переіндексувати тільки системні каталоги\n"
 
-#: reindexdb.c:879
+#: reindexdb.c:909
 #, c-format
 msgid "  -S, --schema=SCHEMA          reindex specific schema(s) only\n"
 msgstr "  -S, --schema=SCHEMA          переіндексувати лише вказані схеми\n"
 
-#: reindexdb.c:880
+#: reindexdb.c:910
 #, c-format
 msgid "  -t, --table=TABLE            reindex specific table(s) only\n"
 msgstr "  -t, --table=TABLE            переіндексувати лише вказані таблиці\n"
 
-#: reindexdb.c:881
+#: reindexdb.c:911
 #, c-format
 msgid "      --tablespace=TABLESPACE  tablespace where indexes are rebuilt\n"
 msgstr "      --tablespace=TABLESPACE  табличний простір для перебудованих індексів\n"
 
-#: reindexdb.c:882
+#: reindexdb.c:912
 #, c-format
 msgid "  -v, --verbose                write a lot of output\n"
 msgstr "  -v, --verbose                виводити багато повідомлень\n"
 
-#: reindexdb.c:892
+#: reindexdb.c:922
 #, c-format
 msgid "\n"
 "Read the description of the SQL command REINDEX for details.\n"
 msgstr "\n"
 "Для деталей читайте опис команди SQL REINDEX.\n"
 
-#: vacuumdb.c:313 vacuumdb.c:316 vacuumdb.c:319 vacuumdb.c:322 vacuumdb.c:325
-#: vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:343
+#: vacuumdb.c:325 vacuumdb.c:328 vacuumdb.c:331 vacuumdb.c:334 vacuumdb.c:337
+#: vacuumdb.c:340 vacuumdb.c:343 vacuumdb.c:346 vacuumdb.c:355
 #, c-format
 msgid "cannot use the \"%s\" option when performing only analyze"
 msgstr "не можна використовувати параметр \"%s\" під час виконання лише аналіза"
 
-#: vacuumdb.c:346
+#: vacuumdb.c:358
 #, c-format
 msgid "cannot use the \"%s\" option when performing full vacuum"
 msgstr "не можна використовувати параметр \"%s\" під час виконання VACUUM FULL"
 
-#: vacuumdb.c:352 vacuumdb.c:360
+#: vacuumdb.c:364 vacuumdb.c:372
 #, c-format
 msgid "cannot use the \"%s\" option with the \"%s\" option"
 msgstr "використовувати параметр \"%s\" з  параметром \"%s\" не можна"
 
-#: vacuumdb.c:432
+#: vacuumdb.c:380
+#, c-format
+msgid "cannot use the \"%s\" option without \"%s\" or \"%s\""
+msgstr "не можна використовувати параметр \"%s\" без \"%s\" або \"%s\""
+
+#: vacuumdb.c:454
 #, c-format
 msgid "cannot vacuum all databases and a specific one at the same time"
 msgstr "неможливо очистити всі бази даних і одну вказану одночасно"
 
-#: vacuumdb.c:436
+#: vacuumdb.c:458
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and specific table(s) at the same time"
 msgstr "неможливо очистити всі таблиці в схемах та вказані таблиці одночасно"
 
-#: vacuumdb.c:440
+#: vacuumdb.c:462
 #, c-format
 msgid "cannot vacuum specific table(s) and exclude schema(s) at the same time"
 msgstr "неможливо очистити вказані таблиці і виключити схеми одночасно"
 
-#: vacuumdb.c:444
+#: vacuumdb.c:466
 #, c-format
 msgid "cannot vacuum all tables in schema(s) and exclude schema(s) at the same time"
 msgstr "неможливо очистити всі таблиці в схемах та виключити схеми одночасно"
 
-#: vacuumdb.c:457
+#: vacuumdb.c:479
 #, c-format
 msgid "out of memory"
 msgstr "недостатньо пам'яті"
 
-#: vacuumdb.c:502
+#: vacuumdb.c:546
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Генерування мінімальної статистики для оптімизатора (1 мета)"
 
-#: vacuumdb.c:503
+#: vacuumdb.c:547
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Генерування середньої статистики для оптимізатора (10 цілей)"
 
-#: vacuumdb.c:504
+#: vacuumdb.c:548
 msgid "Generating default (full) optimizer statistics"
 msgstr "Генерування статистики для оптимізатора за замовчуванням (повністю)"
 
-#: vacuumdb.c:583
+#: vacuumdb.c:646
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: обробка бази даних \"%s\": %s\n"
 
-#: vacuumdb.c:586
+#: vacuumdb.c:649
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: очищення бази даних \"%s\"\n"
 
-#: vacuumdb.c:1135
+#: vacuumdb.c:1325
 #, c-format
 msgid "vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "очистити таблиці \"%s\" в базі даних \"%s\" не вдалося: %s"
 
-#: vacuumdb.c:1138
+#: vacuumdb.c:1328
 #, c-format
 msgid "vacuuming of database \"%s\" failed: %s"
 msgstr "очистити базу даних \"%s\" не вдалося: %s"
 
-#: vacuumdb.c:1146
+#: vacuumdb.c:1336
 #, c-format
 msgid "%s cleans and analyzes a PostgreSQL database.\n\n"
 msgstr "%s очищує й аналізує базу даних PostgreSQL.\n\n"
 
-#: vacuumdb.c:1150
+#: vacuumdb.c:1340
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       очистити усі бази даних\n"
 
-#: vacuumdb.c:1151
+#: vacuumdb.c:1341
 #, c-format
 msgid "      --buffer-usage-limit=SIZE   size of ring buffer used for vacuum\n"
 msgstr "      --buffer-usage-limit=SIZE   розмір кільцевого буферу для очистки\n"
 
-#: vacuumdb.c:1152
+#: vacuumdb.c:1342
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=ІМ'Я_БД             база даних для очищення\n"
 
-#: vacuumdb.c:1153
+#: vacuumdb.c:1343
 #, c-format
 msgid "      --disable-page-skipping     disable all page-skipping behavior\n"
 msgstr "      --disable-page-skipping     відключити пропуск сторінок\n"
 
-#: vacuumdb.c:1154
+#: vacuumdb.c:1344
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
 msgstr "  -e, --echo              показати команди, надіслані серверу\n"
 
-#: vacuumdb.c:1155
+#: vacuumdb.c:1345
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                     зробити повне очищення\n"
 
-#: vacuumdb.c:1156
+#: vacuumdb.c:1346
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr "  -F, --freeze                   заморозити інформацію щодо транзакцій в рядках\n"
 
-#: vacuumdb.c:1157
+#: vacuumdb.c:1347
 #, c-format
 msgid "      --force-index-cleanup       always remove index entries that point to dead tuples\n"
 msgstr "      --force-index-cleanup       завжди видаляти записи індексів, які вказують на мертві кортежі\n"
 
-#: vacuumdb.c:1158
+#: vacuumdb.c:1348
 #, c-format
 msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
 msgstr "  -j, --jobs=ЧИСЛО                   використати ці паралельні підключення для очищення\n"
 
-#: vacuumdb.c:1159
+#: vacuumdb.c:1349
 #, c-format
 msgid "      --min-mxid-age=MXID_AGE     minimum multixact ID age of tables to vacuum\n"
 msgstr "      --min-mxid-age=MXID_AGE     мінімальний ID ери мультитранзакції таблиць для вакууму\n"
 
-#: vacuumdb.c:1160
+#: vacuumdb.c:1350
 #, c-format
 msgid "      --min-xid-age=XID_AGE       minimum transaction ID age of tables to vacuum\n"
 msgstr "      --min-mxid-age=MXID_AGE     мінімальний ID ери транзакції таблиць для вакууму\n"
 
-#: vacuumdb.c:1161
+#: vacuumdb.c:1351
+#, c-format
+msgid "      --missing-stats-only        only analyze relations with missing statistics\n"
+msgstr "      --missing-stats-only        аналізувати лише відношення з відсутніми статистиками\n"
+
+#: vacuumdb.c:1352
 #, c-format
 msgid "      --no-index-cleanup          don't remove index entries that point to dead tuples\n"
 msgstr "      --no-index-cleanup          не видаляти записи індексів, які вказують на мертві кортежі\n"
 
-#: vacuumdb.c:1162
+#: vacuumdb.c:1353
 #, c-format
 msgid "      --no-process-main           skip the main relation\n"
 msgstr "      --no-process-main           пропустити головне відношення\n"
 
-#: vacuumdb.c:1163
+#: vacuumdb.c:1354
 #, c-format
 msgid "      --no-process-toast          skip the TOAST table associated with the table to vacuum\n"
 msgstr "      --no-process-toast          пропускати таблицю TOAST, пов'язану з таблицею для очищення\n"
 
-#: vacuumdb.c:1164
+#: vacuumdb.c:1355
 #, c-format
 msgid "      --no-truncate               don't truncate empty pages at the end of the table\n"
 msgstr "      --no-truncate               не скорочувати пусті сторінки наприкінці таблиці\n"
 
-#: vacuumdb.c:1165
+#: vacuumdb.c:1356
 #, c-format
 msgid "  -n, --schema=SCHEMA             vacuum tables in the specified schema(s) only\n"
 msgstr "  -n, --schema=SCHEMA             очистити тільки таблиці у вказаних схемах\n"
 
-#: vacuumdb.c:1166
+#: vacuumdb.c:1357
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA     do not vacuum tables in the specified schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHEMA     не очищати таблиці у вказаних схемах\n"
 
-#: vacuumdb.c:1167
+#: vacuumdb.c:1358
 #, c-format
 msgid "  -P, --parallel=PARALLEL_WORKERS use this many background workers for vacuum, if available\n"
 msgstr "  -P, --parallel=PARALLEL_WORKERS  використати таку кількість фонових робітників для очищення, якщо вони доступні\n"
 
-#: vacuumdb.c:1168
+#: vacuumdb.c:1359
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet             не писати жодних повідомлень\n"
 
-#: vacuumdb.c:1169
+#: vacuumdb.c:1360
 #, c-format
 msgid "      --skip-locked               skip relations that cannot be immediately locked\n"
 msgstr "      --skip-locked               пропустити відношення, що не можуть бути заблоковані негайно\n"
 
-#: vacuumdb.c:1170
+#: vacuumdb.c:1361
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr "  -t, --table='ТАБЛИЦЯ[(СТОВПЦІ)]'  очистити тільки вказані таблиці\n"
 
-#: vacuumdb.c:1171
+#: vacuumdb.c:1362
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose              виводити багато інформації\n"
 
-#: vacuumdb.c:1172
+#: vacuumdb.c:1363
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                  вивести інформацію про версію і вийти\n"
 
-#: vacuumdb.c:1173
+#: vacuumdb.c:1364
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                 оновити статистику для оптимізатора\n"
 
-#: vacuumdb.c:1174
+#: vacuumdb.c:1365
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
 msgstr "  -Z, --analyze-only             оновити лише статистику для оптимізатора, не очищати\n"
 
-#: vacuumdb.c:1175
+#: vacuumdb.c:1366
 #, c-format
 msgid "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
 "                                  stages for faster results; no vacuum\n"
 msgstr "      --analyze-in-stages         оновити лише статистику для оптимізатора, у декілька стадій для швидших результатів, не очищати\n"
 
-#: vacuumdb.c:1177
+#: vacuumdb.c:1368
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показати цю справку, потім вийти\n"
 
-#: vacuumdb.c:1185
+#: vacuumdb.c:1376
 #, c-format
 msgid "\n"
 "Read the description of the SQL command VACUUM for details.\n"
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index fa54f815796..d45b0cdf9a2 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -2,7 +2,7 @@
  *
  * reindexdb
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  *
  * src/bin/scripts/reindexdb.c
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index ff56a13b46b..ef2faf610b6 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -237,9 +237,10 @@
 	qr/cannot vacuum all databases and a specific one at the same time/,
 	'cannot use option --all and a dbname as argument at the same time');
 
-$node->safe_psql('postgres',
-	'CREATE TABLE regression_vacuumdb_test AS select generate_series(1, 10) a, generate_series(2, 11) b;'
-);
+$node->safe_psql('postgres', q|
+  CREATE TABLE regression_vacuumdb_test AS select generate_series(1, 10) a, generate_series(2, 11) b;
+  ALTER TABLE regression_vacuumdb_test ADD COLUMN c INT GENERATED ALWAYS AS (a + b);
+|);
 $node->issues_sql_like(
 	[
 		'vacuumdb', '--analyze-only',
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 15ecda4bdd2..2f79dab8810 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/bin/scripts/vacuumdb.c
  *
@@ -15,6 +15,7 @@
 
 #include <limits.h>
 
+#include "catalog/pg_attribute_d.h"
 #include "catalog/pg_class_d.h"
 #include "common.h"
 #include "common/connect.h"
@@ -958,6 +959,8 @@ retrieve_objects(PGconn *conn, vacuumingOptions *vacopts,
 							 " AND a.attnum OPERATOR(pg_catalog.>) 0::pg_catalog.int2\n"
 							 " AND NOT a.attisdropped\n"
 							 " AND a.attstattarget IS DISTINCT FROM 0::pg_catalog.int2\n"
+							 " AND a.attgenerated OPERATOR(pg_catalog.<>) "
+							 CppAsString2(ATTRIBUTE_GENERATED_VIRTUAL) "\n"
 							 " AND NOT EXISTS (SELECT NULL FROM pg_catalog.pg_statistic s\n"
 							 " WHERE s.starelid OPERATOR(pg_catalog.=) a.attrelid\n"
 							 " AND s.staattnum OPERATOR(pg_catalog.=) a.attnum\n"
@@ -995,6 +998,8 @@ retrieve_objects(PGconn *conn, vacuumingOptions *vacopts,
 							 " AND a.attnum OPERATOR(pg_catalog.>) 0::pg_catalog.int2\n"
 							 " AND NOT a.attisdropped\n"
 							 " AND a.attstattarget IS DISTINCT FROM 0::pg_catalog.int2\n"
+							 " AND a.attgenerated OPERATOR(pg_catalog.<>) "
+							 CppAsString2(ATTRIBUTE_GENERATED_VIRTUAL) "\n"
 							 " AND c.relhassubclass\n"
 							 " AND NOT p.inherited\n"
 							 " AND EXISTS (SELECT NULL FROM pg_catalog.pg_inherits h\n"
diff --git a/src/common/Makefile b/src/common/Makefile
index 1e2b91c83c4..2c720caa509 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -163,7 +163,7 @@ libpgcommon_shlib.a: $(OBJS_SHLIB)
 # The JSON API normally exits on out-of-memory; disable that behavior for shared
 # library builds. This requires libpq's pqexpbuffer.h.
 jsonapi_shlib.o: override CPPFLAGS += -DJSONAPI_USE_PQEXPBUFFER
-jsonapi_shlib.o: override CPPFLAGS += -I$(libpq_srcdir)
+jsonapi_shlib.o: override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 # Because this uses its own compilation rule, it doesn't use the
 # dependency tracking logic from Makefile.global.  To make sure that
diff --git a/src/common/blkreftable.c b/src/common/blkreftable.c
index b935baf9ad4..5c85d6a5c6d 100644
--- a/src/common/blkreftable.c
+++ b/src/common/blkreftable.c
@@ -497,7 +497,7 @@ WriteBlockRefTable(BlockRefTable *brtab,
 
 		/* Extract entries into serializable format and sort them. */
 		sdata =
-			palloc(brtab->hash->members * sizeof(BlockRefTableSerializedEntry));
+			palloc_array(BlockRefTableSerializedEntry, brtab->hash->members);
 		blockreftable_start_iterate(brtab->hash, &it);
 		while ((brtentry = blockreftable_iterate(brtab->hash, &it)) != NULL)
 		{
@@ -657,10 +657,24 @@ BlockRefTableReaderNextRelation(BlockRefTableReader *reader,
 		return false;
 	}
 
+	/*
+	 * Sanity-check the nchunks value.  In the backend, palloc_array would
+	 * enforce this anyway (with a more generic error message); but in
+	 * frontend it would not, potentially allowing BlockRefTableRead's length
+	 * parameter to overflow.
+	 */
+	if (sentry.nchunks > MaxAllocSize / sizeof(uint16))
+	{
+		reader->error_callback(reader->error_callback_arg,
+							   "file \"%s\" has oversized chunk size array",
+							   reader->error_filename);
+		return false;
+	}
+
 	/* Read chunk size array. */
 	if (reader->chunk_size != NULL)
 		pfree(reader->chunk_size);
-	reader->chunk_size = palloc(sentry.nchunks * sizeof(uint16));
+	reader->chunk_size = palloc_array(uint16, sentry.nchunks);
 	BlockRefTableRead(reader, reader->chunk_size,
 					  sentry.nchunks * sizeof(uint16));
 
@@ -997,10 +1011,9 @@ BlockRefTableEntryMarkBlockModified(BlockRefTableEntry *entry,
 
 		if (entry->nchunks == 0)
 		{
-			entry->chunk_size = palloc0(sizeof(uint16) * max_chunks);
-			entry->chunk_usage = palloc0(sizeof(uint16) * max_chunks);
-			entry->chunk_data =
-				palloc0(sizeof(BlockRefTableChunk) * max_chunks);
+			entry->chunk_size = palloc0_array(uint16, max_chunks);
+			entry->chunk_usage = palloc0_array(uint16, max_chunks);
+			entry->chunk_data = palloc0_array(BlockRefTableChunk, max_chunks);
 		}
 		else
 		{
@@ -1029,7 +1042,7 @@ BlockRefTableEntryMarkBlockModified(BlockRefTableEntry *entry,
 	if (entry->chunk_size[chunkno] == 0)
 	{
 		entry->chunk_data[chunkno] =
-			palloc(sizeof(uint16) * INITIAL_ENTRIES_PER_CHUNK);
+			palloc_array(uint16, INITIAL_ENTRIES_PER_CHUNK);
 		entry->chunk_size[chunkno] = INITIAL_ENTRIES_PER_CHUNK;
 		entry->chunk_data[chunkno][0] = chunkoffset;
 		entry->chunk_usage[chunkno] = 1;
diff --git a/src/common/compression.c b/src/common/compression.c
index 4c3c9fd7b50..eb434542fbd 100644
--- a/src/common/compression.c
+++ b/src/common/compression.c
@@ -425,7 +425,7 @@ validate_compress_specification(pg_compress_specification *spec)
 void
 parse_compress_options(const char *option, char **algorithm, char **detail)
 {
-	char	   *sep;
+	const char *sep;
 	char	   *endp;
 	long		result;
 
diff --git a/src/common/encnames.c b/src/common/encnames.c
index 7a6036c0361..7084885018d 100644
--- a/src/common/encnames.c
+++ b/src/common/encnames.c
@@ -61,8 +61,9 @@ static const pg_encname pg_encname_tbl[] =
 								 * Japanese, standard OSF */
 	{
 		"euckr", PG_EUC_KR
-	},							/* EUC-KR; Extended Unix Code for Korean , KS
-								 * X 1001 standard */
+	},							/* EUC-KR; Extended Unix Code for Korean
+								 * precomposed (Wansung) encoding, standard KS
+								 * X 1001 */
 	{
 		"euctw", PG_EUC_TW
 	},							/* EUC-TW; Extended Unix Code for
@@ -119,8 +120,8 @@ static const pg_encname pg_encname_tbl[] =
 	},							/* ISO-8859-9; RFC1345,KXS2 */
 	{
 		"johab", PG_JOHAB
-	},							/* JOHAB; Extended Unix Code for simplified
-								 * Chinese */
+	},							/* JOHAB; Korean combining (Johab) encoding,
+								 * standard KS X 1001 annex 3 */
 	{
 		"koi8", PG_KOI8R
 	},							/* _dirty_ alias for KOI8-R (backward
@@ -189,7 +190,9 @@ static const pg_encname pg_encname_tbl[] =
 	},							/* alias for WIN1258 */
 	{
 		"uhc", PG_UHC
-	},							/* UHC; Korean Windows CodePage 949 */
+	},							/* UHC; Unified Hangul Code, Microsoft Windows
+								 * CodePage 949; superset of EUC-KR covering
+								 * all 11,172 precomposed Hangul syllables */
 	{
 		"unicode", PG_UTF8
 	},							/* alias for UTF8 */
diff --git a/src/common/fe_memutils.c b/src/common/fe_memutils.c
index 4ba793a6132..f2f073c5caf 100644
--- a/src/common/fe_memutils.c
+++ b/src/common/fe_memutils.c
@@ -19,6 +19,12 @@
 
 #include "postgres_fe.h"
 
+#include "common/int.h"
+
+pg_noreturn static pg_noinline void add_size_error(Size s1, Size s2);
+pg_noreturn static pg_noinline void mul_size_error(Size s1, Size s2);
+
+
 static inline void *
 pg_malloc_internal(size_t size, int flags)
 {
@@ -173,3 +179,185 @@ repalloc(void *pointer, Size size)
 {
 	return pg_realloc(pointer, size);
 }
+
+/*
+ * Support for safe calculation of memory request sizes
+ *
+ * These functions perform the requested calculation, but throw error if the
+ * result overflows.
+ *
+ * An important property of these functions is that if an argument was a
+ * negative signed int before promotion (implying overflow in calculating it)
+ * we will detect that as an error.  That happens because we reject results
+ * larger than SIZE_MAX / 2.  In the backend we rely on later checks to do
+ * that, but in frontend we must do it here.
+ */
+Size
+add_size(Size s1, Size s2)
+{
+	Size		result;
+
+	if (unlikely(pg_add_size_overflow(s1, s2, &result) ||
+				 result > (SIZE_MAX / 2)))
+		add_size_error(s1, s2);
+	return result;
+}
+
+pg_noreturn static pg_noinline void
+add_size_error(Size s1, Size s2)
+{
+	fprintf(stderr, _("invalid memory allocation request size %zu + %zu\n"),
+			s1, s2);
+	exit(EXIT_FAILURE);
+}
+
+Size
+mul_size(Size s1, Size s2)
+{
+	Size		result;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &result) ||
+				 result > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return result;
+}
+
+pg_noreturn static pg_noinline void
+mul_size_error(Size s1, Size s2)
+{
+	fprintf(stderr, _("invalid memory allocation request size %zu * %zu\n"),
+			s1, s2);
+	exit(EXIT_FAILURE);
+}
+
+/*
+ * pg_malloc_mul
+ *		Equivalent to pg_malloc(mul_size(s1, s2)).
+ */
+void *
+pg_malloc_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return pg_malloc(req);
+}
+
+/*
+ * pg_malloc0_mul
+ *		Equivalent to pg_malloc0(mul_size(s1, s2)).
+ *
+ * This is comparable to standard calloc's behavior.
+ */
+void *
+pg_malloc0_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return pg_malloc0(req);
+}
+
+/*
+ * pg_malloc_mul_extended
+ *		Equivalent to pg_malloc_extended(mul_size(s1, s2), flags).
+ */
+void *
+pg_malloc_mul_extended(Size s1, Size s2, int flags)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return pg_malloc_extended(req, flags);
+}
+
+/*
+ * pg_realloc_mul
+ *		Equivalent to pg_realloc(p, mul_size(s1, s2)).
+ */
+void *
+pg_realloc_mul(void *p, Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return pg_realloc(p, req);
+}
+
+/*
+ * palloc_mul
+ *		Equivalent to palloc(mul_size(s1, s2)).
+ */
+void *
+palloc_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return palloc(req);
+}
+
+/*
+ * palloc0_mul
+ *		Equivalent to palloc0(mul_size(s1, s2)).
+ *
+ * This is comparable to standard calloc's behavior.
+ */
+void *
+palloc0_mul(Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return palloc0(req);
+}
+
+/*
+ * palloc_mul_extended
+ *		Equivalent to palloc_extended(mul_size(s1, s2), flags).
+ */
+void *
+palloc_mul_extended(Size s1, Size s2, int flags)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return palloc_extended(req, flags);
+}
+
+/*
+ * repalloc_mul
+ *		Equivalent to repalloc(p, mul_size(s1, s2)).
+ */
+void *
+repalloc_mul(void *p, Size s1, Size s2)
+{
+	/* inline mul_size() for efficiency */
+	Size		req;
+
+	if (unlikely(pg_mul_size_overflow(s1, s2, &req) ||
+				 req > (SIZE_MAX / 2)))
+		mul_size_error(s1, s2);
+	return repalloc(p, req);
+}
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 7dad4da65f6..f0d51c56782 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -1670,9 +1670,31 @@ json_lex(JsonLexContext *lex)
 
 			if (c == '-' || (c >= '0' && c <= '9'))
 			{
-				/* for numbers look for possible numeric continuations */
-
+				/*
+				 * Accumulate numeric continuations, respecting JSON number
+				 * grammar: -? int [frac] [exp]
+				 *
+				 * We must track what parts of the number we've already seen
+				 * so we don't over-consume.  '.' is valid only once and not
+				 * after 'e'/'E'; 'e'/'E' is valid only once; '+'/'-' are
+				 * valid only immediately after 'e'/'E'.
+				 */
 				bool		numend = false;
+				bool		seen_dot = false;
+				bool		seen_exp = false;
+				char		prev;
+
+				/* Scan existing partial token for state */
+				for (int j = 0; j < ptok->len; j++)
+				{
+					char		pc = ptok->data[j];
+
+					if (pc == '.')
+						seen_dot = true;
+					else if (pc == 'e' || pc == 'E')
+						seen_exp = true;
+				}
+				prev = ptok->data[ptok->len - 1];
 
 				for (size_t i = 0; i < lex->input_length && !numend; i++)
 				{
@@ -1682,8 +1704,35 @@ json_lex(JsonLexContext *lex)
 					{
 						case '+':
 						case '-':
+							if (prev != 'e' && prev != 'E')
+							{
+								numend = true;
+								break;
+							}
+							jsonapi_appendStringInfoCharMacro(ptok, cc);
+							added++;
+							break;
+						case '.':
+							if (seen_dot || seen_exp)
+							{
+								numend = true;
+								break;
+							}
+							seen_dot = true;
+							jsonapi_appendStringInfoCharMacro(ptok, cc);
+							added++;
+							break;
 						case 'e':
 						case 'E':
+							if (seen_exp)
+							{
+								numend = true;
+								break;
+							}
+							seen_exp = true;
+							jsonapi_appendStringInfoCharMacro(ptok, cc);
+							added++;
+							break;
 						case '0':
 						case '1':
 						case '2':
@@ -1694,14 +1743,14 @@ json_lex(JsonLexContext *lex)
 						case '7':
 						case '8':
 						case '9':
-							{
-								jsonapi_appendStringInfoCharMacro(ptok, cc);
-								added++;
-							}
+							jsonapi_appendStringInfoCharMacro(ptok, cc);
+							added++;
 							break;
 						default:
 							numend = true;
 					}
+					if (!numend)
+						prev = cc;
 				}
 			}
 
diff --git a/src/common/pg_lzcompress.c b/src/common/pg_lzcompress.c
index 86354d660fd..51ae3c1c610 100644
--- a/src/common/pg_lzcompress.c
+++ b/src/common/pg_lzcompress.c
@@ -727,22 +727,33 @@ pglz_decompress(const char *source, int32 slen, char *dest,
 				int32		len;
 				int32		off;
 
+				/*
+				 * A match tag is at least 2 bytes; if the length nibble is
+				 * 0x0f the tag is 3 bytes (extended length).  Verify we have
+				 * enough source data before reading them.
+				 */
+				if (unlikely(sp + 2 > srcend))
+					return -1;
+
 				len = (sp[0] & 0x0f) + 3;
 				off = ((sp[0] & 0xf0) << 4) | sp[1];
 				sp += 2;
 				if (len == 18)
+				{
+					if (unlikely(sp >= srcend))
+						return -1;
 					len += *sp++;
+				}
 
 				/*
-				 * Check for corrupt data: if we fell off the end of the
-				 * source, or if we obtained off = 0, or if off is more than
-				 * the distance back to the buffer start, we have problems.
-				 * (We must check for off = 0, else we risk an infinite loop
-				 * below in the face of corrupt data.  Likewise, the upper
-				 * limit on off prevents accessing outside the buffer
-				 * boundaries.)
+				 * Check for corrupt data: if we obtained off = 0, or if off
+				 * is more than the distance back to the buffer start, we have
+				 * problems.  (We must check for off = 0, else we risk an
+				 * infinite loop below in the face of corrupt data. Likewise,
+				 * the upper limit on off prevents accessing outside the
+				 * buffer boundaries.)
 				 */
-				if (unlikely(sp > srcend || off == 0 ||
+				if (unlikely(off == 0 ||
 							 off > (dp - (unsigned char *) dest)))
 					return -1;
 
diff --git a/src/common/unicode/case_test.c b/src/common/unicode/case_test.c
index fdfb62e8552..6dfc4d130ea 100644
--- a/src/common/unicode/case_test.c
+++ b/src/common/unicode/case_test.c
@@ -303,7 +303,7 @@ tfunc_title(char *dst, size_t dstsize, const char *src,
 {
 	struct WordBoundaryState wbstate = {
 		.str = src,
-		.len = srclen,
+		.len = (srclen < 0) ? strlen(src) : srclen,
 		.offset = 0,
 		.init = false,
 		.prev_alnum = false,
diff --git a/src/common/unicode_norm.c b/src/common/unicode_norm.c
index 6654b4cbc49..0bb7523f422 100644
--- a/src/common/unicode_norm.c
+++ b/src/common/unicode_norm.c
@@ -23,6 +23,7 @@
 #include "common/unicode_norm_hashfunc.h"
 #include "common/unicode_normprops_table.h"
 #include "port/pg_bswap.h"
+#include "utils/memutils.h"
 #else
 #include "common/unicode_norm_table.h"
 #endif
@@ -420,10 +421,28 @@ unicode_normalize(UnicodeNormalizationForm form, const pg_wchar *input)
 
 	/*
 	 * Calculate how many characters long the decomposed version will be.
+	 *
+	 * Some characters decompose to quite a few code points, so that the
+	 * decomposed version's size could overrun MaxAllocSize, and even 32-bit
+	 * size_t, even though the input string presumably fits in that.  In
+	 * frontend we want to just return NULL in that case, so monitor the sum
+	 * and exit early once we'd need more than MaxAllocSize bytes.
 	 */
 	decomp_size = 0;
 	for (p = input; *p; p++)
+	{
 		decomp_size += get_decomposed_size(*p, compat);
+		if (unlikely(decomp_size > MaxAllocSize / sizeof(pg_wchar)))
+		{
+#ifndef FRONTEND
+			/* Exit loop and let palloc() throw error below */
+			break;
+#else
+			/* Just return NULL with no explicit error */
+			return NULL;
+#endif
+		}
+	}
 
 	decomp_chars = (pg_wchar *) ALLOC((decomp_size + 1) * sizeof(pg_wchar));
 	if (decomp_chars == NULL)
diff --git a/src/common/wchar.c b/src/common/wchar.c
index 9e3e6fbecda..384ac7b6351 100644
--- a/src/common/wchar.c
+++ b/src/common/wchar.c
@@ -67,6 +67,9 @@ utf8_to_gb18030_2022_hook_type utf8_to_gb18030_2022_hook = NULL;
  * subset to the ASCII routines to ensure consistency.
  */
 
+/* No error-reporting facility.  Ignore incomplete trailing byte sequence. */
+#define MB2CHAR_NEED_AT_LEAST(len, need) if ((len) < (need)) break
+
 /*
  * SQL/ASCII
  */
@@ -112,22 +115,24 @@ pg_euc2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 
 	while (len > 0 && *from)
 	{
-		if (*from == SS2 && len >= 2)	/* JIS X 0201 (so called "1 byte
-										 * KANA") */
+		if (*from == SS2)		/* JIS X 0201 (so called "1 byte KANA") */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			from++;
 			*to = (SS2 << 8) | *from++;
 			len -= 2;
 		}
-		else if (*from == SS3 && len >= 3)	/* JIS X 0212 KANJI */
+		else if (*from == SS3)	/* JIS X 0212 KANJI */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			from++;
 			*to = (SS3 << 16) | (*from++ << 8);
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (IS_HIGHBIT_SET(*from) && len >= 2) /* JIS X 0208 KANJI */
+		else if (IS_HIGHBIT_SET(*from)) /* JIS X 0208 KANJI */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			*to = *from++ << 8;
 			*to |= *from++;
 			len -= 2;
@@ -239,22 +244,25 @@ pg_euccn2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 
 	while (len > 0 && *from)
 	{
-		if (*from == SS2 && len >= 3)	/* code set 2 (unused?) */
+		if (*from == SS2)		/* code set 2 (unused?) */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			from++;
 			*to = (SS2 << 16) | (*from++ << 8);
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (*from == SS3 && len >= 3)	/* code set 3 (unused ?) */
+		else if (*from == SS3)	/* code set 3 (unused ?) */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			from++;
 			*to = (SS3 << 16) | (*from++ << 8);
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (IS_HIGHBIT_SET(*from) && len >= 2) /* code set 1 */
+		else if (IS_HIGHBIT_SET(*from)) /* code set 1 */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			*to = *from++ << 8;
 			*to |= *from++;
 			len -= 2;
@@ -271,12 +279,22 @@ pg_euccn2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 	return cnt;
 }
 
+/*
+ * mbverifychar does not accept SS2 or SS3 (CS2 and CS3 are not defined for
+ * EUC_CN), but mb2wchar_with_len does.  Tell a coherent story for code that
+ * relies on agreement between mb2wchar_with_len and mblen.  Invalid text
+ * datums (e.g. from shared catalogs) reach this.
+ */
 static int
 pg_euccn_mblen(const unsigned char *s)
 {
 	int			len;
 
-	if (IS_HIGHBIT_SET(*s))
+	if (*s == SS2)
+		len = 3;
+	else if (*s == SS3)
+		len = 3;
+	else if (IS_HIGHBIT_SET(*s))
 		len = 2;
 	else
 		len = 1;
@@ -306,23 +324,26 @@ pg_euctw2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 
 	while (len > 0 && *from)
 	{
-		if (*from == SS2 && len >= 4)	/* code set 2 */
+		if (*from == SS2)		/* code set 2 */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 4);
 			from++;
 			*to = (((uint32) SS2) << 24) | (*from++ << 16);
 			*to |= *from++ << 8;
 			*to |= *from++;
 			len -= 4;
 		}
-		else if (*from == SS3 && len >= 3)	/* code set 3 (unused?) */
+		else if (*from == SS3)	/* code set 3 (unused?) */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			from++;
 			*to = (SS3 << 16) | (*from++ << 8);
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (IS_HIGHBIT_SET(*from) && len >= 2) /* code set 2 */
+		else if (IS_HIGHBIT_SET(*from)) /* code set 2 */
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			*to = *from++ << 8;
 			*to |= *from++;
 			len -= 2;
@@ -544,8 +565,7 @@ pg_utf2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 		}
 		else if ((*from & 0xe0) == 0xc0)
 		{
-			if (len < 2)
-				break;			/* drop trailing incomplete char */
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			c1 = *from++ & 0x1f;
 			c2 = *from++ & 0x3f;
 			*to = (c1 << 6) | c2;
@@ -553,8 +573,7 @@ pg_utf2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 		}
 		else if ((*from & 0xf0) == 0xe0)
 		{
-			if (len < 3)
-				break;			/* drop trailing incomplete char */
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			c1 = *from++ & 0x0f;
 			c2 = *from++ & 0x3f;
 			c3 = *from++ & 0x3f;
@@ -563,8 +582,7 @@ pg_utf2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 		}
 		else if ((*from & 0xf8) == 0xf0)
 		{
-			if (len < 4)
-				break;			/* drop trailing incomplete char */
+			MB2CHAR_NEED_AT_LEAST(len, 4);
 			c1 = *from++ & 0x07;
 			c2 = *from++ & 0x3f;
 			c3 = *from++ & 0x3f;
@@ -766,28 +784,32 @@ pg_mule2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 
 	while (len > 0 && *from)
 	{
-		if (IS_LC1(*from) && len >= 2)
+		if (IS_LC1(*from))
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 2);
 			*to = *from++ << 16;
 			*to |= *from++;
 			len -= 2;
 		}
-		else if (IS_LCPRV1(*from) && len >= 3)
+		else if (IS_LCPRV1(*from))
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			from++;
 			*to = *from++ << 16;
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (IS_LC2(*from) && len >= 3)
+		else if (IS_LC2(*from))
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 3);
 			*to = *from++ << 16;
 			*to |= *from++ << 8;
 			*to |= *from++;
 			len -= 3;
 		}
-		else if (IS_LCPRV2(*from) && len >= 4)
+		else if (IS_LCPRV2(*from))
 		{
+			MB2CHAR_NEED_AT_LEAST(len, 4);
 			from++;
 			*to = *from++ << 16;
 			*to |= *from++ << 8;
@@ -2153,7 +2175,7 @@ pg_encoding_set_invalid(int encoding, char *dst)
 const pg_wchar_tbl pg_wchar_table[] = {
 	[PG_SQL_ASCII] = {pg_ascii2wchar_with_len, pg_wchar2single_with_len, pg_ascii_mblen, pg_ascii_dsplen, pg_ascii_verifychar, pg_ascii_verifystr, 1},
 	[PG_EUC_JP] = {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3},
-	[PG_EUC_CN] = {pg_euccn2wchar_with_len, pg_wchar2euc_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifychar, pg_euccn_verifystr, 2},
+	[PG_EUC_CN] = {pg_euccn2wchar_with_len, pg_wchar2euc_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifychar, pg_euccn_verifystr, 3},
 	[PG_EUC_KR] = {pg_euckr2wchar_with_len, pg_wchar2euc_with_len, pg_euckr_mblen, pg_euckr_dsplen, pg_euckr_verifychar, pg_euckr_verifystr, 3},
 	[PG_EUC_TW] = {pg_euctw2wchar_with_len, pg_wchar2euc_with_len, pg_euctw_mblen, pg_euctw_dsplen, pg_euctw_verifychar, pg_euctw_verifystr, 4},
 	[PG_EUC_JIS_2004] = {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3},
diff --git a/src/fe_utils/.gitignore b/src/fe_utils/.gitignore
index 37f5f7514df..e1d61f9dea1 100644
--- a/src/fe_utils/.gitignore
+++ b/src/fe_utils/.gitignore
@@ -1 +1,4 @@
 /psqlscan.c
+/ora_keywords.c
+/ora_kwlist_d.h
+/ora_psqlscan.c
diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile
index b6183856d27..82598c6632c 100644
--- a/src/fe_utils/Makefile
+++ b/src/fe_utils/Makefile
@@ -7,7 +7,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # IDENTIFICATION
 #    src/fe_utils/Makefile
diff --git a/src/fe_utils/astreamer_file.c b/src/fe_utils/astreamer_file.c
index c6856285086..175396bd205 100644
--- a/src/fe_utils/astreamer_file.c
+++ b/src/fe_utils/astreamer_file.c
@@ -218,6 +218,10 @@ astreamer_extractor_content(astreamer *streamer, astreamer_member *member,
 		case ASTREAMER_MEMBER_HEADER:
 			Assert(mystreamer->file == NULL);
 
+			if (!path_is_safe_for_extraction(member->pathname))
+				pg_fatal("tar member has unsafe path name: \"%s\"",
+						 member->pathname);
+
 			/* Prepend basepath. */
 			snprintf(mystreamer->filename, sizeof(mystreamer->filename),
 					 "%s/%s", mystreamer->basepath, member->pathname);
@@ -228,20 +232,28 @@ astreamer_extractor_content(astreamer *streamer, astreamer_member *member,
 				mystreamer->filename[fnamelen - 1] = '\0';
 
 			/* Dispatch based on file type. */
-			if (member->is_directory)
+			if (member->is_regular)
+				mystreamer->file =
+					create_file_for_extract(mystreamer->filename,
+											member->mode);
+			else if (member->is_directory)
 				extract_directory(mystreamer->filename, member->mode);
-			else if (member->is_link)
+			else if (member->is_symlink)
 			{
 				const char *linktarget = member->linktarget;
 
 				if (mystreamer->link_map)
 					linktarget = mystreamer->link_map(linktarget);
+
+				if (!is_absolute_path(linktarget) &&
+					!path_is_safe_for_extraction(member->linktarget))
+				{
+					pg_fatal("link target has unsafe path name: \"%s\"",
+							 member->linktarget);
+				}
+
 				extract_link(mystreamer->filename, linktarget);
 			}
-			else
-				mystreamer->file =
-					create_file_for_extract(mystreamer->filename,
-											member->mode);
 
 			/* Report output file change. */
 			if (mystreamer->report_output_file)
@@ -266,7 +278,9 @@ astreamer_extractor_content(astreamer *streamer, astreamer_member *member,
 		case ASTREAMER_MEMBER_TRAILER:
 			if (mystreamer->file == NULL)
 				break;
-			fclose(mystreamer->file);
+			if (fclose(mystreamer->file) != 0)
+				pg_fatal("could not close file \"%s\": %m",
+						 mystreamer->filename);
 			mystreamer->file = NULL;
 			break;
 
diff --git a/src/fe_utils/astreamer_gzip.c b/src/fe_utils/astreamer_gzip.c
index a395f57edcd..671275f941d 100644
--- a/src/fe_utils/astreamer_gzip.c
+++ b/src/fe_utils/astreamer_gzip.c
@@ -316,8 +316,9 @@ astreamer_gzip_decompressor_content(astreamer *streamer,
 		 */
 		res = inflate(zs, Z_NO_FLUSH);
 
-		if (res == Z_STREAM_ERROR)
-			pg_log_error("could not decompress data: %s", zs->msg);
+		if (res != Z_OK && res != Z_STREAM_END && res != Z_BUF_ERROR)
+			pg_fatal("could not decompress data: %s",
+					 zs->msg ? zs->msg : "unknown error");
 
 		mystreamer->bytes_written =
 			mystreamer->base.bbs_buffer.maxlen - zs->avail_out;
@@ -347,10 +348,11 @@ astreamer_gzip_decompressor_finalize(astreamer *streamer)
 	 * End of the stream, if there is some pending data in output buffers then
 	 * we must forward it to next streamer.
 	 */
-	astreamer_content(mystreamer->base.bbs_next, NULL,
-					  mystreamer->base.bbs_buffer.data,
-					  mystreamer->base.bbs_buffer.maxlen,
-					  ASTREAMER_UNKNOWN);
+	if (mystreamer->bytes_written > 0)
+		astreamer_content(mystreamer->base.bbs_next, NULL,
+						  mystreamer->base.bbs_buffer.data,
+						  mystreamer->bytes_written,
+						  ASTREAMER_UNKNOWN);
 
 	astreamer_finalize(mystreamer->base.bbs_next);
 }
@@ -361,7 +363,12 @@ astreamer_gzip_decompressor_finalize(astreamer *streamer)
 static void
 astreamer_gzip_decompressor_free(astreamer *streamer)
 {
+	astreamer_gzip_decompressor *mystreamer;
+
+	mystreamer = (astreamer_gzip_decompressor *) streamer;
+
 	astreamer_free(streamer->bbs_next);
+	inflateEnd(&mystreamer->zstream);
 	pfree(streamer->bbs_buffer.data);
 	pfree(streamer);
 }
diff --git a/src/fe_utils/astreamer_lz4.c b/src/fe_utils/astreamer_lz4.c
index 781aaf99f38..d08caf2809d 100644
--- a/src/fe_utils/astreamer_lz4.c
+++ b/src/fe_utils/astreamer_lz4.c
@@ -94,8 +94,8 @@ astreamer_lz4_compressor_new(astreamer *next, pg_compress_specification *compres
 
 	ctxError = LZ4F_createCompressionContext(&streamer->cctx, LZ4F_VERSION);
 	if (LZ4F_isError(ctxError))
-		pg_log_error("could not create lz4 compression context: %s",
-					 LZ4F_getErrorName(ctxError));
+		pg_fatal("could not create lz4 compression context: %s",
+				 LZ4F_getErrorName(ctxError));
 
 	return &streamer->base;
 #else
@@ -139,8 +139,8 @@ astreamer_lz4_compressor_content(astreamer *streamer,
 											 &mystreamer->prefs);
 
 		if (LZ4F_isError(compressed_size))
-			pg_log_error("could not write lz4 header: %s",
-						 LZ4F_getErrorName(compressed_size));
+			pg_fatal("could not write lz4 header: %s",
+					 LZ4F_getErrorName(compressed_size));
 
 		mystreamer->bytes_written += compressed_size;
 		mystreamer->header_written = true;
@@ -188,8 +188,8 @@ astreamer_lz4_compressor_content(astreamer *streamer,
 										  next_in, len, NULL);
 
 	if (LZ4F_isError(compressed_size))
-		pg_log_error("could not compress data: %s",
-					 LZ4F_getErrorName(compressed_size));
+		pg_fatal("could not compress data: %s",
+				 LZ4F_getErrorName(compressed_size));
 
 	mystreamer->bytes_written += compressed_size;
 }
@@ -240,8 +240,8 @@ astreamer_lz4_compressor_finalize(astreamer *streamer)
 									   next_out, avail_out, NULL);
 
 	if (LZ4F_isError(compressed_size))
-		pg_log_error("could not end lz4 compression: %s",
-					 LZ4F_getErrorName(compressed_size));
+		pg_fatal("could not end lz4 compression: %s",
+				 LZ4F_getErrorName(compressed_size));
 
 	mystreamer->bytes_written += compressed_size;
 
@@ -322,9 +322,9 @@ astreamer_lz4_decompressor_content(astreamer *streamer,
 
 	mystreamer = (astreamer_lz4_frame *) streamer;
 	next_in = (uint8 *) data;
-	next_out = (uint8 *) mystreamer->base.bbs_buffer.data;
+	next_out = (uint8 *) mystreamer->base.bbs_buffer.data + mystreamer->bytes_written;
 	avail_in = len;
-	avail_out = mystreamer->base.bbs_buffer.maxlen;
+	avail_out = mystreamer->base.bbs_buffer.maxlen - mystreamer->bytes_written;
 
 	while (avail_in > 0)
 	{
@@ -353,18 +353,21 @@ astreamer_lz4_decompressor_content(astreamer *streamer,
 							  next_in, &read_size, NULL);
 
 		if (LZ4F_isError(ret))
-			pg_log_error("could not decompress data: %s",
-						 LZ4F_getErrorName(ret));
+			pg_fatal("could not decompress data: %s",
+					 LZ4F_getErrorName(ret));
 
 		/* Update input buffer based on number of bytes consumed */
 		avail_in -= read_size;
 		next_in += read_size;
 
+		/* Update output buffer based on number of bytes produced */
+		avail_out -= out_size;
+		next_out += out_size;
 		mystreamer->bytes_written += out_size;
 
 		/*
 		 * If output buffer is full then forward the content to next streamer
-		 * and update the output buffer.
+		 * and reset the output buffer.
 		 */
 		if (mystreamer->bytes_written >= mystreamer->base.bbs_buffer.maxlen)
 		{
@@ -374,13 +377,8 @@ astreamer_lz4_decompressor_content(astreamer *streamer,
 							  context);
 
 			avail_out = mystreamer->base.bbs_buffer.maxlen;
-			mystreamer->bytes_written = 0;
 			next_out = (uint8 *) mystreamer->base.bbs_buffer.data;
-		}
-		else
-		{
-			avail_out = mystreamer->base.bbs_buffer.maxlen - mystreamer->bytes_written;
-			next_out += mystreamer->bytes_written;
+			mystreamer->bytes_written = 0;
 		}
 	}
 }
@@ -399,10 +397,11 @@ astreamer_lz4_decompressor_finalize(astreamer *streamer)
 	 * End of the stream, if there is some pending data in output buffers then
 	 * we must forward it to next streamer.
 	 */
-	astreamer_content(mystreamer->base.bbs_next, NULL,
-					  mystreamer->base.bbs_buffer.data,
-					  mystreamer->base.bbs_buffer.maxlen,
-					  ASTREAMER_UNKNOWN);
+	if (mystreamer->bytes_written > 0)
+		astreamer_content(mystreamer->base.bbs_next, NULL,
+						  mystreamer->base.bbs_buffer.data,
+						  mystreamer->bytes_written,
+						  ASTREAMER_UNKNOWN);
 
 	astreamer_finalize(mystreamer->base.bbs_next);
 }
diff --git a/src/fe_utils/astreamer_tar.c b/src/fe_utils/astreamer_tar.c
index 088e2357920..90bfab8832c 100644
--- a/src/fe_utils/astreamer_tar.c
+++ b/src/fe_utils/astreamer_tar.c
@@ -224,7 +224,8 @@ astreamer_tar_parser_content(astreamer *streamer, astreamer_member *member,
 				/* OK, now we can send it. */
 				astreamer_content(mystreamer->base.bbs_next,
 								  &mystreamer->member,
-								  data, mystreamer->pad_bytes_expected,
+								  mystreamer->base.bbs_buffer.data,
+								  mystreamer->pad_bytes_expected,
 								  ASTREAMER_MEMBER_TRAILER);
 
 				/* Expect next file header. */
@@ -236,12 +237,16 @@ astreamer_tar_parser_content(astreamer *streamer, astreamer_member *member,
 
 				/*
 				 * We've seen an end-of-archive indicator, so anything more is
-				 * buffered and sent as part of the archive trailer. But we
-				 * don't expect more than 2 blocks.
+				 * buffered and sent as part of the archive trailer.
+				 *
+				 * Per POSIX, the last physical block of a tar archive is
+				 * always full-sized, so there may be undefined data after the
+				 * two zero blocks that mark end-of-archive.  GNU tar, for
+				 * example, zero-pads to a 10kB boundary by default.  We just
+				 * buffer whatever we receive and pass it along at finalize
+				 * time.
 				 */
 				astreamer_buffer_bytes(streamer, &data, &len, len);
-				if (len > 2 * TAR_BLOCK_SIZE)
-					pg_fatal("tar file trailer exceeds 2 blocks");
 				return;
 
 			default:
@@ -255,7 +260,8 @@ astreamer_tar_parser_content(astreamer *streamer, astreamer_member *member,
  * Parse a file header within a tar stream.
  *
  * The return value is true if we found a file header and passed it on to the
- * next astreamer; it is false if we have reached the archive trailer.
+ * next astreamer; it is false if we have found the archive trailer.
+ * We throw error if we see invalid data.
  */
 static bool
 astreamer_tar_header(astreamer_tar_parser *mystreamer)
@@ -267,6 +273,9 @@ astreamer_tar_header(astreamer_tar_parser *mystreamer)
 
 	Assert(mystreamer->base.bbs_buffer.len == TAR_BLOCK_SIZE);
 
+	/* Zero out fields of *member, just for consistency. */
+	memset(member, 0, sizeof(astreamer_member));
+
 	/* Check whether we've got a block of all zero bytes. */
 	for (i = 0; i < TAR_BLOCK_SIZE; ++i)
 	{
@@ -284,22 +293,48 @@ astreamer_tar_header(astreamer_tar_parser *mystreamer)
 	if (!has_nonzero_byte)
 		return false;
 
+	/*
+	 * Verify that we have a reasonable-looking header.
+	 */
+	if (!isValidTarHeader(buffer))
+		pg_fatal("input file does not appear to be a valid tar archive");
+
 	/*
 	 * Parse key fields out of the header.
 	 */
 	strlcpy(member->pathname, &buffer[TAR_OFFSET_NAME], MAXPGPATH);
 	if (member->pathname[0] == '\0')
 		pg_fatal("tar member has empty name");
+	if (!path_is_safe_for_extraction(member->pathname))
+		pg_fatal("tar member has unsafe path name: \"%s\"",
+				 member->pathname);
+
 	member->size = read_tar_number(&buffer[TAR_OFFSET_SIZE], 12);
 	member->mode = read_tar_number(&buffer[TAR_OFFSET_MODE], 8);
 	member->uid = read_tar_number(&buffer[TAR_OFFSET_UID], 8);
 	member->gid = read_tar_number(&buffer[TAR_OFFSET_GID], 8);
-	member->is_directory =
-		(buffer[TAR_OFFSET_TYPEFLAG] == TAR_FILETYPE_DIRECTORY);
-	member->is_link =
-		(buffer[TAR_OFFSET_TYPEFLAG] == TAR_FILETYPE_SYMLINK);
-	if (member->is_link)
-		strlcpy(member->linktarget, &buffer[TAR_OFFSET_LINKNAME], 100);
+
+	switch (buffer[TAR_OFFSET_TYPEFLAG])
+	{
+		case TAR_FILETYPE_PLAIN:
+		case TAR_FILETYPE_PLAIN_OLD:
+			member->is_regular = true;
+			break;
+		case TAR_FILETYPE_DIRECTORY:
+			member->is_directory = true;
+			break;
+		case TAR_FILETYPE_SYMLINK:
+			member->is_symlink = true;
+			strlcpy(member->linktarget, &buffer[TAR_OFFSET_LINKNAME], 100);
+			break;
+		case TAR_FILETYPE_PAX_EXTENDED:
+		case TAR_FILETYPE_PAX_EXTENDED_GLOBAL:
+			pg_fatal("pax extensions to tar format are not supported");
+			break;
+		default:
+			/* For special filetypes, set none of the three is_xxx flags */
+			break;
+	}
 
 	/* Compute number of padding bytes. */
 	mystreamer->pad_bytes_expected = tarPaddingBytesRequired(member->size);
@@ -342,6 +377,7 @@ astreamer_tar_parser_free(astreamer *streamer)
 {
 	pfree(streamer->bbs_buffer.data);
 	astreamer_free(streamer->bbs_next);
+	pfree(streamer);
 }
 
 /*
diff --git a/src/fe_utils/astreamer_zstd.c b/src/fe_utils/astreamer_zstd.c
index bacdcc150c4..24c9ec2ed60 100644
--- a/src/fe_utils/astreamer_zstd.c
+++ b/src/fe_utils/astreamer_zstd.c
@@ -116,11 +116,8 @@ astreamer_zstd_compressor_new(astreamer *next, pg_compress_specification *compre
 									 ZSTD_c_enableLongDistanceMatching,
 									 compress->long_distance);
 		if (ZSTD_isError(ret))
-		{
-			pg_log_error("could not enable long-distance mode: %s",
-						 ZSTD_getErrorName(ret));
-			exit(1);
-		}
+			pg_fatal("could not enable long-distance mode: %s",
+					 ZSTD_getErrorName(ret));
 	}
 
 	/* Initialize the ZSTD output buffer. */
@@ -182,8 +179,8 @@ astreamer_zstd_compressor_content(astreamer *streamer,
 								 &inBuf, ZSTD_e_continue);
 
 		if (ZSTD_isError(yet_to_flush))
-			pg_log_error("could not compress data: %s",
-						 ZSTD_getErrorName(yet_to_flush));
+			pg_fatal("could not compress data: %s",
+					 ZSTD_getErrorName(yet_to_flush));
 	}
 }
 
@@ -224,8 +221,8 @@ astreamer_zstd_compressor_finalize(astreamer *streamer)
 											&in, ZSTD_e_end);
 
 		if (ZSTD_isError(yet_to_flush))
-			pg_log_error("could not compress data: %s",
-						 ZSTD_getErrorName(yet_to_flush));
+			pg_fatal("could not compress data: %s",
+					 ZSTD_getErrorName(yet_to_flush));
 
 	} while (yet_to_flush > 0);
 
@@ -330,8 +327,8 @@ astreamer_zstd_decompressor_content(astreamer *streamer,
 									&mystreamer->zstd_outBuf, &inBuf);
 
 		if (ZSTD_isError(ret))
-			pg_log_error("could not decompress data: %s",
-						 ZSTD_getErrorName(ret));
+			pg_fatal("could not decompress data: %s",
+					 ZSTD_getErrorName(ret));
 	}
 }
 
@@ -350,7 +347,7 @@ astreamer_zstd_decompressor_finalize(astreamer *streamer)
 	if (mystreamer->zstd_outBuf.pos > 0)
 		astreamer_content(mystreamer->base.bbs_next, NULL,
 						  mystreamer->base.bbs_buffer.data,
-						  mystreamer->base.bbs_buffer.maxlen,
+						  mystreamer->zstd_outBuf.pos,
 						  ASTREAMER_UNKNOWN);
 
 	astreamer_finalize(mystreamer->base.bbs_next);
diff --git a/src/fe_utils/meson.build b/src/fe_utils/meson.build
index 794f978aa2f..5f8ced5eb4d 100644
--- a/src/fe_utils/meson.build
+++ b/src/fe_utils/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 run_command(
   [ln,
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 2f5560ef918..f4206fc74de 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -3,7 +3,7 @@
  * recovery_gen.c
  *		Generator for recovery configuration
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 2011-2025, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 2abb3bbcf04..c57515ae4d3 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -8,7 +8,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/fe_utils/string_utils.c
  *
@@ -104,15 +104,16 @@ getFmtEncoding(void)
 const char *
 fmtIdEnc(const char *rawid, int encoding)
 {
-	if (DB_ORACLE == db_mode)
-		return ora_fmtId(rawid);
-
-	PQExpBuffer id_return = getLocalPQExpBuffer();
-
+	PQExpBuffer id_return;
 	const char *cp;
 	bool		need_quotes = false;
 	size_t		remaining = strlen(rawid);
 
+	if (DB_ORACLE == db_mode)
+		return ora_fmtId(rawid);
+
+	id_return = getLocalPQExpBuffer();
+
 	/*
 	 * These checks need to match the identifier production in scan.l. Don't
 	 * use islower() etc.
diff --git a/src/include/Makefile b/src/include/Makefile
index fa1ee64647b..88c10ef961b 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -73,6 +73,7 @@ uninstall:
 
 clean:
 	rm -f utils/fmgroids.h utils/fmgrprotos.h utils/errcodes.h utils/header-stamp
+	rm -f utils/pgstat_wait_event.c utils/wait_event_funcs_data.c
 	rm -f storage/lwlocknames.h utils/probes.h utils/wait_event_types.h
 	rm -f nodes/nodetags.h nodes/header-stamp
 	$(MAKE) -C catalog clean
diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h
index 5e468101b45..1e6aa715693 100644
--- a/src/include/access/amapi.h
+++ b/src/include/access/amapi.h
@@ -293,7 +293,7 @@ typedef struct IndexAmRoutine
 	ambuild_function ambuild;
 	ambuildempty_function ambuildempty;
 	aminsert_function aminsert;
-	aminsertcleanup_function aminsertcleanup;
+	aminsertcleanup_function aminsertcleanup;	/* can be NULL */
 	ambulkdelete_function ambulkdelete;
 	amvacuumcleanup_function amvacuumcleanup;
 	amcanreturn_function amcanreturn;	/* can be NULL */
diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h
index 6fe97de4d66..5d4671dc4c1 100644
--- a/src/include/access/hash_xlog.h
+++ b/src/include/access/hash_xlog.h
@@ -129,7 +129,7 @@ typedef struct xl_hash_split_complete
  *
  * This data record is used for XLOG_HASH_MOVE_PAGE_CONTENTS
  *
- * Backup Blk 0: bucket page
+ * Backup Blk 0: primary bucket page
  * Backup Blk 1: page containing moved tuples
  * Backup Blk 2: page from which tuples will be removed
  */
@@ -149,12 +149,13 @@ typedef struct xl_hash_move_page_contents
  *
  * This data record is used for XLOG_HASH_SQUEEZE_PAGE
  *
- * Backup Blk 0: page containing tuples moved from freed overflow page
- * Backup Blk 1: freed overflow page
- * Backup Blk 2: page previous to the freed overflow page
- * Backup Blk 3: page next to the freed overflow page
- * Backup Blk 4: bitmap page containing info of freed overflow page
- * Backup Blk 5: meta page
+ * Backup Blk 0: primary bucket page
+ * Backup Blk 1: page containing tuples moved from freed overflow page
+ * Backup Blk 2: freed overflow page
+ * Backup Blk 3: page previous to the freed overflow page
+ * Backup Blk 4: page next to the freed overflow page
+ * Backup Blk 5: bitmap page containing info of freed overflow page
+ * Backup Blk 6: meta page
  */
 typedef struct xl_hash_squeeze_page
 {
@@ -245,7 +246,7 @@ typedef struct xl_hash_init_bitmap_page
  *
  * This data record is used for XLOG_HASH_VACUUM_ONE_PAGE
  *
- * Backup Blk 0: bucket page
+ * Backup Blk 0: primary bucket page
  * Backup Blk 1: meta page
  */
 typedef struct xl_hash_vacuum_one_page
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 548570fc077..8bd48dfa8a2 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/access/heapam.h
  *
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
index e5260065999..1b9ac6a0959 100644
--- a/src/include/access/htup_details.h
+++ b/src/include/access/htup_details.h
@@ -190,7 +190,7 @@ struct HeapTupleHeaderData
 #define HEAP_HASNULL			0x0001	/* has null attribute(s) */
 #define HEAP_HASVARWIDTH		0x0002	/* has variable-width attribute(s) */
 #define HEAP_HASEXTERNAL		0x0004	/* has external stored attribute(s) */
-#define HEAP_HASROWID			0x0008	/* has an ROWID field */
+#define HEAP_HASROWID			0x0008	/* has a ROWID field */
 #define HEAP_XMAX_KEYSHR_LOCK	0x0010	/* xmax is a key-shared locker */
 #define HEAP_COMBOCID			0x0020	/* t_cid is a combo CID */
 #define HEAP_XMAX_EXCL_LOCK		0x0040	/* xmax is exclusive locker */
diff --git a/src/include/access/slru.h b/src/include/access/slru.h
index e142800aab2..d5ca3447208 100644
--- a/src/include/access/slru.h
+++ b/src/include/access/slru.h
@@ -55,7 +55,7 @@ typedef enum
 /*
  * Shared-memory state
  *
- * ControlLock is used to protect access to the other fields, except
+ * SLRU bank locks are used to protect access to the other fields, except
  * latest_page_number, which uses atomics; see comment in slru.c.
  */
 typedef struct SlruSharedData
diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index 9e6e6e4b21b..a192b8261d4 100644
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -121,7 +121,9 @@ typedef enum TU_UpdateIndexes
 /*
  * When table_tuple_update, table_tuple_delete, or table_tuple_lock fail
  * because the target tuple is already outdated, they fill in this struct to
- * provide information to the caller about what happened.
+ * provide information to the caller about what happened. When those functions
+ * succeed, the contents of this struct should not be relied upon, except for
+ * `traversed`, which may be set in both success and failure cases.
  *
  * ctid is the target's ctid link: it is the same as the target's TID if the
  * target was deleted, or the location of the replacement tuple if the target
@@ -137,6 +139,9 @@ typedef enum TU_UpdateIndexes
  * tuple); otherwise cmax is zero.  (We make this restriction because
  * HeapTupleHeaderGetCmax doesn't work for tuples outdated in other
  * transactions.)
+ *
+ * traversed indicates if an update chain was followed in order to try to lock
+ * the target tuple.  (This may be set in both success and failure cases.)
  */
 typedef struct TM_FailureData
 {
@@ -1474,8 +1479,8 @@ table_tuple_delete(Relation rel, ItemPointer tid, CommandId cid,
  * Output parameters:
  *	tmfd - filled in failure cases (see below)
  *	lockmode - filled with lock mode acquired on tuple
- *  update_indexes - in success cases this is set to true if new index entries
- *		are required for this tuple
+ *	update_indexes - in success cases this is set if new index entries
+ *		are required for this tuple; see TU_UpdateIndexes
  *
  * Normal, successful return value is TM_Ok, which means we did actually
  * update it.  Failure return codes are TM_SelfModified, TM_Updated, and
@@ -1508,7 +1513,7 @@ table_tuple_update(Relation rel, ItemPointer otid, TupleTableSlot *slot,
  *
  * Input parameters:
  *	relation: relation containing tuple (caller must hold suitable lock)
- *	tid: TID of tuple to lock
+ *	tid: TID of tuple to lock (updated if an update chain was followed)
  *	snapshot: snapshot to use for visibility determinations
  *	cid: current command ID (used for visibility test, and stored into
  *		tuple's cmax if lock is successful)
@@ -1533,8 +1538,10 @@ table_tuple_update(Relation rel, ItemPointer otid, TupleTableSlot *slot,
  *	TM_WouldBlock: lock couldn't be acquired and wait_policy is skip
  *
  * In the failure cases other than TM_Invisible and TM_Deleted, the routine
- * fills *tmfd with the tuple's t_ctid, t_xmax, and, if possible, t_cmax.  See
- * comments for struct TM_FailureData for additional info.
+ * fills *tmfd with the tuple's t_ctid, t_xmax, and, if possible, t_cmax.
+ * Additionally, in both success and failure cases, tmfd->traversed is set if
+ * an update chain was followed.  See comments for struct TM_FailureData for
+ * additional info.
  */
 static inline TM_Result
 table_tuple_lock(Relation rel, ItemPointer tid, Snapshot snapshot,
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 679193a06b0..a04e47de5c0 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/access/transam.h
  *
diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h
index be21c6dd1a3..ea889bf9ec7 100644
--- a/src/include/access/visibilitymap.h
+++ b/src/include/access/visibilitymap.h
@@ -41,5 +41,6 @@ extern uint8 visibilitymap_get_status(Relation rel, BlockNumber heapBlk, Buffer
 extern void visibilitymap_count(Relation rel, BlockNumber *all_visible, BlockNumber *all_frozen);
 extern BlockNumber visibilitymap_prepare_truncate(Relation rel,
 												  BlockNumber nheapblocks);
+extern BlockNumber visibilitymap_truncation_length(BlockNumber nheapblocks);
 
 #endif							/* VISIBILITYMAP_H */
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 8f952d8dec3..ffeef562176 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/access/xlog.h
  */
@@ -216,6 +216,7 @@ extern XLogSegNo XLogGetLastRemovedSegno(void);
 extern XLogSegNo XLogGetOldestSegno(TimeLineID tli);
 extern void XLogSetAsyncXactLSN(XLogRecPtr asyncXactLSN);
 extern void XLogSetReplicationSlotMinimumLSN(XLogRecPtr lsn);
+extern XLogRecPtr XLogGetReplicationSlotMinimumLSN(void);
 
 extern void xlog_redo(struct XLogReaderState *record);
 extern void xlog_desc(StringInfo buf, struct XLogReaderState *record);
@@ -227,6 +228,7 @@ extern bool RecoveryInProgress(void);
 extern RecoveryState GetRecoveryState(void);
 extern bool XLogInsertAllowed(void);
 extern XLogRecPtr GetXLogInsertRecPtr(void);
+extern XLogRecPtr GetXLogInsertEndRecPtr(void);
 extern XLogRecPtr GetXLogWriteRecPtr(void);
 
 extern uint64 GetSystemIdentifier(void);
@@ -270,6 +272,7 @@ extern void SwitchIntoArchiveRecovery(XLogRecPtr EndRecPtr, TimeLineID replayTLI
 extern void ReachedEndOfBackup(XLogRecPtr EndRecPtr, TimeLineID tli);
 extern void SetInstallXLogFileSegmentActive(void);
 extern bool IsInstallXLogFileSegmentActive(void);
+extern void ResetInstallXLogFileSegmentActive(void);
 extern void XLogShutdownWalRcv(void);
 extern void SetCaseGucOption(char* path);
 extern int GetDatabaseStyleFromControl(char* path);
diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h
index 9e41c9f6e84..5464861f356 100644
--- a/src/include/access/xlogdefs.h
+++ b/src/include/access/xlogdefs.h
@@ -25,7 +25,8 @@ typedef uint64 XLogRecPtr;
  * WAL segment, initializing the first WAL page at WAL segment size, so no XLOG
  * record can begin at zero.
  */
-#define InvalidXLogRecPtr	0
+#define InvalidXLogRecPtr		0
+#define XLogRecPtrIsValid(r)	((r) != InvalidXLogRecPtr)
 #define XLogRecPtrIsInvalid(r)	((r) == InvalidXLogRecPtr)
 
 /*
diff --git a/src/include/access/xlogstats.h b/src/include/access/xlogstats.h
index 528a640524a..6ec6670d44c 100644
--- a/src/include/access/xlogstats.h
+++ b/src/include/access/xlogstats.h
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * xlogstats.h
- *		Definitions for WAL Statitstics
+ *		Definitions for WAL Statistics
  *
  * Copyright (c) 2022-2025, PostgreSQL Global Development Group
  *
diff --git a/src/include/c.h b/src/include/c.h
index aab7a91fc44..f4684ce37b5 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -11,7 +11,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/c.h
  *
@@ -225,6 +225,16 @@
 #define PG_USED_FOR_ASSERTS_ONLY pg_attribute_unused()
 #endif
 
+/*
+ * Our C and C++ compilers may have different ideas about which printf
+ * archetype best represents what src/port/snprintf.c can do.
+ */
+#ifndef __cplusplus
+#define PG_PRINTF_ATTRIBUTE PG_C_PRINTF_ATTRIBUTE
+#else
+#define PG_PRINTF_ATTRIBUTE PG_CXX_PRINTF_ATTRIBUTE
+#endif
+
 /* GCC supports format attributes */
 #if defined(__GNUC__)
 #define pg_attribute_format_arg(a) __attribute__((format_arg(a)))
@@ -520,8 +530,6 @@ typedef uint32 bits32;			/* >= 32 bits */
 /* snprintf format strings to use for 64-bit integers */
 #define INT64_FORMAT "%" PRId64
 #define UINT64_FORMAT "%" PRIu64
-#define INT64_HEX_FORMAT "%" PRIx64
-#define UINT64_HEX_FORMAT "%" PRIx64
 
 /*
  * 128-bit signed and unsigned integers
diff --git a/src/include/catalog/.gitignore b/src/include/catalog/.gitignore
index b580f734c71..7812bc25ddd 100644
--- a/src/include/catalog/.gitignore
+++ b/src/include/catalog/.gitignore
@@ -1,4 +1,5 @@
 /postgres.bki
+/postgres_oracle.bki
 /schemapg.h
 /syscache_ids.h
 /syscache_info.h
diff --git a/src/include/catalog/Makefile b/src/include/catalog/Makefile
index f9a4e8b0513..7f456818585 100644
--- a/src/include/catalog/Makefile
+++ b/src/include/catalog/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/Makefile
 #
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index fd7ce05b8ae..ba8e8c0fa5c 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -100,7 +100,7 @@ typedef struct ObjectAddresses ObjectAddresses;
 
 /*
  * Used to store the functions or packages found in pg_depend.
- * If arguments or return datatype of funtions(package subprocedures) reference %TYPE and %ROWTYPE,
+ * If arguments or return datatype of functions(package subprocedures) reference %TYPE and %ROWTYPE,
  * record the dependencies between function(or package) and the relation.
  */
 typedef struct
@@ -190,6 +190,8 @@ extern long changeDependenciesOn(Oid refClassId, Oid oldRefObjectId,
 extern Oid	getExtensionOfObject(Oid classId, Oid objectId);
 extern List *getAutoExtensionsOfObject(Oid classId, Oid objectId);
 
+extern Oid	getExtensionType(Oid extensionOid, const char *typname);
+
 extern bool sequenceIsOwned(Oid seqId, char deptype, Oid *tableId, int32 *colId);
 extern List *getOwnedSequences(Oid relid);
 extern Oid	getIdentitySequence(Relation rel, AttrNumber attnum, bool missing_ok);
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index dbd339e9df4..7f3a0ef5c6d 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -117,7 +117,8 @@ extern List *AddRelationNewConstraints(Relation rel,
 									   const char *queryString);
 extern List *AddRelationNotNullConstraints(Relation rel,
 										   List *constraints,
-										   List *old_notnulls);
+										   List *old_notnulls,
+										   List *existing_constraints);
 
 extern void RelationClearMissing(Relation rel);
 
diff --git a/src/include/catalog/meson.build b/src/include/catalog/meson.build
index 9b5dbf7073b..4c06401939d 100644
--- a/src/include/catalog/meson.build
+++ b/src/include/catalog/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 # Note: the order of this list determines the order in which the catalog
diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index 969515b4738..6e91ac96f0c 100644
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/namespace.h
  *
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 34b5a4eea55..b188b321cb4 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/pg_attribute.h
  *
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index 4afceb5c692..3a03b8d801a 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -263,7 +263,7 @@ extern HeapTuple findNotNullConstraintAttnum(Oid relid, AttrNumber attnum);
 extern HeapTuple findNotNullConstraint(Oid relid, const char *colname);
 extern HeapTuple findDomainNotNullConstraint(Oid typid);
 extern AttrNumber extractNotNullColumn(HeapTuple constrTup);
-extern bool AdjustNotNullInheritance(Oid relid, AttrNumber attnum,
+extern bool AdjustNotNullInheritance(Oid relid, AttrNumber attnum, const char *new_conname,
 									 bool is_local, bool is_no_inherit, bool is_notvalid);
 extern List *RelationGetNotNullConstraints(Oid relid, bool cooked,
 										   bool include_noinh);
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h
index 1985bbfe603..3cb75c7ed4b 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/pg_control.h
  *
diff --git a/src/include/catalog/pg_default_acl.h b/src/include/catalog/pg_default_acl.h
index a671d2b6331..6182e5c32fd 100644
--- a/src/include/catalog/pg_default_acl.h
+++ b/src/include/catalog/pg_default_acl.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/pg_default_acl.h
  *
diff --git a/src/include/catalog/pg_force_view.h b/src/include/catalog/pg_force_view.h
index c47d388a144..d0e2e51bab2 100644
--- a/src/include/catalog/pg_force_view.h
+++ b/src/include/catalog/pg_force_view.h
@@ -5,7 +5,7 @@
  *
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/catalog/pg_force_view.h
@@ -74,4 +74,4 @@ MAKE_SYSCACHE(FORCEVIEWOID, pg_force_view_fvoid_index, 16);
 #define		  IDENT_CASE_LOWERCASE		'l'		/* LOWERCASE */
 #define		  IDENT_CASE_UNDEFINE		'u'		/* UNDEFINE */
 
-#endif							/* PG_FORCE_VIEW_H */
\ No newline at end of file
+#endif							/* PG_FORCE_VIEW_H */
diff --git a/src/include/catalog/pg_namespace.dat b/src/include/catalog/pg_namespace.dat
index 956263a5225..aabec1e68eb 100644
--- a/src/include/catalog/pg_namespace.dat
+++ b/src/include/catalog/pg_namespace.dat
@@ -5,7 +5,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/pg_namespace.dat
 #
diff --git a/src/include/catalog/pg_package.h b/src/include/catalog/pg_package.h
index f1998e82a95..95a0d03c4ee 100644
--- a/src/include/catalog/pg_package.h
+++ b/src/include/catalog/pg_package.h
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package
  *
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/catalog/pg_package.h
diff --git a/src/include/catalog/pg_package_body.h b/src/include/catalog/pg_package_body.h
index 09d12632020..58658299cd9 100644
--- a/src/include/catalog/pg_package_body.h
+++ b/src/include/catalog/pg_package_body.h
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package Body
  *
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/catalog/pg_package_body.h
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index fa2ca8978c7..642cf77d0b5 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -5,7 +5,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/pg_proc.dat
 #
@@ -12583,8 +12583,8 @@
   proname => 'get_parameter_description', prorows => '8',
   proretset => 't', provolatile => 's', prorettype => 'record',
   proargtypes => 'text',
-  proallargtypes => '{text,text,int4}', proargmodes => '{i,o,o}',
-  proargnames => '{query,name,position}',
+  proallargtypes => '{text,text,int4,text}', proargmodes => '{i,o,o,o}',
+  proargnames => '{query,name,position,hint}',
   prosrc => 'get_parameter_description' },
 /*BEGIN Oracle Compatibility Metadatas*/
 { oid => '9101', descr => 'call this function for execution of PL/iSQL procedures',
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 2dfc8d1b47a..040013e6288 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/pg_proc.h
  *
diff --git a/src/include/catalog/pg_sequence.h b/src/include/catalog/pg_sequence.h
index c2ba6c1b9c7..0e7cc759889 100644
--- a/src/include/catalog/pg_sequence.h
+++ b/src/include/catalog/pg_sequence.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/catalog/pg_sequence.h
  *
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index c91797c869c..f458447a0e5 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -85,7 +85,7 @@ typedef struct SubscriptionRelState
 extern void AddSubscriptionRelState(Oid subid, Oid relid, char state,
 									XLogRecPtr sublsn, bool retain_lock);
 extern void UpdateSubscriptionRelState(Oid subid, Oid relid, char state,
-									   XLogRecPtr sublsn);
+									   XLogRecPtr sublsn, bool already_locked);
 extern char GetSubscriptionRelState(Oid subid, Oid relid, XLogRecPtr *sublsn);
 extern void RemoveSubscriptionRel(Oid subid, Oid relid);
 
diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
index 18a39080311..fe221e15907 100644
--- a/src/include/catalog/pg_type.dat
+++ b/src/include/catalog/pg_type.dat
@@ -5,7 +5,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/pg_type.dat
 #
diff --git a/src/include/catalog/reformat_dat_file.pl b/src/include/catalog/reformat_dat_file.pl
index 7b7cf35d3f3..1cbd6459d41 100755
--- a/src/include/catalog/reformat_dat_file.pl
+++ b/src/include/catalog/reformat_dat_file.pl
@@ -12,7 +12,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/reformat_dat_file.pl
 #
diff --git a/src/include/catalog/unused_oids b/src/include/catalog/unused_oids
index 69ecbf09f5a..2a17fe5ed75 100755
--- a/src/include/catalog/unused_oids
+++ b/src/include/catalog/unused_oids
@@ -13,7 +13,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/include/catalog/unused_oids
 #
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index f75c3df9556..aaec7314c10 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -46,4 +46,7 @@ extern void HandleNotifyInterrupt(void);
 /* process interrupts */
 extern void ProcessNotifyInterrupt(bool flush);
 
+/* freeze old transaction IDs in notify queue (called by VACUUM) */
+extern void AsyncNotifyFreezeXids(TransactionId newFrozenXid);
+
 #endif							/* ASYNC_H */
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index bd8d279ae54..1ba0e9f7a14 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/commands/defrem.h
  *
@@ -88,7 +88,7 @@ extern void RemoveOperatorById(Oid operOid);
 extern ObjectAddress AlterOperator(AlterOperatorStmt *stmt);
 
 /* commands/statscmds.c */
-extern ObjectAddress CreateStatistics(CreateStatsStmt *stmt);
+extern ObjectAddress CreateStatistics(CreateStatsStmt *stmt, bool check_rights);
 extern ObjectAddress AlterStatistics(AlterStatsStmt *stmt);
 extern void RemoveStatisticsById(Oid statsOid);
 extern void RemoveStatisticsDataById(Oid statsOid, bool inh);
diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h
index 24419bfb5c9..6525f443c79 100644
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -52,6 +52,8 @@ extern char *get_extension_name(Oid ext_oid);
 extern Oid	get_extension_schema(Oid ext_oid);
 extern bool extension_file_exists(const char *extensionName);
 
+extern Oid	get_function_sibling_type(Oid funcoid, const char *typname);
+
 extern ObjectAddress AlterExtensionNamespace(const char *extensionName, const char *newschema,
 											 Oid *oldschema);
 
diff --git a/src/include/commands/packagecmds.h b/src/include/commands/packagecmds.h
index bc5db14ee24..9dd0d8e02b3 100644
--- a/src/include/commands/packagecmds.h
+++ b/src/include/commands/packagecmds.h
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package
  *
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/commands/packagecmds.h
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 607b2befba3..02dc19272b3 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/commands/sequence.h
  *
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 2ed2c4bb378..54be07c9e42 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -78,7 +78,9 @@ typedef struct TransitionCaptureState
 	/*
 	 * Private data including the tuplestore(s) into which to insert tuples.
 	 */
-	struct AfterTriggersTableData *tcs_private;
+	struct AfterTriggersTableData *tcs_insert_private;
+	struct AfterTriggersTableData *tcs_update_private;
+	struct AfterTriggersTableData *tcs_delete_private;
 } TransitionCaptureState;
 
 /*
@@ -213,7 +215,8 @@ extern bool ExecBRDeleteTriggers(EState *estate,
 								 HeapTuple fdw_trigtuple,
 								 TupleTableSlot **epqslot,
 								 TM_Result *tmresult,
-								 TM_FailureData *tmfd);
+								 TM_FailureData *tmfd,
+								 bool is_merge_delete);
 extern void ExecARDeleteTriggers(EState *estate,
 								 ResultRelInfo *relinfo,
 								 ItemPointer tupleid,
@@ -235,7 +238,8 @@ extern bool ExecBRUpdateTriggers(EState *estate,
 								 HeapTuple fdw_trigtuple,
 								 TupleTableSlot *newslot,
 								 TM_Result *tmresult,
-								 TM_FailureData *tmfd);
+								 TM_FailureData *tmfd,
+								 bool is_merge_update);
 extern void ExecARUpdateTriggers(EState *estate,
 								 ResultRelInfo *relinfo,
 								 ResultRelInfo *src_partinfo,
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h
index cd205287861..0ca134499e1 100644
--- a/src/include/common/fe_memutils.h
+++ b/src/include/common/fe_memutils.h
@@ -41,6 +41,16 @@ extern void *pg_malloc_extended(size_t size, int flags);
 extern void *pg_realloc(void *ptr, size_t size);
 extern void pg_free(void *ptr);
 
+/*
+ * Support for safe calculation of memory request sizes
+ */
+extern Size add_size(Size s1, Size s2);
+extern Size mul_size(Size s1, Size s2);
+extern void *pg_malloc_mul(Size s1, Size s2);
+extern void *pg_malloc0_mul(Size s1, Size s2);
+extern void *pg_malloc_mul_extended(Size s1, Size s2, int flags);
+extern void *pg_realloc_mul(void *p, Size s1, Size s2);
+
 /*
  * Variants with easier notation and more type safety
  */
@@ -54,14 +64,15 @@ extern void pg_free(void *ptr);
 /*
  * Allocate space for "count" objects of type "type"
  */
-#define pg_malloc_array(type, count) ((type *) pg_malloc(sizeof(type) * (count)))
-#define pg_malloc0_array(type, count) ((type *) pg_malloc0(sizeof(type) * (count)))
+#define pg_malloc_array(type, count) ((type *) pg_malloc_mul(sizeof(type), count))
+#define pg_malloc0_array(type, count) ((type *) pg_malloc0_mul(sizeof(type), count))
+#define pg_malloc_array_extended(type, count, flags) ((type *) pg_malloc_mul_extended(sizeof(type), count, flags))
 
 /*
  * Change size of allocation pointed to by "pointer" to have space for "count"
  * objects of type "type"
  */
-#define pg_realloc_array(pointer, type, count) ((type *) pg_realloc(pointer, sizeof(type) * (count)))
+#define pg_realloc_array(pointer, type, count) ((type *) pg_realloc_mul(pointer, sizeof(type), count))
 
 /* Equivalent functions, deliberately named the same as backend functions */
 extern char *pstrdup(const char *in);
@@ -71,12 +82,17 @@ extern void *palloc0(Size size);
 extern void *palloc_extended(Size size, int flags);
 extern void *repalloc(void *pointer, Size size);
 extern void pfree(void *pointer);
+extern void *palloc_mul(Size s1, Size s2);
+extern void *palloc0_mul(Size s1, Size s2);
+extern void *palloc_mul_extended(Size s1, Size s2, int flags);
+extern void *repalloc_mul(void *p, Size s1, Size s2);
 
 #define palloc_object(type) ((type *) palloc(sizeof(type)))
 #define palloc0_object(type) ((type *) palloc0(sizeof(type)))
-#define palloc_array(type, count) ((type *) palloc(sizeof(type) * (count)))
-#define palloc0_array(type, count) ((type *) palloc0(sizeof(type) * (count)))
-#define repalloc_array(pointer, type, count) ((type *) repalloc(pointer, sizeof(type) * (count)))
+#define palloc_array(type, count) ((type *) palloc_mul(sizeof(type), count))
+#define palloc0_array(type, count) ((type *) palloc0_mul(sizeof(type), count))
+#define palloc_array_extended(type, count, flags) ((type *) palloc_mul_extended(sizeof(type), count, flags))
+#define repalloc_array(pointer, type, count) ((type *) repalloc_mul(pointer, sizeof(type), count))
 
 /* sprintf into a palloc'd buffer --- these are in psprintf.c */
 extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/include/common/int.h b/src/include/common/int.h
index 3973f13379d..435716b7906 100644
--- a/src/include/common/int.h
+++ b/src/include/common/int.h
@@ -601,6 +601,73 @@ pg_neg_u64_overflow(uint64 a, int64 *result)
 #endif
 }
 
+/*
+ * size_t
+ */
+static inline bool
+pg_add_size_overflow(size_t a, size_t b, size_t *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_add_overflow(a, b, result);
+#else
+	size_t		res = a + b;
+
+	if (res < a)
+	{
+		*result = 0x5EED;		/* to avoid spurious warnings */
+		return true;
+	}
+	*result = res;
+	return false;
+#endif
+}
+
+static inline bool
+pg_sub_size_overflow(size_t a, size_t b, size_t *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_sub_overflow(a, b, result);
+#else
+	if (b > a)
+	{
+		*result = 0x5EED;		/* to avoid spurious warnings */
+		return true;
+	}
+	*result = a - b;
+	return false;
+#endif
+}
+
+static inline bool
+pg_mul_size_overflow(size_t a, size_t b, size_t *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_mul_overflow(a, b, result);
+#else
+	size_t		res = a * b;
+
+	if (a != 0 && b != res / a)
+	{
+		*result = 0x5EED;		/* to avoid spurious warnings */
+		return true;
+	}
+	*result = res;
+	return false;
+#endif
+}
+
+/*
+ * pg_neg_size_overflow is currently omitted, to avoid having to reason about
+ * the portability of SSIZE_MIN/_MAX before a use case exists.
+ */
+/*
+ * static inline bool
+ * pg_neg_size_overflow(size_t a, ssize_t *result)
+ * {
+ *     ...
+ * }
+ */
+
 /*------------------------------------------------------------------------
  *
  * Comparison routines for integer types.
diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 446886c0225..4c0229ee3a0 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/executor/execExpr.h
  *
@@ -652,6 +652,10 @@ typedef struct ExprEvalStep
 		{
 			bool		has_nulls;
 			bool		inclause;	/* true for IN and false for NOT IN */
+			bool		null_lhs_result;	/* for non-strict lookups, we
+											 * cache what looking up NULL
+											 * returns. */
+			bool		null_lhs_isnull;
 			struct ScalarArrayOpExprHashTable *elements_tab;
 			FmgrInfo   *finfo;	/* function's lookup data */
 			FunctionCallInfo fcinfo_data;	/* arguments etc */
diff --git a/src/include/executor/execScan.h b/src/include/executor/execScan.h
index 837ea7785bb..2003cbc7ed5 100644
--- a/src/include/executor/execScan.h
+++ b/src/include/executor/execScan.h
@@ -49,16 +49,24 @@ ExecScanFetch(ScanState *node,
 		{
 			/*
 			 * This is a ForeignScan or CustomScan which has pushed down a
-			 * join to the remote side.  The recheck method is responsible not
-			 * only for rechecking the scan/join quals but also for storing
-			 * the correct tuple in the slot.
+			 * join to the remote side.  If it is a descendant node in the EPQ
+			 * recheck plan tree, run the recheck method function.  Otherwise,
+			 * run the access method function below.
 			 */
+			if (bms_is_member(epqstate->epqParam, node->ps.plan->extParam))
+			{
+				/*
+				 * The recheck method is responsible not only for rechecking
+				 * the scan/join quals but also for storing the correct tuple
+				 * in the slot.
+				 */
 
-			TupleTableSlot *slot = node->ss_ScanTupleSlot;
+				TupleTableSlot *slot = node->ss_ScanTupleSlot;
 
-			if (!(*recheckMtd) (node, slot))
-				ExecClearTuple(slot);	/* would not be returned by scan */
-			return slot;
+				if (!(*recheckMtd) (node, slot))
+					ExecClearTuple(slot);	/* would not be returned by scan */
+				return slot;
+			}
 		}
 		else if (epqstate->relsubs_done[scanrelid - 1])
 		{
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 54057c84029..6a8553d6a1c 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -243,7 +243,9 @@ extern void standard_ExecutorEnd(QueryDesc *queryDesc);
 extern void ExecutorRewind(QueryDesc *queryDesc);
 extern bool ExecCheckPermissions(List *rangeTable,
 								 List *rteperminfos, bool ereport_on_violation);
+extern bool ExecCheckOneRelPerms(RTEPermissionInfo *perminfo);
 extern void CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation,
+								OnConflictAction onConflictAction,
 								List *mergeActions);
 extern void InitResultRelInfo(ResultRelInfo *resultRelInfo,
 							  Relation resultRelationDesc,
diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h
index a7d41a88806..e3c77c94444 100644
--- a/src/include/executor/nodeModifyTable.h
+++ b/src/include/executor/nodeModifyTable.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/executor/nodeModifyTable.h
  *
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 7df7579bc28..66628228262 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -1,7 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * spi_priv.h
- *				Server Programming Interface private declarations
+ *				Server Programming Interface private
+ *declarations
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -16,8 +17,7 @@
 #include "executor/spi.h"
 #include "utils/queryenvironment.h"
 
-
-#define _SPI_PLAN_MAGIC		569278163
+#define _SPI_PLAN_MAGIC 569278163
 
 typedef struct
 {
@@ -46,7 +46,9 @@ typedef struct
 	uint64		outer_processed;
 	SPITupleTable *outer_tuptable;
 	int			outer_result;
-	void		*current_func;	/* remember current invoke func */
+
+	/* remember current invoke func */
+	void	   *current_func;
 } _SPI_connection;
 
 /*
diff --git a/src/include/fe_utils/astreamer.h b/src/include/fe_utils/astreamer.h
index 0e0031741fa..005141ea8b3 100644
--- a/src/include/fe_utils/astreamer.h
+++ b/src/include/fe_utils/astreamer.h
@@ -83,8 +83,10 @@ typedef struct
 	mode_t		mode;
 	uid_t		uid;
 	gid_t		gid;
+	/* note: special filetypes will set none of these flags */
+	bool		is_regular;
 	bool		is_directory;
-	bool		is_link;
+	bool		is_symlink;
 	char		linktarget[MAXPGPATH];
 } astreamer_member;
 
diff --git a/src/include/fe_utils/psqlscan_int.h b/src/include/fe_utils/psqlscan_int.h
index d18eb821f7b..4c34f391e4b 100644
--- a/src/include/fe_utils/psqlscan_int.h
+++ b/src/include/fe_utils/psqlscan_int.h
@@ -36,7 +36,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/fe_utils/psqlscan_int.h
  *
@@ -171,6 +171,15 @@ typedef struct psqlplus_cmd_print
 	print_list			*print_items;	/* if NULL print all bind variables */
 } psqlplus_cmd_print;
 
+/*
+ * EXECUTE command node
+ */
+typedef struct psqlplus_cmd_execute
+{
+	psqlplus_cmd_type	cmd_type;
+	char				*plisqlstmts;	/* plisql statements text */
+} psqlplus_cmd_execute;
+
 /*
  * All working state of the lexer must be stored in PsqlScanStateData
  * between calls.  This allows us to have multiple open lexer operations,
@@ -233,6 +242,7 @@ typedef struct PsqlScanStateData
 	bool		anonymous_label_start;	/* T if the first token is "<<" */
 	bool		anonymous_label_ident;	/* T if the second token is an identifier */
 	bool		anonymous_label_end;	/* T if the third token is ">>" */
+	bool		xcstate;				/* T If a C-style comment is being parsed */
 
 	/*
 	 * Case 2: DECLARE BEGIN ... END is Oracle anonymous block sytax.
diff --git a/src/include/fe_utils/string_utils.h b/src/include/fe_utils/string_utils.h
index a6861f34d99..ea95be5ca97 100644
--- a/src/include/fe_utils/string_utils.h
+++ b/src/include/fe_utils/string_utils.h
@@ -8,7 +8,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/fe_utils/string_utils.h
  *
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index 492beaa889e..c9626a9fa5e 100644
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/fmgr.h
  *
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 28e0de78b38..03e39b500a2 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -8,7 +8,7 @@
  * or call FUNCAPI-callable functions or macros.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2002-2025, PostgreSQL Global Development Group
  *
  * src/include/funcapi.h
@@ -156,55 +156,65 @@ typedef enum TypeFuncClass
 } TypeFuncClass;
 
 /*
- * function come from subproc
- * we should use function pointer to
- * get its informations, because its struct
- * is PLiSQL_xxx
+ * Subproc-provided function hooks
+ *
+ * Use function pointers to retrieve information about subproc-provided
+ * functions, since their concrete structures are PLiSQL_* and not visible
+ * to generic callers.
  */
 typedef struct
 {
-	TupleDesc (*get_internal_func_result_tupdesc) (FuncExpr *fexpr);
-	char* (*get_internal_func_name) (FuncExpr *fexpr);
+	TupleDesc	(*get_internal_func_result_tupdesc) (FuncExpr *fexpr);
+	char	   *(*get_internal_func_name) (FuncExpr *fexpr);
 	TypeFuncClass (*get_internal_func_result_type) (FuncExpr *fexpr,
-						 ReturnSetInfo *rsinfo,
-						 Oid *resultTypeId,
-						 TupleDesc *resultTupleDesc);
-	List* (*get_internal_func_outargs) (FuncExpr *fexpr);
-	char *(*get_inernal_func_result_name) (FuncExpr *fexpr);
-	void (*package_validator) (Oid objectId, bool is_body);
-	PackageCacheItem*  (*package_handle) (Oid objectId, bool is_body);
-	void* (*package_parse) (ParseState *pstate,
-							PackageCacheItem *item,
-							List *names,
-							int name_start,
-							package_parse_flags flag,
-							Oid *basetypeid, /* return value */
-							int32 *basetypmod,
-							int *entry_type, /* return value */
-							List **fargs, /* return value */
-							List *fargnames,
-							int nargs,
-							Oid *argtypes,
-							bool expand_variadic,
-							bool expand_defaults,
-							Oid *funcid,	/* return value */
-							Oid *rettype,	/* return value */
-							bool *retset,	/* return value */
-							int *nvargs,	/* return value */
-							Oid *vatype,	/* return value */
-							Oid **true_typeids, /* return value */
-							List **argdefaults, /* return value */
-							void **pfunc,		/* return value */
-							bool missing_ok);
-	void (*package_free) (PackageCacheItem *item);
-	void (*package_free_list) (List *pkglist);
-	Oid (*get_top_function_id) (void *function, bool *is_package);
-	void (*get_subprocs_from_package) (Oid pkgoid, TupleDesc tupdesc,
-									Tuplestorestate *tupstore);
-	void (*compile_inline_internal)(char *proc_source);
-	void (*function_free) (Oid funcOid);
-	bool isload;
-} PLiSQL_funcs_call;
+													ReturnSetInfo *rsinfo,
+													Oid *resultTypeId,
+													TupleDesc *resultTupleDesc);
+	List	   *(*get_internal_func_outargs) (FuncExpr *fexpr);
+	char	   *(*get_inernal_func_result_name) (FuncExpr *fexpr);
+	void		(*package_validator) (Oid objectId, bool is_body);
+	PackageCacheItem *(*package_handle) (Oid objectId, bool is_body);
+	void	   *(*package_parse) (ParseState *pstate,
+								  PackageCacheItem * item,
+								  List *names,
+								  int name_start,
+								  package_parse_flags flag,
+								  Oid *basetypeid,	/* return value */
+								  int32 *basetypmod,
+								  int *entry_type,	/* return value */
+								  List **fargs, /* return value */
+								  List *fargnames,
+								  int nargs,
+								  Oid *argtypes,
+								  bool expand_variadic,
+								  bool expand_defaults,
+								  Oid *funcid,	/* return value */
+								  Oid *rettype, /* return value */
+								  bool *retset, /* return value */
+								  int *nvargs,	/* return value */
+								  Oid *vatype,	/* return value */
+								  Oid **true_typeids,	/* return value */
+								  List **argdefaults,	/* return value */
+								  void **pfunc, /* return value */
+								  bool missing_ok);
+	void		(*package_free) (PackageCacheItem * item);
+	void		(*package_free_list) (List *pkglist);
+	Oid			(*get_top_function_id) (void *function, bool *is_package);
+	void		(*get_subprocs_from_package) (Oid pkgoid, TupleDesc tupdesc,
+											  Tuplestorestate *tupstore);
+	int (*get_subproc_arg_info) (FuncExpr *fexpr,
+					Oid **p_argtypes,
+					char ***p_argnames,
+					char **p_argmodes);
+	char (*get_subproc_prokind) (FuncExpr *fexpr);
+	bool (*subproc_should_change_return_type) (FuncExpr *fexpr,
+							Oid *rettype,
+							int32 *typmod,
+							Oid *collationoid);
+	void		(*compile_inline_internal) (char *proc_source);
+	void		(*function_free) (Oid funcOid);
+	bool		isload;
+}			PLiSQL_funcs_call;
 
 extern PGDLLIMPORT PLiSQL_funcs_call plisql_internal_funcs;
 
@@ -238,14 +248,14 @@ extern TupleDesc build_function_result_tupdesc_d(char prokind,
 												 Datum proallargtypes,
 												 Datum proargmodes,
 												 Datum proargnames,
-												 Datum proargtypenames); 
+												 Datum proargtypenames);
 extern TupleDesc build_function_result_tupdesc_t(HeapTuple procTuple);
 extern TupleDesc build_plisql_function_result_tupdesc_d(char prokind,
-								Datum proallargtypes,
-								Datum proargmodes,
-								Datum proargnames,
-								Oid prorettype,
-								Datum proargtypenames);
+														Datum proallargtypes,
+														Datum proargmodes,
+														Datum proargnames,
+														Oid prorettype,
+														Datum proargtypenames);
 
 
 extern bool resolve_polymorphic_tupdesc(TupleDesc tupdesc,
@@ -253,21 +263,31 @@ extern bool resolve_polymorphic_tupdesc(TupleDesc tupdesc,
 										Node *call_expr);
 extern TypeFuncClass get_type_func_class(Oid typid, Oid *base_typeid);
 extern TupleDesc build_internal_function_result_tupdesc_t(FuncExpr *fexpr);
-extern char	*get_internal_function_name(FuncExpr *fexpr);
+extern char *get_internal_function_name(FuncExpr *fexpr);
 extern TypeFuncClass get_internal_function_result_type(FuncExpr *fexpr,
-						 ReturnSetInfo *rsinfo,
-						 Oid *resultTypeId,
-						 TupleDesc *resultTupleDesc);
+													   ReturnSetInfo *rsinfo,
+													   Oid *resultTypeId,
+													   TupleDesc *resultTupleDesc);
 extern TypeFuncClass external_get_type_func_class(Oid typid, Oid *base_typeid);
 extern List *get_internal_function_outargs(FuncExpr *fexpr);
 extern char *get_internal_function_result_name(FuncExpr *fexpr);
-extern bool	func_should_change_return_type(Oid functionId, Oid *rettype,
-								int32 *typmod, Oid *collationoid);
+extern bool func_should_change_return_type(Oid functionId, Oid *rettype,
+										   int32 *typmod, Oid *collationoid);
 
 
 extern void get_func_typename_info(HeapTuple procTup,
-					char ***p_argtypeNames,
-					char **rettypeName);
+								   char ***p_argtypeNames,
+								   char **rettypeName);
+extern char get_subproc_kind(FuncExpr *fexpr);
+extern int get_subproc_arg_info(FuncExpr *fexpr,
+					Oid **p_argtypes,
+					char ***p_argnames,
+					char **p_argmodes);
+extern bool subproc_should_change_return_type(FuncExpr *fexpr,
+						Oid *rettype,
+						int32 *typmod,
+						Oid *collationoid);
+
 
 extern char get_func_prostatus(HeapTuple procTup);
 extern void change_func_prostatus(Oid funcOid, char prostatus);
@@ -318,6 +338,7 @@ HeapTupleGetDatum(const HeapTupleData *tuple)
 {
 	return HeapTupleHeaderGetDatum(tuple->t_data);
 }
+
 /* obsolete version of above */
 #define TupleGetDatum(_slot, _tuple)	HeapTupleGetDatum(_tuple)
 
diff --git a/src/include/jit/SectionMemoryManager.h b/src/include/jit/SectionMemoryManager.h
index 924a99b0d33..4c9bd1c7f01 100644
--- a/src/include/jit/SectionMemoryManager.h
+++ b/src/include/jit/SectionMemoryManager.h
@@ -1,5 +1,5 @@
 /*
- * This is a copy LLVM source code modified by the PostgreSQL project.
+ * This is a copy of LLVM source code modified by the PostgreSQL project.
  * See SectionMemoryManager.cpp for notes on provenance and license.
  */
 
diff --git a/src/include/jit/llvmjit_backport.h b/src/include/jit/llvmjit_backport.h
index cba8eafc4f3..71cfdfc832f 100644
--- a/src/include/jit/llvmjit_backport.h
+++ b/src/include/jit/llvmjit_backport.h
@@ -8,14 +8,14 @@
 #include <llvm/Config/llvm-config.h>
 
 /*
- * LLVM's RuntimeDyld can produce code that crashes on larger memory ARM
+ * Pre-LLVM 22 RuntimeDyld can produce code that crashes on large memory ARM
  * systems, because llvm::SectionMemoryManager allocates multiple pieces of
  * memory that can be placed too far apart for the generated code.  See
  * src/backend/jit/llvm/SectionMemoryManager.cpp for the patched replacement
  * class llvm::backport::SectionMemoryManager that we use as a workaround.
  * This header controls whether we use it.
  */
-#if defined(__aarch64__)
+#if defined(__aarch64__) && LLVM_VERSION_MAJOR < 22
 #define USE_LLVM_BACKPORT_SECTION_MEMORY_MANAGER
 #endif
 
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
index 327274c2340..9622131ede6 100644
--- a/src/include/lib/simplehash.h
+++ b/src/include/lib/simplehash.h
@@ -1044,6 +1044,10 @@ SH_START_ITERATE_AT(SH_TYPE * tb, SH_ITERATOR * iter, uint32 at)
 SH_SCOPE	SH_ELEMENT_TYPE *
 SH_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)
 {
+	/* validate sanity of the given iterator */
+	Assert(iter->cur < tb->size);
+	Assert(iter->end < tb->size);
+
 	while (!iter->done)
 	{
 		SH_ELEMENT_TYPE *elem;
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 77bde939b2c..e9715ef797f 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/libpq/libpq-be.h
  *
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index ef72874c6e9..758d8383354 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -704,7 +704,14 @@ extern int	pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2);
 extern int	pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n);
 extern int	pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n);
 extern size_t pg_wchar_strlen(const pg_wchar *str);
+extern int	pg_mblen_cstr(const char *mbstr);
+extern int	pg_mblen_range(const char *mbstr, const char *end);
+extern int	pg_mblen_with_len(const char *mbstr, int limit);
+extern int	pg_mblen_unbounded(const char *mbstr);
+
+/* deprecated */
 extern int	pg_mblen(const char *mbstr);
+
 extern int	pg_dsplen(const char *mbstr);
 extern int	pg_mbstrlen(const char *mbstr);
 extern int	pg_mbstrlen_with_len(const char *mbstr, int limit);
diff --git a/src/include/meson.build b/src/include/meson.build
index 3fc5d10299e..97b8b3a85b0 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 pg_config_os = configure_file(
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 1bef98471c3..9a7d733ddef 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -114,7 +114,8 @@ extern void ProcessInterrupts(void);
 	(unlikely(InterruptPending))
 #else
 #define INTERRUPTS_PENDING_CONDITION() \
-	(unlikely(UNBLOCKED_SIGNAL_QUEUE()) ? pgwin32_dispatch_queued_signals() : 0, \
+	(unlikely(UNBLOCKED_SIGNAL_QUEUE()) ? \
+	 pgwin32_dispatch_queued_signals() : (void) 0, \
 	 unlikely(InterruptPending))
 #endif
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 2492282213f..409e172bfb6 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -173,12 +173,13 @@ typedef struct ExprState
  *		UniqueProcs
  *		UniqueStrats
  *		Unique				is it a unique index?
- *		OpclassOptions		opclass-specific options, or NULL if none
+ *		NullsNotDistinct	is NULLS NOT DISTINCT?
  *		ReadyForInserts		is it valid for inserts?
  *		CheckedUnchanged	IndexUnchanged status determined yet?
  *		IndexUnchanged		aminsert hint, cached for retail inserts
  *		Concurrent			are we doing a concurrent index build?
  *		BrokenHotChain		did we detect any broken HOT chains?
+ *		WithoutOverlaps		is it a WITHOUT OVERLAPS index?
  *		Summarizing			is it a summarizing index?
  *		ParallelWorkers		# of workers requested (excludes leader)
  *		Am					Oid of index AM
@@ -601,15 +602,13 @@ typedef struct ResultRelInfo
 	bool		ri_RootToChildMapValid;
 
 	/*
-	 * Information needed by tuple routing target relations
+	 * Other information needed by child result relations
 	 *
-	 * RootResultRelInfo gives the target relation mentioned in the query, if
-	 * it's a partitioned table. It is not set if the target relation
-	 * mentioned in the query is an inherited table, nor when tuple routing is
-	 * not needed.
+	 * ri_RootResultRelInfo gives the target relation mentioned in the query.
+	 * Used as the root for tuple routing and/or transition capture.
 	 *
-	 * PartitionTupleSlot is non-NULL if RootToChild conversion is needed and
-	 * the relation is a partition.
+	 * ri_PartitionTupleSlot is non-NULL if the relation is a partition to
+	 * route tuples into and ri_RootToChildMap conversion is needed.
 	 */
 	struct ResultRelInfo *ri_RootResultRelInfo;
 	TupleTableSlot *ri_PartitionTupleSlot;
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 478718dbcdf..c3a191bf83d 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -96,6 +96,7 @@ typedef struct ParamExternData
 	uint16		pflags;			/* flag bits, see above */
 	Oid			ptype;			/* parameter's datatype, or 0 */
 	char 		pmode;			/* parameter's mode, IN, OUT, or INOUT */
+	int32		ptypmod;		/* the typmod of parameter's datatype, or -1 for types that do not need typmod */
 } ParamExternData;
 
 typedef struct ParamListInfoData *ParamListInfo;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 83b1818d724..d84012cd63a 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -14,7 +14,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/nodes/parsenodes.h
  *
@@ -1284,7 +1284,7 @@ typedef struct RangeTblEntry
 	 * Fields valid for a GROUP RTE (else NIL):
 	 */
 	/* list of grouping expressions */
-	List	   *groupexprs pg_node_attr(query_jumble_ignore);
+	List	   *groupexprs;
 
 	/*
 	 * Fields valid in all RTEs:
@@ -3611,6 +3611,8 @@ typedef struct DoStmt
 	NodeTag		type;
 	List	   *args;			/* List of DefElem nodes */
 	List		*paramsmode;	/* List of parameter mode */
+	List		*paramslen;		/* List of length for parameter datatypes */
+	bool		do_from_call;	/* T if DoStmt is come from CallStmt */
 } DoStmt;
 
 typedef struct InlineCodeBlock
@@ -3622,6 +3624,7 @@ typedef struct InlineCodeBlock
 	Oid			langOid;		/* OID of selected language */
 	bool		langIsTrusted;	/* trusted property of the language */
 	bool		atomic;			/* atomic execution context */
+	bool		do_from_call;
 	ParamListInfo params;		
 } InlineCodeBlock;
 
@@ -3645,6 +3648,8 @@ typedef struct CallStmt
 	FuncExpr   *funcexpr;
 	/* transformed output-argument expressions */
 	List	   *outargs;
+	OraParamRef	*hostvariable;	/* only used for get_parameter_descr() */
+	char	   *callinto;		/* rewrite CALL INTO to a PL assign stmt */
 } CallStmt;
 
 typedef struct CallContext
@@ -4394,21 +4399,21 @@ typedef struct AccessibleByClause
 } AccessibleByClause;
 
 /*
- * support alter a function like
+ * support alter a function like:
  * alter function func editable|noneditable or compile
- * we doesn't use the AlterFunctionStmt, because we doesn't
+ * we don't use the AlterFunctionStmt, because we don't
  * want to use AlterFunction function, which will modify the
  * pg_proc catalog table,compile doesn't change the system catalog.
- * another reason is AlterFunction which fun should
+ * another reason is AlterFunction which should
  * bring function arguments and find function rely on its
- * arguments, this struct will doesn't consider function arguments.
+ * arguments, this struct will not consider function arguments.
  */
 typedef struct CompileFunctionStmt
 {
 	NodeTag		type;
 	ObjectType	objtype;
 	ObjectWithArgs *func;		/* name and args of function */
-	bool		is_compile;		/* if false, it is change the editable|noneditable */
+	bool		is_compile;		
 	bool		editable;
 	List		*parameters;
 } CompileFunctionStmt;
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index 6567759595d..6eef1450e04 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -1099,9 +1099,10 @@ typedef struct RelOptInfo
  * IndexOptInfo
  *		Per-index information for planning/optimization
  *
- *		indexkeys[], indexcollations[] each have ncolumns entries.
- *		opfamily[], and opcintype[]	each have nkeycolumns entries. They do
- *		not contain any information about included attributes.
+ *		indexkeys[] and canreturn[] each have ncolumns entries.
+ *
+ *		indexcollations[], opfamily[], and opcintype[] each have nkeycolumns
+ *		entries.  These don't contain any information about INCLUDE columns.
  *
  *		sortopfamily[], reverse_sort[], and nulls_first[] have
  *		nkeycolumns entries, if the index is ordered; but if it is unordered,
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 4584debee1e..a56b4203653 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -9,7 +9,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/nodes/primnodes.h
  *
diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h
index 7fc3072640c..238affbf8ef 100644
--- a/src/include/nodes/value.h
+++ b/src/include/nodes/value.h
@@ -4,7 +4,7 @@
  *	  interface for value nodes
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 2003-2025, PostgreSQL Global Development Group
  *
  * src/include/nodes/value.h
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 8410531f2d6..70380276c84 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -80,6 +80,7 @@ extern bool indexcol_is_bool_constant_for_query(PlannerInfo *root,
 												int indexcol);
 extern bool match_index_to_operand(Node *operand, int indexcol,
 								   IndexOptInfo *index);
+extern Node *strip_phvs_in_index_operand(Node *operand);
 extern void check_index_predicates(PlannerInfo *root, RelOptInfo *rel);
 
 /*
diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h
index db92d8861ba..0186f18bb06 100644
--- a/src/include/optimizer/placeholder.h
+++ b/src/include/optimizer/placeholder.h
@@ -32,5 +32,6 @@ extern bool contain_placeholder_references_to(PlannerInfo *root, Node *clause,
 											  int relid);
 extern Relids get_placeholder_nulling_relids(PlannerInfo *root,
 											 PlaceHolderInfo *phinfo);
+extern Node *strip_noop_phvs(Node *node);
 
 #endif							/* PLACEHOLDER_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index cd74e4b1e8b..ac80458467b 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -72,6 +72,8 @@ extern double get_function_rows(PlannerInfo *root, Oid funcid, Node *node);
 
 extern bool has_row_triggers(PlannerInfo *root, Index rti, CmdType event);
 
+extern bool has_transition_tables(PlannerInfo *root, Index rti, CmdType event);
+
 extern bool has_stored_generated_columns(PlannerInfo *root, Index rti);
 
 extern Bitmapset *get_dependent_generated_columns(PlannerInfo *root, Index rti,
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 9c355bf1179..8d2c1ec08ba 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -48,6 +48,11 @@ extern void apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target);
 extern void split_pathtarget_at_srfs(PlannerInfo *root,
 									 PathTarget *target, PathTarget *input_target,
 									 List **targets, List **targets_contain_srfs);
+extern void split_pathtarget_at_srfs_grouping(PlannerInfo *root,
+											  PathTarget *target,
+											  PathTarget *input_target,
+											  List **targets,
+											  List **targets_contain_srfs);
 
 /* Convenience macro to get a PathTarget with valid cost/width fields */
 #define create_pathtarget(root, tlist) \
diff --git a/src/include/oracle_fe_utils/ora_psqlscan.h b/src/include/oracle_fe_utils/ora_psqlscan.h
index 144a3e757d0..f39902881ca 100644
--- a/src/include/oracle_fe_utils/ora_psqlscan.h
+++ b/src/include/oracle_fe_utils/ora_psqlscan.h
@@ -14,7 +14,7 @@
  * Copyright:
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/oracle_fe_utils/ora_psqlscan.h
  *
diff --git a/src/include/oracle_fe_utils/ora_string_utils.h b/src/include/oracle_fe_utils/ora_string_utils.h
index ed8a66e4cdd..d56f37a709f 100644
--- a/src/include/oracle_fe_utils/ora_string_utils.h
+++ b/src/include/oracle_fe_utils/ora_string_utils.h
@@ -19,7 +19,7 @@
  * assorted contexts.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/oracle_fe_utils/ora_string_utils.h
  *
diff --git a/src/include/oracle_parser/ora_keywords.h b/src/include/oracle_parser/ora_keywords.h
index ff52e623120..7ab591bdc9b 100644
--- a/src/include/oracle_parser/ora_keywords.h
+++ b/src/include/oracle_parser/ora_keywords.h
@@ -17,7 +17,7 @@
  *	  IvorySQL's list of SQL keywords
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/oracle_parser/ora_keywords.h
  *
diff --git a/src/include/oracle_parser/ora_kwlist.h b/src/include/oracle_parser/ora_kwlist.h
index 87a558fe583..d70666dd718 100644
--- a/src/include/oracle_parser/ora_kwlist.h
+++ b/src/include/oracle_parser/ora_kwlist.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/oracle_parser/ora_kwlist.h
@@ -83,7 +83,7 @@ PG_KEYWORD("binary_float", BINARY_FLOAT, COL_NAME_KEYWORD, BARE_LABEL)
 PG_KEYWORD("binary_float_infinity", BINARY_FLOAT_INFINITY, RESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("binary_float_nan", BINARY_FLOAT_NAN, RESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("bit", BIT, COL_NAME_KEYWORD, BARE_LABEL)
-PG_KEYWORD("body", BODY, UNRESERVED_KEYWORD, BARE_LABEL) 
+PG_KEYWORD("body", BODY, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("boolean", BOOLEAN_P, COL_NAME_KEYWORD, BARE_LABEL)
 PG_KEYWORD("both", BOTH, RESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("breadth", BREADTH, UNRESERVED_KEYWORD, BARE_LABEL)
@@ -200,6 +200,7 @@ PG_KEYWORD("expression", EXPRESSION, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("extend", EXTEND, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("extension", EXTENSION, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("external", EXTERNAL, UNRESERVED_KEYWORD, BARE_LABEL)
+PG_KEYWORD("extract", EXTRACT, COL_NAME_KEYWORD, BARE_LABEL)
 PG_KEYWORD("false", FALSE_P, RESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("family", FAMILY, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("fetch", FETCH, RESERVED_KEYWORD, AS_LABEL)
@@ -387,10 +388,11 @@ PG_KEYWORD("overriding", OVERRIDING, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("owned", OWNED, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("owner", OWNER, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("package", PACKAGE, UNRESERVED_KEYWORD, BARE_LABEL)
-PG_KEYWORD("packages", PACKAGES, UNRESERVED_KEYWORD, BARE_LABEL)	
+PG_KEYWORD("packages", PACKAGES, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("parallel", PARALLEL, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("parallel_enable", PARALLEL_ENABLE, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("parameter", PARAMETER, UNRESERVED_KEYWORD, BARE_LABEL)
+PG_KEYWORD("paramslength", PARAMSLENGTH, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("parser", PARSER, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("partial", PARTIAL, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("partition", PARTITION, UNRESERVED_KEYWORD, BARE_LABEL)
diff --git a/src/include/oracle_parser/ora_parser_hook.h b/src/include/oracle_parser/ora_parser_hook.h
index 044348c5784..11ab7a1184c 100644
--- a/src/include/oracle_parser/ora_parser_hook.h
+++ b/src/include/oracle_parser/ora_parser_hook.h
@@ -18,7 +18,7 @@
  *	 	for the Hook function's definitions.
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/oracle_parser/ora_parser_hook.h
  *
diff --git a/src/include/oracle_parser/ora_scanner.h b/src/include/oracle_parser/ora_scanner.h
index e8c34aa7ff6..25656266f64 100644
--- a/src/include/oracle_parser/ora_scanner.h
+++ b/src/include/oracle_parser/ora_scanner.h
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/oracle-parser/ora_scanner.h
  *
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 54c659a89c7..136d0befc6b 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parse_coerce.h
  *
diff --git a/src/include/parser/parse_merge.h b/src/include/parser/parse_merge.h
index 79361363e1c..1f0b477d954 100644
--- a/src/include/parser/parse_merge.h
+++ b/src/include/parser/parse_merge.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parse_merge.h
  *
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 287bdb000f2..809de02de96 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parse_node.h
  *
@@ -261,6 +261,7 @@ struct ParseState
 	uint16	    merge_on_attr_size;
 	uint8 	   *merge_on_attrno;
 	bool 		p_isVarParamState;
+	bool		do_from_call;
 };
 
 /*
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index d03971baa5b..67c9af25b49 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parse_oper.h
  *
diff --git a/src/include/parser/parse_package.h b/src/include/parser/parse_package.h
index 0ea9cc8fe2b..865a2b279b1 100644
--- a/src/include/parser/parse_package.h
+++ b/src/include/parser/parse_package.h
@@ -18,7 +18,7 @@
  * Abstract:
  *		Definitions for the PLISQL Package parser
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/parser/parse_package.h
diff --git a/src/include/parser/parse_param.h b/src/include/parser/parse_param.h
index 9ce7d98d150..e9f1a00def2 100644
--- a/src/include/parser/parse_param.h
+++ b/src/include/parser/parse_param.h
@@ -60,6 +60,7 @@ extern void set_doStmtCheckVar(bool values);
 extern void set_parseDynDoStmt(bool value);
 extern bool get_bindByName(void);
 extern void set_bindByName(bool value);
+extern void setdynamic_callparser(bool value);
 extern int calculate_oraparamname(char ***paramnames);
 extern int calculate_oraparamname_position(Node *parsetree, char ***paramnames);
 
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 4a2eaf89dd9..35d488a8f50 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parse_type.h
  *
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 7f064d44cd2..30d420b36fd 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/parser.h
  *
diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h
index 38c4363b49d..a102e593c27 100644
--- a/src/include/parser/scansup.h
+++ b/src/include/parser/scansup.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/parser/scansup.h
  *
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 96bca3596c0..81d1fa7bb8c 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -33,7 +33,7 @@
 /* Saved arguments from configure */
 #undef CONFIGURE_ARGS
 
-/* Define to the default TCP port number on which the server listens and to
+/* Define the default TCP port number on which the server listens and to
    which clients will try to connect. This can be overridden at run-time, but
    it's convenient if your clients have the right default compiled in.
    (--with-oraport=PORTNUM) */
@@ -238,6 +238,9 @@
 /* Define to 1 if you have the global variable 'int timezone'. */
 #undef HAVE_INT_TIMEZONE
 
+/* Define to 1 if you have the `io_uring_queue_init_mem' function. */
+#undef HAVE_IO_URING_QUEUE_INIT_MEM
+
 /* Define to 1 if __builtin_constant_p(x) implies "i"(x) acceptance. */
 #undef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
 
@@ -602,6 +605,14 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to best C++ printf format archetype, usually gnu_printf if
+   available. */
+#undef PG_CXX_PRINTF_ATTRIBUTE
+
+/* Define to best C printf format archetype, usually gnu_printf if available.
+   */
+#undef PG_C_PRINTF_ATTRIBUTE
+
 /* Define to the name of a signed 128-bit integer type. */
 #undef PG_INT128_TYPE
 
@@ -618,15 +629,15 @@
 /* PostgreSQL minor version number */
 #undef PG_MINORVERSION_NUM
 
-/* Define to best printf format archetype, usually gnu_printf if available. */
-#undef PG_PRINTF_ATTRIBUTE
-
 /* PostgreSQL version as a string */
 #undef PG_VERSION
 
 /* PostgreSQL version as a number */
 #undef PG_VERSION_NUM
 
+/*IvorySQL version as a string*/
+#undef PACKAGE_IVORYSQL_VERSION
+
 /* A string containing the version number, platform, and C compiler */
 #undef PG_VERSION_STR
 
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 378f2f2c2ba..3a302c2cab0 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -11,6 +11,7 @@
 #ifndef PGSTAT_H
 #define PGSTAT_H
 
+#include "access/transam.h"		/* for FullTransactionId */
 #include "datatype/timestamp.h"
 #include "portability/instr_time.h"
 #include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
diff --git a/src/include/pgtar.h b/src/include/pgtar.h
index b2677578a3d..84c98dd3f6e 100644
--- a/src/include/pgtar.h
+++ b/src/include/pgtar.h
@@ -55,11 +55,15 @@ enum tarHeaderOffset
 	/* last 12 bytes of the 512-byte block are unassigned */
 };
 
+/* See POSIX (not all the standard file type codes are listed here) */
 enum tarFileType
 {
 	TAR_FILETYPE_PLAIN = '0',
+	TAR_FILETYPE_PLAIN_OLD = '\0',	/* backwards compatibility, per POSIX */
 	TAR_FILETYPE_SYMLINK = '2',
 	TAR_FILETYPE_DIRECTORY = '5',
+	TAR_FILETYPE_PAX_EXTENDED = 'x',
+	TAR_FILETYPE_PAX_EXTENDED_GLOBAL = 'g',
 };
 
 extern enum tarError tarCreateHeader(char *h, const char *filename,
@@ -68,7 +72,8 @@ extern enum tarError tarCreateHeader(char *h, const char *filename,
 									 time_t mtime);
 extern uint64 read_tar_number(const char *s, int len);
 extern void print_tar_number(char *s, int len, uint64 val);
-extern int	tarChecksum(char *header);
+extern int	tarChecksum(const char *header);
+extern bool isValidTarHeader(const char *header);
 
 /*
  * Compute the number of padding bytes required for an entry in a tar
diff --git a/src/include/port.h b/src/include/port.h
index 52dcc81eefb..2425fc5351e 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/port.h
  *
@@ -59,6 +59,7 @@ extern void make_native_path(char *filename);
 extern void cleanup_path(char *path);
 extern bool path_contains_parent_reference(const char *path);
 extern bool path_is_relative_and_below_cwd(const char *path);
+extern bool path_is_safe_for_extraction(const char *path);
 extern bool path_is_prefix_of_path(const char *path1, const char *path2);
 extern char *make_absolute_path(const char *path);
 extern const char *get_progname(const char *argv0);
@@ -345,7 +346,6 @@ extern bool rmtree(const char *path, bool rmtopdir);
  * open() and fopen() replacements to allow deletion of open files and
  * passing of other special options.
  */
-#define		O_DIRECT	0x80000000
 extern HANDLE pgwin32_open_handle(const char *, int, bool);
 extern int	pgwin32_open(const char *, int,...);
 extern FILE *pgwin32_fopen(const char *, const char *);
diff --git a/src/include/port/atomics/generic-gcc.h b/src/include/port/atomics/generic-gcc.h
index d8f04c89cca..1143c841580 100644
--- a/src/include/port/atomics/generic-gcc.h
+++ b/src/include/port/atomics/generic-gcc.h
@@ -44,12 +44,20 @@
 
 #if !defined(pg_read_barrier_impl) && defined(HAVE_GCC__ATOMIC_INT32_CAS)
 /* acquire semantics include read barrier semantics */
-#		define pg_read_barrier_impl()		__atomic_thread_fence(__ATOMIC_ACQUIRE)
+#		define pg_read_barrier_impl() do \
+{ \
+	pg_compiler_barrier_impl(); \
+	__atomic_thread_fence(__ATOMIC_ACQUIRE); \
+} while (0)
 #endif
 
 #if !defined(pg_write_barrier_impl) && defined(HAVE_GCC__ATOMIC_INT32_CAS)
 /* release semantics include write barrier semantics */
-#		define pg_write_barrier_impl()		__atomic_thread_fence(__ATOMIC_RELEASE)
+#		define pg_write_barrier_impl() do \
+{ \
+	pg_compiler_barrier_impl(); \
+	__atomic_thread_fence(__ATOMIC_RELEASE); \
+} while (0)
 #endif
 
 
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
index 82313bb7fcf..833d4b7df96 100644
--- a/src/include/port/pg_crc32c.h
+++ b/src/include/port/pg_crc32c.h
@@ -70,9 +70,10 @@ static inline
 pg_crc32c
 pg_comp_crc32c_dispatch(pg_crc32c crc, const void *data, size_t len)
 {
+#ifdef HAVE__BUILTIN_CONSTANT_P
 	if (__builtin_constant_p(len) && len < 32)
 	{
-		const unsigned char *p = data;
+		const unsigned char *p = (const unsigned char *) data;
 
 		/*
 		 * For small constant inputs, inline the computation to avoid a
@@ -91,6 +92,9 @@ pg_comp_crc32c_dispatch(pg_crc32c crc, const void *data, size_t len)
 	else
 		/* Otherwise, use a runtime check for AVX-512 instructions. */
 		return pg_comp_crc32c(crc, data, len);
+#else
+	return pg_comp_crc32c(crc, data, len);
+#endif							/* HAVE__BUILTIN_CONSTANT_P */
 }
 
 #elif defined(USE_SSE42_CRC32C_WITH_RUNTIME_CHECK)
diff --git a/src/include/port/pg_iovec.h b/src/include/port/pg_iovec.h
index df40c7208be..90be3af449d 100644
--- a/src/include/port/pg_iovec.h
+++ b/src/include/port/pg_iovec.h
@@ -21,9 +21,6 @@
 
 #else
 
-/* POSIX requires at least 16 as a maximum iovcnt. */
-#define IOV_MAX 16
-
 /* Define our own POSIX-compatible iovec struct. */
 struct iovec
 {
@@ -33,6 +30,15 @@ struct iovec
 
 #endif
 
+/*
+ * If <limits.h> didn't define IOV_MAX, define our own.  X/Open requires at
+ * least 16.  (GNU Hurd apparently feel that they're not bound by X/Open,
+ * because they don't define this symbol at all.)
+ */
+#ifndef IOV_MAX
+#define IOV_MAX 16
+#endif
+
 /*
  * Define a reasonable maximum that is safe to use on the stack in arrays of
  * struct iovec and other small types.  The operating system could limit us to
diff --git a/src/include/port/pg_numa.h b/src/include/port/pg_numa.h
index 40f1d324dcf..9d1ea6d0db8 100644
--- a/src/include/port/pg_numa.h
+++ b/src/include/port/pg_numa.h
@@ -24,12 +24,17 @@ extern PGDLLIMPORT int pg_numa_get_max_node(void);
  * This is required on Linux, before pg_numa_query_pages() as we
  * need to page-fault before move_pages(2) syscall returns valid results.
  */
-#define pg_numa_touch_mem_if_required(ro_volatile_var, ptr) \
-	ro_volatile_var = *(volatile uint64 *) ptr
+static inline void
+pg_numa_touch_mem_if_required(void *ptr)
+{
+	volatile uint64 touch pg_attribute_unused();
+
+	touch = *(volatile uint64 *) ptr;
+}
 
 #else
 
-#define pg_numa_touch_mem_if_required(ro_volatile_var, ptr) \
+#define pg_numa_touch_mem_if_required(ptr) \
 	do {} while(0)
 
 #endif
diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h
index e63a3bd824d..8ff40007c7f 100644
--- a/src/include/port/solaris.h
+++ b/src/include/port/solaris.h
@@ -24,3 +24,12 @@
 #if defined(__i386__)
 #include <sys/isa_defs.h>
 #endif
+
+/*
+ * On original Solaris, PAM conversation procs lack a "const" in their
+ * declaration; but recent OpenIndiana versions put it there by default.
+ * The least messy way to deal with this is to define _PAM_LEGACY_NONCONST,
+ * which causes OpenIndiana to declare pam_conv per the Solaris tradition,
+ * and also use that symbol to control omitting the "const" in our own code.
+ */
+#define _PAM_LEGACY_NONCONST 1
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index ff7028bdc81..14f97815f81 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -335,18 +335,15 @@ extern int	_pglstat64(const char *name, struct stat *buf);
 
 /*
  * Supplement to <fcntl.h>.
- * This is the same value as _O_NOINHERIT in the MS header file. This is
- * to ensure that we don't collide with a future definition. It means
- * we cannot use _O_NOINHERIT ourselves.
- */
-#define O_DSYNC 0x0080
-
-/*
- * Our open() replacement does not create inheritable handles, so it is safe to
- * ignore O_CLOEXEC.  (If we were using Windows' own open(), it might be
- * necessary to convert this to _O_NOINHERIT.)
+ *
+ * We borrow bits from the high end when we have to, to avoid colliding with
+ * the system-defined values.  Our open() replacement in src/port/open.c
+ * converts these to the equivalent CreateFile() flags, along with the ones
+ * from fcntl.h.
  */
-#define O_CLOEXEC 0
+#define	O_CLOEXEC	0x04000000
+#define	O_DIRECT	0x80000000
+#define	O_DSYNC		_O_NOINHERIT
 
 /*
  * Supplement to <errno.h>.
diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h
index bf45c50dcf3..6a8f25a9907 100644
--- a/src/include/postgres_ext.h
+++ b/src/include/postgres_ext.h
@@ -24,6 +24,8 @@
 #ifndef POSTGRES_EXT_H
 #define POSTGRES_EXT_H
 
+#include <stdint.h>
+
 /*
  * Object ID is a fundamental type in Postgres.
  */
@@ -42,6 +44,9 @@ typedef unsigned int Oid;
 /* the above needs <stdlib.h> */
 
 
+/* deprecated name for int64_t, formerly used in client API declarations */
+typedef int64_t pg_int64;
+
 /*
  * Identifiers of error message fields.  Kept here to keep common
  * between frontend and backend, and also to export them to libpq
diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h
index 3dc10512028..ff852c6757b 100644
--- a/src/include/postmaster/postmaster.h
+++ b/src/include/postmaster/postmaster.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/postmaster/postmaster.h
  *
@@ -113,7 +113,7 @@ extern PGDLLIMPORT struct ClientSocket *MyClientSocket;
 /* prototypes for functions in launch_backend.c */
 extern pid_t postmaster_child_launch(BackendType child_type,
 									 int child_slot,
-									 const void *startup_data,
+									 void *startup_data,
 									 size_t startup_data_len,
 									 struct ClientSocket *client_sock);
 const char *PostmasterChildName(BackendType child_type);
diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h
index af0fe97c796..91b5fc80ae8 100644
--- a/src/include/regex/regcustom.h
+++ b/src/include/regex/regcustom.h
@@ -52,6 +52,8 @@
 #define MALLOC(n)		palloc_extended((n), MCXT_ALLOC_NO_OOM)
 #define FREE(p)			pfree(VS(p))
 #define REALLOC(p,n)	repalloc_extended(VS(p),(n), MCXT_ALLOC_NO_OOM)
+#define MALLOC_ARRAY(type, n) palloc_array_extended(type, n, MCXT_ALLOC_NO_OOM)
+#define REALLOC_ARRAY(p, type, n) repalloc_array_extended(p, type, n, MCXT_ALLOC_NO_OOM)
 #define INTERRUPT(re)	CHECK_FOR_INTERRUPTS()
 #define assert(x)		Assert(x)
 
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 272f362ddae..75c2599d5db 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -4,7 +4,7 @@
  * regular expressions
  *
  * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * Development of this software was funded, in part, by Cray Research Inc.,
  * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h
index fd69299a16d..6fb9551721d 100644
--- a/src/include/regex/regguts.h
+++ b/src/include/regex/regguts.h
@@ -76,6 +76,14 @@
 #ifndef FREE
 #define FREE(p)		free(VS(p))
 #endif
+#ifndef MALLOC_ARRAY
+/* we don't depend on calloc's zeroing behavior, we do need overflow check */
+#define MALLOC_ARRAY(type, n) ((type *) calloc(sizeof(type), n))
+#endif
+#ifndef REALLOC_ARRAY
+/* XXX this definition does not provide the desired overflow check */
+#define REALLOC_ARRAY(p, type, n) ((type *) REALLOC(p, sizeof(type) * (n)))
+#endif
 
 /* interruption */
 #ifndef INTERRUPT
@@ -446,6 +454,11 @@ struct cnfa
  * (the compacted NFA and the colormap).
  * The scaling here is based on an empirical measurement that very large
  * NFAs tend to have about 4 arcs/state.
+ *
+ * Do not raise this so high as to allow more than INT_MAX/8 states or arcs,
+ * or you risk integer overflows in various space allocation requests.
+ * (We could be more defensive in those places, but that's so far beyond the
+ * practical range of NFA sizes that it doesn't seem worth additional code.)
  */
 #ifndef REG_MAX_COMPILE_SPACE
 #define REG_MAX_COMPILE_SPACE  \
diff --git a/src/include/replication/conflict.h b/src/include/replication/conflict.h
index 6c59125f256..4d4e817b0f2 100644
--- a/src/include/replication/conflict.h
+++ b/src/include/replication/conflict.h
@@ -9,9 +9,16 @@
 #ifndef CONFLICT_H
 #define CONFLICT_H
 
-#include "nodes/execnodes.h"
+#include "access/xlogdefs.h"
+#include "nodes/pg_list.h"
 #include "utils/timestamp.h"
 
+/* Avoid including execnodes.h here */
+struct EState;
+struct ResultRelInfo;
+struct TupleTableSlot;
+
+
 /*
  * Conflict types that could occur while applying remote changes.
  *
@@ -54,29 +61,30 @@ typedef enum
 #define CONFLICT_NUM_TYPES (CT_MULTIPLE_UNIQUE_CONFLICTS + 1)
 
 /*
- * Information for the existing local tuple that caused the conflict.
+ * Information for the existing local row that caused the conflict.
  */
 typedef struct ConflictTupleInfo
 {
-	TupleTableSlot *slot;		/* tuple slot holding the conflicting local
-								 * tuple */
+	struct TupleTableSlot *slot;	/* tuple slot holding the conflicting
+									 * local tuple */
 	Oid			indexoid;		/* OID of the index where the conflict
 								 * occurred */
 	TransactionId xmin;			/* transaction ID of the modification causing
 								 * the conflict */
 	RepOriginId origin;			/* origin identifier of the modification */
 	TimestampTz ts;				/* timestamp of when the modification on the
-								 * conflicting local tuple occurred */
+								 * conflicting local row occurred */
 } ConflictTupleInfo;
 
-extern bool GetTupleTransactionInfo(TupleTableSlot *localslot,
+extern bool GetTupleTransactionInfo(struct TupleTableSlot *localslot,
 									TransactionId *xmin,
 									RepOriginId *localorigin,
 									TimestampTz *localts);
-extern void ReportApplyConflict(EState *estate, ResultRelInfo *relinfo,
+extern void ReportApplyConflict(struct EState *estate, struct ResultRelInfo *relinfo,
 								int elevel, ConflictType type,
-								TupleTableSlot *searchslot,
-								TupleTableSlot *remoteslot,
+								struct TupleTableSlot *searchslot,
+								struct TupleTableSlot *remoteslot,
 								List *conflicttuples);
-extern void InitConflictIndexes(ResultRelInfo *relInfo);
+extern void InitConflictIndexes(struct ResultRelInfo *relInfo);
+
 #endif
diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
index ffacba9d2ae..d9aab934048 100644
--- a/src/include/replication/slot.h
+++ b/src/include/replication/slot.h
@@ -266,7 +266,7 @@ extern PGDLLIMPORT ReplicationSlot *MyReplicationSlot;
 /* GUCs */
 extern PGDLLIMPORT int max_replication_slots;
 extern PGDLLIMPORT char *synchronized_standby_slots;
-extern PGDLLIMPORT int idle_replication_slot_timeout_mins;
+extern PGDLLIMPORT int idle_replication_slot_timeout_secs;
 
 /* shmem initialization functions */
 extern Size ReplicationSlotsShmemSize(void);
@@ -293,6 +293,8 @@ extern void ReplicationSlotMarkDirty(void);
 /* misc stuff */
 extern void ReplicationSlotInitialize(void);
 extern bool ReplicationSlotValidateName(const char *name, int elevel);
+extern bool ReplicationSlotValidateNameInternal(const char *name,
+												int *err_code, char **err_msg, char **err_hint);
 extern void ReplicationSlotReserveWal(void);
 extern void ReplicationSlotsComputeRequiredXmin(bool already_locked);
 extern void ReplicationSlotsComputeRequiredLSN(void);
diff --git a/src/include/replication/slotsync.h b/src/include/replication/slotsync.h
index 16b721463dd..882c46581b3 100644
--- a/src/include/replication/slotsync.h
+++ b/src/include/replication/slotsync.h
@@ -12,10 +12,15 @@
 #ifndef SLOTSYNC_H
 #define SLOTSYNC_H
 
+#include <signal.h>
+
 #include "replication/walreceiver.h"
 
 extern PGDLLIMPORT bool sync_replication_slots;
 
+/* Interrupt flag set by HandleSlotSyncMessageInterrupt() */
+extern PGDLLIMPORT volatile sig_atomic_t SlotSyncShutdownPending;
+
 /*
  * GUCs needed by slot sync worker to connect to the primary
  * server and carry on with slots synchronization.
@@ -34,5 +39,7 @@ extern bool IsSyncingReplicationSlots(void);
 extern Size SlotSyncShmemSize(void);
 extern void SlotSyncShmemInit(void);
 extern void SyncReplicationSlots(WalReceiverConn *wrconn);
+extern void HandleSlotSyncMessageInterrupt(void);
+extern void ProcessSlotSyncMessage(void);
 
 #endif							/* SLOTSYNC_H */
diff --git a/src/include/statistics/stat_utils.h b/src/include/statistics/stat_utils.h
index 512eb776e0e..4283d2c4053 100644
--- a/src/include/statistics/stat_utils.h
+++ b/src/include/statistics/stat_utils.h
@@ -15,6 +15,9 @@
 
 #include "fmgr.h"
 
+/* avoid including primnodes.h here */
+struct RangeVar;
+
 struct StatsArgInfo
 {
 	const char *argname;
@@ -30,9 +33,8 @@ extern bool stats_check_arg_pair(FunctionCallInfo fcinfo,
 								 struct StatsArgInfo *arginfo,
 								 int argnum1, int argnum2);
 
-extern void stats_lock_check_privileges(Oid reloid);
-
-extern Oid	stats_lookup_relid(const char *nspname, const char *relname);
+extern void RangeVarCallbackForStats(const struct RangeVar *relation,
+									 Oid relId, Oid oldRelid, void *arg);
 
 extern bool stats_fill_fcinfo_from_arg_pairs(FunctionCallInfo pairs_fcinfo,
 											 FunctionCallInfo positional_fcinfo,
diff --git a/src/include/storage/aio.h b/src/include/storage/aio.h
index e7a0a234b6c..2933eea0649 100644
--- a/src/include/storage/aio.h
+++ b/src/include/storage/aio.h
@@ -201,7 +201,7 @@ typedef enum PgAioHandleCallbackID
 } PgAioHandleCallbackID;
 
 #define PGAIO_HCB_MAX	PGAIO_HCB_LOCAL_BUFFER_READV
-StaticAssertDecl(PGAIO_HCB_MAX <= (1 << PGAIO_RESULT_ID_BITS),
+StaticAssertDecl(PGAIO_HCB_MAX < (1 << PGAIO_RESULT_ID_BITS),
 				 "PGAIO_HCB_MAX is too big for PGAIO_RESULT_ID_BITS");
 
 
diff --git a/src/include/storage/aio_internal.h b/src/include/storage/aio_internal.h
index 2d37a243abe..b4de30f2ec1 100644
--- a/src/include/storage/aio_internal.h
+++ b/src/include/storage/aio_internal.h
@@ -92,17 +92,23 @@ typedef enum PgAioHandleState
 
 struct ResourceOwnerData;
 
-/* typedef is in aio_types.h */
+/*
+ * Typedef is in aio_types.h
+ *
+ * We don't use the underlying enums for state, target and op to avoid wasting
+ * space. We tried using bitfields, but several compilers generate rather
+ * horrid code for that.
+ */
 struct PgAioHandle
 {
 	/* all state updates should go through pgaio_io_update_state() */
-	PgAioHandleState state:8;
+	uint8		state;
 
 	/* what are we operating on */
-	PgAioTargetID target:8;
+	uint8		target;
 
 	/* which IO operation */
-	PgAioOp		op:8;
+	uint8		op;
 
 	/* bitfield of PgAioHandleFlags */
 	uint8		flags;
diff --git a/src/include/storage/aio_types.h b/src/include/storage/aio_types.h
index 18183366077..afee85c787b 100644
--- a/src/include/storage/aio_types.h
+++ b/src/include/storage/aio_types.h
@@ -107,7 +107,7 @@ typedef struct PgAioResult
 	/* of type PgAioResultStatus, see above */
 	uint32		status:PGAIO_RESULT_STATUS_BITS;
 
-	/* meaning defined by callback->error */
+	/* meaning defined by callback->report */
 	uint32		error_data:PGAIO_RESULT_ERROR_BITS;
 
 	int32		result;
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 650bbc4297d..1ea118fd422 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/bufmgr.h
  *
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index b77d8e5e30e..75aee33b110 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -55,12 +55,23 @@ typedef int File;
 #define IO_DIRECT_WAL			0x02
 #define IO_DIRECT_WAL_INIT		0x04
 
+enum FileExtendMethod
+{
+#ifdef HAVE_POSIX_FALLOCATE
+	FILE_EXTEND_METHOD_POSIX_FALLOCATE,
+#endif
+	FILE_EXTEND_METHOD_WRITE_ZEROS,
+};
+
+/* Default to the first available file_extend_method. */
+#define DEFAULT_FILE_EXTEND_METHOD 0
 
 /* GUC parameter */
 extern PGDLLIMPORT int max_files_per_process;
 extern PGDLLIMPORT bool data_sync_retry;
 extern PGDLLIMPORT int recovery_init_sync_method;
 extern PGDLLIMPORT int io_direct_flags;
+extern PGDLLIMPORT int file_extend_method;
 
 /*
  * This is private to fd.c, but exported for save/restore_backend_variables()
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index df008076c66..89615b82947 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/lock.h
  *
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index 9c9b6730065..d6208efb857 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/lwlock.h
  *
diff --git a/src/include/storage/lwlocklist.h b/src/include/storage/lwlocklist.h
index a9681738146..932024b1b0b 100644
--- a/src/include/storage/lwlocklist.h
+++ b/src/include/storage/lwlocklist.h
@@ -37,7 +37,7 @@ PG_LWLOCK(3, XidGen)
 PG_LWLOCK(4, ProcArray)
 PG_LWLOCK(5, SInvalRead)
 PG_LWLOCK(6, SInvalWrite)
-/* 7 was WALBufMapping */
+PG_LWLOCK(7, WALBufMapping)
 PG_LWLOCK(8, WALWrite)
 PG_LWLOCK(9, ControlFile)
 /* 10 was CheckpointLock */
diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h
index 6eca7574fc6..ff2861d7641 100644
--- a/src/include/storage/predicate_internals.h
+++ b/src/include/storage/predicate_internals.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/predicate_internals.h
  *
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index d8c15649891..7343b87830c 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/proc.h
  *
@@ -461,6 +461,7 @@ extern PGDLLIMPORT PGPROC *PreparedXactProcs;
 #define MAX_IO_WORKERS          32
 #define NUM_AUXILIARY_PROCS		(6 + MAX_IO_WORKERS)
 
+#define FIRST_PREPARED_XACT_PROC_NUMBER	(MaxBackends + NUM_AUXILIARY_PROCS)
 
 /* configurable options */
 extern PGDLLIMPORT int DeadlockTimeout;
diff --git a/src/include/storage/procsignal.h b/src/include/storage/procsignal.h
index afeeb1ca019..234cfcb364a 100644
--- a/src/include/storage/procsignal.h
+++ b/src/include/storage/procsignal.h
@@ -47,9 +47,11 @@ typedef enum
 	PROCSIG_RECOVERY_CONFLICT_BUFFERPIN,
 	PROCSIG_RECOVERY_CONFLICT_STARTUP_DEADLOCK,
 	PROCSIG_RECOVERY_CONFLICT_LAST = PROCSIG_RECOVERY_CONFLICT_STARTUP_DEADLOCK,
+
+	PROCSIG_SLOTSYNC_MESSAGE,	/* ask slot synchronization to stop */
 } ProcSignalReason;
 
-#define NUM_PROCSIGNALS (PROCSIG_RECOVERY_CONFLICT_LAST + 1)
+#define NUM_PROCSIGNALS (PROCSIG_SLOTSYNC_MESSAGE + 1)
 
 typedef enum
 {
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index c1f668ded95..bcf7d9ea36c 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -38,8 +38,6 @@ extern void InitShmemIndex(void);
 extern HTAB *ShmemInitHash(const char *name, long init_size, long max_size,
 						   HASHCTL *infoP, int hash_flags);
 extern void *ShmemInitStruct(const char *name, Size size, bool *foundPtr);
-extern Size add_size(Size s1, Size s2);
-extern Size mul_size(Size s1, Size s2);
 
 extern PGDLLIMPORT Size pg_get_shmem_pagesize(void);
 
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index fb7e012e03a..6d0826e1882 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/storage/standby.h
  *
diff --git a/src/include/tcop/cmdtaglist.h b/src/include/tcop/cmdtaglist.h
index 48837edbb58..121f147f965 100644
--- a/src/include/tcop/cmdtaglist.h
+++ b/src/include/tcop/cmdtaglist.h
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/tcop/cmdtaglist.h
  *
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index c29588d8532..378d9ba7088 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -37,10 +37,34 @@ typedef struct
 /* The second argument of t_iseq() must be a plain ASCII character */
 #define t_iseq(x,c)		(TOUCHAR(x) == (unsigned char) (c))
 
-#define COPYCHAR(d,s)	memcpy(d, s, pg_mblen(s))
+/* Copy multibyte character of known byte length, return byte length. */
+static inline int
+ts_copychar_with_len(void *dest, const void *src, int length)
+{
+	memcpy(dest, src, length);
+	return length;
+}
+
+/* Copy multibyte character from null-terminated string,  return byte length. */
+static inline int
+ts_copychar_cstr(void *dest, const void *src)
+{
+	return ts_copychar_with_len(dest, src, pg_mblen_cstr((const char *) src));
+}
+
+/* Historical macro for the above. */
+#define COPYCHAR ts_copychar_cstr
+
+#define GENERATE_T_ISCLASS_DECL(character_class) \
+extern int	t_is##character_class##_with_len(const char *ptr, int len); \
+extern int	t_is##character_class##_cstr(const char *ptr); \
+extern int	t_is##character_class##_unbounded(const char *ptr); \
+\
+/* deprecated */ \
+extern int	t_is##character_class(const char *ptr);
 
-extern int	t_isalpha(const char *ptr);
-extern int	t_isalnum(const char *ptr);
+GENERATE_T_ISCLASS_DECL(alnum);
+GENERATE_T_ISCLASS_DECL(alpha);
 
 extern bool tsearch_readline_begin(tsearch_readline_state *stp,
 								   const char *filename);
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
index 7debc85ed80..80ba533882b 100644
--- a/src/include/tsearch/ts_utils.h
+++ b/src/include/tsearch/ts_utils.h
@@ -40,14 +40,12 @@ extern bool gettoken_tsvector(TSVectorParseState state,
 extern void close_tsvector_parser(TSVectorParseState state);
 
 /* phrase operator begins with '<' */
-#define ISOPERATOR(x) \
-	( pg_mblen(x) == 1 && ( *(x) == '!' ||	\
-							*(x) == '&' ||	\
-							*(x) == '|' ||	\
-							*(x) == '(' ||	\
-							*(x) == ')' ||	\
-							*(x) == '<'		\
-						  ) )
+#define ISOPERATOR(x)		(*(x) == '!' ||	\
+							 *(x) == '&' ||	\
+							 *(x) == '|' ||	\
+							 *(x) == '(' ||	\
+							 *(x) == ')' ||	\
+							 *(x) == '<')
 
 /* parse_tsquery */
 
diff --git a/src/include/utils/.gitignore b/src/include/utils/.gitignore
index c1b4c662139..e4ba4ce8dc4 100644
--- a/src/include/utils/.gitignore
+++ b/src/include/utils/.gitignore
@@ -3,4 +3,6 @@
 /probes.h
 /errcodes.h
 /header-stamp
+/pgstat_wait_event.c
+/wait_event_funcs_data.c
 /wait_event_types.h
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index cf5f02fe91f..9cbe870c0f9 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/acl.h
  *
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 1c98c7d2255..64b3f534e9a 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -68,6 +68,7 @@ extern char *pg_ultostr(char *str, uint32 value);
 
 /* oid.c */
 extern oidvector *buildoidvector(const Oid *oids, int n);
+extern void check_valid_oidvector(const oidvector *oidArray);
 extern Oid	oidparse(Node *node);
 extern int	oid_cmp(const void *p1, const void *p2);
 
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 675f4f5f469..581b39091e0 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -527,5 +527,6 @@ extern void write_jsonlog(ErrorData *edata);
  * safely (memory context, GUC load etc)
  */
 extern void write_stderr(const char *fmt,...) pg_attribute_printf(1, 2);
+extern void vwrite_stderr(const char *fmt, va_list ap) pg_attribute_printf(1, 0);
 
 #endif							/* ELOG_H */
diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h
index be82843f7dd..ab6d9b74e25 100644
--- a/src/include/utils/formatting.h
+++ b/src/include/utils/formatting.h
@@ -4,7 +4,7 @@
  * src/include/utils/formatting.h
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *	 Portions Copyright (c) 1999-2025, PostgreSQL Global Development Group
  *
  *	 The PostgreSQL routines for a DateTime/int/float/numeric formatting,
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 877d5605c2c..2f88deb4b9c 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2000-2025, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/guc.h
  *--------------------------------------------------------------------
@@ -107,7 +107,7 @@ typedef enum
  * will show as "default" in pg_settings.  If there is a specific reason not
  * to want that, use source == PGC_S_OVERRIDE.
  *
- * NB: see GucSource_Names in guc.c if you change this.
+ * NB: see GucSource_Names in guc_tables.c if you change this.
  */
 typedef enum
 {
diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h
index da0a1f7a47e..7ca331685e0 100644
--- a/src/include/utils/guc_hooks.h
+++ b/src/include/utils/guc_hooks.h
@@ -7,7 +7,7 @@
  * declare them all here to avoid having to propagate guc.h into
  * a lot of unrelated header files.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  *
  *	  src/include/utils/guc_hooks.h
@@ -85,8 +85,6 @@ extern const char *show_log_timezone(void);
 extern void assign_maintenance_io_concurrency(int newval, void *extra);
 extern void assign_io_max_combine_limit(int newval, void *extra);
 extern void assign_io_combine_limit(int newval, void *extra);
-extern bool check_max_slot_wal_keep_size(int *newval, void **extra,
-										 GucSource source);
 extern void assign_max_wal_size(int newval, void *extra);
 extern bool check_max_stack_depth(int *newval, void **extra, GucSource source);
 extern void assign_max_stack_depth(int newval, void *extra);
@@ -177,8 +175,6 @@ extern void assign_wal_sync_method(int new_wal_sync_method, void *extra);
 extern bool check_synchronized_standby_slots(char **newval, void **extra,
 											 GucSource source);
 extern void assign_synchronized_standby_slots(const char *newval, void *extra);
-extern bool check_idle_replication_slot_timeout(int *newval, void **extra,
-												GucSource source);
 
 
 #endif							/* GUC_HOOKS_H */
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index a23d673b1ca..e88c2e4e7f7 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -5,7 +5,7 @@
  *
  * See src/backend/utils/misc/README for design notes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  *
  *	  src/include/utils/guc_tables.h
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 9b871caef62..b5fbd754c2c 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -43,8 +43,7 @@ extern void CacheInvalidateHeapTuple(Relation relation,
 									 HeapTuple tuple,
 									 HeapTuple newtuple);
 extern void CacheInvalidateHeapTupleInplace(Relation relation,
-											HeapTuple tuple,
-											HeapTuple newtuple);
+											HeapTuple key_equivalent_tuple);
 
 extern void CacheInvalidateCatalog(Oid catalogId);
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index d560e514787..92daec0d638 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/lsyscache.h
  *
@@ -92,6 +92,7 @@ extern bool get_op_hash_functions(Oid opno,
 extern List *get_op_index_interpretation(Oid opno);
 extern bool equality_ops_are_compatible(Oid opno1, Oid opno2);
 extern bool comparison_ops_are_compatible(Oid opno1, Oid opno2);
+extern bool collations_agree_on_equality(Oid coll1, Oid coll2);
 extern Oid	get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype,
 							  int16 procnum);
 extern char *get_attname(Oid relid, AttrNumber attnum, bool missing_ok);
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 8abc26abce2..1375683fb8e 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -41,7 +41,7 @@
 
 #define AllocSizeIsValid(size)	((Size) (size) <= MaxAllocSize)
 
-/* Must be less than SIZE_MAX */
+/* Do not make this any bigger; see add_size() and mul_size() */
 #define MaxAllocHugeSize	(SIZE_MAX / 2)
 
 #define InvalidAllocSize	SIZE_MAX
diff --git a/src/include/utils/meson.build b/src/include/utils/meson.build
index 78c6b9b0a23..c7d2597db5c 100644
--- a/src/include/utils/meson.build
+++ b/src/include/utils/meson.build
@@ -72,8 +72,6 @@ generated_backend_headers += fmgrtab_target[1]
 
 # autoconf generates the file there, ensure we get a conflict
 generated_sources_ac += {
-  'src/backend/utils': fmgrtab_output + ['errcodes.h', 'probes.h', 'fmgr-stamp'],
+  'src/backend/utils': fmgrtab_output + ['errcodes.h', 'wait_event_types.h', 'probes.h', 'fmgr-stamp'],
   'src/include/utils': ['header-stamp'],
 }
-
-generated_sources_ac += {'src/backend/utils/activity': ['wait_event_types.h']}
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 7bf9c4de223..e3d9188e3e5 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
  *
  * Original coding 1998, Jan Wieck.  Heavily revised 2003, Tom Lane.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Copyright (c) 1998-2025, PostgreSQL Global Development Group
  *
  * src/include/utils/numeric.h
diff --git a/src/include/utils/ora_compatible.h b/src/include/utils/ora_compatible.h
index 9d4cfd35997..6f77ee20c75 100644
--- a/src/include/utils/ora_compatible.h
+++ b/src/include/utils/ora_compatible.h
@@ -17,7 +17,7 @@
  *
  * Definition enumeration structure is fro supporting different compatibility modes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/ora_compatible.h
  *
@@ -58,5 +58,5 @@ typedef enum
 	NLS_LENGTH_BYTE,
 	NLS_LENGTH_CHAR
 } NlsLengthSemantics;
-
+extern int       bootstrap_database_mode;
 #endif							/* ORA_COMPATIBLE_H */
diff --git a/src/include/utils/packagecache.h b/src/include/utils/packagecache.h
index 47872609baf..7f2b2fda4d8 100644
--- a/src/include/utils/packagecache.h
+++ b/src/include/utils/packagecache.h
@@ -19,7 +19,7 @@
  *		Definitions for the PLISQL Package cache
  *
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/include/utils/packagecache.h
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index e1b42267b22..e5d3f0947f4 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -85,6 +85,18 @@ pg_nodiscard extern void *repalloc_extended(void *pointer,
 pg_nodiscard extern void *repalloc0(void *pointer, Size oldsize, Size size);
 extern void pfree(void *pointer);
 
+/*
+ * Support for safe calculation of memory request sizes
+ */
+extern Size add_size(Size s1, Size s2);
+extern Size mul_size(Size s1, Size s2);
+extern void *palloc_mul(Size s1, Size s2);
+extern void *palloc0_mul(Size s1, Size s2);
+extern void *palloc_mul_extended(Size s1, Size s2, int flags);
+pg_nodiscard extern void *repalloc_mul(void *p, Size s1, Size s2);
+pg_nodiscard extern void *repalloc_mul_extended(void *p, Size s1, Size s2,
+												int flags);
+
 /*
  * Variants with easier notation and more type safety
  */
@@ -98,15 +110,17 @@ extern void pfree(void *pointer);
 /*
  * Allocate space for "count" objects of type "type"
  */
-#define palloc_array(type, count) ((type *) palloc(sizeof(type) * (count)))
-#define palloc0_array(type, count) ((type *) palloc0(sizeof(type) * (count)))
+#define palloc_array(type, count) ((type *) palloc_mul(sizeof(type), count))
+#define palloc0_array(type, count) ((type *) palloc0_mul(sizeof(type), count))
+#define palloc_array_extended(type, count, flags) ((type *) palloc_mul_extended(sizeof(type), count, flags))
 
 /*
  * Change size of allocation pointed to by "pointer" to have space for "count"
  * objects of type "type"
  */
-#define repalloc_array(pointer, type, count) ((type *) repalloc(pointer, sizeof(type) * (count)))
-#define repalloc0_array(pointer, type, oldcount, count) ((type *) repalloc0(pointer, sizeof(type) * (oldcount), sizeof(type) * (count)))
+#define repalloc_array(pointer, type, count) ((type *) repalloc_mul(pointer, sizeof(type), count))
+#define repalloc0_array(pointer, type, oldcount, count) ((type *) repalloc0(pointer, mul_size(sizeof(type), oldcount), mul_size(sizeof(type), count)))
+#define repalloc_array_extended(pointer, type, count, flags) ((type *) repalloc_mul_extended(pointer, sizeof(type), count, flags))
 
 /* Higher-limit allocators. */
 extern void *MemoryContextAllocHuge(MemoryContext context, Size size);
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index 36b3c92f539..12d945ae481 100644
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -13,12 +13,31 @@
 #define _PG_LOCALE_
 
 #ifdef USE_ICU
+/* only include the C APIs, to avoid errors in cpluspluscheck */
+#undef U_SHOW_CPLUSPLUS_API
+#define U_SHOW_CPLUSPLUS_API 0
+#undef U_SHOW_CPLUSPLUS_HEADER_API
+#define U_SHOW_CPLUSPLUS_HEADER_API 0
 #include <unicode/ucol.h>
 #endif
 
 /* use for libc locale names */
 #define LOCALE_NAME_BUFLEN 128
 
+/*
+ * Maximum number of bytes needed to map a single codepoint. Useful for
+ * mapping and processing a single input codepoint at a time with a
+ * statically-allocated buffer.
+ *
+ * With full case mapping, an input codepoint may be mapped to as many as
+ * three output codepoints. See Unicode 16.0.0, section 5.18.2, "Change in
+ * Length":
+ *
+ * https://www.unicode.org/versions/Unicode16.0.0/core-spec/chapter-5/#G29675
+ */
+#define UNICODE_CASEMAP_LEN		3
+#define UNICODE_CASEMAP_BUFSZ	(UNICODE_CASEMAP_LEN * MAX_MULTIBYTE_CHAR_LEN)
+
 /* GUC settings */
 extern PGDLLIMPORT char *locale_messages;
 extern PGDLLIMPORT char *locale_monetary;
diff --git a/src/include/utils/pgstat_internal.h b/src/include/utils/pgstat_internal.h
index d5557e6e998..6cf00008f63 100644
--- a/src/include/utils/pgstat_internal.h
+++ b/src/include/utils/pgstat_internal.h
@@ -295,18 +295,11 @@ typedef struct PgStat_KindInfo
 	 *
 	 * Returns true if some of the stats could not be flushed, due to lock
 	 * contention for example. Optional.
-	 */
-	bool		(*flush_static_cb) (bool nowait);
-
-	/*
-	 * For fixed-numbered or variable-numbered statistics: Check for pending
-	 * stats in need of flush with flush_static_cb, when these do not use
-	 * PgStat_EntryRef->pending.
 	 *
-	 * Returns true if there are any stats pending for flush, triggering
-	 * flush_static_cb. Optional.
+	 * "pgstat_report_fixed" needs to be set to trigger the flush of pending
+	 * stats.
 	 */
-	bool		(*have_static_pending_cb) (void);
+	bool		(*flush_static_cb) (bool nowait);
 
 	/*
 	 * For fixed-numbered statistics: Reset All.
@@ -627,7 +620,6 @@ extern void pgstat_archiver_snapshot_cb(void);
 
 extern bool pgstat_flush_backend(bool nowait, bits32 flags);
 extern bool pgstat_backend_flush_cb(bool nowait);
-extern bool pgstat_backend_have_pending_cb(void);
 extern void pgstat_backend_reset_timestamp_cb(PgStatShared_Common *header,
 											  TimestampTz ts);
 
@@ -676,7 +668,6 @@ extern bool pgstat_function_flush_cb(PgStat_EntryRef *entry_ref, bool nowait);
 
 extern void pgstat_flush_io(bool nowait);
 
-extern bool pgstat_io_have_pending_cb(void);
 extern bool pgstat_io_flush_cb(bool nowait);
 extern void pgstat_io_init_shmem_cb(void *stats);
 extern void pgstat_io_reset_all_cb(TimestampTz ts);
@@ -738,7 +729,6 @@ extern PgStatShared_Common *pgstat_init_entry(PgStat_Kind kind,
  * Functions in pgstat_slru.c
  */
 
-extern bool pgstat_slru_have_pending_cb(void);
 extern bool pgstat_slru_flush_cb(bool nowait);
 extern void pgstat_slru_init_shmem_cb(void *stats);
 extern void pgstat_slru_reset_all_cb(TimestampTz ts);
@@ -750,7 +740,6 @@ extern void pgstat_slru_snapshot_cb(void);
  */
 
 extern void pgstat_wal_init_backend_cb(void);
-extern bool pgstat_wal_have_pending_cb(void);
 extern bool pgstat_wal_flush_cb(bool nowait);
 extern void pgstat_wal_init_shmem_cb(void *stats);
 extern void pgstat_wal_reset_all_cb(TimestampTz ts);
@@ -778,8 +767,23 @@ extern void pgstat_create_transactional(PgStat_Kind kind, Oid dboid, uint64 obji
  * Variables in pgstat.c
  */
 
-extern PGDLLIMPORT PgStat_LocalState pgStatLocal;
+/*
+ * Track if *any* pending fixed-numbered statistics should be flushed to
+ * shared memory.
+ *
+ * This flag can be switched to true by fixed-numbered statistics to let
+ * pgstat_report_stat() know if it needs to go through one round of
+ * reports, calling flush_static_cb for each fixed-numbered statistics
+ * kind.  When this flag is not set, pgstat_report_stat() is able to do
+ * a fast exit, knowing that there are no pending fixed-numbered statistics.
+ *
+ * Statistics callbacks should never reset this flag; pgstat_report_stat()
+ * is in charge of doing that.
+ */
+extern PGDLLIMPORT bool pgstat_report_fixed;
 
+/* Backend-local stats state */
+extern PGDLLIMPORT PgStat_LocalState pgStatLocal;
 
 /*
  * Implementation of inline functions declared above.
diff --git a/src/include/utils/pgstat_kind.h b/src/include/utils/pgstat_kind.h
index f44169fd5a3..eb5f0b3ae6d 100644
--- a/src/include/utils/pgstat_kind.h
+++ b/src/include/utils/pgstat_kind.h
@@ -18,7 +18,7 @@
 
 /* Range of IDs allowed, for built-in and custom kinds */
 #define PGSTAT_KIND_MIN	1		/* Minimum ID allowed */
-#define PGSTAT_KIND_MAX	256		/* Maximum ID allowed */
+#define PGSTAT_KIND_MAX	32		/* Maximum ID allowed */
 
 /* use 0 for INVALID, to catch zero-initialized data */
 #define PGSTAT_KIND_INVALID 0
@@ -46,7 +46,7 @@
 /* Custom stats kinds */
 
 /* Range of IDs allowed for custom stats kinds */
-#define PGSTAT_KIND_CUSTOM_MIN	128
+#define PGSTAT_KIND_CUSTOM_MIN	24
 #define PGSTAT_KIND_CUSTOM_MAX	PGSTAT_KIND_MAX
 #define PGSTAT_KIND_CUSTOM_SIZE	(PGSTAT_KIND_CUSTOM_MAX - PGSTAT_KIND_CUSTOM_MIN + 1)
 
@@ -55,7 +55,7 @@
  * development and have not reserved their own unique kind ID yet. See:
  * https://wiki.postgresql.org/wiki/CustomCumulativeStats
  */
-#define PGSTAT_KIND_EXPERIMENTAL	128
+#define PGSTAT_KIND_EXPERIMENTAL	24
 
 static inline bool
 pgstat_is_kind_builtin(PgStat_Kind kind)
diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h
index 6b17cf6fdd6..47933167914 100644
--- a/src/include/utils/plancache.h
+++ b/src/include/utils/plancache.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/plancache.h
  *
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index 013049b3098..fb4fa53363d 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -96,7 +96,8 @@ typedef struct VariableStatData
 	int32		atttypmod;		/* actual typmod (after stripping relabel) */
 	bool		isunique;		/* matches unique index, DISTINCT or GROUP-BY
 								 * clause */
-	bool		acl_ok;			/* result of ACL check on table or column */
+	bool		acl_ok;			/* true if user has SELECT privilege on all
+								 * rows from the table or column */
 } VariableStatData;
 
 #define ReleaseVariableStats(vardata)  \
@@ -153,6 +154,7 @@ extern PGDLLIMPORT get_index_stats_hook_type get_index_stats_hook;
 
 extern void examine_variable(PlannerInfo *root, Node *node, int varRelid,
 							 VariableStatData *vardata);
+extern bool all_rows_selectable(PlannerInfo *root, Index varno, Bitmapset *varattnos);
 extern bool statistic_proc_security_check(VariableStatData *vardata, Oid func_oid);
 extern bool get_restriction_variable(PlannerInfo *root, List *args,
 									 int varRelid,
diff --git a/src/include/utils/varlena.h b/src/include/utils/varlena.h
index 2e907612afc..f818ed9143b 100644
--- a/src/include/utils/varlena.h
+++ b/src/include/utils/varlena.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/include/utils/varlena.h
  *
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index 2bbb70333dc..713cbbf6360 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -58,7 +58,12 @@ ecpg_get_connection_nr(const char *connection_name)
 
 		for (con = all_connections; con != NULL; con = con->next)
 		{
-			if (strcmp(connection_name, con->name) == 0)
+			/*
+			 * Check for the case of a NULL connection name, stored as such in
+			 * the connection information by ECPGconnect() when the database
+			 * name is not specified by its caller.
+			 */
+			if (con->name != NULL && strcmp(connection_name, con->name) == 0)
 				break;
 		}
 		ret = con;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index c6ef441d139..0486b157eee 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -475,6 +475,16 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 		memset(&stmt, 0, sizeof stmt);
 		stmt.lineno = lineno;
 
+		/* desperate try to guess something sensible */
+		stmt.connection = ecpg_get_connection(NULL);
+		if (stmt.connection == NULL)
+		{
+			ecpg_raise(lineno, ECPG_NO_CONN, ECPG_SQLSTATE_CONNECTION_DOES_NOT_EXIST,
+					   ecpg_gettext("NULL"));
+			va_end(args);
+			return false;
+		}
+
 		/* Make sure we do NOT honor the locale for numeric input */
 		/* since the database gives the standard decimal point */
 		/* (see comments in execute.c) */
@@ -497,8 +507,6 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 		setlocale(LC_NUMERIC, "C");
 #endif
 
-		/* desperate try to guess something sensible */
-		stmt.connection = ecpg_get_connection(NULL);
 		ecpg_store_result(ECPGresult, index, &stmt, &data_var);
 
 #ifdef HAVE_USELOCALE
diff --git a/src/interfaces/ecpg/ecpglib/po/es.po b/src/interfaces/ecpg/ecpglib/po/es.po
index 0a957e220c5..f6e677d005a 100644
--- a/src/interfaces/ecpg/ecpglib/po/es.po
+++ b/src/interfaces/ecpg/ecpglib/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecpglib (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:40+0000\n"
+"POT-Creation-Date: 2026-02-06 23:09+0000\n"
 "PO-Revision-Date: 2024-11-16 14:23+0100\n"
 "Last-Translator: Emanuel Calvo Franco <postgres-arg@gmail.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: connect.c:221
+#: connect.c:226
 msgid "empty message text"
 msgstr "mensaje de texto vacío"
 
-#: connect.c:386 connect.c:645
+#: connect.c:391 connect.c:653
 msgid "<DEFAULT>"
 msgstr "<POR OMISIÓN>"
 
@@ -195,6 +195,6 @@ msgstr "se ha perdido la conexión al servidor"
 msgid "SQL error: %s\n"
 msgstr "error SQL: %s\n"
 
-#: execute.c:2186 execute.c:2193
+#: execute.c:2189 execute.c:2196
 msgid "<empty>"
 msgstr "<vacío>"
diff --git a/src/interfaces/ecpg/ecpglib/po/ru.po b/src/interfaces/ecpg/ecpglib/po/ru.po
index 91b23dbc9fc..18282264d30 100644
--- a/src/interfaces/ecpg/ecpglib/po/ru.po
+++ b/src/interfaces/ecpg/ecpglib/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecpglib (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2019-09-09 13:30+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "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:221
+#: connect.c:226
 msgid "empty message text"
 msgstr "пустое сообщение"
 
-#: connect.c:386 connect.c:645
+#: connect.c:391 connect.c:653
 msgid "<DEFAULT>"
 msgstr "<ПО_УМОЛЧАНИЮ>"
 
@@ -196,7 +196,7 @@ msgstr "подключение к серверу потеряно"
 msgid "SQL error: %s\n"
 msgstr "ошибка SQL: %s\n"
 
-#: execute.c:2186 execute.c:2193
+#: execute.c:2189 execute.c:2196
 msgid "<empty>"
 msgstr "<>"
 
diff --git a/src/interfaces/ecpg/ecpglib/po/sv.po b/src/interfaces/ecpg/ecpglib/po/sv.po
index 9e499cc68d3..f7f07373ac1 100644
--- a/src/interfaces/ecpg/ecpglib/po/sv.po
+++ b/src/interfaces/ecpg/ecpglib/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 11:10+0000\n"
-"PO-Revision-Date: 2024-07-12 15:08+0200\n"
+"PO-Revision-Date: 2025-07-29 19:44+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index ea1146f520f..998c790c176 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -349,8 +349,12 @@ ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con)
 bool
 ECPGdeallocate_all(int lineno, int compat, const char *connection_name)
 {
-	return ecpg_deallocate_all_conn(lineno, compat,
-									ecpg_get_connection(connection_name));
+	struct connection *con = ecpg_get_connection(connection_name);
+
+	if (!ecpg_init(con, connection_name, lineno))
+		return false;
+
+	return ecpg_deallocate_all_conn(lineno, compat, con);
 }
 
 char *
@@ -363,13 +367,15 @@ ecpg_prepared(const char *name, struct connection *con)
 }
 
 /* return the prepared statement */
-/* lineno is not used here, but kept in to not break API */
 char *
 ECPGprepared_statement(const char *connection_name, const char *name, int lineno)
 {
-	(void) lineno;				/* keep the compiler quiet */
+	struct connection *con = ecpg_get_connection(connection_name);
+
+	if (!ecpg_init(con, connection_name, lineno))
+		return NULL;
 
-	return ecpg_prepared(name, ecpg_get_connection(connection_name));
+	return ecpg_prepared(name, con);
 }
 
 /*
@@ -466,10 +472,18 @@ ecpg_freeStmtCacheEntry(int lineno, int compat,
 
 	con = ecpg_get_connection(entry->connection);
 
-	/* free the 'prepared_statement' list entry */
-	this = ecpg_find_prepared_statement(entry->stmtID, con, &prev);
-	if (this && !deallocate_one(lineno, compat, con, prev, this))
-		return -1;
+	/*
+	 * If the connection is gone, the prepared_statement list it owned is
+	 * already unreachable, so just skip that cleanup.  We must still clear
+	 * the cache slot below so it can be reused.
+	 */
+	if (con)
+	{
+		/* free the 'prepared_statement' list entry */
+		this = ecpg_find_prepared_statement(entry->stmtID, con, &prev);
+		if (this && !deallocate_one(lineno, compat, con, prev, this))
+			return -1;
+	}
 
 	entry->stmtID[0] = '\0';
 
diff --git a/src/interfaces/ecpg/oracle_test/compat_informix/meson.build b/src/interfaces/ecpg/oracle_test/compat_informix/meson.build
index 5f8532d729c..82bbdc70cdf 100644
--- a/src/interfaces/ecpg/oracle_test/compat_informix/meson.build
+++ b/src/interfaces/ecpg/oracle_test/compat_informix/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'charfuncs',
diff --git a/src/interfaces/ecpg/oracle_test/compat_oracle/meson.build b/src/interfaces/ecpg/oracle_test/compat_oracle/meson.build
index badfdaa5dde..e8afadcc65a 100644
--- a/src/interfaces/ecpg/oracle_test/compat_oracle/meson.build
+++ b/src/interfaces/ecpg/oracle_test/compat_oracle/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'char_array',
diff --git a/src/interfaces/ecpg/oracle_test/connect/.gitignore b/src/interfaces/ecpg/oracle_test/connect/.gitignore
index e0639f3c8d1..02236847444 100644
--- a/src/interfaces/ecpg/oracle_test/connect/.gitignore
+++ b/src/interfaces/ecpg/oracle_test/connect/.gitignore
@@ -8,3 +8,5 @@
 /test4.c
 /test5
 /test5.c
+/test6
+/test6.c
diff --git a/src/interfaces/ecpg/oracle_test/connect/Makefile b/src/interfaces/ecpg/oracle_test/connect/Makefile
index b5b215a346e..088201ed875 100644
--- a/src/interfaces/ecpg/oracle_test/connect/Makefile
+++ b/src/interfaces/ecpg/oracle_test/connect/Makefile
@@ -7,6 +7,7 @@ TESTS = test1 test1.c \
         test2 test2.c \
         test3 test3.c \
         test4 test4.c \
-        test5 test5.c
+        test5 test5.c \
+        test6 test6.c
 
 all: $(TESTS)
diff --git a/src/interfaces/ecpg/oracle_test/connect/meson.build b/src/interfaces/ecpg/oracle_test/connect/meson.build
index b24975c82e5..9a08487b856 100644
--- a/src/interfaces/ecpg/oracle_test/connect/meson.build
+++ b/src/interfaces/ecpg/oracle_test/connect/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'test1',
@@ -7,6 +7,7 @@ pgc_files = [
   'test3',
   'test4',
   'test5',
+  'test6',
 ]
 
 foreach pgc_file : pgc_files
diff --git a/src/interfaces/ecpg/oracle_test/connect/test6.pgc b/src/interfaces/ecpg/oracle_test/connect/test6.pgc
new file mode 100644
index 00000000000..d2c10dffb03
--- /dev/null
+++ b/src/interfaces/ecpg/oracle_test/connect/test6.pgc
@@ -0,0 +1,68 @@
+/*
+ * This test verifies that ecpg functions properly handle NULL connections
+ * (i.e., when a connection name doesn't exist or has been disconnected).
+ * Before the fix, these operations would cause a segmentation fault.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+exec sql include ../regression;
+
+int
+main(void)
+{
+exec sql begin declare section;
+	int val1output = 2;
+	int val1 = 1;
+	char val2[6] = "data1";
+	char *stmt1 = "SELECT * from test1 where a = $1 and b = $2";
+exec sql end declare section;
+
+	ECPGdebug(1, stderr);
+
+	/* Connect to the database */
+	exec sql connect to REGRESSDB1 as myconn;
+
+	/* Test 1: Try to get descriptor on a disconnected connection */
+	printf("Test 1: Try to get descriptor on a disconnected connection\n");
+	exec sql create table test1 (a int, b text);
+	exec sql insert into test1 (a,b) values (1, 'data1');
+
+	exec sql allocate descriptor indesc;
+	exec sql allocate descriptor outdesc;
+
+	exec sql prepare foo2 from :stmt1;
+
+	exec sql set descriptor indesc value 1 DATA = :val1;
+	exec sql set descriptor indesc value 2 DATA = :val2;
+
+	exec sql execute foo2 using sql descriptor indesc into sql descriptor outdesc;
+
+	exec sql rollback;
+	exec sql disconnect;
+	exec sql get descriptor outdesc value 1 :val1output = DATA;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 2: Try to deallocate all on a non-existent connection */
+	printf("Test 2: deallocate all with non-existent connection\n");
+	exec sql at nonexistent deallocate all;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 3: deallocate on disconnected connection */
+	printf("Test 3: deallocate all on disconnected connection\n");
+	exec sql deallocate all;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 4: Use prepared statement from non-existent connection */
+	printf("Test 4: Use prepared statement from non-existent connection\n");
+	exec sql at nonexistent prepare stmt1 FROM "SELECT 1";
+	exec sql at nonexistent declare cur1 cursor for stmt1;
+	exec sql at nonexistent open cur1;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	printf("All tests completed !\n");
+
+	return 0;
+}
diff --git a/src/interfaces/ecpg/oracle_test/ecpg_schedule b/src/interfaces/ecpg/oracle_test/ecpg_schedule
index 254a0bacc75..202110e9fc6 100644
--- a/src/interfaces/ecpg/oracle_test/ecpg_schedule
+++ b/src/interfaces/ecpg/oracle_test/ecpg_schedule
@@ -13,6 +13,7 @@ test: connect/test2
 test: connect/test3
 test: connect/test4
 test: connect/test5
+test: connect/test6
 test: pgtypeslib/dt_test
 test: pgtypeslib/dt_test2
 test: pgtypeslib/num_test
diff --git a/src/interfaces/ecpg/oracle_test/expected/compat_informix-dec_test.c b/src/interfaces/ecpg/oracle_test/expected/compat_informix-dec_test.c
index fe3f08c50fc..cce0a297644 100644
--- a/src/interfaces/ecpg/oracle_test/expected/compat_informix-dec_test.c
+++ b/src/interfaces/ecpg/oracle_test/expected/compat_informix-dec_test.c
@@ -30,7 +30,7 @@
 
 #line 1 "printf_hack.h"
 /*
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
diff --git a/src/interfaces/ecpg/oracle_test/expected/connect-test6.c b/src/interfaces/ecpg/oracle_test/expected/connect-test6.c
new file mode 100644
index 00000000000..eed3c46a38c
--- /dev/null
+++ b/src/interfaces/ecpg/oracle_test/expected/connect-test6.c
@@ -0,0 +1,146 @@
+/* Processed by ecpg (regression mode) */
+/* These include files are added by the preprocessor */
+#include <ecpglib.h>
+#include <ecpgerrno.h>
+#include <sqlca.h>
+/* End of automatic include section */
+#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
+
+#line 1 "test6.pgc"
+/*
+ * This test verifies that ecpg functions properly handle NULL connections
+ * (i.e., when a connection name doesn't exist or has been disconnected).
+ * Before the fix, these operations would cause a segmentation fault.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+
+#line 1 "regression.h"
+
+
+
+
+
+
+#line 11 "test6.pgc"
+
+
+int
+main(void)
+{
+/* exec sql begin declare section */
+	   
+	   
+	   
+	   
+
+#line 17 "test6.pgc"
+ int val1output = 2 ;
+ 
+#line 18 "test6.pgc"
+ int val1 = 1 ;
+ 
+#line 19 "test6.pgc"
+ char val2 [ 6 ] = "data1" ;
+ 
+#line 20 "test6.pgc"
+ char * stmt1 = "SELECT * from test1 where a = $1 and b = $2" ;
+/* exec sql end declare section */
+#line 21 "test6.pgc"
+
+
+	ECPGdebug(1, stderr);
+
+	/* Connect to the database */
+	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "myconn", 0); }
+#line 26 "test6.pgc"
+
+
+	/* Test 1: Try to get descriptor on a disconnected connection */
+	printf("Test 1: Try to get descriptor on a disconnected connection\n");
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test1 ( a int , b text )", ECPGt_EOIT, ECPGt_EORT);}
+#line 30 "test6.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test1 ( a , b ) values ( 1 , 'data1' )", ECPGt_EOIT, ECPGt_EORT);}
+#line 31 "test6.pgc"
+
+
+	ECPGallocate_desc(__LINE__, "indesc");
+#line 33 "test6.pgc"
+
+	ECPGallocate_desc(__LINE__, "outdesc");
+#line 34 "test6.pgc"
+
+
+	{ ECPGprepare(__LINE__, NULL, 0, "foo2", stmt1);}
+#line 36 "test6.pgc"
+
+
+	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
+	ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT);
+}
+#line 38 "test6.pgc"
+
+	{ ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data,
+	ECPGt_char,(val2),(long)6,(long)1,(6)*sizeof(char), ECPGd_EODT);
+}
+#line 39 "test6.pgc"
+
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "foo2", 
+	ECPGt_descriptor, "indesc", 1L, 1L, 1L, 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
+	ECPGt_descriptor, "outdesc", 1L, 1L, 1L, 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
+#line 41 "test6.pgc"
+
+
+	{ ECPGtrans(__LINE__, NULL, "rollback");}
+#line 43 "test6.pgc"
+
+	{ ECPGdisconnect(__LINE__, "CURRENT");}
+#line 44 "test6.pgc"
+
+	{ ECPGget_desc(__LINE__, "outdesc", 1,ECPGd_data,
+	ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), ECPGd_EODT);
+}
+#line 45 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 2: Try to deallocate all on a non-existent connection */
+	printf("Test 2: deallocate all with non-existent connection\n");
+	{ ECPGdeallocate_all(__LINE__, 0, "nonexistent");}
+#line 50 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 3: deallocate on disconnected connection */
+	printf("Test 3: deallocate all on disconnected connection\n");
+	{ ECPGdeallocate_all(__LINE__, 0, NULL);}
+#line 55 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 4: Use prepared statement from non-existent connection */
+	printf("Test 4: Use prepared statement from non-existent connection\n");
+	{ ECPGprepare(__LINE__, "nonexistent", 0, "stmt1", "SELECT 1");}
+#line 60 "test6.pgc"
+
+	/* declare cur1 cursor for $1 */
+#line 61 "test6.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, "nonexistent", 0, ECPGst_normal, "declare cur1 cursor for $1", 
+	ECPGt_char_variable,(ECPGprepared_statement("nonexistent", "stmt1", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
+#line 62 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	printf("All tests completed !\n");
+
+	return 0;
+}
diff --git a/src/interfaces/ecpg/oracle_test/expected/connect-test6.stderr b/src/interfaces/ecpg/oracle_test/expected/connect-test6.stderr
new file mode 100644
index 00000000000..8784d5a9d40
--- /dev/null
+++ b/src/interfaces/ecpg/oracle_test/expected/connect-test6.stderr
@@ -0,0 +1,50 @@
+[NO_PID]: ECPGdebug: set to 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGconnect: opening database ecpg1_regression on <DEFAULT> port <DEFAULT>  
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: query: create table test1 ( a int , b text ); with 0 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 30: OK: CREATE TABLE
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: query: insert into test1 ( a , b ) values ( 1 , 'data1' ); with 0 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 31: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: prepare_common on line 36: name foo2; query: "SELECT * from test1 where a = $1 and b = $2"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 41: query: SELECT * from test1 where a = $1 and b = $2; with 2 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 41: using PQexecPrepared for "SELECT * from test1 where a = $1 and b = $2"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_free_params on line 41: parameter 1 = 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_free_params on line 41: parameter 2 = data1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 41: correctly got 1 tuples with 2 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 41: putting result (1 tuples) into descriptor outdesc
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGtrans on line 43: action "rollback"; connection "myconn"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: deallocate_one on line 0: name foo2
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_finish: connection myconn closed
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGget_desc: reading items for tuple 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: raising sqlcode -220 on line 45: connection "NULL" does not exist on line 45
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 50: connection "nonexistent" does not exist on line 50
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 55: connection "NULL" does not exist on line 55
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 60: connection "nonexistent" does not exist on line 60
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 63: connection "nonexistent" does not exist on line 63
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 62: connection "nonexistent" does not exist on line 62
+[NO_PID]: sqlca: code: -220, state: 08003
diff --git a/src/interfaces/ecpg/oracle_test/expected/connect-test6.stdout b/src/interfaces/ecpg/oracle_test/expected/connect-test6.stdout
new file mode 100644
index 00000000000..bf9a2e91051
--- /dev/null
+++ b/src/interfaces/ecpg/oracle_test/expected/connect-test6.stdout
@@ -0,0 +1,9 @@
+Test 1: Try to get descriptor on a disconnected connection
+sqlca.sqlcode = -220
+Test 2: deallocate all with non-existent connection
+sqlca.sqlcode = -220
+Test 3: deallocate all on disconnected connection
+sqlca.sqlcode = -220
+Test 4: Use prepared statement from non-existent connection
+sqlca.sqlcode = -220
+All tests completed !
diff --git a/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test.c
index 9d1e0e4d0f0..7512d9d6321 100644
--- a/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test.c
+++ b/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test.c
@@ -26,7 +26,7 @@
 
 #line 1 "printf_hack.h"
 /*
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
diff --git a/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test2.c
index 417ef5d01ca..c0d1d762fb2 100644
--- a/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test2.c
+++ b/src/interfaces/ecpg/oracle_test/expected/pgtypeslib-num_test2.c
@@ -27,7 +27,7 @@
 
 #line 1 "printf_hack.h"
 /*
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
diff --git a/src/interfaces/ecpg/oracle_test/meson.build b/src/interfaces/ecpg/oracle_test/meson.build
index a07e1e2763f..279804a2721 100644
--- a/src/interfaces/ecpg/oracle_test/meson.build
+++ b/src/interfaces/ecpg/oracle_test/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 # can't run ecpg to build test dependencies, at least not without an emulator
 if meson.is_cross_build()
diff --git a/src/interfaces/ecpg/oracle_test/pg_regress_ecpg.c b/src/interfaces/ecpg/oracle_test/pg_regress_ecpg.c
index 47cfdf25196..b0c3d890eae 100644
--- a/src/interfaces/ecpg/oracle_test/pg_regress_ecpg.c
+++ b/src/interfaces/ecpg/oracle_test/pg_regress_ecpg.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/interfaces/ecpg/test/pg_regress_ecpg.c
  *
diff --git a/src/interfaces/ecpg/oracle_test/pgtypeslib/meson.build b/src/interfaces/ecpg/oracle_test/pgtypeslib/meson.build
index 6a6f6ff0dd1..a07690c9f00 100644
--- a/src/interfaces/ecpg/oracle_test/pgtypeslib/meson.build
+++ b/src/interfaces/ecpg/oracle_test/pgtypeslib/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'dt_test',
diff --git a/src/interfaces/ecpg/oracle_test/preproc/meson.build b/src/interfaces/ecpg/oracle_test/preproc/meson.build
index 3678b9c00c5..456e729d5c3 100644
--- a/src/interfaces/ecpg/oracle_test/preproc/meson.build
+++ b/src/interfaces/ecpg/oracle_test/preproc/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'array_of_struct',
diff --git a/src/interfaces/ecpg/oracle_test/printf_hack.h b/src/interfaces/ecpg/oracle_test/printf_hack.h
index 2a90eab04f5..d83932eda77 100644
--- a/src/interfaces/ecpg/oracle_test/printf_hack.h
+++ b/src/interfaces/ecpg/oracle_test/printf_hack.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
diff --git a/src/interfaces/ecpg/oracle_test/sql/meson.build b/src/interfaces/ecpg/oracle_test/sql/meson.build
index 2c691526c61..89e37e16344 100644
--- a/src/interfaces/ecpg/oracle_test/sql/meson.build
+++ b/src/interfaces/ecpg/oracle_test/sql/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'array',
diff --git a/src/interfaces/ecpg/oracle_test/thread/meson.build b/src/interfaces/ecpg/oracle_test/thread/meson.build
index 46e87692dd4..12616416f1e 100644
--- a/src/interfaces/ecpg/oracle_test/thread/meson.build
+++ b/src/interfaces/ecpg/oracle_test/thread/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 pgc_files = [
   'thread_implicit',
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 1b253747fc4..f43343b4594 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -335,8 +335,8 @@ PGTYPESdate_defmt_asc(date * d, const char *fmt, const char *str)
 	 */
 	int			token[3][2];
 	int			token_values[3] = {-1, -1, -1};
-	char	   *fmt_token_order;
-	char	   *fmt_ystart,
+	const char *fmt_token_order;
+	const char *fmt_ystart,
 			   *fmt_mstart,
 			   *fmt_dstart;
 	unsigned int i;
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 6f94b832a03..390e7713bfb 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1975,7 +1975,7 @@ civarind: cvariable indicator
 
 char_civar: char_variable
 	{
-		char	   *ptr = strstr(@1, ".arr");
+		char	   *ptr = (char *) strstr(@1, ".arr");
 
 		if (ptr)				/* varchar, we need the struct name here, not
 								 * the struct element */
diff --git a/src/interfaces/ecpg/preproc/po/es.po b/src/interfaces/ecpg/preproc/po/es.po
index f8e3c4a34ec..fee381f2ccd 100644
--- a/src/interfaces/ecpg/preproc/po/es.po
+++ b/src/interfaces/ecpg/preproc/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:40+0000\n"
-"PO-Revision-Date: 2024-11-16 14:23+0100\n"
+"POT-Creation-Date: 2026-02-06 23:10+0000\n"
+"PO-Revision-Date: 2025-09-21 11:11+0200\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -23,47 +23,47 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "la variable «%s» debe tener tipo numérico"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "el descriptor %s vinculado a la conexión %s no existe"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "el descriptor %s vinculado a la conexión predeterminada no existe"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "no existe el descriptor del elemento de cabecera «%d»"
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable es siempre 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member es siempre 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "elemento del descriptor «%s» no está implementado"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "no se puede establecer el elemento del descriptor «%s»"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid ""
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -72,7 +72,7 @@ msgstr ""
 "%s es el preprocesador de SQL incrustado para programas en C de PostgreSQL.\n"
 "\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid ""
 "Usage:\n"
@@ -83,12 +83,12 @@ msgstr ""
 "  %s [OPCIÓN]... ARCHIVO...\n"
 "\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid ""
 "  -c             automatically generate C code from embedded SQL code;\n"
@@ -97,7 +97,7 @@ msgstr ""
 "  -c             genera automáticamente código en C desde código SQL\n"
 "                 incrustado; esto afecta EXEC SQL TYPE\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid ""
 "  -C MODE        set compatibility mode; MODE can be one of\n"
@@ -106,37 +106,37 @@ msgstr ""
 "  -C MODO        establece el modo de compatibilidad;\n"
 "                 MODO puede ser \"INFORMIX\", \"INFORMIX_SE\", \"ORACLE\"\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             genera salida depurada del analizador\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D SYMBOL      define SYMBOL\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, c-format
 msgid "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "  -h             analiza un archivo de cabecera; esto incluye «-c»\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, c-format
 msgid "  -i             parse system include files as well\n"
 msgstr "  -i             analiza además los archivos de inclusión de sistema\n"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
 msgstr "  -I DIRECTORIO  busca los archivos de inclusión en DIRECTORIO\n"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o ARCHIVO     escribe la salida en ARCHIVO\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid ""
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
@@ -146,27 +146,27 @@ msgstr ""
 "                 OPCIÓN puede ser: «no_indicator», «prepare»,\n"
 "                 «questionmarks»\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   ejecuta en modo de prueba de regresión\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             activa el compromiso (commit) automático de transacciones\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  muestra información de la versión, luego sale\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     muestra esta ayuda, luego sale\n"
 
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid ""
 "\n"
@@ -177,7 +177,7 @@ msgstr ""
 "Si no se especifica un archivo de salida, el nombre se forma agregando .c al\n"
 "archivo de entrada, luego de quitar .pgc si está presente.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Reporte errores a <%s>.\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sitio web de %s: <%s>\n"
@@ -236,7 +236,7 @@ msgstr "%s: no se especificaron archivos de entrada\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "el cursor «%s» fue declarado pero no abierto"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "no se pudo eliminar el archivo de salida «%s»\n"
@@ -246,413 +246,418 @@ msgstr "no se pudo eliminar el archivo de salida «%s»\n"
 msgid "unterminated /* comment"
 msgstr "comentario /* no cerrado"
 
-#: pgc.l:559
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "una cadena de bits está inconclusa"
 
-#: pgc.l:567
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "una cadena hexadecimal está inconclusa"
 
-#: pgc.l:642
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "cadena de bits no válida"
 
-#: pgc.l:647
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "cadena hexadecimal no válida"
 
-#: pgc.l:665
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr "estado previo no manejado en xqs\n"
 
-#: pgc.l:691 pgc.l:800
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "una cadena en comillas está inconclusa"
 
-#: pgc.l:742
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "una cadena separada por $ está inconclusa"
 
-#: pgc.l:760 pgc.l:780
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "identificador delimitado de longitud cero"
 
-#: pgc.l:791
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "un identificador en comillas está inconcluso"
 
-#: pgc.l:960
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "el número de parámetro es demasiado grande"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "basura sigue después de un parámetro"
 
-#: pgc.l:1012 pgc.l:1015 pgc.l:1018
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "basura sigue después de un literal numérico"
 
-#: pgc.l:1141
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "comentarios /* ... */ anidados"
 
-#: pgc.l:1240
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "falta un identificador en la orden EXEC SQL UNDEF"
 
-#: pgc.l:1258 pgc.l:1271 pgc.l:1287 pgc.l:1300
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "demasiadas condiciones EXEC SQL IFDEF anidadas"
 
-#: pgc.l:1316 pgc.l:1327 pgc.l:1342 pgc.l:1364
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "falta el «EXEC SQL IFDEF» / «EXEC SQL IFNDEF»"
 
-#: pgc.l:1318 pgc.l:1329 pgc.l:1522
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "falta el «EXEC SQL ENDIF;»"
 
-#: pgc.l:1344 pgc.l:1366
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "hay más de un EXEC SQL ELSE"
 
-#: pgc.l:1389 pgc.l:1403
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF sin coincidencia"
 
-#: pgc.l:1464
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "identificador faltante en la orden EXEC SQL IFDEF"
 
-#: pgc.l:1473
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "identificador faltante en la orden EXEC SQL DEFINE"
 
-#: pgc.l:1511
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "error de sintaxis en orden EXEC SQL INCLUDE"
 
-#: pgc.l:1566
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "error interno: estado no esperado; por favor reporte a <%s>"
 
-#: pgc.l:1718
+#: pgc.l:1766
 #, 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:1741
+#: pgc.l:1793
 #, 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"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "ATENCIÓN: "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "ERROR: "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "inicializador no permitido en definición de tipo"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "el nombre de tipo «string» está reservado en modo Informix"
 
-#: preproc.y:552 preproc.y:19034
+#: preproc.y:512 preproc.y:8818
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "el tipo «%s» ya está definido"
 
-#: preproc.y:577 preproc.y:19669 preproc.y:19991 variable.c:624
+#: preproc.y:539 preproc.y:9532 preproc.y:9877 variable.c:652
 #, 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"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "la conexión %s es sobrescrita con %s por la sentencia DECLARE %s"
 
-#: preproc.y:1831
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "la opción AT no está permitida en la sentencia CLOSE DATABASE"
 
-#: preproc.y:2081
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "la opción AT no está permitida en la sentencia CONNECT"
 
-#: preproc.y:2121
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "la opción AT no está permitida en la sentencia DISCONNECT"
 
-#: preproc.y:2176
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "la opción AT no está permitida en la sentencia SET CONNECTION"
 
-#: preproc.y:2198
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "la opción AT no está permitida en la sentencia TYPE"
 
-#: preproc.y:2207
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "la opción AT no está permitida en la sentencia VAR"
 
-#: preproc.y:2214
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "la opción AT no está permitida en la sentencia WHENEVER"
 
-#: preproc.y:2339 preproc.y:2626 preproc.y:4349 preproc.y:5021 preproc.y:5891
-#: preproc.y:6095 preproc.y:6196 preproc.y:12460
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6088
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "característica no soportada será pasada al servidor"
 
-#: preproc.y:2884
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL no está implementado"
 
-#: preproc.y:3596
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN no está implementado"
 
-#: preproc.y:10444 preproc.y:18503
+#: preproc.y:5146 preproc.y:8269
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "no se puede usar «database» como nombre de cursor en modo INFORMIX"
 
-#: preproc.y:10451 preproc.y:18513
+#: preproc.y:5153 preproc.y:8279
 #, 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:10453 preproc.y:18515
+#: preproc.y:5155 preproc.y:8281
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "el cursor «%s» ya está definido"
 
-#: preproc.y:10927
+#: preproc.y:5402
 #, 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:18195 preproc.y:18202
+#: preproc.y:7917 preproc.y:7925
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS no puede especificar INTO"
 
-#: preproc.y:18238
+#: preproc.y:7970
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "se esperaba «@», se encontró «%s»"
 
-#: preproc.y:18250
+#: preproc.y:7982
 #, 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:18253
+#: preproc.y:7985
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "se esperaba «://», se encontró «%s»"
 
-#: preproc.y:18258
+#: preproc.y:7990
 #, 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:18284
+#: preproc.y:8017
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "se esperaba «postgresql», se encontró «%s»"
 
-#: preproc.y:18287
+#: preproc.y:8020
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "tipo de conexión no válido: %s"
 
-#: preproc.y:18296
+#: preproc.y:8029
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "se esperaba «@» o «://», se encontró «%s»"
 
-#: preproc.y:18371 preproc.y:18389
+#: preproc.y:8127 preproc.y:8145
 #, c-format
 msgid "invalid data type"
 msgstr "tipo de dato no válido"
 
-#: preproc.y:18400 preproc.y:18417
+#: preproc.y:8156 preproc.y:8173
 #, c-format
 msgid "incomplete statement"
 msgstr "sentencia incompleta"
 
-#: preproc.y:18403 preproc.y:18420
+#: preproc.y:8159 preproc.y:8176
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "elemento «%s» no reconocido"
 
-#: preproc.y:18465
+#: preproc.y:8231
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "el nombre «%s» ya está declarado"
 
-#: preproc.y:18754
+#: preproc.y:8534
 #, 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:18853
+#: preproc.y:8633
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "la especificación de intervalo no está permitida aquí"
 
-#: preproc.y:19009 preproc.y:19061
+#: preproc.y:8789 preproc.y:8847
 #, 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:19184
+#: preproc.y:8982
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "los punteros a varchar no están implementados"
 
-#: preproc.y:19635
+#: preproc.y:9497
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "inicializador no permitido en la orden EXEC SQL VAR"
 
-#: preproc.y:19949
+#: preproc.y:9820
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "no se permiten los arrays de indicadores en la entrada"
 
-#: preproc.y:20136
+#: preproc.y:10054
 #, 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:20177
+#: preproc.y:10099
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
 
-#: type.c:18 type.c:30
-#, c-format
-msgid "out of memory"
-msgstr "memoria agotada"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "código de tipo de variable %d no reconocido"
 
-#: type.c:263
+#: type.c:240
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
 msgstr "la variable «%s» está escondida por una variable local de tipo diferente"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "la variable «%s» está escondida por una variable local"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "la variable de indicador «%s» está escondida por una variable local de tipo diferente"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "variable de indicador «%s» está escondida por una variable local"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "indicador para array/puntero debe ser array/puntero"
 
-#: type.c:291
+#: type.c:268
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr "no se permiten arrays anidados (excepto cadenas de caracteres)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "el indicador para struct debe ser struct"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, c-format
 msgid "indicator for simple data type has to be simple"
 msgstr "el indicador para tipo dato simple debe ser simple"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "struct para indicador «%s» no tiene suficientes miembros"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "struct para indicador «%s» tiene demasiados miembros"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "código de descriptor de elemento %d no reconocido"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "ATENCIÓN: "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "ERROR: "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "memoria agotada"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "variable formada incorrectamente «%s»"
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "la variable «%s» no es un puntero"
@@ -672,39 +677,44 @@ msgstr "la variable «%s» no es una estructura ni una unión"
 msgid "variable \"%s\" is not an array"
 msgstr "la variable «%s» no es un array"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "corchete sin emparejar en la variable «%s»"
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "la variable «%s» no está declarada"
 
-#: variable.c:492
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "la variable de un indicador debe ser de algún tipo numérico entero"
 
-#: variable.c:509
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "nombre de tipo de datos «%s» no reconocido"
 
-#: variable.c:520 variable.c:528 variable.c:545 variable.c:548
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "los arrays multidimensionales no están soportados"
 
-#: variable.c:537
+#: variable.c:565
 #, 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] "no se soportan los punteros multinivel (más de 2); se encontró 1 nivel"
 msgstr[1] "no se soportan los punteros multinivel (más de 2); se encontraron %d niveles"
 
-#: variable.c:542
+#: variable.c:570
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "los punteros a puntero no están soportados para este tipo de dato"
 
-#: variable.c:562
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "los arrays multidimensionales para estructuras no están soportados"
diff --git a/src/interfaces/ecpg/preproc/po/fr.po b/src/interfaces/ecpg/preproc/po/fr.po
index 6d841e85359..eccecaeba28 100644
--- a/src/interfaces/ecpg/preproc/po/fr.po
+++ b/src/interfaces/ecpg/preproc/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-20 21:10+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-04 19:40+0000\n"
+"PO-Revision-Date: 2025-07-06 13:57+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -20,49 +20,49 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "la variable « %s » doit avoir un type numeric"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "le descripteur %s lié à la connexion %s n'existe pas"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "le descripteur %s lié à la connexion par défaut n'existe pas"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "l'élément d'en-tête du descripteur « %d » n'existe pas"
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable vaut toujours 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member vaut toujours 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "l'élément du descripteur « %s » n'est pas implanté"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "l'élément du descripteur « %s » ne peut pas être initialisé"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid ""
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -71,7 +71,7 @@ msgstr ""
 "%s est le préprocesseur SQL embarqué de PostgreSQL pour les programmes C.\n"
 "\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid ""
 "Usage:\n"
@@ -82,12 +82,12 @@ msgstr ""
 "  %s [OPTION]... FICHIER...\n"
 "\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid ""
 "  -c             automatically generate C code from embedded SQL code;\n"
@@ -96,7 +96,7 @@ msgstr ""
 "  -c             produit automatiquement le code C à partir du code SQL\n"
 "                 embarqué ; ceci affecte EXEC SQL TYPE\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid ""
 "  -C MODE        set compatibility mode; MODE can be one of\n"
@@ -105,39 +105,39 @@ msgstr ""
 "  -C MODE        configure le mode de compatibilité ; MODE peut être\n"
 "                 « INFORMIX », « INFORMIX_SE » ou « ORACLE »\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             produit la sortie de débogage de l'analyseur\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D SYMBOLE     définit SYMBOLE\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, 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\n"
 "                 « -c »\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, 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"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, 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"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o FICHIER     écrit le résultat dans FICHIER\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid ""
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
@@ -146,27 +146,27 @@ msgstr ""
 "  -r OPTION      indique le comportement à l'exécution ; OPTION peut valoir :\n"
 "                 « no_indicator », « prepare », « questionmarks »\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   s'exécute en mode de tests des régressions\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             active la validation automatique des transactions\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  affiche la version et quitte\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     affiche cette aide et quitte\n"
 
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid ""
 "\n"
@@ -178,7 +178,7 @@ msgstr ""
 "le suffixe .c au nom du fichier en entrée après avoir supprimé le suffixe .pgc\n"
 "s'il est présent.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid ""
 "\n"
@@ -187,7 +187,7 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <%s>.\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de %s : <%s>\n"
@@ -237,437 +237,442 @@ msgstr "%s : aucun fichier précisé en entrée\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "le curseur « %s » est déclaré mais non ouvert"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "n'a pas pu supprimer le fichier « %s » en sortie\n"
 
-#: pgc.l:528
+#: pgc.l:542
 #, c-format
 msgid "unterminated /* comment"
 msgstr "commentaire /* non terminé"
 
-#: pgc.l:545
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "chaîne bit littéral non terminée"
 
-#: pgc.l:553
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "chaîne hexadécimale littérale non terminée"
 
-#: pgc.l:628
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "chaîne bit littéral invalide"
 
-#: pgc.l:633
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "chaîne hexadécimale invalide"
 
-#: pgc.l:651
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr "état précédent non géré dans xqs\n"
 
-#: pgc.l:677 pgc.l:786
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "chaîne entre guillemets non terminée"
 
-#: pgc.l:728
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "chaîne entre guillemets dollars non terminée"
 
-#: pgc.l:746 pgc.l:766
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "identifiant délimité de longueur nulle"
 
-#: pgc.l:777
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "identifiant entre guillemets non terminé"
 
-#: pgc.l:946
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "numéro de paramètre trop large"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "élément indésirable après le paramètre"
 
-#: pgc.l:998 pgc.l:1001 pgc.l:1004 pgc.l:1007 pgc.l:1010 pgc.l:1013
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "élément indésirable après la valeur numérique"
 
-#: pgc.l:1136
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "commentaires /* ... */ imbriqués"
 
-#: pgc.l:1235
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "identifiant manquant dans la commande EXEC SQL UNDEF"
 
-#: pgc.l:1253 pgc.l:1266 pgc.l:1282 pgc.l:1295
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "trop de conditions EXEC SQL IFDEF imbriquées"
 
-#: pgc.l:1311 pgc.l:1322 pgc.l:1337 pgc.l:1359
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "correspondance manquante « EXEC SQL IFDEF » / « EXEC SQL IFNDEF »"
 
-#: pgc.l:1313 pgc.l:1324 pgc.l:1517
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "« EXEC SQL ENDIF; » manquant"
 
-#: pgc.l:1339 pgc.l:1361
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "plusieurs EXEC SQL ELSE"
 
-#: pgc.l:1384 pgc.l:1398
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF différent"
 
-#: pgc.l:1459
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "identifiant manquant dans la commande EXEC SQL IFDEF"
 
-#: pgc.l:1468
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "identifiant manquant dans la commande EXEC SQL DEFINE"
 
-#: pgc.l:1506
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "erreur de syntaxe dans la commande EXEC SQL INCLUDE"
 
-#: pgc.l:1561
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "erreur interne : l'état ne peut être atteint ; merci de rapporter ceci à <%s>"
 
-#: pgc.l:1713
+#: pgc.l:1766
 #, 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"
 
-#: pgc.l:1736
+#: pgc.l:1793
 #, 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"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "ATTENTION : "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "ERREUR : "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur « %s » n'existe pas"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "initialiseur non autorisé dans la définition du type"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "le nom du type « string » est réservé dans le mode Informix"
 
-#: preproc.y:552 preproc.y:19072
+#: preproc.y:512 preproc.y:8818
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "le type « %s » est déjà défini"
 
-#: preproc.y:577 preproc.y:19707 preproc.y:20029 variable.c:625
+#: preproc.y:539 preproc.y:9532 preproc.y:9877 variable.c:652
 #, 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"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "la connexion %s est surchargée avec %s par l'instruction DECLARE %s"
 
-#: preproc.y:1833
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "option AT non autorisée dans une instruction CLOSE DATABASE"
 
-#: preproc.y:2083
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "option AT non autorisée dans une instruction CONNECT"
 
-#: preproc.y:2123
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "option AT non autorisée dans une instruction DISCONNECT"
 
-#: preproc.y:2178
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "option AT non autorisée dans une instruction SET CONNECTION"
 
-#: preproc.y:2200
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "option AT non autorisée dans une instruction TYPE"
 
-#: preproc.y:2209
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "option AT non autorisée dans une instruction VAR"
 
-#: preproc.y:2216
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "option AT non autorisée dans une instruction WHENEVER"
 
-#: preproc.y:2341 preproc.y:2628 preproc.y:4379 preproc.y:5043 preproc.y:5913 preproc.y:6117
-#: preproc.y:6218 preproc.y:12482
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016 preproc.y:3103
+#: preproc.y:6088
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "la fonctionnalité non supportée sera passée au serveur"
 
-#: preproc.y:2886
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL n'est pas implanté"
 
-#: preproc.y:3626
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN n'est pas implanté"
 
-#: preproc.y:10466 preproc.y:18541
+#: preproc.y:5146 preproc.y:8269
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "« database » ne peut pas être utilisé comme nom de curseur dans le mode INFORMIX"
 
-#: preproc.y:10473 preproc.y:18551
+#: preproc.y:5153 preproc.y:8279
 #, 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"
 
-#: preproc.y:10475 preproc.y:18553
+#: preproc.y:5155 preproc.y:8281
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "le curseur « %s » est déjà défini"
 
-#: preproc.y:10949
+#: preproc.y:5402
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "la syntaxe obsolète LIMIT #,# a été passée au serveur"
 
-#: preproc.y:18233 preproc.y:18240
+#: preproc.y:7917 preproc.y:7925
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS ne peut pas indiquer INTO"
 
-#: preproc.y:18276
+#: preproc.y:7970
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "« @ » attendu, « %s » trouvé"
 
-#: preproc.y:18288
+#: preproc.y:7982
 #, c-format
 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"
 
-#: preproc.y:18291
+#: preproc.y:7985
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "« :// » attendu, « %s » trouvé"
 
-#: preproc.y:18296
+#: preproc.y:7990
 #, 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 »"
 
-#: preproc.y:18322
+#: preproc.y:8017
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "« postgresql » attendu, « %s » trouvé"
 
-#: preproc.y:18325
+#: preproc.y:8020
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "type de connexion invalide : %s"
 
-#: preproc.y:18334
+#: preproc.y:8029
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "« @ » ou « :// » attendu, « %s » trouvé"
 
-#: preproc.y:18409 preproc.y:18427
+#: preproc.y:8127 preproc.y:8145
 #, c-format
 msgid "invalid data type"
 msgstr "type de données invalide"
 
-#: preproc.y:18438 preproc.y:18455
+#: preproc.y:8156 preproc.y:8173
 #, c-format
 msgid "incomplete statement"
 msgstr "instruction incomplète"
 
-#: preproc.y:18441 preproc.y:18458
+#: preproc.y:8159 preproc.y:8176
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "jeton « %s » non reconnu"
 
-#: preproc.y:18503
+#: preproc.y:8231
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "le nom « %s » est déjà défini"
 
-#: preproc.y:18792
+#: preproc.y:8534
 #, 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"
 
-#: preproc.y:18891
+#: preproc.y:8633
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "interval de spécification non autorisé ici"
 
-#: preproc.y:19047 preproc.y:19099
+#: preproc.y:8789 preproc.y:8847
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "trop de niveaux dans la définition de structure/union imbriquée"
 
-#: preproc.y:19222
+#: preproc.y:8982
 #, 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"
 
-#: preproc.y:19673
+#: preproc.y:9497
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "initialiseur non autorisé dans la commande EXEC SQL VAR"
 
-#: preproc.y:19987
+#: preproc.y:9820
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "les tableaux d'indicateurs ne sont pas autorisés en entrée"
 
-#: preproc.y:20174
+#: preproc.y:10054
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "opérateur non autorisé dans la définition de la variable"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:20215
+#: preproc.y:10099
 #, c-format
 msgid "%s at or near \"%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"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "code %d du type de variable non reconnu"
 
-#: type.c:263
+#: type.c:240
 #, 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"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "la variable « %s » est cachée par une variable locale"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 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"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "la variable indicateur « %s » est cachée par une variable locale"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "l'indicateur pour le tableau/pointeur doit être tableau/pointeur"
 
-#: type.c:291
+#: type.c:268
 #, 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)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "l'indicateur d'un struct doit être un struct"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, 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"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "le struct indicateur « %s » a trop peu de membres"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "le struct indicateur « %s » a trop de membres"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "code %d de l'élément du descripteur non reconnu"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "ATTENTION : "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "ERREUR : "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "variable « %s » mal formée"
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "la variable « %s » n'est pas un pointeur"
@@ -687,27 +692,32 @@ msgstr "la variable « %s » n'est ni une structure ni une union"
 msgid "variable \"%s\" is not an array"
 msgstr "la variable « %s » n'est pas un tableau"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "parenthèse non appariée dans la variable « %s »"
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "la variable « %s » n'est pas déclarée"
 
-#: variable.c:493
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "la variable d'indicateur doit avoir un type integer"
 
-#: variable.c:510
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "nom « %s » non reconnu pour un type de données"
 
-#: variable.c:521 variable.c:529 variable.c:546 variable.c:549
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "les tableaux multidimensionnels ne sont pas supportés"
 
-#: variable.c:538
+#: variable.c:565
 #, 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"
@@ -718,12 +728,12 @@ msgstr[1] ""
 "les pointeurs multi-niveaux (plus de deux) ne sont pas supportés :\n"
 "%d niveaux trouvés"
 
-#: variable.c:543
+#: variable.c:570
 #, 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"
 
-#: variable.c:563
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "les tableaux multidimensionnels ne sont pas supportés pour les structures"
diff --git a/src/interfaces/ecpg/preproc/po/ja.po b/src/interfaces/ecpg/preproc/po/ja.po
index 2509435666a..e2929b0e64c 100644
--- a/src/interfaces/ecpg/preproc/po/ja.po
+++ b/src/interfaces/ecpg/preproc/po/ja.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-03-12 11:10+0900\n"
-"PO-Revision-Date: 2025-03-31 16:23+0900\n"
+"POT-Creation-Date: 2025-04-30 10:33+0900\n"
+"PO-Revision-Date: 2025-04-30 11:34+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -385,12 +385,12 @@ msgstr "型定義では初期化子は許されません"
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "型名\"string\"はInformixモードですでに予約されています"
 
-#: preproc.y:512 preproc.y:8820
+#: preproc.y:512 preproc.y:8822
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "\"%s\"型はすでに定義されています"
 
-#: preproc.y:539 preproc.y:9534 preproc.y:9879 variable.c:652
+#: preproc.y:539 preproc.y:9536 preproc.y:9881 variable.c:652
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "単純なデータ型の多次元配列はサポートされていません"
@@ -435,8 +435,8 @@ msgstr "VAR文ではATオプションは許されません"
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "WHENEVER文ではATオプションは許されません"
 
-#: preproc.y:1375 preproc.y:1498 preproc.y:2260 preproc.y:2586 preproc.y:3017
-#: preproc.y:3104 preproc.y:6086
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6086
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "非サポートの機能がサーバーに渡されます"
@@ -446,22 +446,22 @@ msgstr "非サポートの機能がサーバーに渡されます"
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALLは実装されていません"
 
-#: preproc.y:1896
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDINは実装されていません"
 
-#: preproc.y:5146 preproc.y:8271
+#: preproc.y:5146 preproc.y:8273
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "INFORMIXモードでは\"database\"をカーソル名として使用できません"
 
-#: preproc.y:5153 preproc.y:8281
+#: preproc.y:5153 preproc.y:8283
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "異なったdeclareステートメントにおける変数\"%s\"の使用はサポートされていません"
 
-#: preproc.y:5155 preproc.y:8283
+#: preproc.y:5155 preproc.y:8285
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "カーソル\"%s\"はすでに定義されています"
@@ -471,103 +471,103 @@ msgstr "カーソル\"%s\"はすでに定義されています"
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "サーバーに渡されるLIMIT #,#構文はもはやサポートされていません"
 
-#: preproc.y:7919 preproc.y:7927
+#: preproc.y:7921 preproc.y:7929
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE ASはINTOを指定できません"
 
-#: preproc.y:7972
+#: preproc.y:7974
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "想定では\"@\"、結果では\"%s\""
 
-#: preproc.y:7984
+#: preproc.y:7986
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "プロトコルでは\"tcp\"および\"unix\"のみ、データベースの種類では\"postgresql\"のみがサポートされています"
 
-#: preproc.y:7987
+#: preproc.y:7989
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "想定では\"://\"、結果では\"%s\""
 
-#: preproc.y:7992
+#: preproc.y:7994
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unixドメインソケットは\"localhost\"でのみで動作し、\"%s\"では動作しません"
 
-#: preproc.y:8019
+#: preproc.y:8021
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "想定では\"postgresql\"、結果では\"%s\""
 
-#: preproc.y:8022
+#: preproc.y:8024
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "無効な接続種類: %s"
 
-#: preproc.y:8031
+#: preproc.y:8033
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "想定では\"@または\"\"://\"、結果では\"%s\""
 
-#: preproc.y:8129 preproc.y:8147
+#: preproc.y:8131 preproc.y:8149
 #, c-format
 msgid "invalid data type"
 msgstr "無効なデータ型"
 
-#: preproc.y:8158 preproc.y:8175
+#: preproc.y:8160 preproc.y:8177
 #, c-format
 msgid "incomplete statement"
 msgstr "不完全な文"
 
-#: preproc.y:8161 preproc.y:8178
+#: preproc.y:8163 preproc.y:8180
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "認識できないトークン\"%s\""
 
-#: preproc.y:8233
+#: preproc.y:8235
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "名前\"%s\"はすでに定義されています"
 
-#: preproc.y:8536
+#: preproc.y:8538
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "数値データ型または10進数データ型のみが精度/位取り引数と取ることができます"
 
-#: preproc.y:8635
+#: preproc.y:8637
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "時間間隔の指定はここでは許されません"
 
-#: preproc.y:8791 preproc.y:8849
+#: preproc.y:8793 preproc.y:8851
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "構造体/ユニオンの定義の入れ子レベルが深すぎます"
 
-#: preproc.y:8984
+#: preproc.y:8986
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "varcharを指し示すポインタは実装されていません"
 
-#: preproc.y:9499
+#: preproc.y:9501
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "EXEC SQL VARコマンドでは初期化子は許されません"
 
-#: preproc.y:9822
+#: preproc.y:9824
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "指示子配列は入力として許されません"
 
-#: preproc.y:10056
+#: preproc.y:10058
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "変数定義では演算子は許されません"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:10101
+#: preproc.y:10103
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "\"%2$s\"またはその近辺で%1$s"
@@ -674,8 +674,8 @@ msgstr "変数\"%s\"は配列ではありません"
 
 #: variable.c:220
 #, c-format
-msgid "unmatched brace in variable \"%s\""
-msgstr "変数\"%s\"に閉じられていないブレースがあります"
+msgid "unmatched bracket in variable \"%s\""
+msgstr "変数\"%s\"に閉じられていない角括弧があります"
 
 #: variable.c:235 variable.c:258
 #, c-format
diff --git a/src/interfaces/ecpg/preproc/po/ko.po b/src/interfaces/ecpg/preproc/po/ko.po
index 77d4029a586..53359692dea 100644
--- a/src/interfaces/ecpg/preproc/po/ko.po
+++ b/src/interfaces/ecpg/preproc/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ecpg (PostgreSQL) 17\n"
+"Project-Id-Version: ecpg (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:40+0000\n"
-"PO-Revision-Date: 2025-01-16 10:32+0900\n"
+"POT-Creation-Date: 2025-09-11 21:40+0000\n"
+"PO-Revision-Date: 2025-09-09 11:30+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "\"%s\" 변수는 숫자 형식이어야 함"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "%s 설명자(해당 연결: %s)가 없음"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "기본 연결을 위한 %s 설명자가 없음"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "설명자 헤더 항목 \"%d\"이(가) 없음"
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "null 허용 여부는 항상 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member는 항상 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "설명자 항목 \"%s\"이(가) 구현되지 않음"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "설명자 항목 \"%s\"을(를) 설정할 수 없음"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid ""
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -66,7 +66,7 @@ msgstr ""
 "%s은(는) C 프로그램용 PostgreSQL 포함 SQL 전처리기입니다.\n"
 "\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid ""
 "Usage:\n"
@@ -77,12 +77,12 @@ msgstr ""
 "  %s [OPTION]... 파일...\n"
 "\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "옵션들:\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid ""
 "  -c             automatically generate C code from embedded SQL code;\n"
@@ -91,7 +91,7 @@ msgstr ""
 "  -c             포함된 SQL 코드에서 자동으로 C 코드를 생성합니다.\n"
 "                 EXEC SQL TYPE에 영향을 줍니다.\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid ""
 "  -C MODE        set compatibility mode; MODE can be one of\n"
@@ -101,38 +101,38 @@ msgstr ""
 "다.\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\", \"ORACLE\"\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             파서 디버그 출력 생성\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D SYMBOL      SYMBOL 정의\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, c-format
 msgid ""
 "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "  -h             헤더 파일 구문 분석. 이 옵션은 \"-c\" 옵션 포함\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, c-format
 msgid "  -i             parse system include files as well\n"
 msgstr "  -i             시스템 포함 파일도 구문 분석\n"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
 msgstr "  -I DIRECTORY   DIRECTORY에서 포함 파일 검색\n"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o OUTFILE     OUTFILE에 결과 쓰기\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid ""
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
@@ -142,27 +142,27 @@ msgstr ""
 "다.\n"
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   회귀 테스트 모드에서 실행\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             트랜잭션 자동 커밋 설정\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  버전 정보 보여주고 마침\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     이 도움말을 보여주고 마침\n"
 
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid ""
 "\n"
@@ -173,7 +173,7 @@ msgstr ""
 "출력 파일 이름을 지정하지 않으면 입력 파일 이름에 .pgc가 있을 경우 제거하고\n"
 ".c를 추가하여 이름이 지정됩니다.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid ""
 "\n"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "문제점 보고 주소: <%s>\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 홈페이지: <%s>\n"
@@ -232,7 +232,7 @@ msgstr "%s: 지정된 입력 파일 없음\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "\"%s\" 커서가 선언되었지만 열리지 않음"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "출력 파일 \"%s\"을(를) 제거할 수 없음\n"
@@ -242,253 +242,248 @@ msgstr "출력 파일 \"%s\"을(를) 제거할 수 없음\n"
 msgid "unterminated /* comment"
 msgstr "마무리 안된 /* 주석"
 
-#: pgc.l:559
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "마무리 안된 비트 문자열 문자"
 
-#: pgc.l:567
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "마무리 안된 16진수 문자열 문자"
 
-#: pgc.l:642
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "잘못된 비트 문자열 리터럴"
 
-#: pgc.l:647
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "잘못된 16진수 문자열 문자"
 
-#: pgc.l:665
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr "xqs 안에 다룰 수 없는 이전 상태값 있음\n"
 
-#: pgc.l:691 pgc.l:800
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "마무리 안된 따옴표 안의 문자열"
 
-#: pgc.l:742
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "마무리 안된 따옴표 안의 문자열"
 
-#: pgc.l:760 pgc.l:780
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "길이가 0인 구분 식별자"
 
-#: pgc.l:791
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "마무리 안된 따옴표 안의 식별자"
 
-#: pgc.l:960
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "매개 변수 숫자값이 너무 큽니다"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "매개 변수 뒤에 뭔가 붙었음"
 
-#: pgc.l:1012 pgc.l:1015 pgc.l:1018
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "숫자 뒤에 문자가 붙었습니다"
 
-#: pgc.l:1141
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "중첩된 /* ... */ 주석"
 
-#: pgc.l:1240
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "EXEC SQL UNDEF 명령에 식별자 누락"
 
-#: pgc.l:1258 pgc.l:1271 pgc.l:1287 pgc.l:1300
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "중첩된 EXEC SQL IFDEF 조건이 너무 많음"
 
-#: pgc.l:1316 pgc.l:1327 pgc.l:1342 pgc.l:1364
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "일치하는 \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\" 누락"
 
-#: pgc.l:1318 pgc.l:1329 pgc.l:1522
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "\"EXEC SQL ENDIF;\" 누락"
 
-#: pgc.l:1344 pgc.l:1366
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "두 개 이상의 EXEC SQL ELSE"
 
-#: pgc.l:1389 pgc.l:1403
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "일치하지 않는 EXEC SQL ENDIF"
 
-#: pgc.l:1464
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "EXEC SQL IFDEF 명령에 식별자 누락"
 
-#: pgc.l:1473
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "EXEC SQL DEFINE 명령에 식별자 누락"
 
-#: pgc.l:1511
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "EXEC SQL INCLUDE 명령에 구문 오류 발생"
 
-#: pgc.l:1566
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr ""
 "내부 오류: 상태값을 알 수 없습니다. 이 문제를 <%s> 주소로 알려주십시오."
 
-#: pgc.l:1718
+#: pgc.l:1766
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "오류: 포함 경로 \"%s/%s\"이(가) %d줄에서 너무 길어서 건너뜀\n"
 
-#: pgc.l:1741
+#: pgc.l:1793
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "포함 파일 \"%s\"을(를) %d줄에서 열 수 없음"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "구문 오류"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "경고: "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "오류: "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "\"%s\" 이름의 커서가 없음"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "형식 정의에 이니셜라이저가 허용되지 않음"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "\"string\" 자료형 이름은 인포믹스 모드에서 예약어로 쓰입니다"
 
-#: preproc.y:552 preproc.y:19034
+#: preproc.y:512 preproc.y:8818
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "\"%s\" 형식이 이미 정의됨"
 
-#: preproc.y:577 preproc.y:19669 preproc.y:19991 variable.c:624
+#: preproc.y:539 preproc.y:9532 preproc.y:9877 variable.c:652
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "단순 데이터 형식에 다차원 배열이 지원되지 않음"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "%s 연결은 %s 연결로 바뀌었음, 해당 DECLARE 구문: %s"
 
-#: preproc.y:1831
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "CLOSE DATABASE 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2081
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "CONNECT 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2121
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "DISCONNECT 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2176
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "SET CONNECTION 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2198
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "TYPE 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2207
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "VAR 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2214
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "WHENEVER 문에 AT 옵션이 허용되지 않음"
 
-#: preproc.y:2339 preproc.y:2626 preproc.y:4349 preproc.y:5021 preproc.y:5891
-#: preproc.y:6095 preproc.y:6196 preproc.y:12460
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6088
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "지원되지 않는 기능이 서버에 전달됨"
 
-#: preproc.y:2884
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL이 구현되지 않음"
 
-#: preproc.y:3596
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN이 구현되지 않음"
 
-#: preproc.y:10444 preproc.y:18503
+#: preproc.y:5146 preproc.y:8269
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "INFORMIX 모드에서는 \"database\"를 커서 이름으로 사용할 수 없음"
 
-#: preproc.y:10451 preproc.y:18513
+#: preproc.y:5153 preproc.y:8279
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "서로 다른 선언 구문에서 \"%s\" 변수 사용은 지원하지 않습니다"
 
-#: preproc.y:10453 preproc.y:18515
+#: preproc.y:5155 preproc.y:8281
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "\"%s\" 커서가 이미 정의됨"
 
-#: preproc.y:10927
+#: preproc.y:5402
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "더 이상 지원되지 않는 LIMIT #,# 구문이 서버에 전달됨"
 
-#: preproc.y:18195 preproc.y:18202
+#: preproc.y:7917 preproc.y:7925
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS에서 INTO를 지정할 수 없음"
 
-#: preproc.y:18238
+#: preproc.y:7970
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "\"@\"이 필요한데 \"%s\"이(가) 있음"
 
-#: preproc.y:18250
+#: preproc.y:7982
 #, c-format
 msgid ""
 "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
@@ -496,165 +491,175 @@ msgid ""
 msgstr ""
 "\"tcp\" 및 \"unix\" 프로토콜과 데이터베이스 형식 \"postgresql\"만 지원됨"
 
-#: preproc.y:18253
+#: preproc.y:7985
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "\"://\"가 필요한데 \"%s\"이(가) 있음"
 
-#: preproc.y:18258
+#: preproc.y:7990
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr ""
 "Unix-domain 소켓은 \"localhost\"에서만 작동하며 \"%s\"에서는 작동하지 않음"
 
-#: preproc.y:18284
+#: preproc.y:8017
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "\"postgresql\"이 필요한데 \"%s\"이(가) 있음"
 
-#: preproc.y:18287
+#: preproc.y:8020
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "잘못된 연결 형식: %s"
 
-#: preproc.y:18296
+#: preproc.y:8029
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "\"@\" 또는 \"://\"가 필요한데 \"%s\"이(가) 있음"
 
-#: preproc.y:18371 preproc.y:18389
+#: preproc.y:8127 preproc.y:8145
 #, c-format
 msgid "invalid data type"
 msgstr "잘못된 데이터 형식"
 
-#: preproc.y:18400 preproc.y:18417
+#: preproc.y:8156 preproc.y:8173
 #, c-format
 msgid "incomplete statement"
 msgstr "불완전한 문"
 
-#: preproc.y:18403 preproc.y:18420
+#: preproc.y:8159 preproc.y:8176
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "인식할 수 없는 토큰 \"%s\""
 
-#: preproc.y:18465
+#: preproc.y:8231
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "\"%s\" 이름이 이미 정의됨"
 
-#: preproc.y:18754
+#: preproc.y:8534
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "숫자 및 10진수 데이터 형식에만 전체 자릿수/소수 자릿수 인수 포함"
 
-#: preproc.y:18853
+#: preproc.y:8633
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "여기에는 간격 지정이 허용되지 않음"
 
-#: preproc.y:19009 preproc.y:19061
+#: preproc.y:8789 preproc.y:8847
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "중첩된 구조/union 정의에 수준이 너무 많음"
 
-#: preproc.y:19184
+#: preproc.y:8982
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "varchar에 대한 포인터가 구현되지 않음"
 
-#: preproc.y:19635
+#: preproc.y:9497
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "EXEC SQL VAR 명령에 이니셜라이저가 허용되지 않음"
 
-#: preproc.y:19949
+#: preproc.y:9820
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "입력에서 표시기의 배열이 허용되지 않음"
 
-#: preproc.y:20136
+#: preproc.y:10054
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "연산자는 동적 정의 영역에서는 사용할 수 없음"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:20177
+#: preproc.y:10099
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s, \"%s\" 부근"
 
-#: type.c:18 type.c:30
-#, c-format
-msgid "out of memory"
-msgstr "메모리 부족"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "인식할 수 없는 변수 형식 코드 %d"
 
-#: type.c:263
+#: type.c:240
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
 msgstr "\"%s\" 변수가 다른 자료형의 지역 변수에 의해 숨겨졌음"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "\"%s\" 변수가 지역 변수에 의해 숨겨졌음"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 msgid ""
 "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "\"%s\" 지시자 변수가 지역 변수의 다른 자료형 때문에 숨겨졌음"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "\"%s\" 지시자 변수가 지역 변수에 의해 숨겨졌음"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "배열/포인터의 표시기는 배열/포인터여야 함"
 
-#: type.c:291
+#: type.c:268
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr "중첩된 배열은 지원되지 않음(문자열 제외)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "구조의 표시기는 구조여야 함"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, c-format
 msgid "indicator for simple data type has to be simple"
 msgstr "단순 데이터 형식의 표시기는 단순이어야 함"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "\"%s\" 지시 구조체는 맴버가 너무 적음"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "\"%s\" 지시 구조체는 맴버가 너무 많음"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "인식할 수 없는 설명자 항목 코드 %d"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "경고: "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "오류: "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "메모리 부족"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "잘못된 형식의 변수 \"%s\""
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "\"%s\" 변수가 포인터가 아님"
@@ -674,27 +679,32 @@ msgstr "\"%s\" 변수가 구조나 union이 아님"
 msgid "variable \"%s\" is not an array"
 msgstr "\"%s\" 변수가 배열이 아님"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "\"%s\" 변수 값에 짝이 안맞는 괄호 문자 쓰임"
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "\"%s\" 변수가 선언되지 않음"
 
-#: variable.c:492
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "표시기 변수에 정수 형식이 있어야 함"
 
-#: variable.c:509
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "인식할 수 없는 데이터 형식 이름 \"%s\""
 
-#: variable.c:520 variable.c:528 variable.c:545 variable.c:548
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "다차원 배열이 지원되지 않음"
 
-#: variable.c:537
+#: variable.c:565
 #, c-format
 msgid ""
 "multilevel pointers (more than 2 levels) are not supported; found %d level"
@@ -702,12 +712,12 @@ msgid_plural ""
 "multilevel pointers (more than 2 levels) are not supported; found %d levels"
 msgstr[0] "다중단계 포인터(2단계 이상)는 지원하지 않음; 발견된 레벨: %d"
 
-#: variable.c:542
+#: variable.c:570
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "이 데이터 형식에는 포인터에 대한 포인터가 지원되지 않음"
 
-#: variable.c:562
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "구조에는 다차원 배열이 지원되지 않음"
diff --git a/src/interfaces/ecpg/preproc/po/ru.po b/src/interfaces/ecpg/preproc/po/ru.po
index 874da38e642..e2c3683b46d 100644
--- a/src/interfaces/ecpg/preproc/po/ru.po
+++ b/src/interfaces/ecpg/preproc/po/ru.po
@@ -1,13 +1,13 @@
 # Russian message translation file for ecpg
 # 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, 2018, 2019, 2020, 2021, 2022, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-09-04 07:22+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-08-30 22:23+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,47 +17,47 @@ msgstr ""
 "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"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "переменная \"%s\" должна иметь числовой тип"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "дескриптор %s, привязанный к соединению %s, не существует"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "дескриптор %s, привязанный к соединению по умолчанию, не существует"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "заголовок дескриптора не содержит элемент \"%d\""
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "NULLABLE всегда равно 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "KEY_MEMBER всегда равно 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "поле \"%s\" в дескрипторе не реализовано"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "установить поле \"%s\" в дескрипторе нельзя"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid ""
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -66,7 +66,7 @@ msgstr ""
 "%s - препроцессор SQL-вставок в программах на C для PostgreSQL.\n"
 "\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid ""
 "Usage:\n"
@@ -77,12 +77,12 @@ msgstr ""
 "  %s [ПАРАМЕТР]... ФАЙЛ...\n"
 "\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid ""
 "  -c             automatically generate C code from embedded SQL code;\n"
@@ -91,7 +91,7 @@ msgstr ""
 "  -c             автоматически генерировать код C из внедрённого SQL-кода;\n"
 "                 (это касается EXEC SQL TYPE)\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid ""
 "  -C MODE        set compatibility mode; MODE can be one of\n"
@@ -100,38 +100,38 @@ msgstr ""
 "  -C РЕЖИМ       установить режим совместимости; допустимый РЕЖИМ:\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\" или \"ORACLE\"\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             генерировать отладочные сообщения при разборе\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D СИМВОЛ      определить (define) СИМВОЛ\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, c-format
 msgid ""
 "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "  -h             разобрать файл заголовка (включает параметр \"-c\")\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, c-format
 msgid "  -i             parse system include files as well\n"
 msgstr "  -i             разобрать также системные включаемые файлы\n"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
 msgstr "  -I КАТАЛОГ     искать включаемые файлы в указанном каталоге\n"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o ФАЙЛ        записать результат в ФАЙЛ\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid ""
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
@@ -140,28 +140,28 @@ msgstr ""
 "  -r ПАРАМЕТР    определить режим выполнения; допустимый ПАРАМЕТР:\n"
 "                 \"no_indicator\", \"prepare\" или \"questionmarks\"\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   запустить в режиме тестирования регрессии\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             включить автофиксацию транзакций\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  показать версию и выйти\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     показать эту справку и выйти\n"
 
 # skip-rule: space-before-period
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid ""
 "\n"
@@ -172,7 +172,7 @@ msgstr ""
 "Если выходной файл не указан, к имени входного файла без расширения .pgc\n"
 "добавляется .c.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
@@ -231,7 +231,7 @@ msgstr "%s: нет входных файлов\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "курсор \"%s\" был объявлен, но не открыт"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "ошибка при удалении выходного файла \"%s\"\n"
@@ -241,258 +241,253 @@ msgstr "ошибка при удалении выходного файла \"%s\
 msgid "unterminated /* comment"
 msgstr "незавершённый комментарий /*"
 
-#: pgc.l:559
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "оборванная битовая строка"
 
-#: pgc.l:567
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "оборванная шестнадцатеричная строка"
 
-#: pgc.l:642
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "неверная битовая строка"
 
-#: pgc.l:647
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "неверная шестнадцатеричная строка"
 
-#: pgc.l:665
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr ""
 "необрабатываемое предыдущее состояние при обнаружении закрывающего "
 "апострофа\n"
 
-#: pgc.l:691 pgc.l:800
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершённая строка в кавычках"
 
-#: pgc.l:742
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "незавершённая строка с $"
 
-#: pgc.l:760 pgc.l:780
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "пустой идентификатор в кавычках"
 
-#: pgc.l:791
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "незавершённый идентификатор в кавычках"
 
-#: pgc.l:960
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "номер параметра слишком большой"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "мусорное содержимое после параметра"
 
-#: pgc.l:1012 pgc.l:1015 pgc.l:1018
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "мусорное содержимое после числовой константы"
 
-#: pgc.l:1141
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "вложенные комментарии /* ... */"
 
-#: pgc.l:1240
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "в команде EXEC SQL UNDEF отсутствует идентификатор"
 
-#: pgc.l:1258 pgc.l:1271 pgc.l:1287 pgc.l:1300
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "слишком много вложенных условий EXEC SQL IFDEF"
 
-#: pgc.l:1316 pgc.l:1327 pgc.l:1342 pgc.l:1364
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "нет соответствующего \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1318 pgc.l:1329 pgc.l:1522
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "отсутствует \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1344 pgc.l:1366
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "неоднократная команда EXEC SQL ELSE"
 
-#: pgc.l:1389 pgc.l:1403
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "непарная команда EXEC SQL ENDIF"
 
-#: pgc.l:1464
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "в команде EXEC SQL IFDEF отсутствует идентификатор"
 
-#: pgc.l:1473
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "в команде EXEC SQL DEFINE отсутствует идентификатор"
 
-#: pgc.l:1511
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "ошибка синтаксиса в команде EXEC SQL INCLUDE"
 
-#: pgc.l:1566
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "внутренняя ошибка: недостижимое состояние; пожалуйста, сообщите в <%s>"
 
-#: pgc.l:1718
+#: pgc.l:1766
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr ""
 "Ошибка: путь включаемых файлов \"%s/%s\" в строке %d слишком длинный, "
 "пропускается\n"
 
-#: pgc.l:1741
+#: pgc.l:1793
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "не удалось открыть включаемый файл \"%s\" (строка %d)"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "ошибка синтаксиса"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "ПРЕДУПРЕЖДЕНИЕ: "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "ОШИБКА: "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не существует"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "определение типа не может включать инициализатор"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "имя типа \"string\" в режиме Informix зарезервировано"
 
-#: preproc.y:552 preproc.y:19034
+#: preproc.y:512 preproc.y:8818
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "тип \"%s\" уже определён"
 
-#: preproc.y:577 preproc.y:19669 preproc.y:19991 variable.c:624
+#: preproc.y:539 preproc.y:9532 preproc.y:9877 variable.c:652
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "многомерные массивы с простыми типами данных не поддерживаются"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "подключение %s заменяется на %s оператором DECLARE %s"
 
-#: preproc.y:1831
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "оператор CLOSE DATABASE с параметром AT не поддерживается"
 
-#: preproc.y:2081
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "оператор CONNECT с параметром AT не поддерживается"
 
-#: preproc.y:2121
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "оператор DISCONNECT с параметром AT не поддерживается"
 
-#: preproc.y:2176
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "оператор SET CONNECTION с параметром AT не поддерживается"
 
-#: preproc.y:2198
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "оператор TYPE с параметром AT не поддерживается"
 
-#: preproc.y:2207
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "оператор VAR с параметром AT не поддерживается"
 
-#: preproc.y:2214
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "оператор WHENEVER с параметром AT не поддерживается"
 
-#: preproc.y:2339 preproc.y:2626 preproc.y:4349 preproc.y:5021 preproc.y:5891
-#: preproc.y:6095 preproc.y:6196 preproc.y:12460
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6088
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "неподдерживаемая функция будет передана серверу"
 
-#: preproc.y:2884
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL не реализовано"
 
-#: preproc.y:3596
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "операция COPY FROM STDIN не реализована"
 
-#: preproc.y:10444 preproc.y:18503
+#: preproc.y:5146 preproc.y:8269
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr ""
 "в режиме INFORMIX нельзя использовать \"database\" в качестве имени курсора"
 
-#: preproc.y:10451 preproc.y:18513
+#: preproc.y:5153 preproc.y:8279
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr ""
 "использование переменной \"%s\" в разных операторах DECLARE не поддерживается"
 
-#: preproc.y:10453 preproc.y:18515
+#: preproc.y:5155 preproc.y:8281
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "курсор \"%s\" уже определён"
 
-#: preproc.y:10927
+#: preproc.y:5402
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "не поддерживаемое более предложение LIMIT #,# передано на сервер"
 
-#: preproc.y:18195 preproc.y:18202
+#: preproc.y:7917 preproc.y:7925
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "в CREATE TABLE AS нельзя указать INTO"
 
-#: preproc.y:18238
+#: preproc.y:7970
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "ожидался знак \"@\", но на этом месте \"%s\""
 
-#: preproc.y:18250
+#: preproc.y:7982
 #, c-format
 msgid ""
 "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
@@ -501,165 +496,175 @@ msgstr ""
 "поддерживаются только протоколы \"tcp\" и \"unix\", а тип базы данных - "
 "\"postgresql\""
 
-#: preproc.y:18253
+#: preproc.y:7985
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "ожидалось \"://\", но на этом месте \"%s\""
 
-#: preproc.y:18258
+#: preproc.y:7990
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unix-сокеты работают только с \"localhost\", но не с адресом \"%s\""
 
-#: preproc.y:18284
+#: preproc.y:8017
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "ожидался тип \"postgresql\", но на этом месте \"%s\""
 
-#: preproc.y:18287
+#: preproc.y:8020
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "неверный тип подключения: %s"
 
-#: preproc.y:18296
+#: preproc.y:8029
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "ожидалось \"@\" или \"://\", но на этом месте \"%s\""
 
-#: preproc.y:18371 preproc.y:18389
+#: preproc.y:8127 preproc.y:8145
 #, c-format
 msgid "invalid data type"
 msgstr "неверный тип данных"
 
-#: preproc.y:18400 preproc.y:18417
+#: preproc.y:8156 preproc.y:8173
 #, c-format
 msgid "incomplete statement"
 msgstr "неполный оператор"
 
-#: preproc.y:18403 preproc.y:18420
+#: preproc.y:8159 preproc.y:8176
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "нераспознанное ключевое слово \"%s\""
 
-#: preproc.y:18465
+#: preproc.y:8231
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "имя \"%s\" уже объявлено"
 
-#: preproc.y:18754
+#: preproc.y:8534
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr ""
 "точность/масштаб можно указать только для типов данных numeric и decimal"
 
-#: preproc.y:18853
+#: preproc.y:8633
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "определение интервала здесь не допускается"
 
-#: preproc.y:19009 preproc.y:19061
+#: preproc.y:8789 preproc.y:8847
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "слишком много уровней в определении вложенной структуры/объединения"
 
-#: preproc.y:19184
+#: preproc.y:8982
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "указатели на varchar не реализованы"
 
-#: preproc.y:19635
+#: preproc.y:9497
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "команда EXEC SQL VAR не может включать инициализатор"
 
-#: preproc.y:19949
+#: preproc.y:9820
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "массивы индикаторов на входе недопустимы"
 
-#: preproc.y:20136
+#: preproc.y:10054
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "недопустимый оператор в определении переменной"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:20177
+#: preproc.y:10099
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
 
-#: type.c:18 type.c:30
-#, c-format
-msgid "out of memory"
-msgstr "нехватка памяти"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "нераспознанный код типа переменной %d"
 
-#: type.c:263
+#: type.c:240
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
 msgstr "переменная \"%s\" скрыта локальной переменной другого типа"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "переменная \"%s\" скрыта локальной переменной"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 msgid ""
 "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "переменная-индикатор \"%s\" скрыта локальной переменной другого типа"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "переменная-индикатор \"%s\" скрыта локальной переменной"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "индикатор для массива/указателя должен быть массивом/указателем"
 
-#: type.c:291
+#: type.c:268
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr "вложенные массивы не поддерживаются (за исключением строк)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "индикатор структуры должен быть структурой"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, c-format
 msgid "indicator for simple data type has to be simple"
 msgstr "индикатор простого типа должен быть простым"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "в структуре индикаторе \"%s\" слишком мало членов"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "в структуре индикаторе \"%s\" слишком много членов"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "нераспознанный код элемента дескриптора %d"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "ПРЕДУПРЕЖДЕНИЕ: "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "ОШИБКА: "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "нехватка памяти"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "неправильно оформленная переменная \"%s\""
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "переменная \"%s\" - не указатель"
@@ -679,27 +684,32 @@ msgstr "переменная \"%s\" - не структура и не объед
 msgid "variable \"%s\" is not an array"
 msgstr "переменная \"%s\" - не массив"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "непарная квадратная скобка в переменной \"%s\""
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "переменная \"%s\" не объявлена"
 
-#: variable.c:492
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "переменная-индикатор должна быть целочисленной"
 
-#: variable.c:509
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "нераспознанное имя типа данных \"%s\""
 
-#: variable.c:520 variable.c:528 variable.c:545 variable.c:548
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "многомерные массивы не поддерживаются"
 
-#: variable.c:537
+#: variable.c:565
 #, c-format
 msgid ""
 "multilevel pointers (more than 2 levels) are not supported; found %d level"
@@ -715,12 +725,12 @@ msgstr[2] ""
 "многоуровневые указатели (больше 2 уровней) не поддерживаются, обнаружено %d "
 "уровней"
 
-#: variable.c:542
+#: variable.c:570
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "для этого типа данных указатели на указатели не поддерживаются"
 
-#: variable.c:562
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "многомерные массивы структур не поддерживаются"
diff --git a/src/interfaces/ecpg/preproc/po/sv.po b/src/interfaces/ecpg/preproc/po/sv.po
index 2fb7e68894a..d6c3940b70c 100644
--- a/src/interfaces/ecpg/preproc/po/sv.po
+++ b/src/interfaces/ecpg/preproc/po/sv.po
@@ -1,14 +1,14 @@
 # SWEDISHE message translation file for ecpg
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 11:10+0000\n"
-"PO-Revision-Date: 2024-07-12 15:07+0200\n"
+"POT-Creation-Date: 2025-05-09 18:40+0000\n"
+"PO-Revision-Date: 2025-05-09 22:27+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "variabel \"%s\" måste ha en numerisk typ"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "deskriptor %s kopplad till anslutning %s finns inte"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "deskriptor %s kopplad till standardanslutning finns inte"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "deskriptor-header-post \"%d\" finns inte"
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable är alltid 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member är alltid 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "deskriptor-post \"%s\" är inte implementerad"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "deskriptor-post \"%s\" kan inte sättas"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid ""
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -66,7 +66,7 @@ msgstr ""
 "%s är PostgreSQLs inbäddade SQL-preprocessor för C-program.\n"
 "\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid ""
 "Usage:\n"
@@ -77,12 +77,12 @@ msgstr ""
 "  %s [FLAGGA]... FIL...\n"
 "\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid ""
 "  -c             automatically generate C code from embedded SQL code;\n"
@@ -91,7 +91,7 @@ msgstr ""
 "  -c             generera automatiskt C-kod från inbäddad SQL-kod;\n"
 "                 detta påverkar EXEC SQL TYPE\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid ""
 "  -C MODE        set compatibility mode; MODE can be one of\n"
@@ -100,37 +100,37 @@ msgstr ""
 "  -C LÄGE        sätt kompabilitetsläge; LÄGE kan vara en av\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\", \"ORACLE\"\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             generera parser-debug-utmatning\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D SYMBOL      definiera SYMBOL\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, c-format
 msgid "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "  -h             parsa en header-fil, denna flagga inkluderar flaggan \"-c\"\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, c-format
 msgid "  -i             parse system include files as well\n"
 msgstr "  -i             parsa system-include-filer dessutom\n"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
 msgstr "  -I KATALOG     sök i KATALOG efter include-filer\n"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o UTFIL       skriv resultat till UTFIL\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid ""
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
@@ -139,27 +139,27 @@ msgstr ""
 "  -r FLAGGA      ange runtime-beteende; FLAGGA kan vara en av:\n"
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   kör i regressions-test-läge\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             slå på auto-commit av transaktioner\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  visa versionsinformation, avsluta sedan\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     visa denna hjälp, avsluta sedan\n"
 
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid ""
 "\n"
@@ -170,7 +170,7 @@ msgstr ""
 "Om ingen utdatafil anges så skapas namnet genom att lägga till .c till\n"
 "indatafilnamnet, detta efter att .pgc strippats bort om det var med.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid ""
 "\n"
@@ -179,7 +179,7 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "hemsida för %s: <%s>\n"
@@ -229,423 +229,428 @@ msgstr "%s: inga indatafiler angivna\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "markören \"%s\" har deklarerats men inte öppnats"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "kunde inte ta bort utdatafil \"%s\"\n"
 
-#: pgc.l:528
+#: pgc.l:542
 #, c-format
 msgid "unterminated /* comment"
 msgstr "ej avslutad /*-kommentar"
 
-#: pgc.l:545
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "ej avslutad bitsträngslitteral"
 
-#: pgc.l:553
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "ej avslutad hexadecimal stränglitteral"
 
-#: pgc.l:628
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "ogiltig bit-sträng-literal"
 
-#: pgc.l:633
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "ogiltig hexdecimal sträng-literal"
 
-#: pgc.l:651
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr "tidigare state i xqs som ej kan hanteras\n"
 
-#: pgc.l:677 pgc.l:786
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "icketerminerad citerad sträng"
 
-#: pgc.l:728
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "icke terminerad dollarciterad sträng"
 
-#: pgc.l:746 pgc.l:766
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "noll-längds avdelad identifierare"
 
-#: pgc.l:777
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "ej avslutad citerad identifierare"
 
-#: pgc.l:946
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "parameternummer är för stort"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "efterföljande skräp efter parameter"
 
-#: pgc.l:998 pgc.l:1001 pgc.l:1004 pgc.l:1007 pgc.l:1010 pgc.l:1013
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "efterföljande skräp efter numerisk literal"
 
-#: pgc.l:1136
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "nästlade /* ... */-kommentarer"
 
-#: pgc.l:1235
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "saknar identifierare i EXEC SQL UNDEF-kommando"
 
-#: pgc.l:1253 pgc.l:1266 pgc.l:1282 pgc.l:1295
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "för många nästlade EXEC SQL IFDEF-villkor"
 
-#: pgc.l:1311 pgc.l:1322 pgc.l:1337 pgc.l:1359
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "saknar matchande \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1313 pgc.l:1324 pgc.l:1517
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "saknar \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1339 pgc.l:1361
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "mer än en EXEC SQL ELSE"
 
-#: pgc.l:1384 pgc.l:1398
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "ej matchad EXEC SQL ENDIF"
 
-#: pgc.l:1459
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "saknar identifierare i EXEC SQL IFDEF-kommando"
 
-#: pgc.l:1468
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "saknar identifierare i EXEC SQL DEFINE-kommando"
 
-#: pgc.l:1506
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "syntaxfel i EXEC SQL INCLUDE-kommando"
 
-#: pgc.l:1561
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "internt fel: state som ej skall kunna nås; vänligen rapportera detta till <%s>"
 
-#: pgc.l:1713
+#: pgc.l:1766
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "Fel: include-sökväg \"%s/%s\" är för lång på rad %d, hoppar över\n"
 
-#: pgc.l:1736
+#: pgc.l:1793
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "kunde inte öppna inkludefil \"%s\" på rad %d"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "syntaxfel"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "VARNING: "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "FEL: "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "markör \"%s\" existerar inte"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "initialiserare tillåts inte i typdefinition"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "typnamn \"string\" är reserverat i Informix-läge"
 
-#: preproc.y:552 preproc.y:19072
+#: preproc.y:512 preproc.y:8822
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "typen \"%s\" är redan definierad"
 
-#: preproc.y:577 preproc.y:19707 preproc.y:20029 variable.c:625
+#: preproc.y:539 preproc.y:9536 preproc.y:9881 variable.c:652
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "multidimensionella array:er för enkla datatyper stöds inte"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "anslutning %s överskriven med %s av DECLARE-sats %s"
 
-#: preproc.y:1833
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "AT-flaggan tillåts inte i CLOSE DATABASE-sats"
 
-#: preproc.y:2083
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "AT-flaggan tillåts inte i CONNECT-sats"
 
-#: preproc.y:2123
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "AT-flaggan tillåts inte i DISCONNECT-sats"
 
-#: preproc.y:2178
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "AT-flaggan tillåts inte i SET CONNECTION-sats"
 
-#: preproc.y:2200
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "AT-flaggan tillåts inte i TYPE-sats"
 
-#: preproc.y:2209
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "AT-flaggan tillåts inte i VAR-sats"
 
-#: preproc.y:2216
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "AT-flaggan tillåts inte i WHENEVER-sats"
 
-#: preproc.y:2341 preproc.y:2628 preproc.y:4379 preproc.y:5043 preproc.y:5913
-#: preproc.y:6117 preproc.y:6218 preproc.y:12482
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6086
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "ej stödd funktion skickass till servern"
 
-#: preproc.y:2886
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL är inte implementerad"
 
-#: preproc.y:3626
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN är inte implementerad"
 
-#: preproc.y:10466 preproc.y:18541
+#: preproc.y:5146 preproc.y:8273
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "\"database\" kan inte användas som markörsnamn i INFORMIX-läge"
 
-#: preproc.y:10473 preproc.y:18551
+#: preproc.y:5153 preproc.y:8283
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "använda variabel \"%s\" i olika deklarationssatser stöds inte"
 
-#: preproc.y:10475 preproc.y:18553
+#: preproc.y:5155 preproc.y:8285
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "markören \"%s\" är redan definierad"
 
-#: preproc.y:10949
+#: preproc.y:5402
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "ej längre stödd syntax LIMIT #,# har skickats till servern"
 
-#: preproc.y:18233 preproc.y:18240
+#: preproc.y:7921 preproc.y:7929
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS kan inte ange INTO"
 
-#: preproc.y:18276
+#: preproc.y:7974
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "förväntade \"@\", hittade \"%s\""
 
-#: preproc.y:18288
+#: preproc.y:7986
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "bara protokoll \"tcp\" och \"unix\" samt databastyp \"postgresql\" stöds"
 
-#: preproc.y:18291
+#: preproc.y:7989
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "förväntade \"://\", hittade \"%s\""
 
-#: preproc.y:18296
+#: preproc.y:7994
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unix-domän-socket fungerart bara på \"localhost\" men inte på \"%s\""
 
-#: preproc.y:18322
+#: preproc.y:8021
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "förväntade \"postgresql\", hittade \"%s\""
 
-#: preproc.y:18325
+#: preproc.y:8024
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "ogiltig anslutningstyp: %s"
 
-#: preproc.y:18334
+#: preproc.y:8033
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "förväntade \"@\" eller \"://\", hittade \"%s\""
 
-#: preproc.y:18409 preproc.y:18427
+#: preproc.y:8131 preproc.y:8149
 #, c-format
 msgid "invalid data type"
 msgstr "ogiltig datatyp"
 
-#: preproc.y:18438 preproc.y:18455
+#: preproc.y:8160 preproc.y:8177
 #, c-format
 msgid "incomplete statement"
 msgstr "ofullständig sats"
 
-#: preproc.y:18441 preproc.y:18458
+#: preproc.y:8163 preproc.y:8180
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "okänd symbol \"%s\""
 
-#: preproc.y:18503
+#: preproc.y:8235
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "namnet \"%s\" är redan deklarerat"
 
-#: preproc.y:18792
+#: preproc.y:8538
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "bara datatyperna numeric och decimal har precision/skala-argument"
 
-#: preproc.y:18891
+#: preproc.y:8637
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "intervallspecifikation tillåts inte här"
 
-#: preproc.y:19047 preproc.y:19099
+#: preproc.y:8793 preproc.y:8851
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "för många nästlade nivåer i struktur/union-definition"
 
-#: preproc.y:19222
+#: preproc.y:8986
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "pekare till varchar är inte implementerat"
 
-#: preproc.y:19673
+#: preproc.y:9501
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "initialiserare tillåts inte i EXEC SQL VAR-kommando"
 
-#: preproc.y:19987
+#: preproc.y:9824
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "array:er av indikatorer tillåts inte vid indata"
 
-#: preproc.y:20174
+#: preproc.y:10058
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "operator tillåts inte i variabeldefinition"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:20215
+#: preproc.y:10103
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s vid eller nära \"%s\""
 
-#: type.c:18 type.c:30
-#, c-format
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "okänd variabeltypkod %d"
 
-#: type.c:263
+#: type.c:240
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
 msgstr "variabel \"%s\" döljs av en lokal variabel av annan typ"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "variabel \"%s\" döljs av en lokal variabel"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "indikatorvariabel \"%s\" döljs av en lokal variabel av annan typ"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "indikatorvariabel \"%s\" döljs av en lokal variabel"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "indikator för array/pekare måste vara en array/pekare"
 
-#: type.c:291
+#: type.c:268
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr "nästlade array:er stöds inte (förutom strängar)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "indikator för en struktur måste vara en struktur"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, c-format
 msgid "indicator for simple data type has to be simple"
 msgstr "indikator för enkla datatyper måste vara enkel"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "indikatorstruktur \"%s\" har för få medlemmar"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "indikatorstruktur \"%s\" har för många medlemmar"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "okänd deskriptor-post-kod %d"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "VARNING: "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "FEL: "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "inkorrekt formatterad variabel \"%s\""
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "variabel \"%s\" är inte en pekare"
@@ -665,39 +670,44 @@ msgstr "variabel \"%s\" är varken en struktur eller en union"
 msgid "variable \"%s\" is not an array"
 msgstr "variabel \"%s\" är inte en array"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "ej matchande klamrar i variabeln \"%s\""
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "variabel \"%s\" är inte deklarerad"
 
-#: variable.c:493
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "indikatorvariabel måste ha en heltalstyp"
 
-#: variable.c:510
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "okänt datatypsnamn \"%s\""
 
-#: variable.c:521 variable.c:529 variable.c:546 variable.c:549
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "multidimensionella array:er stöds inte"
 
-#: variable.c:538
+#: variable.c:565
 #, 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] "multinivåpekare (mer än 2 nivåer) stöds inte; hittade %d nivå"
 msgstr[1] "multinivåpekare (mer än 2 nivåer) stöds inte; hittade %d nivåer"
 
-#: variable.c:543
+#: variable.c:570
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "pekare till pekare stöds inte för denna datatyp"
 
-#: variable.c:563
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "multidimensionella array:er av strukturer stöds inte"
diff --git a/src/interfaces/ecpg/preproc/po/uk.po b/src/interfaces/ecpg/preproc/po/uk.po
index 27ca851c33d..af2879f95f8 100644
--- a/src/interfaces/ecpg/preproc/po/uk.po
+++ b/src/interfaces/ecpg/preproc/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-23 10:40+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:10+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,138 +14,138 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/ecpg.pot\n"
-"X-Crowdin-File-ID: 990\n"
+"X-Crowdin-File: /REL_18_STABLE/ecpg.pot\n"
+"X-Crowdin-File-ID: 1075\n"
 
-#: descriptor.c:64
+#: descriptor.c:63
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
 msgstr "змінна \"%s\" повинна мати числовий тип"
 
-#: descriptor.c:124 descriptor.c:155
+#: descriptor.c:119 descriptor.c:149
 #, c-format
 msgid "descriptor %s bound to connection %s does not exist"
 msgstr "дескриптор %s, прив'язаний до підключення %s, не існує"
 
-#: descriptor.c:126 descriptor.c:157
+#: descriptor.c:121 descriptor.c:151
 #, c-format
 msgid "descriptor %s bound to the default connection does not exist"
 msgstr "дескриптор %s, прив'язаний до підключення за замовчуванням, не існує"
 
-#: descriptor.c:172 descriptor.c:224
+#: descriptor.c:166 descriptor.c:218
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "елемент заголовка дескриптору \"%d\" не існує"
 
-#: descriptor.c:194
+#: descriptor.c:188
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable завжди 1"
 
-#: descriptor.c:197
+#: descriptor.c:191
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member завжди 0"
 
-#: descriptor.c:291
+#: descriptor.c:285
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "елемент дескриптору \"%s\" не реалізовано"
 
-#: descriptor.c:301
+#: descriptor.c:295
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "елемент дескриптору \"%s\" не можна встановити"
 
-#: ecpg.c:36
+#: ecpg.c:37
 #, c-format
 msgid "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n\n"
 msgstr "%s - це препроцесор SQL-вставок PostgreSQL для C програм.\n\n"
 
-#: ecpg.c:38
+#: ecpg.c:39
 #, c-format
 msgid "Usage:\n"
 "  %s [OPTION]... FILE...\n\n"
 msgstr "Використання: \n"
 "  %s [OPTION]... FILE...\n\n"
 
-#: ecpg.c:41
+#: ecpg.c:42
 #, c-format
 msgid "Options:\n"
 msgstr "Параметри:\n"
 
-#: ecpg.c:42
+#: ecpg.c:43
 #, c-format
 msgid "  -c             automatically generate C code from embedded SQL code;\n"
 "                 this affects EXEC SQL TYPE\n"
 msgstr "  -c             автоматично генерувати C-код з вбудованого SQL-коду;\n"
 "                 це стосується EXEC SQL TYPE\n"
 
-#: ecpg.c:44
+#: ecpg.c:45
 #, c-format
 msgid "  -C MODE        set compatibility mode; MODE can be one of\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\", \"ORACLE\"\n"
 msgstr "  -C MODE        встановити режим сумісності; допустимий режим може бути одним з:\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\", \"ORACLE\"\n"
 
-#: ecpg.c:47
+#: ecpg.c:48
 #, c-format
 msgid "  -d             generate parser debug output\n"
 msgstr "  -d             генерувати налагоджувальні повідомлення при аналізі\n"
 
-#: ecpg.c:49
+#: ecpg.c:50
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
 msgstr "  -D SYMBOL      визначити СИМВОЛ\n"
 
-#: ecpg.c:50
+#: ecpg.c:51
 #, c-format
 msgid "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "  -h             аналізувати файл заголовку, цей параметр включає параметр \"-c\"\n"
 
-#: ecpg.c:51
+#: ecpg.c:52
 #, c-format
 msgid "  -i             parse system include files as well\n"
 msgstr "  -i             аналізувати системні файли include\n"
 
-#: ecpg.c:52
+#: ecpg.c:53
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
 msgstr "  -I DIRECTORY   шукати файли для включення у зазначенному каталозі\n"
 
-#: ecpg.c:53
+#: ecpg.c:54
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
 msgstr "  -o OUTFILE     записати результат до OUTFILE\n"
 
-#: ecpg.c:54
+#: ecpg.c:55
 #, c-format
 msgid "  -r OPTION      specify run-time behavior; OPTION can be:\n"
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 msgstr "  -r OPTION      визначити поведінку під час виконання; допустимий парамтер може бути:\n"
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 
-#: ecpg.c:56
+#: ecpg.c:57
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
 msgstr "  --regression   запустити в режимі тестування регресії\n"
 
-#: ecpg.c:57
+#: ecpg.c:58
 #, c-format
 msgid "  -t             turn on autocommit of transactions\n"
 msgstr "  -t             увімкнути автопідтвердження транзакцій\n"
 
-#: ecpg.c:58
+#: ecpg.c:59
 #, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  показати версію, потім вийти\n"
 
-#: ecpg.c:59
+#: ecpg.c:60
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     показати цю довідку, потім вийти\n"
 
-#: ecpg.c:60
+#: ecpg.c:61
 #, c-format
 msgid "\n"
 "If no output file is specified, the name is formed by adding .c to the\n"
@@ -153,14 +153,14 @@ msgid "\n"
 msgstr "\n"
 "Якщо файл виводу не вказано, ім'я файла формується додаванням .c до введеного імені файла, після обрізання розширення .pgc, якщо присутнє.\n"
 
-#: ecpg.c:62
+#: ecpg.c:63
 #, c-format
 msgid "\n"
 "Report bugs to <%s>.\n"
 msgstr "\n"
 "Повідомляти про помилки на <%s>.\n"
 
-#: ecpg.c:63
+#: ecpg.c:64
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашня сторінка %s: <%s>\n"
@@ -210,7 +210,7 @@ msgstr "%s: не вказано вхідні файли\n"
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "курсор \"%s\" був оголошений, але не відкритий"
 
-#: ecpg.c:504 preproc.y:130
+#: ecpg.c:504 util.c:75
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "не вдалося видалити файл виводу \"%s\"\n"
@@ -220,413 +220,418 @@ msgstr "не вдалося видалити файл виводу \"%s\"\n"
 msgid "unterminated /* comment"
 msgstr "незавершений коментар /*"
 
-#: pgc.l:559
+#: pgc.l:560
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "незавершений бітовий рядок"
 
-#: pgc.l:567
+#: pgc.l:570
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "незавершений шістнадцятковий рядок"
 
-#: pgc.l:642
+#: pgc.l:644
 #, c-format
 msgid "invalid bit string literal"
 msgstr "неприпустимий літерал бітового рядка"
 
-#: pgc.l:647
+#: pgc.l:649
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "неприпустимий шістнадцятковий рядок"
 
-#: pgc.l:665
+#: pgc.l:667
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr "необроблений попередній стан у xqs\n"
 
-#: pgc.l:691 pgc.l:800
+#: pgc.l:700 pgc.l:820
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершений рядок в лапках"
 
-#: pgc.l:742
+#: pgc.l:753
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "незавершений рядок з $"
 
-#: pgc.l:760 pgc.l:780
+#: pgc.l:772 pgc.l:793
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "пустий ідентифікатор із роздільниками"
 
-#: pgc.l:791
+#: pgc.l:809
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "незавершений ідентифікатор в лапках"
 
-#: pgc.l:960
+#: pgc.l:985
+#, c-format
+msgid "parameter number too large"
+msgstr "номер параметра занадто великий"
+
+#: pgc.l:990
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "сміття після параметру"
 
-#: pgc.l:1012 pgc.l:1015 pgc.l:1018
+#: pgc.l:1042 pgc.l:1045 pgc.l:1048
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "сміття після числового літерала"
 
-#: pgc.l:1141
+#: pgc.l:1177
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "вкладені /* ... */ коменарі"
 
-#: pgc.l:1240
+#: pgc.l:1279
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "відсутній ідентифікатор у команді EXEC SQL UNDEF"
 
-#: pgc.l:1258 pgc.l:1271 pgc.l:1287 pgc.l:1300
+#: pgc.l:1299 pgc.l:1312 pgc.l:1328 pgc.l:1341
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "забагато вкладених умов EXEC SQL IFDEF"
 
-#: pgc.l:1316 pgc.l:1327 pgc.l:1342 pgc.l:1364
+#: pgc.l:1357 pgc.l:1368 pgc.l:1384 pgc.l:1406
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "немає відповідного \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1318 pgc.l:1329 pgc.l:1522
+#: pgc.l:1359 pgc.l:1370 pgc.l:1565
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "відсутній \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1344 pgc.l:1366
+#: pgc.l:1386 pgc.l:1408
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "більше ніж один EXEC SQL ELSE"
 
-#: pgc.l:1389 pgc.l:1403
+#: pgc.l:1431 pgc.l:1445
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "невідповідний EXEC SQL ENDIF"
 
-#: pgc.l:1464
+#: pgc.l:1507
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "відсутній ідентифікатор у команді EXEC SQL IFDEF"
 
-#: pgc.l:1473
+#: pgc.l:1516
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "відсутній ідентифікатор у команді EXEC SQL DEFINE"
 
-#: pgc.l:1511
+#: pgc.l:1554
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "синтаксична помилка у команді EXEC SQL INCLUDE"
 
-#: pgc.l:1566
+#: pgc.l:1609
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "внутрішня помилка: недосяжний стан; будь ласка, повідомте про це на <%s>"
 
-#: pgc.l:1718
+#: pgc.l:1766
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "Помилка: шлях включення \"%s/%s\" занадто довгий у рядку %d, пропускається\n"
 
-#: pgc.l:1741
+#: pgc.l:1793
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "не вдалося відкрити файл включення \"%s\" у рядку %d"
 
-#: preproc.y:31
+#: preproc.y:28
 msgid "syntax error"
 msgstr "синтаксична помилка"
 
-#: preproc.y:84
-#, c-format
-msgid "WARNING: "
-msgstr "ПОПЕРЕДЖЕННЯ: "
-
-#: preproc.y:87
-#, c-format
-msgid "ERROR: "
-msgstr "ПОМИЛКА: "
-
-#: preproc.y:514
+#: preproc.y:467
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не існує"
 
-#: preproc.y:543
+#: preproc.y:503
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "ініціалізація заборонена у визначенні типу"
 
-#: preproc.y:545
+#: preproc.y:505
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "ім’я типу \"string\" зарезервовано у режимі Informix"
 
-#: preproc.y:552 preproc.y:19034
+#: preproc.y:512 preproc.y:8818
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "тип \"%s\" вже визначений"
 
-#: preproc.y:577 preproc.y:19669 preproc.y:19991 variable.c:625
+#: preproc.y:539 preproc.y:9532 preproc.y:9877 variable.c:652
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "багатовимірні масиви для простих типів даних не підтримуються"
 
-#: preproc.y:599
+#: preproc.y:562
 #, c-format
 msgid "connection %s is overwritten with %s by DECLARE statement %s"
 msgstr "підключення %s було перезаписано з %s командою DECLARE %s"
 
-#: preproc.y:1831
+#: preproc.y:932
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "Параметр AT не дозволений в інструкції CLOSE DATABASE"
 
-#: preproc.y:2081
+#: preproc.y:1184
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "Параметр AT не дозволений в інструкції CONNECT"
 
-#: preproc.y:2121
+#: preproc.y:1221
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "Параметр AT не дозволений в інструкції DISCONNECT"
 
-#: preproc.y:2176
+#: preproc.y:1274
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "Параметр AT не дозволений в інструкції SET CONNECTION"
 
-#: preproc.y:2198
+#: preproc.y:1292
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "Параметр AT не дозволений в інструкції TYPE"
 
-#: preproc.y:2207
+#: preproc.y:1300
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "Параметр AT не дозволений в інструкції VAR"
 
-#: preproc.y:2214
+#: preproc.y:1307
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "Параметр AT не дозволений в інструкції WHENEVER"
 
-#: preproc.y:2339 preproc.y:2626 preproc.y:4349 preproc.y:5021 preproc.y:5891
-#: preproc.y:6095 preproc.y:6196 preproc.y:12460
+#: preproc.y:1375 preproc.y:1498 preproc.y:2259 preproc.y:2585 preproc.y:3016
+#: preproc.y:3103 preproc.y:6088
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "непідтримувана функція буде передана до сервера"
 
-#: preproc.y:2884
+#: preproc.y:1610
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL не реалізовано"
 
-#: preproc.y:3596
+#: preproc.y:1895
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN не реалізовано"
 
-#: preproc.y:10444 preproc.y:18503
+#: preproc.y:5146 preproc.y:8269
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr "\"database\" не може використовуватись як назва курсора в режимі INFORMIX"
 
-#: preproc.y:10451 preproc.y:18513
+#: preproc.y:5153 preproc.y:8279
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "використання змінної \"%s\" у різних інструкціях declare не підтримується"
 
-#: preproc.y:10453 preproc.y:18515
+#: preproc.y:5155 preproc.y:8281
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "курсор \"%s\" вже визначено"
 
-#: preproc.y:10927
+#: preproc.y:5402
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "непідтримуваний синтаксис LIMIT #,# передано до сервера"
 
-#: preproc.y:18195 preproc.y:18202
+#: preproc.y:7917 preproc.y:7925
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS не може містити INTO"
 
-#: preproc.y:18238
+#: preproc.y:7970
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "очікувалося \"@\", знайдено \"%s\""
 
-#: preproc.y:18250
+#: preproc.y:7982
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "підтримуються лише протоколи \"tcp\" та \"unix\" і тип бази даних \"postgresql\""
 
-#: preproc.y:18253
+#: preproc.y:7985
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "очікувалося \"://\", знайдено \"%s\""
 
-#: preproc.y:18258
+#: preproc.y:7990
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unix-сокети працюють лише з \"localhost\", але не з \"%s\""
 
-#: preproc.y:18284
+#: preproc.y:8017
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "очікувалось \"postgresql\", знайдено \"%s\""
 
-#: preproc.y:18287
+#: preproc.y:8020
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "неприпустимий тип підключення: %s"
 
-#: preproc.y:18296
+#: preproc.y:8029
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "очікувалось \"@\" або \"://\", знайдено \"%s\""
 
-#: preproc.y:18371 preproc.y:18389
+#: preproc.y:8127 preproc.y:8145
 #, c-format
 msgid "invalid data type"
 msgstr "неприпустимий тип даних"
 
-#: preproc.y:18400 preproc.y:18417
+#: preproc.y:8156 preproc.y:8173
 #, c-format
 msgid "incomplete statement"
 msgstr "неповний оператор"
 
-#: preproc.y:18403 preproc.y:18420
+#: preproc.y:8159 preproc.y:8176
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "нерозпізнаний токен \"%s\""
 
-#: preproc.y:18465
+#: preproc.y:8231
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "ім'я \"%s\" вже оголошена"
 
-#: preproc.y:18754
+#: preproc.y:8534
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "точність/масштаб можна вказати лише для типів даних numeric і decimal"
 
-#: preproc.y:18853
+#: preproc.y:8633
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "специфікація інтервалу тут не допускається"
 
-#: preproc.y:19009 preproc.y:19061
+#: preproc.y:8789 preproc.y:8847
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "занадто багато рівнів у визначенні вкладеної структури/об'єднання"
 
-#: preproc.y:19184
+#: preproc.y:8982
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "вказівників на varchar не реалізовано"
 
-#: preproc.y:19635
+#: preproc.y:9497
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "команда EXEC SQL VAR не допускає ініціалізатор"
 
-#: preproc.y:19949
+#: preproc.y:9820
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "вхідні масиви індикаторів не допускаються"
 
-#: preproc.y:20136
+#: preproc.y:10054
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "у визначенні змінної оператор не допускається"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:20177
+#: preproc.y:10099
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s в або поблизу \"%s\""
 
-#: type.c:18 type.c:30
-#, c-format
-msgid "out of memory"
-msgstr "недостатньо пам'яті"
-
-#: type.c:214 type.c:685
+#: type.c:191 type.c:661
 #, c-format
 msgid "unrecognized variable type code %d"
 msgstr "нерозпізнаний код типу змінної %d"
 
-#: type.c:263
+#: type.c:240
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
 msgstr "змінна \"%s\" прихована локальною змінною іншого типу"
 
-#: type.c:265
+#: type.c:242
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
 msgstr "змінна \"%s\" прихована локальною змінною"
 
-#: type.c:277
+#: type.c:254
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "змінна-індикатор \"%s\" прихована локальною змінною іншого типу"
 
-#: type.c:279
+#: type.c:256
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
 msgstr "змінна-індикатор \"%s\" прихована локальною змінною"
 
-#: type.c:287
+#: type.c:264
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
 msgstr "індикатор для масиву/вказівника повинен бути масивом/вказівником"
 
-#: type.c:291
+#: type.c:268
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr "вкладені масиви не підтримуються (окрім рядків)"
 
-#: type.c:333
+#: type.c:310
 #, c-format
 msgid "indicator for struct has to be a struct"
 msgstr "індикатор структури повинен бути структурою"
 
-#: type.c:353 type.c:374 type.c:394
+#: type.c:330 type.c:351 type.c:371
 #, c-format
 msgid "indicator for simple data type has to be simple"
 msgstr "індикатор для простого типу даних повинен бути простим"
 
-#: type.c:625
+#: type.c:602
 #, c-format
 msgid "indicator struct \"%s\" has too few members"
 msgstr "індикатор структури \"%s\" має занадто мало елементів"
 
-#: type.c:633
+#: type.c:610
 #, c-format
 msgid "indicator struct \"%s\" has too many members"
 msgstr "індикатор структури \"%s\" має занадто багато елементів"
 
-#: type.c:744
+#: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
 msgstr "нерозпізнаний код елементу дескриптора %d"
 
+#: util.c:26
+#, c-format
+msgid "WARNING: "
+msgstr "ПОПЕРЕДЖЕННЯ: "
+
+#: util.c:29
+#, c-format
+msgid "ERROR: "
+msgstr "ПОМИЛКА: "
+
+#: util.c:90 util.c:102
+#, c-format
+msgid "out of memory"
+msgstr "недостатньо пам'яті"
+
 #: variable.c:89 variable.c:115
 #, c-format
 msgid "incorrectly formed variable \"%s\""
 msgstr "неправильно створена змінна \"%s\""
 
-#: variable.c:138
+#: variable.c:138 variable.c:237
 #, c-format
 msgid "variable \"%s\" is not a pointer"
 msgstr "змінна \"%s\" не є вказівником"
@@ -646,27 +651,32 @@ msgstr "змінна \"%s\" не є структурою або об'єднан
 msgid "variable \"%s\" is not an array"
 msgstr "змінна \"%s\" не є масивом"
 
-#: variable.c:232 variable.c:254
+#: variable.c:220
+#, c-format
+msgid "unmatched bracket in variable \"%s\""
+msgstr "незіставлена дужка у змінній \"%s\""
+
+#: variable.c:235 variable.c:258
 #, c-format
 msgid "variable \"%s\" is not declared"
 msgstr "змінна \"%s\" не проголошена"
 
-#: variable.c:493
+#: variable.c:517
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "змінна-індикатор повинна бути цілим числом"
 
-#: variable.c:510
+#: variable.c:534
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "нерозпізнане ім'я типу даних \"%s\""
 
-#: variable.c:521 variable.c:529 variable.c:546 variable.c:549
+#: variable.c:548 variable.c:556 variable.c:573 variable.c:576
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "багатовимірні масиви не підтримуються"
 
-#: variable.c:538
+#: variable.c:565
 #, 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"
@@ -675,12 +685,12 @@ msgstr[1] "багаторівневі вказівники (більше 2 рі
 msgstr[2] "багаторівневі вказівники (більше 2 рівнів) не підтримуються; знайдено %d рівнів"
 msgstr[3] "багаторівневі вказівники (більше 2 рівнів) не підтримуються; знайдено %d рівень"
 
-#: variable.c:543
+#: variable.c:570
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "для цього типу даних вказівники на вказівники не підтримуються"
 
-#: variable.c:563
+#: variable.c:590
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "багатовимірні масиви структур не підтримуються"
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
index 2c67e33e92e..9179b4fb5cf 100644
--- a/src/interfaces/ecpg/preproc/variable.c
+++ b/src/interfaces/ecpg/preproc/variable.c
@@ -197,7 +197,7 @@ find_variable(const char *name)
 	struct variable *p;
 	int			count;
 
-	next = strpbrk(name, ".[-");
+	next = (char *) strpbrk(name, ".[-");
 	if (next)
 	{
 		if (*next == '[')
diff --git a/src/interfaces/ecpg/test/connect/.gitignore b/src/interfaces/ecpg/test/connect/.gitignore
index e0639f3c8d1..02236847444 100644
--- a/src/interfaces/ecpg/test/connect/.gitignore
+++ b/src/interfaces/ecpg/test/connect/.gitignore
@@ -8,3 +8,5 @@
 /test4.c
 /test5
 /test5.c
+/test6
+/test6.c
diff --git a/src/interfaces/ecpg/test/connect/Makefile b/src/interfaces/ecpg/test/connect/Makefile
index 2602d5d286f..17fa2667bf7 100644
--- a/src/interfaces/ecpg/test/connect/Makefile
+++ b/src/interfaces/ecpg/test/connect/Makefile
@@ -7,6 +7,7 @@ TESTS = test1 test1.c \
         test2 test2.c \
         test3 test3.c \
         test4 test4.c \
-        test5 test5.c
+        test5 test5.c \
+        test6 test6.c
 
 all: $(TESTS)
diff --git a/src/interfaces/ecpg/test/connect/meson.build b/src/interfaces/ecpg/test/connect/meson.build
index 5154167663d..a49aec33ebf 100644
--- a/src/interfaces/ecpg/test/connect/meson.build
+++ b/src/interfaces/ecpg/test/connect/meson.build
@@ -6,6 +6,7 @@ pgc_files = [
   'test3',
   'test4',
   'test5',
+  'test6',
 ]
 
 foreach pgc_file : pgc_files
diff --git a/src/interfaces/ecpg/test/connect/test6.pgc b/src/interfaces/ecpg/test/connect/test6.pgc
new file mode 100644
index 00000000000..d2c10dffb03
--- /dev/null
+++ b/src/interfaces/ecpg/test/connect/test6.pgc
@@ -0,0 +1,68 @@
+/*
+ * This test verifies that ecpg functions properly handle NULL connections
+ * (i.e., when a connection name doesn't exist or has been disconnected).
+ * Before the fix, these operations would cause a segmentation fault.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+exec sql include ../regression;
+
+int
+main(void)
+{
+exec sql begin declare section;
+	int val1output = 2;
+	int val1 = 1;
+	char val2[6] = "data1";
+	char *stmt1 = "SELECT * from test1 where a = $1 and b = $2";
+exec sql end declare section;
+
+	ECPGdebug(1, stderr);
+
+	/* Connect to the database */
+	exec sql connect to REGRESSDB1 as myconn;
+
+	/* Test 1: Try to get descriptor on a disconnected connection */
+	printf("Test 1: Try to get descriptor on a disconnected connection\n");
+	exec sql create table test1 (a int, b text);
+	exec sql insert into test1 (a,b) values (1, 'data1');
+
+	exec sql allocate descriptor indesc;
+	exec sql allocate descriptor outdesc;
+
+	exec sql prepare foo2 from :stmt1;
+
+	exec sql set descriptor indesc value 1 DATA = :val1;
+	exec sql set descriptor indesc value 2 DATA = :val2;
+
+	exec sql execute foo2 using sql descriptor indesc into sql descriptor outdesc;
+
+	exec sql rollback;
+	exec sql disconnect;
+	exec sql get descriptor outdesc value 1 :val1output = DATA;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 2: Try to deallocate all on a non-existent connection */
+	printf("Test 2: deallocate all with non-existent connection\n");
+	exec sql at nonexistent deallocate all;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 3: deallocate on disconnected connection */
+	printf("Test 3: deallocate all on disconnected connection\n");
+	exec sql deallocate all;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 4: Use prepared statement from non-existent connection */
+	printf("Test 4: Use prepared statement from non-existent connection\n");
+	exec sql at nonexistent prepare stmt1 FROM "SELECT 1";
+	exec sql at nonexistent declare cur1 cursor for stmt1;
+	exec sql at nonexistent open cur1;
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	printf("All tests completed !\n");
+
+	return 0;
+}
diff --git a/src/interfaces/ecpg/test/ecpg_schedule b/src/interfaces/ecpg/test/ecpg_schedule
index 254a0bacc75..202110e9fc6 100644
--- a/src/interfaces/ecpg/test/ecpg_schedule
+++ b/src/interfaces/ecpg/test/ecpg_schedule
@@ -13,6 +13,7 @@ test: connect/test2
 test: connect/test3
 test: connect/test4
 test: connect/test5
+test: connect/test6
 test: pgtypeslib/dt_test
 test: pgtypeslib/dt_test2
 test: pgtypeslib/num_test
diff --git a/src/interfaces/ecpg/test/expected/connect-test6.c b/src/interfaces/ecpg/test/expected/connect-test6.c
new file mode 100644
index 00000000000..eed3c46a38c
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/connect-test6.c
@@ -0,0 +1,146 @@
+/* Processed by ecpg (regression mode) */
+/* These include files are added by the preprocessor */
+#include <ecpglib.h>
+#include <ecpgerrno.h>
+#include <sqlca.h>
+/* End of automatic include section */
+#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
+
+#line 1 "test6.pgc"
+/*
+ * This test verifies that ecpg functions properly handle NULL connections
+ * (i.e., when a connection name doesn't exist or has been disconnected).
+ * Before the fix, these operations would cause a segmentation fault.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+
+#line 1 "regression.h"
+
+
+
+
+
+
+#line 11 "test6.pgc"
+
+
+int
+main(void)
+{
+/* exec sql begin declare section */
+	   
+	   
+	   
+	   
+
+#line 17 "test6.pgc"
+ int val1output = 2 ;
+ 
+#line 18 "test6.pgc"
+ int val1 = 1 ;
+ 
+#line 19 "test6.pgc"
+ char val2 [ 6 ] = "data1" ;
+ 
+#line 20 "test6.pgc"
+ char * stmt1 = "SELECT * from test1 where a = $1 and b = $2" ;
+/* exec sql end declare section */
+#line 21 "test6.pgc"
+
+
+	ECPGdebug(1, stderr);
+
+	/* Connect to the database */
+	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "myconn", 0); }
+#line 26 "test6.pgc"
+
+
+	/* Test 1: Try to get descriptor on a disconnected connection */
+	printf("Test 1: Try to get descriptor on a disconnected connection\n");
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test1 ( a int , b text )", ECPGt_EOIT, ECPGt_EORT);}
+#line 30 "test6.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test1 ( a , b ) values ( 1 , 'data1' )", ECPGt_EOIT, ECPGt_EORT);}
+#line 31 "test6.pgc"
+
+
+	ECPGallocate_desc(__LINE__, "indesc");
+#line 33 "test6.pgc"
+
+	ECPGallocate_desc(__LINE__, "outdesc");
+#line 34 "test6.pgc"
+
+
+	{ ECPGprepare(__LINE__, NULL, 0, "foo2", stmt1);}
+#line 36 "test6.pgc"
+
+
+	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
+	ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT);
+}
+#line 38 "test6.pgc"
+
+	{ ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data,
+	ECPGt_char,(val2),(long)6,(long)1,(6)*sizeof(char), ECPGd_EODT);
+}
+#line 39 "test6.pgc"
+
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "foo2", 
+	ECPGt_descriptor, "indesc", 1L, 1L, 1L, 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
+	ECPGt_descriptor, "outdesc", 1L, 1L, 1L, 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
+#line 41 "test6.pgc"
+
+
+	{ ECPGtrans(__LINE__, NULL, "rollback");}
+#line 43 "test6.pgc"
+
+	{ ECPGdisconnect(__LINE__, "CURRENT");}
+#line 44 "test6.pgc"
+
+	{ ECPGget_desc(__LINE__, "outdesc", 1,ECPGd_data,
+	ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), ECPGd_EODT);
+}
+#line 45 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 2: Try to deallocate all on a non-existent connection */
+	printf("Test 2: deallocate all with non-existent connection\n");
+	{ ECPGdeallocate_all(__LINE__, 0, "nonexistent");}
+#line 50 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 3: deallocate on disconnected connection */
+	printf("Test 3: deallocate all on disconnected connection\n");
+	{ ECPGdeallocate_all(__LINE__, 0, NULL);}
+#line 55 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	/* Test 4: Use prepared statement from non-existent connection */
+	printf("Test 4: Use prepared statement from non-existent connection\n");
+	{ ECPGprepare(__LINE__, "nonexistent", 0, "stmt1", "SELECT 1");}
+#line 60 "test6.pgc"
+
+	/* declare cur1 cursor for $1 */
+#line 61 "test6.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, "nonexistent", 0, ECPGst_normal, "declare cur1 cursor for $1", 
+	ECPGt_char_variable,(ECPGprepared_statement("nonexistent", "stmt1", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
+#line 62 "test6.pgc"
+
+	printf("sqlca.sqlcode = %ld\n", sqlca.sqlcode);
+
+	printf("All tests completed !\n");
+
+	return 0;
+}
diff --git a/src/interfaces/ecpg/test/expected/connect-test6.stderr b/src/interfaces/ecpg/test/expected/connect-test6.stderr
new file mode 100644
index 00000000000..8784d5a9d40
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/connect-test6.stderr
@@ -0,0 +1,50 @@
+[NO_PID]: ECPGdebug: set to 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGconnect: opening database ecpg1_regression on <DEFAULT> port <DEFAULT>  
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: query: create table test1 ( a int , b text ); with 0 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 30: OK: CREATE TABLE
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: query: insert into test1 ( a , b ) values ( 1 , 'data1' ); with 0 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 31: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: prepare_common on line 36: name foo2; query: "SELECT * from test1 where a = $1 and b = $2"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 41: query: SELECT * from test1 where a = $1 and b = $2; with 2 parameter(s) on connection myconn
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 41: using PQexecPrepared for "SELECT * from test1 where a = $1 and b = $2"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_free_params on line 41: parameter 1 = 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_free_params on line 41: parameter 2 = data1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 41: correctly got 1 tuples with 2 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 41: putting result (1 tuples) into descriptor outdesc
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGtrans on line 43: action "rollback"; connection "myconn"
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: deallocate_one on line 0: name foo2
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_finish: connection myconn closed
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGget_desc: reading items for tuple 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: raising sqlcode -220 on line 45: connection "NULL" does not exist on line 45
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 50: connection "nonexistent" does not exist on line 50
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 55: connection "NULL" does not exist on line 55
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 60: connection "nonexistent" does not exist on line 60
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 63: connection "nonexistent" does not exist on line 63
+[NO_PID]: sqlca: code: -220, state: 08003
+[NO_PID]: raising sqlcode -220 on line 62: connection "nonexistent" does not exist on line 62
+[NO_PID]: sqlca: code: -220, state: 08003
diff --git a/src/interfaces/ecpg/test/expected/connect-test6.stdout b/src/interfaces/ecpg/test/expected/connect-test6.stdout
new file mode 100644
index 00000000000..bf9a2e91051
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/connect-test6.stdout
@@ -0,0 +1,9 @@
+Test 1: Try to get descriptor on a disconnected connection
+sqlca.sqlcode = -220
+Test 2: deallocate all with non-existent connection
+sqlca.sqlcode = -220
+Test 3: deallocate all on disconnected connection
+sqlca.sqlcode = -220
+Test 4: Use prepared statement from non-existent connection
+sqlca.sqlcode = -220
+All tests completed !
diff --git a/src/interfaces/libpq-oauth/.gitignore b/src/interfaces/libpq-oauth/.gitignore
index a4afe7c1c68..eb5b98aea54 100644
--- a/src/interfaces/libpq-oauth/.gitignore
+++ b/src/interfaces/libpq-oauth/.gitignore
@@ -1 +1,4 @@
 /exports.list
+/oauth_tests
+
+/tmp_check/
diff --git a/src/interfaces/libpq-oauth/Makefile b/src/interfaces/libpq-oauth/Makefile
index 270fc0cf2d9..71cd1829720 100644
--- a/src/interfaces/libpq-oauth/Makefile
+++ b/src/interfaces/libpq-oauth/Makefile
@@ -24,7 +24,8 @@ NAME = pq-oauth-$(MAJORVERSION)
 override shlib := lib$(NAME)$(DLSUFFIX)
 override stlib := libpq-oauth.a
 
-override CPPFLAGS := -I$(libpq_srcdir) -I$(top_builddir)/src/port $(LIBCURL_CPPFLAGS) $(CPPFLAGS)
+override CPPFLAGS := -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS) $(LIBCURL_CPPFLAGS)
+override CFLAGS += $(PTHREAD_CFLAGS)
 
 OBJS = \
 	$(WIN32RES)
@@ -47,7 +48,7 @@ $(stlib): override OBJS += $(OBJS_STATIC)
 $(stlib): $(OBJS_STATIC)
 
 SHLIB_LINK_INTERNAL = $(libpq_pgport_shlib)
-SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl, $(LIBS))
+SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl -lm $(PTHREAD_LIBS), $(LIBS))
 SHLIB_PREREQS = submake-libpq
 SHLIB_EXPORTS = exports.txt
 
diff --git a/src/interfaces/libpq-oauth/meson.build b/src/interfaces/libpq-oauth/meson.build
index df064c59a40..4f006e2c381 100644
--- a/src/interfaces/libpq-oauth/meson.build
+++ b/src/interfaces/libpq-oauth/meson.build
@@ -40,7 +40,7 @@ libpq_oauth_name = 'libpq-oauth-@0@'.format(pg_version_major)
 libpq_oauth_so = shared_module(libpq_oauth_name,
   libpq_oauth_sources + libpq_oauth_so_sources,
   include_directories: [libpq_oauth_inc, postgres_inc],
-  c_args: libpq_so_c_args,
+  c_args: libpq_oauth_so_c_args,
   c_pch: pch_postgres_fe_h,
   dependencies: [frontend_shlib_code, libpq, libpq_oauth_deps],
   link_depends: export_file,
diff --git a/src/interfaces/libpq-oauth/oauth-curl.c b/src/interfaces/libpq-oauth/oauth-curl.c
index dba9a684fa8..64b5306372a 100644
--- a/src/interfaces/libpq-oauth/oauth-curl.c
+++ b/src/interfaces/libpq-oauth/oauth-curl.c
@@ -247,7 +247,8 @@ struct async_ctx
 	 * our entry point, errors have three parts:
 	 *
 	 * - errctx:	an optional static string, describing the global operation
-	 *				currently in progress. It'll be translated for you.
+	 *				currently in progress. Should be translated with
+	 *				libpq_gettext().
 	 *
 	 * - errbuf:	contains the actual error message. Generally speaking, use
 	 *				actx_error[_str] to manipulate this. This must be filled
@@ -278,6 +279,7 @@ struct async_ctx
 	bool		user_prompted;	/* have we already sent the authz prompt? */
 	bool		used_basic_auth;	/* did we send a client secret? */
 	bool		debugging;		/* can we give unsafe developer assistance? */
+	int			dbg_num_calls;	/* (debug mode) how many times were we called? */
 };
 
 /*
@@ -366,13 +368,16 @@ pg_fe_cleanup_oauth_flow(PGconn *conn)
 
 /*
  * Macros for manipulating actx->errbuf. actx_error() translates and formats a
- * string for you; actx_error_str() appends a string directly without
- * translation.
+ * string for you, actx_error_internal() is the untranslated equivalent, and
+ * actx_error_str() appends a string directly (also without translation).
  */
 
 #define actx_error(ACTX, FMT, ...) \
 	appendPQExpBuffer(&(ACTX)->errbuf, libpq_gettext(FMT), ##__VA_ARGS__)
 
+#define actx_error_internal(ACTX, FMT, ...) \
+	appendPQExpBuffer(&(ACTX)->errbuf, FMT, ##__VA_ARGS__)
+
 #define actx_error_str(ACTX, S) \
 	appendPQExpBufferStr(&(ACTX)->errbuf, S)
 
@@ -460,6 +465,9 @@ struct oauth_parse
 #define oauth_parse_set_error(ctx, fmt, ...) \
 	appendPQExpBuffer((ctx)->errbuf, libpq_gettext(fmt), ##__VA_ARGS__)
 
+#define oauth_parse_set_error_internal(ctx, fmt, ...) \
+	appendPQExpBuffer((ctx)->errbuf, fmt, ##__VA_ARGS__)
+
 static void
 report_type_mismatch(struct oauth_parse *ctx)
 {
@@ -474,20 +482,20 @@ report_type_mismatch(struct oauth_parse *ctx)
 	switch (ctx->active->type)
 	{
 		case JSON_TOKEN_STRING:
-			msgfmt = "field \"%s\" must be a string";
+			msgfmt = gettext_noop("field \"%s\" must be a string");
 			break;
 
 		case JSON_TOKEN_NUMBER:
-			msgfmt = "field \"%s\" must be a number";
+			msgfmt = gettext_noop("field \"%s\" must be a number");
 			break;
 
 		case JSON_TOKEN_ARRAY_START:
-			msgfmt = "field \"%s\" must be an array of strings";
+			msgfmt = gettext_noop("field \"%s\" must be an array of strings");
 			break;
 
 		default:
 			Assert(false);
-			msgfmt = "field \"%s\" has unexpected type";
+			msgfmt = gettext_noop("field \"%s\" has unexpected type");
 	}
 
 	oauth_parse_set_error(ctx, msgfmt, ctx->active->name);
@@ -535,9 +543,9 @@ oauth_json_object_field_start(void *state, char *name, bool isnull)
 		if (ctx->active)
 		{
 			Assert(false);
-			oauth_parse_set_error(ctx,
-								  "internal error: started field '%s' before field '%s' was finished",
-								  name, ctx->active->name);
+			oauth_parse_set_error_internal(ctx,
+										   "internal error: started field \"%s\" before field \"%s\" was finished",
+										   name, ctx->active->name);
 			return JSON_SEM_ACTION_FAILED;
 		}
 
@@ -587,9 +595,9 @@ oauth_json_object_end(void *state)
 	if (!ctx->nested && ctx->active)
 	{
 		Assert(false);
-		oauth_parse_set_error(ctx,
-							  "internal error: field '%s' still active at end of object",
-							  ctx->active->name);
+		oauth_parse_set_error_internal(ctx,
+									   "internal error: field \"%s\" still active at end of object",
+									   ctx->active->name);
 		return JSON_SEM_ACTION_FAILED;
 	}
 
@@ -643,9 +651,9 @@ oauth_json_array_end(void *state)
 		if (ctx->nested != 2 || ctx->active->type != JSON_TOKEN_ARRAY_START)
 		{
 			Assert(false);
-			oauth_parse_set_error(ctx,
-								  "internal error: found unexpected array end while parsing field '%s'",
-								  ctx->active->name);
+			oauth_parse_set_error_internal(ctx,
+										   "internal error: found unexpected array end while parsing field \"%s\"",
+										   ctx->active->name);
 			return JSON_SEM_ACTION_FAILED;
 		}
 
@@ -698,9 +706,9 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 			if (ctx->nested != 1)
 			{
 				Assert(false);
-				oauth_parse_set_error(ctx,
-									  "internal error: scalar target found at nesting level %d",
-									  ctx->nested);
+				oauth_parse_set_error_internal(ctx,
+											   "internal error: scalar target found at nesting level %d",
+											   ctx->nested);
 				return JSON_SEM_ACTION_FAILED;
 			}
 
@@ -708,9 +716,9 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 			if (*field->target.scalar)
 			{
 				Assert(false);
-				oauth_parse_set_error(ctx,
-									  "internal error: scalar field '%s' would be assigned twice",
-									  ctx->active->name);
+				oauth_parse_set_error_internal(ctx,
+											   "internal error: scalar field \"%s\" would be assigned twice",
+											   ctx->active->name);
 				return JSON_SEM_ACTION_FAILED;
 			}
 
@@ -730,9 +738,9 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 			if (ctx->nested != 2)
 			{
 				Assert(false);
-				oauth_parse_set_error(ctx,
-									  "internal error: array member found at nesting level %d",
-									  ctx->nested);
+				oauth_parse_set_error_internal(ctx,
+											   "internal error: array member found at nesting level %d",
+											   ctx->nested);
 				return JSON_SEM_ACTION_FAILED;
 			}
 
@@ -1086,7 +1094,7 @@ parse_token_error(struct async_ctx *actx, struct token_error *err)
 	 * override the errctx if parsing explicitly fails.
 	 */
 	if (!result)
-		actx->errctx = "failed to parse token error response";
+		actx->errctx = libpq_gettext("failed to parse token error response");
 
 	return result;
 }
@@ -1114,8 +1122,8 @@ record_token_error(struct async_ctx *actx, const struct token_error *err)
 		if (response_code == 401)
 		{
 			actx_error(actx, actx->used_basic_auth
-					   ? "provider rejected the oauth_client_secret"
-					   : "provider requires client authentication, and no oauth_client_secret is set");
+					   ? gettext_noop("provider rejected the oauth_client_secret")
+					   : gettext_noop("provider requires client authentication, and no oauth_client_secret is set"));
 			actx_error_str(actx, " ");
 		}
 	}
@@ -1178,20 +1186,20 @@ setup_multiplexer(struct async_ctx *actx)
 	actx->mux = epoll_create1(EPOLL_CLOEXEC);
 	if (actx->mux < 0)
 	{
-		actx_error(actx, "failed to create epoll set: %m");
+		actx_error_internal(actx, "failed to create epoll set: %m");
 		return false;
 	}
 
 	actx->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
 	if (actx->timerfd < 0)
 	{
-		actx_error(actx, "failed to create timerfd: %m");
+		actx_error_internal(actx, "failed to create timerfd: %m");
 		return false;
 	}
 
 	if (epoll_ctl(actx->mux, EPOLL_CTL_ADD, actx->timerfd, &ev) < 0)
 	{
-		actx_error(actx, "failed to add timerfd to epoll set: %m");
+		actx_error_internal(actx, "failed to add timerfd to epoll set: %m");
 		return false;
 	}
 
@@ -1200,8 +1208,7 @@ setup_multiplexer(struct async_ctx *actx)
 	actx->mux = kqueue();
 	if (actx->mux < 0)
 	{
-		/*- translator: the term "kqueue" (kernel queue) should not be translated */
-		actx_error(actx, "failed to create kqueue: %m");
+		actx_error_internal(actx, "failed to create kqueue: %m");
 		return false;
 	}
 
@@ -1214,7 +1221,7 @@ setup_multiplexer(struct async_ctx *actx)
 	actx->timerfd = kqueue();
 	if (actx->timerfd < 0)
 	{
-		actx_error(actx, "failed to create timer kqueue: %m");
+		actx_error_internal(actx, "failed to create timer kqueue: %m");
 		return false;
 	}
 
@@ -1258,7 +1265,7 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 			break;
 
 		default:
-			actx_error(actx, "unknown libcurl socket operation: %d", what);
+			actx_error_internal(actx, "unknown libcurl socket operation: %d", what);
 			return -1;
 	}
 
@@ -1275,15 +1282,15 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 		switch (op)
 		{
 			case EPOLL_CTL_ADD:
-				actx_error(actx, "could not add to epoll set: %m");
+				actx_error_internal(actx, "could not add to epoll set: %m");
 				break;
 
 			case EPOLL_CTL_DEL:
-				actx_error(actx, "could not delete from epoll set: %m");
+				actx_error_internal(actx, "could not delete from epoll set: %m");
 				break;
 
 			default:
-				actx_error(actx, "could not update epoll set: %m");
+				actx_error_internal(actx, "could not update epoll set: %m");
 		}
 
 		return -1;
@@ -1291,22 +1298,31 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 
 	return 0;
 #elif defined(HAVE_SYS_EVENT_H)
-	struct kevent ev[2] = {0};
+	struct kevent ev[2];
 	struct kevent ev_out[2];
 	struct timespec timeout = {0};
 	int			nev = 0;
 	int			res;
 
+	/*
+	 * We don't know which of the events is currently registered, perhaps
+	 * both, so we always try to remove unneeded events. This means we need to
+	 * tolerate ENOENT below.
+	 */
 	switch (what)
 	{
 		case CURL_POLL_IN:
 			EV_SET(&ev[nev], socket, EVFILT_READ, EV_ADD | EV_RECEIPT, 0, 0, 0);
 			nev++;
+			EV_SET(&ev[nev], socket, EVFILT_WRITE, EV_DELETE | EV_RECEIPT, 0, 0, 0);
+			nev++;
 			break;
 
 		case CURL_POLL_OUT:
 			EV_SET(&ev[nev], socket, EVFILT_WRITE, EV_ADD | EV_RECEIPT, 0, 0, 0);
 			nev++;
+			EV_SET(&ev[nev], socket, EVFILT_READ, EV_DELETE | EV_RECEIPT, 0, 0, 0);
+			nev++;
 			break;
 
 		case CURL_POLL_INOUT:
@@ -1317,12 +1333,6 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 			break;
 
 		case CURL_POLL_REMOVE:
-
-			/*
-			 * We don't know which of these is currently registered, perhaps
-			 * both, so we try to remove both.  This means we need to tolerate
-			 * ENOENT below.
-			 */
 			EV_SET(&ev[nev], socket, EVFILT_READ, EV_DELETE | EV_RECEIPT, 0, 0, 0);
 			nev++;
 			EV_SET(&ev[nev], socket, EVFILT_WRITE, EV_DELETE | EV_RECEIPT, 0, 0, 0);
@@ -1330,14 +1340,17 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 			break;
 
 		default:
-			actx_error(actx, "unknown libcurl socket operation: %d", what);
+			actx_error_internal(actx, "unknown libcurl socket operation: %d", what);
 			return -1;
 	}
 
-	res = kevent(actx->mux, ev, nev, ev_out, lengthof(ev_out), &timeout);
+	Assert(nev <= lengthof(ev));
+	Assert(nev <= lengthof(ev_out));
+
+	res = kevent(actx->mux, ev, nev, ev_out, nev, &timeout);
 	if (res < 0)
 	{
-		actx_error(actx, "could not modify kqueue: %m");
+		actx_error_internal(actx, "could not modify kqueue: %m");
 		return -1;
 	}
 
@@ -1361,10 +1374,10 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 			switch (what)
 			{
 				case CURL_POLL_REMOVE:
-					actx_error(actx, "could not delete from kqueue: %m");
+					actx_error_internal(actx, "could not delete from kqueue: %m");
 					break;
 				default:
-					actx_error(actx, "could not add to kqueue: %m");
+					actx_error_internal(actx, "could not add to kqueue: %m");
 			}
 			return -1;
 		}
@@ -1376,6 +1389,53 @@ register_socket(CURL *curl, curl_socket_t socket, int what, void *ctx,
 #endif
 }
 
+/*
+ * If there is no work to do on any of the descriptors in the multiplexer, then
+ * this function must ensure that the multiplexer is not readable.
+ *
+ * Unlike epoll descriptors, kqueue descriptors only transition from readable to
+ * unreadable when kevent() is called and finds nothing, after removing
+ * level-triggered conditions that have gone away. We therefore need a dummy
+ * kevent() call after operations might have been performed on the monitored
+ * sockets or timer_fd. Any event returned is ignored here, but it also remains
+ * queued (being level-triggered) and leaves the descriptor readable. This is a
+ * no-op for epoll descriptors.
+ */
+static bool
+comb_multiplexer(struct async_ctx *actx)
+{
+#if defined(HAVE_SYS_EPOLL_H)
+	/* The epoll implementation doesn't hold onto stale events. */
+	return true;
+#elif defined(HAVE_SYS_EVENT_H)
+	struct timespec timeout = {0};
+	struct kevent ev;
+
+	/*
+	 * Try to read a single pending event. We can actually ignore the result:
+	 * either we found an event to process, in which case the multiplexer is
+	 * correctly readable for that event at minimum, and it doesn't matter if
+	 * there are any stale events; or we didn't find any, in which case the
+	 * kernel will have discarded any stale events as it traveled to the end
+	 * of the queue.
+	 *
+	 * Note that this depends on our registrations being level-triggered --
+	 * even the timer, so we use a chained kqueue for that instead of an
+	 * EVFILT_TIMER on the top-level mux. If we used edge-triggered events,
+	 * this call would improperly discard them.
+	 */
+	if (kevent(actx->mux, NULL, 0, &ev, 1, &timeout) < 0)
+	{
+		actx_error_internal(actx, "could not comb kqueue: %m");
+		return false;
+	}
+
+	return true;
+#else
+#error comb_multiplexer is not implemented on this platform
+#endif
+}
+
 /*
  * Enables or disables the timer in the multiplexer set. The timeout value is
  * in milliseconds (negative values disable the timer).
@@ -1416,7 +1476,7 @@ set_timer(struct async_ctx *actx, long timeout)
 
 	if (timerfd_settime(actx->timerfd, 0 /* no flags */ , &spec, NULL) < 0)
 	{
-		actx_error(actx, "setting timerfd to %ld: %m", timeout);
+		actx_error_internal(actx, "setting timerfd to %ld: %m", timeout);
 		return false;
 	}
 
@@ -1446,14 +1506,14 @@ set_timer(struct async_ctx *actx, long timeout)
 	EV_SET(&ev, 1, EVFILT_TIMER, EV_DELETE, 0, 0, 0);
 	if (kevent(actx->timerfd, &ev, 1, NULL, 0, NULL) < 0 && errno != ENOENT)
 	{
-		actx_error(actx, "deleting kqueue timer: %m");
+		actx_error_internal(actx, "deleting kqueue timer: %m");
 		return false;
 	}
 
 	EV_SET(&ev, actx->timerfd, EVFILT_READ, EV_DELETE, 0, 0, 0);
 	if (kevent(actx->mux, &ev, 1, NULL, 0, NULL) < 0 && errno != ENOENT)
 	{
-		actx_error(actx, "removing kqueue timer from multiplexer: %m");
+		actx_error_internal(actx, "removing kqueue timer from multiplexer: %m");
 		return false;
 	}
 
@@ -1464,14 +1524,14 @@ set_timer(struct async_ctx *actx, long timeout)
 	EV_SET(&ev, 1, EVFILT_TIMER, (EV_ADD | EV_ONESHOT), 0, timeout, 0);
 	if (kevent(actx->timerfd, &ev, 1, NULL, 0, NULL) < 0)
 	{
-		actx_error(actx, "setting kqueue timer to %ld: %m", timeout);
+		actx_error_internal(actx, "setting kqueue timer to %ld: %m", timeout);
 		return false;
 	}
 
 	EV_SET(&ev, actx->timerfd, EVFILT_READ, EV_ADD, 0, 0, 0);
 	if (kevent(actx->mux, &ev, 1, NULL, 0, NULL) < 0)
 	{
-		actx_error(actx, "adding kqueue timer to multiplexer: %m");
+		actx_error_internal(actx, "adding kqueue timer to multiplexer: %m");
 		return false;
 	}
 
@@ -1483,40 +1543,20 @@ set_timer(struct async_ctx *actx, long timeout)
 
 /*
  * Returns 1 if the timeout in the multiplexer set has expired since the last
- * call to set_timer(), 0 if the timer is still running, or -1 (with an
- * actx_error() report) if the timer cannot be queried.
+ * call to set_timer(), 0 if the timer is either still running or disarmed, or
+ * -1 (with an actx_error() report) if the timer cannot be queried.
  */
 static int
 timer_expired(struct async_ctx *actx)
 {
-#if defined(HAVE_SYS_EPOLL_H)
-	struct itimerspec spec = {0};
-
-	if (timerfd_gettime(actx->timerfd, &spec) < 0)
-	{
-		actx_error(actx, "getting timerfd value: %m");
-		return -1;
-	}
-
-	/*
-	 * This implementation assumes we're using single-shot timers. If you
-	 * change to using intervals, you'll need to reimplement this function
-	 * too, possibly with the read() or select() interfaces for timerfd.
-	 */
-	Assert(spec.it_interval.tv_sec == 0
-		   && spec.it_interval.tv_nsec == 0);
-
-	/* If the remaining time to expiration is zero, we're done. */
-	return (spec.it_value.tv_sec == 0
-			&& spec.it_value.tv_nsec == 0);
-#elif defined(HAVE_SYS_EVENT_H)
+#if defined(HAVE_SYS_EPOLL_H) || defined(HAVE_SYS_EVENT_H)
 	int			res;
 
-	/* Is the timer queue ready? */
+	/* Is the timer ready? */
 	res = PQsocketPoll(actx->timerfd, 1 /* forRead */ , 0, 0);
 	if (res < 0)
 	{
-		actx_error(actx, "checking kqueue for timeout: %m");
+		actx_error(actx, "checking timer expiration: %m");
 		return -1;
 	}
 
@@ -1548,6 +1588,36 @@ register_timer(CURLM *curlm, long timeout, void *ctx)
 	return 0;
 }
 
+/*
+ * Removes any expired-timer event from the multiplexer. If was_expired is not
+ * NULL, it will contain whether or not the timer was expired at time of call.
+ */
+static bool
+drain_timer_events(struct async_ctx *actx, bool *was_expired)
+{
+	int			res;
+
+	res = timer_expired(actx);
+	if (res < 0)
+		return false;
+
+	if (res > 0)
+	{
+		/*
+		 * Timer is expired. We could drain the event manually from the
+		 * timerfd, but it's easier to simply disable it; that keeps the
+		 * platform-specific code in set_timer().
+		 */
+		if (!set_timer(actx, -1))
+			return false;
+	}
+
+	if (was_expired)
+		*was_expired = (res > 0);
+
+	return true;
+}
+
 /*
  * Prints Curl request debugging information to stderr.
  *
@@ -1855,6 +1925,12 @@ start_request(struct async_ctx *actx)
 #define CURL_IGNORE_DEPRECATION(x) x
 #endif
 
+/*
+ * Add another macro layer that inserts the needed semicolon, to avoid having
+ * to write a literal semicolon in the call below, which would break pgindent.
+ */
+#define PG_CURL_IGNORE_DEPRECATION(x) CURL_IGNORE_DEPRECATION(x;)
+
 /*
  * Drives the multi handle towards completion. The caller should have already
  * set up an asynchronous request via start_request().
@@ -1884,11 +1960,10 @@ drive_request(struct async_ctx *actx)
 		 * to remove or break this API, so ignore the deprecation. See
 		 *
 		 *    https://curl.se/mail/lib-2024-11/0028.html
-		 *
 		 */
-		CURL_IGNORE_DEPRECATION(
-			err = curl_multi_socket_all(actx->curlm, &actx->running);
-		)
+		PG_CURL_IGNORE_DEPRECATION(err =
+								   curl_multi_socket_all(actx->curlm,
+														 &actx->running));
 
 		if (err)
 		{
@@ -2084,7 +2159,7 @@ finish_discovery(struct async_ctx *actx)
 	/*
 	 * Pull the fields we care about from the document.
 	 */
-	actx->errctx = "failed to parse OpenID discovery document";
+	actx->errctx = libpq_gettext("failed to parse OpenID discovery document");
 	if (!parse_provider(actx, &actx->provider))
 		return false;			/* error message already set */
 
@@ -2352,7 +2427,7 @@ finish_device_authz(struct async_ctx *actx)
 	 */
 	if (response_code == 200)
 	{
-		actx->errctx = "failed to parse device authorization";
+		actx->errctx = libpq_gettext("failed to parse device authorization");
 		if (!parse_device_authz(actx, &actx->authz))
 			return false;		/* error message already set */
 
@@ -2440,7 +2515,7 @@ finish_token_request(struct async_ctx *actx, struct token *tok)
 	 */
 	if (response_code == 200)
 	{
-		actx->errctx = "failed to parse access token response";
+		actx->errctx = libpq_gettext("failed to parse access token response");
 		if (!parse_access_token(actx, tok))
 			return false;		/* error message already set */
 
@@ -2751,38 +2826,64 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 				{
 					PostgresPollingStatusType status;
 
+					/*
+					 * Clear any expired timeout before calling back into
+					 * Curl. Curl is not guaranteed to do this for us, because
+					 * its API expects us to use single-shot (i.e.
+					 * edge-triggered) timeouts, and ours are level-triggered
+					 * via the mux.
+					 *
+					 * This can't be combined with the comb_multiplexer() call
+					 * below: we might accidentally clear a short timeout that
+					 * was both set and expired during the call to
+					 * drive_request().
+					 */
+					if (!drain_timer_events(actx, NULL))
+						goto error_return;
+
+					/* Move the request forward. */
 					status = drive_request(actx);
 
 					if (status == PGRES_POLLING_FAILED)
 						goto error_return;
-					else if (status != PGRES_POLLING_OK)
-					{
-						/* not done yet */
-						return status;
-					}
+					else if (status == PGRES_POLLING_OK)
+						break;	/* done! */
 
-					break;
+					/*
+					 * This request is still running.
+					 *
+					 * Make sure that stale events don't cause us to come back
+					 * early. (Currently, this can occur only with kqueue.) If
+					 * this is forgotten, the multiplexer can get stuck in a
+					 * signaled state and we'll burn CPU cycles pointlessly.
+					 */
+					if (!comb_multiplexer(actx))
+						goto error_return;
+
+					return status;
 				}
 
 			case OAUTH_STEP_WAIT_INTERVAL:
-
-				/*
-				 * The client application is supposed to wait until our timer
-				 * expires before calling PQconnectPoll() again, but that
-				 * might not happen. To avoid sending a token request early,
-				 * check the timer before continuing.
-				 */
-				if (!timer_expired(actx))
 				{
-					set_conn_altsock(conn, actx->timerfd);
-					return PGRES_POLLING_READING;
-				}
+					bool		expired;
 
-				/* Disable the expired timer. */
-				if (!set_timer(actx, -1))
-					goto error_return;
+					/*
+					 * The client application is supposed to wait until our
+					 * timer expires before calling PQconnectPoll() again, but
+					 * that might not happen. To avoid sending a token request
+					 * early, check the timer before continuing.
+					 */
+					if (!drain_timer_events(actx, &expired))
+						goto error_return;
 
-				break;
+					if (!expired)
+					{
+						set_conn_altsock(conn, actx->timerfd);
+						return PGRES_POLLING_READING;
+					}
+
+					break;
+				}
 		}
 
 		/*
@@ -2793,7 +2894,7 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 		switch (actx->step)
 		{
 			case OAUTH_STEP_INIT:
-				actx->errctx = "failed to fetch OpenID discovery document";
+				actx->errctx = libpq_gettext("failed to fetch OpenID discovery document");
 				if (!start_discovery(actx, conn_oauth_discovery_uri(conn)))
 					goto error_return;
 
@@ -2807,11 +2908,11 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 				if (!check_issuer(actx, conn))
 					goto error_return;
 
-				actx->errctx = "cannot run OAuth device authorization";
+				actx->errctx = libpq_gettext("cannot run OAuth device authorization");
 				if (!check_for_device_flow(actx))
 					goto error_return;
 
-				actx->errctx = "failed to obtain device authorization";
+				actx->errctx = libpq_gettext("failed to obtain device authorization");
 				if (!start_device_authz(actx, conn))
 					goto error_return;
 
@@ -2822,7 +2923,7 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 				if (!finish_device_authz(actx))
 					goto error_return;
 
-				actx->errctx = "failed to obtain access token";
+				actx->errctx = libpq_gettext("failed to obtain access token");
 				if (!start_token_request(actx, conn))
 					goto error_return;
 
@@ -2873,7 +2974,7 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 				break;
 
 			case OAUTH_STEP_WAIT_INTERVAL:
-				actx->errctx = "failed to obtain access token";
+				actx->errctx = libpq_gettext("failed to obtain access token");
 				if (!start_token_request(actx, conn))
 					goto error_return;
 
@@ -2899,7 +3000,7 @@ pg_fe_run_oauth_flow_impl(PGconn *conn)
 	 * also the documentation for struct async_ctx.
 	 */
 	if (actx->errctx)
-		appendPQExpBuffer(errbuf, "%s: ", libpq_gettext(actx->errctx));
+		appendPQExpBuffer(errbuf, "%s: ", actx->errctx);
 
 	if (PQExpBufferDataBroken(actx->errbuf))
 		appendPQExpBufferStr(errbuf, libpq_gettext("out of memory"));
@@ -2932,6 +3033,8 @@ PostgresPollingStatusType
 pg_fe_run_oauth_flow(PGconn *conn)
 {
 	PostgresPollingStatusType result;
+	fe_oauth_state *state = conn_sasl_state(conn);
+	struct async_ctx *actx;
 #ifndef WIN32
 	sigset_t	osigset;
 	bool		sigpipe_pending;
@@ -2960,6 +3063,25 @@ pg_fe_run_oauth_flow(PGconn *conn)
 
 	result = pg_fe_run_oauth_flow_impl(conn);
 
+	/*
+	 * To assist with finding bugs in comb_multiplexer() and
+	 * drain_timer_events(), when we're in debug mode, track the total number
+	 * of calls to this function and print that at the end of the flow.
+	 *
+	 * Be careful that state->async_ctx could be NULL if early initialization
+	 * fails during the first call.
+	 */
+	actx = state->async_ctx;
+	Assert(actx || result == PGRES_POLLING_FAILED);
+
+	if (actx && actx->debugging)
+	{
+		actx->dbg_num_calls++;
+		if (result == PGRES_POLLING_OK || result == PGRES_POLLING_FAILED)
+			fprintf(stderr, "[libpq] total number of polls: %d\n",
+					actx->dbg_num_calls);
+	}
+
 #ifndef WIN32
 	if (masked)
 	{
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index c0ef8e5e114..c2db14b4aff 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
 #
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/interfaces/libpq/Makefile
 #
@@ -25,7 +25,7 @@ NAME= pq
 SO_MAJOR_VERSION= 5
 SO_MINOR_VERSION= $(MAJORVERSION)
 
-override CPPFLAGS :=  -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port
+override CPPFLAGS := -I$(srcdir) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port $(CPPFLAGS)
 ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)
 endif
@@ -90,7 +90,7 @@ endif
 # that are built correctly for use in a shlib.
 SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib
 ifneq ($(PORTNAME), win32)
-SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi_krb5 -lgss -lgssapi -lssl -lsocket -lnsl -lresolv -lintl -lm, $(LIBS)) $(LDAP_LIBS_FE) $(PTHREAD_LIBS)
+SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi_krb5 -lgss -lgssapi -lssl -lsocket -lnsl -lresolv -lintl -ldl -lm, $(LIBS)) $(LDAP_LIBS_FE) $(PTHREAD_LIBS)
 else
 SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl -lm $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE)
 endif
diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
index f6160ca8d00..22f11980d5f 100644
--- a/src/interfaces/libpq/exports.txt
+++ b/src/interfaces/libpq/exports.txt
@@ -205,12 +205,11 @@ PQcancelFinish            202
 PQsocketPoll              203
 PQsetChunkedRowsMode      204
 PQgetCurrentTimeUSec      205
-PQservice                 206
-PQsetAuthDataHook         207
-PQgetAuthDataHook         208
-PQdefaultAuthDataHook     209
-PQfullProtocolVersion     210
-appendPQExpBufferVA       211
+PQsetAuthDataHook         206
+PQgetAuthDataHook         207
+PQdefaultAuthDataHook     208
+PQfullProtocolVersion     209
+appendPQExpBufferVA       210
 Ivyfinish                  312
 Ivystatus                  313
 Ivyexec                    314
@@ -234,3 +233,6 @@ IvybindOutParameterByPos   331
 IvyexecPreparedStatement   332
 IvyFreePreparedStatement   333
 Ivyclear                   334
+Ivyconnectdb2              335
+Ivyfinish2                 336
+IvyStmtExecute2            337
diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c
index d146c5f567c..fb63a3249d6 100644
--- a/src/interfaces/libpq/fe-auth-oauth.c
+++ b/src/interfaces/libpq/fe-auth-oauth.c
@@ -183,7 +183,14 @@ struct json_ctx
 #define oauth_json_has_error(ctx) \
 	(PQExpBufferDataBroken((ctx)->errbuf) || (ctx)->errmsg)
 
-#define oauth_json_set_error(ctx, ...) \
+#define oauth_json_set_error(ctx, fmt, ...) \
+	do { \
+		appendPQExpBuffer(&(ctx)->errbuf, libpq_gettext(fmt), ##__VA_ARGS__); \
+		(ctx)->errmsg = (ctx)->errbuf.data; \
+	} while (0)
+
+/* An untranslated version of oauth_json_set_error(). */
+#define oauth_json_set_error_internal(ctx, ...) \
 	do { \
 		appendPQExpBuffer(&(ctx)->errbuf, __VA_ARGS__); \
 		(ctx)->errmsg = (ctx)->errbuf.data; \
@@ -199,13 +206,13 @@ oauth_json_object_start(void *state)
 		Assert(ctx->nested == 1);
 
 		oauth_json_set_error(ctx,
-							 libpq_gettext("field \"%s\" must be a string"),
+							 "field \"%s\" must be a string",
 							 ctx->target_field_name);
 	}
 
 	++ctx->nested;
 	if (ctx->nested > MAX_SASL_NESTING_LEVEL)
-		oauth_json_set_error(ctx, libpq_gettext("JSON is too deeply nested"));
+		oauth_json_set_error(ctx, "JSON is too deeply nested");
 
 	return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS;
 }
@@ -254,20 +261,20 @@ oauth_json_array_start(void *state)
 
 	if (!ctx->nested)
 	{
-		ctx->errmsg = libpq_gettext("top-level element must be an object");
+		oauth_json_set_error(ctx, "top-level element must be an object");
 	}
 	else if (ctx->target_field)
 	{
 		Assert(ctx->nested == 1);
 
 		oauth_json_set_error(ctx,
-							 libpq_gettext("field \"%s\" must be a string"),
+							 "field \"%s\" must be a string",
 							 ctx->target_field_name);
 	}
 
 	++ctx->nested;
 	if (ctx->nested > MAX_SASL_NESTING_LEVEL)
-		oauth_json_set_error(ctx, libpq_gettext("JSON is too deeply nested"));
+		oauth_json_set_error(ctx, "JSON is too deeply nested");
 
 	return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS;
 }
@@ -288,7 +295,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 
 	if (!ctx->nested)
 	{
-		ctx->errmsg = libpq_gettext("top-level element must be an object");
+		oauth_json_set_error(ctx, "top-level element must be an object");
 		return JSON_SEM_ACTION_FAILED;
 	}
 
@@ -301,9 +308,9 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 			 * Assert and don't continue any further for production builds.
 			 */
 			Assert(false);
-			oauth_json_set_error(ctx,
-								 "internal error: target scalar found at nesting level %d during OAUTHBEARER parsing",
-								 ctx->nested);
+			oauth_json_set_error_internal(ctx,
+										  "internal error: target scalar found at nesting level %d during OAUTHBEARER parsing",
+										  ctx->nested);
 			return JSON_SEM_ACTION_FAILED;
 		}
 
@@ -314,7 +321,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 		if (*ctx->target_field)
 		{
 			oauth_json_set_error(ctx,
-								 libpq_gettext("field \"%s\" is duplicated"),
+								 "field \"%s\" is duplicated",
 								 ctx->target_field_name);
 			return JSON_SEM_ACTION_FAILED;
 		}
@@ -323,7 +330,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
 		if (type != JSON_TOKEN_STRING)
 		{
 			oauth_json_set_error(ctx,
-								 libpq_gettext("field \"%s\" must be a string"),
+								 "field \"%s\" must be a string",
 								 ctx->target_field_name);
 			return JSON_SEM_ACTION_FAILED;
 		}
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
index f6d6a5aa977..f0feeeaca51 100644
--- a/src/interfaces/libpq/fe-auth-scram.c
+++ b/src/interfaces/libpq/fe-auth-scram.c
@@ -631,7 +631,7 @@ read_server_first_message(fe_scram_state *state, char *input)
 
 	/* Verify immediately that the server used our part of the nonce */
 	if (strlen(nonce) < strlen(state->client_nonce) ||
-		memcmp(nonce, state->client_nonce, strlen(state->client_nonce)) != 0)
+		timingsafe_bcmp(nonce, state->client_nonce, strlen(state->client_nonce)) != 0)
 	{
 		libpq_append_conn_error(conn, "invalid SCRAM response (nonce mismatch)");
 		return false;
@@ -896,8 +896,8 @@ verify_server_signature(fe_scram_state *state, bool *match,
 	pg_hmac_free(ctx);
 
 	/* signature processed, so now check after it */
-	if (memcmp(expected_ServerSignature, state->ServerSignature,
-			   state->key_length) != 0)
+	if (timingsafe_bcmp(expected_ServerSignature, state->ServerSignature,
+						state->key_length) != 0)
 		*match = false;
 	else
 		*match = true;
diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c
index cd3102346bf..c872a0267f0 100644
--- a/src/interfaces/libpq/fe-cancel.c
+++ b/src/interfaces/libpq/fe-cancel.c
@@ -137,6 +137,7 @@ PQcancelCreate(PGconn *conn)
 		goto oom_error;
 
 	originalHost = conn->connhost[conn->whichhost];
+	cancelConn->connhost[0].type = originalHost.type;
 	if (originalHost.host)
 	{
 		cancelConn->connhost[0].host = strdup(originalHost.host);
@@ -378,7 +379,24 @@ PQgetCancel(PGconn *conn)
 
 	/* Check that we have received a cancellation key */
 	if (conn->be_cancel_key_len == 0)
-		return NULL;
+	{
+		/*
+		 * In case there is no cancel key, return an all-zero PGcancel object.
+		 * Actually calling PQcancel on this will fail, but we allow creating
+		 * the PGcancel object anyway. Arguably it would be better return NULL
+		 * to indicate that cancellation is not possible, but there'd be no
+		 * way for the caller to distinguish "out of memory" from "server did
+		 * not send a cancel key". Also, this is how PGgetCancel() has always
+		 * behaved, and if we changed it, some clients would stop working
+		 * altogether with servers that don't support cancellation. (The
+		 * modern PQcancelCreate() function returns a failed connection object
+		 * instead.)
+		 *
+		 * The returned dummy object has cancel_pkt_len == 0; we check for
+		 * that in PQcancel() to identify it as a dummy.
+		 */
+		return calloc(1, sizeof(PGcancel));
+	}
 
 	cancel_req_len = offsetof(CancelRequestPacket, cancelAuthCode) + conn->be_cancel_key_len;
 	cancel = malloc(offsetof(PGcancel, cancel_req) + cancel_req_len);
@@ -543,6 +561,15 @@ PQcancel(PGcancel *cancel, char *errbuf, int errbufsize)
 		return false;
 	}
 
+	if (cancel->cancel_pkt_len == 0)
+	{
+		/* This is a dummy PGcancel object, see PQgetCancel */
+		strlcpy(errbuf, "PQcancel() -- no cancellation key received", errbufsize);
+		/* strlcpy probably doesn't change errno, but be paranoid */
+		SOCK_ERRNO_SET(save_errno);
+		return false;
+	}
+
 	/*
 	 * We need to open a temporary connection to the postmaster. Do this with
 	 * only kernel calls.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index c8aeb50f0a1..00c3137af91 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
@@ -19,6 +19,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <limits.h>
 #include <netdb.h>
 #include <time.h>
 #include <unistd.h>
@@ -1136,7 +1137,7 @@ parse_comma_separated_list(char **startptr, bool *more)
 	char	   *p;
 	char	   *s = *startptr;
 	char	   *e;
-	int			len;
+	size_t		len;
 
 	/*
 	 * Search for the end of the current element; a comma or end-of-string
@@ -5745,7 +5746,21 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
 	/* concatenate values into a single string with newline terminators */
 	size = 1;					/* for the trailing null */
 	for (i = 0; values[i] != NULL; i++)
+	{
+		if (values[i]->bv_len >= INT_MAX ||
+			size > (INT_MAX - (values[i]->bv_len + 1)))
+		{
+			libpq_append_error(errorMessage,
+							   "connection info string size exceeds the maximum allowed (%d)",
+							   INT_MAX);
+			ldap_value_free_len(values);
+			ldap_unbind(ld);
+			return 3;
+		}
+
 		size += values[i]->bv_len + 1;
+	}
+
 	if ((result = malloc(size)) == NULL)
 	{
 		libpq_append_error(errorMessage, "out of memory");
@@ -7462,14 +7477,6 @@ PQdb(const PGconn *conn)
 	return conn->dbName;
 }
 
-char *
-PQservice(const PGconn *conn)
-{
-	if (!conn)
-		return NULL;
-	return conn->pgservice;
-}
-
 char *
 PQuser(const PGconn *conn)
 {
@@ -7537,10 +7544,12 @@ PQport(const PGconn *conn)
 	if (!conn)
 		return NULL;
 
-	if (conn->connhost != NULL)
+	if (conn->connhost != NULL &&
+		conn->connhost[conn->whichhost].port != NULL &&
+		conn->connhost[conn->whichhost].port[0] != '\0')
 		return conn->connhost[conn->whichhost].port;
 
-	return "";
+	return DEF_PGPORT_STR;
 }
 
 /*
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index c98ee5a9ad2..968e90c5ba3 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #endif
 
+#include "common/int.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "mb/pg_wchar.h"
@@ -508,7 +509,7 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 	}
 	else
 	{
-		attval->value = (char *) pqResultAlloc(res, len + 1, true);
+		attval->value = (char *) pqResultAlloc(res, (size_t) len + 1, true);
 		if (!attval->value)
 			goto fail;
 		attval->len = len;
@@ -600,8 +601,13 @@ pqResultAlloc(PGresult *res, size_t nBytes, bool isBinary)
 	 */
 	if (nBytes >= PGRESULT_SEP_ALLOC_THRESHOLD)
 	{
-		size_t		alloc_size = nBytes + PGRESULT_BLOCK_OVERHEAD;
+		size_t		alloc_size;
 
+		/* Don't wrap around with overly large requests. */
+		if (nBytes > SIZE_MAX - PGRESULT_BLOCK_OVERHEAD)
+			return NULL;
+
+		alloc_size = nBytes + PGRESULT_BLOCK_OVERHEAD;
 		block = (PGresult_data *) malloc(alloc_size);
 		if (!block)
 			return NULL;
@@ -1073,8 +1079,12 @@ pqSaveMessageField(PGresult *res, char code, const char *value)
 
 /*
  * pqSaveParameterStatus - remember parameter status sent by backend
+ *
+ * Returns 1 on success, 0 on out-of-memory.  (Note that on out-of-memory, we
+ * have already released the old value of the parameter, if any.  The only
+ * really safe way to recover is to terminate the connection.)
  */
-void
+int
 pqSaveParameterStatus(PGconn *conn, const char *name, const char *value)
 {
 	pgParameterStatus *pstatus;
@@ -1116,6 +1126,11 @@ pqSaveParameterStatus(PGconn *conn, const char *name, const char *value)
 		pstatus->next = conn->pstatus;
 		conn->pstatus = pstatus;
 	}
+	else
+	{
+		/* out of memory */
+		return 0;
+	}
 
 	/*
 	 * Save values of settings that are of interest to libpq in fields of the
@@ -1187,6 +1202,8 @@ pqSaveParameterStatus(PGconn *conn, const char *name, const char *value)
 	{
 		conn->scram_sha_256_iterations = atoi(value);
 	}
+
+	return 1;
 }
 
 
@@ -1260,7 +1277,7 @@ pqRowProcessor(PGconn *conn, const char **errmsgp)
 			bool		isbinary = (res->attDescs[i].format != 0);
 			char	   *val;
 
-			val = (char *) pqResultAlloc(res, clen + 1, isbinary);
+			val = (char *) pqResultAlloc(res, (size_t) clen + 1, isbinary);
 			if (val == NULL)
 				return 0;
 
@@ -2982,6 +2999,20 @@ PQfn(PGconn *conn,
 	 int result_is_int,
 	 const PQArgBlock *args,
 	 int nargs)
+{
+	return PQnfn(conn, fnid, result_buf, -1, result_len,
+				 result_is_int, args, nargs);
+}
+
+/*
+ * PQnfn
+ *		Private version of PQfn() with verification that returned data fits in
+ *		result_buf when result_is_int == 0.  Setting buf_size to -1 disables
+ *		this verification.
+ */
+PGresult *
+PQnfn(PGconn *conn, int fnid, int *result_buf, int buf_size, int *result_len,
+	  int result_is_int, const PQArgBlock *args, int nargs)
 {
 	*result_len = 0;
 
@@ -3010,7 +3041,7 @@ PQfn(PGconn *conn,
 	}
 
 	return pqFunctionCall3(conn, fnid,
-						   result_buf, result_len,
+						   result_buf, buf_size, result_len,
 						   result_is_int,
 						   args, nargs);
 }
@@ -4213,8 +4244,8 @@ PQescapeInternal(PGconn *conn, const char *str, size_t len, bool as_ident)
 	const char *s;
 	char	   *result;
 	char	   *rp;
-	int			num_quotes = 0; /* single or double, depending on as_ident */
-	int			num_backslashes = 0;
+	size_t		num_quotes = 0; /* single or double, depending on as_ident */
+	size_t		num_backslashes = 0;
 	size_t		input_len = strnlen(str, len);
 	size_t		result_size;
 	char		quote_char = as_ident ? '"' : '\'';
@@ -4280,10 +4311,21 @@ PQescapeInternal(PGconn *conn, const char *str, size_t len, bool as_ident)
 		}
 	}
 
-	/* Allocate output buffer. */
-	result_size = input_len + num_quotes + 3;	/* two quotes, plus a NUL */
+	/*
+	 * Allocate output buffer. Protect against overflow, in case the caller
+	 * has allocated a large fraction of the available size_t.
+	 */
+	if (pg_add_size_overflow(input_len, num_quotes, &result_size) ||
+		pg_add_size_overflow(result_size, 3, &result_size)) /* two quotes plus a NUL */
+		goto overflow;
+
 	if (!as_ident && num_backslashes > 0)
-		result_size += num_backslashes + 2;
+	{
+		if (pg_add_size_overflow(result_size, num_backslashes, &result_size) ||
+			pg_add_size_overflow(result_size, 2, &result_size)) /* for " E" prefix */
+			goto overflow;
+	}
+
 	result = rp = (char *) malloc(result_size);
 	if (rp == NULL)
 	{
@@ -4356,6 +4398,12 @@ PQescapeInternal(PGconn *conn, const char *str, size_t len, bool as_ident)
 	*rp = '\0';
 
 	return result;
+
+overflow:
+	libpq_append_conn_error(conn,
+							"escaped string size exceeds the maximum allowed (%zu)",
+							SIZE_MAX);
+	return NULL;
 }
 
 char *
@@ -4421,16 +4469,25 @@ PQescapeByteaInternal(PGconn *conn,
 	unsigned char *result;
 	size_t		i;
 	size_t		len;
-	size_t		bslash_len = (std_strings ? 1 : 2);
+	const size_t bslash_len = (std_strings ? 1 : 2);
 
 	/*
-	 * empty string has 1 char ('\0')
+	 * Calculate the escaped length, watching for overflow as we do with
+	 * PQescapeInternal(). The following code relies on a small constant
+	 * bslash_len so that small additions and multiplications don't need their
+	 * own overflow checks.
+	 *
+	 * Start with the empty string, which has 1 char ('\0').
 	 */
 	len = 1;
 
 	if (use_hex)
 	{
-		len += bslash_len + 1 + 2 * from_length;
+		/* We prepend "\x" and double each input character. */
+		if (pg_add_size_overflow(len, bslash_len + 1, &len) ||
+			pg_add_size_overflow(len, from_length, &len) ||
+			pg_add_size_overflow(len, from_length, &len))
+			goto overflow;
 	}
 	else
 	{
@@ -4438,13 +4495,25 @@ PQescapeByteaInternal(PGconn *conn,
 		for (i = from_length; i > 0; i--, vp++)
 		{
 			if (*vp < 0x20 || *vp > 0x7e)
-				len += bslash_len + 3;
+			{
+				if (pg_add_size_overflow(len, bslash_len + 3, &len))	/* octal "\ooo" */
+					goto overflow;
+			}
 			else if (*vp == '\'')
-				len += 2;
+			{
+				if (pg_add_size_overflow(len, 2, &len)) /* double each quote */
+					goto overflow;
+			}
 			else if (*vp == '\\')
-				len += bslash_len + bslash_len;
+			{
+				if (pg_add_size_overflow(len, bslash_len * 2, &len))	/* double each backslash */
+					goto overflow;
+			}
 			else
-				len++;
+			{
+				if (pg_add_size_overflow(len, 1, &len))
+					goto overflow;
+			}
 		}
 	}
 
@@ -4505,6 +4574,13 @@ PQescapeByteaInternal(PGconn *conn,
 	*rp = '\0';
 
 	return result;
+
+overflow:
+	if (conn)
+		libpq_append_conn_error(conn,
+								"escaped bytea size exceeds the maximum allowed (%zu)",
+								SIZE_MAX);
+	return NULL;
 }
 
 unsigned char *
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index a6de13447a6..377f8270a4e 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -271,8 +271,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	argv[1].len = 4;
 	argv[1].u.integer = (int) len;
 
-	res = PQfn(conn, conn->lobjfuncs->fn_lo_read,
-			   (void *) buf, &result_len, 0, argv, 2);
+	res = PQnfn(conn, conn->lobjfuncs->fn_lo_read,
+				(void *) buf, len, &result_len, 0, argv, 2);
 	if (PQresultStatus(res) == PGRES_COMMAND_OK)
 	{
 		PQclear(res);
@@ -412,8 +412,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	argv[2].len = 4;
 	argv[2].u.integer = whence;
 
-	res = PQfn(conn, conn->lobjfuncs->fn_lo_lseek64,
-			   (void *) &retval, &result_len, 0, argv, 3);
+	res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64,
+				(void *) &retval, sizeof(retval), &result_len, 0, argv, 3);
 	if (PQresultStatus(res) == PGRES_COMMAND_OK && result_len == 8)
 	{
 		PQclear(res);
@@ -566,8 +566,8 @@ lo_tell64(PGconn *conn, int fd)
 	argv[0].len = 4;
 	argv[0].u.integer = fd;
 
-	res = PQfn(conn, conn->lobjfuncs->fn_lo_tell64,
-			   (void *) &retval, &result_len, 0, argv, 1);
+	res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64,
+				(void *) &retval, sizeof(retval), &result_len, 0, argv, 1);
 	if (PQresultStatus(res) == PGRES_COMMAND_OK && result_len == 8)
 	{
 		PQclear(res);
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 0c9801fa0ac..107c1eec69d 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -33,6 +33,7 @@
 #endif
 #endif
 
+#include "common/int.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
 
@@ -104,6 +105,16 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
 		}			screen_size;
 #endif
 
+		/*
+		 * Quick sanity check on po->fieldSep, since we make heavy use of int
+		 * math throughout.
+		 */
+		if (fs_len < strlen(po->fieldSep))
+		{
+			fprintf(stderr, libpq_gettext("overlong field separator\n"));
+			goto exit;
+		}
+
 		nTups = PQntuples(res);
 		fieldNames = (const char **) calloc(nFields, sizeof(char *));
 		fieldNotNum = (unsigned char *) calloc(nFields, 1);
@@ -391,7 +402,7 @@ do_field(const PQprintOpt *po, const PGresult *res,
 		{
 			if (plen > fieldMax[j])
 				fieldMax[j] = plen;
-			if (!(fields[i * nFields + j] = (char *) malloc(plen + 1)))
+			if (!(fields[i * nFields + j] = (char *) malloc((size_t) plen + 1)))
 			{
 				fprintf(stderr, libpq_gettext("out of memory\n"));
 				return false;
@@ -453,15 +464,31 @@ do_header(FILE *fout, const PQprintOpt *po, const int nFields, int *fieldMax,
 		fputs("<tr>", fout);
 	else
 	{
-		int			tot = 0;
+		size_t		tot = 0;
 		int			n = 0;
 		char	   *p = NULL;
 
+		/* Calculate the border size, checking for overflow. */
 		for (; n < nFields; n++)
-			tot += fieldMax[n] + fs_len + (po->standard ? 2 : 0);
+		{
+			/* Field plus separator, plus 2 extra '-' in standard format. */
+			if (pg_add_size_overflow(tot, fieldMax[n], &tot) ||
+				pg_add_size_overflow(tot, fs_len, &tot) ||
+				(po->standard && pg_add_size_overflow(tot, 2, &tot)))
+				goto overflow;
+		}
 		if (po->standard)
-			tot += fs_len * 2 + 2;
-		border = malloc(tot + 1);
+		{
+			/* An extra separator at the front and back. */
+			if (pg_add_size_overflow(tot, fs_len, &tot) ||
+				pg_add_size_overflow(tot, fs_len, &tot) ||
+				pg_add_size_overflow(tot, 2, &tot))
+				goto overflow;
+		}
+		if (pg_add_size_overflow(tot, 1, &tot)) /* terminator */
+			goto overflow;
+
+		border = malloc(tot);
 		if (!border)
 		{
 			fprintf(stderr, libpq_gettext("out of memory\n"));
@@ -524,6 +551,10 @@ do_header(FILE *fout, const PQprintOpt *po, const int nFields, int *fieldMax,
 	else
 		fprintf(fout, "\n%s\n", border);
 	return border;
+
+overflow:
+	fprintf(stderr, libpq_gettext("header size exceeds the maximum allowed\n"));
+	return NULL;
 }
 
 
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index aec60dd89b0..45b80455b0f 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -16,6 +16,7 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #ifdef WIN32
 #include "win32.h"
@@ -24,6 +25,7 @@
 #include <netinet/tcp.h>
 #endif
 
+#include "common/int.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "mb/pg_wchar.h"
@@ -43,6 +45,7 @@
 	 (id) == PqMsg_RowDescription)
 
 
+static void handleFatalError(PGconn *conn);
 static void handleSyncLoss(PGconn *conn, char id, int msgLength);
 static int	getRowDescriptions(PGconn *conn, int msgLength);
 static int	getParamDescriptions(PGconn *conn, int msgLength);
@@ -54,8 +57,8 @@ static int	getCopyStart(PGconn *conn, ExecStatusType copytype);
 static int	getReadyForQuery(PGconn *conn);
 static void reportErrorPosition(PQExpBuffer msg, const char *query,
 								int loc, int encoding);
-static int	build_startup_packet(const PGconn *conn, char *packet,
-								 const PQEnvironmentOption *options);
+static size_t build_startup_packet(const PGconn *conn, char *packet,
+								   const PQEnvironmentOption *options);
 
 
 /*
@@ -120,12 +123,12 @@ pqParseInput3(PGconn *conn)
 									 conn))
 			{
 				/*
-				 * XXX add some better recovery code... plan is to skip over
-				 * the message using its length, then report an error. For the
-				 * moment, just treat this like loss of sync (which indeed it
-				 * might be!)
+				 * Abandon the connection.  There's not much else we can
+				 * safely do; we can't just ignore the message or we could
+				 * miss important changes to the connection state.
+				 * pqCheckInBufferSpace() already reported the error.
 				 */
-				handleSyncLoss(conn, id, msgLength);
+				handleFatalError(conn);
 			}
 			return;
 		}
@@ -456,6 +459,11 @@ pqParseInput3(PGconn *conn)
 			/* Normal case: parsing agrees with specified length */
 			pqParseDone(conn, conn->inCursor);
 		}
+		else if (conn->error_result && conn->status == CONNECTION_BAD)
+		{
+			/* The connection was abandoned and we already reported it */
+			return;
+		}
 		else
 		{
 			/* Trouble --- report it */
@@ -470,15 +478,14 @@ pqParseInput3(PGconn *conn)
 }
 
 /*
- * handleSyncLoss: clean up after loss of message-boundary sync
+ * handleFatalError: clean up after a nonrecoverable error
  *
- * There isn't really a lot we can do here except abandon the connection.
+ * This is for errors where we need to abandon the connection.  The caller has
+ * already saved the error message in conn->errorMessage.
  */
 static void
-handleSyncLoss(PGconn *conn, char id, int msgLength)
+handleFatalError(PGconn *conn)
 {
-	libpq_append_conn_error(conn, "lost synchronization with server: got message type \"%c\", length %d",
-					  id, msgLength);
 	/* build an error result holding the error message */
 	pqSaveErrorResult(conn);
 	conn->asyncStatus = PGASYNC_READY;	/* drop out of PQgetResult wait loop */
@@ -487,6 +494,19 @@ handleSyncLoss(PGconn *conn, char id, int msgLength)
 	conn->status = CONNECTION_BAD;	/* No more connection to backend */
 }
 
+/*
+ * handleSyncLoss: clean up after loss of message-boundary sync
+ *
+ * There isn't really a lot we can do here except abandon the connection.
+ */
+static void
+handleSyncLoss(PGconn *conn, char id, int msgLength)
+{
+	libpq_append_conn_error(conn, "lost synchronization with server: got message type \"%c\", length %d",
+							id, msgLength);
+	handleFatalError(conn);
+}
+
 /*
  * parseInput subroutine to read a 'T' (row descriptions) message.
  * We'll build a new PGresult structure (unless called for a Describe
@@ -1216,8 +1236,21 @@ reportErrorPosition(PQExpBuffer msg, const char *query, int loc, int encoding)
 	 * scridx[] respectively.
 	 */
 
-	/* we need a safe allocation size... */
+	/*
+	 * We need a safe allocation size.
+	 *
+	 * The only caller of reportErrorPosition() is pqBuildErrorMessage3(); it
+	 * gets its query from either a PQresultErrorField() or a PGcmdQueueEntry,
+	 * both of which must have fit into conn->inBuffer/outBuffer. So slen fits
+	 * inside an int, but we can't assume that (slen * sizeof(int)) fits
+	 * inside a size_t.
+	 */
 	slen = strlen(wquery) + 1;
+	if (slen > SIZE_MAX / sizeof(int))
+	{
+		free(wquery);
+		return;
+	}
 
 	qidx = (int *) malloc(slen * sizeof(int));
 	if (qidx == NULL)
@@ -1519,7 +1552,11 @@ getParameterStatus(PGconn *conn)
 		return EOF;
 	}
 	/* And save it */
-	pqSaveParameterStatus(conn, conn->workBuffer.data, valueBuf.data);
+	if (!pqSaveParameterStatus(conn, conn->workBuffer.data, valueBuf.data))
+	{
+		libpq_append_conn_error(conn, "out of memory");
+		handleFatalError(conn);
+	}
 	termPQExpBuffer(&valueBuf);
 	return 0;
 }
@@ -1547,12 +1584,33 @@ getBackendKeyData(PGconn *conn, int msgLength)
 
 	cancel_key_len = 5 + msgLength - (conn->inCursor - conn->inStart);
 
+	if (cancel_key_len != 4 && conn->pversion == PG_PROTOCOL(3, 0))
+	{
+		libpq_append_conn_error(conn, "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)", cancel_key_len);
+		handleFatalError(conn);
+		return 0;
+	}
+
+	if (cancel_key_len < 4)
+	{
+		libpq_append_conn_error(conn, "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)", cancel_key_len);
+		handleFatalError(conn);
+		return 0;
+	}
+
+	if (cancel_key_len > 256)
+	{
+		libpq_append_conn_error(conn, "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)", cancel_key_len);
+		handleFatalError(conn);
+		return 0;
+	}
+
 	conn->be_cancel_key = malloc(cancel_key_len);
 	if (conn->be_cancel_key == NULL)
 	{
 		libpq_append_conn_error(conn, "out of memory");
-		/* discard the message */
-		return EOF;
+		handleFatalError(conn);
+		return 0;
 	}
 	if (pqGetnchar(conn->be_cancel_key, cancel_key_len, conn))
 	{
@@ -1589,7 +1647,17 @@ getNotify(PGconn *conn)
 	/* must save name while getting extra string */
 	svname = strdup(conn->workBuffer.data);
 	if (!svname)
-		return EOF;
+	{
+		/*
+		 * Notify messages can arrive at any state, so we cannot associate the
+		 * error with any particular query.  There's no way to return back an
+		 * "async error", so the best we can do is drop the connection.  That
+		 * seems better than silently ignoring the notification.
+		 */
+		libpq_append_conn_error(conn, "out of memory");
+		handleFatalError(conn);
+		return 0;
+	}
 	if (pqGets(&conn->workBuffer, conn))
 	{
 		free(svname);
@@ -1604,21 +1672,26 @@ getNotify(PGconn *conn)
 	nmlen = strlen(svname);
 	extralen = strlen(conn->workBuffer.data);
 	newNotify = (PGnotify *) malloc(sizeof(PGnotify) + nmlen + extralen + 2);
-	if (newNotify)
-	{
-		newNotify->relname = (char *) newNotify + sizeof(PGnotify);
-		strcpy(newNotify->relname, svname);
-		newNotify->extra = newNotify->relname + nmlen + 1;
-		strcpy(newNotify->extra, conn->workBuffer.data);
-		newNotify->be_pid = be_pid;
-		newNotify->next = NULL;
-		if (conn->notifyTail)
-			conn->notifyTail->next = newNotify;
-		else
-			conn->notifyHead = newNotify;
-		conn->notifyTail = newNotify;
+	if (!newNotify)
+	{
+		free(svname);
+		libpq_append_conn_error(conn, "out of memory");
+		handleFatalError(conn);
+		return 0;
 	}
 
+	newNotify->relname = (char *) newNotify + sizeof(PGnotify);
+	strcpy(newNotify->relname, svname);
+	newNotify->extra = newNotify->relname + nmlen + 1;
+	strcpy(newNotify->extra, conn->workBuffer.data);
+	newNotify->be_pid = be_pid;
+	newNotify->next = NULL;
+	if (conn->notifyTail)
+		conn->notifyTail->next = newNotify;
+	else
+		conn->notifyHead = newNotify;
+	conn->notifyTail = newNotify;
+
 	free(svname);
 	return 0;
 }
@@ -1752,12 +1825,12 @@ getCopyDataMessage(PGconn *conn)
 									 conn))
 			{
 				/*
-				 * XXX add some better recovery code... plan is to skip over
-				 * the message using its length, then report an error. For the
-				 * moment, just treat this like loss of sync (which indeed it
-				 * might be!)
+				 * Abandon the connection.  There's not much else we can
+				 * safely do; we can't just ignore the message or we could
+				 * miss important changes to the connection state.
+				 * pqCheckInBufferSpace() already reported the error.
 				 */
-				handleSyncLoss(conn, id, msgLength);
+				handleFatalError(conn);
 				return -2;
 			}
 			return 0;
@@ -2082,7 +2155,7 @@ pqEndcopy3(PGconn *conn)
  */
 PGresult *
 pqFunctionCall3(PGconn *conn, Oid fnid,
-				int *result_buf, int *actual_result_len,
+				int *result_buf, int buf_size, int *actual_result_len,
 				int result_is_int,
 				const PQArgBlock *args, int nargs)
 {
@@ -2186,12 +2259,12 @@ pqFunctionCall3(PGconn *conn, Oid fnid,
 									 conn))
 			{
 				/*
-				 * XXX add some better recovery code... plan is to skip over
-				 * the message using its length, then report an error. For the
-				 * moment, just treat this like loss of sync (which indeed it
-				 * might be!)
+				 * Abandon the connection.  There's not much else we can
+				 * safely do; we can't just ignore the message or we could
+				 * miss important changes to the connection state.
+				 * pqCheckInBufferSpace() already reported the error.
 				 */
-				handleSyncLoss(conn, id, msgLength);
+				handleFatalError(conn);
 				break;
 			}
 			continue;
@@ -2216,6 +2289,17 @@ pqFunctionCall3(PGconn *conn, Oid fnid,
 					}
 					else
 					{
+						/*
+						 * If the server returned too much data for the
+						 * buffer, something fishy is going on.  Abandon ship.
+						 */
+						if (buf_size != -1 && *actual_result_len > buf_size)
+						{
+							libpq_append_conn_error(conn, "server returned too much data");
+							handleFatalError(conn);
+							return pqPrepareAsyncResult(conn);
+						}
+
 						if (pqGetnchar(result_buf,
 									   *actual_result_len,
 									   conn))
@@ -2315,12 +2399,20 @@ pqBuildStartupPacket3(PGconn *conn, int *packetlen,
 					  const PQEnvironmentOption *options)
 {
 	char	   *startpacket;
+	size_t		len;
+
+	len = build_startup_packet(conn, NULL, options);
+	if (len == 0 || len > INT_MAX)
+		return NULL;
 
-	*packetlen = build_startup_packet(conn, NULL, options);
+	*packetlen = len;
 	startpacket = (char *) malloc(*packetlen);
 	if (!startpacket)
 		return NULL;
-	*packetlen = build_startup_packet(conn, startpacket, options);
+
+	len = build_startup_packet(conn, startpacket, options);
+	Assert(*packetlen == len);
+
 	return startpacket;
 }
 
@@ -2331,13 +2423,13 @@ pqBuildStartupPacket3(PGconn *conn, int *packetlen,
  * To avoid duplicate logic, this routine is called twice: the first time
  * (with packet == NULL) just counts the space needed, the second time
  * (with packet == allocated space) fills it in.  Return value is the number
- * of bytes used.
+ * of bytes used, or zero in the unlikely event of size_t overflow.
  */
-static int
+static size_t
 build_startup_packet(const PGconn *conn, char *packet,
 					 const PQEnvironmentOption *options)
 {
-	int			packet_len = 0;
+	size_t		packet_len = 0;
 	const PQEnvironmentOption *next_eo;
 	const char *val;
 
@@ -2356,10 +2448,12 @@ build_startup_packet(const PGconn *conn, char *packet,
 	do { \
 		if (packet) \
 			strcpy(packet + packet_len, optname); \
-		packet_len += strlen(optname) + 1; \
+		if (pg_add_size_overflow(packet_len, strlen(optname) + 1, &packet_len)) \
+			return 0; \
 		if (packet) \
 			strcpy(packet + packet_len, optval); \
-		packet_len += strlen(optval) + 1; \
+		if (pg_add_size_overflow(packet_len, strlen(optval) + 1, &packet_len)) \
+			return 0; \
 	} while(0)
 
 	if (conn->pguser && conn->pguser[0])
@@ -2394,7 +2488,8 @@ build_startup_packet(const PGconn *conn, char *packet,
 	/* Add trailing terminator */
 	if (packet)
 		packet[packet_len] = '\0';
-	packet_len++;
+	if (pg_add_size_overflow(packet_len, 1, &packet_len))
+		return 0;
 
 	return packet_len;
 }
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index d6f4527e2bf..d583514c0c4 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -121,7 +121,7 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len)
 	{
 		appendPQExpBufferStr(&conn->errorMessage,
 							 "GSSAPI caller failed to retransmit all data needing to be retried\n");
-		errno = EINVAL;
+		SOCK_ERRNO_SET(EINVAL);
 		return -1;
 	}
 
@@ -199,14 +199,14 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len)
 		if (major != GSS_S_COMPLETE)
 		{
 			pg_GSS_error(libpq_gettext("GSSAPI wrap error"), conn, major, minor);
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			goto cleanup;
 		}
 
 		if (conf_state == 0)
 		{
 			libpq_append_conn_error(conn, "outgoing GSSAPI message would not use confidentiality");
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			goto cleanup;
 		}
 
@@ -215,7 +215,7 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len)
 			libpq_append_conn_error(conn, "client tried to send oversize GSSAPI packet (%zu > %zu)",
 									(size_t) output.length,
 									PQ_GSS_MAX_PACKET_SIZE - sizeof(uint32));
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			goto cleanup;
 		}
 
@@ -341,7 +341,7 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 			/* If we still haven't got the length, return to the caller */
 			if (PqGSSRecvLength < sizeof(uint32))
 			{
-				errno = EWOULDBLOCK;
+				SOCK_ERRNO_SET(EWOULDBLOCK);
 				return -1;
 			}
 		}
@@ -354,7 +354,7 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 			libpq_append_conn_error(conn, "oversize GSSAPI packet sent by the server (%zu > %zu)",
 									(size_t) input.length,
 									PQ_GSS_MAX_PACKET_SIZE - sizeof(uint32));
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			return -1;
 		}
 
@@ -373,7 +373,7 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 		/* If we don't yet have the whole packet, return to the caller */
 		if (PqGSSRecvLength - sizeof(uint32) < input.length)
 		{
-			errno = EWOULDBLOCK;
+			SOCK_ERRNO_SET(EWOULDBLOCK);
 			return -1;
 		}
 
@@ -393,7 +393,7 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 			pg_GSS_error(libpq_gettext("GSSAPI unwrap error"), conn,
 						 major, minor);
 			ret = -1;
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			goto cleanup;
 		}
 
@@ -401,7 +401,7 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 		{
 			libpq_append_conn_error(conn, "incoming GSSAPI message did not use confidentiality");
 			ret = -1;
-			errno = EIO;		/* for lack of a better idea */
+			SOCK_ERRNO_SET(EIO);	/* for lack of a better idea */
 			goto cleanup;
 		}
 
@@ -437,7 +437,8 @@ gss_read(PGconn *conn, void *recv_buffer, size_t length, ssize_t *ret)
 	*ret = pqsecure_raw_read(conn, recv_buffer, length);
 	if (*ret < 0)
 	{
-		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+		if (SOCK_ERRNO == EAGAIN || SOCK_ERRNO == EWOULDBLOCK ||
+			SOCK_ERRNO == EINTR)
 			return PGRES_POLLING_READING;
 		else
 			return PGRES_POLLING_FAILED;
@@ -457,7 +458,8 @@ gss_read(PGconn *conn, void *recv_buffer, size_t length, ssize_t *ret)
 		*ret = pqsecure_raw_read(conn, recv_buffer, length);
 		if (*ret < 0)
 		{
-			if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+			if (SOCK_ERRNO == EAGAIN || SOCK_ERRNO == EWOULDBLOCK ||
+				SOCK_ERRNO == EINTR)
 				return PGRES_POLLING_READING;
 			else
 				return PGRES_POLLING_FAILED;
@@ -520,7 +522,8 @@ pqsecure_open_gss(PGconn *conn)
 		ret = pqsecure_raw_write(conn, PqGSSSendBuffer + PqGSSSendNext, amount);
 		if (ret < 0)
 		{
-			if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+			if (SOCK_ERRNO == EAGAIN || SOCK_ERRNO == EWOULDBLOCK ||
+				SOCK_ERRNO == EINTR)
 				return PGRES_POLLING_WRITING;
 			else
 				return PGRES_POLLING_FAILED;
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 2e22fe8dece..e60661ef4ef 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -693,34 +693,35 @@ static unsigned char alpn_protos[] = PG_ALPN_PROTOCOL_VECTOR;
  * purposes.  The file will be written using the NSS keylog format.  LibreSSL
  * 3.5 introduced stub function to set the callback for OpenSSL compatibility
  * but the callback is never invoked.
+ *
+ * Error messages added to the connection object won't be printed anywhere if
+ * the connection is successful.  Errors in processing keylogging are printed
+ * to stderr to overcome this.
  */
 static void
 SSL_CTX_keylog_cb(const SSL *ssl, const char *line)
 {
 	int			fd;
-	mode_t		old_umask;
 	ssize_t		rc;
 	PGconn	   *conn = SSL_get_app_data(ssl);
 
 	if (conn == NULL)
 		return;
 
-	old_umask = umask(077);
 	fd = open(conn->sslkeylogfile, O_WRONLY | O_APPEND | O_CREAT, 0600);
-	umask(old_umask);
 
 	if (fd == -1)
 	{
-		libpq_append_conn_error(conn, "could not open SSL key logging file \"%s\": %s",
-								conn->sslkeylogfile, pg_strerror(errno));
+		fprintf(stderr, libpq_gettext("WARNING: could not open SSL key logging file \"%s\": %m\n"),
+				conn->sslkeylogfile);
 		return;
 	}
 
 	/* line is guaranteed by OpenSSL to be NUL terminated */
 	rc = write(fd, line, strlen(line));
 	if (rc < 0)
-		libpq_append_conn_error(conn, "could not write to SSL key logging file \"%s\": %s",
-								conn->sslkeylogfile, pg_strerror(errno));
+		fprintf(stderr, libpq_gettext("WARNING: could not write to SSL key logging file \"%s\": %m\n"),
+				conn->sslkeylogfile);
 	else
 		rc = write(fd, "\n", 1);
 	(void) rc;					/* silence compiler warnings */
@@ -1044,6 +1045,10 @@ initialize_SSL(PGconn *conn)
 	}
 	conn->ssl_in_use = true;
 
+	/*
+	 * If SSL key logging is requested, set up the callback if a compatible
+	 * version of OpenSSL is used and libpq was compiled to support it.
+	 */
 	if (conn->sslkeylogfile && strlen(conn->sslkeylogfile) > 0)
 	{
 #ifdef HAVE_SSL_CTX_SET_KEYLOG_CALLBACK
@@ -1057,7 +1062,6 @@ initialize_SSL(PGconn *conn)
 #endif
 	}
 
-
 	/*
 	 * 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
diff --git a/src/interfaces/libpq/fe-trace.c b/src/interfaces/libpq/fe-trace.c
index a45f0d85587..fae5b47e551 100644
--- a/src/interfaces/libpq/fe-trace.c
+++ b/src/interfaces/libpq/fe-trace.c
@@ -113,7 +113,7 @@ pqTraceOutputByte1(FILE *pfdebug, const char *data, int *cursor)
 	 * that completes ErrorResponse and NoticeResponse messages.
 	 */
 	if (!isprint((unsigned char) *v))
-		fprintf(pfdebug, " \\x%02x", *v);
+		fprintf(pfdebug, " \\x%02x", (unsigned char) *v);
 	else
 		fprintf(pfdebug, " %c", *v);
 	*cursor += 1;
@@ -212,7 +212,7 @@ pqTraceOutputNchar(FILE *pfdebug, int len, const char *data, int *cursor, bool s
 		else
 		{
 			fwrite(v + next, 1, i - next, pfdebug);
-			fprintf(pfdebug, "\\x%02x", v[i]);
+			fprintf(pfdebug, "\\x%02x", (unsigned char) v[i]);
 			next = i + 1;
 		}
 	}
diff --git a/src/interfaces/libpq/ivy-exec.c b/src/interfaces/libpq/ivy-exec.c
index 1fb733ee95e..03e591a642f 100644
--- a/src/interfaces/libpq/ivy-exec.c
+++ b/src/interfaces/libpq/ivy-exec.c
@@ -4,7 +4,7 @@
  *
  * like fe-exec.c but contains ivy functions.         
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivy-exec.c
  *
@@ -75,10 +75,15 @@ static int IvyhandleParamsValues(IvyPreparedStatement *stmtHandle,
 static int Ivyreplacenamebindtoposition(Ivyconn *tconn,
 						IvyPreparedStatement *stmtHandle,
 						char *errmsg,
-						size_t size_error_buf);
+						size_t size_error_buf,
+						bool *iscallinto);
 static int Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 						IvyPreparedStatement *stmtHandle,
 						IvyError *errhp);
+static int Ivyreplacenamebindtoposition3(Ivyconn *tconn,
+						IvyPreparedStatement *stmtHandle,
+						IvyError *errhp,
+						HostVariable *host);
 static int IvybindOutParameterByPosInternel(IvyPreparedStatement *stmthandle,
 						IvyBindOutInfo **bindinfo,
 						int	position,
@@ -158,6 +163,82 @@ Ivyconnectdb(const char *conninfo)
 	return ivyconn;
 }
 
+/*
+ * A variant of Ivyconnectdb.
+ * this function constructs an Ivyconn using the PGconn structure.
+ */
+Ivyconn *
+Ivyconnectdb2(PGconn *conn)
+{
+	Ivyconn	*ivyconn = NULL;
+
+	ivyconn = (Ivyconn *) malloc(sizeof(Ivyconn));
+	if (ivyconn == NULL)
+		return NULL;
+
+	/* init self_lock */
+	if (PGSemaphoreCreate(&ivyconn->self_lock) == 0)
+	{
+		free(ivyconn);
+		return NULL;
+	}
+
+	/* init sock */
+	if (PGSemaphoreCreate(&ivyconn->lock) == 0)
+	{
+		ReleaseSemaphores(&ivyconn->self_lock);
+		free(ivyconn);
+		return NULL;
+	}
+
+	if (conn == NULL)
+	{
+		ReleaseSemaphores(&ivyconn->self_lock);
+		ReleaseSemaphores(&ivyconn->lock);
+		free(ivyconn);
+		return NULL;
+	}
+
+	ivyconn->conn = conn;
+	ivyconn->IvystmtHandleList = NULL;
+	return ivyconn;
+}
+
+/*
+ * like Ivyfinish, but we don't close the connection of tconn->conn.
+ */
+void
+Ivyfinish2(Ivyconn *tconn)
+{
+	if (tconn == NULL || tconn->conn == NULL)
+		return;
+
+	/* add lock */
+	PGSemaphoreLock(&tconn->self_lock);
+	if (tconn->conn == NULL)
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		return;
+	}
+
+	tconn->conn = NULL;
+	PGSemaphoreUnlock(&tconn->self_lock);
+	ReleaseSemaphores(&tconn->self_lock);
+
+	/* remove handle about its stmthandle */
+	PGSemaphoreLock(&tconn->lock);
+	IvyremoveConnRelation(tconn);
+
+	/*free stmt list */
+	Ivyfreelist(tconn->IvystmtHandleList);
+	PGSemaphoreUnlock(&tconn->lock);
+	ReleaseSemaphores(&tconn->lock);
+
+	free(tconn);
+	tconn = NULL;
+	return;
+}
+
 /*
  *
  * like jdbc, create a statementhandle
@@ -250,6 +331,11 @@ IvyexecPreparedStatement(Ivyconn *tconn,
 	PGconn *conn = NULL;
 	PGresult *presult = NULL;
 	bool	sendPrepare = true;
+	bool	iscallinto = false;
+	char	**paramValues_p = (char **) paramValues;
+	int		*paramLengths_p = (int *) paramLengths;
+	int		*paramFormats_p = (int *) paramFormats;
+	Ivyargmode	*argmodes_p = (Ivyargmode *) argmodes;
 
 	if (tconn == NULL || tconn->conn == NULL ||
 		stmtHandle == NULL || stmtHandle->query == NULL)
@@ -287,21 +373,55 @@ IvyexecPreparedStatement(Ivyconn *tconn,
 	/* The placeholder varable is binded by name, change it to be by position */
 	if (stmtHandle->namebind != NULL &&
 		stmtHandle->name_replace == 0 &&
-		!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf))
+		!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf, &iscallinto))
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
 		free(tresult);
 		return NULL;
 	}
 	else if (stmtHandle->stmttype == IVY_STMT_UNKNOW &&
-			!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf))
+			!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf, &iscallinto))
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
 		free(tresult);
 		return NULL;
 	}
 
-	if (stmtHandle->stmttype == IVY_STMT_DO &&
+	/*
+	 * Adjust the position of array elements for CALL INTO stmt.
+	 */
+	if (stmtHandle->stmttype == IVY_STMT_DOFROMCALL && iscallinto && stmtHandle->nParams > 1)
+	{
+		char	*paramValues_tmp = NULL;
+		int		paramLengths_tmp, paramFormats_tmp;
+		int		i;
+		Ivyargmode	argmodes_tmp;
+		Oid		paramTypes_tmp;
+
+		paramValues_tmp = paramValues_p[nParams - 1];
+		paramLengths_tmp = paramLengths_p[nParams - 1];
+		paramFormats_tmp = paramFormats_p[nParams - 1];
+		argmodes_tmp = argmodes_p[nParams - 1];
+		paramTypes_tmp = stmtHandle->paramTypes[nParams - 1];
+
+		for (i = nParams -1; i >= 1; i--)
+		{
+			paramValues_p[i] = paramValues_p[i - 1];
+			paramLengths_p[i] = paramLengths_p[i - 1];
+			paramFormats_p[i] = paramFormats_p[i - 1];
+			argmodes_p[i] = argmodes_p[i - 1];
+			stmtHandle->paramTypes[i] = stmtHandle->paramTypes[i - 1];
+		}
+
+		paramValues_p[0] = paramValues_tmp;
+		paramLengths_p[0] = paramLengths_tmp;
+		paramFormats_p[0] = paramFormats_tmp;
+		argmodes_p[0] = argmodes_tmp;
+		stmtHandle->paramTypes[0] = paramTypes_tmp;
+	}
+
+	if ((stmtHandle->stmttype == IVY_STMT_DO ||
+		 stmtHandle->stmttype == IVY_STMT_DOFROMCALL) &&
 		!IvyHandleDostmt(tconn, stmtHandle, false, errmsg, size_error_buf))
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
@@ -445,6 +565,11 @@ IvyexecPreparedStatement2(Ivyconn *tconn,
 	PGconn *conn = NULL;
 	PGresult *presult = NULL;
 	bool	sendPrepare = true;
+	bool	iscallinto = false;
+	char	**paramValues_p = (char **) paramValues;
+	int		*paramLengths_p = (int *) paramLengths;
+	int		*paramFormats_p = (int *) paramFormats;
+	Ivyargmode	*argmodes_p = (Ivyargmode *) argmodes;
 
 	if (tconn == NULL || tconn->conn == NULL ||
 		stmtHandle == NULL || stmtHandle->query == NULL)
@@ -485,24 +610,97 @@ IvyexecPreparedStatement2(Ivyconn *tconn,
 		return NULL;
 	}
 
+	/*
+	 * This routine does not support anonymous blocks, which may be a flaw.
+	 * Unfortunately I want this routine to support CALL INTO statement.
+	 * CALL INTO is converted into an anonymous block at the interface layer
+	 * for execution.
+	 */
+	if (stmtHandle->outbind == NULL && bindinfos != NULL)
+	{
+		IvyBindOutInfo *ptr = bindinfos;
+		IvyBindOutInfo *dumpbindinfo = NULL;
+		IvyBindOutInfo *preinfo = NULL;
+
+		while (ptr != NULL)
+		{
+			IvyBindOutInfo *tmp;
+			tmp = (IvyBindOutInfo *) malloc(sizeof(IvyBindOutInfo));
+			if (tmp == NULL)
+			{
+				PGSemaphoreUnlock(&stmtHandle->lock);
+				snprintf(errmsg, size_error_buf, "%s", "malloc failed");
+				free(tresult);
+				return NULL;
+			}
+
+			memcpy(tmp, ptr, sizeof(IvyBindOutInfo));
+			tmp->next = NULL;
+
+			if (dumpbindinfo == NULL)
+				dumpbindinfo = tmp;
+			else
+				preinfo->next = tmp;
+
+			preinfo = tmp;
+			ptr = ptr->next;
+		}
+
+		stmtHandle->outbind = dumpbindinfo;
+	}
+
 	/* The placeholder varable is binded by name, change it to be by position */
 	if (stmtHandle->namebind != NULL &&
 		stmtHandle->name_replace == 0 &&
-		Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf) != 1)
+		Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf, &iscallinto) != 1)
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
 		free(tresult);
 		return NULL;
 	}
 	else if (stmtHandle->stmttype == IVY_STMT_UNKNOW &&
-			!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf))
+			!Ivyreplacenamebindtoposition(tconn, stmtHandle, errmsg, size_error_buf, &iscallinto))
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
 		free(tresult);
 		return NULL;
 	}
 
-	if (stmtHandle->stmttype == IVY_STMT_DO &&
+	/*
+	 * Adjust the position of array elements for CALL INTO stmt.
+	 */
+	if (stmtHandle->stmttype == IVY_STMT_DOFROMCALL && iscallinto && stmtHandle->nParams > 1)
+	{
+		char	*paramValues_tmp = NULL;
+		int		paramLengths_tmp, paramFormats_tmp;
+		int		i;
+		Ivyargmode	argmodes_tmp;
+		Oid		paramTypes_tmp;
+
+		paramValues_tmp = paramValues_p[nParams - 1];
+		paramLengths_tmp = paramLengths_p[nParams - 1];
+		paramFormats_tmp = paramFormats_p[nParams - 1];
+		argmodes_tmp = argmodes_p[nParams - 1];
+		paramTypes_tmp = stmtHandle->paramTypes[nParams - 1];
+
+		for (i = nParams -1; i >= 1; i--)
+		{
+			paramValues_p[i] = paramValues_p[i - 1];
+			paramLengths_p[i] = paramLengths_p[i - 1];
+			paramFormats_p[i] = paramFormats_p[i - 1];
+			argmodes_p[i] = argmodes_p[i - 1];
+			stmtHandle->paramTypes[i] = stmtHandle->paramTypes[i - 1];
+		}
+
+		paramValues_p[0] = paramValues_tmp;
+		paramLengths_p[0] = paramLengths_tmp;
+		paramFormats_p[0] = paramFormats_tmp;
+		argmodes_p[0] = argmodes_tmp;
+		stmtHandle->paramTypes[0] = paramTypes_tmp;
+	}
+
+	if ((stmtHandle->stmttype == IVY_STMT_DO ||
+		 stmtHandle->stmttype == IVY_STMT_DOFROMCALL) &&
 		!IvyHandleDostmt(tconn, stmtHandle, false, errmsg, size_error_buf))
 	{
 		PGSemaphoreUnlock(&stmtHandle->lock);
@@ -544,8 +742,8 @@ IvyexecPreparedStatement2(Ivyconn *tconn,
 		char *send_query = NULL;
 
 		/* replace its parameter */
-		if (bindinfos != NULL)
-			IvyreplaceParamTypeByOutParameter(bindinfos,
+		if (stmtHandle->outbind != NULL)
+			IvyreplaceParamTypeByOutParameter(stmtHandle->outbind,
 								stmtHandle->nParams,
 								stmtHandle->paramTypes,
 								argmodes);
@@ -623,7 +821,7 @@ IvyexecPreparedStatement2(Ivyconn *tconn,
 	tresult->result = presult;
 
 	/* assign out parameters */
-	if (stmtHandle->stmttype == IVY_STMT_DO)
+	if (stmtHandle->stmttype == IVY_STMT_DOHANDLED)
 		IvyAssignPLISQLOutParameter(tresult, stmtHandle);
 	else
 		IvyassignOutParameters(tresult, bindinfos);
@@ -1550,9 +1748,9 @@ IvyHandleDostmt(Ivyconn *tconn,
 	PQExpBuffer	query_buf;
 	int nparams = 0;
 	int i = 0;
-	PGresult *res = NULL;
+	int	maxcharlen;
 
-	Assert(stmtHandle->stmttype == IVY_STMT_DO);
+	Assert(stmtHandle->stmttype == IVY_STMT_DO || stmtHandle->stmttype == IVY_STMT_DOFROMCALL);
 
 	if (stmtHandle->namebind == NULL &&
 		stmtHandle->outbind == NULL)
@@ -1574,34 +1772,10 @@ IvyHandleDostmt(Ivyconn *tconn,
 
 	query_buf = createPQExpBuffer();
 
-	/*
-	 * in plisql anonymous block, there may be single quote,
-	 * but in do $$ + using stmt, single quote will fail, 
-	 * so we should use select xxx::text to get realy query.
-	 */
-	appendPQExpBuffer(query_buf, "select '%s'::text", stmtHandle->query);
-
-	PGSemaphoreLock(&tconn->self_lock);
-	res = PQexec(tconn->conn, query_buf->data);
-
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		snprintf(errmsg, err_buf_size, "%s",
-			PQerrorMessage(tconn->conn));
-
-		destroyPQExpBuffer(query_buf);
-		PGSemaphoreUnlock(&tconn->self_lock);
-
-		return 0;
-	}
-
-	resetPQExpBuffer(query_buf);
-
 	/* append do $$ */
-	appendPQExpBuffer(query_buf, "do $$\n%s\n$$ using ", PQgetvalue(res, 0, 0));
+	appendPQExpBuffer(query_buf, "do $$ %s $$ using ", stmtHandle->query);
 
-	PGSemaphoreUnlock(&tconn->self_lock);
-	PQclear(res);
+	maxcharlen = pg_encoding_max_length(tconn->conn->client_encoding);
 
 	if (noparams_info)
 	{
@@ -1643,6 +1817,10 @@ IvyHandleDostmt(Ivyconn *tconn,
 			}
 
 			memset(stmtHandle->paramNames, 0x00, sizeof(char *) * nparams);
+
+			query_buf->data[query_buf->len - 1] = ' ';
+			appendPQExpBufferStr(query_buf, "paramslength ");
+
 			for (nameinfo = stmtHandle->namebind; 
 				nameinfo != NULL; 
 				nameinfo = nameinfo->next)
@@ -1664,6 +1842,21 @@ IvyHandleDostmt(Ivyconn *tconn,
 				memset(stmtHandle->paramNames[i], 0x00, size_char);
 				memcpy(stmtHandle->paramNames[i], nameinfo->name, size_char - 1);
 				stmtHandle->paramTypes[i++] = (Oid) nameinfo->dtype;
+
+				switch(UnSetModeOut(nameinfo->dtype))
+				{
+					case 9500:	/* ORACHARCHAROID */
+					case 9502:	/* ORAVARCHARCHAROID */
+						appendPQExpBuffer(query_buf, "%d,", ((int)nameinfo->val_size - 1) / maxcharlen);
+						break;
+					case 9501:	/* ORACHARBYTEOID */
+					case 9503:	/* ORAVARCHARBYTEOID */
+						appendPQExpBuffer(query_buf, "%d,", (int)nameinfo->val_size - 1);
+						break;
+					default:
+						appendPQExpBuffer(query_buf, "%d,", -1);
+						break;
+				}
 			}
 		}
 		else
@@ -1691,6 +1884,9 @@ IvyHandleDostmt(Ivyconn *tconn,
 				return 0;
 			}
 
+			query_buf->data[query_buf->len - 1] = ' ';
+			appendPQExpBufferStr(query_buf, "paramslength ");
+
 			for (i = 0; i < stmtHandle->nParams; i++)
 			{
 				for (info = stmtHandle->outbind; info != NULL; info = info->next)
@@ -1700,11 +1896,31 @@ IvyHandleDostmt(Ivyconn *tconn,
 				}
 
 				stmtHandle->paramTypes[i] = (Oid) info->dtype;
+
+				switch(UnSetModeOut(info->dtype))
+				{
+					case 9500:	/* ORACHARCHAROID */
+					case 9502:	/* ORAVARCHARCHAROID */
+						appendPQExpBuffer(query_buf, "%d,", ((int)info->val_size - 1) / maxcharlen);
+						break;
+					case 9501:	/* ORACHARBYTEOID */
+					case 9503:	/* ORAVARCHARBYTEOID */
+						appendPQExpBuffer(query_buf, "%d,", (int)info->val_size - 1);
+						break;
+					default:
+						appendPQExpBuffer(query_buf, "%d,", -1);
+						break;
+				}
 			}
 		}
 	}
 	else
 	{
+		PQExpBuffer	clause_buf;
+
+		clause_buf = createPQExpBuffer();
+		appendPQExpBufferStr(clause_buf, "paramslength ");
+
 		/* append parameter mode */
 		if (stmtHandle->namebind != NULL)
 		{
@@ -1716,12 +1932,31 @@ IvyHandleDostmt(Ivyconn *tconn,
 			for(; nameinfo != NULL; nameinfo = nameinfo->next)
 			{
 				appendPQExpBuffer(query_buf, "%s INOUT,", nameinfo->name);
+
+				switch(UnSetModeOut(nameinfo->dtype))
+				{
+					case 9500:	/* ORACHARCHAROID */
+					case 9502:	/* ORAVARCHARCHAROID */
+						appendPQExpBuffer(clause_buf, "%d,", ((int)nameinfo->val_size - 1) / maxcharlen);
+						break;
+					case 9501:	/* ORACHARBYTEOID */
+					case 9503:	/* ORAVARCHARBYTEOID */
+						appendPQExpBuffer(clause_buf, "%d,", (int)nameinfo->val_size - 1);
+						break;
+					default:
+						appendPQExpBuffer(clause_buf, "%d,", -1);
+						break;
+				}
+
 				nparams++;
 			}
 
 			/* others doesn't bind, we assume it is in mode */
 			for (; nparams < stmtHandle->nParams; nparams++)
+			{
 				appendPQExpBuffer(query_buf, "%s,", "IN");
+				appendPQExpBuffer(clause_buf, "%d,", -1);
+			}
 		}
 		else
 		{
@@ -1736,15 +1971,44 @@ IvyHandleDostmt(Ivyconn *tconn,
 				}
 
 				if (info != NULL)
+				{
 					appendPQExpBuffer(query_buf, "%s,", "INOUT");
+
+					switch(UnSetModeOut(info->dtype))
+					{
+						case 9500:	/* ORACHARCHAROID */
+						case 9502:	/* ORAVARCHARCHAROID */
+							appendPQExpBuffer(clause_buf, "%d,", ((int)info->val_size - 1) / maxcharlen);
+							break;
+						case 9501:	/* ORACHARBYTEOID */
+						case 9503:	/* ORAVARCHARBYTEOID */
+							appendPQExpBuffer(clause_buf, "%d,", (int)info->val_size - 1);
+							break;
+						default:
+							appendPQExpBuffer(clause_buf, "%d,", -1);
+							break;
+					}
+				}
 				else
+				{
 					appendPQExpBuffer(query_buf, "%s,", "IN");
+					appendPQExpBuffer(clause_buf, "%d,", -1);
+				}
 			}
 		}
+
+		query_buf->data[query_buf->len - 1] = ' ';
+		appendPQExpBuffer(query_buf, "%s", clause_buf->data);
+		destroyPQExpBuffer(clause_buf);
 	}
 
-	/* replace the last , to ; */
-	query_buf->data[query_buf->len - 1] = ';';
+	if (stmtHandle->stmttype == IVY_STMT_DOFROMCALL)
+	{
+		query_buf->data[query_buf->len - 1] = ' ';
+		appendPQExpBuffer(query_buf, "%s;", "GENERATED FROM CALL");
+	}
+	else
+		query_buf->data[query_buf->len - 1] = ';';	/* replace the last , to ; */
 
 	/* record in stmthandle */
 	stmtHandle->do_using_query = query_buf->data;
@@ -2060,6 +2324,14 @@ IvyStmtExecute(Ivyconn *tconn,
 		if (!PQsendPrepare(conn, stmtHandle->stmtName, send_query,
 					stmtHandle->nParams, stmtHandle->paramTypes))
 		{
+			/*
+			 * Put the error handle assignment in front of the SET command,
+			 * otherwise the execute of the SET command using the same connection
+			 * conn will overwrite the error message text, resulting in failure to
+			 * obtain the error message.
+			 */
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+
 			IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
 
 			PGSemaphoreUnlock(&tconn->self_lock);
@@ -2067,7 +2339,6 @@ IvyStmtExecute(Ivyconn *tconn,
 			PGSemaphoreUnlock(&tconn->lock);
 
 			free(tresult);
-			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
 
 			return NULL;
 		}
@@ -2076,6 +2347,14 @@ IvyStmtExecute(Ivyconn *tconn,
 		if (PQresultStatus(presult) != PGRES_COMMAND_OK)
 		{
 			/* failed */
+			/*
+			 * Put the error handle assignment in front of the SET command,
+			 * otherwise the execute of the SET command using the same connection
+			 * conn will overwrite the error message text, resulting in failure to
+			 * obtain the error message.
+			 */
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+
 			IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
 
 			PGSemaphoreUnlock(&tconn->self_lock);
@@ -2084,30 +2363,34 @@ IvyStmtExecute(Ivyconn *tconn,
 
 			PQclear(presult);
 			free(tresult);
-
-			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
 			return NULL;
 		}
-
 		PQclear(presult);
 
 		IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
 
 		IvyaddRelationStmtHandleandConn(tconn, stmtHandle);
 	}
-
 	PGSemaphoreUnlock(&tconn->lock);
 
 	if (!IvyhandleParamsValues(stmtHandle, &paramValues, &paramLengths, &paramFormats))
 	{
 		PGSemaphoreUnlock(&tconn->self_lock);
 		PGSemaphoreUnlock(&stmtHandle->lock);
-
 		free(tresult);
 		tresult = NULL;
-		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", 
-			"IvyhandleParamsValues failed");
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "getParamsValues failed");
+		return NULL;
+	}
 
+	/* set ivorysql.out_parameter_column_position to true */
+	if (!IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = true;"))
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		free(tresult);
+		tresult = NULL;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "ivorysql.out_parameter_column_position failed");
 		return NULL;
 	}
 
@@ -2118,11 +2401,9 @@ IvyStmtExecute(Ivyconn *tconn,
 	{
 		PGSemaphoreUnlock(&tconn->self_lock);
 		PGSemaphoreUnlock(&stmtHandle->lock);
-
 		free(tresult);
 		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
 		tresult = NULL;
-
 		goto ERROR_HANDLE;
 	}
 
@@ -2135,18 +2416,14 @@ IvyStmtExecute(Ivyconn *tconn,
 		PQclear(presult);
 		PGSemaphoreUnlock(&tconn->self_lock);
 		PGSemaphoreUnlock(&stmtHandle->lock);
-
 		free(tresult);
 		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
 		tresult = NULL;
-
 		goto ERROR_HANDLE;
 	}
-
 	PGSemaphoreUnlock(&tconn->self_lock);
 	tresult->result = presult;
 	tresult->off = get_result_off(presult);
-
 	if (tresult->off == -1)
 	{
 		PQclear(presult);
@@ -2154,11 +2431,10 @@ IvyStmtExecute(Ivyconn *tconn,
 		tresult = NULL;
 		snprintf(errhp->error_msg, errhp->err_buf_size, "result is wrong");
 		PGSemaphoreUnlock(&stmtHandle->lock);
-
 		goto ERROR_HANDLE;
 	}
 
-	/* assign OUT parameters */
+	/* assign out parameters */
 	if (stmtHandle->stmttype != IVY_STMT_DOHANDLED)
 		IvyassignOutParameters2(tresult, stmtHandle->outbind);
 	else
@@ -2167,77 +2443,358 @@ IvyStmtExecute(Ivyconn *tconn,
 	PGSemaphoreUnlock(&stmtHandle->lock);
 
 ERROR_HANDLE:
+	IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
+
 	for (i = 0; i < stmtHandle->nParams; i++)
 	{
 		if (paramValues[i] != NULL)
 			free(paramValues[i]);
 	}
-
 	free(paramValues);
 	free(paramLengths);
 	free(paramFormats);
-
 	paramValues = NULL;
 	paramLengths = NULL;
 	paramFormats = NULL;
-
 	return tresult;
 }
 
 /*
+ * IvyStmtExecute2
  *
- * register OUT parameter by name
- *
- * stmthandle: a stmt to save sql stmt informations
- * bindinfo: to save OUT parameter informations
- * position: the position of this OUT parameter
- * var: the address to save the OUT parameter value
- * val_size: the sizeof the var
- * indp: the index var like oci to save the OUT parameter
- *		0:  the result value is equal to or less then the val_size
- *		-1: the result value of this OUT parameter is null
- *		-2: the result value is more than the val_size plus INT_MAX
- *		positive integer: the result value is more than the
- *		val_size and the positive integer value = (result value - val_size)
- *
- * replace_ok: this position can be binded repeatedly, 
- * if 1, it replaces origin bind informations, 
- * if 0, then error raise.
- * errormsg: save some userful error messages
- * size_error_buf: the size of errormsg buf
+ * This is a variant of IvyStmtExecute. In IvyStmtExecute we
+ * need to call get_parameter_description() to get the placeholder
+ * information. But in IvyStmtExecute2,it provided by the caller.
  *
- * return 1 if bind succeeded, 0 if failed
+ * In PSQL, in order to be compatible with Oracle, we need to verify
+ * whether the bind variable exists, so we must call get_parameter_description() 
+ * in advance. We add this interface to reduce the additional performance
+ * loss caused by meaningless calls to the get_parameter_description() function
+ * within IvyStmtExecute.
  */
-int
-IvybindOutParameterByName(IvyPreparedStatement *stmthandle,
-				IvyBindOutInfo **bindinfo,
-				const char *name,
-				size_t name_len,
-				void *var,
-				size_t	val_size,
-				int *indp,
-				int	replace_ok,
-				char *errormsg,
-				size_t size_error_buf)
+Ivyresult *
+IvyStmtExecute2(Ivyconn *tconn,
+					  IvyPreparedStatement *stmtHandle,
+					  IvyError *errhp,
+					  HostVariable *host)
 {
-	IvyBindOutNameInfo *bindname = NULL;
+	Ivyresult *tresult = NULL;
+	PGconn *conn = NULL;
+	PGresult *presult = NULL;
+	bool	sendPrepare = true;
+	char 	**paramValues = NULL;
+	int *paramLengths = NULL;
+	int *paramFormats = NULL;
+	int	i;
+	int resultFormat = 0;
 
-	if (NULL == stmthandle || NULL == stmthandle->query)
+	if (tconn == NULL || tconn->conn == NULL ||
+		stmtHandle == NULL || stmtHandle->query == NULL)
 	{
-		snprintf(errormsg, size_error_buf, "%s", 
-			"stmt has already been freed");
-		return 0;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "connection or stmt is null");
+		return NULL;
 	}
 
-	if (NULL == name || name_len <= 0)
+	tresult = (Ivyresult *) malloc(sizeof(Ivyresult));
+	if (tresult == NULL)
 	{
-		snprintf(errormsg, size_error_buf, "%s", 
-			"bind name is wrong");
-		return 0;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "malloc failed");
+		return NULL;
 	}
 
-	bindname = (IvyBindOutNameInfo *) malloc(sizeof(IvyBindOutNameInfo));
-	if (bindname == NULL)
+	/* send prepare stmt */
+	/* first lock ivyconn and stmt */
+	PGSemaphoreLock(&stmtHandle->lock);
+	if (stmtHandle->query == NULL)
+	{
+		/* stmtHandle has already be freed */
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "stmt has already be freed");
+		free(tresult);
+		return NULL;
+	}
+
+	/* handle placevar bind byname, we replace it bind by position */
+	if (stmtHandle->namebind != NULL &&
+		stmtHandle->name_replace == 0 &&
+		!Ivyreplacenamebindtoposition3(tconn, stmtHandle, errhp, host))
+	{
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		free(tresult);
+		return NULL;
+	}
+	else if (stmtHandle->stmttype == IVY_STMT_UNKNOW &&
+			!Ivyreplacenamebindtoposition3(tconn, stmtHandle, errhp, host))
+	{
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		free(tresult);
+		return NULL;
+	}
+
+	/* handle dostmt */
+	if ((stmtHandle->stmttype == IVY_STMT_DO || 
+		 stmtHandle->stmttype == IVY_STMT_DOFROMCALL) &&
+		!IvyHandleDostmt(tconn, stmtHandle, true, errhp->error_msg, errhp->err_buf_size))
+	{
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		free(tresult);
+		return NULL;
+	}
+
+	PGSemaphoreLock(&tconn->self_lock);
+	conn = tconn->conn;
+
+	if (!PQexecStart(conn))
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+		free(tresult);
+		return NULL;
+	}
+
+	/* find this stmt has prepare in this connection */
+	PGSemaphoreLock(&tconn->lock);
+	if (tconn->IvystmtHandleList != NULL)
+	{
+		Ivylist *tmp;
+
+		for (tmp = tconn->IvystmtHandleList; tmp != NULL; tmp = tmp->next)
+		{
+			if (tmp->value == stmtHandle)
+			{
+				sendPrepare = false;
+				break;
+			}
+		}
+	}
+
+	/* if hasn't prepare */
+	if (sendPrepare)
+	{
+		char *send_query;
+
+		/* assing nparams */
+		if (stmtHandle->nParams == -1)
+			stmtHandle->nParams = IvyGetParameterNum(stmtHandle);
+
+		/* assign parame types */
+		if (stmtHandle->stmttype != IVY_STMT_DOHANDLED &&
+			!IvyAssignParameterTypes(errhp, stmtHandle))
+		{
+			PGSemaphoreUnlock(&tconn->self_lock);
+			PGSemaphoreUnlock(&stmtHandle->lock);
+			PGSemaphoreUnlock(&tconn->lock);
+			free(tresult);
+			tresult = NULL;
+			return NULL;
+		}
+
+		/* set ivorysql.out_parameter_column_position to true */
+		if (!IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = true;"))
+		{
+			PGSemaphoreUnlock(&tconn->self_lock);
+			PGSemaphoreUnlock(&stmtHandle->lock);
+			PGSemaphoreUnlock(&tconn->lock);
+			free(tresult);
+			tresult = NULL;
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "ivorysql.out_parameter_column_position failed");
+			return NULL;
+		}
+
+		if (stmtHandle->stmttype == IVY_STMT_DOHANDLED)
+			send_query = stmtHandle->do_using_query;
+		else
+			send_query = stmtHandle->query;
+
+		/* third send Prepare */
+		if (!PQsendPrepare(conn, stmtHandle->stmtName, send_query,
+							stmtHandle->nParams, stmtHandle->paramTypes))
+		{
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+			IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
+			PGSemaphoreUnlock(&tconn->self_lock);
+			PGSemaphoreUnlock(&stmtHandle->lock);
+			PGSemaphoreUnlock(&tconn->lock);
+			free(tresult);
+			return NULL;
+		}
+		presult = PQexecFinish(conn);
+		if (PQresultStatus(presult) != PGRES_COMMAND_OK)
+		{
+			/* failed */
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+			IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
+			PGSemaphoreUnlock(&tconn->self_lock);
+			PGSemaphoreUnlock(&stmtHandle->lock);
+			PGSemaphoreUnlock(&tconn->lock);
+			PQclear(presult);
+			free(tresult);
+			return NULL;
+		}
+
+		PQclear(presult);
+
+		IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
+
+		IvyaddRelationStmtHandleandConn(tconn, stmtHandle);
+	}
+
+	PGSemaphoreUnlock(&tconn->lock);
+
+	if (!IvyhandleParamsValues(stmtHandle, &paramValues, &paramLengths, &paramFormats))
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+
+		free(tresult);
+		tresult = NULL;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", 
+			"IvyhandleParamsValues failed");
+
+		return NULL;
+	}
+
+	/* set ivorysql.out_parameter_column_position to true */
+	if (!IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = true;"))
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+		free(tresult);
+		tresult = NULL;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "ivorysql.out_parameter_column_position failed");
+		return NULL;
+	}
+
+	/* send query */
+	if (!PQsendQueryPrepared(conn, stmtHandle->stmtName, stmtHandle->nParams,
+							(const char *const *) paramValues,
+							paramLengths, paramFormats, resultFormat))
+	{
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+
+		free(tresult);
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+		tresult = NULL;
+
+		goto ERROR_HANDLE;
+	}
+
+	/* get presult */
+	presult = PQexecFinish(conn);
+	if (PQresultStatus(presult) != PGRES_TUPLES_OK &&
+		PQresultStatus(presult) != PGRES_COMMAND_OK &&
+		PQresultStatus(presult) != PGRES_EMPTY_QUERY)
+	{
+		PQclear(presult);
+		PGSemaphoreUnlock(&tconn->self_lock);
+		PGSemaphoreUnlock(&stmtHandle->lock);
+
+		free(tresult);
+		snprintf(errhp->error_msg, errhp->err_buf_size, "%s", PQerrorMessage(conn));
+		tresult = NULL;
+
+		goto ERROR_HANDLE;
+	}
+
+	PGSemaphoreUnlock(&tconn->self_lock);
+	tresult->result = presult;
+	tresult->off = get_result_off(presult);
+
+	if (tresult->off == -1)
+	{
+		PQclear(presult);
+		free(tresult);
+		tresult = NULL;
+		snprintf(errhp->error_msg, errhp->err_buf_size, "result is wrong");
+		PGSemaphoreUnlock(&stmtHandle->lock);
+
+		goto ERROR_HANDLE;
+	}
+
+	/* assign OUT parameters */
+	if (stmtHandle->stmttype != IVY_STMT_DOHANDLED)
+		IvyassignOutParameters2(tresult, stmtHandle->outbind);
+	else
+		IvyAssignPLISQLOutParameter(tresult, stmtHandle);
+
+	PGSemaphoreUnlock(&stmtHandle->lock);
+
+ERROR_HANDLE:
+	IvyExecCommand(conn, "set ivorysql.out_parameter_column_position = false;");
+
+	for (i = 0; i < stmtHandle->nParams; i++)
+	{
+		if (paramValues[i] != NULL)
+			free(paramValues[i]);
+	}
+
+	free(paramValues);
+	free(paramLengths);
+	free(paramFormats);
+
+	paramValues = NULL;
+	paramLengths = NULL;
+	paramFormats = NULL;
+
+	return tresult;
+}
+
+/*
+ *
+ * register OUT parameter by name
+ *
+ * stmthandle: a stmt to save sql stmt informations
+ * bindinfo: to save OUT parameter informations
+ * position: the position of this OUT parameter
+ * var: the address to save the OUT parameter value
+ * val_size: the sizeof the var
+ * indp: the index var like oci to save the OUT parameter
+ *		0:  the result value is equal to or less then the val_size
+ *		-1: the result value of this OUT parameter is null
+ *		-2: the result value is more than the val_size plus INT_MAX
+ *		positive integer: the result value is more than the
+ *		val_size and the positive integer value = (result value - val_size)
+ *
+ * replace_ok: this position can be binded repeatedly, 
+ * if 1, it replaces origin bind informations, 
+ * if 0, then error raise.
+ * errormsg: save some userful error messages
+ * size_error_buf: the size of errormsg buf
+ *
+ * return 1 if bind succeeded, 0 if failed
+ */
+int
+IvybindOutParameterByName(IvyPreparedStatement *stmthandle,
+				IvyBindOutInfo **bindinfo,
+				const char *name,
+				size_t name_len,
+				void *var,
+				size_t	val_size,
+				int *indp,
+				int	replace_ok,
+				char *errormsg,
+				size_t size_error_buf)
+{
+	IvyBindOutNameInfo *bindname = NULL;
+
+	if (NULL == stmthandle || NULL == stmthandle->query)
+	{
+		snprintf(errormsg, size_error_buf, "%s", 
+			"stmt has already been freed");
+		return 0;
+	}
+
+	if (NULL == name || name_len <= 0)
+	{
+		snprintf(errormsg, size_error_buf, "%s", 
+			"bind name is wrong");
+		return 0;
+	}
+
+	bindname = (IvyBindOutNameInfo *) malloc(sizeof(IvyBindOutNameInfo));
+	if (bindname == NULL)
 	{
 		snprintf(errormsg, size_error_buf, "%s", 
 			"failed to allocate memory");
@@ -2411,9 +2968,16 @@ IvyreplaceParamTypeByOutParameter(IvyBindOutInfo *bindinfo, int nParams, Oid *pa
 		{
 			/* just OUT mode parameter, we replace its oid with a virtual oid */
 			if (argmodes != NULL && argmodes[serbind->position - 1] == argmode_out)
+			{
 				SetModeOut(paramTypes[serbind->position - 1]);
-			else if (argmodes != NULL && argmodes[serbind->position - 1] == argmode_out)
+				serbind->dtype = paramTypes[serbind->position - 1];
+			}
+			else if (argmodes != NULL && argmodes[serbind->position - 1] == argmode_inout)
+			{
 				SetModeIn(paramTypes[serbind->position - 1]);
+				SetModeOut(paramTypes[serbind->position - 1]);
+				serbind->dtype = paramTypes[serbind->position - 1];
+			}
 		}
 		else
 		{
@@ -2433,6 +2997,10 @@ IvyreplaceParamTypeByOutParameter(IvyBindOutInfo *bindinfo, int nParams, Oid *pa
 static Ivylist*
 IvyaddValueToList(Ivylist *list, void *value)
 {
+	Ivylist *pre = NULL;
+	Ivylist *tmp = NULL;
+	int find = 0;
+
 	if (list == NULL)
 	{
 		Ivylist *new = (Ivylist *) malloc(sizeof(Ivylist));
@@ -2450,10 +3018,6 @@ IvyaddValueToList(Ivylist *list, void *value)
 		return new;
 	}
 
-	Ivylist *pre = NULL;
-	Ivylist *tmp = NULL;
-	int find = 0;
-
 	for (tmp = list, pre = list; tmp != NULL; pre = tmp, tmp = tmp->next)
 	{
 		if (tmp->value == value)
@@ -2848,34 +3412,34 @@ get_paramvalue_type(int type)
 		case 1790:	//REF_CURSOR
 		case 2201:	//REF_CURSOR_ARRAY
 		 /* oracle support type */
-		case 9000:	//ORACHARCHAR
-		case 9004:	//ORACHARCHAR_ARRAY
-		case 9001:	//ORACHARBYTE
-		case 9005:	//ORACHARBYTE_ARRAY
-		case 9002:	//ORAVARCHARCHAR
-		case 9006:	//ORAVARCHARCHAR_ARRAY
-		case 9003:	//ORAVARCHARBYTE
-		case 9007:	//ORAVARCHARBYTE_ARRAY
-		case 9008:	//ORADATE
-		case 9009:	//ORADATE_ARRAY
-		case 9010:	//ORATIMESTAMP
-		case 9011:	//ORATIMESTAMP_ARRAY
-		case 9012:	//ORATIMESTAMPTZ
-		case 9013:	//ORATIMESTAMPTZ_ARRAY
-		case 9014:	//ORATIMESTAMPLTZ
-		case 9015:	//ORATIMESTAMPLTZ_ARRAY
-		case 9016: // YMINTERVAL
-		case 9017: // YMINTERVAL_ARRAY
-		case 9018: // DSINTERVAL
-		case 9019: // DSINTERVAL_ARRAY
-		case 9020: // NUMBER
-		case 9021: // NUMBER_ARRAY
-		case 9022: // BINARY_FLOAT
-		case 9023: // BINARY_FLOAT_ARRAY
-		case 9024: // BINARY_DOUBLE
-		case 9025: // BINARY_DOUBLE_ARRAY
-		case 9030: // ORAREFCURSOR
-		case 9031:  // ORAREFCURSOR_ARRAY
+		case 9500:	//ORACHARCHAR
+		case 9504:	//ORACHARCHAR_ARRAY
+		case 9501:	//ORACHARBYTE
+		case 9505:	//ORACHARBYTE_ARRAY
+		case 9502:	//ORAVARCHARCHAR
+		case 9506:	//ORAVARCHARCHAR_ARRAY
+		case 9503:	//ORAVARCHARBYTE
+		case 9507:	//ORAVARCHARBYTE_ARRAY
+		case 9508:	//ORADATE
+		case 9509:	//ORADATE_ARRAY
+		case 9510:	//ORATIMESTAMP
+		case 9511:	//ORATIMESTAMP_ARRAY
+		case 9512:	//ORATIMESTAMPTZ
+		case 9513:	//ORATIMESTAMPTZ_ARRAY
+		case 9514:	//ORATIMESTAMPLTZ
+		case 9515:	//ORATIMESTAMPLTZ_ARRAY
+		case 9516: // YMINTERVAL
+		case 9517: // YMINTERVAL_ARRAY
+		case 9518: // DSINTERVAL
+		case 9519: // DSINTERVAL_ARRAY
+		case 9520: // NUMBER
+		case 9521: // NUMBER_ARRAY
+		case 9522: // BINARY_FLOAT
+		case 9523: // BINARY_FLOAT_ARRAY
+		case 9524: // BINARY_DOUBLE
+		case 9525: // BINARY_DOUBLE_ARRAY
+		case 9530: // ORAREFCURSOR
+		case 9531:  // ORAREFCURSOR_ARRAY
 			ret = IVY_VALUE_BYTE;
 			break;
 		default:
@@ -3196,9 +3760,9 @@ static int
 Ivyreplacenamebindtoposition(Ivyconn *tconn,
 				IvyPreparedStatement *stmtHandle,
 				char *errmsg,
-				size_t size_error_buf)
+				size_t size_error_buf,
+				bool *iscallinto)
 {
-	int i;
 	Ivyresult *res;
 	IvyBindOutNameInfo *tmp;
 
@@ -3218,8 +3782,13 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 		char	*first_name;
 		int	first_pos;
 		int	dostmt = 0;
+		bool	iscallstmt = false;
+		char	*convertcall = NULL;
+		char	*newsql = NULL;
+		char	*ptr = NULL;
+		const char *query_ptr = NULL;
 
-		query_len = stmtHandle->query_len + strlen("select * from get_parameter_description(") + 5;
+		query_len = (stmtHandle->query_len * 2) + strlen("select * from get_parameter_description(") + 5;
 		query = (char *) malloc(query_len);
 
 		if (query == NULL)
@@ -3228,8 +3797,23 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 			return 0;
 		}
 
+		newsql = malloc(stmtHandle->query_len * 2);	/* enough */
+		ptr = newsql;
+		query_ptr = stmtHandle->query;
+		
+		while (*query_ptr != '\0')
+		{
+			if (*query_ptr == '\'')
+				*ptr++ = *query_ptr;
+			*ptr++ = *query_ptr;
+			query_ptr++;
+		}
+		*ptr = '\0';
+
 		memset(query, 0x00, query_len);
-		snprintf(query, query_len, "select * from get_parameter_description('%s');", stmtHandle->query);
+		snprintf(query, query_len, "select * from get_parameter_description('%s');", newsql);
+		free(newsql);
+
 		res = Ivyexec(tconn, query);
 		if (IvyresultStatus(res) != PGRES_TUPLES_OK)
 		{
@@ -3243,7 +3827,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 		n_tuples = Ivyntuples(res);
 
 		/* check if failed */
-		if (n_fields != 2 || n_tuples < 1)
+		if (n_fields != 3 || n_tuples < 1)
 		{
 			snprintf(errmsg, size_error_buf, "%s", 
 				"get_parameter_description return wrong fields or tuples");
@@ -3263,14 +3847,12 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 			return 0;
 		}
 
-		if (strcmp(first_name, "true") == 0)
+		if (strcmp(first_name, "DO") == 0)
 			dostmt = 1;
-		else if (strcmp(first_name, "false") != 0)
+		else if (strcmp(first_name, "CALL") == 0)
 		{
-			snprintf(errmsg, size_error_buf, "%s", 
-				"get_parameter_description returns wrong first_name");
-			Ivyclear(res);
-			return 0;
+			iscallstmt = true;
+			convertcall = PQgetisnull(res->result, 0, 2) ? NULL : Ivygetvalue(res, 0, 2);
 		}
 
 		/* process dostmt */
@@ -3281,6 +3863,82 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 			return 1;
 		}
 
+		if (iscallstmt)
+		{
+			PQExpBuffer	dostmt_buf;
+			
+			dostmt_buf = createPQExpBuffer();
+			if (convertcall)
+			{
+				appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", convertcall);
+				*iscallinto = true;
+			}
+			else
+			{
+				/*
+				 * It is the responsibility of the caller to
+				 * ensure that stmtHandle->query is not null.
+				 */
+				int	stmt_len = strlen(stmtHandle->query);
+
+				while (stmt_len > 0 && isspace((unsigned char) stmtHandle->query[stmt_len - 1]))
+					stmt_len--;
+
+				if (stmt_len > 0 && stmtHandle->query[stmt_len - 1] == ';')
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", stmtHandle->query);
+				else
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s; END;", stmtHandle->query);
+
+				*iscallinto = false;
+			}
+
+			/* Rewrite IvyPreparedStatement */
+			if (stmtHandle->query != NULL)
+			{
+				free(stmtHandle->query);
+			}
+
+			stmtHandle->query = strdup(dostmt_buf->data);
+			stmtHandle->query_len = strlen(dostmt_buf->data);
+
+			/*
+			 * If there are multiple OUT parameters, the last OUT parameter
+			 * needs to be moved to the head of list.
+			 */
+			if (convertcall)
+			{
+				if (stmtHandle->outbind)
+				{
+					IvyBindInfo *tail = NULL;
+					IvyBindInfo *pre = NULL;
+
+					for(tail = stmtHandle->outbind; tail->next != NULL; tail = tail->next)
+					{
+						pre = tail;
+						pre->position += 1;
+					}
+
+					/*
+					 * If there is only one OUT parameter, there is no
+					 * need to adjust the position of the parameter.
+					 */
+					if (pre)
+					{
+						tail->position = 1;
+						pre->next = NULL;
+						tail->next = stmtHandle->outbind;
+						stmtHandle->outbind = tail;
+					}
+				}
+			}
+
+			destroyPQExpBuffer(dostmt_buf);
+
+			stmtHandle->stmttype = IVY_STMT_DOFROMCALL;
+			Ivyclear(res);
+			return 1;
+		}
+
 		stmtHandle->stmttype = IVY_STMT_OTHERS;
 
 		/*
@@ -3308,7 +3966,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 
 		stmtHandle->paramNames = (char **) malloc(sizeof(char *) * (n_tuples - 1));
 		memset(stmtHandle->paramNames, 0x00, sizeof(char *) * (n_tuples - 1));
-		for (i = 1; i < n_tuples; i++)
+		for (int i = 1; i < n_tuples; i++)
 		{
 			int position;
 			char *name;
@@ -3348,7 +4006,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 
 		if (position == stmtHandle->nParams)
 		{
-			snprintf(errmsg, size_error_buf, "placehondvar \"%s\" not found",
+			snprintf(errmsg, size_error_buf, "placeholder variable \"%s\" not found",
 						tmp->name);
 			return 0;
 		}
@@ -3377,7 +4035,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 		"get_parameter_description return failed");
 
 	Ivyclear(res);
-	for (i = 0; i < stmtHandle->nParams; i++)
+	for (int i = 0; i < stmtHandle->nParams; i++)
 	{
 		if (stmtHandle->paramNames[i] != NULL)
 			free(stmtHandle->paramNames[i]);
@@ -3398,10 +4056,10 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 				IvyPreparedStatement *stmtHandle,
 				IvyError *errhp)
 {
-	int i;
 	Ivyresult *res;
 	IvyBindNameInfo *tmp;
 
+
 	if (stmtHandle->paramNames == NULL)
 	{
 		char	*query;
@@ -3411,8 +4069,13 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 		int	first_pos;
 		char	*first_name;
 		int	dostmt = 0;
+		bool	iscallstmt = false;
+		char	*convertcall = NULL;
+		char	*newsql = NULL;
+		char	*ptr = NULL;
+		const char *query_ptr = NULL;
 
-		query_len = strlen(stmtHandle->query) + strlen("select * from get_parameter_description(") + 5;
+		query_len = (strlen(stmtHandle->query) * 2) + strlen("select * from get_parameter_description(") + 5;
 		query = (char *) malloc(query_len);
 
 		if (query == NULL)
@@ -3422,8 +4085,23 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 			return 0;
 		}
 
+		newsql = malloc(strlen(stmtHandle->query) * 2);	/* enough */
+		ptr = newsql;
+		query_ptr = stmtHandle->query;
+		
+		while (*query_ptr != '\0')
+		{
+			if (*query_ptr == '\'')
+				*ptr++ = *query_ptr;
+			*ptr++ = *query_ptr;
+			query_ptr++;
+		}
+		*ptr = '\0';
+
 		memset(query, 0x00, query_len);
-		snprintf(query, query_len, "select * from get_parameter_description('%s');", stmtHandle->query);
+		snprintf(query, query_len, "select * from get_parameter_description('%s');", newsql);
+		free(newsql);
+
 		res = Ivyexec(tconn, query);
 		if (IvyresultStatus(res) != PGRES_TUPLES_OK)
 		{
@@ -3437,7 +4115,7 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 		n_tuples = Ivyntuples(res);
 
 		/* number of params doesn't match */
-		if (n_fields != 2 || n_tuples < 1)
+		if (n_fields != 3 || n_tuples < 1)
 		{
 			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", 
 				"get_parameter_description return wrong fields or tuples");
@@ -3457,16 +4135,14 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 			return 0;
 		}
 
-		if (strcmp(first_name, "true") == 0)
+		if (strcmp(first_name, "DO") == 0)
 		{
 			dostmt = 1;
 		}
-		else if (strcmp(first_name, "false") != 0)
+		else if (strcmp(first_name, "CALL") == 0)
 		{
-			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", 
-				"get_parameter_description return wrong first_name");
-			Ivyclear(res);
-			return 0;
+			iscallstmt = true;
+			convertcall = PQgetisnull(res->result, 0, 2) ? NULL : Ivygetvalue(res, 0, 2);
 		}
 
 		/* process dostmt */
@@ -3477,6 +4153,77 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 			return 1;
 		}
 
+		if (iscallstmt)
+		{
+			PQExpBuffer	dostmt_buf;
+			
+			dostmt_buf = createPQExpBuffer();
+			if (convertcall)
+				appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", convertcall);
+			else
+			{
+				/*
+				 * It is the responsibility of the caller to
+				 * ensure that stmtHandle->query is not null.
+				 */
+				int	stmt_len = strlen(stmtHandle->query);
+
+				while (stmt_len > 0 && isspace((unsigned char) stmtHandle->query[stmt_len - 1]))
+					stmt_len--;
+
+				if (stmt_len > 0 && stmtHandle->query[stmt_len - 1] == ';')
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", stmtHandle->query);
+				else
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s; END;", stmtHandle->query);
+			}
+
+			/* Rewrite IvyPreparedStatement */
+			if (stmtHandle->query != NULL)
+			{
+				free(stmtHandle->query);
+			}
+
+			stmtHandle->query = strdup(dostmt_buf->data);
+			stmtHandle->query_len = strlen(dostmt_buf->data);
+
+			/*
+			 * If there are multiple OUT parameters, the last OUT parameter
+			 * needs to be moved to the head of list.
+			 */
+			if (convertcall)
+			{
+				if (stmtHandle->outbind)
+				{
+					IvyBindInfo *tail = NULL;
+					IvyBindInfo *pre = NULL;
+
+					for(tail = stmtHandle->outbind; tail->next != NULL; tail = tail->next)
+					{
+						pre = tail;
+						pre->position += 1;
+					}
+
+					/*
+					 * If there is only one OUT parameter, there is no
+					 * need to adjust the position of the parameter.
+					 */
+					if (pre)
+					{
+						tail->position = 1;
+						pre->next = NULL;
+						tail->next = stmtHandle->outbind;
+						stmtHandle->outbind = tail;
+					}
+				}
+			}
+
+			destroyPQExpBuffer(dostmt_buf);
+
+			stmtHandle->stmttype = IVY_STMT_DOFROMCALL;
+			Ivyclear(res);
+			return 1;
+		}
+
 		stmtHandle->stmttype = IVY_STMT_OTHERS;
 		if (n_tuples == 1)
 		{
@@ -3489,7 +4236,7 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 		stmtHandle->paramNames = (char **) malloc(sizeof(char *) * (n_tuples - 1));
 		stmtHandle->nParams = n_tuples - 1;
 		memset(stmtHandle->paramNames, 0x00, sizeof(char *) * (n_tuples - 1));
-		for (i = 1; i < n_tuples; i++)
+		for (int i = 1; i < n_tuples; i++)
 		{
 			int position;
 			char *name;
@@ -3529,7 +4276,7 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 
 		if (position == stmtHandle->nParams)
 		{
-			snprintf(errhp->error_msg, errhp->err_buf_size, "placehondvar \"%s\" not found",
+			snprintf(errhp->error_msg, errhp->err_buf_size, "placeholder variable \"%s\" not found",
 						tmp->name);
 			return 0;
 		}
@@ -3562,7 +4309,7 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 		"get_parameter_description return failed");
 
 	Ivyclear(res);
-	for (i = 0; i < stmtHandle->nParams; i++)
+	for (int i = 0; i < stmtHandle->nParams; i++)
 	{
 		if (stmtHandle->paramNames[i] != NULL)
 			free(stmtHandle->paramNames[i]);
@@ -3573,4 +4320,173 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 
 	return 0;
 }
+/*
+ * like Ivyreplacenamebindtoposition2
+ * but used by IvyStmtExecute2
+ */
+static int
+Ivyreplacenamebindtoposition3(Ivyconn *tconn,
+										IvyPreparedStatement *stmtHandle,
+										IvyError *errhp,
+										HostVariable *host)
+{
+	int i;
+	IvyBindNameInfo *tmp;
+
+	if (stmtHandle->paramNames == NULL)
+	{
+		if (!host || host->length == 0)
+		{
+			snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "No placeholder variables specified");
+			return 0;
+		}
+			
+		/* dostmt should handle special */
+		if (host->isdostmt)
+		{
+			stmtHandle->stmttype = IVY_STMT_DO;
+			return 1;
+		}
+
+		if (host->iscallstmt)
+		{
+			PQExpBuffer	dostmt_buf;
+			
+			dostmt_buf = createPQExpBuffer();
+			if (host->convertcall)
+				appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", host->convertcall);
+			else
+			{
+				/*
+				 * It is the responsibility of the caller to
+				 * ensure that stmtHandle->query is not null.
+				 */
+				int	stmt_len = strlen(stmtHandle->query);
+
+				while (stmt_len > 0 && isspace((unsigned char) stmtHandle->query[stmt_len - 1]))
+					stmt_len--;
+
+				if (stmt_len > 0 && stmtHandle->query[stmt_len - 1] == ';')
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s END;", stmtHandle->query);
+				else
+					appendPQExpBuffer(dostmt_buf, "BEGIN %s; END;", stmtHandle->query);
+			}
+
+			/* Rewrite IvyPreparedStatement */
+			if (stmtHandle->query != NULL)
+			{
+				free(stmtHandle->query);
+			}
+
+			stmtHandle->query = strdup(dostmt_buf->data);
+			stmtHandle->query_len = strlen(dostmt_buf->data);
+
+			/*
+			 * If there are multiple OUT parameters, the last OUT parameter
+			 * needs to be moved to the head of list.
+			 */
+			if (host->convertcall)
+			{
+				if (stmtHandle->outbind)
+				{
+					IvyBindInfo *tail = NULL;
+					IvyBindInfo *pre = NULL;
+
+					for(tail = stmtHandle->outbind; tail->next != NULL; tail = tail->next)
+					{
+						pre = tail;
+						pre->position += 1;
+					}
+
+					/*
+					 * If there is only one OUT parameter, there is no
+					 * need to adjust the position of the parameter.
+					 */
+					if (pre)
+					{
+						tail->position = 1;
+						pre->next = NULL;
+						tail->next = stmtHandle->outbind;
+						stmtHandle->outbind = tail;
+					}
+				}
+			}
+
+			destroyPQExpBuffer(dostmt_buf);
+
+			stmtHandle->stmttype = IVY_STMT_DOFROMCALL;
+			return 1;
+		}
+
+		stmtHandle->stmttype = IVY_STMT_OTHERS;
+		stmtHandle->paramNames = (char **) malloc(sizeof(char *) * host->length);
+		stmtHandle->nParams = host->length;
+		memset(stmtHandle->paramNames, 0x00, sizeof(char *) * host->length);
+		for (i = 0; i < host->length; i++)
+		{
+			int position;
+			char *name;
+			size_t name_len;
+
+			position = host->hostvars[i].position - 1;
+			name = host->hostvars[i].name;
+
+			if (stmtHandle->paramNames[position] != NULL)
+				goto error_handle;
+			name_len = strlen(name) + 1;
+			stmtHandle->paramNames[position] = (char *) malloc(name_len);
+			if (stmtHandle->paramNames[position] == NULL)
+				goto error_handle;
+			snprintf(stmtHandle->paramNames[position], name_len, "%s", name);
+		}
+	}
+
+	/* according to paramnames to replace position */
+	for (tmp = stmtHandle->namebind; tmp != NULL; tmp = tmp->next)
+	{
+		int position;
+		int ret;
+
+		if (tmp->replace != 0)
+			continue;
+
+		for (position = 0; position < stmtHandle->nParams; position++)
+			if (strcmp(stmtHandle->paramNames[position], tmp->name) == 0)
+				break;
+		if (position == stmtHandle->nParams)
+		{
+			snprintf(errhp->error_msg, errhp->err_buf_size, "placeholder variable \"%s\" not found",
+						tmp->name);
+			return 0;
+		}
+		ret = IvyBindByPosInternel(stmtHandle,
+								tmp->bindinfo,
+								errhp,
+								position + 1,
+								tmp->var,
+								tmp->val_size,
+								tmp->dtype,
+								tmp->indp,
+								tmp->alenp,
+								tmp->recodep,
+								tmp->maxarr_len,
+								tmp->curelep,
+								tmp->mode,
+								false);
+		if (ret != 1)
+			return 0;
+		tmp->replace = 1;
+	}
+	stmtHandle->name_replace = 1;
+	return 1;
+
+error_handle:
+	snprintf(errhp->error_msg, errhp->err_buf_size, "%s", "Ivyreplacenamebindtoposition3 failed");
+	for (i = 0; i < stmtHandle->nParams; i++)
+		if (stmtHandle->paramNames[i] != NULL)
+			free(stmtHandle->paramNames[i]);
+	free(stmtHandle->paramNames);
+	stmtHandle->paramNames = NULL;
+	return 0;
+}
 
diff --git a/src/interfaces/libpq/ivy_sema.h b/src/interfaces/libpq/ivy_sema.h
index 31ed8b93e20..c2f1e0c5217 100644
--- a/src/interfaces/libpq/ivy_sema.h
+++ b/src/interfaces/libpq/ivy_sema.h
@@ -11,7 +11,7 @@
  * be provided by each port.
  *
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivy_sema.h
  *
diff --git a/src/interfaces/libpq/ivytest/Makefile b/src/interfaces/libpq/ivytest/Makefile
index 14c2dbb0bc6..601fbb87dad 100644
--- a/src/interfaces/libpq/ivytest/Makefile
+++ b/src/interfaces/libpq/ivytest/Makefile
@@ -15,7 +15,8 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += $(libpq_pgport)
 
 PROGS = testlibpq testlibpqstmt2 testlibpq_nullstmt testlibpq_allout testlibpq_prepare_plsql testlibpq_prepare_dml \
-	testlibpq_binary_double testlibpq_binary_float testlibpq_interval testlibpq_number 
+        testlibpq_binary_double testlibpq_binary_float testlibpq_interval testlibpq_number testlibpq_prepare_call \
+		testlibpq_call testlibpqstmt2_call
 
 all: $(PROGS)
 
diff --git a/src/interfaces/libpq/ivytest/expected/testlibpq_call.out b/src/interfaces/libpq/ivytest/expected/testlibpq_call.out
new file mode 100644
index 00000000000..8b2bd03f580
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/expected/testlibpq_call.out
@@ -0,0 +1,4 @@
+beijing,welcome to beijing
+0,0
+welcome to beijing
+0
diff --git a/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_call.out b/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_call.out
new file mode 100644
index 00000000000..2a47b0d0c1f
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_call.out
@@ -0,0 +1,10 @@
+x:beijing:0
+y:beijing:0
+z:beijingbeijing:0
+x:beijing:0
+y:beijing:0
+z:beijingbeijing:0
+x:welcome to :0
+y:welcome to beijing:0
+x:welcome to :0
+y:welcome to beijing:0
diff --git a/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_plsql.out b/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_plsql.out
index 4e085426046..88f2cfbf1cb 100644
--- a/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_plsql.out
+++ b/src/interfaces/libpq/ivytest/expected/testlibpq_prepare_plsql.out
@@ -1,10 +1,10 @@
 x:25:0
 y:125:0
-z:this is a test:0
+z:this is a test ok:0
 f:23:0
 m:345:0
 x:25:0
 y:125:0
-z:this is a test:0
+z:this is a test ok:0
 f:23:0
 m:345:0
diff --git a/src/interfaces/libpq/ivytest/expected/testlibpqstmt2_call.out b/src/interfaces/libpq/ivytest/expected/testlibpqstmt2_call.out
new file mode 100644
index 00000000000..d34e4e092f9
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/expected/testlibpqstmt2_call.out
@@ -0,0 +1,2 @@
+out parameter:plsql function name1,plsql function name2,23
+return value:xiexie
diff --git a/src/interfaces/libpq/ivytest/regression.txt b/src/interfaces/libpq/ivytest/regression.txt
index 07374cf35e8..4c49df3933a 100644
--- a/src/interfaces/libpq/ivytest/regression.txt
+++ b/src/interfaces/libpq/ivytest/regression.txt
@@ -1,7 +1,9 @@
 testlibpq
 testlibpqstmt2
+testlibpqstmt2_call
 testlibpq_nullstmt
 testlibpq_allout
+testlibpq_call
 testlibpq_prepare_plsql
 testlibpq_prepare_dml
 testlibpq_binary_double
diff --git a/src/interfaces/libpq/ivytest/testlibpq.c b/src/interfaces/libpq/ivytest/testlibpq.c
index 6bd388acdfd..ec966eee6b1 100644
--- a/src/interfaces/libpq/ivytest/testlibpq.c
+++ b/src/interfaces/libpq/ivytest/testlibpq.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq.c
  *
@@ -46,10 +46,10 @@ char name2_out[256];
 int name3_out;
 int indp[3];
 
-char prestmt3_integer[256];
-char prestmt3_name3[256];
+int prestmt3_integer=0;
+int prestmt3_name3=0;
 char prestmt3_name32[256];
-char prestmt3_name33[256];
+int prestmt3_name33=0;
 int prestmt3_indp[4];
 
 
@@ -75,7 +75,7 @@ const char *anonymous_paramete_str =
 "       id := :1;"
 "       :1 := id * 2 + 1;"
 "       :2 := :1 + 100;"
-"       :3 := ''this is a test ok'';"
+"       :3 := 'this is a test ok';"
 "       :4 := 23;"
 "       end;";
 
@@ -271,12 +271,11 @@ run_thread(int flag)
 	}
 
 	/* bind prestmt3 */
-	memset(prestmt3_integer,0x00,256);
 	if (IvybindOutParameterByPos(thread_data.stmt3,
 					&prestmt3_bindinfo[0],
 					1,
-					(void *) prestmt3_integer,
-					256,
+					(void *) &prestmt3_integer,
+					sizeof(int),
 					&prestmt3_indp[0],
 					1,
 					errmsg,
@@ -286,12 +285,11 @@ run_thread(int flag)
 		return;
 	}
 
-	memset(prestmt3_name3,0x00,256);
 	if (IvybindOutParameterByPos(thread_data.stmt3,
 					&prestmt3_bindinfo[1],
 					2,
-					(void *) prestmt3_name3,
-					256,
+					(void *) &prestmt3_name3,
+					sizeof(int),
 					&prestmt3_indp[1],
 					1,
 					errmsg,
@@ -316,12 +314,11 @@ run_thread(int flag)
 		return;
 	}
 
-	memset(prestmt3_name33, 0x00,256);
 	if (IvybindOutParameterByPos(thread_data.stmt3,
 					&prestmt3_bindinfo[3],
 					4,
-					(void *) prestmt3_name33,
-					256,
+					(void *) &prestmt3_name33,
+					sizeof(int),
 					&prestmt3_indp[3],
 					1,
 					errmsg,
@@ -350,7 +347,7 @@ run_thread(int flag)
 	}
 
 	printf("plsql_function_out: %s,%s,%d\n", name2_out, name_out,ntohl(name3_out));
-	printf("anonymous: %s,%s,%s,%s\n", prestmt3_integer, prestmt3_name3, prestmt3_name32,prestmt3_name33);
+	printf("anonymous: %d,%d,%s,%d\n", prestmt3_integer, prestmt3_name3, prestmt3_name32,prestmt3_name33);
 
 	return;
 }
@@ -366,7 +363,7 @@ run_execPrepared(Ivyconn *tconn, int flag)
 	argmodes1[2] = argmode_out;
 	argmodes1[3] = argmode_out;
 
-	argmodes3[0] = argmodes3[1] = argmodes3[2] = argmode_inout;
+	argmodes3[0] = argmodes3[1] = argmodes3[2] = argmodes3[3] = argmode_inout;
 
 	run_stmt(tconn, thread_data.stmt1, argmodes1);
 	run_stmt(tconn, thread_data.stmt3, argmodes3);
diff --git a/src/interfaces/libpq/ivytest/testlibpq_allout.c b/src/interfaces/libpq/ivytest/testlibpq_allout.c
index 0794027c023..0f4167aae03 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_allout.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_allout.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_allout.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_binary_double.c b/src/interfaces/libpq/ivytest/testlibpq_binary_double.c
index c085a9eb126..bf7274a28e3 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_binary_double.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_binary_double.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_binary_double.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_binary_float.c b/src/interfaces/libpq/ivytest/testlibpq_binary_float.c
index 8cf1082183e..69a0e400626 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_binary_float.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_binary_float.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_binary_float.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_call.c b/src/interfaces/libpq/ivytest/testlibpq_call.c
new file mode 100644
index 00000000000..d2757b6ead2
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/testlibpq_call.c
@@ -0,0 +1,225 @@
+/*
+ * testlibpq_call.c
+ * Test the C version of LIBPQ, the POSTGRES frontend library.
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "libpq-fe.h"
+#include "libpq-ivy.h"
+#include <string.h>
+#include <stdint.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+
+char *function_str = "create or replace function call_f_test(a varchar2, b out varchar2) return varchar2 is "
+" begin"
+"    b := 'beijing';"
+"    return a||b;"
+"end;";
+
+char *procedure_str = "create or replace procedure call_p_test(a varchar2, b out varchar2) is "
+" begin"
+"    b := a||'beijing';"
+"end;";
+
+static void
+exit_nicely(Ivyconn *conn)
+{
+	Ivyfinish(conn);
+	exit(EXIT_SUCCESS);
+}
+
+static void
+exec_prepare_func(Ivyconn *conn)
+{
+	int   result_format = 0;
+	Ivyresult   *res;
+	const char *stmt_name = "test_callstmt1";
+	const char *stmt = "call call_f_test(:x, :y) into :z";
+	Oid param_types[3];
+	IvyPreparedStatement *stmthandle;
+	const char* x = "welcome to ";
+	const char* y = "out1";
+	const char* z = "out2";
+	const char* param_values[3];
+	int param_lengths[3];
+	int param_formats[3];
+	char errmsg[256];
+	IvyBindOutInfo *bindinfo[2] = {NULL, NULL};
+	char bindvar1[256];
+	char bindvar2[256];
+	int index[2];
+	Ivyargmode modes[3];
+
+	memset(bindvar1, 0x00, 256);
+	memset(bindvar2, 0x00, 256);
+
+	param_types[0] = 9503 | 0x20000000  /* in */;
+	param_types[1] = 9503 | 0x40000000  /* out */;
+	param_types[2] = 9503 | 0x40000000  /* out */;
+	stmthandle = IvyCreatePreparedStatement(stmt_name, stmt, 3, param_types);
+	IvybindOutParameterByPos(stmthandle,
+							&bindinfo[0],
+							2,
+							bindvar1,
+							256,
+							&index[0],
+							1,
+							errmsg,
+							256);
+	IvybindOutParameterByPos(stmthandle,
+							&bindinfo[1],
+							3,
+							bindvar2,
+							256,
+							&index[1],
+							1,
+							errmsg,
+							256);
+	param_values[0] = x;
+	param_values[1] = y;
+	param_values[2] = z;
+
+	param_lengths[0] = strlen(x);
+	param_lengths[1] = strlen(y);
+	param_lengths[2] = strlen(z);
+
+	param_formats[0] = 0;
+	param_formats[1] = 0;
+	param_formats[2] = 0;
+
+	modes[0] = argmode_in;
+	modes[1] = modes[2] = argmode_out;
+
+	res = IvyexecPreparedStatement(conn, stmthandle, 3, param_values, param_lengths,
+									param_formats, modes, result_format, errmsg, 256);
+	if (IvyresultStatus(res) != PGRES_TUPLES_OK && IvyresultStatus(res) != PGRES_COMMAND_OK &&
+		IvyresultStatus(res) != PGRES_EMPTY_QUERY)
+	{
+		fprintf(stderr, "PQexecPrepared statement didn't return tuples properly\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+
+	printf("%s,%s\n",bindvar1,bindvar2);
+	printf("%d,%d\n",index[0],index[1]);
+	Ivyclear(res);
+	IvyFreePreparedStatement(stmthandle);
+	return;
+}
+
+static void
+exec_prepare_proc(Ivyconn *conn)
+{
+	int   result_format = 0;
+	Ivyresult   *res;
+	const char *stmt_name = "test_callstmt2";
+	const char *stmt = "call call_p_test(:x, :y)";
+	Oid param_types[2];
+	IvyPreparedStatement *stmthandle;
+	const char* x = "welcome to ";
+	const char* y = "out";
+	const char* param_values[2];
+	int param_lengths[2];
+	int param_formats[2];
+	char errmsg[256];
+	IvyBindOutInfo *bindinfo[1] = {NULL};
+	char bindvar[256];
+	int index[1];
+	Ivyargmode modes[2];
+
+	memset(bindvar, 0x00, 256);
+	param_types[0] = 9503 | 0x20000000  /* in */;
+	param_types[1] = 9503 | 0x40000000  /* out */;
+	stmthandle = IvyCreatePreparedStatement(stmt_name, stmt, 2, param_types);
+	IvybindOutParameterByPos(stmthandle,
+							&bindinfo[0],
+							2,
+							bindvar,
+							256,
+							&index[0],
+							1,
+							errmsg,
+							256);
+	param_values[0] = x;
+	param_values[1] = y;
+
+	param_lengths[0] = strlen(x);
+	param_lengths[1] = strlen(y);
+
+	param_formats[0] = 0;
+	param_formats[1] = 0;
+
+	modes[0] = argmode_in;
+	modes[1] = argmode_out;
+
+	res = IvyexecPreparedStatement(conn, stmthandle, 2, param_values, param_lengths,
+									param_formats, modes, result_format, errmsg, 256);
+	if (IvyresultStatus(res) != PGRES_TUPLES_OK && IvyresultStatus(res) != PGRES_COMMAND_OK &&
+		IvyresultStatus(res) != PGRES_EMPTY_QUERY)
+	{
+		fprintf(stderr, "PQexecPrepared statement didn't return tuples properly\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+
+	printf("%s\n",bindvar);
+	printf("%d\n",index[0]);
+	Ivyclear(res);
+	IvyFreePreparedStatement(stmthandle);
+	return;
+}
+
+int
+main(int argc, char **argv)
+{
+	Ivyconn    *conn;
+	Ivyresult   *res;
+	char conninfo[100]="user=system dbname=postgres port=1521";
+	//const char *oraport = argv[1];
+
+	//strcat(conninfo, oraport);
+
+	/* make a connection to the database */
+	conn = Ivyconnectdb(conninfo);
+
+	/* check to see that the backend connection was successfully made */
+	if (Ivystatus(conn) == CONNECTION_BAD)
+	{
+		fprintf(stderr, "Connection to database failed.\n");
+		fprintf(stderr, "%s", IvyerrorMessage(conn));
+		exit_nicely(conn);
+	}
+	res = Ivyexec(conn,function_str);
+	Ivyclear(res);
+	res = Ivyexec(conn,procedure_str);
+	Ivyclear(res);
+
+	/* start a transaction block */
+	res = Ivyexec(conn, "BEGIN");
+
+	if (IvyresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "BEGIN command failed\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+	Ivyclear(res);
+
+	exec_prepare_func(conn);
+	exec_prepare_proc(conn);
+	/* end the transaction */
+	res = Ivyexec(conn, "END");
+	Ivyclear(res);
+
+	res = Ivyexec(conn, "drop function call_f_test(a varchar2, b out varchar2);");
+	Ivyclear(res);
+	res = Ivyexec(conn, "drop procedure call_p_test(a varchar2, b out varchar2);");
+	Ivyclear(res);
+
+	Ivyfinish(conn);
+	return 0;
+}
+
diff --git a/src/interfaces/libpq/ivytest/testlibpq_interval.c b/src/interfaces/libpq/ivytest/testlibpq_interval.c
index 03c60fdd641..1a313a6e327 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_interval.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_interval.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_interval.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_nullstmt.c b/src/interfaces/libpq/ivytest/testlibpq_nullstmt.c
index 3b2b5c307ce..6d7cd18a194 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_nullstmt.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_nullstmt.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_nullstmt.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_number.c b/src/interfaces/libpq/ivytest/testlibpq_number.c
index fa162a14db9..6a692496531 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_number.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_number.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_number.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_prepare_call.c b/src/interfaces/libpq/ivytest/testlibpq_prepare_call.c
new file mode 100644
index 00000000000..9c3fa8ac988
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/testlibpq_prepare_call.c
@@ -0,0 +1,340 @@
+/*
+ * testlibpq_prepare_call.c
+ * Test the C version of LIBPQ, the POSTGRES frontend library.
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "libpq-fe.h"
+#include "libpq-ivy.h"
+#include <string.h>
+#include <stdint.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+
+char *function_str1 = "create or replace function call_f_test(a varchar2, b out varchar2) return varchar2 is "
+" begin"
+"    b := a;"
+"    return a||b;"
+"end;";
+
+char *procedure_str1 = "create or replace procedure call_p_test(a varchar2, b out varchar2) is "
+" begin"
+"    b := a || 'beijing';"
+"end;";
+
+const char *call_function_str = "call call_f_test(:x, :y) into :z";
+const char *call_procedure_str = "call call_p_test(:x, :y)";
+
+static void
+exit_nicely(Ivyconn *conn)
+{
+	Ivyfinish(conn);
+	exit(EXIT_SUCCESS);
+}
+
+static void
+exec_prepare_func(Ivyconn *conn, int byname)
+{
+	Ivyresult   *res;
+	IvyPreparedStatement *stmthandle = NULL;
+	IvyError *errhp = NULL;
+	char	x[256] = "beijing";
+	char	y[256] = "welcome to beijing";
+	char	z[256] = "welcome to IvorySQL";
+	IvyBindInfo *bindinfo[3] = {NULL, NULL, NULL};
+	int index[3] = {0,0,0};
+
+	if (!IvyHandleAlloc(NULL, (void **) &stmthandle,IVY_HANDLE_STMT,4, NULL))
+	{
+		fprintf(stderr, "IvyHandleAlloc prepared stmt failed\n");
+		exit_nicely(conn);
+	}
+
+	if (!IvyHandleAlloc(NULL, (void **) &errhp, IVY_HANDLE_ERROR, 4, NULL))
+	{
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		fprintf(stderr, "IvyHandleAlloc Error handle failed\n");
+		exit_nicely(conn);
+	}
+
+	if (!IvyStmtPrepare(stmthandle, errhp, call_function_str, strlen(call_function_str), 0, 0))
+	{
+		fprintf(stderr, "%s\n", errhp->error_msg);
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		exit_nicely(conn);
+	}
+	if (byname)
+	{
+		IvyBindByName(stmthandle,
+					&bindinfo[0],
+					errhp,
+					":x",
+					strlen(":x"),
+					x,
+					256,
+					9503 | 0x20000000  /* in */,
+					&index[0],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByName(stmthandle,
+					&bindinfo[1],
+					errhp,
+					":y",
+					strlen(":y"),
+					y,
+					256,
+					9503 | 0x40000000  /* out */,
+					&index[1],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByName(stmthandle,
+					&bindinfo[2],
+					errhp,
+					":z",
+					strlen(":z"),
+					z,
+					256,
+					9503 | 0x40000000  /* out */,
+					&index[2],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+	}
+	else
+	{
+		IvyBindByPos(stmthandle,
+					&bindinfo[0],
+					errhp,
+					1,
+					x,
+					256,
+					9503  | 0x20000000  /* in */,
+					&index[0],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByPos(stmthandle,
+					&bindinfo[1],
+					errhp,
+					2,
+					y,
+					256,
+					9503  | 0x40000000  /* out */,
+					&index[1],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByPos(stmthandle,
+					&bindinfo[2],
+					errhp,
+					3,
+					z,
+					256,
+					9503  | 0x40000000  /* out */,
+					&index[2],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+	}
+
+	res = IvyStmtExecute(conn, stmthandle, errhp);
+	if (IvyresultStatus(res) != PGRES_TUPLES_OK && IvyresultStatus(res) != PGRES_COMMAND_OK &&
+		IvyresultStatus(res) != PGRES_EMPTY_QUERY)
+	{
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		fprintf(stderr, "PQexecPrepared statement didn't return tuples properly\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+
+	Ivyclear(res);
+	IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+	IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+
+	printf("x:%s:%d\n", x, index[0]);
+	printf("y:%s:%d\n", y, index[1]);
+	printf("z:%s:%d\n", z, index[2]);
+
+	return;
+}
+
+static void
+exec_prepare_proc(Ivyconn *conn, int byname)
+{
+	Ivyresult   *res;
+	IvyPreparedStatement *stmthandle = NULL;
+	IvyError *errhp = NULL;
+	char	x[256] = "welcome to ";
+	char	y[256] = "welcome to IvorySQL";
+	IvyBindInfo *bindinfo[2] = {NULL, NULL};
+	int index[2] = {0,0};
+
+	if (!IvyHandleAlloc(NULL, (void **) &stmthandle,IVY_HANDLE_STMT,4, NULL))
+	{
+		fprintf(stderr, "IvyHandleAlloc prepared stmt failed\n");
+		exit_nicely(conn);
+	}
+
+	if (!IvyHandleAlloc(NULL, (void **) &errhp, IVY_HANDLE_ERROR, 4, NULL))
+	{
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		fprintf(stderr, "IvyHandleAlloc Error handle failed\n");
+		exit_nicely(conn);
+	}
+
+	if (!IvyStmtPrepare(stmthandle, errhp, call_procedure_str, strlen(call_procedure_str), 0, 0))
+	{
+		fprintf(stderr, "%s\n", errhp->error_msg);
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		exit_nicely(conn);
+	}
+	if (byname)
+	{
+		IvyBindByName(stmthandle,
+					&bindinfo[0],
+					errhp,
+					":x",
+					strlen(":x"),
+					x,
+					256,
+					9503 | 0x20000000  /* in */,
+					&index[0],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByName(stmthandle,
+					&bindinfo[1],
+					errhp,
+					":y",
+					strlen(":y"),
+					y,
+					256,
+					9503 | 0x40000000  /* out */,
+					&index[1],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+	}
+	else
+	{
+		IvyBindByPos(stmthandle,
+					&bindinfo[0],
+					errhp,
+					1,
+					x,
+					256,
+					9503  | 0x20000000  /* in */,
+					&index[0],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+		IvyBindByPos(stmthandle,
+					&bindinfo[1],
+					errhp,
+					2,
+					y,
+					256,
+					9503  | 0x40000000  /* out */,
+					&index[1],
+					NULL,
+					NULL,
+					256,
+					NULL,
+					0);
+	}
+
+	res = IvyStmtExecute(conn, stmthandle, errhp);
+	if (IvyresultStatus(res) != PGRES_TUPLES_OK && IvyresultStatus(res) != PGRES_COMMAND_OK &&
+		IvyresultStatus(res) != PGRES_EMPTY_QUERY)
+	{
+		IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+		IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+		fprintf(stderr, "PQexecPrepared statement didn't return tuples properly\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+
+	Ivyclear(res);
+	IvyFreeHandle(stmthandle, IVY_HANDLE_STMT);
+	IvyFreeHandle(errhp, IVY_HANDLE_ERROR);
+
+	printf("x:%s:%d\n", x, index[0]);
+	printf("y:%s:%d\n", y, index[1]);
+
+	return;
+}
+
+int
+main(int argc, char **argv)
+{
+	Ivyconn    *conn;
+	Ivyresult   *res;
+	char conninfo[100]="user=system dbname=postgres port=1521";
+	//const char *oraport = argv[1];
+
+	//strcat(conninfo, oraport);
+
+	/* make a connection to the database */
+	conn = Ivyconnectdb(conninfo);
+
+	/* check to see that the backend connection was successfully made */
+	if (Ivystatus(conn) == CONNECTION_BAD)
+	{
+		fprintf(stderr, "Connection to database failed.\n");
+		fprintf(stderr, "%s", IvyerrorMessage(conn));
+		exit_nicely(conn);
+	}
+
+	res = Ivyexec(conn, function_str1);
+	Ivyclear(res);
+	res = Ivyexec(conn, procedure_str1);
+	Ivyclear(res);
+
+	/* start a transaction block */
+	res = Ivyexec(conn, "BEGIN");
+
+	if (IvyresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "BEGIN command failed\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+	Ivyclear(res);
+
+	exec_prepare_func(conn, 1);
+	exec_prepare_func(conn, 0);
+	exec_prepare_proc(conn, 1);
+	exec_prepare_proc(conn, 0);
+	/* end the transaction */
+	res = Ivyexec(conn, "END");
+	Ivyclear(res);
+
+	Ivyfinish(conn);
+	return 0;
+}
+
diff --git a/src/interfaces/libpq/ivytest/testlibpq_prepare_dml.c b/src/interfaces/libpq/ivytest/testlibpq_prepare_dml.c
index 7723bedfec8..e6722e6834e 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_prepare_dml.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_prepare_dml.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_prepare_dml.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpq_prepare_plsql.c b/src/interfaces/libpq/ivytest/testlibpq_prepare_plsql.c
index 2c9249fc407..63091ef0b6a 100644
--- a/src/interfaces/libpq/ivytest/testlibpq_prepare_plsql.c
+++ b/src/interfaces/libpq/ivytest/testlibpq_prepare_plsql.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpq_prepare_plsql.c
  *
@@ -32,7 +32,7 @@ const char *anonymous_paramete_str =
 "		id1 := :m;"
 "       :x := id * 2 + 1;"
 "       :y := :x + 100;"
-"       :z := ''this is a test'';"
+"       :z := 'this is a test ok';"
 "       :f := 23;"
 " end;";
 
diff --git a/src/interfaces/libpq/ivytest/testlibpqstmt2.c b/src/interfaces/libpq/ivytest/testlibpqstmt2.c
index d67ce9e54bd..9b894b349d6 100644
--- a/src/interfaces/libpq/ivytest/testlibpqstmt2.c
+++ b/src/interfaces/libpq/ivytest/testlibpqstmt2.c
@@ -4,7 +4,7 @@
  *
  * Test the C version of LIBPQ, the POSTGRES frontend library.  
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/ivytest/testlibpqstmt2.c
  *
diff --git a/src/interfaces/libpq/ivytest/testlibpqstmt2_call.c b/src/interfaces/libpq/ivytest/testlibpqstmt2_call.c
new file mode 100644
index 00000000000..34933a89a56
--- /dev/null
+++ b/src/interfaces/libpq/ivytest/testlibpqstmt2_call.c
@@ -0,0 +1,215 @@
+/*
+ * testlibpqstmt2_call.c
+ * Test the C version of LIBPQ, the POSTGRES frontend library.
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "libpq-fe.h"
+#ifdef WIN32
+#include<Winsock.h>
+#include<Windows.h>
+#pragma   comment   (lib,"Ws2_32.lib")
+#else
+#include <unistd.h>
+#include <arpa/inet.h>
+#endif
+#include "libpq-ivy.h"
+#include <string.h>
+
+const char *plsql_function_out = "create or replace function plsql_function_out(id integer, name1 out varchar,name2 out varchar, id2 out integer) return varchar as "
+"declare"
+"   id1 integer;"
+"begin"
+"   id1 := id;"
+"   name1 := 'plsql function name1';"
+"   name2 := 'plsql function name2';"
+"   id2 := 23;"
+"   return 'xiexie';"
+"end;";
+
+static void run_stmt(Ivyconn *tconn,IvyPreparedStatement *stmt, IvyBindOutInfo *bindinfos);
+static void
+exit_nicely(Ivyconn *conn)
+{
+	Ivyfinish(conn);
+	exit(EXIT_SUCCESS);
+}
+
+static void
+drop_data(Ivyconn *conn)
+{
+	Ivyresult *res;
+
+	/* drop function */
+	res = Ivyexec(conn, "drop function plsql_function_out(integer,varchar,varchar,integer);");
+	if (IvyresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "Ivyexec failed\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+	Ivyclear(res);
+	return;
+}
+static void
+init_data(Ivyconn *conn)
+{
+	Ivyresult *res;
+	/* create plsql function */
+	res = Ivyexec(conn, plsql_function_out);
+	if (IvyresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "Ivyexec failed\n");
+		Ivyclear(res);
+		exit_nicely(conn);
+	}
+	Ivyclear(res);
+	return;
+}
+
+static IvyPreparedStatement *
+init_statement()
+{
+	IvyPreparedStatement *prestmt1;
+	const char *stmt1_name = "test1_stmt";
+	const char *stmt1 = "call plsql_function_out(:arg1, :arg2, :arg3, :arg4) into :hostvar";
+	Oid param_types[5];
+
+	param_types[0] = 23 | 0x20000000  /* in */;
+	param_types[1] = 9503 | 0x40000000  /* out */;
+	param_types[2] = 9503 | 0x40000000  /* out */;
+	param_types[3] = 23 | 0x40000000  /* out */;
+	param_types[4] = 9503 | 0x40000000  /* out */;
+	prestmt1 = IvyCreatePreparedStatement(stmt1_name, stmt1, 5, param_types);
+	return prestmt1;
+}
+
+int
+main(int argc, char **argv)
+{
+	char first_parameter[256];
+	char second_parameter[256];
+	int  third_parameter;
+	char four_parameter[256];
+
+	/* Step1: making connection */
+	Ivyconn    *conn1;
+	IvyPreparedStatement *stmt1;
+	IvyBindOutInfo bindinfos[4];
+
+	char conninfo[100]="user=system dbname=postgres port=1521";
+	//const char *oraport = argv[1];
+
+	//strcat(conninfo, oraport);
+
+	/* make a connection to the database */
+	conn1 = Ivyconnectdb(conninfo);
+
+	/* check to see that the backend connection was successfully made */
+	if (Ivystatus(conn1) == CONNECTION_BAD)
+	{
+		fprintf(stderr, "Connection to database failed.\n");
+		fprintf(stderr, "%s", IvyerrorMessage(conn1));
+		exit_nicely(conn1);
+	}
+
+	init_data(conn1);
+	stmt1 = init_statement();
+
+	/* init bindinfos */
+	/* first out parameter */
+	bindinfos[0].next = &bindinfos[1];
+	bindinfos[0].position = 2;
+	bindinfos[0].resultcolumnno = 0;
+	bindinfos[0].var = first_parameter;
+	bindinfos[0].indp = NULL;
+	bindinfos[0].val_size = 256;
+
+	/* second out parameter */
+	bindinfos[1].next = &bindinfos[2];
+	bindinfos[1].position = 3;
+	bindinfos[1].resultcolumnno = 1;
+	bindinfos[1].var = second_parameter;
+	bindinfos[1].indp = NULL;
+	bindinfos[1].val_size = 256;
+
+	/* third out parameter */
+	bindinfos[2].next = &bindinfos[3];;
+	bindinfos[2].position = 4;
+	bindinfos[2].resultcolumnno = 2;
+	bindinfos[2].var = &third_parameter;
+	bindinfos[2].indp = NULL;
+	bindinfos[2].val_size = sizeof(int);
+
+	/* four out parameter */
+	bindinfos[3].next = NULL;
+	bindinfos[3].position = 5;
+	bindinfos[3].resultcolumnno = 3;
+	bindinfos[3].var = four_parameter;
+	bindinfos[3].indp = NULL;
+	bindinfos[3].val_size = 256;
+
+	memset(first_parameter,0x00,256);
+	memset(second_parameter,0x00,256);
+	memset(four_parameter,0x00,256);
+	run_stmt(conn1,stmt1, bindinfos);
+
+	/*printf out parameters */
+	printf("out parameter:%s,%s,%d\n", first_parameter,second_parameter,third_parameter);
+	printf("return value:%s\n", four_parameter);
+	drop_data(conn1);
+	/* close the connection to the database and cleanup */
+	IvyFreePreparedStatement(stmt1);
+	Ivyfinish(conn1);
+	return 0;
+}
+
+static void
+run_stmt(Ivyconn *tconn,IvyPreparedStatement *stmt, IvyBindOutInfo *bindinfos)
+{
+	Ivyresult *res;
+	Ivyargmode argmodes[5];
+	int param_lengths[5];
+	int param_formats[5];
+	char errmsg[256];
+
+	const char* custid = "3";
+	const char* salary = "2000";
+	const char* name = "welcome to beijing";
+	const char* out_id2 = "2";
+	const char* ret = "return";
+
+	const char* param_values[5];
+	param_values[0] = custid;
+	param_values[1] = salary;
+	param_values[2] = name;
+	param_values[3] = out_id2;
+	param_values[4] = ret;
+
+	param_lengths[0] = 1;
+	param_lengths[1] = strlen(salary);
+	param_lengths[2] = strlen(name);
+	param_lengths[3] = 1;
+	param_lengths[4] = strlen(ret);
+
+	param_formats[0] = 0;
+	param_formats[1] = 0;
+	param_formats[2] = 0;
+	param_formats[3] = 0;
+	param_formats[4] = 0;
+
+	argmodes[0] = argmode_in;
+	argmodes[1] = argmode_out;
+	argmodes[2] = argmode_out;
+	argmodes[3] = argmode_out;
+	argmodes[4] = argmode_out;
+
+	res = IvyexecPreparedStatement2(tconn, stmt, 5, param_values, param_lengths,
+									param_formats, argmodes,
+									bindinfos, 1, errmsg, 256);
+
+	Ivyclear(res);
+	return;
+}
+
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 882afd90d94..b44852718d4 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -242,9 +242,6 @@ typedef struct pgNotify
 	struct pgNotify *next;		/* list link */
 } PGnotify;
 
-/* deprecated name for int64_t */
-typedef int64_t pg_int64;
-
 /* pg_usec_time_t is like time_t, but with microsecond resolution */
 typedef int64_t pg_usec_time_t;
 
@@ -413,7 +410,6 @@ extern int	PQrequestCancel(PGconn *conn);
 
 /* Accessor functions for PGconn objects */
 extern char *PQdb(const PGconn *conn);
-extern char *PQservice(const PGconn *conn);
 extern char *PQuser(const PGconn *conn);
 extern char *PQpass(const PGconn *conn);
 extern char *PQhost(const PGconn *conn);
@@ -755,11 +751,15 @@ typedef struct _PGpromptOAuthDevice
 	int			expires_in;		/* seconds until user code expires */
 } PGpromptOAuthDevice;
 
-/* for PGoauthBearerRequest.async() */
+/*
+ * For PGoauthBearerRequest.async(). This macro just allows clients to avoid
+ * depending on libpq-int.h or Winsock for the "socket" type; it's undefined
+ * immediately below.
+ */
 #ifdef _WIN32
-#define SOCKTYPE uintptr_t		/* avoids depending on winsock2.h for SOCKET */
+#define PQ_SOCKTYPE uintptr_t	/* avoids depending on winsock2.h for SOCKET */
 #else
-#define SOCKTYPE int
+#define PQ_SOCKTYPE int
 #endif
 
 typedef struct PGoauthBearerRequest
@@ -785,10 +785,13 @@ typedef struct PGoauthBearerRequest
 	 * blocking during the original call to the PQAUTHDATA_OAUTH_BEARER_TOKEN
 	 * hook, it may be returned directly, but one of request->async or
 	 * request->token must be set by the hook.
+	 *
+	 * The (PQ_SOCKTYPE *) in the signature is a placeholder for the platform's
+	 * native socket type: (SOCKET *) on Windows, and (int *) everywhere else.
 	 */
 	PostgresPollingStatusType (*async) (PGconn *conn,
 										struct PGoauthBearerRequest *request,
-										SOCKTYPE * altsock);
+										PQ_SOCKTYPE * altsock);
 
 	/*
 	 * Callback to clean up custom allocations. A hook implementation may use
@@ -815,7 +818,7 @@ typedef struct PGoauthBearerRequest
 	void	   *user;
 } PGoauthBearerRequest;
 
-#undef SOCKTYPE
+#undef PQ_SOCKTYPE
 
 extern char *PQencryptPassword(const char *passwd, const char *user);
 extern char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm);
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index f9ccc9fd4d8..c969e137825 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -11,7 +11,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/libpq-int.h
  *
@@ -358,7 +358,8 @@ typedef struct pg_conn_host
 	pg_conn_host_type type;		/* type of host address */
 	char	   *host;			/* host name or socket path */
 	char	   *hostaddr;		/* host numeric IP address */
-	char	   *port;			/* port number (always provided) */
+	char	   *port;			/* port number (if NULL or empty, use
+								 * DEF_PGPORT[_STR]) */
 	char	   *password;		/* password for this host, read from the
 								 * password file; NULL if not sought or not
 								 * found in password file. */
@@ -563,7 +564,16 @@ struct pg_conn
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-	/* Buffer for data received from backend and not yet processed */
+	/*
+	 * Buffer for data received from backend and not yet processed.
+	 *
+	 * NB: We rely on a maximum inBufSize/outBufSize of INT_MAX (and therefore
+	 * an INT_MAX upper bound on the size of any and all packet contents) to
+	 * avoid overflow; for example in reportErrorPosition(). Changing the type
+	 * would require not only an adjustment to the overflow protection in
+	 * pqCheck{In,Out}BufferSpace(), but also a careful audit of all libpq
+	 * code that uses ints during size calculations.
+	 */
 	char	   *inBuffer;		/* currently allocated buffer */
 	int			inBufSize;		/* allocated size of buffer */
 	int			inStart;		/* offset to first unconsumed data in buffer */
@@ -746,12 +756,15 @@ extern PGresult *pqPrepareAsyncResult(PGconn *conn);
 extern void pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) pg_attribute_printf(2, 3);
 extern void pqSaveMessageField(PGresult *res, char code,
 							   const char *value);
-extern void pqSaveParameterStatus(PGconn *conn, const char *name,
+extern int	pqSaveParameterStatus(PGconn *conn, const char *name,
 								  const char *value);
 extern int	pqRowProcessor(PGconn *conn, const char **errmsgp);
 extern void pqCommandQueueAdvance(PGconn *conn, bool isReadyForQuery,
 								  bool gotSync);
 extern int	PQsendQueryContinue(PGconn *conn, const char *query);
+extern PGresult *PQnfn(PGconn *conn, int fnid, int *result_buf, int buf_size,
+					   int *result_len, int result_is_int,
+					   const PQArgBlock *args, int nargs);
 
 /* === in fe-protocol3.c === */
 
@@ -767,7 +780,8 @@ extern int	pqGetline3(PGconn *conn, char *s, int maxlen);
 extern int	pqGetlineAsync3(PGconn *conn, char *buffer, int bufsize);
 extern int	pqEndcopy3(PGconn *conn);
 extern PGresult *pqFunctionCall3(PGconn *conn, Oid fnid,
-								 int *result_buf, int *actual_result_len,
+								 int *result_buf, int buf_size,
+								 int *actual_result_len,
 								 int result_is_int,
 								 const PQArgBlock *args, int nargs);
 
diff --git a/src/interfaces/libpq/libpq-ivy.h b/src/interfaces/libpq/libpq-ivy.h
index 61bdfa5b98b..baf2af8c5fb 100644
--- a/src/interfaces/libpq/libpq-ivy.h
+++ b/src/interfaces/libpq/libpq-ivy.h
@@ -4,7 +4,7 @@
  * This file contains definitions for structures and
  * externs for functions used by frontend applications.
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * src/interfaces/libpq/libpq-ivy.h
  *
@@ -67,6 +67,7 @@ typedef enum IvyStmtType
 {
 	IVY_STMT_UNKNOW,
 	IVY_STMT_DO,
+	IVY_STMT_DOFROMCALL,
 	IVY_STMT_DOHANDLED,
 	IVY_STMT_OTHERS
 } IvyStmtType;
@@ -145,7 +146,24 @@ typedef enum IVY_HANDLE_TYPE
 	IVY_HANDLE_NO
 } ivy_handle_type;
 
+typedef struct HostVariableEntry
+{
+	char	*name;
+	int		position;
+} HostVariableEntry;
+
+typedef struct HostVariable
+{
+	HostVariableEntry *hostvars;
+	int		length;
+	bool	isdostmt;
+	bool	iscallstmt;
+	char	*convertcall;
+} HostVariable;
+
 extern Ivyconn *Ivyconnectdb(const char *conninfo);
+extern Ivyconn *Ivyconnectdb2(PGconn *conn);
+extern void Ivyfinish2(Ivyconn *conn);
 extern IvyPreparedStatement *IvyCreatePreparedStatement(const char *stmtName,
 								const char *query,
 								int nParams,
@@ -202,6 +220,11 @@ extern Ivyresult *IvyStmtExecute(Ivyconn *tconn,
 					IvyPreparedStatement *stmtHandle,
 					IvyError *errhp);
 
+extern Ivyresult *IvyStmtExecute2(Ivyconn *tconn,
+					  				IvyPreparedStatement *stmtHandle,
+					  				IvyError *errhp,
+					  				HostVariable *host);
+
 extern int IvybindOutParameterByName(IvyPreparedStatement *stmtHandle,
 					IvyBindOutInfo **bindinfo,
 					const char *name,
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build
index a74e885b169..2ce9feb787b 100644
--- a/src/interfaces/libpq/meson.build
+++ b/src/interfaces/libpq/meson.build
@@ -16,6 +16,8 @@ libpq_sources = files(
   'legacy-pqsignal.c',
   'libpq-events.c',
   'pqexpbuffer.c',
+  'ivy-exec.c',
+  'ivy_sema.c',
 )
 libpq_so_sources = [] # for shared lib, in addition to the above
 
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index b87df277d93..3fa87a0aaac 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,6 +1,7 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME     = libpq
 GETTEXT_FILES    = fe-auth.c \
+                   fe-auth-oauth.c \
                    fe-auth-scram.c \
                    fe-cancel.c \
                    fe-connect.c \
@@ -21,6 +22,7 @@ GETTEXT_TRIGGERS = actx_error:2 \
                    libpq_append_error:2 \
                    libpq_gettext \
                    libpq_ngettext:1,2 \
+                   oauth_json_set_error:2 \
                    oauth_parse_set_error:2 \
                    pqInternalNotice:2
 GETTEXT_FLAGS    = actx_error:2:c-format \
@@ -29,5 +31,6 @@ GETTEXT_FLAGS    = actx_error:2:c-format \
                    libpq_gettext:1:pass-c-format \
                    libpq_ngettext:1:pass-c-format \
                    libpq_ngettext:2:pass-c-format \
+                   oauth_json_set_error:2:c-format \
                    oauth_parse_set_error:2:c-format \
                    pqInternalNotice:2:c-format
diff --git a/src/interfaces/libpq/po/de.po b/src/interfaces/libpq/po/de.po
index ca479767fe1..7f3a1bd8172 100644
--- a/src/interfaces/libpq/po/de.po
+++ b/src/interfaces/libpq/po/de.po
@@ -1,5 +1,5 @@
 # German message translation file for libpq
-# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2025.
+# Peter Eisentraut <peter@eisentraut.org>, 2001 - 2026.
 #
 # Use these quotes: »%s«
 #
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-03-07 09:40+0000\n"
-"PO-Revision-Date: 2025-03-07 11:51+0100\n"
+"POT-Creation-Date: 2026-02-04 18:40+0000\n"
+"PO-Revision-Date: 2026-02-06 12:38+0100\n"
 "Last-Translator: Peter Eisentraut <peter@eisentraut.org>\n"
 "Language-Team: German <pgsql-translators@postgresql.org>\n"
 "Language: de\n"
@@ -17,6 +17,394 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
+#, c-format
+msgid "libcurl easy handle removal failed: %s"
+msgstr "libcurl-Easy-Handle-Removal fehlgeschlagen: %s"
+
+#: ../libpq-oauth/oauth-curl.c:328
+#, c-format
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "libcurl-Multi-Handle-Cleanup fehlgeschlagen: %s"
+
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "konnte %s nicht setzen für die OAuth-Verbindung: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "konnte %s nicht ermitteln aus der OAuth-Antwort: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "Feld »%s« muss eine Zeichenkette sein"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "Feld »%s« muss eine Zahl sein"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "Feld »%s« muss ein Array von Zeichenketten sein"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "Feld »%s« hat unerwarteten Typ"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON ist zu tief geschachtelt"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "Feld »%s« ist doppelt vorhanden"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "Element auf oberster Ebene muss ein Objekt sein"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "kein Content-Typ wurde angegeben"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "unerwarteter Content-Typ: »%s«"
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "Antwort enthält Null-Bytes"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "Antwort ist kein gültiges UTF-8"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "Feld »%s« fehlt"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "konnte Token-Fehler-Antwort nicht parsen"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "Provider hat das oauth_client_secret abgelehnt"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "Provider erfordert Client-Authentifizierung, aber kein oauth_client_secret ist gesetzt"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "prüfe Ablauf des Timers: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "konnte libcurl-Multi-Handle nicht erzeugen"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "konnte libcurl-Handle nicht erzeugen"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "Speicher aufgebraucht"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "Antwort ist zu groß"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "Einreihen der HTTP-Anfrage fehlgeschlagen: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "asynchrone HTTP-Anfrage fehlgeschlagen: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "für die abgeschlossene Handle wurde kein Ergebnis abgerufen"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "unerwarteter Antwortcode %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "konnte OpenID-Discovery-Dokument nicht parsen"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "der Issuer-Identifier (%s) stimmt nicht mit oauth_issuer (%s) überein"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "Issuer »%s« stellt keinen Device-Authorization-Endpunkt zur Verfügung"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "Device-Authorization-Endpunkt »%s« muss HTTPS verwenden"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "Token-Endpunkt »%s« muss HTTPS verwenden"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "konnte Device-Authorization nicht parsen"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "konnte Access-Token-Antwort nicht parsen"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "slow_down Intervall-Überlauf"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Besuchen Sie %s und geben Sie den Code ein: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "Device-Prompt fehlgeschlagen"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init zuvor beim OAuth-Setup fehlgeschlagen"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init beim OAuth-Setup fehlgeschlagen"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurl ist nicht mehr thread-safe\n"
+"\tCurl-Initialisierung wurde als thread-safe berichtet, als libpq\n"
+"\tkompiliert wurde, aber die aktuell installierte Version von libcurl\n"
+"\tberichtet, dass sie nicht thread-safe ist. Kompilieren Sie libpq neu\n"
+"\tmit der installierten Version von libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "konnte OpenID-Discovery-Dokument nicht holen"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "kann OAuth-Device-Authorization nicht ausführen"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "konnte Device-Authorization nicht erhalten"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "konnte Access-Token nicht erhalten"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "interner Fehler: für die Verbindung war kein OAuth-Token gesetzt"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "OAuth-Discovery-URI »%s« muss HTTPS verwenden"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "OAuth-Discovery-URI »%s« darf keine Query- oder Fragment-Komponenten enthalten"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "OAuth-Discovery-URI »%s« ist keine ».well-known«-URI"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "OAuth-Discovery-URI »%s« verwendet ein nicht unterstütztes ».well-known«-Suffix"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "OAuth-Discovery-URI »%s« verwendet ein ungültiges Format"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "Fehlermeldung vom Server enthielt Null-Byte und wurde verworfen"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "Fehlerantwort vom Server ist kein gültiges UTF-8"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "konnte Fehlerantwort des Servers nicht parsen: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "Discovery-Dokument des Servers auf %s (Issuer »%s«) ist inkompatibel mit oauth_issuer (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "Discovery-Dokument des Servers wurde nach %s verschoben (vorherige Stelle war %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "Server hat Fehlerantwort ohne Status gesendet"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "Server hat OAuth-Bearer-Token abgelehnt: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "benutzerdefinierter OAuth-Flow hat weder ein Token noch einen asynchronen Callback zur Verfügung gestellt"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "benutzerdefinierter OAuth-Flow fehlgeschlagen"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "benutzerdefinierter OAuth-Flow lieferte kein Token"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "benutzerdefinierter OAuth-Flow hat kein Socket für Polling zur Verfügung gestellt"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "konnte Mutex nicht sperren (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "keine OAuth-Flows sind verfügbar (versuchen Sie, das Paket libpq-oauth zu installieren)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "Server verlangt OAuth-Authentifizierung, aber oauth_issuer und oauth_client_id sind nicht beide gesetzt"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "Server hat unerwartete zusätzliche OAuth-Daten gesendet"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "Server verlangt OAuth-Authentifizierung, aber es wurden keine Discovery-Metadaten zur Verfügung gestellt"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "interner Fehler: OAuth-Flow hat kein Token gesetzt"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "Server hat nach einem Fehler zusätzliche OAuth-Daten gesendet"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "ungültiger Zustand des OAuth-Austauschs"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "Verbindung wird erneut versucht mit neuem Bearer-Token"
+
 #: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
@@ -57,26 +445,6 @@ msgstr "fehlerhafte SCRAM-Nachricht (Zeichen »=« für Attribut »%c« erwartet
 msgid "could not generate nonce"
 msgstr "konnte Nonce nicht erzeugen"
 
-#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
-#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
-#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
-#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
-#: fe-auth.c:1493 fe-cancel.c:159 fe-connect.c:984 fe-connect.c:1024
-#: fe-connect.c:2106 fe-connect.c:2268 fe-connect.c:3667 fe-connect.c:5106
-#: fe-connect.c:5419 fe-connect.c:5674 fe-connect.c:5792 fe-connect.c:6039
-#: fe-connect.c:6119 fe-connect.c:6217 fe-connect.c:6468 fe-connect.c:6495
-#: fe-connect.c:6571 fe-connect.c:6594 fe-connect.c:6618 fe-connect.c:6653
-#: fe-connect.c:6739 fe-connect.c:6747 fe-connect.c:7104 fe-connect.c:7286
-#: fe-exec.c:530 fe-exec.c:1315 fe-exec.c:3254 fe-exec.c:4291 fe-exec.c:4457
-#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:209 fe-protocol3.c:232
-#: fe-protocol3.c:255 fe-protocol3.c:272 fe-protocol3.c:293 fe-protocol3.c:369
-#: fe-protocol3.c:733 fe-protocol3.c:972 fe-protocol3.c:1779
-#: fe-protocol3.c:2180 fe-secure-common.c:110 fe-secure-gssapi.c:496
-#: fe-secure-openssl.c:404 fe-secure-openssl.c:1073
-#, c-format
-msgid "out of memory"
-msgstr "Speicher aufgebraucht"
-
 #: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
@@ -337,704 +705,735 @@ msgstr "Wert von »password_encryption« ist zu lang"
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "unbekannter Passwortverschlüsselungsalgorithmus »%s«"
 
-#: fe-cancel.c:76
+#: fe-cancel.c:79
 #, c-format
 msgid "connection pointer is NULL"
 msgstr "Verbindung ist ein NULL-Zeiger"
 
-#: fe-cancel.c:82 fe-misc.c:587
+#: fe-cancel.c:85 fe-misc.c:613
 #, c-format
 msgid "connection not open"
 msgstr "Verbindung nicht offen"
 
-#: fe-cancel.c:193
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "keine Schlüssel für die Stornierung erhalten"
+
+#: fe-cancel.c:212
 #, c-format
 msgid "cancel request is already being sent on this connection"
 msgstr "Stornierungsanfrage wird auf dieser Verbindung bereits gesendet"
 
-#: fe-cancel.c:263
+#: fe-cancel.c:282
 #, c-format
 msgid "unexpected response from server"
 msgstr "unerwartete Antwort vom Server"
 
-#: fe-connect.c:1281
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "fehlerhafte Angabe: %d Hostnamen und %d hostaddr-Angaben"
 
-#: fe-connect.c:1361
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "fehlerhafte Angabe: %d Portnummern und %d Hosts"
 
-#: fe-connect.c:1489
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "negative require_auth-Methode »%s« kann nicht mit nicht-negativen Methoden vermischt werden"
 
-#: fe-connect.c:1502
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "require_auth-Methode »%s« kann nicht mit negativen Methoden vermischt werden"
 
-#: fe-connect.c:1578 fe-connect.c:1707 fe-connect.c:1749 fe-connect.c:1792
-#: fe-connect.c:1895 fe-connect.c:1941 fe-connect.c:1981 fe-connect.c:2052
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "ungültiger %s-Wert: »%s«"
 
-#: fe-connect.c:1620
+#: fe-connect.c:1648
 #, c-format
 msgid "internal error: no space in allowed_sasl_mechs"
-msgstr ""
+msgstr "interner Fehler: kein Platz in allowed_sasl_mechs"
 
-#: fe-connect.c:1659
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "require_auth-Methode »%s« ist mehrmals angegeben"
 
-#: fe-connect.c:1730 fe-connect.c:1769 fe-connect.c:1801 fe-connect.c:1903
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "%s-Wert »%s« ist ungültig, wenn SSL-Unterstützung nicht einkompiliert worden ist"
 
-#: fe-connect.c:1821
+#: fe-connect.c:1849
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
 msgstr "schwacher sslmode »%s« darf nicht mit sslnegotiation=direct verwendet werden (»require«, »verify-ca« oder »verify-full« verwenden)"
 
-#: fe-connect.c:1843
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "schwacher sslmode »%s« darf nicht mit sslrootcert=system verwendet werden (»verify-full« verwenden)"
 
-#: fe-connect.c:1856 fe-connect.c:1864
+#: fe-connect.c:1884 fe-connect.c:1892
 #, c-format
 msgid "invalid \"%s\" value: \"%s\""
 msgstr "ungültiger »%s«-Wert: »%s«"
 
-#: fe-connect.c:1881
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "ungültiges SSL-Protokollsintervall"
 
-#: fe-connect.c:1918
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s-Wert »%s« wird nicht unterstützt (OpenSSL-Version prüfen)"
 
-#: fe-connect.c:1948
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "gssencmode-Wert »%s« ist ungültig, wenn GSSAPI-Unterstützung nicht einkompiliert worden ist"
 
-#: fe-connect.c:2002
+#: fe-connect.c:2030
 #, c-format
 msgid "invalid SCRAM client key"
 msgstr "ungültiger SCRAM-Client-Schlüssel"
 
-#: fe-connect.c:2008
+#: fe-connect.c:2035
 #, c-format
 msgid "invalid SCRAM client key length: %d"
 msgstr "ungültige SCRAM-Client-Schlüssel-Länge: %d"
 
-#: fe-connect.c:2027
+#: fe-connect.c:2053
 #, c-format
 msgid "invalid SCRAM server key"
 msgstr "ungültiger SCRAM-Server-Schlüssel"
 
-#: fe-connect.c:2033
+#: fe-connect.c:2058
 #, c-format
 msgid "invalid SCRAM server key length: %d"
 msgstr "ungültige SCRAM-Server-Schlüssel-Länge: %d"
 
-#: fe-connect.c:2291
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "»%s« ist größer als »%s«"
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "konnte Socket nicht auf TCP »No Delay«-Modus umstellen: %s"
 
-#: fe-connect.c:2350
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "Verbindung zum Server auf Socket »%s« fehlgeschlagen: "
 
-#: fe-connect.c:2376
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "Verbindung zum Server auf »%s« (%s), Port %s fehlgeschlagen: "
 
-#: fe-connect.c:2381
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "Verbindung zum Server auf »%s«, Port %s fehlgeschlagen: "
 
-#: fe-connect.c:2404
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tLäuft der Server lokal und akzeptiert er Verbindungen auf diesem Socket?"
 
-#: fe-connect.c:2406
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tLäuft der Server auf diesem Host und akzeptiert er TCP/IP-Verbindungen?"
 
-#: fe-connect.c:2452 fe-connect.c:2486 fe-connect.c:2521 fe-connect.c:2619
-#: fe-connect.c:3345
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) fehlgeschlagen: %s"
 
-#: fe-connect.c:2585
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) fehlgeschlagen: Fehlercode %d"
 
-#: fe-connect.c:2897
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "ungültiger Verbindungszustand, möglicherweise ein Speicherproblem"
 
-#: fe-connect.c:2980
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "ungültige Portnummer: »%s«"
 
-#: fe-connect.c:2994
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "konnte Hostnamen »%s« nicht in Adresse übersetzen: %s"
 
-#: fe-connect.c:3006
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "konnte Netzwerkadresse »%s« nicht interpretieren: %s"
 
-#: fe-connect.c:3017
+#: fe-connect.c:3083
 #, 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)"
 
-#: fe-connect.c:3031
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "konnte Unix-Domain-Socket-Pfad »%s« nicht in Adresse übersetzen: %s"
 
-#: fe-connect.c:3197 fe-connect.c:4641
+#: fe-connect.c:3263 fe-connect.c:4710
 #, c-format
 msgid "GSSAPI encryption required but it is not supported over a local socket"
 msgstr "GSSAPI-Verschlüsselung war gefordert aber wird über lokales Socket nicht unterstützt"
 
-#: fe-connect.c:3205 fe-connect.c:4770
+#: fe-connect.c:3271 fe-connect.c:4839
 #, c-format
 msgid "GSSAPI encryption required but no credential cache"
 msgstr "GSSAPI-Verschlüsselung war gefordert aber kein Credential-Cache"
 
-#: fe-connect.c:3273
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "konnte Socket nicht erzeugen: %s"
 
-#: fe-connect.c:3304
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %s"
 
-#: fe-connect.c:3315
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "konnte Socket nicht auf »Close on exec«-Modus umstellen: %s"
 
-#: fe-connect.c:3472
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "konnte Socket-Fehlerstatus nicht ermitteln: %s"
 
-#: fe-connect.c:3499
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "konnte Client-Adresse vom Socket nicht ermitteln: %s"
 
-#: fe-connect.c:3525
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "Parameter »requirepeer« wird auf dieser Plattform nicht unterstützt"
 
-#: fe-connect.c:3527
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %s"
 
-#: fe-connect.c:3540
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeer gibt »%s« an, aber tatsächlicher Benutzername der Gegenstelle ist »%s«"
 
-#: fe-connect.c:3578
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "konnte Paket zur GSSAPI-Verhandlung nicht senden: %s"
 
-#: fe-connect.c:3617
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "konnte Paket zur SSL-Verhandlung nicht senden: %s"
 
-#: fe-connect.c:3649
+#: fe-connect.c:3709
 #, c-format
 msgid "could not send cancel packet: %s"
 msgstr "konnte Cancel-Paket nicht senden: %s"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "konnte Startpaket nicht senden: %s"
 
-#: fe-connect.c:3752
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "Server unterstützt kein SSL, aber SSL wurde verlangt"
 
-#: fe-connect.c:3762
+#: fe-connect.c:3822
 #, c-format
 msgid "server sent an error response during SSL exchange"
 msgstr "Server hat während des SSL-Austauschs eine Fehlermeldung gesendet"
 
-#: fe-connect.c:3767
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "ungültige Antwort auf SSL-Verhandlungspaket empfangen: %c"
 
-#: fe-connect.c:3787
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "unverschlüsselte Daten nach SSL-Antwort empfangen"
 
-#: fe-connect.c:3850
+#: fe-connect.c:3910
 #, c-format
 msgid "server sent an error response during GSS encryption exchange"
 msgstr "Server hat während des GSS-Verschlüsselungsaustauschs eine Fehlermeldung gesendet"
 
-#: fe-connect.c:3868
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "Server unterstützt keine GSSAPI-Verschlüsselung, sie wurde aber verlangt"
 
-#: fe-connect.c:3872
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "ungültige Antwort auf GSSAPI-Verhandlungspaket empfangen: %c"
 
-#: fe-connect.c:3894
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "unverschlüsselte Daten nach GSSAPI-Verschlüsselungsantwort empfangen"
 
-#: fe-connect.c:3955
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "Authentifizierungsanfrage wurde vom Server erwartet, aber %c wurde empfangen"
 
-#: fe-connect.c:3983 fe-connect.c:4106
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "ungültige Authentifizierungsanforderung empfangen"
 
-#: fe-connect.c:3989 fe-connect.c:4091
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "ungültige Protokollverhandlungsnachricht empfangen"
 
-#: fe-connect.c:4008 fe-connect.c:4062
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "ungültige Fehlermeldung empfangen"
 
-#: fe-connect.c:4185
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "doppelte Protokollverhandlungsnachricht empfangen"
+
+#: fe-connect.c:4254
 #, c-format
 msgid "internal error: async authentication has no handler"
-msgstr ""
+msgstr "interner Fehler: async authentication has no handler"
 
-#: fe-connect.c:4210
+#: fe-connect.c:4279
 #, c-format
 msgid "internal error: async cleanup did not release polling socket"
-msgstr ""
+msgstr "interner Fehler: async cleanup did not release polling socket"
 
-#: fe-connect.c:4233
+#: fe-connect.c:4302
 #, c-format
 msgid "internal error: async authentication did not set a socket for polling"
-msgstr ""
+msgstr "interner Fehler: async authentication did not set a socket for polling"
 
-#: fe-connect.c:4266
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "unerwartete Nachricht vom Server beim Start"
 
-#: fe-connect.c:4357
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "Sitzung ist read-only"
 
-#: fe-connect.c:4359
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "Sitzung ist nicht read-only"
 
-#: fe-connect.c:4412
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "Server ist im Hot-Standby-Modus"
 
-#: fe-connect.c:4414
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "Server ist nicht im Hot-Standby-Modus"
 
-#: fe-connect.c:4539 fe-connect.c:4589
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "»%s« fehlgeschlagen"
 
-#: fe-connect.c:4603
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "ungültiger Verbindungszustand %d, möglicherweise ein Speicherproblem"
 
-#: fe-connect.c:5432
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "ungültige LDAP-URL »%s«: Schema muss ldap:// sein"
 
-#: fe-connect.c:5447
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "ungültige LDAP-URL »%s«: Distinguished Name fehlt"
 
-#: fe-connect.c:5459 fe-connect.c:5517
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "ungültige LDAP-URL »%s«: muss genau ein Attribut haben"
 
-#: fe-connect.c:5471 fe-connect.c:5533
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "ungültige LDAP-URL »%s«: Suchbereich fehlt (base/one/sub)"
 
-#: fe-connect.c:5483
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "ungültige LDAP-URL »%s«: kein Filter"
 
-#: fe-connect.c:5505
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "ungültige LDAP-URL »%s«: ungültige Portnummer"
 
-#: fe-connect.c:5542
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "konnte LDAP-Struktur nicht erzeugen"
 
-#: fe-connect.c:5617
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "Suche auf LDAP-Server fehlgeschlagen: %s"
 
-#: fe-connect.c:5627
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "LDAP-Suche ergab mehr als einen Eintrag"
 
-#: fe-connect.c:5629 fe-connect.c:5640
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "kein Eintrag gefunden bei LDAP-Suche"
 
-#: fe-connect.c:5650 fe-connect.c:5662
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "Attribut hat keine Werte bei LDAP-Suche"
 
-#: fe-connect.c:5713 fe-connect.c:5732 fe-connect.c:6256
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "Größe der Verbindungsinfo-Zeichenkette überschreitet erlaubtes Maximum (%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "fehlendes »=« nach »%s« in der Zeichenkette der Verbindungsdaten"
 
-#: fe-connect.c:5803 fe-connect.c:6439 fe-connect.c:7269
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "ungültige Verbindungsoption »%s«"
 
-#: fe-connect.c:5818 fe-connect.c:6304
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "fehlendes schließendes Anführungszeichen (\") in der Zeichenkette der Verbindungsdaten"
 
-#: fe-connect.c:5898
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "Definition von Service »%s« nicht gefunden"
 
-#: fe-connect.c:5924
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "Servicedatei »%s« nicht gefunden"
 
-#: fe-connect.c:5937
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "Zeile %d zu lang in Servicedatei »%s«"
 
-#: fe-connect.c:6008 fe-connect.c:6051
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "Syntaxfehler in Servicedatei »%s«, Zeile %d"
 
-#: fe-connect.c:6019
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "geschachtelte »service«-Definitionen werden nicht unterstützt in Servicedatei »%s«, Zeile %d"
 
-#: fe-connect.c:6758
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "ungültige URI an interne Parserroutine weitergeleitet: »%s«"
 
-#: fe-connect.c:6835
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "Ende der Eingabezeichenkette gefunden beim Suchen nach passendem »]« in IPv6-Hostadresse in URI: »%s«"
 
-#: fe-connect.c:6842
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "IPv6-Hostadresse darf nicht leer sein in URI: »%s«"
 
-#: fe-connect.c:6857
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "unerwartetes Zeichen »%c« an Position %d in URI (»:« oder »/« erwartet): »%s«"
 
-#: fe-connect.c:6986
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "zusätzliches Schlüssel/Wert-Trennzeichen »=« in URI-Query-Parameter: »%s«"
 
-#: fe-connect.c:7006
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "fehlendes Schlüssel/Wert-Trennzeichen »=« in URI-Query-Parameter: »%s«"
 
-#: fe-connect.c:7058
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "ungültiger URI-Query-Parameter: »%s«"
 
-#: fe-connect.c:7142
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "ungültiges Prozent-kodiertes Token: »%s«"
 
-#: fe-connect.c:7152
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "verbotener Wert %%00 in Prozent-kodiertem Wert: »%s«"
 
-#: fe-connect.c:7174
+#: fe-connect.c:7265
 #, c-format
 msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
 msgstr "unerwartete Leerzeichen in »%s« gefunden, verwenden Sie stattdessen Prozent-kodierte Leerzeichen (%%20)"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "Verbindung ist ein NULL-Zeiger\n"
 
-#: fe-connect.c:7564 fe-exec.c:713 fe-exec.c:975 fe-exec.c:3459
-#: fe-protocol3.c:987 fe-protocol3.c:1020
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: fe-connect.c:7866
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "WARNUNG: Passwortdatei »%s« ist keine normale Datei\n"
 
-#: fe-connect.c:7876
+#: fe-connect.c:7961
 #, 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"
 
-#: fe-connect.c:7980
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "Passwort wurde aus Datei »%s« gelesen"
 
-#: fe-connect.c:8146
+#: fe-connect.c:8231
 #, c-format
 msgid "invalid integer value \"%s\" for connection option \"%s\""
 msgstr "ungültiger Zahlenwert »%s« für Verbindungsoption »%s«"
 
-#: fe-exec.c:469 fe-exec.c:3533
+#: fe-exec.c:469 fe-exec.c:3549
 #, 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:531 fe-protocol3.c:1985
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:834
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "Schreiben zum Server fehlgeschlagen"
 
-#: fe-exec.c:874
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "kein Fehlertext verfügbar"
 
-#: fe-exec.c:963
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "HINWEIS"
 
-#: fe-exec.c:1021
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult kann nicht mehr als INT_MAX Tupel enthalten"
 
-#: fe-exec.c:1033
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "Überlauf von size_t"
 
-#: fe-exec.c:1438 fe-exec.c:1507 fe-exec.c:1553
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "Befehlszeichenkette ist ein NULL-Zeiger"
 
-#: fe-exec.c:1444 fe-exec.c:3003
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%s im Pipeline-Modus nicht erlaubt"
 
-#: fe-exec.c:1512 fe-exec.c:1558 fe-exec.c:1652
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "Anzahl der Parameter muss zwischen 0 und %d sein"
 
-#: fe-exec.c:1548 fe-exec.c:1647
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "Anweisungsname ist ein NULL-Zeiger"
 
-#: fe-exec.c:1689 fe-exec.c:3379
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "keine Verbindung mit dem Server"
 
-#: fe-exec.c:1697 fe-exec.c:3387
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "ein anderer Befehl ist bereits in Ausführung"
 
-#: fe-exec.c:1727
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "während COPY können keine Befehle aufgereiht werden"
 
-#: fe-exec.c:1846
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "für binäre Parameter muss eine Länge angegeben werden"
 
-#: fe-exec.c:2205
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "unerwarteter asyncStatus: %d"
 
-#: fe-exec.c:2361
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "synchrone Befehlsausführungsfunktionen sind im Pipeline-Modus nicht erlaubt"
 
-#: fe-exec.c:2378
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY von neuem PQexec beendet"
 
-#: fe-exec.c:2394
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "PQexec ist während COPY BOTH nicht erlaubt"
 
-#: fe-exec.c:2630
+#: fe-exec.c:2646
 #, c-format
 msgid "unrecognized message type \"%c\""
 msgstr "unbekannter Message-Typ »%c«"
 
-#: fe-exec.c:2702 fe-exec.c:2756 fe-exec.c:2824 fe-protocol3.c:1916
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "keine COPY in Ausführung"
 
-#: fe-exec.c:3010
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "Verbindung im falschen Zustand"
 
-#: fe-exec.c:3053
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "kann Pipeline-Modus nicht einschalten, Verbindung ist nicht inaktiv"
 
-#: fe-exec.c:3089 fe-exec.c:3110
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "kann Pipeline-Modus nicht beenden, wegen nicht eingesammelter Ergebnisse"
 
-#: fe-exec.c:3093
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "kann Pipeline-Modus nicht beenden während die Verbindung beschäftigt ist"
 
-#: fe-exec.c:3104
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "kann Pipeline-Modus nicht beenden während COPY aktiv ist"
 
-#: fe-exec.c:3303
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "Pipeline kann nicht gesendet werden, wenn der Pipeline-Modus aus ist"
 
-#: fe-exec.c:3422
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "ungültiger ExecStatusType-Kode"
 
-#: fe-exec.c:3449
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult ist kein Fehlerresultat\n"
 
-#: fe-exec.c:3517 fe-exec.c:3540
+#: fe-exec.c:3533 fe-exec.c:3556
 #, 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:3555
+#: fe-exec.c:3571
 #, 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:3866
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "konnte Ergebnis vom Server nicht interpretieren: %s"
 
-#: fe-exec.c:4140 fe-exec.c:4253
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "unvollständiges Mehrbyte-Zeichen"
 
-#: fe-exec.c:4142 fe-exec.c:4272
+#: fe-exec.c:4159 fe-exec.c:4311
 #, c-format
 msgid "invalid multibyte character"
 msgstr "ungültiges Mehrbytezeichen"
 
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "Größe der escapten Zeichenkette überschreitet erlaubtes Maximum (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "Größe des escapten bytea-Wertes überschreitet erlaubtes Maximum (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "GSSAPI-Namensimportfehler"
@@ -1091,7 +1490,7 @@ msgstr "Integer der Größe %lu wird von pqGetInt nicht unterstützt"
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "Integer der Größe %lu wird von pqPutInt nicht unterstützt"
 
-#: fe-misc.c:765 fe-secure-openssl.c:180 fe-secure-openssl.c:286
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
 #: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
@@ -1103,172 +1502,215 @@ msgstr ""
 "\tDas heißt wahrscheinlich, dass der Server abnormal beendete\n"
 "\tbevor oder während die Anweisung bearbeitet wurde."
 
-#: fe-misc.c:832
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "Verbindung nicht offen\n"
 
-#: fe-misc.c:1020
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "Timeout abgelaufen"
 
-#: fe-misc.c:1072
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "ungültiges Socket"
 
-#: fe-misc.c:1095
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() fehlgeschlagen: %s"
 
-#: fe-protocol3.c:187
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "Nachricht vom Typ 0x%02x kam vom Server im Ruhezustand"
 
-#: fe-protocol3.c:402
+#: fe-protocol3.c:403
 #, 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)"
 
-#: fe-protocol3.c:444
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "unerwartete Antwort vom Server; erstes empfangenes Zeichen war »%c«"
 
-#: fe-protocol3.c:463
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "Nachrichteninhalt stimmt nicht mit Länge in Nachrichtentyp »%c« überein"
 
-#: fe-protocol3.c:481
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "Synchronisation mit Server verloren: Nachrichtentyp »%c« empfangen, Länge %d"
 
-#: fe-protocol3.c:533 fe-protocol3.c:573
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "nicht genug Daten in »T«-Nachricht"
 
-#: fe-protocol3.c:644 fe-protocol3.c:850
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "Speicher für Anfrageergebnis aufgebraucht"
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "nicht genug Daten in »t«-Nachricht"
 
-#: fe-protocol3.c:772 fe-protocol3.c:804 fe-protocol3.c:822
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "nicht genug Daten in »D«-Nachricht"
 
-#: fe-protocol3.c:778
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "unerwartete Feldzahl in »D«-Nachricht"
 
-#: fe-protocol3.c:1033
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "keine Fehlermeldung verfügbar\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1081 fe-protocol3.c:1100
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " bei Zeichen %s"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETAIL:  %s\n"
 
-#: fe-protocol3.c:1116
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "TIP:  %s\n"
 
-#: fe-protocol3.c:1119
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "ANFRAGE:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "KONTEXT:  %s\n"
 
-#: fe-protocol3.c:1135
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "SCHEMANAME:  %s\n"
 
-#: fe-protocol3.c:1139
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "TABELLENNAME:  %s\n"
 
-#: fe-protocol3.c:1143
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "SPALTENNAME:  %s\n"
 
-#: fe-protocol3.c:1147
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "DATENTYPNAME:  %s\n"
 
-#: fe-protocol3.c:1151
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "CONSTRAINT-NAME:  %s\n"
 
-#: fe-protocol3.c:1163
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "ORT:  "
 
-#: fe-protocol3.c:1165
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1167
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1362
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "ZEILE %d: "
 
-#: fe-protocol3.c:1436
+#: fe-protocol3.c:1456
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server verlangte Herabstufung auf eine Version mit einer höheren Nummer"
+
+#: fe-protocol3.c:1462
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server verlangte Herabstufung auf eine Protokollversion vor 3.0"
+
+#: fe-protocol3.c:1469
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server verlangte Herabstufung auf nicht existierende Protokollversion 3.1"
+
+#: fe-protocol3.c:1475
 #, c-format
-msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
-msgstr "Protokollversion nicht vom Server unterstützt: Client verwendet %u.%u, Server unterstützt bis %u.%u"
+msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server berichtete eine negative Anzahl nicht unterstützter Parameter"
 
-#: fe-protocol3.c:1442
+#: fe-protocol3.c:1481
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "Protokollerweiterung nicht vom Server unterstützt: %s"
-msgstr[1] "Protokollerweiterungen nicht vom Server unterstützt: %s"
+msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server hat verhandelt aber keine Änderungen verlangt"
 
-#: fe-protocol3.c:1450
+#: fe-protocol3.c:1487
 #, c-format
-msgid "invalid %s message"
-msgstr "ungültige %s-Nachricht"
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "Server unterstützt nur Protokollversion %d.%d, aber »%s« war auf %d.%d gesetzt"
 
-#: fe-protocol3.c:1811
+#: fe-protocol3.c:1512
+#, c-format
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server sendete nicht unterstützten Parameter ohne Präfix »%s« (»%s«)"
+
+#: fe-protocol3.c:1515
+#, c-format
+msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Server sendete nicht unterstützten Parameter, der nicht angefordert war (»%s«)"
+
+#: fe-protocol3.c:1522
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "ungültige Protokollverhandlungsnachricht empfangen: Nachricht zu kurz"
+
+#: fe-protocol3.c:1588
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "ungültige BackendKeyData-Nachricht empfangen: Stornierungsschlüssel mit Länge %d nicht erlaubt in Protokoll 3.0 (muss 4 Bytes sein)"
+
+#: fe-protocol3.c:1595
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "ungültige BackendKeyData-Nachricht empfangen: Stornierungsschlüssel mit Länge %d ist zu kurz (Minimum 4 Bytes)"
+
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "ungültige BackendKeyData-Nachricht empfangen: Stornierungsschlüssel mit Länge %d ist zu lang (Maximum 256 Bytes)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: Text COPY OUT nicht ausgeführt"
 
-#: fe-protocol3.c:2186
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "Protokollfehler: kein Funktionsergebnis"
 
-#: fe-protocol3.c:2198
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "Protokollfehler: id=0x%x"
@@ -1310,132 +1752,138 @@ msgstr "Server-Zertifikat für »%s« stimmt nicht mit dem Hostnamen »%s« übe
 msgid "could not get server's host name from server certificate"
 msgstr "konnte Hostnamen des Servers nicht aus dem Serverzertifikat ermitteln"
 
-#: fe-secure-gssapi.c:194
+#: fe-secure-gssapi.c:201
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI-Wrap-Fehler"
 
-#: fe-secure-gssapi.c:201
+#: fe-secure-gssapi.c:208
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "ausgehende GSSAPI-Nachricht würde keine Vertraulichkeit verwenden"
 
-#: fe-secure-gssapi.c:208
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "Client versuchte übergroßes GSSAPI-Paket zu senden (%zu > %zu)"
 
-#: fe-secure-gssapi.c:347 fe-secure-gssapi.c:589
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "übergroßes GSSAPI-Paket vom Server gesendet (%zu > %zu)"
 
-#: fe-secure-gssapi.c:386
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-Unwrap-Fehler"
 
-#: fe-secure-gssapi.c:395
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "eingehende GSSAPI-Nachricht verwendete keine Vertraulichkeit"
 
-#: fe-secure-gssapi.c:652
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "konnte GSSAPI-Sicherheitskontext nicht initiieren"
 
-#: fe-secure-gssapi.c:681
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-Fehler bei der Größenprüfung"
 
-#: fe-secure-gssapi.c:692
-msgid "GSSAPI context establishment error"
-msgstr "GSSAPI-Fehler beim Einrichten des Kontexts"
-
-#: fe-secure-openssl.c:184 fe-secure-openssl.c:290 fe-secure-openssl.c:1320
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL-SYSCALL-Fehler: %s"
 
-#: fe-secure-openssl.c:190 fe-secure-openssl.c:296 fe-secure-openssl.c:1323
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "SSL-SYSCALL-Fehler: Dateiende entdeckt"
 
-#: fe-secure-openssl.c:200 fe-secure-openssl.c:306 fe-secure-openssl.c:1331
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-Fehler: %s"
 
-#: fe-secure-openssl.c:214 fe-secure-openssl.c:320
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL-Verbindung wurde unerwartet geschlossen"
 
-#: fe-secure-openssl.c:219 fe-secure-openssl.c:325 fe-secure-openssl.c:1378
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "unbekannter SSL-Fehlercode: %d"
 
-#: fe-secure-openssl.c:367
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "konnte Signaturalgorithmus des Serverzertifikats nicht ermitteln"
 
-#: fe-secure-openssl.c:387
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "konnte Digest für NID %s nicht finden"
 
-#: fe-secure-openssl.c:396
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "konnte Hash des Zertifikats der Gegenstelle nicht erzeugen"
 
-#: fe-secure-openssl.c:478
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "Namenseintrag fehlt im SSL-Zertifikat"
 
-#: fe-secure-openssl.c:508
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "Adresseintrag fehlt im SSL-Zertifikat"
 
-#: fe-secure-openssl.c:731
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "WARNUNG: konnte SSL-Key-Logging-Datei »%s« nicht öffnen: %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "WARNUNG: konnte nicht in SSL-Key-Logging-Datei »%s «schreiben: %m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s"
 
-#: fe-secure-openssl.c:773
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "ungültiger Wert »%s« für minimale SSL-Protokollversion"
 
-#: fe-secure-openssl.c:783
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "konnte minimale SSL-Protokollversion nicht setzen: %s"
 
-#: fe-secure-openssl.c:799
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "ungültiger Wert »%s« für maximale SSL-Protokollversion"
 
-#: fe-secure-openssl.c:809
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "konnte maximale SSL-Protokollversion nicht setzen: %s"
 
-#: fe-secure-openssl.c:847
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "konnte System-Root-Zertifikat-Pfade nicht laden: %s"
 
-#: fe-secure-openssl.c:864
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "konnte Root-Zertifikat-Datei »%s« nicht lesen: %s"
 
-#: fe-secure-openssl.c:916
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1444,7 +1892,7 @@ msgstr ""
 "konnte Home-Verzeichnis nicht ermitteln, um Root-Zertifikat-Datei zu finden\n"
 "Legen Sie entweder die Datei an, verwenden Sie die vertrauenswürdigen Roots des Systems mit sslrootcert=system, oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten."
 
-#: fe-secure-openssl.c:919
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1453,117 +1901,127 @@ msgstr ""
 "Root-Zertifikat-Datei »%s« existiert nicht\n"
 "Legen Sie entweder die Datei an, verwenden Sie die vertrauenswürdigen Roots des Systems mit sslrootcert=system, oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten."
 
-#: fe-secure-openssl.c:954
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "konnte Zertifikatdatei »%s« nicht öffnen: %s"
 
-#: fe-secure-openssl.c:972
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "konnte Zertifikatdatei »%s« nicht lesen: %s"
 
-#: fe-secure-openssl.c:996
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht aufbauen: %s"
 
-#: fe-secure-openssl.c:1028
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "WARNUNG: Unterstützung für sslkeylogfile benötigt OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "WARNUNG: libpq wurde ohne Unterstützung für sslkeylogfile gebaut\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "konnte SSL-Server-Name-Indication (SNI) nicht setzen: %s"
 
-#: fe-secure-openssl.c:1045
+#: fe-secure-openssl.c:1107
 #, c-format
 msgid "could not set SSL ALPN extension: %s"
 msgstr "konnte SSL-ALPN-Erweiterung nicht setzen: %s"
 
-#: fe-secure-openssl.c:1088
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "konnte SSL-Engine »%s« nicht laden: %s"
 
-#: fe-secure-openssl.c:1099
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "konnte SSL-Engine »%s« nicht initialisieren: %s"
 
-#: fe-secure-openssl.c:1114
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« lesen: %s"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« laden: %s"
 
-#: fe-secure-openssl.c:1164
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "Zertifikat vorhanden, aber keine private Schlüsseldatei »%s«"
 
-#: fe-secure-openssl.c:1167
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "konnte »stat« für private Schlüsseldatei »%s« nicht ausführen: %m"
 
-#: fe-secure-openssl.c:1175
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "private Schlüsseldatei »%s« ist keine normale Datei"
 
-#: fe-secure-openssl.c:1208
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "private Schlüsseldatei »%s« erlaubt Lesezugriff für Gruppe oder Andere; Dateirechte müssen u=rw (0600) oder weniger sein, wenn der Eigentümer der aktuelle Benutzer ist, oder u=rw,g=r (0640) oder weniger, wenn der Eigentümer »root« ist"
 
-#: fe-secure-openssl.c:1232
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s"
 
-#: fe-secure-openssl.c:1248
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "Zertifikat passt nicht zur privaten Schlüsseldatei »%s«: %s"
 
-#: fe-secure-openssl.c:1317
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "SSL-Fehler: Zertifikatsüberprüfung fehlgeschlagen: %s"
 
-#: fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "Das zeigt möglicherweise an, dass der Server keine SSL-Protokollversion zwischen %s und %s unterstützt."
 
-#: fe-secure-openssl.c:1394
+#: fe-secure-openssl.c:1456
 #, c-format
 msgid "direct SSL connection was established without ALPN protocol negotiation extension"
 msgstr "direkte SSL-Verbindung wurde ohne ALPN-Erweiterung zur Protokollverhandlung aufgebaut"
 
-#: fe-secure-openssl.c:1406
+#: fe-secure-openssl.c:1468
 #, c-format
 msgid "SSL connection was established with unexpected ALPN protocol"
 msgstr "SSL-Verbindung wurde mit unerwartetem ALPN-Protokoll aufgebaut"
 
-#: fe-secure-openssl.c:1423
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "Zertifikat konnte nicht ermittelt werden: %s"
 
-#: fe-secure-openssl.c:1502
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: fe-secure-openssl.c:1545
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
 
-#: fe-secure-openssl.c:1847
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "WARNUNG: sslpassword abgeschnitten\n"
diff --git a/src/interfaces/libpq/po/es.po b/src/interfaces/libpq/po/es.po
index 98349a8ad1f..f54844091bc 100644
--- a/src/interfaces/libpq/po/es.po
+++ b/src/interfaces/libpq/po/es.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libpq (PostgreSQL) 16\n"
+"Project-Id-Version: libpq (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-10-03 07:10+0000\n"
-"PO-Revision-Date: 2023-10-06 13:28+0200\n"
+"POT-Creation-Date: 2026-02-06 23:10+0000\n"
+"PO-Revision-Date: 2026-02-07 09:55+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -23,921 +23,1446 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "no se pudo buscar el usuario local de ID %d: %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "falló la eliminación del “easy handle” de libcurl: %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "no existe un usuario local con ID %d"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "falló la limpieza del “multi handle” de libcurl: %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "no se pudo establecer %s conexión OAuth: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "no se pudo obtener %s de la respuesta OAuth: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+#| msgid "field \"%s\" is missing"
+msgid "field \"%s\" must be a string"
+msgstr "el campo «%s» debe ser una cadena"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+#| msgid "variable \"%s\" must have a numeric type"
+msgid "field \"%s\" must be a number"
+msgstr "el campo «%s» debe ser un número"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+#| msgid "argument of %s must be an array of objects"
+msgid "field \"%s\" must be an array of strings"
+msgstr "el campo «%s» debe ser un array de cadenas"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+#| msgid "field \"%s\" is duplicated"
+msgid "field \"%s\" has unexpected type"
+msgstr "el campo «%s» tiene tipo inesperado"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON está anidado demasiado profundamente"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "el campo %s está duplicado"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "el elemento de nivel superior debe ser un objeto"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "no se entregó un tipo de contenido"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "tipo de contenido inesperado: «%s»"
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "la respuesta contiene caracteres NULL"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "la respuesta no es UTF-8 válido"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "falta el campo «%s»"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+#| msgid "failed to send SSL negotiation response: %m"
+msgid "failed to parse token error response"
+msgstr "no se pudo interpretar la respuesta de error de token"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "el proveedor rechazó el oauth_client_secret"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+#| msgid "provider rejected the oauth_client_secret"
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "el proveedor requiere autenticación de cliente, y no hay ningún oauth_client_secret definido"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "verificando la expiración del temporizador: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "no se pudo crear el “multi handle” de libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "no se pudo crear el “handle” de libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "memoria agotada"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "la respuesta es demasiado grande"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "no se pudo encolar la petición HTTP: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "petición HTTP asíncrona falló: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "no se obtuvo ningún resultado desde el “handle” terminado"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "código de respuesta %ld inesperado"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "no se pudo interpretar el documento de descubrimiento OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "el identificador del emisor (%s) no coincide con oauth_issuer «%s»"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "el emisor «%s» no provee un “endpoint” de autorización de dispositivo"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "el “endpoint” de autorización de dispositivo «%s» debe usar HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "el punto de término de token «%s» debe usar HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+#| msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgid "failed to parse device authorization"
+msgstr "no se pudo interpretar la autorización de dispositivo"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+#| msgid "failed to send SSL negotiation response: %m"
+msgid "failed to parse access token response"
+msgstr "no se pudo interpretar la respuesta de token de acceso"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "desbordamiento del intervalo de “slow_down”"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Visit %s e ingrese el código: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "la petición en el dispositivo falló"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init falló anteriormente mientras se establecía OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init falló mientras se establecía OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurl ya no es thread-seguro\n"
+"\tLa inicialización de Curl se reportó thread-segura cuando libpq\n"
+"\tfue compilado, pero la versión actualmente instalada de libcurl\n"
+"\treporta que no lo es. Recompile libpq contra la versión instalada\n"
+"\tde libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "no se pudo obtener el documento de descubrimiento OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+#| msgid "%s cannot run inside a subtransaction"
+msgid "cannot run OAuth device authorization"
+msgstr "no se puede ejecutar la autorización de dispositivo OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "no se pudo obtener la autorización de dispositivo"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "no se pudo obtener el token de acceso"
+
+#: fe-auth-oauth.c:133
+#, c-format
+#| msgid "internal error in OAuth validator module"
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "error interno: no se definió un token OAuth para la conexión"
+
+#: fe-auth-oauth.c:396
+#, c-format
+#| msgid "token endpoint \"%s\" must use HTTPS"
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "la URI de descubrimiento OAuth «%s» debe usar HTTPS"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "la URI de descubrimiento OAuth «%s» no debe contener componentes de “query” o fragmentos"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "la URI de descubrimiento OAuth «%s» no es una URI .well-known"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "la URI de descubrimiento OAuth «%s» usa un sufijo .well-known no soportado"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "la URI de descubrimiento OAuth «%s» usa un formato no válido"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "el mensaje de error del servidor contenía un NULL embebido, y fue descartado"
+
+#: fe-auth-oauth.c:539
+#, c-format
+#| msgid "response is not valid UTF-8"
+msgid "server's error response is not valid UTF-8"
+msgstr "la respuesta de error del servidor no es UTF-8 válido"
+
+#: fe-auth-oauth.c:579
+#, c-format
+#| msgid "failed to get %s from OAuth response: %s"
+msgid "failed to parse server's error response: %s"
+msgstr "no se pudo interpretar la respuesta de error del servidor: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+#| msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "el documento de descubrimiento del servidor en %s (emisor «%s») es incompatible con oauth_issuer (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "el documento de descubrimiento del servidor se ha movido a %s (la ubicación previa era %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+#| msgid "server sent an error response during SSL exchange"
+msgid "server sent error response without a status"
+msgstr "el servidor envió una respuesta de error sin un status"
+
+#: fe-auth-oauth.c:663
+#, c-format
+#| msgid "malformed JSON array"
+msgid "server rejected OAuth bearer token: %s"
+msgstr "el servidor rechazó el token OAuth “bearer”: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "el flujo OAuth definido por el usuario no proveyó un token ni un “callback” asíncrono"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+#| msgid "reading user-defined operator families"
+msgid "user-defined OAuth flow failed"
+msgstr "el flujo OAuth definido por el usuario falló"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "el flujo OAuth definido por el usuario no proveyó un token"
+
+#: fe-auth-oauth.c:734
+#, c-format
+#| msgid "internal error: async authentication did not set a socket for polling"
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "el flujo OAuth definido por el usuario no proveyó un socket para polling"
+
+#: fe-auth-oauth.c:917
+#, c-format
+#| msgid "failed to create kqueue: %m"
+msgid "failed to lock mutex (%d)"
+msgstr "no se pudo bloquear el mutex (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "no hay flujos OAuth disponibles (intente instalar el paquete libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "el servidor requiere autenticación OAuth, pero oauth_issuer y oauth_client_id no están ambos definidos"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "el servidor envió datos OAuth adicionales inesperados"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "el servidor requiere autenticación OAuth, pero no se proveyó metadatos de descubrimiento"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+#| msgid "internal error: async authentication did not set a socket for polling"
+msgid "internal error: OAuth flow did not set a token"
+msgstr "error interno: el flujo OAuth no definió un token"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+#| msgid "Message contains additional data after the final terminator."
+msgid "server sent additional OAuth data after error"
+msgstr "el servidor envió datos OAuth adicionales después del error"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+#| msgid "invalid SCRAM exchange state"
+msgid "invalid OAuth exchange state"
+msgstr "estado de intercambio OAuth no válido"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+#| msgid "no connection to the server"
+msgid "retrying connection with new bearer token"
+msgstr "reintentando la conexión con el nuevo token “bearer”"
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "mensaje SCRAM mal formado (mensaje vacío)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "mensaje SCRAM mal formado (longitud no coincide)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "no se pudo verificar la signatura del servidor: %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "signatura de servidor incorrecta"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "estado de intercambio SCRAM no es válido"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "mensaje SCRAM mal formado (se esperaba atributo «%c»)"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr "mensaje SCRAM mal formado (se esperaba el carácter «=» para el atributo «%c»)"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "no se pudo generar nonce"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1321
-#: fe-exec.c:3111 fe-exec.c:4071 fe-exec.c:4235 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:256
-#: fe-protocol3.c:273 fe-protocol3.c:353 fe-protocol3.c:720 fe-protocol3.c:959
-#: fe-protocol3.c:1770 fe-protocol3.c:2170 fe-secure-common.c:110
-#: fe-secure-gssapi.c:500 fe-secure-openssl.c:434 fe-secure-openssl.c:1285
-#, c-format
-msgid "out of memory"
-msgstr "memoria agotada"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "no se pudo codificar nonce"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "no se pudo calcular la prueba del cliente: %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "no se pudo codificar la prueba del cliente"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "respuesta SCRAM no es válida (nonce no coincide)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "mensaje SCRAM mal formado (sal no válida)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "mensaje SCRAM mal formado (el conteo de iteración no es válido)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr "mensaje SCRAM mal formado (se encontró basura al final de server-first-message)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "se recibió un error desde el servidor durante el intercambio SCRAM: %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr "mensaje SCRAM mal formado (se encontró basura al final de server-final-message)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "mensaje SCRAM mal formado (la signatura del servidor no es válida)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "no se pudo generar una sal aleatoria"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "memoria agotada creando el búfer GSSAPI (%d)"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "error en continuación de GSSAPI"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "el nombre de servidor debe ser especificado"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "petición de autentificación GSS duplicada"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "memoria agotada creando el búfer SSPI (%d)"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "error en continuación de SSPI"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "petición de autentificación SSPI duplicada"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "se requiere enlazado de canal (channel binding), pero no se está usando SSL"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "petición de autentificación SASL duplicada"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "se requiere enlazado de canal (channel binding), pero no está soportado en el cliente"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
 msgstr "el servidor ofreció autenticación SCRAM-SHA-256-PLUS sobre una conexión no-SSL"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "ningún método de autentificación SASL del servidor está soportado"
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid "authentication method requirement \"%s\" failed: server requested %s authentication"
+msgstr "el método de autentificación «%s» requerido falló: el servidor solicitó autenticación %s"
+
+#: fe-auth.c:580
 #, c-format
 msgid "channel binding is required, but server did not offer an authentication method that supports channel binding"
 msgstr "se requiere enlazado de canal (channel binding), pero el servidor no ofrece un método de autenticación que lo soporte"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "memoria agotada creando el búfer SASL (%d)"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid "AuthenticationSASLFinal received from server, but SASL authentication was not completed"
 msgstr "Se recibió AuthenticationSASLFinal desde el servidor, pero la autentificación SASL no se completó"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "no se encontró respuesta del cliente luego del intercambio SASL exitoso"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "no se pudo cifrar contraseña: %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
-msgstr "el servidor solicitó una contraseña en texto claro"
+msgstr "el servidor solicitó clave en texto plano"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
-msgstr "el servidor solicitó una contraseña cifrada"
+msgstr "el servidor solicitó una clave digerida (hashed)"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "el servidor solicitó autentificación GSSAPI"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "el servidor solicitó autentificación SSPI"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "el servidor solicitó autentificación SASL"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "múltiples valores especificados para el tipo de autentificación"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "el servidor no solicitó un certificado SSL"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "el servidor aceptó la conexión sin un certificado SSL válido"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "el servidor no completó la autentificación"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "el método de autentificación «%s» requerido falló: %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid "channel binding required, but server authenticated client without channel binding"
 msgstr "se requiere enlazado de canal (channel binding), pero el servidor autenticó al cliente sin enlazado de canal"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid "channel binding required but not supported by server's authentication request"
 msgstr "se requiere enlazado de canal (channel binding), pero no es compatible con la solicitud de autenticación del servidor"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "el método de autentificación Kerberos 4 no está soportado"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "el método de autentificación Kerberos 5 no está soportado"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "el método de autentificación GSSAPI no está soportado"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "el método de autentificación SSPI no está soportado"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
 msgstr "el método de autentificación Crypt no está soportado"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "el método de autentificación %u no está soportado"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "fallo en la búsqueda de nombre de usuario: código de error %lu"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "no se pudo encontrar el ID del usuario local %ld: %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "no existe un usuario local con ID %ld"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "SHOW retornó un conjunto de resultados con estructura inesperada"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "el valor para password_encryption es demasiado largo"
+msgid "\"password_encryption\" value too long"
+msgstr "el valor de «password_encryption» es demasiado largo"
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "algoritmo para cifrado de contraseña «%s» desconocido"
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "el puntero de conexión es NULL"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "la conexión no está abierta"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "no se recibió clave de cancelación"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "petición de cancelación ya fue enviada en esta conexión"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "respuesta inesperada del servidor"
+
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "no se pudo emparejar %d nombres de host a %d direcciones de host"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "no se pudo emparejar %d números de puertos a %d hosts"
 
-#: fe-connect.c:1337
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
-msgstr "el método require_auth negativo «%s» no puede ser mezclado con métodos no-negativos"
+msgstr "el método negativo require_auth «%s» no puede mezclarse con métodos no negativos"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
-msgstr "el método require_auth «%s» no puede ser mezclado con métodos negativos"
+msgstr "el método require_auth «%s» no puede mezclarse con métodos negativos"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "valor %s no válido: «%s»"
 
-#: fe-connect.c:1443
+#: fe-connect.c:1648
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "error interno: no hay espacio en allowed_sasl_mechs"
+
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "el método “require_auth” «%s» se especifica más de una vez"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "el valor «%2$s» de %1$s no es válido cuando el soporte SSL no está compilado"
 
-#: fe-connect.c:1546
+#: fe-connect.c:1849
+#, c-format
+msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
+msgstr "el sslmode «%s» débil no puede usarse con sslnegotiation=direct (use «require», «verify-ca» o «verify-full»)"
+
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
-msgstr "el sslmode débil «%s» no puede ser usado con sslrootcert=system (use «verify-full»)"
+msgstr "el sslmode «%s» débil no puede usarse con sslrootcert=system (use «verify-full»)"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1884 fe-connect.c:1892
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "valor «%s» no válido: «%s»"
+
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "rango de versión de protocolo SSL no válido "
 
-#: fe-connect.c:1621
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
-msgstr "el valor «%2$s» de %1$s no está soportado (verifique la versión de OpenSSL)"
+msgstr "el valor «%s» de %s no está soportado (verifique la versión de OpenSSL)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "el valor gssencmode «%s» no es válido cuando no se ha compilado con soporte GSSAPI"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2030
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "llave de cliente SCRAM no válida"
+
+#: fe-connect.c:2035
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "largo de llave de cliente SCRAM no válido: %d"
+
+#: fe-connect.c:2053
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "llave de servidor SCRAM no válida"
+
+#: fe-connect.c:2058
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "largo de llave de servidor SCRAM no válido: %d"
+
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "«%s» es mayor que «%s»"
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "no se pudo establecer el socket en modo TCP sin retardo: %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "falló la conexión al servidor en el socket «%s»: "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "falló la conexión al servidor en «%s» (%s), puerto %s: "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "falló la conexión al servidor en «%s», puerto %s: "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\t¿Está el servidor en ejecución localmente y aceptando conexiones en ese socket?"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\t¿Está el servidor en ejecución en ese host y aceptando conexiones TCP/IP?"
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "valor entero «%s» no válido para la opción de conexión «%s»"
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) falló: %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) falló: código de error %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "el estado de conexión no es válido, probablemente por corrupción de memoria"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "número de puerto no válido: «%s»"
 
-#: fe-connect.c:2690
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "no se pudo traducir el nombre «%s» a una dirección: %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "no se pudo interpretar la dirección de red «%s»: %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "la ruta al socket de dominio Unix «%s» es demasiado larga (máximo %d bytes)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "no se pudo traducir la ruta del socket Unix «%s» a una dirección: %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3263 fe-connect.c:4710
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr "cifrado GSSAPI requerido pero no está soportado en un socket local"
+
+#: fe-connect.c:3271 fe-connect.c:4839
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "cifrado GSSAPI requerido pero no hay caché de credenciales"
+
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "no se pudo crear el socket: %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "no se pudo establecer el socket en modo no bloqueante: %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "no se pudo poner el socket en modo close-on-exec: %s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "el parámetro de keepalives debe ser un entero"
-
-#: fe-connect.c:3100
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "no se pudo determinar el estado de error del socket: %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "no se pudo obtener la dirección del cliente desde el socket: %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "el parámetro requirepeer no está soportado en esta plataforma"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "no se pudo obtener credenciales de la contraparte: %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeer especifica «%s», pero el nombre de usuario de la contraparte es «%s»"
 
-#: fe-connect.c:3221
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "no se pudo enviar el paquete de negociación GSSAPI: %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid "GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)"
-msgstr "cifrado GSSAPI requerido, pero fue imposible (posiblemente no hay cache de credenciales, no hay soporte de servidor, o se está usando un socket local)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "no se pudo enviar el paquete de negociación SSL: %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3709
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "no se pudo enviar el paquete de cancelación: %s"
+
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "no se pudo enviar el paquete de inicio: %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "el servidor no soporta SSL, pero SSL es requerida"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3822
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "el servidor envió una respuesta de error durante el intercambio SSL"
+
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "se ha recibido una respuesta no válida en la negociación SSL: %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "se recibieron datos no cifrados después de la respuesta SSL"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3910
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "el servidor envió una respuesta de error durante un intercambio de cifrado GSS"
+
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "el servidor no soporta cifrado GSSAPI, pero es requerida"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "se ha recibido una respuesta no válida en la negociación GSSAPI: %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "se recibieron datos no cifrados después de la respuesta de cifrado GSSAPI"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "se esperaba una petición de autentificación desde el servidor, pero se ha recibido %c"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "se recibió una solicitud de autentificación no válida"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "se recibió un mensaje de negociación de protocolo no válido"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "se recibió un mensaje de error no válido"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "se recibió un mensaje de negociación de protocolo duplicado"
+
+#: fe-connect.c:4254
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "error interno: la autentificación async no tiene manejador"
+
+#: fe-connect.c:4279
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr "error interno: la limpieza async no liberó el socket de polling"
+
+#: fe-connect.c:4302
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr "error interno: la autentificación async no definió un socket para polling"
+
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "se ha recibido un mensaje inesperado del servidor durante el inicio"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "la sesión es de solo lectura"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "la sesión no es de solo lectura"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "el servidor está en modo hot standby"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "el servidor no está en modo hot standby"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "«%s» falló"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "estado de conexión no válido %d, probablemente por corrupción de memoria"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "URL LDAP no válida «%s»: el esquema debe ser ldap://"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "URL LDAP no válida «%s»: distinguished name faltante"
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "URL LDAP no válida «%s»: debe tener exactamente un atributo"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "URL LDAP no válida «%s»: debe tener ámbito de búsqueda (base/one/sub)"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "URL LDAP no válida «%s»: no tiene filtro"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "URL LDAP no válida «%s»: número de puerto no válido"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "no se pudo crear estructura LDAP"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "búsqueda en servidor LDAP falló: %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "se encontro más de una entrada en búsqueda LDAP"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "no se encontró ninguna entrada en búsqueda LDAP"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "la búsqueda LDAP entregó atributo sin valores"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "el tamaño de la cadena de conexión excede el máximo permitido (%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "falta «=» después de «%s» en la cadena de información de la conexión"
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "opción de conexión no válida «%s»"
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "cadena de caracteres entre comillas sin terminar en la cadena de información de conexión"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "la definición de servicio «%s» no fue encontrada"
 
-#: fe-connect.c:5666
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "el archivo de servicio «%s» no fue encontrado"
 
-#: fe-connect.c:5679
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "la línea %d es demasiado larga en archivo de servicio «%s»"
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "error de sintaxis en archivo de servicio «%s», línea %d"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "especificaciones de servicio anidadas no soportadas en archivo de servicio «%s», línea %d"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "URI no válida propagada a rutina interna de procesamiento: «%s»"
 
-#: fe-connect.c:6577
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "se encontró el fin de la cadena mientras se buscaba el «]» correspondiente en dirección IPv6 en URI: «%s»"
 
-#: fe-connect.c:6584
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "la dirección IPv6 no puede ser vacía en la URI: «%s»"
 
-#: fe-connect.c:6599
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "carácter «%c» inesperado en la posición %d en URI (se esperaba «:» o «/»): «%s»"
 
-#: fe-connect.c:6728
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "separador llave/valor «=» extra en parámetro de la URI: «%s»"
 
-#: fe-connect.c:6748
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "separador llave/valor «=» faltante en parámetro de la URI: «%s»"
 
-#: fe-connect.c:6800
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "parámetro de URI no válido: «%s»"
 
-#: fe-connect.c:6874
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "elemento escapado con %% no válido: «%s»"
 
-#: fe-connect.c:6884
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "valor no permitido %%00 en valor escapado con %%: «%s»"
 
-#: fe-connect.c:7248
+#: fe-connect.c:7265
+#, c-format
+msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr "se encontraron espacios inesperados en «%s», use espacios codificados con el símbolo %% (%%20) en su lugar"
+
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "el puntero de conexión es NULL\n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:970 fe-exec.c:3292
-#: fe-protocol3.c:974 fe-protocol3.c:1007
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7951
 #, 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:7556
+#: fe-connect.c:7961
 #, 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:7663
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "contraseña obtenida desde el archivo «%s»"
 
-#: fe-exec.c:466 fe-exec.c:3366
+#: fe-connect.c:8231
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "valor entero «%s» no válido para la opción de conexión «%s»"
+
+#: fe-exec.c:469 fe-exec.c:3549
 #, 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:528 fe-protocol3.c:1976
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "falló escritura al servidor"
 
-#: fe-exec.c:869
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "no hay mensaje de error disponible"
 
-#: fe-exec.c:958
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "AVISO"
 
-#: fe-exec.c:1016
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult no puede soportar un número de tuplas mayor que INT_MAX"
 
-#: fe-exec.c:1028
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "desbordamiento de size_t"
 
-#: fe-exec.c:1444 fe-exec.c:1513 fe-exec.c:1559
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "la cadena de orden es un puntero nulo"
 
-#: fe-exec.c:1450 fe-exec.c:2888
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "no se permite %s en modo pipeline"
 
-#: fe-exec.c:1518 fe-exec.c:1564 fe-exec.c:1658
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "el número de parámetros debe estar entre 0 y %d"
 
-#: fe-exec.c:1554 fe-exec.c:1653
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "el nombre de sentencia es un puntero nulo"
 
-#: fe-exec.c:1695 fe-exec.c:3220
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "no hay conexión con el servidor"
 
-#: fe-exec.c:1703 fe-exec.c:3228
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "hay otra orden en ejecución"
 
-#: fe-exec.c:1733
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "no se puede agregar órdenes a la cola mientras se hace COPY"
 
-#: fe-exec.c:1850
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "el largo debe ser especificado para un parámetro binario"
 
-#: fe-exec.c:2171
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "asyncStatus no esperado: %d"
 
-#: fe-exec.c:2327
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "no se permiten funciones que ejecuten órdenes sincrónicas en modo pipeline"
 
-#: fe-exec.c:2344
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por un nuevo PQexec"
 
-#: fe-exec.c:2360
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "PQexec no está permitido durante COPY BOTH"
 
-#: fe-exec.c:2586 fe-exec.c:2641 fe-exec.c:2709 fe-protocol3.c:1907
+#: fe-exec.c:2646
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "tipo de mensaje «%c» no reconocido"
+
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "no hay COPY alguno en ejecución"
 
-#: fe-exec.c:2895
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "la conexión está en un estado incorrecto"
 
-#: fe-exec.c:2938
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "no se puede entrar en modo pipeline, la conexión no está inactiva"
 
-#: fe-exec.c:2974 fe-exec.c:2995
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "no se puede salir de modo pipeline al tener resultados sin recolectar"
 
-#: fe-exec.c:2978
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "no se puede salir de modo pipeline mientras haya actividad"
 
-#: fe-exec.c:2989
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "no se puede salir de modo pipeline mientras se está en COPY"
 
-#: fe-exec.c:3154
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "no se puede enviar pipeline cuando no se está en modo pipeline"
 
-#: fe-exec.c:3255
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "el código de ExecStatusType no es válido"
 
-#: fe-exec.c:3282
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult no es un resultado de error\n"
 
-#: fe-exec.c:3350 fe-exec.c:3373
+#: fe-exec.c:3533 fe-exec.c:3556
 #, 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:3388
+#: fe-exec.c:3571
 #, 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:3699
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "no se pudo interpretar el resultado del servidor: %s"
 
-#: fe-exec.c:3964 fe-exec.c:4054
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "carácter multibyte incompleto"
 
+#: fe-exec.c:4159 fe-exec.c:4311
+#, c-format
+msgid "invalid multibyte character"
+msgstr "carácter multibyte no válido"
+
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "el tamaño de la cadena escapada excede el máximo permitido (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "el tamaño del bytea escapado excede el máximo permitido (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "error de importación de nombre de GSSAPI"
@@ -984,23 +1509,18 @@ msgstr "no se pudo escribir a archivo «%s»: %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "la consulta para inicializar las funciones de objetos grandes no devuelve datos"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "el entero de tamaño %lu no está soportado por pqGetInt"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "el entero de tamaño %lu no está soportado por pqPutInt"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "la conexión no está abierta"
-
-#: fe-misc.c:751 fe-secure-openssl.c:215 fe-secure-openssl.c:315
-#: fe-secure.c:257 fe-secure.c:419
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -1011,172 +1531,215 @@ msgstr ""
 "\tProbablemente se debe a que el servidor terminó de manera anormal\n"
 "\tantes o durante el procesamiento de la petición."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "la conexión no está abierta\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "tiempo de espera agotado"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "socket no válido"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() falló: %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "un mensaje de tipo 0x%02x llegó del servidor estando inactivo"
 
-#: fe-protocol3.c:385
+#: fe-protocol3.c:403
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "el servidor envió datos (mensaje «D») sin precederlos con una descripción de fila (mensaje «T»)"
 
-#: fe-protocol3.c:427
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "se ha recibido una respuesta inesperada del servidor; el primer carácter recibido fue «%c»"
 
-#: fe-protocol3.c:450
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "el contenido del mensaje no concuerda con el largo, en el mensaje tipo «%c»"
 
-#: fe-protocol3.c:468
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "se perdió la sincronía con el servidor: se recibió un mensaje de tipo «%c», largo %d"
 
-#: fe-protocol3.c:520 fe-protocol3.c:560
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "datos insuficientes en el mensaje «T»"
 
-#: fe-protocol3.c:631 fe-protocol3.c:837
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "no hay suficiente memoria para el resultado de la consulta"
 
-#: fe-protocol3.c:700
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "datos insuficientes en el mensaje «t»"
 
-#: fe-protocol3.c:759 fe-protocol3.c:791 fe-protocol3.c:809
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "datos insuficientes en el mensaje «D»"
 
-#: fe-protocol3.c:765
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "cantidad de campos inesperada en mensaje «D»"
 
-#: fe-protocol3.c:1020
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "no hay mensaje de error disponible\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1068 fe-protocol3.c:1087
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " en el carácter %s"
 
-#: fe-protocol3.c:1100
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALLE:  %s\n"
 
-#: fe-protocol3.c:1103
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "SUGERENCIA:  %s\n"
 
-#: fe-protocol3.c:1106
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:1122
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "NOMBRE DE ESQUEMA:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "NOMBRE DE TABLA:  %s\n"
 
-#: fe-protocol3.c:1130
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "NOMBRE DE COLUMNA:  %s\n"
 
-#: fe-protocol3.c:1134
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "NOMBRE TIPO DE DATO:  %s\n"
 
-#: fe-protocol3.c:1138
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "NOMBRE DE RESTRICCIÓN:  %s\n"
 
-#: fe-protocol3.c:1150
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "UBICACIÓN:  "
 
-#: fe-protocol3.c:1152
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1154
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1349
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "LÍNEA %d: "
 
-#: fe-protocol3.c:1423
+#: fe-protocol3.c:1456
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor solicitó degradación a una versión con un número mayor"
+
+#: fe-protocol3.c:1462
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor solicitó degradación a una versión de protocolo anterior a 3.0"
+
+#: fe-protocol3.c:1469
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor pidió degradación a la versión de protocolo inexistente 3.1"
+
+#: fe-protocol3.c:1475
+#, c-format
+msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor reportó una cantidad negativa de parámetros no soportados"
+
+#: fe-protocol3.c:1481
 #, c-format
-msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
-msgstr "versión de protocolo no soportada por el servidor: cliente usa %u.%u, servidor soporta hasta %u.%u"
+msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor solicitó negociar pero no pidió ningún cambio"
 
-#: fe-protocol3.c:1429
+#: fe-protocol3.c:1487
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "extensión del protocolo no soportada por el servidor: %s"
-msgstr[1] "extensiones del protocolo no soportadas por el servidor: %s"
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "el servidor sólo soporta la versión de protocolo %d.%d, pero «%s» fue definido a %d.%d"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1512
 #, c-format
-msgid "invalid %s message"
-msgstr "mensaje %s no válido"
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor reportó el nombre de parámetro no soportado sin el prefijo «%s» («%s»)"
 
-#: fe-protocol3.c:1802
+#: fe-protocol3.c:1515
+#, c-format
+msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: el servidor reportó un parámetro no soportado que no fue solicitado («%s»)"
+
+#: fe-protocol3.c:1522
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "se recibió un mensaje de negociación de protocolo no válido: mensaje demasiado corto"
+
+#: fe-protocol3.c:1588
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "se recibió un mensaje BackendKeyData no válido: la llave de cancelación con largo %d no está permitida en la versión de protocolo 3.0 (debe ser 4 bytes)"
+
+#: fe-protocol3.c:1595
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "se recibió un mensaje BackendKeyData no válido: la llave de cancelación con largo %d es demasiado corta (mínimo 4 bytes)"
+
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "se recibió un mensaje BackendKeyData no válido: la llave de cancelación con largo %d es demasiado larga (máximo 256 bytes)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: no se está haciendo COPY OUT de texto"
 
-#: fe-protocol3.c:2176
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "error de protocolo: no hay resultado de función"
 
-#: fe-protocol3.c:2187
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "error de protocolo: id=0x%x"
@@ -1227,123 +1790,129 @@ msgstr "error de «wrap» de GSSAPI"
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "mensaje saliente GSSAPI no proveería confidencialidad"
 
-#: fe-secure-gssapi.c:215
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "el cliente intentó enviar un paquete GSSAPI demasiado grande (%zu > %zu)"
 
-#: fe-secure-gssapi.c:351 fe-secure-gssapi.c:593
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "paquete GSSAPI demasiado grande enviado por el servidor (%zu > %zu)"
 
-#: fe-secure-gssapi.c:390
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "error de «unwrap» de GSSAPI"
 
-#: fe-secure-gssapi.c:399
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "mensaje GSSAPI entrante no usó confidencialidad"
 
-#: fe-secure-gssapi.c:656
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "no se pudo iniciar un contexto de seguridad GSSAPI"
 
-#: fe-secure-gssapi.c:685
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "error de verificación de tamaño GSSAPI"
 
-#: fe-secure-gssapi.c:696
-msgid "GSSAPI context establishment error"
-msgstr "error de establecimiento de contexto de GSSAPI"
-
-#: fe-secure-openssl.c:219 fe-secure-openssl.c:319 fe-secure-openssl.c:1531
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "ERROR en llamada SSL: %s"
 
-#: fe-secure-openssl.c:225 fe-secure-openssl.c:325 fe-secure-openssl.c:1534
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "ERROR en llamada SSL: detectado fin de archivo"
 
-#: fe-secure-openssl.c:235 fe-secure-openssl.c:335 fe-secure-openssl.c:1542
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "error de SSL: %s"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:349
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "la conexión SSL se ha cerrado inesperadamente"
 
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:354 fe-secure-openssl.c:1589
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "código de error SSL no reconocido: %d"
 
-#: fe-secure-openssl.c:397
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "no se pudo determinar el algoritmo de firma del certificado del servidor"
 
-#: fe-secure-openssl.c:417
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "no se pudo encontrar «digest» para el NID %s"
 
-#: fe-secure-openssl.c:426
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "no se pudo generar hash de certificado de la contraparte"
 
-#: fe-secure-openssl.c:509
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "falta el elemento de nombre en el certificado SSL"
 
-#: fe-secure-openssl.c:543
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "falta el elemento de dirección en el certificado SSL"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "ATENCIÓN: no se pudo abrir el archivo de registro de llaves SSL «%s»: %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "ATENCIÓN: no se pudo escribir al archivo de registro de llaves SSL «%s»: %m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "no se pudo crear un contexto SSL: %s"
 
-#: fe-secure-openssl.c:1002
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "valor entero «%s» no válido para la versión mínima del protocolo SSL"
 
-#: fe-secure-openssl.c:1012
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "no se pudo definir la versión mínima de protocolo SSL: %s"
 
-#: fe-secure-openssl.c:1028
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "valor entero «%s» no válido para la versión máxima del protocolo SSL"
 
-#: fe-secure-openssl.c:1038
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "no se pudo definir la versión máxima de protocolo SSL: %s"
 
-#: fe-secure-openssl.c:1076
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "no se pudo cargar las rutas de los certificados raíz del sistema: %s"
 
-#: fe-secure-openssl.c:1093
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "no se pudo leer la lista de certificado raíz «%s»: %s"
 
-#: fe-secure-openssl.c:1145
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1352,7 +1921,7 @@ msgstr ""
 "no se pudo obtener el directorio «home» para ubicar el archivo del certificado raíz\n"
 "Debe ya sea entregar este archivo, usar las raíces confiadas por el sistema con sslrootcert=system, o bien cambiar sslmode para inhabilitarla verificación de certificados del servidor."
 
-#: fe-secure-openssl.c:1148
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1361,112 +1930,137 @@ msgstr ""
 "el archivo de certificado raíz «%s» no existe\n"
 "Debe ya sea entregar este archivo, usar las raíces confiadas por el sistema con sslrootcert=system, o bien cambiar sslmode para inhabilitar la verificación de certificados del servidor."
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "no se pudo abrir el archivo de certificado «%s»: %s"
 
-#: fe-secure-openssl.c:1201
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "no se pudo leer el archivo de certificado «%s»: %s"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "no se pudo establecer conexión SSL: %s"
 
-#: fe-secure-openssl.c:1257
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "ATENCIÓN: el soporte de sslkeylogfile requiere OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "ATENCIÓN: libpq no fue construido con soporte para sslkeylogfile\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "no se pudo establecer el Indicador de Nombre del Servidor (SNI) de SSL: %s"
 
-#: fe-secure-openssl.c:1300
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "no se pudo definir la extensión ALPN de SSL: %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "no se pudo cargar el motor SSL «%s»: %s"
 
-#: fe-secure-openssl.c:1311
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "no se pudo inicializar el motor SSL «%s»: %s"
 
-#: fe-secure-openssl.c:1326
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "no se pudo leer el archivo de la llave privada SSL «%s» desde el motor «%s»: %s"
 
-#: fe-secure-openssl.c:1339
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "no se pudo leer la llave privada SSL «%s» desde el motor «%s»: %s"
 
-#: fe-secure-openssl.c:1376
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "el certificado está presente, pero no la llave privada «%s»"
 
-#: fe-secure-openssl.c:1379
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "no se pudo hacer stat del archivo de la llave privada «%s»: %m"
 
-#: fe-secure-openssl.c:1387
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "el archivo de llave privada «%s» no es un archivo regular"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "el archivo de llave privada «%s» tiene acceso de grupo o para todos; debe tener permisos u=rw (0600) o menos si es de propiedad del usuario de base de datos, o permisos u=rw,g=r (0640) o menos si es de root"
 
-#: fe-secure-openssl.c:1444
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "no se pudo cargar el archivo de la llave privada «%s»: %s"
 
-#: fe-secure-openssl.c:1460
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "el certificado no coincide con la llave privada «%s»: %s"
 
-#: fe-secure-openssl.c:1528
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "error SSL: falló la verificación de certificado: %s"
 
-#: fe-secure-openssl.c:1573
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "Esto puede indicar que el servidor no soporta ninguna versión del protocolo SSL entre %s y %s."
 
-#: fe-secure-openssl.c:1606
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid "direct SSL connection was established without ALPN protocol negotiation extension"
+msgstr "conexión SSL directa fue establecida sin extensión de negociación de protocolo ALPN"
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "la conexión SSL fue establecida con protocolo ALPN inesperado"
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "el certificado no pudo ser obtenido: %s"
 
-#: fe-secure-openssl.c:1711
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "código de error SSL no reportado"
 
-#: fe-secure-openssl.c:1720
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
 
-#: fe-secure-openssl.c:1986
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "ADVERTENCIA: sslpassword truncada\n"
 
-#: fe-secure.c:263
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "no se pudo recibir datos del servidor: %s"
 
-#: fe-secure.c:434
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "no se pudo enviar datos al servidor: %s"
@@ -1475,3 +2069,95 @@ msgstr "no se pudo enviar datos al servidor: %s"
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "código de error de socket no reconocido: 0x%08X/%d"
+
+#, c-format
+#~ msgid "internal error: started field '%s' before field '%s' was finished"
+#~ msgstr "error interno: se inició el campo '%s' antes de terminar el campo '%s'"
+
+#, c-format
+#~ msgid "internal error: field '%s' still active at end of object"
+#~ msgstr "error interno: el campo '%s' sigue activo al final del objeto"
+
+#, c-format
+#~ msgid "internal error: found unexpected array end while parsing field '%s'"
+#~ msgstr "error interno: se encontró un fin de array inesperado mientras se interpretaba el campo «%s»"
+
+#, c-format
+#~ msgid "internal error: scalar target found at nesting level %d"
+#~ msgstr "error interno: se encontró destino escalar en el nivel de anidamiento %d"
+
+#, c-format
+#~ msgid "internal error: scalar field '%s' would be assigned twice"
+#~ msgstr "error interno: el campo escalar '%s' sería asignado dos veces"
+
+#, c-format
+#~ msgid "internal error: array member found at nesting level %d"
+#~ msgstr "error interno: miembro de array encontrado en el nivel de anidamiento %d"
+
+#, c-format
+#~ msgid "failed to create epoll set: %m"
+#~ msgstr "no se pudo crear el grupo de “epoll”: %m"
+
+#, c-format
+#~ msgid "failed to create timerfd: %m"
+#~ msgstr "no se pudo crear el “timerfd”: %m"
+
+#, c-format
+#~ msgid "failed to add timerfd to epoll set: %m"
+#~ msgstr "no se pudo agregar el “timerfd” al grupo de “epoll”: %m"
+
+#, c-format
+#~ msgid "failed to create timer kqueue: %m"
+#~ msgstr "no se pudo crear el temporizador ”kqueue”: %m"
+
+#, c-format
+#~ msgid "unknown libcurl socket operation: %d"
+#~ msgstr "operación de socket libcurl desconocida: %d"
+
+#, c-format
+#~ msgid "could not add to epoll set: %m"
+#~ msgstr "no se pudo agregar al grupo de ”epoll”: %m"
+
+#, c-format
+#~ msgid "could not delete from epoll set: %m"
+#~ msgstr "no se pudo borrar el grupo de “epoll”: %m"
+
+#, c-format
+#~ msgid "could not update epoll set: %m"
+#~ msgstr "no se pudo actualizar el grupo de “epoll”: %m"
+
+#, c-format
+#~ msgid "could not modify kqueue: %m"
+#~ msgstr "no se pudo modificar el “kqueue”: %m"
+
+#, c-format
+#~ msgid "could not delete from kqueue: %m"
+#~ msgstr "no se pudo borrar del “kqueue”: %m"
+
+#, c-format
+#~ msgid "could not add to kqueue: %m"
+#~ msgstr "no se pudo agregar al “kqueue”: %m"
+
+#, c-format
+#~ msgid "could not comb kqueue: %m"
+#~ msgstr "no se pudo “rastrear” el “kqueue”: %m"
+
+#, c-format
+#~ msgid "setting timerfd to %ld: %m"
+#~ msgstr "definiendo “timerfd” a %ld: %m"
+
+#, c-format
+#~ msgid "deleting kqueue timer: %m"
+#~ msgstr "eliminando el temporizador “kqueue”: %m"
+
+#, c-format
+#~ msgid "removing kqueue timer from multiplexer: %m"
+#~ msgstr "eliminando el temporizador “kqueue” del multiplexor: %m"
+
+#, c-format
+#~ msgid "setting kqueue timer to %ld: %m"
+#~ msgstr "definiendo el temporizador “kqueue” a %ld: %m"
+
+#, c-format
+#~ msgid "adding kqueue timer to multiplexer: %m"
+#~ msgstr "agregando el temporizador ”kqueue” al multiplexor: %m"
diff --git a/src/interfaces/libpq/po/fr.po b/src/interfaces/libpq/po/fr.po
index 8c94d724f0b..528459ab88d 100644
--- a/src/interfaces/libpq/po/fr.po
+++ b/src/interfaces/libpq/po/fr.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 15\n"
+"Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-07-29 09:10+0000\n"
-"PO-Revision-Date: 2023-07-30 08:42+0200\n"
+"POT-Creation-Date: 2026-05-08 20:10+0000\n"
+"PO-Revision-Date: 2026-05-10 17:11+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -21,762 +21,1238 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.9\n"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "n'a pas pu rechercher l'identifiant de l'utilisateur local %d : %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "la suppression du « easy handle » de libcurl a échoué : %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "le nettoyage du « multi handle » de libcurl a échoué : %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "n'a pas pu configurer %s sur la connexion OAuth : %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "échec lors de la réception de %s à partir de la réponse OAuth : %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "le champ « %s » doit être une chaîne de caractères"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "le champ « %s » doit être un nombre"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "le champ « %s » doit être un tableau de chaînes"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "le champ « %s » a un type inattendu"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON a trop de profondeur"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "le champ « %s » est dupliqué"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "l'élément haut-niveau doit être un objet"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "aucun type de contenu n'a été fourni"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "type de contenu inattendu : « %s »"
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "la réponse contient des NULL"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "la réponse n'est pas de l'UTF-8 valide"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "le champ « %s » est manquant"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "a échoué à analyser la répondu en erreur du jeton"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "le fournisseur a rejeté oauth_client_secret"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "le fournisseur requiert l'authentification du client, et aucun oauth_client_secret n'est configuré"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "vérification de l'expiration du délai : %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "a échoué pour créer le « multi handle » de libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "a échoué pour créer la poignée libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "la réponse est trop large"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "a échoué pour mettre en queue la requête HTTP : %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "échec de la requête HTTP asynchrone : %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "aucun résultat n'a été récupéré pour la poignée terminée"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "code de réponse inattendu %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "échec lors de l'analyse du document découverte OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "l'identifiant du demandeur (%s) ne correspond pas à oauth_issuer (« %s »)"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "le demandeur « %s » n'a pas fourni un endpoint d'autorisation de périphérique"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "le endpoint d'autorisation du périphérique « %s » doit utiliser HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "le endpoint « %s » du jeton doit utiliser HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "a échoué à analyser l'autorisation du périphérique"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "a échoué à analyser la réponse du jeton"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "dépassement de l'intervalle slow_down"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Allez sur %s et saisissez le code : %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "échec de l'invite du périphérique"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init a échoué précédemment lors de la configuration de OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init a échoué lors de la configuration de OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurl n'est plus garanti avec les threads\n"
+"\tL'initialisation de curl était indiquée comme garantie avec les threads quand libpq\n"
+"\ta été compilé, mais la version actuellement installée de libcurl indique que ce n'est\n"
+"\tplus le cas. Recompilez libpq avec la version installée de libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "échec de la récupération du document découverte OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "ne peut pas exécuter l'autorisation du périphérique OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "a échoué à obtenir l'autorisation du périphérique"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "échec lors de l'obtention du jeton d'accès"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "erreur interne : aucun jeton OAuth n'était configuré pour la connexion"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "l'URI de découverte d'OAuth « %s » doit utiliser HTTPS"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "L'URI de découverte OAuth « %s » ne doit pas contenir des composants requête ou fragment"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "L'URI de découverte OAuth « %s » n'est pas une URI .well-known"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "L'URI de découverte OAuth « %s » utilisé un suffixe .well-known non supporté"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "L'URI de découverte OAuth « %s » utilise un format invalide"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "le message d'erreur du serveur contenait un NULL embarqué, et a été annulé"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "la réponse en erreur du serveur n'est pas de l'UTF-8 valide"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "a échoué à analyser la réponse du serveur : %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "le document de découverte du serveur à %s (émetteur « %s ») est incompatible avec oauth_issuer (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "le document de découverte du serveur a été déplacé dans %s (l'emplacement précédent était %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "le serveur a répondu avec une erreur sans statut"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "le serveur a rejeté le jeton porteur OAuth : %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "le flux OAuth défini par l'utilisateur n'a fourni ni un jeton ni un appel fonction asynchrone"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "échec du flux OAuth défini par l'utilisateur"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "le flux OAuth défini par l'utilisateur n'a pas fourni de jeton"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "le flux OAuth défini par l'utilisateur n'a pas fourni de socket pour l'interrogation"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "a échoué à verrouiller le mutex (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "aucun flux OAuth n'est disponible (essayez d'installer le paquet libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "le serveur requiert une authentification OAuth mais oauth_issuer et oauth_client_id ne sont pas configurés"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "le serveur a envoyé des données OAuth supplémentaires inattendues"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "le serveur réclame une authentification OAuth mais aucune métadonnée de découverte n'a été fournie"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "erreur interne : le flux OAuth n'a pas configuré un jeton"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "le serveur a envoyé des données OAuth supplémentaire après l'erreur"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "état d'échange OAuth invalide"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "nouvelle tentative de connexion avec un nouveau jeton porteur"
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "message SCRAM malformé (message vide)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "message SCRAM malformé (pas de correspondance sur la longueur)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "n'a pas pu vérifier la signature du serveur : %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "signature invalide du serveur"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "état d'échange SCRAM invalide"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "message SCRAM malformé (attribut « %c » attendu)"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr "message SCRAM malformé (caractère « = » attendu pour l'attribut « %c »)"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "n'a pas pu générer le nonce"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1321
-#: fe-exec.c:3111 fe-exec.c:4071 fe-exec.c:4235 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:256
-#: fe-protocol3.c:273 fe-protocol3.c:353 fe-protocol3.c:720 fe-protocol3.c:959
-#: fe-protocol3.c:1770 fe-protocol3.c:2170 fe-secure-common.c:110
-#: fe-secure-gssapi.c:500 fe-secure-openssl.c:434 fe-secure-openssl.c:1285
-#, c-format
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "n'a pas pu encoder le nonce"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "n'a pas pu calculer la preuve du client : %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "n'a pas pu encoder la preuve du client"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "réponse SCRAM invalide (pas de correspondance sur nonce)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "message SCRAM malformé (sel invalide)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "message SCRAM malformé (décompte d'itération invalide)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr "message SCRAM malformé (problème à la fin du server-first-message)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "réception d'une erreur du serveur dans l'échange SCRAM : %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr "message SCRAM malformé (problème à la fin du server-final-message)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "message SCRAM malformé (signature serveur invalide)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "n'a pas pu générer le sel aléatoire"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "mémoire épuisée lors de l'allocation du tampon GSSAPI (%d)"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "erreur de suite GSSAPI"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "le nom d'hôte doit être précisé"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "requête d'authentification GSS dupliquée"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "mémoire épuisée lors de l'allocation du tampon SSPI (%d)"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "erreur de suite SSPI"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "requête d'authentification SSPI dupliquée"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "n'a pas pu obtenir les pièces d'identité SSPI"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "lien de canal requis, mais SSL non utilisé"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "requête d'authentification SASL dupliquée"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "le lien de canal SCRAM est requis mais le client ne supporte par cette option"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
 msgstr "le serveur a proposé une authentification SCRAM-SHA-256-PLUS sur une connexion non SSL"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "aucun des mécanismes d'authentification SASL du serveur n'est supporté"
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid "authentication method requirement \"%s\" failed: server requested %s authentication"
+msgstr "la demande de la méthode d'authentification « %s » a échoué : le serveur a réclamé l'authentification %s"
+
+#: fe-auth.c:580
 #, c-format
 msgid "channel binding is required, but server did not offer an authentication method that supports channel binding"
-msgstr "Lien de canal requis, mais le serveur ne propose pas de méthode d'authentification le supportant"
+msgstr "lien de canal requis, mais le serveur ne propose pas de méthode d'authentification le supportant"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "mémoire épuisée lors de l'allocation du tampon SASL (%d)"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid "AuthenticationSASLFinal received from server, but SASL authentication was not completed"
 msgstr "AuthenticationSASLFinal reçu du serveur mais l'authentification SASL n'a pas été terminée"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "aucune réponse client trouvée après le succès de l'échange SASL"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "n'a pas pu chiffré le mot de passe : %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
 msgstr "le serveur a demandé un mot de passe en clair"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
 msgstr "le serveur a demandé un mot de passe haché"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "le serveur a demandé l'authentification GSSAPI"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "le serveur a demandé l'authentification SSPI"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "le serveur a demandé l'authentification SASL"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "le serveur a demandé un type d'authentification inconnu"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "le serveur n'a pas réclamé de certificat SSL"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "le serveur a accepté la connexion sans certificat SSL valide"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "le serveur n'a pas terminé l'authentification"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "la demande de la méthode d'authentification « %s » a échoué : %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid "channel binding required, but server authenticated client without channel binding"
 msgstr "lien de canal requis, mais le serveur a authentifié le client sans lien de canal"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid "channel binding required but not supported by server's authentication request"
 msgstr "lien de canal requis, mais non supporté par la requête d'authentification du serveur"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "authentification Kerberos 4 non supportée"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "authentification Kerberos 5 non supportée"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "authentification GSSAPI non supportée"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "authentification SSPI non supportée"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
-msgstr "authentification crypt non supportée"
+msgstr "Authentification crypt non supportée"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "méthode d'authentification %u non supportée"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "échec de la recherche du nom d'utilisateur : code d'erreur %lu"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "n'a pas pu rechercher l'identifiant %ld de l'utilisateur local : %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "l'utilisateur local dont l'identifiant est %ld n'existe pas"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "forme du résultat inattendu pour SHOW"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "la valeur de password_encryption est trop longue"
+msgid "\"password_encryption\" value too long"
+msgstr "valeur trop longue pour password_encryption"
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "algorithme de chiffrement du mot de passe « %s » non reconnu"
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "le pointeur de connexion est NULL"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "la connexion n'est pas active"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "aucune clé d'annulation reçue"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "la demande d'annulation est déjà envoyée sur cette connexion"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "réponse inattendue du serveur"
+
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "n'a pas pu faire correspondre les %d noms d'hôte aux %d valeurs hostaddr"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "n'a pas pu faire correspondre les %d numéros de port aux %d hôtes"
 
-#: fe-connect.c:1337
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "la méthode négative require_auth  « %s » ne peut pas être mélangée avec des méthodes non négatives"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "la méthode require_auth  « %s » ne peut pas être mélangée avec des méthodes négatives"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "valeur %s invalide : « %s »"
 
-#: fe-connect.c:1443
+#: fe-connect.c:1648
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "erreur interne : aucun espace dans allowed_sasl_mechs"
+
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "require_auth method \"%s\" est spécifié plus d'une fois"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "valeur %s « %s » invalide si le support SSL n'est pas compilé"
 
-#: fe-connect.c:1546
+#: fe-connect.c:1849
+#, c-format
+msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
+msgstr "le sslmode faible « %s » pourrait ne pas être utilisable avec sslnegotiation=direct (utilisez « require », « verify-ca » ou « verify-full »)"
+
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "le sslmode fiable « %s » pourrait ne pas être utilisé avec sslrootcert=system (utilisez \"verify-full\")"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1884 fe-connect.c:1892
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "valeur « %s » invalide : « %s »"
+
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "intervalle de version invalide pour le protocole SSL"
 
-#: fe-connect.c:1621
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s la valeur « %s » n'est pas supportée (vérifiez la version d'OpenSSL)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "valeur gssencmode « %s » invalide si le support GSSAPI n'est pas compilé"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2030
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "clé SCRAM du client invalide"
+
+#: fe-connect.c:2035
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "longueur de la clé SCRAM du serveur invalide : %d"
+
+#: fe-connect.c:2053
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "clé SCRAM invalide du serveur"
+
+#: fe-connect.c:2058
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "longueur invalide de la clé SCRAM du serveur : %d"
+
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "« %s » est plus supérieur à « %s »"
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "n'a pas pu activer le mode TCP sans délai pour la socket : %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "la connexion au serveur sur le socket « %s » a échoué : "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "la connexion au serveur sur « %s » (%s), port %s a échoué : "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "la connexion au serveur sur « %s », port %s a échoué : "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tLe serveur est-il actif localement et accepte-t-il les connexions sur ce socket ?"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tLe serveur est-il actif sur cet hôte et accepte-t-il les connexions ?"
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "valeur entière « %s » invalide pour l'option de connexion « %s »"
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "échec de %s(%s) : %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "échec de %s(%s) : code d'erreur %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "état de connexion invalide, indique probablement une corruption de mémoire"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "numéro de port invalide : « %s »"
 
-#: fe-connect.c:2690
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "n'a pas pu traduire le nom d'hôte « %s » en adresse : %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "n'a pas pu analyser l'adresse réseau « %s » : %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3083
 #, 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)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "n'a pas pu traduire le chemin de la socket du domaine Unix « %s » en adresse : %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3263 fe-connect.c:4710
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr "le chiffrage avec GSSAPI était requis, mais il n'est pas supporté sur une socket locale"
+
+#: fe-connect.c:3271 fe-connect.c:4839
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "chiffrage GSSAPI requis mais pas de cache d'identifiant"
+
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "n'a pas pu créer la socket : %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "n'a pas pu paramétrer la socket en mode close-on-exec : %s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "le paramètre keepalives doit être un entier"
-
-#: fe-connect.c:3100
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "n'a pas pu déterminer le statut d'erreur de la socket : %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "n'a pas pu obtenir l'adresse du client depuis la socket : %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "le paramètre requirepeer n'est pas supporté sur cette plateforme"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "n'a pas pu obtenir l'authentification de l'autre : %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeer indique « %s » mais le nom de l'utilisateur réel est « %s »"
 
-#: fe-connect.c:3221
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "n'a pas pu transmettre le paquet de négociation GSSAPI : %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid "GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)"
-msgstr "le chiffrage avec GSSAPI était requis, mais impossible (potentiellement pas de cache, de support serveur ou de socket local)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "n'a pas pu transmettre le paquet de négociation SSL : %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3709
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "n'a pas pu envoyer le paquet d'annulation : %s"
+
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "n'a pas pu transmettre le paquet de démarrage : %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "le serveur ne supporte pas SSL alors que SSL était réclamé"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3822
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "le serveur a envoyé une erreur lors de l'échange SSL"
+
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "a reçu une réponse invalide à la négociation SSL : %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "a reçu des données non chiffrées après la réponse SSL"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3910
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "le serveur a envoyé une erreur lors de l'échange de chiffrage GSS"
+
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "le serveur ne supporte pas le chiffrage GSSAPI alors qu'il était réclamé"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "a reçu une réponse invalide à la négociation GSSAPI : %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "a reçu des données non chiffrées après la réponse de chiffrement GSSAPI"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "attendait une requête d'authentification du serveur, mais a reçu %c"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "méthode d'authentification invalide reçue"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "a reçu un message invalide pour la négociation du protocole"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "a reçu un message d'erreur invalide"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "a reçu un message dupliquée pour la négociation du protocole"
+
+#: fe-connect.c:4254
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "erreur interne : async authentication n'a pas de gestionnaire"
+
+#: fe-connect.c:4279
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr "erreur interne : le nettoyage asynchrone n'a pas relâché le socket demandeur"
+
+#: fe-connect.c:4302
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr "erreur interne : une authentification asynchrone n'a pas configuré une socket pour le polling"
+
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "message inattendu du serveur lors du démarrage"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "la session est en lecture seule"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "la session n'est pas en lecture seule"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "le serveur est dans le mode hot standby"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "le serveur n'est pas dans le mode hot standby"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "échec de « %s »"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "état de connexion invalide (%d), indiquant probablement une corruption de mémoire"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "URL LDAP « %s » invalide : le schéma doit être ldap://"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "URL LDAP « %s » invalide : le « distinguished name » manque"
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "URL LDAP « %s » invalide : doit avoir exactement un attribut"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "URL LDAP « %s » invalide : doit avoir une échelle de recherche (base/un/sous)"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "URL LDAP « %s » invalide : aucun filtre"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "URL LDAP « %s » invalide : numéro de port invalide"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "n'a pas pu créer la structure LDAP"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "échec de la recherche sur le serveur LDAP : %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "plusieurs entrées trouvées pendant la recherche LDAP"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "aucune entrée trouvée pendant la recherche LDAP"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "l'attribut n'a pas de valeur après la recherche LDAP"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "la longueur de la chaîne d'information de connexion dépasse le maximum permis (%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "« = » manquant après « %s » dans la chaîne des paramètres de connexion"
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "option de connexion « %s » invalide"
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "guillemets non refermés dans la chaîne des paramètres de connexion"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "définition du service « %s » introuvable"
 
-#: fe-connect.c:5666
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "fichier de service « %s » introuvable"
 
-#: fe-connect.c:5679
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "ligne %d trop longue dans le fichier service « %s »"
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "erreur de syntaxe dans le fichier service « %s », ligne %d"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "spécifications imbriquées de service non supportées dans le fichier service « %s », ligne %d"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "URI invalide propagée à la routine d'analyse interne : « %s »"
 
-#: fe-connect.c:6577
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 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 »"
 
-#: fe-connect.c:6584
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "l'adresse IPv6 de l'hôte ne peut pas être vide dans l'URI : « %s »"
 
-#: fe-connect.c:6599
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "caractère « %c » inattendu à la position %d de l'URI (caractère « : » ou « / » attendu) : « %s »"
 
-#: fe-connect.c:6728
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "séparateur « = » de clé/valeur en trop dans le paramètre de requête URI : « %s »"
 
-#: fe-connect.c:6748
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "séparateur « = » de clé/valeur manquant dans le paramètre de requête URI : « %s »"
 
-#: fe-connect.c:6800
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "paramètre de la requête URI invalide : « %s »"
 
-#: fe-connect.c:6874
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "jeton encodé en pourcentage invalide : « %s »"
 
-#: fe-connect.c:6884
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "valeur %%00 interdite dans la valeur codée en pourcentage : « %s »"
 
-#: fe-connect.c:7248
+#: fe-connect.c:7265
+#, c-format
+msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr "espaces inattendus trouvés dans « %s », utilisez des espaces encodés (%%20) à la place"
+
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "le pointeur de connexion est NULL\n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:970 fe-exec.c:3292
-#: fe-protocol3.c:974 fe-protocol3.c:1007
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ATTENTION : le fichier de mots de passe « %s » n'est pas un fichier texte\n"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7961
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
@@ -784,165 +1260,190 @@ msgstr ""
 "lecture pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
 "ou inférieur\n"
 
-#: fe-connect.c:7663
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "mot de passe récupéré dans le fichier « %s »"
 
-#: fe-exec.c:466 fe-exec.c:3366
+#: fe-connect.c:8231
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "valeur entière « %s » invalide pour l'option de connexion « %s »"
+
+#: fe-exec.c:469 fe-exec.c:3549
 #, 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"
 
-#: fe-exec.c:528 fe-protocol3.c:1976
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "échec en écriture vers le serveur"
 
-#: fe-exec.c:869
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "aucun texte d'erreur disponible"
 
-#: fe-exec.c:958
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: fe-exec.c:1016
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult ne supporte pas plus de INT_MAX lignes"
 
-#: fe-exec.c:1028
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "saturation de size_t"
 
-#: fe-exec.c:1444 fe-exec.c:1513 fe-exec.c:1559
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "la chaîne de commande est un pointeur nul"
 
-#: fe-exec.c:1450 fe-exec.c:2888
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%s non autorisé dans le mode pipeline"
 
-#: fe-exec.c:1518 fe-exec.c:1564 fe-exec.c:1658
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "le nombre de paramètres doit être compris entre 0 et %d"
 
-#: fe-exec.c:1554 fe-exec.c:1653
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "le nom de l'instruction est un pointeur nul"
 
-#: fe-exec.c:1695 fe-exec.c:3220
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "aucune connexion au serveur"
 
-#: fe-exec.c:1703 fe-exec.c:3228
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "une autre commande est déjà en cours"
 
-#: fe-exec.c:1733
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "ne peut pas mettre en queue les commandes lors du COPY"
 
-#: fe-exec.c:1850
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "la longueur doit être indiquée pour les paramètres binaires"
 
-#: fe-exec.c:2171
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "asyncStatus inattendu : %d"
 
-#: fe-exec.c:2327
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "les fonctions d'exécution de commande synchrone ne sont pas autorisées en mode pipeline"
 
-#: fe-exec.c:2344
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminé par un nouveau PQexec"
 
-#: fe-exec.c:2360
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "PQexec non autorisé pendant COPY BOTH"
 
-#: fe-exec.c:2586 fe-exec.c:2641 fe-exec.c:2709 fe-protocol3.c:1907
+#: fe-exec.c:2646
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "type de message « %c » non reconnu"
+
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "aucun COPY en cours"
 
-#: fe-exec.c:2895
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "connexion dans un état erroné"
 
-#: fe-exec.c:2938
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "ne peut pas entrer dans le mode pipeline, connexion active"
 
-#: fe-exec.c:2974 fe-exec.c:2995
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "ne peut pas sortir du mode pipeline avec des résultats non récupérés"
 
-#: fe-exec.c:2978
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "ne peut pas sortir du mode pipeline alors qu'il est occupé"
 
-#: fe-exec.c:2989
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "ne peut pas sortir du mode pipeline pendant un COPY"
 
-#: fe-exec.c:3154
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "ne peut pas envoyer le pipeline lorsqu'il n'est pas en mode pipeline"
 
-#: fe-exec.c:3255
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "code ExecStatusType invalide"
 
-#: fe-exec.c:3282
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult n'est pas un résultat d'erreur\n"
 
-#: fe-exec.c:3350 fe-exec.c:3373
+#: fe-exec.c:3533 fe-exec.c:3556
 #, 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"
 
-#: fe-exec.c:3388
+#: fe-exec.c:3571
 #, 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"
 
-#: fe-exec.c:3699
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "n'a pas pu interpréter la réponse du serveur : %s"
 
-#: fe-exec.c:3964 fe-exec.c:4054
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "caractère multi-octet incomplet"
 
+#: fe-exec.c:4159 fe-exec.c:4311
+#, c-format
+msgid "invalid multibyte character"
+msgstr "caractère multi-octets invalide"
+
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "la taille de la chaîne échappée dépasse le maximum permis (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "la taille du bytea échappé dépasse le maximum permis (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "erreur d'import du nom GSSAPI"
@@ -989,23 +1490,18 @@ msgstr "n'a pas pu écrire dans le fichier « %s » : %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "la requête d'initialisation des fonctions pour « Larges Objects » ne renvoie pas de données"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "entier de taille %lu non supporté par pqGetInt"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "entier de taille %lu non supporté par pqPutInt"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "la connexion n'est pas active"
-
-#: fe-misc.c:751 fe-secure-openssl.c:215 fe-secure-openssl.c:315
-#: fe-secure.c:257 fe-secure.c:419
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -1016,174 +1512,217 @@ msgstr ""
 "\tLe serveur s'est peut-être arrêté anormalement avant ou durant le\n"
 "\ttraitement de la requête."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "la connexion n'est pas active\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "le délai est dépassé"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "socket invalide"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "échec de %s() : %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "le message de type 0x%02x est arrivé alors que le serveur était en attente"
 
-#: fe-protocol3.c:385
+#: fe-protocol3.c:403
 #, 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 »)"
 
-#: fe-protocol3.c:427
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "réponse inattendue du serveur, le premier caractère reçu étant « %c »"
 
-#: fe-protocol3.c:450
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "le contenu du message ne correspond pas avec la longueur du type de message « %c »"
 
-#: fe-protocol3.c:468
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "synchronisation perdue avec le serveur : a reçu le type de message « %c », longueur %d"
 
-#: fe-protocol3.c:520 fe-protocol3.c:560
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "données insuffisantes dans le message « T »"
 
-#: fe-protocol3.c:631 fe-protocol3.c:837
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "mémoire épuisée pour le résultat de la requête"
 
-#: fe-protocol3.c:700
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "données insuffisantes dans le message « t »"
 
-#: fe-protocol3.c:759 fe-protocol3.c:791 fe-protocol3.c:809
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "données insuffisantes dans le message « D »"
 
-#: fe-protocol3.c:765
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "nombre de champs inattendu dans le message « D »"
 
-#: fe-protocol3.c:1020
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "aucun message d'erreur disponible\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1068 fe-protocol3.c:1087
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " au caractère %s"
 
-#: fe-protocol3.c:1100
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DÉTAIL : %s\n"
 
-#: fe-protocol3.c:1103
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "ASTUCE : %s\n"
 
-#: fe-protocol3.c:1106
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "REQUÊTE : %s\n"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTE : %s\n"
 
-#: fe-protocol3.c:1122
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "NOM DE SCHÉMA : %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "NOM DE TABLE : %s\n"
 
-#: fe-protocol3.c:1130
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "NOM DE COLONNE : %s\n"
 
-#: fe-protocol3.c:1134
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "NOM DU TYPE DE DONNÉES : %s\n"
 
-#: fe-protocol3.c:1138
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "NOM DE CONTRAINTE : %s\n"
 
-#: fe-protocol3.c:1150
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "EMPLACEMENT : "
 
-#: fe-protocol3.c:1152
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1154
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s : %s"
 
-#: fe-protocol3.c:1349
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "LIGNE %d : "
 
-#: fe-protocol3.c:1423
+#: fe-protocol3.c:1456
 #, c-format
-msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
-msgstr "version du protocole non supportée par le serveur : le client utilise %u.%u, le serveur supporte jusqu'à %u.%u"
+msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
+msgstr "a reçu un message invalide pour la négociation du protocole : le serveur a demandé de passer sur une version du protocole postérieure"
 
-#: fe-protocol3.c:1429
+#: fe-protocol3.c:1462
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "extension du protocole non supportée par le serveur : %s"
-msgstr[1] "extensions du protocole non supportées par le serveur : %s"
+msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
+msgstr "a reçu un message invalide pour la négociation du protocole : le serveur a demandé de passer sur une version du protocole antérieure à la 3.0"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1469
 #, c-format
-msgid "invalid %s message"
-msgstr "message %s invalide"
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "a reçu un message invalide de négociation du protocole : le serveur a réclamé le retour à une version inexistante du protocole (3.1)"
 
-#: fe-protocol3.c:1802
+#: fe-protocol3.c:1475
+#, c-format
+msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
+msgstr "a reçu un message invalide pour la négociation du protocole : le serveur a renvoyé un nombre négatif de paramètres non pris en compte"
+
+#: fe-protocol3.c:1481
+#, c-format
+msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
+msgstr "a reçu un message invalide pour la négociation du protocole : le serveur a négocié mais n'a demandé aucun changement"
+
+#: fe-protocol3.c:1487
+#, c-format
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "le serveur accepte seulement la version %d.%d du protocole mais « %s » a été configuré à %d.%d"
+
+#: fe-protocol3.c:1512
+#, c-format
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "a reçu un message invalide de négociation du protocole : le serveur a rapporté un nom de paramètre non supporté avec un préfixe « %s » (« %s »)"
+
+#: fe-protocol3.c:1515
+#, c-format
+msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
+msgstr "a reçu un message invalide de négociation du protocole : le serveur a rapporté un paramètre non supporté qui n'était pas demandé (« %s »)"
+
+#: fe-protocol3.c:1522
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "a reçu un message invalide pour la négociation du protocole : message trop court"
+
+#: fe-protocol3.c:1588
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "a reçu un message BackendKeyData invalide : la clé d'annulation de longueur %d n'est pas autorisée dans la version 3.0 du protocole (doit être de 4 octets)"
+
+#: fe-protocol3.c:1595
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "a reçu un message BackendKeyData invalide : la clé d'annulation de longueur %d est trop courte (minimum 4 octets)"
+
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "a reçu un message BackendKeyData invalide : la clé d'annulation de longueur %d est trop longue (maximum 256 octets)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline : ne va pas réaliser un COPY OUT au format texte"
 
-#: fe-protocol3.c:2176
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "erreur de protocole : aucun résultat de fonction"
 
-#: fe-protocol3.c:2187
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "erreur de protocole : id=0x%x"
@@ -1234,123 +1773,131 @@ msgstr "erreur d'emballage GSSAPI"
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "le message sortant GSSAPI n'utiliserait pas la confidentialité"
 
-#: fe-secure-gssapi.c:215
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "le client a essayé d'envoyer un paquet GSSAPI trop gros (%zu > %zu)"
 
-#: fe-secure-gssapi.c:351 fe-secure-gssapi.c:593
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "paquet GSSAPI trop gros envoyé par le serveur (%zu > %zu)"
 
-#: fe-secure-gssapi.c:390
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "erreur de dépaquetage GSSAPI"
 
-#: fe-secure-gssapi.c:399
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "le message entrant GSSAPI n'a pas utilisé la confidentialité"
 
-#: fe-secure-gssapi.c:656
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "n'a pas pu initier le contexte de sécurité GSSAPI"
 
-#: fe-secure-gssapi.c:685
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "erreur de vérification de la taille GSSAPI"
 
-#: fe-secure-gssapi.c:696
-msgid "GSSAPI context establishment error"
-msgstr "erreur d'établissement du contexte GSSAPI"
-
-#: fe-secure-openssl.c:219 fe-secure-openssl.c:319 fe-secure-openssl.c:1531
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "erreur SYSCALL SSL : %s"
 
-#: fe-secure-openssl.c:225 fe-secure-openssl.c:325 fe-secure-openssl.c:1534
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "erreur SYSCALL SSL : EOF détecté"
 
-#: fe-secure-openssl.c:235 fe-secure-openssl.c:335 fe-secure-openssl.c:1542
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "erreur SSL : %s"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:349
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
-msgstr "la connexion SSL a été fermée de façon inattendu"
+msgstr "la connexion SSL a été fermée de façon inattendue"
 
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:354 fe-secure-openssl.c:1589
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "code d'erreur SSL inconnu : %d"
 
-#: fe-secure-openssl.c:397
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "n'a pas pu déterminer l'algorithme de signature du certificat serveur"
 
-#: fe-secure-openssl.c:417
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "n'a pas pu trouver l'entrée pour le NID %s"
 
-#: fe-secure-openssl.c:426
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "n'a pas pu générer le hachage du certificat peer"
 
-#: fe-secure-openssl.c:509
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "l'entrée du nom du certificat SSL est manquante"
 
-#: fe-secure-openssl.c:543
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "l'entrée d'adresse du certificat SSL est manquante"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "ATTENTION : n'a pas pu ouvrir le fichier de traces des clés SSL « %s » : %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr ""
+"ATTENTION : n'a pas pu écrire dans le fichier de traces des clés SSL « %s » : %m\n"
+"\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "n'a pas pu créer le contexte SSL : %s"
 
-#: fe-secure-openssl.c:1002
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "valeur « %s » invalide pour la version minimale du protocole SSL"
 
-#: fe-secure-openssl.c:1012
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "n'a pas pu configurer la version minimale de protocole SSL : %s"
 
-#: fe-secure-openssl.c:1028
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "valeur « %s » invalide pour la version maximale du protocole SSL"
 
-#: fe-secure-openssl.c:1038
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "n'a pas pu configurer la version maximale de protocole SSL : %s"
 
-#: fe-secure-openssl.c:1076
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "n'a pas pu charger les chemins du certificat racine système : %s"
 
-#: fe-secure-openssl.c:1093
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "n'a pas pu lire le certificat racine « %s » : %s"
 
-#: fe-secure-openssl.c:1145
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1359,7 +1906,7 @@ msgstr ""
 "n'a pas pu obtenir le répertoire personnel pour situer le fichier de certificat racine.\n"
 "Fournissez le fichier, utilisez les racines de confiance du système avec sslrootcert=system, ou modifiez sslmode pour désactiver la vérification du certificat par le serveur."
 
-#: fe-secure-openssl.c:1148
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1368,112 +1915,137 @@ msgstr ""
 "le fichier de certificat racine « %s » n'existe pas.\n"
 "Fournissez le fichier, utilisez les racines de confiance du système avec sslrootcert=system, ou modifiez sslmode pour désactiver la vérification du certificat par le serveur."
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "n'a pas pu ouvrir le certificat « %s » : %s"
 
-#: fe-secure-openssl.c:1201
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "n'a pas pu lire le certificat « %s » : %s"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "n'a pas pu établir la connexion SSL : %s"
 
-#: fe-secure-openssl.c:1257
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "ATTENTION : la prise en compte de sslkeylogfile requiert OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "ATTENTION : libpq n'a pas été construit avec le support de sslkeylogfile\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "n'a pas pu configurer le SSL Server Name Indication (SNI) : %s"
 
-#: fe-secure-openssl.c:1300
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "n'a pas pu configurer l'extension ALPN de SSL : %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "n'a pas pu charger le moteur SSL « %s » : %s"
 
-#: fe-secure-openssl.c:1311
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "n'a pas pu initialiser le moteur SSL « %s » : %s"
 
-#: fe-secure-openssl.c:1326
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "n'a pas pu lire la clé privée SSL « %s » à partir du moteur « %s » : %s"
 
-#: fe-secure-openssl.c:1339
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "n'a pas pu charger la clé privée SSL « %s » à partir du moteur « %s » : %s"
 
-#: fe-secure-openssl.c:1376
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "le certificat est présent, mais la clé privée « %s » est absente"
 
-#: fe-secure-openssl.c:1379
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "n'a pas pu interroger le fichier de clé privée « %s » : %m"
 
-#: fe-secure-openssl.c:1387
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "le fichier de clé privée « %s » n'est pas un fichier"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "le fichier de clé privée « %s » a des droits d'accès pour le groupe ou le monde ; le fichier doit avoir les droits u=rw (0600) ou moins si le propriétaire est l'utilisateur courant, ou les droits u=rw,g=r (0640) ou moins si le propriétaire est root"
 
-#: fe-secure-openssl.c:1444
+#: fe-secure-openssl.c:1294
 #, 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"
 
-#: fe-secure-openssl.c:1460
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "le certificat ne correspond pas à la clé privée « %s » : %s"
 
-#: fe-secure-openssl.c:1528
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "erreur SSL : échec de la vérification du certificat : %s"
 
-#: fe-secure-openssl.c:1573
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "Ceci pourrait indiquer que le serveur ne supporte aucune des versions du protocole SSL entre %s et %s."
 
-#: fe-secure-openssl.c:1606
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid "direct SSL connection was established without ALPN protocol negotiation extension"
+msgstr "la connexion SSL directe a été établie sans l'extension de négociation du protocole ALPN"
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "la connexion SSL a été établie avec un protocole ALPN inattendu"
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "le certificat n'a pas pu être obtenu : %s"
 
-#: fe-secure-openssl.c:1711
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "aucune erreur SSL reportée"
 
-#: fe-secure-openssl.c:1720
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "code d'erreur SSL %lu"
 
-#: fe-secure-openssl.c:1986
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "ATTENTION : sslpassword tronqué\n"
 
-#: fe-secure.c:263
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "n'a pas pu recevoir des données depuis le serveur : %s"
 
-#: fe-secure.c:434
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "n'a pas pu transmettre les données au serveur : %s"
@@ -1483,270 +2055,123 @@ msgstr "n'a pas pu transmettre les données au serveur : %s"
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "erreur de socket non reconnue : 0x%08X/%d"
 
-#~ msgid "\"SELECT pg_is_in_recovery()\" failed\n"
-#~ msgstr "\"SELECT pg_is_in_recovery()\" a échoué\n"
-
-#~ msgid "\"SHOW transaction_read_only\" failed\n"
-#~ msgstr "\"SHOW transaction_read_only\" a échoué\n"
+#~ msgid "GSSAPI context establishment error"
+#~ msgstr "erreur d'établissement du contexte GSSAPI"
 
 #, c-format
-#~ msgid "%s(%s) failed: error code %d\n"
-#~ msgstr "échec de %s(%s) : code d'erreur %d\n"
-
-#~ msgid "COPY IN state must be terminated first\n"
-#~ msgstr "l'état COPY IN doit d'abord être terminé\n"
-
-#~ msgid "COPY OUT state must be terminated first\n"
-#~ msgstr "l'état COPY OUT doit d'abord être terminé\n"
-
-#~ msgid "Kerberos 5 authentication rejected: %*s\n"
-#~ msgstr "authentification Kerberos 5 rejetée : %*s\n"
+#~ msgid "adding kqueue timer to multiplexer: %m"
+#~ msgstr "ajout du chronomètre kqueue au multiplexeur : %m"
 
 #, c-format
-#~ msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
-#~ msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_CONNRESET\n"
+#~ msgid "could not add to epoll set: %m"
+#~ msgstr "n'a pas pu ajouter à « epoll set » : %m"
 
 #, c-format
-#~ msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
-#~ msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_RESULTCREATE\n"
-
-#~ msgid "SCM_CRED authentication method not supported\n"
-#~ msgstr "authentification SCM_CRED non supportée\n"
+#~ msgid "could not add to kqueue: %m"
+#~ msgstr "n'a pas pu ajouter à kqueue : %m"
 
 #, c-format
-#~ msgid "SSL error: %s\n"
-#~ msgstr "erreur SSL : %s\n"
-
-#~ 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"
+#~ msgid "could not comb kqueue: %m"
+#~ msgstr "n'a pas pu passer dans kqueue : %m"
 
 #, 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"
-
-#~ msgid "WARNING: line %d too long in password file \"%s\"\n"
-#~ msgstr "ATTENTION : ligne %d trop longue dans le fichier de mots de passe « %s »\n"
-
-#~ msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %d\n"
-#~ msgstr "échec de WSAIoctl(SIO_KEEPALIVE_VALS)  : %d\n"
-
-#~ msgid "cannot determine OID of function lo_creat\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_creat\n"
-
-#~ msgid "cannot determine OID of function lo_create\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_create\n"
-
-#~ msgid "cannot determine OID of function lo_lseek\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek\n"
-
-#~ msgid "cannot determine OID of function lo_lseek64\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek64\n"
-
-#~ msgid "cannot determine OID of function lo_open\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_open\n"
-
-#~ msgid "cannot determine OID of function lo_tell64\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_tell64\n"
-
-#~ msgid "cannot determine OID of function lo_truncate\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate\n"
-
-#~ msgid "cannot determine OID of function lo_truncate64\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate64\n"
-
-#~ msgid "cannot determine OID of function lo_unlink\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lo_unlink\n"
-
-#~ msgid "cannot determine OID of function loread\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction loread\n"
-
-#~ msgid "cannot determine OID of function lowrite\n"
-#~ msgstr "ne peut pas déterminer l'OID de la fonction lowrite\n"
-
-#~ msgid "could not acquire mutex: %s\n"
-#~ msgstr "n'a pas pu acquérir le mutex : %s\n"
-
-#~ msgid ""
-#~ "could not connect to server: %s\n"
-#~ "\tIs the server running on host \"%s\" (%s) and accepting\n"
-#~ "\tTCP/IP connections on port %s?\n"
-#~ msgstr ""
-#~ "n'a pas pu se connecter au serveur : %s\n"
-#~ "\tLe serveur est-il actif sur l'hôte « %s » (%s)\n"
-#~ "\tet accepte-t-il les connexionsTCP/IP sur le port %s ?\n"
+#~ msgid "could not delete from epoll set: %m"
+#~ msgstr "n'a pas pu supprimer de « epoll set » : %m"
 
 #, c-format
-#~ msgid "could not create SSL context: %s\n"
-#~ msgstr "n'a pas pu créer le contexte SSL : %s\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"
-#~ "du client\n"
-
-#~ msgid "could not get home directory to locate password file\n"
-#~ msgstr ""
-#~ "n'a pas pu obtenir le répertoire personnel pour trouver le fichier de\n"
-#~ "mot de passe\n"
-
-#~ 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"
+#~ msgid "could not delete from kqueue: %m"
+#~ msgstr "n'a pas pu supprimer de kqueue : %m"
 
 #, 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"
-
-#~ msgid "could not make a writable connection to server \"%s:%s\"\n"
-#~ msgstr "n'a pas pu réaliser une connexion en écriture au serveur « %s » : %s\n"
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "n'a pas pu rechercher l'identifiant de l'utilisateur local %d : %s"
 
 #, c-format
-#~ msgid "could not open file \"%s\": %s\n"
-#~ msgstr "n'a pas pu ouvrir le fichier « %s » : %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 "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 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 set maximum version of SSL protocol: %s\n"
-#~ msgstr "n'a pas pu mettre en place la version maximale du protocole SSL : %s\n"
-
-#~ msgid "could not set minimum version of SSL protocol: %s\n"
-#~ msgstr "n'a pas pu mettre en place la version minimale du protocole SSL : %s\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 "extraneous data in \"D\" message"
-#~ msgstr "données supplémentaires dans le message « D »"
-
-#~ msgid "extraneous data in \"T\" message"
-#~ msgstr "données supplémentaires dans le message « T »"
-
-#~ msgid "extraneous data in \"t\" message"
-#~ msgstr "données supplémentaires dans le message « t »"
-
-#~ msgid "failed to generate nonce\n"
-#~ msgstr "échec pour la génération de nonce\n"
-
-#~ msgid "failed to generate random salt"
-#~ msgstr "a échoué à générer le sel aléatoire"
-
-#~ msgid "function requires at least protocol version 3.0\n"
-#~ msgstr "la fonction nécessite au minimum le protocole 3.0\n"
-
-#~ msgid "incoming GSSAPI message did not use confidentiality\n"
-#~ msgstr "le message entrant GSSAPI n'a pas utilisé pas la confidentialité\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 "invalid channel_binding value: \"%s\"\n"
-#~ msgstr "valeur de channel_binding invalide : « %s »\n"
-
-#~ msgid "invalid gssencmode value: \"%s\"\n"
-#~ msgstr "valeur gssencmode invalide : « %s »\n"
-
-#~ 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"
-
-#~ msgid "invalid ssl_max_protocol_version value: \"%s\"\n"
-#~ msgstr "valeur ssl_max_protocol_version invalide : « %s »\n"
-
-#~ msgid "invalid ssl_min_protocol_version value: \"%s\"\n"
-#~ msgstr "valeur ssl_min_protocol_version invalide : « %s »\n"
-
-#~ msgid "invalid state %c, probably indicative of memory corruption\n"
-#~ msgstr "état %c invalide, indiquant probablement une corruption de la mémoire\n"
-
-#~ msgid "invalid target_session_attrs value: \"%s\"\n"
-#~ msgstr "valeur target_session_attrs invalide : « %s »\n"
+#~ msgid "could not modify kqueue: %m"
+#~ msgstr "n'a pas pu modifier dans kqueue : %m"
 
 #, 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"
-
-#~ msgid "lost synchronization with server, resetting connection"
-#~ msgstr "synchronisation perdue avec le serveur, réinitialisation de la connexion"
+#~ msgid "could not update epoll set: %m"
+#~ msgstr "n'a pas pu modifier « epoll set » : %m"
 
-#~ msgid "no GSSAPI support; cannot require GSSAPI\n"
-#~ msgstr "pas de support de GSSAPI : ne peut pas nécessiter GSSAPI\n"
+#, c-format
+#~ msgid "deleting kqueue timer: %m"
+#~ msgstr "suppression du chronomètre kqueue : %m"
 
-#~ msgid "outgoing GSSAPI message would not use confidentiality\n"
-#~ msgstr "le message sortant GSSAPI n'utiliserait pas la confidentialité\n"
+#, c-format
+#~ msgid "failed to add timerfd to epoll set: %m"
+#~ msgstr "a échoué à ajouer timerfd à « epoll set » : %m"
 
-#~ msgid "private key file \"%s\" changed during execution\n"
-#~ msgstr "la clé privée « %s » a été modifiée durant l'exécution\n"
+#, c-format
+#~ msgid "failed to create epoll set: %m"
+#~ msgstr "a échoué à créer « epoll set » : %m"
 
 #, 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"
+#~ msgid "failed to create timer kqueue: %m"
+#~ msgstr "a échoué à créer une chronomètre pour « epoll set » : %m"
 
 #, c-format
-#~ msgid "private key file \"%s\" is not a regular file\n"
-#~ msgstr "le fichier de clé privée « %s » n'est pas un fichier standard\n"
+#~ msgid "failed to create timerfd: %m"
+#~ msgstr "a échoué à créer timerfd : %m"
 
 #, c-format
-#~ msgid "private key file \"%s\" must be owned by the current user or root\n"
-#~ msgstr "le fichier de clé privée « %s » doit avoir comme propriétaire l'utilisateur courant ou root\n"
+#~ msgid "getting timerfd value: %m"
+#~ msgstr "récupération de la valeur de timerfd : %m"
 
-#~ msgid "select() failed: %s\n"
-#~ msgstr "échec de select() : %s\n"
+#, c-format
+#~ msgid "internal error: array member found at nesting level %d"
+#~ msgstr "erreur interne : membre du tableau trouvé au niveau d'imbrication %d"
 
-#~ 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 »)"
+#, c-format
+#~ msgid "internal error: field '%s' still active at end of object"
+#~ msgstr "erreur interne : champ « %s » toujours actif à la fin de l'objet"
 
-#~ 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"
+#, c-format
+#~ msgid "internal error: found unexpected array end while parsing field '%s'"
+#~ msgstr "erreur interne : a reçu une fin de tableau inattendu lors de l'analyse du champ « %s »"
 
-#~ msgid "setsockopt(%s) failed: %s\n"
-#~ msgstr "setsockopt(%s) a échoué : %s\n"
+#, c-format
+#~ msgid "internal error: scalar field '%s' would be assigned twice"
+#~ msgstr "erreur interne : le champ scalaire '%s' serait affecté deux fois"
 
-#~ msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
-#~ msgstr "setsockopt(SO_KEEPALIVE) a échoué : %s\n"
+#, c-format
+#~ msgid "internal error: scalar target found at nesting level %d"
+#~ msgstr "erreur interne : cible scalaire trouvée au niveau d'imbrication %d"
 
-#~ msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
-#~ msgstr "setsockopt(TCP_KEEPALIVE) a échoué : %s\n"
+#, c-format
+#~ msgid "internal error: started field '%s' before field '%s' was finished"
+#~ msgstr "erreur interne : le champ « %s » a commencé avant que le champ « %s » n'ait terminé"
 
-#~ msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
-#~ msgstr "setsockopt(TCP_KEEPIDLE) a échoué : %s\n"
+#, c-format
+#~ msgid "invalid %s message"
+#~ msgstr "message %s invalide"
 
-#~ msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
-#~ msgstr "setsockopt(TCP_KEEPINTVL) a échoué : %s\n"
+#, c-format
+#~ msgid "keepalives parameter must be an integer"
+#~ msgstr "le paramètre keepalives doit être un entier"
 
-#~ msgid "socket not open\n"
-#~ msgstr "socket non ouvert\n"
+#, c-format
+#~ msgid "protocol extension not supported by server: %s"
+#~ msgid_plural "protocol extensions not supported by server: %s"
+#~ msgstr[0] "extension du protocole non supportée par le serveur : %s"
+#~ msgstr[1] "extensions du protocole non supportées par le serveur : %s"
 
-#~ 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 »)"
+#, c-format
+#~ msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
+#~ msgstr "version du protocole non supportée par le serveur : le client utilise %u.%u, le serveur supporte jusqu'à %u.%u"
 
 #, c-format
-#~ msgid "unrecognized SSL error code: %d\n"
-#~ msgstr "code d'erreur SSL inconnu : %d\n"
+#~ msgid "removing kqueue timer from multiplexer: %m"
+#~ msgstr "suppression du chronomètre kqueue du multiplexeur : %m"
 
-#~ msgid "unrecognized return value from row processor"
-#~ msgstr "valeur de retour du traitement de la ligne non reconnue"
+#, c-format
+#~ msgid "setting kqueue timer to %ld: %m"
+#~ msgstr "configuration du chronomètre kqueue à %ld : %m"
 
 #, c-format
-#~ msgid "user name lookup failure: error code %lu\n"
-#~ msgstr "échec de la recherche du nom d'utilisateur : code d'erreur %lu\n"
+#~ msgid "setting timerfd to %ld: %m"
+#~ msgstr "configuration de timerfd à %ld : %m"
 
-#~ 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"
+#, c-format
+#~ msgid "unknown libcurl socket operation: %d"
+#~ msgstr "opération inconnue par socket libcurl : %d"
diff --git a/src/interfaces/libpq/po/ja.po b/src/interfaces/libpq/po/ja.po
index 4972a666826..2b28c05029c 100644
--- a/src/interfaces/libpq/po/ja.po
+++ b/src/interfaces/libpq/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libpq (PostgreSQL 18)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-04-07 09:45+0900\n"
-"PO-Revision-Date: 2025-04-07 15:59+0900\n"
+"POT-Creation-Date: 2025-12-16 09:30+0900\n"
+"PO-Revision-Date: 2025-12-16 11:17+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -20,6 +20,393 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.13\n"
 
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
+#, c-format
+msgid "libcurl easy handle removal failed: %s"
+msgstr "libcurl簡易ハンドルの削除に失敗しました: %s"
+
+#: ../libpq-oauth/oauth-curl.c:328
+#, c-format
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "libcurlマルチハンドルのクリーンアップに失敗しました: %s"
+
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "OAuth接続での%sの設定に失敗しました: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "OAuth応答からの%sの取得に失敗しました: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "フィールド\"%s\"は文字列でなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "フィールド\"%s\"は数値でなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "フィールド\"%s\"は文字列配列でなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "フィールド\"%s\"が想定外の型です"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSONのネストが深すぎます"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "フィールド\"%s\"は重複しています。"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "最上位要素はオブジェクトでなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "Content-Typeヘッダーがありませんでした"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "想定しないContent-Typeヘッダーの値: \"%s\""
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "応答の途中にnullが含まれています"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "応答は有効なUTF-8ではありません"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "フィールド\"%s\"が存在しません"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "トークンのエラーレスポンスのパースに失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "プロバイダがoauth_client_secretを拒否しました"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "プロバイダはクライアント認証を必須としていますが、oauth_client_secret が設定されていません"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "タイマー満了確認中: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "libcurl のマルチハンドルの作成に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "libcurl ハンドルの作成に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "メモリ不足です"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "応答が大きすぎます"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "HTTPリクエストのキューイングに失敗: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "非同期HTTPリクエストが失敗しました: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "終了済みのハンドルから結果が得られませんでした"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "想定外のレスポンスコード %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "OpenIDディスカバリードキュメントのパースに失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "issuer識別子(%s)がoauth_issuer (%s)と一致しません"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "issuer\"%s\"はデバイス認証エンドポイントを提供していません"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "デバイス認証エンドポイント\"%s\"はHTTPSを使用しなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "トークン・エンドポイント \"%s\" はHTTPSを使用しなければなりません"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "デバイス認証のパースに失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "アクセストークン応答のパースに失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "slow_down間隔のオーバーフロー"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "%sにアクセスしてコードを入力してください: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "デバイス認証の開始に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init は過去の OAuth セットアップ中に失敗しています"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init が OAuth セットアップ中に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurlはすでにスレッドセーフではありません\n"
+"libpqのコンパイルの際にはcurlの初期化がスレッドセーフだと報告されましたが、\n"
+"現在インストールされている libcurl はそうではないと報告しています。 libpq を\n"
+"このインストールされているバージョンの libcurl でコンパイルしてください。"
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "OpenIDディスカバリードキュメントの取得に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "OAuthデバイス認証を実行できません"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "デバイス認可の取得に失敗しました"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "アクセストークンの取得に失敗しました"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "内部エラー: 接続にOAuthトークンが設定されていません"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "OAuthディスカバリーURI \"%s\" はHTTPSを使用しなければなりません"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "OAuthディスカバリーURI \"%s\" にはクエリ要素やフラグメント要素を含めることはできません"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "OAuthディスカバリーURI \"%s\" は /.well-known で始まるURIではありません"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "OAuthディスカバリーURI \"%s\" は、サポートされていない .well-known のサフィックスを使用しています"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "OAuthディスカバリーURI \"%s\" のフォーマットが不正です"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "サーバーのエラーメッセージの途中にNULLが含まれていたため、メッセージは破棄されました"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "サーバーのエラー応答は有効なUTF-8ではありません"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "サーバーのエラー応答のパースに失敗しました: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "%s のサーバーのディスカバリー・ドキュメントの発行者 \"%s\"が oauth_issuer (%s)と一致していません"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "サーバーのディスカバリードキュメントは %s に移動しました (以前は %s にありました)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "サーバーがステータスを持たないエラー応答を送出しました"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "サーバーがOAuth Bearer トークンを拒否しました: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "ユーザー定義のOAuthフローは、トークンも非同期コールバックも返しませんでした"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "ユーザー定義のOAuthフローが失敗しました"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "ユーザー定義のOAuthフローは、トークンが返しませんでした"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "ユーザー定義OAuthフローがポーリング対象のソケットを指定しませんでした"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "mutexのロックに失敗しました (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "使用可能なOAuthフローがありません (libpq-oauthパッケージをインストールしてみてください)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "サーバーは OAuth 認証を必須としていますが、oauth_issuer と oauth_client_id が両方とも設定されていません"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "サーバーが予期しない追加のOAuthデータを送ってきました"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "サーバーが OAuth 認証を必須としていますが、ディスカバリー・メタデータが提供されていません"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "内部エラー: OAuthフローがトークンを設定しませんでした"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "サーバーがエラーに続いて追加のOAuthデータを送出しました"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "不正な OAuth exchange state"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "新しい Bearer トークンで接続を再試行します"
+
 #: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
@@ -43,7 +430,7 @@ msgstr "正しくないサーバー署名"
 #: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
-msgstr "不正なSCRAM交換状態"
+msgstr "不正な SCRAM exchange state"
 
 #: fe-auth-scram.c:316
 #, c-format
@@ -60,26 +447,6 @@ msgstr "SCRAMメッセージのフォーマット異常 (属性 \"%c\" に文字
 msgid "could not generate nonce"
 msgstr "nonce を生成できませんでした"
 
-#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
-#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
-#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
-#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
-#: fe-auth.c:1493 fe-cancel.c:177 fe-connect.c:1005 fe-connect.c:1045
-#: fe-connect.c:2169 fe-connect.c:2331 fe-connect.c:3724 fe-connect.c:5172
-#: fe-connect.c:5485 fe-connect.c:5740 fe-connect.c:5858 fe-connect.c:6105
-#: fe-connect.c:6185 fe-connect.c:6283 fe-connect.c:6534 fe-connect.c:6561
-#: fe-connect.c:6637 fe-connect.c:6660 fe-connect.c:6684 fe-connect.c:6719
-#: fe-connect.c:6805 fe-connect.c:6813 fe-connect.c:7170 fe-connect.c:7352
-#: fe-exec.c:530 fe-exec.c:1315 fe-exec.c:3254 fe-exec.c:4291 fe-exec.c:4457
-#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:210 fe-protocol3.c:233
-#: fe-protocol3.c:256 fe-protocol3.c:273 fe-protocol3.c:294 fe-protocol3.c:368
-#: fe-protocol3.c:732 fe-protocol3.c:972 fe-protocol3.c:1552
-#: fe-protocol3.c:1861 fe-protocol3.c:2262 fe-secure-common.c:110
-#: fe-secure-gssapi.c:496 fe-secure-openssl.c:405 fe-secure-openssl.c:1131
-#, c-format
-msgid "out of memory"
-msgstr "メモリ不足です"
-
 #: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
@@ -345,7 +712,7 @@ msgstr "認識できないパスワード暗号化アルゴリズム \"%s\""
 msgid "connection pointer is NULL"
 msgstr "接続ポインタはNULLです"
 
-#: fe-cancel.c:85 fe-misc.c:587
+#: fe-cancel.c:85 fe-misc.c:613
 #, c-format
 msgid "connection not open"
 msgstr "接続はオープンされていません"
@@ -355,705 +722,720 @@ msgstr "接続はオープンされていません"
 msgid "no cancellation key received"
 msgstr "キャンセルキーを受信していません"
 
-#: fe-cancel.c:211
+#: fe-cancel.c:212
 #, c-format
 msgid "cancel request is already being sent on this connection"
 msgstr "このセッションではすでにキャンセル要求を送出済みです"
 
-#: fe-cancel.c:281
+#: fe-cancel.c:282
 #, c-format
 msgid "unexpected response from server"
 msgstr "サーバーからの想定外の応答"
 
-#: fe-connect.c:1302
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "%d個のホスト名と%d個のhostaddrの値との突き合せはできません"
 
-#: fe-connect.c:1382
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "%d個のポート番号と%d個のホストとの突き合せはできません"
 
-#: fe-connect.c:1510
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "require_authの方式否定\"%s\"は方式要求と同時に指定することはできません"
 
-#: fe-connect.c:1523
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "require_authの方式要求\"%s\"は方式否定と同時に指定することはできません"
 
-#: fe-connect.c:1599 fe-connect.c:1728 fe-connect.c:1770 fe-connect.c:1813
-#: fe-connect.c:1916 fe-connect.c:1962 fe-connect.c:2002 fe-connect.c:2073
-#: fe-connect.c:8244
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "%s の値が不正: \"%s\""
 
-#: fe-connect.c:1641
+#: fe-connect.c:1648
 #, c-format
 msgid "internal error: no space in allowed_sasl_mechs"
 msgstr "内部エラー: allowed_sasl_mechs に空きがありません"
 
-#: fe-connect.c:1680
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "require_authで方式\"%s\"が複数回指定されました"
 
-#: fe-connect.c:1751 fe-connect.c:1790 fe-connect.c:1822 fe-connect.c:1924
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "%s 値\"%s\"はSSLサポートがコンパイルされていない場合は無効です"
 
-#: fe-connect.c:1842
+#: fe-connect.c:1849
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
 msgstr "弱いsslmode\"%s\"はsslnegotiation=direct とともには使用できません( \"require\", \"verify-ca\"または\"verify-full\"を使用してください)"
 
-#: fe-connect.c:1864
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "弱いsslmode\"%s\"はsslrootcert=systemとともには使用できません(\"verify-full\"を使用してください)"
 
-#: fe-connect.c:1877 fe-connect.c:1885
+#: fe-connect.c:1884 fe-connect.c:1892
 #, c-format
 msgid "invalid \"%s\" value: \"%s\""
 msgstr "\"%s\"の値が不正: \"%s\""
 
-#: fe-connect.c:1902
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "不正なSSLプロトコルバージョン範囲"
 
-#: fe-connect.c:1939
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s 値\"%s\"はサポートされていません(OpenSSLのバージョンを確認してください)"
 
-#: fe-connect.c:1969
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "gssencmodeの値\"%s\"はGSSAPIサポートがコンパイルされていない場合は不正"
 
-#: fe-connect.c:2023
+#: fe-connect.c:2030
 #, c-format
 msgid "invalid SCRAM client key"
 msgstr "不正なSCRAMクライアントキー"
 
-#: fe-connect.c:2029
+#: fe-connect.c:2035
 #, c-format
 msgid "invalid SCRAM client key length: %d"
 msgstr "不正なSCRAMクライアントキー長: %d"
 
-#: fe-connect.c:2048
+#: fe-connect.c:2053
 #, c-format
 msgid "invalid SCRAM server key"
 msgstr "不正なSCRAMサーバーキー"
 
-#: fe-connect.c:2054
+#: fe-connect.c:2058
 #, c-format
 msgid "invalid SCRAM server key length: %d"
 msgstr "不正なSCRAMサーバーキー長: %d"
 
-#: fe-connect.c:2142
+#: fe-connect.c:2145
 #, c-format
-msgid "min_protocol_version is greater than max_protocol_version"
-msgstr "min_protocol_version が max_protocol_version よりも大きいです"
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\"が\"%s\"より大きいです"
 
-#: fe-connect.c:2354
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "TCPソケットを非遅延モードに設定できませんでした: %s"
 
-#: fe-connect.c:2413
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "ソケット\"%s\"のサーバーへの接続に失敗しました: "
 
-#: fe-connect.c:2439
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "\"%s\"(%s)、ポート%sのサーバーへの接続に失敗しました: "
 
-#: fe-connect.c:2444
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "\"%s\"、ポート%sのサーバーへの接続に失敗しました: "
 
-#: fe-connect.c:2467
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tサーバーはローカルで稼働していてそのソケットで接続を受け付けていますか?"
 
-#: fe-connect.c:2469
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tサーバーはそのホスト上で稼働していてTCP/IP接続を受け付けていますか?"
 
-#: fe-connect.c:2515 fe-connect.c:2549 fe-connect.c:2584 fe-connect.c:2682
-#: fe-connect.c:3408
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s)が失敗しました: %s"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s)が失敗しました: エラーコード %d"
 
-#: fe-connect.c:2960
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "接続状態が不正です。メモリ障害の可能性があります"
 
-#: fe-connect.c:3043
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "不正なポート番号です: \"%s\""
 
-#: fe-connect.c:3057
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "ホスト名\"%s\"をアドレスに変換できませんでした: %s"
 
-#: fe-connect.c:3069
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "ネットワークアドレス\"%s\"をパースできませんでした: %s"
 
-#: fe-connect.c:3080
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Unixドメインソケットのパス\"%s\"が長すぎます(最大 %d バイト)"
 
-#: fe-connect.c:3094
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "Unixドメインソケットのパス\"%s\"をアドレスに変換できませんでした: %s"
 
-#: fe-connect.c:3260 fe-connect.c:4707
+#: fe-connect.c:3263 fe-connect.c:4710
 #, c-format
 msgid "GSSAPI encryption required but it is not supported over a local socket"
 msgstr "GSSAPI暗号化が要求されていますが、ローカルソケットではサポートされません"
 
-#: fe-connect.c:3268 fe-connect.c:4836
+#: fe-connect.c:3271 fe-connect.c:4839
 #, c-format
 msgid "GSSAPI encryption required but no credential cache"
 msgstr "GSSAPI暗号化が要求されましたが、資格証明キャッシュがありません"
 
-#: fe-connect.c:3336
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "ソケットを作成できませんでした: %s"
 
-#: fe-connect.c:3367
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "ソケットを非ブロッキングモードに設定できませんでした: %s\\"
 
-#: fe-connect.c:3378
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "ソケットをclose-on-execモードに設定できませんでした: %s"
 
-#: fe-connect.c:3535
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "ソケットのエラー状態を取得できませんでした: %s"
 
-#: fe-connect.c:3562
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "ソケットからクライアントアドレスを取得できませんでした: %s"
 
-#: fe-connect.c:3588
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "このプラットフォームでは requirepeer パラメータはサポートされていません"
 
-#: fe-connect.c:3590
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "接続先の資格証明を取得できませんでした: %s"
 
-#: fe-connect.c:3603
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeerは\"%s\"を指定していますが、実際の接続先名は\"%s\"です"
 
-#: fe-connect.c:3641
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "GSSAPIネゴシエーションパケットを送信できませんでした: %s"
 
-#: fe-connect.c:3680
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "SSLネゴシエーションパケットを送信できませんでした: %s"
 
-#: fe-connect.c:3706
+#: fe-connect.c:3709
 #, c-format
 msgid "could not send cancel packet: %s"
 msgstr "キャンセルパケットを送信できませんでした: %s"
 
-#: fe-connect.c:3736
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "開始パケットを送信できませんでした: %s"
 
-#: fe-connect.c:3809
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "サーバーはSSLをサポートしていませんが、要求されています"
 
-#: fe-connect.c:3819
+#: fe-connect.c:3822
 #, c-format
 msgid "server sent an error response during SSL exchange"
 msgstr "SSLハンドシェイク中にサーバーからエラー応答が返されました"
 
-#: fe-connect.c:3824
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "SSLネゴシエーションに対して不正な応答を受信しました: %c"
 
-#: fe-connect.c:3844
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "SSL応答の後に非暗号化データを受信しました"
 
-#: fe-connect.c:3907
+#: fe-connect.c:3910
 #, c-format
 msgid "server sent an error response during GSS encryption exchange"
 msgstr "GSS暗号化ハンドシェイク中にサーバーからエラー応答が返されました"
 
-#: fe-connect.c:3925
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "サーバーがGSSAPI暗号化サポートしていませんが、要求されてます"
 
-#: fe-connect.c:3929
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "GSSAPIネゴシエーションに対して不正な応答を受信しました: %c"
 
-#: fe-connect.c:3951
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "GSSAPI暗号化応答の後に非暗号化データを受信しました"
 
-#: fe-connect.c:4012
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "サーバーからの認証要求を想定していましたが、%cを受信しました"
 
-#: fe-connect.c:4040 fe-connect.c:4172
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "不正な認証要求を受信しました"
 
-#: fe-connect.c:4046
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信しました"
 
-#: fe-connect.c:4065 fe-connect.c:4119
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "不正なエラーメッセージを受信しました"
 
-#: fe-connect.c:4149
+#: fe-connect.c:4152
 #, c-format
 msgid "received duplicate protocol negotiation message"
 msgstr "重複したプロトコルネゴシエーションメッセージを受信しました"
 
-#: fe-connect.c:4251
+#: fe-connect.c:4254
 #, c-format
 msgid "internal error: async authentication has no handler"
 msgstr "内部エラー: 非同期認証のハンドラーがありません"
 
-#: fe-connect.c:4276
+#: fe-connect.c:4279
 #, c-format
 msgid "internal error: async cleanup did not release polling socket"
 msgstr "内部エラー: 非同期クリーンアップがポーリング中のソケットを解放しませんでした"
 
-#: fe-connect.c:4299
+#: fe-connect.c:4302
 #, c-format
 msgid "internal error: async authentication did not set a socket for polling"
 msgstr "内部エラー: 非同期認証がポーリング対象のソケットを設定しませんでした"
 
-#: fe-connect.c:4332
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "起動中にサーバーから想定外のメッセージがありました"
 
-#: fe-connect.c:4423
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "セッションは読み取り専用です"
 
-#: fe-connect.c:4425
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "セッションは読み取り専用ではありません"
 
-#: fe-connect.c:4478
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "サーバーはホットスタンバイモードです"
 
-#: fe-connect.c:4480
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "サーバーはスタンバイモードではありません"
 
-#: fe-connect.c:4605 fe-connect.c:4655
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "\"%s\"が失敗しました"
 
-#: fe-connect.c:4669
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "接続状態%dは不正です。メモリ障害の可能性があります"
 
-#: fe-connect.c:5498
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "不正なLDAP URL\"%s\":スキームはldap://でなければなりません"
 
-#: fe-connect.c:5513
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "不正なLDAP URL \"%s\": 識別名がありません"
 
-#: fe-connect.c:5525 fe-connect.c:5583
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "不正なLDAP URL \"%s\": ちょうど1つの属性を持たなければなりません"
 
-#: fe-connect.c:5537 fe-connect.c:5599
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "不正なLDAP URL \"%s\": 検索スコープ(base/one/sub)を持たなければなりません"
 
-#: fe-connect.c:5549
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "不正なLDAP URL \"%s\": フィルタがありません"
 
-#: fe-connect.c:5571
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "不正なLDAP URL \"%s\": ポート番号が不正です"
 
-#: fe-connect.c:5608
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "LDAP構造体を作成できませんでした"
 
-#: fe-connect.c:5683
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "LDAPサーバーで検索に失敗しました: %s"
 
-#: fe-connect.c:5693
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "LDAP参照で複数のエントリが見つかりました"
 
-#: fe-connect.c:5695 fe-connect.c:5706
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "LDAP参照でエントリが見つかりません"
 
-#: fe-connect.c:5716 fe-connect.c:5728
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "LDAP参照で属性に値がありません"
 
-#: fe-connect.c:5779 fe-connect.c:5798 fe-connect.c:6322
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "接続情報文字列の長さが上限値(%d)を超えています"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "接続情報文字列において\"%s\"の後に\"=\"がありませんでした"
 
-#: fe-connect.c:5869 fe-connect.c:6505 fe-connect.c:7335
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "不正な接続オプション\"%s\""
 
-#: fe-connect.c:5884 fe-connect.c:6370
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "接続情報文字列内の閉じていない引用符"
 
-#: fe-connect.c:5964
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "サービス定義\"%s\"がみつかりません"
 
-#: fe-connect.c:5990
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "サービスファイル\"%s\"がみつかりません"
 
-#: fe-connect.c:6003
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "サービスファイル\"%2$s\"の行%1$dが長すぎます"
 
-#: fe-connect.c:6074 fe-connect.c:6117
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "サービスファイル\"%s\"の行%dで構文エラー"
 
-#: fe-connect.c:6085
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "サービスファイル\"%s\"、行%dでのネストしたサービス指定はサポートされていません"
 
-#: fe-connect.c:6824
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "内部パーサ処理へ伝播した不正なURI: \"%s\""
 
-#: fe-connect.c:6901
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "URI \"%s\"内のIPv6ホストアドレスにおいて対応する\"]\"を探している間に文字列が終わりました"
 
-#: fe-connect.c:6908
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "URI内ではIPv6ホストアドレスは空であってはなりません: \"%s\""
 
-#: fe-connect.c:6923
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "URI内の位置%2$dに想定外の文字\"%1$c\"があります(\":\"または\"/\"を期待していました): \"%3$s\""
 
-#: fe-connect.c:7052
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "URI問い合わせパラメータ内にキーと値を分ける\"=\"が余分にあります: \"%s\""
 
-#: fe-connect.c:7072
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "URI問い合わせパラメータ内にキーと値を分ける\\\"=\\\"がありません: \"%s\""
 
-#: fe-connect.c:7124
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "不正なURI問い合わせパラメータ:\"%s\""
 
-#: fe-connect.c:7208
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "不正なパーセント符号化トークン: \"%s\""
 
-#: fe-connect.c:7218
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "パーセント符号化された値では値%%00は許されません: \"%s\""
 
-#: fe-connect.c:7240
+#: fe-connect.c:7265
 #, c-format
 msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
 msgstr "\"%s\"に予期しない空白文字があります、代わりにパーセントエンコードされた空白文字(%%20)を使用してください"
 
-#: fe-connect.c:7622
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "接続ポインタはNULLです\n"
 
-#: fe-connect.c:7630 fe-exec.c:713 fe-exec.c:975 fe-exec.c:3459
-#: fe-protocol3.c:987 fe-protocol3.c:1020
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "メモリ不足\n"
 
-#: fe-connect.c:7932
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "WARNING: パスワードファイル\"%s\"がテキストファイルではありません\n"
 
-#: fe-connect.c:7942
+#: fe-connect.c:7961
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "警告: パスワードファイル \"%s\" がグループメンバもしくは他のユーザーから読める状態になっています。この権限はu=rw (0600)以下にすべきです\n"
 
-#: fe-connect.c:8046
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "パスワードはファイル\"%s\"から取り出しました"
 
-#: fe-connect.c:8212
+#: fe-connect.c:8231
 #, c-format
 msgid "invalid integer value \"%s\" for connection option \"%s\""
 msgstr "接続オプション\"%2$s\"に対する不正な整数値\"%1$s\""
 
-#: fe-exec.c:469 fe-exec.c:3533
+#: fe-exec.c:469 fe-exec.c:3549
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行番号%dは0..%dの範囲を超えています"
 
-#: fe-exec.c:531 fe-protocol3.c:2067
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:834
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "サーバーへの書き込みに失敗"
 
-#: fe-exec.c:874
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "エラー文字列がありません"
 
-#: fe-exec.c:963
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "注意"
 
-#: fe-exec.c:1021
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresultはINT_MAX個以上のタプルを扱えません"
 
-#: fe-exec.c:1033
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "size_t オーバーフロー"
 
-#: fe-exec.c:1438 fe-exec.c:1507 fe-exec.c:1553
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "コマンド文字列がヌルポインタです"
 
-#: fe-exec.c:1444 fe-exec.c:3003
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%sはパイプラインモードでは使用できません"
 
-#: fe-exec.c:1512 fe-exec.c:1558 fe-exec.c:1652
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "パラメータ数は0から%dまでの間でなければなりません"
 
-#: fe-exec.c:1548 fe-exec.c:1647
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "文の名前がヌルポインタです"
 
-#: fe-exec.c:1689 fe-exec.c:3379
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "サーバーへの接続がありません"
 
-#: fe-exec.c:1697 fe-exec.c:3387
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "他のコマンドがすでに処理中です"
 
-#: fe-exec.c:1727
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "COPY中はコマンドのキューイングはできません"
 
-#: fe-exec.c:1846
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "バイナリパラメータには長さを指定する必要があります"
 
-#: fe-exec.c:2205
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "想定外のasyncStatus: %d"
 
-#: fe-exec.c:2361
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "同期的にコマンドを実行する関数はパイプラインモード中は実行できません"
 
-#: fe-exec.c:2378
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "新たなPQexec\"によりCOPYが終了しました"
 
-#: fe-exec.c:2394
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "COPY BOTH 実行中の PQexec は許可されていません"
 
-#: fe-exec.c:2630
+#: fe-exec.c:2646
 #, c-format
 msgid "unrecognized message type \"%c\""
 msgstr "認識できないメッセージタイプ\"%c\""
 
-#: fe-exec.c:2702 fe-exec.c:2756 fe-exec.c:2824 fe-protocol3.c:1998
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "実行中のCOPYはありません"
 
-#: fe-exec.c:3010
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "接続状態が異常です"
 
-#: fe-exec.c:3053
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "パイプラインモードに入れません、接続がアイドル状態ではありません"
 
-#: fe-exec.c:3089 fe-exec.c:3110
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "未回収の結果が残っている状態でパイプラインモードを抜けることはできません"
 
-#: fe-exec.c:3093
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "ビジー状態でパイプラインモードを抜けることはできません"
 
-#: fe-exec.c:3104
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "COPY実行中にパイプラインモードを抜けることはできません"
 
-#: fe-exec.c:3303
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "パイプラインモード外でパイプライン送出はできません"
 
-#: fe-exec.c:3422
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "ExecStatusTypeコードが不正です"
 
-#: fe-exec.c:3449
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresutがエラー結果ではありません\n"
 
-#: fe-exec.c:3517 fe-exec.c:3540
+#: fe-exec.c:3533 fe-exec.c:3556
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "列番号%dは0..%dの範囲を超えています"
 
-#: fe-exec.c:3555
+#: fe-exec.c:3571
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "パラメータ%dは0..%dの範囲を超えています"
 
-#: fe-exec.c:3866
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "サーバーからの結果を解釈できませんでした: %s"
 
-#: fe-exec.c:4140 fe-exec.c:4253
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "不完全なマルチバイト文字"
 
-#: fe-exec.c:4142 fe-exec.c:4272
+#: fe-exec.c:4159 fe-exec.c:4311
 #, c-format
 msgid "invalid multibyte character"
 msgstr "不正なマルチバイト文字"
 
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "エスケープされた文字列のサイズが上限(%zu)を超えています"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "エスケープされたbyteaのサイズが上限(%zu)を超えています"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "GSSAPI名のインポートエラー"
@@ -1110,7 +1492,7 @@ msgstr "サイズ%luの整数はpqGetIntでサポートされていません"
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "サイズ%luの整数はpqPutIntでサポートされていません"
 
-#: fe-misc.c:765 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
 #: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
@@ -1122,200 +1504,215 @@ msgstr ""
 "        おそらく要求の処理前または処理中にサーバーが異常終了\n"
 "        したことを意味しています。"
 
-#: fe-misc.c:832
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "接続はオープンされていません\n"
 
-#: fe-misc.c:1020
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "タイムアウト期間が過ぎました"
 
-#: fe-misc.c:1072
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "不正なソケットです"
 
-#: fe-misc.c:1095
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() が失敗しました: %s"
 
-#: fe-protocol3.c:188
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "待機中にサーバーからメッセージ種類0x%02xが届きました"
 
-#: fe-protocol3.c:401
+#: fe-protocol3.c:403
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "サーバーが先行の行記述(\"T\"メッセージ)なしでデータ(\"D\"メッセージ)を送信しました"
 
-#: fe-protocol3.c:443
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "サーバーから想定外の応答がありました。受け付けた先頭文字は\"%c\"です"
 
-#: fe-protocol3.c:462
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "メッセージの内容がメッセージタイプ\"%c\"での長さと合っていません"
 
-#: fe-protocol3.c:480
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "サーバーとの同期が失われました。受信したメッセージタイプは\"%c\"、長さは%d"
 
-#: fe-protocol3.c:532 fe-protocol3.c:572
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "\"T\"メッセージ内のデータが不十分です"
 
-#: fe-protocol3.c:643 fe-protocol3.c:849
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "問い合わせ結果用のメモリが不足しています"
 
-#: fe-protocol3.c:712
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "\"t\"メッセージ内のデータが足りません"
 
-#: fe-protocol3.c:771 fe-protocol3.c:803 fe-protocol3.c:821
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "\"D\"\"メッセージ内のデータが不十分です"
 
-#: fe-protocol3.c:777
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "\"D\"メッセージ内のフィールド数が想定外です。"
 
-#: fe-protocol3.c:1033
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "エラーメッセージがありません\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1081 fe-protocol3.c:1100
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr "(文字位置: %s)"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETAIL:  %s\n"
 
-#: fe-protocol3.c:1116
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "HINT:  %s\n"
 
-#: fe-protocol3.c:1119
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "QUERY:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXT:  %s\n"
 
-#: fe-protocol3.c:1135
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "SCHEMA NAME:  %s\n"
 
-#: fe-protocol3.c:1139
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "TABLE NAME:  %s\n"
 
-#: fe-protocol3.c:1143
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "COLUMN NAME:  %s\n"
 
-#: fe-protocol3.c:1147
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "DATATYPE NAME:  %s\n"
 
-#: fe-protocol3.c:1151
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "CONSTRAINT NAME:  %s\n"
 
-#: fe-protocol3.c:1163
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "LOCATION:  "
 
-#: fe-protocol3.c:1165
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1167
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1362
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "行 %d: "
 
-#: fe-protocol3.c:1424
+#: fe-protocol3.c:1456
 #, c-format
 msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーがより大きなバージョン番号へのダウングレードを要求しました"
 
-#: fe-protocol3.c:1430
+#: fe-protocol3.c:1462
 #, c-format
 msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが3.0より前のプロトコルバージョンへのダウングレードを要求しました"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1469
 #, c-format
-msgid "received invalid protocol negotiation message: server requests downgrade to non-existent 3.1 protocol version"
-msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが存在しない 3.1 プロトコルバージョンを要求しました"
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが、存在しない 3.1 プロトコルバージョンへのダウングレードを要求しました"
 
-#: fe-protocol3.c:1443
+#: fe-protocol3.c:1475
 #, c-format
 msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーがサポート外パラメータの数として負数を通知しました"
 
-#: fe-protocol3.c:1449
+#: fe-protocol3.c:1481
 #, c-format
 msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーがネゴシエーションを行いましたが、変更要求がありませんでした"
 
-#: fe-protocol3.c:1455
+#: fe-protocol3.c:1487
 #, c-format
-msgid "server only supports protocol version %d.%d, but min_protocol_version was set to %d.%d"
-msgstr "サーバーはプロトコルバージョン %d.%d のみサポートしていますが、min_protocol_version は %d.%d に設定されています"
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "サーバーはプロトコルバージョン %d.%d のみサポートしていますが、\"%s\"は %d.%d に設定されています"
 
-#: fe-protocol3.c:1479
+#: fe-protocol3.c:1512
 #, c-format
-msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a _pq_. prefix (\"%s\")"
-msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが _pq_. プレフィクスのないサポートされていないパラメータ名(\"%s\")を報告しました"
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが\"%s\"プレフィクスのないサポートされていないパラメータ名(\"%s\")を報告しました"
 
-#: fe-protocol3.c:1482
+#: fe-protocol3.c:1515
 #, c-format
 msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: サーバーが要求されていないサポート外のパラメータ(\"%s\")を通知しました"
 
-#: fe-protocol3.c:1489
+#: fe-protocol3.c:1522
 #, c-format
-msgid "received invalid protocol negotation message: message too short"
+msgid "received invalid protocol negotiation message: message too short"
 msgstr "不正なプロトコルネゴシエーションメッセージを受信: メッセージが短すぎます"
 
-#: fe-protocol3.c:1893
+#: fe-protocol3.c:1588
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "不正なBackendKeyDataデータを受信しました: 長さ%dのキャンセルキーはプロトコルバージョン3.0では許可されません(4バイトでなければなりません)"
+
+#: fe-protocol3.c:1595
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "不正なBackendKeyDataデータを受信しました: 長さ%dのキャンセルキーは短すぎます (最低4バイト)"
+
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "不正なBackendKeyDataデータを受信しました: 長さ%dのキャンセルキーは長すぎます (最高256バイト)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: テキストのCOPY OUTを行っていません"
 
-#: fe-protocol3.c:2268
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "プロトコルエラー: 関数の結果がありません"
 
-#: fe-protocol3.c:2280
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "プロトコルエラー: id=0x%x"
@@ -1356,57 +1753,53 @@ msgstr "\"%s\"のサーバー証明書がホスト名\"%s\"とマッチしませ
 msgid "could not get server's host name from server certificate"
 msgstr "サーバー証明書からサーバーのホスト名を取得できませんでした"
 
-#: fe-secure-gssapi.c:194
+#: fe-secure-gssapi.c:201
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI名ラップエラー"
 
-#: fe-secure-gssapi.c:201
+#: fe-secure-gssapi.c:208
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "送出されるGSSAPIメッセージに機密性が適用されません"
 
-#: fe-secure-gssapi.c:208
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "クライアントは過大なGSSAPIパケットを送信しようとしました: (%zu > %zu)"
 
-#: fe-secure-gssapi.c:347 fe-secure-gssapi.c:589
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "過大なGSSAPIパケットがサーバーから送出されました: (%zu > %zu)"
 
-#: fe-secure-gssapi.c:386
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPIアンラップエラー"
 
-#: fe-secure-gssapi.c:395
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "到着したGSSAPIメッセージには機密性が適用されていません"
 
-#: fe-secure-gssapi.c:652
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "GSSAPIセキュリティコンテキストを開始できませんでした"
 
-#: fe-secure-gssapi.c:681
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "GSSAPIサイズチェックエラー"
 
-#: fe-secure-gssapi.c:692
-msgid "GSSAPI context establishment error"
-msgstr "GSSAPIコンテクスト確立エラー"
-
-#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1378
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL SYSCALLエラー: %s"
 
-#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1381
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "SSL SYSCALLエラー: EOFを検出"
 
-#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1389
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSLエラー: %s"
@@ -1416,7 +1809,7 @@ msgstr "SSLエラー: %s"
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL接続が意図せずにクローズされました"
 
-#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1436
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "認識できないSSLエラーコード: %d"
@@ -1446,52 +1839,52 @@ msgstr "SSL証明書に名前のエントリがありません"
 msgid "SSL certificate's address entry is missing"
 msgstr "SSL証明書のアドレスのエントリがありません"
 
-#: fe-secure-openssl.c:714
+#: fe-secure-openssl.c:715
 #, c-format
-msgid "could not open ssl keylog file \"%s\": %s"
-msgstr "SSLキーログファイル \"%s\" をオープンできませんでした: %s"
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "警告: SSLキー記録ファイル\"%s\"をオープンできませんでした: %m\n"
 
-#: fe-secure-openssl.c:722
+#: fe-secure-openssl.c:723
 #, c-format
-msgid "could not write to ssl keylog file \"%s\": %s"
-msgstr "SSLキーログファイル \"%s\" に書き込めませんでした: %s"
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "警告: SSLキー記録ファイル\"%s\"に書き込めませんでした: %m\n"
 
-#: fe-secure-openssl.c:775
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "SSLコンテキストを作成できませんでした: %s"
 
-#: fe-secure-openssl.c:817
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "SSLプロトコル最小バージョンに対する不正な値\"%s\""
 
-#: fe-secure-openssl.c:827
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "SSLプロトコル最小バージョンを設定できませんでした: %s"
 
-#: fe-secure-openssl.c:843
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "SSLプロトコル最大バージョンに対する不正な値\"%s\""
 
-#: fe-secure-openssl.c:853
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "SSLプロトコル最大バージョンを設定できませんでした: %s"
 
-#: fe-secure-openssl.c:891
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "システムルート証明書パスをロードできませんでした: %s"
 
-#: fe-secure-openssl.c:908
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "ルート証明書ファイル\"%s\"を読み取れませんでした: %s"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1500,7 +1893,7 @@ msgstr ""
 "ルート証明書ファイルを特定するためのホームディレクトリが取得できませんでした\n"
 "ファイルを用意する、 sslrootcert=systemでシステムの信頼済みルート証明書を使用する、または sslmode を変更してサーバー証明書の検証を無効にしてください。"
 
-#: fe-secure-openssl.c:963
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1509,127 +1902,127 @@ msgstr ""
 "ルート証明書ファイル\"%s\"が存在しません\n"
 "ファイルを用意する、sslrootcert=systemでシステムの信頼済みルート証明書を使用する、またはsslmodeを変更してサーバー証明書の検証を無効にしてください。"
 
-#: fe-secure-openssl.c:998
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "証明書ファイル\"%s\"をオープンできませんでした: %s"
 
-#: fe-secure-openssl.c:1016
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "証明書ファイル\"%s\"を読み込めませんでした: %s"
 
-#: fe-secure-openssl.c:1040
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "SSL接続を確立できませんでした: %s"
 
-#: fe-secure-openssl.c:1053
+#: fe-secure-openssl.c:1058
 #, c-format
 msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
 msgstr "警告: sslkeylogfile をサポートするにはOpenSSLが必要です\n"
 
-#: fe-secure-openssl.c:1055
+#: fe-secure-openssl.c:1060
 #, c-format
 msgid "WARNING: libpq was not built with sslkeylogfile support\n"
 msgstr "警告: libpq は sslkeylogfile のサポート無しでビルドされています\n"
 
-#: fe-secure-openssl.c:1086
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "SSLサーバー名表示(SNI)を設定できませんでした: %s"
 
-#: fe-secure-openssl.c:1103
+#: fe-secure-openssl.c:1107
 #, c-format
 msgid "could not set SSL ALPN extension: %s"
 msgstr "SSL ALPN拡張を設定できませんでした: %s"
 
-#: fe-secure-openssl.c:1146
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "SSLエンジン\"%s\"を読み込みできませんでした: %s"
 
-#: fe-secure-openssl.c:1157
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "SSLエンジン\"%s\"を初期化できませんでした: %s"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "SSL秘密鍵\"%s\"をエンジン\"%s\"から読み取れませんでした: %s"
 
-#: fe-secure-openssl.c:1185
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "SSL秘密鍵\"%s\"をエンジン\"%s\"から読み取れませんでした: %s"
 
-#: fe-secure-openssl.c:1222
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "証明書はありますが、秘密鍵ファイル\"%s\"はありません"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "秘密鍵ファイル\"%s\"をstatできませんでした: %m"
 
-#: fe-secure-openssl.c:1233
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "秘密鍵ファイル\"%s\"は通常のファイルではありません"
 
-#: fe-secure-openssl.c:1266
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "秘密鍵ファイル\"%s\"はグループに対して、もしくは無制限にアクセスを許可しています; ファイルのパーミッションは u=rw (0600) かそれよりも狭い必要があります、rootが所有している場合は  u=rw,g=r (0640) かそれよりも狭い必要があります"
 
-#: fe-secure-openssl.c:1290
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "秘密鍵ファイル\"%s\"をロードできませんでした: %s"
 
-#: fe-secure-openssl.c:1306
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "証明書と秘密鍵ファイル\"%s\"が一致しません: %s"
 
-#: fe-secure-openssl.c:1375
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "SSLエラー: 証明書の検証に失敗しました: %s"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "このことは、クライアントがSSLプロトコルのバージョン%sから%sの間のいずれもサポートしていないことを示唆しているかもしれません。"
 
-#: fe-secure-openssl.c:1452
+#: fe-secure-openssl.c:1456
 #, c-format
 msgid "direct SSL connection was established without ALPN protocol negotiation extension"
 msgstr "直接SSL接続がALPNプロトコルネゴシエーション拡張なしで確立されました"
 
-#: fe-secure-openssl.c:1464
+#: fe-secure-openssl.c:1468
 #, c-format
 msgid "SSL connection was established with unexpected ALPN protocol"
 msgstr "SSL接続が想定外のALPNプロトコルで確立されました"
 
-#: fe-secure-openssl.c:1481
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "証明書を取得できませんでした: %s"
 
-#: fe-secure-openssl.c:1560
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "SSLエラーはありませんでした"
 
-#: fe-secure-openssl.c:1603
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSLエラーコード: %lu"
 
-#: fe-secure-openssl.c:1905
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "警告: sslpasswordが切り詰められました\n"
@@ -1648,3 +2041,75 @@ msgstr "サーバーにデータを送信できませんでした: %s"
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "不明なソケットエラー 0x%08X/%d"
+
+#~ msgid "adding kqueue timer to multiplexer: %m"
+#~ msgstr "マルチプレクサへのkqueueタイマー追加中にエラー: %m"
+
+#~ msgid "could not add to epoll set: %m"
+#~ msgstr "epollセットに追加できませんでした: %m"
+
+#~ msgid "could not add to kqueue: %m"
+#~ msgstr "kqueueへの追加に失敗しました: %m"
+
+#~ msgid "could not comb kqueue: %m"
+#~ msgstr "kqueue の走査に失敗しました: %m"
+
+#~ msgid "could not delete from epoll set: %m"
+#~ msgstr "epollセットから削除できませんでした: %m"
+
+#~ msgid "could not delete from kqueue: %m"
+#~ msgstr "kqueueからの削除に失敗しました: %m"
+
+#~ msgid "could not modify kqueue: %m"
+#~ msgstr "kqueueの設定変更に失敗しました: %m"
+
+#~ msgid "could not update epoll set: %m"
+#~ msgstr "epollセットの設定変更に失敗しました: %m"
+
+#~ msgid "deleting kqueue timer: %m"
+#~ msgstr "kqueue タイマー削除中にエラー: %m"
+
+#~ msgid "failed to add timerfd to epoll set: %m"
+#~ msgstr "epollセットへのtimerfdの追加に失敗しました: %m"
+
+#~ msgid "failed to create epoll set: %m"
+#~ msgstr "epollセットの作成に失敗しました: %m"
+
+#~ msgid "failed to create timer kqueue: %m"
+#~ msgstr "タイマーkqueueの作成に失敗しました: %m"
+
+#~ msgid "failed to create timerfd: %m"
+#~ msgstr "timerfd の作成に失敗しました: %m"
+
+#~ msgid "getting timerfd value: %m"
+#~ msgstr "timerfdの値の取得中にエラー: %m"
+
+#~ msgid "internal error: array member found at nesting level %d"
+#~ msgstr "内部エラー: ネストレベル%dに配列の要素がありました"
+
+#~ msgid "internal error: field '%s' still active at end of object"
+#~ msgstr "内部エラー: オブジェクト終了時点でフィールド '%s' が未終了です"
+
+#~ msgid "internal error: found unexpected array end while parsing field '%s'"
+#~ msgstr "内部エラー: フィールド'%s'のパース中に予期しない配列がありました"
+
+#~ msgid "internal error: scalar field '%s' would be assigned twice"
+#~ msgstr "内部エラー: フィールド '%s' に2回代入されます"
+
+#~ msgid "internal error: scalar target found at nesting level %d"
+#~ msgstr "内部エラー: ネストレベル%dにーターゲットがありました"
+
+#~ msgid "internal error: started field '%s' before field '%s' was finished"
+#~ msgstr "内部エラー: フィールド '%2$s' の終了前にフィールド '%1$s' が開始されました"
+
+#~ msgid "removing kqueue timer from multiplexer: %m"
+#~ msgstr "マルチプレクサからのkqueueタイマー削除中にエラー: %m"
+
+#~ msgid "setting kqueue timer to %ld: %m"
+#~ msgstr "kqueueタイマーの%ldへの設定中にエラー: %m"
+
+#~ msgid "setting timerfd to %ld: %m"
+#~ msgstr "timerfdの%ldへの設定中にエラー: %m"
+
+#~ msgid "unknown libcurl socket operation: %d"
+#~ msgstr "未知のlibcurlソケット操作: %d"
diff --git a/src/interfaces/libpq/po/ka.po b/src/interfaces/libpq/po/ka.po
index 16268bc7b94..0651c388960 100644
--- a/src/interfaces/libpq/po/ka.po
+++ b/src/interfaces/libpq/po/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libpq (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-05-02 22:10+0000\n"
-"PO-Revision-Date: 2025-05-03 01:49+0200\n"
+"POT-Creation-Date: 2025-12-21 05:10+0000\n"
+"PO-Revision-Date: 2025-12-22 04:47+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <nothing>\n"
 "Language: ka\n"
@@ -16,277 +16,208 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
-#: ../libpq-oauth/oauth-curl.c:292 ../libpq-oauth/oauth-curl.c:1910
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-#| msgid "database removal failed: %s"
 msgid "libcurl easy handle removal failed: %s"
 msgstr "libcurl-ის ადვილი დამმუშავებლის წაშლა ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:312
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-#| msgid "creation of new role failed: %s"
 msgid "libcurl multi handle cleanup failed: %s"
 msgstr "libcurl-ის დამმუშავებლების მოსუფთავება ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:375 ../libpq-oauth/oauth-curl.c:386
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
 #, c-format
 msgid "failed to set %s on OAuth connection: %s"
 msgstr "%s-ის დაყენება OAuth კავშირზე ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:397
+#: ../libpq-oauth/oauth-curl.c:416
 #, c-format
 msgid "failed to get %s from OAuth response: %s"
 msgstr "OAuth-ის პასუხიდან %s-ის მიღება ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:519
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
 #, c-format
-msgid "internal error: started field '%s' before field '%s' was finished"
-msgstr "შიდა შეცდომა: დაიწყო ველი '%s' მანამდე, სანამ დასრულდა ველი '%s'"
+msgid "field \"%s\" must be a string"
+msgstr "ველი \"%s\" სტრიქონი უნდა იყოს"
 
-#: ../libpq-oauth/oauth-curl.c:546
+#: ../libpq-oauth/oauth-curl.c:489
 #, c-format
-msgid "field \"%s\" is duplicated"
-msgstr "ველი \"%s\" დუბლირებულია"
-
-#: ../libpq-oauth/oauth-curl.c:571
-#, c-format
-msgid "internal error: field '%s' still active at end of object"
-msgstr "შიდა შეცდომა: ველი '%s' ჯერ კიდევ აქტიურია ობიექტის ბოლოში"
+msgid "field \"%s\" must be a number"
+msgstr "ველი \"%s\" რიცხვი უნდა იყოს"
 
-#: ../libpq-oauth/oauth-curl.c:586 ../libpq-oauth/oauth-curl.c:640
+#: ../libpq-oauth/oauth-curl.c:493
 #, c-format
-msgid "top-level element must be an object"
-msgstr "უმაღლესი დონის ელემენტი ობიექტი უნდა იყოს"
+msgid "field \"%s\" must be an array of strings"
+msgstr "ველი \"%s\" სტრიქონების მასივი უნდა იყოს"
 
-#: ../libpq-oauth/oauth-curl.c:621
+#: ../libpq-oauth/oauth-curl.c:498
 #, c-format
-msgid "internal error: found unexpected array end while parsing field '%s'"
-msgstr "შიდა შეცდომა: აღმოჩენილია მოულოდნელი მასივის დასასრული '%s' ველის დამუშავებისას"
+msgid "field \"%s\" has unexpected type"
+msgstr "ველის \"%s\" ტიპი მოულოდნელია"
 
-#: ../libpq-oauth/oauth-curl.c:676
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
 #, c-format
-msgid "internal error: scalar target found at nesting level %d"
-msgstr "შიდა შეცდომა: აღმოჩენილია სკალარული სამიზნე ერთმანეთში ჩალაგების დონეზე %d"
+msgid "JSON is too deeply nested"
+msgstr "JSON მეტისმეტად ღრმადაა ჩადგმული"
 
-#: ../libpq-oauth/oauth-curl.c:686
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
 #, c-format
-msgid "internal error: scalar field '%s' would be assigned twice"
-msgstr "შიდა შეცდომა: შეიძლება, სკალარული ველი '%s' ორჯერაა მინიჭებული"
+msgid "field \"%s\" is duplicated"
+msgstr "ველი \"%s\" დუბლირებულია"
 
-#: ../libpq-oauth/oauth-curl.c:708
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
 #, c-format
-msgid "internal error: array member found at nesting level %d"
-msgstr "შიდა შეცდომა: ერთმანეთში ჩალაგების დონეზე %d აღმოჩენილია მასივის წევრი"
+msgid "top-level element must be an object"
+msgstr "უმაღლესი დონის ელემენტი ობიექტი უნდა იყოს"
 
-#: ../libpq-oauth/oauth-curl.c:743
+#: ../libpq-oauth/oauth-curl.c:777
 #, c-format
 msgid "no content type was provided"
 msgstr "შემცველობის ტიპი მოწოდებული არაა"
 
-#: ../libpq-oauth/oauth-curl.c:782
+#: ../libpq-oauth/oauth-curl.c:816
 #, c-format
 msgid "unexpected content type: \"%s\""
 msgstr "მოულოდნელი შემცველობის ტიპი: \"%s\""
 
-#: ../libpq-oauth/oauth-curl.c:807
+#: ../libpq-oauth/oauth-curl.c:841
 #, c-format
 msgid "response contains embedded NULLs"
 msgstr "პასუხი ჩაშენებულ NULL-ებს შეიცავს"
 
-#: ../libpq-oauth/oauth-curl.c:817
+#: ../libpq-oauth/oauth-curl.c:851
 #, c-format
 msgid "response is not valid UTF-8"
 msgstr "პასუხი არასწორი UTF-8-ა"
 
-#: ../libpq-oauth/oauth-curl.c:857
+#: ../libpq-oauth/oauth-curl.c:891
 #, c-format
 msgid "field \"%s\" is missing"
 msgstr "ველი \"%s\" აკლია"
 
-#: ../libpq-oauth/oauth-curl.c:1091
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "ტოკენის შეცდომის პასუხის დამუშავება ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:1125
 #, c-format
 msgid "provider rejected the oauth_client_secret"
 msgstr "პროვაიდერმა უარჰყო oauth_client_secret"
 
-#: ../libpq-oauth/oauth-curl.c:1155
-#, c-format
-msgid "failed to create epoll set: %m"
-msgstr "epoll-ის ნაკრების შექმნა ჩავარდა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1162
-#, c-format
-msgid "failed to create timerfd: %m"
-msgstr "timerfd-ის შექმნა ჩავარდა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1168
-#, c-format
-msgid "failed to add timerfd to epoll set: %m"
-msgstr "epoll-ის ნაკრებში timerfd-ის ჩამატება ჩავარდა; %m"
-
-#. translator: the term "kqueue" (kernel queue) should not be translated
-#: ../libpq-oauth/oauth-curl.c:1178
-#, c-format
-msgid "failed to create kqueue: %m"
-msgstr "kqueue-ის შექმნა ჩავარდა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1191
-#, c-format
-msgid "failed to create timer kqueue: %m"
-msgstr "ტაიმერის kqueue-ის შექმნა ჩავარდა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1235 ../libpq-oauth/oauth-curl.c:1307
-#, c-format
-msgid "unknown libcurl socket operation: %d"
-msgstr "libcurl-ის სოკეტის უცნობი ოპერაცია: %d"
-
-#: ../libpq-oauth/oauth-curl.c:1252
-#, c-format
-msgid "could not add to epoll set: %m"
-msgstr "epoll-ის ნაკრებში ჩამატება შეუძლებელია: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1256
-#, c-format
-msgid "could not delete from epoll set: %m"
-msgstr "epoll-ის ნაკრებიდან წაშლა შეუძლებელია: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1260
-#, c-format
-msgid "could not update epoll set: %m"
-msgstr "epoll-ების ნაკრების განახლება ჩავარდა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1314
-#, c-format
-msgid "could not modify kqueue: %m"
-msgstr "kqueue-ის შეცვლა შეუძლებელია: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1338
-#, c-format
-msgid "could not delete from kqueue: %m"
-msgstr "kqueue-დან წაშლა შეუძლებელია: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1341
-#, c-format
-msgid "could not add to kqueue: %m"
-msgstr "kqueue-ში ჩამატება შეუძლებელია: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1393
-#, c-format
-msgid "setting timerfd to %ld: %m"
-msgstr "%ld-ზე timerfd-ის დაყენება: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1423
-#, c-format
-msgid "deleting kqueue timer: %m"
-msgstr "kqueue-ის ტაიმერის წაშლა: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1430
-#, c-format
-msgid "removing kqueue timer from multiplexer: %m"
-msgstr "kqueue-ის ტაიმერის წაშლა მულტიპლექსერიდან: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1441
-#, c-format
-msgid "setting kqueue timer to %ld: %m"
-msgstr "kqueue-ის ტაიმერის დაყენება %ld-ზე: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1448
-#, c-format
-msgid "adding kqueue timer to multiplexer: %m"
-msgstr "kqueue-ის ტაიმერის დამატება მულტიპლექსერზე: %m"
-
-#: ../libpq-oauth/oauth-curl.c:1471
+#: ../libpq-oauth/oauth-curl.c:1126
 #, c-format
-msgid "getting timerfd value: %m"
-msgstr "timerfd-ის მნიშვნელობის მიღება: %m"
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "პროვაიდერმა უარჰყო კლიენტის ავთენტიკაცია და oauth_client_secret დაყენებული არაა"
 
-#: ../libpq-oauth/oauth-curl.c:1493
+#: ../libpq-oauth/oauth-curl.c:1559
 #, c-format
-msgid "checking kqueue for timeout: %m"
-msgstr "kqueue-ის შემოწმება მოლოდინის დროის ამოწურვაზე: %m"
+msgid "checking timer expiration: %m"
+msgstr "შემოწმება მოლოდინის დროის ამოწურვაზე: %m"
 
-#: ../libpq-oauth/oauth-curl.c:1625
+#: ../libpq-oauth/oauth-curl.c:1721
 #, c-format
 msgid "failed to create libcurl multi handle"
 msgstr "libcurl-ის ერთზე მეტი დამმუშავებლის შექმნა ჩავარდა"
 
-#: ../libpq-oauth/oauth-curl.c:1645
+#: ../libpq-oauth/oauth-curl.c:1741
 #, c-format
 msgid "failed to create libcurl handle"
 msgstr "libcurl-ის დამმუშავებლის შექმნა ჩავარდა"
 
-#: ../libpq-oauth/oauth-curl.c:1729 ../libpq-oauth/oauth-curl.c:1770
-#: ../libpq-oauth/oauth-curl.c:2083 ../libpq-oauth/oauth-curl.c:2244
-#: ../libpq-oauth/oauth-curl.c:2305 ../libpq-oauth/oauth-curl.c:2394
-#: ../libpq-oauth/oauth-curl.c:2688 ../libpq-oauth/oauth-curl.c:2879
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
 #: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
 #: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
 #: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
 #: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
-#: fe-auth.c:1493 fe-cancel.c:177 fe-connect.c:1011 fe-connect.c:1051
-#: fe-connect.c:2175 fe-connect.c:2337 fe-connect.c:3730 fe-connect.c:5178
-#: fe-connect.c:5491 fe-connect.c:5746 fe-connect.c:5864 fe-connect.c:6111
-#: fe-connect.c:6191 fe-connect.c:6289 fe-connect.c:6540 fe-connect.c:6567
-#: fe-connect.c:6643 fe-connect.c:6666 fe-connect.c:6690 fe-connect.c:6725
-#: fe-connect.c:6811 fe-connect.c:6819 fe-connect.c:7176 fe-connect.c:7358
-#: fe-exec.c:530 fe-exec.c:1315 fe-exec.c:3254 fe-exec.c:4291 fe-exec.c:4457
-#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:210 fe-protocol3.c:233
-#: fe-protocol3.c:256 fe-protocol3.c:273 fe-protocol3.c:294 fe-protocol3.c:368
-#: fe-protocol3.c:732 fe-protocol3.c:972 fe-protocol3.c:1552
-#: fe-protocol3.c:1861 fe-protocol3.c:2262 fe-secure-common.c:110
-#: fe-secure-gssapi.c:496 fe-secure-openssl.c:405 fe-secure-openssl.c:1131
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
 #, c-format
 msgid "out of memory"
 msgstr "არასაკმარისი მეხსიერება"
 
-#: ../libpq-oauth/oauth-curl.c:1757
+#: ../libpq-oauth/oauth-curl.c:1853
 #, c-format
 msgid "response is too large"
 msgstr "პასუხი მეტისმეტად დიდია"
 
-#: ../libpq-oauth/oauth-curl.c:1799
+#: ../libpq-oauth/oauth-curl.c:1895
 #, c-format
 msgid "failed to queue HTTP request: %s"
 msgstr "HTTP მოთხოვნის რიგში ჩამატება ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:1816 ../libpq-oauth/oauth-curl.c:1869
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
 #, c-format
 msgid "asynchronous HTTP request failed: %s"
 msgstr "ასინქრონული HTTP მოთხოვნა ჩავარდა: %s"
 
-#: ../libpq-oauth/oauth-curl.c:1921
+#: ../libpq-oauth/oauth-curl.c:2022
 #, c-format
 msgid "no result was retrieved for the finished handle"
 msgstr "დასრულებული დამმუშავებლიდან შედეგი მიღებული არაა"
 
-#: ../libpq-oauth/oauth-curl.c:2054 ../libpq-oauth/oauth-curl.c:2360
-#: ../libpq-oauth/oauth-curl.c:2439
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
 #, c-format
 msgid "unexpected response code %ld"
 msgstr "მოულოდნელი პასუხის კოდი %ld"
 
-#: ../libpq-oauth/oauth-curl.c:2126
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "OpenID-ის აღმოჩენის დოკუმენტის დამუშავება ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:2227
 #, c-format
 msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
 msgstr "გამომცემლის იდენტიფიკატორი (%s) oauth_issuer-ს (%s) არ ემთხვევა"
 
-#: ../libpq-oauth/oauth-curl.c:2153
+#: ../libpq-oauth/oauth-curl.c:2254
 #, c-format
 msgid "issuer \"%s\" does not provide a device authorization endpoint"
 msgstr "გამომცემელმა \"%s\" არ მოგვაწოდა მოწყობილობის ავტორიზაციის ბოლოწერტილი"
 
-#: ../libpq-oauth/oauth-curl.c:2179
+#: ../libpq-oauth/oauth-curl.c:2280
 #, c-format
 msgid "device authorization endpoint \"%s\" must use HTTPS"
 msgstr "მოწყობილობის ავტორიზაციის ბოლოწერტილი \"%s\" HTTPS-ს უნდა იყენებდეს"
 
-#: ../libpq-oauth/oauth-curl.c:2188
+#: ../libpq-oauth/oauth-curl.c:2289
 #, c-format
 msgid "token endpoint \"%s\" must use HTTPS"
 msgstr "კოდის ბოლოწერტილი \"%s\" HTTPS-ს უნდა იყენებდეს"
 
-#: ../libpq-oauth/oauth-curl.c:2497
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "მოწყობილობის ავტორიზაციის დამუშავება ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "წვდომის ტოკენის პასუხის დამუშავება ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:2598
 #, c-format
 msgid "slow_down interval overflow"
 msgstr "slow_down-ის ინტერვალის გადავსება"
@@ -294,27 +225,27 @@ msgstr "slow_down-ის ინტერვალის გადავსებ
 #. translator: The first %s is a URL for the user to visit in a
 #. browser, and the second %s is a code to be copy-pasted there.
 #.
-#: ../libpq-oauth/oauth-curl.c:2533
+#: ../libpq-oauth/oauth-curl.c:2634
 #, c-format
 msgid "Visit %s and enter the code: %s\n"
 msgstr "გადადით %s-ზე და შეიყვანეთ კოდი: %s\n"
 
-#: ../libpq-oauth/oauth-curl.c:2538
+#: ../libpq-oauth/oauth-curl.c:2639
 #, c-format
 msgid "device prompt failed"
 msgstr "მოწყობილობის მოთხოვნა ჩავარდა"
 
-#: ../libpq-oauth/oauth-curl.c:2594
+#: ../libpq-oauth/oauth-curl.c:2695
 #, c-format
 msgid "curl_global_init previously failed during OAuth setup"
 msgstr "curl_global_init უკვე ჩავარდა OAuth-ის მორგებისას"
 
-#: ../libpq-oauth/oauth-curl.c:2613
+#: ../libpq-oauth/oauth-curl.c:2714
 #, c-format
 msgid "curl_global_init failed during OAuth setup"
 msgstr "curl_global_init ჩავარდა OAuth-ის მორგებისას"
 
-#: ../libpq-oauth/oauth-curl.c:2634
+#: ../libpq-oauth/oauth-curl.c:2735
 #, c-format
 msgid ""
 "libcurl is no longer thread-safe\n"
@@ -329,6 +260,152 @@ msgstr ""
 "\tამჟამადაა დაყენებული, როგორც ჩანს, არაა. ააგეთ libpq-ი libcurl-ით, რომელიც\n"
 "\tახლა გაქვთ დაყენებული."
 
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "OpenID-ის აღმოჩენის დოკუმენტის გამოთხოვა ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "OAuth მოწყობილობის ავტორიზაციის გაშვება შეუძლებელია"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "მოწყობილობის ავტორიზაციის მიღება ჩავარდა"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "წვდომის ტოკენის მიღება ჩავარდა"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "შიდა შეცდომა: კავშირისთვის OAuth ტოკენი დაყენებული არ იყო"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "OAuth-ის აღმოჩენის URI \"%s\" HTTPS-ს უნდა იყენებდეს"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "OAuth-ის აღმოჩენის URI \"%s\" არ უნდა შეიცავდეს მოთხოვნის ან ფრაგმენტის კომპონენტებს"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "OAuth-ის აღმოჩენის URI \"%s\" .well-known URI არაა"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "OAuth-ის აღმოჩენის URI \"%s\" მხარდაუჭერელ .well-known სუფიქსს იყენებს"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "OAuth-ის აღმოჩენილს URI \"%s\" არასწორ ფორმატს იყენებს"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "სერვერის შეცდომის შეტყობინება შეიცავდა ჩაშენებულ NULL-ს და მოცილებული იყო"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "სერვერის შეცდომის პასუხი არასწორი UTF-8-ია"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "სერვერის შეცდომის დამუშავება ჩავარდა: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "სერვერის აღმოჩენის დოკუმენტი მისამართზე %s (გამომცემი %s) oauth_issuer-თან (%s) თავსებადი არაა"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "სერვერის აღმოჩენის დოკუმენტი გადატანილია %s-ზე (წინა მდებარეობა იყო %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "სერვერმა გამოაგზავნა შეცდომის შემცველი პასუხი SSL სტატუსის გარეშე"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "სერვერმა უარჰყო OAuth-ის წარმდგენის ტოკენი: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "მომხმარებლის მიერ აღწერილი OAuth-ის დინებას არც ტოკენი მოუწოდებია, არც ასინქრონული უკუგამოძახება"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "მომხმარებლის მიერ განსაზღვრული OAuth-ის დინება ჩავარდა"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "მომხმარებლის მიერ აღწერილ OAuth დინებას ტოკენი არ მოუწოდებია"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "მომხმარებლის მიერ აღწერილმა OAuth-დინებამ არ წარმოადგინა სოკეტი პოლინგისთვის"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "მუტექსის დაბლოკვა ჩავარდა (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "OAuth-ის დინებები ხელმისაწვდომი არაა (სცადეთ, დააყენოთ პაკეტი libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "სერვერი ითხოვს OAuth-იტ ავთენტიკაციას, მაგრამ oauth_issuer და oauth_client_id ორივე დაყენებული არაა"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "სერვერმა გამოაგზავნა მოულოდნელი დამატებითი OAuth-ის მონაცემები"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "სერვერი ითხოვს OAuth-ით ავთენტიკაციას, მაგრამ აღმოჩენის მეტამონაცემები წარმოდგენილი არაა"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "შიდა შეცდომა: OAuth-ის დინებამ სოკეტი არ დააყენა"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "სერვერმა გამოაგზავნა დამატებითი OAuth-ის მონაცემები შეცდომის შემდეგ"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "არასწორი OAuth-ის გაცვლის მდგომარეობა"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "დაკავშირების თავიდან ცდა ახალი წარმდგენის ტოკენით"
+
 #: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
@@ -634,7 +711,7 @@ msgstr "პაროლის დაშიფვრის უცნობი ა
 msgid "connection pointer is NULL"
 msgstr "შეერთების მაჩვენებელი ნულოვანია"
 
-#: fe-cancel.c:85 fe-misc.c:587
+#: fe-cancel.c:85 fe-misc.c:613
 #, c-format
 msgid "connection not open"
 msgstr "შეერთება ღია არაა"
@@ -644,89 +721,89 @@ msgstr "შეერთება ღია არაა"
 msgid "no cancellation key received"
 msgstr "გაუქმების გასაღები არ მიმიღია"
 
-#: fe-cancel.c:211
+#: fe-cancel.c:212
 #, c-format
 msgid "cancel request is already being sent on this connection"
 msgstr "ამ მიერთებით გაუქმების მოთხოვნის გაგზავნა უკვე მიმდინარეობს"
 
-#: fe-cancel.c:281
+#: fe-cancel.c:282
 #, c-format
 msgid "unexpected response from server"
 msgstr "მოულოდნელი პასუხი სერვერიდან"
 
-#: fe-connect.c:1308
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "%d ჰოსტის სახელები %d ჰოსტის მისამართების მნიშვნელობებს არ ემთხვევა"
 
-#: fe-connect.c:1388
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "%d პორტის ნომრები %d ჰოსტს არ ემთხვევა"
 
-#: fe-connect.c:1516
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "უარყოფითი require_auth მეთოდი \"%s\" არ შეიძლება სხვა არაუარყოფით მეთოდებს შეურიოთ"
 
-#: fe-connect.c:1529
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "require_auth-ის მეთოდს \"%s\" უარყოფით მეთოდებს ვერ შეურევთ"
 
-#: fe-connect.c:1605 fe-connect.c:1734 fe-connect.c:1776 fe-connect.c:1819
-#: fe-connect.c:1922 fe-connect.c:1968 fe-connect.c:2008 fe-connect.c:2079
-#: fe-connect.c:8250
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "%s-ის არასწორი მნიშვნელობა: \"%s\""
 
-#: fe-connect.c:1647
+#: fe-connect.c:1648
 #, c-format
 msgid "internal error: no space in allowed_sasl_mechs"
 msgstr "შიდა შეცდომა: 'allowed_sasl_merchs'-ში ჰარე არაა"
 
-#: fe-connect.c:1686
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "პარამეტრი \"%s\" ერთზე მეტჯერაა მითითებული"
 
-#: fe-connect.c:1757 fe-connect.c:1796 fe-connect.c:1828 fe-connect.c:1930
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "%s-ის მნიშვნელობა \"%s\" არასწორია, როცა SSL-ის მხარდაჭერა გამორთული იყო აგების დროს"
 
-#: fe-connect.c:1848
+#: fe-connect.c:1849
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
 msgstr "სუსტი sslmode \"%s\" არ შეიძლება გამოყენებული იქნას sslrootcert=system-თან ერთად (გამოიყენეთ \"require\", \"verify-ca\", ან \"verify-full\")"
 
-#: fe-connect.c:1870
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "სუსტი sslmode \"%s\" არ შეიძლება გამოყენებული იქნას sslrootcert=system-თან ერთად (გამოიყენეთ \"verify-full\")"
 
-#: fe-connect.c:1883 fe-connect.c:1891
+#: fe-connect.c:1884 fe-connect.c:1892
 #, c-format
 msgid "invalid \"%s\" value: \"%s\""
 msgstr "\"%s\"-ის არასწორი მნიშვნელობა: \"%s\""
 
-#: fe-connect.c:1908
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "არასწორი SSL პროტოკოლის ვერსიის დიაპაზონი"
 
-#: fe-connect.c:1945
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s-ის მნიშვნელობა \"%s\" მხარდაჭერილი არაა (შეამოწმეთ OpenSSL-ის ვერსია)"
 
-#: fe-connect.c:1975
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "gssencmode -ის მნიშვნელობა \"%s\" არასწორია. GSSAPI-ის მხარდაჭერა გამორთული იყო აგების დროს"
 
-#: fe-connect.c:2029
+#: fe-connect.c:2030
 #, c-format
 msgid "invalid SCRAM client key"
 msgstr "არასწორი SCRAM კლიენტის გასაღები"
@@ -736,613 +813,628 @@ msgstr "არასწორი SCRAM კლიენტის გასაღ
 msgid "invalid SCRAM client key length: %d"
 msgstr "არასწორი SCRAM კლიენტის გასაღების სიგრძე: %d"
 
-#: fe-connect.c:2054
+#: fe-connect.c:2053
 #, c-format
 msgid "invalid SCRAM server key"
 msgstr "არასწორი SCRAM სერვერის გასაღები"
 
-#: fe-connect.c:2060
+#: fe-connect.c:2058
 #, c-format
 msgid "invalid SCRAM server key length: %d"
 msgstr "არასწორი SCRAM სერვერის გასაღების სიგრძე: %d"
 
-#: fe-connect.c:2148
+#: fe-connect.c:2145
 #, c-format
-msgid "min_protocol_version is greater than max_protocol_version"
-msgstr "min_protocol_version უფრო დიდია, ვიდრე max_protocol_version"
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\" \"%s\"-ზე მეტია"
 
-#: fe-connect.c:2360
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "სოკეტის TCP no_delay რეჟიმის ჩართვის შეცდომა: %s"
 
-#: fe-connect.c:2419
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "სოკეტით (\"%s\")სერვერთან მიერთების შეცდომა: "
 
-#: fe-connect.c:2445
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "სერვერის (\"%s\" (%s)) %s-ე პორტზე მიერთების შეცდომა: "
 
-#: fe-connect.c:2450
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "სერვერის (\"%s\" ) %s-ე პორტზე მიერთების შეცდომა: "
 
-#: fe-connect.c:2473
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tარს სერვერი ლოკალურად გაშვებული და მზადაა სოკეტითა დასაკავშირებლად?"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tარის სერვერი გაშვებული ამ ჰოსტზე და ეთანხმება TCP/IP შეერთებებს?"
 
-#: fe-connect.c:2521 fe-connect.c:2555 fe-connect.c:2590 fe-connect.c:2688
-#: fe-connect.c:3414
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) -ის შეცდომა: %s"
 
-#: fe-connect.c:2654
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) -ის შეცდომა: შეცდომის კოდი %d"
 
-#: fe-connect.c:2966
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "შეერთების არასწორი მდგომარეობა. დიდი შანსით ნიშნავს მეხსიერების დაზიანებას"
 
-#: fe-connect.c:3049
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "პორტის არასწორი ნომერი: \"%s\""
 
-#: fe-connect.c:3063
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "ჰოსტის სახელის (%s) მისამართში თარგმნის შეცდომა: %s"
 
-#: fe-connect.c:3075
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "ქსელური მისამართის (\"%s\") დამუშავების პრობლემა: %s"
 
-#: fe-connect.c:3086
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Unix-დომენის სოკეტის მისამართი \"%s\" ძალიან გრძელია (დასაშვებია %d ბაიტი)"
 
-#: fe-connect.c:3100
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "unix-დომენის სოკეტის ბილიკის (\"%s\") მისამართად თარგმნის შეცდომა: %s"
 
-#: fe-connect.c:3266 fe-connect.c:4713
+#: fe-connect.c:3263 fe-connect.c:4710
 #, c-format
 msgid "GSSAPI encryption required but it is not supported over a local socket"
 msgstr "GSSAPI დაშიფვრა მოთხოვნილია, მაგრამ შეუძლებელია ლოკალური სოკეტის გამოყენებით"
 
-#: fe-connect.c:3274 fe-connect.c:4842
+#: fe-connect.c:3271 fe-connect.c:4839
 #, c-format
 msgid "GSSAPI encryption required but no credential cache"
 msgstr "GSSAPI დაშიფვრა მოთხოვნილია, მაგრამ ავტორიზაციის დეტალების კეში არ არსებობს"
 
-#: fe-connect.c:3342
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "სოკეტის შექმნის შეცდომა: %s"
 
-#: fe-connect.c:3373
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "სოკეტის არაბლოკირებული რეჟიმის დაყენების შეცდომა: %s"
 
-#: fe-connect.c:3384
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "სოკეტის დახურვა-შესრულებისას რეჟიმის დაყენების შეცდომა: %s"
 
-#: fe-connect.c:3541
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "სოკეტის შეცდომის სტატუსის მიღების შეცდომა: %s"
 
-#: fe-connect.c:3568
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "კლიენტის მისამართის სოკეტიდან მიღების შეცდომა: %s"
 
-#: fe-connect.c:3594
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "პარამეტრი requirepeer ამ პლატფორმაზე მხარდაჭერილი არაა"
 
-#: fe-connect.c:3596
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "პარტნიორის ავტორიზაციის დეტალების მიღების შეცდომა: %s"
 
-#: fe-connect.c:3609
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requrepeer-ის მნიშვნელობაა \"%s\", მაგრამ პარტნიორის მომხმარებლის ნამდვილი ასხელია: \"%s\""
 
-#: fe-connect.c:3647
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "შეცდომა GSSAPI-ის მიმოცვლის პაკეტის გაგზავნისას: %s"
 
-#: fe-connect.c:3686
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "შეცდომა SSL მიმოცვლის პაკეტის გაგზავნისას: %s"
 
-#: fe-connect.c:3712
+#: fe-connect.c:3709
 #, c-format
 msgid "could not send cancel packet: %s"
 msgstr "გაუქმების პაკეტის გაგზავნა შეუძლებელია: %s"
 
-#: fe-connect.c:3742
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "გაშვების პაკეტის გაგზავნის შეცდომა: %s"
 
-#: fe-connect.c:3815
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "სერვერს SSL-ის მხარდაჭერა არ გააჩნია, მაგრამ SSL-ი აუცილებელია"
 
-#: fe-connect.c:3825
+#: fe-connect.c:3822
 #, c-format
 msgid "server sent an error response during SSL exchange"
 msgstr "სერვერმა გამოაგზავნა შეცდომის შემცველი პასუხი SSL მიმოცვლის დროს"
 
-#: fe-connect.c:3830
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "არასწორი პასუხი SSL მიმოცვლისას: %c"
 
-#: fe-connect.c:3850
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "'SSL' პასუხის შემდეგ მიღებული მონაცემები დაუშიფრავია"
 
-#: fe-connect.c:3913
+#: fe-connect.c:3910
 #, c-format
 msgid "server sent an error response during GSS encryption exchange"
 msgstr "სერვერმა გამოაგზავნა შეცდომის შემცველი პასუხი GSS დაშიფვრის მიმოცვლის დროს"
 
-#: fe-connect.c:3931
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "სერვერს GSSAPI დაშიფვრის მხარდაჭერა არ გააჩნა, მაგრამ ის მოთხოვილია"
 
-#: fe-connect.c:3935
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "'GSSAPI' მიმოცვლის არასწორი პასუხი: %c"
 
-#: fe-connect.c:3957
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "'GSSAPI' პასუხის შემდეგ მიღებული მონაცემები დაუშიფრავია"
 
-#: fe-connect.c:4018
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "სერვერიდან მოსალოდნელი იყო ავთენტიკაციის მოთხოვნა, მაგრამ მიღებულია %c"
 
-#: fe-connect.c:4046 fe-connect.c:4178
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "დუბლირებული GSS ავთენტიკაციის მოთხოვნა"
 
-#: fe-connect.c:4052
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება"
 
-#: fe-connect.c:4071 fe-connect.c:4125
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "მიღებულია არასწორი შეცდომის შეტყობინება"
 
-#: fe-connect.c:4155
+#: fe-connect.c:4152
 #, c-format
 msgid "received duplicate protocol negotiation message"
 msgstr "მიღებულია გამეორებული პროტოკოლის მიმოცვლის შეტყობინება"
 
-#: fe-connect.c:4257
+#: fe-connect.c:4254
 #, c-format
 msgid "internal error: async authentication has no handler"
 msgstr "შიდა შეცდომა: ასინქრონულ ავთენტიკატორს დამმუშავებელი არ აქვს"
 
-#: fe-connect.c:4282
+#: fe-connect.c:4279
 #, c-format
 msgid "internal error: async cleanup did not release polling socket"
 msgstr "შიდა შეცდომა: ასინქრონულმა მოსუფთავებამ სოკეტი არ გაათავისუფლა"
 
-#: fe-connect.c:4305
+#: fe-connect.c:4302
 #, c-format
 msgid "internal error: async authentication did not set a socket for polling"
 msgstr "შიდა შეცდომა: ასინქრონულმა ავთენტიკაციამ პოლინგისთვის სოკეტი არ დააყენა"
 
-#: fe-connect.c:4338
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "სერვერის გაშვებისას მიღებულია მოულოდნელი შეტყობინება"
 
-#: fe-connect.c:4429
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "სესია მხოლოდ კითხვადია"
 
-#: fe-connect.c:4431
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "სესია მხოლოდ კითხვადი არა"
 
-#: fe-connect.c:4484
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "სერვერი მზა-უქმე რეჟიმშია"
 
-#: fe-connect.c:4486
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "სერვერი მზა-უქმე რეჟიმში არაა"
 
-#: fe-connect.c:4611 fe-connect.c:4661
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "\"%s\"-ის შეცდომა"
 
-#: fe-connect.c:4675
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "შეერთების არასწორი მდგომარეობა (%d). დიდი შანსით ნიშნავს მეხსიერების დაზიანებას"
 
-#: fe-connect.c:5504
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "'LDAP'-ის არასწორი URL: \"%s\": სქემა ldap:// უნდა იყოს"
 
-#: fe-connect.c:5519
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "'LDAP'-ის არასწორი URL: \"%s\": აკლია გამოყოფილი სახელი"
 
-#: fe-connect.c:5531 fe-connect.c:5589
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "'LDAP'-ის არასწორი URL \"%s\": ზუსტად ერთი ატრიბუტი უნდა ჰქონდეს"
 
-#: fe-connect.c:5543 fe-connect.c:5605
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "'LDAP'-ის არასწორი URL: \"%s\": საჭიროა ძებნის ფარგლების ქონა (საბაზისო/ერთი/ქვე)"
 
-#: fe-connect.c:5555
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "'LDAP'-ის არასწორი URL: \"%s\":ფილტრი არ არსებობს"
 
-#: fe-connect.c:5577
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "'LDAP'-ის არასწორი URL: \"%s\": პორტის არასწორი ნომერი"
 
-#: fe-connect.c:5614
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "შეცდომა LDAP-ის სტრუქტურის შექმნისას"
 
-#: fe-connect.c:5689
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "'LDAP' სერვერის მოძებნის შეცდომა: %s"
 
-#: fe-connect.c:5699
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "ძებნისას (LDAP) ნაპოვნია ერთზე მეტი ჩანაწერი"
 
-#: fe-connect.c:5701 fe-connect.c:5712
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "ძებნისას (LDAP) ჩანაწერები ნაპოვნი არაა"
 
-#: fe-connect.c:5722 fe-connect.c:5734
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "'LDAP' ძებნის ატრიბუტს მნიშვნელობა არ გააჩნია"
 
-#: fe-connect.c:5785 fe-connect.c:5804 fe-connect.c:6328
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "დაკავშირების ინფორმაციის სტრიქონის ზომა მაქსიმალურ დასაშვებს (%d) აღემატება"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "შეერთების სტრიქონში \"%s\"-ის შემდეგ \"=\" აკლია"
 
-#: fe-connect.c:5875 fe-connect.c:6511 fe-connect.c:7341
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "შეერთების არასწორი პარამეტრი: \"%s\""
 
-#: fe-connect.c:5890 fe-connect.c:6376
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "შეერთების ინფორმაციის სტრიქონში ბრჭყალებში ჩასმული სტრიქონი დაუსრულებელია"
 
-#: fe-connect.c:5970
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "სერვისის აღწერა არ არსებობს: \"%s\""
 
-#: fe-connect.c:5996
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "სერვისის ფაილი არ არსებობს: \"%s\""
 
-#: fe-connect.c:6009
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "ძალიან გრძელი ხაზი (%d) სერვისის ფაილში \"%s\""
 
-#: fe-connect.c:6080 fe-connect.c:6123
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "სინტაქსის შეცდომა სერვისის ფაილში \"%s\" ხაზზე %d"
 
-#: fe-connect.c:6091
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "სერვისის ფაილში \"%s\" ჩადგმული სერვისის მითითება მხარდაუჭერელია. ხაზი %d"
 
-#: fe-connect.c:6830
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "დამუშავებს შიდა ფუნქციაში გადაცემული URI არასწორია: %s"
 
-#: fe-connect.c:6907
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "სტრიქონის დასასრული \"]\"-ს IPv6 ჰოსტის მისამართში URI-ში ძებნისას: \"%s\""
 
-#: fe-connect.c:6914
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "ჰოსტის IPv6 მისამართი URI-ში ცარიელი ვერ იქნება: \"%s\""
 
-#: fe-connect.c:6929
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "უცნობი სიმბოლო (\"%c\") URI-ში პოზიციაზე %d (მოველოდი \":\"-ს ან \"/\"-ს): \"%s\""
 
-#: fe-connect.c:7058
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "მოთხოვნის URI არამეტრში მითითებულია გასაღები/მნიშვნელობის ზედმეტი \"=\": \"%s\""
 
-#: fe-connect.c:7078
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "მოთხოვნის URI პარამეტრში მითითებულია გასაღები/მნიშვნელობის წყვილს \"=\" აკლია: \"%s\""
 
-#: fe-connect.c:7130
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "მოთხოვნის არასწორი პარამეტრი: \"%s\""
 
-#: fe-connect.c:7214
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "არასწორი პროცენტულად-კოდირებული კოდი: \"%s\""
 
-#: fe-connect.c:7224
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "პროცენტში კოდირებული მნიშვნელობის აკრძალული მნიშვნელობა %%00: \"%s\""
 
-#: fe-connect.c:7246
+#: fe-connect.c:7265
 #, c-format
 msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
 msgstr "\"%s\"-ში აღმოჩენილია მოულოდნელი ჰარეები. მათ მაგიერ გამოიყენეთ პროცენტით კოდირებული (%%20)"
 
-#: fe-connect.c:7628
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "შეერთების მაჩვენებელი ნულოვანია\n"
 
-#: fe-connect.c:7636 fe-exec.c:713 fe-exec.c:975 fe-exec.c:3459
-#: fe-protocol3.c:987 fe-protocol3.c:1020
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "არასაკმარისი მეხსიერება\n"
 
-#: fe-connect.c:7938
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "გაფრთხილება. პაროლის ფაილი \"%s\" უბრალოდ ფაილს არ წარმოადგენს\n"
 
-#: fe-connect.c:7948
+#: fe-connect.c:7961
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "გაფრთხილება: პაროლების ფაილს \"%s\" ჯგუფზე ან დანარჩენ ყველაზე წვდომა გააჩნია. წვდომა 0600 ან ნაკლები უნდა იყოს\n"
 
-#: fe-connect.c:8052
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "პაროლი მიღებულია ფაილიდან \"%s\""
 
-#: fe-connect.c:8218
+#: fe-connect.c:8231
 #, c-format
 msgid "invalid integer value \"%s\" for connection option \"%s\""
 msgstr "არასწორი მნიშვნელობა: \"%s\" (უნდა იყოს მთელი რიცხვი) შეერთების პარამეტრისთვის \"%s\""
 
-#: fe-exec.c:469 fe-exec.c:3533
+#: fe-exec.c:469 fe-exec.c:3549
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "მწკრივების რაოდენობა %d ზღვარს (0..%d) გარეთაა"
 
-#: fe-exec.c:531 fe-protocol3.c:2067
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:834
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "სერვერზე ჩაწერის შეცდომა"
 
-#: fe-exec.c:874
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "შეცდომის ტექსტი ხელმიუწვდომელია"
 
-#: fe-exec.c:963
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "გაფრთხილება"
 
-#: fe-exec.c:1021
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult-ს INT_MAX-ზე მეტი სტრუქტურის მხარდაჭერა არ გააჩნია"
 
-#: fe-exec.c:1033
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "size_t -ის გადავსება"
 
-#: fe-exec.c:1438 fe-exec.c:1507 fe-exec.c:1553
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "ბრძანების სტრიქონი ნულოვანი მაჩვენებელია"
 
-#: fe-exec.c:1444 fe-exec.c:3003
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "კომუნიკაციის არხის რეჟიმში %s დაუშვებელია"
 
-#: fe-exec.c:1512 fe-exec.c:1558 fe-exec.c:1652
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "პარამეტრების რაოდენობა 0-სა და %d-ს შორის შეიძლება იყოს"
 
-#: fe-exec.c:1548 fe-exec.c:1647
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "გამოსახულების სახელი ნულოვანი მაჩვენებელია"
 
-#: fe-exec.c:1689 fe-exec.c:3379
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "სერვერთან შეერთება არ არსებობს"
 
-#: fe-exec.c:1697 fe-exec.c:3387
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "უკვე გაშვებულია სხვა ბრძანება"
 
-#: fe-exec.c:1727
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "როცა გაშვებულია ბრძანება COPY, სხვა ბრძანებებს ვერ გაუშვებთ"
 
-#: fe-exec.c:1846
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "ბინარული პარამეტრისთვის სიგრძის მითითება აუცილებელია"
 
-#: fe-exec.c:2205
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "მოულოდნელი asyncStatus: %d"
 
-#: fe-exec.c:2361
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "კომუნიკაციის არხის რეჟიმში ბრძანების სინქრონული შესრულების ფუნქციები მიუწვდომელია"
 
-#: fe-exec.c:2378
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY შეწყვეტილია ახალი PQexec-ის მიერ"
 
-#: fe-exec.c:2394
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "COPY BOTH-ის დროს PQexec დაუშვებელია"
 
-#: fe-exec.c:2630
+#: fe-exec.c:2646
 #, c-format
 msgid "unrecognized message type \"%c\""
 msgstr "შეტყობინების უცნობი ტიპი: \"%c\""
 
-#: fe-exec.c:2702 fe-exec.c:2756 fe-exec.c:2824 fe-protocol3.c:1998
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "ბრძანება COPY გაშვებული არაა"
 
-#: fe-exec.c:3010
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "შეერთების მდგომარეობა არასწორია"
 
-#: fe-exec.c:3053
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "კომუნიკაციის არხის რეჟიმზე გადართვის შეცდომა. შეერთება უქმე არაა"
 
-#: fe-exec.c:3089 fe-exec.c:3110
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "მოგროვებული შედეგების გარეშე კომუნიკაციის არხის რეჟიმიდან ვერ გახვალთ"
 
-#: fe-exec.c:3093
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "კომუნიკაციის არხის რეჟიმიდან გასვლა მაშინ, როცა ის დაკავებულია, შეუძლებელია"
 
-#: fe-exec.c:3104
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "კომუნიკაციის არხის რეჟიმიდან გასვლა მაშინ, როცა ის დაკავებულია, შეუძლებელია"
 
-#: fe-exec.c:3303
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "კომუნიკაციის არხის გაგზავნა, როცა კომუნიკაციის არხის რეჟიმში არ ხართ, შეუძლებელია"
 
-#: fe-exec.c:3422
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "'ExecStatusType'-ის არასწორი კოდი"
 
-#: fe-exec.c:3449
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult შეცდომითი შედეგი არაა\n"
 
-#: fe-exec.c:3517 fe-exec.c:3540
+#: fe-exec.c:3533 fe-exec.c:3556
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "სვეტების რაოდენობა %d ზღვარს (0..%d) გარეთაა"
 
-#: fe-exec.c:3555
+#: fe-exec.c:3571
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "პარამეტრების რაოდენობა %d ზღვარს (0..%d) გარეთაა"
 
-#: fe-exec.c:3866
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "სერვერის პასუხის გაურკვეველია: %s"
 
-#: fe-exec.c:4140 fe-exec.c:4253
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "დაუსრულებელი მრავალბაიტიანი სიმბოლო"
 
-#: fe-exec.c:4142 fe-exec.c:4272
+#: fe-exec.c:4159 fe-exec.c:4311
 #, c-format
 msgid "invalid multibyte character"
 msgstr "არასწორი მრავალბაიტიანი სიმბოლო"
 
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "სპეცსიმბოლოების შემცველი სტრიქონის ზომა მაქსიმალურად დასაშვებს (%zu) აღემატება"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "სპეცსიმბოლოების bytea სტრიქონის ზომა მაქსიმალურად დასაშვებს (%zu) აღემატება"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "GSSAPI-ის სახელის შემოტანის შეცდომა"
@@ -1399,7 +1491,7 @@ msgstr "%lu-ის მთელი რიცხვის ზომა მხა
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "%lu-ის მთელი რიცხვის ზომა მხარდაუჭერელია pqPutInt-is მიერ"
 
-#: fe-misc.c:765 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
 #: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
@@ -1411,200 +1503,215 @@ msgstr ""
 "\tეს დიდი ალბათობით ნიშნავს, რომ სერვერის პროცესი \n"
 "\tმოულოდნელად, მოთხოვნამდე ან მოთხოვნის შესრულებსას დასრულდა."
 
-#: fe-misc.c:832
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "შეერთება ღია არაა\n"
 
-#: fe-misc.c:1020
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "მოლოდინის დრო გავიდა"
 
-#: fe-misc.c:1072
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "არასწორი სოკეტი"
 
-#: fe-misc.c:1095
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s()-ის შეცდომა: %s"
 
-#: fe-protocol3.c:188
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "შეტყობინების ტიპი 0x%02x მოვიდა სერვერიდან, როცა უქმე ვიყავი"
 
-#: fe-protocol3.c:401
+#: fe-protocol3.c:403
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "სერვერმა მონაცემები (\"D\" შეტყობინება) მწკრივების წინასწარი აღწერის (\"T\" შეტყობინება) გარეშე გამოაგზავნა"
 
-#: fe-protocol3.c:443
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "სერვერის მოულოდნელი პასუხი; პირველი მიღებული სიმბოლოა \"%c\""
 
-#: fe-protocol3.c:462
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "შეტყობინების შიგთავსი შეტყობინების ამ ტიპის (%c) სიგრძეს არ ემთხვევა"
 
-#: fe-protocol3.c:480
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "სერვერთან სინქრონიზაციის შეცდომა: შეტყობინების ტიპი: \"%c\", სიგრძე %d"
 
-#: fe-protocol3.c:532 fe-protocol3.c:572
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "არასაკმარისი მონაცემები \"T\" შეტყობინებაში"
 
-#: fe-protocol3.c:643 fe-protocol3.c:849
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "არასაკმარისი მეხსიერება მოთხოვნის შედეგისთვის"
 
-#: fe-protocol3.c:712
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "არასაკმარისი მონაცემები \"t\" შეტყობინებაში"
 
-#: fe-protocol3.c:771 fe-protocol3.c:803 fe-protocol3.c:821
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "არასაკმარისი მონაცემები \"D\" შეტყობინებაში"
 
-#: fe-protocol3.c:777
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "ველების მოულოდნელი რაოდენობა \"D\" შეტყობინებაში"
 
-#: fe-protocol3.c:1033
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "შეცდომის შეტყობინების გარეშე\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1081 fe-protocol3.c:1100
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " სიმბოლოსთან %s"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "დეტალი:  %s\n"
 
-#: fe-protocol3.c:1116
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "მინიშნება:  %s\n"
 
-#: fe-protocol3.c:1119
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "მოთხოვნა:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "კონტექსტი:  %s\n"
 
-#: fe-protocol3.c:1135
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "სქემის სახელი:  %s\n"
 
-#: fe-protocol3.c:1139
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "ცხრილის სახელი:  %s\n"
 
-#: fe-protocol3.c:1143
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "სვეტის სახელი:  %s\n"
 
-#: fe-protocol3.c:1147
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "მონ. ტიპის სახელი:  %s\n"
 
-#: fe-protocol3.c:1151
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "შეზღუდვის სახელი:  %s\n"
 
-#: fe-protocol3.c:1163
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "მდებარეობა:  "
 
-#: fe-protocol3.c:1165
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1167
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1362
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "ხაზი %d: "
 
-#: fe-protocol3.c:1424
+#: fe-protocol3.c:1456
 #, c-format
 msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება: სერვერმა მოითხოვა ვერსიის ჩამოწევა უფრო მაღალ ვერსიაზე"
 
-#: fe-protocol3.c:1430
+#: fe-protocol3.c:1462
 #, c-format
 msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება: სერვერმა მოითხოვა ვერსიის ჩამოწევა 3.0-მდელ ვერსიაზე"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1469
 #, c-format
-msgid "received invalid protocol negotiation message: server requests downgrade to non-existent 3.1 protocol version"
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
 msgstr "მიღებულია არასწორი პროტოკოლის ხელის ჩამორთმევის შეტყობინება: სერვერი ითხოვს ვერსიის ჩამოწევას არარსებულ პროტოკოლის ვერსიაზე 3.1"
 
-#: fe-protocol3.c:1443
+#: fe-protocol3.c:1475
 #, c-format
 msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება: სერვერმა მხარდაუჭერელი პარამეტრების უარყოფითი რაოდენობა გადმოგვცა"
 
-#: fe-protocol3.c:1449
+#: fe-protocol3.c:1481
 #, c-format
 msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება: სერვერთან კავშირი დამყარდა, მაგრამ ის ცვლილებებს არ ითხოვს"
 
-#: fe-protocol3.c:1455
+#: fe-protocol3.c:1487
 #, c-format
-msgid "server only supports protocol version %d.%d, but min_protocol_version was set to %d.%d"
-msgstr "სერვერს, მხოლოდ, %d.%d ვერსიის პროტოკოლის მხარდაჭერა აქვს, მაგრამ min_protocol-ის მნიშვნელობაა %d.%d"
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "სერვერს, მხოლოდ, %d.%d ვერსიის პროტოკოლის მხარდაჭერა აქვს, მაგრამ \"%s\"-ის მნიშვნელობაა %d.%d"
 
-#: fe-protocol3.c:1479
+#: fe-protocol3.c:1512
 #, c-format
-msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a _pq_. prefix (\"%s\")"
-msgstr "მიღებულია არასწორი პროტოკოლის მოლაპარაკების შეტყობინება: სერვერმა მოიწერა მხარდაუჭერელი პარამეტრის სახელი _pq_. პრეფიქსის გარეშე (\"%s\")"
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "მიღებულია არასწორი პროტოკოლის მოლაპარაკების შეტყობინება: სერვერმა მოიწერა მხარდაუჭერელი პარამეტრის სახელი \"%s\" პრეფიქსის გარეშე (\"%s\")"
 
-#: fe-protocol3.c:1482
+#: fe-protocol3.c:1515
 #, c-format
 msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება: სერვერმა მოიწერა მხარდაუჭერელი პარამეტრი, რომელიც მას არ მოუთხოვია (\"%s\")"
 
-#: fe-protocol3.c:1489
+#: fe-protocol3.c:1522
 #, c-format
 msgid "received invalid protocol negotiation message: message too short"
 msgstr "მიღებულია არასწორი პროტოკოლის მიმოცვლის შეტყობინება; შეტყობინება მეტისმეტად მოკლეა"
 
-#: fe-protocol3.c:1893
+#: fe-protocol3.c:1588
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "მიღებულია არასწორი შეტყობინება BackendKeyData: გაუქმების გასაღები სიგრძით %d დაუშვებელია პროტოკოლის ვერსიაში 3.0 (უნდა იყო 4 ბაიტი)"
+
+#: fe-protocol3.c:1595
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "მიღებულია არასწორი შეტყობინება BackendKeyData: გაუქმების გასაღები სიგრძით %d ძალიან მოკლეა (უნდა იყო 4 ბაიტი)"
+
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "მიღებულია არასწორი შეტყობინება BackendKeyData: გაუქმების გასაღები სიგრძით %d ძალიან გრძელია (მაქს 256 ბაიტი)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: ტექსტის COPY OUT-ს არ გავაკეთებ"
 
-#: fe-protocol3.c:2268
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "პროტოკოლის შეცდომა: ფუნქციის შედეგის გარეშე"
 
-#: fe-protocol3.c:2280
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "პროტოკოლის შეცდომა: id=0x%x"
@@ -1646,57 +1753,53 @@ msgstr "სერვერის სერტიფიკატი \"%s\"-თვ
 msgid "could not get server's host name from server certificate"
 msgstr "სერვერის სერტიფიკატიდან ჰოსტის სახელის მიღების შეცდომა"
 
-#: fe-secure-gssapi.c:194
+#: fe-secure-gssapi.c:201
 msgid "GSSAPI wrap error"
 msgstr "GSSAPI -ის გადატანის შეცდომა"
 
-#: fe-secure-gssapi.c:201
+#: fe-secure-gssapi.c:208
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "გამავალი GSSAPI შეტყობინება კონფიდენციალობას ვერ იყენებს"
 
-#: fe-secure-gssapi.c:208
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "კლიენტი ძალიან დიდი GSSAPI პაკეტების გაგზავნას ცდილობს (%zu > %zu)"
 
-#: fe-secure-gssapi.c:347 fe-secure-gssapi.c:589
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "სერვერის მიერ გამოგზავნილი GSSAPI-ის პაკეტი ძალიან დიდია (%zu > %zu)"
 
-#: fe-secure-gssapi.c:386
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-ის გადატანის მოხსნის შეცდომა"
 
-#: fe-secure-gssapi.c:395
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "შემომავალი GSSAPI შეტყობინება კონფიდენციალობას ვერ იყენებს"
 
-#: fe-secure-gssapi.c:652
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "'GSSAPI' უსაფრთხოების კონტექსტის დაწყების შეცდომა"
 
-#: fe-secure-gssapi.c:681
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-ის ზომის შემოწმების შეცდომა"
 
-#: fe-secure-gssapi.c:692
-msgid "GSSAPI context establishment error"
-msgstr "GSSAPI-ის კონტექსტის დამყარებულობის შეცდომა"
-
-#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1378
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL SYSCALL-ის შეცდომა: %s"
 
-#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1381
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "SSL SYSCALL -ის შეცდომა: ნაპოვნია EOF"
 
-#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1389
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-ის შეცდომა: %s"
@@ -1706,7 +1809,7 @@ msgstr "SSL-ის შეცდომა: %s"
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL შეერთება მოულოდნელად დაიხურა"
 
-#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1436
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "უცნობი SSL-ის შეცდომის კოდი: %d"
@@ -1736,52 +1839,52 @@ msgstr "SSL სერტიფიკატის სახელის ჩან
 msgid "SSL certificate's address entry is missing"
 msgstr "SSL სერტიფიკატის მისამართის ჩანაწერი არ არსებობს"
 
-#: fe-secure-openssl.c:714
+#: fe-secure-openssl.c:715
 #, c-format
-msgid "could not open ssl keylog file \"%s\": %s"
-msgstr "ვერ გავხსენი sslkeylogfile \"%s\": %s"
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "გაფრთხილება: ვერ გავხსენი SSL გასაღების ჟურნალის ფაილი \"%s\": %m\n"
 
-#: fe-secure-openssl.c:722
+#: fe-secure-openssl.c:723
 #, c-format
-msgid "could not write to ssl keylog file \"%s\": %s"
-msgstr "sslkeylogfile \"%s\"-ში ჩაწერის შეცდომა: %s"
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "გაფრთხილება: SSL გასაღების ჟურნალის ფაილში \"%s\" ჩაწერის შეცდომა: %m\n"
 
-#: fe-secure-openssl.c:775
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "შეცდომა SSL კონტექსტის შექმნისას: %s"
 
-#: fe-secure-openssl.c:817
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "'SSL' პროტოკოლის ვერსიის არასწორი მინიმალური მნიშვნელობა: %s"
 
-#: fe-secure-openssl.c:827
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "'SSL' პროტოკოლის ვერსიის მინიმალური მნიშვნელობის დაყენების შეცდომა: %s"
 
-#: fe-secure-openssl.c:843
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "'SSL' პროტოკოლის ვერსიის არასწორი მაქსიმალური მნიშვნელობა: %s"
 
-#: fe-secure-openssl.c:853
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "'SSL' პროტოკოლის ვერსიის მაქსიმალური მნიშვნელობის დაყენების შეცდომა: %s"
 
-#: fe-secure-openssl.c:891
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "სისტემური root სერტიფიკატების ბილიკების ჩატვირთვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:908
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "root სერტიფიკატის ფაილის (\"%s\") წაკითხვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1790,7 +1893,7 @@ msgstr ""
 "root სერტიფიკატის ფაილის მოსაძებნად საწყისი საქაღალდის მიღება შეუძლებელია\n"
 "ამ წარმოადგინეთ ფაილი, ან გამოიყენეთ სისტემის სანდო root-ები პარამეტრით sslrootcert=system, ან sslmode სერვერის სერტიფიკატის შემოწმება გამორთეთ."
 
-#: fe-secure-openssl.c:963
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1799,127 +1902,127 @@ msgstr ""
 "root სერტიფიკატის ფაილი \"%s\" არ არსებობს\n"
 "წარმოადგინეთ ფაილი ან გამორთეთ sslmode სერვერის სერტიფიკატის შემოწმება."
 
-#: fe-secure-openssl.c:998
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "სერტიფიკატის ფაილის გახსნის შეცდომა \"%s\": %s"
 
-#: fe-secure-openssl.c:1016
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "სერტიფიკატის ფაილის წაკითხვის შეცდომა \"%s\": %s"
 
-#: fe-secure-openssl.c:1040
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "'SSL' შეერთების დამყარების შეცდომა: %s"
 
-#: fe-secure-openssl.c:1053
+#: fe-secure-openssl.c:1058
 #, c-format
 msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
 msgstr "გაფრთხილება: sslkeylogfile-ის მხარდაჭერას OpenSSL სჭირდება\n"
 
-#: fe-secure-openssl.c:1055
+#: fe-secure-openssl.c:1060
 #, c-format
 msgid "WARNING: libpq was not built with sslkeylogfile support\n"
 msgstr "გაფრთხილება: libpq არ იყო აგებული sslkeylogfile-ის მხარდაჭერით\n"
 
-#: fe-secure-openssl.c:1086
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "'SSL' სერვერის სახელის ინდიკაციის (SNI) დაყენების შეცდომა: %s"
 
-#: fe-secure-openssl.c:1103
+#: fe-secure-openssl.c:1107
 #, c-format
 msgid "could not set SSL ALPN extension: %s"
 msgstr "\"SSL ALPN\" გაფართოების დაყენების შეცდომა: %s"
 
-#: fe-secure-openssl.c:1146
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "'SSL' ძრავის (\"%s\") ჩატვირთვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:1157
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "'SSL' ძრავის (\"%s\") ინიციალიზაციის შეცდომა: %s"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "'SSL'-ის პირადი გასაღების (\"%s\") ძრავიდან (\"%s\") წაკითხვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:1185
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "'SSL'-ის პირადი გასაღების (\"%s\") ძრავიდან (\"%s\") წაკითხვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:1222
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "სერტიფიკატისგან განსხვავებით, პირადი გასაღების ფაილი \"%s\" არ არსებობს"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "პირადი გასაღების ფაილი \"%s\" არ არსებობს: %m"
 
-#: fe-secure-openssl.c:1233
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "პირადი გასაღების ფაილი \"%s\" ჩვეულებრივი ფაილი არაა"
 
-#: fe-secure-openssl.c:1266
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "პირადი გასაღების ფაილს \"%s\" აქვს ჯგუფური ან ყველა სხვაზე წვდომა; ფაილს უნდა ჰქონდეს ნებართვები u=rw (0600) ან ნაკლები, თუ ეკუთვნის ამჟამინდელ მომხმარებელს, ან ნებართვები u=rw,g=r (0640) ან ნაკლები, თუ ეკუთვნის root-ს"
 
-#: fe-secure-openssl.c:1290
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "პირადი გასაღების ფაილის \"%s\" ჩატვირთვის შეცდომა: %s"
 
-#: fe-secure-openssl.c:1306
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "სერტიფიკატი პირადი გასაღების ფაილს (\"%s\") არ ემთხვევა: %s"
 
-#: fe-secure-openssl.c:1375
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "SSL-ის შეცდომა: სერტიფიკატის გადამოწმების შეცდომა: %s"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "ეს შეიძლება ნიშნავდეს, რომ სერვერს SSL პროტოკოლის %s-სა და %s-ს შორის ვერსიების მხარდაჭერა არ გააჩნია."
 
-#: fe-secure-openssl.c:1452
+#: fe-secure-openssl.c:1456
 #, c-format
 msgid "direct SSL connection was established without ALPN protocol negotiation extension"
 msgstr "პირდაპირი SSL მიერთება დამყარდა ALPN პროტოკოლის მიმოცვლის გაფართოების გარეშე"
 
-#: fe-secure-openssl.c:1464
+#: fe-secure-openssl.c:1468
 #, c-format
 msgid "SSL connection was established with unexpected ALPN protocol"
 msgstr "SSL შეერთება დამყარდა მოულოდნელი ALPN პროტოკოლით"
 
-#: fe-secure-openssl.c:1481
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "სერტიფიკატის მიღების შეცდომა: %s"
 
-#: fe-secure-openssl.c:1560
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "'SSL'-ის შეცდომების გარეშე"
 
-#: fe-secure-openssl.c:1603
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-ის შეცდომის კოდი %lu"
 
-#: fe-secure-openssl.c:1905
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "გაფრთხილება: sslpasswrord შეკვეცილია\n"
@@ -1943,6 +2046,9 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "%s(%s) failed: error code %d\n"
 #~ msgstr "%s(%s) -ის შეცდომა: შეცდომის კოდი %d\n"
 
+#~ msgid "GSSAPI context establishment error"
+#~ msgstr "GSSAPI-ის კონტექსტის დამყარებულობის შეცდომა"
+
 #, c-format
 #~ msgid "GSSAPI encryption required but it is not supported over a local socket)"
 #~ msgstr "GSSAPI დაშიფვრა მოთხოვნილია, მაგრამ შეუძლებელია ლოკალური სოკეტის გამოყენებით)"
@@ -1958,10 +2064,34 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
 #~ msgstr "Unix-დომენის სოკეტის მისამართი \"%s\" ძალიან გრძელია (დასაშვებია %d ბაიტი)\n"
 
+#, c-format
+#~ msgid "adding kqueue timer to multiplexer: %m"
+#~ msgstr "kqueue-ის ტაიმერის დამატება მულტიპლექსერზე: %m"
+
+#, c-format
+#~ msgid "could not add to epoll set: %m"
+#~ msgstr "epoll-ის ნაკრებში ჩამატება შეუძლებელია: %m"
+
+#, c-format
+#~ msgid "could not add to kqueue: %m"
+#~ msgstr "kqueue-ში ჩამატება შეუძლებელია: %m"
+
+#, c-format
+#~ msgid "could not comb kqueue: %m"
+#~ msgstr "kqueue-ის კომბინგი შეუძლებელია: %m"
+
 #, c-format
 #~ msgid "could not create SSL context: %s\n"
 #~ msgstr "შეცდომა SSL კონტექსტის შექმნისას: %s\n"
 
+#, c-format
+#~ msgid "could not delete from epoll set: %m"
+#~ msgstr "epoll-ის ნაკრებიდან წაშლა შეუძლებელია: %m"
+
+#, c-format
+#~ msgid "could not delete from kqueue: %m"
+#~ msgstr "kqueue-დან წაშლა შეუძლებელია: %m"
+
 #, c-format
 #~ msgid "could not load private key file \"%s\": %s\n"
 #~ msgstr "პირადი გასაღების ფაილის \"%s\" ჩატვირთვის შეცდომა: %s\n"
@@ -1970,13 +2100,69 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "could not look up local user ID %d: %s"
 #~ msgstr "ლოკალური მომხმარებლის ID-ის (%d) ამოხსნა შეუძლებელია: %s"
 
+#, c-format
+#~ msgid "could not modify kqueue: %m"
+#~ msgstr "kqueue-ის შეცვლა შეუძლებელია: %m"
+
 #, c-format
 #~ msgid "could not open file \"%s\": %s\n"
 #~ msgstr "ფაილის გახსნის შეცდომა \"%s\": %s\n"
 
+#, c-format
+#~ msgid "could not update epoll set: %m"
+#~ msgstr "epoll-ების ნაკრების განახლება ჩავარდა: %m"
+
+#, c-format
+#~ msgid "deleting kqueue timer: %m"
+#~ msgstr "kqueue-ის ტაიმერის წაშლა: %m"
+
+#, c-format
+#~ msgid "failed to add timerfd to epoll set: %m"
+#~ msgstr "epoll-ის ნაკრებში timerfd-ის ჩამატება ჩავარდა; %m"
+
+#, c-format
+#~ msgid "failed to create epoll set: %m"
+#~ msgstr "epoll-ის ნაკრების შექმნა ჩავარდა: %m"
+
+#, c-format
+#~ msgid "failed to create timer kqueue: %m"
+#~ msgstr "ტაიმერის kqueue-ის შექმნა ჩავარდა: %m"
+
+#, c-format
+#~ msgid "failed to create timerfd: %m"
+#~ msgstr "timerfd-ის შექმნა ჩავარდა: %m"
+
+#, c-format
+#~ msgid "getting timerfd value: %m"
+#~ msgstr "timerfd-ის მნიშვნელობის მიღება: %m"
+
 #~ msgid "incoming GSSAPI message did not use confidentiality\n"
 #~ msgstr "შემომავალი GSSAPI შეტყობინება კონფიდენციალობას არ იყენებს\n"
 
+#, c-format
+#~ msgid "internal error: array member found at nesting level %d"
+#~ msgstr "შიდა შეცდომა: ერთმანეთში ჩალაგების დონეზე %d აღმოჩენილია მასივის წევრი"
+
+#, c-format
+#~ msgid "internal error: field '%s' still active at end of object"
+#~ msgstr "შიდა შეცდომა: ველი '%s' ჯერ კიდევ აქტიურია ობიექტის ბოლოში"
+
+#, c-format
+#~ msgid "internal error: found unexpected array end while parsing field '%s'"
+#~ msgstr "შიდა შეცდომა: აღმოჩენილია მოულოდნელი მასივის დასასრული '%s' ველის დამუშავებისას"
+
+#, c-format
+#~ msgid "internal error: scalar field '%s' would be assigned twice"
+#~ msgstr "შიდა შეცდომა: შეიძლება, სკალარული ველი '%s' ორჯერაა მინიჭებული"
+
+#, c-format
+#~ msgid "internal error: scalar target found at nesting level %d"
+#~ msgstr "შიდა შეცდომა: აღმოჩენილია სკალარული სამიზნე ერთმანეთში ჩალაგების დონეზე %d"
+
+#, c-format
+#~ msgid "internal error: started field '%s' before field '%s' was finished"
+#~ msgstr "შიდა შეცდომა: დაიწყო ველი '%s' მანამდე, სანამ დასრულდა ველი '%s'"
+
 #, c-format
 #~ msgid "invalid %s message"
 #~ msgstr "არასწორი %s შეტყობინება"
@@ -1989,6 +2175,10 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "keepalives parameter must be an integer"
 #~ msgstr "პარამეტრი keepalives მთელი რიცხვი უნდა იყოს"
 
+#, c-format
+#~ msgid "min_protocol_version is greater than max_protocol_version"
+#~ msgstr "min_protocol_version უფრო დიდია, ვიდრე max_protocol_version"
+
 #, c-format
 #~ msgid "no application protocol"
 #~ msgstr "აპლიკაციის პროტოკოლის გარეშე"
@@ -2018,6 +2208,18 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
 #~ msgstr "პროტოკოლის ვერსია სერვერის მიერ მხარდაჭერილი არაა: კლიენტი იყენებს %u.%u, სერვერის მხარდაჭერილი ვერსიის მაქსიმუმია %u.%u"
 
+#, c-format
+#~ msgid "removing kqueue timer from multiplexer: %m"
+#~ msgstr "kqueue-ის ტაიმერის წაშლა მულტიპლექსერიდან: %m"
+
+#, c-format
+#~ msgid "setting kqueue timer to %ld: %m"
+#~ msgstr "kqueue-ის ტაიმერის დაყენება %ld-ზე: %m"
+
+#, c-format
+#~ msgid "setting timerfd to %ld: %m"
+#~ msgstr "%ld-ზე timerfd-ის დაყენება: %m"
+
 #, c-format
 #~ msgid "sslnegotiation value \"%s\" invalid when SSL support is not compiled in"
 #~ msgstr "sslnegotiation-ის მნიშვნელობა \"%s\" არასწორია, როცა SSL-ის მხარდაჭერა გამორთული იყო აგების დროს"
@@ -2026,6 +2228,10 @@ msgstr "სოკეტის უცნობი შეცდომა: 0x%08X/%
 #~ msgid "unknown command type provided"
 #~ msgstr "მითითებულია უცნობი ბრძანების ტიპი"
 
+#, c-format
+#~ msgid "unknown libcurl socket operation: %d"
+#~ msgstr "libcurl-ის სოკეტის უცნობი ოპერაცია: %d"
+
 #, c-format
 #~ msgid "unrecognized SSL error code: %d\n"
 #~ msgstr "უცნობი SSL-ის შეცდომის კოდი: %d\n"
diff --git a/src/interfaces/libpq/po/ko.po b/src/interfaces/libpq/po/ko.po
index e2cdc4e86e3..e2db4499274 100644
--- a/src/interfaces/libpq/po/ko.po
+++ b/src/interfaces/libpq/po/ko.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libpq (PostgreSQL) 16\n"
+"Project-Id-Version: libpq (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-09-07 05:40+0000\n"
-"PO-Revision-Date: 2023-07-05 11:21+0900\n"
+"POT-Creation-Date: 2025-09-11 21:40+0000\n"
+"PO-Revision-Date: 2025-09-09 16:37+0900\n"
 "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
 "Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -15,196 +15,489 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:307 ../libpq-oauth/oauth-curl.c:2000
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "UID %d 해당하는 로컬 사용자를 찾을 수 없음: %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "libcurl easy handle 삭제 실패: %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:327
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "ID %d 로컬 사용자 없음"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "libcurl multi handle 정리 실패: %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:390 ../libpq-oauth/oauth-curl.c:401
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "OAuth 연결에서 %s 설정 실패: %s"
+
+#: ../libpq-oauth/oauth-curl.c:412
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "OAuth 응답에서 %s 구하기 실패: %s"
+
+#: ../libpq-oauth/oauth-curl.c:515 ../libpq-oauth/oauth-curl.c:625
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON이 너무 깊게 중첩되었음"
+
+#: ../libpq-oauth/oauth-curl.c:540
+#, c-format
+msgid "internal error: started field '%s' before field '%s' was finished"
+msgstr "내부 오류: '%s' 필드가 '%s' 필드 끝나기 전에 시작했음"
+
+#: ../libpq-oauth/oauth-curl.c:567
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "\"%s\" 필드 중복됨"
+
+#: ../libpq-oauth/oauth-curl.c:592
+#, c-format
+msgid "internal error: field '%s' still active at end of object"
+msgstr "내부 오류: '%s' 필드가 객체 끝에서도 여전히 활성화 상태임"
+
+#: ../libpq-oauth/oauth-curl.c:607 ../libpq-oauth/oauth-curl.c:667
+#, c-format
+msgid "top-level element must be an object"
+msgstr "최상위 레벨은 오브젝트형이어야 함"
+
+#: ../libpq-oauth/oauth-curl.c:648
+#, c-format
+msgid "internal error: found unexpected array end while parsing field '%s'"
+msgstr "내부 오류: '%s' 필드 구문분석 중 예상치 못한 배열 끝을 발견했음"
+
+#: ../libpq-oauth/oauth-curl.c:703
+#, c-format
+msgid "internal error: scalar target found at nesting level %d"
+msgstr "내부 오류: 중첩 수준 %d에서 스칼라 타겟을 발견했음"
+
+#: ../libpq-oauth/oauth-curl.c:713
+#, c-format
+msgid "internal error: scalar field '%s' would be assigned twice"
+msgstr "내부 오류: '%s' 스칼라 필드가 두 번 지정되었음"
+
+#: ../libpq-oauth/oauth-curl.c:735
+#, c-format
+msgid "internal error: array member found at nesting level %d"
+msgstr "내부 오류: 중첩 수준 %d에서 배열 요소를 발견했음"
+
+#: ../libpq-oauth/oauth-curl.c:770
+#, c-format
+msgid "no content type was provided"
+msgstr "content type이 제공되지 않았음"
+
+#: ../libpq-oauth/oauth-curl.c:809
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "예상치 못한 content type: \"%s\""
+
+#: ../libpq-oauth/oauth-curl.c:834
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "응답에 임베디드 NULL이 포함되었음"
+
+#: ../libpq-oauth/oauth-curl.c:844
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "응답이 정상 UTF-8 인코딩이 아님"
+
+#: ../libpq-oauth/oauth-curl.c:884
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "\"%s\" 필드가 없습니다."
+
+#: ../libpq-oauth/oauth-curl.c:1118
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "제공자가 oauth_client_secret을 거부했음"
+
+#: ../libpq-oauth/oauth-curl.c:1182
+#, c-format
+msgid "failed to create epoll set: %m"
+msgstr "epoll 세트를 만들수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1189
+#, c-format
+msgid "failed to create timerfd: %m"
+msgstr "timerfd를 만들 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1195
+#, c-format
+msgid "failed to add timerfd to epoll set: %m"
+msgstr "epoll 세트에 timerfd를 추가할 수 없음: %m"
+
+#. translator: the term "kqueue" (kernel queue) should not be translated
+#: ../libpq-oauth/oauth-curl.c:1205
+#, c-format
+msgid "failed to create kqueue: %m"
+msgstr "kqueue를 만들 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1218
+#, c-format
+msgid "failed to create timer kqueue: %m"
+msgstr "timer kqueue 만들기 실패: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1262 ../libpq-oauth/oauth-curl.c:1337
+#, c-format
+msgid "unknown libcurl socket operation: %d"
+msgstr "알 수 없는 libcurl 소켓 연산: %d"
+
+#: ../libpq-oauth/oauth-curl.c:1279
+#, c-format
+msgid "could not add to epoll set: %m"
+msgstr "epoll 세트에 추가할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1283
+#, c-format
+msgid "could not delete from epoll set: %m"
+msgstr "epoll 세트에서 삭제할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1287
+#, c-format
+msgid "could not update epoll set: %m"
+msgstr "epoll 세트를 갱신할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1347
+#, c-format
+msgid "could not modify kqueue: %m"
+msgstr "kqueue를 변경할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1371
+#, c-format
+msgid "could not delete from kqueue: %m"
+msgstr "kqueue에서 삭제할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1374
+#, c-format
+msgid "could not add to kqueue: %m"
+msgstr "kqueue에 추가할 수 없음: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1423
+#, c-format
+msgid "could not comb kqueue: %m"
+msgstr "kqueue 처리(comb) 실패: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1473
+#, c-format
+msgid "setting timerfd to %ld: %m"
+msgstr "timerfd를 %ld로 설정 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1503
+#, c-format
+msgid "deleting kqueue timer: %m"
+msgstr "kqueue timer 삭제 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1510
+#, c-format
+msgid "removing kqueue timer from multiplexer: %m"
+msgstr "multiplexer에서 kqueue timer 삭제 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1521
+#, c-format
+msgid "setting kqueue timer to %ld: %m"
+msgstr "kqueue timer를 %ld로 설정 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1528
+#, c-format
+msgid "adding kqueue timer to multiplexer: %m"
+msgstr "kqueue timer를 multiplexer에 추가 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1553
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "timer 제한시간 검사 중: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1715
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "libcurl 멀티 핸들러 만들기 실패"
+
+#: ../libpq-oauth/oauth-curl.c:1735
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "libcurl 핸들러 만들기 실패"
+
+#: ../libpq-oauth/oauth-curl.c:1819 ../libpq-oauth/oauth-curl.c:1860
+#: ../libpq-oauth/oauth-curl.c:2173 ../libpq-oauth/oauth-curl.c:2334
+#: ../libpq-oauth/oauth-curl.c:2395 ../libpq-oauth/oauth-curl.c:2484
+#: ../libpq-oauth/oauth-curl.c:2778 ../libpq-oauth/oauth-curl.c:2995
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1011 fe-connect.c:1051
+#: fe-connect.c:2171 fe-connect.c:2333 fe-connect.c:3726 fe-connect.c:5182
+#: fe-connect.c:5495 fe-connect.c:5750 fe-connect.c:5868 fe-connect.c:6115
+#: fe-connect.c:6195 fe-connect.c:6293 fe-connect.c:6544 fe-connect.c:6571
+#: fe-connect.c:6647 fe-connect.c:6670 fe-connect.c:6694 fe-connect.c:6729
+#: fe-connect.c:6815 fe-connect.c:6823 fe-connect.c:7180 fe-connect.c:7362
+#: fe-exec.c:530 fe-exec.c:1326 fe-exec.c:3265 fe-exec.c:4304 fe-exec.c:4470
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:211 fe-protocol3.c:234
+#: fe-protocol3.c:257 fe-protocol3.c:274 fe-protocol3.c:295 fe-protocol3.c:369
+#: fe-protocol3.c:750 fe-protocol3.c:990 fe-protocol3.c:1542
+#: fe-protocol3.c:1596 fe-protocol3.c:1642 fe-protocol3.c:1663
+#: fe-protocol3.c:1920 fe-protocol3.c:2321 fe-secure-common.c:110
+#: fe-secure-gssapi.c:506 fe-secure-gssapi.c:696 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "메모리 부족"
+
+#: ../libpq-oauth/oauth-curl.c:1847
+#, c-format
+msgid "response is too large"
+msgstr "응답 길이가 너무 깁니다"
+
+#: ../libpq-oauth/oauth-curl.c:1889
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "HTTP 요청 큐 처리 실패: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1906 ../libpq-oauth/oauth-curl.c:1959
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "비동기 HTTP 요청 실패: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2011
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "완료된 핸들에 대한 결과가 없음"
+
+#: ../libpq-oauth/oauth-curl.c:2144 ../libpq-oauth/oauth-curl.c:2450
+#: ../libpq-oauth/oauth-curl.c:2529
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "예상치 못한 응답 코드 %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2216
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "이슈 식별자 (%s)와, oauth_issuer (%s) 가 매칭되지 않음"
+
+#: ../libpq-oauth/oauth-curl.c:2243
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "\"%s\" issuer가 장치 인가 엔드포인트를 제공하지 않음"
+
+#: ../libpq-oauth/oauth-curl.c:2269
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "\"%s\" 장치 인가 엔드포인트는 HTTPS를 사용해야함"
+
+#: ../libpq-oauth/oauth-curl.c:2278
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "\"%s\" 토큰 엔드포인트는 HTTPS를 사용해야함"
+
+#: ../libpq-oauth/oauth-curl.c:2587
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "slow_down 인터벌이 넘침"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2623
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "%s 방문해서 다음 코드를 입력하세요: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2628
+#, c-format
+msgid "device prompt failed"
+msgstr "장치 프롬프트 실패"
+
+#: ../libpq-oauth/oauth-curl.c:2684
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "OAuth 설정 중 앞서 curl_global_init 실패"
+
+#: ../libpq-oauth/oauth-curl.c:2703
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "OAuth 설정 중 curl_global_init 실패"
+
+#: ../libpq-oauth/oauth-curl.c:2724
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurl 이 쓰레드에 안전하게 컴파일 되지 않았습니다.\n"
+"\tlibpq가 컴파일될 때 Curl 초기화가 스레드에 안전하다고 \t보고되었지만, 현재 "
+"설치된 libcurl 버전에서는 그렇지 않습니다.\t 설치된 libcurl 버전에 맞춰 libpq"
+"를 다시 컴파일하세요."
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "SCRAM 메시지가 형식에 안맞음 (메시지 비었음)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "SCRAM 메시지가 형식에 안맞음 (길이 불일치)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "서버 서명을 검사 할 수 없음: %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "잘못된 서버 서명"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "SCRAM 교환 상태가 바르지 않음"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "SCRAM 메시지가 형식에 안맞음 (\"%c\" 속성이 예상됨)"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr "SCRAM 메시지가 형식에 안맞음 (\"%c\" 속성 예상값은 \"=\")"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "암호화 토큰(nonce)을 만들 수 없음"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1321
-#: fe-exec.c:3111 fe-exec.c:4071 fe-exec.c:4235 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:256
-#: fe-protocol3.c:273 fe-protocol3.c:353 fe-protocol3.c:720 fe-protocol3.c:959
-#: fe-protocol3.c:1770 fe-protocol3.c:2170 fe-secure-common.c:110
-#: fe-secure-gssapi.c:500 fe-secure-openssl.c:434 fe-secure-openssl.c:1285
-#, c-format
-msgid "out of memory"
-msgstr "메모리 부족"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "암호화 토큰(nonce)을 인코딩할 수 없음"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "클라이언트 프루프(proof)를 계산할 수 없음: %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "클라이언트 프루프(proof)를 인코딩할 수 없음"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "잘못된 SCRAM 응답 (토큰 불일치)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "형식에 맞지 않은 SCRAM 메시지 (잘못된 소금 salt)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "형식에 맞지 않은 SCRAM 메시지 (나열 숫자가 이상함)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr ""
 "형식에 맞지 않은 SCRAM 메시지 (서버 첫 메시지 끝에 쓸모 없는 값이 있음)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "SCRAM 교환작업에서 서버로부터 데이터를 받지 못했음: %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr ""
 "형식에 맞지 않은 SCRAM 메시지 (서버 끝 메시지 뒤에 쓸모 없는 값이 있음)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "형식에 맞지 않은 SCRAM 메시지 (서버 서명이 이상함)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "무작위 솔트 생성 실패"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "GSSAPI 버퍼(%d)에 할당할 메모리 부족"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI 연속 오류"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "호스트 이름을 지정해야 함"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "중복된 GSS 인증 요청"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "SSPI 버퍼(%d)에 할당할 메모리 부족"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "SSPI 연속 오류"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "중복된 SSPI 인증 요청"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "SSPI 자격 증명을 가져올 수 없음"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "채널 바인딩이 필요한데, SSL 기능이 꺼져있음"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "중복된 SASL 인증 요청"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "채널 바인딩이 필요한데, 클라이언트에서 지원하지 않음"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid ""
 "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
 msgstr "서버는 non-SSL 접속으로 SCRAM-SHA-256-PLUS 인증을 제공함"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "SASL 인증 메커니즘을 지원하는 서버가 없습니다."
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid ""
+"authentication method requirement \"%s\" failed: server requested %s "
+"authentication"
+msgstr "\"%s\" 인증 방법 요건이 실패함: 서버는 %s 인증을 요청했음"
+
+#: fe-auth.c:580
 #, c-format
 msgid ""
 "channel binding is required, but server did not offer an authentication "
@@ -212,12 +505,12 @@ msgid ""
 msgstr ""
 "채널 바인딩 기능을 사용하도록 지정했지만, 서버가 이 기능을 지원하지 않음"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "SASL 버퍼(%d)에 할당할 메모리 부족"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid ""
 "AuthenticationSASLFinal received from server, but SASL authentication was "
@@ -225,164 +518,213 @@ msgid ""
 msgstr ""
 "서버에서 AuthenticationSASLFinal 응답을 받았지만, SASL 인증이 끝나지 않았음"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "SASL 교환 성공 후 클라이언트 반응 없음"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "비밀번호를 암호화 할 수 없음: %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
 msgstr "서버가 평문 비밀번호를 요청했음"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
 msgstr "서버가 해시된 비밀번호를 요청했음"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "서버가 GSSAPI 인증을 요청했음"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "서버가 SSPI 인증을 요청했음"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "서버가 SASL 인증을 요청했음"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "서버가 알 수 없는 인증 형식을 요청했음"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "서버가 SSL 인증서를 요청하지 않았음"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "서버가 SSL 인증서 유효성 검사 없이 접속을 허용했음"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "서버가 인증 절차를 완료하지 못했음"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "\"%s\" 인증 방법 요구 사항 실패: %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid ""
 "channel binding required, but server authenticated client without channel "
 "binding"
 msgstr "채널 바인딩이 필요한데, 서버가 체널 바인딩 없이 클라이언트를 인증함"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid ""
 "channel binding required but not supported by server's authentication request"
 msgstr "채널 바인딩이 필요한데, 서버 인증 요청에서 지원하지 않음"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "Kerberos 4 인증 방법이 지원되지 않음"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "Kerberos 5 인증 방법이 지원되지 않음"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "GSSAPI 인증은 지원되지 않음"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "SSPI 인증은 지원되지 않음"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
 msgstr "crypt 인증은 지원되지 않음"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "%u 인증 방법이 지원되지 않음"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "사용자 이름 찾기 실패: 오류 코드 %lu"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "로컬 사용자 ID %ld 해당하는 사용자를 찾을 수 없음: %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "ID %ld 로컬 사용자 없음"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "SHOW 명령의 결과 자료가 비정상임"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "password_encryption 너무 긺"
+msgid "\"password_encryption\" value too long"
+msgstr "\"password_encryption\" 설정값이 너무 긺"
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "알 수 없는 비밀번호 암호화 알고리즘: \"%s\""
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "연결 포인터가 NULL"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "연결 열기 실패"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "중지 작업 키를 받지 못했음"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "취소 요청을 이미 해당 연결에 보냈음"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "서버로부터 기대되지 않는 응답"
+
+#: fe-connect.c:1308
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "호스트 이름은 %d개인데, 호스트 주소는 %d개임"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1388
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "포트 번호는 %d개인데, 호스트는 %d개입니다."
 
-#: fe-connect.c:1337
+#: fe-connect.c:1516
 #, c-format
 msgid ""
 "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr ""
 "\"%s\" negative require_auth 방법은 non-negative 방법과 함께 쓸 수 없음"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1529
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "\"%s\" require_auth 방법은 negative 방법과 함께 쓸 수 없음"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1605 fe-connect.c:1734 fe-connect.c:1776 fe-connect.c:1819
+#: fe-connect.c:1922 fe-connect.c:1968 fe-connect.c:2008 fe-connect.c:2075
+#: fe-connect.c:8248
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "잘못된 %s 값: \"%s\""
 
-#: fe-connect.c:1443
+#: fe-connect.c:1647
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "내부 오류: allowed_sasl_mechs 안에 여유 공간 없음"
+
+#: fe-connect.c:1686
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "\"%s\" require_auth 방법을 한 번 이상 지정했음"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1757 fe-connect.c:1796 fe-connect.c:1828 fe-connect.c:1930
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr ""
 "SSL 연결 기능을 지원하지 않고 컴파일 된 경우는 %s 값으로  \"%s\" 값은 타당치 "
 "않습니다."
 
-#: fe-connect.c:1546
+#: fe-connect.c:1848
+#, c-format
+msgid ""
+"weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require"
+"\", \"verify-ca\", or \"verify-full\")"
+msgstr ""
+"\"%s\" 엄격하지 않은 sslmode 설정일 때는 sslnegotiation=direct 설정을 할 수 "
+"없음 (\"require\", \"verify-ca\", 또는 \"verify-full\" 설정을 사용하세요)"
+
+#: fe-connect.c:1870
 #, c-format
 msgid ""
 "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-"
@@ -391,358 +733,412 @@ msgstr ""
 "\"%s\" 엄격하지 않은 sslmode 설정일 때는 sslrootcert=system 설정을 할 수 없"
 "음 (\"verify-full\" 설정을 사용하세요)"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1883 fe-connect.c:1891
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "잘못된 \"%s\" 값: \"%s\""
+
+#: fe-connect.c:1908
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "잘못된 SSL 프로토콜 버전 범위"
 
-#: fe-connect.c:1621
+#: fe-connect.c:1945
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s 설정 \"%s\" 값은 지원하지 않음 (OpenSSL 버전을 확인하세요)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1975
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr ""
 "GSSAPI 접속을 지원하지 않는 서버에서는 gssencmode 값(\"%s\")이 적당하지 않음"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2029
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "잘못된 SCRAM 클라이언트 키"
+
+#: fe-connect.c:2034
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "잘못된 SCRAM 클라이언트 키 길이: %d"
+
+#: fe-connect.c:2052
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "잘못된 SCRAM 서버 키"
+
+#: fe-connect.c:2057
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "잘못된 SCRAM 서버 키 길이: %d"
+
+#: fe-connect.c:2144
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\" 값은 \"%s\" 보다 큽니다"
+
+#: fe-connect.c:2356
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "소켓을 TCP에 no delay 모드로 지정할 수 없음: %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2415
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "\"%s\" 소켓으로 서버 접속 할 수 없음: "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2441
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "\"%s\" (%s), %s 포트로 서버 접속 할 수 없음: "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2446
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "\"%s\" 포트 %s 서버에 접속 할 수 없음: "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2469
 #, c-format
 msgid ""
 "\tIs the server running locally and accepting connections on that socket?"
 msgstr ""
 "\t로컬 연결을 시도 중이고, 유닉스 도메인 소켓 접속을 허용하는지 확인하세요."
 
-#: fe-connect.c:2059
+#: fe-connect.c:2471
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr ""
 "\t해당 호스트에 서버가 실행 중이고, TCP/IP 접속을 허용하는지 확인하세요."
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "잘못된 정수값: \"%s\", 해당 연결 옵션: \"%s\""
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2517 fe-connect.c:2551 fe-connect.c:2586 fe-connect.c:2684
+#: fe-connect.c:3410
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) 실패: %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2650
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) 실패: 오류 코드 %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2962
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "잘못된 연결 상태, 메모리 손상일 가능성이 큼"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3045
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "잘못된 포트 번호: \"%s\""
 
-#: fe-connect.c:2690
+#: fe-connect.c:3059
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "\"%s\" 호스트 이름 IP 주소로 바꿀 수 없음: %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3071
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "\"%s\" 네트워크 주소를 해석할 수 없음: %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3082
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "\"%s\" 유닉스 도메인 소켓 경로가 너무 깁니다 (최대 %d 바이트)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3096
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "\"%s\" 유닉스 도메인 소켓 경로를 주소로 바꿀 수 없음: %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3262 fe-connect.c:4709
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr "GSSAPI 암호화가 필요하지만 로컬 소켓을 사용할 때는 지원하지 않음"
+
+#: fe-connect.c:3270 fe-connect.c:4838
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "GSSAPI 암호화가 필요한데 자격 증명 캐시가 없음"
+
+#: fe-connect.c:3338
 #, c-format
 msgid "could not create socket: %s"
 msgstr "소켓을 만들 수 없음: %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3369
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "소켓을 nonblocking 모드로 지정할 수 없음: %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3380
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "소켓을 close-on-exec 모드로 지정할 수 없음: %s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "keepalives 매개변수값은 정수여야 합니다."
-
-#: fe-connect.c:3100
+#: fe-connect.c:3537
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "소켓 오류 상태를 구할 수 없음: %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3564
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "소켓에서 클라이언트 주소를 구할 수 없음: %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3590
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "requirepeer 매개변수는 이 운영체제에서 지원하지 않음"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3592
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "신뢰성 피어를 얻을 수 없습니다: %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3605
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr ""
 "\"%s\" 이름으로 requirepeer를 지정했지만, 실재 사용자 이름은 \"%s\" 입니다."
 
-#: fe-connect.c:3221
+#: fe-connect.c:3643
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "GSSAPI 교섭 패킷을 보낼 수 없음: %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid ""
-"GSSAPI encryption required but was impossible (possibly no credential cache, "
-"no server support, or using a local socket)"
-msgstr ""
-"GSSAPI 암호화가 필요하지만 사용할 수 없음 (자격 증명 캐시가 없거나, 서버가 지"
-"원하지 않거나, 로컬 소켓을 사용하고 있는 듯합니다.)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3682
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "SSL 교섭 패킷을 보낼 수 없음: %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3708
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "취소 패킷을 보낼 수 없음: %s"
+
+#: fe-connect.c:3738
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "시작 패킷을 보낼 수 없음: %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3811
 msgid "server does not support SSL, but SSL was required"
 msgstr "서버가 SSL 기능을 지원하지 않는데, SSL 기능을 요구했음"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3821
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "SSL 교환 중에 서버가 오류 응답을 보냈음"
+
+#: fe-connect.c:3826
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "SSL 교섭에 대한 잘못된 응답을 감지했음: %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3846
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "SSL 응답 후에 비암호화 데이터를 받았음"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3909
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "GSS 암호화 교환 중에 서버가 오류 응답을 보냈음"
+
+#: fe-connect.c:3927
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "서버가 GSSAPI 암호화 기능을 지원하지 않는데, 이것이 필요함"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3931
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "GSSAPI 교섭에 대한 잘못된 응답을 감지했음: %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3953
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "GSSAPI 암호화 응답 후 비암호화 데이터 받았음"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4014
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "서버가 인증을 요구했지만, %c 받았음"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4042 fe-connect.c:4174
 #, c-format
 msgid "received invalid authentication request"
 msgstr "잘못된 인증 요청을 받았음"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4048
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "잘못된 프로토콜 교섭 메시지를 받았음"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4067 fe-connect.c:4121
 #, c-format
 msgid "received invalid error message"
 msgstr "잘못된 오류 메시지를 받았음"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4151
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "프로토콜 교섭 메시지를 중복해서 받았음"
+
+#: fe-connect.c:4253
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "내부 오류: async 인증용 핸들러가 없음"
+
+#: fe-connect.c:4278
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr "내부 오류: async cleanup 작업이 polling 소켓을 반환하지 않았음"
+
+#: fe-connect.c:4301
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr "내부 오류: async 인증이 polling을 위해 소켓 지정되지 않았음"
+
+#: fe-connect.c:4334
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "시작하는 동안 서버로부터 기대되지 않는 메시지"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4425
 #, c-format
 msgid "session is read-only"
 msgstr "세션이 읽기 전용임"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4427
 #, c-format
 msgid "session is not read-only"
 msgstr "세션이 읽기 전용이 아님"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4480
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "서버가 hot standby 모드 상태임"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4482
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "서버가 hot standby 모드 상태가 아님"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4607 fe-connect.c:4657
 #, c-format
 msgid "\"%s\" failed"
 msgstr "\"%s\" 실패"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4671
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "잘못된 연결 상태 %d,  메모리 손상일 가능성이 큼"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5508
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "잘못된 LDAP URL \"%s\": 스키마는 ldap:// 여야함"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5523
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "잘못된 LDAP URL \"%s\": 식별자 이름이 빠졌음"
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5535 fe-connect.c:5593
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "잘못된 LDAP URL \"%s\": 단 하나의 속성만 가져야함"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5547 fe-connect.c:5609
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "잘못된 LDAP URL \"%s\": 검색범위(base/one/sub)를 지정해야함"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5559
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "잘못된 LDAP URL \"%s\": 필터 없음"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5581
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "잘못된 LDAP URL \"%s\": 포트번호가 잘못됨"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5618
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "LDAP 구조를 만들 수 없음"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5693
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "LDAP 서버를 찾을 수 없음: %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5703
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "LDAP 검색에서 하나 이상의 엔트리가 발견되었음"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5705 fe-connect.c:5716
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "LDAP 검색에서 해당 항목 없음"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5726 fe-connect.c:5738
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "LDAP 검색에서 속성의 값이 없음"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5789 fe-connect.c:5808 fe-connect.c:6332
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "연결문자열에서 \"%s\" 다음에 \"=\" 문자 빠졌음"
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5879 fe-connect.c:6515 fe-connect.c:7345
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "잘못된 연결 옵션 \"%s\""
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5894 fe-connect.c:6380
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "연결문자열에서 완성되지 못한 따옴표문자열이 있음"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5974
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "\"%s\" 서비스 정의를 찾을 수 없음"
 
-#: fe-connect.c:5666
+#: fe-connect.c:6000
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "\"%s\" 서비스 파일을 찾을 수 없음"
 
-#: fe-connect.c:5679
+#: fe-connect.c:6013
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "%d번째 줄이 \"%s\" 서비스 파일에서 너무 깁니다"
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6084 fe-connect.c:6127
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "\"%s\" 서비스 파일의 %d번째 줄에 구문 오류 있음"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6095
 #, c-format
 msgid ""
 "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "\"%s\" 서비스 파일의 %d번째 줄에 설정을 지원하지 않음"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6834
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "URI 구문 분석을 할 수 없음: \"%s\""
 
-#: fe-connect.c:6577
+#: fe-connect.c:6911
 #, c-format
 msgid ""
 "end of string reached when looking for matching \"]\" in IPv6 host address "
@@ -750,12 +1146,12 @@ msgid ""
 msgstr ""
 "URI의 IPv6 호스트 주소에서 \"]\" 매칭 검색을 실패했습니다, 해당 URI: \"%s\""
 
-#: fe-connect.c:6584
+#: fe-connect.c:6918
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "IPv6 호스트 주소가 없습니다, 해당 URI: \"%s\""
 
-#: fe-connect.c:6599
+#: fe-connect.c:6933
 #, c-format
 msgid ""
 "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): "
@@ -764,47 +1160,55 @@ msgstr ""
 "잘못된 \"%c\" 문자가 URI 문자열 가운데 %d 번째 있습니다(\":\" 또는 \"/\" 문자"
 "가 있어야 함): \"%s\""
 
-#: fe-connect.c:6728
+#: fe-connect.c:7062
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr ""
 "키/밸류 구분자 \"=\" 문자가 필요 이상 더 있음, 해당 URI 쿼리 매개변수: \"%s\""
 
-#: fe-connect.c:6748
+#: fe-connect.c:7082
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "키/밸류 구분자 \"=\" 문자가 필요함, 해당 URI 쿼리 매개변수: \"%s\""
 
-#: fe-connect.c:6800
+#: fe-connect.c:7134
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "잘못된 URL 쿼리 매개변수값: \"%s\""
 
-#: fe-connect.c:6874
+#: fe-connect.c:7218
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "잘못된 퍼센트 인코드 토큰: \"%s\""
 
-#: fe-connect.c:6884
+#: fe-connect.c:7228
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "퍼센트 인코드 값에 %%00 숨김 값이 있음: \"%s\""
 
-#: fe-connect.c:7248
+#: fe-connect.c:7250
+#, c-format
+msgid ""
+"unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr ""
+"\"%s\" 안에 예상치 못한 공백 발견, 퍼센트 기호를 사용한 공백(%%20)을 사용하세"
+"요"
+
+#: fe-connect.c:7626
 msgid "connection pointer is NULL\n"
 msgstr "연결 포인터가 NULL\n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:970 fe-exec.c:3292
-#: fe-protocol3.c:974 fe-protocol3.c:1007
+#: fe-connect.c:7634 fe-exec.c:713 fe-exec.c:975 fe-exec.c:3470
+#: fe-protocol3.c:1005 fe-protocol3.c:1038
 msgid "out of memory\n"
 msgstr "메모리 부족\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7936
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "경고: \"%s\" 패스워드 파일이 plain 파일이 아님\n"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7946
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -813,166 +1217,181 @@ msgstr ""
 "경고: 패스워드 파일 \"%s\"에 그룹 또는 범용 액세스 권한이 있습니다. 권한은 "
 "u=rw(0600) 이하여야 합니다.\n"
 
-#: fe-connect.c:7663
+#: fe-connect.c:8050
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "\"%s\" 파일에서 암호를 찾을 수 없음"
 
-#: fe-exec.c:466 fe-exec.c:3366
+#: fe-connect.c:8216
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "잘못된 정수값: \"%s\", 해당 연결 옵션: \"%s\""
+
+#: fe-exec.c:469 fe-exec.c:3544
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "%d 번째 행(row)은 0..%d 범위를 벗어났음"
 
-#: fe-exec.c:528 fe-protocol3.c:1976
+#: fe-exec.c:531 fe-protocol3.c:2126
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:834
 #, c-format
 msgid "write to server failed"
 msgstr "서버에 쓰기 실패"
 
-#: fe-exec.c:869
+#: fe-exec.c:874
 #, c-format
 msgid "no error text available"
 msgstr "보여줄 오류 메시지가 없음"
 
-#: fe-exec.c:958
+#: fe-exec.c:963
 msgid "NOTICE"
 msgstr "알림"
 
-#: fe-exec.c:1016
+#: fe-exec.c:1021
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult 함수는 INT_MAX 튜플보다 많은 경우를 지원하지 않음"
 
-#: fe-exec.c:1028
+#: fe-exec.c:1033
 msgid "size_t overflow"
 msgstr "size_t 초과"
 
-#: fe-exec.c:1444 fe-exec.c:1513 fe-exec.c:1559
+#: fe-exec.c:1449 fe-exec.c:1518 fe-exec.c:1564
 #, c-format
 msgid "command string is a null pointer"
 msgstr "명령 문자열이 null 포인터"
 
-#: fe-exec.c:1450 fe-exec.c:2888
+#: fe-exec.c:1455 fe-exec.c:3014
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "파이프라인 모드에서는 %s 사용할 수 없음"
 
-#: fe-exec.c:1518 fe-exec.c:1564 fe-exec.c:1658
+#: fe-exec.c:1523 fe-exec.c:1569 fe-exec.c:1663
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "매개변수값으로 숫자는 0에서 %d까지만 쓸 수 있음"
 
-#: fe-exec.c:1554 fe-exec.c:1653
+#: fe-exec.c:1559 fe-exec.c:1658
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "실행 구문 이름이 null 포인트(값이 없음)입니다"
 
-#: fe-exec.c:1695 fe-exec.c:3220
+#: fe-exec.c:1700 fe-exec.c:3390
 #, c-format
 msgid "no connection to the server"
 msgstr "서버에 대한 연결이 없음"
 
-#: fe-exec.c:1703 fe-exec.c:3228
+#: fe-exec.c:1708 fe-exec.c:3398
 #, c-format
 msgid "another command is already in progress"
 msgstr "처리 중에 이미 다른 명령이 존재함"
 
-#: fe-exec.c:1733
+#: fe-exec.c:1738
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "COPY 작업 중 명령들을 큐에 담을 수 없음"
 
-#: fe-exec.c:1850
+#: fe-exec.c:1857
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "바이너리 자료 매개 변수를 사용할 때는 그 길이를 지정해야 함"
 
-#: fe-exec.c:2171
+#: fe-exec.c:2216
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "기대되지 않은 asyncStatus: %d"
 
-#: fe-exec.c:2327
+#: fe-exec.c:2372
 #, c-format
 msgid ""
 "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "파이프라인 모드에서는 동기식 명령 실행 함수는 사용할 수 없음"
 
-#: fe-exec.c:2344
+#: fe-exec.c:2389
 msgid "COPY terminated by new PQexec"
 msgstr "새 PQexec 호출로 COPY 작업이 중지 되었습니다"
 
-#: fe-exec.c:2360
+#: fe-exec.c:2405
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "COPY BOTH 작업 중에는 PQexec 사용할 수 없음"
 
-#: fe-exec.c:2586 fe-exec.c:2641 fe-exec.c:2709 fe-protocol3.c:1907
+#: fe-exec.c:2641
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "알 수 없는 메시지 형 \"%c\""
+
+#: fe-exec.c:2713 fe-exec.c:2767 fe-exec.c:2835 fe-protocol3.c:2057
 #, c-format
 msgid "no COPY in progress"
 msgstr "처리 가운데 COPY가 없음"
 
-#: fe-exec.c:2895
+#: fe-exec.c:3021
 #, c-format
 msgid "connection in wrong state"
 msgstr "잘못된 상태의 연결"
 
-#: fe-exec.c:2938
+#: fe-exec.c:3064
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "파이프라인 모드로 바꿀 수 없음, 연결이 idle 상태가 아님"
 
-#: fe-exec.c:2974 fe-exec.c:2995
+#: fe-exec.c:3100 fe-exec.c:3121
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "수집할 수 없는 결과로 파이프라인 모드를 종료할 수 없음"
 
-#: fe-exec.c:2978
+#: fe-exec.c:3104
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "바빠서 파이프라인 모드를 종료할 수 없음"
 
-#: fe-exec.c:2989
+#: fe-exec.c:3115
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "COPY 하고 있어 파이프라인 모드를 종료할 수 없음"
 
-#: fe-exec.c:3154
+#: fe-exec.c:3314
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "파이프라인 모드 상태가 아닐 때는 파이프라인을 보낼 수 없음"
 
-#: fe-exec.c:3255
+#: fe-exec.c:3433
 msgid "invalid ExecStatusType code"
 msgstr "잘못된 ExecStatusType 코드"
 
-#: fe-exec.c:3282
+#: fe-exec.c:3460
 msgid "PGresult is not an error result\n"
 msgstr "PGresult가 오류 결과가 아님\n"
 
-#: fe-exec.c:3350 fe-exec.c:3373
+#: fe-exec.c:3528 fe-exec.c:3551
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "%d 번째 열은 0..%d 범위를 벗어났음"
 
-#: fe-exec.c:3388
+#: fe-exec.c:3566
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "%d개의 매개 변수는 0..%d 범위를 벗어났음"
 
-#: fe-exec.c:3699
+#: fe-exec.c:3877
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "서버로부터 결과처리를 중지 시킬 수 없음: %s"
 
-#: fe-exec.c:3964 fe-exec.c:4054
+#: fe-exec.c:4152 fe-exec.c:4266
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "완성되지 않은 멀티바이트 문자"
 
+#: fe-exec.c:4154 fe-exec.c:4285
+#, c-format
+msgid "invalid multibyte character"
+msgstr "잘못된 멀티바이트 문자"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "GSSAPI 이름 가져오기 오류"
@@ -1019,23 +1438,18 @@ msgstr "\"%s\" 파일을 쓸 수 없음: %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "large object function을 초기화 하는 쿼리가 데이터를 리턴하지 않았음"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "%lu 정수형 크기는 pqGetInt 함수에서 지원하지 않음"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "%lu 정수형 크기는 pqPutInt 함수에서 지원하지 않음"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "연결 열기 실패"
-
-#: fe-misc.c:751 fe-secure-openssl.c:215 fe-secure-openssl.c:315
-#: fe-secure.c:257 fe-secure.c:419
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -1046,31 +1460,31 @@ msgstr ""
 "\t이런 처리는 클라이언트의 요구를 처리하는 동안이나\n"
 "\t처리하기 전에 서버가 갑자기 종료되었음을 의미함."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "연결 열기 실패\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "시간 초과"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "잘못된 소켓"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() 실패: %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:189
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "휴지(idle)동안 서버로 부터 0x%02x 형태 메시지를 받았음"
 
-#: fe-protocol3.c:385
+#: fe-protocol3.c:402
 #, c-format
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
@@ -1078,145 +1492,229 @@ msgid ""
 msgstr ""
 "서버에서 먼저 행(row) 설명(\"T\" 메시지) 없이 자료(\"D\" 메시지)를 보냈음"
 
-#: fe-protocol3.c:427
+#: fe-protocol3.c:444
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "서버로부터 예상치 못한 응답을 받았음; \"%c\" 문자를 첫문자로 받았음"
 
-#: fe-protocol3.c:450
+#: fe-protocol3.c:468
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "메시지 내용이 \"%c\" 메시지 형태의 길이를 허락하지 않음"
 
-#: fe-protocol3.c:468
+#: fe-protocol3.c:503
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "서버와의 동기화가 끊김:  \"%c\" 형태 길이 %d 메시지 받음"
 
-#: fe-protocol3.c:520 fe-protocol3.c:560
+#: fe-protocol3.c:550 fe-protocol3.c:590
 msgid "insufficient data in \"T\" message"
 msgstr "\"T\" 메시지 안에 부족자 데이터"
 
-#: fe-protocol3.c:631 fe-protocol3.c:837
+#: fe-protocol3.c:661 fe-protocol3.c:867
 msgid "out of memory for query result"
 msgstr "쿼리 결과 처리를 위한 메모리 부족"
 
-#: fe-protocol3.c:700
+#: fe-protocol3.c:730
 msgid "insufficient data in \"t\" message"
 msgstr "\"t\" 메시지 안에 데이터가 충분하지 않음"
 
-#: fe-protocol3.c:759 fe-protocol3.c:791 fe-protocol3.c:809
+#: fe-protocol3.c:789 fe-protocol3.c:821 fe-protocol3.c:839
 msgid "insufficient data in \"D\" message"
 msgstr "\"D\" 메시지 안에 불충분한 데이터"
 
-#: fe-protocol3.c:765
+#: fe-protocol3.c:795
 msgid "unexpected field count in \"D\" message"
 msgstr "\"D\" 메시지 안에 예상치 못한 필드 수"
 
-#: fe-protocol3.c:1020
+#: fe-protocol3.c:1051
 msgid "no error message available\n"
 msgstr "보여줄 오류 메시지가 없음\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1068 fe-protocol3.c:1087
+#: fe-protocol3.c:1099 fe-protocol3.c:1118
 #, c-format
 msgid " at character %s"
 msgstr " 위치: %s"
 
-#: fe-protocol3.c:1100
+#: fe-protocol3.c:1131
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "상세정보:  %s\n"
 
-#: fe-protocol3.c:1103
+#: fe-protocol3.c:1134
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "힌트:  %s\n"
 
-#: fe-protocol3.c:1106
+#: fe-protocol3.c:1137
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "쿼리:  %s\n"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1144
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "구문:  %s\n"
 
-#: fe-protocol3.c:1122
+#: fe-protocol3.c:1153
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "스키마 이름:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1157
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "테이블 이름:  %s\n"
 
-#: fe-protocol3.c:1130
+#: fe-protocol3.c:1161
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "칼럼 이름:  %s\n"
 
-#: fe-protocol3.c:1134
+#: fe-protocol3.c:1165
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "자료형 이름:  %s\n"
 
-#: fe-protocol3.c:1138
+#: fe-protocol3.c:1169
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "제약조건 이름:  %s\n"
 
-#: fe-protocol3.c:1150
+#: fe-protocol3.c:1181
 msgid "LOCATION:  "
 msgstr "위치:  "
 
-#: fe-protocol3.c:1152
+#: fe-protocol3.c:1183
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1154
+#: fe-protocol3.c:1185
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1349
+#: fe-protocol3.c:1380
 #, c-format
 msgid "LINE %d: "
 msgstr "줄 %d: "
 
-#: fe-protocol3.c:1423
+#: fe-protocol3.c:1442
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"a higher-numbered version"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버에서 더 높은 번호의 버전으로 다운그"
+"레이드를 요청했음"
+
+#: fe-protocol3.c:1448
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"pre-3.0 protocol version"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버가 3.0 이전 프로토콜 버전으로 다운"
+"그레이드를 요청했습니다."
+
+#: fe-protocol3.c:1455
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"non-existent 3.1 protocol version"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버가 존재하지 않는 3.1 프로토콜 버전"
+"으로 다운그레이드를 요청했습니다."
+
+#: fe-protocol3.c:1461
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported negative "
+"number of unsupported parameters"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버에서 지원되지 않는 매개변수의 값이 "
+"음수라고 보고했음"
+
+#: fe-protocol3.c:1467
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server negotiated but asks "
+"for no changes"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버는 협상했지만 변경 사항을 요구하지 "
+"않음"
+
+#: fe-protocol3.c:1473
+#, c-format
+msgid ""
+"server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr ""
+"서버는 %d.%d 프로토콜 버전을 지원함, 하지만 \"%s\"에서는 %d.%d 버전을 지정했"
+"음"
+
+#: fe-protocol3.c:1498
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported unsupported "
+"parameter name without a \"%s\" prefix (\"%s\")"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버가 지원하지 않는 매개 변수 이름을 "
+"보고함: \"%s\" 접두사 빠짐 (\"%s\")"
+
+#: fe-protocol3.c:1501
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported an "
+"unsupported parameter that was not requested (\"%s\")"
+msgstr ""
+"잘못된 프로토콜 교섭 메시지를 받았음: 서버가 지원하지 않는 매개 변수 이름을 "
+"보고함: 요청되지 않은 매개 변수 (\"%s\")"
+
+#: fe-protocol3.c:1508
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "잘못된 프로토콜 교섭 메시지를 받았음: 메시지가 너무 짧음"
+
+#: fe-protocol3.c:1574
 #, c-format
 msgid ""
-"protocol version not supported by server: client uses %u.%u, server supports "
-"up to %u.%u"
+"received invalid BackendKeyData message: cancel key with length %d not "
+"allowed in protocol version 3.0 (must be 4 bytes)"
 msgstr ""
-"서버가 해당 프로토콜 버전을 지원하지 않음: 클라이언트=%u.%u, 서버=%u.%u"
+"잘못된 BackendKeyData 메시지 받았음: 길이가 %d인 중지 키는 3.0 버전 프로토콜"
+"에서 허용하지 않음 (4 바이트여야 함)"
 
-#: fe-protocol3.c:1429
+#: fe-protocol3.c:1581
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "서버가 해당 프로토콜 확장을 지원하지 않음: %s"
+msgid ""
+"received invalid BackendKeyData message: cancel key with length %d is too "
+"short (minimum 4 bytes)"
+msgstr ""
+"잘못된 BackendKeyData 메시지 받았음: 길이가 %d인 중지 키는 길이가 너무 짧음"
+"(최소 4 바이트여야 함)"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1588
 #, c-format
-msgid "invalid %s message"
-msgstr "잘못된 %s 메시지"
+msgid ""
+"received invalid BackendKeyData message: cancel key with length %d is too "
+"long (maximum 256 bytes)"
+msgstr ""
+"잘못된 BackendKeyData 메시지 받았음: 길이가 %d인 중지 키는 길이가 너무 긺(최"
+"대 256 바이트여야 함)"
 
-#: fe-protocol3.c:1802
+#: fe-protocol3.c:1952
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: text COPY OUT 작업을 할 수 없음"
 
-#: fe-protocol3.c:2176
+#: fe-protocol3.c:2327
 #, c-format
 msgid "protocol error: no function result"
 msgstr "프로토콜 오류: 함수 결과 없음"
 
-#: fe-protocol3.c:2187
+#: fe-protocol3.c:2339
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "프로토콜 오류: id=0x%x"
@@ -1271,123 +1769,129 @@ msgstr "GSSAPI 감싸기 오류"
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "GSSAPI 송출 메시지는 기밀성을 사용하지 말아야함"
 
-#: fe-secure-gssapi.c:215
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:723
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "클라이언트의 GSSAPI 패킷이 너무 큼 (%zu > %zu)"
 
-#: fe-secure-gssapi.c:351 fe-secure-gssapi.c:593
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:599
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "서버의 GSSAPI 패킷이 너무 큼 (%zu > %zu)"
 
-#: fe-secure-gssapi.c:390
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI 벗기기 오류"
 
-#: fe-secure-gssapi.c:399
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "GSSAPI 수신 메시지는 기밀성을 사용하지 말아야 함"
 
-#: fe-secure-gssapi.c:656
+#: fe-secure-gssapi.c:662
 msgid "could not initiate GSSAPI security context"
 msgstr "GSSAPI 보안 context 초기화 실패"
 
-#: fe-secure-gssapi.c:685
+#: fe-secure-gssapi.c:712
 msgid "GSSAPI size check error"
 msgstr "GSSAPI 크기 검사 오류"
 
-#: fe-secure-gssapi.c:696
-msgid "GSSAPI context establishment error"
-msgstr "GSSAPI context 설정 오류"
-
-#: fe-secure-openssl.c:219 fe-secure-openssl.c:319 fe-secure-openssl.c:1531
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL SYSCALL 오류: %s"
 
-#: fe-secure-openssl.c:225 fe-secure-openssl.c:325 fe-secure-openssl.c:1534
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "SSL SYSCALL 오류: EOF 감지됨"
 
-#: fe-secure-openssl.c:235 fe-secure-openssl.c:335 fe-secure-openssl.c:1542
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL 오류: %s"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:349
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL 연결이 예상치 못하게 끊김"
 
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:354 fe-secure-openssl.c:1589
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "알 수 없는 SSL 오류 코드: %d"
 
-#: fe-secure-openssl.c:397
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "서버 인증서 서명 알고리즘을 알 수 없음"
 
-#: fe-secure-openssl.c:417
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "%s NID용 다이제스트를 찾을 수 없음"
 
-#: fe-secure-openssl.c:426
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "피어 인증 해시 값을 만들 수 없음"
 
-#: fe-secure-openssl.c:509
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "SSL 인증서의 이름 항목이 잘못됨"
 
-#: fe-secure-openssl.c:543
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "SSL 인증서의 주소 항목이 빠졌음"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "경고: \"%s\" SSL 키 로그 파일을 열 수 없음: %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "경고: \"%s\" SSL 키 로그 파일을 쓸 수 없음: %m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "SSL context를 만들 수 없음: %s"
 
-#: fe-secure-openssl.c:1002
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "잘못된 값: \"%s\", 대상: 최소 SSL 프로토콜 버전"
 
-#: fe-secure-openssl.c:1012
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "최소 SSL 프로토콜 버전을 지정할 수 없음: %s"
 
-#: fe-secure-openssl.c:1028
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "잘못된 값: \"%s\", 대상: 최대 SSL 프로토콜 버전"
 
-#: fe-secure-openssl.c:1038
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "최대 SSL 프로토콜 버전을 지정할 수 없음: %s"
 
-#: fe-secure-openssl.c:1076
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "시스템 루트 인증서 경로 불러오기 실패: %s"
 
-#: fe-secure-openssl.c:1093
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "\"%s\" 루트 인증서 파일을 읽을 수 없음: %s"
 
-#: fe-secure-openssl.c:1145
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1400,7 +1904,7 @@ msgstr ""
 "트 인증서를 사용하거나, 서버 인증서 확인을 사용하지 않도록 sslmode를 변경하십"
 "시오."
 
-#: fe-secure-openssl.c:1148
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1413,62 +1917,77 @@ msgstr ""
 "트 인증서를 사용하거나, 서버 인증서 확인을 사용하지 않도록 sslmode를 변경하십"
 "시오."
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "\"%s\" 인증서 파일을 열수 없음: %s"
 
-#: fe-secure-openssl.c:1201
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "\"%s\" 인증서 파일을 읽을 수 없음: %s"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "SSL 연결을 확립할 수 없음: %s"
 
-#: fe-secure-openssl.c:1257
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "경고: sslkeylogfile 설정은 OpenSSL 에서만 지원합니다\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "경고: libpq가 sslkeylogfile 설정을 지원하지 않도록 빌드되었음\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "서버 이름 표시(SNI)를 설정할 수 없음: %s"
 
-#: fe-secure-openssl.c:1300
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "SSL ALPN 확장을 지정할 수 없음: %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "SSL 엔진 \"%s\"을(를) 로드할 수 없음: %s"
 
-#: fe-secure-openssl.c:1311
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "SSL 엔진 \"%s\"을(를) 초기화할 수 없음: %s"
 
-#: fe-secure-openssl.c:1326
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "개인 SSL 키 \"%s\"을(를) \"%s\" 엔진에서 읽을 수 없음: %s"
 
-#: fe-secure-openssl.c:1339
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "개인 SSL 키 \"%s\"을(를) \"%s\" 엔진에서 읽을 수 없음: %s"
 
-#: fe-secure-openssl.c:1376
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "인증서가 있지만, \"%s\" 개인키가 아닙니다."
 
-#: fe-secure-openssl.c:1379
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "\"%s\" 개인키 파일 상태를 알 수 없음: %m"
 
-#: fe-secure-openssl.c:1387
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "\"%s\" 개인키 파일은 일반 파일이 아님"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; file must have "
@@ -1479,54 +1998,66 @@ msgstr ""
 "유주가 현재 사용자라면, 접근권한을 u=rw (0600) 또는 더 작게 설정하고, root가 "
 "소유주라면 u=rw,g=r (0640) 권한으로 지정하세요."
 
-#: fe-secure-openssl.c:1444
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "\"%s\" 개인키 파일을 불러들일 수 없습니다: %s"
 
-#: fe-secure-openssl.c:1460
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "인증서가 \"%s\" 개인키 파일과 맞지 않습니다: %s"
 
-#: fe-secure-openssl.c:1528
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "SSL 오류: 인증서 유효성 검사 실패: %s"
 
-#: fe-secure-openssl.c:1573
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid ""
 "This may indicate that the server does not support any SSL protocol version "
 "between %s and %s."
 msgstr "해당 서버는 SSL 프로토콜 버전 %s - %s 사이를 지원하지 않습니다."
 
-#: fe-secure-openssl.c:1606
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid ""
+"direct SSL connection was established without ALPN protocol negotiation "
+"extension"
+msgstr "ALPN 프로토콜 협상 확장 없이 직접 SSL 연결이 수립되었습니다."
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "예상치 못한 ALPN 프로토콜로 SSL 연결이 수립되었습니다."
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "인증서를 구하질 못했습니다: %s"
 
-#: fe-secure-openssl.c:1711
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "SSL 오류 없음이 보고됨"
 
-#: fe-secure-openssl.c:1720
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL 오류 번호 %lu"
 
-#: fe-secure-openssl.c:1986
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "경고: sslpassword 삭제됨\n"
 
-#: fe-secure.c:263
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "서버로부터 데이터를 받지 못했음: %s"
 
-#: fe-secure.c:434
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "서버에 데이터를 보낼 수 없음: %s"
@@ -1535,3 +2066,25 @@ msgstr "서버에 데이터를 보낼 수 없음: %s"
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "알 수 없는 소켓오류: 0x%08X/%d"
+
+#~ msgid "GSSAPI context establishment error"
+#~ msgstr "GSSAPI context 설정 오류"
+
+#~ msgid "could not look up local user ID %d: %s"
+#~ msgstr "UID %d 해당하는 로컬 사용자를 찾을 수 없음: %s"
+
+#~ msgid "invalid %s message"
+#~ msgstr "잘못된 %s 메시지"
+
+#~ msgid "keepalives parameter must be an integer"
+#~ msgstr "keepalives 매개변수값은 정수여야 합니다."
+
+#~ msgid "protocol extension not supported by server: %s"
+#~ msgid_plural "protocol extensions not supported by server: %s"
+#~ msgstr[0] "서버가 해당 프로토콜 확장을 지원하지 않음: %s"
+
+#~ msgid ""
+#~ "protocol version not supported by server: client uses %u.%u, server "
+#~ "supports up to %u.%u"
+#~ msgstr ""
+#~ "서버가 해당 프로토콜 버전을 지원하지 않음: 클라이언트=%u.%u, 서버=%u.%u"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index d1032596eca..16cb5c66728 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -4,14 +4,14 @@
 # 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, 2018, 2019, 2020, 2021, 2022, 2023.
+# SPDX-FileCopyrightText: 2012-2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Lakhin <exclusion@gmail.com>
 # Maxim Yablokov <m.yablokov@postgrespro.ru>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: libpq (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-05-04 10:36+0300\n"
-"PO-Revision-Date: 2023-08-30 15:09+0300\n"
+"POT-Creation-Date: 2026-02-07 08:57+0200\n"
+"PO-Revision-Date: 2026-02-07 10:48+0200\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -21,185 +21,571 @@ msgstr ""
 "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"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "найти локального пользователя по идентификатору (%d) не удалось: %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "ошибка при удалении простого указателя libcurl: %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локальный пользователь с ID %d не существует"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "ошибка при очистке множественного указателя libcurl: %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "не удалось задать %s для подключения OAuth: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "не удалось получить %s из ответа OAuth: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "поле \"%s\" должно быть строковым"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "поле \"%s\" должно быть числовым"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "поле \"%s\" должно содержать массив строк"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "поле \"%s\" имеет неожиданный тип"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "слишком большая вложенность в JSON"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "поле \"%s\" дублируется"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "элементом верхнего уровня должен быть объект"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "тип содержимого не передан"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "неожиданный тип содержимого: \"%s\""
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "ответ содержит в себе NUL"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "ответ не является текстом в кодировке UTF-8"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "поле \"%s\" отсутствует"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "не удалось разобрать ответ с ошибкой токена"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "провайдер не принял oauth_client_secret"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid ""
+"provider requires client authentication, and no oauth_client_secret is set"
+msgstr ""
+"провайдер требует проверку подлинности клиента, но oauth_client_secret "
+"отсутствует"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "проверка состояния таймера: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "не удалось создать множественный указатель libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "не удалось создать указатель libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "нехватка памяти"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "ответ слишком большой"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "добавить HTTP-запрос в очередь не удалось: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "ошибка асинхронного HTTP-запроса: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "для завершённого указателя не был получен результат"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "неожиданный код ответа %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "не удалось разобрать документ обнаружения OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "идентификатор издателя (%s) не совпадает с oauth_issuer (%s)"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "издатель \"%s\" не передал конечную точку авторизации устройств"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "конечная точка авторизации устройств \"%s\" должна использовать HTTPS"
+
+# well-spelled: токенов
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "конечная точка токенов \"%s\" должна использовать HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "не удалось разобрать сообщение авторизации устройства"
+
+# well-spelled: токеном
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "не удалось разобрать ответ с токеном доступа"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "переполнение интервала замедления (slow_down)"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Посетите %s и введите код: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "ошибка при запросе устройства"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "в curl_global_init ранее возникла ошибка при настройке OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "в curl_global_init возникла ошибка при настройке OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"библиотека libcurl оказалась не потокобезопасной\n"
+"\tВо время компиляции libpq при инициализации библиотеки curl\n"
+"\tона была потокобезопасной, но текущая установленная версия\n"
+"\tlibcurl сообщает, что таковой не является. Перекомпилируйте\n"
+"\tlibpq с установленной версией libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "не удалось получить документ обнаружения OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "не удалось запустить авторизацию устройства OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "не удалось получить авторизацию устройства"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "не удалось получить токен доступа"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "внутренняя ошибка: отсутствует токен OAuth для текущего подключения"
+
+# well-spelled: токенов
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "в URI обнаружения OAuth \"%s\" должен использоваться HTTPS"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid ""
+"OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "URI обнаружения OAuth \"%s\" должен содержать запрос или фрагменты"
+
+# skip-rule: space-before-period
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "URI обнаружения OAuth \"%s\" не соответствует формату .well-known"
+
+# skip-rule: space-before-period
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr ""
+"в URI обнаружения OAuth \"%s\" используется неподдерживаемый суффикс .well-"
+"known"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "URI обнаружения OAuth \"%s\" имеет неправильный формат"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr ""
+"сообщение ошибки сервера игнорируется, так как оно содержит NULL внутри"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "ответ с ошибкой сервера не является текстом в кодировке UTF-8"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "не удалось разобрать ответ с ошибкой сервера: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid ""
+"server's discovery document at %s (issuer \"%s\") is incompatible with "
+"oauth_issuer (%s)"
+msgstr ""
+"документ обнаружения сервера по адресу %s (издатель \"%s\") несовместим с "
+"издателем oauth (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr ""
+"документ обнаружения сервера перемещён в %s (предыдущее расположение: %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "сервер передал ответ с ошибкой без текста статуса"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "сервер не принял токен предъявителя OAuth: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr ""
+"в пользовательском потоке OAuth не был получен ни токен, ни асинхронный "
+"обратный вызов"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "ошибка пользовательского потока OAuth"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "в пользовательском потоке OAuth не был получен токен"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "в пользовательском потоке OAuth не был получен сокет для опроса"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "не удалось получить исключительную блокировку (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "потоки OAuth недоступны (попробуйте установить пакет libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid ""
+"server requires OAuth authentication, but oauth_issuer and oauth_client_id "
+"are not both set"
+msgstr ""
+"сервер требует проверку подлинности OAuth, но значения oauth_issuer и "
+"oauth_client_id не определены"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "сервер передал неожиданные дополнительные данные OAuth"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid ""
+"server requires OAuth authentication, but no discovery metadata was provided"
+msgstr ""
+"сервер требует проверку подлинности OAuth, но метаданные обнаружения не "
+"предоставлены"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "внутренняя ошибка: в потоке OAuth не был установлен токен"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "сервер передал дополнительные данные OAuth после ошибки"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "ошибочное состояние обмена OAuth"
+
+# well-spelled: токеном
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "повторение подключения с новым токеном предъявителя"
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "неправильное сообщение SCRAM (пустое содержимое)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "неправильное сообщение SCRAM (некорректная длина)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "не удалось проверить сигнатуру сервера: %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "некорректная сигнатура сервера"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "ошибочное состояние обмена SCRAM"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "неправильное сообщение SCRAM (ожидался атрибут \"%c\")"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr ""
 "неправильное сообщение SCRAM (для атрибута \"%c\" ожидался символ \"=\")"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "не удалось сгенерировать разовый код"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1323
-#: fe-exec.c:3132 fe-exec.c:4100 fe-exec.c:4264 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:251
-#: fe-protocol3.c:268 fe-protocol3.c:348 fe-protocol3.c:715 fe-protocol3.c:954
-#: fe-protocol3.c:1765 fe-protocol3.c:2165 fe-secure-common.c:110
-#: fe-secure-gssapi.c:496 fe-secure-openssl.c:435 fe-secure-openssl.c:1271
-#, c-format
-msgid "out of memory"
-msgstr "нехватка памяти"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "не удалось оформить разовый код"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "не удалось вычислить подтверждение клиента: %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "не удалось закодировать подтверждение клиента"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "неверный ответ SCRAM (несовпадение разового кода)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "неправильное сообщение SCRAM (некорректная соль)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "неправильное сообщение SCRAM (некорректное число итераций)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr "неправильное сообщение SCRAM (мусор в конце первого сообщения сервера)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "в ходе обмена SCRAM от сервера получена ошибка: %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr ""
 "неправильное сообщение SCRAM (мусор в конце последнего сообщения сервера)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "неправильное сообщение SCRAM (неверная сигнатура сервера)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "не удалось сгенерировать случайную соль"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "недостаточно памяти для буфера GSSAPI (%d)"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "ошибка продолжения в GSSAPI"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "требуется указать имя сервера"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "повторный запрос аутентификации GSS"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "недостаточно памяти для буфера SSPI (%d)"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "ошибка продолжения в SSPI"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "повторный запрос аутентификации SSPI"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "не удалось получить удостоверение SSPI"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "требуется привязка каналов, но SSL не используется"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "повторный запрос аутентификации SASL"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "требуется привязка каналов, но клиент её не поддерживает"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid ""
 "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
@@ -207,12 +593,21 @@ msgstr ""
 "сервер предложил аутентификацию SCRAM-SHA-256-PLUS для соединения, не "
 "защищённого SSL"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "ни один из серверных механизмов аутентификации SASL не поддерживается"
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid ""
+"authentication method requirement \"%s\" failed: server requested %s "
+"authentication"
+msgstr ""
+"требование метода аутентификации \"%s\" не выполнено: сервер запросил "
+"аутентификацию %s"
+
+#: fe-auth.c:580
 #, c-format
 msgid ""
 "channel binding is required, but server did not offer an authentication "
@@ -221,12 +616,12 @@ msgstr ""
 "требуется привязка каналов, но сервер не предложил поддерживающий её метод "
 "аутентификации"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "недостаточно памяти для буфера SASL (%d)"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid ""
 "AuthenticationSASLFinal received from server, but SASL authentication was "
@@ -235,60 +630,60 @@ msgstr ""
 "c сервера получено сообщение AuthenticationSASLFinal, но аутентификация SASL "
 "ещё не завершена"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "после успешного обмена по протоколу SASL не получен ответ клиента"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "не удалось зашифровать пароль: %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
 msgstr "сервер запросил незашифрованный пароль"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
 msgstr "сервер запросил хешированный пароль"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "сервер запросил аутентификацию GSSAPI"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "сервер запросил аутентификацию SSPI"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "сервер запросил аутентификацию SASL"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "сервер запросил аутентификацию неизвестного типа"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "сервер не запросил сертификат SSL"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "сервер принял подключение, не проверив сертификат SSL"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "сервер не завершил аутентификацию"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "требование метода аутентификации \"%s\" не выполнено: %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid ""
 "channel binding required, but server authenticated client without channel "
@@ -296,7 +691,7 @@ msgid ""
 msgstr ""
 "требуется привязка каналов, но сервер аутентифицировал клиента без привязки"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid ""
 "channel binding required but not supported by server's authentication request"
@@ -304,67 +699,102 @@ msgstr ""
 "требуется привязка каналов, но она не поддерживается при том запросе "
 "аутентификации, который передал сервер"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "аутентификация Kerberos 4 не поддерживается"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "аутентификация Kerberos 5 не поддерживается"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "аутентификация через GSSAPI не поддерживается"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "аутентификация через SSPI не поддерживается"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
 msgstr "аутентификация Crypt не поддерживается"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "метод аутентификации %u не поддерживается"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "распознать имя пользователя не удалось (код ошибки: %lu)"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "найти локального пользователя по идентификатору (%ld) не удалось: %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "локальный пользователь с ID %ld не существует"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "неожиданная форма набора результатов, возвращённого для SHOW"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "слишком длинное значение password_encryption"
+msgid "\"password_encryption\" value too long"
+msgstr "слишком длинное значение \"password_encryption\""
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "нераспознанный алгоритм шифрования пароля \"%s\""
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "нулевой указатель соединения"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "соединение не открыто"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "ключ отмены не получен"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "через это соединение уже передаётся запрос отмены"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "неожиданный ответ сервера"
+
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "не удалось сопоставить имена узлов (%d) со значениями hostaddr (%d)"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "не удалось сопоставить номера портов (%d) с узлами (%d)"
 
-#: fe-connect.c:1337
+#: fe-connect.c:1517
 #, c-format
 msgid ""
 "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
@@ -372,30 +802,44 @@ msgstr ""
 "отрицательный метод require_auth \"%s\" не может совмещаться с "
 "неотрицательными методами"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr ""
 "метод require_auth \"%s\" не может совмещаться с отрицательными методами"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "неверное значение %s: \"%s\""
 
-#: fe-connect.c:1443
+#: fe-connect.c:1648
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "внутренняя ошибка: в allowed_sasl_mechs нет места"
+
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "метод require_auth \"%s\" указан неоднократно"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "значение %s \"%s\" недопустимо для сборки без поддержки SSL"
 
-#: fe-connect.c:1546
+#: fe-connect.c:1849
+#, c-format
+msgid ""
+"weak sslmode \"%s\" may not be used with sslnegotiation=direct (use "
+"\"require\", \"verify-ca\", or \"verify-full\")"
+msgstr ""
+"слабый режим sslmode \"%s\" не может использоваться с sslnegotiation=direct "
+"(используйте режим \"require\", \"verify-ca\" или \"verify-full\")"
+
+#: fe-connect.c:1871
 #, c-format
 msgid ""
 "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-"
@@ -404,42 +848,72 @@ msgstr ""
 "слабый режим sslmode \"%s\" не может использоваться с sslrootcert=system "
 "(используйте режим \"verify-full\")"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1884 fe-connect.c:1892
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "неверное значение \"%s\": \"%s\""
+
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "неверный диапазон версий протокола SSL"
 
-#: fe-connect.c:1621
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "значение %s \"%s\" не поддерживается (проверьте версию OpenSSL)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "значение gssencmode \"%s\" недопустимо для сборки без поддержки GSSAPI"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2030
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "неправильный клиентский ключ SCRAM"
+
+#: fe-connect.c:2035
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "некорректная длина клиентского ключа SCRAM: %d"
+
+#: fe-connect.c:2053
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "неправильный серверный ключ SCRAM"
+
+#: fe-connect.c:2058
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "некорректная длина серверного ключа SCRAM: %d"
+
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\" больше чем \"%s\""
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "не удалось перевести сокет в режим TCP-передачи без задержки: %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "подключиться к серверу через сокет \"%s\" не удалось: "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "подключиться к серверу \"%s\" (%s), порту %s не удалось: "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "подключиться к серверу \"%s\", порту %s не удалось: "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2470
 #, c-format
 msgid ""
 "\tIs the server running locally and accepting connections on that socket?"
@@ -447,310 +921,345 @@ msgstr ""
 "\tСервер действительно работает локально и принимает подключения через этот "
 "сокет?"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr ""
 "\tСервер действительно работает по данному адресу и принимает TCP-соединения?"
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "неверное целочисленное значение \"%s\" для параметра соединения \"%s\""
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "ошибка в %s(%s): %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "ошибка в %s(%s): код ошибки %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "неверное состояние соединения - возможно разрушение памяти"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "неверный номер порта: \"%s\""
 
-#: fe-connect.c:2690
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "преобразовать имя \"%s\" в адрес не удалось: %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "не удалось разобрать сетевой адрес \"%s\": %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "длина пути Unix-сокета \"%s\" превышает предел (%d байт)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "преобразовать путь Unix-сокета \"%s\" в адрес не удалось: %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3263 fe-connect.c:4710
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr ""
+"затребовано шифрование GSSAPI, но оно не поддерживается для локального сокета"
+
+#: fe-connect.c:3271 fe-connect.c:4839
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "шифрование GSSAPI затребовано в отсутствие кеша учётных данных"
+
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "не удалось создать сокет: %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "не удалось перевести сокет в неблокирующий режим: %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr ""
 "не удалось перевести сокет в режим закрытия при выполнении (close-on-exec): "
 "%s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "параметр keepalives должен быть целым числом"
-
-#: fe-connect.c:3100
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "не удалось получить статус ошибки сокета: %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "не удалось получить адрес клиента из сокета: %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "параметр requirepeer не поддерживается в этой ОС"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "не удалось получить учётные данные сервера: %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr ""
 "requirepeer допускает подключение только к \"%s\", но сервер работает под "
 "именем \"%s\""
 
-#: fe-connect.c:3221
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "не удалось отправить пакет согласования GSSAPI: %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid ""
-"GSSAPI encryption required but was impossible (possibly no credential cache, "
-"no server support, or using a local socket)"
-msgstr ""
-"затребовано шифрование GSSAPI, но это требование невыполнимо (возможно, "
-"отсутствует кеш учётных данных, нет поддержки на сервере или используется "
-"локальный сокет)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "не удалось отправить пакет согласования SSL: %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3709
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "не удалось отправить пакет отмены: %s"
+
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "не удалось отправить стартовый пакет: %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "затребовано подключение через SSL, но сервер не поддерживает SSL"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3822
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "сервер передал ошибочный ответ во время обмена сообщениями SSL"
+
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "получен неверный ответ при согласовании SSL: %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "после ответа SSL получены незашифрованные данные"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3910
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "сервер передал ошибочный ответ во время шифрования GSS"
+
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "затребовано шифрование GSSAPI, но сервер его не поддерживает"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "получен неверный ответ при согласовании GSSAPI: %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr ""
 "после ответа на запрос шифрования GSSAPI получены незашифрованные данные"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "ожидался запрос аутентификации от сервера, но получено: %c"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "получен некорректный запрос аутентификации"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "получено некорректное сообщение согласования протокола"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "получено некорректное сообщение об ошибке"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "получено повторное сообщение согласования протокола"
+
+#: fe-connect.c:4254
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "внутренняя ошибка: нет обработчика для асинхронной аутентификации"
+
+#: fe-connect.c:4279
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr ""
+"внутренняя ошибка: при асинхронной очистке не был освобождён опрашивающий "
+"сокет"
+
+#: fe-connect.c:4302
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr ""
+"внутренняя ошибка: при асинхронной аутентификации не был настроен сокет для "
+"опроса"
+
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "неожиданное сообщение от сервера в начале работы"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "сеанс не допускает запись"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "сеанс допускает запись"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "сервер работает в режиме горячего резерва"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "сервер работает не в режиме горячего резерва"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "выполнить \"%s\" не удалось"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "неверное состояние соединения %d - возможно разрушение памяти"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "некорректный адрес LDAP \"%s\": схема должна быть ldap://"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "некорректный адрес LDAP \"%s\": отсутствует уникальное имя"
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "некорректный адрес LDAP \"%s\": должен быть только один атрибут"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr ""
 "некорректный адрес LDAP \"%s\": не указана область поиска (base/one/sub)"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "некорректный адрес LDAP \"%s\": нет фильтра"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "некорректный адрес LDAP \"%s\": неверный номер порта"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "не удалось создать структуру LDAP"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "ошибка поиска на сервере LDAP: %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "при поиске LDAP найдено более одного вхождения"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "при поиске LDAP ничего не найдено"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "атрибут не содержит значений при поиске LDAP"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr ""
+"размер строки с информацией о подключении превышает максимально допустимый "
+"(%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "в строке соединения нет \"=\" после \"%s\""
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "неверный параметр соединения \"%s\""
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "в строке соединения не хватает закрывающей кавычки"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "определение службы \"%s\" не найдено"
 
-#: fe-connect.c:5666
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "файл определений служб \"%s\" не найден"
 
-#: fe-connect.c:5679
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "слишком длинная строка (%d) в файле определений служб \"%s\""
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "синтаксическая ошибка в файле определения служб \"%s\" (строка %d)"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6110
 #, c-format
 msgid ""
 "nested service specifications not supported in service file \"%s\", line %d"
@@ -758,24 +1267,24 @@ msgstr ""
 "рекурсивные определения служб не поддерживаются (файл определения служб "
 "\"%s\", строка %d)"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "во внутреннюю процедуру разбора строки передан ошибочный URI: \"%s\""
 
-#: fe-connect.c:6577
+#: fe-connect.c:6926
 #, c-format
 msgid ""
 "end of string reached when looking for matching \"]\" in IPv6 host address "
 "in URI: \"%s\""
 msgstr "URI не содержит символ \"]\" после адреса IPv6: \"%s\""
 
-#: fe-connect.c:6584
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "IPv6, содержащийся в URI, не может быть пустым: \"%s\""
 
-#: fe-connect.c:6599
+#: fe-connect.c:6948
 #, c-format
 msgid ""
 "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): "
@@ -784,46 +1293,53 @@ msgstr ""
 "неожиданный символ \"%c\" в позиции %d в URI (ожидалось \":\" или \"/\"): "
 "\"%s\""
 
-#: fe-connect.c:6728
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "лишний разделитель ключа/значения \"=\" в параметрах URI: \"%s\""
 
-#: fe-connect.c:6748
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "в параметрах URI не хватает разделителя ключа/значения \"=\": \"%s\""
 
-#: fe-connect.c:6800
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "неверный параметр в URI: \"%s\""
 
-#: fe-connect.c:6874
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "неверный символ, закодированный с %%: \"%s\""
 
-#: fe-connect.c:6884
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "недопустимое значение %%00 для символа, закодированного с %%: \"%s\""
 
-#: fe-connect.c:7248
+#: fe-connect.c:7265
+#, c-format
+msgid ""
+"unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr ""
+"в \"%s\" обнаружены недопустимые пробелы, замените их закодированными (%%20)"
+
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "нулевой указатель соединения\n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:972 fe-exec.c:3321
-#: fe-protocol3.c:969 fe-protocol3.c:1002
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "нехватка памяти\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: файл паролей \"%s\" - не обычный файл\n"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7961
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -832,167 +1348,193 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: к файлу паролей \"%s\" имеют доступ все или группа; права "
 "должны быть u=rw (0600) или более ограниченные\n"
 
-#: fe-connect.c:7663
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "пароль получен из файла \"%s\""
 
-#: fe-exec.c:466 fe-exec.c:3395
+#: fe-connect.c:8231
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "неверное целочисленное значение \"%s\" для параметра соединения \"%s\""
+
+#: fe-exec.c:469 fe-exec.c:3549
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "номер записи %d вне диапазона 0..%d"
 
-#: fe-exec.c:528 fe-protocol3.c:1971
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "ошибка при передаче данных серверу"
 
-#: fe-exec.c:871
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "текст ошибки отсутствует"
 
-#: fe-exec.c:960
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "ЗАМЕЧАНИЕ"
 
-#: fe-exec.c:1018
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult не может вместить больше чем INT_MAX кортежей"
 
-#: fe-exec.c:1030
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "переполнение size_t"
 
-#: fe-exec.c:1446 fe-exec.c:1515 fe-exec.c:1561
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "указатель на командную строку нулевой"
 
-#: fe-exec.c:1452 fe-exec.c:2883
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%s не допускается в конвейерном режиме"
 
-#: fe-exec.c:1520 fe-exec.c:1566 fe-exec.c:1660
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "число параметров должно быть от 0 до %d"
 
-#: fe-exec.c:1556 fe-exec.c:1655
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "указатель на имя оператора нулевой"
 
-#: fe-exec.c:1697 fe-exec.c:3241
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "нет соединения с сервером"
 
-#: fe-exec.c:1705 fe-exec.c:3249
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "уже выполняется другая команда"
 
-#: fe-exec.c:1735
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "во время COPY нельзя добавлять команды в очередь"
 
-#: fe-exec.c:1852
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "для двоичного параметра должна быть указана длина"
 
-#: fe-exec.c:2166
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "неожиданный asyncStatus: %d"
 
-#: fe-exec.c:2322
+#: fe-exec.c:2377
 #, c-format
 msgid ""
 "synchronous command execution functions are not allowed in pipeline mode"
 msgstr ""
 "функции синхронного выполнения команд не допускаются в конвейерном режиме"
 
-#: fe-exec.c:2339
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "операция COPY прервана вызовом PQexec"
 
-#: fe-exec.c:2355
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "вызов PQexec не допускается в процессе COPY BOTH"
 
-#: fe-exec.c:2581 fe-exec.c:2636 fe-exec.c:2704 fe-protocol3.c:1902
+#: fe-exec.c:2646
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "нераспознанный тип сообщения \"%c\""
+
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "операция COPY не выполняется"
 
-#: fe-exec.c:2890
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "соединение в неправильном состоянии"
 
-#: fe-exec.c:2933
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "перейти в конвейерный режиме нельзя, соединение не простаивает"
 
-#: fe-exec.c:2969 fe-exec.c:2990
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "выйти из конвейерного режима нельзя, не собрав все результаты"
 
-#: fe-exec.c:2973
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "выйти из конвейерного режима в занятом состоянии нельзя"
 
-#: fe-exec.c:2984
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "выйти из конвейерного режима во время COPY нельзя"
 
-#: fe-exec.c:3175
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "отправить конвейер, не перейдя в конвейерный режим, нельзя"
 
-#: fe-exec.c:3284
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "неверный код ExecStatusType"
 
-#: fe-exec.c:3311
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "В PGresult не передан результат ошибки\n"
 
-#: fe-exec.c:3379 fe-exec.c:3402
+#: fe-exec.c:3533 fe-exec.c:3556
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "номер столбца %d вне диапазона 0..%d"
 
-#: fe-exec.c:3417
+#: fe-exec.c:3571
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "номер параметра %d вне диапазона 0..%d"
 
-#: fe-exec.c:3728
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "не удалось интерпретировать ответ сервера: %s"
 
-#: fe-exec.c:3993 fe-exec.c:4083
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "неполный многобайтный символ"
 
+#: fe-exec.c:4159 fe-exec.c:4311
+#, c-format
+msgid "invalid multibyte character"
+msgstr "неверный многобайтный символ"
+
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "размер строки с экранированием превышает максимально допустимый (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr ""
+"размер значения bytea с экранированием превышает максимально допустимый (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "ошибка импорта имени в GSSAPI"
@@ -1039,23 +1581,18 @@ msgstr "не удалось записать файл \"%s\": %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "запрос инициализации функций для больших объектов не вернул данные"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "функция pqGetInt не поддерживает integer размером %lu байт"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "функция pqPutInt не поддерживает integer размером %lu байт"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "соединение не открыто"
-
-#: fe-misc.c:751 fe-secure-openssl.c:210 fe-secure-openssl.c:316
-#: fe-secure.c:259 fe-secure.c:426
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -1066,31 +1603,31 @@ msgstr ""
 "\tСкорее всего сервер прекратил работу из-за сбоя\n"
 "\tдо или в процессе выполнения запроса."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "соединение не открыто\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "тайм-аут"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "неверный сокет"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "ошибка в %s(): %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "от сервера во время простоя получено сообщение типа 0x%02x"
 
-#: fe-protocol3.c:380
+#: fe-protocol3.c:403
 #, c-format
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
@@ -1099,149 +1636,232 @@ msgstr ""
 "сервер отправил данные (сообщение \"D\") без предварительного описания "
 "строки (сообщение \"T\")"
 
-#: fe-protocol3.c:422
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "неожиданный ответ сервера; первый полученный символ: \"%c\""
 
-#: fe-protocol3.c:445
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "содержимое не соответствует длине в сообщении типа \"%c\""
 
-#: fe-protocol3.c:463
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr ""
 "потеряна синхронизация с сервером: получено сообщение типа \"%c\", длина %d"
 
-#: fe-protocol3.c:515 fe-protocol3.c:555
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "недостаточно данных в сообщении \"T\""
 
-#: fe-protocol3.c:626 fe-protocol3.c:832
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "недостаточно памяти для результата запроса"
 
-#: fe-protocol3.c:695
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "недостаточно данных в сообщении \"t\""
 
-#: fe-protocol3.c:754 fe-protocol3.c:786 fe-protocol3.c:804
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "недостаточно данных в сообщении \"D\""
 
-#: fe-protocol3.c:760
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "неверное число полей в сообщении \"D\""
 
-#: fe-protocol3.c:1015
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "нет сообщения об ошибке\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1063 fe-protocol3.c:1082
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " символ %s"
 
-#: fe-protocol3.c:1095
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "ПОДРОБНОСТИ:  %s\n"
 
-#: fe-protocol3.c:1098
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "ПОДСКАЗКА:  %s\n"
 
-#: fe-protocol3.c:1101
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "ЗАПРОС:  %s\n"
 
-#: fe-protocol3.c:1108
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "КОНТЕКСТ:  %s\n"
 
-#: fe-protocol3.c:1117
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "СХЕМА:  %s\n"
 
-#: fe-protocol3.c:1121
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "ТАБЛИЦА:  %s\n"
 
-#: fe-protocol3.c:1125
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "СТОЛБЕЦ:  %s\n"
 
-#: fe-protocol3.c:1129
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "ТИП ДАННЫХ:  %s\n"
 
-#: fe-protocol3.c:1133
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "ОГРАНИЧЕНИЕ:  %s\n"
 
-#: fe-protocol3.c:1145
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "ПОЛОЖЕНИЕ:  "
 
-#: fe-protocol3.c:1147
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1149
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1344
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "СТРОКА %d: "
 
-#: fe-protocol3.c:1418
+#: fe-protocol3.c:1456
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"a higher-numbered version"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер запросил "
+"понижение версии на версию выше"
+
+#: fe-protocol3.c:1462
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"pre-3.0 protocol version"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер запросил "
+"понижение на версию протокола, предшествующую 3.0"
+
+#: fe-protocol3.c:1469
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server requested downgrade to "
+"non-existent 3.1 protocol version"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер запросил "
+"понижение на несуществующую версию протокола 3.1"
+
+#: fe-protocol3.c:1475
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported negative "
+"number of unsupported parameters"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер передал "
+"отрицательное число неподдерживаемых параметров"
+
+#: fe-protocol3.c:1481
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server negotiated but asks "
+"for no changes"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер согласовал "
+"версию и не требует никаких изменений"
+
+#: fe-protocol3.c:1487
+#, c-format
+msgid ""
+"server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr ""
+"сервер поддерживает только версию протокола %d.%d, но параметр \"%s\" равен "
+"%d.%d"
+
+#: fe-protocol3.c:1512
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported unsupported "
+"parameter name without a \"%s\" prefix (\"%s\")"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер выдал "
+"неподдерживаемое имя параметра без префикса \"%s\" (\"%s\")"
+
+#: fe-protocol3.c:1515
+#, c-format
+msgid ""
+"received invalid protocol negotiation message: server reported an "
+"unsupported parameter that was not requested (\"%s\")"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сервер выдал "
+"неподдерживаемый параметр, который не был запрошен (\"%s\")"
+
+#: fe-protocol3.c:1522
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr ""
+"получено некорректное сообщение согласования протокола: сообщение слишком "
+"короткое"
+
+#: fe-protocol3.c:1588
 #, c-format
 msgid ""
-"protocol version not supported by server: client uses %u.%u, server supports "
-"up to %u.%u"
+"received invalid BackendKeyData message: cancel key with length %d not "
+"allowed in protocol version 3.0 (must be 4 bytes)"
 msgstr ""
-"сервер не поддерживает нужную версию протокола: клиент использует %u.%u, "
-"сервер поддерживает версии до %u.%u"
+"получено некорректное сообщение согласования протокола: ключ отмены длиной "
+"%d в протоколе версии 3.0 не допускается (длина должна быть 4 байта)"
 
-#: fe-protocol3.c:1424
+#: fe-protocol3.c:1595
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "сервер не поддерживает это расширение протокола: %s"
-msgstr[1] "сервер не поддерживает эти расширения протокола: %s"
-msgstr[2] "сервер не поддерживает эти расширения протокола: %s"
+msgid ""
+"received invalid BackendKeyData message: cancel key with length %d is too "
+"short (minimum 4 bytes)"
+msgstr ""
+"получено некорректное сообщение согласования протокола: ключ отмены длиной "
+"%d слишком короткий (минимальная длина 4 байта)"
 
-#: fe-protocol3.c:1432
+#: fe-protocol3.c:1602
 #, c-format
-msgid "invalid %s message"
-msgstr "неверное сообщение %s"
+msgid ""
+"received invalid BackendKeyData message: cancel key with length %d is too "
+"long (maximum 256 bytes)"
+msgstr ""
+"получено некорректное сообщение согласования протокола: ключ отмены длиной "
+"%d слишком длинный (максимальная длина 256 байт)"
 
-#: fe-protocol3.c:1797
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline можно вызывать только во время COPY OUT с текстом"
 
-#: fe-protocol3.c:2171
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "ошибка протокола: нет результата функции"
 
-#: fe-protocol3.c:2182
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "ошибка протокола: id=0x%x"
@@ -1294,132 +1914,142 @@ msgstr "серверный сертификат для \"%s\" не соотве
 msgid "could not get server's host name from server certificate"
 msgstr "не удалось получить имя сервера из серверного сертификата"
 
-#: fe-secure-gssapi.c:194
+#: fe-secure-gssapi.c:201
 msgid "GSSAPI wrap error"
 msgstr "ошибка обёртывания сообщения в GSSAPI"
 
-#: fe-secure-gssapi.c:201
+#: fe-secure-gssapi.c:208
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "исходящее сообщение GSSAPI не будет защищено"
 
-#: fe-secure-gssapi.c:208
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "клиент попытался передать чрезмерно большой пакет GSSAPI (%zu > %zu)"
 
-#: fe-secure-gssapi.c:347 fe-secure-gssapi.c:589
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "сервер передал чрезмерно большой пакет GSSAPI (%zu > %zu)"
 
-#: fe-secure-gssapi.c:386
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "ошибка развёртывания сообщения в GSSAPI"
 
-#: fe-secure-gssapi.c:395
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "входящее сообщение GSSAPI не защищено"
 
-#: fe-secure-gssapi.c:652
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "не удалось инициализировать контекст безопасности GSSAPI"
 
-#: fe-secure-gssapi.c:681
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "ошибка проверки размера в GSSAPI"
 
-#: fe-secure-gssapi.c:692
-msgid "GSSAPI context establishment error"
-msgstr "ошибка установления контекста в GSSAPI"
-
-#: fe-secure-openssl.c:214 fe-secure-openssl.c:320 fe-secure-openssl.c:1518
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "ошибка SSL SYSCALL: %s"
 
-#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1521
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "ошибка SSL SYSCALL: конец файла (EOF)"
 
-#: fe-secure-openssl.c:230 fe-secure-openssl.c:336 fe-secure-openssl.c:1529
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "ошибка SSL: %s"
 
-#: fe-secure-openssl.c:244 fe-secure-openssl.c:350
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL-соединение было неожиданно закрыто"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:355 fe-secure-openssl.c:1576
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "нераспознанный код ошибки SSL: %d"
 
-#: fe-secure-openssl.c:398
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "не удалось определить алгоритм подписи сертификата сервера"
 
-#: fe-secure-openssl.c:418
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "не удалось найти алгоритм хеширования по NID %s"
 
-#: fe-secure-openssl.c:427
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "не удалось сгенерировать хеш сертификата сервера"
 
-#: fe-secure-openssl.c:510
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "в SSL-сертификате отсутствует запись имени"
 
-#: fe-secure-openssl.c:544
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "в SSL-сертификате отсутствует запись адреса"
 
-#: fe-secure-openssl.c:945
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: не удалось открыть файл для диагностики ключа SSL \"%s\": "
+"%m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: не удалось записать в файл для диагностики ключа SSL \"%s\": "
+"%m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "не удалось создать контекст SSL: %s"
 
-#: fe-secure-openssl.c:987
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "неверное значение \"%s\" для минимальной версии протокола SSL"
 
-#: fe-secure-openssl.c:997
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "не удалось задать минимальную версию протокола SSL: %s"
 
-#: fe-secure-openssl.c:1013
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "неверное значение \"%s\" для максимальной версии протокола SSL"
 
-#: fe-secure-openssl.c:1023
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "не удалось задать максимальную версию протокола SSL: %s"
 
-#: fe-secure-openssl.c:1061
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "не удалось выбрать системные пути для корневых сертификатов: %s"
 
-#: fe-secure-openssl.c:1078
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "не удалось прочитать файл корневых сертификатов \"%s\": %s"
 
-#: fe-secure-openssl.c:1130
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1432,7 +2062,7 @@ msgstr ""
 "(sslrootcert=system) или отключите проверку сертификата сервера, изменив "
 "sslmode."
 
-#: fe-secure-openssl.c:1133
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1445,62 +2075,78 @@ msgstr ""
 "(sslrootcert=system) или отключите проверку сертификата сервера, изменив "
 "sslmode."
 
-#: fe-secure-openssl.c:1168
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "не удалось открыть файл сертификата \"%s\": %s"
 
-#: fe-secure-openssl.c:1186
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "не удалось прочитать файл сертификата \"%s\": %s"
 
-#: fe-secure-openssl.c:1210
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "не удалось установить SSL-соединение: %s"
 
-#: fe-secure-openssl.c:1242
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: для поддержки sslkeylogfile требуется OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: сборка libpq была произведена без поддержки sslkeylogfile\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "не удалось задать SNI (Server Name Indication) для SSL-подключения: %s"
 
-#: fe-secure-openssl.c:1286
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "не удалось установить расширение SSL ALPN: %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "не удалось загрузить модуль SSL ENGINE \"%s\": %s"
 
-#: fe-secure-openssl.c:1297
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "не удалось инициализировать модуль SSL ENGINE \"%s\": %s"
 
-#: fe-secure-openssl.c:1312
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "не удалось прочитать закрытый ключ SSL \"%s\" из модуля \"%s\": %s"
 
-#: fe-secure-openssl.c:1325
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "не удалось загрузить закрытый ключ SSL \"%s\" из модуля \"%s\": %s"
 
-#: fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "при наличии сертификата отсутствует файл закрытого ключа \"%s\""
 
-#: fe-secure-openssl.c:1365
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "не удалось получить информацию о файле закрытого ключа \"%s\": %m"
 
-#: fe-secure-openssl.c:1373
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "файл закрытого ключа \"%s\" - не обычный файл"
 
-#: fe-secure-openssl.c:1406
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; file must have "
@@ -1512,22 +2158,22 @@ msgstr ""
 "текущему пользователю, либо u=rw,g=r (0640) или более строгие, если он "
 "принадлежит root"
 
-#: fe-secure-openssl.c:1430
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "не удалось загрузить файл закрытого ключа \"%s\": %s"
 
-#: fe-secure-openssl.c:1446
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "сертификат не соответствует файлу закрытого ключа \"%s\": %s"
 
-#: fe-secure-openssl.c:1515
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "ошибка SSL: не удалось проверить сертификат: %s"
 
-#: fe-secure-openssl.c:1560
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid ""
 "This may indicate that the server does not support any SSL protocol version "
@@ -1536,32 +2182,44 @@ msgstr ""
 "Это может указывать на то, что сервер не поддерживает ни одну версию "
 "протокола SSL между %s и %s."
 
-#: fe-secure-openssl.c:1593
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid ""
+"direct SSL connection was established without ALPN protocol negotiation "
+"extension"
+msgstr "прямое SSL-соединение было установлено без расширения ALPN"
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "SSL-соединение было установлено с неподдерживаемым протоколом ALPN"
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "не удалось получить сертификат: %s"
 
-#: fe-secure-openssl.c:1699
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "нет сообщения об ошибке SSL"
 
-#: fe-secure-openssl.c:1724
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "код ошибки SSL: %lu"
 
-#: fe-secure-openssl.c:2014
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: значение sslpassword усечено\n"
 
-#: fe-secure.c:270
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "не удалось получить данные с сервера: %s"
 
-#: fe-secure.c:441
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "не удалось передать данные серверу: %s"
@@ -1571,6 +2229,124 @@ msgstr "не удалось передать данные серверу: %s"
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "нераспознанная ошибка сокета: 0x%08X/%d"
 
+#, c-format
+#~ msgid "internal error: started field '%s' before field '%s' was finished"
+#~ msgstr ""
+#~ "внутренняя ошибка: поле '%s' началось прежде чем закончилось поле '%s'"
+
+#, c-format
+#~ msgid "internal error: field '%s' still active at end of object"
+#~ msgstr "внутренняя ошибка: поле '%s' активно, но объект завершён"
+
+#, c-format
+#~ msgid "internal error: found unexpected array end while parsing field '%s'"
+#~ msgstr ""
+#~ "внутренняя ошибка: при разборе поля '%s' неожиданно обнаружен конец "
+#~ "массива"
+
+#, c-format
+#~ msgid "internal error: scalar target found at nesting level %d"
+#~ msgstr ""
+#~ "внутрення ошибка: скалярное значение обнаружено на уровне вложенности %d"
+
+#, c-format
+#~ msgid "internal error: scalar field '%s' would be assigned twice"
+#~ msgstr "внутренняя ошибка: попытка двойного присвоения скалярному полю '%s'"
+
+#, c-format
+#~ msgid "internal error: array member found at nesting level %d"
+#~ msgstr "внутренняя ошибка: элемент массива найден на уровне вложенности %d"
+
+#, c-format
+#~ msgid "failed to create timerfd: %m"
+#~ msgstr "не удалось создать timerfd: %m"
+
+#, c-format
+#~ msgid "failed to add timerfd to epoll set: %m"
+#~ msgstr "не удалось добавить timerfd в набор epoll: %m"
+
+#, c-format
+#~ msgid "failed to create timer kqueue: %m"
+#~ msgstr "не удалось создать kqueue для таймера: %m"
+
+#, c-format
+#~ msgid "unknown libcurl socket operation: %d"
+#~ msgstr "неизвестная операция для сокета libcurl: %d"
+
+#, c-format
+#~ msgid "could not add to epoll set: %m"
+#~ msgstr "ошибка при добавлении в набор epoll: %m"
+
+#, c-format
+#~ msgid "could not delete from epoll set: %m"
+#~ msgstr "ошибка при удалении из набора epoll: %m"
+
+#, c-format
+#~ msgid "could not update epoll set: %m"
+#~ msgstr "ошибка при изменении набора epoll: %m"
+
+#, c-format
+#~ msgid "could not modify kqueue: %m"
+#~ msgstr "не удалось модифицировать kqueue: %m"
+
+#, c-format
+#~ msgid "could not delete from kqueue: %m"
+#~ msgstr "ошибка при удалении из kqueue: %m"
+
+#, c-format
+#~ msgid "could not add to kqueue: %m"
+#~ msgstr "ошибка при добавлении в kqueue: %m"
+
+#, c-format
+#~ msgid "could not comb kqueue: %m"
+#~ msgstr "не удалось упорядочить kqueue: %m"
+
+#, c-format
+#~ msgid "setting timerfd to %ld: %m"
+#~ msgstr "установка для timerfd значения %ld: %m"
+
+#, c-format
+#~ msgid "deleting kqueue timer: %m"
+#~ msgstr "удаление таймера kqueue: %m"
+
+#, c-format
+#~ msgid "removing kqueue timer from multiplexer: %m"
+#~ msgstr "удаление таймера kqueue из мультиплексора: %m"
+
+#, c-format
+#~ msgid "setting kqueue timer to %ld: %m"
+#~ msgstr "установка для таймера kqueue значения %ld: %m"
+
+#, c-format
+#~ msgid "adding kqueue timer to multiplexer: %m"
+#~ msgstr "добавление таймера kqueue в мультиплексор: %m"
+
+#, c-format
+#~ msgid ""
+#~ "protocol version not supported by server: client uses %u.%u, server "
+#~ "supports up to %u.%u"
+#~ msgstr ""
+#~ "сервер не поддерживает нужную версию протокола: клиент использует %u.%u, "
+#~ "сервер поддерживает версии до %u.%u"
+
+#, c-format
+#~ msgid "protocol extension not supported by server: %s"
+#~ msgid_plural "protocol extensions not supported by server: %s"
+#~ msgstr[0] "сервер не поддерживает это расширение протокола: %s"
+#~ msgstr[1] "сервер не поддерживает эти расширения протокола: %s"
+#~ msgstr[2] "сервер не поддерживает эти расширения протокола: %s"
+
+#, c-format
+#~ msgid "invalid %s message"
+#~ msgstr "неверное сообщение %s"
+
+#~ msgid "GSSAPI context establishment error"
+#~ msgstr "ошибка установления контекста в GSSAPI"
+
+#, c-format
+#~ msgid "keepalives parameter must be an integer"
+#~ msgstr "параметр keepalives должен быть целым числом"
+
 #~ msgid "SCM_CRED authentication method not supported\n"
 #~ msgstr "аутентификация SCM_CRED не поддерживается\n"
 
@@ -1719,9 +2495,6 @@ msgstr "нераспознанная ошибка сокета: 0x%08X/%d"
 #~ msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 #~ msgstr "ошибка в setsockopt(SO_KEEPALIVE): %s\n"
 
-#~ msgid "could not acquire mutex: %s\n"
-#~ msgstr "не удалось заблокировать семафор: %s\n"
-
 #~ msgid "socket not open\n"
 #~ msgstr "сокет не открыт\n"
 
diff --git a/src/interfaces/libpq/po/sv.po b/src/interfaces/libpq/po/sv.po
index 263b5ebf746..4f3ed1133c2 100644
--- a/src/interfaces/libpq/po/sv.po
+++ b/src/interfaces/libpq/po/sv.po
@@ -1,15 +1,16 @@
 # Swedish message translation file for libpq
 # Peter Eisentraut <peter_e@gmx.net>, 2001, 2010.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017, 2018, 2019, 2020, 2021, 2022, 2023.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006, 2017,
+#   2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026.
 #
 # Use these quotes: "%s"
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 16\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-08-01 14:10+0000\n"
-"PO-Revision-Date: 2023-08-01 22:08+0200\n"
+"POT-Creation-Date: 2026-02-03 14:40+0000\n"
+"PO-Revision-Date: 2026-02-04 07:30+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -18,921 +19,1423 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "kunde inte slå upp lokalt användar-id %d: %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "borttagning av libcurl easy handle misslyckades: %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "lokal användare med ID %d existerar inte"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "uppstädning av libcurl multi handle misslyckades: %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "misslyckades att sätta %s på OAuth-anslutning: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "misslyckades att hämta %s från OAuth-svar: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "fältet \"%s\" måste vara en sträng"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "fältet \"%s\" måste vara ett nummer"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "fältet \"%s\" måste vara en array med strängar"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "fältet \"%s\" har en oväntad typ"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON är nästlad för djupt"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "fältet \"%s\" är duplicerat."
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "elementet på toppnivå måste vara ett objekt"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "ingen innehållstyp angiven"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "oväntad innehållstyp \"%s\""
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "svaret innehåller inbäddade NULL-värden"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "svaret är inte korrekt UTF-8"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "fältet \"%s\" saknas"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "misslyckades att tolka token-felsvar"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "leverantör avvisade oauth_client_secret"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "leverantör kräver klientautentisering men ingen oauth_client_secret är satt"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "kontrollerar om timer löpt ut: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "misslyckades med skapa multi-handle för libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "misslyckades med att skapa handle för libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "svaret är för stort"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "misslyckades att köa HTTP-anrop: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "asynkront HTTP-anrop misslyckades: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "inget resultat kom från avslutad handle"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "oväntad svarskod %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "kunde inte tolka upptäcktsdokument för OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "utfärdarens identifierare (%s) matchar inte oauth_issuer (%s)"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "utfärdaren \"%s\" tillhandahåller inte en auktoriseringsändpunkt för en enhet"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "en enhets auktoriseringsändpunkt \"%s\" måste använda HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "token-ändpunkt \"%s\" måste använda HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "misslyckades att tolka enhetsauktorisering"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "misslyckades att tolka access-token-svar"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "overflow i intervall för slow_down"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Gå till %s och skriv in koden: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "misslyckades att skapa inmatningsfråga för enhet"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init misslyckades tidigare vid uppsättning av OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init misslyckades vid uppsättning av OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid ""
+"libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr ""
+"libcurl är inte längre trådsäker\n"
+"\tCurl initialisering rapporterades trådsäker när curl\n"
+"\tkompilerades men den nu installerade version av libcurl\n"
+"\trapporterar att den inte är det. Kompilera om libpq\n"
+"\tmot den installerade versionen av libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "kunde inte hämta upptäcktsdokument för OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "kan inte köra enhetsauktorisering för OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "misslyckades att hämta enhetsauktorisering"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "misslyckades att hämta access-token"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "internt fel: ingen OAuth-token har satts för anslutningen"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "URI för att hitta OAuth \"%s\" måste använda HTTPS"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "OAuth upptäckts-URI \"%s\" får inte innehålla fråge- eller fragment-komponenter"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "OAuth upptäckts-URI \"%s\" är inte en .well-known-URI"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "OAuth upptäckts-URI \"%s\" använder ett suffix för .well-known som inte stöds"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "OAuth upptäckts-URI \"%s\" använder ett ogiltigt format"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "serverns felmeddelande innehåller NULL och slängdes"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "serverns felsvar är inte korrekt UTF-8"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "misslyckades att tolka serverns felsvar: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "serverns upptäcktsdokument hos %s (utfärdare \"%s\") är inte kompatibel med oauth_issuer (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "serverns upptäcktsdokument har flyttat till %s (tidigare plats var %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "servern skickade ett felmeddelande utan status"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "servern avvisade OAuth bärartoken: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "användardefinierat OAuth-flöde gav varken en token eller en async callback"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "användardefinierat OAuth-flöde misslyckades"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "användardefinierat OAuth-flöde gav ingen token"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "användardefinierat OAuth-flöde angav ingen socket för pollning"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "misslyckades att låsa mutex (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "inga OAUth-flöden är tillgängliga (testa att installera paketet libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "servern kräver OAuth autentisering men oauth_issuer och oauth_client_id är inte båda satta"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "servern skickade oväntat ytterligare OAuth-data"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "servern kräver OAuth-autentisering men ingen upptäcktsmetadata tillhandahölls"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "internt fel: OAuth-flöde satte ingen token"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "servern skickade ytterligare OAuth-data efter fel"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "ogiltig OAuth-utbytesstatus"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "försöker ansluta igen med ny bärartoken"
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "felaktigt SCRAM-meddelande (tomt meddelande)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "felaktigt SCRAM-meddelande (längden stämmer inte)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "kunde inte verifiera serversignaturen: %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "felaktig serversignatur"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "ogiltig SCRAM-utbytesstatus"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "felaktigt SCRAM-meddelande (förväntade attribut \"%c\")"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr "felaktigt SCRAM-meddelande (förväntade tecken \"=\" för attribut \"%c\")"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "kunde inte skapa engångsnummer"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1321
-#: fe-exec.c:3111 fe-exec.c:4071 fe-exec.c:4235 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:256
-#: fe-protocol3.c:273 fe-protocol3.c:353 fe-protocol3.c:720 fe-protocol3.c:959
-#: fe-protocol3.c:1770 fe-protocol3.c:2170 fe-secure-common.c:110
-#: fe-secure-gssapi.c:500 fe-secure-openssl.c:434 fe-secure-openssl.c:1285
-#, c-format
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "kunde inte koda engångsnummer"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "kunde inte räkna ut klientbevis: %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "kunde inte koda klientbevis"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "ogiltigt SCRAM-svar (engångsnummer matchar inte)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "felaktigt SCRAM-meddelande (ogiltigt salt)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "felaktigt SCRAM-meddelande (ogiltig iterationsräknare)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr "felaktigt SCRAM-meddelande (skräp i slutet på server-first-message)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "fel mottaget från server i SCRAM-utbyte: %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr "felaktigt SCRAM-meddelande (skräp i slutet av server-final-message)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "felaktigt SCRAM-meddelande (ogiltigt serversignatur)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "kunde inte generera slumpat salt"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "slut på minne vid allokering av buffer till GSSAPI (%d)"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI fortsättningsfel"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "värdnamn måste anges"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "duplicerad autentiseringsbegäran från GSS"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "slut på minne vid allokering av buffer till SSPI (%d)"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "SSPI fortsättningsfel"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "duplicerad autentiseringsbegäran från SSPI"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "kunde inte hämta SSPI-autentiseringsuppgifter"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "kräver kanalbindning, men SSL används inte"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "duplicerad autentiseringsbegäran från SASL"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "kanalbindning krävs men klienten stöder inte det"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
 msgstr "servern erbjöd SCRAM-SHA-256-PLUS-autentisering över en icke-SSL-anslutning"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "ingen av serverns SASL-autentiseringsmekanismer stöds"
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid "authentication method requirement \"%s\" failed: server requested %s authentication"
+msgstr "autentiseringsmetodens krav \"%s\" misslyckades: servern efterfrågade %s-autentisering"
+
+#: fe-auth.c:580
 #, c-format
 msgid "channel binding is required, but server did not offer an authentication method that supports channel binding"
 msgstr "kräver kanalbindning, men servern erbjöd ingen autentiseringsmetod som stöder kanalbindning"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "slut på minne vid allokering av buffer till SASL (%d)"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid "AuthenticationSASLFinal received from server, but SASL authentication was not completed"
 msgstr "mottog AuthenticationSASLFinal från server, men SASL-autentisering slutfördes ej"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "hittade inget klientsvar efter lyckat SASL-utbyte"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "kan inte kryptera lösenord: %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
 msgstr "servern begärde ett lösenord i klartext"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
 msgstr "servern begärde ett hashat lösenord"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "servern begärde GSSAPI-autentisering"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "servern begärde SSPI-autentisering"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "servern begärde SASL-autentisering"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "servern begärde en okänd autentiseringstyp"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "servern begärde inte ett SSL-certifikat"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "serven accepterade en anslutning utan giltigt SSL-certifikat"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "servern slutförde inte autenticeringen"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "autentiseringsmetodens krav \"%s\" misslyckades: %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid "channel binding required, but server authenticated client without channel binding"
 msgstr "kräver kanalbindning, men servern autentiserade klienten utan kanalbindning"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid "channel binding required but not supported by server's authentication request"
 msgstr "kanalbindning krävs men stöds inte av serverns autentiseringsförfrågan"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "Kerberos-4-autentisering stöds ej"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "Kerberos-5-autentisering stöds ej"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "GSSAPI-autentisering stöds ej"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "SSPI-autentisering stöds ej"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
 msgstr "Crypt-autentisering stöds ej"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "autentiseringsmetod %u stöds ej"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "misslyckad sökning efter användarnamn: felkod %lu"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "kunde inte slå upp lokalt användar-id %ld: %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "lokal användare med ID %ld existerar inte"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "oväntad form på resultatmängden som returnerades för SHOW"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "password_encryption-värdet är för långt"
+msgid "\"password_encryption\" value too long"
+msgstr "\"password_encryption\"-värdet är för långt"
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "okänd lösenordskrypteringsalgoritm \"%s\""
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "anslutningspekare är NULL"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "anslutningen är inte öppen"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "fick ingen nyckel för avbrytning"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "förfrågan för att avbryta har redan skickats på denna anslutning"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "oväntad resultat från servern"
+
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "kunde inte matcha %d värdnamn till %d värdadresser"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "kunde inte matcha %d portnummer med %d värdar"
 
-#: fe-connect.c:1337
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "negativ require_auth-metod \"%s\" kan inte blandas med icke-negativa metoder"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "require_auth-metod \"%s\" kan inte blandas med negativa metoder"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "ogiltigt %s-värde: \"%s\""
 
-#: fe-connect.c:1443
+#: fe-connect.c:1648
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "internt fel: mellanslag tillåts inte i allowed_sasl_mechs"
+
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "require_auth-metod \"%s\" angiven mer än en gång"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "%s värde \"%s\", är ogiltigt när SSL-stöd inte kompilerats in"
 
-#: fe-connect.c:1546
+#: fe-connect.c:1849
+#, c-format
+msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
+msgstr "svagt ssl-läge \"%s\" kan inte användas med sslnegotiation=direct (använd \"require\", \"verify-ca\" eller \"verify-full\")"
+
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "svagt ssl-läge \"%s\" kan inte användas med sslrootcert=system (använd \"verify-full\")"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1884 fe-connect.c:1892
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "ogiltigt \"%s\"-värde: \"%s\""
+
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "ogiltigt intervall för SSL-protokollversion"
 
-#: fe-connect.c:1621
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s-värde \"%s\" stöds inte (kontrollera OpenSSL-versionen)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "värde för gssenc-läge, \"%s\", är ogiltigt när GSSAPI-stöd inte kompilerats in"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2030
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "ogiltig SCRAM-klientnyckel"
+
+#: fe-connect.c:2035
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "ogiltig längd på SCRAM-klientnyckel: %d"
+
+#: fe-connect.c:2053
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "ogiltig SCRAM-servernyckel"
+
+#: fe-connect.c:2058
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "ogiltig längd på SCRAM-servernyckel: %d"
+
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\" är större än \"%s\""
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "kunde inte sätta socket till läget TCP-ingen-fördröjning: %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "anslutning till server på socket \"%s\" misslyckades: "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "anslutning til server på \"%s\" (%s), port %s misslyckades: "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "anslutning till server på \"%s\", port %s misslyckades: "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tKör servern lokalt och accepterar den anslutningar till denna socket?"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tKör servern på den värden och accepterar den TCP/IP-anslutningar?"
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "ogiltigt heltalsvärde \"%s\" för anslutningsflagga \"%s\""
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) misslyckades: %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) misslyckades: felkod %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "ogiltigt tillstånd i anslutning, antagligen korrupt minne"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "ogiltigt portnummer \"%s\""
 
-#: fe-connect.c:2690
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "kunde inte översätta värdnamn \"%s\" till adress: %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "kunde inte parsa nätverksadress \"%s\": %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Sökväg till unix-socket \"%s\" är för lång (maximalt %d byte)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "kunde inte översätta sökväg till Unix-socket \"%s\" till adress: %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3263 fe-connect.c:4710
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr "GSSAPI-kryptering krävdes men stöds inte över en lokal socket"
+
+#: fe-connect.c:3271 fe-connect.c:4839
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "GSSAPI-kryptering krävdes men det finns ingen credential-cache"
+
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "kan inte skapa socket: %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "kunde inte sätta socket till ickeblockerande läge: %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "kunde inte ställa in socket i \"close-on-exec\"-läge: %s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "keepalives-parameter måste vara ett heltal"
-
-#: fe-connect.c:3100
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "kunde inte hämta felstatus för socket: %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "kunde inte få klientadressen från socket: %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "requirepeer-parameter stöds inte på denna plattform"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "kunde inte hämta andra sidans autentiseringsuppgifter: %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeer anger \"%s\", men andra sidans användarnamn är \"%s\""
 
-#: fe-connect.c:3221
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "kunde inte skicka GSSAPI-paket för anslutningsförhandling: %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid "GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)"
-msgstr "GSSAPI-kryptering krävdes men var omöjligt (kanske ingen credential-cache, inget serverstöd eller använder en lokalt socket)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "kunde inte skicka SSL-paket för anslutningsförhandling: %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3709
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "kunde inte skicka avbrottspaket: %s"
+
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "kan inte skicka startpaketet: %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "SSL stöds inte av servern, men SSL krävdes"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3822
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "servern skickade ett felmeddelande vid SSL-utbyte"
+
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "tog emot ogiltigt svar till SSL-anslutningsförhandling: %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "tog emot okrypterad data efter SSL-svar"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3910
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "servern skickade ett felmeddelande vid GSS-krypteringsutbyte"
+
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "GSSAPI-kryptering stöds inte av servern, men det krävdes"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "tog emot ogiltigt svar till GSSAPI-anslutningsförhandling: %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "tog emot okrypterad data efter GSSAPI-krypteringssvar"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "förväntade autentiseringsförfrågan från servern, men fick %c"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "tog emot ogiltig autentiseringsförfrågan"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "tog emot ogiltigt meddelande för protokollets anslutningsförhandling"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "tog emot ogiltigt felmeddelande"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "tog emot dubble meddelande för protokollets anslutningsförhandling"
+
+#: fe-connect.c:4254
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "internt fel: async-authentiserng har ingen hanterare"
+
+#: fe-connect.c:4279
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr "internt fel: uppstädning av async lämnade inte tillbaka socket för pollning"
+
+#: fe-connect.c:4302
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr "internt fel: async autentisering har inte angivit en socket för pollning"
+
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "oväntat meddelande från servern under uppstarten"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "sessionen är i readonly-läge"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "sessionen är inte i readonly-läge"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "servern är i \"hot standby\"-läge"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "servern är inte i \"hot standby\"-läge"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "\"%s\" misslyckades"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "ogiltigt tillstånd %d i anslutning, antagligen korrupt minne"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "ogiltig LDAP URL \"%s\": schemat måste vara ldap://"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "ogiltig LDAP URL \"%s\": saknar \"distinguished name\""
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "ogiltig LDAP URL \"%s\": måste finnas exakt ett attribut"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "ogiltig LDAP URL \"%s\": måste ha sök-scope (base/one/sub)"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "ogiltigt LDAP URL \"%s\": inget filter"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "ogiltig LDAP URL \"%s\": ogiltigt portnummer"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "kunde inte skapa LDAP-struktur"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "uppslagning av LDAP-server misslyckades: %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "mer än en post hittad i LDAP-uppslagning"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "ingen post hittad i LDAP-uppslagning"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "attributet har inga värden i LDAP-uppslagning"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "anslutningssträng överskrider det maximalt tillåtna (%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "\"=\" efter \"%s\" saknas i anslutningssträng"
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "ogiltig anslutningsparameter \"%s\""
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
-msgstr "icke terminerad sträng i uppkopplingsinformationen"
+msgstr "icke terminerad sträng i anslutningsinformationen"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "definition av service \"%s\" hittades inte"
 
-#: fe-connect.c:5666
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "servicefil \"%s\" hittades inte"
 
-#: fe-connect.c:5679
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "rad %d för lång i servicefil \"%s\""
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "syntaxfel i servicefel \"%s\", rad %d"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "nästlade servicespecifikationer stöds inte i servicefil \"%s\", rad %d"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "ogiltig URI propagerad till intern parsningsrutin: \"%s\""
 
-#: fe-connect.c:6577
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "nådde slutet på strängen när vi letade efter matchande \"]\" i IPv6-värdadress i URI: \"%s\""
 
-#: fe-connect.c:6584
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "IPv6-värdadress får ej vara tom i URI: \"%s\""
 
-#: fe-connect.c:6599
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "oväntat tecken \"%c\" vid position %d i URI (förväntade \":\" eller \"/\"): \"%s\""
 
-#: fe-connect.c:6728
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "extra nyckel/värde-separator \"=\" i URI-frågeparameter: \"%s\""
 
-#: fe-connect.c:6748
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "saknar nyckel/värde-separator \"=\" i URI-frågeparameter: \"%s\""
 
-#: fe-connect.c:6800
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "ogiltig URI-frågeparameter: \"%s\""
 
-#: fe-connect.c:6874
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "ogiltigt procent-kodad symbol: \"%s\""
 
-#: fe-connect.c:6884
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "förbjudet värde %%00 i procentkodat värde: \"%s\""
 
-#: fe-connect.c:7248
+#: fe-connect.c:7265
+#, c-format
+msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr "oväntade mellanslag hittade i \"%s\", använd procent-kodade mellanslag (%%20) istället"
+
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "anslutningspekare är NULL\n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:970 fe-exec.c:3292
-#: fe-protocol3.c:974 fe-protocol3.c:1007
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "slut på minne\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "FEL: lösenordsfil \"%s\" är inte en vanlig fil\n"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7961
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "VARNING: lösenordsfilen \"%s\" har läsrättigheter för gruppen eller världen; rättigheten skall vara u=rw (0600) eller mindre\n"
 
-#: fe-connect.c:7663
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "lösenord hämtat från fil \"%s\""
 
-#: fe-exec.c:466 fe-exec.c:3366
+#: fe-connect.c:8231
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "ogiltigt heltalsvärde \"%s\" för anslutningsflagga \"%s\""
+
+#: fe-exec.c:469 fe-exec.c:3549
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "radnummer %d är utanför giltigt intervall 0..%d"
 
-#: fe-exec.c:528 fe-protocol3.c:1976
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "skrivning till servern misslyckades"
 
-#: fe-exec.c:869
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "inget feltext finns tillgänglig"
 
-#: fe-exec.c:958
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "NOTIS"
 
-#: fe-exec.c:1016
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult stöder inte mer än INT_MAX tupler"
 
-#: fe-exec.c:1028
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "size_t-överspill"
 
-#: fe-exec.c:1444 fe-exec.c:1513 fe-exec.c:1559
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "kommandosträngen är en null-pekare"
 
-#: fe-exec.c:1450 fe-exec.c:2888
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%s tillåts inte i pipeline-läge"
 
-#: fe-exec.c:1518 fe-exec.c:1564 fe-exec.c:1658
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "antal parametrar måste vara mellan 0 och %d"
 
-#: fe-exec.c:1554 fe-exec.c:1653
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "satsens namn  är en null-pekare"
 
-#: fe-exec.c:1695 fe-exec.c:3220
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "inte ansluten till servern"
 
-#: fe-exec.c:1703 fe-exec.c:3228
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "ett annat kommando körs redan"
 
-#: fe-exec.c:1733
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "kan inte köa kommandon när COPY körs"
 
-#: fe-exec.c:1850
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "längden måste anges för en binär parameter"
 
-#: fe-exec.c:2171
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "oväntad asyncStatus: %d"
 
-#: fe-exec.c:2327
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "synkrona kommandoexekveringsfunktioner tillåts inte i pipeline-läge"
 
-#: fe-exec.c:2344
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminerad av ny PQexec"
 
-#: fe-exec.c:2360
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "PQexec tillåts inte under COPY BOTH"
 
-#: fe-exec.c:2586 fe-exec.c:2641 fe-exec.c:2709 fe-protocol3.c:1907
+#: fe-exec.c:2646
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "okänd meddelandetyp \"%c\""
+
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "ingen COPY körs"
 
-#: fe-exec.c:2895
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "anslutning i felaktigt tillstånd"
 
-#: fe-exec.c:2938
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "kan inte byta till pipeline-läge, anslutningen är inte inaktiv"
 
-#: fe-exec.c:2974 fe-exec.c:2995
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "kan inte anvsluta pipeline-läge när alla svar inte tagits emot"
 
-#: fe-exec.c:2978
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "är upptagen och kan inte avsluta pipeline-läge"
 
-#: fe-exec.c:2989
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "kan inte avsluta pipeline-läge inne i en COPY"
 
-#: fe-exec.c:3154
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "kan inte skicka en pipeline när vi inte är i pipeline-läge"
 
-#: fe-exec.c:3255
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "ogiltig ExecStatusType-kod"
 
-#: fe-exec.c:3282
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult är inte ett felresultat\n"
 
-#: fe-exec.c:3350 fe-exec.c:3373
+#: fe-exec.c:3533 fe-exec.c:3556
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "kolumnnummer %d är utanför giltigt intervall 0..%d"
 
-#: fe-exec.c:3388
+#: fe-exec.c:3571
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "parameter nummer %d är utanför giltigt intervall 0..%d"
 
-#: fe-exec.c:3699
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "kunde inte tolka svaret från servern: %s"
 
-#: fe-exec.c:3964 fe-exec.c:4054
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "ofullständigt multibyte-tecken"
 
+#: fe-exec.c:4159 fe-exec.c:4311
+#, c-format
+msgid "invalid multibyte character"
+msgstr "ogiltigt multibyte-tecken"
+
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "escape:ad strängstorlek överskrider maximalt tillåtna (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "escape:ad bytea-storlek överskrider maximalt tillåtna (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "GSSAPI-fel vid import av namn"
@@ -979,199 +1482,237 @@ msgstr "kan inte skriva till fil \"%s\": %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "fråga för att initiera stort objekt-funktion returnerade ingen data"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "heltal med storlek %lu stöds inte av pqGetInt"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "heltal med storlek %lu stöds inte av pqPutInt"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "anslutningen är inte öppen"
-
-#: fe-misc.c:751 fe-secure-openssl.c:215 fe-secure-openssl.c:315
-#: fe-secure.c:257 fe-secure.c:419
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
 "\tbefore or while processing the request."
 msgstr ""
-"servern stängde oväntat ner uppkopplingen\n"
+"servern stängde oväntat ner anslutningen\n"
 "\tTroligen så terminerade servern pga något fel antingen\n"
 "\tinnan eller under tiden den bearbetade en förfrågan."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "anslutningen är inte öppen\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "timeout utgången"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "ogiltig socket"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() misslyckades: %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "meddelandetyp 0x%02x kom från server under viloperiod"
 
-#: fe-protocol3.c:385
+#: fe-protocol3.c:403
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "servern skickade data (meddelande \"D\") utan att först skicka en radbeskrivning (meddelande \"T\")"
 
-#: fe-protocol3.c:427
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "oväntat svar för servern; första mottagna tecknet var \"%c\""
 
-#: fe-protocol3.c:450
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "meddelandeinnehåll stämmer inte med längden för meddelandetyp \"%c\""
 
-#: fe-protocol3.c:468
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "tappade synkronisering med servern: fick meddelandetyp \"%c\", längd %d"
 
-#: fe-protocol3.c:520 fe-protocol3.c:560
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "otillräckligt med data i \"T\"-meddelande"
 
-#: fe-protocol3.c:631 fe-protocol3.c:837
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "slut på minnet för frågeresultat"
 
-#: fe-protocol3.c:700
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "otillräckligt med data i \"t\"-meddelande"
 
-#: fe-protocol3.c:759 fe-protocol3.c:791 fe-protocol3.c:809
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "otillräckligt med data i \"D\"-meddelande"
 
-#: fe-protocol3.c:765
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "oväntat fältantal i \"D\"-meddelande"
 
-#: fe-protocol3.c:1020
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "inget felmeddelande finns tillgängligt\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1068 fe-protocol3.c:1087
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " vid tecken %s"
 
-#: fe-protocol3.c:1100
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALJ:  %s\n"
 
-#: fe-protocol3.c:1103
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "TIPS:  %s\n"
 
-#: fe-protocol3.c:1106
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "FRÅGA:  %s\n"
 
-#: fe-protocol3.c:1113
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "KONTEXT:  %s\n"
 
-#: fe-protocol3.c:1122
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "SCHEMANAMN:  %s\n"
 
-#: fe-protocol3.c:1126
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "TABELLNAMN:  %s\n"
 
-#: fe-protocol3.c:1130
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "KOLUMNNAMN:  %s\n"
 
-#: fe-protocol3.c:1134
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "DATATYPNAMN:  %s\n"
 
-#: fe-protocol3.c:1138
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "VILLKORSNAMN:  %s\n"
 
-#: fe-protocol3.c:1150
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "PLATS:  "
 
-#: fe-protocol3.c:1152
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1154
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1349
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "RAD %d: "
 
-#: fe-protocol3.c:1423
+#: fe-protocol3.c:1456
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern efterfrågade nedgradering till en version med högre versionsnummer"
+
+#: fe-protocol3.c:1462
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern efterfrågade nedgradering till en tidigare version än 3.0"
+
+#: fe-protocol3.c:1469
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern efterfrågade nedgradering till en ickeexisterande 3.1-protokollversion"
+
+#: fe-protocol3.c:1475
+#, c-format
+msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern angav negativt nummer för ej stödd parameter"
+
+#: fe-protocol3.c:1481
+#, c-format
+msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern efterfrågade förhandling men ville inte ändra något"
+
+#: fe-protocol3.c:1487
+#, c-format
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "servern stöder bara protokollversion %d.%d, men \"%s\" är satt till %d.%d"
+
+#: fe-protocol3.c:1512
+#, c-format
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern angav parameter som inte stöds med ett namn utan ett \"%s\"-prefix (\"%s\")"
+
+#: fe-protocol3.c:1515
+#, c-format
+msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: servern angav parameter som inte stöds och som inte efterfrågades (\"%s\")"
+
+#: fe-protocol3.c:1522
 #, c-format
-msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
-msgstr "protokollversionen stöds inte av servern: klienten använder %u.%u, servern stöder upp till %u.%u"
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "tog emot ogiltig anslutningsförhandling för protokoll: meddelandet är för kort"
 
-#: fe-protocol3.c:1429
+#: fe-protocol3.c:1588
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "protokollutökning stöds inte av servern: %s"
-msgstr[1] "protokollutökningar stöds inte av servern: %s"
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "tog emot felaktigt BackendKeyData-meddelande: cancel-nyckel med längd %d tillåts inte i protokollversion 3.0 (måsta vara 4 byte)"
 
-#: fe-protocol3.c:1437
+#: fe-protocol3.c:1595
 #, c-format
-msgid "invalid %s message"
-msgstr "ogiltig %s-meddelande"
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "tog emot felaktigt BackendKeyData-meddelande: cancel-nyckel med längd %d är för kort (minst 4 byte)"
 
-#: fe-protocol3.c:1802
+#: fe-protocol3.c:1602
+#, c-format
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "tog emot felaktigt BackendKeyData-meddelande: cancel-nyckel med längd %d är för lång (maximalt 256 byte)"
+
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: utför inte text-COPY OUT"
 
-#: fe-protocol3.c:2176
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "protokollfel: inget funktionsresultat"
 
-#: fe-protocol3.c:2187
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "protokollfel: id=0x%x"
@@ -1222,123 +1763,129 @@ msgstr "GSSAPI-fel vid inpackning"
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "utående GSSAPI-meddelande skulle inte använda sekretess"
 
-#: fe-secure-gssapi.c:215
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "klienten försökte skicka för stort GSSAPI-paket (%zu > %zu)"
 
-#: fe-secure-gssapi.c:351 fe-secure-gssapi.c:593
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "för stort GSSAPI-paket skickat av servern (%zu > %zu)"
 
-#: fe-secure-gssapi.c:390
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "GSSAPI-fel vid uppackning"
 
-#: fe-secure-gssapi.c:399
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "inkommande GSSAPI-meddelande använde inte sekretess"
 
-#: fe-secure-gssapi.c:656
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "kunde inte initiera GSSAPI-säkerhetskontext"
 
-#: fe-secure-gssapi.c:685
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "GSSAPI-fel vid kontroll av storlek"
 
-#: fe-secure-gssapi.c:696
-msgid "GSSAPI context establishment error"
-msgstr "GSSAPI-fel vid skapande av kontext"
-
-#: fe-secure-openssl.c:219 fe-secure-openssl.c:319 fe-secure-openssl.c:1531
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL SYSCALL fel: %s"
 
-#: fe-secure-openssl.c:225 fe-secure-openssl.c:325 fe-secure-openssl.c:1534
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "SSL SYSCALL-fel: EOF upptäckt"
 
-#: fe-secure-openssl.c:235 fe-secure-openssl.c:335 fe-secure-openssl.c:1542
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-fel: %s"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:349
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL-anslutning har oväntat stängts"
 
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:354 fe-secure-openssl.c:1589
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "okänd SSL-felkod: %d"
 
-#: fe-secure-openssl.c:397
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "kunde inte bestämma serverns algoritm för certifikatsignering"
 
-#: fe-secure-openssl.c:417
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "kunde inte hitta kontrollsumma för NID %s"
 
-#: fe-secure-openssl.c:426
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "kunde inte generera peer-certifikathash"
 
-#: fe-secure-openssl.c:509
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "SSL-certifikatets namnpost saknas"
 
-#: fe-secure-openssl.c:543
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "SSL-certifikatets adresspost saknas"
 
-#: fe-secure-openssl.c:960
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "VARNING: kunde inte öppna nyckelloggfil \"%s\" för SSL: %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "VARNING: kunde inte skriva till nyckelloggfil \"%s\" för SSL: %m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "kunde inte skapa SSL-kontext: %s"
 
-#: fe-secure-openssl.c:1002
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "ogiltigt värde \"%s\" för minimal SSL-protokollversion"
 
-#: fe-secure-openssl.c:1012
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "kunde inte sätta minimal SSL-protokollversion: %s"
 
-#: fe-secure-openssl.c:1028
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "ogiltigt värde \"%s\" för maximal SSL-protokollversion"
 
-#: fe-secure-openssl.c:1038
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "kunde inte sätta maximal SSL-protokollversion: %s"
 
-#: fe-secure-openssl.c:1076
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "kunde inte ladda systemets root-certifikatsökvägar: %s"
 
-#: fe-secure-openssl.c:1093
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "kunde inte läsa root-certifikatfilen \"%s\": %s"
 
-#: fe-secure-openssl.c:1145
+#: fe-secure-openssl.c:961
 #, c-format
 msgid ""
 "could not get home directory to locate root certificate file\n"
@@ -1347,7 +1894,7 @@ msgstr ""
 "kunde inte hämta hemkatalogen för att lokalisera root-certifikatfilen\n"
 "Antingen tillhandahåll filen, använd systemets betrodda root med sslrootcert=system eller ändra sslmode för att stänga av serverns certifikatverifiering."
 
-#: fe-secure-openssl.c:1148
+#: fe-secure-openssl.c:964
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -1356,112 +1903,137 @@ msgstr ""
 "root-certifikatfilen \"%s\" finns inte\n"
 "Antingen tillhandahåll filen, använd systemets betrodda root med sslrootcert=system eller ändra sslmode för att stänga av serverns certifikatverifiering."
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "kunde inte öppna certifikatfil \"%s\": %s"
 
-#: fe-secure-openssl.c:1201
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "kunde inte läsa certifikatfil \"%s\": %s"
 
-#: fe-secure-openssl.c:1225
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "kan inte skapa SSL-anslutning: %s"
 
-#: fe-secure-openssl.c:1257
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "VARNING: stöd för sslkeylogfile kräver OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "VARNING: libpq har inte byggts med stöd för sslkeylogfile\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "kunde inte sätta SSL servernamnsindikering (SNI): %s"
 
-#: fe-secure-openssl.c:1300
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "kunde inte sätta utökning för SSL ALPN: %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "kunde inte ladda SSL-motor \"%s\": %s"
 
-#: fe-secure-openssl.c:1311
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "kunde inte initiera SSL-motor \"%s\": %s"
 
-#: fe-secure-openssl.c:1326
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "kunde inte läsa privat SSL-nyckel \"%s\" från motor \"%s\": %s"
 
-#: fe-secure-openssl.c:1339
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "kunde inte ladda privat SSL-nyckel \"%s\" från motor \"%s\": %s"
 
-#: fe-secure-openssl.c:1376
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "certifikat tillgängligt, men inte den privata nyckelfilen \"%s\""
 
-#: fe-secure-openssl.c:1379
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "kunde inte köra stat() på privata nyckelfilen \"%s\": %m"
 
-#: fe-secure-openssl.c:1387
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "privat nyckelfil \"%s\" är inte en vanlig fil"
 
-#: fe-secure-openssl.c:1420
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "privata nyckelfilen \"%s\" har grupp- eller världsrättigheter; filen måste ha rättigheterna u=rw (0600) eller mindre om den ägs av databasanvändaren eller rättigheterna u=rw,g=r (0640) eller mindre om den ägs av root."
 
-#: fe-secure-openssl.c:1444
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "kunde inte läsa in privata nyckelfilen \"%s\": %s"
 
-#: fe-secure-openssl.c:1460
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "certifikatet matchar inte den privata nyckelfilen \"%s\": %s"
 
-#: fe-secure-openssl.c:1528
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "SSL-fel: verifiering av certifikat misslyckades: %s"
 
-#: fe-secure-openssl.c:1573
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "Detta kan tyda på att servern inte stöder någon SSL-protokolversion mellan %s oc %s."
 
-#: fe-secure-openssl.c:1606
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid "direct SSL connection was established without ALPN protocol negotiation extension"
+msgstr "direkt SSL-anslutning har upprättats utan utökning för ALPN-protokollförhandling"
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "SSL-anslutning har upprättats med oväntat ALPN-protokoll"
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "certifikatet kunde inte hämtas: %s"
 
-#: fe-secure-openssl.c:1711
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "inget SSL-fel rapporterat"
 
-#: fe-secure-openssl.c:1720
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-felkod %lu"
 
-#: fe-secure-openssl.c:1986
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "VARNING: sslpassword trunkerat\n"
 
-#: fe-secure.c:263
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "kunde inte ta emot data från servern: %s"
 
-#: fe-secure.c:434
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "kunde inte skicka data till servern: %s"
@@ -1470,48 +2042,3 @@ msgstr "kunde inte skicka data till servern: %s"
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "okänt socket-fel: 0x%08X/%d"
-
-#, c-format
-#~ msgid "%s(%s) failed: error code %d\n"
-#~ msgstr "%s(%s) misslyckades: felkod %d\n"
-
-#~ msgid "SCM_CRED authentication method not supported\n"
-#~ msgstr "autentiseringsmetoden SCM_CRED stöds ej\n"
-
-#, c-format
-#~ msgid "SSL error: %s\n"
-#~ msgstr "SSL-fel: %s\n"
-
-#, c-format
-#~ msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
-#~ msgstr "Sökväg till unixdomänuttag \"%s\" är för lång (maximalt %d byte)\n"
-
-#, c-format
-#~ msgid "could not create SSL context: %s\n"
-#~ msgstr "kan inte skapa SSL-omgivning: %s\n"
-
-#, c-format
-#~ msgid "could not load private key file \"%s\": %s\n"
-#~ msgstr "kunde inte ladda privata nyckelfilen \"%s\": %s\n"
-
-#, c-format
-#~ msgid "could not open file \"%s\": %s\n"
-#~ msgstr "kan inte öppna fil \"%s\": %s\n"
-
-#~ msgid "incoming GSSAPI message did not use confidentiality\n"
-#~ msgstr "inkommande GSSAPI-meddelande använde inte sekretess\n"
-
-#~ msgid "outgoing GSSAPI message would not use confidentiality\n"
-#~ msgstr "utgående GSSAPI-meddelande skulle inte använda sekretess\n"
-
-#, c-format
-#~ msgid "private key file \"%s\" is not a regular file\n"
-#~ msgstr "privat nyckelfilen \"%s\" är inte en vanlig fil\n"
-
-#, c-format
-#~ msgid "unrecognized SSL error code: %d\n"
-#~ msgstr "okänd SSL-felkod: %d\n"
-
-#, c-format
-#~ msgid "user name lookup failure: error code %lu\n"
-#~ msgstr "misslyckad sökning efter användarnamn: felkod %lu\n"
diff --git a/src/interfaces/libpq/po/uk.po b/src/interfaces/libpq/po/uk.po
index 4d5cdf1b724..2eaadf00f2f 100644
--- a/src/interfaces/libpq/po/uk.po
+++ b/src/interfaces/libpq/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-09 18:10+0000\n"
-"PO-Revision-Date: 2024-02-11 16:35\n"
+"POT-Creation-Date: 2025-12-31 02:10+0000\n"
+"PO-Revision-Date: 2026-01-02 14:40\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,924 +14,1425 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_16_STABLE/libpq.pot\n"
-"X-Crowdin-File-ID: 971\n"
+"X-Crowdin-File: /REL_18_STABLE/libpq.pot\n"
+"X-Crowdin-File-ID: 1073\n"
 
-#: ../../port/thread.c:50 ../../port/thread.c:86
+#: ../libpq-oauth/oauth-curl.c:308 ../libpq-oauth/oauth-curl.c:2011
 #, c-format
-msgid "could not look up local user ID %d: %s"
-msgstr "не вдалося знайти локального користувача з ідентифікатором %d: %s"
+msgid "libcurl easy handle removal failed: %s"
+msgstr "не вдалося видалити easy-дескриптор libcurl: %s"
 
-#: ../../port/thread.c:55 ../../port/thread.c:91
+#: ../libpq-oauth/oauth-curl.c:328
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "локального користувача з ідентифікатором %d не існує"
+msgid "libcurl multi handle cleanup failed: %s"
+msgstr "не вдалося очистити multi-дескриптор libcurl: %s"
 
-#: fe-auth-scram.c:227
+#: ../libpq-oauth/oauth-curl.c:394 ../libpq-oauth/oauth-curl.c:405
+#, c-format
+msgid "failed to set %s on OAuth connection: %s"
+msgstr "не вдалося встановити %s для OAuth підключення: %s"
+
+#: ../libpq-oauth/oauth-curl.c:416
+#, c-format
+msgid "failed to get %s from OAuth response: %s"
+msgstr "не вдалося отримати %s з OAuth відповіді: %s"
+
+#: ../libpq-oauth/oauth-curl.c:485 fe-auth-oauth.c:209 fe-auth-oauth.c:271
+#: fe-auth-oauth.c:333
+#, c-format
+msgid "field \"%s\" must be a string"
+msgstr "поле \"%s\" має бути рядком"
+
+#: ../libpq-oauth/oauth-curl.c:489
+#, c-format
+msgid "field \"%s\" must be a number"
+msgstr "поле \"%s\" має бути числом"
+
+#: ../libpq-oauth/oauth-curl.c:493
+#, c-format
+msgid "field \"%s\" must be an array of strings"
+msgstr "поле \"%s\" має бути масивом рядків"
+
+#: ../libpq-oauth/oauth-curl.c:498
+#, c-format
+msgid "field \"%s\" has unexpected type"
+msgstr "поле \"%s\" має неочікуваний тип"
+
+#: ../libpq-oauth/oauth-curl.c:522 ../libpq-oauth/oauth-curl.c:632
+#: fe-auth-oauth.c:215 fe-auth-oauth.c:277
+#, c-format
+msgid "JSON is too deeply nested"
+msgstr "JSON має занадто глибокий рівень вкладеності"
+
+#: ../libpq-oauth/oauth-curl.c:574 fe-auth-oauth.c:324
+#, c-format
+msgid "field \"%s\" is duplicated"
+msgstr "поле \"%s\" дублюється"
+
+#: ../libpq-oauth/oauth-curl.c:614 ../libpq-oauth/oauth-curl.c:674
+#: fe-auth-oauth.c:264 fe-auth-oauth.c:298
+#, c-format
+msgid "top-level element must be an object"
+msgstr "елемент верхнього рівня має бути об'єктом"
+
+#: ../libpq-oauth/oauth-curl.c:777
+#, c-format
+msgid "no content type was provided"
+msgstr "тип вмісту не було надано"
+
+#: ../libpq-oauth/oauth-curl.c:816
+#, c-format
+msgid "unexpected content type: \"%s\""
+msgstr "неочікуваний тип вмісту: \"%s\""
+
+#: ../libpq-oauth/oauth-curl.c:841
+#, c-format
+msgid "response contains embedded NULLs"
+msgstr "відповідь містить вбудовані NULL-символи"
+
+#: ../libpq-oauth/oauth-curl.c:851
+#, c-format
+msgid "response is not valid UTF-8"
+msgstr "відповідь не є коректним UTF-8"
+
+#: ../libpq-oauth/oauth-curl.c:891
+#, c-format
+msgid "field \"%s\" is missing"
+msgstr "поле \"%s\" відсутнє"
+
+#: ../libpq-oauth/oauth-curl.c:1097
+msgid "failed to parse token error response"
+msgstr "не вдалося розібрати відповідь з помилкою токену"
+
+#: ../libpq-oauth/oauth-curl.c:1125
+#, c-format
+msgid "provider rejected the oauth_client_secret"
+msgstr "провайдер відхилив oauth_client_secret"
+
+#: ../libpq-oauth/oauth-curl.c:1126
+#, c-format
+msgid "provider requires client authentication, and no oauth_client_secret is set"
+msgstr "провайдер вимагає автентифікації клієнта, але oauth_client_secret не встановлено"
+
+#: ../libpq-oauth/oauth-curl.c:1559
+#, c-format
+msgid "checking timer expiration: %m"
+msgstr "перевірка завершення таймеру: %m"
+
+#: ../libpq-oauth/oauth-curl.c:1721
+#, c-format
+msgid "failed to create libcurl multi handle"
+msgstr "не вдалося створити multi-дескриптор libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1741
+#, c-format
+msgid "failed to create libcurl handle"
+msgstr "не вдалося створити дескриптор libcurl"
+
+#: ../libpq-oauth/oauth-curl.c:1825 ../libpq-oauth/oauth-curl.c:1866
+#: ../libpq-oauth/oauth-curl.c:2184 ../libpq-oauth/oauth-curl.c:2345
+#: ../libpq-oauth/oauth-curl.c:2406 ../libpq-oauth/oauth-curl.c:2495
+#: ../libpq-oauth/oauth-curl.c:2789 ../libpq-oauth/oauth-curl.c:3006
+#: fe-auth-oauth.c:146 fe-auth-oauth.c:489 fe-auth-oauth.c:561
+#: fe-auth-oauth.c:723 fe-auth-oauth.c:1016 fe-auth-oauth.c:1029
+#: fe-auth-oauth.c:1117 fe-auth-oauth.c:1130 fe-auth-oauth.c:1266
+#: fe-auth-scram.c:374 fe-auth-scram.c:447 fe-auth-scram.c:599
+#: fe-auth-scram.c:619 fe-auth-scram.c:643 fe-auth-scram.c:657
+#: fe-auth-scram.c:703 fe-auth-scram.c:739 fe-auth-scram.c:931 fe-auth.c:308
+#: fe-auth.c:382 fe-auth.c:416 fe-auth.c:694 fe-auth.c:827 fe-auth.c:1330
+#: fe-auth.c:1493 fe-cancel.c:178 fe-connect.c:1012 fe-connect.c:1052
+#: fe-connect.c:2172 fe-connect.c:2334 fe-connect.c:3727 fe-connect.c:5183
+#: fe-connect.c:5496 fe-connect.c:5765 fe-connect.c:5883 fe-connect.c:6130
+#: fe-connect.c:6210 fe-connect.c:6308 fe-connect.c:6559 fe-connect.c:6586
+#: fe-connect.c:6662 fe-connect.c:6685 fe-connect.c:6709 fe-connect.c:6744
+#: fe-connect.c:6830 fe-connect.c:6838 fe-connect.c:7195 fe-connect.c:7377
+#: fe-exec.c:530 fe-exec.c:1331 fe-exec.c:3270 fe-exec.c:4341 fe-exec.c:4534
+#: fe-gssapi-common.c:109 fe-lobj.c:870 fe-protocol3.c:212 fe-protocol3.c:235
+#: fe-protocol3.c:258 fe-protocol3.c:275 fe-protocol3.c:296 fe-protocol3.c:370
+#: fe-protocol3.c:751 fe-protocol3.c:991 fe-protocol3.c:1556
+#: fe-protocol3.c:1610 fe-protocol3.c:1656 fe-protocol3.c:1677
+#: fe-protocol3.c:1934 fe-protocol3.c:2335 fe-secure-common.c:110
+#: fe-secure-gssapi.c:508 fe-secure-gssapi.c:699 fe-secure-openssl.c:405
+#: fe-secure-openssl.c:1135
+#, c-format
+msgid "out of memory"
+msgstr "недостатньо пам'яті"
+
+#: ../libpq-oauth/oauth-curl.c:1853
+#, c-format
+msgid "response is too large"
+msgstr "відповідь занадто велика"
+
+#: ../libpq-oauth/oauth-curl.c:1895
+#, c-format
+msgid "failed to queue HTTP request: %s"
+msgstr "не вдалося поставити HTTP запит у чергу: %s"
+
+#: ../libpq-oauth/oauth-curl.c:1912 ../libpq-oauth/oauth-curl.c:1970
+#, c-format
+msgid "asynchronous HTTP request failed: %s"
+msgstr "асинхронний HTTP запит не вдався: %s"
+
+#: ../libpq-oauth/oauth-curl.c:2022
+#, c-format
+msgid "no result was retrieved for the finished handle"
+msgstr "не отримано результату для завершеного дескриптора"
+
+#: ../libpq-oauth/oauth-curl.c:2155 ../libpq-oauth/oauth-curl.c:2461
+#: ../libpq-oauth/oauth-curl.c:2540
+#, c-format
+msgid "unexpected response code %ld"
+msgstr "неочікуваний код відповіді %ld"
+
+#: ../libpq-oauth/oauth-curl.c:2162
+msgid "failed to parse OpenID discovery document"
+msgstr "не вдалося розібрати документ виявлення OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2227
+#, c-format
+msgid "the issuer identifier (%s) does not match oauth_issuer (%s)"
+msgstr "ідентифікатор видавця (%s) не відповідає oauth_issuer (%s)"
+
+#: ../libpq-oauth/oauth-curl.c:2254
+#, c-format
+msgid "issuer \"%s\" does not provide a device authorization endpoint"
+msgstr "видавець \"%s\" не надає кінцеву точку авторизації пристрою"
+
+#: ../libpq-oauth/oauth-curl.c:2280
+#, c-format
+msgid "device authorization endpoint \"%s\" must use HTTPS"
+msgstr "кінцева точка авторизації пристрою \"%s\" має використовувати HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2289
+#, c-format
+msgid "token endpoint \"%s\" must use HTTPS"
+msgstr "кінцева точка токену \"%s\" має використовувати HTTPS"
+
+#: ../libpq-oauth/oauth-curl.c:2430
+msgid "failed to parse device authorization"
+msgstr "не вдалося розібрати авторизацію пристрою"
+
+#: ../libpq-oauth/oauth-curl.c:2518
+msgid "failed to parse access token response"
+msgstr "не вдалося розібрати відповідь токена доступу"
+
+#: ../libpq-oauth/oauth-curl.c:2598
+#, c-format
+msgid "slow_down interval overflow"
+msgstr "переповнення інтервалу slow_down"
+
+#. translator: The first %s is a URL for the user to visit in a
+#. browser, and the second %s is a code to be copy-pasted there.
+#.
+#: ../libpq-oauth/oauth-curl.c:2634
+#, c-format
+msgid "Visit %s and enter the code: %s\n"
+msgstr "Відвідайте %s і введіть код: %s\n"
+
+#: ../libpq-oauth/oauth-curl.c:2639
+#, c-format
+msgid "device prompt failed"
+msgstr "помилка запиту пристрою"
+
+#: ../libpq-oauth/oauth-curl.c:2695
+#, c-format
+msgid "curl_global_init previously failed during OAuth setup"
+msgstr "curl_global_init раніше не вдалася під час налаштування OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2714
+#, c-format
+msgid "curl_global_init failed during OAuth setup"
+msgstr "curl_global_init не вдалася під час налаштування OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2735
+#, c-format
+msgid "libcurl is no longer thread-safe\n"
+"\tCurl initialization was reported thread-safe when libpq\n"
+"\twas compiled, but the currently installed version of\n"
+"\tlibcurl reports that it is not. Recompile libpq against\n"
+"\tthe installed version of libcurl."
+msgstr "libcurl більше не є потокобезпечною\n"
+"\tПри компіляції libpq ініціалізація Curl\n"
+"\tбула заявлена як потокобезпечна, але\n"
+"\tпоточна встановлена версія libcurl\n"
+"\tповідомляє, що вона не є. Перекомпілюйте libpq\n"
+"\tдля встановленої версії libcurl."
+
+#: ../libpq-oauth/oauth-curl.c:2897
+msgid "failed to fetch OpenID discovery document"
+msgstr "не вдалося отримати документ виявлення OpenID"
+
+#: ../libpq-oauth/oauth-curl.c:2911
+msgid "cannot run OAuth device authorization"
+msgstr "не можна запустити авторизацію пристрою OAuth"
+
+#: ../libpq-oauth/oauth-curl.c:2915
+msgid "failed to obtain device authorization"
+msgstr "не вдалося отримати авторизацію пристрою"
+
+#: ../libpq-oauth/oauth-curl.c:2926 ../libpq-oauth/oauth-curl.c:2977
+msgid "failed to obtain access token"
+msgstr "не вдалося отримати токен доступу"
+
+#: fe-auth-oauth.c:133
+#, c-format
+msgid "internal error: no OAuth token was set for the connection"
+msgstr "внутрішня помилка: OAuth токен не був встановлений для підключення"
+
+#: fe-auth-oauth.c:396
+#, c-format
+msgid "OAuth discovery URI \"%s\" must use HTTPS"
+msgstr "URI виявлення OAuth \"%s\" має використовувати HTTPS"
+
+#: fe-auth-oauth.c:413
+#, c-format
+msgid "OAuth discovery URI \"%s\" must not contain query or fragment components"
+msgstr "URI виявлення OAuth \"%s\" не має містити компоненти запиту чи фрагменти"
+
+#: fe-auth-oauth.c:428
+#, c-format
+msgid "OAuth discovery URI \"%s\" is not a .well-known URI"
+msgstr "URI виявлення OAuth \"%s\" не є .well-known URI"
+
+#: fe-auth-oauth.c:454
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an unsupported .well-known suffix"
+msgstr "URI виявлення OAuth \"%s\" використовує непідтримуваний суфікс .well-known"
+
+#: fe-auth-oauth.c:479
+#, c-format
+msgid "OAuth discovery URI \"%s\" uses an invalid format"
+msgstr "URI виявлення OAuth \"%s\" використовує неправильний формат"
+
+#: fe-auth-oauth.c:528
+#, c-format
+msgid "server's error message contained an embedded NULL, and was discarded"
+msgstr "повідомлення про помилку сервера містило вбудований NULL і було відкинуто"
+
+#: fe-auth-oauth.c:539
+#, c-format
+msgid "server's error response is not valid UTF-8"
+msgstr "відповідь сервера про помилку не є коректним UTF-8"
+
+#: fe-auth-oauth.c:579
+#, c-format
+msgid "failed to parse server's error response: %s"
+msgstr "не вдалося розібрати відповідь сервера про помилку: %s"
+
+#: fe-auth-oauth.c:610
+#, c-format
+msgid "server's discovery document at %s (issuer \"%s\") is incompatible with oauth_issuer (%s)"
+msgstr "документ виявлення сервера за адресою %s (видавець \"%s\") несумісний з oauth_issuer (%s)"
+
+#: fe-auth-oauth.c:631
+#, c-format
+msgid "server's discovery document has moved to %s (previous location was %s)"
+msgstr "документ виявлення сервера переміщено до %s (попереднє місцезнаходження: %s)"
+
+#: fe-auth-oauth.c:652
+#, c-format
+msgid "server sent error response without a status"
+msgstr "сервер надіслав відповідь про помилку без статусу"
+
+#: fe-auth-oauth.c:663
+#, c-format
+msgid "server rejected OAuth bearer token: %s"
+msgstr "сервер відхилив OAuth bearer токен: %s"
+
+#: fe-auth-oauth.c:696
+#, c-format
+msgid "user-defined OAuth flow provided neither a token nor an async callback"
+msgstr "користувацький OAuth потік не надав ні токену, ні асинхронного зворотного виклику"
+
+#: fe-auth-oauth.c:703 fe-auth-oauth.c:1041
+#, c-format
+msgid "user-defined OAuth flow failed"
+msgstr "користувацький OAuth потік не вдався"
+
+#: fe-auth-oauth.c:716
+#, c-format
+msgid "user-defined OAuth flow did not provide a token"
+msgstr "користувацький OAuth потік не надав токен"
+
+#: fe-auth-oauth.c:734
+#, c-format
+msgid "user-defined OAuth flow did not provide a socket for polling"
+msgstr "користувацький OAuth потік не надав сокет для опитування"
+
+#: fe-auth-oauth.c:917
+#, c-format
+msgid "failed to lock mutex (%d)"
+msgstr "не вдалося блокувати м'ютекс (%d)"
+
+#: fe-auth-oauth.c:1046
+#, c-format
+msgid "no OAuth flows are available (try installing the libpq-oauth package)"
+msgstr "OAuth потоки недоступні (спробуйте встановити пакунок libpq-oauth)"
+
+#: fe-auth-oauth.c:1095
+#, c-format
+msgid "server requires OAuth authentication, but oauth_issuer and oauth_client_id are not both set"
+msgstr "сервер вимагає OAuth автентифікації, але oauth_issuer і oauth_client_id обидва не встановлені"
+
+#: fe-auth-oauth.c:1255
+#, c-format
+msgid "server sent unexpected additional OAuth data"
+msgstr "сервер надіслав неочікувані додаткові дані OAuth"
+
+#: fe-auth-oauth.c:1295
+#, c-format
+msgid "server requires OAuth authentication, but no discovery metadata was provided"
+msgstr "сервер вимагає OAuth автентифікації, але метадані виявлення не надано"
+
+#: fe-auth-oauth.c:1333
+#, c-format
+msgid "internal error: OAuth flow did not set a token"
+msgstr "внутрішня помилка: OAuth потік не встановив токен"
+
+#: fe-auth-oauth.c:1351
+#, c-format
+msgid "server sent additional OAuth data after error"
+msgstr "сервер надіслав додаткові дані OAuth після помилки"
+
+#: fe-auth-oauth.c:1355
+#, c-format
+msgid "invalid OAuth exchange state"
+msgstr "неправильний стан обміну OAuth"
+
+#: fe-auth-oauth.c:1368
+#, c-format
+msgid "retrying connection with new bearer token"
+msgstr "повторна спроба підключення з новим bearer токеном"
+
+#: fe-auth-scram.c:228
 #, c-format
 msgid "malformed SCRAM message (empty message)"
 msgstr "неправильне повідомлення SCRAM (пусте повідомлення)"
 
-#: fe-auth-scram.c:232
+#: fe-auth-scram.c:233
 #, c-format
 msgid "malformed SCRAM message (length mismatch)"
 msgstr "неправильне повідомлення SCRAM (невідповідність довжини)"
 
-#: fe-auth-scram.c:275
+#: fe-auth-scram.c:277
 #, c-format
 msgid "could not verify server signature: %s"
 msgstr "не вдалося перевірити підпис сервера: %s"
 
-#: fe-auth-scram.c:281
+#: fe-auth-scram.c:283
 #, c-format
 msgid "incorrect server signature"
 msgstr "невірний підпис сервера"
 
-#: fe-auth-scram.c:290
+#: fe-auth-scram.c:292
 #, c-format
 msgid "invalid SCRAM exchange state"
 msgstr "неприпустимий стан обміну SCRAM"
 
-#: fe-auth-scram.c:317
+#: fe-auth-scram.c:316
 #, c-format
 msgid "malformed SCRAM message (attribute \"%c\" expected)"
 msgstr "неправильне повідомлення SCRAM (очікувався атрибут \"%c\")"
 
-#: fe-auth-scram.c:326
+#: fe-auth-scram.c:325
 #, c-format
 msgid "malformed SCRAM message (expected character \"=\" for attribute \"%c\")"
 msgstr "неправильне повідомлення SCRAM (очікувався символ \"=\" для атрибута \"%c\")"
 
-#: fe-auth-scram.c:366
+#: fe-auth-scram.c:365
 #, c-format
 msgid "could not generate nonce"
 msgstr "не вдалося згенерувати одноразовий ідентифікатор"
 
-#: fe-auth-scram.c:375 fe-auth-scram.c:448 fe-auth-scram.c:600
-#: fe-auth-scram.c:620 fe-auth-scram.c:644 fe-auth-scram.c:658
-#: fe-auth-scram.c:704 fe-auth-scram.c:740 fe-auth-scram.c:914 fe-auth.c:296
-#: fe-auth.c:369 fe-auth.c:403 fe-auth.c:618 fe-auth.c:729 fe-auth.c:1210
-#: fe-auth.c:1375 fe-connect.c:925 fe-connect.c:1759 fe-connect.c:1921
-#: fe-connect.c:3291 fe-connect.c:4496 fe-connect.c:5161 fe-connect.c:5416
-#: fe-connect.c:5534 fe-connect.c:5781 fe-connect.c:5861 fe-connect.c:5959
-#: fe-connect.c:6210 fe-connect.c:6237 fe-connect.c:6313 fe-connect.c:6336
-#: fe-connect.c:6360 fe-connect.c:6395 fe-connect.c:6481 fe-connect.c:6489
-#: fe-connect.c:6846 fe-connect.c:6996 fe-exec.c:527 fe-exec.c:1323
-#: fe-exec.c:3132 fe-exec.c:4100 fe-exec.c:4264 fe-gssapi-common.c:109
-#: fe-lobj.c:870 fe-protocol3.c:204 fe-protocol3.c:228 fe-protocol3.c:251
-#: fe-protocol3.c:268 fe-protocol3.c:348 fe-protocol3.c:715 fe-protocol3.c:954
-#: fe-protocol3.c:1765 fe-protocol3.c:2165 fe-secure-common.c:110
-#: fe-secure-gssapi.c:496 fe-secure-openssl.c:435 fe-secure-openssl.c:1271
-#, c-format
-msgid "out of memory"
-msgstr "недостатньо пам'яті"
-
-#: fe-auth-scram.c:382
+#: fe-auth-scram.c:381
 #, c-format
 msgid "could not encode nonce"
 msgstr "не вдалося закодувати одноразовий ідентифікатор"
 
-#: fe-auth-scram.c:570
+#: fe-auth-scram.c:569
 #, c-format
 msgid "could not calculate client proof: %s"
 msgstr "не вдалося обчислити підтвердження клієнта: %s"
 
-#: fe-auth-scram.c:585
+#: fe-auth-scram.c:584
 #, c-format
 msgid "could not encode client proof"
 msgstr "не вдалося закодувати підтвердження клієнта"
 
-#: fe-auth-scram.c:637
+#: fe-auth-scram.c:636
 #, c-format
 msgid "invalid SCRAM response (nonce mismatch)"
 msgstr "неприпустима відповідь SCRAM (невідповідність одноразового ідентифікатора)"
 
-#: fe-auth-scram.c:667
+#: fe-auth-scram.c:666
 #, c-format
 msgid "malformed SCRAM message (invalid salt)"
 msgstr "неправильне повідомлення SCRAM (неприпустима сіль)"
 
-#: fe-auth-scram.c:680
+#: fe-auth-scram.c:679
 #, c-format
 msgid "malformed SCRAM message (invalid iteration count)"
 msgstr "неправильне повідомлення SCRAM (неприпустима кількість ітерацій)"
 
-#: fe-auth-scram.c:685
+#: fe-auth-scram.c:684
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-first-message)"
 msgstr "неправильне повідомлення SCRAM (сміття в кінці першого повідомлення сервера)"
 
-#: fe-auth-scram.c:719
+#: fe-auth-scram.c:718
 #, c-format
 msgid "error received from server in SCRAM exchange: %s"
 msgstr "отримано помилку від сервера під час обміну SCRAM: %s"
 
-#: fe-auth-scram.c:734
+#: fe-auth-scram.c:733
 #, c-format
 msgid "malformed SCRAM message (garbage at end of server-final-message)"
 msgstr "неправильне повідомлення SCRAM (сміття в кінці останнього повідомлення сервера)"
 
-#: fe-auth-scram.c:751
+#: fe-auth-scram.c:750
 #, c-format
 msgid "malformed SCRAM message (invalid server signature)"
 msgstr "неправильне повідомлення SCRAM (неприпустимий підпис сервера)"
 
-#: fe-auth-scram.c:923
+#: fe-auth-scram.c:940
 msgid "could not generate random salt"
 msgstr "не вдалося згенерувати випадкову сіль"
 
-#: fe-auth.c:77
+#: fe-auth.c:80
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "недостатньо пам'яті для буфера GSSAPI (%d)"
 
-#: fe-auth.c:138
+#: fe-auth.c:146
 msgid "GSSAPI continuation error"
 msgstr "Помилка продовження у GSSAPI"
 
-#: fe-auth.c:168 fe-auth.c:397 fe-gssapi-common.c:97 fe-secure-common.c:99
+#: fe-auth.c:176 fe-auth.c:410 fe-gssapi-common.c:97 fe-secure-common.c:99
 #: fe-secure-common.c:173
 #, c-format
 msgid "host name must be specified"
 msgstr "необхідно вказати ім'я хосту"
 
-#: fe-auth.c:174
+#: fe-auth.c:182
 #, c-format
 msgid "duplicate GSS authentication request"
 msgstr "дублікат запиту автентифікації GSS"
 
-#: fe-auth.c:238
+#: fe-auth.c:246
 #, c-format
 msgid "out of memory allocating SSPI buffer (%d)"
 msgstr "недостатньо пам'яті для буфера SSPI (%d)"
 
-#: fe-auth.c:285
+#: fe-auth.c:297
 msgid "SSPI continuation error"
 msgstr "Помилка продовження SSPI"
 
-#: fe-auth.c:359
+#: fe-auth.c:372
 #, c-format
 msgid "duplicate SSPI authentication request"
 msgstr "дублікат запиту автентифікації SSPI"
 
-#: fe-auth.c:384
+#: fe-auth.c:397
 msgid "could not acquire SSPI credentials"
 msgstr "не вдалось отримати облікові дані SSPI"
 
-#: fe-auth.c:437
+#: fe-auth.c:449
 #, c-format
 msgid "channel binding required, but SSL not in use"
 msgstr "необхідно зв’язування каналів, але SSL не використовується"
 
-#: fe-auth.c:443
+#: fe-auth.c:455
 #, c-format
 msgid "duplicate SASL authentication request"
 msgstr "дублікат запиту автентифікації SASL"
 
-#: fe-auth.c:501
+#: fe-auth.c:513
 #, c-format
 msgid "channel binding is required, but client does not support it"
 msgstr "потрібно зв'язування каналів, але клієнт не підтримує його"
 
-#: fe-auth.c:517
+#: fe-auth.c:529
 #, c-format
 msgid "server offered SCRAM-SHA-256-PLUS authentication over a non-SSL connection"
 msgstr "сервер запропонував автентифікацію SCRAM-SHA-256-PLUS через підключення без SSL"
 
-#: fe-auth.c:531
+#: fe-auth.c:551
 #, c-format
 msgid "none of the server's SASL authentication mechanisms are supported"
 msgstr "жоден з серверних механізмів автентифікації SASL не підтримується"
 
-#: fe-auth.c:538
+#: fe-auth.c:571
+#, c-format
+msgid "authentication method requirement \"%s\" failed: server requested %s authentication"
+msgstr "помилка вимоги методу автентифікації \"%s\": сервер вимагав автентифікації %s"
+
+#: fe-auth.c:580
 #, c-format
 msgid "channel binding is required, but server did not offer an authentication method that supports channel binding"
 msgstr "потрібно зв'язування каналів, але сервер не запропонував метод аутентифікації, який підтримує зв’язування каналів"
 
-#: fe-auth.c:641
+#: fe-auth.c:716
 #, c-format
 msgid "out of memory allocating SASL buffer (%d)"
 msgstr "недостатньо пам'яті для буфера SASL (%d)"
 
-#: fe-auth.c:665
+#: fe-auth.c:758
 #, c-format
 msgid "AuthenticationSASLFinal received from server, but SASL authentication was not completed"
 msgstr "Від сервера отримано AuthenticationSASLFinal, але автентифікація SASL не була завершена"
 
-#: fe-auth.c:675
+#: fe-auth.c:768
 #, c-format
 msgid "no client response found after SASL exchange success"
 msgstr "після успішного обміну SASL немає відповіді клієнта"
 
-#: fe-auth.c:738 fe-auth.c:745 fe-auth.c:1358 fe-auth.c:1369
+#: fe-auth.c:836 fe-auth.c:843 fe-auth.c:1476 fe-auth.c:1487
 #, c-format
 msgid "could not encrypt password: %s"
 msgstr "не вдалося зашифрувати пароль: %s"
 
-#: fe-auth.c:773
+#: fe-auth.c:873
 msgid "server requested a cleartext password"
 msgstr "сервер надіслав запит на пароль простим текстом"
 
-#: fe-auth.c:775
+#: fe-auth.c:875
 msgid "server requested a hashed password"
 msgstr "сервер надіслав запит на хешований пароль"
 
-#: fe-auth.c:778
+#: fe-auth.c:878
 msgid "server requested GSSAPI authentication"
 msgstr "сервер запросив автентифікацію GSSAPI"
 
-#: fe-auth.c:780
+#: fe-auth.c:880
 msgid "server requested SSPI authentication"
 msgstr "сервер запросив автентифікацію SSPI"
 
-#: fe-auth.c:784
+#: fe-auth.c:884
 msgid "server requested SASL authentication"
 msgstr "сервер запросив автентифікацію SASL"
 
-#: fe-auth.c:787
+#: fe-auth.c:887
 msgid "server requested an unknown authentication type"
 msgstr "сервер надіслав запит невідомого типу автентифікації"
 
-#: fe-auth.c:820
+#: fe-auth.c:920
 #, c-format
 msgid "server did not request an SSL certificate"
 msgstr "сервер не запитував SSL-сертифікат"
 
-#: fe-auth.c:825
+#: fe-auth.c:925
 #, c-format
 msgid "server accepted connection without a valid SSL certificate"
 msgstr "сервер приймає підключення без дійсного SSL-сертифікату"
 
-#: fe-auth.c:879
+#: fe-auth.c:979
 msgid "server did not complete authentication"
 msgstr "сервер не пройшов автентифікацію"
 
-#: fe-auth.c:913
+#: fe-auth.c:1013
 #, c-format
 msgid "authentication method requirement \"%s\" failed: %s"
 msgstr "помилка вимоги \"%s\" методу автентифікації: %s"
 
-#: fe-auth.c:936
+#: fe-auth.c:1036
 #, c-format
 msgid "channel binding required, but server authenticated client without channel binding"
 msgstr "потрібно зв'язування каналів, але сервер автентифікував клієнта без зв’язування каналів"
 
-#: fe-auth.c:941
+#: fe-auth.c:1041
 #, c-format
 msgid "channel binding required but not supported by server's authentication request"
 msgstr "потрібно зв'язування каналів, але не підтримується запитом на аутентифікацію сервера"
 
-#: fe-auth.c:975
+#: fe-auth.c:1081
 #, c-format
 msgid "Kerberos 4 authentication not supported"
 msgstr "Автентифікація Kerberos 4 не підтримується"
 
-#: fe-auth.c:979
+#: fe-auth.c:1085
 #, c-format
 msgid "Kerberos 5 authentication not supported"
 msgstr "Автентифікація Kerberos 5 не підтримується"
 
-#: fe-auth.c:1049
+#: fe-auth.c:1155
 #, c-format
 msgid "GSSAPI authentication not supported"
 msgstr "Автентифікація GSSAPI не підтримується"
 
-#: fe-auth.c:1080
+#: fe-auth.c:1186
 #, c-format
 msgid "SSPI authentication not supported"
 msgstr "Автентифікація SSPI не підтримується"
 
-#: fe-auth.c:1087
+#: fe-auth.c:1193
 #, c-format
 msgid "Crypt authentication not supported"
 msgstr "Автентифікація Crypt не підтримується"
 
-#: fe-auth.c:1151
+#: fe-auth.c:1267
 #, c-format
 msgid "authentication method %u not supported"
 msgstr "спосіб автентифікації %u не підтримується"
 
-#: fe-auth.c:1197
+#: fe-auth.c:1307
 #, c-format
 msgid "user name lookup failure: error code %lu"
 msgstr "невдала підстановка імені користувача: код помилки %lu"
 
-#: fe-auth.c:1321
+#: fe-auth.c:1315
+#, c-format
+msgid "could not look up local user ID %ld: %m"
+msgstr "не вдалося знайти локального користувача з ідентифікатором %ld: %m"
+
+#: fe-auth.c:1320
+#, c-format
+msgid "local user with ID %ld does not exist"
+msgstr "локального користувача з ідентифікатором %ld не існує"
+
+#: fe-auth.c:1439
 #, c-format
 msgid "unexpected shape of result set returned for SHOW"
 msgstr "неочікувана форма набору результатів повернулася для SHOW"
 
-#: fe-auth.c:1329
+#: fe-auth.c:1447
 #, c-format
-msgid "password_encryption value too long"
-msgstr "занадто довге значення password_encryption"
+msgid "\"password_encryption\" value too long"
+msgstr "занадто довге значення \"password_encryption\""
 
-#: fe-auth.c:1379
+#: fe-auth.c:1497
 #, c-format
 msgid "unrecognized password encryption algorithm \"%s\""
 msgstr "нерозпізнаний алгоритм шифрування пароля \"%s\""
 
-#: fe-connect.c:1132
+#: fe-cancel.c:79
+#, c-format
+msgid "connection pointer is NULL"
+msgstr "нульове значення вказівника підключення"
+
+#: fe-cancel.c:85 fe-misc.c:613
+#, c-format
+msgid "connection not open"
+msgstr "підключення не відкрито"
+
+#: fe-cancel.c:92
+#, c-format
+msgid "no cancellation key received"
+msgstr "ключ скасування не отримано"
+
+#: fe-cancel.c:212
+#, c-format
+msgid "cancel request is already being sent on this connection"
+msgstr "запит на скасування вже надсилається при цьому підключенні"
+
+#: fe-cancel.c:282
+#, c-format
+msgid "unexpected response from server"
+msgstr "неочікувана відповідь сервера"
+
+#: fe-connect.c:1309
 #, c-format
 msgid "could not match %d host names to %d hostaddr values"
 msgstr "не вдалося зіставити імена хостів %d для значень %d hostaddr"
 
-#: fe-connect.c:1212
+#: fe-connect.c:1389
 #, c-format
 msgid "could not match %d port numbers to %d hosts"
 msgstr "не вдалося зіставити %d номерів портів з %d хостами"
 
-#: fe-connect.c:1337
+#: fe-connect.c:1517
 #, c-format
 msgid "negative require_auth method \"%s\" cannot be mixed with non-negative methods"
 msgstr "від'ємний метод require_auth \"%s\" не може бути змішаний з позитивними методами"
 
-#: fe-connect.c:1350
+#: fe-connect.c:1530
 #, c-format
 msgid "require_auth method \"%s\" cannot be mixed with negative methods"
 msgstr "метод require_auth \"%s\" не може бути змішаний з негативними методами"
 
-#: fe-connect.c:1410 fe-connect.c:1461 fe-connect.c:1503 fe-connect.c:1559
-#: fe-connect.c:1567 fe-connect.c:1598 fe-connect.c:1644 fe-connect.c:1684
-#: fe-connect.c:1705
+#: fe-connect.c:1606 fe-connect.c:1735 fe-connect.c:1777 fe-connect.c:1820
+#: fe-connect.c:1923 fe-connect.c:1969 fe-connect.c:2009 fe-connect.c:2076
+#: fe-connect.c:8263
 #, c-format
 msgid "invalid %s value: \"%s\""
 msgstr "неприпустиме значення %s: \"%s\""
 
-#: fe-connect.c:1443
+#: fe-connect.c:1648
+#, c-format
+msgid "internal error: no space in allowed_sasl_mechs"
+msgstr "внутрішня помилка: неприпустимий пробіл в allowed_sasl_mechs"
+
+#: fe-connect.c:1687
 #, c-format
 msgid "require_auth method \"%s\" is specified more than once"
 msgstr "require_auth метод \"%s\" вказаний неодноразово"
 
-#: fe-connect.c:1484 fe-connect.c:1523 fe-connect.c:1606
+#: fe-connect.c:1758 fe-connect.c:1797 fe-connect.c:1829 fe-connect.c:1931
 #, c-format
 msgid "%s value \"%s\" invalid when SSL support is not compiled in"
 msgstr "%s значення \"%s\" неприпустиме, якщо підтримку протоколу SSL не скомпільовано"
 
-#: fe-connect.c:1546
+#: fe-connect.c:1849
+#, c-format
+msgid "weak sslmode \"%s\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")"
+msgstr "слабкий sslmode \"%s\" не може використовуватися з sslnegotiation=direct (використовуйте \"require\", \"verify-ca\" або \"verify-full\")"
+
+#: fe-connect.c:1871
 #, c-format
 msgid "weak sslmode \"%s\" may not be used with sslrootcert=system (use \"verify-full\")"
 msgstr "слабкий sslmode \"%s\" не може використовуватися з sslrootcert=system (використайте \"verify-full\")"
 
-#: fe-connect.c:1584
+#: fe-connect.c:1884 fe-connect.c:1892
+#, c-format
+msgid "invalid \"%s\" value: \"%s\""
+msgstr "неприпустиме значення \"%s\": \"%s\""
+
+#: fe-connect.c:1909
 #, c-format
 msgid "invalid SSL protocol version range"
 msgstr "неприпустимий діапазон версії протоколу SSL"
 
-#: fe-connect.c:1621
+#: fe-connect.c:1946
 #, c-format
 msgid "%s value \"%s\" is not supported (check OpenSSL version)"
 msgstr "%s значення \"%s\" не підтримується (перевірте версію OpenSSL)"
 
-#: fe-connect.c:1651
+#: fe-connect.c:1976
 #, c-format
 msgid "gssencmode value \"%s\" invalid when GSSAPI support is not compiled in"
 msgstr "значення gssencmode \"%s\" неприпустиме, якщо підтримку протоколу GSSAPI не скомпільовано"
 
-#: fe-connect.c:1944
+#: fe-connect.c:2030
+#, c-format
+msgid "invalid SCRAM client key"
+msgstr "неприпустимий ключ клієнта SCRAM"
+
+#: fe-connect.c:2035
+#, c-format
+msgid "invalid SCRAM client key length: %d"
+msgstr "неприпустима довжина ключа SCRAM: %d"
+
+#: fe-connect.c:2053
+#, c-format
+msgid "invalid SCRAM server key"
+msgstr "неприпустимий ключ сервера SCRAM"
+
+#: fe-connect.c:2058
+#, c-format
+msgid "invalid SCRAM server key length: %d"
+msgstr "неприпустима довжина ключа SCRAM: %d"
+
+#: fe-connect.c:2145
+#, c-format
+msgid "\"%s\" is greater than \"%s\""
+msgstr "\"%s\" більше за \"%s\""
+
+#: fe-connect.c:2357
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s"
 msgstr "не вдалося встановити сокет у TCP-режим без затримки: %s"
 
-#: fe-connect.c:2003
+#: fe-connect.c:2416
 #, c-format
 msgid "connection to server on socket \"%s\" failed: "
 msgstr "помилка при з'єднанні з сервером через сокет \"%s\": "
 
-#: fe-connect.c:2029
+#: fe-connect.c:2442
 #, c-format
 msgid "connection to server at \"%s\" (%s), port %s failed: "
 msgstr "підключення до серверу \"%s\" (%s), порт %s провалено: "
 
-#: fe-connect.c:2034
+#: fe-connect.c:2447
 #, c-format
 msgid "connection to server at \"%s\", port %s failed: "
 msgstr "підключення до серверу \"%s\", порт %s провалено: "
 
-#: fe-connect.c:2057
+#: fe-connect.c:2470
 #, c-format
 msgid "\tIs the server running locally and accepting connections on that socket?"
 msgstr "\tЧи працює сервер локально і приймає підключення до цього сокету?"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2472
 #, c-format
 msgid "\tIs the server running on that host and accepting TCP/IP connections?"
 msgstr "\tЧи працює сервер на цьому хості і приймає TCP/IP підключення?"
 
-#: fe-connect.c:2122
-#, c-format
-msgid "invalid integer value \"%s\" for connection option \"%s\""
-msgstr "неприпустиме ціле значення \"%s\" для параметра з'єднання \"%s\""
-
-#: fe-connect.c:2151 fe-connect.c:2185 fe-connect.c:2220 fe-connect.c:2318
-#: fe-connect.c:2973
+#: fe-connect.c:2518 fe-connect.c:2552 fe-connect.c:2587 fe-connect.c:2685
+#: fe-connect.c:3411
 #, c-format
 msgid "%s(%s) failed: %s"
 msgstr "%s(%s) помилка: %s"
 
-#: fe-connect.c:2284
+#: fe-connect.c:2651
 #, c-format
 msgid "%s(%s) failed: error code %d"
 msgstr "%s(%s) помилка: код помилки %d"
 
-#: fe-connect.c:2597
+#: fe-connect.c:2963
 #, c-format
 msgid "invalid connection state, probably indicative of memory corruption"
 msgstr "неприпустимий стан підключення, можливо, пошкоджена пам'ять"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3046
 #, c-format
 msgid "invalid port number: \"%s\""
 msgstr "неприпустимий номер порту: \"%s\""
 
-#: fe-connect.c:2690
+#: fe-connect.c:3060
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s"
 msgstr "не вдалося перекласти ім’я хоста \"%s\" в адресу: %s"
 
-#: fe-connect.c:2702
+#: fe-connect.c:3072
 #, c-format
 msgid "could not parse network address \"%s\": %s"
 msgstr "не вдалося проаналізувати адресу мережі \"%s\": %s"
 
-#: fe-connect.c:2713
+#: fe-connect.c:3083
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Шлях Unix-сокету \"%s\" занадто довгий (максимум %d байтів)"
 
-#: fe-connect.c:2727
+#: fe-connect.c:3097
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s"
 msgstr "не вдалося перекласти шлях Unix-сокету \"%s\" в адресу: %s"
 
-#: fe-connect.c:2901
+#: fe-connect.c:3263 fe-connect.c:4710
+#, c-format
+msgid "GSSAPI encryption required but it is not supported over a local socket"
+msgstr "Потрібне шифрування GSSAPI, але воно не підтримується над локальним сокетом"
+
+#: fe-connect.c:3271 fe-connect.c:4839
+#, c-format
+msgid "GSSAPI encryption required but no credential cache"
+msgstr "Шифрування GSSAPI необхідне, але немає кешу облікових даних"
+
+#: fe-connect.c:3339
 #, c-format
 msgid "could not create socket: %s"
 msgstr "не вдалося створити сокет: %s"
 
-#: fe-connect.c:2932
+#: fe-connect.c:3370
 #, c-format
 msgid "could not set socket to nonblocking mode: %s"
 msgstr "не вдалося встановити сокет у режим без блокування: %s"
 
-#: fe-connect.c:2943
+#: fe-connect.c:3381
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s"
 msgstr "не вдалося встановити сокет у режим закриття по виконанню: %s"
 
-#: fe-connect.c:2961
-#, c-format
-msgid "keepalives parameter must be an integer"
-msgstr "параметр keepalives має бути цілим числом"
-
-#: fe-connect.c:3100
+#: fe-connect.c:3538
 #, c-format
 msgid "could not get socket error status: %s"
 msgstr "не вдалося отримати статус помилки сокету: %s"
 
-#: fe-connect.c:3127
+#: fe-connect.c:3565
 #, c-format
 msgid "could not get client address from socket: %s"
 msgstr "не вдалося отримати адресу клієнта з сокету: %s"
 
-#: fe-connect.c:3165
+#: fe-connect.c:3591
 #, c-format
 msgid "requirepeer parameter is not supported on this platform"
 msgstr "параметр requirepeer не підтримується на цій платформі"
 
-#: fe-connect.c:3167
+#: fe-connect.c:3593
 #, c-format
 msgid "could not get peer credentials: %s"
 msgstr "не вдалось отримати облікові дані учасника: %s"
 
-#: fe-connect.c:3180
+#: fe-connect.c:3606
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\""
 msgstr "requirepeer вказує на \"%s\", але фактичне ім'я вузла \"%s\""
 
-#: fe-connect.c:3221
+#: fe-connect.c:3644
 #, c-format
 msgid "could not send GSSAPI negotiation packet: %s"
 msgstr "не вдалося передати пакет узгодження протоколу GSSAPI: %s"
 
-#: fe-connect.c:3233
-#, c-format
-msgid "GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)"
-msgstr "вимагалося шифрування GSSAPI, але не було неможливим (можливо, без кешу облікових даних, підтримки сервера, або використання локального сокета)"
-
-#: fe-connect.c:3274
+#: fe-connect.c:3683
 #, c-format
 msgid "could not send SSL negotiation packet: %s"
 msgstr "не вдалося передати пакет узгодження протоколу SSL: %s"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3709
+#, c-format
+msgid "could not send cancel packet: %s"
+msgstr "не вдалося надіслати запит на скасування: %s"
+
+#: fe-connect.c:3739
 #, c-format
 msgid "could not send startup packet: %s"
 msgstr "не вдалося передати стартовий пакет: %s"
 
-#: fe-connect.c:3378
-#, c-format
+#: fe-connect.c:3812
 msgid "server does not support SSL, but SSL was required"
 msgstr "сервер не підтримує протокол SSL, але протокол SSL вимагається"
 
-#: fe-connect.c:3404
+#: fe-connect.c:3822
+#, c-format
+msgid "server sent an error response during SSL exchange"
+msgstr "сервер відповів помилкою під час обміну SSL"
+
+#: fe-connect.c:3827
 #, c-format
 msgid "received invalid response to SSL negotiation: %c"
 msgstr "отримано неприпустиму відповідь на узгодження SSL: %c"
 
-#: fe-connect.c:3424
+#: fe-connect.c:3847
 #, c-format
 msgid "received unencrypted data after SSL response"
 msgstr "отримані незашифровані дані після відповіді SSL"
 
-#: fe-connect.c:3504
+#: fe-connect.c:3910
 #, c-format
+msgid "server sent an error response during GSS encryption exchange"
+msgstr "сервер відповів помилкою під час обміну шифруванням GSS"
+
+#: fe-connect.c:3928
 msgid "server doesn't support GSSAPI encryption, but it was required"
 msgstr "сервер не підтримує шифрування GSSAPI, але це було необхідно"
 
-#: fe-connect.c:3515
+#: fe-connect.c:3932
 #, c-format
 msgid "received invalid response to GSSAPI negotiation: %c"
 msgstr "отримано неприпустиму відповідь на узгодження GSSAPI: %c"
 
-#: fe-connect.c:3533
+#: fe-connect.c:3954
 #, c-format
 msgid "received unencrypted data after GSSAPI encryption response"
 msgstr "отримані незашифровані дані після відповіді шифрування GSSAPI"
 
-#: fe-connect.c:3598
+#: fe-connect.c:4015
 #, c-format
 msgid "expected authentication request from server, but received %c"
 msgstr "очікувався запит автентифікації від сервера, але отримано %c"
 
-#: fe-connect.c:3625 fe-connect.c:3794
+#: fe-connect.c:4043 fe-connect.c:4175
 #, c-format
 msgid "received invalid authentication request"
 msgstr "отримано неприпустимий запит на аутентифікацію"
 
-#: fe-connect.c:3630 fe-connect.c:3779
+#: fe-connect.c:4049
 #, c-format
 msgid "received invalid protocol negotiation message"
 msgstr "отримано неприпустиме повідомлення узгодження протоколу"
 
-#: fe-connect.c:3648 fe-connect.c:3702
+#: fe-connect.c:4068 fe-connect.c:4122
 #, c-format
 msgid "received invalid error message"
 msgstr "отримано неприпустиме повідомлення про помилку"
 
-#: fe-connect.c:3865
+#: fe-connect.c:4152
+#, c-format
+msgid "received duplicate protocol negotiation message"
+msgstr "отримано дубльоване повідомлення про узгодження протоколу"
+
+#: fe-connect.c:4254
+#, c-format
+msgid "internal error: async authentication has no handler"
+msgstr "внутрішня помилка: асинхронна автентифікація не має обробника"
+
+#: fe-connect.c:4279
+#, c-format
+msgid "internal error: async cleanup did not release polling socket"
+msgstr "внутрішня помилка: асинхронне очищення не звільнило приймальний сокет"
+
+#: fe-connect.c:4302
+#, c-format
+msgid "internal error: async authentication did not set a socket for polling"
+msgstr "внутрішня помилка: асинхронна автентифікація не встановила сокет для приймання"
+
+#: fe-connect.c:4335
 #, c-format
 msgid "unexpected message from server during startup"
 msgstr "неочікуване повідомлення від сервера під час запуску"
 
-#: fe-connect.c:3956
+#: fe-connect.c:4426
 #, c-format
 msgid "session is read-only"
 msgstr "сесія доступна тільки для читання"
 
-#: fe-connect.c:3958
+#: fe-connect.c:4428
 #, c-format
 msgid "session is not read-only"
 msgstr "сесія доступна не лише для читання"
 
-#: fe-connect.c:4011
+#: fe-connect.c:4481
 #, c-format
 msgid "server is in hot standby mode"
 msgstr "сервер знаходиться у режимі hot standby"
 
-#: fe-connect.c:4013
+#: fe-connect.c:4483
 #, c-format
 msgid "server is not in hot standby mode"
 msgstr "сервер не в режимі hot standby"
 
-#: fe-connect.c:4129 fe-connect.c:4179
+#: fe-connect.c:4608 fe-connect.c:4658
 #, c-format
 msgid "\"%s\" failed"
 msgstr "\"%s\" помилка"
 
-#: fe-connect.c:4193
+#: fe-connect.c:4672
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption"
 msgstr "неприпустимий стан підключення %d, можливо, пошкоджена пам'ять"
 
-#: fe-connect.c:5174
+#: fe-connect.c:5509
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": схема має бути ldap://"
 
-#: fe-connect.c:5189
+#: fe-connect.c:5524
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": відсутнє унікальне ім'я"
 
-#: fe-connect.c:5201 fe-connect.c:5259
+#: fe-connect.c:5536 fe-connect.c:5594
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": має бути лише один атрибут"
 
-#: fe-connect.c:5213 fe-connect.c:5275
+#: fe-connect.c:5548 fe-connect.c:5610
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": відсутня область пошуку (base/one/sub)"
 
-#: fe-connect.c:5225
+#: fe-connect.c:5560
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": відсутній фільтр"
 
-#: fe-connect.c:5247
+#: fe-connect.c:5582
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number"
 msgstr "неприпустима URL-адреса протоколу LDAP \"%s\": неприпустимий номер порту"
 
-#: fe-connect.c:5284
+#: fe-connect.c:5619
 #, c-format
 msgid "could not create LDAP structure"
 msgstr "не вдалось створити структуру LDAP"
 
-#: fe-connect.c:5359
+#: fe-connect.c:5694
 #, c-format
 msgid "lookup on LDAP server failed: %s"
 msgstr "помилка підстановки на сервері протоколу LDAP: %s"
 
-#: fe-connect.c:5369
+#: fe-connect.c:5704
 #, c-format
 msgid "more than one entry found on LDAP lookup"
 msgstr "знайдено більше одного входження при підстановці протоколу LDAP"
 
-#: fe-connect.c:5371 fe-connect.c:5382
+#: fe-connect.c:5706 fe-connect.c:5717
 #, c-format
 msgid "no entry found on LDAP lookup"
 msgstr "не знайдено входження при підстановці протоколу LDAP"
 
-#: fe-connect.c:5392 fe-connect.c:5404
+#: fe-connect.c:5727 fe-connect.c:5739
 #, c-format
 msgid "attribute has no values on LDAP lookup"
 msgstr "атрибут не має значення при підстановці протоколу LDAP"
 
-#: fe-connect.c:5455 fe-connect.c:5474 fe-connect.c:5998
+#: fe-connect.c:5753
+#, c-format
+msgid "connection info string size exceeds the maximum allowed (%d)"
+msgstr "розмір рядка з'єднання з інформацією перевищує максимально дозволену (%d)"
+
+#: fe-connect.c:5804 fe-connect.c:5823 fe-connect.c:6347
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string"
 msgstr "відсутній \"=\" після \"%s\" у рядку інформації про підключення"
 
-#: fe-connect.c:5545 fe-connect.c:6181 fe-connect.c:6979
+#: fe-connect.c:5894 fe-connect.c:6530 fe-connect.c:7360
 #, c-format
 msgid "invalid connection option \"%s\""
 msgstr "неприпустимий параметр підключення \"%s\""
 
-#: fe-connect.c:5560 fe-connect.c:6046
+#: fe-connect.c:5909 fe-connect.c:6395
 #, c-format
 msgid "unterminated quoted string in connection info string"
 msgstr "відкриті лапки у рядку інформації про підключення"
 
-#: fe-connect.c:5640
+#: fe-connect.c:5989
 #, c-format
 msgid "definition of service \"%s\" not found"
 msgstr "не знайдено визначення сервера \"%s\""
 
-#: fe-connect.c:5666
+#: fe-connect.c:6015
 #, c-format
 msgid "service file \"%s\" not found"
 msgstr "не знайдено сервісний файл \"%s\""
 
-#: fe-connect.c:5679
+#: fe-connect.c:6028
 #, c-format
 msgid "line %d too long in service file \"%s\""
 msgstr "рядок %d занадто довгий у сервісному файлі \"%s\""
 
-#: fe-connect.c:5750 fe-connect.c:5793
+#: fe-connect.c:6099 fe-connect.c:6142
 #, c-format
 msgid "syntax error in service file \"%s\", line %d"
 msgstr "синтаксична помилка у сервісному файлі \"%s\", рядок %d"
 
-#: fe-connect.c:5761
+#: fe-connect.c:6110
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d"
 msgstr "вкладені сервісні специфікації не підтримуються у сервісному файлі \"%s\", рядок %d"
 
-#: fe-connect.c:6500
+#: fe-connect.c:6849
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\""
 msgstr "у внутрішню процедуру аналізу рядка передано помилковий URI: \"%s\""
 
-#: fe-connect.c:6577
+#: fe-connect.c:6926
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\""
 msgstr "досягнуто кінця рядка під час пошуку відповідного \"]\" в адресі IPv6 URI: \"%s\""
 
-#: fe-connect.c:6584
+#: fe-connect.c:6933
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\""
 msgstr "IPv6 адреса хоста не може бути порожньою в URI: \"%s\""
 
-#: fe-connect.c:6599
+#: fe-connect.c:6948
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\""
 msgstr "неочікуваний символ \"%c\" на позиції %d в URI (очікувалося \":\" або \"/\"): \"%s\""
 
-#: fe-connect.c:6728
+#: fe-connect.c:7077
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "зайвий розділювач ключа/значення \"=\" в параметрі запиту URI: \"%s\""
 
-#: fe-connect.c:6748
+#: fe-connect.c:7097
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\""
 msgstr "відсутній розділювач ключа/значення \"=\" у параметрі запиту URI: \"%s\""
 
-#: fe-connect.c:6800
+#: fe-connect.c:7149
 #, c-format
 msgid "invalid URI query parameter: \"%s\""
 msgstr "неприпустимий параметр запиту URI: \"%s\""
 
-#: fe-connect.c:6874
+#: fe-connect.c:7233
 #, c-format
 msgid "invalid percent-encoded token: \"%s\""
 msgstr "неприпустимий токен, закодований відсотками: \"%s\""
 
-#: fe-connect.c:6884
+#: fe-connect.c:7243
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\""
 msgstr "неприпустиме значення %%00 в відсотковому значенні: \"%s\""
 
-#: fe-connect.c:7248
+#: fe-connect.c:7265
+#, c-format
+msgid "unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead"
+msgstr "знайдено неочікувані пробіли в \"%s\", використовуйте пробіли, закодовані відсотками (%%20)"
+
+#: fe-connect.c:7641
 msgid "connection pointer is NULL\n"
 msgstr "нульове значення вказівника підключення \n"
 
-#: fe-connect.c:7256 fe-exec.c:710 fe-exec.c:972 fe-exec.c:3321
-#: fe-protocol3.c:969 fe-protocol3.c:1002
+#: fe-connect.c:7649 fe-exec.c:718 fe-exec.c:980 fe-exec.c:3475
+#: fe-protocol3.c:1006 fe-protocol3.c:1039
 msgid "out of memory\n"
 msgstr "недостатньо пам'яті\n"
 
-#: fe-connect.c:7547
+#: fe-connect.c:7951
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ПОПЕРЕДЖЕННЯ: файл паролів \"%s\" не є простим файлом\n"
 
-#: fe-connect.c:7556
+#: fe-connect.c:7961
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "ПОПЕРЕДЖЕННЯ: до файлу паролів \"%s\" мають доступ група або всі; дозволи мають бути u=rw (0600) або менше\n"
 
-#: fe-connect.c:7663
+#: fe-connect.c:8065
 #, c-format
 msgid "password retrieved from file \"%s\""
 msgstr "пароль отримано з файлу \"%s\""
 
-#: fe-exec.c:466 fe-exec.c:3395
+#: fe-connect.c:8231
+#, c-format
+msgid "invalid integer value \"%s\" for connection option \"%s\""
+msgstr "неприпустиме ціле значення \"%s\" для параметра з'єднання \"%s\""
+
+#: fe-exec.c:469 fe-exec.c:3549
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "число рядків %d поза діапазоном 0..%d"
 
-#: fe-exec.c:528 fe-protocol3.c:1971
+#: fe-exec.c:531 fe-protocol3.c:2140
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-exec.c:831
+#: fe-exec.c:839
 #, c-format
 msgid "write to server failed"
 msgstr "не вдалося записати на сервер"
 
-#: fe-exec.c:871
+#: fe-exec.c:879
 #, c-format
 msgid "no error text available"
 msgstr "немає доступного тексту помилки"
 
-#: fe-exec.c:960
+#: fe-exec.c:968
 msgid "NOTICE"
 msgstr "ПОВІДОМЛЕННЯ"
 
-#: fe-exec.c:1018
+#: fe-exec.c:1026
 msgid "PGresult cannot support more than INT_MAX tuples"
 msgstr "PGresult не може підтримувати більше ніж INT_MAX кортежів"
 
-#: fe-exec.c:1030
+#: fe-exec.c:1038
 msgid "size_t overflow"
 msgstr "переповнення size_t"
 
-#: fe-exec.c:1446 fe-exec.c:1515 fe-exec.c:1561
+#: fe-exec.c:1454 fe-exec.c:1523 fe-exec.c:1569
 #, c-format
 msgid "command string is a null pointer"
 msgstr "рядок команди є нульовим вказівником"
 
-#: fe-exec.c:1452 fe-exec.c:2883
+#: fe-exec.c:1460 fe-exec.c:3019
 #, c-format
 msgid "%s not allowed in pipeline mode"
 msgstr "%s не дозволено в режимі конвеєра"
 
-#: fe-exec.c:1520 fe-exec.c:1566 fe-exec.c:1660
+#: fe-exec.c:1528 fe-exec.c:1574 fe-exec.c:1668
 #, c-format
 msgid "number of parameters must be between 0 and %d"
 msgstr "кількість параметрів має бути між 0 і %d"
 
-#: fe-exec.c:1556 fe-exec.c:1655
+#: fe-exec.c:1564 fe-exec.c:1663
 #, c-format
 msgid "statement name is a null pointer"
 msgstr "ім’я оператора є пустим вказівником"
 
-#: fe-exec.c:1697 fe-exec.c:3241
+#: fe-exec.c:1705 fe-exec.c:3395
 #, c-format
 msgid "no connection to the server"
 msgstr "немає з'єднання з сервером"
 
-#: fe-exec.c:1705 fe-exec.c:3249
+#: fe-exec.c:1713 fe-exec.c:3403
 #, c-format
 msgid "another command is already in progress"
 msgstr "інша команда вже виконується"
 
-#: fe-exec.c:1735
+#: fe-exec.c:1743
 #, c-format
 msgid "cannot queue commands during COPY"
 msgstr "не можна поставити в чергу команди під час COPY"
 
-#: fe-exec.c:1852
+#: fe-exec.c:1862
 #, c-format
 msgid "length must be given for binary parameter"
 msgstr "для бінарного параметра має бути надана довжина"
 
-#: fe-exec.c:2166
+#: fe-exec.c:2221
 #, c-format
 msgid "unexpected asyncStatus: %d"
 msgstr "неочікуваний asyncStatus: %d"
 
-#: fe-exec.c:2322
+#: fe-exec.c:2377
 #, c-format
 msgid "synchronous command execution functions are not allowed in pipeline mode"
 msgstr "функції синхронного виконання команд заборонені в режимі конвеєра"
 
-#: fe-exec.c:2339
+#: fe-exec.c:2394
 msgid "COPY terminated by new PQexec"
 msgstr "COPY завершено новим PQexec"
 
-#: fe-exec.c:2355
+#: fe-exec.c:2410
 #, c-format
 msgid "PQexec not allowed during COPY BOTH"
 msgstr "PQexec не дозволяється під час COPY BOTH"
 
-#: fe-exec.c:2581 fe-exec.c:2636 fe-exec.c:2704 fe-protocol3.c:1902
+#: fe-exec.c:2646
+#, c-format
+msgid "unrecognized message type \"%c\""
+msgstr "нерозпізнаний тип повідомлення \"%c\""
+
+#: fe-exec.c:2718 fe-exec.c:2772 fe-exec.c:2840 fe-protocol3.c:2071
 #, c-format
 msgid "no COPY in progress"
 msgstr "немає COPY у процесі"
 
-#: fe-exec.c:2890
+#: fe-exec.c:3026
 #, c-format
 msgid "connection in wrong state"
 msgstr "підключення у неправильному стані"
 
-#: fe-exec.c:2933
+#: fe-exec.c:3069
 #, c-format
 msgid "cannot enter pipeline mode, connection not idle"
 msgstr "не можна увійти в режим конвеєра, підключення не в очікуванні"
 
-#: fe-exec.c:2969 fe-exec.c:2990
+#: fe-exec.c:3105 fe-exec.c:3126
 #, c-format
 msgid "cannot exit pipeline mode with uncollected results"
 msgstr "не можна вийти з режиму конвеєра з незібраними результатами"
 
-#: fe-exec.c:2973
+#: fe-exec.c:3109
 #, c-format
 msgid "cannot exit pipeline mode while busy"
 msgstr "не можна вийти з режиму конвеєра, коли зайнято"
 
-#: fe-exec.c:2984
+#: fe-exec.c:3120
 #, c-format
 msgid "cannot exit pipeline mode while in COPY"
 msgstr "не можна вийти з режиму конвеєра під час COPY"
 
-#: fe-exec.c:3175
+#: fe-exec.c:3319
 #, c-format
 msgid "cannot send pipeline when not in pipeline mode"
 msgstr "неможливо скористатися конвеєром не у режимі конвеєра"
 
-#: fe-exec.c:3284
+#: fe-exec.c:3438
 msgid "invalid ExecStatusType code"
 msgstr "неприпустимий код ExecStatusType"
 
-#: fe-exec.c:3311
+#: fe-exec.c:3465
 msgid "PGresult is not an error result\n"
 msgstr "PGresult не є помилковим результатом\n"
 
-#: fe-exec.c:3379 fe-exec.c:3402
+#: fe-exec.c:3533 fe-exec.c:3556
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "число стовпців %d поза діапазоном 0..%d"
 
-#: fe-exec.c:3417
+#: fe-exec.c:3571
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "число параметрів %d поза діапазоном 0..%d"
 
-#: fe-exec.c:3728
+#: fe-exec.c:3882
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "не вдалося інтерпретувати результат від сервера: %s"
 
-#: fe-exec.c:3993 fe-exec.c:4083
+#: fe-exec.c:4157 fe-exec.c:4292
 #, c-format
 msgid "incomplete multibyte character"
 msgstr "неповний мультибайтний символ"
 
+#: fe-exec.c:4159 fe-exec.c:4311
+#, c-format
+msgid "invalid multibyte character"
+msgstr "неприпустимий мультибайтний символ"
+
+#: fe-exec.c:4413
+#, c-format
+msgid "escaped string size exceeds the maximum allowed (%zu)"
+msgstr "довжина екранованого рядка перевищує максимально допустиму (%zu)"
+
+#: fe-exec.c:4590
+#, c-format
+msgid "escaped bytea size exceeds the maximum allowed (%zu)"
+msgstr "розмір bytea перевищує максимальний допустимий розмір (%zu)"
+
 #: fe-gssapi-common.c:122
 msgid "GSSAPI name import error"
 msgstr "Помилка імпорту імені у GSSAPI"
@@ -978,23 +1479,18 @@ msgstr "неможливо записати до файлу \"%s\": %s"
 msgid "query to initialize large object functions did not return data"
 msgstr "запит на ініціалізацію функцій для великих об’єктів не повернув дані"
 
-#: fe-misc.c:240
+#: fe-misc.c:239
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "pqGetInt не підтримує ціле число розміром %lu"
 
-#: fe-misc.c:273
+#: fe-misc.c:272
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "pqPutInt не підтримує ціле число розміром %lu"
 
-#: fe-misc.c:573
-#, c-format
-msgid "connection not open"
-msgstr "підключення не відкрито"
-
-#: fe-misc.c:751 fe-secure-openssl.c:210 fe-secure-openssl.c:316
-#: fe-secure.c:259 fe-secure.c:426
+#: fe-misc.c:791 fe-secure-openssl.c:181 fe-secure-openssl.c:287
+#: fe-secure.c:222 fe-secure.c:389
 #, c-format
 msgid "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -1002,174 +1498,215 @@ msgid "server closed the connection unexpectedly\n"
 msgstr "сервер неочікувано закрив підключення\n"
 " Це може означати, що сервер завершив роботу ненормально до або під час обробки запиту."
 
-#: fe-misc.c:818
+#: fe-misc.c:858
 msgid "connection not open\n"
 msgstr "підключення не відкрито\n"
 
-#: fe-misc.c:1003
+#: fe-misc.c:1046
 #, c-format
 msgid "timeout expired"
 msgstr "час очікування минув"
 
-#: fe-misc.c:1047
+#: fe-misc.c:1098
 #, c-format
 msgid "invalid socket"
 msgstr "неприпустимий сокет"
 
-#: fe-misc.c:1069
+#: fe-misc.c:1121
 #, c-format
 msgid "%s() failed: %s"
 msgstr "%s() помилка: %s"
 
-#: fe-protocol3.c:182
+#: fe-protocol3.c:190
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "отримано тип повідомлення 0x%02x від сервера під час бездіяльності"
 
-#: fe-protocol3.c:380
+#: fe-protocol3.c:403
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "сервер передав дані (повідомлення \"D\") без попереднього опису рядка (повідомлення \"T\")"
 
-#: fe-protocol3.c:422
+#: fe-protocol3.c:445
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\""
 msgstr "неочікувана відповідь від сервера; перший отриманий символ був \"%c\""
 
-#: fe-protocol3.c:445
+#: fe-protocol3.c:469
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\""
 msgstr "вміст повідомлення не відповідає довжині у типі повідомлення \"%c\""
 
-#: fe-protocol3.c:463
+#: fe-protocol3.c:504
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d"
 msgstr "втрачено синхронізацію з сервером: отримано тип повідомлення \"%c\", довжина %d"
 
-#: fe-protocol3.c:515 fe-protocol3.c:555
+#: fe-protocol3.c:551 fe-protocol3.c:591
 msgid "insufficient data in \"T\" message"
 msgstr "недостатньо даних у повідомленні \"T\""
 
-#: fe-protocol3.c:626 fe-protocol3.c:832
+#: fe-protocol3.c:662 fe-protocol3.c:868
 msgid "out of memory for query result"
 msgstr "недостатньо пам'яті для результату запиту"
 
-#: fe-protocol3.c:695
+#: fe-protocol3.c:731
 msgid "insufficient data in \"t\" message"
 msgstr "недостатньо даних у повідомленні \"t\""
 
-#: fe-protocol3.c:754 fe-protocol3.c:786 fe-protocol3.c:804
+#: fe-protocol3.c:790 fe-protocol3.c:822 fe-protocol3.c:840
 msgid "insufficient data in \"D\" message"
 msgstr "зайві дані у повідомленні \"D\""
 
-#: fe-protocol3.c:760
+#: fe-protocol3.c:796
 msgid "unexpected field count in \"D\" message"
 msgstr "неочікувана кількість полів у повідомленні \"D\""
 
-#: fe-protocol3.c:1015
+#: fe-protocol3.c:1052
 msgid "no error message available\n"
 msgstr "немає доступного повідомлення про помилку\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:1063 fe-protocol3.c:1082
+#: fe-protocol3.c:1100 fe-protocol3.c:1119
 #, c-format
 msgid " at character %s"
 msgstr " в символі %s"
 
-#: fe-protocol3.c:1095
+#: fe-protocol3.c:1132
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "ДЕТАЛІ:   %s\n"
 
-#: fe-protocol3.c:1098
+#: fe-protocol3.c:1135
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "ПІДКАЗКА:  %s\n"
 
-#: fe-protocol3.c:1101
+#: fe-protocol3.c:1138
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "ЗАПИТ:  %s\n"
 
-#: fe-protocol3.c:1108
+#: fe-protocol3.c:1145
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "КОНТЕКСТ:  %s\n"
 
-#: fe-protocol3.c:1117
+#: fe-protocol3.c:1154
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "ІМ'Я СХЕМИ:  %s\n"
 
-#: fe-protocol3.c:1121
+#: fe-protocol3.c:1158
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "ІМ'Я ТАБЛИЦІ:  %s\n"
 
-#: fe-protocol3.c:1125
+#: fe-protocol3.c:1162
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "ІМ'Я СТОВПЦЯ:  %s\n"
 
-#: fe-protocol3.c:1129
+#: fe-protocol3.c:1166
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "ІМ'Я ТИПУ ДАНИХ:  %s\n"
 
-#: fe-protocol3.c:1133
+#: fe-protocol3.c:1170
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "ІМ'Я ОБМЕЖЕННЯ:  %s\n"
 
-#: fe-protocol3.c:1145
+#: fe-protocol3.c:1182
 msgid "LOCATION:  "
 msgstr "РОЗТАШУВАННЯ:  "
 
-#: fe-protocol3.c:1147
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:1149
+#: fe-protocol3.c:1186
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1344
+#: fe-protocol3.c:1394
 #, c-format
 msgid "LINE %d: "
 msgstr "РЯДОК %d: "
 
-#: fe-protocol3.c:1418
+#: fe-protocol3.c:1456
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to a higher-numbered version"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер запросив пониження до вищої версії"
+
+#: fe-protocol3.c:1462
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to pre-3.0 protocol version"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер запросив пониження до протоколу версії 3.0 і раніше"
+
+#: fe-protocol3.c:1469
+#, c-format
+msgid "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер запросив пониження до неіснуючої версії 3.1 протоколу"
+
+#: fe-protocol3.c:1475
+#, c-format
+msgid "received invalid protocol negotiation message: server reported negative number of unsupported parameters"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер повідомив негативну кількість непідтримуваних параметрів"
+
+#: fe-protocol3.c:1481
+#, c-format
+msgid "received invalid protocol negotiation message: server negotiated but asks for no changes"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер провів узгодження, але не просить жодних змін"
+
+#: fe-protocol3.c:1487
+#, c-format
+msgid "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d"
+msgstr "сервер підтримує лише версію протоколу %d.%d, але \"%s\" було встановлено на %d.%d"
+
+#: fe-protocol3.c:1512
+#, c-format
+msgid "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер повідомив непідтримувану назву параметра без префіксу \"%s\" (\"%s\")"
+
+#: fe-protocol3.c:1515
+#, c-format
+msgid "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: сервер повідомив непідтримуваний параметр, який не був запитаний (\"%s\")"
+
+#: fe-protocol3.c:1522
+#, c-format
+msgid "received invalid protocol negotiation message: message too short"
+msgstr "отримано неправильне повідомлення про узгодження протоколу: повідомлення занадто коротке"
+
+#: fe-protocol3.c:1588
 #, c-format
-msgid "protocol version not supported by server: client uses %u.%u, server supports up to %u.%u"
-msgstr "Версія протоколу не підтримується сервером: клієнт використовує %u.%u, сервер підтримує %u.%u"
+msgid "received invalid BackendKeyData message: cancel key with length %d not allowed in protocol version 3.0 (must be 4 bytes)"
+msgstr "отримано неправильне повідомлення BackendKeyData: ключ скасування з довжиною %d не дозволено для протоколу версії 3.0 (має бути 4 байти)"
 
-#: fe-protocol3.c:1424
+#: fe-protocol3.c:1595
 #, c-format
-msgid "protocol extension not supported by server: %s"
-msgid_plural "protocol extensions not supported by server: %s"
-msgstr[0] "розширення протоколу не підтримується сервером: %s"
-msgstr[1] "розширення протоколів не підтримується сервером: %s"
-msgstr[2] "розширення протоколів не підтримується сервером: %s"
-msgstr[3] "розширення протоколів не підтримується сервером: %s"
+msgid "received invalid BackendKeyData message: cancel key with length %d is too short (minimum 4 bytes)"
+msgstr "отримано неправильне повідомлення BackendKeyData: ключ скасування з довжиною %d занадто короткий (мінімум 4 байти)"
 
-#: fe-protocol3.c:1432
+#: fe-protocol3.c:1602
 #, c-format
-msgid "invalid %s message"
-msgstr "неприпустиме %s повідомлення"
+msgid "received invalid BackendKeyData message: cancel key with length %d is too long (maximum 256 bytes)"
+msgstr "отримано неправильне повідомлення BackendKeyData: ключ скасування з довжиною %d занадто довгий (максимум 256 байтів)"
 
-#: fe-protocol3.c:1797
+#: fe-protocol3.c:1966
 #, c-format
 msgid "PQgetline: not doing text COPY OUT"
 msgstr "PQgetline: не викликати для текстового COPY OUT"
 
-#: fe-protocol3.c:2171
+#: fe-protocol3.c:2341
 #, c-format
 msgid "protocol error: no function result"
 msgstr "помилка протоколу: результат функції відсутній"
 
-#: fe-protocol3.c:2182
+#: fe-protocol3.c:2353
 #, c-format
 msgid "protocol error: id=0x%x"
 msgstr "помилка протоколу: id=0x%x"
@@ -1213,251 +1750,282 @@ msgstr "серверний сертифікат \"%s\" не співпадає 
 msgid "could not get server's host name from server certificate"
 msgstr "не вдалося отримати ім'я хосту від серверного сертифікату"
 
-#: fe-secure-gssapi.c:194
+#: fe-secure-gssapi.c:201
 msgid "GSSAPI wrap error"
 msgstr "помилка при згортанні GSSAPI"
 
-#: fe-secure-gssapi.c:201
+#: fe-secure-gssapi.c:208
 #, c-format
 msgid "outgoing GSSAPI message would not use confidentiality"
 msgstr "вихідне повідомлення GSSAPI не буде використовувати конфіденційність"
 
-#: fe-secure-gssapi.c:208
+#: fe-secure-gssapi.c:215 fe-secure-gssapi.c:726
 #, c-format
 msgid "client tried to send oversize GSSAPI packet (%zu > %zu)"
 msgstr "клієнт намагався відправити переповнений пакет GSSAPI (%zu > %zu)"
 
-#: fe-secure-gssapi.c:347 fe-secure-gssapi.c:589
+#: fe-secure-gssapi.c:354 fe-secure-gssapi.c:602
 #, c-format
 msgid "oversize GSSAPI packet sent by the server (%zu > %zu)"
 msgstr "переповнений пакет GSSAPI відправлений сервером (%zu > %zu)"
 
-#: fe-secure-gssapi.c:386
+#: fe-secure-gssapi.c:393
 msgid "GSSAPI unwrap error"
 msgstr "помилка при розгортанні GSSAPI"
 
-#: fe-secure-gssapi.c:395
+#: fe-secure-gssapi.c:402
 #, c-format
 msgid "incoming GSSAPI message did not use confidentiality"
 msgstr "вхідне повідомлення GSSAPI не використовувало конфіденційність"
 
-#: fe-secure-gssapi.c:652
+#: fe-secure-gssapi.c:665
 msgid "could not initiate GSSAPI security context"
 msgstr "не вдалося ініціювати контекст безпеки GSSAPI"
 
-#: fe-secure-gssapi.c:681
+#: fe-secure-gssapi.c:715
 msgid "GSSAPI size check error"
 msgstr "помилка перевірки розміру GSSAPI"
 
-#: fe-secure-gssapi.c:692
-msgid "GSSAPI context establishment error"
-msgstr "помилка встановлення контексту GSSAPI"
-
-#: fe-secure-openssl.c:214 fe-secure-openssl.c:320 fe-secure-openssl.c:1518
+#: fe-secure-openssl.c:185 fe-secure-openssl.c:291 fe-secure-openssl.c:1382
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "Помилка SSL SYSCALL: %s"
 
-#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1521
+#: fe-secure-openssl.c:191 fe-secure-openssl.c:297 fe-secure-openssl.c:1385
 #, c-format
 msgid "SSL SYSCALL error: EOF detected"
 msgstr "Помилка SSL SYSCALL: виявлено EOF"
 
-#: fe-secure-openssl.c:230 fe-secure-openssl.c:336 fe-secure-openssl.c:1529
+#: fe-secure-openssl.c:201 fe-secure-openssl.c:307 fe-secure-openssl.c:1393
 #, c-format
 msgid "SSL error: %s"
 msgstr "Помилка SSL: %s"
 
-#: fe-secure-openssl.c:244 fe-secure-openssl.c:350
+#: fe-secure-openssl.c:215 fe-secure-openssl.c:321
 #, c-format
 msgid "SSL connection has been closed unexpectedly"
 msgstr "SSL-з'єднання було несподівано перервано"
 
-#: fe-secure-openssl.c:249 fe-secure-openssl.c:355 fe-secure-openssl.c:1576
+#: fe-secure-openssl.c:220 fe-secure-openssl.c:326 fe-secure-openssl.c:1440
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "нерозпізнаний код помилки SSL: %d"
 
-#: fe-secure-openssl.c:398
+#: fe-secure-openssl.c:368
 #, c-format
 msgid "could not determine server certificate signature algorithm"
 msgstr "не вдалося визначити алгоритм підпису сервера сертифіката"
 
-#: fe-secure-openssl.c:418
+#: fe-secure-openssl.c:388
 #, c-format
 msgid "could not find digest for NID %s"
 msgstr "не вдалося знайти дайджест для NID %s"
 
-#: fe-secure-openssl.c:427
+#: fe-secure-openssl.c:397
 #, c-format
 msgid "could not generate peer certificate hash"
 msgstr "не вдалося згенерувати хеш сертифікату вузла"
 
-#: fe-secure-openssl.c:510
+#: fe-secure-openssl.c:479
 #, c-format
 msgid "SSL certificate's name entry is missing"
 msgstr "Відсутня ім'я в сертифікаті SSL"
 
-#: fe-secure-openssl.c:544
+#: fe-secure-openssl.c:509
 #, c-format
 msgid "SSL certificate's address entry is missing"
 msgstr "відсутній елемент адреси SSL-сертифікату"
 
-#: fe-secure-openssl.c:946
+#: fe-secure-openssl.c:715
+#, c-format
+msgid "WARNING: could not open SSL key logging file \"%s\": %m\n"
+msgstr "ПОПЕРЕДЖЕННЯ: не вдалося відкрити файл логування SSL ключів \"%s\": %m\n"
+
+#: fe-secure-openssl.c:723
+#, c-format
+msgid "WARNING: could not write to SSL key logging file \"%s\": %m\n"
+msgstr "ПОПЕРЕДЖЕННЯ: не вдалося записати до файлу логування SSL ключів \"%s\": %m\n"
+
+#: fe-secure-openssl.c:776
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "не вдалося створити контекст SSL: %s"
 
-#: fe-secure-openssl.c:988
+#: fe-secure-openssl.c:818
 #, c-format
 msgid "invalid value \"%s\" for minimum SSL protocol version"
 msgstr "неприпустиме значення \"%s\" для мінімальної версії протоколу SSL"
 
-#: fe-secure-openssl.c:998
+#: fe-secure-openssl.c:828
 #, c-format
 msgid "could not set minimum SSL protocol version: %s"
 msgstr "не вдалося встановити мінімальну версію протоколу SSL: %s"
 
-#: fe-secure-openssl.c:1014
+#: fe-secure-openssl.c:844
 #, c-format
 msgid "invalid value \"%s\" for maximum SSL protocol version"
 msgstr "неприпустиме значення \"%s\" для максимальної версії протоколу SSL"
 
-#: fe-secure-openssl.c:1024
+#: fe-secure-openssl.c:854
 #, c-format
 msgid "could not set maximum SSL protocol version: %s"
 msgstr "не вдалося встановити максимальну версію протоколу SSL: %s"
 
-#: fe-secure-openssl.c:1062
+#: fe-secure-openssl.c:892
 #, c-format
 msgid "could not load system root certificate paths: %s"
 msgstr "не вдалося завантажити шляхи кореневого сертифікату системи: %s"
 
-#: fe-secure-openssl.c:1079
+#: fe-secure-openssl.c:909
 #, c-format
 msgid "could not read root certificate file \"%s\": %s"
 msgstr "не вдалося прочитати файл кореневого сертифікату \"%s\": %s"
 
-#: fe-secure-openssl.c:1131
+#: fe-secure-openssl.c:961
 #, c-format
 msgid "could not get home directory to locate root certificate file\n"
 "Either provide the file, use the system's trusted roots with sslrootcert=system, or change sslmode to disable server certificate verification."
 msgstr "не вдалося отримати домашній каталог, щоб знайти файл кореневого сертифікату\n"
 "Надайте файл, використайте системні кореневі за допомогою sslrootcert=system, або змініть sslmode, щоб вимкнути перевірку серверного сертифікату."
 
-#: fe-secure-openssl.c:1134
+#: fe-secure-openssl.c:964
 #, c-format
 msgid "root certificate file \"%s\" does not exist\n"
 "Either provide the file, use the system's trusted roots with sslrootcert=system, or change sslmode to disable server certificate verification."
 msgstr "файл кореневого сертифікату \"%s\" не існує\n"
 "Надайте файл, використайте системні кореневі за допомогою sslrootcert=system, або змініть sslmode, щоб вимкнути перевірку серверного сертифікату."
 
-#: fe-secure-openssl.c:1169
+#: fe-secure-openssl.c:999
 #, c-format
 msgid "could not open certificate file \"%s\": %s"
 msgstr "не вдалося відкрити файл сертифікату \"%s\": %s"
 
-#: fe-secure-openssl.c:1187
+#: fe-secure-openssl.c:1017
 #, c-format
 msgid "could not read certificate file \"%s\": %s"
 msgstr "не вдалося прочитати файл сертифікату \"%s\": %s"
 
-#: fe-secure-openssl.c:1211
+#: fe-secure-openssl.c:1041
 #, c-format
 msgid "could not establish SSL connection: %s"
 msgstr "не вдалося встановити SSL-підключення: %s"
 
-#: fe-secure-openssl.c:1243
+#: fe-secure-openssl.c:1058
+#, c-format
+msgid "WARNING: sslkeylogfile support requires OpenSSL\n"
+msgstr "ПОПЕРЕДЖЕННЯ: підтримка sslkeylogfile вимагає OpenSSL\n"
+
+#: fe-secure-openssl.c:1060
+#, c-format
+msgid "WARNING: libpq was not built with sslkeylogfile support\n"
+msgstr "ПОПЕРЕДЖЕННЯ: libpq було скомпільовано без підтримки sslkeylogfile\n"
+
+#: fe-secure-openssl.c:1090
 #, c-format
 msgid "could not set SSL Server Name Indication (SNI): %s"
 msgstr "не вдалося встановити позначку назви сервера SSL (SNI): %s"
 
-#: fe-secure-openssl.c:1286
+#: fe-secure-openssl.c:1107
+#, c-format
+msgid "could not set SSL ALPN extension: %s"
+msgstr "не вдалося встановити розширення SSL ALPN: %s"
+
+#: fe-secure-openssl.c:1150
 #, c-format
 msgid "could not load SSL engine \"%s\": %s"
 msgstr "не вдалося завантажити модуль SSL \"%s\": %s"
 
-#: fe-secure-openssl.c:1297
+#: fe-secure-openssl.c:1161
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s"
 msgstr "не вдалося ініціалізувати модуль SSL \"%s\": %s"
 
-#: fe-secure-openssl.c:1312
+#: fe-secure-openssl.c:1176
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "не вдалося прочитати закритий ключ SSL \"%s\" з модуля \"%s\": %s"
 
-#: fe-secure-openssl.c:1325
+#: fe-secure-openssl.c:1189
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s"
 msgstr "не вдалося завантажити закритий ключ SSL \"%s\" з модуля \"%s\": %s"
 
-#: fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:1226
 #, c-format
 msgid "certificate present, but not private key file \"%s\""
 msgstr "сертифікат присутній, але файл закритого ключа \"%s\" ні"
 
-#: fe-secure-openssl.c:1365
+#: fe-secure-openssl.c:1229
 #, c-format
 msgid "could not stat private key file \"%s\": %m"
 msgstr "не вдалося отримати інформацію про файл закритого ключа\"%s\": %m"
 
-#: fe-secure-openssl.c:1373
+#: fe-secure-openssl.c:1237
 #, c-format
 msgid "private key file \"%s\" is not a regular file"
 msgstr "файл закритого ключа \"%s\" не є звичайним"
 
-#: fe-secure-openssl.c:1406
+#: fe-secure-openssl.c:1270
 #, c-format
 msgid "private key file \"%s\" has group or world access; file must have permissions u=rw (0600) or less if owned by the current user, or permissions u=rw,g=r (0640) or less if owned by root"
 msgstr "файл закритого ключа \"%s\" має груповий або загальний доступ; файл повинен мати права u=rw (0600) або менше, якщо він належить поточному користувачу, або права u=rw,g=r (0640) або менше, якщо належить root"
 
-#: fe-secure-openssl.c:1430
+#: fe-secure-openssl.c:1294
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "не вдалось завантажити файл закритого ключа \"%s\": %s"
 
-#: fe-secure-openssl.c:1446
+#: fe-secure-openssl.c:1310
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s"
 msgstr "сертифікат не відповідає файлу закритого ключа \"%s\": %s"
 
-#: fe-secure-openssl.c:1515
+#: fe-secure-openssl.c:1379
 #, c-format
 msgid "SSL error: certificate verify failed: %s"
 msgstr "помилка SSL: помилка перевірки сертифіката %s"
 
-#: fe-secure-openssl.c:1560
+#: fe-secure-openssl.c:1424
 #, c-format
 msgid "This may indicate that the server does not support any SSL protocol version between %s and %s."
 msgstr "Це може вказувати, що сервер не підтримує жодної версії протоколу SSL між %s і %s."
 
-#: fe-secure-openssl.c:1593
+#: fe-secure-openssl.c:1456
+#, c-format
+msgid "direct SSL connection was established without ALPN protocol negotiation extension"
+msgstr "пряме SSL підключення було встановлено без розширення протоколу ALPN"
+
+#: fe-secure-openssl.c:1468
+#, c-format
+msgid "SSL connection was established with unexpected ALPN protocol"
+msgstr "SSL підключення було встановлено з неочікуваним протоколом ALPN"
+
+#: fe-secure-openssl.c:1485
 #, c-format
 msgid "certificate could not be obtained: %s"
 msgstr "не вдалося отримати сертифікат: %s"
 
-#: fe-secure-openssl.c:1698
+#: fe-secure-openssl.c:1564
 #, c-format
 msgid "no SSL error reported"
 msgstr "немає повідомлення про помилку SSL"
 
-#: fe-secure-openssl.c:1707
+#: fe-secure-openssl.c:1607
 #, c-format
 msgid "SSL error code %lu"
 msgstr "Код помилки SSL %lu"
 
-#: fe-secure-openssl.c:1997
+#: fe-secure-openssl.c:1909
 #, c-format
 msgid "WARNING: sslpassword truncated\n"
 msgstr "ПОПЕРЕДЖЕННЯ: sslpassword скорочено\n"
 
-#: fe-secure.c:270
+#: fe-secure.c:233
 #, c-format
 msgid "could not receive data from server: %s"
 msgstr "не вдалося отримати дані з серверу: %s"
 
-#: fe-secure.c:441
+#: fe-secure.c:404
 #, c-format
 msgid "could not send data to server: %s"
 msgstr "не вдалося передати дані серверу: %s"
diff --git a/src/interfaces/libpq/posix_ivysema.c b/src/interfaces/libpq/posix_ivysema.c
index 767514da315..2c47d445d6d 100644
--- a/src/interfaces/libpq/posix_ivysema.c
+++ b/src/interfaces/libpq/posix_ivysema.c
@@ -3,7 +3,7 @@
  * posix_ivysema.c s based on posix_sema.c
  *	  Implement PGSemaphores using POSIX semaphore facilities
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/interfaces/libpq/posix_ivysema.c
diff --git a/src/interfaces/libpq/sysv_ivysema.c b/src/interfaces/libpq/sysv_ivysema.c
index 94a80d80c68..2526beca808 100644
--- a/src/interfaces/libpq/sysv_ivysema.c
+++ b/src/interfaces/libpq/sysv_ivysema.c
@@ -3,7 +3,7 @@
  * sysv_ivysema.c copy from sysv_sema.c
  *	  Implement PGSemaphores using SysV semaphore facilities
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/interfaces/libpq/sysv_ivysema.c
diff --git a/src/interfaces/libpq/t/006_service.pl b/src/interfaces/libpq/t/006_service.pl
index 4fe5adc5c2a..3ccd9a06e63 100644
--- a/src/interfaces/libpq/t/006_service.pl
+++ b/src/interfaces/libpq/t/006_service.pl
@@ -22,18 +22,14 @@
 
 my $td = PostgreSQL::Test::Utils::tempdir;
 
-# Windows vs non-Windows: CRLF vs LF for the file's newline, relying on
-# the fact that libpq uses fgets() when reading the lines of a service file.
-my $newline = $windows_os ? "\r\n" : "\n";
-
 # Create the set of service files used in the tests.
 # File that includes a valid service name, and uses a decomposed connection
 # string for its contents, split on spaces.
 my $srvfile_valid = "$td/pg_service_valid.conf";
-append_to_file($srvfile_valid, "[my_srv]" . $newline);
+append_to_file($srvfile_valid, "[my_srv]\n");
 foreach my $param (split(/\s+/, $node->connstr))
 {
-	append_to_file($srvfile_valid, $param . $newline);
+	append_to_file($srvfile_valid, $param . "\n");
 }
 
 # File defined with no contents, used as default value for PGSERVICEFILE,
diff --git a/src/interfaces/libpq/win32_ivysema.c b/src/interfaces/libpq/win32_ivysema.c
index 32a29522b43..b9680b469cf 100644
--- a/src/interfaces/libpq/win32_ivysema.c
+++ b/src/interfaces/libpq/win32_ivysema.c
@@ -3,7 +3,7 @@
  * win32_ivysema.c copy from win32_sema.c
  *	  Microsoft Windows Win32 Semaphores Emulation
  *
- * Portions Copyright (c) 2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2025-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/interfaces/libpq/win32_ivysema.c
diff --git a/src/meson.build b/src/meson.build
index cc46cf23248..a2fbbcda266 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 # libraries that other subsystems might depend upon first, in their respective
diff --git a/src/nls-global.mk b/src/nls-global.mk
index dfff472cb3f..73a6db10a1d 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -142,8 +142,13 @@ init-po: po/$(CATALOG_NAME).pot
 # For performance reasons, only calculate these when the user actually
 # requested update-po or a specific file.
 ifneq (,$(filter update-po %.po.new,$(MAKECMDGOALS)))
+ifdef PGXS
+ALL_LANGUAGES := $(shell find . -name '*.po' -print | sed 's,^.*/\([^/]*\).po$$,\1,' | LC_ALL=C sort -u)
+all_compendia := $(shell find . -name '*.po' -print | LC_ALL=C sort)
+else
 ALL_LANGUAGES := $(shell find $(top_srcdir) -name '*.po' -print | sed 's,^.*/\([^/]*\).po$$,\1,' | LC_ALL=C sort -u)
 all_compendia := $(shell find $(top_srcdir) -name '*.po' -print | LC_ALL=C sort)
+endif
 else
 ALL_LANGUAGES = $(AVAIL_LANGUAGES)
 all_compendia = FORCE
diff --git a/src/oracle_fe_utils/.gitignore b/src/oracle_fe_utils/.gitignore
new file mode 100644
index 00000000000..779f109db2e
--- /dev/null
+++ b/src/oracle_fe_utils/.gitignore
@@ -0,0 +1 @@
+/ora_psqlscan.c
diff --git a/src/oracle_fe_utils/Makefile b/src/oracle_fe_utils/Makefile
index aa41bb38883..7acf01aedbd 100644
--- a/src/oracle_fe_utils/Makefile
+++ b/src/oracle_fe_utils/Makefile
@@ -18,7 +18,7 @@
 # This makefile generates a static library, liborafeutils.a,
 # for use by client applications
 #
-# Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Copyright (c) 2023-2026, IvorySQL Global Development Team
 # IDENTIFICATION
 #    src/oracle_fe_utils/Makefile
 #
diff --git a/src/oracle_fe_utils/ora_psqlscan.l b/src/oracle_fe_utils/ora_psqlscan.l
index b43a7ebafdc..30dff52eb19 100644
--- a/src/oracle_fe_utils/ora_psqlscan.l
+++ b/src/oracle_fe_utils/ora_psqlscan.l
@@ -25,7 +25,7 @@
  *
  *
  * Copyright:
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -416,6 +416,7 @@ other			.
 
 {xcstart}		{
 					cur_state->xcdepth = 0;
+					cur_state->xcstate = true;
 					BEGIN(xc);
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
@@ -435,11 +436,14 @@ other			.
 				}
 
 {xcstop}		{
+					ECHO;
 					if (cur_state->xcdepth <= 0)
+					{
+						cur_state->xcstate = false;
 						BEGIN(INITIAL);
+					}
 					else
 						cur_state->xcdepth--;
-					ECHO;
 				}
 
 {xcinside}		{
@@ -779,6 +783,7 @@ other			.
 						cur_state->anonymous_label_start = false;
 						cur_state->anonymous_label_ident = false;
 						cur_state->anonymous_label_end = false;
+						cur_state->xcstate = false;
 						cur_state->start_state = YY_START;
 						cur_state->token_count = 0;
 						cur_state->token_cursor_idx = 0;
@@ -807,6 +812,7 @@ other			.
 						cur_state->anonymous_label_start = false;
 						cur_state->anonymous_label_ident = false;
 						cur_state->anonymous_label_end = false;
+						cur_state->xcstate = false;
 						cur_state->token_cursor_idx = 0;
 						cur_state->token_count = 0;
 						cur_state->start_state = YY_START;
@@ -1452,16 +1458,10 @@ ora_psql_scan_reset(PsqlScanState state)
 	state->anonymous_label_start = false;
 	state->anonymous_label_ident = false;
 	state->anonymous_label_end = false;
+	state->xcstate = false;
 	state->token_count = 0;
 	state->token_cursor_idx = 0;
 	state->ora_plsql_expect_end_symbol = END_SYMBOL_INVALID;
-	/* TODO:
-	 * need free if psqlpluscmd is not null ?
-	 * or copy it using state->psqlpluscmd if it not null
-	 * and we free it within psql_scan_finish, late free
-	 * the copy again.
-	 * we need make a function for free psqlpluscmd.
-	 */
 	state->psqlpluscmd = NULL;
 	state->literalbuf = NULL;
 	state->literallen= 0;
@@ -1683,7 +1683,7 @@ ora_psqlscan_emit(PsqlScanState state, const char *txt, int len)
 			break;
 	}
 
-	if (idx != len)
+	if (idx != len && !state->xcstate)
 	{
 		/*
 		 * the anonymous block start with <<label>>
@@ -1869,7 +1869,7 @@ is_oracle_slash(PsqlScanState state, const char *line)
 				len = strlen(line);
 				for (i = 0; i < len; i++)
 				{
-					/* allowed special char */
+					/* allow special char */
 					if (line[i] == '\t' ||
 						line[i] == '\n' ||
 						line[i] == '\r' ||
diff --git a/src/oracle_fe_utils/ora_string_utils.c b/src/oracle_fe_utils/ora_string_utils.c
index b7c7cf68253..7b9280f1be5 100644
--- a/src/oracle_fe_utils/ora_string_utils.c
+++ b/src/oracle_fe_utils/ora_string_utils.c
@@ -8,7 +8,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/oracle_fe_utils/ora_string_utils.c
  *
diff --git a/src/oracle_test/Makefile b/src/oracle_test/Makefile
index 456f370985e..6d26f7d1b54 100644
--- a/src/oracle_test/Makefile
+++ b/src/oracle_test/Makefile
@@ -5,7 +5,7 @@
 #
 # Makefile for src/oracle_test/authentication
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 1994, Regents of the University of California
 #
 # src/oracle_test/authentication/Makefile
diff --git a/src/oracle_test/authentication/Makefile b/src/oracle_test/authentication/Makefile
index 9832aa6316f..dbc45e0bbda 100644
--- a/src/oracle_test/authentication/Makefile
+++ b/src/oracle_test/authentication/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/oracle_test/authentication
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
diff --git a/src/oracle_test/examples/testlo.c b/src/oracle_test/examples/testlo.c
index 437ae52d404..840ce27c0c9 100644
--- a/src/oracle_test/examples/testlo.c
+++ b/src/oracle_test/examples/testlo.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/oracle_test/examples/testlo64.c b/src/oracle_test/examples/testlo64.c
index fd2e0d840b2..9bf176bf80b 100644
--- a/src/oracle_test/examples/testlo64.c
+++ b/src/oracle_test/examples/testlo64.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/oracle_test/isolation/expected/eval-plan-qual.out b/src/oracle_test/isolation/expected/eval-plan-qual.out
index fcb7c601717..5d64a02dcc3 100644
--- a/src/oracle_test/isolation/expected/eval-plan-qual.out
+++ b/src/oracle_test/isolation/expected/eval-plan-qual.out
@@ -1218,6 +1218,100 @@ subid|id
 (1 row)
 
 
+starting permutation: tid1 tid2 c1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tid2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tid2: <... completed>
+accountid|balance
+---------+-------
+(0 rows)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    700|    1400
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tid1 tidsucceed2 c1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tidsucceed2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' OR ctid = '(0,3)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tidsucceed2: <... completed>
+accountid|balance
+---------+-------
+checking |    900
+(1 row)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    900|    1800
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tidrange1 tidrange2 c1 c2 read
+step tidrange1: UPDATE accounts SET balance = balance + 100 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tidrange2: UPDATE accounts SET balance = balance + 200 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tidrange2: <... completed>
+accountid|balance
+---------+-------
+(0 rows)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    700|    1400
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tid1 tid2 r1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tid2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; <waiting ...>
+step r1: ROLLBACK;
+step tid2: <... completed>
+accountid|balance
+---------+-------
+checking |    800
+(1 row)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    800|    1600
+savings  |    600|    1200
+(2 rows)
+
+
 starting permutation: simplepartupdate conditionalpartupdate c1 c2 read_part
 step simplepartupdate: 
 	update parttbl set b = b + 10;
@@ -1363,3 +1457,39 @@ step sysmerge2:
 step c1: COMMIT;
 step sysmerge2: <... completed>
 step c2: COMMIT;
+
+starting permutation: s1pp1 s2pp1 s2pp2 s2pp3 c1 c2
+step s1pp1: UPDATE another_parttbl SET b = b + 1 WHERE a = 1;
+step s2pp1: SET plan_cache_mode TO force_generic_plan;
+step s2pp2: PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1;
+step s2pp3: EXECUTE epd(1); <waiting ...>
+step c1: COMMIT;
+step s2pp3: <... completed>
+step c2: COMMIT;
+
+starting permutation: s1pp1 s2pp4 c1 c2
+step s1pp1: UPDATE another_parttbl SET b = b + 1 WHERE a = 1;
+step s2pp4: DELETE FROM another_parttbl WHERE a = (SELECT 1); <waiting ...>
+step c1: COMMIT;
+step s2pp4: <... completed>
+step c2: COMMIT;
+
+starting permutation: updateformergevalues mergevalues c1 c2 read
+step updateformergevalues: UPDATE accounts SET balance = balance + 100;
+step mergevalues: 
+	MERGE INTO accounts
+	USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
+	ON v.accountid = accounts.accountid
+	WHEN MATCHED THEN UPDATE SET balance = v.balance
+	WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
+ <waiting ...>
+step c1: COMMIT;
+step mergevalues: <... completed>
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    610|    1220
+savings  |    620|    1240
+(2 rows)
+
diff --git a/src/oracle_test/isolation/expected/insert-conflict-do-update-4.out b/src/oracle_test/isolation/expected/insert-conflict-do-update-4.out
new file mode 100644
index 00000000000..80af2798a94
--- /dev/null
+++ b/src/oracle_test/isolation/expected/insert-conflict-do-update-4.out
@@ -0,0 +1,63 @@
+Parsed test spec with 2 sessions
+
+starting permutation: lock2 insert1 update2a c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step update2a: UPDATE upsert SET i = i + 10 WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+ i| j|  k
+--+--+---
+ 1|11|111
+11|10|100
+(2 rows)
+
+step c1: COMMIT;
+
+starting permutation: lock2 insert1 update2b c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step update2b: UPDATE upsert SET i = i + 150 WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+  i| j|  k
+---+--+---
+  1|11|111
+151|10|100
+(2 rows)
+
+step c1: COMMIT;
+
+starting permutation: lock2 insert1 delete2 c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step delete2: DELETE FROM upsert WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+i| j|  k
+-+--+---
+1|11|111
+(1 row)
+
+step c1: COMMIT;
diff --git a/src/oracle_test/isolation/expected/intra-grant-inplace.out b/src/oracle_test/isolation/expected/intra-grant-inplace.out
index 1aa9da622da..23c34d0ca09 100644
--- a/src/oracle_test/isolation/expected/intra-grant-inplace.out
+++ b/src/oracle_test/isolation/expected/intra-grant-inplace.out
@@ -226,7 +226,7 @@ step revoke4: <... completed>
 starting permutation: b1 drop1 b3 sfu3 revoke4 c1 r3
 step b1: BEGIN;
 step drop1: 
-	DROP TABLE intra_grant_inplace;
+	DELETE FROM pg_class WHERE relname = 'intra_grant_inplace';
 
 step b3: BEGIN ISOLATION LEVEL READ COMMITTED;
 step sfu3: 
@@ -248,6 +248,6 @@ relhasindex
 -----------
 (0 rows)
 
-s4: WARNING:  got: relation "intra_grant_inplace" does not exist
+s4: WARNING:  got: cache lookup failed for relation REDACTED
 step revoke4: <... completed>
 step r3: ROLLBACK;
diff --git a/src/oracle_test/isolation/expected/merge-update.out b/src/oracle_test/isolation/expected/merge-update.out
index 8407d3a5b80..b8c28e3656e 100755
--- a/src/oracle_test/isolation/expected/merge-update.out
+++ b/src/oracle_test/isolation/expected/merge-update.out
@@ -105,6 +105,53 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: merge1 explain_merge2a c1 select2 c2
+step merge1:
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+
+step explain_merge2a:
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+ <waiting ...>
+step c1: COMMIT;
+step explain_merge2a: <... completed>
+explain_filter
+-----------------------------------------------------------
+Merge on target t (actual rows=2.00 loops=1)
+  Tuples: inserted=1 updated=1
+  ->  Hash Full Join (actual rows=2.00 loops=1)
+        Hash Cond: (t.key = (1))
+        ->  Seq Scan on target t (actual rows=1.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)
+              ->  Result (actual rows=1.00 loops=1)
+(7 rows)
+
+step select2: SELECT * FROM target;
+key|val
+---+------------------------
+  2|setup1 updated by merge1
+  1|merge2a
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: merge1 merge2b c1 select2 c2
 step merge1: 
   MERGE INTO target t
@@ -165,6 +212,53 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: merge1 c1 explain_merge2a select2 c2
+step merge1:
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+
+ERROR:  Columns referenced in the ON Clause cannot be updated: target.key
+step c1: COMMIT;
+step explain_merge2a:
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+
+explain_filter
+-----------------------------------------------------------
+Merge on target t (actual rows=2.00 loops=1)
+  Tuples: inserted=1 updated=1
+  ->  Hash Full Join (actual rows=2.00 loops=1)
+        Hash Cond: (t.key = (1))
+        ->  Seq Scan on target t (actual rows=1.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)
+              ->  Result (actual rows=1.00 loops=1)
+(7 rows)
+
+step select2: SELECT * FROM target;
+key|val
+---+------------------------------------------------------
+  3|setup1 updated by merge1 source not matched by merge2a
+  1|merge2a
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: pa_merge1 pa_merge2a c1 pa_select2 c2
 step pa_merge1: 
   MERGE INTO pa_target t
@@ -195,6 +289,59 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: pa_merge1 explain_pa_merge2a c1 pa_select2 c2
+step pa_merge1:
+  MERGE INTO pa_target t
+  USING (SELECT 1 as key, 'pa_merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set val = t.val || ' updated by ' || s.val;
+
+step explain_pa_merge2a:
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO pa_target t
+  USING (SELECT 1 as key, 'pa_merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by pa_merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+ <waiting ...>
+step c1: COMMIT;
+step explain_pa_merge2a: <... completed>
+explain_filter
+------------------------------------------------------------------
+Merge on pa_target t (actual rows=2.00 loops=1)
+  Merge on part1 t_1
+  Merge on part2 t_2
+  Merge on part3 t_3
+  Tuples: updated=2
+  ->  Hash Full Join (actual rows=2.00 loops=1)
+        Hash Cond: (t.key = (1))
+        ->  Append (actual rows=2.00 loops=1)
+              ->  Seq Scan on part1 t_1 (actual rows=1.00 loops=1)
+              ->  Seq Scan on part2 t_2 (actual rows=1.00 loops=1)
+              ->  Seq Scan on part3 t_3 (actual rows=0.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)
+              ->  Result (actual rows=1.00 loops=1)
+(13 rows)
+
+step pa_select2: SELECT * FROM pa_target;
+key|val
+---+--------------------------------------------------
+  2|initial updated by pa_merge1 updated by pa_merge2a
+  3|initial source not matched by pa_merge2a
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: pa_merge2 pa_merge2a c1 pa_select2 c2
 step pa_merge2: 
   MERGE INTO pa_target t
@@ -310,3 +457,36 @@ key|val
 (2 rows)
 
 step c2: COMMIT;
+
+starting permutation: merge2a c1 s1beginrr merge1 c2
+step merge2a: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*;
+
+merge_action|old       |new                            |key|val                      
+------------+----------+-------------------------------+---+-------------------------
+UPDATE      |(1,setup1)|(2,"setup1 updated by merge2a")|  2|setup1 updated by merge2a
+(1 row)
+
+step c1: COMMIT;
+step s1beginrr: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step merge1: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+ <waiting ...>
+step c2: COMMIT;
+step merge1: <... completed>
+ERROR:  could not serialize access due to concurrent update
diff --git a/src/oracle_test/isolation/isolation_main.c b/src/oracle_test/isolation/isolation_main.c
index 20d85eff8fd..4a3e1a5ce23 100644
--- a/src/oracle_test/isolation/isolation_main.c
+++ b/src/oracle_test/isolation/isolation_main.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/oracle_test/isolation/isolation_main.c
  *
@@ -18,9 +18,9 @@
 #include "lib/stringinfo.h"
 #include "pg_regress.h"
 
-char		saved_argv0[MAXPGPATH];
-char		isolation_exec[MAXPGPATH];
-bool		looked_up_isolation_exec = false;
+static char		saved_argv0[MAXPGPATH];
+static char		isolation_exec[MAXPGPATH];
+static bool		looked_up_isolation_exec = false;
 
 #define PG_ISOLATION_VERSIONSTR "isolationtester (PostgreSQL) " PG_VERSION "\n"
 
diff --git a/src/oracle_test/isolation/isolation_schedule b/src/oracle_test/isolation/isolation_schedule
index 373de07a780..30313b8dbf9 100644
--- a/src/oracle_test/isolation/isolation_schedule
+++ b/src/oracle_test/isolation/isolation_schedule
@@ -50,6 +50,7 @@ test: insert-conflict-do-nothing-2
 test: insert-conflict-do-update
 test: insert-conflict-do-update-2
 test: insert-conflict-do-update-3
+test: insert-conflict-do-update-4
 test: insert-conflict-specconflict
 test: merge-insert-update
 test: merge-join
diff --git a/src/oracle_test/isolation/isolationtester.h b/src/oracle_test/isolation/isolationtester.h
index 7f0b4d3841c..679825693a6 100644
--- a/src/oracle_test/isolation/isolationtester.h
+++ b/src/oracle_test/isolation/isolationtester.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/isolation/isolationtester.h
diff --git a/src/oracle_test/isolation/specparse.y b/src/oracle_test/isolation/specparse.y
index dafb5710010..3b840fbabd8 100644
--- a/src/oracle_test/isolation/specparse.y
+++ b/src/oracle_test/isolation/specparse.y
@@ -15,6 +15,8 @@
 
 #include "isolationtester.h"
 
+extern int spec_yychar;
+extern int spec_yynerrs;
 
 TestSpec		parseresult;			/* result of parsing is left here */
 
diff --git a/src/oracle_test/isolation/specs/eval-plan-qual.spec b/src/oracle_test/isolation/specs/eval-plan-qual.spec
index 1b5f1e8b878..d0f151fd9e9 100644
--- a/src/oracle_test/isolation/specs/eval-plan-qual.spec
+++ b/src/oracle_test/isolation/specs/eval-plan-qual.spec
@@ -99,6 +99,10 @@ step upsert1	{
 	  WHERE NOT EXISTS (SELECT 1 FROM upsert);
 }
 
+# Tests for Tid / Tid Range Scan
+step tid1 { UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance; }
+step tidrange1 { UPDATE accounts SET balance = balance + 100 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; }
+
 # tests with table p check inheritance cases:
 # readp1/writep1/readp2 tests a bug where nodeLockRows did the wrong thing
 # when the first updated tuple was in a non-first child table.
@@ -106,7 +110,7 @@ step upsert1	{
 # writep3a/writep3b tests updates touching more than one table
 # writep4a/writep4b tests a case where matches in another table confused EPQ
 # writep4a/deletep4 tests the same case in the DELETE path
- 
+
 step readp		{ SELECT tableoid::regclass, ctid, * FROM p; }
 step readp1		{ SELECT tableoid::regclass, ctid, * FROM p WHERE b IN (0, 1) AND c = 0 FOR UPDATE; }
 step writep1	{ UPDATE p SET b = -1 WHERE a = 1 AND b = 1 AND c = 0; }
@@ -196,10 +200,13 @@ step simplepartupdate_noroute {
 
 # test system class LockTuple()
 
-step sys1    {
+step sys1	{
 	UPDATE pg_class SET reltuples = 123 WHERE oid = 'accounts'::regclass;
 }
 
+step s1pp1 { UPDATE another_parttbl SET b = b + 1 WHERE a = 1; }
+step updateformergevalues { UPDATE accounts SET balance = balance + 100; }
+
 session s2
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
 step wx2	{ UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; }
@@ -240,6 +247,11 @@ step updateforcip3	{
 step wrtwcte	{ UPDATE table_a SET value = 'tableAValue2' WHERE id = 1; }
 step wrjt	{ UPDATE jointest SET data = 42 WHERE id = 7; }
 
+step tid2 { UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; }
+step tidrange2 { UPDATE accounts SET balance = balance + 200 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; }
+# here, recheck succeeds; (0,3) is the id that step tid1 will assign
+step tidsucceed2 { UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' OR ctid = '(0,3)' RETURNING accountid, balance; }
+
 step conditionalpartupdate	{
 	update parttbl set c = -c where b < 10;
 }
@@ -287,12 +299,12 @@ step wnested2 {
     );
 }
 
-step sysupd2    {
+step sysupd2	{
 	UPDATE pg_class SET reltuples = reltuples * 2
 	WHERE oid = 'accounts'::regclass;
 }
 
-step sysmerge2    {
+step sysmerge2	{
 	MERGE INTO pg_class
 	USING (SELECT 'accounts'::regclass AS o) j
 	ON o = oid
@@ -302,6 +314,19 @@ step sysmerge2    {
 step c2	{ COMMIT; }
 step r2	{ ROLLBACK; }
 
+step s2pp1 { SET plan_cache_mode TO force_generic_plan; }
+step s2pp2 { PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1; }
+step s2pp3 { EXECUTE epd(1); }
+step s2pp4 { DELETE FROM another_parttbl WHERE a = (SELECT 1); }
+
+step mergevalues {
+	MERGE INTO accounts
+	USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
+	ON v.accountid = accounts.accountid
+	WHEN MATCHED THEN UPDATE SET balance = v.balance
+	WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
+}
+
 session s3
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
 step read	{ SELECT * FROM accounts ORDER BY accountid; }
@@ -391,6 +416,11 @@ permutation wrtwcte readwcte c1 c2
 permutation wrjt selectjoinforupdate c2 c1
 permutation wrjt selectresultforupdate c2 c1
 permutation wrtwcte multireadwcte c1 c2
+permutation tid1 tid2 c1 c2 read
+permutation tid1 tidsucceed2 c1 c2 read
+permutation tidrange1 tidrange2 c1 c2 read
+# test that a rollback on s1 has s2 perform the update on the original row
+permutation tid1 tid2 r1 c2 read
 
 permutation simplepartupdate conditionalpartupdate c1 c2 read_part
 permutation simplepartupdate complexpartupdate c1 c2 read_part
@@ -400,3 +430,10 @@ permutation simplepartupdate_noroute complexpartupdate_doesnt_route c1 c2 read_p
 
 permutation sys1 sysupd2 c1 c2
 permutation sys1 sysmerge2 c1 c2
+
+# Exercise run-time partition pruning code in an EPQ recheck
+permutation s1pp1 s2pp1 s2pp2 s2pp3 c1 c2
+permutation s1pp1 s2pp4 c1 c2
+
+# test EPQ recheck in MERGE from VALUES_RTE, cf bug #19355
+permutation updateformergevalues mergevalues c1 c2 read
diff --git a/src/oracle_test/isolation/specs/insert-conflict-do-update-4.spec b/src/oracle_test/isolation/specs/insert-conflict-do-update-4.spec
new file mode 100644
index 00000000000..a62531660d3
--- /dev/null
+++ b/src/oracle_test/isolation/specs/insert-conflict-do-update-4.spec
@@ -0,0 +1,42 @@
+# INSERT...ON CONFLICT DO UPDATE test with partitioned table
+#
+# We use SELECT FOR UPDATE to block the INSERT at the point where
+# it has found an existing tuple and is attempting to update it.
+# Then we can execute a conflicting update and verify the results.
+# Of course, this only works in READ COMMITTED mode, else we'd get an error.
+
+setup
+{
+  CREATE TABLE upsert (i int PRIMARY KEY, j int, k int) PARTITION BY RANGE (i);
+  CREATE TABLE upsert_1 PARTITION OF upsert FOR VALUES FROM (1) TO (100);
+  CREATE TABLE upsert_2 PARTITION OF upsert FOR VALUES FROM (100) TO (200);
+
+  INSERT INTO upsert VALUES (1, 10, 100);
+}
+
+teardown
+{
+  DROP TABLE upsert;
+}
+
+session s1
+setup           { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step insert1    { INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; }
+step select1    { SELECT * FROM upsert ORDER BY i; }
+step c1         { COMMIT; }
+
+session s2
+setup           { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step lock2      { SELECT * FROM upsert WHERE i = 1 FOR UPDATE; }
+step update2a   { UPDATE upsert SET i = i + 10 WHERE i = 1; }
+step update2b   { UPDATE upsert SET i = i + 150 WHERE i = 1; }
+step delete2    { DELETE FROM upsert WHERE i = 1; }
+step c2         { COMMIT; }
+
+# Test case where concurrent update moves the target row within the partition
+permutation lock2 insert1 update2a c2 select1 c1
+# Test case where concurrent update moves the target row to another partition
+permutation lock2 insert1 update2b c2 select1 c1
+# Test case where target row is concurrently deleted
+permutation lock2 insert1 delete2 c2 select1 c1
diff --git a/src/oracle_test/isolation/specs/intra-grant-inplace.spec b/src/oracle_test/isolation/specs/intra-grant-inplace.spec
index 9936d389359..e9c7848624c 100644
--- a/src/oracle_test/isolation/specs/intra-grant-inplace.spec
+++ b/src/oracle_test/isolation/specs/intra-grant-inplace.spec
@@ -20,7 +20,7 @@ step grant1	{
 	GRANT SELECT ON intra_grant_inplace TO PUBLIC;
 }
 step drop1	{
-	DROP TABLE intra_grant_inplace;
+	DELETE FROM pg_class WHERE relname = 'intra_grant_inplace';
 }
 step c1	{ COMMIT; }
 
diff --git a/src/oracle_test/ldap/Makefile b/src/oracle_test/ldap/Makefile
index 29992a16fb2..0dea300878a 100644
--- a/src/oracle_test/ldap/Makefile
+++ b/src/oracle_test/ldap/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/oracle_test/ldap
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
diff --git a/src/oracle_test/modules/Makefile b/src/oracle_test/modules/Makefile
index 5d773b21da1..9fd752635d4 100644
--- a/src/oracle_test/modules/Makefile
+++ b/src/oracle_test/modules/Makefile
@@ -17,8 +17,10 @@ SUBDIRS = \
 		  spgist_name_ops \
 		  test_aio \
 		  test_bloomfilter \
+		  test_cloexec \
 		  test_copy_callbacks \
 		  test_custom_rmgrs \
+		  test_custom_types \
 		  test_ddl_deparse \
 		  test_dsa \
 		  test_dsm_registry \
diff --git a/src/oracle_test/modules/commit_ts/t/001_base.pl b/src/oracle_test/modules/commit_ts/t/001_base.pl
index 1953b18f6b3..50e79ce6409 100644
--- a/src/oracle_test/modules/commit_ts/t/001_base.pl
+++ b/src/oracle_test/modules/commit_ts/t/001_base.pl
@@ -11,8 +11,7 @@
 use PostgreSQL::Test::Cluster;
 
 my $node = PostgreSQL::Test::Cluster->new('foxtrot');
-$node->init;
-$node->append_conf('postgresql.conf', 'track_commit_timestamp = on');
+$node->init(extra => [ '-c', "track_commit_timestamp=on" ]);
 $node->start;
 
 # Create a table, compare "now()" to the commit TS of its xmin
diff --git a/src/oracle_test/modules/delay_execution/delay_execution.c b/src/oracle_test/modules/delay_execution/delay_execution.c
index f599f6829ef..b696949098b 100644
--- a/src/oracle_test/modules/delay_execution/delay_execution.c
+++ b/src/oracle_test/modules/delay_execution/delay_execution.c
@@ -11,7 +11,7 @@
  * between parsing and execution of any desired query.
  *
  * Copyright (c) 2020-2025, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/oracle_test/modules/delay_execution/delay_execution.c
diff --git a/src/oracle_test/modules/dummy_index_am/dummy_index_am.c b/src/oracle_test/modules/dummy_index_am/dummy_index_am.c
index cb1d61415ed..c1904a44e67 100644
--- a/src/oracle_test/modules/dummy_index_am/dummy_index_am.c
+++ b/src/oracle_test/modules/dummy_index_am/dummy_index_am.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/oracle_test/modules/dummy_index_am/dummy_index_am.c
diff --git a/src/oracle_test/modules/dummy_seclabel/dummy_seclabel.c b/src/oracle_test/modules/dummy_seclabel/dummy_seclabel.c
index 886cce7269e..2b8dd93a27f 100644
--- a/src/oracle_test/modules/dummy_seclabel/dummy_seclabel.c
+++ b/src/oracle_test/modules/dummy_seclabel/dummy_seclabel.c
@@ -9,7 +9,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * add the file for requirement "SQL PARSER"
  *
diff --git a/src/oracle_test/modules/gin/expected/gin_incomplete_splits.out b/src/oracle_test/modules/gin/expected/gin_incomplete_splits.out
index 15574e547ac..bf271718be1 100644
--- a/src/oracle_test/modules/gin/expected/gin_incomplete_splits.out
+++ b/src/oracle_test/modules/gin/expected/gin_incomplete_splits.out
@@ -189,6 +189,7 @@ select verify(:next_i);
 SELECT injection_points_detach('gin-finish-incomplete-split');
  injection_points_detach 
 -------------------------
- 
+
 (1 row)
 
+drop extension injection_points;
\ No newline at end of file
diff --git a/src/oracle_test/modules/gin/sql/gin_incomplete_splits.sql b/src/oracle_test/modules/gin/sql/gin_incomplete_splits.sql
index ebf0f620f0c..636839a50ad 100644
--- a/src/oracle_test/modules/gin/sql/gin_incomplete_splits.sql
+++ b/src/oracle_test/modules/gin/sql/gin_incomplete_splits.sql
@@ -148,3 +148,5 @@ select insert_n(:next_i, 10) as next_i
 select verify(:next_i);
 
 SELECT injection_points_detach('gin-finish-incomplete-split');
+
+drop extension injection_points;
\ No newline at end of file
diff --git a/src/oracle_test/modules/injection_points/Makefile b/src/oracle_test/modules/injection_points/Makefile
index 00f1fbb4f4f..73f37d81210 100644
--- a/src/oracle_test/modules/injection_points/Makefile
+++ b/src/oracle_test/modules/injection_points/Makefile
@@ -11,10 +11,13 @@ EXTENSION = injection_points
 DATA = injection_points--1.0.sql
 PGFILEDESC = "injection_points - facility for injection points"
 
-REGRESS = injection_points hashagg reindex_conc vacuum
-REGRESS_OPTS = --dlpath=$(top_builddir)/src/oracle_test/regress
+ORA_REGRESS = injection_points hashagg reindex_conc vacuum
+ORACLE_REGRESS_OPTS = --dlpath=$(top_builddir)/src/oracle_test/regress
 
-ISOLATION = basic inplace syscache-update-pruned
+ISOLATION = basic \
+	    inplace \
+	    syscache-update-pruned \
+	    heap_lock_update
 
 TAP_TESTS = 1
 
diff --git a/src/oracle_test/modules/injection_points/expected/heap_lock_update.out b/src/oracle_test/modules/injection_points/expected/heap_lock_update.out
new file mode 100644
index 00000000000..f29964e96f8
--- /dev/null
+++ b/src/oracle_test/modules/injection_points/expected/heap_lock_update.out
@@ -0,0 +1,83 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1begin s1update s2lock s1abort vacuum reinsert wake
+step s1begin: BEGIN;
+step s1update: UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid;
+ctid
+-----
+(1,2)
+(1 row)
+
+step s2lock: select * from t where id = 1 for update; <waiting ...>
+step s1abort: ABORT;
+step vacuum: VACUUM t;
+step reinsert:
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	UPDATE t SET id = 10002 WHERE id = 10001 RETURNING ctid;
+
+ctid
+-----
+(1,2)
+(1 row)
+
+ctid
+-----
+(1,3)
+(1 row)
+
+step wake:
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+ <waiting ...>
+step s2lock: <... completed>
+id
+--
+ 1
+(1 row)
+
+step wake: <... completed>
+
+starting permutation: s1begin s1update s2lock s1abort vacuum reinsert_and_lock wake
+step s1begin: BEGIN;
+step s1update: UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid;
+ctid
+-----
+(1,2)
+(1 row)
+
+step s2lock: select * from t where id = 1 for update; <waiting ...>
+step s1abort: ABORT;
+step vacuum: VACUUM t;
+step reinsert_and_lock:
+	BEGIN;
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	SELECT ctid, * FROM t WHERE id = 1 FOR UPDATE;
+	COMMIT;
+	UPDATE t SET id = 10002 WHERE id = 10001 returning ctid;
+
+ctid
+-----
+(1,2)
+(1 row)
+
+ctid |id
+-----+--
+(0,1)| 1
+(1 row)
+
+ctid
+-----
+(1,3)
+(1 row)
+
+step wake:
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+ <waiting ...>
+step s2lock: <... completed>
+id
+--
+ 1
+(1 row)
+
+step wake: <... completed>
diff --git a/src/oracle_test/modules/injection_points/expected/injection_points.out b/src/oracle_test/modules/injection_points/expected/injection_points.out
index 8bf46098b23..5dfcc684419 100644
--- a/src/oracle_test/modules/injection_points/expected/injection_points.out
+++ b/src/oracle_test/modules/injection_points/expected/injection_points.out
@@ -6,6 +6,7 @@ CREATE FUNCTION wait_pid(int)
   RETURNS void
   AS :'regresslib'
   LANGUAGE C STRICT;
+/
 -- Non-strict checks
 SELECT injection_points_run(NULL);
  injection_points_run 
diff --git a/src/oracle_test/modules/injection_points/injection_points.c b/src/oracle_test/modules/injection_points/injection_points.c
index a77b6020941..8d8c5347501 100644
--- a/src/oracle_test/modules/injection_points/injection_points.c
+++ b/src/oracle_test/modules/injection_points/injection_points.c
@@ -8,7 +8,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/test/modules/injection_points/injection_points.c
diff --git a/src/oracle_test/modules/injection_points/injection_stats.c b/src/oracle_test/modules/injection_points/injection_stats.c
index 14903c629e0..ca0c2ce1157 100644
--- a/src/oracle_test/modules/injection_points/injection_stats.c
+++ b/src/oracle_test/modules/injection_points/injection_stats.c
@@ -59,7 +59,7 @@ static const PgStat_KindInfo injection_stats = {
 /*
  * Kind ID reserved for statistics of injection points.
  */
-#define PGSTAT_KIND_INJECTION	129
+#define PGSTAT_KIND_INJECTION	27
 
 /* Track if stats are loaded */
 static bool inj_stats_loaded = false;
@@ -164,8 +164,7 @@ void
 pgstat_report_inj(const char *name)
 {
 	PgStat_EntryRef *entry_ref;
-	PgStatShared_InjectionPoint *shstatent;
-	PgStat_StatInjEntry *statent;
+	PgStat_StatInjEntry *pending;
 
 	/* leave if disabled */
 	if (!inj_stats_loaded || !inj_stats_enabled)
@@ -174,11 +173,10 @@ pgstat_report_inj(const char *name)
 	entry_ref = pgstat_prep_pending_entry(PGSTAT_KIND_INJECTION, InvalidOid,
 										  PGSTAT_INJ_IDX(name), NULL);
 
-	shstatent = (PgStatShared_InjectionPoint *) entry_ref->shared_stats;
-	statent = &shstatent->stats;
+	pending = (PgStat_StatInjEntry *) entry_ref->pending;
 
-	/* Update the injection point statistics */
-	statent->numcalls++;
+	/* Update the injection point pending statistics */
+	pending->numcalls++;
 }
 
 /*
diff --git a/src/oracle_test/modules/injection_points/injection_stats_fixed.c b/src/oracle_test/modules/injection_points/injection_stats_fixed.c
old mode 100755
new mode 100644
index 3d0c01bdd05..1eb71c25eb0
--- a/src/oracle_test/modules/injection_points/injection_stats_fixed.c
+++ b/src/oracle_test/modules/injection_points/injection_stats_fixed.c
@@ -52,7 +52,7 @@ static const PgStat_KindInfo injection_stats_fixed = {
 	.fixed_amount = true,
 	.write_to_file = true,
 
-	.shared_size = sizeof(PgStat_StatInjFixedEntry),
+	.shared_size = sizeof(PgStatShared_InjectionPointFixed),
 	.shared_data_off = offsetof(PgStatShared_InjectionPointFixed, stats),
 	.shared_data_len = sizeof(((PgStatShared_InjectionPointFixed *) 0)->stats),
 
@@ -64,7 +64,7 @@ static const PgStat_KindInfo injection_stats_fixed = {
 /*
  * Kind ID reserved for statistics of injection points.
  */
-#define PGSTAT_KIND_INJECTION_FIXED	130
+#define PGSTAT_KIND_INJECTION_FIXED	28
 
 /* Track if fixed-numbered stats are loaded */
 static bool inj_fixed_loaded = false;
diff --git a/src/oracle_test/modules/injection_points/meson.build b/src/oracle_test/modules/injection_points/meson.build
index ce778ccf9ac..a73e1fe6c34 100644
--- a/src/oracle_test/modules/injection_points/meson.build
+++ b/src/oracle_test/modules/injection_points/meson.build
@@ -48,6 +48,7 @@ tests += {
       'basic',
       'inplace',
       'syscache-update-pruned',
+      'heap_lock_update',
     ],
     'runningcheck': false, # see syscache-update-pruned
   },
diff --git a/src/oracle_test/modules/injection_points/regress_injection.c b/src/oracle_test/modules/injection_points/regress_injection.c
index 7bba1c97d0f..524790a90ed 100755
--- a/src/oracle_test/modules/injection_points/regress_injection.c
+++ b/src/oracle_test/modules/injection_points/regress_injection.c
@@ -50,7 +50,7 @@ removable_cutoff(PG_FUNCTION_ARGS)
 	if (!PG_ARGISNULL(0))
 		rel = table_open(PG_GETARG_OID(0), AccessShareLock);
 
-	if (!rel->rd_rel->relisshared && autovacuum_start_daemon)
+	if (rel != NULL && !rel->rd_rel->relisshared && autovacuum_start_daemon)
 		elog(WARNING,
 			 "removable_cutoff(non-shared-rel) can move backward under autovacuum=on");
 
diff --git a/src/oracle_test/modules/injection_points/specs/heap_lock_update.spec b/src/oracle_test/modules/injection_points/specs/heap_lock_update.spec
new file mode 100644
index 00000000000..b3992a1eb7a
--- /dev/null
+++ b/src/oracle_test/modules/injection_points/specs/heap_lock_update.spec
@@ -0,0 +1,117 @@
+# Test race condition in tuple locking
+#
+# This is a reproducer for the bug reported at:
+# https://www.postgresql.org/message-id/CAOG%2BRQ74x0q%3DkgBBQ%3DmezuvOeZBfSxM1qu_o0V28bwDz3dHxLw%40mail.gmail.com
+#
+# The bug was that when following an update chain when locking tuples,
+# we sometimes failed to check that the xmin on the next tuple matched
+# the prior's xmax. If the updated tuple version was vacuumed away and
+# the slot was reused for an unrelated tuple, we'd incorrectly follow
+# and lock the unrelated tuple.
+
+
+# Set up a test table with enough rows to fill a page. We need the
+# UPDATE used in the test to put the new tuple on a different page,
+# because otherwise the VACUUM cannot remove the aborted tuple because
+# we hold a pin on the first page.
+#
+# The exact number of rows inserted doesn't otherwise matter, but we
+# arrange things in a deterministic fashion so that the last inserted
+# tuple goes to (1,1), and the updated and aborted tuple goes to
+# (1,2). That way we can just memorize those ctids in the expected
+# output, to verify that the test exercises the scenario we want.
+setup
+{
+	CREATE EXTENSION injection_points;
+
+	CREATE TABLE t (id int PRIMARY KEY);
+	do $$
+		DECLARE
+			i int;
+			tid tid;
+		BEGIN
+			FOR i IN 1..5000 LOOP
+				INSERT INTO t VALUES (i) RETURNING ctid INTO tid;
+				IF tid = '(1,1)' THEN
+					RETURN;
+				END IF;
+			END LOOP;
+			RAISE 'expected to insert tuple to (1,1)';
+	   END;
+   $$;
+}
+teardown
+{
+	DROP TABLE t;
+	DROP EXTENSION injection_points;
+}
+
+session s1
+step s1begin	{ BEGIN; }
+step s1update	{ UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid; }
+step s1abort	{ ABORT; }
+step vacuum		{ VACUUM t; }
+
+# Insert a new tuple, and update it.
+step reinsert	{
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	UPDATE t SET id = 10002 WHERE id = 10001 RETURNING ctid;
+}
+
+# Same as the 'reinsert' step, but for extra confusion, we also stamp
+# the original tuple with the same 'xmax' as the re-inserted one.
+step reinsert_and_lock {
+	BEGIN;
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	SELECT ctid, * FROM t WHERE id = 1 FOR UPDATE;
+	COMMIT;
+	UPDATE t SET id = 10002 WHERE id = 10001 returning ctid;
+}
+
+step wake	{
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+}
+
+session s2
+setup	{
+	SELECT FROM injection_points_set_local();
+	SELECT FROM injection_points_attach('heap_lock_updated_tuple', 'wait');
+}
+step s2lock	{ select * from t where id = 1 for update; }
+
+permutation
+	# Begin transaction, update a row. Because of how we set up the
+	# test table, the updated tuple lands at (1,2)
+	s1begin
+	s1update
+
+	# While the updating transaction is open, start a new session that
+	# tries to lock the row. This blocks on the open transaction.
+	s2lock
+
+	# Abort the updating transaction. This unblocks session 2, but it
+	# will immediately hit the injection point and block on that.
+	s1abort
+	# Vacuum away the updated, aborted tuple.
+	vacuum
+
+	# Insert a new tuple. It lands at the same location where the
+	# updated tuple was.
+	reinsert
+
+	# Let the locking transaction continue. It should lock the
+	# original tuple, ignoring the re-inserted tuple.
+	wake(s2lock)
+
+# Variant where the re-inserted tuple is also locked by the inserting
+# transaction. This failed an earlier version of the fix during
+# development.
+permutation
+	s1begin
+	s1update
+	s2lock
+	s1abort
+	vacuum
+	reinsert_and_lock
+	wake(s2lock)
diff --git a/src/oracle_test/modules/injection_points/sql/injection_points.sql b/src/oracle_test/modules/injection_points/sql/injection_points.sql
index 29c28f6bcf8..4cda70245c3 100644
--- a/src/oracle_test/modules/injection_points/sql/injection_points.sql
+++ b/src/oracle_test/modules/injection_points/sql/injection_points.sql
@@ -8,7 +8,7 @@ CREATE FUNCTION wait_pid(int)
   RETURNS void
   AS :'regresslib'
   LANGUAGE C STRICT;
-
+/
 -- Non-strict checks
 SELECT injection_points_run(NULL);
 SELECT injection_points_cached(NULL);
diff --git a/src/oracle_test/modules/ldap_password_func/ldap_password_func.c b/src/oracle_test/modules/ldap_password_func/ldap_password_func.c
index 36e54ce968e..a65dfac3590 100644
--- a/src/oracle_test/modules/ldap_password_func/ldap_password_func.c
+++ b/src/oracle_test/modules/ldap_password_func/ldap_password_func.c
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * Copyright (c) 2022-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * ldap_password_func.c
  *
diff --git a/src/oracle_test/modules/libpq_pipeline/libpq_pipeline.c b/src/oracle_test/modules/libpq_pipeline/libpq_pipeline.c
index e1137be0f5c..1d1bf8533cf 100644
--- a/src/oracle_test/modules/libpq_pipeline/libpq_pipeline.c
+++ b/src/oracle_test/modules/libpq_pipeline/libpq_pipeline.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/libpq_pipeline/libpq_pipeline.c
diff --git a/src/oracle_test/modules/meson.build b/src/oracle_test/modules/meson.build
index 9de0057bd1d..9a957351ab6 100644
--- a/src/oracle_test/modules/meson.build
+++ b/src/oracle_test/modules/meson.build
@@ -15,8 +15,10 @@ subdir('spgist_name_ops')
 subdir('ssl_passphrase_callback')
 subdir('test_aio')
 subdir('test_bloomfilter')
+subdir('test_cloexec')
 subdir('test_copy_callbacks')
 subdir('test_custom_rmgrs')
+subdir('test_custom_types')
 subdir('test_ddl_deparse')
 subdir('test_dsa')
 subdir('test_dsm_registry')
diff --git a/src/oracle_test/modules/oauth_validator/meson.build b/src/oracle_test/modules/oauth_validator/meson.build
index e190f9cf15a..6661eb33cab 100644
--- a/src/oracle_test/modules/oauth_validator/meson.build
+++ b/src/oracle_test/modules/oauth_validator/meson.build
@@ -81,5 +81,6 @@ tests += {
       'with_libcurl': oauth_flow_supported ? 'yes' : 'no',
       'with_python': 'yes',
     },
+    'deps': [oauth_hook_client],
   },
 }
diff --git a/src/oracle_test/modules/oauth_validator/t/001_server.pl b/src/oracle_test/modules/oauth_validator/t/001_server.pl
index 41672ebd5c6..c0dafb8be76 100644
--- a/src/oracle_test/modules/oauth_validator/t/001_server.pl
+++ b/src/oracle_test/modules/oauth_validator/t/001_server.pl
@@ -418,6 +418,35 @@ sub connstr
 	  qr/failed to obtain access token: mutual TLS required for client \(invalid_client\)/
 );
 
+# Count the number of calls to the internal flow when multiple retries are
+# triggered. The exact number depends on many things -- the TCP stack, the
+# version of Curl in use, random chance -- but a ridiculously high number
+# suggests something is wrong with our ability to clear multiplexer events after
+# they're no longer applicable.
+my ($ret, $stdout, $stderr) = $node->psql(
+	'postgres',
+	"SELECT 'connected for call count'",
+	extra_params => ['-w'],
+	connstr => connstr(stage => 'token', retries => 2),
+	on_error_stop => 0);
+
+is($ret, 0, "call count connection succeeds");
+like(
+	$stderr,
+	qr@Visit https://example\.com/ and enter the code: postgresuser@,
+	"call count: stderr matches");
+
+my $count_pattern = qr/\[libpq\] total number of polls: (\d+)/;
+if (like($stderr, $count_pattern, "call count: count is printed"))
+{
+	# For reference, a typical flow with two retries might take between 5-15
+	# calls to the client implementation. And while this will probably continue
+	# to change across OSes and Curl updates, we're likely in trouble if we see
+	# hundreds or thousands of calls.
+	$stderr =~ $count_pattern;
+	cmp_ok($1, '<', 100, "call count is reasonably small");
+}
+
 # Stress test: make sure our builtin flow operates correctly even if the client
 # application isn't respecting PGRES_POLLING_READING/WRITING signals returned
 # from PQconnectPoll().
@@ -428,7 +457,7 @@ sub connstr
 	connstr(stage => 'all', retries => 1, interval => 1));
 
 note "running '" . join("' '", @cmd) . "'";
-my ($stdout, $stderr) = run_command(\@cmd);
+($stdout, $stderr) = run_command(\@cmd);
 
 like($stdout, qr/connection succeeded/, "stress-async: stdout matches");
 unlike(
diff --git a/src/oracle_test/modules/oauth_validator/t/002_client.pl b/src/oracle_test/modules/oauth_validator/t/002_client.pl
index aac0220d215..6b79f9d41bb 100644
--- a/src/oracle_test/modules/oauth_validator/t/002_client.pl
+++ b/src/oracle_test/modules/oauth_validator/t/002_client.pl
@@ -29,6 +29,8 @@
 $node->append_conf('postgresql.conf', "log_connections = all\n");
 $node->append_conf('postgresql.conf',
 	"oauth_validator_libraries = 'validator'\n");
+# Needed to inspect postmaster log after connection failure:
+$node->append_conf('postgresql.conf', "log_min_messages = debug2");
 $node->start;
 
 $node->safe_psql('postgres', 'CREATE USER test;');
@@ -47,7 +49,7 @@
 });
 $node->reload;
 
-my $log_start = $node->wait_for_log(qr/reloading configuration files/);
+my $log_start = -s $node->logfile;
 
 $ENV{PGOAUTHDEBUG} = "UNSAFE";
 
@@ -73,6 +75,7 @@ sub test
 	my @cmd = ("oauth_hook_client", @{$flags}, $common_connstr);
 	note "running '" . join("' '", @cmd) . "'";
 
+    my $log_start = -s $node->logfile;
 	my ($stdout, $stderr) = run_command(\@cmd);
 
 	if (defined($params{expected_stdout}))
@@ -88,6 +91,18 @@ sub test
 	{
 		is($stderr, "", "$test_name: no stderr");
 	}
+
+	if (defined($params{log_like}))
+	{
+		# See Cluster::connect_fails(). To avoid races, we have to wait for the
+		# postmaster to flush the log for finished connection.
+		$node->wait_for_log(
+			qr/DEBUG:  (?:00000: )?forked new client backend, pid=(\d+) socket.*DEBUG:  (?:00000: )?client backend \(PID \d\) exited with exit code \d/s,
+			$log_start);
+
+		$node->log_check("$test_name: log matches",
+			$log_start, log_like => $params{log_like});
+	}
 }
 
 test(
@@ -97,11 +112,8 @@ sub test
 		"--expected-uri", "$issuer/.well-known/openid-configuration",
 		"--expected-scope", $scope,
 	],
-	expected_stdout => qr/connection succeeded/);
-
-$node->log_check("validator receives correct token",
-	$log_start,
-	log_like => [ qr/oauth_validator: token="my-token", role="$user"/, ]);
+	expected_stdout => qr/connection succeeded/,
+	log_like => [qr/oauth_validator: token="my-token", role="$user"/]);
 
 if ($ENV{with_libcurl} ne 'yes')
 {
diff --git a/src/oracle_test/modules/oauth_validator/t/oauth_server.py b/src/oracle_test/modules/oauth_validator/t/oauth_server.py
index 0f8836aadf3..c70783ecbe4 100644
--- a/src/oracle_test/modules/oauth_validator/t/oauth_server.py
+++ b/src/oracle_test/modules/oauth_validator/t/oauth_server.py
@@ -257,13 +257,33 @@ def _access_token(self):
 
         return token
 
+    def _log_response(self, js: JsonObject) -> None:
+        """
+        Trims the response JSON, if necessary, and logs it for later debugging.
+        """
+        # At the moment the biggest problem for tests is the _pad_ member, which
+        # is a megabyte in size, so truncate that to something more reasonable.
+        if "_pad_" in js:
+            pad = js["_pad_"]
+
+            # Don't modify the original dict.
+            js = dict(js)
+            js["_pad_"] = pad[:64] + f"[...truncated from {len(pad)} bytes]"
+
+        resp = json.dumps(js).encode("ascii")
+        self.log_message("sending JSON response: %s", resp)
+
+        # If you've tripped this assertion, please truncate the new addition as
+        # above, or else come up with a new strategy.
+        assert len(resp) < 1024, "_log_response must be adjusted for new JSON"
+
     def _send_json(self, js: JsonObject) -> None:
         """
         Sends the provided JSON dict as an application/json response.
         self._response_code can be modified to send JSON error responses.
         """
         resp = json.dumps(js).encode("ascii")
-        self.log_message("sending JSON response: %s", resp)
+        self._log_response(js)
 
         self.send_response(self._response_code)
         self.send_header("Content-Type", self._content_type)
diff --git a/src/oracle_test/modules/plsample/plsample.c b/src/oracle_test/modules/plsample/plsample.c
index c5ea673317a..4929dc5d89d 100644
--- a/src/oracle_test/modules/plsample/plsample.c
+++ b/src/oracle_test/modules/plsample/plsample.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  *
  * IDENTIFICATION
diff --git a/src/oracle_test/modules/spgist_name_ops/spgist_name_ops.c b/src/oracle_test/modules/spgist_name_ops/spgist_name_ops.c
index ff0e280adef..0967870049d 100644
--- a/src/oracle_test/modules/spgist_name_ops/spgist_name_ops.c
+++ b/src/oracle_test/modules/spgist_name_ops/spgist_name_ops.c
@@ -13,7 +13,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/spgist_name_ops/spgist_name_ops.c
diff --git a/src/oracle_test/modules/test_aio/t/001_aio.pl b/src/oracle_test/modules/test_aio/t/001_aio.pl
index 82ffffc058f..3f0453619e8 100644
--- a/src/oracle_test/modules/test_aio/t/001_aio.pl
+++ b/src/oracle_test/modules/test_aio/t/001_aio.pl
@@ -396,8 +396,8 @@ sub test_io_error
 	{
 		my $invalid_page_re =
 		  $tblname eq 'tbl_corr'
-		  ? qr/invalid page in block 1 of relation base\/\d+\/\d+/
-		  : qr/invalid page in block 1 of relation base\/\d+\/t\d+_\d+/;
+		  ? qr/invalid page in block 1 of relation "base\/\d+\/\d+/
+		  : qr/invalid page in block 1 of relation "base\/\d+\/t\d+_\d+/;
 
 		# verify the error is reported in custom C code
 		psql_like(
@@ -798,7 +798,7 @@ sub test_inject
 		"shortened multi-block read detects invalid page",
 		qq(SELECT count(*) FROM tbl_corr WHERE ctid < '(2, 1)'),
 		qr/^$/,
-		qr/ERROR:.*invalid page in block 1 of relation base\/.*/);
+		qr/ERROR:.*invalid page in block 1 of relation "base\/.*/);
 
 	# trigger a hard error, should error out
 	$psql->query_safe(
@@ -985,7 +985,7 @@ sub test_zero
 			qq(
 SELECT read_rel_block_ll('tbl_zero', 0, zero_on_error=>false)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 0 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 0 of relation "base\/.*\/.*$/
 		);
 
 		# Check that page validity errors are zeroed
@@ -996,7 +996,7 @@ sub test_zero
 			qq(
 SELECT read_rel_block_ll('tbl_zero', 0, zero_on_error=>true)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 0 of relation base\/.*\/.*; zeroing out page$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 0 of relation "base\/.*\/.*"; zeroing out page$/
 		);
 
 		# And that once the corruption is fixed, we can read again
@@ -1027,7 +1027,7 @@ sub test_zero
 			"$persistency: test zeroing of invalid block 3",
 			qq(SELECT read_rel_block_ll('tbl_zero', 3, zero_on_error=>true);),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation base\/.*\/.*; zeroing out page$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation "base\/.*\/.*"; zeroing out page$/
 		);
 
 
@@ -1044,7 +1044,7 @@ sub test_zero
 			"$persistency: test reading of invalid block 2,3 in larger read",
 			qq(SELECT read_rel_block_ll('tbl_zero', 1, nblocks=>4, zero_on_error=>false)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first invalid page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first invalid page\.\nHINT:[^\n]+$/
 		);
 
 		# Then test zeroing via ZERO_ON_ERROR flag
@@ -1054,7 +1054,7 @@ sub test_zero
 			"$persistency: test zeroing of invalid block 2,3 in larger read, ZERO_ON_ERROR",
 			qq(SELECT read_rel_block_ll('tbl_zero', 1, nblocks=>4, zero_on_error=>true)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first zeroed page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first zeroed page\.\nHINT:[^\n]+$/
 		);
 
 		# Then test zeroing via zero_damaged_pages
@@ -1069,7 +1069,7 @@ sub test_zero
 COMMIT;
 ),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first zeroed page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first zeroed page\.\nHINT:[^\n]+$/
 		);
 
 		$psql_a->query_safe(qq(COMMIT));
@@ -1091,7 +1091,7 @@ sub test_zero
 			qq(
 SELECT count(*) FROM tbl_zero),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 2 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 2 of relation "base\/.*\/.*$/
 		);
 
 		# Verify that bufmgr.c IO zeroes out pages with page validity errors
@@ -1106,7 +1106,7 @@ sub test_zero
 COMMIT;
 ),
 			qr/^\d+$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 2 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 2 of relation "base\/.*\/.*$/
 		);
 
 		# Check that warnings/errors about page validity in an IO started by
@@ -1192,7 +1192,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_normal', 3, nblocks=>1, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation base\/\d+\/\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation "base\/\d+\/\d+"$/
 	);
 
 	my ($cs_count_after, $cs_ts_after) =
@@ -1214,7 +1214,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_temp', 4, nblocks=>2, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation base\/\d+\/t\d+_\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation "base\/\d+\/t\d+_\d+"$/
 	);
 
 	($cs_count_after, $cs_ts_after) = checksum_failures($psql_a, 'postgres');
@@ -1235,7 +1235,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('pg_shseclabel', 2, nblocks=>2, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 2..3 of relation global\/\d+\nDETAIL:  Block 2 held first invalid page\.\nHINT:[^\n]+$/
+		qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 2..3 of relation "global\/\d+"\nDETAIL:  Block 2 held the first invalid page\.\nHINT:[^\n]+$/
 	);
 
 	($cs_count_after, $cs_ts_after) = checksum_failures($psql_a);
@@ -1300,7 +1300,7 @@ sub test_checksum_createdb
 		"create database w/ wal strategy, invalid source",
 		$createdb_sql,
 		qr/^$/,
-		qr/psql:<stdin>:\d+: ERROR:  invalid page in block 1 of relation base\/\d+\/\d+$/
+		qr/psql:<stdin>:\d+: ERROR:  invalid page in block 1 of relation "base\/\d+\/\d+"$/
 	);
 	my ($cs_count_after, $cs_ts_after) =
 	  checksum_failures($psql, 'regression_createdb_source');
@@ -1409,7 +1409,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 2, nblocks=>3, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation base\/\d+\/\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation "base\/\d+\/\d+"$/
 	);
 
 	# Test multi-block read with different problems in different blocks
@@ -1431,7 +1431,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 1, nblocks=>5, zero_on_error=>true);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: WARNING:  zeroing 3 page\(s\) and ignoring 2 checksum failure\(s\) among blocks 1..5 of relation/
+		qr/^psql:<stdin>:\d+: WARNING:  zeroing 3 page\(s\) and ignoring 2 checksum failure\(s\) among blocks 1..5 of relation "/
 	);
 
 
@@ -1444,17 +1444,17 @@ sub test_ignore_checksum
 	ok(1, "$io_method: found information about checksum failure in block 2");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 3 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 3 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about invalid page in block 3");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 4 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 4 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about checksum failure in block 4");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 5 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 5 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about checksum failure in block 5");
 
@@ -1473,7 +1473,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 3, nblocks=>1, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation/);
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation "/);
 
 	psql_like(
 		$io_method,
@@ -1482,7 +1482,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 3, nblocks=>1, zero_on_error=>true);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation base\/.*; zeroing out page/
+		qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation "base\/.*"; zeroing out page/
 	);
 
 
diff --git a/src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c b/src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c
index 1354baa39ac..06cc0b307e3 100644
--- a/src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c
+++ b/src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c
@@ -4,7 +4,7 @@
  *		Test false positive rate of Bloom filter.
  *
  * Copyright (c) 2018-2025, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c
diff --git a/src/oracle_test/modules/test_cloexec/.gitignore b/src/oracle_test/modules/test_cloexec/.gitignore
new file mode 100644
index 00000000000..0234e9d8406
--- /dev/null
+++ b/src/oracle_test/modules/test_cloexec/.gitignore
@@ -0,0 +1,3 @@
+/test_cloexec
+# Generated subdirectories
+/tmp_check/
diff --git a/src/oracle_test/modules/test_cloexec/Makefile b/src/oracle_test/modules/test_cloexec/Makefile
new file mode 100644
index 00000000000..c73e6366eb6
--- /dev/null
+++ b/src/oracle_test/modules/test_cloexec/Makefile
@@ -0,0 +1,21 @@
+# src/oracle_test/modules/test_cloexec/Makefile
+
+PGFILEDESC = "test_cloexec - test O_CLOEXEC flag handling"
+PGAPPICON = win32
+
+PROGRAM = test_cloexec
+OBJS = $(WIN32RES) test_cloexec.o
+
+NO_INSTALLCHECK = 1
+TAP_TESTS = 1
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/oracle_test/modules/test_cloexec
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/src/oracle_test/modules/test_cloexec/meson.build b/src/oracle_test/modules/test_cloexec/meson.build
new file mode 100644
index 00000000000..a9e9fe269d7
--- /dev/null
+++ b/src/oracle_test/modules/test_cloexec/meson.build
@@ -0,0 +1,26 @@
+# src/oracle_test/modules/test_cloexec/meson.build
+
+# This test is Windows-only
+if host_system != 'windows'
+  subdir_done()
+endif
+
+test_cloexec_sources = files('test_cloexec.c')
+
+test_cloexec = executable('test_cloexec',
+  test_cloexec_sources,
+  dependencies: [frontend_code],
+  link_with: [pgport[''], pgcommon['']],
+  kwargs: default_bin_args,
+)
+
+tests += {
+  'name': 'test_cloexec',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'tap': {
+    'tests': [
+      't/001_cloexec.pl',
+    ],
+  },
+}
diff --git a/src/oracle_test/modules/test_cloexec/t/001_cloexec.pl b/src/oracle_test/modules/test_cloexec/t/001_cloexec.pl
new file mode 100644
index 00000000000..4c56eb3a4be
--- /dev/null
+++ b/src/oracle_test/modules/test_cloexec/t/001_cloexec.pl
@@ -0,0 +1,60 @@
+# Test O_CLOEXEC flag handling on Windows
+#
+# This test verifies that file handles opened with O_CLOEXEC are not
+# inherited by child processes, while handles opened without O_CLOEXEC
+# are inherited.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Utils;
+use Test::More;
+use IPC::Run qw(run);
+use File::Spec;
+use Cwd 'abs_path';
+
+if (!$PostgreSQL::Test::Utils::windows_os)
+{
+	plan skip_all => 'test is Windows-specific';
+}
+
+plan tests => 1;
+
+my $test_prog;
+foreach my $dir (split(/$Config::Config{path_sep}/, $ENV{PATH}))
+{
+	my $candidate = File::Spec->catfile($dir, 'test_cloexec.exe');
+	if (-f $candidate && -x $candidate)
+	{
+		$test_prog = $candidate;
+		last;
+	}
+}
+
+if (!$test_prog)
+{
+	$test_prog = './test_cloexec.exe';
+}
+
+if (!-f $test_prog)
+{
+	BAIL_OUT("test program not found: $test_prog");
+}
+
+note("Using test program: $test_prog");
+
+my ($stdout, $stderr);
+my $result = run [ $test_prog ], '>', \$stdout, '2>', \$stderr;
+
+note("Test program output:");
+note($stdout) if $stdout;
+
+if ($stderr)
+{
+	diag("Test program stderr:");
+	diag($stderr);
+}
+
+ok($result && $stdout =~ /SUCCESS.*O_CLOEXEC behavior verified/s,
+   "O_CLOEXEC prevents handle inheritance");
+
+done_testing();
\ No newline at end of file
diff --git a/src/oracle_test/modules/test_cloexec/test_cloexec.c b/src/oracle_test/modules/test_cloexec/test_cloexec.c
new file mode 100644
index 00000000000..aec8af9937d
--- /dev/null
+++ b/src/oracle_test/modules/test_cloexec/test_cloexec.c
@@ -0,0 +1,240 @@
+/*-------------------------------------------------------------------------
+ *
+ * test_cloexec.c
+ *		Test O_CLOEXEC flag handling on Windows
+ *
+ * This program tests that:
+ * 1. File handles opened with O_CLOEXEC are NOT inherited by child processes
+ * 2. File handles opened without O_CLOEXEC ARE inherited by child processes
+ *
+ * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#include "common/file_utils.h"
+#include "port.h"
+
+#ifdef WIN32
+static void run_parent_tests(const char *testfile1, const char *testfile2);
+static void run_child_tests(const char *handle1_str, const char *handle2_str);
+static bool try_write_to_handle(HANDLE h, const char *label);
+#endif
+
+int
+main(int argc, char *argv[])
+{
+	/* Windows-only test */
+#ifndef WIN32
+	fprintf(stderr, "This test only runs on Windows\n");
+	return 0;
+#else
+	char		testfile1[MAXPGPATH];
+	char		testfile2[MAXPGPATH];
+
+	if (argc == 3)
+	{
+		/*
+		 * Child mode: receives two handle values as hex strings and attempts
+		 * to write to them.
+		 */
+		run_child_tests(argv[1], argv[2]);
+		return 0;
+	}
+	else if (argc == 1)
+	{
+		/* Parent mode: opens files and spawns child */
+		snprintf(testfile1, sizeof(testfile1), "test_cloexec_1_%d.tmp", (int) getpid());
+		snprintf(testfile2, sizeof(testfile2), "test_cloexec_2_%d.tmp", (int) getpid());
+
+		run_parent_tests(testfile1, testfile2);
+
+		/* Clean up test files */
+		unlink(testfile1);
+		unlink(testfile2);
+
+		return 0;
+	}
+	else
+	{
+		fprintf(stderr, "Usage: %s [handle1_hex handle2_hex]\n", argv[0]);
+		return 1;
+	}
+#endif
+}
+
+#ifdef WIN32
+static void
+run_parent_tests(const char *testfile1, const char *testfile2)
+{
+	int			fd1,
+				fd2;
+	HANDLE		h1,
+				h2;
+	char		exe_path[MAXPGPATH];
+	char		cmdline[MAXPGPATH + 100];
+	STARTUPINFO si = {.cb = sizeof(si)};
+	PROCESS_INFORMATION pi = {0};
+	DWORD		exit_code;
+
+	printf("Parent: Opening test files...\n");
+
+	/* Open first file WITH O_CLOEXEC - should NOT be inherited */
+	fd1 = open(testfile1, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0600);
+	if (fd1 < 0)
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", testfile1, strerror(errno));
+		exit(1);
+	}
+
+	/* Open second file WITHOUT O_CLOEXEC - should be inherited */
+	fd2 = open(testfile2, O_RDWR | O_CREAT | O_TRUNC, 0600);
+	if (fd2 < 0)
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", testfile2, strerror(errno));
+		close(fd1);
+		exit(1);
+	}
+
+	/* Get Windows HANDLEs from file descriptors */
+	h1 = (HANDLE) _get_osfhandle(fd1);
+	h2 = (HANDLE) _get_osfhandle(fd2);
+
+	if (h1 == INVALID_HANDLE_VALUE || h2 == INVALID_HANDLE_VALUE)
+	{
+		fprintf(stderr, "Failed to get OS handles\n");
+		close(fd1);
+		close(fd2);
+		exit(1);
+	}
+
+	printf("Parent: fd1=%d (O_CLOEXEC) -> HANDLE=%p\n", fd1, h1);
+	printf("Parent: fd2=%d (no O_CLOEXEC) -> HANDLE=%p\n", fd2, h2);
+
+	/*
+	 * Find the actual executable path by removing any arguments from
+	 * GetCommandLine(), and add our new arguments.
+	 */
+	GetModuleFileName(NULL, exe_path, sizeof(exe_path));
+	snprintf(cmdline, sizeof(cmdline), "\"%s\" %p %p", exe_path, h1, h2);
+
+	printf("Parent: Spawning child process...\n");
+	printf("Parent: Command line: %s\n", cmdline);
+
+	if (!CreateProcess(NULL,	/* application name */
+					   cmdline, /* command line */
+					   NULL,	/* process security attributes */
+					   NULL,	/* thread security attributes */
+					   TRUE,	/* bInheritHandles - CRITICAL! */
+					   0,		/* creation flags */
+					   NULL,	/* environment */
+					   NULL,	/* current directory */
+					   &si,		/* startup info */
+					   &pi))	/* process information */
+	{
+		fprintf(stderr, "CreateProcess failed: %lu\n", GetLastError());
+		close(fd1);
+		close(fd2);
+		exit(1);
+	}
+
+	printf("Parent: Waiting for child process...\n");
+
+	/* Wait for child to complete */
+	WaitForSingleObject(pi.hProcess, INFINITE);
+	GetExitCodeProcess(pi.hProcess, &exit_code);
+
+	CloseHandle(pi.hProcess);
+	CloseHandle(pi.hThread);
+
+	close(fd1);
+	close(fd2);
+
+	printf("Parent: Child exit code: %lu\n", exit_code);
+
+	if (exit_code == 0)
+	{
+		printf("Parent: SUCCESS - O_CLOEXEC behavior verified\n");
+	}
+	else
+	{
+		printf("Parent: FAILURE - O_CLOEXEC not working correctly\n");
+		exit(1);
+	}
+}
+
+static void
+run_child_tests(const char *handle1_str, const char *handle2_str)
+{
+	HANDLE		h1,
+				h2;
+	bool		h1_worked,
+				h2_worked;
+
+	/* Parse handle values from hex strings */
+	if (sscanf(handle1_str, "%p", &h1) != 1 ||
+		sscanf(handle2_str, "%p", &h2) != 1)
+	{
+		fprintf(stderr, "Child: Failed to parse handle values\n");
+		exit(1);
+	}
+
+	printf("Child: Received HANDLE1=%p (should fail - O_CLOEXEC)\n", h1);
+	printf("Child: Received HANDLE2=%p (should work - no O_CLOEXEC)\n", h2);
+
+	/* Try to write to both handles */
+	h1_worked = try_write_to_handle(h1, "HANDLE1");
+	h2_worked = try_write_to_handle(h2, "HANDLE2");
+
+	printf("Child: HANDLE1 (O_CLOEXEC): %s\n",
+		   h1_worked ? "ACCESSIBLE (BAD!)" : "NOT ACCESSIBLE (GOOD!)");
+	printf("Child: HANDLE2 (no O_CLOEXEC): %s\n",
+		   h2_worked ? "ACCESSIBLE (GOOD!)" : "NOT ACCESSIBLE (BAD!)");
+
+	/*
+	 * For O_CLOEXEC to work correctly, h1 should NOT be accessible (h1_worked
+	 * == false) and h2 SHOULD be accessible (h2_worked == true).
+	 */
+	if (!h1_worked && h2_worked)
+	{
+		printf("Child: Test PASSED - O_CLOEXEC working correctly\n");
+		exit(0);
+	}
+	else
+	{
+		printf("Child: Test FAILED - O_CLOEXEC not working correctly\n");
+		exit(1);
+	}
+}
+
+static bool
+try_write_to_handle(HANDLE h, const char *label)
+{
+	const char *test_data = "test\n";
+	DWORD		bytes_written;
+	BOOL		result;
+
+	result = WriteFile(h, test_data, strlen(test_data), &bytes_written, NULL);
+
+	if (result && bytes_written == strlen(test_data))
+	{
+		printf("Child: Successfully wrote to %s\n", label);
+		return true;
+	}
+	else
+	{
+		printf("Child: Failed to write to %s (error %lu)\n",
+			   label, GetLastError());
+		return false;
+	}
+}
+#endif
diff --git a/src/oracle_test/modules/test_copy_callbacks/test_copy_callbacks.c b/src/oracle_test/modules/test_copy_callbacks/test_copy_callbacks.c
index 4436125b782..e5a0991bdd0 100644
--- a/src/oracle_test/modules/test_copy_callbacks/test_copy_callbacks.c
+++ b/src/oracle_test/modules/test_copy_callbacks/test_copy_callbacks.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_bloomfilter/test_bloomfilter.c
diff --git a/src/oracle_test/modules/test_custom_rmgrs/test_custom_rmgrs.c b/src/oracle_test/modules/test_custom_rmgrs/test_custom_rmgrs.c
index ee3bcfe563b..fa2b9acce4f 100644
--- a/src/oracle_test/modules/test_custom_rmgrs/test_custom_rmgrs.c
+++ b/src/oracle_test/modules/test_custom_rmgrs/test_custom_rmgrs.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_custom_rmgrs/test_custom_rmgrs.c
diff --git a/src/oracle_test/modules/test_custom_types/.gitignore b/src/oracle_test/modules/test_custom_types/.gitignore
new file mode 100644
index 00000000000..5dcb3ff9723
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/src/oracle_test/modules/test_custom_types/Makefile b/src/oracle_test/modules/test_custom_types/Makefile
new file mode 100644
index 00000000000..9f8e31c7c91
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/Makefile
@@ -0,0 +1,20 @@
+# src/oracle_test/modules/test_custom_types/Makefile
+
+MODULES = test_custom_types
+
+EXTENSION = test_custom_types
+DATA = test_custom_types--1.0.sql
+PGFILEDESC = "test_custom_types - tests for dummy custom types"
+
+REGRESS = test_custom_types
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/oracle_test/modules/test_custom_types
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/src/oracle_test/modules/test_custom_types/README b/src/oracle_test/modules/test_custom_types/README
new file mode 100644
index 00000000000..a37d2db577e
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/README
@@ -0,0 +1,9 @@
+test_custom_types
+=================
+
+This module contains a set of custom data types, with some of the following
+patterns:
+
+- typanalyze function registered to a custom type, returning false.
+- typanalyze function registered to a custom type, registering invalid stats
+  data.
diff --git a/src/oracle_test/modules/test_custom_types/expected/test_custom_types.out b/src/oracle_test/modules/test_custom_types/expected/test_custom_types.out
new file mode 100644
index 00000000000..2fb6b0b10ee
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/expected/test_custom_types.out
@@ -0,0 +1,174 @@
+-- Tests with various custom types
+CREATE EXTENSION test_custom_types;
+-- Test comparison functions
+SELECT '42'::int_custom = '42'::int_custom AS eq_test;
+ eq_test 
+---------
+ t
+(1 row)
+
+SELECT '42'::int_custom <> '42'::int_custom AS nt_test;
+ nt_test 
+---------
+ f
+(1 row)
+
+SELECT '42'::int_custom < '100'::int_custom AS lt_test;
+ lt_test 
+---------
+ t
+(1 row)
+
+SELECT '100'::int_custom > '42'::int_custom AS gt_test;
+ gt_test 
+---------
+ t
+(1 row)
+
+SELECT '42'::int_custom <= '100'::int_custom AS le_test;
+ le_test 
+---------
+ t
+(1 row)
+
+SELECT '100'::int_custom >= '42'::int_custom AS ge_test;
+ ge_test 
+---------
+ t
+(1 row)
+
+-- Create a table with the int_custom type
+CREATE TABLE test_table (
+    id int,
+    data int_custom
+);
+INSERT INTO test_table VALUES (1, '42'), (2, '100'), (3, '200');
+-- Verify data was inserted correctly
+SELECT * FROM test_table ORDER BY id;
+ id | data 
+----+------
+  1 | 42
+  2 | 100
+  3 | 200
+(3 rows)
+
+-- Dummy function used for expression evaluations.
+-- Note that this function does not use a SQL-standard function body on
+-- purpose, so as external statistics can be loaded from it.
+CREATE OR REPLACE FUNCTION func_int_custom (p_value int_custom)
+  RETURNS int_custom LANGUAGE plpgsql AS $$
+  BEGIN
+    RETURN p_value;
+  END; $$;
+-- Switch type to use typanalyze function that always returns false.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_false);
+-- Extended statistics with an attribute that cannot be analyzed.
+-- This includes all statistics kinds.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+WARNING:  statistics object "public.test_stats" could not be computed for relation "public.test_table"
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- Extended statistics with an expression that cannot be analyzed.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+WARNING:  statistics object "public.test_stats" could not be computed for relation "public.test_table"
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- There should be no data stored for the expression.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+(0 rows)
+
+-- Switch type to use typanalyze function that generates invalid data.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_invalid);
+-- Extended statistics with an attribute that generates invalid stats.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- Extended statistics with an expression that generates invalid data.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, some data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | f
+(1 row)
+
+-- There should be some data stored for the expression, stored as NULL.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width,
+  n_distinct,
+  most_common_vals,
+  most_common_freqs,
+  histogram_bounds,
+  correlation,
+  most_common_elems,
+  most_common_elem_freqs,
+  elem_count_histogram
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+-[ RECORD 1 ]----------+-----------
+tablename              | test_table
+statistics_name        | test_stats
+null_frac              | 
+avg_width              | 
+n_distinct             | 
+most_common_vals       | 
+most_common_freqs      | 
+histogram_bounds       | 
+correlation            | 
+most_common_elems      | 
+most_common_elem_freqs | 
+elem_count_histogram   | 
+
+-- Run a query able to load the extended stats, including the NULL data.
+SELECT COUNT(*) FROM test_table GROUP BY (func_int_custom(data));
+ count 
+-------
+     1
+     1
+     1
+(3 rows)
+
+DROP STATISTICS test_stats;
+-- Cleanup
+DROP FUNCTION func_int_custom;
+DROP TABLE test_table;
+DROP EXTENSION test_custom_types;
diff --git a/src/oracle_test/modules/test_custom_types/meson.build b/src/oracle_test/modules/test_custom_types/meson.build
new file mode 100644
index 00000000000..3d4f433dd51
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/meson.build
@@ -0,0 +1,33 @@
+# Copyright (c) 2026, PostgreSQL Global Development Group
+
+test_custom_types_sources = files(
+  'test_custom_types.c',
+)
+
+if host_system == 'windows'
+  test_custom_types_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'test_custom_types',
+    '--FILEDESC', 'test_custom_types - tests for dummy custom types',])
+endif
+
+test_custom_types = shared_module('test_custom_types',
+  test_custom_types_sources,
+  kwargs: pg_test_mod_args,
+)
+test_install_libs += test_custom_types
+
+test_install_data += files(
+  'test_custom_types.control',
+  'test_custom_types--1.0.sql',
+)
+
+tests += {
+  'name': 'test_custom_types',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'test_custom_types',
+    ],
+  },
+}
diff --git a/src/oracle_test/modules/test_custom_types/sql/test_custom_types.sql b/src/oracle_test/modules/test_custom_types/sql/test_custom_types.sql
new file mode 100644
index 00000000000..68cdf8718a5
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/sql/test_custom_types.sql
@@ -0,0 +1,105 @@
+-- Tests with various custom types
+
+CREATE EXTENSION test_custom_types;
+
+-- Test comparison functions
+SELECT '42'::int_custom = '42'::int_custom AS eq_test;
+SELECT '42'::int_custom <> '42'::int_custom AS nt_test;
+SELECT '42'::int_custom < '100'::int_custom AS lt_test;
+SELECT '100'::int_custom > '42'::int_custom AS gt_test;
+SELECT '42'::int_custom <= '100'::int_custom AS le_test;
+SELECT '100'::int_custom >= '42'::int_custom AS ge_test;
+
+-- Create a table with the int_custom type
+CREATE TABLE test_table (
+    id int,
+    data int_custom
+);
+INSERT INTO test_table VALUES (1, '42'), (2, '100'), (3, '200');
+
+-- Verify data was inserted correctly
+SELECT * FROM test_table ORDER BY id;
+
+-- Dummy function used for expression evaluations.
+-- Note that this function does not use a SQL-standard function body on
+-- purpose, so as external statistics can be loaded from it.
+CREATE OR REPLACE FUNCTION func_int_custom (p_value int_custom)
+  RETURNS int_custom LANGUAGE plpgsql AS $$
+  BEGIN
+    RETURN p_value;
+  END; $$;
+/
+
+-- Switch type to use typanalyze function that always returns false.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_false);
+
+-- Extended statistics with an attribute that cannot be analyzed.
+-- This includes all statistics kinds.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+
+-- Extended statistics with an expression that cannot be analyzed.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+-- There should be no data stored for the expression.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+
+-- Switch type to use typanalyze function that generates invalid data.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_invalid);
+
+-- Extended statistics with an attribute that generates invalid stats.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+
+-- Extended statistics with an expression that generates invalid data.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, some data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+-- There should be some data stored for the expression, stored as NULL.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width,
+  n_distinct,
+  most_common_vals,
+  most_common_freqs,
+  histogram_bounds,
+  correlation,
+  most_common_elems,
+  most_common_elem_freqs,
+  elem_count_histogram
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+-- Run a query able to load the extended stats, including the NULL data.
+SELECT COUNT(*) FROM test_table GROUP BY (func_int_custom(data));
+DROP STATISTICS test_stats;
+
+-- Cleanup
+DROP FUNCTION func_int_custom;
+DROP TABLE test_table;
+DROP EXTENSION test_custom_types;
diff --git a/src/oracle_test/modules/test_custom_types/test_custom_types--1.0.sql b/src/oracle_test/modules/test_custom_types/test_custom_types--1.0.sql
new file mode 100644
index 00000000000..c85bcbd24ff
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/test_custom_types--1.0.sql
@@ -0,0 +1,175 @@
+/* src/oracle_test/modules/test_custom_types/test_custom_types--1.0.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION test_custom_types" to load this file. \quit
+
+--
+-- Input/output functions for int_custom type
+--
+CREATE FUNCTION int_custom_in(cstring)
+RETURNS int_custom
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_out(int_custom)
+RETURNS cstring
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+--
+-- Typanalyze function that returns false
+--
+CREATE FUNCTION int_custom_typanalyze_false(internal)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+/
+
+--
+-- Typanalyze function that returns invalid stats
+--
+CREATE FUNCTION int_custom_typanalyze_invalid(internal)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+/
+
+--
+-- The int_custom type definition
+--
+-- This type is identical to int4 in storage, and is used in subsequent
+-- tests to have different properties.
+--
+CREATE TYPE int_custom (
+  INPUT = int_custom_in,
+  OUTPUT = int_custom_out,
+  LIKE = int4
+);
+
+--
+-- Comparison functions for int_custom
+--
+-- These are required to create a btree operator class, which is needed
+-- for the type to be usable in extended statistics objects.
+--
+CREATE FUNCTION int_custom_eq(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_ne(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_lt(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_le(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_gt(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_ge(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+CREATE FUNCTION int_custom_cmp(int_custom, int_custom)
+RETURNS integer
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+/
+
+-- Operators for int_custom, for btree operator class
+CREATE OPERATOR = (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_eq,
+  COMMUTATOR = =,
+  NEGATOR = <>,
+  RESTRICT = eqsel,
+  JOIN = eqjoinsel,
+  HASHES,
+  MERGES
+);
+
+CREATE OPERATOR <> (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_ne,
+  COMMUTATOR = <>,
+  NEGATOR = =,
+  RESTRICT = neqsel,
+  JOIN = neqjoinsel
+);
+
+CREATE OPERATOR < (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_lt,
+  COMMUTATOR = >,
+  NEGATOR = >=,
+  RESTRICT = scalarltsel,
+  JOIN = scalarltjoinsel
+);
+
+CREATE OPERATOR <= (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_le,
+  COMMUTATOR = >=,
+  NEGATOR = >,
+  RESTRICT = scalarlesel,
+  JOIN = scalarlejoinsel
+);
+
+CREATE OPERATOR > (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_gt,
+  COMMUTATOR = <,
+  NEGATOR = <=,
+  RESTRICT = scalargtsel,
+  JOIN = scalargtjoinsel
+);
+
+CREATE OPERATOR >= (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_ge,
+  COMMUTATOR = <=,
+  NEGATOR = <,
+  RESTRICT = scalargesel,
+  JOIN = scalargejoinsel
+);
+
+--
+-- Btree operator class for int_custom
+--
+-- This is required for the type to be usable in extended statistics objects,
+-- for attributes and expressions.
+--
+CREATE OPERATOR CLASS int_custom_ops
+  DEFAULT FOR TYPE int_custom USING btree AS
+    OPERATOR    1     <,
+    OPERATOR    2     <=,
+    OPERATOR    3     =,
+    OPERATOR    4     >=,
+    OPERATOR    5     >,
+    FUNCTION    1     int_custom_cmp(int_custom, int_custom);
diff --git a/src/oracle_test/modules/test_custom_types/test_custom_types.c b/src/oracle_test/modules/test_custom_types/test_custom_types.c
new file mode 100644
index 00000000000..45e72056a1f
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/test_custom_types.c
@@ -0,0 +1,182 @@
+/*--------------------------------------------------------------------------
+ *
+ * test_custom_types.c
+ *		Test module for a set of functions for custom types.
+ *
+ * The custom type used in this module is similar to int4 for simplicity,
+ * except that it is able to use various typanalyze functions to enforce
+ * check patterns with ANALYZE.
+ *
+ * Copyright (c) 1996-2026, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *		src/oracle_test/modules/test_custom_types/test_custom_types.c
+ *
+ *--------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "commands/vacuum.h"
+#include "utils/builtins.h"
+
+PG_MODULE_MAGIC;
+
+/* Function declarations */
+PG_FUNCTION_INFO_V1(int_custom_in);
+PG_FUNCTION_INFO_V1(int_custom_out);
+PG_FUNCTION_INFO_V1(int_custom_typanalyze_false);
+PG_FUNCTION_INFO_V1(int_custom_typanalyze_invalid);
+PG_FUNCTION_INFO_V1(int_custom_eq);
+PG_FUNCTION_INFO_V1(int_custom_ne);
+PG_FUNCTION_INFO_V1(int_custom_lt);
+PG_FUNCTION_INFO_V1(int_custom_le);
+PG_FUNCTION_INFO_V1(int_custom_gt);
+PG_FUNCTION_INFO_V1(int_custom_ge);
+PG_FUNCTION_INFO_V1(int_custom_cmp);
+
+/*
+ * int_custom_in - input function for int_custom type
+ *
+ * Converts a string to a int_custom (which is just an int32 internally).
+ */
+Datum
+int_custom_in(PG_FUNCTION_ARGS)
+{
+	char	   *num = PG_GETARG_CSTRING(0);
+
+	PG_RETURN_INT32(pg_strtoint32_safe(num, fcinfo->context));
+}
+
+/*
+ * int_custom_out - output function for int_custom type
+ *
+ * Converts a int_custom to a string.
+ */
+Datum
+int_custom_out(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	char	   *result = (char *) palloc(12);	/* sign, 10 digits, '\0' */
+
+	pg_ltoa(arg1, result);
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ * int_custom_typanalyze_false - typanalyze function that returns false
+ *
+ * This function returns false, to simulate a type that cannot be analyzed.
+ */
+Datum
+int_custom_typanalyze_false(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BOOL(false);
+}
+
+/*
+ * Callback used to compute invalid statistics.
+ */
+static void
+int_custom_invalid_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
+						 int samplerows, double totalrows)
+{
+	/* We are not valid, and do not want to be. */
+	stats->stats_valid = false;
+}
+
+/*
+ * int_custom_typanalyze_invalid
+ *
+ * This function sets some invalid stats data, letting the caller know that
+ * we are safe for an analyze, returning true.
+ */
+Datum
+int_custom_typanalyze_invalid(PG_FUNCTION_ARGS)
+{
+	VacAttrStats *stats = (VacAttrStats *) PG_GETARG_POINTER(0);
+
+	/* If the attstattarget column is negative, use the default value */
+	if (stats->attstattarget < 0)
+		stats->attstattarget = default_statistics_target;
+
+	/* Buggy number, no need to care as long as it is positive */
+	stats->minrows = 300;
+
+	/* Set callback to compute some invalid stats */
+	stats->compute_stats = int_custom_invalid_stats;
+
+	PG_RETURN_BOOL(true);
+}
+
+/*
+ * Comparison functions for int_custom type
+ */
+Datum
+int_custom_eq(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 == arg2);
+}
+
+Datum
+int_custom_ne(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 != arg2);
+}
+
+Datum
+int_custom_lt(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 < arg2);
+}
+
+Datum
+int_custom_le(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 <= arg2);
+}
+
+Datum
+int_custom_gt(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 > arg2);
+}
+
+Datum
+int_custom_ge(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 >= arg2);
+}
+
+Datum
+int_custom_cmp(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	if (arg1 < arg2)
+		PG_RETURN_INT32(-1);
+	else if (arg1 > arg2)
+		PG_RETURN_INT32(1);
+	else
+		PG_RETURN_INT32(0);
+}
diff --git a/src/oracle_test/modules/test_custom_types/test_custom_types.control b/src/oracle_test/modules/test_custom_types/test_custom_types.control
new file mode 100644
index 00000000000..d25a74ef5c4
--- /dev/null
+++ b/src/oracle_test/modules/test_custom_types/test_custom_types.control
@@ -0,0 +1,5 @@
+# test_custom_types extension
+comment = 'Tests for dummy custom types'
+default_version = '1.0'
+module_pathname = '$libdir/test_custom_types'
+relocatable = true
diff --git a/src/oracle_test/modules/test_ddl_deparse/Makefile b/src/oracle_test/modules/test_ddl_deparse/Makefile
index be70a99b2a0..163443bb477 100644
--- a/src/oracle_test/modules/test_ddl_deparse/Makefile
+++ b/src/oracle_test/modules/test_ddl_deparse/Makefile
@@ -28,6 +28,7 @@ REGRESS = test_ddl_deparse \
 	alter_type_enum \
 	opfamily \
 	defprivs \
+	textsearch \
 	matviews
 
 EXTRA_INSTALL = contrib/pg_stat_statements
diff --git a/src/oracle_test/modules/test_ddl_deparse/expected/textsearch.out b/src/oracle_test/modules/test_ddl_deparse/expected/textsearch.out
new file mode 100644
index 00000000000..da0d89e9704
--- /dev/null
+++ b/src/oracle_test/modules/test_ddl_deparse/expected/textsearch.out
@@ -0,0 +1,5 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+NOTICE:  DDL test: type simple, tag CREATE TEXT SEARCH CONFIGURATION
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;
+NOTICE:  DDL test: type alter text search configuration, tag ALTER TEXT SEARCH CONFIGURATION
diff --git a/src/oracle_test/modules/test_ddl_deparse/meson.build b/src/oracle_test/modules/test_ddl_deparse/meson.build
index 640c0226413..8f3cda4fcd4 100644
--- a/src/oracle_test/modules/test_ddl_deparse/meson.build
+++ b/src/oracle_test/modules/test_ddl_deparse/meson.build
@@ -47,6 +47,7 @@ tests += {
       'alter_type_enum',
       'opfamily',
       'defprivs',
+      'textsearch',
       'matviews',
     ],
   },
diff --git a/src/oracle_test/modules/test_ddl_deparse/sql/textsearch.sql b/src/oracle_test/modules/test_ddl_deparse/sql/textsearch.sql
new file mode 100644
index 00000000000..633899a31cb
--- /dev/null
+++ b/src/oracle_test/modules/test_ddl_deparse/sql/textsearch.sql
@@ -0,0 +1,3 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;
diff --git a/src/oracle_test/modules/test_ddl_deparse/test_ddl_deparse.c b/src/oracle_test/modules/test_ddl_deparse/test_ddl_deparse.c
index 961bc67f8e4..559079fb2d6 100644
--- a/src/oracle_test/modules/test_ddl_deparse/test_ddl_deparse.c
+++ b/src/oracle_test/modules/test_ddl_deparse/test_ddl_deparse.c
@@ -3,7 +3,7 @@
  *		Support functions for the test_ddl_deparse module
  *
  * Copyright (c) 2014-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/oracle_test/modules/test_ddl_deparse/test_ddl_deparse.c
diff --git a/src/oracle_test/modules/test_dsa/expected/test_dsa.out b/src/oracle_test/modules/test_dsa/expected/test_dsa.out
index 266010e77fe..4b53a7de4a4 100644
--- a/src/oracle_test/modules/test_dsa/expected/test_dsa.out
+++ b/src/oracle_test/modules/test_dsa/expected/test_dsa.out
@@ -11,3 +11,19 @@ SELECT test_dsa_resowners();
  
 (1 row)
 
+-- Test allocations across a pre-defined range of pages.  This covers enough
+-- range to check for the case of odd-sized segments, without making the test
+-- too slow.
+SELECT test_dsa_allocate(1001, 2000, 100);
+ test_dsa_allocate 
+-------------------
+ 
+(1 row)
+
+-- Larger size with odd-sized segment.
+SELECT test_dsa_allocate(6501, 6600, 100);
+ test_dsa_allocate 
+-------------------
+ 
+(1 row)
+
diff --git a/src/oracle_test/modules/test_dsa/sql/test_dsa.sql b/src/oracle_test/modules/test_dsa/sql/test_dsa.sql
index c3d8db94372..99b4a60dd14 100644
--- a/src/oracle_test/modules/test_dsa/sql/test_dsa.sql
+++ b/src/oracle_test/modules/test_dsa/sql/test_dsa.sql
@@ -2,3 +2,10 @@ CREATE EXTENSION test_dsa;
 
 SELECT test_dsa_basic();
 SELECT test_dsa_resowners();
+
+-- Test allocations across a pre-defined range of pages.  This covers enough
+-- range to check for the case of odd-sized segments, without making the test
+-- too slow.
+SELECT test_dsa_allocate(1001, 2000, 100);
+-- Larger size with odd-sized segment.
+SELECT test_dsa_allocate(6501, 6600, 100);
diff --git a/src/oracle_test/modules/test_dsa/test_dsa--1.0.sql b/src/oracle_test/modules/test_dsa/test_dsa--1.0.sql
index 87bd7a26f4f..df9aa090726 100644
--- a/src/oracle_test/modules/test_dsa/test_dsa--1.0.sql
+++ b/src/oracle_test/modules/test_dsa/test_dsa--1.0.sql
@@ -10,3 +10,7 @@ CREATE FUNCTION test_dsa_basic()
 CREATE FUNCTION test_dsa_resowners()
 	RETURNS pg_catalog.void
 	AS 'MODULE_PATHNAME' LANGUAGE C;
+
+CREATE FUNCTION test_dsa_allocate(int, int, int)
+	RETURNS pg_catalog.void
+	AS 'MODULE_PATHNAME' LANGUAGE C;
diff --git a/src/oracle_test/modules/test_dsa/test_dsa.c b/src/oracle_test/modules/test_dsa/test_dsa.c
index 0b3d9a1fb76..4d021ed90c2 100644
--- a/src/oracle_test/modules/test_dsa/test_dsa.c
+++ b/src/oracle_test/modules/test_dsa/test_dsa.c
@@ -4,7 +4,7 @@
  *		Test dynamic shared memory areas (DSAs)
  *
  * Copyright (c) 2022-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/test/modules/test_dsa/test_dsa.c
@@ -14,8 +14,10 @@
 #include "postgres.h"
 
 #include "fmgr.h"
+#include "storage/dsm_registry.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
+#include "utils/freepage.h"
 #include "utils/resowner.h"
 
 PG_MODULE_MAGIC;
@@ -112,3 +114,42 @@ test_dsa_resowners(PG_FUNCTION_ARGS)
 
 	PG_RETURN_VOID();
 }
+
+/*
+ * test_dsa_allocate
+ *
+ * Test DSA allocation across a range of sizes to exercise the pagemap
+ * sizing logic in make_new_segment().  A fresh DSA is created for each
+ * iteration so that each allocation triggers a new segment creation,
+ * including the odd-sized segment path.
+ */
+PG_FUNCTION_INFO_V1(test_dsa_allocate);
+Datum
+test_dsa_allocate(PG_FUNCTION_ARGS)
+{
+	int			start_num_pages = PG_GETARG_INT32(0);
+	int			end_num_pages = PG_GETARG_INT32(1);
+	int			step = PG_GETARG_INT32(2);
+	size_t		usable_pages;
+	int			tranche_id;
+	dsa_area   *a;
+	dsa_pointer dp;
+
+	if (start_num_pages > end_num_pages)
+		elog(ERROR, "incorrect start and end parameters");
+
+	/* XXX: this tranche is leaked */
+	tranche_id = LWLockNewTrancheId();
+	LWLockRegisterTranche(tranche_id, "test_dsa");
+
+	for (usable_pages = start_num_pages; usable_pages < end_num_pages; usable_pages += step)
+	{
+		a = dsa_create(tranche_id);
+		dp = dsa_allocate(a, usable_pages * FPM_PAGE_SIZE);
+
+		dsa_free(a, dp);
+		dsa_detach(a);
+	}
+
+	PG_RETURN_VOID();
+}
diff --git a/src/oracle_test/modules/test_dsm_registry/test_dsm_registry.c b/src/oracle_test/modules/test_dsm_registry/test_dsm_registry.c
index 0d29d2aaabf..f81283fd4b7 100644
--- a/src/oracle_test/modules/test_dsm_registry/test_dsm_registry.c
+++ b/src/oracle_test/modules/test_dsm_registry/test_dsm_registry.c
@@ -4,7 +4,7 @@
  *	  Test the dynamic shared memory registry.
  *
  * Copyright (c) 2024-2025, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_dsm_registry/test_dsm_registry.c
diff --git a/src/oracle_test/modules/test_extensions/t/001_extension_control_path.pl b/src/oracle_test/modules/test_extensions/t/001_extension_control_path.pl
index 1a9c97bbf4d..7fbe5bde332 100644
--- a/src/oracle_test/modules/test_extensions/t/001_extension_control_path.pl
+++ b/src/oracle_test/modules/test_extensions/t/001_extension_control_path.pl
@@ -11,12 +11,15 @@
 
 $node->init;
 
-# Create a temporary directory for the extension control file
+# Create temporary directories for the extension control files
 my $ext_dir = PostgreSQL::Test::Utils::tempdir();
 mkpath("$ext_dir/extension");
+my $ext_dir2 = PostgreSQL::Test::Utils::tempdir();
+mkpath("$ext_dir2/extension");
 
 my $ext_name = "test_custom_ext_paths";
 create_extension($ext_name, $ext_dir);
+create_extension($ext_name, $ext_dir2);
 
 my $ext_name2 = "test_custom_ext_paths_using_directory";
 mkpath("$ext_dir/$ext_name2");
@@ -26,7 +29,7 @@
 my $sep = $windows_os ? ";" : ":";
 $node->append_conf(
 	'postgresql.conf', qq{
-extension_control_path = '\$system$sep@{[ $windows_os ? ($ext_dir =~ s/\\/\\\\/gr) : $ext_dir ]}'
+extension_control_path = '\$system$sep@{[ $windows_os ? ($ext_dir =~ s/\\/\\\\/gr) : $ext_dir ]}$sep@{[ $windows_os ? ($ext_dir2 =~ s/\\/\\\\/gr) : $ext_dir2 ]}'
 });
 
 # Start node
@@ -34,7 +37,7 @@
 
 my $ecp = $node->safe_psql('postgres', 'show extension_control_path;');
 
-is($ecp, "\$system$sep$ext_dir",
+is($ecp, "\$system$sep$ext_dir$sep$ext_dir2",
 	"custom extension control directory path configured");
 
 $node->safe_psql('postgres', "CREATE EXTENSION $ext_name");
diff --git a/src/oracle_test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/oracle_test/modules/test_ginpostinglist/test_ginpostinglist.c
index f58c7f444da..1ec757d7e43 100644
--- a/src/oracle_test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/oracle_test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -8,7 +8,7 @@
  * IDENTIFICATION
  *		src/oracle_test/modules/test_ginpostinglist/test_ginpostinglist.c
  *
- * Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * -------------------------------------------------------------------------
  */
@@ -74,12 +74,12 @@ test_itemptr_pair(BlockNumber blk, OffsetNumber off, int maxsize)
 			 ItemPointerGetOffsetNumber(&decoded_itemptrs[0]));
 
 	if (ndecoded == 2 &&
-		!ItemPointerEquals(&orig_itemptrs[0], &decoded_itemptrs[0]))
+		!ItemPointerEquals(&orig_itemptrs[1], &decoded_itemptrs[1]))
 	{
 		elog(ERROR, "mismatch on second itemptr: (%u, %d) vs (%u, %d)",
-			 0, 1,
-			 ItemPointerGetBlockNumber(&decoded_itemptrs[0]),
-			 ItemPointerGetOffsetNumber(&decoded_itemptrs[0]));
+			 blk, off,
+			 ItemPointerGetBlockNumber(&decoded_itemptrs[1]),
+			 ItemPointerGetOffsetNumber(&decoded_itemptrs[1]));
 	}
 }
 
diff --git a/src/oracle_test/modules/test_integerset/test_integerset.c b/src/oracle_test/modules/test_integerset/test_integerset.c
index 1d3bb507a4b..bdf52f0e4a3 100644
--- a/src/oracle_test/modules/test_integerset/test_integerset.c
+++ b/src/oracle_test/modules/test_integerset/test_integerset.c
@@ -4,7 +4,7 @@
  *		Test integer set data structure.
  *
  * Copyright (c) 2019-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_integerset/test_integerset.c
diff --git a/src/oracle_test/modules/test_json_parser/.gitignore b/src/oracle_test/modules/test_json_parser/.gitignore
index 2c176672db7..97a9e7fe9fb 100644
--- a/src/oracle_test/modules/test_json_parser/.gitignore
+++ b/src/oracle_test/modules/test_json_parser/.gitignore
@@ -1,3 +1,4 @@
 tmp_check
 test_json_parser_perf
 test_json_parser_incremental
+/test_json_parser_incremental_shlib
diff --git a/src/oracle_test/modules/test_json_parser/test_json_parser_perf.c b/src/oracle_test/modules/test_json_parser/test_json_parser_perf.c
index 98e4cb78c9d..747e0fac1a5 100644
--- a/src/oracle_test/modules/test_json_parser/test_json_parser_perf.c
+++ b/src/oracle_test/modules/test_json_parser/test_json_parser_perf.c
@@ -4,7 +4,7 @@
  *    Performance test program for both flavors of the JSON parser
  *
  * Copyright (c) 2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *    src/test/modules/test_json_parser/test_json_parser_perf.c
diff --git a/src/oracle_test/modules/test_lfind/test_lfind.c b/src/oracle_test/modules/test_lfind/test_lfind.c
index 4fe42b0dfe0..0143c1c836a 100644
--- a/src/oracle_test/modules/test_lfind/test_lfind.c
+++ b/src/oracle_test/modules/test_lfind/test_lfind.c
@@ -4,7 +4,7 @@
  *		Test correctness of optimized linear search functions.
  *
  * Copyright (c) 2022-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_lfind/test_lfind.c
diff --git a/src/oracle_test/modules/test_misc/Makefile b/src/oracle_test/modules/test_misc/Makefile
index f2b17efe8d5..3af286c762a 100644
--- a/src/oracle_test/modules/test_misc/Makefile
+++ b/src/oracle_test/modules/test_misc/Makefile
@@ -3,7 +3,8 @@
 
 TAP_TESTS = 1
 
-EXTRA_INSTALL=src/oracle_test/modules/injection_points
+EXTRA_INSTALL=src/oracle_test/modules/injection_points \
+	contrib/test_decoding
 
 export enable_injection_points
 
diff --git a/src/oracle_test/modules/test_misc/meson.build b/src/oracle_test/modules/test_misc/meson.build
index 58be114abdb..32579029d8a 100644
--- a/src/oracle_test/modules/test_misc/meson.build
+++ b/src/oracle_test/modules/test_misc/meson.build
@@ -16,6 +16,7 @@ tests += {
       't/005_timeouts.pl',
       't/006_signal_autovacuum.pl',
       't/007_catcache_inval.pl',
+      't/008_replslot_single_user.pl',
     ],
   },
 }
diff --git a/src/oracle_test/modules/test_misc/t/008_replslot_single_user.pl b/src/oracle_test/modules/test_misc/t/008_replslot_single_user.pl
new file mode 100644
index 00000000000..796700d621f
--- /dev/null
+++ b/src/oracle_test/modules/test_misc/t/008_replslot_single_user.pl
@@ -0,0 +1,95 @@
+# Copyright (c) 2025, PostgreSQL Global Development Group
+
+# Test manipulations of replication slots with the single-user mode.
+
+use strict;
+use warnings;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+
+# Skip the tests on Windows, as single-user mode would fail on permission
+# failure with privileged accounts.
+if ($windows_os)
+{
+	plan skip_all => 'this test is not supported by this platform';
+}
+
+# Run set of queries in single-user mode.
+sub test_single_mode
+{
+	my ($node, $queries, $testname) = @_;
+
+	my $result = run_log(
+		[
+			'postgres', '--single', '-F',
+			'-c' => 'exit_on_error=true',
+			'-D' => $node->data_dir,
+			'postgres'
+		],
+		'<' => \$queries);
+
+	ok($result, $testname);
+}
+
+my $slot_logical = 'slot_logical';
+my $slot_physical = 'slot_physical';
+
+# Initialize a node
+my $node = PostgreSQL::Test::Cluster->new('node');
+$node->init(allows_streaming => "logical");
+$node->start;
+
+# Define initial table
+$node->safe_psql('postgres', "CREATE TABLE foo (id int)");
+
+$node->stop;
+
+test_single_mode(
+	$node,
+	"SELECT pg_create_logical_replication_slot('$slot_logical', 'test_decoding')",
+	"logical slot creation");
+test_single_mode(
+	$node,
+	"SELECT pg_create_physical_replication_slot('$slot_physical', true)",
+	"physical slot creation");
+test_single_mode(
+	$node,
+	"SELECT pg_create_physical_replication_slot('slot_tmp', true, true)",
+	"temporary physical slot creation");
+
+test_single_mode(
+	$node, qq(
+INSERT INTO foo VALUES (1);
+SELECT pg_logical_slot_get_changes('$slot_logical', NULL, NULL);
+),
+	"logical decoding");
+
+test_single_mode(
+	$node,
+	"SELECT pg_replication_slot_advance('$slot_logical', pg_current_wal_lsn())",
+	"logical slot advance");
+test_single_mode(
+	$node,
+	"SELECT pg_replication_slot_advance('$slot_physical', pg_current_wal_lsn())",
+	"physical slot advance");
+
+test_single_mode(
+	$node,
+	"SELECT pg_copy_logical_replication_slot('$slot_logical', 'slot_log_copy')",
+	"logical slot copy");
+test_single_mode(
+	$node,
+	"SELECT pg_copy_physical_replication_slot('$slot_physical', 'slot_phy_copy')",
+	"physical slot copy");
+
+test_single_mode(
+	$node,
+	"SELECT pg_drop_replication_slot('$slot_logical')",
+	"logical slot drop");
+test_single_mode(
+	$node,
+	"SELECT pg_drop_replication_slot('$slot_physical')",
+	"physical slot drop");
+
+done_testing();
diff --git a/src/oracle_test/modules/test_oat_hooks/test_oat_hooks.c b/src/oracle_test/modules/test_oat_hooks/test_oat_hooks.c
index 4ec2e6456c6..fd6ed8a65f7 100644
--- a/src/oracle_test/modules/test_oat_hooks/test_oat_hooks.c
+++ b/src/oracle_test/modules/test_oat_hooks/test_oat_hooks.c
@@ -4,7 +4,7 @@
  *		Code for testing mandatory access control (MAC) using object access hooks.
  *
  * Copyright (c) 2015-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/test/modules/test_oat_hooks/test_oat_hooks.c
diff --git a/src/oracle_test/modules/test_parser/test_parser.c b/src/oracle_test/modules/test_parser/test_parser.c
index 97f14615315..a48f65552b1 100644
--- a/src/oracle_test/modules/test_parser/test_parser.c
+++ b/src/oracle_test/modules/test_parser/test_parser.c
@@ -4,7 +4,7 @@
  *	  Simple example of a text search parser
  *
  * Copyright (c) 2007-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/oracle_test/modules/test_parser/test_parser.c
diff --git a/src/oracle_test/modules/test_predtest/test_predtest.c b/src/oracle_test/modules/test_predtest/test_predtest.c
index 4e2a2154579..f7a4d716fbd 100644
--- a/src/oracle_test/modules/test_predtest/test_predtest.c
+++ b/src/oracle_test/modules/test_predtest/test_predtest.c
@@ -4,7 +4,7 @@
  *		Test correctness of optimizer's predicate proof logic.
  *
  * Copyright (c) 2018-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_predtest/test_predtest.c
diff --git a/src/oracle_test/modules/test_radixtree/test_radixtree.c b/src/oracle_test/modules/test_radixtree/test_radixtree.c
index a0053479052..59b17ee28aa 100644
--- a/src/oracle_test/modules/test_radixtree/test_radixtree.c
+++ b/src/oracle_test/modules/test_radixtree/test_radixtree.c
@@ -3,8 +3,8 @@
  * test_radixtree.c
  *		Test module for adapive radix tree.
  *
- * Copyright (c) 2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2025, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_radixtree/test_radixtree.c
@@ -45,7 +45,7 @@
 		uint64		_expected = (expected_expr); \
 		if (_result != _expected) \
 			elog(ERROR, \
-				 "%s yielded " UINT64_HEX_FORMAT ", expected " UINT64_HEX_FORMAT " (%s) in file \"%s\" line %u", \
+				 "%s yielded %" PRIx64 ", expected %" PRIx64 " (%s) in file \"%s\" line %u", \
 				 #result_expr, _result, _expected, #expected_expr, __FILE__, __LINE__); \
 	} while (0)
 
diff --git a/src/oracle_test/modules/test_rbtree/test_rbtree.c b/src/oracle_test/modules/test_rbtree/test_rbtree.c
index be991e6d135..8d7188e6136 100644
--- a/src/oracle_test/modules/test_rbtree/test_rbtree.c
+++ b/src/oracle_test/modules/test_rbtree/test_rbtree.c
@@ -4,7 +4,7 @@
  *		Test correctness of red-black tree operations.
  *
  * Copyright (c) 2009-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_rbtree/test_rbtree.c
diff --git a/src/oracle_test/modules/test_regex/test_regex.c b/src/oracle_test/modules/test_regex/test_regex.c
index e0cd69ecde4..94195f1126d 100644
--- a/src/oracle_test/modules/test_regex/test_regex.c
+++ b/src/oracle_test/modules/test_regex/test_regex.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_regex/test_regex.c
@@ -416,7 +416,8 @@ parse_test_flags(test_re_flags *flags, text *opts)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 							 errmsg("invalid regular expression test option: \"%.*s\"",
-									pg_mblen(opt_p + i), opt_p + i)));
+									pg_mblen_range(opt_p + i, opt_p + opt_len),
+									opt_p + i)));
 					break;
 			}
 		}
diff --git a/src/oracle_test/modules/test_resowner/test_resowner_basic.c b/src/oracle_test/modules/test_resowner/test_resowner_basic.c
index d12f66da94d..840c0dfaf1f 100644
--- a/src/oracle_test/modules/test_resowner/test_resowner_basic.c
+++ b/src/oracle_test/modules/test_resowner/test_resowner_basic.c
@@ -4,7 +4,7 @@
  *		Test basic ResourceOwner functionality
  *
  * Copyright (c) 2022-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_resowner/test_resowner_basic.c
diff --git a/src/oracle_test/modules/test_resowner/test_resowner_many.c b/src/oracle_test/modules/test_resowner/test_resowner_many.c
index c5df53703a9..d39d8c37822 100644
--- a/src/oracle_test/modules/test_resowner/test_resowner_many.c
+++ b/src/oracle_test/modules/test_resowner/test_resowner_many.c
@@ -4,7 +4,7 @@
  *		Test ResourceOwner functionality with lots of resources
  *
  * Copyright (c) 2022-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_resowner/test_resowner_many.c
diff --git a/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.c b/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.c
index a1cfe971bd3..463f692b5a4 100644
--- a/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.c
@@ -4,7 +4,7 @@
  *		Code for testing RLS hooks.
  *
  * Copyright (c) 2015-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_rls_hooks/test_rls_hooks.c
diff --git a/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.h b/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.h
index dcf57a823ef..a868074855b 100644
--- a/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.h
+++ b/src/oracle_test/modules/test_rls_hooks/test_rls_hooks.h
@@ -4,7 +4,7 @@
  *		Definitions for RLS hooks
  *
  * Copyright (c) 2015-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_rls_hooks/test_rls_hooks.h
diff --git a/src/oracle_test/modules/test_shm_mq/setup.c b/src/oracle_test/modules/test_shm_mq/setup.c
index 1b11da871ce..f63df54a894 100644
--- a/src/oracle_test/modules/test_shm_mq/setup.c
+++ b/src/oracle_test/modules/test_shm_mq/setup.c
@@ -6,7 +6,7 @@
  *		testing.
  *
  * Copyright (c) 2013-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_shm_mq/setup.c
diff --git a/src/oracle_test/modules/test_shm_mq/test.c b/src/oracle_test/modules/test_shm_mq/test.c
index b5df51c157c..a21032cc11f 100644
--- a/src/oracle_test/modules/test_shm_mq/test.c
+++ b/src/oracle_test/modules/test_shm_mq/test.c
@@ -4,7 +4,7 @@
  *		Test harness code for shared memory message queues.
  *
  * Copyright (c) 2013-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_shm_mq/test.c
diff --git a/src/oracle_test/modules/test_shm_mq/test_shm_mq.h b/src/oracle_test/modules/test_shm_mq/test_shm_mq.h
index 253d297b981..99ccccf97b2 100644
--- a/src/oracle_test/modules/test_shm_mq/test_shm_mq.h
+++ b/src/oracle_test/modules/test_shm_mq/test_shm_mq.h
@@ -4,7 +4,7 @@
  *		Definitions for shared memory message queues
  *
  * Copyright (c) 2013-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_shm_mq/test_shm_mq.h
diff --git a/src/oracle_test/modules/test_shm_mq/worker.c b/src/oracle_test/modules/test_shm_mq/worker.c
index 5e6a72aa132..43b44eb2fb3 100644
--- a/src/oracle_test/modules/test_shm_mq/worker.c
+++ b/src/oracle_test/modules/test_shm_mq/worker.c
@@ -10,7 +10,7 @@
  *		as presented here.
  *
  * Copyright (c) 2013-2025, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_shm_mq/worker.c
diff --git a/src/oracle_test/modules/test_slru/t/001_multixact.pl b/src/oracle_test/modules/test_slru/t/001_multixact.pl
index e2b567a603d..eda1aa8c4ce 100755
--- a/src/oracle_test/modules/test_slru/t/001_multixact.pl
+++ b/src/oracle_test/modules/test_slru/t/001_multixact.pl
@@ -1,10 +1,6 @@
 # Copyright (c) 2024-2025, PostgreSQL Global Development Group
 
-# This test verifies edge case of reading a multixact:
-# when we have multixact that is followed by exactly one another multixact,
-# and another multixact have no offset yet, we must wait until this offset
-# becomes observable. Previously we used to wait for 1ms in a loop in this
-# case, but now we use CV for this. This test is exercising such a sleep.
+# Test multixid corner cases.
 
 use strict;
 use warnings FATAL => 'all';
@@ -19,9 +15,7 @@
 	plan skip_all => 'Injection points not supported by this build';
 }
 
-my ($node, $result);
-
-$node = PostgreSQL::Test::Cluster->new('mike');
+my $node = PostgreSQL::Test::Cluster->new('main');
 $node->init;
 $node->append_conf('postgresql.conf',
 	"shared_preload_libraries = 'test_slru,injection_points'");
@@ -29,95 +23,48 @@
 $node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
 $node->safe_psql('postgres', q(CREATE EXTENSION test_slru));
 
-# Test for Multixact generation edge case
-$node->safe_psql('postgres',
-	q{select injection_points_attach('test-multixact-read','wait')});
-$node->safe_psql('postgres',
-	q{select injection_points_attach('multixact-get-members-cv-sleep','wait')}
-);
+# This test creates three multixacts. The middle one is never
+# WAL-logged or recorded on the offsets page, because we pause the
+# backend and crash the server before that. After restart, verify that
+# the other multixacts are readable, despite the middle one being
+# lost.
 
-# This session must observe sleep on the condition variable while generating a
-# multixact.  To achieve this it first will create a multixact, then pause
-# before reading it.
-my $observer = $node->background_psql('postgres');
-
-# This query will create a multixact, and hang just before reading it.
-$observer->query_until(
-	qr/start/,
-	q{
-	\echo start
-	SELECT test_read_multixact(test_create_multixact());
-});
-$node->wait_for_event('client backend', 'test-multixact-read');
-
-# This session will create the next Multixact. This is necessary to avoid
-# multixact.c's non-sleeping edge case 1.
-my $creator = $node->background_psql('postgres');
+# Create the first multixact
+my $bg_psql = $node->background_psql('postgres');
+my $multi1 = $bg_psql->query_safe(q(SELECT test_create_multixact());));
+
+# Assign the middle multixact. Use an injection point to prevent it
+# from being fully recorded.
 $node->safe_psql('postgres',
 	q{SELECT injection_points_attach('multixact-create-from-members','wait');}
 );
 
-# We expect this query to hang in the critical section after generating new
-# multixact, but before filling its offset into SLRU.
-# Running an injection point inside a critical section requires it to be
-# loaded beforehand.
-$creator->query_until(
-	qr/start/, q{
-	\echo start
+$bg_psql->query_until(
+	qr/assigning lost multi/, q(
++\echo assigning lost multi
 	SELECT test_create_multixact();
-});
+));
 
 $node->wait_for_event('client backend', 'multixact-create-from-members');
 
-# Ensure we have the backends waiting that we expect
-is( $node->safe_psql(
-		'postgres',
-		q{SELECT string_agg(wait_event, ', ' ORDER BY wait_event)
-		FROM pg_stat_activity WHERE wait_event_type = 'InjectionPoint'}
-	),
-	'multixact-create-from-members, test-multixact-read',
-	"matching injection point waits");
-
-# Now wake observer to get it to read the initial multixact.  A subsequent
-# multixact already exists, but that one doesn't have an offset assigned, so
-# this will hit multixact.c's edge case 2.
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('test-multixact-read')});
-$node->wait_for_event('client backend', 'multixact-get-members-cv-sleep');
-
-# Ensure we have the backends waiting that we expect
-is( $node->safe_psql(
-		'postgres',
-		q{SELECT string_agg(wait_event, ', ' ORDER BY wait_event)
-		FROM pg_stat_activity WHERE wait_event_type = 'InjectionPoint'}
-	),
-	'multixact-create-from-members, multixact-get-members-cv-sleep',
-	"matching injection point waits");
-
-# Now we have two backends waiting in multixact-create-from-members and
-# multixact-get-members-cv-sleep.  Also we have 3 injections points set to wait.
-# If we wakeup multixact-get-members-cv-sleep it will happen again, so we must
-# detach it first. So let's detach all injection points, then wake up all
-# backends.
-
-$node->safe_psql('postgres',
-	q{SELECT injection_points_detach('test-multixact-read')});
 $node->safe_psql('postgres',
 	q{SELECT injection_points_detach('multixact-create-from-members')});
-$node->safe_psql('postgres',
-	q{SELECT injection_points_detach('multixact-get-members-cv-sleep')});
 
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('multixact-create-from-members')});
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('multixact-get-members-cv-sleep')});
+# Create the third multixid
+my $multi2 = $node->safe_psql('postgres', q{SELECT test_create_multixact();});
+
+# All set and done, it's time for hard restart
+$node->stop('immediate');
+$node->start;
+$bg_psql->{run}->finish;
 
-# Background psql will now be able to read the result and disconnect.
-$observer->quit;
-$creator->quit;
+# Verify that the recorded multixids are readable
+is( $node->safe_psql('postgres', qq{SELECT test_read_multixact('$multi1');}),
+	'',
+	'first recorded multi is readable');
 
-$node->stop;
+is( $node->safe_psql('postgres', qq{SELECT test_read_multixact('$multi2');}),
+	'',
+	'second recorded multi is readable');
 
-# If we reached this point - everything is OK.
-ok(1);
 done_testing();
diff --git a/src/oracle_test/modules/test_slru/test_multixact.c b/src/oracle_test/modules/test_slru/test_multixact.c
index 56ad5cfeee0..d736ccc4a1a 100644
--- a/src/oracle_test/modules/test_slru/test_multixact.c
+++ b/src/oracle_test/modules/test_slru/test_multixact.c
@@ -17,7 +17,6 @@
 #include "access/multixact.h"
 #include "access/xact.h"
 #include "fmgr.h"
-#include "utils/injection_point.h"
 
 PG_FUNCTION_INFO_V1(test_create_multixact);
 PG_FUNCTION_INFO_V1(test_read_multixact);
@@ -37,8 +36,7 @@ test_create_multixact(PG_FUNCTION_ARGS)
 }
 
 /*
- * Reads given multixact after running an injection point. Discards local cache
- * to make a real read.  Tailored for multixact testing.
+ * Reads given multixact.  Discards local cache to make a real read.
  */
 Datum
 test_read_multixact(PG_FUNCTION_ARGS)
@@ -46,7 +44,6 @@ test_read_multixact(PG_FUNCTION_ARGS)
 	MultiXactId id = PG_GETARG_TRANSACTIONID(0);
 	MultiXactMember *members;
 
-	INJECTION_POINT("test-multixact-read", NULL);
 	/* discard caches */
 	AtEOXact_MultiXact();
 
diff --git a/src/oracle_test/modules/test_slru/test_slru.c b/src/oracle_test/modules/test_slru/test_slru.c
index 40f9cac3ddc..cf2b5b8d919 100644
--- a/src/oracle_test/modules/test_slru/test_slru.c
+++ b/src/oracle_test/modules/test_slru/test_slru.c
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_slru/test_slru.c
diff --git a/src/oracle_test/modules/test_tidstore/test_tidstore.c b/src/oracle_test/modules/test_tidstore/test_tidstore.c
index ddd756327aa..e14a6e9066c 100644
--- a/src/oracle_test/modules/test_tidstore/test_tidstore.c
+++ b/src/oracle_test/modules/test_tidstore/test_tidstore.c
@@ -8,7 +8,7 @@
  * usage.
  *
  * Copyright (c) 2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/test_tidstore/test_tidstore.c
@@ -76,6 +76,19 @@ itemptr_cmp(const void *left, const void *right)
 	return 0;
 }
 
+static int
+offsetnumber_cmp(const void *a, const void *b)
+{
+	OffsetNumber l = *(const OffsetNumber *) a;
+	OffsetNumber r = *(const OffsetNumber *) b;
+
+	if (l < r)
+		return -1;
+	else if (l > r)
+		return 1;
+	return 0;
+}
+
 /*
  * Create a TidStore. If shared is false, the tidstore is created
  * on TopMemoryContext, otherwise on DSA. Although the tidstore
@@ -180,6 +193,9 @@ do_set_block_offsets(PG_FUNCTION_ARGS)
 	noffs = ArrayGetNItems(ARR_NDIM(ta), ARR_DIMS(ta));
 	offs = ((OffsetNumber *) ARR_DATA_PTR(ta));
 
+	/* TidStoreSetBlockOffsets() requires offsets to be strictly ascending. */
+	qsort(offs, noffs, sizeof(OffsetNumber), offsetnumber_cmp);
+
 	/* Set TIDs in the store */
 	TidStoreLockExclusive(tidstore);
 	TidStoreSetBlockOffsets(tidstore, blkno, offs, noffs);
diff --git a/src/oracle_test/modules/typcache/expected/typcache_rel_type_cache.out b/src/oracle_test/modules/typcache/expected/typcache_rel_type_cache.out
index a91bd72b9bd..a5e0736c349 100755
--- a/src/oracle_test/modules/typcache/expected/typcache_rel_type_cache.out
+++ b/src/oracle_test/modules/typcache/expected/typcache_rel_type_cache.out
@@ -39,3 +39,4 @@ SELECT '(1,2)'::t;
  (1,2)
 (1 row)
 
+DROP EXTENSION injection_points;
\ No newline at end of file
diff --git a/src/oracle_test/modules/typcache/sql/typcache_rel_type_cache.sql b/src/oracle_test/modules/typcache/sql/typcache_rel_type_cache.sql
index c1a3af509c0..796590d964f 100755
--- a/src/oracle_test/modules/typcache/sql/typcache_rel_type_cache.sql
+++ b/src/oracle_test/modules/typcache/sql/typcache_rel_type_cache.sql
@@ -19,3 +19,5 @@ SELECT '(1)'::t;
 SELECT injection_points_detach('typecache-before-rel-type-cache-insert');
 ALTER TABLE t ADD COLUMN j int;
 SELECT '(1,2)'::t;
+
+DROP EXTENSION injection_points;
\ No newline at end of file
diff --git a/src/oracle_test/modules/worker_spi/worker_spi.c b/src/oracle_test/modules/worker_spi/worker_spi.c
index 666cc6e1d92..2a5dd0241b5 100644
--- a/src/oracle_test/modules/worker_spi/worker_spi.c
+++ b/src/oracle_test/modules/worker_spi/worker_spi.c
@@ -14,7 +14,7 @@
  * aggregated into the total.
  *
  * Copyright (c) 2013-2024, PostgreSQL Global Development Group
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/worker_spi/worker_spi.c
diff --git a/src/oracle_test/modules/xid_wraparound/meson.build b/src/oracle_test/modules/xid_wraparound/meson.build
index 602172754ac..9d75f47cb77 100644
--- a/src/oracle_test/modules/xid_wraparound/meson.build
+++ b/src/oracle_test/modules/xid_wraparound/meson.build
@@ -31,6 +31,7 @@ tests += {
       't/001_emergency_vacuum.pl',
       't/002_limits.pl',
       't/003_wraparounds.pl',
+      't/004_notify_freeze.pl',
     ],
   },
 }
diff --git a/src/oracle_test/modules/xid_wraparound/t/004_notify_freeze.pl b/src/oracle_test/modules/xid_wraparound/t/004_notify_freeze.pl
new file mode 100644
index 00000000000..5400af1e554
--- /dev/null
+++ b/src/oracle_test/modules/xid_wraparound/t/004_notify_freeze.pl
@@ -0,0 +1,71 @@
+# Copyright (c) 2024-2025, PostgreSQL Global Development Group
+#
+# Test freezing XIDs in the async notification queue. This isn't
+# really wraparound-related, but the test depends on the
+# consume_xids() helper function.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use Test::More;
+
+my $node = PostgreSQL::Test::Cluster->new('node');
+$node->init;
+$node->start;
+
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
+{
+	plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";
+}
+
+# Setup
+$node->safe_psql('postgres', 'CREATE EXTENSION xid_wraparound');
+$node->safe_psql('postgres',
+	'ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true');
+
+# Start Session 1 and leave it idle in transaction
+my $psql_session1 = $node->background_psql('postgres');
+$psql_session1->query_safe('listen s;');
+$psql_session1->query_safe('begin;');
+
+# Send some notifys from other sessions
+for my $i (1 .. 10)
+{
+	$node->safe_psql('postgres', "NOTIFY s, '$i'");
+}
+
+# Consume enough XIDs to trigger truncation, and one more with
+# 'txid_current' to bump up the freeze horizon.
+$node->safe_psql('postgres', 'select consume_xids(10000000);');
+$node->safe_psql('postgres', 'select txid_current()');
+
+# Remember current datfrozenxid before vacuum freeze so that we can
+# check that it is advanced. (Taking the min() this way assumes that
+# XID wraparound doesn't happen.)
+my $datafronzenxid = $node->safe_psql('postgres',
+	"select min(datfrozenxid::text::bigint) from pg_database");
+
+# Execute vacuum freeze on all databases
+$node->command_ok([ 'vacuumdb', '--all', '--freeze', '--port', $node->port ],
+	"vacuumdb --all --freeze");
+
+# Check that vacuumdb advanced datfrozenxid
+my $datafronzenxid_freeze = $node->safe_psql('postgres',
+	"select min(datfrozenxid::text::bigint) from pg_database");
+ok($datafronzenxid_freeze > $datafronzenxid, 'datfrozenxid advanced');
+
+# On Session 1, commit and ensure that the all the notifications are
+# received. This depends on correctly freezing the XIDs in the pending
+# notification entries.
+my $res = $psql_session1->query_safe('commit;');
+my $notifications_count = 0;
+foreach my $i (split('\n', $res))
+{
+	$notifications_count++;
+	like($i,
+		qr/Asynchronous notification "s" with payload "$notifications_count" received/
+	);
+}
+is($notifications_count, 10, 'received all committed notifications');
+
+done_testing();
diff --git a/src/oracle_test/modules/xid_wraparound/xid_wraparound.c b/src/oracle_test/modules/xid_wraparound/xid_wraparound.c
index 2cb443f12e5..e2da0eb9479 100644
--- a/src/oracle_test/modules/xid_wraparound/xid_wraparound.c
+++ b/src/oracle_test/modules/xid_wraparound/xid_wraparound.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *		src/oracle_test/modules/xid_wraparound/xid_wraparound.c
diff --git a/src/oracle_test/perl/PostgreSQL/Test/BackgroundPsql.pm b/src/oracle_test/perl/PostgreSQL/Test/BackgroundPsql.pm
index 173a47dbb01..f45f03bc7df 100644
--- a/src/oracle_test/perl/PostgreSQL/Test/BackgroundPsql.pm
+++ b/src/oracle_test/perl/PostgreSQL/Test/BackgroundPsql.pm
@@ -154,11 +154,11 @@ sub wait_connect
 	#
 	# See query() for details about why/how the banner is used.
 	my $banner = "background_psql: ready";
-	my $banner_match = qr/(^|\n)$banner\r?\n/;
-	$self->{stdin} .= "\\echo $banner\n\\warn $banner\n";
+	my $banner_match = qr/$banner\r?\n/;
+	$self->{stdin} .= "\\echo '$banner'\n\\warn '$banner'\n";
 	$self->{run}->pump()
 	  until ($self->{stdout} =~ /$banner_match/
-		  && $self->{stderr} =~ /$banner\r?\n/)
+		  && $self->{stderr} =~ /$banner_match/)
 	  || $self->{timeout}->is_expired;
 
 	note "connect output:\n",
@@ -258,22 +258,17 @@ sub query
 	# stderr (or vice versa), even if psql printed them in the opposite
 	# order. We therefore wait on both.
 	#
-	# We need to match for the newline, because we try to remove it below, and
-	# it's possible to consume just the input *without* the newline. In
-	# interactive psql we emit \r\n, so we need to allow for that. Also need
-	# to be careful that we don't e.g. match the echoed \echo command, rather
-	# than its output.
+	# In interactive psql we emit \r\n, so we need to allow for that.
+	# Also, include quotes around the banner string in the \echo and \warn
+	# commands, not because the string needs quoting but so that $banner_match
+	# can't match readline's echoing of these commands.
 	my $banner = "background_psql: QUERY_SEPARATOR $query_cnt:";
-	my $banner_match = qr/(^|\n)$banner\r?\n/;
-	$self->{stdin} .= "$query\n;\n\\echo $banner\n\\warn $banner\n";
-	pump_until(
-		$self->{run}, $self->{timeout},
-		\$self->{stdout}, qr/$banner_match/);
-	pump_until(
-		$self->{run}, $self->{timeout},
-		\$self->{stderr}, qr/$banner_match/);
-
-	die "psql query timed out" if $self->{timeout}->is_expired;
+	my $banner_match = qr/$banner\r?\n/;
+	$self->{stdin} .= "$query\n;\n\\echo '$banner'\n\\warn '$banner'\n";
+	$self->{run}->pump()
+	  until ($self->{stdout} =~ /$banner_match/
+		  && $self->{stderr} =~ /$banner_match/)
+	  || $self->{timeout}->is_expired;
 
 	note "results query $query_cnt:\n",
 	  explain {
@@ -281,9 +276,12 @@ sub query
 		stderr => $self->{stderr},
 	  };
 
-	# Remove banner from stdout and stderr, our caller doesn't care.  The
-	# first newline is optional, as there would not be one if consuming an
-	# empty query result.
+	die "psql query timed out" if $self->{timeout}->is_expired;
+
+	# Remove banner from stdout and stderr, our caller doesn't want it.
+	# Also remove the query output's trailing newline, if present (there
+	# would not be one if consuming an empty query result).
+	$banner_match = qr/\r?\n?$banner\r?\n/;
 	$output = $self->{stdout};
 	$output =~ s/$banner_match//;
 	$self->{stderr} =~ s/$banner_match//;
diff --git a/src/oracle_test/perl/PostgreSQL/Test/Cluster.pm b/src/oracle_test/perl/PostgreSQL/Test/Cluster.pm
index ae1ec8577e1..05261a26813 100644
--- a/src/oracle_test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/oracle_test/perl/PostgreSQL/Test/Cluster.pm
@@ -1,5 +1,5 @@
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 =pod
@@ -1646,10 +1646,10 @@ sub new
 	  or
 	  BAIL_OUT("could not create data directory \"$node->{_basedir}\": $!");
 
-	$node->dump_info;
-
 	$node->_set_pg_version;
 
+	$node->dump_info;
+
 	my $ver = $node->{_pg_version};
 
 	# Use a subclass as defined below (or elsewhere) if this version
diff --git a/src/oracle_test/perl/PostgreSQL/Test/Kerberos.pm b/src/oracle_test/perl/PostgreSQL/Test/Kerberos.pm
index b72dd2fbaf4..07a1ea899d0 100644
--- a/src/oracle_test/perl/PostgreSQL/Test/Kerberos.pm
+++ b/src/oracle_test/perl/PostgreSQL/Test/Kerberos.pm
@@ -9,6 +9,7 @@ package PostgreSQL::Test::Kerberos;
 use strict;
 use warnings FATAL => 'all';
 use PostgreSQL::Test::Utils;
+use Test::More;
 
 our (
 	$krb5_bin_dir, $krb5_sbin_dir, $krb5_config, $kinit,
diff --git a/src/oracle_test/perl/PostgreSQL/Test/Utils.pm b/src/oracle_test/perl/PostgreSQL/Test/Utils.pm
index d0ff92c32bb..204c6a27be8 100644
--- a/src/oracle_test/perl/PostgreSQL/Test/Utils.pm
+++ b/src/oracle_test/perl/PostgreSQL/Test/Utils.pm
@@ -92,6 +92,8 @@ our @EXPORT = qw(
   command_ok_or_fails_like
   command_checks_all
 
+  tar_portability_options
+
   $windows_os
   $is_msys2
   $use_unix_sockets
@@ -1150,6 +1152,51 @@ sub command_checks_all
 
 =pod
 
+=item tar_portability_options(tar)
+
+Check for non-default options we need to give to tar to create
+a tarfile we can decode (i.e., no "pax" extensions).
+Not needed in tests that only use tar to read tarfiles.
+
+Returns options as an array.
+
+=cut
+
+sub tar_portability_options
+{
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+	my ($tar) = @_;
+
+	my @tar_p_flags = ();
+
+	return @tar_p_flags if (!defined $tar || $tar eq '');
+
+	# GNU tar typically produces gnu-format archives, which we can read fine.
+	# But some platforms configure it to default to posix/pax format, and
+	# apparently they enable --sparse too.  Override that.
+	#
+	# ustar format supports UIDs only up to 2^21 - 1 (2097151).  Override
+	# owner/group to avoid failures on systems where the running user's UID/GID
+	# exceeds that limit.
+	my $devnull = File::Spec->devnull();
+	if (system(
+			"$tar --format=ustar --owner=0 --group=0 -cf $devnull $devnull 2>$devnull"
+		) == 0)
+	{
+		# GNU tar (Linux), BSD tar (FreeBSD, NetBSD, macOS, Windows)
+		push(@tar_p_flags, "--format=ustar", "--owner=0", "--group=0");
+	}
+	elsif (system("$tar -F ustar -cf $devnull $devnull 2>$devnull") == 0)
+	{
+		# OpenBSD tar
+		push(@tar_p_flags, "-F", "ustar");
+	}
+	return @tar_p_flags;
+}
+
+=pod
+
 =back
 
 =cut
diff --git a/src/oracle_test/postmaster/meson.build b/src/oracle_test/postmaster/meson.build
index c2de2e0eb5b..af1c3018b5d 100644
--- a/src/oracle_test/postmaster/meson.build
+++ b/src/oracle_test/postmaster/meson.build
@@ -7,6 +7,7 @@ tests += {
   'tap': {
     'tests': [
       't/001_connection_limits.pl',
+      't/004_negotiate.pl',
     ],
   },
 }
diff --git a/src/oracle_test/postmaster/t/002_connection_limits.pl b/src/oracle_test/postmaster/t/002_connection_limits.pl
index 4a7fb16261f..88d40ab2606 100644
--- a/src/oracle_test/postmaster/t/002_connection_limits.pl
+++ b/src/oracle_test/postmaster/t/002_connection_limits.pl
@@ -74,6 +74,11 @@ sub connect_fails_wait
 	ok(1, "$test_name: client backend process exited");
 }
 
+# Restart the server to ensure that any backends launched for
+# initialization steps are gone. Otherwise they could still be using
+# up connection slots and mess with our expectations.
+$node->restart;
+
 my @sessions = ();
 my @raw_connections = ();
 
diff --git a/src/oracle_test/postmaster/t/003_start_stop.pl b/src/oracle_test/postmaster/t/003_start_stop.pl
index 58e7ba6cc42..7281822c518 100644
--- a/src/oracle_test/postmaster/t/003_start_stop.pl
+++ b/src/oracle_test/postmaster/t/003_start_stop.pl
@@ -46,6 +46,11 @@
 	plan skip_all => "this test requires working raw_connect()";
 }
 
+# Restart server to ensure that backend launched for
+# raw_connect_works() is gone. Otherwise, it might free up a
+# connection slot later, when we expect all slots to be in use.
+$node->restart;
+
 my @raw_connections = ();
 
 # Open a lot of TCP (or Unix domain socket) connections to use up all
@@ -81,7 +86,7 @@
 # clients already" instead of "role does not exist" error. Test that
 # to ensure that we have used up all the slots.
 $node->connect_fails("dbname=postgres user=invalid_user",
-	"connect ",
+	"connection is rejected when all slots are in use",
 	expected_stderr => qr/FATAL:  sorry, too many clients already/);
 
 # Open one more connection, to really ensure that we have at least one
diff --git a/src/oracle_test/postmaster/t/004_negotiate.pl b/src/oracle_test/postmaster/t/004_negotiate.pl
new file mode 100644
index 00000000000..f01b7519571
--- /dev/null
+++ b/src/oracle_test/postmaster/t/004_negotiate.pl
@@ -0,0 +1,82 @@
+# Copyright (c) 2026, PostgreSQL Global Development Group
+
+# Test the negotiation of combined SSL and GSS requests.  This test
+# relies on both SSL and GSS requests to be rejected first, followed
+# by more requests.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+use Time::HiRes qw(usleep);
+
+my $node = PostgreSQL::Test::Cluster->new('main');
+$node->init;
+$node->append_conf('postgresql.conf', "log_min_messages = debug2");
+$node->append_conf('postgresql.conf',
+	"log_connections = 'receipt,authentication,authorization'");
+$node->append_conf('postgresql.conf', 'trace_connection_negotiation=on');
+$node->start;
+
+if (!$node->raw_connect_works())
+{
+	plan skip_all => "this test requires working raw_connect()";
+}
+
+my $sock = $node->raw_connect();
+
+# SSLRequest: packet length followed by NEGOTIATE_SSL_CODE.
+my $ssl_request = pack("Nnn", 8, 1234, 5679);
+
+# GSSENCRequest: packet length followed by NEGOTIATE_GSS_CODE.
+my $gss_request = pack("Nnn", 8, 1234, 5680);
+
+# Send SSLRequest, reject or bypass.
+$sock->send($ssl_request);
+my $reply = "";
+$sock->recv($reply, 1);
+if ($reply ne 'N')
+{
+	$sock->close();
+	plan skip_all =>
+	  "server accepted SSL; test requires SSL to be rejected";
+}
+
+# Send GSSENCRequest, reject or bypass test.
+$sock->send($gss_request);
+$reply = "";
+$sock->recv($reply, 1);
+if ($reply ne 'N')
+{
+	$sock->close();
+	plan skip_all =>
+	  "server accepted GSS; test requires GSS to be rejected";
+}
+
+my $log_offset = -s $node->logfile;
+
+# Send a second SSLRequest, now that we know that both SSL and GSS have
+# been rejected for this connection.  We are done with both requests, so
+# extra requests will be rejected and fail with an invalid protocol
+# version, and the connection should be closed by the server.
+$sock->send($ssl_request);
+
+# Try to read a response, there should be nothing, and certainly not an
+# extra 'N' message indicating a rejection.
+$reply = "";
+my $bytes = $sock->recv($reply, 1024);
+isnt($reply, 'N',
+	"server does not re-enter SSL negotiation after SSL+GSS were both tried");
+
+$sock->close();
+$node->wait_for_log(qr/FATAL: .* unsupported frontend protocol 1234.5679/,
+					$log_offset);
+
+# Check extra connection with a simple query.
+my $result = $node->safe_psql('postgres', 'select 1;');
+is($result, '1', 'server able to accept connection');
+
+$node->stop;
+
+done_testing();
diff --git a/src/oracle_test/recovery/Makefile b/src/oracle_test/recovery/Makefile
index aa857d9e64d..5722df43a53 100644
--- a/src/oracle_test/recovery/Makefile
+++ b/src/oracle_test/recovery/Makefile
@@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
 export enable_injection_points
 
 # required for 017_shm.pl and 027_stream_regress.pl
-REGRESS_SHLIB=$(abs_top_builddir)/src/oracle_test/regress/regress$(DLSUFFIX)
+REGRESS_SHLIB=$(abs_top_builddir)/src/oracle_test/regress/oraregress$(DLSUFFIX)
 export REGRESS_SHLIB
 
 oracle-check:
diff --git a/src/oracle_test/recovery/meson.build b/src/oracle_test/recovery/meson.build
index 6e78ff1a030..52993c32dbb 100644
--- a/src/oracle_test/recovery/meson.build
+++ b/src/oracle_test/recovery/meson.build
@@ -54,6 +54,7 @@ tests += {
       't/043_no_contrecord_switch.pl',
       't/044_invalidate_inactive_slots.pl',
       't/045_archive_restartpoint.pl',
+      't/046_checkpoint_logical_slot.pl',
       't/047_checkpoint_physical_slot.pl',
       't/048_vacuum_horizon_floor.pl'
     ],
diff --git a/src/oracle_test/recovery/t/004_timeline_switch.pl b/src/oracle_test/recovery/t/004_timeline_switch.pl
index 684838cbab7..f88e54a0603 100644
--- a/src/oracle_test/recovery/t/004_timeline_switch.pl
+++ b/src/oracle_test/recovery/t/004_timeline_switch.pl
@@ -34,11 +34,10 @@
 $node_primary->safe_psql('postgres',
 	"CREATE TABLE tab_int AS SELECT generate_series(1,1000) AS a");
 
-# Wait until standby has replayed enough data on standby 1
-$node_primary->wait_for_catchup($node_standby_1);
-
-# Stop and remove primary
-$node_primary->teardown_node;
+# Cleanly stop and remove primary.  A clean stop is required so as all
+# the records generated on the primary are received and flushed by the two
+# standbys.
+$node_primary->stop;
 
 # promote standby 1 using "pg_promote", switching it to a new timeline
 my $psql_out = '';
diff --git a/src/oracle_test/recovery/t/009_twophase.pl b/src/oracle_test/recovery/t/009_twophase.pl
index 1adc09c1fb8..7a886fba5b5 100644
--- a/src/oracle_test/recovery/t/009_twophase.pl
+++ b/src/oracle_test/recovery/t/009_twophase.pl
@@ -222,7 +222,7 @@ sub configure_and_reload
 	SAVEPOINT s1;
 	INSERT INTO t_009_tbl VALUES (22, 'issued to ${cur_primary_name}');
 	PREPARE TRANSACTION 'xact_009_10';");
-$cur_primary->teardown_node;
+$cur_primary->stop;
 $cur_standby->promote;
 
 # change roles
diff --git a/src/oracle_test/recovery/t/035_standby_logical_decoding.pl b/src/oracle_test/recovery/t/035_standby_logical_decoding.pl
index 9f93ee55c43..c5c150955ea 100644
--- a/src/oracle_test/recovery/t/035_standby_logical_decoding.pl
+++ b/src/oracle_test/recovery/t/035_standby_logical_decoding.pl
@@ -8,6 +8,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
+use Time::HiRes qw(usleep);
 use Test::More;
 
 if ($ENV{enable_injection_points} ne 'yes')
@@ -602,8 +603,8 @@ sub wait_until_vacuum_can_remove
 	  /ERROR:  cannot copy invalidated replication slot "vacuum_full_inactiveslot"/,
 	"invalidated slot cannot be copied");
 
-# Turn hot_standby_feedback back on
-change_hot_standby_feedback_and_wait_for_xmins(1,1);
+# Set hot_standby_feedback to on
+change_hot_standby_feedback_and_wait_for_xmins(1, 1);
 
 ##################################################
 # Verify that invalidated logical slots stay invalidated across a restart.
@@ -729,12 +730,14 @@ sub wait_until_vacuum_can_remove
 
 # message should not be issued
 ok( !$node_standby->log_contains(
-  "invalidating obsolete slot \"no_conflict_inactiveslot\"", $logstart),
-  'inactiveslot slot invalidation is not logged with vacuum on conflict_test');
+		"invalidating obsolete replication slot \"no_conflict_inactiveslot\"", $logstart),
+	'inactiveslot slot invalidation is not logged with vacuum on conflict_test'
+);
 
 ok( !$node_standby->log_contains(
-  "invalidating obsolete slot \"no_conflict_activeslot\"", $logstart),
-  'activeslot slot invalidation is not logged with vacuum on conflict_test');
+		"invalidating obsolete replication slot \"no_conflict_activeslot\"", $logstart),
+	'activeslot slot invalidation is not logged with vacuum on conflict_test'
+);
 
 # Verify that pg_stat_database_conflicts.confl_active_logicalslot has not been updated
 ok( $node_standby->poll_query_until(
diff --git a/src/oracle_test/recovery/t/046_checkpoint_logical_slot.pl b/src/oracle_test/recovery/t/046_checkpoint_logical_slot.pl
new file mode 100644
index 00000000000..406b208cccd
--- /dev/null
+++ b/src/oracle_test/recovery/t/046_checkpoint_logical_slot.pl
@@ -0,0 +1,228 @@
+# Copyright (c) 2025, PostgreSQL Global Development Group
+#
+# This test verifies the case when the logical slot is advanced during
+# checkpoint. The test checks that the logical slot's restart_lsn still refers
+# to an existed WAL segment after immediate restart.
+#
+use strict;
+use warnings FATAL => 'all';
+
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+
+use Test::More;
+
+if ($ENV{enable_injection_points} ne 'yes')
+{
+	plan skip_all => 'Injection points not supported by this build';
+}
+
+my ($node, $result);
+
+$node = PostgreSQL::Test::Cluster->new('mike');
+$node->init(allows_streaming => 'logical');
+$node->start;
+
+# Check if the extension injection_points is available, as it may be
+# possible that this script is run with installcheck, where the module
+# would not be installed by default.
+if (!$node->check_extension('injection_points'))
+{
+	plan skip_all => 'Extension injection_points not installed';
+}
+
+$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
+
+# Create the two slots we'll need.
+$node->safe_psql('postgres',
+	q{select pg_create_logical_replication_slot('slot_logical', 'test_decoding')}
+);
+$node->safe_psql('postgres',
+	q{select pg_create_physical_replication_slot('slot_physical', true)});
+
+# Advance both slots to the current position just to have everything "valid".
+$node->safe_psql('postgres',
+	q{select count(*) from pg_logical_slot_get_changes('slot_logical', null, null)}
+);
+$node->safe_psql('postgres',
+	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
+);
+
+# Run checkpoint to flush current state to disk and set a baseline.
+$node->safe_psql('postgres', q{checkpoint});
+
+# Generate some transactions to get RUNNING_XACTS.
+my $xacts = $node->background_psql('postgres');
+$xacts->query_until(
+	qr/run_xacts/,
+	q(\echo run_xacts
+SELECT 1 \watch 0.1
+\q
+));
+
+$node->advance_wal(20);
+
+# Run another checkpoint to set a new restore LSN.
+$node->safe_psql('postgres', q{checkpoint});
+
+$node->advance_wal(20);
+
+# Run another checkpoint, this time in the background, and make it wait
+# on the injection point) so that the checkpoint stops right before
+# removing old WAL segments.
+note('starting checkpoint');
+
+my $checkpoint = $node->background_psql('postgres');
+$checkpoint->query_safe(
+	q(select injection_points_attach('checkpoint-before-old-wal-removal','wait'))
+);
+$checkpoint->query_until(
+	qr/starting_checkpoint/,
+	q(\echo starting_checkpoint
+checkpoint;
+\q
+));
+
+# Wait until the checkpoint stops right before removing WAL segments.
+note('waiting for injection_point');
+$node->wait_for_event('checkpointer', 'checkpoint-before-old-wal-removal');
+note('injection_point is reached');
+
+# Try to advance the logical slot, but make it stop when it moves to the next
+# WAL segment (this has to happen in the background, too).
+my $logical = $node->background_psql('postgres');
+$logical->query_safe(
+	q{select injection_points_attach('logical-replication-slot-advance-segment','wait');}
+);
+$logical->query_until(
+	qr/get_changes/,
+	q(
+\echo get_changes
+select count(*) from pg_logical_slot_get_changes('slot_logical', null, null) \watch 1
+\q
+));
+
+# Wait until the slot's restart_lsn points to the next WAL segment.
+note('waiting for injection_point');
+$node->wait_for_event('client backend',
+	'logical-replication-slot-advance-segment');
+note('injection_point is reached');
+
+# OK, we're in the right situation: time to advance the physical slot, which
+# recalculates the required LSN, and then unblock the checkpoint, which
+# removes the WAL still needed by the logical slot.
+$node->safe_psql('postgres',
+	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
+);
+
+# Generate a long WAL record, spawning at least two pages for the follow-up
+# post-recovery check.
+$node->safe_psql('postgres',
+	q{select pg_logical_emit_message(false, '', repeat('123456789', 1000))});
+
+# Continue the checkpoint and wait for its completion.
+my $log_offset = -s $node->logfile;
+$node->safe_psql('postgres',
+	q{select injection_points_wakeup('checkpoint-before-old-wal-removal')});
+$node->wait_for_log(qr/checkpoint complete/, $log_offset);
+
+# Abruptly stop the server.
+$node->stop('immediate');
+
+$node->start;
+
+eval {
+	$node->safe_psql('postgres',
+		q{select count(*) from pg_logical_slot_get_changes('slot_logical', null, null);}
+	);
+};
+is($@, '', "Logical slot still valid");
+
+# If we send \q with $<psql_session>->quit the command can be sent to the
+# session already closed. So \q is in initial script, here we only finish
+# IPC::Run
+$xacts->{run}->finish;
+$checkpoint->{run}->finish;
+$logical->{run}->finish;
+
+# Verify that the synchronized slots won't be invalidated immediately after
+# synchronization in the presence of a concurrent checkpoint.
+my $primary = $node;
+
+$primary->append_conf('postgresql.conf', "autovacuum = off");
+$primary->reload;
+
+my $backup_name = 'backup';
+
+$primary->backup($backup_name);
+
+# Create a standby
+my $standby = PostgreSQL::Test::Cluster->new('standby');
+$standby->init_from_backup(
+	$primary, $backup_name,
+	has_streaming => 1);
+
+my $connstr_1 = $primary->connstr;
+$standby->append_conf(
+	'postgresql.conf', qq(
+hot_standby_feedback = on
+primary_slot_name = 'phys_slot'
+primary_conninfo = '$connstr_1 dbname=postgres'
+));
+
+$primary->safe_psql('postgres',
+	q{SELECT pg_create_logical_replication_slot('failover_slot', 'test_decoding', false, false, true);
+	 SELECT pg_create_physical_replication_slot('phys_slot');}
+);
+
+$standby->start;
+
+# Generate some activity and switch WAL file on the primary
+$primary->advance_wal(1);
+$primary->safe_psql('postgres', "CHECKPOINT");
+$primary->wait_for_replay_catchup($standby);
+
+# checkpoint on the standby and make it wait on the injection point so that the
+# checkpoint stops right before invalidating replication slots.
+note('starting checkpoint');
+
+$checkpoint = $standby->background_psql('postgres');
+$checkpoint->query_safe(
+	q(select injection_points_attach('restartpoint-before-slot-invalidation','wait'))
+);
+$checkpoint->query_until(
+	qr/starting_checkpoint/,
+	q(\echo starting_checkpoint
+checkpoint;
+));
+
+# Wait until the checkpoint stops right before invalidating slots
+note('waiting for injection_point');
+$standby->wait_for_event('checkpointer', 'restartpoint-before-slot-invalidation');
+note('injection_point is reached');
+
+# Enable slot sync worker to synchronize the failover slot to the standby
+$standby->append_conf('postgresql.conf', qq(sync_replication_slots = on));
+$standby->reload;
+
+# Wait for the slot to be synced
+$standby->poll_query_until(
+	'postgres',
+	"SELECT COUNT(*) > 0 FROM pg_replication_slots WHERE slot_name = 'failover_slot'");
+
+# Release the checkpointer
+$standby->safe_psql('postgres',
+	q{select injection_points_wakeup('restartpoint-before-slot-invalidation');
+	  select injection_points_detach('restartpoint-before-slot-invalidation')});
+
+$checkpoint->quit;
+
+# Confirm that the slot is not invalidated
+is( $standby->safe_psql(
+		'postgres',
+		q{SELECT invalidation_reason IS NULL AND synced FROM pg_replication_slots WHERE slot_name = 'failover_slot';}
+	),
+	"t",
+	'logical slot is not invalidated');
+
+done_testing();
diff --git a/src/oracle_test/recovery/t/047_checkpoint_physical_slot.pl b/src/oracle_test/recovery/t/047_checkpoint_physical_slot.pl
index a1332b5d44c..9e98383e30e 100644
--- a/src/oracle_test/recovery/t/047_checkpoint_physical_slot.pl
+++ b/src/oracle_test/recovery/t/047_checkpoint_physical_slot.pl
@@ -94,9 +94,11 @@
 	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
 );
 
-# Continue the checkpoint.
+# Continue the checkpoint and wait for its completion.
+my $log_offset = -s $node->logfile;
 $node->safe_psql('postgres',
 	q{select injection_points_wakeup('checkpoint-before-old-wal-removal')});
+$node->wait_for_log(qr/checkpoint complete/, $log_offset);
 
 my $restart_lsn_old = $node->safe_psql('postgres',
 	q{select restart_lsn from pg_replication_slots where slot_name = 'slot_physical'}
@@ -104,8 +106,7 @@
 chomp($restart_lsn_old);
 note("restart lsn before stop: $restart_lsn_old");
 
-# Abruptly stop the server (1 second should be enough for the checkpoint
-# to finish; it would be better).
+# Abruptly stop the server.
 $node->stop('immediate');
 
 $node->start;
diff --git a/src/oracle_test/regress/GNUmakefile b/src/oracle_test/regress/GNUmakefile
index 0e600fb9b8e..4a78f66146b 100644
--- a/src/oracle_test/regress/GNUmakefile
+++ b/src/oracle_test/regress/GNUmakefile
@@ -3,7 +3,7 @@
 # GNUmakefile--
 #    Makefile for src/oracle_test/regress (the regression tests)
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
diff --git a/src/oracle_test/regress/expected/aggregates.out b/src/oracle_test/regress/expected/aggregates.out
index 6146b2bde66..c06037521f3 100644
--- a/src/oracle_test/regress/expected/aggregates.out
+++ b/src/oracle_test/regress/expected/aggregates.out
@@ -1516,6 +1516,37 @@ explain (costs off) select y,z from t2 group by y,z;
    ->  Seq Scan on t2
 (3 rows)
 
+-- A unique index proves uniqueness only under its own opfamily.  When the
+-- GROUP BY's eqop comes from a different opfamily with looser equality,
+-- rows the index regards as distinct can collapse into one GROUP BY group,
+-- so the index is not usable for removing redundant columns.
+create type t_rec as (x numeric);
+create temp table t_opf (a t_rec not null, b text);
+create unique index on t_opf (a record_image_ops);
+-- (1.0) and (1.00) are bytewise distinct but logically equal as records;
+-- the index admits both, but GROUP BY a (default record_ops) would merge
+-- them, so b must be retained as a grouping key.
+insert into t_opf values (row(1.0)::t_rec, 'X'), (row(1.00)::t_rec, 'Y');
+explain (costs off)
+select a, b from t_opf group by a, b order by b;
+          QUERY PLAN           
+-------------------------------
+ Group
+   Group Key: b, a
+   ->  Sort
+         Sort Key: b, a
+         ->  Seq Scan on t_opf
+(5 rows)
+
+select a, b from t_opf group by a, b order by b;
+   a    | b 
+--------+---
+ (1.0)  | X
+ (1.00) | Y
+(2 rows)
+
+drop table t_opf;
+drop type t_rec;
 drop table t1 cascade;
 NOTICE:  drop cascades to table t1c
 drop table t2;
@@ -1562,6 +1593,19 @@ group by f2;
 ----+-------
 (0 rows)
 
+-- check that we preserve join alias in GROUP BY expressions
+create temp view v1 as
+select f1::int from t1 left join t2 using (f1) group by f1;
+select pg_get_viewdef('v1'::regclass);
+           pg_get_viewdef            
+-------------------------------------
+  SELECT (f1)::pg_catalog.int4 AS f1+
+    FROM (t1                        +
+      LEFT JOIN t2 USING (f1))      +
+   GROUP BY f1;
+(1 row)
+
+drop view v1;
 drop table t1, t2;
 --
 -- Test planner's selection of pathkeys for ORDER BY aggregates
@@ -3390,26 +3434,6 @@ select v||'a', case when v||'a' = 'aa' then 1 else 0 end, count(*)
  ba       |    0 |     1
 (2 rows)
 
--- Make sure that generation of HashAggregate for uniqification purposes
--- does not lead to array overflow due to unexpected duplicate hash keys
--- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
-set enable_memoize to off;
-explain (costs off)
-  select 1 from tenk1
-   where (hundred, thousand) in (select twothousand, twothousand from onek);
-                         QUERY PLAN                          
--------------------------------------------------------------
- Hash Join
-   Hash Cond: (tenk1.hundred = onek.twothousand)
-   ->  Seq Scan on tenk1
-         Filter: (hundred = thousand)
-   ->  Hash
-         ->  HashAggregate
-               Group Key: onek.twothousand, onek.twothousand
-               ->  Seq Scan on onek
-(8 rows)
-
-reset enable_memoize;
 --
 -- Hash Aggregation Spill tests
 --
diff --git a/src/oracle_test/regress/expected/alter_table.out b/src/oracle_test/regress/expected/alter_table.out
index a170c7eb157..743cd78b408 100644
--- a/src/oracle_test/regress/expected/alter_table.out
+++ b/src/oracle_test/regress/expected/alter_table.out
@@ -3577,12 +3577,15 @@ SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment F
 -- filenode function call can return NULL for a relation dropped concurrently
 -- with the call's surrounding query, so ignore a NULL mapped_oid for
 -- relations that no longer exist after all calls finish.
+-- Temporary relations are ignored, as not supported by pg_filenode_relation().
 CREATE TEMP TABLE filenode_mapping AS
 SELECT
     oid, mapped_oid, reltablespace, relfilenode, relname
 FROM pg_class,
     pg_filenode_relation(reltablespace, pg_relation_filenode(oid)) AS mapped_oid
-WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
+WHERE relkind IN ('r', 'i', 'S', 't', 'm')
+  AND relpersistence != 't'
+  AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
@@ -3851,6 +3854,16 @@ Referenced by:
 ALTER TABLE test_add_column
 	ADD COLUMN IF NOT EXISTS c5 SERIAL CHECK (c5 > 10);
 NOTICE:  column "c5" of relation "test_add_column" already exists, skipping
+ALTER TABLE test_add_column
+	ADD c6 integer; -- omit COLUMN
+ALTER TABLE test_add_column
+	ADD IF NOT EXISTS c6 integer;
+NOTICE:  column "c6" of relation "test_add_column" already exists, skipping
+ALTER TABLE test_add_column
+	DROP c6; -- omit COLUMN
+ALTER TABLE test_add_column
+	DROP IF EXISTS c6;
+NOTICE:  column "c6" of relation "test_add_column" does not exist, skipping
 \d test_add_column*
                                 Table "public.test_add_column"
  Column |      Type       | Collation | Nullable |                   Default                   
@@ -4497,6 +4510,14 @@ Check constraints:
     "part_rp100_a_check" CHECK (a >= 123 AND a < 133 AND a IS NOT NULL)
 
 DROP TABLE range_parted2;
+-- Test that hash partitions continue to work after they're concurrently
+-- detached (bugs #18371, #19070)
+CREATE TABLE hash_parted2 (a int) PARTITION BY HASH(a);
+CREATE TABLE part_hp PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 0);
+ALTER TABLE hash_parted2 DETACH PARTITION part_hp CONCURRENTLY;
+DROP TABLE hash_parted2;
+INSERT INTO part_hp VALUES (1);
+DROP TABLE part_hp;
 -- Check ALTER TABLE commands for partitioned tables and partitions
 -- cannot add/drop column to/from *only* the parent
 ALTER TABLE ONLY list_parted2 ADD COLUMN c int;
@@ -4763,6 +4784,14 @@ create table attbl(a int);
 create table atref(b attbl check ((b).a is not null));
 alter table attbl alter column a type numeric;  -- someday this should work
 ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
+alter table atref drop constraint atref_b_check;
+create statistics atref_stat on ((b).a is not null) from atref;
+alter table attbl alter column a type numeric;  -- someday this should work
+ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
+drop statistics atref_stat;
+create index atref_idx on atref (((b).a));
+alter table attbl alter column a type numeric;  -- someday this should work
+ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
 drop table attbl, atref;
 /* End test case for bug #18970 */
 -- Test that ALTER TABLE rewrite preserves a clustered index
diff --git a/src/oracle_test/regress/expected/arrays.out b/src/oracle_test/regress/expected/arrays.out
index 362c9539bc0..a22f414cfa0 100644
--- a/src/oracle_test/regress/expected/arrays.out
+++ b/src/oracle_test/regress/expected/arrays.out
@@ -1726,6 +1726,11 @@ select '[-2147483648..-2147483647]={1,2}'::int[];
 (1 row)
 
 -- all of the above should be accepted
+-- some day we might allow these cases, but for now they're errors:
+select array[]::oidvector;
+ERROR:  array is not a valid oidvector
+select array[]::int2vector;
+ERROR:  array is not a valid int2vector
 -- tests for array aggregates
 CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
 INSERT INTO arraggtest (f1, f2, f3) VALUES
diff --git a/src/oracle_test/regress/expected/btree_index.out b/src/oracle_test/regress/expected/btree_index.out
index bdc9d692869..102a053f029 100644
--- a/src/oracle_test/regress/expected/btree_index.out
+++ b/src/oracle_test/regress/expected/btree_index.out
@@ -195,54 +195,123 @@ ORDER BY proname DESC, proargtypes DESC, pronamespace DESC LIMIT 1;
 (1 row)
 
 --
--- Add coverage for RowCompare quals whose rhs row has a NULL that ends scan
+-- Forwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
-                                                 QUERY PLAN                                                  
--------------------------------------------------------------------------------------------------------------
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
  Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
-   Index Cond: ((ROW(proname, proargtypes) < ROW('abs'::name, NULL::oidvector)) AND (proname = 'abs'::name))
+   Index Cond: ((ROW(proname, proargtypes) >= ROW('abs'::name, NULL::oidvector)) AND (proname <= 'abs'::name))
 (2 rows)
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
  proname | proargtypes | pronamespace 
 ---------+-------------+--------------
 (0 rows)
 
 --
--- Add coverage for backwards scan RowCompare quals whose rhs row has a NULL
--- that ends scan
+-- Forwards scan RowCompare quals whose row arg has a NULL that ends scan
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+                                                  QUERY PLAN                                                  
+--------------------------------------------------------------------------------------------------------------
+ Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((proname >= 'abs'::name) AND (ROW(proname, proargtypes) < ROW('abs'::name, NULL::oidvector)))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Index Only Scan Backward using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((proname >= 'abs'::name) AND (ROW(proname, proargtypes) <= ROW('abs'::name, NULL::oidvector)))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that ends scan
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
-                                                 QUERY PLAN                                                  
--------------------------------------------------------------------------------------------------------------
+                                                  QUERY PLAN                                                  
+--------------------------------------------------------------------------------------------------------------
  Index Only Scan Backward using pg_proc_proname_args_nsp_index on pg_proc
-   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname = 'abs'::name))
+   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname <= 'abs'::name))
 (2 rows)
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
  proname | proargtypes | pronamespace 
 ---------+-------------+--------------
 (0 rows)
 
+-- Makes B-Tree preprocessing deal with unmarking redundant keys that were
+-- initially marked required (test case relies on current row compare
+-- preprocessing limitations)
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+                                                                                                     QUERY PLAN                                                                                                     
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname = 'zzzzzz'::name) AND (proargtypes = ANY ('{"26 23",5077}'::oidvector[])) AND (pronamespace = ANY ('{1,2,3}'::oid[])))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
 --
--- Add coverage for recheck of > key following array advancement on previous
--- (left sibling) page that used a high key whose attribute value corresponding
--- to the > key was -inf (due to being truncated when the high key was created).
+-- Performs a recheck of > key following array advancement on previous (left
+-- sibling) page that used a high key whose attribute value corresponding to
+-- the > key was -inf (due to being truncated when the high key was created).
 --
 -- XXX This relies on the assumption that tenk1_thous_tenthous has a truncated
 -- high key "(183, -inf)" on the first page that we'll scan.  The test will only
diff --git a/src/oracle_test/regress/expected/case_conversion.out b/src/oracle_test/regress/expected/case_conversion.out
index 73fa655dde8..3d155acca73 100644
--- a/src/oracle_test/regress/expected/case_conversion.out
+++ b/src/oracle_test/regress/expected/case_conversion.out
@@ -3,7 +3,7 @@
 -- 	  1). If the alphas in the identifier quoted by double quotes are all the upper case, convert the upper case to the lower case.
 -- 	  2). If the alphas in the identifier quoted by double quotes are all the lower case, convert the lower case to the upper case.
 -- 	  3). If the alphas in the identifier quoted by double quotes are case-mixed, leave the identifier unchanged.
--- 2. if guc parameter "identifier_case_switch" value is "lowcase", convert all identifiers to the lower case.
+-- 2. if guc parameter "identifier_case_switch" value is "lowercase", convert all identifiers to the lowercase.
 -- 3. if guc parameter "identifier_case_switch" value is "normal", The rules for converting identifiers are the same as for native PG.
 ----1. "identifier_case_switch" value is "interchange"
 SET ivorysql.enable_case_switch = true;
diff --git a/src/oracle_test/regress/expected/case_conversion_1.out b/src/oracle_test/regress/expected/case_conversion_1.out
index 9a91333782d..58d101e9113 100644
--- a/src/oracle_test/regress/expected/case_conversion_1.out
+++ b/src/oracle_test/regress/expected/case_conversion_1.out
@@ -3,7 +3,7 @@
 -- 	  1). If the alphas in the identifier quoted by double quotes are all the upper case, convert the upper case to the lower case.
 -- 	  2). If the alphas in the identifier quoted by double quotes are all the lower case, convert the lower case to the upper case.
 -- 	  3). If the alphas in the identifier quoted by double quotes are case-mixed, leave the identifier unchanged.
--- 2. if guc parameter "identifier_case_switch" value is "lowcase", convert all identifiers to the lower case.
+-- 2. if guc parameter "identifier_case_switch" value is "lowercase", convert all identifiers to the lowercase.
 -- 3. if guc parameter "identifier_case_switch" value is "normal", The rules for converting identifiers are the same as for native PG.
 ----1. "identifier_case_switch" value is "interchange"
 SET ivorysql.enable_case_switch = true;
diff --git a/src/oracle_test/regress/expected/case_conversion_2.out b/src/oracle_test/regress/expected/case_conversion_2.out
index 46e7f26667d..23c7dffa616 100644
--- a/src/oracle_test/regress/expected/case_conversion_2.out
+++ b/src/oracle_test/regress/expected/case_conversion_2.out
@@ -3,7 +3,7 @@
 -- 	  1). If the alphas in the identifier quoted by double quotes are all the upper case, convert the upper case to the lower case.
 -- 	  2). If the alphas in the identifier quoted by double quotes are all the lower case, convert the lower case to the upper case.
 -- 	  3). If the alphas in the identifier quoted by double quotes are case-mixed, leave the identifier unchanged.
--- 2. if guc parameter "identifier_case_switch" value is "lowcase", convert all identifiers to the lower case.
+-- 2. if guc parameter "identifier_case_switch" value is "lowercase", convert all identifiers to the lowercase.
 -- 3. if guc parameter "identifier_case_switch" value is "normal", The rules for converting identifiers are the same as for native PG.
 ----1. "identifier_case_switch" value is "interchange"
 SET ivorysql.enable_case_switch = true;
diff --git a/src/oracle_test/regress/expected/collate.icu.utf8.out b/src/oracle_test/regress/expected/collate.icu.utf8.out
index 1de53f430fe..b2921093804 100644
--- a/src/oracle_test/regress/expected/collate.icu.utf8.out
+++ b/src/oracle_test/regress/expected/collate.icu.utf8.out
@@ -1490,6 +1490,13 @@ SELECT array_sort('{a,B}'::text[] COLLATE "C");
  {B,a}
 (1 row)
 
+-- test replace() at the end of the string (bug #19341)
+SELECT replace('testX' COLLATE case_insensitive, 'x' COLLATE case_insensitive, 'er');
+ replace 
+---------
+ tester
+(1 row)
+
 -- test language tags
 CREATE COLLATION lt_insensitive (provider = icu, locale = 'en-u-ks-level1', deterministic = false);
 SELECT 'aBcD' COLLATE lt_insensitive = 'AbCd' COLLATE lt_insensitive;
@@ -1643,6 +1650,310 @@ SELECT string_to_array('ABCDEFGHI' COLLATE case_sensitive, NULL, 'b');
  {A,B,C,D,E,F,G,H,I}
 (1 row)
 
+--
+-- A unique index under one collation does not prove uniqueness under
+-- another, so the planner must not use such a proof for any optimization.
+--
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Sort
+   Output: t1.x, t2.x
+   Sort Key: t1.x COLLATE case_sensitive, t2.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, t2.x
+         Hash Cond: ((t2.x)::text = (t1.x)::text)
+         ->  Seq Scan on collate_tests.test3cs t2
+               Output: t2.x
+         ->  Hash
+               Output: t1.x
+               ->  Seq Scan on collate_tests.test1cs t1
+                     Output: t1.x
+(12 rows)
+
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+                QUERY PLAN                
+------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Left Join
+         Hash Cond: (t1.x = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+  x  
+-----
+ abc
+ abc
+ ABC
+ ABC
+ def
+ ghi
+(6 rows)
+
+-- Ensure that self-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive, t2.x COLLATE case_sensitive
+   ->  Hash Join
+         Hash Cond: ((t1.x)::text = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Semi Join
+         Hash Cond: ((t1.x)::text = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+  x  
+-----
+ abc
+ ABC
+ def
+ ghi
+(4 rows)
+
+--
+-- A DISTINCT / GROUP BY / set-op on a subquery does not prove uniqueness
+-- under a different collation, so the planner must not use such a proof for
+-- any optimization.
+--
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on collate_tests.test1cs t1
+               Output: t1.x
+         ->  Hash
+               Output: test3cs.x
+               ->  HashAggregate
+                     Output: test3cs.x
+                     Group Key: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+(15 rows)
+
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Same with GROUP BY
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on collate_tests.test1cs t1
+               Output: t1.x
+         ->  Hash
+               Output: test3cs.x
+               ->  HashAggregate
+                     Output: test3cs.x
+                     Group Key: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+(15 rows)
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Same with set-op
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((test3cs.x)::text = (t1.x)::text)
+         ->  HashAggregate
+               Output: test3cs.x
+               Group Key: test3cs.x
+               ->  Append
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs test3cs_1
+                           Output: test3cs_1.x
+         ->  Hash
+               Output: t1.x
+               ->  Seq Scan on collate_tests.test1cs t1
+                     Output: t1.x
+(18 rows)
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Left Join
+         Hash Cond: (t1.x = (test3cs.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  HashAggregate
+                     Group Key: test3cs.x
+                     ->  Seq Scan on test3cs
+(9 rows)
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+  x  
+-----
+ abc
+ abc
+ ABC
+ ABC
+ def
+ ghi
+(6 rows)
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Semi Join
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  HashAggregate
+                     Group Key: test3cs.x
+                     ->  Seq Scan on test3cs
+(9 rows)
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+  x  
+-----
+ abc
+ ABC
+ def
+ ghi
+(4 rows)
+
 CREATE TABLE test1ci (x text COLLATE case_insensitive);
 CREATE TABLE test2ci (x text COLLATE case_insensitive);
 CREATE TABLE test3ci (x text COLLATE case_insensitive);
@@ -1769,6 +2080,270 @@ SELECT string_to_array('ABCDEFGHI' COLLATE case_insensitive, NULL, 'b');
  {A,NULL,C,D,E,F,G,H,I}
 (1 row)
 
+-- Test HAVING-to-WHERE pushdown with nondeterministic collations.
+-- When a HAVING clause uses a different collation than the GROUP BY's
+-- nondeterministic collation, it must not be pushed to WHERE, otherwise
+-- aggregate results can change because the stricter filter eliminates rows
+-- before grouping.
+-- Negative: collation conflict, HAVING must not be pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (x = 'abc'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: same collation, safe to push HAVING to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3ci
+         Filter: (x = 'abc'::text COLLATE case_insensitive)
+(3 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: function applied to grouped column with conflicting collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (upper(x) = 'ABC'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: function with same collation as GROUP BY
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ GroupAggregate
+   Group Key: x
+   ->  Sort
+         Sort Key: x COLLATE case_insensitive
+         ->  Seq Scan on test3ci
+               Filter: (upper(x) = 'ABC'::text COLLATE case_insensitive)
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: inner function has conflicting collation, even though outer
+-- operator's collation matches GROUP BY due to a COLLATE override
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: ((upper((x)::text))::text = 'ABC'::text)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Mixed AND: conflicting clause stays in HAVING, safe clause pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (x = 'abc'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+         Filter: (length(x) > 1)
+(5 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: AND of two safe clauses, both can be pushed
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3ci
+         Filter: ((x = 'abc'::text COLLATE case_insensitive) AND (length(x) > 1))
+(3 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: OR with a conflicting clause: must stay in HAVING
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: x COLLATE case_insensitive
+   ->  HashAggregate
+         Group Key: x
+         Filter: ((x = 'abc'::text COLLATE case_sensitive) OR (x = 'def'::text COLLATE case_sensitive))
+         ->  Seq Scan on test3ci
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     2
+ def |     1
+(2 rows)
+
+-- Negative: collation conflict inside a RowCompareExpr
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Sort
+   Sort Key: x COLLATE case_insensitive
+   ->  HashAggregate
+         Group Key: x
+         Filter: (ROW(x, 1) < ROW('ABC'::text COLLATE case_sensitive, 1))
+         ->  Seq Scan on test3ci
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: simple-CASE form with conflicting WHEN comparison collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: CASE x WHEN 'abc'::text COLLATE case_sensitive THEN true ELSE false END
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: simple-CASE form with matching collation, safe to push
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   ->  Seq Scan on test3ci
+         Filter: CASE x WHEN 'abc'::text COLLATE case_insensitive THEN true ELSE false END
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: nested CASE with collation conflict
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+                                                     QUERY PLAN                                                      
+---------------------------------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: CASE WHEN (CASE x WHEN 'abc'::text COLLATE case_sensitive THEN 1 ELSE 0 END = 1) THEN true ELSE false END
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: conflicting collation but no grouping expression reference
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING current_setting('server_version') = 'abc' COLLATE case_sensitive;
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   ->  Result
+         One-Time Filter: (current_setting('server_version'::text) = 'abc'::text COLLATE case_sensitive)
+         ->  Seq Scan on test3ci
+(5 rows)
+
+-- Positive: deterministic collation in GROUP BY: always safe to push, even if
+-- HAVING uses a nondeterministic collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+                        QUERY PLAN                        
+----------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3cs
+         Filter: (x = 'abc'::text COLLATE case_sensitive)
+(3 rows)
+
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     1
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ GroupAggregate
+   Group Key: x
+   ->  Sort
+         Sort Key: x COLLATE case_sensitive
+         ->  Seq Scan on test3cs
+               Filter: (x = 'abc'::text COLLATE case_insensitive)
+(6 rows)
+
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     1
+ ABC |     1
+(2 rows)
+
 -- bpchar
 CREATE TABLE test1bpci (x char(3) COLLATE case_insensitive);
 CREATE TABLE test2bpci (x char(3) COLLATE case_insensitive);
@@ -2680,6 +3255,38 @@ DROP TABLE pagg_tab6;
 RESET enable_partitionwise_aggregate;
 RESET max_parallel_workers_per_gather;
 RESET enable_incremental_sort;
+--
+-- A unique index can prove functional dependency for GROUP BY column
+-- removal only if its per-column collation agrees on equality with
+-- the GROUP BY column's collation.  An index built under a different
+-- (deterministic) collation would otherwise let remove_useless_groupby_columns
+-- drop other columns whose values still differ within a nondeterministic
+-- group.
+--
+CREATE TABLE groupby_collation_t (a text COLLATE case_insensitive NOT NULL, b text);
+INSERT INTO groupby_collation_t VALUES ('foo', 'X'), ('FOO', 'Y');
+CREATE UNIQUE INDEX ON groupby_collation_t (a COLLATE "C");
+-- Column b must NOT be dropped: under case_insensitive on a, 'foo' and
+-- 'FOO' would merge, but they have distinct b values.
+EXPLAIN (COSTS OFF)
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Group
+   Group Key: a, b
+   ->  Sort
+         Sort Key: a COLLATE case_insensitive, b
+         ->  Seq Scan on groupby_collation_t
+(5 rows)
+
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+  a  | b 
+-----+---
+ foo | X
+ FOO | Y
+(2 rows)
+
+DROP TABLE groupby_collation_t;
 -- virtual generated columns
 CREATE TABLE t5 (
     a int,
@@ -2700,6 +3307,55 @@ SELECT * FROM t5 ORDER BY c ASC, a ASC;
  3 | d1 | d1
 (3 rows)
 
+-- Check that DEFAULT expressions in SQL/JSON functions use the same collation
+-- as the RETURNING type.  Mismatched collations should raise an error.
+CREATE DOMAIN d1 AS text COLLATE case_insensitive;
+CREATE DOMAIN d2 AS text COLLATE "C";
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT ('C' COLLATE "C") COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+DROP DOMAIN d1, d2;
 -- cleanup
 RESET search_path;
 SET client_min_messages TO warning;
diff --git a/src/oracle_test/regress/expected/compression_pglz.out b/src/oracle_test/regress/expected/compression_pglz.out
new file mode 100644
index 00000000000..8c519d86b22
--- /dev/null
+++ b/src/oracle_test/regress/expected/compression_pglz.out
@@ -0,0 +1,67 @@
+--
+-- Tests for PGLZ compression
+--
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/oraregress' :dlsuffix
+CREATE FUNCTION test_pglz_compress(bytea)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_pglz_decompress(bytea, int4, bool)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+/
+-- Round-trip with pglz: compress then decompress.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, false) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+ roundtrip_ok 
+--------------
+ t
+(1 row)
+
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, true) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+ roundtrip_ok 
+--------------
+ t
+(1 row)
+
+-- Decompression with rawsize too large, fails to fill the destination
+-- buffer.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 500, true);
+ERROR:  pglz_decompress failed
+-- Decompression with rawsize too small, fails with source not fully
+-- consumed.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 100, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- no data follows.
+SELECT length(test_pglz_decompress('\x01'::bytea, 1024, false)) AS ctrl_only_len;
+ ctrl_only_len 
+---------------
+             0
+(1 row)
+
+SELECT test_pglz_decompress('\x01'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- 1 byte follows.
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, false);
+ERROR:  pglz_decompress failed
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with match tag where length
+-- nibble is 3 bytes (extended length), no data follows.
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, false);
+ERROR:  pglz_decompress failed
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Clean up
+DROP FUNCTION test_pglz_compress;
+DROP FUNCTION test_pglz_decompress;
diff --git a/src/oracle_test/regress/expected/constraints.out b/src/oracle_test/regress/expected/constraints.out
index c8de5460d31..865c8cb4faf 100644
--- a/src/oracle_test/regress/expected/constraints.out
+++ b/src/oracle_test/regress/expected/constraints.out
@@ -8,6 +8,7 @@
 --  - EXCLUDE clauses
 --  - NOT NULL clauses
 --
+\set EXECUTE_RUN_PREPARE on
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 --
@@ -740,6 +741,11 @@ ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key ENFORCED;
 ERROR:  cannot alter enforceability of constraint "unique_tbl_i_key" of relation "unique_tbl"
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT ENFORCED;
 ERROR:  cannot alter enforceability of constraint "unique_tbl_i_key" of relation "unique_tbl"
+-- can't make an existing constraint NOT VALID
+ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+ERROR:  constraints cannot be altered to be NOT VALID
+LINE 1: ...ABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+                                                             ^
 DROP TABLE unique_tbl;
 --
 -- EXCLUDE constraints
@@ -833,8 +839,12 @@ CREATE TABLE notnull_tbl1 (a INTEGER NOT NULL NOT NULL);
 Not-null constraints:
     "notnull_tbl1_a_not_null" NOT NULL "a"
 
--- no-op
+-- specifying an existing constraint is a no-op
+ALTER TABLE notnull_tbl1 ADD CONSTRAINT notnull_tbl1_a_not_null NOT NULL a;
+-- but using a different constraint name is not allowed
 ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
+ERROR:  cannot create not-null constraint "nn" on column "a" of table "notnull_tbl1"
+DETAIL:  A not-null constraint named "notnull_tbl1_a_not_null" already exists for this column.
 \d+ notnull_tbl1
                                          Table "public.notnull_tbl1"
  Column |      Type       | Collation | Nullable | Default | Invisible | Storage | Stats target | Description 
@@ -1391,6 +1401,10 @@ ALTER TABLE notnull_tbl1 ADD PRIMARY KEY (a);
 ERROR:  cannot create primary key on column "a"
 DETAIL:  The constraint "nn" on column "a" of table "notnull_tbl1", marked NOT VALID, is incompatible with a primary key.
 HINT:  You might need to validate it using ALTER TABLE ... VALIDATE CONSTRAINT.
+-- cannot set column as generated-as-identity if it has an invalid not-null
+ALTER TABLE notnull_tbl1 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;
+ERROR:  incompatible NOT VALID constraint "nn" on relation "notnull_tbl1"
+HINT:  You might need to validate it using ALTER TABLE ... VALIDATE CONSTRAINT.
 -- ALTER column SET NOT NULL validates an invalid constraint (but this fails
 -- because of rows with null values)
 ALTER TABLE notnull_tbl1 ALTER a SET NOT NULL;
@@ -1658,6 +1672,7 @@ DEALLOCATE get_nnconstraint_info;
 -- Comments
 -- Setup a low-level role to enforce non-superuser checks.
 CREATE ROLE regress_constraint_comments;
+GRANT CREATE ON SCHEMA public TO regress_constraint_comments;
 SET SESSION AUTHORIZATION regress_constraint_comments;
 CREATE TABLE constraint_comments_tbl (a int CONSTRAINT the_constraint CHECK (a > 0));
 CREATE DOMAIN constraint_comments_dom AS int CONSTRAINT the_constraint CHECK (value > 0);
@@ -1686,5 +1701,14 @@ ERROR:  must be owner of type constraint_comments_dom
 RESET SESSION AUTHORIZATION;
 DROP TABLE constraint_comments_tbl;
 DROP DOMAIN constraint_comments_dom;
+REVOKE CREATE ON SCHEMA public FROM regress_constraint_comments;
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';
+-- Create a table that exercises pg_upgrade
+CREATE TABLE regress_notnull1 (a integer);
+CREATE TABLE regress_notnull2 () INHERITS (regress_notnull1);
+ALTER TABLE ONLY regress_notnull2 ALTER COLUMN a SET NOT NULL;
diff --git a/src/oracle_test/regress/expected/create_function_sql.out b/src/oracle_test/regress/expected/create_function_sql.out
index 294be067af2..cc7770a7433 100644
--- a/src/oracle_test/regress/expected/create_function_sql.out
+++ b/src/oracle_test/regress/expected/create_function_sql.out
@@ -783,6 +783,23 @@ SELECT double_append(array_append(ARRAY[q1], q2), q3)
  {4,5,6,4,5,6}
 (2 rows)
 
+-- Check that we can re-use a SQLFunctionCache after a run-time error.
+-- This function will fail with zero-divide at run time (not plan time).
+CREATE FUNCTION part_hashint4_error(value int4, seed int8) RETURNS int8
+LANGUAGE SQL STRICT IMMUTABLE PARALLEL SAFE AS
+$$ SELECT value + seed + random()::int/0 $$;
+/
+-- Put it into an operator class so that FmgrInfo will be cached in relcache.
+CREATE OPERATOR CLASS part_test_int4_ops_bad FOR TYPE int4 USING hash AS
+  FUNCTION 2 part_hashint4_error(int4, int8);
+CREATE TABLE pt(i int) PARTITION BY hash (i part_test_int4_ops_bad);
+CREATE TABLE p1 PARTITION OF pt FOR VALUES WITH (modulus 4, remainder 0);
+INSERT INTO pt VALUES (1);
+ERROR:  division by zero
+CONTEXT:  SQL function "part_hashint4_error" statement 1
+INSERT INTO pt VALUES (1);
+ERROR:  division by zero
+CONTEXT:  SQL function "part_hashint4_error" statement 1
 -- Things that shouldn't work:
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
     AS 'SELECT ''not an integer'';';
@@ -826,7 +843,7 @@ CONTEXT:  SQL function "test1" during startup
 RESET check_function_bodies;
 -- Cleanup
 DROP SCHEMA temp_func_test CASCADE;
-NOTICE:  drop cascades to 35 other objects
+NOTICE:  drop cascades to 38 other objects
 DETAIL:  drop cascades to function functest_a_1(text,date)
 drop cascades to function functest_a_2(text[])
 drop cascades to function functest_a_3()
@@ -861,6 +878,9 @@ drop cascades to function create_and_insert()
 drop cascades to table ddl_test
 drop cascades to function alter_and_insert()
 drop cascades to function double_append(anyarray,anyelement)
+drop cascades to function part_hashint4_error(pg_catalog.int4,pg_catalog.int8)
+drop cascades to operator family part_test_int4_ops_bad for access method hash
+drop cascades to table pt
 drop cascades to function test1(anyelement)
 DROP USER regress_unpriv_user;
 RESET search_path;
diff --git a/src/oracle_test/regress/expected/create_index.out b/src/oracle_test/regress/expected/create_index.out
index 5b03072f1d7..9bb363c43b2 100644
--- a/src/oracle_test/regress/expected/create_index.out
+++ b/src/oracle_test/regress/expected/create_index.out
@@ -32,6 +32,20 @@ COMMENT ON INDEX six_wrong IS 'bad index';
 ERROR:  relation "six_wrong" does not exist
 COMMENT ON INDEX six IS 'good index';
 COMMENT ON INDEX six IS NULL;
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+ six_comment_is_null 
+---------------------
+ t
+(1 row)
+
+COMMENT ON INDEX six IS 'add the comment back';
+COMMENT ON INDEX six IS ''; -- empty string removes the comment, same as NULL
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+ six_comment_is_null 
+---------------------
+ t
+(1 row)
+
 --
 -- BTREE partial indices
 --
@@ -1629,8 +1643,8 @@ DROP TABLE cwi_test;
 --
 CREATE TABLE syscol_table (a INT);
 -- System columns cannot be indexed
-CREATE INDEX ON syscolcol_table (ctid);
-ERROR:  relation "syscolcol_table" does not exist
+CREATE INDEX ON syscol_table (ctid);
+ERROR:  index creation on system columns is not supported
 -- nor used in expressions
 CREATE INDEX ON syscol_table ((ctid >= '(1000,0)'));
 ERROR:  index creation on system columns is not supported
diff --git a/src/oracle_test/regress/expected/create_role.out b/src/oracle_test/regress/expected/create_role.out
index 46d4f9efe99..5d0f21820ed 100644
--- a/src/oracle_test/regress/expected/create_role.out
+++ b/src/oracle_test/regress/expected/create_role.out
@@ -102,6 +102,33 @@ CREATE ROLE regress_rolecreator CREATEROLE;
 CREATE ROLE regress_hasprivs CREATEROLE LOGIN INHERIT CONNECTION LIMIT 5;
 -- ok, we should be able to modify a role we created
 COMMENT ON ROLE regress_hasprivs IS 'some comment';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+ has_comment 
+-------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS NULL;
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+ no_comment 
+------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS 'add the comment back';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+ has_comment 
+-------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS ''; -- empty string removes the comment, same as NULL
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+ no_comment 
+------------
+ t
+(1 row)
+
 ALTER ROLE regress_hasprivs RENAME TO regress_tenant;
 ALTER ROLE regress_tenant NOINHERIT NOLOGIN CONNECTION LIMIT 7;
 -- fail, we should be unable to modify a role we did not create
diff --git a/src/oracle_test/regress/expected/create_table.out b/src/oracle_test/regress/expected/create_table.out
index 6a7a31d0a92..0b85fe6a1da 100644
--- a/src/oracle_test/regress/expected/create_table.out
+++ b/src/oracle_test/regress/expected/create_table.out
@@ -102,6 +102,18 @@ ERROR:  tables declared WITH OIDS are not supported
 -- but explicitly not adding oids is still supported
 CREATE TEMP TABLE withoutoid() WITHOUT OIDS; DROP TABLE withoutoid;
 CREATE TEMP TABLE withoutoid() WITH (oids = false); DROP TABLE withoutoid;
+-- temporary tables are ignored by pg_filenode_relation().
+CREATE TEMP TABLE relation_filenode_check(c1 int);
+SELECT relpersistence,
+  pg_filenode_relation (reltablespace, pg_relation_filenode(oid))
+  FROM pg_class
+  WHERE relname = 'relation_filenode_check';
+ relpersistence | pg_filenode_relation 
+----------------+----------------------
+ t              | 
+(1 row)
+
+DROP TABLE relation_filenode_check;
 -- check restriction with default expressions
 -- invalid use of column reference in default expressions
 CREATE TABLE default_expr_column (id int DEFAULT (id));
@@ -149,6 +161,12 @@ ALTER TABLE remember_node_subid ALTER c TYPE bigint;
 SAVEPOINT q; DROP TABLE remember_node_subid; ROLLBACK TO q;
 COMMIT;
 DROP TABLE remember_node_subid;
+-- generated NOT NULL constraint names must not collide with explicitly named constraints
+CREATE TABLE two_not_null_constraints (
+   col integer NOT NULL,
+   CONSTRAINT two_not_null_constraints_col_not_null CHECK (col IS NOT NULL)
+);
+DROP TABLE two_not_null_constraints;
 --
 -- Partitioned tables
 --
diff --git a/src/oracle_test/regress/expected/create_table_like.out b/src/oracle_test/regress/expected/create_table_like.out
index eeb189277a3..d021f0a0cf0 100644
--- a/src/oracle_test/regress/expected/create_table_like.out
+++ b/src/oracle_test/regress/expected/create_table_like.out
@@ -320,6 +320,7 @@ DROP TABLE inhz;
 -- including storage and comments
 CREATE TABLE ctlt1 (a text CHECK (length(a) > 2) ENFORCED PRIMARY KEY,
 	b text CHECK (length(b) > 100) NOT ENFORCED);
+ALTER TABLE ctlt1 ADD CONSTRAINT cc CHECK (length(b) > 100) NOT VALID;
 CREATE INDEX ctlt1_b_key ON ctlt1 (b);
 CREATE INDEX ctlt1_fnidx ON ctlt1 ((a || b));
 CREATE STATISTICS ctlt1_a_b_stat ON a,b FROM ctlt1;
@@ -378,6 +379,7 @@ SELECT conname, description FROM pg_description, pg_constraint c WHERE classoid
 CREATE TABLE ctlt1_inh (LIKE ctlt1 INCLUDING CONSTRAINTS INCLUDING COMMENTS) INHERITS (ctlt1);
 NOTICE:  merging column "a" with inherited definition
 NOTICE:  merging column "b" with inherited definition
+NOTICE:  merging constraint "cc" with inherited definition
 NOTICE:  merging constraint "ctlt1_a_check" with inherited definition
 NOTICE:  merging constraint "ctlt1_b_check" with inherited definition
 \d+ ctlt1_inh
@@ -387,6 +389,7 @@ NOTICE:  merging constraint "ctlt1_b_check" with inherited definition
  a      | text |           | not null |         |           | main     |              | A
  b      | text |           |          |         |           | extended |              | B
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Not-null constraints:
@@ -409,6 +412,7 @@ NOTICE:  merging multiple inherited definitions of column "a"
  b      | text |           |          |         |           | extended |              | 
  c      | text |           |          |         |           | external |              | 
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
     "ctlt3_a_check" CHECK (length(a) < 5)
@@ -430,6 +434,7 @@ NOTICE:  merging column "a" with inherited definition
 Indexes:
     "ctlt13_like_expr_idx" btree ((a || c))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
     "ctlt3_a_check" CHECK (length(a) < 5)
@@ -456,6 +461,7 @@ Indexes:
     "ctlt_all_b_idx" btree (b)
     "ctlt_all_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -499,6 +505,7 @@ Indexes:
     "pg_attrdef_b_idx" btree (b)
     "pg_attrdef_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -524,6 +531,7 @@ Indexes:
     "ctlt1_b_idx" btree (b)
     "ctlt1_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -686,6 +694,37 @@ SELECT attname, attcompression FROM pg_attribute
  e       | 
 (5 rows)
 
+-- LIKE ... INCLUDING STATISTICS with dropped columns in the parent,
+-- so stxkeys attnums are not contiguous.
+CREATE TABLE ctl_stats3_parent (a int, b int, c int);
+ALTER TABLE ctl_stats3_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats3_stat ON a, c FROM ctl_stats3_parent;
+CREATE TABLE ctl_stats3_child (LIKE ctl_stats3_parent INCLUDING STATISTICS);
+CREATE TABLE ctl_stats4_parent (a int, b int, c int, d int);
+ALTER TABLE ctl_stats4_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats4_stat ON a, c FROM ctl_stats4_parent;
+CREATE TABLE ctl_stats4_child (LIKE ctl_stats4_parent INCLUDING STATISTICS);
+SELECT s.stxrelid::regclass AS relation,
+       array_agg(a.attname ORDER BY u.ord) AS stats_columns
+FROM pg_statistic_ext s
+CROSS JOIN LATERAL
+  unnest(s.stxkeys::int2[]) WITH ORDINALITY AS u(attnum, ord)
+JOIN pg_attribute a
+  ON a.attrelid = s.stxrelid AND a.attnum = u.attnum
+WHERE s.stxrelid IN ('ctl_stats3_child'::regclass,
+                     'ctl_stats4_child'::regclass)
+GROUP BY s.stxrelid
+ORDER BY s.stxrelid::regclass::text;
+     relation     | stats_columns 
+------------------+---------------
+ ctl_stats3_child | {a,c}
+ ctl_stats4_child | {a,c}
+(2 rows)
+
+DROP TABLE ctl_stats3_parent;
+DROP TABLE ctl_stats3_child;
+DROP TABLE ctl_stats4_parent;
+DROP TABLE ctl_stats4_child;
 DROP TABLE ctl_table;
 DROP FOREIGN TABLE ctl_foreign_table1;
 DROP FOREIGN TABLE ctl_foreign_table2;
diff --git a/src/oracle_test/regress/expected/domain.out b/src/oracle_test/regress/expected/domain.out
index 42b9e04dca7..e4b2ed0672d 100644
--- a/src/oracle_test/regress/expected/domain.out
+++ b/src/oracle_test/regress/expected/domain.out
@@ -1,6 +1,7 @@
 --
 -- Test domains.
 --
+\set EXECUTE_RUN_PREPARE on
 -- Test Comment / Drop
 create domain domaindroptest int4;
 comment on domain domaindroptest is 'About to drop this..';
@@ -1018,6 +1019,11 @@ insert into domain_test values (1, 2);
 -- should fail
 alter table domain_test add column c str_domain;
 ERROR:  domain str_domain does not allow null values
+-- disallow duplicated not-null constraints
+create domain int_domain1 as int constraint nn1 not null constraint nn2 not null;
+ERROR:  redundant NOT NULL constraint definition
+LINE 1: ...domain int_domain1 as int constraint nn1 not null constraint...
+                                                             ^
 create domain str_domain2 as text check (value <> 'foo') default 'foo';
 -- should fail
 alter table domain_test add column d str_domain2;
diff --git a/src/oracle_test/regress/expected/encoding.out b/src/oracle_test/regress/expected/encoding.out
new file mode 100644
index 00000000000..69ead606822
--- /dev/null
+++ b/src/oracle_test/regress/expected/encoding.out
@@ -0,0 +1,451 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/oraregress' :dlsuffix
+CREATE FUNCTION test_bytea_to_text(bytea) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_text_to_bytea(text) RETURNS bytea
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_mblen_func(text, text, text, int) RETURNS int
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_text_to_wchars(text, text) RETURNS int[]
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_wchars_to_text(text, int[]) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_valid_server_encoding(text) RETURNS boolean
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE TABLE regress_encoding(good text, truncated text, with_nul text, truncated_with_nul text);
+INSERT INTO regress_encoding
+VALUES ('café',
+        'caf' || test_bytea_to_text('\xc3'),
+        'café' || test_bytea_to_text('\x00') || 'dcba',
+        'caf' || test_bytea_to_text('\xc300') || 'dcba');
+SELECT good, truncated, with_nul FROM regress_encoding;
+ good | truncated | with_nul 
+------+-----------+----------
+ café | caf       | café
+(1 row)
+
+SELECT length(good) FROM regress_encoding;
+ length 
+--------
+      4
+(1 row)
+
+SELECT substring(good, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(good, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ é
+(1 row)
+
+SELECT regexp_replace(good, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ é
+(1 row)
+
+SELECT reverse(good) FROM regress_encoding;
+ reverse 
+---------
+ éfac
+(1 row)
+
+-- invalid short mb character = error
+SELECT length(truncated) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT substring(truncated, 1, 3) FROM regress_encoding;
+ substring 
+-----------
+ caf
+(1 row)
+
+SELECT substring(truncated, 1, 4) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT reverse(truncated) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+-- invalid short mb character = silently dropped
+SELECT regexp_replace(truncated, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ caf
+(1 row)
+
+-- PostgreSQL doesn't allow strings to contain NUL.  If a corrupted string
+-- contains NUL at a character boundary position, some functions treat it as a
+-- character while others treat it as a terminator, as implementation details.
+-- NUL = terminator
+SELECT length(with_nul) FROM regress_encoding;
+ length 
+--------
+      4
+(1 row)
+
+SELECT substring(with_nul, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(with_nul, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ é
+(1 row)
+
+SELECT substring(with_nul, 5, 1) FROM regress_encoding;
+ substring 
+-----------
+ 
+(1 row)
+
+SELECT convert_to(substring(with_nul, 5, 1), 'UTF8') FROM regress_encoding;
+ convert_to 
+------------
+ \x
+(1 row)
+
+SELECT regexp_replace(with_nul, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ é
+(1 row)
+
+-- NUL = character
+SELECT with_nul, reverse(with_nul), reverse(reverse(with_nul)) FROM regress_encoding;
+ with_nul | reverse | reverse 
+----------+---------+---------
+ café     | abcd    | café
+(1 row)
+
+-- If a corrupted string contains NUL in the tail bytes of a multibyte
+-- character (invalid in all encodings), it is considered part of the
+-- character for length purposes.  An error will only be raised in code paths
+-- that convert or verify encodings.
+SELECT length(truncated_with_nul) FROM regress_encoding;
+ length 
+--------
+      8
+(1 row)
+
+SELECT substring(truncated_with_nul, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(truncated_with_nul, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ 
+(1 row)
+
+SELECT convert_to(substring(truncated_with_nul, 4, 1), 'UTF8') FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3 0x00
+SELECT substring(truncated_with_nul, 5, 1) FROM regress_encoding;
+ substring 
+-----------
+ d
+(1 row)
+
+SELECT regexp_replace(truncated_with_nul, '^caf(.)dcba$', '\1') = test_bytea_to_text('\xc300') FROM regress_encoding;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT reverse(truncated_with_nul) FROM regress_encoding;
+ reverse 
+---------
+ abcd
+(1 row)
+
+-- unbounded: sequence would overrun the string!
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+-- condition detected when using the length/range variants
+SELECT test_mblen_func('pg_mblen_with_len', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT test_mblen_func('pg_mblen_range', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+-- unbounded: sequence would overrun the string, if the terminator were really
+-- the end of it
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+SELECT test_mblen_func('pg_encoding_mblen', 'GB18030', truncated_with_nul, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+-- condition detected when using the cstr variants
+SELECT test_mblen_func('pg_mblen_cstr', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+DROP TABLE regress_encoding;
+-- mb<->wchar conversions
+CREATE FUNCTION test_encoding(encoding text, description text, input bytea)
+RETURNS VOID LANGUAGE plisql AS
+$$
+DECLARE
+	prefix text;
+	len int;
+	wchars int[];
+	round_trip bytea;
+	result text;
+BEGIN
+	prefix := rpad(encoding || ' ' || description || ':', 28);
+
+	-- XXX could also test validation, length functions and include client
+	-- only encodings with these test cases
+
+	IF test_valid_server_encoding(encoding) THEN
+		wchars := test_text_to_wchars(encoding, test_bytea_to_text(input));
+		round_trip = test_text_to_bytea(test_wchars_to_text(encoding, wchars));
+		if input = round_trip then
+			result := 'OK';
+		elsif length(input) > length(round_trip) and round_trip = substr(input, 1, length(round_trip)) then
+			result := 'truncated';
+		else
+			result := 'failed';
+		end if;
+		RAISE NOTICE '% % -> % -> % = %', prefix, input, wchars, round_trip, result;
+	END IF;
+END;
+$$;
+/
+-- No validation is done on the encoding itself, just the length to avoid
+-- overruns, so some of the byte sequences below are bogus.  They cover
+-- all code branches, server encodings only for now.
+CREATE TABLE encoding_tests (encoding text, description text, input bytea);
+INSERT INTO encoding_tests VALUES
+	-- LATIN1, other single-byte encodings
+	('LATIN1', 'ASCII',    'a'),
+	('LATIN1', 'extended', '\xe9'),
+	-- EUC_JP, EUC_JIS_2004, EUR_KR (for the purposes of wchar conversion):
+	-- 2 8e (CS2, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 3 8f (CS3, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 2 80..ff (CS1)
+	('EUC_JP', 'ASCII',      'a'),
+	('EUC_JP', 'CS1, short', '\x80'),
+	('EUC_JP', 'CS1',        '\x8002'),
+	('EUC_JP', 'CS2, short', '\x8e'),
+	('EUC_JP', 'CS2',        '\x8e02'),
+	('EUC_JP', 'CS3, short', '\x8f'),
+	('EUC_JP', 'CS3, short', '\x8f02'),
+	('EUC_JP', 'CS3',        '\x8f0203'),
+	-- EUC_CN
+	-- 3 8e (CS2, not used but arbitrarily considered to have length 3)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_CN', 'ASCII',      'a'),
+	('EUC_CN', 'CS1, short', '\x80'),
+	('EUC_CN', 'CS1',        '\x8002'),
+	('EUC_CN', 'CS2, short', '\x8e'),
+	('EUC_CN', 'CS2, short', '\x8e02'),
+	('EUC_CN', 'CS2',        '\x8e0203'),
+	('EUC_CN', 'CS3, short', '\x8f'),
+	('EUC_CN', 'CS3, short', '\x8f02'),
+	('EUC_CN', 'CS3',        '\x8f0203'),
+	-- EUC_TW:
+	-- 4 8e (CS2)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_TW', 'ASCII',      'a'),
+	('EUC_TW', 'CS1, short', '\x80'),
+	('EUC_TW', 'CS1',        '\x8002'),
+	('EUC_TW', 'CS2, short', '\x8e'),
+	('EUC_TW', 'CS2, short', '\x8e02'),
+	('EUC_TW', 'CS2, short', '\x8e0203'),
+	('EUC_TW', 'CS2',        '\x8e020304'),
+	('EUC_TW', 'CS3, short', '\x8f'),
+	('EUC_TW', 'CS3, short', '\x8f02'),
+	('EUC_TW', 'CS3',        '\x8f0203'),
+	-- UTF8
+	-- 2 c0..df
+	-- 3 e0..ef
+	-- 4 f0..f7 (but maximum real codepoint U+10ffff has f4)
+	-- 5 f8..fb (not supported)
+	-- 6 fc..fd (not supported)
+	('UTF8',   'ASCII',               'a'),
+	('UTF8',   '2 byte, short',       '\xdf'),
+	('UTF8',   '2 byte',              '\xdf82'),
+	('UTF8',   '3 byte, short',       '\xef'),
+	('UTF8',   '3 byte, short',       '\xef82'),
+	('UTF8',   '3 byte',              '\xef8283'),
+	('UTF8',   '4 byte, short',       '\xf7'),
+	('UTF8',   '4 byte, short',       '\xf782'),
+	('UTF8',   '4 byte, short',       '\xf78283'),
+	('UTF8',   '4 byte',              '\xf7828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb'),
+	('UTF8',   '5 byte, unsupported', '\xfb82'),
+	('UTF8',   '5 byte, unsupported', '\xfb8283'),
+	('UTF8',   '5 byte, unsupported', '\xfb828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd'),
+	('UTF8',   '6 byte, unsupported', '\xfd82'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283'),
+	('UTF8',   '6 byte, unsupported', '\xfd828384'),
+	('UTF8',   '6 byte, unsupported', '\xfd82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283848586'),
+	-- MULE_INTERNAL
+	-- 2 81..8d LC1
+	-- 3 90..99 LC2
+	('MULE_INTERNAL', 'ASCII',         'a'),
+	('MULE_INTERNAL', 'LC1, short',    '\x81'),
+	('MULE_INTERNAL', 'LC1',           '\x8182'),
+	('MULE_INTERNAL', 'LC2, short',    '\x90'),
+	('MULE_INTERNAL', 'LC2, short',    '\x9082'),
+	('MULE_INTERNAL', 'LC2',           '\x908283');
+SELECT COUNT(test_encoding(encoding, description, input)) > 0
+FROM encoding_tests;
+NOTICE:  LATIN1 ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  LATIN1 extended:             \xe9 -> {233} -> \xe9 = OK
+NOTICE:  EUC_JP ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_JP CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_JP CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_JP CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_JP CS2:                  \x8e02 -> {36354} -> \x8e02 = OK
+NOTICE:  EUC_JP CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_JP CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_JP CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  EUC_CN ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_CN CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_CN CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_CN CS2, short:           \x8e02 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS2:                  \x8e0203 -> {9306627} -> \x8e0203 = OK
+NOTICE:  EUC_CN CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_CN CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  EUC_TW ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_TW CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_TW CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2, short:           \x8e02 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2, short:           \x8e0203 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2:                  \x8e020304 -> {-1912470780} -> \x8e020304 = OK
+NOTICE:  EUC_TW CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_TW CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  UTF8 ASCII:                  \x61 -> {97} -> \x61 = OK
+NOTICE:  UTF8 2 byte, short:          \xdf -> {} -> \x = truncated
+NOTICE:  UTF8 2 byte:                 \xdf82 -> {1986} -> \xdf82 = OK
+NOTICE:  UTF8 3 byte, short:          \xef -> {} -> \x = truncated
+NOTICE:  UTF8 3 byte, short:          \xef82 -> {} -> \x = truncated
+NOTICE:  UTF8 3 byte:                 \xef8283 -> {61571} -> \xef8283 = OK
+NOTICE:  UTF8 4 byte, short:          \xf7 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte, short:          \xf782 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte, short:          \xf78283 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte:                 \xf7828384 -> {1843396} -> \xf7828384 = OK
+NOTICE:  UTF8 5 byte, unsupported:    \xfb -> {251} -> \xc3bb = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb82 -> {251,130} -> \xc3bbc282 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb8283 -> {251,130,131} -> \xc3bbc282c283 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb828384 -> {251,130,131,132} -> \xc3bbc282c283c284 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb82838485 -> {251,130,131,132,133} -> \xc3bbc282c283c284c285 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd -> {253} -> \xc3bd = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd82 -> {253,130} -> \xc3bdc282 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd8283 -> {253,130,131} -> \xc3bdc282c283 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd828384 -> {253,130,131,132} -> \xc3bdc282c283c284 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd82838485 -> {253,130,131,132,133} -> \xc3bdc282c283c284c285 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd8283848586 -> {253,130,131,132,133,134} -> \xc3bdc282c283c284c285c286 = failed
+NOTICE:  MULE_INTERNAL ASCII:         \x61 -> {97} -> \x61 = OK
+NOTICE:  MULE_INTERNAL LC1, short:    \x81 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC1:           \x8182 -> {8454274} -> \x8182 = OK
+NOTICE:  MULE_INTERNAL LC2, short:    \x90 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC2, short:    \x9082 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC2:           \x908283 -> {9470595} -> \x908283 = OK
+ ?column? 
+----------
+ t
+(1 row)
+
+-- substring fetches a slice of a toasted value; unused tail of that slice is
+-- an incomplete char (bug #19406)
+CREATE TABLE toast_3b_utf8 (c text);
+INSERT INTO toast_3b_utf8 VALUES (repeat(U&'\2026', 4000));
+SELECT SUBSTRING(c FROM 1 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ …
+(1 row)
+
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ 
+(1 row)
+
+-- diagnose incomplete char iff within the substring
+UPDATE toast_3b_utf8 SET c = c || test_bytea_to_text('\xe280');
+SELECT SUBSTRING(c FROM 4000 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ …
+(1 row)
+
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xe2 0x80
+-- substring needing last byte of its slice_size
+ALTER TABLE toast_3b_utf8 RENAME TO toast_4b_utf8;
+UPDATE toast_4b_utf8 SET c = repeat(U&'\+01F680', 3000);
+SELECT SUBSTRING(c FROM 3000 FOR 1) FROM toast_4b_utf8;
+ substring 
+-----------
+ 🚀
+(1 row)
+
+DROP TABLE encoding_tests;
+DROP TABLE toast_4b_utf8;
+DROP FUNCTION test_encoding;
+DROP FUNCTION test_wchars_to_text;
+DROP FUNCTION test_text_to_wchars;
+DROP FUNCTION test_valid_server_encoding;
+DROP FUNCTION test_mblen_func;
+DROP FUNCTION test_bytea_to_text;
+DROP FUNCTION test_text_to_bytea;
+-- substring slow path: multi-byte escape char vs. multi-byte pattern char.
+SELECT SUBSTRING('a' SIMILAR U&'\00AC' ESCAPE U&'\00A7');
+ substring 
+-----------
+ 
+(1 row)
+
+-- Levenshtein distance metric: exercise character length cache.
+SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+ERROR:  "real§_name": invalid identifier
+LINE 1: SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+               ^
+-- JSON errcontext: truncate long data.
+SELECT repeat(U&'\00A7', 30)::json;
+ERROR:  invalid input syntax for type json
+DETAIL:  Token "§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§" is invalid.
+CONTEXT:  JSON data, line 1: ...§§§§§§§§§§§§§§§§§§§§§§§§
diff --git a/src/oracle_test/regress/expected/encoding_1.out b/src/oracle_test/regress/expected/encoding_1.out
new file mode 100644
index 00000000000..a5b02090901
--- /dev/null
+++ b/src/oracle_test/regress/expected/encoding_1.out
@@ -0,0 +1,4 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/oracle_test/regress/expected/euc_kr.out b/src/oracle_test/regress/expected/euc_kr.out
new file mode 100644
index 00000000000..7a61c89a43a
--- /dev/null
+++ b/src/oracle_test/regress/expected/euc_kr.out
@@ -0,0 +1,16 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+-- Exercise is_multibyte_char_in_char (non-UTF8) slow path.
+SELECT POSITION(
+	convert_from('\xbcf6c7d0', 'EUC_KR') IN
+	convert_from('\xb0fac7d02c20bcf6c7d02c20b1e2bcfa2c20bbee', 'EUC_KR'));
+ position 
+----------
+        5
+(1 row)
+
diff --git a/src/oracle_test/regress/expected/euc_kr_1.out b/src/oracle_test/regress/expected/euc_kr_1.out
new file mode 100644
index 00000000000..faaac5d6355
--- /dev/null
+++ b/src/oracle_test/regress/expected/euc_kr_1.out
@@ -0,0 +1,6 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/oracle_test/regress/expected/event_trigger.out b/src/oracle_test/regress/expected/event_trigger.out
index d2a8a9dc1b6..e23d83a2de8 100644
--- a/src/oracle_test/regress/expected/event_trigger.out
+++ b/src/oracle_test/regress/expected/event_trigger.out
@@ -233,9 +233,15 @@ INSERT INTO undroppable_objs VALUES
 ('table', 'schema_one.table_three'),
 ('table', 'audit_tbls.schema_two_table_three');
 CREATE TABLE dropped_objects (
-	type text,
-	schema text,
-	object text
+	object_type text,
+	schema_name text,
+	object_name text,
+	object_identity text,
+	address_names text[],
+	address_args text[],
+	is_temporary bool,
+	original bool,
+	normal bool
 );
 -- This tests errors raised within event triggers; the one in audit_tbls
 -- uses 2nd-level recursive invocation via test_evtrig_dropped_objects().
@@ -274,8 +280,12 @@ BEGIN
         END IF;
 
 	INSERT INTO dropped_objects
-		(type, schema, object) VALUES
-		(obj.object_type, obj.schema_name, obj.object_identity);
+		(object_type, schema_name, object_name,
+		 object_identity, address_names, address_args,
+		 is_temporary, original, normal) VALUES
+		(obj.object_type, obj.schema_name, obj.object_name,
+		 obj.object_identity, obj.address_names, obj.address_args,
+		 obj.is_temporary, obj.original, obj.normal);
     END LOOP;
 END
 $$;
@@ -332,42 +342,44 @@ NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
 NOTICE:  table "schema_one_table_one" does not exist, skipping
 NOTICE:  table "schema_one_table two" does not exist, skipping
 NOTICE:  table "schema_one_table_three" does not exist, skipping
-SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
-     type     |   schema   |                     object                      
---------------+------------+-------------------------------------------------
- table column | schema_one | schema_one.table_one.a
- schema       |            | schema_two
- table        | schema_two | schema_two.table_two
- type         | schema_two | schema_two.table_two
- type         | schema_two | schema_two.table_two[]
- table        | audit_tbls | audit_tbls.schema_two_table_three
- type         | audit_tbls | audit_tbls.schema_two_table_three
- type         | audit_tbls | audit_tbls.schema_two_table_three[]
- table        | schema_two | schema_two.table_three
- type         | schema_two | schema_two.table_three
- type         | schema_two | schema_two.table_three[]
- function     | schema_two | schema_two.add(pg_catalog.int4,pg_catalog.int4)
- aggregate    | schema_two | schema_two.newton(pg_catalog.int4)
- schema       |            | schema_one
- table        | schema_one | schema_one.table_one
- type         | schema_one | schema_one.table_one
- type         | schema_one | schema_one.table_one[]
- table        | schema_one | schema_one."table two"
- type         | schema_one | schema_one."table two"
- type         | schema_one | schema_one."table two"[]
- table        | schema_one | schema_one.table_three
- type         | schema_one | schema_one.table_three
- type         | schema_one | schema_one.table_three[]
+-- exclude TOAST objects because they have unstable names
+SELECT * FROM dropped_objects
+  WHERE schema_name IS NULL OR schema_name <> 'pg_toast';
+ object_type  | schema_name |       object_name       |                 object_identity                 |             address_names             |           address_args            | is_temporary | original | normal 
+--------------+-------------+-------------------------+-------------------------------------------------+---------------------------------------+-----------------------------------+--------------+----------+--------
+ table column | schema_one  |                         | schema_one.table_one.a                          | {schema_one,table_one,a}              | {}                                | f            | t        | f
+ schema       |             | schema_two              | schema_two                                      | {schema_two}                          | {}                                | f            | t        | f
+ table        | schema_two  | table_two               | schema_two.table_two                            | {schema_two,table_two}                | {}                                | f            | f        | t
+ type         | schema_two  | table_two               | schema_two.table_two                            | {schema_two.table_two}                | {}                                | f            | f        | f
+ type         | schema_two  | _table_two              | schema_two.table_two[]                          | {schema_two.table_two[]}              | {}                                | f            | f        | f
+ table        | audit_tbls  | schema_two_table_three  | audit_tbls.schema_two_table_three               | {audit_tbls,schema_two_table_three}   | {}                                | f            | t        | f
+ type         | audit_tbls  | schema_two_table_three  | audit_tbls.schema_two_table_three               | {audit_tbls.schema_two_table_three}   | {}                                | f            | f        | f
+ type         | audit_tbls  | _schema_two_table_three | audit_tbls.schema_two_table_three[]             | {audit_tbls.schema_two_table_three[]} | {}                                | f            | f        | f
+ table        | schema_two  | table_three             | schema_two.table_three                          | {schema_two,table_three}              | {}                                | f            | f        | t
+ type         | schema_two  | table_three             | schema_two.table_three                          | {schema_two.table_three}              | {}                                | f            | f        | f
+ type         | schema_two  | _table_three            | schema_two.table_three[]                        | {schema_two.table_three[]}            | {}                                | f            | f        | f
+ function     | schema_two  |                         | schema_two.add(pg_catalog.int4,pg_catalog.int4) | {schema_two,add}                      | {pg_catalog.int4,pg_catalog.int4} | f            | f        | t
+ aggregate    | schema_two  |                         | schema_two.newton(pg_catalog.int4)              | {schema_two,newton}                   | {pg_catalog.int4}                 | f            | f        | t
+ schema       |             | schema_one              | schema_one                                      | {schema_one}                          | {}                                | f            | t        | f
+ table        | schema_one  | table_one               | schema_one.table_one                            | {schema_one,table_one}                | {}                                | f            | f        | t
+ type         | schema_one  | table_one               | schema_one.table_one                            | {schema_one.table_one}                | {}                                | f            | f        | f
+ type         | schema_one  | _table_one              | schema_one.table_one[]                          | {schema_one.table_one[]}              | {}                                | f            | f        | f
+ table        | schema_one  | table two               | schema_one."table two"                          | {schema_one,"table two"}              | {}                                | f            | f        | t
+ type         | schema_one  | table two               | schema_one."table two"                          | {"schema_one.\"table two\""}          | {}                                | f            | f        | f
+ type         | schema_one  | _table two              | schema_one."table two"[]                        | {"schema_one.\"table two\"[]"}        | {}                                | f            | f        | f
+ table        | schema_one  | table_three             | schema_one.table_three                          | {schema_one,table_three}              | {}                                | f            | f        | t
+ type         | schema_one  | table_three             | schema_one.table_three                          | {schema_one.table_three}              | {}                                | f            | f        | f
+ type         | schema_one  | _table_three            | schema_one.table_three[]                        | {schema_one.table_three[]}            | {}                                | f            | f        | f
 (23 rows)
 
 DROP OWNED BY regress_evt_user;
 NOTICE:  schema "audit_tbls" does not exist, skipping
-SELECT * FROM dropped_objects WHERE type = 'schema';
-  type  | schema |   object   
---------+--------+------------
- schema |        | schema_two
- schema |        | schema_one
- schema |        | audit_tbls
+SELECT * FROM dropped_objects WHERE object_type = 'schema';
+ object_type | schema_name | object_name | object_identity | address_names | address_args | is_temporary | original | normal 
+-------------+-------------+-------------+-----------------+---------------+--------------+--------------+----------+--------
+ schema      |             | schema_two  | schema_two      | {schema_two}  | {}           | f            | t        | f
+ schema      |             | schema_one  | schema_one      | {schema_one}  | {}           | f            | t        | f
+ schema      |             | audit_tbls  | audit_tbls      | {audit_tbls}  | {}           | f            | t        | f
 (3 rows)
 
 DROP ROLE regress_evt_user;
@@ -385,9 +397,10 @@ BEGIN
     IF NOT r.normal AND NOT r.original THEN
         CONTINUE;
     END IF;
-    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% name=% args=%',
+    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
         r.original, r.normal, r.is_temporary, r.object_type,
-        r.object_identity, r.address_names, r.address_args;
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
     END LOOP;
 END; $$;
 /
@@ -445,18 +458,18 @@ CREATE TABLE evttrig.part_15_20 PARTITION OF evttrig.part_10_20 (id)
   FOR VALUES FROM (15) TO (20);
 NOTICE:  END: command_tag=CREATE TABLE type=table identity=evttrig.part_15_20
 ALTER TABLE evttrig.two DROP COLUMN col_c;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.two.col_c name={evttrig,two,col_c} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table constraint identity=two_col_c_check on evttrig.two name={evttrig,two,two_col_c_check} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.two.col_c schema=evttrig name=<NULL> addr={evttrig,two,col_c} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table constraint identity=two_col_c_check on evttrig.two schema=evttrig name=<NULL> addr={evttrig,two,two_col_c_check} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.two
 ALTER TABLE evttrig.one ALTER COLUMN col_b DROP DEFAULT;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=default value identity=for evttrig.one.col_b name={evttrig,one,col_b} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=default value identity=for evttrig.one.col_b schema=evttrig name=<NULL> addr={evttrig,one,col_b} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.one DROP CONSTRAINT one_pkey;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table constraint identity=one_pkey on evttrig.one name={evttrig,one,one_pkey} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table constraint identity=one_pkey on evttrig.one schema=evttrig name=<NULL> addr={evttrig,one,one_pkey} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.one DROP COLUMN col_c;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.one.col_c name={evttrig,one,col_c} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_c name={evttrig,one,col_c} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.one.col_c schema=evttrig name=<NULL> addr={evttrig,one,col_c} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_c schema=evttrig name=<NULL> addr={evttrig,one,col_c} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.id ALTER COLUMN col_d SET DATA TYPE bigint;
 NOTICE:  END: command_tag=ALTER SEQUENCE type=sequence identity=evttrig.id_col_d_seq
@@ -465,26 +478,92 @@ ALTER TABLE evttrig.id ALTER COLUMN col_d DROP IDENTITY,
   ALTER COLUMN col_d SET DATA TYPE int;
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.id
 DROP INDEX evttrig.one_idx;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=index identity=evttrig.one_idx name={evttrig,one_idx} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=index identity=evttrig.one_idx schema=evttrig name=one_idx addr={evttrig,one_idx} args={}
 DROP SCHEMA evttrig CASCADE;
 NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to table evttrig.one
 drop cascades to table evttrig.two
 drop cascades to table evttrig.id
 drop cascades to table evttrig.parted
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=schema identity=evttrig name={evttrig} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.one name={evttrig,one} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=sequence identity=evttrig.one_col_a_seq name={evttrig,one_col_a_seq} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_a name={evttrig,one,col_a} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.two name={evttrig,two} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.id name={evttrig,id} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.parted name={evttrig,parted} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_1_10 name={evttrig,part_1_10} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_20 name={evttrig,part_10_20} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_15 name={evttrig,part_10_15} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_15_20 name={evttrig,part_15_20} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=schema identity=evttrig schema=<NULL> name=evttrig addr={evttrig} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.one schema=evttrig name=one addr={evttrig,one} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=sequence identity=evttrig.one_col_a_seq schema=evttrig name=one_col_a_seq addr={evttrig,one_col_a_seq} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_a schema=evttrig name=<NULL> addr={evttrig,one,col_a} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.two schema=evttrig name=two addr={evttrig,two} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.id schema=evttrig name=id addr={evttrig,id} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.parted schema=evttrig name=parted addr={evttrig,parted} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_1_10 schema=evttrig name=part_1_10 addr={evttrig,part_1_10} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_20 schema=evttrig name=part_10_20 addr={evttrig,part_10_20} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_15 schema=evttrig name=part_10_15 addr={evttrig,part_10_15} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_15_20 schema=evttrig name=part_15_20 addr={evttrig,part_15_20} args={}
+DROP TABLE a_temp_tbl;
+NOTICE:  NORMAL: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp,a_temp_tbl} args={}
+-- check unfiltered results, too
+CREATE OR REPLACE FUNCTION event_trigger_report_dropped()
+ RETURNS event_trigger
+ LANGUAGE plisql
+AS $$
+DECLARE r record;
+BEGIN
+    FOR r IN SELECT * from pg_event_trigger_dropped_objects()
+    LOOP
+    RAISE NOTICE 'DROP: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
+        r.original, r.normal, r.is_temporary, r.object_type,
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
+    END LOOP;
+END; $$;
+/
+NOTICE:  END: command_tag=CREATE FUNCTION type=function identity=public.event_trigger_report_dropped()
+CREATE FUNCTION event_trigger_dummy_trigger()
+ RETURNS trigger
+ LANGUAGE plisql
+AS $$
+BEGIN
+    RETURN new;
+END; $$;
+/
+NOTICE:  END: command_tag=CREATE FUNCTION type=function identity=public.event_trigger_dummy_trigger()
+CREATE TABLE evtrg_nontemp_table (f1 int primary key, f2 int default 42);
+NOTICE:  END: command_tag=CREATE TABLE type=table identity=public.evtrg_nontemp_table
+NOTICE:  END: command_tag=CREATE INDEX type=index identity=public.evtrg_nontemp_table_pkey
+CREATE TRIGGER evtrg_nontemp_trig
+  BEFORE INSERT ON evtrg_nontemp_table
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+NOTICE:  END: command_tag=CREATE TRIGGER type=trigger identity=evtrg_nontemp_trig on public.evtrg_nontemp_table
+CREATE POLICY evtrg_nontemp_pol ON evtrg_nontemp_table USING (f2 > 0);
+NOTICE:  END: command_tag=CREATE POLICY type=policy identity=evtrg_nontemp_pol on public.evtrg_nontemp_table
+DROP TABLE evtrg_nontemp_table;
+NOTICE:  DROP: orig=t normal=f istemp=f type=table identity=public.evtrg_nontemp_table schema=public name=evtrg_nontemp_table addr={public,evtrg_nontemp_table} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=type identity=public.evtrg_nontemp_table schema=public name=evtrg_nontemp_table addr={public.evtrg_nontemp_table} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=type identity=public.evtrg_nontemp_table[] schema=public name=_evtrg_nontemp_table addr={public.evtrg_nontemp_table[]} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=default value identity=for public.evtrg_nontemp_table.f2 schema=public name=<NULL> addr={public,evtrg_nontemp_table,f2} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=table constraint identity=evtrg_nontemp_table_f1_not_null on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_table_f1_not_null} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=table constraint identity=evtrg_nontemp_table_pkey on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_table_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=index identity=public.evtrg_nontemp_table_pkey schema=public name=evtrg_nontemp_table_pkey addr={public,evtrg_nontemp_table_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=trigger identity=evtrg_nontemp_trig on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_trig} args={}
+NOTICE:  DROP: orig=f normal=t istemp=f type=policy identity=evtrg_nontemp_pol on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_pol} args={}
+CREATE TEMP TABLE a_temp_tbl (f1 int primary key, f2 int default 42);
+NOTICE:  END: command_tag=CREATE TABLE type=table identity=pg_temp.a_temp_tbl
+NOTICE:  END: command_tag=CREATE INDEX type=index identity=pg_temp.a_temp_tbl_pkey
+CREATE TRIGGER a_temp_trig
+  BEFORE INSERT ON a_temp_tbl
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+NOTICE:  END: command_tag=CREATE TRIGGER type=trigger identity=a_temp_trig on pg_temp.a_temp_tbl
+CREATE POLICY a_temp_pol ON a_temp_tbl USING (f2 > 0);
+NOTICE:  END: command_tag=CREATE POLICY type=policy identity=a_temp_pol on pg_temp.a_temp_tbl
 DROP TABLE a_temp_tbl;
-NOTICE:  NORMAL: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl name={pg_temp,a_temp_tbl} args={}
+NOTICE:  DROP: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp,a_temp_tbl} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=type identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp.a_temp_tbl} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=type identity=pg_temp.a_temp_tbl[] schema=pg_temp name=_a_temp_tbl addr={pg_temp.a_temp_tbl[]} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=default value identity=for pg_temp.a_temp_tbl.f2 schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,f2} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=table constraint identity=a_temp_tbl_f1_not_null on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_tbl_f1_not_null} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=table constraint identity=a_temp_tbl_pkey on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_tbl_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=index identity=pg_temp.a_temp_tbl_pkey schema=pg_temp name=a_temp_tbl_pkey addr={pg_temp,a_temp_tbl_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=trigger identity=a_temp_trig on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_trig} args={}
+NOTICE:  DROP: orig=f normal=t istemp=t type=policy identity=a_temp_pol on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_pol} args={}
+DROP FUNCTION event_trigger_dummy_trigger();
+NOTICE:  DROP: orig=t normal=f istemp=f type=function identity=public.event_trigger_dummy_trigger() schema=public name=<NULL> addr={public,event_trigger_dummy_trigger} args={}
 -- CREATE OPERATOR CLASS without FAMILY clause should report
 -- both CREATE OPERATOR FAMILY and CREATE OPERATOR CLASS
 CREATE OPERATOR CLASS evttrigopclass FOR TYPE int USING btree AS STORAGE int;
diff --git a/src/oracle_test/regress/expected/expressions.out b/src/oracle_test/regress/expected/expressions.out
index bcec2677403..dfcc5ca371d 100644
--- a/src/oracle_test/regress/expected/expressions.out
+++ b/src/oracle_test/regress/expected/expressions.out
@@ -62,7 +62,7 @@ WARNING:  TIME(7) WITH TIME ZONE precision reduced to maximum allowed, 6
 (1 row)
 
 SELECT current_timestamp = current_timestamp(7);
-WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6,the part of excess is 0
+WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6, the part of excess is 0
  ?column? 
 ----------
  t
@@ -76,7 +76,7 @@ WARNING:  TIME(7) precision reduced to maximum allowed, 6
 (1 row)
 
 SELECT localtimestamp = localtimestamp(7);
-WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6,the part of excess is 0
+WARNING:  TIMESTAMP(7) effective number of fractional seconds is 6, the part of excess is 0
  ?column? 
 ----------
  t
@@ -389,42 +389,179 @@ default for type myint using hash as
   operator    1   =  (myint, myint),
   function    1   myinthash(myint);
 create table inttest (a myint);
-insert into inttest values(1::myint),(null);
--- try an array with enough elements to cause hashing
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
- 1
- 
-(2 rows)
+insert into inttest values (null), (0::myint), (1::myint);
+-- Test EEOP_HASHED_SCALARARRAYOP against EEOP_SCALARARRAYOP.  Ensure the
+-- result of non-hashed vs hashed is the same.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | f          | f
+ 1 | t          | t
+(3 rows)
 
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
-(0 rows)
-
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
-(0 rows)
-
--- ensure the result matched with the non-hashed version.  We simply remove
--- some array elements so that we don't reach the hashing threshold.
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
- 1
- 
-(2 rows)
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | t          | t
+ 0 |            | 
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | t          | t
+ 1 | f          | f
+(3 rows)
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | f          | f
+ 0 |            | 
+ 1 | f          | f
+(3 rows)
 
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
-(0 rows)
+-- Now make the equal function return false when given two NULLs
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return $1::int = $2::int;
+  end if;
+end;
+$$ language plpgsql immutable;
+/
+-- And try the same again to ensure EEOP_HASHED_SCALARARRAYOP does the same
+-- thing as EEOP_SCALARARRAYOP.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | f          | f
+ 1 | t          | t
+(3 rows)
 
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
-(0 rows)
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 |            | 
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | t          | t
+ 1 | f          | f
+(3 rows)
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 |            | 
+ 1 | f          | f
+(3 rows)
+
+-- Try again with an equality function that treats NULLs as equal to 0.
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return coalesce($1::int,0) = coalesce($2::int, 0);
+  end if;
+end;
+$$ language plpgsql immutable;
+/
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+ a | not_hashed | hashed | not_hashed_zero | hashed_zero 
+---+------------+--------+-----------------+-------------
+   | f          | f      | t               | t
+ 0 | f          | f      | t               | t
+ 1 | t          | t      | t               | t
+(3 rows)
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | f          | f
+ 0 | t          | t
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+ a | not_hashed | hashed | not_hashed_zero | hashed_zero 
+---+------------+--------+-----------------+-------------
+   | t          | t      | f               | f
+ 0 | t          | t      | f               | f
+ 1 | f          | f      | f               | f
+(3 rows)
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | t          | t
+ 0 | f          | f
+ 1 | f          | f
+(3 rows)
 
 rollback;
diff --git a/src/oracle_test/regress/expected/foreign_data.out b/src/oracle_test/regress/expected/foreign_data.out
index eabd069b2af..d54bb7c0c4f 100644
--- a/src/oracle_test/regress/expected/foreign_data.out
+++ b/src/oracle_test/regress/expected/foreign_data.out
@@ -109,6 +109,13 @@ ERROR:  conflicting or redundant options
 LINE 1: ...GN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER in...
                                                              ^
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+-- should preserve dependency on test_fdw_handler
+ALTER FOREIGN DATA WRAPPER test_fdw VALIDATOR postgresql_fdw_validator;
+WARNING:  changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid
+DROP FUNCTION test_fdw_handler(); -- ERROR
+ERROR:  cannot drop function test_fdw_handler() because other objects depend on it
+DETAIL:  foreign-data wrapper test_fdw depends on function test_fdw_handler()
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 DROP FOREIGN DATA WRAPPER test_fdw;
 -- ALTER FOREIGN DATA WRAPPER
 ALTER FOREIGN DATA WRAPPER foo OPTIONS (nonexistent 'fdw');         -- ERROR
@@ -831,10 +838,13 @@ COMMENT ON COLUMN ft1.c1 IS NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c5 integer DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE ft1 ADD COLUMN IF NOT EXISTS c6 integer;
+NOTICE:  column "c6" of relation "ft1" already exists, skipping
 ALTER FOREIGN TABLE ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE ft1 ADD c11 integer;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
@@ -866,6 +876,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET STORAGE PLAIN;
  c8     | text            |           |          |         | (p2 'V2')                      | plain    |              | 
  c9     | pg_catalog.int4 |           |          |         |                                | plain    |              | 
  c10    | pg_catalog.int4 |           |          |         | (p1 'v1')                      | plain    |              | 
+ c11    | pg_catalog.int4 |           |          |         |                                | plain    |              | 
 Check constraints:
     "ft1_c2_check" CHECK (c2 <> ''::text)
     "ft1_c3_check" CHECK (c3 >= '1994-01-01'::date AND c3 <= '1994-01-31'::date)
@@ -900,6 +911,7 @@ ERROR:  column "no_column" of relation "ft1" does not exist
 ALTER FOREIGN TABLE ft1 DROP COLUMN IF EXISTS no_column;
 NOTICE:  column "no_column" of relation "ft1" does not exist, skipping
 ALTER FOREIGN TABLE ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE ft1 DROP c11;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
@@ -934,6 +946,8 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c4 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c6 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN IF NOT EXISTS c6 integer;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c7 integer NOT NULL;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c8 integer;
@@ -942,6 +956,8 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c9 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD c11 integer;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c6 SET NOT NULL;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c7 DROP NOT NULL;
@@ -963,10 +979,14 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OWNER TO regress_test_role;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN no_column;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN IF EXISTS no_column;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN c9;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP c11;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 SET SCHEMA foreign_schema;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME c1 TO foreign_column_1;
diff --git a/src/oracle_test/regress/expected/foreign_key.out b/src/oracle_test/regress/expected/foreign_key.out
index fe0746f9d03..5bc6eda33d0 100644
--- a/src/oracle_test/regress/expected/foreign_key.out
+++ b/src/oracle_test/regress/expected/foreign_key.out
@@ -1157,6 +1157,59 @@ INSERT INTO fktable VALUES (500, 1000);
 ERROR:  insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey"
 DETAIL:  Key (fk)=(1000) is not present in table "pktable".
 COMMIT;
+-- Check that the existing FK trigger is both deferrable and initially deferred
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+     conname     |  tgrel  |          tgname          | tgtype | tgdeferrable | tginitdeferred 
+-----------------+---------+--------------------------+--------+--------------+----------------
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |      9 | t            | t
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |     17 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |      5 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |     17 | t            | t
+(4 rows)
+
+-- Changing the constraint to NOT ENFORCED drops the associated FK triggers
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey NOT ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+ conname | tgrel | tgname | tgtype | tgdeferrable | tginitdeferred 
+---------+-------+--------+--------+--------------+----------------
+(0 rows)
+
+-- Changing it back to ENFORCED will recreate the necessary FK triggers
+-- that are deferrable and initially deferred
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+     conname     |  tgrel  |          tgname          | tgtype | tgdeferrable | tginitdeferred 
+-----------------+---------+--------------------------+--------+--------------+----------------
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |      9 | t            | t
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |     17 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |      5 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |     17 | t            | t
+(4 rows)
+
+-- Verify that a deferrable, initially deferred foreign key still works
+-- as expected after being set to NOT ENFORCED and then re-enabled
+BEGIN;
+-- doesn't match PK, but no error yet
+INSERT INTO fktable VALUES (2, 20);
+-- should catch error from INSERT at commit
+COMMIT;
+ERROR:  insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey"
+DETAIL:  Key (fk)=(20) is not present in table "pktable".
 DROP TABLE fktable, pktable;
 -- tricky behavior: according to SQL99, if a deferred constraint is set
 -- to 'immediate' mode, it should be checked for validity *immediately*,
@@ -1357,7 +1410,7 @@ LINE 1: ...e ALTER CONSTRAINT fktable_fk_fkey NOT DEFERRABLE INITIALLY ...
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NO INHERIT;
 ERROR:  constraint "fktable_fk_fkey" of relation "fktable" is not a not-null constraint
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NOT VALID;
-ERROR:  FOREIGN KEY constraints cannot be marked NOT VALID
+ERROR:  constraints cannot be altered to be NOT VALID
 LINE 1: ...ER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NOT VALID;
                                                              ^
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey ENFORCED NOT ENFORCED;
@@ -1748,7 +1801,7 @@ Indexes:
 Referenced by:
     TABLE "fk_partitioned_fk" CONSTRAINT "fk_partitioned_fk_a_b_fkey" FOREIGN KEY (a, b) REFERENCES fk_notpartitioned_pk(a, b)
 
--- Check the exsting FK trigger
+-- Check the existing FK trigger
 SELECT conname, tgrelid::regclass as tgrel, regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype
 FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
 WHERE tgrelid IN (SELECT relid FROM pg_partition_tree('fk_partitioned_fk'::regclass)
@@ -3405,3 +3458,54 @@ SET client_min_messages TO warning;
 DROP SCHEMA fkpart12 CASCADE;
 RESET client_min_messages;
 RESET search_path;
+-- Exercise the column mapping code with foreign keys.  In this test we'll
+-- create a partitioned table which has a partition with a dropped column and
+-- check to ensure that an UPDATE cascades the changes correctly to the
+-- partitioned table.
+CREATE SCHEMA fkpart13;
+SET search_path TO fkpart13;
+CREATE TABLE fkpart13_t1 (a int PRIMARY KEY);
+CREATE TABLE fkpart13_t2 (
+  part_id int PRIMARY KEY,
+  column_to_drop int,
+  FOREIGN KEY (part_id) REFERENCES fkpart13_t1 ON UPDATE CASCADE ON DELETE CASCADE
+) PARTITION BY LIST (part_id);
+CREATE TABLE fkpart13_t2_p1 PARTITION OF fkpart13_t2 FOR VALUES IN (1);
+-- drop the column
+ALTER TABLE fkpart13_t2 DROP COLUMN column_to_drop;
+-- create a new partition without the dropped column
+CREATE TABLE fkpart13_t2_p2 PARTITION OF fkpart13_t2 FOR VALUES IN (2);
+CREATE TABLE fkpart13_t3 (
+  a int NOT NULL,
+  FOREIGN KEY (a)
+    REFERENCES fkpart13_t2
+    ON UPDATE CASCADE ON DELETE CASCADE
+);
+INSERT INTO fkpart13_t1 (a) VALUES (1);
+INSERT INTO fkpart13_t2 (part_id) VALUES (1);
+INSERT INTO fkpart13_t3 (a) VALUES (1);
+-- Test a cascading update works correctly with with the dropped column
+UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+SELECT tableoid::regclass,* FROM fkpart13_t2;
+    tableoid    | part_id 
+----------------+---------
+ fkpart13_t2_p2 |       2
+(1 row)
+
+SELECT tableoid::regclass,* FROM fkpart13_t3;
+  tableoid   | a 
+-------------+---
+ fkpart13_t3 | 2
+(1 row)
+
+-- Exercise code in ExecGetTriggerResultRel() as there's been previous issues
+-- with ResultRelInfos being returned with the incorrect ri_RootResultRelInfo
+WITH cte AS (
+  UPDATE fkpart13_t2_p1 SET part_id = part_id
+) UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+DROP SCHEMA fkpart13 CASCADE;
+NOTICE:  drop cascades to 3 other objects
+DETAIL:  drop cascades to table fkpart13_t1
+drop cascades to table fkpart13_t2
+drop cascades to table fkpart13_t3
+RESET search_path;
diff --git a/src/oracle_test/regress/expected/functional_deps.out b/src/oracle_test/regress/expected/functional_deps.out
index e1ea8034756..ab254587953 100644
--- a/src/oracle_test/regress/expected/functional_deps.out
+++ b/src/oracle_test/regress/expected/functional_deps.out
@@ -1,4 +1,5 @@
 -- from http://www.depesz.com/index.php/2010/04/19/getting-unique-elements/
+\set EXECUTE_RUN_PREPARE on
 CREATE TEMP TABLE articles (
     id int CONSTRAINT articles_pkey PRIMARY KEY,
     keywords text,
diff --git a/src/oracle_test/regress/expected/functional_deps_1.out b/src/oracle_test/regress/expected/functional_deps_1.out
index 9858ae4c9cb..62871e9771b 100644
--- a/src/oracle_test/regress/expected/functional_deps_1.out
+++ b/src/oracle_test/regress/expected/functional_deps_1.out
@@ -1,4 +1,5 @@
 -- from http://www.depesz.com/index.php/2010/04/19/getting-unique-elements/
+\set EXECUTE_RUN_PREPARE on
 CREATE TEMP TABLE articles (
     id int CONSTRAINT articles_pkey PRIMARY KEY,
     keywords text,
diff --git a/src/oracle_test/regress/expected/generated_stored.out b/src/oracle_test/regress/expected/generated_stored.out
index aaefdc37fd0..0db45e0b4cd 100644
--- a/src/oracle_test/regress/expected/generated_stored.out
+++ b/src/oracle_test/regress/expected/generated_stored.out
@@ -481,6 +481,12 @@ COPY gtest1 FROM stdin;
 COPY gtest1 (a, b) FROM stdin;
 ERROR:  column "b" is a generated column
 DETAIL:  Generated columns cannot be used in COPY.
+COPY gtest1 FROM stdin WHERE b <> 10;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
 SELECT * FROM gtest1 ORDER BY a;
  a | b 
 ---+---
@@ -1054,11 +1060,26 @@ ERROR:  cannot use generated column in partition key
 LINE 1: ...ENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE (f3);
                                                                    ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
+                                                                 ^
+DETAIL:  Column "f3" is a generated column.
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
 ERROR:  cannot use generated column in partition key
 LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
                                                              ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key is not null));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
 INSERT INTO gtest25 VALUES (3), (4);
@@ -1293,6 +1314,18 @@ CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c te
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
 ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+-- bug #18970: these cases are unsupported, but make sure they fail cleanly
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+DROP STATISTICS gtest31_2_stat;
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
 DROP TABLE gtest31_1, gtest31_2;
 -- Check it for a partitioned table, too
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c text) PARTITION BY LIST (a);
@@ -1477,6 +1510,40 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
  c      | pg_catalog.int4 |           |          | 
  x      | pg_catalog.int4 |           |          | generated always as (b * 2) stored
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) STORED);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+ op  | old_b | new_b 
+-----+-------+-------
+ INS |       |     2
+ UPD |     2 |    20
+ UPD |    20 |    40
+(3 rows)
+
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+ a  | b  
+----+----
+ 20 | 40
+(1 row)
+
+DROP TABLE gtest_rule;
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
  attrelid | attname | attgenerated 
diff --git a/src/oracle_test/regress/expected/generated_virtual.out b/src/oracle_test/regress/expected/generated_virtual.out
index 5fd040c915c..e8277289cb1 100644
--- a/src/oracle_test/regress/expected/generated_virtual.out
+++ b/src/oracle_test/regress/expected/generated_virtual.out
@@ -486,6 +486,12 @@ COPY gtest1 FROM stdin;
 COPY gtest1 (a, b) FROM stdin;
 ERROR:  column "b" is a generated column
 DETAIL:  Generated columns cannot be used in COPY.
+COPY gtest1 FROM stdin WHERE b <> 10;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
 SELECT * FROM gtest1 ORDER BY a;
  a | b 
 ---+---
@@ -1027,11 +1033,26 @@ ERROR:  cannot use generated column in partition key
 LINE 1: ...NERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE (f3);
                                                                    ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...RATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
+                                                                 ^
+DETAIL:  Column "f3" is a generated column.
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
 ERROR:  cannot use generated column in partition key
 LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
                                                              ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key is not null));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
 INSERT INTO gtest25 VALUES (3), (4);
@@ -1274,6 +1295,15 @@ CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c t
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
 ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+-- bug #18970
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
 DROP TABLE gtest31_1, gtest31_2;
 -- Check it for a partitioned table, too
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c text) PARTITION BY LIST (a);
@@ -1458,6 +1488,40 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
  c      | pg_catalog.int4 |           |          | 
  x      | pg_catalog.int4 |           |          | generated always as (b * 2)
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) VIRTUAL);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+ op  | old_b | new_b 
+-----+-------+-------
+ INS |       |     2
+ UPD |     2 |    20
+ UPD |    20 |    40
+(3 rows)
+
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+ a  | b  
+----+----
+ 20 | 40
+(1 row)
+
+DROP TABLE gtest_rule;
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
  attrelid | attname | attgenerated 
@@ -1599,3 +1663,104 @@ select * from gtest32 t group by grouping sets (a, b, c, d, e) having c = 20;
 -- Ensure that the virtual generated columns in ALTER COLUMN TYPE USING expression are expanded
 alter table gtest32 alter column e type bigint using b;
 drop table gtest32;
+-- Ensure that virtual generated columns in constraint expressions are expanded
+create table gtest33 (a int, b int generated always as (a * 2) virtual not null, check (b > 10));
+set constraint_exclusion to on;
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b < 10;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b is null;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+reset constraint_exclusion;
+drop table gtest33;
+-- Ensure that EXCLUDED.<virtual-generated-column> in INSERT ... ON CONFLICT
+-- DO UPDATE is expanded to the generation expression, both for plain and
+-- partitioned target relations.
+create table gtest34 (id int primary key, a int,
+                      c int generated always as (a * 10) virtual);
+insert into gtest34 values (1, 5);
+insert into gtest34 values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+ id | a  |  c  
+----+----+-----
+  1 | 70 | 700
+(1 row)
+
+insert into gtest34 values (1, 2)
+    on conflict (id) do update set a = gtest34.c + excluded.c returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 720 | 7200
+(1 row)
+
+insert into gtest34 values (1, 3)
+    on conflict (id) do update set a = 999 where excluded.c > 20 returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 999 | 9990
+(1 row)
+
+drop table gtest34;
+create table gtest34p (id int primary key, a int,
+                       c int generated always as (a * 10) virtual)
+    partition by range (id);
+create table gtest34p_1 partition of gtest34p for values from (1) to (100);
+insert into gtest34p values (1, 5);
+insert into gtest34p values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+ id | a  |  c  
+----+----+-----
+  1 | 70 | 700
+(1 row)
+
+insert into gtest34p values (1, 2)
+    on conflict (id) do update set a = gtest34p.c + excluded.c returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 720 | 7200
+(1 row)
+
+drop table gtest34p;
+-- Ensure that virtual generated columns work with WHERE CURRENT OF
+create table gtest_cursor (id int primary key, a int, b int generated always as (a * 2) virtual);
+insert into gtest_cursor values (1, 10), (2, 20), (3, 30);
+begin;
+declare curs cursor for select * from gtest_cursor order by id for update;
+fetch 1 from curs;
+ id | a  | b  
+----+----+----
+  1 | 10 | 20
+(1 row)
+
+update gtest_cursor set a = 99 where current of curs;
+select * from gtest_cursor order by id;
+ id | a  |  b  
+----+----+-----
+  1 | 99 | 198
+  2 | 20 |  40
+  3 | 30 |  60
+(3 rows)
+
+delete from gtest_cursor where current of curs;
+select * from gtest_cursor order by id;
+ id | a  | b  
+----+----+----
+  2 | 20 | 40
+  3 | 30 | 60
+(2 rows)
+
+commit;
+drop table gtest_cursor;
diff --git a/src/oracle_test/regress/expected/groupingsets.out b/src/oracle_test/regress/expected/groupingsets.out
index 21f7a0a82fd..2ddf083f2fb 100644
--- a/src/oracle_test/regress/expected/groupingsets.out
+++ b/src/oracle_test/regress/expected/groupingsets.out
@@ -460,6 +460,101 @@ select x, y || 'y'
    | 3y
 (8 rows)
 
+-- check that operands wrapped in PlaceHolderVars are capable of index matching
+begin;
+set local enable_bitmapscan = off;
+explain (costs off)
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Sort
+   Sort Key: tenk1.unique1, tenk1.unique2
+   ->  GroupAggregate
+         Group Key: tenk1.unique1
+         Sort Key: tenk1.unique2
+           Group Key: tenk1.unique2
+         ->  Index Scan using tenk1_unique1 on tenk1
+               Index Cond: (unique1 = 1)
+(8 rows)
+
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+explain (costs off)
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Sort
+   Sort Key: ((tenk1.unique1)::oid), tenk1.unique2
+   ->  GroupAggregate
+         Group Key: ((tenk1.unique1)::oid)
+         Sort Key: tenk1.unique2
+           Group Key: tenk1.unique2
+         ->  Sort
+               Sort Key: ((tenk1.unique1)::oid)
+               ->  Index Scan using tenk1_unique1 on tenk1
+                     Index Cond: (((unique1)::oid)::pg_catalog.int4 = 1)
+(10 rows)
+
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+explain (costs off)
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Sort
+   Sort Key: t1.unique1, t1.unique2
+   ->  GroupAggregate
+         Group Key: t1.unique1
+         Sort Key: t1.unique2
+           Group Key: t1.unique2
+         ->  Nested Loop
+               ->  Index Scan using tenk1_unique1 on tenk1 t1
+                     Index Cond: (unique1 = 1)
+               ->  Index Only Scan using tenk1_hundred on tenk1 t2
+(10 rows)
+
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+rollback;
 -- check qual push-down rules for a subquery with grouping sets
 explain (verbose, costs off)
 select * from (
@@ -886,7 +981,8 @@ explain (costs off)
                        ->  Seq Scan on gstest2
 (10 rows)
 
--- test pushdown of HAVING clause that does not reference any columns that are nullable by grouping sets
+-- test pushdown of non-degenerate HAVING clause that does not reference any
+-- columns that are nullable by grouping sets
 explain (costs off)
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
            QUERY PLAN            
@@ -907,6 +1003,82 @@ select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a
  2 | 2 |     1
 (1 row)
 
+explain (costs off)
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+           QUERY PLAN            
+---------------------------------
+ GroupAggregate
+   Group Key: b, a
+   Group Key: b
+   ->  Sort
+         Sort Key: b, a
+         ->  Seq Scan on gstest2
+               Filter: (b > 1)
+(7 rows)
+
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+ a | b | count 
+---+---+-------
+ 1 | 2 |     1
+ 2 | 2 |     1
+   | 2 |     2
+(3 rows)
+
+-- test pushdown of degenerate HAVING clause
+explain (costs off)
+select count(*) from gstest2 group by grouping sets (()) having false;
+           QUERY PLAN           
+--------------------------------
+ Aggregate
+   Group Key: ()
+   Filter: false
+   ->  Result
+         One-Time Filter: false
+(5 rows)
+
+select count(*) from gstest2 group by grouping sets (()) having false;
+ count 
+-------
+(0 rows)
+
+explain (costs off)
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+              QUERY PLAN              
+--------------------------------------
+ GroupAggregate
+   Group Key: a
+   Group Key: ()
+   Filter: false
+   ->  Sort
+         Sort Key: a
+         ->  Result
+               One-Time Filter: false
+(8 rows)
+
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+ a | count 
+---+-------
+(0 rows)
+
+explain (costs off)
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+              QUERY PLAN              
+--------------------------------------
+ GroupAggregate
+   Group Key: a
+   Sort Key: b
+     Group Key: b
+   ->  Sort
+         Sort Key: a
+         ->  Result
+               One-Time Filter: false
+(8 rows)
+
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+ a | b | count 
+---+---+-------
+(0 rows)
+
 -- HAVING with GROUPING queries
 select ten, grouping(ten) from onek
 group by grouping sets(ten) having grouping(ten) >= 0
@@ -2468,6 +2640,73 @@ group by grouping sets((a, b), (a));
  2 | 2 |          4
 (4 rows)
 
+-- test handling of SRFs with grouping sets
+explain (verbose, costs off)
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Sort
+   Output: (generate_series(1, "*VALUES*".column1))
+   Sort Key: (generate_series(1, "*VALUES*".column1))
+   ->  MixedAggregate
+         Output: (generate_series(1, "*VALUES*".column1))
+         Hash Key: generate_series(1, "*VALUES*".column1)
+         Group Key: ()
+         ->  ProjectSet
+               Output: generate_series(1, "*VALUES*".column1)
+               ->  Values Scan on "*VALUES*"
+                     Output: "*VALUES*".column1
+(11 rows)
+
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+ g 
+---
+ 1
+ 2
+  
+(3 rows)
+
+explain (verbose, costs off)
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Sort
+   Output: (generate_series(1, "*VALUES*".column1)), (("*VALUES*".column1 + "*VALUES*".column2)), "*VALUES*".column1
+   Sort Key: (generate_series(1, "*VALUES*".column1)), (("*VALUES*".column1 + "*VALUES*".column2))
+   ->  ProjectSet
+         Output: generate_series(1, "*VALUES*".column1), (("*VALUES*".column1 + "*VALUES*".column2)), "*VALUES*".column1
+         ->  MixedAggregate
+               Output: "*VALUES*".column1, (("*VALUES*".column1 + "*VALUES*".column2))
+               Hash Key: "*VALUES*".column1, ("*VALUES*".column1 + "*VALUES*".column2)
+               Hash Key: "*VALUES*".column1
+               Group Key: ()
+               ->  Values Scan on "*VALUES*"
+                     Output: ("*VALUES*".column1 + "*VALUES*".column2), "*VALUES*".column1
+(12 rows)
+
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+ g | ab 
+---+----
+ 1 |  2
+ 1 |  4
+ 1 |   
+ 1 |   
+ 2 |  4
+ 2 |   
+(6 rows)
+
 -- end
 reset ivorysql.enable_emptystring_to_null;
 show ivorysql.compatible_mode;
diff --git a/src/oracle_test/regress/expected/hash_index.out b/src/oracle_test/regress/expected/hash_index.out
index 0d4bdb2adef..04035400f12 100644
--- a/src/oracle_test/regress/expected/hash_index.out
+++ b/src/oracle_test/regress/expected/hash_index.out
@@ -40,6 +40,8 @@ CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
 CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops)
   WITH (fillfactor=60);
+CREATE INDEX hash_i4_partial_index ON hash_i4_heap USING hash (seqno)
+  WHERE seqno = 9999;
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.
@@ -131,6 +133,25 @@ SELECT * FROM hash_f8_heap
 -------+--------
 (0 rows)
 
+--
+-- partial hash index
+--
+EXPLAIN (COSTS OFF)
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Index Scan using hash_i4_partial_index on hash_i4_heap
+   Index Cond: (seqno = 9999)
+(2 rows)
+
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+ seqno |   random   
+-------+------------
+  9999 | 1227676208
+(1 row)
+
 --
 -- hash index
 -- grep '^90[^0-9]' hashovfl.data
diff --git a/src/oracle_test/regress/expected/horology.out b/src/oracle_test/regress/expected/horology.out
index 8dfb4ab5f6a..c40a94fcb2d 100644
--- a/src/oracle_test/regress/expected/horology.out
+++ b/src/oracle_test/regress/expected/horology.out
@@ -1706,7 +1706,7 @@ ERROR:  date/time field value out of range: "2016 367"
 SELECT to_date('0000-02-01','YYYY-MM-DD');  -- allowed, though it shouldn't be
   to_date   
 ------------
- 2025-02-01
+ 2026-02-01
 (1 row)
 
 -- to_char's TZ format code produces zone abbrev if known
diff --git a/src/oracle_test/regress/expected/indexing.out b/src/oracle_test/regress/expected/indexing.out
index c74e937a02f..5b4069ef6bd 100644
--- a/src/oracle_test/regress/expected/indexing.out
+++ b/src/oracle_test/regress/expected/indexing.out
@@ -540,6 +540,111 @@ select relname, indisvalid from pg_class join pg_index on indexrelid = oid
  idxpart_a_idx   | t
 (3 rows)
 
+drop table idxpart;
+-- Verify that re-attaching an already-attached partition index can
+-- validate the parent index if it was still invalid, including
+-- indirect ancestors in subpartitions.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (0) to (500);
+-- Partitioned table with no partitions
+create table idxpart2 partition of idxpart for values from (1000) to (2000) partition by range (a);
+-- create parent indexes
+create index on only idxpart ((a/b));
+create index on only idxpart1 ((a/b));
+create index on only idxpart2 ((a/b));
+-- fail, leaves behind an invalid index on the leaf partition
+insert into idxpart11 values (1, 0);
+create index concurrently on idxpart11 ((a/b));
+ERROR:  division by zero
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | f
+ idxpart1_expr_idx  | f
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | f
+(4 rows)
+
+-- attach the indexes; parents stay invalid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | f
+ idxpart1_expr_idx  | f
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | f
+(4 rows)
+
+-- fix the index on the leaf partition
+delete from idxpart11 where b = 0;
+reindex index concurrently idxpart11_expr_idx;
+-- reattach the leaf partition index; parents should now be valid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | t
+ idxpart1_expr_idx  | t
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | t
+(4 rows)
+
+drop table idxpart;
+-- Verify that re-attaching does not validate the parent when another
+-- child index is still invalid.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (500);
+create table idxpart2 partition of idxpart for values from (500) to (1000);
+create index on only idxpart ((a/b));
+-- create invalid indexes on both children
+insert into idxpart1 values (1, 0);
+insert into idxpart2 values (501, 0);
+create index concurrently on idxpart1 ((a/b));
+ERROR:  division by zero
+create index concurrently on idxpart2 ((a/b));
+ERROR:  division by zero
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | f
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
+-- attach both; parent stays invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | f
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
+-- fix only idxpart1's index, leave idxpart2's still invalid
+delete from idxpart1 where b = 0;
+reindex index concurrently idxpart1_expr_idx;
+-- re-attach the fixed child; parent should stay invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | t
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
 drop table idxpart;
 -- verify dependency handling during ALTER TABLE DETACH PARTITION
 create table idxpart (a int) partition by range (a);
diff --git a/src/oracle_test/regress/expected/interval_1.out b/src/oracle_test/regress/expected/interval_1.out
index 917b95cd27a..826f6d03b41 100755
--- a/src/oracle_test/regress/expected/interval_1.out
+++ b/src/oracle_test/regress/expected/interval_1.out
@@ -1516,9 +1516,9 @@ LINE 6:     FROM INTERVAL_TBL;
                  ^
 -- internal overflow test case
 SELECT extract(epoch from interval '1000000000 days');
-ERROR:  syntax error at or near "from"
+ERROR:  syntax error at or near ")"
 LINE 1: SELECT extract(epoch from interval '1000000000 days');
-                             ^
+                                                            ^
 --
 -- test infinite intervals
 --
diff --git a/src/oracle_test/regress/expected/invisible.out b/src/oracle_test/regress/expected/invisible.out
index 3da26aabea8..99b73f90bc3 100644
--- a/src/oracle_test/regress/expected/invisible.out
+++ b/src/oracle_test/regress/expected/invisible.out
@@ -1,4 +1,5 @@
 -- sanity check of system catalog
+\set EXECUTE_RUN_PREPARE on
 SELECT attrelid, attname, attisinvisible FROM pg_attribute WHERE attisinvisible;
  attrelid | attname | attisinvisible 
 ----------+---------+----------------
diff --git a/src/oracle_test/regress/expected/join.out b/src/oracle_test/regress/expected/join.out
index 01c7c5d95c4..ddc381779e9 100644
--- a/src/oracle_test/regress/expected/join.out
+++ b/src/oracle_test/regress/expected/join.out
@@ -2,6 +2,7 @@
 -- JOIN
 -- Test JOIN clauses
 --
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE J1_TBL (
   i integer,
@@ -3074,6 +3075,33 @@ select * from tbl_rs t1 join
  3 | 3 | 4 | 4
 (6 rows)
 
+--
+-- regression test for bug with parallel-hash-right-semi join
+--
+begin;
+-- encourage use of parallel plans
+set local parallel_setup_cost=0;
+set local parallel_tuple_cost=0;
+set local min_parallel_table_scan_size=0;
+set local max_parallel_workers_per_gather=4;
+-- ensure we don't get parallel hash right semi join
+explain (costs off)
+select * from tenk1 t1
+where exists (select 1 from tenk1 t2 where fivethous = t1.fivethous)
+and t1.fivethous < 5;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Gather
+   Workers Planned: 4
+   ->  Parallel Hash Semi Join
+         Hash Cond: (t1.fivethous = t2.fivethous)
+         ->  Parallel Seq Scan on tenk1 t1
+               Filter: (fivethous < 5)
+         ->  Parallel Hash
+               ->  Parallel Seq Scan on tenk1 t2
+(8 rows)
+
+rollback;
 --
 -- regression test for bug #13908 (hash join with skew tuples & nbatch increase)
 --
@@ -3221,6 +3249,24 @@ where b.unique2 is null;
          ->  Index Only Scan using tenk1_unique2 on tenk1 b
 (5 rows)
 
+-- check that we avoid de-duplicating columns redundantly
+set enable_memoize to off;
+explain (costs off)
+select 1 from tenk1
+where (hundred, thousand) in (select twothousand, twothousand from onek);
+                   QUERY PLAN                    
+-------------------------------------------------
+ Hash Join
+   Hash Cond: (tenk1.hundred = onek.twothousand)
+   ->  Seq Scan on tenk1
+         Filter: (hundred = thousand)
+   ->  Hash
+         ->  HashAggregate
+               Group Key: onek.twothousand
+               ->  Seq Scan on onek
+(8 rows)
+
+reset enable_memoize;
 --
 -- regression test for bogus RTE_GROUP entries
 --
@@ -4369,6 +4415,57 @@ where ss.x is null;
                      Output: 'bar'::text
 (12 rows)
 
+-- Test computation of varnullingrels when translating appendrel Var
+begin;
+create temp table t_append (a int not null, b int);
+insert into t_append values (1, 1);
+insert into t_append values (2, 3);
+explain (verbose, costs off)
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Nested Loop
+   Output: t1.a, (t1.a)
+   ->  Merge Left Join
+         Output: t1.a, t2.a
+         Merge Cond: (t1.a = t2.b)
+         ->  Sort
+               Output: t1.a
+               Sort Key: t1.a
+               ->  Seq Scan on pg_temp.t_append t1
+                     Output: t1.a
+         ->  Sort
+               Output: t2.a, t2.b
+               Sort Key: t2.b
+               ->  Seq Scan on pg_temp.t_append t2
+                     Output: t2.a, t2.b
+   ->  Append
+         ->  Result
+               Output: t1.a
+         ->  Result
+               Output: t2.a
+               One-Time Filter: (t2.a IS NOT NULL)
+(21 rows)
+
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+ a | a 
+---+---
+ 1 | 1
+ 1 | 1
+ 2 | 2
+(3 rows)
+
+rollback;
 --
 -- test inlining of immutable functions
 --
@@ -6033,6 +6130,45 @@ from int8_tbl t1
          ->  Seq Scan on onek t4
 (13 rows)
 
+-- bug #19460: we need to clean up RestrictInfos more than we had been doing
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select null::int as id) as dummy_source
+   left join (select a.id from a where a.id = 42) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Full Join
+   Hash Cond: ((1) = (NULL::pg_catalog.int4))
+   ->  Result
+   ->  Hash
+         ->  Result
+(5 rows)
+
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select 2::int as id) as dummy_source
+   left join (select a.id from a) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+        QUERY PLAN        
+--------------------------
+ Hash Full Join
+   Hash Cond: ((1) = (2))
+   ->  Result
+   ->  Hash
+         ->  Result
+(5 rows)
+
 -- More tests of correct placement of pseudoconstant quals
 -- simple constant-false condition
 explain (costs off)
@@ -6504,6 +6640,128 @@ where t1.a = s.c;
 ----------
 (0 rows)
 
+rollback;
+-- check handling of semijoins after join removal: we must suppress
+-- unique-ification of known-constant values
+begin;
+create temp table t (a int unique, b int);
+insert into t values (1, 2);
+explain (verbose, costs off)
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Nested Loop
+   Output: t1.a
+   Inner Unique: true
+   ->  Nested Loop
+         Output: t1.a, t5.a
+         ->  Index Only Scan using t_a_key on pg_temp.t t1
+               Output: t1.a
+               Index Cond: (t1.a = 1)
+         ->  HashAggregate
+               Output: t5.a
+               Group Key: t5.a
+               ->  Hash Join
+                     Output: t5.a
+                     Hash Cond: (t6.b = t4.b)
+                     ->  Seq Scan on pg_temp.t t6
+                           Output: t6.a, t6.b
+                     ->  Hash
+                           Output: t4.b, t5.b, t5.a
+                           ->  Hash Join
+                                 Output: t4.b, t5.b, t5.a
+                                 Inner Unique: true
+                                 Hash Cond: (t5.b = t4.b)
+                                 ->  Seq Scan on pg_temp.t t5
+                                       Output: t5.a, t5.b
+                                 ->  Hash
+                                       Output: t4.b, t4.a
+                                       ->  Index Scan using t_a_key on pg_temp.t t4
+                                             Output: t4.b, t4.a
+                                             Index Cond: (t4.a = 1)
+   ->  Index Only Scan using t_a_key on pg_temp.t t3
+         Output: t3.a
+         Index Cond: (t3.a = t5.a)
+(32 rows)
+
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+ a 
+---
+ 1
+(1 row)
+
+rollback;
+-- check handling of semijoins if all RHS columns are equated to constants: we
+-- should suppress unique-ification in this case.
+begin;
+create temp table t (a int, b int);
+insert into t values (1, 2);
+explain (costs off)
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+                 QUERY PLAN                  
+---------------------------------------------
+ Nested Loop Semi Join
+   ->  Nested Loop
+         ->  Seq Scan on t t1
+               Filter: (a = 1)
+         ->  Materialize
+               ->  Seq Scan on t t2
+                     Filter: (b = 2)
+   ->  Materialize
+         ->  Seq Scan on t t3
+               Filter: ((a = 1) AND (b = 2))
+(10 rows)
+
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+ a | b | a | b 
+---+---+---+---
+ 1 | 2 | 1 | 2
+(1 row)
+
+rollback;
+-- check handling of semijoin unique-ification for child relations if all RHS
+-- columns are equated to constants.
+begin;
+create temp table p (a int, b int) partition by range (a);
+create temp table p1 partition of p for values from (0) to (10);
+create temp table p2 partition of p for values from (10) to (20);
+insert into p values (1, 2);
+insert into p values (10, 20);
+set enable_partitionwise_join to on;
+explain (costs off)
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+          QUERY PLAN           
+-------------------------------
+ Nested Loop Semi Join
+   ->  Seq Scan on p1 t1
+         Filter: (a = 1)
+   ->  Materialize
+         ->  Seq Scan on p1 t2
+               Filter: (a = 1)
+(6 rows)
+
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+ a | b 
+---+---
+ 1 | 2
+(1 row)
+
 rollback;
 -- test cases where we can remove a join, but not a PHV computed at it
 begin;
@@ -6611,10 +6869,10 @@ where ss.a = ss.phv and f1 = 0;
              QUERY PLAN             
 ------------------------------------
  Nested Loop
-   ->  Seq Scan on int4_tbl
-         Filter: (f1 = 0)
    ->  Seq Scan on parttbl1 parttbl
          Filter: (a = 12)
+   ->  Seq Scan on int4_tbl
+         Filter: (f1 = 0)
 (5 rows)
 
 select * from
@@ -7681,6 +7939,22 @@ WHERE q0.a = 1;
    ->  Seq Scan on sj n1
 (7 rows)
 
+-- Do not forget to replace relid in bare Var join clause (bug #19435)
+ALTER TABLE sl ADD COLUMN bool_col boolean;
+EXPLAIN (COSTS OFF)
+SELECT 1 AS c1 FROM sl sl1 LEFT JOIN (sl AS sl2 NATURAL JOIN sl AS sl3)
+  ON sl2.bool_col LEFT JOIN sl AS sl4 ON sl2.bool_col;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Nested Loop Left Join
+   ->  Seq Scan on sl sl1
+   ->  Nested Loop Left Join
+         Join Filter: sl3.bool_col
+         ->  Seq Scan on sl sl3
+               Filter: (bool_col AND (a IS NOT NULL) AND (b IS NOT NULL) AND (c IS NOT NULL) AND (bool_col IS NOT NULL))
+         ->  Seq Scan on sl sl4
+(7 rows)
+
 -- Check optimization disabling if it will violate special join conditions.
 -- Two identical joined relations satisfies self join removal conditions but
 -- stay in different special join infos.
@@ -9593,6 +9867,29 @@ GROUP BY s.c1, s.c2;
 (7 rows)
 
 DROP TABLE group_tbl;
+-- Test that we ignore PlaceHolderVars when looking up statistics
+EXPLAIN (COSTS OFF)
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on tenk1 t2
+         Filter: (unique1 = 42)
+   ->  Index Scan using tenk1_unique2 on tenk1 t1
+         Index Cond: (unique2 = t2.unique2)
+         Filter: (unique1 < 100)
+(6 rows)
+
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+ unique1 
+---------
+      42
+(1 row)
+
 --
 -- Test for a nested loop join involving index scan, transforming OR-clauses
 -- to SAOP.
diff --git a/src/oracle_test/regress/expected/jsonb.out b/src/oracle_test/regress/expected/jsonb.out
index 5da68323bff..e224aa2caa3 100644
--- a/src/oracle_test/regress/expected/jsonb.out
+++ b/src/oracle_test/regress/expected/jsonb.out
@@ -3084,6 +3084,7 @@ SELECT count(*) FROM testjsonb WHERE j @? '$.bar';
      0
 (1 row)
 
+ALTER TABLE testjsonb SET (parallel_workers = 2);
 CREATE INDEX jidx ON testjsonb USING gin (j);
 SET enable_seqscan = off;
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
@@ -3460,7 +3461,7 @@ SELECT count(*) FROM testjsonb WHERE j = '{"pos":98, "line":371, "node":"CBA", "
 
 --gin path opclass
 DROP INDEX jidx;
-CREATE INDEX jidx ON testjsonb USING gin (j jsonb_path_ops);
+CREATE INDEX CONCURRENTLY jidx ON testjsonb USING gin (j jsonb_path_ops);
 SET enable_seqscan = off;
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
  count 
diff --git a/src/oracle_test/regress/expected/jsonb_jsonpath.out b/src/oracle_test/regress/expected/jsonb_jsonpath.out
index 4cc9a64e934..8afbfa51d7c 100644
--- a/src/oracle_test/regress/expected/jsonb_jsonpath.out
+++ b/src/oracle_test/regress/expected/jsonb_jsonpath.out
@@ -2684,12 +2684,15 @@ select jsonb_path_query('"12:34:56 +5:30"', '$.time_tz().string()');
  "12:34:56+05:30"
 (1 row)
 
+begin;
+set local timezone = '-7';
 select jsonb_path_query_tz('"12:34:56"', '$.time_tz().string()');
  jsonb_path_query_tz 
 ---------------------
  "12:34:56-07:00"
 (1 row)
 
+rollback;
 select jsonb_path_query('"12:34:56"', '$.time().string()');
  jsonb_path_query 
 ------------------
diff --git a/src/oracle_test/regress/expected/md5_2.out b/src/oracle_test/regress/expected/md5_2.out
new file mode 100644
index 00000000000..4eea7f2bfc3
--- /dev/null
+++ b/src/oracle_test/regress/expected/md5_2.out
@@ -0,0 +1,35 @@
+--
+-- MD5 test suite - from IETF RFC 1321
+-- (see: https://www.rfc-editor.org/rfc/rfc1321)
+--
+-- (The md5() function will error in OpenSSL FIPS mode.  By keeping
+-- this test in a separate file, it is easier to manage variant
+-- results.)
+select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
diff --git a/src/oracle_test/regress/expected/multirangetypes.out b/src/oracle_test/regress/expected/multirangetypes.out
index 26ecd438c33..f0b7b49abea 100644
--- a/src/oracle_test/regress/expected/multirangetypes.out
+++ b/src/oracle_test/regress/expected/multirangetypes.out
@@ -3146,6 +3146,22 @@ drop type textrange1;
 reset role;
 drop role regress_multirange_owner;
 --
+-- CREATE TYPE checks for CREATE on multirange schema
+--
+create role regress_mr;
+create schema mr_sch;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+ERROR:  permission denied for schema mr_sch
+reset role;
+grant create on schema mr_sch to regress_mr;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+drop type mytype;
+drop schema mr_sch;
+drop role regress_mr;
+--
 -- Test polymorphic type system
 --
 create function anyarray_anymultirange_func(a anyarray, r anymultirange)
@@ -3306,6 +3322,9 @@ select *, row_to_json(upper(t)) as u from
  {["(5,6)","(7,8)")} | {"a":7,"b":8}
 (2 rows)
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_multirange;
+ERROR:  composite type two_ints cannot be made a member of itself
 drop type two_ints cascade;
 NOTICE:  drop cascades to type two_ints_range
 --
diff --git a/src/oracle_test/regress/expected/ora_package.out b/src/oracle_test/regress/expected/ora_package.out
index 7b6ba5972ef..8c5f9bdfbc0 100644
--- a/src/oracle_test/regress/expected/ora_package.out
+++ b/src/oracle_test/regress/expected/ora_package.out
@@ -8,6 +8,7 @@ BEGIN
 END
 $$ language plisql;
 /
+SET ivorysql.allow_out_parameter_const = true;
 --test sys.standard package
 CREATE OR REPLACE package sys.standard IS
 BINARY_FLOAT_NAN constant BINARY_FLOAT;
@@ -275,7 +276,7 @@ declare
  var2 mds%rowtype;
  var3 mds%rowtype;
  name varchar(256);
- function test_package(ids IN  mds%rowtype, ids1 mds%rowtype,name1  varchar) return mds%rowtype is
+ function test_package(ids out mds%rowtype, ids1 mds%rowtype,name1 out varchar) return mds%rowtype is
    var1 mds%rowtype;
  begin
      ids.id := ids1.id + 1;
@@ -300,9 +301,9 @@ end;
 /
 INFO:  var1=(1,"package var change")
 INFO:  var1=(1,"a return pkg type")
-INFO:  var2=<NULL>
+INFO:  var2=(1,"a in package type")
 INFO:  var3=(0,"a in package type")
-INFO:  name=<NULL>
+INFO:  name=wel come to pkgtype
 declare
  var1 mds%rowtype;
 begin
@@ -2040,11 +2041,11 @@ drop package pkg;
 --test package references package
 create or replace package pkg is
 var1 mds%rowtype;
-function test(id integer, var2 mds%rowtype) return mds;
+function test(id integer, var2 out mds%rowtype) return mds%rowtype;
 end;
 /
 create or replace package body pkg is
- function test(id integer, var2 mds%rowtype) return mds is
+ function test(id integer, var2 out mds%rowtype) return mds%rowtype is
   var3 mds%rowtype;
  begin
    var2.id := 1;
@@ -2058,11 +2059,11 @@ end;
 create or replace package pkg1 is
  var1 mds%rowtype;
  var2 pkg.var1%type;
- function test(id integer, var3  mds%rowtype) return mds%rowtype;
+ function test(id integer, var3 out mds%rowtype) return mds%rowtype;
 end;
 /
 create or replace package body pkg1 is
-  function test(id integer, var3  mds%rowtype) return mds%rowtype is
+  function test(id integer, var3 out mds%rowtype) return mds%rowtype is
   var4 mds%rowtype;
   begin
     var3.id := 0;
@@ -2086,8 +2087,8 @@ begin
   raise info 'var1=%,var3=%',var1,var3;
 end;
 /
-INFO:  var2=<NULL>,var4=(2,"a out namechange")
-INFO:  var1=<NULL>,var3=(1,"a pkg1 namepkg1")
+INFO:  var2=(1,"a out name"),var4=(2,"a out namechange")
+INFO:  var1=(0,"a pkg1 name"),var3=(1,"a pkg1 namepkg1")
 --again
 declare
   var1 pkg1.var1%type;
@@ -2101,8 +2102,8 @@ begin
   raise info 'var1=%,var3=%',var1,var3;
 end;
 /
-INFO:  var2=<NULL>,var4=(2,"a out namechange")
-INFO:  var1=<NULL>,var3=(1,"a pkg1 namepkg1")
+INFO:  var2=(1,"a out name"),var4=(2,"a out namechange")
+INFO:  var1=(0,"a pkg1 name"),var3=(1,"a pkg1 namepkg1")
 declare
   var1 pkg1.var1%type;
   var2 pkg.var1%type;
@@ -2842,15 +2843,16 @@ end;
 /
 --clean data
 drop package pkg;
+SET ivorysql.allow_out_parameter_const = true;
 --test
 create table emp2(empno int,ename char(10),job char(20),mgr int,hiredate date,sal number,comm number,deptno int);
 create or replace package pg_myfirst
 is
 procedure sp_emp_insert;
 function f_getename(i_empno number) return varchar2;
-function f_out(id integer, name varchar) return varchar;
-procedure f1_out(id integer, name varchar);
-function f2_out(id integer, var2 mds%rowtype) return mds%rowtype;
+function f_out(id integer, name out varchar) return varchar;
+procedure f1_out(id integer, name out varchar);
+function f2_out(id integer, var2 out mds%rowtype) return mds%rowtype;
 end pg_myfirst;
 /
 create or replace package body pg_myfirst
@@ -2869,16 +2871,16 @@ begin
 select ename into v_ename from emp2 where empno=i_empno;
 return v_ename;
 end;
-function f_out(id integer, name varchar) return varchar is
+function f_out(id integer, name out varchar) return varchar is
 begin
    name := 'xiexie';
    return 'welcome';
 end;
-procedure f1_out(id integer, name varchar) is
+procedure f1_out(id integer, name out varchar) is
 begin
   name := 'jsdfljsf';
 end;
-function f2_out(id integer, var2 mds%rowtype) return mds%rowtype is
+function f2_out(id integer, var2 out mds%rowtype) return mds%rowtype is
   var1 mds%rowtype;
 begin
   var2.id := 1;
@@ -2901,8 +2903,8 @@ begin
   raise info 'ret_mds=%, out_mds=%', ret_mds,out_mds;
 end;
 /
-INFO:  ret_var=welcome, out_var=<NULL>
-INFO:  ret_mds=(2,"return name"), out_mds=<NULL>
+INFO:  ret_var=welcome, out_var=xiexie
+INFO:  ret_mds=(2,"return name"), out_mds=(1,"out name")
 call pg_myfirst.sp_emp_insert();
 select * FROM pg_myfirst.f_getename(7384);
  f_getename 
@@ -2917,29 +2919,39 @@ select pg_myfirst.f_getename(7384) from dual;
 (1 row)
 
 select * from pg_myfirst.f_out(23,NULL);
-  f_out  
----------
- welcome
+  name  | _RETVAL_ 
+--------+----------
+ xiexie | welcome
 (1 row)
 
 select pg_myfirst.f_out(23,NULL) from dual;
-  f_out  
----------
- welcome
+      f_out       
+------------------
+ (xiexie,welcome)
 (1 row)
 
 call pg_myfirst.f1_out(23,NULL);
+   name   
+----------
+ jsdfljsf
+(1 row)
+
 call pg_myfirst.f1_out(23,NULL);
+   name   
+----------
+ jsdfljsf
+(1 row)
+
 select pg_myfirst.f2_out(23,NULL) FROM dual;
-      f2_out       
--------------------
- (2,"return name")
+                   f2_out                   
+--------------------------------------------
+ ("(1,""out name"")","(2,""return name"")")
 (1 row)
 
 SELECT * FROM pg_myfirst.f2_out(23,NULL);
- id |    name     
-----+-------------
-  2 | return name
+      var2      |     _RETVAL_      
+----------------+-------------------
+ (1,"out name") | (2,"return name")
 (1 row)
 
 -- drop data
@@ -3143,11 +3155,11 @@ set search_path to public;
 create table test1(id integer,name varchar(23));
 create or replace package pkg is
   id integer;
-  function test(id integer) return test1;
+  function test(id out integer) return test1;
 end;
 /
 create or replace package body pkg is
-  function test(id integer) return test1 is
+  function test(id out integer) return test1 is
     var1 test1%rowtype;
   begin
     id := pkg.id;
@@ -3172,16 +3184,16 @@ begin
 end;
 /
 INFO:  init block
-INFO:  var1=(2,xiexie),var2=<NULL>
-INFO:  var1=(3,xiexie),var2=<NULL>
-INFO:  var1=(4,xiexie),var2=<NULL>
-INFO:  var1=(5,xiexie),var2=<NULL>
-INFO:  var1=(6,xiexie),var2=<NULL>
-INFO:  var1=(7,xiexie),var2=<NULL>
-INFO:  var1=(8,xiexie),var2=<NULL>
-INFO:  var1=(9,xiexie),var2=<NULL>
-INFO:  var1=(10,xiexie),var2=<NULL>
-INFO:  var1=(11,xiexie),var2=<NULL>
+INFO:  var1=(2,xiexie),var2=1
+INFO:  var1=(3,xiexie),var2=2
+INFO:  var1=(4,xiexie),var2=3
+INFO:  var1=(5,xiexie),var2=4
+INFO:  var1=(6,xiexie),var2=5
+INFO:  var1=(7,xiexie),var2=6
+INFO:  var1=(8,xiexie),var2=7
+INFO:  var1=(9,xiexie),var2=8
+INFO:  var1=(10,xiexie),var2=9
+INFO:  var1=(11,xiexie),var2=10
 drop package pkg;
 drop table test1;
 --test review rely on package
@@ -5115,48 +5127,57 @@ REVOKE CREATE ON SCHEMA public FROM test_user;
 DROP USER test_user;
 DROP USER test_user2;
 CREATE OR REPLACE package test_pkg IS
-	PROCEDURE proc1(number1 NUMBER);
-	PROCEDURE proc2(number2 NUMBER);
-	PROCEDURE proc3(number3 NUMBER);
-	PROCEDURE proc4(number4 NUMBER);
+    var1 number;
+	var2 number;
+	PROCEDURE proc1(number1 out NUMBER);
+	PROCEDURE proc2(number2 out NUMBER);
+	PROCEDURE proc3(number3 out NUMBER);
+	PROCEDURE proc4(number4 out NUMBER);
 end;
 /
 CREATE OR REPLACE package body test_pkg is
-	PROCEDURE proc2(number2 NUMBER) IS
+	PROCEDURE proc2(number2 out NUMBER) IS
 	BEGIN
 		call proc1(number2);
 		raise info '%', number2;
 		raise info '%','proc2';
 	END;
-	PROCEDURE proc4(number4 NUMBER) IS
+	PROCEDURE proc4(number4 out NUMBER) IS
 	BEGIN
 		raise info '%','proc4';
 		call proc3(number4);
 		raise info 'proc3 out %', number4;
 	END;
-	PROCEDURE proc1(number1 NUMBER) IS
+	PROCEDURE proc1(number1 out NUMBER) IS
 	BEGIN
 		raise info '%','proc1';
 		number1 := 0;
 	END;
-	PROCEDURE proc3(number3 NUMBER) IS
+	PROCEDURE proc3(number3 out NUMBER) IS
 	BEGIN
 		raise info '%', 'proc3';
 		number3 := 1;
 	END;
 BEGIN
-	call proc2(1);
-	call proc4(2);
+	call proc2(var1);
+	call proc4(var2);
+	raise info '%-%', var1,var2;
 END;
 /
 call test_pkg.proc1(23);
 INFO:  proc1
-INFO:  1
+INFO:  0
 INFO:  proc2
 INFO:  proc4
 INFO:  proc3
-INFO:  proc3 out 2
+INFO:  proc3 out 1
+INFO:  0-1
 INFO:  proc1
+ number1 
+---------
+ 0
+(1 row)
+
 discard package;
 DROP package test_pkg;
 CREATE OR REPLACE package pkg IS
@@ -5701,8 +5722,564 @@ DROP VIEW test_view;
 DROP FUNCTION test_f;
 DROP PROCEDURE test_p;
 DROP PROCEDURE test_p1;
+DROP package test_pkg;
+--test out parameter
+--raise info 23
+declare
+  var1 integer;
+  procedure test_p(id out integer) is
+  begin
+     id := 23;
+  end;
+begin
+  call test_p(var1);
+  raise info '%', var1;
+end;
+/
+INFO:  23
+declare
+  var1 integer;
+  procedure test_p(id out integer, name varchar2) is
+  begin
+     id := 23;
+  end;
+begin
+  call test_p(var1,'xiexie');
+  raise info '%', var1;
+end;
+/
+INFO:  23
+declare
+  var1 integer;
+  procedure test_p(id1 integer,id out integer, name varchar2) is
+  begin
+     raise info '%-%-%',id1, id, name;
+  end;
+begin
+  call test_p(23, var1,'xiexie');
+  raise info '%', var1;
+end;
+/
+INFO:  23-<NULL>-xiexie
+INFO:  <NULL>
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  procedure test_p(id1 IN out integer,id out mds, name varchar2) is
+  begin
+     raise info '%-%-%',id1, id, name;
+	 id.id := id1;
+	 id.name :=name;
+  end;
+BEGIN
+  var1 := 23;
+  call test_p(var1, var2,'xiexie');
+  raise info '%-%', var1, var2;
+end;
+/
+INFO:  23-<NULL>-xiexie
+INFO:  23-(23,xiexie)
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  procedure test_p(id IN out mds) is
+  begin
+     raise info '%',id;
+	 id.id := var1;
+	 id.name := 'welcome';
+  end;
+BEGIN
+  var1 := 23;
+  call test_p(var2);
+  raise info '%',var2;
+end;
+/
+INFO:  <NULL>
+INFO:  (23,welcome)
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  PROCEDURE test_p(id out integer) IS
+    var2 integer;
+	PROCEDURE test_pp(id1 out mds%rowtype) IS
+    BEGIN
+        id1.id := id;
+		id1.name := 'welcome';
+    end;
+  BEGIN
+     id := 23;
+     call test_pp(var0);
+	 raise info '%', var0;
+  end;
+BEGIN
+    call test_p(var1);
+	raise info '%', var1;
+end;
+/
+INFO:  (23,welcome)
+INFO:  23
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  PROCEDURE test_p(id out integer) IS
+    var2 integer;
+	PROCEDURE test_pp(id1 out mds%rowtype) IS
+    BEGIN
+        id1.id := var2;
+		id1.name := 'welcome';
+    end;
+  BEGIN
+     id := 23;
+	 var2 := 24;
+     call test_pp(var0);
+	 raise info '%', var0;
+  end;
+BEGIN
+    call test_p(var1);
+	raise info '%', var1;
+end;
+/
+INFO:  (24,welcome)
+INFO:  23
+--test function
+DECLARE
+  var1 integer;
+  var2 integer;
+  FUNCTION test_f(id out integer) RETURN integer IS
+  BEGIN
+     id := var1;
+	 RETURN var1 + 1;
+  end;
+BEGIN
+  var2 := 23;
+  var1 := 24;
+  var1 := test_f(var2);
+  raise info '%-%', var1,var2;
+end;
+/
+INFO:  25-24
+declare
+  var1 integer;
+  var2 varchar2(256);
+  function test_f(id out integer) RETURN varchar2 is
+  begin
+     id := 23;
+	 RETURN 'xiexie';
+  end;
+begin
+  var2 := test_f(var1);
+  raise info '%-%', var1,var2;
+end;
+/
+INFO:  23-xiexie
+declare
+  var1 integer;
+  var2 integer;
+  function test_f(id out integer, name varchar2) RETURN integer is
+  begin
+     id := 23;
+	 RETURN id + 1;
+  end;
+begin
+  var2 := test_f(var1,'xiexie');
+  raise info '%-%', var1, var2;
+end;
+/
+INFO:  23-24
+declare
+  var1 integer;
+  var2 integer;
+  FUNCTION  test_f(id1 integer,id out integer, name varchar2) RETURN integer is
+  begin
+     raise info '%-%-%',id1, id, name;
+	 RETURN id + 1;
+  end;
+begin
+  var2 := test_f(23, var1,'xiexie');
+  raise info '%-%', var1,var2;
+end;
+/
+INFO:  23-<NULL>-xiexie
+INFO:  <NULL>-<NULL>
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  var3 mds%rowtype;
+  function test_f(id1 IN out integer,id out mds, name varchar2) RETURN mds IS
+    var3 mds%rowtype;
+  begin
+     raise info '%-%-%',id1, id, name;
+	 id.id := id1;
+	 id.name :=name;
+     var3.id := id.id + 1;
+	 var3.name := 'name' || ' ' || id.name;
+	 RETURN var3;
+  end;
+BEGIN
+  var1 := 23;
+  var3 := test_f(var1, var2,'xiexie');
+  raise info '%-%-%', var1, var2, var3;
+end;
+/
+INFO:  23-<NULL>-xiexie
+INFO:  23-(23,xiexie)-(24,"name xiexie")
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  var3 integer;
+  function test_f(id IN out mds) RETURN integer is
+  begin
+     raise info '%',id;
+	 id.id := var1;
+	 id.name := 'welcome';
+	 RETURN id.id + 1;
+  end;
+BEGIN
+  var1 := 23;
+  var3 := test_f(var2);
+  raise info '%-%',var2, var3;
+end;
+/
+INFO:  <NULL>
+INFO:  (23,welcome)-24
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  var4 integer;
+  function test_f(id out integer) RETURN integer IS
+    var2 integer;
+	var3 varchar2(256);
+	function test_ff(id1 out mds%rowtype) RETURN varchar2 IS
+    BEGIN
+        id1.id := id;
+		id1.name := 'welcome';
+		RETURN 'xiexie';
+    end;
+  BEGIN
+     id := 23;
+     var3 := test_ff(var0);
+	 raise info '%-%', var0, var3;
+	 RETURN 267;
+  end;
+BEGIN
+    var4 := test_f(var1);
+	raise info '%-%', var1, var4;
+end;
+/
+INFO:  (23,welcome)-xiexie
+INFO:  23-267
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  var4 varchar2(256);
+  function test_f(id out integer) RETURN varchar2 IS
+    var2 integer;
+	var3 mds%rowtype;
+	function test_ff(id1 out mds%rowtype) RETURN mds IS
+    BEGIN
+        id1.id := var2;
+		id1.name := 'welcome';
+		RETURN id1;
+    end;
+  BEGIN
+     id := 23;
+	 var2 := 24;
+     var3 := test_ff(var0);
+	 raise info '%-%', var0, var3;
+	 RETURN var0.name;
+  end;
+BEGIN
+    var4 := test_f(var1);
+	raise info '%-%', var1, var4;
+end;
+/
+INFO:  (24,welcome)-(24,welcome)
+INFO:  23-welcome
+CREATE OR REPLACE FUNCTION test_f(id out varchar2,id1 integer) RETURN integer IS
+  var2 mds%rowtype;
+  var1 integer;
+  FUNCTION test_ff(id2 out varchar2) RETURN integer IS
+  BEGIN
+     id2 := 'welcome';
+	 RETURN 23;
+  end;
+  PROCEDURE test_p(id3 out varchar2, id4 out mds) IS
+  BEGIN
+    id3 := 'to beijing';
+	id4.id := 12;
+	id4.name := 'welcome to hunan';
+  end;
+BEGIN
+  var1 := test_ff(id);
+  raise info '%-%', id, var1;
+  call test_p(id, var2);
+  raise info '%-%', id, var2;
+  RETURN var2.id;
+end;
+/
+DECLARE
+  var1 integer;
+  var2 varchar2(256);
+BEGIN
+  var1 := test_f(var2,23);
+  raise info '%-%', var2,var1;
+end;
+/
+INFO:  welcome-23
+INFO:  to beijing-(12,"welcome to hunan")
+INFO:  to beijing-12
+--agian
+DECLARE
+  var1 integer;
+  var2 varchar2(256);
+BEGIN
+  var1 := test_f(var2,23);
+  raise info '%-%', var2,var1;
+end;
+/
+INFO:  welcome-23
+INFO:  to beijing-(12,"welcome to hunan")
+INFO:  to beijing-12
+CREATE OR REPLACE procedure test_p(id out varchar2,id1 integer)  IS
+  var2 mds%rowtype;
+  var1 integer;
+  FUNCTION test_ff(id2 out varchar2) RETURN integer IS
+  BEGIN
+     id2 := 'welcome';
+	 RETURN 23;
+  end;
+  PROCEDURE test_p(id3 out varchar2, id4 out mds) IS
+  BEGIN
+    id3 := 'to beijing';
+	id4.id := 12;
+	id4.name := 'welcome to hunan';
+  end;
+BEGIN
+  var1 := test_ff(id);
+  raise info '%-%', id, var1;
+  call test_p(id, var2);
+  raise info '%-%', id, var2;
+end;
+/
+DECLARE
+  var2 varchar2(256);
+BEGIN
+  call test_p(var2,23);
+  raise info '%', var2;
+end;
+/
+INFO:  welcome-23
+INFO:  to beijing-(12,"welcome to hunan")
+INFO:  to beijing
+--again
+DECLARE
+  var2 varchar2(256);
+BEGIN
+  call test_p(var2,23);
+  raise info '%', var2;
+end;
+/
+INFO:  welcome-23
+INFO:  to beijing-(12,"welcome to hunan")
+INFO:  to beijing
+--clean
+DROP FUNCTION test_f;
+DROP PROCEDURE test_p;
+--package
+CREATE OR REPLACE package test_pkg IS
+ var1 integer;
+ var2 varchar2(256);
+ var3 mds%rowtype;
+ FUNCTION test_f(id out varchar2) RETURN integer;
+ FUNCTION test_f1(id out mds,name out varchar2) RETURN mds;
+ FUNCTION test_f2(id integer) RETURN mds;
+ PROCEDURE test_p(id out mds);
+ PROCEDURE test_p1(name out varchar2,id2 integer);
+end;
+/
+CREATE OR REPLACE package body test_pkg IS
+ FUNCTION test_f(id out varchar2) RETURN integer IS
+ BEGIN
+    id := 'welcome to ';
+	RETURN 23;
+ end;
+ FUNCTION test_f1(id out mds,name out varchar2) RETURN mds IS
+   var4 mds%rowtype;
+ begin
+   id.id := var1;
+   id.name := var2;
+   name := ' beijing';
+   var4.id := 1;
+   var4.name := 'welcome to hunan';
+   RETURN var4;
+ end;
+ FUNCTION test_f2(id integer) RETURN mds IS
+   var4 mds%rowtype;
+ BEGIN
+   var4.id := id;
+   var4.name := 'welcome to beijing';
+   RETURN var4;
+ end;
+ PROCEDURE test_p(id out mds) IS
+ BEGIN
+    id := var3;
+ end;
+ PROCEDURE test_p1(name out varchar2,id2 integer) IS
+ BEGIN
+    name := var3.name;
+ end;
+BEGIN
+  var1 := 23;
+  var2 := 'init a value';
+  var3.id := var1;
+  var3.name := var2;
+end;
+/
+SELECT test_pkg.test_f(NULL);
+       test_f       
+--------------------
+ ("welcome to ",23)
+(1 row)
+
+SELECT test_pkg.test_f1(NULL, NULL);
+                             test_f1                             
+-----------------------------------------------------------------
+ ("(23,""init a value"")"," beijing","(1,""welcome to hunan"")")
+(1 row)
+
+SELECT test_pkg.test_f2(23);
+          test_f2          
+---------------------------
+ (23,"welcome to beijing")
+(1 row)
+
+SELECT * FROM test_pkg.test_f(NULL);
+     id      | _RETVAL_ 
+-------------+----------
+ welcome to  |       23
+(1 row)
+
+SELECT * FROM test_pkg.test_f1(NULL, NULL);
+         id          |   name   |        _RETVAL_        
+---------------------+----------+------------------------
+ (23,"init a value") |  beijing | (1,"welcome to hunan")
+(1 row)
+
+SELECT * FROM test_pkg.test_f2(23);
+ id |        name        
+----+--------------------
+ 23 | welcome to beijing
+(1 row)
+
+call test_pkg.test_p(NULL);
+         id          
+---------------------
+ (23,"init a value")
+(1 row)
+
+call test_pkg.test_p1(NULL, 23);
+     name     
+--------------
+ init a value
+(1 row)
+
+DECLARE
+   var1 integer;
+   var2 varchar2(256);
+   var3 mds%rowtype;
+   var4 mds%rowtype;
+BEGIN
+   var1 := test_pkg.test_f(var2);
+   raise info '%-%', var2,var1;
+   var4 := test_pkg.test_f1(var3, var2);
+   raise info '%-%-%', var3, var2,var4;
+   var4 := test_pkg.test_f2(24);
+   raise info '%', var4;
+   call test_pkg.test_p(test_pkg.var3);
+   raise info '%', test_pkg.var3;
+   call test_pkg.test_p1(var2,23);
+   raise info '%', var2;
+end;
+/
+INFO:  welcome to -23
+INFO:  (23,"init a value")- beijing-(1,"welcome to hunan")
+INFO:  (24,"welcome to beijing")
+INFO:  (23,"init a value")
+INFO:  init a value
+DECLARE
+   var1 integer;
+   var2 varchar2(256);
+   var3 mds%rowtype;
+   var4 mds%rowtype;
+BEGIN
+   var1 := test_pkg.test_f(var2);
+   raise info '%-%', var2,var1;
+   var4 := test_pkg.test_f1(var3, var2);
+   raise info '%-%-%', var3, var2,var4;
+   var4 := test_pkg.test_f2(24);
+   raise info '%', var4;
+   call test_pkg.test_p(test_pkg.var3);
+   raise info '%', test_pkg.var3;
+   call test_pkg.test_p1(var2,23);
+   raise info '%', var2;
+end;
+/
+INFO:  welcome to -23
+INFO:  (23,"init a value")- beijing-(1,"welcome to hunan")
+INFO:  (24,"welcome to beijing")
+INFO:  (23,"init a value")
+INFO:  init a value
+SELECT test_pkg.test_f(NULL);
+       test_f       
+--------------------
+ ("welcome to ",23)
+(1 row)
+
+SELECT test_pkg.test_f1(NULL, NULL);
+                             test_f1                             
+-----------------------------------------------------------------
+ ("(23,""init a value"")"," beijing","(1,""welcome to hunan"")")
+(1 row)
+
+SELECT test_pkg.test_f2(23);
+          test_f2          
+---------------------------
+ (23,"welcome to beijing")
+(1 row)
+
+SELECT * FROM test_pkg.test_f(NULL);
+     id      | _RETVAL_ 
+-------------+----------
+ welcome to  |       23
+(1 row)
+
+SELECT * FROM test_pkg.test_f1(NULL, NULL);
+         id          |   name   |        _RETVAL_        
+---------------------+----------+------------------------
+ (23,"init a value") |  beijing | (1,"welcome to hunan")
+(1 row)
+
+SELECT * FROM test_pkg.test_f2(23);
+ id |        name        
+----+--------------------
+ 23 | welcome to beijing
+(1 row)
+
+call test_pkg.test_p(NULL);
+         id          
+---------------------
+ (23,"init a value")
+(1 row)
+
+call test_pkg.test_p1(NULL, 23);
+     name     
+--------------
+ init a value
+(1 row)
+
 DROP package test_pkg;
 --clean data
+RESET ivorysql.allow_out_parameter_const;
 DROP FUNCTION test_event_trigger;
 DROP TABLE mds;
 DROP TABLE mdss;
diff --git a/src/oracle_test/regress/expected/ora_plisql.out b/src/oracle_test/regress/expected/ora_plisql.out
index 8199e97e4d2..5fe0dd7d614 100755
--- a/src/oracle_test/regress/expected/ora_plisql.out
+++ b/src/oracle_test/regress/expected/ora_plisql.out
@@ -1,7 +1,7 @@
 --
 -- PLISQL
 --
--- return is a non-reserved keyword, Can be used as object name.
+-- return is a non-reserved keyword, can be used as object name.
 CREATE TABLE RETURN (fooid INT, foosubid INT, fooname TEXT);
 INSERT INTO RETURN VALUES (1, 2, 'three');
 INSERT INTO RETURN VALUES (4, 5, 'six');
@@ -743,11 +743,13 @@ NOTICE:  10
 begin
 null;
 end;
+/
 <<
 main >>
 begin
 null;
 end;
+/
 <<
 main
 >>
@@ -858,13 +860,13 @@ begin
 end;
 /
 -- nested subproc of plisql
-create or replace function test_subproc_func(a in integer) returns integer as
+create or replace function test_subproc_func(a in out integer) returns integer as
 $$
 declare
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
   declare
        original_squared integer;
@@ -907,36 +909,36 @@ SELECT pg_get_functiondef('test_proc'::regproc) from dual;
 (1 row)
 
 SELECT pg_get_functiondef('test_subproc_func'::regproc) from dual;
-                           pg_get_functiondef                           
-------------------------------------------------------------------------
- CREATE OR REPLACE FUNCTION public.test_subproc_func(a pg_catalog.int4)+
-  RETURN pg_catalog.int4                                               +
-  AUTHID DEFINER                                                       +
- IS                                                                    +
-                                                                       +
- declare                                                               +
-   mds integer;                                                        +
-   original integer;                                                   +
-   function square(original in integer) return integer;                +
-   function square(original in integer) return integer                 +
-   AS                                                                  +
-   declare                                                             +
-        original_squared integer;                                      +
-   begin                                                               +
-        original_squared := original * original;                       +
-        original := original_squared + 1;                              +
-        return original_squared;                                       +
-    end;                                                               +
- begin                                                                 +
-     mds := 10;                                                        +
-     original := square(mds);                                          +
-     raise info '%',original;                                          +
-     a := original + 1;                                                +
-     return mds;                                                       +
+                              pg_get_functiondef                              
+------------------------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION public.test_subproc_func(INOUT a pg_catalog.int4)+
+  RETURN pg_catalog.int4                                                     +
+  AUTHID DEFINER                                                             +
+ IS                                                                          +
+                                                                             +
+ declare                                                                     +
+   mds integer;                                                              +
+   original integer;                                                         +
+   function square(original in out integer) return integer;                  +
+   function square(original in out integer) return integer                   +
+   AS                                                                        +
+   declare                                                                   +
+        original_squared integer;                                            +
+   begin                                                                     +
+        original_squared := original * original;                             +
+        original := original_squared + 1;                                    +
+        return original_squared;                                             +
+    end;                                                                     +
+ begin                                                                       +
+     mds := 10;                                                              +
+     original := square(mds);                                                +
+     raise info '%',original;                                                +
+     a := original + 1;                                                      +
+     return mds;                                                             +
  end;
 (1 row)
 
--- ivy_get_plisql_functiondef is only using get plisql func/proc definition.
+-- ivy_get_plisql_functiondef is only used to get plisql func/proc definition.
 SELECT ivy_get_plisql_functiondef('test_func'::regproc) from dual;
           ivy_get_plisql_functiondef           
 -----------------------------------------------
@@ -962,32 +964,32 @@ SELECT ivy_get_plisql_functiondef('test_proc'::regproc) from dual;
 (1 row)
 
 SELECT ivy_get_plisql_functiondef('test_subproc_func'::regproc) from dual;
-                       ivy_get_plisql_functiondef                       
-------------------------------------------------------------------------
- CREATE OR REPLACE FUNCTION public.test_subproc_func(a pg_catalog.int4)+
-  RETURN pg_catalog.int4                                               +
-  AUTHID DEFINER                                                       +
- IS                                                                    +
-                                                                       +
- declare                                                               +
-   mds integer;                                                        +
-   original integer;                                                   +
-   function square(original in integer) return integer;                +
-   function square(original in integer) return integer                 +
-   AS                                                                  +
-   declare                                                             +
-        original_squared integer;                                      +
-   begin                                                               +
-        original_squared := original * original;                       +
-        original := original_squared + 1;                              +
-        return original_squared;                                       +
-    end;                                                               +
- begin                                                                 +
-     mds := 10;                                                        +
-     original := square(mds);                                          +
-     raise info '%',original;                                          +
-     a := original + 1;                                                +
-     return mds;                                                       +
+                          ivy_get_plisql_functiondef                          
+------------------------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION public.test_subproc_func(INOUT a pg_catalog.int4)+
+  RETURN pg_catalog.int4                                                     +
+  AUTHID DEFINER                                                             +
+ IS                                                                          +
+                                                                             +
+ declare                                                                     +
+   mds integer;                                                              +
+   original integer;                                                         +
+   function square(original in out integer) return integer;                  +
+   function square(original in out integer) return integer                   +
+   AS                                                                        +
+   declare                                                                   +
+        original_squared integer;                                            +
+   begin                                                                     +
+        original_squared := original * original;                             +
+        original := original_squared + 1;                                    +
+        return original_squared;                                             +
+    end;                                                                     +
+ begin                                                                       +
+     mds := 10;                                                              +
+     original := square(mds);                                                +
+     raise info '%',original;                                                +
+     a := original + 1;                                                      +
+     return mds;                                                             +
  end;
 (1 row)
 
@@ -998,26 +1000,9 @@ DROP FUNCTION test_subproc_func(int);
 -- Compatible with Oracle:
 -- The input parameter type is %rowtype
 --
-create table t1(a int, b int);
-create or  replace function ftest(a in t1%rowtype)
- return int 
-  as 
-begin  a.a = 25; a.b= 26; raise notice '%',a;
-return 25;
-end;
-/
-select * from ftest(null::t1);
-NOTICE:  (25,26)
- ftest 
--------
-    25
-(1 row)
-
-drop function ftest;
-drop table t1;
 create or replace procedure protest 
 as 
-begin 
+begin
 raise notice 'protest';
 end;
 / 
@@ -1028,7 +1013,10 @@ LINE 1: CALL protest;
 CALL protest();
 NOTICE:  protest
 exec protest;      
-NOTICE:  protest
+ERROR:  syntax error at end of input
+LINE 1: BEGIN protest;      ; END
+                          ^
+QUERY:  BEGIN protest;      ; END
 exec protest();
 NOTICE:  protest
 drop  procedure protest ;
@@ -1056,6 +1044,10 @@ LINE 1: CALL test_proc1;
                        ^
 CALL test_proc1();
 EXEC test_proc1;   
+ERROR:  syntax error at end of input
+LINE 1: BEGIN test_proc1;   ; END
+                             ^
+QUERY:  BEGIN test_proc1;   ; END
 EXEC test_proc1();
 DROP PROCEDURE test_proc1;
 CREATE TABLE test1 (a int);
@@ -1116,11 +1108,8 @@ CALL test_proc5('abc');
 (1 row)
 
 EXEC test_proc5('abc');
-    a    
----------
- abc+abc
-(1 row)
-
+ERROR:  procedure parameter "a" is an output parameter but corresponding argument is not writable
+CONTEXT:  PL/iSQL function inline_code_block line 1 at CALL
 DROP PROCEDURE test_proc5;
 CREATE or replace PROCEDURE test_proc6(a int, INOUT b int, INOUT c int)
 AS 
@@ -1136,13 +1125,10 @@ CALL test_proc6(2, 3, 4);
 (1 row)
 
 EXEC test_proc6(2, 3, 4);
- b | c 
----+---
- 6 | 8
-(1 row)
-
+ERROR:  procedure parameter "b" is an output parameter but corresponding argument is not writable
+CONTEXT:  PL/iSQL function inline_code_block line 1 at CALL
 DROP PROCEDURE test_proc6;
--- recursive with output arguments
+-- recursion with output arguments
 CREATE OR REPLACE PROCEDURE test_proc7(x int, INOUT a int, INOUT b numeric)
 AS
 BEGIN
@@ -1160,11 +1146,8 @@ CALL test_proc7(100, -1, -1);
 (1 row)
 
 EXEC test_proc7(100, -1, -1);
- a | b 
----+---
- 0 | 1
-(1 row)
-
+ERROR:  procedure parameter "a" is an output parameter but corresponding argument is not writable
+CONTEXT:  PL/iSQL function inline_code_block line 1 at CALL
 DROP PROCEDURE test_proc7;
 CREATE OR REPLACE PROCEDURE test_proc8a(INOUT a int, INOUT b int)
 AS 
@@ -1175,19 +1158,11 @@ BEGIN
 END;
 /
 EXEC test_proc8a(10, 20);
-NOTICE:  a: 10, b: 20
-  a  | b  
------+----
- 100 | 30
-(1 row)
-
+ERROR:  procedure parameter "a" is an output parameter but corresponding argument is not writable
+CONTEXT:  PL/iSQL function inline_code_block line 1 at CALL
 EXEC test_proc8a(b => 20, a => 10);
-NOTICE:  a: 10, b: 20
-  a  | b  
------+----
- 100 | 30
-(1 row)
-
+ERROR:  procedure parameter "a" is an output parameter but corresponding argument is not writable
+CONTEXT:  PL/iSQL function inline_code_block line 1 at CALL
 DROP PROCEDURE test_proc8a;
 CREATE OR REPLACE PROCEDURE test_proc8b( a  int,  b  int)
 AS 
@@ -1300,3 +1275,553 @@ NOTICE:  stest.protest
 NOTICE:  protest2
 DROP PROCEDURE  protest2;
 DROP PROCEDURE  stest.protest;
+-- An empty parenthesis cannot be ignored
+create or replace procedure p_noarg()
+is
+begin
+raise notice 'this procedure without args';
+end;
+/
+-- fail
+call p_noarg;
+ERROR:  syntax error at or near ";"
+LINE 1: call p_noarg;
+                    ^
+--ok
+call p_noarg();
+NOTICE:  this procedure without args
+create or replace function f_noarg()
+return number
+is
+begin
+raise notice 'this function without args';
+return 999;
+end;
+/
+variable x number;
+-- fail
+call f_noarg into :x;
+ERROR:  syntax error at or near "into"
+LINE 1: select * from get_parameter_description('call f_noarg into :...
+                     ^
+--ok
+call f_noarg() into :x;
+NOTICE:  this function without args
+print x
+  X  
+-----
+ 999
+
+-- function or procedure with default value
+create or replace procedure p_defs(a varchar2 default 'i am a default string')
+is
+begin
+raise notice '%', a;
+end;
+/
+-- fail
+call p_defs;
+ERROR:  syntax error at or near ";"
+LINE 1: call p_defs;
+                   ^
+-- ok
+call p_defs();
+NOTICE:  i am a default string
+--ok
+call p_defs('new string');
+NOTICE:  new string
+create or replace function f_defs(a number default 1314)
+return number
+is
+begin
+raise notice '%', a;
+return a;
+end;
+/
+variable x number
+--fail
+call f_defs into :x;
+ERROR:  syntax error at or near "into"
+LINE 1: select * from get_parameter_description('call f_defs into :x...
+                    ^
+--ok
+call f_defs() into :x;
+NOTICE:  1314
+print x
+  X   
+------
+ 1314
+
+--ok
+call f_defs(999) into :x;
+NOTICE:  999
+print x
+  X  
+-----
+ 999
+
+drop function f_defs;
+drop procedure p_defs;
+drop function f_noarg();
+drop procedure p_noarg();
+--
+-- Truncate when the bind variable and the function return type or param type
+-- are the same and the typmod of the bind variable overflows.
+-- Fails when the bind variable and the function return type are or param type
+-- not same but can cast and the typmod of the bind variable overflows.
+--
+create or replace procedure ff_proc(a varchar2, b varchar2)
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+raise notice '%', a||b;
+end;
+/
+-- ok
+call ff_proc('123456789', '123456789');
+NOTICE:  123456789
+NOTICE:  123456789
+NOTICE:  123456789123456789
+create or replace function ff_test(a varchar2, b varchar2)
+return varchar2
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+return a||b;
+end;
+/
+-- ok
+variable x varchar2(10 char);
+call ff_test('123456789', '123456789') into :x;
+NOTICE:  123456789
+NOTICE:  123456789
+print x
+     X      
+------------
+ 1234567891
+
+-- ok
+variable x varchar2(10 byte);
+call ff_test('123456789', '123456789') into :x;
+NOTICE:  123456789
+NOTICE:  123456789
+print x
+     X      
+------------
+ 1234567891
+
+-- error
+variable x char(10 char);
+call ff_test('123456789', '123456789') into :x;
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(10 char)
+print x
+ X 
+---
+ 
+
+-- error
+variable x char(10 byte);
+call ff_test('123456789', '123456789') into :x;
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(10 byte)
+print x
+ X 
+---
+ 
+
+-- ok
+variable x number;
+call ff_test('123456789', '123456789') into :x;
+NOTICE:  123456789
+NOTICE:  123456789
+print x
+         X          
+--------------------
+ 123456789123456789
+
+-- error
+variable x number;
+call ff_test('abc', '123456789') into :x;
+NOTICE:  abc
+NOTICE:  123456789
+ERROR:  invalid input syntax for type numeric: "abc123456789"
+print x
+ X 
+---
+ 
+
+create or replace procedure f_proc(a varchar2, b out varchar2)
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+b := a;
+end;
+/
+-- ok
+variable x varchar2(5 char)
+call f_proc('123456789', :x);
+NOTICE:  123456789
+NOTICE:  <NULL>
+print
+   X   
+-------
+ 12345
+
+-- ok
+variable x varchar2(5 byte)
+call f_proc('123456789', :x);
+NOTICE:  123456789
+NOTICE:  <NULL>
+print
+   X   
+-------
+ 12345
+
+-- error
+variable x char(5 char)
+call f_proc('123456789', :x);
+NOTICE:  123456789
+NOTICE:  <NULL>
+ERROR:  value too long for type char(5 char)
+print
+ X 
+---
+ 
+
+-- error
+variable x char(5 byte)
+call f_proc('123456789', :x);
+NOTICE:  123456789
+NOTICE:  <NULL>
+ERROR:  value too long for type char(5 byte)
+print
+ X 
+---
+ 
+
+create or replace function f_test(a varchar2, b out varchar2)
+return varchar2
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+b := a;
+raise notice '%', a;
+raise notice '%', b;
+return a||b;
+end;
+/
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 char)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X     
+-----------
+ 123456789
+
+     Y     
+-----------
+ 123456789
+
+      Z       
+--------------
+ 123456789123
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 byte)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X     
+-----------
+ 123456789
+
+     Y     
+-----------
+ 123456789
+
+      Z       
+--------------
+ 123456789123
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(5 char)
+variable z varchar2(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X     
+-----------
+ 123456789
+
+   Y   
+-------
+ 12345
+
+         Z          
+--------------------
+ 123456789123456789
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(5 byte)
+variable z varchar2(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X     
+-----------
+ 123456789
+
+   Y   
+-------
+ 12345
+
+         Z          
+--------------------
+ 123456789123456789
+
+-- error
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 char)
+begin
+:z := f_test(:x, :y);
+end;
+/
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type varchar2(12 char)
+CONTEXT:  PL/iSQL function inline_code_block line 2 at assignment
+print x y z
+     X     
+-----------
+ 123456789
+
+ Y 
+---
+ 
+
+ Z 
+---
+ 
+
+-- error
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(12 char)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(12 char)
+print x y z
+     X      
+------------
+ 123456789 
+
+ Y 
+---
+ 
+
+ Z 
+---
+ 
+
+-- error
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(12 byte)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(12 byte)
+print x y z
+     X      
+------------
+ 123456789 
+
+ Y 
+---
+ 
+
+ Z 
+---
+ 
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(20 char)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X      
+------------
+ 123456789 
+
+      Y      
+-------------
+ 123456789  
+
+          Z           
+----------------------
+ 123456789123456789  
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(20 byte)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X      
+------------
+ 123456789 
+
+      Y      
+-------------
+ 123456789  
+
+          Z           
+----------------------
+ 123456789123456789  
+
+-- error
+variable x char(10) = '123456789'
+variable y char(5 char)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(5 char)
+print x y z
+     X      
+------------
+ 123456789 
+
+ Y 
+---
+ 
+
+ Z 
+---
+ 
+
+-- error
+variable x char(10) = '123456789'
+variable y char(5 byte)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+ERROR:  value too long for type char(5 byte)
+print x y z
+     X      
+------------
+ 123456789 
+
+ Y 
+---
+ 
+
+ Z 
+---
+ 
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(10 char)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X      
+------------
+ 123456789 
+
+     Y      
+------------
+ 123456789 
+
+          Z           
+----------------------
+ 123456789123456789  
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(10 byte)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+NOTICE:  123456789
+NOTICE:  <NULL>
+NOTICE:  123456789
+NOTICE:  123456789
+print x y z
+     X      
+------------
+ 123456789 
+
+     Y      
+------------
+ 123456789 
+
+          Z           
+----------------------
+ 123456789123456789  
+
+-- ORA-06578: output parameter cannot be a duplicate bind.
+-- Cause: The bind variable corresponding to an IN/OUT or
+-- OUT parameter for a function or a procedure or a function
+-- return value in a CALL statement cannot be a duplicate bind variable.
+call f_test(:x, :x) INTO :z;
+ERROR:  output parameter cannot be a duplicate bind
+call f_proc(:x, :x);
+ERROR:  output parameter cannot be a duplicate bind
+--clean
+drop procedure ff_proc;
+drop procedure f_proc;
+drop function f_test;
+drop function ff_test;
diff --git a/src/oracle_test/regress/expected/ora_psql.out b/src/oracle_test/regress/expected/ora_psql.out
index c7dae5cc3c9..c889de51c7a 100644
--- a/src/oracle_test/regress/expected/ora_psql.out
+++ b/src/oracle_test/regress/expected/ora_psql.out
@@ -3,6 +3,7 @@
 -- specific server features.
 -- The main features is compatible with Oracle SQL*PLUS client command.
 --
+\set EXECUTE_RUN_PREPARE off
 --
 -- VAR[IABLE] command
 --
@@ -478,6 +479,122 @@ string "'qqqqqq" missing terminating quote (').
 -- string ""qqqqqq" missing terminating quote (").
 variable a = "qqqqqq
 string ""qqqqqq" missing terminating quote (").
+-- VARIABLE can be abbreviated as VAR
+var my char(4) = '123'
+print my
+  MY  
+------
+ 123 
+
+var my = '1234';
+print my
+  MY  
+------
+ 1234
+
+var my = '12345'
+String beginning "12345" is too long.
+print my
+  MY  
+------
+ 1234
+
+var
+variable	a
+datatype	VARCHAR2(3)
+
+variable	a#b
+datatype	NUMBER
+
+variable	a$b
+datatype	NUMBER
+
+variable	a4b
+datatype	NUMBER
+
+variable	a_b
+datatype	NUMBER
+
+variable	aa
+datatype	CHAR(10 CHAR)
+
+variable	a中文b
+datatype	NUMBER
+
+variable	b
+datatype	VARCHAR2(10)
+
+variable	bb
+datatype	VARCHAR2(10 CHAR)
+
+variable	binary_double
+datatype	NUMBER
+
+variable	binary_float
+datatype	NUMBER
+
+variable	byte
+datatype	NUMBER
+
+variable	c
+datatype	VARCHAR2(10 CHAR)
+
+variable	cc
+datatype	VARCHAR2(10 CHAR)
+
+variable	char
+datatype	NUMBER
+
+variable	comment
+datatype	NUMBER
+
+variable	fail
+datatype	NUMBER
+
+variable	my
+datatype	CHAR(4)
+
+variable	nchar
+datatype	NUMBER
+
+variable	number
+datatype	NUMBER
+
+variable	nvarchar2
+datatype	NUMBER
+
+variable	print
+datatype	NUMBER
+
+variable	truncate
+datatype	VARCHAR2(30 CHAR)
+
+variable	v1
+datatype	NUMBER
+
+variable	v2
+datatype	BINARY_FLOAT
+
+variable	v3
+datatype	BINARY_DOUBLE
+
+variable	v4
+datatype	VARCHAR2(3 CHAR)
+
+variable	varchar2
+datatype	NUMBER
+
+variable	variable
+datatype	NUMBER
+
+variable	x
+datatype	NUMBER
+
+variable	y
+datatype	NUMBER
+
+variable	中文
+datatype	NUMBER
 --
 -- PRINT command
 --
@@ -502,9 +619,9 @@ print v3 v5
  char      
 
 print
- A 
----
- 
+  A  
+-----
+ qqq
 
  A#B 
 -----
@@ -570,6 +687,10 @@ print
 ------
  
 
+  MY  
+------
+ 1234
+
  NCHAR 
 -------
  
@@ -671,35 +792,600 @@ invalid host/bind variable name.
 
 -- Unlike Oracle, these two syntaxes are the same
 print a'b'
- A 
----
- 
+  A  
+-----
+ qqq
 
 invalid host/bind variable name.
 
 print a 'b'
- A 
----
- 
+  A  
+-----
+ qqq
 
 invalid host/bind variable name.
 
 -- Unlike Oracle, these two syntaxes are the same
 print a "b"
- A 
----
- 
+  A  
+-----
+ qqq
 
  B 
 ---
  
 
 print a"b"
- A 
+  A  
+-----
+ qqq
+
+ B 
 ---
  
 
- B 
+--
+-- Referencing bind variables
+--
+-- Referencing bind variables within anonymous blocks.
+variable v1 number = 123
+variable v2 binary_float = 3.14
+variable v3 binary_double = 3.1415926
+variable v4 char = 't'
+variable v5 char(100) = 'this is char(100) datatype'
+variable v6 char(100 char) = 'this is char(100 char) datatype'
+variable v7 char(100 byte) = 'this is char(100 byte) datatype'
+variable v8 nchar(100) = 'this is nchar(100) datatype'
+variable v9 varchar2 = 't'
+variable v10 varchar2(100) = 'this is varchar2(100) datatype'
+variable v11 varchar2(100 char) = 'this is varchar2(100 char) datatype'
+variable v12 varchar2(100 byte) = 'this is varchar2(100 byte) datatype'
+-- can be used as an lvalue or an rvalue
+declare
+lval1 number;
+lval2 binary_float;
+lval3 binary_double;
+lval4 char;
+lval5 char(100);
+lval6 char(100 char);
+lval7 char(100 byte);
+lval8 nchar(100);
+lval9 varchar2;
+lval10 varchar2(100);
+lval11 varchar2(100 char);
+lval12 varchar2(100 byte);
+begin
+raise notice 'old value of v1 is %', :v1;
+raise notice 'old value of v2 is %', :v2;
+raise notice 'old value of v3 is %', :v3;
+raise notice 'old value of v4 is %', :v4;
+raise notice 'old value of v5 is %', :v5;
+raise notice 'old value of v6 is %', :v6;
+raise notice 'old value of v7 is %', :v7;
+raise notice 'old value of v8 is %', :v8;
+raise notice 'old value of v9 is %', :v9;
+raise notice 'old value of v10 is %', :v10;
+raise notice 'old value of v11 is %', :v11;
+raise notice 'old value of v12 is %', :v12;
+lval1 := :v1;
+lval2 := :v2;
+lval3 := :v3;
+lval4 := :v4;
+lval5 := :v5;
+lval6 := :v6;
+lval7 := :v7;
+lval8 := :v8;
+lval9 := :v9;
+lval10 := :v10;
+lval11 := :v11;
+lval12 := :v12;
+:v1 := 3.141592657;
+:v2 := 3.141592657;
+:v3 := 3.141592657;
+:v4 := 'f';
+:v5 := 'new value = ' || :v5;
+:v6 := 'new value = ' || :v6;
+:v7 := 'new value = ' || :v7;
+:v8 := 'new value = ' || :v8;
+:v9 := 'f';
+:v10 := 'new value = ' || :v10;
+:v11 := 'new value = ' || :v11;
+:v12 := 'new value = ' || :v12;
+raise notice 'new value of v1 is %', :v1;
+raise notice 'new value of v2 is %', :v2;
+raise notice 'new value of v3 is %', :v3;
+raise notice 'new value of v4 is %', :v4;
+raise notice 'new value of v5 is %', :v5;
+raise notice 'new value of v6 is %', :v6;
+raise notice 'new value of v7 is %', :v7;
+raise notice 'new value of v8 is %', :v8;
+raise notice 'new value of v9 is %', :v9;
+raise notice 'new value of v10 is %', :v10;
+raise notice 'new value of v11 is %', :v11;
+raise notice 'new value of v12 is %', :v12;
+raise notice 'the value of local variable is %', lval1;
+raise notice 'the value of local variable is %', lval2;
+raise notice 'the value of local variable is %', lval3;
+raise notice 'the value of local variable is %', lval4;
+raise notice 'the value of local variable is %', lval5;
+raise notice 'the value of local variable is %', lval6;
+raise notice 'the value of local variable is %', lval7;
+raise notice 'the value of local variable is %', lval8;
+raise notice 'the value of local variable is %', lval9;
+raise notice 'the value of local variable is %', lval10;
+raise notice 'the value of local variable is %', lval11;
+raise notice 'the value of local variable is %', lval12;
+end;
+/
+NOTICE:  old value of v1 is 123
+NOTICE:  old value of v2 is 3.14
+NOTICE:  old value of v3 is 3.1415926
+NOTICE:  old value of v4 is t
+NOTICE:  old value of v5 is this is char(100) datatype                                                                          
+NOTICE:  old value of v6 is this is char(100 char) datatype                                                                     
+NOTICE:  old value of v7 is this is char(100 byte) datatype                                                                     
+NOTICE:  old value of v8 is this is nchar(100) datatype                                                                         
+NOTICE:  old value of v9 is t
+NOTICE:  old value of v10 is this is varchar2(100) datatype
+NOTICE:  old value of v11 is this is varchar2(100 char) datatype
+NOTICE:  old value of v12 is this is varchar2(100 byte) datatype
+NOTICE:  new value of v1 is 3.141592657
+NOTICE:  new value of v2 is 3.1415927
+NOTICE:  new value of v3 is 3.141592657
+NOTICE:  new value of v4 is f
+NOTICE:  new value of v5 is new value = this is char(100) datatype                                                              
+NOTICE:  new value of v6 is new value = this is char(100 char) datatype                                                         
+NOTICE:  new value of v7 is new value = this is char(100 byte) datatype                                                         
+NOTICE:  new value of v8 is new value = this is nchar(100) datatype                                                             
+NOTICE:  new value of v9 is f
+NOTICE:  new value of v10 is new value = this is varchar2(100) datatype
+NOTICE:  new value of v11 is new value = this is varchar2(100 char) datatype
+NOTICE:  new value of v12 is new value = this is varchar2(100 byte) datatype
+NOTICE:  the value of local variable is 123
+NOTICE:  the value of local variable is 3.14
+NOTICE:  the value of local variable is 3.1415926
+NOTICE:  the value of local variable is t
+NOTICE:  the value of local variable is this is char(100) datatype                                                                          
+NOTICE:  the value of local variable is this is char(100 char) datatype                                                                     
+NOTICE:  the value of local variable is this is char(100 byte) datatype                                                                     
+NOTICE:  the value of local variable is this is nchar(100) datatype                                                                         
+NOTICE:  the value of local variable is t
+NOTICE:  the value of local variable is this is varchar2(100) datatype
+NOTICE:  the value of local variable is this is varchar2(100 char) datatype
+NOTICE:  the value of local variable is this is varchar2(100 byte) datatype
+print v1
+     V1      
+-------------
+ 3.141592657
+
+print v2
+    V2     
+-----------
+ 3.1415927
+
+print v3
+     V3      
+-------------
+ 3.141592657
+
+print v4
+ V4 
+----
+ f
+
+print v5
+                                                  V5                                                  
+------------------------------------------------------------------------------------------------------
+ new value = this is char(100) datatype                                                              
+
+print v6
+                                                  V6                                                  
+------------------------------------------------------------------------------------------------------
+ new value = this is char(100 char) datatype                                                         
+
+print v7
+                                                  V7                                                  
+------------------------------------------------------------------------------------------------------
+ new value = this is char(100 byte) datatype                                                         
+
+print v8
+                                                  V8                                                  
+------------------------------------------------------------------------------------------------------
+ new value = this is nchar(100) datatype                                                             
+
+print v9
+ V9 
+----
+ f
+
+print v10
+                    V10                     
+--------------------------------------------
+ new value = this is varchar2(100) datatype
+
+print v11
+                       V11                       
+-------------------------------------------------
+ new value = this is varchar2(100 char) datatype
+
+print v12
+                       V12                       
+-------------------------------------------------
+ new value = this is varchar2(100 byte) datatype
+
+-- error out of range
+var x char(3 byte) = 'abc'
+print x
+  X  
+-----
+ abc
+
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'abcd';
+raise notice 'new value of :x is %', :x;
+end;
+/
+NOTICE:  old value of :x is abc
+ERROR:  value too long for type char(3 byte)
+CONTEXT:  PL/iSQL assignment ":x := 'abcd'"
+PL/iSQL function inline_code_block line 3 at assignment
+print x
+  X  
+-----
+ abc
+
+var x char(3 char) = '数据库'
+print x
+   X    
+--------
+ 数据库
+
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'IvorySQL社区';
+raise notice 'new value of :x is %', :x;
+end;
+/
+NOTICE:  old value of :x is 数据库
+ERROR:  value too long for type char(3 char)
+CONTEXT:  PL/iSQL assignment ":x := 'IvorySQL社区'"
+PL/iSQL function inline_code_block line 3 at assignment
+print x
+   X    
+--------
+ 数据库
+
+-- catch exception
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'IvorySQL社区';
+EXCEPTION WHEN OTHERS THEN
+	raise notice 'Get an exception and reassign an acceptable value to the bind variable';
+	:x := 'abc';
+raise notice 'new value of :x is %', :x;
+end;
+/
+NOTICE:  old value of :x is 数据库
+NOTICE:  Get an exception and reassign an acceptable value to the bind variable
+NOTICE:  new value of :x is abc
+print x
+  X  
+-----
+ abc
+
+-- Referencing bind variables within non-anonymous block queries
+var x number = 4
+var y char(20) = 'bindvar_test'
+var z char(20) = 'select'
+var m number = 999
+var n char(5) = '888'
+print x
+ X 
+---
+ 4
+
+print y
+          Y           
+----------------------
+ bindvar_test        
+
+print z
+          Z           
+----------------------
+ select              
+
+print m
+  M  
+-----
+ 999
+
+print n
+   N   
+-------
+ 888  
+
+create table bindvar_test(a number);
+insert into bindvar_test values(1);
+insert into bindvar_test values(2);
+insert into bindvar_test values(3);
+insert into bindvar_test values(4);
+insert into bindvar_test values(5);
+select * from bindvar_test;
+ a 
+---
+ 1
+ 2
+ 3
+ 4
+ 5
+(5 rows)
+
+-- ok
+select * from bindvar_test where a = :x;
+ a 
+---
+ 4
+(1 row)
+
+-- ok
+insert into bindvar_test values(:m);
+insert into bindvar_test values(:n);
+select * from bindvar_test;
+  a  
+-----
+ 1
+ 2
+ 3
+ 4
+ 5
+ 999
+ 888
+(7 rows)
+
+-- ok
+delete from bindvar_test where a = :x;
+select * from bindvar_test;
+  a  
+-----
+ 1
+ 2
+ 3
+ 5
+ 999
+ 888
+(6 rows)
+
+-- error, cannot use input host variables to supply SQL keywords or the names of database objects or data definition statements. 
+select * from :y;
+ERROR:  syntax error at or near ":y"
+LINE 1: select * from get_parameter_description('select * from :y;')...
+                      ^
+:z * from bindvar_test;
+ERROR:  syntax error at or near ":z"
+LINE 1: select * from get_parameter_description(':z * from bindvar_t...
+        ^
+drop table :y;
+ERROR:  syntax error at or near ":y"
+LINE 1: select * from get_parameter_description('drop table :y;');
+                   ^
+drop table bindvar_test;
+-- Referencing bind variables in functions or procedures as input or output host variable.
+var x number=10
+var y number=20
+var z char(6)='input'
+CREATE OR REPLACE FUNCTION f_test (x NUMBER, y OUT NUMBER, z OUT char) return int AS
+BEGIN
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+y := x;
+z := 'output';
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+return 999;
+END;
+/
+-- error out within Oracle: ORA-06572: Function F_TEST has out arguments.
+-- error out within IvorySQL: ERROR:  OUT or IN OUT arguments of the function f_test must be variables.
+select f_test(:x, :y, :z) from dual;
+ERROR:  OUT or IN OUT arguments of the function f_test must be variables 
+-- error out within Oracle: ORA-06572: Function F_TEST has out arguments.
+-- IvorySQL can execute successfully. Will be changed in the future?
+select * from f_test(:x, :y, :z);
+INFO:  10
+INFO:  <NULL>
+INFO:  <NULL>
+INFO:  10
+INFO:  10
+INFO:  output
+ _column_2 | _column_3 | _RETVAL_ 
+-----------+-----------+----------
+ 10        | output    |      999
+(1 row)
+
+print x
+ X  
+----
+ 10
+
+print y
+ Y  
+----
+ 10
+
+print z
+   Z    
+--------
+ output
+
+-- CALL statement
+exec :x := 3.14
+exec :z := 'any'
+CREATE OR REPLACE PROCEDURE p_test (x NUMBER, y IN OUT NUMBER, z OUT char) AS
+BEGIN
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+y := x;
+z := 'output';
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+END;
+/
+call p_test(:x, :y, :z);
+INFO:  3.14
+INFO:  10
+INFO:  <NULL>
+INFO:  3.14
+INFO:  3.14
+INFO:  output
+print x
+  X   
+------
+ 3.14
+
+print y
+  Y   
+------
+ 3.14
+
+print z
+   Z    
+--------
+ output
+
+--clean
+drop function f_test;
+drop procedure p_test;
+--
+-- EXECUTE
+--
+var x number;
+print x
+ X 
 ---
  
 
+-- there is not necessarily a space after exec.
+exec:x := 111;
+print x
+  X  
+-----
+ 111
+
+exec:x := 222
+print x
+  X  
+-----
+ 222
+
+exec :x := 333;
+print x
+  X  
+-----
+ 333
+
+exec :x := 444
+print x
+  X  
+-----
+ 444
+
+-- Usage: EXEC[UTE] statement
+exec
+Usage: EXEC[UTE] statement
+execute
+Usage: EXEC[UTE] statement
+/* Comments and whitespace are ignored */exec
+Usage: EXEC[UTE] statement
+/* Comments and whitespace are ignored */ execute
+Usage: EXEC[UTE] statement
+-- An error is reported on overflow
+var x char(3 byte);
+exec :x := 'abc'
+print x
+  X  
+-----
+ abc
+
+exec :x := 'qwer'
+ERROR:  value too long for type char(3 byte)
+CONTEXT:  PL/iSQL assignment ":x := 'qwer'"
+PL/iSQL function inline_code_block line 1 at assignment
+print x
+  X  
+-----
+ abc
+
+var x char(3 char)
+exec :x := '数据库';
+print x
+   X    
+--------
+ 数据库
+
+exec :x := '数据库1';
+ERROR:  value too long for type char(3 char)
+CONTEXT:  PL/iSQL assignment ":x := '数据库1'"
+PL/iSQL function inline_code_block line 1 at assignment
+print x
+   X    
+--------
+ 数据库
+
+var x varchar2(3 byte);
+exec :x := 'abc'
+print x
+  X  
+-----
+ abc
+
+exec :x := 'qwer'
+ERROR:  value too long for type varchar2(3 byte)
+CONTEXT:  PL/iSQL assignment ":x := 'qwer'"
+PL/iSQL function inline_code_block line 1 at assignment
+print x
+  X  
+-----
+ abc
+
+var x varchar2(3 char)
+exec :x := '数据库';
+print x
+   X    
+--------
+ 数据库
+
+exec :x := '数据库1';
+ERROR:  value too long for type varchar2(3 char)
+CONTEXT:  PL/iSQL assignment ":x := '数据库1'"
+PL/iSQL function inline_code_block line 1 at assignment
+print x
+   X    
+--------
+ 数据库
+
+var x number
+exec :x := '3.14'
+print x
+  X   
+------
+ 3.14
+
+exec :x := 'abc'
+ERROR:  invalid input syntax for type numeric: "abc"
+LINE 1: :x := 'abc'
+              ^
+QUERY:  :x := 'abc'
+CONTEXT:  PL/iSQL function inline_code_block line 1 at assignment
+print x
+  X   
+------
+ 3.14
+
+-- host variable not exist
+exec :nohostvar := '123'
+Bind variable "nohostvar" not declared.
diff --git a/src/oracle_test/regress/expected/partition_aggregate.out b/src/oracle_test/regress/expected/partition_aggregate.out
index 24ffad6a0cd..f9d602862f1 100644
--- a/src/oracle_test/regress/expected/partition_aggregate.out
+++ b/src/oracle_test/regress/expected/partition_aggregate.out
@@ -335,6 +335,37 @@ SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
  2
 (3 rows)
 
+-- Test partitionwise aggregation with ordered append path built from fractional paths
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Limit
+   ->  Merge Append
+         Sort Key: pagg_tab.c
+         ->  GroupAggregate
+               Group Key: pagg_tab.c
+               ->  Sort
+                     Sort Key: pagg_tab.c
+                     ->  Seq Scan on pagg_tab_p1 pagg_tab
+         ->  GroupAggregate
+               Group Key: pagg_tab_1.c
+               ->  Sort
+                     Sort Key: pagg_tab_1.c
+                     ->  Seq Scan on pagg_tab_p2 pagg_tab_1
+         ->  GroupAggregate
+               Group Key: pagg_tab_2.c
+               ->  Sort
+                     Sort Key: pagg_tab_2.c
+                     ->  Seq Scan on pagg_tab_p3 pagg_tab_2
+(18 rows)
+
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+ count 
+-------
+   250
+(1 row)
+
 RESET enable_hashagg;
 -- ROLLUP, partitionwise aggregation does not apply
 EXPLAIN (COSTS OFF)
diff --git a/src/oracle_test/regress/expected/partition_prune.out b/src/oracle_test/regress/expected/partition_prune.out
index b0478ef9ccf..627578d92b6 100644
--- a/src/oracle_test/regress/expected/partition_prune.out
+++ b/src/oracle_test/regress/expected/partition_prune.out
@@ -1,6 +1,7 @@
 --
 -- Test partitioning planner code
 --
+\set EXECUTE_RUN_PREPARE on
 -- Helper function which can be used for masking out portions of EXPLAIN
 -- ANALYZE which could contain information that's not consistent on all
 -- platforms.
@@ -4703,3 +4704,135 @@ select min(a) over (partition by a order by a) from part_abc where a >= stable_o
 
 drop view part_abc_view;
 drop table part_abc;
+--
+-- Check that operands wrapped in PlaceHolderVars are matched to partition
+-- keys, allowing partition pruning to occur.  PlaceHolderVars can be
+-- introduced when a subquery's output is used with grouping sets.
+--
+create table phv_part (a int, b text) partition by list (a);
+create table phv_part_1 partition of phv_part for values in (1);
+create table phv_part_2 partition of phv_part for values in (2);
+create table phv_part_null partition of phv_part for values in (null);
+insert into phv_part values (1, 'one'), (2, 'two'), (null, 'null');
+-- OpExpr: PHV-wrapped operand matched via equal()
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+              QUERY PLAN               
+---------------------------------------
+ MixedAggregate
+   Hash Key: phv_part.b
+   Group Key: phv_part.a
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (a = 1)
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- OpExpr with RelabelType: PHV wrapped around a casted column
+explain (costs off)
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+                    QUERY PLAN                     
+---------------------------------------------------
+ HashAggregate
+   Hash Key: (phv_part.a)::oid
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (((a)::oid)::pg_catalog.int4 = 1)
+(5 rows)
+
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+ x |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- ScalarArrayOpExpr: IN clause with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ HashAggregate
+   Hash Key: phv_part.a
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (a = ANY ('{1,NULL}'::pg_catalog.int4[]))
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- NullTest: IS NULL with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+                QUERY PLAN                
+------------------------------------------
+ HashAggregate
+   Hash Key: phv_part.a
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_null phv_part
+         Filter: (a IS NULL)
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+ a |  b   
+---+------
+   | 
+   | null
+(2 rows)
+
+drop table phv_part;
+-- BooleanTest: IS TRUE with PHV-wrapped boolean partition key
+create table phv_boolpart (a bool, b text) partition by list (a);
+create table phv_boolpart_t partition of phv_boolpart for values in (true);
+create table phv_boolpart_f partition of phv_boolpart for values in (false);
+create table phv_boolpart_null partition of phv_boolpart default;
+insert into phv_boolpart values (true, 'yes'), (false, 'no'), (null, 'unknown');
+explain (costs off)
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+                  QUERY PLAN                   
+-----------------------------------------------
+ HashAggregate
+   Hash Key: phv_boolpart.a
+   Hash Key: phv_boolpart.b
+   ->  Seq Scan on phv_boolpart_t phv_boolpart
+         Filter: (a IS TRUE)
+(5 rows)
+
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ t | 
+   | yes
+(2 rows)
+
+drop table phv_boolpart;
diff --git a/src/oracle_test/regress/expected/password_2.out b/src/oracle_test/regress/expected/password_2.out
new file mode 100644
index 00000000000..ea1fc7a083c
--- /dev/null
+++ b/src/oracle_test/regress/expected/password_2.out
@@ -0,0 +1,168 @@
+--
+-- Tests for password types
+--
+-- Tests for GUC password_encryption
+SET password_encryption = 'novalue'; -- error
+ERROR:  invalid value for parameter "password_encryption": "novalue"
+HINT:  Available values: md5, scram-sha-256.
+SET password_encryption = true; -- error
+ERROR:  invalid value for parameter "password_encryption": "true"
+HINT:  Available values: md5, scram-sha-256.
+SET password_encryption = 'md5'; -- ok
+SET password_encryption = 'scram-sha-256'; -- ok
+-- consistency of password entries
+SET password_encryption = 'md5';
+CREATE ROLE regress_passwd1;
+ALTER ROLE regress_passwd1 PASSWORD 'role_pwd1';
+ERROR:  password encryption failed: disabled for FIPS
+CREATE ROLE regress_passwd2;
+ALTER ROLE regress_passwd2 PASSWORD 'role_pwd2';
+ERROR:  password encryption failed: disabled for FIPS
+SET password_encryption = 'scram-sha-256';
+CREATE ROLE regress_passwd3 PASSWORD 'role_pwd3';
+CREATE ROLE regress_passwd4 PASSWORD NULL;
+-- check list of created entries
+--
+-- The scram secret will look something like:
+-- SCRAM-SHA-256$4096:E4HxLGtnRzsYwg==$6YtlR4t69SguDiwFvbVgVZtuz6gpJQQqUMZ7IQJK5yI=:ps75jrHeYU4lXCcXI4O8oIdJ3eO8o2jirjruw9phBTo=
+--
+-- Since the salt is random, the exact value stored will be different on every test
+-- run. Use a regular expression to mask the changing parts.
+SELECT rolname, regexp_replace(rolpassword, '(SCRAM-SHA-256)\$(\d+):([a-zA-Z0-9+/=]+)\$([a-zA-Z0-9+=/]+):([a-zA-Z0-9+/=]+)', '\1$\2:<salt>$<storedkey>:<serverkey>') as rolpassword_masked
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+     rolname     |                rolpassword_masked                 
+-----------------+---------------------------------------------------
+ regress_passwd1 | 
+ regress_passwd2 | 
+ regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd4 | 
+(4 rows)
+
+-- Rename a role
+ALTER ROLE regress_passwd2 RENAME TO regress_passwd2_new;
+-- md5 entry should have been removed
+SELECT rolname, rolpassword
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd2_new'
+    ORDER BY rolname, rolpassword;
+       rolname       | rolpassword 
+---------------------+-------------
+ regress_passwd2_new | 
+(1 row)
+
+ALTER ROLE regress_passwd2_new RENAME TO regress_passwd2;
+-- Change passwords with ALTER USER. With plaintext or already-encrypted
+-- passwords.
+SET password_encryption = 'md5';
+-- encrypt with MD5
+ALTER ROLE regress_passwd2 PASSWORD 'foo';
+ERROR:  password encryption failed: disabled for FIPS
+-- already encrypted, use as they are
+ALTER ROLE regress_passwd1 PASSWORD 'md5cd3578025fe2c3d7ed1b9a9b26238b70';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+ALTER ROLE regress_passwd3 PASSWORD 'SCRAM-SHA-256$4096:VLK4RMaQLCvNtQ==$6YtlR4t69SguDiwFvbVgVZtuz6gpJQQqUMZ7IQJK5yI=:ps75jrHeYU4lXCcXI4O8oIdJ3eO8o2jirjruw9phBTo=';
+SET password_encryption = 'scram-sha-256';
+-- create SCRAM secret
+ALTER ROLE  regress_passwd4 PASSWORD 'foo';
+-- already encrypted with MD5, use as it is
+CREATE ROLE regress_passwd5 PASSWORD 'md5e73a4b11df52a6068f8b39f90be36023';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+-- This looks like a valid SCRAM-SHA-256 secret, but it is not
+-- so it should be hashed with SCRAM-SHA-256.
+CREATE ROLE regress_passwd6 PASSWORD 'SCRAM-SHA-256$1234';
+-- These may look like valid MD5 secrets, but they are not, so they
+-- should be hashed with SCRAM-SHA-256.
+-- trailing garbage at the end
+CREATE ROLE regress_passwd7 PASSWORD 'md5012345678901234567890123456789zz';
+-- invalid length
+CREATE ROLE regress_passwd8 PASSWORD 'md501234567890123456789012345678901zz';
+-- Changing the SCRAM iteration count
+SET scram_iterations = 1024;
+CREATE ROLE regress_passwd9 PASSWORD 'alterediterationcount';
+SELECT rolname, regexp_replace(rolpassword, '(SCRAM-SHA-256)\$(\d+):([a-zA-Z0-9+/=]+)\$([a-zA-Z0-9+=/]+):([a-zA-Z0-9+/=]+)', '\1$\2:<salt>$<storedkey>:<serverkey>') as rolpassword_masked
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+     rolname     |                rolpassword_masked                 
+-----------------+---------------------------------------------------
+ regress_passwd1 | md5cd3578025fe2c3d7ed1b9a9b26238b70
+ regress_passwd2 | 
+ regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd5 | md5e73a4b11df52a6068f8b39f90be36023
+ regress_passwd6 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd7 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd8 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd9 | SCRAM-SHA-256$1024:<salt>$<storedkey>:<serverkey>
+(9 rows)
+
+-- An empty password is not allowed, in any form
+CREATE ROLE regress_passwd_empty PASSWORD '';
+NOTICE:  empty string is not a valid password, clearing password
+ALTER ROLE regress_passwd_empty PASSWORD 'md585939a5ce845f1a1b620742e3c659e0a';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+ALTER ROLE regress_passwd_empty PASSWORD 'SCRAM-SHA-256$4096:hpFyHTUsSWcR7O9P$LgZFIt6Oqdo27ZFKbZ2nV+vtnYM995pDh9ca6WSi120=:qVV5NeluNfUPkwm7Vqat25RjSPLkGeoZBQs6wVv+um4=';
+NOTICE:  empty string is not a valid password, clearing password
+SELECT rolpassword FROM pg_authid WHERE rolname='regress_passwd_empty';
+ rolpassword 
+-------------
+ 
+(1 row)
+
+-- Test with invalid stored and server keys.
+--
+-- The first is valid, to act as a control. The others have too long
+-- stored/server keys. They will be re-hashed.
+CREATE ROLE regress_passwd_sha_len0 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96Rqw=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZI=';
+CREATE ROLE regress_passwd_sha_len1 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96RqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZI=';
+CREATE ROLE regress_passwd_sha_len2 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96Rqw=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=';
+-- Check that the invalid secrets were re-hashed. A re-hashed secret
+-- should not contain the original salt.
+SELECT rolname, rolpassword not like '%A6xHKoH/494E941doaPOYg==%' as is_rolpassword_rehashed
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd_sha_len%'
+    ORDER BY rolname;
+         rolname         | is_rolpassword_rehashed 
+-------------------------+-------------------------
+ regress_passwd_sha_len0 | f
+ regress_passwd_sha_len1 | t
+ regress_passwd_sha_len2 | t
+(3 rows)
+
+-- Test that valid hashes that are too long are rejected
+CREATE ROLE regress_passwd10 PASSWORD 'SCRAM-SHA-256$000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004096:wNFxNSk1hAXBkgub8py3bg==$65zC6E+R0U7tiYTC9+Wtq4Thw6gUDj3eDCINij8TflU=:rC1I7tcVugrHEY2DT0iPjGyjM4aJxkMM9n8WBxtUtHU=';
+ERROR:  encrypted password is too long
+DETAIL:  Encrypted passwords must be no longer than 512 bytes.
+ALTER ROLE regress_passwd9 PASSWORD 'SCRAM-SHA-256$000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004096:wNFxNSk1hAXBkgub8py3bg==$65zC6E+R0U7tiYTC9+Wtq4Thw6gUDj3eDCINij8TflU=:rC1I7tcVugrHEY2DT0iPjGyjM4aJxkMM9n8WBxtUtHU=';
+ERROR:  encrypted password is too long
+DETAIL:  Encrypted passwords must be no longer than 512 bytes.
+DROP ROLE regress_passwd1;
+DROP ROLE regress_passwd2;
+DROP ROLE regress_passwd3;
+DROP ROLE regress_passwd4;
+DROP ROLE regress_passwd5;
+DROP ROLE regress_passwd6;
+DROP ROLE regress_passwd7;
+DROP ROLE regress_passwd8;
+DROP ROLE regress_passwd9;
+DROP ROLE regress_passwd_empty;
+DROP ROLE regress_passwd_sha_len0;
+DROP ROLE regress_passwd_sha_len1;
+DROP ROLE regress_passwd_sha_len2;
+-- all entries should have been removed
+SELECT rolname, rolpassword
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+ rolname | rolpassword 
+---------+-------------
+(0 rows)
+
diff --git a/src/oracle_test/regress/expected/plancache.out b/src/oracle_test/regress/expected/plancache.out
index 425bbd42029..f45c161e2ab 100644
--- a/src/oracle_test/regress/expected/plancache.out
+++ b/src/oracle_test/regress/expected/plancache.out
@@ -1,6 +1,7 @@
 --
 -- Tests to exercise the plan caching/invalidation mechanism
 --
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
 -- create and use a cached plan
diff --git a/src/oracle_test/regress/expected/portals.out b/src/oracle_test/regress/expected/portals.out
index aeef9295275..fe019c3f827 100644
--- a/src/oracle_test/regress/expected/portals.out
+++ b/src/oracle_test/regress/expected/portals.out
@@ -1,6 +1,7 @@
 --
 -- Cursor regression tests
 --
+\set EXECUTE_RUN_PREPARE on
 BEGIN;
 DECLARE foo1 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo2 SCROLL CURSOR FOR SELECT * FROM tenk2;
@@ -1339,6 +1340,17 @@ FETCH FROM c1;
 DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
 ERROR:  WHERE CURRENT OF on a view is not implemented
 ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+ f1 |  f2   
+----+-------
+ 13 | three
+(1 row)
+
+UPDATE ucview SET f1 = f1 + 10 WHERE CURRENT OF c1; -- fail, views not supported
+ERROR:  WHERE CURRENT OF on a view is not implemented
+ROLLBACK;
 -- Check WHERE CURRENT OF with an index-only scan
 BEGIN;
 EXPLAIN (costs off)
diff --git a/src/oracle_test/regress/expected/prepare.out b/src/oracle_test/regress/expected/prepare.out
index 939dacefae5..e7325188a88 100644
--- a/src/oracle_test/regress/expected/prepare.out
+++ b/src/oracle_test/regress/expected/prepare.out
@@ -1,6 +1,7 @@
 -- Regression tests for prepareable statements. We query the content
 -- of the pg_prepared_statements view as prepared statements are
 -- created and removed.
+\set EXECUTE_RUN_PREPARE on
 SELECT name, statement, parameter_types, result_types FROM pg_prepared_statements;
  name | statement | parameter_types | result_types 
 ------+-----------+-----------------+--------------
diff --git a/src/oracle_test/regress/expected/prepared_xacts.out b/src/oracle_test/regress/expected/prepared_xacts.out
index 47cc5bd959e..6ba4cb41ab6 100644
--- a/src/oracle_test/regress/expected/prepared_xacts.out
+++ b/src/oracle_test/regress/expected/prepared_xacts.out
@@ -1,3 +1,7 @@
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 --
 -- PREPARED TRANSACTIONS (two-phase commit)
 --
@@ -263,8 +267,37 @@ SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
 -----
 (0 rows)
 
+-- Test row-level locks held by prepared transactions
+CREATE TABLE pxtest_rowlock (id int PRIMARY KEY, data text);
+INSERT INTO pxtest_rowlock VALUES (1, 'test data');
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+ id |   data    
+----+-----------
+  1 | test data
+(1 row)
+
+PREPARE TRANSACTION 'regress_p1';
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+ERROR:  could not obtain lock on row in relation "pxtest_rowlock"
+-- Test prepared transactions that participate in multixacts. For
+-- that, lock the same row again, creating a multixid.
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+ id |   data    
+----+-----------
+  1 | test data
+(1 row)
+
+PREPARE TRANSACTION 'regress_p2';
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+ERROR:  could not obtain lock on row in relation "pxtest_rowlock"
+ROLLBACK PREPARED 'regress_p1';
+ROLLBACK PREPARED 'regress_p2';
 -- Clean up
 DROP TABLE pxtest2;
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
-ERROR:  table "pxtest3" does not exist
+-- pxtest3 was already dropped
 DROP TABLE pxtest4;
+DROP TABLE pxtest_rowlock;
diff --git a/src/oracle_test/regress/expected/prepared_xacts_1.out b/src/oracle_test/regress/expected/prepared_xacts_1.out
index 6ad3d11898a..a21314768c3 100644
--- a/src/oracle_test/regress/expected/prepared_xacts_1.out
+++ b/src/oracle_test/regress/expected/prepared_xacts_1.out
@@ -1,266 +1,3 @@
---
--- PREPARED TRANSACTIONS (two-phase commit)
---
--- We can't readily test persistence of prepared xacts within the
--- regression script framework, unfortunately.  Note that a crash
--- isn't really needed ... stopping and starting the postmaster would
--- be enough, but we can't even do that here.
--- create a simple table that we'll use in the tests
-CREATE TABLE pxtest1 (foobar VARCHAR(10));
-INSERT INTO pxtest1 VALUES ('aaa');
--- Test PREPARE TRANSACTION
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'bbb' WHERE foobar = 'aaa';
-SELECT * FROM pxtest1;
- foobar 
---------
- bbb
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo1';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test pg_prepared_xacts system view
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Test ROLLBACK PREPARED
-ROLLBACK PREPARED 'regress_foo1';
-ERROR:  prepared transaction with identifier "regress_foo1" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Test COMMIT PREPARED
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-INSERT INTO pxtest1 VALUES ('ddd');
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
- ddd
-(2 rows)
-
-PREPARE TRANSACTION 'regress_foo2';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-COMMIT PREPARED 'regress_foo2';
-ERROR:  prepared transaction with identifier "regress_foo2" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test duplicate gids
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo3';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-INSERT INTO pxtest1 VALUES ('fff');
--- This should fail, because the gid foo3 is already in use
-PREPARE TRANSACTION 'regress_foo3';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-ROLLBACK PREPARED 'regress_foo3';
-ERROR:  prepared transaction with identifier "regress_foo3" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test serialization failure (SSI)
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo4';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- This should fail, because the two transactions have a write-skew anomaly
-INSERT INTO pxtest1 VALUES ('fff');
-PREPARE TRANSACTION 'regress_foo5';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-ROLLBACK PREPARED 'regress_foo4';
-ERROR:  prepared transaction with identifier "regress_foo4" does not exist
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Clean up
-DROP TABLE pxtest1;
--- Test detection of session-level and xact-level locks on same object
-BEGIN;
-SELECT pg_advisory_lock(1);
- pg_advisory_lock 
-------------------
- 
-(1 row)
-
-SELECT pg_advisory_xact_lock_shared(1);
- pg_advisory_xact_lock_shared 
-------------------------------
- 
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo6';  -- fails
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
--- Test subtransactions
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-  CREATE TABLE pxtest2 (a int);
-  INSERT INTO pxtest2 VALUES (1);
-  SAVEPOINT a;
-    INSERT INTO pxtest2 VALUES (2);
-  ROLLBACK TO a;
-  SAVEPOINT b;
-  INSERT INTO pxtest2 VALUES (3);
-PREPARE TRANSACTION 'regress_sub1';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-CREATE TABLE pxtest3(fff int);
--- Test shared invalidation
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-  DROP TABLE pxtest3;
-  CREATE TABLE pxtest4 (a int);
-  INSERT INTO pxtest4 VALUES (1);
-  INSERT INTO pxtest4 VALUES (2);
-  DECLARE foo CURSOR FOR SELECT * FROM pxtest4;
-  -- Fetch 1 tuple, keeping the cursor open
-  FETCH 1 FROM foo;
- a 
----
- 1
-(1 row)
-
-PREPARE TRANSACTION 'regress_sub2';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
--- No such cursor
-FETCH 1 FROM foo;
-ERROR:  cursor "foo" does not exist
--- Table doesn't exist, the creation hasn't been committed yet
-SELECT * FROM pxtest2;
-ERROR:  relation "pxtest2" does not exist
-LINE 1: SELECT * FROM pxtest2;
-                      ^
--- There should be two prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- pxtest3 should be locked because of the pending DROP
-begin;
-lock table pxtest3 in access share mode nowait;
-rollback;
--- Disconnect, we will continue testing in a different backend
-\c -
--- There should still be two prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- pxtest3 should still be locked because of the pending DROP
-begin;
-lock table pxtest3 in access share mode nowait;
-rollback;
--- Commit table creation
-COMMIT PREPARED 'regress_sub1';
-ERROR:  prepared transaction with identifier "regress_sub1" does not exist
-\d pxtest2
-SELECT * FROM pxtest2;
-ERROR:  relation "pxtest2" does not exist
-LINE 1: SELECT * FROM pxtest2;
-                      ^
--- There should be one prepared transaction
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Commit table drop
-COMMIT PREPARED 'regress_sub2';
-ERROR:  prepared transaction with identifier "regress_sub2" does not exist
-SELECT * FROM pxtest3;
- fff 
------
-(0 rows)
-
--- There should be no prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Clean up
-DROP TABLE pxtest2;
-ERROR:  table "pxtest2" does not exist
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
-DROP TABLE pxtest4;
-ERROR:  table "pxtest4" does not exist
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/oracle_test/regress/expected/privileges.out b/src/oracle_test/regress/expected/privileges.out
index 4abf27f66e3..61750fc9d0d 100644
--- a/src/oracle_test/regress/expected/privileges.out
+++ b/src/oracle_test/regress/expected/privileges.out
@@ -113,36 +113,6 @@ CREATE USER regress_priv_user2;
 CREATE USER regress_priv_user3;
 CREATE USER regress_priv_user4;
 CREATE USER regress_priv_user5;
--- DROP OWNED should also act on granted and granted-to roles
-GRANT regress_priv_user1 TO regress_priv_user2;
-GRANT regress_priv_user2 TO regress_priv_user3;
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-       roleid       |       member       
---------------------+--------------------
- regress_priv_user1 | regress_priv_user2
- regress_priv_user2 | regress_priv_user3
-(2 rows)
-
-REASSIGN OWNED BY regress_priv_user2 TO regress_priv_user4;  -- no effect
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-       roleid       |       member       
---------------------+--------------------
- regress_priv_user1 | regress_priv_user2
- regress_priv_user2 | regress_priv_user3
-(2 rows)
-
-DROP OWNED BY regress_priv_user2;  -- removes both grants
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
- roleid | member 
---------+--------
-(0 rows)
-
 GRANT pg_read_all_data TO regress_priv_user6;
 GRANT pg_write_all_data TO regress_priv_user7;
 GRANT pg_read_all_settings TO regress_priv_user8 WITH ADMIN OPTION;
@@ -514,8 +484,6 @@ CREATE VIEW atest12v AS
   SELECT * FROM atest12 WHERE b <<< 5;
 CREATE VIEW atest12sbv WITH (security_barrier=true) AS
   SELECT * FROM atest12 WHERE b <<< 5;
-GRANT SELECT ON atest12v TO PUBLIC;
-GRANT SELECT ON atest12sbv 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                    
@@ -562,9 +530,18 @@ CREATE FUNCTION leak2(integer,integer) RETURNS boolean
 /
 CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
                      restrict = scalargtsel);
--- This should not show any "leak" notices before failing.
+-- These should not show any "leak" notices before failing.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
 ERROR:  permission denied for table atest12
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v WHERE a >>> 0;
+ERROR:  permission denied for view atest12v
+EXPLAIN (COSTS OFF) SELECT * FROM atest12sbv WHERE a >>> 0;
+ERROR:  permission denied for view atest12sbv
+-- Now regress_priv_user1 grants access to regress_priv_user2 via the views.
+SET SESSION AUTHORIZATION regress_priv_user1;
+GRANT SELECT ON atest12v TO PUBLIC;
+GRANT SELECT ON atest12sbv TO PUBLIC;
+SET SESSION AUTHORIZATION regress_priv_user2;
 -- These plans should continue to use a nestloop, since they execute with the
 -- privileges of the view owner.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
@@ -2594,6 +2571,26 @@ SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 	'SELECT, fake_privilege', FALSE);  -- error
 ERROR:  unrecognized privilege type: "fake_privilege"
+-- Test quoting and dequoting of user names in ACLs
+CREATE ROLE "regress_""quoted";
+SELECT makeaclitem('regress_"quoted'::regrole, 'regress_"quoted'::regrole,
+                   'SELECT', TRUE);
+               makeaclitem                
+------------------------------------------
+ "regress_""quoted"=r*/"regress_""quoted"
+(1 row)
+
+SELECT '"regress_""quoted"=r*/"regress_""quoted"'::aclitem;
+                 aclitem                  
+------------------------------------------
+ "regress_""quoted"=r*/"regress_""quoted"
+(1 row)
+
+SELECT '""=r*/""'::aclitem;  -- used to be misparsed as """"
+ERROR:  a name must follow the "/" sign
+LINE 1: SELECT '""=r*/""'::aclitem;
+               ^
+DROP ROLE "regress_""quoted";
 -- Test non-throwing aclitem I/O
 SELECT pg_input_is_valid('regress_priv_user1=r/regress_priv_user2', 'aclitem');
  pg_input_is_valid 
@@ -3158,6 +3155,11 @@ DROP USER regress_priv_user6;
 DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 ERROR:  role "regress_priv_user8" does not exist
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE USAGE ON TYPES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE USAGE ON TYPES FROM pg_read_all_settings;
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);
diff --git a/src/oracle_test/regress/expected/psql.out b/src/oracle_test/regress/expected/psql.out
index bec4051903e..e7ce5f00848 100644
--- a/src/oracle_test/regress/expected/psql.out
+++ b/src/oracle_test/regress/expected/psql.out
@@ -2,6 +2,7 @@
 -- Tests for psql features that aren't closely connected to any
 -- specific server features
 --
+\set EXECUTE_RUN_PREPARE on
 -- \set
 -- fail: invalid name
 \set invalid/name foo
@@ -4681,6 +4682,7 @@ invalid command \lo
 	\pset arg1 arg2
 	\q
 	\reset
+	\restrict test
 	\s arg1
 	\sendpipeline
 	\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
@@ -4692,6 +4694,7 @@ invalid command \lo
 	\t arg1
 	\T arg1
 	\timing arg1
+	\unrestrict not_valid
 	\unset arg1
 	\w arg1
 	\watch arg1 arg2
diff --git a/src/oracle_test/regress/expected/publication.out b/src/oracle_test/regress/expected/publication.out
index 50179c91ec1..6123bcbb6e3 100644
--- a/src/oracle_test/regress/expected/publication.out
+++ b/src/oracle_test/regress/expected/publication.out
@@ -36,6 +36,9 @@ LINE 1: ...pub_xxx WITH (publish_generated_columns = stored, publish_ge...
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = foo);
 ERROR:  invalid value for publication parameter "publish_generated_columns": "foo"
 DETAIL:  Valid values are "none" and "stored".
+CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns);
+ERROR:  invalid value for publication parameter "publish_generated_columns": ""
+DETAIL:  Valid values are "none" and "stored".
 \dRp
                                                         List of publications
         Name        |          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root 
@@ -1846,8 +1849,7 @@ DROP SCHEMA sch1 cascade;
 DROP SCHEMA sch2 cascade;
 -- ======================================================
 -- Test the 'publish_generated_columns' parameter with the following values:
--- 'stored', 'none', and the default (no value specified), which defaults to
--- 'stored'.
+-- 'stored', 'none'.
 SET client_min_messages = 'ERROR';
 CREATE PUBLICATION pub1 FOR ALL TABLES WITH (publish_generated_columns = stored);
 \dRp+ pub1
@@ -1865,17 +1867,8 @@ CREATE PUBLICATION pub2 FOR ALL TABLES WITH (publish_generated_columns = none);
  regress_publication_user | t          | t       | t       | t       | t         | none              | f
 (1 row)
 
-CREATE PUBLICATION pub3 FOR ALL TABLES WITH (publish_generated_columns);
-\dRp+ pub3
-                                                Publication pub3
-          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root 
---------------------------+------------+---------+---------+---------+-----------+-------------------+----------
- regress_publication_user | t          | t       | t       | t       | t         | stored            | f
-(1 row)
-
 DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
-DROP PUBLICATION pub3;
 -- Test the 'publish_generated_columns' parameter as 'none' and 'stored' for
 -- different scenarios with/without generated columns in column lists.
 CREATE TABLE gencols (a int, gen1 int GENERATED ALWAYS AS (a * 2) STORED);
@@ -1933,6 +1926,85 @@ DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
 DROP TABLE gencols;
 RESET client_min_messages;
+-- Test that the INSERT ON CONFLICT command correctly checks REPLICA IDENTITY
+-- when the target table is published.
+CREATE TABLE testpub_insert_onconfl_no_ri (a int unique, b int);
+CREATE TABLE testpub_insert_onconfl_parted (a int unique, b int) PARTITION by RANGE (a);
+CREATE TABLE testpub_insert_onconfl_part_no_ri PARTITION OF testpub_insert_onconfl_parted FOR VALUES FROM (1) TO (10);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+-- fail - missing REPLICA IDENTITY
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+ERROR:  cannot update table "testpub_insert_onconfl_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT DO NOTHING;
+-- fail - missing REPLICA IDENTITY in partition testpub_insert_onconfl_no_ri
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+ERROR:  cannot update table "testpub_insert_onconfl_part_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT DO NOTHING;
+DROP PUBLICATION pub1;
+DROP TABLE testpub_insert_onconfl_no_ri;
+DROP TABLE testpub_insert_onconfl_parted;
+-- Test that the MERGE command correctly checks REPLICA IDENTITY when the
+-- target table is published.
+CREATE TABLE testpub_merge_no_ri (a int, b int);
+CREATE TABLE testpub_merge_pk (a int primary key, b int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN UPDATE SET b = s.b;
+ERROR:  cannot update table "testpub_merge_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DELETE;
+ERROR:  syntax error at or near "DELETE"
+LINE 2:  WHEN MATCHED THEN DELETE;
+                           ^
+-- ok - insert and do nothing are not restricted
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DO NOTHING
+ WHEN NOT MATCHED THEN INSERT (a, b) VALUES (0, 0);
+ERROR:  syntax error at or near "DO"
+LINE 2:  WHEN MATCHED THEN DO NOTHING
+                           ^
+-- ok - REPLICA IDENTITY is DEFAULT and table has a PK
+MERGE INTO testpub_merge_pk USING testpub_merge_no_ri s ON s.a >= 1
+ WHEN MATCHED AND s.a > 0 THEN UPDATE SET b = s.b
+ WHEN MATCHED THEN DELETE;
+ERROR:  syntax error at or near "AND"
+LINE 2:  WHEN MATCHED AND s.a > 0 THEN UPDATE SET b = s.b
+                      ^
+DROP PUBLICATION pub1;
+DROP TABLE testpub_merge_no_ri;
+DROP TABLE testpub_merge_pk;
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_publication_user, regress_publication_user2;
 DROP ROLE regress_publication_user_dummy;
+-- stage objects for pg_dump tests
+CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int);
+CREATE SCHEMA pubme2 CREATE TABLE t0 (c int, d int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION dump_pub_qual_1ct FOR
+  TABLE ONLY pubme.t0 (c, d) WHERE (c > 0);
+CREATE PUBLICATION dump_pub_qual_2ct FOR
+  TABLE ONLY pubme.t0 (c) WHERE (c > 0),
+  TABLE ONLY pubme.t1 (c);
+CREATE PUBLICATION dump_pub_nsp_1ct FOR
+  TABLES IN SCHEMA pubme;
+CREATE PUBLICATION dump_pub_nsp_2ct FOR
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2;
+CREATE PUBLICATION dump_pub_all FOR
+  TABLE ONLY pubme.t0,
+  TABLE ONLY pubme.t1 WHERE (c < 0),
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2
+  WITH (publish_via_partition_root = true);
+RESET client_min_messages;
diff --git a/src/oracle_test/regress/expected/rowsecurity.out b/src/oracle_test/regress/expected/rowsecurity.out
index e48f2b32b0c..25c76c4e722 100644
--- a/src/oracle_test/regress/expected/rowsecurity.out
+++ b/src/oracle_test/regress/expected/rowsecurity.out
@@ -1,6 +1,7 @@
 --
 -- Test of Row-level security feature
 --
+\set EXECUTE_RUN_PREPARE on
 -- Clean up in case a prior regression run failed
 -- Suppress NOTICE messages when users/groups don't exist
 SET client_min_messages TO 'warning';
@@ -4486,7 +4487,7 @@ RESET SESSION AUTHORIZATION;
 DROP VIEW rls_view;
 DROP TABLE rls_tbl;
 DROP TABLE ref_tbl;
--- Leaky operator test
+-- Leaky operator tests
 CREATE TABLE rls_tbl (a int);
 INSERT INTO rls_tbl SELECT x/10 FROM generate_series(1, 100) x;
 ANALYZE rls_tbl;
@@ -4511,9 +4512,80 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_tbl WHERE a <<< 1000 or a <<< 900;
    One-Time Filter: false
 (2 rows)
 
+RESET SESSION AUTHORIZATION;
+CREATE TABLE rls_child_tbl () INHERITS (rls_tbl);
+INSERT INTO rls_child_tbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_child_tbl;
+CREATE TABLE rls_ptbl (a int) PARTITION BY RANGE (a);
+CREATE TABLE rls_part PARTITION OF rls_ptbl FOR VALUES FROM (-100) TO (100);
+INSERT INTO rls_ptbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_ptbl, rls_part;
+ALTER TABLE rls_ptbl ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_part ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_ptbl TO regress_rls_alice;
+GRANT SELECT ON rls_part TO regress_rls_alice;
+CREATE POLICY p1 ON rls_tbl USING (a < 0);
+CREATE POLICY p2 ON rls_ptbl USING (a < 0);
+CREATE POLICY p3 ON rls_part USING (a < 0);
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+ERROR:  permission denied for table rls_child_tbl
+SELECT * FROM rls_ptbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM rls_part WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+ERROR:  permission denied for table rls_child_tbl
+RESET SESSION AUTHORIZATION;
+REVOKE SELECT ON rls_tbl FROM regress_rls_alice;
+CREATE VIEW rls_tbl_view AS SELECT * FROM rls_tbl;
+ALTER TABLE rls_child_tbl ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_child_tbl TO regress_rls_alice;
+CREATE POLICY p4 ON rls_child_tbl USING (a < 0);
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+ERROR:  permission denied for table rls_tbl
+SELECT * FROM rls_tbl_view WHERE a <<< 1000;
+ERROR:  permission denied for view rls_tbl_view
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+ERROR:  permission denied for table rls_tbl
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
+DROP TABLE rls_part;
+DROP TABLE rls_ptbl;
+DROP TABLE rls_child_tbl;
+DROP VIEW rls_tbl_view;
 DROP TABLE rls_tbl;
 -- Bug #16006: whole-row Vars in a policy don't play nice with sub-selects
 SET SESSION AUTHORIZATION regress_rls_alice;
diff --git a/src/oracle_test/regress/expected/select_parallel.out b/src/oracle_test/regress/expected/select_parallel.out
index 07201ecdc86..cf931c1e41d 100644
--- a/src/oracle_test/regress/expected/select_parallel.out
+++ b/src/oracle_test/regress/expected/select_parallel.out
@@ -1,6 +1,7 @@
 --
 -- PARALLEL
 --
+\set EXECUTE_RUN_PREPARE on
 -- Save parallel worker stats, used for comparison at the end
 select pg_stat_force_next_flush();
  pg_stat_force_next_flush 
diff --git a/src/oracle_test/regress/expected/select_views.out b/src/oracle_test/regress/expected/select_views.out
index 8fa35420ec6..12833e91213 100644
--- a/src/oracle_test/regress/expected/select_views.out
+++ b/src/oracle_test/regress/expected/select_views.out
@@ -2,6 +2,7 @@
 -- SELECT_VIEWS
 -- test the views defined in CREATE_VIEWS
 --
+\set EXECUTE_RUN_PREPARE on
 SELECT * FROM street;
                 name                |                                                                                                                                                                                                                   thepath                                                                                                                                                                                                                    |   cname   
 ------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------
diff --git a/src/oracle_test/regress/expected/sqljson_queryfuncs.out b/src/oracle_test/regress/expected/sqljson_queryfuncs.out
index df1d4dee559..be84e68227d 100644
--- a/src/oracle_test/regress/expected/sqljson_queryfuncs.out
+++ b/src/oracle_test/regress/expected/sqljson_queryfuncs.out
@@ -1305,6 +1305,10 @@ SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a' WITH WRAPPER);
  [123]
 (1 row)
 
+SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || NULL)::date WITH WRAPPER);
+ERROR:  JSON path expression must be of type jsonpath, not of type date
+LINE 1: SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || ...
+                                               ^
 -- Should fail (invalid path)
 SELECT JSON_QUERY(jsonb '{"a": 123}', 'error' || ' ' || 'error');
 ERROR:  syntax error at or near " " of jsonpath input
@@ -1329,6 +1333,10 @@ SELECT json_value('"aaa"', path RETURNING json) FROM jsonpaths;
  "aaa"
 (1 row)
 
+SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM jsonpaths;
+ERROR:  JSON path expression must be of type jsonpath, not of type jsonpaths
+LINE 1: SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM js...
+                                   ^
 -- Test PASSING argument parsing
 SELECT JSON_QUERY(jsonb 'null', '$xyz' PASSING 1 AS xy);
 ERROR:  could not find jsonpath variable "xyz"
diff --git a/src/oracle_test/regress/expected/stats.out b/src/oracle_test/regress/expected/stats.out
index 6eec7be1f44..f6f64a46408 100644
--- a/src/oracle_test/regress/expected/stats.out
+++ b/src/oracle_test/regress/expected/stats.out
@@ -879,6 +879,8 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
  t
 (1 row)
 
+-- stats_reset may not be set for datid=0 and shared objects in
+-- pg_stat_database, so reset once.
 SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
  pg_stat_reset_single_table_counters 
 -------------------------------------
@@ -892,6 +894,22 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
  f
 (1 row)
 
+SELECT extract(epoch from stats_reset) AS shared_db_reset_before
+  FROM pg_stat_database WHERE datid = 0 \gset
+-- Second reset for comparison.
+SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
+ pg_stat_reset_single_table_counters 
+-------------------------------------
+ 
+(1 row)
+
+SELECT extract(epoch from stats_reset) > :'shared_db_reset_before' AS has_updated
+  FROM pg_stat_database WHERE datid = 0;
+ has_updated 
+-------------
+ t
+(1 row)
+
 -- set back comment
 \if :{?description_before}
   COMMENT ON DATABASE :"datname" IS :'description_before';
diff --git a/src/oracle_test/regress/expected/stats_ext.out b/src/oracle_test/regress/expected/stats_ext.out
index dacebf2bd86..61369b3c177 100644
--- a/src/oracle_test/regress/expected/stats_ext.out
+++ b/src/oracle_test/regress/expected/stats_ext.out
@@ -55,6 +55,26 @@ CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), y FROM ext_stats_test;
 ERROR:  duplicate expression in statistics definition
 CREATE STATISTICS tst (unrecognized) ON x, y FROM ext_stats_test;
 ERROR:  unrecognized statistics kind "unrecognized"
+-- unsupported targets
+CREATE STATISTICS tst ON a FROM (VALUES (x)) AS foo;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM foo NATURAL JOIN bar;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM (SELECT * FROM ext_stats_test) AS foo;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM ext_stats_test s TABLESAMPLE system (x);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM XMLTABLE('foo' PASSING 'bar' COLUMNS a text);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM JSON_TABLE(jsonb '123', '$' COLUMNS (item int));
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE FUNCTION tftest(int) returns table(a int, b int) as $$
+SELECT $1, $1+i FROM generate_series(1,5) g(i);
+$$ LANGUAGE sql IMMUTABLE STRICT;
+/
+CREATE STATISTICS alt_stat2 ON a FROM tftest(1);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+DROP FUNCTION tftest;
 -- incorrect expressions
 CREATE STATISTICS tst ON (y) FROM ext_stats_test; -- single column reference
 ERROR:  extended statistics require at least 2 columns
@@ -104,6 +124,20 @@ ALTER STATISTICS ab1_a_b_stats RENAME TO ab1_a_b_stats_new;
 ERROR:  must be owner of statistics object ab1_a_b_stats
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_stats_ext;
+CREATE STATISTICS pg_temp.stats_ext_temp ON a, b FROM ab1;
+SELECT regexp_replace(pg_describe_object(tableoid, oid, 0),
+                      'pg_temp_[0-9]*', 'pg_temp_REDACTED') AS descr,
+       pg_statistics_obj_is_visible(oid) AS visible
+  FROM pg_statistic_ext
+ WHERE stxname = 'stats_ext_temp';
+                       descr                       | visible 
+---------------------------------------------------+---------
+ statistics object pg_temp_REDACTED.stats_ext_temp | f
+(1 row)
+
+DROP STATISTICS stats_ext_temp;  -- shall fail
+ERROR:  statistics object "stats_ext_temp" does not exist
+DROP STATISTICS pg_temp.stats_ext_temp;
 CREATE STATISTICS IF NOT EXISTS ab1_a_b_stats ON a, b FROM ab1;
 NOTICE:  statistics object "ab1_a_b_stats" already exists, skipping
 DROP STATISTICS ab1_a_b_stats;
@@ -3280,9 +3314,18 @@ CREATE FUNCTION op_leak(int, int) RETURNS bool
 /
 CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
+CREATE FUNCTION op_leak(record, record) RETURNS bool
+    AS 'BEGIN RAISE NOTICE ''op_leak => %, %'', $1, $2; RETURN $1 < $2; END'
+    LANGUAGE plpgsql;
+/
+CREATE OPERATOR <<< (procedure = op_leak, leftarg = record, rightarg = record,
+                     restrict = scalarltsel);
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_tbl
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
@@ -3303,10 +3346,17 @@ SELECT * FROM tststats.priv_test_view WHERE a <<< 0 OR b <<< 0; -- Should not le
 ---+---
 (0 rows)
 
+SELECT * FROM tststats.priv_test_view t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
 DELETE FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 -- Grant table access, but hide all data with RLS
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tststats.priv_test_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_tbl_pol ON tststats.priv_test_tbl USING (2 * a < 0);
 GRANT SELECT, DELETE ON tststats.priv_test_tbl TO regress_stats_user1;
 -- Should now have direct table access, but see nothing and leak nothing
 SET SESSION AUTHORIZATION regress_stats_user1;
@@ -3315,12 +3365,57 @@ SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not le
 ---+---
 (0 rows)
 
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
  a | b 
 ---+---
 (0 rows)
 
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+-- Create plain inheritance parent table with no access permissions
+RESET SESSION AUTHORIZATION;
+CREATE TABLE tststats.priv_test_parent_tbl (a int, b int);
+ALTER TABLE tststats.priv_test_tbl INHERIT tststats.priv_test_parent_tbl;
+-- Should not have access to parent, and should leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+-- Grant table access to parent, but hide all data with RLS
+RESET SESSION AUTHORIZATION;
+ALTER TABLE tststats.priv_test_parent_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_parent_tbl_pol ON tststats.priv_test_parent_tbl USING (2 * a < 0);
+GRANT SELECT, DELETE ON tststats.priv_test_parent_tbl TO regress_stats_user1;
+-- Should now have direct table access to parent, but see nothing and leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
 -- privilege checks for pg_stats_ext and pg_stats_ext_exprs
 RESET SESSION AUTHORIZATION;
 CREATE TABLE stats_ext_tbl (id INT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, col TEXT);
@@ -3363,15 +3458,55 @@ SELECT statistics_name, most_common_vals FROM pg_stats_ext_exprs x
  s_expr          | {1}
 (2 rows)
 
+-- CREATE STATISTICS checks for CREATE on the schema
+RESET SESSION AUTHORIZATION;
+CREATE SCHEMA sts_sch1 CREATE TABLE sts_sch1.tbl (a INT, b INT, c INT GENERATED ALWAYS AS (b * 2) STORED);
+CREATE SCHEMA sts_sch2;
+GRANT USAGE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+ALTER TABLE sts_sch1.tbl OWNER TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch1
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch2
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch2
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1 FROM regress_stats_user1;
+GRANT CREATE ON SCHEMA sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch1
+CREATE STATISTICS sts_sch2.pass1 ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass2 ON a, b, c FROM sts_sch1.tbl;
+-- re-creating statistics via ALTER TABLE bypasses checks for CREATE on schema
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1, sts_sch2 FROM regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN a TYPE SMALLINT;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN c SET EXPRESSION AS (a * 3);
 -- Tidy up
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
+DROP OPERATOR <<< (record, record);
+DROP FUNCTION op_leak(record, record);
 RESET SESSION AUTHORIZATION;
 DROP TABLE stats_ext_tbl;
 DROP SCHEMA tststats CASCADE;
-NOTICE:  drop cascades to 2 other objects
-DETAIL:  drop cascades to table tststats.priv_test_tbl
+NOTICE:  drop cascades to 3 other objects
+DETAIL:  drop cascades to table tststats.priv_test_parent_tbl
+drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
+DROP SCHEMA sts_sch1, sts_sch2 CASCADE;
+NOTICE:  drop cascades to table sts_sch1.tbl
 DROP USER regress_stats_user1;
 CREATE TABLE grouping_unique (x integer);
 INSERT INTO grouping_unique (x) SELECT gs FROM generate_series(1,1000) AS gs;
diff --git a/src/oracle_test/regress/expected/stats_import.out b/src/oracle_test/regress/expected/stats_import.out
old mode 100755
new mode 100644
index 696b47675f7..b0048aa1970
--- a/src/oracle_test/regress/expected/stats_import.out
+++ b/src/oracle_test/regress/expected/stats_import.out
@@ -50,26 +50,26 @@ SELECT pg_clear_relation_stats('stats_import', 'test');
 SELECT pg_catalog.pg_restore_relation_stats(
         'relname', 'test',
         'relpages', 17::integer);
-ERROR:  "schemaname" cannot be NULL
+ERROR:  argument "schemaname" must not be null
 -- error: relname missing
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relpages', 17::integer);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 --- error: schemaname is wrong type
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 3.6::float,
         'relname', 'test',
         'relpages', 17::integer);
-WARNING:  argument "schemaname" has type "pg_catalog.float8", expected type "text"
-ERROR:  "schemaname" cannot be NULL
+WARNING:  argument "schemaname" has type pg_catalog.float8, expected type text
+ERROR:  argument "schemaname" must not be null
 --- error: relname is wrong type
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relname', 0::oid,
         'relpages', 17::integer);
-WARNING:  argument "relname" has type "oid", expected type "text"
-ERROR:  "relname" cannot be NULL
+WARNING:  argument "relname" has type oid, expected type text
+ERROR:  argument "relname" must not be null
 -- error: relation not found
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
@@ -88,7 +88,7 @@ SELECT pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relname', 'test',
         NULL, '17'::integer);
-ERROR:  name at variadic position 5 is NULL
+ERROR:  name at variadic position 5 is null
 -- starting stats
 SELECT relpages, reltuples, relallvisible, relallfrozen
 FROM pg_class
@@ -120,9 +120,9 @@ WHERE relation = 'stats_import.test'::regclass AND
 SELECT mode FROM pg_locks
 WHERE relation = 'stats_import.test_i'::regclass AND
       pid = pg_backend_pid() AND granted;
-      mode       
------------------
- AccessShareLock
+           mode           
+--------------------------
+ ShareUpdateExclusiveLock
 (1 row)
 
 COMMIT;
@@ -286,7 +286,7 @@ SELECT pg_restore_relation_stats(
         'reltuples', 400.0::real,
         'relallvisible', 4::integer,
         'relallfrozen', 3::integer);
-WARNING:  argument "relpages" has type "text", expected type "pg_catalog.int4"
+WARNING:  argument "relpages" has type text, expected type pg_catalog.int4
  pg_restore_relation_stats 
 ---------------------------
  f
@@ -358,7 +358,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "schemaname" cannot be NULL
+ERROR:  argument "schemaname" must not be null
 -- error: schema does not exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'nope',
@@ -373,7 +373,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 -- error: relname does not exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -389,7 +389,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 -- error: NULL attname
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -397,7 +397,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', NULL,
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  must specify either attname or attnum
+ERROR:  must specify either "attname" or "attnum"
 -- error: attname doesn't exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -416,14 +416,14 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attnum', 1::smallint,
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  cannot specify both attname and attnum
+ERROR:  cannot specify both "attname" and "attnum"
 -- error: neither attname nor attnum
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
     'relname', 'test',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  must specify either attname or attnum
+ERROR:  must specify either "attname" or "attnum"
 -- error: attribute is system column
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -439,7 +439,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', NULL::boolean,
     'null_frac', 0.1::real);
-ERROR:  "inherited" cannot be NULL
+ERROR:  argument "inherited" must not be null
 -- ok: just the fixed values, with version, no stakinds
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -527,7 +527,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.21::real,
     'most_common_freqs', '{0.1,0.2,0.3}'::real[]
     );
-WARNING:  "most_common_vals" must be specified when "most_common_freqs" is specified
+WARNING:  argument "most_common_vals" must be specified when argument "most_common_freqs" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -553,7 +553,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.21::real,
     'most_common_vals', '{1,2,3}'::text
     );
-WARNING:  "most_common_freqs" must be specified when "most_common_vals" is specified
+WARNING:  argument "most_common_freqs" must be specified when argument "most_common_vals" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -580,8 +580,8 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_vals', '{2,1,3}'::text,
     'most_common_freqs', '{0.2,0.1}'::double precision[]
     );
-WARNING:  argument "most_common_freqs" has type "pg_catalog.float8[]", expected type "pg_catalog.float4[]"
-WARNING:  "most_common_freqs" must be specified when "most_common_vals" is specified
+WARNING:  argument "most_common_freqs" has type pg_catalog.float8[], expected type pg_catalog.float4[]
+WARNING:  argument "most_common_freqs" must be specified when argument "most_common_vals" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -625,6 +625,87 @@ AND attname = 'id';
  stats_import | test      | id      | f         |      0.23 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
 (1 row)
 
+-- warn: mcv / mcf array length mismatch (more vals), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.24::real,
+    'most_common_vals', '{2,1,3}'::text,
+    'most_common_freqs', '{0.3,0.25}'::real[]
+    );
+WARNING:  could not parse "most_common_vals": incorrect number of elements (same as "most_common_freqs" required)
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.24 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
+-- warn: mcv / mcf array length mismatch (more freqs), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.25::real,
+    'most_common_vals', '{2,1}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05}'::real[]
+    );
+WARNING:  could not parse "most_common_vals": incorrect number of elements (same as "most_common_freqs" required)
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.25 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
+-- warn: most_common_vals is multi-dimensional, mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.26::real,
+    'most_common_vals', '{{2,1},{3,4}}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05,0.04}'::real[]
+    );
+WARNING:  "most_common_vals" must be a one-dimensional array
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.26 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
 -- ok: mcv+mcf
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -647,7 +728,7 @@ AND inherited = false
 AND attname = 'id';
   schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
 --------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
- stats_import | test      | id      | f         |      0.23 |         5 |        0.6 | {2,1,3}          | {0.3,0.25,0.05}   |                  |             |                   |                        |                      |                        |                  | 
+ stats_import | test      | id      | f         |      0.26 |         5 |        0.6 | {2,1,3}          | {0.3,0.25,0.05}   |                  |             |                   |                        |                      |                        |                  | 
 (1 row)
 
 -- warn: NULL in histogram array, rest get set
@@ -659,7 +740,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.24::real,
     'histogram_bounds', '{1,NULL,3,4}'::text
     );
-WARNING:  "histogram_bounds" array cannot contain NULL values
+WARNING:  "histogram_bounds" array must not contain null values
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -709,7 +790,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.25::real,
     'elem_count_histogram', '{1,1,NULL,1,1,1,1,1}'::real[]
     );
-WARNING:  "elem_count_histogram" array cannot contain NULL values
+WARNING:  argument "elem_count_histogram" array must not contain null values
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -761,7 +842,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'range_empty_frac', 0.5::real,
     'range_length_histogram', '{399,499,Infinity}'::text
     );
-WARNING:  attribute "id" is not a range type
+WARNING:  column "id" is not a range type
 DETAIL:  Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM.
  pg_restore_attribute_stats 
 ----------------------------
@@ -788,7 +869,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.28::real,
     'range_length_histogram', '{399,499,Infinity}'::text
     );
-WARNING:  "range_empty_frac" must be specified when "range_length_histogram" is specified
+WARNING:  argument "range_empty_frac" must be specified when argument "range_length_histogram" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -814,7 +895,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.29::real,
     'range_empty_frac', 0.5::real
     );
-WARNING:  "range_length_histogram" must be specified when "range_empty_frac" is specified
+WARNING:  argument "range_length_histogram" must be specified when argument "range_empty_frac" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -865,7 +946,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.31::real,
     'range_bounds_histogram', '{"[-1,1)","[0,4)","[1,4)","[1,100)"}'::text
     );
-WARNING:  attribute "id" is not a range type
+WARNING:  column "id" is not a range type
 DETAIL:  Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM.
  pg_restore_attribute_stats 
 ----------------------------
@@ -917,7 +998,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_elems', '{3,1}'::text,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3,0.0}'::real[]
     );
-WARNING:  unable to determine element type of attribute "arange"
+WARNING:  could not determine element type of column "arange"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
@@ -945,7 +1026,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_elems', '{1,3}'::text,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3,0.0}'::real[]
     );
-WARNING:  unable to determine element type of attribute "id"
+WARNING:  could not determine element type of column "id"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
@@ -972,7 +1053,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.34::real,
     'most_common_elems', '{one,two}'::text
     );
-WARNING:  "most_common_elem_freqs" must be specified when "most_common_elems" is specified
+WARNING:  argument "most_common_elem_freqs" must be specified when argument "most_common_elems" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -998,7 +1079,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.35::real,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3}'::real[]
     );
-WARNING:  "most_common_elems" must be specified when "most_common_elem_freqs" is specified
+WARNING:  argument "most_common_elems" must be specified when argument "most_common_elem_freqs" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -1049,7 +1130,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.36::real,
     'elem_count_histogram', '{1,1,1,1,1,1,1,1,1,1}'::real[]
     );
-WARNING:  unable to determine element type of attribute "id"
+WARNING:  could not determine element type of column "id"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
diff --git a/src/oracle_test/regress/expected/strings.out b/src/oracle_test/regress/expected/strings.out
index c7f5b84e2e8..9db08f1c6e3 100644
--- a/src/oracle_test/regress/expected/strings.out
+++ b/src/oracle_test/regress/expected/strings.out
@@ -678,6 +678,15 @@ EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[^^]^';
    Filter: (f1 ~ '^(?:[^^]\^)$'::text)
 (2 rows)
 
+-- Closing square bracket after an escape sequence at the beginning of
+-- a character closes the character class
+EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[|a]%' ESCAPE '|';
+              QUERY PLAN               
+---------------------------------------
+ Seq Scan on text_tbl
+   Filter: (f1 ~ '^(?:[\a].*)$'::text)
+(2 rows)
+
 -- Test backslash escapes in regexp_replace's replacement string
 SELECT regexp_replace('1112223333', E'(\\d{3})(\\d{3})(\\d{4})', E'(\\1) \\2-\\3');
  regexp_replace 
diff --git a/src/oracle_test/regress/expected/subselect.out b/src/oracle_test/regress/expected/subselect.out
index 8e73243b838..43a482a4d82 100644
--- a/src/oracle_test/regress/expected/subselect.out
+++ b/src/oracle_test/regress/expected/subselect.out
@@ -677,6 +677,21 @@ select * from (
    0
 (1 row)
 
+--
+-- Test cases for interactions between PARAM_EXEC, subplans and array
+-- subscripts
+--
+-- check that array subscription doesn't conflict with PARAM_EXEC (see #19370)
+SELECT (array[1,2])[(SELECT g.i)] FROM generate_series(1, 1) g(i);
+ array 
+-------
+     1
+(1 row)
+
+SELECT (array[1,2])[(SELECT g.i):(SELECT g.i + 1)] FROM generate_series(1, 1) g(i);
+ERROR:  syntax error at or near ":"
+LINE 1: SELECT (array[1,2])[(SELECT g.i):(SELECT g.i + 1)] FROM gene...
+                                        ^
 --
 -- Test that an IN implemented using a UniquePath does unique-ification
 -- with the right semantics, as per bug #4113.  (Unfortunately we have
@@ -774,6 +789,25 @@ select (select (a.*)::text) from view_a a;
  (42)
 (1 row)
 
+--
+-- Test case for bug #19037: no relation entry for relid N
+--
+explain (costs off)
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+         QUERY PLAN         
+----------------------------
+ Aggregate
+   ->  Seq Scan on int4_tbl
+   SubPlan 1
+     ->  Result
+(4 rows)
+
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+ ?column? 
+----------
+ t
+(1 row)
+
 --
 -- Check that whole-row Vars reading the result of a subselect don't include
 -- any junk columns therein
@@ -1697,6 +1731,110 @@ NOTICE:  x = 9, y = 13
  9 | 3
 (3 rows)
 
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains SRFs
+--
+explain (verbose, costs off)
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+                                                                                                                            QUERY PLAN                                                                                                                             
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Subquery Scan on ss
+   Output: ss.g, ss.count
+   Filter: (ss.g = 1)
+   ->  HashAggregate
+         Output: (generate_series(1, tenk1.ten)), count(*)
+         Group Key: generate_series(1, tenk1.ten)
+         ->  ProjectSet
+               Output: generate_series(1, tenk1.ten)
+               ->  Seq Scan on public.tenk1
+                     Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, tenk1.thousand, tenk1.twothousand, tenk1.fivethous, tenk1.tenthous, tenk1.odd, tenk1.even, tenk1.stringu1, tenk1.stringu2, tenk1.string4
+(10 rows)
+
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+ g | count 
+---+-------
+ 1 |  9000
+(1 row)
+
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains volatile functions
+--
+alter function tattle(x int, y int) volatile;
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Subquery Scan on ss
+   Output: ss.v, ss.count
+   Filter: ss.v
+   ->  GroupAggregate
+         Output: (tattle(3, tenk1.ten)), count(*)
+         Group Key: (tattle(3, tenk1.ten))
+         ->  Sort
+               Output: (tattle(3, tenk1.ten))
+               Sort Key: (tattle(3, tenk1.ten))
+               ->  Bitmap Heap Scan on public.tenk1
+                     Output: tattle(3, tenk1.ten)
+                     Recheck Cond: (tenk1.unique1 < 3)
+                     ->  Bitmap Index Scan on tenk1_unique1
+                           Index Cond: (tenk1.unique1 < 3)
+(14 rows)
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 0
+ v | count 
+---+-------
+ t |     3
+(1 row)
+
+-- if we pretend it's stable, we get different results:
+alter function tattle(x int, y int) stable;
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+                      QUERY PLAN                      
+------------------------------------------------------
+ GroupAggregate
+   Output: (tattle(3, tenk1.ten)), count(*)
+   Group Key: (tattle(3, tenk1.ten))
+   ->  Sort
+         Output: (tattle(3, tenk1.ten))
+         Sort Key: (tattle(3, tenk1.ten))
+         ->  Bitmap Heap Scan on public.tenk1
+               Output: tattle(3, tenk1.ten)
+               Recheck Cond: (tenk1.unique1 < 3)
+               Filter: tattle(3, tenk1.ten)
+               ->  Bitmap Index Scan on tenk1_unique1
+                     Index Cond: (tenk1.unique1 < 3)
+(12 rows)
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 0
+NOTICE:  x = 3, y = 0
+ v | count 
+---+-------
+ t |     3
+(1 row)
+
 drop function tattle(x int, y int);
 --
 -- Test that LIMIT can be pushed to SORT through a subquery that just projects
@@ -1767,6 +1905,34 @@ fetch backward all in c1;
 
 commit;
 --
+-- Check that JsonConstructorExpr is treated as non-strict, and thus can be
+-- wrapped in a PlaceHolderVar
+--
+begin;
+create temp table json_tab (a int);
+insert into json_tab values (1);
+explain (verbose, costs off)
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Nested Loop Left Join
+   Output: t1.a, (JSON_ARRAY(1, a RETURNING json))
+   Join Filter: false
+   ->  Seq Scan on pg_temp.json_tab t1
+         Output: t1.a
+   ->  Result
+         Output: JSON_ARRAY(1, a RETURNING json)
+         One-Time Filter: false
+(8 rows)
+
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+ a | json_array 
+---+------------
+ 1 | 
+(1 row)
+
+rollback;
+--
 -- Verify that we correctly flatten cases involving a subquery output
 -- expression that doesn't need to be wrapped in a PlaceHolderVar
 --
diff --git a/src/oracle_test/regress/expected/timestamp.out b/src/oracle_test/regress/expected/timestamp.out
index f7af0d5de88..2eef611f8fd 100644
--- a/src/oracle_test/regress/expected/timestamp.out
+++ b/src/oracle_test/regress/expected/timestamp.out
@@ -480,6 +480,14 @@ SELECT date_trunc( 'week', timestamp '2004-02-29 15:44:17.71393' ) AS week_trunc
  Mon Feb 23 00:00:00 2004
 (1 row)
 
+SELECT date_trunc( 'week', timestamp 'infinity' ) AS inf_trunc;
+ERROR:  datetime string and format model does not match
+SELECT date_trunc( 'timezone', timestamp '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+ERROR:  unit "timezone" not supported for type pg_catalog.timestamp
+SELECT date_trunc( 'timezone', timestamp 'infinity' ) AS notsupp_inf_trunc;
+ERROR:  datetime string and format model does not match
+SELECT date_trunc( 'ago', timestamp 'infinity' ) AS invalid_trunc;
+ERROR:  datetime string and format model does not match
 -- verify date_bin behaves the same as date_trunc for relevant intervals
 -- case 1: AD dates, origin < input
 SELECT
diff --git a/src/oracle_test/regress/expected/transactions.out b/src/oracle_test/regress/expected/transactions.out
index 90a5bcf4cbf..d869ac80efe 100644
--- a/src/oracle_test/regress/expected/transactions.out
+++ b/src/oracle_test/regress/expected/transactions.out
@@ -1,6 +1,7 @@
 --
 -- TRANSACTIONS
 --
+\set EXECUTE_RUN_PREPARE on
 BEGIN;
 CREATE TABLE xacttest (a smallint, b real);
 INSERT INTO xacttest VALUES
diff --git a/src/oracle_test/regress/expected/triggers.out b/src/oracle_test/regress/expected/triggers.out
index bb44ffe14e7..ccc4a87b578 100644
--- a/src/oracle_test/regress/expected/triggers.out
+++ b/src/oracle_test/regress/expected/triggers.out
@@ -2781,6 +2781,10 @@ NOTICE:  trigger = child3_delete_trig, old table = (42,CCC)
 -- copy into parent sees parent-format tuples
 copy parent (a, b) from stdin;
 NOTICE:  trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)
+-- check detach/reattach behavior; statement triggers with transition tables
+-- should not prevent a table from becoming a partition again
+alter table parent detach partition child1;
+alter table parent attach partition child1 for values in ('AAA');
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2981,6 +2985,10 @@ NOTICE:  trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)
 create index on parent(b);
 copy parent (a, b) from stdin;
 NOTICE:  trigger = parent_insert_trig, new table = (DDD,42)
+-- check disinherit/reinherit behavior; statement triggers with transition
+-- tables should not prevent a table from becoming an inheritance child again
+alter table child1 no inherit parent;
+alter table child1 inherit parent;
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -3040,13 +3048,19 @@ NOTICE:  trigger = table1_trig, new table = (42)
 with wcte as (insert into table1 values (43))
   insert into table1 values (44);
 NOTICE:  trigger = table1_trig, new table = (43), (44)
+with wcte as (insert into table1 values (45))
+  merge into table1 using (values (46)) as v(a) on table1.a = v.a
+    when not matched then insert values (v.a);
+NOTICE:  trigger = table1_trig, new table = (45), (46)
 select * from table1;
  a  
 ----
  42
  44
  43
-(3 rows)
+ 46
+ 45
+(5 rows)
 
 select * from table2;
       a      
diff --git a/src/oracle_test/regress/expected/tsearch.out b/src/oracle_test/regress/expected/tsearch.out
index 0b38c76c065..dc3cc34e69e 100644
--- a/src/oracle_test/regress/expected/tsearch.out
+++ b/src/oracle_test/regress/expected/tsearch.out
@@ -871,6 +871,7 @@ RESET enable_seqscan;
 RESET enable_indexscan;
 RESET enable_bitmapscan;
 DROP INDEX wowidx;
+ALTER TABLE test_tsvector SET (parallel_workers = 2);
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 SET enable_seqscan=OFF;
 -- GIN only supports bitmapscan, so no need to test plain indexscan
@@ -2145,6 +2146,16 @@ NOTICE:  text-search query doesn't contain lexemes: ""
  foo bar
 (1 row)
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+ERROR:  value for "StartSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+ERROR:  value for "StopSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+ERROR:  value for "FragmentDelimiter" is too long
 --Rewrite sub system
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
 \set ECHO none
diff --git a/src/oracle_test/regress/expected/union.out b/src/oracle_test/regress/expected/union.out
index fb0cfb57c14..92e69132f50 100644
--- a/src/oracle_test/regress/expected/union.out
+++ b/src/oracle_test/regress/expected/union.out
@@ -1499,4 +1499,21 @@ on true limit 1;
                ->  Result
 (6 rows)
 
+-- Test handling of Vars with varno 0 in estimate_array_length
+explain (verbose, costs off)
+select null::int[] union all select null::int[] union all select null::bigint[];
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Append
+   ->  Result
+         Output: (NULL::pg_catalog.int4[])
+         ->  Append
+               ->  Result
+                     Output: NULL::pg_catalog.int4[]
+               ->  Result
+                     Output: NULL::pg_catalog.int4[]
+   ->  Result
+         Output: NULL::pg_catalog.int8[]
+(10 rows)
+
 reset ivorysql.enable_emptystring_to_null;
diff --git a/src/oracle_test/regress/expected/updatable_views.out b/src/oracle_test/regress/expected/updatable_views.out
index 06d10d45382..942f6effd61 100644
--- a/src/oracle_test/regress/expected/updatable_views.out
+++ b/src/oracle_test/regress/expected/updatable_views.out
@@ -1,6 +1,7 @@
 --
 -- UPDATABLE VIEWS
 --
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 -- avoid bit-exact output here because operations may not be bit-exact.
 SET extra_float_digits = 0;
diff --git a/src/oracle_test/regress/expected/window.out b/src/oracle_test/regress/expected/window.out
index 2551659c779..19c2668127a 100644
--- a/src/oracle_test/regress/expected/window.out
+++ b/src/oracle_test/regress/expected/window.out
@@ -1357,6 +1357,97 @@ CREATE TEMP VIEW v_window AS
 ERROR:  missing or invalid datetime field.
 SELECT pg_get_viewdef('v_window');
 ERROR:  relation "v_window" does not exist
+-- test overflow frame specifications
+SELECT sum(unique1) over (rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  41 |       4 |    0
+  39 |       2 |    2
+  38 |       1 |    1
+  32 |       6 |    2
+  23 |       9 |    1
+  15 |       8 |    0
+  10 |       5 |    1
+   7 |       3 |    3
+   0 |       7 |    3
+     |       0 |    0
+(10 rows)
+
+SELECT sum(unique1) over (rows between 9223372036854775807 following and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       4 |    0
+     |       2 |    2
+     |       1 |    1
+     |       6 |    2
+     |       9 |    1
+     |       8 |    0
+     |       5 |    1
+     |       3 |    3
+     |       7 |    3
+     |       0 |    0
+(10 rows)
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ last_value | unique1 | four 
+------------+---------+------
+          7 |       0 |    0
+          7 |       8 |    0
+          7 |       4 |    0
+          7 |       5 |    1
+          7 |       9 |    1
+          7 |       1 |    1
+          7 |       6 |    2
+          7 |       2 |    2
+          7 |       3 |    3
+            |       7 |    3
+(10 rows)
+
+-- These test GROUPS mode with an offset large enough to cause overflow when
+-- added to currentgroup.  Although the overflow doesn't produce visibly wrong
+-- results (due to the incremental nature of group pointer advancement), we
+-- still need to protect against it as signed integer overflow is undefined
+-- behavior in C.
+SELECT sum(unique1) over (ORDER BY four groups between current row and 9223372036854775807 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  45 |       0 |    0
+  45 |       8 |    0
+  45 |       4 |    0
+  33 |       5 |    1
+  33 |       9 |    1
+  33 |       1 |    1
+  18 |       6 |    2
+  18 |       2 |    2
+  10 |       3 |    3
+  10 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (ORDER BY four groups between 9223372036854775807 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+     |       5 |    1
+     |       9 |    1
+     |       1 |    1
+     |       6 |    2
+     |       2 |    2
+     |       3 |    3
+     |       7 |    3
+(10 rows)
+
 -- RANGE offset PRECEDING/FOLLOWING tests
 SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
 	unique1, four
diff --git a/src/oracle_test/regress/expected/with.out b/src/oracle_test/regress/expected/with.out
index f5f3625f724..b84911e65f3 100644
--- a/src/oracle_test/regress/expected/with.out
+++ b/src/oracle_test/regress/expected/with.out
@@ -2297,6 +2297,48 @@ from int4_tbl;
  -2147483647
 (5 rows)
 
+--
+-- test for bug #19055: interaction of WITH with aggregates
+--
+-- For now, we just throw an error if there's a use of a CTE below the
+-- semantic level that the SQL standard assigns to the aggregate.
+-- It's not entirely clear what we could do instead that doesn't risk
+-- breaking more things than it fixes.
+select f1, (with cte1(x,y) as (select 1,2)
+            select count((select i4.f1 from cte1))) as ss
+from int4_tbl i4;
+ERROR:  outer-level aggregate cannot use a nested CTE
+LINE 2:             select count((select i4.f1 from cte1))) as ss
+                           ^
+DETAIL:  CTE "cte1" is below the aggregate's semantic level.
+--
+-- test for bug #19106: interaction of WITH with aggregates
+--
+-- the initial fix for #19055 was too aggressive and broke this case
+explain (verbose, costs off)
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+                 QUERY PLAN                 
+--------------------------------------------
+ Aggregate
+   Output: max((InitPlan 1).col1)
+   InitPlan 1
+     ->  Aggregate
+           Output: sum("*VALUES*".column1)
+           ->  Values Scan on "*VALUES*"
+                 Output: "*VALUES*".column1
+   ->  Result
+(8 rows)
+
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+ agg 
+-----
+   3
+(1 row)
+
 --
 -- test for nested-recursive-WITH bug
 --
@@ -2830,6 +2872,47 @@ SELECT * FROM bug6051_3;
 ---
 (0 rows)
 
+-- check that recursive CTE processing doesn't rewrite a CTE more than once
+-- (must not try to expand GENERATED ALWAYS IDENTITY columns more than once)
+CREATE TEMP TABLE id_alw1 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP TABLE id_alw2 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP VIEW id_alw2_view AS SELECT * FROM id_alw2;
+CREATE TEMP TABLE id_alw3 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE RULE id_alw3_ins AS ON INSERT TO id_alw3 DO INSTEAD
+  WITH t1 AS (INSERT INTO id_alw1 DEFAULT VALUES RETURNING i)
+    INSERT INTO id_alw2_view DEFAULT VALUES RETURNING i;
+CREATE TEMP VIEW id_alw3_view AS SELECT * FROM id_alw3;
+CREATE TEMP TABLE id_alw4 (i int GENERATED ALWAYS AS IDENTITY);
+WITH t4 AS (INSERT INTO id_alw4 DEFAULT VALUES RETURNING i)
+  INSERT INTO id_alw3_view DEFAULT VALUES RETURNING i;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw1;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw2;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw3;
+ i 
+---
+(0 rows)
+
+SELECT * from id_alw4;
+ i 
+---
+ 1
+(1 row)
+
 -- check case where CTE reference is removed due to optimization
 EXPLAIN (VERBOSE, COSTS OFF)
 SELECT q1 FROM
diff --git a/src/oracle_test/regress/expected/xml.out b/src/oracle_test/regress/expected/xml.out
index 029270c07ff..90aab19e440 100644
--- a/src/oracle_test/regress/expected/xml.out
+++ b/src/oracle_test/regress/expected/xml.out
@@ -1,3 +1,4 @@
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE xmltest (
     id int,
diff --git a/src/oracle_test/regress/expected/xml_1.out b/src/oracle_test/regress/expected/xml_1.out
index b25d8b0be26..896abb6afc8 100644
--- a/src/oracle_test/regress/expected/xml_1.out
+++ b/src/oracle_test/regress/expected/xml_1.out
@@ -1,3 +1,4 @@
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE xmltest (
     id int,
diff --git a/src/oracle_test/regress/expected/xml_2.out b/src/oracle_test/regress/expected/xml_2.out
index 9fcb970d2e7..d14021dabc8 100644
--- a/src/oracle_test/regress/expected/xml_2.out
+++ b/src/oracle_test/regress/expected/xml_2.out
@@ -1,3 +1,4 @@
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE xmltest (
     id int,
diff --git a/src/oracle_test/regress/parallel_schedule b/src/oracle_test/regress/parallel_schedule
index 82af86cebe3..41ac7013d65 100644
--- a/src/oracle_test/regress/parallel_schedule
+++ b/src/oracle_test/regress/parallel_schedule
@@ -31,7 +31,7 @@ test: strings md5 numerology point lseg line box path polygon circle date time t
 # geometry depends on point, lseg, line, box, path, polygon, circle
 # horology depends on date, time, timetz, timestamp, timestamptz, interval
 # ----------
-test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import
+test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import encoding euc_kr
 
 # ----------
 # Load huge amounts of data
@@ -128,7 +128,12 @@ test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion tr
 # The stats test resets stats, so nothing else needing stats access can be in
 # this group.
 # ----------
-test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain compression memoize stats predicate numa
+test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain memoize stats predicate numa
+
+# ----------
+# Another group of parallel tests (compression)
+# ----------
+test: compression compression_pglz
 
 # event_trigger depends on create_am and cannot run concurrently with
 # any test that runs DDL
@@ -159,4 +164,4 @@ test: emptystring_to_null
 
 test: ora_package
 
-test: ora_force_view
\ No newline at end of file
+test: ora_force_view
diff --git a/src/oracle_test/regress/pg_regress.c b/src/oracle_test/regress/pg_regress.c
index 3d0f74acf24..c0a67a06fd8 100644
--- a/src/oracle_test/regress/pg_regress.c
+++ b/src/oracle_test/regress/pg_regress.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/oracle_test/regress/pg_regress.c
  *
@@ -699,7 +699,7 @@ static
 const char *
 get_expectfile(const char *testname, const char *file)
 {
-	char	   *file_type;
+	const char *file_type;
 	_resultmap *rm;
 
 	/*
diff --git a/src/oracle_test/regress/pg_regress.h b/src/oracle_test/regress/pg_regress.h
index 2d2163337fb..ae1613643a9 100644
--- a/src/oracle_test/regress/pg_regress.h
+++ b/src/oracle_test/regress/pg_regress.h
@@ -3,7 +3,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/test/regress/pg_regress.h
  *-------------------------------------------------------------------------
diff --git a/src/oracle_test/regress/pg_regress_main.c b/src/oracle_test/regress/pg_regress_main.c
index 087889893f5..73899ec39c8 100644
--- a/src/oracle_test/regress/pg_regress_main.c
+++ b/src/oracle_test/regress/pg_regress_main.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/test/regress/pg_regress_main.c
  *
diff --git a/src/oracle_test/regress/regress.c b/src/oracle_test/regress/regress.c
index 47866814cea..1de9a47342a 100644
--- a/src/oracle_test/regress/regress.c
+++ b/src/oracle_test/regress/regress.c
@@ -8,7 +8,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/test/regress/regress.c
  *
@@ -28,6 +28,7 @@
 #include "catalog/pg_type.h"
 #include "commands/sequence.h"
 #include "commands/trigger.h"
+#include "common/pg_lzcompress.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "funcapi.h"
@@ -991,6 +992,145 @@ test_enc_conversion(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(HeapTupleGetDatum(tuple));
 }
 
+/* Convert bytea to text without validation for corruption tests from SQL. */
+PG_FUNCTION_INFO_V1(test_bytea_to_text);
+Datum
+test_bytea_to_text(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_TEXT_P(PG_GETARG_BYTEA_PP(0));
+}
+
+/* And the reverse. */
+PG_FUNCTION_INFO_V1(test_text_to_bytea);
+Datum
+test_text_to_bytea(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BYTEA_P(PG_GETARG_TEXT_PP(0));
+}
+
+/* Corruption tests in C. */
+PG_FUNCTION_INFO_V1(test_mblen_func);
+Datum
+test_mblen_func(PG_FUNCTION_ARGS)
+{
+	const char *func = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	const char *encoding = text_to_cstring(PG_GETARG_BYTEA_PP(1));
+	text	   *string = PG_GETARG_BYTEA_PP(2);
+	int			offset = PG_GETARG_INT32(3);
+	const char *data = VARDATA_ANY(string);
+	size_t		size = VARSIZE_ANY_EXHDR(string);
+	int			result = 0;
+
+	if (strcmp(func, "pg_mblen_unbounded") == 0)
+		result = pg_mblen_unbounded(data + offset);
+	else if (strcmp(func, "pg_mblen_cstr") == 0)
+		result = pg_mblen_cstr(data + offset);
+	else if (strcmp(func, "pg_mblen_with_len") == 0)
+		result = pg_mblen_with_len(data + offset, size - offset);
+	else if (strcmp(func, "pg_mblen_range") == 0)
+		result = pg_mblen_range(data + offset, data + size);
+	else if (strcmp(func, "pg_encoding_mblen") == 0)
+		result = pg_encoding_mblen(pg_char_to_encoding(encoding), data + offset);
+	else
+		elog(ERROR, "unknown function");
+
+	PG_RETURN_INT32(result);
+}
+
+PG_FUNCTION_INFO_V1(test_text_to_wchars);
+Datum
+test_text_to_wchars(PG_FUNCTION_ARGS)
+{
+	const char *encoding_name = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	text	   *string = PG_GETARG_TEXT_PP(1);
+	const char *data = VARDATA_ANY(string);
+	size_t		size = VARSIZE_ANY_EXHDR(string);
+	pg_wchar   *wchars = palloc(sizeof(pg_wchar) * (size + 1));
+	Datum	   *datums;
+	int			wlen;
+	int			encoding;
+
+	encoding = pg_char_to_encoding(encoding_name);
+	if (encoding < 0)
+		elog(ERROR, "unknown encoding name: %s", encoding_name);
+
+	if (size > 0)
+	{
+		datums = palloc(sizeof(Datum) * size);
+		wlen = pg_encoding_mb2wchar_with_len(encoding,
+											 data,
+											 wchars,
+											 size);
+		Assert(wlen >= 0);
+		Assert(wlen <= size);
+		Assert(wchars[wlen] == 0);
+
+		for (int i = 0; i < wlen; ++i)
+			datums[i] = UInt32GetDatum(wchars[i]);
+	}
+	else
+	{
+		datums = NULL;
+		wlen = 0;
+	}
+
+	PG_RETURN_ARRAYTYPE_P(construct_array_builtin(datums, wlen, INT4OID));
+}
+
+PG_FUNCTION_INFO_V1(test_wchars_to_text);
+Datum
+test_wchars_to_text(PG_FUNCTION_ARGS)
+{
+	const char *encoding_name = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	ArrayType  *array = PG_GETARG_ARRAYTYPE_P(1);
+	Datum	   *datums;
+	bool	   *nulls;
+	char	   *mb;
+	text	   *result;
+	int			wlen;
+	int			bytes;
+	int			encoding;
+
+	encoding = pg_char_to_encoding(encoding_name);
+	if (encoding < 0)
+		elog(ERROR, "unknown encoding name: %s", encoding_name);
+
+	deconstruct_array_builtin(array, INT4OID, &datums, &nulls, &wlen);
+
+	if (wlen > 0)
+	{
+		pg_wchar   *wchars = palloc(sizeof(pg_wchar) * wlen);
+
+		for (int i = 0; i < wlen; ++i)
+		{
+			if (nulls[i])
+				elog(ERROR, "unexpected NULL in array");
+			wchars[i] = DatumGetInt32(datums[i]);
+		}
+
+		mb = palloc(pg_encoding_max_length(encoding) * wlen + 1);
+		bytes = pg_encoding_wchar2mb_with_len(encoding, wchars, mb, wlen);
+	}
+	else
+	{
+		mb = "";
+		bytes = 0;
+	}
+
+	result = palloc(bytes + VARHDRSZ);
+	SET_VARSIZE(result, bytes + VARHDRSZ);
+	memcpy(VARDATA(result), mb, bytes);
+
+	PG_RETURN_TEXT_P(result);
+}
+
+PG_FUNCTION_INFO_V1(test_valid_server_encoding);
+Datum
+test_valid_server_encoding(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BOOL(pg_valid_server_encoding(text_to_cstring(PG_GETARG_TEXT_PP(0))) >= 0);
+}
+
 /* Provide SQL access to IsBinaryCoercible() */
 PG_FUNCTION_INFO_V1(binary_coercible);
 Datum
@@ -1029,3 +1169,68 @@ test_relpath(PG_FUNCTION_ARGS)
 
 	PG_RETURN_VOID();
 }
+
+/*
+ * test_pglz_compress
+ *
+ * Compress the input using pglz_compress().  Only the "always" strategy is
+ * currently supported.
+ *
+ * Returns the compressed data, or NULL if compression fails.
+ */
+PG_FUNCTION_INFO_V1(test_pglz_compress);
+Datum
+test_pglz_compress(PG_FUNCTION_ARGS)
+{
+	bytea	   *input = PG_GETARG_BYTEA_PP(0);
+	char	   *source = VARDATA_ANY(input);
+	int32		slen = VARSIZE_ANY_EXHDR(input);
+	int32		maxout = PGLZ_MAX_OUTPUT(slen);
+	bytea	   *result;
+	int32		clen;
+
+	result = (bytea *) palloc(maxout + VARHDRSZ);
+	clen = pglz_compress(source, slen, VARDATA(result),
+						 PGLZ_strategy_always);
+	if (clen < 0)
+		PG_RETURN_NULL();
+
+	SET_VARSIZE(result, clen + VARHDRSZ);
+	PG_RETURN_BYTEA_P(result);
+}
+
+/*
+ * test_pglz_decompress
+ *
+ * Decompress the input using pglz_decompress().
+ *
+ * The second argument is the expected uncompressed data size.  The third
+ * argument is here for the check_complete flag.
+ *
+ * Returns the decompressed data, or raises an error if decompression fails.
+ */
+PG_FUNCTION_INFO_V1(test_pglz_decompress);
+Datum
+test_pglz_decompress(PG_FUNCTION_ARGS)
+{
+	bytea	   *input = PG_GETARG_BYTEA_PP(0);
+	int32		rawsize = PG_GETARG_INT32(1);
+	bool		check_complete = PG_GETARG_BOOL(2);
+	char	   *source = VARDATA_ANY(input);
+	int32		slen = VARSIZE_ANY_EXHDR(input);
+	bytea	   *result;
+	int32		dlen;
+
+	if (rawsize < 0)
+		elog(ERROR, "rawsize must not be negative");
+
+	result = (bytea *) palloc(rawsize + VARHDRSZ);
+
+	dlen = pglz_decompress(source, slen, VARDATA(result),
+						   rawsize, check_complete);
+	if (dlen < 0)
+		elog(ERROR, "pglz_decompress failed");
+
+	SET_VARSIZE(result, dlen + VARHDRSZ);
+	PG_RETURN_BYTEA_P(result);
+}
diff --git a/src/oracle_test/regress/sql/aggregates.sql b/src/oracle_test/regress/sql/aggregates.sql
index a296965dcc9..8e917f1e9e7 100644
--- a/src/oracle_test/regress/sql/aggregates.sql
+++ b/src/oracle_test/regress/sql/aggregates.sql
@@ -540,6 +540,23 @@ alter table t2 alter column z drop not null;
 create unique index t2_z_uidx on t2(z) nulls not distinct;
 explain (costs off) select y,z from t2 group by y,z;
 
+-- A unique index proves uniqueness only under its own opfamily.  When the
+-- GROUP BY's eqop comes from a different opfamily with looser equality,
+-- rows the index regards as distinct can collapse into one GROUP BY group,
+-- so the index is not usable for removing redundant columns.
+create type t_rec as (x numeric);
+create temp table t_opf (a t_rec not null, b text);
+create unique index on t_opf (a record_image_ops);
+-- (1.0) and (1.00) are bytewise distinct but logically equal as records;
+-- the index admits both, but GROUP BY a (default record_ops) would merge
+-- them, so b must be retained as a grouping key.
+insert into t_opf values (row(1.0)::t_rec, 'X'), (row(1.00)::t_rec, 'Y');
+explain (costs off)
+select a, b from t_opf group by a, b order by b;
+select a, b from t_opf group by a, b order by b;
+drop table t_opf;
+drop type t_rec;
+
 drop table t1 cascade;
 drop table t2;
 drop table t3;
@@ -568,6 +585,12 @@ select f2, count(*) from
 t1 x(x0,x1) left join (t1 left join t2 using(f2)) on (x0 = 0)
 group by f2;
 
+-- check that we preserve join alias in GROUP BY expressions
+create temp view v1 as
+select f1::int from t1 left join t2 using (f1) group by f1;
+select pg_get_viewdef('v1'::regclass);
+
+drop view v1;
 drop table t1, t2;
 
 --
@@ -1516,15 +1539,6 @@ select v||'a', case when v||'a' = 'aa' then 1 else 0 end, count(*)
   from unnest(array['a','b']) u(v)
  group by v||'a' order by 1;
 
--- Make sure that generation of HashAggregate for uniqification purposes
--- does not lead to array overflow due to unexpected duplicate hash keys
--- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
-set enable_memoize to off;
-explain (costs off)
-  select 1 from tenk1
-   where (hundred, thousand) in (select twothousand, twothousand from onek);
-reset enable_memoize;
-
 --
 -- Hash Aggregation Spill tests
 --
diff --git a/src/oracle_test/regress/sql/alter_table.sql b/src/oracle_test/regress/sql/alter_table.sql
index 6d1ec9f6792..260267e4504 100644
--- a/src/oracle_test/regress/sql/alter_table.sql
+++ b/src/oracle_test/regress/sql/alter_table.sql
@@ -2209,13 +2209,15 @@ SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment F
 -- filenode function call can return NULL for a relation dropped concurrently
 -- with the call's surrounding query, so ignore a NULL mapped_oid for
 -- relations that no longer exist after all calls finish.
+-- Temporary relations are ignored, as not supported by pg_filenode_relation().
 CREATE TEMP TABLE filenode_mapping AS
 SELECT
     oid, mapped_oid, reltablespace, relfilenode, relname
 FROM pg_class,
     pg_filenode_relation(reltablespace, pg_relation_filenode(oid)) AS mapped_oid
-WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
-
+WHERE relkind IN ('r', 'i', 'S', 't', 'm')
+  AND relpersistence != 't'
+  AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
 
@@ -2336,6 +2338,14 @@ ALTER TABLE test_add_column
 \d test_add_column
 ALTER TABLE test_add_column
 	ADD COLUMN IF NOT EXISTS c5 SERIAL CHECK (c5 > 10);
+ALTER TABLE test_add_column
+	ADD c6 integer; -- omit COLUMN
+ALTER TABLE test_add_column
+	ADD IF NOT EXISTS c6 integer;
+ALTER TABLE test_add_column
+	DROP c6; -- omit COLUMN
+ALTER TABLE test_add_column
+	DROP IF EXISTS c6;
 \d test_add_column*
 DROP TABLE test_add_column;
 \d test_add_column*
@@ -2839,6 +2849,15 @@ ALTER TABLE range_parted2 DETACH PARTITION part_rp100 CONCURRENTLY;
 \d part_rp100
 DROP TABLE range_parted2;
 
+-- Test that hash partitions continue to work after they're concurrently
+-- detached (bugs #18371, #19070)
+CREATE TABLE hash_parted2 (a int) PARTITION BY HASH(a);
+CREATE TABLE part_hp PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 0);
+ALTER TABLE hash_parted2 DETACH PARTITION part_hp CONCURRENTLY;
+DROP TABLE hash_parted2;
+INSERT INTO part_hp VALUES (1);
+DROP TABLE part_hp;
+
 -- Check ALTER TABLE commands for partitioned tables and partitions
 
 -- cannot add/drop column to/from *only* the parent
@@ -3084,6 +3103,14 @@ drop table attbl, atref;
 create table attbl(a int);
 create table atref(b attbl check ((b).a is not null));
 alter table attbl alter column a type numeric;  -- someday this should work
+alter table atref drop constraint atref_b_check;
+
+create statistics atref_stat on ((b).a is not null) from atref;
+alter table attbl alter column a type numeric;  -- someday this should work
+drop statistics atref_stat;
+
+create index atref_idx on atref (((b).a));
+alter table attbl alter column a type numeric;  -- someday this should work
 drop table attbl, atref;
 
 /* End test case for bug #18970 */
diff --git a/src/oracle_test/regress/sql/arrays.sql b/src/oracle_test/regress/sql/arrays.sql
index ff373354e98..e9ae831f5d6 100644
--- a/src/oracle_test/regress/sql/arrays.sql
+++ b/src/oracle_test/regress/sql/arrays.sql
@@ -527,6 +527,10 @@ select '[2147483646..2147483646]={1}'::int[];
 select '[-2147483648..-2147483647]={1,2}'::int[];
 -- all of the above should be accepted
 
+-- some day we might allow these cases, but for now they're errors:
+select array[]::oidvector;
+select array[]::int2vector;
+
 -- tests for array aggregates
 CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
 
diff --git a/src/oracle_test/regress/sql/btree_index.sql b/src/oracle_test/regress/sql/btree_index.sql
index a76c912c9b9..6f21192baae 100644
--- a/src/oracle_test/regress/sql/btree_index.sql
+++ b/src/oracle_test/regress/sql/btree_index.sql
@@ -143,38 +143,83 @@ SELECT proname, proargtypes, pronamespace
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC LIMIT 1;
 
 --
--- Add coverage for RowCompare quals whose rhs row has a NULL that ends scan
+-- Forwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
 
 --
--- Add coverage for backwards scan RowCompare quals whose rhs row has a NULL
--- that ends scan
+-- Forwards scan RowCompare quals whose row arg has a NULL that ends scan
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
 
 --
--- Add coverage for recheck of > key following array advancement on previous
--- (left sibling) page that used a high key whose attribute value corresponding
--- to the > key was -inf (due to being truncated when the high key was created).
+-- Backwards scan RowCompare qual whose row arg has a NULL that ends scan
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+
+-- Makes B-Tree preprocessing deal with unmarking redundant keys that were
+-- initially marked required (test case relies on current row compare
+-- preprocessing limitations)
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+
+--
+-- Performs a recheck of > key following array advancement on previous (left
+-- sibling) page that used a high key whose attribute value corresponding to
+-- the > key was -inf (due to being truncated when the high key was created).
 --
 -- XXX This relies on the assumption that tenk1_thous_tenthous has a truncated
 -- high key "(183, -inf)" on the first page that we'll scan.  The test will only
diff --git a/src/oracle_test/regress/sql/case_conversion.sql b/src/oracle_test/regress/sql/case_conversion.sql
index 9d03108a09c..6f974bb79f0 100644
--- a/src/oracle_test/regress/sql/case_conversion.sql
+++ b/src/oracle_test/regress/sql/case_conversion.sql
@@ -3,7 +3,7 @@
 -- 	  1). If the alphas in the identifier quoted by double quotes are all the upper case, convert the upper case to the lower case.
 -- 	  2). If the alphas in the identifier quoted by double quotes are all the lower case, convert the lower case to the upper case.
 -- 	  3). If the alphas in the identifier quoted by double quotes are case-mixed, leave the identifier unchanged.
--- 2. if guc parameter "identifier_case_switch" value is "lowcase", convert all identifiers to the lower case.
+-- 2. if guc parameter "identifier_case_switch" value is "lowercase", convert all identifiers to the lowercase.
 -- 3. if guc parameter "identifier_case_switch" value is "normal", The rules for converting identifiers are the same as for native PG.
 
 ----1. "identifier_case_switch" value is "interchange"
diff --git a/src/oracle_test/regress/sql/collate.icu.utf8.sql b/src/oracle_test/regress/sql/collate.icu.utf8.sql
index 67349275702..c7dc12baa13 100644
--- a/src/oracle_test/regress/sql/collate.icu.utf8.sql
+++ b/src/oracle_test/regress/sql/collate.icu.utf8.sql
@@ -575,6 +575,9 @@ SELECT 'abc' <= 'ABC' COLLATE case_insensitive, 'abc' >= 'ABC' COLLATE case_inse
 SELECT array_sort('{a,B}'::text[] COLLATE case_insensitive);
 SELECT array_sort('{a,B}'::text[] COLLATE "C");
 
+-- test replace() at the end of the string (bug #19341)
+SELECT replace('testX' COLLATE case_insensitive, 'x' COLLATE case_insensitive, 'er');
+
 -- test language tags
 CREATE COLLATION lt_insensitive (provider = icu, locale = 'en-u-ks-level1', deterministic = false);
 SELECT 'aBcD' COLLATE lt_insensitive = 'AbCd' COLLATE lt_insensitive;
@@ -612,6 +615,109 @@ CREATE UNIQUE INDEX ON test3cs (x);  -- ok
 SELECT string_to_array('ABC,DEF,GHI' COLLATE case_sensitive, ',', 'abc');
 SELECT string_to_array('ABCDEFGHI' COLLATE case_sensitive, NULL, 'b');
 
+--
+-- A unique index under one collation does not prove uniqueness under
+-- another, so the planner must not use such a proof for any optimization.
+--
+
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+-- Ensure that self-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+--
+-- A DISTINCT / GROUP BY / set-op on a subquery does not prove uniqueness
+-- under a different collation, so the planner must not use such a proof for
+-- any optimization.
+--
+
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Same with GROUP BY
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Same with set-op
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
 CREATE TABLE test1ci (x text COLLATE case_insensitive);
 CREATE TABLE test2ci (x text COLLATE case_insensitive);
 CREATE TABLE test3ci (x text COLLATE case_insensitive);
@@ -642,6 +748,87 @@ CREATE UNIQUE INDEX ON test3ci (x);  -- error
 SELECT string_to_array('ABC,DEF,GHI' COLLATE case_insensitive, ',', 'abc');
 SELECT string_to_array('ABCDEFGHI' COLLATE case_insensitive, NULL, 'b');
 
+-- Test HAVING-to-WHERE pushdown with nondeterministic collations.
+-- When a HAVING clause uses a different collation than the GROUP BY's
+-- nondeterministic collation, it must not be pushed to WHERE, otherwise
+-- aggregate results can change because the stricter filter eliminates rows
+-- before grouping.
+
+-- Negative: collation conflict, HAVING must not be pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+
+-- Positive: same collation, safe to push HAVING to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+
+-- Negative: function applied to grouped column with conflicting collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+
+-- Positive: function with same collation as GROUP BY
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+
+-- Negative: inner function has conflicting collation, even though outer
+-- operator's collation matches GROUP BY due to a COLLATE override
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+
+-- Mixed AND: conflicting clause stays in HAVING, safe clause pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+
+-- Positive: AND of two safe clauses, both can be pushed
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+
+-- Negative: OR with a conflicting clause: must stay in HAVING
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+
+-- Negative: collation conflict inside a RowCompareExpr
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+
+-- Negative: simple-CASE form with conflicting WHEN comparison collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+
+-- Positive: simple-CASE form with matching collation, safe to push
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+
+-- Negative: nested CASE with collation conflict
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+
+-- Positive: conflicting collation but no grouping expression reference
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING current_setting('server_version') = 'abc' COLLATE case_sensitive;
+
+-- Positive: deterministic collation in GROUP BY: always safe to push, even if
+-- HAVING uses a nondeterministic collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+
 -- bpchar
 CREATE TABLE test1bpci (x char(3) COLLATE case_insensitive);
 CREATE TABLE test2bpci (x char(3) COLLATE case_insensitive);
@@ -990,6 +1177,26 @@ RESET enable_partitionwise_aggregate;
 RESET max_parallel_workers_per_gather;
 RESET enable_incremental_sort;
 
+--
+-- A unique index can prove functional dependency for GROUP BY column
+-- removal only if its per-column collation agrees on equality with
+-- the GROUP BY column's collation.  An index built under a different
+-- (deterministic) collation would otherwise let remove_useless_groupby_columns
+-- drop other columns whose values still differ within a nondeterministic
+-- group.
+--
+CREATE TABLE groupby_collation_t (a text COLLATE case_insensitive NOT NULL, b text);
+INSERT INTO groupby_collation_t VALUES ('foo', 'X'), ('FOO', 'Y');
+CREATE UNIQUE INDEX ON groupby_collation_t (a COLLATE "C");
+
+-- Column b must NOT be dropped: under case_insensitive on a, 'foo' and
+-- 'FOO' would merge, but they have distinct b values.
+EXPLAIN (COSTS OFF)
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+
+DROP TABLE groupby_collation_t;
+
 -- virtual generated columns
 CREATE TABLE t5 (
     a int,
@@ -1004,6 +1211,19 @@ INSERT INTO t5 (a, b) values (1, 'D1'), (2, 'D2'), (3, 'd1');
 -- rewriting.)
 SELECT * FROM t5 ORDER BY c ASC, a ASC;
 
+-- Check that DEFAULT expressions in SQL/JSON functions use the same collation
+-- as the RETURNING type.  Mismatched collations should raise an error.
+CREATE DOMAIN d1 AS text COLLATE case_insensitive;
+CREATE DOMAIN d2 AS text COLLATE "C";
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT ('C' COLLATE "C") COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
+DROP DOMAIN d1, d2;
 
 -- cleanup
 RESET search_path;
diff --git a/src/oracle_test/regress/sql/compression_pglz.sql b/src/oracle_test/regress/sql/compression_pglz.sql
new file mode 100644
index 00000000000..389ce942278
--- /dev/null
+++ b/src/oracle_test/regress/sql/compression_pglz.sql
@@ -0,0 +1,55 @@
+--
+-- Tests for PGLZ compression
+--
+
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/oraregress' :dlsuffix
+
+CREATE FUNCTION test_pglz_compress(bytea)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_pglz_decompress(bytea, int4, bool)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+/
+
+-- Round-trip with pglz: compress then decompress.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, false) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, true) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+
+-- Decompression with rawsize too large, fails to fill the destination
+-- buffer.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 500, true);
+
+-- Decompression with rawsize too small, fails with source not fully
+-- consumed.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 100, true);
+
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- no data follows.
+SELECT length(test_pglz_decompress('\x01'::bytea, 1024, false)) AS ctrl_only_len;
+SELECT test_pglz_decompress('\x01'::bytea, 1024, true);
+
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- 1 byte follows.
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, false);
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, true);
+
+-- Corrupted compressed data.  Set control bit with match tag where length
+-- nibble is 3 bytes (extended length), no data follows.
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, false);
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, true);
+
+-- Clean up
+DROP FUNCTION test_pglz_compress;
+DROP FUNCTION test_pglz_decompress;
diff --git a/src/oracle_test/regress/sql/constraints.sql b/src/oracle_test/regress/sql/constraints.sql
index 120f3a8e3b0..4a2624da5dc 100644
--- a/src/oracle_test/regress/sql/constraints.sql
+++ b/src/oracle_test/regress/sql/constraints.sql
@@ -8,6 +8,7 @@
 --  - EXCLUDE clauses
 --  - NOT NULL clauses
 --
+\set EXECUTE_RUN_PREPARE on
 
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
@@ -537,6 +538,9 @@ CREATE TABLE UNIQUE_NOTEN_TBL(i int UNIQUE NOT ENFORCED);
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key ENFORCED;
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT ENFORCED;
 
+-- can't make an existing constraint NOT VALID
+ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+
 DROP TABLE unique_tbl;
 
 --
@@ -620,7 +624,9 @@ DROP TABLE deferred_excl;
 -- verify constraints created for NOT NULL clauses
 CREATE TABLE notnull_tbl1 (a INTEGER NOT NULL NOT NULL);
 \d+ notnull_tbl1
--- no-op
+-- specifying an existing constraint is a no-op
+ALTER TABLE notnull_tbl1 ADD CONSTRAINT notnull_tbl1_a_not_null NOT NULL a;
+-- but using a different constraint name is not allowed
 ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
 \d+ notnull_tbl1
 -- duplicate name
@@ -829,6 +835,9 @@ ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
 -- cannot add primary key on a column with an invalid not-null
 ALTER TABLE notnull_tbl1 ADD PRIMARY KEY (a);
 
+-- cannot set column as generated-as-identity if it has an invalid not-null
+ALTER TABLE notnull_tbl1 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;
+
 -- ALTER column SET NOT NULL validates an invalid constraint (but this fails
 -- because of rows with null values)
 ALTER TABLE notnull_tbl1 ALTER a SET NOT NULL;
@@ -1008,6 +1017,7 @@ DEALLOCATE get_nnconstraint_info;
 -- Comments
 -- Setup a low-level role to enforce non-superuser checks.
 CREATE ROLE regress_constraint_comments;
+GRANT CREATE ON SCHEMA public TO regress_constraint_comments;
 SET SESSION AUTHORIZATION regress_constraint_comments;
 
 CREATE TABLE constraint_comments_tbl (a int CONSTRAINT the_constraint CHECK (a > 0));
@@ -1038,5 +1048,17 @@ RESET SESSION AUTHORIZATION;
 DROP TABLE constraint_comments_tbl;
 DROP DOMAIN constraint_comments_dom;
 
+REVOKE CREATE ON SCHEMA public FROM regress_constraint_comments;
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';
+
+-- Create a table that exercises pg_upgrade
+CREATE TABLE regress_notnull1 (a integer);
+CREATE TABLE regress_notnull2 () INHERITS (regress_notnull1);
+ALTER TABLE ONLY regress_notnull2 ALTER COLUMN a SET NOT NULL;
diff --git a/src/oracle_test/regress/sql/create_function_sql.sql b/src/oracle_test/regress/sql/create_function_sql.sql
index b6c8de6d9bc..16e306f6cb8 100644
--- a/src/oracle_test/regress/sql/create_function_sql.sql
+++ b/src/oracle_test/regress/sql/create_function_sql.sql
@@ -485,6 +485,23 @@ $$ SELECT array_append($1, $2) || array_append($1, $2) $$;
 SELECT double_append(array_append(ARRAY[q1], q2), q3)
   FROM (VALUES(1,2,3), (4,5,6)) v(q1,q2,q3);
 
+-- Check that we can re-use a SQLFunctionCache after a run-time error.
+
+-- This function will fail with zero-divide at run time (not plan time).
+CREATE FUNCTION part_hashint4_error(value int4, seed int8) RETURNS int8
+LANGUAGE SQL STRICT IMMUTABLE PARALLEL SAFE AS
+$$ SELECT value + seed + random()::int/0 $$;
+/
+-- Put it into an operator class so that FmgrInfo will be cached in relcache.
+CREATE OPERATOR CLASS part_test_int4_ops_bad FOR TYPE int4 USING hash AS
+  FUNCTION 2 part_hashint4_error(int4, int8);
+
+CREATE TABLE pt(i int) PARTITION BY hash (i part_test_int4_ops_bad);
+CREATE TABLE p1 PARTITION OF pt FOR VALUES WITH (modulus 4, remainder 0);
+
+INSERT INTO pt VALUES (1);
+INSERT INTO pt VALUES (1);
+
 -- Things that shouldn't work:
 
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
@@ -521,4 +538,4 @@ RESET check_function_bodies;
 DROP SCHEMA temp_func_test CASCADE;
 DROP USER regress_unpriv_user;
 RESET search_path;
-reset ivorysql.enable_emptystring_to_null;
\ No newline at end of file
+reset ivorysql.enable_emptystring_to_null;
diff --git a/src/oracle_test/regress/sql/create_index.sql b/src/oracle_test/regress/sql/create_index.sql
index 0ab60868933..5c3be35d85f 100644
--- a/src/oracle_test/regress/sql/create_index.sql
+++ b/src/oracle_test/regress/sql/create_index.sql
@@ -45,6 +45,10 @@ CREATE INDEX six ON shighway USING btree (name text_ops);
 COMMENT ON INDEX six_wrong IS 'bad index';
 COMMENT ON INDEX six IS 'good index';
 COMMENT ON INDEX six IS NULL;
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+COMMENT ON INDEX six IS 'add the comment back';
+COMMENT ON INDEX six IS ''; -- empty string removes the comment, same as NULL
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
 
 --
 -- BTREE partial indices
@@ -636,7 +640,7 @@ DROP TABLE cwi_test;
 CREATE TABLE syscol_table (a INT);
 
 -- System columns cannot be indexed
-CREATE INDEX ON syscolcol_table (ctid);
+CREATE INDEX ON syscol_table (ctid);
 
 -- nor used in expressions
 CREATE INDEX ON syscol_table ((ctid >= '(1000,0)'));
diff --git a/src/oracle_test/regress/sql/create_role.sql b/src/oracle_test/regress/sql/create_role.sql
index 4491a28a8ae..b22f9c6f50a 100644
--- a/src/oracle_test/regress/sql/create_role.sql
+++ b/src/oracle_test/regress/sql/create_role.sql
@@ -92,6 +92,13 @@ CREATE ROLE regress_hasprivs CREATEROLE LOGIN INHERIT CONNECTION LIMIT 5;
 
 -- ok, we should be able to modify a role we created
 COMMENT ON ROLE regress_hasprivs IS 'some comment';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+COMMENT ON ROLE regress_hasprivs IS NULL;
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+COMMENT ON ROLE regress_hasprivs IS 'add the comment back';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+COMMENT ON ROLE regress_hasprivs IS ''; -- empty string removes the comment, same as NULL
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
 ALTER ROLE regress_hasprivs RENAME TO regress_tenant;
 ALTER ROLE regress_tenant NOINHERIT NOLOGIN CONNECTION LIMIT 7;
 
diff --git a/src/oracle_test/regress/sql/create_table.sql b/src/oracle_test/regress/sql/create_table.sql
index 4b519be3fc1..8d33e46f98f 100644
--- a/src/oracle_test/regress/sql/create_table.sql
+++ b/src/oracle_test/regress/sql/create_table.sql
@@ -68,6 +68,14 @@ CREATE TABLE withoid() WITH (oids = true);
 CREATE TEMP TABLE withoutoid() WITHOUT OIDS; DROP TABLE withoutoid;
 CREATE TEMP TABLE withoutoid() WITH (oids = false); DROP TABLE withoutoid;
 
+-- temporary tables are ignored by pg_filenode_relation().
+CREATE TEMP TABLE relation_filenode_check(c1 int);
+SELECT relpersistence,
+  pg_filenode_relation (reltablespace, pg_relation_filenode(oid))
+  FROM pg_class
+  WHERE relname = 'relation_filenode_check';
+DROP TABLE relation_filenode_check;
+
 -- check restriction with default expressions
 -- invalid use of column reference in default expressions
 CREATE TABLE default_expr_column (id int DEFAULT (id));
@@ -97,6 +105,13 @@ SAVEPOINT q; DROP TABLE remember_node_subid; ROLLBACK TO q;
 COMMIT;
 DROP TABLE remember_node_subid;
 
+-- generated NOT NULL constraint names must not collide with explicitly named constraints
+CREATE TABLE two_not_null_constraints (
+   col integer NOT NULL,
+   CONSTRAINT two_not_null_constraints_col_not_null CHECK (col IS NOT NULL)
+);
+DROP TABLE two_not_null_constraints;
+
 --
 -- Partitioned tables
 --
diff --git a/src/oracle_test/regress/sql/create_table_like.sql b/src/oracle_test/regress/sql/create_table_like.sql
index bf8702116a7..d52a93ef131 100644
--- a/src/oracle_test/regress/sql/create_table_like.sql
+++ b/src/oracle_test/regress/sql/create_table_like.sql
@@ -130,6 +130,7 @@ DROP TABLE inhz;
 -- including storage and comments
 CREATE TABLE ctlt1 (a text CHECK (length(a) > 2) ENFORCED PRIMARY KEY,
 	b text CHECK (length(b) > 100) NOT ENFORCED);
+ALTER TABLE ctlt1 ADD CONSTRAINT cc CHECK (length(b) > 100) NOT VALID;
 CREATE INDEX ctlt1_b_key ON ctlt1 (b);
 CREATE INDEX ctlt1_fnidx ON ctlt1 ((a || b));
 CREATE STATISTICS ctlt1_a_b_stat ON a,b FROM ctlt1;
@@ -275,6 +276,32 @@ CREATE FOREIGN TABLE ctl_foreign_table2(LIKE ctl_table INCLUDING ALL) SERVER ctl
 SELECT attname, attcompression FROM pg_attribute
   WHERE attrelid = 'ctl_foreign_table2'::regclass and attnum > 0 ORDER BY attnum;
 
+-- LIKE ... INCLUDING STATISTICS with dropped columns in the parent,
+-- so stxkeys attnums are not contiguous.
+CREATE TABLE ctl_stats3_parent (a int, b int, c int);
+ALTER TABLE ctl_stats3_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats3_stat ON a, c FROM ctl_stats3_parent;
+CREATE TABLE ctl_stats3_child (LIKE ctl_stats3_parent INCLUDING STATISTICS);
+CREATE TABLE ctl_stats4_parent (a int, b int, c int, d int);
+ALTER TABLE ctl_stats4_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats4_stat ON a, c FROM ctl_stats4_parent;
+CREATE TABLE ctl_stats4_child (LIKE ctl_stats4_parent INCLUDING STATISTICS);
+SELECT s.stxrelid::regclass AS relation,
+       array_agg(a.attname ORDER BY u.ord) AS stats_columns
+FROM pg_statistic_ext s
+CROSS JOIN LATERAL
+  unnest(s.stxkeys::int2[]) WITH ORDINALITY AS u(attnum, ord)
+JOIN pg_attribute a
+  ON a.attrelid = s.stxrelid AND a.attnum = u.attnum
+WHERE s.stxrelid IN ('ctl_stats3_child'::regclass,
+                     'ctl_stats4_child'::regclass)
+GROUP BY s.stxrelid
+ORDER BY s.stxrelid::regclass::text;
+DROP TABLE ctl_stats3_parent;
+DROP TABLE ctl_stats3_child;
+DROP TABLE ctl_stats4_parent;
+DROP TABLE ctl_stats4_child;
+
 DROP TABLE ctl_table;
 DROP FOREIGN TABLE ctl_foreign_table1;
 DROP FOREIGN TABLE ctl_foreign_table2;
diff --git a/src/oracle_test/regress/sql/domain.sql b/src/oracle_test/regress/sql/domain.sql
index cc50e25d93b..692b6d72aa3 100644
--- a/src/oracle_test/regress/sql/domain.sql
+++ b/src/oracle_test/regress/sql/domain.sql
@@ -2,6 +2,7 @@
 -- Test domains.
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- Test Comment / Drop
 create domain domaindroptest int4;
 comment on domain domaindroptest is 'About to drop this..';
@@ -603,6 +604,9 @@ insert into domain_test values (1, 2);
 -- should fail
 alter table domain_test add column c str_domain;
 
+-- disallow duplicated not-null constraints
+create domain int_domain1 as int constraint nn1 not null constraint nn2 not null;
+
 create domain str_domain2 as text check (value <> 'foo') default 'foo';
 
 -- should fail
diff --git a/src/oracle_test/regress/sql/encoding.sql b/src/oracle_test/regress/sql/encoding.sql
new file mode 100644
index 00000000000..9a9ac1685d2
--- /dev/null
+++ b/src/oracle_test/regress/sql/encoding.sql
@@ -0,0 +1,254 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/oraregress' :dlsuffix
+
+CREATE FUNCTION test_bytea_to_text(bytea) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_text_to_bytea(text) RETURNS bytea
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_mblen_func(text, text, text, int) RETURNS int
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_text_to_wchars(text, text) RETURNS int[]
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_wchars_to_text(text, int[]) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+CREATE FUNCTION test_valid_server_encoding(text) RETURNS boolean
+    AS :'regresslib' LANGUAGE C STRICT;
+/
+
+
+CREATE TABLE regress_encoding(good text, truncated text, with_nul text, truncated_with_nul text);
+INSERT INTO regress_encoding
+VALUES ('café',
+        'caf' || test_bytea_to_text('\xc3'),
+        'café' || test_bytea_to_text('\x00') || 'dcba',
+        'caf' || test_bytea_to_text('\xc300') || 'dcba');
+
+SELECT good, truncated, with_nul FROM regress_encoding;
+
+SELECT length(good) FROM regress_encoding;
+SELECT substring(good, 3, 1) FROM regress_encoding;
+SELECT substring(good, 4, 1) FROM regress_encoding;
+SELECT regexp_replace(good, '^caf(.)$', '\1') FROM regress_encoding;
+SELECT reverse(good) FROM regress_encoding;
+
+-- invalid short mb character = error
+SELECT length(truncated) FROM regress_encoding;
+SELECT substring(truncated, 1, 3) FROM regress_encoding;
+SELECT substring(truncated, 1, 4) FROM regress_encoding;
+SELECT reverse(truncated) FROM regress_encoding;
+-- invalid short mb character = silently dropped
+SELECT regexp_replace(truncated, '^caf(.)$', '\1') FROM regress_encoding;
+
+-- PostgreSQL doesn't allow strings to contain NUL.  If a corrupted string
+-- contains NUL at a character boundary position, some functions treat it as a
+-- character while others treat it as a terminator, as implementation details.
+
+-- NUL = terminator
+SELECT length(with_nul) FROM regress_encoding;
+SELECT substring(with_nul, 3, 1) FROM regress_encoding;
+SELECT substring(with_nul, 4, 1) FROM regress_encoding;
+SELECT substring(with_nul, 5, 1) FROM regress_encoding;
+SELECT convert_to(substring(with_nul, 5, 1), 'UTF8') FROM regress_encoding;
+SELECT regexp_replace(with_nul, '^caf(.)$', '\1') FROM regress_encoding;
+-- NUL = character
+SELECT with_nul, reverse(with_nul), reverse(reverse(with_nul)) FROM regress_encoding;
+
+-- If a corrupted string contains NUL in the tail bytes of a multibyte
+-- character (invalid in all encodings), it is considered part of the
+-- character for length purposes.  An error will only be raised in code paths
+-- that convert or verify encodings.
+
+SELECT length(truncated_with_nul) FROM regress_encoding;
+SELECT substring(truncated_with_nul, 3, 1) FROM regress_encoding;
+SELECT substring(truncated_with_nul, 4, 1) FROM regress_encoding;
+SELECT convert_to(substring(truncated_with_nul, 4, 1), 'UTF8') FROM regress_encoding;
+SELECT substring(truncated_with_nul, 5, 1) FROM regress_encoding;
+SELECT regexp_replace(truncated_with_nul, '^caf(.)dcba$', '\1') = test_bytea_to_text('\xc300') FROM regress_encoding;
+SELECT reverse(truncated_with_nul) FROM regress_encoding;
+
+-- unbounded: sequence would overrun the string!
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated, 3)
+FROM regress_encoding;
+
+-- condition detected when using the length/range variants
+SELECT test_mblen_func('pg_mblen_with_len', 'UTF8', truncated, 3)
+FROM regress_encoding;
+SELECT test_mblen_func('pg_mblen_range', 'UTF8', truncated, 3)
+FROM regress_encoding;
+
+-- unbounded: sequence would overrun the string, if the terminator were really
+-- the end of it
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+SELECT test_mblen_func('pg_encoding_mblen', 'GB18030', truncated_with_nul, 3)
+FROM regress_encoding;
+
+-- condition detected when using the cstr variants
+SELECT test_mblen_func('pg_mblen_cstr', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+
+DROP TABLE regress_encoding;
+
+-- mb<->wchar conversions
+CREATE FUNCTION test_encoding(encoding text, description text, input bytea)
+RETURNS VOID LANGUAGE plisql AS
+$$
+DECLARE
+	prefix text;
+	len int;
+	wchars int[];
+	round_trip bytea;
+	result text;
+BEGIN
+	prefix := rpad(encoding || ' ' || description || ':', 28);
+
+	-- XXX could also test validation, length functions and include client
+	-- only encodings with these test cases
+
+	IF test_valid_server_encoding(encoding) THEN
+		wchars := test_text_to_wchars(encoding, test_bytea_to_text(input));
+		round_trip = test_text_to_bytea(test_wchars_to_text(encoding, wchars));
+		if input = round_trip then
+			result := 'OK';
+		elsif length(input) > length(round_trip) and round_trip = substr(input, 1, length(round_trip)) then
+			result := 'truncated';
+		else
+			result := 'failed';
+		end if;
+		RAISE NOTICE '% % -> % -> % = %', prefix, input, wchars, round_trip, result;
+	END IF;
+END;
+$$;
+/
+-- No validation is done on the encoding itself, just the length to avoid
+-- overruns, so some of the byte sequences below are bogus.  They cover
+-- all code branches, server encodings only for now.
+CREATE TABLE encoding_tests (encoding text, description text, input bytea);
+INSERT INTO encoding_tests VALUES
+	-- LATIN1, other single-byte encodings
+	('LATIN1', 'ASCII',    'a'),
+	('LATIN1', 'extended', '\xe9'),
+	-- EUC_JP, EUC_JIS_2004, EUR_KR (for the purposes of wchar conversion):
+	-- 2 8e (CS2, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 3 8f (CS3, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 2 80..ff (CS1)
+	('EUC_JP', 'ASCII',      'a'),
+	('EUC_JP', 'CS1, short', '\x80'),
+	('EUC_JP', 'CS1',        '\x8002'),
+	('EUC_JP', 'CS2, short', '\x8e'),
+	('EUC_JP', 'CS2',        '\x8e02'),
+	('EUC_JP', 'CS3, short', '\x8f'),
+	('EUC_JP', 'CS3, short', '\x8f02'),
+	('EUC_JP', 'CS3',        '\x8f0203'),
+	-- EUC_CN
+	-- 3 8e (CS2, not used but arbitrarily considered to have length 3)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_CN', 'ASCII',      'a'),
+	('EUC_CN', 'CS1, short', '\x80'),
+	('EUC_CN', 'CS1',        '\x8002'),
+	('EUC_CN', 'CS2, short', '\x8e'),
+	('EUC_CN', 'CS2, short', '\x8e02'),
+	('EUC_CN', 'CS2',        '\x8e0203'),
+	('EUC_CN', 'CS3, short', '\x8f'),
+	('EUC_CN', 'CS3, short', '\x8f02'),
+	('EUC_CN', 'CS3',        '\x8f0203'),
+	-- EUC_TW:
+	-- 4 8e (CS2)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_TW', 'ASCII',      'a'),
+	('EUC_TW', 'CS1, short', '\x80'),
+	('EUC_TW', 'CS1',        '\x8002'),
+	('EUC_TW', 'CS2, short', '\x8e'),
+	('EUC_TW', 'CS2, short', '\x8e02'),
+	('EUC_TW', 'CS2, short', '\x8e0203'),
+	('EUC_TW', 'CS2',        '\x8e020304'),
+	('EUC_TW', 'CS3, short', '\x8f'),
+	('EUC_TW', 'CS3, short', '\x8f02'),
+	('EUC_TW', 'CS3',        '\x8f0203'),
+	-- UTF8
+	-- 2 c0..df
+	-- 3 e0..ef
+	-- 4 f0..f7 (but maximum real codepoint U+10ffff has f4)
+	-- 5 f8..fb (not supported)
+	-- 6 fc..fd (not supported)
+	('UTF8',   'ASCII',               'a'),
+	('UTF8',   '2 byte, short',       '\xdf'),
+	('UTF8',   '2 byte',              '\xdf82'),
+	('UTF8',   '3 byte, short',       '\xef'),
+	('UTF8',   '3 byte, short',       '\xef82'),
+	('UTF8',   '3 byte',              '\xef8283'),
+	('UTF8',   '4 byte, short',       '\xf7'),
+	('UTF8',   '4 byte, short',       '\xf782'),
+	('UTF8',   '4 byte, short',       '\xf78283'),
+	('UTF8',   '4 byte',              '\xf7828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb'),
+	('UTF8',   '5 byte, unsupported', '\xfb82'),
+	('UTF8',   '5 byte, unsupported', '\xfb8283'),
+	('UTF8',   '5 byte, unsupported', '\xfb828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd'),
+	('UTF8',   '6 byte, unsupported', '\xfd82'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283'),
+	('UTF8',   '6 byte, unsupported', '\xfd828384'),
+	('UTF8',   '6 byte, unsupported', '\xfd82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283848586'),
+	-- MULE_INTERNAL
+	-- 2 81..8d LC1
+	-- 3 90..99 LC2
+	('MULE_INTERNAL', 'ASCII',         'a'),
+	('MULE_INTERNAL', 'LC1, short',    '\x81'),
+	('MULE_INTERNAL', 'LC1',           '\x8182'),
+	('MULE_INTERNAL', 'LC2, short',    '\x90'),
+	('MULE_INTERNAL', 'LC2, short',    '\x9082'),
+	('MULE_INTERNAL', 'LC2',           '\x908283');
+
+SELECT COUNT(test_encoding(encoding, description, input)) > 0
+FROM encoding_tests;
+
+-- substring fetches a slice of a toasted value; unused tail of that slice is
+-- an incomplete char (bug #19406)
+CREATE TABLE toast_3b_utf8 (c text);
+INSERT INTO toast_3b_utf8 VALUES (repeat(U&'\2026', 4000));
+SELECT SUBSTRING(c FROM 1 FOR 1) FROM toast_3b_utf8;
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+-- diagnose incomplete char iff within the substring
+UPDATE toast_3b_utf8 SET c = c || test_bytea_to_text('\xe280');
+SELECT SUBSTRING(c FROM 4000 FOR 1) FROM toast_3b_utf8;
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+-- substring needing last byte of its slice_size
+ALTER TABLE toast_3b_utf8 RENAME TO toast_4b_utf8;
+UPDATE toast_4b_utf8 SET c = repeat(U&'\+01F680', 3000);
+SELECT SUBSTRING(c FROM 3000 FOR 1) FROM toast_4b_utf8;
+
+DROP TABLE encoding_tests;
+DROP TABLE toast_4b_utf8;
+DROP FUNCTION test_encoding;
+DROP FUNCTION test_wchars_to_text;
+DROP FUNCTION test_text_to_wchars;
+DROP FUNCTION test_valid_server_encoding;
+DROP FUNCTION test_mblen_func;
+DROP FUNCTION test_bytea_to_text;
+DROP FUNCTION test_text_to_bytea;
+
+
+-- substring slow path: multi-byte escape char vs. multi-byte pattern char.
+SELECT SUBSTRING('a' SIMILAR U&'\00AC' ESCAPE U&'\00A7');
+-- Levenshtein distance metric: exercise character length cache.
+SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+-- JSON errcontext: truncate long data.
+SELECT repeat(U&'\00A7', 30)::json;
diff --git a/src/oracle_test/regress/sql/euc_kr.sql b/src/oracle_test/regress/sql/euc_kr.sql
new file mode 100644
index 00000000000..1851b2a8c14
--- /dev/null
+++ b/src/oracle_test/regress/sql/euc_kr.sql
@@ -0,0 +1,12 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+-- Exercise is_multibyte_char_in_char (non-UTF8) slow path.
+SELECT POSITION(
+	convert_from('\xbcf6c7d0', 'EUC_KR') IN
+	convert_from('\xb0fac7d02c20bcf6c7d02c20b1e2bcfa2c20bbee', 'EUC_KR'));
diff --git a/src/oracle_test/regress/sql/event_trigger.sql b/src/oracle_test/regress/sql/event_trigger.sql
index 403f5214b3c..f03522a864e 100644
--- a/src/oracle_test/regress/sql/event_trigger.sql
+++ b/src/oracle_test/regress/sql/event_trigger.sql
@@ -207,9 +207,15 @@ INSERT INTO undroppable_objs VALUES
 ('table', 'audit_tbls.schema_two_table_three');
 
 CREATE TABLE dropped_objects (
-	type text,
-	schema text,
-	object text
+	object_type text,
+	schema_name text,
+	object_name text,
+	object_identity text,
+	address_names text[],
+	address_args text[],
+	is_temporary bool,
+	original bool,
+	normal bool
 );
 
 -- This tests errors raised within event triggers; the one in audit_tbls
@@ -251,8 +257,12 @@ BEGIN
         END IF;
 
 	INSERT INTO dropped_objects
-		(type, schema, object) VALUES
-		(obj.object_type, obj.schema_name, obj.object_identity);
+		(object_type, schema_name, object_name,
+		 object_identity, address_names, address_args,
+		 is_temporary, original, normal) VALUES
+		(obj.object_type, obj.schema_name, obj.object_name,
+		 obj.object_identity, obj.address_names, obj.address_args,
+		 obj.is_temporary, obj.original, obj.normal);
     END LOOP;
 END
 $$;
@@ -270,10 +280,12 @@ DROP SCHEMA schema_one, schema_two CASCADE;
 DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
 DROP SCHEMA schema_one, schema_two CASCADE;
 
-SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
+-- exclude TOAST objects because they have unstable names
+SELECT * FROM dropped_objects
+  WHERE schema_name IS NULL OR schema_name <> 'pg_toast';
 
 DROP OWNED BY regress_evt_user;
-SELECT * FROM dropped_objects WHERE type = 'schema';
+SELECT * FROM dropped_objects WHERE object_type = 'schema';
 
 DROP ROLE regress_evt_user;
 
@@ -292,9 +304,10 @@ BEGIN
     IF NOT r.normal AND NOT r.original THEN
         CONTINUE;
     END IF;
-    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% name=% args=%',
+    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
         r.original, r.normal, r.is_temporary, r.object_type,
-        r.object_identity, r.address_names, r.address_args;
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
     END LOOP;
 END; $$;
 /
@@ -346,6 +359,48 @@ DROP INDEX evttrig.one_idx;
 DROP SCHEMA evttrig CASCADE;
 DROP TABLE a_temp_tbl;
 
+-- check unfiltered results, too
+CREATE OR REPLACE FUNCTION event_trigger_report_dropped()
+ RETURNS event_trigger
+ LANGUAGE plisql
+AS $$
+DECLARE r record;
+BEGIN
+    FOR r IN SELECT * from pg_event_trigger_dropped_objects()
+    LOOP
+    RAISE NOTICE 'DROP: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
+        r.original, r.normal, r.is_temporary, r.object_type,
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
+    END LOOP;
+END; $$;
+/
+
+CREATE FUNCTION event_trigger_dummy_trigger()
+ RETURNS trigger
+ LANGUAGE plisql
+AS $$
+BEGIN
+    RETURN new;
+END; $$;
+/
+
+CREATE TABLE evtrg_nontemp_table (f1 int primary key, f2 int default 42);
+CREATE TRIGGER evtrg_nontemp_trig
+  BEFORE INSERT ON evtrg_nontemp_table
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+CREATE POLICY evtrg_nontemp_pol ON evtrg_nontemp_table USING (f2 > 0);
+DROP TABLE evtrg_nontemp_table;
+
+CREATE TEMP TABLE a_temp_tbl (f1 int primary key, f2 int default 42);
+CREATE TRIGGER a_temp_trig
+  BEFORE INSERT ON a_temp_tbl
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+CREATE POLICY a_temp_pol ON a_temp_tbl USING (f2 > 0);
+DROP TABLE a_temp_tbl;
+
+DROP FUNCTION event_trigger_dummy_trigger();
+
 -- CREATE OPERATOR CLASS without FAMILY clause should report
 -- both CREATE OPERATOR FAMILY and CREATE OPERATOR CLASS
 CREATE OPERATOR CLASS evttrigopclass FOR TYPE int USING btree AS STORAGE int;
diff --git a/src/oracle_test/regress/sql/expressions.sql b/src/oracle_test/regress/sql/expressions.sql
index b29de6412a3..fed0a5f9c71 100644
--- a/src/oracle_test/regress/sql/expressions.sql
+++ b/src/oracle_test/regress/sql/expressions.sql
@@ -202,16 +202,110 @@ default for type myint using hash as
   function    1   myinthash(myint);
 
 create table inttest (a myint);
-insert into inttest values(1::myint),(null);
-
--- try an array with enough elements to cause hashing
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
--- ensure the result matched with the non-hashed version.  We simply remove
--- some array elements so that we don't reach the hashing threshold.
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint, null);
+insert into inttest values (null), (0::myint), (1::myint);
+
+-- Test EEOP_HASHED_SCALARARRAYOP against EEOP_SCALARARRAYOP.  Ensure the
+-- result of non-hashed vs hashed is the same.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+
+-- Now make the equal function return false when given two NULLs
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return $1::int = $2::int;
+  end if;
+end;
+$$ language plpgsql immutable;
+/
+
+-- And try the same again to ensure EEOP_HASHED_SCALARARRAYOP does the same
+-- thing as EEOP_SCALARARRAYOP.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+
+-- Try again with an equality function that treats NULLs as equal to 0.
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return coalesce($1::int,0) = coalesce($2::int, 0);
+  end if;
+end;
+$$ language plpgsql immutable;
+/
+
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
 
 rollback;
diff --git a/src/oracle_test/regress/sql/foreign_data.sql b/src/oracle_test/regress/sql/foreign_data.sql
index f0cc6ae8309..51dd210b9e1 100644
--- a/src/oracle_test/regress/sql/foreign_data.sql
+++ b/src/oracle_test/regress/sql/foreign_data.sql
@@ -69,6 +69,11 @@ CREATE FUNCTION invalid_fdw_handler() RETURNS int LANGUAGE SQL AS 'SELECT 1;';
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER invalid_fdw_handler;  -- ERROR
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER invalid_fdw_handler;  -- ERROR
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+
+-- should preserve dependency on test_fdw_handler
+ALTER FOREIGN DATA WRAPPER test_fdw VALIDATOR postgresql_fdw_validator;
+DROP FUNCTION test_fdw_handler(); -- ERROR
+
 DROP FOREIGN DATA WRAPPER test_fdw;
 
 -- ALTER FOREIGN DATA WRAPPER
@@ -385,10 +390,12 @@ COMMENT ON COLUMN ft1.c1 IS NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c5 integer DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE ft1 ADD COLUMN IF NOT EXISTS c6 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE ft1 ADD c11 integer;
 
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;
@@ -421,6 +428,7 @@ ALTER FOREIGN TABLE ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
 ALTER FOREIGN TABLE ft1 DROP COLUMN no_column;                  -- ERROR
 ALTER FOREIGN TABLE ft1 DROP COLUMN IF EXISTS no_column;
 ALTER FOREIGN TABLE ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE ft1 DROP c11;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
@@ -432,10 +440,12 @@ ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1;
 -- alter noexisting table
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN IF NOT EXISTS c6 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD c11 integer;
 
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c7 DROP NOT NULL;
@@ -449,8 +459,10 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP CONSTRAINT IF EXISTS no_cons
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP CONSTRAINT ft1_c1_check;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OWNER TO regress_test_role;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN no_column;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN IF EXISTS no_column;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP c11;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME c1 TO foreign_column_1;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME TO foreign_table_1;
diff --git a/src/oracle_test/regress/sql/foreign_key.sql b/src/oracle_test/regress/sql/foreign_key.sql
index d4ea39c8f1b..9b33612a3fb 100644
--- a/src/oracle_test/regress/sql/foreign_key.sql
+++ b/src/oracle_test/regress/sql/foreign_key.sql
@@ -784,6 +784,43 @@ INSERT INTO fktable VALUES (500, 1000);
 
 COMMIT;
 
+-- Check that the existing FK trigger is both deferrable and initially deferred
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Changing the constraint to NOT ENFORCED drops the associated FK triggers
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey NOT ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Changing it back to ENFORCED will recreate the necessary FK triggers
+-- that are deferrable and initially deferred
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Verify that a deferrable, initially deferred foreign key still works
+-- as expected after being set to NOT ENFORCED and then re-enabled
+BEGIN;
+
+-- doesn't match PK, but no error yet
+INSERT INTO fktable VALUES (2, 20);
+
+-- should catch error from INSERT at commit
+COMMIT;
+
 DROP TABLE fktable, pktable;
 
 -- tricky behavior: according to SQL99, if a deferred constraint is set
@@ -1296,7 +1333,7 @@ UPDATE fk_notpartitioned_pk SET b = 2504 WHERE a = 2500;
 -- check psql behavior
 \d fk_notpartitioned_pk
 
--- Check the exsting FK trigger
+-- Check the existing FK trigger
 SELECT conname, tgrelid::regclass as tgrel, regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype
 FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
 WHERE tgrelid IN (SELECT relid FROM pg_partition_tree('fk_partitioned_fk'::regclass)
@@ -2387,3 +2424,51 @@ SET client_min_messages TO warning;
 DROP SCHEMA fkpart12 CASCADE;
 RESET client_min_messages;
 RESET search_path;
+
+-- Exercise the column mapping code with foreign keys.  In this test we'll
+-- create a partitioned table which has a partition with a dropped column and
+-- check to ensure that an UPDATE cascades the changes correctly to the
+-- partitioned table.
+CREATE SCHEMA fkpart13;
+SET search_path TO fkpart13;
+
+CREATE TABLE fkpart13_t1 (a int PRIMARY KEY);
+
+CREATE TABLE fkpart13_t2 (
+  part_id int PRIMARY KEY,
+  column_to_drop int,
+  FOREIGN KEY (part_id) REFERENCES fkpart13_t1 ON UPDATE CASCADE ON DELETE CASCADE
+) PARTITION BY LIST (part_id);
+
+CREATE TABLE fkpart13_t2_p1 PARTITION OF fkpart13_t2 FOR VALUES IN (1);
+
+-- drop the column
+ALTER TABLE fkpart13_t2 DROP COLUMN column_to_drop;
+
+-- create a new partition without the dropped column
+CREATE TABLE fkpart13_t2_p2 PARTITION OF fkpart13_t2 FOR VALUES IN (2);
+
+CREATE TABLE fkpart13_t3 (
+  a int NOT NULL,
+  FOREIGN KEY (a)
+    REFERENCES fkpart13_t2
+    ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+INSERT INTO fkpart13_t1 (a) VALUES (1);
+INSERT INTO fkpart13_t2 (part_id) VALUES (1);
+INSERT INTO fkpart13_t3 (a) VALUES (1);
+
+-- Test a cascading update works correctly with with the dropped column
+UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+SELECT tableoid::regclass,* FROM fkpart13_t2;
+SELECT tableoid::regclass,* FROM fkpart13_t3;
+
+-- Exercise code in ExecGetTriggerResultRel() as there's been previous issues
+-- with ResultRelInfos being returned with the incorrect ri_RootResultRelInfo
+WITH cte AS (
+  UPDATE fkpart13_t2_p1 SET part_id = part_id
+) UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+
+DROP SCHEMA fkpart13 CASCADE;
+RESET search_path;
diff --git a/src/oracle_test/regress/sql/functional_deps.sql b/src/oracle_test/regress/sql/functional_deps.sql
index 406490b995c..a6123af8c21 100644
--- a/src/oracle_test/regress/sql/functional_deps.sql
+++ b/src/oracle_test/regress/sql/functional_deps.sql
@@ -1,5 +1,6 @@
 -- from http://www.depesz.com/index.php/2010/04/19/getting-unique-elements/
 
+\set EXECUTE_RUN_PREPARE on
 CREATE TEMP TABLE articles (
     id int CONSTRAINT articles_pkey PRIMARY KEY,
     keywords text,
diff --git a/src/oracle_test/regress/sql/generated_stored.sql b/src/oracle_test/regress/sql/generated_stored.sql
index c73feab9079..e5f411103e5 100644
--- a/src/oracle_test/regress/sql/generated_stored.sql
+++ b/src/oracle_test/regress/sql/generated_stored.sql
@@ -207,6 +207,10 @@ COPY gtest1 FROM stdin;
 
 COPY gtest1 (a, b) FROM stdin;
 
+COPY gtest1 FROM stdin WHERE b <> 10;
+
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+
 SELECT * FROM gtest1 ORDER BY a;
 
 TRUNCATE gtest3;
@@ -491,7 +495,10 @@ SELECT tableoid::regclass, * FROM gtest_parent ORDER BY 1, 2, 3;
 
 -- generated columns in partition key (not allowed)
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE (f3);
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key is not null));
 
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
@@ -586,6 +593,19 @@ ALTER TABLE gtest30_1 ALTER COLUMN b DROP EXPRESSION;  -- error
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c text);
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
+
+-- bug #18970: these cases are unsupported, but make sure they fail cleanly
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+
 DROP TABLE gtest31_1, gtest31_2;
 
 -- Check it for a partitioned table, too
@@ -725,6 +745,29 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
 
 \d gtest28*
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) STORED);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+DROP TABLE gtest_rule;
 
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
diff --git a/src/oracle_test/regress/sql/generated_virtual.sql b/src/oracle_test/regress/sql/generated_virtual.sql
index 06e09dad11c..8a95bfa26f4 100644
--- a/src/oracle_test/regress/sql/generated_virtual.sql
+++ b/src/oracle_test/regress/sql/generated_virtual.sql
@@ -217,6 +217,10 @@ COPY gtest1 FROM stdin;
 
 COPY gtest1 (a, b) FROM stdin;
 
+COPY gtest1 FROM stdin WHERE b <> 10;
+
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+
 SELECT * FROM gtest1 ORDER BY a;
 
 TRUNCATE gtest3;
@@ -544,7 +548,10 @@ SELECT tableoid::regclass, * FROM gtest_parent ORDER BY 1, 2, 3;
 
 -- generated columns in partition key (not allowed)
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE (f3);
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key is not null));
 
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
@@ -647,6 +654,19 @@ ALTER TABLE gtest30_1 ALTER COLUMN b DROP EXPRESSION;  -- error
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c text);
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
+
+-- bug #18970
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+
 DROP TABLE gtest31_1, gtest31_2;
 
 -- Check it for a partitioned table, too
@@ -787,6 +807,29 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
 
 \d gtest28*
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) VIRTUAL);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+DROP TABLE gtest_rule;
 
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
@@ -851,3 +894,58 @@ select * from gtest32 t group by grouping sets (a, b, c, d, e) having c = 20;
 alter table gtest32 alter column e type bigint using b;
 
 drop table gtest32;
+
+-- Ensure that virtual generated columns in constraint expressions are expanded
+create table gtest33 (a int, b int generated always as (a * 2) virtual not null, check (b > 10));
+set constraint_exclusion to on;
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b < 10;
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b is null;
+
+reset constraint_exclusion;
+drop table gtest33;
+
+-- Ensure that EXCLUDED.<virtual-generated-column> in INSERT ... ON CONFLICT
+-- DO UPDATE is expanded to the generation expression, both for plain and
+-- partitioned target relations.
+create table gtest34 (id int primary key, a int,
+                      c int generated always as (a * 10) virtual);
+insert into gtest34 values (1, 5);
+insert into gtest34 values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+insert into gtest34 values (1, 2)
+    on conflict (id) do update set a = gtest34.c + excluded.c returning *;
+insert into gtest34 values (1, 3)
+    on conflict (id) do update set a = 999 where excluded.c > 20 returning *;
+drop table gtest34;
+
+create table gtest34p (id int primary key, a int,
+                       c int generated always as (a * 10) virtual)
+    partition by range (id);
+create table gtest34p_1 partition of gtest34p for values from (1) to (100);
+insert into gtest34p values (1, 5);
+insert into gtest34p values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+insert into gtest34p values (1, 2)
+    on conflict (id) do update set a = gtest34p.c + excluded.c returning *;
+drop table gtest34p;
+
+-- Ensure that virtual generated columns work with WHERE CURRENT OF
+create table gtest_cursor (id int primary key, a int, b int generated always as (a * 2) virtual);
+insert into gtest_cursor values (1, 10), (2, 20), (3, 30);
+
+begin;
+declare curs cursor for select * from gtest_cursor order by id for update;
+fetch 1 from curs;
+update gtest_cursor set a = 99 where current of curs;
+select * from gtest_cursor order by id;
+delete from gtest_cursor where current of curs;
+select * from gtest_cursor order by id;
+commit;
+
+drop table gtest_cursor;
diff --git a/src/oracle_test/regress/sql/groupingsets.sql b/src/oracle_test/regress/sql/groupingsets.sql
index 38e012461d4..fcbc0cb5621 100644
--- a/src/oracle_test/regress/sql/groupingsets.sql
+++ b/src/oracle_test/regress/sql/groupingsets.sql
@@ -185,6 +185,52 @@ select x, y || 'y'
   group by grouping sets (x, y)
   order by 1, 2;
 
+-- check that operands wrapped in PlaceHolderVars are capable of index matching
+begin;
+
+set local enable_bitmapscan = off;
+
+explain (costs off)
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+explain (costs off)
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+explain (costs off)
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+rollback;
+
 -- check qual push-down rules for a subquery with grouping sets
 explain (verbose, costs off)
 select * from (
@@ -292,11 +338,29 @@ explain (costs off)
   select v.c, (select count(*) from gstest2 group by () having v.c)
     from (values (false),(true)) v(c) order by v.c;
 
--- test pushdown of HAVING clause that does not reference any columns that are nullable by grouping sets
+-- test pushdown of non-degenerate HAVING clause that does not reference any
+-- columns that are nullable by grouping sets
 explain (costs off)
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
 
+explain (costs off)
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+
+-- test pushdown of degenerate HAVING clause
+explain (costs off)
+select count(*) from gstest2 group by grouping sets (()) having false;
+select count(*) from gstest2 group by grouping sets (()) having false;
+
+explain (costs off)
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+
+explain (costs off)
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+
 -- HAVING with GROUPING queries
 select ten, grouping(ten) from onek
 group by grouping sets(ten) having grouping(ten) >= 0
@@ -705,6 +769,29 @@ select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
 group by grouping sets((a, b), (a));
 
+-- test handling of SRFs with grouping sets
+explain (verbose, costs off)
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+
+explain (verbose, costs off)
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+
 -- end
 reset ivorysql.enable_emptystring_to_null;
 
diff --git a/src/oracle_test/regress/sql/hash_index.sql b/src/oracle_test/regress/sql/hash_index.sql
index 219da829816..60571f6cdf1 100644
--- a/src/oracle_test/regress/sql/hash_index.sql
+++ b/src/oracle_test/regress/sql/hash_index.sql
@@ -53,6 +53,9 @@ CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops)
   WITH (fillfactor=60);
 
+CREATE INDEX hash_i4_partial_index ON hash_i4_heap USING hash (seqno)
+  WHERE seqno = 9999;
+
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.
@@ -117,6 +120,16 @@ SELECT * FROM hash_f8_heap
 SELECT * FROM hash_f8_heap
    WHERE hash_f8_heap.random = '88888888'::float8;
 
+--
+-- partial hash index
+--
+EXPLAIN (COSTS OFF)
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+
 --
 -- hash index
 -- grep '^90[^0-9]' hashovfl.data
diff --git a/src/oracle_test/regress/sql/indexing.sql b/src/oracle_test/regress/sql/indexing.sql
index b5cb01c2d70..706a6ec04ac 100644
--- a/src/oracle_test/regress/sql/indexing.sql
+++ b/src/oracle_test/regress/sql/indexing.sql
@@ -246,6 +246,65 @@ select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
 drop table idxpart;
 
+-- Verify that re-attaching an already-attached partition index can
+-- validate the parent index if it was still invalid, including
+-- indirect ancestors in subpartitions.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (0) to (500);
+-- Partitioned table with no partitions
+create table idxpart2 partition of idxpart for values from (1000) to (2000) partition by range (a);
+-- create parent indexes
+create index on only idxpart ((a/b));
+create index on only idxpart1 ((a/b));
+create index on only idxpart2 ((a/b));
+-- fail, leaves behind an invalid index on the leaf partition
+insert into idxpart11 values (1, 0);
+create index concurrently on idxpart11 ((a/b));
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- attach the indexes; parents stay invalid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- fix the index on the leaf partition
+delete from idxpart11 where b = 0;
+reindex index concurrently idxpart11_expr_idx;
+-- reattach the leaf partition index; parents should now be valid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Verify that re-attaching does not validate the parent when another
+-- child index is still invalid.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (500);
+create table idxpart2 partition of idxpart for values from (500) to (1000);
+create index on only idxpart ((a/b));
+-- create invalid indexes on both children
+insert into idxpart1 values (1, 0);
+insert into idxpart2 values (501, 0);
+create index concurrently on idxpart1 ((a/b));
+create index concurrently on idxpart2 ((a/b));
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- attach both; parent stays invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- fix only idxpart1's index, leave idxpart2's still invalid
+delete from idxpart1 where b = 0;
+reindex index concurrently idxpart1_expr_idx;
+-- re-attach the fixed child; parent should stay invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
 -- verify dependency handling during ALTER TABLE DETACH PARTITION
 create table idxpart (a int) partition by range (a);
 create table idxpart1 (like idxpart);
diff --git a/src/oracle_test/regress/sql/invisible.sql b/src/oracle_test/regress/sql/invisible.sql
index 547222d5bbd..9b6e852cd45 100644
--- a/src/oracle_test/regress/sql/invisible.sql
+++ b/src/oracle_test/regress/sql/invisible.sql
@@ -1,4 +1,5 @@
 -- sanity check of system catalog
+\set EXECUTE_RUN_PREPARE on
 SELECT attrelid, attname, attisinvisible FROM pg_attribute WHERE attisinvisible;
 
 
diff --git a/src/oracle_test/regress/sql/join.sql b/src/oracle_test/regress/sql/join.sql
index 629b4c0ab33..113d12ffbb9 100644
--- a/src/oracle_test/regress/sql/join.sql
+++ b/src/oracle_test/regress/sql/join.sql
@@ -3,6 +3,7 @@
 -- Test JOIN clauses
 --
 
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE J1_TBL (
   i integer,
@@ -760,6 +761,26 @@ select * from tbl_rs t1 join
             (select t1.a+t3.a from tbl_rs t3) and t2.a < 5)
   on true;
 
+--
+-- regression test for bug with parallel-hash-right-semi join
+--
+
+begin;
+
+-- encourage use of parallel plans
+set local parallel_setup_cost=0;
+set local parallel_tuple_cost=0;
+set local min_parallel_table_scan_size=0;
+set local max_parallel_workers_per_gather=4;
+
+-- ensure we don't get parallel hash right semi join
+explain (costs off)
+select * from tenk1 t1
+where exists (select 1 from tenk1 t2 where fivethous = t1.fivethous)
+and t1.fivethous < 5;
+
+rollback;
+
 --
 -- regression test for bug #13908 (hash join with skew tuples & nbatch increase)
 --
@@ -840,6 +861,13 @@ explain (costs off)
 select a.* from tenk1 a left join tenk1 b on a.unique1 = b.unique2
 where b.unique2 is null;
 
+-- check that we avoid de-duplicating columns redundantly
+set enable_memoize to off;
+explain (costs off)
+select 1 from tenk1
+where (hundred, thousand) in (select twothousand, twothousand from onek);
+reset enable_memoize;
+
 --
 -- regression test for bogus RTE_GROUP entries
 --
@@ -1455,6 +1483,30 @@ select * from int4_tbl left join (
 ) ss(x) on true
 where ss.x is null;
 
+-- Test computation of varnullingrels when translating appendrel Var
+begin;
+
+create temp table t_append (a int not null, b int);
+insert into t_append values (1, 1);
+insert into t_append values (2, 3);
+
+explain (verbose, costs off)
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+
+rollback;
+
 --
 -- test inlining of immutable functions
 --
@@ -2179,6 +2231,29 @@ from int8_tbl t1
   left join onek t4
     on t2.q2 < t3.unique2;
 
+-- bug #19460: we need to clean up RestrictInfos more than we had been doing
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select null::int as id) as dummy_source
+   left join (select a.id from a where a.id = 42) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select 2::int as id) as dummy_source
+   left join (select a.id from a) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+
 -- More tests of correct placement of pseudoconstant quals
 
 -- simple constant-false condition
@@ -2425,6 +2500,69 @@ where t1.a = s.c;
 
 rollback;
 
+-- check handling of semijoins after join removal: we must suppress
+-- unique-ification of known-constant values
+begin;
+
+create temp table t (a int unique, b int);
+insert into t values (1, 2);
+
+explain (verbose, costs off)
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+
+rollback;
+
+-- check handling of semijoins if all RHS columns are equated to constants: we
+-- should suppress unique-ification in this case.
+begin;
+
+create temp table t (a int, b int);
+insert into t values (1, 2);
+
+explain (costs off)
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+
+rollback;
+
+-- check handling of semijoin unique-ification for child relations if all RHS
+-- columns are equated to constants.
+begin;
+
+create temp table p (a int, b int) partition by range (a);
+create temp table p1 partition of p for values from (0) to (10);
+create temp table p2 partition of p for values from (10) to (20);
+insert into p values (1, 2);
+insert into p values (10, 20);
+
+set enable_partitionwise_join to on;
+
+explain (costs off)
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+
+rollback;
+
 -- test cases where we can remove a join, but not a PHV computed at it
 begin;
 
@@ -2969,6 +3107,12 @@ SELECT * FROM
 (SELECT n2.a FROM sj n1, sj n2 WHERE n1.a <> n2.a) q0, sl
 WHERE q0.a = 1;
 
+-- Do not forget to replace relid in bare Var join clause (bug #19435)
+ALTER TABLE sl ADD COLUMN bool_col boolean;
+EXPLAIN (COSTS OFF)
+SELECT 1 AS c1 FROM sl sl1 LEFT JOIN (sl AS sl2 NATURAL JOIN sl AS sl3)
+  ON sl2.bool_col LEFT JOIN sl AS sl4 ON sl2.bool_col;
+
 -- Check optimization disabling if it will violate special join conditions.
 -- Two identical joined relations satisfies self join removal conditions but
 -- stay in different special join infos.
@@ -3648,6 +3792,16 @@ GROUP BY s.c1, s.c2;
 
 DROP TABLE group_tbl;
 
+-- Test that we ignore PlaceHolderVars when looking up statistics
+EXPLAIN (COSTS OFF)
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+
 --
 -- Test for a nested loop join involving index scan, transforming OR-clauses
 -- to SAOP.
diff --git a/src/oracle_test/regress/sql/jsonb.sql b/src/oracle_test/regress/sql/jsonb.sql
index c54a640f80a..0fb685145c4 100644
--- a/src/oracle_test/regress/sql/jsonb.sql
+++ b/src/oracle_test/regress/sql/jsonb.sql
@@ -852,6 +852,7 @@ SELECT count(*) FROM testjsonb WHERE j @? '$';
 SELECT count(*) FROM testjsonb WHERE j @? '$.public';
 SELECT count(*) FROM testjsonb WHERE j @? '$.bar';
 
+ALTER TABLE testjsonb SET (parallel_workers = 2);
 CREATE INDEX jidx ON testjsonb USING gin (j);
 SET enable_seqscan = off;
 
@@ -940,7 +941,7 @@ SELECT count(*) FROM testjsonb WHERE j = '{"pos":98, "line":371, "node":"CBA", "
 
 --gin path opclass
 DROP INDEX jidx;
-CREATE INDEX jidx ON testjsonb USING gin (j jsonb_path_ops);
+CREATE INDEX CONCURRENTLY jidx ON testjsonb USING gin (j jsonb_path_ops);
 SET enable_seqscan = off;
 
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
diff --git a/src/oracle_test/regress/sql/jsonb_jsonpath.sql b/src/oracle_test/regress/sql/jsonb_jsonpath.sql
index da3f7969ca2..ced42b609ac 100644
--- a/src/oracle_test/regress/sql/jsonb_jsonpath.sql
+++ b/src/oracle_test/regress/sql/jsonb_jsonpath.sql
@@ -607,7 +607,10 @@ select jsonb_path_query_tz('"2023-08-15 12:34:56"', '$.timestamp_tz().string()')
 select jsonb_path_query('"2023-08-15 12:34:56 +5:30"', '$.timestamp_tz().string()');
 select jsonb_path_query('"2023-08-15 12:34:56"', '$.timestamp().string()');
 select jsonb_path_query('"12:34:56 +5:30"', '$.time_tz().string()');
+begin;
+set local timezone = '-7';
 select jsonb_path_query_tz('"12:34:56"', '$.time_tz().string()');
+rollback;
 select jsonb_path_query('"12:34:56"', '$.time().string()');
 select jsonb_path_query('"2023-08-15"', '$.date().string()');
 
diff --git a/src/oracle_test/regress/sql/multirangetypes.sql b/src/oracle_test/regress/sql/multirangetypes.sql
index 2742d9190b4..2c5943fbf02 100644
--- a/src/oracle_test/regress/sql/multirangetypes.sql
+++ b/src/oracle_test/regress/sql/multirangetypes.sql
@@ -722,6 +722,22 @@ drop type textrange1;
 reset role;
 drop role regress_multirange_owner;
 
+--
+-- CREATE TYPE checks for CREATE on multirange schema
+--
+create role regress_mr;
+create schema mr_sch;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+grant create on schema mr_sch to regress_mr;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+drop type mytype;
+drop schema mr_sch;
+drop role regress_mr;
+
 --
 -- Test polymorphic type system
 --
@@ -824,6 +840,9 @@ select *, row_to_json(upper(t)) as u from
   (values (two_ints_multirange(two_ints_range(row(1,2), row(3,4)))),
           (two_ints_multirange(two_ints_range(row(5,6), row(7,8))))) v(t);
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_multirange;
+
 drop type two_ints cascade;
 
 --
diff --git a/src/oracle_test/regress/sql/ora_package.sql b/src/oracle_test/regress/sql/ora_package.sql
index 3d247e02f16..6bb5a9b403f 100644
--- a/src/oracle_test/regress/sql/ora_package.sql
+++ b/src/oracle_test/regress/sql/ora_package.sql
@@ -10,6 +10,8 @@ END
 $$ language plisql;
 /
 
+SET ivorysql.allow_out_parameter_const = true;
+
 --test sys.standard package
 CREATE OR REPLACE package sys.standard IS
 BINARY_FLOAT_NAN constant BINARY_FLOAT;
@@ -233,7 +235,7 @@ declare
  var2 mds%rowtype;
  var3 mds%rowtype;
  name varchar(256);
- function test_package(ids IN  mds%rowtype, ids1 mds%rowtype,name1  varchar) return mds%rowtype is
+ function test_package(ids out mds%rowtype, ids1 mds%rowtype,name1 out varchar) return mds%rowtype is
    var1 mds%rowtype;
  begin
      ids.id := ids1.id + 1;
@@ -2001,12 +2003,12 @@ drop package pkg;
 --test package references package
 create or replace package pkg is
 var1 mds%rowtype;
-function test(id integer, var2 mds%rowtype) return mds;
+function test(id integer, var2 out mds%rowtype) return mds%rowtype;
 end;
 /
 
 create or replace package body pkg is
- function test(id integer, var2 mds%rowtype) return mds is
+ function test(id integer, var2 out mds%rowtype) return mds%rowtype is
   var3 mds%rowtype;
  begin
    var2.id := 1;
@@ -2021,12 +2023,12 @@ end;
 create or replace package pkg1 is
  var1 mds%rowtype;
  var2 pkg.var1%type;
- function test(id integer, var3  mds%rowtype) return mds%rowtype;
+ function test(id integer, var3 out mds%rowtype) return mds%rowtype;
 end;
 /
 
 create or replace package body pkg1 is
-  function test(id integer, var3  mds%rowtype) return mds%rowtype is
+  function test(id integer, var3 out mds%rowtype) return mds%rowtype is
   var4 mds%rowtype;
   begin
     var3.id := 0;
@@ -2769,15 +2771,17 @@ end;
 --clean data
 drop package pkg;
 
+SET ivorysql.allow_out_parameter_const = true;
+
 --test
 create table emp2(empno int,ename char(10),job char(20),mgr int,hiredate date,sal number,comm number,deptno int);
 create or replace package pg_myfirst
 is
 procedure sp_emp_insert;
 function f_getename(i_empno number) return varchar2;
-function f_out(id integer, name varchar) return varchar;
-procedure f1_out(id integer, name varchar);
-function f2_out(id integer, var2 mds%rowtype) return mds%rowtype;
+function f_out(id integer, name out varchar) return varchar;
+procedure f1_out(id integer, name out varchar);
+function f2_out(id integer, var2 out mds%rowtype) return mds%rowtype;
 end pg_myfirst;
 /
 
@@ -2797,16 +2801,16 @@ begin
 select ename into v_ename from emp2 where empno=i_empno;
 return v_ename;
 end;
-function f_out(id integer, name varchar) return varchar is
+function f_out(id integer, name out varchar) return varchar is
 begin
    name := 'xiexie';
    return 'welcome';
 end;
-procedure f1_out(id integer, name varchar) is
+procedure f1_out(id integer, name out varchar) is
 begin
   name := 'jsdfljsf';
 end;
-function f2_out(id integer, var2 mds%rowtype) return mds%rowtype is
+function f2_out(id integer, var2 out mds%rowtype) return mds%rowtype is
   var1 mds%rowtype;
 begin
   var2.id := 1;
@@ -3036,12 +3040,12 @@ create table test1(id integer,name varchar(23));
 
 create or replace package pkg is
   id integer;
-  function test(id integer) return test1;
+  function test(id out integer) return test1;
 end;
 /
 
 create or replace package body pkg is
-  function test(id integer) return test1 is
+  function test(id out integer) return test1 is
     var1 test1%rowtype;
   begin
     id := pkg.id;
@@ -5071,42 +5075,45 @@ DROP USER test_user2;
 
 
 CREATE OR REPLACE package test_pkg IS
-	PROCEDURE proc1(number1 NUMBER);
-	PROCEDURE proc2(number2 NUMBER);
-	PROCEDURE proc3(number3 NUMBER);
-	PROCEDURE proc4(number4 NUMBER);
+    var1 number;
+	var2 number;
+	PROCEDURE proc1(number1 out NUMBER);
+	PROCEDURE proc2(number2 out NUMBER);
+	PROCEDURE proc3(number3 out NUMBER);
+	PROCEDURE proc4(number4 out NUMBER);
 end;
 /
 
 CREATE OR REPLACE package body test_pkg is
-	PROCEDURE proc2(number2 NUMBER) IS
+	PROCEDURE proc2(number2 out NUMBER) IS
 	BEGIN
 		call proc1(number2);
 		raise info '%', number2;
 		raise info '%','proc2';
 	END;
 
-	PROCEDURE proc4(number4 NUMBER) IS
+	PROCEDURE proc4(number4 out NUMBER) IS
 	BEGIN
 		raise info '%','proc4';
 		call proc3(number4);
 		raise info 'proc3 out %', number4;
 	END;
 
-	PROCEDURE proc1(number1 NUMBER) IS
+	PROCEDURE proc1(number1 out NUMBER) IS
 	BEGIN
 		raise info '%','proc1';
 		number1 := 0;
 	END;
 
-	PROCEDURE proc3(number3 NUMBER) IS
+	PROCEDURE proc3(number3 out NUMBER) IS
 	BEGIN
 		raise info '%', 'proc3';
 		number3 := 1;
 	END;
 BEGIN
-	call proc2(1);
-	call proc4(2);
+	call proc2(var1);
+	call proc4(var2);
+	raise info '%-%', var1,var2;
 END;
 /
 
@@ -5619,7 +5626,476 @@ DROP PROCEDURE test_p;
 DROP PROCEDURE test_p1;
 DROP package test_pkg;
 
+--test out parameter
+--raise info 23
+declare
+  var1 integer;
+  procedure test_p(id out integer) is
+  begin
+     id := 23;
+  end;
+begin
+  call test_p(var1);
+  raise info '%', var1;
+end;
+/
+
+declare
+  var1 integer;
+  procedure test_p(id out integer, name varchar2) is
+  begin
+     id := 23;
+  end;
+begin
+  call test_p(var1,'xiexie');
+  raise info '%', var1;
+end;
+/
+
+declare
+  var1 integer;
+  procedure test_p(id1 integer,id out integer, name varchar2) is
+  begin
+     raise info '%-%-%',id1, id, name;
+  end;
+begin
+  call test_p(23, var1,'xiexie');
+  raise info '%', var1;
+end;
+/
+
+
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  procedure test_p(id1 IN out integer,id out mds, name varchar2) is
+  begin
+     raise info '%-%-%',id1, id, name;
+	 id.id := id1;
+	 id.name :=name;
+  end;
+BEGIN
+  var1 := 23;
+  call test_p(var1, var2,'xiexie');
+  raise info '%-%', var1, var2;
+end;
+/
+
+
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  procedure test_p(id IN out mds) is
+  begin
+     raise info '%',id;
+	 id.id := var1;
+	 id.name := 'welcome';
+  end;
+BEGIN
+  var1 := 23;
+  call test_p(var2);
+  raise info '%',var2;
+end;
+/
+
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  PROCEDURE test_p(id out integer) IS
+    var2 integer;
+	PROCEDURE test_pp(id1 out mds%rowtype) IS
+    BEGIN
+        id1.id := id;
+		id1.name := 'welcome';
+    end;
+  BEGIN
+     id := 23;
+     call test_pp(var0);
+	 raise info '%', var0;
+  end;
+BEGIN
+    call test_p(var1);
+	raise info '%', var1;
+end;
+/
+
+
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  PROCEDURE test_p(id out integer) IS
+    var2 integer;
+	PROCEDURE test_pp(id1 out mds%rowtype) IS
+    BEGIN
+        id1.id := var2;
+		id1.name := 'welcome';
+    end;
+  BEGIN
+     id := 23;
+	 var2 := 24;
+     call test_pp(var0);
+	 raise info '%', var0;
+  end;
+BEGIN
+    call test_p(var1);
+	raise info '%', var1;
+end;
+/
+
+--test function
+DECLARE
+  var1 integer;
+  var2 integer;
+  FUNCTION test_f(id out integer) RETURN integer IS
+  BEGIN
+     id := var1;
+	 RETURN var1 + 1;
+  end;
+BEGIN
+  var2 := 23;
+  var1 := 24;
+  var1 := test_f(var2);
+  raise info '%-%', var1,var2;
+end;
+/
+
+
+declare
+  var1 integer;
+  var2 varchar2(256);
+  function test_f(id out integer) RETURN varchar2 is
+  begin
+     id := 23;
+	 RETURN 'xiexie';
+  end;
+begin
+  var2 := test_f(var1);
+  raise info '%-%', var1,var2;
+end;
+/
+
+declare
+  var1 integer;
+  var2 integer;
+  function test_f(id out integer, name varchar2) RETURN integer is
+  begin
+     id := 23;
+	 RETURN id + 1;
+  end;
+begin
+  var2 := test_f(var1,'xiexie');
+  raise info '%-%', var1, var2;
+end;
+/
+
+declare
+  var1 integer;
+  var2 integer;
+  FUNCTION  test_f(id1 integer,id out integer, name varchar2) RETURN integer is
+  begin
+     raise info '%-%-%',id1, id, name;
+	 RETURN id + 1;
+  end;
+begin
+  var2 := test_f(23, var1,'xiexie');
+  raise info '%-%', var1,var2;
+end;
+/
+
+
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  var3 mds%rowtype;
+  function test_f(id1 IN out integer,id out mds, name varchar2) RETURN mds IS
+    var3 mds%rowtype;
+  begin
+     raise info '%-%-%',id1, id, name;
+	 id.id := id1;
+	 id.name :=name;
+     var3.id := id.id + 1;
+	 var3.name := 'name' || ' ' || id.name;
+	 RETURN var3;
+  end;
+BEGIN
+  var1 := 23;
+  var3 := test_f(var1, var2,'xiexie');
+  raise info '%-%-%', var1, var2, var3;
+end;
+/
+
+
+declare
+  var1 integer;
+  var2 mds%rowtype;
+  var3 integer;
+  function test_f(id IN out mds) RETURN integer is
+  begin
+     raise info '%',id;
+	 id.id := var1;
+	 id.name := 'welcome';
+	 RETURN id.id + 1;
+  end;
+BEGIN
+  var1 := 23;
+  var3 := test_f(var2);
+  raise info '%-%',var2, var3;
+end;
+/
+
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  var4 integer;
+  function test_f(id out integer) RETURN integer IS
+    var2 integer;
+	var3 varchar2(256);
+	function test_ff(id1 out mds%rowtype) RETURN varchar2 IS
+    BEGIN
+        id1.id := id;
+		id1.name := 'welcome';
+		RETURN 'xiexie';
+    end;
+  BEGIN
+     id := 23;
+     var3 := test_ff(var0);
+	 raise info '%-%', var0, var3;
+	 RETURN 267;
+  end;
+BEGIN
+    var4 := test_f(var1);
+	raise info '%-%', var1, var4;
+end;
+/
+
+
+DECLARE
+  var1 integer;
+  var0 mds%rowtype;
+  var4 varchar2(256);
+  function test_f(id out integer) RETURN varchar2 IS
+    var2 integer;
+	var3 mds%rowtype;
+	function test_ff(id1 out mds%rowtype) RETURN mds IS
+    BEGIN
+        id1.id := var2;
+		id1.name := 'welcome';
+		RETURN id1;
+    end;
+  BEGIN
+     id := 23;
+	 var2 := 24;
+     var3 := test_ff(var0);
+	 raise info '%-%', var0, var3;
+	 RETURN var0.name;
+  end;
+BEGIN
+    var4 := test_f(var1);
+	raise info '%-%', var1, var4;
+end;
+/
+
+CREATE OR REPLACE FUNCTION test_f(id out varchar2,id1 integer) RETURN integer IS
+  var2 mds%rowtype;
+  var1 integer;
+  FUNCTION test_ff(id2 out varchar2) RETURN integer IS
+  BEGIN
+     id2 := 'welcome';
+	 RETURN 23;
+  end;
+  PROCEDURE test_p(id3 out varchar2, id4 out mds) IS
+  BEGIN
+    id3 := 'to beijing';
+	id4.id := 12;
+	id4.name := 'welcome to hunan';
+  end;
+BEGIN
+  var1 := test_ff(id);
+  raise info '%-%', id, var1;
+  call test_p(id, var2);
+  raise info '%-%', id, var2;
+  RETURN var2.id;
+end;
+/
+
+DECLARE
+  var1 integer;
+  var2 varchar2(256);
+BEGIN
+  var1 := test_f(var2,23);
+  raise info '%-%', var2,var1;
+end;
+/
+
+
+--agian
+DECLARE
+  var1 integer;
+  var2 varchar2(256);
+BEGIN
+  var1 := test_f(var2,23);
+  raise info '%-%', var2,var1;
+end;
+/
+
+CREATE OR REPLACE procedure test_p(id out varchar2,id1 integer)  IS
+  var2 mds%rowtype;
+  var1 integer;
+  FUNCTION test_ff(id2 out varchar2) RETURN integer IS
+  BEGIN
+     id2 := 'welcome';
+	 RETURN 23;
+  end;
+  PROCEDURE test_p(id3 out varchar2, id4 out mds) IS
+  BEGIN
+    id3 := 'to beijing';
+	id4.id := 12;
+	id4.name := 'welcome to hunan';
+  end;
+BEGIN
+  var1 := test_ff(id);
+  raise info '%-%', id, var1;
+  call test_p(id, var2);
+  raise info '%-%', id, var2;
+end;
+/
+
+
+DECLARE
+  var2 varchar2(256);
+BEGIN
+  call test_p(var2,23);
+  raise info '%', var2;
+end;
+/
+
+--again
+DECLARE
+  var2 varchar2(256);
+BEGIN
+  call test_p(var2,23);
+  raise info '%', var2;
+end;
+/
+
+--clean
+DROP FUNCTION test_f;
+DROP PROCEDURE test_p;
+
+--package
+CREATE OR REPLACE package test_pkg IS
+ var1 integer;
+ var2 varchar2(256);
+ var3 mds%rowtype;
+ FUNCTION test_f(id out varchar2) RETURN integer;
+ FUNCTION test_f1(id out mds,name out varchar2) RETURN mds;
+ FUNCTION test_f2(id integer) RETURN mds;
+ PROCEDURE test_p(id out mds);
+ PROCEDURE test_p1(name out varchar2,id2 integer);
+end;
+/
+
+CREATE OR REPLACE package body test_pkg IS
+ FUNCTION test_f(id out varchar2) RETURN integer IS
+ BEGIN
+    id := 'welcome to ';
+	RETURN 23;
+ end;
+ FUNCTION test_f1(id out mds,name out varchar2) RETURN mds IS
+   var4 mds%rowtype;
+ begin
+   id.id := var1;
+   id.name := var2;
+   name := ' beijing';
+   var4.id := 1;
+   var4.name := 'welcome to hunan';
+   RETURN var4;
+ end;
+ FUNCTION test_f2(id integer) RETURN mds IS
+   var4 mds%rowtype;
+ BEGIN
+   var4.id := id;
+   var4.name := 'welcome to beijing';
+   RETURN var4;
+ end;
+ PROCEDURE test_p(id out mds) IS
+ BEGIN
+    id := var3;
+ end;
+ PROCEDURE test_p1(name out varchar2,id2 integer) IS
+ BEGIN
+    name := var3.name;
+ end;
+BEGIN
+  var1 := 23;
+  var2 := 'init a value';
+  var3.id := var1;
+  var3.name := var2;
+end;
+/
+
+SELECT test_pkg.test_f(NULL);
+SELECT test_pkg.test_f1(NULL, NULL);
+SELECT test_pkg.test_f2(23);
+SELECT * FROM test_pkg.test_f(NULL);
+SELECT * FROM test_pkg.test_f1(NULL, NULL);
+SELECT * FROM test_pkg.test_f2(23);
+call test_pkg.test_p(NULL);
+call test_pkg.test_p1(NULL, 23);
+
+DECLARE
+   var1 integer;
+   var2 varchar2(256);
+   var3 mds%rowtype;
+   var4 mds%rowtype;
+BEGIN
+   var1 := test_pkg.test_f(var2);
+   raise info '%-%', var2,var1;
+   var4 := test_pkg.test_f1(var3, var2);
+   raise info '%-%-%', var3, var2,var4;
+   var4 := test_pkg.test_f2(24);
+   raise info '%', var4;
+   call test_pkg.test_p(test_pkg.var3);
+   raise info '%', test_pkg.var3;
+   call test_pkg.test_p1(var2,23);
+   raise info '%', var2;
+end;
+/
+
+
+DECLARE
+   var1 integer;
+   var2 varchar2(256);
+   var3 mds%rowtype;
+   var4 mds%rowtype;
+BEGIN
+   var1 := test_pkg.test_f(var2);
+   raise info '%-%', var2,var1;
+   var4 := test_pkg.test_f1(var3, var2);
+   raise info '%-%-%', var3, var2,var4;
+   var4 := test_pkg.test_f2(24);
+   raise info '%', var4;
+   call test_pkg.test_p(test_pkg.var3);
+   raise info '%', test_pkg.var3;
+   call test_pkg.test_p1(var2,23);
+   raise info '%', var2;
+end;
+/
+
+
+SELECT test_pkg.test_f(NULL);
+SELECT test_pkg.test_f1(NULL, NULL);
+SELECT test_pkg.test_f2(23);
+SELECT * FROM test_pkg.test_f(NULL);
+SELECT * FROM test_pkg.test_f1(NULL, NULL);
+SELECT * FROM test_pkg.test_f2(23);
+call test_pkg.test_p(NULL);
+call test_pkg.test_p1(NULL, 23);
+
+DROP package test_pkg;
+
 --clean data
+RESET ivorysql.allow_out_parameter_const;
 DROP FUNCTION test_event_trigger;
 DROP TABLE mds;
 DROP TABLE mdss;
diff --git a/src/oracle_test/regress/sql/ora_plisql.sql b/src/oracle_test/regress/sql/ora_plisql.sql
index dab44cf3dc1..6dbbe7b2a08 100755
--- a/src/oracle_test/regress/sql/ora_plisql.sql
+++ b/src/oracle_test/regress/sql/ora_plisql.sql
@@ -2,7 +2,7 @@
 -- PLISQL
 --
 
--- return is a non-reserved keyword, Can be used as object name.
+-- return is a non-reserved keyword, can be used as object name.
 CREATE TABLE RETURN (fooid INT, foosubid INT, fooname TEXT);
 INSERT INTO RETURN VALUES (1, 2, 'three');
 INSERT INTO RETURN VALUES (4, 5, 'six');
@@ -802,13 +802,14 @@ end;
 begin
 null;
 end;
-
+/
 
 <<
 main >>
 begin
 null;
 end;
+/
 
 <<
 main
@@ -905,13 +906,13 @@ end;
 /
 
 -- nested subproc of plisql
-create or replace function test_subproc_func(a in integer) returns integer as
+create or replace function test_subproc_func(a in out integer) returns integer as
 $$
 declare
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
   declare
        original_squared integer;
@@ -934,7 +935,7 @@ SELECT pg_get_functiondef('test_func'::regproc) from dual;
 SELECT pg_get_functiondef('test_proc'::regproc) from dual;
 SELECT pg_get_functiondef('test_subproc_func'::regproc) from dual;
 
--- ivy_get_plisql_functiondef is only using get plisql func/proc definition.
+-- ivy_get_plisql_functiondef is only used to get plisql func/proc definition.
 SELECT ivy_get_plisql_functiondef('test_func'::regproc) from dual;
 SELECT ivy_get_plisql_functiondef('test_proc'::regproc) from dual;
 SELECT ivy_get_plisql_functiondef('test_subproc_func'::regproc) from dual;
@@ -947,25 +948,9 @@ DROP FUNCTION test_subproc_func(int);
 -- Compatible with Oracle:
 -- The input parameter type is %rowtype
 --
-create table t1(a int, b int);
-
-create or  replace function ftest(a in t1%rowtype)
- return int 
-  as 
-begin  a.a = 25; a.b= 26; raise notice '%',a;
-return 25;
-end;
-/
-
-select * from ftest(null::t1);
-
-drop function ftest;
-drop table t1;
-
-
 create or replace procedure protest 
 as 
-begin 
+begin
 raise notice 'protest';
 end;
 / 
@@ -1056,7 +1041,7 @@ END;
 CALL test_proc6(2, 3, 4);
 EXEC test_proc6(2, 3, 4);
 DROP PROCEDURE test_proc6;
--- recursive with output arguments
+-- recursion with output arguments
 
 CREATE OR REPLACE PROCEDURE test_proc7(x int, INOUT a int, INOUT b numeric)
 AS
@@ -1189,3 +1174,286 @@ CALL protest2();
 
 DROP PROCEDURE  protest2;
 DROP PROCEDURE  stest.protest;
+-- An empty parenthesis cannot be ignored
+create or replace procedure p_noarg()
+is
+begin
+raise notice 'this procedure without args';
+end;
+/
+
+-- fail
+call p_noarg;
+
+--ok
+call p_noarg();
+
+create or replace function f_noarg()
+return number
+is
+begin
+raise notice 'this function without args';
+return 999;
+end;
+/
+
+variable x number;
+
+-- fail
+call f_noarg into :x;
+
+--ok
+call f_noarg() into :x;
+print x
+
+-- function or procedure with default value
+create or replace procedure p_defs(a varchar2 default 'i am a default string')
+is
+begin
+raise notice '%', a;
+end;
+/
+
+-- fail
+call p_defs;
+
+-- ok
+call p_defs();
+--ok
+call p_defs('new string');
+
+create or replace function f_defs(a number default 1314)
+return number
+is
+begin
+raise notice '%', a;
+return a;
+end;
+/
+
+variable x number
+
+--fail
+call f_defs into :x;
+
+--ok
+call f_defs() into :x;
+print x
+
+--ok
+call f_defs(999) into :x;
+print x
+
+drop function f_defs;
+drop procedure p_defs;
+drop function f_noarg();
+drop procedure p_noarg();
+
+--
+-- Truncate when the bind variable and the function return type or param type
+-- are the same and the typmod of the bind variable overflows.
+-- Fails when the bind variable and the function return type are or param type
+-- not same but can cast and the typmod of the bind variable overflows.
+--
+create or replace procedure ff_proc(a varchar2, b varchar2)
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+raise notice '%', a||b;
+end;
+/
+
+-- ok
+call ff_proc('123456789', '123456789');
+
+create or replace function ff_test(a varchar2, b varchar2)
+return varchar2
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+return a||b;
+end;
+/
+
+-- ok
+variable x varchar2(10 char);
+call ff_test('123456789', '123456789') into :x;
+print x
+
+-- ok
+variable x varchar2(10 byte);
+call ff_test('123456789', '123456789') into :x;
+print x
+
+-- error
+variable x char(10 char);
+call ff_test('123456789', '123456789') into :x;
+print x
+
+-- error
+variable x char(10 byte);
+call ff_test('123456789', '123456789') into :x;
+print x
+
+-- ok
+variable x number;
+call ff_test('123456789', '123456789') into :x;
+print x
+
+-- error
+variable x number;
+call ff_test('abc', '123456789') into :x;
+print x
+
+create or replace procedure f_proc(a varchar2, b out varchar2)
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+b := a;
+end;
+/
+
+-- ok
+variable x varchar2(5 char)
+call f_proc('123456789', :x);
+print
+
+-- ok
+variable x varchar2(5 byte)
+call f_proc('123456789', :x);
+print
+
+-- error
+variable x char(5 char)
+call f_proc('123456789', :x);
+print
+
+-- error
+variable x char(5 byte)
+call f_proc('123456789', :x);
+print
+
+create or replace function f_test(a varchar2, b out varchar2)
+return varchar2
+is
+begin
+raise notice '%', a;
+raise notice '%', b;
+b := a;
+raise notice '%', a;
+raise notice '%', b;
+return a||b;
+end;
+/
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 char)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 byte)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(5 char)
+variable z varchar2(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x varchar2(10) = '123456789'
+variable y varchar2(5 byte)
+variable z varchar2(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- error
+variable x varchar2(10) = '123456789'
+variable y varchar2(11)
+variable z varchar2(12 char)
+
+begin
+:z := f_test(:x, :y);
+end;
+/
+print x y z
+
+-- error
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(12 char)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- error
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(12 byte)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(20 char)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(11)
+variable z char(20 byte)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- error
+variable x char(10) = '123456789'
+variable y char(5 char)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- error
+variable x char(10) = '123456789'
+variable y char(5 byte)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(10 char)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ok
+variable x char(10) = '123456789'
+variable y char(10 byte)
+variable z char(20)
+call f_test(:x, :y) INTO :z;
+print x y z
+
+-- ORA-06578: output parameter cannot be a duplicate bind.
+-- Cause: The bind variable corresponding to an IN/OUT or
+-- OUT parameter for a function or a procedure or a function
+-- return value in a CALL statement cannot be a duplicate bind variable.
+call f_test(:x, :x) INTO :z;
+call f_proc(:x, :x);
+
+--clean
+drop procedure ff_proc;
+drop procedure f_proc;
+drop function f_test;
+drop function ff_test;
+
diff --git a/src/oracle_test/regress/sql/ora_psql.sql b/src/oracle_test/regress/sql/ora_psql.sql
index 822f846f105..716c1d025e7 100644
--- a/src/oracle_test/regress/sql/ora_psql.sql
+++ b/src/oracle_test/regress/sql/ora_psql.sql
@@ -4,6 +4,8 @@
 -- The main features is compatible with Oracle SQL*PLUS client command.
 --
 
+\set EXECUTE_RUN_PREPARE off
+
 --
 -- VAR[IABLE] command
 --
@@ -271,6 +273,15 @@ variable a = 'qqqqqq
 -- string ""qqqqqq" missing terminating quote (").
 variable a = "qqqqqq
 
+-- VARIABLE can be abbreviated as VAR
+var my char(4) = '123'
+print my
+var my = '1234';
+print my
+var my = '12345'
+print my
+var
+
 --
 -- PRINT command
 --
@@ -310,3 +321,303 @@ print a 'b'
 -- Unlike Oracle, these two syntaxes are the same
 print a "b"
 print a"b"
+
+--
+-- Referencing bind variables
+--
+-- Referencing bind variables within anonymous blocks.
+variable v1 number = 123
+variable v2 binary_float = 3.14
+variable v3 binary_double = 3.1415926
+variable v4 char = 't'
+variable v5 char(100) = 'this is char(100) datatype'
+variable v6 char(100 char) = 'this is char(100 char) datatype'
+variable v7 char(100 byte) = 'this is char(100 byte) datatype'
+variable v8 nchar(100) = 'this is nchar(100) datatype'
+variable v9 varchar2 = 't'
+variable v10 varchar2(100) = 'this is varchar2(100) datatype'
+variable v11 varchar2(100 char) = 'this is varchar2(100 char) datatype'
+variable v12 varchar2(100 byte) = 'this is varchar2(100 byte) datatype'
+
+-- can be used as an lvalue or an rvalue
+declare
+lval1 number;
+lval2 binary_float;
+lval3 binary_double;
+lval4 char;
+lval5 char(100);
+lval6 char(100 char);
+lval7 char(100 byte);
+lval8 nchar(100);
+lval9 varchar2;
+lval10 varchar2(100);
+lval11 varchar2(100 char);
+lval12 varchar2(100 byte);
+begin
+raise notice 'old value of v1 is %', :v1;
+raise notice 'old value of v2 is %', :v2;
+raise notice 'old value of v3 is %', :v3;
+raise notice 'old value of v4 is %', :v4;
+raise notice 'old value of v5 is %', :v5;
+raise notice 'old value of v6 is %', :v6;
+raise notice 'old value of v7 is %', :v7;
+raise notice 'old value of v8 is %', :v8;
+raise notice 'old value of v9 is %', :v9;
+raise notice 'old value of v10 is %', :v10;
+raise notice 'old value of v11 is %', :v11;
+raise notice 'old value of v12 is %', :v12;
+
+lval1 := :v1;
+lval2 := :v2;
+lval3 := :v3;
+lval4 := :v4;
+lval5 := :v5;
+lval6 := :v6;
+lval7 := :v7;
+lval8 := :v8;
+lval9 := :v9;
+lval10 := :v10;
+lval11 := :v11;
+lval12 := :v12;
+
+:v1 := 3.141592657;
+:v2 := 3.141592657;
+:v3 := 3.141592657;
+:v4 := 'f';
+:v5 := 'new value = ' || :v5;
+:v6 := 'new value = ' || :v6;
+:v7 := 'new value = ' || :v7;
+:v8 := 'new value = ' || :v8;
+:v9 := 'f';
+:v10 := 'new value = ' || :v10;
+:v11 := 'new value = ' || :v11;
+:v12 := 'new value = ' || :v12;
+
+raise notice 'new value of v1 is %', :v1;
+raise notice 'new value of v2 is %', :v2;
+raise notice 'new value of v3 is %', :v3;
+raise notice 'new value of v4 is %', :v4;
+raise notice 'new value of v5 is %', :v5;
+raise notice 'new value of v6 is %', :v6;
+raise notice 'new value of v7 is %', :v7;
+raise notice 'new value of v8 is %', :v8;
+raise notice 'new value of v9 is %', :v9;
+raise notice 'new value of v10 is %', :v10;
+raise notice 'new value of v11 is %', :v11;
+raise notice 'new value of v12 is %', :v12;
+
+raise notice 'the value of local variable is %', lval1;
+raise notice 'the value of local variable is %', lval2;
+raise notice 'the value of local variable is %', lval3;
+raise notice 'the value of local variable is %', lval4;
+raise notice 'the value of local variable is %', lval5;
+raise notice 'the value of local variable is %', lval6;
+raise notice 'the value of local variable is %', lval7;
+raise notice 'the value of local variable is %', lval8;
+raise notice 'the value of local variable is %', lval9;
+raise notice 'the value of local variable is %', lval10;
+raise notice 'the value of local variable is %', lval11;
+raise notice 'the value of local variable is %', lval12;
+end;
+/
+print v1
+print v2
+print v3
+print v4
+print v5
+print v6
+print v7
+print v8
+print v9
+print v10
+print v11
+print v12
+
+-- error out of range
+var x char(3 byte) = 'abc'
+print x
+
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'abcd';
+raise notice 'new value of :x is %', :x;
+end;
+/
+
+print x
+
+var x char(3 char) = '数据库'
+print x
+
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'IvorySQL社区';
+raise notice 'new value of :x is %', :x;
+end;
+/
+
+print x
+
+-- catch exception
+begin
+raise notice 'old value of :x is %', :x;
+:x := 'IvorySQL社区';
+EXCEPTION WHEN OTHERS THEN
+	raise notice 'Get an exception and reassign an acceptable value to the bind variable';
+	:x := 'abc';
+raise notice 'new value of :x is %', :x;
+end;
+/
+
+print x
+
+-- Referencing bind variables within non-anonymous block queries
+var x number = 4
+var y char(20) = 'bindvar_test'
+var z char(20) = 'select'
+var m number = 999
+var n char(5) = '888'
+print x
+print y
+print z
+print m
+print n
+
+create table bindvar_test(a number);
+insert into bindvar_test values(1);
+insert into bindvar_test values(2);
+insert into bindvar_test values(3);
+insert into bindvar_test values(4);
+insert into bindvar_test values(5);
+select * from bindvar_test;
+-- ok
+select * from bindvar_test where a = :x;
+
+-- ok
+insert into bindvar_test values(:m);
+insert into bindvar_test values(:n);
+select * from bindvar_test;
+
+-- ok
+delete from bindvar_test where a = :x;
+select * from bindvar_test;
+
+-- error, cannot use input host variables to supply SQL keywords or the names of database objects or data definition statements. 
+select * from :y;
+:z * from bindvar_test;
+drop table :y;
+drop table bindvar_test;
+
+-- Referencing bind variables in functions or procedures as input or output host variable.
+var x number=10
+var y number=20
+var z char(6)='input'
+
+CREATE OR REPLACE FUNCTION f_test (x NUMBER, y OUT NUMBER, z OUT char) return int AS
+BEGIN
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+y := x;
+z := 'output';
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+return 999;
+END;
+/
+
+-- error out within Oracle: ORA-06572: Function F_TEST has out arguments.
+-- error out within IvorySQL: ERROR:  OUT or IN OUT arguments of the function f_test must be variables.
+select f_test(:x, :y, :z) from dual;
+
+-- error out within Oracle: ORA-06572: Function F_TEST has out arguments.
+-- IvorySQL can execute successfully. Will be changed in the future?
+select * from f_test(:x, :y, :z);
+print x
+print y
+print z
+
+-- CALL statement
+exec :x := 3.14
+exec :z := 'any'
+CREATE OR REPLACE PROCEDURE p_test (x NUMBER, y IN OUT NUMBER, z OUT char) AS
+BEGIN
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+y := x;
+z := 'output';
+raise info '%', x;
+raise info '%', y;
+raise info '%', z;
+END;
+/
+
+call p_test(:x, :y, :z);
+print x
+print y
+print z
+
+--clean
+drop function f_test;
+drop procedure p_test;
+
+--
+-- EXECUTE
+--
+var x number;
+print x
+
+-- there is not necessarily a space after exec.
+exec:x := 111;
+print x
+
+exec:x := 222
+print x
+
+exec :x := 333;
+print x
+
+exec :x := 444
+print x
+
+-- Usage: EXEC[UTE] statement
+exec
+execute
+/* Comments and whitespace are ignored */exec
+/* Comments and whitespace are ignored */ execute
+
+-- An error is reported on overflow
+var x char(3 byte);
+exec :x := 'abc'
+print x
+exec :x := 'qwer'
+print x
+
+var x char(3 char)
+exec :x := '数据库';
+print x
+exec :x := '数据库1';
+print x
+
+var x varchar2(3 byte);
+exec :x := 'abc'
+print x
+exec :x := 'qwer'
+print x
+
+var x varchar2(3 char)
+exec :x := '数据库';
+print x
+exec :x := '数据库1';
+print x
+
+var x number
+exec :x := '3.14'
+print x
+exec :x := 'abc'
+print x
+
+-- host variable not exist
+exec :nohostvar := '123'
diff --git a/src/oracle_test/regress/sql/ora_rowid.sql b/src/oracle_test/regress/sql/ora_rowid.sql
index d9aa3e9f38c..662452bf042 100644
--- a/src/oracle_test/regress/sql/ora_rowid.sql
+++ b/src/oracle_test/regress/sql/ora_rowid.sql
@@ -1,5 +1,5 @@
 --
--- Test Compatible Oracle ROWID pseudo
+-- Test Oracle-Compatible ROWID Pseudo-Column
 --
 
 --
@@ -111,12 +111,12 @@ alter table t2 set without rowid;
 
 select (rowid).rowno, * from t2;
 
--- clearup
+-- cleanup
 drop table t2;
 drop table t3;
 
 --
---3, CTEATE TABLE ... WITH ROWID 
+--3, CREATE TABLE ... WITH ROWID
 --
 create table t2 (a int, b int) with rowid;
 
diff --git a/src/oracle_test/regress/sql/partition_aggregate.sql b/src/oracle_test/regress/sql/partition_aggregate.sql
index ab070fee244..f2f23d5f5d8 100644
--- a/src/oracle_test/regress/sql/partition_aggregate.sql
+++ b/src/oracle_test/regress/sql/partition_aggregate.sql
@@ -74,6 +74,11 @@ EXPLAIN (COSTS OFF)
 SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
 SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
 
+-- Test partitionwise aggregation with ordered append path built from fractional paths
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+
 RESET enable_hashagg;
 
 -- ROLLUP, partitionwise aggregation does not apply
diff --git a/src/oracle_test/regress/sql/partition_prune.sql b/src/oracle_test/regress/sql/partition_prune.sql
index 9ec8e2d24e0..48aa20b06c4 100644
--- a/src/oracle_test/regress/sql/partition_prune.sql
+++ b/src/oracle_test/regress/sql/partition_prune.sql
@@ -2,6 +2,7 @@
 -- Test partitioning planner code
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- Helper function which can be used for masking out portions of EXPLAIN
 -- ANALYZE which could contain information that's not consistent on all
 -- platforms.
@@ -1401,3 +1402,74 @@ select min(a) over (partition by a order by a) from part_abc where a >= stable_o
 
 drop view part_abc_view;
 drop table part_abc;
+
+--
+-- Check that operands wrapped in PlaceHolderVars are matched to partition
+-- keys, allowing partition pruning to occur.  PlaceHolderVars can be
+-- introduced when a subquery's output is used with grouping sets.
+--
+create table phv_part (a int, b text) partition by list (a);
+create table phv_part_1 partition of phv_part for values in (1);
+create table phv_part_2 partition of phv_part for values in (2);
+create table phv_part_null partition of phv_part for values in (null);
+insert into phv_part values (1, 'one'), (2, 'two'), (null, 'null');
+
+-- OpExpr: PHV-wrapped operand matched via equal()
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+
+-- OpExpr with RelabelType: PHV wrapped around a casted column
+explain (costs off)
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+
+-- ScalarArrayOpExpr: IN clause with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+
+-- NullTest: IS NULL with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+
+drop table phv_part;
+
+-- BooleanTest: IS TRUE with PHV-wrapped boolean partition key
+create table phv_boolpart (a bool, b text) partition by list (a);
+create table phv_boolpart_t partition of phv_boolpart for values in (true);
+create table phv_boolpart_f partition of phv_boolpart for values in (false);
+create table phv_boolpart_null partition of phv_boolpart default;
+insert into phv_boolpart values (true, 'yes'), (false, 'no'), (null, 'unknown');
+
+explain (costs off)
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+
+drop table phv_boolpart;
diff --git a/src/oracle_test/regress/sql/plancache.sql b/src/oracle_test/regress/sql/plancache.sql
index 14b6ea2c4a1..83c80568114 100644
--- a/src/oracle_test/regress/sql/plancache.sql
+++ b/src/oracle_test/regress/sql/plancache.sql
@@ -2,6 +2,7 @@
 -- Tests to exercise the plan caching/invalidation mechanism
 --
 
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
 
diff --git a/src/oracle_test/regress/sql/portals.sql b/src/oracle_test/regress/sql/portals.sql
index 959565f594b..c81869b2eb3 100644
--- a/src/oracle_test/regress/sql/portals.sql
+++ b/src/oracle_test/regress/sql/portals.sql
@@ -2,6 +2,7 @@
 -- Cursor regression tests
 --
 
+\set EXECUTE_RUN_PREPARE on
 BEGIN;
 
 DECLARE foo1 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
@@ -511,6 +512,11 @@ DECLARE c1 CURSOR FOR SELECT * FROM ucview;
 FETCH FROM c1;
 DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
 ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+UPDATE ucview SET f1 = f1 + 10 WHERE CURRENT OF c1; -- fail, views not supported
+ROLLBACK;
 
 -- Check WHERE CURRENT OF with an index-only scan
 BEGIN;
diff --git a/src/oracle_test/regress/sql/prepare.sql b/src/oracle_test/regress/sql/prepare.sql
index c6098dc95ce..668d1055a7e 100644
--- a/src/oracle_test/regress/sql/prepare.sql
+++ b/src/oracle_test/regress/sql/prepare.sql
@@ -2,6 +2,7 @@
 -- of the pg_prepared_statements view as prepared statements are
 -- created and removed.
 
+\set EXECUTE_RUN_PREPARE on
 SELECT name, statement, parameter_types, result_types FROM pg_prepared_statements;
 
 PREPARE q1 AS SELECT 1 AS a;
diff --git a/src/oracle_test/regress/sql/prepared_xacts.sql b/src/oracle_test/regress/sql/prepared_xacts.sql
index ade3a2672a8..b0712b153e0 100644
--- a/src/oracle_test/regress/sql/prepared_xacts.sql
+++ b/src/oracle_test/regress/sql/prepared_xacts.sql
@@ -1,3 +1,8 @@
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
 --
 -- PREPARED TRANSACTIONS (two-phase commit)
 --
@@ -158,7 +163,32 @@ SELECT * FROM pxtest3;
 -- There should be no prepared transactions
 SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
 
+
+-- Test row-level locks held by prepared transactions
+CREATE TABLE pxtest_rowlock (id int PRIMARY KEY, data text);
+INSERT INTO pxtest_rowlock VALUES (1, 'test data');
+
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+PREPARE TRANSACTION 'regress_p1';
+
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+
+-- Test prepared transactions that participate in multixacts. For
+-- that, lock the same row again, creating a multixid.
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+PREPARE TRANSACTION 'regress_p2';
+
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+
+ROLLBACK PREPARED 'regress_p1';
+ROLLBACK PREPARED 'regress_p2';
+
 -- Clean up
 DROP TABLE pxtest2;
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
+-- pxtest3 was already dropped
 DROP TABLE pxtest4;
+DROP TABLE pxtest_rowlock;
diff --git a/src/oracle_test/regress/sql/privileges.sql b/src/oracle_test/regress/sql/privileges.sql
index 7f144a24c39..f8b7baf8842 100644
--- a/src/oracle_test/regress/sql/privileges.sql
+++ b/src/oracle_test/regress/sql/privileges.sql
@@ -90,21 +90,6 @@ CREATE USER regress_priv_user3;
 CREATE USER regress_priv_user4;
 CREATE USER regress_priv_user5;
 
--- DROP OWNED should also act on granted and granted-to roles
-GRANT regress_priv_user1 TO regress_priv_user2;
-GRANT regress_priv_user2 TO regress_priv_user3;
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-REASSIGN OWNED BY regress_priv_user2 TO regress_priv_user4;  -- no effect
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-DROP OWNED BY regress_priv_user2;  -- removes both grants
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-
 GRANT pg_read_all_data TO regress_priv_user6;
 GRANT pg_write_all_data TO regress_priv_user7;
 GRANT pg_read_all_settings TO regress_priv_user8 WITH ADMIN OPTION;
@@ -347,8 +332,6 @@ CREATE VIEW atest12v AS
   SELECT * FROM atest12 WHERE b <<< 5;
 CREATE VIEW atest12sbv WITH (security_barrier=true) AS
   SELECT * FROM atest12 WHERE b <<< 5;
-GRANT SELECT ON atest12v TO PUBLIC;
-GRANT SELECT ON atest12sbv 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;
@@ -371,8 +354,16 @@ CREATE FUNCTION leak2(integer,integer) RETURNS boolean
 CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
                      restrict = scalargtsel);
 
--- This should not show any "leak" notices before failing.
+-- These should not show any "leak" notices before failing.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v WHERE a >>> 0;
+EXPLAIN (COSTS OFF) SELECT * FROM atest12sbv WHERE a >>> 0;
+
+-- Now regress_priv_user1 grants access to regress_priv_user2 via the views.
+SET SESSION AUTHORIZATION regress_priv_user1;
+GRANT SELECT ON atest12v TO PUBLIC;
+GRANT SELECT ON atest12sbv TO PUBLIC;
+SET SESSION AUTHORIZATION regress_priv_user2;
 
 -- These plans should continue to use a nestloop, since they execute with the
 -- privileges of the view owner.
@@ -1565,6 +1556,14 @@ SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 	'SELECT, fake_privilege', FALSE);  -- error
 
+-- Test quoting and dequoting of user names in ACLs
+CREATE ROLE "regress_""quoted";
+SELECT makeaclitem('regress_"quoted'::regrole, 'regress_"quoted'::regrole,
+                   'SELECT', TRUE);
+SELECT '"regress_""quoted"=r*/"regress_""quoted"'::aclitem;
+SELECT '""=r*/""'::aclitem;  -- used to be misparsed as """"
+DROP ROLE "regress_""quoted";
+
 -- Test non-throwing aclitem I/O
 SELECT pg_input_is_valid('regress_priv_user1=r/regress_priv_user2', 'aclitem');
 SELECT pg_input_is_valid('regress_priv_user1=r/', 'aclitem');
@@ -1876,6 +1875,13 @@ DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 
 
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE USAGE ON TYPES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE USAGE ON TYPES FROM pg_read_all_settings;
+
+
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);
diff --git a/src/oracle_test/regress/sql/psql.sql b/src/oracle_test/regress/sql/psql.sql
index 0522c41b275..408eb19af91 100644
--- a/src/oracle_test/regress/sql/psql.sql
+++ b/src/oracle_test/regress/sql/psql.sql
@@ -3,6 +3,7 @@
 -- specific server features
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- \set
 
 -- fail: invalid name
@@ -1066,6 +1067,7 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
 	\pset arg1 arg2
 	\q
 	\reset
+	\restrict test
 	\s arg1
 	\sendpipeline
 	\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
@@ -1077,6 +1079,7 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
 	\t arg1
 	\T arg1
 	\timing arg1
+	\unrestrict not_valid
 	\unset arg1
 	\w arg1
 	\watch arg1 arg2
diff --git a/src/oracle_test/regress/sql/publication.sql b/src/oracle_test/regress/sql/publication.sql
index f674f267765..66c91bb6cd7 100644
--- a/src/oracle_test/regress/sql/publication.sql
+++ b/src/oracle_test/regress/sql/publication.sql
@@ -26,6 +26,7 @@ CREATE PUBLICATION testpub_xxx WITH (publish = 'cluster, vacuum');
 CREATE PUBLICATION testpub_xxx WITH (publish_via_partition_root = 'true', publish_via_partition_root = '0');
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = stored, publish_generated_columns = none);
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = foo);
+CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns);
 
 \dRp
 
@@ -1185,19 +1186,15 @@ DROP SCHEMA sch2 cascade;
 -- ======================================================
 
 -- Test the 'publish_generated_columns' parameter with the following values:
--- 'stored', 'none', and the default (no value specified), which defaults to
--- 'stored'.
+-- 'stored', 'none'.
 SET client_min_messages = 'ERROR';
 CREATE PUBLICATION pub1 FOR ALL TABLES WITH (publish_generated_columns = stored);
 \dRp+ pub1
 CREATE PUBLICATION pub2 FOR ALL TABLES WITH (publish_generated_columns = none);
 \dRp+ pub2
-CREATE PUBLICATION pub3 FOR ALL TABLES WITH (publish_generated_columns);
-\dRp+ pub3
 
 DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
-DROP PUBLICATION pub3;
 
 -- Test the 'publish_generated_columns' parameter as 'none' and 'stored' for
 -- different scenarios with/without generated columns in column lists.
@@ -1228,6 +1225,86 @@ DROP PUBLICATION pub2;
 DROP TABLE gencols;
 
 RESET client_min_messages;
+
+-- Test that the INSERT ON CONFLICT command correctly checks REPLICA IDENTITY
+-- when the target table is published.
+CREATE TABLE testpub_insert_onconfl_no_ri (a int unique, b int);
+CREATE TABLE testpub_insert_onconfl_parted (a int unique, b int) PARTITION by RANGE (a);
+CREATE TABLE testpub_insert_onconfl_part_no_ri PARTITION OF testpub_insert_onconfl_parted FOR VALUES FROM (1) TO (10);
+
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+
+-- fail - missing REPLICA IDENTITY
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT DO NOTHING;
+
+-- fail - missing REPLICA IDENTITY in partition testpub_insert_onconfl_no_ri
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT DO NOTHING;
+
+DROP PUBLICATION pub1;
+DROP TABLE testpub_insert_onconfl_no_ri;
+DROP TABLE testpub_insert_onconfl_parted;
+
+-- Test that the MERGE command correctly checks REPLICA IDENTITY when the
+-- target table is published.
+CREATE TABLE testpub_merge_no_ri (a int, b int);
+CREATE TABLE testpub_merge_pk (a int primary key, b int);
+
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN UPDATE SET b = s.b;
+
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DELETE;
+
+-- ok - insert and do nothing are not restricted
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DO NOTHING
+ WHEN NOT MATCHED THEN INSERT (a, b) VALUES (0, 0);
+
+-- ok - REPLICA IDENTITY is DEFAULT and table has a PK
+MERGE INTO testpub_merge_pk USING testpub_merge_no_ri s ON s.a >= 1
+ WHEN MATCHED AND s.a > 0 THEN UPDATE SET b = s.b
+ WHEN MATCHED THEN DELETE;
+
+DROP PUBLICATION pub1;
+DROP TABLE testpub_merge_no_ri;
+DROP TABLE testpub_merge_pk;
+
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_publication_user, regress_publication_user2;
 DROP ROLE regress_publication_user_dummy;
+
+-- stage objects for pg_dump tests
+CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int);
+CREATE SCHEMA pubme2 CREATE TABLE t0 (c int, d int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION dump_pub_qual_1ct FOR
+  TABLE ONLY pubme.t0 (c, d) WHERE (c > 0);
+CREATE PUBLICATION dump_pub_qual_2ct FOR
+  TABLE ONLY pubme.t0 (c) WHERE (c > 0),
+  TABLE ONLY pubme.t1 (c);
+CREATE PUBLICATION dump_pub_nsp_1ct FOR
+  TABLES IN SCHEMA pubme;
+CREATE PUBLICATION dump_pub_nsp_2ct FOR
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2;
+CREATE PUBLICATION dump_pub_all FOR
+  TABLE ONLY pubme.t0,
+  TABLE ONLY pubme.t1 WHERE (c < 0),
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2
+  WITH (publish_via_partition_root = true);
+RESET client_min_messages;
diff --git a/src/oracle_test/regress/sql/rowsecurity.sql b/src/oracle_test/regress/sql/rowsecurity.sql
index df5aa8fe7a4..64fabbf76d8 100644
--- a/src/oracle_test/regress/sql/rowsecurity.sql
+++ b/src/oracle_test/regress/sql/rowsecurity.sql
@@ -2,6 +2,7 @@
 -- Test of Row-level security feature
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- Clean up in case a prior regression run failed
 
 -- Suppress NOTICE messages when users/groups don't exist
@@ -2166,7 +2167,7 @@ DROP VIEW rls_view;
 DROP TABLE rls_tbl;
 DROP TABLE ref_tbl;
 
--- Leaky operator test
+-- Leaky operator tests
 CREATE TABLE rls_tbl (a int);
 INSERT INTO rls_tbl SELECT x/10 FROM generate_series(1, 100) x;
 ANALYZE rls_tbl;
@@ -2183,9 +2184,58 @@ CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
 SELECT * FROM rls_tbl WHERE a <<< 1000;
 EXPLAIN (COSTS OFF) SELECT * FROM rls_tbl WHERE a <<< 1000 or a <<< 900;
+RESET SESSION AUTHORIZATION;
+
+CREATE TABLE rls_child_tbl () INHERITS (rls_tbl);
+INSERT INTO rls_child_tbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_child_tbl;
+
+CREATE TABLE rls_ptbl (a int) PARTITION BY RANGE (a);
+CREATE TABLE rls_part PARTITION OF rls_ptbl FOR VALUES FROM (-100) TO (100);
+INSERT INTO rls_ptbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_ptbl, rls_part;
+
+ALTER TABLE rls_ptbl ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_part ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_ptbl TO regress_rls_alice;
+GRANT SELECT ON rls_part TO regress_rls_alice;
+CREATE POLICY p1 ON rls_tbl USING (a < 0);
+CREATE POLICY p2 ON rls_ptbl USING (a < 0);
+CREATE POLICY p3 ON rls_part USING (a < 0);
+
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+SELECT * FROM rls_ptbl WHERE a <<< 1000;
+SELECT * FROM rls_part WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+RESET SESSION AUTHORIZATION;
+
+REVOKE SELECT ON rls_tbl FROM regress_rls_alice;
+CREATE VIEW rls_tbl_view AS SELECT * FROM rls_tbl;
+
+ALTER TABLE rls_child_tbl ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_child_tbl TO regress_rls_alice;
+CREATE POLICY p4 ON rls_child_tbl USING (a < 0);
+
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+SELECT * FROM rls_tbl_view WHERE a <<< 1000;
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
+DROP TABLE rls_part;
+DROP TABLE rls_ptbl;
+DROP TABLE rls_child_tbl;
+DROP VIEW rls_tbl_view;
 DROP TABLE rls_tbl;
 
 -- Bug #16006: whole-row Vars in a policy don't play nice with sub-selects
diff --git a/src/oracle_test/regress/sql/select_parallel.sql b/src/oracle_test/regress/sql/select_parallel.sql
index 914193c80d9..f7ecf195786 100644
--- a/src/oracle_test/regress/sql/select_parallel.sql
+++ b/src/oracle_test/regress/sql/select_parallel.sql
@@ -2,6 +2,7 @@
 -- PARALLEL
 --
 
+\set EXECUTE_RUN_PREPARE on
 -- Save parallel worker stats, used for comparison at the end
 select pg_stat_force_next_flush();
 select parallel_workers_to_launch as parallel_workers_to_launch_before,
diff --git a/src/oracle_test/regress/sql/select_views.sql b/src/oracle_test/regress/sql/select_views.sql
index b0ee7db67a0..c27bf1f46ae 100644
--- a/src/oracle_test/regress/sql/select_views.sql
+++ b/src/oracle_test/regress/sql/select_views.sql
@@ -3,6 +3,7 @@
 -- test the views defined in CREATE_VIEWS
 --
 
+\set EXECUTE_RUN_PREPARE on
 SELECT * FROM street;
 
 SELECT name, #thepath FROM iexit ORDER BY name COLLATE "C", 2;
diff --git a/src/oracle_test/regress/sql/sqljson_queryfuncs.sql b/src/oracle_test/regress/sql/sqljson_queryfuncs.sql
index fbc8eb670d8..1d4b9529bbe 100644
--- a/src/oracle_test/regress/sql/sqljson_queryfuncs.sql
+++ b/src/oracle_test/regress/sql/sqljson_queryfuncs.sql
@@ -451,6 +451,7 @@ SELECT JSON_VALUE(jsonb '{"a": 123}', '$' || '.' || 'a');
 SELECT JSON_VALUE(jsonb '{"a": 123}', '$' || '.' || 'b' DEFAULT 'foo' ON EMPTY);
 SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a');
 SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a' WITH WRAPPER);
+SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || NULL)::date WITH WRAPPER);
 -- Should fail (invalid path)
 SELECT JSON_QUERY(jsonb '{"a": 123}', 'error' || ' ' || 'error');
 
@@ -461,6 +462,7 @@ SELECT JSON_QUERY(NULL FORMAT JSON, '$');
 -- Test non-const jsonpath
 CREATE TEMP TABLE jsonpaths (path) AS SELECT '$';
 SELECT json_value('"aaa"', path RETURNING json) FROM jsonpaths;
+SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM jsonpaths;
 
 -- Test PASSING argument parsing
 SELECT JSON_QUERY(jsonb 'null', '$xyz' PASSING 1 AS xy);
diff --git a/src/oracle_test/regress/sql/stats.sql b/src/oracle_test/regress/sql/stats.sql
index bb77c7e7c85..0b8dc5a87e9 100644
--- a/src/oracle_test/regress/sql/stats.sql
+++ b/src/oracle_test/regress/sql/stats.sql
@@ -404,9 +404,17 @@ COMMIT;
 -- check that the stats are reset.
 SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
   WHERE relid = 'pg_shdescription'::regclass;
+-- stats_reset may not be set for datid=0 and shared objects in
+-- pg_stat_database, so reset once.
 SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
 SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
   WHERE relid = 'pg_shdescription'::regclass;
+SELECT extract(epoch from stats_reset) AS shared_db_reset_before
+  FROM pg_stat_database WHERE datid = 0 \gset
+-- Second reset for comparison.
+SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
+SELECT extract(epoch from stats_reset) > :'shared_db_reset_before' AS has_updated
+  FROM pg_stat_database WHERE datid = 0;
 
 -- set back comment
 \if :{?description_before}
diff --git a/src/oracle_test/regress/sql/stats_ext.sql b/src/oracle_test/regress/sql/stats_ext.sql
index 7c59aba7b5a..799475054db 100644
--- a/src/oracle_test/regress/sql/stats_ext.sql
+++ b/src/oracle_test/regress/sql/stats_ext.sql
@@ -41,6 +41,19 @@ CREATE STATISTICS tst ON x, x, y, x, x, (x || 'x'), (y + 1), (x || 'x'), (x || '
 CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), (y + 1), (x || 'x'), (x || 'x'), (y + 1), (x || 'x'), (x || 'x'), (y + 1) FROM ext_stats_test;
 CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), y FROM ext_stats_test;
 CREATE STATISTICS tst (unrecognized) ON x, y FROM ext_stats_test;
+-- unsupported targets
+CREATE STATISTICS tst ON a FROM (VALUES (x)) AS foo;
+CREATE STATISTICS tst ON a FROM foo NATURAL JOIN bar;
+CREATE STATISTICS tst ON a FROM (SELECT * FROM ext_stats_test) AS foo;
+CREATE STATISTICS tst ON a FROM ext_stats_test s TABLESAMPLE system (x);
+CREATE STATISTICS tst ON a FROM XMLTABLE('foo' PASSING 'bar' COLUMNS a text);
+CREATE STATISTICS tst ON a FROM JSON_TABLE(jsonb '123', '$' COLUMNS (item int));
+CREATE FUNCTION tftest(int) returns table(a int, b int) as $$
+SELECT $1, $1+i FROM generate_series(1,5) g(i);
+$$ LANGUAGE sql IMMUTABLE STRICT;
+/
+CREATE STATISTICS alt_stat2 ON a FROM tftest(1);
+DROP FUNCTION tftest;
 -- incorrect expressions
 CREATE STATISTICS tst ON (y) FROM ext_stats_test; -- single column reference
 CREATE STATISTICS tst ON y + z FROM ext_stats_test; -- missing parentheses
@@ -72,6 +85,14 @@ DROP STATISTICS ab1_a_b_stats;
 ALTER STATISTICS ab1_a_b_stats RENAME TO ab1_a_b_stats_new;
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_stats_ext;
+CREATE STATISTICS pg_temp.stats_ext_temp ON a, b FROM ab1;
+SELECT regexp_replace(pg_describe_object(tableoid, oid, 0),
+                      'pg_temp_[0-9]*', 'pg_temp_REDACTED') AS descr,
+       pg_statistics_obj_is_visible(oid) AS visible
+  FROM pg_statistic_ext
+ WHERE stxname = 'stats_ext_temp';
+DROP STATISTICS stats_ext_temp;  -- shall fail
+DROP STATISTICS pg_temp.stats_ext_temp;
 
 CREATE STATISTICS IF NOT EXISTS ab1_a_b_stats ON a, b FROM ab1;
 DROP STATISTICS ab1_a_b_stats;
@@ -1649,8 +1670,16 @@ CREATE FUNCTION op_leak(int, int) RETURNS bool
 /
 CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
+CREATE FUNCTION op_leak(record, record) RETURNS bool
+    AS 'BEGIN RAISE NOTICE ''op_leak => %, %'', $1, $2; RETURN $1 < $2; END'
+    LANGUAGE plpgsql;
+/
+CREATE OPERATOR <<< (procedure = op_leak, leftarg = record, rightarg = record,
+                     restrict = scalarltsel);
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 
 -- Grant access via a security barrier view, but hide all data
@@ -1663,19 +1692,51 @@ GRANT SELECT, DELETE ON tststats.priv_test_view TO regress_stats_user1;
 SET SESSION AUTHORIZATION regress_stats_user1;
 SELECT * FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 SELECT * FROM tststats.priv_test_view WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_view t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
 DELETE FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 
 -- Grant table access, but hide all data with RLS
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tststats.priv_test_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_tbl_pol ON tststats.priv_test_tbl USING (2 * a < 0);
 GRANT SELECT, DELETE ON tststats.priv_test_tbl TO regress_stats_user1;
 
 -- Should now have direct table access, but see nothing and leak nothing
 SET SESSION AUTHORIZATION regress_stats_user1;
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
 
+-- Create plain inheritance parent table with no access permissions
+RESET SESSION AUTHORIZATION;
+CREATE TABLE tststats.priv_test_parent_tbl (a int, b int);
+ALTER TABLE tststats.priv_test_tbl INHERIT tststats.priv_test_parent_tbl;
+
+-- Should not have access to parent, and should leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+
+-- Grant table access to parent, but hide all data with RLS
+RESET SESSION AUTHORIZATION;
+ALTER TABLE tststats.priv_test_parent_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_parent_tbl_pol ON tststats.priv_test_parent_tbl USING (2 * a < 0);
+GRANT SELECT, DELETE ON tststats.priv_test_parent_tbl TO regress_stats_user1;
+
+-- Should now have direct table access to parent, but see nothing and leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+
 -- privilege checks for pg_stats_ext and pg_stats_ext_exprs
 RESET SESSION AUTHORIZATION;
 CREATE TABLE stats_ext_tbl (id INT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, col TEXT);
@@ -1702,12 +1763,48 @@ SELECT statistics_name, most_common_vals FROM pg_stats_ext x
 SELECT statistics_name, most_common_vals FROM pg_stats_ext_exprs x
     WHERE tablename = 'stats_ext_tbl' ORDER BY ROW(x.*);
 
+-- CREATE STATISTICS checks for CREATE on the schema
+RESET SESSION AUTHORIZATION;
+CREATE SCHEMA sts_sch1 CREATE TABLE sts_sch1.tbl (a INT, b INT, c INT GENERATED ALWAYS AS (b * 2) STORED);
+CREATE SCHEMA sts_sch2;
+GRANT USAGE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+ALTER TABLE sts_sch1.tbl OWNER TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1 FROM regress_stats_user1;
+GRANT CREATE ON SCHEMA sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass1 ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass2 ON a, b, c FROM sts_sch1.tbl;
+
+-- re-creating statistics via ALTER TABLE bypasses checks for CREATE on schema
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1, sts_sch2 FROM regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN a TYPE SMALLINT;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN c SET EXPRESSION AS (a * 3);
+
 -- Tidy up
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
+DROP OPERATOR <<< (record, record);
+DROP FUNCTION op_leak(record, record);
 RESET SESSION AUTHORIZATION;
 DROP TABLE stats_ext_tbl;
 DROP SCHEMA tststats CASCADE;
+DROP SCHEMA sts_sch1, sts_sch2 CASCADE;
 DROP USER regress_stats_user1;
 
 CREATE TABLE grouping_unique (x integer);
diff --git a/src/oracle_test/regress/sql/stats_import.sql b/src/oracle_test/regress/sql/stats_import.sql
index d140733a750..ee97fa6bc1b 100755
--- a/src/oracle_test/regress/sql/stats_import.sql
+++ b/src/oracle_test/regress/sql/stats_import.sql
@@ -457,6 +457,60 @@ AND tablename = 'test'
 AND inherited = false
 AND attname = 'id';
 
+-- warn: mcv / mcf array length mismatch (more vals), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.24::real,
+    'most_common_vals', '{2,1,3}'::text,
+    'most_common_freqs', '{0.3,0.25}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
+-- warn: mcv / mcf array length mismatch (more freqs), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.25::real,
+    'most_common_vals', '{2,1}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
+-- warn: most_common_vals is multi-dimensional, mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.26::real,
+    'most_common_vals', '{{2,1},{3,4}}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05,0.04}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
 -- ok: mcv+mcf
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
diff --git a/src/oracle_test/regress/sql/strings.sql b/src/oracle_test/regress/sql/strings.sql
index 8827602257a..38a93e50955 100644
--- a/src/oracle_test/regress/sql/strings.sql
+++ b/src/oracle_test/regress/sql/strings.sql
@@ -217,6 +217,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[]%][^]%][^%]%';
 -- Closing square bracket effective after two carets at the beginning
 -- of character class.
 EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[^^]^';
+-- Closing square bracket after an escape sequence at the beginning of
+-- a character closes the character class
+EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[|a]%' ESCAPE '|';
 
 -- Test backslash escapes in regexp_replace's replacement string
 SELECT regexp_replace('1112223333', E'(\\d{3})(\\d{3})(\\d{4})', E'(\\1) \\2-\\3');
diff --git a/src/oracle_test/regress/sql/subselect.sql b/src/oracle_test/regress/sql/subselect.sql
index 1967fef0357..186d5965345 100644
--- a/src/oracle_test/regress/sql/subselect.sql
+++ b/src/oracle_test/regress/sql/subselect.sql
@@ -341,6 +341,16 @@ select * from (
   where not exists (select 1 from tenk1 as b where b.unique2 = 10000)
 ) ss;
 
+--
+-- Test cases for interactions between PARAM_EXEC, subplans and array
+-- subscripts
+--
+
+-- check that array subscription doesn't conflict with PARAM_EXEC (see #19370)
+SELECT (array[1,2])[(SELECT g.i)] FROM generate_series(1, 1) g(i);
+SELECT (array[1,2])[(SELECT g.i):(SELECT g.i + 1)] FROM generate_series(1, 1) g(i);
+
+
 --
 -- Test that an IN implemented using a UniquePath does unique-ification
 -- with the right semantics, as per bug #4113.  (Unfortunately we have
@@ -413,6 +423,15 @@ select (select view_a) from view_a;
 select (select (select view_a)) from view_a;
 select (select (a.*)::text) from view_a a;
 
+--
+-- Test case for bug #19037: no relation entry for relid N
+--
+
+explain (costs off)
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+
 --
 -- Check that whole-row Vars reading the result of a subselect don't include
 -- any junk columns therein
@@ -868,6 +887,46 @@ select * from
   (select 9 as x, unnest(array[1,2,3,11,12,13]) as u) ss
   where tattle(x, u);
 
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains SRFs
+--
+explain (verbose, costs off)
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains volatile functions
+--
+alter function tattle(x int, y int) volatile;
+
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+-- if we pretend it's stable, we get different results:
+alter function tattle(x int, y int) stable;
+
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
 drop function tattle(x int, y int);
 
 --
@@ -926,6 +985,23 @@ fetch backward all in c1;
 
 commit;
 
+--
+-- Check that JsonConstructorExpr is treated as non-strict, and thus can be
+-- wrapped in a PlaceHolderVar
+--
+
+begin;
+
+create temp table json_tab (a int);
+insert into json_tab values (1);
+
+explain (verbose, costs off)
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+
+rollback;
+
 --
 -- Verify that we correctly flatten cases involving a subquery output
 -- expression that doesn't need to be wrapped in a PlaceHolderVar
diff --git a/src/oracle_test/regress/sql/timestamp.sql b/src/oracle_test/regress/sql/timestamp.sql
index 2c6d7425b06..1db20b665d3 100644
--- a/src/oracle_test/regress/sql/timestamp.sql
+++ b/src/oracle_test/regress/sql/timestamp.sql
@@ -173,6 +173,10 @@ SELECT d1 - timestamp without time zone '1997-01-02' AS diff
    FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
 
 SELECT date_trunc( 'week', timestamp '2004-02-29 15:44:17.71393' ) AS week_trunc;
+SELECT date_trunc( 'week', timestamp 'infinity' ) AS inf_trunc;
+SELECT date_trunc( 'timezone', timestamp '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+SELECT date_trunc( 'timezone', timestamp 'infinity' ) AS notsupp_inf_trunc;
+SELECT date_trunc( 'ago', timestamp 'infinity' ) AS invalid_trunc;
 
 -- verify date_bin behaves the same as date_trunc for relevant intervals
 
diff --git a/src/oracle_test/regress/sql/transactions.sql b/src/oracle_test/regress/sql/transactions.sql
index 4954163b544..79ebfe6b03b 100644
--- a/src/oracle_test/regress/sql/transactions.sql
+++ b/src/oracle_test/regress/sql/transactions.sql
@@ -2,6 +2,7 @@
 -- TRANSACTIONS
 --
 
+\set EXECUTE_RUN_PREPARE on
 BEGIN;
 
 CREATE TABLE xacttest (a smallint, b real);
diff --git a/src/oracle_test/regress/sql/triggers.sql b/src/oracle_test/regress/sql/triggers.sql
index 804bf0e6cf8..3a286939824 100644
--- a/src/oracle_test/regress/sql/triggers.sql
+++ b/src/oracle_test/regress/sql/triggers.sql
@@ -1963,6 +1963,11 @@ BBB	42
 CCC	42
 \.
 
+-- check detach/reattach behavior; statement triggers with transition tables
+-- should not prevent a table from becoming a partition again
+alter table parent detach partition child1;
+alter table parent attach partition child1 for values in ('AAA');
+
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2187,6 +2192,11 @@ copy parent (a, b) from stdin;
 DDD	42
 \.
 
+-- check disinherit/reinherit behavior; statement triggers with transition
+-- tables should not prevent a table from becoming an inheritance child again
+alter table child1 no inherit parent;
+alter table child1 inherit parent;
+
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2251,6 +2261,10 @@ with wcte as (insert into table1 values (42))
 with wcte as (insert into table1 values (43))
   insert into table1 values (44);
 
+with wcte as (insert into table1 values (45))
+  merge into table1 using (values (46)) as v(a) on table1.a = v.a
+    when not matched then insert values (v.a);
+
 select * from table1;
 select * from table2;
 
diff --git a/src/oracle_test/regress/sql/tsearch.sql b/src/oracle_test/regress/sql/tsearch.sql
index 508ef19ef35..698633967e5 100644
--- a/src/oracle_test/regress/sql/tsearch.sql
+++ b/src/oracle_test/regress/sql/tsearch.sql
@@ -223,6 +223,7 @@ RESET enable_bitmapscan;
 
 DROP INDEX wowidx;
 
+ALTER TABLE test_tsvector SET (parallel_workers = 2);
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 
 SET enable_seqscan=OFF;
@@ -647,6 +648,14 @@ SELECT ts_headline('english',
 SELECT ts_headline('english',
 'foo bar', to_tsquery('english', ''));
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+
 --Rewrite sub system
 
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
diff --git a/src/oracle_test/regress/sql/union.sql b/src/oracle_test/regress/sql/union.sql
index 405ab2017e0..1ab8e1543cf 100644
--- a/src/oracle_test/regress/sql/union.sql
+++ b/src/oracle_test/regress/sql/union.sql
@@ -594,4 +594,8 @@ select * from tenk1 t1
 left join lateral
   (select t1.tenthous from tenk2 t2 union all (values(1)))
 on true limit 1;
+
+-- Test handling of Vars with varno 0 in estimate_array_length
+explain (verbose, costs off)
+select null::int[] union all select null::int[] union all select null::bigint[];
 reset ivorysql.enable_emptystring_to_null;
diff --git a/src/oracle_test/regress/sql/updatable_views.sql b/src/oracle_test/regress/sql/updatable_views.sql
index 9299bba6265..89142990f0f 100644
--- a/src/oracle_test/regress/sql/updatable_views.sql
+++ b/src/oracle_test/regress/sql/updatable_views.sql
@@ -2,6 +2,7 @@
 -- UPDATABLE VIEWS
 --
 
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 -- avoid bit-exact output here because operations may not be bit-exact.
 SET extra_float_digits = 0;
diff --git a/src/oracle_test/regress/sql/window.sql b/src/oracle_test/regress/sql/window.sql
index 9a94e07fffe..f99ba5e5c07 100644
--- a/src/oracle_test/regress/sql/window.sql
+++ b/src/oracle_test/regress/sql/window.sql
@@ -331,6 +331,32 @@ CREATE TEMP VIEW v_window AS
 
 SELECT pg_get_viewdef('v_window');
 
+-- test overflow frame specifications
+SELECT sum(unique1) over (rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (rows between 9223372036854775807 following and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+-- These test GROUPS mode with an offset large enough to cause overflow when
+-- added to currentgroup.  Although the overflow doesn't produce visibly wrong
+-- results (due to the incremental nature of group pointer advancement), we
+-- still need to protect against it as signed integer overflow is undefined
+-- behavior in C.
+SELECT sum(unique1) over (ORDER BY four groups between current row and 9223372036854775807 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (ORDER BY four groups between 9223372036854775807 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
 -- RANGE offset PRECEDING/FOLLOWING tests
 
 SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
diff --git a/src/oracle_test/regress/sql/with.sql b/src/oracle_test/regress/sql/with.sql
index e84904a1780..a668e9af947 100644
--- a/src/oracle_test/regress/sql/with.sql
+++ b/src/oracle_test/regress/sql/with.sql
@@ -1098,6 +1098,30 @@ select ( with cte(foo) as ( values(f1) )
           values((select foo from cte)) )
 from int4_tbl;
 
+--
+-- test for bug #19055: interaction of WITH with aggregates
+--
+-- For now, we just throw an error if there's a use of a CTE below the
+-- semantic level that the SQL standard assigns to the aggregate.
+-- It's not entirely clear what we could do instead that doesn't risk
+-- breaking more things than it fixes.
+select f1, (with cte1(x,y) as (select 1,2)
+            select count((select i4.f1 from cte1))) as ss
+from int4_tbl i4;
+
+--
+-- test for bug #19106: interaction of WITH with aggregates
+--
+-- the initial fix for #19055 was too aggressive and broke this case
+explain (verbose, costs off)
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+
 --
 -- test for nested-recursive-WITH bug
 --
@@ -1337,6 +1361,29 @@ COMMIT;
 
 SELECT * FROM bug6051_3;
 
+-- check that recursive CTE processing doesn't rewrite a CTE more than once
+-- (must not try to expand GENERATED ALWAYS IDENTITY columns more than once)
+CREATE TEMP TABLE id_alw1 (i int GENERATED ALWAYS AS IDENTITY);
+
+CREATE TEMP TABLE id_alw2 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP VIEW id_alw2_view AS SELECT * FROM id_alw2;
+
+CREATE TEMP TABLE id_alw3 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE RULE id_alw3_ins AS ON INSERT TO id_alw3 DO INSTEAD
+  WITH t1 AS (INSERT INTO id_alw1 DEFAULT VALUES RETURNING i)
+    INSERT INTO id_alw2_view DEFAULT VALUES RETURNING i;
+CREATE TEMP VIEW id_alw3_view AS SELECT * FROM id_alw3;
+
+CREATE TEMP TABLE id_alw4 (i int GENERATED ALWAYS AS IDENTITY);
+
+WITH t4 AS (INSERT INTO id_alw4 DEFAULT VALUES RETURNING i)
+  INSERT INTO id_alw3_view DEFAULT VALUES RETURNING i;
+
+SELECT * from id_alw1;
+SELECT * from id_alw2;
+SELECT * from id_alw3;
+SELECT * from id_alw4;
+
 -- check case where CTE reference is removed due to optimization
 EXPLAIN (VERBOSE, COSTS OFF)
 SELECT q1 FROM
diff --git a/src/oracle_test/regress/sql/xml.sql b/src/oracle_test/regress/sql/xml.sql
index 8db19e29920..dd3be76e92a 100644
--- a/src/oracle_test/regress/sql/xml.sql
+++ b/src/oracle_test/regress/sql/xml.sql
@@ -1,3 +1,4 @@
+\set EXECUTE_RUN_PREPARE on
 set ivorysql.enable_emptystring_to_null to false;
 CREATE TABLE xmltest (
     id int,
diff --git a/src/oracle_test/ssl/t/001_ssltests.pl b/src/oracle_test/ssl/t/001_ssltests.pl
index f9d30843efc..a9aeae2a819 100644
--- a/src/oracle_test/ssl/t/001_ssltests.pl
+++ b/src/oracle_test/ssl/t/001_ssltests.pl
@@ -172,6 +172,13 @@ sub switch_server_cert
 	ok( (@status = stat("$tempdir/key.txt")),
 		"keylog file exists and returned status");
 	ok(@status && !($status[2] & 0006), "keylog file is not world readable");
+
+	# Connect should work with an incorrect sslkeylogfile, with the error to
+	# open the logfile printed to stderr
+	$node->connect_ok(
+		"$common_connstr sslrootcert=ssl/root+server_ca.crt sslkeylogfile=$tempdir/invalid/key.txt sslmode=require",
+		"connect with server root cert and incorrect sslkeylogfile path",
+		expected_stderr => qr/could not open/);
 }
 
 # The server should not accept non-SSL connections.
diff --git a/src/oracle_test/subscription/t/001_rep_changes.pl b/src/oracle_test/subscription/t/001_rep_changes.pl
index 17dbab06164..58258a92307 100644
--- a/src/oracle_test/subscription/t/001_rep_changes.pl
+++ b/src/oracle_test/subscription/t/001_rep_changes.pl
@@ -352,7 +352,8 @@
 # Note that the current location of the log file is not grabbed immediately
 # after reloading the configuration, but after sending one SQL command to
 # the node so as we are sure that the reloading has taken effect.
-my $log_location = -s $node_subscriber->logfile;
+my $log_location_pub = -s $node_publisher->logfile;
+my $log_location_sub = -s $node_subscriber->logfile;
 
 $node_publisher->safe_psql('postgres',
 	"UPDATE tab_full_pk SET b = 'quux' WHERE a = 1");
@@ -362,12 +363,12 @@
 
 $node_publisher->wait_for_catchup('tap_sub');
 
-my $logfile = slurp_file($node_subscriber->logfile, $log_location);
+my $logfile = slurp_file($node_subscriber->logfile, $log_location_sub);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab_full_pk": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(1, quux\); replica identity \(a\)=\(1\)/m,
+	  qr/conflict detected on relation "public.tab_full_pk": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(1, quux\); replica identity \(a\)=\(1\)/m,
 	'update target row is missing');
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab_full": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(26\); replica identity full \(25\)/m,
+	  qr/conflict detected on relation "public.tab_full": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(26\); replica identity full \(25\)/m,
 	'update target row is missing');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab_full_pk": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(2\)/m,
@@ -434,17 +435,35 @@
 22.22|bar|2),
 	'update works with dropped subscriber column');
 
+# Verify that GUC settings supplied in the CONNECTION string take effect on
+# the publisher's walsender.  We do this by enabling log_statement_stats in
+# the CONNECTION string later and checking that the publisher's log contains a
+# QUERY STATISTICS message.
+#
+# First, confirm that no such QUERY STATISTICS message appears before enabling
+# log_statement_stats.
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
+unlike(
+	$logfile,
+	qr/QUERY STATISTICS/,
+	'log_statement_stats has not been enabled yet');
+$log_location_pub = -s $node_publisher->logfile;
+
 # check that change of connection string and/or publication list causes
 # restart of subscription workers. We check the state along with
 # application_name to ensure that the walsender is (re)started.
 #
 # Not all of these are registered as tests as we need to poll for a change
 # but the test suite will fail nonetheless when something goes wrong.
+#
+# Enable log_statement_stats as the change of connection string,
+# which is also for the above mentioned test of GUC settings passed through
+# CONNECTION.
 my $oldpid = $node_publisher->safe_psql('postgres',
 	"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
 );
 $node_subscriber->safe_psql('postgres',
-	"ALTER SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr sslmode=disable'"
+	"ALTER SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr options=''-c log_statement_stats=on'''"
 );
 $node_publisher->poll_query_until('postgres',
 	"SELECT pid != $oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
@@ -452,6 +471,16 @@
   or die
   "Timed out while waiting for apply to restart after changing CONNECTION";
 
+# Check that the expected QUERY STATISTICS message appears,
+# which shows that log_statement_stats=on from the CONNECTION string
+# was correctly passed through to and honored by the walsender.
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
+like(
+	$logfile,
+	qr/QUERY STATISTICS/,
+	'log_statement_stats in CONNECTION string had effect on publisher\'s walsender'
+);
+
 $oldpid = $node_publisher->safe_psql('postgres',
 	"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
 );
@@ -507,13 +536,13 @@
 # Note that the current location of the log file is not grabbed immediately
 # after reloading the configuration, but after sending one SQL command to
 # the node so that we are sure that the reloading has taken effect.
-$log_location = -s $node_publisher->logfile;
+$log_location_pub = -s $node_publisher->logfile;
 
 $node_publisher->safe_psql('postgres', "INSERT INTO tab_notrep VALUES (11)");
 
 $node_publisher->wait_for_catchup('tap_sub');
 
-$logfile = slurp_file($node_publisher->logfile, $log_location);
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
 ok($logfile =~ qr/skipped replication of an empty transaction with XID/,
 	'empty transaction is skipped');
 
diff --git a/src/oracle_test/subscription/t/004_sync.pl b/src/oracle_test/subscription/t/004_sync.pl
index e077e255fc0..8ce6a112472 100644
--- a/src/oracle_test/subscription/t/004_sync.pl
+++ b/src/oracle_test/subscription/t/004_sync.pl
@@ -172,6 +172,12 @@
 		'postgres', 'SELECT count(*) = 0 FROM pg_replication_slots'),
 	'DROP SUBSCRIPTION during error can clean up the slots on the publisher');
 
+# After dropping the subscription, all replication origins, whether created by
+# an apply worker or table sync worker, should have been cleaned up.
+$result = $node_subscriber->safe_psql('postgres',
+	"SELECT count(*) FROM pg_replication_origin_status");
+is($result, qq(0), 'all replication origins have been cleaned up');
+
 $node_subscriber->stop('fast');
 $node_publisher->stop('fast');
 
diff --git a/src/oracle_test/subscription/t/013_partition.pl b/src/oracle_test/subscription/t/013_partition.pl
index 4f78dd48815..763a91e75a3 100644
--- a/src/oracle_test/subscription/t/013_partition.pl
+++ b/src/oracle_test/subscription/t/013_partition.pl
@@ -368,7 +368,7 @@ BEGIN
 
 my $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab1_2_2": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(null, 4, quux\); replica identity \(a\)=\(4\)/,
+	  qr/conflict detected on relation "public.tab1_2_2": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(null, 4, quux\); replica identity \(a\)=\(4\)/,
 	'update target row is missing in tab1_2_2');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab1_1": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(1\)/,
@@ -781,7 +781,7 @@ BEGIN
 
 $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab2_1": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(pub_tab2, quux, 5\); replica identity \(a\)=\(5\)/,
+	  qr/conflict detected on relation "public.tab2_1": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(pub_tab2, quux, 5\); replica identity \(a\)=\(5\)/,
 	'update target row is missing in tab2_1');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab2_1": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(1\)/,
@@ -802,8 +802,8 @@ BEGIN
 
 $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab2_1": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified locally in transaction [0-9]+ at .*\n.*Existing local tuple \(yyy, null, 3\); remote tuple \(pub_tab2, quux, 3\); replica identity \(a\)=\(3\)/,
-	'updating a tuple that was modified by a different origin');
+	  qr/conflict detected on relation "public.tab2_1": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified locally in transaction [0-9]+ at .*\n.*Existing local row \(yyy, null, 3\); remote row \(pub_tab2, quux, 3\); replica identity \(a\)=\(3\)/,
+	'updating a row that was modified by a different origin');
 
 # The remaining tests no longer test conflict detection.
 $node_subscriber1->append_conf('postgresql.conf',
diff --git a/src/oracle_test/subscription/t/023_twophase_stream.pl b/src/oracle_test/subscription/t/023_twophase_stream.pl
index 23c762e8adf..5a5516ba787 100644
--- a/src/oracle_test/subscription/t/023_twophase_stream.pl
+++ b/src/oracle_test/subscription/t/023_twophase_stream.pl
@@ -429,6 +429,51 @@ sub test_streaming
   $node_subscriber->safe_psql('postgres', "SELECT count(*) FROM test_tab_2");
 is($result, qq(1), 'transaction is committed on subscriber');
 
+# Test the ability to re-apply a transaction when a parallel apply worker fails
+# to prepare the transaction due to insufficient max_prepared_transactions
+# setting.
+$node_subscriber->append_conf(
+	'postgresql.conf', qq(
+max_prepared_transactions = 0
+debug_logical_replication_streaming = buffered
+));
+$node_subscriber->restart;
+
+$node_publisher->safe_psql(
+	'postgres', q{
+	BEGIN;
+	INSERT INTO test_tab_2 values(2);
+	PREPARE TRANSACTION 'xact';
+	COMMIT PREPARED 'xact';
+	});
+
+$offset = -s $node_subscriber->logfile;
+
+# Confirm the ERROR is reported because max_prepared_transactions is zero
+$node_subscriber->wait_for_log(
+	qr/ERROR: ( [A-Z0-9]+:)? prepared transactions are disabled/,
+	$offset);
+
+# Confirm that the parallel apply worker has encountered an error. The check
+# focuses on the worker type as a keyword, since the error message content may
+# differ based on whether the leader initially detected the parallel apply
+# worker's failure or received a signal from it.
+$node_subscriber->wait_for_log(
+	qr/ERROR: .*logical replication parallel apply worker.*/,
+	$offset);
+
+# Set max_prepared_transactions to correct value to resume the replication
+$node_subscriber->append_conf('postgresql.conf',
+	qq(max_prepared_transactions = 10));
+$node_subscriber->restart;
+
+$node_publisher->wait_for_catchup($appname);
+
+# Check that transaction is committed on subscriber
+$result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*) FROM test_tab_2");
+is($result, qq(2), 'transaction is committed on subscriber after retrying');
+
 ###############################
 # check all the cleanup
 ###############################
diff --git a/src/oracle_test/subscription/t/029_on_error.pl b/src/oracle_test/subscription/t/029_on_error.pl
index 2f099a74f39..b59d20599fd 100644
--- a/src/oracle_test/subscription/t/029_on_error.pl
+++ b/src/oracle_test/subscription/t/029_on_error.pl
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2021-2024, PostgreSQL Global Development Group
+# Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 # Tests for disable_on_error and SKIP transaction features.
 use strict;
@@ -30,7 +30,7 @@ sub test_skip_lsn
 	# ERROR with its CONTEXT when retrieving this information.
 	my $contents = slurp_file($node_subscriber->logfile, $offset);
 	$contents =~
-	  qr/conflict detected on relation "public.tbl".*\n.*DETAIL:.* Key already exists in unique index "tbl_pkey", modified by .*origin.* transaction \d+ at .*\n.*Key \(i\)=\(\d+\); existing local tuple .*; remote tuple .*\n.*CONTEXT:.* for replication target relation "public.tbl" in transaction \d+, finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/m
+	  qr/conflict detected on relation "public.tbl".*\n.*DETAIL:.* Key already exists in unique index "tbl_pkey", modified by .*origin.* transaction \d+ at .*\n.*Key \(i\)=\(\d+\); existing local row .*; remote row .*\n.*CONTEXT:.* for replication target relation "public.tbl" in transaction \d+, finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/m
 	  or die "could not get error-LSN";
 	my $lsn = $1;
 
diff --git a/src/oracle_test/subscription/t/030_origin.pl b/src/oracle_test/subscription/t/030_origin.pl
index c4a8276b1a2..3fe99f4ae09 100644
--- a/src/oracle_test/subscription/t/030_origin.pl
+++ b/src/oracle_test/subscription/t/030_origin.pl
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2021-2024, PostgreSQL Global Development Group
+# Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 # Test the CREATE SUBSCRIPTION 'origin' parameter and its interaction with
 # 'copy_data' parameter.
@@ -9,6 +9,9 @@
 use PostgreSQL::Test::Utils;
 use Test::More;
 
+my $tab_unquoted = q{tab'le};
+my $tab = qq{"$tab_unquoted"};
+
 my $subname_AB  = 'tap_sub_A_B';
 my $subname_AB2 = 'tap_sub_A_B_2';
 my $subname_BA  = 'tap_sub_B_A';
@@ -38,15 +41,15 @@
 $node_B->start;
 
 # Create table on node_A
-$node_A->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_A->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Create the same table on node_B
-$node_B->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_B->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Setup logical replication
 # node_A (pub) -> node_B (sub)
 my $node_A_connstr = $node_A->connstr . ' dbname=postgres';
-$node_A->safe_psql('postgres', "CREATE PUBLICATION tap_pub_A FOR TABLE tab");
+$node_A->safe_psql('postgres', "CREATE PUBLICATION tap_pub_A FOR TABLE $tab");
 $node_B->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_BA
@@ -56,7 +59,7 @@
 
 # node_B (pub) -> node_A (sub)
 my $node_B_connstr = $node_B->connstr . ' dbname=postgres';
-$node_B->safe_psql('postgres', "CREATE PUBLICATION tap_pub_B FOR TABLE tab");
+$node_B->safe_psql('postgres', "CREATE PUBLICATION tap_pub_B FOR TABLE $tab");
 $node_A->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_AB
@@ -76,25 +79,25 @@
 ###############################################################################
 
 # insert a record
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (11);");
-$node_B->safe_psql('postgres', "INSERT INTO tab VALUES (21);");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (11);");
+$node_B->safe_psql('postgres', "INSERT INTO $tab VALUES (21);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
 # check that transaction was committed on subscriber(s)
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is( $result, qq(11
 21),
 	'Inserted successfully without leading to infinite recursion in bidirectional replication setup'
 );
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is( $result, qq(11
 21),
 	'Inserted successfully without leading to infinite recursion in bidirectional replication setup'
 );
 
-$node_A->safe_psql('postgres', "DELETE FROM tab;");
+$node_A->safe_psql('postgres', "DELETE FROM $tab;");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
@@ -103,10 +106,10 @@
 # Check that remote data of node_B (that originated from node_C) is not
 # published to node_A.
 ###############################################################################
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(), 'Check existing data');
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(), 'Check existing data');
 
 # Initialize node node_C
@@ -114,12 +117,12 @@
 $node_C->init(allows_streaming => 'logical');
 $node_C->start;
 
-$node_C->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_C->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Setup logical replication
 # node_C (pub) -> node_B (sub)
 my $node_C_connstr = $node_C->connstr . ' dbname=postgres';
-$node_C->safe_psql('postgres', "CREATE PUBLICATION tap_pub_C FOR TABLE tab");
+$node_C->safe_psql('postgres', "CREATE PUBLICATION tap_pub_C FOR TABLE $tab");
 $node_B->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_BC
@@ -129,17 +132,17 @@
 $node_B->wait_for_subscription_sync($node_C, $subname_BC);
 
 # insert a record
-$node_C->safe_psql('postgres', "INSERT INTO tab VALUES (32);");
+$node_C->safe_psql('postgres', "INSERT INTO $tab VALUES (32);");
 
 $node_C->wait_for_catchup($subname_BC);
 $node_B->wait_for_catchup($subname_AB);
 $node_A->wait_for_catchup($subname_BA);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(32), 'The node_C data replicated to node_B');
 
 # check that the data published from node_C to node_B is not sent to node_A
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(),
 	'Remote data originating from another node (not the publisher) is not replicated when origin parameter is none'
 );
@@ -149,37 +152,37 @@
 # delete a row that was previously modified by a different source.
 ###############################################################################
 
-$node_B->safe_psql('postgres', "DELETE FROM tab;");
+$node_B->safe_psql('postgres', "DELETE FROM $tab;");
 
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (32);");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (32);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(32), 'The node_A data replicated to node_B');
 
 # The update should update the row on node B that was inserted by node A.
-$node_C->safe_psql('postgres', "UPDATE tab SET a = 33 WHERE a = 32;");
+$node_C->safe_psql('postgres', "UPDATE $tab SET a = 33 WHERE a = 32;");
 
 $node_B->wait_for_log(
-	qr/conflict detected on relation "public.tab": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local tuple \(32\); remote tuple \(33\); replica identity \(a\)=\(32\)/
+	qr/conflict detected on relation "public.$tab_unquoted": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local row \(32\); remote row \(33\); replica identity \(a\)=\(32\)/
 );
 
-$node_B->safe_psql('postgres', "DELETE FROM tab;");
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (33);");
+$node_B->safe_psql('postgres', "DELETE FROM $tab;");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (33);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(33), 'The node_A data replicated to node_B');
 
 # The delete should remove the row on node B that was inserted by node A.
-$node_C->safe_psql('postgres', "DELETE FROM tab WHERE a = 33;");
+$node_C->safe_psql('postgres', "DELETE FROM $tab WHERE a = 33;");
 
 $node_B->wait_for_log(
-	qr/conflict detected on relation "public.tab": conflict=delete_origin_differs.*\n.*DETAIL:.* Deleting the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local tuple \(33\); replica identity \(a\)=\(33\)/
+	qr/conflict detected on relation "public.$tab_unquoted": conflict=delete_origin_differs.*\n.*DETAIL:.* Deleting the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local row \(33\); replica identity \(a\)=\(33\)/
 );
 
 # The remaining tests no longer test conflict detection.
diff --git a/src/oracle_test/subscription/t/035_conflicts.pl b/src/oracle_test/subscription/t/035_conflicts.pl
index d78a6bac16a..9a72925fb59 100644
--- a/src/oracle_test/subscription/t/035_conflicts.pl
+++ b/src/oracle_test/subscription/t/035_conflicts.pl
@@ -79,11 +79,11 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_pkey\".*
-.*Key \(a\)=\(2\); existing local tuple \(2, 2, 2\); remote tuple \(2, 3, 4\).*
+.*Key \(a\)=\(2\); existing local row \(2, 2, 2\); remote row \(2, 3, 4\).*
 .*Key already exists in unique index \"conf_tab_b_key\".*
-.*Key \(b\)=\(3\); existing local tuple \(3, 3, 3\); remote tuple \(2, 3, 4\).*
+.*Key \(b\)=\(3\); existing local row \(3, 3, 3\); remote row \(2, 3, 4\).*
 .*Key already exists in unique index \"conf_tab_c_key\".*
-.*Key \(c\)=\(4\); existing local tuple \(4, 4, 4\); remote tuple \(2, 3, 4\)./,
+.*Key \(c\)=\(4\); existing local row \(4, 4, 4\); remote row \(2, 3, 4\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected during insert');
@@ -111,11 +111,11 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_pkey\".*
-.*Key \(a\)=\(6\); existing local tuple \(6, 6, 6\); remote tuple \(6, 7, 8\).*
+.*Key \(a\)=\(6\); existing local row \(6, 6, 6\); remote row \(6, 7, 8\).*
 .*Key already exists in unique index \"conf_tab_b_key\".*
-.*Key \(b\)=\(7\); existing local tuple \(7, 7, 7\); remote tuple \(6, 7, 8\).*
+.*Key \(b\)=\(7\); existing local row \(7, 7, 7\); remote row \(6, 7, 8\).*
 .*Key already exists in unique index \"conf_tab_c_key\".*
-.*Key \(c\)=\(8\); existing local tuple \(8, 8, 8\); remote tuple \(6, 7, 8\)./,
+.*Key \(c\)=\(8\); existing local row \(8, 8, 8\); remote row \(6, 7, 8\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected during update');
@@ -139,9 +139,9 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab_2_p1\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_2_p1_pkey\".*
-.*Key \(a\)=\(55\); existing local tuple \(55, 2, 3\); remote tuple \(55, 2, 3\).*
+.*Key \(a\)=\(55\); existing local row \(55, 2, 3\); remote row \(55, 2, 3\).*
 .*Key already exists in unique index \"conf_tab_2_p1_a_b_key\".*
-.*Key \(a, b\)=\(55, 2\); existing local tuple \(55, 2, 3\); remote tuple \(55, 2, 3\)./,
+.*Key \(a, b\)=\(55, 2\); existing local row \(55, 2, 3\); remote row \(55, 2, 3\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected on a leaf partition during insert');
diff --git a/src/oracle_test/subscription/t/100_bugs.pl b/src/oracle_test/subscription/t/100_bugs.pl
index f20af4ccc3e..3f8939f145f 100644
--- a/src/oracle_test/subscription/t/100_bugs.pl
+++ b/src/oracle_test/subscription/t/100_bugs.pl
@@ -575,4 +575,34 @@ BEGIN
 $node_publisher->stop('fast');
 $node_subscriber->stop('fast');
 
+# BUG #18988
+# The bug happened due to a self-deadlock between the DROP SUBSCRIPTION
+# command and the walsender process for accessing pg_subscription. This
+# occurred when DROP SUBSCRIPTION attempted to remove a replication slot by
+# connecting to a newly created database whose caches are not yet
+# initialized.
+#
+# The bug is fixed by reducing the lock-level during DROP SUBSCRIPTION.
+$node_publisher->start();
+
+$publisher_connstr = $node_publisher->connstr . ' dbname=regress_db';
+$node_publisher->safe_psql(
+	'postgres', qq(
+	CREATE DATABASE regress_db;
+	CREATE SUBSCRIPTION regress_sub1 CONNECTION '$publisher_connstr' PUBLICATION regress_pub WITH (connect=false);
+));
+
+my ($ret, $stdout, $stderr) =
+  $node_publisher->psql('postgres', q{DROP SUBSCRIPTION regress_sub1});
+
+isnt($ret, 0, "replication slot does not exist: exit code not 0");
+like(
+	$stderr,
+	qr/ERROR:  could not drop replication slot "regress_sub1" on publisher/,
+	"could not drop replication slot: error message");
+
+$node_publisher->safe_psql('postgres', "DROP DATABASE regress_db");
+
+$node_publisher->stop('fast');
+
 done_testing();
diff --git a/src/pl/Makefile b/src/pl/Makefile
index a7ace2d02db..3611f4ce6e4 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -3,7 +3,7 @@
 # Makefile for src/pl (procedural languages)
 #
 # Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/pl/Makefile
 #
diff --git a/src/pl/meson.build b/src/pl/meson.build
index 85c50499a30..99b13231ac4 100644
--- a/src/pl/meson.build
+++ b/src/pl/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 subdir('plpgsql')
diff --git a/src/pl/plisql/Makefile b/src/pl/plisql/Makefile
index 89e54977c7a..987549c776e 100755
--- a/src/pl/plisql/Makefile
+++ b/src/pl/plisql/Makefile
@@ -15,7 +15,7 @@
 #
 # Makefile for src/pl/plisql (IvorySQL's PLISQL procedural language)
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/pl/plisql/Makefile
 #
diff --git a/src/pl/plisql/meson.build b/src/pl/plisql/meson.build
index 6904dbe8911..9107f4fc6e1 100644
--- a/src/pl/plisql/meson.build
+++ b/src/pl/plisql/meson.build
@@ -1,4 +1,4 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 subdir('src')
diff --git a/src/pl/plisql/src/Makefile b/src/pl/plisql/src/Makefile
index 721d608814c..21561a1f65b 100755
--- a/src/pl/plisql/src/Makefile
+++ b/src/pl/plisql/src/Makefile
@@ -15,7 +15,7 @@
 #
 # Makefile for the PL/iSQL procedural language
 #
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/pl/plisql/src/Makefile
 #
@@ -56,7 +56,7 @@ ORACLE_REGRESS_OPTS = --dbname=$(PL_TESTDB)
 REGRESS = plisql_array plisql_call plisql_control plisql_copy plisql_domain \
 	plisql_record plisql_cache plisql_simple plisql_transaction \
 	plisql_trap plisql_trigger plisql_varprops plisql_nested_subproc \
-	plisql_nested_subproc2 plisql_out_parameter plisql_type_rowtype
+	plisql_nested_subproc2 plisql_out_parameter plisql_type_rowtype plisql_bugs
 
 # where to find ora_gen_keywordlist.pl and subsidiary files
 TOOLSDIR = $(top_srcdir)/src/tools
diff --git a/src/pl/plisql/src/expected/plisql_bugs.out b/src/pl/plisql/src/expected/plisql_bugs.out
new file mode 100644
index 00000000000..2bb12a4f310
--- /dev/null
+++ b/src/pl/plisql/src/expected/plisql_bugs.out
@@ -0,0 +1,128 @@
+--
+-- Test for GitHub Issue #1124: Variable Reset Bug in Nested Functions
+--
+-- Bug: When evaluating expressions like "v_sum := v_sum + nested_func()",
+-- variables show original values instead of modified ones.
+--
+-- Test 1: Variable modification + nested function call in expression
+-- This was the core bug - v_sum's modified value (109) was being lost
+-- during expression evaluation, causing v_sum + get_30(10) to be 0 + 30 = 30
+-- instead of 109 + 30 = 139
+CREATE OR REPLACE FUNCTION test_bug1124_basic() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_result NUMBER;
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    -- Modify v_sum
+    v_sum := v_sum + 10;  -- v_sum = 109
+    -- Expression with nested function - this was buggy
+    v_result := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+    RETURN v_result;
+END;
+/
+SELECT test_bug1124_basic() AS result FROM dual;
+ result 
+--------
+ 139
+(1 row)
+
+DROP FUNCTION test_bug1124_basic;
+-- Test 2: Multiple expressions to ensure consistent behavior
+CREATE OR REPLACE FUNCTION test_bug1124_multiple() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+    -- First expression
+    v_temp := v_sum + get_30(10);  -- Should be 139
+    -- Second expression (same) - should also be 139
+    v_temp := v_sum + get_30(10);
+    -- Third expression
+    v_temp := v_sum + get_30(10);
+    RETURN v_temp;
+END;
+/
+SELECT test_bug1124_multiple() AS result FROM dual;
+ result 
+--------
+ 139
+(1 row)
+
+DROP FUNCTION test_bug1124_multiple;
+-- Test 3: Nested procedure modifying parent variable + nested function in expression
+CREATE OR REPLACE FUNCTION test_bug1124_proc_and_func() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+    PROCEDURE add_val(p_val NUMBER) IS
+    BEGIN
+        v_sum := v_sum + p_val;
+    END add_val;
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    -- Call nested procedure to modify v_sum
+    add_val(10);  -- v_sum = 109
+    -- Expression with nested function
+    v_temp := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+    RETURN v_temp;
+END;
+/
+SELECT test_bug1124_proc_and_func() AS result FROM dual;
+ result 
+--------
+ 139
+(1 row)
+
+DROP FUNCTION test_bug1124_proc_and_func;
+-- Test 4: Test with integer type (not just NUMBER)
+CREATE OR REPLACE FUNCTION test_bug1124_integer() RETURN integer AS
+    v_sum integer := 99;
+    v_result integer;
+    FUNCTION get_30(p_val integer) RETURN integer IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+    v_result := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+    RETURN v_result;
+END;
+/
+SELECT test_bug1124_integer() AS result FROM dual;
+ result 
+--------
+    139
+(1 row)
+
+DROP FUNCTION test_bug1124_integer;
+-- Test 5: Nested function on left side of expression
+CREATE OR REPLACE FUNCTION test_bug1124_order() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+    -- Nested function result on left side
+    v_temp := get_30(10) + v_sum;  -- Should be 30 + 109 = 139
+    RETURN v_temp;
+END;
+/
+SELECT test_bug1124_order() AS result FROM dual;
+ result 
+--------
+ 139
+(1 row)
+
+DROP FUNCTION test_bug1124_order;
diff --git a/src/pl/plisql/src/expected/plisql_call.out b/src/pl/plisql/src/expected/plisql_call.out
index 26313b3187c..314b2b6b5ad 100644
--- a/src/pl/plisql/src/expected/plisql_call.out
+++ b/src/pl/plisql/src/expected/plisql_call.out
@@ -678,3 +678,196 @@ NOTICE:  f_print_x(1)
 NOTICE:  f_get_x(2)
 NOTICE:  f_print_x(2)
 ROLLBACK;
+-- Test for issue #1006: Mixed positional and named parameters with variables
+-- calling package procedures with default parameters
+CREATE OR REPLACE PACKAGE test_mixed_params_pkg AS
+  PROCEDURE proc_with_defaults(
+    p1 VARCHAR2,
+    p2 VARCHAR2 DEFAULT 'default_p2',
+    p3 VARCHAR2 DEFAULT 'default_p3'
+  );
+END test_mixed_params_pkg;
+/
+CREATE OR REPLACE PACKAGE BODY test_mixed_params_pkg AS
+  PROCEDURE proc_with_defaults(
+    p1 VARCHAR2,
+    p2 VARCHAR2 DEFAULT 'default_p2',
+    p3 VARCHAR2 DEFAULT 'default_p3'
+  ) IS
+  BEGIN
+    RAISE NOTICE 'p1=%, p2=%, p3=%', p1, p2, p3;
+  END;
+END test_mixed_params_pkg;
+/
+-- Test 1: All positional parameters (should work)
+DO $$
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', 'b', 'c');
+END;
+$$;
+NOTICE:  p1=a, p2=b, p3=c
+-- Test 2: All named parameters with variable (should work)
+DO $$
+DECLARE
+  v_val VARCHAR2(20) := 'var_value';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults(p1=>'a', p2=>'b', p3=>v_val);
+END;
+$$;
+NOTICE:  p1=a, p2=b, p3=var_value
+-- Test 3: Mixed positional and named with literal (should work)
+DO $$
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', p3=>'c');
+END;
+$$;
+NOTICE:  p1=a, p2=default_p2, p3=c
+-- Test 4: Mixed positional and named with variable (issue #1006)
+-- This would fail before the fix with:
+-- ERROR: failed to find conversion function from unknown to varchar2
+DO $$
+DECLARE
+  v_val VARCHAR2(20) := 'var_value';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', p3=>v_val);
+END;
+$$;
+NOTICE:  p1=a, p2=default_p2, p3=var_value
+-- Test 5: Multiple variables with mixed notation
+DO $$
+DECLARE
+  v1 VARCHAR2(20) := 'value1';
+  v2 VARCHAR2(20) := 'value2';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults(v1, p3=>v2);
+END;
+$$;
+NOTICE:  p1=value1, p2=default_p2, p3=value2
+DROP PACKAGE test_mixed_params_pkg;
+-- Test subprocedures with mixed positional and named parameters (Issue #1006)
+-- This tests the same bug scenario but for subprocedures instead of packages
+DO $$
+DECLARE
+    v_name VARCHAR2(100) := 'Test Name';
+    v_value NUMBER := 42;
+    v_result VARCHAR2(200);
+
+    PROCEDURE test_subproc(p_id NUMBER, p_name VARCHAR2, p_value NUMBER DEFAULT 0) AS
+    BEGIN
+        RAISE NOTICE 'test_subproc called: id=%, name=%, value=%', p_id, p_name, p_value;
+    END;
+
+    FUNCTION test_subfunc(p_id NUMBER, p_name VARCHAR2, p_value NUMBER DEFAULT 0) RETURN VARCHAR2 AS
+    BEGIN
+        RETURN 'id=' || p_id || ', name=' || p_name || ', value=' || p_value;
+    END;
+BEGIN
+    -- Test 1: All positional parameters
+    test_subproc(1, 'literal', 10);
+
+    -- Test 2: All named parameters with variables
+    test_subproc(p_id => 2, p_name => v_name, p_value => v_value);
+
+    -- Test 3: Mixed positional and named with literals
+    test_subproc(3, p_name => 'mixed literal');
+
+    -- Test 4: Mixed positional and named with variables (the bug case)
+    test_subproc(4, p_name => v_name);
+
+    -- Test 5: Multiple variables with mixed notation
+    test_subproc(5, p_name => v_name, p_value => v_value);
+
+    -- Test 6: Function with mixed parameters and variables
+    v_result := test_subfunc(6, p_name => v_name, p_value => v_value);
+    RAISE NOTICE 'Function result: %', v_result;
+END;
+$$ LANGUAGE plisql;
+NOTICE:  test_subproc called: id=1, name=literal, value=10
+NOTICE:  test_subproc called: id=2, name=Test Name, value=42
+NOTICE:  test_subproc called: id=3, name=mixed literal, value=0
+NOTICE:  test_subproc called: id=4, name=Test Name, value=0
+NOTICE:  test_subproc called: id=5, name=Test Name, value=42
+NOTICE:  Function result: id=6, name=Test Name, value=42
+-- Test subprocedure overloading still works with the fix
+DO $$
+DECLARE
+    v_int INTEGER := 10;
+    v_str VARCHAR2(50) := 'hello';
+    v_result INTEGER;
+
+    FUNCTION overloaded(p_val INTEGER) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(INTEGER) called with %', p_val;
+        RETURN p_val * 2;
+    END;
+
+    FUNCTION overloaded(p_val VARCHAR2) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(VARCHAR2) called with %', p_val;
+        RETURN LENGTH(p_val);
+    END;
+
+    FUNCTION overloaded(p_id INTEGER, p_name VARCHAR2) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(INTEGER, VARCHAR2) called with %, %', p_id, p_name;
+        RETURN p_id + LENGTH(p_name);
+    END;
+BEGIN
+    -- Test overload resolution with different types
+    v_result := overloaded(v_int);
+    RAISE NOTICE 'Result 1: %', v_result;
+
+    v_result := overloaded(v_str);
+    RAISE NOTICE 'Result 2: %', v_result;
+
+    -- Test overload with multiple args
+    v_result := overloaded(5, 'test');
+    RAISE NOTICE 'Result 3: %', v_result;
+
+    -- Test overload with named parameters
+    v_result := overloaded(p_id => v_int, p_name => v_str);
+    RAISE NOTICE 'Result 4: %', v_result;
+END;
+$$ LANGUAGE plisql;
+NOTICE:  overloaded(INTEGER) called with 10
+NOTICE:  Result 1: 20
+NOTICE:  overloaded(VARCHAR2) called with hello
+NOTICE:  Result 2: 5
+NOTICE:  overloaded(INTEGER, VARCHAR2) called with 5, test
+NOTICE:  Result 3: 9
+NOTICE:  overloaded(INTEGER, VARCHAR2) called with 10, hello
+NOTICE:  Result 4: 15
+-- Minimal test case for issue #1006 subprocedure fix
+-- This is the exact bug scenario: mixed positional + named params with variable
+-- The bug occurs when argument types need coercion after reordering
+-- Before fix: ERROR: failed to find conversion function from unknown to varchar2
+DO $$
+DECLARE
+    v_str VARCHAR2(50) := 'test_value';
+    v_num NUMBER := 99;
+
+    -- Test with different type combinations that require proper type alignment
+    PROCEDURE test_types(p_num NUMBER, p_str VARCHAR2, p_extra NUMBER DEFAULT 0) AS
+    BEGIN
+        RAISE NOTICE 'test_types: num=%, str=%, extra=%', p_num, p_str, p_extra;
+    END;
+BEGIN
+    -- Case 1: Mixed positional + named with variable (varchar arg)
+    -- Call order: (1, p_str => v_str)
+    -- Declared order: (p_num NUMBER, p_str VARCHAR2, p_extra NUMBER)
+    test_types(1, p_str => v_str);
+
+    -- Case 2: Mixed positional + named with variable (number arg)
+    test_types(2, p_str => 'literal', p_extra => v_num);
+
+    -- Case 3: Named parameters in different order than declared
+    test_types(p_str => v_str, p_num => 3);
+
+    -- Case 4: All named with variables
+    test_types(p_num => v_num, p_str => v_str, p_extra => 10);
+END;
+$$ LANGUAGE plisql;
+NOTICE:  test_types: num=1, str=test_value, extra=0
+NOTICE:  test_types: num=2, str=literal, extra=99
+NOTICE:  test_types: num=3, str=test_value, extra=0
+NOTICE:  test_types: num=99, str=test_value, extra=10
diff --git a/src/pl/plisql/src/expected/plisql_domain.out b/src/pl/plisql/src/expected/plisql_domain.out
index 7263b67ab44..937c925e1cf 100755
--- a/src/pl/plisql/src/expected/plisql_domain.out
+++ b/src/pl/plisql/src/expected/plisql_domain.out
@@ -417,3 +417,17 @@ SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
  {"(1,2)"}
 (1 row)
 
+CREATE FUNCTION test_null_ordered_named_pair()
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair;
+begin
+return v;
+end
+$$ LANGUAGE plisql;
+/
+SELECT * FROM test_null_ordered_named_pair();
+ i | j 
+---+---
+   |  
+(1 row)
+
diff --git a/src/pl/plisql/src/expected/plisql_nested_subproc.out b/src/pl/plisql/src/expected/plisql_nested_subproc.out
index 23046f59481..c14ad5590ed 100644
--- a/src/pl/plisql/src/expected/plisql_nested_subproc.out
+++ b/src/pl/plisql/src/expected/plisql_nested_subproc.out
@@ -28,8 +28,8 @@ $$
 declare
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
   declare
        original_squared integer;
@@ -45,12 +45,12 @@ begin
     return mds;
 end;$$ language plisql;
 /
---print 100 and 10
+--print 100 and 101
 select * from test_subproc_func(23);
 INFO:  100
  test_subproc_func 
 -------------------
-                10
+               101
 (1 row)
 
 drop function test_subproc_func(integer);
@@ -202,10 +202,8 @@ INFO:  529
 INFO:  529
 --subproc use global variable
 --print we are in main function
---res = 45 a square function assign 11
+--res = 121 a square function assign 45
 --
---there originial not like oracle
---for out argmuments
 do $$
 declare
   mds varchar(256);
@@ -221,7 +219,7 @@ declare
        raise info '%', mds;
        mds := 'a square function assign';
        original := 45;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 'we are in main function';
@@ -232,9 +230,9 @@ begin
     raise info 'originial=%', originial;
 end;$$ language plisql;
 INFO:  we are in main function
-INFO:  res=45
+INFO:  res=121
 INFO:  a square function assign
-INFO:  originial=11
+INFO:  originial=45
 --test function reload
 --test failed
 do $$
@@ -447,7 +445,7 @@ begin
 end;$$ language plisql;
 INFO:  23
 INFO:  xiexie
--- test subproc function'argument has default value
+-- test that subproc function'argument has default value
 --test ok
 --print 529
 do $$
@@ -788,7 +786,7 @@ begin
 end; $$ language plisql;
 INFO:  text mds2=abc
 INFO:  529
----global variable the name as local variable
+---global variable has the name as local variable
 --test ok
 create or replace function test_subproc_func(a in out integer) returns integer AS
 $$
@@ -809,7 +807,7 @@ declare
 	   raise info 'local var a = %',a;
 	   raise info 'global a = %', test_subproc_func.a;
        original := original_squared + 1;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 10;
@@ -828,15 +826,15 @@ INFO:  mds=10
 INFO:  original=10
 INFO:  local var a = 23
 INFO:  global a = 21
-INFO:  101
+INFO:  100
   a  | _RETVAL_ 
 -----+----------
- 102 |       10
+ 101 |      101
 (1 row)
 
 drop function test_subproc_func(integer);
 set ivorysql.allow_out_parameter_const = false;
---function the name as global variable
+--function has the name as global variable
 --test failed
 do $$
 declare
@@ -860,13 +858,13 @@ CONTEXT:  compilation of PL/iSQL function "inline_code_block" near line 3
 do $$
 declare
   salary integer;
-  var2 record;
+  var2 integer;
   id integer;
-  function test_out(id in out integer, salary out integer) return record
+  function test_out(id in out integer, salary out integer) return integer
   IS
   declare
-       var1 record;
-       function test_out(id in out integer,salary out integer) return record
+       var1 integer;
+       function test_out(id in out integer,salary out integer) return integer
        IS
        declare
             var2 integer;
@@ -874,28 +872,22 @@ declare
 	     salary := 101;
 	     var2 := id + 2;
 	     id := 1;
-	     --return var2;
+	     return var2;
 	end;
    begin
      var1 := test_out(id, salary);
 	 raise info 'var=%', var1;
 	 salary := 102;
 	 id := 2;
-	 --return var1;
+	 return var1;
    end;
 begin
     var2 := test_out(id, salary);
     raise info 'var2 = %', var2;
 end; $$ language plisql;
-INFO:  var=(1,101)
-INFO:  var2 = (2,102)
+INFO:  var=<NULL>
+INFO:  var2 = <NULL>
 --ok
---this because out parameter we have don't handle
--- so it doesn't like oracle
--- test out name=must be assign to null
--- test_out.test_out name=must be assign to null
--- name1= must be assign to null
--- declare name=must be assign to null
 do $$
 declare
   name varchar(256);
@@ -925,11 +917,11 @@ begin
     test_out(id, name);
     raise info 'declare name=%', name;
  end; $$ language plisql;
-INFO:  test out name=must be assign to null
-INFO:  test_out.test_out name=must be assign to null
-INFO:  name1=must be assign to null
-INFO:  declare name=must be assign to null
----schema function and subproc function as the same name
+INFO:  test out name=<NULL>
+INFO:  test_out.test_out name=<NULL>
+INFO:  name1=a test_out.test_out
+INFO:  declare name=return to declare
+---schema function and subproc function has the same name
 create or replace function test_subproc(id integer) returns integer
 AS $$
 declare
@@ -990,7 +982,7 @@ drop function test_subproc(integer);
 ---subproc function return object_type
 create type test_subproc_type as (id integer,name varchar(23));
 --test ok
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 do $$
 declare
     var1 test_subproc_type;
@@ -1000,16 +992,16 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 return var1;
     end;
 begin
     var1 := test_subproc(23);
     raise info 'var1=%', var1;
 end;$$ language plisql;
-INFO:  var1=(23,"a object type")
+INFO:  var1=(23,"an object type")
 --print id = (1, "welcome to beiing")
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 do $$
 declare
     var1 test_subproc_type;
@@ -1019,7 +1011,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 raise info 'id = %',id;
 	 return var1;
     end;
@@ -1030,7 +1022,7 @@ BEGIN
     raise info 'var1=%', var1;
 end;$$ language plisql;
 INFO:  id = (1,"welcome to beiing")
-INFO:  var1=(23,"a object type")
+INFO:  var1=(23,"an object type")
 drop type test_subproc_type;
 --test function and procedure properties
 --test ok
@@ -1898,10 +1890,10 @@ INFO:  procedure no par
 --ret = (46, "test a nocopy")
 do $$
 declare
-   ret record;
+   ret integer;
    out_var integer;
    name varchar(256);
-   function square(id out nocopy integer, name in out nocopy varchar) return record
+   function square(id out nocopy integer, name in out nocopy varchar) return integer
    IS
    declare
      var1 integer;
@@ -1910,7 +1902,7 @@ declare
      id := var1 + 23;
      raise info 'id=%,name=%', id,name;
      name := 'test a nocopy';
-     --return var1;
+     return var1;
    end;
 begin
   name := 'before function';
@@ -1918,7 +1910,7 @@ begin
   raise info 'ret=%', ret;
 end; $$ language plisql;
 INFO:  id=46,name=before function
-INFO:  ret=(46,"test a nocopy")
+INFO:  ret=23
 --test failed
 do $$
 declare
@@ -1967,7 +1959,7 @@ end; $$ language plisql;
 ERROR:  duplicate declaration at or near ";"
 LINE 4:   procedure mds(id integer);
                                    ^
---only declare but no define raise error
+--only declare but no definition, raise error
 do $$
 DECLARE
   var1 integer;
@@ -1989,7 +1981,7 @@ end; $$ language plisql;
 ERROR:  A subprogram body must be defined for the forward declaration of mds
 LINE 4:   function mds(id integer) return integer;
                    ^
---define before declare faield
+--define before declare failed
 do $$
 declare
    function mds(id integer) return integer IS
@@ -2097,16 +2089,16 @@ BEGIN
 	proc4(2);
 END; $$ language plisql;
 INFO:  proc1
-INFO:  1
+INFO:  0
 INFO:  proc2
 INFO:  proc4
 INFO:  proc3
-INFO:  proc3 out 2
+INFO:  proc3 out 1
 --
 --
--- subproc function support polymorphic type
+-- subproc function supports polymorphic type
 --
---point raise error others is ok
+--point raise error, others is ok
 do $$
 DECLARE
    var1 integer;
@@ -2299,32 +2291,44 @@ INFO:  [42,49),[42,50)
 do $$
 DECLARE
    r record;
+   var1 _int4;
+   var2 _number;
+   var3 _point;
    function f1(a anyelement, b anyarray,
                    c anycompatible, d anycompatible,
                    x OUT anyarray, y OUT anycompatiblearray) RETURN record
-	as
+	AS
+      r record;
 	begin
 	  x := a || b;
 	  y := array[c, d];
+	  RETURN r;
 	end;
 begin
-	r := f1(11, array[1, 2], 42, 34.5, NULL,NULL);
+	r := f1(11, array[1, 2], 42, 34.5, var1, var2);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2], point(1,2), point(3,4), NULL,NULL);
+	raise info '%-%',var1, var2;
+	r := f1(11, array[1, 2], point(1,2), point(3,4), var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, '{1,2}', point(1,2), '(3,4)', NULL,NULL);
+	raise info '%-%',var1, var3;
+	r := f1(11, '{1,2}', point(1,2), '(3,4)', var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL);  -- fail
+	raise info '%-%',var1, var3;
+	r := f1(11, array[1, 2.2], 42, 34.5, var1,var2);  -- fail
 	raise info 'r=%',r;
+	raise info '%-%',var1, var2;
 END; $$ language plisql;
-INFO:  r=("{11,1,2}","{42,34.5}")
-INFO:  r=("{11,1,2}","{""(1,2)"",""(3,4)""}")
-INFO:  r=("{11,1,2}","{""(1,2)"",""(3,4)""}")
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{42,34.5}
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{"(1,2)","(3,4)"}
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{"(1,2)","(3,4)"}
 ERROR:  wrong number or types of arguments in call to "f1"
-LINE 1: r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL)
+LINE 1: r := f1(11, array[1, 2.2], 42, 34.5, var1,var2)
              ^
-QUERY:  r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL)
-CONTEXT:  PL/iSQL function inline_code_block line 19 at assignment
+QUERY:  r := f1(11, array[1, 2.2], 42, 34.5, var1,var2)
+CONTEXT:  PL/iSQL function inline_code_block line 27 at assignment
 --
 -- Test handling of OUT parameters, including polymorphic cases.
 -- Note that RETURN is optional with OUT params; we try both ways.
@@ -2332,44 +2336,60 @@ CONTEXT:  PL/iSQL function inline_code_block line 19 at assignment
 do $$
 DECLARE
    var1 integer;
+   var2 integer;
    function f1(i IN int, j out int) RETURN integer is
    begin
      j := i+1;
-     return;
+     RETURN 23;
    end;
 BEGIN
-  raise info '%', f1(42, 23);
-  SELECT f1(42,23) INTO var1;
-  raise info '%', var1;
+  raise info '%', f1(42, var1);
+  SELECT f1(42,var2) INTO var1;
+  raise info '%-%', var1, var2;
 end; $$ language plisql;
-INFO:  43
-INFO:  43
+INFO:  23
+INFO:  23-43
 do $$
-declare
-  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN record is
+DECLARE
+  var1 _int4;
+  var2 _text;
+  var3 integer;
+  var4 text;
+  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN integer is
    begin
 	  j := i;
 	  k := array[j,j];
-	  return;
+	  RETURN 23;
   end;
 BEGIN
-  raise info '%,%',duplic(42,45,NULL), duplic('foo'::text,'45',NULL);
+  raise info '%,%',duplic(42,var3,var1), duplic('foo'::text,var4,var2);
+  raise info '%-%', var1, var3;
+  raise info '%-%', var4, var2;
 END; $$ language plisql;
-INFO:  (42,"{42,42}"),(foo,"{foo,foo}")
+INFO:  23,23
+INFO:  {42,42}-42
+INFO:  foo-{foo,foo}
 do $$
-declare
-    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN record as
+DECLARE
+    var1 integer;
+	var2 _int4;
+    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN integer as
 	begin
 		j := lower(i);
 		k := array[lower(i),upper(i)];
-		return;
+		RETURN 23;
 	end;
 BEGIN
-	raise info '%,%',duplic(int4range(42,49), NULL,NULL),duplic(int4range('23', '45'), NULL,NULL);
+	raise info '%',duplic(int4range(42,49), var1,var2);
+	raise info '%-%', var1, var2;
+	raise info '%', duplic(int4range('23', '45'), var1,var2);
+	raise info '%-%', var1, var2;
 end; $$ language plisql;
-INFO:  (42,"{42,49}"),(23,"{23,45}")
---test extral
---error test_f is is out of scope
+INFO:  23
+INFO:  42-{42,49}
+INFO:  23
+INFO:  23-{23,45}
+--error test_f is out of scope
 do $$
 declare
   var1 integer;
@@ -2506,7 +2526,7 @@ begin
 end; $$ language plisql;
 INFO:  var1=23
 INFO:  var1 = 24
---oracle raise error,but we success
+--oracle raise error,but we succeed
 do $$
 declare
   var1 integer;
@@ -2531,7 +2551,7 @@ declare
 begin
   var1 := test_f(23);
 end; $$ language plisql;
---oracle raiser error,but we sucess
+--oracle raiser error,but we succeed
 create or replace function test_f(id integer) returns integer as
 $$
 declare
@@ -2558,7 +2578,7 @@ DROP FUNCTION test_f(integer);
 do $$
 declare
   var1 integer;
-  function test_f(id integer) return integer is
+  function test_f(id out integer) return integer is
   begin
     id := 23;
 	var1 := id;
@@ -2667,13 +2687,13 @@ declare
   function test_f(id integer default 23,id2 out integer) return integer is
   begin
     id2 := id;
-    --return id;
+    return id;
   end;
 begin
   var1 := test_f(23,var2);
-  raise info 'var1=%', var1;
+  raise info 'var1=%, var2=%', var1, var2;
 end; $$ language plisql;
-INFO:  var1=23
+INFO:  var1=23, var2=23
 --ok
 do $$
 declare
@@ -2681,6 +2701,7 @@ declare
   function test_f(id out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2706,6 +2727,7 @@ declare
   function test_f(id in out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2735,7 +2757,7 @@ declare
 begin
   var1 := test_f();
 end;$$ language plisql;
---dynamic include subproc function ok var1=25
+--dynamically include subproc function ok var1=25
 do $$
 declare
   var1 integer;
@@ -2898,7 +2920,7 @@ end; $$ language plisql;
 ERROR:  Only schema-level programs allow AUTHID at or near "definer"
 LINE 4:   procedure test_p(id integer) authid definer;
                                               ^
---oracle failed, but we sucess
+--oracle failed, but we succeed
 do $$
 declare
   var1 integer;
@@ -2951,7 +2973,7 @@ LINE 1: var1 := test_proc1(23)
 HINT:  To call a procedure, use CALL.
 QUERY:  var1 := test_proc1(23)
 CONTEXT:  PL/iSQL function inline_code_block line 11 at assignment
---surcess
+--success
 do $$
 declare
   var1 integer;
@@ -2985,7 +3007,7 @@ LINE 1: CALL test_func1(var1)
 HINT:  To call a function, use SELECT.
 QUERY:  CALL test_func1(var1)
 CONTEXT:  PL/iSQL function inline_code_block line 9 at CALL
---sucess
+--success
 do $$
 declare
   var1 integer;
@@ -3027,7 +3049,7 @@ declare
 BEGIN
 	trigger := 1;
 end; $$ language plisql;
---oracle failed,but we sucess
+--oracle failed,but we succeed
 do $$
 DECLARE
 	type integer;
@@ -3049,7 +3071,7 @@ begin
 end; $$ language plisql;
 INFO:  test_f
 INFO:  test_f
---oracle failed,but we success
+--oracle failed,but we succeed
 do $$
 declare
   var1 integer;
@@ -3232,7 +3254,6 @@ INFO:  test_event_trigger: ddl_command_start CREATE TABLE
 DROP event TRIGGER regress_event_trigger;
 DROP FUNCTION test_event_trigger();
 drop table test_subproc_system;
---requite documents example
 --ok and print test_subprocproc and test_linefunc
 do $$
 declare
@@ -3705,7 +3726,7 @@ declare
  end; $$ language plisql;
 INFO:  24
 INFO:  25.1
---oracle raise error,but we sucess
+--oracle raise error,but we succeed
 CREATE TABLE mds(id integer,name varchar2(256));
 ERROR:  relation "mds" already exists
 do $$
@@ -3933,3 +3954,127 @@ begin
 end; $$ language plisql;
 DROP TABLE rec_typ2;
 DROP TABLE r1;
+-- Test for issue #1005: subproc with local variable initialized from parameter
+-- This should not crash when the parent function is called
+-- Test 1: Package with private procedure that has param-initialized local var
+CREATE OR REPLACE PACKAGE test_pkg_1005 IS
+    FUNCTION get_value RETURN NUMBER;
+END test_pkg_1005;
+/
+CREATE OR REPLACE PACKAGE BODY test_pkg_1005 IS
+    PROCEDURE private_proc(p_val NUMBER) IS
+        v_local NUMBER := p_val;  -- local var initialized from parameter
+    BEGIN
+        NULL;  -- private_proc does nothing visible
+    END private_proc;
+    FUNCTION get_value RETURN NUMBER IS
+    BEGIN
+        RETURN 42;
+    END get_value;
+END test_pkg_1005;
+/
+-- Should return 42 without crash (private_proc is never called)
+SELECT test_pkg_1005.get_value() FROM dual;
+ get_value 
+-----------
+ 42
+(1 row)
+
+-- Test 2: Call the private procedure to verify it works when actually invoked
+CREATE OR REPLACE PACKAGE BODY test_pkg_1005 IS
+    PROCEDURE private_proc(p_val NUMBER) IS
+        v_local NUMBER := p_val;
+    BEGIN
+        RAISE INFO 'v_local=%', v_local;
+    END private_proc;
+    FUNCTION get_value RETURN NUMBER IS
+    BEGIN
+        private_proc(100);  -- now call private_proc
+        RETURN 42;
+    END get_value;
+END test_pkg_1005;
+/
+-- Should print v_local=100 and return 42
+SELECT test_pkg_1005.get_value() FROM dual;
+INFO:  v_local=100
+ get_value 
+-----------
+ 42
+(1 row)
+
+DROP PACKAGE test_pkg_1005;
+-- Test 3: Standalone function with nested procedure (not in package)
+CREATE OR REPLACE FUNCTION test_func_1005(p_input NUMBER) RETURN NUMBER AS
+    v_result NUMBER := 0;
+    PROCEDURE helper(p_val NUMBER) IS
+        v_local NUMBER := p_val;  -- local var initialized from parameter
+    BEGIN
+        v_result := v_local * 2;
+    END helper;
+BEGIN
+    helper(p_input);
+    RETURN v_result;
+END;
+/
+-- Should return 200 (100 * 2)
+SELECT test_func_1005(100) FROM dual;
+ test_func_1005 
+----------------
+ 200
+(1 row)
+
+DROP FUNCTION test_func_1005;
+-- Test 4: Nested function with param-initialized local var that is never called
+CREATE OR REPLACE FUNCTION test_func_1005_nocall(p_input NUMBER) RETURN NUMBER AS
+    FUNCTION never_called(p_val NUMBER) RETURN NUMBER IS
+        v_local NUMBER := p_val;
+    BEGIN
+        RETURN v_local;
+    END never_called;
+BEGIN
+    -- never_called is declared but never invoked
+    RETURN p_input + 1;
+END;
+/
+-- Should return 101 without any issues
+SELECT test_func_1005_nocall(100) FROM dual;
+ test_func_1005_nocall 
+-----------------------
+ 101
+(1 row)
+
+DROP FUNCTION test_func_1005_nocall;
+-- Test 5: Multiple nested subprocs with param-initialized local vars
+-- Note: func1 is intentionally not called due to issue #1124
+CREATE OR REPLACE FUNCTION test_func_1005_multi(p_input NUMBER) RETURN NUMBER AS
+    v_sum NUMBER := 0;
+    PROCEDURE proc1(p_val NUMBER) IS
+        v_local1 NUMBER := p_val;
+    BEGIN
+        v_sum := v_sum + v_local1;
+    END proc1;
+    PROCEDURE proc2(p_val NUMBER) IS
+        v_local2 NUMBER := p_val * 2;
+    BEGIN
+        v_sum := v_sum + v_local2;
+    END proc2;
+    FUNCTION func1(p_val NUMBER) RETURN NUMBER IS
+        v_local3 NUMBER := p_val * 3;
+    BEGIN
+        RETURN v_local3;
+    END func1;
+BEGIN
+    proc1(10);      -- v_sum = 10
+    proc2(10);      -- v_sum = 10 + 20 = 30
+    -- Not calling: v_sum := v_sum + func1(10) due to issue #1124
+    RETURN v_sum;
+END;
+/
+-- Should return 30 (proc1 adds 10, proc2 adds 20)
+SELECT test_func_1005_multi(10) FROM dual;
+ test_func_1005_multi 
+----------------------
+ 30
+(1 row)
+
+DROP FUNCTION test_func_1005_multi;
diff --git a/src/pl/plisql/src/expected/plisql_nested_subproc2.out b/src/pl/plisql/src/expected/plisql_nested_subproc2.out
index 7f79af7d24c..9a0cf92660f 100755
--- a/src/pl/plisql/src/expected/plisql_nested_subproc2.out
+++ b/src/pl/plisql/src/expected/plisql_nested_subproc2.out
@@ -25,8 +25,8 @@ INFO:  121
 create or replace function test_subproc_func(a in integer) return integer as
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
        original_squared integer;
   begin
@@ -41,12 +41,12 @@ begin
     return mds;
 end;
 /
---print 100 and 10
+--print 100 and 101
 select * from test_subproc_func(23);
 INFO:  100
  test_subproc_func 
 -------------------
-                10
+               101
 (1 row)
 
 drop function test_subproc_func(integer);
@@ -206,10 +206,8 @@ INFO:  529
 INFO:  529
 --subproc use global variable
 --print we are in main function
---res = 45 a square function assign 11
+--res = 121 a square function assign 45
 --
---there originial not like oracle
---for out argmuments
 declare
   mds varchar(256);
   originial integer;
@@ -223,7 +221,7 @@ declare
        raise info '%', mds;
        mds := 'a square function assign';
        original := 45;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 'we are in main function';
@@ -235,9 +233,9 @@ begin
 end;
 /
 INFO:  we are in main function
-INFO:  res=45
+INFO:  res=121
 INFO:  a square function assign
-INFO:  originial=11
+INFO:  originial=45
 --test function reload
 --test failed
 declare
@@ -769,7 +767,7 @@ end;
 /
 INFO:  text mds2=abc
 INFO:  529
----global variable the name as local variable
+---global variable has same name as local variable
 --test ok
 create or replace function test_subproc_func(a in out integer) return integer AS
   mds integer;
@@ -787,7 +785,7 @@ create or replace function test_subproc_func(a in out integer) return integer AS
 	   raise info 'local var a = %',a;
 	   raise info 'global a = %', test_subproc_func.a;
        original := original_squared + 1;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 10;
@@ -806,15 +804,15 @@ INFO:  mds=10
 INFO:  original=10
 INFO:  local var a = 23
 INFO:  global a = 21
-INFO:  101
+INFO:  100
   a  | _RETVAL_ 
 -----+----------
- 102 |       10
+ 101 |      101
 (1 row)
 
 drop function test_subproc_func(integer);
 set ivorysql.allow_out_parameter_const = false;
---function the name as global variable
+--function has same name as global variable
 --test failed
 declare
   mds integer;
@@ -836,12 +834,12 @@ CONTEXT:  compilation of PL/iSQL function "inline_code_block" near line 2
 --print var = (1,101)  var2=(2,102)
 declare
   salary integer;
-  var2 record;
+  var2 integer;
   id integer;
-  function test_out(id in out integer, salary out integer) return record
+  function test_out(id in out integer, salary out integer) return integer
   IS
-       var1 record;
-       function test_out(id in out integer,salary out integer) return record
+       var1 integer;
+       function test_out(id in out integer,salary out integer) return integer
        IS
        declare
             var2 integer;
@@ -849,29 +847,23 @@ declare
 	     salary := 101;
 	     var2 := id + 2;
 	     id := 1;
-	     --return var2;
+	     return var2;
 	end;
    begin
      var1 := test_out(id, salary);
 	 raise info 'var=%', var1;
 	 salary := 102;
 	 id := 2;
-	 --return var1;
+	 return var1;
    end;
 begin
     var2 := test_out(id, salary);
     raise info 'var2 = %', var2;
 end;
 /
-INFO:  var=(1,101)
-INFO:  var2 = (2,102)
+INFO:  var=<NULL>
+INFO:  var2 = <NULL>
 --ok
---this because out parameter we have don't handle
--- so it doesn't like oracle
--- test out name=must be assign to null
--- test_out.test_out name=must be assign to null
--- name1= must be assign to null
--- declare name=must be assign to null
 declare
   name varchar(256);
   id integer;
@@ -899,11 +891,11 @@ begin
     raise info 'declare name=%', name;
  end;
  /
-INFO:  test out name=must be assign to null
-INFO:  test_out.test_out name=must be assign to null
-INFO:  name1=must be assign to null
-INFO:  declare name=must be assign to null
----schema function and subproc function as the same name
+INFO:  test out name=<NULL>
+INFO:  test_out.test_out name=<NULL>
+INFO:  name1=a test_out.test_out
+INFO:  declare name=return to declare
+---schema function and subproc function has the same name
 create or replace function test_subproc(id integer) return integer
 AS
    var1 integer;
@@ -961,7 +953,7 @@ drop function test_subproc(integer);
 ---subproc function return object_type
 create type test_subproc_type as (id integer,name varchar(23));
 --test ok
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 declare
     var1 test_subproc_type;
     function test_subproc(id integer) return test_subproc_type
@@ -969,7 +961,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 return var1;
     end;
 begin
@@ -977,9 +969,9 @@ begin
     raise info 'var1=%', var1;
 end;
 /
-INFO:  var1=(23,"a object type")
+INFO:  var1=(23,"an object type")
 --print id = (1, "welcome to beiing")
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 declare
     var1 test_subproc_type;
     function test_subproc(id test_subproc_type) return test_subproc_type
@@ -987,7 +979,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 raise info 'id = %',id;
 	 return var1;
     end;
@@ -999,7 +991,7 @@ BEGIN
 end;
 /
 INFO:  id = (1,"welcome to beiing")
-INFO:  var1=(23,"a object type")
+INFO:  var1=(23,"an object type")
 drop type test_subproc_type;
 --test function and procedure properties
 --test ok
@@ -1818,10 +1810,10 @@ INFO:  procedure no par
 --print id=46,name=before function
 --ret = (46, "test a nocopy")
 declare
-   ret record;
+   ret integer;
    out_var integer;
    name varchar(256);
-   function square(id out nocopy integer, name in out nocopy varchar) return record
+   function square(id out nocopy integer, name in out nocopy varchar) return integer
    IS
      var1 integer;
    begin
@@ -1829,7 +1821,7 @@ declare
      id := var1 + 23;
      raise info 'id=%,name=%', id,name;
      name := 'test a nocopy';
-     --return var1;
+     return var1;
    end;
 begin
   name := 'before function';
@@ -1838,7 +1830,7 @@ begin
 end;
 /
 INFO:  id=46,name=before function
-INFO:  ret=(46,"test a nocopy")
+INFO:  ret=23
 --test failed
 declare
    ret record;
@@ -1951,7 +1943,7 @@ QUERY:  DECLARE
 begin
   var1 := mds(23);
 end
---define before declare faield
+--define before declare failed
 declare
    function mds(id integer) return integer IS
       var1 integer;
@@ -2045,16 +2037,16 @@ BEGIN
 END;
 /
 INFO:  proc1
-INFO:  1
+INFO:  0
 INFO:  proc2
 INFO:  proc4
 INFO:  proc3
-INFO:  proc3 out 2
+INFO:  proc3 out 1
 --
 --
--- subproc function support polymorphic type
+-- subproc function supports polymorphic type
 --
---point raise error others is ok
+--point raise error, others is ok
 DECLARE
    var1 integer;
    var2 number;
@@ -2245,78 +2237,106 @@ END;
 INFO:  [42,49),[42,50)
 DECLARE
    r record;
+   var1 _int4;
+   var2 _number;
+   var3 _point;
    function f1(a anyelement, b anyarray,
                    c anycompatible, d anycompatible,
                    x OUT anyarray, y OUT anycompatiblearray) RETURN record
-	as
+	AS
+      r record;
 	begin
 	  x := a || b;
 	  y := array[c, d];
+	  RETURN r;
 	end;
 begin
-	r := f1(11, array[1, 2], 42, 34.5, NULL,NULL);
+	r := f1(11, array[1, 2], 42, 34.5, var1, var2);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2], point(1,2), point(3,4), NULL,NULL);
+	raise info '%-%',var1, var2;
+	r := f1(11, array[1, 2], point(1,2), point(3,4), var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, '{1,2}', point(1,2), '(3,4)', NULL,NULL);
+	raise info '%-%',var1, var3;
+	r := f1(11, '{1,2}', point(1,2), '(3,4)', var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL);  -- fail
+	raise info '%-%',var1, var3;
+	r := f1(11, array[1, 2.2], 42, 34.5, var1,var2);  -- fail
 	raise info 'r=%',r;
+	raise info '%-%',var1, var2;
 END;
 /
-INFO:  r=("{11,1,2}","{42,34.5}")
-INFO:  r=("{11,1,2}","{""(1,2)"",""(3,4)""}")
-INFO:  r=("{11,1,2}","{""(1,2)"",""(3,4)""}")
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{42,34.5}
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{"(1,2)","(3,4)"}
+INFO:  r=<NULL>
+INFO:  {11,1,2}-{"(1,2)","(3,4)"}
 ERROR:  wrong number or types of arguments in call to "f1"
-LINE 1: r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL)
+LINE 1: r := f1(11, array[1, 2.2], 42, 34.5, var1,var2)
              ^
-QUERY:  r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL)
-CONTEXT:  PL/iSQL function inline_code_block line 18 at assignment
+QUERY:  r := f1(11, array[1, 2.2], 42, 34.5, var1,var2)
+CONTEXT:  PL/iSQL function inline_code_block line 26 at assignment
 --
 -- Test handling of OUT parameters, including polymorphic cases.
 -- Note that RETURN is optional with OUT params; we try both ways.
 --
 DECLARE
    var1 integer;
+   var2 integer;
    function f1(i IN int, j out int) RETURN integer is
    begin
      j := i+1;
-     return;
+     RETURN 23;
    end;
 BEGIN
-  raise info '%', f1(42, 23);
-  SELECT f1(42,23) INTO var1;
-  raise info '%', var1;
+  raise info '%', f1(42, var1);
+  SELECT f1(42,var2) INTO var1;
+  raise info '%-%', var1, var2;
 end;
 /
-INFO:  43
-INFO:  43
+INFO:  23
+INFO:  23-43
 declare
-  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN record is
+  var1 _int4;
+  var2 _text;
+  var3 integer;
+  var4 text;
+  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN integer is
    begin
 	  j := i;
 	  k := array[j,j];
-	  return;
+	  RETURN 23;
   end;
 BEGIN
-  raise info '%,%',duplic(42,45,NULL), duplic('foo'::text,'45',NULL);
+  raise info '%,%',duplic(42,var3,var1), duplic('foo'::text,var4,var2);
+  raise info '%-%', var1, var3;
+  raise info '%-%', var4, var2;
 END;
 /
-INFO:  (42,"{42,42}"),(foo,"{foo,foo}")
+INFO:  23,23
+INFO:  {42,42}-42
+INFO:  foo-{foo,foo}
 declare
-    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN record as
+    var1 integer;
+	var2 _int4;
+    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN integer as
 	begin
 		j := lower(i);
 		k := array[lower(i),upper(i)];
-		return;
+		RETURN 23;
 	end;
 BEGIN
-	raise info '%,%',duplic(int4range(42,49), NULL,NULL),duplic(int4range('23', '45'), NULL,NULL);
+	raise info '%',duplic(int4range(42,49), var1,var2);
+	raise info '%-%', var1, var2;
+	raise info '%', duplic(int4range('23', '45'), var1,var2);
+	raise info '%-%', var1, var2;
 end;
 /
-INFO:  (42,"{42,49}"),(23,"{23,45}")
---test extral
---error test_f is is out of scope
+INFO:  23
+INFO:  42-{42,49}
+INFO:  23
+INFO:  23-{23,45}
+--error test_f is out of scope
 declare
   var1 integer;
   function test_f(id integer,name varchar2) return integer IS
@@ -2459,7 +2479,7 @@ end;
 /
 INFO:  var1=23
 INFO:  var1 = 24
---oracle raise error,but we success
+--oracle raise error,but we succeed
 declare
   var1 integer;
   function test_f(id integer,name varchar2) return integer is
@@ -2484,7 +2504,7 @@ begin
   var1 := test_f(23);
 end;
 /
---oracle raiser error,but we sucess
+--oracle raiser error,but we succeed
 create or replace function test_f(id integer) return integer as
   function test_f(id integer) return integer is
   begin
@@ -2508,7 +2528,7 @@ DROP FUNCTION test_f(integer);
 --var1 = 23:23
 declare
   var1 integer;
-  function test_f(id integer) return integer is
+  function test_f(id out integer) return integer is
   begin
     id := 23;
 	var1 := id;
@@ -2652,20 +2672,21 @@ declare
   function test_f(id integer default 23,id2 out integer) return integer is
   begin
     id2 := id;
-    --return id;
+    return id;
   end;
 begin
   var1 := test_f(23,var2);
-  raise info 'var1=%', var1;
+  raise info 'var1=%, var2=%', var1, var2;
 end;
 /
-INFO:  var1=23
+INFO:  var1=23, var2=23
 --ok
 declare
   var1 integer;
   function test_f(id out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2700,6 +2721,7 @@ declare
   function test_f(id in out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2739,7 +2761,7 @@ begin
   var1 := test_f();
 end;
 /
---dynamic include subproc function ok var1=25
+--dynamically include subproc function ok var1=25
 declare
   var1 integer;
   function test_f(id integer) return integer IS
@@ -2919,7 +2941,7 @@ QUERY:  declare
 begin
   test_p(var1);
 end
---oracle failed, but we sucess
+--oracle failed, but we succeed
 declare
   var1 integer;
   function test_f(id integer) return integer;
@@ -2969,7 +2991,7 @@ LINE 1: var1 := test_proc1(23)
 HINT:  To call a procedure, use CALL.
 QUERY:  var1 := test_proc1(23)
 CONTEXT:  PL/iSQL function inline_code_block line 9 at assignment
---surcess
+--success
 declare
   var1 integer;
 begin
@@ -3001,7 +3023,7 @@ LINE 1: CALL test_func1(var1)
 HINT:  To call a function, use SELECT.
 QUERY:  CALL test_func1(var1)
 CONTEXT:  PL/iSQL function inline_code_block line 8 at CALL
---sucess
+--success
 declare
   var1 integer;
 begin
@@ -3053,7 +3075,7 @@ BEGIN
 	trigger := 1;
 end;
 /
---oracle failed,but we sucess
+--oracle failed,but we succeed
 DECLARE
 	type integer;
 begin
@@ -3075,7 +3097,7 @@ end;
 /
 INFO:  test_f
 INFO:  test_f
---oracle failed,but we success
+--oracle failed,but we succeed
 declare
   var1 integer;
   var2 integer;
@@ -3277,7 +3299,6 @@ INFO:  test_event_trigger: ddl_command_start CREATE TABLE
 DROP event TRIGGER regress_event_trigger;
 DROP FUNCTION test_event_trigger();
 drop table test_subproc_system;
---requite documents example
 --ok and print test_subprocproc and test_linefunc
 declare
   mds integer;
@@ -3724,7 +3745,7 @@ declare
  /
 INFO:  24
 INFO:  25.1
---oracle raise error,but we sucess
+--oracle raise error,but we succeed
 CREATE TABLE mds(id integer,name varchar2(256));
 ERROR:  relation "mds" already exists
 DECLARE
diff --git a/src/pl/plisql/src/expected/plisql_out_parameter.out b/src/pl/plisql/src/expected/plisql_out_parameter.out
index 2fe767f66b3..b9f88fbaea6 100644
--- a/src/pl/plisql/src/expected/plisql_out_parameter.out
+++ b/src/pl/plisql/src/expected/plisql_out_parameter.out
@@ -171,23 +171,8 @@ begin
   return 2;
 end;
 /
-declare
-  id integer;
-  name1 varchar(256);
-  name2 varchar(256);
-  ret integer;
-begin
-  id := 24;
-  ret = 0;
-  name1 := 'could not change';
-  name2 := 'could change';
-  ret = test_inchange(id,name1,name2);
-end;
-/
-ERROR:  expression "id" cannot be used as an assignment target
-CONTEXT:  PL/iSQL function test_inchange(pg_catalog.int4,varchar2,varchar2) line 2 at assignment
-PL/iSQL function inline_code_block line 11 at assignment
-drop function test_inchange(integer,varchar,varchar);
+WARNING:  compilation error
+HINT:  expression "id" cannot be used as an assignment target
 --report error when IN OUT paramater has default value
 create or replace function test_return_inout(id integer,price in out integer default 100,name out varchar) return varchar 
 as
@@ -1231,36 +1216,36 @@ drop function test_out(integer,varchar, integer);
 drop function test_out1(integer, varchar, integer, integer, integer, integer);
 --test get_parameter_description function
 select * from get_parameter_description('insert into t values(:x,:y)');
- name  | position 
--------+----------
- false |        0
- :x    |        1
- :y    |        2
+  name  | position | hint 
+--------+----------+------
+ INSERT |        0 | 
+ :x     |        1 | 
+ :y     |        2 | 
 (3 rows)
 
 select * from get_parameter_description('delete from t where xxx = :xx');
- name  | position 
--------+----------
- false |        0
- :xx   |        1
+  name  | position | hint 
+--------+----------+------
+ DELETE |        0 | 
+ :xx    |        1 | 
 (2 rows)
 
 select * from get_parameter_description('update t set t1 = :x and t2 = :y');
- name  | position 
--------+----------
- false |        0
- :x    |        1
- :y    |        2
+  name  | position | hint 
+--------+----------+------
+ UPDATE |        0 | 
+ :x     |        1 | 
+ :y     |        2 | 
 (3 rows)
 
 select * from get_parameter_description('BEGIN
                           CALL RAISE_SALARY(:emp_number, :new_sal);
                           END;');
-    name     | position 
--------------+----------
- true        |        0
- :emp_number |        1
- :new_sal    |        2
+    name     | position | hint 
+-------------+----------+------
+ DO          |        0 | 
+ :emp_number |        1 | 
+ :new_sal    |        2 | 
 (3 rows)
 
 select * from get_parameter_description('
@@ -1278,13 +1263,13 @@ begin
 	:4 := 23;
 	execute immediate ''declare books integer; begin books := 1000; :x := books + 100;end;'' using out id;
 end;');
- name | position 
-------+----------
- true |        0
- :1   |        1
- :2   |        2
- :3   |        3
- :4   |        4
+ name | position | hint 
+------+----------+------
+ DO   |        0 | 
+ :1   |        1 | 
+ :2   |        2 | 
+ :3   |        3 | 
+ :4   |        4 | 
 (5 rows)
 
 --clean data
diff --git a/src/pl/plisql/src/expected/plisql_simple.out b/src/pl/plisql/src/expected/plisql_simple.out
index be4d26c51f0..fe0dcaf5b3c 100755
--- a/src/pl/plisql/src/expected/plisql_simple.out
+++ b/src/pl/plisql/src/expected/plisql_simple.out
@@ -139,3 +139,80 @@ begin
  raise notice 'val = %', val;
 end; $$;
 NOTICE:  val = 42
+-- Check SELECT INTO with parenthesized expressions (IvorySQL issue #981)
+do $$
+declare
+ x int := 50;
+ result numeric;
+begin
+ -- Test parenthesized expression at start of SELECT list
+ select (100 - x) * 0.01 into result from dual;
+ raise notice 'Test 1 (parentheses): %', result;
+
+ -- Test without parentheses (should still work)
+ select 100 - x into result from dual;
+ raise notice 'Test 2 (no parentheses): %', result;
+
+ -- Test multiple parenthesized expressions
+ select (100 - x) * (0.01 + x) into result from dual;
+ raise notice 'Test 3 (multiple parentheses): %', result;
+
+ -- Test nested parentheses
+ select ((100 - x) * 0.01) into result from dual;
+ raise notice 'Test 4 (nested parentheses): %', result;
+end; $$;
+NOTICE:  Test 1 (parentheses): 0.50
+NOTICE:  Test 2 (no parentheses): 50
+NOTICE:  Test 3 (multiple parentheses): 2500.50
+NOTICE:  Test 4 (nested parentheses): 0.50
+-- Edge case: nested SELECT with parenthesized expressions
+do $$
+declare
+ result int;
+begin
+ select (select (10 + 5) from dual) into result from dual;
+ raise notice 'Nested SELECT: %', result;
+end; $$;
+NOTICE:  Nested SELECT: 15
+-- Edge case: function call in parentheses (not just arithmetic)
+create function test_func(int) returns int language plisql
+as $$begin return $1 * 2; end$$;
+/
+do $$
+declare
+ result int;
+begin
+ select (test_func(25)) into result from dual;
+ raise notice 'Function in parens: %', result;
+end; $$;
+NOTICE:  Function in parens: 50
+-- Edge case: CASE expression in parentheses
+do $$
+declare
+ x int := 10;
+ result int;
+begin
+ select (case when x > 5 then x * 2 else x end) into result from dual;
+ raise notice 'CASE in parens: %', result;
+end; $$;
+NOTICE:  CASE in parens: 20
+-- Edge case: SELECT with CAST in parentheses
+do $$
+declare
+ result varchar;
+begin
+ select (cast(123 as varchar)) into result from dual;
+ raise notice 'CAST in parens: %', result;
+end; $$;
+NOTICE:  CAST in parens: 123
+-- Edge case: Complex nested expression
+do $$
+declare
+ x int := 10;
+ y int := 5;
+ result numeric;
+begin
+ select ((x + y) * (x - y)) / 2.0 into result from dual;
+ raise notice 'Complex expression: %', result;
+end; $$;
+NOTICE:  Complex expression: 37.5000000000000000
diff --git a/src/pl/plisql/src/expected/plisql_type_rowtype.out b/src/pl/plisql/src/expected/plisql_type_rowtype.out
index 16e83f7f142..2cb8e860e37 100644
--- a/src/pl/plisql/src/expected/plisql_type_rowtype.out
+++ b/src/pl/plisql/src/expected/plisql_type_rowtype.out
@@ -273,7 +273,8 @@ ERROR:  invalid input syntax for type integer: "a"
 CONTEXT:  PL/iSQL function fun3(pg_catalog.int4) line 1 during statement block local variable initialization
 SELECT fun4(4) FROM dual;  --failed
 ERROR:  invalid input syntax for type integer: "a"
-CONTEXT:  PL/iSQL function fun4(pg_catalog.int4) line 2 during statement block local variable initialization
+CONTEXT:  PL/iSQL function inf1 line 2 during statement block local variable initialization
+PL/iSQL function fun4(pg_catalog.int4) line 7 at RETURN
 SELECT fun5(5) FROM dual;  --successfully
 NOTICE:  5
  fun5 
@@ -307,7 +308,8 @@ ERROR:  invalid input syntax for type integer: "a"
 CONTEXT:  PL/iSQL function fun3(pg_catalog.int4) line 1 during statement block local variable initialization
 SELECT fun4(4) FROM dual;  --failed
 ERROR:  invalid input syntax for type integer: "a"
-CONTEXT:  PL/iSQL function fun4(pg_catalog.int4) line 2 during statement block local variable initialization
+CONTEXT:  PL/iSQL function inf1 line 2 during statement block local variable initialization
+PL/iSQL function fun4(pg_catalog.int4) line 7 at RETURN
 SELECT fun5(5) FROM dual;  --successfully
 NOTICE:  5
  fun5 
diff --git a/src/pl/plisql/src/generate-plerrcodes.pl b/src/pl/plisql/src/generate-plerrcodes.pl
index 03f38d6b10e..037322bb71c 100755
--- a/src/pl/plisql/src/generate-plerrcodes.pl
+++ b/src/pl/plisql/src/generate-plerrcodes.pl
@@ -2,7 +2,7 @@
 #
 # Generate the plerrcodes.h header from ora_errcodes.txt
 # Copyright (c) 2000-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/src/pl/plisql/src/meson.build b/src/pl/plisql/src/meson.build
index d9ab429726c..5804b0952f3 100644
--- a/src/pl/plisql/src/meson.build
+++ b/src/pl/plisql/src/meson.build
@@ -1,5 +1,5 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 plisql_sources = files(
   'pl_comp.c',
diff --git a/src/pl/plisql/src/nls.mk b/src/pl/plisql/src/nls.mk
index ac5f9e88375..8cb67a364b8 100644
--- a/src/pl/plisql/src/nls.mk
+++ b/src/pl/plisql/src/nls.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # src/pl/plisql/src/nls.mk
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 CATALOG_NAME     = plisql
 GETTEXT_FILES    = pl_comp.c \
diff --git a/src/pl/plisql/src/pl_comp.c b/src/pl/plisql/src/pl_comp.c
index f71f9b8d637..6e1604038e8 100644
--- a/src/pl/plisql/src/pl_comp.c
+++ b/src/pl/plisql/src/pl_comp.c
@@ -3,7 +3,7 @@
  * pl_comp.c		- Compiler part of the PL/iSQL
  *			  procedural language
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -51,10 +51,10 @@
  * ----------
  */
 
-int	datums_alloc; 
+int			datums_alloc;
 int			plisql_nDatums;
 PLiSQL_datum **plisql_Datums;
-int	datums_last;
+int			datums_last;
 
 char	   *plisql_error_funcname;
 bool		plisql_DumpExecTree = false;
@@ -80,7 +80,7 @@ static HTAB *plisql_HashTable = NULL;
 typedef struct
 {
 	const char *label;
-	int			sqlerrstate;
+	int	sqlerrstate;
 } ExceptionLabelMap;
 
 static const ExceptionLabelMap exception_label_map[] = {
@@ -88,43 +88,44 @@ static const ExceptionLabelMap exception_label_map[] = {
 	{NULL, 0}
 };
 
-bool check_referenced_objects = false;
-List *plisql_referenced_objects = NIL;	/* the elements of list are ObjectAddress */
+bool		check_referenced_objects = false;
+List	   *plisql_referenced_objects = NIL;	/* the elements of list are
+												 * ObjectAddress */
 
 
 /* ----------
  * static prototypes
  * ----------
  */
-static PLiSQL_function *do_compile(FunctionCallInfo fcinfo,
+static PLiSQL_function * do_compile(FunctionCallInfo fcinfo,
 									HeapTuple procTup,
-									PLiSQL_function *function,
-									PLiSQL_func_hashkey *hashkey,
+									PLiSQL_function * function,
+									PLiSQL_func_hashkey * hashkey,
 									bool forValidator);
 static Node *plisql_pre_column_ref(ParseState *pstate, ColumnRef *cref);
 static Node *plisql_post_column_ref(ParseState *pstate, ColumnRef *cref, Node *var);
 static Node *plisql_param_ref(ParseState *pstate, ParamRef *pref);
-static Node *resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
+static Node *resolve_column_ref(ParseState *pstate, PLiSQL_expr * expr,
 								ColumnRef *cref, bool error_if_no_field);
-static Node *make_datum_param(PLiSQL_expr *expr, int dno, int location);
-static PLiSQL_type *build_datatype(HeapTuple typeTup, int32 typmod,
+static Node *make_datum_param(PLiSQL_expr * expr, int dno, int location);
+static PLiSQL_type * build_datatype(HeapTuple typeTup, int32 typmod,
 									Oid collation, TypeName *origtypname);
 static void compute_function_hashkey(FunctionCallInfo fcinfo,
 									 Form_pg_proc procStruct,
-									 PLiSQL_func_hashkey *hashkey,
+									 PLiSQL_func_hashkey * hashkey,
 									 bool forValidator,
-									 HeapTuple procTup); 
-static PLiSQL_function *plisql_HashTableLookup(PLiSQL_func_hashkey *func_key);
-static void plisql_HashTableInsert(PLiSQL_function *function,
-									PLiSQL_func_hashkey *func_key);
-static void plisql_HashTableDelete(PLiSQL_function *function);
+									 HeapTuple procTup);
+static PLiSQL_function * plisql_HashTableLookup(PLiSQL_func_hashkey * func_key);
+static void plisql_HashTableInsert(PLiSQL_function * function,
+								   PLiSQL_func_hashkey * func_key);
+static void plisql_HashTableDelete(PLiSQL_function * function);
 static void plisql_add_type_referenced_objects(TypeName *typeName);
-void delete_function(PLiSQL_function *func);
+void		delete_function(PLiSQL_function * func);
 
 /* ----------
- * plisql_compile		Make an execution tree for a PL/iSQL function.
+ * plisql_compile		Build an execution tree for a PL/iSQL function.
  *
- * If forValidator is true, we're only compiling for validation purposes,
+ * If forValidator is true, we're just compiling for validation purpose,
  * and so some checks are skipped.
  *
  * Note: it's important for this to fall through quickly if the function
@@ -134,17 +135,17 @@ void delete_function(PLiSQL_function *func);
 PLiSQL_function *
 plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 {
-	Oid			funcOid = fcinfo->flinfo->fn_oid;
+	Oid		funcOid = fcinfo->flinfo->fn_oid;
 	HeapTuple	procTup;
 	Form_pg_proc procStruct;
 	PLiSQL_function *function;
 	PLiSQL_func_hashkey hashkey;
 	bool		function_valid = false;
 	bool		hashkey_valid = false;
-	Oid rettypeoid = InvalidOid;
+	Oid			rettypeoid = InvalidOid;
 
 	/*
-	 * Lookup the pg_proc tuple by Oid; we'll need it in any case
+	 * Lookup the pg_proc tuple by Oid; we need it in any case
 	 */
 	procTup = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcOid));
 	if (!HeapTupleIsValid(procTup))
@@ -163,7 +164,7 @@ plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 	if (!function)
 	{
 		/* Compute hashkey using function signature and actual arg types */
-		compute_function_hashkey(fcinfo, procStruct, &hashkey, forValidator, procTup); 
+		compute_function_hashkey(fcinfo, procStruct, &hashkey, forValidator, procTup);
 		hashkey_valid = true;
 
 		/* And do the lookup */
@@ -175,7 +176,7 @@ plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 		/* We have a compiled function, but is it still valid? */
 		if (function->fn_xmin == HeapTupleHeaderGetRawXmin(procTup->t_data) &&
 			ItemPointerEquals(&function->fn_tid, &procTup->t_self) &&
-			(!OidIsValid(rettypeoid) || rettypeoid == function->fn_rettype)) 
+			(!OidIsValid(rettypeoid) || rettypeoid == function->fn_rettype))
 			function_valid = true;
 		else
 		{
@@ -218,23 +219,24 @@ plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 			if (!forValidator &&
 				procStruct->prostatus == PROSTATUS_INVALID)
 				ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("%s %s is in an invalid state",
-						(procStruct->prokind == PROKIND_FUNCTION) ? "function" : "procedure",
-						NameStr(procStruct->proname))));
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("%s %s is in an invalid state",
+								(procStruct->prokind == PROKIND_FUNCTION) ? "function" : "procedure",
+								NameStr(procStruct->proname))));
+
 			/*
-			 * Calculate hashkey if we didn't already; we'll need it to store the
-			 * completed function.
+			 * Calculate hashkey if we didn't already; we'll need it to store
+			 * the completed function.
 			 */
 			if (!hashkey_valid)
 				compute_function_hashkey(fcinfo, procStruct, &hashkey,
-							 forValidator, procTup); 
-	
+										 forValidator, procTup);
+
 			/*
 			 * Do the hard part.
 			 */
 			function = do_compile(fcinfo, procTup, function,
-						  &hashkey, forValidator);
+								  &hashkey, forValidator);
 		}
 
 		PG_CATCH();
@@ -251,7 +253,7 @@ plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 	/*
 	 * Save pointer in FmgrInfo to avoid search on subsequent calls
 	 */
-	fcinfo->flinfo->fn_extra =  function;
+	fcinfo->flinfo->fn_extra = function;
 
 	/*
 	 * Finally return the compiled function
@@ -285,14 +287,14 @@ plisql_compile(FunctionCallInfo fcinfo, bool forValidator)
 static PLiSQL_function *
 do_compile(FunctionCallInfo fcinfo,
 		   HeapTuple procTup,
-		   PLiSQL_function *function,
-		   PLiSQL_func_hashkey *hashkey,
+		   PLiSQL_function * function,
+		   PLiSQL_func_hashkey * hashkey,
 		   bool forValidator)
 {
 	Form_pg_proc procStruct = (Form_pg_proc) GETSTRUCT(procTup);
 	bool		is_dml_trigger = CALLED_AS_TRIGGER(fcinfo);
 	bool		is_event_trigger = CALLED_AS_EVENT_TRIGGER(fcinfo);
-	yyscan_t        scanner;
+	yyscan_t	scanner;
 	Datum		prosrcdatum;
 	char	   *proc_source;
 	HeapTuple	typeTup;
@@ -315,11 +317,11 @@ do_compile(FunctionCallInfo fcinfo,
 	MemoryContext func_cxt;
 
 	bool		is_plisql_function = false;
-	int		*all_arg_varnos = NULL;
+	int		   *all_arg_varnos = NULL;
 
-	char		**argtypenames = NULL;
-	char		*rettypename = NULL;
-	PLiSQL_type	*rettype = NULL;
+	char	  **argtypenames = NULL;
+	char	   *rettypename = NULL;
+	PLiSQL_type *rettype = NULL;
 
 	/*
 	 * Setup the scanner input and error info.
@@ -342,7 +344,7 @@ do_compile(FunctionCallInfo fcinfo,
 
 	/*
 	 * Do extra syntax checks when validating the function definition. We skip
-	 * this when actually compiling functions for execution, for performance
+	 * this when actually compiling functions for execution, due to performance
 	 * reasons.
 	 */
 	plisql_check_syntax = forValidator;
@@ -368,8 +370,8 @@ do_compile(FunctionCallInfo fcinfo,
 	 * per-function memory context, so it can be reclaimed easily.
 	 */
 	func_cxt = AllocSetContextCreate(TopMemoryContext,
-									 "PL/iSQL function",
-									 ALLOCSET_DEFAULT_SIZES);
+						 "PL/iSQL function",
+						 ALLOCSET_DEFAULT_SIZES);
 	plisql_compile_tmp_cxt = MemoryContextSwitchTo(func_cxt);
 
 	function->fn_signature = format_procedure(fcinfo->flinfo->fn_oid);
@@ -443,21 +445,21 @@ do_compile(FunctionCallInfo fcinfo,
 			MemoryContextSwitchTo(plisql_compile_tmp_cxt);
 
 			numargs = get_func_arg_info(procTup,
-										&argtypes, &argnames, &argmodes);
+							&argtypes, &argnames, &argmodes);
 
 			get_func_typename_info(procTup,
-									&argtypenames, &rettypename);
+								   &argtypenames, &rettypename);
 
 			plisql_resolve_polymorphic_argtypes(numargs, argtypes, argmodes,
-												 fcinfo->flinfo->fn_expr,
-												 forValidator,
-												 plisql_error_funcname);
+												fcinfo->flinfo->fn_expr,
+												forValidator,
+												plisql_error_funcname);
 
 			in_arg_varnos = (int *) palloc(numargs * sizeof(int));
 			if (is_plisql_function)
-				out_arg_variables = (PLiSQL_variable **) palloc((numargs + 1) * sizeof(PLiSQL_variable *));
+				out_arg_variables = (PLiSQL_variable * *) palloc((numargs + 1) * sizeof(PLiSQL_variable *));
 			else
-				out_arg_variables = (PLiSQL_variable **) palloc(numargs * sizeof(PLiSQL_variable *));
+				out_arg_variables = (PLiSQL_variable * *) palloc(numargs * sizeof(PLiSQL_variable *));
 
 			all_arg_varnos = (int *) palloc(numargs * sizeof(int));
 
@@ -469,7 +471,7 @@ do_compile(FunctionCallInfo fcinfo,
 			for (i = 0; i < numargs; i++)
 			{
 				char		buf[32];
-				Oid			argtypeid = argtypes[i];
+				Oid		argtypeid = argtypes[i];
 				char		argmode = argmodes ? argmodes[i] : PROARGMODE_IN;
 				PLiSQL_type *argdtype;
 				PLiSQL_variable *argvariable;
@@ -479,10 +481,10 @@ do_compile(FunctionCallInfo fcinfo,
 				snprintf(buf, sizeof(buf), "$%d", i + 1);
 
 				/* Create datatype info */
-				/* consider the argument type comes from a package */
+				/* consider the argument type that comes from a package */
 				if (argtypenames != NULL && strcmp(argtypenames[i], "") != 0)
 				{
-					TypeName	*tname;
+					TypeName   *tname;
 
 					tname = (TypeName *) stringToNode(argtypenames[i]);
 
@@ -500,16 +502,16 @@ do_compile(FunctionCallInfo fcinfo,
 						typtup = LookupOraTypeName(NULL, tname, NULL, true);
 						if (typtup == NULL)
 							ereport(ERROR,
-								(errcode(ERRCODE_UNDEFINED_OBJECT),
-								 errmsg("type \"%s\" does not exist",
-									TypeNameToString(tname)),
-								 	parser_errposition(NULL, tname->location)));
+									(errcode(ERRCODE_UNDEFINED_OBJECT),
+									 errmsg("type \"%s\" does not exist",
+											TypeNameToString(tname)),
+									 parser_errposition(NULL, tname->location)));
 
 						argtypeid = typeTypeId(typtup);
 						argdtype = plisql_build_datatype(argtypeid,
-										  -1,
-										  function->fn_input_collation,
-										  NULL);
+														 -1,
+														 function->fn_input_collation,
+														 NULL);
 						ReleaseSysCache(typtup);
 					}
 					pfree(tname);
@@ -517,15 +519,15 @@ do_compile(FunctionCallInfo fcinfo,
 				else
 				{
 					argdtype = plisql_build_datatype(argtypeid,
-									  -1,
-									  function->fn_input_collation,
-									  NULL);
+													 -1,
+													 function->fn_input_collation,
+													 NULL);
 				}
 
 
 				/* Disallow pseudotype argument */
-				/* (note we already replaced polymorphic types) */
-				/* (build_variable would do this, but wrong message) */
+				/* note we already replaced polymorphic types */
+				/* build_variable can do this, but with wrong message */
 				if (argdtype->ttype == PLISQL_TTYPE_PSEUDO)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -537,40 +539,40 @@ do_compile(FunctionCallInfo fcinfo,
 				 * for the argument, use that as refname, else use $n name.
 				 */
 				argvariable = plisql_build_variable((argnames &&
-													  argnames[i][0] != '\0') ?
-													 argnames[i] : buf,
-													 0, argdtype, false);
+													 argnames[i][0] != '\0') ?
+													argnames[i] : buf,
+													0, argdtype, false);
 
 				if (argvariable->dtype == PLISQL_DTYPE_VAR)
 				{
 					argitemtype = PLISQL_NSTYPE_VAR;
 
-					/* 
-					 * remember the variable mode for IN, OUT and IN OUT,  
+					/*
+					 * remember the variable mode for IN, OUT and IN OUT,
 					 * variable of IN mode is not allowned to have value.
 					 */
 					if (argmode == PROARGMODE_IN ||
 						argmode == PROARGMODE_OUT ||
 						argmode == PROARGMODE_INOUT)
-						((PLiSQL_var *)argvariable)->info = argmode;
+						((PLiSQL_var *) argvariable)->info = argmode;
 					else
-						((PLiSQL_var *)argvariable)->info = PROARGMODE_IN;
+						((PLiSQL_var *) argvariable)->info = PROARGMODE_IN;
 				}
 				else
 				{
 					Assert(argvariable->dtype == PLISQL_DTYPE_REC);
 					argitemtype = PLISQL_NSTYPE_REC;
 
-					/* 
-					 * remember the variable mode for IN, OUT and IN OUT,  
+					/*
+					 * remember the variable mode for IN, OUT and IN OUT,
 					 * variable of IN mode is not allowned to have value.
 					 */
 					if (argmode == PROARGMODE_IN ||
 						argmode == PROARGMODE_OUT ||
 						argmode == PROARGMODE_INOUT)
-						((PLiSQL_rec *)argvariable)->info = argmode;
+						((PLiSQL_rec *) argvariable)->info = argmode;
 					else
-						((PLiSQL_rec *)argvariable)->info = PROARGMODE_IN;
+						((PLiSQL_rec *) argvariable)->info = PROARGMODE_IN;
 				}
 
 				/* Remember arguments in appropriate arrays */
@@ -596,7 +598,7 @@ do_compile(FunctionCallInfo fcinfo,
 
 			if (rettypename != NULL)
 			{
-				TypeName		*tname;
+				TypeName   *tname;
 
 				tname = (TypeName *) stringToNode(rettypename);
 				if (tname->pct_type || tname->row_type)
@@ -614,16 +616,16 @@ do_compile(FunctionCallInfo fcinfo,
 					typtup = LookupOraTypeName(NULL, tname, NULL, true);
 					if (typtup == NULL)
 						ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_OBJECT),
-							 errmsg("type \"%s\" does not exist",
-								TypeNameToString(tname)),
+								(errcode(ERRCODE_UNDEFINED_OBJECT),
+								 errmsg("type \"%s\" does not exist",
+										TypeNameToString(tname)),
 								 parser_errposition(NULL, tname->location)));
 
 					rettypeid = typeTypeId(typtup);
 					rettype = plisql_build_datatype(rettypeid,
-									  -1,
-									  function->fn_input_collation,
-									  NULL);
+													-1,
+													function->fn_input_collation,
+													NULL);
 					ReleaseSysCache(typtup);
 				}
 				else
@@ -642,7 +644,7 @@ do_compile(FunctionCallInfo fcinfo,
 				if (procStruct->prorettype != VOIDOID)
 				{
 					char		buf[32];
-					Oid 		argtypeid = rettypeid;
+					Oid			argtypeid = rettypeid;
 					PLiSQL_type *argdtype;
 					PLiSQL_variable *argvariable;
 					PLiSQL_nsitem_type argitemtype;
@@ -665,10 +667,10 @@ do_compile(FunctionCallInfo fcinfo,
 							if (!OidIsValid(argtypeid))
 							{
 								ereport(ERROR,
-									(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-										errmsg("could not know the actual return type "
-											"for polymorphic function \"%s\"",
-											plisql_error_funcname)));
+										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+										 errmsg("could not know the actual return type "
+												"for polymorphic function \"%s\"",
+												plisql_error_funcname)));
 							}
 						}
 					}
@@ -676,11 +678,11 @@ do_compile(FunctionCallInfo fcinfo,
 					snprintf(buf, sizeof(buf), "$%d", i + 1);
 
 					argdtype = plisql_build_datatype(argtypeid, -1,
-									 function->fn_input_collation,
-									 NULL);
+													 function->fn_input_collation,
+													 NULL);
 
 					argvariable = plisql_build_variable("_RETVAL_",
-										 0, argdtype, false);
+														0, argdtype, false);
 
 					function->fn_ret_vardno = argvariable->dno;
 
@@ -689,7 +691,10 @@ do_compile(FunctionCallInfo fcinfo,
 					else
 						argitemtype = PLISQL_NSTYPE_REC;
 
-					/* the variable for function return value follows all function OUT args */
+					/*
+					 * the variable for function return value follows all
+					 * function OUT args
+					 */
 					out_arg_variables[num_out_args] = argvariable;
 					num_out_args++;
 
@@ -699,14 +704,16 @@ do_compile(FunctionCallInfo fcinfo,
 			}
 
 			/*
-			 * If there's at least one OUT parameter in a procedure, build a row that
-			 * holds all of them.  If there's at least one OUT parameter in a function,
-			 * and the return type is VOID, alos build a row that holds all of them.
+			 * If there's at least one OUT parameter in a procedure, build a
+			 * row that holds all of them.  If there's at least one OUT
+			 * parameter in a function, and the return type is VOID, alos
+			 * build a row that holds all of them.
 			 *
-			 * If the function return type is not VOID, build a row that combines all 
-			 * OUT parameters and return value.
+			 * If the function return type is not VOID, build a row that
+			 * combines all OUT parameters and return value.
 			 *
-			 * Procedures and functions return a row even for one OUT parameter.
+			 * Procedures and functions return a row even for one OUT
+			 * parameter.
 			 */
 			if (num_out_args > 0)
 			{
@@ -722,12 +729,12 @@ do_compile(FunctionCallInfo fcinfo,
 			 * one.  (In validation mode we arbitrarily assume we are dealing
 			 * with integers.)
 			 *
-			 * Note: errcode is FEATURE_NOT_SUPPORTED because it should always
-			 * work; if it doesn't we're in some context that fails to make
+			 * Note: errcode is FEATURE_NOT_SUPPORTED as it would always work; 
+			 * if it doesn't we're in some context that fails to make
 			 * the info available.
 			 */
 
-			/* If a function has out arguments, change ts return type to RECORDOID */
+			/* If a function has out arguments, change its return type to RECORDOID */
 			if (num_out_args > 0 &&
 				rettypeid != RECORDOID &&
 				is_plisql_function)
@@ -749,7 +756,6 @@ do_compile(FunctionCallInfo fcinfo,
 						rettypeid = INT4MULTIRANGEOID;
 					else		/* ANYELEMENT or ANYNONARRAY or ANYCOMPATIBLE */
 						rettypeid = INT4OID;
-					/* XXX what could we use for ANYENUM? */
 				}
 				else
 				{
@@ -778,7 +784,7 @@ do_compile(FunctionCallInfo fcinfo,
 			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			/* Disallow pseudotype result, except VOID or RECORD */
-			/* (note we already replaced polymorphic types) */
+			/* note we already replaced polymorphic types */
 			if (typeStruct->typtype == TYPTYPE_PSEUDO)
 			{
 				if (rettypeid == VOIDOID ||
@@ -809,11 +815,11 @@ do_compile(FunctionCallInfo fcinfo,
 				num_out_args == 0)
 			{
 				(void) plisql_build_variable("$0", 0,
-											  build_datatype(typeTup,
-															 -1,
-															 function->fn_input_collation,
-															 NULL),
-											  true);
+								  build_datatype(typeTup,
+								 -1,
+								 function->fn_input_collation,
+								 NULL),
+								  true);
 			}
 
 			ReleaseSysCache(typeTup);
@@ -844,110 +850,110 @@ do_compile(FunctionCallInfo fcinfo,
 
 			/* Add the variable tg_name */
 			var = plisql_build_variable("tg_name", 0,
-										 plisql_build_datatype(NAMEOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(NAMEOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_NAME;
 
 			/* Add the variable tg_when */
 			var = plisql_build_variable("tg_when", 0,
-										 plisql_build_datatype(TEXTOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_WHEN;
 
 			/* Add the variable tg_level */
 			var = plisql_build_variable("tg_level", 0,
-										 plisql_build_datatype(TEXTOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_LEVEL;
 
 			/* Add the variable tg_op */
 			var = plisql_build_variable("tg_op", 0,
-										 plisql_build_datatype(TEXTOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_OP;
 
 			/* Add the variable tg_relid */
 			var = plisql_build_variable("tg_relid", 0,
-										 plisql_build_datatype(OIDOID,
-																-1,
-																InvalidOid,
-																NULL),
-										 true);
+							 plisql_build_datatype(OIDOID,
+							-1,
+							InvalidOid,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_RELID;
 
 			/* Add the variable tg_relname */
 			var = plisql_build_variable("tg_relname", 0,
-										 plisql_build_datatype(NAMEOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(NAMEOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_TABLE_NAME;
 
-			/* tg_table_name is now preferred to tg_relname */
+			/* tg_table_name is now preferred to be tg_relname */
 			var = plisql_build_variable("tg_table_name", 0,
-										 plisql_build_datatype(NAMEOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(NAMEOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_TABLE_NAME;
 
 			/* add the variable tg_table_schema */
 			var = plisql_build_variable("tg_table_schema", 0,
-										 plisql_build_datatype(NAMEOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(NAMEOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_TABLE_SCHEMA;
 
 			/* Add the variable tg_nargs */
 			var = plisql_build_variable("tg_nargs", 0,
-										 plisql_build_datatype(INT4OID,
-																-1,
-																InvalidOid,
-																NULL),
-										 true);
+							 plisql_build_datatype(INT4OID,
+							-1,
+							InvalidOid,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_NARGS;
 
 			/* Add the variable tg_argv */
 			var = plisql_build_variable("tg_argv", 0,
-										 plisql_build_datatype(TEXTARRAYOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTARRAYOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_ARGV;
@@ -969,22 +975,22 @@ do_compile(FunctionCallInfo fcinfo,
 
 			/* Add the variable tg_event */
 			var = plisql_build_variable("tg_event", 0,
-										 plisql_build_datatype(TEXTOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_EVENT;
 
 			/* Add the variable tg_tag */
 			var = plisql_build_variable("tg_tag", 0,
-										 plisql_build_datatype(TEXTOID,
-																-1,
-																function->fn_input_collation,
-																NULL),
-										 true);
+							 plisql_build_datatype(TEXTOID,
+							-1,
+							function->fn_input_collation,
+							NULL),
+							 true);
 			Assert(var->dtype == PLISQL_DTYPE_VAR);
 			var->dtype = PLISQL_DTYPE_PROMISE;
 			((PLiSQL_var *) var)->promise = PLISQL_PROMISE_TG_TAG;
@@ -1004,11 +1010,11 @@ do_compile(FunctionCallInfo fcinfo,
 	 * Create the magic FOUND variable.
 	 */
 	var = plisql_build_variable("found", 0,
-								 plisql_build_datatype(BOOLOID,
-														-1,
-														InvalidOid,
-														NULL),
-								 true);
+					 plisql_build_datatype(BOOLOID,
+					-1,
+					InvalidOid,
+					NULL),
+					 true);
 	function->found_varno = var->dno;
 
 	PG_TRY();
@@ -1031,7 +1037,9 @@ do_compile(FunctionCallInfo fcinfo,
 		is_plisql_function &&
 		procStruct->prorettype != VOIDOID &&
 		((PLiSQL_stmt *) llast(function->action->body))->cmd_type != PLISQL_STMT_RETURN)
+	{
 		function->fn_no_return = true;
+	}
 
 	/*
 	 * If it has OUT parameters or returns VOID or returns a set, we allow
@@ -1056,51 +1064,51 @@ do_compile(FunctionCallInfo fcinfo,
 	else
 	{
 		for (i = 0; i < function->fn_nargs; i++)
-			function->fn_argvarnos[i] = in_arg_varnos[i];	
+			function->fn_argvarnos[i] = in_arg_varnos[i];
 	}
 
 	plisql_finish_datums(function);
 	if (function->has_exception_block)
-			plisql_mark_local_assignment_targets(function);
+		plisql_mark_local_assignment_targets(function);
 	plisql_finish_subproc_func(function);
 
 	plisql_check_subproc_define(function, scanner);
 
 	/*
-	 * after plisql_check_subproc_define for nice error message
+	 * run after plisql_check_subproc_define for nice error message
 	 */
 	plisql_scanner_finish(scanner);
 	pfree(proc_source);
 
 	/* Debug dump for completed functions */
 	if (plisql_DumpExecTree)
-		plisql_dumptree(function, 0, 0); 
+		plisql_dumptree(function, 0, 0);
 
 	if (check_referenced_objects)
 	{
 		/*
-		 * we have builded a global list plisql_referenced_objects
+		 * we have built a global list plisql_referenced_objects
 		 * to store the objects referenced by %TYPE and %ROWTYPE
 		 * in function body. Consider whether there are
 		 * referenced objects in the function arguments datatype
 		 * and the function returned datatype.
 		 *
 		 */
-		char		**argtypenames = NULL;
-		char		*rettypename = NULL;
+		argtypenames = NULL;
+		rettypename = NULL;
 
 		get_func_typename_info(procTup, &argtypenames, &rettypename);
 		if (argtypenames != NULL)
 		{
-			int 	i = 0;
+			int			j = 0;
 
-			for (i = 0; i < procStruct->pronargs; i++)
+			for (j = 0; j < procStruct->pronargs; j++)
 			{
-				if (strcmp(argtypenames[i], "") != 0)
+				if (strcmp(argtypenames[j], "") != 0)
 				{
-					TypeName	*typeName;
+					TypeName   *typeName;
 
-					typeName = (TypeName *) stringToNode(argtypenames[i]);
+					typeName = (TypeName *) stringToNode(argtypenames[j]);
 					plisql_add_type_referenced_objects(typeName);
 				}
 			}
@@ -1108,13 +1116,13 @@ do_compile(FunctionCallInfo fcinfo,
 		}
 		if (rettypename != NULL && strcmp(rettypename, "") != 0)
 		{
-			TypeName	*typeName;
+			TypeName   *typeName;
 
 			typeName = (TypeName *) stringToNode(rettypename);
 			plisql_add_type_referenced_objects(typeName);
 			pfree(rettypename);
 		}
-	
+
 		/* All the referenced objects are in plisql_referenced_objects list */
 		if (plisql_referenced_objects != NIL)
 		{
@@ -1124,30 +1132,35 @@ do_compile(FunctionCallInfo fcinfo,
 			Relation	depRel;
 
 			/*
-			 * If the parameters datatype or return type of a function(procedure)
-			 * or the function body reference tablename.column%TYPE,
-			 * schemaname.tablename.column%TYPE, tablename%ROWTYPE,
-			 * schemaname.tablename%ROWTYPE, record the dependencies
-			 * between relation and function(procedure or package).
+			 * If the parameters datatype or return type of a
+			 * function(procedure) or the function body reference
+			 * tablename.column%TYPE, schemaname.tablename.column%TYPE,
+			 * tablename%ROWTYPE, schemaname.tablename%ROWTYPE, record the
+			 * dependencies between relation and function(procedure or
+			 * package).
 			 */
 			addrs = new_object_addresses();
 			ObjectAddressSet(myself, ProcedureRelationId, function->fn_oid);
 			depRel = table_open(DependRelationId, RowExclusiveLock);
 
-			/* Scan the parameters list and check if it references table name 
-			 * or tablename.columnname 
+			/*
+			 * Scan the parameters list and check if it references table name
+			 * or tablename.columnname
 			 */
 			foreach(x, plisql_referenced_objects)
 			{
 				ObjectAddress *obj = (ObjectAddress *) lfirst(x);
 				ObjectAddress referenced;
 				ScanKeyData key[3];
-				int 		nkeys;
+				int			nkeys;
 				SysScanDesc scan;
 				HeapTuple	tup;
 				bool		isduplicate = false;
 
-				/* Check duplicate dependencies that alreay been built in CREATE FUNCTION/PROCEDURE statment */
+				/*
+				 * Check duplicate dependencies that alreay been built in
+				 * CREATE FUNCTION/PROCEDURE statment
+				 */
 				ScanKeyInit(&key[0],
 							Anum_pg_depend_refclassid,
 							BTEqualStrategyNumber, F_OIDEQ,
@@ -1161,23 +1174,27 @@ do_compile(FunctionCallInfo fcinfo,
 				{
 					/* Consider dependencies of only this sub-object */
 					ScanKeyInit(&key[2],
-							Anum_pg_depend_refobjsubid,
-							BTEqualStrategyNumber, F_INT4EQ,
-							Int32GetDatum(obj->objectSubId));
+								Anum_pg_depend_refobjsubid,
+								BTEqualStrategyNumber, F_INT4EQ,
+								Int32GetDatum(obj->objectSubId));
 					nkeys = 3;
 				}
 				else
 				{
-					/* Consider dependencies of this object and any sub-objects */
+					/*
+					 * Consider dependencies of this object and any
+					 * sub-objects
+					 */
 					nkeys = 2;
 				}
 
 				scan = systable_beginscan(depRel, DependReferenceIndexId, true,
-							  NULL, nkeys, key);
+										  NULL, nkeys, key);
 
 				while (HeapTupleIsValid(tup = systable_getnext(scan)))
 				{
 					Form_pg_depend foundDep = (Form_pg_depend) GETSTRUCT(tup);
+
 					if (foundDep->objid == function->fn_oid)
 					{
 						isduplicate = true;
@@ -1190,7 +1207,8 @@ do_compile(FunctionCallInfo fcinfo,
 					continue;
 
 				/*
-				 * Record the dependencies between relation and function(procedure, or package).
+				 * Record the dependencies between relation and
+				 * function(procedure, or package).
 				 */
 				ObjectAddressSet(referenced, obj->classId, obj->objectId);
 				referenced.objectSubId = obj->objectSubId;
@@ -1236,9 +1254,9 @@ do_compile(FunctionCallInfo fcinfo,
  * ----------
  */
 PLiSQL_function *
-plisql_compile_inline(char *proc_source, ParamListInfo inparams)
+plisql_compile_inline(char *proc_source, ParamListInfo inparams, bool fromcall)
 {
-	yyscan_t        scanner;
+	yyscan_t	scanner;
 	struct compile_error_callback_arg cbarg;
 	char	   *func_name = "inline_code_block";
 	PLiSQL_function *function;
@@ -1277,8 +1295,8 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 	 * its own memory context, so it can be reclaimed easily.
 	 */
 	func_cxt = AllocSetContextCreate(CurrentMemoryContext,
-									 "PL/iSQL inline code context",
-									 ALLOCSET_DEFAULT_SIZES);
+						 "PL/iSQL inline code context",
+						 ALLOCSET_DEFAULT_SIZES);
 	plisql_compile_tmp_cxt = MemoryContextSwitchTo(func_cxt);
 
 	function->fn_signature = pstrdup(func_name);
@@ -1290,8 +1308,8 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 	function->print_strict_params = plisql_print_strict_params;
 
 	/*
-	 * don't do extra validation for inline code as we don't want to add spam
-	 * at runtime
+	 * don't do extra validation for inline code 
+	 * as we don't want to add spam at runtime.
 	 */
 	function->extra_warnings = 0;
 	function->extra_errors = 0;
@@ -1303,6 +1321,7 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 	function->fn_no_return = false;
 
 	function->namelabel = NULL;
+	function->do_from_call = fromcall;
 
 	check_referenced_objects = false;
 	plisql_referenced_objects = NIL;
@@ -1339,7 +1358,7 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 	function->fn_nargs = 0;
 	if (inparams)
 	{
-		int	i;
+		int			i;
 
 		function->fn_nargs = inparams->numParams;
 		function->paramnames = inparams->paramnames;
@@ -1350,8 +1369,8 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 			PLiSQL_variable *argvariable;
 			ParamExternData *param = &(inparams->params[i]);
 			char		buf[32];
-			Oid		argtypeid = param->ptype;
-			int		argitemtype;
+			Oid			argtypeid = param->ptype;
+			int			argitemtype;
 
 			/* Create $n name for variables */
 			if (inparams->paramnames != NULL &&
@@ -1362,7 +1381,7 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 
 			/* Create datatype info */
 			argdtype = plisql_build_datatype(argtypeid,
-								-1,
+								param->ptypmod,
 								function->fn_input_collation,
 								NULL);
 
@@ -1371,24 +1390,24 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 				argdtype->ttype != PLISQL_TTYPE_REC)
 			{
 				ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					errmsg("PLI/SQL functions cannot accept type %s",
-					format_type_be(argtypeid))));
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("PLI/SQL functions cannot accept type %s",
+								format_type_be(argtypeid))));
 			}
 
-			/* Build variable and nsert into datum list */
+			/* Build variable and insert into datum list */
 			argvariable = plisql_build_variable(buf, 0, argdtype, false);
 
 			if (argvariable->dtype == PLISQL_DTYPE_VAR)
 			{
 				argitemtype = PLISQL_NSTYPE_VAR;
-				((PLiSQL_var *)argvariable)->info = param->pmode;
+				((PLiSQL_var *) argvariable)->info = param->pmode;
 			}
 			else
 			{
 				Assert(argvariable->dtype == PLISQL_DTYPE_REC);
 				argitemtype = PLISQL_NSTYPE_REC;
-				((PLiSQL_rec *)argvariable)->info = param->pmode;
+				((PLiSQL_rec *) argvariable)->info = param->pmode;
 			}
 
 			/* Add the $n name into namespace */
@@ -1396,7 +1415,7 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 			function->fn_argvarnos[i] = argvariable->dno;
 		}
 
-		if (inparams->numParams> 0)
+		if (inparams->numParams > 0)
 			function->fn_prokind = PROKIND_ANONYMOUS_BLOCK;
 	}
 
@@ -1404,11 +1423,11 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 	 * Create the magic FOUND variable.
 	 */
 	var = plisql_build_variable("found", 0,
-								 plisql_build_datatype(BOOLOID,
-														-1,
-														InvalidOid,
-														NULL),
-								 true);
+					 plisql_build_datatype(BOOLOID,
+					-1,
+					InvalidOid,
+					NULL),
+					 true);
 	function->found_varno = var->dno;
 
 	/*
@@ -1441,7 +1460,7 @@ plisql_compile_inline(char *proc_source, ParamListInfo inparams)
 		plisql_dumptree(function, 0, 0);
 
 	/*
-	 * after plisql_check_subproc_define for nice error message
+	 * run after plisql_check_subproc_define for nice error message
 	 */
 	plisql_scanner_finish(scanner);
 
@@ -1508,8 +1527,8 @@ add_parameter_name(PLiSQL_nsitem_type itemtype, int itemno, const char *name)
 	 * disambiguate.
 	 */
 	if (plisql_ns_lookup(plisql_ns_top(), true,
-						  name, NULL, NULL,
-						  NULL) != NULL)
+						 name, NULL, NULL,
+						 NULL) != NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 				 errmsg("parameter name \"%s\" used more than once",
@@ -1523,7 +1542,7 @@ add_parameter_name(PLiSQL_nsitem_type itemtype, int itemno, const char *name)
  * Add a dummy RETURN statement to the given function's body
  */
 void
-add_dummy_return(PLiSQL_function *function)
+add_dummy_return(PLiSQL_function * function)
 {
 	/*
 	 * If the outer block has an EXCEPTION clause, we need to make a new outer
@@ -1543,10 +1562,10 @@ add_dummy_return(PLiSQL_function *function)
 
 		function->action = new;
 	}
-	if (function->action->body == NIL || 
+	if (function->action->body == NIL ||
 		function->fn_ret_vardno != -1 ||
 		(function->fn_ret_vardno == -1 &&
-		((PLiSQL_stmt *) llast(function->action->body))->cmd_type != PLISQL_STMT_RETURN))
+		 ((PLiSQL_stmt *) llast(function->action->body))->cmd_type != PLISQL_STMT_RETURN))
 	{
 		PLiSQL_stmt_return *new;
 
@@ -1570,14 +1589,14 @@ add_dummy_return(PLiSQL_function *function)
  * previously been parsed and planned.
  */
 void
-plisql_parser_setup(struct ParseState *pstate, PLiSQL_expr *expr)
+plisql_parser_setup(struct ParseState *pstate, PLiSQL_expr * expr)
 {
 	pstate->p_pre_columnref_hook = plisql_pre_column_ref;
 	pstate->p_post_columnref_hook = plisql_post_column_ref;
 	pstate->p_paramref_hook = plisql_param_ref;
 	pstate->p_subprocfunc_hook = plisql_subprocfunc_ref;
 	/* no need to use p_coerce_param_hook */
-	pstate->p_ref_hook_state =  expr;
+	pstate->p_ref_hook_state = expr;
 }
 
 /*
@@ -1654,7 +1673,7 @@ plisql_param_ref(ParseState *pstate, ParamRef *pref)
 
 		if (expr->func->paramnames != NULL)
 		{
-			int i;
+			int			i;
 
 			for (i = 0; i < expr->func->fn_nargs; i++)
 				if (expr->func->paramnames[i] != NULL &&
@@ -1666,8 +1685,8 @@ plisql_param_ref(ParseState *pstate, ParamRef *pref)
 	snprintf(pname, sizeof(pname), "$%d", pref->number);
 
 	nse = plisql_ns_lookup(expr->ns, false,
-							pname, NULL, NULL,
-							NULL);
+						   pname, NULL, NULL,
+						   NULL);
 
 	if (nse == NULL)
 		return NULL;			/* name not known to plisql */
@@ -1684,7 +1703,7 @@ plisql_param_ref(ParseState *pstate, ParamRef *pref)
  * we are able to match a record/row name but don't find a field name match.
  */
 static Node *
-resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
+resolve_column_ref(ParseState *pstate, PLiSQL_expr * expr,
 				   ColumnRef *cref, bool error_if_no_field)
 {
 	PLiSQL_execstate *estate;
@@ -1704,6 +1723,7 @@ resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
 	 * plans when those types change ...
 	 */
 	estate = expr->func->cur_estate;
+	pstate->do_from_call = expr->func->do_from_call;
 
 	/*----------
 	 * The allowed syntaxes are:
@@ -1778,18 +1798,18 @@ resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
 	}
 
 	nse = plisql_ns_lookup(expr->ns, false,
-							name1, name2, name3,
-							&nnames);
+					name1, name2, name3,
+					&nnames);
 	/* maybe a package var */
 	if (nse == NULL)
 	{
-		char		*refname;
+		char	   *refname;
 
 		refname = NameListToString(cref->fields);
 
 		nse = plisql_ns_lookup(expr->ns, false,
-							refname, NULL, NULL,
-							&nnames);
+							   refname, NULL, NULL,
+							   &nnames);
 		pfree(refname);
 		if (nse != NULL)
 		{
@@ -1834,7 +1854,7 @@ resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
 				/*
 				 * We should not get here, because a RECFIELD datum should
 				 * have been built at parse time for every possible qualified
-				 * reference to fields of this record.  But if we do, handle
+				 * reference to fields of this record. But if we do, handle
 				 * it like field-not-found: throw error or return NULL.
 				 */
 				if (error_if_no_field)
@@ -1859,10 +1879,10 @@ resolve_column_ref(ParseState *pstate, PLiSQL_expr *expr,
 
 /*
  * Helper for columnref parsing: build a Param referencing a plisql datum,
- * and make sure that that datum is listed in the expression's paramnos.
+ * and make sure that datum is listed in the expression's paramnos.
  */
 static Node *
-make_datum_param(PLiSQL_expr *expr, int dno, int location)
+make_datum_param(PLiSQL_expr * expr, int dno, int location)
 {
 	PLiSQL_execstate *estate;
 	PLiSQL_datum *datum;
@@ -1885,10 +1905,10 @@ make_datum_param(PLiSQL_expr *expr, int dno, int location)
 	param->paramkind = PARAM_EXTERN;
 	param->paramid = dno + 1;
 	plisql_exec_get_datum_type_info(estate,
-									 datum,
-									 &param->paramtype,
-									 &param->paramtypmod,
-									 &param->paramcollid);
+					 datum,
+					 &param->paramtype,
+					 &param->paramtypmod,
+					 &param->paramcollid);
 	param->location = location;
 
 	return (Node *) param;
@@ -1916,7 +1936,7 @@ make_datum_param(PLiSQL_expr *expr, int dno, int location)
  */
 bool
 plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
-				   PLwdatum *wdatum, PLword *word)
+				  PLwdatum *wdatum, PLword *word)
 {
 	PLiSQL_nsitem *ns;
 
@@ -1931,8 +1951,8 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 		 * Do a lookup in the current namespace stack
 		 */
 		ns = plisql_ns_lookup(plisql_ns_top(), false,
-							   paramname, NULL, NULL,
-							   NULL);
+							  paramname, NULL, NULL,
+							  NULL);
 
 		if (ns != NULL)
 		{
@@ -1947,9 +1967,9 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 					wdatum->idents = NIL;
 					return true;
 
-					case PLISQL_NSTYPE_SUBPROC_FUNC:
-					case PLISQL_NSTYPE_SUBPROC_PROC:
-						break;
+				case PLISQL_NSTYPE_SUBPROC_FUNC:
+				case PLISQL_NSTYPE_SUBPROC_PROC:
+					break;
 
 				default:
 					/* plisql_ns_lookup should never return anything else */
@@ -1960,15 +1980,15 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 		else if (!is_compile_standard_package())
 		{
 			/*
-			 * handle var come from standard.xxx
-			 * maybe a udt type construct func like udt_type(xx)
-			 * so we should parse package entry
+			 * Handle variables coming from standard.xxx; this might be a UDT
+			 * constructor function like udt_type(xx), so parse the package
+			 * entry.
 			 */
-			PkgEntry *entry;
-			size_t len = 8 + strlen(word1) + 2;
-			char *refname = (char *) palloc0(len);
-			List *idents =  list_make2(makeString("standard"),
-						makeString(word1));
+			PkgEntry   *entry;
+			size_t		len = 8 + strlen(word1) + 2;
+			char	   *refname = (char *) palloc0(len);
+			List	   *idents = list_make2(makeString("standard"),
+											makeString(word1));
 
 			snprintf(refname, len, "standard.%s", word1);
 
@@ -1986,8 +2006,8 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 						wdatum->nname_used = 1;
 						/* add namespace */
 						if (plisql_ns_lookup(plisql_ns_top(), true,
-							word1, NULL, NULL,
-							NULL) == NULL)
+											 word1, NULL, NULL,
+											 NULL) == NULL)
 							add_parameter_name(PLISQL_NSTYPE_VAR, wdatum->datum->dno, word1);
 						return true;
 						break;
@@ -2000,25 +2020,25 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 			}
 		}
 	}
+
 	/*
-	 * there, make sure the local namespace has not found or
-	 * we lookup standard'package first than local, which will
-	 * result mistake.
-	 * for example: exit when not found which then found, we
-	 * mustn't use standard'found
+	 * there, make sure the local namespace has not found or we lookup
+	 * standard'package first than local, which will result mistake. for
+	 * example: exit when not found which then found, we mustn't use
+	 * standard'found
 	 */
 	if (lookup &&
 		plisql_IdentifierLookup != IDENTIFIER_LOOKUP_DECLARE &&
 		!is_compile_standard_package() &&
 		plisql_ns_lookup(plisql_ns_top(), false,
-							   word1, NULL, NULL,
-							   NULL) == NULL)
+						 word1, NULL, NULL,
+						 NULL) == NULL)
 	{
-		PkgEntry *entry;
-		size_t len = 8 + strlen(word1) + 2;
-		char *refname = (char *) palloc0(len);
-		List *idents =  list_make2(makeString("standard"),
-					makeString(word1));
+		PkgEntry   *entry;
+		size_t		len = 8 + strlen(word1) + 2;
+		char	   *refname = (char *) palloc0(len);
+		List	   *idents = list_make2(makeString("standard"),
+										makeString(word1));
 
 		snprintf(refname, len, "standard.%s", word1);
 
@@ -2036,11 +2056,11 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 					wdatum->nname_used = 1;
 					/* add namespace */
 					if (plisql_ns_lookup(plisql_ns_top(), true,
-						word1, NULL, NULL,
-						NULL) == NULL)
+										 word1, NULL, NULL,
+										 NULL) == NULL)
 						add_parameter_name(PLISQL_NSTYPE_VAR,
-										wdatum->datum->dno,
-										word1);
+										   wdatum->datum->dno,
+										   word1);
 					return true;
 					break;
 				case PKG_TYPE:
@@ -2053,8 +2073,7 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
 	}
 
 	/*
-	 * Nothing found - up to now it's a word without any special meaning for
-	 * us.
+	 * Nothing found - up to now it's a word without any special meaning for us.
 	 */
 	word->ident = word1;
 	word->quoted = (yytxt[0] == '"');
@@ -2069,7 +2088,7 @@ plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
  */
 bool
 plisql_parse_dblword(char *paramname, char *word1, char *word2,
-					  PLwdatum *wdatum, PLcword *cword)
+					 PLwdatum *wdatum, PLcword *cword)
 {
 	PLiSQL_nsitem *ns;
 	List	   *idents;
@@ -2090,8 +2109,8 @@ plisql_parse_dblword(char *paramname, char *word1, char *word2,
 		 * Do a lookup in the current namespace stack
 		 */
 		ns = plisql_ns_lookup(plisql_ns_top(), false,
-							   paramname, word2, NULL,
-							   &nnames);
+							  paramname, word2, NULL,
+							  &nnames);
 		if (ns != NULL)
 		{
 			switch (ns->itemtype)
@@ -2140,13 +2159,13 @@ plisql_parse_dblword(char *paramname, char *word1, char *word2,
 		else
 		{
 			/*
-			 * handle var come from package
-			 * maybe a udt type construct func like udt_type(xx)
-			 * so we should parse package entry
+			 * Handle variables coming from a package; this might be a UDT
+			 * constructor function like udt_type(xx), so parse the package
+			 * entry.
 			 */
-			PkgEntry *entry;
-			size_t len = strlen(word1) + strlen(word2) + 2;
-			char *refname = (char *) palloc0(len);
+			PkgEntry   *entry;
+			size_t		len = strlen(word1) + strlen(word2) + 2;
+			char	   *refname = (char *) palloc0(len);
 
 			snprintf(refname, len, "%s.%s", word1, word2);
 
@@ -2187,11 +2206,11 @@ plisql_parse_dblword(char *paramname, char *word1, char *word2,
  */
 bool
 plisql_parse_tripword(char *paramname, char *word1, char *word2, char *word3,
-					   PLwdatum *wdatum, PLcword *cword)
+					  PLwdatum *wdatum, PLcword *cword)
 {
 	PLiSQL_nsitem *ns;
 	List	   *idents;
-	int			nnames;
+	int	nnames;
 
 	/*
 	 * We should do nothing in DECLARE sections.  In SQL expressions, we need
@@ -2203,12 +2222,12 @@ plisql_parse_tripword(char *paramname, char *word1, char *word2, char *word3,
 	if (plisql_IdentifierLookup != IDENTIFIER_LOOKUP_DECLARE)
 	{
 		/*
-		 * Do a lookup in the current namespace stack.  Must find a record
-		 * reference, else ignore.
+		 * Do a lookup in the current namespace stack.  
+		 * Must find a record reference, else ignore.
 		 */
 		ns = plisql_ns_lookup(plisql_ns_top(), false,
-							   paramname, word2, word3,
-							   &nnames);
+					   paramname, word2, word3,
+					   &nnames);
 		if (ns != NULL)
 		{
 			switch (ns->itemtype)
@@ -2255,13 +2274,13 @@ plisql_parse_tripword(char *paramname, char *word1, char *word2, char *word3,
 		else
 		{
 			/*
-			 * handle var come from package
-			 * it maybe is udt_type constructor func
-			 * so we should parse package entry
+			 * Handle variables coming from a package; this may be a UDT
+			 * constructor function (e.g., udt_type(...)), so parse the
+			 * corresponding package entry.
 			 */
-			PkgEntry *entry;
-			size_t len = strlen(word1) + strlen(word2) + strlen(word3) + 3;
-			char *refname = (char *) palloc0(len);
+			PkgEntry   *entry;
+			size_t		len = strlen(word1) + strlen(word2) + strlen(word3) + 3;
+			char	   *refname = (char *) palloc0(len);
 
 			snprintf(refname, len, "%s.%s.%s", word1, word2, word3);
 			idents = list_make3(makeString(word1),
@@ -2311,29 +2330,28 @@ PLiSQL_type *
 plisql_parse_wordtype(char *ident)
 {
 	PLiSQL_nsitem *nse;
-	List		*idents;
-	PLiSQL_type 	*dtype;
+	List	   *idents;
+	PLiSQL_type *dtype;
 
 	/*
 	 * Do a lookup in the current namespace stack
 	 */
 	nse = plisql_ns_lookup(plisql_ns_top(), false,
-							ident, NULL, NULL,
-							NULL);
+					ident, NULL, NULL,
+					NULL);
 
 	if (nse != NULL)
 	{
 		switch (nse->itemtype)
 		{
 			case PLISQL_NSTYPE_VAR:
+
 				/*
-				 * Set the not null attribute of variable with notnull attribute of dtype.
-				 * For example, name has a NOT NULL constraint, surname inherits the NOT NULL constraint.
-				 * DECLARE
-				 *   name     VARCHAR(25) NOT NULL := 'Smith';
-				 *   surname  name%TYPE;
-				 * BEGIN
-				 * END;
+				 * Set the not null attribute of variable with notnull
+				 * attribute of dtype. For example, name has a NOT NULL
+				 * constraint, surname inherits the NOT NULL constraint.
+				 * DECLARE name     VARCHAR(25) NOT NULL := 'Smith'; surname
+				 * name%TYPE; BEGIN END;
 				 */
 				dtype = ((PLiSQL_var *) (plisql_Datums[nse->itemno]))->datatype;
 				dtype->notnull = ((PLiSQL_var *) (plisql_Datums[nse->itemno]))->notnull;
@@ -2351,7 +2369,7 @@ plisql_parse_wordtype(char *ident)
 		{
 			idents = list_make2(makeString("standard"), makeString(ident));
 			if ((dtype = plisql_parse_package_type(makeTypeNameFromNameList(idents),
-					parse_by_var_type, true)) != NULL)
+												   parse_by_var_type, true)) != NULL)
 			{
 				list_free(idents);
 				return dtype;
@@ -2389,7 +2407,7 @@ plisql_parse_cwordtype(List *idents)
 	HeapTuple	typetup = NULL;
 	Form_pg_attribute attrStruct;
 	MemoryContext oldCxt;
-	TypeName	*typeName;
+	TypeName   *typeName;
 
 	/* Avoid memory leaks in the long-term function context */
 	oldCxt = MemoryContextSwitchTo(plisql_compile_tmp_cxt);
@@ -2400,23 +2418,20 @@ plisql_parse_cwordtype(List *idents)
 		 * Do a lookup in the current namespace stack
 		 */
 		nse = plisql_ns_lookup(plisql_ns_top(), false,
-								strVal(linitial(idents)),
-								strVal(lsecond(idents)),
-								NULL,
-								&nnames);
+						strVal(linitial(idents)),
+						strVal(lsecond(idents)),
+						NULL,
+						&nnames);
 
 		if (nse != NULL && nse->itemtype == PLISQL_NSTYPE_VAR)
 		{
 			dtype = ((PLiSQL_var *) (plisql_Datums[nse->itemno]))->datatype;
 
 			/*
-			 * Set the not null attribute of variable with not null attribute of dtype.
-			 * For example, name has a NOT NULL constraint, surname gets the NOT NULL constraint.
-			 * DECLARE
-			 *	 name	  VARCHAR(25) NOT NULL := 'Steven';
-			 *	 surname  name%TYPE;
-			 * BEGIN
-			 * END;
+			 * Set the not null attribute of variable with not null attribute
+			 * of dtype. For example, name has a NOT NULL constraint, surname
+			 * gets the NOT NULL constraint. DECLARE name	  VARCHAR(25) NOT
+			 * NULL := 'Steven'; surname  name%TYPE; BEGIN END;
 			 */
 			dtype->notnull = ((PLiSQL_var *) (plisql_Datums[nse->itemno]))->notnull;
 			goto done;
@@ -2431,7 +2446,7 @@ plisql_parse_cwordtype(List *idents)
 
 		/* maybe type comes from package */
 		if ((dtype = plisql_parse_package_type(makeTypeNameFromNameList(idents),
-				parse_by_var_type, false)) != NULL)
+											   parse_by_var_type, false)) != NULL)
 		{
 			goto done;
 		}
@@ -2440,8 +2455,8 @@ plisql_parse_cwordtype(List *idents)
 		 * First word could also be a table name
 		 */
 		relvar = makeRangeVar(NULL,
-							  strVal(linitial(idents)),
-							  -1);
+					  strVal(linitial(idents)),
+					  -1);
 		fldname = strVal(lsecond(idents));
 	}
 	else
@@ -2459,7 +2474,7 @@ plisql_parse_cwordtype(List *idents)
 		if (list_length(idents) == 3)
 		{
 			if ((dtype = plisql_parse_package_type(makeTypeNameFromNameList(idents),
-							parse_by_var_type, false)) != NULL)
+												   parse_by_var_type, false)) != NULL)
 			{
 				goto done;
 			}
@@ -2485,7 +2500,7 @@ plisql_parse_cwordtype(List *idents)
 	attrStruct = (Form_pg_attribute) GETSTRUCT(attrtup);
 
 	typetup = SearchSysCache1(TYPEOID,
-							  ObjectIdGetDatum(attrStruct->atttypid));
+					  ObjectIdGetDatum(attrStruct->atttypid));
 	if (!HeapTupleIsValid(typetup))
 		elog(ERROR, "cache lookup failed for type %u", attrStruct->atttypid);
 
@@ -2501,24 +2516,24 @@ plisql_parse_cwordtype(List *idents)
 	typeName->row_type = false;
 
 	dtype = build_datatype(typetup,
-						   attrStruct->atttypmod,
-						   attrStruct->attcollation,
-						   typeName);
+				   attrStruct->atttypmod,
+				   attrStruct->attcollation,
+				   typeName);
 
 	/*
-	 * declare a variable which datatype is table.column%TYPE
-	 * or schema.table.column%TYPE in a function, procedure or package.
-	 * record the table or view OID, and column number(or 0 if not used).
+	 * declare a variable which datatype is table.column%TYPE or
+	 * schema.table.column%TYPE in a function, procedure or package. record
+	 * the table or view OID, and column number(or 0 if not used).
 	 */
 	if (check_referenced_objects)
 	{
 		ObjectAddress *refobj;
 
-		refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+		refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 		refobj->classId = RelationRelationId;
 		refobj->objectId = classOid;
 		refobj->objectSubId = attrStruct->attnum;
-		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *)refobj);
+		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *) refobj);
 	}
 
 	MemoryContextSwitchTo(plisql_compile_tmp_cxt);
@@ -2543,18 +2558,18 @@ plisql_parse_wordrowtype(char *ident)
 {
 	Oid			classOid;
 	Oid			typOid;
-	PLiSQL_type	*result;
-	TypeName	*typname;
+	PLiSQL_type *result;
+	TypeName   *typname;
 	bool		missing_ok = false;
-	TypeName	*typeName;
+	TypeName   *typeName;
 
 	typname = typeStringToTypeName(ident, NULL);
 	if (list_length(typname->names) < 2 &&
 		!is_compile_standard_package())
 	{
 		/* may be a standard.type */
-		size_t len = 8 + strlen(ident) + 2;
-		char *refname = (char *) palloc0(len);
+		size_t		len = 8 + strlen(ident) + 2;
+		char	   *refname = (char *) palloc0(len);
 
 		snprintf(refname, len, "standard.%s", ident);
 		pfree(typname);
@@ -2564,7 +2579,8 @@ plisql_parse_wordrowtype(char *ident)
 	}
 	result = plisql_parse_package_type(typname, parse_by_var_rowtype, missing_ok);
 	if (result != NULL)
-	{	pfree(typname);
+	{
+		pfree(typname);
 		return result;
 	}
 	pfree(typname);
@@ -2591,19 +2607,19 @@ plisql_parse_wordrowtype(char *ident)
 						ident)));
 
 	/*
-	 * declare a variable which datatype is table%ROWTYPE
-	 * or schema.table%ROWTYPE in a function, procedure or package,
-	 * record the table or view OID.
+	 * declare a variable which datatype is table%ROWTYPE or
+	 * schema.table%ROWTYPE in a function, procedure or package, record the
+	 * table or view OID.
 	 */
 	if (check_referenced_objects)
 	{
 		ObjectAddress *refobj;
 
-		refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+		refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 		refobj->classId = RelationRelationId;
 		refobj->objectId = classOid;
 		refobj->objectSubId = InvalidAttrNumber;
-		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *)refobj);
+		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *) refobj);
 	}
 
 	typeName = makeTypeName(ident);
@@ -2612,7 +2628,7 @@ plisql_parse_wordrowtype(char *ident)
 
 	/* Build and return the row type struct */
 	return plisql_build_datatype(typOid, -1, InvalidOid,
-					  typeName);
+								 typeName);
 }
 
 /* ----------
@@ -2627,11 +2643,11 @@ plisql_parse_cwordrowtype(List *idents)
 	Oid			typOid;
 	RangeVar   *relvar;
 	MemoryContext oldCxt;
-	PLiSQL_type	*result;
-	TypeName	*typeName;
+	PLiSQL_type *result;
+	TypeName   *typeName;
 
 	result = plisql_parse_package_type(makeTypeNameFromNameList(idents),
-							parse_by_var_rowtype, false);
+									   parse_by_var_rowtype, false);
 	if (result != NULL)
 		return result;
 
@@ -2658,19 +2674,18 @@ plisql_parse_cwordrowtype(List *idents)
 	MemoryContextSwitchTo(oldCxt);
 
 	/*
-	 * declare a variable which datatype is schema.table%ROWTYPE
-	 * in a function, procedure or package,
-	 * record the table or view OID.
+	 * declare a variable which datatype is schema.table%ROWTYPE in a
+	 * function, procedure or package, record the table or view OID.
 	 */
 	if (check_referenced_objects)
 	{
 		ObjectAddress *refobj;
 
-		refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+		refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 		refobj->classId = RelationRelationId;
 		refobj->objectId = classOid;
 		refobj->objectSubId = InvalidAttrNumber;
-		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *)refobj);
+		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *) refobj);
 	}
 
 	typeName = makeTypeNameFromNameList(idents);
@@ -2679,7 +2694,7 @@ plisql_parse_cwordrowtype(List *idents)
 
 	/* Build and return the row type struct */
 	return plisql_build_datatype(typOid, -1, InvalidOid,
-					  typeName);
+								 typeName);
 }
 
 /*
@@ -2692,8 +2707,8 @@ plisql_parse_cwordrowtype(List *idents)
  * array, and optionally to the current namespace.
  */
 PLiSQL_variable *
-plisql_build_variable(const char *refname, int lineno, PLiSQL_type *dtype,
-					   bool add2namespace)
+plisql_build_variable(const char *refname, int lineno, PLiSQL_type * dtype,
+					  bool add2namespace)
 {
 	PLiSQL_variable *result;
 
@@ -2711,7 +2726,7 @@ plisql_build_variable(const char *refname, int lineno, PLiSQL_type *dtype,
 				var->datatype = dtype;
 				/* other fields are left as 0, might be changed by caller */
 
-				/* preset to NULL */
+				/* preset to be NULL */
 				var->value = 0;
 				var->isnull = true;
 				var->freeval = false;
@@ -2720,8 +2735,8 @@ plisql_build_variable(const char *refname, int lineno, PLiSQL_type *dtype,
 				plisql_adddatum((PLiSQL_datum *) var);
 				if (add2namespace)
 					plisql_ns_additem(PLISQL_NSTYPE_VAR,
-									   var->dno,
-									   refname);
+									  var->dno,
+									  refname);
 				result = (PLiSQL_variable *) var;
 				break;
 			}
@@ -2731,8 +2746,8 @@ plisql_build_variable(const char *refname, int lineno, PLiSQL_type *dtype,
 				PLiSQL_rec *rec;
 
 				rec = plisql_build_record(refname, lineno,
-										   dtype, dtype->typoid,
-										   add2namespace);
+							   dtype, dtype->typoid,
+							   add2namespace);
 				result = (PLiSQL_variable *) rec;
 				break;
 			}
@@ -2757,8 +2772,8 @@ plisql_build_variable(const char *refname, int lineno, PLiSQL_type *dtype,
  */
 PLiSQL_rec *
 plisql_build_record(const char *refname, int lineno,
-					 PLiSQL_type *dtype, Oid rectypeid,
-					 bool add2namespace)
+					PLiSQL_type * dtype, Oid rectypeid,
+					bool add2namespace)
 {
 	PLiSQL_rec *rec;
 
@@ -2776,12 +2791,13 @@ plisql_build_record(const char *refname, int lineno,
 		plisql_ns_additem(PLISQL_NSTYPE_REC, rec->dno, rec->refname);
 
 	rec->pkgoid = (plisql_compile_packageitem == NULL ? InvalidOid : plisql_compile_packageitem->source.fn_oid);
+
 	/*
 	 * there, if we compile package, and build a rec like table%rowtype
-	 * but others function or package first reference it first filed and then
+	 * but other function or package first reference it first filed and then
 	 * lookup it in package, but its doesn't find, because compile package
-	 * doesn't references it, should we add datum during exec?
-	 * this is not fine, so we add all recfiled in compile
+	 * doesn't references it, should we add datum during execution?
+	 * this is not good, so we add all recfiled in compile.
 	 * maybe it can expand out of package
 	 */
 	if (OidIsValid(rec->pkgoid))
@@ -2795,10 +2811,10 @@ plisql_build_record(const char *refname, int lineno,
  * Include a rowtupdesc, since we will need to materialize the row result.
  */
 PLiSQL_row *
-build_row_from_vars(PLiSQL_variable **vars, int numvars)
+build_row_from_vars(PLiSQL_variable * *vars, int numvars)
 {
 	PLiSQL_row *row;
-	int			i;
+	int	i;
 
 	row = palloc0(sizeof(PLiSQL_row));
 	row->dtype = PLISQL_DTYPE_ROW;
@@ -2859,10 +2875,10 @@ build_row_from_vars(PLiSQL_variable **vars, int numvars)
 /*
  * Build a RECFIELD datum for the named field of the specified record variable
  *
- * If there's already such a datum, just return it; we don't need duplicates.
+ * If there's already such a datum, just return it; we don't need duplicate one
  */
 PLiSQL_recfield *
-plisql_build_recfield(PLiSQL_rec *rec, const char *fldname)
+plisql_build_recfield(PLiSQL_rec * rec, const char *fldname)
 {
 	PLiSQL_recfield *recfield;
 	int			i;
@@ -2899,7 +2915,7 @@ plisql_build_recfield(PLiSQL_rec *rec, const char *fldname)
 
 /*
  * plisql_build_datatype
- *		Build PLiSQL_type struct given type OID, typmod, collation,
+ *		Build PLiSQL_type struct with given type OID, typmod, collation,
  *		and type's parsed name.
  *
  * If collation is not InvalidOid then it overrides the type's default
@@ -2911,7 +2927,7 @@ plisql_build_recfield(PLiSQL_rec *rec, const char *fldname)
  */
 PLiSQL_type *
 plisql_build_datatype(Oid typeOid, int32 typmod,
-					   Oid collation, TypeName *origtypname)
+					  Oid collation, TypeName *origtypname)
 {
 	HeapTuple	typeTup;
 	PLiSQL_type *typ;
@@ -3015,11 +3031,11 @@ build_datatype(HeapTuple typeTup, int32 typmod,
 		TypeCacheEntry *typentry;
 
 		typentry = lookup_type_cache(typ->typoid,
-									 TYPECACHE_TUPDESC |
-									 TYPECACHE_DOMAIN_BASE_INFO);
+						 TYPECACHE_TUPDESC |
+						 TYPECACHE_DOMAIN_BASE_INFO);
 		if (typentry->typtype == TYPTYPE_DOMAIN)
 			typentry = lookup_type_cache(typentry->domainBaseType,
-										 TYPECACHE_TUPDESC);
+							 TYPECACHE_TUPDESC);
 		if (typentry->tupDesc == NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -3038,10 +3054,11 @@ build_datatype(HeapTuple typeTup, int32 typmod,
 	}
 
 	/*
-	 * If it's a %TYPE or %ROWTYPE type, save the original type name in pctrowtypname.
+	 * If it's a %TYPE or %ROWTYPE type, save the original type name in
+	 * pctrowtypname.
 	 */
 	typ->notnull = false;
-	if (origtypname!= NULL &&
+	if (origtypname != NULL &&
 		(origtypname->pct_type || origtypname->row_type))
 		typ->pctrowtypname = origtypname;
 	else
@@ -3054,13 +3071,13 @@ build_datatype(HeapTuple typeTup, int32 typmod,
  * Build an array type for the element type specified as argument.
  */
 PLiSQL_type *
-plisql_build_datatype_arrayof(PLiSQL_type *dtype)
+plisql_build_datatype_arrayof(PLiSQL_type * dtype)
 {
 	Oid			array_typeid;
 
 	/*
-	 * If it's already an array type, use it as-is: Postgres doesn't do nested
-	 * arrays.
+	 * If it's already an array type, use it as-is: 
+	 * Postgres doesn't do nested arrays.
 	 */
 	if (dtype->typisarray)
 		return dtype;
@@ -3074,7 +3091,7 @@ plisql_build_datatype_arrayof(PLiSQL_type *dtype)
 
 	/* Note we inherit typmod and collation, if any, from the element type */
 	return plisql_build_datatype(array_typeid, dtype->atttypmod,
-								  dtype->collation, NULL);
+								 dtype->collation, NULL);
 }
 
 /*
@@ -3087,17 +3104,17 @@ plisql_build_datatype_arrayof(PLiSQL_type *dtype)
 int
 plisql_recognize_err_condition(const char *condname, bool allow_sqlstate)
 {
-	int			i;
+	int	i;
 
 	if (allow_sqlstate)
 	{
 		if (strlen(condname) == 5 &&
 			strspn(condname, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") == 5)
 			return MAKE_SQLSTATE(condname[0],
-								 condname[1],
-								 condname[2],
-								 condname[3],
-								 condname[4]);
+						 condname[1],
+						 condname[2],
+						 condname[3],
+						 condname[4]);
 	}
 
 	for (i = 0; exception_label_map[i].label != NULL; i++)
@@ -3117,19 +3134,18 @@ plisql_recognize_err_condition(const char *condname, bool allow_sqlstate)
  * plisql_parse_err_condition
  *		Generate PLiSQL_condition entry(s) for an exception condition name
  *
- * This has to be able to return a list because there are some duplicate
+ * This has to be able to return a list because there are some duplicated
  * names in the table of error code names.
  */
 PLiSQL_condition *
 plisql_parse_err_condition(char *condname)
 {
-	int			i;
+	int		i;
 	PLiSQL_condition *new;
 	PLiSQL_condition *prev;
 
 	/*
-	 * XXX Eventually we will want to look for user-defined exception names
-	 * here.
+	 * Eventually we will want to look for user-defined exception names here.
 	 */
 
 	if (strcmp(condname, "others") == 0)
@@ -3164,7 +3180,7 @@ plisql_parse_err_condition(char *condname)
 }
 
 /* ----------
- * plisql_start_datums			Initialize datum list at compile startup.
+ * plisql_start_datums			Initialize datum list at compiler startup.
  * ----------
  */
 void
@@ -3174,7 +3190,7 @@ plisql_start_datums(void)
 	plisql_nDatums = 0;
 	/* This is short-lived, so needn't allocate in function's cxt */
 	plisql_Datums = MemoryContextAlloc(plisql_compile_tmp_cxt,
-										sizeof(PLiSQL_datum *) * datums_alloc);
+						sizeof(PLiSQL_datum *) * datums_alloc);
 	/* datums_last tracks what's been seen by plisql_add_initdatums() */
 	datums_last = 0;
 }
@@ -3185,7 +3201,7 @@ plisql_start_datums(void)
  * ----------
  */
 void
-plisql_adddatum(PLiSQL_datum *newdatum)
+plisql_adddatum(PLiSQL_datum * newdatum)
 {
 	if (plisql_nDatums == datums_alloc)
 	{
@@ -3202,13 +3218,13 @@ plisql_adddatum(PLiSQL_datum *newdatum)
  * ----------
  */
 void
-plisql_finish_datums(PLiSQL_function *function)
+plisql_finish_datums(PLiSQL_function * function)
 {
 	Size		copiable_size = 0;
 	int			i;
 
 	/*
-	 * maybe compile a package body which function->ndatums not null
+	 * maybe compile a package body which function->ndatums is not null
 	 */
 	if (function->item != NULL)
 	{
@@ -3218,7 +3234,7 @@ plisql_finish_datums(PLiSQL_function *function)
 			return;
 		if (function->ndatums != 0)
 			function->datums = repalloc(function->datums,
-									sizeof(PLiSQL_datum *) * plisql_nDatums);
+								sizeof(PLiSQL_datum *) * plisql_nDatums);
 		else
 			function->datums = palloc(sizeof(PLiSQL_datum *) * plisql_nDatums);
 		function->ndatums = plisql_nDatums;
@@ -3250,6 +3266,43 @@ plisql_finish_datums(PLiSQL_function *function)
 }
 
 
+/*
+ * plisql_datum_belongs_to_subproc
+ *		Check if a datum index falls within any subproc's datum range.
+ *
+ * Subproc datums (parameters and local variables) should not be initialized
+ * by the parent block, as they have their own initialization logic.
+ * Each subproc's datum range is [lastassignvardno, lastoutvardno).
+ */
+static bool
+plisql_datum_belongs_to_subproc(int datum_idx)
+{
+	int		j;
+
+	for (j = 0; j < plisql_nsubprocFuncs; j++)
+	{
+		PLiSQL_subproc_function *subproc = plisql_subprocFuncs[j];
+
+		/*
+		 * Skip subprocs that don't have a function body yet (forward declarations).
+		 * Also skip if lastoutvardno is 0 (not yet set).
+		 */
+		if (subproc->function == NULL || subproc->lastoutvardno == 0)
+			continue;
+
+		/*
+		 * Check if datum_idx falls within [lastassignvardno, lastoutvardno).
+		 * lastassignvardno is set before building subproc args.
+		 * lastoutvardno is set after the subproc body is fully compiled.
+		 */
+		if (datum_idx >= subproc->lastassignvardno &&
+			datum_idx < subproc->lastoutvardno)
+			return true;
+	}
+
+	return false;
+}
+
 /* ----------
  * plisql_add_initdatums		Make an array of the datum numbers of
  *					all the initializable datums created since the last call
@@ -3276,6 +3329,19 @@ plisql_add_initdatums(int **varnos)
 	 */
 	for (i = datums_last; i < plisql_nDatums; i++)
 	{
+		/*
+		 * Skip datums that belong to subprocs. These datums (parameters and
+		 * local variables of nested functions/procedures) should not be
+		 * initialized by the parent block. They have their own initialization
+		 * logic within the subproc's execution context.
+		 *
+		 * This prevents crashes when a subproc's local variable has a default
+		 * expression that references the subproc's parameters, which don't
+		 * exist in the parent's execution context.
+		 */
+		if (plisql_datum_belongs_to_subproc(i))
+			continue;
+
 		switch (plisql_Datums[i]->dtype)
 		{
 			case PLISQL_DTYPE_VAR:
@@ -3297,6 +3363,10 @@ plisql_add_initdatums(int **varnos)
 			n = 0;
 			for (i = datums_last; i < plisql_nDatums; i++)
 			{
+				/* Skip subproc datums */
+				if (plisql_datum_belongs_to_subproc(i))
+					continue;
+
 				switch (plisql_Datums[i]->dtype)
 				{
 					case PLISQL_DTYPE_VAR:
@@ -3324,10 +3394,10 @@ plisql_add_initdatums(int **varnos)
  */
 static void
 compute_function_hashkey(FunctionCallInfo fcinfo,
-						 Form_pg_proc procStruct,
-						 PLiSQL_func_hashkey *hashkey,
-						 bool forValidator, 
-						 HeapTuple procTup) 
+			 Form_pg_proc procStruct,
+			 PLiSQL_func_hashkey *hashkey,
+			 bool forValidator, 
+			 HeapTuple procTup) 
 {
 	/* Make sure any unused bytes of the struct are zero */
 	MemSet(hashkey, 0, sizeof(PLiSQL_func_hashkey));
@@ -3347,7 +3417,7 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
 	 * leave trigOid zero; the hash entry built in this case will never be
 	 * used for any actual calls.
 	 *
-	 * We don't currently need to distinguish different event trigger usages
+	 * Currently We don't need to distinguish different event trigger usages
 	 * in the same way, since the special parameter variables don't vary in
 	 * type in that case.
 	 */
@@ -3364,21 +3434,21 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
 	if (procStruct->pronargs > 0)
 	{
 		/* get the argument types */
-		Datum protypenames;
-		bool	isNull;
+		Datum		protypenames;
+		bool		isNull;
 		Datum	   *elems;
-		int			nelems;
+		int	nelems;
 		char **argtypenames = NULL;
 		int i;
 
 		protypenames = SysCacheGetAttr(PROCOID, procTup,
-									Anum_pg_proc_protypenames,
-									&isNull);
+							Anum_pg_proc_protypenames,
+							&isNull);
 		if (!isNull)
 		{
 			deconstruct_array(DatumGetArrayTypeP(protypenames),
-								TEXTOID, -1, false, 'i',
-								&elems, NULL, &nelems);
+							  TEXTOID, -1, false, 'i',
+							  &elems, NULL, &nelems);
 			argtypenames = (char **) palloc(sizeof(char *) * nelems);
 			for (i = 0; i < nelems; i++)
 				argtypenames[i] = TextDatumGetCString(elems[i]);
@@ -3390,8 +3460,8 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
 				hashkey->argtypes[i] = procStruct->proargtypes.values[i];
 				if (strcmp(argtypenames[i], "") != 0)
 				{
-					TypeName	*tname;
-					PkgType *pkgtype;
+					TypeName   *tname;
+					PkgType    *pkgtype;
 
 					tname = (TypeName *) stringToNode(argtypenames[i]);
 
@@ -3424,15 +3494,15 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
 		}
 		else
 			memcpy(hashkey->argtypes, procStruct->proargtypes.values,
-				procStruct->pronargs * sizeof(Oid));
+				   procStruct->pronargs * sizeof(Oid));
 
 		/* resolve any polymorphic argument types */
 		plisql_resolve_polymorphic_argtypes(procStruct->pronargs,
-											 hashkey->argtypes,
-											 NULL,
-											 fcinfo->flinfo->fn_expr,
-											 forValidator,
-											 NameStr(procStruct->proname));
+							 hashkey->argtypes,
+							 NULL,
+							 fcinfo->flinfo->fn_expr,
+							 forValidator,
+							 NameStr(procStruct->proname));
 	}
 }
 
@@ -3450,19 +3520,19 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
  */
 void
 plisql_resolve_polymorphic_argtypes(int numargs,
-									 Oid *argtypes, char *argmodes,
-									 Node *call_expr, bool forValidator,
-									 const char *proname)
+					 Oid *argtypes, char *argmodes,
+					 Node *call_expr, bool forValidator,
+					 const char *proname)
 {
-	int			i;
+	int		i;
 
 	if (!forValidator)
 	{
-		int			inargno;
+		int		inargno;
 
 		/* normal case, pass to standard routine */
 		if (!resolve_polymorphic_argtypes(numargs, argtypes, argmodes,
-										  call_expr))
+						  call_expr))
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("could not determine actual argument "
@@ -3478,8 +3548,8 @@ plisql_resolve_polymorphic_argtypes(int numargs,
 				continue;
 			if (argtypes[i] == RECORDOID || argtypes[i] == RECORDARRAYOID)
 			{
-				Oid			resolvedtype = get_call_expr_argtype(call_expr,
-																 inargno);
+				Oid	resolvedtype = get_call_expr_argtype(call_expr,
+										 inargno);
 
 				if (OidIsValid(resolvedtype))
 					argtypes[i] = resolvedtype;
@@ -3496,7 +3566,7 @@ plisql_resolve_polymorphic_argtypes(int numargs,
 			{
 				case ANYELEMENTOID:
 				case ANYNONARRAYOID:
-				case ANYENUMOID:	/* XXX dubious */
+				case ANYENUMOID:	/* dubious */
 				case ANYCOMPATIBLEOID:
 				case ANYCOMPATIBLENONARRAYOID:
 					argtypes[i] = INT4OID;
@@ -3534,7 +3604,7 @@ plisql_resolve_polymorphic_argtypes(int numargs,
  * twice.
  */
 void
-delete_function(PLiSQL_function *func)
+delete_function(PLiSQL_function * func)
 {
 	/* remove function from hash table (might be done already) */
 	plisql_HashTableDelete(func);
@@ -3556,20 +3626,20 @@ plisql_HashTableInit(void)
 	ctl.keysize = sizeof(PLiSQL_func_hashkey);
 	ctl.entrysize = sizeof(plisql_HashEnt);
 	plisql_HashTable = hash_create("PLiSQL function hash",
-									FUNCS_PER_USER,
-									&ctl,
-									HASH_ELEM | HASH_BLOBS);
+					FUNCS_PER_USER,
+					&ctl,
+					HASH_ELEM | HASH_BLOBS);
 }
 
 static PLiSQL_function *
-plisql_HashTableLookup(PLiSQL_func_hashkey *func_key)
+plisql_HashTableLookup(PLiSQL_func_hashkey * func_key)
 {
 	plisql_HashEnt *hentry;
 
 	hentry = (plisql_HashEnt *) hash_search(plisql_HashTable,
-											 func_key,
-											 HASH_FIND,
-											 NULL);
+						 func_key,
+						 HASH_FIND,
+						 NULL);
 	if (hentry)
 		return hentry->function;
 	else
@@ -3577,16 +3647,16 @@ plisql_HashTableLookup(PLiSQL_func_hashkey *func_key)
 }
 
 static void
-plisql_HashTableInsert(PLiSQL_function *function,
-						PLiSQL_func_hashkey *func_key)
+plisql_HashTableInsert(PLiSQL_function * function,
+					   PLiSQL_func_hashkey * func_key)
 {
 	plisql_HashEnt *hentry;
 	bool		found;
 
 	hentry = (plisql_HashEnt *) hash_search(plisql_HashTable,
-											 func_key,
-											 HASH_ENTER,
-											 &found);
+						 func_key,
+						 HASH_ENTER,
+						 &found);
 	if (found)
 		elog(WARNING, "trying to insert a function that already exists");
 
@@ -3596,7 +3666,7 @@ plisql_HashTableInsert(PLiSQL_function *function,
 }
 
 static void
-plisql_HashTableDelete(PLiSQL_function *function)
+plisql_HashTableDelete(PLiSQL_function * function)
 {
 	plisql_HashEnt *hentry;
 
@@ -3605,9 +3675,9 @@ plisql_HashTableDelete(PLiSQL_function *function)
 		return;
 
 	hentry = (plisql_HashEnt *) hash_search(plisql_HashTable,
-											 function->fn_hashkey,
-											 HASH_REMOVE,
-											 NULL);
+						 function->fn_hashkey,
+						 HASH_REMOVE,
+						 NULL);
 	if (hentry == NULL)
 		elog(WARNING, "trying to delete function that does not exist");
 
@@ -3616,19 +3686,19 @@ plisql_HashTableDelete(PLiSQL_function *function)
 }
 
 /* ----------
- * plisql_compile_inline_internal	
+ * plisql_compile_inline_internal
  * Only compile the function, but not store the compiled function.
  * ----------
  */
 void
 plisql_compile_inline_internal(char *proc_source)
 {
-	yyscan_t        scanner;
-	char   *func_name = "inline_code_block";
+	yyscan_t	scanner;
+	char	   *func_name = "inline_code_block";
 	PLiSQL_function *function;
 	struct compile_error_callback_arg cbarg;
 	ErrorContextCallback plerrcontext;
-	int	parse_rc;
+	int			parse_rc;
 	MemoryContext func_cxt;
 
 	/*
@@ -3657,12 +3727,12 @@ plisql_compile_inline_internal(char *proc_source)
 	plisql_curr_compile = function;
 
 	/*
-	 * Store all the rest of the compile-time storage (e.g. parse tree) in
-	 * its own memory context, so it can be reclaimed easily.
+	 * Store all the rest of the compile-time storage (e.g. parse tree) in its
+	 * own memory context, so it can be reclaimed easily.
 	 */
 	func_cxt = AllocSetContextCreate(CurrentMemoryContext,
-					 "PL/iSQL inline code context",
-					 ALLOCSET_DEFAULT_SIZES);
+									 "PL/iSQL inline code context",
+									 ALLOCSET_DEFAULT_SIZES);
 
 	plisql_compile_tmp_cxt = MemoryContextSwitchTo(func_cxt);
 
@@ -3704,7 +3774,7 @@ plisql_compile_inline_internal(char *proc_source)
 	function->fn_rettyplen = sizeof(int32);
 
 	/*
-	 * Remember if function is readonly.  
+	 * Remember if function is readonly.
 	 */
 	function->fn_readonly = false;
 
@@ -3714,7 +3784,7 @@ plisql_compile_inline_internal(char *proc_source)
 	function->fn_nargs = 0;
 
 	/*
-	 * If we only parse a anonymous, set the prokind to 
+	 * If we only parse an anonymous block, set the prokind to 
 	 * PROKIND_ANONYMOUS_BLOCK_ONLY_PARSE,
 	 */
 	function->fn_prokind = PROKIND_ANONYMOUS_BLOCK_ONLY_PARSE;
@@ -3757,7 +3827,7 @@ plisql_compile_inline_internal(char *proc_source)
 }
 
 /*
- * dynamic_build_func_vars  
+ * dynamic_build_func_vars
  * Build the variables dynamiclly.
  * If find a ORAPARAM token, and the function is PROKIND_ANONYMOUS_BLOCK_ONLY_PARSE,
  * Build the variables dynamiclly.
@@ -3770,23 +3840,23 @@ plisql_compile_inline_internal(char *proc_source)
  * end;');
  */
 void
-dynamic_build_func_vars(PLiSQL_function **function)
+dynamic_build_func_vars(PLiSQL_function * *function)
 {
 	char		buf[32];
-	Oid 		argtypeid = INT4OID;
+	Oid			argtypeid = INT4OID;
 	PLiSQL_type *argdtype;
 	PLiSQL_variable *argvariable;
-	int 		argitemtype;
-	int		fn_nargs = (*function)->fn_nargs;
+	int			argitemtype;
+	int			fn_nargs = (*function)->fn_nargs;
 
 	/* Create $n name for variable */
 	snprintf(buf, sizeof(buf), "$%d", fn_nargs + 1);
 
 	/* Create datatype info */
 	argdtype = plisql_build_datatype(argtypeid,
-						-1,
-						(*function)->fn_input_collation,
-						NULL);
+									 -1,
+									 (*function)->fn_input_collation,
+									 NULL);
 
 	/* Build variable and add to datum list */
 	argvariable = plisql_build_variable(buf, 0, argdtype, false);
@@ -3808,10 +3878,11 @@ void
 plisql_free_function(Oid funcOid)
 {
 	HeapTuple	procTup;
-	Form_pg_proc 	proc;
+	Form_pg_proc proc;
 	PLiSQL_function *function;
 	PLiSQL_func_hashkey hashkey;
 	char		functyptype;
+
 	LOCAL_FCINFO(fake_fcinfo, 0);
 	FmgrInfo	flinfo;
 	TriggerData trigdata;
@@ -3843,9 +3914,9 @@ plisql_free_function(Oid funcOid)
 				 proc->prorettype != VOIDOID &&
 				 !IsPolymorphicType(proc->prorettype))
 			ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("PL/iSQL functions cannot return type %s",
-					format_type_be(proc->prorettype))));
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("PL/iSQL functions cannot return type %s",
+							format_type_be(proc->prorettype))));
 	}
 
 	/*
@@ -3880,8 +3951,9 @@ plisql_free_function(Oid funcOid)
 
 	if (function)
 	{
-		/* We have a compiled function, and it is still valid, 
-		 * remove the function from hashtable 
+		/*
+		 * We have a compiled function, and it is still valid, remove the
+		 * function from hashtable
 		 */
 		if (function->fn_xmin == HeapTupleHeaderGetRawXmin(procTup->t_data) &&
 			ItemPointerEquals(&function->fn_tid, &procTup->t_self))
@@ -3901,7 +3973,7 @@ plisql_free_function(Oid funcOid)
 static void
 plisql_add_type_referenced_objects(TypeName *typeName)
 {
-	PkgType *pkgtype;
+	PkgType    *pkgtype;
 
 	pkgtype = LookupPkgTypeByTypename(typeName->names, false);
 
@@ -3909,7 +3981,7 @@ plisql_add_type_referenced_objects(TypeName *typeName)
 	{
 		ObjectAddress *refobj;
 
-		refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+		refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 		refobj->classId = PackageRelationId;
 		refobj->objectId = pkgtype->pkgoid;
 		refobj->objectSubId = InvalidAttrNumber;
@@ -3923,48 +3995,48 @@ plisql_add_type_referenced_objects(TypeName *typeName)
 		/* Handle %TYPE that reference to the type of an existing field */
 		RangeVar   *rel = makeRangeVar(NULL, NULL, typeName->location);
 		char	   *field = NULL;
-		Oid 		relid;
+		Oid			relid;
 		AttrNumber	attnum;
-		ObjectAddress 	*refobj;
+		ObjectAddress *refobj;
 
 		/* deconstruct the name list */
 		switch (list_length(typeName->names))
 		{
-		case 1:
-			ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("improper %%TYPE reference (too few dotted names): %s",
-					NameListToString(typeName->names))));
-			break;
-		case 2:
-			rel->relname = strVal(linitial(typeName->names));
-			field = strVal(lsecond(typeName->names));
-			break;
-		case 3:
-			rel->schemaname = strVal(linitial(typeName->names));
-			rel->relname = strVal(lsecond(typeName->names));
-			field = strVal(lthird(typeName->names));
-			break;
-		case 4:
-			rel->catalogname = strVal(linitial(typeName->names));
-			rel->schemaname = strVal(lsecond(typeName->names));
-			rel->relname = strVal(lthird(typeName->names));
-			field = strVal(lfourth(typeName->names));
-			break;
-		default:
-			ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("improper %%TYPE reference (too many dotted names): %s",
-					NameListToString(typeName->names))));
-			break;
+			case 1:
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("improper %%TYPE reference (too few dotted names): %s",
+								NameListToString(typeName->names))));
+				break;
+			case 2:
+				rel->relname = strVal(linitial(typeName->names));
+				field = strVal(lsecond(typeName->names));
+				break;
+			case 3:
+				rel->schemaname = strVal(linitial(typeName->names));
+				rel->relname = strVal(lsecond(typeName->names));
+				field = strVal(lthird(typeName->names));
+				break;
+			case 4:
+				rel->catalogname = strVal(linitial(typeName->names));
+				rel->schemaname = strVal(lsecond(typeName->names));
+				rel->relname = strVal(lthird(typeName->names));
+				field = strVal(lfourth(typeName->names));
+				break;
+			default:
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("improper %%TYPE reference (too many dotted names): %s",
+								NameListToString(typeName->names))));
+				break;
 		}
 
 		/*
 		 * Look up the field.
 		 *
 		 * As no lock is taken here, this might fail in the presence of
-		 * concurrent DDL. But taking a lock would carry a performance
-		 * penalty and would also require a permissions check.
+		 * concurrent DDL. But taking a lock would carry a performance penalty
+		 * and would also require a permissions check.
 		 */
 		relid = RangeVarGetRelid(rel, NoLock, false);
 		attnum = get_attnum(relid, field);
@@ -3972,23 +4044,23 @@ plisql_add_type_referenced_objects(TypeName *typeName)
 		if (attnum == InvalidAttrNumber)
 		{
 			ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-					field, rel->relname)));
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column \"%s\" of relation \"%s\" does not exist",
+							field, rel->relname)));
 		}
 
-		refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+		refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 		refobj->classId = RelationRelationId;
 		refobj->objectId = relid;
 		refobj->objectSubId = attnum;
-		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *)refobj);
+		plisql_referenced_objects = lappend(plisql_referenced_objects, (void *) refobj);
 	}
 	else if (typeName != NULL && typeName->row_type)
 	{
-		char		*schema_name = NULL;
-		char		*relname = NULL;
-		RangeVar   	*rel;
-		Oid 		relid;
+		char	   *schema_name = NULL;
+		char	   *relname = NULL;
+		RangeVar   *rel;
+		Oid			relid;
 
 		DeconstructQualifiedName(typeName->names, &schema_name, &relname);
 		rel = makeRangeVar(schema_name, relname, typeName->location);
@@ -3998,14 +4070,13 @@ plisql_add_type_referenced_objects(TypeName *typeName)
 		{
 			ObjectAddress *refobj;
 
-			refobj = (ObjectAddress *)palloc(sizeof(ObjectAddress));
+			refobj = (ObjectAddress *) palloc(sizeof(ObjectAddress));
 			refobj->classId = RelationRelationId;
 			refobj->objectId = relid;
 			refobj->objectSubId = InvalidAttrNumber;
-			plisql_referenced_objects = lappend(plisql_referenced_objects, (void *)refobj);
+			plisql_referenced_objects = lappend(plisql_referenced_objects, (void *) refobj);
 		}
 	}
 
 	pfree(typeName);
 }
-
diff --git a/src/pl/plisql/src/pl_exec.c b/src/pl/plisql/src/pl_exec.c
index def79919438..b8d6ca95d05 100644
--- a/src/pl/plisql/src/pl_exec.c
+++ b/src/pl/plisql/src/pl_exec.c
@@ -3,7 +3,7 @@
  * pl_exec.c		- Executor for the PL/iSQL
  *			  procedural language
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -168,24 +168,24 @@ typedef struct					/* lookup key for cast info */
 	Oid			dsttype;		/* destination type for cast */
 	int32		srctypmod;		/* source typmod for cast */
 	int32		dsttypmod;		/* destination typmod for cast */
-} plisql_CastHashKey;
+}			plisql_CastHashKey;
 
 typedef struct					/* cast_expr_hash table entry */
 {
-	plisql_CastHashKey key;	/* hash key --- MUST BE FIRST */
+	plisql_CastHashKey key;		/* hash key --- MUST BE FIRST */
 	Expr	   *cast_expr;		/* cast expression, or NULL if no-op cast */
 	CachedExpression *cast_cexpr;	/* cached expression backing the above */
-} plisql_CastExprHashEntry;
+}			plisql_CastExprHashEntry;
 
 typedef struct					/* cast_hash table entry */
 {
-	plisql_CastHashKey key;	/* hash key --- MUST BE FIRST */
-	plisql_CastExprHashEntry *cast_centry; /* link to matching expr entry */
+	plisql_CastHashKey key;		/* hash key --- MUST BE FIRST */
+	plisql_CastExprHashEntry *cast_centry;	/* link to matching expr entry */
 	/* ExprState is valid only when cast_lxid matches current LXID */
 	ExprState  *cast_exprstate; /* expression's eval tree */
 	bool		cast_in_use;	/* true while we're executing eval tree */
 	LocalTransactionId cast_lxid;
-} plisql_CastHashEntry;
+}			plisql_CastHashEntry;
 
 static HTAB *cast_expr_hash = NULL;
 static HTAB *shared_cast_hash = NULL;
@@ -276,213 +276,213 @@ typedef struct count_param_references_context
 /************************************************************
  * Local function forward declarations
  ************************************************************/
-static void coerce_function_result_tuple(PLiSQL_execstate *estate,
+static void coerce_function_result_tuple(PLiSQL_execstate * estate,
 										 TupleDesc tupdesc);
 static void plisql_exec_error_callback(void *arg);
-static void copy_plisql_datums(PLiSQL_execstate *estate,
-								PLiSQL_function *func);
-static void plisql_fulfill_promise(PLiSQL_execstate *estate,
-									PLiSQL_var *var);
-static MemoryContext get_stmt_mcontext(PLiSQL_execstate *estate);
-static void push_stmt_mcontext(PLiSQL_execstate *estate);
-static void pop_stmt_mcontext(PLiSQL_execstate *estate);
-
-static int	exec_toplevel_block(PLiSQL_execstate *estate,
-								PLiSQL_stmt_block *block);
-static int exec_stmt_block(PLiSQL_execstate *estate,
-				PLiSQL_stmt_block *block);
-static int exec_stmts(PLiSQL_execstate *estate,
+static void copy_plisql_datums(PLiSQL_execstate * estate,
+							   PLiSQL_function * func);
+static void plisql_fulfill_promise(PLiSQL_execstate * estate,
+								   PLiSQL_var * var);
+static MemoryContext get_stmt_mcontext(PLiSQL_execstate * estate);
+static void push_stmt_mcontext(PLiSQL_execstate * estate);
+static void pop_stmt_mcontext(PLiSQL_execstate * estate);
+
+static int	exec_toplevel_block(PLiSQL_execstate * estate,
+								PLiSQL_stmt_block * block);
+static int	exec_stmt_block(PLiSQL_execstate * estate,
+							PLiSQL_stmt_block * block);
+static int	exec_stmts(PLiSQL_execstate * estate,
 					   List *stmts);
-static int exec_stmt_assign(PLiSQL_execstate *estate,
-				 PLiSQL_stmt_assign *stmt);
-static int exec_stmt_perform(PLiSQL_execstate *estate,
-				  PLiSQL_stmt_perform *stmt);
-static int exec_stmt_call(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_call *stmt);
-static int exec_stmt_getdiag(PLiSQL_execstate *estate,
-				  PLiSQL_stmt_getdiag *stmt);
-static int exec_stmt_if(PLiSQL_execstate *estate,
-			 PLiSQL_stmt_if *stmt);
-static int exec_stmt_case(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_case *stmt);
-static int exec_stmt_loop(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_loop *stmt);
-static int exec_stmt_while(PLiSQL_execstate *estate,
-				PLiSQL_stmt_while *stmt);
-static int exec_stmt_fori(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_fori *stmt);
-static int exec_stmt_fors(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_fors *stmt);
-static int exec_stmt_forc(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_forc *stmt);
-static int exec_stmt_foreach_a(PLiSQL_execstate *estate,
-					PLiSQL_stmt_foreach_a *stmt);
-static int exec_stmt_open(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_open *stmt);
-static int exec_stmt_fetch(PLiSQL_execstate *estate,
-				PLiSQL_stmt_fetch *stmt);
-static int exec_stmt_close(PLiSQL_execstate *estate,
-				PLiSQL_stmt_close *stmt);
-static int exec_stmt_exit(PLiSQL_execstate *estate,
-			   PLiSQL_stmt_exit *stmt);
-static int exec_stmt_return(PLiSQL_execstate *estate,
-				 PLiSQL_stmt_return *stmt);
-static int exec_stmt_return_next(PLiSQL_execstate *estate,
-					  PLiSQL_stmt_return_next *stmt);
-static int exec_stmt_return_query(PLiSQL_execstate *estate,
-					   PLiSQL_stmt_return_query *stmt);
-static int exec_stmt_raise(PLiSQL_execstate *estate,
-				PLiSQL_stmt_raise *stmt);
-static int exec_stmt_assert(PLiSQL_execstate *estate,
-				 PLiSQL_stmt_assert *stmt);
-static int exec_stmt_execsql(PLiSQL_execstate *estate,
-				  PLiSQL_stmt_execsql *stmt);
-static int exec_stmt_dynexecute(PLiSQL_execstate *estate,
-					 PLiSQL_stmt_dynexecute *stmt);
-static int exec_stmt_dynfors(PLiSQL_execstate *estate,
-				  PLiSQL_stmt_dynfors *stmt);
-static int exec_stmt_commit(PLiSQL_execstate *estate,
-				 PLiSQL_stmt_commit *stmt);
-static int exec_stmt_rollback(PLiSQL_execstate *estate,
-				   PLiSQL_stmt_rollback *stmt);
-
-static void plisql_estate_setup(PLiSQL_execstate *estate,
-								 PLiSQL_function *func,
-								 ReturnSetInfo *rsi,
-								 EState *simple_eval_estate,
-								 ResourceOwner simple_eval_resowner);
-static void exec_eval_cleanup(PLiSQL_execstate *estate);
-
-static void exec_prepare_plan(PLiSQL_execstate *estate,
-							  PLiSQL_expr *expr, int cursorOptions);
-static void exec_simple_check_plan(PLiSQL_execstate *estate, PLiSQL_expr *expr);
-static void exec_save_simple_expr(PLiSQL_expr *expr, CachedPlan *cplan);
-static void exec_check_rw_parameter(PLiSQL_expr *expr, int paramid);
+static int	exec_stmt_assign(PLiSQL_execstate * estate,
+							 PLiSQL_stmt_assign * stmt);
+static int	exec_stmt_perform(PLiSQL_execstate * estate,
+							  PLiSQL_stmt_perform * stmt);
+static int	exec_stmt_call(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_call * stmt);
+static int	exec_stmt_getdiag(PLiSQL_execstate * estate,
+							  PLiSQL_stmt_getdiag * stmt);
+static int	exec_stmt_if(PLiSQL_execstate * estate,
+						 PLiSQL_stmt_if * stmt);
+static int	exec_stmt_case(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_case * stmt);
+static int	exec_stmt_loop(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_loop * stmt);
+static int	exec_stmt_while(PLiSQL_execstate * estate,
+							PLiSQL_stmt_while * stmt);
+static int	exec_stmt_fori(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_fori * stmt);
+static int	exec_stmt_fors(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_fors * stmt);
+static int	exec_stmt_forc(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_forc * stmt);
+static int	exec_stmt_foreach_a(PLiSQL_execstate * estate,
+								PLiSQL_stmt_foreach_a * stmt);
+static int	exec_stmt_open(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_open * stmt);
+static int	exec_stmt_fetch(PLiSQL_execstate * estate,
+							PLiSQL_stmt_fetch * stmt);
+static int	exec_stmt_close(PLiSQL_execstate * estate,
+							PLiSQL_stmt_close * stmt);
+static int	exec_stmt_exit(PLiSQL_execstate * estate,
+						   PLiSQL_stmt_exit * stmt);
+static int	exec_stmt_return(PLiSQL_execstate * estate,
+							 PLiSQL_stmt_return * stmt);
+static int	exec_stmt_return_next(PLiSQL_execstate * estate,
+								  PLiSQL_stmt_return_next * stmt);
+static int	exec_stmt_return_query(PLiSQL_execstate * estate,
+								   PLiSQL_stmt_return_query * stmt);
+static int	exec_stmt_raise(PLiSQL_execstate * estate,
+							PLiSQL_stmt_raise * stmt);
+static int	exec_stmt_assert(PLiSQL_execstate * estate,
+							 PLiSQL_stmt_assert * stmt);
+static int	exec_stmt_execsql(PLiSQL_execstate * estate,
+							  PLiSQL_stmt_execsql * stmt);
+static int	exec_stmt_dynexecute(PLiSQL_execstate * estate,
+								 PLiSQL_stmt_dynexecute * stmt);
+static int	exec_stmt_dynfors(PLiSQL_execstate * estate,
+							  PLiSQL_stmt_dynfors * stmt);
+static int	exec_stmt_commit(PLiSQL_execstate * estate,
+							 PLiSQL_stmt_commit * stmt);
+static int	exec_stmt_rollback(PLiSQL_execstate * estate,
+							   PLiSQL_stmt_rollback * stmt);
+
+static void plisql_estate_setup(PLiSQL_execstate * estate,
+								PLiSQL_function * func,
+								ReturnSetInfo *rsi,
+								EState *simple_eval_estate,
+								ResourceOwner simple_eval_resowner);
+static void exec_eval_cleanup(PLiSQL_execstate * estate);
+
+static void exec_prepare_plan(PLiSQL_execstate * estate,
+							  PLiSQL_expr * expr, int cursorOptions);
+static void exec_simple_check_plan(PLiSQL_execstate * estate, PLiSQL_expr * expr);
+static void exec_save_simple_expr(PLiSQL_expr * expr, CachedPlan *cplan);
+static void exec_check_rw_parameter(PLiSQL_expr * expr, int paramid);
 static bool count_param_references(Node *node,
 								   count_param_references_context *context);
-static void exec_check_assignable(PLiSQL_execstate *estate, int dno);
-static bool exec_eval_simple_expr(PLiSQL_execstate *estate,
-								  PLiSQL_expr *expr,
+static void exec_check_assignable(PLiSQL_execstate * estate, int dno);
+static bool exec_eval_simple_expr(PLiSQL_execstate * estate,
+								  PLiSQL_expr * expr,
 								  Datum *result,
 								  bool *isNull,
 								  Oid *rettype,
 								  int32 *rettypmod);
 
-static void exec_assign_expr(PLiSQL_execstate *estate,
-							 PLiSQL_datum *target,
-							 PLiSQL_expr *expr);
-static void exec_assign_c_string(PLiSQL_execstate *estate,
-								 PLiSQL_datum *target,
+static void exec_assign_expr(PLiSQL_execstate * estate,
+							 PLiSQL_datum * target,
+							 PLiSQL_expr * expr);
+static void exec_assign_c_string(PLiSQL_execstate * estate,
+								 PLiSQL_datum * target,
 								 const char *str);
-static void exec_assign_value(PLiSQL_execstate *estate,
-							  PLiSQL_datum *target,
+static void exec_assign_value(PLiSQL_execstate * estate,
+							  PLiSQL_datum * target,
 							  Datum value, bool isNull,
 							  Oid valtype, int32 valtypmod);
-static void exec_eval_datum(PLiSQL_execstate *estate,
-							PLiSQL_datum *datum,
+static void exec_eval_datum(PLiSQL_execstate * estate,
+							PLiSQL_datum * datum,
 							Oid *typeid,
 							int32 *typetypmod,
 							Datum *value,
 							bool *isnull);
-static int	exec_eval_integer(PLiSQL_execstate *estate,
-							  PLiSQL_expr *expr,
+static int	exec_eval_integer(PLiSQL_execstate * estate,
+							  PLiSQL_expr * expr,
 							  bool *isNull);
-static bool exec_eval_boolean(PLiSQL_execstate *estate,
-							  PLiSQL_expr *expr,
+static bool exec_eval_boolean(PLiSQL_execstate * estate,
+							  PLiSQL_expr * expr,
 							  bool *isNull);
-static Datum exec_eval_expr(PLiSQL_execstate *estate,
-							PLiSQL_expr *expr,
+static Datum exec_eval_expr(PLiSQL_execstate * estate,
+							PLiSQL_expr * expr,
 							bool *isNull,
 							Oid *rettype,
 							int32 *rettypmod);
-static int	exec_run_select(PLiSQL_execstate *estate,
-							PLiSQL_expr *expr, long maxtuples, Portal *portalP);
-static int	exec_for_query(PLiSQL_execstate *estate, PLiSQL_stmt_forq *stmt,
+static int	exec_run_select(PLiSQL_execstate * estate,
+							PLiSQL_expr * expr, long maxtuples, Portal *portalP);
+static int	exec_for_query(PLiSQL_execstate * estate, PLiSQL_stmt_forq * stmt,
 						   Portal portal, bool prefetch_ok);
-static ParamListInfo setup_param_list(PLiSQL_execstate *estate,
-									  PLiSQL_expr *expr);
+static ParamListInfo setup_param_list(PLiSQL_execstate * estate,
+									  PLiSQL_expr * expr);
 static ParamExternData *plisql_param_fetch(ParamListInfo params,
-											int paramid, bool speculative,
-											ParamExternData *prm);
+										   int paramid, bool speculative,
+										   ParamExternData *prm);
 static void plisql_param_compile(ParamListInfo params, Param *param,
-								  ExprState *state,
-								  Datum *resv, bool *resnull);
+								 ExprState *state,
+								 Datum *resv, bool *resnull);
 static void plisql_param_eval_var_check(ExprState *state, ExprEvalStep *op,
-										 ExprContext *econtext);
+										ExprContext *econtext);
 static void plisql_param_eval_var_transfer(ExprState *state, ExprEvalStep *op,
-											ExprContext *econtext);
+										   ExprContext *econtext);
 static void plisql_param_eval_var(ExprState *state, ExprEvalStep *op,
-								   ExprContext *econtext);
+								  ExprContext *econtext);
 static void plisql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
-									  ExprContext *econtext);
+									 ExprContext *econtext);
 static void plisql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
-										ExprContext *econtext);
-static void plisql_param_eval_generic(ExprState *state, ExprEvalStep *op,
 									   ExprContext *econtext);
+static void plisql_param_eval_generic(ExprState *state, ExprEvalStep *op,
+									  ExprContext *econtext);
 static void plisql_param_eval_generic_ro(ExprState *state, ExprEvalStep *op,
-										  ExprContext *econtext);
-static void exec_move_row(PLiSQL_execstate *estate,
-						  PLiSQL_variable *target,
+										 ExprContext *econtext);
+static void exec_move_row(PLiSQL_execstate * estate,
+						  PLiSQL_variable * target,
 						  HeapTuple tup, TupleDesc tupdesc);
-static void revalidate_rectypeid(PLiSQL_rec *rec);
-static ExpandedRecordHeader *make_expanded_record_for_rec(PLiSQL_execstate *estate,
-														  PLiSQL_rec *rec,
+static void revalidate_rectypeid(PLiSQL_rec * rec);
+static ExpandedRecordHeader *make_expanded_record_for_rec(PLiSQL_execstate * estate,
+														  PLiSQL_rec * rec,
 														  TupleDesc srctupdesc,
 														  ExpandedRecordHeader *srcerh);
-static void exec_move_row_from_fields(PLiSQL_execstate *estate,
-									  PLiSQL_variable *target,
+static void exec_move_row_from_fields(PLiSQL_execstate * estate,
+									  PLiSQL_variable * target,
 									  ExpandedRecordHeader *newerh,
 									  Datum *values, bool *nulls,
 									  TupleDesc tupdesc);
 static bool compatible_tupdescs(TupleDesc src_tupdesc, TupleDesc dst_tupdesc);
-static HeapTuple make_tuple_from_row(PLiSQL_execstate *estate,
-									 PLiSQL_row *row,
+static HeapTuple make_tuple_from_row(PLiSQL_execstate * estate,
+									 PLiSQL_row * row,
 									 TupleDesc tupdesc);
 static TupleDesc deconstruct_composite_datum(Datum value,
 											 HeapTupleData *tmptup);
-static void exec_move_row_from_datum(PLiSQL_execstate *estate,
-									 PLiSQL_variable *target,
+static void exec_move_row_from_datum(PLiSQL_execstate * estate,
+									 PLiSQL_variable * target,
 									 Datum value);
-static void instantiate_empty_record_variable(PLiSQL_execstate *estate,
-											  PLiSQL_rec *rec);
-static char *convert_value_to_string(PLiSQL_execstate *estate,
+static void instantiate_empty_record_variable(PLiSQL_execstate * estate,
+											  PLiSQL_rec * rec);
+static char *convert_value_to_string(PLiSQL_execstate * estate,
 									 Datum value, Oid valtype);
-static inline Datum exec_cast_value(PLiSQL_execstate *estate,
+static inline Datum exec_cast_value(PLiSQL_execstate * estate,
 									Datum value, bool *isnull,
 									Oid valtype, int32 valtypmod,
 									Oid reqtype, int32 reqtypmod);
-static Datum do_cast_value(PLiSQL_execstate *estate,
+static Datum do_cast_value(PLiSQL_execstate * estate,
 						   Datum value, bool *isnull,
 						   Oid valtype, int32 valtypmod,
 						   Oid reqtype, int32 reqtypmod);
-static plisql_CastHashEntry *get_cast_hashentry(PLiSQL_execstate *estate,
+static plisql_CastHashEntry * get_cast_hashentry(PLiSQL_execstate * estate,
 												 Oid srctype, int32 srctypmod,
 												 Oid dsttype, int32 dsttypmod);
-static void exec_init_tuple_store(PLiSQL_execstate *estate);
-static void exec_set_found(PLiSQL_execstate *estate, bool state);
-static void plisql_create_econtext(PLiSQL_execstate *estate);
-static void plisql_destroy_econtext(PLiSQL_execstate *estate);
-static void assign_simple_var(PLiSQL_execstate *estate, PLiSQL_var *var,
+static void exec_init_tuple_store(PLiSQL_execstate * estate);
+static void exec_set_found(PLiSQL_execstate * estate, bool state);
+static void plisql_create_econtext(PLiSQL_execstate * estate);
+static void plisql_destroy_econtext(PLiSQL_execstate * estate);
+static void assign_simple_var(PLiSQL_execstate * estate, PLiSQL_var * var,
 							  Datum newvalue, bool isnull, bool freeable);
-static void assign_text_var(PLiSQL_execstate *estate, PLiSQL_var *var,
+static void assign_text_var(PLiSQL_execstate * estate, PLiSQL_var * var,
 							const char *str);
-static void assign_record_var(PLiSQL_execstate *estate, PLiSQL_rec *rec,
+static void assign_record_var(PLiSQL_execstate * estate, PLiSQL_rec * rec,
 							  ExpandedRecordHeader *erh);
-static ParamListInfo exec_eval_using_params(PLiSQL_execstate *estate,
+static ParamListInfo exec_eval_using_params(PLiSQL_execstate * estate,
 											List *params);
-static Portal exec_dynquery_with_params(PLiSQL_execstate *estate,
-										PLiSQL_expr *dynquery, List *params,
+static Portal exec_dynquery_with_params(PLiSQL_execstate * estate,
+										PLiSQL_expr * dynquery, List *params,
 										const char *portalname, int cursorOptions);
-static char *format_expr_params(PLiSQL_execstate *estate,
-								const PLiSQL_expr *expr);
-static char *format_preparedparamsdata(PLiSQL_execstate *estate,
+static char *format_expr_params(PLiSQL_execstate * estate,
+								const PLiSQL_expr * expr);
+static char *format_preparedparamsdata(PLiSQL_execstate * estate,
 									   ParamListInfo paramLI);
-static PLiSQL_variable *make_callstmt_target(PLiSQL_execstate *estate,
-											  PLiSQL_expr *expr);
+static PLiSQL_variable * make_callstmt_target(PLiSQL_execstate * estate,
+											  PLiSQL_expr * expr);
 static void plisql_out_param_setup(void *s);
 static void plisql_out_param(ExprState *state, ExprEvalStep *op);
 
-static void plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiSQL_function *func);
+static void plisql_anonymous_return_out_parameter(PLiSQL_execstate * estate, PLiSQL_function * func);
 
 
 
@@ -506,25 +506,25 @@ static void plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiS
  * ----------
  */
 Datum
-plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
-					  EState *simple_eval_estate,
-					  ResourceOwner simple_eval_resowner,
-					  ResourceOwner procedure_resowner,
-					  bool atomic)
+plisql_exec_function(PLiSQL_function * func, FunctionCallInfo fcinfo,
+					 EState *simple_eval_estate,
+					 ResourceOwner simple_eval_resowner,
+					 ResourceOwner procedure_resowner,
+					 bool atomic)
 {
 	PLiSQL_execstate estate;
 	ErrorContextCallback plerrcontext;
 	int			i;
 	int			rc;
 
-	char	function_from = plisql_function_from(fcinfo);
+	char		function_from = plisql_function_from(fcinfo);
 	bool		anonymous_have_outparam = false;
 
 	/*
 	 * Setup the execution state
 	 */
 	plisql_estate_setup(&estate, func, (ReturnSetInfo *) fcinfo->resultinfo,
-						 simple_eval_estate, simple_eval_resowner);
+						simple_eval_estate, simple_eval_resowner);
 	estate.procedure_resowner = procedure_resowner;
 	estate.atomic = atomic;
 
@@ -550,7 +550,7 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 	}
 
 	if (function_from == FUNC_FROM_SUBPROCFUNC &&
-		func->item == NULL) 
+		func->item == NULL)
 		plisql_init_subprocfunc_globalvar(&estate, fcinfo);
 
 	/*
@@ -570,52 +570,56 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 					if (var->info != PROARGMODE_OUT)
 					{
 						assign_simple_var(&estate, var,
-								  fcinfo->args[i].value,
-								  fcinfo->args[i].isnull,
-								  false);
+										  fcinfo->args[i].value,
+										  fcinfo->args[i].isnull,
+										  false);
 
 						/*
-						* If it's a varlena type, check to see if we received a
-						* R/W expanded-object pointer.  If so, we can commandeer
-						* the object rather than having to copy it.  If passed a
-						* R/O expanded pointer, just keep it as the value of the
-						* variable for the moment.  (We can change it to R/W if
-						* the variable gets modified, but that may very well
-						* never happen.)
-						*
-						* Also, force any flat array value to be stored in
-						* expanded form in our local variable, in hopes of
-						* improving efficiency of uses of the variable.  (This is
-						* a hack, really: why only arrays? Need more thought
-						* about which cases are likely to win.  See also
-						* typisarray-specific heuristic in exec_assign_value.)
-						*/
+						 * If it's a varlena type, check to see if we received
+						 * a R/W expanded-object pointer.  If so, we can
+						 * commandeer the object rather than having to copy
+						 * it.  If passed a R/O expanded pointer, just keep it
+						 * as the value of the variable for the moment.  (We
+						 * can change it to R/W if the variable gets modified,
+						 * but that may very well never happen.)
+						 *
+						 * Also, force any flat array value to be stored in
+						 * expanded form in our local variable, in hopes of
+						 * improving efficiency of uses of the variable. (This
+						 * is a hack, really: why only arrays? Need more
+						 * thought about which cases are likely to win.  See
+						 * also typisarray-specific heuristic in
+						 * exec_assign_value.)
+						 */
 						if (!var->isnull && var->datatype->typlen == -1)
 						{
 							if (VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(var->value)))
 							{
 								/* take ownership of R/W object */
 								assign_simple_var(&estate, var,
-											  TransferExpandedObject(var->value,
-											  plisql_get_relevantContext(var->pkgoid,
-														estate.datum_context)),
-											  false,
-											  true);
+												  TransferExpandedObject(var->value,
+																		 plisql_get_relevantContext(var->pkgoid,
+																									estate.datum_context)),
+												  false,
+												  true);
 							}
 							else if (VARATT_IS_EXTERNAL_EXPANDED_RO(DatumGetPointer(var->value)))
 							{
-								/* R/O pointer, keep it as-is until assigned to */
+								/*
+								 * R/O pointer, keep it as-is until assigned
+								 * to
+								 */
 							}
 							else if (var->datatype->typisarray)
 							{
 								/* flat array, so force to expanded form */
 								assign_simple_var(&estate, var,
-											  expand_array(var->value,
-											   plisql_get_relevantContext(var->pkgoid,
-												estate.datum_context),
-											   NULL),
-											  false,
-											  true);
+												  expand_array(var->value,
+															   plisql_get_relevantContext(var->pkgoid,
+																						  estate.datum_context),
+															   NULL),
+												  false,
+												  true);
 							}
 						}
 					}
@@ -632,8 +636,8 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 						{
 							/* Assign row value from composite datum */
 							exec_move_row_from_datum(&estate,
-											 (PLiSQL_variable *) rec,
-											 fcinfo->args[i].value);
+													 (PLiSQL_variable *) rec,
+													 fcinfo->args[i].value);
 						}
 						else
 						{
@@ -657,11 +661,11 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 	estate.err_text = gettext_noop("during function entry");
 
 	/*
-	 * Set the magic variable FOUND to false
+	 * Initialize the magic variable FOUND to false. For subprocedures and
+	 * package routines, FOUND is inherited from the caller.
 	 */
-	/* subproc func, its found come from its parents */
 	if (function_from != FUNC_FROM_SUBPROCFUNC &&
-		function_from != FUNC_FROM_PACKAGE) 
+		function_from != FUNC_FROM_PACKAGE)
 		exec_set_found(&estate, false);
 
 	/*
@@ -749,72 +753,74 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 				if (func->fn_rettype == estate.rettype &&
 					func->fn_rettype != RECORDOID)
 				{
-				/*
-				 * Copy the tuple result into upper executor memory context.
-				 * However, if we have a R/W expanded datum, we can just
-				 * transfer its ownership out to the upper context.
-				 */
+					/*
+					 * Copy the tuple result into upper executor memory
+					 * context. However, if we have a R/W expanded datum, we
+					 * can just transfer its ownership out to the upper
+					 * context.
+					 */
 					if (estate.retpkgvar)
 						estate.retval = package_datumTransfer(estate.retval,
-													  false,
-													  -1,
-													  estate.retisnull);
+															  false,
+															  -1,
+															  estate.retisnull);
 					else
 						estate.retval = SPI_datumTransfer(estate.retval,
-												  false,
-												  -1);
+														  false,
+														  -1);
 				}
 				else
 				{
-				/*
-				 * Need to look up the expected result type.  XXX would be
-				 * better to cache the tupdesc instead of repeating
-				 * get_call_result_type(), but the only easy place to save it
-				 * is in the PLiSQL_function struct, and that's too
-				 * long-lived: composite types could change during the
-				 * existence of a PLiSQL_function.
-				 */
-				Oid			resultTypeId;
-				TupleDesc	tupdesc;
-
-				switch (get_call_result_type(fcinfo, &resultTypeId, &tupdesc))
-				{
-					case TYPEFUNC_COMPOSITE:
-						/* got the expected result rowtype, now coerce it */
-						coerce_function_result_tuple(&estate, tupdesc);
-						break;
-					case TYPEFUNC_COMPOSITE_DOMAIN:
-						/* got the expected result rowtype, now coerce it */
-						coerce_function_result_tuple(&estate, tupdesc);
-						/* and check domain constraints */
-						/* XXX allowing caching here would be good, too */
-						domain_check(estate.retval, false, resultTypeId,
-									 NULL, NULL);
-						break;
-					case TYPEFUNC_RECORD:
+					/*
+					 * Need to look up the expected result type.  XXX would be
+					 * better to cache the tupdesc instead of repeating
+					 * get_call_result_type(), but the only easy place to save
+					 * it is in the PLiSQL_function struct, and that's too
+					 * long-lived: composite types could change during the
+					 * existence of a PLiSQL_function.
+					 */
+					Oid			resultTypeId;
+					TupleDesc	tupdesc;
 
-						/*
-						 * Failed to determine actual type of RECORD.  We
-						 * could raise an error here, but what this means in
-						 * practice is that the caller is expecting any old
-						 * generic rowtype, so we don't really need to be
-						 * restrictive.  Pass back the generated result as-is.
-						 */
+					switch (get_call_result_type(fcinfo, &resultTypeId, &tupdesc))
+					{
+						case TYPEFUNC_COMPOSITE:
+							/* got the expected result rowtype, now coerce it */
+							coerce_function_result_tuple(&estate, tupdesc);
+							break;
+						case TYPEFUNC_COMPOSITE_DOMAIN:
+							/* got the expected result rowtype, now coerce it */
+							coerce_function_result_tuple(&estate, tupdesc);
+							/* and check domain constraints */
+							/* XXX allowing caching here would be good, too */
+							domain_check(estate.retval, false, resultTypeId,
+										 NULL, NULL);
+							break;
+						case TYPEFUNC_RECORD:
+
+							/*
+							 * Failed to determine actual type of RECORD.  We
+							 * could raise an error here, but what this means
+							 * in practice is that the caller is expecting any
+							 * old generic rowtype, so we don't really need to
+							 * be restrictive.  Pass back the generated result
+							 * as-is.
+							 */
 							if (estate.retpkgvar)
 								estate.retval = package_datumTransfer(estate.retval,
-															  false,
-															  -1,
-															  estate.retisnull);
+																	  false,
+																	  -1,
+																	  estate.retisnull);
 							else
 								estate.retval = SPI_datumTransfer(estate.retval,
-														  false,
-														  -1);
-						break;
-					default:
-						/* shouldn't get here if retistuple is true ... */
-						elog(ERROR, "return type must be a row type");
-						break;
-				}
+																  false,
+																  -1);
+							break;
+						default:
+							/* shouldn't get here if retistuple is true ... */
+							elog(ERROR, "return type must be a row type");
+							break;
+					}
 				}
 			}
 			else
@@ -844,13 +850,13 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 			{
 				if (estate.retpkgvar)
 					estate.retval = package_datumTransfer(estate.retval,
-												  false,
-												  func->fn_rettyplen,
-												  estate.retisnull);
+														  false,
+														  func->fn_rettyplen,
+														  estate.retisnull);
 				else
 					estate.retval = SPI_datumTransfer(estate.retval,
-												  false,
-												  func->fn_rettyplen);
+													  false,
+													  func->fn_rettyplen);
 			}
 
 		}
@@ -899,12 +905,12 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
 			switch (estate.datums[n]->dtype)
 			{
 				case PLISQL_DTYPE_VAR:
-				{
-					PLiSQL_var *var = (PLiSQL_var *)estate.datums[n];
+					{
+						PLiSQL_var *var = (PLiSQL_var *) estate.datums[n];
 
-					fcinfo->args[i].value = var->value;
-					fcinfo->args[i].isnull = var->isnull;
-				}
+						fcinfo->args[i].value = var->value;
+						fcinfo->args[i].isnull = var->isnull;
+					}
 					break;
 				case PLISQL_DTYPE_ROW:
 					fcinfo->args[i].isnull = false;
@@ -930,7 +936,7 @@ plisql_exec_function(PLiSQL_function *func, FunctionCallInfo fcinfo,
  * estate->retval is updated in-place.
  */
 static void
-coerce_function_result_tuple(PLiSQL_execstate *estate, TupleDesc tupdesc)
+coerce_function_result_tuple(PLiSQL_execstate * estate, TupleDesc tupdesc)
 {
 	HeapTuple	rettup;
 	TupleDesc	retdesc;
@@ -988,7 +994,7 @@ coerce_function_result_tuple(PLiSQL_execstate *estate, TupleDesc tupdesc)
 
 			resultsize = EOH_get_flat_size(&erh->hdr);
 			tuphdr = (HeapTupleHeader) SPI_palloc(resultsize);
-			EOH_flatten_into(&erh->hdr,  tuphdr, resultsize);
+			EOH_flatten_into(&erh->hdr, tuphdr, resultsize);
 			HeapTupleHeaderSetTypeId(tuphdr, tupdesc->tdtypeid);
 			HeapTupleHeaderSetTypMod(tuphdr, tupdesc->tdtypmod);
 			estate->retval = PointerGetDatum(tuphdr);
@@ -1002,13 +1008,13 @@ coerce_function_result_tuple(PLiSQL_execstate *estate, TupleDesc tupdesc)
 			 */
 			if (estate->retpkgvar)
 				estate->retval = package_datumTransfer(estate->retval,
-											  false,
-											  -1,
-											  estate->retisnull);
+													   false,
+													   -1,
+													   estate->retisnull);
 			else
 				estate->retval = SPI_datumTransfer(estate->retval,
-											  false,
-											  -1);
+												   false,
+												   -1);
 		}
 	}
 	else
@@ -1047,8 +1053,8 @@ coerce_function_result_tuple(PLiSQL_execstate *estate, TupleDesc tupdesc)
  * ----------
  */
 HeapTuple
-plisql_exec_trigger(PLiSQL_function *func,
-					 TriggerData *trigdata)
+plisql_exec_trigger(PLiSQL_function * func,
+					TriggerData *trigdata)
 {
 	PLiSQL_execstate estate;
 	ErrorContextCallback plerrcontext;
@@ -1287,7 +1293,7 @@ plisql_exec_trigger(PLiSQL_function *func,
  * ----------
  */
 void
-plisql_exec_event_trigger(PLiSQL_function *func, EventTriggerData *trigdata)
+plisql_exec_event_trigger(PLiSQL_function * func, EventTriggerData *trigdata)
 {
 	PLiSQL_execstate estate;
 	ErrorContextCallback plerrcontext;
@@ -1427,8 +1433,8 @@ plisql_exec_error_callback(void *arg)
  * ----------
  */
 static void
-copy_plisql_datums(PLiSQL_execstate *estate,
-					PLiSQL_function *func)
+copy_plisql_datums(PLiSQL_execstate * estate,
+				   PLiSQL_function * func)
 {
 	int			ndatums = estate->ndatums;
 	PLiSQL_datum **indatums;
@@ -1438,7 +1444,7 @@ copy_plisql_datums(PLiSQL_execstate *estate,
 	int			i;
 
 	/* Allocate local datum-pointer array */
-	estate->datums = (PLiSQL_datum **)
+	estate->datums = (PLiSQL_datum * *)
 		palloc(sizeof(PLiSQL_datum *) * ndatums);
 
 	/*
@@ -1484,6 +1490,7 @@ copy_plisql_datums(PLiSQL_execstate *estate,
 				break;
 
 			case PLISQL_DTYPE_PACKAGE_DATUM:
+
 				/*
 				 * package is a reference, so we don't copy it
 				 */
@@ -1508,8 +1515,8 @@ copy_plisql_datums(PLiSQL_execstate *estate,
  * The assignment automatically disarms the promise.
  */
 static void
-plisql_fulfill_promise(PLiSQL_execstate *estate,
-						PLiSQL_var *var)
+plisql_fulfill_promise(PLiSQL_execstate * estate,
+					   PLiSQL_var * var)
 {
 	MemoryContext oldcontext;
 
@@ -1668,7 +1675,7 @@ plisql_fulfill_promise(PLiSQL_execstate *estate,
  * either the function's main context or a pushed-down outer stmt_mcontext.
  */
 static MemoryContext
-get_stmt_mcontext(PLiSQL_execstate *estate)
+get_stmt_mcontext(PLiSQL_execstate * estate)
 {
 	if (estate->stmt_mcontext == NULL)
 	{
@@ -1687,7 +1694,7 @@ get_stmt_mcontext(PLiSQL_execstate *estate)
  * pop_stmt_mcontext().
  */
 static void
-push_stmt_mcontext(PLiSQL_execstate *estate)
+push_stmt_mcontext(PLiSQL_execstate * estate)
 {
 	/* Should have done get_stmt_mcontext() first */
 	Assert(estate->stmt_mcontext != NULL);
@@ -1706,7 +1713,7 @@ push_stmt_mcontext(PLiSQL_execstate *estate)
  * might currently be estate->stmt_mcontext.
  */
 static void
-pop_stmt_mcontext(PLiSQL_execstate *estate)
+pop_stmt_mcontext(PLiSQL_execstate * estate)
 {
 	/* We need only pop the stack */
 	estate->stmt_mcontext = estate->stmt_mcontext_parent;
@@ -1719,7 +1726,7 @@ pop_stmt_mcontext(PLiSQL_execstate *estate)
  * match the current exception?
  */
 static bool
-exception_matches_conditions(ErrorData *edata, PLiSQL_condition *cond)
+exception_matches_conditions(ErrorData *edata, PLiSQL_condition * cond)
 {
 	for (; cond != NULL; cond = cond->next)
 	{
@@ -1758,7 +1765,7 @@ exception_matches_conditions(ErrorData *edata, PLiSQL_condition *cond)
  * ----------
  */
 static int
-exec_toplevel_block(PLiSQL_execstate *estate, PLiSQL_stmt_block *block)
+exec_toplevel_block(PLiSQL_execstate * estate, PLiSQL_stmt_block * block)
 {
 	int			rc;
 
@@ -1787,7 +1794,7 @@ exec_toplevel_block(PLiSQL_execstate *estate, PLiSQL_stmt_block *block)
  * ----------
  */
 static int
-exec_stmt_block(PLiSQL_execstate *estate, PLiSQL_stmt_block *block)
+exec_stmt_block(PLiSQL_execstate * estate, PLiSQL_stmt_block * block)
 {
 	volatile int rc = -1;
 	int			i;
@@ -2128,7 +2135,7 @@ exec_stmt_block(PLiSQL_execstate *estate, PLiSQL_stmt_block *block)
  * ----------
  */
 static int
-exec_stmts(PLiSQL_execstate *estate, List *stmts)
+exec_stmts(PLiSQL_execstate * estate, List *stmts)
 {
 	PLiSQL_stmt *save_estmt = estate->err_stmt;
 	ListCell   *s;
@@ -2296,7 +2303,7 @@ exec_stmts(PLiSQL_execstate *estate, List *stmts)
  * ----------
  */
 static int
-exec_stmt_assign(PLiSQL_execstate *estate, PLiSQL_stmt_assign *stmt)
+exec_stmt_assign(PLiSQL_execstate * estate, PLiSQL_stmt_assign * stmt)
 {
 	Assert(stmt->varno >= 0);
 
@@ -2312,7 +2319,7 @@ exec_stmt_assign(PLiSQL_execstate *estate, PLiSQL_stmt_assign *stmt)
  * ----------
  */
 static int
-exec_stmt_perform(PLiSQL_execstate *estate, PLiSQL_stmt_perform *stmt)
+exec_stmt_perform(PLiSQL_execstate * estate, PLiSQL_stmt_perform * stmt)
 {
 	PLiSQL_expr *expr = stmt->expr;
 
@@ -2329,7 +2336,7 @@ exec_stmt_perform(PLiSQL_execstate *estate, PLiSQL_stmt_perform *stmt)
  * NOTE: this is used for both CALL and DO statements.
  */
 static int
-exec_stmt_call(PLiSQL_execstate *estate, PLiSQL_stmt_call *stmt)
+exec_stmt_call(PLiSQL_execstate * estate, PLiSQL_stmt_call * stmt)
 {
 	PLiSQL_expr *expr = stmt->expr;
 	LocalTransactionId before_lxid;
@@ -2339,9 +2346,9 @@ exec_stmt_call(PLiSQL_execstate *estate, PLiSQL_stmt_call *stmt)
 	int			rc;
 
 	/*
-	* The grammar can't conveniently set expr->func while building the parse
-	* tree, so make sure it's set before parser hooks need it.
-	*/
+	 * The grammar can't conveniently set expr->func while building the parse
+	 * tree, so make sure it's set before parser hooks need it.
+	 */
 	expr->func = estate->func;
 
 	/*
@@ -2427,7 +2434,7 @@ exec_stmt_call(PLiSQL_execstate *estate, PLiSQL_stmt_call *stmt)
  * exec_move_row() to do the assignments.
  */
 static PLiSQL_variable *
-make_callstmt_target(PLiSQL_execstate *estate, PLiSQL_expr *expr)
+make_callstmt_target(PLiSQL_execstate * estate, PLiSQL_expr * expr)
 {
 	CachedPlan *cplan;
 	PlannedStmt *pstmt;
@@ -2468,12 +2475,13 @@ make_callstmt_target(PLiSQL_execstate *estate, PLiSQL_expr *expr)
 		if (!HeapTupleIsValid(func_tuple))
 			elog(ERROR, "cache lookup failed for function %u",
 				 funcexpr->funcid);
+
 		/*
-		 * Get the argument names and modes, so that we can deliver on-point error
-		 * messages when something is wrong.
+		 * Get the argument names and modes, so that we can deliver on-point
+		 * error messages when something is wrong.
 		 */
 		numargs = get_func_arg_info(func_tuple, &argtypes, &argnames, &argmodes);
-			ReleaseSysCache(func_tuple);
+		ReleaseSysCache(func_tuple);
 	}
 	else
 		numargs = get_subprocfunc_arg_info(funcexpr, &argtypes, &argnames, &argmodes);
@@ -2506,6 +2514,14 @@ make_callstmt_target(PLiSQL_execstate *estate, PLiSQL_expr *expr)
 		{
 			Node	   *n = list_nth(stmt->outargs, nfields);
 
+			/*
+			 * I'm not sure if this is a bug, so I'm only temporarily
+			 * fixing it for scenarios that I care about.
+			 */
+			if (estate->func && estate->func->do_from_call &&
+				strcmp(estate->func->fn_signature, "inline_code_block") == 0)
+				n = ParseParamVariable(n);
+
 			if (IsA(n, Param))
 			{
 				Param	   *param = (Param *) n;
@@ -2551,7 +2567,7 @@ make_callstmt_target(PLiSQL_execstate *estate, PLiSQL_expr *expr)
  * ----------
  */
 static int
-exec_stmt_getdiag(PLiSQL_execstate *estate, PLiSQL_stmt_getdiag *stmt)
+exec_stmt_getdiag(PLiSQL_execstate * estate, PLiSQL_stmt_getdiag * stmt)
 {
 	ListCell   *lc;
 
@@ -2570,6 +2586,7 @@ exec_stmt_getdiag(PLiSQL_execstate *estate, PLiSQL_stmt_getdiag *stmt)
 	{
 		PLiSQL_diag_item *diag_item = (PLiSQL_diag_item *) lfirst(lc);
 		PLiSQL_datum *var;
+
 		var = plisql_get_datum(estate, estate->datums[diag_item->target]);
 
 		switch (diag_item->kind)
@@ -2668,7 +2685,7 @@ exec_stmt_getdiag(PLiSQL_execstate *estate, PLiSQL_stmt_getdiag *stmt)
  * ----------
  */
 static int
-exec_stmt_if(PLiSQL_execstate *estate, PLiSQL_stmt_if *stmt)
+exec_stmt_if(PLiSQL_execstate * estate, PLiSQL_stmt_if * stmt)
 {
 	bool		value;
 	bool		isnull;
@@ -2698,7 +2715,7 @@ exec_stmt_if(PLiSQL_execstate *estate, PLiSQL_stmt_if *stmt)
  *-----------
  */
 static int
-exec_stmt_case(PLiSQL_execstate *estate, PLiSQL_stmt_case *stmt)
+exec_stmt_case(PLiSQL_execstate * estate, PLiSQL_stmt_case * stmt)
 {
 	PLiSQL_var *t_var = NULL;
 	bool		isnull;
@@ -2728,24 +2745,25 @@ exec_stmt_case(PLiSQL_execstate *estate, PLiSQL_stmt_case *stmt)
 			t_var->datatype->atttypmod != t_typmod)
 		{
 			MemoryContext oldctx = NULL;
+
 			/*
-			 * package'var doesn't use plisql_copy_datum
-			 * so we should swith its function memorycontext
+			 * package'var doesn't use plisql_copy_datum, 
+			 * so we should switch its function memory context.
 			 * maybe save origin datatype, but no place
-			 * to store it and when to recover
-			 * we must not free its origin datatype, maybe its
-			 * is referenced by other place like use define type
+			 * to store it and when to recover, 
+			 * we must not free its origin datatype, maybe it
+			 * is referenced by other place like user defined type.
 			 */
 			if (OidIsValid(t_var->pkgoid))
 			{
 				oldctx = MemoryContextSwitchTo(plisql_get_relevantContext(t_var->pkgoid,
-												CurrentMemoryContext));
+																		  CurrentMemoryContext));
 			}
 
 			t_var->datatype = plisql_build_datatype(t_typoid,
-													 t_typmod,
-													 estate->func->fn_input_collation,
-													 NULL);
+													t_typmod,
+													estate->func->fn_input_collation,
+													NULL);
 			if (oldctx != NULL)
 				MemoryContextSwitchTo(oldctx);
 		}
@@ -2804,7 +2822,7 @@ exec_stmt_case(PLiSQL_execstate *estate, PLiSQL_stmt_case *stmt)
  * ----------
  */
 static int
-exec_stmt_loop(PLiSQL_execstate *estate, PLiSQL_stmt_loop *stmt)
+exec_stmt_loop(PLiSQL_execstate * estate, PLiSQL_stmt_loop * stmt)
 {
 	int			rc = PLISQL_RC_OK;
 
@@ -2826,7 +2844,7 @@ exec_stmt_loop(PLiSQL_execstate *estate, PLiSQL_stmt_loop *stmt)
  * ----------
  */
 static int
-exec_stmt_while(PLiSQL_execstate *estate, PLiSQL_stmt_while *stmt)
+exec_stmt_while(PLiSQL_execstate * estate, PLiSQL_stmt_while * stmt)
 {
 	int			rc = PLISQL_RC_OK;
 
@@ -2857,7 +2875,7 @@ exec_stmt_while(PLiSQL_execstate *estate, PLiSQL_stmt_while *stmt)
  * ----------
  */
 static int
-exec_stmt_fori(PLiSQL_execstate *estate, PLiSQL_stmt_fori *stmt)
+exec_stmt_fori(PLiSQL_execstate * estate, PLiSQL_stmt_fori * stmt)
 {
 	PLiSQL_var *var;
 	Datum		value;
@@ -2870,7 +2888,7 @@ exec_stmt_fori(PLiSQL_execstate *estate, PLiSQL_stmt_fori *stmt)
 	bool		found = false;
 	int			rc = PLISQL_RC_OK;
 
-	var = (PLiSQL_var *)  plisql_get_datum(estate, estate->datums[stmt->var->dno]);
+	var = (PLiSQL_var *) plisql_get_datum(estate, estate->datums[stmt->var->dno]);
 
 	/*
 	 * Get the value of the lower bound
@@ -3000,7 +3018,7 @@ exec_stmt_fori(PLiSQL_execstate *estate, PLiSQL_stmt_fori *stmt)
  * ----------
  */
 static int
-exec_stmt_fors(PLiSQL_execstate *estate, PLiSQL_stmt_fors *stmt)
+exec_stmt_fors(PLiSQL_execstate * estate, PLiSQL_stmt_fors * stmt)
 {
 	Portal		portal;
 	int			rc;
@@ -3029,7 +3047,7 @@ exec_stmt_fors(PLiSQL_execstate *estate, PLiSQL_stmt_fors *stmt)
  * ----------
  */
 static int
-exec_stmt_forc(PLiSQL_execstate *estate, PLiSQL_stmt_forc *stmt)
+exec_stmt_forc(PLiSQL_execstate * estate, PLiSQL_stmt_forc * stmt)
 {
 	PLiSQL_var *curvar;
 	MemoryContext stmt_mcontext = NULL;
@@ -3092,7 +3110,7 @@ exec_stmt_forc(PLiSQL_execstate *estate, PLiSQL_stmt_forc *stmt)
 		if (OidIsValid(curvar->pkgoid))
 			set_args.target = (PLiSQL_variable *)
 				get_package_datum_bydno(estate, curvar->pkgoid,
-						curvar->cursor_explicit_argrow);
+										curvar->cursor_explicit_argrow);
 		else
 			set_args.target = (PLiSQL_variable *)
 				(estate->datums[curvar->cursor_explicit_argrow]);
@@ -3173,7 +3191,7 @@ exec_stmt_forc(PLiSQL_execstate *estate, PLiSQL_stmt_forc *stmt)
  * ----------
  */
 static int
-exec_stmt_foreach_a(PLiSQL_execstate *estate, PLiSQL_stmt_foreach_a *stmt)
+exec_stmt_foreach_a(PLiSQL_execstate * estate, PLiSQL_stmt_foreach_a * stmt)
 {
 	ArrayType  *arr;
 	Oid			arrtype;
@@ -3243,7 +3261,7 @@ exec_stmt_foreach_a(PLiSQL_execstate *estate, PLiSQL_stmt_foreach_a *stmt)
 	}
 	else
 		loop_var_elem_type = get_element_type(plisql_exec_get_datum_type(estate,
-																		  loop_var));
+																		 loop_var));
 
 	/*
 	 * Sanity-check the loop variable type.  We don't try very hard here, and
@@ -3329,7 +3347,7 @@ exec_stmt_foreach_a(PLiSQL_execstate *estate, PLiSQL_stmt_foreach_a *stmt)
  * ----------
  */
 static int
-exec_stmt_exit(PLiSQL_execstate *estate, PLiSQL_stmt_exit *stmt)
+exec_stmt_exit(PLiSQL_execstate * estate, PLiSQL_stmt_exit * stmt)
 {
 	/*
 	 * If the exit / continue has a condition, evaluate it
@@ -3362,7 +3380,7 @@ exec_stmt_exit(PLiSQL_execstate *estate, PLiSQL_stmt_exit *stmt)
  * ----------
  */
 static int
-exec_stmt_return(PLiSQL_execstate *estate, PLiSQL_stmt_return *stmt)
+exec_stmt_return(PLiSQL_execstate * estate, PLiSQL_stmt_return * stmt)
 {
 	/*
 	 * If processing a set-returning PL/iSQL function, the final RETURN
@@ -3403,19 +3421,23 @@ exec_stmt_return(PLiSQL_execstate *estate, PLiSQL_stmt_return *stmt)
 		if (estate->func &&
 			stmt->retvarno == estate->func->fn_ret_vardno)
 		{
-			/* assign stmt->expr expression value to the function returned variable */
+			/*
+			 * assign stmt->expr expression value to the function returned
+			 * variable
+			 */
 			exec_assign_expr(estate, retvar, stmt->expr);
 
-			/* the return stmt is contructed combinding all OUT parameters and function return value */
+			/* the return stmt is constructed combinding all OUT parameters and function return value */
 			return exec_stmt_return(estate, (PLiSQL_stmt_return *)
-						llast(estate->func->action->body));
+									llast(estate->func->action->body));
 		}
 
 		/*
-		 * When compile a function with out arguments and the return type is not VOIDIID,
-		 * build a RETURN statment which combinds all OUT parameters and function return value,
-		 * and put it as the last statment of function body.
-		 * If there is no explicit RETURN statement in function body, raise error.
+		 * When compile a function with out arguments and the return type is
+		 * not VOIDIID, build a RETURN statment which combinds all OUT
+		 * parameters and function return value, and put it as the last
+		 * statment of function body. If there is no explicit RETURN statement
+		 * in function body, raise error.
 		 */
 		if (estate->func &&
 			stmt->retvarno != estate->func->fn_ret_vardno &&
@@ -3458,28 +3480,14 @@ exec_stmt_return(PLiSQL_execstate *estate, PLiSQL_stmt_return *stmt)
 				}
 				break;
 
-			case PLISQL_DTYPE_REC:
-				{
-					PLiSQL_rec *rec = (PLiSQL_rec *) retvar;
-
-					/* If record is empty, we return NULL not a row of nulls */
-					if (rec->erh && !ExpandedRecordIsEmpty(rec->erh))
-					{
-						estate->retval = ExpandedRecordGetDatum(rec->erh);
-						estate->retisnull = false;
-						estate->rettype = rec->rectypeid;
-					}
-				}
-				break;
-
 			case PLISQL_DTYPE_ROW:
+			case PLISQL_DTYPE_REC:
 				{
-					PLiSQL_row *row = (PLiSQL_row *) retvar;
+					/* exec_eval_datum can handle these cases */
 					int32		rettypmod;
 
-					/* We get here if there are multiple OUT parameters */
 					exec_eval_datum(estate,
-									(PLiSQL_datum *) row,
+									retvar,
 									&estate->rettype,
 									&rettypmod,
 									&estate->retval,
@@ -3488,8 +3496,7 @@ exec_stmt_return(PLiSQL_execstate *estate, PLiSQL_stmt_return *stmt)
 				break;
 
 			/*
-			 * there maybe return a package.var.id, so should handle
-			 * special
+			 * there may return a package.var.id, handle it specially.
 			 */
 			case PLISQL_DTYPE_RECFIELD:
 				{
@@ -3556,8 +3563,8 @@ exec_stmt_return(PLiSQL_execstate *estate, PLiSQL_stmt_return *stmt)
  * ----------
  */
 static int
-exec_stmt_return_next(PLiSQL_execstate *estate,
-					  PLiSQL_stmt_return_next *stmt)
+exec_stmt_return_next(PLiSQL_execstate * estate,
+					  PLiSQL_stmt_return_next * stmt)
 {
 	TupleDesc	tupdesc;
 	int			natts;
@@ -3589,6 +3596,7 @@ exec_stmt_return_next(PLiSQL_execstate *estate,
 	if (stmt->retvarno >= 0)
 	{
 		PLiSQL_datum *retvar;
+
 		retvar = plisql_get_datum(estate, estate->datums[stmt->retvarno]);
 
 		switch (retvar->dtype)
@@ -3779,8 +3787,8 @@ exec_stmt_return_next(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_stmt_return_query(PLiSQL_execstate *estate,
-					   PLiSQL_stmt_return_query *stmt)
+exec_stmt_return_query(PLiSQL_execstate * estate,
+					   PLiSQL_stmt_return_query * stmt)
 {
 	int64		tcount;
 	DestReceiver *treceiver;
@@ -3908,7 +3916,7 @@ exec_stmt_return_query(PLiSQL_execstate *estate,
 }
 
 static void
-exec_init_tuple_store(PLiSQL_execstate *estate)
+exec_init_tuple_store(PLiSQL_execstate * estate)
 {
 	ReturnSetInfo *rsi = estate->rsi;
 	MemoryContext oldcxt;
@@ -3964,7 +3972,7 @@ do { \
  * ----------
  */
 static int
-exec_stmt_raise(PLiSQL_execstate *estate, PLiSQL_stmt_raise *stmt)
+exec_stmt_raise(PLiSQL_execstate * estate, PLiSQL_stmt_raise * stmt)
 {
 	int			err_code = 0;
 	char	   *condname = NULL;
@@ -4175,7 +4183,7 @@ exec_stmt_raise(PLiSQL_execstate *estate, PLiSQL_stmt_raise *stmt)
  * ----------
  */
 static int
-exec_stmt_assert(PLiSQL_execstate *estate, PLiSQL_stmt_assert *stmt)
+exec_stmt_assert(PLiSQL_execstate * estate, PLiSQL_stmt_assert * stmt)
 {
 	bool		value;
 	bool		isnull;
@@ -4218,11 +4226,11 @@ exec_stmt_assert(PLiSQL_execstate *estate, PLiSQL_stmt_assert *stmt)
  * ----------
  */
 static void
-plisql_estate_setup(PLiSQL_execstate *estate,
-					 PLiSQL_function *func,
-					 ReturnSetInfo *rsi,
-					 EState *simple_eval_estate,
-					 ResourceOwner simple_eval_resowner)
+plisql_estate_setup(PLiSQL_execstate * estate,
+					PLiSQL_function * func,
+					ReturnSetInfo *rsi,
+					EState *simple_eval_estate,
+					ResourceOwner simple_eval_resowner)
 {
 	HASHCTL		ctl;
 
@@ -4272,7 +4280,7 @@ plisql_estate_setup(PLiSQL_execstate *estate,
 	/* initialize our ParamListInfo with appropriate hook functions */
 	estate->paramLI = makeParamList(0);
 	estate->paramLI->paramFetch = plisql_param_fetch;
-	estate->paramLI->paramFetchArg =  estate;
+	estate->paramLI->paramFetchArg = estate;
 	estate->paramLI->paramCompile = plisql_param_compile;
 	estate->paramLI->paramCompileArg = NULL;	/* not needed */
 	estate->paramLI->parserSetup = (ParserSetupHook) plisql_parser_setup;
@@ -4380,7 +4388,7 @@ plisql_estate_setup(PLiSQL_execstate *estate,
  * ----------
  */
 static void
-exec_eval_cleanup(PLiSQL_execstate *estate)
+exec_eval_cleanup(PLiSQL_execstate * estate)
 {
 	/* Clear result of a full SPI_execute */
 	if (estate->eval_tuptable != NULL)
@@ -4417,8 +4425,8 @@ exec_eval_cleanup(PLiSQL_execstate *estate)
  * ----------
  */
 static void
-exec_prepare_plan(PLiSQL_execstate *estate,
-				  PLiSQL_expr *expr, int cursorOptions)
+exec_prepare_plan(PLiSQL_execstate * estate,
+				  PLiSQL_expr * expr, int cursorOptions)
 {
 	SPIPlanPtr	plan;
 	SPIPrepareOptions options;
@@ -4428,7 +4436,7 @@ exec_prepare_plan(PLiSQL_execstate *estate,
 	 */
 	memset(&options, 0, sizeof(options));
 	options.parserSetup = (ParserSetupHook) plisql_parser_setup;
-	options.parserSetupArg =  expr;
+	options.parserSetupArg = expr;
 	options.parseMode = expr->parseMode;
 	options.cursorOptions = cursorOptions;
 	plan = SPI_prepare_extended(expr->query, &options);
@@ -4452,8 +4460,8 @@ exec_prepare_plan(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_stmt_execsql(PLiSQL_execstate *estate,
-				  PLiSQL_stmt_execsql *stmt)
+exec_stmt_execsql(PLiSQL_execstate * estate,
+				  PLiSQL_stmt_execsql * stmt)
 {
 	ParamListInfo paramLI;
 	long		tcount;
@@ -4483,12 +4491,12 @@ exec_stmt_execsql(PLiSQL_execstate *estate,
 			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(l);
 
 			/*
-			* We could look at the raw_parse_tree, but it seems simpler to
-			* check the command tag.  Note we should *not* look at the Query
-			* tree(s), since those are the result of rewriting and could be
-			* stale, or could have been transmogrified into something else
-			* entirely.
-			*/
+			 * We could look at the raw_parse_tree, but it seems simpler to
+			 * check the command tag.  Note we should *not* look at the Query
+			 * tree(s), since those are the result of rewriting and could be
+			 * stale, or could have been transmogrified into something else
+			 * entirely.
+			 */
 
 			if (plansource->commandTag == CMDTAG_INSERT ||
 				plansource->commandTag == CMDTAG_UPDATE ||
@@ -4685,8 +4693,8 @@ exec_stmt_execsql(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_stmt_dynexecute(PLiSQL_execstate *estate,
-					 PLiSQL_stmt_dynexecute *stmt)
+exec_stmt_dynexecute(PLiSQL_execstate * estate,
+					 PLiSQL_stmt_dynexecute * stmt)
 {
 	Datum		query;
 	bool		isnull;
@@ -4731,7 +4739,7 @@ exec_stmt_dynexecute(PLiSQL_execstate *estate,
 	set_haspgparam(false);
 
 	exec_res = SPI_execute_extended(querystr, &options);
-	
+
 	backward_oraparam_stack();
 
 	switch (exec_res)
@@ -4762,9 +4770,9 @@ exec_stmt_dynexecute(PLiSQL_execstate *estate,
 			/*
 			 * We want to disallow SELECT INTO for now, because its behavior
 			 * is not consistent with SELECT INTO in a normal plisql context.
-			 * (We need to reimplement EXECUTE to parse the string as a
-			 * plisql command, not just feed it to SPI_execute.)  This is not
-			 * a functional limitation because CREATE TABLE AS is allowed.
+			 * (We need to reimplement EXECUTE to parse the string as a plisql
+			 * command, not just feed it to SPI_execute.)  This is not a
+			 * functional limitation because CREATE TABLE AS is allowed.
 			 */
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -4809,7 +4817,7 @@ exec_stmt_dynexecute(PLiSQL_execstate *estate,
 
 		/* Fetch target's datum entry */
 		target = (PLiSQL_variable *) plisql_get_datum(estate,
-								estate->datums[stmt->target->dno]);
+													  estate->datums[stmt->target->dno]);
 
 		/*
 		 * If SELECT ... INTO specified STRICT, and the query didn't find
@@ -4883,7 +4891,7 @@ exec_stmt_dynexecute(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_stmt_dynfors(PLiSQL_execstate *estate, PLiSQL_stmt_dynfors *stmt)
+exec_stmt_dynfors(PLiSQL_execstate * estate, PLiSQL_stmt_dynfors * stmt)
 {
 	Portal		portal;
 	int			rc;
@@ -4913,7 +4921,7 @@ exec_stmt_dynfors(PLiSQL_execstate *estate, PLiSQL_stmt_dynfors *stmt)
  * ----------
  */
 static int
-exec_stmt_open(PLiSQL_execstate *estate, PLiSQL_stmt_open *stmt)
+exec_stmt_open(PLiSQL_execstate * estate, PLiSQL_stmt_open * stmt)
 {
 	PLiSQL_var *curvar;
 	MemoryContext stmt_mcontext = NULL;
@@ -5022,8 +5030,8 @@ exec_stmt_open(PLiSQL_execstate *estate, PLiSQL_stmt_open *stmt)
 			/* XXX historically this has not been STRICT */
 			if (OidIsValid(curvar->pkgoid))
 				set_args.target = (PLiSQL_variable *) get_package_datum_bydno(estate,
-											curvar->pkgoid,
-											curvar->cursor_explicit_argrow);
+																			  curvar->pkgoid,
+																			  curvar->cursor_explicit_argrow);
 			else
 				set_args.target = (PLiSQL_variable *)
 					(estate->datums[curvar->cursor_explicit_argrow]);
@@ -5070,7 +5078,7 @@ exec_stmt_open(PLiSQL_execstate *estate, PLiSQL_stmt_open *stmt)
 	}
 
 	/*
-	 * pakcag global cursor var should holdable
+	 * package global cursor var should be holdable
 	 */
 	if (is_package_global_var(curvar))
 		portal->cursorOptions = portal->cursorOptions | CURSOR_OPT_HOLD;
@@ -5090,7 +5098,7 @@ exec_stmt_open(PLiSQL_execstate *estate, PLiSQL_stmt_open *stmt)
  * ----------
  */
 static int
-exec_stmt_fetch(PLiSQL_execstate *estate, PLiSQL_stmt_fetch *stmt)
+exec_stmt_fetch(PLiSQL_execstate * estate, PLiSQL_stmt_fetch * stmt)
 {
 	PLiSQL_var *curvar;
 	long		how_many = stmt->how_many;
@@ -5155,7 +5163,7 @@ exec_stmt_fetch(PLiSQL_execstate *estate, PLiSQL_stmt_fetch *stmt)
 		 * ----------
 		 */
 		target = (PLiSQL_variable *) plisql_get_datum(estate,
-							estate->datums[stmt->target->dno]);
+													  estate->datums[stmt->target->dno]);
 
 		if (n == 0)
 			exec_move_row(estate, target, NULL, tuptab->tupdesc);
@@ -5184,7 +5192,7 @@ exec_stmt_fetch(PLiSQL_execstate *estate, PLiSQL_stmt_fetch *stmt)
  * ----------
  */
 static int
-exec_stmt_close(PLiSQL_execstate *estate, PLiSQL_stmt_close *stmt)
+exec_stmt_close(PLiSQL_execstate * estate, PLiSQL_stmt_close * stmt)
 {
 	PLiSQL_var *curvar;
 	Portal		portal;
@@ -5196,7 +5204,7 @@ exec_stmt_close(PLiSQL_execstate *estate, PLiSQL_stmt_close *stmt)
 	 * ----------
 	 */
 	curvar = (PLiSQL_var *) plisql_get_datum(estate,
-						estate->datums[stmt->curvar]);
+											 estate->datums[stmt->curvar]);
 
 	if (curvar->isnull)
 		ereport(ERROR,
@@ -5229,7 +5237,7 @@ exec_stmt_close(PLiSQL_execstate *estate, PLiSQL_stmt_close *stmt)
  * Commit the transaction.
  */
 static int
-exec_stmt_commit(PLiSQL_execstate *estate, PLiSQL_stmt_commit *stmt)
+exec_stmt_commit(PLiSQL_execstate * estate, PLiSQL_stmt_commit * stmt)
 {
 	if (stmt->chain)
 		SPI_commit_and_chain();
@@ -5253,7 +5261,7 @@ exec_stmt_commit(PLiSQL_execstate *estate, PLiSQL_stmt_commit *stmt)
  * Abort the transaction.
  */
 static int
-exec_stmt_rollback(PLiSQL_execstate *estate, PLiSQL_stmt_rollback *stmt)
+exec_stmt_rollback(PLiSQL_execstate * estate, PLiSQL_stmt_rollback * stmt)
 {
 	if (stmt->chain)
 		SPI_rollback_and_chain();
@@ -5276,8 +5284,8 @@ exec_stmt_rollback(PLiSQL_execstate *estate, PLiSQL_stmt_rollback *stmt)
  * ----------
  */
 static void
-exec_assign_expr(PLiSQL_execstate *estate, PLiSQL_datum *target,
-				 PLiSQL_expr *expr)
+exec_assign_expr(PLiSQL_execstate * estate, PLiSQL_datum * target,
+				 PLiSQL_expr * expr)
 {
 	Datum		value;
 	bool		isnull;
@@ -5291,32 +5299,6 @@ exec_assign_expr(PLiSQL_execstate *estate, PLiSQL_datum *target,
 		exec_prepare_plan(estate, expr, 0);
 
 	value = exec_eval_expr(estate, expr, &isnull, &valtype, &valtypmod);
-
-	if (target->dtype == PLISQL_DTYPE_VAR)
-	{
-		PLiSQL_var *var = (PLiSQL_var *) target;
-
-		if (var->info == PROARGMODE_IN)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_PLPGSQL_ERROR),
-					 errmsg("expression \"%s\" cannot be used as an assignment target",
-							var->refname)));
-		}
-	}
-	else if (target->dtype ==  PLISQL_DTYPE_REC)
-	{
-		PLiSQL_rec *rec = (PLiSQL_rec *) target;
-
-		if (rec->info == PROARGMODE_IN)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_PLPGSQL_ERROR),
-					 errmsg("expression \"%s\" cannot be used as an assignment target",
-							rec->refname)));
-		}
-	}
-
 	exec_assign_value(estate, target, value, isnull, valtype, valtypmod);
 	exec_eval_cleanup(estate);
 }
@@ -5332,7 +5314,7 @@ exec_assign_expr(PLiSQL_execstate *estate, PLiSQL_datum *target,
  * ----------
  */
 static void
-exec_assign_c_string(PLiSQL_execstate *estate, PLiSQL_datum *target,
+exec_assign_c_string(PLiSQL_execstate * estate, PLiSQL_datum * target,
 					 const char *str)
 {
 	text	   *value;
@@ -5360,8 +5342,8 @@ exec_assign_c_string(PLiSQL_execstate *estate, PLiSQL_datum *target,
  * ----------
  */
 static void
-exec_assign_value(PLiSQL_execstate *estate,
-				  PLiSQL_datum *target,
+exec_assign_value(PLiSQL_execstate * estate,
+				  PLiSQL_datum * target,
 				  Datum value, bool isNull,
 				  Oid valtype, int32 valtypmod)
 {
@@ -5416,7 +5398,7 @@ exec_assign_value(PLiSQL_execstate *estate,
 
 						/* array and not already R/W, so apply expand_array */
 						newvalue = expand_array(newvalue,
-												mc, 
+												mc,
 												NULL);
 					}
 					else
@@ -5523,8 +5505,8 @@ exec_assign_value(PLiSQL_execstate *estate,
 
 				if (OidIsValid(recfield->pkgoid))
 					rec = (PLiSQL_rec *) get_package_datum_bydno(estate,
-												recfield->pkgoid,
-												recfield->recparentno);
+																 recfield->pkgoid,
+																 recfield->recparentno);
 				else
 					rec = (PLiSQL_rec *) (estate->datums[recfield->recparentno]);
 				erh = rec->erh;
@@ -5584,9 +5566,9 @@ exec_assign_value(PLiSQL_execstate *estate,
 				target = plisql_get_datum(estate, target);
 
 				exec_assign_value(estate,
-				  target,
-				  value, isNull,
-				  valtype, valtypmod);
+								  target,
+								  value, isNull,
+								  valtype, valtypmod);
 				break;
 			}
 
@@ -5613,8 +5595,8 @@ exec_assign_value(PLiSQL_execstate *estate,
  * it into the estate's eval_mcontext.
  */
 static void
-exec_eval_datum(PLiSQL_execstate *estate,
-				PLiSQL_datum *datum,
+exec_eval_datum(PLiSQL_execstate * estate,
+				PLiSQL_datum * datum,
 				Oid *typeid,
 				int32 *typetypmod,
 				Datum *value,
@@ -5713,8 +5695,8 @@ exec_eval_datum(PLiSQL_execstate *estate,
 
 				if (OidIsValid(recfield->pkgoid))
 					rec = (PLiSQL_rec *) get_package_datum_bydno(estate,
-												recfield->pkgoid,
-												recfield->recparentno);
+																 recfield->pkgoid,
+																 recfield->recparentno);
 				else
 					rec = (PLiSQL_rec *) (estate->datums[recfield->recparentno]);
 				erh = rec->erh;
@@ -5761,11 +5743,11 @@ exec_eval_datum(PLiSQL_execstate *estate,
 			{
 				datum = plisql_get_datum(estate, datum);
 				exec_eval_datum(estate,
-					datum,
-					typeid,
-					typetypmod,
-					value,
-					isnull);
+								datum,
+								typeid,
+								typetypmod,
+								value,
+								isnull);
 				break;
 			}
 
@@ -5781,8 +5763,8 @@ exec_eval_datum(PLiSQL_execstate *estate,
  * the actual value of the variable.  Also, needn't support DTYPE_ROW.
  */
 Oid
-plisql_exec_get_datum_type(PLiSQL_execstate *estate,
-							PLiSQL_datum *datum)
+plisql_exec_get_datum_type(PLiSQL_execstate * estate,
+						   PLiSQL_datum * datum)
 {
 	Oid			typeid = InvalidOid;;
 
@@ -5821,8 +5803,8 @@ plisql_exec_get_datum_type(PLiSQL_execstate *estate,
 
 				if (OidIsValid(recfield->pkgoid))
 					rec = (PLiSQL_rec *) get_package_datum_bydno(estate,
-										recfield->pkgoid,
-										recfield->recparentno);
+																 recfield->pkgoid,
+																 recfield->recparentno);
 				else
 					rec = (PLiSQL_rec *) (estate->datums[recfield->recparentno]);
 
@@ -5878,9 +5860,9 @@ plisql_exec_get_datum_type(PLiSQL_execstate *estate,
  * possibly-mutable typmod of RECORD values, but say -1 always.
  */
 void
-plisql_exec_get_datum_type_info(PLiSQL_execstate *estate,
-								 PLiSQL_datum *datum,
-								 Oid *typeId, int32 *typMod, Oid *collation)
+plisql_exec_get_datum_type_info(PLiSQL_execstate * estate,
+								PLiSQL_datum * datum,
+								Oid *typeId, int32 *typMod, Oid *collation)
 {
 	switch (datum->dtype)
 	{
@@ -5924,8 +5906,8 @@ plisql_exec_get_datum_type_info(PLiSQL_execstate *estate,
 
 				if (OidIsValid(recfield->pkgoid))
 					rec = (PLiSQL_rec *) get_package_datum_bydno(estate,
-										recfield->pkgoid,
-										recfield->recparentno);
+																 recfield->pkgoid,
+																 recfield->recparentno);
 				else
 					rec = (PLiSQL_rec *) (estate->datums[recfield->recparentno]);
 
@@ -5963,8 +5945,8 @@ plisql_exec_get_datum_type_info(PLiSQL_execstate *estate,
 			{
 				datum = plisql_get_datum(estate, datum);
 				plisql_exec_get_datum_type_info(estate,
-								 datum,
-								 typeId, typMod, collation);
+												datum,
+												typeId, typMod, collation);
 				break;
 			}
 
@@ -5980,17 +5962,17 @@ plisql_exec_get_datum_type_info(PLiSQL_execstate *estate,
 /*
 * plisql_assign_in_global_var is similar to
 * exec_assign_value, we assign subproc global var
-* from its parents'var
+* with its parents'var
 */
 void
-plisql_assign_in_global_var(PLiSQL_execstate *estate,
-													 PLiSQL_execstate *parestate,
-													 int dno)
+plisql_assign_in_global_var(PLiSQL_execstate * estate,
+							PLiSQL_execstate * parestate,
+							int dno)
 {
-	Oid typeid;
-	int32 typetypmod;
-	Datum value;
-	bool isnull;
+	Oid			typeid;
+	int32		typetypmod;
+	Datum		value;
+	bool		isnull;
 
 	Assert(dno < estate->ndatums);
 	Assert(dno < parestate->ndatums);
@@ -6001,41 +5983,41 @@ plisql_assign_in_global_var(PLiSQL_execstate *estate,
 	Assert(parestate->datums[dno]->dtype != PLISQL_DTYPE_PACKAGE_DATUM);
 	Assert(!OidIsValid(parestate->datums[dno]->pkgoid));
 
-	/* get origin value */
+	/* get original value */
 	exec_eval_datum(parestate, parestate->datums[dno],
-				&typeid, &typetypmod,
-				&value, &isnull);
+					&typeid, &typetypmod,
+					&value, &isnull);
 
 	/*
-	* If it's a read/write expanded datum, convert reference to read-only.
-	* (There's little point in trying to optimize read/write parameters,
-	* given the cases in which this function is used.)
-	*/
-	if (parestate->datums[dno]->dtype	== PLISQL_DTYPE_VAR)
+	 * If it's a read/write expanded datum, convert reference to read-only.
+	 * (There's little point in trying to optimize read/write parameters,
+	 * given the cases in which this function is used.)
+	 */
+	if (parestate->datums[dno]->dtype == PLISQL_DTYPE_VAR)
 		value = MakeExpandedObjectReadOnly(value,
-									isnull,
-									((PLiSQL_var *) parestate->datums[dno])->datatype->typlen);
+							isnull,
+							((PLiSQL_var *) parestate->datums[dno])->datatype->typlen);
 	else if (parestate->datums[dno]->dtype == PLISQL_DTYPE_REC)
 		value = MakeExpandedObjectReadOnly(value,
-									isnull,
-									-1);
+							isnull,
+							-1);
 
 	exec_assign_value(estate, estate->datums[dno],
-				value, isnull, typeid, typetypmod);
+					  value, isnull, typeid, typetypmod);
 }
 
 /*
 * assign value from estate to parestate
 */
 void
-plisql_assign_out_global_var(PLiSQL_execstate *estate,
-							PLiSQL_execstate *parestate,
-							int dno, int spi_level)
+plisql_assign_out_global_var(PLiSQL_execstate * estate,
+							 PLiSQL_execstate * parestate,
+							 int dno, int spi_level)
 {
-	Oid typeid;
-	int32 typetypmod;
-	Datum value;
-	bool isnull;
+	Oid			typeid;
+	int32		typetypmod;
+	Datum		value;
+	bool		isnull;
 	MemoryContext oldctx;
 
 	Assert(dno < estate->ndatums);
@@ -6046,23 +6028,24 @@ plisql_assign_out_global_var(PLiSQL_execstate *estate,
 	Assert(parestate->datums[dno]->dtype != PLISQL_DTYPE_PACKAGE_DATUM);
 	Assert(!OidIsValid(parestate->datums[dno]->pkgoid));
 
-	/* get origin value */
+	/* get original value */
 	exec_eval_datum(estate, estate->datums[dno],
-			&typeid, &typetypmod,
-			&value, &isnull);
-	/*
-	* If it's a read/write expanded datum, convert reference to read-only.
-	* (There's little point in trying to optimize read/write parameters,
-	* given the cases in which this function is used.)
-	*/
-	if (estate->datums[dno]->dtype  == PLISQL_DTYPE_VAR)
+					&typeid, &typetypmod,
+					&value, &isnull);
+
+	/*
+	 * If it's a read/write expanded datum, convert reference to read-only.
+	 * (There's little point in trying to optimize read/write parameters,
+	 * given the cases in which this function is used.)
+	 */
+	if (estate->datums[dno]->dtype == PLISQL_DTYPE_VAR)
 		value = MakeExpandedObjectReadOnly(value,
-									isnull,
-									((PLiSQL_var *) estate->datums[dno])->datatype->typlen);
- else if (estate->datums[dno]->dtype == PLISQL_DTYPE_REC)
-	 value = MakeExpandedObjectReadOnly(value,
-									isnull,
-									-1);
+										   isnull,
+										   ((PLiSQL_var *) estate->datums[dno])->datatype->typlen);
+	else if (estate->datums[dno]->dtype == PLISQL_DTYPE_REC)
+		value = MakeExpandedObjectReadOnly(value,
+										   isnull,
+										   -1);
 
 	oldctx = MemoryContextSwitchTo(SPI_get_proccxt(spi_level));
 
@@ -6091,8 +6074,8 @@ plisql_assign_out_global_var(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_eval_integer(PLiSQL_execstate *estate,
-				  PLiSQL_expr *expr,
+exec_eval_integer(PLiSQL_execstate * estate,
+				  PLiSQL_expr * expr,
 				  bool *isNull)
 {
 	Datum		exprdatum;
@@ -6114,8 +6097,8 @@ exec_eval_integer(PLiSQL_execstate *estate,
  * ----------
  */
 static bool
-exec_eval_boolean(PLiSQL_execstate *estate,
-				  PLiSQL_expr *expr,
+exec_eval_boolean(PLiSQL_execstate * estate,
+				  PLiSQL_expr * expr,
 				  bool *isNull)
 {
 	Datum		exprdatum;
@@ -6137,8 +6120,8 @@ exec_eval_boolean(PLiSQL_execstate *estate,
  * ----------
  */
 static Datum
-exec_eval_expr(PLiSQL_execstate *estate,
-			   PLiSQL_expr *expr,
+exec_eval_expr(PLiSQL_execstate * estate,
+			   PLiSQL_expr * expr,
 			   bool *isNull,
 			   Oid *rettype,
 			   int32 *rettypmod)
@@ -6164,7 +6147,7 @@ exec_eval_expr(PLiSQL_execstate *estate,
 	/*
 	 * Else do it the hard way via exec_run_select
 	 */
-	rc = exec_run_select(estate, expr, 2, NULL);
+	rc = exec_run_select(estate, expr, 0, NULL);
 	if (rc != SPI_OK_SELECT)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -6221,8 +6204,8 @@ exec_eval_expr(PLiSQL_execstate *estate,
  * ----------
  */
 static int
-exec_run_select(PLiSQL_execstate *estate,
-				PLiSQL_expr *expr, long maxtuples, Portal *portalP)
+exec_run_select(PLiSQL_execstate * estate,
+				PLiSQL_expr * expr, long maxtuples, Portal *portalP)
 {
 	ParamListInfo paramLI;
 	int			rc;
@@ -6305,7 +6288,7 @@ exec_run_select(PLiSQL_execstate *estate,
  * Used by exec_stmt_fors, exec_stmt_forc and exec_stmt_dynfors
  */
 static int
-exec_for_query(PLiSQL_execstate *estate, PLiSQL_stmt_forq *stmt,
+exec_for_query(PLiSQL_execstate * estate, PLiSQL_stmt_forq * stmt,
 			   Portal portal, bool prefetch_ok)
 {
 	PLiSQL_variable *var;
@@ -6318,7 +6301,7 @@ exec_for_query(PLiSQL_execstate *estate, PLiSQL_stmt_forq *stmt,
 
 	/* Fetch loop variable's datum entry */
 	var = (PLiSQL_variable *) plisql_get_datum(estate,
-						estate->datums[stmt->var->dno]);
+											   estate->datums[stmt->var->dno]);
 
 	/*
 	 * Make sure the portal doesn't get closed by the user statements we
@@ -6488,8 +6471,8 @@ exec_for_query(PLiSQL_execstate *estate, PLiSQL_stmt_forq *stmt,
  * ----------
  */
 static bool
-exec_eval_simple_expr(PLiSQL_execstate *estate,
-					  PLiSQL_expr *expr,
+exec_eval_simple_expr(PLiSQL_execstate * estate,
+					  PLiSQL_expr * expr,
 					  Datum *result,
 					  bool *isNull,
 					  Oid *rettype,
@@ -6581,7 +6564,7 @@ exec_eval_simple_expr(PLiSQL_execstate *estate,
 		Assert(cplan != NULL);
 
 		/*
-		 * This test probably can't fail either, but if it does, cope by
+		 * This test probably wouldn't fail either, but if it does, cope by
 		 * declaring the plan to be non-simple.  On success, we'll acquire a
 		 * refcount on the new plan, stored in simple_eval_resowner.
 		 */
@@ -6632,7 +6615,7 @@ exec_eval_simple_expr(PLiSQL_execstate *estate,
 	 * possibly setting ecxt_param_list_info to NULL; we've already forced use
 	 * of a generic plan.
 	 */
-	paramLI->parserSetupArg =  expr;
+	paramLI->parserSetupArg = expr;
 	econtext->ecxt_param_list_info = paramLI;
 
 	/*
@@ -6718,7 +6701,7 @@ exec_eval_simple_expr(PLiSQL_execstate *estate,
  * that seems like a waste of memory.)
  */
 static ParamListInfo
-setup_param_list(PLiSQL_execstate *estate, PLiSQL_expr *expr)
+setup_param_list(PLiSQL_execstate * estate, PLiSQL_expr * expr)
 {
 	ParamListInfo paramLI;
 
@@ -6741,12 +6724,12 @@ setup_param_list(PLiSQL_execstate *estate, PLiSQL_expr *expr)
 		 * Callers must save and restore parserSetupArg if there is any chance
 		 * that they are interrupting an active use of parameters.
 		 */
-		paramLI->parserSetupArg =  expr;
+		paramLI->parserSetupArg = expr;
 
 		/*
 		 * Also make sure this is set before parser hooks need it.  There is
 		 * no need to save and restore, since the value is always correct once
-		 * set.  (Should be set already, but let's be sure.)
+		 * set.  (Should be set already, but let's make sure.)
 		 */
 		expr->func = estate->func;
 	}
@@ -6774,8 +6757,8 @@ setup_param_list(PLiSQL_execstate *estate, PLiSQL_expr *expr)
  */
 static ParamExternData *
 plisql_param_fetch(ParamListInfo params,
-					int paramid, bool speculative,
-					ParamExternData *prm)
+				   int paramid, bool speculative,
+				   ParamExternData *prm)
 {
 	int			dno;
 	PLiSQL_execstate *estate;
@@ -6807,7 +6790,7 @@ plisql_param_fetch(ParamListInfo params,
 	if (!bms_is_member(dno, expr->paramnos))
 		ok = false;
 
-	/* may be come from a package var */
+	/* maybe come from a package var */
 	if (datum->dtype == PLISQL_DTYPE_PACKAGE_DATUM)
 	{
 		PLiSQL_pkg_datum *pkgdatum = (PLiSQL_pkg_datum *) datum;
@@ -6923,8 +6906,8 @@ plisql_param_fetch(ParamListInfo params,
  */
 static void
 plisql_param_compile(ParamListInfo params, Param *param,
-					  ExprState *state,
-					  Datum *resv, bool *resnull)
+					 ExprState *state,
+					 Datum *resv, bool *resnull)
 {
 	PLiSQL_execstate *estate;
 	PLiSQL_expr *expr;
@@ -7020,7 +7003,7 @@ plisql_param_compile(ParamListInfo params, Param *param,
  */
 static void
 plisql_param_eval_var_check(ExprState *state, ExprEvalStep *op,
-							 ExprContext *econtext)
+							ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7117,7 +7100,7 @@ plisql_param_eval_var_check(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_var_transfer(ExprState *state, ExprEvalStep *op,
-								ExprContext *econtext)
+							   ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7173,7 +7156,7 @@ plisql_param_eval_var_transfer(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_var(ExprState *state, ExprEvalStep *op,
-					   ExprContext *econtext)
+					  ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7213,7 +7196,7 @@ plisql_param_eval_var(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
-						  ExprContext *econtext)
+						 ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7241,10 +7224,38 @@ plisql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
 	/*
 	 * Inlined version of exec_eval_datum() ... and while we're at it, force
 	 * expanded datums to read-only.
+	 *
+	 * IMPORTANT (Bug #1124 fix): For varlena types that are NOT expanded
+	 * objects, we must make a copy of the value into the eval_mcontext,
+	 * rather than just returning a pointer to the variable's storage. This is
+	 * because nested function calls (a PL/iSQL feature) can happen during
+	 * expression evaluation, and when they return, they copy back their global
+	 * variables to the parent. This copy-back operation frees the parent's old
+	 * variable storage, which would leave us with a dangling pointer if we had
+	 * just returned var->value directly.
+	 *
+	 * For expanded objects (like composite types), we use
+	 * MakeExpandedObjectReadOnly which handles them properly.
+	 *
+	 * By copying to eval_mcontext here, we ensure the value survives for the
+	 * duration of the expression evaluation, even if the original variable
+	 * storage is freed and reallocated.
 	 */
-	*op->resvalue = MakeExpandedObjectReadOnly(var->value,
-											   var->isnull,
-											   -1);
+	if (!var->isnull && var->datatype->typlen == -1 &&
+		!VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(var->value)))
+	{
+		/* Non-expanded varlena type - make a copy in eval_mcontext */
+		MemoryContext oldcxt = MemoryContextSwitchTo(get_eval_mcontext(estate));
+		*op->resvalue = datumCopy(var->value, false, -1);
+		MemoryContextSwitchTo(oldcxt);
+	}
+	else
+	{
+		/* Expanded object, pass-by-value, or null - use standard handling */
+		*op->resvalue = MakeExpandedObjectReadOnly(var->value,
+												   var->isnull,
+												   -1);
+	}
 	*op->resnull = var->isnull;
 
 	/* safety check -- an assertion should be sufficient */
@@ -7259,7 +7270,7 @@ plisql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
-							ExprContext *econtext)
+						   ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7275,7 +7286,7 @@ plisql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
 	if (OidIsValid(pkgoid))
 	{
 		recfield = (PLiSQL_recfield *) get_package_datum_bydno(estate,
-														pkgoid, dno);
+															   pkgoid, dno);
 	}
 	else
 	{
@@ -7290,7 +7301,7 @@ plisql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
 	/* inline the relevant part of exec_eval_datum */
 	if (OidIsValid(recfield->pkgoid))
 		rec = (PLiSQL_rec *) get_package_datum_bydno(estate, pkgoid,
-										recfield->recparentno);
+													 recfield->recparentno);
 	else
 		rec = (PLiSQL_rec *) (estate->datums[recfield->recparentno]);
 	erh = rec->erh;
@@ -7345,7 +7356,7 @@ plisql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_generic(ExprState *state, ExprEvalStep *op,
-						   ExprContext *econtext)
+						  ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7392,7 +7403,7 @@ plisql_param_eval_generic(ExprState *state, ExprEvalStep *op,
  */
 static void
 plisql_param_eval_generic_ro(ExprState *state, ExprEvalStep *op,
-							  ExprContext *econtext)
+							 ExprContext *econtext)
 {
 	ParamListInfo params;
 	PLiSQL_execstate *estate;
@@ -7448,8 +7459,8 @@ plisql_param_eval_generic_ro(ExprState *state, ExprEvalStep *op,
  * exec_eval_cleanup to prevent long-term memory leaks.
  */
 static void
-exec_move_row(PLiSQL_execstate *estate,
-			  PLiSQL_variable *target,
+exec_move_row(PLiSQL_execstate * estate,
+			  PLiSQL_variable * target,
 			  HeapTuple tup, TupleDesc tupdesc)
 {
 	ExpandedRecordHeader *newerh = NULL;
@@ -7583,7 +7594,7 @@ exec_move_row(PLiSQL_execstate *estate,
  * Verify that a PLiSQL_rec's rectypeid is up-to-date.
  */
 static void
-revalidate_rectypeid(PLiSQL_rec *rec)
+revalidate_rectypeid(PLiSQL_rec * rec)
 {
 	PLiSQL_type *typ = rec->datatype;
 	TypeCacheEntry *typentry;
@@ -7663,13 +7674,14 @@ revalidate_rectypeid(PLiSQL_rec *rec)
  * if we fail before reaching assign_record_var().
  */
 static ExpandedRecordHeader *
-make_expanded_record_for_rec(PLiSQL_execstate *estate,
-							 PLiSQL_rec *rec,
+make_expanded_record_for_rec(PLiSQL_execstate * estate,
+							 PLiSQL_rec * rec,
 							 TupleDesc srctupdesc,
 							 ExpandedRecordHeader *srcerh)
 {
 	ExpandedRecordHeader *newerh;
 	MemoryContext mcontext = get_eval_mcontext(estate);
+
 	mcontext = plisql_get_relevantContext(rec->pkgoid, mcontext);
 
 	if (rec->rectypeid != RECORDOID)
@@ -7727,8 +7739,8 @@ make_expanded_record_for_rec(PLiSQL_execstate *estate,
  * exec_eval_cleanup to prevent long-term memory leaks.
  */
 static void
-exec_move_row_from_fields(PLiSQL_execstate *estate,
-						  PLiSQL_variable *target,
+exec_move_row_from_fields(PLiSQL_execstate * estate,
+						  PLiSQL_variable * target,
 						  ExpandedRecordHeader *newerh,
 						  Datum *values, bool *nulls,
 						  TupleDesc tupdesc)
@@ -7739,7 +7751,7 @@ exec_move_row_from_fields(PLiSQL_execstate *estate,
 	int			strict_multiassignment_level = 0;
 
 	HeapTupleHeader tuphd = NULL;
-	Oid 		tupType;
+	Oid			tupType;
 	int32		tupTypmod;
 	TupleDesc	rowidtupdesc;
 	HeapTupleData tuple;
@@ -7772,7 +7784,7 @@ exec_move_row_from_fields(PLiSQL_execstate *estate,
 		var_tupdesc = expanded_record_get_tupdesc(newerh);
 
 		if (compatible_db == ORA_PARSER && (rec->datatype->typoid == ROWIDOID ||
-			rec->datatype->typoid == UROWIDOID))
+											rec->datatype->typoid == UROWIDOID))
 		{
 			is_rowid_var = true;
 
@@ -8092,8 +8104,8 @@ compatible_tupdescs(TupleDesc src_tupdesc, TupleDesc dst_tupdesc)
  * ----------
  */
 static HeapTuple
-make_tuple_from_row(PLiSQL_execstate *estate,
-					PLiSQL_row *row,
+make_tuple_from_row(PLiSQL_execstate * estate,
+					PLiSQL_row * row,
 					TupleDesc tupdesc)
 {
 	int			natts = tupdesc->natts;
@@ -8178,8 +8190,8 @@ deconstruct_composite_datum(Datum value, HeapTupleData *tmptup)
  * Note: it's caller's responsibility to be sure value is of composite type.
  */
 static void
-exec_move_row_from_datum(PLiSQL_execstate *estate,
-						 PLiSQL_variable *target,
+exec_move_row_from_datum(PLiSQL_execstate * estate,
+						 PLiSQL_variable * target,
 						 Datum value)
 {
 	/* Check to see if source is an expanded record */
@@ -8375,7 +8387,7 @@ exec_move_row_from_datum(PLiSQL_execstate *estate,
 			{
 				ExpandedRecordHeader *newerh;
 				MemoryContext mcontext = plisql_get_relevantContext(rec->pkgoid,
-											get_eval_mcontext(estate));
+																	get_eval_mcontext(estate));
 
 				newerh = make_expanded_record_from_typeid(tupType, tupTypmod,
 														  mcontext);
@@ -8412,7 +8424,7 @@ exec_move_row_from_datum(PLiSQL_execstate *estate,
  * However, now we'll have a tupdesc with which we can e.g. look up fields.
  */
 static void
-instantiate_empty_record_variable(PLiSQL_execstate *estate, PLiSQL_rec *rec)
+instantiate_empty_record_variable(PLiSQL_execstate * estate, PLiSQL_rec * rec)
 {
 	MemoryContext mc;
 
@@ -8450,7 +8462,7 @@ instantiate_empty_record_variable(PLiSQL_execstate *estate, PLiSQL_rec *rec)
  * ----------
  */
 static char *
-convert_value_to_string(PLiSQL_execstate *estate, Datum value, Oid valtype)
+convert_value_to_string(PLiSQL_execstate * estate, Datum value, Oid valtype)
 {
 	char	   *result;
 	MemoryContext oldcontext;
@@ -8479,7 +8491,7 @@ convert_value_to_string(PLiSQL_execstate *estate, Datum value, Oid valtype)
  * ----------
  */
 static inline Datum
-exec_cast_value(PLiSQL_execstate *estate,
+exec_cast_value(PLiSQL_execstate * estate,
 				Datum value, bool *isnull,
 				Oid valtype, int32 valtypmod,
 				Oid reqtype, int32 reqtypmod)
@@ -8503,7 +8515,7 @@ exec_cast_value(PLiSQL_execstate *estate,
  * ----------
  */
 static Datum
-do_cast_value(PLiSQL_execstate *estate,
+do_cast_value(PLiSQL_execstate * estate,
 			  Datum value, bool *isnull,
 			  Oid valtype, int32 valtypmod,
 			  Oid reqtype, int32 reqtypmod)
@@ -8547,7 +8559,7 @@ do_cast_value(PLiSQL_execstate *estate,
  * ----------
  */
 static plisql_CastHashEntry *
-get_cast_hashentry(PLiSQL_execstate *estate,
+get_cast_hashentry(PLiSQL_execstate * estate,
 				   Oid srctype, int32 srctypmod,
 				   Oid dsttype, int32 dsttypmod)
 {
@@ -8564,15 +8576,15 @@ get_cast_hashentry(PLiSQL_execstate *estate,
 	cast_key.srctypmod = srctypmod;
 	cast_key.dsttypmod = dsttypmod;
 	cast_entry = (plisql_CastHashEntry *) hash_search(estate->cast_hash,
-													   &cast_key,
-													   HASH_ENTER, &found);
+													  &cast_key,
+													  HASH_ENTER, &found);
 	if (!found)					/* initialize if new entry */
 	{
 		/* We need a second lookup to see if a cast_expr_hash entry exists */
 		expr_entry = (plisql_CastExprHashEntry *) hash_search(cast_expr_hash,
-															   &cast_key,
-															   HASH_ENTER,
-															   &found);
+															  &cast_key,
+															  HASH_ENTER,
+															  &found);
 		if (!found)				/* initialize if new expr entry */
 			expr_entry->cast_cexpr = NULL;
 
@@ -8625,9 +8637,9 @@ get_cast_hashentry(PLiSQL_execstate *estate,
 
 		/*
 		 * Apply coercion.  We use the special coercion context
-		 * COERCION_PLPGSQL to match plisql's historical behavior, namely
-		 * that any cast not available at ASSIGNMENT level will be implemented
-		 * as an I/O coercion.  (It's somewhat dubious that we prefer I/O
+		 * COERCION_PLPGSQL to match plisql's historical behavior, namely that
+		 * any cast not available at ASSIGNMENT level will be implemented as
+		 * an I/O coercion.  (It's somewhat dubious that we prefer I/O
 		 * coercion over cast pathways that exist at EXPLICIT level.  Changing
 		 * that would cause assorted minor behavioral differences though, and
 		 * a user who wants the explicit-cast behavior can always write an
@@ -8641,12 +8653,35 @@ get_cast_hashentry(PLiSQL_execstate *estate,
 		if (srctype == UNKNOWNOID || srctype == RECORDOID)
 			cast_expr = NULL;
 		else
-			cast_expr = coerce_to_target_type(NULL,
-											  (Node *) placeholder, srctype,
-											  dsttype, dsttypmod,
-											  COERCION_PLPGSQL,
-											  COERCE_IMPLICIT_CAST,
-											  -1);
+		{
+			/*
+			 * The SQL CALL statement compatible with Oracle is implicitly converted to
+			 * DoStmt on the client side (libpq). According to the behavior of Oracle 21c,
+			 * if the parameter type declared by the subprogram is the same as the datatype
+			 * of the bind variable, the behavior of exceeding precision is truncated, 
+			 * otherwise an error will be reported.
+			 */
+			if (estate->func &&
+				estate->func->do_from_call &&
+				strcmp(estate->func->fn_signature, "inline_code_block") == 0 &&
+				(((srctype == ORACHARCHAROID || srctype == ORACHARBYTEOID) &&
+				  (dsttype == ORACHARCHAROID || dsttype == ORACHARBYTEOID)) ||
+				 ((srctype == ORAVARCHARCHAROID || srctype == ORAVARCHARBYTEOID) &&
+				  (dsttype == ORAVARCHARCHAROID || dsttype == ORAVARCHARBYTEOID))))
+				cast_expr = coerce_to_target_type(NULL,
+												  (Node *) placeholder, srctype,
+												  dsttype, dsttypmod,
+												  COERCION_EXPLICIT,
+												  COERCE_IMPLICIT_CAST,
+												  -1);
+			else
+				cast_expr = coerce_to_target_type(NULL,
+												  (Node *) placeholder, srctype,
+												  dsttype, dsttypmod,
+												  COERCION_PLPGSQL,
+												  COERCE_IMPLICIT_CAST,
+												  -1);
+		}
 
 		/*
 		 * If there's no cast path according to the parser, fall back to using
@@ -8738,7 +8773,7 @@ get_cast_hashentry(PLiSQL_execstate *estate,
  * ----------
  */
 static void
-exec_simple_check_plan(PLiSQL_execstate *estate, PLiSQL_expr *expr)
+exec_simple_check_plan(PLiSQL_execstate * estate, PLiSQL_expr * expr)
 {
 	List	   *plansources;
 	CachedPlanSource *plansource;
@@ -8858,7 +8893,7 @@ exec_simple_check_plan(PLiSQL_execstate *estate, PLiSQL_expr *expr)
  * exec_save_simple_expr --- extract simple expression from CachedPlan
  */
 static void
-exec_save_simple_expr(PLiSQL_expr *expr, CachedPlan *cplan)
+exec_save_simple_expr(PLiSQL_expr * expr, CachedPlan *cplan)
 {
 	PlannedStmt *stmt;
 	Plan	   *plan;
@@ -8983,7 +9018,7 @@ exec_save_simple_expr(PLiSQL_expr *expr, CachedPlan *cplan)
  * exec_run_select code path will flatten any expanded result anyway.
  */
 static void
-exec_check_rw_parameter(PLiSQL_expr *expr, int paramid)
+exec_check_rw_parameter(PLiSQL_expr * expr, int paramid)
 {
 	Expr	   *sexpr = expr->expr_simple_expr;
 	Oid			funcid;
@@ -9109,39 +9144,39 @@ exec_check_rw_parameter(PLiSQL_expr *expr, int paramid)
  * check package datum can be assigned
  */
 static void
-exec_check_packagedatum_assignable(PLiSQL_pkg_datum *pkg_datum, PLiSQL_execstate *estate)
+exec_check_packagedatum_assignable(PLiSQL_pkg_datum * pkg_datum, PLiSQL_execstate * estate)
 {
-        PLiSQL_datum *datum = pkg_datum->pkgvar;
-
-        switch (datum->dtype)
-        {
-                case PLISQL_DTYPE_PACKAGE_DATUM:
-                        {
-                                PLiSQL_pkg_datum *pkg1_datum = (PLiSQL_pkg_datum *) datum;
-
-                                exec_check_packagedatum_assignable(pkg1_datum, estate);
-                        }
-                        break;
-                case PLISQL_DTYPE_VAR:
-                case PLISQL_DTYPE_PROMISE:
-                case PLISQL_DTYPE_REC:
-                        if (((PLiSQL_variable *) datum)->isconst)
-                                ereport(ERROR,
-                                                (errcode(ERRCODE_ERROR_IN_ASSIGNMENT),
-                                                 errmsg("variable \"%s\" is declared CONSTANT",
-                                                                ((PLiSQL_variable *) datum)->refname)));
-                        break;
-                case PLISQL_DTYPE_ROW:
-                        /* always assignable; member vars were checked at compile time */
-                        break;
-                case PLISQL_DTYPE_RECFIELD:
-                        /* assignable if parent record is */
-                        exec_check_assignable(estate, ((PLiSQL_recfield *) datum)->recparentno);
-                        break;
-                default:
-                        elog(ERROR, "unrecognized dtype: %d", datum->dtype);
-                        break;
-        }
+	PLiSQL_datum *datum = pkg_datum->pkgvar;
+
+	switch (datum->dtype)
+	{
+		case PLISQL_DTYPE_PACKAGE_DATUM:
+			{
+				PLiSQL_pkg_datum *pkg1_datum = (PLiSQL_pkg_datum *) datum;
+
+				exec_check_packagedatum_assignable(pkg1_datum, estate);
+			}
+			break;
+		case PLISQL_DTYPE_VAR:
+		case PLISQL_DTYPE_PROMISE:
+		case PLISQL_DTYPE_REC:
+			if (((PLiSQL_variable *) datum)->isconst)
+				ereport(ERROR,
+						(errcode(ERRCODE_ERROR_IN_ASSIGNMENT),
+						 errmsg("variable \"%s\" is declared CONSTANT",
+								((PLiSQL_variable *) datum)->refname)));
+			break;
+		case PLISQL_DTYPE_ROW:
+			/* always assignable; member vars were checked at compile time */
+			break;
+		case PLISQL_DTYPE_RECFIELD:
+			/* assignable if parent record is */
+			exec_check_assignable(estate, ((PLiSQL_recfield *) datum)->recparentno);
+			break;
+		default:
+			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
+			break;
+	}
 }
 
 /*
@@ -9179,7 +9214,7 @@ count_param_references(Node *node, count_param_references_context *context)
  * This should match pl_gram.y's check_assignable().
  */
 static void
-exec_check_assignable(PLiSQL_execstate *estate, int dno)
+exec_check_assignable(PLiSQL_execstate * estate, int dno)
 {
 	PLiSQL_datum *datum;
 
@@ -9205,7 +9240,7 @@ exec_check_assignable(PLiSQL_execstate *estate, int dno)
 								  ((PLiSQL_recfield *) datum)->recparentno);
 			break;
 		case PLISQL_DTYPE_PACKAGE_DATUM:
-			exec_check_packagedatum_assignable((PLiSQL_pkg_datum *) datum, estate) ; 
+			exec_check_packagedatum_assignable((PLiSQL_pkg_datum *) datum, estate);
 			break;
 		default:
 			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
@@ -9218,7 +9253,7 @@ exec_check_assignable(PLiSQL_execstate *estate, int dno)
  * ----------
  */
 static void
-exec_set_found(PLiSQL_execstate *estate, bool state)
+exec_set_found(PLiSQL_execstate * estate, bool state)
 {
 	PLiSQL_var *var;
 
@@ -9234,7 +9269,7 @@ exec_set_found(PLiSQL_execstate *estate, bool state)
  * transaction end.  Ditto for shared_simple_eval_resowner.
  */
 static void
-plisql_create_econtext(PLiSQL_execstate *estate)
+plisql_create_econtext(PLiSQL_execstate * estate)
 {
 	SimpleEcontextStackEntry *entry;
 
@@ -9244,12 +9279,12 @@ plisql_create_econtext(PLiSQL_execstate *estate)
 	 * TopTransactionContext so it will have the right lifespan.
 	 *
 	 * Note that this path is never taken when beginning a DO block; the
-	 * required EState was already made by plisql_inline_handler.  However,
-	 * if the DO block executes COMMIT or ROLLBACK, then we'll come here and
-	 * make a shared EState to use for the rest of the DO block.  That's OK;
-	 * see the comments for shared_simple_eval_estate.  (Note also that a DO
-	 * block will continue to use its private cast hash table for the rest of
-	 * the block.  That's okay for now, but it might cause problems someday.)
+	 * required EState was already made by plisql_inline_handler.  However, if
+	 * the DO block executes COMMIT or ROLLBACK, then we'll come here and make
+	 * a shared EState to use for the rest of the DO block.  That's OK; see
+	 * the comments for shared_simple_eval_estate.  (Note also that a DO block
+	 * will continue to use its private cast hash table for the rest of the
+	 * block.  That's okay for now, but it might cause problems someday.)
 	 */
 	if (estate->simple_eval_estate == NULL)
 	{
@@ -9303,7 +9338,7 @@ plisql_create_econtext(PLiSQL_execstate *estate)
  * entry along with the context.
  */
 static void
-plisql_destroy_econtext(PLiSQL_execstate *estate)
+plisql_destroy_econtext(PLiSQL_execstate * estate)
 {
 	SimpleEcontextStackEntry *next;
 
@@ -9368,7 +9403,7 @@ plisql_xact_cb(XactEvent event, void *arg)
  */
 void
 plisql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
-				   SubTransactionId parentSubid, void *arg)
+				  SubTransactionId parentSubid, void *arg)
 {
 	if (event == SUBXACT_EVENT_COMMIT_SUB || event == SUBXACT_EVENT_ABORT_SUB)
 	{
@@ -9394,7 +9429,7 @@ plisql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
  * the detoasting business).
  */
 static void
-assign_simple_var(PLiSQL_execstate *estate, PLiSQL_var *var,
+assign_simple_var(PLiSQL_execstate * estate, PLiSQL_var * var,
 				  Datum newvalue, bool isnull, bool freeable)
 {
 	Assert(var->dtype == PLISQL_DTYPE_VAR ||
@@ -9424,7 +9459,7 @@ assign_simple_var(PLiSQL_execstate *estate, PLiSQL_var *var,
 		 */
 		if (OidIsValid(var->pkgoid))
 			oldcxt = MemoryContextSwitchTo(plisql_get_relevantContext(var->pkgoid,
-					get_eval_mcontext(estate)));
+																	  get_eval_mcontext(estate)));
 		else
 			oldcxt = MemoryContextSwitchTo(get_eval_mcontext(estate));
 		detoasted = PointerGetDatum(detoast_external_attr((struct varlena *) DatumGetPointer(newvalue)));
@@ -9465,14 +9500,14 @@ assign_simple_var(PLiSQL_execstate *estate, PLiSQL_var *var,
  * free old value of a text variable and assign new value from C string
  */
 static void
-assign_text_var(PLiSQL_execstate *estate, PLiSQL_var *var, const char *str)
+assign_text_var(PLiSQL_execstate * estate, PLiSQL_var * var, const char *str)
 {
 	MemoryContext ctx = NULL;
 
 	if (OidIsValid(var->pkgoid))
 	{
 		ctx = MemoryContextSwitchTo(plisql_get_relevantContext(var->pkgoid,
-											CurrentMemoryContext));
+															   CurrentMemoryContext));
 	}
 
 	assign_simple_var(estate, var, CStringGetTextDatum(str), false, true);
@@ -9485,7 +9520,7 @@ assign_text_var(PLiSQL_execstate *estate, PLiSQL_var *var, const char *str)
  * assign_record_var --- assign a new value to any REC datum.
  */
 static void
-assign_record_var(PLiSQL_execstate *estate, PLiSQL_rec *rec,
+assign_record_var(PLiSQL_execstate * estate, PLiSQL_rec * rec,
 				  ExpandedRecordHeader *erh)
 {
 	MemoryContext ctx = NULL;
@@ -9495,7 +9530,7 @@ assign_record_var(PLiSQL_execstate *estate, PLiSQL_rec *rec,
 	ctx = plisql_get_relevantContext(rec->pkgoid, estate->datum_context);
 
 	/* Transfer new record object into datum_context */
-	TransferExpandedRecord(erh, ctx); 
+	TransferExpandedRecord(erh, ctx);
 
 	/* Free the old value ... */
 	if (rec->erh)
@@ -9512,7 +9547,7 @@ assign_record_var(PLiSQL_execstate *estate, PLiSQL_rec *rec,
  * be freed by resetting that context.
  */
 static ParamListInfo
-exec_eval_using_params(PLiSQL_execstate *estate, List *params)
+exec_eval_using_params(PLiSQL_execstate * estate, List *params)
 {
 	ParamListInfo paramLI;
 	int			nargs;
@@ -9594,8 +9629,8 @@ exec_eval_using_params(PLiSQL_execstate *estate, List *params)
  * simpler to do it here.
  */
 static Portal
-exec_dynquery_with_params(PLiSQL_execstate *estate,
-						  PLiSQL_expr *dynquery,
+exec_dynquery_with_params(PLiSQL_execstate * estate,
+						  PLiSQL_expr * dynquery,
 						  List *params,
 						  const char *portalname,
 						  int cursorOptions)
@@ -9655,8 +9690,8 @@ exec_dynquery_with_params(PLiSQL_execstate *estate,
  * The result is in the eval_mcontext.
  */
 static char *
-format_expr_params(PLiSQL_execstate *estate,
-				   const PLiSQL_expr *expr)
+format_expr_params(PLiSQL_execstate * estate,
+				   const PLiSQL_expr * expr)
 {
 	int			paramno;
 	int			dno;
@@ -9712,7 +9747,7 @@ format_expr_params(PLiSQL_execstate *estate,
  * The result is in the eval_mcontext.
  */
 static char *
-format_preparedparamsdata(PLiSQL_execstate *estate,
+format_preparedparamsdata(PLiSQL_execstate * estate,
 						  ParamListInfo paramLI)
 {
 	int			paramno;
@@ -9768,22 +9803,22 @@ plisql_out_param_setup(void *s)
 
 /*
  * plisql_out_param
- * separate the return value of function from the tuple 
+ * separate the return value of function from the tuple
  * which combined out parameter and the return value,
  * and assign values to out parameters.
  */
 static void
 plisql_out_param(ExprState *state, ExprEvalStep *op)
 {
-	PLiSQL_execstate *estate = (PLiSQL_execstate *)op->d.out_params.pestate;
-	Datum 		  value = *op->resvalue;
-	bool 		  isNull = *op->resnull;
-	int 		  nout = op->d.out_params.nout;
-	int    		 *paramids = op->d.out_params.paramids;
-	MemoryContext 	old;
+	PLiSQL_execstate *estate = (PLiSQL_execstate *) op->d.out_params.pestate;
+	Datum		value = *op->resvalue;
+	bool		isNull = *op->resnull;
+	int			nout = op->d.out_params.nout;
+	int		   *paramids = op->d.out_params.paramids;
+	MemoryContext old;
 	Datum		func_retval;
-	int		i;
-	HeapTupleData 	tmptup;
+	int			i;
+	HeapTupleData tmptup;
 	TupleDesc	tupdesc = NULL;
 
 	old = MemoryContextSwitchTo(estate->datum_context);
@@ -9793,10 +9828,10 @@ plisql_out_param(ExprState *state, ExprEvalStep *op)
 	/* assign value to out parameters */
 	for (i = 0; i < nout; i++)
 	{
-		bool	  	isnull;
-		Oid 		valtype;
+		bool		isnull;
+		Oid			valtype;
 		int32		valtypmod = -1;
-		PLiSQL_datum    *target;
+		PLiSQL_datum *target;
 
 		target = estate->datums[paramids[i]];
 
@@ -9805,7 +9840,7 @@ plisql_out_param(ExprState *state, ExprEvalStep *op)
 		value = SPI_getbinval(&tmptup, tupdesc, i + 1, &isnull);
 
 		exec_assign_value(estate, target, value, isnull,
-					valtype, valtypmod);
+						  valtype, valtypmod);
 	}
 
 	/* get the function real return value */
@@ -9825,15 +9860,15 @@ plisql_out_param(ExprState *state, ExprEvalStep *op)
  * should return out parameters.
  */
 static void
-plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiSQL_function *func)
+plisql_anonymous_return_out_parameter(PLiSQL_execstate * estate, PLiSQL_function * func)
 {
-	int	i = 0;
-	int 	j = 0;
+	int			i = 0;
+	int			j = 0;
 	HeapTuple	tup;
 	PLiSQL_variable **out_variables = NULL;
 	PLiSQL_row *row;
 
-	out_variables = (PLiSQL_variable **) palloc0(func->fn_nargs * sizeof(PLiSQL_variable *));
+	out_variables = (PLiSQL_variable * *) palloc0(func->fn_nargs * sizeof(PLiSQL_variable *));
 
 	for (i = 0; i < func->fn_nargs; i++)
 	{
@@ -9841,15 +9876,15 @@ plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiSQL_function
 
 		if (argvariable->dtype == PLISQL_DTYPE_VAR)
 		{
-			if (((PLiSQL_var *)argvariable)->info == PROARGMODE_OUT ||
-				((PLiSQL_var *)argvariable)->info == PROARGMODE_INOUT)
+			if (((PLiSQL_var *) argvariable)->info == PROARGMODE_OUT ||
+				((PLiSQL_var *) argvariable)->info == PROARGMODE_INOUT)
 				out_variables[j++] = (PLiSQL_variable *) estate->datums[func->fn_argvarnos[i]];
 		}
 		else
 		{
 			Assert(argvariable->dtype == PLISQL_DTYPE_REC);
-			if (((PLiSQL_rec *)argvariable)->info == PROARGMODE_OUT ||
-				((PLiSQL_rec *)argvariable)->info == PROARGMODE_INOUT)
+			if (((PLiSQL_rec *) argvariable)->info == PROARGMODE_OUT ||
+				((PLiSQL_rec *) argvariable)->info == PROARGMODE_INOUT)
 				out_variables[j++] = (PLiSQL_variable *) estate->datums[func->fn_argvarnos[i]];
 		}
 	}
@@ -9859,11 +9894,11 @@ plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiSQL_function
 
 	pfree(out_variables);
 
-	if (!row->rowtupdesc)	/* should not happen */
+	if (!row->rowtupdesc)		/* should not happen */
 		elog(ERROR, "row variable has no tupdesc");
 
 	tup = make_tuple_from_row(estate, row, row->rowtupdesc);
-	if (tup == NULL)	/* should not happen */
+	if (tup == NULL)			/* should not happen */
 		elog(ERROR, "row not compatible with its own tupdesc");
 
 	estate->retval = HeapTupleGetDatum(tup);
@@ -9873,4 +9908,3 @@ plisql_anonymous_return_out_parameter(PLiSQL_execstate *estate, PLiSQL_function
 
 	return;
 }
-
diff --git a/src/pl/plisql/src/pl_funcs.c b/src/pl/plisql/src/pl_funcs.c
index 3e4296c1fbd..7118ae866ad 100644
--- a/src/pl/plisql/src/pl_funcs.c
+++ b/src/pl/plisql/src/pl_funcs.c
@@ -3,14 +3,14 @@
  * pl_funcs.c		- Misc functions for the PL/iSQL
  *			  procedural language
  *
- * Portions Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2024-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_funcs.c
  *
- * add the file for requirement "SQL PARSER"
+ * add the file for "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@
  * items.
  * ----------
  */
-static PLiSQL_nsitem *ns_top = NULL;
+static PLiSQL_nsitem * ns_top = NULL;
 
 
 /* ----------
@@ -50,7 +50,7 @@ plisql_ns_init(void)
 }
 
 void
-plisql_set_ns(PLiSQL_nsitem *cur)
+plisql_set_ns(PLiSQL_nsitem * cur)
 {
 	ns_top = cur;
 }
@@ -137,9 +137,9 @@ plisql_ns_additem(PLiSQL_nsitem_type itemtype, int itemno, const char *name)
  * ----------
  */
 PLiSQL_nsitem *
-plisql_ns_lookup(PLiSQL_nsitem *ns_cur, bool localmode,
-				  const char *name1, const char *name2, const char *name3,
-				  int *names_used)
+plisql_ns_lookup(PLiSQL_nsitem * ns_cur, bool localmode,
+				 const char *name1, const char *name2, const char *name3,
+				 int *names_used)
 {
 	/* Outer loop iterates once per block level in the namespace chain */
 	while (ns_cur != NULL)
@@ -202,7 +202,7 @@ plisql_ns_lookup(PLiSQL_nsitem *ns_cur, bool localmode,
  * ----------
  */
 PLiSQL_nsitem *
-plisql_ns_lookup_label(PLiSQL_nsitem *ns_cur, const char *name)
+plisql_ns_lookup_label(PLiSQL_nsitem * ns_cur, const char *name)
 {
 	while (ns_cur != NULL)
 	{
@@ -221,7 +221,7 @@ plisql_ns_lookup_label(PLiSQL_nsitem *ns_cur, const char *name)
  * ----------
  */
 PLiSQL_nsitem *
-plisql_ns_find_nearest_loop(PLiSQL_nsitem *ns_cur)
+plisql_ns_find_nearest_loop(PLiSQL_nsitem * ns_cur)
 {
 	while (ns_cur != NULL)
 	{
@@ -239,7 +239,7 @@ plisql_ns_find_nearest_loop(PLiSQL_nsitem *ns_cur)
  * Statement type as a string, for use in error messages etc.
  */
 const char *
-plisql_stmt_typename(PLiSQL_stmt *stmt)
+plisql_stmt_typename(PLiSQL_stmt * stmt)
 {
 	switch (stmt->cmd_type)
 	{
@@ -356,10 +356,10 @@ plisql_getdiag_kindname(PLiSQL_getdiag_kind kind)
  * plisql_statement_tree_walker().  The expression callback can be a
  * no-op if no per-expression behavior is needed.
  **********************************************************************/
-typedef void (*plisql_stmt_walker_callback) (PLiSQL_stmt *stmt,
-											  void *context);
-typedef void (*plisql_expr_walker_callback) (PLiSQL_expr *expr,
-											  void *context);
+typedef void (*plisql_stmt_walker_callback) (PLiSQL_stmt * stmt,
+											 void *context);
+typedef void (*plisql_expr_walker_callback) (PLiSQL_expr * expr,
+											 void *context);
 
 /*
  * As in nodeFuncs.h, we respectfully decline to support the C standard's
@@ -371,10 +371,10 @@ typedef void (*plisql_expr_walker_callback) (PLiSQL_expr *expr,
 									   (plisql_expr_walker_callback) (ew), c)
 
 static void
-plisql_statement_tree_walker_impl(PLiSQL_stmt *stmt,
-								   plisql_stmt_walker_callback stmt_callback,
-								   plisql_expr_walker_callback expr_callback,
-								   void *context)
+plisql_statement_tree_walker_impl(PLiSQL_stmt * stmt,
+								  plisql_stmt_walker_callback stmt_callback,
+								  plisql_expr_walker_callback expr_callback,
+								  void *context)
 {
 #define S_WALK(st) stmt_callback(st, context)
 #define E_WALK(ex) expr_callback(ex, context)
@@ -625,11 +625,11 @@ plisql_statement_tree_walker_impl(PLiSQL_stmt *stmt,
  * Within the recursion, local_dnos is a Bitmapset of dnos of variables
  * known to be declared within the current exception level.
  **********************************************************************/
-static void mark_stmt(PLiSQL_stmt *stmt, Bitmapset *local_dnos);
-static void mark_expr(PLiSQL_expr *expr, Bitmapset *local_dnos);
+static void mark_stmt(PLiSQL_stmt * stmt, Bitmapset *local_dnos);
+static void mark_expr(PLiSQL_expr * expr, Bitmapset *local_dnos);
 
 static void
-mark_stmt(PLiSQL_stmt *stmt, Bitmapset *local_dnos)
+mark_stmt(PLiSQL_stmt * stmt, Bitmapset *local_dnos)
 {
 	if (stmt == NULL)
 		return;
@@ -659,7 +659,7 @@ mark_stmt(PLiSQL_stmt *stmt, Bitmapset *local_dnos)
 			for (int i = 0; i < block->n_initvars; i++)
 				local_dnos = bms_add_member(local_dnos, block->initvarnos[i]);
 			plisql_statement_tree_walker(stmt, mark_stmt, mark_expr,
-										  local_dnos);
+										 local_dnos);
 			bms_free(local_dnos);
 		}
 	}
@@ -668,7 +668,7 @@ mark_stmt(PLiSQL_stmt *stmt, Bitmapset *local_dnos)
 }
 
 static void
-mark_expr(PLiSQL_expr *expr, Bitmapset *local_dnos)
+mark_expr(PLiSQL_expr * expr, Bitmapset *local_dnos)
 {
 	/*
 	 * If this expression has an assignment target, check whether the target
@@ -679,7 +679,7 @@ mark_expr(PLiSQL_expr *expr, Bitmapset *local_dnos)
 }
 
 void
-plisql_mark_local_assignment_targets(PLiSQL_function *func)
+plisql_mark_local_assignment_targets(PLiSQL_function * func)
 {
 	Bitmapset  *local_dnos;
 
@@ -700,11 +700,11 @@ plisql_mark_local_assignment_targets(PLiSQL_function *func)
  * The function tree itself, along with subsidiary data, is freed in
  * one swoop by freeing the function's permanent memory context.
  **********************************************************************/
-static void free_stmt(PLiSQL_stmt *stmt, void *context);
-static void free_expr(PLiSQL_expr *expr, void *context);
+static void free_stmt(PLiSQL_stmt * stmt, void *context);
+static void free_expr(PLiSQL_expr * expr, void *context);
 
 static void
-free_stmt(PLiSQL_stmt *stmt, void *context)
+free_stmt(PLiSQL_stmt * stmt, void *context)
 {
 	if (stmt == NULL)
 		return;
@@ -712,7 +712,7 @@ free_stmt(PLiSQL_stmt *stmt, void *context)
 }
 
 static void
-free_expr(PLiSQL_expr *expr, void *context)
+free_expr(PLiSQL_expr * expr, void *context)
 {
 	if (expr && expr->plan)
 	{
@@ -722,7 +722,7 @@ free_expr(PLiSQL_expr *expr, void *context)
 }
 
 void
-plisql_free_function_memory(PLiSQL_function *func,
+plisql_free_function_memory(PLiSQL_function * func,
 							int start_datum, int start_subprocfunc)
 {
 	int			i;
@@ -746,7 +746,7 @@ plisql_free_function_memory(PLiSQL_function *func,
 
 					free_expr(var->default_val, NULL);
 					free_expr(var->cursor_explicit_expr, NULL);
-					/* we should close package explicit cursor */
+					/* Close package-level explicit cursor if open */
 					if (OidIsValid(var->pkgoid) &&
 						var->datatype->typoid == REFCURSOROID &&
 						plisql_cursor_is_open(var))
@@ -779,7 +779,7 @@ plisql_free_function_memory(PLiSQL_function *func,
 	/* release subproc function */
 	for (i = start_subprocfunc; i < func->nsubprocfuncs; i++)
 	{
-		ListCell *lc;
+		ListCell   *lc;
 		PLiSQL_subproc_function *subprocfunc = func->subprocfuncs[i];
 
 		foreach(lc, subprocfunc->arg)
@@ -792,24 +792,24 @@ plisql_free_function_memory(PLiSQL_function *func,
 			subprocfunc->poly_tab == NULL)
 		{
 			/*
-			 * if no action, the lastoutvardno and lastoutinlinefno is invalid
-			 * we must not free its context
+			 * if there is no action, the lastoutvardno and lastoutinlinefno must be invalid,
+			 * we should not free its context.
 			 */
 			if (subprocfunc->function->action != NULL)
 				plisql_free_function_memory(subprocfunc->function, subprocfunc->lastoutvardno,
-								subprocfunc->lastoutsubprocfno);
+											subprocfunc->lastoutsubprocfno);
 		}
 		else
 		{
-			/* free inline function from  hashtable */
+			/* free inline function from hashtable */
 			HASH_SEQ_STATUS status;
 			plisql_HashEnt *entry;
 
 			Assert(subprocfunc->poly_tab != NULL);
 
 			/*
-			 * if no action, the lastoutvardno and lastoutinlinefno is invalid
-			 * we must not free its context
+			 * if there is no action, the lastoutvardno and lastoutinlinefno must be invalid,
+			 * we should not free its context.
 			 */
 			if (subprocfunc->function->action != NULL)
 			{
@@ -817,7 +817,7 @@ plisql_free_function_memory(PLiSQL_function *func,
 
 				while ((entry = (plisql_HashEnt *) hash_seq_search(&status)) != NULL)
 				{
-					hash_search(subprocfunc->poly_tab, (void *)(&(entry->key)), HASH_REMOVE, NULL);
+					hash_search(subprocfunc->poly_tab, (void *) (&(entry->key)), HASH_REMOVE, NULL);
 					plisql_free_function_memory(entry->function, subprocfunc->lastoutvardno, subprocfunc->lastoutsubprocfno);
 				}
 			}
@@ -847,36 +847,36 @@ plisql_free_function_memory(PLiSQL_function *func,
 static int	dump_indent;
 
 static void dump_ind(void);
-static void dump_stmt(PLiSQL_stmt *stmt);
-static void dump_block(PLiSQL_stmt_block *block);
-static void dump_assign(PLiSQL_stmt_assign *stmt);
-static void dump_if(PLiSQL_stmt_if *stmt);
-static void dump_case(PLiSQL_stmt_case *stmt);
-static void dump_loop(PLiSQL_stmt_loop *stmt);
-static void dump_while(PLiSQL_stmt_while *stmt);
-static void dump_fori(PLiSQL_stmt_fori *stmt);
-static void dump_fors(PLiSQL_stmt_fors *stmt);
-static void dump_forc(PLiSQL_stmt_forc *stmt);
-static void dump_foreach_a(PLiSQL_stmt_foreach_a *stmt);
-static void dump_exit(PLiSQL_stmt_exit *stmt);
-static void dump_return(PLiSQL_stmt_return *stmt);
-static void dump_return_next(PLiSQL_stmt_return_next *stmt);
-static void dump_return_query(PLiSQL_stmt_return_query *stmt);
-static void dump_raise(PLiSQL_stmt_raise *stmt);
-static void dump_assert(PLiSQL_stmt_assert *stmt);
-static void dump_execsql(PLiSQL_stmt_execsql *stmt);
-static void dump_dynexecute(PLiSQL_stmt_dynexecute *stmt);
-static void dump_dynfors(PLiSQL_stmt_dynfors *stmt);
-static void dump_getdiag(PLiSQL_stmt_getdiag *stmt);
-static void dump_open(PLiSQL_stmt_open *stmt);
-static void dump_fetch(PLiSQL_stmt_fetch *stmt);
-static void dump_cursor_direction(PLiSQL_stmt_fetch *stmt);
-static void dump_close(PLiSQL_stmt_close *stmt);
-static void dump_perform(PLiSQL_stmt_perform *stmt);
-static void dump_call(PLiSQL_stmt_call *stmt);
-static void dump_commit(PLiSQL_stmt_commit *stmt);
-static void dump_rollback(PLiSQL_stmt_rollback *stmt);
-static void dump_expr(PLiSQL_expr *expr);
+static void dump_stmt(PLiSQL_stmt * stmt);
+static void dump_block(PLiSQL_stmt_block * block);
+static void dump_assign(PLiSQL_stmt_assign * stmt);
+static void dump_if(PLiSQL_stmt_if * stmt);
+static void dump_case(PLiSQL_stmt_case * stmt);
+static void dump_loop(PLiSQL_stmt_loop * stmt);
+static void dump_while(PLiSQL_stmt_while * stmt);
+static void dump_fori(PLiSQL_stmt_fori * stmt);
+static void dump_fors(PLiSQL_stmt_fors * stmt);
+static void dump_forc(PLiSQL_stmt_forc * stmt);
+static void dump_foreach_a(PLiSQL_stmt_foreach_a * stmt);
+static void dump_exit(PLiSQL_stmt_exit * stmt);
+static void dump_return(PLiSQL_stmt_return * stmt);
+static void dump_return_next(PLiSQL_stmt_return_next * stmt);
+static void dump_return_query(PLiSQL_stmt_return_query * stmt);
+static void dump_raise(PLiSQL_stmt_raise * stmt);
+static void dump_assert(PLiSQL_stmt_assert * stmt);
+static void dump_execsql(PLiSQL_stmt_execsql * stmt);
+static void dump_dynexecute(PLiSQL_stmt_dynexecute * stmt);
+static void dump_dynfors(PLiSQL_stmt_dynfors * stmt);
+static void dump_getdiag(PLiSQL_stmt_getdiag * stmt);
+static void dump_open(PLiSQL_stmt_open * stmt);
+static void dump_fetch(PLiSQL_stmt_fetch * stmt);
+static void dump_cursor_direction(PLiSQL_stmt_fetch * stmt);
+static void dump_close(PLiSQL_stmt_close * stmt);
+static void dump_perform(PLiSQL_stmt_perform * stmt);
+static void dump_call(PLiSQL_stmt_call * stmt);
+static void dump_commit(PLiSQL_stmt_commit * stmt);
+static void dump_rollback(PLiSQL_stmt_rollback * stmt);
+static void dump_expr(PLiSQL_expr * expr);
 
 
 static void
@@ -889,7 +889,7 @@ dump_ind(void)
 }
 
 static void
-dump_stmt(PLiSQL_stmt *stmt)
+dump_stmt(PLiSQL_stmt * stmt)
 {
 	printf("%3d:", stmt->lineno);
 	switch (stmt->cmd_type)
@@ -993,7 +993,7 @@ dump_stmts(List *stmts)
 }
 
 static void
-dump_block(PLiSQL_stmt_block *block)
+dump_block(PLiSQL_stmt_block * block)
 {
 	char	   *name;
 
@@ -1034,7 +1034,7 @@ dump_block(PLiSQL_stmt_block *block)
 }
 
 static void
-dump_assign(PLiSQL_stmt_assign *stmt)
+dump_assign(PLiSQL_stmt_assign * stmt)
 {
 	dump_ind();
 	printf("ASSIGN var %d := ", stmt->varno);
@@ -1043,7 +1043,7 @@ dump_assign(PLiSQL_stmt_assign *stmt)
 }
 
 static void
-dump_if(PLiSQL_stmt_if *stmt)
+dump_if(PLiSQL_stmt_if * stmt)
 {
 	ListCell   *l;
 
@@ -1073,7 +1073,7 @@ dump_if(PLiSQL_stmt_if *stmt)
 }
 
 static void
-dump_case(PLiSQL_stmt_case *stmt)
+dump_case(PLiSQL_stmt_case * stmt)
 {
 	ListCell   *l;
 
@@ -1111,7 +1111,7 @@ dump_case(PLiSQL_stmt_case *stmt)
 }
 
 static void
-dump_loop(PLiSQL_stmt_loop *stmt)
+dump_loop(PLiSQL_stmt_loop * stmt)
 {
 	dump_ind();
 	printf("LOOP\n");
@@ -1123,7 +1123,7 @@ dump_loop(PLiSQL_stmt_loop *stmt)
 }
 
 static void
-dump_while(PLiSQL_stmt_while *stmt)
+dump_while(PLiSQL_stmt_while * stmt)
 {
 	dump_ind();
 	printf("WHILE ");
@@ -1137,7 +1137,7 @@ dump_while(PLiSQL_stmt_while *stmt)
 }
 
 static void
-dump_fori(PLiSQL_stmt_fori *stmt)
+dump_fori(PLiSQL_stmt_fori * stmt)
 {
 	dump_ind();
 	printf("FORI %s %s\n", stmt->var->refname, (stmt->reverse) ? "REVERSE" : "NORMAL");
@@ -1167,7 +1167,7 @@ dump_fori(PLiSQL_stmt_fori *stmt)
 }
 
 static void
-dump_fors(PLiSQL_stmt_fors *stmt)
+dump_fors(PLiSQL_stmt_fors * stmt)
 {
 	dump_ind();
 	printf("FORS %s ", stmt->var->refname);
@@ -1181,7 +1181,7 @@ dump_fors(PLiSQL_stmt_fors *stmt)
 }
 
 static void
-dump_forc(PLiSQL_stmt_forc *stmt)
+dump_forc(PLiSQL_stmt_forc * stmt)
 {
 	dump_ind();
 	printf("FORC %s ", stmt->var->refname);
@@ -1204,7 +1204,7 @@ dump_forc(PLiSQL_stmt_forc *stmt)
 }
 
 static void
-dump_foreach_a(PLiSQL_stmt_foreach_a *stmt)
+dump_foreach_a(PLiSQL_stmt_foreach_a * stmt)
 {
 	dump_ind();
 	printf("FOREACHA var %d ", stmt->varno);
@@ -1221,7 +1221,7 @@ dump_foreach_a(PLiSQL_stmt_foreach_a *stmt)
 }
 
 static void
-dump_open(PLiSQL_stmt_open *stmt)
+dump_open(PLiSQL_stmt_open * stmt)
 {
 	dump_ind();
 	printf("OPEN curvar=%d\n", stmt->curvar);
@@ -1272,7 +1272,7 @@ dump_open(PLiSQL_stmt_open *stmt)
 }
 
 static void
-dump_fetch(PLiSQL_stmt_fetch *stmt)
+dump_fetch(PLiSQL_stmt_fetch * stmt)
 {
 	dump_ind();
 
@@ -1298,7 +1298,7 @@ dump_fetch(PLiSQL_stmt_fetch *stmt)
 }
 
 static void
-dump_cursor_direction(PLiSQL_stmt_fetch *stmt)
+dump_cursor_direction(PLiSQL_stmt_fetch * stmt)
 {
 	dump_indent += 2;
 	dump_ind();
@@ -1332,14 +1332,14 @@ dump_cursor_direction(PLiSQL_stmt_fetch *stmt)
 }
 
 static void
-dump_close(PLiSQL_stmt_close *stmt)
+dump_close(PLiSQL_stmt_close * stmt)
 {
 	dump_ind();
 	printf("CLOSE curvar=%d\n", stmt->curvar);
 }
 
 static void
-dump_perform(PLiSQL_stmt_perform *stmt)
+dump_perform(PLiSQL_stmt_perform * stmt)
 {
 	dump_ind();
 	printf("PERFORM expr = ");
@@ -1348,7 +1348,7 @@ dump_perform(PLiSQL_stmt_perform *stmt)
 }
 
 static void
-dump_call(PLiSQL_stmt_call *stmt)
+dump_call(PLiSQL_stmt_call * stmt)
 {
 	dump_ind();
 	printf("%s expr = ", stmt->is_call ? "CALL" : "DO");
@@ -1357,7 +1357,7 @@ dump_call(PLiSQL_stmt_call *stmt)
 }
 
 static void
-dump_commit(PLiSQL_stmt_commit *stmt)
+dump_commit(PLiSQL_stmt_commit * stmt)
 {
 	dump_ind();
 	if (stmt->chain)
@@ -1367,7 +1367,7 @@ dump_commit(PLiSQL_stmt_commit *stmt)
 }
 
 static void
-dump_rollback(PLiSQL_stmt_rollback *stmt)
+dump_rollback(PLiSQL_stmt_rollback * stmt)
 {
 	dump_ind();
 	if (stmt->chain)
@@ -1377,7 +1377,7 @@ dump_rollback(PLiSQL_stmt_rollback *stmt)
 }
 
 static void
-dump_exit(PLiSQL_stmt_exit *stmt)
+dump_exit(PLiSQL_stmt_exit * stmt)
 {
 	dump_ind();
 	printf("%s", stmt->is_exit ? "EXIT" : "CONTINUE");
@@ -1392,7 +1392,7 @@ dump_exit(PLiSQL_stmt_exit *stmt)
 }
 
 static void
-dump_return(PLiSQL_stmt_return *stmt)
+dump_return(PLiSQL_stmt_return * stmt)
 {
 	dump_ind();
 	printf("RETURN ");
@@ -1406,7 +1406,7 @@ dump_return(PLiSQL_stmt_return *stmt)
 }
 
 static void
-dump_return_next(PLiSQL_stmt_return_next *stmt)
+dump_return_next(PLiSQL_stmt_return_next * stmt)
 {
 	dump_ind();
 	printf("RETURN NEXT ");
@@ -1420,7 +1420,7 @@ dump_return_next(PLiSQL_stmt_return_next *stmt)
 }
 
 static void
-dump_return_query(PLiSQL_stmt_return_query *stmt)
+dump_return_query(PLiSQL_stmt_return_query * stmt)
 {
 	dump_ind();
 	if (stmt->query)
@@ -1457,7 +1457,7 @@ dump_return_query(PLiSQL_stmt_return_query *stmt)
 }
 
 static void
-dump_raise(PLiSQL_stmt_raise *stmt)
+dump_raise(PLiSQL_stmt_raise * stmt)
 {
 	ListCell   *lc;
 	int			i = 0;
@@ -1526,7 +1526,7 @@ dump_raise(PLiSQL_stmt_raise *stmt)
 }
 
 static void
-dump_assert(PLiSQL_stmt_assert *stmt)
+dump_assert(PLiSQL_stmt_assert * stmt)
 {
 	dump_ind();
 	printf("ASSERT ");
@@ -1545,7 +1545,7 @@ dump_assert(PLiSQL_stmt_assert *stmt)
 }
 
 static void
-dump_execsql(PLiSQL_stmt_execsql *stmt)
+dump_execsql(PLiSQL_stmt_execsql * stmt)
 {
 	dump_ind();
 	printf("EXECSQL ");
@@ -1564,7 +1564,7 @@ dump_execsql(PLiSQL_stmt_execsql *stmt)
 }
 
 static void
-dump_dynexecute(PLiSQL_stmt_dynexecute *stmt)
+dump_dynexecute(PLiSQL_stmt_dynexecute * stmt)
 {
 	dump_ind();
 	printf("EXECUTE ");
@@ -1601,7 +1601,7 @@ dump_dynexecute(PLiSQL_stmt_dynexecute *stmt)
 }
 
 static void
-dump_dynfors(PLiSQL_stmt_dynfors *stmt)
+dump_dynfors(PLiSQL_stmt_dynfors * stmt)
 {
 	dump_ind();
 	printf("FORS %s EXECUTE ", stmt->var->refname);
@@ -1632,7 +1632,7 @@ dump_dynfors(PLiSQL_stmt_dynfors *stmt)
 }
 
 static void
-dump_getdiag(PLiSQL_stmt_getdiag *stmt)
+dump_getdiag(PLiSQL_stmt_getdiag * stmt)
 {
 	ListCell   *lc;
 
@@ -1652,7 +1652,7 @@ dump_getdiag(PLiSQL_stmt_getdiag *stmt)
 }
 
 static void
-dump_expr(PLiSQL_expr *expr)
+dump_expr(PLiSQL_expr * expr)
 {
 	printf("'%s'", expr->query);
 	if (expr->target_param >= 0)
@@ -1661,7 +1661,7 @@ dump_expr(PLiSQL_expr *expr)
 }
 
 void
-plisql_dumptree(PLiSQL_function *func, int start_datum, int start_subprocfunc) 
+plisql_dumptree(PLiSQL_function * func, int start_datum, int start_subprocfunc)
 {
 	int			i;
 	PLiSQL_datum *d;
@@ -1767,24 +1767,24 @@ plisql_dumptree(PLiSQL_function *func, int start_datum, int start_subprocfunc)
 			printf("Arguments: 0\n");
 		else
 		{
-			ListCell *lc;
-			int j = 0;
+			ListCell   *lc;
+			int			j = 0;
 
 			printf("Arguments: %d\n", list_length(subprocfunc->arg));
-			foreach (lc, subprocfunc->arg)
+			foreach(lc, subprocfunc->arg)
 			{
 				PLiSQL_function_argitem *argitem = (PLiSQL_function_argitem *) lfirst(lc);
-				char *typname;
+				char	   *typname;
 
 				printf("    entry %d: ", j);
 				typname = argitem->type->typname;
 
 				printf("Argument: argno:%d, argname:%s, argtype:%s\n",
-						j++, argitem->argname, typname);
+					   j++, argitem->argname, typname);
 			}
 		}
 		plisql_dumptree(subprocfunc->function, subprocfunc->lastoutvardno,
-								subprocfunc->lastoutsubprocfno);
+						subprocfunc->lastoutsubprocfno);
 		printf("\nEnd of subprocfunction %s\n\n", subprocfunc->func_name);
 	}
 
diff --git a/src/pl/plisql/src/pl_gram.y b/src/pl/plisql/src/pl_gram.y
index 0835f4b4597..9f2f6e87d84 100644
--- a/src/pl/plisql/src/pl_gram.y
+++ b/src/pl/plisql/src/pl_gram.y
@@ -3,14 +3,14 @@
  *
  * pl_gram.y			- Parser for the PL/iSQL procedural language
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_gram.y
  *
- * add the file for requirement "SQL PARSER"
+ * add the file for "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -488,12 +488,12 @@ ora_outermost_pl_block		: ora_decl_sect K_BEGIN proc_sect exception_sect K_END o
 		{
 			PLiSQL_stmt_block *new;
 
-			/* package specification doesn't be allowed to include begin */
+			/* package specification doesn't allow to include begin */
 			if (plisql_compile_packageitem != NULL &&
 				!plisql_compile_packageitem->finish_compile_special)
 				yyerror(&yylloc, NULL, yyscanner,  "syntax error for package specificaion have a body");
 
-			/* we only consider package body level */
+			/* Only consider package body level here */
 			if (plisql_compile_packageitem != NULL &&
 				cur_compile_func_level == 0)
 			{
@@ -516,7 +516,7 @@ ora_outermost_pl_block		: ora_decl_sect K_BEGIN proc_sect exception_sect K_END o
 
 			check_labels($1.label, $6, @6, yyscanner);
 			/*
-			 * no decalre keyword, we don't add lable block namespace
+			 * No DECLARE keyword, so do not add a label block namespace
 			 */
 			if ($1.popname)
 				plisql_ns_pop();
@@ -526,8 +526,7 @@ ora_outermost_pl_block		: ora_decl_sect K_BEGIN proc_sect exception_sect K_END o
 	;
 
 /*
- * package and its body define for which
- * has no init block
+ * definition of package and its body which has no init block
  */
 ora_pl_package: ora_decl_sect K_END opt_label
 			{
@@ -556,7 +555,7 @@ ora_pl_package: ora_decl_sect K_END opt_label
 					plisql_compile_packageitem->status =
 								plisql_set_package_compile_status();
 				/*
-				 * no decalre keyword, we don't add lable block namespace
+				 * No DECLARE keyword, so do not add a label block namespace
 				 */
 				if ($1.popname)
 					plisql_ns_pop();
@@ -820,7 +819,7 @@ decl_statement	: decl_varname decl_const decl_datatype decl_collate decl_notnull
 				/* function or procedure declare or define */
 				| function_heading function_properties ';'
 					{
-						/* check does it duplicate declare */
+						/* check if duplicate declare */
 						if ($1->has_declare)
 							yyerror(&yylloc, NULL, yyscanner, "duplicate declaration");
 						$1->has_declare = true;
@@ -864,7 +863,7 @@ decl_statement	: decl_varname decl_const decl_datatype decl_collate decl_notnull
 					}
 				| procedure_heading procedure_properties ';'
 					{
-						/* check does it duplicate declare */
+						/* check if duplicate declare */
 						if ($1->has_declare)
 							yyerror(&yylloc, NULL, yyscanner, "duplicate declaration");
 						plisql_check_subprocfunc_properties($1,$2, false);
@@ -1816,9 +1815,9 @@ getdiag_item :
 getdiag_target	: T_DATUM
 					{
 						/*
-						 * In principle we should support a getdiag_target
-						 * that is an array element, but for now we don't, so
-						 * just throw an error if next token is '['.
+             * In principle, an array-element getdiag_target could be
+             * supported; currently it is not, so throw an error if the
+             * next token is '['.
 						 */
 						if (is_row_record_datum($1.datum) || 
 							plisql_peek(yyscanner) == '[')
@@ -2272,8 +2271,8 @@ for_control		: for_variable K_IN
  *
  * However, if we see a comma-separated list of names, we know that it
  * can't be an integer FOR loop and so it's OK to check the variables
- * immediately.  In particular, for T_WORD followed by comma, we should
- * complain that the name is not known rather than say it's a syntax error.
+ * immediately.  In particular, for T_WORD followed by comma, report that the
+ * name is not known rather than issuing a generic syntax error.
  * Note that the non-error result of this case sets *both* $$.scalar and
  * $$.row; see the for_control production.
  */
@@ -2641,8 +2640,8 @@ loop_body		: proc_sect K_END K_LOOP opt_label ';'
 /*
  * T_WORD+T_CWORD match any initial identifier that is not a known plisql
  * variable.  (The composite case is probably a syntax error, but we'll let
- * the core parser decide that.)  Normally, we should assume that such a
- * word is a SQL statement keyword that isn't also a plisql keyword.
+ * the core parser decide that.)  Normally, assume that such a word is a SQL
+ * statement keyword that isn't also a plisql keyword.
  * However, if the next token is assignment or '[' or '.', it can't be a valid
  * SQL statement, and what we're probably looking at is an intended variable
  * assignment.  Give an appropriate complaint for that, instead of letting
@@ -2669,7 +2668,13 @@ stmt_execsql	: K_IMPORT
 						if (tok == '=' || tok == COLON_EQUALS ||
 							tok == '[' || tok == '.')
 							word_is_not_variable(&($1), @1, yyscanner);
-						if (tok == '(' || tok == ';')
+						/*
+						 * Check for SELECT keyword - must be treated as EXECSQL even
+						 * when followed by '(' to allow parenthesized expressions
+						 * like SELECT (100 - x) * 0.01 INTO ...
+						 */
+						if ((tok == '(' || tok == ';') &&
+							pg_strcasecmp($1.ident, "select") != 0)
 						{
 							PLiSQL_stmt_call *new;
 
@@ -2972,9 +2977,9 @@ opt_transaction_chain:
 cursor_variable	: T_DATUM
 					{
 						/*
-						 * In principle we should support a cursor_variable
-						 * that is an array element, but for now we don't, so
-						 * just throw an error if next token is '['.
+             * In principle, a cursor_variable could be an array element;
+             * currently it is not supported, so throw an error if the next
+             * token is '['.
 						 *
 						 * maybe a package variable
 						 */
@@ -3317,9 +3322,9 @@ unreserved_keyword	:
 				;
 
 /*
- * This is to solve the shift/reduce conflict of the access by which
- * accept package/trigger/type package/trigger/type as unit_kind or unit_name
- * which removes the three keywords K_PACAGE, K_TYPE, K_TRIGGER on the basis
+ * This is to solve the shift/reduce conflict of the access which
+ * accept package/trigger/type as unit_kind or unit_name 
+ * that removes the three keywords K_PACAGE, K_TYPE, K_TRIGGER on the basis
  * of the unreserved_keyword
  */
 unit_name_keyword:
@@ -3630,7 +3635,7 @@ read_sql_construct(int until,
 		/*
 		 * End of function definition is an error, and we don't expect to
 		 * hit a semicolon either (unless it's the until symbol, in which
-		 * case we should have fallen out above).
+ * case we would have fallen out above).
 		 */
 		if (tok == 0 || tok == ';')
 		{
@@ -4465,6 +4470,31 @@ check_assignable(PLiSQL_datum *datum, int location, yyscan_t yyscanner)
 						 errmsg("variable \"%s\" is declared CONSTANT",
 								((PLiSQL_variable *) datum)->refname),
 						 parser_errposition(location)));
+
+			if (datum->dtype == PLISQL_DTYPE_VAR)
+			{
+				PLiSQL_var *var = (PLiSQL_var *) datum;
+
+				if (var->info == PROARGMODE_IN)
+					ereport(ERROR,
+							(errcode(ERRCODE_PLPGSQL_ERROR),
+							 errmsg("expression \"%s\" cannot be used as an assignment target",
+									var->refname)));
+			}
+			else if (datum->dtype ==  PLISQL_DTYPE_REC)
+			{
+				/*
+				 * Target is a record variable
+				 */
+				PLiSQL_rec *rec = (PLiSQL_rec *) datum;
+
+				if (rec->info == PROARGMODE_IN)
+					ereport(ERROR,
+							(errcode(ERRCODE_PLPGSQL_ERROR),
+							 errmsg("expression \"%s\" cannot be used as an assignment target",
+									rec->refname)));
+			}
+
 			break;
 		case PLISQL_DTYPE_ROW:
 			/* always assignable; member vars were checked at compile time */
@@ -4484,7 +4514,7 @@ check_assignable(PLiSQL_datum *datum, int location, yyscan_t yyscanner)
 }
 
 /*
- * check package datum can be assigned
+ * check if package datum can be assigned
  */
 static void
 check_packagedatum_assignable(PLiSQL_pkg_datum *pkg_datum, int location, yyscan_t yyscanner)
@@ -4512,6 +4542,31 @@ check_packagedatum_assignable(PLiSQL_pkg_datum *pkg_datum, int location, yyscan_
 						 errmsg("variable \"%s\" is declared CONSTANT",
 								((PLiSQL_variable *) datum)->refname),
 						 parser_errposition(location)));
+
+			if (datum->dtype == PLISQL_DTYPE_VAR)
+			{
+				PLiSQL_var *var = (PLiSQL_var *) datum;
+
+				if (var->info == PROARGMODE_IN)
+					ereport(ERROR,
+							(errcode(ERRCODE_PLPGSQL_ERROR),
+							 errmsg("expression \"%s\" cannot be used as an assignment target",
+									var->refname)));
+			}
+			else if (datum->dtype ==  PLISQL_DTYPE_REC)
+			{
+				/*
+				 * Target is a record variable
+				 */
+				PLiSQL_rec *rec = (PLiSQL_rec *) datum;
+
+				if (rec->info == PROARGMODE_IN)
+					ereport(ERROR,
+							(errcode(ERRCODE_PLPGSQL_ERROR),
+							 errmsg("expression \"%s\" cannot be used as an assignment target",
+									rec->refname)));
+			}
+
 			break;
 		case PLISQL_DTYPE_ROW:
 			/* always assignable; member vars were checked at compile time */
@@ -4552,8 +4607,8 @@ read_into_target(PLiSQL_variable **target, bool *strict, YYSTYPE *yylvalp, YYLTY
 	 * Currently, a row or record variable can be the single INTO target,
 	 * but not a member of a multi-target list.  So we throw error if there
 	 * is a comma after it, because that probably means the user tried to
-	 * write a multi-target list.  If this ever gets generalized, we should
-	 * probably refactor read_into_scalar_list so it handles all cases.
+ * write a multi-target list.  If this ever gets generalized, refactoring
+ * read_into_scalar_list to handle all cases would likely be required.
 	 */
 	switch (tok)
 	{
diff --git a/src/pl/plisql/src/pl_handler.c b/src/pl/plisql/src/pl_handler.c
index 4ae2e1ecc14..383d0d073d6 100644
--- a/src/pl/plisql/src/pl_handler.c
+++ b/src/pl/plisql/src/pl_handler.c
@@ -3,14 +3,13 @@
  * pl_handler.c		- Handler for the PL/iSQL
  *			  procedural language
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_handler.c
  *
- * add the file for requirement "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +37,7 @@
 static bool plisql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
 static void plisql_extra_warnings_assign_hook(const char *newvalue, void *extra);
 static void plisql_extra_errors_assign_hook(const char *newvalue, void *extra);
-static void set_blocks_oraparam_level(PLiSQL_stmt_block *block, int top, int cur);
+static void set_blocks_oraparam_level(PLiSQL_stmt_block * block, int top, int cur);
 
 PG_MODULE_MAGIC_EXT(
 					.name = "plisql",
@@ -59,8 +58,8 @@ bool		plisql_print_strict_params = false;
 
 bool		plisql_check_asserts = true;
 
-static char	 *plisql_extra_warnings_string = NULL;
-static char	 *plisql_extra_errors_string = NULL;
+static char *plisql_extra_warnings_string = NULL;
+static char *plisql_extra_errors_string = NULL;
 int			plisql_extra_warnings;
 int			plisql_extra_errors;
 
@@ -130,7 +129,7 @@ plisql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source)
 	if (!myextra)
 		return false;
 	*myextra = extrachecks;
-	*extra =  myextra;
+	*extra = myextra;
 
 	return true;
 }
@@ -218,14 +217,16 @@ _PG_init(void)
 	plisql_register_internal_func();
 
 	/* Set up a rendezvous point with optional instrumentation plugin */
-	plisql_plugin_ptr = (PLiSQL_plugin **) find_rendezvous_variable("PLiSQL_plugin");
+	plisql_plugin_ptr = (PLiSQL_plugin * *) find_rendezvous_variable("PLiSQL_plugin");
 
 	inited = true;
 }
 
 /*
- * unregister internel func
+ * Cleanup: deregister internal routines.
  */
+void _PG_fini(void);
+
 void
 _PG_fini(void)
 {
@@ -251,9 +252,9 @@ plisql_call_handler(PG_FUNCTION_ARGS)
 	volatile Datum retval = (Datum) 0;
 	int			rc;
 
-	char	function_from = plisql_function_from(fcinfo);
-	int         oraparam_top_level = -1;
-	int         oraparam_cur_level = -1;
+	char		function_from = plisql_function_from(fcinfo);
+	int			oraparam_top_level = -1;
+	int			oraparam_cur_level = -1;
 
 	nonatomic = fcinfo->context &&
 		IsA(fcinfo->context, CallContext) &&
@@ -273,9 +274,8 @@ plisql_call_handler(PG_FUNCTION_ARGS)
 	}
 	else
 		func = plisql_compile(fcinfo, false);
-	/* End - nSRS-PLSQL-SUBPROC */
 
-	/* rember current func in SPI */
+	/* Record the active function for this SPI level. */
 	SPI_remember_func(func);
 
 	/* Must save and restore prior value of cur_estate */
@@ -307,18 +307,18 @@ plisql_call_handler(PG_FUNCTION_ARGS)
 		 */
 		if (CALLED_AS_TRIGGER(fcinfo))
 			retval = PointerGetDatum(plisql_exec_trigger(func,
-														  (TriggerData *) fcinfo->context));
+														 (TriggerData *) fcinfo->context));
 		else if (CALLED_AS_EVENT_TRIGGER(fcinfo))
 		{
 			plisql_exec_event_trigger(func,
-									   (EventTriggerData *) fcinfo->context);
+									  (EventTriggerData *) fcinfo->context);
 			/* there's no return value in this case */
 		}
 		else
 			retval = plisql_exec_function(func, fcinfo,
-										   NULL, NULL,
-										   procedure_resowner,
-										   !nonatomic);
+										  NULL, NULL,
+										  procedure_resowner,
+										  !nonatomic);
 	}
 	PG_FINALLY();
 	{
@@ -370,9 +370,10 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 	ResourceOwner simple_eval_resowner;
 	Datum		retval;
 	int			rc;
-	bool	ora_forward = false;
-	int         oraparam_top_level = -1;
-	int         oraparam_cur_level = -1;
+	bool		ora_forward = false;
+	int			oraparam_top_level = -1;
+	int			oraparam_cur_level = -1;
+	MemoryContext oldcontext = CurrentMemoryContext;
 
 	/*
 	 * Connect to SPI manager
@@ -381,7 +382,7 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 
 	if (codeblock->params != NULL)
 	{
-		bool check_var = get_doStmtCheckVar();
+		bool		check_var = get_doStmtCheckVar();
 
 		set_ParseDynSql(true);
 		set_parseDynDoStmt(true);
@@ -395,7 +396,7 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 
 	/*
 	 * Anonymous block has parameters, call forward_oraparam_stack, 
-	 * so that we can check if the variable match
+	 * so that we can check if the variable matches.
 	 */
 	if (codeblock->params != NULL &&
 		SPI_get_connected() == 0)
@@ -405,9 +406,9 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 	}
 
 	/* Compile the anonymous code block */
-	func = plisql_compile_inline(codeblock->source_text, codeblock->params);
+	func = plisql_compile_inline(codeblock->source_text, codeblock->params, codeblock->do_from_call);
 
-	/* rember current func in SPI */
+	/* Record the active function for this SPI level. */
 	SPI_remember_func(func);
 
 	/* check variables */
@@ -421,8 +422,8 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 		PG_CATCH();
 		{
 			plisql_subxact_cb(SUBXACT_EVENT_ABORT_SUB,
-						GetCurrentSubTransactionId(),
-						0, NULL);
+							  GetCurrentSubTransactionId(),
+							  0, NULL);
 
 			plisql_free_function_memory(func, 0, 0);
 
@@ -472,7 +473,7 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 
 	if (codeblock->params)
 	{
-		int		i;
+		int			i;
 
 		fake_fcinfo->nargs = codeblock->params->numParams;
 		for (i = 0; i < codeblock->params->numParams; ++i)
@@ -481,7 +482,7 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 			fake_fcinfo->args[i].isnull = codeblock->params->params[i].isnull;
 		}
 	}
-	push_oraparam_stack();		
+	push_oraparam_stack();
 	get_oraparam_level(&oraparam_top_level, &oraparam_cur_level);
 	set_blocks_oraparam_level(func->action, oraparam_top_level, oraparam_cur_level);
 
@@ -489,13 +490,30 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 	PG_TRY();
 	{
 		retval = plisql_exec_function(func, fake_fcinfo,
-									   simple_eval_estate,
-									   simple_eval_resowner,
-									   simple_eval_resowner,	/* see above */
-									   codeblock->atomic);
+									  simple_eval_estate,
+									  simple_eval_resowner,
+									  simple_eval_resowner, /* see above */
+									  codeblock->atomic);
 	}
 	PG_CATCH();
 	{
+		if (codeblock->do_from_call && oldcontext != ErrorContext)
+		{
+			ErrorData  *edata;
+
+			/* Save error info */
+			MemoryContextSwitchTo(oldcontext);
+			edata = CopyErrorData();
+			FlushErrorState();
+			
+			/* For CALL statements expect only primary error message */
+			if (edata->message)
+				elog(ERROR, "%s", edata->message);
+			else
+				ThrowErrorData(edata);
+			FreeErrorData(edata);
+		}
+
 		pop_oraparam_stack(oraparam_top_level - 1, oraparam_cur_level);
 		if (ora_forward)
 			backward_oraparam_stack();
@@ -516,8 +534,8 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 		 * pay attention to its parentSubid argument.
 		 */
 		plisql_subxact_cb(SUBXACT_EVENT_ABORT_SUB,
-						   GetCurrentSubTransactionId(),
-						   0, NULL);
+						  GetCurrentSubTransactionId(),
+						  0, NULL);
 
 		/* Clean up the private EState and resowner */
 		FreeExecutorState(simple_eval_estate);
@@ -544,12 +562,12 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 
 	if (codeblock->params != NULL && codeblock->params->haveout)
 	{
-		int		i;
+		int			i;
 		int16		typLen;
 		bool		typByVal;
-		MemoryContext 	old;
+		MemoryContext old;
 
-		/* use datumCopy to pass variables, first swith to saved memory context */
+		/* use datumCopy to pass variables, first switch to saved memory context */
 		old = MemoryContextSwitchTo(Ora_spi_saved_memorycontext());
 		for (i = 0; i < fake_fcinfo->nargs; ++i)
 		{
@@ -557,7 +575,10 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 			{
 				get_typlenbyval(codeblock->params->params[i].ptype, &typLen, &typByVal);
 
-				/* use datumCopy because fake_fcinfo memory will be freed by FreeExecutorState */
+				/*
+				 * use datumCopy because fake_fcinfo memory will be freed by
+				 * FreeExecutorState
+				 */
 				codeblock->params->params[i].value = datumCopy(fake_fcinfo->args[i].value, typByVal, typLen);
 				codeblock->params->params[i].isnull = fake_fcinfo->args[i].isnull;
 			}
@@ -568,7 +589,7 @@ plisql_inline_handler(PG_FUNCTION_ARGS)
 			}
 		}
 
-		/* return to old memory context */
+		/* switch to old memory context */
 		MemoryContextSwitchTo(old);
 	}
 
@@ -731,7 +752,7 @@ plisql_validator(PG_FUNCTION_ARGS)
 }
 
 static void
-set_blocks_oraparam_level(PLiSQL_stmt_block *block, int top, int cur)
+set_blocks_oraparam_level(PLiSQL_stmt_block * block, int top, int cur)
 {
 	ListCell   *s;
 
@@ -745,14 +766,13 @@ set_blocks_oraparam_level(PLiSQL_stmt_block *block, int top, int cur)
 
 	foreach(s, block->body)
 	{
-		PLiSQL_stmt *stmt = (PLiSQL_stmt *)lfirst(s);
+		PLiSQL_stmt *stmt = (PLiSQL_stmt *) lfirst(s);
 
 		if (stmt != NULL && (enum PLiSQL_stmt_type) stmt->cmd_type == PLISQL_STMT_BLOCK)
 		{
-			set_blocks_oraparam_level((PLiSQL_stmt_block *)stmt, top, cur);		
-		}	
+			set_blocks_oraparam_level((PLiSQL_stmt_block *) stmt, top, cur);
+		}
 	}
 
 	return;
 }
-
diff --git a/src/pl/plisql/src/pl_package.c b/src/pl/plisql/src/pl_package.c
index c77a0c9924f..3138c08e350 100644
--- a/src/pl/plisql/src/pl_package.c
+++ b/src/pl/plisql/src/pl_package.c
@@ -18,7 +18,7 @@
  * Abstract:
  * 	 Executor for the PLiSQL package
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *    src/pl/plisql/src/pl_package.c
@@ -2730,14 +2730,13 @@ static void
 plisql_remove_function_references(PLiSQL_function *func, PackageCacheItem *item)
 {
 	PLiSQL_package *psource = (PLiSQL_package *) item->source;
-	int pre_len;
-
-	pre_len = list_length(psource->source.funclist);
 
+	if (!list_member_ptr(psource->source.funclist, func))
+	{
+		Assert(false);
+		return;
+	}
 	psource->source.funclist = list_delete_ptr(psource->source.funclist, (void *) func);
-
-	Assert(pre_len == list_length(psource->source.funclist) + 1);
-
 	psource->source.use_count--;
 
 	/*
@@ -3489,6 +3488,168 @@ plisql_get_subprocs_from_package(Oid pkgoid,
 	return;
 }
 
+/*
+ * get subproc arginfo
+ */
+int
+plisql_get_subproc_arg_info (FuncExpr *fexpr,
+				Oid **p_argtypes,
+				char ***p_argnames,
+				char **p_argmodes)
+{
+	PLiSQL_function *function = NULL;
+	PLiSQL_subproc_function *subprocfunc = NULL;
+	ListCell *lc = NULL;
+	int nargs = 0;
+	int	i = 0;
+
+	if (FUNC_EXPR_FROM_PG_PROC(fexpr->function_from))
+		elog(ERROR, "FuncExpr is not an internal function");
+
+	if (fexpr->parent_func == NULL)
+		elog(ERROR, "parent_func has not been set");
+
+	function = (PLiSQL_function *) fexpr->parent_func;
+
+	if (fexpr->funcid < 0 || fexpr->funcid >= function->nsubprocfuncs)
+		elog(ERROR, "invalid fno %d", fexpr->funcid);
+
+	subprocfunc = function->subprocfuncs[fexpr->funcid];
+	nargs = list_length(subprocfunc->arg);
+
+	if (nargs == 0)
+		return nargs;
+
+	*p_argtypes = (Oid *) palloc(nargs * sizeof(Oid));
+	*p_argnames = (char **) palloc(nargs * sizeof(char *));
+	*p_argmodes = (char *) palloc0((nargs + 1) * sizeof(char));
+
+	foreach (lc, subprocfunc->arg)
+	{
+		PLiSQL_function_argitem *argitem = (PLiSQL_function_argitem *) lfirst(lc);
+		char argmode;
+
+		(*p_argtypes)[i] = argitem->type->typoid;
+		(*p_argnames)[i] = pstrdup(argitem->argname);
+
+		switch (argitem->argmode)
+		{
+			case ARGMODE_IN:
+				argmode = FUNC_PARAM_IN;
+				break;
+			case ARGMODE_OUT:
+				argmode = FUNC_PARAM_OUT;
+				break;
+			case ARGMODE_INOUT:
+				argmode = FUNC_PARAM_INOUT;
+				break;
+			default:
+				elog(ERROR, "invalid argmode %u", argitem->argmode);
+				break;
+		}
+
+		(*p_argmodes)[i++] = argmode;
+	}
+
+	return nargs;
+}
+
+
+/*
+ * get subproc kind
+ */
+char
+plisql_get_subproc_prokind (FuncExpr *fexpr)
+{
+	PLiSQL_function *function = NULL;
+	PLiSQL_subproc_function *subprocfunc = NULL;
+
+	if (FUNC_EXPR_FROM_PG_PROC(fexpr->function_from))
+		elog(ERROR, "FuncExpr is not an internal function");
+
+	if (fexpr->parent_func == NULL)
+		elog(ERROR, "parent_func has not been set");
+
+	function = (PLiSQL_function *) fexpr->parent_func;
+
+	if (fexpr->funcid < 0 || fexpr->funcid >= function->nsubprocfuncs)
+		elog(ERROR, "invalid fno %d", fexpr->funcid);
+
+	subprocfunc = function->subprocfuncs[fexpr->funcid];
+	return subprocfunc->function->fn_prokind;
+}
+
+
+/*
+ * like func_should_change_return_type, handle package'func.
+ */
+bool
+plisql_subproc_should_change_return_type(FuncExpr *fexpr,
+					Oid *rettype,
+					int32 *typmod,
+					Oid *collationoid)
+{
+	PLiSQL_function *function = NULL;
+	PLiSQL_subproc_function *subprocfunc = NULL;
+	Oid	real_retype;
+	int result = false;
+
+	if (FUNC_EXPR_FROM_PG_PROC(fexpr->function_from))
+		elog(ERROR, "FuncExpr is not an internal function");
+
+	if (fexpr->parent_func == NULL)
+		elog(ERROR, "parent_func has not been set");
+
+	function = (PLiSQL_function *) fexpr->parent_func;
+
+	if (fexpr->funcid < 0 || fexpr->funcid >= function->nsubprocfuncs)
+		elog(ERROR, "invalid fno %d", fexpr->funcid);
+
+	subprocfunc = function->subprocfuncs[fexpr->funcid];
+	real_retype = (subprocfunc->rettype == NULL ? VOIDOID : subprocfunc->rettype->typoid);
+
+	if (real_retype == RECORDOID)
+		return false;
+
+	/*
+	 * If there are more than one out-parameters, or only one out-parameter 
+	 * and return type does exist, change the rettype to be record. 
+	 */
+	if (subprocfunc->noutargs >= 2 ||
+		(subprocfunc->noutargs == 1 &&
+		real_retype != VOIDOID))
+	{
+		result = true;
+		*rettype = RECORDOID;
+		*typmod = -1;
+		*collationoid = 0;
+	}
+	else if (subprocfunc->noutargs == 1 &&
+		real_retype == VOIDOID)
+	{
+		/* only one out-parameter, change the rettype to be out-parameter type */
+		ListCell *lc;
+
+		foreach (lc, subprocfunc->arg)
+		{
+			PLiSQL_function_argitem *argitem = (PLiSQL_function_argitem *) lfirst(lc);
+
+			if (argitem->argmode == ARGMODE_OUT ||
+				argitem->argmode == ARGMODE_INOUT)
+			{
+				result = true;
+				*rettype = argitem->type->typoid;
+				*typmod = argitem->type->atttypmod;
+				*collationoid = argitem->type->collation;
+				break;
+			}
+		}
+		Assert(result);
+	}
+	return result;
+}
+
+
 /*
  * check the datum is PLiSQL_row or
  * PLiSQL_record variable in package
diff --git a/src/pl/plisql/src/pl_package.h b/src/pl/plisql/src/pl_package.h
index 9c830cd5dc7..f54ff094200 100644
--- a/src/pl/plisql/src/pl_package.h
+++ b/src/pl/plisql/src/pl_package.h
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright (c) 2024-2025, IvorySQL Global Development Team
+ * Copyright (c) 2024-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_package.h
@@ -209,6 +209,16 @@ extern Datum package_datumTransfer(Datum value, bool typByVal,
 extern bool is_compile_standard_package(void);
 extern void plisql_get_subprocs_from_package(Oid pkgoid, TupleDesc tupdesc,
 											Tuplestorestate *tupstore);
+extern int plisql_get_subproc_arg_info (FuncExpr *fexpr,
+						Oid **p_argtypes,
+						char ***p_argnames,
+						char **p_argmodes);
+extern char plisql_get_subproc_prokind (FuncExpr *fexpr);
+extern bool plisql_subproc_should_change_return_type(FuncExpr *fexpr,
+							Oid *rettype,
+							int32 *typmod,
+							Oid *collationoid);
+
 extern bool is_row_record_datum(PLiSQL_datum *datum);
 extern void release_package_func_usecount(FunctionCallInfo fcinfo);
 #endif
diff --git a/src/pl/plisql/src/pl_reserved_kwlist.h b/src/pl/plisql/src/pl_reserved_kwlist.h
index a7c7cb37b02..9df5eac893e 100755
--- a/src/pl/plisql/src/pl_reserved_kwlist.h
+++ b/src/pl/plisql/src/pl_reserved_kwlist.h
@@ -7,13 +7,13 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plisql/src/pl_reserved_kwlist.h
  *
- * add the file for requirement "SQL PARSER"
+ * add the file for "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -21,14 +21,13 @@
 /* There is deliberately not an #ifndef PL_RESERVED_KWLIST_H here. */
 
 /*
- * List of (keyword-name, keyword-token-value) pairs.
+ * Catalog of (keyword name, token code) pairs.
  *
- * Be careful not to put the same word into pl_unreserved_kwlist.h.
+ * Do not list here any word that also appears in pl_unreserved_kwlist.h.
  *
- * Note: gen_keywordlist.pl requires the entries to appear in ASCII order.
+ * Requirement: gen_keywordlist.pl expects items in ASCII sort order.
  */
 
-/* name, value */
 PG_KEYWORD("all", K_ALL)
 PG_KEYWORD("begin", K_BEGIN)
 PG_KEYWORD("by", K_BY)
diff --git a/src/pl/plisql/src/pl_scanner.c b/src/pl/plisql/src/pl_scanner.c
index 2f2b358e366..c94ad3e566b 100644
--- a/src/pl/plisql/src/pl_scanner.c
+++ b/src/pl/plisql/src/pl_scanner.c
@@ -4,14 +4,13 @@
  *	  lexical scanning for PL/iSQL
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_scanner.c
  *
- * add the file for requirement "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -107,8 +106,7 @@ typedef struct
  * pointer around is great enough to not want to do it without need.
  */
 
-/* The stuff the core lexer needs */
-//static ora_core_yyscan_t yyscanner = NULL;
+/* The stuff that the core lexer needs */
 static ora_core_yy_extra_type core_yy_extra;
 
 /* The original input string */
@@ -120,15 +118,17 @@ static int	plisql_yyleng;
 /* Current token's code (corresponds to plisql_yylval and plisql_yylloc) */
 static int	plisql_yytoken;
 
-static yyscan_t plisql_scanner;
+
 /* The semantic value of the lookahead symbol.  */
 static YYSTYPE plisql_yylval;
+
 /* Location data for the lookahead symbol.  */
 static YYLTYPE plisql_yylloc
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-  = { 1, 1, 1, 1 }
-# endif
-;
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+= {1, 1, 1, 1}
+#endif
+		   ;
+
 /* Token pushback stack */
 #define MAX_PUSHBACKS 4
 
@@ -139,7 +139,6 @@ static TokenAuxData pushback_auxdata[MAX_PUSHBACKS];
 /* State for plisql_location_to_lineno() */
 static const char *cur_line_start;
 static const char *cur_line_end;
-static int	cur_line_num;
 
 /*
  * yylex used global variable in pl_scanner.c
@@ -148,29 +147,29 @@ typedef struct PLiSQL_yylex_global_proper
 {
 
 	ora_core_yy_extra_type core_yy_extra;
-	//ora_core_yyscan_t yyscanner;
+	/* ora_core_yyscan_t yyscanner; */
 	/* The original input string */
 	const char *scanorig;
 
 	/* Current token's length (corresponds to plsql_yylval and plsql_yylloc) */
-	int	plisql_yyleng;
+	int			plisql_yyleng;
 
 	/* Current token's code (corresponds to plsql_yylval and plsql_yylloc) */
-	int	plisql_yytoken;
+	int			plisql_yytoken;
 
-	int	num_pushbacks;
-	int	pushback_token[MAX_PUSHBACKS];
+	int			num_pushbacks;
+	int			pushback_token[MAX_PUSHBACKS];
 	TokenAuxData pushback_auxdata[MAX_PUSHBACKS];
 
 	/* from pl_gram.y */
-	YYSTYPE	plisql_yylval;
-	YYLTYPE	plisql_yylloc;
+	YYSTYPE		plisql_yylval;
+	YYLTYPE		plisql_yylloc;
 
 	/* State for plsql_location_to_lineno() */
 	const char *cur_line_start;
 	const char *cur_line_end;
-	int	cur_line_num;
-} PLiSQL_yylex_global_proper;
+	int			cur_line_num;
+}			PLiSQL_yylex_global_proper;
 
 /* Internal functions */
 static int	internal_yylex(TokenAuxData *auxdata, yyscan_t yyscanner);
@@ -206,35 +205,32 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 	int			tok1;
 	TokenAuxData aux1;
 	int			kwnum;
-	char        buf[32];
-	char		*paramname;
+	char		buf[32];
+	char	   *paramname;
 
 	tok1 = internal_yylex(&aux1, yyscanner);
 	if (tok1 == IDENT || tok1 == PARAM || tok1 == ORAPARAM)
 	{
-		int	tok2;
+		int			tok2;
 		TokenAuxData aux2;
 
 		paramname = aux1.lval.str;
 		if (tok1 == ORAPARAM)
 		{
-			int num;
+			int			num;
 
 			/*
-			 *  exmaple syntax:
-			 *****************************************
-			 * do $$
-			 * begin
-			 *   :x = 78;
-			 *   :y = 'thanks';
-			 * end; using y inout, x inout;
-			 ******************************************
+			 * exmaple syntax: ****************************************
+			 *
+			 * do $$ begin :x = 78; :y = 'thanks'; end; using y inout, x
+			 * inout; *****************************************
+			 *
 			 * the origin strings :x or :y are treated as the parameter name
 			 */
 
 			if (plisql_curr_compile->paramnames != NULL)
 			{
-				int i;
+				int			i;
 
 				for (i = 0; i < plisql_curr_compile->fn_nargs; i++)
 				{
@@ -291,11 +287,11 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 					if (tok5 == IDENT)
 					{
 						if (plisql_parse_tripword(paramname,
-												   aux1.lval.str,
-												   aux3.lval.str,
-												   aux5.lval.str,
-												   &aux1.lval.wdatum,
-												   &aux1.lval.cword))
+												  aux1.lval.str,
+												  aux3.lval.str,
+												  aux5.lval.str,
+												  &aux1.lval.wdatum,
+												  &aux1.lval.cword))
 							tok1 = T_DATUM;
 						else
 							tok1 = T_CWORD;
@@ -308,10 +304,10 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 						push_back_token(tok5, &aux5, yyscanner);
 						push_back_token(tok4, &aux4, yyscanner);
 						if (plisql_parse_dblword(paramname,
-												  aux1.lval.str,
-												  aux3.lval.str,
-												  &aux1.lval.wdatum,
-												  &aux1.lval.cword))
+												 aux1.lval.str,
+												 aux3.lval.str,
+												 &aux1.lval.wdatum,
+												 &aux1.lval.cword))
 							tok1 = T_DATUM;
 						else
 							tok1 = T_CWORD;
@@ -324,10 +320,10 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 					/* not A.B.C, so just process A.B */
 					push_back_token(tok4, &aux4, yyscanner);
 					if (plisql_parse_dblword(paramname,
-											  aux1.lval.str,
-											  aux3.lval.str,
-											  &aux1.lval.wdatum,
-											  &aux1.lval.cword))
+											 aux1.lval.str,
+											 aux3.lval.str,
+											 &aux1.lval.wdatum,
+											 &aux1.lval.cword))
 						tok1 = T_DATUM;
 					else
 						tok1 = T_CWORD;
@@ -341,11 +337,11 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 				push_back_token(tok3, &aux3, yyscanner);
 				push_back_token(tok2, &aux2, yyscanner);
 				if (plisql_parse_word(paramname,
-									   aux1.lval.str,
-									   yyextra->core_yy_extra.scanbuf + aux1.lloc,
-									   true,
-									   &aux1.lval.wdatum,
-									   &aux1.lval.word))
+									  aux1.lval.str,
+									  yyextra->core_yy_extra.scanbuf + aux1.lloc,
+									  true,
+									  &aux1.lval.wdatum,
+									  &aux1.lval.word))
 					tok1 = T_DATUM;
 				else if (!aux1.lval.word.quoted &&
 						 (kwnum = ScanKeywordLookup(aux1.lval.word.ident,
@@ -382,13 +378,13 @@ plisql_yylex(YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner)
 			 * non-variable cases.
 			 */
 			if (plisql_parse_word(paramname,
-								   aux1.lval.str,
-								   yyextra->core_yy_extra.scanbuf + aux1.lloc,
-								   (!AT_STMT_START(plisql_yytoken) ||
-									(tok2 == '=' || tok2 == COLON_EQUALS ||
-									 tok2 == '[')),
-								   &aux1.lval.wdatum,
-								   &aux1.lval.word))
+								  aux1.lval.str,
+								  yyextra->core_yy_extra.scanbuf + aux1.lloc,
+								  (!AT_STMT_START(plisql_yytoken) ||
+								   (tok2 == '=' || tok2 == COLON_EQUALS ||
+									tok2 == '[')),
+								  &aux1.lval.wdatum,
+								  &aux1.lval.word))
 				tok1 = T_DATUM;
 			else if (!aux1.lval.word.quoted &&
 					 (kwnum = ScanKeywordLookup(aux1.lval.word.ident,
@@ -455,8 +451,8 @@ internal_yylex(TokenAuxData *auxdata, yyscan_t yyscanner)
 	else
 	{
 		token = ora_core_yylex(&auxdata->lval.core_yystype,
-						   &auxdata->lloc,
-						   yyscanner);
+							   &auxdata->lloc,
+							   yyscanner);
 
 		/* remember the length of yytext before it gets changed */
 		yytext = yyextra->core_yy_extra.scanbuf + auxdata->lloc;
@@ -545,8 +541,8 @@ plisql_token_is_unreserved_keyword(int token)
  */
 void
 plisql_append_source_text(StringInfo buf,
-						   int startlocation, int endlocation,
-						   yyscan_t yyscanner)
+						  int startlocation, int endlocation,
+						  yyscan_t yyscanner)
 {
 	Assert(startlocation <= endlocation);
 	appendBinaryStringInfo(buf, yyextra->scanorig + startlocation,
@@ -638,12 +634,12 @@ plisql_scanner_errposition(int location, yyscan_t yyscanner)
  * parsers report error as soon as the first unparsable token is reached.
  * Beware of using yyerror for other purposes, as the cursor position might
  * be misleading!
- * 
+ *
  * (The second argument is enforced by Bison to match the second argument of
  * yyparse(), but it is not used here.)
  */
 pg_noreturn void
-plisql_yyerror(YYLTYPE *yyllocp,  PLiSQL_stmt_block **plisql_parse_result_p, yyscan_t yyscanner,const char *message)
+plisql_yyerror(YYLTYPE *yyllocp, PLiSQL_stmt_block * *plisql_parse_result_p, yyscan_t yyscanner, const char *message)
 {
 	char	   *yytext = yyextra->core_yy_extra.scanbuf + *yyllocp;
 
@@ -737,7 +733,7 @@ plisql_scanner_init(const char *str)
 
 	/* Start up the core scanner */
 	yyscanner = ora_scanner_init(str, (ora_core_yy_extra_type *) yyext,
-							 &ReservedPLKeywords, ReservedPLKeywordTokens);
+								 &ReservedPLKeywords, ReservedPLKeywordTokens);
 
 	/*
 	 * scanorig points to the original string, which unlike the scanner's
@@ -768,19 +764,19 @@ plisql_scanner_finish(yyscan_t yyscanner)
 }
 
 /*
- * saved yylex global variable
+ * yylex global variable
  */
 void *
 plisql_get_yylex_global_proper(void)
 {
 	PLiSQL_yylex_global_proper *yylex_data;
-	int i;
+	int			i;
 
 	yylex_data = (PLiSQL_yylex_global_proper *) palloc0(sizeof(PLiSQL_yylex_global_proper));
 
 	yylex_data->core_yy_extra = core_yy_extra;
 	yylex_data->cur_line_end = cur_line_end;
-	//yylex_data->cur_line_num = cur_line_num;
+	/* yylex_data->cur_line_num = cur_line_num; */
 	yylex_data->cur_line_start = cur_line_start;
 	yylex_data->plisql_yyleng = plisql_yyleng;
 	yylex_data->plisql_yytoken = plisql_yytoken;
@@ -793,7 +789,7 @@ plisql_get_yylex_global_proper(void)
 	}
 
 	yylex_data->scanorig = scanorig;
-	//yylex_data->yyscanner = plisql_scanner;
+	/* yylex_data->yyscanner = plisql_scanner; */
 	yylex_data->plisql_yylval = plisql_yylval;
 	yylex_data->plisql_yylloc = plisql_yylloc;
 
@@ -807,7 +803,7 @@ void
 plisql_recover_yylex_global_proper(void *value)
 {
 	PLiSQL_yylex_global_proper *yylex_data;
-	int i;
+	int			i;
 
 	Assert(value != NULL);
 
@@ -815,23 +811,22 @@ plisql_recover_yylex_global_proper(void *value)
 
 	core_yy_extra = yylex_data->core_yy_extra;
 	cur_line_end = yylex_data->cur_line_end;
-	//cur_line_num = yylex_data->cur_line_num;
+	/* cur_line_num = yylex_data->cur_line_num; */
 	cur_line_start = yylex_data->cur_line_start;
 	plisql_yyleng = yylex_data->plisql_yyleng;
 	plisql_yytoken = yylex_data->plisql_yytoken;
 
 	num_pushbacks = yylex_data->num_pushbacks;
-	for (i = 0;i < num_pushbacks; i++)
+	for (i = 0; i < num_pushbacks; i++)
 	{
 		pushback_auxdata[i] = yylex_data->pushback_auxdata[i];
 		pushback_token[i] = yylex_data->pushback_token[i];
 	}
 
 	scanorig = yylex_data->scanorig;
-	//plisql_scanner = yylex_data->yyscanner;
+	/* plisql_scanner = yylex_data->yyscanner; */
 	plisql_yylval = yylex_data->plisql_yylval;
 	plisql_yylloc = yylex_data->plisql_yylloc;
 
 	return;
 }
-
diff --git a/src/pl/plisql/src/pl_subproc_function.c b/src/pl/plisql/src/pl_subproc_function.c
index dc8262730bc..853a78d91c3 100644
--- a/src/pl/plisql/src/pl_subproc_function.c
+++ b/src/pl/plisql/src/pl_subproc_function.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,13 +15,12 @@
  *
  * File:pl_subproc_function.c
  *
- * Abstract:
- *		Definitions for the PLISQL
- *			  procedural language nested sub function/procedure
+ * Overview:
+ *   Implementation file focused on algorithms and internal details.
+ *   For the interface and high-level design, see pl_subproc_function.h to
+ *   avoid duplication between .c and .h.
  *
- * Authored by dwdai@highgo.com,20220627.
- *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_subproc_function.c
@@ -44,103 +43,104 @@
 #include "commands/packagecmds.h"
 #include "catalog/pg_package.h"
 #include "miscadmin.h"
+#include "utils/guc.h"
 
 
 typedef struct _subprocFuncCandidateList
 {
 	struct _subprocFuncCandidateList *next;
-	int		fno;
-	int		nargs;
-	int		ndargs;
-	char	*argmodes;
-	int		*argnumbers;
-	Oid		args[FLEXIBLE_ARRAY_MEMBER];
-} *subprocFuncCandidateList;
+	int			fno;
+	int			nargs;
+	int			ndargs;
+	char	   *argmodes;
+	int		   *argnumbers;
+	Oid			args[FLEXIBLE_ARRAY_MEMBER];
+}		   *subprocFuncCandidateList;
 
 PLiSQL_subproc_function **plisql_subprocFuncs;
-int plisql_nsubprocFuncs;
-int subprocFuncs_alloc;
-int cur_compile_func_level;
+int			plisql_nsubprocFuncs;
+int			subprocFuncs_alloc;
+int			cur_compile_func_level;
+
 /*
- * saved subproc informations
- * plisql_saved_compile:
- *		save the last compile function
- * plisql_saved_last_datums:
- *		saved the last var'dno of block init var
- * plisql_saved_error_funcname
- *		saved the last Plisql_error_funcname
- * plisql_saved_nsubprocfuncs
- *		saved the last plisql_nsubprocFuncs
- * plisql_saved_subprocfunc_alloc
- *		saved the last subprocFuncs_alloc
- * plisql_saved_subprocfuncs
- * 		saved tha lst plisql_subprocFuncs
+ * Saved subproc-related state (one frame per nested compilation level):
+ *
+ * - plisql_saved_compile:
+ *     previous PLiSQL_function being compiled
+ * - plisql_saved_last_datums:
+ *     last datum index of the enclosing block at init time
+ * - plisql_saved_error_funcname:
+ *     previous value of plisql_error_funcname
+ * - plisql_saved_nsubprocfuncs:
+ *     number of subprocs at the enclosing level
+ * - plisql_saved_subprocfunc_alloc:
+ *     allocation size for the subproc array at the enclosing level
+ * - plisql_saved_subprocfuncs:
+ *     pointer to the subproc array at the enclosing level
  */
 PLiSQL_function *plisql_saved_compile[FUNC_MAX_NEST_LEVEL];
-int plisql_saved_datums_last[FUNC_MAX_NEST_LEVEL];
-char *plisql_saved_error_funcname[FUNC_MAX_NEST_LEVEL];
-int plisql_saved_nsubprocfuncs[FUNC_MAX_NEST_LEVEL];
-int plisql_saved_subprocfunc_alloc[FUNC_MAX_NEST_LEVEL];
+int			plisql_saved_datums_last[FUNC_MAX_NEST_LEVEL];
+char	   *plisql_saved_error_funcname[FUNC_MAX_NEST_LEVEL];
+int			plisql_saved_nsubprocfuncs[FUNC_MAX_NEST_LEVEL];
+int			plisql_saved_subprocfunc_alloc[FUNC_MAX_NEST_LEVEL];
 PLiSQL_subproc_function **plisql_saved_subprocfuncs[FUNC_MAX_NEST_LEVEL];
 
 
-/* user full functions */
+/* Utility helpers (implementation details) */
 static HTAB *plisql_subprocfunc_HashTableInit(void);
 
-static int plisql_check_function_canreload(List *args,
-						List *fnos, PLiSQL_type *rettype);
+static int	plisql_check_function_canreload(List *args,
+											List *fnos, PLiSQL_type * rettype);
 static PLiSQL_subproc_function * plisql_build_subproc_function_internal(char *funcname,
-																	List *args,
-																	PLiSQL_type *retype,
-																	bool add2namespace,
-																	int location); 
+																		List *args,
+																		PLiSQL_type * retype,
+																		bool add2namespace,
+																		int location);
 static bool plisql_match_function_argnames(List *funcargs, int nargs,
-													List *argnames, int **argnumber);
+										   List *argnames, int **argnumber);
 static subprocFuncCandidateList plisql_getFuncCandidateListFromFunname(char *funcname,
-																	PLiSQL_function *pfunc,
-																	PLiSQL_nsitem *nse, int nargs,
-																	List *fargname,
-																	bool proc_call);
-static int plisql_func_match_argtypes(int nargs, Oid *input_typeids,
-												subprocFuncCandidateList raw_candidates,
-												subprocFuncCandidateList *candidates);
+																	   PLiSQL_function * pfunc,
+																	   PLiSQL_nsitem * nse, int nargs,
+																	   List *fargname,
+																	   bool proc_call);
+static int	plisql_func_match_argtypes(int nargs, Oid *input_typeids,
+									   subprocFuncCandidateList raw_candidates,
+									   subprocFuncCandidateList * candidates);
 static subprocFuncCandidateList plisql_func_select_candidate(int nargs,
-																Oid *input_typeids,
-																subprocFuncCandidateList candidates);
+															 Oid *input_typeids,
+															 subprocFuncCandidateList candidates);
 static List *plisql_expand_and_reorder_functionargs(ParseState *pstate,
-																	PLiSQL_subproc_function *subprocfunc,
-																	int funcnarg, List *fargs,
-																	List *defaultnumber, List **argdefaults);
-static TypeFuncClass internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
-																		Node *call_expr,
-																		ReturnSetInfo *rsinfo,
-																		Oid *resultTypeId,
-																		TupleDesc *resultTupleDesc);
-static TupleDesc build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function *subprocfunc);
+													PLiSQL_subproc_function * subprocfunc,
+													int funcnarg, List *fargs,
+													List *defaultnumber, List **argdefaults);
+static TypeFuncClass internal_get_subprocfunc_result_type(PLiSQL_subproc_function * subprocfunc,
+														  Node *call_expr,
+														  ReturnSetInfo *rsinfo,
+														  Oid *resultTypeId,
+														  TupleDesc *resultTupleDesc);
+static TupleDesc build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function * subprocfunc);
 
 static void plisql_subprocfunc_HashTableInsert(HTAB *hashp,
-						PLiSQL_function *function,
-						PLiSQL_func_hashkey *func_key);
+											   PLiSQL_function * function,
+											   PLiSQL_func_hashkey * func_key);
 static Node *plisql_get_subprocfunc_argdefaults(ParseState *pstate,
-											PLiSQL_subproc_function *subprocfunc, int argno);
-static void plisql_init_subprocfunc_compile(PLiSQL_subproc_function *subprocfunc);
+												PLiSQL_subproc_function * subprocfunc, int argno);
+static void plisql_init_subprocfunc_compile(PLiSQL_subproc_function * subprocfunc);
 
-static void plsql_init_glovalvar_from_stack(PLiSQL_execstate *estate, int dno,
-														int *start_level);
-static void plsql_assign_out_glovalvar_from_stack(PLiSQL_execstate *estate,
-													int dno, int *start_level);
-static bool is_subprocfunc_argnum(PLiSQL_function *pfunc, int dno);
+static void plsql_init_glovalvar_from_stack(PLiSQL_execstate * estate, int dno,
+											int *start_level);
+static void plsql_assign_out_glovalvar_from_stack(PLiSQL_execstate * estate,
+												  int dno, int *start_level);
+static bool is_subprocfunc_argnum(PLiSQL_function * pfunc, int dno);
 
 /*
- * like plisql_start_datums
- * we init subproc function some global
- * variables
+ * Initialize global state for subproc compilation (similar to plisql_start_datums).
  */
 void
 plisql_start_subproc_func(void)
 {
-	int pre_level = cur_compile_func_level - 1;
-	int	pre_nnested_subproc;
+	int			pre_level = cur_compile_func_level - 1;
+	int			pre_nnested_subproc;
 
 	if (pre_level < 0)
 		pre_nnested_subproc = -1;
@@ -156,20 +156,19 @@ plisql_start_subproc_func(void)
 			subprocFuncs_alloc = subprocFuncs_alloc * 2;
 	}
 	plisql_nsubprocFuncs = 0;
-	/* This is short-lived, so needn't allocate in function's cxt */
+	/* Short-lived allocation in compile temporary context */
 	plisql_subprocFuncs = MemoryContextAlloc(plisql_compile_tmp_cxt,
-									sizeof(PLiSQL_subproc_function *) * subprocFuncs_alloc);
-	/* init global nested subproc */
+											 sizeof(PLiSQL_subproc_function *) * subprocFuncs_alloc);
+	/* Initialize nested subproc list from previous level */
 	for (plisql_nsubprocFuncs = 0; plisql_nsubprocFuncs < pre_nnested_subproc; plisql_nsubprocFuncs++)
 		plisql_subprocFuncs[plisql_nsubprocFuncs] = plisql_saved_subprocfuncs[pre_level][plisql_nsubprocFuncs];
 }
 
 /*
- * like plisql_finish_datums
- * we reset some global variables
+ * Reset global state after subproc compilation (similar to plisql_finish_datums).
  */
 void
-plisql_finish_subproc_func(PLiSQL_function *function)
+plisql_finish_subproc_func(PLiSQL_function * function)
 {
 	int			i;
 	int			start_subproc = function->nsubprocfuncs;
@@ -179,15 +178,15 @@ plisql_finish_subproc_func(PLiSQL_function *function)
 	if (plisql_nsubprocFuncs <= 0)
 		return;
 
-	/*
-	 * except package specification subproc
-	 */
+/*
+ * Exclude package specification subprocs
+ */
 	Assert(start_subproc <= plisql_nsubprocFuncs);
 	if (start_subproc == plisql_nsubprocFuncs)
 		return;
 	if (start_subproc != 0)
 		function->subprocfuncs = repalloc(function->subprocfuncs,
-									sizeof(PLiSQL_subproc_function *) * plisql_nsubprocFuncs);
+										  sizeof(PLiSQL_subproc_function *) * plisql_nsubprocFuncs);
 	else
 		function->subprocfuncs = palloc(sizeof(PLiSQL_subproc_function *) * plisql_nsubprocFuncs);
 	for (i = start_subproc; i < plisql_nsubprocFuncs; i++)
@@ -196,8 +195,7 @@ plisql_finish_subproc_func(PLiSQL_function *function)
 
 
 /*
- * saved current level subproc function
- * global variable into stack
+ * Save the current level's subproc compilation context on the stack.
  */
 void
 plisql_push_subproc_func(void)
@@ -216,9 +214,7 @@ plisql_push_subproc_func(void)
 }
 
 /*
- * when subproc function compile finish
- * we recover the last global variable from
- * stack
+ * Restore the previous level's subproc compilation context from the stack.
  */
 void
 plisql_pop_subproc_func(void)
@@ -240,44 +236,45 @@ plisql_pop_subproc_func(void)
 
 
 /*
- * build subproc function argument variables
+ * Materialize variables corresponding to the subproc's formal arguments.
  */
 void
-plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool forValidator,
-												FunctionCallInfo fcinfo, int found_varno)
+plisql_build_variable_from_funcargs(PLiSQL_subproc_function * subprocfunc, bool forValidator,
+									FunctionCallInfo fcinfo, int found_varno)
 {
 	PLiSQL_function_argitem *argitem;
-	ListCell *cell;
-	PLiSQL_nsitem	*nse;
-	int				noutargs = 0;
-	PLiSQL_variable	**outvar;
-	int				i;
-	int				nargs = 0;
-	int				nargdefaults = 0;
-	MemoryContext	oldctx;
+	ListCell   *cell;
+	PLiSQL_nsitem *nse;
+	int			noutargs = 0;
+	int			norigoutargs = 0;
+	PLiSQL_variable **outvar;
+	int			i;
+	int			nargs = 0;
+	int			nargdefaults = 0;
+	MemoryContext oldctx;
 	Oid		   *argtypes;
 	char	  **argnames;
 	char	   *argmodes;
 	PLiSQL_variable *argvariable;
-	List		*args = subprocfunc->arg;
+	List	   *args = subprocfunc->arg;
 	PLiSQL_function *function = subprocfunc->function;
-	Oid rettypeid;
-	Oid origrettypeid;
-	HeapTuple typeTup;
+	Oid			rettypeid;
+	Oid			origrettypeid;
+	HeapTuple	typeTup;
 	Form_pg_type typeStruct;
-	char	*detailmsg;
-	Oid origargtypes[FUNC_MAX_ARGS];
+	char	   *detailmsg;
+	Oid			origargtypes[FUNC_MAX_ARGS];
 
 	if (args == NIL)
 		goto no_argument;
 
 	/*
-	 * Fetch info about the procedure's parameters. Allocations aren't
-	 * needed permanently, so make them in tmp cxt.
+	 * Collect parameter metadata. Since these allocations are short-lived,
+	 * perform them in the compile-time temporary context.
 	 *
-	 * We also need to resolve any polymorphic input or output
-	 * argument types.  In validation mode we won't be able to, so we
-	 * arbitrarily assume we are dealing with integers.
+	 * Resolve any polymorphic IN/OUT types. If running in validation mode,
+	 * there may be no call-site expression to infer from; assume int4-based
+	 * stand-ins in that case.
 	 */
 	oldctx = MemoryContextSwitchTo(plisql_compile_tmp_cxt);
 
@@ -293,18 +290,18 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 		memcpy(origargtypes, argtypes, nargs * sizeof(Oid));
 
 	plisql_resolve_polymorphic_argtypes(nargs, argtypes, argmodes,
-										 fcinfo == NULL ? NULL : fcinfo->flinfo->fn_expr,
-										 forValidator,
-										 plisql_error_funcname);
+										fcinfo == NULL ? NULL : fcinfo->flinfo->fn_expr,
+										forValidator,
+										plisql_error_funcname);
 
-	outvar = (PLiSQL_variable **) palloc(sizeof(PLiSQL_variable *) * nargs);
+	outvar = (PLiSQL_variable **) palloc(sizeof(PLiSQL_variable *) * (nargs + 1));
 	i = 0;
 	noutargs = 0;
 	nargdefaults = 0;
 
 	MemoryContextSwitchTo(oldctx);
 
-	foreach (cell, args)
+	foreach(cell, args)
 	{
 		char		buf[32];
 		Oid			argtypeid = argtypes[i];
@@ -315,15 +312,15 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 		argitem = (PLiSQL_function_argitem *) lfirst(cell);
 
 		nse = plisql_ns_lookup(plisql_ns_top(), true,
-							argitem->argname, NULL, NULL,
-							NULL);
+							   argitem->argname, NULL, NULL,
+							   NULL);
 		if (nse != NULL)
 			elog(ERROR, "duplicate declaration in function args");
 
 		snprintf(buf, sizeof(buf), "$%d", i + 1);
 		if (IsPolymorphicType(argitem->type->typoid))
 			argdtype = plisql_build_datatype(argtypes[i], -1,
-							function->fn_input_collation, NULL);
+											 function->fn_input_collation, NULL);
 		else
 			argdtype = argitem->type;
 
@@ -337,30 +334,52 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 							format_type_be(argtypeid))));
 
 		argvariable = plisql_build_variable((argnames &&
-											  argnames[i][0] != '\0') ?
-											 argnames[i] : buf,
-											 0, argdtype, false);
+											 argnames[i][0] != '\0') ?
+											argnames[i] : buf,
+											0, argdtype, false);
 		if (argvariable->dtype == PLISQL_DTYPE_VAR)
 		{
 			argitemtype = PLISQL_NSTYPE_VAR;
+
+			/*
+			 * Use the info field to remember the variable' IN, OUT, IN OUT mode,
+			 * IN mode variable is not allowned to be assigned with value.
+			 */
+			if (argmode == PROARGMODE_IN ||
+				argmode == PROARGMODE_OUT ||
+				argmode == PROARGMODE_INOUT)
+				((PLiSQL_var *)argvariable)->info = argmode;
+			else
+				((PLiSQL_var *)argvariable)->info = PROARGMODE_IN;
 		}
 		else
 		{
 			Assert(argvariable->dtype == PLISQL_DTYPE_REC);
 			argitemtype = PLISQL_NSTYPE_REC;
+
+			/*
+			 * Use the info field to remember the variable' IN, OUT, IN OUT mode,
+			 * IN mode variable is not allowned to be assigned with value.
+			 */
+			if (argmode == PROARGMODE_IN ||
+				argmode == PROARGMODE_OUT ||
+				argmode == PROARGMODE_INOUT)
+				((PLiSQL_rec *)argvariable)->info = argmode;
+			else
+				((PLiSQL_rec *)argvariable)->info = PROARGMODE_IN;
 		}
 		function->fn_argvarnos[i] = argvariable->dno;
 
-		/* Remember arguments in appropriate arrays */
+		/* Track OUT/INOUT/TABLE parameters for later aggregation */
 		if (argmode == PROARGMODE_OUT ||
 			argmode == PROARGMODE_INOUT ||
 			argmode == PROARGMODE_TABLE)
 			outvar[noutargs++] = argvariable;
 
-		/* Add to namespace under the $n name */
+		/* Expose as $n in the current namespace */
 		add_parameter_name(argitemtype, argvariable->dno, buf);
 
-		/* If there's a name for the argument, make an alias */
+		/* If the argument is named, create an alias entry */
 		if (argnames && argnames[i][0] != '\0')
 			add_parameter_name(argitemtype, argvariable->dno,
 							   argnames[i]);
@@ -383,42 +402,102 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 		i++;
 	}
 
-	/*
-	 * If there's just one OUT parameter, out_param_varno points
-	 * directly to it.  If there's more than one, build a row that
-	 * holds all of them.  Procedures return a row even for one OUT
-	 * parameter.
-	 */
-	if (noutargs > 1 ||
-		(noutargs == 1 && function->fn_prokind == PROKIND_PROCEDURE))
+	norigoutargs = noutargs;
+	/*Build a '_retval_' varaible for the function return value */
+	if (noutargs > 0)
+	{
+		if (subprocfunc->rettype != NULL &&
+			subprocfunc->rettype->typoid != VOIDOID)
+		{
+			char		buf[32];
+			PLiSQL_type *argdtype;
+			PLiSQL_nsitem_type argitemtype;
+			Oid 		argtypeid = subprocfunc->rettype->typoid;
+
+			/* Is the function's return type a PSEUDO type? */
+			if (IsPolymorphicType(argtypeid))
+			{
+				if (forValidator)
+				{
+					if (argtypeid == ANYARRAYOID)
+						argtypeid = INT4ARRAYOID;
+					else if (argtypeid == ANYRANGEOID)
+						argtypeid = INT4RANGEOID;
+					else
+						argtypeid = INT4OID;
+				}
+				else
+				{
+					argtypeid = get_fn_expr_rettype(fcinfo->flinfo);
+					if (!OidIsValid(argtypeid))
+						ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								errmsg("could not determine actual return type "
+									"for polymorphic function \"%s\"",
+										plisql_error_funcname)));
+				}
+			}
+
+			snprintf(buf, sizeof(buf), "$%d", i + 1);
+
+			argdtype = plisql_build_datatype(argtypeid,
+								-1,
+								function->fn_input_collation,
+								NULL);
+			argvariable = plisql_build_variable("_RETVAL_", 0, argdtype, false);
+			function->fn_ret_vardno = argvariable->dno;
+
+			if (argvariable->dtype == PLISQL_DTYPE_VAR)
+				argitemtype = PLISQL_NSTYPE_VAR;
+			else
+				argitemtype = PLISQL_NSTYPE_REC;
+
+			/* the new builded variable for function return value is after all function OUT args */
+			outvar[noutargs] = argvariable;
+			noutargs++;
+
+			add_parameter_name(argitemtype, argvariable->dno, buf);
+			add_parameter_name(argitemtype, argvariable->dno, "_RETVAL_");
+		}
+	}
+
+	if (noutargs > 0)
 	{
 		PLiSQL_row *row = build_row_from_vars(outvar,
-											   noutargs);
+											  noutargs);
 
 		plisql_adddatum((PLiSQL_datum *) row);
 		function->out_param_varno = row->dno;
 	}
-	else if (noutargs == 1)
-		function->out_param_varno = outvar[0]->dno;
 
 	pfree(outvar);
 
 no_argument:
 
 	/*
-	 * Check for a polymorphic returntype. If found, use the actual
-	 * returntype type from the caller's FuncExpr node, if we have
-	 * one.  (In validation mode we arbitrarily assume we are dealing
-	 * with integers.)
+	 * Handle polymorphic return types: - If possible, derive the concrete
+	 * type from the caller's FuncExpr. - In validation mode (no call site),
+	 * substitute int4-based proxies.
 	 *
-	 * Note: errcode is FEATURE_NOT_SUPPORTED because it should always
-	 * work; if it doesn't we're in some context that fails to make
-	 * the info available.
+	 * Note: using FEATURE_NOT_SUPPORTED reflects that resolution should
+	 * generally succeed; failure indicates missing context.
+	 */
+	/*
+	 * proceduew with out paramster, change its rettypeid to RECORDOID
 	 */
-	rettypeid = subprocfunc->rettype == NULL ? VOIDOID : subprocfunc->rettype->typoid;
-	origrettypeid = rettypeid;
-	if (IsPolymorphicType(rettypeid))
+	origrettypeid = subprocfunc->rettype == NULL ? VOIDOID : subprocfunc->rettype->typoid;
+
+	if (norigoutargs > 0)
+		rettypeid = RECORDOID;
+	else
+		rettypeid = origrettypeid;
+
+	if (IsPolymorphicType(origrettypeid))
 	{
+		if (norigoutargs > 0)
+			elog(ERROR, "result type must not be PolymorphicType because "
+					"of OUT parameters");
+
 		if (forValidator)
 		{
 			if (rettypeid == ANYARRAYOID ||
@@ -429,7 +508,7 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 				rettypeid = INT4RANGEOID;
 			else if (rettypeid == ANYMULTIRANGEOID)
 				rettypeid = INT4MULTIRANGEOID;
-			else		/* ANYELEMENT or ANYNONARRAY or ANYCOMPATIBLE */
+			else				/* ANYELEMENT or ANYNONARRAY or ANYCOMPATIBLE */
 				rettypeid = INT4OID;
 			/* XXX what could we use for ANYENUM? */
 		}
@@ -446,14 +525,14 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 	}
 
 	/*
-	 * Normal function has a defined returntype
+	 * Record the resolved basic result type information.
 	 */
 	function->fn_rettype = rettypeid;
 	function->fn_retset = false;
 	function->fn_nargs = nargs;
 
 	/*
-	 * Lookup the function's return type
+	 * Load catalog details for the resolved result type.
 	 */
 	typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettypeid));
 	if (!HeapTupleIsValid(typeTup))
@@ -484,30 +563,29 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 	function->fn_rettyplen = typeStruct->typlen;
 
 	/*
-	 * install $0 reference, but only for polymorphic return types,
-	 * and not when the return is specified through an output
-	 * parameter.
+	 * For polymorphic results without OUT parameters, install a $0 reference
+	 * of the resolved result type for internal use.
 	 */
 	if (subprocfunc->rettype != NULL &&
 		IsPolymorphicType(subprocfunc->rettype->typoid) &&
 		noutargs == 0)
 	{
 		(void) plisql_build_variable("$0", 0,
-									  plisql_build_datatype(rettypeid,
-													 -1,
-													 function->fn_input_collation,
-													 NULL),
-									  true);
+									 plisql_build_datatype(rettypeid,
+														   -1,
+														   function->fn_input_collation,
+														   NULL),
+									 true);
 	}
 
 	subprocfunc->nargdefaults = nargdefaults;
-	subprocfunc->noutargs = noutargs;
+	subprocfunc->noutargs = norigoutargs;
 
 	ReleaseSysCache(typeTup);
 
 	/*
-	 * Do not allow polymorphic return type unless there is a polymorphic
-	 * input argument that we can use to deduce the actual return type.
+	 * Reject polymorphic results if no polymorphic inputs are available to
+	 * determine a concrete result type.
 	 */
 	detailmsg = check_valid_polymorphic_signature(origrettypeid,
 												  origargtypes,
@@ -519,8 +597,7 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 				 errdetail_internal("%s", detailmsg)));
 
 	/*
-	 * Also, do not allow return type INTERNAL unless at least one input
-	 * argument is INTERNAL.
+	 * Forbid INTERNAL results unless at least one input is INTERNAL.
 	 */
 	detailmsg = check_valid_internal_signature(origrettypeid,
 											   origargtypes,
@@ -539,7 +616,7 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 		if (argmodes == NULL ||
 			argmodes[i] == PROARGMODE_IN ||
 			argmodes[i] == PROARGMODE_VARIADIC)
-			continue;		/* ignore input-only params */
+			continue;			/* skip pure input parameters */
 
 		detailmsg = check_valid_polymorphic_signature(origargtypes[i],
 													  origargtypes,
@@ -559,31 +636,31 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 					 errdetail_internal("%s", detailmsg)));
 	}
 
-	/* Remember if function is STABLE/IMMUTABLE */
+	/* Record readonly flag (STABLE/IMMUTABLE semantics not used here) */
 	function->fn_readonly = false;
 	function->found_varno = found_varno;
 
-	/* there, we insert function to hashtab */
+	/* Insert function into hash table (for polymorphic arg specializations) */
 	if (subprocfunc->has_poly_argument)
 	{
 		PLiSQL_func_hashkey hashkey;
 
-		/* Make sure any unused bytes of the struct are zero */
+		/* Clear the entire key to avoid garbage in unused bytes */
 		MemSet(&hashkey, 0, sizeof(PLiSQL_func_hashkey));
 
-		/* get function OID */
-		hashkey.funcOid =  (Oid ) subprocfunc->fno;
+		/* Record function OID */
+		hashkey.funcOid = (Oid) subprocfunc->fno;
 
-		/* get call context */
+		/* Initialize trigger-related context flags */
 		hashkey.isTrigger = false;
 		hashkey.isEventTrigger = false;
 		hashkey.trigOid = InvalidOid;
 
-		/* get input collation, if known */
+		/* Propagate input collation, if available */
 		hashkey.inputCollation = function->fn_input_collation;
 
 		memcpy(hashkey.argtypes, argtypes,
-				   nargs * sizeof(Oid));
+			   nargs * sizeof(Oid));
 		if (subprocfunc->poly_tab == NULL)
 			subprocfunc->poly_tab = plisql_subprocfunc_HashTableInit();
 		plisql_subprocfunc_HashTableInsert(subprocfunc->poly_tab, function, &hashkey);
@@ -594,19 +671,25 @@ plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc, bool f
 
 
 /*
- * set subproc function action
- * this function call must be after define a function, so we record this
- * subproc function can use subprocfunctions,datums,udttypes.
+ * Set subproc function action.
+ * Must be called after the function is defined, since the subproc function
+ * may reference other subprocs, datums, and user-defined types.
  */
 void
-plisql_set_subprocfunc_action(PLiSQL_subproc_function *subprocfunc,
-										PLiSQL_stmt_block *action)
+plisql_set_subprocfunc_action(PLiSQL_subproc_function * subprocfunc,
+							  PLiSQL_stmt_block * action)
 {
 	Assert(action != NULL && subprocfunc != NULL && subprocfunc->function->action == NULL);
 
 	subprocfunc->function->action = action;
 
-	/* add return stmt */
+	if (subprocfunc->noutargs > 0 &&
+		subprocfunc->rettype != NULL &&
+		((PLiSQL_stmt *) llast(subprocfunc->function->action->body))->cmd_type != PLISQL_STMT_RETURN)
+		subprocfunc->function->fn_no_return = true;
+
+	/* Add implicit RETURN when appropriate */
+
 	/*
 	 * If it has OUT parameters or returns VOID or returns a set, we allow
 	 * control to fall off the end without an explicit RETURN statement. The
@@ -621,29 +704,29 @@ plisql_set_subprocfunc_action(PLiSQL_subproc_function *subprocfunc,
 }
 
 /*
- * check function properties
+ * Validate function properties.
  */
 void
-plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
-												List *properties, bool isdeclare)
+plisql_check_subprocfunc_properties(PLiSQL_subproc_function * subprocfunc,
+									List *properties, bool isdeclare)
 {
-	ListCell *lc;
-	bool	has_result_cache = false;
-	bool	has_deterministic = false;
+	ListCell   *lc;
+	bool		has_result_cache = false;
+	bool		has_deterministic = false;
 
-	/* check result_cache match */
-	foreach (lc, subprocfunc->properties)
+	/* Validate RESULT_CACHE consistency (only check RESULT_CACHE here) */
+	foreach(lc, subprocfunc->properties)
 	{
 		PLiSQL_subprocfunc_proper *proper = (PLiSQL_subprocfunc_proper *) lfirst(lc);
-		ListCell *dlc;
-		bool found = false;
+		ListCell   *dlc;
+		bool		found = false;
 		PLiSQL_subprocfunc_proper *dproper;
 
-		/* deterministic proper can not match */
+		/* Only check RESULT_CACHE in this pass */
 		if (proper->proper_type != FUNC_PROPER_RESULT_CACHE)
 			continue;
 
-		foreach (dlc, properties)
+		foreach(dlc, properties)
 		{
 			dproper = (PLiSQL_subprocfunc_proper *) lfirst(dlc);
 			if (dproper->proper_type == proper->proper_type)
@@ -654,15 +737,15 @@ plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
 		}
 		if (!found)
 			elog(ERROR, "RESULT_CACHE must be specified on \"%s\" declaration and definition",
-						subprocfunc->func_name);
+				 subprocfunc->func_name);
 	}
 
-	/* check new proper */
-	foreach (lc, properties)
+	/* Check and merge new properties */
+	foreach(lc, properties)
 	{
 		PLiSQL_subprocfunc_proper *proper = (PLiSQL_subprocfunc_proper *) lfirst(lc);
-		bool append = true;
-		ListCell *dlc;
+		bool		append = true;
+		ListCell   *dlc;
 		PLiSQL_subprocfunc_proper *dproper;
 
 		switch (proper->proper_type)
@@ -690,7 +773,7 @@ plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
 				break;
 			case PROC_PROPER_DEFAULT_COLLATION:
 				elog(ERROR, "Only package specification, a standalone type specification, "
-					"and in standalone subprograms allow default collation");
+					 "and in standalone subprograms allow default collation");
 				break;
 			case PROC_PROPER_INVOKER_RIGHT:
 				elog(ERROR, "Only schema-level programs allow AUTHID");
@@ -699,8 +782,8 @@ plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
 				elog(ERROR, "wrong type of function proper:%d", proper->proper_type);
 				break;
 		}
-		/* check dest properties */
-		foreach (dlc, subprocfunc->properties)
+		/* Merge into destination properties */
+		foreach(dlc, subprocfunc->properties)
 		{
 			dproper = (PLiSQL_subprocfunc_proper *) lfirst(dlc);
 			if (dproper->proper_type == proper->proper_type)
@@ -715,7 +798,7 @@ plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
 			if (proper->proper_type == FUNC_PROPER_RESULT_CACHE &&
 				(!isdeclare) && subprocfunc->has_declare)
 				elog(ERROR, "RESULT_CACHE must be specified on \"%s\" declaration and definition",
-							subprocfunc->func_name);
+					 subprocfunc->func_name);
 
 			subprocfunc->properties = lappend(subprocfunc->properties, proper);
 		}
@@ -729,27 +812,26 @@ plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
 
 
 /*
- * build a subproc function
- * subproc function can reload and support declare and define
- * so we should check wether a subproc function is define or a
- * new function, we support more than two times declare, but
- * we don't support more than two times define.
+ * Build a subproc function.
+ * A subproc can be reloaded and supports both declaration and definition.
+ * We should check whether a subproc is a re-definition or a new function.
+ * We allow multiple declarations, but do not allow more than one definition.
  */
 PLiSQL_subproc_function *
 plisql_build_subproc_function(char *funcname, List *args,
-										PLiSQL_type *rettype, int location) 
+							  PLiSQL_type * rettype, int location)
 {
 	PLiSQL_subproc_function *funcs;
-	PLiSQL_nsitem	*nse;
-	int fno;
+	PLiSQL_nsitem *nse;
+	int			fno;
 
 	if (strlen(funcname) > NAMEDATALEN)
 		elog(ERROR, "funcname length more than :%d", NAMEDATALEN);
 
-	/* lookup namespace */
+	/* Lookup namespace */
 	nse = plisql_ns_lookup(plisql_ns_top(), true,
-							funcname, NULL, NULL,
-							NULL);
+						   funcname, NULL, NULL,
+						   NULL);
 
 	if (nse != NULL)
 	{
@@ -763,15 +845,15 @@ plisql_build_subproc_function(char *funcname, List *args,
 			funcs = plisql_subprocFuncs[fno];
 		else
 		{
-			/* define new function */
-			funcs = plisql_build_subproc_function_internal(funcname, args, rettype, false, location); 
+			/* Define a new subproc */
+			funcs = plisql_build_subproc_function_internal(funcname, args, rettype, false, location);
 			nse->subprocfunc = lappend_int(nse->subprocfunc, funcs->fno);
 		}
 	}
 	else
 	{
-		funcs = plisql_build_subproc_function_internal(funcname, args, rettype, true, location); 
-		/* init subproc func hash tab */
+		funcs = plisql_build_subproc_function_internal(funcname, args, rettype, true, location);
+		/* Initialize subproc function hash table */
 		nse = plisql_ns_top();
 		Assert(nse->itemno == funcs->fno);
 		nse->subprocfunc = lappend_int(nse->subprocfunc, funcs->fno);
@@ -784,13 +866,13 @@ plisql_build_subproc_function(char *funcname, List *args,
  * add a new subprocfunction to global subprocfunctions var
  */
 void
-plisql_add_subproc_function(PLiSQL_subproc_function *new)
+plisql_add_subproc_function(PLiSQL_subproc_function * new)
 {
 	if (plisql_nsubprocFuncs == subprocFuncs_alloc)
 	{
 		subprocFuncs_alloc *= 2;
 		plisql_subprocFuncs = repalloc(plisql_subprocFuncs, sizeof(PLiSQL_subproc_function *) *
-														subprocFuncs_alloc);
+									   subprocFuncs_alloc);
 	}
 
 	new->fno = plisql_nsubprocFuncs;
@@ -821,6 +903,9 @@ plisql_register_internal_func(void)
 	plisql_internal_funcs.package_free = plisql_free_package_function;
 	plisql_internal_funcs.get_subprocs_from_package = plisql_get_subprocs_from_package;
 	plisql_internal_funcs.function_free = plisql_free_function;
+	plisql_internal_funcs.get_subproc_arg_info = plisql_get_subproc_arg_info;
+	plisql_internal_funcs.get_subproc_prokind = plisql_get_subproc_prokind;
+	plisql_internal_funcs.subproc_should_change_return_type = plisql_subproc_should_change_return_type;
 
 	plisql_internal_funcs.isload = true;
 }
@@ -837,7 +922,7 @@ plisql_unregister_internal_func(void)
 
 
 /*
- * get TupleDesc from internel function
+ * Get TupleDesc from internal function.
  */
 TupleDesc
 plisql_get_func_result_tupdesc(FuncExpr *fexpr)
@@ -862,12 +947,11 @@ plisql_get_func_result_tupdesc(FuncExpr *fexpr)
 }
 
 /*
- * like get_func_arg_info
- * we get subprocfunc arg info
+ * Similar to get_func_arg_info: return subproc function argument info.
  */
 int
 get_subprocfunc_arg_info(FuncExpr *funcexpr, Oid **p_argtypes,
-									char ***p_argnames, char **p_argmodes)
+						 char ***p_argnames, char **p_argmodes)
 {
 	PLiSQL_function *function;
 	PLiSQL_subproc_function *subprocfunc;
@@ -886,12 +970,12 @@ get_subprocfunc_arg_info(FuncExpr *funcexpr, Oid **p_argtypes,
 	subprocfunc = function->subprocfuncs[funcexpr->funcid];
 
 	return get_subprocfunc_arg_info_from_arguments(subprocfunc->arg, p_argtypes,
-												p_argnames, p_argmodes);
+												   p_argnames, p_argmodes);
 
 }
+
 /*
- * get subproc function name
- * from FuncExpr
+ * Get subproc function name from FuncExpr.
  */
 char *
 plisql_get_func_name(FuncExpr *fexpr)
@@ -917,14 +1001,13 @@ plisql_get_func_name(FuncExpr *fexpr)
 
 
 /*
- * like get_call_result_type
- * we build subproc function result type
+ * Similar to get_call_result_type: determine the subproc function result type.
  */
 TypeFuncClass
 plisql_get_subprocfunc_result_type(FuncExpr *fexpr,
-						 ReturnSetInfo *rsinfo,
-						 Oid *resultTypeId,
-						 TupleDesc *resultTupleDesc)
+								   ReturnSetInfo *rsinfo,
+								   Oid *resultTypeId,
+								   TupleDesc *resultTupleDesc)
 {
 	PLiSQL_function *function;
 	PLiSQL_subproc_function *subprocfunc;
@@ -943,25 +1026,25 @@ plisql_get_subprocfunc_result_type(FuncExpr *fexpr,
 	subprocfunc = function->subprocfuncs[fexpr->funcid];
 
 	return internal_get_subprocfunc_result_type(subprocfunc,
-									(Node *) fexpr,
-									rsinfo,
-									resultTypeId,
-									resultTupleDesc);
+												(Node *) fexpr,
+												rsinfo,
+												resultTypeId,
+												resultTupleDesc);
 }
 
 
 /*
- * return out arglist for subprocfunction
- * see details for transformCallStmt
+ * Return list of OUT arguments for a subproc function.
+ * See transformCallStmt for calling convention details.
  */
 List *
 plisql_get_subprocfunc_outargs(FuncExpr *fexpr)
 {
 	PLiSQL_function *function;
 	PLiSQL_subproc_function *subprocfunc;
-	ListCell *lc;
-	List *outargs = NIL;
-	int i = 0;
+	ListCell   *lc;
+	List	   *outargs = NIL;
+	int			i = 0;
 
 	if (FUNC_EXPR_FROM_PG_PROC(fexpr->function_from))
 		elog(ERROR, "FuncExpr is not a internal function");
@@ -976,7 +1059,7 @@ plisql_get_subprocfunc_outargs(FuncExpr *fexpr)
 
 	subprocfunc = function->subprocfuncs[fexpr->funcid];
 
-	foreach (lc, subprocfunc->arg)
+	foreach(lc, subprocfunc->arg)
 	{
 		PLiSQL_function_argitem *argitem = (PLiSQL_function_argitem *) lfirst(lc);
 
@@ -992,15 +1075,15 @@ plisql_get_subprocfunc_outargs(FuncExpr *fexpr)
 
 
 /*
- * like get_func_result_name
- * we return subproc func result name
+ * Similar to get_func_result_name: return the subproc function result name
+ * when there is exactly one OUT parameter; otherwise return NULL.
  */
 char *
 plisql_get_subprocfunc_result_name(FuncExpr *fexpr)
 {
 	PLiSQL_function *function;
 	PLiSQL_subproc_function *subprocfunc;
-	ListCell *lc;
+	ListCell   *lc;
 
 	if (FUNC_EXPR_FROM_PG_PROC(fexpr->function_from))
 		elog(ERROR, "FuncExpr is not a internal function");
@@ -1018,7 +1101,7 @@ plisql_get_subprocfunc_result_name(FuncExpr *fexpr)
 	if (subprocfunc->noutargs != 1)
 		return NULL;
 
-	foreach (lc, subprocfunc->arg)
+	foreach(lc, subprocfunc->arg)
 	{
 		PLiSQL_function_argitem *argitem = (PLiSQL_function_argitem *) lfirst(lc);
 
@@ -1032,13 +1115,12 @@ plisql_get_subprocfunc_result_name(FuncExpr *fexpr)
 }
 
 /*
- * decide where the function
- * come from
+ * Identify the origin of the function (pg_proc vs. subproc).
  */
 char
 plisql_function_from(FunctionCallInfo fcinfo)
 {
-	FuncExpr *funexpr;
+	FuncExpr   *funexpr;
 
 	if (fcinfo->flinfo == NULL || fcinfo->flinfo->fn_expr == NULL)
 		return FUNC_FROM_PG_PROC;
@@ -1053,7 +1135,7 @@ plisql_function_from(FunctionCallInfo fcinfo)
 
 
 /*
- * get subproc func for call stmt
+ * Resolve subproc function for a call statement.
  */
 PLiSQL_function *
 plisql_get_subproc_func(FunctionCallInfo fcinfo, bool forValidator)
@@ -1061,8 +1143,8 @@ plisql_get_subproc_func(FunctionCallInfo fcinfo, bool forValidator)
 	PLiSQL_execstate *estate;
 	PLiSQL_function *pfunc;
 	PLiSQL_subproc_function *subprocfunc;
-	FuncExpr *funcexpr;
-	int	fno;
+	FuncExpr   *funcexpr;
+	int			fno;
 	PLiSQL_function *func;
 
 	funcexpr = (FuncExpr *) fcinfo->flinfo->fn_expr;
@@ -1086,49 +1168,49 @@ plisql_get_subproc_func(FunctionCallInfo fcinfo, bool forValidator)
 
 	subprocfunc = pfunc->subprocfuncs[fno];
 
-	/* if not have poly arguments */
+	/* Handle subproc with polymorphic arguments */
 	if (subprocfunc->has_poly_argument)
 	{
-		int nargs;
-		Oid *argtypes;
-		char **argnames;
-		char *argmodes;
+		int			nargs;
+		Oid		   *argtypes;
+		char	  **argnames;
+		char	   *argmodes;
 		PLiSQL_func_hashkey hashkey;
 
-		/* origin has no define */
+		/* Require the template subproc to have a compiled definition */
 		if (subprocfunc->function->action == NULL)
 			elog(ERROR, "subproc function \"%s\" doesn't define",
-				subprocfunc->func_name); 
+				 subprocfunc->func_name);
 
 
 		Assert(subprocfunc->poly_tab != NULL);
 
 		nargs = get_subprocfunc_arg_info_from_arguments(subprocfunc->arg, &argtypes, &argnames, &argmodes);
 		plisql_resolve_polymorphic_argtypes(nargs, argtypes, argmodes,
-										 fcinfo->flinfo->fn_expr,
-										 forValidator,
-										 subprocfunc->func_name);
+											fcinfo->flinfo->fn_expr,
+											forValidator,
+											subprocfunc->func_name);
 
 		/* Make sure any unused bytes of the struct are zero */
 		MemSet(&hashkey, 0, sizeof(PLiSQL_func_hashkey));
 
-		/* get function OID */
-		hashkey.funcOid =  (Oid ) subprocfunc->fno;
+		/* Record function OID */
+		hashkey.funcOid = (Oid) subprocfunc->fno;
 
-		/* get call context */
+		/* Initialize trigger-related context flags */
 		hashkey.isTrigger = false;
 		hashkey.isEventTrigger = false;
 		hashkey.trigOid = InvalidOid;
 
-		/* get input collation, if known */
+		/* Propagate input collation, if available */
 		hashkey.inputCollation = fcinfo->fncollation;;
 
-		memcpy(hashkey.argtypes, argtypes,
-				   nargs * sizeof(Oid));
+		/* Copy resolved argument type OIDs into the lookup key */
+		memcpy(hashkey.argtypes, argtypes, nargs * sizeof(Oid));
 		func = plisql_subprocfunc_HashTableLookup(subprocfunc->poly_tab, &hashkey);
 		if (func == NULL)
 		{
-			/* function is not found, we shoud dynamic compile */
+			/* Cache miss: compile a specialized version on demand */
 			Assert(subprocfunc->src != NULL);
 			func = plisql_dynamic_compile_subproc(fcinfo, subprocfunc, forValidator);
 		}
@@ -1138,24 +1220,24 @@ plisql_get_subproc_func(FunctionCallInfo fcinfo, bool forValidator)
 
 	if (func->action == NULL)
 		elog(ERROR, "subproc function \"%s\" doesn't define",
-			func->fn_signature); 
+			 func->fn_signature);
 
 	return func;
 }
 
 /*
- * this function init subprocfunction variable by its parent'variable value
+ * Initialize subproc variables from parent scope values.
  */
 void
-plisql_init_subprocfunc_globalvar(PLiSQL_execstate *estate, FunctionCallInfo fcinfo)
+plisql_init_subprocfunc_globalvar(PLiSQL_execstate * estate, FunctionCallInfo fcinfo)
 {
 	PLiSQL_function *pfunc;
 	PLiSQL_execstate *parestate;
 	PLiSQL_subproc_function *subprocfunc;
 	int			fno;
 	int			i;
-	FuncExpr	*funcexpr;
-	int start_level = -1;
+	FuncExpr   *funcexpr;
+	int			start_level = -1;
 
 	funcexpr = (FuncExpr *) fcinfo->flinfo->fn_expr;
 	Assert(funcexpr->function_from == FUNC_FROM_SUBPROCFUNC);
@@ -1171,7 +1253,7 @@ plisql_init_subprocfunc_globalvar(PLiSQL_execstate *estate, FunctionCallInfo fci
 
 	for (i = 0; i < subprocfunc->lastassignvardno; i++)
 	{
-		/* ignore package datum*/
+		/* Skip package-backed datums */
 		if (estate->datums[i]->dtype == PLISQL_DTYPE_PACKAGE_DATUM ||
 			OidIsValid(estate->datums[i]->pkgoid))
 			continue;
@@ -1179,22 +1261,24 @@ plisql_init_subprocfunc_globalvar(PLiSQL_execstate *estate, FunctionCallInfo fci
 		if (is_const_datum(estate, estate->datums[i]))
 			continue;
 
-		/* ignore row variable which is internal */
+		/* Skip internal row-typed datums */
 		if (estate->datums[i]->dtype == PLISQL_DTYPE_ROW)
 			continue;
 
-		/* ignore some datums, which need not assign */
+		/* Ignore datums that don't require assignment */
 		if (is_subprocfunc_argnum(pfunc, i))
 			continue;
 
 		if (i < parestate->ndatums)
 		{
+			/* Use the value from the immediate parent frame */
 			plisql_assign_in_global_var(estate, parestate, i);
 		}
 		else
 		{
 			if (start_level == -1)
 				start_level = SPI_get_connected() - 1;
+			/* Otherwise, resolve from outer stack frames */
 			plsql_init_glovalvar_from_stack(estate, i, &start_level);
 		}
 	}
@@ -1204,20 +1288,19 @@ plisql_init_subprocfunc_globalvar(PLiSQL_execstate *estate, FunctionCallInfo fci
 
 
 /*
- * this function, when global variable is changed
- * we should assign its near out parent
+ * When a global variable has changed, assign it to the nearest OUT parent.
  */
 void
-plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate *estate,
-													FunctionCallInfo fcinfo)
+plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate * estate,
+										FunctionCallInfo fcinfo)
 {
 	PLiSQL_function *pfunc;
 	PLiSQL_execstate *parestate;
 	PLiSQL_subproc_function *subprocfunc;
 	int			fno;
 	int			i;
-	FuncExpr	*funcexpr;
-	int start_level = -1;
+	FuncExpr   *funcexpr;
+	int			start_level = -1;
 
 	funcexpr = (FuncExpr *) fcinfo->flinfo->fn_expr;
 	Assert(funcexpr->function_from == FUNC_FROM_SUBPROCFUNC);
@@ -1233,7 +1316,7 @@ plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate *estate,
 
 	for (i = 0; i < subprocfunc->lastassignvardno; i++)
 	{
-		/* ignore package datum*/
+		/* Skip package-backed datums */
 		if (estate->datums[i]->dtype == PLISQL_DTYPE_PACKAGE_DATUM ||
 			OidIsValid(estate->datums[i]->pkgoid))
 			continue;
@@ -1241,11 +1324,11 @@ plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate *estate,
 		if (is_const_datum(estate, estate->datums[i]))
 			continue;
 
-		/* ignore row variable which is internal */
+		/* Skip internal row-typed datums */
 		if (estate->datums[i]->dtype == PLISQL_DTYPE_ROW)
 			continue;
 
-		/* ignore some datums, which need not assign */
+		/* Ignore datums that don't require assignment */
 		if (is_subprocfunc_argnum(pfunc, i))
 			continue;
 
@@ -1264,54 +1347,53 @@ plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate *estate,
 
 
 /*
- * init subproc function for arg has polymorphic
- * this hash table like plisql_HashTable
+ * Initialize hash table for subproc functions with polymorphic arguments.
+ * Modeled after plisql_HashTable.
  */
 static HTAB *
 plisql_subprocfunc_HashTableInit(void)
 {
 	HASHCTL		ctl;
-	HTAB		*htab;
+	HTAB	   *htab;
 
 	ctl.keysize = sizeof(PLiSQL_func_hashkey);
 	ctl.entrysize = sizeof(plisql_HashEnt);
-	ctl.hcxt= CurrentMemoryContext;
+	ctl.hcxt = CurrentMemoryContext;
 
 	htab = hash_create("PLiSQL subprocfunction hash for polyarg",
-									128,
-									&ctl,
-									HASH_ELEM | HASH_BLOBS|HASH_CONTEXT);
+					   128,
+					   &ctl,
+					   HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
 
 	return htab;
 }
 
 
 /*
- * plsql_get_subprocfunc_detail like func_get_detail
- * but we get function details from subprocfunc
+ * Similar to func_get_detail, but retrieve details from a subproc function.
  */
 FuncDetailCode
 plisql_get_subprocfunc_detail(ParseState *pstate,
-											PLiSQL_function *pfunc, PLiSQL_nsitem *nse,
-											char *funcname, List **fargs, /* return value */
-											bool proc_call,
-											List *fargnames,
-											int nargs,
-											Oid *argtypes,
-											Oid *funcid,	/* return value */
-											Oid *rettype,	/* return value */
-											bool *retset,	/* return value */
-											int *nvargs,	/* return value */
-											Oid *vatype,	/* return value */
-											Oid **true_typeids, /* return value */
-											List **argdefaults) /* return value */
+							  PLiSQL_function * pfunc, PLiSQL_nsitem * nse,
+							  char *funcname, List **fargs, /* return value */
+							  bool proc_call,
+							  List *fargnames,
+							  int nargs,
+							  Oid *argtypes,
+							  Oid *funcid,	/* return value */
+							  Oid *rettype, /* return value */
+							  bool *retset, /* return value */
+							  int *nvargs,	/* return value */
+							  Oid *vatype,	/* return value */
+							  Oid **true_typeids,	/* return value */
+							  List **argdefaults)	/* return value */
 {
 	subprocFuncCandidateList raw_candidates;
 	subprocFuncCandidateList best_candidate = NULL;
 	subprocFuncCandidateList tmp_candidate;
-	int						nbest;
+	int			nbest;
 
-	/* initialize output arguments to silence compiler warnings */
+	/* Initialize outputs to silence compiler warnings */
 	*funcid = InvalidOid;
 	*rettype = InvalidOid;
 	*retset = false;
@@ -1332,10 +1414,10 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 	 */
 	nbest = 0;
 	for (tmp_candidate = raw_candidates;
-		tmp_candidate != NULL;
-		tmp_candidate = tmp_candidate->next)
+		 tmp_candidate != NULL;
+		 tmp_candidate = tmp_candidate->next)
 	{
-		/* if nargs==0, argtypes can be null; don't pass that to memcmp */
+		/* If nargs == 0, argtypes can be NULL; don't pass that to memcmp */
 		if (nargs == 0 ||
 			memcmp(argtypes, tmp_candidate->args, nargs * sizeof(Oid)) == 0)
 		{
@@ -1349,25 +1431,23 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 	if (best_candidate == NULL)
 	{
 		subprocFuncCandidateList current_candidates;
-		int 		ncandidates;
+		int			ncandidates;
 
 		ncandidates = plisql_func_match_argtypes(nargs,
-										argtypes,
-										raw_candidates,
-										&current_candidates);
+												 argtypes,
+												 raw_candidates,
+												 &current_candidates);
 
-		/* one match only? then run with it... */
+		/* Single match: use it */
 		if (ncandidates == 1)
 			best_candidate = current_candidates;
 
-		/*
-		 * multiple candidates? then better decide or throw an error...
-		 */
+		/* Multiple candidates: select the best or error out */
 		else if (ncandidates > 1)
 		{
 			best_candidate = plisql_func_select_candidate(nargs,
-												argtypes,
-												current_candidates);
+														  argtypes,
+														  current_candidates);
 
 			/*
 			 * If we were able to choose a best candidate, we're done.
@@ -1380,7 +1460,7 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 	if (best_candidate)
 	{
 		PLiSQL_subproc_function *subprocfunc;
-		List *defaultnumber = NIL;
+		List	   *defaultnumber = NIL;
 
 		subprocfunc = pfunc->subprocfuncs[best_candidate->fno];
 
@@ -1389,12 +1469,24 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 		if (subprocfunc->rettype != NULL)
 			*rettype = subprocfunc->rettype->typoid;
 		else
-			*rettype = VOIDOID;
+		{
+			/* Begin - ReqID:SRS-SQL-PACKAGE */
+			/*
+			 * procedure with out parameter, we replace rettype
+			 * use RECORDOID
+			 */
+			if (subprocfunc->noutargs != 0)
+				*rettype = RECORDOID;
+			else
+				*rettype = VOIDOID;
+			/* End - ReqID:SRS-SQL-PACKAGE */
+		}
+
 		*retset = subprocfunc->function->fn_retset;
 
 		if (best_candidate->argnumbers != NULL)
 		{
-			int 		i = 0;
+			int			i = 0;
 			ListCell   *lc;
 
 			foreach(lc, *fargs)
@@ -1406,11 +1498,12 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 				i++;
 			}
 		}
-		/* saved defualt argnumber */
+		/* Record indexes of defaulted arguments */
 		if (argdefaults && best_candidate->ndargs > 0)
 		{
-			int i;
-			/* saved default */
+			int			i;
+
+			/* Defaulted arguments */
 			if (best_candidate->argnumbers != NULL)
 			{
 				for (i = nargs; i < best_candidate->nargs; i++)
@@ -1423,8 +1516,33 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 			}
 		}
 		if (fargnames != NIL || defaultnumber != NIL)
+		{
 			*fargs = plisql_expand_and_reorder_functionargs(pstate, subprocfunc, best_candidate->nargs,
-									*fargs, defaultnumber, argdefaults);
+															*fargs, defaultnumber, argdefaults);
+
+			/*
+			 * After reordering fargs to declared order, we must also rebuild
+			 * true_typeids (which becomes declared_arg_types in the caller) to
+			 * match. The original best_candidate->args is in call order for
+			 * overload resolution, but make_fn_arguments needs declared order
+			 * to match the reordered fargs.
+			 */
+			if (best_candidate->argnumbers != NULL)
+			{
+				Oid		   *declared_order_types;
+				ListCell   *lc;
+				int			i = 0;
+
+				declared_order_types = palloc(best_candidate->nargs * sizeof(Oid));
+				foreach(lc, subprocfunc->arg)
+				{
+					PLiSQL_function_argitem *argitem = lfirst(lc);
+
+					declared_order_types[i++] = argitem->type->typoid;
+				}
+				*true_typeids = declared_order_types;
+			}
+		}
 
 		if (subprocfunc->is_proc)
 			return FUNCDETAIL_PROCEDURE;
@@ -1439,29 +1557,29 @@ plisql_get_subprocfunc_detail(ParseState *pstate,
 
 
 /*
- * check subproc function can reload
- * 1) different number of arguments
- * 2) different arguments'name
- * 3) different arguments'oid
- * 4) if arguments are udt type, but its types is different
- * 5) as define or declare we allow the rettype is not different
- * as long as meet one of the above five conditions, then
- * subproc function can reload.
+ * Check whether a subproc function can be overloaded.
+ * Criteria include:
+ *   1) different number of arguments
+ *   2) different argument names
+ *   3) different argument type OIDs
+ *   4) for UDT arguments, different type details
+ *   5) return type does not participate in overload resolution; declaration
+ *      and definition may differ in return type
  */
 static int
 plisql_check_function_canreload(List *args,
-							List *fnos, PLiSQL_type *rettype)
+								List *fnos, PLiSQL_type * rettype)
 {
-	int resultfno = -1;
-	ListCell *lc;
+	int			resultfno = -1;
+	ListCell   *lc;
 
-	foreach (lc, fnos)
+	foreach(lc, fnos)
 	{
-		int fno;
+		int			fno;
 		PLiSQL_subproc_function *subprocfunc;
-		ListCell *cell1;
-		ListCell *cell2;
-		bool	canreload = false;
+		ListCell   *cell1;
+		ListCell   *cell2;
+		bool		canreload = false;
 
 		fno = lfirst_int(lc);
 
@@ -1470,11 +1588,11 @@ plisql_check_function_canreload(List *args,
 
 		subprocfunc = plisql_subprocFuncs[fno];
 
-		/* compare nargs */
+		/* Compare number of arguments */
 		if (list_length(args) != list_length(subprocfunc->arg))
 			continue;
 
-		/* compare rettype */
+		/* Compare return type */
 		if (rettype != NULL &&
 			subprocfunc->rettype != NULL &&
 			rettype->typoid != subprocfunc->rettype->typoid)
@@ -1489,7 +1607,7 @@ plisql_check_function_canreload(List *args,
 			subprocfunc->rettype != NULL)
 			continue;
 
-		/* compare arg item */
+		/* Compare argument items */
 		forboth(cell1, args, cell2, subprocfunc->arg)
 		{
 			PLiSQL_function_argitem *srcitem;
@@ -1498,14 +1616,14 @@ plisql_check_function_canreload(List *args,
 			srcitem = lfirst(cell1);
 			dstitem = lfirst(cell2);
 
-			/* argname doesn't consistent */
+			/* Argument name differs */
 			if (strcmp(srcitem->argname, dstitem->argname) != 0)
 			{
 				canreload = true;
 				break;
 			}
 
-			/* compare type oid */
+			/* Compare type OID */
 			if (srcitem->type->typoid != dstitem->type->typoid)
 				canreload = true;
 			else
@@ -1515,8 +1633,8 @@ plisql_check_function_canreload(List *args,
 					canreload = true;
 				else if (srcitem->type->pctrowtypname != NULL && dstitem->type->pctrowtypname != NULL)
 				{
-					TypeName *src_typname = srcitem->type->pctrowtypname;
-					TypeName *dst_typname = dstitem->type->pctrowtypname;
+					TypeName   *src_typname = srcitem->type->pctrowtypname;
+					TypeName   *dst_typname = dstitem->type->pctrowtypname;
 
 					if ((src_typname->pct_type && !dst_typname->pct_type) ||
 						(!src_typname->pct_type && dst_typname->pct_type) ||
@@ -1525,18 +1643,18 @@ plisql_check_function_canreload(List *args,
 						canreload = true;
 					else
 					{
-						ListCell *l1;
-						ListCell *l2;
+						ListCell   *l1;
+						ListCell   *l2;
 
 						if (list_length(src_typname->names) != list_length(dst_typname->names))
 							canreload = true;
 						forboth(l1, src_typname->names, l2, dst_typname->names)
 						{
-							char *src_name;
-							char *dst_name;
+							char	   *src_name;
+							char	   *dst_name;
 
-							src_name = strVal((String *)lfirst(l1));
-							dst_name = strVal((String*)lfirst(l2));
+							src_name = strVal((String *) lfirst(l1));
+							dst_name = strVal((String *) lfirst(l2));
 							if (pg_strcasecmp(src_name, dst_name))
 							{
 								canreload = true;
@@ -1566,21 +1684,22 @@ plisql_check_function_canreload(List *args,
 }
 
 /*
- * like plisql_build_variable
+ * Similar to plisql_build_variable.
  *
- * this function build a subproc function and add it to namespace
+ * Build a subproc function and optionally add it to the namespace.
  */
 static PLiSQL_subproc_function *
 plisql_build_subproc_function_internal(char *funcname, List *args,
-													PLiSQL_type *rettype,
-													bool add2namespace,
-													int location) 
+									   PLiSQL_type * rettype,
+									   bool add2namespace,
+									   int location)
 {
 	PLiSQL_subproc_function *funcs;
-	bool is_proc = (rettype == NULL ? true : false);
+	bool		is_proc = (rettype == NULL ? true : false);
 	PLiSQL_function *function;
 	bool		has_poly_argument = false;
 	MemoryContext func_cxt = plisql_curr_compile->fn_cxt;
+	int		noutargs = 0;
 
 	funcs = (PLiSQL_subproc_function *) palloc0(sizeof(PLiSQL_subproc_function));
 	funcs->function = (PLiSQL_function *) palloc0(sizeof(PLiSQL_function));
@@ -1596,10 +1715,10 @@ plisql_build_subproc_function_internal(char *funcname, List *args,
 	function->fn_signature = quote_qualified_identifier(NULL, funcname);
 	function->fn_input_collation = plisql_curr_compile->fn_input_collation;
 	function->fn_cxt = func_cxt;
-	function->out_param_varno = -1; /* set up for no OUT param */
+	function->out_param_varno = -1; /* initialize as no OUT parameter */
 	function->resolve_option = plisql_curr_compile->resolve_option;
 	function->print_strict_params = plisql_curr_compile->print_strict_params;
-	/* only promote extra warnings and errors at CREATE FUNCTION time */
+	/* Promote extra warnings and errors only at CREATE FUNCTION time */
 	function->extra_warnings = plisql_curr_compile->extra_warnings;
 	function->extra_errors = plisql_curr_compile->extra_errors;
 
@@ -1616,27 +1735,26 @@ plisql_build_subproc_function_internal(char *funcname, List *args,
 	function->fn_nargs = list_length(args);
 	function->paramnames = NULL;
 
-	/*
-	 * when parse a package function
-	 * we don't compile package body
-	 * but parse shoud use its argument defaults
-	 * so we there record its defaults arguments
-	 */
+/*
+ * When parsing a package function, the package body is not compiled;
+ * however, the parser needs access to argument defaults. Record the
+ * presence of defaults here.
+ */
 	if (args != NIL)
 	{
 		PLiSQL_function_argitem *argitem;
-		ListCell *lc;
+		ListCell   *lc;
 
 		if (list_length(args) > FUNC_MAX_ARGS)
 			ereport(ERROR,
-				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-			 errmsg_plural("cannot pass more than %d argument to a function or procedure",
-						   "cannot pass more than %d arguments to a function or procedure",
-						   FUNC_MAX_ARGS,
-						   FUNC_MAX_ARGS),
-				 parser_errposition(NULL, -1)));
-
-		foreach (lc, args)
+					(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
+					 errmsg_plural("cannot pass more than %d argument to a function or procedure",
+								   "cannot pass more than %d arguments to a function or procedure",
+								   FUNC_MAX_ARGS,
+								   FUNC_MAX_ARGS),
+					 parser_errposition(NULL, -1)));
+
+		foreach(lc, args)
 		{
 			argitem = (PLiSQL_function_argitem *) lfirst(lc);
 
@@ -1644,6 +1762,10 @@ plisql_build_subproc_function_internal(char *funcname, List *args,
 				funcs->nargdefaults++;
 			if (IsPolymorphicType(argitem->type->typoid))
 				has_poly_argument = true;
+
+			if (argitem->argmode == ARGMODE_OUT ||
+				argitem->argmode == ARGMODE_INOUT)
+				noutargs++;
 		}
 	}
 
@@ -1652,12 +1774,12 @@ plisql_build_subproc_function_internal(char *funcname, List *args,
 	{
 		if (is_proc)
 			plisql_ns_additem(PLISQL_NSTYPE_SUBPROC_PROC,
-							funcs->fno,
-							funcname);
+							  funcs->fno,
+							  funcname);
 		else
 			plisql_ns_additem(PLISQL_NSTYPE_SUBPROC_FUNC,
-							funcs->fno,
-							funcname);
+							  funcs->fno,
+							  funcname);
 	}
 	funcs->has_poly_argument = has_poly_argument;
 
@@ -1666,24 +1788,25 @@ plisql_build_subproc_function_internal(char *funcname, List *args,
 	funcs->function->fn_oid = plisql_curr_compile->fn_oid;
 	funcs->function->namelabel = pstrdup(funcname);
 	funcs->location = location;
+	funcs->noutargs = noutargs;
 
 	return funcs;
 }
 
 /*
- * like MatchNamedCallFromFuncInfo
- * we map the NameCall to its argument position'number
+ * Similar to MatchNamedCallFromFuncInfo: map named-call arguments to their
+ * positional indexes.
  */
 static bool
 plisql_match_function_argnames(List *funcargs, int nargs,
-										List *argnames, int **argnumber)
+							   List *argnames, int **argnumber)
 {
-	int nnameargs;
-	ListCell *lc;
-	int	j;
-	bool	*found = NULL;
-	int		funcnargs;
-	int		position_nargs;
+	int			nnameargs;
+	ListCell   *lc;
+	int			j;
+	bool	   *found = NULL;
+	int			funcnargs;
+	int			position_nargs;
 
 	if (argnumber)
 		*argnumber = NULL;
@@ -1703,7 +1826,7 @@ plisql_match_function_argnames(List *funcargs, int nargs,
 	foreach(lc, argnames)
 	{
 		char	   *argname = (char *) lfirst(lc);
-		ListCell	*flc;
+		ListCell   *flc;
 		int			i = 0;
 		bool		match = false;
 
@@ -1731,13 +1854,13 @@ plisql_match_function_argnames(List *funcargs, int nargs,
 	}
 
 	Assert(j == nargs);
-	/* find default value argnum */
+	/* Locate defaulted argument positions */
 	if (j < funcnargs)
 	{
 		for (; j < funcnargs; j++)
 		{
-			bool match = false;
-			int i;
+			bool		match = false;
+			int			i;
 
 			for (i = 0; i < funcnargs; i++)
 			{
@@ -1772,28 +1895,28 @@ plisql_match_function_argnames(List *funcargs, int nargs,
 }
 
 /*
- * like FuncnameGetCandidates
- * but we get function list from hashtab
+ * Similar to FuncnameGetCandidates, but retrieve the function list from the
+ * subproc hash table and namespace.
  */
 static subprocFuncCandidateList
-plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
-													PLiSQL_nsitem *nse, int nargs,
-													List *fargnames, bool proc_call)
+plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function * pfunc,
+									   PLiSQL_nsitem * nse, int nargs,
+									   List *fargnames, bool proc_call)
 {
-	ListCell *lc;
+	ListCell   *lc;
 	subprocFuncCandidateList resultList = NULL;
 
 	foreach(lc, nse->subprocfunc)
 	{
 		PLiSQL_subproc_function *subprocfunc = NULL;
-		List *args;
-		ListCell	*l;
-		int i;
-		Oid *argoids = NULL;
-		int *argnumber = NULL;
-		char *argmode = NULL;
-		int declare_nargs;
-		int fno;
+		List	   *args;
+		ListCell   *l;
+		int			i;
+		Oid		   *argoids = NULL;
+		int		   *argnumber = NULL;
+		char	   *argmode = NULL;
+		int			declare_nargs;
+		int			fno;
 		subprocFuncCandidateList newResult;
 
 		fno = lfirst_int(lc);
@@ -1805,30 +1928,31 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 		args = subprocfunc->arg;
 		declare_nargs = list_length(args);
 
-		/* only find procedure */
+		/* Restrict match to procedures */
 		if (proc_call && !subprocfunc->is_proc)
 			continue;
 
-		/* only find function */
+		/* Restrict match to functions */
 		if (!proc_call && subprocfunc->is_proc)
 			continue;
 
 		if (declare_nargs < nargs)
 			continue;
 		else if (declare_nargs == nargs ||
-			declare_nargs <= nargs + subprocfunc->nargdefaults)
+				 declare_nargs <= nargs + subprocfunc->nargdefaults)
 		{
-			/* argname match */
+			/* Match argument name */
 			if (fargnames != NULL)
 			{
 				if (!plisql_match_function_argnames(args, nargs,
-						fargnames, &argnumber))
+													fargnames, &argnumber))
 					continue;
 			}
 			if (declare_nargs > nargs)
 			{
-				/* check argdefault */
-				bool default_match = true;
+				/* Check argument default */
+				bool		default_match = true;
+
 				if (argnumber == NULL)
 				{
 					for (i = nargs; i < declare_nargs; i++)
@@ -1850,7 +1974,7 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 					continue;
 				}
 			}
-			/* argtype match */
+			/* Match argument type */
 			if (declare_nargs > 0)
 			{
 				argoids = (Oid *) palloc(declare_nargs * sizeof(Oid));
@@ -1864,7 +1988,7 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 
 				argoids[i] = argitem->type->typoid;
 				if (argitem->argmode == ARGMODE_IN)
-					argmode[i++] =  FUNC_PARAM_IN;
+					argmode[i++] = FUNC_PARAM_IN;
 				else if (argitem->argmode == ARGMODE_OUT)
 					argmode[i++] = FUNC_PARAM_OUT;
 				else
@@ -1873,8 +1997,8 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 
 			if (argnumber != NULL)
 			{
-				Oid *using_oid = palloc(declare_nargs * sizeof(Oid));
-				char *using_mode = palloc(declare_nargs * sizeof(char));
+				Oid		   *using_oid = palloc(declare_nargs * sizeof(Oid));
+				char	   *using_mode = palloc(declare_nargs * sizeof(char));
 
 				for (i = 0; i < declare_nargs; i++)
 				{
@@ -1903,23 +2027,23 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 		}
 	}
 
-	/* nice error report */
+	/* Improve error reporting */
 	if (resultList == NULL && list_length(nse->subprocfunc) == 1)
 	{
-		int fno = linitial_int(nse->subprocfunc);
+		int			fno = linitial_int(nse->subprocfunc);
 		PLiSQL_subproc_function *subprocfunc = pfunc->subprocfuncs[fno];
 
 		if (proc_call && !subprocfunc->is_proc)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					errmsg("'%s' is not a procedure",
-					funcname),
-					errhint("To call a function, use SELECT.")));
+					 errmsg("'%s' is not a procedure",
+							funcname),
+					 errhint("To call a function, use SELECT.")));
 		else if (!proc_call && subprocfunc->is_proc)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					errmsg("'%s' is a procedure", funcname),
-					errhint("To call a procedure, use CALL.")));
+					 errmsg("'%s' is a procedure", funcname),
+					 errhint("To call a procedure, use CALL.")));
 	}
 
 	return resultList;
@@ -1927,14 +2051,13 @@ plisql_getFuncCandidateListFromFunname(char *funcname, PLiSQL_function *pfunc,
 
 
 /*
- * like func_match_argtypes()
- *
+ * Similar to func_match_argtypes().
  */
 static int
 plisql_func_match_argtypes(int nargs,
-					Oid *input_typeids,
-					subprocFuncCandidateList raw_candidates,
-					subprocFuncCandidateList *candidates)		/* return value */
+						   Oid *input_typeids,
+						   subprocFuncCandidateList raw_candidates,
+						   subprocFuncCandidateList * candidates)	/* return value */
 {
 	subprocFuncCandidateList current_candidate;
 	subprocFuncCandidateList next_candidate;
@@ -1957,17 +2080,17 @@ plisql_func_match_argtypes(int nargs,
 	}
 
 	return ncandidates;
-}	/* plisql_func_match_argtypes() */
+}								/* plisql_func_match_argtypes() */
 
 
 
 /*
- * like func_selec_candidate
+ * Similar to func_select_candidate.
  */
 static subprocFuncCandidateList
 plisql_func_select_candidate(int nargs,
-					  Oid *input_typeids,
-					  subprocFuncCandidateList candidates)
+							 Oid *input_typeids,
+							 subprocFuncCandidateList candidates)
 {
 	subprocFuncCandidateList current_candidate,
 				first_candidate,
@@ -1990,10 +2113,10 @@ plisql_func_select_candidate(int nargs,
 	if (nargs > FUNC_MAX_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-			 errmsg_plural("cannot pass more than %d argument to a function",
-						   "cannot pass more than %d arguments to a function",
-						   FUNC_MAX_ARGS,
-						   FUNC_MAX_ARGS)));
+				 errmsg_plural("cannot pass more than %d argument to a function",
+							   "cannot pass more than %d arguments to a function",
+							   FUNC_MAX_ARGS,
+							   FUNC_MAX_ARGS)));
 
 	/*
 	 * If any input types are domains, reduce them to their base types. This
@@ -2027,7 +2150,7 @@ plisql_func_select_candidate(int nargs,
 	 */
 	ncandidates = 0;
 	nbestMatch = 0;
-	first_candidate = NULL;		/* ReqID:SRS-GKC-DATATYPE_001 */
+	first_candidate = NULL;
 	last_candidate = NULL;
 	for (current_candidate = candidates;
 		 current_candidate != NULL;
@@ -2042,7 +2165,7 @@ plisql_func_select_candidate(int nargs,
 				nmatch++;
 		}
 
-		/* take this one as the best choice so far? */
+		/* Best choice so far */
 		if ((nmatch > nbestMatch) || (last_candidate == NULL))
 		{
 			nbestMatch = nmatch;
@@ -2050,30 +2173,30 @@ plisql_func_select_candidate(int nargs,
 			last_candidate = current_candidate;
 			ncandidates = 1;
 		}
-		/* no worse than the last choice, so keep this one too? */
+		/* As good as previous best; keep it */
 		else if (nmatch == nbestMatch)
 		{
 			last_candidate->next = current_candidate;
 			last_candidate = current_candidate;
 			ncandidates++;
 		}
-		/* otherwise, don't bother keeping this one... */
+		/* Otherwise, discard */
 	}
 
-	if (last_candidate)			/* terminate rebuilt list */
+	if (last_candidate)			/* terminate rebuilt candidate list */
 		last_candidate->next = NULL;
 
 	if (ncandidates == 1)
 		return candidates;
 
 	/*
-	 * Still too many candidates? Now look for candidates which have either
-	 * exact matches or preferred types at the args that will require
-	 * coercion. (Restriction added in 7.4: preferred type must be of same
-	 * category as input type; give no preference to cross-category
-	 * conversions to preferred types.)  Keep all candidates if none match.
+	 * If ambiguity remains, prefer candidates that either exactly match the
+	 * known input types or use preferred types at positions that require
+	 * coercion. (Since 7.4, the preferred type must be in the same category
+	 * as the input; do not favor cross-category conversions.) If none match,
+	 * keep the full set of candidates.
 	 */
-	for (i = 0; i < nargs; i++) /* avoid multiple lookups */
+	for (i = 0; i < nargs; i++) /* avoid repeated lookups */
 		slot_category[i] = TypeCategory(input_base_typeids[i]);
 	ncandidates = 0;
 	nbestMatch = 0;
@@ -2099,7 +2222,7 @@ plisql_func_select_candidate(int nargs,
 			nbestMatch = nmatch;
 			candidates = current_candidate;
 			last_candidate = current_candidate;
-			first_candidate = last_candidate;		/* ReqID:SRS-GKC-DATATYPE_001 */
+			first_candidate = last_candidate;
 			ncandidates = 1;
 		}
 		else if (nmatch == nbestMatch)
@@ -2117,32 +2240,20 @@ plisql_func_select_candidate(int nargs,
 		return candidates;
 
 	/*
-	 * Still too many candidates?  Try assigning types for the unknown inputs.
-	 *
-	 * If there are no unknown inputs, we have no more heuristics that apply,
-	 * and must fail.
+	 * If ambiguity persists, try to ascribe types to the unknown inputs. If
+	 * there are no unknowns, no further heuristics apply and we must fail.
 	 */
 	if (nunknowns == 0)
 		return NULL;
 
 	/*
-	 * The next step examines each unknown argument position to see if we can
-	 * determine a "type category" for it.  If any candidate has an input
-	 * datatype of STRING category, use STRING category (this bias towards
-	 * STRING is appropriate since unknown-type literals look like strings).
-	 * Otherwise, if all the candidates agree on the type category of this
-	 * argument position, use that category.  Otherwise, fail because we
-	 * cannot determine a category.
-	 *
-	 * If we are able to determine a type category, also notice whether any of
-	 * the candidates takes a preferred datatype within the category.
-	 *
-	 * Having completed this examination, remove candidates that accept the
-	 * wrong category at any unknown position.  Also, if at least one
-	 * candidate accepted a preferred type at a position, remove candidates
-	 * that accept non-preferred types.  If just one candidate remains, return
-	 * that one.  However, if this rule turns out to reject all candidates,
-	 * keep them all instead.
+	 * For each unknown position, determine a common type category. Prefer
+	 * STRING if any candidate uses STRING there (unknown literals look like
+	 * strings). Otherwise, if all candidates agree on a category, use it; if
+	 * not, category resolution fails at that position. Track whether any
+	 * candidate uses a preferred type for the chosen category; if so, later
+	 * prefer such candidates. After classification, drop candidates that do
+	 * not match the category or (when applicable) the preferred-type flag.
 	 */
 	resolved_unknowns = false;
 	for (i = 0; i < nargs; i++)
@@ -2151,7 +2262,7 @@ plisql_func_select_candidate(int nargs,
 
 		if (input_base_typeids[i] != UNKNOWNOID)
 			continue;
-		resolved_unknowns = true;		/* assume we can do it */
+		resolved_unknowns = true;	/* assume we can do it */
 		slot_category[i] = TYPCATEGORY_INVALID;
 		slot_has_preferred_type[i] = false;
 		have_conflict = false;
@@ -2166,36 +2277,34 @@ plisql_func_select_candidate(int nargs,
 										&current_is_preferred);
 			if (slot_category[i] == TYPCATEGORY_INVALID)
 			{
-				/* first candidate */
+				/* initialize from first candidate */
 				slot_category[i] = current_category;
 				slot_has_preferred_type[i] = current_is_preferred;
 			}
 			else if (current_category == slot_category[i])
 			{
-				/* more candidates in same category */
+				/* same category as current */
 				slot_has_preferred_type[i] |= current_is_preferred;
 			}
 			else
 			{
-				/* category conflict! */
+				/* category mismatch */
 				if (current_category == TYPCATEGORY_STRING)
 				{
-					/* STRING always wins if available */
+					/* prefer STRING category when present */
 					slot_category[i] = current_category;
 					slot_has_preferred_type[i] = current_is_preferred;
 				}
 				else
 				{
-					/*
-					 * Remember conflict, but keep going (might find STRING)
-					 */
+					/* record conflict; continue in case STRING appears */
 					have_conflict = true;
 				}
 			}
 		}
 		if (have_conflict && slot_category[i] != TYPCATEGORY_STRING)
 		{
-			/* Failed to resolve category conflict at this position */
+			/* unable to resolve a single category at this position */
 			resolved_unknowns = false;
 			break;
 		}
@@ -2203,7 +2312,7 @@ plisql_func_select_candidate(int nargs,
 
 	if (resolved_unknowns)
 	{
-		/* Strip non-matching candidates */
+		/* Filter out non-matching candidates */
 		ncandidates = 0;
 		first_candidate = candidates;
 		last_candidate = NULL;
@@ -2235,13 +2344,13 @@ plisql_func_select_candidate(int nargs,
 			}
 			if (keepit)
 			{
-				/* keep this candidate */
+				/* retain this candidate */
 				last_candidate = current_candidate;
 				ncandidates++;
 			}
 			else
 			{
-				/* forget this candidate */
+				/* discard this candidate */
 				if (last_candidate)
 					last_candidate->next = current_candidate->next;
 				else
@@ -2249,11 +2358,11 @@ plisql_func_select_candidate(int nargs,
 			}
 		}
 
-		/* if we found any matches, restrict our attention to those */
+		/* If any matches remain, restrict our attention to them */
 		if (last_candidate)
 		{
 			candidates = first_candidate;
-			/* terminate rebuilt list */
+			/* terminate rebuilt candidate list */
 			last_candidate->next = NULL;
 		}
 
@@ -2279,7 +2388,7 @@ plisql_func_select_candidate(int nargs,
 		{
 			if (input_base_typeids[i] == UNKNOWNOID)
 				continue;
-			if (known_type == UNKNOWNOID)		/* first known arg? */
+			if (known_type == UNKNOWNOID)	/* first known arg? */
 				known_type = input_base_typeids[i];
 			else if (known_type != input_base_typeids[i])
 			{
@@ -2291,7 +2400,7 @@ plisql_func_select_candidate(int nargs,
 
 		if (known_type != UNKNOWNOID)
 		{
-			/* okay, just one known type, apply the heuristic */
+			/* Exactly one known base type: apply the heuristic */
 			for (i = 0; i < nargs; i++)
 				input_base_typeids[i] = known_type;
 			ncandidates = 0;
@@ -2305,40 +2414,38 @@ plisql_func_select_candidate(int nargs,
 									COERCION_IMPLICIT))
 				{
 					if (++ncandidates > 1)
-						break;	/* not unique, give up */
+						break;	/* more than one; not unique */
 					last_candidate = current_candidate;
-					/* Begin - ReqID:SRS-GKC-DATATYPE_001 */
 					if (first_candidate == NULL)
 						first_candidate = last_candidate;
-					/* End - ReqID:SRS-GKC-DATATYPE_001 */
 				}
 			}
 			if (ncandidates == 1)
 			{
-				/* successfully identified a unique match */
+				/* Unique match identified */
 				last_candidate->next = NULL;
 				return last_candidate;
 			}
 		}
 	}
 
-	return NULL;				/* failed to select a best candidate */
-}	/* plisql_func_select_candidate() */
+	return NULL;				/* no unique best candidate */
+}
 
 /*
- * like expand_function_arguments
- * we expand subproc function arguments and reorder
- * its arguments
+ * Similar to expand_function_arguments: expand and reorder subproc function
+ * arguments (including defaults and named arguments).
  */
 static List *
-plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_function *subprocfunc,
-													int funcnarg, List *fargs,
-													List *defaultnumber, List **argdefaults)
+plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_function * subprocfunc,
+									   int funcnarg, List *fargs,
+									   List *defaultnumber, List **argdefaults)
 {
 	Node	   *argarray[FUNC_MAX_ARGS];
-	int i;
+	int			i;
 	ListCell   *lc;
-	int provnargs = list_length(fargs);
+	int			provnargs = list_length(fargs);
+
 	MemSet(argarray, 0, sizeof(argarray));
 
 	i = 0;
@@ -2348,7 +2455,7 @@ plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_functi
 
 		if (!IsA(arg, NamedArgExpr))
 		{
-			/* positional argument, assumed to precede all named args */
+			/* Positional argument; must precede all named arguments */
 			Assert(argarray[i] == NULL);
 			argarray[i++] = arg;
 		}
@@ -2365,8 +2472,8 @@ plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_functi
 	{
 		foreach(lc, defaultnumber)
 		{
-			int argno = lfirst_int(lc);
-			Node		*argdefault;
+			int			argno = lfirst_int(lc);
+			Node	   *argdefault;
 
 			Assert(argarray[argno] == NULL);
 
@@ -2376,7 +2483,7 @@ plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_functi
 				*argdefaults = lappend(*argdefaults, argdefault);
 		}
 	}
-	/* Now reconstruct the args list in proper order */
+	/* Rebuild the argument list in call order */
 	fargs = NIL;
 	for (i = 0; i < funcnarg; i++)
 	{
@@ -2388,15 +2495,14 @@ plisql_expand_and_reorder_functionargs(ParseState *pstate, PLiSQL_subproc_functi
 }
 
 /*
- * like internal_get_result_type
- * we build subprocfunc result type
+ * Derive the subproc function result type (cf. internal_get_result_type).
  */
 static TypeFuncClass
-internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
-									Node *call_expr,
-									ReturnSetInfo *rsinfo,
-									Oid *resultTypeId,
-									TupleDesc *resultTupleDesc)
+internal_get_subprocfunc_result_type(PLiSQL_subproc_function * subprocfunc,
+									 Node *call_expr,
+									 ReturnSetInfo *rsinfo,
+									 Oid *resultTypeId,
+									 TupleDesc *resultTupleDesc)
 {
 	TypeFuncClass result;
 	Oid			rettype = (subprocfunc->rettype != NULL ? subprocfunc->rettype->typoid : InvalidOid);
@@ -2406,10 +2512,10 @@ internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
 	tupdesc = build_subprocfunction_result_tupdesc_t(subprocfunc);
 	if (tupdesc)
 	{
-		oidvector *oidvec;
-		Oid			*argtypes;
-		ListCell	*lc;
-		int i = 0;
+		oidvector  *oidvec;
+		Oid		   *argtypes;
+		ListCell   *lc;
+		int			i = 0;
 
 		argtypes = (Oid *) palloc(subprocfunc->function->fn_nargs * sizeof(Oid));
 		foreach(lc, subprocfunc->arg)
@@ -2422,9 +2528,8 @@ internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
 		oidvec = buildoidvector(argtypes, i);
 
 		/*
-		 * It has OUT parameters, so it's basically like a regular composite
-		 * type, except we have to be able to resolve any polymorphic OUT
-		 * parameters.
+		 * With OUT parameters present, treat as a composite type, but resolve
+		 * any polymorphic OUT fields.
 		 */
 		if (resultTypeId)
 			*resultTypeId = rettype;
@@ -2453,9 +2558,7 @@ internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
 		return result;
 	}
 
-	/*
-	 * If scalar polymorphic result, try to resolve it.
-	 */
+	/* Resolve scalar polymorphic result type, if any. */
 	if (IsPolymorphicType(rettype))
 	{
 		Oid			newrettype = exprType(call_expr);
@@ -2472,7 +2575,7 @@ internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
 	if (resultTypeId)
 		*resultTypeId = rettype;
 	if (resultTupleDesc)
-		*resultTupleDesc = NULL;	/* default result */
+		*resultTupleDesc = NULL;	/* no composite descriptor */
 
 	/* Classify the result type */
 	result = get_type_func_class(rettype, &base_rettype);
@@ -2506,25 +2609,29 @@ internal_get_subprocfunc_result_type(PLiSQL_subproc_function *subprocfunc,
 
 
 /*
- * like build_function_result_tupdesc_t
- * we build subproc function result tupdesc
+ * Similar to build_function_result_tupdesc_t: build the result tupdesc
+ * for a subproc function.
  */
 static TupleDesc
-build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function *subprocfunc)
+build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function * subprocfunc)
 {
 	TupleDesc	desc;
-	Oid			*outargtypes;
-	char		**outargnames;
+	Oid		   *outargtypes;
+	char	  **outargnames;
 	int			numoutargs = subprocfunc->noutargs;
 	int			i;
 	int			j;
-	ListCell	*lc;
-	Oid			rettype = subprocfunc->function->fn_rettype;
+	ListCell   *lc;
+	Oid			rettype = (subprocfunc->rettype != NULL ? subprocfunc->rettype->typoid : VOIDOID);
 
-	/* function no out arguments */
-	if (numoutargs < 1 || (numoutargs == 1 && rettype == VOIDOID))
+	/* No OUT arguments */
+	if (numoutargs < 1)
 		return NULL;
 
+	/* include rettype */
+	if (rettype != VOIDOID)
+		numoutargs++;
+
 	outargtypes = (Oid *) palloc0(numoutargs * sizeof(Oid));
 	outargnames = (char **) palloc0(numoutargs * sizeof(char *));
 
@@ -2536,24 +2643,40 @@ build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function *subprocfunc)
 		if (argitem->argmode != ARGMODE_IN)
 		{
 			outargtypes[i] = argitem->type->typoid;
-			outargnames[i++] = argitem->argname;
+
+			/*
+			 * If the guc pararmeter out_parameter_column_position is set to be true,
+			 * make out parameter column name to be special,
+			 * so we can distinguish it from the return value.
+			 */
+			if (out_parameter_column_position)
+				outargnames[i] = psprintf("_column_%d", i + 1);
+			else
+				outargnames[i] = argitem->argname;
+			i++;
 		}
 	}
 
+	if (rettype != VOIDOID)
+	{
+		outargtypes[i] = rettype;
+		outargnames[i++] = pstrdup("_RETVAL_");
+	}
+
 	Assert(i == numoutargs);
 
 	desc = CreateTemplateTupleDesc(numoutargs);
 
 	i = 0;
-	/* result value after out parameters value */
-	/* init out-parameters */
+	/* Result value follows OUT parameters */
+	/* Initialize OUT parameters */
 	for (j = 0; j < numoutargs; j++)
 	{
 		TupleDescInitEntry(desc, ++i,
-						outargnames[j],
-						outargtypes[j],
-						-1,
-						0);
+						   outargnames[j],
+						   outargtypes[j],
+						   -1,
+						   0);
 	}
 
 	pfree(outargtypes);
@@ -2563,17 +2686,16 @@ build_subprocfunction_result_tupdesc_t(PLiSQL_subproc_function *subprocfunc)
 }
 
 /*
- * like get_func_arg_info
- * we get function argtypes from arguments
- * this is special for poly argument type
+ * Similar to get_func_arg_info: collect function arg types from the argument
+ * list. Special handling for polymorphic argument types.
  */
 int
 get_subprocfunc_arg_info_from_arguments(List *args, Oid **p_argtypes,
-								char ***p_argnames, char **p_argmodes)
+										char ***p_argnames, char **p_argmodes)
 {
-	int numargs;
-	ListCell *lc;
-	int	i = 0;
+	int			numargs;
+	ListCell   *lc;
+	int			i = 0;
 
 	numargs = list_length(args);
 
@@ -2584,7 +2706,7 @@ get_subprocfunc_arg_info_from_arguments(List *args, Oid **p_argtypes,
 	*p_argnames = (char **) palloc(sizeof(char *) * numargs);
 	*p_argmodes = (char *) palloc(numargs * sizeof(char));
 
-	foreach (lc, args)
+	foreach(lc, args)
 	{
 		PLiSQL_function_argitem *argitem;
 
@@ -2607,18 +2729,18 @@ get_subprocfunc_arg_info_from_arguments(List *args, Oid **p_argtypes,
 }
 
 /*
- * look up for a subproc function
+ * Lookup a subproc function in the hash table.
  */
 PLiSQL_function *
 plisql_subprocfunc_HashTableLookup(HTAB *hashp,
-							PLiSQL_func_hashkey *func_key)
+								   PLiSQL_func_hashkey * func_key)
 {
 	plisql_HashEnt *hentry;
 
 	hentry = (plisql_HashEnt *) hash_search(hashp,
-											 (void *) func_key,
-											 HASH_FIND,
-											 NULL);
+											(void *) func_key,
+											HASH_FIND,
+											NULL);
 	if (hentry)
 		return hentry->function;
 	else
@@ -2626,46 +2748,45 @@ plisql_subprocfunc_HashTableLookup(HTAB *hashp,
 }
 
 /*
- * insert a subproc function into a hash table
+ * Insert a subproc function into the hash table.
  */
 static void
-plisql_subprocfunc_HashTableInsert(HTAB *hashp, PLiSQL_function *function,
-						PLiSQL_func_hashkey *func_key)
+plisql_subprocfunc_HashTableInsert(HTAB *hashp, PLiSQL_function * function,
+								   PLiSQL_func_hashkey * func_key)
 {
 	plisql_HashEnt *hentry;
 	bool		found;
 
 	hentry = (plisql_HashEnt *) hash_search(hashp,
-											 (void *) func_key,
-											 HASH_ENTER,
-											 &found);
+											(void *) func_key,
+											HASH_ENTER,
+											&found);
 	if (found)
 		elog(WARNING, "trying to insert a subproc function that already exists");
 
 	hentry->function = function;
-	/* prepare back link from function to hashtable key */
+	/* Backlink from function to hash key */
 	function->fn_hashkey = &hentry->key;
 }
 
 /*
- * get subproc function
- * default expr
+ * Retrieve the default expression for a subproc function argument.
  */
 static Node *
-plisql_get_subprocfunc_argdefaults(ParseState *pstate, PLiSQL_subproc_function *subprocfunc, int argno)
+plisql_get_subprocfunc_argdefaults(ParseState *pstate, PLiSQL_subproc_function * subprocfunc, int argno)
 {
-	Node *default_node;
+	Node	   *default_node;
 	PLiSQL_function_argitem *argitem = list_nth(subprocfunc->arg, argno);
 
 	Assert(argitem != NULL && argitem->defexpr != NULL);
 
 	if (argitem->default_sql_expr == NULL)
 	{
-		RawStmt *rawnode;
-		List *rawlist;
+		RawStmt    *rawnode;
+		List	   *rawlist;
 		SelectStmt *selectnode;
-		ResTarget *res;
-		Node *sql_expr;
+		ResTarget  *res;
+		Node	   *sql_expr;
 		MemoryContext oldctx;
 
 		Assert(argitem->defexpr->query != NULL);
@@ -2683,12 +2804,12 @@ plisql_get_subprocfunc_argdefaults(ParseState *pstate, PLiSQL_subproc_function *
 		if (list_length(selectnode->targetList) != 1)
 			elog(ERROR, "more than one target for argitem default expr '%s'", argitem->defexpr->query);
 
-		res = (ResTarget*) linitial(selectnode->targetList);
+		res = (ResTarget *) linitial(selectnode->targetList);
 
 		sql_expr = transformExpr(pstate, res->val, EXPR_KIND_FUNCTION_DEFAULT);
 		Assert(sql_expr != NULL);
 
-		/* saved in function memory context */
+		/* Persist in the function's memory context */
 		oldctx = MemoryContextSwitchTo(subprocfunc->function->fn_cxt);
 		argitem->default_sql_expr = (Node *) copyObject(sql_expr);
 		MemoryContextSwitchTo(oldctx);
@@ -2700,25 +2821,23 @@ plisql_get_subprocfunc_argdefaults(ParseState *pstate, PLiSQL_subproc_function *
 }
 
 /*
- * before dynamic compile a subproc func
- * we should init something like namespace
- * and its global datums,subprocfunc
+ * Initialize namespace, global datums, and subproc state before compiling.
  */
 static void
-plisql_init_subprocfunc_compile(PLiSQL_subproc_function *subprocfunc)
+plisql_init_subprocfunc_compile(PLiSQL_subproc_function * subprocfunc)
 {
-	int i;
+	int			i;
 
 	plisql_set_ns(subprocfunc->global_cur);
 	plisql_start_datums();
 	plisql_start_subproc_func();
 
-	/* init datums use origin function */
+	/* Initialize datums using the template function */
 	for (i = 0; i < subprocfunc->lastoutvardno; i++)
 		plisql_adddatum(subprocfunc->function->datums[i]);
 	Assert(subprocfunc->lastoutvardno == plisql_nDatums);
 
-	/* init subprocfunc use origin function */
+	/* Initialize subproc list using the template function */
 	for (i = 0; i < subprocfunc->lastoutsubprocfno; i++)
 		plisql_add_subproc_function(subprocfunc->function->subprocfuncs[i]);
 	Assert(subprocfunc->lastoutsubprocfno == plisql_nsubprocFuncs);
@@ -2729,32 +2848,32 @@ plisql_init_subprocfunc_compile(PLiSQL_subproc_function *subprocfunc)
 
 
 /*
- * like do_compile but only
- * compile a subproc function
+ * Similar to do_compile, but compile only a subproc function.
  */
-PLiSQL_function*
+PLiSQL_function *
 plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
-										PLiSQL_subproc_function *subprocfunc,
-										bool forValidator)
+							   PLiSQL_subproc_function * subprocfunc,
+							   bool forValidator)
 {
 	ErrorContextCallback plerrcontext;
 	MemoryContext func_cxt;
 	PLiSQL_function *function;
-	int	parse_rc;
-	int found_varno = subprocfunc->function->found_varno;
-	Oid 		define_useid = InvalidOid;
-	Oid 		save_userid;
-	int 		save_sec_context;
+	int			parse_rc;
+	int			found_varno = subprocfunc->function->found_varno;
+	Oid			define_useid = InvalidOid;
+	Oid			save_userid;
+	int			save_sec_context;
 	Oid			current_user = GetUserId();
 	yyscan_t	scanner;
 	compile_error_callback_arg cbarg;
 	PLiSQL_stmt_block *plisql_parse_result;
+
 	scanner = plisql_scanner_init(subprocfunc->src);
 
 	plisql_error_funcname = pstrdup(subprocfunc->func_name);
 
 	/*
-	 * Setup error traceback support for ereport()
+	 * Install error-context callback for ereport() traceback.
 	 */
 	cbarg.proc_source = subprocfunc->src;
 	cbarg.yyscanner = scanner;
@@ -2763,17 +2882,17 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 	plerrcontext.previous = error_context_stack;
 	error_context_stack = &plerrcontext;
 
-	/* append package namespace */
+	/* If compiling within a package, adopt package owner and error callback */
 	if (subprocfunc->function->item != NULL)
 	{
 		HeapTuple	pkgTup;
 		Form_pg_package pkgStruct;
 
 		pkgTup = SearchSysCache1(PKGOID,
-				ObjectIdGetDatum(subprocfunc->function->item->pkey));
+								 ObjectIdGetDatum(subprocfunc->function->item->pkey));
 		if (!HeapTupleIsValid(pkgTup))
 			elog(ERROR, "cache lookup failed for package %u",
-			subprocfunc->function->item->pkey);
+				 subprocfunc->function->item->pkey);
 
 		pkgStruct = (Form_pg_package) GETSTRUCT(pkgTup);
 
@@ -2783,7 +2902,7 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 			GetUserIdAndSecContext(&save_userid, &save_sec_context);
 
 			SetUserIdAndSecContext(define_useid,
-						save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
+								   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
 		}
 		ReleaseSysCache(pkgTup);
 
@@ -2798,10 +2917,10 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 	plisql_check_syntax = false;
 
 	function = (PLiSQL_function *)
-			MemoryContextAllocZero(subprocfunc->function->fn_cxt, sizeof(PLiSQL_function));
+		MemoryContextAllocZero(subprocfunc->function->fn_cxt, sizeof(PLiSQL_function));
 	plisql_curr_compile = function;
 
-	/* user origin function fn_cxt */
+	/* Reuse original function's memory context */
 	func_cxt = subprocfunc->function->fn_cxt;
 
 	plisql_compile_tmp_cxt = MemoryContextSwitchTo(func_cxt);
@@ -2813,7 +2932,7 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 	function->resolve_option = plisql_variable_conflict;
 	function->print_strict_params = plisql_print_strict_params;
 	/* only promote extra warnings and errors at CREATE FUNCTION time */
-	function->extra_warnings =  0;
+	function->extra_warnings = 0;
 	function->extra_errors = 0;
 	function->fn_is_trigger = subprocfunc->function->fn_is_trigger;
 
@@ -2833,20 +2952,18 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 		plisql_compile_packageitem = NULL;
 	function->namelabel = pstrdup(subprocfunc->func_name);
 
-	/* init subprocfunc */
+	/* Initialize subproc compile state */
 	plisql_init_subprocfunc_compile(subprocfunc);
 	plisql_DumpExecTree = false;
 
-	/* replate origin function */
+	/* Replace template function with compiled instance */
 	subprocfunc->function = function;
 	plisql_ns_push(subprocfunc->func_name, PLISQL_LABEL_BLOCK);
 
 	plisql_build_variable_from_funcargs(subprocfunc, forValidator,
-								fcinfo, found_varno);
+										fcinfo, found_varno);
 
-	/*
-	 * Now parse the function's text
-	 */
+	/* Parse the function body */
 	parse_rc = plisql_yyparse(&plisql_parse_result, scanner);
 	if (parse_rc != 0)
 		elog(ERROR, "plisql parser returned %d", parse_rc);
@@ -2879,9 +2996,8 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
 
 
 /*
- * when variable define after subproc function definition
- * we shoule use parent stack function to
- * init global var for example:
+ * When a variable is defined after a subproc function definition, use the
+ * parent stack frame to initialize the global variable. For example:
  *
  * declare
  *   var1 integer;
@@ -2901,15 +3017,14 @@ plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
  *   var1 := test_f1(23);
  * end;
  *
- *  when test_f1 invoke test_f, the var3 is not global var to test_f1
- *  but is global var to test_f, so we init var3 from test_f1 parent which
- * is the anonymous block
+ *  When test_f1 invokes test_f, var3 is not a global variable for test_f1
+ *  but is global for test_f. Therefore, initialize var3 from test_f1's
+ *  parent (the anonymous block).
  */
 static void
-plsql_init_glovalvar_from_stack(PLiSQL_execstate *estate, int dno, int *start_level)
+plsql_init_glovalvar_from_stack(PLiSQL_execstate * estate, int dno, int *start_level)
 {
-	bool match = false;
-	int connected;
+	int			connected;
 	PLiSQL_execstate *parestate;
 	PLiSQL_function *func;
 
@@ -2917,31 +3032,30 @@ plsql_init_glovalvar_from_stack(PLiSQL_execstate *estate, int dno, int *start_le
 	{
 		func = (PLiSQL_function *) SPI_get_func(connected);
 
-		/* maybe come from plpgsql */
+		/* Might originate from plpgsql; skip if so */
 		if (func == NULL)
 			continue;
 		parestate = func->cur_estate;
 
-		/* dno not match */
+		/* DNO does not match */
 		if (dno >= parestate->ndatums)
 			continue;
 		plisql_assign_in_global_var(estate, parestate, dno);
-		match = true;
 		*start_level = connected;
-		break;
+
+		return;
 	}
-	Assert(match);
+	Assert(false);
 	return;
 }
 
 /*
- * like plsql_init_glovalvar_from_stack, but we assign it out
+ * Similar to plsql_init_glovalvar_from_stack, but assigns OUT values.
  */
 static void
-plsql_assign_out_glovalvar_from_stack(PLiSQL_execstate *estate, int dno, int *start_level)
+plsql_assign_out_glovalvar_from_stack(PLiSQL_execstate * estate, int dno, int *start_level)
 {
-	bool match = false;
-	int connected;
+	int			connected;
 	PLiSQL_execstate *parestate;
 	PLiSQL_function *func;
 
@@ -2949,41 +3063,41 @@ plsql_assign_out_glovalvar_from_stack(PLiSQL_execstate *estate, int dno, int *st
 	{
 		func = (PLiSQL_function *) SPI_get_func(connected);
 
-		/* maybe NULL ? */
+		/* Possibly NULL */
 		if (func == NULL)
 			continue;
 		parestate = func->cur_estate;
 
-		/* dno not match */
+		/* DNO does not match */
 		if (dno >= parestate->ndatums)
 			continue;
 		plisql_assign_out_global_var(estate, parestate, dno, connected);
 		*start_level = connected;
-		match = true;
-		break;
+
+		return;
 	}
-	Assert(match);
+	Assert(false);
 	return;
 }
 
 
 /*
- * decide wether the dno
- * is subprocfunc argnum
+ * Determine whether the given dno refers to a subproc function argument.
  */
 static bool
-is_subprocfunc_argnum(PLiSQL_function *pfunc, int dno)
+is_subprocfunc_argnum(PLiSQL_function * pfunc, int dno)
 {
-	int i;
+	int			i;
 
 	for (i = 0; i < pfunc->nsubprocfuncs; i++)
 	{
 		PLiSQL_subproc_function *subprocfunc = pfunc->subprocfuncs[i];
 
-		/* ignore no action function */
-		if (subprocfunc->function->action != NULL)
+		/* Skip subprocs without compiled actions */
+		if (subprocfunc->function->action != NULL &&
+			subprocfunc->function != pfunc)
 		{
-			int j;
+			int			j;
 
 			for (j = 0; j < subprocfunc->function->fn_nargs; j++)
 			{
@@ -2997,37 +3111,37 @@ is_subprocfunc_argnum(PLiSQL_function *pfunc, int dno)
 
 
 /*
- * like plisql_param_ref
- * we handle subprocfunc, but its arguments like func_get_detail
+ * Similar to plisql_param_ref: resolve a subproc function reference.
+ * Argument handling aligns with func_get_detail.
  */
 int
 plisql_subprocfunc_ref(ParseState *pstate, List *funcname,
-				List **fargs, /* return value */
-				List *fargnames,
-				int nargs,
-				Oid *argtypes,
-				bool expand_variadic,
-				bool expand_defaults,
-				bool proc_call,
-				Oid *funcid,	/* return value */
-				Oid *rettype,	/* return value */
-				bool *retset,	/* return value */
-				int *nvargs,	/* return value */
-				Oid *vatype,	/* return value */
-				Oid **true_typeids, /* return value */
-				List **argdefaults, /* return value */
-				void **pfunc) /* return value */
+					   List **fargs,	/* return value */
+					   List *fargnames,
+					   int nargs,
+					   Oid *argtypes,
+					   bool expand_variadic,
+					   bool expand_defaults,
+					   bool proc_call,
+					   Oid *funcid, /* return value */
+					   Oid *rettype,	/* return value */
+					   bool *retset,	/* return value */
+					   int *nvargs, /* return value */
+					   Oid *vatype, /* return value */
+					   Oid **true_typeids,	/* return value */
+					   List **argdefaults,	/* return value */
+					   void **pfunc)	/* return value */
 {
 	PLiSQL_expr *expr = (PLiSQL_expr *) pstate->p_ref_hook_state;
 	PLiSQL_nsitem *nse = NULL;
-	char *func_name = NULL;
-	char *name1 = NULL;
-	char *name2 = NULL;
-	char *name3 = NULL;
-	int list_len = list_length(funcname);
+	char	   *func_name = NULL;
+	char	   *name1 = NULL;
+	char	   *name2 = NULL;
+	char	   *name3 = NULL;
+	int			list_len = list_length(funcname);
 	FuncDetailCode detail;
 
-	switch(list_len)
+	switch (list_len)
 	{
 		case 1:
 			name1 = strVal(linitial(funcname));
@@ -3053,25 +3167,25 @@ plisql_subprocfunc_ref(ParseState *pstate, List *funcname,
 	}
 
 	nse = plisql_ns_lookup(expr->ns, false,
-							name1, name2, name3,
-							NULL);
+						   name1, name2, name3,
+						   NULL);
 
 	if (nse == NULL || (nse->itemtype != PLISQL_NSTYPE_SUBPROC_FUNC &&
-		nse->itemtype != PLISQL_NSTYPE_SUBPROC_PROC))
+						nse->itemtype != PLISQL_NSTYPE_SUBPROC_PROC))
 		return FUNCDETAIL_NOTFOUND;
 
-	detail = plisql_get_subprocfunc_detail(pstate,expr->func, nse, func_name, fargs, /* return value */
-											proc_call,
-											fargnames,
-											nargs,
-											argtypes,
-											funcid,	/* return value */
-											rettype,	/* return value */
-											retset,	/* return value */
-											nvargs,	/* return value */
-											vatype,	/* return value */
-											true_typeids, /* return value */
-											argdefaults); /* return value */
+	detail = plisql_get_subprocfunc_detail(pstate, expr->func, nse, func_name, fargs,	/* return value */
+										   proc_call,
+										   fargnames,
+										   nargs,
+										   argtypes,
+										   funcid,	/* return value */
+										   rettype, /* return value */
+										   retset,	/* return value */
+										   nvargs,	/* return value */
+										   vatype,	/* return value */
+										   true_typeids,	/* return value */
+										   argdefaults);	/* return value */
 	if (detail != FUNCDETAIL_NORMAL &&
 		detail != FUNCDETAIL_PROCEDURE)
 		elog(ERROR, "wrong number or types of arguments in call to \"%s\"", func_name);
@@ -3080,4 +3194,3 @@ plisql_subprocfunc_ref(ParseState *pstate, List *funcname,
 
 	return detail;
 }
-
diff --git a/src/pl/plisql/src/pl_subproc_function.h b/src/pl/plisql/src/pl_subproc_function.h
index c894118df41..df913da5882 100644
--- a/src/pl/plisql/src/pl_subproc_function.h
+++ b/src/pl/plisql/src/pl_subproc_function.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  * Copyright 2025 IvorySQL Global Development Team
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,14 +15,15 @@
  *
  * File:pl_subproc_function.h
  *
- * Abstract:
- *		Definitions for the PLISQL
- *			  procedural language nested sub function/procedure
+ * Overview:
+ *   Interfaces and data structures for nested sub-functions/sub-procedures
+ *   ("subprocs") in the PL/ISQL procedural language.
+ *   This header serves as the canonical module overview to avoid duplication
+ *   with the implementation file.
  *
  *
- * Authored by dwdai@highgo.com,20220627.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * IDENTIFICATION
  *	  src/pl/plisql/src/pl_subproc_function.h
@@ -34,27 +35,29 @@
 #define PL_SUBPROC_FUNCTION_H
 #include "funcapi.h"
 #include "parser/parse_func.h"
+
 /* the max nested level in inline function */
 #define FUNC_MAX_NEST_LEVEL 200
+
 enum
 {
-	ARGMODE_IN,		/* in parameter */
-	ARGMODE_OUT,	/* out parameter */
-	ARGMODE_INOUT	/* inout parameter */
+	ARGMODE_IN,					/* IN parameter */
+	ARGMODE_OUT,				/* OUT parameter */
+	ARGMODE_INOUT				/* INOUT parameter */
 };
 
 enum
 {
-	FUNC_PROPER_DETERMINISTIC,	/* DETERMINISTIC proper */
-	FUNC_PROPER_RESULT_CACHE,		/* RESULT_CACHE proper */
-	FUNC_PROPER_PARALLEL_ENABLE,	/* PARALLEL_ENABLE proper */
-	FUNC_PROPER_PIPELINED,			/* pipelined proper */
-	PROC_PROPER_ACCESSIBLE_BY,		/* accessible by clause proper */
-	PROC_PROPER_DEFAULT_COLLATION,	/* default collation proper */
-	PROC_PROPER_INVOKER_RIGHT		/* invoke right proper */
+	FUNC_PROPER_DETERMINISTIC,	/* DETERMINISTIC property */
+	FUNC_PROPER_RESULT_CACHE,	/* RESULT_CACHE property */
+	FUNC_PROPER_PARALLEL_ENABLE,	/* PARALLEL_ENABLE property */
+	FUNC_PROPER_PIPELINED,		/* PIPELINED property */
+	PROC_PROPER_ACCESSIBLE_BY,	/* ACCESSIBLE BY clause property */
+	PROC_PROPER_DEFAULT_COLLATION,	/* DEFAULT COLLATION property */
+	PROC_PROPER_INVOKER_RIGHT	/* INVOKER RIGHTS property */
 };
 
-
+/* Access property item kind */
 typedef enum AccessProperItemType
 {
 	access_proper_function,
@@ -63,30 +66,30 @@ typedef enum AccessProperItemType
 	access_proper_trigger,
 	access_proper_type,
 	access_proper_unknow
-} AccessProperItemType;
+}			AccessProperItemType;
 
 typedef struct AccessProperItem
 {
-	AccessProperItemType	proper_type;
-	char *schema_name;
-	char *unit_name;
-} AccessProperItem;
-
+	AccessProperItemType proper_type;
+	char	   *schema_name;
+	char	   *unit_name;
+}			AccessProperItem;
 
-/* inline function argitem struct */
+/* Inline function argument item */
 typedef struct PLiSQL_function_argitem
 {
-	char		*argname;
-	PLiSQL_type	*type;
+	char	   *argname;
+	PLiSQL_type *type;
 	int			argmode;
 	bool		nocopy;
-	PLiSQL_expr	*defexpr;
-	Node		*default_sql_expr;
-} PLiSQL_function_argitem;
+	PLiSQL_expr *defexpr;
+	Node	   *default_sql_expr;
+}			PLiSQL_function_argitem;
 
 /*
- * subproc function struct
- * subproc function saves test function like
+ * Subproc function structure
+ *
+ * Example of a function that declares nested subprocs:
  * ------------------------------------------------------------
  * declare
  *    var1 integer;
@@ -114,153 +117,148 @@ typedef struct PLiSQL_function_argitem
  * end;
  * ---------------------------------------------------------------
  * nargdefaults:
- *   	the number of the function arg which has default value.
+ *   	Number of function arguments that have default values.
  *
  * lastoutvardno:
- *		first, we consider the var2'dno as the lastoutvardno, but if
- *		global var is compisite type var and init its firistcol in
- *		subprocfunc, we should include this rec_filedvar because it
- *		also a member of the parent variable.
- *		so finial,we record lastoutvardno which include the inlinefunc
- *		datum, so in the above example, the lastoutvardno is var3'dno
+ *		Initially we consider var2's dno as the lastoutvardno. However, if
+ *a global variable is a composite type and its first field is initialized
+ *		inside the subproc, we also need to account for that field
+ *variable because it belongs to the parent variable. Therefore we record the
+ *		final lastoutvardno including inline-function datums. In the
+ *above example, lastoutvardno is var3's dno.
  *
- * lastassignvardno
- *		the init and assign out global var, we consider the var2'dno
- *		we record this ,so that we don't repeate assign rec_filedvar
- *		for its firsitcol in inlinefunc, we only init and assign in
- *		its parent'var
+ * lastassignvardno:
+ *		Tracks initialization/assignment of OUT global variables. We
+ *record var2's dno so we do not repeatedly assign the record field variable for
+ *its first column in the inline function. Initialization/assignment is
+ *performed only on the parent variable.
  *
  * lastoutsubprocfno:
- *		the last global subproc function'fno the test function maybe use
- *		in the above example, the lastoutinlinefno is the test1'fno
+ *		The last global subproc function fno that the current function can
+ *use. In the example above, lastoutsubprocfno is the fno of test1.
  *
  */
 
 typedef struct PLiSQL_subproc_function
 {
-	int		fno;					/* function dno */
-	char	*func_name;				/* function name */
-	List *arg;						/* function'args, list of PLiSQL_function_argitem */
-	List *properties;				/* function propers, list of PLSQL_subproc_proper */
+	int			fno;			/* function datum number (dno) */
+	char	   *func_name;		/* function name */
+	List	   *arg;			/* function args; list of
+								 * PLiSQL_function_argitem */
+	List	   *properties;		/* function properties; list of
+								 * PLiSQL_subproc_proper */
 	PLiSQL_type *rettype;
-	bool		is_proc;			/* wether it is procedure or function */
-	bool		has_poly_argument;	/* wether it has poly argument */
-	char		*src;				/* block src for polymorphic argtype function or procedure */
-	PLiSQL_function *function;		/* function save action and dautms */
-	bool		has_declare;		/* has declare */
+	bool		is_proc;		/* whether it is procedure or function */
+	bool		has_poly_argument;	/* whether it has polymorphic argument(s) */
+	char	   *src;			/* source text for polymorphic-arg
+								 * function/procedure block */
+	PLiSQL_function *function;	/* compiled function; actions and datums */
+	bool		has_declare;	/* has DECLARE section */
 	int			nargdefaults;
-	int			noutargs;			/* the number of out arguments */
+	int			noutargs;		/* number of OUT arguments */
 	int			lastoutvardno;
 	int			lastassignvardno;
-	int			lastoutsubprocfno;	/* the last out subproc fno, which function can use */
-	PLiSQL_nsitem *global_cur;		/* the namespace which the function to search global var */
-	HTAB		*poly_tab;			/* hash table for polymorphic argtype function or procedure */
-	int			location;			/* nice errors position */
-} PLiSQL_subproc_function;
-
+	int			lastoutsubprocfno;	/* last subproc fno usable by this
+									 * function */
+	PLiSQL_nsitem *global_cur;	/* namespace used to search global variables */
+	HTAB	   *poly_tab;		/* hash table for polymorphic arg types */
+	int			location;		/* best error position */
+}			PLiSQL_subproc_function;
 
 typedef struct PLiSQL_subprocfunc_proper
 {
-	int proper_type;
-	void *value;
-} PLiSQL_subprocfunc_proper;
+	int			proper_type;
+	void	   *value;
+}			PLiSQL_subprocfunc_proper;
 
 typedef struct proper_result_cache
 {
-	List *data_source;			/* list of names */
-} proper_result_cache;
-
+	List	   *data_source;	/* list of names */
+}			proper_result_cache;
 
-extern PLiSQL_subproc_function **plisql_subprocFuncs;
-extern int plisql_nsubprocFuncs;
-extern int subprocFuncs_alloc;
-extern int cur_compile_func_level;
-extern PLiSQL_function *plisql_saved_compile[];
-extern int plisql_saved_datums_last[];
+extern PLiSQL_subproc_function * *plisql_subprocFuncs;
+extern int	plisql_nsubprocFuncs;
+extern int	subprocFuncs_alloc;
+extern int	cur_compile_func_level;
+extern PLiSQL_function * plisql_saved_compile[];
+extern int	plisql_saved_datums_last[];
 extern char *plisql_saved_error_funcname[];
-extern int plisql_saved_nsubprocfuncs[];
-extern int plisql_saved_subprocfunc_alloc[];
-extern PLiSQL_subproc_function **plisql_saved_subprocfuncs[];
+extern int	plisql_saved_nsubprocfuncs[];
+extern int	plisql_saved_subprocfunc_alloc[];
+extern PLiSQL_subproc_function * *plisql_saved_subprocfuncs[];
 
-
-/* some userfull funcs */
+/* Useful functions */
 extern void plisql_start_subproc_func(void);
-extern void plisql_finish_subproc_func(PLiSQL_function *function);
+extern void plisql_finish_subproc_func(PLiSQL_function * function);
 extern void plisql_push_subproc_func(void);
 extern void plisql_pop_subproc_func(void);
 
 extern void plisql_build_variable_from_funcargs(PLiSQL_subproc_function *subprocfunc,
-														bool forValidator, FunctionCallInfo fcinfo,
-														int found_varno);
+							bool forValidator, FunctionCallInfo fcinfo,
+							int found_varno);
 extern void plisql_set_subprocfunc_action(PLiSQL_subproc_function *inlinefunc,
-													PLiSQL_stmt_block *action);
+							PLiSQL_stmt_block *action);
 extern void plisql_check_subprocfunc_properties(PLiSQL_subproc_function *subprocfunc,
-													List *properties, bool isdeclare);
+							List *properties, bool isdeclare);
 extern PLiSQL_subproc_function *plisql_build_subproc_function(char *funcname, List *args,
-													PLiSQL_type *rettype, int location); 
+							PLiSQL_type *rettype, int location); 
 extern void plisql_add_subproc_function(PLiSQL_subproc_function *inlinefunc);
 extern void plisql_register_internal_func(void);
 extern void plisql_unregister_internal_func(void);
 extern TupleDesc plisql_get_func_result_tupdesc(FuncExpr *fexpr);
 extern int get_subprocfunc_arg_info(FuncExpr *funcexpr, Oid **p_argtypes,
-									char ***p_argnames, char **p_argmodes);
+							char ***p_argnames, char **p_argmodes);
 extern char *plisql_get_func_name(FuncExpr *fexpr);
-extern TypeFuncClass plisql_get_subprocfunc_result_type(FuncExpr *fexpr,
-						 ReturnSetInfo *rsinfo,
-						 Oid *resultTypeId,
-						 TupleDesc *resultTupleDesc);
+extern TypeFuncClass
+			plisql_get_subprocfunc_result_type(FuncExpr *fexpr, ReturnSetInfo *rsinfo,
+											   Oid *resultTypeId,
+											   TupleDesc *resultTupleDesc);
 extern List *plisql_get_subprocfunc_outargs(FuncExpr *fexpr);
 extern char *plisql_get_subprocfunc_result_name(FuncExpr *fexpr);
 
 extern char plisql_function_from(FunctionCallInfo fcinfo);
 
-extern PLiSQL_function *plisql_get_subproc_func(FunctionCallInfo fcinfo, bool forValidator);
-
-extern void plisql_init_subprocfunc_globalvar(PLiSQL_execstate *estate,
-														FunctionCallInfo fcinfo);
-
+extern PLiSQL_function * plisql_get_subproc_func(FunctionCallInfo fcinfo,
+												 bool forValidator);
 
-extern void plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate *estate,
-																FunctionCallInfo fcinfo);
-extern int plisql_subprocfunc_ref(ParseState *pstate, List *funcname,
-				List **fargs,	/* return value */
-				List *fargnames,
-				int nargs,
-				Oid *argtypes,
-				bool expand_variadic,
-				bool expand_defaults,
-				bool include_out_arguments,
-				Oid *funcid,	/* return value */
-				Oid *rettype,	/* return value */
-				bool *retset,	/* return value */
-				int *nvargs,	/* return value */
-				Oid *vatype,	/* return value */
-				Oid **true_typeids, /* return value */
-				List **argdefaults,	/* return value */
-				void **pfunc);	/* return value */
+extern void plisql_init_subprocfunc_globalvar(PLiSQL_execstate * estate,
+											  FunctionCallInfo fcinfo);
 
-extern FuncDetailCode plisql_get_subprocfunc_detail(ParseState *pstate,
-											PLiSQL_function *pfunc,
-											PLiSQL_nsitem *nse,
-											char *funcname, List **fargs,
-											bool proc_call,
-											List *fargnames,
-											int nargs,
-											Oid *argtypes,
-											Oid *funcid,	/* return value */
-											Oid *rettype,	/* return value */
-											bool *retset,	/* return value */
-											int *nvargs,	/* return value */
-											Oid *vatype,	/* return value */
-											Oid **true_typeids, /* return value */
-											List **argdefaults);
-extern int get_subprocfunc_arg_info_from_arguments(List *args, Oid **p_argtypes,
-								char ***p_argnames, char **p_argmodes);
-extern PLiSQL_function *plisql_subprocfunc_HashTableLookup(HTAB *hashp,
-							PLiSQL_func_hashkey *func_key);
-extern PLiSQL_function* plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
-													PLiSQL_subproc_function *subprocfunc,
-													bool forValidator);
+extern void plisql_assign_out_subprocfunc_globalvar(PLiSQL_execstate * estate,
+													FunctionCallInfo fcinfo);
+extern int	plisql_subprocfunc_ref(ParseState *pstate, List *funcname,
+								   List **fargs,	/* return value */
+								   List *fargnames, int nargs, Oid *argtypes,
+								   bool expand_variadic, bool expand_defaults,
+								   bool include_out_arguments,
+								   Oid *funcid, /* return value */
+								   Oid *rettype,	/* return value */
+								   bool *retset,	/* return value */
+								   int *nvargs, /* return value */
+								   Oid *vatype, /* return value */
+								   Oid **true_typeids,	/* return value */
+								   List **argdefaults,	/* return value */
+								   void **pfunc);	/* return value */
 
-#endif   /* PL_SUBPROC_FUNCTION_H */
+extern FuncDetailCode
+			plisql_get_subprocfunc_detail(ParseState *pstate, PLiSQL_function * pfunc,
+										  PLiSQL_nsitem * nse, char *funcname, List **fargs,
+										  bool proc_call, List *fargnames, int nargs,
+										  Oid *argtypes, Oid *funcid,	/* return value */
+										  Oid *rettype, /* return value */
+										  bool *retset, /* return value */
+										  int *nvargs,	/* return value */
+										  Oid *vatype,	/* return value */
+										  Oid **true_typeids,	/* return value */
+										  List **argdefaults);
+extern int	get_subprocfunc_arg_info_from_arguments(List *args, Oid **p_argtypes,
+													char ***p_argnames,
+													char **p_argmodes);
+extern PLiSQL_function *
+plisql_subprocfunc_HashTableLookup(HTAB *hashp, PLiSQL_func_hashkey * func_key);
+extern PLiSQL_function *
+plisql_dynamic_compile_subproc(FunctionCallInfo fcinfo,
+							   PLiSQL_subproc_function * subprocfunc,
+							   bool forValidator);
 
+#endif							/* PL_SUBPROC_FUNCTION_H */
diff --git a/src/pl/plisql/src/pl_unreserved_kwlist.h b/src/pl/plisql/src/pl_unreserved_kwlist.h
index 902822b4ab3..ecd0e3709ad 100755
--- a/src/pl/plisql/src/pl_unreserved_kwlist.h
+++ b/src/pl/plisql/src/pl_unreserved_kwlist.h
@@ -7,13 +7,13 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plisql/src/pl_unreserved_kwlist.h
  *
- * add the file for requirement "SQL PARSER"
+ * add the file for "SQL PARSER"
  *
  *-------------------------------------------------------------------------
  */
@@ -21,15 +21,14 @@
 /* There is deliberately not an #ifndef PL_UNRESERVED_KWLIST_H here. */
 
 /*
- * List of (keyword-name, keyword-token-value) pairs.
+ * Catalog of (keyword name, token code) pairs.
  *
- * Be careful not to put the same word into pl_reserved_kwlist.h.  Also be
- * sure that pl_gram.y's unreserved_keyword production agrees with this list.
+ * Do not duplicate any term that exists in pl_reserved_kwlist.h. Also
+ * keep pl_gram.y's unreserved_keyword production consistent with this list.
  *
- * Note: gen_keywordlist.pl requires the entries to appear in ASCII order.
+ * Reminder: gen_keywordlist.pl expects entries sorted in ASCII order.
  */
 
-/* name, value */
 PG_KEYWORD("absolute", K_ABSOLUTE)
 PG_KEYWORD("accessible", K_ACCESSIBLE)
 PG_KEYWORD("alias", K_ALIAS)
diff --git a/src/pl/plisql/src/plisql--1.0.sql b/src/pl/plisql/src/plisql--1.0.sql
index 1a1c005d93e..b6455b61e5c 100755
--- a/src/pl/plisql/src/plisql--1.0.sql
+++ b/src/pl/plisql/src/plisql--1.0.sql
@@ -15,7 +15,7 @@
  */
 
 /* src/pl/plisql/src/plisql--1.0.sql */
-/* Portions Copyright (c) 2023-2025, IvorySQL Global Development Team */
+/* Portions Copyright (c) 2023-2026, IvorySQL Global Development Team */
 
 -- The language object, but not the functions, can be owned by a non-superuser.
 ALTER LANGUAGE plisql OWNER TO @extowner@;
diff --git a/src/pl/plisql/src/plisql.control b/src/pl/plisql/src/plisql.control
index c3953eb3d5f..348bbc44486 100755
--- a/src/pl/plisql/src/plisql.control
+++ b/src/pl/plisql/src/plisql.control
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # plisql extension
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 comment = 'PL/iSQL procedural language'
 default_version = '1.0'
 module_pathname = '$libdir/plisql'
diff --git a/src/pl/plisql/src/plisql.h b/src/pl/plisql/src/plisql.h
index 6d1195a8783..a24c0e51e41 100755
--- a/src/pl/plisql/src/plisql.h
+++ b/src/pl/plisql/src/plisql.h
@@ -3,7 +3,7 @@
  * plisql.h		- Definitions for the PL/iSQL
  *			  procedural language
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
@@ -23,9 +23,8 @@
 #include "commands/trigger.h"
 #include "executor/spi.h"
 #include "utils/expandedrecord.h"
-#include "utils/typcache.h"
 #include "utils/packagecache.h"
-
+#include "utils/typcache.h"
 
 /**********************************************************************
  * Definitions
@@ -46,19 +45,19 @@ typedef enum PLiSQL_nsitem_type
 	PLISQL_NSTYPE_LABEL,		/* block label */
 	PLISQL_NSTYPE_VAR,			/* scalar variable */
 	PLISQL_NSTYPE_REC,			/* composite variable */
-	PLISQL_NSTYPE_SUBPROC_FUNC,	/* subproc function */
+	PLISQL_NSTYPE_SUBPROC_FUNC, /* subproc function */
 	PLISQL_NSTYPE_SUBPROC_PROC	/* subproc proc */
-} PLiSQL_nsitem_type;
+}			PLiSQL_nsitem_type;
 
 /*
  * A PLISQL_NSTYPE_LABEL stack entry must be one of these types
  */
 typedef enum PLiSQL_label_type
 {
-	PLISQL_LABEL_BLOCK,		/* DECLARE/BEGIN block */
+	PLISQL_LABEL_BLOCK,			/* DECLARE/BEGIN block */
 	PLISQL_LABEL_LOOP,			/* looping construct */
 	PLISQL_LABEL_OTHER			/* anything else */
-} PLiSQL_label_type;
+}			PLiSQL_label_type;
 
 /*
  * Datum array node types
@@ -71,7 +70,7 @@ typedef enum PLiSQL_datum_type
 	PLISQL_DTYPE_RECFIELD,
 	PLISQL_DTYPE_PROMISE,
 	PLISQL_DTYPE_PACKAGE_DATUM,
-} PLiSQL_datum_type;
+}			PLiSQL_datum_type;
 
 /*
  * DTYPE_PROMISE datums have these possible ways of computing the promise
@@ -90,7 +89,7 @@ typedef enum PLiSQL_promise_type
 	PLISQL_PROMISE_TG_ARGV,
 	PLISQL_PROMISE_TG_EVENT,
 	PLISQL_PROMISE_TG_TAG
-} PLiSQL_promise_type;
+}			PLiSQL_promise_type;
 
 /*
  * Variants distinguished in PLiSQL_type structs
@@ -99,8 +98,8 @@ typedef enum PLiSQL_type_type
 {
 	PLISQL_TTYPE_SCALAR,		/* scalar types and domains */
 	PLISQL_TTYPE_REC,			/* composite types, including RECORD */
-	PLISQL_TTYPE_PSEUDO		/* pseudotypes */
-} PLiSQL_type_type;
+	PLISQL_TTYPE_PSEUDO			/* pseudotypes */
+}			PLiSQL_type_type;
 
 /*
  * Execution tree node types
@@ -134,17 +133,14 @@ typedef enum PLiSQL_stmt_type
 	PLISQL_STMT_CALL,
 	PLISQL_STMT_COMMIT,
 	PLISQL_STMT_ROLLBACK
-} PLiSQL_stmt_type;
+}			PLiSQL_stmt_type;
 
 /*
  * Execution node return codes
  */
 enum
 {
-	PLISQL_RC_OK,
-	PLISQL_RC_EXIT,
-	PLISQL_RC_RETURN,
-	PLISQL_RC_CONTINUE
+	PLISQL_RC_OK, PLISQL_RC_EXIT, PLISQL_RC_RETURN, PLISQL_RC_CONTINUE
 };
 
 /*
@@ -165,7 +161,7 @@ typedef enum PLiSQL_getdiag_kind
 	PLISQL_GETDIAG_MESSAGE_TEXT,
 	PLISQL_GETDIAG_TABLE_NAME,
 	PLISQL_GETDIAG_SCHEMA_NAME
-} PLiSQL_getdiag_kind;
+}			PLiSQL_getdiag_kind;
 
 /*
  * RAISE statement options
@@ -181,7 +177,7 @@ typedef enum PLiSQL_raise_option_type
 	PLISQL_RAISEOPTION_DATATYPE,
 	PLISQL_RAISEOPTION_TABLE,
 	PLISQL_RAISEOPTION_SCHEMA
-} PLiSQL_raise_option_type;
+}			PLiSQL_raise_option_type;
 
 /*
  * Behavioral modes for plpgsql variable resolution
@@ -191,7 +187,7 @@ typedef enum PLiSQL_resolve_option
 	PLISQL_RESOLVE_ERROR,		/* throw error if ambiguous */
 	PLISQL_RESOLVE_VARIABLE,	/* prefer plpgsql var to table column */
 	PLISQL_RESOLVE_COLUMN		/* prefer table column to plpgsql var */
-} PLiSQL_resolve_option;
+}			PLiSQL_resolve_option;
 
 typedef enum PLiSQL_rwopt
 {
@@ -199,7 +195,7 @@ typedef enum PLiSQL_rwopt
 	PLISQL_RWOPT_NOPE,			/* cannot do any optimization */
 	PLISQL_RWOPT_TRANSFER,		/* transfer the old value into expr state */
 	PLISQL_RWOPT_INPLACE,		/* pass value as R/W to top-level function */
-} PLiSQL_rwopt;
+}			PLiSQL_rwopt;
 
 /**********************************************************************
  * Node and structure definitions
@@ -212,21 +208,22 @@ typedef struct PLiSQL_type
 {
 	char	   *typname;		/* (simple) name of the type */
 	Oid			typoid;			/* OID of the data type */
-	PLiSQL_type_type ttype;	/* PLISQL_TTYPE_ code */
+	PLiSQL_type_type ttype;		/* PLISQL_TTYPE_ code */
 	int16		typlen;			/* stuff copied from its pg_type entry */
 	bool		typbyval;
 	char		typtype;
 	Oid			collation;		/* from pg_type, but can be overridden */
 	bool		typisarray;		/* is "true" array, or domain over one */
 	int32		atttypmod;		/* typmod (taken from someplace else) */
-	bool		notnull;		/* the type is built by variable%type,
-						 * isnull or notnull of the variable */
-	TypeName   *pctrowtypname;	/* type name only for the types that uses %TYPE or %ROWTYPE */
+	bool		notnull;		/* the type is built by variable%type, isnull
+								 * or notnull of the variable */
+	TypeName   *pctrowtypname;	/* type name only for the types that uses
+								 * %TYPE or %ROWTYPE */
 	/* Remaining fields are used only for named composite types (not RECORD) */
 	TypeName   *origtypname;	/* type name as written by user */
 	TypeCacheEntry *tcache;		/* typcache entry for composite type */
 	uint64		tupdesc_id;		/* last-seen tupdesc identifier */
-} PLiSQL_type;
+}			PLiSQL_type;
 
 /*
  * SQL Query to plan and execute
@@ -235,8 +232,8 @@ typedef struct PLiSQL_expr
 {
 	char	   *query;			/* query string, verbatim from function body */
 	RawParseMode parseMode;		/* raw_parser() mode to use */
-	struct PLiSQL_function *func;  /* function containing this expr */
-	struct PLiSQL_nsitem *ns;      /* namespace chain visible to this expr */
+	struct PLiSQL_function *func;	/* function containing this expr */
+	struct PLiSQL_nsitem *ns;	/* namespace chain visible to this expr */
 
 	/*
 	 * These fields are used to help optimize assignments to expanded-datum
@@ -246,7 +243,7 @@ typedef struct PLiSQL_expr
 	 * closest exception block containing the assignment
 	 */
 	int			target_param;	/* dno of assign target, or -1 if none */
-	bool        target_is_local;        /* is it within nearest exception block? */
+	bool		target_is_local;	/* is it within nearest exception block? */
 
 	/*
 	 * Fields above are set during plpgsql parsing.  Remaining fields are left
@@ -291,7 +288,7 @@ typedef struct PLiSQL_expr
 	ExprState  *expr_simple_state;	/* eval tree for expr_simple_expr */
 	bool		expr_simple_in_use; /* true if eval tree is active */
 	LocalTransactionId expr_simple_lxid;
-} PLiSQL_expr;
+}			PLiSQL_expr;
 
 /*
  * Generic datum array item
@@ -304,7 +301,7 @@ typedef struct PLiSQL_datum
 	PLiSQL_datum_type dtype;
 	int			dno;
 	Oid			pkgoid;
-} PLiSQL_datum;
+}			PLiSQL_datum;
 
 /*
  * Scalar or composite variable
@@ -322,7 +319,7 @@ typedef struct PLiSQL_variable
 	bool		isconst;
 	bool		notnull;
 	PLiSQL_expr *default_val;
-} PLiSQL_variable;
+}			PLiSQL_variable;
 
 /*
  * Scalar variable
@@ -359,7 +356,7 @@ typedef struct PLiSQL_var
 	int			cursor_options;
 
 	char		info; /* record the argument mode which may be IN, OUT or IN OUT.
-			       * If variable is built in plsql block local, it is empty */
+			       * If variable is built in plisql block locally, it is empty */
 
 	/* Fields below here can change at runtime */
 
@@ -373,7 +370,7 @@ typedef struct PLiSQL_var
 	 * been fulfilled, this is PLISQL_PROMISE_NONE.
 	 */
 	PLiSQL_promise_type promise;
-} PLiSQL_var;
+}			PLiSQL_var;
 
 /*
  * Row variable - this represents one or more variables that are listed in an
@@ -415,7 +412,7 @@ typedef struct PLiSQL_row
 	int			nfields;
 	char	  **fieldnames;
 	int		   *varnos;
-} PLiSQL_row;
+}			PLiSQL_row;
 
 /*
  * Record variable (any composite type, including RECORD)
@@ -444,13 +441,13 @@ typedef struct PLiSQL_rec
 	int			firstfield;		/* dno of first RECFIELD, or -1 if none */
 
 	char		info;  /* record the argument mode which may be IN, OUT or IN OUT.
-				* If variable is built in plsql block local, it is empty */
+				* If variable is built in plisql block locally, it is empty */
 
 	/* Fields below here can change at runtime */
 
 	/* We always store record variables as "expanded" records */
 	ExpandedRecordHeader *erh;
-} PLiSQL_rec;
+}			PLiSQL_rec;
 
 /*
  * Field in record
@@ -469,7 +466,7 @@ typedef struct PLiSQL_recfield
 	uint64		rectupledescid; /* record's tupledesc ID as of last lookup */
 	ExpandedRecordFieldInfo finfo;	/* field's attnum and type info */
 	/* if rectupledescid == INVALID_TUPLEDESC_IDENTIFIER, finfo isn't valid */
-} PLiSQL_recfield;
+}			PLiSQL_recfield;
 
 /*
  * Item in the compilers namespace tree
@@ -484,9 +481,9 @@ typedef struct PLiSQL_nsitem
 	 */
 	int			itemno;
 	struct PLiSQL_nsitem *prev;
-	List		*subprocfunc;
+	List	   *subprocfunc;
 	char		name[FLEXIBLE_ARRAY_MEMBER];	/* nul-terminated string */
-} PLiSQL_nsitem;
+}			PLiSQL_nsitem;
 
 /*
  * Generic execution node
@@ -502,7 +499,7 @@ typedef struct PLiSQL_stmt
 	 * per-statement metrics.
 	 */
 	unsigned int stmtid;
-} PLiSQL_stmt;
+}			PLiSQL_stmt;
 
 /*
  * One EXCEPTION condition name
@@ -512,7 +509,7 @@ typedef struct PLiSQL_condition
 	int			sqlerrstate;	/* SQLSTATE code, or PLISQL_OTHERS */
 	char	   *condname;		/* condition name (for debugging) */
 	struct PLiSQL_condition *next;
-} PLiSQL_condition;
+}			PLiSQL_condition;
 
 /* This value mustn't match any possible output of MAKE_SQLSTATE() */
 #define PLISQL_OTHERS (-1)
@@ -525,7 +522,7 @@ typedef struct PLiSQL_exception_block
 	int			sqlstate_varno;
 	int			sqlerrm_varno;
 	List	   *exc_list;		/* List of WHEN clauses */
-} PLiSQL_exception_block;
+}			PLiSQL_exception_block;
 
 /*
  * One EXCEPTION ... WHEN clause
@@ -535,7 +532,7 @@ typedef struct PLiSQL_exception
 	int			lineno;
 	PLiSQL_condition *conditions;
 	List	   *action;			/* List of statements */
-} PLiSQL_exception;
+}			PLiSQL_exception;
 
 /*
  * Block of statements
@@ -550,9 +547,9 @@ typedef struct PLiSQL_stmt_block
 	int			n_initvars;		/* Length of initvarnos[] */
 	int		   *initvarnos;		/* dnos of variables declared in this block */
 	PLiSQL_exception_block *exceptions;
-	int       ora_param_stack_top_level;
-	int       ora_param_stack_cur_level;
-} PLiSQL_stmt_block;
+	int			ora_param_stack_top_level;
+	int			ora_param_stack_cur_level;
+}			PLiSQL_stmt_block;
 
 /*
  * Assign statement
@@ -564,7 +561,7 @@ typedef struct PLiSQL_stmt_assign
 	unsigned int stmtid;
 	int			varno;
 	PLiSQL_expr *expr;
-} PLiSQL_stmt_assign;
+}			PLiSQL_stmt_assign;
 
 /*
  * PERFORM statement
@@ -575,7 +572,7 @@ typedef struct PLiSQL_stmt_perform
 	int			lineno;
 	unsigned int stmtid;
 	PLiSQL_expr *expr;
-} PLiSQL_stmt_perform;
+}			PLiSQL_stmt_perform;
 
 /*
  * CALL statement
@@ -588,7 +585,7 @@ typedef struct PLiSQL_stmt_call
 	PLiSQL_expr *expr;
 	bool		is_call;
 	PLiSQL_variable *target;
-} PLiSQL_stmt_call;
+}			PLiSQL_stmt_call;
 
 /*
  * COMMIT statement
@@ -599,7 +596,7 @@ typedef struct PLiSQL_stmt_commit
 	int			lineno;
 	unsigned int stmtid;
 	bool		chain;
-} PLiSQL_stmt_commit;
+}			PLiSQL_stmt_commit;
 
 /*
  * ROLLBACK statement
@@ -610,7 +607,7 @@ typedef struct PLiSQL_stmt_rollback
 	int			lineno;
 	unsigned int stmtid;
 	bool		chain;
-} PLiSQL_stmt_rollback;
+}			PLiSQL_stmt_rollback;
 
 /*
  * GET DIAGNOSTICS item
@@ -619,7 +616,7 @@ typedef struct PLiSQL_diag_item
 {
 	PLiSQL_getdiag_kind kind;	/* id for diagnostic value desired */
 	int			target;			/* where to assign it */
-} PLiSQL_diag_item;
+}			PLiSQL_diag_item;
 
 /*
  * GET DIAGNOSTICS statement
@@ -631,7 +628,7 @@ typedef struct PLiSQL_stmt_getdiag
 	unsigned int stmtid;
 	bool		is_stacked;		/* STACKED or CURRENT diagnostics area? */
 	List	   *diag_items;		/* List of PLiSQL_diag_item */
-} PLiSQL_stmt_getdiag;
+}			PLiSQL_stmt_getdiag;
 
 /*
  * IF statement
@@ -645,7 +642,7 @@ typedef struct PLiSQL_stmt_if
 	List	   *then_body;		/* List of statements */
 	List	   *elsif_list;		/* List of PLiSQL_if_elsif structs */
 	List	   *else_body;		/* List of statements */
-} PLiSQL_stmt_if;
+}			PLiSQL_stmt_if;
 
 /*
  * one ELSIF arm of IF statement
@@ -655,7 +652,7 @@ typedef struct PLiSQL_if_elsif
 	int			lineno;
 	PLiSQL_expr *cond;			/* boolean expression for this case */
 	List	   *stmts;			/* List of statements */
-} PLiSQL_if_elsif;
+}			PLiSQL_if_elsif;
 
 /*
  * CASE statement
@@ -670,7 +667,7 @@ typedef struct PLiSQL_stmt_case
 	List	   *case_when_list; /* List of PLiSQL_case_when structs */
 	bool		have_else;		/* flag needed because list could be empty */
 	List	   *else_stmts;		/* List of statements */
-} PLiSQL_stmt_case;
+}			PLiSQL_stmt_case;
 
 /*
  * one arm of CASE statement
@@ -680,7 +677,7 @@ typedef struct PLiSQL_case_when
 	int			lineno;
 	PLiSQL_expr *expr;			/* boolean expression for this case */
 	List	   *stmts;			/* List of statements */
-} PLiSQL_case_when;
+}			PLiSQL_case_when;
 
 /*
  * Unconditional LOOP statement
@@ -692,7 +689,7 @@ typedef struct PLiSQL_stmt_loop
 	unsigned int stmtid;
 	char	   *label;
 	List	   *body;			/* List of statements */
-} PLiSQL_stmt_loop;
+}			PLiSQL_stmt_loop;
 
 /*
  * WHILE cond LOOP statement
@@ -705,7 +702,7 @@ typedef struct PLiSQL_stmt_while
 	char	   *label;
 	PLiSQL_expr *cond;
 	List	   *body;			/* List of statements */
-} PLiSQL_stmt_while;
+}			PLiSQL_stmt_while;
 
 /*
  * FOR statement with integer loopvar
@@ -722,7 +719,7 @@ typedef struct PLiSQL_stmt_fori
 	PLiSQL_expr *step;			/* NULL means default (ie, BY 1) */
 	int			reverse;
 	List	   *body;			/* List of statements */
-} PLiSQL_stmt_fori;
+}			PLiSQL_stmt_fori;
 
 /*
  * PLiSQL_stmt_forq represents a FOR statement running over a SQL query.
@@ -737,7 +734,7 @@ typedef struct PLiSQL_stmt_forq
 	char	   *label;
 	PLiSQL_variable *var;		/* Loop variable (record or row) */
 	List	   *body;			/* List of statements */
-} PLiSQL_stmt_forq;
+}			PLiSQL_stmt_forq;
 
 /*
  * FOR statement running over SELECT
@@ -752,7 +749,7 @@ typedef struct PLiSQL_stmt_fors
 	List	   *body;			/* List of statements */
 	/* end of fields that must match PLiSQL_stmt_forq */
 	PLiSQL_expr *query;
-} PLiSQL_stmt_fors;
+}			PLiSQL_stmt_fors;
 
 /*
  * FOR statement running over cursor
@@ -768,7 +765,7 @@ typedef struct PLiSQL_stmt_forc
 	/* end of fields that must match PLiSQL_stmt_forq */
 	int			curvar;
 	PLiSQL_expr *argquery;		/* cursor arguments if any */
-} PLiSQL_stmt_forc;
+}			PLiSQL_stmt_forc;
 
 /*
  * FOR statement running over EXECUTE
@@ -784,7 +781,7 @@ typedef struct PLiSQL_stmt_dynfors
 	/* end of fields that must match PLiSQL_stmt_forq */
 	PLiSQL_expr *query;
 	List	   *params;			/* USING expressions */
-} PLiSQL_stmt_dynfors;
+}			PLiSQL_stmt_dynfors;
 
 /*
  * FOREACH item in array loop
@@ -799,7 +796,7 @@ typedef struct PLiSQL_stmt_foreach_a
 	int			slice;			/* slice dimension, or 0 */
 	PLiSQL_expr *expr;			/* array expression */
 	List	   *body;			/* List of statements */
-} PLiSQL_stmt_foreach_a;
+}			PLiSQL_stmt_foreach_a;
 
 /*
  * OPEN a curvar
@@ -815,7 +812,7 @@ typedef struct PLiSQL_stmt_open
 	PLiSQL_expr *query;
 	PLiSQL_expr *dynquery;
 	List	   *params;			/* USING expressions */
-} PLiSQL_stmt_open;
+}			PLiSQL_stmt_open;
 
 /*
  * FETCH or MOVE statement
@@ -832,7 +829,7 @@ typedef struct PLiSQL_stmt_fetch
 	PLiSQL_expr *expr;			/* count, if expression */
 	bool		is_move;		/* is this a fetch or move? */
 	bool		returns_multiple_rows;	/* can return more than one row? */
-} PLiSQL_stmt_fetch;
+}			PLiSQL_stmt_fetch;
 
 /*
  * CLOSE curvar
@@ -843,7 +840,7 @@ typedef struct PLiSQL_stmt_close
 	int			lineno;
 	unsigned int stmtid;
 	int			curvar;
-} PLiSQL_stmt_close;
+}			PLiSQL_stmt_close;
 
 /*
  * EXIT or CONTINUE statement
@@ -856,7 +853,7 @@ typedef struct PLiSQL_stmt_exit
 	bool		is_exit;		/* Is this an exit or a continue? */
 	char	   *label;			/* NULL if it's an unlabeled EXIT/CONTINUE */
 	PLiSQL_expr *cond;
-} PLiSQL_stmt_exit;
+}			PLiSQL_stmt_exit;
 
 /*
  * RETURN statement
@@ -868,7 +865,7 @@ typedef struct PLiSQL_stmt_return
 	unsigned int stmtid;
 	PLiSQL_expr *expr;
 	int			retvarno;
-} PLiSQL_stmt_return;
+}			PLiSQL_stmt_return;
 
 /*
  * RETURN NEXT statement
@@ -880,7 +877,7 @@ typedef struct PLiSQL_stmt_return_next
 	unsigned int stmtid;
 	PLiSQL_expr *expr;
 	int			retvarno;
-} PLiSQL_stmt_return_next;
+}			PLiSQL_stmt_return_next;
 
 /*
  * RETURN QUERY statement
@@ -890,10 +887,10 @@ typedef struct PLiSQL_stmt_return_query
 	PLiSQL_stmt_type cmd_type;
 	int			lineno;
 	unsigned int stmtid;
-	PLiSQL_expr *query;		/* if static query */
+	PLiSQL_expr *query;			/* if static query */
 	PLiSQL_expr *dynquery;		/* if dynamic query (RETURN QUERY EXECUTE) */
 	List	   *params;			/* USING arguments for dynamic query */
-} PLiSQL_stmt_return_query;
+}			PLiSQL_stmt_return_query;
 
 /*
  * RAISE statement
@@ -908,7 +905,7 @@ typedef struct PLiSQL_stmt_raise
 	char	   *message;		/* old-style message format literal, or NULL */
 	List	   *params;			/* list of expressions for old-style message */
 	List	   *options;		/* list of PLiSQL_raise_option */
-} PLiSQL_stmt_raise;
+}			PLiSQL_stmt_raise;
 
 /*
  * RAISE statement option
@@ -917,7 +914,7 @@ typedef struct PLiSQL_raise_option
 {
 	PLiSQL_raise_option_type opt_type;
 	PLiSQL_expr *expr;
-} PLiSQL_raise_option;
+}			PLiSQL_raise_option;
 
 /*
  * ASSERT statement
@@ -929,7 +926,7 @@ typedef struct PLiSQL_stmt_assert
 	unsigned int stmtid;
 	PLiSQL_expr *cond;
 	PLiSQL_expr *message;
-} PLiSQL_stmt_assert;
+}			PLiSQL_stmt_assert;
 
 /*
  * Generic SQL statement to execute
@@ -945,7 +942,7 @@ typedef struct PLiSQL_stmt_execsql
 	bool		into;			/* INTO supplied? */
 	bool		strict;			/* INTO STRICT flag */
 	PLiSQL_variable *target;	/* INTO target (record or row) */
-} PLiSQL_stmt_execsql;
+}			PLiSQL_stmt_execsql;
 
 /*
  * Dynamic SQL string to execute
@@ -955,14 +952,14 @@ typedef struct PLiSQL_stmt_dynexecute
 	PLiSQL_stmt_type cmd_type;
 	int			lineno;
 	unsigned int stmtid;
-	PLiSQL_expr *query;		/* string expression */
+	PLiSQL_expr *query;			/* string expression */
 	bool		into;			/* INTO supplied? */
 	bool		strict;			/* INTO STRICT flag */
 	PLiSQL_variable *target;	/* INTO target (record or row) */
 	List	   *params;			/* USING expressions */
-	bool        haveout;        /* "out" or "in out" mode */
-	PLiSQL_row *out;		/* OUT target, if row */
-} PLiSQL_stmt_dynexecute;
+	bool		haveout;		/* "out" or "in out" mode */
+	PLiSQL_row *out;			/* OUT target, if row */
+}			PLiSQL_stmt_dynexecute;
 
 /*
  * Hash lookup key for functions
@@ -974,12 +971,12 @@ typedef struct PLiSQL_func_hashkey
 	bool		isTrigger;		/* true if called as a DML trigger */
 	bool		isEventTrigger; /* true if called as an event trigger */
 
-	/* be careful that pad bytes in this struct get zeroed! */
+	/* be careful that pad bytes in this struct may get zeroed! */
 
 	/*
 	 * For a trigger function, the OID of the trigger is part of the hash key
 	 * --- we want to compile the trigger function separately for each trigger
-	 * it is used with, in case the rowtype or transition table names are
+	 * it uses with, in case the rowtype or transition table names are
 	 * different.  Zero if not called as a DML trigger.
 	 */
 	Oid			trigOid;
@@ -996,7 +993,7 @@ typedef struct PLiSQL_func_hashkey
 	 * PLiSQL functions.  Be careful that extra positions are zeroed!
 	 */
 	Oid			argtypes[FUNC_MAX_ARGS];
-} PLiSQL_func_hashkey;
+}			PLiSQL_func_hashkey;
 
 /*
  * Trigger type
@@ -1006,7 +1003,7 @@ typedef enum PLiSQL_trigtype
 	PLISQL_DML_TRIGGER,
 	PLISQL_EVENT_TRIGGER,
 	PLISQL_NOT_TRIGGER
-} PLiSQL_trigtype;
+}			PLiSQL_trigtype;
 
 /*
  * Complete compiled function
@@ -1054,10 +1051,10 @@ typedef struct PLiSQL_function
 	int			nsubprocfuncs;
 	struct PLiSQL_subproc_function **subprocfuncs;
 
-	PackageCacheItem	*item;	/* if this function comes from a package */
-	List				*funclist;	/* functions list which references to package */
-	List				*pkgcachelist;	/* references to package'cache list */
-	char				*namelabel;		/* for label */
+	PackageCacheItem *item;		/* if this function comes from a package */
+	List	   *funclist;		/* functions list which references to package */
+	List	   *pkgcachelist;	/* references to package'cache list */
+	char	   *namelabel;		/* for label */
 
 	/* function body parsetree */
 	PLiSQL_stmt_block *action;
@@ -1065,15 +1062,16 @@ typedef struct PLiSQL_function
 	/* data derived while parsing body */
 	unsigned int nstatements;	/* counter for assigning stmtids */
 	bool		requires_procedure_resowner;	/* contains CALL or DO? */
-	bool        has_exception_block;    /* contains BEGIN...EXCEPTION? */
+	bool		has_exception_block;	/* contains BEGIN...EXCEPTION? */
 
 	/* these fields change when the function is used */
 	struct PLiSQL_execstate *cur_estate;
 	unsigned long use_count;
 	int		fn_ret_vardno;	/* the variable dno for the function return value */
 	bool		fn_no_return;	/* when the function return type is not VOIDOID, if the body has not a RETURN statment,
-					 * the CREATE FUNCTION can execute successfully, but when the function is called,
+					 * the CREATE FUNCTION can be executed successfully, but when the function is called,
 					 * an error will be reported */
+	bool		do_from_call;
 	char		**paramnames;	/* saved do + using parameter'name */
 } PLiSQL_function;
 
@@ -1081,7 +1079,7 @@ typedef struct plisql_hashent
 {
 	PLiSQL_func_hashkey key;
 	PLiSQL_function *function;
-} plisql_HashEnt;
+}			plisql_HashEnt;
 
 /*
  * Runtime execution data
@@ -1161,7 +1159,7 @@ typedef struct PLiSQL_execstate
 	const char *err_text;		/* additional state info */
 
 	void	   *plugin_info;	/* reserved for use by optional plugin */
-} PLiSQL_execstate;
+}			PLiSQL_execstate;
 
 /*
  * A PLiSQL_plugin structure represents an instrumentation plugin.
@@ -1169,8 +1167,7 @@ typedef struct PLiSQL_execstate
  * variable "PLiSQL_plugin" and set it to point to a PLiSQL_plugin struct.
  * Typically the struct could just be static data in the plugin library.
  * We expect that a plugin would do this at library load time (_PG_init()).
- * It must also be careful to set the rendezvous variable back to NULL
- * if it is unloaded (_PG_fini()).
+ * Be careful to set the rendezvous variable back to NULL if it is unloaded (_PG_fini()).
  *
  * This structure is basically a collection of function pointers --- at
  * various interesting points in pl_exec.c, we call these functions
@@ -1204,29 +1201,24 @@ typedef struct PLiSQL_execstate
 typedef struct PLiSQL_plugin
 {
 	/* Function pointers set up by the plugin */
-	void		(*func_setup) (PLiSQL_execstate *estate, PLiSQL_function *func);
-	void		(*func_beg) (PLiSQL_execstate *estate, PLiSQL_function *func);
-	void		(*func_end) (PLiSQL_execstate *estate, PLiSQL_function *func);
-	void		(*stmt_beg) (PLiSQL_execstate *estate, PLiSQL_stmt *stmt);
-	void		(*stmt_end) (PLiSQL_execstate *estate, PLiSQL_stmt *stmt);
+	void		(*func_setup) (PLiSQL_execstate * estate, PLiSQL_function * func);
+	void		(*func_beg) (PLiSQL_execstate * estate, PLiSQL_function * func);
+	void		(*func_end) (PLiSQL_execstate * estate, PLiSQL_function * func);
+	void		(*stmt_beg) (PLiSQL_execstate * estate, PLiSQL_stmt * stmt);
+	void		(*stmt_end) (PLiSQL_execstate * estate, PLiSQL_stmt * stmt);
 
 	/* Function pointers set by PL/pgSQL itself */
 	void		(*error_callback) (void *arg);
-	void		(*assign_expr) (PLiSQL_execstate *estate,
-								PLiSQL_datum *target,
-								PLiSQL_expr *expr);
-	void		(*assign_value) (PLiSQL_execstate *estate,
-								 PLiSQL_datum *target,
-								 Datum value, bool isNull,
-								 Oid valtype, int32 valtypmod);
-	void		(*eval_datum) (PLiSQL_execstate *estate, PLiSQL_datum *datum,
-							   Oid *typeId, int32 *typetypmod,
-							   Datum *value, bool *isnull);
-	Datum		(*cast_value) (PLiSQL_execstate *estate,
-							   Datum value, bool *isnull,
-							   Oid valtype, int32 valtypmod,
-							   Oid reqtype, int32 reqtypmod);
-} PLiSQL_plugin;
+	void		(*assign_expr) (PLiSQL_execstate * estate, PLiSQL_datum * target,
+								PLiSQL_expr * expr);
+	void		(*assign_value) (PLiSQL_execstate * estate, PLiSQL_datum * target,
+								 Datum value, bool isNull, Oid valtype, int32 valtypmod);
+	void		(*eval_datum) (PLiSQL_execstate * estate, PLiSQL_datum * datum, Oid *typeId,
+							   int32 *typetypmod, Datum *value, bool *isnull);
+	Datum		(*cast_value) (PLiSQL_execstate * estate, Datum value, bool *isnull,
+							   Oid valtype, int32 valtypmod, Oid reqtype,
+							   int32 reqtypmod);
+}			PLiSQL_plugin;
 
 /*
  * Struct types used during parsing
@@ -1249,7 +1241,7 @@ typedef struct PLwdatum
 	char	   *ident;			/* valid if simple name */
 	bool		quoted;
 	List	   *idents;			/* valid if composite name */
-	int			nname_used;		/* to find datum, we match idents n names */
+	int			nname_used;		/* to find datum, we match n names */
 } PLwdatum;
 
 union YYSTYPE;
@@ -1262,7 +1254,7 @@ typedef struct compile_error_callback_arg
 {
 	const char *proc_source;
 	yyscan_t	yyscanner;
-} compile_error_callback_arg;
+}			compile_error_callback_arg;
 
 /**********************************************************************
  * Global variable declarations
@@ -1284,11 +1276,11 @@ extern bool plisql_print_strict_params;
 extern bool plisql_check_asserts;
 
 /* extra compile-time and run-time checks */
-#define PLISQL_XCHECK_NONE						0
-#define PLISQL_XCHECK_SHADOWVAR				(1 << 1)
-#define PLISQL_XCHECK_TOOMANYROWS				(1 << 2)
-#define PLISQL_XCHECK_STRICTMULTIASSIGNMENT	(1 << 3)
-#define PLISQL_XCHECK_ALL						((int) ~0)
+#define PLISQL_XCHECK_NONE 0
+#define PLISQL_XCHECK_SHADOWVAR (1 << 1)
+#define PLISQL_XCHECK_TOOMANYROWS (1 << 2)
+#define PLISQL_XCHECK_STRICTMULTIASSIGNMENT (1 << 3)
+#define PLISQL_XCHECK_ALL ((int)~0)
 
 extern int	plisql_extra_warnings;
 extern int	plisql_extra_errors;
@@ -1296,23 +1288,24 @@ extern int	plisql_extra_errors;
 extern bool plisql_check_syntax;
 extern bool plisql_DumpExecTree;
 
-
 extern int	plisql_nDatums;
-extern PLiSQL_datum **plisql_Datums;
+extern PLiSQL_datum * *plisql_Datums;
 
-extern int datums_last;
+extern int	datums_last;
 
-extern int datums_alloc;
+extern int	datums_alloc;
 
 extern char *plisql_error_funcname;
 
-extern PLiSQL_function *plisql_curr_compile;
+extern PLiSQL_function * plisql_curr_compile;
 extern MemoryContext plisql_compile_tmp_cxt;
 
-extern PLiSQL_plugin **plisql_plugin_ptr;
+extern PLiSQL_plugin * *plisql_plugin_ptr;
 
 extern bool check_referenced_objects;
-extern List *plisql_referenced_objects;	/*the elements in list are ObjectAddress */
+extern List
+		   *plisql_referenced_objects;	/* the elements in list are
+										 * ObjectAddress */
 
 /**********************************************************************
  * Function declarations
@@ -1321,135 +1314,136 @@ extern List *plisql_referenced_objects;	/*the elements in list are ObjectAddress
 /*
  * Functions in pl_comp.c
  */
-extern PGDLLEXPORT PLiSQL_function *plisql_compile(FunctionCallInfo fcinfo,
-													 bool forValidator);
+extern PGDLLEXPORT PLiSQL_function * plisql_compile(FunctionCallInfo fcinfo,
+													bool forValidator);
 
-extern PLiSQL_function *plisql_compile_inline(char *proc_source, ParamListInfo inparams);
+extern PLiSQL_function *plisql_compile_inline(char *proc_source, ParamListInfo inparams, bool fromcall);
 extern PGDLLEXPORT void plisql_parser_setup(struct ParseState *pstate,
-								 PLiSQL_expr *expr);
-extern bool plisql_parse_word(char *paramname, char *word1, const char *yytxt, bool lookup,
-							   PLwdatum *wdatum, PLword *word);
+											PLiSQL_expr * expr);
+extern bool plisql_parse_word(char *paramname, char *word1, const char *yytxt,
+							  bool lookup, PLwdatum *wdatum, PLword *word);
 extern bool plisql_parse_dblword(char *paramname, char *word1, char *word2,
-								  PLwdatum *wdatum, PLcword *cword);
-extern bool plisql_parse_tripword(char *paramname, char *word1, char *word2, char *word3,
-								   PLwdatum *wdatum, PLcword *cword);
-extern PLiSQL_type *plisql_parse_wordtype(char *ident);
-extern PLiSQL_type *plisql_parse_cwordtype(List *idents);
-extern PLiSQL_type *plisql_parse_wordrowtype(char *ident);
-extern PLiSQL_type *plisql_parse_cwordrowtype(List *idents);
-extern PGDLLEXPORT PLiSQL_type *plisql_build_datatype(Oid typeOid, int32 typmod,
-											Oid collation,
-											TypeName *origtypname);
-extern PLiSQL_type *plisql_build_datatype_arrayof(PLiSQL_type *dtype);
-extern PLiSQL_variable *plisql_build_variable(const char *refname, int lineno,
-												PLiSQL_type *dtype,
-												bool add2namespace);
-extern PLiSQL_rec *plisql_build_record(const char *refname, int lineno,
-										 PLiSQL_type *dtype, Oid rectypeid,
-										 bool add2namespace);
-extern PLiSQL_recfield *plisql_build_recfield(PLiSQL_rec *rec,
-												const char *fldname);
-extern PGDLLEXPORT int	plisql_recognize_err_condition(const char *condname,
-											bool allow_sqlstate);
-extern PLiSQL_condition *plisql_parse_err_condition(char *condname);
-extern void plisql_adddatum(PLiSQL_datum *newdatum);
+								 PLwdatum *wdatum, PLcword *cword);
+extern bool plisql_parse_tripword(char *paramname, char *word1, char *word2,
+								  char *word3, PLwdatum *wdatum,
+								  PLcword *cword);
+extern PLiSQL_type * plisql_parse_wordtype(char *ident);
+extern PLiSQL_type * plisql_parse_cwordtype(List *idents);
+extern PLiSQL_type * plisql_parse_wordrowtype(char *ident);
+extern PLiSQL_type * plisql_parse_cwordrowtype(List *idents);
+extern PGDLLEXPORT PLiSQL_type * plisql_build_datatype(Oid typeOid, int32 typmod,
+													   Oid collation,
+													   TypeName *origtypname);
+extern PLiSQL_type * plisql_build_datatype_arrayof(PLiSQL_type * dtype);
+extern PLiSQL_variable * plisql_build_variable(const char *refname, int lineno,
+											   PLiSQL_type * dtype,
+											   bool add2namespace);
+extern PLiSQL_rec * plisql_build_record(const char *refname, int lineno,
+										PLiSQL_type * dtype, Oid rectypeid,
+										bool add2namespace);
+extern PLiSQL_recfield * plisql_build_recfield(PLiSQL_rec * rec,
+											   const char *fldname);
+extern PGDLLEXPORT int plisql_recognize_err_condition(const char *condname,
+													  bool allow_sqlstate);
+extern PLiSQL_condition * plisql_parse_err_condition(char *condname);
+extern void plisql_adddatum(PLiSQL_datum * newdatum);
 extern int	plisql_add_initdatums(int **varnos);
 extern void plisql_HashTableInit(void);
 
-extern void plisql_resolve_polymorphic_argtypes(int numargs,
-												 Oid *argtypes, char *argmodes,
-												 Node *call_expr, bool forValidator,
-												 const char *proname);
-extern void add_parameter_name(PLiSQL_nsitem_type itemtype, int itemno, const char *name);
-extern PLiSQL_row *build_row_from_vars(PLiSQL_variable **vars, int numvars);
-extern void add_dummy_return(PLiSQL_function *function);
+extern void plisql_resolve_polymorphic_argtypes(int numargs, Oid *argtypes,
+												char *argmodes, Node *call_expr,
+												bool forValidator,
+												const char *proname);
+extern void add_parameter_name(PLiSQL_nsitem_type itemtype, int itemno,
+							   const char *name);
+extern PLiSQL_row * build_row_from_vars(PLiSQL_variable * *vars, int numvars);
+extern void add_dummy_return(PLiSQL_function * function);
 extern void plisql_start_datums(void);
 extern void plisql_compile_error_callback(void *arg);
-extern void plisql_finish_datums(PLiSQL_function *function);
+extern void plisql_finish_datums(PLiSQL_function * function);
 
 extern void plisql_compile_inline_internal(char *proc_source);
-extern void dynamic_build_func_vars(PLiSQL_function **function);
+extern void dynamic_build_func_vars(PLiSQL_function * *function);
 
-extern void delete_function(PLiSQL_function *func);
+extern void delete_function(PLiSQL_function * func);
 
 extern void plisql_free_function(Oid funcOid);
 
 /*
  * Functions in pl_exec.c
  */
-extern Datum plisql_exec_function(PLiSQL_function *func,
-								   FunctionCallInfo fcinfo,
-								   EState *simple_eval_estate,
-								   ResourceOwner simple_eval_resowner,
-								   ResourceOwner procedure_resowner,
-								   bool atomic);
-extern HeapTuple plisql_exec_trigger(PLiSQL_function *func,
-									  TriggerData *trigdata);
-extern void plisql_exec_event_trigger(PLiSQL_function *func,
-									   EventTriggerData *trigdata);
+extern Datum plisql_exec_function(PLiSQL_function * func,
+								  FunctionCallInfo fcinfo,
+								  EState *simple_eval_estate,
+								  ResourceOwner simple_eval_resowner,
+								  ResourceOwner procedure_resowner,
+								  bool atomic);
+extern HeapTuple plisql_exec_trigger(PLiSQL_function * func,
+									 TriggerData *trigdata);
+extern void plisql_exec_event_trigger(PLiSQL_function * func,
+									  EventTriggerData *trigdata);
 extern void plisql_xact_cb(XactEvent event, void *arg);
 extern void plisql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
-							   SubTransactionId parentSubid, void *arg);
-extern PGDLLEXPORT Oid	plisql_exec_get_datum_type(PLiSQL_execstate *estate,
-										PLiSQL_datum *datum);
-extern void plisql_exec_get_datum_type_info(PLiSQL_execstate *estate,
-											 PLiSQL_datum *datum,
-											 Oid *typeId, int32 *typMod,
-											 Oid *collation);
-
-extern void plisql_assign_in_global_var(PLiSQL_execstate *estate,
-													 PLiSQL_execstate *parestate,
-													 int dno);
-extern void plisql_assign_out_global_var(PLiSQL_execstate *estate,
-										 PLiSQL_execstate *parestate,
-										 int dno,
+							  SubTransactionId parentSubid, void *arg);
+extern PGDLLEXPORT Oid plisql_exec_get_datum_type(PLiSQL_execstate * estate,
+												  PLiSQL_datum * datum);
+extern void plisql_exec_get_datum_type_info(PLiSQL_execstate * estate,
+											PLiSQL_datum * datum, Oid *typeId,
+											int32 *typMod, Oid *collation);
+
+extern void plisql_assign_in_global_var(PLiSQL_execstate * estate,
+										PLiSQL_execstate * parestate, int dno);
+extern void plisql_assign_out_global_var(PLiSQL_execstate * estate,
+										 PLiSQL_execstate * parestate, int dno,
 										 int spilevel);
 
-
 /*
  * Functions for namespace handling in pl_funcs.c
  */
 extern void plisql_ns_init(void);
-extern void plisql_set_ns(PLiSQL_nsitem *cur);
-extern void plisql_ns_push(const char *label,
-							PLiSQL_label_type label_type);
+extern void plisql_set_ns(PLiSQL_nsitem * cur);
+extern void plisql_ns_push(const char *label, PLiSQL_label_type label_type);
 extern void plisql_ns_pop(void);
-extern PLiSQL_nsitem *plisql_ns_top(void);
-extern void plisql_ns_additem(PLiSQL_nsitem_type itemtype, int itemno, const char *name);
-extern PGDLLEXPORT PLiSQL_nsitem *plisql_ns_lookup(PLiSQL_nsitem *ns_cur, bool localmode,
-										 const char *name1, const char *name2,
-										 const char *name3, int *names_used);
-extern PLiSQL_nsitem *plisql_ns_lookup_label(PLiSQL_nsitem *ns_cur,
-											   const char *name);
-extern PLiSQL_nsitem *plisql_ns_find_nearest_loop(PLiSQL_nsitem *ns_cur);
+extern PLiSQL_nsitem * plisql_ns_top(void);
+extern void plisql_ns_additem(PLiSQL_nsitem_type itemtype, int itemno,
+							  const char *name);
+extern PGDLLEXPORT PLiSQL_nsitem *
+plisql_ns_lookup(PLiSQL_nsitem * ns_cur, bool localmode, const char *name1,
+				 const char *name2, const char *name3, int *names_used);
+extern PLiSQL_nsitem * plisql_ns_lookup_label(PLiSQL_nsitem * ns_cur,
+											  const char *name);
+extern PLiSQL_nsitem * plisql_ns_find_nearest_loop(PLiSQL_nsitem * ns_cur);
 
 /*
  * Other functions in pl_funcs.c
  */
-extern PGDLLEXPORT const char *plisql_stmt_typename(PLiSQL_stmt *stmt);
+extern PGDLLEXPORT const char *plisql_stmt_typename(PLiSQL_stmt * stmt);
 extern const char *plisql_getdiag_kindname(PLiSQL_getdiag_kind kind);
-extern void plisql_free_function_memory(PLiSQL_function *func,
-							int start_datum, int start_inlinefunc);
-extern void plisql_mark_local_assignment_targets(PLiSQL_function *func);
-extern void plisql_dumptree(PLiSQL_function *func, int start_datum, int start_subprocfunc); 
+extern void plisql_free_function_memory(PLiSQL_function * func, int start_datum,
+										int start_inlinefunc);
+extern void plisql_mark_local_assignment_targets(PLiSQL_function * func);
+extern void plisql_dumptree(PLiSQL_function * func, int start_datum,
+							int start_subprocfunc);
 
 /*
  * Scanner functions in pl_scanner.c
  */
 
-
-extern int	plisql_yylex(union YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner);
+extern int	plisql_yylex(union YYSTYPE *yylvalp, YYLTYPE *yyllocp,
+						 yyscan_t yyscanner);
 extern int	plisql_token_length(yyscan_t yyscanner);
-extern void plisql_push_back_token(int token, union YYSTYPE *yylvalp, YYLTYPE *yyllocp, yyscan_t yyscanner);
+extern void plisql_push_back_token(int token, union YYSTYPE *yylvalp,
+								   YYLTYPE *yyllocp, yyscan_t yyscanner);
 extern bool plisql_token_is_unreserved_keyword(int token);
-extern void plisql_append_source_text(StringInfo buf,
-									   int startlocation, int endlocation,
-									   yyscan_t yyscanner);
+extern void plisql_append_source_text(StringInfo buf, int startlocation,
+									  int endlocation, yyscan_t yyscanner);
 extern int	plisql_peek(yyscan_t yyscanner);
-extern void plisql_peek2(int *tok1_p, int *tok2_p, int *tok1_loc,
-						  int *tok2_loc, yyscan_t yyscanner);
+extern void plisql_peek2(int *tok1_p, int *tok2_p, int *tok1_loc, int *tok2_loc,
+						 yyscan_t yyscanner);
 extern int	plisql_scanner_errposition(int location, yyscan_t yyscanner);
-pg_noreturn extern void plisql_yyerror(YYLTYPE *yyllocp, PLiSQL_stmt_block **plisql_parse_result_p, yyscan_t yyscanner, const char *message);
+pg_noreturn extern void
+			plisql_yyerror(YYLTYPE *yyllocp, PLiSQL_stmt_block * *plisql_parse_result_p,
+						   yyscan_t yyscanner, const char *message);
 extern int	plisql_location_to_lineno(int location, yyscan_t yyscanner);
 extern int	plisql_latest_lineno(yyscan_t yyscanner);
 extern yyscan_t plisql_scanner_init(const char *str);
@@ -1457,10 +1451,10 @@ extern void plisql_scanner_finish(yyscan_t yyscanner);
 extern void *plisql_get_yylex_global_proper(void);
 extern void plisql_recover_yylex_global_proper(void *yylex_data);
 
-
 /*
  * Externs in gram.y
  */
-extern int	plisql_yyparse(PLiSQL_stmt_block **plisql_parse_result_p, yyscan_t yyscanner);
+extern int	plisql_yyparse(PLiSQL_stmt_block * *plisql_parse_result_p,
+						   yyscan_t yyscanner);
 
 #endif							/* PLISQL_H */
diff --git a/src/pl/plisql/src/po/es.po b/src/pl/plisql/src/po/es.po
index cdb7e319e38..7589e763168 100644
--- a/src/pl/plisql/src/po/es.po
+++ b/src/pl/plisql/src/po/es.po
@@ -11,9 +11,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plisql (PostgreSQL) 14\n"
+"Project-Id-Version: plisql (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2021-10-13 22:09+0000\n"
+"POT-Creation-Date: 2026-02-06 23:09+0000\n"
 "PO-Revision-Date: 2021-10-14 10:18-0500\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
diff --git a/src/pl/plisql/src/po/meson.build b/src/pl/plisql/src/po/meson.build
index 1d322c392e5..86e837fd3c6 100644
--- a/src/pl/plisql/src/po/meson.build
+++ b/src/pl/plisql/src/po/meson.build
@@ -1,4 +1,4 @@
 # Copyright (c) 2022-2024, PostgreSQL Global Development Group
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 
 nls_targets += [i18n.gettext('plisql-' + pg_version_major.to_string())]
diff --git a/src/pl/plisql/src/po/uk.po b/src/pl/plisql/src/po/uk.po
index de31539e4f2..a245bfa26f1 100644
--- a/src/pl/plisql/src/po/uk.po
+++ b/src/pl/plisql/src/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2021-08-17 08:39+0000\n"
-"PO-Revision-Date: 2021-08-17 10:54\n"
+"POT-Creation-Date: 2025-12-31 02:09+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_14_DEV/plisql.pot\n"
-"X-Crowdin-File-ID: 758\n"
+"X-Crowdin-File: /REL_18_STABLE/plpgsql.pot\n"
+"X-Crowdin-File-ID: 1087\n"
 
 #: pl_comp.c:438 pl_handler.c:496
 #, c-format
diff --git a/src/pl/plisql/src/sql/plisql_bugs.sql b/src/pl/plisql/src/sql/plisql_bugs.sql
new file mode 100644
index 00000000000..558e0795812
--- /dev/null
+++ b/src/pl/plisql/src/sql/plisql_bugs.sql
@@ -0,0 +1,131 @@
+--
+-- Test for GitHub Issue #1124: Variable Reset Bug in Nested Functions
+--
+-- Bug: When evaluating expressions like "v_sum := v_sum + nested_func()",
+-- variables show original values instead of modified ones.
+--
+
+-- Test 1: Variable modification + nested function call in expression
+-- This was the core bug - v_sum's modified value (109) was being lost
+-- during expression evaluation, causing v_sum + get_30(10) to be 0 + 30 = 30
+-- instead of 109 + 30 = 139
+CREATE OR REPLACE FUNCTION test_bug1124_basic() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_result NUMBER;
+
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    -- Modify v_sum
+    v_sum := v_sum + 10;  -- v_sum = 109
+
+    -- Expression with nested function - this was buggy
+    v_result := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+
+    RETURN v_result;
+END;
+/
+
+SELECT test_bug1124_basic() AS result FROM dual;
+DROP FUNCTION test_bug1124_basic;
+
+-- Test 2: Multiple expressions to ensure consistent behavior
+CREATE OR REPLACE FUNCTION test_bug1124_multiple() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+
+    -- First expression
+    v_temp := v_sum + get_30(10);  -- Should be 139
+
+    -- Second expression (same) - should also be 139
+    v_temp := v_sum + get_30(10);
+
+    -- Third expression
+    v_temp := v_sum + get_30(10);
+
+    RETURN v_temp;
+END;
+/
+
+SELECT test_bug1124_multiple() AS result FROM dual;
+DROP FUNCTION test_bug1124_multiple;
+
+-- Test 3: Nested procedure modifying parent variable + nested function in expression
+CREATE OR REPLACE FUNCTION test_bug1124_proc_and_func() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+
+    PROCEDURE add_val(p_val NUMBER) IS
+    BEGIN
+        v_sum := v_sum + p_val;
+    END add_val;
+
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    -- Call nested procedure to modify v_sum
+    add_val(10);  -- v_sum = 109
+
+    -- Expression with nested function
+    v_temp := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+
+    RETURN v_temp;
+END;
+/
+
+SELECT test_bug1124_proc_and_func() AS result FROM dual;
+DROP FUNCTION test_bug1124_proc_and_func;
+
+-- Test 4: Test with integer type (not just NUMBER)
+CREATE OR REPLACE FUNCTION test_bug1124_integer() RETURN integer AS
+    v_sum integer := 99;
+    v_result integer;
+
+    FUNCTION get_30(p_val integer) RETURN integer IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+
+    v_result := v_sum + get_30(10);  -- Should be 109 + 30 = 139
+
+    RETURN v_result;
+END;
+/
+
+SELECT test_bug1124_integer() AS result FROM dual;
+DROP FUNCTION test_bug1124_integer;
+
+-- Test 5: Nested function on left side of expression
+CREATE OR REPLACE FUNCTION test_bug1124_order() RETURN NUMBER AS
+    v_sum NUMBER := 99;
+    v_temp NUMBER;
+
+    FUNCTION get_30(p_val NUMBER) RETURN NUMBER IS
+    BEGIN
+        RETURN p_val * 3;
+    END get_30;
+BEGIN
+    v_sum := v_sum + 10;  -- v_sum = 109
+
+    -- Nested function result on left side
+    v_temp := get_30(10) + v_sum;  -- Should be 30 + 109 = 139
+
+    RETURN v_temp;
+END;
+/
+
+SELECT test_bug1124_order() AS result FROM dual;
+DROP FUNCTION test_bug1124_order;
diff --git a/src/pl/plisql/src/sql/plisql_call.sql b/src/pl/plisql/src/sql/plisql_call.sql
index 74c05d56bbc..4910d1bc02b 100755
--- a/src/pl/plisql/src/sql/plisql_call.sql
+++ b/src/pl/plisql/src/sql/plisql_call.sql
@@ -609,3 +609,185 @@ END
 $$;
 
 ROLLBACK;
+
+-- Test for issue #1006: Mixed positional and named parameters with variables
+-- calling package procedures with default parameters
+
+CREATE OR REPLACE PACKAGE test_mixed_params_pkg AS
+  PROCEDURE proc_with_defaults(
+    p1 VARCHAR2,
+    p2 VARCHAR2 DEFAULT 'default_p2',
+    p3 VARCHAR2 DEFAULT 'default_p3'
+  );
+END test_mixed_params_pkg;
+/
+
+CREATE OR REPLACE PACKAGE BODY test_mixed_params_pkg AS
+  PROCEDURE proc_with_defaults(
+    p1 VARCHAR2,
+    p2 VARCHAR2 DEFAULT 'default_p2',
+    p3 VARCHAR2 DEFAULT 'default_p3'
+  ) IS
+  BEGIN
+    RAISE NOTICE 'p1=%, p2=%, p3=%', p1, p2, p3;
+  END;
+END test_mixed_params_pkg;
+/
+
+-- Test 1: All positional parameters (should work)
+DO $$
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', 'b', 'c');
+END;
+$$;
+
+-- Test 2: All named parameters with variable (should work)
+DO $$
+DECLARE
+  v_val VARCHAR2(20) := 'var_value';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults(p1=>'a', p2=>'b', p3=>v_val);
+END;
+$$;
+
+-- Test 3: Mixed positional and named with literal (should work)
+DO $$
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', p3=>'c');
+END;
+$$;
+
+-- Test 4: Mixed positional and named with variable (issue #1006)
+-- This would fail before the fix with:
+-- ERROR: failed to find conversion function from unknown to varchar2
+DO $$
+DECLARE
+  v_val VARCHAR2(20) := 'var_value';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults('a', p3=>v_val);
+END;
+$$;
+
+-- Test 5: Multiple variables with mixed notation
+DO $$
+DECLARE
+  v1 VARCHAR2(20) := 'value1';
+  v2 VARCHAR2(20) := 'value2';
+BEGIN
+  test_mixed_params_pkg.proc_with_defaults(v1, p3=>v2);
+END;
+$$;
+
+DROP PACKAGE test_mixed_params_pkg;
+
+-- Test subprocedures with mixed positional and named parameters (Issue #1006)
+-- This tests the same bug scenario but for subprocedures instead of packages
+DO $$
+DECLARE
+    v_name VARCHAR2(100) := 'Test Name';
+    v_value NUMBER := 42;
+    v_result VARCHAR2(200);
+
+    PROCEDURE test_subproc(p_id NUMBER, p_name VARCHAR2, p_value NUMBER DEFAULT 0) AS
+    BEGIN
+        RAISE NOTICE 'test_subproc called: id=%, name=%, value=%', p_id, p_name, p_value;
+    END;
+
+    FUNCTION test_subfunc(p_id NUMBER, p_name VARCHAR2, p_value NUMBER DEFAULT 0) RETURN VARCHAR2 AS
+    BEGIN
+        RETURN 'id=' || p_id || ', name=' || p_name || ', value=' || p_value;
+    END;
+BEGIN
+    -- Test 1: All positional parameters
+    test_subproc(1, 'literal', 10);
+
+    -- Test 2: All named parameters with variables
+    test_subproc(p_id => 2, p_name => v_name, p_value => v_value);
+
+    -- Test 3: Mixed positional and named with literals
+    test_subproc(3, p_name => 'mixed literal');
+
+    -- Test 4: Mixed positional and named with variables (the bug case)
+    test_subproc(4, p_name => v_name);
+
+    -- Test 5: Multiple variables with mixed notation
+    test_subproc(5, p_name => v_name, p_value => v_value);
+
+    -- Test 6: Function with mixed parameters and variables
+    v_result := test_subfunc(6, p_name => v_name, p_value => v_value);
+    RAISE NOTICE 'Function result: %', v_result;
+END;
+$$ LANGUAGE plisql;
+
+-- Test subprocedure overloading still works with the fix
+DO $$
+DECLARE
+    v_int INTEGER := 10;
+    v_str VARCHAR2(50) := 'hello';
+    v_result INTEGER;
+
+    FUNCTION overloaded(p_val INTEGER) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(INTEGER) called with %', p_val;
+        RETURN p_val * 2;
+    END;
+
+    FUNCTION overloaded(p_val VARCHAR2) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(VARCHAR2) called with %', p_val;
+        RETURN LENGTH(p_val);
+    END;
+
+    FUNCTION overloaded(p_id INTEGER, p_name VARCHAR2) RETURN INTEGER AS
+    BEGIN
+        RAISE NOTICE 'overloaded(INTEGER, VARCHAR2) called with %, %', p_id, p_name;
+        RETURN p_id + LENGTH(p_name);
+    END;
+BEGIN
+    -- Test overload resolution with different types
+    v_result := overloaded(v_int);
+    RAISE NOTICE 'Result 1: %', v_result;
+
+    v_result := overloaded(v_str);
+    RAISE NOTICE 'Result 2: %', v_result;
+
+    -- Test overload with multiple args
+    v_result := overloaded(5, 'test');
+    RAISE NOTICE 'Result 3: %', v_result;
+
+    -- Test overload with named parameters
+    v_result := overloaded(p_id => v_int, p_name => v_str);
+    RAISE NOTICE 'Result 4: %', v_result;
+END;
+$$ LANGUAGE plisql;
+
+-- Minimal test case for issue #1006 subprocedure fix
+-- This is the exact bug scenario: mixed positional + named params with variable
+-- The bug occurs when argument types need coercion after reordering
+-- Before fix: ERROR: failed to find conversion function from unknown to varchar2
+DO $$
+DECLARE
+    v_str VARCHAR2(50) := 'test_value';
+    v_num NUMBER := 99;
+
+    -- Test with different type combinations that require proper type alignment
+    PROCEDURE test_types(p_num NUMBER, p_str VARCHAR2, p_extra NUMBER DEFAULT 0) AS
+    BEGIN
+        RAISE NOTICE 'test_types: num=%, str=%, extra=%', p_num, p_str, p_extra;
+    END;
+BEGIN
+    -- Case 1: Mixed positional + named with variable (varchar arg)
+    -- Call order: (1, p_str => v_str)
+    -- Declared order: (p_num NUMBER, p_str VARCHAR2, p_extra NUMBER)
+    test_types(1, p_str => v_str);
+
+    -- Case 2: Mixed positional + named with variable (number arg)
+    test_types(2, p_str => 'literal', p_extra => v_num);
+
+    -- Case 3: Named parameters in different order than declared
+    test_types(p_str => v_str, p_num => 3);
+
+    -- Case 4: All named with variables
+    test_types(p_num => v_num, p_str => v_str, p_extra => 10);
+END;
+$$ LANGUAGE plisql;
diff --git a/src/pl/plisql/src/sql/plisql_domain.sql b/src/pl/plisql/src/sql/plisql_domain.sql
index 9ddba00e5fe..1ea2784cea3 100755
--- a/src/pl/plisql/src/sql/plisql_domain.sql
+++ b/src/pl/plisql/src/sql/plisql_domain.sql
@@ -299,3 +299,14 @@ $$ LANGUAGE plisql;
 SELECT * FROM test_assign_ordered_named_pairs(1,2,3);
 SELECT * FROM test_assign_ordered_named_pairs(2,1,3);
 SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
+
+CREATE FUNCTION test_null_ordered_named_pair()
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair;
+begin
+return v;
+end
+$$ LANGUAGE plisql;
+/
+
+SELECT * FROM test_null_ordered_named_pair();
diff --git a/src/pl/plisql/src/sql/plisql_nested_subproc.sql b/src/pl/plisql/src/sql/plisql_nested_subproc.sql
index 61ac83b500d..317dc21c632 100644
--- a/src/pl/plisql/src/sql/plisql_nested_subproc.sql
+++ b/src/pl/plisql/src/sql/plisql_nested_subproc.sql
@@ -27,8 +27,8 @@ $$
 declare
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
   declare
        original_squared integer;
@@ -45,7 +45,7 @@ begin
 end;$$ language plisql;
 /
 
---print 100 and 10
+--print 100 and 101
 select * from test_subproc_func(23);
 drop function test_subproc_func(integer);
 
@@ -187,10 +187,8 @@ begin
 
 --subproc use global variable
 --print we are in main function
---res = 45 a square function assign 11
+--res = 121 a square function assign 45
 --
---there originial not like oracle
---for out argmuments
 do $$
 declare
   mds varchar(256);
@@ -206,7 +204,7 @@ declare
        raise info '%', mds;
        mds := 'a square function assign';
        original := 45;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 'we are in main function';
@@ -413,7 +411,7 @@ begin
      test(name);
 end;$$ language plisql;
 
--- test subproc function'argument has default value
+-- test that subproc function'argument has default value
 --test ok
 --print 529
 do $$
@@ -734,7 +732,7 @@ begin
     raise info '%', ret;
 end; $$ language plisql;
 
----global variable the name as local variable
+---global variable has the name as local variable
 --test ok
 create or replace function test_subproc_func(a in out integer) returns integer AS
 $$
@@ -755,7 +753,7 @@ declare
 	   raise info 'local var a = %',a;
 	   raise info 'global a = %', test_subproc_func.a;
        original := original_squared + 1;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 10;
@@ -774,7 +772,7 @@ select * from test_subproc_func(21);
 drop function test_subproc_func(integer);
 set ivorysql.allow_out_parameter_const = false;
 
---function the name as global variable
+--function has the name as global variable
 --test failed
 do $$
 declare
@@ -798,13 +796,13 @@ end; $$ language plisql;
 do $$
 declare
   salary integer;
-  var2 record;
+  var2 integer;
   id integer;
-  function test_out(id in out integer, salary out integer) return record
+  function test_out(id in out integer, salary out integer) return integer
   IS
   declare
-       var1 record;
-       function test_out(id in out integer,salary out integer) return record
+       var1 integer;
+       function test_out(id in out integer,salary out integer) return integer
        IS
        declare
             var2 integer;
@@ -812,14 +810,14 @@ declare
 	     salary := 101;
 	     var2 := id + 2;
 	     id := 1;
-	     --return var2;
+	     return var2;
 	end;
    begin
      var1 := test_out(id, salary);
 	 raise info 'var=%', var1;
 	 salary := 102;
 	 id := 2;
-	 --return var1;
+	 return var1;
    end;
 begin
     var2 := test_out(id, salary);
@@ -827,12 +825,6 @@ begin
 end; $$ language plisql;
 
 --ok
---this because out parameter we have don't handle
--- so it doesn't like oracle
--- test out name=must be assign to null
--- test_out.test_out name=must be assign to null
--- name1= must be assign to null
--- declare name=must be assign to null
 do $$
 declare
   name varchar(256);
@@ -864,7 +856,7 @@ begin
  end; $$ language plisql;
 
 
----schema function and subproc function as the same name
+---schema function and subproc function has the same name
 create or replace function test_subproc(id integer) returns integer
 AS $$
 declare
@@ -925,7 +917,7 @@ drop function test_subproc(integer);
 create type test_subproc_type as (id integer,name varchar(23));
 
 --test ok
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 do $$
 declare
     var1 test_subproc_type;
@@ -935,7 +927,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 return var1;
     end;
 begin
@@ -944,7 +936,7 @@ begin
 end;$$ language plisql;
 
 --print id = (1, "welcome to beiing")
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 do $$
 declare
     var1 test_subproc_type;
@@ -954,7 +946,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 raise info 'id = %',id;
 	 return var1;
     end;
@@ -1822,10 +1814,10 @@ end; $$ language plisql;
 --ret = (46, "test a nocopy")
 do $$
 declare
-   ret record;
+   ret integer;
    out_var integer;
    name varchar(256);
-   function square(id out nocopy integer, name in out nocopy varchar) return record
+   function square(id out nocopy integer, name in out nocopy varchar) return integer
    IS
    declare
      var1 integer;
@@ -1834,7 +1826,7 @@ declare
      id := var1 + 23;
      raise info 'id=%,name=%', id,name;
      name := 'test a nocopy';
-     --return var1;
+     return var1;
    end;
 begin
   name := 'before function';
@@ -1884,7 +1876,7 @@ begin
   NULL;
 end; $$ language plisql;
 
---only declare but no define raise error
+--only declare but no definition, raise error
 do $$
 DECLARE
   var1 integer;
@@ -1903,7 +1895,7 @@ begin
   var1 := mds(23);
 end; $$ language plisql;
 
---define before declare faield
+--define before declare failed
 do $$
 declare
    function mds(id integer) return integer IS
@@ -2010,9 +2002,9 @@ END; $$ language plisql;
 
 --
 --
--- subproc function support polymorphic type
+-- subproc function supports polymorphic type
 --
---point raise error others is ok
+--point raise error, others is ok
 do $$
 DECLARE
    var1 integer;
@@ -2189,23 +2181,32 @@ END; $$ language plisql;
 do $$
 DECLARE
    r record;
+   var1 _int4;
+   var2 _number;
+   var3 _point;
    function f1(a anyelement, b anyarray,
                    c anycompatible, d anycompatible,
                    x OUT anyarray, y OUT anycompatiblearray) RETURN record
-	as
+	AS
+      r record;
 	begin
 	  x := a || b;
 	  y := array[c, d];
+	  RETURN r;
 	end;
 begin
-	r := f1(11, array[1, 2], 42, 34.5, NULL,NULL);
+	r := f1(11, array[1, 2], 42, 34.5, var1, var2);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2], point(1,2), point(3,4), NULL,NULL);
+	raise info '%-%',var1, var2;
+	r := f1(11, array[1, 2], point(1,2), point(3,4), var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, '{1,2}', point(1,2), '(3,4)', NULL,NULL);
+	raise info '%-%',var1, var3;
+	r := f1(11, '{1,2}', point(1,2), '(3,4)', var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL);  -- fail
+	raise info '%-%',var1, var3;
+	r := f1(11, array[1, 2.2], 42, 34.5, var1,var2);  -- fail
 	raise info 'r=%',r;
+	raise info '%-%',var1, var2;
 END; $$ language plisql;
 
 --
@@ -2215,44 +2216,55 @@ END; $$ language plisql;
 do $$
 DECLARE
    var1 integer;
+   var2 integer;
    function f1(i IN int, j out int) RETURN integer is
    begin
      j := i+1;
-     return;
+     RETURN 23;
    end;
 BEGIN
-  raise info '%', f1(42, 23);
-  SELECT f1(42,23) INTO var1;
-  raise info '%', var1;
+  raise info '%', f1(42, var1);
+  SELECT f1(42,var2) INTO var1;
+  raise info '%-%', var1, var2;
 end; $$ language plisql;
 
 do $$
-declare
-  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN record is
+DECLARE
+  var1 _int4;
+  var2 _text;
+  var3 integer;
+  var4 text;
+  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN integer is
    begin
 	  j := i;
 	  k := array[j,j];
-	  return;
+	  RETURN 23;
   end;
 BEGIN
-  raise info '%,%',duplic(42,45,NULL), duplic('foo'::text,'45',NULL);
+  raise info '%,%',duplic(42,var3,var1), duplic('foo'::text,var4,var2);
+  raise info '%-%', var1, var3;
+  raise info '%-%', var4, var2;
 END; $$ language plisql;
 
 do $$
-declare
-    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN record as
+DECLARE
+    var1 integer;
+	var2 _int4;
+    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN integer as
 	begin
 		j := lower(i);
 		k := array[lower(i),upper(i)];
-		return;
+		RETURN 23;
 	end;
 BEGIN
-	raise info '%,%',duplic(int4range(42,49), NULL,NULL),duplic(int4range('23', '45'), NULL,NULL);
+	raise info '%',duplic(int4range(42,49), var1,var2);
+	raise info '%-%', var1, var2;
+	raise info '%', duplic(int4range('23', '45'), var1,var2);
+	raise info '%-%', var1, var2;
 end; $$ language plisql;
 
 
---test extral
---error test_f is is out of scope
+--error test_f is out of scope
 do $$
 declare
   var1 integer;
@@ -2376,7 +2388,7 @@ begin
 end; $$ language plisql;
 
 
---oracle raise error,but we success
+--oracle raise error,but we succeed
 do $$
 declare
   var1 integer;
@@ -2405,7 +2417,7 @@ begin
 end; $$ language plisql;
 
 
---oracle raiser error,but we sucess
+--oracle raiser error,but we succeed
 create or replace function test_f(id integer) returns integer as
 $$
 declare
@@ -2430,7 +2442,7 @@ DROP FUNCTION test_f(integer);
 do $$
 declare
   var1 integer;
-  function test_f(id integer) return integer is
+  function test_f(id out integer) return integer is
   begin
     id := 23;
 	var1 := id;
@@ -2535,11 +2547,11 @@ declare
   function test_f(id integer default 23,id2 out integer) return integer is
   begin
     id2 := id;
-    --return id;
+    return id;
   end;
 begin
   var1 := test_f(23,var2);
-  raise info 'var1=%', var1;
+  raise info 'var1=%, var2=%', var1, var2;
 end; $$ language plisql;
 
 --ok
@@ -2549,6 +2561,7 @@ declare
   function test_f(id out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2573,6 +2586,7 @@ declare
   function test_f(id in out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2602,7 +2616,7 @@ begin
   var1 := test_f();
 end;$$ language plisql;
 
---dynamic include subproc function ok var1=25
+--dynamically include subproc function ok var1=25
 do $$
 declare
   var1 integer;
@@ -2759,7 +2773,7 @@ begin
   test_p(var1);
 end; $$ language plisql;
 
---oracle failed, but we sucess
+--oracle failed, but we succeed
 do $$
 declare
   var1 integer;
@@ -2808,7 +2822,7 @@ begin
   var1 := test_proc1(23);
 end; $$ language plisql;
 
---surcess
+--success
 do $$
 declare
   var1 integer;
@@ -2840,7 +2854,7 @@ begin
    test_func1(var1);
 end; $$ language plisql;
 
---sucess
+--success
 do $$
 declare
   var1 integer;
@@ -2880,7 +2894,7 @@ BEGIN
 	trigger := 1;
 end; $$ language plisql;
 
---oracle failed,but we sucess
+--oracle failed,but we succeed
 do $$
 DECLARE
 	type integer;
@@ -2902,7 +2916,7 @@ begin
   var1 := test_f(23) + test_f(23);
 end; $$ language plisql;
 
---oracle failed,but we success
+--oracle failed,but we succeed
 do $$
 declare
   var1 integer;
@@ -3085,7 +3099,6 @@ DROP event TRIGGER regress_event_trigger;
 DROP FUNCTION test_event_trigger();
 drop table test_subproc_system;
 
---requite documents example
 --ok and print test_subprocproc and test_linefunc
 do $$
 declare
@@ -3530,7 +3543,7 @@ declare
     raise info '%', test_f(24.1);
  end; $$ language plisql;
 
---oracle raise error,but we sucess
+--oracle raise error,but we succeed
 CREATE TABLE mds(id integer,name varchar2(256));
 
 do $$
@@ -3757,3 +3770,123 @@ end; $$ language plisql;
 
 DROP TABLE rec_typ2;
 DROP TABLE r1;
+
+-- Test for issue #1005: subproc with local variable initialized from parameter
+-- This should not crash when the parent function is called
+
+-- Test 1: Package with private procedure that has param-initialized local var
+CREATE OR REPLACE PACKAGE test_pkg_1005 IS
+    FUNCTION get_value RETURN NUMBER;
+END test_pkg_1005;
+/
+
+CREATE OR REPLACE PACKAGE BODY test_pkg_1005 IS
+    PROCEDURE private_proc(p_val NUMBER) IS
+        v_local NUMBER := p_val;  -- local var initialized from parameter
+    BEGIN
+        NULL;  -- private_proc does nothing visible
+    END private_proc;
+
+    FUNCTION get_value RETURN NUMBER IS
+    BEGIN
+        RETURN 42;
+    END get_value;
+END test_pkg_1005;
+/
+
+-- Should return 42 without crash (private_proc is never called)
+SELECT test_pkg_1005.get_value() FROM dual;
+
+-- Test 2: Call the private procedure to verify it works when actually invoked
+CREATE OR REPLACE PACKAGE BODY test_pkg_1005 IS
+    PROCEDURE private_proc(p_val NUMBER) IS
+        v_local NUMBER := p_val;
+    BEGIN
+        RAISE INFO 'v_local=%', v_local;
+    END private_proc;
+
+    FUNCTION get_value RETURN NUMBER IS
+    BEGIN
+        private_proc(100);  -- now call private_proc
+        RETURN 42;
+    END get_value;
+END test_pkg_1005;
+/
+
+-- Should print v_local=100 and return 42
+SELECT test_pkg_1005.get_value() FROM dual;
+
+DROP PACKAGE test_pkg_1005;
+
+-- Test 3: Standalone function with nested procedure (not in package)
+CREATE OR REPLACE FUNCTION test_func_1005(p_input NUMBER) RETURN NUMBER AS
+    v_result NUMBER := 0;
+
+    PROCEDURE helper(p_val NUMBER) IS
+        v_local NUMBER := p_val;  -- local var initialized from parameter
+    BEGIN
+        v_result := v_local * 2;
+    END helper;
+BEGIN
+    helper(p_input);
+    RETURN v_result;
+END;
+/
+
+-- Should return 200 (100 * 2)
+SELECT test_func_1005(100) FROM dual;
+
+DROP FUNCTION test_func_1005;
+
+-- Test 4: Nested function with param-initialized local var that is never called
+CREATE OR REPLACE FUNCTION test_func_1005_nocall(p_input NUMBER) RETURN NUMBER AS
+    FUNCTION never_called(p_val NUMBER) RETURN NUMBER IS
+        v_local NUMBER := p_val;
+    BEGIN
+        RETURN v_local;
+    END never_called;
+BEGIN
+    -- never_called is declared but never invoked
+    RETURN p_input + 1;
+END;
+/
+
+-- Should return 101 without any issues
+SELECT test_func_1005_nocall(100) FROM dual;
+
+DROP FUNCTION test_func_1005_nocall;
+
+-- Test 5: Multiple nested subprocs with param-initialized local vars
+-- Note: func1 is intentionally not called due to issue #1124
+CREATE OR REPLACE FUNCTION test_func_1005_multi(p_input NUMBER) RETURN NUMBER AS
+    v_sum NUMBER := 0;
+
+    PROCEDURE proc1(p_val NUMBER) IS
+        v_local1 NUMBER := p_val;
+    BEGIN
+        v_sum := v_sum + v_local1;
+    END proc1;
+
+    PROCEDURE proc2(p_val NUMBER) IS
+        v_local2 NUMBER := p_val * 2;
+    BEGIN
+        v_sum := v_sum + v_local2;
+    END proc2;
+
+    FUNCTION func1(p_val NUMBER) RETURN NUMBER IS
+        v_local3 NUMBER := p_val * 3;
+    BEGIN
+        RETURN v_local3;
+    END func1;
+BEGIN
+    proc1(10);      -- v_sum = 10
+    proc2(10);      -- v_sum = 10 + 20 = 30
+    -- Not calling: v_sum := v_sum + func1(10) due to issue #1124
+    RETURN v_sum;
+END;
+/
+
+-- Should return 30 (proc1 adds 10, proc2 adds 20)
+SELECT test_func_1005_multi(10) FROM dual;
+
+DROP FUNCTION test_func_1005_multi;
diff --git a/src/pl/plisql/src/sql/plisql_nested_subproc2.sql b/src/pl/plisql/src/sql/plisql_nested_subproc2.sql
index 6494189472c..e9b37d926f4 100755
--- a/src/pl/plisql/src/sql/plisql_nested_subproc2.sql
+++ b/src/pl/plisql/src/sql/plisql_nested_subproc2.sql
@@ -24,8 +24,8 @@ end;
 create or replace function test_subproc_func(a in integer) return integer as
   mds integer;
   original integer;
-  function square(original in integer) return integer;
-  function square(original in integer) return integer
+  function square(original in out integer) return integer;
+  function square(original in out integer) return integer
   AS
        original_squared integer;
   begin
@@ -41,7 +41,7 @@ begin
 end;
 /
 
---print 100 and 10
+--print 100 and 101
 select * from test_subproc_func(23);
 drop function test_subproc_func(integer);
 
@@ -175,10 +175,8 @@ begin
 
 --subproc use global variable
 --print we are in main function
---res = 45 a square function assign 11
+--res = 121 a square function assign 45
 --
---there originial not like oracle
---for out argmuments
 declare
   mds varchar(256);
   originial integer;
@@ -192,7 +190,7 @@ declare
        raise info '%', mds;
        mds := 'a square function assign';
        original := 45;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 'we are in main function';
@@ -699,7 +697,7 @@ begin
 end;
 /
 
----global variable the name as local variable
+---global variable has same name as local variable
 --test ok
 create or replace function test_subproc_func(a in out integer) return integer AS
   mds integer;
@@ -717,7 +715,7 @@ create or replace function test_subproc_func(a in out integer) return integer AS
 	   raise info 'local var a = %',a;
 	   raise info 'global a = %', test_subproc_func.a;
        original := original_squared + 1;
-       --return original_squared;
+       return original_squared;
    end;
 begin
     mds := 10;
@@ -736,7 +734,7 @@ select * from test_subproc_func(21);
 drop function test_subproc_func(integer);
 set ivorysql.allow_out_parameter_const = false;
 
---function the name as global variable
+--function has same name as global variable
 --test failed
 declare
   mds integer;
@@ -758,12 +756,12 @@ end;
 --print var = (1,101)  var2=(2,102)
 declare
   salary integer;
-  var2 record;
+  var2 integer;
   id integer;
-  function test_out(id in out integer, salary out integer) return record
+  function test_out(id in out integer, salary out integer) return integer
   IS
-       var1 record;
-       function test_out(id in out integer,salary out integer) return record
+       var1 integer;
+       function test_out(id in out integer,salary out integer) return integer
        IS
        declare
             var2 integer;
@@ -771,14 +769,14 @@ declare
 	     salary := 101;
 	     var2 := id + 2;
 	     id := 1;
-	     --return var2;
+	     return var2;
 	end;
    begin
      var1 := test_out(id, salary);
 	 raise info 'var=%', var1;
 	 salary := 102;
 	 id := 2;
-	 --return var1;
+	 return var1;
    end;
 begin
     var2 := test_out(id, salary);
@@ -787,12 +785,6 @@ end;
 /
 
 --ok
---this because out parameter we have don't handle
--- so it doesn't like oracle
--- test out name=must be assign to null
--- test_out.test_out name=must be assign to null
--- name1= must be assign to null
--- declare name=must be assign to null
 declare
   name varchar(256);
   id integer;
@@ -822,7 +814,7 @@ begin
  /
 
 
----schema function and subproc function as the same name
+---schema function and subproc function has the same name
 create or replace function test_subproc(id integer) return integer
 AS
    var1 integer;
@@ -880,7 +872,7 @@ drop function test_subproc(integer);
 create type test_subproc_type as (id integer,name varchar(23));
 
 --test ok
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 declare
     var1 test_subproc_type;
     function test_subproc(id integer) return test_subproc_type
@@ -888,7 +880,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 return var1;
     end;
 begin
@@ -898,7 +890,7 @@ end;
 /
 
 --print id = (1, "welcome to beiing")
---print var1=(23, "a object type")
+--print var1=(23, "an object type")
 declare
     var1 test_subproc_type;
     function test_subproc(id test_subproc_type) return test_subproc_type
@@ -906,7 +898,7 @@ declare
         var1 test_subproc_type;
     begin
          var1.id := 23;
-	 var1.name := 'a object type';
+	 var1.name := 'an object type';
 	 raise info 'id = %',id;
 	 return var1;
     end;
@@ -1697,10 +1689,10 @@ end;
 --print id=46,name=before function
 --ret = (46, "test a nocopy")
 declare
-   ret record;
+   ret integer;
    out_var integer;
    name varchar(256);
-   function square(id out nocopy integer, name in out nocopy varchar) return record
+   function square(id out nocopy integer, name in out nocopy varchar) return integer
    IS
      var1 integer;
    begin
@@ -1708,7 +1700,7 @@ declare
      id := var1 + 23;
      raise info 'id=%,name=%', id,name;
      name := 'test a nocopy';
-     --return var1;
+     return var1;
    end;
 begin
   name := 'before function';
@@ -1777,7 +1769,7 @@ begin
 end;
 /
 
---define before declare faield
+--define before declare failed
 declare
    function mds(id integer) return integer IS
       var1 integer;
@@ -1879,9 +1871,9 @@ END;
 
 --
 --
--- subproc function support polymorphic type
+-- subproc function supports polymorphic type
 --
---point raise error others is ok
+--point raise error, others is ok
 DECLARE
    var1 integer;
    var2 number;
@@ -2056,23 +2048,32 @@ END;
 
 DECLARE
    r record;
+   var1 _int4;
+   var2 _number;
+   var3 _point;
    function f1(a anyelement, b anyarray,
                    c anycompatible, d anycompatible,
                    x OUT anyarray, y OUT anycompatiblearray) RETURN record
-	as
+	AS
+      r record;
 	begin
 	  x := a || b;
 	  y := array[c, d];
+	  RETURN r;
 	end;
 begin
-	r := f1(11, array[1, 2], 42, 34.5, NULL,NULL);
+	r := f1(11, array[1, 2], 42, 34.5, var1, var2);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2], point(1,2), point(3,4), NULL,NULL);
+	raise info '%-%',var1, var2;
+	r := f1(11, array[1, 2], point(1,2), point(3,4), var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, '{1,2}', point(1,2), '(3,4)', NULL,NULL);
+	raise info '%-%',var1, var3;
+	r := f1(11, '{1,2}', point(1,2), '(3,4)', var1,var3);
 	raise info 'r=%',r;
-	r := f1(11, array[1, 2.2], 42, 34.5, NULL,NULL);  -- fail
+	raise info '%-%',var1, var3;
+	r := f1(11, array[1, 2.2], 42, 34.5, var1,var2);  -- fail
 	raise info 'r=%',r;
+	raise info '%-%',var1, var2;
 END;
 /
 
@@ -2082,45 +2083,56 @@ END;
 --
 DECLARE
    var1 integer;
+   var2 integer;
    function f1(i IN int, j out int) RETURN integer is
    begin
      j := i+1;
-     return;
+     RETURN 23;
    end;
 BEGIN
-  raise info '%', f1(42, 23);
-  SELECT f1(42,23) INTO var1;
-  raise info '%', var1;
+  raise info '%', f1(42, var1);
+  SELECT f1(42,var2) INTO var1;
+  raise info '%-%', var1, var2;
 end;
 /
 
 declare
-  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN record is
+  var1 _int4;
+  var2 _text;
+  var3 integer;
+  var4 text;
+  function duplic(i IN anyelement, j out anyelement, k out anyarray) RETURN integer is
    begin
 	  j := i;
 	  k := array[j,j];
-	  return;
+	  RETURN 23;
   end;
 BEGIN
-  raise info '%,%',duplic(42,45,NULL), duplic('foo'::text,'45',NULL);
+  raise info '%,%',duplic(42,var3,var1), duplic('foo'::text,var4,var2);
+  raise info '%-%', var1, var3;
+  raise info '%-%', var4, var2;
 END;
 /
 
 declare
-    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN record as
+    var1 integer;
+	var2 _int4;
+    function duplic(i IN anycompatiblerange, j out anycompatible, k out anycompatiblearray) RETURN integer as
 	begin
 		j := lower(i);
 		k := array[lower(i),upper(i)];
-		return;
+		RETURN 23;
 	end;
 BEGIN
-	raise info '%,%',duplic(int4range(42,49), NULL,NULL),duplic(int4range('23', '45'), NULL,NULL);
+	raise info '%',duplic(int4range(42,49), var1,var2);
+	raise info '%-%', var1, var2;
+	raise info '%', duplic(int4range('23', '45'), var1,var2);
+	raise info '%-%', var1, var2;
 end;
 /
 
 
---test extral
---error test_f is is out of scope
+--error test_f is out of scope
 declare
   var1 integer;
   function test_f(id integer,name varchar2) return integer IS
@@ -2239,7 +2251,7 @@ end;
 /
 
 
---oracle raise error,but we success
+--oracle raise error,but we succeed
 declare
   var1 integer;
   function test_f(id integer,name varchar2) return integer is
@@ -2268,7 +2280,7 @@ end;
 /
 
 
---oracle raiser error,but we sucess
+--oracle raiser error,but we succeed
 create or replace function test_f(id integer) return integer as
   function test_f(id integer) return integer is
   begin
@@ -2290,7 +2302,7 @@ DROP FUNCTION test_f(integer);
 --var1 = 23:23
 declare
   var1 integer;
-  function test_f(id integer) return integer is
+  function test_f(id out integer) return integer is
   begin
     id := 23;
 	var1 := id;
@@ -2394,11 +2406,11 @@ declare
   function test_f(id integer default 23,id2 out integer) return integer is
   begin
     id2 := id;
-    --return id;
+    return id;
   end;
 begin
   var1 := test_f(23,var2);
-  raise info 'var1=%', var1;
+  raise info 'var1=%, var2=%', var1, var2;
 end;
 /
 
@@ -2408,6 +2420,7 @@ declare
   function test_f(id out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2432,6 +2445,7 @@ declare
   function test_f(id in out nocopy integer) return integer is
   begin
    id := 23;
+   RETURN 24;
   end;
 begin
   var1 := test_f(var1);
@@ -2462,7 +2476,7 @@ begin
 end;
 /
 
---dynamic include subproc function ok var1=25
+--dynamically include subproc function ok var1=25
 declare
   var1 integer;
   function test_f(id integer) return integer IS
@@ -2616,7 +2630,7 @@ begin
 end;
 /
 
---oracle failed, but we sucess
+--oracle failed, but we succeed
 declare
   var1 integer;
   function test_f(id integer) return integer;
@@ -2662,7 +2676,7 @@ begin
 end;
 /
 
---surcess
+--success
 declare
   var1 integer;
 begin
@@ -2692,7 +2706,7 @@ begin
 end;
 /
 
---sucess
+--success
 declare
   var1 integer;
 begin
@@ -2732,7 +2746,7 @@ BEGIN
 end;
 /
 
---oracle failed,but we sucess
+--oracle failed,but we succeed
 DECLARE
 	type integer;
 begin
@@ -2754,7 +2768,7 @@ begin
 end;
 /
 
---oracle failed,but we success
+--oracle failed,but we succeed
 declare
   var1 integer;
   var2 integer;
@@ -2937,7 +2951,6 @@ DROP event TRIGGER regress_event_trigger;
 DROP FUNCTION test_event_trigger();
 drop table test_subproc_system;
 
---requite documents example
 --ok and print test_subprocproc and test_linefunc
 declare
   mds integer;
@@ -3356,7 +3369,7 @@ declare
  end;
  /
 
---oracle raise error,but we sucess
+--oracle raise error,but we succeed
 CREATE TABLE mds(id integer,name varchar2(256));
 
 DECLARE
diff --git a/src/pl/plisql/src/sql/plisql_out_parameter.sql b/src/pl/plisql/src/sql/plisql_out_parameter.sql
index d8e4b307ede..9b09e14f646 100644
--- a/src/pl/plisql/src/sql/plisql_out_parameter.sql
+++ b/src/pl/plisql/src/sql/plisql_out_parameter.sql
@@ -164,22 +164,6 @@ begin
 end;
 /
 
-declare
-  id integer;
-  name1 varchar(256);
-  name2 varchar(256);
-  ret integer;
-begin
-  id := 24;
-  ret = 0;
-  name1 := 'could not change';
-  name2 := 'could change';
-  ret = test_inchange(id,name1,name2);
-end;
-/
-
-drop function test_inchange(integer,varchar,varchar);
-
 
 --report error when IN OUT paramater has default value
 create or replace function test_return_inout(id integer,price in out integer default 100,name out varchar) return varchar 
diff --git a/src/pl/plisql/src/sql/plisql_simple.sql b/src/pl/plisql/src/sql/plisql_simple.sql
index b67c0da4299..3354994ce42 100755
--- a/src/pl/plisql/src/sql/plisql_simple.sql
+++ b/src/pl/plisql/src/sql/plisql_simple.sql
@@ -125,3 +125,79 @@ begin
  raise notice 'val = %', val;
 end; $$;
 
+-- Check SELECT INTO with parenthesized expressions (IvorySQL issue #981)
+
+do $$
+declare
+ x int := 50;
+ result numeric;
+begin
+ -- Test parenthesized expression at start of SELECT list
+ select (100 - x) * 0.01 into result from dual;
+ raise notice 'Test 1 (parentheses): %', result;
+
+ -- Test without parentheses (should still work)
+ select 100 - x into result from dual;
+ raise notice 'Test 2 (no parentheses): %', result;
+
+ -- Test multiple parenthesized expressions
+ select (100 - x) * (0.01 + x) into result from dual;
+ raise notice 'Test 3 (multiple parentheses): %', result;
+
+ -- Test nested parentheses
+ select ((100 - x) * 0.01) into result from dual;
+ raise notice 'Test 4 (nested parentheses): %', result;
+end; $$;
+
+-- Edge case: nested SELECT with parenthesized expressions
+do $$
+declare
+ result int;
+begin
+ select (select (10 + 5) from dual) into result from dual;
+ raise notice 'Nested SELECT: %', result;
+end; $$;
+
+-- Edge case: function call in parentheses (not just arithmetic)
+create function test_func(int) returns int language plisql
+as $$begin return $1 * 2; end$$;
+/
+
+do $$
+declare
+ result int;
+begin
+ select (test_func(25)) into result from dual;
+ raise notice 'Function in parens: %', result;
+end; $$;
+
+-- Edge case: CASE expression in parentheses
+do $$
+declare
+ x int := 10;
+ result int;
+begin
+ select (case when x > 5 then x * 2 else x end) into result from dual;
+ raise notice 'CASE in parens: %', result;
+end; $$;
+
+-- Edge case: SELECT with CAST in parentheses
+do $$
+declare
+ result varchar;
+begin
+ select (cast(123 as varchar)) into result from dual;
+ raise notice 'CAST in parens: %', result;
+end; $$;
+
+-- Edge case: Complex nested expression
+do $$
+declare
+ x int := 10;
+ y int := 5;
+ result numeric;
+begin
+ select ((x + y) * (x - y)) / 2.0 into result from dual;
+ raise notice 'Complex expression: %', result;
+end; $$;
+
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 558c764aadb..d7c8917f822 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -62,7 +62,7 @@ endif
 
 REGRESS_OPTS = --dbname=$(PL_TESTDB) --dlpath=$(top_builddir)/src/test/regress
 REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \
-	plperl_elog plperl_util plperl_init plperlu plperl_array \
+	plperl_elog plperl_unicode plperl_util plperl_init plperlu plperl_array \
 	plperl_call plperl_transaction plperl_env
 # if Perl can support two interpreters in one backend,
 # test plperl-and-plperlu cases
diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
index a6d35cb79c4..3f9449a9659 100644
--- a/src/pl/plperl/expected/plperl_elog.out
+++ b/src/pl/plperl/expected/plperl_elog.out
@@ -97,16 +97,3 @@ NOTICE:  caught die
                    2
 (1 row)
 
--- Test non-ASCII error messages
---
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
-SET client_encoding TO UTF8;
-create or replace function error_with_nbsp() returns void language plperl as $$
-  elog(ERROR, "this message contains a no-break space");
-$$;
-select error_with_nbsp();
-ERROR:  this message contains a no-break space at line 2.
-CONTEXT:  PL/Perl function "error_with_nbsp"
diff --git a/src/pl/plperl/expected/plperl_elog_1.out b/src/pl/plperl/expected/plperl_elog_1.out
index 85aa460ec4c..34d5d5836da 100644
--- a/src/pl/plperl/expected/plperl_elog_1.out
+++ b/src/pl/plperl/expected/plperl_elog_1.out
@@ -97,16 +97,3 @@ NOTICE:  caught die
                    2
 (1 row)
 
--- Test non-ASCII error messages
---
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
-SET client_encoding TO UTF8;
-create or replace function error_with_nbsp() returns void language plperl as $$
-  elog(ERROR, "this message contains a no-break space");
-$$;
-select error_with_nbsp();
-ERROR:  this message contains a no-break space at line 2.
-CONTEXT:  PL/Perl function "error_with_nbsp"
diff --git a/src/pl/plperl/expected/plperl_unicode.out b/src/pl/plperl/expected/plperl_unicode.out
new file mode 100644
index 00000000000..3c48f2e9611
--- /dev/null
+++ b/src/pl/plperl/expected/plperl_unicode.out
@@ -0,0 +1,18 @@
+-- Test non-ASCII error messages
+--
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+SET client_encoding TO UTF8;
+create or replace function error_with_nbsp() returns void language plperl as $$
+  elog(ERROR, "this message contains a no-break space");
+$$;
+select error_with_nbsp();
+ERROR:  this message contains a no-break space at line 2.
+CONTEXT:  PL/Perl function "error_with_nbsp"
diff --git a/src/pl/plperl/expected/plperl_unicode_1.out b/src/pl/plperl/expected/plperl_unicode_1.out
new file mode 100644
index 00000000000..761de04b1ee
--- /dev/null
+++ b/src/pl/plperl/expected/plperl_unicode_1.out
@@ -0,0 +1,10 @@
+-- Test non-ASCII error messages
+--
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/pl/plperl/meson.build b/src/pl/plperl/meson.build
index b463d4d56c5..e77679b451b 100644
--- a/src/pl/plperl/meson.build
+++ b/src/pl/plperl/meson.build
@@ -88,6 +88,7 @@ tests += {
       'plperl_trigger',
       'plperl_shared',
       'plperl_elog',
+      'plperl_unicode',
       'plperl_util',
       'plperl_init',
       'plperlu',
diff --git a/src/pl/plperl/po/es.po b/src/pl/plperl/po/es.po
index 4846603c139..a54ee0afc75 100644
--- a/src/pl/plperl/po/es.po
+++ b/src/pl/plperl/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plperl (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:39+0000\n"
+"POT-Creation-Date: 2026-02-06 23:09+0000\n"
 "PO-Revision-Date: 2024-11-16 14:24+0100\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -20,150 +20,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: plperl.c:405
+#: plperl.c:407
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr "Si es verdadero, se compilará código Perl confiable y no confiable en modo «strict»."
 
-#: plperl.c:419
+#: plperl.c:421
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "Código Perl de inicialización a ejecutar cuando un intérprete Perl es inicializado."
 
-#: plperl.c:441
+#: plperl.c:443
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "Código Perl de inicialización a ejecutar cuando plperl se usa por primera vez."
 
-#: plperl.c:449
+#: plperl.c:451
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "Código Perl de inicialización a ejecutar cuando plperlu se usa por primera vez."
 
-#: plperl.c:643
+#: plperl.c:645
 #, c-format
 msgid "cannot allocate multiple Perl interpreters on this platform"
 msgstr "no se pueden instanciar múltiples intérpretes Perl en esta plataforma"
 
-#: plperl.c:666 plperl.c:850 plperl.c:856 plperl.c:973 plperl.c:985
-#: plperl.c:1028 plperl.c:1051 plperl.c:2151 plperl.c:2259 plperl.c:2327
-#: plperl.c:2390
+#: plperl.c:668 plperl.c:852 plperl.c:858 plperl.c:975 plperl.c:987
+#: plperl.c:1030 plperl.c:1053 plperl.c:2152 plperl.c:2260 plperl.c:2328
+#: plperl.c:2391
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:667
+#: plperl.c:669
 #, c-format
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "mientras se ejecutaba PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:851
+#: plperl.c:853
 #, c-format
 msgid "while parsing Perl initialization"
 msgstr "mientras se interpretaba la inicialización de Perl"
 
-#: plperl.c:857
+#: plperl.c:859
 #, c-format
 msgid "while running Perl initialization"
 msgstr "mientras se ejecutaba la inicialización de Perl"
 
-#: plperl.c:974
+#: plperl.c:976
 #, c-format
 msgid "while executing PLC_TRUSTED"
 msgstr "mientras se ejecutaba PLC_TRUSTED"
 
-#: plperl.c:986
+#: plperl.c:988
 #, c-format
 msgid "while executing utf8fix"
 msgstr "mientras se ejecutaba utf8fix"
 
-#: plperl.c:1029
+#: plperl.c:1031
 #, c-format
 msgid "while executing plperl.on_plperl_init"
 msgstr "mientras se ejecutaba plperl.on_plperl_init"
 
-#: plperl.c:1052
+#: plperl.c:1054
 #, c-format
 msgid "while executing plperl.on_plperlu_init"
 msgstr "mientras se ejecutaba plperl.on_plperlu_init"
 
-#: plperl.c:1098 plperl.c:1804
+#: plperl.c:1100 plperl.c:1806
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "el hash de Perl contiene el columna inexistente «%s»"
 
-#: plperl.c:1103 plperl.c:1809
+#: plperl.c:1105 plperl.c:1811
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "no se puede definir el atributo de sistema «%s»"
 
-#: plperl.c:1199 plperl.c:1214 plperl.c:1231
+#: plperl.c:1201 plperl.c:1216 plperl.c:1233
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "los arrays multidimensionales deben tener expresiones de arrays con dimensiones coincidentes"
 
-#: plperl.c:1204
+#: plperl.c:1206
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "el número de dimensiones del array excede el máximo permitido (%d)"
 
-#: plperl.c:1274
+#: plperl.c:1276
 #, c-format
 msgid "cannot convert Perl array to non-array type %s"
 msgstr "no se puede convertir un array de Perl al tipo no-array %s"
 
-#: plperl.c:1375
+#: plperl.c:1377
 #, c-format
 msgid "cannot convert Perl hash to non-composite type %s"
 msgstr "no se puede convertir un hash de Perl al tipo no compuesto %s"
 
-#: plperl.c:1397 plperl.c:3315
+#: plperl.c:1399 plperl.c:3316
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "se llamó una función que retorna un registro en un contexto que no puede aceptarlo"
 
-#: plperl.c:1458
+#: plperl.c:1460
 #, c-format
 msgid "lookup failed for type %s"
 msgstr "búsqueda del tipo %s falló"
 
-#: plperl.c:1779
+#: plperl.c:1781
 #, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} no existe"
 
-#: plperl.c:1783
+#: plperl.c:1785
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} no es una referencia a un hash"
 
-#: plperl.c:1814
+#: plperl.c:1816
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "no se puede definir la columna generada «%s»"
 
-#: plperl.c:2026 plperl.c:2867
+#: plperl.c:2027 plperl.c:2865
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "las funciones en PL/Perl no pueden retornar el tipo %s"
 
-#: plperl.c:2039 plperl.c:2906
+#: plperl.c:2040 plperl.c:2904
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funciones de PL/Perl no pueden aceptar el tipo %s"
 
-#: plperl.c:2156
+#: plperl.c:2157
 #, 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:2247
+#: plperl.c:2248
 #, 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:2291 plperl.c:2358
+#: plperl.c:2292 plperl.c:2359
 #, c-format
 msgid "couldn't fetch $_TD"
 msgstr "no se pudo obtener $_TD"
 
-#: plperl.c:2315 plperl.c:2378
+#: plperl.c:2316 plperl.c:2379
 #, 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"
@@ -183,47 +183,47 @@ msgstr "se requiere un nodo «materialize», pero no está permitido en este con
 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:2606
+#: plperl.c:2605
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando la tupla modificada en el disparador DELETE"
 
-#: plperl.c:2614
+#: plperl.c:2613
 #, 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:2862
+#: plperl.c:2860
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plperl.c:3220
+#: plperl.c:3221
 #, c-format
 msgid "query result has too many rows to fit in a Perl array"
 msgstr "el resultado de la consulta tiene demasiados registros y no entran en un array de Perl"
 
-#: plperl.c:3292
+#: plperl.c:3293
 #, 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:3366
+#: plperl.c:3367
 #, 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:4148
+#: plperl.c:4149
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "función PL/Perl «%s»"
 
-#: plperl.c:4160
+#: plperl.c:4161
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilación de la función PL/Perl «%s»"
 
-#: plperl.c:4169
+#: plperl.c:4170
 #, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "bloque de código anónimo de PL/Perl"
diff --git a/src/pl/plperl/po/ru.po b/src/pl/plperl/po/ru.po
index 8b47276a620..20aabd70405 100644
--- a/src/pl/plperl/po/ru.po
+++ b/src/pl/plperl/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plperl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2024-09-04 20:00+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -17,90 +17,90 @@ msgstr ""
 "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"
 
-#: plperl.c:405
+#: plperl.c:407
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Если этот параметр равен true, доверенный и недоверенный код Perl будет "
 "компилироваться в строгом режиме."
 
-#: plperl.c:419
+#: plperl.c:421
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
 "Код инициализации Perl, который выполняется при инициализации интерпретатора "
 "Perl."
 
-#: plperl.c:441
+#: plperl.c:443
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr ""
 "Код инициализации Perl, который выполняется один раз, при первом "
 "использовании plperl."
 
-#: plperl.c:449
+#: plperl.c:451
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr ""
 "Код инициализации Perl, который выполняется один раз, при первом "
 "использовании plperlu."
 
-#: plperl.c:643
+#: plperl.c:645
 #, c-format
 msgid "cannot allocate multiple Perl interpreters on this platform"
 msgstr "на этой платформе нельзя запустить множество интерпретаторов Perl"
 
-#: plperl.c:666 plperl.c:850 plperl.c:856 plperl.c:973 plperl.c:985
-#: plperl.c:1028 plperl.c:1051 plperl.c:2151 plperl.c:2259 plperl.c:2327
-#: plperl.c:2390
+#: plperl.c:668 plperl.c:852 plperl.c:858 plperl.c:975 plperl.c:987
+#: plperl.c:1030 plperl.c:1053 plperl.c:2152 plperl.c:2260 plperl.c:2328
+#: plperl.c:2391
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:667
+#: plperl.c:669
 #, c-format
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "при выполнении PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:851
+#: plperl.c:853
 #, c-format
 msgid "while parsing Perl initialization"
 msgstr "при разборе параметров инициализации Perl"
 
-#: plperl.c:857
+#: plperl.c:859
 #, c-format
 msgid "while running Perl initialization"
 msgstr "при выполнении инициализации Perl"
 
-#: plperl.c:974
+#: plperl.c:976
 #, c-format
 msgid "while executing PLC_TRUSTED"
 msgstr "при выполнении PLC_TRUSTED"
 
-#: plperl.c:986
+#: plperl.c:988
 #, c-format
 msgid "while executing utf8fix"
 msgstr "при выполнении utf8fix"
 
-#: plperl.c:1029
+#: plperl.c:1031
 #, c-format
 msgid "while executing plperl.on_plperl_init"
 msgstr "при выполнении plperl.on_plperl_init"
 
-#: plperl.c:1052
+#: plperl.c:1054
 #, c-format
 msgid "while executing plperl.on_plperlu_init"
 msgstr "при выполнении plperl.on_plperlu_init"
 
-#: plperl.c:1098 plperl.c:1804
+#: plperl.c:1100 plperl.c:1806
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl-хеш содержит несуществующий столбец \"%s\""
 
-#: plperl.c:1103 plperl.c:1809
+#: plperl.c:1105 plperl.c:1811
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "присвоить значение системному атрибуту \"%s\" нельзя"
 
-#: plperl.c:1199 plperl.c:1214 plperl.c:1231
+#: plperl.c:1201 plperl.c:1216 plperl.c:1233
 #, c-format
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
@@ -108,74 +108,74 @@ msgstr ""
 "для многомерных массивов должны задаваться выражения с соответствующими "
 "размерностями"
 
-#: plperl.c:1204
+#: plperl.c:1206
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "число размерностей массива превышает предел (%d)"
 
-#: plperl.c:1274
+#: plperl.c:1276
 #, c-format
 msgid "cannot convert Perl array to non-array type %s"
 msgstr "Perl-массив нельзя преобразовать в тип не массива %s"
 
-#: plperl.c:1375
+#: plperl.c:1377
 #, c-format
 msgid "cannot convert Perl hash to non-composite type %s"
 msgstr "Perl-хеш нельзя преобразовать в не составной тип %s"
 
-#: plperl.c:1397 plperl.c:3315
+#: plperl.c:1399 plperl.c:3316
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
 
-#: plperl.c:1458
+#: plperl.c:1460
 #, c-format
 msgid "lookup failed for type %s"
 msgstr "найти тип %s не удалось"
 
-#: plperl.c:1779
+#: plperl.c:1781
 #, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} не существует"
 
-#: plperl.c:1783
+#: plperl.c:1785
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} - не ссылка на хеш"
 
-#: plperl.c:1814
+#: plperl.c:1816
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "присвоить значение генерируемому столбцу \"%s\" нельзя"
 
-#: plperl.c:2026 plperl.c:2867
+#: plperl.c:2027 plperl.c:2865
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "функции PL/Perl не могут возвращать тип %s"
 
-#: plperl.c:2039 plperl.c:2906
+#: plperl.c:2040 plperl.c:2904
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "функции PL/Perl не могут принимать тип %s"
 
-#: plperl.c:2156
+#: plperl.c:2157
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "не удалось получить ссылку на код после компиляции функции \"%s\""
 
-#: plperl.c:2247
+#: plperl.c:2248
 #, c-format
 msgid "didn't get a return item from function"
 msgstr "не удалось получить возвращаемый элемент от функции"
 
-#: plperl.c:2291 plperl.c:2358
+#: plperl.c:2292 plperl.c:2359
 #, c-format
 msgid "couldn't fetch $_TD"
 msgstr "не удалось получить $_TD"
 
-#: plperl.c:2315 plperl.c:2378
+#: plperl.c:2316 plperl.c:2379
 #, c-format
 msgid "didn't get a return item from trigger function"
 msgstr "не удалось получить возвращаемый элемент от триггерной функции"
@@ -200,12 +200,12 @@ msgstr ""
 "функция PL/Perl, возвращающая множество, должна возвращать ссылку на массив "
 "или вызывать return_next"
 
-#: plperl.c:2606
+#: plperl.c:2605
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "в триггере DELETE изменённая строка игнорируется"
 
-#: plperl.c:2614
+#: plperl.c:2613
 #, c-format
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
@@ -213,24 +213,24 @@ msgstr ""
 "результатом триггерной функции PL/Perl должен быть undef, \"SKIP\" или "
 "\"MODIFY\""
 
-#: plperl.c:2862
+#: plperl.c:2860
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызываться только в триггерах"
 
-#: plperl.c:3220
+#: plperl.c:3221
 #, c-format
 msgid "query result has too many rows to fit in a Perl array"
 msgstr ""
 "результат запроса содержит слишком много строк для передачи в массиве Perl"
 
-#: plperl.c:3292
+#: plperl.c:3293
 #, c-format
 msgid "cannot use return_next in a non-SETOF function"
 msgstr ""
 "return_next можно использовать только в функциях, возвращающих множества"
 
-#: plperl.c:3366
+#: plperl.c:3367
 #, c-format
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
@@ -239,17 +239,17 @@ msgstr ""
 "функция PL/Perl, возвращающая составное множество, должна вызывать "
 "return_next со ссылкой на хеш"
 
-#: plperl.c:4148
+#: plperl.c:4149
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "функция PL/Perl \"%s\""
 
-#: plperl.c:4160
+#: plperl.c:4161
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "компиляция функции PL/Perl \"%s\""
 
-#: plperl.c:4169
+#: plperl.c:4170
 #, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "анонимный блок кода PL/Perl"
diff --git a/src/pl/plperl/po/sv.po b/src/pl/plperl/po/sv.po
index f16de78b9df..386746d06a1 100644
--- a/src/pl/plperl/po/sv.po
+++ b/src/pl/plperl/po/sv.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 17:39+0000\n"
-"PO-Revision-Date: 2024-07-12 22:07+0200\n"
+"PO-Revision-Date: 2025-07-29 19:46+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/pl/plperl/po/uk.po b/src/pl/plperl/po/uk.po
index fcb64b7d80a..5b91d1ecc91 100644
--- a/src/pl/plperl/po/uk.po
+++ b/src/pl/plperl/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-24 00:09+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:39+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,153 +14,153 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/plperl.pot\n"
-"X-Crowdin-File-ID: 1012\n"
+"X-Crowdin-File: /REL_18_STABLE/plperl.pot\n"
+"X-Crowdin-File-ID: 1095\n"
 
-#: plperl.c:405
+#: plperl.c:407
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr "Якщо увімкнено, надійний і ненадійний код Perl буде скомпільований в суворому режимі."
 
-#: plperl.c:419
+#: plperl.c:421
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "Виконати ініціалізаційний код під час ініціалізації інтерпретатора Perl."
 
-#: plperl.c:441
+#: plperl.c:443
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "Виконати код ініціалізації один раз під час першого використання plperl."
 
-#: plperl.c:449
+#: plperl.c:451
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "Виконати код ініціалізації один раз під час першого використання plperlu."
 
-#: plperl.c:643
+#: plperl.c:645
 #, c-format
 msgid "cannot allocate multiple Perl interpreters on this platform"
 msgstr "не можна розмістити декілька Perl інтерпретаторів на цій платформі"
 
-#: plperl.c:666 plperl.c:850 plperl.c:856 plperl.c:973 plperl.c:985
-#: plperl.c:1028 plperl.c:1051 plperl.c:2151 plperl.c:2259 plperl.c:2327
-#: plperl.c:2390
+#: plperl.c:668 plperl.c:852 plperl.c:858 plperl.c:975 plperl.c:987
+#: plperl.c:1030 plperl.c:1053 plperl.c:2152 plperl.c:2260 plperl.c:2328
+#: plperl.c:2391
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:667
+#: plperl.c:669
 #, c-format
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "під час виконання PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:851
+#: plperl.c:853
 #, c-format
 msgid "while parsing Perl initialization"
 msgstr "під час обробки ініціалізації Perl"
 
-#: plperl.c:857
+#: plperl.c:859
 #, c-format
 msgid "while running Perl initialization"
 msgstr "під час запуску Perl ініціалізації"
 
-#: plperl.c:974
+#: plperl.c:976
 #, c-format
 msgid "while executing PLC_TRUSTED"
 msgstr "під час виконання PLC_TRUSTED"
 
-#: plperl.c:986
+#: plperl.c:988
 #, c-format
 msgid "while executing utf8fix"
 msgstr "під час виконання utf8fix"
 
-#: plperl.c:1029
+#: plperl.c:1031
 #, c-format
 msgid "while executing plperl.on_plperl_init"
 msgstr "під час виконання plperl.on_plperl_init"
 
-#: plperl.c:1052
+#: plperl.c:1054
 #, c-format
 msgid "while executing plperl.on_plperlu_init"
 msgstr "під час виконання plperl.on_plperlu_init"
 
-#: plperl.c:1098 plperl.c:1804
+#: plperl.c:1100 plperl.c:1806
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "хеш Perl містить неіснуючу колонку \"%s\""
 
-#: plperl.c:1103 plperl.c:1809
+#: plperl.c:1105 plperl.c:1811
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "не вдалося встановити системний атрибут \"%s\""
 
-#: plperl.c:1199 plperl.c:1214 plperl.c:1231
+#: plperl.c:1201 plperl.c:1216 plperl.c:1233
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "для багатовимірних масивів повинні задаватись вирази з відповідними вимірами"
 
-#: plperl.c:1204
+#: plperl.c:1206
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "кількість вимірів масиву перевищує максимально дозволену (%d)"
 
-#: plperl.c:1274
+#: plperl.c:1276
 #, c-format
 msgid "cannot convert Perl array to non-array type %s"
 msgstr "неможливо конвертувати масив Perl у тип не масиву %s"
 
-#: plperl.c:1375
+#: plperl.c:1377
 #, c-format
 msgid "cannot convert Perl hash to non-composite type %s"
 msgstr "неможливо конвертувати хеш Perl у нескладений тип %s"
 
-#: plperl.c:1397 plperl.c:3315
+#: plperl.c:1399 plperl.c:3316
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "функція, що повертає набір, викликана у контексті, що не приймає тип запис"
 
-#: plperl.c:1458
+#: plperl.c:1460
 #, c-format
 msgid "lookup failed for type %s"
 msgstr "неможливо фільтрувати для типу %s"
 
-#: plperl.c:1779
+#: plperl.c:1781
 #, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} не існує"
 
-#: plperl.c:1783
+#: plperl.c:1785
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} не є посиланням на хеш"
 
-#: plperl.c:1814
+#: plperl.c:1816
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "неможливо оновити згенерований стовпець \"%s\""
 
-#: plperl.c:2026 plperl.c:2867
+#: plperl.c:2027 plperl.c:2865
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "функції PL/Perl не можуть повертати тип %s"
 
-#: plperl.c:2039 plperl.c:2906
+#: plperl.c:2040 plperl.c:2904
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "функції PL/Perl не можуть приймати тип %s"
 
-#: plperl.c:2156
+#: plperl.c:2157
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "не отримано посилання CODE з функції компіляції \"%s\""
 
-#: plperl.c:2247
+#: plperl.c:2248
 #, c-format
 msgid "didn't get a return item from function"
 msgstr "не отримано елемент результату з функції"
 
-#: plperl.c:2291 plperl.c:2358
+#: plperl.c:2292 plperl.c:2359
 #, c-format
 msgid "couldn't fetch $_TD"
 msgstr "не вдалось отримати $_TD"
 
-#: plperl.c:2315 plperl.c:2378
+#: plperl.c:2316 plperl.c:2379
 #, c-format
 msgid "didn't get a return item from trigger function"
 msgstr "не отримано елемент результату з функції-тригеру"
@@ -180,47 +180,47 @@ msgstr "необхідний режим матеріалізації (materializ
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr "функція PL/Perl, що вертає набір значень, повинна посилатися на масив або використовувати return_next"
 
-#: plperl.c:2606
+#: plperl.c:2605
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ігнорується змінений рядок у тригері DELETE"
 
-#: plperl.c:2614
+#: plperl.c:2613
 #, c-format
 msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr "результат тригерної функції PL/Perl повинен бути undef, \"SKIP\" або \"MODIFY\""
 
-#: plperl.c:2862
+#: plperl.c:2860
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "тригер-функція може викликатися лише як тригер"
 
-#: plperl.c:3220
+#: plperl.c:3221
 #, c-format
 msgid "query result has too many rows to fit in a Perl array"
 msgstr "результат запиту має забагато рядків для відповідності в масиві Perl"
 
-#: plperl.c:3292
+#: plperl.c:3293
 #, c-format
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "не можна використовувати return_next в функціях, що не повертають набори даних"
 
-#: plperl.c:3366
+#: plperl.c:3367
 #, c-format
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr "Функція PL/Perl, що повертає набір композитних даних, повинна викликати return_next з посиланням на хеш"
 
-#: plperl.c:4148
+#: plperl.c:4149
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "PL/Perl функція \"%s\""
 
-#: plperl.c:4160
+#: plperl.c:4161
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "компіляція функції PL/Perl \"%s\""
 
-#: plperl.c:4169
+#: plperl.c:4170
 #, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "анонімний блок коду PL/Perl"
diff --git a/src/pl/plperl/sql/plperl_elog.sql b/src/pl/plperl/sql/plperl_elog.sql
index 9ea1350069b..032fd8b8ba7 100644
--- a/src/pl/plperl/sql/plperl_elog.sql
+++ b/src/pl/plperl/sql/plperl_elog.sql
@@ -76,18 +76,3 @@ return $a + $b;
 $$;
 
 select indirect_die_caller();
-
--- Test non-ASCII error messages
---
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
-
-SET client_encoding TO UTF8;
-
-create or replace function error_with_nbsp() returns void language plperl as $$
-  elog(ERROR, "this message contains a no-break space");
-$$;
-
-select error_with_nbsp();
diff --git a/src/pl/plperl/sql/plperl_unicode.sql b/src/pl/plperl/sql/plperl_unicode.sql
new file mode 100644
index 00000000000..7e1ad745cdd
--- /dev/null
+++ b/src/pl/plperl/sql/plperl_unicode.sql
@@ -0,0 +1,19 @@
+-- Test non-ASCII error messages
+--
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+SET client_encoding TO UTF8;
+
+create or replace function error_with_nbsp() returns void language plperl as $$
+  elog(ERROR, "this message contains a no-break space");
+$$;
+
+select error_with_nbsp();
diff --git a/src/pl/plpgsql/src/expected/plpgsql_domain.out b/src/pl/plpgsql/src/expected/plpgsql_domain.out
index 516c2b9e08e..11c012ea024 100644
--- a/src/pl/plpgsql/src/expected/plpgsql_domain.out
+++ b/src/pl/plpgsql/src/expected/plpgsql_domain.out
@@ -395,3 +395,16 @@ SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
  {"(1,2)"}
 (1 row)
 
+CREATE FUNCTION test_null_ordered_named_pair()
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair;
+begin
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_null_ordered_named_pair();
+ i | j 
+---+---
+   |  
+(1 row)
+
diff --git a/src/pl/plpgsql/src/expected/plpgsql_trap.out b/src/pl/plpgsql/src/expected/plpgsql_trap.out
index 62d1679c28f..c37ac3b5c69 100644
--- a/src/pl/plpgsql/src/expected/plpgsql_trap.out
+++ b/src/pl/plpgsql/src/expected/plpgsql_trap.out
@@ -138,13 +138,11 @@ select * from foo;
 drop table foo;
 create function trap_timeout() returns void as $$
 begin
-  declare x int;
   begin
-    -- we assume this will take longer than 1 second:
-    select count(*) into x from generate_series(1, 1_000_000_000_000);
+    perform pg_sleep(10);
   exception
     when others then
-      raise notice 'caught others?';
+      raise notice 'caught others: %', sqlerrm;
     when query_canceled then
       raise notice 'nyeah nyeah, can''t stop me';
   end;
@@ -157,7 +155,7 @@ set statement_timeout to 1000;
 select trap_timeout();
 NOTICE:  nyeah nyeah, can't stop me
 ERROR:  end of function
-CONTEXT:  PL/pgSQL function trap_timeout() line 15 at RAISE
+CONTEXT:  PL/pgSQL function trap_timeout() line 13 at RAISE
 rollback;
 -- Test for pass-by-ref values being stored in proper context
 create function test_variable_storage() returns text as $$
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index bb99781c56e..756d5f7778d 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3256,28 +3256,14 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 				}
 				break;
 
-			case PLPGSQL_DTYPE_REC:
-				{
-					PLpgSQL_rec *rec = (PLpgSQL_rec *) retvar;
-
-					/* If record is empty, we return NULL not a row of nulls */
-					if (rec->erh && !ExpandedRecordIsEmpty(rec->erh))
-					{
-						estate->retval = ExpandedRecordGetDatum(rec->erh);
-						estate->retisnull = false;
-						estate->rettype = rec->rectypeid;
-					}
-				}
-				break;
-
 			case PLPGSQL_DTYPE_ROW:
+			case PLPGSQL_DTYPE_REC:
 				{
-					PLpgSQL_row *row = (PLpgSQL_row *) retvar;
+					/* exec_eval_datum can handle these cases */
 					int32		rettypmod;
 
-					/* We get here if there are multiple OUT parameters */
 					exec_eval_datum(estate,
-									(PLpgSQL_datum *) row,
+									retvar,
 									&estate->rettype,
 									&rettypmod,
 									&estate->retval,
@@ -5703,7 +5689,7 @@ exec_eval_expr(PLpgSQL_execstate *estate,
 	/*
 	 * Else do it the hard way via exec_run_select
 	 */
-	rc = exec_run_select(estate, expr, 2, NULL);
+	rc = exec_run_select(estate, expr, 0, NULL);
 	if (rc != SPI_OK_SELECT)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -5757,6 +5743,10 @@ exec_eval_expr(PLpgSQL_execstate *estate,
 
 /* ----------
  * exec_run_select			Execute a select query
+ *
+ * Note: passing maxtuples different from 0 ("return all tuples") is
+ * deprecated because it will prevent parallel execution of the query.
+ * However, we retain the parameter in case we need it someday.
  * ----------
  */
 static int
diff --git a/src/pl/plpgsql/src/po/es.po b/src/pl/plpgsql/src/po/es.po
index c045415aa32..e20f2d44d96 100644
--- a/src/pl/plpgsql/src/po/es.po
+++ b/src/pl/plpgsql/src/po/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:39+0000\n"
+"POT-Creation-Date: 2026-02-06 23:09+0000\n"
 "PO-Revision-Date: 2024-11-16 14:24+0100\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -23,174 +23,169 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: BlackCAT 1.1\n"
 
-#: pl_comp.c:434 pl_handler.c:496
+#: pl_comp.c:329 pl_handler.c:496
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "las funciones PL/pgSQL no pueden aceptar el tipo %s"
 
-#: pl_comp.c:526
+#: pl_comp.c:421
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "no se pudo determinar el verdadero tipo de resultado para la función polimórfica «%s»"
 
-#: pl_comp.c:556
+#: pl_comp.c:451
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones de disparador sólo pueden ser invocadas como disparadores"
 
-#: pl_comp.c:560 pl_handler.c:480
+#: pl_comp.c:455 pl_handler.c:480
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "las funciones PL/pgSQL no pueden retornar el tipo %s"
 
-#: pl_comp.c:600
+#: pl_comp.c:495
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "las funciones de disparador no pueden tener argumentos declarados"
 
-#: pl_comp.c:601
+#: pl_comp.c:496
 #, c-format
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Los argumentos del disparador pueden accederse usando TG_NARGS y TG_ARGV."
 
-#: pl_comp.c:734
+#: pl_comp.c:629
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "las funciones de disparador por eventos no pueden tener argumentos declarados"
 
-#: pl_comp.c:998
+#: pl_comp.c:906
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilación de la función PL/pgSQL «%s» cerca de la línea %d"
 
-#: pl_comp.c:1021
+#: pl_comp.c:929
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "el nombre de parámetro «%s» fue usado más de una vez"
 
-#: pl_comp.c:1135
+#: pl_comp.c:1043
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la referencia a la columna «%s» es ambigua"
 
-#: pl_comp.c:1137
+#: pl_comp.c:1045
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Podría referirse tanto a una variable PL/pgSQL como a una columna de una tabla."
 
-#: pl_comp.c:1314 pl_exec.c:5260 pl_exec.c:5433 pl_exec.c:5520 pl_exec.c:5611
-#: pl_exec.c:6636
+#: pl_comp.c:1222 pl_exec.c:5252 pl_exec.c:5425 pl_exec.c:5512 pl_exec.c:5603
+#: pl_exec.c:6800
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "el registro «%s» no tiene un campo «%s»"
 
-#: pl_comp.c:1633 pl_gram.y:645 pl_gram.y:660 pl_gram.y:686
+#: pl_comp.c:1541 pl_gram.y:665 pl_gram.y:680 pl_gram.y:706
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "no existe la variable «%s»"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1630
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "no existe la columna «%s» en la relación «%s»"
 
-#: pl_comp.c:1775
+#: pl_comp.c:1683
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: pl_comp.c:1782 pl_comp.c:1820
+#: pl_comp.c:1690 pl_comp.c:1728
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "la relación «%s» no contiene un tipo compuesto"
 
-#: pl_comp.c:1886
+#: pl_comp.c:1794
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable «%s» tiene pseudotipo %s"
 
-#: pl_comp.c:2075
+#: pl_comp.c:1983
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
 
-#: pl_comp.c:2157 pl_exec.c:6937
+#: pl_comp.c:2065 pl_exec.c:7101
 #, c-format
 msgid "type %s is not composite"
 msgstr "el tipo %s no es compuesto"
 
-#: pl_comp.c:2193
+#: pl_comp.c:2101
 #, 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"
 
-#: pl_comp.c:2232 pl_comp.c:2285
+#: pl_comp.c:2140 pl_comp.c:2189
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "no se reconoce la condición de excepción «%s»"
 
-#: pl_comp.c:2514
-#, 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»"
-
-#: pl_exec.c:512 pl_exec.c:951 pl_exec.c:1186
+#: pl_exec.c:523 pl_exec.c:963 pl_exec.c:1198
 msgid "during initialization of execution state"
 msgstr "durante la inicialización del estado de ejecución"
 
-#: pl_exec.c:518
+#: pl_exec.c:529
 msgid "while storing call arguments into local variables"
 msgstr "mientras se almacenaban los argumentos de invocación en variables locales"
 
-#: pl_exec.c:606 pl_exec.c:1024
+#: pl_exec.c:618 pl_exec.c:1036
 msgid "during function entry"
 msgstr "durante el ingreso a la función"
 
-#: pl_exec.c:629
+#: pl_exec.c:641
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "la ejecución alcanzó el fin de la función sin encontrar RETURN"
 
-#: pl_exec.c:635
+#: pl_exec.c:647
 msgid "while casting return value to function's return type"
 msgstr "mientras se hacía la conversión del valor de retorno al tipo de retorno de la función"
 
-#: pl_exec.c:647 pl_exec.c:3683
+#: pl_exec.c:659 pl_exec.c:3695
 #, 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"
 
-#: pl_exec.c:652 pl_exec.c:3689
+#: pl_exec.c:664 pl_exec.c:3701
 #, 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"
 
-#: pl_exec.c:779 pl_exec.c:1050 pl_exec.c:1208
+#: pl_exec.c:791 pl_exec.c:1062 pl_exec.c:1220
 msgid "during function exit"
 msgstr "durante la salida de la función"
 
-#: pl_exec.c:834 pl_exec.c:898 pl_exec.c:3482
+#: pl_exec.c:846 pl_exec.c:910 pl_exec.c:3494
 msgid "returned record type does not match expected record type"
 msgstr "el tipo de registro retornado no coincide con el tipo de registro esperado"
 
-#: pl_exec.c:1047 pl_exec.c:1205
+#: pl_exec.c:1059 pl_exec.c:1217
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
 
-#: pl_exec.c:1055
+#: pl_exec.c:1067
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "los procedimientos disparadores no pueden retornar conjuntos"
 
-#: pl_exec.c:1094 pl_exec.c:1122
+#: pl_exec.c:1106 pl_exec.c:1134
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "la estructura de fila retornada no coincide con la estructura de la tabla que generó el evento de disparador"
 
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:1263
+#: pl_exec.c:1275
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "función PL/pgSQL %s en la línea %d %s"
@@ -198,336 +193,336 @@ msgstr "función PL/pgSQL %s en la línea %d %s"
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:1274
+#: pl_exec.c:1286
 #, c-format
 msgid "PL/pgSQL function %s %s"
 msgstr "función PL/pgSQL %s %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:1282
+#: pl_exec.c:1294
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "función PL/pgSQL %s en la línea %d en %s"
 
-#: pl_exec.c:1288
+#: pl_exec.c:1300
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "función PL/pgSQL %s"
 
-#: pl_exec.c:1659
+#: pl_exec.c:1671
 msgid "during statement block local variable initialization"
 msgstr "durante inicialización de variables locales en el bloque de sentencias"
 
-#: pl_exec.c:1764
+#: pl_exec.c:1776
 msgid "during statement block entry"
 msgstr "durante la entrada al bloque de sentencias"
 
-#: pl_exec.c:1796
+#: pl_exec.c:1808
 msgid "during statement block exit"
 msgstr "durante la salida del bloque de sentencias"
 
-#: pl_exec.c:1834
+#: pl_exec.c:1846
 msgid "during exception cleanup"
 msgstr "durante la finalización por excepción"
 
-#: pl_exec.c:2370
+#: pl_exec.c:2382
 #, c-format
 msgid "procedure parameter \"%s\" is an output parameter but corresponding argument is not writable"
 msgstr "el parámetro de procedimiento «%s» es un parámetro de salida pero el argumento correspondiente no es escribible"
 
-#: pl_exec.c:2375
+#: pl_exec.c:2387
 #, c-format
 msgid "procedure parameter %d is an output parameter but corresponding argument is not writable"
 msgstr "el parámetro de procedimiento %d es un parámetro de salida pero el argumento correspondiente no es escribible"
 
-#: pl_exec.c:2411
+#: pl_exec.c:2423
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr "GET STACKED DIAGNOSTICS no puede ser usado fuera de un manejador de excepción"
 
-#: pl_exec.c:2617
+#: pl_exec.c:2629
 #, c-format
 msgid "case not found"
 msgstr "caso no encontrado"
 
-#: pl_exec.c:2618
+#: pl_exec.c:2630
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "A la sentencia CASE le falta la parte ELSE."
 
-#: pl_exec.c:2711
+#: pl_exec.c:2723
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "el límite inferior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:2727
+#: pl_exec.c:2739
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "el límite superior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:2745
+#: pl_exec.c:2757
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "el valor BY de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:2751
+#: pl_exec.c:2763
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "el valor BY de un ciclo FOR debe ser mayor que cero"
 
-#: pl_exec.c:2885 pl_exec.c:4693
+#: pl_exec.c:2897 pl_exec.c:4699
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "el cursor «%s» ya está en uso"
 
-#: pl_exec.c:2908 pl_exec.c:4763
+#: pl_exec.c:2920 pl_exec.c:4769
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "se dieron argumentos a un cursor sin argumentos"
 
-#: pl_exec.c:2927 pl_exec.c:4782
+#: pl_exec.c:2939 pl_exec.c:4788
 #, c-format
 msgid "arguments required for cursor"
 msgstr "se requieren argumentos para el cursor"
 
-#: pl_exec.c:3018
+#: pl_exec.c:3030
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "la expresión FOREACH no debe ser nula"
 
-#: pl_exec.c:3033
+#: pl_exec.c:3045
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "una expresión FOREACH debe retornar un array, no tipo %s"
 
-#: pl_exec.c:3050
+#: pl_exec.c:3062
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "la dimensión del slice (%d) está fuera de rango 0..%d"
 
-#: pl_exec.c:3077
+#: pl_exec.c:3089
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "las variables de bucles FOREACH ... SLICE deben ser de un tipo array"
 
-#: pl_exec.c:3081
+#: pl_exec.c:3093
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "la variable de bucle FOREACH no debe ser de tipo array"
 
-#: pl_exec.c:3243 pl_exec.c:3300 pl_exec.c:3475
+#: pl_exec.c:3255 pl_exec.c:3312 pl_exec.c:3487
 #, c-format
 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:3339 pl_gram.y:3375
+#: pl_exec.c:3351 pl_gram.y:3444
 #, 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"
 
-#: pl_exec.c:3380 pl_exec.c:3512
+#: pl_exec.c:3392 pl_exec.c:3524
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "se pasó un tipo incorrecto de resultado a RETURN NEXT"
 
-#: pl_exec.c:3418 pl_exec.c:3439
+#: pl_exec.c:3430 pl_exec.c:3451
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "se pasó un tipo de registro incorrecto a RETURN NEXT"
 
-#: pl_exec.c:3531
+#: pl_exec.c:3543
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT debe tener un parámetro"
 
-#: pl_exec.c:3559 pl_gram.y:3439
+#: pl_exec.c:3571 pl_gram.y:3508
 #, 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"
 
-#: pl_exec.c:3577
+#: pl_exec.c:3589
 msgid "structure of query does not match function result type"
 msgstr "la estructura de la consulta no coincide con el tipo del resultado de la función"
 
-#: pl_exec.c:3632 pl_exec.c:4469 pl_exec.c:8759
+#: pl_exec.c:3644 pl_exec.c:4475 pl_exec.c:8988
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "el argumento de consulta a ejecutar en EXECUTE es null"
 
-#: pl_exec.c:3717 pl_exec.c:3855
+#: pl_exec.c:3729 pl_exec.c:3867
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "la opción de RAISE ya se especificó: %s"
 
-#: pl_exec.c:3751
+#: pl_exec.c:3763
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
 
-#: pl_exec.c:3845
+#: pl_exec.c:3857
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "la opción de sentencia en RAISE no puede ser null"
 
-#: pl_exec.c:3915
+#: pl_exec.c:3927
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3970
+#: pl_exec.c:3982
 #, c-format
 msgid "assertion failed"
 msgstr "aseveración falló"
 
-#: pl_exec.c:4342 pl_exec.c:4532
+#: pl_exec.c:4348 pl_exec.c:4538
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "no se puede ejecutar COPY desde/a un cliente en PL/pgSQL"
 
-#: pl_exec.c:4348
+#: pl_exec.c:4354
 #, c-format
 msgid "unsupported transaction command in PL/pgSQL"
 msgstr "orden de transacción no soportada en PL/pgSQL"
 
-#: pl_exec.c:4371 pl_exec.c:4561
+#: pl_exec.c:4377 pl_exec.c:4567
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO es utilizado con una orden que no puede retornar datos"
 
-#: pl_exec.c:4394 pl_exec.c:4584
+#: pl_exec.c:4400 pl_exec.c:4590
 #, c-format
 msgid "query returned no rows"
 msgstr "la consulta no regresó filas"
 
-#: pl_exec.c:4416 pl_exec.c:4603 pl_exec.c:5755
+#: pl_exec.c:4422 pl_exec.c:4609 pl_exec.c:5747
 #, c-format
 msgid "query returned more than one row"
 msgstr "la consulta regresó más de una fila"
 
-#: pl_exec.c:4418
+#: pl_exec.c:4424
 #, c-format
 msgid "Make sure the query returns a single row, or use LIMIT 1."
 msgstr "Asegúrese que la consulta retorne una única fila, o use LIMIT 1."
 
-#: pl_exec.c:4434
+#: pl_exec.c:4440
 #, c-format
 msgid "query has no destination for result data"
 msgstr "la consulta no tiene un destino para los datos de resultado"
 
-#: pl_exec.c:4435
+#: pl_exec.c:4441
 #, c-format
 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:4524
+#: pl_exec.c:4530
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "no está implementado EXECUTE de un SELECT ... INTO"
 
-#: pl_exec.c:4525
+#: pl_exec.c:4531
 #, c-format
 msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
 msgstr "Puede desear usar EXECUTE ... INTO o EXECUTE CREATE TABLE ... AS en su lugar."
 
-#: pl_exec.c:4538
+#: pl_exec.c:4544
 #, c-format
 msgid "EXECUTE of transaction commands is not implemented"
 msgstr "no está implementado EXECUTE de órdenes de transacción"
 
-#: pl_exec.c:4848 pl_exec.c:4936
+#: pl_exec.c:4854 pl_exec.c:4942
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variable cursor «%s» es null"
 
-#: pl_exec.c:4859 pl_exec.c:4947
+#: pl_exec.c:4865 pl_exec.c:4953
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: pl_exec.c:4872
+#: pl_exec.c:4878
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "la posición relativa o absoluta del cursor es null"
 
-#: pl_exec.c:5110 pl_exec.c:5205
+#: pl_exec.c:5102 pl_exec.c:5197
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "no puede asignarse un valor null a la variable «%s» que fue declarada NOT NULL"
 
-#: pl_exec.c:5186
+#: pl_exec.c:5178
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "no se puede asignar un valor no compuesto a una variable de tipo row"
 
-#: pl_exec.c:5218
+#: pl_exec.c:5210
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "no se puede asignar un valor no compuesto a una variable de tipo record"
 
-#: pl_exec.c:5269
+#: pl_exec.c:5261
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "no se puede asignar a la columna de sistema «%s»"
 
-#: pl_exec.c:5718
+#: pl_exec.c:5710
 #, c-format
 msgid "query did not return data"
 msgstr "la consulta no retornó datos"
 
-#: pl_exec.c:5719 pl_exec.c:5731 pl_exec.c:5756 pl_exec.c:5832 pl_exec.c:5837
+#: pl_exec.c:5711 pl_exec.c:5723 pl_exec.c:5748 pl_exec.c:5828 pl_exec.c:5833
 #, c-format
 msgid "query: %s"
 msgstr "consulta: %s"
 
-#: pl_exec.c:5727
+#: pl_exec.c:5719
 #, c-format
 msgid "query returned %d column"
 msgid_plural "query returned %d columns"
 msgstr[0] "la consulta retornó %d columna"
 msgstr[1] "la consulta retornó %d columnas"
 
-#: pl_exec.c:5831
+#: pl_exec.c:5827
 #, c-format
 msgid "query is SELECT INTO, but it should be plain SELECT"
 msgstr "la consulta es SELECT INTO, pero debería ser un SELECT simple"
 
-#: pl_exec.c:5836
+#: pl_exec.c:5832
 #, c-format
 msgid "query is not a SELECT"
 msgstr "la consulta no es un SELECT"
 
-#: pl_exec.c:6650 pl_exec.c:6690 pl_exec.c:6730
+#: pl_exec.c:6814 pl_exec.c:6854 pl_exec.c:6894
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "el tipo del parámetro %d (%s) no coincide aquel con que fue preparado el plan (%s)"
 
-#: pl_exec.c:7141 pl_exec.c:7175 pl_exec.c:7249 pl_exec.c:7275
+#: pl_exec.c:7305 pl_exec.c:7339 pl_exec.c:7413 pl_exec.c:7439
 #, c-format
 msgid "number of source and target fields in assignment does not match"
 msgstr "no coincide el número de campos de origen y destino en la asignación"
 
 #. translator: %s represents a name of an extra check
-#: pl_exec.c:7143 pl_exec.c:7177 pl_exec.c:7251 pl_exec.c:7277
+#: pl_exec.c:7307 pl_exec.c:7341 pl_exec.c:7415 pl_exec.c:7441
 #, c-format
 msgid "%s check of %s is active."
 msgstr "El chequeo %s de %s está activo."
 
-#: pl_exec.c:7147 pl_exec.c:7181 pl_exec.c:7255 pl_exec.c:7281
+#: pl_exec.c:7311 pl_exec.c:7345 pl_exec.c:7419 pl_exec.c:7445
 #, c-format
 msgid "Make sure the query returns the exact list of columns."
 msgstr "Asegúrese que la consulta retorna la lista exacta de columnas."
 
-#: pl_exec.c:7668
+#: pl_exec.c:7832
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "el registro «%s» no ha sido asignado aún"
 
-#: pl_exec.c:7669
+#: pl_exec.c:7833
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "La estructura de fila de un registro aún no asignado no está determinado."
 
-#: pl_exec.c:8357 pl_gram.y:3498
+#: pl_exec.c:8586 pl_gram.y:3567
 #, c-format
 msgid "variable \"%s\" is declared CONSTANT"
 msgstr "la variable «%s» esta declarada como CONSTANT"
@@ -564,306 +559,306 @@ msgstr "sentencia SQL"
 msgid "FOR over EXECUTE statement"
 msgstr "bucle FOR en torno a una sentencia EXECUTE"
 
-#: pl_gram.y:485
+#: pl_gram.y:501
 #, 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:505
+#: pl_gram.y:521
 #, 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:524
+#: pl_gram.y:540
 #, c-format
 msgid "variable \"%s\" must have a default value, since it's declared NOT NULL"
 msgstr "la variable «%s» debe tener valor por omisión, puesto que está declarado NOT NULL"
 
-#: pl_gram.y:704 pl_gram.y:732
+#: pl_gram.y:724 pl_gram.y:752
 msgid "duplicate declaration"
 msgstr "declaración duplicada"
 
-#: pl_gram.y:715 pl_gram.y:743
+#: pl_gram.y:735 pl_gram.y:763
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "la variable «%s» oculta una variable definida anteriormente"
 
-#: pl_gram.y:1017
+#: pl_gram.y:1040
 #, 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:1035
+#: pl_gram.y:1058
 #, 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:1133
+#: pl_gram.y:1156
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "elemento de GET DIAGNOSTICS no reconocido"
 
-#: pl_gram.y:1149 pl_gram.y:3614
+#: pl_gram.y:1172 pl_gram.y:3685
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "«%s» no es una variable escalar"
 
-#: pl_gram.y:1379 pl_gram.y:1572
+#: pl_gram.y:1402 pl_gram.y:1595
 #, c-format
 msgid "loop variable of loop over rows must be a record variable or list of scalar variables"
 msgstr "la variable de bucle de un bucle sobre filas debe ser una variable de tipo record o una lista de variables escalares"
 
-#: pl_gram.y:1414
+#: pl_gram.y:1437
 #, 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:1421
+#: pl_gram.y:1444
 #, 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:1511
+#: pl_gram.y:1534
 #, 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:1545
+#: pl_gram.y:1568
 #, 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:1675
+#: pl_gram.y:1700
 #, 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:1717
+#: pl_gram.y:1742
 #, c-format
 msgid "there is no label \"%s\" attached to any block or loop enclosing this statement"
 msgstr "ningún bloque o bucle que contenga esta sentencia tiene una etiqueta «%s»"
 
-#: pl_gram.y:1725
+#: pl_gram.y:1750
 #, c-format
 msgid "block label \"%s\" cannot be used in CONTINUE"
 msgstr "la etiqueta de bloque «%s» no puede usarse en CONTINUE"
 
-#: pl_gram.y:1740
+#: pl_gram.y:1765
 #, c-format
 msgid "EXIT cannot be used outside a loop, unless it has a label"
 msgstr "EXIT no puede usarse fuera de un bucle, a menos que tenga una etiqueta"
 
-#: pl_gram.y:1741
+#: pl_gram.y:1766
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE no puede usarse fuera de un bucle"
 
-#: pl_gram.y:1765 pl_gram.y:1803 pl_gram.y:1851 pl_gram.y:3061 pl_gram.y:3149
-#: pl_gram.y:3260 pl_gram.y:4009
+#: pl_gram.y:1790 pl_gram.y:1828 pl_gram.y:1876 pl_gram.y:3136 pl_gram.y:3218
+#: pl_gram.y:3329 pl_gram.y:4081
 msgid "unexpected end of function definition"
 msgstr "fin inesperado de la definición de la función"
 
-#: pl_gram.y:1871 pl_gram.y:1895 pl_gram.y:1911 pl_gram.y:1917 pl_gram.y:2042
-#: pl_gram.y:2050 pl_gram.y:2064 pl_gram.y:2159 pl_gram.y:2383 pl_gram.y:2473
-#: pl_gram.y:2632 pl_gram.y:3856 pl_gram.y:3917 pl_gram.y:3990
+#: pl_gram.y:1896 pl_gram.y:1921 pl_gram.y:1937 pl_gram.y:1943 pl_gram.y:2069
+#: pl_gram.y:2077 pl_gram.y:2092 pl_gram.y:2187 pl_gram.y:2413 pl_gram.y:2503
+#: pl_gram.y:2662 pl_gram.y:3930 pl_gram.y:3994 pl_gram.y:4062
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: pl_gram.y:1899 pl_gram.y:1901 pl_gram.y:2387 pl_gram.y:2389
+#: pl_gram.y:1925 pl_gram.y:1927 pl_gram.y:2417 pl_gram.y:2419
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: pl_gram.y:2107
+#: pl_gram.y:2135
 msgid "syntax error, expected \"FOR\""
 msgstr "error de sintaxis, se esperaba «FOR»"
 
-#: pl_gram.y:2168
+#: pl_gram.y:2196
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "la sentencia FETCH no puede retornar múltiples filas"
 
-#: pl_gram.y:2265
+#: pl_gram.y:2293
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "variable de cursor debe ser una variable simple"
 
-#: pl_gram.y:2271
+#: pl_gram.y:2299
 #, 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:2603 pl_gram.y:2614
+#: pl_gram.y:2633 pl_gram.y:2644
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "«%s» no es una variable conocida"
 
-#: pl_gram.y:2719 pl_gram.y:2729 pl_gram.y:2911
+#: pl_gram.y:2799 pl_gram.y:2810 pl_gram.y:2986
 msgid "mismatched parentheses"
 msgstr "no coinciden los paréntesis"
 
-#: pl_gram.y:2733
+#: pl_gram.y:2814
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "falta «%s» al final de la expresión SQL"
 
-#: pl_gram.y:2739
+#: pl_gram.y:2820
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "falta «%s» al final de la sentencia SQL"
 
-#: pl_gram.y:2758
+#: pl_gram.y:2839
 msgid "missing expression"
 msgstr "expresión faltante"
 
-#: pl_gram.y:2760
+#: pl_gram.y:2841
 msgid "missing SQL statement"
 msgstr "sentencia SQL faltante"
 
-#: pl_gram.y:2889
+#: pl_gram.y:2964
 msgid "syntax error, expected \"]\""
 msgstr "error de sintaxis, se esperaba «]»"
 
-#: pl_gram.y:2913
+#: pl_gram.y:2988
 msgid "incomplete data type declaration"
 msgstr "declaración de tipo de dato incompleta"
 
-#: pl_gram.y:2936
+#: pl_gram.y:3011
 msgid "missing data type declaration"
 msgstr "declaración de tipo de dato faltante"
 
-#: pl_gram.y:3071
+#: pl_gram.y:3146
 msgid "INTO specified more than once"
 msgstr "INTO fue especificado más de una vez"
 
-#: pl_gram.y:3241
+#: pl_gram.y:3310
 msgid "expected FROM or IN"
 msgstr "se espera FROM o IN"
 
-#: pl_gram.y:3302
+#: pl_gram.y:3371
 #, 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:3303
+#: pl_gram.y:3372
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Use RETURN NEXT o RETURN QUERY."
 
-#: pl_gram.y:3313
+#: pl_gram.y:3382
 #, c-format
 msgid "RETURN cannot have a parameter in a procedure"
 msgstr "RETURN no puede tener un parámetro un procedimiento"
 
-#: pl_gram.y:3318
+#: pl_gram.y:3387
 #, 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:3327
+#: pl_gram.y:3396
 #, 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:3390
+#: pl_gram.y:3459
 #, 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:3556
+#: pl_gram.y:3625
 #, c-format
 msgid "record variable cannot be part of multiple-item INTO list"
 msgstr "una variable de tipo record no puede ser parte de una lista INTO de múltiples elementos"
 
-#: pl_gram.y:3602
+#: pl_gram.y:3673
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "se especificaron demasiadas variables INTO"
 
-#: pl_gram.y:3810
+#: pl_gram.y:3884
 #, c-format
 msgid "end label \"%s\" specified for unlabeled block"
 msgstr "etiqueta de término «%s» especificada para un bloque sin etiqueta"
 
-#: pl_gram.y:3817
+#: pl_gram.y:3891
 #, 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:3851
+#: pl_gram.y:3925
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "el cursor «%s» no tiene argumentos"
 
-#: pl_gram.y:3865
+#: pl_gram.y:3939
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "el cursor «%s» tiene argumentos"
 
-#: pl_gram.y:3907
+#: pl_gram.y:3984
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "el cursor «%s» no tiene un argumento llamado «%s»"
 
-#: pl_gram.y:3927
+#: pl_gram.y:4004
 #, 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:3948
+#: pl_gram.y:4026
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "no hay suficientes argumentos para el cursor «%s»"
 
-#: pl_gram.y:3955
+#: pl_gram.y:4033
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "demasiados argumentos para el cursor «%s»"
 
-#: pl_gram.y:4041
+#: pl_gram.y:4113
 msgid "unrecognized RAISE statement option"
 msgstr "no se reconoce la opción de sentencia RAISE"
 
-#: pl_gram.y:4045
+#: pl_gram.y:4117
 msgid "syntax error, expected \"=\""
 msgstr "error de sintaxis, se esperaba «=»"
 
-#: pl_gram.y:4086
+#: pl_gram.y:4158
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "se especificaron demasiados parámetros a RAISE"
 
-#: pl_gram.y:4090
+#: pl_gram.y:4162
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "se especificaron muy pocos parámetros a RAISE"
 
-#: pl_handler.c:156
+#: pl_handler.c:159
 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:165
+#: pl_handler.c:168
 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:173
+#: pl_handler.c:176
 msgid "Perform checks given in ASSERT statements."
 msgstr "Ejecuta las verificaciones en sentencias ASSERT."
 
-#: pl_handler.c:181
+#: pl_handler.c:184
 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:191
+#: pl_handler.c:194
 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:525
+#: pl_scanner.c:543
 #, 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:541
+#: pl_scanner.c:559
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
diff --git a/src/pl/plpgsql/src/po/ja.po b/src/pl/plpgsql/src/po/ja.po
index 7d36ec1a178..58194d8d925 100644
--- a/src/pl/plpgsql/src/po/ja.po
+++ b/src/pl/plpgsql/src/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL 17)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-01-09 10:23+0900\n"
-"PO-Revision-Date: 2024-01-09 13:27+0900\n"
+"POT-Creation-Date: 2025-07-01 09:33+0900\n"
+"PO-Revision-Date: 2025-07-01 10:00+0900\n"
 "Last-Translator: Kyotaro Horiguchi <horikyota.ntt@gmail.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "Language: ja\n"
@@ -18,164 +18,173 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.13\n"
 
-#: pl_comp.c:434 pl_handler.c:496
+#: pl_comp.c:329 pl_handler.c:496
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "PL/pgSQL 関数では %s 型は指定できません"
 
-#: pl_comp.c:526
+#: pl_comp.c:421
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "多相関数\"%s\"の実際の戻り値の型を特定できませんでした"
 
-#: pl_comp.c:556
+#: pl_comp.c:451
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: pl_comp.c:560 pl_handler.c:480
+#: pl_comp.c:455 pl_handler.c:480
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "PL/pgSQL 関数は %s 型を返せません"
 
-#: pl_comp.c:600
+#: pl_comp.c:495
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "トリガー関数には引数を宣言できません"
 
-#: pl_comp.c:601
+#: pl_comp.c:496
 #, c-format
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "その代わり、トリガーの引数には TG_NARGS と TG_ARGV を通してのみアクセスできます"
 
-#: pl_comp.c:734
+#: pl_comp.c:629
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "イベントトリガー関数では引数を宣言できません"
 
-#: pl_comp.c:998
+#: pl_comp.c:906
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目付近でのコンパイル"
 
-#: pl_comp.c:1021
+#: pl_comp.c:929
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "パラメータ \"%s\" が複数指定されました"
 
-#: pl_comp.c:1135
+#: pl_comp.c:1043
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "列参照 \"%s\" が一意に特定できません"
 
-#: pl_comp.c:1137
+#: pl_comp.c:1045
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "PL/pgSQL 変数もしくはテーブルのカラム名のどちらかを参照していた可能性があります。"
 
-#: pl_comp.c:1314 pl_exec.c:5255 pl_exec.c:5428 pl_exec.c:5515 pl_exec.c:5606
-#: pl_exec.c:6624
+#: pl_comp.c:1227
 #, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "レコード \"%s\" には項目 \"%s\" はありません"
+msgid "field name \"%s\" is a reserved key word"
+msgstr "フィールド名\"%s\"は予約キーワードです"
 
-#: pl_comp.c:1795
+#: pl_comp.c:1229
+#, c-format
+msgid "Use double quotes to quote it."
+msgstr "二重引用符で囲ってください。"
+
+#: pl_comp.c:1546 pl_gram.y:665 pl_gram.y:680 pl_gram.y:706
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "変数 \"%s\" は存在しません"
+
+#: pl_comp.c:1635
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist"
+msgstr "リレーション\"%2$s\"の列\"%1$s\"は存在しません"
+
+#: pl_comp.c:1688
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "リレーション \"%s\" がありません"
 
-#: pl_comp.c:1802 pl_comp.c:1844
+#: pl_comp.c:1695 pl_comp.c:1733
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "リレーション\"%s\"は複合型を持っていません"
 
-#: pl_comp.c:1910
+#: pl_comp.c:1799
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "変数 \"%s\" の型は擬似タイプ %s です"
 
-#: pl_comp.c:2099
+#: pl_comp.c:1988
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "型 \"%s\" はシェルでのみ使えます"
 
-#: pl_comp.c:2181 pl_exec.c:6925
+#: pl_comp.c:2070 pl_exec.c:7097
 #, c-format
 msgid "type %s is not composite"
 msgstr "型%sは複合型ではありません"
 
-#: pl_comp.c:2217
+#: pl_comp.c:2106
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "データ型%sの配列型がありませんでした"
 
-#: pl_comp.c:2256 pl_comp.c:2309
+#: pl_comp.c:2145 pl_comp.c:2194
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "例外条件 \"%s\" が認識できません"
 
-#: pl_comp.c:2538
-#, c-format
-msgid "could not determine actual argument type for polymorphic function \"%s\""
-msgstr "多相関数\"%s\"の実際の引数の型を特定できませんでした"
-
-#: pl_exec.c:511 pl_exec.c:950 pl_exec.c:1185
+#: pl_exec.c:523 pl_exec.c:963 pl_exec.c:1198
 msgid "during initialization of execution state"
 msgstr "実行状態の初期化の際"
 
-#: pl_exec.c:517
+#: pl_exec.c:529
 msgid "while storing call arguments into local variables"
 msgstr "引数をローカル変数に格納する際"
 
-#: pl_exec.c:605 pl_exec.c:1023
+#: pl_exec.c:618 pl_exec.c:1036
 msgid "during function entry"
 msgstr "関数に入る際"
 
-#: pl_exec.c:628
+#: pl_exec.c:641
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "RETURN が現れる前に、制御が関数の終わりに達しました"
 
-#: pl_exec.c:634
+#: pl_exec.c:647
 msgid "while casting return value to function's return type"
 msgstr "戻り値を関数の戻り値の型へキャストする際に"
 
-#: pl_exec.c:646 pl_exec.c:3681
+#: pl_exec.c:659 pl_exec.c:3695
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "値の集合を受け付けないようなコンテキストで、集合値を返す関数が呼ばれました"
 
-#: pl_exec.c:651 pl_exec.c:3687
+#: pl_exec.c:664 pl_exec.c:3701
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "マテリアライズモードが必要ですが、現在のコンテクストで禁止されています"
 
-#: pl_exec.c:778 pl_exec.c:1049 pl_exec.c:1207
+#: pl_exec.c:791 pl_exec.c:1062 pl_exec.c:1220
 msgid "during function exit"
 msgstr "関数を抜ける際"
 
-#: pl_exec.c:833 pl_exec.c:897 pl_exec.c:3480
+#: pl_exec.c:846 pl_exec.c:910 pl_exec.c:3494
 msgid "returned record type does not match expected record type"
 msgstr "返されたレコードの型が期待するレコードの型と一致しません"
 
-#: pl_exec.c:1046 pl_exec.c:1204
+#: pl_exec.c:1059 pl_exec.c:1217
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "RETURN が現れる前に、制御がトリガープロシージャの終わりに達しました"
 
-#: pl_exec.c:1054
+#: pl_exec.c:1067
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "トリガー手続きは集合値を返すことができません"
 
-#: pl_exec.c:1093 pl_exec.c:1121
+#: pl_exec.c:1106 pl_exec.c:1134
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "返された行の構造が、トリガーしているテーブルの構造とマッチしません"
 
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:1262
+#: pl_exec.c:1275
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "PL/pgSQL関数%sの%d行目 %s"
@@ -183,335 +192,340 @@ msgstr "PL/pgSQL関数%sの%d行目 %s"
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:1273
+#: pl_exec.c:1286
 #, 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:1281
+#: pl_exec.c:1294
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "PL/pgSQL関数%sの%d行目 - %s"
 
-#: pl_exec.c:1287
+#: pl_exec.c:1300
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "PL/pgSQL関数 %s"
 
-#: pl_exec.c:1658
+#: pl_exec.c:1671
 msgid "during statement block local variable initialization"
 msgstr "ステートメントブロックでローカル変数を初期化中"
 
-#: pl_exec.c:1763
+#: pl_exec.c:1776
 msgid "during statement block entry"
 msgstr "ステートメントブロックに入る際に"
 
-#: pl_exec.c:1795
+#: pl_exec.c:1808
 msgid "during statement block exit"
 msgstr "ステートメントブロックを抜ける際に"
 
-#: pl_exec.c:1833
+#: pl_exec.c:1846
 msgid "during exception cleanup"
 msgstr "例外をクリーンアップする際に"
 
-#: pl_exec.c:2370
+#: pl_exec.c:2382
 #, c-format
 msgid "procedure parameter \"%s\" is an output parameter but corresponding argument is not writable"
 msgstr "プロシージャのパラメータ\"%s\"は出力パラメータですが対応する引数が書き込み不可です"
 
-#: pl_exec.c:2375
+#: pl_exec.c:2387
 #, c-format
 msgid "procedure parameter %d is an output parameter but corresponding argument is not writable"
 msgstr "プロシージャのパラメータ%dは出力パラメータですが対応する引数が書き込み不可です"
 
-#: pl_exec.c:2409
+#: pl_exec.c:2423
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr "GET STACKED DIAGNOSTICS は例外ハンドラの外では使えません"
 
-#: pl_exec.c:2615
+#: pl_exec.c:2629
 #, c-format
 msgid "case not found"
 msgstr "case が見つかりません"
 
-#: pl_exec.c:2616
+#: pl_exec.c:2630
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "CASE ステートメントに ELSE 部分がありません"
 
-#: pl_exec.c:2709
+#: pl_exec.c:2723
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "FOR ループの下限を NULL にすることはできません"
 
-#: pl_exec.c:2725
+#: pl_exec.c:2739
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "FOR ループの上限を NULL にすることはできません"
 
-#: pl_exec.c:2743
+#: pl_exec.c:2757
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "FOR ループにおける BY の値を NULL にすることはできません"
 
-#: pl_exec.c:2749
+#: pl_exec.c:2763
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "FOR ループにおける BY の値はゼロより大きくなければなりません"
 
-#: pl_exec.c:2883 pl_exec.c:4688
+#: pl_exec.c:2897 pl_exec.c:4699
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "カーソル \"%s\" はすでに使われています"
 
-#: pl_exec.c:2906 pl_exec.c:4758
+#: pl_exec.c:2920 pl_exec.c:4769
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "引数なしのカーソルに引数が与えられました"
 
-#: pl_exec.c:2925 pl_exec.c:4777
+#: pl_exec.c:2939 pl_exec.c:4788
 #, c-format
 msgid "arguments required for cursor"
 msgstr "カーソルには引数が必要です"
 
-#: pl_exec.c:3016
+#: pl_exec.c:3030
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "FOREACH 式は NULL であってはなりません"
 
-#: pl_exec.c:3031
+#: pl_exec.c:3045
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "FOREACH 式は %s 型ではなく配列を生成しなければなりません"
 
-#: pl_exec.c:3048
+#: pl_exec.c:3062
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "配列の要素数 (%d) が有効範囲0から%dまでの間にありません"
 
-#: pl_exec.c:3075
+#: pl_exec.c:3089
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "FOREACH ... SLICE ループ変数は配列型でなければなりません"
 
-#: pl_exec.c:3079
+#: pl_exec.c:3093
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "FOREACH ループ変数は配列型であってはなりません"
 
-#: pl_exec.c:3241 pl_exec.c:3298 pl_exec.c:3473
+#: pl_exec.c:3255 pl_exec.c:3312 pl_exec.c:3487
 #, c-format
 msgid "cannot return non-composite value from function returning composite type"
 msgstr "複合型を返す関数から複合型以外の値を返すことはできません"
 
-#: pl_exec.c:3337 pl_gram.y:3323
+#: pl_exec.c:3351 pl_gram.y:3448
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN NEXT は使えません"
 
-#: pl_exec.c:3378 pl_exec.c:3510
+#: pl_exec.c:3392 pl_exec.c:3524
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "RETURN NEXT で指定されている結果の型が誤っています"
 
-#: pl_exec.c:3416 pl_exec.c:3437
+#: pl_exec.c:3430 pl_exec.c:3451
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "RETURN NEXT で指定されているレコードの型が誤っています"
 
-#: pl_exec.c:3529
+#: pl_exec.c:3543
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT にはパラメーターが必要です"
 
-#: pl_exec.c:3557 pl_gram.y:3387
+#: pl_exec.c:3571 pl_gram.y:3512
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN QUERY は使えません"
 
-#: pl_exec.c:3575
+#: pl_exec.c:3589
 msgid "structure of query does not match function result type"
 msgstr "問い合わせの構造が関数の結果の型と一致しません"
 
-#: pl_exec.c:3630 pl_exec.c:4465 pl_exec.c:8724
+#: pl_exec.c:3644 pl_exec.c:4475 pl_exec.c:8984
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "EXECUTE の問い合わせ文字列の引数が NULL です"
 
-#: pl_exec.c:3715 pl_exec.c:3853
+#: pl_exec.c:3729 pl_exec.c:3867
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "RAISE オプションは既に指定されています: %s"
 
-#: pl_exec.c:3749
+#: pl_exec.c:3763
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "引数の無い RAISE は、例外ハンドラの外では使えません"
 
-#: pl_exec.c:3843
+#: pl_exec.c:3857
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "RAISE ステートメントのオプションには NULL は指定できません"
 
-#: pl_exec.c:3913
+#: pl_exec.c:3927
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3968
+#: pl_exec.c:3982
 #, c-format
 msgid "assertion failed"
 msgstr "アサーションに失敗"
 
-#: pl_exec.c:4338 pl_exec.c:4527
+#: pl_exec.c:4348 pl_exec.c:4538
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "PL/pgSQL 内では COPY to/from クライアントは使えません"
 
-#: pl_exec.c:4344
+#: pl_exec.c:4354
 #, c-format
 msgid "unsupported transaction command in PL/pgSQL"
 msgstr "PL/pgSQL 内ではサポートされないトランザクションコマンド"
 
-#: pl_exec.c:4367 pl_exec.c:4556
+#: pl_exec.c:4377 pl_exec.c:4567
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "データを返せないコマンドで INTO が使われました"
 
-#: pl_exec.c:4390 pl_exec.c:4579
+#: pl_exec.c:4400 pl_exec.c:4590
 #, c-format
 msgid "query returned no rows"
 msgstr "問い合わせは行を返しませんでした"
 
-#: pl_exec.c:4412 pl_exec.c:4598 pl_exec.c:5750
+#: pl_exec.c:4422 pl_exec.c:4609 pl_exec.c:5747
 #, c-format
 msgid "query returned more than one row"
 msgstr "問い合わせが複数の行を返しました"
 
-#: pl_exec.c:4414
+#: pl_exec.c:4424
 #, c-format
 msgid "Make sure the query returns a single row, or use LIMIT 1."
 msgstr "問い合わせを1行返却するようにするか、LIMIT 1 をつけてください。"
 
-#: pl_exec.c:4430
+#: pl_exec.c:4440
 #, c-format
 msgid "query has no destination for result data"
 msgstr "問い合わせに結果データの返却先が指定されていません"
 
-#: pl_exec.c:4431
+#: pl_exec.c:4441
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "SELECT の結果を破棄したい場合、代わりに PERFORM を使ってください"
 
-#: pl_exec.c:4519
+#: pl_exec.c:4530
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "SELECT ... INTO の EXECUTE は実装されていません"
 
-#: pl_exec.c:4520
+#: pl_exec.c:4531
 #, c-format
 msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
 msgstr "代わりに EXECUTE ... INTO または EXECUTE CREATE TABLE ... AS が使えます。"
 
-#: pl_exec.c:4533
+#: pl_exec.c:4544
 #, c-format
 msgid "EXECUTE of transaction commands is not implemented"
 msgstr "トランザクションコマンドのEXECUTEは実装されていません"
 
-#: pl_exec.c:4843 pl_exec.c:4931
+#: pl_exec.c:4854 pl_exec.c:4942
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "カーソル変数 \"%s\" が NULL です"
 
-#: pl_exec.c:4854 pl_exec.c:4942
+#: pl_exec.c:4865 pl_exec.c:4953
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "カーソル \"%s\" は存在しません"
 
-#: pl_exec.c:4867
+#: pl_exec.c:4878
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "相対もしくは絶対カーソル位置が NULL です"
 
-#: pl_exec.c:5105 pl_exec.c:5200
+#: pl_exec.c:5102 pl_exec.c:5197
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NOT NULL として宣言された変数 \"%s\" には NULL を代入できません"
 
-#: pl_exec.c:5181
+#: pl_exec.c:5178
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "複合型でない値を行変数に代入できません"
 
-#: pl_exec.c:5213
+#: pl_exec.c:5210
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "複合型でない値をレコード変数に代入できません"
 
-#: pl_exec.c:5264
+#: pl_exec.c:5252 pl_exec.c:5425 pl_exec.c:5512 pl_exec.c:5603 pl_exec.c:6796
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "レコード \"%s\" には項目 \"%s\" はありません"
+
+#: pl_exec.c:5261
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "システム列\"%s\"に代入できません"
 
-#: pl_exec.c:5713
+#: pl_exec.c:5710
 #, c-format
 msgid "query did not return data"
 msgstr "問い合わせがデータを返しませんでした"
 
-#: pl_exec.c:5714 pl_exec.c:5726 pl_exec.c:5751 pl_exec.c:5827 pl_exec.c:5832
+#: pl_exec.c:5711 pl_exec.c:5723 pl_exec.c:5748 pl_exec.c:5824 pl_exec.c:5829
 #, c-format
 msgid "query: %s"
 msgstr "問い合わせ: %s"
 
-#: pl_exec.c:5722
+#: pl_exec.c:5719
 #, c-format
 msgid "query returned %d column"
 msgid_plural "query returned %d columns"
 msgstr[0] "問い合わせが%d個の列を返しました"
 
-#: pl_exec.c:5826
+#: pl_exec.c:5823
 #, c-format
 msgid "query is SELECT INTO, but it should be plain SELECT"
 msgstr "問い合わせはSELECT INTOですが、単純なSELECTでなければなりません"
 
-#: pl_exec.c:5831
+#: pl_exec.c:5828
 #, c-format
 msgid "query is not a SELECT"
 msgstr "問い合わせがSELECTではありません"
 
-#: pl_exec.c:6638 pl_exec.c:6678 pl_exec.c:6718
+#: pl_exec.c:6810 pl_exec.c:6850 pl_exec.c:6890
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "パラメータの型%d(%s)が実行計画(%s)を準備する時点と一致しません"
 
-#: pl_exec.c:7129 pl_exec.c:7163 pl_exec.c:7237 pl_exec.c:7263
+#: pl_exec.c:7301 pl_exec.c:7335 pl_exec.c:7409 pl_exec.c:7435
 #, c-format
 msgid "number of source and target fields in assignment does not match"
 msgstr "代入のソースとターゲットのフィールド数が一致していません"
 
 #. translator: %s represents a name of an extra check
-#: pl_exec.c:7131 pl_exec.c:7165 pl_exec.c:7239 pl_exec.c:7265
+#: pl_exec.c:7303 pl_exec.c:7337 pl_exec.c:7411 pl_exec.c:7437
 #, c-format
 msgid "%s check of %s is active."
 msgstr "%2$sの%1$sチェックが有効です。"
 
-#: pl_exec.c:7135 pl_exec.c:7169 pl_exec.c:7243 pl_exec.c:7269
+#: pl_exec.c:7307 pl_exec.c:7341 pl_exec.c:7415 pl_exec.c:7441
 #, c-format
 msgid "Make sure the query returns the exact list of columns."
 msgstr "問い合わせはカラムの正確なリストを返却するようにしてください。"
 
-#: pl_exec.c:7656
+#: pl_exec.c:7828
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "レコード \"%s\" にはまだ値が代入されていません"
 
-#: pl_exec.c:7657
+#: pl_exec.c:7829
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "まだ代入されていないレコードのタプル構造は不定です"
 
-#: pl_exec.c:8322 pl_gram.y:3446
+#: pl_exec.c:8582 pl_gram.y:3572
 #, c-format
 msgid "variable \"%s\" is declared CONSTANT"
 msgstr "変数\"%s\" はCONSTANTとして定義されています"
@@ -548,341 +562,306 @@ msgstr "SQL ステートメント"
 msgid "FOR over EXECUTE statement"
 msgstr "EXECUTE ステートメントを使った FOR"
 
-#: pl_gram.y:485
+#: pl_gram.y:501
 #, c-format
 msgid "block label must be placed before DECLARE, not after"
 msgstr "ブロックラベルは DECLARE の後ではなく前に置かなければなりません"
 
-#: pl_gram.y:505
+#: pl_gram.y:521
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "%s 型では照合順序はサポートされていません"
 
-#: pl_gram.y:524
+#: pl_gram.y:540
 #, c-format
 msgid "variable \"%s\" must have a default value, since it's declared NOT NULL"
 msgstr "NOT NULL宣言されているため、変数\"%s\"はデフォルト値を持つ必要があります"
 
-#: pl_gram.y:645 pl_gram.y:660 pl_gram.y:686
-#, c-format
-msgid "variable \"%s\" does not exist"
-msgstr "変数 \"%s\" は存在しません"
-
-#: pl_gram.y:704 pl_gram.y:732
+#: pl_gram.y:724 pl_gram.y:752
 msgid "duplicate declaration"
 msgstr "重複した宣言です。"
 
-#: pl_gram.y:715 pl_gram.y:743
+#: pl_gram.y:735 pl_gram.y:763
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "変数 \"%s\" が事前に定義された変数を不可視にしています"
 
-#: pl_gram.y:1017
+#: pl_gram.y:1040
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
 msgstr "GET STACKED DIAGNOSTICS では診断項目 %s は許可されていません"
 
-#: pl_gram.y:1035
+#: pl_gram.y:1058
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
 msgstr "GET CURRENT DIAGNOSTICS では診断項目 %s は許可されていません"
 
-#: pl_gram.y:1133
+#: pl_gram.y:1156
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "GET DIAGNOSTICS 項目が認識できません"
 
-#: pl_gram.y:1149 pl_gram.y:3562
+#: pl_gram.y:1172 pl_gram.y:3690
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" はスカラー変数ではありません"
 
-#: pl_gram.y:1379 pl_gram.y:1573
+#: pl_gram.y:1403 pl_gram.y:1596
 #, c-format
 msgid "loop variable of loop over rows must be a record variable or list of scalar variables"
 msgstr "行に対するループでのループ変数は、レコード変数またはスカラー変数のリストでなければなりません"
 
-#: pl_gram.y:1414
+#: pl_gram.y:1438
 #, c-format
 msgid "cursor FOR loop must have only one target variable"
 msgstr "カーソルを使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: pl_gram.y:1421
+#: pl_gram.y:1445
 #, c-format
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "カーソルを使った FOR ループでは、それに関連付けられたカーソル変数を使用しなければなりません"
 
-#: pl_gram.y:1512
+#: pl_gram.y:1535
 #, c-format
 msgid "integer FOR loop must have only one target variable"
 msgstr "整数を使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: pl_gram.y:1546
+#: pl_gram.y:1569
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "問い合わせを使った FOR ループの中では REVERSE は指定できません"
 
-#: pl_gram.y:1676
+#: pl_gram.y:1701
 #, c-format
 msgid "loop variable of FOREACH must be a known variable or list of variables"
 msgstr "FOREACH のループ変数は、既知の変数または変数のリストでなければなりません"
 
-#: pl_gram.y:1718
+#: pl_gram.y:1743
 #, c-format
 msgid "there is no label \"%s\" attached to any block or loop enclosing this statement"
 msgstr "このステートメントを囲むブロックやループに割り当てられた \"%s\" というラベルはありません。"
 
-#: pl_gram.y:1726
+#: pl_gram.y:1751
 #, c-format
 msgid "block label \"%s\" cannot be used in CONTINUE"
 msgstr "ブロックラベル \"%s\" は CONTINUE の中では使えません。"
 
-#: pl_gram.y:1741
+#: pl_gram.y:1766
 #, c-format
 msgid "EXIT cannot be used outside a loop, unless it has a label"
 msgstr "ラベルのない EXIT は、ループの外では使えません"
 
-#: pl_gram.y:1742
+#: pl_gram.y:1767
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE はループの外では使えません"
 
-#: pl_gram.y:1766 pl_gram.y:1804 pl_gram.y:1852 pl_gram.y:3009 pl_gram.y:3097
-#: pl_gram.y:3208 pl_gram.y:3961
+#: pl_gram.y:1791 pl_gram.y:1829 pl_gram.y:1877 pl_gram.y:3140 pl_gram.y:3222
+#: pl_gram.y:3333 pl_gram.y:4086
 msgid "unexpected end of function definition"
 msgstr "予期しない関数定義の終端に達しました"
 
-#: pl_gram.y:1872 pl_gram.y:1896 pl_gram.y:1912 pl_gram.y:1918 pl_gram.y:2043
-#: pl_gram.y:2051 pl_gram.y:2065 pl_gram.y:2160 pl_gram.y:2384 pl_gram.y:2474
-#: pl_gram.y:2633 pl_gram.y:3804 pl_gram.y:3865 pl_gram.y:3942
+#: pl_gram.y:1897 pl_gram.y:1922 pl_gram.y:1938 pl_gram.y:1944 pl_gram.y:2070
+#: pl_gram.y:2078 pl_gram.y:2093 pl_gram.y:2189 pl_gram.y:2415 pl_gram.y:2505
+#: pl_gram.y:2666 pl_gram.y:3935 pl_gram.y:3999 pl_gram.y:4067
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: pl_gram.y:1900 pl_gram.y:1902 pl_gram.y:2388 pl_gram.y:2390
+#: pl_gram.y:1926 pl_gram.y:1928 pl_gram.y:2419 pl_gram.y:2421
 msgid "invalid SQLSTATE code"
 msgstr "無効な SQLSTATE コードです"
 
-#: pl_gram.y:2108
+#: pl_gram.y:2136
 msgid "syntax error, expected \"FOR\""
 msgstr "構文エラー。\"FOR\" が現れるべきでした。"
 
-#: pl_gram.y:2169
+#: pl_gram.y:2198
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH ステートメントは複数行を返せません"
 
-#: pl_gram.y:2266
+#: pl_gram.y:2295
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "カーソル変数は単純変数でなければなりません"
 
-#: pl_gram.y:2272
+#: pl_gram.y:2301
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "変数 \"%s\" は cursor 型または refcursor 型でなければなりません"
 
-#: pl_gram.y:2604 pl_gram.y:2615
+#: pl_gram.y:2637 pl_gram.y:2648
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" は既知の変数ではありません"
 
-#: pl_gram.y:2721 pl_gram.y:2731 pl_gram.y:2914
+#: pl_gram.y:2803 pl_gram.y:2814 pl_gram.y:2990
 msgid "mismatched parentheses"
 msgstr "括弧が対応していません"
 
-#: pl_gram.y:2735
+#: pl_gram.y:2818
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "SQL 表現式の終わりに \"%s\" がありません"
 
-#: pl_gram.y:2741
+#: pl_gram.y:2824
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "SQL ステートメントの終わりに \"%s\" がありません"
 
-#: pl_gram.y:2758
+#: pl_gram.y:2843
 msgid "missing expression"
 msgstr "表現式がありません"
 
-#: pl_gram.y:2760
+#: pl_gram.y:2845
 msgid "missing SQL statement"
 msgstr "SQL ステートメントがありません"
 
-#: pl_gram.y:2892
+#: pl_gram.y:2968
 msgid "syntax error, expected \"]\""
 msgstr "構文エラー。\"]\" を期待していました"
 
-#: pl_gram.y:2916
+#: pl_gram.y:2992
 msgid "incomplete data type declaration"
 msgstr "データ型の定義が不完全です"
 
-#: pl_gram.y:2939
+#: pl_gram.y:3015
 msgid "missing data type declaration"
 msgstr "データ型の定義がありません"
 
-#: pl_gram.y:3019
+#: pl_gram.y:3150
 msgid "INTO specified more than once"
 msgstr "INTO が複数回指定されています"
 
-#: pl_gram.y:3189
+#: pl_gram.y:3314
 msgid "expected FROM or IN"
 msgstr "FROM もしくは IN が来るべきでした"
 
-#: pl_gram.y:3250
+#: pl_gram.y:3375
 #, c-format
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "集合を返す関数では、RETURN にパラメータを指定できません"
 
-#: pl_gram.y:3251
+#: pl_gram.y:3376
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "RETURN NEXT もしくは RETURN QUERY を使用してください"
 
-#: pl_gram.y:3261
+#: pl_gram.y:3386
 #, c-format
 msgid "RETURN cannot have a parameter in a procedure"
 msgstr "プロシージャないのRETURNはパラメータを取ることができません"
 
-#: pl_gram.y:3266
+#: pl_gram.y:3391
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "void を返す関数では、RETURN にパラメータを指定できません"
 
-#: pl_gram.y:3275
+#: pl_gram.y:3400
 #, c-format
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "OUT パラメータのない関数では、RETURN にパラメータを指定できません"
 
-#: pl_gram.y:3338
+#: pl_gram.y:3463
 #, c-format
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "OUT パラメータ付きの関数では、RETURN NEXT にパラメータを指定できません"
 
-#: pl_gram.y:3504
+#: pl_gram.y:3630
 #, c-format
 msgid "record variable cannot be part of multiple-item INTO list"
 msgstr "レコード変数は、複数項目を持つ INTO リストでは使えません"
 
-#: pl_gram.y:3550
+#: pl_gram.y:3678
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "INTO 変数の指定が多すぎます"
 
-#: pl_gram.y:3758
+#: pl_gram.y:3889
 #, c-format
 msgid "end label \"%s\" specified for unlabeled block"
 msgstr "終端ラベル\"%s\"がラベルなしのブロックに対して指定されました"
 
-#: pl_gram.y:3765
+#: pl_gram.y:3896
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "終端ラベル \"%s\" がブロックのラベル \"%s\" と異なります"
 
-#: pl_gram.y:3799
+#: pl_gram.y:3930
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "カーソル \"%s\" に引数がありません"
 
-#: pl_gram.y:3813
+#: pl_gram.y:3944
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "カーソル \"%s\" に引数がついています"
 
-#: pl_gram.y:3855
+#: pl_gram.y:3989
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "カーソル \"%s\" に \"%s\" という名前の引数がありません"
 
-#: pl_gram.y:3875
+#: pl_gram.y:4009
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "カーソル \"%2$s\" のパラメータ \"%1$s\" の値が複数個指定されました"
 
-#: pl_gram.y:3900
+#: pl_gram.y:4031
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "カーソル \"%s\" の引数が不足しています"
 
-#: pl_gram.y:3907
+#: pl_gram.y:4038
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "カーソル \"%s\" に対する引数が多すぎます"
 
-#: pl_gram.y:3993
+#: pl_gram.y:4118
 msgid "unrecognized RAISE statement option"
 msgstr "RAISE ステートメントのオプションを認識できません"
 
-#: pl_gram.y:3997
+#: pl_gram.y:4122
 msgid "syntax error, expected \"=\""
 msgstr "構文エラー。\"=\" を期待していました"
 
-#: pl_gram.y:4038
+#: pl_gram.y:4163
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が多すぎます"
 
-#: pl_gram.y:4042
+#: pl_gram.y:4167
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が足りません"
 
-#: pl_handler.c:156
+#: pl_handler.c:159
 msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
 msgstr "PL/pgSQL 変数名とテーブルのカラム名の間の衝突時処理を設定します。"
 
-#: pl_handler.c:165
+#: pl_handler.c:168
 msgid "Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."
 msgstr "INTO ... STRICT 失敗時に生成されたエラーメッセージの DETAIL 部分のパラメーター情報を表示します。"
 
-#: pl_handler.c:173
+#: pl_handler.c:176
 msgid "Perform checks given in ASSERT statements."
 msgstr "ASSERT ステートメントで指定されたチェックを実行します。"
 
-#: pl_handler.c:181
+#: pl_handler.c:184
 msgid "List of programming constructs that should produce a warning."
 msgstr "生成されたプログラムの中で、警告を発生すべき部分の一覧です。"
 
-#: pl_handler.c:191
+#: pl_handler.c:194
 msgid "List of programming constructs that should produce an error."
 msgstr "生成されたプログラムの中で、エラーを発生すべき部分の一覧です。"
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:508
+#: pl_scanner.c:543
 #, c-format
 msgid "%s at end of input"
 msgstr "入力の最後で %s"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:524
+#: pl_scanner.c:559
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "\"%2$s\" もしくはその近辺で %1$s"
-
-#~ msgid "Use a BEGIN block with an EXCEPTION clause instead."
-#~ msgstr "代わりに EXCEPTION 句を伴う BEGIN ブロックを使用してください"
-
-#~ msgid "array subscript in assignment must not be null"
-#~ msgstr "代入における配列の添字が NULL であってはなりません"
-
-#~ msgid "default value for row or record variable is not supported"
-#~ msgstr "行またはレコード変数のデフォルト値指定はサポートされていません"
-
-#~ msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-#~ msgstr "配列の次元数(%d)が制限値(%d)を超えています"
-
-#~ msgid "query \"%s\" returned more than one row"
-#~ msgstr "問い合わせ \"%s\" が複数の行を返しました"
-
-#~ msgid "relation \"%s\" is not a table"
-#~ msgstr "リレーション \"%s\" はテーブルではありません"
-
-#~ msgid "row or record variable cannot be CONSTANT"
-#~ msgstr "行またはレコード変数は CONSTANT にはできません"
-
-#~ msgid "row or record variable cannot be NOT NULL"
-#~ msgstr "行またはレコード変数を NOT NULL にはできません"
-
-#~ msgid "subscripted object is not an array"
-#~ msgstr "添字つきオブジェクトは配列ではありません"
-
-#~ msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
-#~ msgstr "変数 \"%s\" は NOT NULL として宣言されているため、デフォルト値を NULL にすることはできません"
diff --git a/src/pl/plpgsql/src/po/ru.po b/src/pl/plpgsql/src/po/ru.po
index 99ba5ac7e11..4b6e2c7d3f8 100644
--- a/src/pl/plpgsql/src/po/ru.po
+++ b/src/pl/plpgsql/src/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-09-02 09:29+0300\n"
+"POT-Creation-Date: 2026-02-21 05:19+0200\n"
 "PO-Revision-Date: 2024-09-04 20:00+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -17,34 +17,34 @@ msgstr ""
 "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"
 
-#: pl_comp.c:434 pl_handler.c:496
+#: pl_comp.c:329 pl_handler.c:496
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "функции PL/pgSQL не могут принимать тип %s"
 
-#: pl_comp.c:526
+#: pl_comp.c:421
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "не удалось определить фактический тип результата для полиморфной функции "
 "\"%s\""
 
-#: pl_comp.c:556
+#: pl_comp.c:451
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызываться только в триггерах"
 
-#: pl_comp.c:560 pl_handler.c:480
+#: pl_comp.c:455 pl_handler.c:480
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "функции PL/pgSQL не могут возвращать тип %s"
 
-#: pl_comp.c:600
+#: pl_comp.c:495
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "у триггерных функций не может быть объявленных аргументов"
 
-#: pl_comp.c:601
+#: pl_comp.c:496
 #, c-format
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
@@ -53,141 +53,133 @@ msgstr ""
 "При необходимости к аргументам триггера можно обращаться через переменные "
 "TG_NARGS и TG_ARGV."
 
-#: pl_comp.c:734
+#: pl_comp.c:629
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "у функций событийных триггеров не может быть объявленных аргументов"
 
-#: pl_comp.c:998
+#: pl_comp.c:906
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "компиляция функции PL/pgSQL \"%s\" в районе строки %d"
 
-#: pl_comp.c:1021
+#: pl_comp.c:929
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "имя параметра \"%s\" указано неоднократно"
 
-#: pl_comp.c:1135
+#: pl_comp.c:1043
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "неоднозначная ссылка на столбец \"%s\""
 
-#: pl_comp.c:1137
+#: pl_comp.c:1045
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Подразумевается ссылка на переменную PL/pgSQL или столбец таблицы."
 
-#: pl_comp.c:1314 pl_exec.c:5260 pl_exec.c:5433 pl_exec.c:5520 pl_exec.c:5611
-#: pl_exec.c:6636
+#: pl_comp.c:1222 pl_exec.c:5238 pl_exec.c:5411 pl_exec.c:5498 pl_exec.c:5589
+#: pl_exec.c:6786
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "в записи \"%s\" нет поля \"%s\""
 
-#: pl_comp.c:1633 pl_gram.y:645 pl_gram.y:660 pl_gram.y:686
+#: pl_comp.c:1541 pl_gram.y:665 pl_gram.y:680 pl_gram.y:706
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "переменная \"%s\" не существует"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1630
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "столбец \"%s\" в таблице \"%s\" не существует"
 
-#: pl_comp.c:1775
+#: pl_comp.c:1683
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "отношение \"%s\" не существует"
 
-#: pl_comp.c:1782 pl_comp.c:1820
+#: pl_comp.c:1690 pl_comp.c:1728
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "отношение \"%s\" не имеет составного типа"
 
-#: pl_comp.c:1886
+#: pl_comp.c:1794
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "переменная \"%s\" имеет псевдотип %s"
 
-#: pl_comp.c:2075
+#: pl_comp.c:1983
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "тип \"%s\" является пустышкой"
 
-#: pl_comp.c:2157 pl_exec.c:6937
+#: pl_comp.c:2065 pl_exec.c:7087
 #, c-format
 msgid "type %s is not composite"
 msgstr "тип %s не является составным"
 
-#: pl_comp.c:2193
+#: pl_comp.c:2101
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "тип массива для типа данных %s не найден"
 
-#: pl_comp.c:2232 pl_comp.c:2285
+#: pl_comp.c:2140 pl_comp.c:2189
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "нераспознанное условие исключения \"%s\""
 
-#: pl_comp.c:2514
-#, c-format
-msgid ""
-"could not determine actual argument type for polymorphic function \"%s\""
-msgstr ""
-"не удалось определить фактический тип аргумента для полиморфной функции "
-"\"%s\""
-
-#: pl_exec.c:512 pl_exec.c:951 pl_exec.c:1186
+#: pl_exec.c:523 pl_exec.c:963 pl_exec.c:1198
 msgid "during initialization of execution state"
 msgstr "в процессе инициализации состояния выполнения"
 
-#: pl_exec.c:518
+#: pl_exec.c:529
 msgid "while storing call arguments into local variables"
 msgstr "при сохранении аргументов вызова в локальных переменных"
 
-#: pl_exec.c:606 pl_exec.c:1024
+#: pl_exec.c:618 pl_exec.c:1036
 msgid "during function entry"
 msgstr "при входе в функцию"
 
-#: pl_exec.c:629
+#: pl_exec.c:641
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "конец функции достигнут без RETURN"
 
-#: pl_exec.c:635
+#: pl_exec.c:647
 msgid "while casting return value to function's return type"
 msgstr "при приведении возвращаемого значения к типу результата функции"
 
-#: pl_exec.c:647 pl_exec.c:3683
+#: pl_exec.c:659 pl_exec.c:3681
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функция, возвращающая множество, вызвана в контексте, где ему нет места"
 
-#: pl_exec.c:652 pl_exec.c:3689
+#: pl_exec.c:664 pl_exec.c:3687
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "требуется режим материализации, но он недопустим в этом контексте"
 
-#: pl_exec.c:779 pl_exec.c:1050 pl_exec.c:1208
+#: pl_exec.c:791 pl_exec.c:1062 pl_exec.c:1220
 msgid "during function exit"
 msgstr "при выходе из функции"
 
-#: pl_exec.c:834 pl_exec.c:898 pl_exec.c:3482
+#: pl_exec.c:846 pl_exec.c:910 pl_exec.c:3480
 msgid "returned record type does not match expected record type"
 msgstr "возвращаемый тип записи не соответствует ожидаемому"
 
-#: pl_exec.c:1047 pl_exec.c:1205
+#: pl_exec.c:1059 pl_exec.c:1217
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "конец триггерной процедуры достигнут без RETURN"
 
-#: pl_exec.c:1055
+#: pl_exec.c:1067
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "триггерная процедура не может возвращать множество"
 
-#: pl_exec.c:1094 pl_exec.c:1122
+#: pl_exec.c:1106 pl_exec.c:1134
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr ""
@@ -197,7 +189,7 @@ msgstr ""
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:1263
+#: pl_exec.c:1275
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "функция PL/pgSQL %s, строка %d, %s"
@@ -205,39 +197,39 @@ msgstr "функция PL/pgSQL %s, строка %d, %s"
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:1274
+#: pl_exec.c:1286
 #, 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:1282
+#: pl_exec.c:1294
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "функция PL/pgSQL %s, строка %d, оператор %s"
 
-#: pl_exec.c:1288
+#: pl_exec.c:1300
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "функция PL/pgSQL %s"
 
-#: pl_exec.c:1659
+#: pl_exec.c:1671
 msgid "during statement block local variable initialization"
 msgstr "при инициализации локальной переменной в блоке операторов"
 
-#: pl_exec.c:1764
+#: pl_exec.c:1776
 msgid "during statement block entry"
 msgstr "при входе в блок операторов"
 
-#: pl_exec.c:1796
+#: pl_exec.c:1808
 msgid "during statement block exit"
 msgstr "при выходе из блока операторов"
 
-#: pl_exec.c:1834
+#: pl_exec.c:1846
 msgid "during exception cleanup"
 msgstr "при очистке после исключения"
 
-#: pl_exec.c:2370
+#: pl_exec.c:2382
 #, c-format
 msgid ""
 "procedure parameter \"%s\" is an output parameter but corresponding argument "
@@ -246,7 +238,7 @@ msgstr ""
 "параметр процедуры \"%s\" является выходным, но соответствующий аргумент не "
 "допускает запись"
 
-#: pl_exec.c:2375
+#: pl_exec.c:2387
 #, c-format
 msgid ""
 "procedure parameter %d is an output parameter but corresponding argument is "
@@ -255,199 +247,199 @@ msgstr ""
 "параметр процедуры %d является выходным, но соответствующий аргумент не "
 "допускает запись"
 
-#: pl_exec.c:2411
+#: pl_exec.c:2423
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr ""
 "GET STACKED DIAGNOSTICS нельзя использовать вне блока обработчика исключения"
 
-#: pl_exec.c:2617
+#: pl_exec.c:2629
 #, c-format
 msgid "case not found"
 msgstr "неправильный CASE"
 
-#: pl_exec.c:2618
+#: pl_exec.c:2630
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "В операторе CASE не хватает части ELSE."
 
-#: pl_exec.c:2711
+#: pl_exec.c:2723
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "нижняя граница цикла FOR не может быть равна NULL"
 
-#: pl_exec.c:2727
+#: pl_exec.c:2739
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "верхняя граница цикла FOR не может быть равна NULL"
 
-#: pl_exec.c:2745
+#: pl_exec.c:2757
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "значение BY в цикле FOR не может быть равно NULL"
 
-#: pl_exec.c:2751
+#: pl_exec.c:2763
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "значение BY в цикле FOR должно быть больше нуля"
 
-#: pl_exec.c:2885 pl_exec.c:4693
+#: pl_exec.c:2897 pl_exec.c:4685
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "курсор \"%s\" уже используется"
 
-#: pl_exec.c:2908 pl_exec.c:4763
+#: pl_exec.c:2920 pl_exec.c:4755
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "курсору без аргументов были переданы аргументы"
 
-#: pl_exec.c:2927 pl_exec.c:4782
+#: pl_exec.c:2939 pl_exec.c:4774
 #, c-format
 msgid "arguments required for cursor"
 msgstr "курсору требуются аргументы"
 
-#: pl_exec.c:3018
+#: pl_exec.c:3030
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "выражение FOREACH не может быть равно NULL"
 
-#: pl_exec.c:3033
+#: pl_exec.c:3045
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "выражение в FOREACH должно быть массивом, но не типом %s"
 
-#: pl_exec.c:3050
+#: pl_exec.c:3062
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "размерность среза (%d) вне допустимого диапазона 0..%d"
 
-#: pl_exec.c:3077
+#: pl_exec.c:3089
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "переменная цикла FOREACH ... SLICE должна быть массивом"
 
-#: pl_exec.c:3081
+#: pl_exec.c:3093
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "переменная цикла FOREACH не должна быть массивом"
 
-#: pl_exec.c:3243 pl_exec.c:3300 pl_exec.c:3475
+#: pl_exec.c:3255 pl_exec.c:3298 pl_exec.c:3473
 #, c-format
 msgid ""
 "cannot return non-composite value from function returning composite type"
 msgstr ""
 "функция, возвращающая составной тип, не может вернуть несоставное значение"
 
-#: pl_exec.c:3339 pl_gram.y:3375
+#: pl_exec.c:3337 pl_gram.y:3444
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr ""
 "RETURN NEXT можно использовать только в функциях, возвращающих множества"
 
-#: pl_exec.c:3380 pl_exec.c:3512
+#: pl_exec.c:3378 pl_exec.c:3510
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT передан неправильный тип результата"
 
-#: pl_exec.c:3418 pl_exec.c:3439
+#: pl_exec.c:3416 pl_exec.c:3437
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT передан неправильный тип записи"
 
-#: pl_exec.c:3531
+#: pl_exec.c:3529
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "у оператора RETURN NEXT должен быть параметр"
 
-#: pl_exec.c:3559 pl_gram.y:3439
+#: pl_exec.c:3557 pl_gram.y:3508
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr ""
 "RETURN QUERY можно использовать только в функциях, возвращающих множества"
 
-#: pl_exec.c:3577
+#: pl_exec.c:3575
 msgid "structure of query does not match function result type"
 msgstr "структура запроса не соответствует типу результата функции"
 
-#: pl_exec.c:3632 pl_exec.c:4469 pl_exec.c:8759
+#: pl_exec.c:3630 pl_exec.c:4461 pl_exec.c:8974
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "в качестве текста запроса в EXECUTE передан NULL"
 
-#: pl_exec.c:3717 pl_exec.c:3855
+#: pl_exec.c:3715 pl_exec.c:3853
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "этот параметр RAISE уже указан: %s"
 
-#: pl_exec.c:3751
+#: pl_exec.c:3749
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr ""
 "RAISE без параметров нельзя использовать вне блока обработчика исключения"
 
-#: pl_exec.c:3845
+#: pl_exec.c:3843
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "параметром оператора RAISE не может быть NULL"
 
-#: pl_exec.c:3915
+#: pl_exec.c:3913
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3970
+#: pl_exec.c:3968
 #, c-format
 msgid "assertion failed"
 msgstr "нарушение истинности"
 
-#: pl_exec.c:4342 pl_exec.c:4532
+#: pl_exec.c:4334 pl_exec.c:4524
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "в PL/pgSQL нельзя выполнить COPY с участием клиента"
 
-#: pl_exec.c:4348
+#: pl_exec.c:4340
 #, c-format
 msgid "unsupported transaction command in PL/pgSQL"
 msgstr "неподдерживаемая транзакционная команда в PL/pgSQL"
 
-#: pl_exec.c:4371 pl_exec.c:4561
+#: pl_exec.c:4363 pl_exec.c:4553
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO с командой не может возвращать данные"
 
-#: pl_exec.c:4394 pl_exec.c:4584
+#: pl_exec.c:4386 pl_exec.c:4576
 #, c-format
 msgid "query returned no rows"
 msgstr "запрос не вернул строк"
 
-#: pl_exec.c:4416 pl_exec.c:4603 pl_exec.c:5755
+#: pl_exec.c:4408 pl_exec.c:4595 pl_exec.c:5733
 #, c-format
 msgid "query returned more than one row"
 msgstr "запрос вернул несколько строк"
 
-#: pl_exec.c:4418
+#: pl_exec.c:4410
 #, c-format
 msgid "Make sure the query returns a single row, or use LIMIT 1."
 msgstr ""
 "Измените запрос, чтобы он выбирал одну строку, или используйте LIMIT 1."
 
-#: pl_exec.c:4434
+#: pl_exec.c:4426
 #, c-format
 msgid "query has no destination for result data"
 msgstr "в запросе нет назначения для данных результата"
 
-#: pl_exec.c:4435
+#: pl_exec.c:4427
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Если вам нужно отбросить результаты SELECT, используйте PERFORM."
 
-#: pl_exec.c:4524
+#: pl_exec.c:4516
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "возможность выполнения SELECT ... INTO в EXECUTE не реализована"
 
 # skip-rule: space-before-ellipsis
-#: pl_exec.c:4525
+#: pl_exec.c:4517
 #, c-format
 msgid ""
 "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
@@ -456,57 +448,57 @@ msgstr ""
 "Альтернативой может стать EXECUTE ... INTO или EXECUTE CREATE TABLE ... "
 "AS ..."
 
-#: pl_exec.c:4538
+#: pl_exec.c:4530
 #, c-format
 msgid "EXECUTE of transaction commands is not implemented"
 msgstr "EXECUTE с транзакционными командами не поддерживается"
 
-#: pl_exec.c:4848 pl_exec.c:4936
+#: pl_exec.c:4840 pl_exec.c:4928
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "переменная курсора \"%s\" равна NULL"
 
-#: pl_exec.c:4859 pl_exec.c:4947
+#: pl_exec.c:4851 pl_exec.c:4939
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не существует"
 
-#: pl_exec.c:4872
+#: pl_exec.c:4864
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "относительная или абсолютная позиция курсора равна NULL"
 
-#: pl_exec.c:5110 pl_exec.c:5205
+#: pl_exec.c:5088 pl_exec.c:5183
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "значение NULL нельзя присвоить переменной \"%s\", объявленной NOT NULL"
 
-#: pl_exec.c:5186
+#: pl_exec.c:5164
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "переменной типа кортеж можно присвоить только составное значение"
 
-#: pl_exec.c:5218
+#: pl_exec.c:5196
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "переменной типа запись можно присвоить только составное значение"
 
-#: pl_exec.c:5269
+#: pl_exec.c:5247
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "присвоить значение системному столбцу \"%s\" нельзя"
 
-#: pl_exec.c:5718
+#: pl_exec.c:5696
 #, c-format
 msgid "query did not return data"
 msgstr "запрос не вернул данные"
 
-#: pl_exec.c:5719 pl_exec.c:5731 pl_exec.c:5756 pl_exec.c:5832 pl_exec.c:5837
+#: pl_exec.c:5697 pl_exec.c:5709 pl_exec.c:5734 pl_exec.c:5814 pl_exec.c:5819
 #, c-format
 msgid "query: %s"
 msgstr "запрос: %s"
 
-#: pl_exec.c:5727
+#: pl_exec.c:5705
 #, c-format
 msgid "query returned %d column"
 msgid_plural "query returned %d columns"
@@ -514,17 +506,17 @@ msgstr[0] "запрос вернул %d столбец"
 msgstr[1] "запрос вернул %d столбца"
 msgstr[2] "запрос вернул %d столбцов"
 
-#: pl_exec.c:5831
+#: pl_exec.c:5813
 #, c-format
 msgid "query is SELECT INTO, but it should be plain SELECT"
 msgstr "запрос - не просто SELECT, а SELECT INTO"
 
-#: pl_exec.c:5836
+#: pl_exec.c:5818
 #, c-format
 msgid "query is not a SELECT"
 msgstr "запрос - не SELECT"
 
-#: pl_exec.c:6650 pl_exec.c:6690 pl_exec.c:6730
+#: pl_exec.c:6800 pl_exec.c:6840 pl_exec.c:6880
 #, c-format
 msgid ""
 "type of parameter %d (%s) does not match that when preparing the plan (%s)"
@@ -532,35 +524,35 @@ msgstr ""
 "тип параметра %d (%s) не соответствует тому, с которым подготавливался план "
 "(%s)"
 
-#: pl_exec.c:7141 pl_exec.c:7175 pl_exec.c:7249 pl_exec.c:7275
+#: pl_exec.c:7291 pl_exec.c:7325 pl_exec.c:7399 pl_exec.c:7425
 #, c-format
 msgid "number of source and target fields in assignment does not match"
 msgstr "в левой и правой части присваивания разное количество полей"
 
 #. translator: %s represents a name of an extra check
-#: pl_exec.c:7143 pl_exec.c:7177 pl_exec.c:7251 pl_exec.c:7277
+#: pl_exec.c:7293 pl_exec.c:7327 pl_exec.c:7401 pl_exec.c:7427
 #, c-format
 msgid "%s check of %s is active."
 msgstr "Включена проверка %s (с %s)."
 
-#: pl_exec.c:7147 pl_exec.c:7181 pl_exec.c:7255 pl_exec.c:7281
+#: pl_exec.c:7297 pl_exec.c:7331 pl_exec.c:7405 pl_exec.c:7431
 #, c-format
 msgid "Make sure the query returns the exact list of columns."
 msgstr ""
 "Измените запрос, чтобы он возвращал в точности требуемый список столбцов."
 
-#: pl_exec.c:7668
+#: pl_exec.c:7818
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "записи \"%s\" не присвоено значение"
 
-#: pl_exec.c:7669
+#: pl_exec.c:7819
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr ""
 "Для записи, которой не присвоено значение, структура кортежа не определена."
 
-#: pl_exec.c:8357 pl_gram.y:3498
+#: pl_exec.c:8572 pl_gram.y:3567
 #, c-format
 msgid "variable \"%s\" is declared CONSTANT"
 msgstr "переменная \"%s\" объявлена как CONSTANT"
@@ -597,52 +589,52 @@ msgstr "SQL-оператор"
 msgid "FOR over EXECUTE statement"
 msgstr "FOR по результатам EXECUTE"
 
-#: pl_gram.y:485
+#: pl_gram.y:501
 #, c-format
 msgid "block label must be placed before DECLARE, not after"
 msgstr "метка блока должна помещаться до DECLARE, а не после"
 
-#: pl_gram.y:505
+#: pl_gram.y:521
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "тип %s не поддерживает сортировку (COLLATION)"
 
-#: pl_gram.y:524
+#: pl_gram.y:540
 #, c-format
 msgid "variable \"%s\" must have a default value, since it's declared NOT NULL"
 msgstr ""
 "у переменной \"%s\" должно быть значение по умолчанию, так как она объявлена "
 "как NOT NULL"
 
-#: pl_gram.y:704 pl_gram.y:732
+#: pl_gram.y:724 pl_gram.y:752
 msgid "duplicate declaration"
 msgstr "повторяющееся объявление"
 
-#: pl_gram.y:715 pl_gram.y:743
+#: pl_gram.y:735 pl_gram.y:763
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "переменная \"%s\" скрывает ранее определённую переменную"
 
-#: pl_gram.y:1017
+#: pl_gram.y:1040
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
 msgstr "команда GET STACKED DIAGNOSTICS не принимает элемент %s"
 
-#: pl_gram.y:1035
+#: pl_gram.y:1058
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
 msgstr "команда GET CURRENT DIAGNOSTICS не принимает элемент %s"
 
-#: pl_gram.y:1133
+#: pl_gram.y:1156
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "нераспознанный элемент GET DIAGNOSTICS"
 
-#: pl_gram.y:1149 pl_gram.y:3614
+#: pl_gram.y:1172 pl_gram.y:3685
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" - не скалярная переменная"
 
-#: pl_gram.y:1379 pl_gram.y:1572
+#: pl_gram.y:1402 pl_gram.y:1595
 #, c-format
 msgid ""
 "loop variable of loop over rows must be a record variable or list of scalar "
@@ -651,238 +643,238 @@ msgstr ""
 "переменная цикла по кортежам должна быть переменной типа запись или списком "
 "скалярных переменных"
 
-#: pl_gram.y:1414
+#: pl_gram.y:1437
 #, c-format
 msgid "cursor FOR loop must have only one target variable"
 msgstr "в цикле FOR с курсором должна быть только одна переменная"
 
-#: pl_gram.y:1421
+#: pl_gram.y:1444
 #, c-format
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr ""
 "в цикле FOR с курсором должен использоваться курсор, привязанный к запросу"
 
-#: pl_gram.y:1511
+#: pl_gram.y:1534
 #, c-format
 msgid "integer FOR loop must have only one target variable"
 msgstr "в целочисленном цикле FOR должна быть только одна переменная"
 
-#: pl_gram.y:1545
+#: pl_gram.y:1568
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "в цикле FOR с запросом нельзя указать REVERSE"
 
-#: pl_gram.y:1675
+#: pl_gram.y:1700
 #, c-format
 msgid "loop variable of FOREACH must be a known variable or list of variables"
 msgstr ""
 "переменной цикла FOREACH должна быть известная переменная или список "
 "переменных"
 
-#: pl_gram.y:1717
+#: pl_gram.y:1742
 #, c-format
 msgid ""
 "there is no label \"%s\" attached to any block or loop enclosing this "
 "statement"
 msgstr "в блоке или цикле, окружающем этот оператор, нет метки \"%s\""
 
-#: pl_gram.y:1725
+#: pl_gram.y:1750
 #, c-format
 msgid "block label \"%s\" cannot be used in CONTINUE"
 msgstr "метку блока \"%s\" нельзя использовать в CONTINUE"
 
-#: pl_gram.y:1740
+#: pl_gram.y:1765
 #, c-format
 msgid "EXIT cannot be used outside a loop, unless it has a label"
 msgstr "EXIT можно использовать вне цикла только с указанием метки"
 
-#: pl_gram.y:1741
+#: pl_gram.y:1766
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE нельзя использовать вне цикла"
 
-#: pl_gram.y:1765 pl_gram.y:1803 pl_gram.y:1851 pl_gram.y:3061 pl_gram.y:3149
-#: pl_gram.y:3260 pl_gram.y:4009
+#: pl_gram.y:1790 pl_gram.y:1828 pl_gram.y:1876 pl_gram.y:3136 pl_gram.y:3218
+#: pl_gram.y:3329 pl_gram.y:4081
 msgid "unexpected end of function definition"
 msgstr "неожиданный конец определения функции"
 
-#: pl_gram.y:1871 pl_gram.y:1895 pl_gram.y:1911 pl_gram.y:1917 pl_gram.y:2042
-#: pl_gram.y:2050 pl_gram.y:2064 pl_gram.y:2159 pl_gram.y:2383 pl_gram.y:2473
-#: pl_gram.y:2632 pl_gram.y:3856 pl_gram.y:3917 pl_gram.y:3990
+#: pl_gram.y:1896 pl_gram.y:1921 pl_gram.y:1937 pl_gram.y:1943 pl_gram.y:2069
+#: pl_gram.y:2077 pl_gram.y:2092 pl_gram.y:2187 pl_gram.y:2413 pl_gram.y:2503
+#: pl_gram.y:2662 pl_gram.y:3930 pl_gram.y:3994 pl_gram.y:4062
 msgid "syntax error"
 msgstr "ошибка синтаксиса"
 
-#: pl_gram.y:1899 pl_gram.y:1901 pl_gram.y:2387 pl_gram.y:2389
+#: pl_gram.y:1925 pl_gram.y:1927 pl_gram.y:2417 pl_gram.y:2419
 msgid "invalid SQLSTATE code"
 msgstr "неверный код SQLSTATE"
 
-#: pl_gram.y:2107
+#: pl_gram.y:2135
 msgid "syntax error, expected \"FOR\""
 msgstr "ошибка синтаксиса, ожидался \"FOR\""
 
-#: pl_gram.y:2168
+#: pl_gram.y:2196
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "оператор FETCH не может вернуть несколько строк"
 
-#: pl_gram.y:2265
+#: pl_gram.y:2293
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "переменная-курсор должна быть простой переменной"
 
-#: pl_gram.y:2271
+#: pl_gram.y:2299
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "переменная \"%s\" должна быть типа cursor или refcursor"
 
-#: pl_gram.y:2603 pl_gram.y:2614
+#: pl_gram.y:2633 pl_gram.y:2644
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" - не известная переменная"
 
-#: pl_gram.y:2719 pl_gram.y:2729 pl_gram.y:2911
+#: pl_gram.y:2799 pl_gram.y:2810 pl_gram.y:2986
 msgid "mismatched parentheses"
 msgstr "непарные скобки"
 
-#: pl_gram.y:2733
+#: pl_gram.y:2814
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "отсутствует \"%s\" в конце выражения SQL"
 
-#: pl_gram.y:2739
+#: pl_gram.y:2820
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "отсутствует \"%s\" в конце оператора SQL"
 
-#: pl_gram.y:2758
+#: pl_gram.y:2839
 msgid "missing expression"
 msgstr "отсутствует выражение"
 
-#: pl_gram.y:2760
+#: pl_gram.y:2841
 msgid "missing SQL statement"
 msgstr "отсутствует оператор SQL"
 
-#: pl_gram.y:2889
+#: pl_gram.y:2964
 msgid "syntax error, expected \"]\""
 msgstr "ошибка синтаксиса, ожидалась \"]\""
 
-#: pl_gram.y:2913
+#: pl_gram.y:2988
 msgid "incomplete data type declaration"
 msgstr "неполное определение типа данных"
 
-#: pl_gram.y:2936
+#: pl_gram.y:3011
 msgid "missing data type declaration"
 msgstr "отсутствует определение типа данных"
 
-#: pl_gram.y:3071
+#: pl_gram.y:3146
 msgid "INTO specified more than once"
 msgstr "INTO указано неоднократно"
 
-#: pl_gram.y:3241
+#: pl_gram.y:3310
 msgid "expected FROM or IN"
 msgstr "ожидалось FROM или IN"
 
-#: pl_gram.y:3302
+#: pl_gram.y:3371
 #, c-format
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "в функции, возвращающей множество, RETURN должен быть без параметров"
 
-#: pl_gram.y:3303
+#: pl_gram.y:3372
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Используйте RETURN NEXT или RETURN QUERY."
 
-#: pl_gram.y:3313
+#: pl_gram.y:3382
 #, c-format
 msgid "RETURN cannot have a parameter in a procedure"
 msgstr "в процедуре RETURN должен быть без параметров"
 
-#: pl_gram.y:3318
+#: pl_gram.y:3387
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "в функции, не возвращающей ничего, RETURN не должен иметь параметров"
 
-#: pl_gram.y:3327
+#: pl_gram.y:3396
 #, c-format
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN должен быть без параметров в функции с параметрами OUT"
 
-#: pl_gram.y:3390
+#: pl_gram.y:3459
 #, c-format
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT должен быть без параметров в функции с параметрами OUT"
 
-#: pl_gram.y:3556
+#: pl_gram.y:3625
 #, c-format
 msgid "record variable cannot be part of multiple-item INTO list"
 msgstr ""
 "переменная типа запись не может быть частью списка INTO с несколькими "
 "элементами"
 
-#: pl_gram.y:3602
+#: pl_gram.y:3673
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "указано слишком много переменных INTO"
 
-#: pl_gram.y:3810
+#: pl_gram.y:3884
 #, c-format
 msgid "end label \"%s\" specified for unlabeled block"
 msgstr "конечная метка \"%s\" указана для непомеченного блока"
 
-#: pl_gram.y:3817
+#: pl_gram.y:3891
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "конечная метка \"%s\" отличается от метки блока \"%s\""
 
-#: pl_gram.y:3851
+#: pl_gram.y:3925
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "курсор \"%s\" не имеет аргументов"
 
-#: pl_gram.y:3865
+#: pl_gram.y:3939
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "курсор \"%s\" имеет аргументы"
 
-#: pl_gram.y:3907
+#: pl_gram.y:3984
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "курсор \"%s\" не имеет аргумента \"%s\""
 
-#: pl_gram.y:3927
+#: pl_gram.y:4004
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "значение параметра \"%s\" курсора \"%s\" указано неоднократно"
 
-#: pl_gram.y:3948
+#: pl_gram.y:4026
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "недостаточно аргументов для курсора \"%s\""
 
-#: pl_gram.y:3955
+#: pl_gram.y:4033
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "слишком много аргументов для курсора \"%s\""
 
-#: pl_gram.y:4041
+#: pl_gram.y:4113
 msgid "unrecognized RAISE statement option"
 msgstr "нераспознанный параметр оператора RAISE"
 
-#: pl_gram.y:4045
+#: pl_gram.y:4117
 msgid "syntax error, expected \"=\""
 msgstr "ошибка синтаксиса, ожидалось \"=\""
 
-#: pl_gram.y:4086
+#: pl_gram.y:4158
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "слишком много параметров для RAISE"
 
-#: pl_gram.y:4090
+#: pl_gram.y:4162
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "недостаточно параметров для RAISE"
 
-#: pl_handler.c:156
+#: pl_handler.c:159
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
@@ -890,7 +882,7 @@ msgstr ""
 "Выбирает режим разрешения конфликтов между именами переменных PL/pgSQL и "
 "именами столбцов таблиц."
 
-#: pl_handler.c:165
+#: pl_handler.c:168
 msgid ""
 "Print information about parameters in the DETAIL part of the error messages "
 "generated on INTO ... STRICT failures."
@@ -898,31 +890,38 @@ msgstr ""
 "Добавляет информацию о параметрах в раздел DETAIL сообщений, выводимых при "
 "ошибках в INTO ... STRICT."
 
-#: pl_handler.c:173
+#: pl_handler.c:176
 msgid "Perform checks given in ASSERT statements."
 msgstr "Выполняет проверки, заданные в операторах ASSERT."
 
-#: pl_handler.c:181
+#: pl_handler.c:184
 msgid "List of programming constructs that should produce a warning."
 msgstr ""
 "Список программных конструкций, которые должны выдавать предупреждения."
 
-#: pl_handler.c:191
+#: pl_handler.c:194
 msgid "List of programming constructs that should produce an error."
 msgstr "Список программных конструкций, которые должны выдавать ошибку."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:525
+#: pl_scanner.c:543
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в конце"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:541
+#: pl_scanner.c:559
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
 
+#, c-format
+#~ msgid ""
+#~ "could not determine actual argument type for polymorphic function \"%s\""
+#~ msgstr ""
+#~ "не удалось определить фактический тип аргумента для полиморфной функции "
+#~ "\"%s\""
+
 #~ msgid "query \"%s\" returned more than one row"
 #~ msgstr "запрос \"%s\" вернул несколько строк"
 
diff --git a/src/pl/plpgsql/src/po/sv.po b/src/pl/plpgsql/src/po/sv.po
index 9f78dd5633e..5f311f8f52d 100644
--- a/src/pl/plpgsql/src/po/sv.po
+++ b/src/pl/plpgsql/src/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-12 17:39+0000\n"
-"PO-Revision-Date: 2024-07-12 22:07+0200\n"
+"PO-Revision-Date: 2025-07-29 19:46+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/pl/plpgsql/src/po/uk.po b/src/pl/plpgsql/src/po/uk.po
index 044dd5fa4c3..5e286b71d1b 100644
--- a/src/pl/plpgsql/src/po/uk.po
+++ b/src/pl/plpgsql/src/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:09+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:09+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,177 +14,172 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/plpgsql.pot\n"
-"X-Crowdin-File-ID: 998\n"
+"X-Crowdin-File: /REL_18_STABLE/plpgsql.pot\n"
+"X-Crowdin-File-ID: 1087\n"
 
-#: pl_comp.c:434 pl_handler.c:496
+#: pl_comp.c:329 pl_handler.c:496
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "Функції PL/pgSQL не можуть приймати тип %s"
 
-#: pl_comp.c:526
+#: pl_comp.c:421
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "не вдалося визначити фактичний тип результату поліморфної функції \"%s\""
 
-#: pl_comp.c:556
+#: pl_comp.c:451
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "тригер-функція може викликатися лише як тригер"
 
-#: pl_comp.c:560 pl_handler.c:480
+#: pl_comp.c:455 pl_handler.c:480
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "Функції PL/pgSQL не можуть повертати тип %s"
 
-#: pl_comp.c:600
+#: pl_comp.c:495
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "тригер-функції не можуть мати задекларованих аргументи"
 
-#: pl_comp.c:601
+#: pl_comp.c:496
 #, c-format
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Аргументи тригеру доступні через TG_NARGS та TG_ARGV замість цього."
 
-#: pl_comp.c:734
+#: pl_comp.c:629
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "функції тригерів подій не можуть мати задекларовані аргументи"
 
-#: pl_comp.c:998
+#: pl_comp.c:906
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "компіляція функції PL/pgSQL \"%s\" біля рядка %d"
 
-#: pl_comp.c:1021
+#: pl_comp.c:929
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "ім'я параметру «%s» використано декілька разів"
 
-#: pl_comp.c:1135
+#: pl_comp.c:1043
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "посилання на стовпець \"%s\" є неоднозначним"
 
-#: pl_comp.c:1137
+#: pl_comp.c:1045
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Це може відноситися до змінної PL/pgSQL або стовпця таблиці."
 
-#: pl_comp.c:1314 pl_exec.c:5260 pl_exec.c:5433 pl_exec.c:5520 pl_exec.c:5611
-#: pl_exec.c:6636
+#: pl_comp.c:1222 pl_exec.c:5252 pl_exec.c:5425 pl_exec.c:5512 pl_exec.c:5603
+#: pl_exec.c:6800
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "запис \"%s\" не має поля \"%s\""
 
-#: pl_comp.c:1633 pl_gram.y:645 pl_gram.y:660 pl_gram.y:686
+#: pl_comp.c:1541 pl_gram.y:665 pl_gram.y:680 pl_gram.y:706
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "змінної \"%s\" не існує"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1630
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "стовпець \"%s\" зв'язку \"%s\" не існує"
 
-#: pl_comp.c:1775
+#: pl_comp.c:1683
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "відношення \"%s\" не існує"
 
-#: pl_comp.c:1782 pl_comp.c:1820
+#: pl_comp.c:1690 pl_comp.c:1728
 #, c-format
 msgid "relation \"%s\" does not have a composite type"
 msgstr "відношення \"%s\" не має складеного типу"
 
-#: pl_comp.c:1886
+#: pl_comp.c:1794
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "змінна \"%s\" має псевдотип %s"
 
-#: pl_comp.c:2075
+#: pl_comp.c:1983
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "тип \"%s\" є лише оболонкою"
 
-#: pl_comp.c:2157 pl_exec.c:6937
+#: pl_comp.c:2065 pl_exec.c:7101
 #, c-format
 msgid "type %s is not composite"
 msgstr "тип %s не є складеним"
 
-#: pl_comp.c:2193
+#: pl_comp.c:2101
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "не вдалося знайти тип масиву для типу даних %s"
 
-#: pl_comp.c:2232 pl_comp.c:2285
+#: pl_comp.c:2140 pl_comp.c:2189
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "нерозпізнана умова виключення \"%s\""
 
-#: pl_comp.c:2514
-#, c-format
-msgid "could not determine actual argument type for polymorphic function \"%s\""
-msgstr "не вдалося визначити фактичний тип аргумента поліморфної функції \"%s\""
-
-#: pl_exec.c:512 pl_exec.c:951 pl_exec.c:1186
+#: pl_exec.c:523 pl_exec.c:963 pl_exec.c:1198
 msgid "during initialization of execution state"
 msgstr "під час ініціалізації стану виконання"
 
-#: pl_exec.c:518
+#: pl_exec.c:529
 msgid "while storing call arguments into local variables"
 msgstr "під час зберігання аргументів виклику до локальних змінних"
 
-#: pl_exec.c:606 pl_exec.c:1024
+#: pl_exec.c:618 pl_exec.c:1036
 msgid "during function entry"
 msgstr "під час входу до функції"
 
-#: pl_exec.c:629
+#: pl_exec.c:641
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "досягнуто кінця функції без RETURN"
 
-#: pl_exec.c:635
+#: pl_exec.c:647
 msgid "while casting return value to function's return type"
 msgstr "під час приведення значення, що повертається, до типу результата функції"
 
-#: pl_exec.c:647 pl_exec.c:3683
+#: pl_exec.c:659 pl_exec.c:3695
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "функція \"set-valued\" викликана в контексті, де йому немає місця"
 
-#: pl_exec.c:652 pl_exec.c:3689
+#: pl_exec.c:664 pl_exec.c:3701
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "необхідний режим матеріалізації (materialize mode), але він неприпустимий у цьому контексті"
 
-#: pl_exec.c:779 pl_exec.c:1050 pl_exec.c:1208
+#: pl_exec.c:791 pl_exec.c:1062 pl_exec.c:1220
 msgid "during function exit"
 msgstr "під час виходу з функції"
 
-#: pl_exec.c:834 pl_exec.c:898 pl_exec.c:3482
+#: pl_exec.c:846 pl_exec.c:910 pl_exec.c:3494
 msgid "returned record type does not match expected record type"
 msgstr "тип запису, що повертається, не відповідає очікуваному типу"
 
-#: pl_exec.c:1047 pl_exec.c:1205
+#: pl_exec.c:1059 pl_exec.c:1217
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "досягнуто кінця тригерної процедури без RETURN"
 
-#: pl_exec.c:1055
+#: pl_exec.c:1067
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "тригерна процедура не може повернути набір"
 
-#: pl_exec.c:1094 pl_exec.c:1122
+#: pl_exec.c:1106 pl_exec.c:1134
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "структура рядка, що повертається, не відповідає структурі таблиці, яка викликала тригер"
 
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:1263
+#: pl_exec.c:1275
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "Функція PL/pgSQL %s рядок %d %s"
@@ -192,288 +187,288 @@ msgstr "Функція PL/pgSQL %s рядок %d %s"
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:1274
+#: pl_exec.c:1286
 #, 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:1282
+#: pl_exec.c:1294
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "Функція PL/pgSQL %s рядок %d в %s"
 
-#: pl_exec.c:1288
+#: pl_exec.c:1300
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "Функція PL/pgSQL %s"
 
-#: pl_exec.c:1659
+#: pl_exec.c:1671
 msgid "during statement block local variable initialization"
 msgstr "під час ініціалізації локальної змінної в блоці операторів"
 
-#: pl_exec.c:1764
+#: pl_exec.c:1776
 msgid "during statement block entry"
 msgstr "під час входу в блок операторів"
 
-#: pl_exec.c:1796
+#: pl_exec.c:1808
 msgid "during statement block exit"
 msgstr "під час виходу з блоку операторів"
 
-#: pl_exec.c:1834
+#: pl_exec.c:1846
 msgid "during exception cleanup"
 msgstr "під час очищення винятку"
 
-#: pl_exec.c:2370
+#: pl_exec.c:2382
 #, c-format
 msgid "procedure parameter \"%s\" is an output parameter but corresponding argument is not writable"
 msgstr "параметр процедури \"%s\" є вихідним, але відповідний аргумент не допускає запис"
 
-#: pl_exec.c:2375
+#: pl_exec.c:2387
 #, c-format
 msgid "procedure parameter %d is an output parameter but corresponding argument is not writable"
 msgstr "параметр процедури %d є вихідним, але відповідний аргумент не допускає запис"
 
-#: pl_exec.c:2411
+#: pl_exec.c:2423
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr "GET STACKED DIAGNOSTICS не може використовуватись поза блоком обробника винятків"
 
-#: pl_exec.c:2617
+#: pl_exec.c:2629
 #, c-format
 msgid "case not found"
 msgstr "гілку не знайдено"
 
-#: pl_exec.c:2618
+#: pl_exec.c:2630
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "В операторі CASE пропущено частину ELSE."
 
-#: pl_exec.c:2711
+#: pl_exec.c:2723
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "нижня границя циклу FOR не може бути null"
 
-#: pl_exec.c:2727
+#: pl_exec.c:2739
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "верхня границя циклу FOR не може бути null"
 
-#: pl_exec.c:2745
+#: pl_exec.c:2757
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "Значення BY циклу FOR не може бути null"
 
-#: pl_exec.c:2751
+#: pl_exec.c:2763
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "Значення BY циклу FOR повинно бути більше нуля"
 
-#: pl_exec.c:2885 pl_exec.c:4693
+#: pl_exec.c:2897 pl_exec.c:4699
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "курсор \"%s\" вже використовується"
 
-#: pl_exec.c:2908 pl_exec.c:4763
+#: pl_exec.c:2920 pl_exec.c:4769
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "аргументи, надані курсору без аргументів"
 
-#: pl_exec.c:2927 pl_exec.c:4782
+#: pl_exec.c:2939 pl_exec.c:4788
 #, c-format
 msgid "arguments required for cursor"
 msgstr "аргументи, необхідні для курсора"
 
-#: pl_exec.c:3018
+#: pl_exec.c:3030
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "Вираз FOREACH не може бути null"
 
-#: pl_exec.c:3033
+#: pl_exec.c:3045
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "Вираз в FOREACH повинен бути масивом, не типом %s"
 
-#: pl_exec.c:3050
+#: pl_exec.c:3062
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "розмір зрізу (%d) поза припустимим діапазоном 0..%d"
 
-#: pl_exec.c:3077
+#: pl_exec.c:3089
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "Змінна циклу FOREACH ... SLICE повинна бути масивом"
 
-#: pl_exec.c:3081
+#: pl_exec.c:3093
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "Змінна циклу FOREACH не повинна бути масивом"
 
-#: pl_exec.c:3243 pl_exec.c:3300 pl_exec.c:3475
+#: pl_exec.c:3255 pl_exec.c:3312 pl_exec.c:3487
 #, c-format
 msgid "cannot return non-composite value from function returning composite type"
 msgstr "функція, що повертає складений тип, не може повернути не складене значення"
 
-#: pl_exec.c:3339 pl_gram.y:3375
+#: pl_exec.c:3351 pl_gram.y:3444
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "не можна використовувати RETURN NEXT в функціях, що не повертають набори даних"
 
-#: pl_exec.c:3380 pl_exec.c:3512
+#: pl_exec.c:3392 pl_exec.c:3524
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT вказано неправильний тип результату"
 
-#: pl_exec.c:3418 pl_exec.c:3439
+#: pl_exec.c:3430 pl_exec.c:3451
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT вказано неправильний тип запису"
 
-#: pl_exec.c:3531
+#: pl_exec.c:3543
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT повинен мати параметр"
 
-#: pl_exec.c:3559 pl_gram.y:3439
+#: pl_exec.c:3571 pl_gram.y:3508
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "не можна використовувати RETURN QUERY в функціях, що не повертають набір"
 
-#: pl_exec.c:3577
+#: pl_exec.c:3589
 msgid "structure of query does not match function result type"
 msgstr "структура запиту не відповідає типу результата функції"
 
-#: pl_exec.c:3632 pl_exec.c:4469 pl_exec.c:8759
+#: pl_exec.c:3644 pl_exec.c:4475 pl_exec.c:8988
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "текстовий аргумент запиту EXECUTE є null"
 
-#: pl_exec.c:3717 pl_exec.c:3855
+#: pl_exec.c:3729 pl_exec.c:3867
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "Параметр RAISE вже вказано: %s"
 
-#: pl_exec.c:3751
+#: pl_exec.c:3763
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "RAISE без параметрів не можна використовувати поза блоком обробника винятків"
 
-#: pl_exec.c:3845
+#: pl_exec.c:3857
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "Параметром оператора RAISE не може бути null"
 
-#: pl_exec.c:3915
+#: pl_exec.c:3927
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3970
+#: pl_exec.c:3982
 #, c-format
 msgid "assertion failed"
 msgstr "порушення істинності"
 
-#: pl_exec.c:4342 pl_exec.c:4532
+#: pl_exec.c:4348 pl_exec.c:4538
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "в PL/pgSQL не можна виконати COPY за участю клієнта"
 
-#: pl_exec.c:4348
+#: pl_exec.c:4354
 #, c-format
 msgid "unsupported transaction command in PL/pgSQL"
 msgstr "непідтримувана транзакційна команда в PL/pgSQL"
 
-#: pl_exec.c:4371 pl_exec.c:4561
+#: pl_exec.c:4377 pl_exec.c:4567
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO використаний з командою, що не може повертати дані"
 
-#: pl_exec.c:4394 pl_exec.c:4584
+#: pl_exec.c:4400 pl_exec.c:4590
 #, c-format
 msgid "query returned no rows"
 msgstr "запит не повернув рядки"
 
-#: pl_exec.c:4416 pl_exec.c:4603 pl_exec.c:5755
+#: pl_exec.c:4422 pl_exec.c:4609 pl_exec.c:5747
 #, c-format
 msgid "query returned more than one row"
 msgstr "запит повернув декілька рядків"
 
-#: pl_exec.c:4418
+#: pl_exec.c:4424
 #, c-format
 msgid "Make sure the query returns a single row, or use LIMIT 1."
 msgstr "Переконайтеся, що запит повертає один рядок, або використовуйте LIMIT 1."
 
-#: pl_exec.c:4434
+#: pl_exec.c:4440
 #, c-format
 msgid "query has no destination for result data"
 msgstr "запит не має призначення для даних результату"
 
-#: pl_exec.c:4435
+#: pl_exec.c:4441
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Якщо ви хочете відкинути результати SELECT, використайте PERFORM."
 
-#: pl_exec.c:4524
+#: pl_exec.c:4530
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE виразу SELECT ... INTO не реалізовано"
 
-#: pl_exec.c:4525
+#: pl_exec.c:4531
 #, c-format
 msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
 msgstr "Альтернативою може стати EXECUTE ... INTO або EXECUTE CREATE TABLE ... AS."
 
-#: pl_exec.c:4538
+#: pl_exec.c:4544
 #, c-format
 msgid "EXECUTE of transaction commands is not implemented"
 msgstr "EXECUTE з транзакційними командами не реалізовано"
 
-#: pl_exec.c:4848 pl_exec.c:4936
+#: pl_exec.c:4854 pl_exec.c:4942
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "змінна курсора \"%s\" дорівнює null"
 
-#: pl_exec.c:4859 pl_exec.c:4947
+#: pl_exec.c:4865 pl_exec.c:4953
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "курсор \"%s\" не існує"
 
-#: pl_exec.c:4872
+#: pl_exec.c:4878
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "відносна або абсолютна позиція курсора дорівнює null"
 
-#: pl_exec.c:5110 pl_exec.c:5205
+#: pl_exec.c:5102 pl_exec.c:5197
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "значення null не можна призначити змінній \"%s\", оголошеній NOT NULL"
 
-#: pl_exec.c:5186
+#: pl_exec.c:5178
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "змінній типу кортеж можна призначити лише складене значення"
 
-#: pl_exec.c:5218
+#: pl_exec.c:5210
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "змінній типу запис можна призначити лише складене значення"
 
-#: pl_exec.c:5269
+#: pl_exec.c:5261
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "призначити значення системному стовпцю \"%s\" не можна"
 
-#: pl_exec.c:5718
+#: pl_exec.c:5710
 #, c-format
 msgid "query did not return data"
 msgstr "запит не повернув даних"
 
-#: pl_exec.c:5719 pl_exec.c:5731 pl_exec.c:5756 pl_exec.c:5832 pl_exec.c:5837
+#: pl_exec.c:5711 pl_exec.c:5723 pl_exec.c:5748 pl_exec.c:5828 pl_exec.c:5833
 #, c-format
 msgid "query: %s"
 msgstr "запит: %s"
 
-#: pl_exec.c:5727
+#: pl_exec.c:5719
 #, c-format
 msgid "query returned %d column"
 msgid_plural "query returned %d columns"
@@ -482,48 +477,48 @@ msgstr[1] "запит повернув %d колонки"
 msgstr[2] "запит повернув %d колонок"
 msgstr[3] "запит повернув %d колонок"
 
-#: pl_exec.c:5831
+#: pl_exec.c:5827
 #, c-format
 msgid "query is SELECT INTO, but it should be plain SELECT"
 msgstr "запит є SELECT INTO, але має бути звичайним SELECT"
 
-#: pl_exec.c:5836
+#: pl_exec.c:5832
 #, c-format
 msgid "query is not a SELECT"
 msgstr "запит не є SELECT"
 
-#: pl_exec.c:6650 pl_exec.c:6690 pl_exec.c:6730
+#: pl_exec.c:6814 pl_exec.c:6854 pl_exec.c:6894
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "тип параметру %d (%s) не відповідає тому, з котрим тривала підготовка плану (%s)"
 
-#: pl_exec.c:7141 pl_exec.c:7175 pl_exec.c:7249 pl_exec.c:7275
+#: pl_exec.c:7305 pl_exec.c:7339 pl_exec.c:7413 pl_exec.c:7439
 #, c-format
 msgid "number of source and target fields in assignment does not match"
 msgstr "кількість вихідних і цільових полів у присвоюванні не збігається"
 
 #. translator: %s represents a name of an extra check
-#: pl_exec.c:7143 pl_exec.c:7177 pl_exec.c:7251 pl_exec.c:7277
+#: pl_exec.c:7307 pl_exec.c:7341 pl_exec.c:7415 pl_exec.c:7441
 #, c-format
 msgid "%s check of %s is active."
 msgstr "%s перевірка %s активна."
 
-#: pl_exec.c:7147 pl_exec.c:7181 pl_exec.c:7255 pl_exec.c:7281
+#: pl_exec.c:7311 pl_exec.c:7345 pl_exec.c:7419 pl_exec.c:7445
 #, c-format
 msgid "Make sure the query returns the exact list of columns."
 msgstr "Переконайтеся, що запит повертає точний список стовпців."
 
-#: pl_exec.c:7668
+#: pl_exec.c:7832
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "запис \"%s\" ще не призначено"
 
-#: pl_exec.c:7669
+#: pl_exec.c:7833
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "Для запису, котрому не призначене значення, структура кортежа не визначена."
 
-#: pl_exec.c:8357 pl_gram.y:3498
+#: pl_exec.c:8586 pl_gram.y:3567
 #, c-format
 msgid "variable \"%s\" is declared CONSTANT"
 msgstr "змінна \"%s\" оголошена як CONSTANT"
@@ -560,306 +555,306 @@ msgstr "SQL-оператор"
 msgid "FOR over EXECUTE statement"
 msgstr "FOR за результатами EXECUTE"
 
-#: pl_gram.y:485
+#: pl_gram.y:501
 #, c-format
 msgid "block label must be placed before DECLARE, not after"
 msgstr "мітка блоку повинна бути розміщена до DECLARE, а не після"
 
-#: pl_gram.y:505
+#: pl_gram.y:521
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "тип %s не підтримує правила сортування"
 
-#: pl_gram.y:524
+#: pl_gram.y:540
 #, c-format
 msgid "variable \"%s\" must have a default value, since it's declared NOT NULL"
 msgstr "змінна \"%s\" повинна мати значення за замовчуванням після того, як вона оголошена як NOT NULL"
 
-#: pl_gram.y:704 pl_gram.y:732
+#: pl_gram.y:724 pl_gram.y:752
 msgid "duplicate declaration"
 msgstr "дублікат оголошення"
 
-#: pl_gram.y:715 pl_gram.y:743
+#: pl_gram.y:735 pl_gram.y:763
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "змінна \"%s\" приховує раніше оголошену змінну"
 
-#: pl_gram.y:1017
+#: pl_gram.y:1040
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
 msgstr "команда GET STACKED DIAGNOSTICS не дозволяє елемент діагностування %s"
 
-#: pl_gram.y:1035
+#: pl_gram.y:1058
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
 msgstr "команда GET CURRENT DIAGNOSTICS не дозволяє елемент діагностування %s"
 
-#: pl_gram.y:1133
+#: pl_gram.y:1156
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "нерозпізнаний елемент GET DIAGNOSTICS"
 
-#: pl_gram.y:1149 pl_gram.y:3614
+#: pl_gram.y:1172 pl_gram.y:3685
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" не є скалярною змінною"
 
-#: pl_gram.y:1379 pl_gram.y:1572
+#: pl_gram.y:1402 pl_gram.y:1595
 #, c-format
 msgid "loop variable of loop over rows must be a record variable or list of scalar variables"
 msgstr "змінна циклу по кортежах повинна бути змінною типу запис або списком скалярних змінних"
 
-#: pl_gram.y:1414
+#: pl_gram.y:1437
 #, c-format
 msgid "cursor FOR loop must have only one target variable"
 msgstr "курсор в циклі FOR повинен мати лише одну цільову змінну"
 
-#: pl_gram.y:1421
+#: pl_gram.y:1444
 #, c-format
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "цикл курсора FOR повинен використовувати обмежуючу змінну курсора"
 
-#: pl_gram.y:1511
+#: pl_gram.y:1534
 #, c-format
 msgid "integer FOR loop must have only one target variable"
 msgstr "цілочисельний цикл FOR повинен мати лише одну цільову змінну"
 
-#: pl_gram.y:1545
+#: pl_gram.y:1568
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "в циклі FOR з запитом не можна вказати REVERSE"
 
-#: pl_gram.y:1675
+#: pl_gram.y:1700
 #, c-format
 msgid "loop variable of FOREACH must be a known variable or list of variables"
 msgstr "змінній циклу FOREACH повинна бути відома змінна або список змінних"
 
-#: pl_gram.y:1717
+#: pl_gram.y:1742
 #, c-format
 msgid "there is no label \"%s\" attached to any block or loop enclosing this statement"
 msgstr "в блоку або циклу, розділеному цим оператором, немає мітки \"%s\""
 
-#: pl_gram.y:1725
+#: pl_gram.y:1750
 #, c-format
 msgid "block label \"%s\" cannot be used in CONTINUE"
 msgstr "мітку блока \"%s\" не можна використовувати в CONTINUE"
 
-#: pl_gram.y:1740
+#: pl_gram.y:1765
 #, c-format
 msgid "EXIT cannot be used outside a loop, unless it has a label"
 msgstr "EXIT можна використовувати поза циклом, тільки з зазначенням мітки"
 
-#: pl_gram.y:1741
+#: pl_gram.y:1766
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE не можна використовувати поза циклом"
 
-#: pl_gram.y:1765 pl_gram.y:1803 pl_gram.y:1851 pl_gram.y:3061 pl_gram.y:3149
-#: pl_gram.y:3260 pl_gram.y:4009
+#: pl_gram.y:1790 pl_gram.y:1828 pl_gram.y:1876 pl_gram.y:3136 pl_gram.y:3218
+#: pl_gram.y:3329 pl_gram.y:4081
 msgid "unexpected end of function definition"
 msgstr "неочікуваний кінец визначення функції"
 
-#: pl_gram.y:1871 pl_gram.y:1895 pl_gram.y:1911 pl_gram.y:1917 pl_gram.y:2042
-#: pl_gram.y:2050 pl_gram.y:2064 pl_gram.y:2159 pl_gram.y:2383 pl_gram.y:2473
-#: pl_gram.y:2632 pl_gram.y:3856 pl_gram.y:3917 pl_gram.y:3990
+#: pl_gram.y:1896 pl_gram.y:1921 pl_gram.y:1937 pl_gram.y:1943 pl_gram.y:2069
+#: pl_gram.y:2077 pl_gram.y:2092 pl_gram.y:2187 pl_gram.y:2413 pl_gram.y:2503
+#: pl_gram.y:2662 pl_gram.y:3930 pl_gram.y:3994 pl_gram.y:4062
 msgid "syntax error"
 msgstr "синтаксична помилка"
 
-#: pl_gram.y:1899 pl_gram.y:1901 pl_gram.y:2387 pl_gram.y:2389
+#: pl_gram.y:1925 pl_gram.y:1927 pl_gram.y:2417 pl_gram.y:2419
 msgid "invalid SQLSTATE code"
 msgstr "неприпустимий код SQLSTATE"
 
-#: pl_gram.y:2107
+#: pl_gram.y:2135
 msgid "syntax error, expected \"FOR\""
 msgstr "помилка синтаксису, очікувався \"FOR\""
 
-#: pl_gram.y:2168
+#: pl_gram.y:2196
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "Оператор FETCH не може повернути декілька рядків"
 
-#: pl_gram.y:2265
+#: pl_gram.y:2293
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "змінна-курсор повинна бути простою змінною"
 
-#: pl_gram.y:2271
+#: pl_gram.y:2299
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "змінна \"%s\" повинна бути типу cursor або refcursor"
 
-#: pl_gram.y:2603 pl_gram.y:2614
+#: pl_gram.y:2633 pl_gram.y:2644
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" - невідома змінна"
 
-#: pl_gram.y:2719 pl_gram.y:2729 pl_gram.y:2911
+#: pl_gram.y:2799 pl_gram.y:2810 pl_gram.y:2986
 msgid "mismatched parentheses"
 msgstr "неузгоджені дужки"
 
-#: pl_gram.y:2733
+#: pl_gram.y:2814
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "пропущено \"%s\" в кінці виразу SQL"
 
-#: pl_gram.y:2739
+#: pl_gram.y:2820
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "пропущено \"%s\" в кінці оператора SQL"
 
-#: pl_gram.y:2758
+#: pl_gram.y:2839
 msgid "missing expression"
 msgstr "пропущено вираз"
 
-#: pl_gram.y:2760
+#: pl_gram.y:2841
 msgid "missing SQL statement"
 msgstr "пропущений оператор SQL"
 
-#: pl_gram.y:2889
+#: pl_gram.y:2964
 msgid "syntax error, expected \"]\""
 msgstr "помилка синтаксису, очікувалось \"]\""
 
-#: pl_gram.y:2913
+#: pl_gram.y:2988
 msgid "incomplete data type declaration"
 msgstr "неповне оголошення типу даних"
 
-#: pl_gram.y:2936
+#: pl_gram.y:3011
 msgid "missing data type declaration"
 msgstr "пропущено оголошення типу даних"
 
-#: pl_gram.y:3071
+#: pl_gram.y:3146
 msgid "INTO specified more than once"
 msgstr "INTO вказано неодноразово"
 
-#: pl_gram.y:3241
+#: pl_gram.y:3310
 msgid "expected FROM or IN"
 msgstr "очікувалось FROM або IN"
 
-#: pl_gram.y:3302
+#: pl_gram.y:3371
 #, c-format
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "В функції, яка повертає набір, RETURN не може мати параметр"
 
-#: pl_gram.y:3303
+#: pl_gram.y:3372
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Використайте RETURN NEXT або RETURN QUERY."
 
-#: pl_gram.y:3313
+#: pl_gram.y:3382
 #, c-format
 msgid "RETURN cannot have a parameter in a procedure"
 msgstr "В процедурі RETURN не може мати параметр"
 
-#: pl_gram.y:3318
+#: pl_gram.y:3387
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "В функції, яка не повертає нічого, RETURN не може мати параметр"
 
-#: pl_gram.y:3327
+#: pl_gram.y:3396
 #, c-format
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "В функції з параметрами OUT, RETURN не може мати параметр"
 
-#: pl_gram.y:3390
+#: pl_gram.y:3459
 #, c-format
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "В функції з параметрами OUT, RETURN NEXT не може мати параметр"
 
-#: pl_gram.y:3556
+#: pl_gram.y:3625
 #, c-format
 msgid "record variable cannot be part of multiple-item INTO list"
 msgstr "змінна типу запис не може бути частиною списка INTO з декількома елементами"
 
-#: pl_gram.y:3602
+#: pl_gram.y:3673
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "вказано занадто багато змінних INTO"
 
-#: pl_gram.y:3810
+#: pl_gram.y:3884
 #, c-format
 msgid "end label \"%s\" specified for unlabeled block"
 msgstr "кінцева мітка \"%s\" вказана для невідміченого блоку"
 
-#: pl_gram.y:3817
+#: pl_gram.y:3891
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "кінцева мітка \"%s\" відрізняється від мітки блоку \"%s\""
 
-#: pl_gram.y:3851
+#: pl_gram.y:3925
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "курсор \"%s\" не має аргументів"
 
-#: pl_gram.y:3865
+#: pl_gram.y:3939
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "курсор \"%s\" має аргументи"
 
-#: pl_gram.y:3907
+#: pl_gram.y:3984
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "курсор \"%s\" не має аргументу \"%s\""
 
-#: pl_gram.y:3927
+#: pl_gram.y:4004
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "значення параметра \"%s\" курсора \"%s\" вказано неодноразово"
 
-#: pl_gram.y:3948
+#: pl_gram.y:4026
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "недостатньо аргументів для курсора \"%s\""
 
-#: pl_gram.y:3955
+#: pl_gram.y:4033
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "занадто багато аргументів для курсора \"%s\""
 
-#: pl_gram.y:4041
+#: pl_gram.y:4113
 msgid "unrecognized RAISE statement option"
 msgstr "нерозпізнаний параметр оператора RAISE"
 
-#: pl_gram.y:4045
+#: pl_gram.y:4117
 msgid "syntax error, expected \"=\""
 msgstr "помилка синтаксису, очікувалось \"=\""
 
-#: pl_gram.y:4086
+#: pl_gram.y:4158
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "занадто багато параметрів вказано для RAISE"
 
-#: pl_gram.y:4090
+#: pl_gram.y:4162
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "занадто мало параметрів вказано для RAISE"
 
-#: pl_handler.c:156
+#: pl_handler.c:159
 msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
 msgstr "Обирає режим вирішення конфліктів між іменами змінних PL/pgSQL та іменами стовпців таблиць."
 
-#: pl_handler.c:165
+#: pl_handler.c:168
 msgid "Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."
 msgstr "Додає інформацію про параметри в частину DETAIL повідомлень, які виводяться під час помилок в INTO ... STRICT."
 
-#: pl_handler.c:173
+#: pl_handler.c:176
 msgid "Perform checks given in ASSERT statements."
 msgstr "Виконує перевірки, задані в операторах ASSERT."
 
-#: pl_handler.c:181
+#: pl_handler.c:184
 msgid "List of programming constructs that should produce a warning."
 msgstr "Список програмних конструкцій, які повинні видавати попередження."
 
-#: pl_handler.c:191
+#: pl_handler.c:194
 msgid "List of programming constructs that should produce an error."
 msgstr "Список програмних конструкцій, які повинні видавати помилку."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:525
+#: pl_scanner.c:543
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в кінці введення"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:541
+#: pl_scanner.c:559
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s в або поблизу \"%s\""
diff --git a/src/pl/plpgsql/src/sql/plpgsql_domain.sql b/src/pl/plpgsql/src/sql/plpgsql_domain.sql
index 8f99aae5a9f..4c5dd7dc707 100644
--- a/src/pl/plpgsql/src/sql/plpgsql_domain.sql
+++ b/src/pl/plpgsql/src/sql/plpgsql_domain.sql
@@ -277,3 +277,13 @@ $$ LANGUAGE plpgsql;
 SELECT * FROM test_assign_ordered_named_pairs(1,2,3);
 SELECT * FROM test_assign_ordered_named_pairs(2,1,3);
 SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
+
+CREATE FUNCTION test_null_ordered_named_pair()
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair;
+begin
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_null_ordered_named_pair();
diff --git a/src/pl/plpgsql/src/sql/plpgsql_trap.sql b/src/pl/plpgsql/src/sql/plpgsql_trap.sql
index 5459b347e7f..731d592040e 100644
--- a/src/pl/plpgsql/src/sql/plpgsql_trap.sql
+++ b/src/pl/plpgsql/src/sql/plpgsql_trap.sql
@@ -85,13 +85,11 @@ drop table foo;
 
 create function trap_timeout() returns void as $$
 begin
-  declare x int;
   begin
-    -- we assume this will take longer than 1 second:
-    select count(*) into x from generate_series(1, 1_000_000_000_000);
+    perform pg_sleep(10);
   exception
     when others then
-      raise notice 'caught others?';
+      raise notice 'caught others: %', sqlerrm;
     when query_canceled then
       raise notice 'nyeah nyeah, can''t stop me';
   end;
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index f959083a0bd..25f295c3709 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -11,7 +11,7 @@ ifeq ($(PORTNAME), win32)
 override python_libspec =
 endif
 
-override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(python_includespec)
 
 rpathdir = $(python_libdir)
 
diff --git a/src/pl/plpython/expected/plpython_unicode.out b/src/pl/plpython/expected/plpython_unicode.out
index fd54b0b88e8..bd8d9c561c9 100644
--- a/src/pl/plpython/expected/plpython_unicode.out
+++ b/src/pl/plpython/expected/plpython_unicode.out
@@ -1,11 +1,16 @@
 --
 -- Unicode handling
 --
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
 --
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 SET client_encoding TO UTF8;
 CREATE TABLE unicode_test (
 	testvalue  text NOT NULL
diff --git a/src/pl/plpython/expected/plpython_unicode_1.out b/src/pl/plpython/expected/plpython_unicode_1.out
new file mode 100644
index 00000000000..f8b21fd7eb7
--- /dev/null
+++ b/src/pl/plpython/expected/plpython_unicode_1.out
@@ -0,0 +1,12 @@
+--
+-- Unicode handling
+--
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
+--
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index f6d10045e5c..27689edb3fd 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -143,14 +143,7 @@ PLy_elog_impl(int elevel, const char *fmt,...)
 	{
 		Py_XDECREF(exc);
 		Py_XDECREF(val);
-		/* Must release all the objects in the traceback stack */
-		while (tb != NULL && tb != Py_None)
-		{
-			PyObject   *tb_prev = tb;
-
-			tb = PyObject_GetAttrString(tb, "tb_next");
-			Py_DECREF(tb_prev);
-		}
+		Py_XDECREF(tb);
 		/* For neatness' sake, also release our string buffers */
 		if (fmt)
 			pfree(emsg.data);
@@ -343,6 +336,17 @@ PLy_traceback(PyObject *e, PyObject *v, PyObject *tb,
 		tb = PyObject_GetAttrString(tb, "tb_next");
 		if (tb == NULL)
 			elog(ERROR, "could not traverse Python traceback");
+
+		/*
+		 * Release the refcount that PyObject_GetAttrString acquired on the
+		 * next frame object.  We don't need it, because our caller has a
+		 * refcount on the first frame object and the frame objects each have
+		 * a refcount on the next one.  If we tried to hold this refcount
+		 * longer, it would greatly complicate cleanup in the event of a
+		 * failure in the above PG_TRY block.
+		 */
+		Py_DECREF(tb);
+
 		(*tb_depth)++;
 	}
 
@@ -376,6 +380,10 @@ PLy_get_sqlerrcode(PyObject *exc, int *sqlerrcode)
 
 /*
  * Extract the error data from a SPIError
+ *
+ * Note: the returned string values are pointers into the given PyObject.
+ * They must not be free()'d, and are not guaranteed to be valid once
+ * we stop holding a reference on the PyObject.
  */
 static void
 PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail,
@@ -412,6 +420,11 @@ PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail,
  *
  * Note: position and query attributes are never set for Error so, unlike
  * PLy_get_spi_error_data, this function doesn't return them.
+ *
+ * Note: the returned string values are palloc'd in the current context.
+ * While our caller could pfree them later, there's no real need to do so,
+ * and it would be complicated to handle both this convention and that of
+ * PLy_get_spi_error_data.
  */
 static void
 PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint,
diff --git a/src/pl/plpython/po/es.po b/src/pl/plpython/po/es.po
index bae86f7219b..06d72916610 100644
--- a/src/pl/plpython/po/es.po
+++ b/src/pl/plpython/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:39+0000\n"
+"POT-Creation-Date: 2026-02-06 23:08+0000\n"
 "PO-Revision-Date: 2024-11-16 14:24+0100\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
@@ -21,269 +21,269 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.0.2\n"
 
-#: plpy_cursorobject.c:72
+#: plpy_cursorobject.c:91
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor espera una consulta o un plan"
 
-#: plpy_cursorobject.c:154
+#: plpy_cursorobject.c:177
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor lleva una secuencia como segundo argumento"
 
-#: plpy_cursorobject.c:170 plpy_spi.c:204
+#: plpy_cursorobject.c:193 plpy_spi.c:200
 #, c-format
 msgid "could not execute plan"
 msgstr "no se pudo ejecutar el plan"
 
-#: plpy_cursorobject.c:173 plpy_spi.c:207
+#: plpy_cursorobject.c:196 plpy_spi.c:203
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Se esperaba una secuencia de %d argumento, se obtuvo %d: %s"
 msgstr[1] "Se esperaba una secuencia de %d argumentos, se obtuvo %d: %s"
 
-#: plpy_cursorobject.c:317
+#: plpy_cursorobject.c:349
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "iterando un cursor cerrado"
 
-#: plpy_cursorobject.c:325 plpy_cursorobject.c:391
+#: plpy_cursorobject.c:357 plpy_cursorobject.c:423
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "iterando un cursor en una subtransacción abortada"
 
-#: plpy_cursorobject.c:383
+#: plpy_cursorobject.c:415
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "haciendo «fetch» en un cursor cerrado"
 
-#: plpy_cursorobject.c:426 plpy_spi.c:393
+#: plpy_cursorobject.c:458 plpy_spi.c:389
 #, c-format
 msgid "query result has too many rows to fit in a Python list"
 msgstr "el resultado de la consulta tiene demasiados registros y no entran en una lista de Python"
 
-#: plpy_cursorobject.c:478
+#: plpy_cursorobject.c:510
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "cerrando un cursor en una subtransacción abortada"
 
-#: plpy_elog.c:122 plpy_elog.c:123 plpy_plpymodule.c:530
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:527
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:139
+#: plpy_exec.c:137
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "modo de retorno de conjunto de función no soportado"
 
-#: plpy_exec.c:140
+#: plpy_exec.c:138
 #, c-format
 msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr "Las funciones PL/Python que retornan conjuntos sólo permiten retornar un valor por invocación."
 
-#: plpy_exec.c:153
+#: plpy_exec.c:151
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado no puede ser iterado"
 
-#: plpy_exec.c:154
+#: plpy_exec.c:152
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "Los funciones PL/Python que retornan conjuntos deben retornar un objeto iterable."
 
-#: plpy_exec.c:168
+#: plpy_exec.c:166
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "error extrayendo el próximo elemento del iterador"
 
-#: plpy_exec.c:211
+#: plpy_exec.c:209
 #, c-format
 msgid "PL/Python procedure did not return None"
 msgstr "procedimiento PL/Python no returnó None"
 
-#: plpy_exec.c:215
+#: plpy_exec.c:213
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "función PL/Python con tipo de retorno «void» no retorna None"
 
-#: plpy_exec.c:246
+#: plpy_exec.c:244
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "se llamó una función que retorna un registro en un contexto que no puede aceptarlo"
 
-#: plpy_exec.c:392 plpy_exec.c:416
+#: plpy_exec.c:390 plpy_exec.c:414
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "valor de retorno no esperado desde el procedimiento disparador"
 
-#: plpy_exec.c:393
+#: plpy_exec.c:391
 #, c-format
 msgid "Expected None or a string."
 msgstr "Se esperaba None o una cadena."
 
-#: plpy_exec.c:406
+#: plpy_exec.c:404
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "función de disparador de PL/Python retorno «MODIFY» en un disparador de tipo DELETE -- ignorado"
 
-#: plpy_exec.c:417
+#: plpy_exec.c:415
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
 
-#: plpy_exec.c:468
+#: plpy_exec.c:466
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falló, mientras se inicializaban los argumentos"
 
-#: plpy_exec.c:472
+#: plpy_exec.c:470
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
 
-#: plpy_exec.c:701
+#: plpy_exec.c:699
 #, c-format
 msgid "while creating return value"
 msgstr "mientras se creaba el valor de retorno"
 
-#: plpy_exec.c:952
+#: plpy_exec.c:950
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
 
-#: plpy_exec.c:957
+#: plpy_exec.c:955
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] no es un diccionario"
 
-#: plpy_exec.c:982
+#: plpy_exec.c:980
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "el nombre del atributo de TD[\"new\"] en la posición %d no es una cadena"
 
-#: plpy_exec.c:989
+#: plpy_exec.c:987
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "la llave «%s» en TD[\"new\"] no existe como columna en la fila disparadora"
 
-#: plpy_exec.c:994
+#: plpy_exec.c:992
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "no se puede definir el atributo de sistema «%s»"
 
-#: plpy_exec.c:999
+#: plpy_exec.c:997
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "no se puede definir el atributo generado «%s»"
 
-#: plpy_exec.c:1057
+#: plpy_exec.c:1055
 #, c-format
 msgid "while modifying trigger row"
 msgstr "mientras se modificaba la fila de disparador"
 
 # FIXME not very happy with this
-#: plpy_exec.c:1115
+#: plpy_exec.c:1107
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "abortando una subtransacción que no se ha cerrado"
 
-#: plpy_main.c:109
+#: plpy_main.c:112
 #, 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:110
+#: plpy_main.c:113
 #, 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:122
+#: plpy_main.c:125
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "error no capturado en la inicialización"
 
-#: plpy_main.c:145
+#: plpy_main.c:148
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpy_main.c:154
+#: plpy_main.c:157
 #, c-format
 msgid "could not initialize globals"
 msgstr "no se pudo inicializar las globales"
 
-#: plpy_main.c:352
+#: plpy_main.c:353
 #, c-format
 msgid "PL/Python procedure \"%s\""
 msgstr "procedimiento PL/Python «%s»"
 
-#: plpy_main.c:355
+#: plpy_main.c:356
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "función PL/Python «%s»"
 
-#: plpy_main.c:363
+#: plpy_main.c:364
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "bloque de código anónimo de PL/Python"
 
-#: plpy_plpymodule.c:168 plpy_plpymodule.c:171
+#: plpy_plpymodule.c:165 plpy_plpymodule.c:168
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "no se pudo importar el módulo «plpy»"
 
-#: plpy_plpymodule.c:182
+#: plpy_plpymodule.c:179
 #, c-format
 msgid "could not create the spiexceptions module"
 msgstr "no se pudo crear el módulo spiexceptions"
 
-#: plpy_plpymodule.c:190
+#: plpy_plpymodule.c:187
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "no se pudo importar el módulo spiexceptions"
 
-#: plpy_plpymodule.c:257
+#: plpy_plpymodule.c:254
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "no se pudo generar excepciones SPI"
 
-#: plpy_plpymodule.c:425
+#: plpy_plpymodule.c:422
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "no se pudo desempaquetar los argumentos de plpy.elog"
 
-#: plpy_plpymodule.c:434
+#: plpy_plpymodule.c:431
 msgid "could not parse error message in plpy.elog"
 msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpy_plpymodule.c:451
+#: plpy_plpymodule.c:448
 #, c-format
 msgid "argument 'message' given by name and position"
 msgstr "el argumento 'message' fue pasado por nombre y posición"
 
-#: plpy_plpymodule.c:478
+#: plpy_plpymodule.c:475
 #, c-format
 msgid "'%s' is an invalid keyword argument for this function"
 msgstr "«%s» no es un argumento válido para esta función"
 
-#: plpy_plpymodule.c:489 plpy_plpymodule.c:495
+#: plpy_plpymodule.c:486 plpy_plpymodule.c:492
 #, c-format
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: plpy_procedure.c:226
+#: 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:230
+#: plpy_procedure.c:227
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "las funciones PL/Python no pueden retornar el tipo %s"
 
-#: plpy_procedure.c:308
+#: plpy_procedure.c:305
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
@@ -298,57 +298,57 @@ msgstr "no se pudo compilar la función PL/Python «%s»"
 msgid "could not compile anonymous PL/Python code block"
 msgstr "no se pudo compilar el bloque anónimo PL/Python"
 
-#: plpy_resultobject.c:117 plpy_resultobject.c:143 plpy_resultobject.c:169
+#: plpy_resultobject.c:148 plpy_resultobject.c:174 plpy_resultobject.c:200
 #, c-format
 msgid "command did not produce a result set"
 msgstr "la orden no produjo un conjunto de resultados"
 
-#: plpy_spi.c:56
+#: plpy_spi.c:53
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "el segundo argumento de plpy.prepare debe ser una secuencia"
 
-#: plpy_spi.c:98
+#: plpy_spi.c:94
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: el nombre de tipo en la posición %d no es una cadena"
 
-#: plpy_spi.c:170
+#: plpy_spi.c:166
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera una consulta o un plan"
 
-#: plpy_spi.c:188
+#: plpy_spi.c:184
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute lleva una secuencia como segundo argumento"
 
-#: plpy_spi.c:289
+#: plpy_spi.c:285
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "falló SPI_execute_plan: %s"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:327
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "falló SPI_execute: %s"
 
-#: plpy_subxactobject.c:92
+#: plpy_subxactobject.c:102
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "ya se ha entrado en esta subtransacción"
 
-#: plpy_subxactobject.c:98 plpy_subxactobject.c:156
+#: plpy_subxactobject.c:108 plpy_subxactobject.c:166
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "ya se ha salido de esta subtransacción"
 
-#: plpy_subxactobject.c:150
+#: plpy_subxactobject.c:160
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "no se ha entrado en esta subtransacción"
 
-#: plpy_subxactobject.c:162
+#: plpy_subxactobject.c:172
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "no hay una subtransacción de la cual salir"
@@ -368,87 +368,87 @@ msgstr "no se encontró atributo Decimal en el módulo"
 msgid "conversion from numeric to Decimal failed"
 msgstr "falló la conversión de numeric a Decimal"
 
-#: plpy_typeio.c:912
+#: plpy_typeio.c:915
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "no se pudo crear la representación de cadena de bytes de Python"
 
-#: plpy_typeio.c:1049
+#: plpy_typeio.c:1052
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "no se pudo crear la representación de cadena de texto del objeto de Python"
 
-#: plpy_typeio.c:1060
+#: plpy_typeio.c:1063
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "no se pudo convertir el objeto Python a un cstring: la representación de cadena Python parece tener bytes nulos (\\0)"
 
-#: plpy_typeio.c:1157
+#: plpy_typeio.c:1160
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "el valor de retorno de la función con tipo de retorno array no es una secuencia Python"
 
-#: plpy_typeio.c:1202
+#: plpy_typeio.c:1205
 #, c-format
 msgid "could not determine sequence length for function return value"
 msgstr "no se pudo determinar el largo de secuencia del retorno de valor de la función"
 
-#: plpy_typeio.c:1222 plpy_typeio.c:1237 plpy_typeio.c:1253
+#: plpy_typeio.c:1225 plpy_typeio.c:1240 plpy_typeio.c:1256
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "los arrays multidimensionales deben tener expresiones de arrays con dimensiones coincidentes"
 
-#: plpy_typeio.c:1227
+#: plpy_typeio.c:1230
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "el número de dimensiones del array excede el máximo permitido (%d)"
 
-#: plpy_typeio.c:1329
+#: plpy_typeio.c:1332
 #, c-format
 msgid "malformed record literal: \"%s\""
 msgstr "literal de record no es válido: «%s»"
 
-#: plpy_typeio.c:1330
+#: plpy_typeio.c:1333
 #, c-format
 msgid "Missing left parenthesis."
 msgstr "Falta paréntesis izquierdo."
 
-#: plpy_typeio.c:1331 plpy_typeio.c:1532
+#: plpy_typeio.c:1334 plpy_typeio.c:1535
 #, c-format
 msgid "To return a composite type in an array, return the composite type as a Python tuple, e.g., \"[('foo',)]\"."
 msgstr "Para retornar un tipo compuesto en un array, retorne el tipo compuesto como una tupla de Python, e.g., «[('foo',)]»."
 
-#: plpy_typeio.c:1378
+#: plpy_typeio.c:1381
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la llave «%s» no fue encontrada en el mapa"
 
-#: plpy_typeio.c:1379
+#: plpy_typeio.c:1382
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Para retornar null en una columna, agregue el valor None al mapa, con llave llamada igual que la columna."
 
-#: plpy_typeio.c:1432
+#: plpy_typeio.c:1435
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "el tamaño de la secuencia retornada no concuerda con el número de columnas de la fila"
 
-#: plpy_typeio.c:1530
+#: plpy_typeio.c:1533
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "el atributo «%s» no existe en el objeto Python"
 
-#: plpy_typeio.c:1533
+#: plpy_typeio.c:1536
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Para retornar null en una columna, haga que el objeto retornado tenga un atributo llamado igual que la columna, con valor None."
 
-#: plpy_util.c:31
+#: plpy_util.c:29
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "no se pudo convertir el objeto Unicode de Python a bytes"
 
-#: plpy_util.c:37
+#: plpy_util.c:35
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "no se pudo extraer bytes desde la cadena codificada"
diff --git a/src/pl/plpython/po/ru.po b/src/pl/plpython/po/ru.po
index 0b57951c610..066976d50ab 100644
--- a/src/pl/plpython/po/ru.po
+++ b/src/pl/plpython/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
 "PO-Revision-Date: 2019-08-29 15:42+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "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"
 
-#: plpy_cursorobject.c:72
+#: plpy_cursorobject.c:91
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor ожидает запрос или план"
 
-#: plpy_cursorobject.c:154
+#: plpy_cursorobject.c:177
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor принимает в качестве второго аргумента последовательность"
 
-#: plpy_cursorobject.c:170 plpy_spi.c:204
+#: plpy_cursorobject.c:193 plpy_spi.c:200
 #, c-format
 msgid "could not execute plan"
 msgstr "нельзя выполнить план"
 
-#: plpy_cursorobject.c:173 plpy_spi.c:207
+#: plpy_cursorobject.c:196 plpy_spi.c:203
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -40,43 +40,43 @@ msgstr[0] "Ожидалась последовательность из %d ар
 msgstr[1] "Ожидалась последовательность из %d аргументов, получено %d: %s"
 msgstr[2] "Ожидалась последовательность из %d аргументов, получено %d: %s"
 
-#: plpy_cursorobject.c:317
+#: plpy_cursorobject.c:349
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "перемещение закрытого курсора"
 
-#: plpy_cursorobject.c:325 plpy_cursorobject.c:391
+#: plpy_cursorobject.c:357 plpy_cursorobject.c:423
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "перемещение курсора в прерванной подтранзакции"
 
-#: plpy_cursorobject.c:383
+#: plpy_cursorobject.c:415
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "выборка из закрытого курсора"
 
-#: plpy_cursorobject.c:426 plpy_spi.c:393
+#: plpy_cursorobject.c:458 plpy_spi.c:389
 #, c-format
 msgid "query result has too many rows to fit in a Python list"
 msgstr ""
 "результат запроса содержит слишком много строк для передачи в списке Python"
 
-#: plpy_cursorobject.c:478
+#: plpy_cursorobject.c:510
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "закрытие курсора в прерванной подтранзакции"
 
-#: plpy_elog.c:122 plpy_elog.c:123 plpy_plpymodule.c:530
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:527
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:139
+#: plpy_exec.c:137
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "неподдерживаемый режим возврата для функции с результатом-множеством"
 
-#: plpy_exec.c:140
+#: plpy_exec.c:138
 #, c-format
 msgid ""
 "PL/Python set-returning functions only support returning one value per call."
@@ -84,51 +84,51 @@ msgstr ""
 "Функции PL/Python с результатом-множеством могут возвращать только одно "
 "значение за вызов."
 
-#: plpy_exec.c:153
+#: plpy_exec.c:151
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "возвращаемый объект не поддерживает итерации"
 
-#: plpy_exec.c:154
+#: plpy_exec.c:152
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "Функции PL/Python с результатом-множеством должны возвращать объекты с "
 "возможностью итерации."
 
-#: plpy_exec.c:168
+#: plpy_exec.c:166
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "ошибка получения следующего элемента из итератора"
 
-#: plpy_exec.c:211
+#: plpy_exec.c:209
 #, c-format
 msgid "PL/Python procedure did not return None"
 msgstr "процедура PL/Python вернула не None"
 
-#: plpy_exec.c:215
+#: plpy_exec.c:213
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "функция PL/Python с типом результата \"void\" вернула не None"
 
-#: plpy_exec.c:246
+#: plpy_exec.c:244
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
 
-#: plpy_exec.c:392 plpy_exec.c:416
+#: plpy_exec.c:390 plpy_exec.c:414
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "триггерная процедура вернула недопустимое значение"
 
-#: plpy_exec.c:393
+#: plpy_exec.c:391
 #, c-format
 msgid "Expected None or a string."
 msgstr "Ожидалось None или строка."
 
-#: plpy_exec.c:406
+#: plpy_exec.c:404
 #, c-format
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
@@ -136,42 +136,42 @@ msgstr ""
 "триггерная функция PL/Python вернула \"MODIFY\" в триггере DELETE -- "
 "игнорируется"
 
-#: plpy_exec.c:417
+#: plpy_exec.c:415
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Ожидалось None, \"OK\", \"SKIP\" или \"MODIFY\"."
 
-#: plpy_exec.c:468
+#: plpy_exec.c:466
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "ошибка в PyList_SetItem() при настройке аргументов"
 
-#: plpy_exec.c:472
+#: plpy_exec.c:470
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "ошибка в PyDict_SetItemString() при настройке аргументов"
 
-#: plpy_exec.c:701
+#: plpy_exec.c:699
 #, c-format
 msgid "while creating return value"
 msgstr "при создании возвращаемого значения"
 
-#: plpy_exec.c:952
+#: plpy_exec.c:950
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "элемент TD[\"new\"] удалён -- изменить строку нельзя"
 
-#: plpy_exec.c:957
+#: plpy_exec.c:955
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] - не словарь"
 
-#: plpy_exec.c:982
+#: plpy_exec.c:980
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "ключ словаря TD[\"new\"] с порядковым номером %d не является строкой"
 
-#: plpy_exec.c:989
+#: plpy_exec.c:987
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -180,121 +180,121 @@ msgstr ""
 "ключу \"%s\", найденному в TD[\"new\"], не соответствует столбец в строке, "
 "обрабатываемой триггером"
 
-#: plpy_exec.c:994
+#: plpy_exec.c:992
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "присвоить значение системному атрибуту \"%s\" нельзя"
 
-#: plpy_exec.c:999
+#: plpy_exec.c:997
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "присвоить значение генерируемому столбцу \"%s\" нельзя"
 
-#: plpy_exec.c:1057
+#: plpy_exec.c:1055
 #, c-format
 msgid "while modifying trigger row"
 msgstr "при изменении строки в триггере"
 
-#: plpy_exec.c:1115
+#: plpy_exec.c:1107
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "принудительное прерывание незавершённой подтранзакции"
 
-#: plpy_main.c:109
+#: plpy_main.c:112
 #, c-format
 msgid "multiple Python libraries are present in session"
 msgstr "в сеансе представлено несколько библиотек Python"
 
-#: plpy_main.c:110
+#: plpy_main.c:113
 #, c-format
 msgid "Only one Python major version can be used in one session."
 msgstr "В одном сеансе нельзя использовать Python разных старших версий."
 
-#: plpy_main.c:122
+#: plpy_main.c:125
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "необработанная ошибка при инициализации"
 
-#: plpy_main.c:145
+#: plpy_main.c:148
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "не удалось импортировать модуль \"__main__\""
 
-#: plpy_main.c:154
+#: plpy_main.c:157
 #, c-format
 msgid "could not initialize globals"
 msgstr "не удалось инициализировать глобальные данные"
 
-#: plpy_main.c:352
+#: plpy_main.c:353
 #, c-format
 msgid "PL/Python procedure \"%s\""
 msgstr "процедура PL/Python \"%s\""
 
-#: plpy_main.c:355
+#: plpy_main.c:356
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "функция PL/Python \"%s\""
 
-#: plpy_main.c:363
+#: plpy_main.c:364
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "анонимный блок кода PL/Python"
 
-#: plpy_plpymodule.c:168 plpy_plpymodule.c:171
+#: plpy_plpymodule.c:165 plpy_plpymodule.c:168
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "не удалось импортировать модуль \"plpy\""
 
-#: plpy_plpymodule.c:182
+#: plpy_plpymodule.c:179
 #, c-format
 msgid "could not create the spiexceptions module"
 msgstr "не удалось создать модуль spiexceptions"
 
-#: plpy_plpymodule.c:190
+#: plpy_plpymodule.c:187
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "не удалось добавить модуль spiexceptions"
 
-#: plpy_plpymodule.c:257
+#: plpy_plpymodule.c:254
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "не удалось сгенерировать исключения SPI"
 
-#: plpy_plpymodule.c:425
+#: plpy_plpymodule.c:422
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "не удалось распаковать аргументы в plpy.elog"
 
-#: plpy_plpymodule.c:434
+#: plpy_plpymodule.c:431
 msgid "could not parse error message in plpy.elog"
 msgstr "не удалось разобрать сообщение об ошибке в plpy.elog"
 
-#: plpy_plpymodule.c:451
+#: plpy_plpymodule.c:448
 #, c-format
 msgid "argument 'message' given by name and position"
 msgstr "аргумент 'message' задан и по имени, и по позиции"
 
-#: plpy_plpymodule.c:478
+#: plpy_plpymodule.c:475
 #, c-format
 msgid "'%s' is an invalid keyword argument for this function"
 msgstr "'%s' - недопустимое ключевое слово (аргумент) для этой функции"
 
-#: plpy_plpymodule.c:489 plpy_plpymodule.c:495
+#: plpy_plpymodule.c:486 plpy_plpymodule.c:492
 #, c-format
 msgid "invalid SQLSTATE code"
 msgstr "неверный код SQLSTATE"
 
-#: plpy_procedure.c:226
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызываться только в триггерах"
 
-#: plpy_procedure.c:230
+#: plpy_procedure.c:227
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "функции PL/Python не могут возвращать тип %s"
 
-#: plpy_procedure.c:308
+#: plpy_procedure.c:305
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "функции PL/Python не могут принимать тип %s"
@@ -309,57 +309,57 @@ msgstr "не удалось скомпилировать функцию PL/Pytho
 msgid "could not compile anonymous PL/Python code block"
 msgstr "не удалось скомпилировать анонимный блок кода PL/Python"
 
-#: plpy_resultobject.c:117 plpy_resultobject.c:143 plpy_resultobject.c:169
+#: plpy_resultobject.c:148 plpy_resultobject.c:174 plpy_resultobject.c:200
 #, c-format
 msgid "command did not produce a result set"
 msgstr "команда не выдала результирующий набор"
 
-#: plpy_spi.c:56
+#: plpy_spi.c:53
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "вторым аргументом plpy.prepare должна быть последовательность"
 
-#: plpy_spi.c:98
+#: plpy_spi.c:94
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: имя типа с порядковым номером %d не является строкой"
 
-#: plpy_spi.c:170
+#: plpy_spi.c:166
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute ожидает запрос или план"
 
-#: plpy_spi.c:188
+#: plpy_spi.c:184
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute принимает в качестве второго аргумента последовательность"
 
-#: plpy_spi.c:289
+#: plpy_spi.c:285
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "ошибка в SPI_execute_plan: %s"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:327
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "ошибка в SPI_execute: %s"
 
-#: plpy_subxactobject.c:92
+#: plpy_subxactobject.c:102
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "эта подтранзакция уже начата"
 
-#: plpy_subxactobject.c:98 plpy_subxactobject.c:156
+#: plpy_subxactobject.c:108 plpy_subxactobject.c:166
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "эта подтранзакция уже закончена"
 
-#: plpy_subxactobject.c:150
+#: plpy_subxactobject.c:160
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "эта подтранзакция ещё не начата"
 
-#: plpy_subxactobject.c:162
+#: plpy_subxactobject.c:172
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "нет подтранзакции, которую нужно закончить"
@@ -379,17 +379,17 @@ msgstr "в модуле нет атрибута Decimal"
 msgid "conversion from numeric to Decimal failed"
 msgstr "не удалось преобразовать numeric в Decimal"
 
-#: plpy_typeio.c:912
+#: plpy_typeio.c:915
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "не удалось создать байтовое представление объекта Python"
 
-#: plpy_typeio.c:1049
+#: plpy_typeio.c:1052
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "не удалось создать строковое представление объекта Python"
 
-#: plpy_typeio.c:1060
+#: plpy_typeio.c:1063
 #, c-format
 msgid ""
 "could not convert Python object into cstring: Python string representation "
@@ -398,7 +398,7 @@ msgstr ""
 "не удалось преобразовать объект Python в cstring: похоже, представление "
 "строки Python содержит нулевые байты"
 
-#: plpy_typeio.c:1157
+#: plpy_typeio.c:1160
 #, c-format
 msgid ""
 "return value of function with array return type is not a Python sequence"
@@ -406,14 +406,14 @@ msgstr ""
 "возвращаемое значение функции с результатом-массивом не является "
 "последовательностью"
 
-#: plpy_typeio.c:1202
+#: plpy_typeio.c:1205
 #, c-format
 msgid "could not determine sequence length for function return value"
 msgstr ""
 "не удалось определить длину последовательности в возвращаемом функцией "
 "значении"
 
-#: plpy_typeio.c:1222 plpy_typeio.c:1237 plpy_typeio.c:1253
+#: plpy_typeio.c:1225 plpy_typeio.c:1240 plpy_typeio.c:1256
 #, c-format
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
@@ -421,22 +421,22 @@ msgstr ""
 "для многомерных массивов должны задаваться выражения с соответствующими "
 "размерностями"
 
-#: plpy_typeio.c:1227
+#: plpy_typeio.c:1230
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "число размерностей массива превышает предел (%d)"
 
-#: plpy_typeio.c:1329
+#: plpy_typeio.c:1332
 #, c-format
 msgid "malformed record literal: \"%s\""
 msgstr "ошибка в литерале записи: \"%s\""
 
-#: plpy_typeio.c:1330
+#: plpy_typeio.c:1333
 #, c-format
 msgid "Missing left parenthesis."
 msgstr "Отсутствует левая скобка."
 
-#: plpy_typeio.c:1331 plpy_typeio.c:1532
+#: plpy_typeio.c:1334 plpy_typeio.c:1535
 #, c-format
 msgid ""
 "To return a composite type in an array, return the composite type as a "
@@ -445,12 +445,12 @@ msgstr ""
 "Чтобы возвратить составной тип в массиве, нужно возвратить составное "
 "значение в виде кортежа Python, например: \"[('foo',)]\"."
 
-#: plpy_typeio.c:1378
+#: plpy_typeio.c:1381
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "ключ \"%s\" не найден в сопоставлении"
 
-#: plpy_typeio.c:1379
+#: plpy_typeio.c:1382
 #, c-format
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
@@ -459,17 +459,17 @@ msgstr ""
 "Чтобы присвоить столбцу NULL, добавьте в сопоставление значение None с "
 "ключом-именем столбца."
 
-#: plpy_typeio.c:1432
+#: plpy_typeio.c:1435
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "длина возвращённой последовательности не равна числу столбцов в строке"
 
-#: plpy_typeio.c:1530
+#: plpy_typeio.c:1533
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "в объекте Python не существует атрибут \"%s\""
 
-#: plpy_typeio.c:1533
+#: plpy_typeio.c:1536
 #, c-format
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
@@ -478,12 +478,12 @@ msgstr ""
 "Чтобы присвоить столбцу NULL, присвойте возвращаемому значению атрибут с "
 "именем столбца и значением None."
 
-#: plpy_util.c:31
+#: plpy_util.c:29
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "не удалось преобразовать объект Python Unicode в байты"
 
-#: plpy_util.c:37
+#: plpy_util.c:35
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "не удалось извлечь байты из кодированной строки"
diff --git a/src/pl/plpython/po/sv.po b/src/pl/plpython/po/sv.po
index 54f3db92ff4..95e0d4d2f05 100644
--- a/src/pl/plpython/po/sv.po
+++ b/src/pl/plpython/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
 "POT-Creation-Date: 2024-07-13 15:38+0000\n"
-"PO-Revision-Date: 2024-07-13 18:15+0200\n"
+"PO-Revision-Date: 2025-07-29 19:47+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
diff --git a/src/pl/plpython/po/uk.po b/src/pl/plpython/po/uk.po
index 22ef7bc349b..03834b71442 100644
--- a/src/pl/plpython/po/uk.po
+++ b/src/pl/plpython/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:09+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-12-31 02:09+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,25 +14,25 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/plpython.pot\n"
-"X-Crowdin-File-ID: 1014\n"
+"X-Crowdin-File: /REL_18_STABLE/plpython.pot\n"
+"X-Crowdin-File-ID: 1065\n"
 
-#: plpy_cursorobject.c:72
+#: plpy_cursorobject.c:91
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor очікував запит або план"
 
-#: plpy_cursorobject.c:155
+#: plpy_cursorobject.c:177
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.сursor приймає як другий аргумент послідовність"
 
-#: plpy_cursorobject.c:171 plpy_spi.c:205
+#: plpy_cursorobject.c:193 plpy_spi.c:200
 #, c-format
 msgid "could not execute plan"
 msgstr "не вдалося виконати план"
 
-#: plpy_cursorobject.c:174 plpy_spi.c:208
+#: plpy_cursorobject.c:196 plpy_spi.c:203
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -41,246 +41,246 @@ msgstr[1] "Очікувалась послідовність %d аргумент
 msgstr[2] "Очікувалась послідовність %d аргументів, отримано %d: %s"
 msgstr[3] "Очікувалась послідовність %d аргумента, отримано %d: %s"
 
-#: plpy_cursorobject.c:321
+#: plpy_cursorobject.c:349
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "ітерація закритого курсора"
 
-#: plpy_cursorobject.c:329 plpy_cursorobject.c:395
+#: plpy_cursorobject.c:357 plpy_cursorobject.c:423
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "ітерація курсора в перерваній субтранзакції"
 
-#: plpy_cursorobject.c:387
+#: plpy_cursorobject.c:415
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "витяг з закритого курсору"
 
-#: plpy_cursorobject.c:430 plpy_spi.c:401
+#: plpy_cursorobject.c:458 plpy_spi.c:389
 #, c-format
 msgid "query result has too many rows to fit in a Python list"
 msgstr "результат запиту має забагато рядків для передачі у список Python"
 
-#: plpy_cursorobject.c:482
+#: plpy_cursorobject.c:510
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "закриття курсора в перерваній транзакції"
 
-#: plpy_elog.c:122 plpy_elog.c:123 plpy_plpymodule.c:530
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:527
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:139
+#: plpy_exec.c:137
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "режим не підтримується для функцій, що повертають набір"
 
-#: plpy_exec.c:140
+#: plpy_exec.c:138
 #, c-format
 msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr "функції PL/Python підтримують лише одне значення на виклик, коли повертають набір."
 
-#: plpy_exec.c:153
+#: plpy_exec.c:151
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "повернутий об'єкт не підтримує ітерації"
 
-#: plpy_exec.c:154
+#: plpy_exec.c:152
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "функції PL/Python повинні повертати об'єкт з підтримкою ітерації, коли повертають набір."
 
-#: plpy_exec.c:168
+#: plpy_exec.c:166
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "помилка отримання наступного елемента від ітератора"
 
-#: plpy_exec.c:211
+#: plpy_exec.c:209
 #, c-format
 msgid "PL/Python procedure did not return None"
 msgstr "процедура PL/Python не повернула None"
 
-#: plpy_exec.c:215
+#: plpy_exec.c:213
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "PL/Python функція з типом результату \"void\" не повернули None"
 
-#: plpy_exec.c:246
+#: plpy_exec.c:244
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "функція, що повертає набір, викликана у контексті, що не приймає тип запис"
 
-#: plpy_exec.c:392 plpy_exec.c:416
+#: plpy_exec.c:390 plpy_exec.c:414
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "неочікуване значення процедури тригера"
 
-#: plpy_exec.c:393
+#: plpy_exec.c:391
 #, c-format
 msgid "Expected None or a string."
 msgstr "Очікувалось None або рядок."
 
-#: plpy_exec.c:406
+#: plpy_exec.c:404
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "Тригерна функція PL/Python повернула \"MODIFY\" в тригері DELETE -- проігноровано"
 
-#: plpy_exec.c:417
+#: plpy_exec.c:415
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Очікувалось None, \"OK\", \"SKIP\" або \"MODIFY\"."
 
-#: plpy_exec.c:468
+#: plpy_exec.c:466
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "помилка PyList_SetItem() під час встановлення параметрів"
 
-#: plpy_exec.c:472
+#: plpy_exec.c:470
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "помилка PyDict_SetItemString() під час встановлення параметрів"
 
-#: plpy_exec.c:701
+#: plpy_exec.c:699
 #, c-format
 msgid "while creating return value"
 msgstr "під час створення значення результату"
 
-#: plpy_exec.c:952
+#: plpy_exec.c:950
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] видалено, неможливо змінити рядок"
 
-#: plpy_exec.c:957
+#: plpy_exec.c:955
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] не є словником"
 
-#: plpy_exec.c:982
+#: plpy_exec.c:980
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "ключ словника TD[\"new\"] на порядковий позиції %d не є рядком"
 
-#: plpy_exec.c:989
+#: plpy_exec.c:987
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "ключ \"%s\" знайдений у TD[\"new\"] не існує як стовпець у рядку тригера"
 
-#: plpy_exec.c:994
+#: plpy_exec.c:992
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "не вдалося встановити системний атрибут \"%s\""
 
-#: plpy_exec.c:999
+#: plpy_exec.c:997
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "неможливо оновити згенерований стовпець \"%s\""
 
-#: plpy_exec.c:1057
+#: plpy_exec.c:1055
 #, c-format
 msgid "while modifying trigger row"
 msgstr "під час зміни рядка тригера"
 
-#: plpy_exec.c:1115
+#: plpy_exec.c:1107
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "примусове переривання субтранзакції, яка не вийшла"
 
-#: plpy_main.c:109
+#: plpy_main.c:112
 #, c-format
 msgid "multiple Python libraries are present in session"
 msgstr "декілька бібліотек Python присутні у сесії"
 
-#: plpy_main.c:110
+#: plpy_main.c:113
 #, c-format
 msgid "Only one Python major version can be used in one session."
 msgstr "За один сеанс може використовуватися лише одна основна версія Python."
 
-#: plpy_main.c:122
+#: plpy_main.c:125
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "неопрацьована помилка під час ініціалізації"
 
-#: plpy_main.c:145
+#: plpy_main.c:148
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "не вдалося імпортувати \"__main__\" модуль"
 
-#: plpy_main.c:154
+#: plpy_main.c:157
 #, c-format
 msgid "could not initialize globals"
 msgstr "не вдалося ініціалізувати globals"
 
-#: plpy_main.c:352
+#: plpy_main.c:353
 #, c-format
 msgid "PL/Python procedure \"%s\""
 msgstr "PL/Python процедура \"%s\""
 
-#: plpy_main.c:355
+#: plpy_main.c:356
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python функція \"%s\""
 
-#: plpy_main.c:363
+#: plpy_main.c:364
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "анонімні коди блоку PL/Python"
 
-#: plpy_plpymodule.c:168 plpy_plpymodule.c:171
+#: plpy_plpymodule.c:165 plpy_plpymodule.c:168
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "не вдалося імпортувати \"plpy\" модуль"
 
-#: plpy_plpymodule.c:182
+#: plpy_plpymodule.c:179
 #, c-format
 msgid "could not create the spiexceptions module"
 msgstr "не вдалося створити spiexceptions модуль"
 
-#: plpy_plpymodule.c:190
+#: plpy_plpymodule.c:187
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "не вдалося додати spiexceptions модуль"
 
-#: plpy_plpymodule.c:257
+#: plpy_plpymodule.c:254
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "не вдається створити винятки SPI"
 
-#: plpy_plpymodule.c:425
+#: plpy_plpymodule.c:422
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "не вдалося розпакувати аргументи в plpy.elog"
 
-#: plpy_plpymodule.c:434
+#: plpy_plpymodule.c:431
 msgid "could not parse error message in plpy.elog"
 msgstr "не вдалося проаналізувати повідомлення про помилку в plpy.elog"
 
-#: plpy_plpymodule.c:451
+#: plpy_plpymodule.c:448
 #, c-format
 msgid "argument 'message' given by name and position"
 msgstr "аргумент 'повідомлення' виданий за ім'ям та розташуванням"
 
-#: plpy_plpymodule.c:478
+#: plpy_plpymodule.c:475
 #, c-format
 msgid "'%s' is an invalid keyword argument for this function"
 msgstr "'%s' є неприпустимим ключовим словом-аргументом для цієї функції"
 
-#: plpy_plpymodule.c:489 plpy_plpymodule.c:495
+#: plpy_plpymodule.c:486 plpy_plpymodule.c:492
 #, c-format
 msgid "invalid SQLSTATE code"
 msgstr "неприпустимий код SQLSTATE"
 
-#: plpy_procedure.c:226
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "тригер-функція може викликатися лише як тригер"
 
-#: plpy_procedure.c:230
+#: plpy_procedure.c:227
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python функції не можуть повернути тип %s"
 
-#: plpy_procedure.c:308
+#: plpy_procedure.c:305
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python функції не можуть прийняти тип %s"
@@ -295,57 +295,57 @@ msgstr "не вдалося скомпілювати функцію PL/Python \"
 msgid "could not compile anonymous PL/Python code block"
 msgstr "не вдалося скомпілювати анонімні коди блоку PL/Python"
 
-#: plpy_resultobject.c:117 plpy_resultobject.c:143 plpy_resultobject.c:169
+#: plpy_resultobject.c:148 plpy_resultobject.c:174 plpy_resultobject.c:200
 #, c-format
 msgid "command did not produce a result set"
 msgstr "команда не створила набір результатів"
 
-#: plpy_spi.c:56
+#: plpy_spi.c:53
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "другий аргумент plpy.prepare має бути послідовністю"
 
-#: plpy_spi.c:98
+#: plpy_spi.c:94
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: ім'я на порядковий позиції %d не є рядком"
 
-#: plpy_spi.c:170
+#: plpy_spi.c:166
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute очікував запит або план"
 
-#: plpy_spi.c:189
+#: plpy_spi.c:184
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute приймає як другий аргумент послідовність"
 
-#: plpy_spi.c:297
+#: plpy_spi.c:285
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan не спрацював: %s"
 
-#: plpy_spi.c:339
+#: plpy_spi.c:327
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute не спрацював: %s"
 
-#: plpy_subxactobject.c:92
+#: plpy_subxactobject.c:102
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "ця субтранзакція вже почалась"
 
-#: plpy_subxactobject.c:98 plpy_subxactobject.c:156
+#: plpy_subxactobject.c:108 plpy_subxactobject.c:166
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "ця субтранзакція вже вийшла"
 
-#: plpy_subxactobject.c:150
+#: plpy_subxactobject.c:160
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "ця субтранзакція ще не почалася"
 
-#: plpy_subxactobject.c:162
+#: plpy_subxactobject.c:172
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "немає субтранзакції, щоб з неї вийти"
@@ -365,87 +365,87 @@ msgstr "відсутній атрибут Decimal у модулі"
 msgid "conversion from numeric to Decimal failed"
 msgstr "не вдалося виконати перетворення з numeric на Decimal"
 
-#: plpy_typeio.c:912
+#: plpy_typeio.c:915
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "не вдалося створити байтову репрезентацію об'єкта Python"
 
-#: plpy_typeio.c:1049
+#: plpy_typeio.c:1052
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "не вдалося створити рядкову репрезентацію об'єкта Python"
 
-#: plpy_typeio.c:1060
+#: plpy_typeio.c:1063
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "не вдалося перетворити об'єкт Python на cstring: репрезентація рядка Python містить значення null-байти"
 
-#: plpy_typeio.c:1157
+#: plpy_typeio.c:1160
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "значення функції з масивом в якості результату не є послідовністю Python"
 
-#: plpy_typeio.c:1202
+#: plpy_typeio.c:1205
 #, c-format
 msgid "could not determine sequence length for function return value"
 msgstr "не вдалося визначити довжину послідовності для значення функція"
 
-#: plpy_typeio.c:1222 plpy_typeio.c:1237 plpy_typeio.c:1253
+#: plpy_typeio.c:1225 plpy_typeio.c:1240 plpy_typeio.c:1256
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "для багатовимірних масивів повинні задаватись вирази з відповідними вимірами"
 
-#: plpy_typeio.c:1227
+#: plpy_typeio.c:1230
 #, c-format
 msgid "number of array dimensions exceeds the maximum allowed (%d)"
 msgstr "кількість вимірів масиву перевищує максимально дозволену (%d)"
 
-#: plpy_typeio.c:1329
+#: plpy_typeio.c:1332
 #, c-format
 msgid "malformed record literal: \"%s\""
 msgstr "невірно сформований літерал запису: \"%s\""
 
-#: plpy_typeio.c:1330
+#: plpy_typeio.c:1333
 #, c-format
 msgid "Missing left parenthesis."
 msgstr "Відсутня ліва дужка."
 
-#: plpy_typeio.c:1331 plpy_typeio.c:1532
+#: plpy_typeio.c:1334 plpy_typeio.c:1535
 #, c-format
 msgid "To return a composite type in an array, return the composite type as a Python tuple, e.g., \"[('foo',)]\"."
 msgstr "Щоб повернути складений тип в масиві, треба повернути композитний тип як кортеж Python, наприклад, \"[('foo',)]\"."
 
-#: plpy_typeio.c:1378
+#: plpy_typeio.c:1381
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "ключ \"%s\" не знайдено в зіставленні"
 
-#: plpy_typeio.c:1379
+#: plpy_typeio.c:1382
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Для повернення значення null в стовпці, додайте значення None з ключом, що дорівнює імені стовпця."
 
-#: plpy_typeio.c:1432
+#: plpy_typeio.c:1435
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "довжина повернутої послідовності не відповідає кількості стовпців у рядку"
 
-#: plpy_typeio.c:1530
+#: plpy_typeio.c:1533
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "атрибут \"%s\" не існує в об'єкті Python"
 
-#: plpy_typeio.c:1533
+#: plpy_typeio.c:1536
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Щоб повернути null в стовпці, результуючий об'єкт має мати атрибут з іменем стовпця зі значенням None."
 
-#: plpy_util.c:31
+#: plpy_util.c:29
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "не вдалося конвертувати об'єкт Python Unicode в байти"
 
-#: plpy_util.c:37
+#: plpy_util.c:35
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "не можливо отримати байт з закодованого рядка"
diff --git a/src/pl/plpython/sql/plpython_unicode.sql b/src/pl/plpython/sql/plpython_unicode.sql
index 14f7b4e0053..f45844b906e 100644
--- a/src/pl/plpython/sql/plpython_unicode.sql
+++ b/src/pl/plpython/sql/plpython_unicode.sql
@@ -1,11 +1,16 @@
 --
 -- Unicode handling
 --
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
 --
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 
 SET client_encoding TO UTF8;
 
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index ea52a2efc22..dd57f7d694c 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -11,7 +11,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I. -I$(srcdir) $(TCL_INCLUDE_SPEC) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(TCL_INCLUDE_SPEC)
 
 # On Windows, we don't link directly with the Tcl library; see below
 ifneq ($(PORTNAME), win32)
diff --git a/src/pl/tcl/expected/pltcl_unicode.out b/src/pl/tcl/expected/pltcl_unicode.out
index eea7d70664f..d33afd7548f 100644
--- a/src/pl/tcl/expected/pltcl_unicode.out
+++ b/src/pl/tcl/expected/pltcl_unicode.out
@@ -1,11 +1,16 @@
 --
 -- Unicode handling
 --
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
 --
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 SET client_encoding TO UTF8;
 CREATE TABLE unicode_test (
     testvalue  text NOT NULL
diff --git a/src/pl/tcl/expected/pltcl_unicode_1.out b/src/pl/tcl/expected/pltcl_unicode_1.out
new file mode 100644
index 00000000000..f8b21fd7eb7
--- /dev/null
+++ b/src/pl/tcl/expected/pltcl_unicode_1.out
@@ -0,0 +1,12 @@
+--
+-- Unicode handling
+--
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
+--
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/pl/tcl/po/es.po b/src/pl/tcl/po/es.po
index 5020e4ffb18..62c863e9a45 100644
--- a/src/pl/tcl/po/es.po
+++ b/src/pl/tcl/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pltcl (PostgreSQL) 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-16 19:38+0000\n"
-"PO-Revision-Date: 2024-11-16 14:24+0100\n"
+"POT-Creation-Date: 2026-02-06 23:08+0000\n"
+"PO-Revision-Date: 2025-09-21 11:42+0200\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
 "Language: es\n"
@@ -20,105 +20,105 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.2\n"
 
-#: pltcl.c:466
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "función PL/Tcl a ejecutar cuando se use pltcl por primera vez."
 
-#: pltcl.c:473
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "función PL/TclU a ejecutar cuando se use pltclu por primera vez."
 
-#: pltcl.c:640
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "la función «%s» está en el lenguaje equivocado"
 
-#: pltcl.c:651
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "la función «%s» no debe ser SECURITY DEFINER"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:685
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "procesando el parámetro %s"
 
-#: pltcl.c:838
+#: pltcl.c:841
 #, 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"
 
-#: pltcl.c:843
+#: pltcl.c:846
 #, 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"
 
-#: pltcl.c:1016
+#: pltcl.c:1019
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "se llamó una función que retorna un registro en un contexto que no puede aceptarlo"
 
-#: pltcl.c:1035
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "no se pudo interpretar el valor de retorno de la función: %s"
 
-#: pltcl.c:1302
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "no se pudo interpretar el valor de retorno del trigger: «%s»"
 
-#: pltcl.c:1387 pltcl.c:1814
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1388
+#: pltcl.c:1405
 #, c-format
 msgid ""
 "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr ""
 "%s\n"
-"en función PL/Tcl \"%s\""
+"en función PL/Tcl %s"
 
-#: pltcl.c:1551
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser invocadas como disparadores"
 
-#: pltcl.c:1555
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "las funciones PL/Tcl no pueden retornar tipo %s"
 
-#: pltcl.c:1594
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "las funciones PL/Tcl no pueden aceptar el tipog%s"
 
-#: pltcl.c:1706
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "no se pudo crear procedimiento interno «%s»: %s"
 
-#: pltcl.c:3211
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "la lista de nombres de columnas y valores debe tener un número par de elementos"
 
-#: pltcl.c:3229
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr "la lista de nombres de columnas y valores contiene el nombre de columna no existente «%s»"
 
-#: pltcl.c:3236
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "no se puede definir el atributo de sistema «%s»"
 
-#: pltcl.c:3242
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "no se puede definir el atributo generado «%s»"
diff --git a/src/pl/tcl/po/fr.po b/src/pl/tcl/po/fr.po
index e7ab5bc05e7..2e326149bac 100644
--- a/src/pl/tcl/po/fr.po
+++ b/src/pl/tcl/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 17\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-23 14:08+0000\n"
-"PO-Revision-Date: 2024-09-16 16:28+0200\n"
+"POT-Creation-Date: 2025-07-08 05:08+0000\n"
+"PO-Revision-Date: 2025-07-08 10:47+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -19,109 +19,109 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 
-#: pltcl.c:462
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "Fonction PL/Tcl à appeler une fois quand pltcl est utilisé pour la première fois."
 
-#: pltcl.c:469
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "Fonction PL/TclU à appeler une fois quand pltcl est utilisé pour la première fois."
 
-#: pltcl.c:636
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "la fonction « %s » est dans le mauvais langage"
 
-#: pltcl.c:647
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "la fonction « %s » doit être définie en SECURITY DEFINER"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:681
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "traitement du paramètre %s"
 
-#: pltcl.c:834
+#: pltcl.c:841
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "la fonction renvoyant un ensemble a été appelée dans un contexte qui n'accepte pas un ensemble"
 
-#: pltcl.c:839
+#: pltcl.c:846
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "mode matérialisé requis mais interdit dans ce contexte"
 
-#: pltcl.c:1012
+#: pltcl.c:1019
 #, 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"
 "accepter le type record"
 
-#: pltcl.c:1031
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "n'a pas pu analyser la valeur de retour de la fonction : %s"
 
-#: pltcl.c:1298
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "n'a pas pu analyser la valeur de retour du trigger : %s"
 
-#: pltcl.c:1383 pltcl.c:1810
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1384
+#: pltcl.c:1405
 #, c-format
 msgid ""
 "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr ""
 "%s\n"
 "dans la fonction PL/Tcl « %s »"
 
-#: pltcl.c:1547
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
 
-#: pltcl.c:1551
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "les fonctions PL/Tcl ne peuvent pas renvoyer le type %s"
 
-#: pltcl.c:1590
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "les fonctions PL/Tcl ne peuvent pas accepter le type %s"
 
-#: pltcl.c:1702
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "n'a pas pu créer la procédure interne « %s » : %s"
 
-#: pltcl.c:3207
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "la liste de nom de colonne/valeur doit avoir un nombre pair d'éléments"
 
-#: pltcl.c:3225
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr "la liste de nom de colonne/valeur contient des noms de colonne inexistantes (« %s »)"
 
-#: pltcl.c:3232
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "ne peut pas initialiser l'attribut système « %s »"
 
-#: pltcl.c:3238
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "ne peut pas initialiser la colonne générée « %s »"
diff --git a/src/pl/tcl/po/ko.po b/src/pl/tcl/po/ko.po
index 63d744f6c21..f383be2bb98 100644
--- a/src/pl/tcl/po/ko.po
+++ b/src/pl/tcl/po/ko.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pltcl (PostgreSQL) 17\n"
+"Project-Id-Version: pltcl (PostgreSQL) 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-01-17 04:38+0000\n"
-"PO-Revision-Date: 2025-01-16 11:03+0900\n"
+"POT-Creation-Date: 2025-09-11 21:38+0000\n"
+"PO-Revision-Date: 2025-09-09 12:55+0900\n"
 "Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
 "Language-Team: Korean Team <pgsql-kr@postgresql.kr>\n"
 "Language: ko\n"
@@ -17,111 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pltcl.c:466
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "pltcl 언어가 처음 사용될 때 한번 호출 될 PL/Tcl 함수"
 
-#: pltcl.c:473
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "pltclu 언어가 처음 사용될 때 한번 호출 될 PL/Tcl 함수"
 
-#: pltcl.c:640
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "\"%s\" 함수에 잘못된 언어가 있음"
 
-#: pltcl.c:651
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "\"%s\" 함수는 SECURITY DEFINER 속성이 없어야 합니다"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:685
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "%s 매개 변수 처리 중"
 
-#: pltcl.c:838
+#: pltcl.c:841
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "집합이 값이 함수가 집합을 사용할 수 없는 구문에서 호출 되었음"
 
-#: pltcl.c:843
+#: pltcl.c:846
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "materialize 모드가 필요합니다만, 이 구문에서는 허용되지 않습니다"
 
-#: pltcl.c:1016
+#: pltcl.c:1019
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "레코드를 반환하는 함수가 레코드 형을 사용할 수 없는 구문에서 호출 되었음"
 
-#: pltcl.c:1035
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "함수 반환값을 분석할 수 없음: %s"
 
-#: pltcl.c:1302
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "트리거 반환값을 분석할 수 없음: %s"
 
-#: pltcl.c:1387 pltcl.c:1814
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1388
+#: pltcl.c:1405
 #, c-format
 msgid ""
 "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr ""
 "%s\n"
-"해당 PL/Tcl 함수: \"%s\""
+"해당 PL/Tcl 함수: %s"
 
-#: pltcl.c:1551
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "트리거 함수는 트리거로만 호출될 수 있음"
 
-#: pltcl.c:1555
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "PL/Tcl 함수는 %s 자료형을 반환할 수 없음"
 
-#: pltcl.c:1594
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "PL/Tcl 함수는 %s 자료형을 사용할 수 없음"
 
-#: pltcl.c:1706
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "\"%s\" 내부 프로시져를 만들 수 없음: %s"
 
-#: pltcl.c:3211
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "칼럼 이름/값 목록은 그 요소의 개수가 짝수여야 함"
 
-#: pltcl.c:3229
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr "칼럼 이름/값 목록에 \"%s\" 칼럼에 대한 값이 없음"
 
-#: pltcl.c:3236
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "\"%s\" 시스템 속성을 지정할 수 없음"
 
-#: pltcl.c:3242
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "\"%s\" 계산된 칼럼을 지정할 수 없음"
 
-#, c-format
 #~ msgid "could not split return value from trigger: %s"
 #~ msgstr "트리거에서 반환값을 분리할 수 없음: %s"
diff --git a/src/pl/tcl/po/ru.po b/src/pl/tcl/po/ru.po
index 1f15520c8cb..7832ff809ce 100644
--- a/src/pl/tcl/po/ru.po
+++ b/src/pl/tcl/po/ru.po
@@ -1,13 +1,13 @@
 # Russian message translation file for pltcl
 # 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, 2019, 2022, 2024.
+# SPDX-FileCopyrightText: 2012-2017, 2019, 2022, 2024, 2025 Alexander Lakhin <exclusion@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: pltcl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2025-02-08 07:44+0200\n"
-"PO-Revision-Date: 2024-08-01 13:03+0300\n"
+"POT-Creation-Date: 2025-08-30 15:59+0300\n"
+"PO-Revision-Date: 2025-09-13 17:22+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
@@ -17,109 +17,109 @@ msgstr ""
 "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"
 
-#: pltcl.c:466
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "Функция на PL/Tcl, вызываемая при первом использовании pltcl."
 
-#: pltcl.c:473
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "Функция на PL/TclU, вызываемая при первом использовании pltclu."
 
-#: pltcl.c:640
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "Функция \"%s\" объявлена на другом языке"
 
-#: pltcl.c:651
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "функция \"%s\" не должна иметь характеристику SECURITY DEFINER"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:685
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "обработка параметра %s"
 
-#: pltcl.c:838
+#: pltcl.c:841
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функция, возвращающая множество, вызвана в контексте, где ему нет места"
 
-#: pltcl.c:843
+#: pltcl.c:846
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "требуется режим материализации, но он недопустим в этом контексте"
 
-#: pltcl.c:1016
+#: pltcl.c:1019
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
 
-#: pltcl.c:1035
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "разобрать возвращаемое функцией значение не удалось: %s"
 
-#: pltcl.c:1302
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "разобрать возвращаемое триггером значение не удалось: %s"
 
-#: pltcl.c:1387 pltcl.c:1814
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1388
+#: pltcl.c:1405
 #, c-format
 msgid ""
 "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr ""
 "%s\n"
-"в функции PL/Tcl \"%s\""
+"в функции PL/Tcl %s"
 
-#: pltcl.c:1551
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызываться только в триггерах"
 
-#: pltcl.c:1555
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "функции PL/Tcl не могут возвращать тип %s"
 
-#: pltcl.c:1594
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "функции PL/Tcl не могут принимать тип %s"
 
-#: pltcl.c:1706
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "не удалось создать внутреннюю процедуру \"%s\": %s"
 
-#: pltcl.c:3211
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "в списке имён/значений столбцов должно быть чётное число элементов"
 
-#: pltcl.c:3229
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr ""
 "список имён/значений столбцов содержит имя несуществующего столбца \"%s\""
 
-#: pltcl.c:3236
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "присвоить значение системному атрибуту \"%s\" нельзя"
 
-#: pltcl.c:3242
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "присвоить значение генерируемому столбцу \"%s\" нельзя"
diff --git a/src/pl/tcl/po/sv.po b/src/pl/tcl/po/sv.po
index d6fce1b82cb..bbfcef11ba1 100644
--- a/src/pl/tcl/po/sv.po
+++ b/src/pl/tcl/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish message translation file for pltcl
 # Copyright (C) 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
+# Dennis Björklund <db@zigo.dhs.org>, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 17\n"
+"Project-Id-Version: PostgreSQL 18\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-07-12 17:38+0000\n"
-"PO-Revision-Date: 2024-07-12 22:05+0200\n"
+"POT-Creation-Date: 2025-05-16 16:08+0000\n"
+"PO-Revision-Date: 2025-05-16 20:25+0200\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <pgsql-translators@postgresql.org>\n"
 "Language: sv\n"
@@ -17,105 +17,105 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pltcl.c:462
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "PL/Tcl-funktion att anropa en gång när pltcl först används."
 
-#: pltcl.c:469
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "PL/TclU-funktion att anrop en gång när pltclu först används."
 
-#: pltcl.c:636
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "funktionen \"%s\" är skriven i fel språk"
 
-#: pltcl.c:647
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "funktionen \"%s\" får ej vara SECURITY DEFINER"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:681
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "processar parameter %s"
 
-#: pltcl.c:834
+#: pltcl.c:841
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "en funktion som returnerar en mängd anropades i kontext som inte godtar en mängd"
 
-#: pltcl.c:839
+#: pltcl.c:846
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "materialiserat läge krävs, men stöds inte i detta kontext"
 
-#: pltcl.c:1012
+#: pltcl.c:1019
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "en funktion med post som värde anropades i sammanhang där poster inte kan godtagas."
 
-#: pltcl.c:1031
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "kunde inte parsa funktions returvärde: %s"
 
-#: pltcl.c:1298
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "kunde inte parsa triggers returvärde: %s"
 
-#: pltcl.c:1383 pltcl.c:1810
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1384
+#: pltcl.c:1405
 #, c-format
 msgid ""
 "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr ""
 "%s\n"
-"i PL/Tcl-funktion \"%s\""
+"i PL/Tcl-funktion %s"
 
-#: pltcl.c:1547
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggningsfunktioner kan bara anropas vid triggning."
 
-#: pltcl.c:1551
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "PL/Tcl-funktioner kan inte returnera typ %s"
 
-#: pltcl.c:1590
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "PL/Tcl-funktioner kan inte ta emot typ %s"
 
-#: pltcl.c:1702
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "kunde inte skapa en intern procedur \"%s\": %s"
 
-#: pltcl.c:3207
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "kolumn-namn/-värde måste ha ett jämt antal element"
 
-#: pltcl.c:3225
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr "listan med kolumn-namn/-värde innehåller det icke existerande kolumnnamnet \"%s\""
 
-#: pltcl.c:3232
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "kan inte sätta systemattribut \"%s\""
 
-#: pltcl.c:3238
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "kan inte sätta genererad kolumn \"%s\""
diff --git a/src/pl/tcl/po/uk.po b/src/pl/tcl/po/uk.po
index 6caba5446ef..d0a06f205d0 100644
--- a/src/pl/tcl/po/uk.po
+++ b/src/pl/tcl/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: postgresql\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-08-31 06:08+0000\n"
-"PO-Revision-Date: 2024-09-23 19:38\n"
+"POT-Creation-Date: 2025-04-01 10:38+0000\n"
+"PO-Revision-Date: 2026-01-02 15:22\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -14,106 +14,106 @@ msgstr ""
 "X-Crowdin-Project: postgresql\n"
 "X-Crowdin-Project-ID: 324573\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /REL_17_STABLE/pltcl.pot\n"
-"X-Crowdin-File-ID: 1016\n"
+"X-Crowdin-File: /REL_18_STABLE/pltcl.pot\n"
+"X-Crowdin-File-ID: 1079\n"
 
-#: pltcl.c:462
+#: pltcl.c:470
 msgid "PL/Tcl function to call once when pltcl is first used."
 msgstr "Функція PL/Tcl використовується для виклику коли pltcl вперше використаний."
 
-#: pltcl.c:469
+#: pltcl.c:477
 msgid "PL/TclU function to call once when pltclu is first used."
 msgstr "Функція PL/TclU використовується для виклику коли pltclu вперше використаний."
 
-#: pltcl.c:636
+#: pltcl.c:644
 #, c-format
 msgid "function \"%s\" is in the wrong language"
 msgstr "функція «%s» написана неправильною мовою"
 
-#: pltcl.c:647
+#: pltcl.c:655
 #, c-format
 msgid "function \"%s\" must not be SECURITY DEFINER"
 msgstr "функція \"%s\" не має бути SECURITY DEFINER"
 
 #. translator: %s is "pltcl.start_proc" or "pltclu.start_proc"
-#: pltcl.c:681
+#: pltcl.c:689
 #, c-format
 msgid "processing %s parameter"
 msgstr "обробляється параметр %s"
 
-#: pltcl.c:834
+#: pltcl.c:841
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "функція \"set-valued\" викликана в контексті, де йому немає місця"
 
-#: pltcl.c:839
+#: pltcl.c:846
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "необхідний режим матеріалізації (materialize mode), але він неприпустимий у цьому контексті"
 
-#: pltcl.c:1012
+#: pltcl.c:1019
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "функція, що повертає набір, викликана у контексті, що не приймає тип запис"
 
-#: pltcl.c:1031
+#: pltcl.c:1038
 #, c-format
 msgid "could not parse function return value: %s"
 msgstr "не вдалося проаналізувати значення функції: %s"
 
-#: pltcl.c:1298
+#: pltcl.c:1304
 #, c-format
 msgid "could not parse trigger return value: %s"
 msgstr "не вдалося проаналізувати значення тригера: %s"
 
-#: pltcl.c:1383 pltcl.c:1810
+#: pltcl.c:1404 pltcl.c:1898
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1384
+#: pltcl.c:1405
 #, c-format
 msgid "%s\n"
-"in PL/Tcl function \"%s\""
+"in PL/Tcl function %s"
 msgstr "%s\n"
-"у функції PL/Tcl \"%s\""
+"у функції PL/Tcl %s"
 
-#: pltcl.c:1547
+#: pltcl.c:1633
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "тригер-функція може викликатися лише як тригер"
 
-#: pltcl.c:1551
+#: pltcl.c:1637
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "Функції PL/Tcl не можуть повертати тип %s"
 
-#: pltcl.c:1590
+#: pltcl.c:1676
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "Функції PL/Tcl не можуть приймати тип %s"
 
-#: pltcl.c:1702
+#: pltcl.c:1788
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "не вдалося створити внутрішню процедуру \"%s\": %s"
 
-#: pltcl.c:3207
+#: pltcl.c:3298
 #, c-format
 msgid "column name/value list must have even number of elements"
 msgstr "список імен і значень стовпців повинен мати парну кількість елементів"
 
-#: pltcl.c:3225
+#: pltcl.c:3316
 #, c-format
 msgid "column name/value list contains nonexistent column name \"%s\""
 msgstr "список імен і значень стовпців містить неіснуєче ім'я стовпця \"%s\""
 
-#: pltcl.c:3232
+#: pltcl.c:3323
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "не вдалося встановити системний атрибут \"%s\""
 
-#: pltcl.c:3238
+#: pltcl.c:3329
 #, c-format
 msgid "cannot set generated column \"%s\""
 msgstr "неможливо оновити згенерований стовпець \"%s\""
diff --git a/src/pl/tcl/sql/pltcl_unicode.sql b/src/pl/tcl/sql/pltcl_unicode.sql
index f0006046127..a09e4998b2b 100644
--- a/src/pl/tcl/sql/pltcl_unicode.sql
+++ b/src/pl/tcl/sql/pltcl_unicode.sql
@@ -1,11 +1,16 @@
 --
 -- Unicode handling
 --
--- Note: this test case is known to fail if the database encoding is
--- EUC_CN, EUC_JP, EUC_KR, or EUC_TW, for lack of any equivalent to
--- U+00A0 (no-break space) in those encodings.  However, testing with
--- plain ASCII data would be rather useless, so we must live with that.
+-- This test case would fail if the database encoding is EUC_CN, EUC_JP,
+-- EUC_KR, or EUC_TW, for lack of any equivalent to U+00A0 (no-break space) in
+-- those encodings.  However, testing with plain ASCII data would be rather
+-- useless, so we must live with that.
 --
+SELECT getdatabaseencoding() IN ('EUC_CN', 'EUC_JP', 'EUC_KR', 'EUC_TW')
+  AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 
 SET client_encoding TO UTF8;
 
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 034939f7fd2..023a7435c9b 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -202,7 +202,7 @@ static char *
 win32_get_codeset(const char *ctype)
 {
 	char	   *r = NULL;
-	char	   *codepage;
+	const char *codepage;
 	uint32		cp;
 	WCHAR		wctype[LOCALE_NAME_MAX_LENGTH];
 
diff --git a/src/port/getopt.c b/src/port/getopt.c
index 655fef3b0c7..2cca5a0673a 100644
--- a/src/port/getopt.c
+++ b/src/port/getopt.c
@@ -72,7 +72,7 @@ int
 getopt(int nargc, char *const *nargv, const char *ostr)
 {
 	static char *place = EMSG;	/* option letter processing */
-	char	   *oli;			/* option letter list index */
+	const char *oli;			/* option letter list index */
 
 	if (!*place)
 	{							/* update scanning pointer */
diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c
index f83de0dff97..20953db9db1 100644
--- a/src/port/getopt_long.c
+++ b/src/port/getopt_long.c
@@ -62,7 +62,7 @@ getopt_long(int argc, char *const argv[],
 			const struct option *longopts, int *longindex)
 {
 	static char *place = EMSG;	/* option letter processing */
-	char	   *oli;			/* option letter list index */
+	const char *oli;			/* option letter list index */
 	static int	nonopt_start = -1;
 	static bool force_nonopt = false;
 
diff --git a/src/port/identifier_alpha_transfor.c b/src/port/identifier_alpha_transfor.c
index 21b725dcb09..e895fbd965a 100644
--- a/src/port/identifier_alpha_transfor.c
+++ b/src/port/identifier_alpha_transfor.c
@@ -18,17 +18,17 @@
  *
  * This file provides a string case conversion function
  *
- * upper_character() 	-- transfor lower to upper
- * down_character() 	-- transfor upper to lower
+ * upper_character() 	-- transform lowercase letters to uppercase
+ * down_character() 	-- transform uppercase letters to lowercase
  * is_all_upper() 	-- Determine whether the letters in the string are all uppercase letters
  * is_all_lower() 	-- Determine whether the letters in the string are all lowercase letters
  *
  *
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/port/identifier_alpha_transfor.c
  *
- * add the file for requirement "CASE SENSITIVE IDENTIFY" feature upgrade
+ * add the file for requirement "case-sensitive identifier" feature upgrade
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,7 @@
 #include "common/fe_memutils.h"
 
 /*
- * transfor upper to lower
+ * transform upper to lower
  */
 char *
 down_character(const char *src, int len)
@@ -56,7 +56,7 @@ down_character(const char *src, int len)
 	res[len] = '\0';
 	s = res;
 
-	/* transfor */
+	/* transform */
 	for (i = 0; i < len ; i++)
 	{
 		*s = tolower(*s);
@@ -66,7 +66,7 @@ down_character(const char *src, int len)
 	return res;
 }
 /*
- * transfor lower to upper
+ * transform lower to upper
  */
 char *
 upper_character(const char *src, int len)
@@ -82,7 +82,7 @@ upper_character(const char *src, int len)
 	res[len] = '\0';
 	s = res;
 
-	/* transfor */
+	/* transform */
 	for (i = 0; i < len ; i++)
 	{
 		*s = toupper(*s);
diff --git a/src/port/meson.build b/src/port/meson.build
index 092b812dc49..dc583c6fc61 100644
--- a/src/port/meson.build
+++ b/src/port/meson.build
@@ -1,4 +1,4 @@
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2022-2025, PostgreSQL Global Development Group
 
 pgport_sources = [
diff --git a/src/port/open.c b/src/port/open.c
index 4a31c5d7b77..ec0fbf29e92 100644
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -74,13 +74,23 @@ pgwin32_open_handle(const char *fileName, int fileFlags, bool backup_semantics)
 	/* Check that we can handle the request */
 	assert((fileFlags & ((O_RDONLY | O_WRONLY | O_RDWR) | O_APPEND |
 						 (O_RANDOM | O_SEQUENTIAL | O_TEMPORARY) |
-						 _O_SHORT_LIVED | O_DSYNC | O_DIRECT |
+						 _O_SHORT_LIVED | O_DSYNC | O_DIRECT | O_CLOEXEC |
 						 (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags);
 
 	sa.nLength = sizeof(sa);
-	sa.bInheritHandle = TRUE;
 	sa.lpSecurityDescriptor = NULL;
 
+	/*
+	 * If O_CLOEXEC is specified, create a non-inheritable handle.  Otherwise,
+	 * create an inheritable handle (the default Windows behavior).
+	 *
+	 * Note: We could instead use SetHandleInformation() after CreateFile() to
+	 * clear HANDLE_FLAG_INHERIT, but this way avoids rare leaks in
+	 * multi-threaded programs that create processes, just like POSIX
+	 * O_CLOEXEC.
+	 */
+	sa.bInheritHandle = !(fileFlags & O_CLOEXEC);
+
 	while ((h = CreateFile(fileName,
 	/* cannot use O_RDONLY, as it == 0 */
 						   (fileFlags & O_RDWR) ? (GENERIC_WRITE | GENERIC_READ) :
diff --git a/src/port/path.c b/src/port/path.c
index 63503409d5a..7f13940b55b 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -627,6 +627,23 @@ path_is_relative_and_below_cwd(const char *path)
 		return true;
 }
 
+/*
+ * Detect whether a path is safe for use during archive extraction.
+ *
+ * This applies canonicalize_path(), then it checks that the path does
+ * not contain any parent directory references.
+ */
+bool
+path_is_safe_for_extraction(const char *path)
+{
+	char		buf[MAXPGPATH];
+
+	strlcpy(buf, path, sizeof(buf));
+	canonicalize_path(buf);
+
+	return path_is_relative_and_below_cwd(buf);
+}
+
 /*
  * Detect whether path1 is a prefix of path2 (including equality).
  *
diff --git a/src/port/pg_crc32c_armv8_choose.c b/src/port/pg_crc32c_armv8_choose.c
index ec12be1bbc3..c0001cfe2dc 100644
--- a/src/port/pg_crc32c_armv8_choose.c
+++ b/src/port/pg_crc32c_armv8_choose.c
@@ -26,7 +26,8 @@
 
 #if defined(HAVE_ELF_AUX_INFO) || defined(HAVE_GETAUXVAL)
 #include <sys/auxv.h>
-#if defined(__linux__) && !defined(__aarch64__) && !defined(HWCAP2_CRC32)
+/* Ancient glibc releases don't include the HWCAPxxx macros in sys/auxv.h */
+#if defined(__linux__) && (defined(__aarch64__) ? !defined(HWCAP_CRC32) : !defined(HWCAP2_CRC32))
 #include <asm/hwcap.h>
 #endif
 #endif
diff --git a/src/port/pg_numa.c b/src/port/pg_numa.c
index 4b487a2a4e8..93450d8d0b7 100644
--- a/src/port/pg_numa.c
+++ b/src/port/pg_numa.c
@@ -16,6 +16,7 @@
 #include "c.h"
 #include <unistd.h>
 
+#include "miscadmin.h"
 #include "port/pg_numa.h"
 
 /*
@@ -29,11 +30,34 @@
 #include <numa.h>
 #include <numaif.h>
 
+/*
+ * numa_move_pages() chunk size, has to be <= 16 to work around a kernel bug
+ * in do_pages_stat() (chunked by DO_PAGES_STAT_CHUNK_NR). By using the same
+ * chunk size, we make it work even on unfixed kernels.
+ *
+ * 64-bit system are not affected by the bug, and so use much larger chunks.
+ */
+#if SIZEOF_SIZE_T == 4
+#define NUMA_QUERY_CHUNK_SIZE 16
+#else
+#define NUMA_QUERY_CHUNK_SIZE 1024
+#endif
+
 /* libnuma requires initialization as per numa(3) on Linux */
 int
 pg_numa_init(void)
 {
-	int			r = numa_available();
+	int			r;
+
+	/*
+	 * XXX libnuma versions before 2.0.19 don't handle EPERM by disabling
+	 * NUMA, which then leads to unexpected failures later. This affects
+	 * containers that disable get_mempolicy by a seccomp profile.
+	 */
+	if (get_mempolicy(NULL, NULL, 0, 0, 0) < 0 && (errno == EPERM))
+		r = -1;
+	else
+		r = numa_available();
 
 	return r;
 }
@@ -42,11 +66,50 @@ pg_numa_init(void)
  * We use move_pages(2) syscall here - instead of get_mempolicy(2) - as the
  * first one allows us to batch and query about many memory pages in one single
  * giant system call that is way faster.
+ *
+ * We call numa_move_pages() for smaller chunks of the whole array. The first
+ * reason is to work around a kernel bug, but also to allow interrupting the
+ * query between the calls (for many pointers processing the whole array can
+ * take a lot of time).
  */
 int
 pg_numa_query_pages(int pid, unsigned long count, void **pages, int *status)
 {
-	return numa_move_pages(pid, count, pages, NULL, status, 0);
+	unsigned long next = 0;
+	int			ret = 0;
+
+	/*
+	 * Chunk pointers passed to numa_move_pages to NUMA_QUERY_CHUNK_SIZE
+	 * items, to work around a kernel bug in do_pages_stat().
+	 */
+	while (next < count)
+	{
+		unsigned long count_chunk = Min(count - next,
+										NUMA_QUERY_CHUNK_SIZE);
+
+#ifndef FRONTEND
+		CHECK_FOR_INTERRUPTS();
+#endif
+
+		/*
+		 * Bail out if any of the chunks errors out (ret<0). We ignore (ret>0)
+		 * which is used to return number of nonmigrated pages, but we're not
+		 * migrating any pages here.
+		 */
+		ret = numa_move_pages(pid, count_chunk, &pages[next], NULL, &status[next], 0);
+		if (ret < 0)
+		{
+			/* plain error, return as is */
+			return ret;
+		}
+
+		next += count_chunk;
+	}
+
+	/* should have consumed the input array exactly */
+	Assert(next == count);
+
+	return 0;
 }
 
 int
diff --git a/src/port/pg_popcount_aarch64.c b/src/port/pg_popcount_aarch64.c
index e515e4d45b8..0c93e2e625e 100644
--- a/src/port/pg_popcount_aarch64.c
+++ b/src/port/pg_popcount_aarch64.c
@@ -23,6 +23,10 @@
 
 #if defined(HAVE_ELF_AUX_INFO) || defined(HAVE_GETAUXVAL)
 #include <sys/auxv.h>
+/* Ancient glibc releases don't include the HWCAPxxx macros in sys/auxv.h */
+#if defined(__linux__) && !defined(HWCAP_SVE)
+#include <asm/hwcap.h>
+#endif
 #endif
 #endif
 
@@ -474,4 +478,10 @@ pg_popcount_masked_neon(const char *buf, int bytes, bits8 mask)
 	return popcnt;
 }
 
-#endif							/* POPCNT_AARCH64 */
+#else							/* POPCNT_AARCH64 */
+
+/* prevent linker complaints about empty module */
+extern int	pg_popcount_aarch64_dummy_variable;
+int			pg_popcount_aarch64_dummy_variable = 0;
+
+#endif							/* ! POPCNT_AARCH64 */
diff --git a/src/port/pg_popcount_avx512.c b/src/port/pg_popcount_avx512.c
index 80c0aee3e73..896bc7473b2 100644
--- a/src/port/pg_popcount_avx512.c
+++ b/src/port/pg_popcount_avx512.c
@@ -220,4 +220,11 @@ pg_popcount_masked_avx512(const char *buf, int bytes, bits8 mask)
 }
 
 #endif							/* TRY_POPCNT_X86_64 */
-#endif							/* USE_AVX512_POPCNT_WITH_RUNTIME_CHECK */
+
+#else							/* USE_AVX512_POPCNT_WITH_RUNTIME_CHECK */
+
+/* prevent linker complaints about empty module */
+extern int	pg_popcount_avx512_dummy_variable;
+int			pg_popcount_avx512_dummy_variable = 0;
+
+#endif							/* ! USE_AVX512_POPCNT_WITH_RUNTIME_CHECK */
diff --git a/src/port/tar.c b/src/port/tar.c
index 592b4fb7b0f..fee9dbbf5be 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -87,7 +87,7 @@ read_tar_number(const char *s, int len)
  * be 512 bytes, per the tar standard.
  */
 int
-tarChecksum(char *header)
+tarChecksum(const char *header)
 {
 	int			i,
 				sum;
@@ -95,15 +95,44 @@ tarChecksum(char *header)
 	/*
 	 * Per POSIX, the checksum is the simple sum of all bytes in the header,
 	 * treating the bytes as unsigned, and treating the checksum field (at
-	 * offset 148) as though it contained 8 spaces.
+	 * offset TAR_OFFSET_CHECKSUM) as though it contained 8 spaces.
 	 */
 	sum = 8 * ' ';				/* presumed value for checksum field */
-	for (i = 0; i < 512; i++)
-		if (i < 148 || i >= 156)
+	for (i = 0; i < TAR_BLOCK_SIZE; i++)
+		if (i < TAR_OFFSET_CHECKSUM || i >= TAR_OFFSET_CHECKSUM + 8)
 			sum += 0xFF & header[i];
 	return sum;
 }
 
+/*
+ * Check validity of a tar header (assumed to be 512 bytes long).
+ * We verify the checksum and the magic number / version.
+ */
+bool
+isValidTarHeader(const char *header)
+{
+	int			sum;
+	int			chk = tarChecksum(header);
+
+	sum = read_tar_number(&header[TAR_OFFSET_CHECKSUM], 8);
+
+	if (sum != chk)
+		return false;
+
+	/* POSIX tar format */
+	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar\0", 6) == 0 &&
+		memcmp(&header[TAR_OFFSET_VERSION], "00", 2) == 0)
+		return true;
+	/* GNU tar format */
+	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar  \0", 8) == 0)
+		return true;
+	/* not-quite-POSIX format written by pre-9.3 pg_dump */
+	if (memcmp(&header[TAR_OFFSET_MAGIC], "ustar00\0", 8) == 0)
+		return true;
+
+	return false;
+}
+
 
 /*
  * Fill in the buffer pointed to by h with a tar format header. This buffer
diff --git a/src/port/win32env.c b/src/port/win32env.c
index b22fbafde40..e1cee683dbf 100644
--- a/src/port/win32env.c
+++ b/src/port/win32env.c
@@ -152,6 +152,13 @@ pgwin32_unsetenv(const char *name)
 	int			res;
 	char	   *envbuf;
 
+	/* Error conditions, per POSIX */
+	if (name == NULL || name[0] == '\0' || strchr(name, '=') != NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
 	envbuf = (char *) malloc(strlen(name) + 2);
 	if (!envbuf)
 		return -1;
diff --git a/src/port/win32security.c b/src/port/win32security.c
index a46b82dd048..b7608ab1706 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -31,9 +31,9 @@ log_error(const char *fmt,...)
 
 	va_start(ap, fmt);
 #ifndef FRONTEND
-	write_stderr(fmt, ap);
+	vwrite_stderr(fmt, ap);
 #else
-	fprintf(stderr, fmt, ap);
+	vfprintf(stderr, fmt, ap);
 #endif
 	va_end(ap);
 }
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c
index 7c0982439db..6e084946132 100644
--- a/src/port/win32setlocale.c
+++ b/src/port/win32setlocale.c
@@ -119,9 +119,9 @@ map_locale(const struct locale_map *map, const char *locale)
 		const char *needle_start = map[i].locale_name_start;
 		const char *needle_end = map[i].locale_name_end;
 		const char *replacement = map[i].replacement;
-		char	   *match;
-		char	   *match_start = NULL;
-		char	   *match_end = NULL;
+		const char *match;
+		const char *match_start = NULL;
+		const char *match_end = NULL;
 
 		match = strstr(locale, needle_start);
 		if (match)
@@ -148,7 +148,7 @@ map_locale(const struct locale_map *map, const char *locale)
 			/* Found a match. Replace the matched string. */
 			int			matchpos = match_start - locale;
 			int			replacementlen = strlen(replacement);
-			char	   *rest = match_end;
+			const char *rest = match_end;
 			int			restlen = strlen(rest);
 
 			/* check that the result fits in the static buffer */
diff --git a/src/test/isolation/expected/eval-plan-qual.out b/src/test/isolation/expected/eval-plan-qual.out
index 032d4208d51..a122047fd2a 100644
--- a/src/test/isolation/expected/eval-plan-qual.out
+++ b/src/test/isolation/expected/eval-plan-qual.out
@@ -1218,6 +1218,100 @@ subid|id
 (1 row)
 
 
+starting permutation: tid1 tid2 c1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tid2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tid2: <... completed>
+accountid|balance
+---------+-------
+(0 rows)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    700|    1400
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tid1 tidsucceed2 c1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tidsucceed2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' OR ctid = '(0,3)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tidsucceed2: <... completed>
+accountid|balance
+---------+-------
+checking |    900
+(1 row)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    900|    1800
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tidrange1 tidrange2 c1 c2 read
+step tidrange1: UPDATE accounts SET balance = balance + 100 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tidrange2: UPDATE accounts SET balance = balance + 200 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; <waiting ...>
+step c1: COMMIT;
+step tidrange2: <... completed>
+accountid|balance
+---------+-------
+(0 rows)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    700|    1400
+savings  |    600|    1200
+(2 rows)
+
+
+starting permutation: tid1 tid2 r1 c2 read
+step tid1: UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance;
+accountid|balance
+---------+-------
+checking |    700
+(1 row)
+
+step tid2: UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; <waiting ...>
+step r1: ROLLBACK;
+step tid2: <... completed>
+accountid|balance
+---------+-------
+checking |    800
+(1 row)
+
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    800|    1600
+savings  |    600|    1200
+(2 rows)
+
+
 starting permutation: simplepartupdate conditionalpartupdate c1 c2 read_part
 step simplepartupdate: 
 	update parttbl set b = b + 10;
@@ -1363,3 +1457,39 @@ step sysmerge2:
 step c1: COMMIT;
 step sysmerge2: <... completed>
 step c2: COMMIT;
+
+starting permutation: s1pp1 s2pp1 s2pp2 s2pp3 c1 c2
+step s1pp1: UPDATE another_parttbl SET b = b + 1 WHERE a = 1;
+step s2pp1: SET plan_cache_mode TO force_generic_plan;
+step s2pp2: PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1;
+step s2pp3: EXECUTE epd(1); <waiting ...>
+step c1: COMMIT;
+step s2pp3: <... completed>
+step c2: COMMIT;
+
+starting permutation: s1pp1 s2pp4 c1 c2
+step s1pp1: UPDATE another_parttbl SET b = b + 1 WHERE a = 1;
+step s2pp4: DELETE FROM another_parttbl WHERE a = (SELECT 1); <waiting ...>
+step c1: COMMIT;
+step s2pp4: <... completed>
+step c2: COMMIT;
+
+starting permutation: updateformergevalues mergevalues c1 c2 read
+step updateformergevalues: UPDATE accounts SET balance = balance + 100;
+step mergevalues: 
+	MERGE INTO accounts
+	USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
+	ON v.accountid = accounts.accountid
+	WHEN MATCHED THEN UPDATE SET balance = v.balance
+	WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
+ <waiting ...>
+step c1: COMMIT;
+step mergevalues: <... completed>
+step c2: COMMIT;
+step read: SELECT * FROM accounts ORDER BY accountid;
+accountid|balance|balance2
+---------+-------+--------
+checking |    610|    1220
+savings  |    620|    1240
+(2 rows)
+
diff --git a/src/test/isolation/expected/insert-conflict-do-update-4.out b/src/test/isolation/expected/insert-conflict-do-update-4.out
new file mode 100644
index 00000000000..80af2798a94
--- /dev/null
+++ b/src/test/isolation/expected/insert-conflict-do-update-4.out
@@ -0,0 +1,63 @@
+Parsed test spec with 2 sessions
+
+starting permutation: lock2 insert1 update2a c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step update2a: UPDATE upsert SET i = i + 10 WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+ i| j|  k
+--+--+---
+ 1|11|111
+11|10|100
+(2 rows)
+
+step c1: COMMIT;
+
+starting permutation: lock2 insert1 update2b c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step update2b: UPDATE upsert SET i = i + 150 WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+  i| j|  k
+---+--+---
+  1|11|111
+151|10|100
+(2 rows)
+
+step c1: COMMIT;
+
+starting permutation: lock2 insert1 delete2 c2 select1 c1
+step lock2: SELECT * FROM upsert WHERE i = 1 FOR UPDATE;
+i| j|  k
+-+--+---
+1|10|100
+(1 row)
+
+step insert1: INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; <waiting ...>
+step delete2: DELETE FROM upsert WHERE i = 1;
+step c2: COMMIT;
+step insert1: <... completed>
+step select1: SELECT * FROM upsert ORDER BY i;
+i| j|  k
+-+--+---
+1|11|111
+(1 row)
+
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/intra-grant-inplace.out b/src/test/isolation/expected/intra-grant-inplace.out
index 1aa9da622da..23c34d0ca09 100644
--- a/src/test/isolation/expected/intra-grant-inplace.out
+++ b/src/test/isolation/expected/intra-grant-inplace.out
@@ -226,7 +226,7 @@ step revoke4: <... completed>
 starting permutation: b1 drop1 b3 sfu3 revoke4 c1 r3
 step b1: BEGIN;
 step drop1: 
-	DROP TABLE intra_grant_inplace;
+	DELETE FROM pg_class WHERE relname = 'intra_grant_inplace';
 
 step b3: BEGIN ISOLATION LEVEL READ COMMITTED;
 step sfu3: 
@@ -248,6 +248,6 @@ relhasindex
 -----------
 (0 rows)
 
-s4: WARNING:  got: relation "intra_grant_inplace" does not exist
+s4: WARNING:  got: cache lookup failed for relation REDACTED
 step revoke4: <... completed>
 step r3: ROLLBACK;
diff --git a/src/test/isolation/expected/merge-match-recheck.out b/src/test/isolation/expected/merge-match-recheck.out
index 9a44a595927..4250b85af2d 100644
--- a/src/test/isolation/expected/merge-match-recheck.out
+++ b/src/test/isolation/expected/merge-match-recheck.out
@@ -241,7 +241,41 @@ starting permutation: update_bal1_tg merge_bal_tg c2 select1_tg c1
 s2: NOTICE:  Update: (1,160,s1,setup) -> (1,50,s1,"setup updated by update_bal1_tg")
 step update_bal1_tg: UPDATE target_tg t SET balance = 50, val = t.val || ' updated by update_bal1_tg' WHERE t.key = 1;
 step merge_bal_tg: 
-  MERGE INTO target_tg t
+  WITH t AS (
+    MERGE INTO target_tg t
+    USING (SELECT 1 as key) s
+    ON s.key = t.key
+    WHEN MATCHED AND balance < 100 THEN
+      UPDATE SET balance = balance * 2, val = t.val || ' when1'
+    WHEN MATCHED AND balance < 200 THEN
+      UPDATE SET balance = balance * 4, val = t.val || ' when2'
+    WHEN MATCHED AND balance < 300 THEN
+      UPDATE SET balance = balance * 8, val = t.val || ' when3'
+    RETURNING t.*
+  )
+  SELECT * FROM t;
+ <waiting ...>
+step c2: COMMIT;
+s1: NOTICE:  Update: (1,50,s1,"setup updated by update_bal1_tg") -> (1,100,s1,"setup updated by update_bal1_tg when1")
+step merge_bal_tg: <... completed>
+key|balance|status|val                                  
+---+-------+------+-------------------------------------
+  1|    100|s1    |setup updated by update_bal1_tg when1
+(1 row)
+
+step select1_tg: SELECT * FROM target_tg;
+key|balance|status|val                                  
+---+-------+------+-------------------------------------
+  1|    100|s1    |setup updated by update_bal1_tg when1
+(1 row)
+
+step c1: COMMIT;
+
+starting permutation: update1 update6 merge_bal c2 select1 c1
+step update1: UPDATE target t SET balance = balance + 10, val = t.val || ' updated by update1' WHERE t.key = 1;
+step update6: UPDATE target t SET balance = balance - 100, val = t.val || ' updated by update6' WHERE t.key = 1;
+step merge_bal: 
+  MERGE INTO target t
   USING (SELECT 1 as key) s
   ON s.key = t.key
   WHEN MATCHED AND balance < 100 THEN
@@ -252,16 +286,136 @@ step merge_bal_tg:
 	UPDATE SET balance = balance * 8, val = t.val || ' when3';
  <waiting ...>
 step c2: COMMIT;
-s1: NOTICE:  Update: (1,50,s1,"setup updated by update_bal1_tg") -> (1,100,s1,"setup updated by update_bal1_tg when1")
+step merge_bal: <... completed>
+step select1: SELECT * FROM target;
+key|balance|status|val                                              
+---+-------+------+-------------------------------------------------
+  1|    140|s1    |setup updated by update1 updated by update6 when1
+(1 row)
+
+step c1: COMMIT;
+
+starting permutation: update1_pa update6_pa merge_bal_pa c2 select1_pa c1
+step update1_pa: UPDATE target_pa t SET balance = balance + 10, val = t.val || ' updated by update1_pa' WHERE t.key = 1;
+step update6_pa: UPDATE target_pa t SET balance = balance - 100, val = t.val || ' updated by update6_pa' WHERE t.key = 1;
+step merge_bal_pa: 
+  MERGE INTO target_pa t
+  USING (SELECT 1 as key) s
+  ON s.key = t.key
+  WHEN MATCHED AND balance < 100 THEN
+	UPDATE SET balance = balance * 2, val = t.val || ' when1'
+  WHEN MATCHED AND balance < 200 THEN
+	UPDATE SET balance = balance * 4, val = t.val || ' when2'
+  WHEN MATCHED AND balance < 300 THEN
+	UPDATE SET balance = balance * 8, val = t.val || ' when3';
+ <waiting ...>
+step c2: COMMIT;
+step merge_bal_pa: <... completed>
+step select1_pa: SELECT * FROM target_pa;
+key|balance|status|val                                                    
+---+-------+------+-------------------------------------------------------
+  1|    140|s1    |setup updated by update1_pa updated by update6_pa when1
+(1 row)
+
+step c1: COMMIT;
+
+starting permutation: update1_tg update6_tg merge_bal_tg c2 select1_tg c1
+s2: NOTICE:  Update: (1,160,s1,setup) -> (1,170,s1,"setup updated by update1_tg")
+step update1_tg: UPDATE target_tg t SET balance = balance + 10, val = t.val || ' updated by update1_tg' WHERE t.key = 1;
+s2: NOTICE:  Update: (1,170,s1,"setup updated by update1_tg") -> (1,70,s1,"setup updated by update1_tg updated by update6_tg")
+step update6_tg: UPDATE target_tg t SET balance = balance - 100, val = t.val || ' updated by update6_tg' WHERE t.key = 1;
+step merge_bal_tg: 
+  WITH t AS (
+    MERGE INTO target_tg t
+    USING (SELECT 1 as key) s
+    ON s.key = t.key
+    WHEN MATCHED AND balance < 100 THEN
+      UPDATE SET balance = balance * 2, val = t.val || ' when1'
+    WHEN MATCHED AND balance < 200 THEN
+      UPDATE SET balance = balance * 4, val = t.val || ' when2'
+    WHEN MATCHED AND balance < 300 THEN
+      UPDATE SET balance = balance * 8, val = t.val || ' when3'
+    RETURNING t.*
+  )
+  SELECT * FROM t;
+ <waiting ...>
+step c2: COMMIT;
+s1: NOTICE:  Update: (1,70,s1,"setup updated by update1_tg updated by update6_tg") -> (1,140,s1,"setup updated by update1_tg updated by update6_tg when1")
 step merge_bal_tg: <... completed>
+key|balance|status|val                                                    
+---+-------+------+-------------------------------------------------------
+  1|    140|s1    |setup updated by update1_tg updated by update6_tg when1
+(1 row)
+
 step select1_tg: SELECT * FROM target_tg;
-key|balance|status|val                                  
----+-------+------+-------------------------------------
-  1|    100|s1    |setup updated by update_bal1_tg when1
+key|balance|status|val                                                    
+---+-------+------+-------------------------------------------------------
+  1|    140|s1    |setup updated by update1_tg updated by update6_tg when1
+(1 row)
+
+step c1: COMMIT;
+
+starting permutation: update7 update6 merge_bal c2 select1 c1
+step update7: UPDATE target t SET balance = 350, val = t.val || ' updated by update7' WHERE t.key = 1;
+step update6: UPDATE target t SET balance = balance - 100, val = t.val || ' updated by update6' WHERE t.key = 1;
+step merge_bal: 
+  MERGE INTO target t
+  USING (SELECT 1 as key) s
+  ON s.key = t.key
+  WHEN MATCHED AND balance < 100 THEN
+	UPDATE SET balance = balance * 2, val = t.val || ' when1'
+  WHEN MATCHED AND balance < 200 THEN
+	UPDATE SET balance = balance * 4, val = t.val || ' when2'
+  WHEN MATCHED AND balance < 300 THEN
+	UPDATE SET balance = balance * 8, val = t.val || ' when3';
+ <waiting ...>
+step c2: COMMIT;
+step merge_bal: <... completed>
+step select1: SELECT * FROM target;
+key|balance|status|val                                              
+---+-------+------+-------------------------------------------------
+  1|   2000|s1    |setup updated by update7 updated by update6 when3
 (1 row)
 
 step c1: COMMIT;
 
+starting permutation: update1_pa_move merge_bal_pa c2 c1
+step update1_pa_move: UPDATE target_pa t SET balance = 210, val = t.val || ' updated by update1_pa_move' WHERE t.key = 1;
+step merge_bal_pa: 
+  MERGE INTO target_pa t
+  USING (SELECT 1 as key) s
+  ON s.key = t.key
+  WHEN MATCHED AND balance < 100 THEN
+	UPDATE SET balance = balance * 2, val = t.val || ' when1'
+  WHEN MATCHED AND balance < 200 THEN
+	UPDATE SET balance = balance * 4, val = t.val || ' when2'
+  WHEN MATCHED AND balance < 300 THEN
+	UPDATE SET balance = balance * 8, val = t.val || ' when3';
+ <waiting ...>
+step c2: COMMIT;
+step merge_bal_pa: <... completed>
+ERROR:  tuple to be locked was already moved to another partition due to concurrent update
+step c1: COMMIT;
+
+starting permutation: update1_pa update1_pa_move merge_bal_pa c2 c1
+step update1_pa: UPDATE target_pa t SET balance = balance + 10, val = t.val || ' updated by update1_pa' WHERE t.key = 1;
+step update1_pa_move: UPDATE target_pa t SET balance = 210, val = t.val || ' updated by update1_pa_move' WHERE t.key = 1;
+step merge_bal_pa: 
+  MERGE INTO target_pa t
+  USING (SELECT 1 as key) s
+  ON s.key = t.key
+  WHEN MATCHED AND balance < 100 THEN
+	UPDATE SET balance = balance * 2, val = t.val || ' when1'
+  WHEN MATCHED AND balance < 200 THEN
+	UPDATE SET balance = balance * 4, val = t.val || ' when2'
+  WHEN MATCHED AND balance < 300 THEN
+	UPDATE SET balance = balance * 8, val = t.val || ' when3';
+ <waiting ...>
+step c2: COMMIT;
+step merge_bal_pa: <... completed>
+ERROR:  tuple to be locked was already moved to another partition due to concurrent update
+step c1: COMMIT;
+
 starting permutation: update1 merge_delete c2 select1 c1
 step update1: UPDATE target t SET balance = balance + 10, val = t.val || ' updated by update1' WHERE t.key = 1;
 step merge_delete: 
diff --git a/src/test/isolation/expected/merge-update.out b/src/test/isolation/expected/merge-update.out
index 677263d1ec1..821565b4303 100644
--- a/src/test/isolation/expected/merge-update.out
+++ b/src/test/isolation/expected/merge-update.out
@@ -57,6 +57,52 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: merge1 c1 explain_merge2a select2 c2
+step merge1: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+
+step c1: COMMIT;
+step explain_merge2a: 
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+
+explain_filter                                             
+-----------------------------------------------------------
+Merge on target t (actual rows=2.00 loops=1)               
+  Tuples: inserted=1 updated=1                             
+  ->  Hash Full Join (actual rows=2.00 loops=1)            
+        Hash Cond: (t.key = (1))                           
+        ->  Seq Scan on target t (actual rows=1.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)                
+              ->  Result (actual rows=1.00 loops=1)        
+(7 rows)
+
+step select2: SELECT * FROM target;
+key|val                                                   
+---+------------------------------------------------------
+  3|setup1 updated by merge1 source not matched by merge2a
+  1|merge2a                                               
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: pa_merge1 c1 pa_merge2c_dup a2
 step pa_merge1: 
   MERGE INTO pa_target t
@@ -117,6 +163,53 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: merge1 explain_merge2a c1 select2 c2
+step merge1: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+
+step explain_merge2a: 
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+ <waiting ...>
+step c1: COMMIT;
+step explain_merge2a: <... completed>
+explain_filter                                             
+-----------------------------------------------------------
+Merge on target t (actual rows=2.00 loops=1)               
+  Tuples: inserted=1 updated=1                             
+  ->  Hash Full Join (actual rows=2.00 loops=1)            
+        Hash Cond: (t.key = (1))                           
+        ->  Seq Scan on target t (actual rows=1.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)                
+              ->  Result (actual rows=1.00 loops=1)        
+(7 rows)
+
+step select2: SELECT * FROM target;
+key|val                                                   
+---+------------------------------------------------------
+  3|setup1 updated by merge1 source not matched by merge2a
+  1|merge2a                                               
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: merge1 merge2a a1 select2 c2
 step merge1: 
   MERGE INTO target t
@@ -253,6 +346,59 @@ key|val
 
 step c2: COMMIT;
 
+starting permutation: pa_merge1 explain_pa_merge2a c1 pa_select2 c2
+step pa_merge1: 
+  MERGE INTO pa_target t
+  USING (SELECT 1 as key, 'pa_merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set val = t.val || ' updated by ' || s.val;
+
+step explain_pa_merge2a: 
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO pa_target t
+  USING (SELECT 1 as key, 'pa_merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by pa_merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+ <waiting ...>
+step c1: COMMIT;
+step explain_pa_merge2a: <... completed>
+explain_filter                                                    
+------------------------------------------------------------------
+Merge on pa_target t (actual rows=2.00 loops=1)                   
+  Merge on part1 t_1                                              
+  Merge on part2 t_2                                              
+  Merge on part3 t_3                                              
+  Tuples: updated=2                                               
+  ->  Hash Full Join (actual rows=2.00 loops=1)                   
+        Hash Cond: (t.key = (1))                                  
+        ->  Append (actual rows=2.00 loops=1)                     
+              ->  Seq Scan on part1 t_1 (actual rows=1.00 loops=1)
+              ->  Seq Scan on part2 t_2 (actual rows=1.00 loops=1)
+              ->  Seq Scan on part3 t_3 (actual rows=0.00 loops=1)
+        ->  Hash (actual rows=1.00 loops=1)                       
+              ->  Result (actual rows=1.00 loops=1)               
+(13 rows)
+
+step pa_select2: SELECT * FROM pa_target;
+key|val                                               
+---+--------------------------------------------------
+  2|initial updated by pa_merge1 updated by pa_merge2a
+  3|initial source not matched by pa_merge2a          
+(2 rows)
+
+step c2: COMMIT;
+
 starting permutation: pa_merge2 pa_merge2a c1 pa_select2 c2
 step pa_merge2: 
   MERGE INTO pa_target t
@@ -403,3 +549,36 @@ step c1: COMMIT;
 step pa_merge2c_dup: <... completed>
 ERROR:  MERGE command cannot affect row a second time
 step a2: ABORT;
+
+starting permutation: merge2a c1 s1beginrr merge1 c2
+step merge2a: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*;
+
+merge_action|old       |new                            |key|val                      
+------------+----------+-------------------------------+---+-------------------------
+UPDATE      |(1,setup1)|(2,"setup1 updated by merge2a")|  2|setup1 updated by merge2a
+(1 row)
+
+step c1: COMMIT;
+step s1beginrr: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step merge1: 
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge1' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+    UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val;
+ <waiting ...>
+step c2: COMMIT;
+step merge1: <... completed>
+ERROR:  could not serialize access due to concurrent update
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index e3c669a29c7..abac824ec9e 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -50,6 +50,7 @@ test: insert-conflict-do-nothing-2
 test: insert-conflict-do-update
 test: insert-conflict-do-update-2
 test: insert-conflict-do-update-3
+test: insert-conflict-do-update-4
 test: insert-conflict-specconflict
 test: merge-insert-update
 test: merge-delete
diff --git a/src/test/isolation/specs/eval-plan-qual.spec b/src/test/isolation/specs/eval-plan-qual.spec
index 07307e623e4..fb57fb237dd 100644
--- a/src/test/isolation/specs/eval-plan-qual.spec
+++ b/src/test/isolation/specs/eval-plan-qual.spec
@@ -99,6 +99,10 @@ step upsert1	{
 	  WHERE NOT EXISTS (SELECT 1 FROM upsert);
 }
 
+# Tests for Tid / Tid Range Scan
+step tid1 { UPDATE accounts SET balance = balance + 100 WHERE ctid = '(0,1)' RETURNING accountid, balance; }
+step tidrange1 { UPDATE accounts SET balance = balance + 100 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; }
+
 # tests with table p check inheritance cases:
 # readp1/writep1/readp2 tests a bug where nodeLockRows did the wrong thing
 # when the first updated tuple was in a non-first child table.
@@ -200,6 +204,9 @@ step sys1	{
 	UPDATE pg_class SET reltuples = 123 WHERE oid = 'accounts'::regclass;
 }
 
+step s1pp1 { UPDATE another_parttbl SET b = b + 1 WHERE a = 1; }
+
+step updateformergevalues { UPDATE accounts SET balance = balance + 100; }
 
 session s2
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
@@ -241,6 +248,11 @@ step updateforcip3	{
 step wrtwcte	{ UPDATE table_a SET value = 'tableAValue2' WHERE id = 1; }
 step wrjt	{ UPDATE jointest SET data = 42 WHERE id = 7; }
 
+step tid2 { UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' RETURNING accountid, balance; }
+step tidrange2 { UPDATE accounts SET balance = balance + 200 WHERE ctid BETWEEN '(0,1)' AND '(0,1)' RETURNING accountid, balance; }
+# here, recheck succeeds; (0,3) is the id that step tid1 will assign
+step tidsucceed2 { UPDATE accounts SET balance = balance + 200 WHERE ctid = '(0,1)' OR ctid = '(0,3)' RETURNING accountid, balance; }
+
 step conditionalpartupdate	{
 	update parttbl set c = -c where b < 10;
 }
@@ -303,6 +315,19 @@ step sysmerge2	{
 step c2	{ COMMIT; }
 step r2	{ ROLLBACK; }
 
+step s2pp1 { SET plan_cache_mode TO force_generic_plan; }
+step s2pp2 { PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1; }
+step s2pp3 { EXECUTE epd(1); }
+step s2pp4 { DELETE FROM another_parttbl WHERE a = (SELECT 1); }
+
+step mergevalues {
+	MERGE INTO accounts
+	USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
+	ON v.accountid = accounts.accountid
+	WHEN MATCHED THEN UPDATE SET balance = v.balance
+	WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
+}
+
 session s3
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
 step read	{ SELECT * FROM accounts ORDER BY accountid; }
@@ -392,6 +417,11 @@ permutation wrtwcte readwcte c1 c2
 permutation wrjt selectjoinforupdate c2 c1
 permutation wrjt selectresultforupdate c2 c1
 permutation wrtwcte multireadwcte c1 c2
+permutation tid1 tid2 c1 c2 read
+permutation tid1 tidsucceed2 c1 c2 read
+permutation tidrange1 tidrange2 c1 c2 read
+# test that a rollback on s1 has s2 perform the update on the original row
+permutation tid1 tid2 r1 c2 read
 
 permutation simplepartupdate conditionalpartupdate c1 c2 read_part
 permutation simplepartupdate complexpartupdate c1 c2 read_part
@@ -401,3 +431,10 @@ permutation simplepartupdate_noroute complexpartupdate_doesnt_route c1 c2 read_p
 
 permutation sys1 sysupd2 c1 c2
 permutation sys1 sysmerge2 c1 c2
+
+# Exercise run-time partition pruning code in an EPQ recheck
+permutation s1pp1 s2pp1 s2pp2 s2pp3 c1 c2
+permutation s1pp1 s2pp4 c1 c2
+
+# test EPQ recheck in MERGE from VALUES_RTE, cf bug #19355
+permutation updateformergevalues mergevalues c1 c2 read
diff --git a/src/test/isolation/specs/insert-conflict-do-update-4.spec b/src/test/isolation/specs/insert-conflict-do-update-4.spec
new file mode 100644
index 00000000000..a62531660d3
--- /dev/null
+++ b/src/test/isolation/specs/insert-conflict-do-update-4.spec
@@ -0,0 +1,42 @@
+# INSERT...ON CONFLICT DO UPDATE test with partitioned table
+#
+# We use SELECT FOR UPDATE to block the INSERT at the point where
+# it has found an existing tuple and is attempting to update it.
+# Then we can execute a conflicting update and verify the results.
+# Of course, this only works in READ COMMITTED mode, else we'd get an error.
+
+setup
+{
+  CREATE TABLE upsert (i int PRIMARY KEY, j int, k int) PARTITION BY RANGE (i);
+  CREATE TABLE upsert_1 PARTITION OF upsert FOR VALUES FROM (1) TO (100);
+  CREATE TABLE upsert_2 PARTITION OF upsert FOR VALUES FROM (100) TO (200);
+
+  INSERT INTO upsert VALUES (1, 10, 100);
+}
+
+teardown
+{
+  DROP TABLE upsert;
+}
+
+session s1
+setup           { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step insert1    { INSERT INTO upsert VALUES (1, 11, 111)
+                  ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; }
+step select1    { SELECT * FROM upsert ORDER BY i; }
+step c1         { COMMIT; }
+
+session s2
+setup           { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step lock2      { SELECT * FROM upsert WHERE i = 1 FOR UPDATE; }
+step update2a   { UPDATE upsert SET i = i + 10 WHERE i = 1; }
+step update2b   { UPDATE upsert SET i = i + 150 WHERE i = 1; }
+step delete2    { DELETE FROM upsert WHERE i = 1; }
+step c2         { COMMIT; }
+
+# Test case where concurrent update moves the target row within the partition
+permutation lock2 insert1 update2a c2 select1 c1
+# Test case where concurrent update moves the target row to another partition
+permutation lock2 insert1 update2b c2 select1 c1
+# Test case where target row is concurrently deleted
+permutation lock2 insert1 delete2 c2 select1 c1
diff --git a/src/test/isolation/specs/intra-grant-inplace.spec b/src/test/isolation/specs/intra-grant-inplace.spec
index 9936d389359..e9c7848624c 100644
--- a/src/test/isolation/specs/intra-grant-inplace.spec
+++ b/src/test/isolation/specs/intra-grant-inplace.spec
@@ -20,7 +20,7 @@ step grant1	{
 	GRANT SELECT ON intra_grant_inplace TO PUBLIC;
 }
 step drop1	{
-	DROP TABLE intra_grant_inplace;
+	DELETE FROM pg_class WHERE relname = 'intra_grant_inplace';
 }
 step c1	{ COMMIT; }
 
diff --git a/src/test/isolation/specs/merge-match-recheck.spec b/src/test/isolation/specs/merge-match-recheck.spec
index 26266b8c297..6e7a776d17e 100644
--- a/src/test/isolation/specs/merge-match-recheck.spec
+++ b/src/test/isolation/specs/merge-match-recheck.spec
@@ -99,15 +99,19 @@ step "merge_bal_pa"
 }
 step "merge_bal_tg"
 {
-  MERGE INTO target_tg t
-  USING (SELECT 1 as key) s
-  ON s.key = t.key
-  WHEN MATCHED AND balance < 100 THEN
-	UPDATE SET balance = balance * 2, val = t.val || ' when1'
-  WHEN MATCHED AND balance < 200 THEN
-	UPDATE SET balance = balance * 4, val = t.val || ' when2'
-  WHEN MATCHED AND balance < 300 THEN
-	UPDATE SET balance = balance * 8, val = t.val || ' when3';
+  WITH t AS (
+    MERGE INTO target_tg t
+    USING (SELECT 1 as key) s
+    ON s.key = t.key
+    WHEN MATCHED AND balance < 100 THEN
+      UPDATE SET balance = balance * 2, val = t.val || ' when1'
+    WHEN MATCHED AND balance < 200 THEN
+      UPDATE SET balance = balance * 4, val = t.val || ' when2'
+    WHEN MATCHED AND balance < 300 THEN
+      UPDATE SET balance = balance * 8, val = t.val || ' when3'
+    RETURNING t.*
+  )
+  SELECT * FROM t;
 }
 
 step "merge_delete"
@@ -142,6 +146,8 @@ setup
   BEGIN ISOLATION LEVEL READ COMMITTED;
 }
 step "update1" { UPDATE target t SET balance = balance + 10, val = t.val || ' updated by update1' WHERE t.key = 1; }
+step "update1_pa" { UPDATE target_pa t SET balance = balance + 10, val = t.val || ' updated by update1_pa' WHERE t.key = 1; }
+step "update1_pa_move" { UPDATE target_pa t SET balance = 210, val = t.val || ' updated by update1_pa_move' WHERE t.key = 1; }
 step "update1_tg" { UPDATE target_tg t SET balance = balance + 10, val = t.val || ' updated by update1_tg' WHERE t.key = 1; }
 step "update2" { UPDATE target t SET status = 's2', val = t.val || ' updated by update2' WHERE t.key = 1; }
 step "update2_tg" { UPDATE target_tg t SET status = 's2', val = t.val || ' updated by update2_tg' WHERE t.key = 1; }
@@ -149,6 +155,10 @@ step "update3" { UPDATE target t SET status = 's3', val = t.val || ' updated by
 step "update3_tg" { UPDATE target_tg t SET status = 's3', val = t.val || ' updated by update3_tg' WHERE t.key = 1; }
 step "update5" { UPDATE target t SET status = 's5', val = t.val || ' updated by update5' WHERE t.key = 1; }
 step "update5_tg" { UPDATE target_tg t SET status = 's5', val = t.val || ' updated by update5_tg' WHERE t.key = 1; }
+step "update6" { UPDATE target t SET balance = balance - 100, val = t.val || ' updated by update6' WHERE t.key = 1; }
+step "update6_pa" { UPDATE target_pa t SET balance = balance - 100, val = t.val || ' updated by update6_pa' WHERE t.key = 1; }
+step "update6_tg" { UPDATE target_tg t SET balance = balance - 100, val = t.val || ' updated by update6_tg' WHERE t.key = 1; }
+step "update7" { UPDATE target t SET balance = 350, val = t.val || ' updated by update7' WHERE t.key = 1; }
 step "update_bal1" { UPDATE target t SET balance = 50, val = t.val || ' updated by update_bal1' WHERE t.key = 1; }
 step "update_bal1_pa" { UPDATE target_pa t SET balance = 50, val = t.val || ' updated by update_bal1_pa' WHERE t.key = 1; }
 step "update_bal1_tg" { UPDATE target_tg t SET balance = 50, val = t.val || ' updated by update_bal1_tg' WHERE t.key = 1; }
@@ -175,6 +185,18 @@ permutation "update_bal1" "merge_bal" "c2" "select1" "c1"
 permutation "update_bal1_pa" "merge_bal_pa" "c2" "select1_pa" "c1"
 permutation "update_bal1_tg" "merge_bal_tg" "c2" "select1_tg" "c1"
 
+# merge_bal sees row concurrently updated twice and rechecks WHEN conditions, different check passes, so final balance = 140
+permutation "update1" "update6" "merge_bal" "c2" "select1" "c1"
+permutation "update1_pa" "update6_pa" "merge_bal_pa" "c2" "select1_pa" "c1"
+permutation "update1_tg" "update6_tg" "merge_bal_tg" "c2" "select1_tg" "c1"
+
+# merge_bal sees row concurrently updated twice, first update would cause all checks to fail, second update causes different check to pass, so final balance = 2000
+permutation "update7" "update6" "merge_bal" "c2" "select1" "c1"
+
+# merge_bal sees concurrently updated row moved to new partition, so fails
+permutation "update1_pa_move" "merge_bal_pa" "c2" "c1"
+permutation "update1_pa" "update1_pa_move" "merge_bal_pa" "c2" "c1"
+
 # merge_delete sees concurrently updated row and rechecks WHEN conditions, but recheck passes and row is deleted
 permutation "update1" "merge_delete" "c2" "select1" "c1"
 permutation "update1_tg" "merge_delete_tg" "c2" "select1_tg" "c1"
diff --git a/src/test/isolation/specs/merge-update.spec b/src/test/isolation/specs/merge-update.spec
index c718ff646b2..b902779edd6 100644
--- a/src/test/isolation/specs/merge-update.spec
+++ b/src/test/isolation/specs/merge-update.spec
@@ -23,12 +23,27 @@ setup
 
   INSERT INTO pa_target VALUES (1, 'initial');
   INSERT INTO pa_target VALUES (2, 'initial');
+
+  CREATE FUNCTION explain_filter(text) RETURNS SETOF text
+  LANGUAGE plpgsql AS
+  $$
+  DECLARE
+    ln text;
+  BEGIN
+    FOR ln IN EXECUTE $1 LOOP
+      -- Ignore hash memory usage because it varies depending on the system
+      CONTINUE WHEN (ln ~ 'Memory Usage');
+      RETURN NEXT ln;
+    END LOOP;
+  END;
+  $$;
 }
 
 teardown
 {
   DROP TABLE target;
   DROP TABLE pa_target CASCADE;
+  DROP FUNCTION explain_filter;
 }
 
 session "s1"
@@ -78,6 +93,7 @@ step "pa_merge3"
 }
 step "c1" { COMMIT; }
 step "a1" { ABORT; }
+step "s1beginrr" { BEGIN ISOLATION LEVEL REPEATABLE READ; }
 
 session "s2"
 setup
@@ -97,6 +113,22 @@ step "merge2a"
 	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
   RETURNING merge_action(), old, new, t.*;
 }
+step "explain_merge2a"
+{
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO target t
+  USING (SELECT 1 as key, 'merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+}
 step "merge2b"
 {
   MERGE INTO target t
@@ -130,6 +162,22 @@ step "pa_merge2a"
 	UPDATE set key = t.key + 1, val = t.val || ' source not matched by pa_merge2a'
   RETURNING merge_action(), old, new, t.*;
 }
+step "explain_pa_merge2a"
+{
+  SELECT explain_filter($$
+  EXPLAIN (ANALYZE, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF)
+  MERGE INTO pa_target t
+  USING (SELECT 1 as key, 'pa_merge2a' as val) s
+  ON s.key = t.key
+  WHEN NOT MATCHED THEN
+	INSERT VALUES (s.key, s.val)
+  WHEN MATCHED THEN
+	UPDATE set key = t.key + 1, val = t.val || ' updated by ' || s.val
+  WHEN NOT MATCHED BY SOURCE THEN
+	UPDATE set key = t.key + 1, val = t.val || ' source not matched by pa_merge2a'
+  RETURNING merge_action(), old, new, t.*
+  $$);
+}
 # MERGE proceeds only if 'val' unchanged
 step "pa_merge2b_when"
 {
@@ -160,16 +208,20 @@ permutation "merge1" "c1" "select2" "c2"
 
 # One after the other, no concurrency
 permutation "merge1" "c1" "merge2a" "select2" "c2"
+permutation "merge1" "c1" "explain_merge2a" "select2" "c2"
 permutation "pa_merge1" "c1" "pa_merge2c_dup" "a2"
 
 # Now with concurrency
 permutation "merge1" "merge2a" "c1" "select2" "c2"
+permutation "merge1" "explain_merge2a" "c1" "select2" "c2"
 permutation "merge1" "merge2a" "a1" "select2" "c2"
 permutation "merge1" "merge2b" "c1" "select2" "c2"
 permutation "merge1" "merge2c" "c1" "select2" "c2"
 permutation "pa_merge1" "pa_merge2a" "c1" "pa_select2" "c2"
+permutation "pa_merge1" "explain_pa_merge2a" "c1" "pa_select2" "c2"
 permutation "pa_merge2" "pa_merge2a" "c1" "pa_select2" "c2" # fails
 permutation "pa_merge2" "c1" "pa_merge2a" "pa_select2" "c2" # succeeds
 permutation "pa_merge3" "pa_merge2b_when" "c1" "pa_select2" "c2" # WHEN not satisfied by updated tuple
 permutation "pa_merge1" "pa_merge2b_when" "c1" "pa_select2" "c2" # WHEN satisfied by updated tuple
 permutation "pa_merge1" "pa_merge2c_dup" "c1" "a2"
+permutation "merge2a" "c1" "s1beginrr" "merge1" "c2"
diff --git a/src/test/isolation/specs/stats.spec b/src/test/isolation/specs/stats.spec
index 1d98ac785b8..e6d29749915 100644
--- a/src/test/isolation/specs/stats.spec
+++ b/src/test/isolation/specs/stats.spec
@@ -6,10 +6,13 @@ setup
     INSERT INTO test_stat_tab(key, value) VALUES('k0', 1);
     INSERT INTO test_stat_oid(name, oid) VALUES('test_stat_tab', 'test_stat_tab'::regclass);
 
-    CREATE FUNCTION test_stat_func() RETURNS VOID LANGUAGE plpgsql AS $$BEGIN END;$$;
+    -- include 10us sleep to ensure that runtime measures as more than zero
+    CREATE FUNCTION test_stat_func() RETURNS VOID LANGUAGE plpgsql AS
+      $$BEGIN PERFORM pg_sleep(10e-6); END;$$;
     INSERT INTO test_stat_oid(name, oid) VALUES('test_stat_func', 'test_stat_func'::regproc);
 
-    CREATE FUNCTION test_stat_func2() RETURNS VOID LANGUAGE plpgsql AS $$BEGIN END;$$;
+    CREATE FUNCTION test_stat_func2() RETURNS VOID LANGUAGE plpgsql AS
+      $$BEGIN PERFORM pg_sleep(10e-6); END;$$;
     INSERT INTO test_stat_oid(name, oid) VALUES('test_stat_func2', 'test_stat_func2'::regproc);
 
     CREATE TABLE test_slru_stats(slru TEXT, stat TEXT, value INT);
diff --git a/src/test/modules/Makefile b/src/test/modules/Makefile
index aa1d27bbed3..4e82d6f1517 100644
--- a/src/test/modules/Makefile
+++ b/src/test/modules/Makefile
@@ -16,8 +16,10 @@ SUBDIRS = \
 		  spgist_name_ops \
 		  test_aio \
 		  test_bloomfilter \
+		  test_cloexec \
 		  test_copy_callbacks \
 		  test_custom_rmgrs \
+		  test_custom_types \
 		  test_ddl_deparse \
 		  test_dsa \
 		  test_dsm_registry \
diff --git a/src/test/modules/brin/t/01_workitems.pl b/src/test/modules/brin/t/01_workitems.pl
index c3b1fb51706..ccc3f420897 100644
--- a/src/test/modules/brin/t/01_workitems.pl
+++ b/src/test/modules/brin/t/01_workitems.pl
@@ -24,13 +24,31 @@
 	 create index brin_wi_idx on brin_wi using brin (a) with (pages_per_range=1, autosummarize=on);
 	 '
 );
+# Another table with an index that requires a snapshot to run
+$node->safe_psql(
+	'postgres',
+	'create table journal (d timestamp) with (fillfactor = 10);
+	 create function packdate(d timestamp) returns text language plpgsql
+	   as $$ begin return to_char(d, \'yyyymm\'); end; $$
+	   returns null on null input immutable;
+	 create index brin_packdate_idx on journal using brin (packdate(d))
+	   with (autosummarize = on, pages_per_range = 1);
+	 '
+);
+
 my $count = $node->safe_psql('postgres',
 	"select count(*) from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)"
 );
-is($count, '1', "initial index state is correct");
+is($count, '1', "initial brin_wi_index index state is correct");
+$count = $node->safe_psql('postgres',
+	"select count(*) from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)"
+);
+is($count, '1', "initial brin_packdate_idx index state is correct");
 
 $node->safe_psql('postgres',
 	'insert into brin_wi select * from generate_series(1, 100)');
+$node->safe_psql('postgres',
+	"insert into journal select * from generate_series(timestamp '1976-08-01', '1976-10-28', '1 day')");
 
 $node->poll_query_until(
 	'postgres',
@@ -38,9 +56,22 @@
 	't');
 
 $count = $node->safe_psql('postgres',
-	"select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)"
+	"select count(*) from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)
+	 where not placeholder;"
 );
-is($count, 't', "index got summarized");
+cmp_ok($count, '>', '1', "$count brin_wi_idx ranges got summarized");
+
+$node->poll_query_until(
+	'postgres',
+	"select count(*) > 1 from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)",
+	't');
+
+$count = $node->safe_psql('postgres',
+	"select count(*) from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)
+	 where not placeholder;"
+);
+cmp_ok($count, '>', '1', "$count brin_packdate_idx ranges got summarized");
+
 $node->stop;
 
 done_testing();
diff --git a/src/test/modules/commit_ts/t/001_base.pl b/src/test/modules/commit_ts/t/001_base.pl
index 1953b18f6b3..50e79ce6409 100644
--- a/src/test/modules/commit_ts/t/001_base.pl
+++ b/src/test/modules/commit_ts/t/001_base.pl
@@ -11,8 +11,7 @@
 use PostgreSQL::Test::Cluster;
 
 my $node = PostgreSQL::Test::Cluster->new('foxtrot');
-$node->init;
-$node->append_conf('postgresql.conf', 'track_commit_timestamp = on');
+$node->init(extra => [ '-c', "track_commit_timestamp=on" ]);
 $node->start;
 
 # Create a table, compare "now()" to the commit TS of its xmin
diff --git a/src/test/modules/gin/expected/gin_incomplete_splits.out b/src/test/modules/gin/expected/gin_incomplete_splits.out
index 15574e547ac..0f3ac9a0466 100644
--- a/src/test/modules/gin/expected/gin_incomplete_splits.out
+++ b/src/test/modules/gin/expected/gin_incomplete_splits.out
@@ -192,3 +192,4 @@ SELECT injection_points_detach('gin-finish-incomplete-split');
  
 (1 row)
 
+drop extension injection_points;
diff --git a/src/test/modules/gin/sql/gin_incomplete_splits.sql b/src/test/modules/gin/sql/gin_incomplete_splits.sql
index ebf0f620f0c..d451257c275 100644
--- a/src/test/modules/gin/sql/gin_incomplete_splits.sql
+++ b/src/test/modules/gin/sql/gin_incomplete_splits.sql
@@ -148,3 +148,5 @@ select insert_n(:next_i, 10) as next_i
 select verify(:next_i);
 
 SELECT injection_points_detach('gin-finish-incomplete-split');
+
+drop extension injection_points;
diff --git a/src/test/modules/injection_points/Makefile b/src/test/modules/injection_points/Makefile
index fc82cd67f6c..2e49d30f942 100644
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@ -14,7 +14,10 @@ PGFILEDESC = "injection_points - facility for injection points"
 REGRESS = injection_points hashagg reindex_conc vacuum
 REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress
 
-ISOLATION = basic inplace syscache-update-pruned
+ISOLATION = basic \
+	    inplace \
+	    syscache-update-pruned \
+	    heap_lock_update
 
 TAP_TESTS = 1
 
diff --git a/src/test/modules/injection_points/expected/heap_lock_update.out b/src/test/modules/injection_points/expected/heap_lock_update.out
new file mode 100644
index 00000000000..1ec8d876414
--- /dev/null
+++ b/src/test/modules/injection_points/expected/heap_lock_update.out
@@ -0,0 +1,83 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1begin s1update s2lock s1abort vacuum reinsert wake
+step s1begin: BEGIN;
+step s1update: UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid;
+ctid 
+-----
+(1,2)
+(1 row)
+
+step s2lock: select * from t where id = 1 for update; <waiting ...>
+step s1abort: ABORT;
+step vacuum: VACUUM t;
+step reinsert: 
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	UPDATE t SET id = 10002 WHERE id = 10001 RETURNING ctid;
+
+ctid 
+-----
+(1,2)
+(1 row)
+
+ctid 
+-----
+(1,3)
+(1 row)
+
+step wake: 
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+ <waiting ...>
+step s2lock: <... completed>
+id
+--
+ 1
+(1 row)
+
+step wake: <... completed>
+
+starting permutation: s1begin s1update s2lock s1abort vacuum reinsert_and_lock wake
+step s1begin: BEGIN;
+step s1update: UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid;
+ctid 
+-----
+(1,2)
+(1 row)
+
+step s2lock: select * from t where id = 1 for update; <waiting ...>
+step s1abort: ABORT;
+step vacuum: VACUUM t;
+step reinsert_and_lock: 
+	BEGIN;
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	SELECT ctid, * FROM t WHERE id = 1 FOR UPDATE;
+	COMMIT;
+	UPDATE t SET id = 10002 WHERE id = 10001 returning ctid;
+
+ctid 
+-----
+(1,2)
+(1 row)
+
+ctid |id
+-----+--
+(0,1)| 1
+(1 row)
+
+ctid 
+-----
+(1,3)
+(1 row)
+
+step wake: 
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+ <waiting ...>
+step s2lock: <... completed>
+id
+--
+ 1
+(1 row)
+
+step wake: <... completed>
diff --git a/src/test/modules/injection_points/injection_stats.c b/src/test/modules/injection_points/injection_stats.c
index 14903c629e0..ca8df4ad217 100644
--- a/src/test/modules/injection_points/injection_stats.c
+++ b/src/test/modules/injection_points/injection_stats.c
@@ -59,7 +59,7 @@ static const PgStat_KindInfo injection_stats = {
 /*
  * Kind ID reserved for statistics of injection points.
  */
-#define PGSTAT_KIND_INJECTION	129
+#define PGSTAT_KIND_INJECTION	25
 
 /* Track if stats are loaded */
 static bool inj_stats_loaded = false;
@@ -164,8 +164,7 @@ void
 pgstat_report_inj(const char *name)
 {
 	PgStat_EntryRef *entry_ref;
-	PgStatShared_InjectionPoint *shstatent;
-	PgStat_StatInjEntry *statent;
+	PgStat_StatInjEntry *pending;
 
 	/* leave if disabled */
 	if (!inj_stats_loaded || !inj_stats_enabled)
@@ -174,11 +173,10 @@ pgstat_report_inj(const char *name)
 	entry_ref = pgstat_prep_pending_entry(PGSTAT_KIND_INJECTION, InvalidOid,
 										  PGSTAT_INJ_IDX(name), NULL);
 
-	shstatent = (PgStatShared_InjectionPoint *) entry_ref->shared_stats;
-	statent = &shstatent->stats;
+	pending = (PgStat_StatInjEntry *) entry_ref->pending;
 
-	/* Update the injection point statistics */
-	statent->numcalls++;
+	/* Update the injection point pending statistics */
+	pending->numcalls++;
 }
 
 /*
diff --git a/src/test/modules/injection_points/injection_stats_fixed.c b/src/test/modules/injection_points/injection_stats_fixed.c
index 3d0c01bdd05..666b305261f 100644
--- a/src/test/modules/injection_points/injection_stats_fixed.c
+++ b/src/test/modules/injection_points/injection_stats_fixed.c
@@ -52,7 +52,7 @@ static const PgStat_KindInfo injection_stats_fixed = {
 	.fixed_amount = true,
 	.write_to_file = true,
 
-	.shared_size = sizeof(PgStat_StatInjFixedEntry),
+	.shared_size = sizeof(PgStatShared_InjectionPointFixed),
 	.shared_data_off = offsetof(PgStatShared_InjectionPointFixed, stats),
 	.shared_data_len = sizeof(((PgStatShared_InjectionPointFixed *) 0)->stats),
 
@@ -64,7 +64,7 @@ static const PgStat_KindInfo injection_stats_fixed = {
 /*
  * Kind ID reserved for statistics of injection points.
  */
-#define PGSTAT_KIND_INJECTION_FIXED	130
+#define PGSTAT_KIND_INJECTION_FIXED	26
 
 /* Track if fixed-numbered stats are loaded */
 static bool inj_fixed_loaded = false;
@@ -152,6 +152,8 @@ pgstat_report_inj_fixed(uint32 numattach,
 
 	stats_shmem = pgstat_get_custom_shmem_data(PGSTAT_KIND_INJECTION_FIXED);
 
+	LWLockAcquire(&stats_shmem->lock, LW_EXCLUSIVE);
+
 	pgstat_begin_changecount_write(&stats_shmem->changecount);
 	stats_shmem->stats.numattach += numattach;
 	stats_shmem->stats.numdetach += numdetach;
@@ -159,6 +161,8 @@ pgstat_report_inj_fixed(uint32 numattach,
 	stats_shmem->stats.numcached += numcached;
 	stats_shmem->stats.numloaded += numloaded;
 	pgstat_end_changecount_write(&stats_shmem->changecount);
+
+	LWLockRelease(&stats_shmem->lock);
 }
 
 /*
diff --git a/src/test/modules/injection_points/meson.build b/src/test/modules/injection_points/meson.build
index ce778ccf9ac..a73e1fe6c34 100644
--- a/src/test/modules/injection_points/meson.build
+++ b/src/test/modules/injection_points/meson.build
@@ -48,6 +48,7 @@ tests += {
       'basic',
       'inplace',
       'syscache-update-pruned',
+      'heap_lock_update',
     ],
     'runningcheck': false, # see syscache-update-pruned
   },
diff --git a/src/test/modules/injection_points/regress_injection.c b/src/test/modules/injection_points/regress_injection.c
index 7bba1c97d0f..524790a90ed 100644
--- a/src/test/modules/injection_points/regress_injection.c
+++ b/src/test/modules/injection_points/regress_injection.c
@@ -50,7 +50,7 @@ removable_cutoff(PG_FUNCTION_ARGS)
 	if (!PG_ARGISNULL(0))
 		rel = table_open(PG_GETARG_OID(0), AccessShareLock);
 
-	if (!rel->rd_rel->relisshared && autovacuum_start_daemon)
+	if (rel != NULL && !rel->rd_rel->relisshared && autovacuum_start_daemon)
 		elog(WARNING,
 			 "removable_cutoff(non-shared-rel) can move backward under autovacuum=on");
 
diff --git a/src/test/modules/injection_points/specs/heap_lock_update.spec b/src/test/modules/injection_points/specs/heap_lock_update.spec
new file mode 100644
index 00000000000..b3992a1eb7a
--- /dev/null
+++ b/src/test/modules/injection_points/specs/heap_lock_update.spec
@@ -0,0 +1,117 @@
+# Test race condition in tuple locking
+#
+# This is a reproducer for the bug reported at:
+# https://www.postgresql.org/message-id/CAOG%2BRQ74x0q%3DkgBBQ%3DmezuvOeZBfSxM1qu_o0V28bwDz3dHxLw%40mail.gmail.com
+#
+# The bug was that when following an update chain when locking tuples,
+# we sometimes failed to check that the xmin on the next tuple matched
+# the prior's xmax. If the updated tuple version was vacuumed away and
+# the slot was reused for an unrelated tuple, we'd incorrectly follow
+# and lock the unrelated tuple.
+
+
+# Set up a test table with enough rows to fill a page. We need the
+# UPDATE used in the test to put the new tuple on a different page,
+# because otherwise the VACUUM cannot remove the aborted tuple because
+# we hold a pin on the first page.
+#
+# The exact number of rows inserted doesn't otherwise matter, but we
+# arrange things in a deterministic fashion so that the last inserted
+# tuple goes to (1,1), and the updated and aborted tuple goes to
+# (1,2). That way we can just memorize those ctids in the expected
+# output, to verify that the test exercises the scenario we want.
+setup
+{
+	CREATE EXTENSION injection_points;
+
+	CREATE TABLE t (id int PRIMARY KEY);
+	do $$
+		DECLARE
+			i int;
+			tid tid;
+		BEGIN
+			FOR i IN 1..5000 LOOP
+				INSERT INTO t VALUES (i) RETURNING ctid INTO tid;
+				IF tid = '(1,1)' THEN
+					RETURN;
+				END IF;
+			END LOOP;
+			RAISE 'expected to insert tuple to (1,1)';
+	   END;
+   $$;
+}
+teardown
+{
+	DROP TABLE t;
+	DROP EXTENSION injection_points;
+}
+
+session s1
+step s1begin	{ BEGIN; }
+step s1update	{ UPDATE t SET id = 10000 WHERE id = 1 RETURNING ctid; }
+step s1abort	{ ABORT; }
+step vacuum		{ VACUUM t; }
+
+# Insert a new tuple, and update it.
+step reinsert	{
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	UPDATE t SET id = 10002 WHERE id = 10001 RETURNING ctid;
+}
+
+# Same as the 'reinsert' step, but for extra confusion, we also stamp
+# the original tuple with the same 'xmax' as the re-inserted one.
+step reinsert_and_lock {
+	BEGIN;
+	INSERT INTO t VALUES (10001) RETURNING ctid;
+	SELECT ctid, * FROM t WHERE id = 1 FOR UPDATE;
+	COMMIT;
+	UPDATE t SET id = 10002 WHERE id = 10001 returning ctid;
+}
+
+step wake	{
+	SELECT FROM injection_points_detach('heap_lock_updated_tuple');
+	SELECT FROM injection_points_wakeup('heap_lock_updated_tuple');
+}
+
+session s2
+setup	{
+	SELECT FROM injection_points_set_local();
+	SELECT FROM injection_points_attach('heap_lock_updated_tuple', 'wait');
+}
+step s2lock	{ select * from t where id = 1 for update; }
+
+permutation
+	# Begin transaction, update a row. Because of how we set up the
+	# test table, the updated tuple lands at (1,2)
+	s1begin
+	s1update
+
+	# While the updating transaction is open, start a new session that
+	# tries to lock the row. This blocks on the open transaction.
+	s2lock
+
+	# Abort the updating transaction. This unblocks session 2, but it
+	# will immediately hit the injection point and block on that.
+	s1abort
+	# Vacuum away the updated, aborted tuple.
+	vacuum
+
+	# Insert a new tuple. It lands at the same location where the
+	# updated tuple was.
+	reinsert
+
+	# Let the locking transaction continue. It should lock the
+	# original tuple, ignoring the re-inserted tuple.
+	wake(s2lock)
+
+# Variant where the re-inserted tuple is also locked by the inserting
+# transaction. This failed an earlier version of the fix during
+# development.
+permutation
+	s1begin
+	s1update
+	s2lock
+	s1abort
+	vacuum
+	reinsert_and_lock
+	wake(s2lock)
diff --git a/src/test/modules/meson.build b/src/test/modules/meson.build
index 9de0057bd1d..9a957351ab6 100644
--- a/src/test/modules/meson.build
+++ b/src/test/modules/meson.build
@@ -15,8 +15,10 @@ subdir('spgist_name_ops')
 subdir('ssl_passphrase_callback')
 subdir('test_aio')
 subdir('test_bloomfilter')
+subdir('test_cloexec')
 subdir('test_copy_callbacks')
 subdir('test_custom_rmgrs')
+subdir('test_custom_types')
 subdir('test_ddl_deparse')
 subdir('test_dsa')
 subdir('test_dsm_registry')
diff --git a/src/test/modules/oauth_validator/meson.build b/src/test/modules/oauth_validator/meson.build
index e190f9cf15a..6661eb33cab 100644
--- a/src/test/modules/oauth_validator/meson.build
+++ b/src/test/modules/oauth_validator/meson.build
@@ -81,5 +81,6 @@ tests += {
       'with_libcurl': oauth_flow_supported ? 'yes' : 'no',
       'with_python': 'yes',
     },
+    'deps': [oauth_hook_client],
   },
 }
diff --git a/src/test/modules/oauth_validator/t/001_server.pl b/src/test/modules/oauth_validator/t/001_server.pl
index 41672ebd5c6..c0dafb8be76 100644
--- a/src/test/modules/oauth_validator/t/001_server.pl
+++ b/src/test/modules/oauth_validator/t/001_server.pl
@@ -418,6 +418,35 @@ sub connstr
 	  qr/failed to obtain access token: mutual TLS required for client \(invalid_client\)/
 );
 
+# Count the number of calls to the internal flow when multiple retries are
+# triggered. The exact number depends on many things -- the TCP stack, the
+# version of Curl in use, random chance -- but a ridiculously high number
+# suggests something is wrong with our ability to clear multiplexer events after
+# they're no longer applicable.
+my ($ret, $stdout, $stderr) = $node->psql(
+	'postgres',
+	"SELECT 'connected for call count'",
+	extra_params => ['-w'],
+	connstr => connstr(stage => 'token', retries => 2),
+	on_error_stop => 0);
+
+is($ret, 0, "call count connection succeeds");
+like(
+	$stderr,
+	qr@Visit https://example\.com/ and enter the code: postgresuser@,
+	"call count: stderr matches");
+
+my $count_pattern = qr/\[libpq\] total number of polls: (\d+)/;
+if (like($stderr, $count_pattern, "call count: count is printed"))
+{
+	# For reference, a typical flow with two retries might take between 5-15
+	# calls to the client implementation. And while this will probably continue
+	# to change across OSes and Curl updates, we're likely in trouble if we see
+	# hundreds or thousands of calls.
+	$stderr =~ $count_pattern;
+	cmp_ok($1, '<', 100, "call count is reasonably small");
+}
+
 # Stress test: make sure our builtin flow operates correctly even if the client
 # application isn't respecting PGRES_POLLING_READING/WRITING signals returned
 # from PQconnectPoll().
@@ -428,7 +457,7 @@ sub connstr
 	connstr(stage => 'all', retries => 1, interval => 1));
 
 note "running '" . join("' '", @cmd) . "'";
-my ($stdout, $stderr) = run_command(\@cmd);
+($stdout, $stderr) = run_command(\@cmd);
 
 like($stdout, qr/connection succeeded/, "stress-async: stdout matches");
 unlike(
diff --git a/src/test/modules/oauth_validator/t/002_client.pl b/src/test/modules/oauth_validator/t/002_client.pl
index aac0220d215..e6c91fc911c 100644
--- a/src/test/modules/oauth_validator/t/002_client.pl
+++ b/src/test/modules/oauth_validator/t/002_client.pl
@@ -29,6 +29,8 @@
 $node->append_conf('postgresql.conf', "log_connections = all\n");
 $node->append_conf('postgresql.conf',
 	"oauth_validator_libraries = 'validator'\n");
+# Needed to inspect postmaster log after connection failure:
+$node->append_conf('postgresql.conf', "log_min_messages = debug2");
 $node->start;
 
 $node->safe_psql('postgres', 'CREATE USER test;');
@@ -47,7 +49,7 @@
 });
 $node->reload;
 
-my $log_start = $node->wait_for_log(qr/reloading configuration files/);
+$node->wait_for_log(qr/reloading configuration files/);
 
 $ENV{PGOAUTHDEBUG} = "UNSAFE";
 
@@ -73,6 +75,7 @@ sub test
 	my @cmd = ("oauth_hook_client", @{$flags}, $common_connstr);
 	note "running '" . join("' '", @cmd) . "'";
 
+	my $log_start = -s $node->logfile;
 	my ($stdout, $stderr) = run_command(\@cmd);
 
 	if (defined($params{expected_stdout}))
@@ -88,6 +91,18 @@ sub test
 	{
 		is($stderr, "", "$test_name: no stderr");
 	}
+
+	if (defined($params{log_like}))
+	{
+		# See Cluster::connect_fails(). To avoid races, we have to wait for the
+		# postmaster to flush the log for the finished connection.
+		$node->wait_for_log(
+			qr/DEBUG:  (?:00000: )?forked new client backend, pid=(\d+) socket.*DEBUG:  (?:00000: )?client backend \(PID \1\) exited with exit code \d/s,
+			$log_start);
+
+		$node->log_check("$test_name: log matches",
+			$log_start, log_like => $params{log_like});
+	}
 }
 
 test(
@@ -97,11 +112,8 @@ sub test
 		"--expected-uri", "$issuer/.well-known/openid-configuration",
 		"--expected-scope", $scope,
 	],
-	expected_stdout => qr/connection succeeded/);
-
-$node->log_check("validator receives correct token",
-	$log_start,
-	log_like => [ qr/oauth_validator: token="my-token", role="$user"/, ]);
+	expected_stdout => qr/connection succeeded/,
+	log_like => [qr/oauth_validator: token="my-token", role="$user"/]);
 
 if ($ENV{with_libcurl} ne 'yes')
 {
diff --git a/src/test/modules/oauth_validator/t/oauth_server.py b/src/test/modules/oauth_validator/t/oauth_server.py
index 0f8836aadf3..c70783ecbe4 100755
--- a/src/test/modules/oauth_validator/t/oauth_server.py
+++ b/src/test/modules/oauth_validator/t/oauth_server.py
@@ -257,13 +257,33 @@ def _access_token(self):
 
         return token
 
+    def _log_response(self, js: JsonObject) -> None:
+        """
+        Trims the response JSON, if necessary, and logs it for later debugging.
+        """
+        # At the moment the biggest problem for tests is the _pad_ member, which
+        # is a megabyte in size, so truncate that to something more reasonable.
+        if "_pad_" in js:
+            pad = js["_pad_"]
+
+            # Don't modify the original dict.
+            js = dict(js)
+            js["_pad_"] = pad[:64] + f"[...truncated from {len(pad)} bytes]"
+
+        resp = json.dumps(js).encode("ascii")
+        self.log_message("sending JSON response: %s", resp)
+
+        # If you've tripped this assertion, please truncate the new addition as
+        # above, or else come up with a new strategy.
+        assert len(resp) < 1024, "_log_response must be adjusted for new JSON"
+
     def _send_json(self, js: JsonObject) -> None:
         """
         Sends the provided JSON dict as an application/json response.
         self._response_code can be modified to send JSON error responses.
         """
         resp = json.dumps(js).encode("ascii")
-        self.log_message("sending JSON response: %s", resp)
+        self._log_response(js)
 
         self.send_response(self._response_code)
         self.send_header("Content-Type", self._content_type)
diff --git a/src/test/modules/test_aio/t/001_aio.pl b/src/test/modules/test_aio/t/001_aio.pl
index 82ffffc058f..3f0453619e8 100644
--- a/src/test/modules/test_aio/t/001_aio.pl
+++ b/src/test/modules/test_aio/t/001_aio.pl
@@ -396,8 +396,8 @@ sub test_io_error
 	{
 		my $invalid_page_re =
 		  $tblname eq 'tbl_corr'
-		  ? qr/invalid page in block 1 of relation base\/\d+\/\d+/
-		  : qr/invalid page in block 1 of relation base\/\d+\/t\d+_\d+/;
+		  ? qr/invalid page in block 1 of relation "base\/\d+\/\d+/
+		  : qr/invalid page in block 1 of relation "base\/\d+\/t\d+_\d+/;
 
 		# verify the error is reported in custom C code
 		psql_like(
@@ -798,7 +798,7 @@ sub test_inject
 		"shortened multi-block read detects invalid page",
 		qq(SELECT count(*) FROM tbl_corr WHERE ctid < '(2, 1)'),
 		qr/^$/,
-		qr/ERROR:.*invalid page in block 1 of relation base\/.*/);
+		qr/ERROR:.*invalid page in block 1 of relation "base\/.*/);
 
 	# trigger a hard error, should error out
 	$psql->query_safe(
@@ -985,7 +985,7 @@ sub test_zero
 			qq(
 SELECT read_rel_block_ll('tbl_zero', 0, zero_on_error=>false)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 0 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 0 of relation "base\/.*\/.*$/
 		);
 
 		# Check that page validity errors are zeroed
@@ -996,7 +996,7 @@ sub test_zero
 			qq(
 SELECT read_rel_block_ll('tbl_zero', 0, zero_on_error=>true)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 0 of relation base\/.*\/.*; zeroing out page$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 0 of relation "base\/.*\/.*"; zeroing out page$/
 		);
 
 		# And that once the corruption is fixed, we can read again
@@ -1027,7 +1027,7 @@ sub test_zero
 			"$persistency: test zeroing of invalid block 3",
 			qq(SELECT read_rel_block_ll('tbl_zero', 3, zero_on_error=>true);),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation base\/.*\/.*; zeroing out page$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation "base\/.*\/.*"; zeroing out page$/
 		);
 
 
@@ -1044,7 +1044,7 @@ sub test_zero
 			"$persistency: test reading of invalid block 2,3 in larger read",
 			qq(SELECT read_rel_block_ll('tbl_zero', 1, nblocks=>4, zero_on_error=>false)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first invalid page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first invalid page\.\nHINT:[^\n]+$/
 		);
 
 		# Then test zeroing via ZERO_ON_ERROR flag
@@ -1054,7 +1054,7 @@ sub test_zero
 			"$persistency: test zeroing of invalid block 2,3 in larger read, ZERO_ON_ERROR",
 			qq(SELECT read_rel_block_ll('tbl_zero', 1, nblocks=>4, zero_on_error=>true)),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first zeroed page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first zeroed page\.\nHINT:[^\n]+$/
 		);
 
 		# Then test zeroing via zero_damaged_pages
@@ -1069,7 +1069,7 @@ sub test_zero
 COMMIT;
 ),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation base\/.*\/.*\nDETAIL:  Block 2 held first zeroed page\.\nHINT:[^\n]+$/
+			qr/^psql:<stdin>:\d+: WARNING:  zeroing out 2 invalid pages among blocks 1..4 of relation "base\/.*\/.*\nDETAIL:  Block 2 held the first zeroed page\.\nHINT:[^\n]+$/
 		);
 
 		$psql_a->query_safe(qq(COMMIT));
@@ -1091,7 +1091,7 @@ sub test_zero
 			qq(
 SELECT count(*) FROM tbl_zero),
 			qr/^$/,
-			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 2 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 2 of relation "base\/.*\/.*$/
 		);
 
 		# Verify that bufmgr.c IO zeroes out pages with page validity errors
@@ -1106,7 +1106,7 @@ sub test_zero
 COMMIT;
 ),
 			qr/^\d+$/,
-			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 2 of relation base\/.*\/.*$/
+			qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 2 of relation "base\/.*\/.*$/
 		);
 
 		# Check that warnings/errors about page validity in an IO started by
@@ -1192,7 +1192,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_normal', 3, nblocks=>1, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation base\/\d+\/\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation "base\/\d+\/\d+"$/
 	);
 
 	my ($cs_count_after, $cs_ts_after) =
@@ -1214,7 +1214,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_temp', 4, nblocks=>2, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation base\/\d+\/t\d+_\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation "base\/\d+\/t\d+_\d+"$/
 	);
 
 	($cs_count_after, $cs_ts_after) = checksum_failures($psql_a, 'postgres');
@@ -1235,7 +1235,7 @@ sub test_checksum
 		qq(
 SELECT read_rel_block_ll('pg_shseclabel', 2, nblocks=>2, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 2..3 of relation global\/\d+\nDETAIL:  Block 2 held first invalid page\.\nHINT:[^\n]+$/
+		qr/^psql:<stdin>:\d+: ERROR:  2 invalid pages among blocks 2..3 of relation "global\/\d+"\nDETAIL:  Block 2 held the first invalid page\.\nHINT:[^\n]+$/
 	);
 
 	($cs_count_after, $cs_ts_after) = checksum_failures($psql_a);
@@ -1300,7 +1300,7 @@ sub test_checksum_createdb
 		"create database w/ wal strategy, invalid source",
 		$createdb_sql,
 		qr/^$/,
-		qr/psql:<stdin>:\d+: ERROR:  invalid page in block 1 of relation base\/\d+\/\d+$/
+		qr/psql:<stdin>:\d+: ERROR:  invalid page in block 1 of relation "base\/\d+\/\d+"$/
 	);
 	my ($cs_count_after, $cs_ts_after) =
 	  checksum_failures($psql, 'regression_createdb_source');
@@ -1409,7 +1409,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 2, nblocks=>3, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation base\/\d+\/\d+$/
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 4 of relation "base\/\d+\/\d+"$/
 	);
 
 	# Test multi-block read with different problems in different blocks
@@ -1431,7 +1431,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 1, nblocks=>5, zero_on_error=>true);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: WARNING:  zeroing 3 page\(s\) and ignoring 2 checksum failure\(s\) among blocks 1..5 of relation/
+		qr/^psql:<stdin>:\d+: WARNING:  zeroing 3 page\(s\) and ignoring 2 checksum failure\(s\) among blocks 1..5 of relation "/
 	);
 
 
@@ -1444,17 +1444,17 @@ sub test_ignore_checksum
 	ok(1, "$io_method: found information about checksum failure in block 2");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 3 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 3 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about invalid page in block 3");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 4 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 4 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about checksum failure in block 4");
 
 	$node->wait_for_log(
-		qr/LOG:  invalid page in block 5 of relation base.*; zeroing out page/,
+		qr/LOG:  invalid page in block 5 of relation "base.*"; zeroing out page/,
 		$log_location);
 	ok(1, "$io_method: found information about checksum failure in block 5");
 
@@ -1473,7 +1473,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 3, nblocks=>1, zero_on_error=>false);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation/);
+		qr/^psql:<stdin>:\d+: ERROR:  invalid page in block 3 of relation "/);
 
 	psql_like(
 		$io_method,
@@ -1482,7 +1482,7 @@ sub test_ignore_checksum
 		qq(
 SELECT read_rel_block_ll('tbl_cs_fail', 3, nblocks=>1, zero_on_error=>true);),
 		qr/^$/,
-		qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation base\/.*; zeroing out page/
+		qr/^psql:<stdin>:\d+: WARNING:  invalid page in block 3 of relation "base\/.*"; zeroing out page/
 	);
 
 
diff --git a/src/test/modules/test_cloexec/.gitignore b/src/test/modules/test_cloexec/.gitignore
new file mode 100644
index 00000000000..0234e9d8406
--- /dev/null
+++ b/src/test/modules/test_cloexec/.gitignore
@@ -0,0 +1,3 @@
+/test_cloexec
+# Generated subdirectories
+/tmp_check/
diff --git a/src/test/modules/test_cloexec/Makefile b/src/test/modules/test_cloexec/Makefile
new file mode 100644
index 00000000000..db3876f21e4
--- /dev/null
+++ b/src/test/modules/test_cloexec/Makefile
@@ -0,0 +1,21 @@
+# src/test/modules/test_cloexec/Makefile
+
+PGFILEDESC = "test_cloexec - test O_CLOEXEC flag handling"
+PGAPPICON = win32
+
+PROGRAM = test_cloexec
+OBJS = $(WIN32RES) test_cloexec.o
+
+NO_INSTALLCHECK = 1
+TAP_TESTS = 1
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/test/modules/test_cloexec
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/src/test/modules/test_cloexec/meson.build b/src/test/modules/test_cloexec/meson.build
new file mode 100644
index 00000000000..63c8658b04e
--- /dev/null
+++ b/src/test/modules/test_cloexec/meson.build
@@ -0,0 +1,26 @@
+# src/test/modules/test_cloexec/meson.build
+
+# This test is Windows-only
+if host_system != 'windows'
+  subdir_done()
+endif
+
+test_cloexec_sources = files('test_cloexec.c')
+
+test_cloexec = executable('test_cloexec',
+  test_cloexec_sources,
+  dependencies: [frontend_code],
+  link_with: [pgport[''], pgcommon['']],
+  kwargs: default_bin_args,
+)
+
+tests += {
+  'name': 'test_cloexec',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'tap': {
+    'tests': [
+      't/001_cloexec.pl',
+    ],
+  },
+}
diff --git a/src/test/modules/test_cloexec/t/001_cloexec.pl b/src/test/modules/test_cloexec/t/001_cloexec.pl
new file mode 100644
index 00000000000..4c56eb3a4be
--- /dev/null
+++ b/src/test/modules/test_cloexec/t/001_cloexec.pl
@@ -0,0 +1,60 @@
+# Test O_CLOEXEC flag handling on Windows
+#
+# This test verifies that file handles opened with O_CLOEXEC are not
+# inherited by child processes, while handles opened without O_CLOEXEC
+# are inherited.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Utils;
+use Test::More;
+use IPC::Run qw(run);
+use File::Spec;
+use Cwd 'abs_path';
+
+if (!$PostgreSQL::Test::Utils::windows_os)
+{
+	plan skip_all => 'test is Windows-specific';
+}
+
+plan tests => 1;
+
+my $test_prog;
+foreach my $dir (split(/$Config::Config{path_sep}/, $ENV{PATH}))
+{
+	my $candidate = File::Spec->catfile($dir, 'test_cloexec.exe');
+	if (-f $candidate && -x $candidate)
+	{
+		$test_prog = $candidate;
+		last;
+	}
+}
+
+if (!$test_prog)
+{
+	$test_prog = './test_cloexec.exe';
+}
+
+if (!-f $test_prog)
+{
+	BAIL_OUT("test program not found: $test_prog");
+}
+
+note("Using test program: $test_prog");
+
+my ($stdout, $stderr);
+my $result = run [ $test_prog ], '>', \$stdout, '2>', \$stderr;
+
+note("Test program output:");
+note($stdout) if $stdout;
+
+if ($stderr)
+{
+	diag("Test program stderr:");
+	diag($stderr);
+}
+
+ok($result && $stdout =~ /SUCCESS.*O_CLOEXEC behavior verified/s,
+   "O_CLOEXEC prevents handle inheritance");
+
+done_testing();
\ No newline at end of file
diff --git a/src/test/modules/test_cloexec/test_cloexec.c b/src/test/modules/test_cloexec/test_cloexec.c
new file mode 100644
index 00000000000..aec8af9937d
--- /dev/null
+++ b/src/test/modules/test_cloexec/test_cloexec.c
@@ -0,0 +1,240 @@
+/*-------------------------------------------------------------------------
+ *
+ * test_cloexec.c
+ *		Test O_CLOEXEC flag handling on Windows
+ *
+ * This program tests that:
+ * 1. File handles opened with O_CLOEXEC are NOT inherited by child processes
+ * 2. File handles opened without O_CLOEXEC ARE inherited by child processes
+ *
+ * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#include "common/file_utils.h"
+#include "port.h"
+
+#ifdef WIN32
+static void run_parent_tests(const char *testfile1, const char *testfile2);
+static void run_child_tests(const char *handle1_str, const char *handle2_str);
+static bool try_write_to_handle(HANDLE h, const char *label);
+#endif
+
+int
+main(int argc, char *argv[])
+{
+	/* Windows-only test */
+#ifndef WIN32
+	fprintf(stderr, "This test only runs on Windows\n");
+	return 0;
+#else
+	char		testfile1[MAXPGPATH];
+	char		testfile2[MAXPGPATH];
+
+	if (argc == 3)
+	{
+		/*
+		 * Child mode: receives two handle values as hex strings and attempts
+		 * to write to them.
+		 */
+		run_child_tests(argv[1], argv[2]);
+		return 0;
+	}
+	else if (argc == 1)
+	{
+		/* Parent mode: opens files and spawns child */
+		snprintf(testfile1, sizeof(testfile1), "test_cloexec_1_%d.tmp", (int) getpid());
+		snprintf(testfile2, sizeof(testfile2), "test_cloexec_2_%d.tmp", (int) getpid());
+
+		run_parent_tests(testfile1, testfile2);
+
+		/* Clean up test files */
+		unlink(testfile1);
+		unlink(testfile2);
+
+		return 0;
+	}
+	else
+	{
+		fprintf(stderr, "Usage: %s [handle1_hex handle2_hex]\n", argv[0]);
+		return 1;
+	}
+#endif
+}
+
+#ifdef WIN32
+static void
+run_parent_tests(const char *testfile1, const char *testfile2)
+{
+	int			fd1,
+				fd2;
+	HANDLE		h1,
+				h2;
+	char		exe_path[MAXPGPATH];
+	char		cmdline[MAXPGPATH + 100];
+	STARTUPINFO si = {.cb = sizeof(si)};
+	PROCESS_INFORMATION pi = {0};
+	DWORD		exit_code;
+
+	printf("Parent: Opening test files...\n");
+
+	/* Open first file WITH O_CLOEXEC - should NOT be inherited */
+	fd1 = open(testfile1, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0600);
+	if (fd1 < 0)
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", testfile1, strerror(errno));
+		exit(1);
+	}
+
+	/* Open second file WITHOUT O_CLOEXEC - should be inherited */
+	fd2 = open(testfile2, O_RDWR | O_CREAT | O_TRUNC, 0600);
+	if (fd2 < 0)
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", testfile2, strerror(errno));
+		close(fd1);
+		exit(1);
+	}
+
+	/* Get Windows HANDLEs from file descriptors */
+	h1 = (HANDLE) _get_osfhandle(fd1);
+	h2 = (HANDLE) _get_osfhandle(fd2);
+
+	if (h1 == INVALID_HANDLE_VALUE || h2 == INVALID_HANDLE_VALUE)
+	{
+		fprintf(stderr, "Failed to get OS handles\n");
+		close(fd1);
+		close(fd2);
+		exit(1);
+	}
+
+	printf("Parent: fd1=%d (O_CLOEXEC) -> HANDLE=%p\n", fd1, h1);
+	printf("Parent: fd2=%d (no O_CLOEXEC) -> HANDLE=%p\n", fd2, h2);
+
+	/*
+	 * Find the actual executable path by removing any arguments from
+	 * GetCommandLine(), and add our new arguments.
+	 */
+	GetModuleFileName(NULL, exe_path, sizeof(exe_path));
+	snprintf(cmdline, sizeof(cmdline), "\"%s\" %p %p", exe_path, h1, h2);
+
+	printf("Parent: Spawning child process...\n");
+	printf("Parent: Command line: %s\n", cmdline);
+
+	if (!CreateProcess(NULL,	/* application name */
+					   cmdline, /* command line */
+					   NULL,	/* process security attributes */
+					   NULL,	/* thread security attributes */
+					   TRUE,	/* bInheritHandles - CRITICAL! */
+					   0,		/* creation flags */
+					   NULL,	/* environment */
+					   NULL,	/* current directory */
+					   &si,		/* startup info */
+					   &pi))	/* process information */
+	{
+		fprintf(stderr, "CreateProcess failed: %lu\n", GetLastError());
+		close(fd1);
+		close(fd2);
+		exit(1);
+	}
+
+	printf("Parent: Waiting for child process...\n");
+
+	/* Wait for child to complete */
+	WaitForSingleObject(pi.hProcess, INFINITE);
+	GetExitCodeProcess(pi.hProcess, &exit_code);
+
+	CloseHandle(pi.hProcess);
+	CloseHandle(pi.hThread);
+
+	close(fd1);
+	close(fd2);
+
+	printf("Parent: Child exit code: %lu\n", exit_code);
+
+	if (exit_code == 0)
+	{
+		printf("Parent: SUCCESS - O_CLOEXEC behavior verified\n");
+	}
+	else
+	{
+		printf("Parent: FAILURE - O_CLOEXEC not working correctly\n");
+		exit(1);
+	}
+}
+
+static void
+run_child_tests(const char *handle1_str, const char *handle2_str)
+{
+	HANDLE		h1,
+				h2;
+	bool		h1_worked,
+				h2_worked;
+
+	/* Parse handle values from hex strings */
+	if (sscanf(handle1_str, "%p", &h1) != 1 ||
+		sscanf(handle2_str, "%p", &h2) != 1)
+	{
+		fprintf(stderr, "Child: Failed to parse handle values\n");
+		exit(1);
+	}
+
+	printf("Child: Received HANDLE1=%p (should fail - O_CLOEXEC)\n", h1);
+	printf("Child: Received HANDLE2=%p (should work - no O_CLOEXEC)\n", h2);
+
+	/* Try to write to both handles */
+	h1_worked = try_write_to_handle(h1, "HANDLE1");
+	h2_worked = try_write_to_handle(h2, "HANDLE2");
+
+	printf("Child: HANDLE1 (O_CLOEXEC): %s\n",
+		   h1_worked ? "ACCESSIBLE (BAD!)" : "NOT ACCESSIBLE (GOOD!)");
+	printf("Child: HANDLE2 (no O_CLOEXEC): %s\n",
+		   h2_worked ? "ACCESSIBLE (GOOD!)" : "NOT ACCESSIBLE (BAD!)");
+
+	/*
+	 * For O_CLOEXEC to work correctly, h1 should NOT be accessible (h1_worked
+	 * == false) and h2 SHOULD be accessible (h2_worked == true).
+	 */
+	if (!h1_worked && h2_worked)
+	{
+		printf("Child: Test PASSED - O_CLOEXEC working correctly\n");
+		exit(0);
+	}
+	else
+	{
+		printf("Child: Test FAILED - O_CLOEXEC not working correctly\n");
+		exit(1);
+	}
+}
+
+static bool
+try_write_to_handle(HANDLE h, const char *label)
+{
+	const char *test_data = "test\n";
+	DWORD		bytes_written;
+	BOOL		result;
+
+	result = WriteFile(h, test_data, strlen(test_data), &bytes_written, NULL);
+
+	if (result && bytes_written == strlen(test_data))
+	{
+		printf("Child: Successfully wrote to %s\n", label);
+		return true;
+	}
+	else
+	{
+		printf("Child: Failed to write to %s (error %lu)\n",
+			   label, GetLastError());
+		return false;
+	}
+}
+#endif
diff --git a/src/test/modules/test_custom_types/.gitignore b/src/test/modules/test_custom_types/.gitignore
new file mode 100644
index 00000000000..5dcb3ff9723
--- /dev/null
+++ b/src/test/modules/test_custom_types/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/src/test/modules/test_custom_types/Makefile b/src/test/modules/test_custom_types/Makefile
new file mode 100644
index 00000000000..e1b582b26ea
--- /dev/null
+++ b/src/test/modules/test_custom_types/Makefile
@@ -0,0 +1,20 @@
+# src/test/modules/test_custom_types/Makefile
+
+MODULES = test_custom_types
+
+EXTENSION = test_custom_types
+DATA = test_custom_types--1.0.sql
+PGFILEDESC = "test_custom_types - tests for dummy custom types"
+
+REGRESS = test_custom_types
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/test/modules/test_custom_types
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/src/test/modules/test_custom_types/README b/src/test/modules/test_custom_types/README
new file mode 100644
index 00000000000..a37d2db577e
--- /dev/null
+++ b/src/test/modules/test_custom_types/README
@@ -0,0 +1,9 @@
+test_custom_types
+=================
+
+This module contains a set of custom data types, with some of the following
+patterns:
+
+- typanalyze function registered to a custom type, returning false.
+- typanalyze function registered to a custom type, registering invalid stats
+  data.
diff --git a/src/test/modules/test_custom_types/expected/test_custom_types.out b/src/test/modules/test_custom_types/expected/test_custom_types.out
new file mode 100644
index 00000000000..2fb6b0b10ee
--- /dev/null
+++ b/src/test/modules/test_custom_types/expected/test_custom_types.out
@@ -0,0 +1,174 @@
+-- Tests with various custom types
+CREATE EXTENSION test_custom_types;
+-- Test comparison functions
+SELECT '42'::int_custom = '42'::int_custom AS eq_test;
+ eq_test 
+---------
+ t
+(1 row)
+
+SELECT '42'::int_custom <> '42'::int_custom AS nt_test;
+ nt_test 
+---------
+ f
+(1 row)
+
+SELECT '42'::int_custom < '100'::int_custom AS lt_test;
+ lt_test 
+---------
+ t
+(1 row)
+
+SELECT '100'::int_custom > '42'::int_custom AS gt_test;
+ gt_test 
+---------
+ t
+(1 row)
+
+SELECT '42'::int_custom <= '100'::int_custom AS le_test;
+ le_test 
+---------
+ t
+(1 row)
+
+SELECT '100'::int_custom >= '42'::int_custom AS ge_test;
+ ge_test 
+---------
+ t
+(1 row)
+
+-- Create a table with the int_custom type
+CREATE TABLE test_table (
+    id int,
+    data int_custom
+);
+INSERT INTO test_table VALUES (1, '42'), (2, '100'), (3, '200');
+-- Verify data was inserted correctly
+SELECT * FROM test_table ORDER BY id;
+ id | data 
+----+------
+  1 | 42
+  2 | 100
+  3 | 200
+(3 rows)
+
+-- Dummy function used for expression evaluations.
+-- Note that this function does not use a SQL-standard function body on
+-- purpose, so as external statistics can be loaded from it.
+CREATE OR REPLACE FUNCTION func_int_custom (p_value int_custom)
+  RETURNS int_custom LANGUAGE plpgsql AS $$
+  BEGIN
+    RETURN p_value;
+  END; $$;
+-- Switch type to use typanalyze function that always returns false.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_false);
+-- Extended statistics with an attribute that cannot be analyzed.
+-- This includes all statistics kinds.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+WARNING:  statistics object "public.test_stats" could not be computed for relation "public.test_table"
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- Extended statistics with an expression that cannot be analyzed.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+WARNING:  statistics object "public.test_stats" could not be computed for relation "public.test_table"
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- There should be no data stored for the expression.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+(0 rows)
+
+-- Switch type to use typanalyze function that generates invalid data.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_invalid);
+-- Extended statistics with an attribute that generates invalid stats.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | t
+(1 row)
+
+DROP STATISTICS test_stats;
+-- Extended statistics with an expression that generates invalid data.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, some data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+  stxname   | expr_stats_is_null 
+------------+--------------------
+ test_stats | f
+(1 row)
+
+-- There should be some data stored for the expression, stored as NULL.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width,
+  n_distinct,
+  most_common_vals,
+  most_common_freqs,
+  histogram_bounds,
+  correlation,
+  most_common_elems,
+  most_common_elem_freqs,
+  elem_count_histogram
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+-[ RECORD 1 ]----------+-----------
+tablename              | test_table
+statistics_name        | test_stats
+null_frac              | 
+avg_width              | 
+n_distinct             | 
+most_common_vals       | 
+most_common_freqs      | 
+histogram_bounds       | 
+correlation            | 
+most_common_elems      | 
+most_common_elem_freqs | 
+elem_count_histogram   | 
+
+-- Run a query able to load the extended stats, including the NULL data.
+SELECT COUNT(*) FROM test_table GROUP BY (func_int_custom(data));
+ count 
+-------
+     1
+     1
+     1
+(3 rows)
+
+DROP STATISTICS test_stats;
+-- Cleanup
+DROP FUNCTION func_int_custom;
+DROP TABLE test_table;
+DROP EXTENSION test_custom_types;
diff --git a/src/test/modules/test_custom_types/meson.build b/src/test/modules/test_custom_types/meson.build
new file mode 100644
index 00000000000..3d4f433dd51
--- /dev/null
+++ b/src/test/modules/test_custom_types/meson.build
@@ -0,0 +1,33 @@
+# Copyright (c) 2026, PostgreSQL Global Development Group
+
+test_custom_types_sources = files(
+  'test_custom_types.c',
+)
+
+if host_system == 'windows'
+  test_custom_types_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'test_custom_types',
+    '--FILEDESC', 'test_custom_types - tests for dummy custom types',])
+endif
+
+test_custom_types = shared_module('test_custom_types',
+  test_custom_types_sources,
+  kwargs: pg_test_mod_args,
+)
+test_install_libs += test_custom_types
+
+test_install_data += files(
+  'test_custom_types.control',
+  'test_custom_types--1.0.sql',
+)
+
+tests += {
+  'name': 'test_custom_types',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'test_custom_types',
+    ],
+  },
+}
diff --git a/src/test/modules/test_custom_types/sql/test_custom_types.sql b/src/test/modules/test_custom_types/sql/test_custom_types.sql
new file mode 100644
index 00000000000..206a17c667f
--- /dev/null
+++ b/src/test/modules/test_custom_types/sql/test_custom_types.sql
@@ -0,0 +1,104 @@
+-- Tests with various custom types
+
+CREATE EXTENSION test_custom_types;
+
+-- Test comparison functions
+SELECT '42'::int_custom = '42'::int_custom AS eq_test;
+SELECT '42'::int_custom <> '42'::int_custom AS nt_test;
+SELECT '42'::int_custom < '100'::int_custom AS lt_test;
+SELECT '100'::int_custom > '42'::int_custom AS gt_test;
+SELECT '42'::int_custom <= '100'::int_custom AS le_test;
+SELECT '100'::int_custom >= '42'::int_custom AS ge_test;
+
+-- Create a table with the int_custom type
+CREATE TABLE test_table (
+    id int,
+    data int_custom
+);
+INSERT INTO test_table VALUES (1, '42'), (2, '100'), (3, '200');
+
+-- Verify data was inserted correctly
+SELECT * FROM test_table ORDER BY id;
+
+-- Dummy function used for expression evaluations.
+-- Note that this function does not use a SQL-standard function body on
+-- purpose, so as external statistics can be loaded from it.
+CREATE OR REPLACE FUNCTION func_int_custom (p_value int_custom)
+  RETURNS int_custom LANGUAGE plpgsql AS $$
+  BEGIN
+    RETURN p_value;
+  END; $$;
+
+-- Switch type to use typanalyze function that always returns false.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_false);
+
+-- Extended statistics with an attribute that cannot be analyzed.
+-- This includes all statistics kinds.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+
+-- Extended statistics with an expression that cannot be analyzed.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+-- There should be no data stored for the expression.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+
+-- Switch type to use typanalyze function that generates invalid data.
+ALTER TYPE int_custom SET (ANALYZE = int_custom_typanalyze_invalid);
+
+-- Extended statistics with an attribute that generates invalid stats.
+CREATE STATISTICS test_stats ON data, id FROM test_table;
+-- Computation of the stats fails, no data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+DROP STATISTICS test_stats;
+
+-- Extended statistics with an expression that generates invalid data.
+CREATE STATISTICS test_stats ON func_int_custom(data), (id) FROM test_table;
+-- Computation of the stats fails, some data generated.
+ANALYZE test_table;
+SELECT stxname, stxdexpr IS NULL as expr_stats_is_null
+  FROM pg_statistic_ext s
+  LEFT JOIN pg_statistic_ext_data d ON s.oid = d.stxoid
+  WHERE stxname = 'test_stats';
+-- There should be some data stored for the expression, stored as NULL.
+SELECT tablename,
+  statistics_name,
+  null_frac,
+  avg_width,
+  n_distinct,
+  most_common_vals,
+  most_common_freqs,
+  histogram_bounds,
+  correlation,
+  most_common_elems,
+  most_common_elem_freqs,
+  elem_count_histogram
+  FROM pg_stats_ext_exprs WHERE statistics_name = 'test_stats' \gx
+-- Run a query able to load the extended stats, including the NULL data.
+SELECT COUNT(*) FROM test_table GROUP BY (func_int_custom(data));
+DROP STATISTICS test_stats;
+
+-- Cleanup
+DROP FUNCTION func_int_custom;
+DROP TABLE test_table;
+DROP EXTENSION test_custom_types;
diff --git a/src/test/modules/test_custom_types/test_custom_types--1.0.sql b/src/test/modules/test_custom_types/test_custom_types--1.0.sql
new file mode 100644
index 00000000000..ce0e905d636
--- /dev/null
+++ b/src/test/modules/test_custom_types/test_custom_types--1.0.sql
@@ -0,0 +1,164 @@
+/* src/test/modules/test_custom_types/test_custom_types--1.0.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION test_custom_types" to load this file. \quit
+
+--
+-- Input/output functions for int_custom type
+--
+CREATE FUNCTION int_custom_in(cstring)
+RETURNS int_custom
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_out(int_custom)
+RETURNS cstring
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+--
+-- Typanalyze function that returns false
+--
+CREATE FUNCTION int_custom_typanalyze_false(internal)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+--
+-- Typanalyze function that returns invalid stats
+--
+CREATE FUNCTION int_custom_typanalyze_invalid(internal)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+--
+-- The int_custom type definition
+--
+-- This type is identical to int4 in storage, and is used in subsequent
+-- tests to have different properties.
+--
+CREATE TYPE int_custom (
+  INPUT = int_custom_in,
+  OUTPUT = int_custom_out,
+  LIKE = int4
+);
+
+--
+-- Comparison functions for int_custom
+--
+-- These are required to create a btree operator class, which is needed
+-- for the type to be usable in extended statistics objects.
+--
+CREATE FUNCTION int_custom_eq(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_ne(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_lt(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_le(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_gt(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_ge(int_custom, int_custom)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE FUNCTION int_custom_cmp(int_custom, int_custom)
+RETURNS integer
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
+-- Operators for int_custom, for btree operator class
+CREATE OPERATOR = (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_eq,
+  COMMUTATOR = =,
+  NEGATOR = <>,
+  RESTRICT = eqsel,
+  JOIN = eqjoinsel,
+  HASHES,
+  MERGES
+);
+
+CREATE OPERATOR <> (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_ne,
+  COMMUTATOR = <>,
+  NEGATOR = =,
+  RESTRICT = neqsel,
+  JOIN = neqjoinsel
+);
+
+CREATE OPERATOR < (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_lt,
+  COMMUTATOR = >,
+  NEGATOR = >=,
+  RESTRICT = scalarltsel,
+  JOIN = scalarltjoinsel
+);
+
+CREATE OPERATOR <= (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_le,
+  COMMUTATOR = >=,
+  NEGATOR = >,
+  RESTRICT = scalarlesel,
+  JOIN = scalarlejoinsel
+);
+
+CREATE OPERATOR > (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_gt,
+  COMMUTATOR = <,
+  NEGATOR = <=,
+  RESTRICT = scalargtsel,
+  JOIN = scalargtjoinsel
+);
+
+CREATE OPERATOR >= (
+  LEFTARG = int_custom,
+  RIGHTARG = int_custom,
+  FUNCTION = int_custom_ge,
+  COMMUTATOR = <=,
+  NEGATOR = <,
+  RESTRICT = scalargesel,
+  JOIN = scalargejoinsel
+);
+
+--
+-- Btree operator class for int_custom
+--
+-- This is required for the type to be usable in extended statistics objects,
+-- for attributes and expressions.
+--
+CREATE OPERATOR CLASS int_custom_ops
+  DEFAULT FOR TYPE int_custom USING btree AS
+    OPERATOR    1     <,
+    OPERATOR    2     <=,
+    OPERATOR    3     =,
+    OPERATOR    4     >=,
+    OPERATOR    5     >,
+    FUNCTION    1     int_custom_cmp(int_custom, int_custom);
diff --git a/src/test/modules/test_custom_types/test_custom_types.c b/src/test/modules/test_custom_types/test_custom_types.c
new file mode 100644
index 00000000000..41262044b47
--- /dev/null
+++ b/src/test/modules/test_custom_types/test_custom_types.c
@@ -0,0 +1,182 @@
+/*--------------------------------------------------------------------------
+ *
+ * test_custom_types.c
+ *		Test module for a set of functions for custom types.
+ *
+ * The custom type used in this module is similar to int4 for simplicity,
+ * except that it is able to use various typanalyze functions to enforce
+ * check patterns with ANALYZE.
+ *
+ * Copyright (c) 1996-2026, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *		src/test/modules/test_custom_types/test_custom_types.c
+ *
+ *--------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "commands/vacuum.h"
+#include "utils/builtins.h"
+
+PG_MODULE_MAGIC;
+
+/* Function declarations */
+PG_FUNCTION_INFO_V1(int_custom_in);
+PG_FUNCTION_INFO_V1(int_custom_out);
+PG_FUNCTION_INFO_V1(int_custom_typanalyze_false);
+PG_FUNCTION_INFO_V1(int_custom_typanalyze_invalid);
+PG_FUNCTION_INFO_V1(int_custom_eq);
+PG_FUNCTION_INFO_V1(int_custom_ne);
+PG_FUNCTION_INFO_V1(int_custom_lt);
+PG_FUNCTION_INFO_V1(int_custom_le);
+PG_FUNCTION_INFO_V1(int_custom_gt);
+PG_FUNCTION_INFO_V1(int_custom_ge);
+PG_FUNCTION_INFO_V1(int_custom_cmp);
+
+/*
+ * int_custom_in - input function for int_custom type
+ *
+ * Converts a string to a int_custom (which is just an int32 internally).
+ */
+Datum
+int_custom_in(PG_FUNCTION_ARGS)
+{
+	char	   *num = PG_GETARG_CSTRING(0);
+
+	PG_RETURN_INT32(pg_strtoint32_safe(num, fcinfo->context));
+}
+
+/*
+ * int_custom_out - output function for int_custom type
+ *
+ * Converts a int_custom to a string.
+ */
+Datum
+int_custom_out(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	char	   *result = (char *) palloc(12);	/* sign, 10 digits, '\0' */
+
+	pg_ltoa(arg1, result);
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ * int_custom_typanalyze_false - typanalyze function that returns false
+ *
+ * This function returns false, to simulate a type that cannot be analyzed.
+ */
+Datum
+int_custom_typanalyze_false(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BOOL(false);
+}
+
+/*
+ * Callback used to compute invalid statistics.
+ */
+static void
+int_custom_invalid_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
+						 int samplerows, double totalrows)
+{
+	/* We are not valid, and do not want to be. */
+	stats->stats_valid = false;
+}
+
+/*
+ * int_custom_typanalyze_invalid
+ *
+ * This function sets some invalid stats data, letting the caller know that
+ * we are safe for an analyze, returning true.
+ */
+Datum
+int_custom_typanalyze_invalid(PG_FUNCTION_ARGS)
+{
+	VacAttrStats *stats = (VacAttrStats *) PG_GETARG_POINTER(0);
+
+	/* If the attstattarget column is negative, use the default value */
+	if (stats->attstattarget < 0)
+		stats->attstattarget = default_statistics_target;
+
+	/* Buggy number, no need to care as long as it is positive */
+	stats->minrows = 300;
+
+	/* Set callback to compute some invalid stats */
+	stats->compute_stats = int_custom_invalid_stats;
+
+	PG_RETURN_BOOL(true);
+}
+
+/*
+ * Comparison functions for int_custom type
+ */
+Datum
+int_custom_eq(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 == arg2);
+}
+
+Datum
+int_custom_ne(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 != arg2);
+}
+
+Datum
+int_custom_lt(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 < arg2);
+}
+
+Datum
+int_custom_le(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 <= arg2);
+}
+
+Datum
+int_custom_gt(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 > arg2);
+}
+
+Datum
+int_custom_ge(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	PG_RETURN_BOOL(arg1 >= arg2);
+}
+
+Datum
+int_custom_cmp(PG_FUNCTION_ARGS)
+{
+	int32		arg1 = PG_GETARG_INT32(0);
+	int32		arg2 = PG_GETARG_INT32(1);
+
+	if (arg1 < arg2)
+		PG_RETURN_INT32(-1);
+	else if (arg1 > arg2)
+		PG_RETURN_INT32(1);
+	else
+		PG_RETURN_INT32(0);
+}
diff --git a/src/test/modules/test_custom_types/test_custom_types.control b/src/test/modules/test_custom_types/test_custom_types.control
new file mode 100644
index 00000000000..d25a74ef5c4
--- /dev/null
+++ b/src/test/modules/test_custom_types/test_custom_types.control
@@ -0,0 +1,5 @@
+# test_custom_types extension
+comment = 'Tests for dummy custom types'
+default_version = '1.0'
+module_pathname = '$libdir/test_custom_types'
+relocatable = true
diff --git a/src/test/modules/test_ddl_deparse/Makefile b/src/test/modules/test_ddl_deparse/Makefile
index 3a57a95c849..4576ed31e20 100644
--- a/src/test/modules/test_ddl_deparse/Makefile
+++ b/src/test/modules/test_ddl_deparse/Makefile
@@ -27,6 +27,7 @@ REGRESS = test_ddl_deparse \
 	alter_type_enum \
 	opfamily \
 	defprivs \
+	textsearch \
 	matviews
 
 EXTRA_INSTALL = contrib/pg_stat_statements
diff --git a/src/test/modules/test_ddl_deparse/expected/textsearch.out b/src/test/modules/test_ddl_deparse/expected/textsearch.out
new file mode 100644
index 00000000000..da0d89e9704
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/expected/textsearch.out
@@ -0,0 +1,5 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+NOTICE:  DDL test: type simple, tag CREATE TEXT SEARCH CONFIGURATION
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;
+NOTICE:  DDL test: type alter text search configuration, tag ALTER TEXT SEARCH CONFIGURATION
diff --git a/src/test/modules/test_ddl_deparse/meson.build b/src/test/modules/test_ddl_deparse/meson.build
index bff65ba6333..f87eeac0e5a 100644
--- a/src/test/modules/test_ddl_deparse/meson.build
+++ b/src/test/modules/test_ddl_deparse/meson.build
@@ -47,6 +47,7 @@ tests += {
       'alter_type_enum',
       'opfamily',
       'defprivs',
+      'textsearch',
       'matviews',
     ],
   },
diff --git a/src/test/modules/test_ddl_deparse/sql/textsearch.sql b/src/test/modules/test_ddl_deparse/sql/textsearch.sql
new file mode 100644
index 00000000000..633899a31cb
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/sql/textsearch.sql
@@ -0,0 +1,3 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;
diff --git a/src/test/modules/test_dsa/expected/test_dsa.out b/src/test/modules/test_dsa/expected/test_dsa.out
index 266010e77fe..4b53a7de4a4 100644
--- a/src/test/modules/test_dsa/expected/test_dsa.out
+++ b/src/test/modules/test_dsa/expected/test_dsa.out
@@ -11,3 +11,19 @@ SELECT test_dsa_resowners();
  
 (1 row)
 
+-- Test allocations across a pre-defined range of pages.  This covers enough
+-- range to check for the case of odd-sized segments, without making the test
+-- too slow.
+SELECT test_dsa_allocate(1001, 2000, 100);
+ test_dsa_allocate 
+-------------------
+ 
+(1 row)
+
+-- Larger size with odd-sized segment.
+SELECT test_dsa_allocate(6501, 6600, 100);
+ test_dsa_allocate 
+-------------------
+ 
+(1 row)
+
diff --git a/src/test/modules/test_dsa/sql/test_dsa.sql b/src/test/modules/test_dsa/sql/test_dsa.sql
index c3d8db94372..99b4a60dd14 100644
--- a/src/test/modules/test_dsa/sql/test_dsa.sql
+++ b/src/test/modules/test_dsa/sql/test_dsa.sql
@@ -2,3 +2,10 @@ CREATE EXTENSION test_dsa;
 
 SELECT test_dsa_basic();
 SELECT test_dsa_resowners();
+
+-- Test allocations across a pre-defined range of pages.  This covers enough
+-- range to check for the case of odd-sized segments, without making the test
+-- too slow.
+SELECT test_dsa_allocate(1001, 2000, 100);
+-- Larger size with odd-sized segment.
+SELECT test_dsa_allocate(6501, 6600, 100);
diff --git a/src/test/modules/test_dsa/test_dsa--1.0.sql b/src/test/modules/test_dsa/test_dsa--1.0.sql
index 2904cb23525..3ee2e44cc00 100644
--- a/src/test/modules/test_dsa/test_dsa--1.0.sql
+++ b/src/test/modules/test_dsa/test_dsa--1.0.sql
@@ -10,3 +10,7 @@ CREATE FUNCTION test_dsa_basic()
 CREATE FUNCTION test_dsa_resowners()
 	RETURNS pg_catalog.void
 	AS 'MODULE_PATHNAME' LANGUAGE C;
+
+CREATE FUNCTION test_dsa_allocate(int, int, int)
+	RETURNS pg_catalog.void
+	AS 'MODULE_PATHNAME' LANGUAGE C;
diff --git a/src/test/modules/test_dsa/test_dsa.c b/src/test/modules/test_dsa/test_dsa.c
index cd24d0f4873..3e6455a453b 100644
--- a/src/test/modules/test_dsa/test_dsa.c
+++ b/src/test/modules/test_dsa/test_dsa.c
@@ -13,8 +13,10 @@
 #include "postgres.h"
 
 #include "fmgr.h"
+#include "storage/dsm_registry.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
+#include "utils/freepage.h"
 #include "utils/resowner.h"
 
 PG_MODULE_MAGIC;
@@ -111,3 +113,42 @@ test_dsa_resowners(PG_FUNCTION_ARGS)
 
 	PG_RETURN_VOID();
 }
+
+/*
+ * test_dsa_allocate
+ *
+ * Test DSA allocation across a range of sizes to exercise the pagemap
+ * sizing logic in make_new_segment().  A fresh DSA is created for each
+ * iteration so that each allocation triggers a new segment creation,
+ * including the odd-sized segment path.
+ */
+PG_FUNCTION_INFO_V1(test_dsa_allocate);
+Datum
+test_dsa_allocate(PG_FUNCTION_ARGS)
+{
+	int			start_num_pages = PG_GETARG_INT32(0);
+	int			end_num_pages = PG_GETARG_INT32(1);
+	int			step = PG_GETARG_INT32(2);
+	size_t		usable_pages;
+	int			tranche_id;
+	dsa_area   *a;
+	dsa_pointer dp;
+
+	if (start_num_pages > end_num_pages)
+		elog(ERROR, "incorrect start and end parameters");
+
+	/* XXX: this tranche is leaked */
+	tranche_id = LWLockNewTrancheId();
+	LWLockRegisterTranche(tranche_id, "test_dsa");
+
+	for (usable_pages = start_num_pages; usable_pages < end_num_pages; usable_pages += step)
+	{
+		a = dsa_create(tranche_id);
+		dp = dsa_allocate(a, usable_pages * FPM_PAGE_SIZE);
+
+		dsa_free(a, dp);
+		dsa_detach(a);
+	}
+
+	PG_RETURN_VOID();
+}
diff --git a/src/test/modules/test_extensions/t/001_extension_control_path.pl b/src/test/modules/test_extensions/t/001_extension_control_path.pl
index 1a9c97bbf4d..7fbe5bde332 100644
--- a/src/test/modules/test_extensions/t/001_extension_control_path.pl
+++ b/src/test/modules/test_extensions/t/001_extension_control_path.pl
@@ -11,12 +11,15 @@
 
 $node->init;
 
-# Create a temporary directory for the extension control file
+# Create temporary directories for the extension control files
 my $ext_dir = PostgreSQL::Test::Utils::tempdir();
 mkpath("$ext_dir/extension");
+my $ext_dir2 = PostgreSQL::Test::Utils::tempdir();
+mkpath("$ext_dir2/extension");
 
 my $ext_name = "test_custom_ext_paths";
 create_extension($ext_name, $ext_dir);
+create_extension($ext_name, $ext_dir2);
 
 my $ext_name2 = "test_custom_ext_paths_using_directory";
 mkpath("$ext_dir/$ext_name2");
@@ -26,7 +29,7 @@
 my $sep = $windows_os ? ";" : ":";
 $node->append_conf(
 	'postgresql.conf', qq{
-extension_control_path = '\$system$sep@{[ $windows_os ? ($ext_dir =~ s/\\/\\\\/gr) : $ext_dir ]}'
+extension_control_path = '\$system$sep@{[ $windows_os ? ($ext_dir =~ s/\\/\\\\/gr) : $ext_dir ]}$sep@{[ $windows_os ? ($ext_dir2 =~ s/\\/\\\\/gr) : $ext_dir2 ]}'
 });
 
 # Start node
@@ -34,7 +37,7 @@
 
 my $ecp = $node->safe_psql('postgres', 'show extension_control_path;');
 
-is($ecp, "\$system$sep$ext_dir",
+is($ecp, "\$system$sep$ext_dir$sep$ext_dir2",
 	"custom extension control directory path configured");
 
 $node->safe_psql('postgres', "CREATE EXTENSION $ext_name");
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index e1161bdfbfa..52161dcc38a 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -72,12 +72,12 @@ test_itemptr_pair(BlockNumber blk, OffsetNumber off, int maxsize)
 			 ItemPointerGetOffsetNumber(&decoded_itemptrs[0]));
 
 	if (ndecoded == 2 &&
-		!ItemPointerEquals(&orig_itemptrs[0], &decoded_itemptrs[0]))
+		!ItemPointerEquals(&orig_itemptrs[1], &decoded_itemptrs[1]))
 	{
 		elog(ERROR, "mismatch on second itemptr: (%u, %d) vs (%u, %d)",
-			 0, 1,
-			 ItemPointerGetBlockNumber(&decoded_itemptrs[0]),
-			 ItemPointerGetOffsetNumber(&decoded_itemptrs[0]));
+			 blk, off,
+			 ItemPointerGetBlockNumber(&decoded_itemptrs[1]),
+			 ItemPointerGetOffsetNumber(&decoded_itemptrs[1]));
 	}
 }
 
diff --git a/src/test/modules/test_json_parser/README b/src/test/modules/test_json_parser/README
index ceccd499f43..61e7c78d588 100644
--- a/src/test/modules/test_json_parser/README
+++ b/src/test/modules/test_json_parser/README
@@ -6,10 +6,12 @@ This module contains two programs for testing the json parsers.
 - `test_json_parser_incremental` is for testing the incremental parser, It
   reads in a file and passes it in very small chunks (default is 60 bytes at a
   time) to the incremental parser. It's not meant to be a speed test but to
-  test the accuracy of the incremental parser.  There are two option arguments,
-  "-c nn" specifies an alternative chunk size, and "-s" specifies using
-  semantic routines. The semantic routines re-output the json, although not in
-  a very pretty form. The required non-option argument is the input file name.
+  test the accuracy of the incremental parser. The option "-c nn" specifies an
+  alternative chunk size, "-r nn" runs a range of chunk sizes down to one byte
+  on the same input (with output separated by null bytes), and "-s" specifies
+  using semantic routines. The semantic routines re-output the json, although
+  not in a very pretty form. The required non-option argument is the input file
+  name.
 - `test_json_parser_perf` is for speed testing both the standard
   recursive descent parser and the non-recursive incremental
   parser. If given the `-i` flag it uses the non-recursive parser,
diff --git a/src/test/modules/test_json_parser/t/002_inline.pl b/src/test/modules/test_json_parser/t/002_inline.pl
index 7c8b64977ec..3dd16731e90 100644
--- a/src/test/modules/test_json_parser/t/002_inline.pl
+++ b/src/test/modules/test_json_parser/t/002_inline.pl
@@ -33,23 +33,37 @@ sub test
 	print $fh "$json";
 	close($fh);
 
+	# The -r mode runs the parser in a loop, with output separated by nulls.
+	# Unpack that as a list of null-terminated ASCII strings (Z*) and check that
+	# each run produces the same result.
+	my ($all_stdout, $all_stderr) =
+	  run_command([ @exe, "-r", $chunk, $fname ]);
+
+	my @stdout = unpack("(Z*)*", $all_stdout);
+	my @stderr = unpack("(Z*)*", $all_stderr);
+
+	is(scalar @stdout, $chunk, "$name: stdout has correct number of entries");
+	is(scalar @stderr, $chunk, "$name: stderr has correct number of entries");
+
+	my $i = 0;
+
 	foreach my $size (reverse(1 .. $chunk))
 	{
-		my ($stdout, $stderr) = run_command([ @exe, "-c", $size, $fname ]);
-
 		if (defined($params{error}))
 		{
-			unlike($stdout, qr/SUCCESS/,
+			unlike($stdout[$i], qr/SUCCESS/,
 				"$name, chunk size $size: test fails");
-			like($stderr, $params{error},
+			like($stderr[$i], $params{error},
 				"$name, chunk size $size: correct error output");
 		}
 		else
 		{
-			like($stdout, qr/SUCCESS/,
+			like($stdout[$i], qr/SUCCESS/,
 				"$name, chunk size $size: test succeeds");
-			is($stderr, "", "$name, chunk size $size: no error output");
+			is($stderr[$i], "", "$name, chunk size $size: no error output");
 		}
+
+		$i++;
 	}
 }
 
diff --git a/src/test/modules/test_json_parser/test_json_parser_incremental.c b/src/test/modules/test_json_parser/test_json_parser_incremental.c
index d1e3e4ab4ea..8c78061ee46 100644
--- a/src/test/modules/test_json_parser/test_json_parser_incremental.c
+++ b/src/test/modules/test_json_parser/test_json_parser_incremental.c
@@ -12,9 +12,14 @@
  * the parser in very small chunks. In practice you would normally use
  * much larger chunks, but doing this makes it more likely that the
  * full range of increment handling, especially in the lexer, is exercised.
+ *
  * If the "-c SIZE" option is provided, that chunk size is used instead
  * of the default of 60.
  *
+ * If the "-r SIZE" option is provided, a range of chunk sizes from SIZE down to
+ * 1 are run sequentially. A null byte is printed to the streams after each
+ * iteration.
+ *
  * If the -s flag is given, the program does semantic processing. This should
  * just mirror back the json, albeit with white space changes.
  *
@@ -88,8 +93,8 @@ main(int argc, char **argv)
 	StringInfoData json;
 	int			n_read;
 	size_t		chunk_size = DEFAULT_CHUNK_SIZE;
+	bool		run_chunk_ranges = false;
 	struct stat statbuf;
-	off_t		bytes_left;
 	const JsonSemAction *testsem = &nullSemAction;
 	char	   *testfile;
 	int			c;
@@ -102,11 +107,14 @@ main(int argc, char **argv)
 	if (!lex)
 		pg_fatal("out of memory");
 
-	while ((c = getopt(argc, argv, "c:os")) != -1)
+	while ((c = getopt(argc, argv, "r:c:os")) != -1)
 	{
 		switch (c)
 		{
-			case 'c':			/* chunksize */
+			case 'r':			/* chunk range */
+				run_chunk_ranges = true;
+				/* fall through */
+			case 'c':			/* chunk size */
 				chunk_size = strtou64(optarg, NULL, 10);
 				if (chunk_size > BUFSIZE)
 					pg_fatal("chunk size cannot exceed %d", BUFSIZE);
@@ -135,8 +143,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	makeJsonLexContextIncremental(lex, PG_UTF8, need_strings);
-	setJsonLexContextOwnsTokens(lex, lex_owns_tokens);
 	initStringInfo(&json);
 
 	if ((json_file = fopen(testfile, PG_BINARY_R)) == NULL)
@@ -145,61 +151,88 @@ main(int argc, char **argv)
 	if (fstat(fileno(json_file), &statbuf) != 0)
 		pg_fatal("error statting input: %m");
 
-	bytes_left = statbuf.st_size;
-
-	for (;;)
+	do
 	{
-		/* We will break when there's nothing left to read */
-
-		if (bytes_left < chunk_size)
-			chunk_size = bytes_left;
+		/*
+		 * This outer loop only repeats in -r mode. Reset the parse state and
+		 * our position in the input file for the inner loop, which performs
+		 * the incremental parsing.
+		 */
+		off_t		bytes_left = statbuf.st_size;
+		size_t		to_read = chunk_size;
 
-		n_read = fread(buff, 1, chunk_size, json_file);
-		if (n_read < chunk_size)
-			pg_fatal("error reading input file: %d", ferror(json_file));
+		makeJsonLexContextIncremental(lex, PG_UTF8, need_strings);
+		setJsonLexContextOwnsTokens(lex, lex_owns_tokens);
 
-		appendBinaryStringInfo(&json, buff, n_read);
+		rewind(json_file);
+		resetStringInfo(&json);
 
-		/*
-		 * Append some trailing junk to the buffer passed to the parser. This
-		 * helps us ensure that the parser does the right thing even if the
-		 * chunk isn't terminated with a '\0'.
-		 */
-		appendStringInfoString(&json, "1+23 trailing junk");
-		bytes_left -= n_read;
-		if (bytes_left > 0)
+		for (;;)
 		{
-			result = pg_parse_json_incremental(lex, testsem,
-											   json.data, n_read,
-											   false);
-			if (result != JSON_INCOMPLETE)
+			/* We will break when there's nothing left to read */
+
+			if (bytes_left < to_read)
+				to_read = bytes_left;
+
+			n_read = fread(buff, 1, to_read, json_file);
+			if (n_read < to_read)
+				pg_fatal("error reading input file: %d", ferror(json_file));
+
+			appendBinaryStringInfo(&json, buff, n_read);
+
+			/*
+			 * Append some trailing junk to the buffer passed to the parser.
+			 * This helps us ensure that the parser does the right thing even
+			 * if the chunk isn't terminated with a '\0'.
+			 */
+			appendStringInfoString(&json, "1+23 trailing junk");
+			bytes_left -= n_read;
+			if (bytes_left > 0)
 			{
-				fprintf(stderr, "%s\n", json_errdetail(result, lex));
-				ret = 1;
-				goto cleanup;
+				result = pg_parse_json_incremental(lex, testsem,
+												   json.data, n_read,
+												   false);
+				if (result != JSON_INCOMPLETE)
+				{
+					fprintf(stderr, "%s\n", json_errdetail(result, lex));
+					ret = 1;
+					goto cleanup;
+				}
+				resetStringInfo(&json);
 			}
-			resetStringInfo(&json);
-		}
-		else
-		{
-			result = pg_parse_json_incremental(lex, testsem,
-											   json.data, n_read,
-											   true);
-			if (result != JSON_SUCCESS)
+			else
 			{
-				fprintf(stderr, "%s\n", json_errdetail(result, lex));
-				ret = 1;
-				goto cleanup;
+				result = pg_parse_json_incremental(lex, testsem,
+												   json.data, n_read,
+												   true);
+				if (result != JSON_SUCCESS)
+				{
+					fprintf(stderr, "%s\n", json_errdetail(result, lex));
+					ret = 1;
+					goto cleanup;
+				}
+				if (!need_strings)
+					printf("SUCCESS!\n");
+				break;
 			}
-			if (!need_strings)
-				printf("SUCCESS!\n");
-			break;
 		}
-	}
 
 cleanup:
+		freeJsonLexContext(lex);
+
+		/*
+		 * In -r mode, separate output with nulls so that the calling test can
+		 * split it up, decrement the chunk size, and loop back to the top.
+		 * All other modes immediately fall out of the loop and exit.
+		 */
+		if (run_chunk_ranges)
+		{
+			fputc('\0', stdout);
+			fputc('\0', stderr);
+		}
+	} while (run_chunk_ranges && (--chunk_size > 0));
+
 	fclose(json_file);
-	freeJsonLexContext(lex);
 	free(json.data);
 	free(lex);
 
diff --git a/src/test/modules/test_misc/Makefile b/src/test/modules/test_misc/Makefile
index 919a25fc67f..399b9094a38 100644
--- a/src/test/modules/test_misc/Makefile
+++ b/src/test/modules/test_misc/Makefile
@@ -2,7 +2,8 @@
 
 TAP_TESTS = 1
 
-EXTRA_INSTALL=src/test/modules/injection_points
+EXTRA_INSTALL=src/test/modules/injection_points \
+	contrib/test_decoding
 
 export enable_injection_points
 
diff --git a/src/test/modules/test_misc/meson.build b/src/test/modules/test_misc/meson.build
index 9c50de7efb0..6b1e730bf46 100644
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@ -16,6 +16,7 @@ tests += {
       't/005_timeouts.pl',
       't/006_signal_autovacuum.pl',
       't/007_catcache_inval.pl',
+      't/008_replslot_single_user.pl',
     ],
   },
 }
diff --git a/src/test/modules/test_misc/t/008_replslot_single_user.pl b/src/test/modules/test_misc/t/008_replslot_single_user.pl
new file mode 100644
index 00000000000..796700d621f
--- /dev/null
+++ b/src/test/modules/test_misc/t/008_replslot_single_user.pl
@@ -0,0 +1,95 @@
+# Copyright (c) 2025, PostgreSQL Global Development Group
+
+# Test manipulations of replication slots with the single-user mode.
+
+use strict;
+use warnings;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+
+# Skip the tests on Windows, as single-user mode would fail on permission
+# failure with privileged accounts.
+if ($windows_os)
+{
+	plan skip_all => 'this test is not supported by this platform';
+}
+
+# Run set of queries in single-user mode.
+sub test_single_mode
+{
+	my ($node, $queries, $testname) = @_;
+
+	my $result = run_log(
+		[
+			'postgres', '--single', '-F',
+			'-c' => 'exit_on_error=true',
+			'-D' => $node->data_dir,
+			'postgres'
+		],
+		'<' => \$queries);
+
+	ok($result, $testname);
+}
+
+my $slot_logical = 'slot_logical';
+my $slot_physical = 'slot_physical';
+
+# Initialize a node
+my $node = PostgreSQL::Test::Cluster->new('node');
+$node->init(allows_streaming => "logical");
+$node->start;
+
+# Define initial table
+$node->safe_psql('postgres', "CREATE TABLE foo (id int)");
+
+$node->stop;
+
+test_single_mode(
+	$node,
+	"SELECT pg_create_logical_replication_slot('$slot_logical', 'test_decoding')",
+	"logical slot creation");
+test_single_mode(
+	$node,
+	"SELECT pg_create_physical_replication_slot('$slot_physical', true)",
+	"physical slot creation");
+test_single_mode(
+	$node,
+	"SELECT pg_create_physical_replication_slot('slot_tmp', true, true)",
+	"temporary physical slot creation");
+
+test_single_mode(
+	$node, qq(
+INSERT INTO foo VALUES (1);
+SELECT pg_logical_slot_get_changes('$slot_logical', NULL, NULL);
+),
+	"logical decoding");
+
+test_single_mode(
+	$node,
+	"SELECT pg_replication_slot_advance('$slot_logical', pg_current_wal_lsn())",
+	"logical slot advance");
+test_single_mode(
+	$node,
+	"SELECT pg_replication_slot_advance('$slot_physical', pg_current_wal_lsn())",
+	"physical slot advance");
+
+test_single_mode(
+	$node,
+	"SELECT pg_copy_logical_replication_slot('$slot_logical', 'slot_log_copy')",
+	"logical slot copy");
+test_single_mode(
+	$node,
+	"SELECT pg_copy_physical_replication_slot('$slot_physical', 'slot_phy_copy')",
+	"physical slot copy");
+
+test_single_mode(
+	$node,
+	"SELECT pg_drop_replication_slot('$slot_logical')",
+	"logical slot drop");
+test_single_mode(
+	$node,
+	"SELECT pg_drop_replication_slot('$slot_physical')",
+	"physical slot drop");
+
+done_testing();
diff --git a/src/test/modules/test_radixtree/test_radixtree.c b/src/test/modules/test_radixtree/test_radixtree.c
index 32de6a3123e..80ad0296164 100644
--- a/src/test/modules/test_radixtree/test_radixtree.c
+++ b/src/test/modules/test_radixtree/test_radixtree.c
@@ -44,7 +44,7 @@
 		uint64		_expected = (expected_expr); \
 		if (_result != _expected) \
 			elog(ERROR, \
-				 "%s yielded " UINT64_HEX_FORMAT ", expected " UINT64_HEX_FORMAT " (%s) in file \"%s\" line %u", \
+				 "%s yielded %" PRIx64 ", expected %" PRIx64 " (%s) in file \"%s\" line %u", \
 				 #result_expr, _result, _expected, #expected_expr, __FILE__, __LINE__); \
 	} while (0)
 
diff --git a/src/test/modules/test_regex/test_regex.c b/src/test/modules/test_regex/test_regex.c
index 2548a0ef7b1..df69f897833 100644
--- a/src/test/modules/test_regex/test_regex.c
+++ b/src/test/modules/test_regex/test_regex.c
@@ -413,7 +413,8 @@ parse_test_flags(test_re_flags *flags, text *opts)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 							 errmsg("invalid regular expression test option: \"%.*s\"",
-									pg_mblen(opt_p + i), opt_p + i)));
+									pg_mblen_range(opt_p + i, opt_p + opt_len),
+									opt_p + i)));
 					break;
 			}
 		}
diff --git a/src/test/modules/test_slru/t/001_multixact.pl b/src/test/modules/test_slru/t/001_multixact.pl
index e2b567a603d..7837eb810f0 100644
--- a/src/test/modules/test_slru/t/001_multixact.pl
+++ b/src/test/modules/test_slru/t/001_multixact.pl
@@ -1,10 +1,6 @@
 # Copyright (c) 2024-2025, PostgreSQL Global Development Group
 
-# This test verifies edge case of reading a multixact:
-# when we have multixact that is followed by exactly one another multixact,
-# and another multixact have no offset yet, we must wait until this offset
-# becomes observable. Previously we used to wait for 1ms in a loop in this
-# case, but now we use CV for this. This test is exercising such a sleep.
+# Test multixid corner cases.
 
 use strict;
 use warnings FATAL => 'all';
@@ -19,9 +15,7 @@
 	plan skip_all => 'Injection points not supported by this build';
 }
 
-my ($node, $result);
-
-$node = PostgreSQL::Test::Cluster->new('mike');
+my $node = PostgreSQL::Test::Cluster->new('main');
 $node->init;
 $node->append_conf('postgresql.conf',
 	"shared_preload_libraries = 'test_slru,injection_points'");
@@ -29,95 +23,47 @@
 $node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
 $node->safe_psql('postgres', q(CREATE EXTENSION test_slru));
 
-# Test for Multixact generation edge case
-$node->safe_psql('postgres',
-	q{select injection_points_attach('test-multixact-read','wait')});
-$node->safe_psql('postgres',
-	q{select injection_points_attach('multixact-get-members-cv-sleep','wait')}
-);
+# This test creates three multixacts. The middle one is never
+# WAL-logged or recorded on the offsets page, because we pause the
+# backend and crash the server before that. After restart, verify that
+# the other multixacts are readable, despite the middle one being
+# lost.
 
-# This session must observe sleep on the condition variable while generating a
-# multixact.  To achieve this it first will create a multixact, then pause
-# before reading it.
-my $observer = $node->background_psql('postgres');
-
-# This query will create a multixact, and hang just before reading it.
-$observer->query_until(
-	qr/start/,
-	q{
-	\echo start
-	SELECT test_read_multixact(test_create_multixact());
-});
-$node->wait_for_event('client backend', 'test-multixact-read');
-
-# This session will create the next Multixact. This is necessary to avoid
-# multixact.c's non-sleeping edge case 1.
-my $creator = $node->background_psql('postgres');
+# Create the first multixact
+my $bg_psql = $node->background_psql('postgres');
+my $multi1 = $bg_psql->query_safe(q(SELECT test_create_multixact();));
+
+# Assign the middle multixact. Use an injection point to prevent it
+# from being fully recorded.
 $node->safe_psql('postgres',
 	q{SELECT injection_points_attach('multixact-create-from-members','wait');}
 );
 
-# We expect this query to hang in the critical section after generating new
-# multixact, but before filling its offset into SLRU.
-# Running an injection point inside a critical section requires it to be
-# loaded beforehand.
-$creator->query_until(
-	qr/start/, q{
-	\echo start
+$bg_psql->query_until(
+	qr/assigning lost multi/, q(
+\echo assigning lost multi
 	SELECT test_create_multixact();
-});
+));
 
 $node->wait_for_event('client backend', 'multixact-create-from-members');
-
-# Ensure we have the backends waiting that we expect
-is( $node->safe_psql(
-		'postgres',
-		q{SELECT string_agg(wait_event, ', ' ORDER BY wait_event)
-		FROM pg_stat_activity WHERE wait_event_type = 'InjectionPoint'}
-	),
-	'multixact-create-from-members, test-multixact-read',
-	"matching injection point waits");
-
-# Now wake observer to get it to read the initial multixact.  A subsequent
-# multixact already exists, but that one doesn't have an offset assigned, so
-# this will hit multixact.c's edge case 2.
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('test-multixact-read')});
-$node->wait_for_event('client backend', 'multixact-get-members-cv-sleep');
-
-# Ensure we have the backends waiting that we expect
-is( $node->safe_psql(
-		'postgres',
-		q{SELECT string_agg(wait_event, ', ' ORDER BY wait_event)
-		FROM pg_stat_activity WHERE wait_event_type = 'InjectionPoint'}
-	),
-	'multixact-create-from-members, multixact-get-members-cv-sleep',
-	"matching injection point waits");
-
-# Now we have two backends waiting in multixact-create-from-members and
-# multixact-get-members-cv-sleep.  Also we have 3 injections points set to wait.
-# If we wakeup multixact-get-members-cv-sleep it will happen again, so we must
-# detach it first. So let's detach all injection points, then wake up all
-# backends.
-
-$node->safe_psql('postgres',
-	q{SELECT injection_points_detach('test-multixact-read')});
 $node->safe_psql('postgres',
 	q{SELECT injection_points_detach('multixact-create-from-members')});
-$node->safe_psql('postgres',
-	q{SELECT injection_points_detach('multixact-get-members-cv-sleep')});
 
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('multixact-create-from-members')});
-$node->safe_psql('postgres',
-	q{SELECT injection_points_wakeup('multixact-get-members-cv-sleep')});
+# Create the third multixid
+my $multi2 = $node->safe_psql('postgres', q{SELECT test_create_multixact();});
+
+# All set and done, it's time for hard restart
+$node->stop('immediate');
+$node->start;
+$bg_psql->{run}->finish;
 
-# Background psql will now be able to read the result and disconnect.
-$observer->quit;
-$creator->quit;
+# Verify that the recorded multixids are readable
+is( $node->safe_psql('postgres', qq{SELECT test_read_multixact('$multi1');}),
+	'',
+	'first recorded multi is readable');
 
-$node->stop;
+is( $node->safe_psql('postgres', qq{SELECT test_read_multixact('$multi2');}),
+	'',
+	'second recorded multi is readable');
 
-# If we reached this point - everything is OK.
-ok(1);
 done_testing();
diff --git a/src/test/modules/test_slru/test_multixact.c b/src/test/modules/test_slru/test_multixact.c
index 6c9b0420717..8fb6c19d70f 100644
--- a/src/test/modules/test_slru/test_multixact.c
+++ b/src/test/modules/test_slru/test_multixact.c
@@ -17,7 +17,6 @@
 #include "access/multixact.h"
 #include "access/xact.h"
 #include "fmgr.h"
-#include "utils/injection_point.h"
 
 PG_FUNCTION_INFO_V1(test_create_multixact);
 PG_FUNCTION_INFO_V1(test_read_multixact);
@@ -37,8 +36,7 @@ test_create_multixact(PG_FUNCTION_ARGS)
 }
 
 /*
- * Reads given multixact after running an injection point. Discards local cache
- * to make a real read.  Tailored for multixact testing.
+ * Reads given multixact.  Discards local cache to make a real read.
  */
 Datum
 test_read_multixact(PG_FUNCTION_ARGS)
@@ -46,7 +44,6 @@ test_read_multixact(PG_FUNCTION_ARGS)
 	MultiXactId id = PG_GETARG_TRANSACTIONID(0);
 	MultiXactMember *members;
 
-	INJECTION_POINT("test-multixact-read", NULL);
 	/* discard caches */
 	AtEOXact_MultiXact();
 
diff --git a/src/test/modules/test_tidstore/test_tidstore.c b/src/test/modules/test_tidstore/test_tidstore.c
index eb16e0fbfa6..d12d54f3677 100644
--- a/src/test/modules/test_tidstore/test_tidstore.c
+++ b/src/test/modules/test_tidstore/test_tidstore.c
@@ -75,6 +75,19 @@ itemptr_cmp(const void *left, const void *right)
 	return 0;
 }
 
+static int
+offsetnumber_cmp(const void *a, const void *b)
+{
+	OffsetNumber l = *(const OffsetNumber *) a;
+	OffsetNumber r = *(const OffsetNumber *) b;
+
+	if (l < r)
+		return -1;
+	else if (l > r)
+		return 1;
+	return 0;
+}
+
 /*
  * Create a TidStore. If shared is false, the tidstore is created
  * on TopMemoryContext, otherwise on DSA. Although the tidstore
@@ -179,6 +192,9 @@ do_set_block_offsets(PG_FUNCTION_ARGS)
 	noffs = ArrayGetNItems(ARR_NDIM(ta), ARR_DIMS(ta));
 	offs = ((OffsetNumber *) ARR_DATA_PTR(ta));
 
+	/* TidStoreSetBlockOffsets() requires offsets to be strictly ascending. */
+	qsort(offs, noffs, sizeof(OffsetNumber), offsetnumber_cmp);
+
 	/* Set TIDs in the store */
 	TidStoreLockExclusive(tidstore);
 	TidStoreSetBlockOffsets(tidstore, blkno, offs, noffs);
diff --git a/src/test/modules/typcache/expected/typcache_rel_type_cache.out b/src/test/modules/typcache/expected/typcache_rel_type_cache.out
index a91bd72b9bd..54c61602d08 100644
--- a/src/test/modules/typcache/expected/typcache_rel_type_cache.out
+++ b/src/test/modules/typcache/expected/typcache_rel_type_cache.out
@@ -39,3 +39,4 @@ SELECT '(1,2)'::t;
  (1,2)
 (1 row)
 
+DROP EXTENSION injection_points;
diff --git a/src/test/modules/typcache/sql/typcache_rel_type_cache.sql b/src/test/modules/typcache/sql/typcache_rel_type_cache.sql
index c1a3af509c0..f004a31c32a 100644
--- a/src/test/modules/typcache/sql/typcache_rel_type_cache.sql
+++ b/src/test/modules/typcache/sql/typcache_rel_type_cache.sql
@@ -19,3 +19,5 @@ SELECT '(1)'::t;
 SELECT injection_points_detach('typecache-before-rel-type-cache-insert');
 ALTER TABLE t ADD COLUMN j int;
 SELECT '(1,2)'::t;
+
+DROP EXTENSION injection_points;
diff --git a/src/test/modules/unsafe_tests/expected/guc_privs.out b/src/test/modules/unsafe_tests/expected/guc_privs.out
index 6c0ad898341..7f76b675c8c 100644
--- a/src/test/modules/unsafe_tests/expected/guc_privs.out
+++ b/src/test/modules/unsafe_tests/expected/guc_privs.out
@@ -581,6 +581,16 @@ DROP ROLE regress_host_resource_newadmin;  -- ok, nothing was transferred
 -- Use "drop owned by" so we can drop the role
 DROP OWNED BY regress_host_resource_admin;  -- ok
 DROP ROLE regress_host_resource_admin;  -- ok
+-- Test for GUC synchronized standby slots
+-- Cannot set synchronized_standby_slots to an invalid slot name
+ALTER SYSTEM SET synchronized_standby_slots='invalid*';
+ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
+DETAIL:  replication slot name "invalid*" contains invalid character
+HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+-- Can set synchronized_standby_slots to a non-existent slot name
+ALTER SYSTEM SET synchronized_standby_slots='missing';
+-- Reset the GUC
+ALTER SYSTEM RESET synchronized_standby_slots;
 -- Clean up
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_admin; -- ok
diff --git a/src/test/modules/unsafe_tests/sql/guc_privs.sql b/src/test/modules/unsafe_tests/sql/guc_privs.sql
index 9bcbbfa9040..ccbff5a5358 100644
--- a/src/test/modules/unsafe_tests/sql/guc_privs.sql
+++ b/src/test/modules/unsafe_tests/sql/guc_privs.sql
@@ -262,6 +262,14 @@ DROP ROLE regress_host_resource_newadmin;  -- ok, nothing was transferred
 DROP OWNED BY regress_host_resource_admin;  -- ok
 DROP ROLE regress_host_resource_admin;  -- ok
 
+-- Test for GUC synchronized standby slots
+-- Cannot set synchronized_standby_slots to an invalid slot name
+ALTER SYSTEM SET synchronized_standby_slots='invalid*';
+-- Can set synchronized_standby_slots to a non-existent slot name
+ALTER SYSTEM SET synchronized_standby_slots='missing';
+-- Reset the GUC
+ALTER SYSTEM RESET synchronized_standby_slots;
+
 -- Clean up
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_admin; -- ok
diff --git a/src/test/modules/xid_wraparound/meson.build b/src/test/modules/xid_wraparound/meson.build
index f7dada67f67..3aec430df8c 100644
--- a/src/test/modules/xid_wraparound/meson.build
+++ b/src/test/modules/xid_wraparound/meson.build
@@ -30,6 +30,7 @@ tests += {
       't/001_emergency_vacuum.pl',
       't/002_limits.pl',
       't/003_wraparounds.pl',
+      't/004_notify_freeze.pl',
     ],
   },
 }
diff --git a/src/test/modules/xid_wraparound/t/004_notify_freeze.pl b/src/test/modules/xid_wraparound/t/004_notify_freeze.pl
new file mode 100644
index 00000000000..5400af1e554
--- /dev/null
+++ b/src/test/modules/xid_wraparound/t/004_notify_freeze.pl
@@ -0,0 +1,71 @@
+# Copyright (c) 2024-2025, PostgreSQL Global Development Group
+#
+# Test freezing XIDs in the async notification queue. This isn't
+# really wraparound-related, but the test depends on the
+# consume_xids() helper function.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use Test::More;
+
+my $node = PostgreSQL::Test::Cluster->new('node');
+$node->init;
+$node->start;
+
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
+{
+	plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";
+}
+
+# Setup
+$node->safe_psql('postgres', 'CREATE EXTENSION xid_wraparound');
+$node->safe_psql('postgres',
+	'ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true');
+
+# Start Session 1 and leave it idle in transaction
+my $psql_session1 = $node->background_psql('postgres');
+$psql_session1->query_safe('listen s;');
+$psql_session1->query_safe('begin;');
+
+# Send some notifys from other sessions
+for my $i (1 .. 10)
+{
+	$node->safe_psql('postgres', "NOTIFY s, '$i'");
+}
+
+# Consume enough XIDs to trigger truncation, and one more with
+# 'txid_current' to bump up the freeze horizon.
+$node->safe_psql('postgres', 'select consume_xids(10000000);');
+$node->safe_psql('postgres', 'select txid_current()');
+
+# Remember current datfrozenxid before vacuum freeze so that we can
+# check that it is advanced. (Taking the min() this way assumes that
+# XID wraparound doesn't happen.)
+my $datafronzenxid = $node->safe_psql('postgres',
+	"select min(datfrozenxid::text::bigint) from pg_database");
+
+# Execute vacuum freeze on all databases
+$node->command_ok([ 'vacuumdb', '--all', '--freeze', '--port', $node->port ],
+	"vacuumdb --all --freeze");
+
+# Check that vacuumdb advanced datfrozenxid
+my $datafronzenxid_freeze = $node->safe_psql('postgres',
+	"select min(datfrozenxid::text::bigint) from pg_database");
+ok($datafronzenxid_freeze > $datafronzenxid, 'datfrozenxid advanced');
+
+# On Session 1, commit and ensure that the all the notifications are
+# received. This depends on correctly freezing the XIDs in the pending
+# notification entries.
+my $res = $psql_session1->query_safe('commit;');
+my $notifications_count = 0;
+foreach my $i (split('\n', $res))
+{
+	$notifications_count++;
+	like($i,
+		qr/Asynchronous notification "s" with payload "$notifications_count" received/
+	);
+}
+is($notifications_count, 10, 'received all committed notifications');
+
+done_testing();
diff --git a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
index 173a47dbb01..f45f03bc7df 100644
--- a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
+++ b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
@@ -154,11 +154,11 @@ sub wait_connect
 	#
 	# See query() for details about why/how the banner is used.
 	my $banner = "background_psql: ready";
-	my $banner_match = qr/(^|\n)$banner\r?\n/;
-	$self->{stdin} .= "\\echo $banner\n\\warn $banner\n";
+	my $banner_match = qr/$banner\r?\n/;
+	$self->{stdin} .= "\\echo '$banner'\n\\warn '$banner'\n";
 	$self->{run}->pump()
 	  until ($self->{stdout} =~ /$banner_match/
-		  && $self->{stderr} =~ /$banner\r?\n/)
+		  && $self->{stderr} =~ /$banner_match/)
 	  || $self->{timeout}->is_expired;
 
 	note "connect output:\n",
@@ -258,22 +258,17 @@ sub query
 	# stderr (or vice versa), even if psql printed them in the opposite
 	# order. We therefore wait on both.
 	#
-	# We need to match for the newline, because we try to remove it below, and
-	# it's possible to consume just the input *without* the newline. In
-	# interactive psql we emit \r\n, so we need to allow for that. Also need
-	# to be careful that we don't e.g. match the echoed \echo command, rather
-	# than its output.
+	# In interactive psql we emit \r\n, so we need to allow for that.
+	# Also, include quotes around the banner string in the \echo and \warn
+	# commands, not because the string needs quoting but so that $banner_match
+	# can't match readline's echoing of these commands.
 	my $banner = "background_psql: QUERY_SEPARATOR $query_cnt:";
-	my $banner_match = qr/(^|\n)$banner\r?\n/;
-	$self->{stdin} .= "$query\n;\n\\echo $banner\n\\warn $banner\n";
-	pump_until(
-		$self->{run}, $self->{timeout},
-		\$self->{stdout}, qr/$banner_match/);
-	pump_until(
-		$self->{run}, $self->{timeout},
-		\$self->{stderr}, qr/$banner_match/);
-
-	die "psql query timed out" if $self->{timeout}->is_expired;
+	my $banner_match = qr/$banner\r?\n/;
+	$self->{stdin} .= "$query\n;\n\\echo '$banner'\n\\warn '$banner'\n";
+	$self->{run}->pump()
+	  until ($self->{stdout} =~ /$banner_match/
+		  && $self->{stderr} =~ /$banner_match/)
+	  || $self->{timeout}->is_expired;
 
 	note "results query $query_cnt:\n",
 	  explain {
@@ -281,9 +276,12 @@ sub query
 		stderr => $self->{stderr},
 	  };
 
-	# Remove banner from stdout and stderr, our caller doesn't care.  The
-	# first newline is optional, as there would not be one if consuming an
-	# empty query result.
+	die "psql query timed out" if $self->{timeout}->is_expired;
+
+	# Remove banner from stdout and stderr, our caller doesn't want it.
+	# Also remove the query output's trailing newline, if present (there
+	# would not be one if consuming an empty query result).
+	$banner_match = qr/\r?\n?$banner\r?\n/;
 	$output = $self->{stdout};
 	$output =~ s/$banner_match//;
 	$self->{stderr} =~ s/$banner_match//;
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
index 02b9af9b741..c678f0bc454 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -1,5 +1,5 @@
 
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
 =pod
@@ -1625,10 +1625,10 @@ sub new
 	  or
 	  BAIL_OUT("could not create data directory \"$node->{_basedir}\": $!");
 
-	$node->dump_info;
-
 	$node->_set_pg_version;
 
+	$node->dump_info;
+
 	my $ver = $node->{_pg_version};
 
 	# Use a subclass as defined below (or elsewhere) if this version
diff --git a/src/test/perl/PostgreSQL/Test/Kerberos.pm b/src/test/perl/PostgreSQL/Test/Kerberos.pm
index b72dd2fbaf4..07a1ea899d0 100644
--- a/src/test/perl/PostgreSQL/Test/Kerberos.pm
+++ b/src/test/perl/PostgreSQL/Test/Kerberos.pm
@@ -9,6 +9,7 @@ package PostgreSQL::Test::Kerberos;
 use strict;
 use warnings FATAL => 'all';
 use PostgreSQL::Test::Utils;
+use Test::More;
 
 our (
 	$krb5_bin_dir, $krb5_sbin_dir, $krb5_config, $kinit,
diff --git a/src/test/perl/PostgreSQL/Test/Utils.pm b/src/test/perl/PostgreSQL/Test/Utils.pm
index d0ff92c32bb..204c6a27be8 100644
--- a/src/test/perl/PostgreSQL/Test/Utils.pm
+++ b/src/test/perl/PostgreSQL/Test/Utils.pm
@@ -92,6 +92,8 @@ our @EXPORT = qw(
   command_ok_or_fails_like
   command_checks_all
 
+  tar_portability_options
+
   $windows_os
   $is_msys2
   $use_unix_sockets
@@ -1150,6 +1152,51 @@ sub command_checks_all
 
 =pod
 
+=item tar_portability_options(tar)
+
+Check for non-default options we need to give to tar to create
+a tarfile we can decode (i.e., no "pax" extensions).
+Not needed in tests that only use tar to read tarfiles.
+
+Returns options as an array.
+
+=cut
+
+sub tar_portability_options
+{
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+	my ($tar) = @_;
+
+	my @tar_p_flags = ();
+
+	return @tar_p_flags if (!defined $tar || $tar eq '');
+
+	# GNU tar typically produces gnu-format archives, which we can read fine.
+	# But some platforms configure it to default to posix/pax format, and
+	# apparently they enable --sparse too.  Override that.
+	#
+	# ustar format supports UIDs only up to 2^21 - 1 (2097151).  Override
+	# owner/group to avoid failures on systems where the running user's UID/GID
+	# exceeds that limit.
+	my $devnull = File::Spec->devnull();
+	if (system(
+			"$tar --format=ustar --owner=0 --group=0 -cf $devnull $devnull 2>$devnull"
+		) == 0)
+	{
+		# GNU tar (Linux), BSD tar (FreeBSD, NetBSD, macOS, Windows)
+		push(@tar_p_flags, "--format=ustar", "--owner=0", "--group=0");
+	}
+	elsif (system("$tar -F ustar -cf $devnull $devnull 2>$devnull") == 0)
+	{
+		# OpenBSD tar
+		push(@tar_p_flags, "-F", "ustar");
+	}
+	return @tar_p_flags;
+}
+
+=pod
+
 =back
 
 =cut
diff --git a/src/test/postmaster/meson.build b/src/test/postmaster/meson.build
index 0ab32b42f2e..ae4a2fcc340 100644
--- a/src/test/postmaster/meson.build
+++ b/src/test/postmaster/meson.build
@@ -9,6 +9,7 @@ tests += {
       't/001_basic.pl',
       't/002_connection_limits.pl',
       't/003_start_stop.pl',
+      't/004_negotiate.pl',
     ],
   },
 }
diff --git a/src/test/postmaster/t/002_connection_limits.pl b/src/test/postmaster/t/002_connection_limits.pl
index 4a7fb16261f..2fc821ad0b4 100644
--- a/src/test/postmaster/t/002_connection_limits.pl
+++ b/src/test/postmaster/t/002_connection_limits.pl
@@ -74,6 +74,11 @@ sub connect_fails_wait
 	ok(1, "$test_name: client backend process exited");
 }
 
+# Restart the server to ensure that any backends launched for the
+# initialization steps are gone. Otherwise they could still be using
+# up connection slots and mess with our expectations.
+$node->restart;
+
 my @sessions = ();
 my @raw_connections = ();
 
diff --git a/src/test/postmaster/t/003_start_stop.pl b/src/test/postmaster/t/003_start_stop.pl
index 58e7ba6cc42..25d6f667217 100644
--- a/src/test/postmaster/t/003_start_stop.pl
+++ b/src/test/postmaster/t/003_start_stop.pl
@@ -46,6 +46,11 @@
 	plan skip_all => "this test requires working raw_connect()";
 }
 
+# Restart the server to ensure that the backend launched for
+# raw_connect_works() is gone. Otherwise, it might free up the
+# connection slot later, when we expect all the slots to be in use.
+$node->restart;
+
 my @raw_connections = ();
 
 # Open a lot of TCP (or Unix domain socket) connections to use up all
@@ -81,7 +86,7 @@
 # clients already" instead of "role does not exist" error. Test that
 # to ensure that we have used up all the slots.
 $node->connect_fails("dbname=postgres user=invalid_user",
-	"connect ",
+	"connection is rejected when all slots are in use",
 	expected_stderr => qr/FATAL:  sorry, too many clients already/);
 
 # Open one more connection, to really ensure that we have at least one
diff --git a/src/test/postmaster/t/004_negotiate.pl b/src/test/postmaster/t/004_negotiate.pl
new file mode 100644
index 00000000000..f01b7519571
--- /dev/null
+++ b/src/test/postmaster/t/004_negotiate.pl
@@ -0,0 +1,82 @@
+# Copyright (c) 2026, PostgreSQL Global Development Group
+
+# Test the negotiation of combined SSL and GSS requests.  This test
+# relies on both SSL and GSS requests to be rejected first, followed
+# by more requests.
+
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+use Time::HiRes qw(usleep);
+
+my $node = PostgreSQL::Test::Cluster->new('main');
+$node->init;
+$node->append_conf('postgresql.conf', "log_min_messages = debug2");
+$node->append_conf('postgresql.conf',
+	"log_connections = 'receipt,authentication,authorization'");
+$node->append_conf('postgresql.conf', 'trace_connection_negotiation=on');
+$node->start;
+
+if (!$node->raw_connect_works())
+{
+	plan skip_all => "this test requires working raw_connect()";
+}
+
+my $sock = $node->raw_connect();
+
+# SSLRequest: packet length followed by NEGOTIATE_SSL_CODE.
+my $ssl_request = pack("Nnn", 8, 1234, 5679);
+
+# GSSENCRequest: packet length followed by NEGOTIATE_GSS_CODE.
+my $gss_request = pack("Nnn", 8, 1234, 5680);
+
+# Send SSLRequest, reject or bypass.
+$sock->send($ssl_request);
+my $reply = "";
+$sock->recv($reply, 1);
+if ($reply ne 'N')
+{
+	$sock->close();
+	plan skip_all =>
+	  "server accepted SSL; test requires SSL to be rejected";
+}
+
+# Send GSSENCRequest, reject or bypass test.
+$sock->send($gss_request);
+$reply = "";
+$sock->recv($reply, 1);
+if ($reply ne 'N')
+{
+	$sock->close();
+	plan skip_all =>
+	  "server accepted GSS; test requires GSS to be rejected";
+}
+
+my $log_offset = -s $node->logfile;
+
+# Send a second SSLRequest, now that we know that both SSL and GSS have
+# been rejected for this connection.  We are done with both requests, so
+# extra requests will be rejected and fail with an invalid protocol
+# version, and the connection should be closed by the server.
+$sock->send($ssl_request);
+
+# Try to read a response, there should be nothing, and certainly not an
+# extra 'N' message indicating a rejection.
+$reply = "";
+my $bytes = $sock->recv($reply, 1024);
+isnt($reply, 'N',
+	"server does not re-enter SSL negotiation after SSL+GSS were both tried");
+
+$sock->close();
+$node->wait_for_log(qr/FATAL: .* unsupported frontend protocol 1234.5679/,
+					$log_offset);
+
+# Check extra connection with a simple query.
+my $result = $node->safe_psql('postgres', 'select 1;');
+is($result, '1', 'server able to accept connection');
+
+$node->stop;
+
+done_testing();
diff --git a/src/test/recovery/meson.build b/src/test/recovery/meson.build
index 6e78ff1a030..52993c32dbb 100644
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@ -54,6 +54,7 @@ tests += {
       't/043_no_contrecord_switch.pl',
       't/044_invalidate_inactive_slots.pl',
       't/045_archive_restartpoint.pl',
+      't/046_checkpoint_logical_slot.pl',
       't/047_checkpoint_physical_slot.pl',
       't/048_vacuum_horizon_floor.pl'
     ],
diff --git a/src/test/recovery/t/004_timeline_switch.pl b/src/test/recovery/t/004_timeline_switch.pl
index 9c8334cf278..5c2f8665330 100644
--- a/src/test/recovery/t/004_timeline_switch.pl
+++ b/src/test/recovery/t/004_timeline_switch.pl
@@ -34,11 +34,10 @@
 $node_primary->safe_psql('postgres',
 	"CREATE TABLE tab_int AS SELECT generate_series(1,1000) AS a");
 
-# Wait until standby has replayed enough data on standby 1
-$node_primary->wait_for_catchup($node_standby_1);
-
-# Stop and remove primary
-$node_primary->teardown_node;
+# Cleanly stop and remove primary.  A clean stop is required so as all
+# the records generated on the primary are received and flushed by the two
+# standbys.
+$node_primary->stop;
 
 # promote standby 1 using "pg_promote", switching it to a new timeline
 my $psql_out = '';
@@ -54,8 +53,19 @@
 	'postgresql.conf', qq(
 primary_conninfo='$connstr_1'
 ));
+
+# Rotate logfile before restarting, for the log checks done below.
+$node_standby_2->rotate_logfile;
 $node_standby_2->restart;
 
+# Wait for walreceiver to reconnect after the restart.  We want to
+# verify that after reconnection, the walreceiver stays alive during
+# the timeline switch.
+$node_standby_2->poll_query_until('postgres',
+	"SELECT EXISTS(SELECT 1 FROM pg_stat_wal_receiver)");
+my $wr_pid_before_switch = $node_standby_2->safe_psql('postgres',
+	"SELECT pid FROM pg_stat_wal_receiver");
+
 # Insert some data in standby 1 and check its presence in standby 2
 # to ensure that the timeline switch has been done.
 $node_standby_1->safe_psql('postgres',
@@ -66,6 +76,22 @@
   $node_standby_2->safe_psql('postgres', "SELECT count(*) FROM tab_int");
 is($result, qq(2000), 'check content of standby 2');
 
+# Check the logs, WAL receiver should not have been stopped while
+# transitioning to its new timeline.  There is no need to rely on an
+# offset in this check of the server logs: a new log file is used on
+# node restart when primary_conninfo is updated above.
+ok( !$node_standby_2->log_contains(
+		"FATAL: .* terminating walreceiver process due to administrator command"
+	),
+	'WAL receiver should not be stopped across timeline jumps');
+
+# Verify that the walreceiver process stayed alive across the timeline
+# switch, check its PID.
+my $wr_pid_after_switch = $node_standby_2->safe_psql('postgres',
+	"SELECT pid FROM pg_stat_wal_receiver");
+
+is($wr_pid_before_switch, $wr_pid_after_switch,
+	'WAL receiver PID matches across timeline jumps');
 
 # Ensure that a standby is able to follow a primary on a newer timeline
 # when WAL archiving is enabled.
diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
index 2badc868c4d..e791c2c8e40 100644
--- a/src/test/recovery/t/009_twophase.pl
+++ b/src/test/recovery/t/009_twophase.pl
@@ -222,7 +222,7 @@ sub configure_and_reload
 	SAVEPOINT s1;
 	INSERT INTO t_009_tbl VALUES (22, 'issued to ${cur_primary_name}');
 	PREPARE TRANSACTION 'xact_009_10';");
-$cur_primary->teardown_node;
+$cur_primary->stop;
 $cur_standby->promote;
 
 # change roles
diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl
index 623a42ef95a..4481fee816b 100644
--- a/src/test/recovery/t/027_stream_regress.pl
+++ b/src/test/recovery/t/027_stream_regress.pl
@@ -108,6 +108,7 @@
 		'pg_dumpall',
 		'--file' => $outputdir . '/primary.dump',
 		'--no-sync', '--no-statistics',
+		'--restrict-key=test',
 		'--port' => $node_primary->port,
 		'--no-unlogged-table-data',    # if unlogged, standby has schema only
 	],
@@ -117,6 +118,7 @@
 		'pg_dumpall',
 		'--file' => $outputdir . '/standby.dump',
 		'--no-sync', '--no-statistics',
+		'--restrict-key=test',
 		'--port' => $node_standby_1->port,
 	],
 	'dump standby server');
@@ -136,6 +138,7 @@
 		'--schema' => 'pg_catalog',
 		'--file' => $outputdir . '/catalogs_primary.dump',
 		'--no-sync',
+		'--restrict-key=test',
 		'--port', $node_primary->port,
 		'--no-unlogged-table-data',
 		'regression',
@@ -147,6 +150,7 @@
 		'--schema' => 'pg_catalog',
 		'--file' => $outputdir . '/catalogs_standby.dump',
 		'--no-sync',
+		'--restrict-key=test',
 		'--port' => $node_standby_1->port,
 		'regression',
 	],
diff --git a/src/test/recovery/t/035_standby_logical_decoding.pl b/src/test/recovery/t/035_standby_logical_decoding.pl
index 9f93ee55c43..c5c150955ea 100644
--- a/src/test/recovery/t/035_standby_logical_decoding.pl
+++ b/src/test/recovery/t/035_standby_logical_decoding.pl
@@ -8,6 +8,7 @@
 
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
+use Time::HiRes qw(usleep);
 use Test::More;
 
 if ($ENV{enable_injection_points} ne 'yes')
@@ -602,8 +603,8 @@ sub wait_until_vacuum_can_remove
 	  /ERROR:  cannot copy invalidated replication slot "vacuum_full_inactiveslot"/,
 	"invalidated slot cannot be copied");
 
-# Turn hot_standby_feedback back on
-change_hot_standby_feedback_and_wait_for_xmins(1,1);
+# Set hot_standby_feedback to on
+change_hot_standby_feedback_and_wait_for_xmins(1, 1);
 
 ##################################################
 # Verify that invalidated logical slots stay invalidated across a restart.
@@ -729,12 +730,14 @@ sub wait_until_vacuum_can_remove
 
 # message should not be issued
 ok( !$node_standby->log_contains(
-  "invalidating obsolete slot \"no_conflict_inactiveslot\"", $logstart),
-  'inactiveslot slot invalidation is not logged with vacuum on conflict_test');
+		"invalidating obsolete replication slot \"no_conflict_inactiveslot\"", $logstart),
+	'inactiveslot slot invalidation is not logged with vacuum on conflict_test'
+);
 
 ok( !$node_standby->log_contains(
-  "invalidating obsolete slot \"no_conflict_activeslot\"", $logstart),
-  'activeslot slot invalidation is not logged with vacuum on conflict_test');
+		"invalidating obsolete replication slot \"no_conflict_activeslot\"", $logstart),
+	'activeslot slot invalidation is not logged with vacuum on conflict_test'
+);
 
 # Verify that pg_stat_database_conflicts.confl_active_logicalslot has not been updated
 ok( $node_standby->poll_query_until(
diff --git a/src/test/recovery/t/042_low_level_backup.pl b/src/test/recovery/t/042_low_level_backup.pl
index 5749a1df533..20b1abf8999 100644
--- a/src/test/recovery/t/042_low_level_backup.pl
+++ b/src/test/recovery/t/042_low_level_backup.pl
@@ -105,8 +105,8 @@
 
 $node_replica->start;
 
-ok($node_replica->safe_psql('postgres', $canary_query) == 0,
-	'canary is missing');
+is($node_replica->safe_psql('postgres', $canary_query),
+	'0', 'canary is missing');
 
 # Check log to ensure that crash recovery was used as there is no
 # backup_label.
@@ -134,8 +134,8 @@
 	has_restoring => 1);
 $node_replica->start;
 
-ok($node_replica->safe_psql('postgres', $canary_query) == 1,
-	'canary is present');
+is($node_replica->safe_psql('postgres', $canary_query),
+	'1', 'canary is present');
 
 # Check log to ensure that backup_label was used for recovery.
 ok($node_replica->log_contains('starting backup recovery with redo LSN'),
diff --git a/src/test/recovery/t/046_checkpoint_logical_slot.pl b/src/test/recovery/t/046_checkpoint_logical_slot.pl
new file mode 100644
index 00000000000..406b208cccd
--- /dev/null
+++ b/src/test/recovery/t/046_checkpoint_logical_slot.pl
@@ -0,0 +1,228 @@
+# Copyright (c) 2025, PostgreSQL Global Development Group
+#
+# This test verifies the case when the logical slot is advanced during
+# checkpoint. The test checks that the logical slot's restart_lsn still refers
+# to an existed WAL segment after immediate restart.
+#
+use strict;
+use warnings FATAL => 'all';
+
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+
+use Test::More;
+
+if ($ENV{enable_injection_points} ne 'yes')
+{
+	plan skip_all => 'Injection points not supported by this build';
+}
+
+my ($node, $result);
+
+$node = PostgreSQL::Test::Cluster->new('mike');
+$node->init(allows_streaming => 'logical');
+$node->start;
+
+# Check if the extension injection_points is available, as it may be
+# possible that this script is run with installcheck, where the module
+# would not be installed by default.
+if (!$node->check_extension('injection_points'))
+{
+	plan skip_all => 'Extension injection_points not installed';
+}
+
+$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
+
+# Create the two slots we'll need.
+$node->safe_psql('postgres',
+	q{select pg_create_logical_replication_slot('slot_logical', 'test_decoding')}
+);
+$node->safe_psql('postgres',
+	q{select pg_create_physical_replication_slot('slot_physical', true)});
+
+# Advance both slots to the current position just to have everything "valid".
+$node->safe_psql('postgres',
+	q{select count(*) from pg_logical_slot_get_changes('slot_logical', null, null)}
+);
+$node->safe_psql('postgres',
+	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
+);
+
+# Run checkpoint to flush current state to disk and set a baseline.
+$node->safe_psql('postgres', q{checkpoint});
+
+# Generate some transactions to get RUNNING_XACTS.
+my $xacts = $node->background_psql('postgres');
+$xacts->query_until(
+	qr/run_xacts/,
+	q(\echo run_xacts
+SELECT 1 \watch 0.1
+\q
+));
+
+$node->advance_wal(20);
+
+# Run another checkpoint to set a new restore LSN.
+$node->safe_psql('postgres', q{checkpoint});
+
+$node->advance_wal(20);
+
+# Run another checkpoint, this time in the background, and make it wait
+# on the injection point) so that the checkpoint stops right before
+# removing old WAL segments.
+note('starting checkpoint');
+
+my $checkpoint = $node->background_psql('postgres');
+$checkpoint->query_safe(
+	q(select injection_points_attach('checkpoint-before-old-wal-removal','wait'))
+);
+$checkpoint->query_until(
+	qr/starting_checkpoint/,
+	q(\echo starting_checkpoint
+checkpoint;
+\q
+));
+
+# Wait until the checkpoint stops right before removing WAL segments.
+note('waiting for injection_point');
+$node->wait_for_event('checkpointer', 'checkpoint-before-old-wal-removal');
+note('injection_point is reached');
+
+# Try to advance the logical slot, but make it stop when it moves to the next
+# WAL segment (this has to happen in the background, too).
+my $logical = $node->background_psql('postgres');
+$logical->query_safe(
+	q{select injection_points_attach('logical-replication-slot-advance-segment','wait');}
+);
+$logical->query_until(
+	qr/get_changes/,
+	q(
+\echo get_changes
+select count(*) from pg_logical_slot_get_changes('slot_logical', null, null) \watch 1
+\q
+));
+
+# Wait until the slot's restart_lsn points to the next WAL segment.
+note('waiting for injection_point');
+$node->wait_for_event('client backend',
+	'logical-replication-slot-advance-segment');
+note('injection_point is reached');
+
+# OK, we're in the right situation: time to advance the physical slot, which
+# recalculates the required LSN, and then unblock the checkpoint, which
+# removes the WAL still needed by the logical slot.
+$node->safe_psql('postgres',
+	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
+);
+
+# Generate a long WAL record, spawning at least two pages for the follow-up
+# post-recovery check.
+$node->safe_psql('postgres',
+	q{select pg_logical_emit_message(false, '', repeat('123456789', 1000))});
+
+# Continue the checkpoint and wait for its completion.
+my $log_offset = -s $node->logfile;
+$node->safe_psql('postgres',
+	q{select injection_points_wakeup('checkpoint-before-old-wal-removal')});
+$node->wait_for_log(qr/checkpoint complete/, $log_offset);
+
+# Abruptly stop the server.
+$node->stop('immediate');
+
+$node->start;
+
+eval {
+	$node->safe_psql('postgres',
+		q{select count(*) from pg_logical_slot_get_changes('slot_logical', null, null);}
+	);
+};
+is($@, '', "Logical slot still valid");
+
+# If we send \q with $<psql_session>->quit the command can be sent to the
+# session already closed. So \q is in initial script, here we only finish
+# IPC::Run
+$xacts->{run}->finish;
+$checkpoint->{run}->finish;
+$logical->{run}->finish;
+
+# Verify that the synchronized slots won't be invalidated immediately after
+# synchronization in the presence of a concurrent checkpoint.
+my $primary = $node;
+
+$primary->append_conf('postgresql.conf', "autovacuum = off");
+$primary->reload;
+
+my $backup_name = 'backup';
+
+$primary->backup($backup_name);
+
+# Create a standby
+my $standby = PostgreSQL::Test::Cluster->new('standby');
+$standby->init_from_backup(
+	$primary, $backup_name,
+	has_streaming => 1);
+
+my $connstr_1 = $primary->connstr;
+$standby->append_conf(
+	'postgresql.conf', qq(
+hot_standby_feedback = on
+primary_slot_name = 'phys_slot'
+primary_conninfo = '$connstr_1 dbname=postgres'
+));
+
+$primary->safe_psql('postgres',
+	q{SELECT pg_create_logical_replication_slot('failover_slot', 'test_decoding', false, false, true);
+	 SELECT pg_create_physical_replication_slot('phys_slot');}
+);
+
+$standby->start;
+
+# Generate some activity and switch WAL file on the primary
+$primary->advance_wal(1);
+$primary->safe_psql('postgres', "CHECKPOINT");
+$primary->wait_for_replay_catchup($standby);
+
+# checkpoint on the standby and make it wait on the injection point so that the
+# checkpoint stops right before invalidating replication slots.
+note('starting checkpoint');
+
+$checkpoint = $standby->background_psql('postgres');
+$checkpoint->query_safe(
+	q(select injection_points_attach('restartpoint-before-slot-invalidation','wait'))
+);
+$checkpoint->query_until(
+	qr/starting_checkpoint/,
+	q(\echo starting_checkpoint
+checkpoint;
+));
+
+# Wait until the checkpoint stops right before invalidating slots
+note('waiting for injection_point');
+$standby->wait_for_event('checkpointer', 'restartpoint-before-slot-invalidation');
+note('injection_point is reached');
+
+# Enable slot sync worker to synchronize the failover slot to the standby
+$standby->append_conf('postgresql.conf', qq(sync_replication_slots = on));
+$standby->reload;
+
+# Wait for the slot to be synced
+$standby->poll_query_until(
+	'postgres',
+	"SELECT COUNT(*) > 0 FROM pg_replication_slots WHERE slot_name = 'failover_slot'");
+
+# Release the checkpointer
+$standby->safe_psql('postgres',
+	q{select injection_points_wakeup('restartpoint-before-slot-invalidation');
+	  select injection_points_detach('restartpoint-before-slot-invalidation')});
+
+$checkpoint->quit;
+
+# Confirm that the slot is not invalidated
+is( $standby->safe_psql(
+		'postgres',
+		q{SELECT invalidation_reason IS NULL AND synced FROM pg_replication_slots WHERE slot_name = 'failover_slot';}
+	),
+	"t",
+	'logical slot is not invalidated');
+
+done_testing();
diff --git a/src/test/recovery/t/047_checkpoint_physical_slot.pl b/src/test/recovery/t/047_checkpoint_physical_slot.pl
index a1332b5d44c..9e98383e30e 100644
--- a/src/test/recovery/t/047_checkpoint_physical_slot.pl
+++ b/src/test/recovery/t/047_checkpoint_physical_slot.pl
@@ -94,9 +94,11 @@
 	q{select pg_replication_slot_advance('slot_physical', pg_current_wal_lsn())}
 );
 
-# Continue the checkpoint.
+# Continue the checkpoint and wait for its completion.
+my $log_offset = -s $node->logfile;
 $node->safe_psql('postgres',
 	q{select injection_points_wakeup('checkpoint-before-old-wal-removal')});
+$node->wait_for_log(qr/checkpoint complete/, $log_offset);
 
 my $restart_lsn_old = $node->safe_psql('postgres',
 	q{select restart_lsn from pg_replication_slots where slot_name = 'slot_physical'}
@@ -104,8 +106,7 @@
 chomp($restart_lsn_old);
 note("restart lsn before stop: $restart_lsn_old");
 
-# Abruptly stop the server (1 second should be enough for the checkpoint
-# to finish; it would be better).
+# Abruptly stop the server.
 $node->stop('immediate');
 
 $node->start;
diff --git a/src/test/recovery/t/048_vacuum_horizon_floor.pl b/src/test/recovery/t/048_vacuum_horizon_floor.pl
index e56fce59d58..668eedd71b2 100644
--- a/src/test/recovery/t/048_vacuum_horizon_floor.pl
+++ b/src/test/recovery/t/048_vacuum_horizon_floor.pl
@@ -1,8 +1,5 @@
-use strict;
-use warnings;
-use PostgreSQL::Test::Cluster;
-use Test::More;
-
+# Copyright (c) 2025, PostgreSQL Global Development Group
+#
 # Test that vacuum prunes away all dead tuples killed before OldestXmin
 #
 # This test creates a table on a primary, updates the table to generate dead
@@ -10,6 +7,11 @@
 # GlobalVisState->maybe_needed on the primary to move backwards and precede
 # the value of OldestXmin set at the beginning of vacuuming the table.
 
+use strict;
+use warnings;
+use PostgreSQL::Test::Cluster;
+use Test::More;
+
 # Set up nodes
 my $node_primary = PostgreSQL::Test::Cluster->new('primary');
 $node_primary->init(allows_streaming => 'physical');
diff --git a/src/test/regress/.gitignore b/src/test/regress/.gitignore
index 89129d7358a..a1a6b057686 100644
--- a/src/test/regress/.gitignore
+++ b/src/test/regress/.gitignore
@@ -1,5 +1,6 @@
 # Local binaries
 /pg_regress
+/ora_pg_regress
 
 # Generated subdirectories
 /tmp_check/
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index 1f1ce2380af..cdb4ecf288f 100644
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -1515,6 +1515,37 @@ explain (costs off) select y,z from t2 group by y,z;
    ->  Seq Scan on t2
 (3 rows)
 
+-- A unique index proves uniqueness only under its own opfamily.  When the
+-- GROUP BY's eqop comes from a different opfamily with looser equality,
+-- rows the index regards as distinct can collapse into one GROUP BY group,
+-- so the index is not usable for removing redundant columns.
+create type t_rec as (x numeric);
+create temp table t_opf (a t_rec not null, b text);
+create unique index on t_opf (a record_image_ops);
+-- (1.0) and (1.00) are bytewise distinct but logically equal as records;
+-- the index admits both, but GROUP BY a (default record_ops) would merge
+-- them, so b must be retained as a grouping key.
+insert into t_opf values (row(1.0)::t_rec, 'X'), (row(1.00)::t_rec, 'Y');
+explain (costs off)
+select a, b from t_opf group by a, b order by b;
+          QUERY PLAN           
+-------------------------------
+ Group
+   Group Key: b, a
+   ->  Sort
+         Sort Key: b, a
+         ->  Seq Scan on t_opf
+(5 rows)
+
+select a, b from t_opf group by a, b order by b;
+   a    | b 
+--------+---
+ (1.0)  | X
+ (1.00) | Y
+(2 rows)
+
+drop table t_opf;
+drop type t_rec;
 drop table t1 cascade;
 NOTICE:  drop cascades to table t1c
 drop table t2;
@@ -1561,6 +1592,19 @@ group by f2;
 ----+-------
 (0 rows)
 
+-- check that we preserve join alias in GROUP BY expressions
+create temp view v1 as
+select f1::int from t1 left join t2 using (f1) group by f1;
+select pg_get_viewdef('v1'::regclass);
+        pg_get_viewdef         
+-------------------------------
+  SELECT (f1)::integer AS f1  +
+    FROM (t1                  +
+      LEFT JOIN t2 USING (f1))+
+   GROUP BY f1;
+(1 row)
+
+drop view v1;
 drop table t1, t2;
 --
 -- Test planner's selection of pathkeys for ORDER BY aggregates
@@ -3379,26 +3423,6 @@ select v||'a', case when v||'a' = 'aa' then 1 else 0 end, count(*)
  ba       |    0 |     1
 (2 rows)
 
--- Make sure that generation of HashAggregate for uniqification purposes
--- does not lead to array overflow due to unexpected duplicate hash keys
--- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
-set enable_memoize to off;
-explain (costs off)
-  select 1 from tenk1
-   where (hundred, thousand) in (select twothousand, twothousand from onek);
-                         QUERY PLAN                          
--------------------------------------------------------------
- Hash Join
-   Hash Cond: (tenk1.hundred = onek.twothousand)
-   ->  Seq Scan on tenk1
-         Filter: (hundred = thousand)
-   ->  Hash
-         ->  HashAggregate
-               Group Key: onek.twothousand, onek.twothousand
-               ->  Seq Scan on onek
-(8 rows)
-
-reset enable_memoize;
 --
 -- Hash Aggregation Spill tests
 --
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 750efc042d8..65a18ca1d9b 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -3567,12 +3567,15 @@ SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment F
 -- filenode function call can return NULL for a relation dropped concurrently
 -- with the call's surrounding query, so ignore a NULL mapped_oid for
 -- relations that no longer exist after all calls finish.
+-- Temporary relations are ignored, as not supported by pg_filenode_relation().
 CREATE TEMP TABLE filenode_mapping AS
 SELECT
     oid, mapped_oid, reltablespace, relfilenode, relname
 FROM pg_class,
     pg_filenode_relation(reltablespace, pg_relation_filenode(oid)) AS mapped_oid
-WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
+WHERE relkind IN ('r', 'i', 'S', 't', 'm')
+  AND relpersistence != 't'
+  AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
@@ -3841,6 +3844,16 @@ Referenced by:
 ALTER TABLE test_add_column
 	ADD COLUMN IF NOT EXISTS c5 SERIAL CHECK (c5 > 10);
 NOTICE:  column "c5" of relation "test_add_column" already exists, skipping
+ALTER TABLE test_add_column
+	ADD c6 integer; -- omit COLUMN
+ALTER TABLE test_add_column
+	ADD IF NOT EXISTS c6 integer;
+NOTICE:  column "c6" of relation "test_add_column" already exists, skipping
+ALTER TABLE test_add_column
+	DROP c6; -- omit COLUMN
+ALTER TABLE test_add_column
+	DROP IF EXISTS c6;
+NOTICE:  column "c6" of relation "test_add_column" does not exist, skipping
 \d test_add_column*
                             Table "public.test_add_column"
  Column |  Type   | Collation | Nullable |                   Default                   
@@ -4487,6 +4500,14 @@ Check constraints:
     "part_rp100_a_check" CHECK (a >= 123 AND a < 133 AND a IS NOT NULL)
 
 DROP TABLE range_parted2;
+-- Test that hash partitions continue to work after they're concurrently
+-- detached (bugs #18371, #19070)
+CREATE TABLE hash_parted2 (a int) PARTITION BY HASH(a);
+CREATE TABLE part_hp PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 0);
+ALTER TABLE hash_parted2 DETACH PARTITION part_hp CONCURRENTLY;
+DROP TABLE hash_parted2;
+INSERT INTO part_hp VALUES (1);
+DROP TABLE part_hp;
 -- Check ALTER TABLE commands for partitioned tables and partitions
 -- cannot add/drop column to/from *only* the parent
 ALTER TABLE ONLY list_parted2 ADD COLUMN c int;
@@ -4750,6 +4771,14 @@ create table attbl(a int);
 create table atref(b attbl check ((b).a is not null));
 alter table attbl alter column a type numeric;  -- someday this should work
 ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
+alter table atref drop constraint atref_b_check;
+create statistics atref_stat on ((b).a is not null) from atref;
+alter table attbl alter column a type numeric;  -- someday this should work
+ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
+drop statistics atref_stat;
+create index atref_idx on atref (((b).a));
+alter table attbl alter column a type numeric;  -- someday this should work
+ERROR:  cannot alter table "attbl" because column "atref.b" uses its row type
 drop table attbl, atref;
 /* End test case for bug #18970 */
 -- Test that ALTER TABLE rewrite preserves a clustered index
diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out
index b815473f414..af725009cd6 100644
--- a/src/test/regress/expected/arrays.out
+++ b/src/test/regress/expected/arrays.out
@@ -1737,6 +1737,11 @@ select '[-2147483648:-2147483647]={1,2}'::int[];
 (1 row)
 
 -- all of the above should be accepted
+-- some day we might allow these cases, but for now they're errors:
+select array[]::oidvector;
+ERROR:  array is not a valid oidvector
+select array[]::int2vector;
+ERROR:  array is not a valid int2vector
 -- tests for array aggregates
 CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
 INSERT INTO arraggtest (f1, f2, f3) VALUES
diff --git a/src/test/regress/expected/btree_index.out b/src/test/regress/expected/btree_index.out
index bfb1a286ea4..21dc9b5783a 100644
--- a/src/test/regress/expected/btree_index.out
+++ b/src/test/regress/expected/btree_index.out
@@ -195,54 +195,123 @@ ORDER BY proname DESC, proargtypes DESC, pronamespace DESC LIMIT 1;
 (1 row)
 
 --
--- Add coverage for RowCompare quals whose rhs row has a NULL that ends scan
+-- Forwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
-                                                 QUERY PLAN                                                  
--------------------------------------------------------------------------------------------------------------
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
  Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
-   Index Cond: ((ROW(proname, proargtypes) < ROW('abs'::name, NULL::oidvector)) AND (proname = 'abs'::name))
+   Index Cond: ((ROW(proname, proargtypes) >= ROW('abs'::name, NULL::oidvector)) AND (proname <= 'abs'::name))
 (2 rows)
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
  proname | proargtypes | pronamespace 
 ---------+-------------+--------------
 (0 rows)
 
 --
--- Add coverage for backwards scan RowCompare quals whose rhs row has a NULL
--- that ends scan
+-- Forwards scan RowCompare quals whose row arg has a NULL that ends scan
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+                                                  QUERY PLAN                                                  
+--------------------------------------------------------------------------------------------------------------
+ Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((proname >= 'abs'::name) AND (ROW(proname, proargtypes) < ROW('abs'::name, NULL::oidvector)))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Index Only Scan Backward using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((proname >= 'abs'::name) AND (ROW(proname, proargtypes) <= ROW('abs'::name, NULL::oidvector)))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that ends scan
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
-                                                 QUERY PLAN                                                  
--------------------------------------------------------------------------------------------------------------
+                                                  QUERY PLAN                                                  
+--------------------------------------------------------------------------------------------------------------
  Index Only Scan Backward using pg_proc_proname_args_nsp_index on pg_proc
-   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname = 'abs'::name))
+   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname <= 'abs'::name))
 (2 rows)
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
  proname | proargtypes | pronamespace 
 ---------+-------------+--------------
 (0 rows)
 
+-- Makes B-Tree preprocessing deal with unmarking redundant keys that were
+-- initially marked required (test case relies on current row compare
+-- preprocessing limitations)
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+                                                                                                     QUERY PLAN                                                                                                     
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Index Only Scan using pg_proc_proname_args_nsp_index on pg_proc
+   Index Cond: ((ROW(proname, proargtypes) > ROW('abs'::name, NULL::oidvector)) AND (proname = 'zzzzzz'::name) AND (proargtypes = ANY ('{"26 23",5077}'::oidvector[])) AND (pronamespace = ANY ('{1,2,3}'::oid[])))
+(2 rows)
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+ proname | proargtypes | pronamespace 
+---------+-------------+--------------
+(0 rows)
+
 --
--- Add coverage for recheck of > key following array advancement on previous
--- (left sibling) page that used a high key whose attribute value corresponding
--- to the > key was -inf (due to being truncated when the high key was created).
+-- Performs a recheck of > key following array advancement on previous (left
+-- sibling) page that used a high key whose attribute value corresponding to
+-- the > key was -inf (due to being truncated when the high key was created).
 --
 -- XXX This relies on the assumption that tenk1_thous_tenthous has a truncated
 -- high key "(183, -inf)" on the first page that we'll scan.  The test will only
diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
index 69805d4b9ec..66093040965 100644
--- a/src/test/regress/expected/collate.icu.utf8.out
+++ b/src/test/regress/expected/collate.icu.utf8.out
@@ -1484,6 +1484,13 @@ SELECT array_sort('{a,B}'::text[] COLLATE "C");
  {B,a}
 (1 row)
 
+-- test replace() at the end of the string (bug #19341)
+SELECT replace('testX' COLLATE case_insensitive, 'x' COLLATE case_insensitive, 'er');
+ replace 
+---------
+ tester
+(1 row)
+
 -- test language tags
 CREATE COLLATION lt_insensitive (provider = icu, locale = 'en-u-ks-level1', deterministic = false);
 SELECT 'aBcD' COLLATE lt_insensitive = 'AbCd' COLLATE lt_insensitive;
@@ -1637,6 +1644,310 @@ SELECT string_to_array('ABCDEFGHI' COLLATE case_sensitive, NULL, 'b');
  {A,B,C,D,E,F,G,H,I}
 (1 row)
 
+--
+-- A unique index under one collation does not prove uniqueness under
+-- another, so the planner must not use such a proof for any optimization.
+--
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Sort
+   Output: t1.x, t2.x
+   Sort Key: t1.x COLLATE case_sensitive, t2.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, t2.x
+         Hash Cond: ((t2.x)::text = (t1.x)::text)
+         ->  Seq Scan on collate_tests.test3cs t2
+               Output: t2.x
+         ->  Hash
+               Output: t1.x
+               ->  Seq Scan on collate_tests.test1cs t1
+                     Output: t1.x
+(12 rows)
+
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+                QUERY PLAN                
+------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Left Join
+         Hash Cond: (t1.x = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+  x  
+-----
+ abc
+ abc
+ ABC
+ ABC
+ def
+ ghi
+(6 rows)
+
+-- Ensure that self-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive, t2.x COLLATE case_sensitive
+   ->  Hash Join
+         Hash Cond: ((t1.x)::text = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Semi Join
+         Hash Cond: ((t1.x)::text = (t2.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  Seq Scan on test3cs t2
+(7 rows)
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+  x  
+-----
+ abc
+ ABC
+ def
+ ghi
+(4 rows)
+
+--
+-- A DISTINCT / GROUP BY / set-op on a subquery does not prove uniqueness
+-- under a different collation, so the planner must not use such a proof for
+-- any optimization.
+--
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on collate_tests.test1cs t1
+               Output: t1.x
+         ->  Hash
+               Output: test3cs.x
+               ->  HashAggregate
+                     Output: test3cs.x
+                     Group Key: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+(15 rows)
+
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Same with GROUP BY
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on collate_tests.test1cs t1
+               Output: t1.x
+         ->  Hash
+               Output: test3cs.x
+               ->  HashAggregate
+                     Output: test3cs.x
+                     Group Key: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+(15 rows)
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Same with set-op
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Output: t1.x, test3cs.x
+   Sort Key: t1.x COLLATE case_sensitive, test3cs.x COLLATE case_sensitive
+   ->  Hash Join
+         Output: t1.x, test3cs.x
+         Hash Cond: ((test3cs.x)::text = (t1.x)::text)
+         ->  HashAggregate
+               Output: test3cs.x
+               Group Key: test3cs.x
+               ->  Append
+                     ->  Seq Scan on collate_tests.test3cs
+                           Output: test3cs.x
+                     ->  Seq Scan on collate_tests.test3cs test3cs_1
+                           Output: test3cs_1.x
+         ->  Hash
+               Output: t1.x
+               ->  Seq Scan on collate_tests.test1cs t1
+                     Output: t1.x
+(18 rows)
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+  x  |  x  
+-----+-----
+ abc | abc
+ abc | ABC
+ ABC | abc
+ ABC | ABC
+ def | def
+ ghi | ghi
+(6 rows)
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Left Join
+         Hash Cond: (t1.x = (test3cs.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  HashAggregate
+                     Group Key: test3cs.x
+                     ->  Seq Scan on test3cs
+(9 rows)
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+  x  
+-----
+ abc
+ abc
+ ABC
+ ABC
+ def
+ ghi
+(6 rows)
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Sort
+   Sort Key: t1.x COLLATE case_sensitive
+   ->  Hash Semi Join
+         Hash Cond: ((t1.x)::text = (test3cs.x)::text)
+         ->  Seq Scan on test3cs t1
+         ->  Hash
+               ->  HashAggregate
+                     Group Key: test3cs.x
+                     ->  Seq Scan on test3cs
+(9 rows)
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+  x  
+-----
+ abc
+ ABC
+ def
+ ghi
+(4 rows)
+
 CREATE TABLE test1ci (x text COLLATE case_insensitive);
 CREATE TABLE test2ci (x text COLLATE case_insensitive);
 CREATE TABLE test3ci (x text COLLATE case_insensitive);
@@ -1763,6 +2074,270 @@ SELECT string_to_array('ABCDEFGHI' COLLATE case_insensitive, NULL, 'b');
  {A,NULL,C,D,E,F,G,H,I}
 (1 row)
 
+-- Test HAVING-to-WHERE pushdown with nondeterministic collations.
+-- When a HAVING clause uses a different collation than the GROUP BY's
+-- nondeterministic collation, it must not be pushed to WHERE, otherwise
+-- aggregate results can change because the stricter filter eliminates rows
+-- before grouping.
+-- Negative: collation conflict, HAVING must not be pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (x = 'abc'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: same collation, safe to push HAVING to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3ci
+         Filter: (x = 'abc'::text COLLATE case_insensitive)
+(3 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: function applied to grouped column with conflicting collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (upper(x) = 'ABC'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: function with same collation as GROUP BY
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ GroupAggregate
+   Group Key: x
+   ->  Sort
+         Sort Key: x COLLATE case_insensitive
+         ->  Seq Scan on test3ci
+               Filter: (upper(x) = 'ABC'::text COLLATE case_insensitive)
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: inner function has conflicting collation, even though outer
+-- operator's collation matches GROUP BY due to a COLLATE override
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: ((upper((x)::text))::text = 'ABC'::text)
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Mixed AND: conflicting clause stays in HAVING, safe clause pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+                     QUERY PLAN                     
+----------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: (x = 'abc'::text COLLATE case_sensitive)
+   ->  Seq Scan on test3ci
+         Filter: (length(x) > 1)
+(5 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: AND of two safe clauses, both can be pushed
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3ci
+         Filter: ((x = 'abc'::text COLLATE case_insensitive) AND (length(x) > 1))
+(3 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: OR with a conflicting clause: must stay in HAVING
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: x COLLATE case_insensitive
+   ->  HashAggregate
+         Group Key: x
+         Filter: ((x = 'abc'::text COLLATE case_sensitive) OR (x = 'def'::text COLLATE case_sensitive))
+         ->  Seq Scan on test3ci
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     2
+ def |     1
+(2 rows)
+
+-- Negative: collation conflict inside a RowCompareExpr
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Sort
+   Sort Key: x COLLATE case_insensitive
+   ->  HashAggregate
+         Group Key: x
+         Filter: (ROW(x, 1) < ROW('ABC'::text COLLATE case_sensitive, 1))
+         ->  Seq Scan on test3ci
+(6 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: simple-CASE form with conflicting WHEN comparison collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: CASE x WHEN 'abc'::text COLLATE case_sensitive THEN true ELSE false END
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: simple-CASE form with matching collation, safe to push
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   ->  Seq Scan on test3ci
+         Filter: CASE x WHEN 'abc'::text COLLATE case_insensitive THEN true ELSE false END
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Negative: nested CASE with collation conflict
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+                                                     QUERY PLAN                                                      
+---------------------------------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   Filter: CASE WHEN (CASE x WHEN 'abc'::text COLLATE case_sensitive THEN 1 ELSE 0 END = 1) THEN true ELSE false END
+   ->  Seq Scan on test3ci
+(4 rows)
+
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+  x  | count 
+-----+-------
+ abc |     2
+(1 row)
+
+-- Positive: conflicting collation but no grouping expression reference
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING current_setting('server_version') = 'abc' COLLATE case_sensitive;
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ HashAggregate
+   Group Key: x
+   ->  Result
+         One-Time Filter: (current_setting('server_version'::text) = 'abc'::text COLLATE case_sensitive)
+         ->  Seq Scan on test3ci
+(5 rows)
+
+-- Positive: deterministic collation in GROUP BY: always safe to push, even if
+-- HAVING uses a nondeterministic collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+                        QUERY PLAN                        
+----------------------------------------------------------
+ GroupAggregate
+   ->  Seq Scan on test3cs
+         Filter: (x = 'abc'::text COLLATE case_sensitive)
+(3 rows)
+
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+  x  | count 
+-----+-------
+ abc |     1
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ GroupAggregate
+   Group Key: x
+   ->  Sort
+         Sort Key: x COLLATE case_sensitive
+         ->  Seq Scan on test3cs
+               Filter: (x = 'abc'::text COLLATE case_insensitive)
+(6 rows)
+
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+  x  | count 
+-----+-------
+ abc |     1
+ ABC |     1
+(2 rows)
+
 -- bpchar
 CREATE TABLE test1bpci (x char(3) COLLATE case_insensitive);
 CREATE TABLE test2bpci (x char(3) COLLATE case_insensitive);
@@ -2670,6 +3245,38 @@ DROP TABLE pagg_tab6;
 RESET enable_partitionwise_aggregate;
 RESET max_parallel_workers_per_gather;
 RESET enable_incremental_sort;
+--
+-- A unique index can prove functional dependency for GROUP BY column
+-- removal only if its per-column collation agrees on equality with
+-- the GROUP BY column's collation.  An index built under a different
+-- (deterministic) collation would otherwise let remove_useless_groupby_columns
+-- drop other columns whose values still differ within a nondeterministic
+-- group.
+--
+CREATE TABLE groupby_collation_t (a text COLLATE case_insensitive NOT NULL, b text);
+INSERT INTO groupby_collation_t VALUES ('foo', 'X'), ('FOO', 'Y');
+CREATE UNIQUE INDEX ON groupby_collation_t (a COLLATE "C");
+-- Column b must NOT be dropped: under case_insensitive on a, 'foo' and
+-- 'FOO' would merge, but they have distinct b values.
+EXPLAIN (COSTS OFF)
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Group
+   Group Key: a, b
+   ->  Sort
+         Sort Key: a COLLATE case_insensitive, b
+         ->  Seq Scan on groupby_collation_t
+(5 rows)
+
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+  a  | b 
+-----+---
+ foo | X
+ FOO | Y
+(2 rows)
+
+DROP TABLE groupby_collation_t;
 -- virtual generated columns
 CREATE TABLE t5 (
     a int,
@@ -2690,6 +3297,55 @@ SELECT * FROM t5 ORDER BY c ASC, a ASC;
  3 | d1 | d1
 (3 rows)
 
+-- Check that DEFAULT expressions in SQL/JSON functions use the same collation
+-- as the RETURNING type.  Mismatched collations should raise an error.
+CREATE DOMAIN d1 AS text COLLATE case_insensitive;
+CREATE DOMAIN d2 AS text COLLATE "C";
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT ('C' COLLATE "C") COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
+ERROR:  collation of DEFAULT expression conflicts with RETURNING clause
+LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT...
+                                                             ^
+DETAIL:  "C" versus "case_insensitive"
+DROP DOMAIN d1, d2;
 -- cleanup
 RESET search_path;
 SET client_min_messages TO warning;
diff --git a/src/test/regress/expected/compression_pglz.out b/src/test/regress/expected/compression_pglz.out
new file mode 100644
index 00000000000..0ef49d42506
--- /dev/null
+++ b/src/test/regress/expected/compression_pglz.out
@@ -0,0 +1,65 @@
+--
+-- Tests for PGLZ compression
+--
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/regress' :dlsuffix
+CREATE FUNCTION test_pglz_compress(bytea)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_pglz_decompress(bytea, int4, bool)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+-- Round-trip with pglz: compress then decompress.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, false) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+ roundtrip_ok 
+--------------
+ t
+(1 row)
+
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, true) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+ roundtrip_ok 
+--------------
+ t
+(1 row)
+
+-- Decompression with rawsize too large, fails to fill the destination
+-- buffer.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 500, true);
+ERROR:  pglz_decompress failed
+-- Decompression with rawsize too small, fails with source not fully
+-- consumed.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 100, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- no data follows.
+SELECT length(test_pglz_decompress('\x01'::bytea, 1024, false)) AS ctrl_only_len;
+ ctrl_only_len 
+---------------
+             0
+(1 row)
+
+SELECT test_pglz_decompress('\x01'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- 1 byte follows.
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, false);
+ERROR:  pglz_decompress failed
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Corrupted compressed data.  Set control bit with match tag where length
+-- nibble is 3 bytes (extended length), no data follows.
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, false);
+ERROR:  pglz_decompress failed
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, true);
+ERROR:  pglz_decompress failed
+-- Clean up
+DROP FUNCTION test_pglz_compress;
+DROP FUNCTION test_pglz_decompress;
diff --git a/src/test/regress/expected/constraints.out b/src/test/regress/expected/constraints.out
index b5592617d97..ebc892a2a42 100644
--- a/src/test/regress/expected/constraints.out
+++ b/src/test/regress/expected/constraints.out
@@ -748,6 +748,11 @@ ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key ENFORCED;
 ERROR:  cannot alter enforceability of constraint "unique_tbl_i_key" of relation "unique_tbl"
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT ENFORCED;
 ERROR:  cannot alter enforceability of constraint "unique_tbl_i_key" of relation "unique_tbl"
+-- can't make an existing constraint NOT VALID
+ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+ERROR:  constraints cannot be altered to be NOT VALID
+LINE 1: ...ABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+                                                             ^
 DROP TABLE unique_tbl;
 --
 -- EXCLUDE constraints
@@ -841,8 +846,12 @@ CREATE TABLE notnull_tbl1 (a INTEGER NOT NULL NOT NULL);
 Not-null constraints:
     "notnull_tbl1_a_not_null" NOT NULL "a"
 
--- no-op
+-- specifying an existing constraint is a no-op
+ALTER TABLE notnull_tbl1 ADD CONSTRAINT notnull_tbl1_a_not_null NOT NULL a;
+-- but using a different constraint name is not allowed
 ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
+ERROR:  cannot create not-null constraint "nn" on column "a" of table "notnull_tbl1"
+DETAIL:  A not-null constraint named "notnull_tbl1_a_not_null" already exists for this column.
 \d+ notnull_tbl1
                                Table "public.notnull_tbl1"
  Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
@@ -1399,6 +1408,10 @@ ALTER TABLE notnull_tbl1 ADD PRIMARY KEY (a);
 ERROR:  cannot create primary key on column "a"
 DETAIL:  The constraint "nn" on column "a" of table "notnull_tbl1", marked NOT VALID, is incompatible with a primary key.
 HINT:  You might need to validate it using ALTER TABLE ... VALIDATE CONSTRAINT.
+-- cannot set column as generated-as-identity if it has an invalid not-null
+ALTER TABLE notnull_tbl1 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;
+ERROR:  incompatible NOT VALID constraint "nn" on relation "notnull_tbl1"
+HINT:  You might need to validate it using ALTER TABLE ... VALIDATE CONSTRAINT.
 -- ALTER column SET NOT NULL validates an invalid constraint (but this fails
 -- because of rows with null values)
 ALTER TABLE notnull_tbl1 ALTER a SET NOT NULL;
@@ -1696,3 +1709,11 @@ DROP TABLE constraint_comments_tbl;
 DROP DOMAIN constraint_comments_dom;
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';
+-- Create a table that exercises pg_upgrade
+CREATE TABLE regress_notnull1 (a integer);
+CREATE TABLE regress_notnull2 () INHERITS (regress_notnull1);
+ALTER TABLE ONLY regress_notnull2 ALTER COLUMN a SET NOT NULL;
diff --git a/src/test/regress/expected/create_function_sql.out b/src/test/regress/expected/create_function_sql.out
index 963b6f863ff..da112608d66 100644
--- a/src/test/regress/expected/create_function_sql.out
+++ b/src/test/regress/expected/create_function_sql.out
@@ -733,6 +733,22 @@ SELECT double_append(array_append(ARRAY[q1], q2), q3)
  {4,5,6,4,5,6}
 (2 rows)
 
+-- Check that we can re-use a SQLFunctionCache after a run-time error.
+-- This function will fail with zero-divide at run time (not plan time).
+CREATE FUNCTION part_hashint4_error(value int4, seed int8) RETURNS int8
+LANGUAGE SQL STRICT IMMUTABLE PARALLEL SAFE AS
+$$ SELECT value + seed + random()::int/0 $$;
+-- Put it into an operator class so that FmgrInfo will be cached in relcache.
+CREATE OPERATOR CLASS part_test_int4_ops_bad FOR TYPE int4 USING hash AS
+  FUNCTION 2 part_hashint4_error(int4, int8);
+CREATE TABLE pt(i int) PARTITION BY hash (i part_test_int4_ops_bad);
+CREATE TABLE p1 PARTITION OF pt FOR VALUES WITH (modulus 4, remainder 0);
+INSERT INTO pt VALUES (1);
+ERROR:  division by zero
+CONTEXT:  SQL function "part_hashint4_error" statement 1
+INSERT INTO pt VALUES (1);
+ERROR:  division by zero
+CONTEXT:  SQL function "part_hashint4_error" statement 1
 -- Things that shouldn't work:
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
     AS 'SELECT ''not an integer'';';
@@ -773,7 +789,7 @@ CONTEXT:  SQL function "test1" during startup
 RESET check_function_bodies;
 -- Cleanup
 DROP SCHEMA temp_func_test CASCADE;
-NOTICE:  drop cascades to 35 other objects
+NOTICE:  drop cascades to 38 other objects
 DETAIL:  drop cascades to function functest_a_1(text,date)
 drop cascades to function functest_a_2(text[])
 drop cascades to function functest_a_3()
@@ -808,6 +824,9 @@ drop cascades to function create_and_insert()
 drop cascades to table ddl_test
 drop cascades to function alter_and_insert()
 drop cascades to function double_append(anyarray,anyelement)
+drop cascades to function part_hashint4_error(integer,bigint)
+drop cascades to operator family part_test_int4_ops_bad for access method hash
+drop cascades to table pt
 drop cascades to function test1(anyelement)
 DROP USER regress_unpriv_user;
 RESET search_path;
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 9ade7b835e6..8bc45a237f8 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -32,6 +32,20 @@ COMMENT ON INDEX six_wrong IS 'bad index';
 ERROR:  relation "six_wrong" does not exist
 COMMENT ON INDEX six IS 'good index';
 COMMENT ON INDEX six IS NULL;
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+ six_comment_is_null 
+---------------------
+ t
+(1 row)
+
+COMMENT ON INDEX six IS 'add the comment back';
+COMMENT ON INDEX six IS ''; -- empty string removes the comment, same as NULL
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+ six_comment_is_null 
+---------------------
+ t
+(1 row)
+
 --
 -- BTREE partial indices
 --
@@ -1624,8 +1638,8 @@ DROP TABLE cwi_test;
 --
 CREATE TABLE syscol_table (a INT);
 -- System columns cannot be indexed
-CREATE INDEX ON syscolcol_table (ctid);
-ERROR:  relation "syscolcol_table" does not exist
+CREATE INDEX ON syscol_table (ctid);
+ERROR:  index creation on system columns is not supported
 -- nor used in expressions
 CREATE INDEX ON syscol_table ((ctid >= '(1000,0)'));
 ERROR:  index creation on system columns is not supported
diff --git a/src/test/regress/expected/create_role.out b/src/test/regress/expected/create_role.out
index 46d4f9efe99..5d0f21820ed 100644
--- a/src/test/regress/expected/create_role.out
+++ b/src/test/regress/expected/create_role.out
@@ -102,6 +102,33 @@ CREATE ROLE regress_rolecreator CREATEROLE;
 CREATE ROLE regress_hasprivs CREATEROLE LOGIN INHERIT CONNECTION LIMIT 5;
 -- ok, we should be able to modify a role we created
 COMMENT ON ROLE regress_hasprivs IS 'some comment';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+ has_comment 
+-------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS NULL;
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+ no_comment 
+------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS 'add the comment back';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+ has_comment 
+-------------
+ t
+(1 row)
+
+COMMENT ON ROLE regress_hasprivs IS ''; -- empty string removes the comment, same as NULL
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+ no_comment 
+------------
+ t
+(1 row)
+
 ALTER ROLE regress_hasprivs RENAME TO regress_tenant;
 ALTER ROLE regress_tenant NOINHERIT NOLOGIN CONNECTION LIMIT 7;
 -- fail, we should be unable to modify a role we did not create
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index 76604705a93..90639ea0d89 100644
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -102,6 +102,18 @@ ERROR:  tables declared WITH OIDS are not supported
 -- but explicitly not adding oids is still supported
 CREATE TEMP TABLE withoutoid() WITHOUT OIDS; DROP TABLE withoutoid;
 CREATE TEMP TABLE withoutoid() WITH (oids = false); DROP TABLE withoutoid;
+-- temporary tables are ignored by pg_filenode_relation().
+CREATE TEMP TABLE relation_filenode_check(c1 int);
+SELECT relpersistence,
+  pg_filenode_relation (reltablespace, pg_relation_filenode(oid))
+  FROM pg_class
+  WHERE relname = 'relation_filenode_check';
+ relpersistence | pg_filenode_relation 
+----------------+----------------------
+ t              | 
+(1 row)
+
+DROP TABLE relation_filenode_check;
 -- check restriction with default expressions
 -- invalid use of column reference in default expressions
 CREATE TABLE default_expr_column (id int DEFAULT (id));
@@ -149,6 +161,12 @@ ALTER TABLE remember_node_subid ALTER c TYPE bigint;
 SAVEPOINT q; DROP TABLE remember_node_subid; ROLLBACK TO q;
 COMMIT;
 DROP TABLE remember_node_subid;
+-- generated NOT NULL constraint names must not collide with explicitly named constraints
+CREATE TABLE two_not_null_constraints (
+   col integer NOT NULL,
+   CONSTRAINT two_not_null_constraints_col_not_null CHECK (col IS NOT NULL)
+);
+DROP TABLE two_not_null_constraints;
 --
 -- Partitioned tables
 --
diff --git a/src/test/regress/expected/create_table_like.out b/src/test/regress/expected/create_table_like.out
index 29a779c2e90..feeb961fadd 100644
--- a/src/test/regress/expected/create_table_like.out
+++ b/src/test/regress/expected/create_table_like.out
@@ -320,6 +320,7 @@ DROP TABLE inhz;
 -- including storage and comments
 CREATE TABLE ctlt1 (a text CHECK (length(a) > 2) ENFORCED PRIMARY KEY,
 	b text CHECK (length(b) > 100) NOT ENFORCED);
+ALTER TABLE ctlt1 ADD CONSTRAINT cc CHECK (length(b) > 100) NOT VALID;
 CREATE INDEX ctlt1_b_key ON ctlt1 (b);
 CREATE INDEX ctlt1_fnidx ON ctlt1 ((a || b));
 CREATE STATISTICS ctlt1_a_b_stat ON a,b FROM ctlt1;
@@ -378,6 +379,7 @@ SELECT conname, description FROM pg_description, pg_constraint c WHERE classoid
 CREATE TABLE ctlt1_inh (LIKE ctlt1 INCLUDING CONSTRAINTS INCLUDING COMMENTS) INHERITS (ctlt1);
 NOTICE:  merging column "a" with inherited definition
 NOTICE:  merging column "b" with inherited definition
+NOTICE:  merging constraint "cc" with inherited definition
 NOTICE:  merging constraint "ctlt1_a_check" with inherited definition
 NOTICE:  merging constraint "ctlt1_b_check" with inherited definition
 \d+ ctlt1_inh
@@ -387,6 +389,7 @@ NOTICE:  merging constraint "ctlt1_b_check" with inherited definition
  a      | text |           | not null |         | main     |              | A
  b      | text |           |          |         | extended |              | B
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Not-null constraints:
@@ -409,6 +412,7 @@ NOTICE:  merging multiple inherited definitions of column "a"
  b      | text |           |          |         | extended |              | 
  c      | text |           |          |         | external |              | 
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
     "ctlt3_a_check" CHECK (length(a) < 5)
@@ -430,6 +434,7 @@ NOTICE:  merging column "a" with inherited definition
 Indexes:
     "ctlt13_like_expr_idx" btree ((a || c))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
     "ctlt3_a_check" CHECK (length(a) < 5)
@@ -456,6 +461,7 @@ Indexes:
     "ctlt_all_b_idx" btree (b)
     "ctlt_all_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -499,6 +505,7 @@ Indexes:
     "pg_attrdef_b_idx" btree (b)
     "pg_attrdef_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -524,6 +531,7 @@ Indexes:
     "ctlt1_b_idx" btree (b)
     "ctlt1_expr_idx" btree ((a || b))
 Check constraints:
+    "cc" CHECK (length(b) > 100)
     "ctlt1_a_check" CHECK (length(a) > 2)
     "ctlt1_b_check" CHECK (length(b) > 100) NOT ENFORCED
 Statistics objects:
@@ -686,6 +694,37 @@ SELECT attname, attcompression FROM pg_attribute
  e       | 
 (5 rows)
 
+-- LIKE ... INCLUDING STATISTICS with dropped columns in the parent,
+-- so stxkeys attnums are not contiguous.
+CREATE TABLE ctl_stats3_parent (a int, b int, c int);
+ALTER TABLE ctl_stats3_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats3_stat ON a, c FROM ctl_stats3_parent;
+CREATE TABLE ctl_stats3_child (LIKE ctl_stats3_parent INCLUDING STATISTICS);
+CREATE TABLE ctl_stats4_parent (a int, b int, c int, d int);
+ALTER TABLE ctl_stats4_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats4_stat ON a, c FROM ctl_stats4_parent;
+CREATE TABLE ctl_stats4_child (LIKE ctl_stats4_parent INCLUDING STATISTICS);
+SELECT s.stxrelid::regclass AS relation,
+       array_agg(a.attname ORDER BY u.ord) AS stats_columns
+FROM pg_statistic_ext s
+CROSS JOIN LATERAL
+  unnest(s.stxkeys::int2[]) WITH ORDINALITY AS u(attnum, ord)
+JOIN pg_attribute a
+  ON a.attrelid = s.stxrelid AND a.attnum = u.attnum
+WHERE s.stxrelid IN ('ctl_stats3_child'::regclass,
+                     'ctl_stats4_child'::regclass)
+GROUP BY s.stxrelid
+ORDER BY s.stxrelid::regclass::text;
+     relation     | stats_columns 
+------------------+---------------
+ ctl_stats3_child | {a,c}
+ ctl_stats4_child | {a,c}
+(2 rows)
+
+DROP TABLE ctl_stats3_parent;
+DROP TABLE ctl_stats3_child;
+DROP TABLE ctl_stats4_parent;
+DROP TABLE ctl_stats4_child;
 DROP TABLE ctl_table;
 DROP FOREIGN TABLE ctl_foreign_table1;
 DROP FOREIGN TABLE ctl_foreign_table2;
diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index ba6f05eeb7d..b5ea707df31 100644
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -1019,6 +1019,11 @@ insert into domain_test values (1, 2);
 -- should fail
 alter table domain_test add column c str_domain;
 ERROR:  domain str_domain does not allow null values
+-- disallow duplicated not-null constraints
+create domain int_domain1 as int constraint nn1 not null constraint nn2 not null;
+ERROR:  redundant NOT NULL constraint definition
+LINE 1: ...domain int_domain1 as int constraint nn1 not null constraint...
+                                                             ^
 create domain str_domain2 as text check (value <> 'foo') default 'foo';
 -- should fail
 alter table domain_test add column d str_domain2;
diff --git a/src/test/regress/expected/encoding.out b/src/test/regress/expected/encoding.out
new file mode 100644
index 00000000000..b3655527b0a
--- /dev/null
+++ b/src/test/regress/expected/encoding.out
@@ -0,0 +1,445 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/regress' :dlsuffix
+CREATE FUNCTION test_bytea_to_text(bytea) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_text_to_bytea(text) RETURNS bytea
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_mblen_func(text, text, text, int) RETURNS int
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_text_to_wchars(text, text) RETURNS int[]
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_wchars_to_text(text, int[]) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_valid_server_encoding(text) RETURNS boolean
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE TABLE regress_encoding(good text, truncated text, with_nul text, truncated_with_nul text);
+INSERT INTO regress_encoding
+VALUES ('café',
+        'caf' || test_bytea_to_text('\xc3'),
+        'café' || test_bytea_to_text('\x00') || 'dcba',
+        'caf' || test_bytea_to_text('\xc300') || 'dcba');
+SELECT good, truncated, with_nul FROM regress_encoding;
+ good | truncated | with_nul 
+------+-----------+----------
+ café | caf       | café
+(1 row)
+
+SELECT length(good) FROM regress_encoding;
+ length 
+--------
+      4
+(1 row)
+
+SELECT substring(good, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(good, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ é
+(1 row)
+
+SELECT regexp_replace(good, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ é
+(1 row)
+
+SELECT reverse(good) FROM regress_encoding;
+ reverse 
+---------
+ éfac
+(1 row)
+
+-- invalid short mb character = error
+SELECT length(truncated) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT substring(truncated, 1, 3) FROM regress_encoding;
+ substring 
+-----------
+ caf
+(1 row)
+
+SELECT substring(truncated, 1, 4) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT reverse(truncated) FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+-- invalid short mb character = silently dropped
+SELECT regexp_replace(truncated, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ caf
+(1 row)
+
+-- PostgreSQL doesn't allow strings to contain NUL.  If a corrupted string
+-- contains NUL at a character boundary position, some functions treat it as a
+-- character while others treat it as a terminator, as implementation details.
+-- NUL = terminator
+SELECT length(with_nul) FROM regress_encoding;
+ length 
+--------
+      4
+(1 row)
+
+SELECT substring(with_nul, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(with_nul, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ é
+(1 row)
+
+SELECT substring(with_nul, 5, 1) FROM regress_encoding;
+ substring 
+-----------
+ 
+(1 row)
+
+SELECT convert_to(substring(with_nul, 5, 1), 'UTF8') FROM regress_encoding;
+ convert_to 
+------------
+ \x
+(1 row)
+
+SELECT regexp_replace(with_nul, '^caf(.)$', '\1') FROM regress_encoding;
+ regexp_replace 
+----------------
+ é
+(1 row)
+
+-- NUL = character
+SELECT with_nul, reverse(with_nul), reverse(reverse(with_nul)) FROM regress_encoding;
+ with_nul | reverse | reverse 
+----------+---------+---------
+ café     | abcd    | café
+(1 row)
+
+-- If a corrupted string contains NUL in the tail bytes of a multibyte
+-- character (invalid in all encodings), it is considered part of the
+-- character for length purposes.  An error will only be raised in code paths
+-- that convert or verify encodings.
+SELECT length(truncated_with_nul) FROM regress_encoding;
+ length 
+--------
+      8
+(1 row)
+
+SELECT substring(truncated_with_nul, 3, 1) FROM regress_encoding;
+ substring 
+-----------
+ f
+(1 row)
+
+SELECT substring(truncated_with_nul, 4, 1) FROM regress_encoding;
+ substring 
+-----------
+ 
+(1 row)
+
+SELECT convert_to(substring(truncated_with_nul, 4, 1), 'UTF8') FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3 0x00
+SELECT substring(truncated_with_nul, 5, 1) FROM regress_encoding;
+ substring 
+-----------
+ d
+(1 row)
+
+SELECT regexp_replace(truncated_with_nul, '^caf(.)dcba$', '\1') = test_bytea_to_text('\xc300') FROM regress_encoding;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT reverse(truncated_with_nul) FROM regress_encoding;
+ reverse 
+---------
+ abcd
+(1 row)
+
+-- unbounded: sequence would overrun the string!
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+-- condition detected when using the length/range variants
+SELECT test_mblen_func('pg_mblen_with_len', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+SELECT test_mblen_func('pg_mblen_range', 'UTF8', truncated, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+-- unbounded: sequence would overrun the string, if the terminator were really
+-- the end of it
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+SELECT test_mblen_func('pg_encoding_mblen', 'GB18030', truncated_with_nul, 3)
+FROM regress_encoding;
+ test_mblen_func 
+-----------------
+               2
+(1 row)
+
+-- condition detected when using the cstr variants
+SELECT test_mblen_func('pg_mblen_cstr', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xc3
+DROP TABLE regress_encoding;
+-- mb<->wchar conversions
+CREATE FUNCTION test_encoding(encoding text, description text, input bytea)
+RETURNS VOID LANGUAGE plpgsql AS
+$$
+DECLARE
+	prefix text;
+	len int;
+	wchars int[];
+	round_trip bytea;
+	result text;
+BEGIN
+	prefix := rpad(encoding || ' ' || description || ':', 28);
+
+	-- XXX could also test validation, length functions and include client
+	-- only encodings with these test cases
+
+	IF test_valid_server_encoding(encoding) THEN
+		wchars := test_text_to_wchars(encoding, test_bytea_to_text(input));
+		round_trip = test_text_to_bytea(test_wchars_to_text(encoding, wchars));
+		if input = round_trip then
+			result := 'OK';
+		elsif length(input) > length(round_trip) and round_trip = substr(input, 1, length(round_trip)) then
+			result := 'truncated';
+		else
+			result := 'failed';
+		end if;
+		RAISE NOTICE '% % -> % -> % = %', prefix, input, wchars, round_trip, result;
+	END IF;
+END;
+$$;
+-- No validation is done on the encoding itself, just the length to avoid
+-- overruns, so some of the byte sequences below are bogus.  They cover
+-- all code branches, server encodings only for now.
+CREATE TABLE encoding_tests (encoding text, description text, input bytea);
+INSERT INTO encoding_tests VALUES
+	-- LATIN1, other single-byte encodings
+	('LATIN1', 'ASCII',    'a'),
+	('LATIN1', 'extended', '\xe9'),
+	-- EUC_JP, EUC_JIS_2004, EUR_KR (for the purposes of wchar conversion):
+	-- 2 8e (CS2, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 3 8f (CS3, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 2 80..ff (CS1)
+	('EUC_JP', 'ASCII',      'a'),
+	('EUC_JP', 'CS1, short', '\x80'),
+	('EUC_JP', 'CS1',        '\x8002'),
+	('EUC_JP', 'CS2, short', '\x8e'),
+	('EUC_JP', 'CS2',        '\x8e02'),
+	('EUC_JP', 'CS3, short', '\x8f'),
+	('EUC_JP', 'CS3, short', '\x8f02'),
+	('EUC_JP', 'CS3',        '\x8f0203'),
+	-- EUC_CN
+	-- 3 8e (CS2, not used but arbitrarily considered to have length 3)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_CN', 'ASCII',      'a'),
+	('EUC_CN', 'CS1, short', '\x80'),
+	('EUC_CN', 'CS1',        '\x8002'),
+	('EUC_CN', 'CS2, short', '\x8e'),
+	('EUC_CN', 'CS2, short', '\x8e02'),
+	('EUC_CN', 'CS2',        '\x8e0203'),
+	('EUC_CN', 'CS3, short', '\x8f'),
+	('EUC_CN', 'CS3, short', '\x8f02'),
+	('EUC_CN', 'CS3',        '\x8f0203'),
+	-- EUC_TW:
+	-- 4 8e (CS2)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_TW', 'ASCII',      'a'),
+	('EUC_TW', 'CS1, short', '\x80'),
+	('EUC_TW', 'CS1',        '\x8002'),
+	('EUC_TW', 'CS2, short', '\x8e'),
+	('EUC_TW', 'CS2, short', '\x8e02'),
+	('EUC_TW', 'CS2, short', '\x8e0203'),
+	('EUC_TW', 'CS2',        '\x8e020304'),
+	('EUC_TW', 'CS3, short', '\x8f'),
+	('EUC_TW', 'CS3, short', '\x8f02'),
+	('EUC_TW', 'CS3',        '\x8f0203'),
+	-- UTF8
+	-- 2 c0..df
+	-- 3 e0..ef
+	-- 4 f0..f7 (but maximum real codepoint U+10ffff has f4)
+	-- 5 f8..fb (not supported)
+	-- 6 fc..fd (not supported)
+	('UTF8',   'ASCII',               'a'),
+	('UTF8',   '2 byte, short',       '\xdf'),
+	('UTF8',   '2 byte',              '\xdf82'),
+	('UTF8',   '3 byte, short',       '\xef'),
+	('UTF8',   '3 byte, short',       '\xef82'),
+	('UTF8',   '3 byte',              '\xef8283'),
+	('UTF8',   '4 byte, short',       '\xf7'),
+	('UTF8',   '4 byte, short',       '\xf782'),
+	('UTF8',   '4 byte, short',       '\xf78283'),
+	('UTF8',   '4 byte',              '\xf7828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb'),
+	('UTF8',   '5 byte, unsupported', '\xfb82'),
+	('UTF8',   '5 byte, unsupported', '\xfb8283'),
+	('UTF8',   '5 byte, unsupported', '\xfb828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd'),
+	('UTF8',   '6 byte, unsupported', '\xfd82'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283'),
+	('UTF8',   '6 byte, unsupported', '\xfd828384'),
+	('UTF8',   '6 byte, unsupported', '\xfd82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283848586'),
+	-- MULE_INTERNAL
+	-- 2 81..8d LC1
+	-- 3 90..99 LC2
+	('MULE_INTERNAL', 'ASCII',         'a'),
+	('MULE_INTERNAL', 'LC1, short',    '\x81'),
+	('MULE_INTERNAL', 'LC1',           '\x8182'),
+	('MULE_INTERNAL', 'LC2, short',    '\x90'),
+	('MULE_INTERNAL', 'LC2, short',    '\x9082'),
+	('MULE_INTERNAL', 'LC2',           '\x908283');
+SELECT COUNT(test_encoding(encoding, description, input)) > 0
+FROM encoding_tests;
+NOTICE:  LATIN1 ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  LATIN1 extended:             \xe9 -> {233} -> \xe9 = OK
+NOTICE:  EUC_JP ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_JP CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_JP CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_JP CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_JP CS2:                  \x8e02 -> {36354} -> \x8e02 = OK
+NOTICE:  EUC_JP CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_JP CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_JP CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  EUC_CN ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_CN CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_CN CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_CN CS2, short:           \x8e02 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS2:                  \x8e0203 -> {9306627} -> \x8e0203 = OK
+NOTICE:  EUC_CN CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_CN CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_CN CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  EUC_TW ASCII:                \x61 -> {97} -> \x61 = OK
+NOTICE:  EUC_TW CS1, short:           \x80 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS1:                  \x8002 -> {32770} -> \x8002 = OK
+NOTICE:  EUC_TW CS2, short:           \x8e -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2, short:           \x8e02 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2, short:           \x8e0203 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS2:                  \x8e020304 -> {-1912470780} -> \x8e020304 = OK
+NOTICE:  EUC_TW CS3, short:           \x8f -> {} -> \x = truncated
+NOTICE:  EUC_TW CS3, short:           \x8f02 -> {} -> \x = truncated
+NOTICE:  EUC_TW CS3:                  \x8f0203 -> {9372163} -> \x8f0203 = OK
+NOTICE:  UTF8 ASCII:                  \x61 -> {97} -> \x61 = OK
+NOTICE:  UTF8 2 byte, short:          \xdf -> {} -> \x = truncated
+NOTICE:  UTF8 2 byte:                 \xdf82 -> {1986} -> \xdf82 = OK
+NOTICE:  UTF8 3 byte, short:          \xef -> {} -> \x = truncated
+NOTICE:  UTF8 3 byte, short:          \xef82 -> {} -> \x = truncated
+NOTICE:  UTF8 3 byte:                 \xef8283 -> {61571} -> \xef8283 = OK
+NOTICE:  UTF8 4 byte, short:          \xf7 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte, short:          \xf782 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte, short:          \xf78283 -> {} -> \x = truncated
+NOTICE:  UTF8 4 byte:                 \xf7828384 -> {1843396} -> \xf7828384 = OK
+NOTICE:  UTF8 5 byte, unsupported:    \xfb -> {251} -> \xc3bb = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb82 -> {251,130} -> \xc3bbc282 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb8283 -> {251,130,131} -> \xc3bbc282c283 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb828384 -> {251,130,131,132} -> \xc3bbc282c283c284 = failed
+NOTICE:  UTF8 5 byte, unsupported:    \xfb82838485 -> {251,130,131,132,133} -> \xc3bbc282c283c284c285 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd -> {253} -> \xc3bd = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd82 -> {253,130} -> \xc3bdc282 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd8283 -> {253,130,131} -> \xc3bdc282c283 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd828384 -> {253,130,131,132} -> \xc3bdc282c283c284 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd82838485 -> {253,130,131,132,133} -> \xc3bdc282c283c284c285 = failed
+NOTICE:  UTF8 6 byte, unsupported:    \xfd8283848586 -> {253,130,131,132,133,134} -> \xc3bdc282c283c284c285c286 = failed
+NOTICE:  MULE_INTERNAL ASCII:         \x61 -> {97} -> \x61 = OK
+NOTICE:  MULE_INTERNAL LC1, short:    \x81 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC1:           \x8182 -> {8454274} -> \x8182 = OK
+NOTICE:  MULE_INTERNAL LC2, short:    \x90 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC2, short:    \x9082 -> {} -> \x = truncated
+NOTICE:  MULE_INTERNAL LC2:           \x908283 -> {9470595} -> \x908283 = OK
+ ?column? 
+----------
+ t
+(1 row)
+
+-- substring fetches a slice of a toasted value; unused tail of that slice is
+-- an incomplete char (bug #19406)
+CREATE TABLE toast_3b_utf8 (c text);
+INSERT INTO toast_3b_utf8 VALUES (repeat(U&'\2026', 4000));
+SELECT SUBSTRING(c FROM 1 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ …
+(1 row)
+
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ 
+(1 row)
+
+-- diagnose incomplete char iff within the substring
+UPDATE toast_3b_utf8 SET c = c || test_bytea_to_text('\xe280');
+SELECT SUBSTRING(c FROM 4000 FOR 1) FROM toast_3b_utf8;
+ substring 
+-----------
+ …
+(1 row)
+
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+ERROR:  invalid byte sequence for encoding "UTF8": 0xe2 0x80
+-- substring needing last byte of its slice_size
+ALTER TABLE toast_3b_utf8 RENAME TO toast_4b_utf8;
+UPDATE toast_4b_utf8 SET c = repeat(U&'\+01F680', 3000);
+SELECT SUBSTRING(c FROM 3000 FOR 1) FROM toast_4b_utf8;
+ substring 
+-----------
+ 🚀
+(1 row)
+
+DROP TABLE encoding_tests;
+DROP TABLE toast_4b_utf8;
+DROP FUNCTION test_encoding;
+DROP FUNCTION test_wchars_to_text;
+DROP FUNCTION test_text_to_wchars;
+DROP FUNCTION test_valid_server_encoding;
+DROP FUNCTION test_mblen_func;
+DROP FUNCTION test_bytea_to_text;
+DROP FUNCTION test_text_to_bytea;
+-- substring slow path: multi-byte escape char vs. multi-byte pattern char.
+SELECT SUBSTRING('a' SIMILAR U&'\00AC' ESCAPE U&'\00A7');
+ substring 
+-----------
+ 
+(1 row)
+
+-- Levenshtein distance metric: exercise character length cache.
+SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+ERROR:  column "real§_name" does not exist
+LINE 1: SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+               ^
+HINT:  Perhaps you meant to reference the column "x.real_name".
+-- JSON errcontext: truncate long data.
+SELECT repeat(U&'\00A7', 30)::json;
+ERROR:  invalid input syntax for type json
+DETAIL:  Token "§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§" is invalid.
+CONTEXT:  JSON data, line 1: ...§§§§§§§§§§§§§§§§§§§§§§§§
diff --git a/src/test/regress/expected/encoding_1.out b/src/test/regress/expected/encoding_1.out
new file mode 100644
index 00000000000..a5b02090901
--- /dev/null
+++ b/src/test/regress/expected/encoding_1.out
@@ -0,0 +1,4 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/test/regress/expected/euc_kr.out b/src/test/regress/expected/euc_kr.out
new file mode 100644
index 00000000000..7a61c89a43a
--- /dev/null
+++ b/src/test/regress/expected/euc_kr.out
@@ -0,0 +1,16 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+-- Exercise is_multibyte_char_in_char (non-UTF8) slow path.
+SELECT POSITION(
+	convert_from('\xbcf6c7d0', 'EUC_KR') IN
+	convert_from('\xb0fac7d02c20bcf6c7d02c20b1e2bcfa2c20bbee', 'EUC_KR'));
+ position 
+----------
+        5
+(1 row)
+
diff --git a/src/test/regress/expected/euc_kr_1.out b/src/test/regress/expected/euc_kr_1.out
new file mode 100644
index 00000000000..faaac5d6355
--- /dev/null
+++ b/src/test/regress/expected/euc_kr_1.out
@@ -0,0 +1,6 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index 7b2198eac6f..16e4530708c 100644
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -228,9 +228,15 @@ INSERT INTO undroppable_objs VALUES
 ('table', 'schema_one.table_three'),
 ('table', 'audit_tbls.schema_two_table_three');
 CREATE TABLE dropped_objects (
-	type text,
-	schema text,
-	object text
+	object_type text,
+	schema_name text,
+	object_name text,
+	object_identity text,
+	address_names text[],
+	address_args text[],
+	is_temporary bool,
+	original bool,
+	normal bool
 );
 -- This tests errors raised within event triggers; the one in audit_tbls
 -- uses 2nd-level recursive invocation via test_evtrig_dropped_objects().
@@ -268,8 +274,12 @@ BEGIN
         END IF;
 
 	INSERT INTO dropped_objects
-		(type, schema, object) VALUES
-		(obj.object_type, obj.schema_name, obj.object_identity);
+		(object_type, schema_name, object_name,
+		 object_identity, address_names, address_args,
+		 is_temporary, original, normal) VALUES
+		(obj.object_type, obj.schema_name, obj.object_name,
+		 obj.object_identity, obj.address_names, obj.address_args,
+		 obj.is_temporary, obj.original, obj.normal);
     END LOOP;
 END
 $$;
@@ -325,42 +335,44 @@ NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
 NOTICE:  table "schema_one_table_one" does not exist, skipping
 NOTICE:  table "schema_one_table two" does not exist, skipping
 NOTICE:  table "schema_one_table_three" does not exist, skipping
-SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
-     type     |   schema   |               object                
---------------+------------+-------------------------------------
- table column | schema_one | schema_one.table_one.a
- schema       |            | schema_two
- table        | schema_two | schema_two.table_two
- type         | schema_two | schema_two.table_two
- type         | schema_two | schema_two.table_two[]
- table        | audit_tbls | audit_tbls.schema_two_table_three
- type         | audit_tbls | audit_tbls.schema_two_table_three
- type         | audit_tbls | audit_tbls.schema_two_table_three[]
- table        | schema_two | schema_two.table_three
- type         | schema_two | schema_two.table_three
- type         | schema_two | schema_two.table_three[]
- function     | schema_two | schema_two.add(integer,integer)
- aggregate    | schema_two | schema_two.newton(integer)
- schema       |            | schema_one
- table        | schema_one | schema_one.table_one
- type         | schema_one | schema_one.table_one
- type         | schema_one | schema_one.table_one[]
- table        | schema_one | schema_one."table two"
- type         | schema_one | schema_one."table two"
- type         | schema_one | schema_one."table two"[]
- table        | schema_one | schema_one.table_three
- type         | schema_one | schema_one.table_three
- type         | schema_one | schema_one.table_three[]
+-- exclude TOAST objects because they have unstable names
+SELECT * FROM dropped_objects
+  WHERE schema_name IS NULL OR schema_name <> 'pg_toast';
+ object_type  | schema_name |       object_name       |           object_identity           |             address_names             |   address_args    | is_temporary | original | normal 
+--------------+-------------+-------------------------+-------------------------------------+---------------------------------------+-------------------+--------------+----------+--------
+ table column | schema_one  |                         | schema_one.table_one.a              | {schema_one,table_one,a}              | {}                | f            | t        | f
+ schema       |             | schema_two              | schema_two                          | {schema_two}                          | {}                | f            | t        | f
+ table        | schema_two  | table_two               | schema_two.table_two                | {schema_two,table_two}                | {}                | f            | f        | t
+ type         | schema_two  | table_two               | schema_two.table_two                | {schema_two.table_two}                | {}                | f            | f        | f
+ type         | schema_two  | _table_two              | schema_two.table_two[]              | {schema_two.table_two[]}              | {}                | f            | f        | f
+ table        | audit_tbls  | schema_two_table_three  | audit_tbls.schema_two_table_three   | {audit_tbls,schema_two_table_three}   | {}                | f            | t        | f
+ type         | audit_tbls  | schema_two_table_three  | audit_tbls.schema_two_table_three   | {audit_tbls.schema_two_table_three}   | {}                | f            | f        | f
+ type         | audit_tbls  | _schema_two_table_three | audit_tbls.schema_two_table_three[] | {audit_tbls.schema_two_table_three[]} | {}                | f            | f        | f
+ table        | schema_two  | table_three             | schema_two.table_three              | {schema_two,table_three}              | {}                | f            | f        | t
+ type         | schema_two  | table_three             | schema_two.table_three              | {schema_two.table_three}              | {}                | f            | f        | f
+ type         | schema_two  | _table_three            | schema_two.table_three[]            | {schema_two.table_three[]}            | {}                | f            | f        | f
+ function     | schema_two  |                         | schema_two.add(integer,integer)     | {schema_two,add}                      | {integer,integer} | f            | f        | t
+ aggregate    | schema_two  |                         | schema_two.newton(integer)          | {schema_two,newton}                   | {integer}         | f            | f        | t
+ schema       |             | schema_one              | schema_one                          | {schema_one}                          | {}                | f            | t        | f
+ table        | schema_one  | table_one               | schema_one.table_one                | {schema_one,table_one}                | {}                | f            | f        | t
+ type         | schema_one  | table_one               | schema_one.table_one                | {schema_one.table_one}                | {}                | f            | f        | f
+ type         | schema_one  | _table_one              | schema_one.table_one[]              | {schema_one.table_one[]}              | {}                | f            | f        | f
+ table        | schema_one  | table two               | schema_one."table two"              | {schema_one,"table two"}              | {}                | f            | f        | t
+ type         | schema_one  | table two               | schema_one."table two"              | {"schema_one.\"table two\""}          | {}                | f            | f        | f
+ type         | schema_one  | _table two              | schema_one."table two"[]            | {"schema_one.\"table two\"[]"}        | {}                | f            | f        | f
+ table        | schema_one  | table_three             | schema_one.table_three              | {schema_one,table_three}              | {}                | f            | f        | t
+ type         | schema_one  | table_three             | schema_one.table_three              | {schema_one.table_three}              | {}                | f            | f        | f
+ type         | schema_one  | _table_three            | schema_one.table_three[]            | {schema_one.table_three[]}            | {}                | f            | f        | f
 (23 rows)
 
 DROP OWNED BY regress_evt_user;
 NOTICE:  schema "audit_tbls" does not exist, skipping
-SELECT * FROM dropped_objects WHERE type = 'schema';
-  type  | schema |   object   
---------+--------+------------
- schema |        | schema_two
- schema |        | schema_one
- schema |        | audit_tbls
+SELECT * FROM dropped_objects WHERE object_type = 'schema';
+ object_type | schema_name | object_name | object_identity | address_names | address_args | is_temporary | original | normal 
+-------------+-------------+-------------+-----------------+---------------+--------------+--------------+----------+--------
+ schema      |             | schema_two  | schema_two      | {schema_two}  | {}           | f            | t        | f
+ schema      |             | schema_one  | schema_one      | {schema_one}  | {}           | f            | t        | f
+ schema      |             | audit_tbls  | audit_tbls      | {audit_tbls}  | {}           | f            | t        | f
 (3 rows)
 
 DROP ROLE regress_evt_user;
@@ -378,9 +390,10 @@ BEGIN
     IF NOT r.normal AND NOT r.original THEN
         CONTINUE;
     END IF;
-    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% name=% args=%',
+    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
         r.original, r.normal, r.is_temporary, r.object_type,
-        r.object_identity, r.address_names, r.address_args;
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
     END LOOP;
 END; $$;
 CREATE EVENT TRIGGER regress_event_trigger_report_dropped ON sql_drop
@@ -436,18 +449,18 @@ CREATE TABLE evttrig.part_15_20 PARTITION OF evttrig.part_10_20 (id)
   FOR VALUES FROM (15) TO (20);
 NOTICE:  END: command_tag=CREATE TABLE type=table identity=evttrig.part_15_20
 ALTER TABLE evttrig.two DROP COLUMN col_c;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.two.col_c name={evttrig,two,col_c} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table constraint identity=two_col_c_check on evttrig.two name={evttrig,two,two_col_c_check} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.two.col_c schema=evttrig name=<NULL> addr={evttrig,two,col_c} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table constraint identity=two_col_c_check on evttrig.two schema=evttrig name=<NULL> addr={evttrig,two,two_col_c_check} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.two
 ALTER TABLE evttrig.one ALTER COLUMN col_b DROP DEFAULT;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=default value identity=for evttrig.one.col_b name={evttrig,one,col_b} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=default value identity=for evttrig.one.col_b schema=evttrig name=<NULL> addr={evttrig,one,col_b} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.one DROP CONSTRAINT one_pkey;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table constraint identity=one_pkey on evttrig.one name={evttrig,one,one_pkey} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table constraint identity=one_pkey on evttrig.one schema=evttrig name=<NULL> addr={evttrig,one,one_pkey} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.one DROP COLUMN col_c;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.one.col_c name={evttrig,one,col_c} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_c name={evttrig,one,col_c} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.one.col_c schema=evttrig name=<NULL> addr={evttrig,one,col_c} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_c schema=evttrig name=<NULL> addr={evttrig,one,col_c} args={}
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.one
 ALTER TABLE evttrig.id ALTER COLUMN col_d SET DATA TYPE bigint;
 NOTICE:  END: command_tag=ALTER SEQUENCE type=sequence identity=evttrig.id_col_d_seq
@@ -456,26 +469,90 @@ ALTER TABLE evttrig.id ALTER COLUMN col_d DROP IDENTITY,
   ALTER COLUMN col_d SET DATA TYPE int;
 NOTICE:  END: command_tag=ALTER TABLE type=table identity=evttrig.id
 DROP INDEX evttrig.one_idx;
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=index identity=evttrig.one_idx name={evttrig,one_idx} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=index identity=evttrig.one_idx schema=evttrig name=one_idx addr={evttrig,one_idx} args={}
 DROP SCHEMA evttrig CASCADE;
 NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to table evttrig.one
 drop cascades to table evttrig.two
 drop cascades to table evttrig.id
 drop cascades to table evttrig.parted
-NOTICE:  NORMAL: orig=t normal=f istemp=f type=schema identity=evttrig name={evttrig} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.one name={evttrig,one} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=sequence identity=evttrig.one_col_a_seq name={evttrig,one_col_a_seq} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_a name={evttrig,one,col_a} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.two name={evttrig,two} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.id name={evttrig,id} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.parted name={evttrig,parted} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_1_10 name={evttrig,part_1_10} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_20 name={evttrig,part_10_20} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_15 name={evttrig,part_10_15} args={}
-NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_15_20 name={evttrig,part_15_20} args={}
+NOTICE:  NORMAL: orig=t normal=f istemp=f type=schema identity=evttrig schema=<NULL> name=evttrig addr={evttrig} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.one schema=evttrig name=one addr={evttrig,one} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=sequence identity=evttrig.one_col_a_seq schema=evttrig name=one_col_a_seq addr={evttrig,one_col_a_seq} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_a schema=evttrig name=<NULL> addr={evttrig,one,col_a} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.two schema=evttrig name=two addr={evttrig,two} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.id schema=evttrig name=id addr={evttrig,id} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.parted schema=evttrig name=parted addr={evttrig,parted} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_1_10 schema=evttrig name=part_1_10 addr={evttrig,part_1_10} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_20 schema=evttrig name=part_10_20 addr={evttrig,part_10_20} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_15 schema=evttrig name=part_10_15 addr={evttrig,part_10_15} args={}
+NOTICE:  NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_15_20 schema=evttrig name=part_15_20 addr={evttrig,part_15_20} args={}
+DROP TABLE a_temp_tbl;
+NOTICE:  NORMAL: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp,a_temp_tbl} args={}
+-- check unfiltered results, too
+CREATE OR REPLACE FUNCTION event_trigger_report_dropped()
+ RETURNS event_trigger
+ LANGUAGE plpgsql
+AS $$
+DECLARE r record;
+BEGIN
+    FOR r IN SELECT * from pg_event_trigger_dropped_objects()
+    LOOP
+    RAISE NOTICE 'DROP: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
+        r.original, r.normal, r.is_temporary, r.object_type,
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
+    END LOOP;
+END; $$;
+NOTICE:  END: command_tag=CREATE FUNCTION type=function identity=public.event_trigger_report_dropped()
+CREATE FUNCTION event_trigger_dummy_trigger()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $$
+BEGIN
+    RETURN new;
+END; $$;
+NOTICE:  END: command_tag=CREATE FUNCTION type=function identity=public.event_trigger_dummy_trigger()
+CREATE TABLE evtrg_nontemp_table (f1 int primary key, f2 int default 42);
+NOTICE:  END: command_tag=CREATE TABLE type=table identity=public.evtrg_nontemp_table
+NOTICE:  END: command_tag=CREATE INDEX type=index identity=public.evtrg_nontemp_table_pkey
+CREATE TRIGGER evtrg_nontemp_trig
+  BEFORE INSERT ON evtrg_nontemp_table
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+NOTICE:  END: command_tag=CREATE TRIGGER type=trigger identity=evtrg_nontemp_trig on public.evtrg_nontemp_table
+CREATE POLICY evtrg_nontemp_pol ON evtrg_nontemp_table USING (f2 > 0);
+NOTICE:  END: command_tag=CREATE POLICY type=policy identity=evtrg_nontemp_pol on public.evtrg_nontemp_table
+DROP TABLE evtrg_nontemp_table;
+NOTICE:  DROP: orig=t normal=f istemp=f type=table identity=public.evtrg_nontemp_table schema=public name=evtrg_nontemp_table addr={public,evtrg_nontemp_table} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=type identity=public.evtrg_nontemp_table schema=public name=evtrg_nontemp_table addr={public.evtrg_nontemp_table} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=type identity=public.evtrg_nontemp_table[] schema=public name=_evtrg_nontemp_table addr={public.evtrg_nontemp_table[]} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=default value identity=for public.evtrg_nontemp_table.f2 schema=public name=<NULL> addr={public,evtrg_nontemp_table,f2} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=table constraint identity=evtrg_nontemp_table_f1_not_null on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_table_f1_not_null} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=table constraint identity=evtrg_nontemp_table_pkey on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_table_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=index identity=public.evtrg_nontemp_table_pkey schema=public name=evtrg_nontemp_table_pkey addr={public,evtrg_nontemp_table_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=f type=trigger identity=evtrg_nontemp_trig on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_trig} args={}
+NOTICE:  DROP: orig=f normal=t istemp=f type=policy identity=evtrg_nontemp_pol on public.evtrg_nontemp_table schema=public name=<NULL> addr={public,evtrg_nontemp_table,evtrg_nontemp_pol} args={}
+CREATE TEMP TABLE a_temp_tbl (f1 int primary key, f2 int default 42);
+NOTICE:  END: command_tag=CREATE TABLE type=table identity=pg_temp.a_temp_tbl
+NOTICE:  END: command_tag=CREATE INDEX type=index identity=pg_temp.a_temp_tbl_pkey
+CREATE TRIGGER a_temp_trig
+  BEFORE INSERT ON a_temp_tbl
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+NOTICE:  END: command_tag=CREATE TRIGGER type=trigger identity=a_temp_trig on pg_temp.a_temp_tbl
+CREATE POLICY a_temp_pol ON a_temp_tbl USING (f2 > 0);
+NOTICE:  END: command_tag=CREATE POLICY type=policy identity=a_temp_pol on pg_temp.a_temp_tbl
 DROP TABLE a_temp_tbl;
-NOTICE:  NORMAL: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl name={pg_temp,a_temp_tbl} args={}
+NOTICE:  DROP: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp,a_temp_tbl} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=type identity=pg_temp.a_temp_tbl schema=pg_temp name=a_temp_tbl addr={pg_temp.a_temp_tbl} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=type identity=pg_temp.a_temp_tbl[] schema=pg_temp name=_a_temp_tbl addr={pg_temp.a_temp_tbl[]} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=default value identity=for pg_temp.a_temp_tbl.f2 schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,f2} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=table constraint identity=a_temp_tbl_f1_not_null on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_tbl_f1_not_null} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=table constraint identity=a_temp_tbl_pkey on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_tbl_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=index identity=pg_temp.a_temp_tbl_pkey schema=pg_temp name=a_temp_tbl_pkey addr={pg_temp,a_temp_tbl_pkey} args={}
+NOTICE:  DROP: orig=f normal=f istemp=t type=trigger identity=a_temp_trig on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_trig} args={}
+NOTICE:  DROP: orig=f normal=t istemp=t type=policy identity=a_temp_pol on pg_temp.a_temp_tbl schema=pg_temp name=<NULL> addr={pg_temp,a_temp_tbl,a_temp_pol} args={}
+DROP FUNCTION event_trigger_dummy_trigger();
+NOTICE:  DROP: orig=t normal=f istemp=f type=function identity=public.event_trigger_dummy_trigger() schema=public name=<NULL> addr={public,event_trigger_dummy_trigger} args={}
 -- CREATE OPERATOR CLASS without FAMILY clause should report
 -- both CREATE OPERATOR FAMILY and CREATE OPERATOR CLASS
 CREATE OPERATOR CLASS evttrigopclass FOR TYPE int USING btree AS STORAGE int;
diff --git a/src/test/regress/expected/expressions.out b/src/test/regress/expected/expressions.out
index 21c54fc1989..f9bb55e22e0 100644
--- a/src/test/regress/expected/expressions.out
+++ b/src/test/regress/expected/expressions.out
@@ -386,42 +386,177 @@ default for type myint using hash as
   operator    1   =  (myint, myint),
   function    1   myinthash(myint);
 create table inttest (a myint);
-insert into inttest values(1::myint),(null);
--- try an array with enough elements to cause hashing
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
- 1
- 
-(2 rows)
+insert into inttest values (null), (0::myint), (1::myint);
+-- Test EEOP_HASHED_SCALARARRAYOP against EEOP_SCALARARRAYOP.  Ensure the
+-- result of non-hashed vs hashed is the same.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | f          | f
+ 1 | t          | t
+(3 rows)
 
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
-(0 rows)
-
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
- a 
----
-(0 rows)
-
--- ensure the result matched with the non-hashed version.  We simply remove
--- some array elements so that we don't reach the hashing threshold.
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
- 1
- 
-(2 rows)
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | t          | t
+ 0 |            | 
+ 1 | t          | t
+(3 rows)
 
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
-(0 rows)
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | t          | t
+ 1 | f          | f
+(3 rows)
 
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint, null);
- a 
----
-(0 rows)
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | f          | f
+ 0 |            | 
+ 1 | f          | f
+(3 rows)
+
+-- Now make the equal function return false when given two NULLs
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return $1::int = $2::int;
+  end if;
+end;
+$$ language plpgsql immutable;
+-- And try the same again to ensure EEOP_HASHED_SCALARARRAYOP does the same
+-- thing as EEOP_SCALARARRAYOP.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | f          | f
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 |            | 
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 | t          | t
+ 1 | f          | f
+(3 rows)
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   |            | 
+ 0 |            | 
+ 1 | f          | f
+(3 rows)
+
+-- Try again with an equality function that treats NULLs as equal to 0.
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return coalesce($1::int,0) = coalesce($2::int, 0);
+  end if;
+end;
+$$ language plpgsql immutable;
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+ a | not_hashed | hashed | not_hashed_zero | hashed_zero 
+---+------------+--------+-----------------+-------------
+   | f          | f      | t               | t
+ 0 | f          | f      | t               | t
+ 1 | t          | t      | t               | t
+(3 rows)
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | f          | f
+ 0 | t          | t
+ 1 | t          | t
+(3 rows)
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+ a | not_hashed | hashed | not_hashed_zero | hashed_zero 
+---+------------+--------+-----------------+-------------
+   | t          | t      | f               | f
+ 0 | t          | t      | f               | f
+ 1 | f          | f      | f               | f
+(3 rows)
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+ a | not_hashed | hashed 
+---+------------+--------
+   | t          | t
+ 0 | f          | f
+ 1 | f          | f
+(3 rows)
 
 rollback;
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index cce49e509ab..35d75180dff 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -106,6 +106,13 @@ ERROR:  conflicting or redundant options
 LINE 1: ...GN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER in...
                                                              ^
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+-- should preserve dependency on test_fdw_handler
+ALTER FOREIGN DATA WRAPPER test_fdw VALIDATOR postgresql_fdw_validator;
+WARNING:  changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid
+DROP FUNCTION test_fdw_handler(); -- ERROR
+ERROR:  cannot drop function test_fdw_handler() because other objects depend on it
+DETAIL:  foreign-data wrapper test_fdw depends on function test_fdw_handler()
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 DROP FOREIGN DATA WRAPPER test_fdw;
 -- ALTER FOREIGN DATA WRAPPER
 ALTER FOREIGN DATA WRAPPER foo OPTIONS (nonexistent 'fdw');         -- ERROR
@@ -828,10 +835,13 @@ COMMENT ON COLUMN ft1.c1 IS NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c5 integer DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE ft1 ADD COLUMN IF NOT EXISTS c6 integer;
+NOTICE:  column "c6" of relation "ft1" already exists, skipping
 ALTER FOREIGN TABLE ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE ft1 ADD c11 integer;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
@@ -863,6 +873,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET STORAGE PLAIN;
  c8     | text    |           |          |         | (p2 'V2')                      | plain    |              | 
  c9     | integer |           |          |         |                                | plain    |              | 
  c10    | integer |           |          |         | (p1 'v1')                      | plain    |              | 
+ c11    | integer |           |          |         |                                | plain    |              | 
 Check constraints:
     "ft1_c2_check" CHECK (c2 <> ''::text)
     "ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date)
@@ -897,6 +908,7 @@ ERROR:  column "no_column" of relation "ft1" does not exist
 ALTER FOREIGN TABLE ft1 DROP COLUMN IF EXISTS no_column;
 NOTICE:  column "no_column" of relation "ft1" does not exist, skipping
 ALTER FOREIGN TABLE ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE ft1 DROP c11;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
@@ -931,6 +943,8 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c4 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c6 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN IF NOT EXISTS c6 integer;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c7 integer NOT NULL;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c8 integer;
@@ -939,6 +953,8 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c9 integer;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD c11 integer;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c6 SET NOT NULL;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c7 DROP NOT NULL;
@@ -960,10 +976,14 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OWNER TO regress_test_role;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN no_column;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN IF EXISTS no_column;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN c9;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP c11;
+NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 SET SCHEMA foreign_schema;
 NOTICE:  relation "doesnt_exist_ft1" does not exist, skipping
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME c1 TO foreign_column_1;
diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index 6a8f3959345..be07bf26a33 100644
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -1157,6 +1157,59 @@ INSERT INTO fktable VALUES (500, 1000);
 ERROR:  insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey"
 DETAIL:  Key (fk)=(1000) is not present in table "pktable".
 COMMIT;
+-- Check that the existing FK trigger is both deferrable and initially deferred
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+     conname     |  tgrel  |          tgname          | tgtype | tgdeferrable | tginitdeferred 
+-----------------+---------+--------------------------+--------+--------------+----------------
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |      9 | t            | t
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |     17 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |      5 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |     17 | t            | t
+(4 rows)
+
+-- Changing the constraint to NOT ENFORCED drops the associated FK triggers
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey NOT ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+ conname | tgrel | tgname | tgtype | tgdeferrable | tginitdeferred 
+---------+-------+--------+--------+--------------+----------------
+(0 rows)
+
+-- Changing it back to ENFORCED will recreate the necessary FK triggers
+-- that are deferrable and initially deferred
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+     conname     |  tgrel  |          tgname          | tgtype | tgdeferrable | tginitdeferred 
+-----------------+---------+--------------------------+--------+--------------+----------------
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |      9 | t            | t
+ fktable_fk_fkey | pktable | RI_ConstraintTrigger_a_N |     17 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |      5 | t            | t
+ fktable_fk_fkey | fktable | RI_ConstraintTrigger_c_N |     17 | t            | t
+(4 rows)
+
+-- Verify that a deferrable, initially deferred foreign key still works
+-- as expected after being set to NOT ENFORCED and then re-enabled
+BEGIN;
+-- doesn't match PK, but no error yet
+INSERT INTO fktable VALUES (2, 20);
+-- should catch error from INSERT at commit
+COMMIT;
+ERROR:  insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey"
+DETAIL:  Key (fk)=(20) is not present in table "pktable".
 DROP TABLE fktable, pktable;
 -- tricky behavior: according to SQL99, if a deferred constraint is set
 -- to 'immediate' mode, it should be checked for validity *immediately*,
@@ -1359,7 +1412,7 @@ LINE 1: ...e ALTER CONSTRAINT fktable_fk_fkey NOT DEFERRABLE INITIALLY ...
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NO INHERIT;
 ERROR:  constraint "fktable_fk_fkey" of relation "fktable" is not a not-null constraint
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NOT VALID;
-ERROR:  FOREIGN KEY constraints cannot be marked NOT VALID
+ERROR:  constraints cannot be altered to be NOT VALID
 LINE 1: ...ER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey NOT VALID;
                                                              ^
 ALTER TABLE fktable ALTER CONSTRAINT fktable_fk_fkey ENFORCED NOT ENFORCED;
@@ -1750,7 +1803,7 @@ Indexes:
 Referenced by:
     TABLE "fk_partitioned_fk" CONSTRAINT "fk_partitioned_fk_a_b_fkey" FOREIGN KEY (a, b) REFERENCES fk_notpartitioned_pk(a, b)
 
--- Check the exsting FK trigger
+-- Check the existing FK trigger
 SELECT conname, tgrelid::regclass as tgrel, regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype
 FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
 WHERE tgrelid IN (SELECT relid FROM pg_partition_tree('fk_partitioned_fk'::regclass)
@@ -3406,3 +3459,54 @@ SET client_min_messages TO warning;
 DROP SCHEMA fkpart12 CASCADE;
 RESET client_min_messages;
 RESET search_path;
+-- Exercise the column mapping code with foreign keys.  In this test we'll
+-- create a partitioned table which has a partition with a dropped column and
+-- check to ensure that an UPDATE cascades the changes correctly to the
+-- partitioned table.
+CREATE SCHEMA fkpart13;
+SET search_path TO fkpart13;
+CREATE TABLE fkpart13_t1 (a int PRIMARY KEY);
+CREATE TABLE fkpart13_t2 (
+  part_id int PRIMARY KEY,
+  column_to_drop int,
+  FOREIGN KEY (part_id) REFERENCES fkpart13_t1 ON UPDATE CASCADE ON DELETE CASCADE
+) PARTITION BY LIST (part_id);
+CREATE TABLE fkpart13_t2_p1 PARTITION OF fkpart13_t2 FOR VALUES IN (1);
+-- drop the column
+ALTER TABLE fkpart13_t2 DROP COLUMN column_to_drop;
+-- create a new partition without the dropped column
+CREATE TABLE fkpart13_t2_p2 PARTITION OF fkpart13_t2 FOR VALUES IN (2);
+CREATE TABLE fkpart13_t3 (
+  a int NOT NULL,
+  FOREIGN KEY (a)
+    REFERENCES fkpart13_t2
+    ON UPDATE CASCADE ON DELETE CASCADE
+);
+INSERT INTO fkpart13_t1 (a) VALUES (1);
+INSERT INTO fkpart13_t2 (part_id) VALUES (1);
+INSERT INTO fkpart13_t3 (a) VALUES (1);
+-- Test a cascading update works correctly with with the dropped column
+UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+SELECT tableoid::regclass,* FROM fkpart13_t2;
+    tableoid    | part_id 
+----------------+---------
+ fkpart13_t2_p2 |       2
+(1 row)
+
+SELECT tableoid::regclass,* FROM fkpart13_t3;
+  tableoid   | a 
+-------------+---
+ fkpart13_t3 | 2
+(1 row)
+
+-- Exercise code in ExecGetTriggerResultRel() as there's been previous issues
+-- with ResultRelInfos being returned with the incorrect ri_RootResultRelInfo
+WITH cte AS (
+  UPDATE fkpart13_t2_p1 SET part_id = part_id
+) UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+DROP SCHEMA fkpart13 CASCADE;
+NOTICE:  drop cascades to 3 other objects
+DETAIL:  drop cascades to table fkpart13_t1
+drop cascades to table fkpart13_t2
+drop cascades to table fkpart13_t3
+RESET search_path;
diff --git a/src/test/regress/expected/generated_stored.out b/src/test/regress/expected/generated_stored.out
index 16de30ab191..86a04548a02 100644
--- a/src/test/regress/expected/generated_stored.out
+++ b/src/test/regress/expected/generated_stored.out
@@ -502,6 +502,12 @@ COPY gtest1 FROM stdin;
 COPY gtest1 (a, b) FROM stdin;
 ERROR:  column "b" is a generated column
 DETAIL:  Generated columns cannot be used in COPY.
+COPY gtest1 FROM stdin WHERE b <> 10;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
 SELECT * FROM gtest1 ORDER BY a;
  a | b 
 ---+---
@@ -1074,11 +1080,26 @@ ERROR:  cannot use generated column in partition key
 LINE 1: ...ENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE (f3);
                                                                    ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
+                                                                 ^
+DETAIL:  Column "f3" is a generated column.
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
 ERROR:  cannot use generated column in partition key
 LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
                                                              ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key is not null));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...ED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
 INSERT INTO gtest25 VALUES (3), (4);
@@ -1313,6 +1334,18 @@ CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c te
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
 ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+-- bug #18970: these cases are unsupported, but make sure they fail cleanly
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+DROP STATISTICS gtest31_2_stat;
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
 DROP TABLE gtest31_1, gtest31_2;
 -- Check it for a partitioned table, too
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c text) PARTITION BY LIST (a);
@@ -1494,6 +1527,40 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
  c      | integer |           |          | 
  x      | integer |           |          | generated always as (b * 2) stored
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) STORED);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+ op  | old_b | new_b 
+-----+-------+-------
+ INS |       |     2
+ UPD |     2 |    20
+ UPD |    20 |    40
+(3 rows)
+
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+ a  | b  
+----+----
+ 20 | 40
+(1 row)
+
+DROP TABLE gtest_rule;
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
  attrelid | attname | attgenerated 
diff --git a/src/test/regress/expected/generated_virtual.out b/src/test/regress/expected/generated_virtual.out
index df704b5166f..171d68ba2e2 100644
--- a/src/test/regress/expected/generated_virtual.out
+++ b/src/test/regress/expected/generated_virtual.out
@@ -496,6 +496,12 @@ COPY gtest1 FROM stdin;
 COPY gtest1 (a, b) FROM stdin;
 ERROR:  column "b" is a generated column
 DETAIL:  Generated columns cannot be used in COPY.
+COPY gtest1 FROM stdin WHERE b <> 10;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+ERROR:  generated columns are not supported in COPY FROM WHERE conditions
+DETAIL:  Column "b" is a generated column.
 SELECT * FROM gtest1 ORDER BY a;
  a | b 
 ---+---
@@ -1036,11 +1042,26 @@ ERROR:  cannot use generated column in partition key
 LINE 1: ...NERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE (f3);
                                                                    ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...RATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
+                                                                 ^
+DETAIL:  Column "f3" is a generated column.
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
 ERROR:  cannot use generated column in partition key
 LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
                                                              ^
 DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key is not null));
+ERROR:  cannot use generated column in partition key
+LINE 1: ...D ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_par...
+                                                             ^
+DETAIL:  Column "f3" is a generated column.
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
 INSERT INTO gtest25 VALUES (3), (4);
@@ -1283,6 +1304,15 @@ CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c t
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
 ERROR:  cannot alter table "gtest31_1" because column "gtest31_2.y" uses its row type
+-- bug #18970
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
 DROP TABLE gtest31_1, gtest31_2;
 -- Check it for a partitioned table, too
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c text) PARTITION BY LIST (a);
@@ -1464,6 +1494,40 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
  c      | integer |           |          | 
  x      | integer |           |          | generated always as (b * 2)
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) VIRTUAL);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+ op  | old_b | new_b 
+-----+-------+-------
+ INS |       |     2
+ UPD |     2 |    20
+ UPD |    20 |    40
+(3 rows)
+
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+ a  | b  
+----+----
+ 20 | 40
+(1 row)
+
+DROP TABLE gtest_rule;
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
  attrelid | attname | attgenerated 
@@ -1605,3 +1669,104 @@ select * from gtest32 t group by grouping sets (a, b, c, d, e) having c = 20;
 -- Ensure that the virtual generated columns in ALTER COLUMN TYPE USING expression are expanded
 alter table gtest32 alter column e type bigint using b;
 drop table gtest32;
+-- Ensure that virtual generated columns in constraint expressions are expanded
+create table gtest33 (a int, b int generated always as (a * 2) virtual not null, check (b > 10));
+set constraint_exclusion to on;
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b < 10;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b is null;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+reset constraint_exclusion;
+drop table gtest33;
+-- Ensure that EXCLUDED.<virtual-generated-column> in INSERT ... ON CONFLICT
+-- DO UPDATE is expanded to the generation expression, both for plain and
+-- partitioned target relations.
+create table gtest34 (id int primary key, a int,
+                      c int generated always as (a * 10) virtual);
+insert into gtest34 values (1, 5);
+insert into gtest34 values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+ id | a  |  c  
+----+----+-----
+  1 | 70 | 700
+(1 row)
+
+insert into gtest34 values (1, 2)
+    on conflict (id) do update set a = gtest34.c + excluded.c returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 720 | 7200
+(1 row)
+
+insert into gtest34 values (1, 3)
+    on conflict (id) do update set a = 999 where excluded.c > 20 returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 999 | 9990
+(1 row)
+
+drop table gtest34;
+create table gtest34p (id int primary key, a int,
+                       c int generated always as (a * 10) virtual)
+    partition by range (id);
+create table gtest34p_1 partition of gtest34p for values from (1) to (100);
+insert into gtest34p values (1, 5);
+insert into gtest34p values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+ id | a  |  c  
+----+----+-----
+  1 | 70 | 700
+(1 row)
+
+insert into gtest34p values (1, 2)
+    on conflict (id) do update set a = gtest34p.c + excluded.c returning *;
+ id |  a  |  c   
+----+-----+------
+  1 | 720 | 7200
+(1 row)
+
+drop table gtest34p;
+-- Ensure that virtual generated columns work with WHERE CURRENT OF
+create table gtest_cursor (id int primary key, a int, b int generated always as (a * 2) virtual);
+insert into gtest_cursor values (1, 10), (2, 20), (3, 30);
+begin;
+declare curs cursor for select * from gtest_cursor order by id for update;
+fetch 1 from curs;
+ id | a  | b  
+----+----+----
+  1 | 10 | 20
+(1 row)
+
+update gtest_cursor set a = 99 where current of curs;
+select * from gtest_cursor order by id;
+ id | a  |  b  
+----+----+-----
+  1 | 99 | 198
+  2 | 20 |  40
+  3 | 30 |  60
+(3 rows)
+
+delete from gtest_cursor where current of curs;
+select * from gtest_cursor order by id;
+ id | a  | b  
+----+----+----
+  2 | 20 | 40
+  3 | 30 | 60
+(2 rows)
+
+commit;
+drop table gtest_cursor;
diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out
index 35e4cb47ebe..ca6f2207ab1 100644
--- a/src/test/regress/expected/groupingsets.out
+++ b/src/test/regress/expected/groupingsets.out
@@ -463,6 +463,101 @@ select x, y || 'y'
    | 3y
 (8 rows)
 
+-- check that operands wrapped in PlaceHolderVars are capable of index matching
+begin;
+set local enable_bitmapscan = off;
+explain (costs off)
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Sort
+   Sort Key: tenk1.unique1, tenk1.unique2
+   ->  GroupAggregate
+         Group Key: tenk1.unique1
+         Sort Key: tenk1.unique2
+           Group Key: tenk1.unique2
+         ->  Index Scan using tenk1_unique1 on tenk1
+               Index Cond: (unique1 = 1)
+(8 rows)
+
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+explain (costs off)
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Sort
+   Sort Key: ((tenk1.unique1)::oid), tenk1.unique2
+   ->  GroupAggregate
+         Group Key: ((tenk1.unique1)::oid)
+         Sort Key: tenk1.unique2
+           Group Key: tenk1.unique2
+         ->  Sort
+               Sort Key: ((tenk1.unique1)::oid)
+               ->  Index Scan using tenk1_unique1 on tenk1
+                     Index Cond: (((unique1)::oid)::integer = 1)
+(10 rows)
+
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+explain (costs off)
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Sort
+   Sort Key: t1.unique1, t1.unique2
+   ->  GroupAggregate
+         Group Key: t1.unique1
+         Sort Key: t1.unique2
+           Group Key: t1.unique2
+         ->  Nested Loop
+               ->  Index Scan using tenk1_unique1 on tenk1 t1
+                     Index Cond: (unique1 = 1)
+               ->  Index Only Scan using tenk1_hundred on tenk1 t2
+(10 rows)
+
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+ x |  y   
+---+------
+ 1 |     
+   | 2838
+(2 rows)
+
+rollback;
 -- check qual push-down rules for a subquery with grouping sets
 explain (verbose, costs off)
 select * from (
@@ -889,7 +984,8 @@ explain (costs off)
                        ->  Seq Scan on gstest2
 (10 rows)
 
--- test pushdown of HAVING clause that does not reference any columns that are nullable by grouping sets
+-- test pushdown of non-degenerate HAVING clause that does not reference any
+-- columns that are nullable by grouping sets
 explain (costs off)
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
            QUERY PLAN            
@@ -910,6 +1006,82 @@ select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a
  2 | 2 |     1
 (1 row)
 
+explain (costs off)
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+           QUERY PLAN            
+---------------------------------
+ GroupAggregate
+   Group Key: b, a
+   Group Key: b
+   ->  Sort
+         Sort Key: b, a
+         ->  Seq Scan on gstest2
+               Filter: (b > 1)
+(7 rows)
+
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+ a | b | count 
+---+---+-------
+ 1 | 2 |     1
+ 2 | 2 |     1
+   | 2 |     2
+(3 rows)
+
+-- test pushdown of degenerate HAVING clause
+explain (costs off)
+select count(*) from gstest2 group by grouping sets (()) having false;
+           QUERY PLAN           
+--------------------------------
+ Aggregate
+   Group Key: ()
+   Filter: false
+   ->  Result
+         One-Time Filter: false
+(5 rows)
+
+select count(*) from gstest2 group by grouping sets (()) having false;
+ count 
+-------
+(0 rows)
+
+explain (costs off)
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+              QUERY PLAN              
+--------------------------------------
+ GroupAggregate
+   Group Key: a
+   Group Key: ()
+   Filter: false
+   ->  Sort
+         Sort Key: a
+         ->  Result
+               One-Time Filter: false
+(8 rows)
+
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+ a | count 
+---+-------
+(0 rows)
+
+explain (costs off)
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+              QUERY PLAN              
+--------------------------------------
+ GroupAggregate
+   Group Key: a
+   Sort Key: b
+     Group Key: b
+   ->  Sort
+         Sort Key: a
+         ->  Result
+               One-Time Filter: false
+(8 rows)
+
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+ a | b | count 
+---+---+-------
+(0 rows)
+
 -- HAVING with GROUPING queries
 select ten, grouping(ten) from onek
 group by grouping sets(ten) having grouping(ten) >= 0
@@ -2481,4 +2653,71 @@ group by grouping sets((a, b), (a));
  2 | 2 |          4
 (4 rows)
 
+-- test handling of SRFs with grouping sets
+explain (verbose, costs off)
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Sort
+   Output: (generate_series(1, "*VALUES*".column1))
+   Sort Key: (generate_series(1, "*VALUES*".column1))
+   ->  MixedAggregate
+         Output: (generate_series(1, "*VALUES*".column1))
+         Hash Key: generate_series(1, "*VALUES*".column1)
+         Group Key: ()
+         ->  ProjectSet
+               Output: generate_series(1, "*VALUES*".column1)
+               ->  Values Scan on "*VALUES*"
+                     Output: "*VALUES*".column1
+(11 rows)
+
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+ g 
+---
+ 1
+ 2
+  
+(3 rows)
+
+explain (verbose, costs off)
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Sort
+   Output: (generate_series(1, "*VALUES*".column1)), (("*VALUES*".column1 + "*VALUES*".column2)), "*VALUES*".column1
+   Sort Key: (generate_series(1, "*VALUES*".column1)), (("*VALUES*".column1 + "*VALUES*".column2))
+   ->  ProjectSet
+         Output: generate_series(1, "*VALUES*".column1), (("*VALUES*".column1 + "*VALUES*".column2)), "*VALUES*".column1
+         ->  MixedAggregate
+               Output: "*VALUES*".column1, (("*VALUES*".column1 + "*VALUES*".column2))
+               Hash Key: "*VALUES*".column1, ("*VALUES*".column1 + "*VALUES*".column2)
+               Hash Key: "*VALUES*".column1
+               Group Key: ()
+               ->  Values Scan on "*VALUES*"
+                     Output: ("*VALUES*".column1 + "*VALUES*".column2), "*VALUES*".column1
+(12 rows)
+
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+ g | ab 
+---+----
+ 1 |  2
+ 1 |  4
+ 1 |   
+ 1 |   
+ 2 |  4
+ 2 |   
+(6 rows)
+
 -- end
diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out
index 0d4bdb2adef..04035400f12 100644
--- a/src/test/regress/expected/hash_index.out
+++ b/src/test/regress/expected/hash_index.out
@@ -40,6 +40,8 @@ CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
 CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops)
   WITH (fillfactor=60);
+CREATE INDEX hash_i4_partial_index ON hash_i4_heap USING hash (seqno)
+  WHERE seqno = 9999;
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.
@@ -131,6 +133,25 @@ SELECT * FROM hash_f8_heap
 -------+--------
 (0 rows)
 
+--
+-- partial hash index
+--
+EXPLAIN (COSTS OFF)
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Index Scan using hash_i4_partial_index on hash_i4_heap
+   Index Cond: (seqno = 9999)
+(2 rows)
+
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+ seqno |   random   
+-------+------------
+  9999 | 1227676208
+(1 row)
+
 --
 -- hash index
 -- grep '^90[^0-9]' hashovfl.data
diff --git a/src/test/regress/expected/indexing.out b/src/test/regress/expected/indexing.out
index bcf1db11d73..b8d7d3047be 100644
--- a/src/test/regress/expected/indexing.out
+++ b/src/test/regress/expected/indexing.out
@@ -540,6 +540,111 @@ select relname, indisvalid from pg_class join pg_index on indexrelid = oid
  idxpart_a_idx   | t
 (3 rows)
 
+drop table idxpart;
+-- Verify that re-attaching an already-attached partition index can
+-- validate the parent index if it was still invalid, including
+-- indirect ancestors in subpartitions.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (0) to (500);
+-- Partitioned table with no partitions
+create table idxpart2 partition of idxpart for values from (1000) to (2000) partition by range (a);
+-- create parent indexes
+create index on only idxpart ((a/b));
+create index on only idxpart1 ((a/b));
+create index on only idxpart2 ((a/b));
+-- fail, leaves behind an invalid index on the leaf partition
+insert into idxpart11 values (1, 0);
+create index concurrently on idxpart11 ((a/b));
+ERROR:  division by zero
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | f
+ idxpart1_expr_idx  | f
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | f
+(4 rows)
+
+-- attach the indexes; parents stay invalid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | f
+ idxpart1_expr_idx  | f
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | f
+(4 rows)
+
+-- fix the index on the leaf partition
+delete from idxpart11 where b = 0;
+reindex index concurrently idxpart11_expr_idx;
+-- reattach the leaf partition index; parents should now be valid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname       | indisvalid 
+--------------------+------------
+ idxpart11_expr_idx | t
+ idxpart1_expr_idx  | t
+ idxpart2_expr_idx  | t
+ idxpart_expr_idx   | t
+(4 rows)
+
+drop table idxpart;
+-- Verify that re-attaching does not validate the parent when another
+-- child index is still invalid.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (500);
+create table idxpart2 partition of idxpart for values from (500) to (1000);
+create index on only idxpart ((a/b));
+-- create invalid indexes on both children
+insert into idxpart1 values (1, 0);
+insert into idxpart2 values (501, 0);
+create index concurrently on idxpart1 ((a/b));
+ERROR:  division by zero
+create index concurrently on idxpart2 ((a/b));
+ERROR:  division by zero
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | f
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
+-- attach both; parent stays invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | f
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
+-- fix only idxpart1's index, leave idxpart2's still invalid
+delete from idxpart1 where b = 0;
+reindex index concurrently idxpart1_expr_idx;
+-- re-attach the fixed child; parent should stay invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+      relname      | indisvalid 
+-------------------+------------
+ idxpart1_expr_idx | t
+ idxpart2_expr_idx | f
+ idxpart_expr_idx  | f
+(3 rows)
+
 drop table idxpart;
 -- verify dependency handling during ALTER TABLE DETACH PARTITION
 create table idxpart (a int) partition by range (a);
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index 390aabfb34b..02935b0af6d 100644
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -3075,6 +3075,33 @@ select * from tbl_rs t1 join
  3 | 3 | 4 | 4
 (6 rows)
 
+--
+-- regression test for bug with parallel-hash-right-semi join
+--
+begin;
+-- encourage use of parallel plans
+set local parallel_setup_cost=0;
+set local parallel_tuple_cost=0;
+set local min_parallel_table_scan_size=0;
+set local max_parallel_workers_per_gather=4;
+-- ensure we don't get parallel hash right semi join
+explain (costs off)
+select * from tenk1 t1
+where exists (select 1 from tenk1 t2 where fivethous = t1.fivethous)
+and t1.fivethous < 5;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Gather
+   Workers Planned: 4
+   ->  Parallel Hash Semi Join
+         Hash Cond: (t1.fivethous = t2.fivethous)
+         ->  Parallel Seq Scan on tenk1 t1
+               Filter: (fivethous < 5)
+         ->  Parallel Hash
+               ->  Parallel Seq Scan on tenk1 t2
+(8 rows)
+
+rollback;
 --
 -- regression test for bug #13908 (hash join with skew tuples & nbatch increase)
 --
@@ -3222,6 +3249,24 @@ where b.unique2 is null;
          ->  Index Only Scan using tenk1_unique2 on tenk1 b
 (5 rows)
 
+-- check that we avoid de-duplicating columns redundantly
+set enable_memoize to off;
+explain (costs off)
+select 1 from tenk1
+where (hundred, thousand) in (select twothousand, twothousand from onek);
+                   QUERY PLAN                    
+-------------------------------------------------
+ Hash Join
+   Hash Cond: (tenk1.hundred = onek.twothousand)
+   ->  Seq Scan on tenk1
+         Filter: (hundred = thousand)
+   ->  Hash
+         ->  HashAggregate
+               Group Key: onek.twothousand
+               ->  Seq Scan on onek
+(8 rows)
+
+reset enable_memoize;
 --
 -- regression test for bogus RTE_GROUP entries
 --
@@ -4369,6 +4414,57 @@ where ss.x is null;
                      Output: 'bar'::text
 (12 rows)
 
+-- Test computation of varnullingrels when translating appendrel Var
+begin;
+create temp table t_append (a int not null, b int);
+insert into t_append values (1, 1);
+insert into t_append values (2, 3);
+explain (verbose, costs off)
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Nested Loop
+   Output: t1.a, (t1.a)
+   ->  Merge Left Join
+         Output: t1.a, t2.a
+         Merge Cond: (t1.a = t2.b)
+         ->  Sort
+               Output: t1.a
+               Sort Key: t1.a
+               ->  Seq Scan on pg_temp.t_append t1
+                     Output: t1.a
+         ->  Sort
+               Output: t2.a, t2.b
+               Sort Key: t2.b
+               ->  Seq Scan on pg_temp.t_append t2
+                     Output: t2.a, t2.b
+   ->  Append
+         ->  Result
+               Output: t1.a
+         ->  Result
+               Output: t2.a
+               One-Time Filter: (t2.a IS NOT NULL)
+(21 rows)
+
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+ a | a 
+---+---
+ 1 | 1
+ 1 | 1
+ 2 | 2
+(3 rows)
+
+rollback;
 --
 -- test inlining of immutable functions
 --
@@ -6029,6 +6125,45 @@ from int8_tbl t1
          ->  Seq Scan on onek t4
 (13 rows)
 
+-- bug #19460: we need to clean up RestrictInfos more than we had been doing
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select null::int as id) as dummy_source
+   left join (select a.id from a where a.id = 42) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+              QUERY PLAN              
+--------------------------------------
+ Hash Full Join
+   Hash Cond: ((1) = (NULL::integer))
+   ->  Result
+   ->  Hash
+         ->  Result
+(5 rows)
+
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select 2::int as id) as dummy_source
+   left join (select a.id from a) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+        QUERY PLAN        
+--------------------------
+ Hash Full Join
+   Hash Cond: ((1) = (2))
+   ->  Result
+   ->  Hash
+         ->  Result
+(5 rows)
+
 -- More tests of correct placement of pseudoconstant quals
 -- simple constant-false condition
 explain (costs off)
@@ -6500,6 +6635,128 @@ where t1.a = s.c;
 ----------
 (0 rows)
 
+rollback;
+-- check handling of semijoins after join removal: we must suppress
+-- unique-ification of known-constant values
+begin;
+create temp table t (a int unique, b int);
+insert into t values (1, 2);
+explain (verbose, costs off)
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Nested Loop
+   Output: t1.a
+   Inner Unique: true
+   ->  Nested Loop
+         Output: t1.a, t5.a
+         ->  Index Only Scan using t_a_key on pg_temp.t t1
+               Output: t1.a
+               Index Cond: (t1.a = 1)
+         ->  HashAggregate
+               Output: t5.a
+               Group Key: t5.a
+               ->  Hash Join
+                     Output: t5.a
+                     Hash Cond: (t6.b = t4.b)
+                     ->  Seq Scan on pg_temp.t t6
+                           Output: t6.a, t6.b
+                     ->  Hash
+                           Output: t4.b, t5.b, t5.a
+                           ->  Hash Join
+                                 Output: t4.b, t5.b, t5.a
+                                 Inner Unique: true
+                                 Hash Cond: (t5.b = t4.b)
+                                 ->  Seq Scan on pg_temp.t t5
+                                       Output: t5.a, t5.b
+                                 ->  Hash
+                                       Output: t4.b, t4.a
+                                       ->  Index Scan using t_a_key on pg_temp.t t4
+                                             Output: t4.b, t4.a
+                                             Index Cond: (t4.a = 1)
+   ->  Index Only Scan using t_a_key on pg_temp.t t3
+         Output: t3.a
+         Index Cond: (t3.a = t5.a)
+(32 rows)
+
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+ a 
+---
+ 1
+(1 row)
+
+rollback;
+-- check handling of semijoins if all RHS columns are equated to constants: we
+-- should suppress unique-ification in this case.
+begin;
+create temp table t (a int, b int);
+insert into t values (1, 2);
+explain (costs off)
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+                 QUERY PLAN                  
+---------------------------------------------
+ Nested Loop Semi Join
+   ->  Nested Loop
+         ->  Seq Scan on t t1
+               Filter: (a = 1)
+         ->  Materialize
+               ->  Seq Scan on t t2
+                     Filter: (b = 2)
+   ->  Materialize
+         ->  Seq Scan on t t3
+               Filter: ((a = 1) AND (b = 2))
+(10 rows)
+
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+ a | b | a | b 
+---+---+---+---
+ 1 | 2 | 1 | 2
+(1 row)
+
+rollback;
+-- check handling of semijoin unique-ification for child relations if all RHS
+-- columns are equated to constants.
+begin;
+create temp table p (a int, b int) partition by range (a);
+create temp table p1 partition of p for values from (0) to (10);
+create temp table p2 partition of p for values from (10) to (20);
+insert into p values (1, 2);
+insert into p values (10, 20);
+set enable_partitionwise_join to on;
+explain (costs off)
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+          QUERY PLAN           
+-------------------------------
+ Nested Loop Semi Join
+   ->  Seq Scan on p1 t1
+         Filter: (a = 1)
+   ->  Materialize
+         ->  Seq Scan on p1 t2
+               Filter: (a = 1)
+(6 rows)
+
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+ a | b 
+---+---
+ 1 | 2
+(1 row)
+
 rollback;
 -- test cases where we can remove a join, but not a PHV computed at it
 begin;
@@ -6607,10 +6864,10 @@ where ss.a = ss.phv and f1 = 0;
              QUERY PLAN             
 ------------------------------------
  Nested Loop
-   ->  Seq Scan on int4_tbl
-         Filter: (f1 = 0)
    ->  Seq Scan on parttbl1 parttbl
          Filter: (a = 12)
+   ->  Seq Scan on int4_tbl
+         Filter: (f1 = 0)
 (5 rows)
 
 select * from
@@ -7678,6 +7935,22 @@ WHERE q0.a = 1;
    ->  Seq Scan on sj n1
 (7 rows)
 
+-- Do not forget to replace relid in bare Var join clause (bug #19435)
+ALTER TABLE sl ADD COLUMN bool_col boolean;
+EXPLAIN (COSTS OFF)
+SELECT 1 AS c1 FROM sl sl1 LEFT JOIN (sl AS sl2 NATURAL JOIN sl AS sl3)
+  ON sl2.bool_col LEFT JOIN sl AS sl4 ON sl2.bool_col;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Nested Loop Left Join
+   ->  Seq Scan on sl sl1
+   ->  Nested Loop Left Join
+         Join Filter: sl3.bool_col
+         ->  Seq Scan on sl sl3
+               Filter: (bool_col AND (a IS NOT NULL) AND (b IS NOT NULL) AND (c IS NOT NULL) AND (bool_col IS NOT NULL))
+         ->  Seq Scan on sl sl4
+(7 rows)
+
 -- Check optimization disabling if it will violate special join conditions.
 -- Two identical joined relations satisfies self join removal conditions but
 -- stay in different special join infos.
@@ -9607,6 +9880,29 @@ GROUP BY s.c1, s.c2;
 (7 rows)
 
 DROP TABLE group_tbl;
+-- Test that we ignore PlaceHolderVars when looking up statistics
+EXPLAIN (COSTS OFF)
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on tenk1 t2
+         Filter: (unique1 = 42)
+   ->  Index Scan using tenk1_unique2 on tenk1 t1
+         Index Cond: (unique2 = t2.unique2)
+         Filter: (unique1 < 100)
+(6 rows)
+
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+ unique1 
+---------
+      42
+(1 row)
+
 --
 -- Test for a nested loop join involving index scan, transforming OR-clauses
 -- to SAOP.
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
index 5a1eb18aba2..36c31c14576 100644
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -3099,6 +3099,7 @@ SELECT count(*) FROM testjsonb WHERE j @? '$.bar';
      0
 (1 row)
 
+ALTER TABLE testjsonb SET (parallel_workers = 2);
 CREATE INDEX jidx ON testjsonb USING gin (j);
 SET enable_seqscan = off;
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
@@ -3475,7 +3476,7 @@ SELECT count(*) FROM testjsonb WHERE j = '{"pos":98, "line":371, "node":"CBA", "
 
 --gin path opclass
 DROP INDEX jidx;
-CREATE INDEX jidx ON testjsonb USING gin (j jsonb_path_ops);
+CREATE INDEX CONCURRENTLY jidx ON testjsonb USING gin (j jsonb_path_ops);
 SET enable_seqscan = off;
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
  count 
diff --git a/src/test/regress/expected/md5_2.out b/src/test/regress/expected/md5_2.out
new file mode 100644
index 00000000000..4eea7f2bfc3
--- /dev/null
+++ b/src/test/regress/expected/md5_2.out
@@ -0,0 +1,35 @@
+--
+-- MD5 test suite - from IETF RFC 1321
+-- (see: https://www.rfc-editor.org/rfc/rfc1321)
+--
+-- (The md5() function will error in OpenSSL FIPS mode.  By keeping
+-- this test in a separate file, it is easier to manage variant
+-- results.)
+select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
+select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
+ERROR:  could not compute MD5 hash: disabled for FIPS
diff --git a/src/test/regress/expected/multirangetypes.out b/src/test/regress/expected/multirangetypes.out
index c6363ebeb24..76ab1430c4c 100644
--- a/src/test/regress/expected/multirangetypes.out
+++ b/src/test/regress/expected/multirangetypes.out
@@ -3145,6 +3145,22 @@ drop type textrange1;
 reset role;
 drop role regress_multirange_owner;
 --
+-- CREATE TYPE checks for CREATE on multirange schema
+--
+create role regress_mr;
+create schema mr_sch;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+ERROR:  permission denied for schema mr_sch
+reset role;
+grant create on schema mr_sch to regress_mr;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+drop type mytype;
+drop schema mr_sch;
+drop role regress_mr;
+--
 -- Test polymorphic type system
 --
 create function anyarray_anymultirange_func(a anyarray, r anymultirange)
@@ -3297,6 +3313,9 @@ select *, row_to_json(upper(t)) as u from
  {["(5,6)","(7,8)")} | {"a":7,"b":8}
 (2 rows)
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_multirange;
+ERROR:  composite type two_ints cannot be made a member of itself
 drop type two_ints cascade;
 NOTICE:  drop cascades to type two_ints_range
 --
diff --git a/src/test/regress/expected/partition_aggregate.out b/src/test/regress/expected/partition_aggregate.out
index 5f2c0cf5786..673ce7658b4 100644
--- a/src/test/regress/expected/partition_aggregate.out
+++ b/src/test/regress/expected/partition_aggregate.out
@@ -335,6 +335,37 @@ SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
  2
 (3 rows)
 
+-- Test partitionwise aggregation with ordered append path built from fractional paths
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Limit
+   ->  Merge Append
+         Sort Key: pagg_tab.c
+         ->  GroupAggregate
+               Group Key: pagg_tab.c
+               ->  Sort
+                     Sort Key: pagg_tab.c
+                     ->  Seq Scan on pagg_tab_p1 pagg_tab
+         ->  GroupAggregate
+               Group Key: pagg_tab_1.c
+               ->  Sort
+                     Sort Key: pagg_tab_1.c
+                     ->  Seq Scan on pagg_tab_p2 pagg_tab_1
+         ->  GroupAggregate
+               Group Key: pagg_tab_2.c
+               ->  Sort
+                     Sort Key: pagg_tab_2.c
+                     ->  Seq Scan on pagg_tab_p3 pagg_tab_2
+(18 rows)
+
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+ count 
+-------
+   250
+(1 row)
+
 RESET enable_hashagg;
 -- ROLLUP, partitionwise aggregation does not apply
 EXPLAIN (COSTS OFF)
diff --git a/src/test/regress/expected/partition_prune.out b/src/test/regress/expected/partition_prune.out
index d1966cd7d82..7aa3e5cbaf9 100644
--- a/src/test/regress/expected/partition_prune.out
+++ b/src/test/regress/expected/partition_prune.out
@@ -4801,3 +4801,135 @@ select min(a) over (partition by a order by a) from part_abc where a >= stable_o
 
 drop view part_abc_view;
 drop table part_abc;
+--
+-- Check that operands wrapped in PlaceHolderVars are matched to partition
+-- keys, allowing partition pruning to occur.  PlaceHolderVars can be
+-- introduced when a subquery's output is used with grouping sets.
+--
+create table phv_part (a int, b text) partition by list (a);
+create table phv_part_1 partition of phv_part for values in (1);
+create table phv_part_2 partition of phv_part for values in (2);
+create table phv_part_null partition of phv_part for values in (null);
+insert into phv_part values (1, 'one'), (2, 'two'), (null, 'null');
+-- OpExpr: PHV-wrapped operand matched via equal()
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+              QUERY PLAN               
+---------------------------------------
+ MixedAggregate
+   Hash Key: phv_part.b
+   Group Key: phv_part.a
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (a = 1)
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- OpExpr with RelabelType: PHV wrapped around a casted column
+explain (costs off)
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+                QUERY PLAN                 
+-------------------------------------------
+ HashAggregate
+   Hash Key: (phv_part.a)::oid
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (((a)::oid)::integer = 1)
+(5 rows)
+
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+ x |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- ScalarArrayOpExpr: IN clause with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+                    QUERY PLAN                     
+---------------------------------------------------
+ HashAggregate
+   Hash Key: phv_part.a
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_1 phv_part
+         Filter: (a = ANY ('{1,NULL}'::integer[]))
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ 1 | 
+   | one
+(2 rows)
+
+-- NullTest: IS NULL with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+                QUERY PLAN                
+------------------------------------------
+ HashAggregate
+   Hash Key: phv_part.a
+   Hash Key: phv_part.b
+   ->  Seq Scan on phv_part_null phv_part
+         Filter: (a IS NULL)
+(5 rows)
+
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+ a |  b   
+---+------
+   | 
+   | null
+(2 rows)
+
+drop table phv_part;
+-- BooleanTest: IS TRUE with PHV-wrapped boolean partition key
+create table phv_boolpart (a bool, b text) partition by list (a);
+create table phv_boolpart_t partition of phv_boolpart for values in (true);
+create table phv_boolpart_f partition of phv_boolpart for values in (false);
+create table phv_boolpart_null partition of phv_boolpart default;
+insert into phv_boolpart values (true, 'yes'), (false, 'no'), (null, 'unknown');
+explain (costs off)
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+                  QUERY PLAN                   
+-----------------------------------------------
+ HashAggregate
+   Hash Key: phv_boolpart.a
+   Hash Key: phv_boolpart.b
+   ->  Seq Scan on phv_boolpart_t phv_boolpart
+         Filter: (a IS TRUE)
+(5 rows)
+
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+ a |  b  
+---+-----
+ t | 
+   | yes
+(2 rows)
+
+drop table phv_boolpart;
diff --git a/src/test/regress/expected/password_2.out b/src/test/regress/expected/password_2.out
new file mode 100644
index 00000000000..ea1fc7a083c
--- /dev/null
+++ b/src/test/regress/expected/password_2.out
@@ -0,0 +1,168 @@
+--
+-- Tests for password types
+--
+-- Tests for GUC password_encryption
+SET password_encryption = 'novalue'; -- error
+ERROR:  invalid value for parameter "password_encryption": "novalue"
+HINT:  Available values: md5, scram-sha-256.
+SET password_encryption = true; -- error
+ERROR:  invalid value for parameter "password_encryption": "true"
+HINT:  Available values: md5, scram-sha-256.
+SET password_encryption = 'md5'; -- ok
+SET password_encryption = 'scram-sha-256'; -- ok
+-- consistency of password entries
+SET password_encryption = 'md5';
+CREATE ROLE regress_passwd1;
+ALTER ROLE regress_passwd1 PASSWORD 'role_pwd1';
+ERROR:  password encryption failed: disabled for FIPS
+CREATE ROLE regress_passwd2;
+ALTER ROLE regress_passwd2 PASSWORD 'role_pwd2';
+ERROR:  password encryption failed: disabled for FIPS
+SET password_encryption = 'scram-sha-256';
+CREATE ROLE regress_passwd3 PASSWORD 'role_pwd3';
+CREATE ROLE regress_passwd4 PASSWORD NULL;
+-- check list of created entries
+--
+-- The scram secret will look something like:
+-- SCRAM-SHA-256$4096:E4HxLGtnRzsYwg==$6YtlR4t69SguDiwFvbVgVZtuz6gpJQQqUMZ7IQJK5yI=:ps75jrHeYU4lXCcXI4O8oIdJ3eO8o2jirjruw9phBTo=
+--
+-- Since the salt is random, the exact value stored will be different on every test
+-- run. Use a regular expression to mask the changing parts.
+SELECT rolname, regexp_replace(rolpassword, '(SCRAM-SHA-256)\$(\d+):([a-zA-Z0-9+/=]+)\$([a-zA-Z0-9+=/]+):([a-zA-Z0-9+/=]+)', '\1$\2:<salt>$<storedkey>:<serverkey>') as rolpassword_masked
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+     rolname     |                rolpassword_masked                 
+-----------------+---------------------------------------------------
+ regress_passwd1 | 
+ regress_passwd2 | 
+ regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd4 | 
+(4 rows)
+
+-- Rename a role
+ALTER ROLE regress_passwd2 RENAME TO regress_passwd2_new;
+-- md5 entry should have been removed
+SELECT rolname, rolpassword
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd2_new'
+    ORDER BY rolname, rolpassword;
+       rolname       | rolpassword 
+---------------------+-------------
+ regress_passwd2_new | 
+(1 row)
+
+ALTER ROLE regress_passwd2_new RENAME TO regress_passwd2;
+-- Change passwords with ALTER USER. With plaintext or already-encrypted
+-- passwords.
+SET password_encryption = 'md5';
+-- encrypt with MD5
+ALTER ROLE regress_passwd2 PASSWORD 'foo';
+ERROR:  password encryption failed: disabled for FIPS
+-- already encrypted, use as they are
+ALTER ROLE regress_passwd1 PASSWORD 'md5cd3578025fe2c3d7ed1b9a9b26238b70';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+ALTER ROLE regress_passwd3 PASSWORD 'SCRAM-SHA-256$4096:VLK4RMaQLCvNtQ==$6YtlR4t69SguDiwFvbVgVZtuz6gpJQQqUMZ7IQJK5yI=:ps75jrHeYU4lXCcXI4O8oIdJ3eO8o2jirjruw9phBTo=';
+SET password_encryption = 'scram-sha-256';
+-- create SCRAM secret
+ALTER ROLE  regress_passwd4 PASSWORD 'foo';
+-- already encrypted with MD5, use as it is
+CREATE ROLE regress_passwd5 PASSWORD 'md5e73a4b11df52a6068f8b39f90be36023';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+-- This looks like a valid SCRAM-SHA-256 secret, but it is not
+-- so it should be hashed with SCRAM-SHA-256.
+CREATE ROLE regress_passwd6 PASSWORD 'SCRAM-SHA-256$1234';
+-- These may look like valid MD5 secrets, but they are not, so they
+-- should be hashed with SCRAM-SHA-256.
+-- trailing garbage at the end
+CREATE ROLE regress_passwd7 PASSWORD 'md5012345678901234567890123456789zz';
+-- invalid length
+CREATE ROLE regress_passwd8 PASSWORD 'md501234567890123456789012345678901zz';
+-- Changing the SCRAM iteration count
+SET scram_iterations = 1024;
+CREATE ROLE regress_passwd9 PASSWORD 'alterediterationcount';
+SELECT rolname, regexp_replace(rolpassword, '(SCRAM-SHA-256)\$(\d+):([a-zA-Z0-9+/=]+)\$([a-zA-Z0-9+=/]+):([a-zA-Z0-9+/=]+)', '\1$\2:<salt>$<storedkey>:<serverkey>') as rolpassword_masked
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+     rolname     |                rolpassword_masked                 
+-----------------+---------------------------------------------------
+ regress_passwd1 | md5cd3578025fe2c3d7ed1b9a9b26238b70
+ regress_passwd2 | 
+ regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd5 | md5e73a4b11df52a6068f8b39f90be36023
+ regress_passwd6 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd7 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd8 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
+ regress_passwd9 | SCRAM-SHA-256$1024:<salt>$<storedkey>:<serverkey>
+(9 rows)
+
+-- An empty password is not allowed, in any form
+CREATE ROLE regress_passwd_empty PASSWORD '';
+NOTICE:  empty string is not a valid password, clearing password
+ALTER ROLE regress_passwd_empty PASSWORD 'md585939a5ce845f1a1b620742e3c659e0a';
+WARNING:  setting an MD5-encrypted password
+DETAIL:  MD5 password support is deprecated and will be removed in a future release of PostgreSQL.
+HINT:  Refer to the PostgreSQL documentation for details about migrating to another password type.
+ALTER ROLE regress_passwd_empty PASSWORD 'SCRAM-SHA-256$4096:hpFyHTUsSWcR7O9P$LgZFIt6Oqdo27ZFKbZ2nV+vtnYM995pDh9ca6WSi120=:qVV5NeluNfUPkwm7Vqat25RjSPLkGeoZBQs6wVv+um4=';
+NOTICE:  empty string is not a valid password, clearing password
+SELECT rolpassword FROM pg_authid WHERE rolname='regress_passwd_empty';
+ rolpassword 
+-------------
+ 
+(1 row)
+
+-- Test with invalid stored and server keys.
+--
+-- The first is valid, to act as a control. The others have too long
+-- stored/server keys. They will be re-hashed.
+CREATE ROLE regress_passwd_sha_len0 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96Rqw=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZI=';
+CREATE ROLE regress_passwd_sha_len1 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96RqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZI=';
+CREATE ROLE regress_passwd_sha_len2 PASSWORD 'SCRAM-SHA-256$4096:A6xHKoH/494E941doaPOYg==$Ky+A30sewHIH3VHQLRN9vYsuzlgNyGNKCh37dy96Rqw=:COPdlNiIkrsacU5QoxydEuOH6e/KfiipeETb/bPw8ZIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=';
+-- Check that the invalid secrets were re-hashed. A re-hashed secret
+-- should not contain the original salt.
+SELECT rolname, rolpassword not like '%A6xHKoH/494E941doaPOYg==%' as is_rolpassword_rehashed
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd_sha_len%'
+    ORDER BY rolname;
+         rolname         | is_rolpassword_rehashed 
+-------------------------+-------------------------
+ regress_passwd_sha_len0 | f
+ regress_passwd_sha_len1 | t
+ regress_passwd_sha_len2 | t
+(3 rows)
+
+-- Test that valid hashes that are too long are rejected
+CREATE ROLE regress_passwd10 PASSWORD 'SCRAM-SHA-256$000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004096:wNFxNSk1hAXBkgub8py3bg==$65zC6E+R0U7tiYTC9+Wtq4Thw6gUDj3eDCINij8TflU=:rC1I7tcVugrHEY2DT0iPjGyjM4aJxkMM9n8WBxtUtHU=';
+ERROR:  encrypted password is too long
+DETAIL:  Encrypted passwords must be no longer than 512 bytes.
+ALTER ROLE regress_passwd9 PASSWORD 'SCRAM-SHA-256$000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004096:wNFxNSk1hAXBkgub8py3bg==$65zC6E+R0U7tiYTC9+Wtq4Thw6gUDj3eDCINij8TflU=:rC1I7tcVugrHEY2DT0iPjGyjM4aJxkMM9n8WBxtUtHU=';
+ERROR:  encrypted password is too long
+DETAIL:  Encrypted passwords must be no longer than 512 bytes.
+DROP ROLE regress_passwd1;
+DROP ROLE regress_passwd2;
+DROP ROLE regress_passwd3;
+DROP ROLE regress_passwd4;
+DROP ROLE regress_passwd5;
+DROP ROLE regress_passwd6;
+DROP ROLE regress_passwd7;
+DROP ROLE regress_passwd8;
+DROP ROLE regress_passwd9;
+DROP ROLE regress_passwd_empty;
+DROP ROLE regress_passwd_sha_len0;
+DROP ROLE regress_passwd_sha_len1;
+DROP ROLE regress_passwd_sha_len2;
+-- all entries should have been removed
+SELECT rolname, rolpassword
+    FROM pg_authid
+    WHERE rolname LIKE 'regress_passwd%'
+    ORDER BY rolname, rolpassword;
+ rolname | rolpassword 
+---------+-------------
+(0 rows)
+
diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out
index 06726ed4ab7..c1fbfa105ef 100644
--- a/src/test/regress/expected/portals.out
+++ b/src/test/regress/expected/portals.out
@@ -1336,6 +1336,17 @@ FETCH FROM c1;
 DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
 ERROR:  WHERE CURRENT OF on a view is not implemented
 ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+ f1 |  f2   
+----+-------
+ 13 | three
+(1 row)
+
+UPDATE ucview SET f1 = f1 + 10 WHERE CURRENT OF c1; -- fail, views not supported
+ERROR:  WHERE CURRENT OF on a view is not implemented
+ROLLBACK;
 -- Check WHERE CURRENT OF with an index-only scan
 BEGIN;
 EXPLAIN (costs off)
diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out
index 515a2ada9d1..ac4ebf6ca36 100644
--- a/src/test/regress/expected/prepared_xacts.out
+++ b/src/test/regress/expected/prepared_xacts.out
@@ -1,3 +1,7 @@
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
+\endif
 --
 -- PREPARED TRANSACTIONS (two-phase commit)
 --
@@ -263,8 +267,37 @@ SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
 -----
 (0 rows)
 
+-- Test row-level locks held by prepared transactions
+CREATE TABLE pxtest_rowlock (id int PRIMARY KEY, data text);
+INSERT INTO pxtest_rowlock VALUES (1, 'test data');
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+ id |   data    
+----+-----------
+  1 | test data
+(1 row)
+
+PREPARE TRANSACTION 'regress_p1';
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+ERROR:  could not obtain lock on row in relation "pxtest_rowlock"
+-- Test prepared transactions that participate in multixacts. For
+-- that, lock the same row again, creating a multixid.
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+ id |   data    
+----+-----------
+  1 | test data
+(1 row)
+
+PREPARE TRANSACTION 'regress_p2';
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+ERROR:  could not obtain lock on row in relation "pxtest_rowlock"
+ROLLBACK PREPARED 'regress_p1';
+ROLLBACK PREPARED 'regress_p2';
 -- Clean up
 DROP TABLE pxtest2;
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
-ERROR:  table "pxtest3" does not exist
+-- pxtest3 was already dropped
 DROP TABLE pxtest4;
+DROP TABLE pxtest_rowlock;
diff --git a/src/test/regress/expected/prepared_xacts_1.out b/src/test/regress/expected/prepared_xacts_1.out
index 6ad3d11898a..a21314768c3 100644
--- a/src/test/regress/expected/prepared_xacts_1.out
+++ b/src/test/regress/expected/prepared_xacts_1.out
@@ -1,266 +1,3 @@
---
--- PREPARED TRANSACTIONS (two-phase commit)
---
--- We can't readily test persistence of prepared xacts within the
--- regression script framework, unfortunately.  Note that a crash
--- isn't really needed ... stopping and starting the postmaster would
--- be enough, but we can't even do that here.
--- create a simple table that we'll use in the tests
-CREATE TABLE pxtest1 (foobar VARCHAR(10));
-INSERT INTO pxtest1 VALUES ('aaa');
--- Test PREPARE TRANSACTION
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'bbb' WHERE foobar = 'aaa';
-SELECT * FROM pxtest1;
- foobar 
---------
- bbb
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo1';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test pg_prepared_xacts system view
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Test ROLLBACK PREPARED
-ROLLBACK PREPARED 'regress_foo1';
-ERROR:  prepared transaction with identifier "regress_foo1" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Test COMMIT PREPARED
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-INSERT INTO pxtest1 VALUES ('ddd');
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
- ddd
-(2 rows)
-
-PREPARE TRANSACTION 'regress_foo2';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-COMMIT PREPARED 'regress_foo2';
-ERROR:  prepared transaction with identifier "regress_foo2" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test duplicate gids
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo3';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-INSERT INTO pxtest1 VALUES ('fff');
--- This should fail, because the gid foo3 is already in use
-PREPARE TRANSACTION 'regress_foo3';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-ROLLBACK PREPARED 'regress_foo3';
-ERROR:  prepared transaction with identifier "regress_foo3" does not exist
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- Test serialization failure (SSI)
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo4';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
-(1 row)
-
--- This should fail, because the two transactions have a write-skew anomaly
-INSERT INTO pxtest1 VALUES ('fff');
-PREPARE TRANSACTION 'regress_foo5';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
-ROLLBACK PREPARED 'regress_foo4';
-ERROR:  prepared transaction with identifier "regress_foo4" does not exist
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Clean up
-DROP TABLE pxtest1;
--- Test detection of session-level and xact-level locks on same object
-BEGIN;
-SELECT pg_advisory_lock(1);
- pg_advisory_lock 
-------------------
- 
-(1 row)
-
-SELECT pg_advisory_xact_lock_shared(1);
- pg_advisory_xact_lock_shared 
-------------------------------
- 
-(1 row)
-
-PREPARE TRANSACTION 'regress_foo6';  -- fails
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
--- Test subtransactions
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-  CREATE TABLE pxtest2 (a int);
-  INSERT INTO pxtest2 VALUES (1);
-  SAVEPOINT a;
-    INSERT INTO pxtest2 VALUES (2);
-  ROLLBACK TO a;
-  SAVEPOINT b;
-  INSERT INTO pxtest2 VALUES (3);
-PREPARE TRANSACTION 'regress_sub1';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
-CREATE TABLE pxtest3(fff int);
--- Test shared invalidation
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-  DROP TABLE pxtest3;
-  CREATE TABLE pxtest4 (a int);
-  INSERT INTO pxtest4 VALUES (1);
-  INSERT INTO pxtest4 VALUES (2);
-  DECLARE foo CURSOR FOR SELECT * FROM pxtest4;
-  -- Fetch 1 tuple, keeping the cursor open
-  FETCH 1 FROM foo;
- a 
----
- 1
-(1 row)
-
-PREPARE TRANSACTION 'regress_sub2';
-ERROR:  prepared transactions are disabled
-HINT:  Set "max_prepared_transactions" to a nonzero value.
--- No such cursor
-FETCH 1 FROM foo;
-ERROR:  cursor "foo" does not exist
--- Table doesn't exist, the creation hasn't been committed yet
-SELECT * FROM pxtest2;
-ERROR:  relation "pxtest2" does not exist
-LINE 1: SELECT * FROM pxtest2;
-                      ^
--- There should be two prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- pxtest3 should be locked because of the pending DROP
-begin;
-lock table pxtest3 in access share mode nowait;
-rollback;
--- Disconnect, we will continue testing in a different backend
-\c -
--- There should still be two prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- pxtest3 should still be locked because of the pending DROP
-begin;
-lock table pxtest3 in access share mode nowait;
-rollback;
--- Commit table creation
-COMMIT PREPARED 'regress_sub1';
-ERROR:  prepared transaction with identifier "regress_sub1" does not exist
-\d pxtest2
-SELECT * FROM pxtest2;
-ERROR:  relation "pxtest2" does not exist
-LINE 1: SELECT * FROM pxtest2;
-                      ^
--- There should be one prepared transaction
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Commit table drop
-COMMIT PREPARED 'regress_sub2';
-ERROR:  prepared transaction with identifier "regress_sub2" does not exist
-SELECT * FROM pxtest3;
- fff 
------
-(0 rows)
-
--- There should be no prepared transactions
-SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
- gid 
------
-(0 rows)
-
--- Clean up
-DROP TABLE pxtest2;
-ERROR:  table "pxtest2" does not exist
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
-DROP TABLE pxtest4;
-ERROR:  table "pxtest4" does not exist
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index c25062c288f..823b824c203 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -113,36 +113,6 @@ CREATE USER regress_priv_user2;
 CREATE USER regress_priv_user3;
 CREATE USER regress_priv_user4;
 CREATE USER regress_priv_user5;
--- DROP OWNED should also act on granted and granted-to roles
-GRANT regress_priv_user1 TO regress_priv_user2;
-GRANT regress_priv_user2 TO regress_priv_user3;
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-       roleid       |       member       
---------------------+--------------------
- regress_priv_user1 | regress_priv_user2
- regress_priv_user2 | regress_priv_user3
-(2 rows)
-
-REASSIGN OWNED BY regress_priv_user2 TO regress_priv_user4;  -- no effect
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-       roleid       |       member       
---------------------+--------------------
- regress_priv_user1 | regress_priv_user2
- regress_priv_user2 | regress_priv_user3
-(2 rows)
-
-DROP OWNED BY regress_priv_user2;  -- removes both grants
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
- roleid | member 
---------+--------
-(0 rows)
-
 GRANT pg_read_all_data TO regress_priv_user6;
 GRANT pg_write_all_data TO regress_priv_user7;
 GRANT pg_read_all_settings TO regress_priv_user8 WITH ADMIN OPTION;
@@ -513,8 +483,6 @@ CREATE VIEW atest12v AS
   SELECT * FROM atest12 WHERE b <<< 5;
 CREATE VIEW atest12sbv WITH (security_barrier=true) AS
   SELECT * FROM atest12 WHERE b <<< 5;
-GRANT SELECT ON atest12v TO PUBLIC;
-GRANT SELECT ON atest12sbv 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                    
@@ -560,9 +528,18 @@ CREATE FUNCTION leak2(integer,integer) RETURNS boolean
   LANGUAGE plpgsql immutable;
 CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
                      restrict = scalargtsel);
--- This should not show any "leak" notices before failing.
+-- These should not show any "leak" notices before failing.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
 ERROR:  permission denied for table atest12
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v WHERE a >>> 0;
+ERROR:  permission denied for view atest12v
+EXPLAIN (COSTS OFF) SELECT * FROM atest12sbv WHERE a >>> 0;
+ERROR:  permission denied for view atest12sbv
+-- Now regress_priv_user1 grants access to regress_priv_user2 via the views.
+SET SESSION AUTHORIZATION regress_priv_user1;
+GRANT SELECT ON atest12v TO PUBLIC;
+GRANT SELECT ON atest12sbv TO PUBLIC;
+SET SESSION AUTHORIZATION regress_priv_user2;
 -- These plans should continue to use a nestloop, since they execute with the
 -- privileges of the view owner.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
@@ -2568,6 +2545,26 @@ SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 	'SELECT, fake_privilege', FALSE);  -- error
 ERROR:  unrecognized privilege type: "fake_privilege"
+-- Test quoting and dequoting of user names in ACLs
+CREATE ROLE "regress_""quoted";
+SELECT makeaclitem('regress_"quoted'::regrole, 'regress_"quoted'::regrole,
+                   'SELECT', TRUE);
+               makeaclitem                
+------------------------------------------
+ "regress_""quoted"=r*/"regress_""quoted"
+(1 row)
+
+SELECT '"regress_""quoted"=r*/"regress_""quoted"'::aclitem;
+                 aclitem                  
+------------------------------------------
+ "regress_""quoted"=r*/"regress_""quoted"
+(1 row)
+
+SELECT '""=r*/""'::aclitem;  -- used to be misparsed as """"
+ERROR:  a name must follow the "/" sign
+LINE 1: SELECT '""=r*/""'::aclitem;
+               ^
+DROP ROLE "regress_""quoted";
 -- Test non-throwing aclitem I/O
 SELECT pg_input_is_valid('regress_priv_user1=r/regress_priv_user2', 'aclitem');
  pg_input_is_valid 
@@ -3126,6 +3123,11 @@ DROP USER regress_priv_user6;
 DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 ERROR:  role "regress_priv_user8" does not exist
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE USAGE ON TYPES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE USAGE ON TYPES FROM pg_read_all_settings;
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 236eba2540e..a79325e8a2f 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -4705,6 +4705,7 @@ invalid command \lo
 	\pset arg1 arg2
 	\q
 	\reset
+	\restrict test
 	\s arg1
 	\sendpipeline
 	\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
@@ -4716,6 +4717,7 @@ invalid command \lo
 	\t arg1
 	\T arg1
 	\timing arg1
+	\unrestrict not_valid
 	\unset arg1
 	\w arg1
 	\watch arg1 arg2
diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index 3a2eacd793f..895ca87a0df 100644
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -36,6 +36,9 @@ LINE 1: ...pub_xxx WITH (publish_generated_columns = stored, publish_ge...
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = foo);
 ERROR:  invalid value for publication parameter "publish_generated_columns": "foo"
 DETAIL:  Valid values are "none" and "stored".
+CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns);
+ERROR:  invalid value for publication parameter "publish_generated_columns": ""
+DETAIL:  Valid values are "none" and "stored".
 \dRp
                                                         List of publications
         Name        |          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root 
@@ -1844,8 +1847,7 @@ DROP SCHEMA sch1 cascade;
 DROP SCHEMA sch2 cascade;
 -- ======================================================
 -- Test the 'publish_generated_columns' parameter with the following values:
--- 'stored', 'none', and the default (no value specified), which defaults to
--- 'stored'.
+-- 'stored', 'none'.
 SET client_min_messages = 'ERROR';
 CREATE PUBLICATION pub1 FOR ALL TABLES WITH (publish_generated_columns = stored);
 \dRp+ pub1
@@ -1863,17 +1865,8 @@ CREATE PUBLICATION pub2 FOR ALL TABLES WITH (publish_generated_columns = none);
  regress_publication_user | t          | t       | t       | t       | t         | none              | f
 (1 row)
 
-CREATE PUBLICATION pub3 FOR ALL TABLES WITH (publish_generated_columns);
-\dRp+ pub3
-                                                Publication pub3
-          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Generated columns | Via root 
---------------------------+------------+---------+---------+---------+-----------+-------------------+----------
- regress_publication_user | t          | t       | t       | t       | t         | stored            | f
-(1 row)
-
 DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
-DROP PUBLICATION pub3;
 -- Test the 'publish_generated_columns' parameter as 'none' and 'stored' for
 -- different scenarios with/without generated columns in column lists.
 CREATE TABLE gencols (a int, gen1 int GENERATED ALWAYS AS (a * 2) STORED);
@@ -1931,6 +1924,78 @@ DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
 DROP TABLE gencols;
 RESET client_min_messages;
+-- Test that the INSERT ON CONFLICT command correctly checks REPLICA IDENTITY
+-- when the target table is published.
+CREATE TABLE testpub_insert_onconfl_no_ri (a int unique, b int);
+CREATE TABLE testpub_insert_onconfl_parted (a int unique, b int) PARTITION by RANGE (a);
+CREATE TABLE testpub_insert_onconfl_part_no_ri PARTITION OF testpub_insert_onconfl_parted FOR VALUES FROM (1) TO (10);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+-- fail - missing REPLICA IDENTITY
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+ERROR:  cannot update table "testpub_insert_onconfl_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT DO NOTHING;
+-- fail - missing REPLICA IDENTITY in partition testpub_insert_onconfl_no_ri
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+ERROR:  cannot update table "testpub_insert_onconfl_part_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT DO NOTHING;
+DROP PUBLICATION pub1;
+DROP TABLE testpub_insert_onconfl_no_ri;
+DROP TABLE testpub_insert_onconfl_parted;
+-- Test that the MERGE command correctly checks REPLICA IDENTITY when the
+-- target table is published.
+CREATE TABLE testpub_merge_no_ri (a int, b int);
+CREATE TABLE testpub_merge_pk (a int primary key, b int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN UPDATE SET b = s.b;
+ERROR:  cannot update table "testpub_merge_no_ri" because it does not have a replica identity and publishes updates
+HINT:  To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DELETE;
+ERROR:  cannot delete from table "testpub_merge_no_ri" because it does not have a replica identity and publishes deletes
+HINT:  To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE.
+-- ok - insert and do nothing are not restricted
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DO NOTHING
+ WHEN NOT MATCHED THEN INSERT (a, b) VALUES (0, 0);
+-- ok - REPLICA IDENTITY is DEFAULT and table has a PK
+MERGE INTO testpub_merge_pk USING testpub_merge_no_ri s ON s.a >= 1
+ WHEN MATCHED AND s.a > 0 THEN UPDATE SET b = s.b
+ WHEN MATCHED THEN DELETE;
+DROP PUBLICATION pub1;
+DROP TABLE testpub_merge_no_ri;
+DROP TABLE testpub_merge_pk;
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_publication_user, regress_publication_user2;
 DROP ROLE regress_publication_user_dummy;
+-- stage objects for pg_dump tests
+CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int);
+CREATE SCHEMA pubme2 CREATE TABLE t0 (c int, d int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION dump_pub_qual_1ct FOR
+  TABLE ONLY pubme.t0 (c, d) WHERE (c > 0);
+CREATE PUBLICATION dump_pub_qual_2ct FOR
+  TABLE ONLY pubme.t0 (c) WHERE (c > 0),
+  TABLE ONLY pubme.t1 (c);
+CREATE PUBLICATION dump_pub_nsp_1ct FOR
+  TABLES IN SCHEMA pubme;
+CREATE PUBLICATION dump_pub_nsp_2ct FOR
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2;
+CREATE PUBLICATION dump_pub_all FOR
+  TABLE ONLY pubme.t0,
+  TABLE ONLY pubme.t1 WHERE (c < 0),
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2
+  WITH (publish_via_partition_root = true);
+RESET client_min_messages;
diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out
index 1c4e37d2249..8c879509313 100644
--- a/src/test/regress/expected/rowsecurity.out
+++ b/src/test/regress/expected/rowsecurity.out
@@ -4506,7 +4506,7 @@ RESET SESSION AUTHORIZATION;
 DROP VIEW rls_view;
 DROP TABLE rls_tbl;
 DROP TABLE ref_tbl;
--- Leaky operator test
+-- Leaky operator tests
 CREATE TABLE rls_tbl (a int);
 INSERT INTO rls_tbl SELECT x/10 FROM generate_series(1, 100) x;
 ANALYZE rls_tbl;
@@ -4530,9 +4530,80 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_tbl WHERE a <<< 1000 or a <<< 900;
    One-Time Filter: false
 (2 rows)
 
+RESET SESSION AUTHORIZATION;
+CREATE TABLE rls_child_tbl () INHERITS (rls_tbl);
+INSERT INTO rls_child_tbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_child_tbl;
+CREATE TABLE rls_ptbl (a int) PARTITION BY RANGE (a);
+CREATE TABLE rls_part PARTITION OF rls_ptbl FOR VALUES FROM (-100) TO (100);
+INSERT INTO rls_ptbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_ptbl, rls_part;
+ALTER TABLE rls_ptbl ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_part ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_ptbl TO regress_rls_alice;
+GRANT SELECT ON rls_part TO regress_rls_alice;
+CREATE POLICY p1 ON rls_tbl USING (a < 0);
+CREATE POLICY p2 ON rls_ptbl USING (a < 0);
+CREATE POLICY p3 ON rls_part USING (a < 0);
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+ERROR:  permission denied for table rls_child_tbl
+SELECT * FROM rls_ptbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM rls_part WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+ERROR:  permission denied for table rls_child_tbl
+RESET SESSION AUTHORIZATION;
+REVOKE SELECT ON rls_tbl FROM regress_rls_alice;
+CREATE VIEW rls_tbl_view AS SELECT * FROM rls_tbl;
+ALTER TABLE rls_child_tbl ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_child_tbl TO regress_rls_alice;
+CREATE POLICY p4 ON rls_child_tbl USING (a < 0);
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+ERROR:  permission denied for table rls_tbl
+SELECT * FROM rls_tbl_view WHERE a <<< 1000;
+ERROR:  permission denied for view rls_tbl_view
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+ERROR:  permission denied for table rls_tbl
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+ a 
+---
+(0 rows)
+
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
+DROP TABLE rls_part;
+DROP TABLE rls_ptbl;
+DROP TABLE rls_child_tbl;
+DROP VIEW rls_tbl_view;
 DROP TABLE rls_tbl;
 -- Bug #16006: whole-row Vars in a policy don't play nice with sub-selects
 SET SESSION AUTHORIZATION regress_rls_alice;
diff --git a/src/test/regress/expected/sqljson_queryfuncs.out b/src/test/regress/expected/sqljson_queryfuncs.out
index 5a35aeb7bba..53145f50f18 100644
--- a/src/test/regress/expected/sqljson_queryfuncs.out
+++ b/src/test/regress/expected/sqljson_queryfuncs.out
@@ -1331,6 +1331,10 @@ SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a' WITH WRAPPER);
  [123]
 (1 row)
 
+SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || NULL)::date WITH WRAPPER);
+ERROR:  JSON path expression must be of type jsonpath, not of type date
+LINE 1: SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || ...
+                                               ^
 -- Should fail (invalid path)
 SELECT JSON_QUERY(jsonb '{"a": 123}', 'error' || ' ' || 'error');
 ERROR:  syntax error at or near " " of jsonpath input
@@ -1355,6 +1359,10 @@ SELECT json_value('"aaa"', path RETURNING json) FROM jsonpaths;
  "aaa"
 (1 row)
 
+SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM jsonpaths;
+ERROR:  JSON path expression must be of type jsonpath, not of type jsonpaths
+LINE 1: SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM js...
+                                   ^
 -- Test PASSING argument parsing
 SELECT JSON_QUERY(jsonb 'null', '$xyz' PASSING 1 AS xy);
 ERROR:  could not find jsonpath variable "xyz"
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index 776f1ad0e53..37df27351d8 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -877,6 +877,8 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
  t
 (1 row)
 
+-- stats_reset may not be set for datid=0 and shared objects in
+-- pg_stat_database, so reset once.
 SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
  pg_stat_reset_single_table_counters 
 -------------------------------------
@@ -890,6 +892,22 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
  f
 (1 row)
 
+SELECT stats_reset AS shared_db_reset_before
+  FROM pg_stat_database WHERE datid = 0 \gset
+-- Second reset for comparison.
+SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
+ pg_stat_reset_single_table_counters 
+-------------------------------------
+ 
+(1 row)
+
+SELECT stats_reset > :'shared_db_reset_before'::timestamptz AS has_updated
+  FROM pg_stat_database WHERE datid = 0;
+ has_updated 
+-------------
+ t
+(1 row)
+
 -- set back comment
 \if :{?description_before}
   COMMENT ON DATABASE :"datname" IS :'description_before';
diff --git a/src/test/regress/expected/stats_ext.out b/src/test/regress/expected/stats_ext.out
index 6359e5fb689..c2f2604a52b 100644
--- a/src/test/regress/expected/stats_ext.out
+++ b/src/test/regress/expected/stats_ext.out
@@ -54,6 +54,25 @@ CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), y FROM ext_stats_test;
 ERROR:  duplicate expression in statistics definition
 CREATE STATISTICS tst (unrecognized) ON x, y FROM ext_stats_test;
 ERROR:  unrecognized statistics kind "unrecognized"
+-- unsupported targets
+CREATE STATISTICS tst ON a FROM (VALUES (x)) AS foo;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM foo NATURAL JOIN bar;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM (SELECT * FROM ext_stats_test) AS foo;
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM ext_stats_test s TABLESAMPLE system (x);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM XMLTABLE('foo' PASSING 'bar' COLUMNS a text);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE STATISTICS tst ON a FROM JSON_TABLE(jsonb '123', '$' COLUMNS (item int));
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+CREATE FUNCTION tftest(int) returns table(a int, b int) as $$
+SELECT $1, $1+i FROM generate_series(1,5) g(i);
+$$ LANGUAGE sql IMMUTABLE STRICT;
+CREATE STATISTICS alt_stat2 ON a FROM tftest(1);
+ERROR:  CREATE STATISTICS only supports relation names in the FROM clause
+DROP FUNCTION tftest;
 -- incorrect expressions
 CREATE STATISTICS tst ON (y) FROM ext_stats_test; -- single column reference
 ERROR:  extended statistics require at least 2 columns
@@ -103,6 +122,20 @@ ALTER STATISTICS ab1_a_b_stats RENAME TO ab1_a_b_stats_new;
 ERROR:  must be owner of statistics object ab1_a_b_stats
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_stats_ext;
+CREATE STATISTICS pg_temp.stats_ext_temp ON a, b FROM ab1;
+SELECT regexp_replace(pg_describe_object(tableoid, oid, 0),
+                      'pg_temp_[0-9]*', 'pg_temp_REDACTED') AS descr,
+       pg_statistics_obj_is_visible(oid) AS visible
+  FROM pg_statistic_ext
+ WHERE stxname = 'stats_ext_temp';
+                       descr                       | visible 
+---------------------------------------------------+---------
+ statistics object pg_temp_REDACTED.stats_ext_temp | f
+(1 row)
+
+DROP STATISTICS stats_ext_temp;  -- shall fail
+ERROR:  statistics object "stats_ext_temp" does not exist
+DROP STATISTICS pg_temp.stats_ext_temp;
 CREATE STATISTICS IF NOT EXISTS ab1_a_b_stats ON a, b FROM ab1;
 NOTICE:  statistics object "ab1_a_b_stats" already exists, skipping
 DROP STATISTICS ab1_a_b_stats;
@@ -3275,9 +3308,17 @@ CREATE FUNCTION op_leak(int, int) RETURNS bool
     LANGUAGE plpgsql;
 CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
+CREATE FUNCTION op_leak(record, record) RETURNS bool
+    AS 'BEGIN RAISE NOTICE ''op_leak => %, %'', $1, $2; RETURN $1 < $2; END'
+    LANGUAGE plpgsql;
+CREATE OPERATOR <<< (procedure = op_leak, leftarg = record, rightarg = record,
+                     restrict = scalarltsel);
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_tbl
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 ERROR:  permission denied for table priv_test_tbl
@@ -3298,10 +3339,17 @@ SELECT * FROM tststats.priv_test_view WHERE a <<< 0 OR b <<< 0; -- Should not le
 ---+---
 (0 rows)
 
+SELECT * FROM tststats.priv_test_view t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
 DELETE FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 -- Grant table access, but hide all data with RLS
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tststats.priv_test_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_tbl_pol ON tststats.priv_test_tbl USING (2 * a < 0);
 GRANT SELECT, DELETE ON tststats.priv_test_tbl TO regress_stats_user1;
 -- Should now have direct table access, but see nothing and leak nothing
 SET SESSION AUTHORIZATION regress_stats_user1;
@@ -3310,12 +3358,57 @@ SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not le
 ---+---
 (0 rows)
 
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
  a | b 
 ---+---
 (0 rows)
 
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+-- Create plain inheritance parent table with no access permissions
+RESET SESSION AUTHORIZATION;
+CREATE TABLE tststats.priv_test_parent_tbl (a int, b int);
+ALTER TABLE tststats.priv_test_tbl INHERIT tststats.priv_test_parent_tbl;
+-- Should not have access to parent, and should leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+ERROR:  permission denied for table priv_test_parent_tbl
+-- Grant table access to parent, but hide all data with RLS
+RESET SESSION AUTHORIZATION;
+ALTER TABLE tststats.priv_test_parent_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_parent_tbl_pol ON tststats.priv_test_parent_tbl USING (2 * a < 0);
+GRANT SELECT, DELETE ON tststats.priv_test_parent_tbl TO regress_stats_user1;
+-- Should now have direct table access to parent, but see nothing and leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+ a | b 
+---+---
+(0 rows)
+
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
 -- privilege checks for pg_stats_ext and pg_stats_ext_exprs
 RESET SESSION AUTHORIZATION;
 CREATE TABLE stats_ext_tbl (id INT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, col TEXT);
@@ -3358,15 +3451,55 @@ SELECT statistics_name, most_common_vals FROM pg_stats_ext_exprs x
  s_expr          | {1}
 (2 rows)
 
+-- CREATE STATISTICS checks for CREATE on the schema
+RESET SESSION AUTHORIZATION;
+CREATE SCHEMA sts_sch1 CREATE TABLE sts_sch1.tbl (a INT, b INT, c INT GENERATED ALWAYS AS (b * 2) STORED);
+CREATE SCHEMA sts_sch2;
+GRANT USAGE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+ALTER TABLE sts_sch1.tbl OWNER TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch1
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch2
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch2
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1 FROM regress_stats_user1;
+GRANT CREATE ON SCHEMA sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+ERROR:  permission denied for schema sts_sch1
+CREATE STATISTICS sts_sch2.pass1 ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass2 ON a, b, c FROM sts_sch1.tbl;
+-- re-creating statistics via ALTER TABLE bypasses checks for CREATE on schema
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1, sts_sch2 FROM regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN a TYPE SMALLINT;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN c SET EXPRESSION AS (a * 3);
 -- Tidy up
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
+DROP OPERATOR <<< (record, record);
+DROP FUNCTION op_leak(record, record);
 RESET SESSION AUTHORIZATION;
 DROP TABLE stats_ext_tbl;
 DROP SCHEMA tststats CASCADE;
-NOTICE:  drop cascades to 2 other objects
-DETAIL:  drop cascades to table tststats.priv_test_tbl
+NOTICE:  drop cascades to 3 other objects
+DETAIL:  drop cascades to table tststats.priv_test_parent_tbl
+drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
+DROP SCHEMA sts_sch1, sts_sch2 CASCADE;
+NOTICE:  drop cascades to table sts_sch1.tbl
 DROP USER regress_stats_user1;
 CREATE TABLE grouping_unique (x integer);
 INSERT INTO grouping_unique (x) SELECT gs FROM generate_series(1,1000) AS gs;
diff --git a/src/test/regress/expected/stats_import.out b/src/test/regress/expected/stats_import.out
index 48d6392b4ad..2efd422df16 100644
--- a/src/test/regress/expected/stats_import.out
+++ b/src/test/regress/expected/stats_import.out
@@ -50,26 +50,26 @@ SELECT pg_clear_relation_stats('stats_import', 'test');
 SELECT pg_catalog.pg_restore_relation_stats(
         'relname', 'test',
         'relpages', 17::integer);
-ERROR:  "schemaname" cannot be NULL
+ERROR:  argument "schemaname" must not be null
 -- error: relname missing
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relpages', 17::integer);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 --- error: schemaname is wrong type
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 3.6::float,
         'relname', 'test',
         'relpages', 17::integer);
-WARNING:  argument "schemaname" has type "double precision", expected type "text"
-ERROR:  "schemaname" cannot be NULL
+WARNING:  argument "schemaname" has type double precision, expected type text
+ERROR:  argument "schemaname" must not be null
 --- error: relname is wrong type
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relname', 0::oid,
         'relpages', 17::integer);
-WARNING:  argument "relname" has type "oid", expected type "text"
-ERROR:  "relname" cannot be NULL
+WARNING:  argument "relname" has type oid, expected type text
+ERROR:  argument "relname" must not be null
 -- error: relation not found
 SELECT pg_catalog.pg_restore_relation_stats(
         'schemaname', 'stats_import',
@@ -88,7 +88,7 @@ SELECT pg_restore_relation_stats(
         'schemaname', 'stats_import',
         'relname', 'test',
         NULL, '17'::integer);
-ERROR:  name at variadic position 5 is NULL
+ERROR:  name at variadic position 5 is null
 -- starting stats
 SELECT relpages, reltuples, relallvisible, relallfrozen
 FROM pg_class
@@ -120,9 +120,9 @@ WHERE relation = 'stats_import.test'::regclass AND
 SELECT mode FROM pg_locks
 WHERE relation = 'stats_import.test_i'::regclass AND
       pid = pg_backend_pid() AND granted;
-      mode       
------------------
- AccessShareLock
+           mode           
+--------------------------
+ ShareUpdateExclusiveLock
 (1 row)
 
 COMMIT;
@@ -286,7 +286,7 @@ SELECT pg_restore_relation_stats(
         'reltuples', 400.0::real,
         'relallvisible', 4::integer,
         'relallfrozen', 3::integer);
-WARNING:  argument "relpages" has type "text", expected type "integer"
+WARNING:  argument "relpages" has type text, expected type integer
  pg_restore_relation_stats 
 ---------------------------
  f
@@ -358,7 +358,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "schemaname" cannot be NULL
+ERROR:  argument "schemaname" must not be null
 -- error: schema does not exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'nope',
@@ -373,7 +373,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 -- error: relname does not exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -389,7 +389,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  "relname" cannot be NULL
+ERROR:  argument "relname" must not be null
 -- error: NULL attname
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -397,7 +397,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', NULL,
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  must specify either attname or attnum
+ERROR:  must specify either "attname" or "attnum"
 -- error: attname doesn't exist
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -416,14 +416,14 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attnum', 1::smallint,
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  cannot specify both attname and attnum
+ERROR:  cannot specify both "attname" and "attnum"
 -- error: neither attname nor attnum
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
     'relname', 'test',
     'inherited', false::boolean,
     'null_frac', 0.1::real);
-ERROR:  must specify either attname or attnum
+ERROR:  must specify either "attname" or "attnum"
 -- error: attribute is system column
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -439,7 +439,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'attname', 'id',
     'inherited', NULL::boolean,
     'null_frac', 0.1::real);
-ERROR:  "inherited" cannot be NULL
+ERROR:  argument "inherited" must not be null
 -- ok: just the fixed values, with version, no stakinds
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -527,7 +527,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.21::real,
     'most_common_freqs', '{0.1,0.2,0.3}'::real[]
     );
-WARNING:  "most_common_vals" must be specified when "most_common_freqs" is specified
+WARNING:  argument "most_common_vals" must be specified when argument "most_common_freqs" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -553,7 +553,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.21::real,
     'most_common_vals', '{1,2,3}'::text
     );
-WARNING:  "most_common_freqs" must be specified when "most_common_vals" is specified
+WARNING:  argument "most_common_freqs" must be specified when argument "most_common_vals" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -580,8 +580,8 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_vals', '{2,1,3}'::text,
     'most_common_freqs', '{0.2,0.1}'::double precision[]
     );
-WARNING:  argument "most_common_freqs" has type "double precision[]", expected type "real[]"
-WARNING:  "most_common_freqs" must be specified when "most_common_vals" is specified
+WARNING:  argument "most_common_freqs" has type double precision[], expected type real[]
+WARNING:  argument "most_common_freqs" must be specified when argument "most_common_vals" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -625,6 +625,87 @@ AND attname = 'id';
  stats_import | test      | id      | f         |      0.23 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
 (1 row)
 
+-- warn: mcv / mcf array length mismatch (more vals), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.24::real,
+    'most_common_vals', '{2,1,3}'::text,
+    'most_common_freqs', '{0.3,0.25}'::real[]
+    );
+WARNING:  could not parse "most_common_vals": incorrect number of elements (same as "most_common_freqs" required)
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.24 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
+-- warn: mcv / mcf array length mismatch (more freqs), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.25::real,
+    'most_common_vals', '{2,1}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05}'::real[]
+    );
+WARNING:  could not parse "most_common_vals": incorrect number of elements (same as "most_common_freqs" required)
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.25 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
+-- warn: most_common_vals is multi-dimensional, mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.26::real,
+    'most_common_vals', '{{2,1},{3,4}}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05,0.04}'::real[]
+    );
+WARNING:  "most_common_vals" must be a one-dimensional array
+ pg_restore_attribute_stats 
+----------------------------
+ f
+(1 row)
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+  schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
+--------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
+ stats_import | test      | id      | f         |      0.26 |         5 |        0.6 |                  |                   |                  |             |                   |                        |                      |                        |                  | 
+(1 row)
+
 -- ok: mcv+mcf
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
@@ -647,7 +728,7 @@ AND inherited = false
 AND attname = 'id';
   schemaname  | tablename | attname | inherited | null_frac | avg_width | n_distinct | most_common_vals | most_common_freqs | histogram_bounds | correlation | most_common_elems | most_common_elem_freqs | elem_count_histogram | range_length_histogram | range_empty_frac | range_bounds_histogram 
 --------------+-----------+---------+-----------+-----------+-----------+------------+------------------+-------------------+------------------+-------------+-------------------+------------------------+----------------------+------------------------+------------------+------------------------
- stats_import | test      | id      | f         |      0.23 |         5 |        0.6 | {2,1,3}          | {0.3,0.25,0.05}   |                  |             |                   |                        |                      |                        |                  | 
+ stats_import | test      | id      | f         |      0.26 |         5 |        0.6 | {2,1,3}          | {0.3,0.25,0.05}   |                  |             |                   |                        |                      |                        |                  | 
 (1 row)
 
 -- warn: NULL in histogram array, rest get set
@@ -659,7 +740,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.24::real,
     'histogram_bounds', '{1,NULL,3,4}'::text
     );
-WARNING:  "histogram_bounds" array cannot contain NULL values
+WARNING:  "histogram_bounds" array must not contain null values
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -709,7 +790,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.25::real,
     'elem_count_histogram', '{1,1,NULL,1,1,1,1,1}'::real[]
     );
-WARNING:  "elem_count_histogram" array cannot contain NULL values
+WARNING:  argument "elem_count_histogram" array must not contain null values
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -761,7 +842,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'range_empty_frac', 0.5::real,
     'range_length_histogram', '{399,499,Infinity}'::text
     );
-WARNING:  attribute "id" is not a range type
+WARNING:  column "id" is not a range type
 DETAIL:  Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM.
  pg_restore_attribute_stats 
 ----------------------------
@@ -788,7 +869,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.28::real,
     'range_length_histogram', '{399,499,Infinity}'::text
     );
-WARNING:  "range_empty_frac" must be specified when "range_length_histogram" is specified
+WARNING:  argument "range_empty_frac" must be specified when argument "range_length_histogram" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -814,7 +895,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.29::real,
     'range_empty_frac', 0.5::real
     );
-WARNING:  "range_length_histogram" must be specified when "range_empty_frac" is specified
+WARNING:  argument "range_length_histogram" must be specified when argument "range_empty_frac" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -865,7 +946,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.31::real,
     'range_bounds_histogram', '{"[-1,1)","[0,4)","[1,4)","[1,100)"}'::text
     );
-WARNING:  attribute "id" is not a range type
+WARNING:  column "id" is not a range type
 DETAIL:  Cannot set STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM or STATISTIC_KIND_BOUNDS_HISTOGRAM.
  pg_restore_attribute_stats 
 ----------------------------
@@ -917,7 +998,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_elems', '{3,1}'::text,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3,0.0}'::real[]
     );
-WARNING:  unable to determine element type of attribute "arange"
+WARNING:  could not determine element type of column "arange"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
@@ -945,7 +1026,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'most_common_elems', '{1,3}'::text,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3,0.0}'::real[]
     );
-WARNING:  unable to determine element type of attribute "id"
+WARNING:  could not determine element type of column "id"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
@@ -972,7 +1053,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.34::real,
     'most_common_elems', '{one,two}'::text
     );
-WARNING:  "most_common_elem_freqs" must be specified when "most_common_elems" is specified
+WARNING:  argument "most_common_elem_freqs" must be specified when argument "most_common_elems" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -998,7 +1079,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.35::real,
     'most_common_elem_freqs', '{0.3,0.2,0.2,0.3}'::real[]
     );
-WARNING:  "most_common_elems" must be specified when "most_common_elem_freqs" is specified
+WARNING:  argument "most_common_elems" must be specified when argument "most_common_elem_freqs" is specified
  pg_restore_attribute_stats 
 ----------------------------
  f
@@ -1049,7 +1130,7 @@ SELECT pg_catalog.pg_restore_attribute_stats(
     'null_frac', 0.36::real,
     'elem_count_histogram', '{1,1,1,1,1,1,1,1,1,1}'::real[]
     );
-WARNING:  unable to determine element type of attribute "id"
+WARNING:  could not determine element type of column "id"
 DETAIL:  Cannot set STATISTIC_KIND_MCELEM or STATISTIC_KIND_DECHIST.
  pg_restore_attribute_stats 
 ----------------------------
diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index 788844abd20..b9c5d4c12b8 100644
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -681,6 +681,15 @@ EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[^^]^';
    Filter: (f1 ~ '^(?:[^^]\^)$'::text)
 (2 rows)
 
+-- Closing square bracket after an escape sequence at the beginning of
+-- a character closes the character class
+EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[|a]%' ESCAPE '|';
+              QUERY PLAN               
+---------------------------------------
+ Seq Scan on text_tbl
+   Filter: (f1 ~ '^(?:[\a].*)$'::text)
+(2 rows)
+
 -- Test backslash escapes in regexp_replace's replacement string
 SELECT regexp_replace('1112223333', E'(\\d{3})(\\d{3})(\\d{4})', E'(\\1) \\2-\\3');
  regexp_replace 
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index 40d8056fcea..323429d896f 100644
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -676,6 +676,23 @@ select * from (
    0
 (1 row)
 
+--
+-- Test cases for interactions between PARAM_EXEC, subplans and array
+-- subscripts
+--
+-- check that array subscription doesn't conflict with PARAM_EXEC (see #19370)
+SELECT (array[1,2])[(SELECT g.i)] FROM generate_series(1, 1) g(i);
+ array 
+-------
+     1
+(1 row)
+
+SELECT (array[1,2])[(SELECT g.i):(SELECT g.i + 1)] FROM generate_series(1, 1) g(i);
+ array 
+-------
+ {1,2}
+(1 row)
+
 --
 -- Test that an IN implemented using a UniquePath does unique-ification
 -- with the right semantics, as per bug #4113.  (Unfortunately we have
@@ -773,6 +790,25 @@ select (select (a.*)::text) from view_a a;
  (42)
 (1 row)
 
+--
+-- Test case for bug #19037: no relation entry for relid N
+--
+explain (costs off)
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+         QUERY PLAN         
+----------------------------
+ Aggregate
+   ->  Seq Scan on int4_tbl
+   SubPlan 1
+     ->  Result
+(4 rows)
+
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+ ?column? 
+----------
+ t
+(1 row)
+
 --
 -- Check that whole-row Vars reading the result of a subselect don't include
 -- any junk columns therein
@@ -1695,6 +1731,110 @@ NOTICE:  x = 9, y = 13
  9 | 3
 (3 rows)
 
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains SRFs
+--
+explain (verbose, costs off)
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+                                                                                                                            QUERY PLAN                                                                                                                             
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Subquery Scan on ss
+   Output: ss.g, ss.count
+   Filter: (ss.g = 1)
+   ->  HashAggregate
+         Output: (generate_series(1, tenk1.ten)), count(*)
+         Group Key: generate_series(1, tenk1.ten)
+         ->  ProjectSet
+               Output: generate_series(1, tenk1.ten)
+               ->  Seq Scan on public.tenk1
+                     Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, tenk1.thousand, tenk1.twothousand, tenk1.fivethous, tenk1.tenthous, tenk1.odd, tenk1.even, tenk1.stringu1, tenk1.stringu2, tenk1.string4
+(10 rows)
+
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+ g | count 
+---+-------
+ 1 |  9000
+(1 row)
+
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains volatile functions
+--
+alter function tattle(x int, y int) volatile;
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Subquery Scan on ss
+   Output: ss.v, ss.count
+   Filter: ss.v
+   ->  GroupAggregate
+         Output: (tattle(3, tenk1.ten)), count(*)
+         Group Key: (tattle(3, tenk1.ten))
+         ->  Sort
+               Output: (tattle(3, tenk1.ten))
+               Sort Key: (tattle(3, tenk1.ten))
+               ->  Bitmap Heap Scan on public.tenk1
+                     Output: tattle(3, tenk1.ten)
+                     Recheck Cond: (tenk1.unique1 < 3)
+                     ->  Bitmap Index Scan on tenk1_unique1
+                           Index Cond: (tenk1.unique1 < 3)
+(14 rows)
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 0
+ v | count 
+---+-------
+ t |     3
+(1 row)
+
+-- if we pretend it's stable, we get different results:
+alter function tattle(x int, y int) stable;
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+                      QUERY PLAN                      
+------------------------------------------------------
+ GroupAggregate
+   Output: (tattle(3, tenk1.ten)), count(*)
+   Group Key: (tattle(3, tenk1.ten))
+   ->  Sort
+         Output: (tattle(3, tenk1.ten))
+         Sort Key: (tattle(3, tenk1.ten))
+         ->  Bitmap Heap Scan on public.tenk1
+               Output: tattle(3, tenk1.ten)
+               Recheck Cond: (tenk1.unique1 < 3)
+               Filter: tattle(3, tenk1.ten)
+               ->  Bitmap Index Scan on tenk1_unique1
+                     Index Cond: (tenk1.unique1 < 3)
+(12 rows)
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 2
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 1
+NOTICE:  x = 3, y = 0
+NOTICE:  x = 3, y = 0
+ v | count 
+---+-------
+ t |     3
+(1 row)
+
 drop function tattle(x int, y int);
 --
 -- Test that LIMIT can be pushed to SORT through a subquery that just projects
@@ -1764,6 +1904,34 @@ fetch backward all in c1;
 
 commit;
 --
+-- Check that JsonConstructorExpr is treated as non-strict, and thus can be
+-- wrapped in a PlaceHolderVar
+--
+begin;
+create temp table json_tab (a int);
+insert into json_tab values (1);
+explain (verbose, costs off)
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Nested Loop Left Join
+   Output: t1.a, (JSON_ARRAY(1, a RETURNING json))
+   Join Filter: false
+   ->  Seq Scan on pg_temp.json_tab t1
+         Output: t1.a
+   ->  Result
+         Output: JSON_ARRAY(1, a RETURNING json)
+         One-Time Filter: false
+(8 rows)
+
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+ a | json_array 
+---+------------
+ 1 | 
+(1 row)
+
+rollback;
+--
 -- Verify that we correctly flatten cases involving a subquery output
 -- expression that doesn't need to be wrapped in a PlaceHolderVar
 --
diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out
index 6aaa19c8f4e..14a9f5b56a6 100644
--- a/src/test/regress/expected/timestamp.out
+++ b/src/test/regress/expected/timestamp.out
@@ -591,6 +591,16 @@ SELECT date_trunc( 'week', timestamp '2004-02-29 15:44:17.71393' ) AS week_trunc
  Mon Feb 23 00:00:00 2004
 (1 row)
 
+SELECT date_trunc( 'week', timestamp 'infinity' ) AS inf_trunc;
+ inf_trunc 
+-----------
+ infinity
+(1 row)
+
+SELECT date_trunc( 'timezone', timestamp '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+ERROR:  unit "timezone" not supported for type timestamp without time zone
+SELECT date_trunc( 'timezone', timestamp 'infinity' ) AS notsupp_inf_trunc;
+ERROR:  unit "timezone" not supported for type timestamp without time zone
 SELECT date_trunc( 'ago', timestamp 'infinity' ) AS invalid_trunc;
 ERROR:  unit "ago" not recognized for type timestamp without time zone
 -- verify date_bin behaves the same as date_trunc for relevant intervals
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 2a69953ff25..5dc8a621f6c 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -760,6 +760,16 @@ SELECT date_trunc( 'week', timestamp with time zone '2004-02-29 15:44:17.71393'
  Mon Feb 23 00:00:00 2004 PST
 (1 row)
 
+SELECT date_trunc( 'week', timestamp with time zone 'infinity' ) AS inf_trunc;
+ inf_trunc 
+-----------
+ infinity
+(1 row)
+
+SELECT date_trunc( 'timezone', timestamp with time zone '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+ERROR:  unit "timezone" not supported for type timestamp with time zone
+SELECT date_trunc( 'timezone', timestamp with time zone 'infinity' ) AS notsupp_inf_trunc;
+ERROR:  unit "timezone" not supported for type timestamp with time zone
 SELECT date_trunc( 'ago', timestamp with time zone 'infinity' ) AS invalid_trunc;
 ERROR:  unit "ago" not recognized for type timestamp with time zone
 SELECT date_trunc('day', timestamp with time zone '2001-02-16 20:38:40+00', 'Australia/Sydney') as sydney_trunc;  -- zone name
@@ -780,6 +790,14 @@ SELECT date_trunc('day', timestamp with time zone '2001-02-16 20:38:40+00', 'VET
  Thu Feb 15 20:00:00 2001 PST
 (1 row)
 
+SELECT date_trunc('timezone', timestamp with time zone 'infinity', 'GMT') AS notsupp_zone_trunc;
+ERROR:  unit "timezone" not supported for type timestamp with time zone
+SELECT date_trunc( 'week', timestamp with time zone 'infinity', 'GMT') AS inf_zone_trunc;
+ inf_zone_trunc 
+----------------
+ infinity
+(1 row)
+
 SELECT date_trunc('ago', timestamp with time zone 'infinity', 'GMT') AS invalid_zone_trunc;
 ERROR:  unit "ago" not recognized for type timestamp with time zone
 -- verify date_bin behaves the same as date_trunc for relevant intervals
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 2bf0e77d61e..fac786cb5d1 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -2748,6 +2748,10 @@ NOTICE:  trigger = child3_delete_trig, old table = (42,CCC)
 -- copy into parent sees parent-format tuples
 copy parent (a, b) from stdin;
 NOTICE:  trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)
+-- check detach/reattach behavior; statement triggers with transition tables
+-- should not prevent a table from becoming a partition again
+alter table parent detach partition child1;
+alter table parent attach partition child1 for values in ('AAA');
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2945,6 +2949,10 @@ NOTICE:  trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)
 create index on parent(b);
 copy parent (a, b) from stdin;
 NOTICE:  trigger = parent_insert_trig, new table = (DDD,42)
+-- check disinherit/reinherit behavior; statement triggers with transition
+-- tables should not prevent a table from becoming an inheritance child again
+alter table child1 no inherit parent;
+alter table child1 inherit parent;
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -3004,13 +3012,19 @@ NOTICE:  trigger = table1_trig, new table = (42)
 with wcte as (insert into table1 values (43))
   insert into table1 values (44);
 NOTICE:  trigger = table1_trig, new table = (43), (44)
+with wcte as (insert into table1 values (45))
+  merge into table1 using (values (46)) as v(a) on table1.a = v.a
+    when not matched then insert values (v.a);
+NOTICE:  trigger = table1_trig, new table = (45), (46)
 select * from table1;
  a  
 ----
  42
  44
  43
-(3 rows)
+ 46
+ 45
+(5 rows)
 
 select * from table2;
       a      
diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
index 9fad6c8b04b..5b7c2123f37 100644
--- a/src/test/regress/expected/tsearch.out
+++ b/src/test/regress/expected/tsearch.out
@@ -870,6 +870,7 @@ RESET enable_seqscan;
 RESET enable_indexscan;
 RESET enable_bitmapscan;
 DROP INDEX wowidx;
+ALTER TABLE test_tsvector SET (parallel_workers = 2);
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 SET enable_seqscan=OFF;
 -- GIN only supports bitmapscan, so no need to test plain indexscan
@@ -2144,6 +2145,16 @@ NOTICE:  text-search query doesn't contain lexemes: ""
  foo bar
 (1 row)
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+ERROR:  value for "StartSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+ERROR:  value for "StopSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+ERROR:  value for "FragmentDelimiter" is too long
 --Rewrite sub system
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
 \set ECHO none
diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index 96962817ed4..984db95608c 100644
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -1500,3 +1500,20 @@ on true limit 1;
                ->  Result
 (6 rows)
 
+-- Test handling of Vars with varno 0 in estimate_array_length
+explain (verbose, costs off)
+select null::int[] union all select null::int[] union all select null::bigint[];
+                 QUERY PLAN                  
+---------------------------------------------
+ Append
+   ->  Result
+         Output: (NULL::integer[])
+         ->  Append
+               ->  Result
+                     Output: NULL::integer[]
+               ->  Result
+                     Output: NULL::integer[]
+   ->  Result
+         Output: NULL::bigint[]
+(10 rows)
+
diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index b86b668f433..6ee01f37009 100644
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -1361,6 +1361,97 @@ SELECT pg_get_viewdef('v_window');
     FROM generate_series(now(), (now() + '@ 100 days'::interval), '@ 1 hour'::interval) i(i);
 (1 row)
 
+-- test overflow frame specifications
+SELECT sum(unique1) over (rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  41 |       4 |    0
+  39 |       2 |    2
+  38 |       1 |    1
+  32 |       6 |    2
+  23 |       9 |    1
+  15 |       8 |    0
+  10 |       5 |    1
+   7 |       3 |    3
+   0 |       7 |    3
+     |       0 |    0
+(10 rows)
+
+SELECT sum(unique1) over (rows between 9223372036854775807 following and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       4 |    0
+     |       2 |    2
+     |       1 |    1
+     |       6 |    2
+     |       9 |    1
+     |       8 |    0
+     |       5 |    1
+     |       3 |    3
+     |       7 |    3
+     |       0 |    0
+(10 rows)
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ last_value | unique1 | four 
+------------+---------+------
+          7 |       0 |    0
+          7 |       8 |    0
+          7 |       4 |    0
+          7 |       5 |    1
+          7 |       9 |    1
+          7 |       1 |    1
+          7 |       6 |    2
+          7 |       2 |    2
+          7 |       3 |    3
+            |       7 |    3
+(10 rows)
+
+-- These test GROUPS mode with an offset large enough to cause overflow when
+-- added to currentgroup.  Although the overflow doesn't produce visibly wrong
+-- results (due to the incremental nature of group pointer advancement), we
+-- still need to protect against it as signed integer overflow is undefined
+-- behavior in C.
+SELECT sum(unique1) over (ORDER BY four groups between current row and 9223372036854775807 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  45 |       0 |    0
+  45 |       8 |    0
+  45 |       4 |    0
+  33 |       5 |    1
+  33 |       9 |    1
+  33 |       1 |    1
+  18 |       6 |    2
+  18 |       2 |    2
+  10 |       3 |    3
+  10 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (ORDER BY four groups between 9223372036854775807 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+     |       5 |    1
+     |       9 |    1
+     |       1 |    1
+     |       6 |    2
+     |       2 |    2
+     |       3 |    3
+     |       7 |    3
+(10 rows)
+
 -- RANGE offset PRECEDING/FOLLOWING tests
 SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
 	unique1, four
diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out
index 26c88505140..7b1969e609f 100644
--- a/src/test/regress/expected/with.out
+++ b/src/test/regress/expected/with.out
@@ -2296,6 +2296,48 @@ from int4_tbl;
  -2147483647
 (5 rows)
 
+--
+-- test for bug #19055: interaction of WITH with aggregates
+--
+-- For now, we just throw an error if there's a use of a CTE below the
+-- semantic level that the SQL standard assigns to the aggregate.
+-- It's not entirely clear what we could do instead that doesn't risk
+-- breaking more things than it fixes.
+select f1, (with cte1(x,y) as (select 1,2)
+            select count((select i4.f1 from cte1))) as ss
+from int4_tbl i4;
+ERROR:  outer-level aggregate cannot use a nested CTE
+LINE 2:             select count((select i4.f1 from cte1))) as ss
+                           ^
+DETAIL:  CTE "cte1" is below the aggregate's semantic level.
+--
+-- test for bug #19106: interaction of WITH with aggregates
+--
+-- the initial fix for #19055 was too aggressive and broke this case
+explain (verbose, costs off)
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+                 QUERY PLAN                 
+--------------------------------------------
+ Aggregate
+   Output: max((InitPlan 1).col1)
+   InitPlan 1
+     ->  Aggregate
+           Output: sum("*VALUES*".column1)
+           ->  Values Scan on "*VALUES*"
+                 Output: "*VALUES*".column1
+   ->  Result
+(8 rows)
+
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+ agg 
+-----
+   3
+(1 row)
+
 --
 -- test for nested-recursive-WITH bug
 --
@@ -2829,6 +2871,47 @@ SELECT * FROM bug6051_3;
 ---
 (0 rows)
 
+-- check that recursive CTE processing doesn't rewrite a CTE more than once
+-- (must not try to expand GENERATED ALWAYS IDENTITY columns more than once)
+CREATE TEMP TABLE id_alw1 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP TABLE id_alw2 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP VIEW id_alw2_view AS SELECT * FROM id_alw2;
+CREATE TEMP TABLE id_alw3 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE RULE id_alw3_ins AS ON INSERT TO id_alw3 DO INSTEAD
+  WITH t1 AS (INSERT INTO id_alw1 DEFAULT VALUES RETURNING i)
+    INSERT INTO id_alw2_view DEFAULT VALUES RETURNING i;
+CREATE TEMP VIEW id_alw3_view AS SELECT * FROM id_alw3;
+CREATE TEMP TABLE id_alw4 (i int GENERATED ALWAYS AS IDENTITY);
+WITH t4 AS (INSERT INTO id_alw4 DEFAULT VALUES RETURNING i)
+  INSERT INTO id_alw3_view DEFAULT VALUES RETURNING i;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw1;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw2;
+ i 
+---
+ 1
+(1 row)
+
+SELECT * from id_alw3;
+ i 
+---
+(0 rows)
+
+SELECT * from id_alw4;
+ i 
+---
+ 1
+(1 row)
+
 -- check case where CTE reference is removed due to optimization
 EXPLAIN (VERBOSE, COSTS OFF)
 SELECT q1 FROM
diff --git a/src/test/regress/expected/without_overlaps.out b/src/test/regress/expected/without_overlaps.out
index f3144bdc39c..28cb655981b 100644
--- a/src/test/regress/expected/without_overlaps.out
+++ b/src/test/regress/expected/without_overlaps.out
@@ -311,6 +311,45 @@ ALTER TABLE temporal_rng3 DROP CONSTRAINT temporal_rng3_uq;
 DROP TABLE temporal_rng3;
 DROP TYPE textrange2;
 --
+-- test PRIMARY KEY and UNIQUE constraints' interaction with domains
+--
+-- range over domain:
+CREATE DOMAIN int4_d as integer check (value <> 10);
+CREATE TYPE int4_d_range as range (subtype = int4_d);
+CREATE TABLE temporal_rng4 (
+  id int4range,
+  valid_at int4_d_range,
+  CONSTRAINT temporal_rng4_pk PRIMARY KEY(id, valid_at WITHOUT OVERLAPS)
+);
+INSERT INTO temporal_rng4 VALUES ('[1,11)', '[9,10)'); -- start bound violates domain
+ERROR:  value for domain int4_d violates check constraint "int4_d_check"
+LINE 1: INSERT INTO temporal_rng4 VALUES ('[1,11)', '[9,10)');
+                                                    ^
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[10,11)'); -- end bound violates domain
+ERROR:  value for domain int4_d violates check constraint "int4_d_check"
+LINE 1: INSERT INTO temporal_rng4 VALUES ('[1,2)', '[10,11)');
+                                                   ^
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[2,5)'); -- overlaps
+ERROR:  conflicting key value violates exclusion constraint "temporal_rng4_pk"
+DETAIL:  Key (id, valid_at)=([1,2), [2,5)) conflicts with existing key (id, valid_at)=([1,2), [1,13)).
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[20,23)'); -- okay
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[30,)'); -- null bound is okay
+DROP TABLE temporal_rng4;
+-- domain over range:
+CREATE DOMAIN int4range_d AS int4range CHECK (VALUE <> '[10,11)');
+CREATE TABLE temporal_rng4 (
+  id int4range,
+  valid_at int4range_d,
+  CONSTRAINT temporal_rng4_pk UNIQUE (id, valid_at WITHOUT OVERLAPS)
+);
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[10,11)'); -- violates domain
+ERROR:  value for domain int4range_d violates check constraint "int4range_d_check"
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[2,13)'); -- overlaps
+ERROR:  conflicting key value violates exclusion constraint "temporal_rng4_pk"
+DETAIL:  Key (id, valid_at)=([1,2), [2,13)) conflicts with existing key (id, valid_at)=([1,2), [1,13)).
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[20,23)'); -- okay
+DROP TABLE temporal_rng4;
+--
 -- test ALTER TABLE ADD CONSTRAINT
 --
 CREATE TABLE temporal_rng (
diff --git a/src/test/regress/ora_pg_regress.c b/src/test/regress/ora_pg_regress.c
index 8177fbc78e7..094cf99b799 100644
--- a/src/test/regress/ora_pg_regress.c
+++ b/src/test/regress/ora_pg_regress.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/oracle_test/regress/ora_pg_regress.c
  *
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index a424be2a6bf..e1e0c540194 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -28,7 +28,7 @@ test: strings md5 numerology point lseg line box path polygon circle date time t
 # geometry depends on point, lseg, line, box, path, polygon, circle
 # horology depends on date, time, timetz, timestamp, timestamptz, interval
 # ----------
-test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import
+test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import encoding euc_kr
 
 # ----------
 # Load huge amounts of data
@@ -123,7 +123,12 @@ test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion tr
 # The stats test resets stats, so nothing else needing stats access can be in
 # this group.
 # ----------
-test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain compression memoize stats predicate numa
+test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain memoize stats predicate numa
+
+# ----------
+# Another group of parallel tests (compression)
+# ----------
+test: compression compression_pglz
 
 # event_trigger depends on create_am and cannot run concurrently with
 # any test that runs DDL
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index e1f1fa72bc2..4e7ae0a9a78 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -10,7 +10,7 @@
  *
  * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
- * Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+ * Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
  *
  * src/test/regress/pg_regress.c
  *
@@ -694,7 +694,7 @@ static
 const char *
 get_expectfile(const char *testname, const char *file)
 {
-	char	   *file_type;
+	const char *file_type;
 	_resultmap *rm;
 
 	/*
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 3dbba069024..49672f1dfc0 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -27,6 +27,7 @@
 #include "catalog/pg_type.h"
 #include "commands/sequence.h"
 #include "commands/trigger.h"
+#include "common/pg_lzcompress.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "funcapi.h"
@@ -990,6 +991,145 @@ test_enc_conversion(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(HeapTupleGetDatum(tuple));
 }
 
+/* Convert bytea to text without validation for corruption tests from SQL. */
+PG_FUNCTION_INFO_V1(test_bytea_to_text);
+Datum
+test_bytea_to_text(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_TEXT_P(PG_GETARG_BYTEA_PP(0));
+}
+
+/* And the reverse. */
+PG_FUNCTION_INFO_V1(test_text_to_bytea);
+Datum
+test_text_to_bytea(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BYTEA_P(PG_GETARG_TEXT_PP(0));
+}
+
+/* Corruption tests in C. */
+PG_FUNCTION_INFO_V1(test_mblen_func);
+Datum
+test_mblen_func(PG_FUNCTION_ARGS)
+{
+	const char *func = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	const char *encoding = text_to_cstring(PG_GETARG_BYTEA_PP(1));
+	text	   *string = PG_GETARG_BYTEA_PP(2);
+	int			offset = PG_GETARG_INT32(3);
+	const char *data = VARDATA_ANY(string);
+	size_t		size = VARSIZE_ANY_EXHDR(string);
+	int			result = 0;
+
+	if (strcmp(func, "pg_mblen_unbounded") == 0)
+		result = pg_mblen_unbounded(data + offset);
+	else if (strcmp(func, "pg_mblen_cstr") == 0)
+		result = pg_mblen_cstr(data + offset);
+	else if (strcmp(func, "pg_mblen_with_len") == 0)
+		result = pg_mblen_with_len(data + offset, size - offset);
+	else if (strcmp(func, "pg_mblen_range") == 0)
+		result = pg_mblen_range(data + offset, data + size);
+	else if (strcmp(func, "pg_encoding_mblen") == 0)
+		result = pg_encoding_mblen(pg_char_to_encoding(encoding), data + offset);
+	else
+		elog(ERROR, "unknown function");
+
+	PG_RETURN_INT32(result);
+}
+
+PG_FUNCTION_INFO_V1(test_text_to_wchars);
+Datum
+test_text_to_wchars(PG_FUNCTION_ARGS)
+{
+	const char *encoding_name = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	text	   *string = PG_GETARG_TEXT_PP(1);
+	const char *data = VARDATA_ANY(string);
+	size_t		size = VARSIZE_ANY_EXHDR(string);
+	pg_wchar   *wchars = palloc(sizeof(pg_wchar) * (size + 1));
+	Datum	   *datums;
+	int			wlen;
+	int			encoding;
+
+	encoding = pg_char_to_encoding(encoding_name);
+	if (encoding < 0)
+		elog(ERROR, "unknown encoding name: %s", encoding_name);
+
+	if (size > 0)
+	{
+		datums = palloc(sizeof(Datum) * size);
+		wlen = pg_encoding_mb2wchar_with_len(encoding,
+											 data,
+											 wchars,
+											 size);
+		Assert(wlen >= 0);
+		Assert(wlen <= size);
+		Assert(wchars[wlen] == 0);
+
+		for (int i = 0; i < wlen; ++i)
+			datums[i] = UInt32GetDatum(wchars[i]);
+	}
+	else
+	{
+		datums = NULL;
+		wlen = 0;
+	}
+
+	PG_RETURN_ARRAYTYPE_P(construct_array_builtin(datums, wlen, INT4OID));
+}
+
+PG_FUNCTION_INFO_V1(test_wchars_to_text);
+Datum
+test_wchars_to_text(PG_FUNCTION_ARGS)
+{
+	const char *encoding_name = text_to_cstring(PG_GETARG_BYTEA_PP(0));
+	ArrayType  *array = PG_GETARG_ARRAYTYPE_P(1);
+	Datum	   *datums;
+	bool	   *nulls;
+	char	   *mb;
+	text	   *result;
+	int			wlen;
+	int			bytes;
+	int			encoding;
+
+	encoding = pg_char_to_encoding(encoding_name);
+	if (encoding < 0)
+		elog(ERROR, "unknown encoding name: %s", encoding_name);
+
+	deconstruct_array_builtin(array, INT4OID, &datums, &nulls, &wlen);
+
+	if (wlen > 0)
+	{
+		pg_wchar   *wchars = palloc(sizeof(pg_wchar) * wlen);
+
+		for (int i = 0; i < wlen; ++i)
+		{
+			if (nulls[i])
+				elog(ERROR, "unexpected NULL in array");
+			wchars[i] = DatumGetInt32(datums[i]);
+		}
+
+		mb = palloc(pg_encoding_max_length(encoding) * wlen + 1);
+		bytes = pg_encoding_wchar2mb_with_len(encoding, wchars, mb, wlen);
+	}
+	else
+	{
+		mb = "";
+		bytes = 0;
+	}
+
+	result = palloc(bytes + VARHDRSZ);
+	SET_VARSIZE(result, bytes + VARHDRSZ);
+	memcpy(VARDATA(result), mb, bytes);
+
+	PG_RETURN_TEXT_P(result);
+}
+
+PG_FUNCTION_INFO_V1(test_valid_server_encoding);
+Datum
+test_valid_server_encoding(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_BOOL(pg_valid_server_encoding(text_to_cstring(PG_GETARG_TEXT_PP(0))) >= 0);
+}
+
 /* Provide SQL access to IsBinaryCoercible() */
 PG_FUNCTION_INFO_V1(binary_coercible);
 Datum
@@ -1028,3 +1168,68 @@ test_relpath(PG_FUNCTION_ARGS)
 
 	PG_RETURN_VOID();
 }
+
+/*
+ * test_pglz_compress
+ *
+ * Compress the input using pglz_compress().  Only the "always" strategy is
+ * currently supported.
+ *
+ * Returns the compressed data, or NULL if compression fails.
+ */
+PG_FUNCTION_INFO_V1(test_pglz_compress);
+Datum
+test_pglz_compress(PG_FUNCTION_ARGS)
+{
+	bytea	   *input = PG_GETARG_BYTEA_PP(0);
+	char	   *source = VARDATA_ANY(input);
+	int32		slen = VARSIZE_ANY_EXHDR(input);
+	int32		maxout = PGLZ_MAX_OUTPUT(slen);
+	bytea	   *result;
+	int32		clen;
+
+	result = (bytea *) palloc(maxout + VARHDRSZ);
+	clen = pglz_compress(source, slen, VARDATA(result),
+						 PGLZ_strategy_always);
+	if (clen < 0)
+		PG_RETURN_NULL();
+
+	SET_VARSIZE(result, clen + VARHDRSZ);
+	PG_RETURN_BYTEA_P(result);
+}
+
+/*
+ * test_pglz_decompress
+ *
+ * Decompress the input using pglz_decompress().
+ *
+ * The second argument is the expected uncompressed data size.  The third
+ * argument is here for the check_complete flag.
+ *
+ * Returns the decompressed data, or raises an error if decompression fails.
+ */
+PG_FUNCTION_INFO_V1(test_pglz_decompress);
+Datum
+test_pglz_decompress(PG_FUNCTION_ARGS)
+{
+	bytea	   *input = PG_GETARG_BYTEA_PP(0);
+	int32		rawsize = PG_GETARG_INT32(1);
+	bool		check_complete = PG_GETARG_BOOL(2);
+	char	   *source = VARDATA_ANY(input);
+	int32		slen = VARSIZE_ANY_EXHDR(input);
+	bytea	   *result;
+	int32		dlen;
+
+	if (rawsize < 0)
+		elog(ERROR, "rawsize must not be negative");
+
+	result = (bytea *) palloc(rawsize + VARHDRSZ);
+
+	dlen = pglz_decompress(source, slen, VARDATA(result),
+						   rawsize, check_complete);
+	if (dlen < 0)
+		elog(ERROR, "pglz_decompress failed");
+
+	SET_VARSIZE(result, dlen + VARHDRSZ);
+	PG_RETURN_BYTEA_P(result);
+}
diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index 277b4b198cc..b751783e833 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -539,6 +539,23 @@ alter table t2 alter column z drop not null;
 create unique index t2_z_uidx on t2(z) nulls not distinct;
 explain (costs off) select y,z from t2 group by y,z;
 
+-- A unique index proves uniqueness only under its own opfamily.  When the
+-- GROUP BY's eqop comes from a different opfamily with looser equality,
+-- rows the index regards as distinct can collapse into one GROUP BY group,
+-- so the index is not usable for removing redundant columns.
+create type t_rec as (x numeric);
+create temp table t_opf (a t_rec not null, b text);
+create unique index on t_opf (a record_image_ops);
+-- (1.0) and (1.00) are bytewise distinct but logically equal as records;
+-- the index admits both, but GROUP BY a (default record_ops) would merge
+-- them, so b must be retained as a grouping key.
+insert into t_opf values (row(1.0)::t_rec, 'X'), (row(1.00)::t_rec, 'Y');
+explain (costs off)
+select a, b from t_opf group by a, b order by b;
+select a, b from t_opf group by a, b order by b;
+drop table t_opf;
+drop type t_rec;
+
 drop table t1 cascade;
 drop table t2;
 drop table t3;
@@ -567,6 +584,12 @@ select f2, count(*) from
 t1 x(x0,x1) left join (t1 left join t2 using(f2)) on (x0 = 0)
 group by f2;
 
+-- check that we preserve join alias in GROUP BY expressions
+create temp view v1 as
+select f1::int from t1 left join t2 using (f1) group by f1;
+select pg_get_viewdef('v1'::regclass);
+
+drop view v1;
 drop table t1, t2;
 
 --
@@ -1505,15 +1528,6 @@ select v||'a', case when v||'a' = 'aa' then 1 else 0 end, count(*)
   from unnest(array['a','b']) u(v)
  group by v||'a' order by 1;
 
--- Make sure that generation of HashAggregate for uniqification purposes
--- does not lead to array overflow due to unexpected duplicate hash keys
--- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
-set enable_memoize to off;
-explain (costs off)
-  select 1 from tenk1
-   where (hundred, thousand) in (select twothousand, twothousand from onek);
-reset enable_memoize;
-
 --
 -- Hash Aggregation Spill tests
 --
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 41cff198e18..e1937a85ba7 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -2202,13 +2202,15 @@ SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment F
 -- filenode function call can return NULL for a relation dropped concurrently
 -- with the call's surrounding query, so ignore a NULL mapped_oid for
 -- relations that no longer exist after all calls finish.
+-- Temporary relations are ignored, as not supported by pg_filenode_relation().
 CREATE TEMP TABLE filenode_mapping AS
 SELECT
     oid, mapped_oid, reltablespace, relfilenode, relname
 FROM pg_class,
     pg_filenode_relation(reltablespace, pg_relation_filenode(oid)) AS mapped_oid
-WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
-
+WHERE relkind IN ('r', 'i', 'S', 't', 'm')
+  AND relpersistence != 't'
+  AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
 
@@ -2329,6 +2331,14 @@ ALTER TABLE test_add_column
 \d test_add_column
 ALTER TABLE test_add_column
 	ADD COLUMN IF NOT EXISTS c5 SERIAL CHECK (c5 > 10);
+ALTER TABLE test_add_column
+	ADD c6 integer; -- omit COLUMN
+ALTER TABLE test_add_column
+	ADD IF NOT EXISTS c6 integer;
+ALTER TABLE test_add_column
+	DROP c6; -- omit COLUMN
+ALTER TABLE test_add_column
+	DROP IF EXISTS c6;
 \d test_add_column*
 DROP TABLE test_add_column;
 \d test_add_column*
@@ -2832,6 +2842,15 @@ ALTER TABLE range_parted2 DETACH PARTITION part_rp100 CONCURRENTLY;
 \d part_rp100
 DROP TABLE range_parted2;
 
+-- Test that hash partitions continue to work after they're concurrently
+-- detached (bugs #18371, #19070)
+CREATE TABLE hash_parted2 (a int) PARTITION BY HASH(a);
+CREATE TABLE part_hp PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 0);
+ALTER TABLE hash_parted2 DETACH PARTITION part_hp CONCURRENTLY;
+DROP TABLE hash_parted2;
+INSERT INTO part_hp VALUES (1);
+DROP TABLE part_hp;
+
 -- Check ALTER TABLE commands for partitioned tables and partitions
 
 -- cannot add/drop column to/from *only* the parent
@@ -3074,6 +3093,14 @@ drop table attbl, atref;
 create table attbl(a int);
 create table atref(b attbl check ((b).a is not null));
 alter table attbl alter column a type numeric;  -- someday this should work
+alter table atref drop constraint atref_b_check;
+
+create statistics atref_stat on ((b).a is not null) from atref;
+alter table attbl alter column a type numeric;  -- someday this should work
+drop statistics atref_stat;
+
+create index atref_idx on atref (((b).a));
+alter table attbl alter column a type numeric;  -- someday this should work
 drop table attbl, atref;
 
 /* End test case for bug #18970 */
diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql
index 47d62c1d38d..ddd496e80ed 100644
--- a/src/test/regress/sql/arrays.sql
+++ b/src/test/regress/sql/arrays.sql
@@ -528,6 +528,10 @@ select '[2147483646:2147483646]={1}'::int[];
 select '[-2147483648:-2147483647]={1,2}'::int[];
 -- all of the above should be accepted
 
+-- some day we might allow these cases, but for now they're errors:
+select array[]::oidvector;
+select array[]::int2vector;
+
 -- tests for array aggregates
 CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
 
diff --git a/src/test/regress/sql/btree_index.sql b/src/test/regress/sql/btree_index.sql
index 68c61dbc7d1..6aaaa386abc 100644
--- a/src/test/regress/sql/btree_index.sql
+++ b/src/test/regress/sql/btree_index.sql
@@ -143,38 +143,83 @@ SELECT proname, proargtypes, pronamespace
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC LIMIT 1;
 
 --
--- Add coverage for RowCompare quals whose rhs row has a NULL that ends scan
+-- Forwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) < ('abs', NULL)
+   WHERE (proname, proargtypes) >= ('abs', NULL) AND proname <= 'abs'
 ORDER BY proname, proargtypes, pronamespace;
 
 --
--- Add coverage for backwards scan RowCompare quals whose rhs row has a NULL
--- that ends scan
+-- Forwards scan RowCompare quals whose row arg has a NULL that ends scan
 --
 explain (costs off)
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) < ('abs', NULL)
+ORDER BY proname, proargtypes, pronamespace;
+
+--
+-- Backwards scan RowCompare qual whose row arg has a NULL that affects our
+-- initial positioning strategy
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
 
 SELECT proname, proargtypes, pronamespace
    FROM pg_proc
-   WHERE proname = 'abs' AND (proname, proargtypes) > ('abs', NULL)
+   WHERE proname >= 'abs' AND (proname, proargtypes) <= ('abs', NULL)
 ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
 
 --
--- Add coverage for recheck of > key following array advancement on previous
--- (left sibling) page that used a high key whose attribute value corresponding
--- to the > key was -inf (due to being truncated when the high key was created).
+-- Backwards scan RowCompare qual whose row arg has a NULL that ends scan
+--
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE (proname, proargtypes) > ('abs', NULL) AND proname <= 'abs'
+ORDER BY proname DESC, proargtypes DESC, pronamespace DESC;
+
+-- Makes B-Tree preprocessing deal with unmarking redundant keys that were
+-- initially marked required (test case relies on current row compare
+-- preprocessing limitations)
+explain (costs off)
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+
+SELECT proname, proargtypes, pronamespace
+   FROM pg_proc
+   WHERE proname = 'zzzzzz' AND (proname, proargtypes) > ('abs', NULL)
+   AND pronamespace IN (1, 2, 3) AND proargtypes IN ('26 23', '5077')
+ORDER BY proname, proargtypes, pronamespace;
+
+--
+-- Performs a recheck of > key following array advancement on previous (left
+-- sibling) page that used a high key whose attribute value corresponding to
+-- the > key was -inf (due to being truncated when the high key was created).
 --
 -- XXX This relies on the assumption that tenk1_thous_tenthous has a truncated
 -- high key "(183, -inf)" on the first page that we'll scan.  The test will only
diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql
index dbc190227d0..90ea90d64e0 100644
--- a/src/test/regress/sql/collate.icu.utf8.sql
+++ b/src/test/regress/sql/collate.icu.utf8.sql
@@ -568,6 +568,9 @@ SELECT 'abc' <= 'ABC' COLLATE case_insensitive, 'abc' >= 'ABC' COLLATE case_inse
 SELECT array_sort('{a,B}'::text[] COLLATE case_insensitive);
 SELECT array_sort('{a,B}'::text[] COLLATE "C");
 
+-- test replace() at the end of the string (bug #19341)
+SELECT replace('testX' COLLATE case_insensitive, 'x' COLLATE case_insensitive, 'er');
+
 -- test language tags
 CREATE COLLATION lt_insensitive (provider = icu, locale = 'en-u-ks-level1', deterministic = false);
 SELECT 'aBcD' COLLATE lt_insensitive = 'AbCd' COLLATE lt_insensitive;
@@ -605,6 +608,109 @@ CREATE UNIQUE INDEX ON test3cs (x);  -- ok
 SELECT string_to_array('ABC,DEF,GHI' COLLATE case_sensitive, ',', 'abc');
 SELECT string_to_array('ABCDEFGHI' COLLATE case_sensitive, NULL, 'b');
 
+--
+-- A unique index under one collation does not prove uniqueness under
+-- another, so the planner must not use such a proof for any optimization.
+--
+
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN test3cs t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+-- Ensure that self-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test3cs t1, test3cs t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM test3cs t2 WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+--
+-- A DISTINCT / GROUP BY / set-op on a subquery does not prove uniqueness
+-- under a different collation, so the planner must not use such a proof for
+-- any optimization.
+--
+
+-- Ensure that we do not use inner-unique join execution
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT DISTINCT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Same with GROUP BY
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs GROUP BY x) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Same with set-op
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+SELECT * FROM test1cs t1, (SELECT x FROM test3cs UNION SELECT x FROM test3cs) t2
+WHERE t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1, 2;
+
+-- Ensure that left-join is not removed
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+SELECT t1.* FROM test3cs t1
+       LEFT JOIN (SELECT DISTINCT x FROM test3cs) t2 ON t1.x = t2.x COLLATE case_insensitive
+ORDER BY 1;
+
+-- Ensure that semijoin is not reduced to innerjoin
+EXPLAIN (COSTS OFF)
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
+SELECT * FROM test3cs t1
+  WHERE EXISTS (SELECT 1 FROM (SELECT DISTINCT x FROM test3cs) t2
+                WHERE t1.x = t2.x COLLATE case_insensitive)
+ORDER BY 1;
+
 CREATE TABLE test1ci (x text COLLATE case_insensitive);
 CREATE TABLE test2ci (x text COLLATE case_insensitive);
 CREATE TABLE test3ci (x text COLLATE case_insensitive);
@@ -635,6 +741,87 @@ CREATE UNIQUE INDEX ON test3ci (x);  -- error
 SELECT string_to_array('ABC,DEF,GHI' COLLATE case_insensitive, ',', 'abc');
 SELECT string_to_array('ABCDEFGHI' COLLATE case_insensitive, NULL, 'b');
 
+-- Test HAVING-to-WHERE pushdown with nondeterministic collations.
+-- When a HAVING clause uses a different collation than the GROUP BY's
+-- nondeterministic collation, it must not be pushed to WHERE, otherwise
+-- aggregate results can change because the stricter filter eliminates rows
+-- before grouping.
+
+-- Negative: collation conflict, HAVING must not be pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+
+-- Positive: same collation, safe to push HAVING to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive;
+
+-- Negative: function applied to grouped column with conflicting collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_sensitive;
+
+-- Positive: function with same collation as GROUP BY
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x) = 'ABC' COLLATE case_insensitive;
+
+-- Negative: inner function has conflicting collation, even though outer
+-- operator's collation matches GROUP BY due to a COLLATE override
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING upper(x COLLATE case_sensitive) COLLATE case_insensitive = 'ABC';
+
+-- Mixed AND: conflicting clause stays in HAVING, safe clause pushed to WHERE
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive AND length(x) > 1;
+
+-- Positive: AND of two safe clauses, both can be pushed
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_insensitive AND length(x) > 1;
+
+-- Negative: OR with a conflicting clause: must stay in HAVING
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING x = 'abc' COLLATE case_sensitive OR x = 'def' COLLATE case_sensitive ORDER BY 1;
+
+-- Negative: collation conflict inside a RowCompareExpr
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING ROW(x, 1) < ROW('ABC' COLLATE case_sensitive, 1) ORDER BY 1;
+
+-- Negative: simple-CASE form with conflicting WHEN comparison collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_sensitive THEN true ELSE false END);
+
+-- Positive: simple-CASE form with matching collation, safe to push
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE x WHEN 'abc' COLLATE case_insensitive THEN true ELSE false END);
+
+-- Negative: nested CASE with collation conflict
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING (CASE WHEN (CASE x WHEN 'abc' COLLATE case_sensitive THEN 1 ELSE 0 END) = 1 THEN true ELSE false END);
+
+-- Positive: conflicting collation but no grouping expression reference
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3ci GROUP BY x HAVING current_setting('server_version') = 'abc' COLLATE case_sensitive;
+
+-- Positive: deterministic collation in GROUP BY: always safe to push, even if
+-- HAVING uses a nondeterministic collation
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_sensitive;
+
+EXPLAIN (COSTS OFF)
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+SELECT x, count(*) FROM test3cs GROUP BY x HAVING x = 'abc' COLLATE case_insensitive ORDER BY 1;
+
 -- bpchar
 CREATE TABLE test1bpci (x char(3) COLLATE case_insensitive);
 CREATE TABLE test2bpci (x char(3) COLLATE case_insensitive);
@@ -983,6 +1170,26 @@ RESET enable_partitionwise_aggregate;
 RESET max_parallel_workers_per_gather;
 RESET enable_incremental_sort;
 
+--
+-- A unique index can prove functional dependency for GROUP BY column
+-- removal only if its per-column collation agrees on equality with
+-- the GROUP BY column's collation.  An index built under a different
+-- (deterministic) collation would otherwise let remove_useless_groupby_columns
+-- drop other columns whose values still differ within a nondeterministic
+-- group.
+--
+CREATE TABLE groupby_collation_t (a text COLLATE case_insensitive NOT NULL, b text);
+INSERT INTO groupby_collation_t VALUES ('foo', 'X'), ('FOO', 'Y');
+CREATE UNIQUE INDEX ON groupby_collation_t (a COLLATE "C");
+
+-- Column b must NOT be dropped: under case_insensitive on a, 'foo' and
+-- 'FOO' would merge, but they have distinct b values.
+EXPLAIN (COSTS OFF)
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+SELECT a, b FROM groupby_collation_t GROUP BY a, b ORDER BY a, b;
+
+DROP TABLE groupby_collation_t;
+
 -- virtual generated columns
 CREATE TABLE t5 (
     a int,
@@ -997,6 +1204,19 @@ INSERT INTO t5 (a, b) values (1, 'D1'), (2, 'D2'), (3, 'd1');
 -- rewriting.)
 SELECT * FROM t5 ORDER BY c ASC, a ASC;
 
+-- Check that DEFAULT expressions in SQL/JSON functions use the same collation
+-- as the RETURNING type.  Mismatched collations should raise an error.
+CREATE DOMAIN d1 AS text COLLATE case_insensitive;
+CREATE DOMAIN d2 AS text COLLATE "C";
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT ('C' COLLATE "C") COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_insensitive ON EMPTY) = 'a'; -- true
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
+SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
+DROP DOMAIN d1, d2;
 
 -- cleanup
 RESET search_path;
diff --git a/src/test/regress/sql/compression_pglz.sql b/src/test/regress/sql/compression_pglz.sql
new file mode 100644
index 00000000000..a44af02afb7
--- /dev/null
+++ b/src/test/regress/sql/compression_pglz.sql
@@ -0,0 +1,53 @@
+--
+-- Tests for PGLZ compression
+--
+
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/regress' :dlsuffix
+
+CREATE FUNCTION test_pglz_compress(bytea)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_pglz_decompress(bytea, int4, bool)
+  RETURNS bytea
+  AS :'regresslib' LANGUAGE C STRICT;
+
+-- Round-trip with pglz: compress then decompress.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, false) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 400, true) =
+    decode(repeat('abcd', 100), 'escape') AS roundtrip_ok;
+
+-- Decompression with rawsize too large, fails to fill the destination
+-- buffer.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 500, true);
+
+-- Decompression with rawsize too small, fails with source not fully
+-- consumed.
+SELECT test_pglz_decompress(test_pglz_compress(
+    decode(repeat('abcd', 100), 'escape')), 100, true);
+
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- no data follows.
+SELECT length(test_pglz_decompress('\x01'::bytea, 1024, false)) AS ctrl_only_len;
+SELECT test_pglz_decompress('\x01'::bytea, 1024, true);
+
+-- Corrupted compressed data.  Set control bit with read of a match tag,
+-- 1 byte follows.
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, false);
+SELECT test_pglz_decompress('\x01ff'::bytea, 1024, true);
+
+-- Corrupted compressed data.  Set control bit with match tag where length
+-- nibble is 3 bytes (extended length), no data follows.
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, false);
+SELECT test_pglz_decompress('\x010f01'::bytea, 1024, true);
+
+-- Clean up
+DROP FUNCTION test_pglz_compress;
+DROP FUNCTION test_pglz_decompress;
diff --git a/src/test/regress/sql/constraints.sql b/src/test/regress/sql/constraints.sql
index 12668f0e0ce..1e9989698b6 100644
--- a/src/test/regress/sql/constraints.sql
+++ b/src/test/regress/sql/constraints.sql
@@ -537,6 +537,9 @@ CREATE TABLE UNIQUE_NOTEN_TBL(i int UNIQUE NOT ENFORCED);
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key ENFORCED;
 ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT ENFORCED;
 
+-- can't make an existing constraint NOT VALID
+ALTER TABLE unique_tbl ALTER CONSTRAINT unique_tbl_i_key NOT VALID;
+
 DROP TABLE unique_tbl;
 
 --
@@ -620,7 +623,9 @@ DROP TABLE deferred_excl;
 -- verify constraints created for NOT NULL clauses
 CREATE TABLE notnull_tbl1 (a INTEGER NOT NULL NOT NULL);
 \d+ notnull_tbl1
--- no-op
+-- specifying an existing constraint is a no-op
+ALTER TABLE notnull_tbl1 ADD CONSTRAINT notnull_tbl1_a_not_null NOT NULL a;
+-- but using a different constraint name is not allowed
 ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
 \d+ notnull_tbl1
 -- duplicate name
@@ -829,6 +834,9 @@ ALTER TABLE notnull_tbl1 ADD CONSTRAINT nn NOT NULL a;
 -- cannot add primary key on a column with an invalid not-null
 ALTER TABLE notnull_tbl1 ADD PRIMARY KEY (a);
 
+-- cannot set column as generated-as-identity if it has an invalid not-null
+ALTER TABLE notnull_tbl1 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;
+
 -- ALTER column SET NOT NULL validates an invalid constraint (but this fails
 -- because of rows with null values)
 ALTER TABLE notnull_tbl1 ALTER a SET NOT NULL;
@@ -1040,3 +1048,14 @@ DROP DOMAIN constraint_comments_dom;
 
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';
+
+-- Create a table that exercises pg_upgrade
+CREATE TABLE regress_notnull1 (a integer);
+CREATE TABLE regress_notnull2 () INHERITS (regress_notnull1);
+ALTER TABLE ONLY regress_notnull2 ALTER COLUMN a SET NOT NULL;
diff --git a/src/test/regress/sql/create_function_sql.sql b/src/test/regress/sql/create_function_sql.sql
index 6d1c102d780..3d5f2a92093 100644
--- a/src/test/regress/sql/create_function_sql.sql
+++ b/src/test/regress/sql/create_function_sql.sql
@@ -432,6 +432,23 @@ $$ SELECT array_append($1, $2) || array_append($1, $2) $$;
 SELECT double_append(array_append(ARRAY[q1], q2), q3)
   FROM (VALUES(1,2,3), (4,5,6)) v(q1,q2,q3);
 
+-- Check that we can re-use a SQLFunctionCache after a run-time error.
+
+-- This function will fail with zero-divide at run time (not plan time).
+CREATE FUNCTION part_hashint4_error(value int4, seed int8) RETURNS int8
+LANGUAGE SQL STRICT IMMUTABLE PARALLEL SAFE AS
+$$ SELECT value + seed + random()::int/0 $$;
+
+-- Put it into an operator class so that FmgrInfo will be cached in relcache.
+CREATE OPERATOR CLASS part_test_int4_ops_bad FOR TYPE int4 USING hash AS
+  FUNCTION 2 part_hashint4_error(int4, int8);
+
+CREATE TABLE pt(i int) PARTITION BY hash (i part_test_int4_ops_bad);
+CREATE TABLE p1 PARTITION OF pt FOR VALUES WITH (modulus 4, remainder 0);
+
+INSERT INTO pt VALUES (1);
+INSERT INTO pt VALUES (1);
+
 -- Things that shouldn't work:
 
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index e21ff426519..82e4062a215 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -45,6 +45,10 @@ CREATE INDEX six ON shighway USING btree (name text_ops);
 COMMENT ON INDEX six_wrong IS 'bad index';
 COMMENT ON INDEX six IS 'good index';
 COMMENT ON INDEX six IS NULL;
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
+COMMENT ON INDEX six IS 'add the comment back';
+COMMENT ON INDEX six IS ''; -- empty string removes the comment, same as NULL
+SELECT obj_description('six'::regclass, 'pg_class') IS NULL AS six_comment_is_null;
 
 --
 -- BTREE partial indices
@@ -635,7 +639,7 @@ DROP TABLE cwi_test;
 CREATE TABLE syscol_table (a INT);
 
 -- System columns cannot be indexed
-CREATE INDEX ON syscolcol_table (ctid);
+CREATE INDEX ON syscol_table (ctid);
 
 -- nor used in expressions
 CREATE INDEX ON syscol_table ((ctid >= '(1000,0)'));
diff --git a/src/test/regress/sql/create_role.sql b/src/test/regress/sql/create_role.sql
index 4491a28a8ae..b22f9c6f50a 100644
--- a/src/test/regress/sql/create_role.sql
+++ b/src/test/regress/sql/create_role.sql
@@ -92,6 +92,13 @@ CREATE ROLE regress_hasprivs CREATEROLE LOGIN INHERIT CONNECTION LIMIT 5;
 
 -- ok, we should be able to modify a role we created
 COMMENT ON ROLE regress_hasprivs IS 'some comment';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+COMMENT ON ROLE regress_hasprivs IS NULL;
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
+COMMENT ON ROLE regress_hasprivs IS 'add the comment back';
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NOT NULL AS has_comment;
+COMMENT ON ROLE regress_hasprivs IS ''; -- empty string removes the comment, same as NULL
+SELECT shobj_description('regress_hasprivs'::regrole, 'pg_authid') IS NULL AS no_comment;
 ALTER ROLE regress_hasprivs RENAME TO regress_tenant;
 ALTER ROLE regress_tenant NOINHERIT NOLOGIN CONNECTION LIMIT 7;
 
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index 37a227148e9..80e424e6bda 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -68,6 +68,14 @@ CREATE TABLE withoid() WITH (oids = true);
 CREATE TEMP TABLE withoutoid() WITHOUT OIDS; DROP TABLE withoutoid;
 CREATE TEMP TABLE withoutoid() WITH (oids = false); DROP TABLE withoutoid;
 
+-- temporary tables are ignored by pg_filenode_relation().
+CREATE TEMP TABLE relation_filenode_check(c1 int);
+SELECT relpersistence,
+  pg_filenode_relation (reltablespace, pg_relation_filenode(oid))
+  FROM pg_class
+  WHERE relname = 'relation_filenode_check';
+DROP TABLE relation_filenode_check;
+
 -- check restriction with default expressions
 -- invalid use of column reference in default expressions
 CREATE TABLE default_expr_column (id int DEFAULT (id));
@@ -97,6 +105,13 @@ SAVEPOINT q; DROP TABLE remember_node_subid; ROLLBACK TO q;
 COMMIT;
 DROP TABLE remember_node_subid;
 
+-- generated NOT NULL constraint names must not collide with explicitly named constraints
+CREATE TABLE two_not_null_constraints (
+   col integer NOT NULL,
+   CONSTRAINT two_not_null_constraints_col_not_null CHECK (col IS NOT NULL)
+);
+DROP TABLE two_not_null_constraints;
+
 --
 -- Partitioned tables
 --
diff --git a/src/test/regress/sql/create_table_like.sql b/src/test/regress/sql/create_table_like.sql
index bf8702116a7..d52a93ef131 100644
--- a/src/test/regress/sql/create_table_like.sql
+++ b/src/test/regress/sql/create_table_like.sql
@@ -130,6 +130,7 @@ DROP TABLE inhz;
 -- including storage and comments
 CREATE TABLE ctlt1 (a text CHECK (length(a) > 2) ENFORCED PRIMARY KEY,
 	b text CHECK (length(b) > 100) NOT ENFORCED);
+ALTER TABLE ctlt1 ADD CONSTRAINT cc CHECK (length(b) > 100) NOT VALID;
 CREATE INDEX ctlt1_b_key ON ctlt1 (b);
 CREATE INDEX ctlt1_fnidx ON ctlt1 ((a || b));
 CREATE STATISTICS ctlt1_a_b_stat ON a,b FROM ctlt1;
@@ -275,6 +276,32 @@ CREATE FOREIGN TABLE ctl_foreign_table2(LIKE ctl_table INCLUDING ALL) SERVER ctl
 SELECT attname, attcompression FROM pg_attribute
   WHERE attrelid = 'ctl_foreign_table2'::regclass and attnum > 0 ORDER BY attnum;
 
+-- LIKE ... INCLUDING STATISTICS with dropped columns in the parent,
+-- so stxkeys attnums are not contiguous.
+CREATE TABLE ctl_stats3_parent (a int, b int, c int);
+ALTER TABLE ctl_stats3_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats3_stat ON a, c FROM ctl_stats3_parent;
+CREATE TABLE ctl_stats3_child (LIKE ctl_stats3_parent INCLUDING STATISTICS);
+CREATE TABLE ctl_stats4_parent (a int, b int, c int, d int);
+ALTER TABLE ctl_stats4_parent DROP COLUMN b;
+CREATE STATISTICS ctl_stats4_stat ON a, c FROM ctl_stats4_parent;
+CREATE TABLE ctl_stats4_child (LIKE ctl_stats4_parent INCLUDING STATISTICS);
+SELECT s.stxrelid::regclass AS relation,
+       array_agg(a.attname ORDER BY u.ord) AS stats_columns
+FROM pg_statistic_ext s
+CROSS JOIN LATERAL
+  unnest(s.stxkeys::int2[]) WITH ORDINALITY AS u(attnum, ord)
+JOIN pg_attribute a
+  ON a.attrelid = s.stxrelid AND a.attnum = u.attnum
+WHERE s.stxrelid IN ('ctl_stats3_child'::regclass,
+                     'ctl_stats4_child'::regclass)
+GROUP BY s.stxrelid
+ORDER BY s.stxrelid::regclass::text;
+DROP TABLE ctl_stats3_parent;
+DROP TABLE ctl_stats3_child;
+DROP TABLE ctl_stats4_parent;
+DROP TABLE ctl_stats4_child;
+
 DROP TABLE ctl_table;
 DROP FOREIGN TABLE ctl_foreign_table1;
 DROP FOREIGN TABLE ctl_foreign_table2;
diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql
index b752a63ab5f..b8f5a639712 100644
--- a/src/test/regress/sql/domain.sql
+++ b/src/test/regress/sql/domain.sql
@@ -602,6 +602,9 @@ insert into domain_test values (1, 2);
 -- should fail
 alter table domain_test add column c str_domain;
 
+-- disallow duplicated not-null constraints
+create domain int_domain1 as int constraint nn1 not null constraint nn2 not null;
+
 create domain str_domain2 as text check (value <> 'foo') default 'foo';
 
 -- should fail
diff --git a/src/test/regress/sql/encoding.sql b/src/test/regress/sql/encoding.sql
new file mode 100644
index 00000000000..d591818c3eb
--- /dev/null
+++ b/src/test/regress/sql/encoding.sql
@@ -0,0 +1,247 @@
+/* skip test if not UTF8 server encoding */
+SELECT getdatabaseencoding() <> 'UTF8' AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/regress' :dlsuffix
+
+CREATE FUNCTION test_bytea_to_text(bytea) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_text_to_bytea(text) RETURNS bytea
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_mblen_func(text, text, text, int) RETURNS int
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_text_to_wchars(text, text) RETURNS int[]
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_wchars_to_text(text, int[]) RETURNS text
+    AS :'regresslib' LANGUAGE C STRICT;
+CREATE FUNCTION test_valid_server_encoding(text) RETURNS boolean
+    AS :'regresslib' LANGUAGE C STRICT;
+
+
+CREATE TABLE regress_encoding(good text, truncated text, with_nul text, truncated_with_nul text);
+INSERT INTO regress_encoding
+VALUES ('café',
+        'caf' || test_bytea_to_text('\xc3'),
+        'café' || test_bytea_to_text('\x00') || 'dcba',
+        'caf' || test_bytea_to_text('\xc300') || 'dcba');
+
+SELECT good, truncated, with_nul FROM regress_encoding;
+
+SELECT length(good) FROM regress_encoding;
+SELECT substring(good, 3, 1) FROM regress_encoding;
+SELECT substring(good, 4, 1) FROM regress_encoding;
+SELECT regexp_replace(good, '^caf(.)$', '\1') FROM regress_encoding;
+SELECT reverse(good) FROM regress_encoding;
+
+-- invalid short mb character = error
+SELECT length(truncated) FROM regress_encoding;
+SELECT substring(truncated, 1, 3) FROM regress_encoding;
+SELECT substring(truncated, 1, 4) FROM regress_encoding;
+SELECT reverse(truncated) FROM regress_encoding;
+-- invalid short mb character = silently dropped
+SELECT regexp_replace(truncated, '^caf(.)$', '\1') FROM regress_encoding;
+
+-- PostgreSQL doesn't allow strings to contain NUL.  If a corrupted string
+-- contains NUL at a character boundary position, some functions treat it as a
+-- character while others treat it as a terminator, as implementation details.
+
+-- NUL = terminator
+SELECT length(with_nul) FROM regress_encoding;
+SELECT substring(with_nul, 3, 1) FROM regress_encoding;
+SELECT substring(with_nul, 4, 1) FROM regress_encoding;
+SELECT substring(with_nul, 5, 1) FROM regress_encoding;
+SELECT convert_to(substring(with_nul, 5, 1), 'UTF8') FROM regress_encoding;
+SELECT regexp_replace(with_nul, '^caf(.)$', '\1') FROM regress_encoding;
+-- NUL = character
+SELECT with_nul, reverse(with_nul), reverse(reverse(with_nul)) FROM regress_encoding;
+
+-- If a corrupted string contains NUL in the tail bytes of a multibyte
+-- character (invalid in all encodings), it is considered part of the
+-- character for length purposes.  An error will only be raised in code paths
+-- that convert or verify encodings.
+
+SELECT length(truncated_with_nul) FROM regress_encoding;
+SELECT substring(truncated_with_nul, 3, 1) FROM regress_encoding;
+SELECT substring(truncated_with_nul, 4, 1) FROM regress_encoding;
+SELECT convert_to(substring(truncated_with_nul, 4, 1), 'UTF8') FROM regress_encoding;
+SELECT substring(truncated_with_nul, 5, 1) FROM regress_encoding;
+SELECT regexp_replace(truncated_with_nul, '^caf(.)dcba$', '\1') = test_bytea_to_text('\xc300') FROM regress_encoding;
+SELECT reverse(truncated_with_nul) FROM regress_encoding;
+
+-- unbounded: sequence would overrun the string!
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated, 3)
+FROM regress_encoding;
+
+-- condition detected when using the length/range variants
+SELECT test_mblen_func('pg_mblen_with_len', 'UTF8', truncated, 3)
+FROM regress_encoding;
+SELECT test_mblen_func('pg_mblen_range', 'UTF8', truncated, 3)
+FROM regress_encoding;
+
+-- unbounded: sequence would overrun the string, if the terminator were really
+-- the end of it
+SELECT test_mblen_func('pg_mblen_unbounded', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+SELECT test_mblen_func('pg_encoding_mblen', 'GB18030', truncated_with_nul, 3)
+FROM regress_encoding;
+
+-- condition detected when using the cstr variants
+SELECT test_mblen_func('pg_mblen_cstr', 'UTF8', truncated_with_nul, 3)
+FROM regress_encoding;
+
+DROP TABLE regress_encoding;
+
+-- mb<->wchar conversions
+CREATE FUNCTION test_encoding(encoding text, description text, input bytea)
+RETURNS VOID LANGUAGE plpgsql AS
+$$
+DECLARE
+	prefix text;
+	len int;
+	wchars int[];
+	round_trip bytea;
+	result text;
+BEGIN
+	prefix := rpad(encoding || ' ' || description || ':', 28);
+
+	-- XXX could also test validation, length functions and include client
+	-- only encodings with these test cases
+
+	IF test_valid_server_encoding(encoding) THEN
+		wchars := test_text_to_wchars(encoding, test_bytea_to_text(input));
+		round_trip = test_text_to_bytea(test_wchars_to_text(encoding, wchars));
+		if input = round_trip then
+			result := 'OK';
+		elsif length(input) > length(round_trip) and round_trip = substr(input, 1, length(round_trip)) then
+			result := 'truncated';
+		else
+			result := 'failed';
+		end if;
+		RAISE NOTICE '% % -> % -> % = %', prefix, input, wchars, round_trip, result;
+	END IF;
+END;
+$$;
+-- No validation is done on the encoding itself, just the length to avoid
+-- overruns, so some of the byte sequences below are bogus.  They cover
+-- all code branches, server encodings only for now.
+CREATE TABLE encoding_tests (encoding text, description text, input bytea);
+INSERT INTO encoding_tests VALUES
+	-- LATIN1, other single-byte encodings
+	('LATIN1', 'ASCII',    'a'),
+	('LATIN1', 'extended', '\xe9'),
+	-- EUC_JP, EUC_JIS_2004, EUR_KR (for the purposes of wchar conversion):
+	-- 2 8e (CS2, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 3 8f (CS3, not used by EUR_KR but arbitrarily considered to have EUC_JP length)
+	-- 2 80..ff (CS1)
+	('EUC_JP', 'ASCII',      'a'),
+	('EUC_JP', 'CS1, short', '\x80'),
+	('EUC_JP', 'CS1',        '\x8002'),
+	('EUC_JP', 'CS2, short', '\x8e'),
+	('EUC_JP', 'CS2',        '\x8e02'),
+	('EUC_JP', 'CS3, short', '\x8f'),
+	('EUC_JP', 'CS3, short', '\x8f02'),
+	('EUC_JP', 'CS3',        '\x8f0203'),
+	-- EUC_CN
+	-- 3 8e (CS2, not used but arbitrarily considered to have length 3)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_CN', 'ASCII',      'a'),
+	('EUC_CN', 'CS1, short', '\x80'),
+	('EUC_CN', 'CS1',        '\x8002'),
+	('EUC_CN', 'CS2, short', '\x8e'),
+	('EUC_CN', 'CS2, short', '\x8e02'),
+	('EUC_CN', 'CS2',        '\x8e0203'),
+	('EUC_CN', 'CS3, short', '\x8f'),
+	('EUC_CN', 'CS3, short', '\x8f02'),
+	('EUC_CN', 'CS3',        '\x8f0203'),
+	-- EUC_TW:
+	-- 4 8e (CS2)
+	-- 3 8f (CS3, not used but arbitrarily considered to have length 3)
+	-- 2 80..ff (CS1)
+	('EUC_TW', 'ASCII',      'a'),
+	('EUC_TW', 'CS1, short', '\x80'),
+	('EUC_TW', 'CS1',        '\x8002'),
+	('EUC_TW', 'CS2, short', '\x8e'),
+	('EUC_TW', 'CS2, short', '\x8e02'),
+	('EUC_TW', 'CS2, short', '\x8e0203'),
+	('EUC_TW', 'CS2',        '\x8e020304'),
+	('EUC_TW', 'CS3, short', '\x8f'),
+	('EUC_TW', 'CS3, short', '\x8f02'),
+	('EUC_TW', 'CS3',        '\x8f0203'),
+	-- UTF8
+	-- 2 c0..df
+	-- 3 e0..ef
+	-- 4 f0..f7 (but maximum real codepoint U+10ffff has f4)
+	-- 5 f8..fb (not supported)
+	-- 6 fc..fd (not supported)
+	('UTF8',   'ASCII',               'a'),
+	('UTF8',   '2 byte, short',       '\xdf'),
+	('UTF8',   '2 byte',              '\xdf82'),
+	('UTF8',   '3 byte, short',       '\xef'),
+	('UTF8',   '3 byte, short',       '\xef82'),
+	('UTF8',   '3 byte',              '\xef8283'),
+	('UTF8',   '4 byte, short',       '\xf7'),
+	('UTF8',   '4 byte, short',       '\xf782'),
+	('UTF8',   '4 byte, short',       '\xf78283'),
+	('UTF8',   '4 byte',              '\xf7828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb'),
+	('UTF8',   '5 byte, unsupported', '\xfb82'),
+	('UTF8',   '5 byte, unsupported', '\xfb8283'),
+	('UTF8',   '5 byte, unsupported', '\xfb828384'),
+	('UTF8',   '5 byte, unsupported', '\xfb82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd'),
+	('UTF8',   '6 byte, unsupported', '\xfd82'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283'),
+	('UTF8',   '6 byte, unsupported', '\xfd828384'),
+	('UTF8',   '6 byte, unsupported', '\xfd82838485'),
+	('UTF8',   '6 byte, unsupported', '\xfd8283848586'),
+	-- MULE_INTERNAL
+	-- 2 81..8d LC1
+	-- 3 90..99 LC2
+	('MULE_INTERNAL', 'ASCII',         'a'),
+	('MULE_INTERNAL', 'LC1, short',    '\x81'),
+	('MULE_INTERNAL', 'LC1',           '\x8182'),
+	('MULE_INTERNAL', 'LC2, short',    '\x90'),
+	('MULE_INTERNAL', 'LC2, short',    '\x9082'),
+	('MULE_INTERNAL', 'LC2',           '\x908283');
+
+SELECT COUNT(test_encoding(encoding, description, input)) > 0
+FROM encoding_tests;
+
+-- substring fetches a slice of a toasted value; unused tail of that slice is
+-- an incomplete char (bug #19406)
+CREATE TABLE toast_3b_utf8 (c text);
+INSERT INTO toast_3b_utf8 VALUES (repeat(U&'\2026', 4000));
+SELECT SUBSTRING(c FROM 1 FOR 1) FROM toast_3b_utf8;
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+-- diagnose incomplete char iff within the substring
+UPDATE toast_3b_utf8 SET c = c || test_bytea_to_text('\xe280');
+SELECT SUBSTRING(c FROM 4000 FOR 1) FROM toast_3b_utf8;
+SELECT SUBSTRING(c FROM 4001 FOR 1) FROM toast_3b_utf8;
+-- substring needing last byte of its slice_size
+ALTER TABLE toast_3b_utf8 RENAME TO toast_4b_utf8;
+UPDATE toast_4b_utf8 SET c = repeat(U&'\+01F680', 3000);
+SELECT SUBSTRING(c FROM 3000 FOR 1) FROM toast_4b_utf8;
+
+DROP TABLE encoding_tests;
+DROP TABLE toast_4b_utf8;
+DROP FUNCTION test_encoding;
+DROP FUNCTION test_wchars_to_text;
+DROP FUNCTION test_text_to_wchars;
+DROP FUNCTION test_valid_server_encoding;
+DROP FUNCTION test_mblen_func;
+DROP FUNCTION test_bytea_to_text;
+DROP FUNCTION test_text_to_bytea;
+
+
+-- substring slow path: multi-byte escape char vs. multi-byte pattern char.
+SELECT SUBSTRING('a' SIMILAR U&'\00AC' ESCAPE U&'\00A7');
+-- Levenshtein distance metric: exercise character length cache.
+SELECT U&"real\00A7_name" FROM (select 1) AS x(real_name);
+-- JSON errcontext: truncate long data.
+SELECT repeat(U&'\00A7', 30)::json;
diff --git a/src/test/regress/sql/euc_kr.sql b/src/test/regress/sql/euc_kr.sql
new file mode 100644
index 00000000000..1851b2a8c14
--- /dev/null
+++ b/src/test/regress/sql/euc_kr.sql
@@ -0,0 +1,12 @@
+-- This test is about EUC_KR encoding, chosen as perhaps the most prevalent
+-- non-UTF8, multibyte encoding as of 2026-01.  Since UTF8 can represent all
+-- of EUC_KR, also run the test in UTF8.
+SELECT getdatabaseencoding() NOT IN ('EUC_KR', 'UTF8') AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
+-- Exercise is_multibyte_char_in_char (non-UTF8) slow path.
+SELECT POSITION(
+	convert_from('\xbcf6c7d0', 'EUC_KR') IN
+	convert_from('\xb0fac7d02c20bcf6c7d02c20b1e2bcfa2c20bbee', 'EUC_KR'));
diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql
index 013546b8305..c613c0cfd43 100644
--- a/src/test/regress/sql/event_trigger.sql
+++ b/src/test/regress/sql/event_trigger.sql
@@ -202,9 +202,15 @@ INSERT INTO undroppable_objs VALUES
 ('table', 'audit_tbls.schema_two_table_three');
 
 CREATE TABLE dropped_objects (
-	type text,
-	schema text,
-	object text
+	object_type text,
+	schema_name text,
+	object_name text,
+	object_identity text,
+	address_names text[],
+	address_args text[],
+	is_temporary bool,
+	original bool,
+	normal bool
 );
 
 -- This tests errors raised within event triggers; the one in audit_tbls
@@ -245,8 +251,12 @@ BEGIN
         END IF;
 
 	INSERT INTO dropped_objects
-		(type, schema, object) VALUES
-		(obj.object_type, obj.schema_name, obj.object_identity);
+		(object_type, schema_name, object_name,
+		 object_identity, address_names, address_args,
+		 is_temporary, original, normal) VALUES
+		(obj.object_type, obj.schema_name, obj.object_name,
+		 obj.object_identity, obj.address_names, obj.address_args,
+		 obj.is_temporary, obj.original, obj.normal);
     END LOOP;
 END
 $$;
@@ -263,10 +273,12 @@ DROP SCHEMA schema_one, schema_two CASCADE;
 DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
 DROP SCHEMA schema_one, schema_two CASCADE;
 
-SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
+-- exclude TOAST objects because they have unstable names
+SELECT * FROM dropped_objects
+  WHERE schema_name IS NULL OR schema_name <> 'pg_toast';
 
 DROP OWNED BY regress_evt_user;
-SELECT * FROM dropped_objects WHERE type = 'schema';
+SELECT * FROM dropped_objects WHERE object_type = 'schema';
 
 DROP ROLE regress_evt_user;
 
@@ -285,9 +297,10 @@ BEGIN
     IF NOT r.normal AND NOT r.original THEN
         CONTINUE;
     END IF;
-    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% name=% args=%',
+    RAISE NOTICE 'NORMAL: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
         r.original, r.normal, r.is_temporary, r.object_type,
-        r.object_identity, r.address_names, r.address_args;
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
     END LOOP;
 END; $$;
 CREATE EVENT TRIGGER regress_event_trigger_report_dropped ON sql_drop
@@ -337,6 +350,46 @@ DROP INDEX evttrig.one_idx;
 DROP SCHEMA evttrig CASCADE;
 DROP TABLE a_temp_tbl;
 
+-- check unfiltered results, too
+CREATE OR REPLACE FUNCTION event_trigger_report_dropped()
+ RETURNS event_trigger
+ LANGUAGE plpgsql
+AS $$
+DECLARE r record;
+BEGIN
+    FOR r IN SELECT * from pg_event_trigger_dropped_objects()
+    LOOP
+    RAISE NOTICE 'DROP: orig=% normal=% istemp=% type=% identity=% schema=% name=% addr=% args=%',
+        r.original, r.normal, r.is_temporary, r.object_type,
+        r.object_identity, r.schema_name, r.object_name,
+        r.address_names, r.address_args;
+    END LOOP;
+END; $$;
+
+CREATE FUNCTION event_trigger_dummy_trigger()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $$
+BEGIN
+    RETURN new;
+END; $$;
+
+CREATE TABLE evtrg_nontemp_table (f1 int primary key, f2 int default 42);
+CREATE TRIGGER evtrg_nontemp_trig
+  BEFORE INSERT ON evtrg_nontemp_table
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+CREATE POLICY evtrg_nontemp_pol ON evtrg_nontemp_table USING (f2 > 0);
+DROP TABLE evtrg_nontemp_table;
+
+CREATE TEMP TABLE a_temp_tbl (f1 int primary key, f2 int default 42);
+CREATE TRIGGER a_temp_trig
+  BEFORE INSERT ON a_temp_tbl
+  EXECUTE FUNCTION event_trigger_dummy_trigger();
+CREATE POLICY a_temp_pol ON a_temp_tbl USING (f2 > 0);
+DROP TABLE a_temp_tbl;
+
+DROP FUNCTION event_trigger_dummy_trigger();
+
 -- CREATE OPERATOR CLASS without FAMILY clause should report
 -- both CREATE OPERATOR FAMILY and CREATE OPERATOR CLASS
 CREATE OPERATOR CLASS evttrigopclass FOR TYPE int USING btree AS STORAGE int;
diff --git a/src/test/regress/sql/expressions.sql b/src/test/regress/sql/expressions.sql
index e02c21f3368..3b3048f9731 100644
--- a/src/test/regress/sql/expressions.sql
+++ b/src/test/regress/sql/expressions.sql
@@ -196,16 +196,108 @@ default for type myint using hash as
   function    1   myinthash(myint);
 
 create table inttest (a myint);
-insert into inttest values(1::myint),(null);
-
--- try an array with enough elements to cause hashing
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
--- ensure the result matched with the non-hashed version.  We simply remove
--- some array elements so that we don't reach the hashing threshold.
-select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
-select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint, null);
-select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint, null);
+insert into inttest values (null), (0::myint), (1::myint);
+
+-- Test EEOP_HASHED_SCALARARRAYOP against EEOP_SCALARARRAYOP.  Ensure the
+-- result of non-hashed vs hashed is the same.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+
+-- Now make the equal function return false when given two NULLs
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return $1::int = $2::int;
+  end if;
+end;
+$$ language plpgsql immutable;
+
+-- And try the same again to ensure EEOP_HASHED_SCALARARRAYOP does the same
+-- thing as EEOP_SCALARARRAYOP.
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
+
+-- Try again with an equality function that treats NULLs as equal to 0.
+create or replace function myinteq(myint, myint) returns bool as $$
+begin
+  if $1 is null and $2 is null then
+    return false;
+  else
+    return coalesce($1::int,0) = coalesce($2::int, 0);
+  end if;
+end;
+$$ language plpgsql immutable;
+
+select
+  a,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+
+select
+  a,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+ from inttest;
+
+select
+  a,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as not_hashed,
+  a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint) as hashed,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed_zero,
+  a not in (0::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed_zero
+from inttest;
+
+select
+  a,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint) as not_hashed,
+  a not in (null::myint,1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint) as hashed
+from inttest;
 
 rollback;
diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index aa147b14a90..0080bfb8856 100644
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -67,6 +67,11 @@ CREATE FUNCTION invalid_fdw_handler() RETURNS int LANGUAGE SQL AS 'SELECT 1;';
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER invalid_fdw_handler;  -- ERROR
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER invalid_fdw_handler;  -- ERROR
 CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+
+-- should preserve dependency on test_fdw_handler
+ALTER FOREIGN DATA WRAPPER test_fdw VALIDATOR postgresql_fdw_validator;
+DROP FUNCTION test_fdw_handler(); -- ERROR
+
 DROP FOREIGN DATA WRAPPER test_fdw;
 
 -- ALTER FOREIGN DATA WRAPPER
@@ -383,10 +388,12 @@ COMMENT ON COLUMN ft1.c1 IS NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c5 integer DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE ft1 ADD COLUMN IF NOT EXISTS c6 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE ft1 ADD c11 integer;
 
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;
@@ -419,6 +426,7 @@ ALTER FOREIGN TABLE ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
 ALTER FOREIGN TABLE ft1 DROP COLUMN no_column;                  -- ERROR
 ALTER FOREIGN TABLE ft1 DROP COLUMN IF EXISTS no_column;
 ALTER FOREIGN TABLE ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE ft1 DROP c11;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
@@ -430,10 +438,12 @@ ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1;
 -- alter noexisting table
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c4 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c6 integer;
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN IF NOT EXISTS c6 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c7 integer NOT NULL;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c8 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c9 integer;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD COLUMN c10 integer OPTIONS (p1 'v1');
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ADD c11 integer;
 
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 ALTER COLUMN c7 DROP NOT NULL;
@@ -447,8 +457,10 @@ ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP CONSTRAINT IF EXISTS no_cons
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP CONSTRAINT ft1_c1_check;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OWNER TO regress_test_role;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 OPTIONS (DROP delimiter, SET quote '~', ADD escape '@');
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN no_column;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN IF EXISTS no_column;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP COLUMN c9;
+ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 DROP c11;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME c1 TO foreign_column_1;
 ALTER FOREIGN TABLE IF EXISTS doesnt_exist_ft1 RENAME TO foreign_table_1;
diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql
index cfcecb4e911..cfe6d9f9cc5 100644
--- a/src/test/regress/sql/foreign_key.sql
+++ b/src/test/regress/sql/foreign_key.sql
@@ -784,6 +784,43 @@ INSERT INTO fktable VALUES (500, 1000);
 
 COMMIT;
 
+-- Check that the existing FK trigger is both deferrable and initially deferred
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Changing the constraint to NOT ENFORCED drops the associated FK triggers
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey NOT ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Changing it back to ENFORCED will recreate the necessary FK triggers
+-- that are deferrable and initially deferred
+ALTER TABLE FKTABLE ALTER CONSTRAINT fktable_fk_fkey ENFORCED;
+SELECT conname, tgrelid::regclass as tgrel,
+       regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype,
+       tgdeferrable, tginitdeferred
+FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
+WHERE conrelid = 'fktable'::regclass AND conname = 'fktable_fk_fkey'
+ORDER BY tgrelid, tgtype;
+
+-- Verify that a deferrable, initially deferred foreign key still works
+-- as expected after being set to NOT ENFORCED and then re-enabled
+BEGIN;
+
+-- doesn't match PK, but no error yet
+INSERT INTO fktable VALUES (2, 20);
+
+-- should catch error from INSERT at commit
+COMMIT;
+
 DROP TABLE fktable, pktable;
 
 -- tricky behavior: according to SQL99, if a deferred constraint is set
@@ -1296,7 +1333,7 @@ UPDATE fk_notpartitioned_pk SET b = 2504 WHERE a = 2500;
 -- check psql behavior
 \d fk_notpartitioned_pk
 
--- Check the exsting FK trigger
+-- Check the existing FK trigger
 SELECT conname, tgrelid::regclass as tgrel, regexp_replace(tgname, '[0-9]+', 'N') as tgname, tgtype
 FROM pg_trigger t JOIN pg_constraint c ON (t.tgconstraint = c.oid)
 WHERE tgrelid IN (SELECT relid FROM pg_partition_tree('fk_partitioned_fk'::regclass)
@@ -2386,3 +2423,51 @@ SET client_min_messages TO warning;
 DROP SCHEMA fkpart12 CASCADE;
 RESET client_min_messages;
 RESET search_path;
+
+-- Exercise the column mapping code with foreign keys.  In this test we'll
+-- create a partitioned table which has a partition with a dropped column and
+-- check to ensure that an UPDATE cascades the changes correctly to the
+-- partitioned table.
+CREATE SCHEMA fkpart13;
+SET search_path TO fkpart13;
+
+CREATE TABLE fkpart13_t1 (a int PRIMARY KEY);
+
+CREATE TABLE fkpart13_t2 (
+  part_id int PRIMARY KEY,
+  column_to_drop int,
+  FOREIGN KEY (part_id) REFERENCES fkpart13_t1 ON UPDATE CASCADE ON DELETE CASCADE
+) PARTITION BY LIST (part_id);
+
+CREATE TABLE fkpart13_t2_p1 PARTITION OF fkpart13_t2 FOR VALUES IN (1);
+
+-- drop the column
+ALTER TABLE fkpart13_t2 DROP COLUMN column_to_drop;
+
+-- create a new partition without the dropped column
+CREATE TABLE fkpart13_t2_p2 PARTITION OF fkpart13_t2 FOR VALUES IN (2);
+
+CREATE TABLE fkpart13_t3 (
+  a int NOT NULL,
+  FOREIGN KEY (a)
+    REFERENCES fkpart13_t2
+    ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+INSERT INTO fkpart13_t1 (a) VALUES (1);
+INSERT INTO fkpart13_t2 (part_id) VALUES (1);
+INSERT INTO fkpart13_t3 (a) VALUES (1);
+
+-- Test a cascading update works correctly with with the dropped column
+UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+SELECT tableoid::regclass,* FROM fkpart13_t2;
+SELECT tableoid::regclass,* FROM fkpart13_t3;
+
+-- Exercise code in ExecGetTriggerResultRel() as there's been previous issues
+-- with ResultRelInfos being returned with the incorrect ri_RootResultRelInfo
+WITH cte AS (
+  UPDATE fkpart13_t2_p1 SET part_id = part_id
+) UPDATE fkpart13_t1 SET a = 2 WHERE a = 1;
+
+DROP SCHEMA fkpart13 CASCADE;
+RESET search_path;
diff --git a/src/test/regress/sql/generated_stored.sql b/src/test/regress/sql/generated_stored.sql
index 4ec155f2da9..6abae289ffe 100644
--- a/src/test/regress/sql/generated_stored.sql
+++ b/src/test/regress/sql/generated_stored.sql
@@ -217,6 +217,10 @@ COPY gtest1 FROM stdin;
 
 COPY gtest1 (a, b) FROM stdin;
 
+COPY gtest1 FROM stdin WHERE b <> 10;
+
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+
 SELECT * FROM gtest1 ORDER BY a;
 
 TRUNCATE gtest3;
@@ -500,7 +504,10 @@ SELECT tableoid::regclass, * FROM gtest_parent ORDER BY 1, 2, 3;
 
 -- generated columns in partition key (not allowed)
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE (f3);
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3));
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((f3 * 3));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) STORED) PARTITION BY RANGE ((gtest_part_key is not null));
 
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
@@ -595,6 +602,19 @@ ALTER TABLE gtest30_1 ALTER COLUMN b DROP EXPRESSION;  -- error
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') STORED, c text);
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
+
+-- bug #18970: these cases are unsupported, but make sure they fail cleanly
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+
 DROP TABLE gtest31_1, gtest31_2;
 
 -- Check it for a partitioned table, too
@@ -731,6 +751,29 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
 
 \d gtest28*
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) STORED);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+DROP TABLE gtest_rule;
 
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
diff --git a/src/test/regress/sql/generated_virtual.sql b/src/test/regress/sql/generated_virtual.sql
index 6fa986515b9..0ba8c626047 100644
--- a/src/test/regress/sql/generated_virtual.sql
+++ b/src/test/regress/sql/generated_virtual.sql
@@ -217,6 +217,10 @@ COPY gtest1 FROM stdin;
 
 COPY gtest1 (a, b) FROM stdin;
 
+COPY gtest1 FROM stdin WHERE b <> 10;
+
+COPY gtest1 FROM stdin WHERE gtest1 IS NULL;
+
 SELECT * FROM gtest1 ORDER BY a;
 
 TRUNCATE gtest3;
@@ -543,7 +547,10 @@ SELECT tableoid::regclass, * FROM gtest_parent ORDER BY 1, 2, 3;
 
 -- generated columns in partition key (not allowed)
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE (f3);
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3));
 CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((f3 * 3));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key));
+CREATE TABLE gtest_part_key (f1 date NOT NULL, f2 bigint, f3 bigint GENERATED ALWAYS AS (f2 * 2) VIRTUAL) PARTITION BY RANGE ((gtest_part_key is not null));
 
 -- ALTER TABLE ... ADD COLUMN
 CREATE TABLE gtest25 (a int PRIMARY KEY);
@@ -646,6 +653,19 @@ ALTER TABLE gtest30_1 ALTER COLUMN b DROP EXPRESSION;  -- error
 CREATE TABLE gtest31_1 (a int, b text GENERATED ALWAYS AS ('hello') VIRTUAL, c text);
 CREATE TABLE gtest31_2 (x int, y gtest31_1);
 ALTER TABLE gtest31_1 ALTER COLUMN b TYPE varchar;  -- fails
+
+-- bug #18970
+ALTER TABLE gtest31_2 ADD CONSTRAINT cc CHECK ((y).b IS NOT NULL);
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello1');
+ALTER TABLE gtest31_2 DROP CONSTRAINT cc;
+
+CREATE STATISTICS gtest31_2_stat ON ((y).b is not null) FROM gtest31_2;
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello2');
+DROP STATISTICS gtest31_2_stat;
+
+CREATE INDEX gtest31_2_y_idx ON gtest31_2(((y).b));
+ALTER TABLE gtest31_1 ALTER COLUMN b SET EXPRESSION AS ('hello3');
+
 DROP TABLE gtest31_1, gtest31_2;
 
 -- Check it for a partitioned table, too
@@ -782,6 +802,29 @@ CREATE TABLE gtest28b (LIKE gtest28a INCLUDING GENERATED);
 
 \d gtest28*
 
+-- rule actions referring to generated columns:
+-- NEW.b in a rule action should reflect the generated column's new value
+CREATE TABLE gtest_rule (a int, b int GENERATED ALWAYS AS (a * 2) VIRTUAL);
+CREATE TABLE gtest_rule_log (op text, old_b int, new_b int);
+CREATE RULE gtest_rule_upd AS ON UPDATE TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('UPD', OLD.b, NEW.b);
+CREATE RULE gtest_rule_ins AS ON INSERT TO gtest_rule
+  DO ALSO INSERT INTO gtest_rule_log VALUES ('INS', NULL, NEW.b);
+INSERT INTO gtest_rule (a) VALUES (1);
+UPDATE gtest_rule SET a = 10;
+UPDATE gtest_rule SET a = (SELECT max(b) FROM gtest_rule);
+SELECT * FROM gtest_rule_log;
+DROP RULE gtest_rule_upd ON gtest_rule;
+DROP RULE gtest_rule_ins ON gtest_rule;
+DROP TABLE gtest_rule_log;
+
+-- rule quals referring to generated columns:
+-- NEW.b in the rule qual should reflect the generated column's new value
+CREATE RULE gtest_rule_qual AS ON UPDATE TO gtest_rule WHERE NEW.b > 100
+  DO INSTEAD NOTHING;
+UPDATE gtest_rule SET a = 100;
+SELECT * FROM gtest_rule;
+DROP TABLE gtest_rule;
 
 -- sanity check of system catalog
 SELECT attrelid, attname, attgenerated FROM pg_attribute WHERE attgenerated NOT IN ('', 's', 'v');
@@ -846,3 +889,58 @@ select * from gtest32 t group by grouping sets (a, b, c, d, e) having c = 20;
 alter table gtest32 alter column e type bigint using b;
 
 drop table gtest32;
+
+-- Ensure that virtual generated columns in constraint expressions are expanded
+create table gtest33 (a int, b int generated always as (a * 2) virtual not null, check (b > 10));
+set constraint_exclusion to on;
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b < 10;
+
+-- should get a dummy Result, not a seq scan
+explain (costs off)
+select * from gtest33 where b is null;
+
+reset constraint_exclusion;
+drop table gtest33;
+
+-- Ensure that EXCLUDED.<virtual-generated-column> in INSERT ... ON CONFLICT
+-- DO UPDATE is expanded to the generation expression, both for plain and
+-- partitioned target relations.
+create table gtest34 (id int primary key, a int,
+                      c int generated always as (a * 10) virtual);
+insert into gtest34 values (1, 5);
+insert into gtest34 values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+insert into gtest34 values (1, 2)
+    on conflict (id) do update set a = gtest34.c + excluded.c returning *;
+insert into gtest34 values (1, 3)
+    on conflict (id) do update set a = 999 where excluded.c > 20 returning *;
+drop table gtest34;
+
+create table gtest34p (id int primary key, a int,
+                       c int generated always as (a * 10) virtual)
+    partition by range (id);
+create table gtest34p_1 partition of gtest34p for values from (1) to (100);
+insert into gtest34p values (1, 5);
+insert into gtest34p values (1, 7)
+    on conflict (id) do update set a = excluded.c returning *;
+insert into gtest34p values (1, 2)
+    on conflict (id) do update set a = gtest34p.c + excluded.c returning *;
+drop table gtest34p;
+
+-- Ensure that virtual generated columns work with WHERE CURRENT OF
+create table gtest_cursor (id int primary key, a int, b int generated always as (a * 2) virtual);
+insert into gtest_cursor values (1, 10), (2, 20), (3, 30);
+
+begin;
+declare curs cursor for select * from gtest_cursor order by id for update;
+fetch 1 from curs;
+update gtest_cursor set a = 99 where current of curs;
+select * from gtest_cursor order by id;
+delete from gtest_cursor where current of curs;
+select * from gtest_cursor order by id;
+commit;
+
+drop table gtest_cursor;
diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql
index 38d3cdd0fd8..826ac5f5dbf 100644
--- a/src/test/regress/sql/groupingsets.sql
+++ b/src/test/regress/sql/groupingsets.sql
@@ -183,6 +183,52 @@ select x, y || 'y'
   group by grouping sets (x, y)
   order by 1, 2;
 
+-- check that operands wrapped in PlaceHolderVars are capable of index matching
+begin;
+
+set local enable_bitmapscan = off;
+
+explain (costs off)
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select unique1 as x, unique2 as y from tenk1) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+explain (costs off)
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select unique1::oid as x, unique2 as y from tenk1) as t
+  where x::integer = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+explain (costs off)
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+select x, y
+  from (select t1.unique1 as x, t1.unique2 as y from tenk1 t1, tenk1 t2) as t
+  where x = 1
+  group by grouping sets (x, y)
+  order by 1, 2;
+
+rollback;
+
 -- check qual push-down rules for a subquery with grouping sets
 explain (verbose, costs off)
 select * from (
@@ -290,11 +336,29 @@ explain (costs off)
   select v.c, (select count(*) from gstest2 group by () having v.c)
     from (values (false),(true)) v(c) order by v.c;
 
--- test pushdown of HAVING clause that does not reference any columns that are nullable by grouping sets
+-- test pushdown of non-degenerate HAVING clause that does not reference any
+-- columns that are nullable by grouping sets
 explain (costs off)
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
 select a, b, count(*) from gstest2 group by grouping sets ((a, b), (a)) having a > 1 and b > 1;
 
+explain (costs off)
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+select a, b, count(*) from gstest2 group by rollup(a), b having b > 1;
+
+-- test pushdown of degenerate HAVING clause
+explain (costs off)
+select count(*) from gstest2 group by grouping sets (()) having false;
+select count(*) from gstest2 group by grouping sets (()) having false;
+
+explain (costs off)
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+select a, count(*) from gstest2 group by grouping sets ((a), ()) having false;
+
+explain (costs off)
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+select a, b, count(*) from gstest2 group by grouping sets ((a), (b)) having false;
+
 -- HAVING with GROUPING queries
 select ten, grouping(ten) from onek
 group by grouping sets(ten) having grouping(ten) >= 0
@@ -703,4 +767,27 @@ select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
 group by grouping sets((a, b), (a));
 
+-- test handling of SRFs with grouping sets
+explain (verbose, costs off)
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+
+select generate_series(1, a) as g
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(g)
+order by 1;
+
+explain (verbose, costs off)
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+
+select generate_series(1, a) as g, a+b as ab
+from (values (1, 1), (2, 2)) as t (a, b)
+group by rollup(a, ab)
+order by 1, 2;
+
 -- end
diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql
index 219da829816..60571f6cdf1 100644
--- a/src/test/regress/sql/hash_index.sql
+++ b/src/test/regress/sql/hash_index.sql
@@ -53,6 +53,9 @@ CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops)
   WITH (fillfactor=60);
 
+CREATE INDEX hash_i4_partial_index ON hash_i4_heap USING hash (seqno)
+  WHERE seqno = 9999;
+
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.
@@ -117,6 +120,16 @@ SELECT * FROM hash_f8_heap
 SELECT * FROM hash_f8_heap
    WHERE hash_f8_heap.random = '88888888'::float8;
 
+--
+-- partial hash index
+--
+EXPLAIN (COSTS OFF)
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+
+SELECT * FROM hash_i4_heap
+   WHERE seqno = 9999;
+
 --
 -- hash index
 -- grep '^90[^0-9]' hashovfl.data
diff --git a/src/test/regress/sql/indexing.sql b/src/test/regress/sql/indexing.sql
index b5cb01c2d70..706a6ec04ac 100644
--- a/src/test/regress/sql/indexing.sql
+++ b/src/test/regress/sql/indexing.sql
@@ -246,6 +246,65 @@ select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
 drop table idxpart;
 
+-- Verify that re-attaching an already-attached partition index can
+-- validate the parent index if it was still invalid, including
+-- indirect ancestors in subpartitions.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (0) to (500);
+-- Partitioned table with no partitions
+create table idxpart2 partition of idxpart for values from (1000) to (2000) partition by range (a);
+-- create parent indexes
+create index on only idxpart ((a/b));
+create index on only idxpart1 ((a/b));
+create index on only idxpart2 ((a/b));
+-- fail, leaves behind an invalid index on the leaf partition
+insert into idxpart11 values (1, 0);
+create index concurrently on idxpart11 ((a/b));
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- attach the indexes; parents stay invalid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- fix the index on the leaf partition
+delete from idxpart11 where b = 0;
+reindex index concurrently idxpart11_expr_idx;
+-- reattach the leaf partition index; parents should now be valid
+alter index idxpart1_expr_idx attach partition idxpart11_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Verify that re-attaching does not validate the parent when another
+-- child index is still invalid.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (500);
+create table idxpart2 partition of idxpart for values from (500) to (1000);
+create index on only idxpart ((a/b));
+-- create invalid indexes on both children
+insert into idxpart1 values (1, 0);
+insert into idxpart2 values (501, 0);
+create index concurrently on idxpart1 ((a/b));
+create index concurrently on idxpart2 ((a/b));
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- attach both; parent stays invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+alter index idxpart_expr_idx attach partition idxpart2_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- fix only idxpart1's index, leave idxpart2's still invalid
+delete from idxpart1 where b = 0;
+reindex index concurrently idxpart1_expr_idx;
+-- re-attach the fixed child; parent should stay invalid
+alter index idxpart_expr_idx attach partition idxpart1_expr_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
 -- verify dependency handling during ALTER TABLE DETACH PARTITION
 create table idxpart (a int) partition by range (a);
 create table idxpart1 (like idxpart);
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index f6e7070db65..3ac1ac69074 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -759,6 +759,26 @@ select * from tbl_rs t1 join
             (select t1.a+t3.a from tbl_rs t3) and t2.a < 5)
   on true;
 
+--
+-- regression test for bug with parallel-hash-right-semi join
+--
+
+begin;
+
+-- encourage use of parallel plans
+set local parallel_setup_cost=0;
+set local parallel_tuple_cost=0;
+set local min_parallel_table_scan_size=0;
+set local max_parallel_workers_per_gather=4;
+
+-- ensure we don't get parallel hash right semi join
+explain (costs off)
+select * from tenk1 t1
+where exists (select 1 from tenk1 t2 where fivethous = t1.fivethous)
+and t1.fivethous < 5;
+
+rollback;
+
 --
 -- regression test for bug #13908 (hash join with skew tuples & nbatch increase)
 --
@@ -839,6 +859,13 @@ explain (costs off)
 select a.* from tenk1 a left join tenk1 b on a.unique1 = b.unique2
 where b.unique2 is null;
 
+-- check that we avoid de-duplicating columns redundantly
+set enable_memoize to off;
+explain (costs off)
+select 1 from tenk1
+where (hundred, thousand) in (select twothousand, twothousand from onek);
+reset enable_memoize;
+
 --
 -- regression test for bogus RTE_GROUP entries
 --
@@ -1454,6 +1481,30 @@ select * from int4_tbl left join (
 ) ss(x) on true
 where ss.x is null;
 
+-- Test computation of varnullingrels when translating appendrel Var
+begin;
+
+create temp table t_append (a int not null, b int);
+insert into t_append values (1, 1);
+insert into t_append values (2, 3);
+
+explain (verbose, costs off)
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+
+select t1.a, s.a from t_append t1
+  left join t_append t2 on t1.a = t2.b
+  join lateral (
+    select t1.a as a union all select t2.a as a
+  ) s on true
+where s.a is not null;
+
+rollback;
+
 --
 -- test inlining of immutable functions
 --
@@ -2174,6 +2225,29 @@ from int8_tbl t1
   left join onek t4
     on t2.q2 < t3.unique2;
 
+-- bug #19460: we need to clean up RestrictInfos more than we had been doing
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select null::int as id) as dummy_source
+   left join (select a.id from a where a.id = 42) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+
+explain (costs off)
+select * from
+  (select 1::int as id) as lhs
+full join
+  (select dummy_source.id
+   from (select 2::int as id) as dummy_source
+   left join (select a.id from a) as sub
+   on sub.id = dummy_source.id
+  ) as rhs
+on lhs.id = rhs.id;
+
 -- More tests of correct placement of pseudoconstant quals
 
 -- simple constant-false condition
@@ -2420,6 +2494,69 @@ where t1.a = s.c;
 
 rollback;
 
+-- check handling of semijoins after join removal: we must suppress
+-- unique-ification of known-constant values
+begin;
+
+create temp table t (a int unique, b int);
+insert into t values (1, 2);
+
+explain (verbose, costs off)
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+
+select t1.a from t t1
+  left join t t2 on t1.a = t2.a
+       join t t3 on true
+where exists (select 1 from t t4
+                join t t5 on t4.b = t5.b
+                join t t6 on t5.b = t6.b
+              where t1.a = t4.a and t3.a = t5.a and t4.a = 1);
+
+rollback;
+
+-- check handling of semijoins if all RHS columns are equated to constants: we
+-- should suppress unique-ification in this case.
+begin;
+
+create temp table t (a int, b int);
+insert into t values (1, 2);
+
+explain (costs off)
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+
+select * from t t1, t t2 where exists
+  (select 1 from t t3 where t1.a = t3.a and t2.b = t3.b and t3.a = 1 and t3.b = 2);
+
+rollback;
+
+-- check handling of semijoin unique-ification for child relations if all RHS
+-- columns are equated to constants.
+begin;
+
+create temp table p (a int, b int) partition by range (a);
+create temp table p1 partition of p for values from (0) to (10);
+create temp table p2 partition of p for values from (10) to (20);
+insert into p values (1, 2);
+insert into p values (10, 20);
+
+set enable_partitionwise_join to on;
+
+explain (costs off)
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+
+select * from p t1 where exists
+  (select 1 from p t2 where t1.a = t2.a and t1.a = 1);
+
+rollback;
+
 -- test cases where we can remove a join, but not a PHV computed at it
 begin;
 
@@ -2964,6 +3101,12 @@ SELECT * FROM
 (SELECT n2.a FROM sj n1, sj n2 WHERE n1.a <> n2.a) q0, sl
 WHERE q0.a = 1;
 
+-- Do not forget to replace relid in bare Var join clause (bug #19435)
+ALTER TABLE sl ADD COLUMN bool_col boolean;
+EXPLAIN (COSTS OFF)
+SELECT 1 AS c1 FROM sl sl1 LEFT JOIN (sl AS sl2 NATURAL JOIN sl AS sl3)
+  ON sl2.bool_col LEFT JOIN sl AS sl4 ON sl2.bool_col;
+
 -- Check optimization disabling if it will violate special join conditions.
 -- Two identical joined relations satisfies self join removal conditions but
 -- stay in different special join infos.
@@ -3642,6 +3785,16 @@ GROUP BY s.c1, s.c2;
 
 DROP TABLE group_tbl;
 
+-- Test that we ignore PlaceHolderVars when looking up statistics
+EXPLAIN (COSTS OFF)
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+
+SELECT t1.unique1 FROM tenk1 t1 LEFT JOIN
+  (SELECT *, 42 AS phv FROM tenk1 t2) ss ON t1.unique2 = ss.unique2
+WHERE ss.unique1 = ss.phv AND t1.unique1 < 100;
+
 --
 -- Test for a nested loop join involving index scan, transforming OR-clauses
 -- to SAOP.
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
index 57c11acddfe..07295b46929 100644
--- a/src/test/regress/sql/jsonb.sql
+++ b/src/test/regress/sql/jsonb.sql
@@ -851,6 +851,7 @@ SELECT count(*) FROM testjsonb WHERE j @? '$';
 SELECT count(*) FROM testjsonb WHERE j @? '$.public';
 SELECT count(*) FROM testjsonb WHERE j @? '$.bar';
 
+ALTER TABLE testjsonb SET (parallel_workers = 2);
 CREATE INDEX jidx ON testjsonb USING gin (j);
 SET enable_seqscan = off;
 
@@ -939,7 +940,7 @@ SELECT count(*) FROM testjsonb WHERE j = '{"pos":98, "line":371, "node":"CBA", "
 
 --gin path opclass
 DROP INDEX jidx;
-CREATE INDEX jidx ON testjsonb USING gin (j jsonb_path_ops);
+CREATE INDEX CONCURRENTLY jidx ON testjsonb USING gin (j jsonb_path_ops);
 SET enable_seqscan = off;
 
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
diff --git a/src/test/regress/sql/multirangetypes.sql b/src/test/regress/sql/multirangetypes.sql
index 41d5524285a..c7953aad295 100644
--- a/src/test/regress/sql/multirangetypes.sql
+++ b/src/test/regress/sql/multirangetypes.sql
@@ -721,6 +721,22 @@ drop type textrange1;
 reset role;
 drop role regress_multirange_owner;
 
+--
+-- CREATE TYPE checks for CREATE on multirange schema
+--
+create role regress_mr;
+create schema mr_sch;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+grant create on schema mr_sch to regress_mr;
+set role regress_mr;
+create type mytype as range (subtype=int4, multirange_type_name=mr_sch.mr_type);
+reset role;
+drop type mytype;
+drop schema mr_sch;
+drop role regress_mr;
+
 --
 -- Test polymorphic type system
 --
@@ -815,6 +831,9 @@ select *, row_to_json(upper(t)) as u from
   (values (two_ints_multirange(two_ints_range(row(1,2), row(3,4)))),
           (two_ints_multirange(two_ints_range(row(5,6), row(7,8))))) v(t);
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_multirange;
+
 drop type two_ints cascade;
 
 --
diff --git a/src/test/regress/sql/partition_aggregate.sql b/src/test/regress/sql/partition_aggregate.sql
index ab070fee244..f2f23d5f5d8 100644
--- a/src/test/regress/sql/partition_aggregate.sql
+++ b/src/test/regress/sql/partition_aggregate.sql
@@ -74,6 +74,11 @@ EXPLAIN (COSTS OFF)
 SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
 SELECT a FROM pagg_tab WHERE a < 3 GROUP BY a ORDER BY 1;
 
+-- Test partitionwise aggregation with ordered append path built from fractional paths
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+SELECT count(*) FROM pagg_tab GROUP BY c ORDER BY c LIMIT 1;
+
 RESET enable_hashagg;
 
 -- ROLLUP, partitionwise aggregation does not apply
diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
index d93c0c03bab..359a9208056 100644
--- a/src/test/regress/sql/partition_prune.sql
+++ b/src/test/regress/sql/partition_prune.sql
@@ -1447,3 +1447,74 @@ select min(a) over (partition by a order by a) from part_abc where a >= stable_o
 
 drop view part_abc_view;
 drop table part_abc;
+
+--
+-- Check that operands wrapped in PlaceHolderVars are matched to partition
+-- keys, allowing partition pruning to occur.  PlaceHolderVars can be
+-- introduced when a subquery's output is used with grouping sets.
+--
+create table phv_part (a int, b text) partition by list (a);
+create table phv_part_1 partition of phv_part for values in (1);
+create table phv_part_2 partition of phv_part for values in (2);
+create table phv_part_null partition of phv_part for values in (null);
+insert into phv_part values (1, 'one'), (2, 'two'), (null, 'null');
+
+-- OpExpr: PHV-wrapped operand matched via equal()
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a = 1
+  group by grouping sets (a, b);
+
+-- OpExpr with RelabelType: PHV wrapped around a casted column
+explain (costs off)
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+
+select * from (select a::oid as x, b from phv_part) t
+  where x::int = 1
+  group by grouping sets (x, b);
+
+-- ScalarArrayOpExpr: IN clause with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a in (1, null)
+  group by grouping sets (a, b);
+
+-- NullTest: IS NULL with PHV-wrapped operand
+explain (costs off)
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_part) t
+  where a is null
+  group by grouping sets (a, b);
+
+drop table phv_part;
+
+-- BooleanTest: IS TRUE with PHV-wrapped boolean partition key
+create table phv_boolpart (a bool, b text) partition by list (a);
+create table phv_boolpart_t partition of phv_boolpart for values in (true);
+create table phv_boolpart_f partition of phv_boolpart for values in (false);
+create table phv_boolpart_null partition of phv_boolpart default;
+insert into phv_boolpart values (true, 'yes'), (false, 'no'), (null, 'unknown');
+
+explain (costs off)
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+
+select * from (select a, b from phv_boolpart) t
+  where a is true
+  group by grouping sets (a, b);
+
+drop table phv_boolpart;
diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql
index fc4cccb96c0..196b862c756 100644
--- a/src/test/regress/sql/portals.sql
+++ b/src/test/regress/sql/portals.sql
@@ -508,6 +508,11 @@ DECLARE c1 CURSOR FOR SELECT * FROM ucview;
 FETCH FROM c1;
 DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
 ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+UPDATE ucview SET f1 = f1 + 10 WHERE CURRENT OF c1; -- fail, views not supported
+ROLLBACK;
 
 -- Check WHERE CURRENT OF with an index-only scan
 BEGIN;
diff --git a/src/test/regress/sql/prepared_xacts.sql b/src/test/regress/sql/prepared_xacts.sql
index ade3a2672a8..b0712b153e0 100644
--- a/src/test/regress/sql/prepared_xacts.sql
+++ b/src/test/regress/sql/prepared_xacts.sql
@@ -1,3 +1,8 @@
+SELECT current_setting('max_prepared_transactions')::integer < 2 AS skip_test \gset
+\if :skip_test
+\quit
+\endif
+
 --
 -- PREPARED TRANSACTIONS (two-phase commit)
 --
@@ -158,7 +163,32 @@ SELECT * FROM pxtest3;
 -- There should be no prepared transactions
 SELECT gid FROM pg_prepared_xacts WHERE gid ~ '^regress_' ORDER BY gid;
 
+
+-- Test row-level locks held by prepared transactions
+CREATE TABLE pxtest_rowlock (id int PRIMARY KEY, data text);
+INSERT INTO pxtest_rowlock VALUES (1, 'test data');
+
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+PREPARE TRANSACTION 'regress_p1';
+
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+
+-- Test prepared transactions that participate in multixacts. For
+-- that, lock the same row again, creating a multixid.
+BEGIN;
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR SHARE;
+PREPARE TRANSACTION 'regress_p2';
+
+-- Should fail because the row is locked
+SELECT * FROM pxtest_rowlock WHERE id = 1 FOR UPDATE NOWAIT;
+
+ROLLBACK PREPARED 'regress_p1';
+ROLLBACK PREPARED 'regress_p2';
+
 -- Clean up
 DROP TABLE pxtest2;
-DROP TABLE pxtest3;  -- will still be there if prepared xacts are disabled
+-- pxtest3 was already dropped
 DROP TABLE pxtest4;
+DROP TABLE pxtest_rowlock;
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index f337aa67c13..75fe68df333 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -90,21 +90,6 @@ CREATE USER regress_priv_user3;
 CREATE USER regress_priv_user4;
 CREATE USER regress_priv_user5;
 
--- DROP OWNED should also act on granted and granted-to roles
-GRANT regress_priv_user1 TO regress_priv_user2;
-GRANT regress_priv_user2 TO regress_priv_user3;
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-REASSIGN OWNED BY regress_priv_user2 TO regress_priv_user4;  -- no effect
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-DROP OWNED BY regress_priv_user2;  -- removes both grants
-SELECT roleid::regrole, member::regrole FROM pg_auth_members
-  WHERE roleid IN ('regress_priv_user1'::regrole,'regress_priv_user2'::regrole)
-  ORDER BY roleid::regrole::text;
-
 GRANT pg_read_all_data TO regress_priv_user6;
 GRANT pg_write_all_data TO regress_priv_user7;
 GRANT pg_read_all_settings TO regress_priv_user8 WITH ADMIN OPTION;
@@ -346,8 +331,6 @@ CREATE VIEW atest12v AS
   SELECT * FROM atest12 WHERE b <<< 5;
 CREATE VIEW atest12sbv WITH (security_barrier=true) AS
   SELECT * FROM atest12 WHERE b <<< 5;
-GRANT SELECT ON atest12v TO PUBLIC;
-GRANT SELECT ON atest12sbv 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;
@@ -369,8 +352,16 @@ CREATE FUNCTION leak2(integer,integer) RETURNS boolean
 CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
                      restrict = scalargtsel);
 
--- This should not show any "leak" notices before failing.
+-- These should not show any "leak" notices before failing.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v WHERE a >>> 0;
+EXPLAIN (COSTS OFF) SELECT * FROM atest12sbv WHERE a >>> 0;
+
+-- Now regress_priv_user1 grants access to regress_priv_user2 via the views.
+SET SESSION AUTHORIZATION regress_priv_user1;
+GRANT SELECT ON atest12v TO PUBLIC;
+GRANT SELECT ON atest12sbv TO PUBLIC;
+SET SESSION AUTHORIZATION regress_priv_user2;
 
 -- These plans should continue to use a nestloop, since they execute with the
 -- privileges of the view owner.
@@ -1544,6 +1535,14 @@ SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 SELECT makeaclitem('regress_priv_user1'::regrole, 'regress_priv_user2'::regrole,
 	'SELECT, fake_privilege', FALSE);  -- error
 
+-- Test quoting and dequoting of user names in ACLs
+CREATE ROLE "regress_""quoted";
+SELECT makeaclitem('regress_"quoted'::regrole, 'regress_"quoted'::regrole,
+                   'SELECT', TRUE);
+SELECT '"regress_""quoted"=r*/"regress_""quoted"'::aclitem;
+SELECT '""=r*/""'::aclitem;  -- used to be misparsed as """"
+DROP ROLE "regress_""quoted";
+
 -- Test non-throwing aclitem I/O
 SELECT pg_input_is_valid('regress_priv_user1=r/regress_priv_user2', 'aclitem');
 SELECT pg_input_is_valid('regress_priv_user1=r/', 'aclitem');
@@ -1849,6 +1848,13 @@ DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 
 
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE USAGE ON TYPES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE USAGE ON TYPES FROM pg_read_all_settings;
+
+
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index e2e31245439..f064e4f5456 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -1073,6 +1073,7 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
 	\pset arg1 arg2
 	\q
 	\reset
+	\restrict test
 	\s arg1
 	\sendpipeline
 	\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
@@ -1084,6 +1085,7 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
 	\t arg1
 	\T arg1
 	\timing arg1
+	\unrestrict not_valid
 	\unset arg1
 	\w arg1
 	\watch arg1 arg2
diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql
index c9e309190df..3f423061395 100644
--- a/src/test/regress/sql/publication.sql
+++ b/src/test/regress/sql/publication.sql
@@ -26,6 +26,7 @@ CREATE PUBLICATION testpub_xxx WITH (publish = 'cluster, vacuum');
 CREATE PUBLICATION testpub_xxx WITH (publish_via_partition_root = 'true', publish_via_partition_root = '0');
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = stored, publish_generated_columns = none);
 CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns = foo);
+CREATE PUBLICATION testpub_xxx WITH (publish_generated_columns);
 
 \dRp
 
@@ -1183,19 +1184,15 @@ DROP SCHEMA sch2 cascade;
 -- ======================================================
 
 -- Test the 'publish_generated_columns' parameter with the following values:
--- 'stored', 'none', and the default (no value specified), which defaults to
--- 'stored'.
+-- 'stored', 'none'.
 SET client_min_messages = 'ERROR';
 CREATE PUBLICATION pub1 FOR ALL TABLES WITH (publish_generated_columns = stored);
 \dRp+ pub1
 CREATE PUBLICATION pub2 FOR ALL TABLES WITH (publish_generated_columns = none);
 \dRp+ pub2
-CREATE PUBLICATION pub3 FOR ALL TABLES WITH (publish_generated_columns);
-\dRp+ pub3
 
 DROP PUBLICATION pub1;
 DROP PUBLICATION pub2;
-DROP PUBLICATION pub3;
 
 -- Test the 'publish_generated_columns' parameter as 'none' and 'stored' for
 -- different scenarios with/without generated columns in column lists.
@@ -1226,6 +1223,86 @@ DROP PUBLICATION pub2;
 DROP TABLE gencols;
 
 RESET client_min_messages;
+
+-- Test that the INSERT ON CONFLICT command correctly checks REPLICA IDENTITY
+-- when the target table is published.
+CREATE TABLE testpub_insert_onconfl_no_ri (a int unique, b int);
+CREATE TABLE testpub_insert_onconfl_parted (a int unique, b int) PARTITION by RANGE (a);
+CREATE TABLE testpub_insert_onconfl_part_no_ri PARTITION OF testpub_insert_onconfl_parted FOR VALUES FROM (1) TO (10);
+
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+
+-- fail - missing REPLICA IDENTITY
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_no_ri VALUES (1, 1) ON CONFLICT DO NOTHING;
+
+-- fail - missing REPLICA IDENTITY in partition testpub_insert_onconfl_no_ri
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT (a) DO UPDATE SET b = 2;
+
+-- ok - no updates
+INSERT INTO testpub_insert_onconfl_parted VALUES (1, 1) ON CONFLICT DO NOTHING;
+
+DROP PUBLICATION pub1;
+DROP TABLE testpub_insert_onconfl_no_ri;
+DROP TABLE testpub_insert_onconfl_parted;
+
+-- Test that the MERGE command correctly checks REPLICA IDENTITY when the
+-- target table is published.
+CREATE TABLE testpub_merge_no_ri (a int, b int);
+CREATE TABLE testpub_merge_pk (a int primary key, b int);
+
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION pub1 FOR ALL TABLES;
+RESET client_min_messages;
+
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN UPDATE SET b = s.b;
+
+-- fail - missing REPLICA IDENTITY
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DELETE;
+
+-- ok - insert and do nothing are not restricted
+MERGE INTO testpub_merge_no_ri USING testpub_merge_pk s ON s.a >= 1
+ WHEN MATCHED THEN DO NOTHING
+ WHEN NOT MATCHED THEN INSERT (a, b) VALUES (0, 0);
+
+-- ok - REPLICA IDENTITY is DEFAULT and table has a PK
+MERGE INTO testpub_merge_pk USING testpub_merge_no_ri s ON s.a >= 1
+ WHEN MATCHED AND s.a > 0 THEN UPDATE SET b = s.b
+ WHEN MATCHED THEN DELETE;
+
+DROP PUBLICATION pub1;
+DROP TABLE testpub_merge_no_ri;
+DROP TABLE testpub_merge_pk;
+
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_publication_user, regress_publication_user2;
 DROP ROLE regress_publication_user_dummy;
+
+-- stage objects for pg_dump tests
+CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int);
+CREATE SCHEMA pubme2 CREATE TABLE t0 (c int, d int);
+SET client_min_messages = 'ERROR';
+CREATE PUBLICATION dump_pub_qual_1ct FOR
+  TABLE ONLY pubme.t0 (c, d) WHERE (c > 0);
+CREATE PUBLICATION dump_pub_qual_2ct FOR
+  TABLE ONLY pubme.t0 (c) WHERE (c > 0),
+  TABLE ONLY pubme.t1 (c);
+CREATE PUBLICATION dump_pub_nsp_1ct FOR
+  TABLES IN SCHEMA pubme;
+CREATE PUBLICATION dump_pub_nsp_2ct FOR
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2;
+CREATE PUBLICATION dump_pub_all FOR
+  TABLE ONLY pubme.t0,
+  TABLE ONLY pubme.t1 WHERE (c < 0),
+  TABLES IN SCHEMA pubme,
+  TABLES IN SCHEMA pubme2
+  WITH (publish_via_partition_root = true);
+RESET client_min_messages;
diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql
index 9da967a9ef2..21ac0ca51ee 100644
--- a/src/test/regress/sql/rowsecurity.sql
+++ b/src/test/regress/sql/rowsecurity.sql
@@ -2189,7 +2189,7 @@ DROP VIEW rls_view;
 DROP TABLE rls_tbl;
 DROP TABLE ref_tbl;
 
--- Leaky operator test
+-- Leaky operator tests
 CREATE TABLE rls_tbl (a int);
 INSERT INTO rls_tbl SELECT x/10 FROM generate_series(1, 100) x;
 ANALYZE rls_tbl;
@@ -2205,9 +2205,58 @@ CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
 SELECT * FROM rls_tbl WHERE a <<< 1000;
 EXPLAIN (COSTS OFF) SELECT * FROM rls_tbl WHERE a <<< 1000 or a <<< 900;
+RESET SESSION AUTHORIZATION;
+
+CREATE TABLE rls_child_tbl () INHERITS (rls_tbl);
+INSERT INTO rls_child_tbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_child_tbl;
+
+CREATE TABLE rls_ptbl (a int) PARTITION BY RANGE (a);
+CREATE TABLE rls_part PARTITION OF rls_ptbl FOR VALUES FROM (-100) TO (100);
+INSERT INTO rls_ptbl SELECT x/10 FROM generate_series(1, 100) x;
+ANALYZE rls_ptbl, rls_part;
+
+ALTER TABLE rls_ptbl ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_part ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_ptbl TO regress_rls_alice;
+GRANT SELECT ON rls_part TO regress_rls_alice;
+CREATE POLICY p1 ON rls_tbl USING (a < 0);
+CREATE POLICY p2 ON rls_ptbl USING (a < 0);
+CREATE POLICY p3 ON rls_part USING (a < 0);
+
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+SELECT * FROM rls_ptbl WHERE a <<< 1000;
+SELECT * FROM rls_part WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
+RESET SESSION AUTHORIZATION;
+
+REVOKE SELECT ON rls_tbl FROM regress_rls_alice;
+CREATE VIEW rls_tbl_view AS SELECT * FROM rls_tbl;
+
+ALTER TABLE rls_child_tbl ENABLE ROW LEVEL SECURITY;
+GRANT SELECT ON rls_child_tbl TO regress_rls_alice;
+CREATE POLICY p4 ON rls_child_tbl USING (a < 0);
+
+SET SESSION AUTHORIZATION regress_rls_alice;
+SELECT * FROM rls_tbl WHERE a <<< 1000;
+SELECT * FROM rls_tbl_view WHERE a <<< 1000;
+SELECT * FROM rls_child_tbl WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_tbl UNION ALL
+               SELECT * FROM rls_tbl) t WHERE a <<< 1000;
+SELECT * FROM (SELECT * FROM rls_child_tbl UNION ALL
+               SELECT * FROM rls_child_tbl) t WHERE a <<< 1000;
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
+DROP TABLE rls_part;
+DROP TABLE rls_ptbl;
+DROP TABLE rls_child_tbl;
+DROP VIEW rls_tbl_view;
 DROP TABLE rls_tbl;
 
 -- Bug #16006: whole-row Vars in a policy don't play nice with sub-selects
diff --git a/src/test/regress/sql/sqljson_queryfuncs.sql b/src/test/regress/sql/sqljson_queryfuncs.sql
index 8d7b225b612..a5d5e256d7f 100644
--- a/src/test/regress/sql/sqljson_queryfuncs.sql
+++ b/src/test/regress/sql/sqljson_queryfuncs.sql
@@ -450,6 +450,7 @@ SELECT JSON_VALUE(jsonb '{"a": 123}', '$' || '.' || 'a');
 SELECT JSON_VALUE(jsonb '{"a": 123}', '$' || '.' || 'b' DEFAULT 'foo' ON EMPTY);
 SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a');
 SELECT JSON_QUERY(jsonb '{"a": 123}', '$' || '.' || 'a' WITH WRAPPER);
+SELECT JSON_QUERY(jsonb '{"a": 123}', ('$' || '.' || 'a' || NULL)::date WITH WRAPPER);
 -- Should fail (invalid path)
 SELECT JSON_QUERY(jsonb '{"a": 123}', 'error' || ' ' || 'error');
 
@@ -460,6 +461,7 @@ SELECT JSON_QUERY(NULL FORMAT JSON, '$');
 -- Test non-const jsonpath
 CREATE TEMP TABLE jsonpaths (path) AS SELECT '$';
 SELECT json_value('"aaa"', path RETURNING json) FROM jsonpaths;
+SELECT json_value('"aaa"', jsonpaths RETURNING json) FROM jsonpaths;
 
 -- Test PASSING argument parsing
 SELECT JSON_QUERY(jsonb 'null', '$xyz' PASSING 1 AS xy);
diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql
index 232ab8db8fa..2df55a9f2e5 100644
--- a/src/test/regress/sql/stats.sql
+++ b/src/test/regress/sql/stats.sql
@@ -402,9 +402,17 @@ COMMIT;
 -- check that the stats are reset.
 SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
   WHERE relid = 'pg_shdescription'::regclass;
+-- stats_reset may not be set for datid=0 and shared objects in
+-- pg_stat_database, so reset once.
 SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
 SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
   WHERE relid = 'pg_shdescription'::regclass;
+SELECT stats_reset AS shared_db_reset_before
+  FROM pg_stat_database WHERE datid = 0 \gset
+-- Second reset for comparison.
+SELECT pg_stat_reset_single_table_counters('pg_shdescription'::regclass);
+SELECT stats_reset > :'shared_db_reset_before'::timestamptz AS has_updated
+  FROM pg_stat_database WHERE datid = 0;
 
 -- set back comment
 \if :{?description_before}
diff --git a/src/test/regress/sql/stats_ext.sql b/src/test/regress/sql/stats_ext.sql
index da4f2fe9c93..7272f9d8764 100644
--- a/src/test/regress/sql/stats_ext.sql
+++ b/src/test/regress/sql/stats_ext.sql
@@ -40,6 +40,18 @@ CREATE STATISTICS tst ON x, x, y, x, x, (x || 'x'), (y + 1), (x || 'x'), (x || '
 CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), (y + 1), (x || 'x'), (x || 'x'), (y + 1), (x || 'x'), (x || 'x'), (y + 1) FROM ext_stats_test;
 CREATE STATISTICS tst ON (x || 'x'), (x || 'x'), y FROM ext_stats_test;
 CREATE STATISTICS tst (unrecognized) ON x, y FROM ext_stats_test;
+-- unsupported targets
+CREATE STATISTICS tst ON a FROM (VALUES (x)) AS foo;
+CREATE STATISTICS tst ON a FROM foo NATURAL JOIN bar;
+CREATE STATISTICS tst ON a FROM (SELECT * FROM ext_stats_test) AS foo;
+CREATE STATISTICS tst ON a FROM ext_stats_test s TABLESAMPLE system (x);
+CREATE STATISTICS tst ON a FROM XMLTABLE('foo' PASSING 'bar' COLUMNS a text);
+CREATE STATISTICS tst ON a FROM JSON_TABLE(jsonb '123', '$' COLUMNS (item int));
+CREATE FUNCTION tftest(int) returns table(a int, b int) as $$
+SELECT $1, $1+i FROM generate_series(1,5) g(i);
+$$ LANGUAGE sql IMMUTABLE STRICT;
+CREATE STATISTICS alt_stat2 ON a FROM tftest(1);
+DROP FUNCTION tftest;
 -- incorrect expressions
 CREATE STATISTICS tst ON (y) FROM ext_stats_test; -- single column reference
 CREATE STATISTICS tst ON y + z FROM ext_stats_test; -- missing parentheses
@@ -71,6 +83,14 @@ DROP STATISTICS ab1_a_b_stats;
 ALTER STATISTICS ab1_a_b_stats RENAME TO ab1_a_b_stats_new;
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_stats_ext;
+CREATE STATISTICS pg_temp.stats_ext_temp ON a, b FROM ab1;
+SELECT regexp_replace(pg_describe_object(tableoid, oid, 0),
+                      'pg_temp_[0-9]*', 'pg_temp_REDACTED') AS descr,
+       pg_statistics_obj_is_visible(oid) AS visible
+  FROM pg_statistic_ext
+ WHERE stxname = 'stats_ext_temp';
+DROP STATISTICS stats_ext_temp;  -- shall fail
+DROP STATISTICS pg_temp.stats_ext_temp;
 
 CREATE STATISTICS IF NOT EXISTS ab1_a_b_stats ON a, b FROM ab1;
 DROP STATISTICS ab1_a_b_stats;
@@ -1647,8 +1667,15 @@ CREATE FUNCTION op_leak(int, int) RETURNS bool
     LANGUAGE plpgsql;
 CREATE OPERATOR <<< (procedure = op_leak, leftarg = int, rightarg = int,
                      restrict = scalarltsel);
+CREATE FUNCTION op_leak(record, record) RETURNS bool
+    AS 'BEGIN RAISE NOTICE ''op_leak => %, %'', $1, $2; RETURN $1 < $2; END'
+    LANGUAGE plpgsql;
+CREATE OPERATOR <<< (procedure = op_leak, leftarg = record, rightarg = record,
+                     restrict = scalarltsel);
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
 
 -- Grant access via a security barrier view, but hide all data
@@ -1661,19 +1688,51 @@ GRANT SELECT, DELETE ON tststats.priv_test_view TO regress_stats_user1;
 SET SESSION AUTHORIZATION regress_stats_user1;
 SELECT * FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 SELECT * FROM tststats.priv_test_view WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_view t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
 DELETE FROM tststats.priv_test_view WHERE a <<< 0 AND b <<< 0; -- Should not leak
 
 -- Grant table access, but hide all data with RLS
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tststats.priv_test_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_tbl_pol ON tststats.priv_test_tbl USING (2 * a < 0);
 GRANT SELECT, DELETE ON tststats.priv_test_tbl TO regress_stats_user1;
 
 -- Should now have direct table access, but see nothing and leak nothing
 SET SESSION AUTHORIZATION regress_stats_user1;
 SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
-SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0;
+SELECT * FROM tststats.priv_test_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
 DELETE FROM tststats.priv_test_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
 
+-- Create plain inheritance parent table with no access permissions
+RESET SESSION AUTHORIZATION;
+CREATE TABLE tststats.priv_test_parent_tbl (a int, b int);
+ALTER TABLE tststats.priv_test_tbl INHERIT tststats.priv_test_parent_tbl;
+
+-- Should not have access to parent, and should leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Permission denied
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Permission denied
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Permission denied
+
+-- Grant table access to parent, but hide all data with RLS
+RESET SESSION AUTHORIZATION;
+ALTER TABLE tststats.priv_test_parent_tbl ENABLE ROW LEVEL SECURITY;
+CREATE POLICY priv_test_parent_tbl_pol ON tststats.priv_test_parent_tbl USING (2 * a < 0);
+GRANT SELECT, DELETE ON tststats.priv_test_parent_tbl TO regress_stats_user1;
+
+-- Should now have direct table access to parent, but see nothing and leak nothing
+SET SESSION AUTHORIZATION regress_stats_user1;
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_parent_tbl WHERE a <<< 0 OR b <<< 0; -- Should not leak
+SELECT * FROM tststats.priv_test_parent_tbl t
+ WHERE a <<< 0 AND (b <<< 0 OR t.* <<< (1, 1) IS NOT NULL); -- Should not leak
+DELETE FROM tststats.priv_test_parent_tbl WHERE a <<< 0 AND b <<< 0; -- Should not leak
+
 -- privilege checks for pg_stats_ext and pg_stats_ext_exprs
 RESET SESSION AUTHORIZATION;
 CREATE TABLE stats_ext_tbl (id INT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, col TEXT);
@@ -1700,12 +1759,48 @@ SELECT statistics_name, most_common_vals FROM pg_stats_ext x
 SELECT statistics_name, most_common_vals FROM pg_stats_ext_exprs x
     WHERE tablename = 'stats_ext_tbl' ORDER BY ROW(x.*);
 
+-- CREATE STATISTICS checks for CREATE on the schema
+RESET SESSION AUTHORIZATION;
+CREATE SCHEMA sts_sch1 CREATE TABLE sts_sch1.tbl (a INT, b INT, c INT GENERATED ALWAYS AS (b * 2) STORED);
+CREATE SCHEMA sts_sch2;
+GRANT USAGE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+ALTER TABLE sts_sch1.tbl OWNER TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.fail ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1 FROM regress_stats_user1;
+GRANT CREATE ON SCHEMA sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass1 ON a, b, c FROM sts_sch1.tbl;
+RESET SESSION AUTHORIZATION;
+GRANT CREATE ON SCHEMA sts_sch1, sts_sch2 TO regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+CREATE STATISTICS ON a, b, c FROM sts_sch1.tbl;
+CREATE STATISTICS sts_sch2.pass2 ON a, b, c FROM sts_sch1.tbl;
+
+-- re-creating statistics via ALTER TABLE bypasses checks for CREATE on schema
+RESET SESSION AUTHORIZATION;
+REVOKE CREATE ON SCHEMA sts_sch1, sts_sch2 FROM regress_stats_user1;
+SET SESSION AUTHORIZATION regress_stats_user1;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN a TYPE SMALLINT;
+ALTER TABLE sts_sch1.tbl ALTER COLUMN c SET EXPRESSION AS (a * 3);
+
 -- Tidy up
 DROP OPERATOR <<< (int, int);
 DROP FUNCTION op_leak(int, int);
+DROP OPERATOR <<< (record, record);
+DROP FUNCTION op_leak(record, record);
 RESET SESSION AUTHORIZATION;
 DROP TABLE stats_ext_tbl;
 DROP SCHEMA tststats CASCADE;
+DROP SCHEMA sts_sch1, sts_sch2 CASCADE;
 DROP USER regress_stats_user1;
 
 CREATE TABLE grouping_unique (x integer);
diff --git a/src/test/regress/sql/stats_import.sql b/src/test/regress/sql/stats_import.sql
index d140733a750..ee97fa6bc1b 100644
--- a/src/test/regress/sql/stats_import.sql
+++ b/src/test/regress/sql/stats_import.sql
@@ -457,6 +457,60 @@ AND tablename = 'test'
 AND inherited = false
 AND attname = 'id';
 
+-- warn: mcv / mcf array length mismatch (more vals), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.24::real,
+    'most_common_vals', '{2,1,3}'::text,
+    'most_common_freqs', '{0.3,0.25}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
+-- warn: mcv / mcf array length mismatch (more freqs), mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.25::real,
+    'most_common_vals', '{2,1}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
+-- warn: most_common_vals is multi-dimensional, mcv-pair fails, rest get set
+SELECT pg_catalog.pg_restore_attribute_stats(
+    'schemaname', 'stats_import',
+    'relname', 'test',
+    'attname', 'id',
+    'inherited', false::boolean,
+    'null_frac', 0.26::real,
+    'most_common_vals', '{{2,1},{3,4}}'::text,
+    'most_common_freqs', '{0.3,0.25,0.05,0.04}'::real[]
+    );
+
+SELECT *
+FROM pg_stats
+WHERE schemaname = 'stats_import'
+AND tablename = 'test'
+AND inherited = false
+AND attname = 'id';
+
 -- ok: mcv+mcf
 SELECT pg_catalog.pg_restore_attribute_stats(
     'schemaname', 'stats_import',
diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql
index 2577a42987d..0198927f5fc 100644
--- a/src/test/regress/sql/strings.sql
+++ b/src/test/regress/sql/strings.sql
@@ -216,6 +216,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[]%][^]%][^%]%';
 -- Closing square bracket effective after two carets at the beginning
 -- of character class.
 EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[^^]^';
+-- Closing square bracket after an escape sequence at the beginning of
+-- a character closes the character class
+EXPLAIN (COSTS OFF) SELECT * FROM TEXT_TBL WHERE f1 SIMILAR TO '[|a]%' ESCAPE '|';
 
 -- Test backslash escapes in regexp_replace's replacement string
 SELECT regexp_replace('1112223333', E'(\\d{3})(\\d{3})(\\d{4})', E'(\\1) \\2-\\3');
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index fec38ef85a6..c729d6d1970 100644
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -340,6 +340,17 @@ select * from (
   where not exists (select 1 from tenk1 as b where b.unique2 = 10000)
 ) ss;
 
+
+--
+-- Test cases for interactions between PARAM_EXEC, subplans and array
+-- subscripts
+--
+
+-- check that array subscription doesn't conflict with PARAM_EXEC (see #19370)
+SELECT (array[1,2])[(SELECT g.i)] FROM generate_series(1, 1) g(i);
+SELECT (array[1,2])[(SELECT g.i):(SELECT g.i + 1)] FROM generate_series(1, 1) g(i);
+
+
 --
 -- Test that an IN implemented using a UniquePath does unique-ification
 -- with the right semantics, as per bug #4113.  (Unfortunately we have
@@ -412,6 +423,15 @@ select (select view_a) from view_a;
 select (select (select view_a)) from view_a;
 select (select (a.*)::text) from view_a a;
 
+--
+-- Test case for bug #19037: no relation entry for relid N
+--
+
+explain (costs off)
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+
+select (1 = any(array_agg(f1))) = any (select false) from int4_tbl;
+
 --
 -- Check that whole-row Vars reading the result of a subselect don't include
 -- any junk columns therein
@@ -863,6 +883,46 @@ select * from
   (select 9 as x, unnest(array[1,2,3,11,12,13]) as u) ss
   where tattle(x, u);
 
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains SRFs
+--
+explain (verbose, costs off)
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+
+select * from
+  (select generate_series(1, ten) as g, count(*) from tenk1 group by 1) ss
+  where ss.g = 1;
+
+--
+-- check that an upper-level qual is not pushed down if it references a grouped
+-- Var whose underlying expression contains volatile functions
+--
+alter function tattle(x int, y int) volatile;
+
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+-- if we pretend it's stable, we get different results:
+alter function tattle(x int, y int) stable;
+
+explain (verbose, costs off)
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
+select * from
+  (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
+  where ss.v;
+
 drop function tattle(x int, y int);
 
 --
@@ -920,6 +980,23 @@ fetch backward all in c1;
 
 commit;
 
+--
+-- Check that JsonConstructorExpr is treated as non-strict, and thus can be
+-- wrapped in a PlaceHolderVar
+--
+
+begin;
+
+create temp table json_tab (a int);
+insert into json_tab values (1);
+
+explain (verbose, costs off)
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+
+select * from json_tab t1 left join (select json_array(1, a) from json_tab t2) s on false;
+
+rollback;
+
 --
 -- Verify that we correctly flatten cases involving a subquery output
 -- expression that doesn't need to be wrapped in a PlaceHolderVar
diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql
index 55f80530ea0..313757ed041 100644
--- a/src/test/regress/sql/timestamp.sql
+++ b/src/test/regress/sql/timestamp.sql
@@ -175,7 +175,9 @@ SELECT d1 - timestamp without time zone '1997-01-02' AS diff
    FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
 
 SELECT date_trunc( 'week', timestamp '2004-02-29 15:44:17.71393' ) AS week_trunc;
-
+SELECT date_trunc( 'week', timestamp 'infinity' ) AS inf_trunc;
+SELECT date_trunc( 'timezone', timestamp '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+SELECT date_trunc( 'timezone', timestamp 'infinity' ) AS notsupp_inf_trunc;
 SELECT date_trunc( 'ago', timestamp 'infinity' ) AS invalid_trunc;
 
 -- verify date_bin behaves the same as date_trunc for relevant intervals
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index caca3123f13..6ace851d169 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -217,15 +217,18 @@ SELECT d1 - timestamp with time zone '1997-01-02' AS diff
    FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
 
 SELECT date_trunc( 'week', timestamp with time zone '2004-02-29 15:44:17.71393' ) AS week_trunc;
+SELECT date_trunc( 'week', timestamp with time zone 'infinity' ) AS inf_trunc;
+SELECT date_trunc( 'timezone', timestamp with time zone '2004-02-29 15:44:17.71393' ) AS notsupp_trunc;
+SELECT date_trunc( 'timezone', timestamp with time zone 'infinity' ) AS notsupp_inf_trunc;
 SELECT date_trunc( 'ago', timestamp with time zone 'infinity' ) AS invalid_trunc;
 
 SELECT date_trunc('day', timestamp with time zone '2001-02-16 20:38:40+00', 'Australia/Sydney') as sydney_trunc;  -- zone name
 SELECT date_trunc('day', timestamp with time zone '2001-02-16 20:38:40+00', 'GMT') as gmt_trunc;  -- fixed-offset abbreviation
 SELECT date_trunc('day', timestamp with time zone '2001-02-16 20:38:40+00', 'VET') as vet_trunc;  -- variable-offset abbreviation
+SELECT date_trunc('timezone', timestamp with time zone 'infinity', 'GMT') AS notsupp_zone_trunc;
+SELECT date_trunc( 'week', timestamp with time zone 'infinity', 'GMT') AS inf_zone_trunc;
 SELECT date_trunc('ago', timestamp with time zone 'infinity', 'GMT') AS invalid_zone_trunc;
 
-
-
 -- verify date_bin behaves the same as date_trunc for relevant intervals
 SELECT
   str,
diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index 9ffd318385f..ddf42af64ed 100644
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -1922,6 +1922,11 @@ BBB	42
 CCC	42
 \.
 
+-- check detach/reattach behavior; statement triggers with transition tables
+-- should not prevent a table from becoming a partition again
+alter table parent detach partition child1;
+alter table parent attach partition child1 for values in ('AAA');
+
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2141,6 +2146,11 @@ copy parent (a, b) from stdin;
 DDD	42
 \.
 
+-- check disinherit/reinherit behavior; statement triggers with transition
+-- tables should not prevent a table from becoming an inheritance child again
+alter table child1 no inherit parent;
+alter table child1 inherit parent;
+
 -- DML affecting parent sees tuples collected from children even if
 -- there is no transition table trigger on the children
 drop trigger child1_insert_trig on child1;
@@ -2205,6 +2215,10 @@ with wcte as (insert into table1 values (42))
 with wcte as (insert into table1 values (43))
   insert into table1 values (44);
 
+with wcte as (insert into table1 values (45))
+  merge into table1 using (values (46)) as v(a) on table1.a = v.a
+    when not matched then insert values (v.a);
+
 select * from table1;
 select * from table2;
 
diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
index fbd26cdba45..8b3d700f57c 100644
--- a/src/test/regress/sql/tsearch.sql
+++ b/src/test/regress/sql/tsearch.sql
@@ -222,6 +222,7 @@ RESET enable_bitmapscan;
 
 DROP INDEX wowidx;
 
+ALTER TABLE test_tsvector SET (parallel_workers = 2);
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 
 SET enable_seqscan=OFF;
@@ -646,6 +647,14 @@ SELECT ts_headline('english',
 SELECT ts_headline('english',
 'foo bar', to_tsquery('english', ''));
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+
 --Rewrite sub system
 
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
diff --git a/src/test/regress/sql/union.sql b/src/test/regress/sql/union.sql
index 13700a6bfc4..bc50bc40ded 100644
--- a/src/test/regress/sql/union.sql
+++ b/src/test/regress/sql/union.sql
@@ -592,3 +592,7 @@ select * from tenk1 t1
 left join lateral
   (select t1.tenthous from tenk2 t2 union all (values(1)))
 on true limit 1;
+
+-- Test handling of Vars with varno 0 in estimate_array_length
+explain (verbose, costs off)
+select null::int[] union all select null::int[] union all select null::bigint[];
diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index 02f105f070e..ff58f45ce26 100644
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -330,6 +330,32 @@ CREATE TEMP VIEW v_window AS
 
 SELECT pg_get_viewdef('v_window');
 
+-- test overflow frame specifications
+SELECT sum(unique1) over (rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (rows between 9223372036854775807 following and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 9223372036854775807 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+-- These test GROUPS mode with an offset large enough to cause overflow when
+-- added to currentgroup.  Although the overflow doesn't produce visibly wrong
+-- results (due to the incremental nature of group pointer advancement), we
+-- still need to protect against it as signed integer overflow is undefined
+-- behavior in C.
+SELECT sum(unique1) over (ORDER BY four groups between current row and 9223372036854775807 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (ORDER BY four groups between 9223372036854775807 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
 -- RANGE offset PRECEDING/FOLLOWING tests
 
 SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
diff --git a/src/test/regress/sql/with.sql b/src/test/regress/sql/with.sql
index b1cae161290..2255befda89 100644
--- a/src/test/regress/sql/with.sql
+++ b/src/test/regress/sql/with.sql
@@ -1097,6 +1097,30 @@ select ( with cte(foo) as ( values(f1) )
           values((select foo from cte)) )
 from int4_tbl;
 
+--
+-- test for bug #19055: interaction of WITH with aggregates
+--
+-- For now, we just throw an error if there's a use of a CTE below the
+-- semantic level that the SQL standard assigns to the aggregate.
+-- It's not entirely clear what we could do instead that doesn't risk
+-- breaking more things than it fixes.
+select f1, (with cte1(x,y) as (select 1,2)
+            select count((select i4.f1 from cte1))) as ss
+from int4_tbl i4;
+
+--
+-- test for bug #19106: interaction of WITH with aggregates
+--
+-- the initial fix for #19055 was too aggressive and broke this case
+explain (verbose, costs off)
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+
+with a as ( select id from (values (1), (2)) as v(id) ),
+     b as ( select max((select sum(id) from a)) as agg )
+select agg from b;
+
 --
 -- test for nested-recursive-WITH bug
 --
@@ -1336,6 +1360,29 @@ COMMIT;
 
 SELECT * FROM bug6051_3;
 
+-- check that recursive CTE processing doesn't rewrite a CTE more than once
+-- (must not try to expand GENERATED ALWAYS IDENTITY columns more than once)
+CREATE TEMP TABLE id_alw1 (i int GENERATED ALWAYS AS IDENTITY);
+
+CREATE TEMP TABLE id_alw2 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE TEMP VIEW id_alw2_view AS SELECT * FROM id_alw2;
+
+CREATE TEMP TABLE id_alw3 (i int GENERATED ALWAYS AS IDENTITY);
+CREATE RULE id_alw3_ins AS ON INSERT TO id_alw3 DO INSTEAD
+  WITH t1 AS (INSERT INTO id_alw1 DEFAULT VALUES RETURNING i)
+    INSERT INTO id_alw2_view DEFAULT VALUES RETURNING i;
+CREATE TEMP VIEW id_alw3_view AS SELECT * FROM id_alw3;
+
+CREATE TEMP TABLE id_alw4 (i int GENERATED ALWAYS AS IDENTITY);
+
+WITH t4 AS (INSERT INTO id_alw4 DEFAULT VALUES RETURNING i)
+  INSERT INTO id_alw3_view DEFAULT VALUES RETURNING i;
+
+SELECT * from id_alw1;
+SELECT * from id_alw2;
+SELECT * from id_alw3;
+SELECT * from id_alw4;
+
 -- check case where CTE reference is removed due to optimization
 EXPLAIN (VERBOSE, COSTS OFF)
 SELECT q1 FROM
diff --git a/src/test/regress/sql/without_overlaps.sql b/src/test/regress/sql/without_overlaps.sql
index 4aaca242bbe..430f5bf05ee 100644
--- a/src/test/regress/sql/without_overlaps.sql
+++ b/src/test/regress/sql/without_overlaps.sql
@@ -180,6 +180,37 @@ ALTER TABLE temporal_rng3 DROP CONSTRAINT temporal_rng3_uq;
 DROP TABLE temporal_rng3;
 DROP TYPE textrange2;
 
+--
+-- test PRIMARY KEY and UNIQUE constraints' interaction with domains
+--
+
+-- range over domain:
+CREATE DOMAIN int4_d as integer check (value <> 10);
+CREATE TYPE int4_d_range as range (subtype = int4_d);
+CREATE TABLE temporal_rng4 (
+  id int4range,
+  valid_at int4_d_range,
+  CONSTRAINT temporal_rng4_pk PRIMARY KEY(id, valid_at WITHOUT OVERLAPS)
+);
+INSERT INTO temporal_rng4 VALUES ('[1,11)', '[9,10)'); -- start bound violates domain
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[10,11)'); -- end bound violates domain
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[2,5)'); -- overlaps
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[20,23)'); -- okay
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[30,)'); -- null bound is okay
+DROP TABLE temporal_rng4;
+
+-- domain over range:
+CREATE DOMAIN int4range_d AS int4range CHECK (VALUE <> '[10,11)');
+CREATE TABLE temporal_rng4 (
+  id int4range,
+  valid_at int4range_d,
+  CONSTRAINT temporal_rng4_pk UNIQUE (id, valid_at WITHOUT OVERLAPS)
+);
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[10,11)'); -- violates domain
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[2,13)'); -- overlaps
+INSERT INTO temporal_rng4 VALUES ('[1,2)', '[1,13)'), ('[1,2)', '[20,23)'); -- okay
+DROP TABLE temporal_rng4;
+
 --
 -- test ALTER TABLE ADD CONSTRAINT
 --
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index f9d30843efc..f2e3eddb58a 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -172,6 +172,13 @@ sub switch_server_cert
 	ok( (@status = stat("$tempdir/key.txt")),
 		"keylog file exists and returned status");
 	ok(@status && !($status[2] & 0006), "keylog file is not world readable");
+
+	# Connect should work with an incorrect sslkeylogfile, with the error to
+	# open the logfile printed to stderr
+	$node->connect_ok(
+		"$common_connstr sslrootcert=ssl/root+server_ca.crt sslkeylogfile=$tempdir/invalid/key.txt sslmode=require",
+		"connect with server root cert and incorrect sslkeylogfile path",
+		expected_stderr => qr/could not open/);
 }
 
 # The server should not accept non-SSL connections.
@@ -735,33 +742,29 @@ sub switch_server_cert
 
 # pg_stat_ssl
 
-my $serialno = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
-if ($? == 0)
-{
-	# OpenSSL prints serial numbers in hexadecimal and converting the serial
-	# from hex requires a 64-bit capable Perl as the serialnumber is based on
-	# the current timestamp. On 32-bit fall back to checking for it being an
-	# integer like how we do when grabbing the serial fails.
-	if ($Config{ivsize} == 8)
-	{
-		no warnings qw(portable);
+# If the openssl program isn't available, or fails to run, fall back to a
+# generic integer match rather than skipping the test.
+my $serialno = '\d+';
 
-		$serialno =~ s/^serial=//;
-		$serialno =~ s/\s+//g;
-		$serialno = hex($serialno);
-	}
-	else
+if ($ENV{OPENSSL} ne '')
+{
+	my $serialstr = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
+	if ($? == 0)
 	{
-		$serialno = '\d+';
+		# OpenSSL prints serial numbers in hexadecimal and converting the serial
+		# from hex requires a 64-bit capable Perl as the serialnumber is based on
+		# the current timestamp. On 32-bit fall back to checking for it being an
+		# integer like how we do when grabbing the serial fails.
+		if ($Config{ivsize} == 8)
+		{
+			no warnings qw(portable);
+
+			$serialstr =~ s/^serial=//;
+			$serialstr =~ s/\s+//g;
+			$serialno = hex($serialstr);
+		}
 	}
 }
-else
-{
-	# OpenSSL isn't functioning on the user's PATH. This probably isn't worth
-	# skipping the test over, so just fall back to a generic integer match.
-	warn "couldn't run \"$ENV{OPENSSL} x509\" to get client cert serialno";
-	$serialno = '\d+';
-}
 
 command_like(
 	[
diff --git a/src/test/subscription/t/001_rep_changes.pl b/src/test/subscription/t/001_rep_changes.pl
index 17dbab06164..58258a92307 100644
--- a/src/test/subscription/t/001_rep_changes.pl
+++ b/src/test/subscription/t/001_rep_changes.pl
@@ -352,7 +352,8 @@
 # Note that the current location of the log file is not grabbed immediately
 # after reloading the configuration, but after sending one SQL command to
 # the node so as we are sure that the reloading has taken effect.
-my $log_location = -s $node_subscriber->logfile;
+my $log_location_pub = -s $node_publisher->logfile;
+my $log_location_sub = -s $node_subscriber->logfile;
 
 $node_publisher->safe_psql('postgres',
 	"UPDATE tab_full_pk SET b = 'quux' WHERE a = 1");
@@ -362,12 +363,12 @@
 
 $node_publisher->wait_for_catchup('tap_sub');
 
-my $logfile = slurp_file($node_subscriber->logfile, $log_location);
+my $logfile = slurp_file($node_subscriber->logfile, $log_location_sub);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab_full_pk": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(1, quux\); replica identity \(a\)=\(1\)/m,
+	  qr/conflict detected on relation "public.tab_full_pk": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(1, quux\); replica identity \(a\)=\(1\)/m,
 	'update target row is missing');
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab_full": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(26\); replica identity full \(25\)/m,
+	  qr/conflict detected on relation "public.tab_full": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(26\); replica identity full \(25\)/m,
 	'update target row is missing');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab_full_pk": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(2\)/m,
@@ -434,17 +435,35 @@
 22.22|bar|2),
 	'update works with dropped subscriber column');
 
+# Verify that GUC settings supplied in the CONNECTION string take effect on
+# the publisher's walsender.  We do this by enabling log_statement_stats in
+# the CONNECTION string later and checking that the publisher's log contains a
+# QUERY STATISTICS message.
+#
+# First, confirm that no such QUERY STATISTICS message appears before enabling
+# log_statement_stats.
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
+unlike(
+	$logfile,
+	qr/QUERY STATISTICS/,
+	'log_statement_stats has not been enabled yet');
+$log_location_pub = -s $node_publisher->logfile;
+
 # check that change of connection string and/or publication list causes
 # restart of subscription workers. We check the state along with
 # application_name to ensure that the walsender is (re)started.
 #
 # Not all of these are registered as tests as we need to poll for a change
 # but the test suite will fail nonetheless when something goes wrong.
+#
+# Enable log_statement_stats as the change of connection string,
+# which is also for the above mentioned test of GUC settings passed through
+# CONNECTION.
 my $oldpid = $node_publisher->safe_psql('postgres',
 	"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
 );
 $node_subscriber->safe_psql('postgres',
-	"ALTER SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr sslmode=disable'"
+	"ALTER SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr options=''-c log_statement_stats=on'''"
 );
 $node_publisher->poll_query_until('postgres',
 	"SELECT pid != $oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
@@ -452,6 +471,16 @@
   or die
   "Timed out while waiting for apply to restart after changing CONNECTION";
 
+# Check that the expected QUERY STATISTICS message appears,
+# which shows that log_statement_stats=on from the CONNECTION string
+# was correctly passed through to and honored by the walsender.
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
+like(
+	$logfile,
+	qr/QUERY STATISTICS/,
+	'log_statement_stats in CONNECTION string had effect on publisher\'s walsender'
+);
+
 $oldpid = $node_publisher->safe_psql('postgres',
 	"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
 );
@@ -507,13 +536,13 @@
 # Note that the current location of the log file is not grabbed immediately
 # after reloading the configuration, but after sending one SQL command to
 # the node so that we are sure that the reloading has taken effect.
-$log_location = -s $node_publisher->logfile;
+$log_location_pub = -s $node_publisher->logfile;
 
 $node_publisher->safe_psql('postgres', "INSERT INTO tab_notrep VALUES (11)");
 
 $node_publisher->wait_for_catchup('tap_sub');
 
-$logfile = slurp_file($node_publisher->logfile, $log_location);
+$logfile = slurp_file($node_publisher->logfile, $log_location_pub);
 ok($logfile =~ qr/skipped replication of an empty transaction with XID/,
 	'empty transaction is skipped');
 
diff --git a/src/test/subscription/t/004_sync.pl b/src/test/subscription/t/004_sync.pl
index d5eac05a3b3..2c6ae2d023a 100644
--- a/src/test/subscription/t/004_sync.pl
+++ b/src/test/subscription/t/004_sync.pl
@@ -172,6 +172,12 @@
 		'postgres', 'SELECT count(*) = 0 FROM pg_replication_slots'),
 	'DROP SUBSCRIPTION during error can clean up the slots on the publisher');
 
+# After dropping the subscription, all replication origins, whether created by
+# an apply worker or table sync worker, should have been cleaned up.
+$result = $node_subscriber->safe_psql('postgres',
+	"SELECT count(*) FROM pg_replication_origin_status");
+is($result, qq(0), 'all replication origins have been cleaned up');
+
 $node_subscriber->stop('fast');
 $node_publisher->stop('fast');
 
diff --git a/src/test/subscription/t/013_partition.pl b/src/test/subscription/t/013_partition.pl
index 4f78dd48815..763a91e75a3 100644
--- a/src/test/subscription/t/013_partition.pl
+++ b/src/test/subscription/t/013_partition.pl
@@ -368,7 +368,7 @@ BEGIN
 
 my $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab1_2_2": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(null, 4, quux\); replica identity \(a\)=\(4\)/,
+	  qr/conflict detected on relation "public.tab1_2_2": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(null, 4, quux\); replica identity \(a\)=\(4\)/,
 	'update target row is missing in tab1_2_2');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab1_1": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(1\)/,
@@ -781,7 +781,7 @@ BEGIN
 
 $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab2_1": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote tuple \(pub_tab2, quux, 5\); replica identity \(a\)=\(5\)/,
+	  qr/conflict detected on relation "public.tab2_1": conflict=update_missing.*\n.*DETAIL:.* Could not find the row to be updated.*\n.*Remote row \(pub_tab2, quux, 5\); replica identity \(a\)=\(5\)/,
 	'update target row is missing in tab2_1');
 ok( $logfile =~
 	  qr/conflict detected on relation "public.tab2_1": conflict=delete_missing.*\n.*DETAIL:.* Could not find the row to be deleted.*\n.*Replica identity \(a\)=\(1\)/,
@@ -802,8 +802,8 @@ BEGIN
 
 $logfile = slurp_file($node_subscriber1->logfile(), $log_location);
 ok( $logfile =~
-	  qr/conflict detected on relation "public.tab2_1": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified locally in transaction [0-9]+ at .*\n.*Existing local tuple \(yyy, null, 3\); remote tuple \(pub_tab2, quux, 3\); replica identity \(a\)=\(3\)/,
-	'updating a tuple that was modified by a different origin');
+	  qr/conflict detected on relation "public.tab2_1": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified locally in transaction [0-9]+ at .*\n.*Existing local row \(yyy, null, 3\); remote row \(pub_tab2, quux, 3\); replica identity \(a\)=\(3\)/,
+	'updating a row that was modified by a different origin');
 
 # The remaining tests no longer test conflict detection.
 $node_subscriber1->append_conf('postgresql.conf',
diff --git a/src/test/subscription/t/023_twophase_stream.pl b/src/test/subscription/t/023_twophase_stream.pl
index a2839bcce08..fb6dbc594fa 100644
--- a/src/test/subscription/t/023_twophase_stream.pl
+++ b/src/test/subscription/t/023_twophase_stream.pl
@@ -428,6 +428,51 @@ sub test_streaming
   $node_subscriber->safe_psql('postgres', "SELECT count(*) FROM test_tab_2");
 is($result, qq(1), 'transaction is committed on subscriber');
 
+# Test the ability to re-apply a transaction when a parallel apply worker fails
+# to prepare the transaction due to insufficient max_prepared_transactions
+# setting.
+$node_subscriber->append_conf(
+	'postgresql.conf', qq(
+max_prepared_transactions = 0
+debug_logical_replication_streaming = buffered
+));
+$node_subscriber->restart;
+
+$node_publisher->safe_psql(
+	'postgres', q{
+	BEGIN;
+	INSERT INTO test_tab_2 values(2);
+	PREPARE TRANSACTION 'xact';
+	COMMIT PREPARED 'xact';
+	});
+
+$offset = -s $node_subscriber->logfile;
+
+# Confirm the ERROR is reported because max_prepared_transactions is zero
+$node_subscriber->wait_for_log(
+	qr/ERROR: ( [A-Z0-9]+:)? prepared transactions are disabled/,
+	$offset);
+
+# Confirm that the parallel apply worker has encountered an error. The check
+# focuses on the worker type as a keyword, since the error message content may
+# differ based on whether the leader initially detected the parallel apply
+# worker's failure or received a signal from it.
+$node_subscriber->wait_for_log(
+	qr/ERROR: .*logical replication parallel apply worker.*/,
+	$offset);
+
+# Set max_prepared_transactions to correct value to resume the replication
+$node_subscriber->append_conf('postgresql.conf',
+	qq(max_prepared_transactions = 10));
+$node_subscriber->restart;
+
+$node_publisher->wait_for_catchup($appname);
+
+# Check that transaction is committed on subscriber
+$result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*) FROM test_tab_2");
+is($result, qq(2), 'transaction is committed on subscriber after retrying');
+
 ###############################
 # check all the cleanup
 ###############################
diff --git a/src/test/subscription/t/029_on_error.pl b/src/test/subscription/t/029_on_error.pl
index 243662e1240..b59d20599fd 100644
--- a/src/test/subscription/t/029_on_error.pl
+++ b/src/test/subscription/t/029_on_error.pl
@@ -30,7 +30,7 @@ sub test_skip_lsn
 	# ERROR with its CONTEXT when retrieving this information.
 	my $contents = slurp_file($node_subscriber->logfile, $offset);
 	$contents =~
-	  qr/conflict detected on relation "public.tbl".*\n.*DETAIL:.* Key already exists in unique index "tbl_pkey", modified by .*origin.* transaction \d+ at .*\n.*Key \(i\)=\(\d+\); existing local tuple .*; remote tuple .*\n.*CONTEXT:.* for replication target relation "public.tbl" in transaction \d+, finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/m
+	  qr/conflict detected on relation "public.tbl".*\n.*DETAIL:.* Key already exists in unique index "tbl_pkey", modified by .*origin.* transaction \d+ at .*\n.*Key \(i\)=\(\d+\); existing local row .*; remote row .*\n.*CONTEXT:.* for replication target relation "public.tbl" in transaction \d+, finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/m
 	  or die "could not get error-LSN";
 	my $lsn = $1;
 
diff --git a/src/test/subscription/t/030_origin.pl b/src/test/subscription/t/030_origin.pl
index 10706107b63..3fe99f4ae09 100644
--- a/src/test/subscription/t/030_origin.pl
+++ b/src/test/subscription/t/030_origin.pl
@@ -9,6 +9,9 @@
 use PostgreSQL::Test::Utils;
 use Test::More;
 
+my $tab_unquoted = q{tab'le};
+my $tab = qq{"$tab_unquoted"};
+
 my $subname_AB  = 'tap_sub_A_B';
 my $subname_AB2 = 'tap_sub_A_B_2';
 my $subname_BA  = 'tap_sub_B_A';
@@ -38,15 +41,15 @@
 $node_B->start;
 
 # Create table on node_A
-$node_A->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_A->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Create the same table on node_B
-$node_B->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_B->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Setup logical replication
 # node_A (pub) -> node_B (sub)
 my $node_A_connstr = $node_A->connstr . ' dbname=postgres';
-$node_A->safe_psql('postgres', "CREATE PUBLICATION tap_pub_A FOR TABLE tab");
+$node_A->safe_psql('postgres', "CREATE PUBLICATION tap_pub_A FOR TABLE $tab");
 $node_B->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_BA
@@ -56,7 +59,7 @@
 
 # node_B (pub) -> node_A (sub)
 my $node_B_connstr = $node_B->connstr . ' dbname=postgres';
-$node_B->safe_psql('postgres', "CREATE PUBLICATION tap_pub_B FOR TABLE tab");
+$node_B->safe_psql('postgres', "CREATE PUBLICATION tap_pub_B FOR TABLE $tab");
 $node_A->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_AB
@@ -76,25 +79,25 @@
 ###############################################################################
 
 # insert a record
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (11);");
-$node_B->safe_psql('postgres', "INSERT INTO tab VALUES (21);");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (11);");
+$node_B->safe_psql('postgres', "INSERT INTO $tab VALUES (21);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
 # check that transaction was committed on subscriber(s)
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is( $result, qq(11
 21),
 	'Inserted successfully without leading to infinite recursion in bidirectional replication setup'
 );
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is( $result, qq(11
 21),
 	'Inserted successfully without leading to infinite recursion in bidirectional replication setup'
 );
 
-$node_A->safe_psql('postgres', "DELETE FROM tab;");
+$node_A->safe_psql('postgres', "DELETE FROM $tab;");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
@@ -103,10 +106,10 @@
 # Check that remote data of node_B (that originated from node_C) is not
 # published to node_A.
 ###############################################################################
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(), 'Check existing data');
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(), 'Check existing data');
 
 # Initialize node node_C
@@ -114,12 +117,12 @@
 $node_C->init(allows_streaming => 'logical');
 $node_C->start;
 
-$node_C->safe_psql('postgres', "CREATE TABLE tab (a int PRIMARY KEY)");
+$node_C->safe_psql('postgres', "CREATE TABLE $tab (a int PRIMARY KEY)");
 
 # Setup logical replication
 # node_C (pub) -> node_B (sub)
 my $node_C_connstr = $node_C->connstr . ' dbname=postgres';
-$node_C->safe_psql('postgres', "CREATE PUBLICATION tap_pub_C FOR TABLE tab");
+$node_C->safe_psql('postgres', "CREATE PUBLICATION tap_pub_C FOR TABLE $tab");
 $node_B->safe_psql(
 	'postgres', "
 	CREATE SUBSCRIPTION $subname_BC
@@ -129,17 +132,17 @@
 $node_B->wait_for_subscription_sync($node_C, $subname_BC);
 
 # insert a record
-$node_C->safe_psql('postgres', "INSERT INTO tab VALUES (32);");
+$node_C->safe_psql('postgres', "INSERT INTO $tab VALUES (32);");
 
 $node_C->wait_for_catchup($subname_BC);
 $node_B->wait_for_catchup($subname_AB);
 $node_A->wait_for_catchup($subname_BA);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(32), 'The node_C data replicated to node_B');
 
 # check that the data published from node_C to node_B is not sent to node_A
-$result = $node_A->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_A->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(),
 	'Remote data originating from another node (not the publisher) is not replicated when origin parameter is none'
 );
@@ -149,37 +152,37 @@
 # delete a row that was previously modified by a different source.
 ###############################################################################
 
-$node_B->safe_psql('postgres', "DELETE FROM tab;");
+$node_B->safe_psql('postgres', "DELETE FROM $tab;");
 
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (32);");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (32);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(32), 'The node_A data replicated to node_B');
 
 # The update should update the row on node B that was inserted by node A.
-$node_C->safe_psql('postgres', "UPDATE tab SET a = 33 WHERE a = 32;");
+$node_C->safe_psql('postgres', "UPDATE $tab SET a = 33 WHERE a = 32;");
 
 $node_B->wait_for_log(
-	qr/conflict detected on relation "public.tab": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local tuple \(32\); remote tuple \(33\); replica identity \(a\)=\(32\)/
+	qr/conflict detected on relation "public.$tab_unquoted": conflict=update_origin_differs.*\n.*DETAIL:.* Updating the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local row \(32\); remote row \(33\); replica identity \(a\)=\(32\)/
 );
 
-$node_B->safe_psql('postgres', "DELETE FROM tab;");
-$node_A->safe_psql('postgres', "INSERT INTO tab VALUES (33);");
+$node_B->safe_psql('postgres', "DELETE FROM $tab;");
+$node_A->safe_psql('postgres', "INSERT INTO $tab VALUES (33);");
 
 $node_A->wait_for_catchup($subname_BA);
 $node_B->wait_for_catchup($subname_AB);
 
-$result = $node_B->safe_psql('postgres', "SELECT * FROM tab ORDER BY 1;");
+$result = $node_B->safe_psql('postgres', "SELECT * FROM $tab ORDER BY 1;");
 is($result, qq(33), 'The node_A data replicated to node_B');
 
 # The delete should remove the row on node B that was inserted by node A.
-$node_C->safe_psql('postgres', "DELETE FROM tab WHERE a = 33;");
+$node_C->safe_psql('postgres', "DELETE FROM $tab WHERE a = 33;");
 
 $node_B->wait_for_log(
-	qr/conflict detected on relation "public.tab": conflict=delete_origin_differs.*\n.*DETAIL:.* Deleting the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local tuple \(33\); replica identity \(a\)=\(33\)/
+	qr/conflict detected on relation "public.$tab_unquoted": conflict=delete_origin_differs.*\n.*DETAIL:.* Deleting the row that was modified by a different origin ".*" in transaction [0-9]+ at .*\n.*Existing local row \(33\); replica identity \(a\)=\(33\)/
 );
 
 # The remaining tests no longer test conflict detection.
diff --git a/src/test/subscription/t/035_conflicts.pl b/src/test/subscription/t/035_conflicts.pl
index d78a6bac16a..9a72925fb59 100644
--- a/src/test/subscription/t/035_conflicts.pl
+++ b/src/test/subscription/t/035_conflicts.pl
@@ -79,11 +79,11 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_pkey\".*
-.*Key \(a\)=\(2\); existing local tuple \(2, 2, 2\); remote tuple \(2, 3, 4\).*
+.*Key \(a\)=\(2\); existing local row \(2, 2, 2\); remote row \(2, 3, 4\).*
 .*Key already exists in unique index \"conf_tab_b_key\".*
-.*Key \(b\)=\(3\); existing local tuple \(3, 3, 3\); remote tuple \(2, 3, 4\).*
+.*Key \(b\)=\(3\); existing local row \(3, 3, 3\); remote row \(2, 3, 4\).*
 .*Key already exists in unique index \"conf_tab_c_key\".*
-.*Key \(c\)=\(4\); existing local tuple \(4, 4, 4\); remote tuple \(2, 3, 4\)./,
+.*Key \(c\)=\(4\); existing local row \(4, 4, 4\); remote row \(2, 3, 4\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected during insert');
@@ -111,11 +111,11 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_pkey\".*
-.*Key \(a\)=\(6\); existing local tuple \(6, 6, 6\); remote tuple \(6, 7, 8\).*
+.*Key \(a\)=\(6\); existing local row \(6, 6, 6\); remote row \(6, 7, 8\).*
 .*Key already exists in unique index \"conf_tab_b_key\".*
-.*Key \(b\)=\(7\); existing local tuple \(7, 7, 7\); remote tuple \(6, 7, 8\).*
+.*Key \(b\)=\(7\); existing local row \(7, 7, 7\); remote row \(6, 7, 8\).*
 .*Key already exists in unique index \"conf_tab_c_key\".*
-.*Key \(c\)=\(8\); existing local tuple \(8, 8, 8\); remote tuple \(6, 7, 8\)./,
+.*Key \(c\)=\(8\); existing local row \(8, 8, 8\); remote row \(6, 7, 8\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected during update');
@@ -139,9 +139,9 @@
 $node_subscriber->wait_for_log(
 	qr/conflict detected on relation \"public.conf_tab_2_p1\": conflict=multiple_unique_conflicts.*
 .*Key already exists in unique index \"conf_tab_2_p1_pkey\".*
-.*Key \(a\)=\(55\); existing local tuple \(55, 2, 3\); remote tuple \(55, 2, 3\).*
+.*Key \(a\)=\(55\); existing local row \(55, 2, 3\); remote row \(55, 2, 3\).*
 .*Key already exists in unique index \"conf_tab_2_p1_a_b_key\".*
-.*Key \(a, b\)=\(55, 2\); existing local tuple \(55, 2, 3\); remote tuple \(55, 2, 3\)./,
+.*Key \(a, b\)=\(55, 2\); existing local row \(55, 2, 3\); remote row \(55, 2, 3\)./,
 	$log_offset);
 
 pass('multiple_unique_conflicts detected on a leaf partition during insert');
diff --git a/src/test/subscription/t/100_bugs.pl b/src/test/subscription/t/100_bugs.pl
index 34313dda829..decbcbca9c0 100644
--- a/src/test/subscription/t/100_bugs.pl
+++ b/src/test/subscription/t/100_bugs.pl
@@ -575,4 +575,34 @@ BEGIN
 $node_publisher->stop('fast');
 $node_subscriber->stop('fast');
 
+# BUG #18988
+# The bug happened due to a self-deadlock between the DROP SUBSCRIPTION
+# command and the walsender process for accessing pg_subscription. This
+# occurred when DROP SUBSCRIPTION attempted to remove a replication slot by
+# connecting to a newly created database whose caches are not yet
+# initialized.
+#
+# The bug is fixed by reducing the lock-level during DROP SUBSCRIPTION.
+$node_publisher->start();
+
+$publisher_connstr = $node_publisher->connstr . ' dbname=regress_db';
+$node_publisher->safe_psql(
+	'postgres', qq(
+	CREATE DATABASE regress_db;
+	CREATE SUBSCRIPTION regress_sub1 CONNECTION '$publisher_connstr' PUBLICATION regress_pub WITH (connect=false);
+));
+
+my ($ret, $stdout, $stderr) =
+  $node_publisher->psql('postgres', q{DROP SUBSCRIPTION regress_sub1});
+
+isnt($ret, 0, "replication slot does not exist: exit code not 0");
+like(
+	$stderr,
+	qr/ERROR:  could not drop replication slot "regress_sub1" on publisher/,
+	"could not drop replication slot: error message");
+
+$node_publisher->safe_psql('postgres', "DROP DATABASE regress_db");
+
+$node_publisher->stop('fast');
+
 done_testing();
diff --git a/src/timezone/data/tzdata.zi b/src/timezone/data/tzdata.zi
index a7fb52f1968..53082964703 100644
--- a/src/timezone/data/tzdata.zi
+++ b/src/timezone/data/tzdata.zi
@@ -1,4 +1,5 @@
-# version 2025b
+# version 2026b
+# redo posix_only
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
 R d 1916 1919 - O Su>=1 23s 0 -
@@ -1304,8 +1305,8 @@ R MT 1974 o - S 16 0s 0 -
 R MT 1975 1979 - Ap Su>=15 2 1 S
 R MT 1975 1980 - S Su>=15 2 0 -
 R MT 1980 o - Mar 31 2 1 S
-R MD 1997 ma - Mar lastSu 2 1 S
-R MD 1997 ma - O lastSu 3 0 -
+R MD 1997 2021 - Mar lastSu 2 1 S
+R MD 1997 2021 - O lastSu 3 0 -
 R O 1918 1919 - S 16 2s 0 -
 R O 1919 o - Ap 15 2s 1 S
 R O 1944 o - Ap 3 2s 1 S
@@ -2951,9 +2952,7 @@ Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
 -8 1 PDT 1951 S 30 2
 -8 - PST 1952 Ap 27 2
 -8 1 PDT 1952 S 28 2
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
+-8 CA P%sT 1967
 -8 u P%sT 1996
 -8 m P%sT 2001
 -8 u P%sT 2002 F 20
@@ -2967,7 +2966,9 @@ Z America/Toronto -5:17:32 - LMT 1895
 -5 C E%sT
 Z America/Vancouver -8:12:28 - LMT 1884
 -8 Va P%sT 1987
--8 C P%sT
+-8 C P%sT 2026 Mar 9
+-8 1 PDT 2026 N 1 2
+-7 - MST
 Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
 -9 Y Y%sT 1965
 -9 Yu Y%sT 1966 F 27
@@ -3668,7 +3669,8 @@ Z Europe/Chisinau 1:55:20 - LMT 1880
 3 R MSK/MSD 1990 May 6 2
 2 R EE%sT 1992
 2 e EE%sT 1997
-2 MD EE%sT
+2 MD EE%sT 2022
+2 E EE%sT
 Z Europe/Dublin -0:25:21 - LMT 1880 Au 2
 -0:25:21 - DMT 1916 May 21 2s
 -0:25:21 1 IST 1916 O 1 2s
diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index 9247a34157f..3da0b4d7658 100644
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -122,6 +122,13 @@ static char *_yconv(int a, int b, bool convert_top, bool convert_yy, char *pt, c
  * Convert timestamp t to string s, a caller-allocated buffer of size maxsize,
  * using the given format pattern.
  *
+ * Unlike standard strftime(), we guarantee to provide a null-terminated
+ * result even on failure, so long as maxsize > 0.  If we overrun the buffer,
+ * return an empty string rather than risking mis-encoded multibyte output.
+ * (Since this module only supports C locale, you might think multibyte
+ * characters are impossible --- but the time zone name printed by %Z comes
+ * from outside and could contain such.)
+ *
  * See also timestamptz_to_str.
  */
 size_t
@@ -135,11 +142,15 @@ pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_tm *t)
 	if (!p)
 	{
 		errno = EOVERFLOW;
+		if (maxsize > 0)
+			*s = '\0';
 		return 0;
 	}
 	if (p == s + maxsize)
 	{
 		errno = ERANGE;
+		if (maxsize > 0)
+			*s = '\0';
 		return 0;
 	}
 	*p = '\0';
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index dd780e06419..3e60afb063f 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -2631,7 +2631,7 @@ doabbr(char *abbr, struct zone const *zp, char const *letters,
 	   bool isdst, zic_t save, bool doquotes)
 {
 	char	   *cp;
-	char	   *slashp;
+	char const *slashp;
 	size_t		len;
 	char const *format = zp->z_format;
 
diff --git a/src/tools/ci/README b/src/tools/ci/README
index 12c1e7c308f..d183648a8d0 100644
--- a/src/tools/ci/README
+++ b/src/tools/ci/README
@@ -82,3 +82,14 @@ defined in .cirrus.yml, by redefining the relevant yaml anchors.
 Custom compute resources can be provided using
 - https://cirrus-ci.org/guide/supported-computing-services/
 - https://cirrus-ci.org/guide/persistent-workers/
+
+
+Enabling manual tasks by default
+================================
+
+Some tasks are not triggered automatically by default, to avoid using up CI
+credits too quickly. This can be changed on the repository level, e.g. when
+custom compute resources are configured.
+
+The following repository level environment variables are recognized:
+- REPO_CI_AUTOMATIC_TRIGGER_TASKS - space-separated list of (mingw|netbsd|openbsd)
diff --git a/src/tools/ci/cores_backtrace.sh b/src/tools/ci/cores_backtrace.sh
index 54607415258..cb325f21156 100755
--- a/src/tools/ci/cores_backtrace.sh
+++ b/src/tools/ci/cores_backtrace.sh
@@ -1,12 +1,18 @@
 #! /bin/sh
 
-if [ $# -ne 2 ]; then
+os=$1
+directory=$2
+executable_directory=$3
+
+if [ "$os" != 'openbsd' ] && [ $# -ne 2 ]; then
     echo "cores_backtrace.sh <os> <directory>"
     exit 1
 fi
 
-os=$1
-directory=$2
+if [ "$os" = 'openbsd' ] && [ $# -ne 3 ]; then
+    echo "cores_backtrace.sh <os> <core_directory> <executable_directory>"
+    exit 1
+fi
 
 case $os in
     freebsd|linux|macos|netbsd|openbsd)
@@ -17,6 +23,10 @@ case $os in
     ;;
 esac
 
+if [ "$os" = 'openbsd' ]; then
+    export PATH="${executable_directory}:${PATH}"
+fi
+
 first=1
 for corefile in $(find "$directory" -type f) ; do
     if [ "$first" -eq 1 ]; then
@@ -26,8 +36,21 @@ for corefile in $(find "$directory" -type f) ; do
         echo -e '\n\n'
     fi
 
-    if [ "$os" = 'macos' ] || [ "$os" = 'openbsd' ]; then
+    if [ "$os" = 'macos' ]; then
         lldb -c $corefile --batch -o 'thread backtrace all' -o 'quit'
+    elif [ "$os" = 'openbsd' ]; then
+        # OpenBSD's ELF format doesn't include executable information, so we
+        # search for the executable manually in <executable_directory>.
+        filename=$(basename "$corefile")
+        base=$(echo "$filename" | sed 's/\.core.*$//')
+        binary=$(which "${base}")
+
+        if [ -z "$binary" ]; then
+            echo "executable ${base} not found in ${PATH}, running 'lldb' without debug information"
+            lldb -c "$corefile" --batch -o 'thread backtrace all' -o 'quit'
+        else
+            lldb "$binary" -c "$corefile" --batch -o 'thread backtrace all' -o 'quit'
+        fi
     else
         auxv=$(gdb --quiet --core ${corefile} --batch -ex 'info auxv' 2>/dev/null)
         if [ $? -ne 0 ]; then
diff --git a/src/tools/ci/gcp_ram_disk.sh b/src/tools/ci/gcp_ram_disk.sh
index d48634512ac..18dbb2037f5 100755
--- a/src/tools/ci/gcp_ram_disk.sh
+++ b/src/tools/ci/gcp_ram_disk.sh
@@ -15,7 +15,12 @@ case "`uname`" in
     umount /dev/sd0j # unused /usr/obj partition
     printf "m j\n\n\nswap\nw\nq\n" | disklabel -E sd0
     swapon /dev/sd0j
-    mount -t mfs -o rw,noatime,nodev,-s=8000000 swap $CIRRUS_WORKING_DIR
+    # Remove the per-process data segment limit so that mount_mfs can allocate
+    # large memory filesystems. Without this, mount_mfs mmap() may fail with
+    # "Cannot allocate memory" if the requested size exceeds the current
+    # datasize limit.
+    ulimit -d unlimited
+    mount -t mfs -o rw,noatime,nodev,-s=10000000 swap $CIRRUS_WORKING_DIR
     ;;
 esac
 
diff --git a/src/tools/ora_gen_keywordlist.pl b/src/tools/ora_gen_keywordlist.pl
index cf431811edd..6488926c278 100644
--- a/src/tools/ora_gen_keywordlist.pl
+++ b/src/tools/ora_gen_keywordlist.pl
@@ -23,7 +23,7 @@
 #
 # Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
-# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+# Portions Copyright (c) 2023-2026, IvorySQL Global Development Team
 #
 # src/tools/ora_gen_keywordlist.pl
 #
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 0ae069ee049..a7ac5e30810 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -245,14 +245,6 @@ sub pre_indent
 	# Protect wrapping in CATALOG()
 	$source =~ s!^(CATALOG\(.*)$!/*$1*/!gm;
 
-	# Treat a CURL_IGNORE_DEPRECATION() as braces for the purposes of
-	# indentation. (The recursive regex comes from the perlre documentation; it
-	# matches balanced parentheses as group $1 and the contents as group $2.)
-	my $curlopen = '{ /* CURL_IGNORE_DEPRECATION */';
-	my $curlclose = '} /* CURL_IGNORE_DEPRECATION */';
-	$source =~
-	  s!^[ \t]+CURL_IGNORE_DEPRECATION(\(((?:(?>[^()]+)|(?1))*)\))!$curlopen$2$curlclose!gms;
-
 	return $source;
 }
 
@@ -267,12 +259,6 @@ sub post_indent
 	$source =~ s!^/\* Open extern "C" \*/$!{!gm;
 	$source =~ s!^/\* Close extern "C" \*/$!}!gm;
 
-	# Restore the CURL_IGNORE_DEPRECATION() macro, keeping in mind that our
-	# markers may have been re-indented.
-	$source =~
-	  s!{[ \t]+/\* CURL_IGNORE_DEPRECATION \*/!CURL_IGNORE_DEPRECATION(!gm;
-	$source =~ s!}[ \t]+/\* CURL_IGNORE_DEPRECATION \*/!)!gm;
-
 	## Comments
 
 	# Undo change of dash-protected block comments
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index e3c41e7c87f..8d2db090c43 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -55,9 +55,6 @@ AggStrategy
 AggTransInfo
 Aggref
 AggregateInstrumentation
-AioWorkerControl
-AioWorkerSlot
-AioWorkerSubmissionQueue
 AlenState
 Alias
 AllocBlock
@@ -651,6 +648,7 @@ DiscardMode
 DiscardStmt
 DispatchOption
 DistanceValue
+DistinctColInfo
 DistinctExpr
 DoState
 DoStmt
@@ -790,6 +788,7 @@ ExtensibleNodeEntry
 ExtensibleNodeMethods
 ExtensionControlFile
 ExtensionInfo
+ExtensionSiblingCache
 ExtensionVersionInfo
 FDWCollateState
 FD_SET
@@ -1104,6 +1103,7 @@ GrantRoleStmt
 GrantStmt
 GrantTargetType
 Group
+GroupByColInfo
 GroupByOrdering
 GroupClause
 GroupPath
@@ -2176,8 +2176,12 @@ PgAioReturn
 PgAioTargetData
 PgAioTargetID
 PgAioTargetInfo
+PgAioUringCaps
 PgAioUringContext
 PgAioWaitRef
+PgAioWorkerControl
+PgAioWorkerSlot
+PgAioWorkerSubmissionQueue
 PgArchData
 PgBackendGSSStatus
 PgBackendSSLStatus
@@ -3664,6 +3668,7 @@ gistxlogPageReuse
 gistxlogPageSplit
 gistxlogPageUpdate
 grouping_sets_data
+growable_trgm_array
 gseg_picksplit_item
 gss_OID_set
 gss_buffer_desc
@@ -3675,6 +3680,7 @@ gss_key_value_set_desc
 gss_name_t
 gtrgm_consistent_cache
 gzFile
+having_collation_ctx
 hbaPort
 heap_page_items_state
 help_handler
diff --git a/src/tools/valgrind.supp b/src/tools/valgrind.supp
index 7ea464c8094..2ad5b81526d 100644
--- a/src/tools/valgrind.supp
+++ b/src/tools/valgrind.supp
@@ -180,3 +180,17 @@
    Memcheck:Cond
    fun:PyObject_Realloc
 }
+
+# NUMA introspection requires touching memory first, and some of it may
+# be marked as noacess (e.g. unpinned buffers). So just ignore that.
+{
+   pg_numa_touch_mem_if_required
+   Memcheck:Addr4
+   fun:pg_numa_touch_mem_if_required
+}
+
+{
+   pg_numa_touch_mem_if_required
+   Memcheck:Addr8
+   fun:pg_numa_touch_mem_if_required
+}